diff options
Diffstat (limited to 'pkgs')
11524 files changed, 111642 insertions, 60742 deletions
diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix index 884cb0ed88d60..192bf041c64e6 100644 --- a/pkgs/applications/accessibility/contrast/default.nix +++ b/pkgs/applications/accessibility/contrast/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { pname = "contrast"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -27,10 +27,10 @@ rustPlatform.buildRustPackage rec { owner = "design"; repo = "contrast"; rev = version; - sha256 = "0rm705zrk9rfv31pwbqxrswi5v6vhnghxa8dgxjmcrh00l8dm6j9"; + sha256 = "0kk3mv7a6y258109xvgicmsi0lw0rcs00gfyivl5hdz7qh47iccy"; }; - cargoSha256 = "0qj0vmxa1d6war1vb3zgkf1drvk7awm970fw6692hd9msa9c1kkf"; + cargoSha256 = "0vi8nv4hkhsgqgz36xacwkk5cxirg6li44nbmk3x7vx7c64hzybq"; nativeBuildInputs = [ desktop-file-utils @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Checks whether the contrast between two colors meet the WCAG requirements"; - homepage = https://gitlab.gnome.org/World/design/contrast; + homepage = "https://gitlab.gnome.org/World/design/contrast"; license = licenses.gpl3; maintainers = with maintainers; [ jtojnar ]; }; diff --git a/pkgs/applications/accessibility/dasher/default.nix b/pkgs/applications/accessibility/dasher/default.nix index 9e8084e7a87a2..43844d0c66bb2 100644 --- a/pkgs/applications/accessibility/dasher/default.nix +++ b/pkgs/applications/accessibility/dasher/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ] ++ lib.optional speechSupport speechd; meta = { - homepage = http://www.inference.org.uk/dasher/; + homepage = "http://www.inference.org.uk/dasher/"; description = "Information-efficient text-entry interface, driven by natural continuous pointing gestures"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.Profpatsch ]; diff --git a/pkgs/applications/accessibility/mousetweaks/default.nix b/pkgs/applications/accessibility/mousetweaks/default.nix index e4fd66679a79d..b645bc61848be 100644 --- a/pkgs/applications/accessibility/mousetweaks/default.nix +++ b/pkgs/applications/accessibility/mousetweaks/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { The features can be activated and configured through the Universal Access panel of the GNOME Control Center. ''; - homepage = https://wiki.gnome.org/Projects/Mousetweaks; + homepage = "https://wiki.gnome.org/Projects/Mousetweaks"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.johnazoidberg ]; diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/pkgs/applications/audio/AMB-plugins/default.nix index d9a05e0bf6609..2e2af8f3a9a2d 100644 --- a/pkgs/applications/audio/AMB-plugins/default.nix +++ b/pkgs/applications/audio/AMB-plugins/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { Mono and stereo to B-format panning, horizontal rotator, square, hexagon and cube decoders. ''; version = version; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/FIL-plugins/default.nix b/pkgs/applications/audio/FIL-plugins/default.nix index cf383c1dd495e..253e724cd313f 100644 --- a/pkgs/applications/audio/FIL-plugins/default.nix +++ b/pkgs/applications/audio/FIL-plugins/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { This should make this plugin a good candidate for use in systems that allow automation of plugin control ports, such as Ardour, or for stage use. ''; version = version; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 2833172004844..64468bddc8529 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -18,11 +18,11 @@ in stdenv.mkDerivation { patches = [ (fetchpatch { - url = https://repo.or.cz/a2jmidid.git/patch/24e3b8e543256ae8fdfb4b75eb9fd775f07c46e2; + url = "https://repo.or.cz/a2jmidid.git/patch/24e3b8e543256ae8fdfb4b75eb9fd775f07c46e2"; sha256 = "1nxrvnhxlgqc9wbxnp1gnpw4wjyzxvymwcg1gh2nqzmssgfykfkc"; }) (fetchpatch { - url = https://repo.or.cz/a2jmidid.git/patch/7f82da7eb2f540a94db23331be98d42a58ddc269; + url = "https://repo.or.cz/a2jmidid.git/patch/7f82da7eb2f540a94db23331be98d42a58ddc269"; sha256 = "1nab9zf0agbcj5pvhl90pz0cx1d204d4janqflc5ymjhy8jyrsdv"; }) ]; diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix index 5892351225d31..194514c65b535 100644 --- a/pkgs/applications/audio/aacgain/default.nix +++ b/pkgs/applications/audio/aacgain/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "ReplayGain for AAC files"; - homepage = https://aacgain.altosdesign.com; + homepage = "https://aacgain.altosdesign.com"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.robbinch ]; diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index adb38d4bbbabe..4cb28e512a72c 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -46,7 +46,7 @@ in ''; meta = with stdenv.lib; { - homepage = http://abcde.einval.com/wiki/; + homepage = "http://abcde.einval.com/wiki/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ gebner ]; description = "Command-line audio CD ripper"; diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 1d91ad4d2be19..176d1d4cfb37e 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -83,7 +83,7 @@ multiStdenv.mkDerivation { protocol to correctly embed the plugin editor into the host window. ''; - homepage = https://github.com/phantom-code/airwave; + homepage = "https://github.com/phantom-code/airwave"; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ michalrus ]; diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index 5c379b57ad6a3..f781aad905d07 100644 --- a/pkgs/applications/audio/aj-snapshot/default.nix +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { You can also run aj-snapshot in daemon mode if you want to have your connections continually restored. ''; - homepage = http://aj-snapshot.sourceforge.net/; + homepage = "http://aj-snapshot.sourceforge.net/"; license = licenses.gpl2; maintainers = [ maintainers.mrVanDalo ]; platforms = platforms.all; diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index cd951701e7714..25fceb357cc5a 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -14,7 +14,7 @@ mkDerivation rec { # master has the Qt5 version as of April 2018 but a formal release has not # yet been made so change this back to the proper upstream when such a # release is out - url = git://anongit.kde.org/amarok.git; + url = "git://anongit.kde.org/amarok.git"; # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; rev = "457fbda25a85a102bfda92aa7137e7ef5e4c8b00"; sha256 = "1ig2mg8pqany6m2zplkrvldcv4ibxwsypnyv5igm7nz7ax82cd5j"; diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index c1749029cdc9c..fadfedf5384f4 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -1,14 +1,51 @@ -{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen -, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 -, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg -, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile -, libusb, libuuid, libxml2, libxslt, lilv, lrdf, lv2, makeWrapper -, perl, pkgconfig, python2, rubberband, serd, sord, sratom -, taglib, vamp-plugin-sdk, dbus, fftw, pango, suil, libarchive -, wafHook }: - +{ stdenv +, fetchgit +, alsaLib +, aubio +, boost +, cairomm +, curl +, doxygen +, fftwSinglePrec +, flac +, glibc +, glibmm +, graphviz +, gtkmm2 +, libjack2 +, liblo +, libogg +, libsamplerate +, libsigcxx +, libsndfile +, libusb1 +, fluidsynth_1 +, hidapi +, libltc +, qm-dsp +, libxml2 +, lilv +, lrdf +, lv2 +, makeWrapper +, perl +, pkg-config +, itstool +, python2 +, rubberband +, serd +, sord +, sratom +, taglib +, vamp-plugin-sdk +, dbus +, fftw +, pango +, suil +, libarchive +, wafHook +}: let - # Ardour git repo uses a mix of annotated and lightweight tags. Annotated # tags are used for MAJOR.MINOR versioning, and lightweight tags are used # in-between; MAJOR.MINOR.REV where REV is the number of commits since the @@ -18,10 +55,7 @@ let # Version to build. tag = "5.12"; - -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { name = "ardour-${tag}"; src = fetchgit { @@ -30,46 +64,84 @@ stdenv.mkDerivation rec { sha256 = "0mla5lm51ryikc2rrk53max2m7a5ds6i1ai921l2h95wrha45nkr"; }; - nativeBuildInputs = [ wafHook ]; - buildInputs = - [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac - glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo - libmad libogg librdf_raptor librdf_rasqal libsamplerate - libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lrdf lv2 - makeWrapper pango perl pkgconfig python2 rubberband serd sord - sratom suil taglib vamp-plugin-sdk libarchive - ]; + nativeBuildInputs = [ + wafHook + makeWrapper + pkg-config + itstool + doxygen + graphviz # for dot + perl + python2 + ]; - # ardour's wscript has a "tarball" target but that required the git revision - # be available. Since this is an unzipped tarball fetched from github we - # have to do that ourself. - patchPhase = '' - printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-${builtins.substring 0 8 src.rev}\"; }\n' > libs/ardour/revision.cc - sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript - patchShebangs ./tools/ - ''; + buildInputs = [ + alsaLib + aubio + boost + cairomm + curl + dbus + fftw + fftwSinglePrec + flac + glibmm + gtkmm2 + libjack2 + liblo + libogg + libsamplerate + libsigcxx + libsndfile + libusb1 + fluidsynth_1 + hidapi + libltc + qm-dsp + libxml2 + lilv + lrdf + lv2 + pango + rubberband + serd + sord + sratom + suil + taglib + vamp-plugin-sdk + libarchive + ]; wafConfigureFlags = [ "--optimize" "--docs" + "--use-external-libs" + "--freedesktop" "--with-backends=jack,alsa,dummy" ]; + NIX_CFLAGS_COMPILE = "-I${qm-dsp}/include/qm-dsp"; + + # ardour's wscript has a "tarball" target but that required the git revision + # be available. Since this is an unzipped tarball fetched from github we + # have to do that ourself. + postPatch = '' + printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-${builtins.substring 0 8 src.rev}\"; }\n' > libs/ardour/revision.cc + patchShebangs ./tools/ + ''; + postInstall = '' - # Install desktop file - mkdir -p "$out/share/applications" - cat > "$out/share/applications/ardour.desktop" << EOF - [Desktop Entry] - Name=Ardour 5 - GenericName=Digital Audio Workstation - Comment=Multitrack harddisk recorder - Exec=$out/bin/ardour5 - Icon=$out/share/ardour5/resources/Ardour-icon_256px.png - Terminal=false - Type=Application - X-MultipleArgs=false - Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video; - EOF + # wscript does not install these for some reason + install -vDm 644 "build/gtk2_ardour/ardour.xml" \ + -t "$out/share/mime/packages" + install -vDm 644 "build/gtk2_ardour/ardour5.desktop" \ + -t "$out/share/applications" + for size in 16 22 32 48 256 512; do + install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \ + "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour5.png" + done + install -vDm 644 "ardour.1"* -t "$out/share/man/man1" ''; meta = with stdenv.lib; { @@ -83,7 +155,7 @@ stdenv.mkDerivation rec { Please consider supporting the ardour project financially: https://community.ardour.org/node/8288 ''; - homepage = http://ardour.org/; + homepage = "http://ardour.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.goibhniu maintainers.fps ]; diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index 4b48f5f1eea2c..99a09e7ee3300 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "GTK client for MPD (Music player daemon)"; - homepage = http://ario-player.sourceforge.net/; + homepage = "http://ario-player.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.garrison ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix index 4b76ebdf60532..0265e0f75ecb9 100644 --- a/pkgs/applications/audio/artyFX/default.nix +++ b/pkgs/applications/audio/artyFX/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk ]; meta = with stdenv.lib; { - homepage = http://openavproductions.com/artyfx/; + homepage = "http://openavproductions.com/artyfx/"; description = "A LV2 plugin bundle of artistic realtime effects"; license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index 5a0b6797a2417..7d90ac36f3660 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "A graphical Audio CD ripper and encoder for Linux"; - homepage = http://littlesvr.ca/asunder/index.php; + homepage = "http://littlesvr.ca/asunder/index.php"; license = licenses.gpl2; maintainers = with maintainers; [ mudri ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 12e8237d4857d..b06175f37f315 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Audio player"; - homepage = https://audacious-media-player.org/; + homepage = "https://audacious-media-player.org/"; maintainers = with maintainers; [ eelco ramkromberg ]; platforms = with platforms; linux; license = with licenses; [ diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix index baf7b108e5047..45525571a646b 100644 --- a/pkgs/applications/audio/audacious/qt-5.nix +++ b/pkgs/applications/audio/audacious/qt-5.nix @@ -81,7 +81,7 @@ mkDerivation { meta = with lib; { description = "Audio player"; - homepage = https://audacious-media-player.org/; + homepage = "https://audacious-media-player.org/"; maintainers = with maintainers; [ ttuegel ]; platforms = with platforms; linux; license = with licenses; [ diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 57e0c52e64061..542a1f85188cf 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.3.3"; + version = "2.4.1"; pname = "audacity"; src = fetchzip { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "0ddc03dbm4ixy877czmwd03fpjgr3y68bxfgb6n2q6cv4prp30ig"; + sha256 = "1xk0piv72d2xd3p7igr916fhcbrm76fhjr418k1rlqdzzg1hfljn"; }; preConfigure = /* we prefer system-wide libs */ '' @@ -57,9 +57,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sound editor with graphical UI"; - homepage = http://audacityteam.org/; + homepage = "http://audacityteam.org/"; license = licenses.gpl2Plus; platforms = intersectLists platforms.linux platforms.x86; # fails on ARM - maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix index 534b87e9fa743..eee293b76c2f9 100644 --- a/pkgs/applications/audio/audio-recorder/default.nix +++ b/pkgs/applications/audio/audio-recorder/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { automatically record your Skype calls. It supports several audio (output) formats such as OGG audio, Flac, MP3 and WAV. ''; - homepage = https://launchpad.net/~audio-recorder; + homepage = "https://launchpad.net/~audio-recorder"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix index db5f081c4ed49..5bc7f84325824 100644 --- a/pkgs/applications/audio/aumix/default.nix +++ b/pkgs/applications/audio/aumix/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { Aumix adjusts an audio mixer from X, the console, a terminal, the command line or a script. ''; - homepage = http://www.jpj.net/~trevor/aumix.html; + homepage = "http://www.jpj.net/~trevor/aumix.html"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix index fb9b3c9513f8d..3d907e421b3e3 100644 --- a/pkgs/applications/audio/axoloti/default.nix +++ b/pkgs/applications/audio/axoloti/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.axoloti.com; + homepage = "http://www.axoloti.com"; description = '' Sketching embedded digital audio algorithms. diff --git a/pkgs/applications/audio/axoloti/dfu-util.nix b/pkgs/applications/audio/axoloti/dfu-util.nix index e9fa6daecfe39..80ec696c64594 100644 --- a/pkgs/applications/audio/axoloti/dfu-util.nix +++ b/pkgs/applications/audio/axoloti/dfu-util.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { phones. With dfu-util you are able to download firmware to your device or upload firmware from it. ''; - homepage = http://dfu-util.sourceforge.net; + homepage = "http://dfu-util.sourceforge.net"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ ]; diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix index 1a6ebd346ccab..49b788f66537c 100644 --- a/pkgs/applications/audio/axoloti/libusb1.nix +++ b/pkgs/applications/audio/axoloti/libusb1.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.libusb.info; + homepage = "http://www.libusb.info"; description = "User-space USB library"; platforms = platforms.unix; license = licenses.lgpl21; diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix index c35df95b24c70..0d95675d1e67a 100644 --- a/pkgs/applications/audio/baudline/default.nix +++ b/pkgs/applications/audio/baudline/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { displays, and continuous capture tools for hunting down and studying elusive signal characteristics. ''; - homepage = http://www.baudline.com/; + homepage = "http://www.baudline.com/"; # See http://www.baudline.com/faq.html#licensing_terms. # (Do NOT (re)distribute on hydra.) license = licenses.unfree; diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix index 6f471f3a02839..ac05a9367cc99 100644 --- a/pkgs/applications/audio/bitmeter/default.nix +++ b/pkgs/applications/audio/bitmeter/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { - url = https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/bitmeter/files/bitmeter-1.2-fix-build-system.patch; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/bitmeter/files/bitmeter-1.2-fix-build-system.patch"; sha256 = "021mz6933iw7mpk6b9cbjr8naj6smbq1hwqjszlyx72qbwrrid7k"; }) ]; meta = with stdenv.lib; { - homepage = http://devel.tlrmx.org/audio/bitmeter/; + homepage = "http://devel.tlrmx.org/audio/bitmeter/"; description = "Also known as jack bitscope. Useful to detect denormals"; license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index 8358684719060..910c1cfe51b54 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { production, performance and DJing, with a focus on flexible editing tools and a super-fast workflow. ''; - homepage = https://www.bitwig.com/; + homepage = "https://www.bitwig.com/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ michalrus mrVanDalo ]; diff --git a/pkgs/applications/audio/bjumblr/default.nix b/pkgs/applications/audio/bjumblr/default.nix new file mode 100644 index 0000000000000..de0cae7a21a3a --- /dev/null +++ b/pkgs/applications/audio/bjumblr/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, libX11, cairo, lv2, pkgconfig, libsndfile }: + +stdenv.mkDerivation rec { + pname = "BJumblr"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "sjaehn"; + repo = pname; + rev = "v${version}"; + sha256 = "14z8113zkwykbhm1a8h2xs972dgifvlfij92b08jckyc7cbz84ys"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + libX11 cairo lv2 libsndfile + ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/sjaehn/BJumblr"; + description = "Pattern-controlled audio stream / sample re-sequencer LV2 plugin"; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index 504900d65955b..704b888e22932 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A range of synthesiser, electric piano and organ emulations"; - homepage = http://bristol.sourceforge.net; + homepage = "http://bristol.sourceforge.net"; license = licenses.gpl3; platforms = ["x86_64-linux" "i686-linux"]; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix index 2dee463aeee23..76a789356193b 100644 --- a/pkgs/applications/audio/bs1770gain/default.nix +++ b/pkgs/applications/audio/bs1770gain/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A audio/video loudness scanner implementing ITU-R BS.1770"; license = licenses.gpl2Plus; - homepage = http://bs1770gain.sourceforge.net/; + homepage = "http://bs1770gain.sourceforge.net/"; platforms = platforms.all; }; } diff --git a/pkgs/applications/audio/bsequencer/default.nix b/pkgs/applications/audio/bsequencer/default.nix index b91554f5716e7..bb45a846b1b85 100644 --- a/pkgs/applications/audio/bsequencer/default.nix +++ b/pkgs/applications/audio/bsequencer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BSEQuencer"; - version = "1.2.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = "${version}"; - sha256 = "08xwz5v8wrar0rx7qdr9pkpjz2k9sw6bn5glhpn6sp6453fabf8q"; + sha256 = "1fz0p0ba00b7k7a8q9mxwj01jwl8xwh9a2npn00pbbdrg9zv4fdr"; }; nativeBuildInputs = [ pkgconfig ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/sjaehn/BSEQuencer; + homepage = "https://github.com/sjaehn/BSEQuencer"; description = "Multi channel MIDI step sequencer LV2 plugin"; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/bshapr/default.nix b/pkgs/applications/audio/bshapr/default.nix index d2206cf93b5ed..a2f96bc288c95 100644 --- a/pkgs/applications/audio/bshapr/default.nix +++ b/pkgs/applications/audio/bshapr/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/sjaehn/BShapr; + homepage = "https://github.com/sjaehn/BShapr"; description = "Beat / envelope shaper LV2 plugin"; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/bslizr/default.nix b/pkgs/applications/audio/bslizr/default.nix index 97a9d60ec277d..bae2407ec7b99 100644 --- a/pkgs/applications/audio/bslizr/default.nix +++ b/pkgs/applications/audio/bslizr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BSlizr"; - version = "1.2.4"; + version = "1.2.6"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = "${version}"; - sha256 = "0gyczxhd1jch7lwz3y1nrbpc0dycw9cc5i144rpif6b9gd2y1h1j"; + sha256 = "1l0znwvvqd2s24c652q54pkizlh86mvmr8h0qqp9xma0i575fcrh"; }; nativeBuildInputs = [ pkgconfig ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/sjaehn/BSlizr; + homepage = "https://github.com/sjaehn/BSlizr"; description = "Sequenced audio slicing effect LV2 plugin (step sequencer effect)"; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index 7aa2872224d77..4f4ad4b8c5b03 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -91,7 +91,7 @@ mkDerivation rec { '') scriptAndSource; meta = { - homepage = https://github.com/falkTX/Cadence/; + homepage = "https://github.com/falkTX/Cadence/"; description = "Collection of tools useful for audio production"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ genesis worldofpeace ]; diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 0106e8b45846b..bbeef4c395a2b 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://calf-studio-gear.org; + homepage = "http://calf-studio-gear.org"; description = "A set of high quality open source audio plugins for musicians"; license = licenses.lgpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix index eabbf86683752..dc8511bf5007e 100644 --- a/pkgs/applications/audio/caps/default.nix +++ b/pkgs/applications/audio/caps/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { considerations are latency-free realtime operation, modesty of resource demands and meaningful control interfaces. ''; - homepage = http://www.quitte.de/dsp/caps.html; + homepage = "http://www.quitte.de/dsp/caps.html"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.astsmtl ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 6641e99e49174..bf297d8a83cac 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.0.0"; + version = "2.1"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - sha256 = "0fqgncqlr86n38yy7pa118mswfacmfczj7w9xx6c6k0jav3wk29k"; + sha256 = "074y40yrgl3qrdr3a5vn0scsw0qv77r5p5m6gc89zhf20ic8ajzc"; }; nativeBuildInputs = [ @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://kxstudio.sf.net/carla; + homepage = "http://kxstudio.sf.net/carla"; description = "An audio plugin host"; longDescription = '' It currently supports LADSPA (including LRDF), DSSI, LV2, VST2/3 diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index 1ab39311258b9..c953909586374 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://caudec.net/; + homepage = "http://caudec.net/"; description = "A multiprocess audio converter that supports many formats (FLAC, MP3, Ogg Vorbis, Windows codecs and many more)"; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index 5c5c262056ec6..2bdca386bf456 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Console-based Audio Visualizer for Alsa"; - homepage = https://github.com/karlstav/cava; + homepage = "https://github.com/karlstav/cava"; license = licenses.mit; maintainers = with maintainers; [ offline mirrexagon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index 864e04d88f3c2..2ceb5f6d09a2e 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin IOKit; meta = with stdenv.lib; { - homepage = http://linukz.org/cd-discid.shtml; + homepage = "http://linukz.org/cd-discid.shtml"; license = licenses.gpl2Plus; maintainers = [ maintainers.rycee ]; platforms = platforms.unix; diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 4e517ee636e81..0658305723c4e 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://xiph.org/paranoia; + homepage = "https://xiph.org/paranoia"; description = "A tool and library for reading digital audio from CDs"; license = with licenses; [ gpl2Plus lgpl21Plus ]; platforms = platforms.unix; diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index 04b31ae2c0b32..f30b5dba5b6b2 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "1.4.0.0"; + version = "1.4.0.1"; pname = "chuck"; src = fetchurl { url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz"; - sha256 = "1b17rsf7bv45gfhyhfmpz9d4rkxn24c0m2hgmpfjz3nlp0rf7bic"; + sha256 = "1m0fhndbqaf0lii1asyc50c66bv55ib6mbnm8fzk5qc5ncs0r8hi"; }; nativeBuildInputs = [ flex bison which ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Programming language for real-time sound synthesis and music creation"; - homepage = http://chuck.cs.princeton.edu; + homepage = "http://chuck.cs.princeton.edu"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ ftrvxmtrx ]; diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 479f2a16fd8a1..15d0f92b76aa7 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -91,7 +91,7 @@ let ''; meta = with stdenv.lib; { - homepage = http://www.clementine-player.org; + homepage = "https://www.clementine-player.org"; description = "A multiplatform music player"; license = licenses.gpl3Plus; platforms = platforms.linux; @@ -130,7 +130,7 @@ let ''; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.clementine-player.org; + homepage = "https://www.clementine-player.org"; description = "Spotify integration for Clementine"; # The blob itself is Apache-licensed, although libspotify is unfree. license = licenses.asl20; diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index 4da2228c6c130..3c78295db6745 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An MPD client built on top of rofi"; - homepage = https://github.com/carnager/clerk; + homepage = "https://github.com/carnager/clerk"; license = licenses.mit; maintainers = with maintainers; [ anderspapitto ]; }; diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 023e35bd78707..3e5916ba0983e 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small, fast and powerful console music player for Linux and *BSD"; - homepage = https://cmus.github.io/; + homepage = "https://cmus.github.io/"; license = licenses.gpl2; maintainers = [ maintainers.oxij ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix index 54f1050da466e..6695b9a7237ce 100644 --- a/pkgs/applications/audio/cmusfm/default.nix +++ b/pkgs/applications/audio/cmusfm/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { + run `cmusfm init` to generate configuration file under ~/.config/cmus/cmusfm.conf + Inside cmus run `:set status_display_program=cmusfm` to set up cmusfm ''; - homepage = https://github.com/Arkq/cmusfm/; + homepage = "https://github.com/Arkq/cmusfm/"; maintainers = with stdenv.lib.maintainers; [ CharlesHD ]; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix index 865bc130db915..a5947bd37f19a 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -75,7 +75,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A modern audio book player for Linux using GTK 3"; - homepage = https://cozy.geigi.de/; + homepage = "https://cozy.geigi.de/"; maintainers = [ maintainers.makefu ]; license = licenses.gpl3; }; diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/applications/audio/crip/default.nix index f7bf919c22129..0181ede26dda0 100644 --- a/pkgs/applications/audio/crip/default.nix +++ b/pkgs/applications/audio/crip/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://bach.dynet.com/crip/; + homepage = "http://bach.dynet.com/crip/"; description = "Terminal-based ripper/encoder/tagger tool for creating Ogg Vorbis/FLAC files"; license = stdenv.lib.licenses.gpl1; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/csa/default.nix b/pkgs/applications/audio/csa/default.nix index 0b8afada0206f..756c21892fb28 100644 --- a/pkgs/applications/audio/csa/default.nix +++ b/pkgs/applications/audio/csa/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postInstall = "rm $out/lib/ladspa/celllm_3890.*"; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/csa/; + homepage = "https://sourceforge.net/projects/csa/"; description = "A group of LADSPA Audio plugins for FM broadcast and more"; longDescription = '' CSA means : Contrôle Signal Audio. diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix index d16d933182163..895609d3c0232 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features."; - homepage = https://csoundqt.github.io/; + homepage = "https://csoundqt.github.io/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ hlolli ]; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 758448c2fb33b..4b426609fea47 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; - homepage = http://www.csounds.com/; + homepage = "http://www.csounds.com/"; license = licenses.gpl2; maintainers = [maintainers.marcweber]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix index b26360f0c469b..337d570a93535 100644 --- a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix +++ b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Plug-in that adds GTK 3 header bar to the DeaDBeeF music player"; - homepage = https://github.com/saivert/ddb_misc_headerbar_GTK3; + homepage = "https://github.com/saivert/ddb_misc_headerbar_GTK3"; license = licenses.gpl2Plus; maintainers = [ maintainers.jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/deadbeef/plugins/infobar.nix b/pkgs/applications/audio/deadbeef/plugins/infobar.nix index 8a81101983f7b..294d3a0ad8bf1 100644 --- a/pkgs/applications/audio/deadbeef/plugins/infobar.nix +++ b/pkgs/applications/audio/deadbeef/plugins/infobar.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { broken = true; # crashes DeaDBeeF and is abandoned (https://bitbucket.org/dsimbiriatin/deadbeef-infobar/issues/38/infobar-causes-deadbeef-180-to-crash) description = "DeaDBeeF Infobar Plugin"; - homepage = https://bitbucket.org/dsimbiriatin/deadbeef-infobar; + homepage = "https://bitbucket.org/dsimbiriatin/deadbeef-infobar"; license = licenses.gpl2Plus; maintainers = [ maintainers.jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix index 5b27f3c3f3235..95606a869b7f1 100644 --- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MPRISv2 plugin for the DeaDBeeF music player"; - homepage = https://github.com/Serranya/deadbeef-mpris2-plugin/; + homepage = "https://github.com/Serranya/deadbeef-mpris2-plugin/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index f3adec4fece22..313c7cbfd42f1 100644 --- a/pkgs/applications/audio/denemo/default.nix +++ b/pkgs/applications/audio/denemo/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "denemo"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { url = "https://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz"; - sha256 = "1blkcl3slbsq9jlhwcf2m9v9g38a0sjfhh9advgi2qr1gxri08by"; + sha256 = "145kq0zfgdadykl3i6na221i4s5wzdrcqq48amzyfarnrqk2rmpd"; }; buildInputs = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Music notation and composition software used with lilypond"; - homepage = http://denemo.org; + homepage = "http://denemo.org"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.olynch ]; diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index 1785ca60060c7..6df4679d1d5f6 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }: +{ mkDerivation, stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }: let @@ -26,7 +26,7 @@ let }; }; -in stdenv.mkDerivation rec { +in mkDerivation rec { pname = "dfasma"; version = "1.4.5"; @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { there are basic functionalities to align the signals in time and amplitude, this software does not aim to be an audio editor. ''; - homepage = http://gillesdegottex.github.io/dfasma/; + homepage = "http://gillesdegottex.github.io/dfasma/"; license = [ licenses.gpl3Plus reaperFork.meta.license ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix index 1fcdda4089666..5e0cf3616fe53 100644 --- a/pkgs/applications/audio/dirt/default.nix +++ b/pkgs/applications/audio/dirt/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An unimpressive thingie for playing bits of samples with some level of accuracy"; - homepage = https://github.com/tidalcycles/Dirt; + homepage = "https://github.com/tidalcycles/Dirt"; license = licenses.gpl3; maintainers = with maintainers; [ anderspapitto ]; platforms = with platforms; linux; diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 36f7dcc5993fe..0f651f47a4884 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://distrho.sourceforge.net; + homepage = "http://distrho.sourceforge.net"; description = "A collection of cross-platform audio effects and plugins"; longDescription = '' Includes: diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/pkgs/applications/audio/dr14_tmeter/default.nix index ea0ce8cb5f30d..fbf25384eef2b 100644 --- a/pkgs/applications/audio/dr14_tmeter/default.nix +++ b/pkgs/applications/audio/dr14_tmeter/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Compute the DR14 of a given audio file according to the procedure described by the Pleasurize Music Foundation"; license = licenses.gpl3Plus; - homepage = http://dr14tmeter.sourceforge.net/; + homepage = "http://dr14tmeter.sourceforge.net/"; maintainers = [ maintainers.adisbladis ]; }; } diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix index 1ce7115ad85b4..99c07ba8f5fed 100644 --- a/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/michaelwillis/dragonfly-reverb; + homepage = "https://github.com/michaelwillis/dragonfly-reverb"; description = "A hall-style reverb based on freeverb3 algorithms"; maintainers = [ maintainers.magnetophon ]; license = licenses.gpl3; diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index 2581f223c91d7..454befd55f9d5 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An LV2 sample based drum plugin"; - homepage = https://www.drumgizmo.org; + homepage = "https://www.drumgizmo.org"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.goibhniu maintainers.nico202 ]; diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index ae32a5f41a3e5..04277badfbe90 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "drumkv1"; - version = "0.9.13"; + version = "0.9.14"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz"; - sha256 = "1h88sakxs0b20k8v2sh14y05fin1zqmhnid6h9mk9c37ixxg58ia"; + sha256 = "0fr7pkp55zvjxf7p22drs93fsjgvqhbd55vxi0srhp2s2wzz5qak"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 4c2b97e727f47..3f294342da70f 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "View and edit tags for various audio files"; - homepage = https://wiki.gnome.org/Apps/EasyTAG; + homepage = "https://wiki.gnome.org/Apps/EasyTAG"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix index c17f6b745b37d..13c48fc12af31 100644 --- a/pkgs/applications/audio/ecasound/default.nix +++ b/pkgs/applications/audio/ecasound/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { meta = { description = "Ecasound is a software package designed for multitrack audio processing"; license = with stdenv.lib.licenses; [ gpl2 lgpl21 ]; - homepage = http://nosignal.fi/ecasound/; + homepage = "http://nosignal.fi/ecasound/"; }; } diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix index 2338c0ed376e9..f9a579512caba 100644 --- a/pkgs/applications/audio/eflite/default.nix +++ b/pkgs/applications/audio/eflite/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { CFLAGS = stdenv.lib.optionalString debug " -DDEBUG=2"; meta = { - homepage = http://eflite.sourceforge.net; + homepage = "http://eflite.sourceforge.net"; description = "EFlite is a speech server for screen readers"; longDescription = '' EFlite is a speech server for Emacspeak and other screen diff --git a/pkgs/applications/audio/ensemble-chorus/default.nix b/pkgs/applications/audio/ensemble-chorus/default.nix index 5940203d04d17..e2413a4fe87f1 100644 --- a/pkgs/applications/audio/ensemble-chorus/default.nix +++ b/pkgs/applications/audio/ensemble-chorus/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/jpcima/ensemble-chorus; + homepage = "https://github.com/jpcima/ensemble-chorus"; description = "Digital model of electronic string ensemble chorus"; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index b4ad150532049..cc3a3c9ac1f56 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { # glibc 2.27 compatibility - url = https://sources.debian.org/data/main/e/eq10q/2.2~repack0-2.1/debian/patches/05-pow10.patch; + url = "https://sources.debian.org/data/main/e/eq10q/2.2~repack0-2.1/debian/patches/05-pow10.patch"; sha256 = "07b0wf6k4xqgigv4h095bzfaw8r218wa36r9w1817jcys13r6c5r"; }) ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { 64 bits floating point internal audio processing. Nice GUI with powerful metering for every plugin. ''; - homepage = http://eq10q.sourceforge.net/; + homepage = "http://eq10q.sourceforge.net/"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix index 6b5101b50b5a2..aa68fd5363d63 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/applications/audio/espeak/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compact open source software speech synthesizer"; - homepage = http://espeak.sourceforge.net/; + homepage = "http://espeak.sourceforge.net/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index 8d7db50fd3234..6bcffcbc5c346 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Phoneme editor for espeak"; - homepage = http://espeak.sourceforge.net/; + homepage = "http://espeak.sourceforge.net/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/eteroj.lv2/default.nix b/pkgs/applications/audio/eteroj.lv2/default.nix index bbfe1ad5623f3..c86e7b5e9ba19 100644 --- a/pkgs/applications/audio/eteroj.lv2/default.nix +++ b/pkgs/applications/audio/eteroj.lv2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OSC injection/ejection from/to UDP/TCP/Serial for LV2"; - homepage = https://open-music-kontrollers.ch/lv2/eteroj; + homepage = "https://open-music-kontrollers.ch/lv2/eteroj"; license = licenses.artistic2; maintainers = with maintainers; [ magnetophon ]; }; diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 687608b435246..64b8e72443115 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -17,8 +17,8 @@ let }; meta = with stdenv.lib; { - homepage = http://faust.grame.fr/; - downloadPage = https://sourceforge.net/projects/faudiostream/files/; + homepage = "http://faust.grame.fr/"; + downloadPage = "https://sourceforge.net/projects/faudiostream/files/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ magnetophon pmahoney ]; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index cca0e21f83582..33df1ce5d4ee1 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -31,8 +31,8 @@ let }; meta = with stdenv.lib; { - homepage = http://faust.grame.fr/; - downloadPage = https://sourceforge.net/projects/faudiostream/files/; + homepage = "http://faust.grame.fr/"; + downloadPage = "https://sourceforge.net/projects/faudiostream/files/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ magnetophon pmahoney ]; diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix index f032f435a35e7..26478b2bb2e5d 100644 --- a/pkgs/applications/audio/faust/faust2jack.nix +++ b/pkgs/applications/audio/faust/faust2jack.nix @@ -2,7 +2,7 @@ , gtk2 , jack2Full , alsaLib -, opencv +, opencv2 , libsndfile }: @@ -20,7 +20,7 @@ faust.wrapWithBuildEnv { gtk2 jack2Full alsaLib - opencv + opencv2 libsndfile ]; diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix index 144d19cb01e4c..a2f1c2139a1a8 100644 --- a/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/pkgs/applications/audio/faust/faust2jaqt.nix @@ -1,6 +1,6 @@ { faust , jack2Full -, opencv +, opencv2 , qt4 , libsndfile , which @@ -17,7 +17,7 @@ faust.wrapWithBuildEnv { propagatedBuildInputs = [ jack2Full - opencv + opencv2 qt4 libsndfile which diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 3b6ca9e4053f9..90bd8bc60ad04 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { together the convenience of a standalone interpreted language with the efficiency of a compiled language. It's ideal for fast prototyping. ''; - homepage = http://faust.grame.fr/; + homepage = "http://faust.grame.fr/"; license = licenses.gpl3; }; } diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index df3aa987c3fb5..bd8b9bea82b75 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "doc" ]; meta = with stdenv.lib; { - homepage = https://xiph.org/flac/; + homepage = "https://xiph.org/flac/"; description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; platforms = platforms.all; license = licenses.bsd3; diff --git a/pkgs/applications/audio/flac123/default.nix b/pkgs/applications/audio/flac123/default.nix index 19ed23523556e..6f13b710effc6 100644 --- a/pkgs/applications/audio/flac123/default.nix +++ b/pkgs/applications/audio/flac123/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ flac libao libogg popt ]; meta = with stdenv.lib; { - homepage = http://flac-tools.sourceforge.net/; + homepage = "http://flac-tools.sourceforge.net/"; description = "A command-line program for playing FLAC audio files"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index eb39309a254c2..1da40e7541531 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extracts audio tracks from an audio CD image to separate tracks."; - homepage = https://flacon.github.io/; + homepage = "https://flacon.github.io/"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ snglth ]; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 8e2895bf84780..9d9772cde29a5 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Real-time software synthesizer based on the SoundFont 2 specifications"; - homepage = http://www.fluidsynth.org; + homepage = "http://www.fluidsynth.org"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ goibhniu lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index ee45217e49091..114cf5e192ff8 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -46,7 +46,7 @@ mkDerivation rec { FMIT is a graphical utility for tuning musical instruments, with error and volume history, and advanced features. ''; - homepage = http://gillesdegottex.github.io/fmit/; + homepage = "http://gillesdegottex.github.io/fmit/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix index 248967e06e6f3..d957c7ec33d87 100644 --- a/pkgs/applications/audio/fmsynth/default.nix +++ b/pkgs/applications/audio/fmsynth/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { - Full floating point implementation optimized for SIMD - Hard real-time constraints ''; - homepage = https://github.com/Themaister/libfmsynth; + homepage = "https://github.com/Themaister/libfmsynth"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix index 9f7f0b0900740..a712eef06501f 100644 --- a/pkgs/applications/audio/fomp/default.nix +++ b/pkgs/applications/audio/fomp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ lv2 python2 ]; meta = with stdenv.lib; { - homepage = http://drobilla.net/software/fomp/; + homepage = "http://drobilla.net/software/fomp/"; description = "An LV2 port of the MCP, VCO, FIL, and WAH plugins by Fons Adriaensen"; license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index e514032f44e25..643b648fa88d8 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { broken = true; # see: https://github.com/sampov2/foo-yc20/issues/7 description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20"; - homepage = https://github.com/sampov2/foo-yc20; + homepage = "https://github.com/sampov2/foo-yc20"; license = "BSD"; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 34494871f29c1..071a4a9caab5b 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -8,13 +8,13 @@ in stdenv.mkDerivation rec { pname = "freewheeling"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "free-wheeling"; repo = "freewheeling"; rev = "v${version}"; - sha256 = "1gjii2kndffj9iqici4vb9zrkrdqj1hs9q43x7jv48wv9872z78r"; + sha256 = "1xff5whr02cixihgd257dc70hnyf22j3zamvhsvg4lp7zq9l2in4"; }; nativeBuildInputs = [ pkgconfig autoreconfHook libtool ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { software, released under the GNU GPL license. '' ; - homepage = http://freewheeling.sourceforge.net; + homepage = "http://freewheeling.sourceforge.net"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.sepi ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index e80239553f1b8..c5661f3336f7d 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.15"; + version = "1.24"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "19xgdaij71gpvq216zjlp60zmfdl2a8kf8sc3bpk8a4d4xh4n151"; + sha256 = "0wb7xsc2m9f4q5zsf5ai6h6c0558lkziv30b5a8ic64wp0layr6k"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix index d95b3eea596d6..51f895ea2d5ff 100644 --- a/pkgs/applications/audio/game-music-emu/default.nix +++ b/pkgs/applications/audio/game-music-emu/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = https://bitbucket.org/mpyne/game-music-emu/wiki/Home; + homepage = "https://bitbucket.org/mpyne/game-music-emu/wiki/Home"; description = "A collection of video game music file emulators"; license = licenses.lgpl21Plus; platforms = platforms.all; diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/applications/audio/gbsplay/default.nix index 9ff9b8dc1145b..f89b8ed399b4e 100644 --- a/pkgs/applications/audio/gbsplay/default.nix +++ b/pkgs/applications/audio/gbsplay/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation { }; buildInputs = [ libpulseaudio ]; - - configureFlagsArray = + + configureFlags = [ "--without-test" "--without-contrib" "--disable-devdsp" "--enable-pulse" "--disable-alsa" "--disable-midi" "--disable-nas" "--disable-dsound" "--disable-i18n" ]; - makeFlagsArray = [ "tests=" ]; + makeFlags = [ "tests=" ]; meta = with stdenv.lib; { description = "gameboy sound player"; diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index eff1d6411a15b..fcf4d0b86520f 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -1,23 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, - fltk, jansson, rtmidi, libsamplerate, libsndfile, - jack2, alsaLib, libpulseaudio, - libXpm, libXinerama, libXcursor }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, fltk +, jansson +, rtmidi +, libsamplerate +, libsndfile +, jack2 +, alsaLib +, libpulseaudio +, libXpm +, libXinerama +, libXcursor +, catch2 +, nlohmann_json +}: stdenv.mkDerivation rec { pname = "giada"; - version = "0.16.1"; + version = "0.16.2.2"; src = fetchFromGitHub { owner = "monocasual"; repo = pname; rev = "v${version}"; - sha256 = "0b3lhjs6myml5r5saky15523sbc3qr43r9rh047vhsiafmqdvfq1"; + sha256 = "0rpg5qmw3b76xcra869shb8fwk5wfzpzw216n96hxa5s6k69cm0p"; }; - configureFlags = [ "--target=linux" ]; + configureFlags = [ + "--target=linux" + "--enable-system-catch" + ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ fltk libsndfile @@ -30,9 +48,16 @@ stdenv.mkDerivation rec { libpulseaudio libXinerama libXcursor + catch2 + nlohmann_json ]; - meta = with lib; { + postPatch = '' + sed -i 's:"deps/json/single_include/nlohmann/json\.hpp":<nlohmann/json.hpp>:' \ + src/core/{conf,init,midiMapConf,patch}.cpp + ''; + + meta = with stdenv.lib; { description = "A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians"; homepage = "https://giadamusic.com/"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index b8ec2d7116f5d..08eec3135081d 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.linuxsampler.org; + homepage = "http://www.linuxsampler.org"; description = "Gigasampler file access library"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index 42285ba4bf862..9e016c68608bd 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Generates playlists such that each song sounds good following the previous song"; - homepage = http://gjay.sourceforge.net/; + homepage = "http://gjay.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index cae35b6251904..7ae02ae38d852 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { libmpd = stdenv.mkDerivation { name = "libmpd-11.8.17"; src = fetchurl { - url = http://download.sarine.nl/Programs/gmpc/11.8/libmpd-11.8.17.tar.gz; + url = "http://download.sarine.nl/Programs/gmpc/11.8/libmpd-11.8.17.tar.gz"; sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y"; }; patches = [ ./libmpd-11.8.17-remove-strndup.patch ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://gmpclient.org; + homepage = "https://gmpclient.org"; description = "A GTK2 frontend for Music Player Daemon"; license = licenses.gpl2; maintainers = []; diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/applications/audio/gmu/default.nix index 8446855d190c3..bfe9f72d66463 100644 --- a/pkgs/applications/audio/gmu/default.nix +++ b/pkgs/applications/audio/gmu/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://wejp.k.vu/projects/gmu; + homepage = "http://wejp.k.vu/projects/gmu"; description = "Open source music player for portable gaming consoles and handhelds"; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index 261750859940a..d5bec0c09e5fa 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -9,7 +9,6 @@ , rustc , python3 , pkgconfig -, gnome3 , glib , libhandy , gtk3 @@ -74,9 +73,9 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Listen to your favorite podcasts"; - homepage = https://wiki.gnome.org/Apps/Podcasts; + homepage = "https://wiki.gnome.org/Apps/Podcasts"; license = licenses.gpl3; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/applications/audio/goattracker/default.nix b/pkgs/applications/audio/goattracker/default.nix new file mode 100644 index 0000000000000..77a04221b84b3 --- /dev/null +++ b/pkgs/applications/audio/goattracker/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, fetchurl +, unzip +, makeDesktopItem +, imagemagick +, SDL +, isStereo ? false +}: + +with stdenv.lib; +let + pname = "goattracker" + optionalString isStereo "-stereo"; + desktopItem = makeDesktopItem { + type = "Application"; + name = pname; + desktopName = "GoatTracker 2" + optionalString isStereo " Stereo"; + genericName = "Music Tracker"; + exec = if isStereo + then "gt2stereo" + else "goattrk2"; + icon = "goattracker"; + categories = "AudioVideo;AudioVideoEditing;"; + extraEntries = "Keywords=tracker;music;"; + }; + +in stdenv.mkDerivation rec { + inherit pname; + version = if isStereo + then "2.76" # stereo + else "2.75"; # normal + + src = fetchurl { + url = "mirror://sourceforge/goattracker2/GoatTracker_${version}${optionalString isStereo "_Stereo"}.zip"; + sha256 = if isStereo + then "12cz3780x5k047jqdv69n6rjgbfiwv67z850kfl4i37lxja432l7" # stereo + else "1km97nl7qvk6qc5l5j69wncbm76hf86j47sgzgr968423g0bxxlk"; # normal + }; + sourceRoot = (if isStereo then "gt2stereo/trunk" else "goattrk2") + "/src"; + + nativeBuildInputs = [ unzip imagemagick ]; + buildInputs = [ SDL ]; + + # PREFIX gets treated as BINDIR. + makeFlags = [ "PREFIX=$(out)/bin/" ]; + + # The zip contains some build artifacts. + prePatch = "make clean"; + + # The destination does not get created automatically. + preBuild = "mkdir -p $out/bin"; + + # Other files get installed during the build phase. + installPhase = '' + convert goattrk2.bmp goattracker.png + install -Dm644 goattracker.png $out/share/icons/hicolor/32x32/apps/goattracker.png + ${desktopItem.buildCommand} + ''; + + meta = { + description = "A crossplatform music editor for creating Commodore 64 music. Uses reSID library by Dag Lem and supports alternatively HardSID & CatWeasel devices" + + optionalString isStereo " - Stereo version"; + homepage = "https://cadaver.github.io/tools.html"; + downloadPage = "https://sourceforge.net/projects/goattracker2/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 332f2ca2342ea..509d3ddcf751f 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.googleplaymusicdesktopplayer.com/; + homepage = "https://www.googleplaymusicdesktopplayer.com/"; description = "A beautiful cross platform Desktop Player for Google Play Music"; license = stdenv.lib.licenses.mit; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 332a633616ccb..933c9ac02035c 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "gpodder"; - version = "3.10.13"; + version = "3.10.15"; format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1h542syaxsx1hslfzlk3fx1nbp190zjw35kigw7a1kx1jwvfwapg"; + sha256 = "0ghbanj142n0hgydzfjmnkdgri2kswsjal3mn10c723kih4ir4yr"; }; patches = [ @@ -73,7 +73,7 @@ python3Packages.buildPythonApplication rec { gPodder downloads and manages free audio and video content (podcasts) for you. Listen directly on your computer or on your mobile devices. ''; - homepage = http://gpodder.org/; + homepage = "http://gpodder.org/"; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ skeidel mic92 ]; diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index 487b0a730d83b..384235fc0650d 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation { patches = [ ./0001-Remove-post-install-script-that-hardcodes-paths.patch ]; meta = with stdenv.lib; { - homepage = https://github.com/haecker-felix/gradio; + homepage = "https://github.com/haecker-felix/gradio"; description = "A GTK3 app for finding and listening to internet radio stations"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/audio/gspeech/default.nix b/pkgs/applications/audio/gspeech/default.nix new file mode 100644 index 0000000000000..f51eb338d286b --- /dev/null +++ b/pkgs/applications/audio/gspeech/default.nix @@ -0,0 +1,73 @@ +{ lib +, fetchFromGitHub +, python3 +, gtk3 +, wrapGAppsHook +, glibcLocales +, gobject-introspection +, gettext +, pango +, gdk-pixbuf +, librsvg +, atk +, libnotify +, libappindicator-gtk3 +, gst_all_1 +, makeWrapper +, picotts +, sox +}: + +python3.pkgs.buildPythonApplication rec { + pname = "gSpeech"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "mothsart"; + repo = pname; + rev = version; + sha256 = "11pvdpb9jjssp8nmlj21gs7ncgfm89kw26mfc8c2x8w2q4h92ja3"; + }; + + nativeBuildInputs = [ + wrapGAppsHook + gobject-introspection + pango + gdk-pixbuf + atk + gettext + libnotify + libappindicator-gtk3 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + makeWrapper + ]; + + buildInputs = [ + glibcLocales + gtk3 + python3 + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + librsvg + ]; + + postFixup = '' + wrapProgram $out/bin/gspeech --prefix PATH : ${lib.makeBinPath [ picotts ]} + wrapProgram $out/bin/gspeech-cli --prefix PATH : ${lib.makeBinPath [ picotts ]} + ''; + + strictDeps = false; + + meta = with lib; { + description = "A minimal GUI for the Text To Speech 'Svox Pico'. Read clipboard or selected text in different languages and manage it : pause, stop, replay."; + homepage = "https://github.com/mothsART/gSpeech"; + maintainers = with maintainers; [ mothsart ]; + license = licenses.gpl3; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix index b653ae5ca5881..a81834c1fff79 100644 --- a/pkgs/applications/audio/gtklick/default.nix +++ b/pkgs/applications/audio/gtklick/default.nix @@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication rec { ''; meta = { - homepage = http://das.nasophon.de/gtklick/; + homepage = "http://das.nasophon.de/gtklick/"; description = "Simple metronome with an easy-to-use GTK interface"; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index fd3632ee1552e..1f293fe2d7960 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GTK Manager for an Apple ipod"; - homepage = http://gtkpod.sourceforge.net; + homepage = "http://gtkpod.sourceforge.net"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.skeidel ]; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index acb078fea8768..f94d27565e914 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, intltool, pkgconfig, python2 +{ stdenv, fetchurl, fetchpatch, faust, gettext, intltool, pkgconfig, python2 , avahi, bluez, boost, eigen, fftw, glib, glib-networking , glibmm, gsettings-desktop-schemas, gtkmm2, libjack2 , ladspaH, libav, libsndfile, lilv, lrdf, lv2, serd, sord, sratom @@ -19,7 +19,15 @@ stdenv.mkDerivation rec { sha256 = "1nn80m1qagfhvv69za60f0w6ck87vmk77qmqarj7fbr8avwg63s9"; }; - nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 wafHook ]; + patches = [ + (fetchpatch { + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/guitarix-0.39.0-fix_faust_and_lv2_plugins.patch?id=8579b4dfe85e04303ad2d9771ed699f04ea7b7cf"; + stripLen = 1; + sha256 = "0pgkhi4v4vrzjnig0ggmz207q4x5iyk2n6rjj8s5lv15fia7qzp4"; + }) + ]; + + nativeBuildInputs = [ faust gettext intltool wrapGAppsHook pkgconfig python2 wafHook ]; buildInputs = [ avahi bluez boost eigen fftw glib glibmm glib-networking.out @@ -28,11 +36,16 @@ stdenv.mkDerivation rec { zita-resampler curl ]; + postPatch = '' + # Fix build with lv2 1.18: https://github.com/brummer10/guitarix/commit/c0334c72 + find . -type f -exec fgrep -q LV2UI_Descriptor {} \; \ + -exec sed -i {} -e 's/const struct _\?LV2UI_Descriptor/const LV2UI_Descriptor/' \; + ''; + wafConfigureFlags = [ "--shared-lib" "--no-desktop-update" "--enable-nls" - "--no-faust" # todo: find out why --faust doesn't work "--install-roboto-font" "--includeresampler" "--convolver-ffmpeg" @@ -62,7 +75,7 @@ stdenv.mkDerivation rec { clean-sounds, nice overdrive, fat distortion and a diversity of crazy sounds never heard before. ''; - homepage = http://guitarix.sourceforge.net/; + homepage = "http://guitarix.sourceforge.net/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ astsmtl goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/gxmatcheq-lv2/default.nix b/pkgs/applications/audio/gxmatcheq-lv2/default.nix index 1d5579d74c050..b2d99e0eba866 100644 --- a/pkgs/applications/audio/gxmatcheq-lv2/default.nix +++ b/pkgs/applications/audio/gxmatcheq-lv2/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ]; meta = with stdenv.lib; { - homepage = https://github.com/brummer10/GxMatchEQ.lv2; + homepage = "https://github.com/brummer10/GxMatchEQ.lv2"; description = "Matching Equalizer to apply EQ curve from one source to another source"; maintainers = [ maintainers.magnetophon ]; license = licenses.gpl3; diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix index 1f4323eb9d55c..077bb407020e4 100644 --- a/pkgs/applications/audio/gxplugins-lv2/default.nix +++ b/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/brummer10/GxPlugins.lv2; + homepage = "https://github.com/brummer10/GxPlugins.lv2"; description = "A set of extra lv2 plugins from the guitarix project"; maintainers = [ maintainers.magnetophon ]; license = licenses.gpl3; diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index bfd211316a7c9..3ada3224e33e0 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "One music sequencer for all major platforms, both desktop and mobile"; - homepage = https://helio.fm/; + homepage = "https://helio.fm/"; license = licenses.gpl3; maintainers = [ maintainers.suhr ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index 428490e119a62..8459967a363c5 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -34,7 +34,7 @@ ''; meta = with stdenv.lib; { - homepage = http://tytel.org/helm; + homepage = "http://tytel.org/helm"; description = "A free, cross-platform, polyphonic synthesizer"; longDescription = '' A free, cross-platform, polyphonic synthesizer. diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/pkgs/applications/audio/hybridreverb2/default.nix index 19aac1bd1e957..3f1fac79623d5 100644 --- a/pkgs/applications/audio/hybridreverb2/default.nix +++ b/pkgs/applications/audio/hybridreverb2/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www2.ika.ruhr-uni-bochum.de/HybridReverb2; + homepage = "http://www2.ika.ruhr-uni-bochum.de/HybridReverb2"; description = "Reverb effect using hybrid impulse convolution"; license = licenses.gpl2Plus; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index d8aa2a013c4d9..b3aff4e4c5091 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Advanced drum machine"; - homepage = http://www.hydrogen-music.org; + homepage = "http://www.hydrogen-music.org"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/hydrogen/unstable.nix b/pkgs/applications/audio/hydrogen/unstable.nix new file mode 100644 index 0000000000000..2f220f8d31aac --- /dev/null +++ b/pkgs/applications/audio/hydrogen/unstable.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook +, alsaLib, ladspa-sdk, lash, libarchive, libjack2, liblo, libpulseaudio, libsndfile, lrdf +, qtbase, qttools, qtxmlpatterns +}: + +stdenv.mkDerivation rec { + pname = "hydrogen"; + version = "1.0.0-beta2"; + + src = fetchFromGitHub { + owner = "hydrogen-music"; + repo = pname; + rev = version; + sha256 = "1s3jrdyjpm92flw9mkkxchnj0wz8nn1y1kifii8ws252iiqjya4a"; + }; + + nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + buildInputs = [ + alsaLib ladspa-sdk lash libarchive libjack2 liblo libpulseaudio libsndfile lrdf + qtbase qttools qtxmlpatterns + ]; + + cmakeFlags = [ + "-DWANT_DEBUG=OFF" + ]; + + meta = with stdenv.lib; { + description = "Advanced drum machine"; + homepage = "http://www.hydrogen-music.org"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ goibhniu orivej ]; + }; +} diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix index f3928499413c7..daedb9b98206c 100644 --- a/pkgs/applications/audio/i-score/default.nix +++ b/pkgs/applications/audio/i-score/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { meta = { description = "An interactive sequencer for the intermedia arts"; - homepage = http://i-score.org/; + homepage = "http://i-score.org/"; license = stdenv.lib.licenses.cecill20; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index a893390d74edf..fa779a7f0f4e9 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake +{ mkDerivation, stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake }: -stdenv.mkDerivation { +mkDerivation { pname = "iannix"; version = "2016-01-31"; src = fetchFromGitHub { @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Graphical open-source sequencer,"; - homepage = https://www.iannix.org/; + homepage = "https://www.iannix.org/"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index 0fdb3b2a4a149..75d999ede1d7a 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command line editor for id3v2 tags"; - homepage = http://id3v2.sourceforge.net/; + homepage = "http://id3v2.sourceforge.net/"; license = licenses.gpl2Plus; platforms = with platforms; unix; }; diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix index 341c41818421d..2cfe77ec291fd 100644 --- a/pkgs/applications/audio/infamousPlugins/default.nix +++ b/pkgs/applications/audio/infamousPlugins/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairomm lv2 libpthreadstubs libXdmcp libXft ntk pcre fftwFloat zita-resampler ]; meta = with stdenv.lib; { - homepage = https://ssj71.github.io/infamousPlugins; + homepage = "https://ssj71.github.io/infamousPlugins"; description = "A collection of open-source LV2 plugins"; longDescription = '' These are audio plugins in the LV2 format, developed for linux. Most are suitable for live use. diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 9d3fb6aae40b2..c5d4b3f87f491 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A modular audio processing system using JACK and LV2 or LADSPA plugins"; - homepage = http://drobilla.net/software/ingen; + homepage = "http://drobilla.net/software/ingen"; license = licenses.agpl3Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix index 9d3656a81f97d..f9f58ab5ec1a6 100644 --- a/pkgs/applications/audio/ir.lv2/default.nix +++ b/pkgs/applications/audio/ir.lv2/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://factorial.hu/plugins/lv2/ir; + homepage = "http://factorial.hu/plugins/lv2/ir"; description = "Zero-latency, realtime, high performance signal convolver especially for creating reverb effects"; license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix index 92b2f8ac5153c..80f15935af23f 100644 --- a/pkgs/applications/audio/jaaa/default.nix +++ b/pkgs/applications/audio/jaaa/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/index.html"; description = "JACK and ALSA Audio Analyser"; license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index c62ccc4fc8831..e443a0a52694a 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A program for recording soundfiles with jack"; - homepage = http://archive.notam02.no/arkiv/src; + homepage = "http://archive.notam02.no/arkiv/src"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index 5bad5453504fa..08263f2abddc2 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple waveform viewer for JACK"; - homepage = http://das.nasophon.de/jack_oscrolloscope; + homepage = "http://das.nasophon.de/jack_oscrolloscope"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index 2f9b9db93c244..d13dbcc168895 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { be controlled using the ALSA sequencer. It's phat; it turns your computer into an effects box. ''; - homepage = http://jack-rack.sourceforge.net/; + homepage = "http://jack-rack.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.astsmtl ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index e44dfddd37b7c..2a75b384af5ca 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Console jack loudness meter"; - homepage = https://www.aelius.com/njh/jackmeter/; + homepage = "https://www.aelius.com/njh/jackmeter/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index 5df6e1e2daeac..c3a46439ba709 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "jackmix-0.5.2"; src = fetchurl { - url = https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz; + url = "https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz"; sha256 = "18f5v7g66mgarhs476frvayhch7fy4nyjf2xivixc061ipn0m82j"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Matrix-Mixer for the Jack-Audio-connection-Kit"; - homepage = http://www.arnoldarts.de/jackmix/; + homepage = "http://www.arnoldarts.de/jackmix/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.kampfschlaefer ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index 51ec102dbfd21..bbf66a74bc503 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple but fully featured LV2 host for Jack"; - homepage = http://drobilla.net/software/jalv; + homepage = "http://drobilla.net/software/jalv"; license = licenses.isc; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index 818630585cfdf..a9b423320a0ea 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "jamin-0.95.0"; src = fetchurl { - url = mirror://sourceforge/jamin/jamin-0.95.0.tar.gz; + url = "mirror://sourceforge/jamin/jamin-0.95.0.tar.gz"; sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://jamin.sourceforge.net; + homepage = "http://jamin.sourceforge.net"; description = "JACK Audio Mastering interface"; license = licenses.gpl2; maintainers = [ maintainers.nico202 ]; diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/applications/audio/japa/default.nix index a9eb15aabf357..426fea21107f4 100644 --- a/pkgs/applications/audio/japa/default.nix +++ b/pkgs/applications/audio/japa/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A 'perceptual' or 'psychoacoustic' audio spectrum analyser for JACK and ALSA"; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/index.html"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index d47fc3b6190da..710c1e8079297 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { management, no track suggestions, no media player. Just a fast, efficient workflow tool. ''; - homepage = http://www.ibrahimshaath.co.uk/keyfinder/; + homepage = "http://www.ibrahimshaath.co.uk/keyfinder/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index dcd305abdee6a..cfcad390f4c9a 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { - Edit synchronized lyrics and event timing codes, import and export LRC files ''; - homepage = http://kid3.sourceforge.net/; + homepage = "http://kid3.sourceforge.net/"; license = licenses.lgpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix index f33245d8f1c95..9ff063c1c8078 100644 --- a/pkgs/applications/audio/klick/default.nix +++ b/pkgs/applications/audio/klick/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fpermissive"; meta = { - homepage = http://das.nasophon.de/klick/; + homepage = "http://das.nasophon.de/klick/"; description = "Advanced command-line metronome for JACK"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index 44186abc3c46c..a0fc8631fb391 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://plugin.org.uk/; + homepage = "http://plugin.org.uk/"; description = "LADSPA format audio plugins"; license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix index a7779ee8aeea1..76acd1daba7fb 100644 --- a/pkgs/applications/audio/ladspa-sdk/default.nix +++ b/pkgs/applications/audio/ladspa-sdk/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ten example LADSPA plugins and three example programs (applyplugin, analyseplugin and listplugins). ''; - homepage = http://www.ladspa.org/ladspa_sdk/overview.html; + homepage = "http://www.ladspa.org/ladspa_sdk/overview.html"; license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix index 3fad5de1de592..d51aa3b75e1f2 100644 --- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix +++ b/pkgs/applications/audio/ladspa-sdk/ladspah.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { The ladspa.h API header file from the LADSPA SDK. For the full SDK, use the ladspa-sdk package. ''; - homepage = http://www.ladspa.org/ladspa_sdk/overview.html; + homepage = "http://www.ladspa.org/ladspa_sdk/overview.html"; license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index 0dbe60b6a6154..cb0a3ee05e122 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { longDescription = '' Session management system for GNU/Linux audio applications. ''; - homepage = https://www.nongnu.org/lash; + homepage = "https://www.nongnu.org/lash"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix index 3135a00334c7d..efafc5b05b184 100644 --- a/pkgs/applications/audio/lastfmsubmitd/default.nix +++ b/pkgs/applications/audio/lastfmsubmitd/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { installCommand = "python setup.py install --prefix=$out"; meta = { - homepage = https://www.red-bean.com/decklin/lastfmsubmitd/; + homepage = "https://www.red-bean.com/decklin/lastfmsubmitd/"; license = lib.licenses.mit; description = "An last.fm audio scrobbler and daemon"; }; diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix index b5a99150cb223..cd9ca5e267489 100644 --- a/pkgs/applications/audio/linuxband/default.nix +++ b/pkgs/applications/audio/linuxband/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { meta = { description = "A GUI front-end for MMA: Type in the chords, choose the groove and it will play an accompaniment"; - homepage = http://linuxband.org/; + homepage = "http://linuxband.org/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index f13f10d15e820..6b6cfd55926b6 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.linuxsampler.org; + homepage = "http://www.linuxsampler.org"; description = "Sampler backend"; longDescription = '' Includes sampler engine, audio and MIDI drivers, network layer diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 0420a52d89b8d..c243e9beb233e 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -41,7 +41,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "DAW similar to FL Studio (music production software)"; - homepage = https://lmms.io; + homepage = "https://lmms.io"; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ goibhniu yegortimoshenko ]; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index d0f88170980a7..e4b8b906fa64f 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.2.32"; + version = "1.2.35"; format = "other"; doCheck = false; @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "03x6qihd349pq5lmgahb77sys60g16v5v6qkdlzf8k88451k8p7n"; + sha256 = "19nw9qh17yyi9ih1nwngbbwjx1vr26haqhmzsdqf0yjgsgf9vldx"; }; nativeBuildInputs = [ @@ -94,7 +94,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}"; description = "A modern music player for GNOME"; - homepage = https://wiki.gnome.org/Apps/Lollypop; + homepage = "https://wiki.gnome.org/Apps/Lollypop"; license = licenses.gpl3Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index 8a2f64b4efd4b..218c2bdac7412 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -1,19 +1,29 @@ -{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, makeWrapper , libsndfile, jack2Full , libGLU, libGL, lv2, cairo , ladspaH, php }: stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.1.15"; + version = "1.1.19"; src = fetchFromGitHub { owner = "sadko4u"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0lynyjs5zp27gnzcv8a23pvb7c1ghzc2dspypca3ciq40bfpfzik"; + sha256 = "1wiph3vxhydc6mr9hn2c6crd4cx592l2zv0wrzgmpnlm1lflzpbg"; }; + patches = [ + # Fix build + # https://github.com/sadko4u/lsp-plugins/issues/104 + (fetchpatch { + url = "https://github.com/sadko4u/lsp-plugins/commit/4d901135fb82fa95e668b4d55d05e405f5e620d2.patch"; + excludes = [ "TODO.txt" ]; + sha256 = "wR2B6XnDXT2BGwmrsL72PH/BM1e9d9JvqHxDtfFDAug="; + }) + ]; + nativeBuildInputs = [ pkgconfig php makeWrapper ]; buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH ]; @@ -140,7 +150,7 @@ stdenv.mkDerivation rec { - Delay Compensator Stereo - Verzögerungsausgleicher Stereo - Delay Compensator x2 Stereo - Verzögerungsausgleicher x2 Stereo ''; - homepage = https://lsp-plug.in; + homepage = "https://lsp-plug.in"; maintainers = with maintainers; [ magnetophon ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/audio/luppp/default.nix b/pkgs/applications/audio/luppp/default.nix index fdba836a6ae2e..c1494ffc3334e 100644 --- a/pkgs/applications/audio/luppp/default.nix +++ b/pkgs/applications/audio/luppp/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://openavproductions.com/luppp/; + homepage = "http://openavproductions.com/luppp/"; description = "A music creation tool, intended for live use"; license = licenses.gpl3Plus; maintainers = with maintainers; [ prusnak ]; diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix index f1eddb626245c..aee910f56eb6e 100644 --- a/pkgs/applications/audio/lv2bm/default.nix +++ b/pkgs/applications/audio/lv2bm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/portalmod/lv2bm; + homepage = "https://github.com/portalmod/lv2bm"; description = "A benchmark tool for LV2 plugins"; license = licenses.gpl3; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix index 6488d1bd65e56..e16198696a697 100644 --- a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "A compressor with character. For jack and lv2"; - homepage = https://github.com/magnetophon/CharacterCompressor; + homepage = "https://github.com/magnetophon/CharacterCompressor"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix index c5728b6e8b7bc..1ccc9f3fcd5b1 100644 --- a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "A group of compressors mixed into a bus, sidechained from that mix bus. For jack and lv2"; - homepage = https://github.com/magnetophon/CompBus; + homepage = "https://github.com/magnetophon/CompBus"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix index 331e58c4bd294..d5ed7e85b696b 100644 --- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A chorus algorithm that maintains constant and symmetric detuning depth (in cents), regardless of modulation rate. For jack and lv2"; - homepage = https://github.com/magnetophon/constant-detune-chorus; + homepage = "https://github.com/magnetophon/constant-detune-chorus"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix index 046ee70e990c9..6d119394d5de8 100644 --- a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A fast yet clean lookahead limiter for jack and lv2"; - homepage = https://magnetophon.github.io/LazyLimiter/; + homepage = "https://magnetophon.github.io/LazyLimiter/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix index aa7da17dafd18..0eb68e65eae60 100644 --- a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Mid-side multiband distortion for jack and lv2"; - homepage = https://github.com/magnetophon/MBdistortion; + homepage = "https://github.com/magnetophon/MBdistortion"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix index ae05866e57d09..be8ad72d28dff 100644 --- a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Tap a rhythm into your delay! For jack and lv2"; - homepage = https://github.com/magnetophon/RhythmDelay; + homepage = "https://github.com/magnetophon/RhythmDelay"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix index 718bbdaf49ea9..dce2db4cb7708 100644 --- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "Turn your voice into a synthesizer"; - homepage = https://github.com/magnetophon/VoiceOfFaust; + homepage = "https://github.com/magnetophon/VoiceOfFaust"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix index 735e7efe54dcc..172b5ed38913f 100644 --- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "A collection of bread and butter compressors"; - homepage = https://github.com/magnetophon/faustCompressors; + homepage = "https://github.com/magnetophon/faustCompressors"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix index 356e95bf97c84..11d51d756abcd 100644 --- a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Some simple utility lv2 plugins"; - homepage = https://github.com/magnetophon/pluginUtils; + homepage = "https://github.com/magnetophon/pluginUtils"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix index 292cd3dfd8606..360cee243c33a 100644 --- a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "A multiband compressor made from shelving filters."; - homepage = https://github.com/magnetophon/shelfMultiBand; + homepage = "https://github.com/magnetophon/shelfMultiBand"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index 6c4170cf0fb6d..2464abb6585c1 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ fftwSinglePrec lv2 ]; meta = with stdenv.lib; { - homepage = http://drobilla.net/software/mda-lv2/; + homepage = "http://drobilla.net/software/mda-lv2/"; description = "An LV2 port of the MDA plugins by Paul Kellett"; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix index 4d2fa0e15b489..9d807358cd5a9 100644 --- a/pkgs/applications/audio/meterbridge/default.nix +++ b/pkgs/applications/audio/meterbridge/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Various meters (VU, PPM, DPM, JF, SCO) for Jack Audio Connection Kit"; - homepage = http://plugin.org.uk/meterbridge/; + homepage = "http://plugin.org.uk/meterbridge/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.nico202 ]; diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix index 12383dcbbda4a..cd9523d271086 100644 --- a/pkgs/applications/audio/meters_lv2/default.nix +++ b/pkgs/applications/audio/meters_lv2/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Collection of audio level meters with GUI in LV2 plugin format"; - homepage = http://x42.github.io/meters.lv2/; + homepage = "http://x42.github.io/meters.lv2/"; maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index e4d6c0293df84..67204260da247 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical program for editing, playing and recording sound files"; - homepage = https://github.com/magnush/mhwaveedit; + homepage = "https://github.com/magnush/mhwaveedit"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/applications/audio/mid2key/default.nix index 3c5660724d397..071b18e5a8a63 100644 --- a/pkgs/applications/audio/mid2key/default.nix +++ b/pkgs/applications/audio/mid2key/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installPhase = "mkdir -p $out/bin && mv mid2key $out/bin"; meta = with stdenv.lib; { - homepage = http://code.google.com/p/mid2key/; + homepage = "http://code.google.com/p/mid2key/"; description = "A simple tool which maps midi notes to simulated keystrokes"; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/midas/m32edit.nix b/pkgs/applications/audio/midas/m32edit.nix index c8a751c235b1c..6af11d42e31f9 100644 --- a/pkgs/applications/audio/midas/m32edit.nix +++ b/pkgs/applications/audio/midas/m32edit.nix @@ -5,5 +5,5 @@ callPackage ./generic.nix (args // { type = "M32"; version = "3.2"; sha256 = "1cds6qinz37086l6pmmgrzrxadygjr2z96sjjyznnai2wz4z2nrd"; - homepage = http://www.musictri.be/Categories/Midas/Mixers/Digital/M32/p/P0B3I/downloads; + homepage = "http://www.musictri.be/Categories/Midas/Mixers/Digital/M32/p/P0B3I/downloads"; }) diff --git a/pkgs/applications/audio/midas/x32edit.nix b/pkgs/applications/audio/midas/x32edit.nix index 4aacfcc89a368..7e364ff984a5f 100644 --- a/pkgs/applications/audio/midas/x32edit.nix +++ b/pkgs/applications/audio/midas/x32edit.nix @@ -5,5 +5,5 @@ callPackage ./generic.nix (args // { type = "X32"; version = "3.2"; sha256 = "1lzmhd0sqnlzc0khpwm82sfi48qhv7rg153a57qjih7hhhy41mzk"; - homepage = http://www.musictri.be/Categories/Behringer/Mixers/Digital/X32/p/P0ASF/downloads; + homepage = "http://www.musictri.be/Categories/Behringer/Mixers/Digital/X32/p/P0ASF/downloads"; }) diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/applications/audio/midisheetmusic/default.nix index 48052fc4ec883..388fc2a1b3ea1 100644 --- a/pkgs/applications/audio/midisheetmusic/default.nix +++ b/pkgs/applications/audio/midisheetmusic/default.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Convert MIDI Files to Piano Sheet Music for two hands"; - homepage = http://midisheetmusic.com; + homepage = "http://midisheetmusic.com"; license = licenses.gpl2; maintainers = [ maintainers.gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index 42fa8b7621a5d..9be303cb652ad 100644 --- a/pkgs/applications/audio/mikmod/default.nix +++ b/pkgs/applications/audio/mikmod/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Tracker music player for the terminal"; - homepage = http://mikmod.shlomifish.org/; + homepage = "http://mikmod.shlomifish.org/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index bc508f92e3b51..d7b9e5a6355ba 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Music tracker application, similar to Fasttracker II"; - homepage = http://milkytracker.org; + homepage = "http://milkytracker.org"; license = licenses.gpl3Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ zoomulator ]; diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index e91b2c9360de7..e33e69ad78c31 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Mycroft's TTS engine, based on CMU's Flite (Festival Lite)"; - homepage = https://mimic.mycroft.ai/; + homepage = "https://mimic.mycroft.ai/"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.noneucat ]; diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix index 2d301a8b6a967..47e9fa306dc43 100644 --- a/pkgs/applications/audio/mimms/default.nix +++ b/pkgs/applications/audio/mimms/default.nix @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { ''; meta = { - homepage = https://savannah.nongnu.org/projects/mimms/; + homepage = "https://savannah.nongnu.org/projects/mimms/"; license = stdenv.lib.licenses.gpl3; description = "An mms (e.g. mms://) stream downloader"; diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 8de05ee309b77..f889d9e1e8d23 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -49,7 +49,7 @@ mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://mixxx.org; + homepage = "https://mixxx.org"; description = "Digital DJ mixing software"; license = licenses.gpl2Plus; maintainers = [ maintainers.aszlig maintainers.goibhniu maintainers.bfortz ]; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 5615f4cace3dc..18b5a980633aa 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An ncurses console audio player designed to be powerful and easy to use"; - homepage = http://moc.daper.net/; + homepage = "http://moc.daper.net/"; license = licenses.gpl2; maintainers = with maintainers; [ aethelz pSub jagajaga ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix index c20f04ec9470f..765def25d6004 100644 --- a/pkgs/applications/audio/mod-distortion/default.nix +++ b/pkgs/applications/audio/mod-distortion/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { installFlags = [ "INSTALL_PATH=$(out)/lib/lv2" ]; meta = with stdenv.lib; { - homepage = https://github.com/portalmod/mod-distortion; + homepage = "https://github.com/portalmod/mod-distortion"; description = "Analog distortion emulation lv2 plugins"; license = licenses.gpl3; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 66be35bfcc8f6..0b9f815330200 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -1,44 +1,41 @@ -{ stdenv, fetchFromGitHub, python3Packages, wrapGAppsHook -, gst_all_1, glib-networking, gobject-introspection -}: - -python3Packages.buildPythonApplication rec { - pname = "mopidy"; - version = "3.0.2"; - - src = fetchFromGitHub { - owner = "mopidy"; - repo = "mopidy"; - rev = "v${version}"; - sha256 = "1n9lpgq0p112cjgsrc1cd6mnffk56y36g2c5skk9cqzw27qrkd15"; - }; +{ newScope, python }: + +# Create a custom scope so we are consistent in which python version is used + +let + callPackage = newScope self; + + self = { + + inherit python; + pythonPackages = python.pkgs; + + mopidy = callPackage ./mopidy.nix { }; + + mopidy-gmusic = callPackage ./gmusic.nix { }; + + mopidy-local-images = callPackage ./local-images.nix { }; + + mopidy-local-sqlite = callPackage ./local-sqlite.nix { }; + + mopidy-spotify = callPackage ./spotify.nix { }; + + mopidy-moped = callPackage ./moped.nix { }; + + mopidy-mopify = callPackage ./mopify.nix { }; + + mopidy-mpd = callPackage ./mpd.nix { }; + + mopidy-spotify-tunigo = callPackage ./spotify-tunigo.nix { }; + + mopidy-youtube = callPackage ./youtube.nix { }; + + mopidy-soundcloud = callPackage ./soundcloud.nix { }; + + mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { }; + + mopidy-iris = callPackage ./iris.nix { }; - nativeBuildInputs = [ wrapGAppsHook ]; - - buildInputs = with gst_all_1; [ - gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad - glib-networking gobject-introspection - ]; - - propagatedBuildInputs = with python3Packages; [ - gst-python pygobject3 pykka tornado_4 requests setuptools - ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; - - # There are no tests - doCheck = false; - - preFixup = '' - gappsWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH") - ''; - - meta = with stdenv.lib; { - homepage = "https://www.mopidy.com/"; - description = '' - An extensible music server that plays music from local disk, Spotify, - SoundCloud, Google Play Music, and more - ''; - license = licenses.asl20; - maintainers = [ maintainers.fpletz ]; - hydraPlatforms = []; }; -} + +in self diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix index 8c173140efd8f..3dea9156f8fcb 100644 --- a/pkgs/applications/audio/mopidy/gmusic.nix +++ b/pkgs/applications/audio/mopidy/gmusic.nix @@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://www.mopidy.com/; + homepage = "https://www.mopidy.com/"; description = "Mopidy extension for playing music from Google Play Music"; license = licenses.asl20; maintainers = [ maintainers.jgillich ]; diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 000a0bc0bfe3e..5cc3a957d2602 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.46.0"; + version = "3.49.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0c7b6zbcj4bq5qsxvhjwqclrl1k2hs3wb50pfjbw7gs7m3gm2b7d"; + sha256 = "0zddm7286iwx437gjz47m4g28s8gdcxnm2hmly9w1dzi08aa4fas"; }; propagatedBuildInputs = [ @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/jaedb/Iris; + homepage = "https://github.com/jaedb/Iris"; description = "A fully-functional Mopidy web client encompassing Spotify and many other backends"; license = licenses.asl20; maintainers = [ maintainers.rvolosatovs ]; diff --git a/pkgs/applications/audio/mopidy/local-images.nix b/pkgs/applications/audio/mopidy/local-images.nix index 2ffc736572bf7..085fe855e8a8a 100644 --- a/pkgs/applications/audio/mopidy/local-images.nix +++ b/pkgs/applications/audio/mopidy/local-images.nix @@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/mopidy/mopidy-local-images; + homepage = "https://github.com/mopidy/mopidy-local-images"; description = "Mopidy local library proxy extension for handling embedded album art"; license = licenses.asl20; maintainers = [ maintainers.rvolosatovs ]; diff --git a/pkgs/applications/audio/mopidy/local-sqlite.nix b/pkgs/applications/audio/mopidy/local-sqlite.nix index 6d0cc370ff346..23e01c02a0f50 100644 --- a/pkgs/applications/audio/mopidy/local-sqlite.nix +++ b/pkgs/applications/audio/mopidy/local-sqlite.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/mopidy/mopidy-local-sqlite; + homepage = "https://github.com/mopidy/mopidy-local-sqlite"; description = "Mopidy SQLite local library extension"; license = licenses.asl20; maintainers = [ maintainers.rvolosatovs ]; diff --git a/pkgs/applications/audio/mopidy/moped.nix b/pkgs/applications/audio/mopidy/moped.nix index d41fb12ae8d3e..ffd9af76d173b 100644 --- a/pkgs/applications/audio/mopidy/moped.nix +++ b/pkgs/applications/audio/mopidy/moped.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/martijnboland/moped; + homepage = "https://github.com/martijnboland/moped"; description = "A web client for Mopidy"; license = licenses.mit; maintainers = []; diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix new file mode 100644 index 0000000000000..ae65d9b2f6ede --- /dev/null +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook +, gst_all_1, glib-networking, gobject-introspection +}: + +pythonPackages.buildPythonApplication rec { + pname = "mopidy"; + version = "3.0.2"; + + src = fetchFromGitHub { + owner = "mopidy"; + repo = "mopidy"; + rev = "v${version}"; + sha256 = "1n9lpgq0p112cjgsrc1cd6mnffk56y36g2c5skk9cqzw27qrkd15"; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + + buildInputs = with gst_all_1; [ + gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad + glib-networking gobject-introspection + ]; + + propagatedBuildInputs = with pythonPackages; [ + gst-python pygobject3 pykka tornado_4 requests setuptools + ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; + + # There are no tests + doCheck = false; + + preFixup = '' + gappsWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH") + ''; + + meta = with stdenv.lib; { + homepage = "https://www.mopidy.com/"; + description = '' + An extensible music server that plays music from local disk, Spotify, + SoundCloud, Google Play Music, and more + ''; + license = licenses.asl20; + maintainers = [ maintainers.fpletz ]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/audio/mopidy/mopify.nix b/pkgs/applications/audio/mopidy/mopify.nix index b657f69e26eec..a9902ca417212 100644 --- a/pkgs/applications/audio/mopidy/mopify.nix +++ b/pkgs/applications/audio/mopidy/mopify.nix @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/dirkgroenen/mopidy-mopify; + homepage = "https://github.com/dirkgroenen/mopidy-mopify"; description = "A mopidy webclient based on the Spotify webbased interface"; license = licenses.gpl3; maintainers = [ maintainers.Gonzih ]; diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index a01bf6c80d3d2..32019c74f86d7 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, python3Packages, mopidy }: +{ stdenv, fetchurl, pythonPackages, mopidy }: -python3Packages.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; version = "4.0.1"; @@ -9,12 +9,12 @@ python3Packages.buildPythonApplication rec { sha256 = "1ac8r8050i5r3ag1hlblbcyskqjqz7wgamndbzsmw52qi6hxk44f"; }; - propagatedBuildInputs = [ mopidy python3Packages.pyspotify ]; + propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; doCheck = false; meta = with stdenv.lib; { - homepage = https://www.mopidy.com/; + homepage = "https://www.mopidy.com/"; description = "Mopidy extension for playing music from Spotify"; license = licenses.asl20; maintainers = []; diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix index 727133be78df0..2943a31454a64 100644 --- a/pkgs/applications/audio/mp3blaster/default.nix +++ b/pkgs/applications/audio/mp3blaster/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An audio player for the text console"; - homepage = http://www.mp3blaster.org/; + homepage = "http://www.mp3blaster.org/"; license = licenses.gpl2; maintainers = with maintainers; [ earldouglas ]; platforms = platforms.all; diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix index 233aebfa1470f..f2b4564c7ccf5 100644 --- a/pkgs/applications/audio/mp3gain/default.nix +++ b/pkgs/applications/audio/mp3gain/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Lossless mp3 normalizer with statistical analysis"; - homepage = http://mp3gain.sourceforge.net/; + homepage = "http://mp3gain.sourceforge.net/"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index 6700f21fc8cca..69ca271d27dd9 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { other attributes in a pre-defined or user-specifiable output format. ''; - homepage = http://www.ibiblio.org/mp3info/; + homepage = "http://www.ibiblio.org/mp3info/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix index f067c5af6df3f..323854575ea74 100644 --- a/pkgs/applications/audio/mp3splt/default.nix +++ b/pkgs/applications/audio/mp3splt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility to split mp3, ogg vorbis and FLAC files without decoding"; - homepage = https://sourceforge.net/projects/mp3splt/; + homepage = "https://sourceforge.net/projects/mp3splt/"; license = licenses.gpl2; maintainers = [ maintainers.bosu ]; platforms = platforms.unix; diff --git a/pkgs/applications/audio/mp3val/default.nix b/pkgs/applications/audio/mp3val/default.nix index 6c35779f6c4cf..636fb7d9b9a17 100644 --- a/pkgs/applications/audio/mp3val/default.nix +++ b/pkgs/applications/audio/mp3val/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { also other MPEG versions and layers. The tool is also aware of the most common types of tags (ID3v1, ID3v2, APEv2). ''; - homepage = http://mp3val.sourceforge.net/index.shtml; + homepage = "http://mp3val.sourceforge.net/index.shtml"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index 1e8d73ce560f0..a226b720df9b2 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A minimalist command line interface to MPD"; - homepage = https://www.musicpd.org/clients/mpc/; + homepage = "https://www.musicpd.org/clients/mpc/"; license = licenses.gpl2; maintainers = with maintainers; [ algorith ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index f024e5a6a1d16..ef5cb169a2cf7 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://mpc123.sourceforge.net/; + homepage = "http://mpc123.sourceforge.net/"; description = "A Musepack (.mpc) audio player"; diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 6c4b9a4317681..53e66e580da89 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Fast console MPEG Audio Player and decoder library"; - homepage = http://mpg123.org; + homepage = "http://mpg123.org"; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index 08fe9b4f9af15..63b8e2d867a72 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line MP3 player"; - homepage = http://mpg321.sourceforge.net/; + homepage = "http://mpg321.sourceforge.net/"; license = licenses.gpl2; maintainers = [ maintainers.rycee ]; platforms = platforms.gnu ++ platforms.linux; diff --git a/pkgs/applications/audio/mup/default.nix b/pkgs/applications/audio/mup/default.nix index 43098be12e3f9..0227255d38dc6 100644 --- a/pkgs/applications/audio/mup/default.nix +++ b/pkgs/applications/audio/mup/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "mup"; - version = "6.7"; + version = "6.8"; src = fetchurl { url = "http://www.arkkra.com/ftp/pub/unix/mup${builtins.replaceStrings ["."] [""] version}src.tar.gz"; - sha256 = "1y1qknhib1isdjsbv833w3nxzyfljkfgp1gmjwly60l55q60frpk"; + sha256 = "06bv5nyl8rcibyb83zzrfdq6x6f93g3rgnv47i5gsjcaw5w6l31y"; }; nativeBuildInputs = [ autoreconfHook bison flex ghostscript groff netpbm ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; # Undeclared dependencies + https://stackoverflow.com/a/19822767/1687334 for prolog.ps. meta = with stdenv.lib; { - homepage = http://www.arkkra.com/; + homepage = "http://www.arkkra.com/"; description = "Music typesetting program (ASCII to PostScript and MIDI)"; license = licenses.bsd3; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix index 8b08aed62b8b1..8870a144c9f5a 100644 --- a/pkgs/applications/audio/musescore/darwin.nix +++ b/pkgs/applications/audio/musescore/darwin.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Music notation and composition software"; - homepage = https://musescore.org/; + homepage = "https://musescore.org/"; license = licenses.gpl2; platforms = platforms.darwin; maintainers = with maintainers; [ yurrriq ]; - repositories.git = https://github.com/musescore/MuseScore; + repositories.git = "https://github.com/musescore/MuseScore"; }; } diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 7ef6328c02c2b..063a05a72f3a8 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -31,10 +31,10 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Music notation and composition software"; - homepage = https://musescore.org/; + homepage = "https://musescore.org/"; license = licenses.gpl2; - maintainers = with maintainers; [ vandenoever ]; + maintainers = with maintainers; [ vandenoever turion ]; platforms = platforms.linux; - repositories.git = https://github.com/musescore/MuseScore; + repositories.git = "https://github.com/musescore/MuseScore"; }; } diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix new file mode 100644 index 0000000000000..0c076946b9277 --- /dev/null +++ b/pkgs/applications/audio/musikcube/default.nix @@ -0,0 +1,56 @@ +{ cmake +, pkg-config +, alsaLib +, boost +, curl +, fetchFromGitHub +, ffmpeg +, lame +, libev +, libmicrohttpd +, ncurses +, pulseaudio +, stdenv +, taglib +, systemdSupport ? stdenv.isLinux, systemd +}: + +stdenv.mkDerivation rec { + pname = "musikcube"; + version = "0.90.1"; + + src = fetchFromGitHub { + owner = "clangen"; + repo = pname; + rev = version; + sha256 = "1ff2cgbllrl2pl5zfbf0cd9qbf6hqpwr395sa1k245ar4f1rfwpg"; + }; + + # https://github.com/clangen/musikcube/issues/339 + patches = [ ./dont-strip.patch ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + alsaLib + boost + curl + ffmpeg + lame + libev + libmicrohttpd + ncurses + pulseaudio + taglib + ] ++ stdenv.lib.optional systemdSupport systemd; + + meta = with stdenv.lib; { + description = "A fully functional terminal-based music player, library, and streaming audio server"; + homepage = "https://musikcube.com/"; + maintainers = [ maintainers.aanderse ]; + license = licenses.bsd3; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/musikcube/dont-strip.patch b/pkgs/applications/audio/musikcube/dont-strip.patch new file mode 100644 index 0000000000000..b7385dcddba93 --- /dev/null +++ b/pkgs/applications/audio/musikcube/dont-strip.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3e02666..7c43c7e6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -370,9 +370,3 @@ endif() + # they don't yet exist! + add_custom_target(postbuild ALL DEPENDS musikcube musikcubed) + add_custom_command(TARGET postbuild POST_BUILD COMMAND cmake .) +- +-# strip binaries in release mode +-if (CMAKE_BUILD_TYPE MATCHES Release) +- message(STATUS "stripping binaries...") +- add_custom_command(TARGET postbuild POST_BUILD COMMAND "${CMAKE_SOURCE_DIR}/strip-nix.sh") +-endif() diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix index e7a9e22c2d680..b1e8822cdcf8b 100644 --- a/pkgs/applications/audio/musly/default.nix +++ b/pkgs/applications/audio/musly/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { '' else ""; meta = with stdenv.lib; { - homepage = https://www.musly.org; + homepage = "https://www.musly.org"; description = "A fast and high-quality audio music similarity library written in C/C++"; longDescription = '' Musly analyzes the the audio signal of music pieces to estimate their similarity. diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index c95177cd3821e..aea50d71d75db 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -10,13 +10,13 @@ assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.37"; + version = "0.38"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "1b0vd0h49kjg4nxjfjrcg8gzplz93ryr6xyfha2pvhlrzdd2d1lj"; + sha256 = "1kidpd1xrfax3v31q93r9g9b7jd841476q47wgd94h1a86b70gs9"; }; buildInputs = [ glib ncurses mpd_clientlib boost ] @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; - homepage = https://www.musicpd.org/clients/ncmpc/; + homepage = "https://www.musicpd.org/clients/ncmpc/"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 2ba36b4a50d92..f8adc522fcb5e 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A featureful ncurses based MPD client inspired by ncmpc"; - homepage = https://ncmpcpp.rybczak.net/; + homepage = "https://ncmpcpp.rybczak.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jfrankenau koral lovek323 ]; platforms = platforms.all; diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix index 53ed9b3297c17..32d8df2f0487f 100644 --- a/pkgs/applications/audio/ncpamixer/default.nix +++ b/pkgs/applications/audio/ncpamixer/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An ncurses mixer for PulseAudio inspired by pavucontrol"; - homepage = https://github.com/fulhax/ncpamixer; + homepage = "https://github.com/fulhax/ncpamixer"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ StijnDW ]; diff --git a/pkgs/applications/audio/netease-cloud-music/default.nix b/pkgs/applications/audio/netease-cloud-music/default.nix index 15afe233b3abc..c4cc291d026c9 100644 --- a/pkgs/applications/audio/netease-cloud-music/default.nix +++ b/pkgs/applications/audio/netease-cloud-music/default.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { meta = { description = "Client for Netease Cloud Music service"; - homepage = https://music.163.com; + homepage = "https://music.163.com"; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.mlatus ]; license = stdenv.lib.licenses.unfreeRedistributable; diff --git a/pkgs/applications/audio/ninjas2/default.nix b/pkgs/applications/audio/ninjas2/default.nix new file mode 100644 index 0000000000000..3a23347c1e764 --- /dev/null +++ b/pkgs/applications/audio/ninjas2/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, libjack2, libGL, pkgconfig, xorg, mesa, libsndfile, libsamplerate }: + +stdenv.mkDerivation rec { + pname = "ninjas2"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "clearly-broken-software"; + repo = pname; + rev = "v${version}"; + sha256 = "1kwp6pmnfar2ip9693gprfbcfscklgri1k1ycimxzlqr61nkd2k9"; + fetchSubmodules = true; + }; + + patchPhase = '' + patchShebangs dpf/utils/generate-ttl.sh + ''; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + libjack2 xorg.libX11 libGL mesa libsndfile libsamplerate + ]; + + installPhase = '' + install -dD bin/ninjas2.lv2 $out/lib/lv2/ninjas2.lv2 + install -D bin/ninjas2-vst.so $out/lib/vst/ninjas2-vst.so + install -D bin/ninjas2 $out/bin/ninjas2 + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/clearly-broken-software/ninjas2"; + description = "sample slicer plugin for LV2, VST, and jack standalone"; + license = with licenses; [ gpl3 ]; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/noise-repellent/default.nix b/pkgs/applications/audio/noise-repellent/default.nix index bc5b35396e239..3b2f233c6afef 100644 --- a/pkgs/applications/audio/noise-repellent/default.nix +++ b/pkgs/applications/audio/noise-repellent/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An lv2 plugin for broadband noise reduction"; - homepage = https://github.com/lucianodato/noise-repellent; + homepage = "https://github.com/lucianodato/noise-repellent"; license = licenses.gpl3; maintainers = [ maintainers.magnetophon ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" ]; diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index 651db50f0a7bb..9b4b147c2304d 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Lightweight and lightning fast modular Digital Audio Workstation"; - homepage = http://non.tuxfamily.org; + homepage = "http://non.tuxfamily.org"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/pkgs/applications/audio/nootka/default.nix b/pkgs/applications/audio/nootka/default.nix index 4f7b1e7e30f72..b0d4843aecd5d 100644 --- a/pkgs/applications/audio/nootka/default.nix +++ b/pkgs/applications/audio/nootka/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Application for practicing playing musical scores and ear training"; - homepage = https://nootka.sourceforge.io/; + homepage = "https://nootka.sourceforge.io/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/nootka/unstable.nix b/pkgs/applications/audio/nootka/unstable.nix index d76fd0835caa5..16df55c1dfba0 100644 --- a/pkgs/applications/audio/nootka/unstable.nix +++ b/pkgs/applications/audio/nootka/unstable.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Application for practicing playing musical scores and ear training"; - homepage = https://nootka.sourceforge.io/; + homepage = "https://nootka.sourceforge.io/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/applications/audio/normalize/default.nix index 490ecc967bbfb..0aa2641169325 100644 --- a/pkgs/applications/audio/normalize/default.nix +++ b/pkgs/applications/audio/normalize/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmad ]; meta = with stdenv.lib; { - homepage = https://www.nongnu.org/normalize/; + homepage = "https://www.nongnu.org/normalize/"; description = "Audio file normalizer"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index 0bb970500bdc5..bc5a3efc59a38 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "nova-filters"; src = fetchurl { - url = https://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz; + url = "https://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz"; sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "LADSPA plugins based on filters of nova"; - homepage = http://klingt.org/~tim/nova-filters/; + homepage = "http://klingt.org/~tim/nova-filters/"; license = licenses.gpl2Plus; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 24ac52e7e3112..de903bf32768d 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -2,14 +2,14 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let - version = "0.4.11"; + version = "0.4.12"; in stdenv.mkDerivation { pname = "openmpt123"; inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "1g96bpwh419s429wb387lkmhjsn3ldsjrzrb8h9p3wva5z6943i6"; + sha256 = "0q2yf9g6hcwvr2nk3zggkscyf0np6i03q2g7fx10i2kcdr3n9k8c"; }; enableParallelBuilding = true; @@ -23,7 +23,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A cross-platform command-line based module file player"; - homepage = https://lib.openmpt.org/libopenmpt/; + homepage = "https://lib.openmpt.org/libopenmpt/"; license = licenses.bsd3; maintainers = with maintainers; [ gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix index 69fa75d85f4d1..9d95c362d9285 100644 --- a/pkgs/applications/audio/opus-tools/default.nix +++ b/pkgs/applications/audio/opus-tools/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Tools to work with opus encoded audio streams"; - homepage = http://www.opus-codec.org/; + homepage = "http://www.opus-codec.org/"; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix index 25636863793f0..c09b3f415d869 100644 --- a/pkgs/applications/audio/opusfile/default.nix +++ b/pkgs/applications/audio/opusfile/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High-level API for decoding and seeking in .opus files"; - homepage = http://www.opus-codec.org/; + homepage = "http://www.opus-codec.org/"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/audio/orca-c/default.nix b/pkgs/applications/audio/orca-c/default.nix new file mode 100644 index 0000000000000..3a4f4b2ce2b8e --- /dev/null +++ b/pkgs/applications/audio/orca-c/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, ncurses, portmidi }: +stdenv.mkDerivation { + pname = "orca-c"; + + version = "git-2020-05-01"; + + src = fetchFromGitHub { + owner = "hundredrabbits"; + repo = "Orca-c"; + rev = "d7a3b169c5ed0b06a9ad0fdb3057704da9a0b6ce"; + sha256 = "101y617a295hzwr98ykvza1sycxlk29kzxn2ybjwc718r0alkbzz"; + }; + + buildInputs = [ ncurses portmidi ]; + + patchPhase = '' + patchShebangs tool + ''; + + installPhase = '' + mkdir -p $out/bin + install build/orca $out/bin/orca + ''; + + meta = with stdenv.lib; { + description = "An esoteric programming language designed to quickly create procedural sequencers."; + homepage = "https://github.com/hundredrabbits/Orca-c"; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 911bb4c8c7731..19bd6ecc0c8a2 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "padthv1"; - version = "0.9.13"; + version = "0.9.14"; src = fetchurl { url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz"; - sha256 = "1c1zllph86qswcxddz4vpsj6r9w21hbv4gkba0pyd3q7pbfqr7nz"; + sha256 = "079iwwlkl1gscyv70v9ambad8shxbs0ixdfp0vsl6dbh87b09qzh"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix index 2507f08e9e599..cc5d84d9471b1 100644 --- a/pkgs/applications/audio/pamix/default.nix +++ b/pkgs/applications/audio/pamix/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pulseaudio terminal mixer"; - homepage = https://github.com/patroclos/PAmix; + homepage = "https://github.com/patroclos/PAmix"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ericsagnes ]; diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index 7c45209678508..71d8524859915 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { - Increase / Decrease the volume for a device - Mute or unmute a device ''; - homepage = https://github.com/cdemoulins/pamixer; + homepage = "https://github.com/cdemoulins/pamixer"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index 9c59b5466c747..b5ec1206ce3da 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { dialog for the PulseAudio sound server. ''; - homepage = http://freedesktop.org/software/pulseaudio/paprefs/; + homepage = "http://freedesktop.org/software/pulseaudio/paprefs/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index e7c4cab9af18f..ac679d6dd9499 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "patchage"; version = "1.0.1"; src = fetchsvn { - url = http://svn.drobilla.net/lad/trunk/patchage/; + url = "http://svn.drobilla.net/lad/trunk/patchage/"; rev = "5821"; sha256 = "1ar64l0sg468qzxj7i6ppgfqjpm92awcp5lzskamrf3ln17lrgj7"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Modular patch bay for Jack and ALSA systems"; - homepage = http://non.tuxfamily.org; + homepage = "http://non.tuxfamily.org"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix index b9a3f39affb17..f6cee7672f7ca 100644 --- a/pkgs/applications/audio/paulstretch/default.nix +++ b/pkgs/applications/audio/paulstretch/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { special effects by "spectral smoothing" the sounds. It can transform any sound/music to a texture. ''; - homepage = http://hypermammut.sourceforge.net/paulstretch/; + homepage = "http://hypermammut.sourceforge.net/paulstretch/"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index d07cf8a476b5b..301e44168d39b 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { easily control the volume of all clients, sinks, etc. ''; - homepage = http://freedesktop.org/software/pulseaudio/pavucontrol/; + homepage = "http://freedesktop.org/software/pulseaudio/pavucontrol/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix index 6440f6e787ffa..56f1ec518de01 100644 --- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix +++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A library of PureData classes, bringing some level of compatibility between Max/MSP and Pd environments"; - homepage = http://puredata.info/downloads/cyclone; + homepage = "http://puredata.info/downloads/cyclone"; license = stdenv.lib.licenses.tcltk; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index 6c7a4b03ef59d..be5a385d3088f 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { description = "Time domain pitch tracker for Pure Data"; - homepage = http://www.katjaas.nl/helmholtz/helmholtz.html; + homepage = "http://www.katjaas.nl/helmholtz/helmholtz.html"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix index 21ba375200bc6..aec793c4ee8ad 100644 --- a/pkgs/applications/audio/pd-plugins/maxlib/default.nix +++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A library of non-tilde externals for puredata, by Miller Puckette"; - homepage = http://puredata.info/downloads/maxlib; + homepage = "http://puredata.info/downloads/maxlib"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix index 028a4667cb2da..cefee430ad5ff 100644 --- a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix +++ b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { meta = { description = "A collection of Pd objectclasses for OSC-messages"; - homepage = http://puredata.info/downloads/osc; + homepage = "http://puredata.info/downloads/osc"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix index c214d3fcf4050..7a5014664d556 100644 --- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Set of externals to facilitate the use of sensors within Pure Data and to create complex relations between input and output of a dynamic system"; - homepage = http://www.chnry.net/ch/?090-Pure-Mapping&lang=en; + homepage = "http://www.chnry.net/ch/?090-Pure-Mapping&lang=en"; license = stdenv.lib.licenses.gpl1; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/applications/audio/pd-plugins/timbreid/default.nix index fa9660fbbf61a..e68610a022691 100644 --- a/pkgs/applications/audio/pd-plugins/timbreid/default.nix +++ b/pkgs/applications/audio/pd-plugins/timbreid/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "A collection of audio feature analysis externals for puredata"; - homepage = http://williambrent.conflations.com/pages/research.html; + homepage = "http://williambrent.conflations.com/pages/research.html"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix index cc307417c061f..4f82690813627 100644 --- a/pkgs/applications/audio/pd-plugins/zexy/default.nix +++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "The swiss army knife for puredata"; - homepage = http://puredata.info/downloads/zexy; + homepage = "http://puredata.info/downloads/zexy"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index 8bbeffb1f7a32..322eba2b9521a 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MIDI controllable audio sampler"; longDescription = "a fork of Specimen"; - homepage = http://petri-foo.sourceforge.net; + homepage = "http://petri-foo.sourceforge.net"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 811952f845ff9..28173d34b78d1 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, libao, json_c, libgcrypt, ffmpeg, curl }: stdenv.mkDerivation rec { - name = "pianobar-2019.02.14"; + name = "pianobar-2020.04.05"; src = fetchurl { url = "http://6xq.net/projects/pianobar/${name}.tar.bz2"; - sha256 = "07z21vmlqpmvb3294r384iqbx972rwcx6chrdlkfv4hlnc9h7gf0"; + sha256 = "1034f9ilj9xjw12d6n4vadhl5jzrx0jv8gq1w0rg9hfc55mkn5vc"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix index bbf64a4325b09..4832fce1e9626 100644 --- a/pkgs/applications/audio/pianobooster/default.nix +++ b/pkgs/applications/audio/pianobooster/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A MIDI file player that teaches you how to play the piano"; - homepage = https://github.com/captnfab/PianoBooster; + homepage = "https://github.com/captnfab/PianoBooster"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu orivej ]; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 5830e1eefb88c..dc06134c910ff 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -12,13 +12,13 @@ let ; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "0xalg4dvaqb396h4s6gzxnplgv1lcvsczmmrlhyrj0kfj10amhsj"; + sha256 = "sha256-rJbpoPjNMlw4diWjwNQ/DPo3rltvISU4kuRqBbvlBZ0="; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 20a6e928cefbd..6c3ffebc8c955 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Pandora Internet Radio player for GNOME"; - homepage = https://pithos.github.io/; + homepage = "https://pithos.github.io/"; license = licenses.gpl3; maintainers = with maintainers; [ obadz ]; }; diff --git a/pkgs/applications/audio/playbar2/default.nix b/pkgs/applications/audio/playbar2/default.nix index 8c21dc8f2ad71..15385e91927c6 100644 --- a/pkgs/applications/audio/playbar2/default.nix +++ b/pkgs/applications/audio/playbar2/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mpris2 Client for Plasma5"; - homepage = https://github.com/audoban/PlayBar2; + homepage = "https://github.com/audoban/PlayBar2"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ pjones ]; diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix index f444ad6cb3236..3c852cf450e93 100644 --- a/pkgs/applications/audio/plugin-torture/default.nix +++ b/pkgs/applications/audio/plugin-torture/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/cth103/plugin-torture; + homepage = "https://github.com/cth103/plugin-torture"; description = "A tool to test LADSPA and LV2 plugins"; license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/applications/audio/pmidi/default.nix index f9b3fbae21370..0da86ca9bd1a7 100644 --- a/pkgs/applications/audio/pmidi/default.nix +++ b/pkgs/applications/audio/pmidi/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ alsaLib ]; meta = with stdenv.lib; { - homepage = http://www.parabola.me.uk/alsa/pmidi.html; + homepage = "http://www.parabola.me.uk/alsa/pmidi.html"; description = "A straightforward command line program to play midi files through the ALSA sequencer"; maintainers = with maintainers; [ lheckemann ]; license = licenses.gpl2; diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix new file mode 100644 index 0000000000000..270d51840d788 --- /dev/null +++ b/pkgs/applications/audio/polyphone/default.nix @@ -0,0 +1,49 @@ +{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: + +mkDerivation rec { + version = "2.2.0"; + pname = "polyphone"; + + src = fetchFromGitHub { + owner = "davy7125"; + repo = "polyphone"; + rev = version; + sha256 = "0w5pidzhpwpggjn5la384fvjzkvprvrnidb06068whci11kgpbp7"; + }; + + buildInputs = [ + alsaLib + libjack2 + portaudio + libogg + flac + libvorbis + rtmidi + qtsvg + ]; + + nativeBuildInputs = [ qmake pkgconfig ]; + + preConfigure = '' + cd ./sources/ + ''; + + installPhase = '' + install -d $out/bin + install -m755 bin/polyphone $out/bin/ + ''; + + qmakeFlags = [ + "DEFINES+=USE_LOCAL_STK" + "DEFINES+=USE_LOCAL_QCUSTOMPLOT" + "INCLUDEPATH+=${libjack2}/include/jack" + ]; + + meta = with stdenv.lib; { + description = "A soundfont editor for creating musical instruments"; + homepage = "https://www.polyphone-soundfonts.com/"; + license = licenses.gpl3; + maintainers = [ maintainers.maxdamantus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/ponymix/default.nix b/pkgs/applications/audio/ponymix/default.nix index 6d168ec566187..6c289a97384f7 100644 --- a/pkgs/applications/audio/ponymix/default.nix +++ b/pkgs/applications/audio/ponymix/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CLI PulseAudio Volume Control"; - homepage = https://github.com/falconindy/ponymix; + homepage = "https://github.com/falconindy/ponymix"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ericsagnes ]; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 9414f4211d7a2..2fb8e30a64d8b 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Doing phonetics by computer"; - homepage = http://www.fon.hum.uva.nl/praat/; + homepage = "http://www.fon.hum.uva.nl/praat/"; license = stdenv.lib.licenses.gpl2Plus; # Has some 3rd-party code in it though platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix index 347774010ae1f..205a3ad287e93 100644 --- a/pkgs/applications/audio/projectm/default.nix +++ b/pkgs/applications/audio/projectm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "Music Visualizer"; - homepage = http://projectm.sourceforge.net/; + homepage = "http://projectm.sourceforge.net/"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { }; patch_gcc6 = fetchpatch { - url = https://raw.githubusercontent.com/gentoo/gentoo/45abd63abc6644b6e177c057b5b42d894dbf8e29/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch; + url = "https://raw.githubusercontent.com/gentoo/gentoo/45abd63abc6644b6e177c057b5b42d894dbf8e29/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch"; sha256 = "1i50scxv1jlqvb3jm3sql89a7wqckxhlpvnhz20vvmm1kii6lrsn"; }; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 2f21e3ea56b6f..c500463425668 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.07"; + version = "1.16"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "0g2bp9n05ng2fvqw86pb941zamcqnfz1l066wvh5j3av1w22khi8"; + sha256 = "0rbjphhyca71j22lbyx53w3n2mkdw7xflks2knfaziwdkqcfcvp2"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 3a6cd298557f8..a0813fa0c8018 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -29,7 +29,7 @@ python2Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "An audio tag editor similar to the Windows program, Mp3tag"; - homepage = https://docs.puddletag.net; + homepage = "https://docs.puddletag.net"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/applications/audio/pulseaudio-ctl/default.nix index 6b7d242e1f6d0..125dafc132e07 100644 --- a/pkgs/applications/audio/pulseaudio-ctl/default.nix +++ b/pkgs/applications/audio/pulseaudio-ctl/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Control pulseaudio volume from the shell or mapped to keyboard shortcuts. No need for alsa-utils."; - homepage = https://bbs.archlinux.org/viewtopic.php?id=124513; + homepage = "https://bbs.archlinux.org/viewtopic.php?id=124513"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix index 328bd8b0b041b..efe39aa1600ee 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pure python implementation of multicast DNS service discovery"; - homepage = https://github.com/jstasiak/python-zeroconf; + homepage = "https://github.com/jstasiak/python-zeroconf"; license = licenses.lgpl21; maintainers = [ ]; }; diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index b8082c12c644e..2511cf0f20a54 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/EHfive/pulseaudio-modules-bt; + homepage = "https://github.com/EHfive/pulseaudio-modules-bt"; description = "LDAC, aptX, aptX HD, AAC codecs (A2DP Audio) support for Linux PulseAudio"; platforms = platforms.linux; license = licenses.mit; diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 82dd0223bc806..eaedcb426b818 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -99,9 +99,14 @@ in stdenv.mkDerivation rec { ) ''; + # Meson is no longer able to pick up Boost automatically. + # https://github.com/NixOS/nixpkgs/issues/86131 + BOOST_INCLUDEDIR = "${stdenv.lib.getDev boost}/include"; + BOOST_LIBRARYDIR = "${stdenv.lib.getLib boost}/lib"; + meta = with stdenv.lib; { description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications"; - homepage = https://github.com/wwmm/pulseeffects; + homepage = "https://github.com/wwmm/pulseeffects"; license = licenses.gpl3; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 5886a465409a1..4b221cd1a76bf 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "puredata"; - version = "0.49-0"; + version = "0.50-2"; src = fetchurl { url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz"; - sha256 = "18rzqbpgnnvyslap7k0ly87aw1bbxkb0rk5agpr423ibs9slxq6j"; + sha256 = "0dz6r6jy0zfs1xy1xspnrxxks8kddi9c7pxz4vpg2ygwv83ghpg5"; }; nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''A real-time graphical programming environment for audio, video, and graphical processing''; - homepage = http://puredata.info; + homepage = "http://puredata.info"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 753f6fe8206e3..87666940c151d 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, mkDerivation, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: mkDerivation rec { - version = "0.6.1"; + version = "0.6.2"; pname = "qjackctl"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${pname}-${version}.tar.gz"; - sha256 = "09y0s43ypcghnvzsz89mi1qs5bsvn4hpb98lqxmwwsy0ikcv3hny"; + sha256 = "1rjhdyp0wzhlqr4cn80rh1qhby998cpqv81j1bbb9hfsiq77viqy"; }; buildInputs = [ @@ -26,7 +26,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "A Qt application to control the JACK sound server daemon"; - homepage = http://qjackctl.sourceforge.net/; + homepage = "http://qjackctl.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 2b79818543f81..479a8a2bb04f5 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,12 +1,12 @@ { mkDerivation, lib, fetchurl, pkgconfig, qtbase, qttools, alsaLib, libjack2 }: mkDerivation rec { - version = "0.6.1"; + version = "0.6.2"; pname = "qmidinet"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz"; - sha256 = "1nvbvx3wg2s6s7r4x6m2pm9nx7pdz00ghw9h10wfqi2s474mwip0"; + sha256 = "0siqzyhwg3l9av7jbca3bqdww7xspjlpi9ya4mkj211xc3a3a1d6"; }; hardeningDisable = [ "format" ]; @@ -17,7 +17,7 @@ mkDerivation rec { meta = with lib; { description = "A MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network"; - homepage = http://qmidinet.sourceforge.net/; + homepage = "http://qmidinet.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 6cc731710b7f2..509c95ad54572 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. mkDerivation rec { - name = "qmmp-1.3.7"; + name = "qmmp-1.4.0"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "13mk8p7bfl3fkavpqyhpcxkxb8a4f5d4qc1lasyf7wls3ghrdag7"; + sha256 = "13rhnk55d44svksl13w23w2qkfpkq4mc0jy5mi89nzqkzshwvfd8"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -59,6 +59,6 @@ mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; - repositories.svn = http://qmmp.googlecode.com/svn/; + repositories.svn = "http://qmmp.googlecode.com/svn/"; }; } diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index 33411002c23be..1f65b37483814 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.linuxsampler.org; + homepage = "http://www.linuxsampler.org"; description = "Graphical frontend to LinuxSampler"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 29f5704c73025..5da8f4cd46264 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "qsynth"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz"; - sha256 = "12jhfan81a10vbqfky5nmam3lk6d0i4654mm192v68q5r867xmcl"; + sha256 = "0cp6vrqrj37rv3a7qfvqrg64j7zwpfj60y5b83mlkzvmg1sgjnlv"; }; nativeBuildInputs = [ autoconf pkgconfig ]; @@ -19,7 +19,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Fluidsynth GUI"; - homepage = https://sourceforge.net/projects/qsynth; + homepage = "https://sourceforge.net/projects/qsynth"; license = licenses.gpl2Plus; maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 8cb9f8dccb849..344927bce774c 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "qtractor"; - version = "0.9.12"; + version = "0.9.13"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "06493sf4hr178jkvric3rmc2phh1ph2jlyh8kl9z248amq3zfnhy"; + sha256 = "1hwxdjlzsf1z6xl82s4bdfxa2bfisklrfx361zbzskmg9iymw1gy"; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Audio/MIDI multi-track sequencer"; - homepage = http://qtractor.sourceforge.net; + homepage = "http://qtractor.sourceforge.net"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/qtscrobbler/default.nix b/pkgs/applications/audio/qtscrobbler/default.nix index 68e8e6402acf5..5b84989a7c41f 100644 --- a/pkgs/applications/audio/qtscrobbler/default.nix +++ b/pkgs/applications/audio/qtscrobbler/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { It is able to gather this information from Apple iPods or DAPs running the Rockbox replacement firmware. ''; - homepage = http://qtscrob.sourceforge.net; + homepage = "http://qtscrob.sourceforge.net"; license = licenses.gpl2; maintainers = [ maintainers.vanzef ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 597cf68f4d09e..704e20cc8c563 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -74,6 +74,6 @@ python3.pkgs.buildPythonApplication rec { ''; maintainers = with maintainers; [ coroa sauyon ]; - homepage = https://quodlibet.readthedocs.io/en/latest/; + homepage = "https://quodlibet.readthedocs.io/en/latest/"; }; } diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index a64e407b39b88..014906594a7d5 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An internet radio player for linux"; - homepage = https://github.com/ebruck/radiotray-ng; + homepage = "https://github.com/ebruck/radiotray-ng"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix index 36302458a75b0..4548f9ba624fa 100644 --- a/pkgs/applications/audio/rakarrack/default.nix +++ b/pkgs/applications/audio/rakarrack/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi-effects processor emulating a guitar effects pedalboard"; - homepage = http://rakarrack.sourceforge.net; + homepage = "http://rakarrack.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 236c42b529305..9de70d83ee5ef 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, autoPatchelfHook, makeWrapper -, alsaLib, xorg +, alsaLib, xorg, libjack2 , gtk3, pango, gdk-pixbuf, cairo, glib, freetype , libpulseaudio, xdg_utils }: stdenv.mkDerivation rec { pname = "reaper"; - version = "5.987"; + version = "6.10"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "040k5inzj7mmi75fc6hr0ym18y5xss1675bl5rmhn4sq535m289k"; + sha256 = "1p54phmsa6xbqxb5cpgwnz7ny4famb8zi25y3cmxwgr4pfy94b2p"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { rm $out/opt/REAPER/uninstall-reaper.sh wrapProgram $out/opt/REAPER/reaper \ - --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libpulseaudio libjack2 ]}" mkdir $out/bin ln -s $out/opt/REAPER/reaper $out/bin/ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Digital audio workstation"; - homepage = https://www.reaper.fm/; + homepage = "https://www.reaper.fm/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 2fb1943e0e577..1cbd5b3afa28f 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = { description = "Modern tracker-based DAW"; - homepage = https://www.renoise.com/; + homepage = "https://www.renoise.com/"; license = licenses.unfree; maintainers = []; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix index 59a8b6ec8c492..7a0a8a59a084e 100644 --- a/pkgs/applications/audio/rhvoice/default.nix +++ b/pkgs/applications/audio/rhvoice/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation { meta = { description = "A free and open source speech synthesizer for Russian language and others"; - homepage = https://github.com/Olga-Yakovleva/RHVoice/wiki; + homepage = "https://github.com/Olga-Yakovleva/RHVoice/wiki"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ berce ]; platforms = with lib.platforms; all; diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index b6bff79fa03a1..79560451e540c 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Rhythmbox; + homepage = "https://wiki.gnome.org/Apps/Rhythmbox"; description = "A music playing application for GNOME"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix index 0ff23102e7552..59979c4108386 100644 --- a/pkgs/applications/audio/rkrlv2/default.nix +++ b/pkgs/applications/audio/rkrlv2/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Rakarrak effects ported to LV2"; - homepage = https://github.com/ssj71/rkrlv2; + homepage = "https://github.com/ssj71/rkrlv2"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.joelmo ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/rofi-mpd/default.nix b/pkgs/applications/audio/rofi-mpd/default.nix index ef57466ec84fa..8f9819bd913b8 100644 --- a/pkgs/applications/audio/rofi-mpd/default.nix +++ b/pkgs/applications/audio/rofi-mpd/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "rofi-mpd"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "JakeStanger"; repo = "Rofi_MPD"; rev = "v${version}"; - sha256 = "1b0y8706mmrxhiyz8g6znisllc35j8g7sz8gfjll9svysjmvb6lc"; + sha256 = "0jabyn6gqh8ychn2a06xws3avz0lqdnx3qvqkavfd2xr6sp2q7lg"; }; propagatedBuildInputs = with python3Packages; [ mutagen mpd2 toml appdirs ]; diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 3d9342f16caa5..921c8fff67a19 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://www.rosegardenmusic.com/; + homepage = "https://www.rosegardenmusic.com/"; description = "Music composition and editing environment"; longDescription = '' Rosegarden is a music composition and editing environment based around diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index f902b2dd41b0e..7f6762958a346 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -1,30 +1,29 @@ -{ stdenv, fetchurl, alsaLib, python, SDL }: +{ stdenv, fetchFromGitHub +, autoreconfHook +, alsaLib, python, SDL }: stdenv.mkDerivation rec { - version = "20120105"; pname = "schismtracker"; + version = "20200412"; - src = fetchurl { - url = "http://schismtracker.org/dl/${pname}-${version}.tar.bz2"; - sha256 = "1ny7wv2wxm1av299wvpskall6438wjjpadphmqc7c0h6d0zg5kii"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "1n6cgjiw3vkv7a1h1nki5syyjxjb6icknr9s049w2jrag10bxssn"; }; - preConfigure = '' - # Build fails on Linux with windres. - export ac_cv_prog_ac_ct_WINDRES= - ''; - configureFlags = [ "--enable-dependency-tracking" ]; - buildInputs = [ alsaLib python SDL ]; + nativeBuildInputs = [ autoreconfHook python ]; - enableParallelBuilding = true; + buildInputs = [ SDL ] ++ stdenv.lib.optional stdenv.isLinux alsaLib; - meta = { + meta = with stdenv.lib; { description = "Music tracker application, free reimplementation of Impulse Tracker"; - homepage = http://schismtracker.org/; - license = stdenv.lib.licenses.gpl2; - platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; + homepage = "http://schismtracker.org/"; + license = licenses.gpl2; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ ftrvxmtrx ]; }; } diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index 9bab024f021e5..c8347d70b1d93 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Minimal loop based midi sequencer"; - homepage = http://www.filter24.org/seq24; + homepage = "http://www.filter24.org/seq24"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index d785d37806580..acec8c54e53c3 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub , cmake, libjack2, libsndfile }: +{ stdenv, fetchFromGitHub , cmake, libjack2, libsndfile, pkgconfig }: stdenv.mkDerivation rec { pname = "sfizz"; - version = "unstable-2020-01-24"; + version = "0.3.2"; src = fetchFromGitHub { owner = "sfztools"; repo = pname; - rev = "b9c332777853cb35faeeda2ff4bf34ea7121ffb9"; - sha256 = "0wzgwpcwal5a7ifrm1hx8y6vx832qixk9ilp8wkjnsdxj6i88p2c"; + rev = version; + sha256 = "1px22x9lb6wyqfbv1jg1sbl1rsnwrzs8sm4dnas1w4ifchiv3ymd"; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libjack2 libsndfile ]; diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/applications/audio/shntool/default.nix index e3bfc60a40a5f..de18f3c2ce8d3 100644 --- a/pkgs/applications/audio/shntool/default.nix +++ b/pkgs/applications/audio/shntool/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "shntool"; src = fetchurl { - url = http://www.etree.org/shnutils/shntool/dist/src/shntool-3.0.10.tar.gz; + url = "http://www.etree.org/shnutils/shntool/dist/src/shntool-3.0.10.tar.gz"; sha256 = "00i1rbjaaws3drkhiczaign3lnbhr161b7rbnjr8z83w8yn2wc3l"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Multi-purpose WAVE data processing and reporting utility"; - homepage = http://www.etree.org/shnutils/shntool/; + homepage = "http://www.etree.org/shnutils/shntool/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ jcumming ]; diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index aff8c173d9f2b..b0a50bbf128e9 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A SID player using libsidplayfp"; - homepage = https://sourceforge.net/projects/sidplay-residfp/; + homepage = "https://sourceforge.net/projects/sidplay-residfp/"; license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ dezgeg ]; platforms = with platforms; linux; diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index f95655f5e9a35..07215fc42f87f 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple audio oscilloscope with variable time scale, triggering, cursors and numeric readout in LV2 plugin format"; - homepage = http://x42.github.io/sisco.lv2/; + homepage = "http://x42.github.io/sisco.lv2/"; license = licenses.gpl2; maintainers = [ maintainers.e-user ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 21a36cecbe549..531a633f05da9 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Synchronous multi-room audio player"; - homepage = https://github.com/badaix/snapcast; + homepage = "https://github.com/badaix/snapcast"; maintainers = with maintainers; [ fpletz ]; license = licenses.gpl3; }; diff --git a/pkgs/applications/audio/sndpeek/default.nix b/pkgs/applications/audio/sndpeek/default.nix index 376aadc7385b6..d239fda11aee4 100644 --- a/pkgs/applications/audio/sndpeek/default.nix +++ b/pkgs/applications/audio/sndpeek/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { * available on MacOS X, Linux, and Windows under GPL * part of the sndtools distribution. ''; - homepage = https://soundlab.cs.princeton.edu/software/sndpeek/; + homepage = "https://soundlab.cs.princeton.edu/software/sndpeek/"; license = licenses.gpl2; maintainers = [ maintainers.laikq ]; }; diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index b9293fe27294b..68eefadf41108 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -61,7 +61,7 @@ in buildPythonApplication rec { - Commandline control - Available in 24 languages ''; - homepage = https://www.nongnu.org/sonata/; + homepage = "https://www.nongnu.org/sonata/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.rvl ]; diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix index 93b4c2dade4d8..b837eb07cf1be 100644 --- a/pkgs/applications/audio/sonic-lineup/default.nix +++ b/pkgs/applications/audio/sonic-lineup/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Comparative visualisation of related audio recordings"; - homepage = https://www.sonicvisualiser.org/sonic-lineup/; + homepage = "https://www.sonicvisualiser.org/sonic-lineup/"; license = licenses.gpl2Plus; maintainers = [ maintainers.vandenoever ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index f7803098066d2..e8b6a4d4313b8 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "View and analyse contents of music audio files"; - homepage = https://www.sonicvisualiser.org/; + homepage = "https://www.sonicvisualiser.org/"; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu maintainers.marcweber ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index 768b40a113883..e7a43ad8a5954 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -1,17 +1,32 @@ -{ stdenv, fetchFromGitHub, liblo, libxml2, libjack2, libsndfile, wxGTK, libsigcxx -, libsamplerate, rubberband, pkgconfig, libtool, gettext, ncurses, which +{ stdenv +, fetchFromGitHub , autoreconfHook +, pkgconfig +, which +, libtool +, liblo +, libxml2 +, libjack2 +, libsndfile +, wxGTK30 +, libsigcxx +, libsamplerate +, rubberband +, gettext +, ncurses +, alsaLib +, fftw }: stdenv.mkDerivation rec { - pname = "sooperlooper-git"; - version = "2016-07-19"; + pname = "sooperlooper"; + version = "unstable-2019-09-30"; src = fetchFromGitHub { owner = "essej"; repo = "sooperlooper"; - rev = "3bdfe184cd59b51c757b8048536abc1146fb0de4"; - sha256 = "0qz25h4idv79m97ici2kzx72fwzks3lysyksk3p3rx72lsijhf3g"; + rev = "4d1da14176e16b0f56b727bb1e6c2e8957515625"; + sha256 = "1gsgqa7hdymzw2al1ymzv0f33y161dyhh3fmy88lpjwv3bfchamg"; }; autoreconfPhase = '' @@ -22,11 +37,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig which libtool ]; buildInputs = [ - liblo libxml2 libjack2 libsndfile wxGTK libsigcxx - libsamplerate rubberband gettext ncurses + liblo + libxml2 + libjack2 + libsndfile + wxGTK30 + libsigcxx + libsamplerate + rubberband + gettext + ncurses + alsaLib + fftw ]; - meta = { + meta = with stdenv.lib; { description = "A live looping sampler capable of immediate loop recording, overdubbing, multiplying, reversing and more"; longDescription = '' It allows for multiple simultaneous multi-channel loops limited only by your computer's available memory. @@ -35,11 +60,9 @@ stdenv.mkDerivation rec { However, this kind of live performance looping tool is most effectively used via hardware (midi footpedals, etc) and the engine can be run standalone on a computer without a monitor. ''; - - version = version; - homepage = http://essej.net/sooperlooper/index.html; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + homepage = "http://essej.net/sooperlooper/"; # https is broken + license = licenses.gpl2; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix index 5d8ae0928c907..7601f942868fc 100644 --- a/pkgs/applications/audio/sorcer/default.nix +++ b/pkgs/applications/audio/sorcer/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://openavproductions.com/sorcer/; + homepage = "http://openavproductions.com/sorcer/"; description = "A wavetable LV2 plugin synth, targeted at the electronic / dubstep genre"; license = licenses.gpl3; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 20c8a83676ef0..dcad0cec1e81a 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec{ meta = with stdenv.lib; { description = "A Gnome CD Ripper"; - homepage = https://wiki.gnome.org/Apps/SoundJuicer; + homepage = "https://wiki.gnome.org/Apps/SoundJuicer"; maintainers = [ maintainers.bdimcheff ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index 5b5f01eef5cc8..741211bd90d7b 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { version = "2016-11-03"; src = fetchgit { - url = https://github.com/SoundScapeRenderer/ssr; + url = "https://github.com/SoundScapeRenderer/ssr"; rev = "0dd0136dd24e47b63d8a4e05de467f5c7b047ec9"; sha256 = "095x2spv9bmg6pi71mpajnghbqj58ziflg16f9854awx0qp9d8x7"; }; @@ -45,7 +45,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://spatialaudio.net/ssr/; + homepage = "http://spatialaudio.net/ssr/"; description = "The SoundScape Renderer (SSR) is a tool for real-time spatial audio reproduction"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.fridh ]; diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix index a4f48aa0c21c8..d8209dad02de6 100644 --- a/pkgs/applications/audio/spectmorph/default.nix +++ b/pkgs/applications/audio/spectmorph/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Allows to analyze samples of musical instruments, and to combine them (morphing) to construct hybrid sounds"; - homepage = http://spectmorph.org; + homepage = "http://spectmorph.org"; license = licenses.gpl3; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix index 4c1682b1e0b8f..35534750d0c6c 100644 --- a/pkgs/applications/audio/spectrojack/default.nix +++ b/pkgs/applications/audio/spectrojack/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A little spectrogram/audiogram/sonogram/whatever for JACK"; - homepage = http://sed.free.fr/spectrojack; + homepage = "http://sed.free.fr/spectrojack"; license = stdenv.lib.licenses.publicDomain; maintainers = with stdenv.lib.maintainers; [ sleexyz ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/applications/audio/speech-denoiser/default.nix index 6598d24fb07a5..706a6956c5d25 100644 --- a/pkgs/applications/audio/speech-denoiser/default.nix +++ b/pkgs/applications/audio/speech-denoiser/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Speech denoise lv2 plugin based on RNNoise library"; - homepage = https://github.com/lucianodato/speech-denoiser; + homepage = "https://github.com/lucianodato/speech-denoiser"; license = licenses.lgpl3; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix index f4922e388c46f..88b22c59ae508 100644 --- a/pkgs/applications/audio/spek/default.nix +++ b/pkgs/applications/audio/spek/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Analyse your audio files by showing their spectrogram"; - homepage = http://spek.cc/; + homepage = "http://spek.cc/"; license = licenses.gpl3; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/audio/split2flac/default.nix b/pkgs/applications/audio/split2flac/default.nix index 3c9565df9199b..efad434e30796 100644 --- a/pkgs/applications/audio/split2flac/default.nix +++ b/pkgs/applications/audio/split2flac/default.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Split flac/ape/wv/wav + cue sheet into separate tracks"; - homepage = https://github.com/ftrvxmtrx/split2flac; + homepage = "https://github.com/ftrvxmtrx/split2flac"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index 65dfc50fe1b11..91acab353892b 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -2,25 +2,25 @@ rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.17.1"; + version = "0.19.0"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "1gsddjinxmglm05hhphclax08d9pig1f0wjjs3bbcq096fydxgfs"; + sha256 = "1bdcfkfbvvn262p4j0nb4kvjzzgrvn3kxlif48yipqkkykzsgz6g"; }; - cargoSha256 = "1y398ypckk3gw1sfzf97xzwf5d5z3kxlcpn3bccmsfr59kvkf661"; + cargoSha256 = "13v2ilmfs9468kavlx6wrsp0dscppxbxgygwpdd35p5hq3vnhl7k"; - nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; - buildInputs = [ openssl ] - ++ stdenv.lib.optional stdenv.isLinux libxcb + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig python3 ]; + buildInputs = [ ] + ++ stdenv.lib.optionals stdenv.isLinux [ openssl libxcb ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; meta = with stdenv.lib; { description = "Spotify for the terminal written in Rust"; - homepage = https://github.com/Rigellute/spotify-tui; + homepage = "https://github.com/Rigellute/spotify-tui"; changelog = "https://github.com/Rigellute/spotify-tui/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jwijenbergh ]; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index eb2055ec7c195..245d96dee0184 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.spotify.com/; + homepage = "https://www.spotify.com/"; description = "Play music from the Spotify music service"; license = licenses.unfree; maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau ma27 ]; diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 263fe986df317..121f9cbc960f8 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -2,6 +2,9 @@ , withALSA ? true, alsaLib ? null , withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null +, withMpris ? false +, withKeyring ? false +, dbus ? null }: rustPlatform.buildRustPackage rec { @@ -20,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--no-default-features" "--features" - "${stdenv.lib.optionalString withALSA "alsa_backend,"}${stdenv.lib.optionalString withPulseAudio "pulseaudio_backend,"}${stdenv.lib.optionalString withPortAudio "portaudio_backend,"}" + "${stdenv.lib.optionalString withALSA "alsa_backend,"}${stdenv.lib.optionalString withPulseAudio "pulseaudio_backend,"}${stdenv.lib.optionalString withPortAudio "portaudio_backend,"}${stdenv.lib.optionalString withMpris "dbus_mpris,"}${stdenv.lib.optionalString withKeyring "dbus_keyring,"}" ]; nativeBuildInputs = [ pkgconfig ]; @@ -28,7 +31,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optional withALSA alsaLib ++ stdenv.lib.optional withPulseAudio libpulseaudio - ++ stdenv.lib.optional withPortAudio portaudio; + ++ stdenv.lib.optional withPortAudio portaudio + ++ stdenv.lib.optional (withMpris || withKeyring) dbus; doCheck = false; diff --git a/pkgs/applications/audio/spotifywm/default.nix b/pkgs/applications/audio/spotifywm/default.nix index 2380c8e5d9edc..a51e82f29c4bc 100644 --- a/pkgs/applications/audio/spotifywm/default.nix +++ b/pkgs/applications/audio/spotifywm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/dasJ/spotifywm; + homepage = "https://github.com/dasJ/spotifywm"; description = "Wrapper around Spotify that correctly sets class name before opening the window"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index ce0153e9f26ea..de135706ad3f8 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Lightweight headless squeezebox client emulator"; - homepage = https://github.com/ralph-irving/squeezelite; + homepage = "https://github.com/ralph-irving/squeezelite"; license = with licenses; [ gpl3 ] ++ optional dsdSupport bsd2; maintainers = with maintainers; [ samdoshi ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/squishyball/default.nix b/pkgs/applications/audio/squishyball/default.nix index 496ce779ffb57..e6dd48018e745 100644 --- a/pkgs/applications/audio/squishyball/default.nix +++ b/pkgs/applications/audio/squishyball/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { comparisons of groups of up to ten samples; this is the default mode of operation. ''; - homepage = https://svn.xiph.org/trunk/squishyball; + homepage = "https://svn.xiph.org/trunk/squishyball"; license = licenses.gpl2Plus; maintainers = with maintainers; [ michalrus ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/applications/audio/ssrc/default.nix index 1247bbc19f976..9d519e14147b2 100644 --- a/pkgs/applications/audio/ssrc/default.nix +++ b/pkgs/applications/audio/ssrc/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; version = version; - homepage = http://shibatch.sourceforge.net/; + homepage = "http://shibatch.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ leenaars]; platforms = with platforms; [ linux ] ; diff --git a/pkgs/applications/audio/stone-phaser/default.nix b/pkgs/applications/audio/stone-phaser/default.nix index 6e64ebc7fb3e9..d36b28df978a7 100644 --- a/pkgs/applications/audio/stone-phaser/default.nix +++ b/pkgs/applications/audio/stone-phaser/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/jpcima/stone-phaser; + homepage = "https://github.com/jpcima/stone-phaser"; description = "A classic analog phaser effect, made with DPF and Faust"; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index ad5685f71b024..dce73c3867077 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -35,13 +35,13 @@ mkDerivation rec { pname = "strawberry"; - version = "0.6.8"; + version = "0.6.10"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "0jc1m1855dg3f1i1p744c5s42ssmjs61znw4cf28ifamw1nbr1r5"; + sha256 = "0qf510hlxbndqzwq62mdzfclqxr3caf1a34kd770k84x8vrb4pld"; }; buildInputs = [ diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix index efa87a2f72cca..1411fe59b30fd 100644 --- a/pkgs/applications/audio/streamripper/default.nix +++ b/pkgs/applications/audio/streamripper/default.nix @@ -13,9 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ glib libogg libvorbis libmad ]; meta = with stdenv.lib; { - homepage = http://streamripper.sourceforge.net/; + homepage = "http://streamripper.sourceforge.net/"; description = "Application that lets you record streaming mp3 to your hard drive"; license = licenses.gpl2; - maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix index 3e9fe4725afd4..0f8e514388304 100644 --- a/pkgs/applications/audio/svox/default.nix +++ b/pkgs/applications/audio/svox/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Text-to-speech engine"; - homepage = https://android.googlesource.com/platform/external/svox; + homepage = "https://android.googlesource.com/platform/external/svox"; platforms = platforms.linux; license = licenses.asl20; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix index b59752d7cc3e5..02499d54476f1 100644 --- a/pkgs/applications/audio/swh-lv2/default.nix +++ b/pkgs/applications/audio/swh-lv2/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installPhase = "make install-system"; meta = with stdenv.lib; { - homepage = http://plugin.org.uk; + homepage = "http://plugin.org.uk"; description = "LV2 version of Steve Harris' SWH plugins"; longDescription = '' SWH plugins include: diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 6339dad7f3783..c7e936d28e508 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "synthv1"; - version = "0.9.13"; + version = "0.9.14"; src = fetchurl { url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz"; - sha256 = "0bb48myvgvqcibwm68qhd4852pjr2g19rasf059a799d1hzgfq3l"; + sha256 = "08n83krkak20924flb9azhm9hn40lyfvn29m63zs3lw3wajf0b40"; }; buildInputs = [ qtbase qttools libjack2 alsaLib liblo lv2 ]; diff --git a/pkgs/applications/audio/tambura/default.nix b/pkgs/applications/audio/tambura/default.nix index 030bb2c01a72b..96f9bb7053e0b 100644 --- a/pkgs/applications/audio/tambura/default.nix +++ b/pkgs/applications/audio/tambura/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A FAUST patch inspired by the Indian Tambura/Tanpura - a four string drone instrument, known for its unique rich harmonic timbre"; - homepage = https://github.com/olilarkin/Tambura; + homepage = "https://github.com/olilarkin/Tambura"; license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix index 40362fdd49688..8780e54bb7c33 100644 --- a/pkgs/applications/audio/tetraproc/default.nix +++ b/pkgs/applications/audio/tetraproc/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Converts the A-format signals from a tetrahedral Ambisonic microphone into B-format signals ready for recording"; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/"; license = licenses.gpl2; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix index 3564f875c9b45..8be43346bc04d 100644 --- a/pkgs/applications/audio/timemachine/default.nix +++ b/pkgs/applications/audio/timemachine/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "JACK audio recorder"; - homepage = http://plugin.org.uk/timemachine/; + homepage = "http://plugin.org.uk/timemachine/"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/pkgs/applications/audio/tony/default.nix b/pkgs/applications/audio/tony/default.nix index 92cab9b5b8dee..011d802536477 100644 --- a/pkgs/applications/audio/tony/default.nix +++ b/pkgs/applications/audio/tony/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pitch and note annotation of unaccompanied melody"; - homepage = https://www.sonicvisualiser.org/tony/; + homepage = "https://www.sonicvisualiser.org/tony/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/transcode/default.nix b/pkgs/applications/audio/transcode/default.nix index d7d5b65375e9b..c7ee3914f25cc 100644 --- a/pkgs/applications/audio/transcode/default.nix +++ b/pkgs/applications/audio/transcode/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Suite of command line utilities for transcoding video and audio codecs, and for converting between different container formats"; - homepage = http://www.transcoding.org/; + homepage = "http://www.transcoding.org/"; license = licenses.lgpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix index 8eb846ac9c56d..d9469fa4b7ae7 100644 --- a/pkgs/applications/audio/transcribe/default.nix +++ b/pkgs/applications/audio/transcribe/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { has many transcription-specific features not found on conventional music players. ''; - homepage = https://www.seventhstring.com/xscribe/; + homepage = "https://www.seventhstring.com/xscribe/"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ michalrus ]; diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix index 504e6ae96447e..63ba44bec35aa 100644 --- a/pkgs/applications/audio/traverso/default.nix +++ b/pkgs/applications/audio/traverso/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, cmake, pkgconfig +{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig , alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio , libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack }: -stdenv.mkDerivation { +mkDerivation { pname = "traverso"; version = "0.49.6"; diff --git a/pkgs/applications/audio/tree-from-tags/default.nix b/pkgs/applications/audio/tree-from-tags/default.nix index 521133cb08fca..3b25b4218f19f 100644 --- a/pkgs/applications/audio/tree-from-tags/default.nix +++ b/pkgs/applications/audio/tree-from-tags/default.nix @@ -30,7 +30,7 @@ EOF meta = with stdenv.lib; { description = "Create file hierarchies from media tags"; - homepage = https://www.emacswiki.org/emacs/Bongo; + homepage = "https://www.emacswiki.org/emacs/Bongo"; platforms = ruby.meta.platforms; maintainers = [ maintainers.livnev maintainers.dbrock ]; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix index 844eea11f5144..9130461e4d728 100644 --- a/pkgs/applications/audio/uade123/default.nix +++ b/pkgs/applications/audio/uade123/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Plays old Amiga tunes through UAE emulation and cloned m68k-assembler Eagleplayer API"; - homepage = http://zakalwe.fi/uade/; + homepage = "http://zakalwe.fi/uade/"; license = licenses.gpl2; maintainers = [ stdenv.lib.maintainers.gnidorah ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 21aa27fa5bc11..2aa09ec0be818 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -93,7 +93,7 @@ with stdenv.lib; stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source virtual modular synthesizer"; - homepage = https://vcvrack.com/; + homepage = "https://vcvrack.com/"; # The source is BSD-3 licensed, some of the art is CC-BY-NC 4.0 or under a # no-derivatives clause license = with licenses; [ bsd3 cc-by-nc-40 unfreeRedistributable ]; diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index 7f02ea9cefec0..bcbfa6d3874f4 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A vi/vim inspired client for the Music Player Daemon (mpd)"; - homepage = https://github.com/boysetsfrog/vimpc; + homepage = "https://github.com/boysetsfrog/vimpc"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/applications/audio/vkeybd/default.nix index 3f77a6574724f..0e8f12823d1e4 100644 --- a/pkgs/applications/audio/vkeybd/default.nix +++ b/pkgs/applications/audio/vkeybd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Virtual MIDI keyboard"; - homepage = https://www.alsa-project.org/~tiwai/alsa.html; + homepage = "https://www.alsa-project.org/~tiwai/alsa.html"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index 8b94450f8bda6..6ef992ffff670 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { longDescription = '' Vocal is a powerful, fast, and intuitive application that helps users find new podcasts, manage their libraries, and enjoy the best that indepedent audio and video publishing has to offer. Vocal features full support for both episode downloading and streaming, native system integration, iTunes store search and top 100 charts (with international results support), iTunes link parsing, OPML importing and exporting, and so much more. Plus, it has great smart features like automatically keeping your library clean from old files, and the ability to set custom skip intervals. ''; - homepage = https://github.com/needle-and-thread/vocal; + homepage = "https://github.com/needle-and-thread/vocal"; license = licenses.gpl3Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 44d322069fc27..2270e56e62ac3 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation { name = "vorbis-tools-1.4.0"; src = fetchurl { - url = http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz; + url = "http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz"; sha256 = "1g12bnh5ah08v529y72kfdz5lhvy75iaz7f9jskyby23m9dkk2d3"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation { A set of command-line tools to manipulate Ogg Vorbis audio files, notably the `ogg123' player and the `oggenc' encoder. ''; - homepage = https://xiph.org/vorbis/; + homepage = "https://xiph.org/vorbis/"; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/pkgs/applications/audio/waon/default.nix b/pkgs/applications/audio/waon/default.nix index b27fdbffb7d68..bc05547e641d2 100644 --- a/pkgs/applications/audio/waon/default.nix +++ b/pkgs/applications/audio/waon/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Wave-to-Notes transcriber"; - homepage = https://kichiki.github.io/WaoN/; + homepage = "https://kichiki.github.io/WaoN/"; license = licenses.gpl2; maintainers = [ maintainers.puckipedia ]; platforms = platforms.all; diff --git a/pkgs/applications/audio/wavegain/default.nix b/pkgs/applications/audio/wavegain/default.nix index 5f56fb7297f47..d9b13f532735e 100644 --- a/pkgs/applications/audio/wavegain/default.nix +++ b/pkgs/applications/audio/wavegain/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "ReplayGain for wave files"; - homepage = https://github.com/MestreLion/wavegain; + homepage = "https://github.com/MestreLion/wavegain"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.robbinch ]; diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index ff278d4d7f233..5cbc9a07b6c77 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/whipper-team/whipper; + homepage = "https://github.com/whipper-team/whipper"; description = "A CD ripper aiming for accuracy over speed"; maintainers = with maintainers; [ rycee emily ]; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/applications/audio/wolf-shaper/default.nix index 13bf1d674c7c4..7d42a3c4e7bf9 100644 --- a/pkgs/applications/audio/wolf-shaper/default.nix +++ b/pkgs/applications/audio/wolf-shaper/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://pdesaulniers.github.io/wolf-shaper/; + homepage = "https://pdesaulniers.github.io/wolf-shaper/"; description = "Waveshaper plugin with spline-based graph editor"; license = licenses.gpl3; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/applications/audio/x42-avldrums/default.nix index b34062672f9af..fb05a50b4e594 100644 --- a/pkgs/applications/audio/x42-avldrums/default.nix +++ b/pkgs/applications/audio/x42-avldrums/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Drum sample player LV2 plugin dedicated to Glen MacArthur's AVLdrums"; - homepage = https://x42-plugins.com/x42/x42-avldrums; + homepage = "https://x42-plugins.com/x42/x42-avldrums"; maintainers = with maintainers; [ magnetophon orivej ]; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/audio/x42-gmsynth/default.nix b/pkgs/applications/audio/x42-gmsynth/default.nix index 33d61eeb35f6c..7a96e3fd4f2f8 100644 --- a/pkgs/applications/audio/x42-gmsynth/default.nix +++ b/pkgs/applications/audio/x42-gmsynth/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Chris Colins' General User soundfont player LV2 plugin"; - homepage = https://x42-plugins.com/x42/x42-gmsynth; + homepage = "https://x42-plugins.com/x42/x42-gmsynth"; maintainers = with maintainers; [ orivej ]; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index f4087506daa32..20f87725f9912 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20200114"; + version = "20200411"; pname = "x42-plugins"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - sha256 = "02f8wnsl9wg7pgf4sshr0hdjfjkwln870ffgjmb01nqk37v7hiyn"; + sha256 = "0y6778l2zc80kvp31mqw3vkcyi7g613jxn3g3lxqfa31i617gh6j"; }; nativeBuildInputs = [ pkgconfig ]; @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { patchPhase = '' patchShebangs ./stepseq.lv2/gridgen.sh - patchShebangs ./matrixmixer.lv2/genttl.sh #TODO: remove at next update, see https://github.com/x42/matrixmixer.lv2/issues/2 - patchShebangs ./matrixmixer.lv2/genhead.sh #TODO: remove at next update, see https://github.com/x42/matrixmixer.lv2/issues/2 + patchShebangs ./matrixmixer.lv2/genttl.sh + patchShebangs ./matrixmixer.lv2/genhead.sh sed -i 's|/usr/include/zita-convolver.h|${zita-convolver}/include/zita-convolver.h|g' ./convoLV2/Makefile ''; meta = with stdenv.lib; { description = "Collection of LV2 plugins by Robin Gareus"; - homepage = https://github.com/x42/x42-plugins; + homepage = "https://github.com/x42/x42-plugins"; maintainers = with maintainers; [ magnetophon ]; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/applications/audio/yasr/default.nix index c8902f1dda4be..68423197f3c8b 100644 --- a/pkgs/applications/audio/yasr/default.nix +++ b/pkgs/applications/audio/yasr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; # taken from the debian yasr package meta = { - homepage = http://yasr.sourceforge.net; + homepage = "http://yasr.sourceforge.net"; description = "A general-purpose console screen reader"; longDescription = "Yasr is a general-purpose console screen reader for GNU/Linux and other Unix-like operating systems."; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index 7976f7477171f..8f86d6e7ba93d 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake mpd_clientlib openssl ]; meta = { - homepage = https://www.ympd.org; + homepage = "https://www.ympd.org"; description = "Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS"; maintainers = [ stdenv.lib.maintainers.siddharthist ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 40691be1a0c9d..f8ea58fef3ce7 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ZynAddSubFX along with very good Jack and Alsa midi/audio functionality on Linux ''; - homepage = http://yoshimi.sourceforge.net; + homepage = "http://yoshimi.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index b9645fa4d8af1..a34773513d933 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.zamaudio.com/?p=976; + homepage = "http://www.zamaudio.com/?p=976"; description = "A collection of LV2/LADSPA/VST/JACK audio plugins by ZamAudio"; license = licenses.gpl2Plus; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/zita-ajbridge/default.nix b/pkgs/applications/audio/zita-ajbridge/default.nix index 6904952afea67..ad2ea53e9f7e1 100644 --- a/pkgs/applications/audio/zita-ajbridge/default.nix +++ b/pkgs/applications/audio/zita-ajbridge/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, alsaLib, libjack2, zita-alsa-pcmi, zita-resampler }: stdenv.mkDerivation rec { - name = "zita-ajbridge-0.8.2"; + name = "zita-ajbridge-0.8.4"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; - sha256 = "1gvk6g6w9rsiib89l0i9myl2cxxfzmcpbg9wdypq6b27l9s5k64j"; + sha256 = "0g5v0l0zmqh049mhv62n8s5bpm0yrlby7mkxxhs5qwadp8v4w9mw"; }; buildInputs = [ alsaLib libjack2 zita-alsa-pcmi zita-resampler ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Connect additional ALSA devices to JACK"; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/index.html"; license = licenses.gpl3Plus; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/zita-at1/default.nix b/pkgs/applications/audio/zita-at1/default.nix index c91edf34c826f..d357febd882e3 100644 --- a/pkgs/applications/audio/zita-at1/default.nix +++ b/pkgs/applications/audio/zita-at1/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Autotuner Jack application to correct the pitch of vocal tracks"; - homepage = https://kokkinizita.linuxaudio.org/linuxaudio/index.html; + homepage = "https://kokkinizita.linuxaudio.org/linuxaudio/index.html"; license = licenses.gpl3Plus; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/zita-njbridge/default.nix b/pkgs/applications/audio/zita-njbridge/default.nix index 1ec6946cf38c3..3a293cfc026f4 100644 --- a/pkgs/applications/audio/zita-njbridge/default.nix +++ b/pkgs/applications/audio/zita-njbridge/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "command line Jack clients to transmit full quality multichannel audio over a local IP network"; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/index.html"; license = licenses.gpl3; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index e22bf9ed653a4..9a432f73d3f04 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High quality software synthesizer"; - homepage = http://zynaddsubfx.sourceforge.net; + homepage = "http://zynaddsubfx.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.goibhniu maintainers.nico202 ]; diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix index d02aa4b8444f6..b4d644430dd19 100644 --- a/pkgs/applications/backup/areca/default.nix +++ b/pkgs/applications/backup/areca/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.areca-backup.org/; + homepage = "http://www.areca-backup.org/"; description = "An Open Source personal backup solution"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/blockchains/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix index db9e68ae90504..5e0c25466ebef 100644 --- a/pkgs/applications/blockchains/aeon/default.nix +++ b/pkgs/applications/blockchains/aeon/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Private, secure, untraceable currency"; - homepage = http://www.aeon.cash/; + homepage = "http://www.aeon.cash/"; license = licenses.bsd3; maintainers = [ maintainers.aij ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index afc5b40f9db5b..aee73cecdfc71 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.21.3"; + version = "0.21.5"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1pzdgghbsss2qjfgl42lvkbs5yc5q6jnzqnp24lljmrh341g2zn4"; + sha256 = "1jx33n8dhn16iaxvmc56cxw0i5qk0ga5nf7qf9frwwq6zkglknga"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/pkgs/applications/blockchains/bitcoin-classic.nix b/pkgs/applications/blockchains/bitcoin-classic.nix index ddce5c3f71503..01c1264567ce7 100644 --- a/pkgs/applications/blockchains/bitcoin-classic.nix +++ b/pkgs/applications/blockchains/bitcoin-classic.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { will continue to release updates that are in line with Satoshi’s whitepaper & vision, and are agreed upon by the community. ''; - homepage = https://bitcoinclassic.com/; + homepage = "https://bitcoinclassic.com/"; maintainers = with maintainers; [ jefdaj ]; license = licenses.mit; broken = stdenv.isDarwin; diff --git a/pkgs/applications/blockchains/bitcoin-unlimited.nix b/pkgs/applications/blockchains/bitcoin-unlimited.nix index c0d51e66db334..f755efaa0e124 100644 --- a/pkgs/applications/blockchains/bitcoin-unlimited.nix +++ b/pkgs/applications/blockchains/bitcoin-unlimited.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { support Bitcoin conflict resolution as originally envisioned by its founder - consider running a Bitcoin Unlimited client. ''; - homepage = https://www.bitcoinunlimited.info/; + homepage = "https://www.bitcoinunlimited.info/"; maintainers = with maintainers; [ DmitryTsygankov ]; license = licenses.mit; broken = stdenv.isDarwin; diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index c1143f898e285..450102da66f31 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -5,7 +5,7 @@ with stdenv.lib; let - version = "0.19.0.1"; + version = "0.19.1"; majorMinorVersion = versions.majorMinor version; desktop = fetchurl { @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "7ac9f972249a0a16ed01352ca2a199a5448fe87a4ea74923404a40b4086de284"; + sha256 = "f2591d555b8e8c2e1bd780e40d53a91e165d8b3c7e0391ae2d24a0c0f23a7cc0"; }; nativeBuildInputs = @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. ''; - homepage = http://www.bitcoin.org/; + homepage = "https://bitcoin.org/"; maintainers = with maintainers; [ roconnor AndersonTorres ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix index 0add60cc19e46..6777e5998cefb 100644 --- a/pkgs/applications/blockchains/clightning.nix +++ b/pkgs/applications/blockchains/clightning.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "clightning"; - version = "0.8.1"; + version = "0.8.2.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "079d3yx7yr7qrilqgaayvn18lxl8h6a1gwwbsgm5xsyxj4vdlz7r"; + sha256 = "02incjr59fv75q6hlrln9h4b5gq7ipd778scbz8b8dahj7x1a6i5"; }; enableParallelBuilding = true; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { Bitcoin, enabling secure and instant transfer of funds between any two parties for any amount. ''; - homepage = https://github.com/ElementsProject/lightning; + homepage = "https://github.com/ElementsProject/lightning"; maintainers = with maintainers; [ jb55 ]; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/blockchains/cryptop/default.nix b/pkgs/applications/blockchains/cryptop/default.nix index 01c47b320de58..f0bcda5793013 100644 --- a/pkgs/applications/blockchains/cryptop/default.nix +++ b/pkgs/applications/blockchains/cryptop/default.nix @@ -15,7 +15,7 @@ buildPythonApplication rec { doCheck = false; meta = { - homepage = https://github.com/huwwp/cryptop; + homepage = "https://github.com/huwwp/cryptop"; description = "Command line Cryptocurrency Portfolio"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ bhipple ]; diff --git a/pkgs/applications/blockchains/dashpay.nix b/pkgs/applications/blockchains/dashpay.nix index 03dcd6cb54e6d..d0c3fed4350ba 100644 --- a/pkgs/applications/blockchains/dashpay.nix +++ b/pkgs/applications/blockchains/dashpay.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { with instant transactions. It allows you to keep your finances private as you make transactions without waits, similar to cash. ''; - homepage = https://www.dash.org; + homepage = "https://www.dash.org"; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/blockchains/dcrwallet.nix b/pkgs/applications/blockchains/dcrwallet.nix index 163ed2615d33e..258aad8e1bd98 100644 --- a/pkgs/applications/blockchains/dcrwallet.nix +++ b/pkgs/applications/blockchains/dcrwallet.nix @@ -29,8 +29,8 @@ buildGoPackage rec { ''; installPhase = '' - mkdir -pv $bin/bin - cp -v dcrwallet $bin/bin + mkdir -pv $out/bin + cp -v dcrwallet $out/bin ''; diff --git a/pkgs/applications/blockchains/dogecoin.nix b/pkgs/applications/blockchains/dogecoin.nix index 02744e50647ea..b1ebebdd213a1 100644 --- a/pkgs/applications/blockchains/dogecoin.nix +++ b/pkgs/applications/blockchains/dogecoin.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { internet currency." It is named after a famous Internet meme, the "Doge" - a Shiba Inu dog. ''; - homepage = http://www.dogecoin.com/; + homepage = "http://www.dogecoin.com/"; license = licenses.mit; maintainers = with maintainers; [ edwtjo offline AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/blockchains/freicoin.nix b/pkgs/applications/blockchains/freicoin.nix index 6cf84f76f919c..cc28fff96c47a 100644 --- a/pkgs/applications/blockchains/freicoin.nix +++ b/pkgs/applications/blockchains/freicoin.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Peer-to-peer currency with demurrage fee"; - homepage = http://freicoi.in/; + homepage = "http://freicoi.in/"; license = licenses.mit; maintainers = [ maintainers.viric ]; platforms = platforms.linux; diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 980b485b95680..690731fa12011 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -2,18 +2,33 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.12"; + version = "1.9.14"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "143imiphyzk3009cfnqj7q013pb1wva13zq63byfj3d204b58cg6"; + sha256 = "0vqsx4q7jn6vhmrm9kkk810d5nvnmyb6bni38ynkxcwlrp3qs6v2"; }; - modSha256 = "15a8if5gx361nrqgv201jy8saq1ir1g18rpqzdmavg4ic75si5x1"; + usb = fetchFromGitHub { + owner = "karalabe"; + repo = "usb"; + rev = "911d15fe12a9c411cf5d0dd5635231c759399bed"; + sha256 = "0asd5fz2rhzkjmd8wjgmla5qmqyz4jaa6qf0n2ycia16jsck6wc2"; + }; + + vendorSha256 = "01mbmc8qlp08127dlmcqz0viasmg7mrzqzmyw21an69sabcr112n"; + + overrideModAttrs = (_: { + postBuild = '' + cp -r --reflink=auto ${usb}/libusb vendor/github.com/karalabe/usb + cp -r --reflink=auto ${usb}/hidapi vendor/github.com/karalabe/usb + ''; + }); subPackages = [ + "cmd/abidump" "cmd/abigen" "cmd/bootnode" "cmd/checkpoint-admin" diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index edc68f9d0c7ad..1c76ef8df284b 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.1.0"; + version = "2.3.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "1ywvdqmq8asczhmvc6ai2v6di1f5q19x3ygqlinwz8d1hrj3496r"; + sha256 = "0xd3w564zij614ajg57n1qlvz0hd9l7219qxx81ai6b02b9a5g9h"; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/litecoin.nix b/pkgs/applications/blockchains/litecoin.nix index 470772665413f..ec1658b595d39 100644 --- a/pkgs/applications/blockchains/litecoin.nix +++ b/pkgs/applications/blockchains/litecoin.nix @@ -46,7 +46,7 @@ mkDerivation rec { the regular computers and GPUs most people already have. The Litecoin network is scheduled to produce 84 million currency units. ''; - homepage = https://litecoin.org/; + homepage = "https://litecoin.org/"; platforms = platforms.unix; license = licenses.mit; broken = stdenv.isDarwin; diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix index dd45746c8df5b..1f249223df58d 100644 --- a/pkgs/applications/blockchains/lnd.nix +++ b/pkgs/applications/blockchains/lnd.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "lnd"; - version = "0.9.0-beta"; + version = "0.10.0-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "1hq105s9ykp6nsn4iicjnl3mwspqkbfsswkx7sgzv3jggg08fkq9"; + sha256 = "1amciz924s2h6qhy7w34jpv1jc25p5ayfxzvjph6hhx0bccrm88w"; }; - modSha256 = "1pvcvpiz6ck8xkgpypchrq9kgkik0jxd7f3jhihbgldsh4zaqiaq"; + vendorSha256 = "1iyghg11cxvbzi0gl40fvv8pl3d3k52j179w3x5m1f09r5ji223y"; + + subPackages = ["cmd/lncli" "cmd/lnd"]; meta = with lib; { description = "Lightning Network Daemon"; @@ -19,4 +21,4 @@ buildGoModule rec { license = lib.licenses.mit; maintainers = with maintainers; [ cypherpunk2140 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/blockchains/mist.nix b/pkgs/applications/blockchains/mist.nix index 2990b44c7f4c1..9dd564d715cc8 100644 --- a/pkgs/applications/blockchains/mist.nix +++ b/pkgs/applications/blockchains/mist.nix @@ -8,7 +8,7 @@ let meta = with stdenv.lib; { description = "Browse and use Ðapps on the Ethereum network"; - homepage = https://github.com/ethereum/mist; + homepage = "https://github.com/ethereum/mist"; license = licenses.gpl3; maintainers = with maintainers; []; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 980e20d04b756..cfd3998ee3686 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -5,7 +5,7 @@ , qtquickcontrols, qtquickcontrols2 , monero, unbound, readline, boost, libunwind , libsodium, pcsclite, zeromq, cppzmq -, hidapi, libusb, protobuf, randomx +, hidapi, libusb-compat-0_1, protobuf, randomx }: with stdenv.lib; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { qtxmlpatterns monero unbound readline boost libunwind libsodium pcsclite zeromq - cppzmq hidapi libusb protobuf randomx + cppzmq hidapi libusb-compat-0_1 protobuf randomx ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ]; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = { description = "Private, secure, untraceable currency"; - homepage = https://getmonero.org/; + homepage = "https://getmonero.org/"; license = licenses.bsd3; platforms = platforms.all; badPlatforms = platforms.darwin; diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index c942197006c4f..d1abd39565702 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -2,7 +2,7 @@ , cmake, pkgconfig , boost, miniupnpc, openssl, unbound, cppzmq , zeromq, pcsclite, readline, libsodium, hidapi -, pythonProtobuf, randomx, rapidjson, libusb +, pythonProtobuf, randomx, rapidjson, libusb-compat-0_1 , CoreData, IOKit, PCSC }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline libsodium hidapi randomx rapidjson - pythonProtobuf libusb + pythonProtobuf libusb-compat-0_1 ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; cmakeFlags = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Private, secure, untraceable currency"; - homepage = https://getmonero.org/; + homepage = "https://getmonero.org/"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ ehmry rnhmjoj ]; diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix index 7d9fdb06d184f..664e26740629a 100644 --- a/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/pkgs/applications/blockchains/nano-wallet/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "Wallet for Nano cryptocurrency"; - homepage = https://nano.org/en/wallet/; + homepage = "https://nano.org/en/wallet/"; license = lib.licenses.bsd2; # Fails on Darwin. See: # https://github.com/NixOS/nixpkgs/pull/39295#issuecomment-386800962 diff --git a/pkgs/applications/blockchains/parity-ui/default.nix b/pkgs/applications/blockchains/parity-ui/default.nix index 0615aed2ca03f..b18c121607abd 100644 --- a/pkgs/applications/blockchains/parity-ui/default.nix +++ b/pkgs/applications/blockchains/parity-ui/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "UI for Parity. Fast, light, robust Ethereum implementation"; - homepage = http://parity.io; + homepage = "http://parity.io"; license = licenses.gpl3; maintainers = [ maintainers.sorpaas ]; platforms = platforms.linux; diff --git a/pkgs/applications/blockchains/parity/default.nix b/pkgs/applications/blockchains/parity/default.nix index e390b78b86df2..a2428ed01ed53 100644 --- a/pkgs/applications/blockchains/parity/default.nix +++ b/pkgs/applications/blockchains/parity/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "parity"; - version = "2.7.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "parity-ethereum"; rev = "v${version}"; - sha256 = "09cvqk0h9c26famh3f1nc3g74cd0zk6klys977yr1f13bgqmzx0x"; + sha256 = "124km8c2d7877yzd885wzlcl3gky15isx0z2l1qg1q3cqdsb5mjf"; }; - cargoSha256 = "1fdymy8hvn137i5y4flyhlxwjxkd2cd6gq81i1429gk7j3h085ig"; + cargoSha256 = "0m4pms7agfyqk6gz6fwxdl8jmcyhphhzh3x4vykbi6186y7a8ihq"; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/particl/particl-core.nix b/pkgs/applications/blockchains/particl/particl-core.nix index 613d57cd9c8c8..f30e9a609808a 100644 --- a/pkgs/applications/blockchains/particl/particl-core.nix +++ b/pkgs/applications/blockchains/particl/particl-core.nix @@ -17,11 +17,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "particl-core"; - version = "0.17.1.2"; + version = "0.19.1.1"; src = fetchurl { url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; - sha256 = "16hcyxwp6yrypwvxz6i2987z3jmpk47xcgnsgh9klih8baqg64p5"; + sha256 = "11y5q2srkh6r2samppjb5mg6hl79y16j2lj1r23p0968vb9c45kl"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { An open source, decentralized privacy platform built for global person to person eCommerce. RPC daemon and CLI client only. ''; - homepage = https://particl.io/; + homepage = "https://particl.io/"; maintainers = with maintainers; [ demyanrogozhin ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix index af8085232e994..600e462b390e2 100644 --- a/pkgs/applications/blockchains/pivx.nix +++ b/pkgs/applications/blockchains/pivx.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { Zero Knowledge cryptography proofs for industry-leading transaction anonymity. ''; license = licenses.mit; - homepage = https://www.dash.org; + homepage = "https://www.dash.org"; maintainers = with maintainers; [ wucke13 ]; platforms = platforms.unix; # TODO diff --git a/pkgs/applications/blockchains/quorum.nix b/pkgs/applications/blockchains/quorum.nix index 49bc0be108ff6..f745860f66126 100644 --- a/pkgs/applications/blockchains/quorum.nix +++ b/pkgs/applications/blockchains/quorum.nix @@ -21,8 +21,8 @@ buildGoPackage rec { ''; installPhase = '' - mkdir -pv $bin/bin - cp -v build/bin/geth build/bin/bootnode build/bin/swarm $bin/bin + mkdir -pv $out/bin + cp -v build/bin/geth build/bin/bootnode build/bin/swarm $out/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/blockchains/stellar-core.nix b/pkgs/applications/blockchains/stellar-core.nix index 4c3f9fe0760bb..6bb717a0344b0 100644 --- a/pkgs/applications/blockchains/stellar-core.nix +++ b/pkgs/applications/blockchains/stellar-core.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation { instances of stellar-core on the network. Optionally, stellar-core can store historical records of the ledger and participate in consensus. ''; - homepage = https://www.stellar.org/; + homepage = "https://www.stellar.org/"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ chris-martin ]; license = licenses.asl20; diff --git a/pkgs/applications/blockchains/vertcoin.nix b/pkgs/applications/blockchains/vertcoin.nix index 1b8b0376331aa..21104012f4d25 100644 --- a/pkgs/applications/blockchains/vertcoin.nix +++ b/pkgs/applications/blockchains/vertcoin.nix @@ -19,7 +19,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "vertcoin"; - version = "0.14.0"; + version = "0.15.0.1"; name = pname + toString (optional (!withGui) "d") + "-" + version; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = pname + "-project"; repo = pname + "-core"; rev = version; - sha256 = "00vnmrhn5mad58dyiz8rxgsrn0663ii6fdbcqm20mv1l313k4882"; + sha256 = "09q7qicw52gv225hq6wlpsf4zr4hjc8miyim5cygi5nxxrlw7kd3"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/wownero.nix b/pkgs/applications/blockchains/wownero.nix index eb813a361251f..1094d7f0f7ba4 100644 --- a/pkgs/applications/blockchains/wownero.nix +++ b/pkgs/applications/blockchains/wownero.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { signatures using different participants for the same tx outputs on opposing forks. ''; - homepage = https://wownero.org/; + homepage = "https://wownero.org/"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ fuwa ]; diff --git a/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix index 6cd2ae018fb6c..526adc715d45a 100644 --- a/pkgs/applications/blockchains/zcash/librustzcash/default.nix +++ b/pkgs/applications/blockchains/zcash/librustzcash/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { installPhase = '' mkdir -p $out/lib - cp target/release/librustzcash.a $out/lib/ + cp $releaseDir/librustzcash.a $out/lib/ mkdir -p $out/include cp librustzcash/include/librustzcash.h $out/include/ ''; diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index 3128f125cd9eb..488ef4cfedd47 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { pname = "lightdm-enso-os-greeter"; src = fetchgit { - url = https://github.com/nick92/Enso-OS; + url = "https://github.com/nick92/Enso-OS"; rev = "ed48330bfd986072bd82ac542ed8f8a7365c6427"; sha256 = "11jm181jq1vbn83h235avpdxz7pqq6prqyzki5yryy53mkj4kgxz"; }; @@ -60,7 +60,7 @@ stdenv.mkDerivation { A fork of pantheon greeter that positions elements in a central and vertigal manner and adds a blur effect to the background ''; - homepage = https://github.com/nick92/Enso-OS; + homepage = "https://github.com/nick92/Enso-OS"; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix index b5b26d7cc4305..256ecd59f4e94 100644 --- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lightdm-mini-greeter"; - version = "0.3.4"; + version = "0.4.0"; src = fetchFromGitHub { owner = "prikhi"; repo = "lightdm-mini-greeter"; rev = version; - sha256 = "1qi0bsqi8z2zv3303ww0kd7bciz6qx8na5bkvgrqlwyvq31czai5"; + sha256 = "10hga7pmfyjdvj4xwm3djwrhk50brcpycj3p3c57pa0vnx4ill3s"; }; nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; @@ -29,9 +29,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A minimal, configurable, single-user GTK3 LightDM greeter"; - homepage = https://github.com/prikhi/lightdm-mini-greeter; + homepage = "https://github.com/prikhi/lightdm-mini-greeter"; license = licenses.gpl3; maintainers = with maintainers; [ mnacamura prikhi ]; platforms = platforms.linux; + changelog = "https://github.com/prikhi/lightdm-mini-greeter/blob/master/CHANGELOG.md"; }; } diff --git a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix index 323df7369368f..7e37d1348749d 100644 --- a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tiny multi user lightdm greeter"; - homepage = https://github.com/off-world/lightdm-tiny-greeter; + homepage = "https://github.com/off-world/lightdm-tiny-greeter"; license = licenses.bsd3; maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index c251af74b2172..1a65ebd33577b 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/CanonicalLtd/lightdm; + homepage = "https://github.com/CanonicalLtd/lightdm"; description = "A cross-desktop display manager"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index be586bdac9bce..ab7dd90801ced 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { }]; meta = with stdenv.lib; { - homepage = https://launchpad.net/lightdm-gtk-greeter; + homepage = "https://launchpad.net/lightdm-gtk-greeter"; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ ocharles ]; diff --git a/pkgs/applications/display-managers/ly/default.nix b/pkgs/applications/display-managers/ly/default.nix index 2f0a770bc71c0..f16dd62bb1a44 100644 --- a/pkgs/applications/display-managers/ly/default.nix +++ b/pkgs/applications/display-managers/ly/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "TUI display manager"; license = licenses.wtfpl; - homepage = https://github.com/cylgom/ly; + homepage = "https://github.com/cylgom/ly"; maintainers = [ maintainers.spacekookie ]; }; } diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 735e83a0842a6..3ebeaa6262b7a 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -60,7 +60,7 @@ in mkDerivation { meta = with lib; { description = "QML based X11 display manager"; - homepage = https://github.com/sddm/sddm; + homepage = "https://github.com/sddm/sddm"; maintainers = with maintainers; [ abbradar ttuegel ]; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/applications/editors/aewan/default.nix index 1bd73bebe03b0..56a144bdfb8d2 100644 --- a/pkgs/applications/editors/aewan/default.nix +++ b/pkgs/applications/editors/aewan/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Ascii-art Editor Without A Name"; - homepage = http://aewan.sourceforge.net/; + homepage = "http://aewan.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index bd1685f7cdbef..1a6904b21768d 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -39,6 +39,7 @@ , nss , pciutils , pkgsi686Linux +, ps , setxkbmap , stdenv , systemd @@ -89,6 +90,7 @@ let # Runtime stuff git + ps ]}" \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ @@ -185,9 +187,16 @@ in runCommand IntelliJ IDEA. ''; homepage = if channel == "stable" - then https://developer.android.com/studio/index.html - else https://developer.android.com/studio/preview/index.html; - license = licenses.asl20; + then "https://developer.android.com/studio/index.html" + else "https://developer.android.com/studio/preview/index.html"; + license = with licenses; [ asl20 unfree ]; # The code is under Apache-2.0, but: + # If one selects Help -> Licenses in Android Studio, the dialog shows the following: + # "Android Studio includes proprietary code subject to separate license, + # including JetBrains CLion(R) (www.jetbrains.com/clion) and IntelliJ(R) + # IDEA Community Edition (www.jetbrains.com/idea)." + # Also: For actual development the Android SDK is required and the Google + # binaries are also distributed as proprietary software (unlike the + # source-code itself). platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ primeos ]; }; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 1134b67a24a67..cd6b46880b444 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -8,19 +8,19 @@ let inherit (gnome2) GConf gnome_vfs; }; stableVersion = { - version = "3.6.2.0"; # "Android Studio 3.6.2" - build = "192.6308749"; - sha256Hash = "04r4iwlmns1lf3wfd32cqmndbdz9rf7hfbi5r6qmvpi8j83fghvr"; + version = "3.6.3.0"; # "Android Studio 3.6.3" + build = "192.6392135"; + sha256Hash = "0apxmp341m7mbpm2df3qvsbaifwy6yqq746kbhbwlw8bn9hrzv1k"; }; betaVersion = { - version = "4.0.0.13"; # "Android Studio 4.0 Beta 4" - build = "193.6348893"; - sha256Hash = "0lchi3l50826n1af1z24yclpf27v2q5p1zjbvcmn37wz46d4s4g2"; + version = "4.0.0.14"; # "Android Studio 4.0 Beta 5" + build = "193.6401094"; + sha256Hash = "11fmpf58z44i78ldkapzivz6md65744vqczzbwv8mkjkv9nz95rs"; }; latestVersion = { # canary & dev - version = "4.1.0.4"; # "Android Studio 4.1 Canary 4" - build = "193.6325121"; - sha256Hash = "19b4a03qfljdisn7cw44qzab85hib000m9mgswzssjh6ylkd9arw"; + version = "4.1.0.8"; # "Android Studio 4.1 Canary 8" + build = "193.6423924"; + sha256Hash = "0ksgmhz9vhkw2mxzjapli0w6203ssd8ddgb0dq06rck8v7ysy8bp"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index 623f86a61c2c6..b3902293718e9 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -11,14 +11,14 @@ let in stdenv.mkDerivation rec { pname = "apostrophe"; - version = "unstable-2020-03-29"; + version = "2.2.0.3"; src = fetchFromGitLab { owner = "somas"; repo = pname; domain = "gitlab.gnome.org"; - rev = "219fa8976e3b8a6f0cea15cfefe4e336423f2bdb"; - sha256 = "192n5qs3x6rx62mqxd6wajwm453pns8kjyz5v3xc891an6bm1kqx"; + rev = "v${version}"; + sha256 = "06bl1hc69ixk2vcb2ig74mwid14sl5zq6rfna7lx9na6j3l04879"; }; nativeBuildInputs = [ meson ninja cmake pkgconfig desktop-file-utils diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 5ba0f9cf237e7..4ba8932fec259 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { passthru = { inherit skia; }; meta = with lib; { - homepage = https://www.aseprite.org/; + homepage = "https://www.aseprite.org/"; description = "Animated sprite editor & pixel art tool"; license = if unfree then licenses.unfree else licenses.gpl2; longDescription = diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 0a7e362e75ad7..fbe08dbfe7b7b 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -74,7 +74,7 @@ let meta = with stdenv.lib; { description = "A hackable text editor for the 21st Century"; - homepage = https://atom.io/; + homepage = "https://atom.io/"; license = licenses.mit; maintainers = with maintainers; [ offline nequissimus ysndr ]; platforms = platforms.x86_64; diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index f78f7fbf91487..c7ac671c15bff 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "bluefish-2.2.10"; + name = "bluefish-2.2.11"; src = fetchurl { url = "mirror://sourceforge/bluefish/${name}.tar.bz2"; - sha256 = "1ciygj79q6i3ga5x1j8aivc05nh6rhhnm7hrq8q8xd9vd4ms3v5g"; + sha256 = "1zy2ppdg3nq9iy3zgfhnw93bq5zbbhyampf7bk3grpfvq5zqfk25"; }; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A powerful editor targeted towards programmers and webdevelopers"; - homepage = http://bluefish.openoffice.nl/; + homepage = "http://bluefish.openoffice.nl/"; license = licenses.gpl3Plus; maintainers = [maintainers.vbgl]; platforms = platforms.all; diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index 439b721632d06..3e01bcdb0f9d5 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "An open source code editor for the web, written in JavaScript, HTML and CSS"; - homepage = http://brackets.io/; + homepage = "http://brackets.io/"; license = licenses.mit; maintainers = [ maintainers.matejc ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix index 2e79b80d6105f..8a61e0252bc3a 100644 --- a/pkgs/applications/editors/bvi/default.nix +++ b/pkgs/applications/editors/bvi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Hex editor with vim style keybindings"; - homepage = http://bvi.sourceforge.net/download.html; + homepage = "http://bvi.sourceforge.net/download.html"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix index 5fab7fe9da620..2cf094c091a6e 100644 --- a/pkgs/applications/editors/bviplus/default.nix +++ b/pkgs/applications/editors/bviplus/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ncurses based hex editor with a vim-like interface"; - homepage = http://bviplus.sourceforge.net; + homepage = "http://bviplus.sourceforge.net"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index cbed08f317fad..4e2ac8a50f14f 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { It is designed to be very extensible and fully configurable. Finally, an IDE with all the features you need, having a consistent look, feel and operation across platforms. ''; - homepage = http://www.codeblocks.org; + homepage = "http://www.codeblocks.org"; license = licenses.gpl3; }; } diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/applications/editors/dhex/default.nix index efb3a2f9ffabb..0a635b7ba82e9 100644 --- a/pkgs/applications/editors/dhex/default.nix +++ b/pkgs/applications/editors/dhex/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A themeable hex editor with diff mode"; - homepage = http://www.dettus.net/dhex/; + homepage = "http://www.dettus.net/dhex/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [qknight]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/applications/editors/dit/default.nix index f973e67599c28..e89267d04c500 100644 --- a/pkgs/applications/editors/dit/default.nix +++ b/pkgs/applications/editors/dit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dit"; - version = "0.6"; + version = "0.7"; src = fetchurl { url = "https://hisham.hm/dit/releases/${version}/${pname}-${version}.tar.gz"; - sha256 = "0ryvm54xxkg2gcgz4r8zdxrl6j2h8mgg9nfqmdmdr31qkcj8wjsq"; + sha256 = "0cmbyzqfz2qa83cg8lpjifn34wmx34c5innw485zh4vk3c0k8wlj"; }; buildInputs = [ ncurses lua ] diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 6ae9eb078e262..8b6a0c164e908 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,5 +1,5 @@ { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender -, zlib, jdk, glib, gtk3, libXtst, gsettings-desktop-schemas, webkitgtk +, zlib, jdk, glib, gtk, libXtst, gsettings-desktop-schemas, webkitgtk , makeWrapper, ... }: { name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - fontconfig freetype glib gsettings-desktop-schemas gtk3 jdk libX11 + fontconfig freetype glib gsettings-desktop-schemas gtk jdk libX11 libXrender libXtst makeWrapper zlib ] ++ stdenv.lib.optional (webkitgtk != null) webkitgtk; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst ] ++ stdenv.lib.optional (webkitgtk != null) webkitgtk)} \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk libXtst ] ++ stdenv.lib.optional (webkitgtk != null) webkitgtk)} \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; # */ meta = { - homepage = http://www.eclipse.org/; + homepage = "http://www.eclipse.org/"; inherit description; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 345f7eae9fc69..66bdfb15c69b7 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXrender, zlib -, glib, gtk3, libXtst, jdk, gsettings-desktop-schemas +, glib, gtk3, gtk2, libXtst, jdk, jdk8, gsettings-desktop-schemas , webkitgtk ? null # for internal web browser , buildEnv, runCommand , callPackage @@ -17,11 +17,12 @@ let year = "2020"; month = "03"; timestamp = "${year}${month}050155"; + gtk = gtk3; in rec { - buildEclipse = import ./build-eclipse.nix { + buildEclipse = callPackage ./build-eclipse.nix { inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib - jdk glib gtk3 libXtst gsettings-desktop-schemas webkitgtk + jdk glib gtk libXtst gsettings-desktop-schemas webkitgtk makeWrapper; }; @@ -63,19 +64,14 @@ in rec { ### Eclipse Scala SDK - eclipse-scala-sdk = buildEclipse { - name = "eclipse-scala-sdk-4.4.1"; - description = "Eclipse IDE for Scala Developers"; - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { # tested - url = https://downloads.typesafe.com/scalaide-pack/4.4.1-vfinal-luna-211-20160504/scala-SDK-4.4.1-vfinal-2.11-linux.gtk.x86_64.tar.gz; - sha256 = "4c2d1ac68384e12a11a851cf0fc7757aea087eba69329b21d539382a65340d27"; - } - else - fetchurl { # untested - url = https://downloads.typesafe.com/scalaide-pack/4.4.1-vfinal-luna-211-20160504/scala-SDK-4.4.1-vfinal-2.11-linux.gtk.x86.tar.gz; - sha256 = "35383cb09567187e14a30c15de9fd9aa0eef99e4bbb342396ce3acd11fb5cbac"; + eclipse-scala-sdk = + buildEclipse.override { jdk = jdk8; gtk = gtk2; } { + name = "eclipse-scala-sdk-4.7.0"; + description = "Eclipse IDE for Scala Developers"; + src = + fetchurl { + url = "https://downloads.typesafe.com/scalaide-pack/4.7.0-vfinal-oxygen-212-20170929/scala-SDK-4.7.0-vfinal-2.12-linux.gtk.x86_64.tar.gz"; + sha256 = "1n5w2a7mh9ajv6fxcas1gpgwb04pdxbr9v5dzr67gsz5bhahq4ya"; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index a60b1a2ae5111..fab7317868a92 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -106,7 +106,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://github.com/tobiasmelcher/EclipseAceJump; + homepage = "https://github.com/tobiasmelcher/EclipseAceJump"; description = "Provides fast jumps to text based on initial letter"; license = licenses.mit; platforms = platforms.all; @@ -153,7 +153,7 @@ rec { meta = with stdenv.lib; { description = "A powerful parser generator for processing structured text or binary files"; - homepage = https://www.antlr.org/; + homepage = "https://www.antlr.org/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.rycee ]; @@ -176,7 +176,7 @@ rec { meta = with stdenv.lib; { description = "A powerful parser generator for processing structured text or binary files"; - homepage = https://www.antlr.org/; + homepage = "https://www.antlr.org/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.rycee ]; @@ -198,7 +198,7 @@ rec { }; meta = with stdenv.lib; { - homepage = http://andrei.gmxhome.de/anyedit/; + homepage = "http://andrei.gmxhome.de/anyedit/"; description = "Adds new tools to the context menu of text-based editors"; license = licenses.epl10; platforms = platforms.all; @@ -221,7 +221,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://github.com/cypher256/eclipse-encoding-plugin; + homepage = "https://github.com/cypher256/eclipse-encoding-plugin"; description = "Show file encoding and line ending for the active editor in the eclipse status bar"; license = licenses.epl10; platforms = platforms.all; @@ -244,7 +244,7 @@ rec { }; meta = with stdenv.lib; { - homepage = http://andrei.gmxhome.de/bytecode/; + homepage = "http://andrei.gmxhome.de/bytecode/"; description = "Shows disassembled bytecode of current java editor or class file"; license = licenses.bsd2; platforms = platforms.all; @@ -263,7 +263,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://eclipse.org/cdt/; + homepage = "https://eclipse.org/cdt/"; description = "C/C++ development tooling"; license = licenses.epl10; platforms = platforms.all; @@ -282,7 +282,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://eclipse-cs.sourceforge.net/; + homepage = "https://eclipse-cs.sourceforge.net/"; description = "Checkstyle integration into the Eclipse IDE"; license = licenses.lgpl21; platforms = platforms.all; @@ -306,7 +306,7 @@ rec { }; meta = with stdenv.lib; { - homepage = http://eclipsecolorthemes.org/; + homepage = "http://eclipsecolorthemes.org/"; description = "Plugin to switch color themes conveniently and without side effects"; license = licenses.epl10; platforms = platforms.all; @@ -339,7 +339,7 @@ rec { propagatedBuildInputs = [ zest ]; meta = with stdenv.lib; { - homepage = http://www2.cs.tum.edu/projects/cup/eclipse.php; + homepage = "http://www2.cs.tum.edu/projects/cup/eclipse.php"; description = "IDE for developing CUP based parsers"; platforms = platforms.all; maintainers = [ maintainers.romildo ]; @@ -367,7 +367,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://www.drools.org/; + homepage = "https://www.drools.org/"; description = "Drools is a Business Rules Management System (BRMS) solution"; license = licenses.asl20; }; @@ -384,7 +384,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://www.eclemma.org/; + homepage = "https://www.eclemma.org/"; description = "EclEmma is a free Java code coverage tool for Eclipse"; license = licenses.epl10; platforms = platforms.all; @@ -407,7 +407,7 @@ rec { }; meta = with stdenv.lib; { - homepage = http://findbugs.sourceforge.net/; + homepage = "http://findbugs.sourceforge.net/"; description = "Plugin that uses static analysis to look for bugs in Java code"; license = licenses.epl10; platforms = platforms.all; @@ -426,7 +426,7 @@ rec { }; meta = with stdenv.lib; { - homepage = http://gnuarmeclipse.livius.net/; + homepage = "http://gnuarmeclipse.livius.net/"; description = "GNU ARM Eclipse Plug-ins"; license = licenses.epl10; platforms = platforms.all; @@ -465,7 +465,7 @@ rec { meta = with stdenv.lib; { description = "Adds support for JSON files to Eclipse"; - homepage = https://github.com/boothen/Json-Eclipse-Plugin; + homepage = "https://github.com/boothen/Json-Eclipse-Plugin"; license = licenses.epl10; platforms = platforms.all; maintainers = [ maintainers.rycee ]; @@ -483,7 +483,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://www.eclipse.org/jdt/; + homepage = "https://www.eclipse.org/jdt/"; description = "Eclipse Java development tools"; license = licenses.epl10; platforms = platforms.all; @@ -506,7 +506,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://github.com/angelozerr/jdt-codemining; + homepage = "https://github.com/angelozerr/jdt-codemining"; description = "Provides JDT Java CodeMining"; license = licenses.epl10; platforms = platforms.all; @@ -532,7 +532,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://github.com/RustDT; + homepage = "https://github.com/RustDT"; description = "Rust development tooling"; license = licenses.epl10; platforms = platforms.all; @@ -549,7 +549,7 @@ rec { }; meta = with stdenv.lib; { - homepage = http://scala-ide.org/; + homepage = "http://scala-ide.org/"; description = "The Scala IDE for Eclipse"; license = licenses.bsd3; platforms = platforms.all; @@ -568,7 +568,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://spotbugs.github.io/; + homepage = "https://spotbugs.github.io/"; description = "Plugin that uses static analysis to look for bugs in Java code"; license = licenses.lgpl21; platforms = platforms.all; @@ -591,7 +591,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://testng.org/doc/; + homepage = "https://testng.org/doc/"; description = "Eclipse plugin for the TestNG testing framework"; license = licenses.asl20; platforms = platforms.all; @@ -636,7 +636,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://github.com/oyse/yedit; + homepage = "https://github.com/oyse/yedit"; description = "A YAML editor plugin for Eclipse"; license = licenses.epl10; platforms = platforms.all; @@ -654,7 +654,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://www.eclipse.org/gef/zest/; + homepage = "https://www.eclipse.org/gef/zest/"; description = "The Eclipse Visualization Toolkit"; platforms = platforms.all; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/applications/editors/edit/default.nix index 27c13c0cb3968..052206002610e 100644 --- a/pkgs/applications/editors/edit/default.nix +++ b/pkgs/applications/editors/edit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "20160425"; src = fetchgit { - url = git://c9x.me/ed.git; + url = "git://c9x.me/ed.git"; rev = "323d49b68c5e804ed3b8cada0e2274f1589b3484"; sha256 = "0wv8i3ii7cd9bqhjpahwp2g5fcmyk365nc7ncmvl79cxbz3f7y8v"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A relaxing mix of Vi and ACME"; - homepage = http://c9x.me/edit; + homepage = "http://c9x.me/edit"; license = licenses.publicDomain; maintainers = [ maintainers.vrthra ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix index 4b7e4c8a3ca43..3a6c8c97b2219 100644 --- a/pkgs/applications/editors/elvis/default.nix +++ b/pkgs/applications/editors/elvis/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { configureFlags = [ "--ioctl=termios" ]; meta = { - homepage = http://elvis.vi-editor.org/; + homepage = "http://elvis.vi-editor.org/"; description = "A vi clone for Unix and other operating systems"; license = stdenv.lib.licenses.free; }; diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs-modes/cedet/default.nix index 5fbe095c4f355..45f20fccad904 100644 --- a/pkgs/applications/editors/emacs-modes/cedet/default.nix +++ b/pkgs/applications/editors/emacs-modes/cedet/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - homepage = http://cedet.sourceforge.net/; + homepage = "http://cedet.sourceforge.net/"; # Fails with `semantic-idle.el:42:1:Error: Invalid function: class-p` broken = true; diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix index 33f2ad79ea0c8..ba54e5f434129 100644 --- a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix +++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Precision colors for machines and people"; - homepage = http://ethanschoonover.com/solarized; + homepage = "http://ethanschoonover.com/solarized"; maintainers = [ maintainers.samuelrivas ]; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 9ae07c1c900c8..b1b33dc9354b4 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -39,10 +39,10 @@ elpaBuild { pname = "ada-mode"; ename = "ada-mode"; - version = "7.0.1"; + version = "7.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-7.0.1.tar"; - sha256 = "0iqninv4wf4ap8axk9m0gi39j3kq4jpbpdc8hczd34xrp83ml46a"; + url = "https://elpa.gnu.org/packages/ada-mode-7.1.1.tar"; + sha256 = "11ch0dn478ddzkcjcyqf2rjim7w0fjb8xfijqxxi07847w4gkklp"; }; packageRequires = [ emacs uniquify-files wisi ]; meta = { @@ -223,10 +223,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "12.2.0"; + version = "12.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-12.2.0.tar"; - sha256 = "0j919l3q5sq6h1k1kmk4kyv0vkzl4f98fxcd64v34x5q1ahjhg48"; + url = "https://elpa.gnu.org/packages/auctex-12.2.1.tar"; + sha256 = "14y0kdri2zvz81qwpncsr3ly4ciqab6g8yxl956k3ddn36b3a56s"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -685,10 +685,10 @@ elpaBuild { pname = "darkroom"; ename = "darkroom"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/darkroom-0.2.el"; - sha256 = "1a528brhz4vckhp77n2c1phkyqdliykpj9kzk3f834f4rwnb5mp0"; + url = "https://elpa.gnu.org/packages/darkroom-0.3.el"; + sha256 = "0l1xg5kqmjw22k78qnsln0ifx2dx74xxqj0qp8xxcpqvzzx0xh86"; }; packageRequires = [ cl-lib ]; meta = { @@ -925,10 +925,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.6.13"; + version = "0.6.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.6.13.tar"; - sha256 = "1nxbp7w4xxij07q8manc15b896sl10yh2h1cg88prdqbw1wk62qr"; + url = "https://elpa.gnu.org/packages/ebdb-0.6.17.tar"; + sha256 = "07335pcqvvj1apzbwy4dc4i6pc6w21hr7v9fvgkc9c2x7fqlqg24"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -1005,10 +1005,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.5"; + version = "1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eglot-1.5.tar"; - sha256 = "00ifgz9r9xvy19zsz1yfls6n1acvms14p86nbw0x6ldjgvpf279i"; + url = "https://elpa.gnu.org/packages/eglot-1.6.tar"; + sha256 = "15hd6sx7qrpvlvhwwkcgdiki8pswwf4mm7hkm0xvznskfcp44spx"; }; packageRequires = [ emacs flymake jsonrpc ]; meta = { @@ -1036,6 +1036,21 @@ license = lib.licenses.free; }; }) {}; + eldoc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "eldoc"; + ename = "eldoc"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/eldoc-1.0.0.el"; + sha256 = "0jdqnndvpz929rbfgrm2bgw3z2vp7dvvgk3wnhvlhf63mdiza89m"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/eldoc.html"; + license = lib.licenses.free; + }; + }) {}; eldoc-eval = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "eldoc-eval"; @@ -1367,10 +1382,10 @@ elpaBuild { pname = "gnorb"; ename = "gnorb"; - version = "1.6.5"; + version = "1.6.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.6.5.tar"; - sha256 = "1har3j8gb65mawrwn93939jg157wbap138qa1z1myznrrish6vzc"; + url = "https://elpa.gnu.org/packages/gnorb-1.6.7.tar"; + sha256 = "17pz6i51z298rk7j3rraw1gxlssn88yi4bbpzyxv9cs7y1lfy8ld"; }; packageRequires = [ cl-lib ]; meta = { @@ -1378,6 +1393,21 @@ license = lib.licenses.free; }; }) {}; + gnu-elpa = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "gnu-elpa"; + ename = "gnu-elpa"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gnu-elpa-1.1.tar"; + sha256 = "0b0law1xwwqa42wb09b3w73psq2kx16lkiwxjxl0sshjcmarhv8r"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/gnu-elpa.html"; + license = lib.licenses.free; + }; + }) {}; gnu-elpa-keyring-update = callPackage ({ elpaBuild , fetchurl , lib }: @@ -1419,10 +1449,10 @@ elpaBuild { pname = "gnus-mock"; ename = "gnus-mock"; - version = "0.4.4"; + version = "0.4.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnus-mock-0.4.4.tar"; - sha256 = "0v94z800f1y3ylbgbrw4nslqm7j2jr592g402nxgj9rlldazzxg0"; + url = "https://elpa.gnu.org/packages/gnus-mock-0.4.5.tar"; + sha256 = "1hfh315vrxd54r2f1wpdfk06b7lhpab7knygav58vdwwdbndlqiz"; }; packageRequires = []; meta = { @@ -1696,10 +1726,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.9"; + version = "1.0.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jsonrpc-1.0.9.el"; - sha256 = "1ncsdv9pr2zsfa9mxm4n68fppnkpm410mh72r7h5f8yj17lz00ss"; + url = "https://elpa.gnu.org/packages/jsonrpc-1.0.11.el"; + sha256 = "04cy1mqd6y8k5lcpg076szjk9av9345mmsnzzh6vgbcw3dcgbr23"; }; packageRequires = [ emacs ]; meta = { @@ -1981,10 +2011,10 @@ elpaBuild { pname = "minimap"; ename = "minimap"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/minimap-1.2.el"; - sha256 = "1vcxdxy7mv8mi4lrri3kmyf9kly3rb02z4kpfx5d1xv493havvb8"; + url = "https://elpa.gnu.org/packages/minimap-1.3.el"; + sha256 = "15azlmi6kk9pg1c4zrw952qsh9wq6ggqb4qqc84a7l67nhqb9bqp"; }; packageRequires = []; meta = { @@ -2011,10 +2041,10 @@ elpaBuild { pname = "modus-operandi-theme"; ename = "modus-operandi-theme"; - version = "0.6.0"; + version = "0.8.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.6.0.el"; - sha256 = "10smvzaxp90lsg0g61s2nzmfxwnlrxq9dv4rn771vlhra249y08v"; + url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.8.1.el"; + sha256 = "0i8s6blkhx53m1jk1bblqs7fwlbn57xkxxhsp9famcj5m0xyfimb"; }; packageRequires = [ emacs ]; meta = { @@ -2026,10 +2056,10 @@ elpaBuild { pname = "modus-vivendi-theme"; ename = "modus-vivendi-theme"; - version = "0.6.0"; + version = "0.8.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.6.0.el"; - sha256 = "1b7wkz779f020gpil4spbdzmg2fx6l48wk1138564cv9kx3nkkz2"; + url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.8.1.el"; + sha256 = "121nlr5w58j4q47rh9xjjf9wzb97yl2m1n2l6g58ck4vnarwndl1"; }; packageRequires = [ emacs ]; meta = { @@ -2215,10 +2245,10 @@ elpaBuild { pname = "oauth2"; ename = "oauth2"; - version = "0.12"; + version = "0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/oauth2-0.12.el"; - sha256 = "1rfyfy0h7shr3fmd8lh6s2i3ahfh28wb5fqiqlsjwspn5h77ll29"; + url = "https://elpa.gnu.org/packages/oauth2-0.13.el"; + sha256 = "0y5nbdwxz2hfr09xgsqgyv60vgx0rsaisibcpkz00klvgg26w33r"; }; packageRequires = []; meta = { @@ -2320,10 +2350,10 @@ elpaBuild { pname = "orgalist"; ename = "orgalist"; - version = "1.11"; + version = "1.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/orgalist-1.11.el"; - sha256 = "0zbqkk540rax32s8szp5zgz3a02zw88fc1dmjmyw6h3ls04m91kl"; + url = "https://elpa.gnu.org/packages/orgalist-1.12.el"; + sha256 = "1hwm7j0hbv2pg9w885ky1c9qga3grcfq8v216jv2ivkw8xzavysd"; }; packageRequires = [ emacs ]; meta = { @@ -2455,10 +2485,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.3.38"; + version = "0.3.48"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.3.38.tar"; - sha256 = "1m8f1z259c66k0hf0cfjqidfd0cra2c2mb7k5lj71v1kfckwj6bh"; + url = "https://elpa.gnu.org/packages/phps-mode-0.3.48.tar"; + sha256 = "1mnbrsgh6lx7kgkfsfq5zk78a97iwh8mxgxzyf1zq4jj6ziwd6bv"; }; packageRequires = [ emacs ]; meta = { @@ -2500,10 +2530,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-0.6.0.el"; - sha256 = "14x2jgjn8di03rrad4x4mn8fhcqibk1j5c0ya0vmv8648fki6i9d"; + url = "https://elpa.gnu.org/packages/posframe-0.7.0.el"; + sha256 = "1kwl83jb5k1hnx0s2qw972v0gjqbbvk4sdcdb1qbdxsyw36sylc9"; }; packageRequires = [ emacs ]; meta = { @@ -2511,6 +2541,21 @@ license = lib.licenses.free; }; }) {}; + project = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "project"; + ename = "project"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/project-0.1.2.el"; + sha256 = "0713hwim1chf6lxpg1rb234aa1gj92c153fjlc4jddp6dzzgn50d"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/project.html"; + license = lib.licenses.free; + }; + }) {}; psgml = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "psgml"; @@ -2575,10 +2620,10 @@ elpaBuild { pname = "rainbow-mode"; ename = "rainbow-mode"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.3.el"; - sha256 = "0cpwqllhv3cb0gii22cj9i731rk3sbf2drm5m52w5yclm8sfr339"; + url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.4.el"; + sha256 = "0rp76gix1ph1wrmdax6y2m3i9y1dmgv7ikjz8xsl5lizkygsy9cg"; }; packageRequires = []; meta = { @@ -2795,10 +2840,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.15"; + version = "1.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/relint-1.15.tar"; - sha256 = "0sxmdsacj8my942k8j76m2y68nzab7190acv7cwgflc5n4f07yxa"; + url = "https://elpa.gnu.org/packages/relint-1.17.tar"; + sha256 = "1nv13dqdhf72c1jgk1ml4k6jqb8wsyphcx2vhsyhig5198lg4kd7"; }; packageRequires = [ emacs xr ]; meta = { @@ -2857,6 +2902,21 @@ license = lib.licenses.free; }; }) {}; + scanner = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "scanner"; + ename = "scanner"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/scanner-0.1.tar"; + sha256 = "0hv4w7yzfdnz8vrfhw6i6agj9hs09vzsqr63nrp6dd93q0gk71mw"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/scanner.html"; + license = lib.licenses.free; + }; + }) {}; scroll-restore = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "scroll-restore"; @@ -2947,6 +3007,21 @@ license = lib.licenses.free; }; }) {}; + sm-c-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "sm-c-mode"; + ename = "sm-c-mode"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sm-c-mode-1.0.el"; + sha256 = "1lq65dhcvrh6ybla37lvni7wmbjb5nhm75ja9cl79148da1zrg91"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/sm-c-mode.html"; + license = lib.licenses.free; + }; + }) {}; smalltalk-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "smalltalk-mode"; @@ -3225,10 +3300,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.4.3.3"; + version = "2.4.3.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.4.3.3.tar"; - sha256 = "1di9ia59k6x7j9r8flwf05r160j30nrg0jvq5fjc9iazag9lniyw"; + url = "https://elpa.gnu.org/packages/tramp-2.4.3.4.tar"; + sha256 = "01il42xb6s38qnb7bhn9d7gscc5p5y4da5a4dp1i1cyi823sfp8f"; }; packageRequires = [ emacs ]; meta = { @@ -3315,10 +3390,10 @@ elpaBuild { pname = "uniquify-files"; ename = "uniquify-files"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/uniquify-files-1.0.2.tar"; - sha256 = "1vib79wsz5k94b9z0wiwhbzsdm70y9dla6szw2bb75245cx3kr0h"; + url = "https://elpa.gnu.org/packages/uniquify-files-1.0.3.tar"; + sha256 = "04yfys615ncz3jyh3hx5sg6x6szx028223184zv52skb4j99vkwq"; }; packageRequires = [ emacs ]; meta = { @@ -3539,10 +3614,10 @@ elpaBuild { pname = "web-server"; ename = "web-server"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/web-server-0.1.1.tar"; - sha256 = "1q51fhqw5al4iycdlighwv7jqgdpjb1a66glwd5jnc9b651yk42n"; + url = "https://elpa.gnu.org/packages/web-server-0.1.2.tar"; + sha256 = "10lcsl4dg2yr9zjd99gq9jz150wvvh6r5y9pd88l8y9vz16f2lim"; }; packageRequires = [ emacs ]; meta = { @@ -3629,10 +3704,10 @@ elpaBuild { pname = "wisi"; ename = "wisi"; - version = "3.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-3.0.1.tar"; - sha256 = "01961apbirdi4y8qx2wb01f04knkw3hyin3ndrkjlkfslqbsnzzv"; + url = "https://elpa.gnu.org/packages/wisi-3.1.1.tar"; + sha256 = "0abm9xfyk2izi0w9172sfhdq83abcxgbngngbh2gby54df0ycn0q"; }; packageRequires = [ emacs seq ]; meta = { @@ -3649,10 +3724,10 @@ elpaBuild { pname = "wisitoken-grammar-mode"; ename = "wisitoken-grammar-mode"; - version = "1.0.3"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.0.3.tar"; - sha256 = "1vljnhi35vix30xch9mziczg56ss1r615yn2pgdcw8wa8sm14crw"; + url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.1.0.tar"; + sha256 = "123z9j76cm0p22d9n4kqvn2477fdkgp5jarw564nd71cxrrb52ms"; }; packageRequires = [ emacs mmm-mode wisi ]; meta = { @@ -3724,10 +3799,10 @@ elpaBuild { pname = "xr"; ename = "xr"; - version = "1.18"; + version = "1.19"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xr-1.18.tar"; - sha256 = "1nq9pj47sxgpkw97c2xrkhgcwh3zsfd2a22qiqbl4i9zf2l9yy91"; + url = "https://elpa.gnu.org/packages/xr-1.19.tar"; + sha256 = "1aa3iqh0r635jw8k89zh8y4am9d4hfrqpk9mrdh2b51invjn8llq"; }; packageRequires = [ emacs ]; meta = { @@ -3735,6 +3810,21 @@ license = lib.licenses.free; }; }) {}; + xref = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }: + elpaBuild { + pname = "xref"; + ename = "xref"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/xref-1.0.1.el"; + sha256 = "17wlwilm2d1gvin8mkkqnpw2skjx0klxfs1pqpy8rrzdfpsb55li"; + }; + packageRequires = [ emacs project ]; + meta = { + homepage = "https://elpa.gnu.org/packages/xref.html"; + license = lib.licenses.free; + }; + }) {}; yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "yasnippet"; diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix index a6d657199b98e..57f5d7b859411 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix @@ -8,6 +8,16 @@ To update the list of packages from MELPA, 2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacsPackagesNg.elpaPackages`. 3. `git commit -m "elpa-packages $(date -Idate)" -- elpa-generated.nix` +## Update from overlay + +Alternatively, run the following command: + +./update-from-overlay + +It will update both melpa and elpa packages using +https://github.com/nix-community/emacs-overlay. It's almost +instantenous and formats commits for you. + */ { lib, stdenv, texinfo }: diff --git a/pkgs/applications/editors/emacs-modes/emacs2nix.nix b/pkgs/applications/editors/emacs-modes/emacs2nix.nix index cedc56e97ceb0..852f395c4a227 100644 --- a/pkgs/applications/editors/emacs-modes/emacs2nix.nix +++ b/pkgs/applications/editors/emacs-modes/emacs2nix.nix @@ -4,8 +4,8 @@ let src = pkgs.fetchgit { url = "https://github.com/ttuegel/emacs2nix.git"; fetchSubmodules = true; - rev = "752fe1bd891425cb7a4a53cd7b98c194c1fe4518"; - sha256 = "0asfdswh8sbnapbqhbz539zzxmv72f1iviha95iys34sgnd5k1nk"; + rev = "d4c52a7b22b0622aecf0b0d59941a4a2b250617c"; + sha256 = "133m0bmm8ahy0jbappgcdjqppkpxf5s9wg4gg254afx3f7yfqzbh"; }; in pkgs.mkShell { diff --git a/pkgs/applications/editors/emacs-modes/emacspeak/default.nix b/pkgs/applications/editors/emacs-modes/emacspeak/default.nix new file mode 100644 index 0000000000000..f2ae3712cac46 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/emacspeak/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, makeWrapper, emacs, tcl, tclx, espeak-ng, lib }: + +stdenv.mkDerivation rec { + pname = "emacspeak"; + version = "51.0"; + + src = fetchurl { + url = "https://github.com/tvraman/emacspeak/releases/download/${version}/${pname}-${version}.tar.bz2"; + sha256 = "09a0ywxlqa8jmc0wmvhaf7bdydnkyhy9nqfsdqcpbsgdzj6qpg90"; + }; + + nativeBuildInputs = [ makeWrapper emacs ]; + buildInputs = [ tcl tclx espeak-ng ]; + + preConfigure = '' + make config + ''; + + postBuild = '' + make -C servers/native-espeak PREFIX=$out "TCL_INCLUDE=${tcl}/include" + ''; + + postInstall = '' + make -C servers/native-espeak PREFIX=$out install + local d=$out/share/emacs/site-lisp/emacspeak/ + install -d -- "$d" + cp -a . "$d" + find "$d" \( -type d -or \( -type f -executable \) \) -execdir chmod 755 {} + + find "$d" -type f -not -executable -execdir chmod 644 {} + + makeWrapper ${emacs}/bin/emacs $out/bin/emacspeak \ + --set DTK_PROGRAM "${espeak-ng}/bin/espeak" \ + --add-flags '-l "${placeholder "out"}/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.elc"' + ''; + + meta = { + homepage = "https://github.com/tvraman/emacspeak/"; + description = "Emacs extension that provides spoken output"; + license = lib.licenses.gpl2; + maintainers = [ ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix b/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix index 077e72f55764f..5beaed5824071 100644 --- a/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix +++ b/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Popup descriptions of R objects"; - homepage = https://github.com/myuhe/ess-R-object-popup.el; + homepage = "https://github.com/myuhe/ess-R-object-popup.el"; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix b/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix deleted file mode 100644 index ad22faf3dff72..0000000000000 --- a/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ fetchurl, melpaBuild }: - -melpaBuild { - pname = "filesets-plus"; - version = "20170222.55"; - - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/filesets%2b.el"; - sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs00"; - name = "filesets+.el"; - }; - - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/filesets-plus+"; - sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g"; - name = "filesets-plus"; - }; - - meta = { - homepage = "https://melpa.org/#/filesets+"; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/header2/default.nix b/pkgs/applications/editors/emacs-modes/header2/default.nix deleted file mode 100644 index 171d8c6b16aec..0000000000000 --- a/pkgs/applications/editors/emacs-modes/header2/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ fetchurl, lib, melpaBuild }: - -melpaBuild { - pname = "header2"; - version = "20170223.1949"; - - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/header2.el"; - sha256 = "0cv74cfihr13jrgyqbj4x0na659djfyrhflxni6jdbgbysi4zf6k"; - name = "header2.el"; - }; - - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/header2"; - sha256 = "1dg25krx3wxma2l5vb2ji7rpfp17qbrl62jyjpa52cjfsvyp6v06"; - name = "header2"; - }; - - meta = { - homepage = "https://melpa.org/#/header2"; - license = lib.licenses.gpl3; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/helm-words/default.nix b/pkgs/applications/editors/emacs-modes/helm-words/default.nix index c6e1c5a50f4a4..00879463276c9 100644 --- a/pkgs/applications/editors/emacs-modes/helm-words/default.nix +++ b/pkgs/applications/editors/emacs-modes/helm-words/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Emacs major mode for jade and stylus"; - homepage = https://github.com/brianc/helm-words; + homepage = "https://github.com/brianc/helm-words"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/hexrgb/default.nix b/pkgs/applications/editors/emacs-modes/hexrgb/default.nix deleted file mode 100644 index 8b9ebcd602627..0000000000000 --- a/pkgs/applications/editors/emacs-modes/hexrgb/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ fetchurl, lib, melpaBuild }: - -melpaBuild { - pname = "hexrgb"; - version = "20170304.1017"; - - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hexrgb.el"; - sha256 = "1aj1fsc3wr8174xs45j2wc2mm6f8v6zs40xn0r4qisdw0plmsbsy"; - name = "hexrgb.el"; - }; - - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/hexrgb"; - sha256 = "0mzqslrrf7sc262syj3ja7b7rnbg80dwf2p9bzxdrzx6b8vvsx06"; - name = "hexrgb"; - }; - - meta = { - homepage = "https://melpa.org/#/hexrgb"; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/hol_light/default.nix b/pkgs/applications/editors/emacs-modes/hol_light/default.nix deleted file mode 100644 index 255b30d60ed11..0000000000000 --- a/pkgs/applications/editors/emacs-modes/hol_light/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchsvn }: - -stdenv.mkDerivation rec { - pname = "hol_light-mode"; - version = "73"; - - src = fetchsvn { - url = http://seanmcl-ocaml-lib.googlecode.com/svn/trunk/workshop/software/emacs; - rev = version; - sha256 = "3ca83098960439da149a47e1caff32536601559a77f04822be742a390c67feb7"; - }; - - installPhase = '' - DEST=$out/share/emacs/site-lisp - mkdir -p $DEST - cp -a * $DEST - ''; - - meta = { - description = "A HOL Light mode for Emacs"; - homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; - - # Fails trying to fetch dependencies in build - # broken = true; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/hsc3/default.nix b/pkgs/applications/editors/emacs-modes/hsc3/default.nix index 75b72516a3cd2..6c2db85d7942e 100644 --- a/pkgs/applications/editors/emacs-modes/hsc3/default.nix +++ b/pkgs/applications/editors/emacs-modes/hsc3/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { pname = "hsc3-mode"; inherit version; src = fetchurl { - url = mirror://hackage/hsc3-0.15/hsc3-0.15.tar.gz; + url = "mirror://hackage/hsc3-0.15/hsc3-0.15.tar.gz"; sha256 = "2f3b15655419cf8ebe25ab1c6ec22993b2589b4ffca7c3a75ce478ca78a0bde6"; }; @@ -21,7 +21,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = http://rd.slavepianos.org/?t=hsc3; + homepage = "http://rd.slavepianos.org/?t=hsc3"; description = "hsc3 mode package for Emacs"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix deleted file mode 100644 index 27dcd1063bf2a..0000000000000 --- a/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, emacs }: - -let - modules = [ - { name = "icicles.el"; sha256 = "1744n5g2kmv3r261ipa0fhrgnapl0chxz57bbbls3bp30cnnfrs7"; } - { name = "icicles-chg.el"; sha256 = "058sxa8wh3vqr3zy677q6m2lfx4n477rnb8921s1p6wgs55v7dp4"; } - { name = "icicles-cmd1.el"; sha256 = "064hyy8nxvlg298s5qnmk7aczbasfpddhx57jxaldyyzkca3n2h5"; } - { name = "icicles-cmd2.el"; sha256 = "0a77fx0pxyfrg9nxvqvzz247v6cljjfz9dnfs7lc8qgdvksxs261"; } - { name = "icicles-doc1.el"; sha256 = "04j5qvj7pqnjh8h2y2sdgi7x55czdp9xn7yysr3bzcmr1rq5p4bz"; } - { name = "icicles-doc2.el"; sha256 = "1k8vfhi3fa4bzsxr074bw5q6srvq6z6hi61rzlxdw7pah6qf7hcz"; } - { name = "icicles-face.el"; sha256 = "1pvygqzmh6ag0zhfjn1vhdvlhxybwxzj22ah2pc0ls80dlywhi4l"; } - { name = "icicles-fn.el"; sha256 = "02vwa9dx9393d7kxrf443r1lj7y9ihkh25cmd418pwfgmw2yd5s7"; } - { name = "icicles-mac.el"; sha256 = "13nxgg9k5w39lga90jwn1c7v756dqlfln2qh312vfaxfjfijfv9r"; } - { name = "icicles-mcmd.el"; sha256 = "17d4zlf3r09wmarwyc1cbjv0pyklg4cdhwh3h643d4v8mhs5hnil"; } - { name = "icicles-mode.el"; sha256 = "1xfv8nryf5y2gygg02naawzm5qhrkba3h84g43518r1xc6rgbpp6"; } - { name = "icicles-opt.el"; sha256 = "154mgcd1ksnmlyb4ijy2njqq75i8cj4k47phplxsi648pzqnda77"; } - { name = "icicles-var.el"; sha256 = "0f94299q1z0va4v1s5ijpksaqlaz88ay1qbmlzq0i2wnxnsliys8"; } - ]; - - forAll = f: map f modules; -in -stdenv.mkDerivation rec { - version = "2019-02-22"; - pname = "icicles"; - - srcs = forAll ({name, sha256}: fetchurl { url = "https://www.emacswiki.org/emacs/download/${name}"; inherit sha256; }); - - buildInputs = [ emacs ]; - - unpackPhase = "for m in $srcs; do cp $m $(echo $m | cut -d- -f2-); done"; - - buildPhase = "emacs --batch -L . -f batch-byte-compile *.el"; - - installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${pname}-${version}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${pname}-${version}/"; - - meta = { - homepage = https://www.emacswiki.org/emacs/Icicles; - description = "Enhance Emacs minibuffer input with cycling and powerful completion"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = emacs.meta.platforms; - maintainers = with stdenv.lib.maintainers; [ scolobb ]; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/lib-requires/default.nix b/pkgs/applications/editors/emacs-modes/lib-requires/default.nix deleted file mode 100644 index 84dae10127e9e..0000000000000 --- a/pkgs/applications/editors/emacs-modes/lib-requires/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ fetchurl, lib, melpaBuild }: - -melpaBuild { - pname = "lib-requires"; - version = "20170307.757"; - - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/lib-requires.el"; - sha256 = "04lrkdjrhsgg7vgvw1mkr9a5m9xlyvjvnj2aj6w453bgmnp1mbvv"; - name = "lib-requires.el"; - }; - - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/lib-requires"; - sha256 = "1g22jh56z8rnq0h80wj10gs38yig1rk9xmk3kmhmm5mm6b14iwdx"; - name = "lib-requires"; - }; - - meta = { - homepage = "https://melpa.org/#/lib-requires"; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/libgenerated.nix b/pkgs/applications/editors/emacs-modes/libgenerated.nix index 57bccc6081831..2ddafc4796c0d 100644 --- a/pkgs/applications/editors/emacs-modes/libgenerated.nix +++ b/pkgs/applications/editors/emacs-modes/libgenerated.nix @@ -25,10 +25,12 @@ let } ) {}; git = self.callPackage ({ fetchgit }: - fetchgit { + (fetchgit { rev = commit; inherit sha256 url; - } + }).overrideAttrs(_: { + GIT_SSL_NO_VERIFY = true; + }) ) {}; bitbucket = self.callPackage ({ fetchhg }: fetchhg { @@ -61,8 +63,9 @@ in { pname = builtins.replaceStrings [ "@" ] [ "at" ] ename; broken = ! isNull error; in - lib.nameValuePair ename (if hasSource then ( - self.callPackage ({ melpaBuild, fetchurl, ... }@pkgargs: + if hasSource then + lib.nameValuePair ename ( + self.callPackage ({ melpaBuild, fetchurl, ... }@pkgargs: melpaBuild { inherit pname; ename = ename; @@ -85,6 +88,8 @@ in { }; } ) {} - ) else null); + ) + else + null; } diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index f04319f23de3e..dfe287a7f4021 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -65,11 +65,11 @@ }; }; + emacspeak = callPackage ./emacspeak {}; + ess-R-object-popup = callPackage ./ess-R-object-popup { }; - filesets-plus = callPackage ./filesets-plus { }; - font-lock-plus = callPackage ./font-lock-plus { }; ghc-mod = melpaBuild { @@ -98,7 +98,7 @@ sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78"; }; recipe = pkgs.writeText "recipe" '' - (haskell-unicode-input-method + (emacs-haskell-unicode-input-method :repo "roelvandijk/emacs-haskell-unicode-input-method" :fetcher github) ''; @@ -109,17 +109,8 @@ }; }; - hexrgb = callPackage ./hexrgb { }; - - header2 = callPackage ./header2 { }; - helm-words = callPackage ./helm-words { }; - icicles = callPackage ./icicles { }; - - lib-requires = - callPackage ./lib-requires { }; - org-mac-link = callPackage ./org-mac-link { }; @@ -134,12 +125,8 @@ sv-kalender = callPackage ./sv-kalender { }; - thingatpt-plus = callPackage ./thingatpt-plus { }; - tramp = callPackage ./tramp { }; - yaoddmuse = callPackage ./yaoddmuse { }; - zeitgeist = callPackage ./zeitgeist { }; # From old emacsPackages (pre emacsPackagesNg) @@ -148,9 +135,7 @@ colorThemeSolarized = callPackage ./color-theme-solarized { }; emacsSessionManagement = callPackage ./session-management-for-emacs { }; hsc3-mode = callPackage ./hsc3 { }; - hol_light_mode = callPackage ./hol_light { }; ido-ubiquitous = callPackage ./ido-ubiquitous { }; - ocaml-mode = callPackage ./ocaml { }; prolog-mode = callPackage ./prolog { }; rectMark = callPackage ./rect-mark { }; sunriseCommander = callPackage ./sunrise-commander { }; @@ -160,7 +145,6 @@ # # Ideally this should be dropped some time during/after 20.03 bbdb3 = self.melpaStablePackages.bbdb; - ocamlMode = self.ocaml-mode; jade = self.jade-mode; # scalaMode2 = null; # No clear mapping as of now flymakeCursor = self.melpaStablePackages.flymake-cursor; diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 5c9456b76a637..f228d34a654ef 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -10,42 +10,62 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages 3. `git commit -m "melpa-packages: $(date -Idate)" recipes-archive-melpa.json` -*/ - -{ lib, external, pkgs }: variant: self: let - - dontConfigure = pkg: if pkg != null then pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - dontConfigure = true; - }); - }) else null; - - markBroken = pkg: if pkg != null then pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - meta = (drv.meta or {}) // { broken = true; }; - }); - }) else null; +## Update from overlay - externalSrc = pkg : epkg : if pkg != null then pkg.override (args : { - melpaBuild = drv : args.melpaBuild (drv // { - inherit (epkg) src version; +Alternatively, run the following command: - propagatedUserEnvPkgs = [ epkg ]; - }); - }) else null; +./update-from-overlay - fix-rtags = pkg : if pkg != null then dontConfigure (externalSrc pkg external.rtags) - else null; +It will update both melpa and elpa packages using +https://github.com/nix-community/emacs-overlay. It's almost +instantenous and formats commits for you. - generateMelpa = lib.makeOverridable ({ - archiveJson ? ./recipes-archive-melpa.json - }: let - - inherit (import ./libgenerated.nix lib self) melpaDerivation; - super = lib.listToAttrs (map (melpaDerivation variant) (lib.importJSON archiveJson)); +*/ - overrides = rec { - shared = rec { +{ lib, external, pkgs }: variant: self: +let + dontConfigure = pkg: + if pkg != null then pkg.override (args: { + melpaBuild = drv: args.melpaBuild (drv // { + dontConfigure = true; + }); + }) else null; + + markBroken = pkg: + if pkg != null then pkg.override (args: { + melpaBuild = drv: args.melpaBuild (drv // { + meta = (drv.meta or { }) // { broken = true; }; + }); + }) else null; + + externalSrc = pkg: epkg: + if pkg != null then pkg.override (args: { + melpaBuild = drv: args.melpaBuild (drv // { + inherit (epkg) src version; + + propagatedUserEnvPkgs = [ epkg ]; + }); + }) else null; + + fix-rtags = pkg: + if pkg != null then dontConfigure (externalSrc pkg external.rtags) + else null; + + generateMelpa = lib.makeOverridable ({ archiveJson ? ./recipes-archive-melpa.json + }: + let + inherit (import ./libgenerated.nix lib self) melpaDerivation; + super = ( + lib.listToAttrs (builtins.filter + (s: s != null) + (map + (melpaDerivation variant) + (lib.importJSON archiveJson) + ) + ) + ); + + overrides = { # Expects bash to be at /bin/bash ac-rtags = fix-rtags super.ac-rtags; @@ -53,12 +73,11 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac inherit (self.melpaPackages) powerline; }; - auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs(old: { + auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ external.llvmPackages.llvm ]; CFLAGS = "-I${external.llvmPackages.clang}/include"; LDFLAGS = "-L${external.llvmPackages.clang}/lib"; }); - emacsClangCompleteAsync = auto-complete-clang-async; # part of a larger package caml = dontConfigure super.caml; @@ -73,7 +92,9 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac inherit (self.melpaPackages) easy-kill; }; - emacsql-sqlite = super.emacsql-sqlite.overrideAttrs(old: { + dune = dontConfigure super.dune; + + emacsql-sqlite = super.emacsql-sqlite.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.sqlite ]; postBuild = '' @@ -102,21 +123,32 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac evil-magit = super.evil-magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + eopengrok = super.eopengrok.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); ess-R-data-view = super.ess-R-data-view.override { inherit (self.melpaPackages) ess ctable popup; }; + forge = super.forge.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + flycheck-rtags = fix-rtags super.flycheck-rtags; gnuplot = super.gnuplot.overrideAttrs (old: { nativeBuildInputs = - (old.nativeBuildInputs or []) ++ [ pkgs.autoreconfHook ]; + (old.nativeBuildInputs or [ ]) ++ [ pkgs.autoreconfHook ]; }); - pdf-tools = super.pdf-tools.overrideAttrs(old: { + pdf-tools = super.pdf-tools.overrideAttrs (old: { nativeBuildInputs = [ external.pkgconfig ]; buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ]; preBuild = "make server/epdfinfo"; @@ -133,7 +165,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac }); irony = super.irony.overrideAttrs (old: { - cmakeFlags = old.cmakeFlags or [] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ]; + cmakeFlags = old.cmakeFlags or [ ] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ]; NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR"; preConfigure = '' cd server @@ -167,49 +199,115 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac magit = super.magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + magit-find-file = super.magit-find-file.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + magit-gh-pulls = super.magit-gh-pulls.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + magit-imerge = super.magit-imerge.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + magit-lfs = super.magit-lfs.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + magit-org-todos = super.magit-org-todos.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + magit-stgit = super.magit-stgit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + magit-tbdiff = super.magit-tbdiff.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + magit-topgit = super.magit-topgit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + magit-vcsh = super.magit-vcsh.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + magit-gerrit = super.magit-gerrit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-todos = super.magit-todos.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-filenotify = super.magit-filenotify.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magithub = super.magithub.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-svn = super.magit-svn.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); kubernetes = super.kubernetes.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + kubernetes-evil = super.kubernetes-evil.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); # upstream issue: missing file header @@ -225,12 +323,14 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac rtags = dontConfigure (externalSrc super.rtags external.rtags); + rtags-xref = dontConfigure super.rtags; + shm = super.shm.overrideAttrs (attrs: { propagatedUserEnvPkgs = [ external.structured-haskell-mode ]; }); # Telega has a server portion for it's network protocol - telega = super.telega.overrideAttrs(old: { + telega = super.telega.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.tdlib ]; postBuild = '' @@ -245,18 +345,27 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac ''; }); + treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: { nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); - zmq = super.zmq.overrideAttrs(old: { + zmq = super.zmq.overrideAttrs (old: { stripDebugList = [ "share" ]; preBuild = '' make ''; nativeBuildInputs = [ - external.autoconf external.automake external.pkgconfig external.libtool + external.autoconf + external.automake + external.pkgconfig + external.libtool (external.zeromq.override { enableDrafts = true; }) ]; postInstall = '' @@ -268,10 +377,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # Map legacy renames from emacs2nix since code generation was ported to emacs lisp _0blayout = super."0blayout"; - _0xc = super."0xc"; - _2048-game = super."2048-game"; - _4clojure = super."4clojure"; - at = super."@"; desktop-plus = super."desktop+"; ghub-plus = super."ghub+"; git-gutter-plus = super."git-gutter+"; @@ -282,13 +387,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac markdown-mode-plus = super."markdown-mode+"; package-plus = super."package+"; rect-plus = super."rect+"; - term-plus = super."term+"; - term-plus-key-intercept = super."term+key-intercept"; - term-plus-mux = super."term+mux"; - xml-plus = super."xml+"; - }; - - stable = shared // { # upstream issue: missing file header bufshow = markBroken super.bufshow; @@ -299,9 +397,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # upstream issue: missing file header dictionary = markBroken super.dictionary; - # missing git - egg = markBroken super.egg; - # upstream issue: missing file header elmine = markBroken super.elmine; @@ -320,8 +415,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # upstream issue: doesn't build eterm-256color = markBroken super.eterm-256color; - helm-rtags = fix-rtags super.helm-rtags; - # upstream issue: missing file header qiita = markBroken super.qiita; @@ -340,9 +433,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # upstream issue: missing file header window-numbering = markBroken super.window-numbering; - }; - - unstable = shared // { editorconfig = super.editorconfig.overrideAttrs (attrs: { propagatedUserEnvPkgs = [ external.editorconfig-core-c ]; }); @@ -350,7 +440,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac egg = super.egg.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); # missing dependencies @@ -358,20 +448,88 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac packageRequires = with self; [ evil highlight ]; }); - forge = super.forge.overrideAttrs (attrs: { + kapacitor = super.kapacitor.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + gerrit = super.gerrit.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + gerrit-download = super.gerrit-download.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + github-pullrequest = super.github-pullrequest.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); helm-rtags = fix-rtags super.helm-rtags; + jist = super.jist.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + mandoku = super.mandoku.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + mandoku-tls = super.mandoku-tls.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + magit-p4 = super.magit-p4.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + magit-rbr = super.magit-rbr.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + magit-diff-flycheck = super.magit-diff-flycheck.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + magit-reviewboard = super.magit-reviewboard.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + magit-patch-changelog = super.magit-patch-changelog.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + magit-circleci = super.magit-circleci.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + orgit = (super.orgit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - })); + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + })); # tries to write to $HOME php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: { @@ -389,13 +547,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac inherit (self.melpaPackages) powerline; }; - treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - - vterm = super.vterm.overrideAttrs(old: { + vterm = super.vterm.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ self.emacs pkgs.cmake pkgs.libvterm-neovim ]; cmakeFlags = [ "-DEMACS_SOURCE=${self.emacs.src}" @@ -411,22 +563,38 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac rm -rf $out/share/emacs/site-lisp/elpa/vterm-**/{CMake*,build,*.c,*.h} ''; }); - # Legacy alias - emacs-libvterm = unstable.vterm; w3m = super.w3m.override (args: { melpaBuild = drv: args.melpaBuild (drv // { prePatch = - let w3m = "${lib.getBin external.w3m}/bin/w3m"; in '' + let w3m = "${lib.getBin external.w3m}/bin/w3m"; in + '' substituteInPlace w3m.el \ - --replace 'defcustom w3m-command nil' \ - 'defcustom w3m-command "${w3m}"' + --replace 'defcustom w3m-command nil' \ + 'defcustom w3m-command "${w3m}"' ''; }); }); }; - }; - - in super // overrides.${variant}); -in generateMelpa { } + # Deprecated legacy aliases for backwards compat + aliases = lib.listToAttrs (lib.attrValues (lib.mapAttrs (n: v: { name = v; value = builtins.trace "Melpa attribute '${v}' is a legacy alias that will be removed in 21.03, use '${n}' instead" melpaPackages.${n}; }) (lib.filterAttrs (n: v: lib.hasAttr n melpaPackages) { + "auto-complete-clang-async" = "emacsClangCompleteAsync"; + "vterm" = "emacs-libvterm"; + "0xc" = "_0xc"; + "2048-game" = "_2048-game"; + "4clojure" = "_4clojure"; + "@" = "at"; + "term+" = "term-plus"; + "term+key-intercept" = "term-plus-key-intercept"; + "term+mux" = "term-plus-mux"; + "xml+" = "xml-plus"; + }))); + + melpaPackages = lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super; + + in + melpaPackages // aliases); + +in +generateMelpa { } diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/pkgs/applications/editors/emacs-modes/ocaml/default.nix deleted file mode 100644 index becc2dc5dc9b8..0000000000000 --- a/pkgs/applications/editors/emacs-modes/ocaml/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, emacs, ocaml }: - -# this package installs the emacs-mode which -# resides in the ocaml compiler sources. - -let version = stdenv.lib.removePrefix "ocaml-" ocaml.name; -in stdenv.mkDerivation { - pname = "ocaml-mode"; - inherit version; - inherit (ocaml) prefixKey src; - - # a quick configure to get the Makefile generated. Since - # we do not build the ocaml itself, we don't really - # need it to support any features. - configureFlags = (with stdenv.lib; optional (!(versionAtLeast version "4.02")) "-no-tk") ++ - [ "-no-curses" "-no-pthread" ]; - - buildInputs = [ emacs ]; - dontBuild = true; - - installPhase = '' - cd emacs; - mkdir -p "$out/share/emacs/site-lisp" "$out/bin" - EMACSDIR=$out/share/emacs/site-lisp make simple-install install-ocamltags - ''; - - meta = { - homepage = http://caml.inria.fr; - description = "OCaml mode package for Emacs"; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 302f5adcfb1f7..4beb5750166dc 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20191203"; + version = "20200511"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20191203.tar"; - sha256 = "1fcgiswjnqmfzx3xkmlqyyhc4a8ms07vdsv7nkizgxqdh9hwfm2q"; + url = "https://orgmode.org/elpa/org-20200511.tar"; + sha256 = "147k6nmq00milw5knyhw01z481rcdl6s30vk4fkjidw508nkmg9c"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20191203"; + version = "20200511"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20191203.tar"; - sha256 = "1kvw95492acb7gqn8gxbp1vg4fyw80w43yvflxnfxdf6jnnw2wah"; + url = "https://orgmode.org/elpa/org-plus-contrib-20200511.tar"; + sha256 = "1hsdp7n985404zdqj6gyfw1bxxbs0p3bf4fyizvgji21zxwnf63f"; }; packageRequires = []; meta = { @@ -30,4 +30,4 @@ license = lib.licenses.free; }; }) {}; - } + } \ No newline at end of file diff --git a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix b/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix index 4d8f40074bdd1..93af03ce229fd 100644 --- a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix +++ b/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Insert org-mode links to items selected in various Mac apps"; - homepage = https://orgmode.org/worg/org-contrib/org-mac-link.html; + homepage = "https://orgmode.org/worg/org-contrib/org-mac-link.html"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix b/pkgs/applications/editors/emacs-modes/perl-completion/default.nix index 9f251f54d6aa9..7f2454c811a7a 100644 --- a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix +++ b/pkgs/applications/editors/emacs-modes/perl-completion/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Minor mode provides useful features for editing perl codes"; - homepage = http://emacswiki.org/emacs/PerlCompletion; + homepage = "http://emacswiki.org/emacs/PerlCompletion"; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/pod-mode/default.nix b/pkgs/applications/editors/emacs-modes/pod-mode/default.nix index 198adefc0163d..549633b7dfbdc 100644 --- a/pkgs/applications/editors/emacs-modes/pod-mode/default.nix +++ b/pkgs/applications/editors/emacs-modes/pod-mode/default.nix @@ -13,6 +13,6 @@ trivialBuild rec { description = "Major mode for editing .pod-files"; license = licenses.gpl2Plus; maintainers = with maintainers; [ qyliss ]; - platform = platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/prolog/default.nix b/pkgs/applications/editors/emacs-modes/prolog/default.nix index 337a1585b1b4c..7f5a097daa935 100644 --- a/pkgs/applications/editors/emacs-modes/prolog/default.nix +++ b/pkgs/applications/editors/emacs-modes/prolog/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://bruda.ca/emacs/prolog_mode_for_emacs/; + homepage = "http://bruda.ca/emacs/prolog_mode_for_emacs/"; description = "Prolog mode for Emacs"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/editors/emacs-modes/railgun/default.nix b/pkgs/applications/editors/emacs-modes/railgun/default.nix index ba716e1dd13b1..8ca8d1feaa1e8 100644 --- a/pkgs/applications/editors/emacs-modes/railgun/default.nix +++ b/pkgs/applications/editors/emacs-modes/railgun/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Propel yourself through a rails project with the power of magnets"; - homepage = https://github.com/mbriggs/railgun.el; + homepage = "https://github.com/mbriggs/railgun.el"; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index b512d5f5c7513..a10df7791039f 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -31,11 +31,11 @@ "url": "https://git.sr.ht/~zge/nullpointer-emacs", "unstable": { "version": [ - 20200313, - 1542 + 20200411, + 1227 ], - "commit": "1d29192a3c28ba088d93410bfcdd4bee0abb6610", - "sha256": "02kmfzkrl35y599w5yal5d7rjb3xi02zhvb8q0m3iw4mbm16sw28" + "commit": "59136313132c08ab5fddaa875f6abeb22916a04b", + "sha256": "0acdh1r28v6xcsh39r13xppzqb6m00jgxgsxl17779isw98w9a3y" }, "stable": { "version": [ @@ -67,17 +67,17 @@ }, { "ename": "2048-game", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "0z7x9bnyi3qlq7l0fskb61i6yr9gm7w7wplqd28wz8p1j5yw8aa0", - "fetcher": "bitbucket", - "repo": "zck/2048.el", + "commit": "d3828ad7599d13728b5571b882344c3ada434b85", + "sha256": "0i7g7fg21ndpfbdydij3fb683pqgd1sicb7x6rradbc8jpmcf5sq", + "fetcher": "hg", + "url": "https://hg.sr.ht/~zck/game-2048", "unstable": { "version": [ - 20151026, - 1933 + 20200417, + 259 ], - "commit": "ea6c3bce8ac1c17dae5ac711ae4e931c0495e455", - "sha256": "1p9qn9n8mfb4z62h1s94mlg0vshpzafbhsxgzvx78sqlf6bfc80l" + "commit": "aad4a590ea91f9a3256233b9b345e9159c6993f2", + "sha256": "1jd50m5w0g0yplzms4qvkxx16f7xsbm9h7sdrw1p130gbij252l3" } }, { @@ -479,8 +479,8 @@ "auto-complete", "eclim" ], - "commit": "23f5b294f833ce58516d7b9ae08a7792d70022a1", - "sha256": "17q972354nkkynfjmwih4vp7s5dzdvr3nf7ni3ci095lzb0zzf4g" + "commit": "222ddd48fcf0ee01592dec77c58e0cf3f2ea1100", + "sha256": "0jdddf8krvg379wlay1xs27qlxpi87nz6v2i526pk59mmg8jrnvc" }, "stable": { "version": [ @@ -960,8 +960,8 @@ "auto-complete", "yasnippet" ], - "commit": "7b8db219080b714a7b8ba452ddb82bd08f7db152", - "sha256": "1zm04hqy6dg57swk05qvl5idzb11camcdmh7lrh6mqsvrcsvym2q" + "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41", + "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj" }, "stable": { "version": [ @@ -986,8 +986,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20200103, - 656 + 20200516, + 52 ], "deps": [ "dash", @@ -997,8 +997,8 @@ "s", "xcscope" ], - "commit": "7b8db219080b714a7b8ba452ddb82bd08f7db152", - "sha256": "1zm04hqy6dg57swk05qvl5idzb11camcdmh7lrh6mqsvrcsvym2q" + "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41", + "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj" }, "stable": { "version": [ @@ -1064,8 +1064,8 @@ "auto-complete", "rtags" ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", + "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" }, "stable": { "version": [ @@ -1212,11 +1212,11 @@ "repo": "tam17aki/ace-isearch", "unstable": { "version": [ - 20200205, - 1105 + 20200420, + 518 ], - "commit": "cb6d7306cb5d2d4d36cb3803c0eaf779d88c2666", - "sha256": "1lrgjz7a4s50shc74kx6k958i1ayv5pfncsrjb3n87bvrx9wq6g3" + "commit": "58e4f1ad5cbbd2f86d161881d3f3ded3a3db984c", + "sha256": "0mlswnyd89ir060kiinzlrh70mdy8nfm2zpwr9jj2p19hrslmc4r" }, "stable": { "version": [ @@ -1360,14 +1360,14 @@ "repo": "abo-abo/ace-link", "unstable": { "version": [ - 20200210, - 2031 + 20200515, + 1854 ], "deps": [ "avy" ], - "commit": "9b22793789263b2e2fc06ca8b6073bb01211df9b", - "sha256": "0ik2v881rnik58zvxczjg847fvc9vf493h85rv8q72hb7zi9p0gy" + "commit": "b610dcb99510328d07ab1e1ea67b2f87ecb1cc5b", + "sha256": "0r7cyvrkbqq0dsm5963wn2i1wqgq0md5r8b2afjbr3m9b6v5lnq4" }, "stable": { "version": [ @@ -1563,32 +1563,30 @@ "repo": "pauldub/activity-watch-mode", "unstable": { "version": [ - 20200130, - 805 + 20200416, + 637 ], "deps": [ "cl-lib", "json", - "projectile", "request" ], - "commit": "153d93eac0b9511dc00b50c2ba409c085b58602b", - "sha256": "18idfbdrk3b2y573g2ld5sqkb9j216ixik679qj7qdnwa2b7m2xx" + "commit": "9d591c5ec9a2b2c7b55a754dd37c7434b2ef9fdc", + "sha256": "0a1ylq0il5aca5y9acykaa47p8d9xb3jy4wgi1lpm60z06n4m99y" }, "stable": { "version": [ 1, - 1, - 1 + 3, + 0 ], "deps": [ "cl-lib", "json", - "projectile", "request" ], - "commit": "153d93eac0b9511dc00b50c2ba409c085b58602b", - "sha256": "18idfbdrk3b2y573g2ld5sqkb9j216ixik679qj7qdnwa2b7m2xx" + "commit": "9d591c5ec9a2b2c7b55a754dd37c7434b2ef9fdc", + "sha256": "0a1ylq0il5aca5y9acykaa47p8d9xb3jy4wgi1lpm60z06n4m99y" } }, { @@ -1819,14 +1817,14 @@ "repo": "Malabarba/aggressive-indent-mode", "unstable": { "version": [ - 20190828, - 1828 + 20200512, + 1207 ], "deps": [ "cl-lib" ], - "commit": "c28246ba09d53e32cd9d8cafb1830f50387d9985", - "sha256": "19qklr4wqy55cb2133qlnrhf9yggsf096l14glw4jwpvx3cn61dd" + "commit": "12a64b4e5c1a1e124baa74336738b6ae1972607f", + "sha256": "1pkqjg30l9sjh5m8w4p8qrlw92sxr28c3d7mq6h8sfc8dkgivd33" }, "stable": { "version": [ @@ -1894,11 +1892,11 @@ "repo": "ralesi/ahk-mode", "unstable": { "version": [ - 20191221, - 2202 + 20200412, + 1832 ], - "commit": "377f79484cc43458f66c1ba5a61459b77e363591", - "sha256": "0vf9pg2yjldzm4nzvzw0w2cvrnxj4xpm3ymsnpzdd55mp7q3y1ag" + "commit": "729007b5f22a49f5187ff47fca18c0d674e73047", + "sha256": "0989iva0igmd3y61hihwnc7mhn11midimrnbpvq7d062iy7g4vaw" }, "stable": { "version": [ @@ -1942,11 +1940,11 @@ "repo": "skeeto/emacs-aio", "unstable": { "version": [ - 20190601, - 753 + 20200410, + 1409 ], - "commit": "0e8a18f1bbb5f7be0f88d8e02ef13494736d63bc", - "sha256": "1aikvka4s97p5s26vclrnamgj8agx1j8ls6q3x7mxf8mhpv4ghqz" + "commit": "9367005c44c42c46c8ca1e7d3f780731c7d123dd", + "sha256": "063avjlizpjc53myjzvkqsp64gkxwcc7w7shjdf1xgjb9b58pbc1" }, "stable": { "version": [ @@ -1965,25 +1963,25 @@ "repo": "AnthonyDiGirolamo/airline-themes", "unstable": { "version": [ - 20180411, - 406 + 20200511, + 1543 ], "deps": [ "powerline" ], - "commit": "8b528fbae0e557461315bed82883275d58df41f2", - "sha256": "1xydgf9w0i2anpmjhy8m0zv1hql4gb37i11xfn6xzwna572z1ml9" + "commit": "a6a3bd55baee29bd372869c835aded0f7d5e5f76", + "sha256": "1yg9wdagysfa5xswdrnwngbzf7gmdhjsl40ivqnxxvb74adxcwp6" }, "stable": { "version": [ 1, - 7 + 8 ], "deps": [ "powerline" ], - "commit": "bd9624a94618f4144762032a93549f53ffc1e7b3", - "sha256": "1rlszg7z5k8c6fmjk4sjgrc9xgcjc1jah6c7kdl9kypha7y8s4bq" + "commit": "5ea031bcbdf665afea7e47e519a49e2c33978833", + "sha256": "1jx17g8a6pxkw4zlx3fwhqgxfzcf3019k8fklykamfrkharzsc2l" } }, { @@ -2242,14 +2240,14 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20200326, - 1553 + 20200508, + 1157 ], "deps": [ "memoize" ], - "commit": "f6cbb51c152dd60be5718218600a4ec14d9fd6cc", - "sha256": "0a59m1vv0s7czsccfalqyyp3v4lhydn1wbvyxkzy8i9fsjqbyxsa" + "commit": "d6cb6d4a779eaa3570d8e451fd4d38b2b4554860", + "sha256": "0pnzsnklqjlks6ipaj242vlrk5skmwflpn1sdd00xw9gmb5mxb3m" }, "stable": { "version": [ @@ -2272,14 +2270,14 @@ "repo": "jtbm37/all-the-icons-dired", "unstable": { "version": [ - 20200327, - 758 + 20200403, + 1018 ], "deps": [ "all-the-icons" ], - "commit": "816987d339630e43f77a5a64ef308e95d341dda7", - "sha256": "01wgxdw222pz2sv7x9jwlislkasaw01bkq1nkpdp4jwl816aza8l" + "commit": "fc2dfa1e9eb8bf1c402a675e7089638d702a27a5", + "sha256": "0zhyhz4lhx0d8wwh1xxxf7ck4s621fk9757ql2ypxbr4iqh7sjlp" } }, { @@ -2531,15 +2529,15 @@ "repo": "zwild/ammonite-term-repl", "unstable": { "version": [ - 20190618, - 1517 + 20200416, + 559 ], "deps": [ "s", "scala-mode" ], - "commit": "9b3fe36654f03f6ab461bbec413f9ea014829a49", - "sha256": "09n9b1zkhaq0ikbgklnlxpgyyjf8hs9f7dcpgx5jjwi4pj0wzvi9" + "commit": "b552fe21977e005c1c460bf6607557e67241a6b6", + "sha256": "0g6ldvzcm6arm6hxiz1y168mj73kipgbjzxciif2b4sd3z7wpnp6" } }, { @@ -2550,11 +2548,11 @@ "repo": "immerrr/ample-regexps.el", "unstable": { "version": [ - 20151023, - 1000 + 20200508, + 1021 ], - "commit": "cbe91e148cac1ee8e223874dc956ed4cf607f046", - "sha256": "1mm4icrwx4mscp7kbbmlc34995r164dhrfczn5ybkyxjzzf76jn1" + "commit": "153969ce547afe410b8986f01c9ed4087c9cd20b", + "sha256": "0dkp7bcd7h2ds40wyszy11nmh7c2jxrwy04ayz7pbxh53ir7s2k0" } }, { @@ -2595,14 +2593,14 @@ "repo": "stardiviner/amread-mode", "unstable": { "version": [ - 20200322, - 843 + 20200404, + 1143 ], "deps": [ "cl-lib" ], - "commit": "76ebe8d56b4d19f2bf75f54479f0e7ecc9cbaac9", - "sha256": "09jmllb9an992mzgncxral8i7j532l8i80yvvqwaqwv9azwab5sd" + "commit": "a595828fcc2257f765139b576beb6c33b4fc3bce", + "sha256": "1mwlj48hjp59mcafia612qqzmqxh30k0jshzrnzsnwlfbbsdxjwj" } }, { @@ -2613,14 +2611,14 @@ "repo": "DarwinAwardWinner/amx", "unstable": { "version": [ - 20200215, - 1901 + 20200417, + 1513 ], "deps": [ "s" ], - "commit": "e512e74e8368f9b1cf83bee16dd2522f3b1dbeea", - "sha256": "08vx7rd36j4ls7a7i2vn7mf74vbzcyrzzv0wzqzyb8ihv4qhjc0g" + "commit": "7fb7b874291e0cdeb1f0acb18564a686ec86788d", + "sha256": "0yc2b814zcl3c6lgamrr63cl4r3ayzlyfqql8875fzflc541nnnc" }, "stable": { "version": [ @@ -2671,6 +2669,36 @@ } }, { + "ename": "anakondo", + "commit": "197ff9f72a46a5732495d97c6b0ecb526e6995f4", + "sha256": "14kypppdgvzj2plydcpd22b9wpkircr0nc6gs4rcw416h157l2bv", + "fetcher": "github", + "repo": "didibus/anakondo", + "unstable": { + "version": [ + 20200503, + 123 + ], + "deps": [ + "clojure-mode", + "projectile" + ], + "commit": "ba6b56c18f2b0ae035b448813b27114d19fb821c", + "sha256": "0dbhkinfn6ahvi9pi7kghlc0fccil15lx0pd1rpgv4d7n3bnsdna" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "projectile" + ], + "commit": "87760e8326a0e303ca66dda298a79742888b7254", + "sha256": "1l58l0gj3my61yi55hak0c8y26dc2sn8kzbs80v3vsfr6pq916vx" + } + }, + { "ename": "anaphora", "commit": "8505db1945071a15ba0f2bb74b58d4a6875ca7d6", "sha256": "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2", @@ -2756,11 +2784,15 @@ "repo": "rudolfolah/angularjs-mode", "unstable": { "version": [ - 20151201, - 2127 + 20200510, + 1729 ], - "commit": "8720cde86af0f1859ccc8580571e8d0ad1c52cff", - "sha256": "04kg2x0lif91knmkkh05mj42xw3dkzsnysjda6ian95v57wfg377" + "commit": "b24020768217f16b1b86aa236e9729b3d40e17b3", + "error": [ + "exited abnormally with code 1\n", + "", + "error: unable to download 'https://github.com/rudolfolah/angularjs-mode/archive/b24020768217f16b1b86aa236e9729b3d40e17b3.tar.gz': HTTP error 404\n" + ] }, "stable": { "version": [ @@ -2845,8 +2877,8 @@ "repo": "davidshepherd7/anki-mode", "unstable": { "version": [ - 20191020, - 1441 + 20200413, + 1019 ], "deps": [ "dash", @@ -2854,8 +2886,8 @@ "request", "s" ], - "commit": "8022fbab57c47581102af831b4405fc27f71db92", - "sha256": "1nyiqd3093dbcimljj09vidanki6nbrzknzdxw4rkbl2kd1wfvlf" + "commit": "fcbcfa7cd7fb5c282e1138322e61242942729e3d", + "sha256": "06ab3zdaz5wf30zbci7cav3dvvnknnbzq18zfzzfi4xjcsi0zkvr" }, "stable": { "version": [ @@ -2930,11 +2962,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20200317, - 1703 + 20200330, + 1640 ], - "commit": "44b378b16ad407c36e8cf728e671c17116d854b6", - "sha256": "1xhmgadi4maci25si3mf854d0ammz7w9l317r4m81v1gkdfvv8wi" + "commit": "f0a71bb14806c79f09cb6aacb5ef98a852ef66e2", + "sha256": "1v2rbrhqg4kipk4l901xzfdc4wm5fkvvx4j3l8mfp7nvc2x8gcbw" }, "stable": { "version": [ @@ -3206,22 +3238,19 @@ "repo": "emacsorphanage/anzu", "unstable": { "version": [ - 20200328, - 2019 + 20200514, + 1801 ], - "commit": "61cb32aa61f9bd088c519ea3cc96b81e241efed7", - "sha256": "1b2zjich6mvypycsrz5jkpv5mbaj77jka17vcc5ss2390dad92f8" + "commit": "7b8688c84d6032300d0c415182c7c1ad6cb7f819", + "sha256": "09x4hhycnv4sc472fqv7z8jpjx8viap5hb143yri3wkwa15bqd3b" }, "stable": { "version": [ 0, - 62 + 63 ], - "deps": [ - "cl-lib" - ], - "commit": "3328619fec138862302bbe1b9acf2eea624a4c5e", - "sha256": "1lzvc0ihcbplir4hqfyxfqpsd78arz15gk92kmq4f8ggbkl37fan" + "commit": "a5a22fd537cb3bd2194d1eecc91dca418bedf442", + "sha256": "11k30174a0z738gcmvpvk8wxsnsdnaf4qphrz0aq8yy0k1pidav2" } }, { @@ -3271,20 +3300,20 @@ "repo": "dieter-wilhelm/apdl-mode", "unstable": { "version": [ - 20200329, - 2024 + 20200501, + 1904 ], - "commit": "af7764828555486a78727194a001193d03dc12f0", - "sha256": "1p5w7kzmmsc3ayh4rvmd0a9g9wchvddhr22dx3jl7dx42s3sig5m" + "commit": "ee5f546f6659b9ca3c6895a1959087531b4a016a", + "sha256": "1qpqji2qx4srxk22684gh3sjj8sa87kd5fbr1xh8dscn19h5yvx9" }, "stable": { "version": [ 20, - 3, + 5, 0 ], - "commit": "17bbc63239d2b791887c3d263fa7b4e8ea9d0ccb", - "sha256": "0g9nf0853c56w8vpzys4rxw6ki887ajr3h7cgqb295aa16bg65x7" + "commit": "ee5f546f6659b9ca3c6895a1959087531b4a016a", + "sha256": "1qpqji2qx4srxk22684gh3sjj8sa87kd5fbr1xh8dscn19h5yvx9" } }, { @@ -4156,6 +4185,29 @@ } }, { + "ename": "auth-source-xoauth2", + "commit": "8ba0273c8aa2a50b9dc9b8312b860d94dfd808d5", + "sha256": "0g06240ix4gzw3fb74jcadiq7nissi20i1vsbzhkx35j10mv7wn3", + "fetcher": "github", + "repo": "ccrusius/auth-source-xoauth2", + "unstable": { + "version": [ + 20200509, + 2304 + ], + "commit": "5e646a32c9ba31a015a09fce1ad711b85717119a", + "sha256": "0nl859csl8xcd6ybpjj15ph8l8fxwkwf45kbylss68alkyf1rl3v" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "5e646a32c9ba31a015a09fce1ad711b85717119a", + "sha256": "0nl859csl8xcd6ybpjj15ph8l8fxwkwf45kbylss68alkyf1rl3v" + } + }, + { "ename": "auto-async-byte-compile", "commit": "f8e4328cae9b4759a75da0b26ea8b68821bc71af", "sha256": "0ks6xsxzayiyd0jl8m36xlc5p57p21qbhgq2mmz50a2lhpxxfiyg", @@ -4234,8 +4286,8 @@ "cl-lib", "popup" ], - "commit": "2e83566ddfa758c69afe50b8a1c62a66f47471e3", - "sha256": "1rkqjq7wr4aavg08i8mq13w85z14xdhfmpbipj5mhwlpyrrci4bk" + "commit": "2f11a4e6ff7f5d4939c3e1724158411a7efed057", + "sha256": "067ymm5swi9yq3sndzghqxlyyywzk434ip68nf6fxbj51raxzzq8" }, "stable": { "version": [ @@ -4541,11 +4593,11 @@ "repo": "mina86/auto-dim-other-buffers.el", "unstable": { "version": [ - 20180612, - 2341 + 20200516, + 1608 ], - "commit": "ec74b4803adeadf06296c84595fb6ccf4e1b4a3f", - "sha256": "0l08kx12k97nag8khb63rz5fl1r9gahgmjg5073h25lypl74895n" + "commit": "f712de72d4618ce6c5d55ba20c848c83a87c5f32", + "sha256": "17dsdfs9l3g4jnna5b2pzifvxv13rr5rja76frl5wwp2brfmq8qv" } }, { @@ -4632,14 +4684,14 @@ "repo": "rranelli/auto-package-update.el", "unstable": { "version": [ - 20180712, - 2045 + 20200421, + 309 ], "deps": [ "dash" ], - "commit": "55870d313fbe9db40b1a2b59dbc420ba66a9297e", - "sha256": "06hnr7id7w774adip0yffxh6c2xk27j2kch03r8y0v19mnfrvb39" + "commit": "cf7f7486ed699f2ed7cc8af950740aece0de6124", + "sha256": "14sq8p3qbhlfmpisanjxpginiibngmb84mjga97aq5sgpxy38wix" }, "stable": { "version": [ @@ -4784,14 +4836,26 @@ "repo": "ncaq/auto-sudoedit", "unstable": { "version": [ - 20200122, - 857 + 20200427, + 635 + ], + "deps": [ + "f" + ], + "commit": "0ad8247fdd0f1d747cd1ff73adb6b5efcecc7f3b", + "sha256": "10p0hc95j382km8655pqld9wxg10j1f36czzppkdd6a55cxarv9f" + }, + "stable": { + "version": [ + 1, + 0, + 0 ], "deps": [ "f" ], - "commit": "bfad607be640bed3a107e36c91b091e136c1c9ec", - "sha256": "0nwnmqhfy4378p43a12bc32y4qqw349xjkrdh6x7fkdsd4wpf7f4" + "commit": "0ad8247fdd0f1d747cd1ff73adb6b5efcecc7f3b", + "sha256": "10p0hc95j382km8655pqld9wxg10j1f36czzppkdd6a55cxarv9f" } }, { @@ -4822,16 +4886,16 @@ "repo": "robert-zaremba/auto-virtualenvwrapper.el", "unstable": { "version": [ - 20191120, - 1159 + 20200510, + 1006 ], "deps": [ "cl-lib", "s", "virtualenvwrapper" ], - "commit": "6380e8986d593655021f7f884d0d21895d7e63ad", - "sha256": "18k7azy456l7qizn3xnpb2dkj58gfrxy5q77dwplgakyvkr13y8p" + "commit": "30fb54aa3c99f3c614ea9a92669d634df30c9439", + "sha256": "19qycxf6ln60s604j5rn3qfsy2rbzdbw4gwkiprdiq1bkmphbwzj" } }, { @@ -4897,8 +4961,8 @@ "deps": [ "cl-lib" ], - "commit": "b5ac7436be372dffc97280f4b835f61ab6b716d5", - "sha256": "138kzn20gfy6dj15nkfwsz7lz91n6ffsjzz2kkmclnfkazxixjhq" + "commit": "9e7a101e1563eaf6f5d671e5877d652079cea78b", + "sha256": "0khhmhh5fv004xhs3v8v8y3m8i1ibi19w74sv4shpy0ixd5zq1bj" } }, { @@ -4909,11 +4973,11 @@ "url": "https://git.sr.ht/~zge/autocrypt", "unstable": { "version": [ - 20200327, - 1958 + 20200505, + 1717 ], - "commit": "f970fb51c80d582dcc6682106388d6a870ef2c83", - "sha256": "0qfawvnjyc0rrvr5zhkq7ngllrf5h9z3wsi2a75s74545d6nyyjq" + "commit": "d77140654405cabd007621606aca9beb512dff7a", + "sha256": "0cr2q5dfvh85m6zlc2glssxj81py0hrvg9kh7bk6r33j0zygbr7r" } }, { @@ -5018,8 +5082,8 @@ 20190331, 2230 ], - "commit": "052881b101d8c2d11c89ae4f1befe7a999de987e", - "sha256": "0k9sjjsqxnrh0cq6m3cd9rk44n0rjbjgqcbfv6fg33a0gpybvryf" + "commit": "bcd3d76a47b4f0e7c382fb680b14f40208dae568", + "sha256": "0sgzjddd34icbbm4pc7v1662k6288pkr70ki4p2j3q4mh9qqc8q7" } }, { @@ -5125,14 +5189,14 @@ "repo": "abo-abo/avy", "unstable": { "version": [ - 20200311, - 1106 + 20200422, + 1153 ], "deps": [ "cl-lib" ], - "commit": "3bf83140fad4c28f2dc4c7107b9d8fef84d17cb9", - "sha256": "1zicf7xynvxdx0pvg0zshvllabmjprvprjgg54phcbqlilcrq0hk" + "commit": "509471bad0e8094b8639729ec39ca141fae7d4bd", + "sha256": "0kj4nbp8g22xyvjdy8vh54v6zgd4f3z6srrw5pd55gbczm5csnbj" }, "stable": { "version": [ @@ -5319,11 +5383,11 @@ "url": "https://bitbucket.org/pdo/axiom-environment", "unstable": { "version": [ - 20200109, - 2207 + 20200411, + 1031 ], - "commit": "2c5384b994266008a20558db4ffe0525e66c0f5f", - "sha256": "17f40w9r4whz0v007pp13w060jq87ag42p21hcj93c14py5s4g67" + "commit": "25932da0dc40c6877463cbf019b14ab05a6b0164", + "sha256": "1xbps0k4x982gh1a0pscpx4kayjjyykvm5pyj516wwkya7bac4a6" } }, { @@ -5569,20 +5633,20 @@ "url": "https://git.sr.ht/~zge/bang", "unstable": { "version": [ - 20200325, - 1053 + 20200510, + 1107 ], - "commit": "11e121aed7f5fe90700bd3f49d987bff0a796c2d", - "sha256": "0y6rdfhywjp0d4l39hjhlzzwp64wgd3xrvr80c2f6xbc74c6l5hk" + "commit": "f80c7c394b57057499db6409f386ade9ac32f763", + "sha256": "0mj2kr13gpvy4kpzxvy1jmz0c9cdnikazlsb9j0dx94f9777sy04" }, "stable": { "version": [ 1, 0, - 1 + 2 ], - "commit": "87b5ad3c81ccf0f2435e3c26ad7f9a1d6191ddb9", - "sha256": "10cybpw6wks2p21g1cz9rr6chvhv1s7jasrnzbcgpg8vkzb3dj48" + "commit": "1fb0162ffd2115080d4e1ddf65935277cf3c75db", + "sha256": "12nr5la6y5dnh46rfij3p1srgpwdc3fiaf4ckfx6f9kl0n1zyrls" } }, { @@ -5661,11 +5725,11 @@ "repo": "belak/base16-emacs", "unstable": { "version": [ - 20191031, - 1607 + 20200414, + 2048 ], - "commit": "9eba6874c80ab429bf5cbf6c76bb0399d3d2a2cb", - "sha256": "0ag5fsr3377rz6xfa0b9j54r90zh0yiz98kpa27xzhky4f5jpdah" + "commit": "d68512c0856f57a19cd49d1034199836352c15a0", + "sha256": "1h98ra53i7hc7zi9yjc6p29f70r04hivdczhw4imds13akq6j034" }, "stable": { "version": [ @@ -5720,6 +5784,44 @@ } }, { + "ename": "basic-ide", + "commit": "9aaac29f5711f93f9ba7c14e5a332888e8920a86", + "sha256": "1pvgbc3vxqm4l8qc43g7b4viz4ilw828k9qlmb6ynzmij5ykrfrq", + "fetcher": "gitlab", + "repo": "sasanidas/emacs-c64-basic-ide", + "unstable": { + "version": [ + 20200429, + 1104 + ], + "deps": [ + "basic-mode", + "company", + "dash", + "f", + "flycheck" + ], + "commit": "0f75c944239960445f1e9c8a0b5f7a5b4d37ff89", + "sha256": "0xmi27b3zs8bsvcf9405rg88cjz1x2nivj5pvy6gjy07r9dl7ngf" + }, + "stable": { + "version": [ + 0, + 0, + 3 + ], + "deps": [ + "basic-mode", + "company", + "dash", + "f", + "flycheck" + ], + "commit": "5bfd5f91b9f91e46158e0419c6bb5c350e7684a1", + "sha256": "0nb6dbk8aclkq7jki52y4lwgbxg61xh1598l08yfv2l1ykhgg0n0" + } + }, + { "ename": "basic-mode", "commit": "71801bdc0720f150edeab6796487c753c6e7c3f5", "sha256": "1l0ylzww7jg6l804fdrklhay4is0wx1drfi9l9wn7gcdjh76mr6g", @@ -5794,17 +5896,17 @@ }, { "ename": "bazel-mode", - "commit": "3945f7eba7d5f248cace11a7946262ac2500b01a", - "sha256": "10590pbpg6mwkcwlm01nxf0ypw694h1b57frvn5rnc53al87i586", + "commit": "10f3918c55426c8c4754ef0dfccf19300e516012", + "sha256": "1gylmwlhzg6kgj9936799ppahbhicrxn2zpbr3417qycib84nl8x", "fetcher": "github", - "repo": "codesuki/bazel-mode", + "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20191110, - 2228 + 20200515, + 1408 ], - "commit": "7798e33cba5db14eb2c06ddcbc4e8fa361eb679c", - "sha256": "0gjm8276qj3a5kmh2qg93yadjhc2gcny058zpxwr6sialq9p7iwz" + "commit": "39d4649f4a179e22fabbef1166afe1725c8dbea6", + "sha256": "0n5kqjcmwfbr58my3yisgfigh77rhy5b18jr4kh2b327r76ssqwl" }, "stable": { "version": [ @@ -6099,11 +6201,11 @@ "repo": "DamienCassou/beginend", "unstable": { "version": [ - 20200203, - 1035 + 20200415, + 1752 ], - "commit": "3ab68d77839060f5e85bbf9455846b68cc63ef00", - "sha256": "049r18sa4646rhp2cidpdnk09c87xxf52d6mffq82xphzsniqarz" + "commit": "bb51f7ee9229ff0b6ec5ba4a730f7360246fb9ea", + "sha256": "0l7lbmn6ljh8yv7ch2fax47mr7kxly5b5ps5vg61ra15nv8v5vfr" }, "stable": { "version": [ @@ -6178,6 +6280,21 @@ } }, { + "ename": "bencoding", + "commit": "a668dc6c90a3be1a51be7478e385b9ab395f6852", + "sha256": "1qjk71gkzqq07yy84i0bkyg2wh0jn4gvglcknpcia38dd80m8b7z", + "fetcher": "github", + "repo": "xuchunyang/bencoding.el", + "unstable": { + "version": [ + 20200331, + 1102 + ], + "commit": "f0af19511831f3ade590879e7d1636387682a8e7", + "sha256": "1sfj694a6yjc4qwkxn2yvnl8xp8rzrkdgnsaj8ncwdyaa50xgw78" + } + }, + { "ename": "bento", "commit": "aad104fd26adb419c5da1e3472807244794e8949", "sha256": "0a7yaikvaxxk8wmr7f9darpwb4r17rkzxcxaagfypn8n5kswddj4", @@ -6373,14 +6490,14 @@ "repo": "cpitclaudel/biblio.el", "unstable": { "version": [ - 20190624, - 1408 + 20200416, + 1407 ], "deps": [ "biblio-core" ], - "commit": "efeeab720cb8e3f95ddb4298d0cc62393cf237e9", - "sha256": "1ikp1899sn8v46ng561nfj7j7vg234l3n8l8xx3gg7yxp2l9g8ms" + "commit": "eb9baf1d2bf6a073d24ccb717025baa693e98f3e", + "sha256": "0s7wld8ikfyn2rz8zr4g3lj59b2g95mj1jnqw6xvmxys0ahnb0r5" }, "stable": { "version": [ @@ -6420,16 +6537,16 @@ "repo": "cpitclaudel/biblio.el", "unstable": { "version": [ - 20190624, - 1408 + 20200416, + 307 ], "deps": [ "dash", "let-alist", "seq" ], - "commit": "efeeab720cb8e3f95ddb4298d0cc62393cf237e9", - "sha256": "1ikp1899sn8v46ng561nfj7j7vg234l3n8l8xx3gg7yxp2l9g8ms" + "commit": "eb9baf1d2bf6a073d24ccb717025baa693e98f3e", + "sha256": "0s7wld8ikfyn2rz8zr4g3lj59b2g95mj1jnqw6xvmxys0ahnb0r5" }, "stable": { "version": [ @@ -6460,8 +6577,8 @@ "a", "pdf-tools" ], - "commit": "eab07dae119129066624e692c1c75a53b2ab10a5", - "sha256": "1q9g8kza6hv6pv1sjzkl6b4gxcx6fsvv8lk5w7kk9gpws5vjz5bz" + "commit": "61a14d1a8c17930caca5c5daf893cedc9c23c5f3", + "sha256": "0acq8d8vlx3hd405wmi5w36gg88bz1c1crmlxbd2whgi8kyf506z" } }, { @@ -6502,6 +6619,45 @@ } }, { + "ename": "bibtex-completion", + "commit": "873ae2af16e03c8e10494be3f0e7840eb27172a3", + "sha256": "06mg9fwp6jwr6fbnzh4z8am47bspcl8hv0icmdpc9lmzbcyfpg8f", + "fetcher": "github", + "repo": "tmalsburg/helm-bibtex", + "unstable": { + "version": [ + 20200513, + 852 + ], + "deps": [ + "biblio", + "cl-lib", + "dash", + "f", + "parsebib", + "s" + ], + "commit": "8a0dd9841316793aacddea744d6b8ca4a7857a35", + "sha256": "1av058d7888kr3q15y1122r8jkarfw1s83gvkillj7kyzj3i53m5" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "deps": [ + "cl-lib", + "dash", + "f", + "parsebib", + "s" + ], + "commit": "d6a98ac6f28d2a6a05e203115211c98333d40aca", + "sha256": "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23" + } + }, + { "ename": "bibtex-utils", "commit": "5764b6a880e8143db66e9011cc1c2bf0bcd61082", "sha256": "13llsyyvy0xc9s51cqqc1rz13m3qdqh8jw07gwywfbixlma59z8l", @@ -6524,11 +6680,11 @@ "repo": "tarsius/bicycle", "unstable": { "version": [ - 20200103, - 1237 + 20200429, + 1021 ], - "commit": "91d9f946690df0a1ed866f2cd1eab1b2e7c7480a", - "sha256": "0pkn99srwyvyibz5zxkh58csbf598x26f31mpizacx3bs4nys0qb" + "commit": "1bd8836171cf8da0be836fc407f2f140f52bdeb1", + "sha256": "0zd8ls2qyxgdzkmhl7mxlh7wbkp627kync8zg95kvrh3qymf5vys" }, "stable": { "version": [ @@ -6551,8 +6707,8 @@ 20200325, 539 ], - "commit": "773a6dde790c4a240e643a9071e4c7bce09d40de", - "sha256": "11dirb13hblfa95hqqshrsjri4d4qzcq5qhhnd4xqajdchr62758" + "commit": "de8d09b08b0b30714c4f9b98c97e9577d47b9be6", + "sha256": "1z3jk232i0h2zakvbkfpb5a5qdbzfqn4zvbja1hms9349x54a07i" }, "stable": { "version": [ @@ -6852,11 +7008,11 @@ "repo": "raxod502/blackout", "unstable": { "version": [ - 20200326, - 1640 + 20200404, + 1550 ], - "commit": "87498cc91916c2f41d28e93fd80102c42b93ccf6", - "sha256": "156mnqwcpv3zl5pklqvmayq5j76hm4jc3has4qydfygz8fhx1zhy" + "commit": "d99ab1aad84e4bd2bd4a499877764c213cce50ff", + "sha256": "0ay49ars61vr43n4bd3k4n1w89ilmw7d8s53ifixgw0vvjkz74z1" }, "stable": { "version": [ @@ -6926,11 +7082,11 @@ "repo": "Sodaware/blitzmax-mode", "unstable": { "version": [ - 20200211, - 2205 + 20200415, + 1529 ], - "commit": "4814c35007035f0e26e0fadc50fffc4ab6d298ad", - "sha256": "160jd2rn1lgwgnm1ygdcsz1z0yxg9f1ps9wxqkv30xnkbnnxq10c" + "commit": "5f67bb3c8e4baf1f6881cc998f9f031641a7b08a", + "sha256": "1hcx6b3ka0n6sbi9p0z2wqlsxk5d2pvkjawpcyh40b5f1r6dpfmc" }, "stable": { "version": [ @@ -7126,8 +7282,8 @@ "deps": [ "cl-lib" ], - "commit": "b5df3647f55359f8546dcfa991a351673a069a49", - "sha256": "1rfv036wzlrbqbki5i24871a9f2h6zk7yqd1lq6gnqrc4y7m477c" + "commit": "6c8fa1b4961e279ae63130902996c5f71a2e64e4", + "sha256": "0kph9898s2m086p8gj97bbzr7mba9y7hmyxh1z4mgpv5808zvd05" }, "stable": { "version": [ @@ -7255,16 +7411,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20200212, - 1535 + 20200514, + 1227 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "19bc70fa6f9e5c001f8ac714ce90af14788f35dd", - "sha256": "0ippdjd4j8y1xx438pvxiw0h0my6zdmvnbpay3fckrssirhi1m6l" + "commit": "57271ed2ddca96c77b83b282019852d1cffffd26", + "sha256": "0mmyxi75hlg1lkvpk4lq5nagmcsmjijmkcmmkkq25llf7nmik8as" }, "stable": { "version": [ @@ -7288,16 +7444,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20200223, - 1448 + 20200513, + 1954 ], "deps": [ - "dash", "epkg", "magit" ], - "commit": "3cfb35f5c54a76f200272ed11b4a39f11a57552c", - "sha256": "1y4c7bdy4vzv630d3yxhgq3v29q5f071d30kig4wwv460nai7c4c" + "commit": "f6a2e0cb8c3db5840c717114caba93793f2e9661", + "sha256": "1sa0wk7xj3qsk9fr4z2av80gp8n0804zylx3d27pdwm8bjyfzf7b" }, "stable": { "version": [ @@ -7504,8 +7659,8 @@ 20200321, 2126 ], - "commit": "51f2d43e08960aa65a67273101733636026790a6", - "sha256": "0dzgkpaqlrqfzsmb61idlrp91vs3lrcymbdd4k6ls58kdv75v1j8" + "commit": "3b34032bdde6a37b4566c45ce93cb38da21d4965", + "sha256": "16p4404mxqgl1zqdalnq3bvbhwv11wgfl42871lxv3nndcsd30gr" }, "stable": { "version": [ @@ -7621,6 +7776,21 @@ } }, { + "ename": "brutal-theme", + "commit": "e415b9a4d269cfee5ee2b0e58acb18804c2a8cb7", + "sha256": "1xjj2ssw3lbx21w6g4m6vqc471v8jgmgk0zw1z1hkmygg0xipgl3", + "fetcher": "github", + "repo": "topikettunen/brutal-emacs", + "unstable": { + "version": [ + 20200415, + 602 + ], + "commit": "ee63563b7cb07aeec342722ae684426cb0465a98", + "sha256": "1wx6771iv4psvlwhng0n09g0w3yml1pw3ga5lghjz9j6hba0bc6s" + } + }, + { "ename": "brutalist-theme", "commit": "ec889956a5685c3a60003ad2bfa04b03b57aa8e8", "sha256": "0dg0432r3cpjgdlpz583vky4hj5vld9d25dvaj6nxlir2ph9g9hn", @@ -7946,14 +8116,14 @@ }, { "ename": "bufler", - "commit": "b50d5939113ca9a8ad1ba606f3d3030f110a800b", - "sha256": "0y1gfpb99777sxizxvqyffsmbv6ib4zasi2dyrf8imf4z45r6adh", + "commit": "4ba5657f237eea9073a46a4127be5795be07c687", + "sha256": "1zxvkrgwk7v3404vcwyv5nag60ri72qqi5fkpwwmzc9cs2bckj20", "fetcher": "github", "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20200318, - 2005 + 20200409, + 1253 ], "deps": [ "dash", @@ -7962,16 +8132,23 @@ "magit-section", "pretty-hydra" ], - "commit": "39e756a23196d12792a3af4a06ab024d8235ee19", - "sha256": "1b9ddgdd7b6x6353f8s6cv97xqsmmka6vwmv68sq75104wr189w5" + "commit": "b2b260e4f9e8ba76bb8b4d71344c7b75e05ac44f", + "sha256": "0ww7z2xz185i97wa1rnmqwlx2mvwx69hhlyi5m3sm0nkyckb2hjs" }, "stable": { "version": [ 0, - 1 + 2 + ], + "deps": [ + "dash", + "dash-functional", + "f", + "magit-section", + "pretty-hydra" ], - "commit": "2eca0959657030c5853020da017fe98a19bba3f1", - "sha256": "0yqgaqz41sbfdbvjxf773p5m2qsr4mm22j2qgn3mp0z1r5dx67ai" + "commit": "d6c79f04b7d288174d8294fb30488b567586364d", + "sha256": "0l35ssjry15wqcxnr8rf5lrv856pgnm0k2d4d6ag14ypjx9nfhw3" } }, { @@ -8030,14 +8207,14 @@ "repo": "alezost/bui.el", "unstable": { "version": [ - 20181218, - 1830 + 20200426, + 2219 ], "deps": [ "dash" ], - "commit": "508577a7225b3d07eaefa9444064410af2518675", - "sha256": "0d9s0gdy5wda86jn8hjs1rq9rbwz5syvr8jxdks3iy27k4hp4wil" + "commit": "28a9b0a36cb69b931cf32db7546ad5c6589752cf", + "sha256": "1gwb95pjwv9k0iq290mcyyl0xasr3jldr086rrhabxpcc9ih3yv8" }, "stable": { "version": [ @@ -8275,11 +8452,11 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20200308, - 2200 + 20200509, + 2224 ], - "commit": "b360e3501703d8829a7dfc2d141e8c7c32c9bcfe", - "sha256": "0b3xkykfw8888zdg5w45kzij0d547j67crpc62mizh0fnc5naqvr" + "commit": "e71a40f1ffef4847df28c9d4ad7edc1e360ee52a", + "sha256": "0avmxbxxsazd14h5avsrqh2yyfnp8jan64sbp5ih2c9hm7xv5p1k" }, "stable": { "version": [ @@ -8304,8 +8481,8 @@ "deps": [ "buttercup" ], - "commit": "400227a45164e4e849048d288a02ab8243d09cd2", - "sha256": "1z972i1pzg8bkrzzbjha802486mybqyh9bhbvfk2sr6nzhvx2w1k" + "commit": "3ae4f84813c9e04e03a6e703990ca998b62b6deb", + "sha256": "0ndxbh2jff6qryczawzbg580744h18z7grg82dpg7fv0rbxnyi3j" }, "stable": { "version": [ @@ -8560,6 +8737,25 @@ } }, { + "ename": "calc-at-point", + "commit": "9ab725281ae66c1b97875518614a0f6312ace3a8", + "sha256": "1yzb2gmmdrcckgq1kd1gcbnbqf65aia7nx4j2lgrh2n9dlp40d03", + "fetcher": "github", + "repo": "walseb/calc-at-point", + "unstable": { + "version": [ + 20200406, + 1618 + ], + "deps": [ + "dash", + "dash-functional" + ], + "commit": "11e40c8db9493ada71964b73069c6db529016492", + "sha256": "06dmm6b2xflkwgk5mysi3ycbi6yz5n0sci191a15nnzxg7vh1fbf" + } + }, + { "ename": "calendar-norway", "commit": "c5d01230027d5cec9da2545a9ce9270a611f6567", "sha256": "1i23ks0bnq62bvn3szvqf0ikcam4s92yvr998mkjxhdhc94zd19c", @@ -8721,8 +8917,8 @@ "repo": "beacoder/call-graph", "unstable": { "version": [ - 20200211, - 240 + 20200402, + 910 ], "deps": [ "anaconda-mode", @@ -8731,8 +8927,8 @@ "ivy", "tree-mode" ], - "commit": "768a1b2169dca60a130204065dbc54bdff415b0f", - "sha256": "12f9wc3kp3pafip283yr8qd5s93nmcf84b07i72fv69nxxi4a41q" + "commit": "2f47dcb65ed8dc5393df846b4175a4872e254c05", + "sha256": "0xn8xk2x3ih22vlfjvnl6853ddpk57q70z9b0vwhjvwmi4idz7xp" }, "stable": { "version": [ @@ -9190,8 +9386,8 @@ 20200314, 1557 ], - "commit": "37593d191b255d8633231099c70b1b26b3da0d39", - "sha256": "02pn3pxawl6268sy981iqialzyj9zy9dz6ci9jrkvbc8gp9gcvwh" + "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b", + "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji" } }, { @@ -9240,8 +9436,8 @@ 20200314, 1557 ], - "commit": "37593d191b255d8633231099c70b1b26b3da0d39", - "sha256": "02pn3pxawl6268sy981iqialzyj9zy9dz6ci9jrkvbc8gp9gcvwh" + "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b", + "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji" } }, { @@ -9252,11 +9448,11 @@ "repo": "cdominik/cdlatex", "unstable": { "version": [ - 20200305, - 809 + 20200506, + 739 ], - "commit": "a5cb624ef5f9e3d51fce6faa8dc153277f61043a", - "sha256": "0gicai05d21909mjjvfc6194ygrqg2pbff60pjh3w593c4l4jmcj" + "commit": "480387b39f6ddd9cd2a9511ecee064ad8e1dd324", + "sha256": "1y5c2ycvmij7klvc9rhg265ha23xlh2hi4q5w50xljzh2mmlp3fb" }, "stable": { "version": [ @@ -9375,15 +9571,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20200325, - 1236 + 20200511, + 1242 ], "deps": [ "cl-lib", "powerline" ], - "commit": "e6bf9f5257fa5401695e0e33d0376a0821ac2f2f", - "sha256": "1gm06par7pglwj25ydvlp1n2vniq6283mm0g4s53ra77ywsz73jv" + "commit": "57afd81c7fd6449239af7adcda4cd2192976dbb8", + "sha256": "1sa4anfqvhidn7kxqnchk0d8kc2v0l3cxbf0bnwwx7nk04gjvshg" }, "stable": { "version": [ @@ -9406,11 +9602,11 @@ "repo": "andre-r/centered-cursor-mode.el", "unstable": { "version": [ - 20190306, - 1006 + 20200507, + 1529 ], - "commit": "90e6d68a74d134f67c32d0621d64db90703c46eb", - "sha256": "05x1hppnmhinb92zblkwdpwkf0bhk7jsj2mms8mi1gl27pn7zg14" + "commit": "f376bdb882047347345d5f0e3ec3fcef63ee93ba", + "sha256": "1dnc0vjy6z6kdh8h8bmwi5vgyvy2z4405qpxb20d0dbly8qz9fns" } }, { @@ -9421,11 +9617,11 @@ "repo": "anler/centered-window-mode", "unstable": { "version": [ - 20171127, - 949 + 20200426, + 1053 ], - "commit": "24f7c5be9def20879f46659082d497e67b55d7af", - "sha256": "0387x0z2l0yvbhkvh3rf3h2ddk7bvwgkpvpngwhhsjbc4hh4k3hz" + "commit": "f50859941ab5c7cbeaee410f2d38716252b552ac", + "sha256": "1l7m3gfn7j1mxs0rj1pm5avknplw2f34dd2k24n5rldfm41pf8i8" } }, { @@ -9510,17 +9706,17 @@ 20171115, 2108 ], - "commit": "f09d88781a5557d4b2b7d039757cc5e9a7ddd275", - "sha256": "10zr6a3z7gzvqvn5fb4l7hg9wi5vhmkdln0c44gskmikdsm173x1" + "commit": "dc0e180cbaf73e86d22f1d2996c7582dd0eb07b5", + "sha256": "0n9f87syrj30dn5k4vq1l7i02hzwfnadanfjbwv4a9wfjl77xy53" }, "stable": { "version": [ 3, 15, - 0 + 1 ], - "commit": "76bc1fad91478de7064380c31d333e1975cf8126", - "sha256": "1amjzy3v7rhc6djl1ldqnhpd4m3prh7lfyd5hyb9fp0v8jhyg3w2" + "commit": "e766ee2484f9a7609688ac1832ff2ca7528624c5", + "sha256": "18iv6s2g7gz2dmqhipn6ln6g4qngywcj7fm4gqwrph04bx5dfqac" } }, { @@ -9595,16 +9791,16 @@ "repo": "Alexander-Miller/cfrs", "unstable": { "version": [ - 20190618, - 1458 + 20191125, + 2007 ], "deps": [ "dash", "posframe", "s" ], - "commit": "de83b587affe374d1cf6e6c2d747696e6c33a817", - "sha256": "130g09i38k77y2kyirg54dglksl6vrypdhh4h2j8hzy1mipc5a43" + "commit": "fc5effdc25a926eada4936e5506dcccdf3902137", + "sha256": "1d18wvx2szmpvj5v26qqp2qkdmb764sfkp2f864by2hpad0rx034" }, "stable": { "version": [ @@ -10101,30 +10297,30 @@ "url": "https://framagit.org/contrapunctus/chronometrist/", "unstable": { "version": [ - 20200324, - 653 + 20200503, + 633 ], "deps": [ "dash", "s", "seq" ], - "commit": "dc0fb3bed6b893ecb924f5b1228ab718325cc808", - "sha256": "08mzv8rijsagkj4ykxlgr99axp0kxnz36d3iaffkqzyv50cm4r6f" + "commit": "16f2ca86540001b40725c4099d04154aab0a6ba5", + "sha256": "19z8wmhsqbm12h0vvzfgjmzj7g3mcpa9qgcz3cnmrr4hgkx4b9a5" }, "stable": { "version": [ 0, 4, - 2 + 3 ], "deps": [ "dash", "s", "seq" ], - "commit": "cc791cd61ee4580c9786f8c58d9e1964e0ff0c64", - "sha256": "1ccy7qz1wcmggqlf3hwigbqq4wrx1amds4x9bxz9py6bypglyjc5" + "commit": "282c338c21d01932049392f271f66e1725562efd", + "sha256": "1ljjqzghcap4admv0hvw6asm148b80mfgjgxjjcw6qc95fkjjjlr" } }, { @@ -10183,8 +10379,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20200328, - 1555 + 20200511, + 1025 ], "deps": [ "clojure-mode", @@ -10195,8 +10391,8 @@ "sesman", "spinner" ], - "commit": "dfc13f9c199920522ee02feac1d5da1c0b578b6b", - "sha256": "12yifir74qicryl5v5gl80s5m2qvlb09ck6jywx20yin3jkw6l58" + "commit": "25fb15d915117310069254016391c9d76abcebcc", + "sha256": "1hz2l2ryllwyv1zk0la376klg7yndz9q32pd1vypwymwnac93c0y" }, "stable": { "version": [ @@ -10688,8 +10884,8 @@ 20200327, 2241 ], - "commit": "7ee3f9c52f70f80820a8c66fb6f796d6e01dd92d", - "sha256": "1vgk4ci5di0dxm2ql02g1h484nd6abqiv2xa7fh2d9rbkfh9px30" + "commit": "01b39044b9b65fa4ea7d3166f8b1ffab6f740362", + "sha256": "1g1awdcqzrnw1a6gl4n87a97lniyn0ck5a51l9n6jz2m8k3idmsg" }, "stable": { "version": [ @@ -10794,8 +10990,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20200229, - 1105 + 20200405, + 1419 ], "deps": [ "cider", @@ -10808,8 +11004,8 @@ "seq", "yasnippet" ], - "commit": "92d372393a031e5fa73ef926447afe72b574cb45", - "sha256": "0lnis1qwk1gyxgapl06d7ww1mlb9a8ahl8zwa7y2n3jrgfm25qp4" + "commit": "8259791e054382457b87d1f78061b5e3ce948907", + "sha256": "0vn32b8vhlp75vj4schy8blmiddc6dn92jl4f935yd4sg7pm04cj" }, "stable": { "version": [ @@ -10972,11 +11168,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20200326, - 1542 + 20200419, + 559 ], - "commit": "2f8f3ce4974a5290a99077fcc9b36f1c42309b55", - "sha256": "145wpnbv3g2l7i6nckcs7bcrv8fj28gzpz3n0dl8vqlw0qb7hmgr" + "commit": "da9f1ec717dac1194404b4a4562dba6bd9a4ee3a", + "sha256": "0v4q031rvy34llbxhksqlzf3ign4q5xcwf6b3fzblb9k5nz2b3hr" }, "stable": { "version": [ @@ -11002,8 +11198,8 @@ "deps": [ "clojure-mode" ], - "commit": "2f8f3ce4974a5290a99077fcc9b36f1c42309b55", - "sha256": "145wpnbv3g2l7i6nckcs7bcrv8fj28gzpz3n0dl8vqlw0qb7hmgr" + "commit": "da9f1ec717dac1194404b4a4562dba6bd9a4ee3a", + "sha256": "0v4q031rvy34llbxhksqlzf3ign4q5xcwf6b3fzblb9k5nz2b3hr" }, "stable": { "version": [ @@ -11268,8 +11464,8 @@ "repo": "atilaneves/cmake-ide", "unstable": { "version": [ - 20190731, - 1009 + 20200515, + 951 ], "deps": [ "cl-lib", @@ -11277,8 +11473,8 @@ "s", "seq" ], - "commit": "e3aa1ded10c079337826b40586111df7114f6379", - "sha256": "1s1z3m3qaf6ayp69w7h95ad3k4bs2iqqzsvjf94h5wd233mqlp2v" + "commit": "a8f9e83848b513f810170988679a9ef455025975", + "sha256": "1dzqqcj9l7hr73cj65rx5iy58bsiif5521d18jym4pajhzj3mkx0" }, "stable": { "version": [ @@ -11305,17 +11501,17 @@ 20190710, 1319 ], - "commit": "887eb6b7680685ae9bc8697f30bf6406df2d318e", - "sha256": "1lcfn79fn3cn0sdhw5f50l8830w6lh0j7lhrz7la27sg4ag5rmg0" + "commit": "135b5835a42d6e3c7efb85f80f3fe0885d45d644", + "sha256": "18mgkn5cy14f5l4qajhdphxvw66hhhw2yf12qfvpd2n5bx3b8dcs" }, "stable": { "version": [ 3, 17, - 0 + 2 ], - "commit": "e3185e3d1b92a95c18f22f70b3cef6944dd019eb", - "sha256": "1r8nnaisx10d5r3kzyfz4af9mwb5f0nzz8nmn3xvnr12rryg2bwl" + "commit": "615129f3ebd308abeaaee7f5f0689e7fc4616c28", + "sha256": "1akclhrc9gx0asvmwcsbvw90wgazlyqd044wql7qj6vibv47cdjd" } }, { @@ -11491,8 +11687,8 @@ "deps": [ "request" ], - "commit": "055c9ce9c1b630d062305919cbffb9cf88fd24a8", - "sha256": "12rydfm05i1qvav1c73wwlk63i8mvqi148hdx1fks7al4lkhg2nl" + "commit": "0d5be395d4233ea533e6eddf50af725c51304205", + "sha256": "12b2skhp9x17ffh1jxpl0nw7cybq9a2iyqmp3fwmvrr51mdg6va1" }, "stable": { "version": [ @@ -11768,8 +11964,8 @@ 20200315, 929 ], - "commit": "6c25e4f29e1c75dabd350e04c190e81f7bca3cc3", - "sha256": "0fi0w7mjardvblqwvii9grgfzd11mjr2c35vzbq5dx01ydfib387" + "commit": "40464198e7bf2121694a7e6d87588342140a84ff", + "sha256": "0fhr0rvfrb9fmbh9zgzxx2c2zl28v16hxmn9jx6k73nsfwpy498j" }, "stable": { "version": [ @@ -11815,11 +12011,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20200220, - 1500 + 20200507, + 608 ], - "commit": "437bdd7a96fee751c6f817aff0100dd44bb07b23", - "sha256": "0cjbl7m6a0mmiiidn7w7hcggc58l5503swfnasbzyd1pzdrnn15y" + "commit": "e4e577c24db6ad7f6940a13e1d58418d42ff0c81", + "sha256": "0363fi2q4wprnkrdlvvbsib42czsf4fwhy61c6b9bbj8fvmflzj8" }, "stable": { "version": [ @@ -11950,11 +12146,11 @@ "repo": "cyrus-and/comb", "unstable": { "version": [ - 20200114, - 1325 + 20200411, + 1040 ], - "commit": "bd8e11b8593bc48f81ce01c0657d5a7977cafdf6", - "sha256": "0ndz25x1l0rzn5j8xg9ql2s2lgin1893kzf722chyk8147qwb0i8" + "commit": "59e025c3afb867706b869ac4bf2623665eb99821", + "sha256": "16swixv88nbs6gscgzy5lizi66pw0c9fm03xpm1kinan8v2s9m3v" }, "stable": { "version": [ @@ -12246,11 +12442,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20200324, - 2145 + 20200510, + 1614 ], - "commit": "61ddd9afb58879267bf947b152a68f3dbadb9259", - "sha256": "097xy8ar6dms4zn7ymxxgmhap096fs8nc5j3js5srzmv14rswm36" + "commit": "1c7a87283146f429c5076e8ea0a559556a4d4272", + "sha256": "0dvvdyg8fc6jzcl1hgrh0cr3nz4vyw5i9xz5w3mc3mn7fixbdcr3" }, "stable": { "version": [ @@ -12270,8 +12466,8 @@ "repo": "pythonic-emacs/company-anaconda", "unstable": { "version": [ - 20200129, - 1830 + 20200404, + 1859 ], "deps": [ "anaconda-mode", @@ -12280,8 +12476,8 @@ "dash", "s" ], - "commit": "a31354ca8ea35c0b2c1f6bb2b1a02a6cfb5e564b", - "sha256": "05qaxb3qpz3bi6c88qspf50sh15hzc01354zhj0amd07bmqzhwfg" + "commit": "da1566db41a68809ef7f91ebf2de28118067c89b", + "sha256": "1x260p0fj33xg6hkrz9q9dqrpibp4yn2n9is3a6s4xxfb485rz0g" }, "stable": { "version": [ @@ -12388,8 +12584,8 @@ "axiom-environment", "company" ], - "commit": "2c5384b994266008a20558db4ffe0525e66c0f5f", - "sha256": "17f40w9r4whz0v007pp13w060jq87ag42p21hcj93c14py5s4g67" + "commit": "25932da0dc40c6877463cbf019b14ab05a6b0164", + "sha256": "1xbps0k4x982gh1a0pscpx4kayjjyykvm5pyj516wwkya7bac4a6" } }, { @@ -12420,16 +12616,16 @@ "repo": "sebastiencs/company-box", "unstable": { "version": [ - 20190311, - 1745 + 20200511, + 401 ], "deps": [ "company", "dash", "dash-functional" ], - "commit": "8fc6168f2d3a0275156dd3fdf46ba496adbab226", - "sha256": "0mmn7lzl69hmy8rlzhwqb2ffgk29mb2ybb149cdpk7ydv1h63hqn" + "commit": "452f083f6c11793a3723224bce42898a2bedc0e1", + "sha256": "07il7z52ywvkqy5zpkvzsaxsjqx8dqgd91cpba05vywpsl3lis30" } }, { @@ -12528,14 +12724,14 @@ "repo": "redguardtoo/company-ctags", "unstable": { "version": [ - 20200209, - 47 + 20200407, + 803 ], "deps": [ "company" ], - "commit": "fa5a3f7b765fc0e42a378fa2293be4c2817fe04e", - "sha256": "1wgxmy1pwwc7mvgw9bx3vvaay1pirzghvpqs6d9mnx1wbzn1x29b" + "commit": "b159e45b38226e046cf6fb7d08a0cf864ebbf772", + "sha256": "0h0k06c9fabyz6akka1bpwkz69wzl7ajcm0p108xdf5lymc75v5h" }, "stable": { "version": [ @@ -12624,41 +12820,6 @@ } }, { - "ename": "company-edbi", - "commit": "5d881ff0927d5bd7f8192f58927ceabb9bad4beb", - "sha256": "067ff1xdyqy4qzgk5pmqf4kksfjk1glkrslcj3rk4zmhcalwrfrm", - "fetcher": "github", - "repo": "proofit404/company-edbi", - "unstable": { - "version": [ - 20160221, - 1923 - ], - "deps": [ - "cl-lib", - "company", - "edbi", - "s" - ], - "commit": "ffaeff75d0457285d16d11db772881542a6026ad", - "sha256": "16v4wzb9sp9ryfhgl3rk108pqvam2v6rh6hl6008083g557nmhq1" - }, - "stable": { - "version": [ - 0, - 1 - ], - "deps": [ - "cl-lib", - "company", - "edbi", - "s" - ], - "commit": "08dc69ccfbcf10ca83f7075e9b735c6885cd7e11", - "sha256": "0n2hvrfbybsp57w6m9mm7ywjq30fwwx9bzc2rllfr06d2ms7naai" - } - }, - { "ename": "company-emacs-eclim", "commit": "1e9d3075587fbd9ca188535fd945a7dc451c6d7e", "sha256": "1l56hcy0y3cr38z1pjf0ilsdqdzvj3zwd40markm6si2xhdr8xig", @@ -12674,8 +12835,8 @@ "company", "eclim" ], - "commit": "23f5b294f833ce58516d7b9ae08a7792d70022a1", - "sha256": "17q972354nkkynfjmwih4vp7s5dzdvr3nf7ni3ci095lzb0zzf4g" + "commit": "222ddd48fcf0ee01592dec77c58e0cf3f2ea1100", + "sha256": "0jdddf8krvg379wlay1xs27qlxpi87nz6v2i526pk59mmg8jrnvc" }, "stable": { "version": [ @@ -12912,8 +13073,8 @@ "company", "go-mode" ], - "commit": "939b4a677f2f843ea13d9dd90206d57111f0ceb9", - "sha256": "1yfw8y6czkqgxpyfdxwvkcrsmwbca7l0lr4jqmnpmm5m5rylcwr9" + "commit": "4acdcbdea79de6b3dee1c637eca5cbea0fdbe37c", + "sha256": "0i1hc089gb6a4mcgg56vn5l0q96wrlza2n08l4349s3dc2j559fb" }, "stable": { "version": [ @@ -13192,8 +13353,8 @@ "company", "native-complete" ], - "commit": "11803df3706fb23d58e418a14ce981204a64e847", - "sha256": "0maljdxigd4fvrm7pv3ssyywl3c1zhfpqdymq933iig7d2hrwxm1" + "commit": "0f290514564d3733b35e4b48d70446c1a6eb4b41", + "sha256": "0i8bss7ipwsjfrgfri7d3f9pbpkdbfh8aqz8cawr2wvf4yayk8q5" } }, { @@ -13279,22 +13440,22 @@ }, { "ename": "company-org-roam", - "commit": "546d4c869c4d2a0981a572b5653f5e9ab8bcec47", - "sha256": "0kxf4fhs8ikw06ljdkk4ky1fb83xpmknasp7kyd3lpdk63cfvijh", + "commit": "aeb95e34be27dd78a237c0bfe1da94802fa68eae", + "sha256": "0k4w9g1rl94rpcvbcdmvsy47vzs53wz4b4hy9khj4yjn023nbsj7", "fetcher": "github", - "repo": "jethrokuan/company-org-roam", + "repo": "org-roam/company-org-roam", "unstable": { "version": [ - 20200329, - 609 + 20200511, + 743 ], "deps": [ "company", "dash", "org-roam" ], - "commit": "0d14bf56f53b1fcf14418d3e545785f4857b5f06", - "sha256": "0kjf3pqlb95m1z057sjkqmsi1qhh3d4snp29gk3fzz278bc7sl45" + "commit": "674c2bd493f571c5323d69279557a6c18ccbd14e", + "sha256": "1x88kvxawbpg4sagi0kh4y7inyhy05dxcg8hl0ih4x40cwxyxrs5" }, "stable": { "version": [ @@ -13325,8 +13486,8 @@ "cl-lib", "company" ], - "commit": "7b8db219080b714a7b8ba452ddb82bd08f7db152", - "sha256": "1zm04hqy6dg57swk05qvl5idzb11camcdmh7lrh6mqsvrcsvym2q" + "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41", + "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj" }, "stable": { "version": [ @@ -13358,8 +13519,8 @@ "company", "phpactor" ], - "commit": "31fe2ea4dbd5c2f23efd6a4ec2ec881a4ced6b05", - "sha256": "0j52n0vs85q7zz5xfqw4rgrjjpr7mzfiqbzk7vwkcdmpnax608w5" + "commit": "860d7e8784b261ee71deba354d01c3038cd777ab", + "sha256": "1d3fijh11g70xhx3a47l75mrp64bvkk7hh9lg83nl30qhn2vrbn3" }, "stable": { "version": [ @@ -13423,15 +13584,15 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20200327, - 148 + 20200514, + 2116 ], "deps": [ "company", "posframe" ], - "commit": "18b83d29dae75239e22ca73d91eb09ceca5e77c4", - "sha256": "0gb3y80qhk1xgdx0iglcj78wvnbxnaiyvfgg0bmfvhswjii80160" + "commit": "4e506d661ed9cd2e4cf16281f3a11009210e9c30", + "sha256": "1h6pls6vg593cbmvq2kh5z67jvcyljvwbdxypqqsls5d22hvvbh5" }, "stable": { "version": [ @@ -13455,27 +13616,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20191224, - 220 + 20200404, + 1550 ], "deps": [ "company", "prescient" ], - "commit": "a194852e8022762843052e58a9d0fbdaa1df0fe5", - "sha256": "0da4s32fza42vdiqhh7cdim08by5i4909q93ivxkmgrmqfgdvz0p" + "commit": "3ab7605d997fb8337bf5ded2ad960b98ac0e1fd7", + "sha256": "081v916gnjvx2rzjbqkqhdwijz57w7iryxzg71729gwvavs25lsv" }, "stable": { "version": [ 4, - 0 + 1 ], "deps": [ "company", "prescient" ], - "commit": "ad9fbe8a17fe74b27a39bcc034f3da1865663387", - "sha256": "008hxy1vasnyz36wwg44gikpi80ng75hj85nrswk60b7z7cznbmr" + "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0", + "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3" } }, { @@ -13651,8 +13812,8 @@ "company", "rtags" ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", + "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" }, "stable": { "version": [ @@ -13717,8 +13878,8 @@ "company", "solidity-mode" ], - "commit": "b190993dcb8376e80fb1d9b71f3ed6170bd2a341", - "sha256": "0s5xk38k3mc1d40dszlcgfpn5rvb7nsnnpmgr3c0bwqa4xh6yqrg" + "commit": "022b3159832384a7dcdc2168809e698600826047", + "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69" }, "stable": { "version": [ @@ -13874,46 +14035,6 @@ } }, { - "ename": "company-tern", - "commit": "acc9b816796b9f142c53f90593952b43c962d2d8", - "sha256": "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh", - "fetcher": "github", - "repo": "proofit404/company-tern", - "unstable": { - "version": [ - 20161004, - 1847 - ], - "deps": [ - "cl-lib", - "company", - "dash", - "dash-functional", - "s", - "tern" - ], - "commit": "10ac058b065ae73c1f30e9fb7d969dd1a79387be", - "sha256": "1pjyiy95axv92yxzks4ac871vcqxjnp7n2116nkdrdzzpmlb1x9h" - }, - "stable": { - "version": [ - 0, - 3, - 0 - ], - "deps": [ - "cl-lib", - "company", - "dash", - "dash-functional", - "s", - "tern" - ], - "commit": "b20b3e490bf277c8480712210e3c92ea489859ef", - "sha256": "1l4b54rqwsb32r8zwwrag7s35zc3kpviafdrqkq8r1nyshg2yccm" - } - }, - { "ename": "company-terraform", "commit": "1d9732da975dcf59d3b311b19e20abbb29c33656", "sha256": "198ppqn6f7y9bg582z5s4cl9gg1q9ibsr7mmn68b50zvma7ankzh", @@ -13952,15 +14073,15 @@ "repo": "Wilfred/company-try-hard", "unstable": { "version": [ - 20191106, - 2105 + 20200417, + 1603 ], "deps": [ "company", "dash" ], - "commit": "8a417255b4da9f2e3889f6024755290dcc5884d1", - "sha256": "14b3sad9a7dr8j7xhnspk905ybidqz8h4hx2rw4bgl25imhmlysz" + "commit": "2b41136b5ed6e02032d99bcdb0599ecf00394fa5", + "sha256": "07c4vsrixqw6d6d2mqm6xzzzc9l9mgwgabcc6jlnw78cxij1wrsx" } }, { @@ -14074,20 +14195,20 @@ }, { "ename": "competitive-programming-snippets", - "commit": "0100042ee1356dd709d8bbeec4539ddc64317baa", - "sha256": "1mdkv2pn83mgj7yy4xf8nkm9bvxldiy7gdx4bpv36b9xw5zz6q6r", + "commit": "9a6d2467c37bf095c0a1e4605744474999ce04e2", + "sha256": "1yblnm1ar466fgwvhxybqv8sp2hn40p10p6hhnn9gi1xj9napam7", "fetcher": "github", "repo": "sei40kr/competitive-programming-snippets", "unstable": { "version": [ - 20200122, - 1558 + 20200501, + 1205 ], "deps": [ "yasnippet" ], - "commit": "b0245fcbabf035d89b80150add5d6a47859ab555", - "sha256": "07l495vv3by6r62i48jbfyr5pp1p6896cz25gkc7p3xqwrhi2min" + "commit": "22bbf4c5edcc895b67b9f22599f284655ca48858", + "sha256": "14vbpy1y9dq9ip0bkmap7l2y2qx9jxzvisarbwlqqxj0xl7gbwc6" }, "stable": { "version": [ @@ -14103,6 +14224,21 @@ } }, { + "ename": "completions-frame", + "commit": "dcbb088900f76c05b04ffe25d32e43a477a0556f", + "sha256": "1ng5wmk1vp6yqrcyld23mrs8xdfa010l9acjy1vgkcsxjp3nmv3x", + "fetcher": "github", + "repo": "muffinmad/emacs-completions-frame", + "unstable": { + "version": [ + 20200507, + 1703 + ], + "commit": "192a70060d2a8710ca75aa2336a10c21a4d30eed", + "sha256": "0bi7q2napzfqbsdi4si1kfzdjq39hxg3czwbpmybrljg6rwgr9xf" + } + }, + { "ename": "composable", "commit": "1fc0f076198e4be46a33a26eea9f2d273dda12b8", "sha256": "1fs4pczjn9sv12sladf6zbkz0cmzxr0jaqkiwryydal1l5nqqxcy", @@ -14221,8 +14357,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20200120, - 1721 + 20200509, + 1836 ], "deps": [ "dash", @@ -14230,14 +14366,14 @@ "pythonic", "s" ], - "commit": "335474e409774e31125fe320a4a54c8d92bf5fa2", - "sha256": "10aadbvsg6qy11nfkmc5rvivjvyak6501srmjl6lvzxsw8q79fj4" + "commit": "8dad784b75a42d1cb6f7a6b8a2c2e39f589727f9", + "sha256": "1k1hsargcqciyz48zkdsnhinv8h4fr9786x8s7c63864fbxxby3v" }, "stable": { "version": [ 0, 0, - 9 + 10 ], "deps": [ "dash", @@ -14245,8 +14381,8 @@ "pythonic", "s" ], - "commit": "64b804c33f2667e8232689770a9f2e332c2dd0ab", - "sha256": "1w1p1m2d0mwi3frkah5cnphyqsix7fp1li8glhlwf923cg48cxfq" + "commit": "8dad784b75a42d1cb6f7a6b8a2c2e39f589727f9", + "sha256": "1k1hsargcqciyz48zkdsnhinv8h4fr9786x8s7c63864fbxxby3v" } }, { @@ -14329,8 +14465,8 @@ "repo": "odanoburu/conllu-mode", "unstable": { "version": [ - 20190215, - 2043 + 20200501, + 2328 ], "deps": [ "cl-lib", @@ -14338,8 +14474,8 @@ "hydra", "s" ], - "commit": "1eb5ab3bad5cf36d30a557e64dc218b5fee735bf", - "sha256": "092wvxkscmpfrkpaw33r9qxrp4b2vcah3x61r7wry4f6v7jhd9hw" + "commit": "0db3063572b0de08874822e20570bb153747e6ed", + "sha256": "0l7d88p010z47qhk33k8s13h9596g3dxz3mx9winsm82px8fvcpp" }, "stable": { "version": [ @@ -14655,6 +14791,30 @@ } }, { + "ename": "cort", + "commit": "1c99109a816303b1a14ff15e7a8300c73910e3a7", + "sha256": "1r1plngky2djgpbja0xr2j7hgj79d0l2jcjq4kj97q6874r4fswq", + "fetcher": "github", + "repo": "conao3/cort.el", + "unstable": { + "version": [ + 20200330, + 1641 + ], + "commit": "eb94d2a5b3a048a495fb0218b2df9021f8c864f4", + "sha256": "0rc1jfqkc05ml41cp8dc8akrxx3ifziyjy1w4vvgpbb5z49m83ky" + }, + "stable": { + "version": [ + 3, + 0, + 5 + ], + "commit": "1df178e296feaf4465967567b1cfdce1dda5a09b", + "sha256": "0y23w34dcifk6cxw2kcgwydqdc8hn0mj5129z560fm6iwxd6cgkx" + } + }, + { "ename": "cosmo", "commit": "3ab914dfefcddf6ecd65261bc11bd3eb12929c79", "sha256": "1pk34d0kv1jm2fq72qa5lj0y39x1yf2nbkjjg8jcj8ari28h9vfk", @@ -14677,14 +14837,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200319, - 1329 + 20200512, + 1130 ], "deps": [ "swiper" ], - "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787", - "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q" + "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", + "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" }, "stable": { "version": [ @@ -14757,15 +14917,15 @@ "repo": "hlissner/emacs-counsel-css", "unstable": { "version": [ - 20191031, - 345 + 20200331, + 632 ], "deps": [ "cl-lib", "counsel" ], - "commit": "61a38c9d50fa9d1e38b2fa550d07130eb9322524", - "sha256": "0c8assn7dc8dhzyzk37x7y8s266pvr6hs0vh13y65z0sgxk59i2w" + "commit": "6427dfcbda0d2bbd81db03f9d6b56b06c260ac02", + "sha256": "1g8gz5mz2qclia64qmgw02h5ivywgn46d6djlr7vcdfyp774cf64" }, "stable": { "version": [ @@ -14824,26 +14984,44 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20200320, - 19 + 20200514, + 1224 ], "deps": [ "counsel" ], - "commit": "0abd7a1b6abaf59a01774ca05f51cc0c6ce7f287", - "sha256": "0kfj3b8gx95pa7yaps25javmag2bnlz5zn802wf0x81np4d3hgjs" + "commit": "362fc857a271e509d05fa190212629dc6b0778f2", + "sha256": "0c9p6pfnzdbxaib1vgm1npp8lgyw0hpczi210c26x8p9d8xx19lw" }, "stable": { "version": [ 1, 9, - 6 + 8 ], "deps": [ "counsel" ], - "commit": "9fae8adc833919ffe33ca51d8e3db67e5be13666", - "sha256": "0831ylsl6d1ldrvvg5cs0yl33mh8s5hgxjp38kcy912mc7b1x0q1" + "commit": "362fc857a271e509d05fa190212629dc6b0778f2", + "sha256": "0c9p6pfnzdbxaib1vgm1npp8lgyw0hpczi210c26x8p9d8xx19lw" + } + }, + { + "ename": "counsel-fd", + "commit": "b2e58e2a0bf3825d6ef43455fd3e60b33c88aaa2", + "sha256": "1ywyg2l1dx2rziw23b0i5m4xg4n8laarkq9wbbq80ma5pjb18ims", + "fetcher": "github", + "repo": "CsBigDataHub/counsel-fd", + "unstable": { + "version": [ + 20200505, + 1344 + ], + "deps": [ + "counsel" + ], + "commit": "afba62f73d348cd7dfd10db039769788f5ae7ad4", + "sha256": "1v5iy8axlrapaav0vwhns32xbsnsay62dc9g50bv7n84cn1pvmmy" } }, { @@ -15009,15 +15187,15 @@ "repo": "ericdanan/counsel-projectile", "unstable": { "version": [ - 20200214, - 1450 + 20200430, + 2133 ], "deps": [ "counsel", "projectile" ], - "commit": "b556ed8995f375e57496f3482aef4b0def565de8", - "sha256": "105lvn2bmz6lgxx5y6k9gnhkl4p8igxwgnfz5anxlcv32w7q21pw" + "commit": "126e825bbab872b3befd9ef88660571391ebfdc3", + "sha256": "0shmndgr1plx8kzppn990ybb2144h8p49v4vd37099y5pj6w3zri" }, "stable": { "version": [ @@ -15102,8 +15280,8 @@ "deps": [ "counsel" ], - "commit": "da451df4c5f0ba32056ec600e8eb6a2c7ca4df08", - "sha256": "18qlwyjqxap2qfbz14ma6yqp4p3v4q2y8idc355s4szjdd2as2lr" + "commit": "719b38ba2242cc1c6d1d79cab106c8c8b1afa775", + "sha256": "1jjgyps59xiyqdi392cfbx19n0znw3kj3fxbc5v3l56i3qm24bd4" }, "stable": { "version": [ @@ -15323,11 +15501,11 @@ "url": "https://git.sr.ht/~zge/cpp-capf", "unstable": { "version": [ - 20190723, - 1158 + 20200405, + 8 ], - "commit": "ca6d50f3853e1226a0ccad435aa8fbd7852c2149", - "sha256": "19vhayxy3ha3kkncz8vy5as2pdc17k4mycqszi2g0wywllnirhvv" + "commit": "0a4fd531e9e47369ff29d9f8583efd0bacd6bc50", + "sha256": "0q6kgh2mdx3pr8ywr3fhn96chvrf6zx6xxs2lyfviwmfq2c3pyph" }, "stable": { "version": [ @@ -15363,6 +15541,21 @@ } }, { + "ename": "cpu-sos", + "commit": "612eddcec84562a1f060c9eb5a63f77ce88da7ea", + "sha256": "1mjbcyz8j1d0l6jnfa3bk4ba5dbb8xih56rvfri61caqmy73s6pz", + "fetcher": "github", + "repo": "oitofelix/cpu-sos", + "unstable": { + "version": [ + 20200409, + 2356 + ], + "commit": "1594b76d4ad3a6e3c471d82da366226d156e6226", + "sha256": "1pqw1gilj3m35fqaj5j51ggmxzwhdiks0k36hxmw3ihr63am0j5f" + } + }, + { "ename": "cql-mode", "commit": "1084dd0ec0f2e8fe6fa8e97b322833c14e8e59d1", "sha256": "0wdal8w0i73xjak2g0wazs54z957f4lj4n8qdmzpcylzpl1lqd88", @@ -15581,11 +15774,11 @@ "repo": "emacs-pe/crontab-mode", "unstable": { "version": [ - 20190827, - 1300 + 20200330, + 920 ], - "commit": "9acbb426c6bfb832e1e83f10fe01a8829452eb7e", - "sha256": "04wyngg5n5dr4ninfljl3n0gqx0pik5jbj6ny79bchrnxlh22f3k" + "commit": "9625228cbfce29ac3b443c6eff893ff828268f7d", + "sha256": "01s32ivn1fdqq99ms3s6a73hrqdc2r5khrg4jv3sniviql2k3i31" } }, { @@ -15707,11 +15900,11 @@ "repo": "josteink/csharp-mode", "unstable": { "version": [ - 20191126, - 1928 + 20200402, + 919 ], - "commit": "57bd21bda4edc16671a85c7d6d51484e40a6e640", - "sha256": "0chl9lzxn1mq59vy5lsim2iiy2hl20rg3d7ri41ljksjcfz9ki6v" + "commit": "31124dba6833a4de144ca508edb90d5adfeec209", + "sha256": "0jrj2ayna8bzhi441hhszhch3na08iciqnd7fsqrm8xbwlrq7l2x" }, "stable": { "version": [ @@ -15731,8 +15924,8 @@ "repo": "hlolli/csound-mode", "unstable": { "version": [ - 20200326, - 2154 + 20200402, + 1509 ], "deps": [ "dash", @@ -15740,8 +15933,8 @@ "multi", "shut-up" ], - "commit": "f278a0e13ecd6b00cd7b056a2e36021322bed8ea", - "sha256": "1axib3rgy7kdyprpp8cs94rc9yr34faii4n9f70jjkk6x7pr398m" + "commit": "81bec1a71934a56f677f442e2c22fb6336b366c4", + "sha256": "1cxg2c8sz76b3ml8blb4f268xl6ql959p2hi5i4llil4fggw6df2" }, "stable": { "version": [ @@ -15919,6 +16112,29 @@ } }, { + "ename": "ctrlf", + "commit": "46073c430c271aa1971e27948e7f6d4b65b3d533", + "sha256": "01d2zv7x588r55namcda58l21lg5sbwcn1ycnvg5md69pv5cg461", + "fetcher": "github", + "repo": "raxod502/ctrlf", + "unstable": { + "version": [ + 20200417, + 1549 + ], + "commit": "0bf26a5688b7f34695310100dc8c28381bfafe34", + "sha256": "1rknqa4qj3gfhlxfb8fqhdcy936sr0a2vi89rcqh5izl76zynisr" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "41eecedf44f2235ce13e021906c4ce92deddefdc", + "sha256": "10gnhafas54zj3z9173h1g7b519ac4i26afclmw3w1pk6qyyb03z" + } + }, + { "ename": "ctune", "commit": "927ecd888bc00abff13f5fc335a88dffc2bf6779", "sha256": "1ymy508h19w6c7z93nww9fzirzk84w24j3dpbj08d08bifndhj1q", @@ -16078,11 +16294,11 @@ "repo": "xuchunyang/curl-to-elisp", "unstable": { "version": [ - 20200321, - 953 + 20200427, + 219 ], - "commit": "79da15f739984e3ce3e0b137df3634582abb4546", - "sha256": "04qjap6wsjd8kdz47bz1a11h1bdn7bmlvfg6y0bqy5yq55f4ampa" + "commit": "25449962e758607762b3df76fc5501cfeedbbd38", + "sha256": "1yk5j8sb1li2zh1w5awwn83rhcwr1g492an4ajxkyikj3b7ljyfv" } }, { @@ -16266,17 +16482,17 @@ 20190111, 2150 ], - "commit": "6a30fecff5decdf20029763afea6183de3177dc3", - "sha256": "1qdxr4wdl7mmbahsdhybq4qmc6ahf2h342gf6y99y6jkj8akvjy3" + "commit": "d6e6de9237bde72e7878f7b1fe0e58fdccd36dd2", + "sha256": "0lac5lqina90w8mdjkqa9qk4b52lmh6kibcph1xcjghqlw7agjfn" }, "stable": { "version": [ 0, 29, - 16 + 17 ], - "commit": "c8425604fc3e4ea846016689942fa98e886b5f4f", - "sha256": "1794w6d9ams691ah8sah93vzb97wpss0j36z0fcn3sfvnf8kvpby" + "commit": "b648b65ac39291aa546b58e44c8576869c351b66", + "sha256": "1kc172hh7nj8vlf781rr8jal4f7nl7dbh6csxj0qz4h4cyxrsl6z" } }, { @@ -16364,11 +16580,11 @@ "repo": "cbowdon/daemons.el", "unstable": { "version": [ - 20200129, - 929 + 20200421, + 912 ], - "commit": "9320c6af524f923f20aa95c1a48b7ae41c3005a8", - "sha256": "0wlv3vjhw6v6q5br4bassw34k4kai6nrw10av4y6nkvw58i5b3h7" + "commit": "a26155d04cec399ffe25b88f71cbfa4ada784569", + "sha256": "0bvfcrr3blyz0861ysfw2qbfh1iq8nfdh1kw9wz4m7g6big27qgd" }, "stable": { "version": [ @@ -16418,11 +16634,11 @@ "repo": "rails-to-cosmos/danneskjold-theme", "unstable": { "version": [ - 20200223, - 1128 + 20200507, + 2144 ], - "commit": "c6776c5f40587429a4fd6e9c52008bb9242ef692", - "sha256": "0qh21ry2vjsvr7yz110c6ggn8bhxdq2x37mwqalpibyx81clh3nw" + "commit": "06bcd1c00397a528cf8863b08e93e9a4b1032a57", + "sha256": "1y3xnya33qszxnn2kyzgk339gfxxq485b2fydhc32ayfav6hjfn7" } }, { @@ -16433,8 +16649,8 @@ "repo": "jyp/dante", "unstable": { "version": [ - 20200131, - 1211 + 20200416, + 1217 ], "deps": [ "company", @@ -16445,8 +16661,8 @@ "lcr", "s" ], - "commit": "4955bc7363e250d22579bc34b0b4ab6611c0766c", - "sha256": "06xagrjl00iwvaf0cli3dhhvvn4x7ysvkir4120lwc9ispzc077m" + "commit": "7411904bfbde25cdb986e001ec682593dcb7c5e3", + "sha256": "0dhkp9g1cc1vlfk1fjncl3x3s7zd9a633ya85pjyxl70kky2qhnz" }, "stable": { "version": [ @@ -16474,8 +16690,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20200325, - 546 + 20200514, + 1655 ], "deps": [ "bui", @@ -16486,13 +16702,13 @@ "lsp-treemacs", "s" ], - "commit": "e2086fc9fbde4413f779b314bd5a93f808a3fb78", - "sha256": "1ig4s5aimd7zfyaa4fgb584lpzmi38kbfqc4jncifh0i69mi6x9k" + "commit": "86fc65d525e30c0249e7ec6acac5e4e55cd7c3e2", + "sha256": "1jfrjrbjscjsa52wjvvmhcl4cqrw43wz4f34z8yzsxmsalgpf0nw" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "bui", @@ -16500,12 +16716,11 @@ "dash-functional", "f", "lsp-mode", - "s", - "tree-mode", - "treemacs" + "lsp-treemacs", + "s" ], - "commit": "4e25c8334f2ace87275f86b11f0ed969c2f20def", - "sha256": "0zajvq6p1d0lzha58yzaacbc060krhlj6m4v4lg9w1c9vdyshin3" + "commit": "6cbf83784788dc2bba85a2baa1492b276252680c", + "sha256": "0w0a9x8lp1z05jv50biidj7vh4yfwkzfkmzwv04il028cy509yh0" } }, { @@ -16740,11 +16955,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20200119, - 2310 + 20200426, + 2244 ], - "commit": "721436b04da4e2795387cb48a98ac6de37ece0fd", - "sha256": "153f55dqkhs8w2xlf6b88wp5vlkap7h8vjd9wxh4jp2ram5g4l1n" + "commit": "fe9bbc2414af645d255de68cd59cf0edd5d8548b", + "sha256": "048yglafray643mbjggcf516rymbckn5ypnkiq390h9bd0hz7qy8" }, "stable": { "version": [ @@ -16819,8 +17034,8 @@ "deps": [ "dash" ], - "commit": "721436b04da4e2795387cb48a98ac6de37ece0fd", - "sha256": "153f55dqkhs8w2xlf6b88wp5vlkap7h8vjd9wxh4jp2ram5g4l1n" + "commit": "fe9bbc2414af645d255de68cd59cf0edd5d8548b", + "sha256": "048yglafray643mbjggcf516rymbckn5ypnkiq390h9bd0hz7qy8" }, "stable": { "version": [ @@ -16892,30 +17107,30 @@ "repo": "jcs-elpa/dashboard-ls", "unstable": { "version": [ - 20200329, - 1443 + 20200515, + 1430 ], "deps": [ "dashboard", "f", "s" ], - "commit": "9026fd157f94b023a7b660a418b66ad638b14272", - "sha256": "1r78w47897qd9ki24mqxl3kgr2anzybfqv5x91y4xsvrk0siir64" + "commit": "8b2922abb75847787626fe241d609cff7eabf840", + "sha256": "19i6rd0yk90yw9cib2xg72mc667jarfwgh30xh4jfkpdl1j2481h" }, "stable": { "version": [ 0, 1, - 2 + 3 ], "deps": [ "dashboard", "f", "s" ], - "commit": "9026fd157f94b023a7b660a418b66ad638b14272", - "sha256": "1r78w47897qd9ki24mqxl3kgr2anzybfqv5x91y4xsvrk0siir64" + "commit": "8b2922abb75847787626fe241d609cff7eabf840", + "sha256": "19i6rd0yk90yw9cib2xg72mc667jarfwgh30xh4jfkpdl1j2481h" } }, { @@ -17145,6 +17360,37 @@ } }, { + "ename": "dbc", + "commit": "0f82920ec0b8544c7008a57a412fe3ba15fc5e0f", + "sha256": "0xba153ky52iiyjndryzm6n3v019d0710r4k91chvv8gvyb4jr9z", + "fetcher": "gitlab", + "repo": "matsievskiysv/display-buffer-control", + "unstable": { + "version": [ + 20200331, + 1826 + ], + "deps": [ + "cl-lib", + "ht" + ], + "commit": "17c6640a409424ec32fdb6bfd6065562e726bf1f", + "sha256": "18mamp8j3lmmcpcyfrwrqppxvyx7zirn30rwp4wndczpyapkwv4n" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "cl-lib", + "ht" + ], + "commit": "5123477396a562fae350a89fbed79464cc498bc9", + "sha256": "0xd94cpqpv0yw70ajrvs69ygds62m40fk0m4s59zvdn5qs7ivj4k" + } + }, + { "ename": "ddskk", "commit": "6eccccb79881eaa04af3ed6395cd2ab981d9c894", "sha256": "01pb00p126q7swsl12yjrhghln2wgaj65jhjr0k7dkk64x4psyc9", @@ -17152,15 +17398,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20200325, - 1337 + 20200403, + 1308 ], "deps": [ "ccc", "cdb" ], - "commit": "37593d191b255d8633231099c70b1b26b3da0d39", - "sha256": "02pn3pxawl6268sy981iqialzyj9zy9dz6ci9jrkvbc8gp9gcvwh" + "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b", + "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji" } }, { @@ -17202,16 +17448,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20200202, - 1520 + 20200411, + 652 ], "deps": [ "dash", "s", "spinner" ], - "commit": "3ec95398d09719a9dbdc3a67d29d22ca224516cf", - "sha256": "0rxzm30md5s87s6j1aqgjxa9kb637v11b7q194l8zzhf457ky6la" + "commit": "bdcdf138cd71b0a5a80ca64b3bd68b7355084757", + "sha256": "1f0gbl2s6h945h1d4pg6cms3w2jwppqiddy3ja9b02ckcld1c227" }, "stable": { "version": [ @@ -17235,11 +17481,11 @@ "url": "https://salsa.debian.org/emacsen-team/debian-el.git", "unstable": { "version": [ - 20181020, - 1513 + 20200401, + 1622 ], - "commit": "8ff1f5d73d5d56bee65e45e9d8ac4e75aa8b8e4c", - "sha256": "0hqxl0gi9csp2zfc65s01c3i6himh38fia46cn68i3hh5d6kb6qx" + "commit": "d7117ab18b15f449f194cd7d91ff22e55fcfa817", + "sha256": "09i2n4990d5ra4zqswzv8sjk4psd9lf71xdsgnfbr88pdv1q8bhf" }, "stable": { "version": [ @@ -17471,11 +17717,11 @@ "repo": "abo-abo/define-word", "unstable": { "version": [ - 20191031, - 1736 + 20200417, + 844 ], - "commit": "d8c76d503be3d561221631067ec5274e7c147248", - "sha256": "18yy7gw8x3y9sk3v7xpd59p425qc36dymj0wgk6mzarfq5rhv79h" + "commit": "08c71b1ff4fd07bf0c78d1fcf77efeaafc8f7443", + "sha256": "053kyg2jqayphdkm7s8fz8yl97yspib6qszcajyr77m6n7j4i764" }, "stable": { "version": [ @@ -17528,11 +17774,11 @@ "repo": "jrblevin/deft", "unstable": { "version": [ - 20181226, - 1534 + 20200515, + 1513 ], - "commit": "f54e8a65a7e75a029657364055420374df45656d", - "sha256": "1vas6jgwli0jcxmxmcwvzwv4414q8kkmhqfz5m96r7l4lpgcrhdr" + "commit": "fca9ea05ef4fdac825e2ad3921baa7042f6b82c8", + "sha256": "0h5znwc4sa92l2472204yn60z30ysvkr9hphjga7kn4j4jgvqak1" }, "stable": { "version": [ @@ -17806,11 +18052,11 @@ "repo": "raxod502/diary-manager", "unstable": { "version": [ - 20190702, - 2148 + 20200404, + 1549 ], - "commit": "964dd7bf60a8e8abc880ef5b73319bc65d5ea5e3", - "sha256": "1w1hffypsx41n63yrpz0lcyzia4x4lis0sja8gksik7dvwwkyhwb" + "commit": "2850e8f27662eb1e8a34425b3032a361a5c989cc", + "sha256": "0p4l6gsfazq6aigvyy8mjkr9jpqs8cbmpzsfwdr7yvr5llxg77ds" }, "stable": { "version": [ @@ -17849,15 +18095,15 @@ "repo": "cqql/dictcc.el", "unstable": { "version": [ - 20200209, - 1810 + 20200421, + 1422 ], "deps": [ "cl-lib", "ivy" ], - "commit": "e07ebfc577b904b3387705a91395ac873e42c727", - "sha256": "0wi3iz31qizd3xsys1pyfr2zfn03x27lrja5s8170s27zqkwm56j" + "commit": "3950011197ba81f27cc82b4e6075c9100945f936", + "sha256": "0xmmkzsg48q6awhkbi5naqjm0yjdnwb437k17razgd6y99vyh0ns" }, "stable": { "version": [ @@ -17936,11 +18182,11 @@ "repo": "ideasman42/emacs-diff-at-point", "unstable": { "version": [ - 20200106, - 441 + 20200413, + 200 ], - "commit": "c26027d701f2a1512e0a2b18e4b34f02e9140ee0", - "sha256": "1c5pibjmpkw7fi26vnsvv5yjg4y851jccwymzwa06gbxb3jf5ggc" + "commit": "5b06de513297a80cf3a2081b8ee0914e90da810b", + "sha256": "1ib8297alpsvcxl9c56n2bjh5j4m49k92nz1mgdybiqwg3z4is21" } }, { @@ -17951,14 +18197,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20200329, - 1724 + 20200510, + 1540 ], "deps": [ "cl-lib" ], - "commit": "7fce94f7d5eebea06aed153b0f574567182c8d2b", - "sha256": "11m9ab7ymvbsxgddwxwcr8mrll3m67lnib8bpmb9vmh16zb2mzcl" + "commit": "ab2f4f0db9b0c3484db837252ce2dc75f4696b1d", + "sha256": "1pb1hp79b3r0nn7dclk3x0d0yrvx6nasgzwi1f918k9n7kzz7n4g" }, "stable": { "version": [ @@ -18071,20 +18317,20 @@ }, { "ename": "digit-groups", - "commit": "eea9d435c7c1889b16549a0ef3f66483b2de3605", - "sha256": "1wy1hf15qi9v0wz2rykpf40v3g2n4mha6h207m0zn8l8rb79hwjq", - "fetcher": "bitbucket", + "commit": "e5768c2d9f77e7fc58b7b293763cab64634e00da", + "sha256": "032dcnbwrm0fbg6dlghrcvslpwxlhw5bp4ank1mnkp5m39iwdn60", + "fetcher": "github", "repo": "adamsmd/digit-groups", "unstable": { "version": [ - 20160817, - 226 + 20200506, + 37 ], "deps": [ "dash" ], - "commit": "ee1d6de372600cb9e1aa481b7ed0eb7ca37c5246", - "sha256": "0rkajjlw820gfx1kclkcvdq7milhiid2yzvn9hd275ydskrhhwlp" + "commit": "7b81930cad19b8b7913b7eedbcb498964bfdcbdb", + "sha256": "1ss8ym7zayhvyrl4lzxjqiy8azx2zciwcp1x6s8vw649gmyi98jc" } }, { @@ -18226,11 +18472,11 @@ "repo": "gonewest818/dimmer.el", "unstable": { "version": [ - 20200329, - 35 + 20200509, + 1718 ], - "commit": "5298af739ce30bacadda892b620858b95709c84b", - "sha256": "0dlgk66mcbzdbpw0xn6l7fxjayvgczccsx0igda9745pwm8yvy9z" + "commit": "4abe51533a972910f9012029a47b533878ec682e", + "sha256": "023lrm9s8rdq41d19nlizq2s1d2317s4qlc83m4g6ymw54m61z2m" }, "stable": { "version": [ @@ -18627,11 +18873,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20200318, - 1715 + 20200430, + 1625 ], - "commit": "1f73233065ddb077adb7019ae33efd8acce9b561", - "sha256": "1sc0y7ffvyq5785gcmlgkkblz1nyyx4a5h1m1bi50zkqpna1pxbf" + "commit": "95a411f6d4bb5eec4ef8fdbba9f038ddf60da81f", + "sha256": "0rz8d9lj2zbipz6cwrlw2a3z9y4rybbmz73h73l1i7fjg9q1kqm4" } }, { @@ -18831,14 +19077,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20200226, - 333 + 20200409, + 801 ], "deps": [ "dired-subtree" ], - "commit": "5f88a4570eae9645be06ff22542f110aeb70dd7d", - "sha256": "0l1wr7g4lfqmvhw3vir6fmwxmid9sasxlf5pxxvh0z8kps53f0cn" + "commit": "6e569c851418890c21fd37d03a62f85343aa0900", + "sha256": "0jxljpmzncbh9xb22y4xr9bzcxwijy68pn8chqsvqmivss5py7n9" }, "stable": { "version": [ @@ -18928,11 +19174,11 @@ "repo": "renard/dired-toggle-sudo", "unstable": { "version": [ - 20151109, - 1006 + 20200401, + 1353 ], - "commit": "02449dbda4e168f99fe5352c9628df5d39e11483", - "sha256": "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2" + "commit": "13bbe52c54893f5aa3e56228450ffdd0c9e1d169", + "sha256": "1fw1pb1z6krqd1pfxxhr6rrfr9ckkcb0zsjzbjk0i2i1q5cg6car" }, "stable": { "version": [ @@ -19388,17 +19634,17 @@ }, { "ename": "ditz-mode", - "commit": "02e2a2a25f42929626d7237511136ba6826dad33", - "sha256": "0shzm9l31n4ffjs1d26ykxsycd478lhlpl8xcwzbjryywg4gf5nd", - "fetcher": "bitbucket", - "repo": "zondo/ditz-mode", + "commit": "ac0d321e7486f297f783c07268563586aa0e3d92", + "sha256": "1k6rw2xmhlpcixwgfy6207h0jcqv09jfhi3dzj5n56s108z6hqr4", + "fetcher": "hg", + "url": "https://hg.sr.ht/~zondo/ditz-mode", "unstable": { "version": [ 20150729, 940 ], - "commit": "beac4c1f3b7ef82014bb77ad8752dace482897da", - "sha256": "1cbsy4lchl41zmyxfq828cjpl3h2dwvn8xf1qgf2lbscdb6cwbwb" + "commit": "74b6b93b097d595a001c019e3b762abfc60f821a", + "sha256": "194i43s99by2rrb112nh6rkwcd5rmmdj6kfc2bc1k6ygnvynnk67" } }, { @@ -19581,8 +19827,8 @@ "repo": "pythonic-emacs/djangonaut", "unstable": { "version": [ - 20180727, - 1544 + 20200503, + 921 ], "deps": [ "f", @@ -19590,8 +19836,8 @@ "pythonic", "s" ], - "commit": "3e154709def09020a9b9eb29d330fb1f833a8250", - "sha256": "0lfh55disvc1ngysljvcccv5hl3k2xj3czy6h3chwqp7py33i1kc" + "commit": "75f642114e3997308a1e7e67c3025738cecee0fe", + "sha256": "1bka2nj2hqhpjiwdghp56y7z3jdxrpqw10s9divpa910mk33vay8" } }, { @@ -19754,8 +20000,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20200218, - 1257 + 20200508, + 1956 ], "deps": [ "dash", @@ -19765,8 +20011,8 @@ "tablist", "transient" ], - "commit": "a2092b3b170214587127b6c05f386504cae6981b", - "sha256": "1q3fgh3sjly62h86yvjqhr7j1yyrsfygk4rqkx0p7a052s2qvqi7" + "commit": "01a04d0a295f3396833d0b6fa60cf24d52e1a89f", + "sha256": "0gh0h64dwn8v67q5569gifdjhzz5g4hfnsiqmg1nyq0nhvpp2b1c" }, "stable": { "version": [ @@ -19925,11 +20171,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20200329, - 1548 + 20200514, + 2215 ], - "commit": "e788ec71dafdd57a5c0eb3633794abbe3355f0c9", - "sha256": "19zqhcjpb23h4nn9h22jn1gh7a53y5v8f52809scl3vif0ch9b2h" + "commit": "1bcec209e12200c9b93b0d95f61b964b5de4439c", + "sha256": "03lbsww77vq1wrpj94jdx62zmjjhir9i50g85l8yadlp9696zh3s" } }, { @@ -20044,30 +20290,30 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20200322, - 636 + 20200513, + 1103 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "0642f7107102e88fb8818da02e6612c6855537ff", - "sha256": "1wmsrvzbvixzps6zp1d2r5fn7gkfwvjz2ksjqd6a8sd4swdx9ggk" + "commit": "2b308857677e983ca4eaedc36438ed94aadf9e65", + "sha256": "1c7mk26drz9yldy3kvcxxnabg8ph900pj1g029xhd1407x417vqc" }, "stable": { "version": [ - 2, - 9, - 2 + 3, + 0, + 0 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "e6d690bae01cb68e7171857fe07ac914d7a19f4b", - "sha256": "0k5rppzpycl1aggg6cvwvgxylgvjbxksvdah8fkrrmx3dwcr2y3p" + "commit": "b44955841a301f4930b054e912fa4c1a700d426d", + "sha256": "08m75rl5i812pa87zcsjvb4mm3jjhpwzgx9mf2m7sxj807airz5d" } }, { @@ -20078,14 +20324,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20200327, - 1325 + 20200514, + 2115 ], "deps": [ "cl-lib" ], - "commit": "bbb3725af973485424f6ca716b648923defa176c", - "sha256": "0pybwshmcfj0ll2hjcdrqdqbf6crn10pjlkbiyf3k23w5ayaql49" + "commit": "95463eac68fe88535d9342c7b4c2cbaae3c80950", + "sha256": "0ccq6gzahpsxsgmmd9dl16mfnz1n9sgn0ns62n03s3xgmf4ay3ap" }, "stable": { "version": [ @@ -20290,11 +20536,11 @@ "repo": "david-christiansen/dr-racket-like-unicode", "unstable": { "version": [ - 20161021, - 1211 + 20200513, + 1642 ], - "commit": "a69e364532fffa451d1f12ade8fadb9cdbd8318c", - "sha256": "12pwfv0j54idvn061l3qxf0vrrl56085n517izh8x6jkgxjcx7k0" + "commit": "70bc1caea6b277e49e1cb29e1926a7b0c83c5ebc", + "sha256": "1an4hk9cjg1lhis0japdr371mnf1p4pl5mzl0l1cfkvprbxhzy65" }, "stable": { "version": [ @@ -20314,11 +20560,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20200324, - 1726 + 20200514, + 1527 ], - "commit": "e4672e22885772d2be0c75df03c4f805f1acf5fa", - "sha256": "0pb0q8grybzl3sh75km93n1cvk7wh5c2r2nbm8rkwzzhxrhrvffl" + "commit": "c162aff5025a7e9f55785d7177d59f4a3aa60183", + "sha256": "11wlrvrz3q054nqkdbd4525kh50cspszrgmqd74plah6jc95wpa3" }, "stable": { "version": [ @@ -20562,19 +20808,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20200306, - 1054 + 20200430, + 1023 ], - "commit": "1569b712ea691a9b8df12af5ee8c8a4aa4853e45", - "sha256": "1149s9ym30nfdbb2ndk5ypl5wb984an6n37gycra15j3z15d60mh" + "commit": "50c440c80e0d15303d8ab543bce4c56e9c2bf407", + "sha256": "0p5v5xwr0s59hv3s0f85byafphc85qv76g41crad9fhnxzab9rly" }, "stable": { "version": [ 1, - 0 + 2 ], - "commit": "1569b712ea691a9b8df12af5ee8c8a4aa4853e45", - "sha256": "1149s9ym30nfdbb2ndk5ypl5wb984an6n37gycra15j3z15d60mh" + "commit": "50c440c80e0d15303d8ab543bce4c56e9c2bf407", + "sha256": "0p5v5xwr0s59hv3s0f85byafphc85qv76g41crad9fhnxzab9rly" } }, { @@ -20644,17 +20890,16 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20200306, - 513 + 20200513, + 2014 ], "deps": [ "dash", - "f", "popup", "s" ], - "commit": "e8e9b0c2d1eda594fd40db9c64e93a70b426641b", - "sha256": "0m8771bzz972zf2lhv7f4z2x0rnnfc0iidb5jpz072wr3v52kark" + "commit": "194bfdbe305e21d8e6d29893d449686c85273207", + "sha256": "0lz5kajhkqh18xyg07bshvl0v5j5g5xj4q8p6min1mapm8shnv2i" }, "stable": { "version": [ @@ -20698,17 +20943,17 @@ 20191016, 1241 ], - "commit": "d864995d98479a21fb88fcf6d24b8262f2fdeae2", - "sha256": "091c58yvvwly070dgzz1202njlp695fzq85873v4dak1rwxisrwh" + "commit": "e5bec1a57fd4ebeedc848e76e0cf991db7e22fd0", + "sha256": "091z6p93sv3aqf7bcw41nwh4kvvpsfncjny2fwcv3vv7zlyj2px2" }, "stable": { "version": [ 2, - 4, - 0 + 5, + 1 ], - "commit": "ccd447e41a711f8a52bc854d71dba8677c900c34", - "sha256": "0i8b84mi38r431z4a1yh4xnn9z5mnk1g3di0qz6h4lsxq8pg2m0v" + "commit": "4d1ef91df8c732d516ddea4a953f5956e99692b2", + "sha256": "1ljhwsyl277lvmii4v439dafyc0y2l2jf2ds5zivpbrh168851di" } }, { @@ -20767,11 +21012,11 @@ "repo": "dylan-lang/dylan-mode", "unstable": { "version": [ - 20190831, - 1910 + 20200425, + 1347 ], - "commit": "4801b7adcc984edfffa3f951e2c35329fae2b6e4", - "sha256": "1xm27fc98rj8fsfm9na1x3d7zgp8fkxf782ajvirzbbq5nj0lyma" + "commit": "64f3aed546315c766331c69be3c7e78c7da6c333", + "sha256": "1r63gxy1hlij1ck570agvj39rynby6kna5kcfhrr0imi7hl98mzz" } }, { @@ -21098,14 +21343,14 @@ "repo": "redguardtoo/eacl", "unstable": { "version": [ - 20191230, - 1057 + 20200407, + 756 ], "deps": [ "ivy" ], - "commit": "a25c28f4ee1126d1ee51dae22843f3440520f1a3", - "sha256": "0pz894saz6ncira9ag9aqmfw394v56sfxldv25phh3z44y1ij01z" + "commit": "47b839f305e63e119b6a554497cd4b99512e8e00", + "sha256": "1gdppgjdapjx25ns5ja1lnnypq26m8w9s5vbnfg7p0j64kd2mdwh" }, "stable": { "version": [ @@ -21158,28 +21403,28 @@ "repo": "masasam/emacs-easy-hugo", "unstable": { "version": [ - 20200209, - 743 + 20200427, + 1901 ], "deps": [ "popup", "request" ], - "commit": "30145bb0bd5b04d9c413f5ace2fd0e52b2519663", - "sha256": "1i3wjkxksmq4d364sc56243p847rkyzzh10xj1j5a3zm69g3v53z" + "commit": "2dfdcdbcd8eb81c3fd631372d7dceb4f432d5f1e", + "sha256": "19j7r14qxh2cl4zi4vssbbqjhp6r53gjavnwyihk52llxcgrxrr7" }, "stable": { "version": [ 3, 9, - 45 + 46 ], "deps": [ "popup", "request" ], - "commit": "30145bb0bd5b04d9c413f5ace2fd0e52b2519663", - "sha256": "1i3wjkxksmq4d364sc56243p847rkyzzh10xj1j5a3zm69g3v53z" + "commit": "9e923e32f21134bb89196a169f5a3f2aecfe45cb", + "sha256": "1r8s83dc3ibp687fywfsgs2kc95j2s153ncrgxldqvsp24k1wm8x" } }, { @@ -21190,26 +21435,26 @@ "repo": "masasam/emacs-easy-jekyll", "unstable": { "version": [ - 20200209, - 651 + 20200506, + 117 ], "deps": [ "request" ], - "commit": "3582ed543b3e9f5c32834f530abeba92ef0b4244", - "sha256": "0bqp6z1c1bf5gbj4rz717q47cj54ral2gagz8b6d7ihyn7398qq6" + "commit": "d114ed4ef4470ea429d2dd291a409bc406d0dda0", + "sha256": "11wkvrl19c0z2icig2a7i6ccplzgx7j4jjlx97lq41vx679xxiwp" }, "stable": { "version": [ 2, 4, - 24 + 26 ], "deps": [ "request" ], - "commit": "75f057caf54714b4e8a0934107f1ff8a05fc5349", - "sha256": "1753wf817z65sd23bkispsxyk67sd4r2yx9k6f1ncaywcl0z974k" + "commit": "d114ed4ef4470ea429d2dd291a409bc406d0dda0", + "sha256": "11wkvrl19c0z2icig2a7i6ccplzgx7j4jjlx97lq41vx679xxiwp" } }, { @@ -21367,26 +21612,26 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20200327, - 1040 + 20200513, + 2326 ], "deps": [ "parsebib" ], - "commit": "f57e138d56bd293f30a64c33ab8b374758acfb08", - "sha256": "0h8bxy6p91hhx6mvzbxv2j3cr6bxcdbpgbaqa9ibcaxy72d9xrjp" + "commit": "6499e4a67f2772a29128864a8f7606a78fb73b45", + "sha256": "0css7pfyqz834f8awc632mwlfcph3mrsqwbxvrlaw59bc3hgxjdv" }, "stable": { "version": [ 2, - 22, + 23, 1 ], "deps": [ "parsebib" ], - "commit": "cd37aaa9a11e3b2232b8aa12cfe9a8ae9b830b10", - "sha256": "0spiz5r2y4pdpyc4d3f9w228giq0j9rm8f5h5akzn5rwiq9pfkwz" + "commit": "6499e4a67f2772a29128864a8f7606a78fb73b45", + "sha256": "0css7pfyqz834f8awc632mwlfcph3mrsqwbxvrlaw59bc3hgxjdv" } }, { @@ -21397,11 +21642,11 @@ "repo": "flexibeast/ebuku", "unstable": { "version": [ - 20200203, - 1122 + 20200427, + 1143 ], - "commit": "2f1af38469966c788483cbce4ab70436f72cf30d", - "sha256": "15liiczqjf8p2jr9356zrj65ijp5gdrnb5i7m09armyhb8282rmg" + "commit": "9e1878810eaaaa55885d4cbcd6968566e4e3f7a8", + "sha256": "0czrchzz7ljynbkkgpp1ifjybp33wx4lhyzyqkxs4q84rs4m7p2p" } }, { @@ -21438,8 +21683,8 @@ "s", "yasnippet" ], - "commit": "23f5b294f833ce58516d7b9ae08a7792d70022a1", - "sha256": "17q972354nkkynfjmwih4vp7s5dzdvr3nf7ni3ci095lzb0zzf4g" + "commit": "222ddd48fcf0ee01592dec77c58e0cf3f2ea1100", + "sha256": "0jdddf8krvg379wlay1xs27qlxpi87nz6v2i526pk59mmg8jrnvc" }, "stable": { "version": [ @@ -21548,90 +21793,6 @@ } }, { - "ename": "edbi-database-url", - "commit": "e25bf3d65ef2fb09eb0802cfd3e3faee86a5cfdb", - "sha256": "018rxijmy0lvisy281d501ra9lnh5xi0wmvz5avbjpb0fi4q1zdn", - "fetcher": "github", - "repo": "proofit404/edbi-database-url", - "unstable": { - "version": [ - 20160221, - 1923 - ], - "deps": [ - "edbi" - ], - "commit": "d56c580268cd93651998c4c6b1c5558e6b6ca90f", - "sha256": "1nkfl8jngkdz8h951jig39af1wh5vrc5lqk58l2i4lc2znprj9lx" - } - }, - { - "ename": "edbi-django", - "commit": "10dd853022ab93e345761b04d760b3763f4d2384", - "sha256": "02vcbqgkvhlw9msf65777f85c8myxr95g2dz199nlfmz4vpqrkgq", - "fetcher": "github", - "repo": "proofit404/edbi-django", - "unstable": { - "version": [ - 20190212, - 1417 - ], - "deps": [ - "edbi", - "pythonic" - ], - "commit": "9b73db66c02a222fc62dc3bc590962f58c5b43d8", - "sha256": "1yinm4qzwpdmr4a0isbkiw6ny23gllajcppwh7g0d62di3v242dm" - } - }, - { - "ename": "edbi-minor-mode", - "commit": "5fb878b60c7ecbb1e3a47aef1d9765061c510644", - "sha256": "0p7vdf9cp6i7mhjxj82670pfflf1kacalmakb7ssgigs1nsf3spi", - "fetcher": "github", - "repo": "proofit404/edbi-minor-mode", - "unstable": { - "version": [ - 20160706, - 1447 - ], - "deps": [ - "edbi" - ], - "commit": "566a2141a6eb9d9d5d7e1bd7c251d1c5e8f0d2ec", - "sha256": "1g6mlmrwl8p5ffj9q298vymd9xi2kpp7mhbmz4by4f6a3g831c88" - }, - "stable": { - "version": [ - 0, - 1 - ], - "deps": [ - "edbi" - ], - "commit": "566a2141a6eb9d9d5d7e1bd7c251d1c5e8f0d2ec", - "sha256": "1g6mlmrwl8p5ffj9q298vymd9xi2kpp7mhbmz4by4f6a3g831c88" - } - }, - { - "ename": "edbi-sqlite", - "commit": "acc9b816796b9f142c53f90593952b43c962d2d8", - "sha256": "1w53ypz3pdqaml3vq9j3f1w443n8s9hb2ys090kxvjqnb8x8v44y", - "fetcher": "github", - "repo": "proofit404/edbi-sqlite", - "unstable": { - "version": [ - 20160221, - 1923 - ], - "deps": [ - "edbi" - ], - "commit": "52cb9ca1af7691b592f2cfd2f007847e7a4ccd5f", - "sha256": "1vll81386fx90lq5sy4rlxcik6mvw7zx5cc51f0yaca9bkcckp51" - } - }, - { "ename": "ede-compdb", "commit": "3b70138b7d82aec2d60f4a7c0cd21e734a1fc52a", "sha256": "1ypi7rxbgg2qck1b571hcw5m4ipllb48g6sindpdf180kbfbfpn7", @@ -21787,8 +21948,8 @@ "deps": [ "websocket" ], - "commit": "7074fe87c2df4aa7afecb7513326f5d481dcf92d", - "sha256": "17kbakpr6d79cih1fmvnrivs0vk41fw0njhb5y6dbml6ppi11i57" + "commit": "e9ef6a72bdc6b58f932c51aa161869cee11b4bc9", + "sha256": "1akyxq0ja06q5bywa6nb4klnbvrw6f6d83bzrjdz2sc7ddk3a4hz" } }, { @@ -21887,8 +22048,8 @@ 20181016, 1125 ], - "commit": "af46de40e2991b046f04856c18a6483badce38aa", - "sha256": "1lfdfnc7cx3lqa69mpn72jhsz4dwmfnrfpzrnk6lfh10h65yfdiw" + "commit": "43f180809fcbc7e104f96f95608a97c4c2a2c8b3", + "sha256": "0v9nn85pw7lll516p8bb9y6dk44rj2h88ky4zz9wgkrppjs7qdb0" }, "stable": { "version": [ @@ -21961,8 +22122,8 @@ "deps": [ "editorconfig" ], - "commit": "ddf60923c6f4841cb593b2ea04c9c710a01d262f", - "sha256": "1v5a6s4x7cm6i0bxaqdpsg8vqj479lp5h45glx4ipk0icdq8cvd9" + "commit": "4f75e175ad15ce2038f926fe4f0e5a0c1d0cbc46", + "sha256": "12a78187ar4mxdf1sk8bkrdcxly1nc5m9krkry04jklj6h9dayj3" } }, { @@ -22071,8 +22232,8 @@ "repo": "sebastiw/edts", "unstable": { "version": [ - 20200304, - 1709 + 20200413, + 1929 ], "deps": [ "auto-complete", @@ -22083,8 +22244,8 @@ "popup", "s" ], - "commit": "22eb59692a792c6769ae0b2b9f9a2583133764b8", - "sha256": "015irp4vd4s2j2iw4p0r98kb60xyjbrpvckj8iixsja3qj8b63rw" + "commit": "e797eb57ede8332205b3abd7d7adeccbb319ad29", + "sha256": "1101yx1dg82msw0bbji9hpnzq029ghh9ca4a6588fik8sn3v786j" }, "stable": { "version": [ @@ -22181,8 +22342,8 @@ "deps": [ "dash" ], - "commit": "64511754e123687930afdb5b05cfcc24a30fbbcb", - "sha256": "1bxf5wssmpgnidf228frzw347fx8fvcqsj8rpg83fz315i16nydb" + "commit": "e683b16ed4265ddb46efcc8cbf9503301cc39e22", + "sha256": "12nsbqrk7clr642kmbaa9xqgx7j2r6as6grx5qmghnp7kjfy1d7l" }, "stable": { "version": [ @@ -22247,17 +22408,17 @@ 20200107, 2333 ], - "commit": "6ea43326d142b714363042a27e06d3487f7845d7", - "sha256": "0pvaz69rjaz8m32s4chq7kavf20njb78l380xl97blj9h0yry1l4" + "commit": "1809fd4c001a4ae2fa5e2b721b67c1059fb8e9b8", + "sha256": "0ssh0chavas524jwj3r9bywkd8rgnbjz4xcgxhbnjfcl786pmyw7" }, "stable": { "version": [ - 3, - 10, - 3 + 4, + 0, + 0 ], - "commit": "79ab16f093aa3b2373422d0044f3119467755f5e", - "sha256": "0fisq0g3css641fh7y9vhagkfbsm2rfw9pnzyz434cr41wnjmjfz" + "commit": "400465de0ece5b03607895bd1c83b1cfae34079a", + "sha256": "196jn2cmyjvjai3nbij5kk64djz908ch4kddi4qdpkighwslkh2i" } }, { @@ -22268,27 +22429,30 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20200320, - 852 + 20200516, + 1013 ], "deps": [ + "eldoc", "flymake", - "jsonrpc" + "jsonrpc", + "package", + "xref" ], - "commit": "2209779972eee595ff6ea8e75c002f7e5726b0c8", - "sha256": "08mfgg9s76wmjzvpdirnm8rsa3fsvlvjivxjdn53aj1pnky55z8d" + "commit": "bf75312b8e7ea5136905d7a55a6d705b51b2b6c9", + "sha256": "1xbisdraj04jns0vcpcvnqqiwib3b8jpbian1nnmllvscfdz6c7l" }, "stable": { "version": [ 1, - 5 + 6 ], "deps": [ "flymake", "jsonrpc" ], - "commit": "33a4f869972f0958c15c33b47035672b265a8b55", - "sha256": "1x6nlsc93scq8lidx1l5ipi7r7s0p63m2vwkl77p3v59glir15cb" + "commit": "e02479a8c20cd79c3dfeb553deaaecd7d6e97e51", + "sha256": "13r1ysdhnxkc025wypwi6w507v18hm5qf0x29qrycql46f8klrjb" } }, { @@ -22299,28 +22463,28 @@ "repo": "non-Jedi/eglot-jl", "unstable": { "version": [ - 20200120, - 1457 + 20200514, + 2034 ], "deps": [ "eglot", "julia-mode" ], - "commit": "94e84fe0d14585192dca53e1e962bec7596f095c", - "sha256": "0dsnyp30c9nrglv4ifv6g272sa6pgrn5f75ak81z4pkdhdn6wvnb" + "commit": "844f12d881a3305d319e959b032e01501be1e8ae", + "sha256": "0na70zn0s09nihzki6kfnb5hc2j2wqfffj50kwdzjfs53m4sl1s7" }, "stable": { "version": [ - 1, - 1, - 1 + 2, + 0, + 0 ], "deps": [ "eglot", "julia-mode" ], - "commit": "94e84fe0d14585192dca53e1e962bec7596f095c", - "sha256": "0dsnyp30c9nrglv4ifv6g272sa6pgrn5f75ak81z4pkdhdn6wvnb" + "commit": "844f12d881a3305d319e959b032e01501be1e8ae", + "sha256": "0na70zn0s09nihzki6kfnb5hc2j2wqfffj50kwdzjfs53m4sl1s7" } }, { @@ -22348,26 +22512,26 @@ }, { "ename": "eide", - "commit": "a42244392719c620b47bc43a7a8501dab4b6f74e", - "sha256": "1962shxcfn3v1ljann7182ca6ciy5xfbcd6l9l8rc8gikp55qv8m", + "commit": "1dd52b48fbac25ee2873645d87a1238351a6ff74", + "sha256": "1akmb48rpq05mmb022yh0qnjlbs1wx5x6f1gk2kw5fb5g45swb0c", "fetcher": "git", - "url": "https://framagit.org/eide/eide.git", + "url": "https://forge.tedomum.net/eide/eide.git", "unstable": { "version": [ - 20191213, - 2119 + 20200507, + 2238 ], - "commit": "2153a68b58910e7892b16cc32414e2be99e33f36", - "sha256": "17fbxijpiachsb16ngbv7wpy9f4m0456bc5q9g7z8qi28dgzlz9p" + "commit": "f5f858e238c279a134d34a4ff334428dd811ca07", + "sha256": "1y87cbzngn29svx94mqvsk74j7vk912fx29b4fi26hj6myvki1nx" }, "stable": { "version": [ 2, - 1, - 3 + 2, + 0 ], - "commit": "7e4f101923d1aaa4ad4626ff60375ece8dd13e1d", - "sha256": "0j343hdarrlgznc4f59gbix20zlpr4wv5b8db6m0262ajc5q5zfb" + "commit": "93b7f4e6013f378f387586011b6389f7ae366bbc", + "sha256": "04hsk0dbnv4viypq6x5wrg1dd0q35ihb5lvk74r1h508s6ngbvyd" } }, { @@ -22393,19 +22557,20 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20200328, - 2131 + 20200514, + 2040 ], "deps": [ "anaphora", "dash", "deferred", + "exec-path-from-shell", "polymode", "request", "websocket" ], - "commit": "6fc75f20aa0b6666e743ce674c6da526f88793b1", - "sha256": "10cm3pvpjrqy76xd9067ayn108z34014cyaal4vj2l69yrkfr0m1" + "commit": "ec3aa36bf37a78e99723563e38f81ee24b855524", + "sha256": "0pr14dv4bbxgpki8kd1z9i07x1khb0v2wr82483qf3hhqafv6lrm" }, "stable": { "version": [ @@ -22479,8 +22644,8 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20200325, - 1455 + 20200516, + 1604 ], "deps": [ "auto-complete", @@ -22489,8 +22654,8 @@ "direx", "spinner" ], - "commit": "5bf46fc49b7827604ee82d56b80eee36630b562d", - "sha256": "0dcnzq9l1mnfrn7rq8kvyfkbw36r6iagp61c0p757xwfawsaxns4" + "commit": "b02e0bbc6df08a4ae44d16ac57886e56cfb8095d", + "sha256": "0vs4kcdval7klzbs21jq2rcxs013r7rskpxgjc7lrq1qrsgyyq9d" }, "stable": { "version": [ @@ -22573,8 +22738,8 @@ 20181006, 225 ], - "commit": "456fea0866ee71cb5a68eb65e9464565674081bf", - "sha256": "1hcjf88xjgkgp5wv7ccnfifnmpdj33csx6xm7rrdal3cy0f3ydj8" + "commit": "3f746410a9024af60a1368d02c2c0d9edd93ab66", + "sha256": "03zvxdbqjzkr6js8g21dzdiqsbmbhphij8jz98ian7gvzi8ady23" }, "stable": { "version": [ @@ -22687,20 +22852,19 @@ "repo": "raxod502/el-patch", "unstable": { "version": [ - 20191114, - 1639 + 20200404, + 1548 ], - "commit": "4744d6b1a5405001cb75f2c362a681964367319c", - "sha256": "1l4rjvdrdzvgq5zq6njg6gv0b7p6j545h4v27mpyxfh3z5jc8c49" + "commit": "46d22e7dfc7f9d8e9cbf5042d365f60b1fc7da0f", + "sha256": "1xjnzy7gp4sqd0mj3zkw741bj7kbpbdgcqxs6ppvlmr5i0adx2hh" }, "stable": { "version": [ 2, - 2, 3 ], - "commit": "ef56cbc6950dffd91de93009bafe51efb81eb84f", - "sha256": "18djslz177q6q33y82zmg2v6n9236a76kiqfvxdk4vbqzjbq82f7" + "commit": "278a27477a4d7032fe06bb56ab01701cb10df808", + "sha256": "15bwjl6377ngg3qwn1g8wc2wi61pcm6xlhjzj28ap5vz7y7zxps2" } }, { @@ -22841,11 +23005,11 @@ "repo": "tumashu/el2org", "unstable": { "version": [ - 20190504, - 1114 + 20200408, + 146 ], - "commit": "fbb2c5bff78564111ff1826976101555314bfc53", - "sha256": "17d85fdckbzj551j98j0hrhdj0ag8ba2kpk2ix8fmvdnssxdnvm0" + "commit": "7db77fdd73f378d4e60e34c11bbdf00677adc32c", + "sha256": "196nrg4cp57calv36if0fkc8bjiz6qzisr29ry49zmkgjlqaafq3" }, "stable": { "version": [ @@ -22964,20 +23128,20 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20200315, - 1527 + 20200515, + 1905 ], - "commit": "98fc3206c36bf6384bf333f93b4ae3d9382f5c57", - "sha256": "0a6a20n4nwfnzh0fbndpf3f77mchax4sdc2bwhn66yncm9kikjyh" + "commit": "a76712621a4851fdb0bc3d76f454898afefedf6e", + "sha256": "1jc6l0pcsyv9wgp58ij9wvjj4x4a3zz4svsna2aq86pf8bbbyng9" }, "stable": { "version": [ 0, - 2, - 1 + 3, + 2 ], - "commit": "77e1e90efa6622c6784ef10f26e6f845aca5ee3e", - "sha256": "0ip9dnyh53m2yd92bp0jddm3db4fbcpm9zniqij9anvzhjdfqx1b" + "commit": "f345065592b4bc9a5173b44e12a74400335d4e49", + "sha256": "0gf7sfdrnyndgbkpm2pz3056y0d06iy6pwhr63sbm7g4x79j9yjd" } }, { @@ -22991,8 +23155,8 @@ 20200316, 1956 ], - "commit": "7fa3b78d073c235ad945fc28d692c5f5fb60860a", - "sha256": "06cy6dsn3drfk0jkc10b96qzvi5rfhkjy7cib5dk2kqgg615is6d" + "commit": "c1a1b77ec0c7fff9ecf7122d10dcd16eebcd3829", + "sha256": "1gg3gxw5ks4fds7lgl9mqxyb2qjrdsdwyyc183nfz6aq0m4w91yb" }, "stable": { "version": [ @@ -23114,14 +23278,14 @@ "repo": "davidshepherd7/electric-operator", "unstable": { "version": [ - 20191005, - 1109 + 20200410, + 928 ], "deps": [ "dash" ], - "commit": "71d65e4abaef5e49a9e1b8fce706ce0296f9d5e2", - "sha256": "168ri3wahr6zjv2dvqc3jbqih2m4d0mfzp4gqw5mss000fqmx9ns" + "commit": "f8454905a147045f25ab03da7aa6406e4f20cc64", + "sha256": "1x087fry0yx5sk9vvgqv1zh7fkpgzvykl14fzns1920sxacgms68" }, "stable": { "version": [ @@ -23202,8 +23366,8 @@ 20200209, 1942 ], - "commit": "d0405e63863e54a01200740a6717ac875eceabc1", - "sha256": "1pbcs4i9d1v8pmgrsxnacnbdrcswifpbnrb613z18caj1a17nl02" + "commit": "af31f80552f7d081b985d729143a804ad47c0734", + "sha256": "13n0yhw9si1cp31m15andwkqan7vmmny5mxzj09cykjd1bk2rpan" }, "stable": { "version": [ @@ -23268,28 +23432,28 @@ "repo": "fasheng/elfeed-protocol", "unstable": { "version": [ - 20200307, - 1242 + 20200503, + 304 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "328dcf40def951ddc193f3d6ccb01cb58f9fc1cd", - "sha256": "0zqgkx6s9dcy6la62vlv4c12wx5a505pc1hhxiwhhpp93r61bh1z" + "commit": "2df5237dfa8c51a151bcf9d8fb6746447a8aa3d0", + "sha256": "0n4f621787v3gqfyqg7f37z6nxjqxl0bxxnl5j3gxqrif0ml2725" }, "stable": { "version": [ 0, 7, - 5 + 6 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "bffe74f0f7d7126691f6a9dd9eadf8714545dfe0", - "sha256": "16cmm59lwkgq0yj0pg9sn46afvqqjjx06xv5sc96vgwvn1n0lfi7" + "commit": "fc0beb392386b8ed387e52e7e100354b8549fd7e", + "sha256": "1kh524fkhsq3l9w0dv12b8shdyqfvnkhdr19xzfbhzw10hfdl5js" } }, { @@ -23339,8 +23503,8 @@ "elfeed", "simple-httpd" ], - "commit": "d0405e63863e54a01200740a6717ac875eceabc1", - "sha256": "1pbcs4i9d1v8pmgrsxnacnbdrcswifpbnrb613z18caj1a17nl02" + "commit": "af31f80552f7d081b985d729143a804ad47c0734", + "sha256": "13n0yhw9si1cp31m15andwkqan7vmmny5mxzj09cykjd1bk2rpan" }, "stable": { "version": [ @@ -23442,11 +23606,11 @@ "repo": "xuchunyang/elisp-demos", "unstable": { "version": [ - 20200329, - 2310 + 20200427, + 151 ], - "commit": "57dd4ae3e47ecca6cb9eee87328f159b3eb53702", - "sha256": "15cjv97240nnmjjbdx9iqz4qwxvbxxsyjllcjwbmkkbpv6x91b89" + "commit": "4cd55a30d5dbd8d36a0e6f87261c4fef17fc6db0", + "sha256": "0g1wnx37pdl3zxmym4fnqvhlw9hj6aw51vpxa18fpsh7fadfjjdp" }, "stable": { "version": [ @@ -23474,6 +23638,24 @@ } }, { + "ename": "elisp-depmap", + "commit": "8c86ca9b1ad39282f965d36ec2a8df807cc0ebb1", + "sha256": "08qjrc3vrn18apnb856qd2m0wzza8755fbh8ly9nh58dlbjhkkd7", + "fetcher": "github", + "repo": "mtekman/elisp-depmap.el", + "unstable": { + "version": [ + 20200413, + 1215 + ], + "deps": [ + "dash" + ], + "commit": "e47616c968dd82e30cb10961452e2b46c7900163", + "sha256": "1jpqdi15lvyd48jsbndlallnjc8bkmv0mxwyf51m483vz9v8nn2i" + } + }, + { "ename": "elisp-docstring-mode", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0mdh3ikn6zfd3fbmifvivqih2fsijvlzalljdvm32crs9cy6fa96", @@ -23543,16 +23725,16 @@ "repo": "Wilfred/elisp-refs", "unstable": { "version": [ - 20190323, - 1331 + 20200428, + 1707 ], "deps": [ "dash", "loop", "s" ], - "commit": "0a254e6a4dc7fa12857f8334fe6eefa72e49d1c9", - "sha256": "05lw10c11svqp5bi5pfga9iian7c3ikrsxzcr1qwcnhs3c5qjq9c" + "commit": "0e7ea1574717108ddc2eda5e1bc883d44cd28257", + "sha256": "0qkgsac3g02p4w8rkkmwv0p0brmi3rb1yijq45nvyy8kkf331g0g" }, "stable": { "version": [ @@ -23699,8 +23881,8 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20200301, - 19 + 20200406, + 214 ], "deps": [ "dash", @@ -23708,8 +23890,8 @@ "reformatter", "s" ], - "commit": "3f042ec430e7d915bfdca21d4f4d6201a882434b", - "sha256": "16b66kv49bslnnhya2a9q0zshcwx58017sy0ab451j5zsq42v2qh" + "commit": "7782be0814b52f7c35a09b21a4839c1502a4707f", + "sha256": "0g3mxp80hfjwf3adaslwykk01w5fh5y6nwj4687wbm5dldvhr42i" }, "stable": { "version": [ @@ -23974,11 +24156,11 @@ "repo": "redguardtoo/elpa-mirror", "unstable": { "version": [ - 20190622, - 730 + 20200502, + 115 ], - "commit": "468adfff8dedb024b90af0e66434dc50de259714", - "sha256": "0cr8pqbbjaxx48zal8cmmjddhapzjg4mvaspn8d3pygz4q7z5lba" + "commit": "9b25a8a2619e1f723528e8a093d31181223d5c85", + "sha256": "0frafk7a86l2g02c1c6vrinp609v480klhkh3y823b5k4bx3m3b7" }, "stable": { "version": [ @@ -23998,20 +24180,20 @@ "url": "git://thelambdalab.xyz/elpher.git", "unstable": { "version": [ - 20191212, - 1858 + 20200516, + 1232 ], - "commit": "3f56dde4342dcfecc2b8b4d1c6e07436d2ab9991", - "sha256": "0872dis1zin58fljbyzvvyd5z6c27cw8ikxgd8s57addbi4s6ffh" + "commit": "bea10793f68037947b6fec30a86316ca2123bbfa", + "sha256": "0n5z9vf5yzmdccmzfvs7xb6gxvlvgsfcdfw8m25zi1lajpjajhq6" }, "stable": { "version": [ 2, - 5, - 2 + 7, + 1 ], - "commit": "12629c283e0e3e62561d1456a2f8842b3524df57", - "sha256": "023ih6bgqf98jgzqy03nplwxhabaj9x9dqk3c8bmd50ndgrspc7q" + "commit": "bea10793f68037947b6fec30a86316ca2123bbfa", + "sha256": "0n5z9vf5yzmdccmzfvs7xb6gxvlvgsfcdfw8m25zi1lajpjajhq6" } }, { @@ -24037,8 +24219,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20200329, - 1830 + 20200510, + 1559 ], "deps": [ "company", @@ -24047,8 +24229,8 @@ "s", "yasnippet" ], - "commit": "fc54812f5f53889842e7e707727e50d9589443ca", - "sha256": "1jdpg6vq88kxg1wfhp9hwnvfadxazmznzscfhvr967fbgq46w6qj" + "commit": "6b7db2f23a9f248fd756e0bc537fd8d53d98eb96", + "sha256": "044qm7kgdnsh4yipxklyfvkrvzgw4abn6gjawkkvgniii2pf39hj" }, "stable": { "version": [ @@ -24236,15 +24418,15 @@ "repo": "wamei/elscreen-multi-term", "unstable": { "version": [ - 20151022, - 233 + 20200417, + 821 ], "deps": [ "elscreen", "multi-term" ], - "commit": "7b6048a0dd80f69460a62bbc6f1af8856141a5ea", - "sha256": "1cninrbgxzg0gykkpjx0i8pk2yc7sgr2kliqd35lgcxz2q4jlr51" + "commit": "4ea89bae0444d9d4377515929f76cb3e98140f1f", + "sha256": "0j5dpikjxwn1679ndy894g55qm9hs0n65lqyxx483h584nqxsdkg" } }, { @@ -24350,11 +24532,11 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20191226, - 1614 + 20200422, + 1352 ], - "commit": "4cbdcd79524db4a71abbf761a3945617086f5d09", - "sha256": "1gb2sh2mcx8va8lgyc46pch9fswfm761935806myi9fl1v67ayk6" + "commit": "d5ebd8ab6439fea3dcae0bcaece6e914f4ee1f6c", + "sha256": "1h1dx6dpwr4cml2a57mz3lq4f746cja007ckrpk3vii9ap413hf8" }, "stable": { "version": [ @@ -24611,20 +24793,26 @@ "repo": "GuiltyDolphin/emaps", "unstable": { "version": [ - 20180712, - 1916 + 20200508, + 1759 + ], + "deps": [ + "dash" ], - "commit": "823b8f72e6459c9f1a5dd62451ee4005ef71d955", - "sha256": "1g9637j8f65q3l6k4aw5p847m891irh74kg3pa2p9w0ppsa6n3jm" + "commit": "7c561f3ded2015ed3774e5784059d6601082743e", + "sha256": "0x4i2c493zb7cf0cnixsxiwl409faljd5sk05flkq88wjm176dcm" }, "stable": { "version": [ 0, - 1, + 2, 0 ], - "commit": "823b8f72e6459c9f1a5dd62451ee4005ef71d955", - "sha256": "1g9637j8f65q3l6k4aw5p847m891irh74kg3pa2p9w0ppsa6n3jm" + "deps": [ + "dash" + ], + "commit": "7c561f3ded2015ed3774e5784059d6601082743e", + "sha256": "0x4i2c493zb7cf0cnixsxiwl409faljd5sk05flkq88wjm176dcm" } }, { @@ -24779,25 +24967,25 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20200212, - 1825 + 20200508, + 1955 ], "deps": [ "cl-lib" ], - "commit": "2767c660562d35f02f9b272252a697804d70dd14", - "sha256": "1jg5m9684kdxvgfqvf56x5c7fqnlqf0mmqqlrrvl5di3n79cfmsb" + "commit": "64b9ee9c86067118b2d0055f467e60bc211aa59d", + "sha256": "16h9hb6d621mfi7805p2iaw814n2pm2g659wcjqxpvm5x5hpn55v" }, "stable": { "version": [ 5, - 3 + 4 ], "deps": [ "cl-lib" ], - "commit": "a8075b52fa75c5b53892214e6ca89fe0b42a04bf", - "sha256": "0jp96s0pglmrcgcyn9cp4rn2qlk9rf0dq6avrr5wiigjjkl33fip" + "commit": "f4924c2e77bdc5806495a74832fba60b2c30aca1", + "sha256": "01d8akv046igc13d5ki9wz36v51dlijab892ki5s5c4ysgj42wkr" } }, { @@ -25108,15 +25296,15 @@ "repo": "iqbalansari/emacs-emojify", "unstable": { "version": [ - 20200309, - 553 + 20200513, + 1627 ], "deps": [ "ht", "seq" ], - "commit": "e05217ee668db3ffb537528408ce8004fadb75c0", - "sha256": "1blhvzrvjabh81si1h9iznldfp6mkchd31ig68byqfjvi6d34nxq" + "commit": "dfa3c6d060914c6082d6837da32df0c337330ee4", + "sha256": "0m963cn916m0xa8cb1yslkcla86a34dchwy3ism62a2r9swa7p6s" }, "stable": { "version": [ @@ -25172,8 +25360,8 @@ "repo": "Wilfred/emacs-refactor", "unstable": { "version": [ - 20191122, - 1911 + 20200420, + 721 ], "deps": [ "cl-lib", @@ -25186,8 +25374,8 @@ "projectile", "s" ], - "commit": "8038ab88a000a835ca73af2068b1ef536bc7e33c", - "sha256": "1d27y6chxjf4k9cgsk93xjf1wq9lrv0516lpnqqlp2rdd7m3nv7y" + "commit": "a8f6ab823453decf43f0764d02e554d05009a631", + "sha256": "0d1qd9jzmh0vg1in6q1xjlwq85sgds5lfvyg2wi6z8ci5a7m3ahs" }, "stable": { "version": [ @@ -25359,25 +25547,6 @@ } }, { - "ename": "envdir", - "commit": "79c1497f709f6d23e4886359e09ab0456ed61777", - "sha256": "085bfm4w7flrv8jvzdnzbdg3j5n29xfzbs1wlrr29mg9dja6s8g8", - "fetcher": "github", - "repo": "proofit404/envdir-mode", - "unstable": { - "version": [ - 20160221, - 1923 - ], - "deps": [ - "dash", - "f" - ], - "commit": "f29346c55ccf11d8c75628edc6d430ed63c36917", - "sha256": "1jyhr9gv3d0rxv5iks2g9x6xbxqv1bvf1fnih96h4pgsfxz8wrp6" - } - }, - { "ename": "eopengrok", "commit": "2b87ea158a6fdbc6b4e40fd7c0f6814d135f8545", "sha256": "0756x78113286hwk1i1m5s8xq04gh7zxb4fkmw58lg2ssff8q6av", @@ -25471,15 +25640,14 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20200309, - 546 + 20200503, + 1214 ], "deps": [ - "closql", - "dash" + "closql" ], - "commit": "37f06fd2daca6a7afa163ceb0ccccd450af85e68", - "sha256": "18prjspaz4wlfrk2zzzzpxs4z8dkxxx68sbq2b4bdgg34fgnj02z" + "commit": "d987af46d9d763946fbf2930cacc9d6906df4382", + "sha256": "1jyb9m6nx91dn4isai36v1yc7shrpgnk76kpkamavrvwqdzvw6nv" }, "stable": { "version": [ @@ -25613,15 +25781,15 @@ "repo": "emacsomancer/equake", "unstable": { "version": [ - 20200214, - 1651 + 20200429, + 209 ], "deps": [ "dash", "tco" ], - "commit": "2039faac5f649f586d86d5ace10204d5a510fe0e", - "sha256": "1zg1bxwpqgzak5nvcwlcv9k8lkpa071kpnh11yv7s74ykvxa49l0" + "commit": "7e8ef8627151748156e7a4a384b6e8c6c344261b", + "sha256": "1ds89jk4d7j89mgfkqqc92lizh6fwwr338imzvby1lb8i17nww40" } }, { @@ -25647,25 +25815,25 @@ "repo": "atomontage/erc-crypt", "unstable": { "version": [ - 20200103, - 1329 + 20200511, + 2235 ], "deps": [ "cl-lib" ], - "commit": "26e16e0fc3af78e70b095f47995d2a368f8de61d", - "sha256": "197sj97j7mc9jwhamra4narnypdg3xpxy5rb95an5gqqzhy9bccm" + "commit": "6d158b39ea2833b753858153eb110da9b8a40fc4", + "sha256": "0pj330x5j9rnwcv2la2yc6w3vsg53c9ij0f3q9zi2psxbr268xi0" }, "stable": { "version": [ - 1, - 9 + 2, + 1 ], "deps": [ "cl-lib" ], - "commit": "2a597b39a929f6dff2b7da6439fcee6d2b25d3e6", - "sha256": "0jgkhwfgvy8lw6mws1m44vzh16514xxv34fivghc8kzn5w5ghwv7" + "commit": "6d158b39ea2833b753858153eb110da9b8a40fc4", + "sha256": "0pj330x5j9rnwcv2la2yc6w3vsg53c9ij0f3q9zi2psxbr268xi0" } }, { @@ -25984,14 +26152,14 @@ "repo": "mhayashi1120/Emacs-erefactor", "unstable": { "version": [ - 20160121, - 959 + 20200513, + 1252 ], "deps": [ "cl-lib" ], - "commit": "bf68085e5635eb94fd85709f8e1355c1f5534745", - "sha256": "1v8x6qmhywfxs7crzv7hfl5n4zq5y3ar40l873946l4wyk0wclng" + "commit": "bfe27a1b8c7cac0fe054e76113e941efa3775fe8", + "sha256": "1071gqli1qd498syhysyj2wzyw1nya5070m82xd9qalqdh11b8is" }, "stable": { "version": [ @@ -26069,18 +26237,16 @@ 20200313, 1030 ], - "commit": "f805a35f696d965b297de3988a2340f86bfe88ba", - "sha256": "102yzbgmqyy5m74zhr8kaai17dyhg8k6w0ykxyvmb0q7ghwaq01s" + "commit": "e5d476b5f22927d341caf1774355d9e69e390cfa", + "sha256": "1kcdl56qybvq4m5dp65n3nbg6xijb793xi25yckk5nc17n1nwrzb" }, "stable": { "version": [ 23, - 0, - -1, - 2 + 0 ], - "commit": "a24425668beed38e04039c292361e09c4826683f", - "sha256": "1i91p2hsajcwjqv10ri6jj2a94g68mb6fmxqx47g50fbc5f0dqj5" + "commit": "7a8d04dbcb388a5d837a213ad249c1b96e19e998", + "sha256": "0hw0js0man58m5mdrzrig5q1agifp92wxphnbxk1qxxbl6ccs6ls" } }, { @@ -26870,14 +27036,14 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20200328, - 1547 + 20200516, + 522 ], "deps": [ "julia-mode" ], - "commit": "1c2387fdba509c1c9d072150f65ccc318a570870", - "sha256": "0llsjqrvabcvpd2nhixiklwmm2lisywif77iwfrsdc6lfxp8cdd0" + "commit": "8f04fa92a11cdb4a3777755fdbaaa65e076f04ef", + "sha256": "10cg90aqlr5y3vmp94zhkwj3l178l9f32igpl38bzxm9hmdgikfr" }, "stable": { "version": [ @@ -27202,22 +27368,22 @@ "dash", "paredit" ], - "commit": "0fe2d3fa0fd1739ec096f149dc067b586e05c75c", - "sha256": "0gswgn99pqikw44mp4v6b4bxvh6bj132gq5x3swvkmi3f56l0bry" + "commit": "c8e5f31a2476c922857d921e367b6a2320ce5a6f", + "sha256": "1mrssbl0wyc6iij8zk1y3h9bd3rv53nnrxsij7fn67l1m4z0clyn" }, "stable": { "version": [ 0, 9, - 6 + 7 ], "deps": [ "ace-window", "dash", "paredit" ], - "commit": "7e2b42570b449b2a3c2922f3036a027d1e393a60", - "sha256": "0x97flv356kd7j6wbhacz0lmsrdd9as87b0n6nliq5n0y30my8dy" + "commit": "c8e5f31a2476c922857d921e367b6a2320ce5a6f", + "sha256": "1mrssbl0wyc6iij8zk1y3h9bd3rv53nnrxsij7fn67l1m4z0clyn" } }, { @@ -27326,16 +27492,16 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20200304, - 1421 + 20200516, + 1740 ], "deps": [ "cl-lib", "goto-chg", "undo-tree" ], - "commit": "296932406a0b55474fe4b6cb8db8b7d5e05633aa", - "sha256": "1gvmvczdfgq07chj98gqg5j2zyfdrq3znl8l6a81mbrjbvsyvmd3" + "commit": "3f3b2fea87172f155e5f91d75f0fb69d8648acf2", + "sha256": "0ihb42v513c9jrh8d0v5a76ykhqi408cdnfpilrwq9499qr22jdg" }, "stable": { "version": [ @@ -27360,15 +27526,15 @@ "repo": "emacsorphanage/evil-anzu", "unstable": { "version": [ - 20170124, - 718 + 20200514, + 1902 ], "deps": [ "anzu", "evil" ], - "commit": "9bca6ca14d865e7e005bc02a28a09b4ae74facc9", - "sha256": "1y0jiglcazxnvggs5ljys2iizljsihlgr46svbbwgf45ibdrw392" + "commit": "d3f6ed4773b48767bd5f4708c7f083336a8a8a86", + "sha256": "0ribvnw2slaad4xlcyxhg3linvd810qqn52qpyrjsq0dnqrpmwyl" }, "stable": { "version": [ @@ -27529,16 +27695,16 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20200327, - 722 + 20200513, + 804 ], "deps": [ "annalist", "cl-lib", "evil" ], - "commit": "2df9bedfa48bdc22e46bf4d43f6e2792d4cafbea", - "sha256": "17737k612gl5bhkkq8fdivk9rxbcypfl9hnm3mbp5v2wpr8chw3a" + "commit": "e998952dfe73d296259905e1bd8f96659bfe2661", + "sha256": "1r896jbshniaxxh15iw87yklnr2hq5as3a8w6xb202gxz5pvc4ym" }, "stable": { "version": [ @@ -27611,15 +27777,15 @@ "repo": "PythonNut/evil-easymotion", "unstable": { "version": [ - 20180114, - 654 + 20200424, + 135 ], "deps": [ "avy", "cl-lib" ], - "commit": "79c13ed3bce018ac09d358e642e5bd7025e93603", - "sha256": "0496dnbciq8gbivihas1y58gwd4nbfz767rr98zpwgkz8l2jvy73" + "commit": "f96c2ed38ddc07908db7c3c11bcd6285a3e8c2e9", + "sha256": "0xsva9bnlfwfmccm38qh3yvn4jr9za5rxqn4pwxbmhnx4rk47cch" } }, { @@ -28063,15 +28229,15 @@ "repo": "emacs-evil/evil-magit", "unstable": { "version": [ - 20200302, - 1611 + 20200409, + 1909 ], "deps": [ "evil", "magit" ], - "commit": "0b79aa33a478770865716dc0e09f95d91ec042a2", - "sha256": "0qxapq9nl1yr3ryg1q9n2ajffm308fai115mbvwmjl9sd6x2p3ly" + "commit": "253c644807013fe92429acdef418748794b8f254", + "sha256": "08mh7phxsdb9w4dfs0pmr4l4fdzzr2rm88z2s8karfi5j5ik2ag5" }, "stable": { "version": [ @@ -28125,14 +28291,14 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20191023, - 2322 + 20200502, + 1140 ], "deps": [ "evil" ], - "commit": "11d98debf8b051b10068137668eb54c2fede0e30", - "sha256": "1jppiqz1mlmz9wnxmaymg15sz6j59kghhrv95r6hkv90zwdvbqvw" + "commit": "943bf5fb2b04e077a797cf192fd7650b41e3c3e4", + "sha256": "0iryzs12nn20pj5zcyhdk4mpgyrlah0pzbjawmj0l91clmhwbvhb" }, "stable": { "version": [ @@ -28260,11 +28426,11 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20200324, - 2310 + 20200417, + 59 ], - "commit": "4387407615258d5e95f71bfb425cbe92dd813290", - "sha256": "0v31gbn423g20lqksvbc72z325lh0qjmgz8nhy8ygqli4b2msvzb" + "commit": "1bd2de52011c39777a3e8779b14cee2790dc873b", + "sha256": "0h8hzqjh6qq4fj0imrb5ic5m4zn3ig6s3b7b2x9r6ig9m15jpg6n" }, "stable": { "version": [ @@ -28360,8 +28526,8 @@ "deps": [ "evil" ], - "commit": "9d4be14118bf27094a30dbff349b815f098aacbf", - "sha256": "1fxxfkinb0gq4p5b686r7z4jrkv98zfgh5z889zkjacncv8ibswn" + "commit": "2d70c981587187f4fb7d72b9c5b368e6f7c1460f", + "sha256": "1v20iba2b6dwr01zm69ix23xrlkm1ig8n9zn13nkna9iawafqrq9" }, "stable": { "version": [ @@ -28672,15 +28838,15 @@ "repo": "hlissner/evil-snipe", "unstable": { "version": [ - 20200103, - 923 + 20200422, + 519 ], "deps": [ "cl-lib", "evil" ], - "commit": "3ec8adfd4990f95fa0fab2b7019ead3596857673", - "sha256": "0q689f52saky3rfap351n4bkjn0kpg7xkjias926affqpghywb1r" + "commit": "2ba6353bb9253dbbc4193f1d35403e7dcc1317b1", + "sha256": "1sqbwg41by88qq7npsw7w9q3zmfk5adzqpqh2m84zk6fd64mc6h2" }, "stable": { "version": [ @@ -28863,8 +29029,8 @@ "deps": [ "evil" ], - "commit": "296932406a0b55474fe4b6cb8db8b7d5e05633aa", - "sha256": "1gvmvczdfgq07chj98gqg5j2zyfdrq3znl8l6a81mbrjbvsyvmd3" + "commit": "3f3b2fea87172f155e5f91d75f0fb69d8648acf2", + "sha256": "0ihb42v513c9jrh8d0v5a76ykhqi408cdnfpilrwq9499qr22jdg" }, "stable": { "version": [ @@ -29430,8 +29596,8 @@ 20191229, 112 ], - "commit": "d17c4e0b73fc5ffeb2bc28156785c6bdda058654", - "sha256": "0nxrdfr9y37ws647qbb0c25l2vwapkqp3qhxwds20jwkskpqa7vm" + "commit": "2d152d17814c6d551d525d83201da72c4047c1de", + "sha256": "129iccdddpz0hhb25v63a8pk76ayx67jn47rwd3x6wzsnhsg3pp6" }, "stable": { "version": [ @@ -29617,11 +29783,11 @@ "repo": "extemporelang/extempore-emacs-mode", "unstable": { "version": [ - 20200312, - 224 + 20200408, + 2253 ], - "commit": "9f370d6cba7f115896579b634c7550923503a4ab", - "sha256": "11qm9f850zm8l26q75j9mlbl5ydiyw7alan47h4nyfihpl4498qz" + "commit": "09518ae6650d7be33a4633a4c0f31b7130d04c6e", + "sha256": "0hfza9lzdsz94gxhmzyp9fwviscv19rmnjgd0q613faayn11sjsp" } }, { @@ -29834,20 +30000,20 @@ }, { "ename": "eyebrowse", - "commit": "90d052bfc0b94cf177e33b2ffc01a45d254fc1b1", - "sha256": "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861", - "fetcher": "github", - "repo": "wasamasa/eyebrowse", + "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", + "sha256": "18wkfih7i6swg0wadkrs3bq7bmy54v0lph2p14dqpgmxcyh2zzgg", + "fetcher": "git", + "url": "https://depp.brause.cc/eyebrowse.git", "unstable": { "version": [ - 20190928, - 1458 + 20200506, + 1303 ], "deps": [ "dash" ], - "commit": "e483d35e905c2e26fac63f33c77b9e764729a364", - "sha256": "1y3v2cplvnnhw4ga2pw2agwdbffdjrfhjz73cfv6vaa5q8hp32vy" + "commit": "bde0eb8f56ec7e2501dc33154c273e43cafb1e5d", + "sha256": "19x3wfnbcmrrywxbigr3lv0yp6dxmr0iy10ykqg3pajpxbvarcn2" }, "stable": { "version": [ @@ -30457,11 +30623,11 @@ "repo": "yqrashawn/fd-dired", "unstable": { "version": [ - 20180731, - 1049 + 20200428, + 332 ], - "commit": "fd4c3f490b0b6727592b85f1635e57638dec8f91", - "sha256": "0vgwbdrs2f4lwpciwv4j544nqfqwdgli9fsr3ldr01wd4ghjib9m" + "commit": "001cc95effdd5c4d9974b3f2c40b2ddf1f0e3de2", + "sha256": "1ab03jn1kg4bq97d7dzinpxlyg3wcx4cha0a7ibqdbqrci3znigc" }, "stable": { "version": [ @@ -30549,11 +30715,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20200206, - 2001 + 20200405, + 1935 ], - "commit": "c02f4a9ed1b9c26f9cfc3237906c2844f5937622", - "sha256": "1bcdicgp3wlxpdzardx1ry9js192dy26q8af6pdlvrnxqvdl2asm" + "commit": "7fadf2580c3afcae3f6ebc54dad0e519b7600f1d", + "sha256": "1qpfpfdm2d8bdqm7h62y3hgbip67yqmblhg66zlmfxfdnsad5ls6" } }, { @@ -30635,16 +30801,16 @@ }, { "ename": "figlet", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "1m7hw56awdbvgzdnjysb3wqkhkjqy68jxsxh9f7fx266wjqhp6yj", - "fetcher": "bitbucket", + "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203", + "sha256": "0p5xnq3c4bvvy7nqgi18ylsha7kz9r7apw7lz84kq5hwhni298k5", + "fetcher": "github", "repo": "jpkotta/figlet", "unstable": { "version": [ 20160218, 2237 ], - "commit": "70ca269d706eedd34838fe2435073c6860be470b", + "commit": "19a38783a90e151faf047ff233a21a729db0cea9", "sha256": "1c18b1h154sdxkksqwk8snyk8n43bwzgavi75l8mnz8dnl1ciaxs" } }, @@ -30959,11 +31125,11 @@ "repo": "jming422/fira-code-mode", "unstable": { "version": [ - 20200316, - 1708 + 20200415, + 2356 ], - "commit": "64c4e655ea6ef29c7e720a5bf9281e865f2e3fa7", - "sha256": "0c11lfwdibx35wwvpq3vl4img4rz2slslqhlqaqbab212ii9jsmy" + "commit": "a61d7fce35eadba39236a6a3e9aa301e161d147b", + "sha256": "1bn81qwkvhznc5pi6bq08kp83208pj09vknfszx152r72sv5fpmz" } }, { @@ -31022,35 +31188,35 @@ "repo": "johanvts/emacs-fireplace", "unstable": { "version": [ - 20181211, - 1927 + 20200402, + 2206 ], - "commit": "571ffa7dd0ce46edca838df74d055aaa83da4d78", - "sha256": "1iw17rkihsn50p3zljag82v09zyav8bzgfn6mfa267fkf4f1fgjy" + "commit": "f6c23e259349922aae25cf2898ba815a7d8f2527", + "sha256": "16cb8grw2cfgdix1sr5a3fnwhhc93ci8qgbhgs5ilyayy2cb6s4c" }, "stable": { "version": [ 1, - 1, - 2 + 2, + 0 ], - "commit": "2b966ed65b714c613f79e9144d004dfa3b28f1ed", - "sha256": "1f5053bbvjdmm64zv6r2qkswkpwvx0s3qz4bwm9zya583a6g0nv8" + "commit": "f6c23e259349922aae25cf2898ba815a7d8f2527", + "sha256": "16cb8grw2cfgdix1sr5a3fnwhhc93ci8qgbhgs5ilyayy2cb6s4c" } }, { "ename": "firestarter", - "commit": "5b046eb3b63220b937e1b70f633cb5424dc782a1", - "sha256": "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp", - "fetcher": "github", - "repo": "wasamasa/firestarter", + "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", + "sha256": "1kaw710za76178ak35nlgr2pj1303z7fcas6474rr3nd82l8sypf", + "fetcher": "git", + "url": "https://depp.brause.cc/firestarter.git", "unstable": { "version": [ - 20200116, - 2023 + 20200506, + 1311 ], - "commit": "eecd8f97a09bbfbc03113b71fa3c8b92766e3956", - "sha256": "1a7cp4rfa9r707pg7g9xhhs7nj79gva8fnmbq6ck0hxyllcabwa7" + "commit": "5b117bf8d290af5c104d88c413f40e84da0c4ce8", + "sha256": "13axz8c4v4x43x2ami78kwaj6cpmyqykapj94mqrr3b5qzms502b" }, "stable": { "version": [ @@ -31244,8 +31410,8 @@ "string-utils", "tabulated-list" ], - "commit": "1b8b3460f1e3c3c1784b2a63fb9f4fb3bb4dc084", - "sha256": "1x4k8890pzdcizzl0p6v96ylrx5xid9ykgrmggx0b3y0gx0vhwic" + "commit": "5cddb64e0d52635e9a1529d80cb5cefa6f829341", + "sha256": "0kl2b4j93kk9lzw0qclib55ghcwznag3p022jkr0bq5z30m2gdj4" }, "stable": { "version": [ @@ -31326,6 +31492,21 @@ } }, { + "ename": "flatfluc-theme", + "commit": "de15ce71674965c5e0a8564ae2e640bc05dbd589", + "sha256": "0rpmiw71scdl3dgrvf2j9d909wmafyvlgraxfg5hsxngcyj5gjk0", + "fetcher": "github", + "repo": "seblemaguer/flatfluc-theme", + "unstable": { + "version": [ + 20200419, + 1033 + ], + "commit": "f81bb130be69e9f321e2085b627387074d23a253", + "sha256": "17z5bmcd2c4k26w9xd8npaqwk9wwr2nf0d6vikzj0mxg0pdlbaz2" + } + }, + { "ename": "flatland-black-theme", "commit": "641d1959bd31598fcdacd39a3d1bb077dcccfa5c", "sha256": "0cl2qbry56nb4prbsczffx8h35x91pgicw5pld0ndw3pxid9h2da", @@ -31417,15 +31598,15 @@ "repo": "plandes/flex-compile", "unstable": { "version": [ - 20191019, - 18 + 20200506, + 1309 ], "deps": [ "buffer-manage", "dash" ], - "commit": "df113f0b25ef73c5a246330ef9fa69ab936df174", - "sha256": "11hdabn2ayg2nrp7mg8vp9ywb1yl6nw4z7y7rxv70n0h4blnwn9n" + "commit": "dc6d920b477fe96a71bc37d593beef5ae8b2ae7e", + "sha256": "1vcpb0bnklq89vgynnpfs4dmjacaajrzkasgwzix7q4qfzcbid9n" }, "stable": { "version": [ @@ -31442,16 +31623,16 @@ }, { "ename": "flex-isearch", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "1msgrimi2a0xm5h23p78jflh00bl5bx44xpc3sc9pspznjv1d0k3", - "fetcher": "bitbucket", + "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203", + "sha256": "0y5j90y4ssw3kwqhji9h4icy8xj2pa5fjvkbkl4x7rxs8kwwm989", + "fetcher": "github", "repo": "jpkotta/flex-isearch", "unstable": { "version": [ 20170308, 2010 ], - "commit": "8b934ea6f1e4324088f055454a2e8b714961854a", + "commit": "b1f7e04de762282c276343cc2709af9ff4abc9d2", "sha256": "0xbwrzkfv4i91qxs80p0pfjlvj5pyigvidby8m5lammm8idwx9dh" } }, @@ -31481,14 +31662,11 @@ "repo": "IvanMalison/flimenu", "unstable": { "version": [ - 20170418, - 147 - ], - "deps": [ - "dash" + 20200415, + 2353 ], - "commit": "9351201d89b05cbdaec312a6ebd7fd10c38d6112", - "sha256": "1qb08j66a9mvybqhc2vyywwn16w3kkjb06k50rfqf6sbcmndz8va" + "commit": "f110bc77415a7594742f3b12551571c4069c9157", + "sha256": "1y832w4n10k9lfi90lhq8l9s56zcg24j9j8jklkzby1vf34vq0ql" } }, { @@ -31633,11 +31811,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20200226, - 640 + 20200508, + 1252 ], - "commit": "ec92a4df842ad7e5bd8f60a648ffe7b004abb09d", - "sha256": "1l7nd01p5p9l2a4k2rl61vjs337sagx4m3qr4isvhvy2bk2cppmy" + "commit": "8818bc07727fe748edf4aea629b510b7ada680b3", + "sha256": "05pl4w3zmfg24fk1pj053r0f8sx3m1zacfymvpya022y1ggpvnh6" } }, { @@ -31655,8 +31833,8 @@ "flutter", "flycheck" ], - "commit": "ec92a4df842ad7e5bd8f60a648ffe7b004abb09d", - "sha256": "1l7nd01p5p9l2a4k2rl61vjs337sagx4m3qr4isvhvy2bk2cppmy" + "commit": "8818bc07727fe748edf4aea629b510b7ada680b3", + "sha256": "05pl4w3zmfg24fk1pj053r0f8sx3m1zacfymvpya022y1ggpvnh6" } }, { @@ -31766,8 +31944,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20200329, - 2344 + 20200516, + 1719 ], "deps": [ "dash", @@ -31775,8 +31953,8 @@ "pkg-info", "seq" ], - "commit": "1751a4e9f8f6f20706a1620429422f101eabcd38", - "sha256": "10w9fgcwyni5iid7sfzrza155wrh481gdylwrwa7v640a9jmbyls" + "commit": "309d37286729994094b931344c9a664dd7c6c08d", + "sha256": "1gsa4lik5f0dzn897lh369nmcn7n61if80ll5jc5qiymm1fx16cr" }, "stable": { "version": [ @@ -31985,14 +32163,14 @@ "repo": "alexmurray/flycheck-clang-analyzer", "unstable": { "version": [ - 20200320, - 428 + 20200429, + 238 ], "deps": [ "flycheck" ], - "commit": "7e1bf9853a34828c7f81d824dc4785f1620f2006", - "sha256": "1iw3vjdnskbk8zlbyvxiwlisj72d7q8nz8n55ffwz3v44ymzhya6" + "commit": "0c9b6e4626cd5376037464f8d6b8c64aa32768ee", + "sha256": "0nr3wipmcalxfp48hi23vmrj2rwbwk6gipdqmic8ay4z9x2csi8v" } }, { @@ -32053,14 +32231,14 @@ "repo": "borkdude/flycheck-clj-kondo", "unstable": { "version": [ - 20190619, - 1743 + 20200414, + 1444 ], "deps": [ "flycheck" ], - "commit": "f652a8dc4cff01e78bba50b555bae7ba6115b552", - "sha256": "09k87wfz4m16r32g6ry4jl2zagh1gpgfd9sik54wvyky24s605y4" + "commit": "5472c26ffdf754a0661357564874ffd4f8598805", + "sha256": "0nb88mil1nlhv0nalswl3xwndzz91yah52zpri2jfbyvivshpfm4" }, "stable": { "version": [ @@ -32491,8 +32669,8 @@ "let-alist", "seq" ], - "commit": "debd0af563cb6c2944367a691c7fa3021d9378c1", - "sha256": "1vl0lss2n50pz5wscqj6vhjwb4hbg8xx2chh5vafsrnn0a3fryrd" + "commit": "1b60050efd4729bfba548f3e5adbcb58436667cb", + "sha256": "1kjms9d2c98ffd1qxs879qhg0n4jzic0r5kni9y4gz3v09ww8zms" } }, { @@ -32637,31 +32815,31 @@ }, { "ename": "flycheck-grammalecte", - "commit": "fdd82aa0568d998a3d176b5ee47b8a227438ea09", - "sha256": "0xqg995a42cl6mvmpi68ay56fgs636cbzg65q5si5yc1yzgl74nv", + "commit": "ddaffa55c1b99cce9097c019efe9a236e2f5a395", + "sha256": "1fblc6mvj9n676ci8597as3rnwh6hmbh2hfwr92gi1dd8ibnd2pn", "fetcher": "git", "url": "https://git.deparis.io/flycheck-grammalecte/", "unstable": { "version": [ - 20200308, - 1452 + 20200515, + 1120 ], "deps": [ "flycheck" ], - "commit": "ca4b87d22474d3337db72e19f88105f557f44867", - "sha256": "0wj81xfy3wlgdlnhhyhz5lfkl6sfb2ajwb6s8f2y4bcvqa8gz3qj" + "commit": "8608df3144714d79b93afcfe13400693ed763ed8", + "sha256": "1ibcalim4mp9676szbvrf69nhfbc8vy47anmpqi9idjvdf6bpm75" }, "stable": { "version": [ 1, - 0 + 2 ], "deps": [ "flycheck" ], - "commit": "ca4b87d22474d3337db72e19f88105f557f44867", - "sha256": "0wj81xfy3wlgdlnhhyhz5lfkl6sfb2ajwb6s8f2y4bcvqa8gz3qj" + "commit": "8608df3144714d79b93afcfe13400693ed763ed8", + "sha256": "1ibcalim4mp9676szbvrf69nhfbc8vy47anmpqi9idjvdf6bpm75" } }, { @@ -32805,14 +32983,26 @@ "repo": "gexplorer/flycheck-indicator", "unstable": { "version": [ - 20190729, - 1501 + 20200331, + 1142 + ], + "deps": [ + "flycheck" + ], + "commit": "e00d9a20cbc21d6814c27cc9206296da394478e8", + "sha256": "0y3dzamm7xcac9fcgx88z48l6nkgmz5lx0a6lnxxywkh0h1y2kqn" + }, + "stable": { + "version": [ + 1, + 1, + 1 ], "deps": [ "flycheck" ], - "commit": "6b1386296ddf2ccc11ca8fa719dc0b2f16808424", - "sha256": "0bd8k3jzipm0r0242hpl2lkcdfnb367yf4xpj6r23g3y99f6f0yk" + "commit": "e00d9a20cbc21d6814c27cc9206296da394478e8", + "sha256": "0y3dzamm7xcac9fcgx88z48l6nkgmz5lx0a6lnxxywkh0h1y2kqn" } }, { @@ -32920,26 +33110,26 @@ "repo": "candid82/flycheck-joker", "unstable": { "version": [ - 20180913, - 504 + 20200412, + 2346 ], "deps": [ "flycheck" ], - "commit": "51e99e697761ee8dab863930910abdba7607c1bd", - "sha256": "07pxfvnrgp7f3rb27j1zrq04pncvga4291krqqy3dzwazsjplz48" + "commit": "93576295fef7a749bf779eeece5edd85e21868e2", + "sha256": "1hz5nlrhbrlwwk8rcjvc3jhj0g9wgm6xw903ap8fxq470mj99gln" }, "stable": { "version": [ 1, - 3, + 5, 0 ], "deps": [ "flycheck" ], - "commit": "51e99e697761ee8dab863930910abdba7607c1bd", - "sha256": "07pxfvnrgp7f3rb27j1zrq04pncvga4291krqqy3dzwazsjplz48" + "commit": "93576295fef7a749bf779eeece5edd85e21868e2", + "sha256": "1hz5nlrhbrlwwk8rcjvc3jhj0g9wgm6xw903ap8fxq470mj99gln" } }, { @@ -33162,8 +33352,8 @@ "deps": [ "flycheck" ], - "commit": "12a77ee8ee3f6e774365f63be3cd5aede6462dd5", - "sha256": "187v8877wh247j26d5h2qcnc8i3fmqgyzfvjjjlw9sswqgrln6m7" + "commit": "5b4e14ab0cbce2ff35fee7e69b5b95eafd609c80", + "sha256": "1cx1rm40ns3y5bdbk8hfycdaq16p4zxkjjss02xs6hl96yvc4kaj" } }, { @@ -33374,28 +33564,28 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20200122, - 1256 + 20200411, + 531 ], "deps": [ "flycheck", "phpstan" ], - "commit": "a1c30ca634107551c20c846b5316ca5697adb06d", - "sha256": "0b7rnzk1zkrzh978bmh2dsy78f0sb4ia1w06khyqiby52m27q9k1" + "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101", + "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w" }, "stable": { "version": [ 0, - 3, - 3 + 5, + 0 ], "deps": [ "flycheck", "phpstan" ], - "commit": "535e172e1c561bc7b8c706b4e03bbf71689bd83a", - "sha256": "1hn1rdgymv81rm8nkibnc5jazgjrx3sz4w1lin85rgypzbfaf6wk" + "commit": "bf9e82a63f2ccb12af02c9e79a83e7989eeb7cb1", + "sha256": "15kv5xv6lcfgf048wr2zsnpvrplbxypy3wq56zvrzbq18hwprqg1" } }, { @@ -33406,16 +33596,16 @@ "repo": "Wilfred/flycheck-pkg-config", "unstable": { "version": [ - 20180430, - 2243 + 20200409, + 501 ], "deps": [ "dash", "flycheck", "s" ], - "commit": "e72e4c1b8153611ed82695673af84096f4d52795", - "sha256": "07zyrbib9qzy4kj3p7kljcfi53qhb28nf0sjhhkqzdj09iv2k9wf" + "commit": "b76b24ea1f4800f5fb96ce9c6c4788e0e63133d3", + "sha256": "01wzzrpfgh3z28qsynxvkfm92xy98vyvkkv31qh53kxxdicnzlh0" } }, { @@ -33507,15 +33697,15 @@ "repo": "flycheck/flycheck-pos-tip", "unstable": { "version": [ - 20180610, - 1615 + 20200516, + 1600 ], "deps": [ "flycheck", "pos-tip" ], - "commit": "909113977d37739387c7f099d74a724cfe6efcec", - "sha256": "0rfbhvl8n656a9d58bjyzki9r3si3ypylbyjn67rnla4jzzi22v8" + "commit": "dc57beac0e59669926ad720c7af38b27c3a30467", + "sha256": "15h4m5cfk0vh1g630vlwfxmcpa1jdalrrldnvijsqla99mb2jm1w" }, "stable": { "version": [ @@ -33575,14 +33765,14 @@ "repo": "msherry/flycheck-pycheckers", "unstable": { "version": [ - 20200206, - 2158 + 20200428, + 40 ], "deps": [ "flycheck" ], - "commit": "c5349c0fb3b719469b7e66dbdfbe58d0813f6a74", - "sha256": "02886xggdb09880jp57cah3fmf1nm77gvb0aaws8j4abl278g7x5" + "commit": "dcf5b097b7c1206f6325547f5cf37b867a6a5ffb", + "sha256": "16fwk1prq7gyhs0yk4bmr9j3wxnznjj9ppbxwidnmpbhdis2f0sv" }, "stable": { "version": [ @@ -33679,8 +33869,8 @@ "flycheck", "rtags" ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", + "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" }, "stable": { "version": [ @@ -33899,15 +34089,15 @@ "repo": "nhojb/flycheck-swiftx", "unstable": { "version": [ - 20191129, - 2207 + 20200504, + 1345 ], "deps": [ "flycheck", "xcode-project" ], - "commit": "94ead32e879c055902e3edb78af1193f21339e5f", - "sha256": "1r49cyhpqw469j832nqdywjh1zc37q9innxwj2hnvvw9hz69g2wm" + "commit": "1b9174fb37498dc3a3cf8bbbfbb4f0470e8ef139", + "sha256": "1qiddgrrf2d0sjmikd9yy53v5vxfh13j1m9qq40ap9vz7x4661va" } }, { @@ -34779,6 +34969,36 @@ } }, { + "ename": "flymake-phpstan", + "commit": "bc0ea837b6813002826d861acb7f3cc506c337ba", + "sha256": "0fg2skkzd9xn42a5jdxg69bjg0jw26p5jrq6i5v815vgisxfgjbv", + "fetcher": "github", + "repo": "emacs-php/phpstan.el", + "unstable": { + "version": [ + 20200415, + 1637 + ], + "deps": [ + "phpstan" + ], + "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101", + "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w" + }, + "stable": { + "version": [ + 0, + 5, + 0 + ], + "deps": [ + "phpstan" + ], + "commit": "bf9e82a63f2ccb12af02c9e79a83e7989eeb7cb1", + "sha256": "15kv5xv6lcfgf048wr2zsnpvrplbxypy3wq56zvrzbq18hwprqg1" + } + }, + { "ename": "flymake-puppet", "commit": "302dbe34e7949da9c65e9c7bf2ab924db91b968f", "sha256": "1izq6s33p74dy4wzfnjii8wjs723bm5ggl0w6hkvzgbmyjc01hxv", @@ -34980,8 +35200,8 @@ 20200329, 2005 ], - "commit": "bb413006afc23105a0f84df6fb82504a06483a55", - "sha256": "09cqn0255pxim34v5zfypbzr4clfd2ajlsyxpc9h64wg6v9876y5" + "commit": "78956f0e5bb9c4d35989657a55929e8e3f5691e6", + "sha256": "068mx5p4drwgppy4ry1rfq6qi79w6d82b4rnpl2jm37grsg94lix" } }, { @@ -35097,8 +35317,8 @@ 20200215, 1408 ], - "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87", - "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp" + "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", + "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" }, "stable": { "version": [ @@ -35125,8 +35345,8 @@ "avy-menu", "flyspell-correct" ], - "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87", - "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp" + "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", + "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" }, "stable": { "version": [ @@ -35157,8 +35377,8 @@ "flyspell-correct", "helm" ], - "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87", - "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp" + "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", + "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" }, "stable": { "version": [ @@ -35182,15 +35402,15 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20200215, - 1503 + 20200513, + 708 ], "deps": [ "flyspell-correct", "ivy" ], - "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87", - "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp" + "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", + "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" }, "stable": { "version": [ @@ -35221,8 +35441,8 @@ "flyspell-correct", "popup" ], - "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87", - "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp" + "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", + "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" }, "stable": { "version": [ @@ -35505,8 +35725,8 @@ 20200321, 533 ], - "commit": "1a54066611da213626ab69ea426ba3c63ece3438", - "sha256": "1c7n099b8dkrcrvxsva7da1m1z01p0acbyj271lix9w331h9gbf6" + "commit": "9f82d31f9f0fb06bbc2ce18e21e79d1eabbe6c5e", + "sha256": "0b6g36frvp1i92qn8rv3dcm8sxiw5yvbvhl7j58x2xwvawn79nfd" } }, { @@ -35632,8 +35852,8 @@ 20191004, 1850 ], - "commit": "eab07dae119129066624e692c1c75a53b2ab10a5", - "sha256": "1q9g8kza6hv6pv1sjzkl6b4gxcx6fsvv8lk5w7kk9gpws5vjz5bz" + "commit": "61a14d1a8c17930caca5c5daf893cedc9c23c5f3", + "sha256": "0acq8d8vlx3hd405wmi5w36gg88bz1c1crmlxbd2whgi8kyf506z" } }, { @@ -35710,8 +35930,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20200309, - 937 + 20200425, + 2225 ], "deps": [ "closql", @@ -35723,8 +35943,8 @@ "markdown-mode", "transient" ], - "commit": "2e2d26cf428012f0ece53a81cde02179e72648aa", - "sha256": "0mpim6699cda3ds8gv1f2y021gssjrw9rg7w9b8h1ifhrl54x0qn" + "commit": "e2da80660a0550f613400ce3b238025589800417", + "sha256": "0m80w0qh6icj365pcg9d0kb2nvmv48c3874wy15mjcilzb6i97av" }, "stable": { "version": [ @@ -35749,17 +35969,17 @@ }, { "ename": "form-feed", - "commit": "468503d8103766e8196e977325e3bcb696219f6b", - "sha256": "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh", - "fetcher": "github", - "repo": "wasamasa/form-feed", + "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", + "sha256": "0nh50lwr9jyi45sd4722nm2rmmc9zm9l8l55w4pjq61cfwldqq7p", + "fetcher": "git", + "url": "https://depp.brause.cc/form-feed.git", "unstable": { "version": [ - 20160102, - 2253 + 20200506, + 1300 ], - "commit": "799ca3e72b20a59a755a094b8cead57f654f3170", - "sha256": "0nj056x87gcpdqkgx3li5syp6wbj58a1mw2aqa48zflbqwyvs03i" + "commit": "b5dbfd8b90e72de84ae7b6667947264fe655c163", + "sha256": "0n2k0ki6k1pgni907fvz09z3hbfbchnv1q80j42w23qam2hp7a3f" }, "stable": { "version": [ @@ -35779,15 +35999,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20200219, - 1628 + 20200513, + 1930 ], "deps": [ "cl-lib", "language-id" ], - "commit": "8c8c47a863a397d947999fff4358caf20bafca0a", - "sha256": "0ayb57p114z64ppf74g2wpm2g2iga2vrl8rhay7fnfv1j2i4xjss" + "commit": "0227e1aadeb18db397f03368d54cbefe4afd6112", + "sha256": "0p04xgswp269a17jpiwpj8qfj3c2zvkmr4vn0wa1dfrw5f5bfj2x" }, "stable": { "version": [ @@ -35924,26 +36144,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20200312, - 1315 + 20200516, + 624 ], "deps": [ "seq" ], - "commit": "92fdd9c8a5e405cd77ee6f338351b9ebc8976038", - "sha256": "0wa28wdd3kgxwaaiay0mha4w87x2p8z01vfn93y1256awx8kgg78" + "commit": "83d308b6fd26662bc8fb204c4d634616e03dca44", + "sha256": "0a068qfc969bvxyynrk2yakv2l3y31snnvcpdsbxd4m4m6drv3lw" }, "stable": { "version": [ 3, - 0, - 3 + 1, + 0 ], "deps": [ "seq" ], - "commit": "974c9df2c73cf52030dfe0c771d97d3d37bd08e4", - "sha256": "0103rnq9x07a11930jgcg04ayd7npri9wd2j2ghr510y7sm86p0d" + "commit": "9027c6f2b2a2d7d64501e55ff3531cdef26c463d", + "sha256": "08giwg0jwk8zzj2i4cm08322qr6znrnv9a49za7c6j47bykpwj6s" } }, { @@ -36210,20 +36430,152 @@ "repo": "rnkn/freeze-it", "unstable": { "version": [ - 20200322, - 700 + 20200416, + 1605 ], - "commit": "0e2ddd99dc1211800d55e874c1bd078f879e0d9c", - "sha256": "08jdlwn8da8cgkpwpx8834rhx8is5iigq0cv3abbydmz5lrd72nl" + "commit": "b93af18633bc783c2cb8443808aeeaaca33e1146", + "sha256": "0gljal6hmchx5zyd268kwlqn8pqq206y8a89ff7kq6qaql88mngn" }, "stable": { "version": [ 0, - 1, + 2, + 1 + ], + "commit": "b93af18633bc783c2cb8443808aeeaaca33e1146", + "sha256": "0gljal6hmchx5zyd268kwlqn8pqq206y8a89ff7kq6qaql88mngn" + } + }, + { + "ename": "friendly-remote-shell", + "commit": "de68633dae1e07006ae7b043c9264d9b8d08d377", + "sha256": "0ja0xgxs26sk2mx57wqb3schmw8ms01sdla260c96ilmy1qj6fvq", + "fetcher": "github", + "repo": "p3r7/friendly-shell", + "unstable": { + "version": [ + 20200510, + 1438 + ], + "deps": [ + "cl-lib", + "friendly-shell", + "friendly-tramp-path", + "with-shell-interpreter" + ], + "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", + "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + }, + "stable": { + "version": [ + 0, + 2, + 2 + ], + "deps": [ + "cl-lib", + "friendly-shell", + "friendly-tramp-path", + "with-shell-interpreter" + ], + "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", + "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + } + }, + { + "ename": "friendly-shell", + "commit": "de68633dae1e07006ae7b043c9264d9b8d08d377", + "sha256": "1xpfykkfrm6gg6p0rjp1hfnjf4k4n6k3v5kxifgbxld4hjl9223d", + "fetcher": "github", + "repo": "p3r7/friendly-shell", + "unstable": { + "version": [ + 20200510, + 1438 + ], + "deps": [ + "cl-lib", + "with-shell-interpreter" + ], + "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", + "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + }, + "stable": { + "version": [ + 0, + 2, + 2 + ], + "deps": [ + "cl-lib", + "with-shell-interpreter" + ], + "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", + "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + } + }, + { + "ename": "friendly-shell-command", + "commit": "de68633dae1e07006ae7b043c9264d9b8d08d377", + "sha256": "0hsnn18zxwqvk5zpp5kf8mlfya6if0npnfm0crvwqqsipx9nj8v4", + "fetcher": "github", + "repo": "p3r7/friendly-shell", + "unstable": { + "version": [ + 20200510, + 1438 + ], + "deps": [ + "cl-lib", + "dash", + "with-shell-interpreter" + ], + "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", + "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + }, + "stable": { + "version": [ + 0, + 2, 2 ], - "commit": "cf53f31e4f266b7f0b12e091de074e763c7d565b", - "sha256": "0drznbwci4swfxmmdvkm14qmpb9y9pykyflhh69l5fdxiigpdlb8" + "deps": [ + "cl-lib", + "dash", + "with-shell-interpreter" + ], + "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", + "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + } + }, + { + "ename": "friendly-tramp-path", + "commit": "cb18ad238792570e5ef825a101059bfdc293949f", + "sha256": "120g9w1l4i544km5d1jx5g4vsfb92lizn7ibxl767zffgahqhbdf", + "fetcher": "github", + "repo": "p3r7/friendly-tramp-path", + "unstable": { + "version": [ + 20200502, + 1032 + ], + "deps": [ + "cl-lib" + ], + "commit": "be572b8953b9e5a3a35c30bb64c2936d3e9802ba", + "sha256": "0w99py469ylkg9jg9fdxalv3axd57ld9rgwhgfy1r8rpp7xch7pn" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "cl-lib" + ], + "commit": "be2714118876c592fae199aaa877c49475b6176a", + "sha256": "1z1rcm8pc8p2d7zzf02nms6cz2ik8y1b95a58lqxlp8n75rz4c5i" } }, { @@ -36349,8 +36701,8 @@ "repo": "FStarLang/fstar-mode.el", "unstable": { "version": [ - 20200305, - 1654 + 20200424, + 2235 ], "deps": [ "company", @@ -36360,8 +36712,8 @@ "quick-peek", "yasnippet" ], - "commit": "aaaf2568881d3e5e08f8cbd04a9add49912552ad", - "sha256": "1wqbfz8sbvfl7v31a1i6mc6c8p5fyp8yflj87lavpk1d0h5dl8ly" + "commit": "d8b586518f32d4acde049852d81902670d1ee277", + "sha256": "0av315lf58nwgvix100bj279mq2pm175vwc5dip19gn73bq4d9vi" }, "stable": { "version": [ @@ -36385,14 +36737,14 @@ "repo": "factor/factor", "unstable": { "version": [ - 20190611, - 1350 + 20200514, + 1516 ], "deps": [ "cl-lib" ], - "commit": "2d85dafa9872fa34b463f6473e61a1ed71c17788", - "sha256": "0zwrlvp2i0n4imba84cc0hsivyaxv4sy98bsqfwpy65xm94h0d96" + "commit": "68f6eeb3adbc7d9f71d24761600bf8538775c969", + "sha256": "16iz2wf8bn4mjcgbc5vj50snlgiqqdc495kxbd9mcld5rjhfs45q" }, "stable": { "version": [ @@ -36545,14 +36897,14 @@ "repo": "diku-dk/futhark-mode", "unstable": { "version": [ - 20200123, - 931 + 20200415, + 1228 ], "deps": [ "cl-lib" ], - "commit": "ca22b1e5fe46125b968c3da46e0bc9780b32e346", - "sha256": "1zkqlacxmiwprx8xbnp6phf3gh3faxghxv0j90019k0g3dq9l3ws" + "commit": "2befd490ce7d78a43d001b4bb0bd4300d086d645", + "sha256": "0p4ii7mbspx1fsmzx9n8z2siq9n8ixpisxs388ndd2ccp7x3k6nm" } }, { @@ -36590,8 +36942,8 @@ 20150730, 337 ], - "commit": "534d723ad2e06322ff8d9bd0ba4863d243f698e7", - "sha256": "0rzp8c2164w775ggm2fs4j5dz33vqcah84ysp81majirwfql1niv" + "commit": "a36bde2f6e94d6b2bfaae68d73bbd39734e5b907", + "sha256": "1aj7r16bnx2jr2gpzwsmr3yqmfza5qbdcn78chcsfqxv5c8bgswa" }, "stable": { "version": [ @@ -36821,11 +37173,11 @@ "repo": "koral/gcmh", "unstable": { "version": [ - 20200315, - 950 + 20200409, + 1456 ], - "commit": "9e241e0a9f921b04407050a0f0fada3d0c3b254a", - "sha256": "0k2qwkj0lacdb5kmvx2ip17wn7bg01y5166bi9lk9zzk3jbh70d3" + "commit": "b1bde5089169a74f62033d027e06e98cbeedd43f", + "sha256": "0k0gh1dr3hipg73mpgkw6hlg27c7c5r8aa61p4vj2rpmf6k90pc5" } }, { @@ -36836,20 +37188,20 @@ "repo": "GDQuest/emacs-gdscript-mode", "unstable": { "version": [ - 20200328, - 1820 + 20200427, + 1514 ], - "commit": "56a864ecff99ae314b838b755cf26af66f4f9323", - "sha256": "0mlvvagdr2bj13ibms1vq8p9zp10ag4qhyfklkj93lg6j744qav4" + "commit": "0718ca9b090780bd28d02ef5c79cd0e7c5a84d5e", + "sha256": "0wdsfakx50x60lxb6d46h9rhb1vrisch71fmdl1c8jiwf57q5kpn" }, "stable": { "version": [ 1, - 0, - 2 + 1, + 0 ], - "commit": "361439f28bd10649c9f58f1d3290b4ee63ee4f54", - "sha256": "1ymblv04as076yfi3inmc3s66j0nqslqvfx34s3da6s8g8zi0ash" + "commit": "86577f81dc2640d5388565d0430b4df241bdd38e", + "sha256": "0cpfdbza3gh1s6y5igs51b1m7g7dfa7jszjfawz3v2g49p4a5m2d" } }, { @@ -36937,11 +37289,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20200327, - 2213 + 20200513, + 1219 ], - "commit": "9b45785173dc61a2897b17edf27df9407d1d94ce", - "sha256": "0r21fs262jzzpilynnlnqc9bd42fbq7hn522dfnx93jjmni35kjc" + "commit": "7a39c8eb7ca2a0a4fe0ad307ea55578e11e6dfdd", + "sha256": "09lv9ixgrkb351nb67nas5yfa8vk0rz4ljhc1hxxn4g451hbd14f" }, "stable": { "version": [ @@ -36954,6 +37306,24 @@ } }, { + "ename": "geiser-kawa", + "commit": "68690d6b011c95197af6b5a87cc21c4dbe97ff00", + "sha256": "0gzzab0v93vd9n14s1bya0frf3dagh0gbwg1an4mapg7gjz9ffdg", + "fetcher": "gitlab", + "repo": "spellcard199/geiser-kawa", + "unstable": { + "version": [ + 20200507, + 1305 + ], + "deps": [ + "geiser" + ], + "commit": "b96c008e9c3b8dc210d8b536ee7b76b8690c8af6", + "sha256": "0j2djjgfd4hd2k60ymgxzpsy52ks6hxpd4rr81z5nh9fdg9axhrs" + } + }, + { "ename": "general", "commit": "d86383b443622d78f6d8ff7b8ac74c8d72879d26", "sha256": "104ywsfylfymly64p1i3hsy9pnpz3dkpmcq1ygafnld8zjd08gpc", @@ -36961,14 +37331,14 @@ "repo": "noctuid/general.el", "unstable": { "version": [ - 20200320, - 2340 + 20200516, + 50 ], "deps": [ "cl-lib" ], - "commit": "14ad4c888b34eb8ebd946d26917aaf2dd4fcce29", - "sha256": "09hp8aavimlhasnxl5z74pk6afvjpcpd6fpv7j2amdmyhbflxv9h" + "commit": "a0b17d207badf462311b2eef7c065b884462cb7c", + "sha256": "0wn5rk3gkimdklip392mnjrmkymgrb7q9skifi03cbpjam1anzvv" } }, { @@ -37384,15 +37754,15 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20200309, - 936 + 20200425, + 2233 ], "deps": [ "let-alist", "treepy" ], - "commit": "a8bf337534ec583906db77a3d56f7d1b84bda952", - "sha256": "0cpbz79k6q5ang47qw4j3i99qz093xc40k8lsc9j21g07fihxiv5" + "commit": "206f2b5b2ab622efda8da85feaa3bc2a1e0f3da3", + "sha256": "132y2yi9c91p25cwnvb9w6jj7la6fdc0xlvnxmbnfnxaic4jyhs3" }, "stable": { "version": [ @@ -37668,15 +38038,15 @@ "repo": "walseb/git-backup-ivy", "unstable": { "version": [ - 20191224, - 1254 + 20200424, + 1049 ], "deps": [ "git-backup", "ivy" ], - "commit": "0a6226c37b63660e6b246bc9bbcf919e44270a99", - "sha256": "081dfbxs417zv2dds4i16ak6dri41cfn012sbfmalp8qslpclb6z" + "commit": "d9361c9ad903e0d58f25ccebad99d9a753f1937a", + "sha256": "0jkkajv0scbp91al18fqqyvvcda2z6wkkbz0p1rcwzap5g96b7ag" } }, { @@ -37743,8 +38113,8 @@ "transient", "with-editor" ], - "commit": "236c44518d30c43c7035be32f02ba615d148b5ef", - "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6" + "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", + "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" }, "stable": { "version": [ @@ -38015,11 +38385,11 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20191119, - 1420 + 20200331, + 2329 ], - "commit": "2fb0e4be8801e7d53e02fc7f14ec0f9a14586ba2", - "sha256": "1y5qw5iyblj14zjvw4is51qyvmy2z0f0iba7cqr628zn9q1fqll6" + "commit": "7142ec898f0cb97aa5d1a68da7957b4710bbfa87", + "sha256": "0xcgzhlxd7ycfxmbgkwm04pdfjysygkka3jis4p45zy6mrackn4c" }, "stable": { "version": [ @@ -38694,6 +39064,38 @@ } }, { + "ename": "gitlab-snip-helm", + "commit": "d73cc8f3490f5e56bc0fda1b7e680d21839f4c98", + "sha256": "0hv0m9lh105f18d4jhc5i68nhv5hxlv4264mkza4cwq07amxlhw2", + "fetcher": "gitlab", + "repo": "sasanidas/gitlab-snip-helm", + "unstable": { + "version": [ + 20200427, + 2014 + ], + "deps": [ + "dash", + "helm" + ], + "commit": "a0ba22ae7098b1a57af626fe5b6e9d663e8e2fc3", + "sha256": "1mxkcnjgazc1pyjbqqfnhc9phpyrgah960avm2fmi7m9n5v8cf0w" + }, + "stable": { + "version": [ + 0, + 0, + 2 + ], + "deps": [ + "dash", + "helm" + ], + "commit": "5fe0a66642da6f4e7ba9e1e3a96572c7f1876e37", + "sha256": "1c5js19zyb1z61hapvbfcl5jhrjqij46cxldgqij6al0scw44dga" + } + }, + { "ename": "gitolite-clone", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0mv2bdfqqq47wgikkm5kwpr8gajylf1yzk2j6cxljz09amgq6c8q", @@ -38796,11 +39198,11 @@ "url": "https://git.launchpad.net/global-tags.el", "unstable": { "version": [ - 20191104, - 1328 + 20200511, + 2146 ], - "commit": "8ac8790790d833e2979103f7f5a14b37382ff323", - "sha256": "05swwpslvy3c7yv7v5g6q4s82ff623lpbdkasmq3q8jhmbjsx92k" + "commit": "5239c1ba873eb907d5665964820b4a7ddbf75b5c", + "sha256": "0yp1hq849drkkbypaaak36i5s1q9ff549w21qswmi60nmiikabsg" } }, { @@ -38811,11 +39213,11 @@ "repo": "jimhourihan/glsl-mode", "unstable": { "version": [ - 20191017, - 2148 + 20200501, + 2304 ], - "commit": "43d906688a8e2fe650005806eb69bea131d9321a", - "sha256": "1783gimn1adfgs2xybz15nrx8wsz1xb4xk8mxrc18hyci7fwk04r" + "commit": "b07112016436d9634cd4ef747f9af6b01366d136", + "sha256": "0bav9ipfm0vy26n74ngsmjzc7fsyqz6xmriadzx55s44h8p5dn1s" } }, { @@ -39105,6 +39507,39 @@ } }, { + "ename": "gnus-notes", + "commit": "971db65c22e975ef52ca964e7d468d2f65ad81ea", + "sha256": "0xvkkmgqhib1fx8dbzv1iz03y67z504b312n2k1rfwl7rgggjc8k", + "fetcher": "github", + "repo": "deusmax/gnus-notes", + "unstable": { + "version": [ + 20200509, + 1942 + ], + "deps": [ + "async", + "bbdb", + "helm", + "hydra", + "lv", + "org", + "s" + ], + "commit": "c5c057263ecc86f60b62a1e811e63cfb1c394c15", + "sha256": "1rfkc6pp2kkin87hbjz1192hb6hf24ygiyd6zigs3bfaxja313rp" + }, + "stable": { + "version": [ + 0, + 3, + 1 + ], + "commit": "8373615b1b5945db485ab18205fdd1077ee0a506", + "sha256": "10ddsw1idyn1w2w92gs6i7a14hq347qib521vk7yqb9s4qyxg1fg" + } + }, + { "ename": "gnus-recent", "commit": "0b80d94cf1a8b8e2d4da5d45f65231aa4884a3a0", "sha256": "14xac6bmn61bk0h6dby14111iijz0j254v4mh77lf0ydbz6wxjf1", @@ -39112,20 +39547,20 @@ "repo": "unhammer/gnus-recent", "unstable": { "version": [ - 20190423, - 1146 + 20200513, + 1038 ], - "commit": "d9375cfad0054a05c910c1210f0f37aa601aebba", - "sha256": "19ggfisfxq2bk62axdi0nipwxymrvnnvmijcrwc9yglbnhiigdb5" + "commit": "a7b131c5acd10df2949ef4f799af08ded013bc35", + "sha256": "0cx0764ksxmjnryjwya3h49r1c5npyipxv16amad1lyysm4a8q0a" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "df85e5810c02f613bfa6e236674de969d6e00ae1", - "sha256": "0hvsp9y0vzcr9c2wglh0wdavjmp2n2hbhlsr1bfvnfxk97ka0y5r" + "commit": "a7b131c5acd10df2949ef4f799af08ded013bc35", + "sha256": "0cx0764ksxmjnryjwya3h49r1c5npyipxv16amad1lyysm4a8q0a" } }, { @@ -39272,8 +39707,8 @@ "deps": [ "auto-complete" ], - "commit": "939b4a677f2f843ea13d9dd90206d57111f0ceb9", - "sha256": "1yfw8y6czkqgxpyfdxwvkcrsmwbca7l0lr4jqmnpmm5m5rylcwr9" + "commit": "4acdcbdea79de6b3dee1c637eca5cbea0fdbe37c", + "sha256": "0i1hc089gb6a4mcgg56vn5l0q96wrlza2n08l4349s3dc2j559fb" }, "stable": { "version": [ @@ -39517,8 +39952,8 @@ "cl-lib", "go-mode" ], - "commit": "85a20dac6cee1e4bcfff554a665bcb7cd21dc0d9", - "sha256": "09xivjss1vlpqyp8cbv6652sgy3rxp00ml7f76prx22cwfpq67db" + "commit": "734d5232455ffde088021ea5908849ac570e890f", + "sha256": "0228l3s3afmvm4cy3vwcpz3g2gkmyhqdq2kwwn1n5dsha8fzbdps" }, "stable": { "version": [ @@ -39610,11 +40045,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20200309, - 303 + 20200425, + 1740 ], - "commit": "85a20dac6cee1e4bcfff554a665bcb7cd21dc0d9", - "sha256": "09xivjss1vlpqyp8cbv6652sgy3rxp00ml7f76prx22cwfpq67db" + "commit": "734d5232455ffde088021ea5908849ac570e890f", + "sha256": "0228l3s3afmvm4cy3vwcpz3g2gkmyhqdq2kwwn1n5dsha8fzbdps" }, "stable": { "version": [ @@ -39627,6 +40062,21 @@ } }, { + "ename": "go-noisegate", + "commit": "1a033cf87c7d53ed8e3af1ac3a5b9b1bac035559", + "sha256": "0hpslf7q4jqbfkr17kb6phc0dbdvqcm9wynzj4fsji7c1cq0z5xh", + "fetcher": "github", + "repo": "go-noisegate/go-noisegate.el", + "unstable": { + "version": [ + 20200502, + 703 + ], + "commit": "e3fc198c234131c94f7d307b7f7c6ef623fb93b7", + "sha256": "12b4l3sl1pykz7v73vsjsicbqpmylsmwhlyprpiimc0r1is5km3m" + } + }, + { "ename": "go-playground", "commit": "900aabb7bc2350698f8740d72a5fad69c9219c33", "sha256": "1rabwc80qwkafq833m6a199zfiwwmf0hha89721gc7i0myk9pac6", @@ -39718,8 +40168,8 @@ "deps": [ "go-mode" ], - "commit": "85a20dac6cee1e4bcfff554a665bcb7cd21dc0d9", - "sha256": "09xivjss1vlpqyp8cbv6652sgy3rxp00ml7f76prx22cwfpq67db" + "commit": "734d5232455ffde088021ea5908849ac570e890f", + "sha256": "0228l3s3afmvm4cy3vwcpz3g2gkmyhqdq2kwwn1n5dsha8fzbdps" }, "stable": { "version": [ @@ -39850,20 +40300,20 @@ "repo": "emacsorphanage/god-mode", "unstable": { "version": [ - 20200329, - 209 + 20200413, + 2144 ], - "commit": "b82ce18ae4db2078c03d92946e21808c1f325f15", - "sha256": "1a490s5s8884rhb35gw4dxdzk2djvdiw4zsp9866sfrwh7xcama4" + "commit": "1eb6ef3a4f67a805c5d6deb1e3895b6c853707d7", + "sha256": "0kqw6w72prhxbqvxccbrc80q82yfif0y99nfgqd60rfk9mpl369k" }, "stable": { "version": [ 2, 16, - 0 + 2 ], - "commit": "b82ce18ae4db2078c03d92946e21808c1f325f15", - "sha256": "1a490s5s8884rhb35gw4dxdzk2djvdiw4zsp9866sfrwh7xcama4" + "commit": "1eb6ef3a4f67a805c5d6deb1e3895b6c853707d7", + "sha256": "0kqw6w72prhxbqvxccbrc80q82yfif0y99nfgqd60rfk9mpl369k" } }, { @@ -39939,11 +40389,11 @@ "repo": "jixiuf/golden-ratio-scroll-screen", "unstable": { "version": [ - 20170224, - 229 + 20200419, + 451 ], - "commit": "44e947194d3e5cbe0fd2f3c4886a4e6e1a0c0791", - "sha256": "1wd19jskpp9w0lrg0ky3hvnliq9l09kmxy59hdp06hsdmvr31jwv" + "commit": "1b6ff0e3e8822423335d3f7d88c1fcb4cf43ce42", + "sha256": "0kniznqdbaim9llf76zi0cbwpa21xcf07w970hrspffjpzkcadnv" } }, { @@ -40038,8 +40488,8 @@ 20180130, 1736 ], - "commit": "305ac8725a166ed42e3f5dd3f80d6de2cf840ef1", - "sha256": "05znbhy98pyc6r7dii8drw4p8vy6f5b3zk0hmlw8w73vcwia59ay" + "commit": "7a59e424c8e641605e30eed68197859533ea6aaf", + "sha256": "1w9hf7bcdd5ddjavhj0ggnxipf5f5w3cfj52n9i46jmm6g2x2b5g" } }, { @@ -40248,17 +40698,17 @@ }, { "ename": "gotham-theme", - "commit": "4b388de872be397864a1217a330ba80437c287c0", - "sha256": "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl", - "fetcher": "github", - "repo": "wasamasa/gotham-theme", + "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", + "sha256": "17nkg3ac8ckk5sa722nqinzhln8nb96yppjyp0567cc8p9a3bp59", + "fetcher": "git", + "url": "https://depp.brause.cc/gotham-theme.git", "unstable": { "version": [ - 20191022, - 1809 + 20200506, + 1250 ], - "commit": "02a7c7cd280747737792f4620b0df2e0b826e2c7", - "sha256": "017ibhznkyla2c3qymv3mlcd25svx8c55vavsb4apwzw061n8m79" + "commit": "0e5965f897c8c976d6b2ca2471dec0dec9b29bbb", + "sha256": "0cvrb23p1m83kd6p5ah04pgzc5gic7q88gnnad9p8d0a7ajh2vbi" }, "stable": { "version": [ @@ -40401,8 +40851,8 @@ "magit-popup", "s" ], - "commit": "a01612b9850519603bfef116bd7bddd9c8e3b975", - "sha256": "0kbnhm6m7sf1j63yykrn4p7ykkjvvair3x95wi4b59icc6ydvwv7" + "commit": "0c56c1e833bc9e21b603539a19bdfe4836a197ed", + "sha256": "0iaa34hh0zpy9alf0d6bad7qwk565l9k5k09ig342pwnmigz1scs" }, "stable": { "version": [ @@ -41215,14 +41665,14 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20200307, - 1522 + 20200514, + 740 ], "deps": [ "autothemer" ], - "commit": "647796a42951a807ee1694a648442b3d83057e43", - "sha256": "0j0w6g0pr1p90wjyrwl21y0hlvjms8ba4yw90sd89lnzn7ncscm8" + "commit": "f1dfcd8bd50e4885cab71b174bbc6a620c2b9d7f", + "sha256": "106vkpm75s3s52bkmcnjlw8gx3qlh5hffwvj2bvkmqfcgnxpzgx0" }, "stable": { "version": [ @@ -41326,6 +41776,30 @@ } }, { + "ename": "gtk-variant", + "commit": "12bcbebf4b604e29cee443825c56336f5249e088", + "sha256": "1dcj0k2j89yx7k0cqqinb4xnhl0i2yivlvrb87xbj89zbijss967", + "fetcher": "github", + "repo": "bepvte/gtk-variant.el", + "unstable": { + "version": [ + 20200416, + 2136 + ], + "commit": "4462a5ab071ec001734e92d1ac2e5fa9721b94bd", + "sha256": "0v2h846k9xv47am66nv4piqhvn74xijhp2bq84v3wpls4msvfk70" + }, + "stable": { + "version": [ + 1, + 0, + 4 + ], + "commit": "4462a5ab071ec001734e92d1ac2e5fa9721b94bd", + "sha256": "0v2h846k9xv47am66nv4piqhvn74xijhp2bq84v3wpls4msvfk70" + } + }, + { "ename": "guess-language", "commit": "6e78cb707943fcaaba0414d7af2af717efce84d0", "sha256": "1p8j18hskvsv4pn3cal5s91l19hgshq8hpclmp84z9hlnj9g9fpm", @@ -41415,8 +41889,8 @@ "repo": "alezost/guix.el", "unstable": { "version": [ - 20200219, - 1821 + 20200510, + 1613 ], "deps": [ "bui", @@ -41425,8 +41899,8 @@ "geiser", "magit-popup" ], - "commit": "3b5990618e70494aa89ff18c58ff24f369005323", - "sha256": "1w5dhacl451cbi8s6y49dcgzkxyai9ggrkpkf16kpmgwf7j0rapk" + "commit": "0b8f75124372266bfab32e8d1fa114f33ea24e6f", + "sha256": "17i0rivgixkg18qiqw5a47ahli9vpc9p5yhd9s9j3jmf1jlzq4bf" }, "stable": { "version": [ @@ -41592,14 +42066,14 @@ "repo": "hhvm/hack-mode", "unstable": { "version": [ - 20191218, - 1628 + 20200421, + 157 ], "deps": [ "s" ], - "commit": "fd6a661b091490920804d043303596f9e60a5dd7", - "sha256": "1x4nymp53rdm1d0jjkz0mha4d8y8wzmakf65d56fn5mnziqh2l5d" + "commit": "330df61f7297344cff9cf9e2d802a4d041279de3", + "sha256": "00g9h96kb9d3qg544x9143hx4nc5crw67cq93ip4mrh3d86rkpc1" }, "stable": { "version": [ @@ -42043,11 +42517,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20200315, - 140 + 20200408, + 247 ], - "commit": "7032966ee76b23520001af916d9184b4a2d7a689", - "sha256": "0mk2fw33j1k8m6w0b6p15n7zl52kbwjda0p2zzvxbhlk3cvqmgd0" + "commit": "bbdbc0e9231f49a45ce787ebfb3f2b019615bf61", + "sha256": "0qln2zc4zx8w4ffplp6b17sksg578x61hyvwv1l79pc8bmpgn0ww" }, "stable": { "version": [ @@ -42097,19 +42571,19 @@ "url": "https://git.spwhitton.name/haskell-tab-indent", "unstable": { "version": [ - 20170701, - 958 + 20200513, + 1950 ], - "commit": "b921c076c10ba996bcfb3b38654363d30567bfa5", - "sha256": "046wiccc4kg81jcqmxzxh5karfbdg2z1d8i4nzcbz7q3n27x0l5f" + "commit": "0482f0de774c58bd7f2e079f5bf01781eed709a3", + "sha256": "05hgxrmsrmg5i50zxs7pa2xnfn2sja09hdk8xjsalnbbjvn4mmxx" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "6d3b878765b9ef7a4b2c1f5dfd47309d4ab7c419", - "sha256": "07pcn244alqaiqwj9a5jcyh4hp5n71bsnhpilqy3xv0sn6ci1v2q" + "commit": "1127f46eca40a48be9cd2380df2cfc5f0b694e63", + "sha256": "13c2z1i7icpwv60njn83qbla9i0qlq3m0yz88ach1mlvmsdfj9jz" } }, { @@ -42377,30 +42851,30 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200325, - 757 + 20200515, + 715 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "0181b7ef468def6ef5547c7241b5c4c854816166", - "sha256": "09yvc6jpcb93fwa5blgzaqpk3f3v5h6m2hxajih1y6fxrdaxgnhq" + "commit": "202bcb533e2feb25d63c64553afccefd9cfab262", + "sha256": "0vn6420qjs04cwiq1bry0cj14i53w3zkyib4y6wyrnd709dfyzgp" }, "stable": { "version": [ 3, 6, - 0 + 1 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "ac3c49be00df1efecc76ef0b33db2884039579b8", - "sha256": "0miq2q52pbicijp7pmj0widk252qixswywc03d120s4hya2b7vd7" + "commit": "55281e1390bae54310dc880ae3805e0595d5c1bd", + "sha256": "1sghq7xjd4a9ysh3cywd5rss9y47rwk82y86cwh1g7p0jv89gqaf" } }, { @@ -42500,14 +42974,14 @@ "repo": "emacsorphanage/helm-ag", "unstable": { "version": [ - 20200328, - 533 + 20200516, + 613 ], "deps": [ "helm" ], - "commit": "ad3ef038584007fbf1b7d6e727be1f18e39a8730", - "sha256": "06gjbc1rkxg13nb2hr3gm65zyzpxv77pvsz7b7c9i3qfw782zsax" + "commit": "ae1dbefa151544035272d04e56e0147185a847c5", + "sha256": "03q29x63v500b3h4mj99h619ayifb12rrqiyyihm84i9lmgp5r28" }, "stable": { "version": [ @@ -42638,26 +43112,22 @@ }, { "ename": "helm-bibtex", - "commit": "f4118a7721435240cf8489daa4dd39369208855b", - "sha256": "037pqgyyb2grg88yfxx1r8yp4lrgz2fyzz9fbbp34l8s6vk3cp4z", + "commit": "873ae2af16e03c8e10494be3f0e7840eb27172a3", + "sha256": "0ciz4lczfv9b4n12jd9r5w81yj884pmi53xmm9cqzvrv3hh9n8hs", "fetcher": "github", "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20191028, - 1313 + 20200429, + 1606 ], "deps": [ - "biblio", + "bibtex-completion", "cl-lib", - "dash", - "f", - "helm", - "parsebib", - "s" + "helm" ], - "commit": "d4471232be26793fbf56c0ac3690b5f537c378b9", - "sha256": "1bkzhic6qckb267025il1r3xcpz99kisphxiafni1pxvf9jafr0j" + "commit": "8a0dd9841316793aacddea744d6b8ca4a7857a35", + "sha256": "1av058d7888kr3q15y1122r8jkarfw1s83gvkillj7kyzj3i53m5" }, "stable": { "version": [ @@ -42811,6 +43281,37 @@ } }, { + "ename": "helm-bufler", + "commit": "4ba5657f237eea9073a46a4127be5795be07c687", + "sha256": "0wb1ds3acc36hl7798phbvhygfljjc6br11lf4y3043q8v0lz6gi", + "fetcher": "github", + "repo": "alphapapa/bufler.el", + "unstable": { + "version": [ + 20200409, + 1253 + ], + "deps": [ + "bufler", + "helm" + ], + "commit": "b2b260e4f9e8ba76bb8b4d71344c7b75e05ac44f", + "sha256": "0ww7z2xz185i97wa1rnmqwlx2mvwx69hhlyi5m3sm0nkyckb2hjs" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "bufler", + "helm" + ], + "commit": "d6c79f04b7d288174d8294fb30488b567586364d", + "sha256": "0l35ssjry15wqcxnr8rf5lrv856pgnm0k2d4d6ag14ypjx9nfhw3" + } + }, + { "ename": "helm-bundle-show", "commit": "2f10f7387cca102696c38af1d8dc0fe5da5e366f", "sha256": "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7", @@ -43232,26 +43733,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200306, - 1417 + 20200514, + 644 ], "deps": [ "async" ], - "commit": "0181b7ef468def6ef5547c7241b5c4c854816166", - "sha256": "09yvc6jpcb93fwa5blgzaqpk3f3v5h6m2hxajih1y6fxrdaxgnhq" + "commit": "202bcb533e2feb25d63c64553afccefd9cfab262", + "sha256": "0vn6420qjs04cwiq1bry0cj14i53w3zkyib4y6wyrnd709dfyzgp" }, "stable": { "version": [ 3, 6, - 0 + 1 ], "deps": [ "async" ], - "commit": "ac3c49be00df1efecc76ef0b33db2884039579b8", - "sha256": "0miq2q52pbicijp7pmj0widk252qixswywc03d120s4hya2b7vd7" + "commit": "55281e1390bae54310dc880ae3805e0595d5c1bd", + "sha256": "1sghq7xjd4a9ysh3cywd5rss9y47rwk82y86cwh1g7p0jv89gqaf" } }, { @@ -43415,14 +43916,14 @@ "repo": "emacs-helm/helm-dictionary", "unstable": { "version": [ - 20191110, - 2202 + 20200406, + 1632 ], "deps": [ "helm" ], - "commit": "6a21ac1ba424ffa87b3b3e1b53d0fdd529844a28", - "sha256": "1qpcly4v7yf6ncp951gl1c18riln86xgyasf66n56qj26mfq8bhq" + "commit": "1dfec049c7851754a5967329a60e9e9a9f805423", + "sha256": "042rn38myq8b2024mdpisakmqysp34mmhvbdnw433vl9qxw6pikd" } }, { @@ -43666,15 +44167,15 @@ "repo": "xueeinstein/helm-evil-markers", "unstable": { "version": [ - 20190719, - 539 + 20200506, + 715 ], "deps": [ "evil", "helm" ], - "commit": "bb04e3a25920c2fd676132703970c6879dade802", - "sha256": "1g944dv3ak064kxkbl30q1kaap0nzyh2v3klhyxmj8f6jc9x2wh8" + "commit": "0245f0c268e0eaec85df51ab2deba7ac961f6770", + "sha256": "0b1db6x2hz9rixchn9qfp2ak27a2vbz2l4g0fd7mys5c0llbwj1r" }, "stable": { "version": [ @@ -43889,27 +44390,27 @@ "repo": "emacs-helm/helm-fish-completion", "unstable": { "version": [ - 20191230, - 1717 + 20200509, + 1056 ], "deps": [ "fish-completion", "helm" ], - "commit": "b579193c9eca37e45ac54b66114032e9fb78aa69", - "sha256": "1aydd2f0xmyrkl9hhxcrgzgrpl2qna1krzgaprw0y7gcvg0p09b4" + "commit": "fd730198afe01f6eecc6c5841358a8eea4cf4b09", + "sha256": "1iv0hwr74hzgrvrr31nlnswvi87lvpg24rd1rhkr5kjicr2295fq" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "fish-completion", "helm" ], - "commit": "dff0fdfdbf70ad41fa2da031197836a84384e635", - "sha256": "089gp2k22xwn33z8brpyb7r18vpyralq2cwxj1xsc8b2sj9s4896" + "commit": "fd730198afe01f6eecc6c5841358a8eea4cf4b09", + "sha256": "1iv0hwr74hzgrvrr31nlnswvi87lvpg24rd1rhkr5kjicr2295fq" } }, { @@ -44430,14 +44931,14 @@ "repo": "emacsorphanage/helm-gtags", "unstable": { "version": [ - 20200321, - 1456 + 20200409, + 1559 ], "deps": [ "helm" ], - "commit": "ff4329fec2cc1f53b404054ddab4cd16faef7241", - "sha256": "14jjjk258hg2d47d8fgg6qb410ij16400anx5kcghi2680a92f2w" + "commit": "25b81d7774622911c1e95d9020209ae4ace1542b", + "sha256": "14k0yrf8p015gsgdgq8ykvrjjhd1brq2gsfx7m3jv0p789yxw7zk" }, "stable": { "version": [ @@ -44949,16 +45450,16 @@ "repo": "emacs-lsp/helm-lsp", "unstable": { "version": [ - 20200103, - 1659 + 20200429, + 1457 ], "deps": [ "dash", "helm", "lsp-mode" ], - "commit": "6f62659cc528b7e37ffcc8fb356633acd7031be8", - "sha256": "1gf3pzrcxrymlj677mghxf4yrqiqa90y3ip1g1f1h186wnwa2vcg" + "commit": "6b5ce182d7c94c62b55b8f7d0c7e643b2c30e560", + "sha256": "0f6a26h1n6h0x3dal40180w3vb7gz3h8qwxvr3b0zq4f7byikisb" } }, { @@ -45145,16 +45646,17 @@ "repo": "emacs-helm/helm-navi", "unstable": { "version": [ - 20181226, - 29 + 20200401, + 904 ], "deps": [ "helm", + "helm-org", "navi-mode", "s" ], - "commit": "3b9abcc39ce7c657bc2dcc054b850dc2a7cf0448", - "sha256": "1kxv8qx7s51fnzrslwqrgayqvyq30ycnb84p5qy7jf0rf69hxxjh" + "commit": "9bba79119edd8959d26484326c2f6868b7d942c0", + "sha256": "136shiqwr7k95gqywrlqqykx1pgpvyjbfzggwj7q1akqjslxfffn" } }, { @@ -45281,6 +45783,42 @@ } }, { + "ename": "helm-org-multi-wiki", + "commit": "536cf8f9a0b16e6e9bda30de67d0da44bb1b5877", + "sha256": "0wk08m6y2rvjbj28h3hqf9w3cgx0ykiv8z6f6kqjfpik8fl2bzbj", + "fetcher": "github", + "repo": "akirak/org-multi-wiki", + "unstable": { + "version": [ + 20200505, + 1053 + ], + "deps": [ + "dash", + "helm", + "helm-org", + "org-multi-wiki", + "org-ql" + ], + "commit": "8b056103d6f5320563e9fd794a008fd4e0719702", + "sha256": "1xmj2p9hcpf1nld0gsnxq12kaljh0p195fy24v23l8ygykhmqw17" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "deps": [ + "dash", + "org-multi-wiki", + "org-ql" + ], + "commit": "80791ea872939df0578dc3a2992a2f7fd5618971", + "sha256": "0avg5xwnb3c9ylj9dqdcqmh8kykl98jsr6cl3rrivkj7l47i1rl0" + } + }, + { "ename": "helm-org-rifle", "commit": "f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615", "sha256": "0hx764vql2qgw9i8qrr3kkn23lw6jx3x604dm1y33ig6a15gy3a3", @@ -45288,8 +45826,8 @@ "repo": "alphapapa/helm-org-rifle", "unstable": { "version": [ - 20190809, - 1831 + 20200512, + 1943 ], "deps": [ "dash", @@ -45297,14 +45835,14 @@ "helm", "s" ], - "commit": "abc14bb85427a6585aa354894eaef6926881d585", - "sha256": "1ggj84b8wgd8xj6a442wfccvyaqg605zpikx19vqzwymaqbay85f" + "commit": "263f56d70112f5d0496684c89a2aa07959e0a95f", + "sha256": "0pm6va26kadjvbai4qsnjc2bk379w2nk6h3b5f0c2yv3q5na0p49" }, "stable": { "version": [ 1, 7, - 0 + 1 ], "deps": [ "dash", @@ -45312,8 +45850,8 @@ "helm", "s" ], - "commit": "dbda48031bad6fec1e130ee6e0d1a3bfea8ad8b8", - "sha256": "058zvh7cdall7dl3xay9ibcjvs13fbqp8fli3lz980pinmsds3r2" + "commit": "263f56d70112f5d0496684c89a2aa07959e0a95f", + "sha256": "0pm6va26kadjvbai4qsnjc2bk379w2nk6h3b5f0c2yv3q5na0p49" } }, { @@ -45519,15 +46057,15 @@ "repo": "tumashu/helm-posframe", "unstable": { "version": [ - 20200118, - 2302 + 20200512, + 1146 ], "deps": [ "helm", "posframe" ], - "commit": "7970f9397ba7d148e590e4ffb340bf6c7c0602fc", - "sha256": "0106fsdzp3911spylrixqkgpnjnfg491f0rmbqmn4hc1shnc2sbk" + "commit": "b107e64eedef6292c49d590f30d320c29b64190b", + "sha256": "09y98ij4wkqh771ahwi3b7nsg6yb2b69n94v3ad41kp4q0c2rscd" } }, { @@ -45999,8 +46537,8 @@ "helm", "rtags" ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", + "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" }, "stable": { "version": [ @@ -46368,14 +46906,14 @@ "repo": "emacsorphanage/helm-swoop", "unstable": { "version": [ - 20200321, - 231 + 20200515, + 417 ], "deps": [ "helm" ], - "commit": "069dc0b3970f1e796e34b7789ae51b1b7979ee30", - "sha256": "1jf1573r8v4mda1xiszrz51qarb1ii31cyk0v3ci16bi9dpp8swb" + "commit": "2efc552591102ab8b4408ad60a3c4be991bb8e93", + "sha256": "0fbahbcgdcbmnhv3m2pmxy8n01qab5x0468bikygs80krch84qh5" }, "stable": { "version": [ @@ -46398,15 +46936,15 @@ "repo": "emacs-helm/helm-system-packages", "unstable": { "version": [ - 20190809, - 1508 + 20200502, + 751 ], "deps": [ "helm", "seq" ], - "commit": "427c40d18ae1b5593df6bef72aa1d62ce89fc652", - "sha256": "0msil7niva1fy1lw5h7jwzfn398c5msml4vshplz13ry1ip33vih" + "commit": "4e257fc84472d3d85ee2b413ca8a45aa0fd0118c", + "sha256": "1p89zggsqhif6dadajapq8vr9ffxbzq7v8sv8iaxyn0cg2sn6fdl" }, "stable": { "version": [ @@ -46532,8 +47070,8 @@ "deps": [ "helm" ], - "commit": "924b5516270b3933e847562e8e14e3888dd24184", - "sha256": "19y97ia4zl50wd22gkb7kkhj713imd5jc92l2xnpw04b59b60di1" + "commit": "55e56975fe1456591a293bf60c183c3dda9f788f", + "sha256": "0py1k0r15frj67mazfjkdwi8sx5a51ykrrbzvfb73kakq2f55jap" }, "stable": { "version": [ @@ -46799,8 +47337,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20200111, - 2324 + 20200506, + 816 ], "deps": [ "dash", @@ -46809,8 +47347,8 @@ "f", "s" ], - "commit": "c54e9ddbd6a77858048c1a4c4b549de98af8f88e", - "sha256": "0x339wxhwma1i27j52wnbhc541633dxqmx1wyxg3yp78aciyrfhv" + "commit": "c0662aa07266fe204f4e6d72ccaa6af089400556", + "sha256": "1k61k7hhrfi8rzsniy15almvnvdsv85l7bmlaqs695pvanr5zlgh" }, "stable": { "version": [ @@ -46866,25 +47404,26 @@ "repo": "jjzmajic/hercules.el", "unstable": { "version": [ - 20190929, - 637 + 20200420, + 747 ], "deps": [ "which-key" ], - "commit": "031f8eec95240fc46481061f0f44822c0f7fe65e", - "sha256": "0snfmvri4cpmhrk5s4hxxlyzs3d58ysmqzaiyiz4979admdc1lmb" + "commit": "557da39878d0637395fdded91243b340c37eff7b", + "sha256": "1rp37rhkj8jm07dwr74vc68dhrbvyvrxjdavpb0h073ps9vl9dsc" }, "stable": { "version": [ 0, - 3 + 3, + 1 ], "deps": [ "which-key" ], - "commit": "031f8eec95240fc46481061f0f44822c0f7fe65e", - "sha256": "0snfmvri4cpmhrk5s4hxxlyzs3d58ysmqzaiyiz4979admdc1lmb" + "commit": "557da39878d0637395fdded91243b340c37eff7b", + "sha256": "1rp37rhkj8jm07dwr74vc68dhrbvyvrxjdavpb0h073ps9vl9dsc" } }, { @@ -46925,11 +47464,11 @@ "repo": "kuanyui/hexo.el", "unstable": { "version": [ - 20180815, - 219 + 20200416, + 1410 ], - "commit": "6bca18f911f6b2cd5c055ed73ddec98c385f9f86", - "sha256": "1zawz3nry832rhx80hyfqfs0gfw3hyrn96060zj3n75avx13rr8j" + "commit": "d600b6c2d51959f1331c8abf3953365544322afa", + "sha256": "07w6jlq3z5y019n5kplqn38gw60ffk2yx4vchp6qgif98lhcjiyr" } }, { @@ -47267,11 +47806,11 @@ "repo": "DarthFennec/highlight-indent-guides", "unstable": { "version": [ - 20190108, - 3 + 20200412, + 2328 ], - "commit": "0b10f38c54ffc099861ce8463e16a1b07ddbb203", - "sha256": "0fa41y9gdci60417zksj9bgjx1knwh781i3dfphkgr7qbx25iky7" + "commit": "1b12c7b440ff988c7237936187c1375ac4ddc7f4", + "sha256": "03dpwklrwbkminfds8v129w0i47p5mkwdyhlhv05a22xnmlanyrs" } }, { @@ -47345,16 +47884,16 @@ }, { "ename": "highlight-operators", - "commit": "e7bd74b7a3484e437c6db4f18613744ebae030f5", - "sha256": "00agrwp2i3mkacnp4qhqcnpwn5qlbj9qv97zrw7a7ldqga0vwvhn", - "fetcher": "bitbucket", + "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203", + "sha256": "1l0ci20r0qm4lc9chvvwxgyi3vg41n3ccj0csfgzilzicsvjs9ic", + "fetcher": "github", "repo": "jpkotta/highlight-operators", "unstable": { "version": [ 20170213, 2220 ], - "commit": "3938e88e78c592936fc8fc6eabbfaf7205a967c8", + "commit": "7696b43419505d6e3511ad2781f9f1dd3c55ef8c", "sha256": "1h5whrc1iphzq0g8x9mmkhjkbmbdg9i9bvr1y8zrwrs8za8k127y" } }, @@ -47729,11 +48268,11 @@ "repo": "ideasman42/emacs-hl-block-mode", "unstable": { "version": [ - 20200118, - 310 + 20200404, + 702 ], - "commit": "6a8f871d7aa5d0d58b7c6ede281f8f8965124c9e", - "sha256": "1jdqz3cfncka4rdqxa4qg7f8dhkwx2h9s16gd3xqjwh8xrpf9qnd" + "commit": "6dc75e71b0b179d7c087cf7de51823f5810d671a", + "sha256": "142nrxq72dkl45lq93c076nl2ifdl6vdgiydpcs4lwg0crja8qzl" } }, { @@ -47744,14 +48283,14 @@ "repo": "laishulu/hl-fill-column", "unstable": { "version": [ - 20190608, - 203 + 20200404, + 306 ], "deps": [ "names" ], - "commit": "612441e69772c24f9ce67ae73e47c84f29ee653d", - "sha256": "0b7770prp5sj4yinrdgzvblqky05vm245i40d38frcbghwqr2jl4" + "commit": "43cb3c35a92c912b7205b8a36f1ad0ec0a5b4a22", + "sha256": "0pf1hk21xbahccw1cdz95haqvhrf50cwg32qa36v9nammd37752z" } }, { @@ -48080,8 +48619,8 @@ 20200129, 1957 ], - "commit": "5bed6dd5bb9faf7d113b19f61cbca98da6262a3e", - "sha256": "0nhx0j3ffd24v9hvwfwwrp3bhx1105g9vwz543hn6yagx63y4vxz" + "commit": "040d19abd397d2132508a50e1266e86d324f7c69", + "sha256": "04impsvfmna1vyssjs2id9hsk9cq7wx317z4h16wr1jvng6m1jig" } }, { @@ -48142,17 +48681,17 @@ 20200321, 1819 ], - "commit": "cf1cd543f68525732e0a9178c96a5f83a3cabc7f", - "sha256": "1yjfvx94ipps91fr8qbgafpkdp38yhlbzvggyi97g91ib2pxfals" + "commit": "6f9ed1a6517e3a43ef2deafc2f86c70b2abce008", + "sha256": "06vhxmvd57hf8kc21ncv6is9h70syjbzqwfcl3xf5zwcpc8vn13s" }, "stable": { "version": [ 1, 1, - 0 + 3 ], - "commit": "cf1cd543f68525732e0a9178c96a5f83a3cabc7f", - "sha256": "1yjfvx94ipps91fr8qbgafpkdp38yhlbzvggyi97g91ib2pxfals" + "commit": "6f9ed1a6517e3a43ef2deafc2f86c70b2abce008", + "sha256": "06vhxmvd57hf8kc21ncv6is9h70syjbzqwfcl3xf5zwcpc8vn13s" } }, { @@ -48186,8 +48725,8 @@ "promise", "request" ], - "commit": "ef7f42c14f0f4aec475b74d56931daa36aded6c8", - "sha256": "1a1wr86z5368zwvlgyp979x1ypz38m2w2qnp5607vjjplcrcmay2" + "commit": "23407fb7a950f08498b5586062ba69962a20ea24", + "sha256": "1hcwac7fjsshnjapb1hdh9x0liap4n1i5q6bsar5zanmz1h9i94q" } }, { @@ -48538,11 +49077,11 @@ "repo": "humanoid-colors/emacs-humanoid-themes", "unstable": { "version": [ - 20200310, - 940 + 20200403, + 1939 ], - "commit": "57d7db70904faeeba9ccd0151e4ebf889403a40d", - "sha256": "0vxfq6gycgkfypyk91mwf2jg1mkldxpkd2v39j2nmlgbbw1ldaka" + "commit": "22c9a0987c7d746d7eb9fe850f93f232d91cae14", + "sha256": "1h3v76p17mzigwr0kpjlm5fgas4vvrm59g73l1699pnq1n1i5kgx" } }, { @@ -48592,16 +49131,16 @@ "repo": "hylang/hy-mode", "unstable": { "version": [ - 20191003, - 1902 + 20200508, + 502 ], "deps": [ "dash", "dash-functional", "s" ], - "commit": "e2d5fecdaec602788aa7123ed13651c888b8d94b", - "sha256": "0gihxlmfminadaqdr8d2zccd7wwygl3m0gfzxsk5izi7f8hl4w7f" + "commit": "a18b0b8bfcd79a30bfe9ef960244ec6748a9430d", + "sha256": "0vvwilfj1sv7r1xsv7m6w0qc3077jfaflwxmq54dmrbw6qypqx1f" }, "stable": { "version": [ @@ -48703,15 +49242,15 @@ "repo": "abo-abo/hydra", "unstable": { "version": [ - 20200306, - 913 + 20200504, + 1747 ], "deps": [ "cl-lib", "lv" ], - "commit": "16fa8d109ec5799931a793b2e866ea9d593bee84", - "sha256": "1l6pi5ldmdcgv5qyg3kk1x8sxb639brzbfj0iddy5752hmg08g3h" + "commit": "87873d788891029d9e44fa5458321d6a05849b94", + "sha256": "1b6davg1jqcxqzf9aqv8av8c78fgdri97m9q44xzvr1xfbmvkl8g" }, "stable": { "version": [ @@ -48980,6 +49519,47 @@ } }, { + "ename": "iceberg-theme", + "commit": "dec6f24b215de80a4c12856bd1ad4dc26c33f47e", + "sha256": "021v5rpmmk2bym46w9hs5ckyajqv41qf2l2183ybqfc679mkbym8", + "fetcher": "github", + "repo": "conao3/iceberg-theme.el", + "unstable": { + "version": [ + 20200515, + 934 + ], + "deps": [ + "solarized-theme" + ], + "commit": "9615307cbd37e698d6939a04128162ef893313cb", + "sha256": "02lsbzk5215z1rdvs6idnv2yff2487i4pqi1ljdjfn3g43ly5lr2" + } + }, + { + "ename": "icomplete-vertical", + "commit": "1a952162da476b4a0f496d9dc15d2d7a8d0964f6", + "sha256": "10rbsxp3jp8xyzcklpcc2zs0sv4pvvkqb7i96js9cp13nc9a7rgz", + "fetcher": "github", + "repo": "oantolin/icomplete-vertical", + "unstable": { + "version": [ + 20200504, + 1916 + ], + "commit": "fe835acce91b0f088c8d27801bf42e24bb2dbab5", + "sha256": "1az3m6zwrggj4w2lh5qhnbh09dvxpyj5m2a85yhcha2p7g1hpym1" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "a2ee9254085431ec9e5c88d522e2c700355003ef", + "sha256": "1bqnlvv1gvrjriazvzd3bq98r8ii6fqax0zznhvkl1ij5pf55a90" + } + }, + { "ename": "icsql", "commit": "bf2a7e6572418d2f252d63068edd82c21eab874e", "sha256": "1lsh5nfw7xki4cjln492b92v37k093633sl4fs4254qfpi25n94a", @@ -49651,11 +50231,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20190419, - 803 + 20200412, + 756 ], - "commit": "e2c100cdd67b7d82835d281ac2cd1bf4f374bc8f", - "sha256": "0wr3w2id95wx2rma8n1ifjrv9rx37ly26ijc5zi58id0yrip3hnc" + "commit": "0fb3d380866664c3ab543acede606d343c257406", + "sha256": "0fz3p41j6d6bwk95v626j7w1z4rvbdxms6a4azy9dfncplnbnih0" }, "stable": { "version": [ @@ -50030,16 +50610,16 @@ }, { "ename": "immortal-scratch", - "commit": "1f9f4a59d88106ddfee740653abd28e305f6dfe0", - "sha256": "0rxhaqivvjij59hhv3mh4wwrc0bl0xv144j1i237xhlvhxk6nnn6", - "fetcher": "bitbucket", + "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203", + "sha256": "00g68abnssf9xw233zs09jyjqbm0720isamc97rfr95d7wvrb2cr", + "fetcher": "github", "repo": "jpkotta/immortal-scratch", "unstable": { "version": [ 20160517, 2118 ], - "commit": "b354aba33d91a16a1878c87a931564505f6a0ee1", + "commit": "faeab0ad6c33c74c0cbd1dfcebffaa0690de40c6", "sha256": "1mx9f8pwnbrm6q9ngdyv64aqkw1izj83m0mf7zqlpww7yfhv1q9b" } }, @@ -50382,26 +50962,26 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20200118, - 1533 + 20200425, + 1648 ], "deps": [ "clojure-mode" ], - "commit": "49390d9dfde1d6354629b7662edd0ee422477f4a", - "sha256": "1jhh4ablxmwy4diai6jhki5ifiw1d0fcza7l9gy8iqqnd1yc2m25" + "commit": "f29861204ddbb032b425c7d693e8c006b7b027c6", + "sha256": "127kl64hqdy04qdbqr1xfzky3d8fzgbmp7z4hv6mjsc0p4s19azw" }, "stable": { "version": [ 2, - 1, + 2, 0 ], "deps": [ "clojure-mode" ], - "commit": "247ca70f8ba5104be292aea20fbde6adb37e359f", - "sha256": "11hyva006bc4hbhzjwb4brilm6fb7qfm5h66nl0gmmyva40y6412" + "commit": "ff72d667c2709166d19ac15a36f7aac3423cefa1", + "sha256": "07l8wkm0j6y2cj7bbb24x4rkjgf4q6ag0c1kcjs0sfmf1kaf14bk" } }, { @@ -50527,9 +51107,9 @@ }, { "ename": "info-buffer", - "commit": "3c44a1d69725b687444329d8af43c9799112b407", - "sha256": "1vkgkwgwym0j5xip7mai11anlpa2h7vd5m9i1xga1b23hcs9r1w4", - "fetcher": "github", + "commit": "6a7caa8c4fea7ef2211f01bc8340c660a6e6c5f3", + "sha256": "1si3sz34bmzcnqm4bc6nq7q2rmsyksh0610bn0r9frf12vakg28p", + "fetcher": "gitlab", "repo": "llvilanova/info-buffer", "unstable": { "version": [ @@ -50590,6 +51170,59 @@ } }, { + "ename": "inform", + "commit": "fb678165f97deeebfab624a3bd74ce28836607fd", + "sha256": "1smgmzg8nf4lh2ywlzrzzqpmh66rxwbn7vrsvby8v6rx6bmyhfa1", + "fetcher": "github", + "repo": "dieter-wilhelm/inform", + "unstable": { + "version": [ + 20200512, + 1351 + ], + "commit": "54e0c51960c7f50de31a6831c034ea6adc5a8892", + "sha256": "0j3hc3f7yx9dklbvvwpcq0d2n3lp0z47l5066ngvmm52aihhhiyd" + }, + "stable": { + "version": [ + 1, + 3 + ], + "commit": "5e096549632b2691fe1f975394d07a31cf603fc6", + "sha256": "0bs0z957cs240cacl3bl72dp1sqcpd0j60yrv972w6p1j9v0f3rn" + } + }, + { + "ename": "inform7", + "commit": "5d62f9e9e513103dbebc84bfcb0d18dcf7563211", + "sha256": "1h8bba0npnsjcyvmd40lbm54ib1rsa5c5df6lc7m53zg2h9fzcbd", + "fetcher": "github", + "repo": "GuiltyDolphin/inform7-mode", + "unstable": { + "version": [ + 20200430, + 1539 + ], + "deps": [ + "s" + ], + "commit": "a409bbc6f04264f7f00616a995fa6ecf59d33d0d", + "sha256": "1sai118i5ry58jjc3777kn2ca2nhaxszhl0va6gyy7j2cdpg8gpy" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "s" + ], + "commit": "a409bbc6f04264f7f00616a995fa6ecf59d33d0d", + "sha256": "1sai118i5ry58jjc3777kn2ca2nhaxszhl0va6gyy7j2cdpg8gpy" + } + }, + { "ename": "inherit-local", "commit": "08b978724ff26b3ea7a134d307d888c80e2a92a9", "sha256": "1v3q3s6qq64k1f4ck6rfgsy1arnf9cxg2kw6d1ahfrwr4ixsqm87", @@ -50721,11 +51354,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20191218, - 2038 + 20200515, + 421 ], - "commit": "ed488fcbc8c015121a4b1acd8d08db229fd6735a", - "sha256": "14y87fvav10wjc88bbi1pwy8lxnqcdk4cahwhd9cg5bhsqwhm32m" + "commit": "0f289a3f465728ed41d532674166eef09ac7209b", + "sha256": "1bchvrmmcbw8ird7i1klz0ds2xkfmwccz2pp59ixgys0j8cxnq4b" } }, { @@ -50801,8 +51434,8 @@ 20200325, 2248 ], - "commit": "b943fe73327acc08dcd431eb8168a01609b9ab76", - "sha256": "13fk3b80gmgmr0d5296csvjfyjdq1jdxy3iahaj5mbhb9m3ganpc" + "commit": "d18423f78cc02ba866b1a1dfb0617476cd941c54", + "sha256": "0n6fjndwcp2qg8164420dlc3xsdzm6m0zwbvvwn5w03khbk788hr" }, "stable": { "version": [ @@ -51499,20 +52132,20 @@ "repo": "doublep/iter2", "unstable": { "version": [ - 20190113, - 1424 + 20200512, + 2111 ], - "commit": "698ffb93954817be0064ca6739f295d846707439", - "sha256": "10v6il7811w2907d8w2c28lnn29nlhdinlwwb7wy7rzl2vfinbm9" + "commit": "b87c1e8ac50f728e8d33b5b69bf4124ef90b88ba", + "sha256": "09yasj1vfakryjvs22a3gd27wwa866b2pkvajwp8hlngk11sc3p3" }, "stable": { "version": [ 0, 9, - 10 + 11 ], - "commit": "fc1fcea5379bc7728a25dd81546886213e3db6fa", - "sha256": "1gvm5gfgmcw4mibi8899x9ry1zqm3ij6yl0dnmdqmv9dbv1zlqp2" + "commit": "a6e228eefed8dd6a405c235c15e7a4ea726cae02", + "sha256": "1n65202ap7qf44mv8f3ly5msp9fn12ap3cckhqb62ib3yw46ilwk" } }, { @@ -51578,11 +52211,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200319, - 1247 + 20200515, + 1845 ], - "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787", - "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q" + "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", + "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" }, "stable": { "version": [ @@ -51596,26 +52229,22 @@ }, { "ename": "ivy-bibtex", - "commit": "c23c09225c57a9b9abe0a0a770a9184ae2e58f7c", - "sha256": "0qni48s09lgzqr98r49dhrzpfqp9yfwga11h7vhqclscjvlalpc2", + "commit": "873ae2af16e03c8e10494be3f0e7840eb27172a3", + "sha256": "0ri0f8cfzyymx9jrw0bldwzx74bzdd5gc90yv16hv239g65scbvx", "fetcher": "github", "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20191028, - 1313 + 20200429, + 1606 ], "deps": [ - "biblio", + "bibtex-completion", "cl-lib", - "dash", - "f", - "parsebib", - "s", "swiper" ], - "commit": "d4471232be26793fbf56c0ac3690b5f537c378b9", - "sha256": "1bkzhic6qckb267025il1r3xcpz99kisphxiafni1pxvf9jafr0j" + "commit": "8a0dd9841316793aacddea744d6b8ca4a7857a35", + "sha256": "1av058d7888kr3q15y1122r8jkarfw1s83gvkillj7kyzj3i53m5" }, "stable": { "version": [ @@ -51889,15 +52518,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20191018, - 1251 + 20200421, + 1120 ], "deps": [ "hydra", "ivy" ], - "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787", - "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q" + "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", + "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" }, "stable": { "version": [ @@ -52061,15 +52690,15 @@ "repo": "tumashu/ivy-posframe", "unstable": { "version": [ - 20191226, - 637 + 20200331, + 536 ], "deps": [ "ivy", "posframe" ], - "commit": "6d697ff00ac406b919eba8665b1bc18a2b423cda", - "sha256": "05zhfhml8bd1zi1msy6zjkimirwq59i9fwa0mxy9l88si3dmb2hb" + "commit": "ae9bafe94fe6b77b6fe45766ae6172646f6a5d50", + "sha256": "1j6yns5d7lh2v1nfcznrirl7qicdli9csciqvfgj4gkh72a97pw1" } }, { @@ -52080,27 +52709,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20191224, - 220 + 20200415, + 1457 ], "deps": [ "ivy", "prescient" ], - "commit": "a194852e8022762843052e58a9d0fbdaa1df0fe5", - "sha256": "0da4s32fza42vdiqhh7cdim08by5i4909q93ivxkmgrmqfgdvz0p" + "commit": "3ab7605d997fb8337bf5ded2ad960b98ac0e1fd7", + "sha256": "081v916gnjvx2rzjbqkqhdwijz57w7iryxzg71729gwvavs25lsv" }, "stable": { "version": [ 4, - 0 + 1 ], "deps": [ "ivy", "prescient" ], - "commit": "ad9fbe8a17fe74b27a39bcc034f3da1865663387", - "sha256": "008hxy1vasnyz36wwg44gikpi80ng75hj85nrswk60b7z7cznbmr" + "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0", + "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3" } }, { @@ -52142,14 +52771,14 @@ "repo": "Yevgnen/ivy-rich", "unstable": { "version": [ - 20200322, - 1326 + 20200428, + 110 ], "deps": [ "ivy" ], - "commit": "596874d1469667f896b83731914d7d4456025553", - "sha256": "0yym3l24zzn1yjg3fjkq7lpvpp9w7wi2vl161v53pmg1v94xig6s" + "commit": "3f818b201769bc13cc75aa73645217e374136aca", + "sha256": "19w1mmqg15xy963f2h50i0cz0gmii75yarkmv2ssfh164pkyvhdk" }, "stable": { "version": [ @@ -52179,8 +52808,8 @@ "ivy", "rtags" ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", + "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" }, "stable": { "version": [ @@ -52479,17 +53108,17 @@ }, { "ename": "jammer", - "commit": "cb82a6e936e2d5d1dd5930b600ede52dac3ceb33", - "sha256": "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z", - "fetcher": "github", - "repo": "wasamasa/jammer", + "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", + "sha256": "19qvl428daa1xzkj3dldj5yvylq3w313bg42m4lqrmzhx3dgj8dd", + "fetcher": "git", + "url": "https://depp.brause.cc/jammer.git", "unstable": { "version": [ - 20160310, - 859 + 20200506, + 1247 ], - "commit": "48aa795df6df7ae6484518bcd0398293ca49d7c6", - "sha256": "1gnj8vmpxds2wdkz49swiby5vq2hvbf64q5hhvwymfdvwlk54v55" + "commit": "76e006dddd491aecccfcb06939db56f9f7daa56d", + "sha256": "18mz9yiz94xbvjlrpfxgfvv87s3rv3pv4b8y9c5yywr12zp6jbag" }, "stable": { "version": [ @@ -52509,11 +53138,11 @@ "repo": "ALSchwalm/janet-mode", "unstable": { "version": [ - 20191201, - 2353 + 20200509, + 1651 ], - "commit": "62a1ca33ac443e23869bc83dd2149cc014bb5132", - "sha256": "02chr2dcyf3946pg2wysybca559n2vm9lyb65zx6h6pvqhmg4kwp" + "commit": "2f5bcabcb6953e1ed1926ba6a2328c453e8b4ac7", + "sha256": "0qj0gpycv2f3z1dgz1a27bjn983hrr3ppvrp7csl34lagnmp89rz" } }, { @@ -52742,11 +53371,11 @@ "repo": "donderom/jazz-theme", "unstable": { "version": [ - 20170411, - 1411 + 20200417, + 2042 ], - "commit": "b1cb78a97cc4050f19d88a89e455c3e52d98240e", - "sha256": "0q9gfa40qh9wypvzg3xrv4kh6l51az9swb39133961dc8zrrrinm" + "commit": "b6694f09e10aa7df14836aac2f6615c32aa572dd", + "sha256": "1mjzfr2iz72n3ds6d0sqhqd2a5kcfn8d2kji9hqmydmplg247apx" } }, { @@ -53127,15 +53756,15 @@ "repo": "nyyManni/jiralib2", "unstable": { "version": [ - 20190927, - 2010 + 20200331, + 1940 ], "deps": [ "dash", "request" ], - "commit": "e913f8e4a994850d2cff18ce2b1f4177cac62c91", - "sha256": "022jndjwj0ml2w829id0nx43p24h6jpmilc12n9hiy4p80vjgy1y" + "commit": "ccf69e417911e091ec4c28d47d178ee63196c626", + "sha256": "170fjz7k9bk17qk7wrd56xw484xp8zckx635360pm0lfg4dvycpc" } }, { @@ -53263,20 +53892,20 @@ "repo": "ljos/jq-mode", "unstable": { "version": [ - 20200317, - 852 + 20200516, + 1606 ], - "commit": "bc904840f27fe7b0e6dbdaeb912a7175a3837110", - "sha256": "0w5cgys1yfhirhsvj4n5k6km2xwyqvlnbv0m0sim1vavizzfmda4" + "commit": "85214664a9f20faab7c45087b28bedd0feabb560", + "sha256": "0kvi1cqn4hdcs2mc4lsddy01yyixvm2ykqq6j4yb9h07lixrxih6" }, "stable": { "version": [ 0, - 4, - 1 + 5, + 0 ], - "commit": "d6bbd83baf0746f22564f7ae92db44e06da6e08c", - "sha256": "1sk603258gvnfrvl641xfmgapg67z44wnlx6qba73wn3f2055765" + "commit": "3bda2d1085d5ac28fc6e7e8093ca7e74d3719f56", + "sha256": "0xk0if5i9cz4w06lx8v1vdm112pn1ybqgfw048sx15yyvfzgril1" } }, { @@ -53515,14 +54144,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20200211, - 2057 + 20200427, + 33 ], "deps": [ "cl-lib" ], - "commit": "fe53814dc2a0db2e95ac06083362e43923bf83fc", - "sha256": "0b30c5valf58md5h5zm45nkx9xdszwi4kz12qfzh27fyn46gdwjq" + "commit": "515d876c6ae45a61cf67a7bd5723fe4c9e518756", + "sha256": "05pgyisb2szbrfbv6wjhfi8c00gakv51jxb8j73pji30v2a9rapn" }, "stable": { "version": [ @@ -53757,14 +54386,26 @@ "repo": "skeeto/elisp-json-rpc", "unstable": { "version": [ - 20180104, - 1528 + 20200417, + 1629 + ], + "deps": [ + "cl-lib" + ], + "commit": "81a5a520072e20d18aeab2aac4d66c046b031e56", + "sha256": "13s18mjh6dpdxvva9yx4841rxvayxsvaj3vblxril6zm2wcqw2lm" + }, + "stable": { + "version": [ + 0, + 0, + 1 ], "deps": [ "cl-lib" ], - "commit": "0992ae71964055230aa5d4d934a1b93b5dfd7eb4", - "sha256": "0nfccwxss3dz1ig6i3dig703xpsy90m7i96bm3pysrw2jfp4by9s" + "commit": "81a5a520072e20d18aeab2aac4d66c046b031e56", + "sha256": "13s18mjh6dpdxvva9yx4841rxvayxsvaj3vblxril6zm2wcqw2lm" } }, { @@ -53917,11 +54558,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20200324, - 1652 + 20200504, + 1726 ], - "commit": "1c122f1dff8dd2674245b2ce5e43b62504864bfd", - "sha256": "1ki42xx7vws8hb5vr1rgm2aih4qadf9qva8c4zq1hzmzq5j74jry" + "commit": "839726af374991223ffe56f7e7d10bef81033d09", + "sha256": "0lspmp519py7adippfmz70zcd9dpz46x8a3wlda71a5pdjs5szfq" }, "stable": { "version": [ @@ -53985,8 +54626,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20200327, - 602 + 20200515, + 2010 ], "deps": [ "cl-lib", @@ -53997,16 +54638,16 @@ "spinner", "vterm" ], - "commit": "c293f0db0203708e49139cb3b32e5826056ef972", - "sha256": "1fyw36c5f70j53jl03yk79pgr0x4q89mwyb77n9xcbscdhaxv3s2" + "commit": "c9aff5ffe6df951dd5343f05d6e4170203a7032a", + "sha256": "065ix3jycsx3wvkq7a6060i93caxisdvgxgqb1l6rq15n4qln78y" }, "stable": { "version": [ 1, 0, 0, - -2, - 6 + -1, + 4 ], "deps": [ "cl-lib", @@ -54017,8 +54658,8 @@ "spinner", "vterm" ], - "commit": "596f59774edf213c4c4885992dda158de145be03", - "sha256": "0x8mlvq264ihhcdbkljhaij6hsvlh8s4fmrd8x970c7i3qi3hh7k" + "commit": "c9aff5ffe6df951dd5343f05d6e4170203a7032a", + "sha256": "065ix3jycsx3wvkq7a6060i93caxisdvgxgqb1l6rq15n4qln78y" } }, { @@ -54153,8 +54794,8 @@ "repo": "dzop/emacs-jupyter", "unstable": { "version": [ - 20200329, - 828 + 20200417, + 1907 ], "deps": [ "cl-lib", @@ -54162,14 +54803,14 @@ "websocket", "zmq" ], - "commit": "b691d38483b6540d42d482a32d35eb54178e5658", - "sha256": "1lp6xg71snlsaffl7afrgjcs99l2axc5xrbkrncc50zjhxlimxrr" + "commit": "785edbbff65abb0c929dc2fbd8b8305c77fd529e", + "sha256": "1l1fd062dmig3mgkwixr4ly8x12z9skh5wj18hkyc84n7rwdar47" }, "stable": { "version": [ 0, 8, - 1 + 2 ], "deps": [ "cl-lib", @@ -54177,8 +54818,8 @@ "websocket", "zmq" ], - "commit": "6650dd35887e0e987385a4fb74b0a3c1661e149b", - "sha256": "152g22bm970px2mi3bfr6f59mvvbk2p8prv5vs5b9n0cmviqm50w" + "commit": "403c70c83cb3754c83da0932b0efaf5e72bdca9a", + "sha256": "1sr007wsl2y6wqpzkmv3inbpwhvgdcb2nmqzgfg7w1awapi2r13p" } }, { @@ -54480,15 +55121,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20200324, - 1349 + 20200508, + 1621 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "9877c12ad412e79b3d88423f911be1ff59a72e0e", - "sha256": "079si7dhl45rx2vf8kf8srflk6nd6yxqz44xbsrh0s39gpp9v5dh" + "commit": "15e2612eba2eeb223f6b4e5ac4a55dc5da09b14a", + "sha256": "0qay924qz5ab7a4d7cnancfnb7ivra33dr6knwqmy3wf089jl6kk" }, "stable": { "version": [ @@ -54766,11 +55407,11 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20200103, - 1239 + 20200418, + 2028 ], - "commit": "adb55497c0f16e90069d6e5e86b4f9f65f13624b", - "sha256": "1sprdfx0gvyqmq0fkf4bf56q3d8xxig2vxi38nzjx90llzvka35q" + "commit": "a912c4db1b88390f76b14e3b47ded314fdc8f48c", + "sha256": "07gfldj9y4jfvna1rqlr7w6y6daqdsvc1fb2m7acjn37bpmfrc3b" }, "stable": { "version": [ @@ -54863,14 +55504,14 @@ "repo": "tarsius/keymap-utils", "unstable": { "version": [ - 20191222, - 2258 + 20200413, + 1858 ], "deps": [ "cl-lib" ], - "commit": "0b9bb7f4959ca54f0827b202f513ec7508c11e0e", - "sha256": "11y1vdrj2isn00mh428ynzqnfxjsg0138wx0bs619j0pv6d3j09g" + "commit": "195e0ca5b1b9967faf94a3e5a634d8975b796705", + "sha256": "0ckv9mbqb1f2lp17sv3nxjwww4ph9v3bhlxwvchvkkdlbcg87i5n" }, "stable": { "version": [ @@ -54901,6 +55542,21 @@ } }, { + "ename": "keypression", + "commit": "056a8881cd868634a1833172436528ea2503af12", + "sha256": "1ysfpxfhgy14v0jy02c4qyz28cx682cf2haxlnrpw2gxjh0a0702", + "fetcher": "github", + "repo": "chuntaro/emacs-keypression", + "unstable": { + "version": [ + 20200514, + 822 + ], + "commit": "1e00bbdb451fd88bde9917526fd0b13b2a1bd26c", + "sha256": "06j8pqss8izhyahf0nw95mg34lbclhzk4f5vzfg35qcmjmbmqzg6" + } + }, + { "ename": "keyset", "commit": "7bad8a1f1b94fbfbde5d8035f7e22431e64a9eec", "sha256": "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg", @@ -55186,8 +55842,8 @@ 20180702, 2029 ], - "commit": "26228b202e821824afd8b2536234b26c23ae1b9d", - "sha256": "1329xyhriha7037lnsg8bf4xqkc20f0h3bv7xifm2i40ib0z3wlx" + "commit": "c0227c5ce4011033b5f0cf2815c352d123a13305", + "sha256": "1l3fjljm7abk29ibbbvds7nq72yqrgcsy5bv42s1czbffw62zcn6" }, "stable": { "version": [ @@ -55195,10 +55851,10 @@ 0, 0, -1, - 1 + 2 ], - "commit": "ae0fa0cab3025e517452f44b91dd7d95182f39b2", - "sha256": "1ca9ggkbhfbr9d938nmg5klgmf5ayji0i201hcragjqj7hak18ia" + "commit": "78fb93b88f9941c22be02d36a786db8ca7639c59", + "sha256": "1z59fi9q32xql1w7pjh4w1jzfz1n63a0lr5x38kwjj79dpz3ccal" } }, { @@ -55209,15 +55865,15 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20200315, - 332 + 20200512, + 1321 ], "deps": [ "cl-lib", "request" ], - "commit": "d5e5780f3c933f873e1a19458c1ea269e9a57afe", - "sha256": "1p7fqw1j1kphvqb09c8s5lyqkxi7fd0gfpvyp0g0v0shdxydb9ix" + "commit": "dd02284149027694e4cf16d6f4daf1f6dd011249", + "sha256": "0zhg9467id0jd516hnz4c6aqmjp5q1s95fkhjxbk3g9j11cnfjf0" }, "stable": { "version": [ @@ -55379,8 +56035,8 @@ 20191102, 1510 ], - "commit": "ab610996820b5cbdb032edbf8747661131603ab8", - "sha256": "1dcaiwxymrch1vfzssjizv6l9isc68xcf8987c0l71zmzmrq1s7s" + "commit": "8e6dd578f2b3d77ac33b6384d2bfe1b1f6799a1a", + "sha256": "12gwy76kz4qjw1qxma4q9pk9s2arzr5p95ni5vzizm2p4x4c5a8x" } }, { @@ -55474,16 +56130,16 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20200316, - 207 + 20200429, + 1454 ], "deps": [ "dash", "s", "transient" ], - "commit": "db3a999c028ffeeeb49936e8b921c364bf8f437e", - "sha256": "1ai33jma22agrxww6dcgsh6dbv5h36gixgs0b6n1q4d5v7k6d9q3" + "commit": "7a0f095992cc135babfbf9706b6eb927e0d0c883", + "sha256": "0g6sr8ndbig0vgqy7791hkzn89m5lj7qfq36inh5ci9q9r343ggg" }, "stable": { "version": [ @@ -55509,8 +56165,8 @@ "evil", "kubel" ], - "commit": "db3a999c028ffeeeb49936e8b921c364bf8f437e", - "sha256": "1ai33jma22agrxww6dcgsh6dbv5h36gixgs0b6n1q4d5v7k6d9q3" + "commit": "7a0f095992cc135babfbf9706b6eb927e0d0c883", + "sha256": "0g6sr8ndbig0vgqy7791hkzn89m5lj7qfq36inh5ci9q9r343ggg" }, "stable": { "version": [ @@ -55742,6 +56398,25 @@ } }, { + "ename": "lambdapi-mode", + "commit": "86702d5ad9279f03bdae5facb0b546e133c1fedd", + "sha256": "0ha9k0wc5snb5j0bpzjj91b7kd9ppsk8wbcj454wdkx87x73npdd", + "fetcher": "github", + "repo": "Deducteam/lambdapi", + "unstable": { + "version": [ + 20200513, + 1043 + ], + "deps": [ + "eglot", + "math-symbol-lists" + ], + "commit": "a3d4ae8863e268c88664ce869e9469c8a42d2e05", + "sha256": "1v8w70x1jnald6k22ipa7d9z1ggcf2imr97wbw3i48dp4iv21zqd" + } + }, + { "ename": "lammps-mode", "commit": "8f5471a8e17977c17ad84b12a77fe80f37eda25e", "sha256": "06i48pxp9vq4z7hffna0cndr6iblapim169659pmhidbc4pp7bm4", @@ -55845,26 +56520,50 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20200321, - 724 + 20200409, + 607 ], "deps": [ "cl-lib" ], - "commit": "756f238b4fda63f6e0980f627869eb3c03d13f66", - "sha256": "18i1l7vpfa0y5zpy9hbcrkp79n30n7pkf0kasq718cj8ggczj120" + "commit": "bf17d80b6c4b58fb66cddc2b2914f57d48468e97", + "sha256": "1p21smbm3z6xfq0zk8pv62wppbbxx8mh994ax8b00kh16j7yhh2c" }, "stable": { "version": [ 0, - 4, - 2 + 5, + 1 ], "deps": [ "cl-lib" ], - "commit": "2c7b8599fc7fb56b0c820a9ae9f08053c71a8738", - "sha256": "10vrx3vfg8glrqngbyhwgkg5maib8ihv03psdd6qjhd0kik83498" + "commit": "bf17d80b6c4b58fb66cddc2b2914f57d48468e97", + "sha256": "1p21smbm3z6xfq0zk8pv62wppbbxx8mh994ax8b00kh16j7yhh2c" + } + }, + { + "ename": "languagetool", + "commit": "ce91d4013963eacf1525809684e64ca52239fb73", + "sha256": "1cbhamz8yhfnyhzbn4j0kp9sbsycq1hi0j2kr3yhbf66fgi6x9f6", + "fetcher": "github", + "repo": "PillFall/Emacs-LanguageTool.el", + "unstable": { + "version": [ + 20200507, + 610 + ], + "commit": "e7faecf8a7eec8086aafc48a5c4f1908bb5c4300", + "sha256": "1nb5l1xpgz9z6xplb64a3nx8vis70r9dl0xxly5hddy67i49si54" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "commit": "e7faecf8a7eec8086aafc48a5c4f1908bb5c4300", + "sha256": "1nb5l1xpgz9z6xplb64a3nx8vis70r9dl0xxly5hddy67i49si54" } }, { @@ -56197,20 +56896,40 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20200327, - 1411 + 20200511, + 821 ], - "commit": "199045bfe411afc30cb7c7d18b8a6b03edebeae1", - "sha256": "0apaa5w2zfycigdf8d7x3h8aw8m11mz8b6l2d546dlbvxr5yra28" + "commit": "59c85a53385a3c55ce6b3b0e62a4fca1556389eb", + "sha256": "0scmdb99i20xk8rvlv2xjg54lqqvfp9gv8q9kpqa8jpcq21nbav0" }, "stable": { "version": [ - 3, - 6, + 4, + 1, 0 ], - "commit": "c0a0fca2f9c83909c49729af75664411b4affab8", - "sha256": "18vrk19273xlg2nhkf7fvvhspnsfgk4dxa42x2q5599p9z7aph00" + "commit": "0841ab466a1542868b5448bb375ac9f0c33e2b3f", + "sha256": "0lpgkd2hhv98k7bi7zdplhlv0p3gbp4aq2cb0kyiwp2yxlnmkbzv" + } + }, + { + "ename": "leaf-convert", + "commit": "db2fa6cdfe98aea41eeafb59527050edfa9ef6e5", + "sha256": "1hw6imdf8f7939r077zccv0sa23xfcmwpbhjyb49g4nhzs5grpnv", + "fetcher": "github", + "repo": "conao3/leaf-convert.el", + "unstable": { + "version": [ + 20200415, + 1725 + ], + "deps": [ + "leaf", + "leaf-keywords", + "ppp" + ], + "commit": "2a8ec045d5d36e85e7deb2a46aefacaecf4bfafe", + "sha256": "133id4zd9dnx962r71m0irxvqs9dwaqnv5l4b8bjd3gigijah1dp" } }, { @@ -56221,14 +56940,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20200328, - 845 + 20200428, + 1803 ], "deps": [ "leaf" ], - "commit": "3164f1f4b98be9efa9e28170cc9b8d14a10b3e56", - "sha256": "165x864rn9ha8dd3k62xgdp97fi961x75p6a7nldl0znzan65691" + "commit": "bdf225b2b2cc76b87f5bf55dfa09c3a020ac1e7d", + "sha256": "0wdxxwh64l013vpkb7xpjqzyy4c0qy7h9l6l5cr4pncp7nx3bcns" }, "stable": { "version": [ @@ -56241,6 +56960,56 @@ } }, { + "ename": "leaf-manager", + "commit": "e1d80f4662a0f77360244fc4b34f2076db4fd478", + "sha256": "1pr5yljhif5ffm63g6w6544cy6m15kljbdvxs87ivnisblbl4s21", + "fetcher": "github", + "repo": "conao3/leaf-manager.el", + "unstable": { + "version": [ + 20200414, + 543 + ], + "deps": [ + "leaf", + "leaf-convert", + "ppp" + ], + "commit": "f2ae35e02ebe218daa3076a0e9d83b4feadfbb0a", + "sha256": "09ll1vs9y6qmcl3qxil52mjw5bf7x896wjsij4kf0y5wd2fhra61" + } + }, + { + "ename": "leaf-tree", + "commit": "2e51160b1e5d277e66b9cff493b1f6b3c6f9ee28", + "sha256": "1xnqxwa978wbvx181v48zd37vckrj6p6wa7gas3fj648mwdjnii3", + "fetcher": "github", + "repo": "conao3/leaf-tree.el", + "unstable": { + "version": [ + 20200412, + 2355 + ], + "deps": [ + "imenu-list" + ], + "commit": "22f6c116cf1465c28d4a35d8a4587a8b614be175", + "sha256": "1bgjhrpq6a239v8vfi6i9qcbyrg76mpy4yykkb5da8hlp23idwy7" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "imenu-list" + ], + "commit": "22f6c116cf1465c28d4a35d8a4587a8b614be175", + "sha256": "1bgjhrpq6a239v8vfi6i9qcbyrg76mpy4yykkb5da8hlp23idwy7" + } + }, + { "ename": "lean-mode", "commit": "42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde", "sha256": "0rdraxsirkrzbinjwg4qam15iy3qiixqgwsckngzw8d9a4s9l6sj", @@ -56355,11 +57124,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20200328, - 1927 + 20200509, + 1136 ], - "commit": "bfa25a92d0cf63c5316b5aa8d50bd6809297ea9e", - "sha256": "1gx9brcwdmwhk0w2p93szdla5bgn25f1bsi9lna2l8ax1sn3l5kd" + "commit": "5a517cee3dfedfd1b90c2f01d6d8e01198a198d1", + "sha256": "1gldvp2gp8vh97skrkxbcxh1qvjpndankjckm1q1h7jpkznjvc2v" }, "stable": { "version": [ @@ -56593,11 +57362,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20200122, - 1934 + 20200513, + 1742 ], - "commit": "4bf80c2bb1e679b6e42e8d6547d6f33996830f73", - "sha256": "152731dwf0q1i1p5cjd3fwznl100vzsjk45ks1wxw4zv0w59q399" + "commit": "afda2d80b0bc98d431a3ac7c1563c76b8ace3a65", + "sha256": "0fapzkjnm3w4fgc5464a9bz2sld3m81zzls7sy4h0yxq9rpb284d" } }, { @@ -56714,6 +57483,30 @@ } }, { + "ename": "liberime", + "commit": "0ccac33c02762314d997156df4627c0c4a0279c6", + "sha256": "0i95vjn4rw7n4f83nrxjkmilzalgmjlmyhsvwfm4n1rqfqdwkl5h", + "fetcher": "github", + "repo": "merrickluo/liberime", + "unstable": { + "version": [ + 20200511, + 46 + ], + "commit": "a631d3d575b5ffa2dc9a3a950c53f425c21380c1", + "sha256": "1gx3nxxcw5xz2n85xqgnghw04gaakhcnqcs9bnxx2fh4qpwkqggp" + }, + "stable": { + "version": [ + 0, + 0, + 6 + ], + "commit": "f13a98ddd7be658e742b0f42988b02db9d779e85", + "sha256": "09d9dx4jk8bgbdcn6dh9ar5rs33s2cwz08w211b3kgj41i115gl7" + } + }, + { "ename": "libgit", "commit": "993a5abe3a9e8b160f0d68283eeca6af033abc79", "sha256": "05yys8cjli2zhmhdh9w5qz287ibzplqabx5vyyjv9rpk6wgzkzik", @@ -56721,11 +57514,11 @@ "repo": "magit/libegit2", "unstable": { "version": [ - 20200223, - 1431 + 20200515, + 1759 ], - "commit": "6c3b89276a149b2d009882f756a9edf866671f05", - "sha256": "1r59bw0dggjf6ry2vbl0vddd5hxxh1mshr5h2bk9z74gy04cfi4y" + "commit": "0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a", + "sha256": "0pnjr3bg6y6354dfjjxfj0g51swzgl1fncpprah75x4k94rd369f" } }, { @@ -56951,15 +57744,15 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20200205, - 2244 + 20200405, + 1607 ], "deps": [ "avy", "cl-lib" ], - "commit": "0d9cabcdb783ddc834ede6dcb1bed627c3acd303", - "sha256": "1ybzxc421wyy34w71lgbdfx7vgy9j6va9jjv1mkxa0zxqpdar974" + "commit": "7440704cacb5c0fab35fff8ec59d30fbea17f44a", + "sha256": "0j609j69lxyfvr2g89gdkjrk1vy0c1qq6m0p0ay468bh7l6crs7v" } }, { @@ -57093,6 +57886,35 @@ } }, { + "ename": "lisp-local", + "commit": "2ec3f57a05e1b2e28ce33700d8ea98758b0bb69d", + "sha256": "1kzg2v0x0xf99mwd88bblbjfm9js4f40pibq6297xc9i5wrp3bv4", + "fetcher": "github", + "repo": "lispunion/emacs-lisp-local", + "unstable": { + "version": [ + 20200409, + 1330 + ], + "deps": [ + "cl-lib" + ], + "commit": "ff745a937f79df51cac0209b3cc3c35ce1d1fc61", + "sha256": "0ffwjv5fpzia772iavn9ily5m7l73pxf0amgqizzmbx12rx3kkhg" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "cl-lib" + ], + "commit": "ff745a937f79df51cac0209b3cc3c35ce1d1fc61", + "sha256": "0ffwjv5fpzia772iavn9ily5m7l73pxf0amgqizzmbx12rx3kkhg" + } + }, + { "ename": "lispxmp", "commit": "ad10a684b4b2f01bc65883374f36fef156ff55d2", "sha256": "1a641v5cx4wy2v8a2swxzn1y9cz4g2bp4mn9q290n3ifpn5356dl", @@ -57115,8 +57937,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20200323, - 1616 + 20200510, + 1533 ], "deps": [ "ace-window", @@ -57125,8 +57947,8 @@ "iedit", "zoutline" ], - "commit": "b07ab5d8374c75bd1401b320fda17486325bc96d", - "sha256": "0gknqazf8pihn903518a5hmy5ggqmmq40rxz4kq2nfblpm6s5zkz" + "commit": "3660a8a6acf9a7faee4af4bf5249ceb85a5d8bbb", + "sha256": "0s20wrdqf51mxfnnpll38nzp5ira59l83yz9dg0svz0vj5mrrwr5" }, "stable": { "version": [ @@ -57272,20 +58094,20 @@ "repo": "rolandwalker/list-utils", "unstable": { "version": [ - 20160414, - 1402 + 20200502, + 1309 ], - "commit": "acf18aca1131a90f8d673974673e3c5d8fdc6a86", - "sha256": "0ql159v7sxs33yh2l080kchrj52vk34knz50cvqi3ykpb7djg3sz" + "commit": "9bb2487c83ec46a0b6e6c4158af69334ac797b82", + "sha256": "07hbz2md52ccy95gv4d5n6szrfmpfqf3w4kwqdg2cf54c7kgf7hw" }, "stable": { "version": [ 0, 4, - 4 + 6 ], - "commit": "acf18aca1131a90f8d673974673e3c5d8fdc6a86", - "sha256": "0ql159v7sxs33yh2l080kchrj52vk34knz50cvqi3ykpb7djg3sz" + "commit": "9bb2487c83ec46a0b6e6c4158af69334ac797b82", + "sha256": "07hbz2md52ccy95gv4d5n6szrfmpfqf3w4kwqdg2cf54c7kgf7hw" } }, { @@ -57521,11 +58343,20 @@ "repo": "lassik/emacs-live-preview", "unstable": { "version": [ - 20190415, - 2214 + 20200419, + 2143 + ], + "commit": "7af1c74e0479c5b91d6368a4a3ff1342b83ef477", + "sha256": "0ifk0k6lfjzb0x0mgzh69jx0m166ljdg3ad69p51jw3m85c0wc6b" + }, + "stable": { + "version": [ + 0, + 1, + 1 ], - "commit": "bc3f79b58c4e428485b2cf800278004220f7433d", - "sha256": "1xlaq07wsgwzh3c0x50wgpj9i13nyk5ig45w1fx4156kmc69vjk8" + "commit": "448d6d2b0912a46acd7d9a9b186b53425b1a7626", + "sha256": "1by62z8pch148ar47453bybg7q9drja73rq3pwcn9jb0yb6gn1xl" } }, { @@ -57536,20 +58367,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20200329, - 2216 + 20200510, + 1939 ], - "commit": "18587cf78fa22d61a7365238da852be4a55c0656", - "sha256": "0141svf43miy1xyfc4wi3lrv0jyx97qbg9yhnxwlxz5i6gdrnyza" + "commit": "38a3cf447fd7d9c4e6014b71134e178b0d8a01de", + "sha256": "0yah03sblz9i510cq6q2bj0mkz6sqdifpwhzxhs4kn8zdircr0f4" }, "stable": { "version": [ 4, - 0, - 1 + 1, + 0 ], - "commit": "0cc8f0a31ef815e26eb7da314a516e908ba25838", - "sha256": "13wbsapnq5p75c27smzsgmmgzjbx7x2vbj7b7707bm6cakqjwdzv" + "commit": "0a0d881d8ff30a6007b998e9bb9dddb999cca16e", + "sha256": "1mdnbbd0kr5y4vr2xbay80v4n07gg5jkkn0k3ywypsin7fz5ihhl" } }, { @@ -57790,20 +58621,20 @@ "repo": "aki2o/log4e", "unstable": { "version": [ - 20170401, - 1304 + 20200420, + 745 ], - "commit": "c69424e407be0d9d0e54b427d8b18b1ac5a607e2", - "sha256": "1ng2cgqb83dhxm1hvsfdgzhfl80q9qkf07cr9hp7sxldy36hvxw8" + "commit": "7df0c1ff4656f8f993b87064b1567618eadb5546", + "sha256": "0dbnks76v05allzkhx9zmyqpn6sk5376n8k2rbpnaw6gmz1ib2fv" }, "stable": { "version": [ 0, 3, - 0 + 3 ], - "commit": "6592682ab7de0e3d1915aa4d3c53e083be79fbeb", - "sha256": "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022" + "commit": "7df0c1ff4656f8f993b87064b1567618eadb5546", + "sha256": "0dbnks76v05allzkhx9zmyqpn6sk5376n8k2rbpnaw6gmz1ib2fv" } }, { @@ -57932,27 +58763,28 @@ "repo": "doublep/logview", "unstable": { "version": [ - 20200125, - 1808 + 20200331, + 2111 ], "deps": [ "datetime", "extmap" ], - "commit": "638dbd4833c6387be3849d0097b5b1a14c619afb", - "sha256": "1arzz27vf6r62m7qhfq049n5zw1x2zbbrvmlnvbd9yaanlgrf0hc" + "commit": "c67298a215136617de60c9041904ee6a455dcd4f", + "sha256": "0bjgzh4z4bz4nr97cn9wd92brg7wik37c0vd3kfisdalxq2wrgn5" }, "stable": { "version": [ 0, - 13 + 13, + 1 ], "deps": [ "datetime", "extmap" ], - "commit": "638dbd4833c6387be3849d0097b5b1a14c619afb", - "sha256": "1arzz27vf6r62m7qhfq049n5zw1x2zbbrvmlnvbd9yaanlgrf0hc" + "commit": "c67298a215136617de60c9041904ee6a455dcd4f", + "sha256": "0bjgzh4z4bz4nr97cn9wd92brg7wik37c0vd3kfisdalxq2wrgn5" } }, { @@ -58101,6 +58933,68 @@ } }, { + "ename": "lpy", + "commit": "e0e7941d9efc303b8cd5d3e7b29606316307fd8b", + "sha256": "1wna38yc3sxylg2qjwl424g8qcnaj0h6g0rnnmhzf1kfd8hkd7zx", + "fetcher": "github", + "repo": "abo-abo/lpy", + "unstable": { + "version": [ + 20200504, + 1918 + ], + "deps": [ + "lispy" + ], + "commit": "39d05463939398168dd8c8dca22d76af93aa87ae", + "sha256": "03wa94wn9a1lzdmi5fj5r446cvpqk7km9r9h8sq1hmwpr6qwymw7" + } + }, + { + "ename": "lsp-dart", + "commit": "acbba6bc6f1bb6e1153f1f75ca1dc025bb5a8993", + "sha256": "0q2x3i5yydnrplfgk8fcngdsxf1g1vz1jzkbwhiqf46wrv5vxwl3", + "fetcher": "github", + "repo": "emacs-lsp/lsp-dart", + "unstable": { + "version": [ + 20200515, + 2152 + ], + "deps": [ + "dap-mode", + "dart-mode", + "dash", + "f", + "ht", + "lsp-mode", + "lsp-treemacs", + "pkg-info" + ], + "commit": "14d11f959dfab22a546525a0076fa3abd0d85c32", + "sha256": "0mxiy8myvk91b7r5ngidi2665vpqs87f8qraplyl0vcpywb2jm5n" + }, + "stable": { + "version": [ + 1, + 10, + 5 + ], + "deps": [ + "dap-mode", + "dart-mode", + "dash", + "f", + "ht", + "lsp-mode", + "lsp-treemacs", + "pkg-info" + ], + "commit": "14d11f959dfab22a546525a0076fa3abd0d85c32", + "sha256": "0mxiy8myvk91b7r5ngidi2665vpqs87f8qraplyl0vcpywb2jm5n" + } + }, + { "ename": "lsp-docker", "commit": "f592ec9b1d6a05e1e115d4b313be108c8e47ee67", "sha256": "1xmkwhgkcsf52hngb811n2q7q4rav75wwjz7zin6x17vfv8hqifx", @@ -58115,8 +59009,8 @@ "dash", "lsp-mode" ], - "commit": "f46e56e554c9207d5ab5b9aebf994df8b41955f3", - "sha256": "1281qrskwwjz3x3mi99a6sp9694wbd08myhy0nlba6493ip8wbhz" + "commit": "af56404c383102344f9b99e2e168e69b7d8d50d0", + "sha256": "16fsyr77bwa7gipsafsacqy1ad51kgm5im0js5yinkg2ipwi75xk" } }, { @@ -58145,15 +59039,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20200309, - 2144 + 20200510, + 941 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "582fa27c8894db888c92b5e53527b8deec82ea7f", - "sha256": "1jrvd8gnd7hc9xksryb35a2qzwwv7q6ncpcsb2l9ryfl5xd26i0a" + "commit": "1a541e2459b918012cd655407920600ad35736ef", + "sha256": "0bmyjgydyr0mppx8c4kv4vrfivyz1lpxxg966danh7rv9c90ps3b" } }, { @@ -58182,16 +59076,16 @@ "repo": "emacs-lsp/lsp-ivy", "unstable": { "version": [ - 20200327, - 1007 + 20200418, + 1500 ], "deps": [ "dash", "ivy", "lsp-mode" ], - "commit": "39b90e7aef755b6e7756f2ae306d66b01cb4d18d", - "sha256": "1nss84rzpa1lwxx9sr28nsq1p6z82ifs7n7dh4zl6xm7rl7cr9pz" + "commit": "81e81ced99829358674c5a6bbe2c3e15cecd4ed8", + "sha256": "011126hz98qzb8zn1628z77j2s5w1hgvmb5saj2fr9wncgv1nax9" } }, { @@ -58202,8 +59096,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20200327, - 2019 + 20200430, + 1659 ], "deps": [ "dash", @@ -58215,13 +59109,13 @@ "request", "treemacs" ], - "commit": "5c6953441916c1e2e76ab0c41384ea6f57a18a5e", - "sha256": "13070b986jg1xd8chbr6am8915zg8wjk8mn9zlmn0d9k45zw1gsv" + "commit": "bbbe4297fd470d0eb9492d011b0b4daf628763f5", + "sha256": "0qm9hwl88qwm19xwpsnv1rp9ny664440di0rd2lh3h7w1bczf76s" }, "stable": { "version": [ 2, - 2 + 4 ], "deps": [ "dash", @@ -58230,10 +59124,11 @@ "ht", "lsp-mode", "markdown-mode", - "request" + "request", + "treemacs" ], - "commit": "527e7b7abc11b51516b9bb52051201c2cdcd4a39", - "sha256": "0hcnvbyaqyypgby1bfj4zbrbq97amk8hfx0sj4w73rl46yf4jk3j" + "commit": "004516ed2f0803e068f50e00d5bc3bad76af45e1", + "sha256": "1n7prbj3fppl5d2qvjfyfsw280grr3yywvazrhygjrr5920jxarh" } }, { @@ -58263,28 +59158,58 @@ "repo": "non-Jedi/lsp-julia", "unstable": { "version": [ - 20191011, - 1005 + 20200511, + 1444 ], "deps": [ "julia-mode", "lsp-mode" ], - "commit": "da66e78eb601b1652c3a9096e0ceea6b852aa6a0", - "sha256": "1xn7470lm322lqkkbg95qmzaadk85z3f2f3cx34iq00cmkkppcng" + "commit": "b342e5f74f9b815d2a7db9fffee7b9c46850d293", + "sha256": "13haa9jvcq6wvj8g1bnqrrczg1j50lwk41pr4n7q0i7313r8f89v" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 0 ], "deps": [ "julia-mode", "lsp-mode" ], - "commit": "6b0d1a3f32c5e6c5b4c0993f30303569a9e9e9bd", - "sha256": "11jisy6161j4mpqyi06slfr3l7cmmnp7xc6701hszmvl935znn3l" + "commit": "9f158a290168149fd301a1c1c2016600106ad5be", + "sha256": "077mrvxf8df4dppl3xqa7p3ksm3wcms64l306y7i5x878vyjgibv" + } + }, + { + "ename": "lsp-latex", + "commit": "5e3c176af536155c8110006fd4bc63eeb2b2d12c", + "sha256": "01kn9faak6y1zfd1143yj453hl6rp1xykrg5rp196zf6brywj5a1", + "fetcher": "github", + "repo": "ROCKTAKEY/lsp-latex", + "unstable": { + "version": [ + 20200425, + 920 + ], + "deps": [ + "lsp-mode" + ], + "commit": "5cd7b6bb35bc54f3e9341d6a64605a3bb50db0a0", + "sha256": "0lc3hidi1s993fz432090ab31r5pgb62ivw6y755332bgr359i4p" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "lsp-mode" + ], + "commit": "d016440fe364a016935bd90ae07e22d9012bcf8f", + "sha256": "0a6nryx7vshh4k0amlw3w3fn4yr8zlqxq5py8vj3pz4zkcndhxks" } }, { @@ -58295,8 +59220,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20200329, - 1431 + 20200515, + 2000 ], "deps": [ "dash", @@ -58307,13 +59232,13 @@ "markdown-mode", "spinner" ], - "commit": "9835e93f5526110bdeb164e42d8da16c1e39feb7", - "sha256": "0vd0vdbhfv31r63cygg40bzfj2v66k3zqd66hmkfzghhjl9d4q9f" + "commit": "17614737b6ae881d0e94ad6f0b87a01950062dba", + "sha256": "0zh2mllm7n3gj0w5rn4y6491kx361mrf6w0fa46jgdck26fkazfw" }, "stable": { "version": [ 6, - 2, + 3, 1 ], "deps": [ @@ -58325,8 +59250,8 @@ "markdown-mode", "spinner" ], - "commit": "5c8addac9d57dff268d2f6e825522fd5353e5e3e", - "sha256": "0f9d0zhblcjzrpggqclww2g7fyjky5rzpp7zj424005ahv0zd3xf" + "commit": "bdbd2d0ccfe02f6721ea942e82e5178f4b216228", + "sha256": "125rpmhlyd6wmq7p71j54x3rzmk07vn1hdcvvdjjip5481raxcwx" } }, { @@ -58347,8 +59272,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "e16e91d6a2a6cdb406ee9b98cfb47f7a32e41d61", - "sha256": "1fyghfl1acrghf8lisg760cgxw4rnz29ym4mzlznc0lb80d43cg3" + "commit": "b462cfa9b8071c624b905baf37a255d808ac6376", + "sha256": "1wig6hr5g0q0lg7zkqw1bfgagpx1ndpga75lnxaqpm0f0rgwdc33" } }, { @@ -58400,6 +59325,24 @@ } }, { + "ename": "lsp-pascal", + "commit": "41e4088e4b0cd99aafac40c83188112a680a65f7", + "sha256": "08zvh9r1plnirdp8qb0p8xfq0y7qx7awq98gn8340f5zbwh9006q", + "fetcher": "github", + "repo": "arjanadriaanse/lsp-pascal", + "unstable": { + "version": [ + 20200422, + 1610 + ], + "deps": [ + "lsp-mode" + ], + "commit": "b132bdf66748e4abe0d4140f6d061b1ccd56082a", + "sha256": "09v79p6wsp775ky1wy5fr0hwh5j33jvdvcarjs20zbdwnrs53am8" + } + }, + { "ename": "lsp-pyre", "commit": "5b243c6ab0a441531e02dc8fdd88c023ba505d25", "sha256": "1v8yx062cv5wmpg3lalah5cy8hvhslvyrd4f3185gmc0ynz71fpi", @@ -58425,15 +59368,15 @@ "repo": "emacs-lsp/lsp-python-ms", "unstable": { "version": [ - 20200223, - 2136 + 20200501, + 1408 ], "deps": [ "cl-lib", "lsp-mode" ], - "commit": "5d0c799099aa5810858174f390e28fff3894bc06", - "sha256": "002h0i93blsv092pnfmzsfx0pj98r9glki0ki9n7gxg1z3nb0ybp" + "commit": "97ad997c6c2e3bc8d12c02b2809960d47ad316b0", + "sha256": "11jad58shbrxd1r2r4amlvddx0qlx3ikbmq598sfwz2253ndzny1" }, "stable": { "version": [ @@ -58482,8 +59425,8 @@ "deps": [ "lsp-mode" ], - "commit": "04d75b6a0be5894fea4a55fec0b2ccedf5b3be58", - "sha256": "09vvjb215qz4l31bs2pvwdnnahmyhh34zhf1ghymcr2d34zqiqn0" + "commit": "130f7a8f7a37869515953aa7715b3b969c3d7a0b", + "sha256": "0mz1wdxn31qngk98k924mwf4f5pb8v1y9jjl2sf4mrjw1wz2xsnb" } }, { @@ -58494,8 +59437,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20200220, - 534 + 20200503, + 1640 ], "deps": [ "dash", @@ -58505,8 +59448,8 @@ "lsp-mode", "treemacs" ], - "commit": "2e3606eebfa8bd909b45b88e59d8eecc6afea4a2", - "sha256": "08xpf677jj1cnfkbpb148h3wld8lvlarp2yq89539nfcmajx53ch" + "commit": "bd2c3727dd1e46e972477f11ba84999697ed842c", + "sha256": "03jlwbzkkpqn0a68m991b6zhbnpna1rvjsdjmqqvyng209lgcgph" } }, { @@ -58517,8 +59460,8 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20200311, - 1837 + 20200503, + 1650 ], "deps": [ "dash", @@ -58526,8 +59469,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "134d9b725d21f8889f3dc72dddc418c6c6561f0e", - "sha256": "1ajza32nj4l5m0x9kghlwc2plavd507wajna6cdk5z276lyrn38a" + "commit": "271b47cb33f11915295911f7cf8575f8a82a5e1c", + "sha256": "181j9anm3h5sfallls3sxik6cd7dw1fbi3q9mlfhk979wk6varjk" }, "stable": { "version": [ @@ -58552,11 +59495,11 @@ "repo": "immerrr/lua-mode", "unstable": { "version": [ - 20191204, - 1434 + 20200508, + 1316 ], - "commit": "1f596a93b3f1caadd7bba01030f8c179b029600b", - "sha256": "0swnan2v2lc7s1jsnmkyzv7gajx08akgm6dvbsgm5hzp0mjbbpy4" + "commit": "35b6e4c20b8b4eaf783ccc8e613d0dd06dbd165c", + "sha256": "1bwyyp9fbvy0p4f3mmbqc0plxrcm0ag2r3zb74gb5k2vcxi2vdw4" }, "stable": { "version": [ @@ -58607,14 +59550,14 @@ "repo": "sjbach/lusty-emacs", "unstable": { "version": [ - 20200115, - 1413 + 20200415, + 1456 ], "deps": [ "s" ], - "commit": "3f4be19e0c466399c680a355c402b09792123e4d", - "sha256": "1915w43dwvqkklxdh1scy4yxzmalyyrx76iy9wl024svwjq3i0np" + "commit": "1b7053b41083666c6805bcaeb55ece6dcc0d77cb", + "sha256": "1y3nzp6rpg7anv5xscbp4lzmfdvzffcxha9vx3mrclhjg6giz510" }, "stable": { "version": [ @@ -58634,11 +59577,11 @@ "repo": "abo-abo/hydra", "unstable": { "version": [ - 20200227, - 1301 + 20200507, + 1518 ], - "commit": "16fa8d109ec5799931a793b2e866ea9d593bee84", - "sha256": "1l6pi5ldmdcgv5qyg3kk1x8sxb639brzbfj0iddy5752hmg08g3h" + "commit": "87873d788891029d9e44fa5458321d6a05849b94", + "sha256": "1b6davg1jqcxqzf9aqv8av8c78fgdri97m9q44xzvr1xfbmvkl8g" }, "stable": { "version": [ @@ -58673,26 +59616,26 @@ "repo": "montag451/lxc-tramp", "unstable": { "version": [ - 20200321, - 1815 + 20200414, + 1445 ], "deps": [ "cl-lib" ], - "commit": "ad03a98386d4cdb0df3eb323ecaab8fe6d0942c6", - "sha256": "1x43na4m7krkhhsvvync9k0rk4lxdakl52n43aafyx43zgv5zk8y" + "commit": "1585e55a5deb89e2f4e30a0ad9e0f121d1e0ebcb", + "sha256": "1zs4wcbxqx8275j2q1118ipqw7532cd6cdy2whw22ck4z5w47vfg" }, "stable": { "version": [ + 1, 0, - 2, 0 ], "deps": [ "cl-lib" ], - "commit": "ad03a98386d4cdb0df3eb323ecaab8fe6d0942c6", - "sha256": "1x43na4m7krkhhsvvync9k0rk4lxdakl52n43aafyx43zgv5zk8y" + "commit": "1585e55a5deb89e2f4e30a0ad9e0f121d1e0ebcb", + "sha256": "1zs4wcbxqx8275j2q1118ipqw7532cd6cdy2whw22ck4z5w47vfg" } }, { @@ -58973,8 +59916,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200318, - 1224 + 20200514, + 1330 ], "deps": [ "async", @@ -58983,8 +59926,8 @@ "transient", "with-editor" ], - "commit": "236c44518d30c43c7035be32f02ba615d148b5ef", - "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6" + "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", + "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" }, "stable": { "version": [ @@ -59012,15 +59955,15 @@ "repo": "magit/magit-annex", "unstable": { "version": [ - 20200224, - 1 + 20200428, + 9 ], "deps": [ "cl-lib", "magit" ], - "commit": "9ffebd50a18adba70a9cfc2710012dfd650c5376", - "sha256": "0sihrmk9snazdj1dana7q89a5qd7xjclhmfqh15gvxchs4a8jwqg" + "commit": "ef5dce6267e9118a5eca82a22bcad0b67826c23a", + "sha256": "0vzkydgl889cq173zjl89g2vrddb9abc4a8gljiz3b4a7n5b1nrd" }, "stable": { "version": [ @@ -59311,8 +60254,8 @@ "libgit", "magit" ], - "commit": "236c44518d30c43c7035be32f02ba615d148b5ef", - "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6" + "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", + "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" } }, { @@ -59398,8 +60341,8 @@ "deps": [ "dash" ], - "commit": "f316a085b9f66804692554df46c0f4f536a45b78", - "sha256": "1d650wny0201vh4hmkmx290rq0b2fnlwlb8ivys7mai9d380vlwi" + "commit": "b8e886c4f2242d6c58f84d4549af712e86360db1", + "sha256": "14l989m5pxzxk6164z8lgvshy45aq0ab78mjz5f6zw58h5rvnbdg" }, "stable": { "version": [ @@ -59460,14 +60403,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200318, - 1224 + 20200513, + 1503 ], "deps": [ "dash" ], - "commit": "236c44518d30c43c7035be32f02ba615d148b5ef", - "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6" + "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", + "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" }, "stable": { "version": [ @@ -60251,14 +61194,26 @@ "repo": "plandes/mark-thing-at", "unstable": { "version": [ - 20190817, - 1623 + 20200427, + 1453 + ], + "deps": [ + "choice-program" + ], + "commit": "a69696635616c10184a3289d459d8eb532f04f47", + "sha256": "0iiwa5cv43177irm4kj9jzfr1jzkw0gw0rmy9vnnbggfgmklzxrq" + }, + "stable": { + "version": [ + 0, + 0, + 2 ], "deps": [ "choice-program" ], - "commit": "0d2220fdc81c33a36ab5f136856f9f2f79cd01a7", - "sha256": "0xxip63gkq76lhlafpgklpnj3n345fw95pdwhn5blzsjrx77ig6h" + "commit": "a69696635616c10184a3289d459d8eb532f04f47", + "sha256": "0iiwa5cv43177irm4kj9jzfr1jzkw0gw0rmy9vnnbggfgmklzxrq" } }, { @@ -60322,14 +61277,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20191230, - 1055 - ], - "deps": [ - "cl-lib" + 20200514, + 16 ], - "commit": "e9dff50d572caa96b68a7466c18c97a8d6ed651c", - "sha256": "0v7a56fqwaqzqkpip7lpbsf9jnnwfjwd3jf61xnziv6j9sa46p1d" + "commit": "705c77b9533970a425b09fb4c2fabf3b406117c7", + "sha256": "0i40pp0157azw2jkkr08f4cbal9ansp9dbscdbdzmlp9lf27kqjs" }, "stable": { "version": [ @@ -60431,30 +61383,30 @@ "repo": "ardumont/markdown-toc", "unstable": { "version": [ - 20170711, - 1949 + 20200502, + 742 ], "deps": [ "dash", "markdown-mode", "s" ], - "commit": "7038f4f6d5c2bc7e4aea89699a607ac2b7dd16a8", - "sha256": "1kvf30ib1kxp29k1xwixkq6l4jjr3q3g1wpvh9yfzk5ld97zmry1" + "commit": "a9f13eecd0c7d8be960055dbc2d6f5d3fe6f40ca", + "sha256": "01xls8jd6l8c8xiyx8l15j5ca96gsln1m32prnhw4sfmrlw996h6" }, "stable": { "version": [ 0, 1, - 2 + 4 ], "deps": [ "dash", "markdown-mode", "s" ], - "commit": "15587c76bec43dd778a2034035f98a79ad29e96a", - "sha256": "00rvpbfcdy1npddxa7yynqpzwrx1h2bm69x9yh42dv6ss3vk1sjs" + "commit": "e6de0f5c4c6dfdb8da37b34a16fe7e8edc88765c", + "sha256": "1xqrrf4gwcr64xgbyvgplmcrcl7knfsm0v8yzrhscq65pb7zf3zj" } }, { @@ -60910,6 +61862,24 @@ } }, { + "ename": "mc-calc", + "commit": "a8cded39a6c14d34f618aba136d48e162a70c433", + "sha256": "1lphlavndz0m3pw2kcrbqkavvcgmzn2p3av0h60ghndz00psqbys", + "fetcher": "github", + "repo": "hatheroldev/mc-calc", + "unstable": { + "version": [ + 20200420, + 1836 + ], + "deps": [ + "multiple-cursors" + ], + "commit": "74a046a5728919a4d1135ca62738326b0dde278c", + "sha256": "0498088pgbpywqdla8mzhpq4izzbdbqwq9cjzg0050y598pinpqq" + } + }, + { "ename": "mc-extras", "commit": "12747bb8603ebc09ce0873f3317a99e34d818313", "sha256": "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym", @@ -61026,30 +61996,30 @@ "repo": "mopemope/meghanada-emacs", "unstable": { "version": [ - 20191215, - 1353 + 20200506, + 743 ], "deps": [ "company", "flycheck", "yasnippet" ], - "commit": "70bfbf553c7b7fb1928672e9a95b7137e02c2d4b", - "sha256": "07rl9lr4dyb9ld2cgvkxkfirls03jznggaa1j776nppk00fhz3bg" + "commit": "e119c7b3271281d60892b80a0cc6488503baf38f", + "sha256": "11nvhvxm39pcxjknzik6n07l309x9r5maf24pnlgk2wxkr28xmzs" }, "stable": { "version": [ 1, - 2, - 1 + 3, + 0 ], "deps": [ "company", "flycheck", "yasnippet" ], - "commit": "70bfbf553c7b7fb1928672e9a95b7137e02c2d4b", - "sha256": "07rl9lr4dyb9ld2cgvkxkfirls03jznggaa1j776nppk00fhz3bg" + "commit": "83ee6c6520a8cf063742e1b16fef3efebbcf8b73", + "sha256": "1hk4953dk93pa7srlgnjh9pskpl67f90gm9g0iv9zffwsxw4kwaw" } }, { @@ -61209,6 +62179,25 @@ } }, { + "ename": "meow", + "commit": "b5515ad6f1b8e8296fba5bd91d7adf5e1fc229b4", + "sha256": "1s9wqmxg1g8crhsvwn4fh3hkn7pyfj5x71fal9yl0fk6gx59n1p0", + "fetcher": "github", + "repo": "DogLooksGood/meow", + "unstable": { + "version": [ + 20200510, + 154 + ], + "deps": [ + "cl-lib", + "dash" + ], + "commit": "56e7ba100eb0ae92a37bcd0fcce77affa26d2fb8", + "sha256": "1jz0jpdr4imzs7rr21q19j59y04kw518qpisrrsmyw6fywi8k22g" + } + }, + { "ename": "merlin", "commit": "9338298a79b7f2d654df90b0f553aeed1428de13", "sha256": "0r4wc5ann6239bagj364yyzw4y3lcpkl5nnn0vmx4hgkwdg509fn", @@ -61219,17 +62208,17 @@ 20191025, 851 ], - "commit": "37e38e44f57fa2caac5ed8a1268e747a42174c85", - "sha256": "1r73dy1wyrdclcnp9dpk7r463fwkh2ybi31q1mmxym1xwvkg5ahl" + "commit": "db957668fa2be7b9d076f0c066178a65c48dd085", + "sha256": "0abg2c0lcdiwmf1jlybrjw0n17hwqfmj29r7gbvrsm16snf27rag" }, "stable": { "version": [ 3, 3, - 3 + 4 ], - "commit": "73e9771bcc1c8f8575b505a62c58ad40004cf5f7", - "sha256": "12mh5p87rjwvkf6dqmxka4jbvhcd729972b726im6v0a27ncqh77" + "commit": "21f4ba18acd9ca3dc5c8263acfc46042a6aa557e", + "sha256": "1sp1g70wy8qp34641hlpk5xaf7vv359xgwc7z8cw7yvj39mn98va" } }, { @@ -61269,14 +62258,14 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20200320, - 1357 + 20200420, + 2258 ], "deps": [ "f" ], - "commit": "a5b16bc4308e2a520711c2ef8a964e269115cbf7", - "sha256": "150a69rn0wkfb0bmyx21vywh7vcd5a3yfi7i9jgp8zf8hfclsymg" + "commit": "b8673381ff8bbfbdf3f165ae928e7c775a3117e9", + "sha256": "14w2mwqiksmng8pzm4l0c458q0i2m3p4wcfvvmagyqk6mfl05m4l" } }, { @@ -61303,6 +62292,21 @@ } }, { + "ename": "message-attachment-reminder", + "commit": "7412f7428d16955968cd78de3bb3abcbbcd5c508", + "sha256": "0hwah27sw3myka86gywjjncp0i8lnqiagklxdh6z6z4hl9jk105r", + "fetcher": "github", + "repo": "alexmurray/message-attachment-reminder", + "unstable": { + "version": [ + 20200428, + 124 + ], + "commit": "a8b761d665c17694a04eccf1c2bc135d35bdf482", + "sha256": "0rg34w1nsvmwxn9z3aipj32fk26fykzqxkr0x7am7icigg02dsbn" + } + }, + { "ename": "messages-are-flowing", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0v74b7cjj87kncndxfpfs6dcc4jcl18wpbirffl7dw6mac2anw6m", @@ -61397,8 +62401,8 @@ 20191018, 242 ], - "commit": "821ed77f0982dfeb1df50380931d53e6b7b7036f", - "sha256": "16hrnfz4jp5a672rvgk6ky9xfzvgxx73p5l96wh3x9294vyjd4vi" + "commit": "60eae1c8a7f82fbcc2660d785b33601daaa29f4b", + "sha256": "06ia4ba6c1yph259wr4y5sdkl1ry6pzbwhx807ia675rp0clp9hz" }, "stable": { "version": [ @@ -61418,14 +62422,14 @@ "repo": "ianxm/emacs-tracker", "unstable": { "version": [ - 20200126, - 1851 + 20200503, + 1425 ], "deps": [ "seq" ], - "commit": "4da64b60091c3d7b23c7c5fd3dba981122b0e1f7", - "sha256": "1jy07b1am1g4hwiwywmi9iyidv3yp933j2y4f9nmfhpb4yjs193y" + "commit": "6d68118eee409a2b671537129eae1154421ba82c", + "sha256": "1i7fzla9i3s4439ckkny09fq3r2q0q2153qzyhxsfbcxb47vbx26" } }, { @@ -61436,11 +62440,11 @@ "repo": "jagrg/metronome", "unstable": { "version": [ - 20200309, - 1918 + 20200502, + 1748 ], - "commit": "ab9478da0da3aadba26c65beba938c3928c823c3", - "sha256": "0qrjyn2qc5k5a6gz1m1izx315sy7dd0cdzgiyrwp8za39gkhgbl7" + "commit": "18257ecdd7b3d816104e83a5f0f96e676cc9fbfc", + "sha256": "14qzb1i9l149nw4zhx8jlrrz7nvflc974zr5lbv7vv2zky0pya6w" } }, { @@ -61522,8 +62526,8 @@ 20200104, 108 ], - "commit": "3bce96bbd509ad5ffb35ead52128dec5c1a67abf", - "sha256": "01wx7cvk3bvdvkpldhbj7wvqyrra7ajqjkgnj4knjg8m2wrhilhj" + "commit": "e9af8a2595e336542c9dfc656fe808ddc6937a59", + "sha256": "1s72qvg1jwqk27axiqb2wn7y1q3x0rf2mb20yc9kqva553fk5vzd" }, "stable": { "version": [ @@ -61549,8 +62553,8 @@ "deps": [ "calfw" ], - "commit": "86d3682ff9491893da671237be3cde0b0010ca85", - "sha256": "0md61pfjvx8xakahpig39ldfzvwdjgr19qxr78c7bzl98hbjpgq4" + "commit": "f9f048de9fe85a90d376d828ce3dad2a96c62c40", + "sha256": "1m6w12y9dcz85xm7lc7dhc7vjhw0bhdm0b4rcp1fr2sn9wv7c4wz" }, "stable": { "version": [ @@ -61672,17 +62676,17 @@ }, { "ename": "minesweeper", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "1n6r3a3rl09pv4jvb7ald1gaipqylfchggza973qv9rgh5g90nag", - "fetcher": "bitbucket", - "repo": "zck/minesweeper.el", + "commit": "d3828ad7599d13728b5571b882344c3ada434b85", + "sha256": "061l7xh7vjg5krz5lskj2jvrnsv2qq4bwg0qkkysmy4zp9f3m5iq", + "fetcher": "hg", + "url": "https://hg.sr.ht/~zck/minesweeper", "unstable": { "version": [ - 20150414, - 522 + 20200416, + 2342 ], - "commit": "d29af12fc6115399c11bdf7461a74cb810c97336", - "sha256": "1b2kn4c90hl07lzdg10wamd4lq8f24wmaj4zvr728pwyga99b2av" + "commit": "d4248e3c9b3e9e7277cb9e6d081330611898f334", + "sha256": "0b648nsnwn461r2alg9v220v0c4djyvwn7xgwh8c8sb9pjwbmw90" } }, { @@ -61711,11 +62715,11 @@ "repo": "muffinmad/emacs-mini-frame", "unstable": { "version": [ - 20200327, - 2218 + 20200430, + 721 ], - "commit": "30000e659b0ad2501591343b4818e5877783483b", - "sha256": "07b4903i3h91rjdixqsyhfclwg936n538bpiglay9r2klaa6kjp1" + "commit": "78d9bbb272acc5f2927648cc706321f95e2955c9", + "sha256": "1d4zgrpy21j35dzcspbv4szbprxxv9mygwqfx0x2bs53z4abk1kg" } }, { @@ -61741,25 +62745,25 @@ "repo": "kiennq/emacs-mini-modeline", "unstable": { "version": [ - 20200319, - 526 + 20200424, + 647 ], "deps": [ "dash" ], - "commit": "efe3f9743004d7989ea3b82d2bc71960e990bdc0", - "sha256": "0wy52ixj16029xk5grh1531afdcmpfi25iacl9bhplsrivzjl7hf" + "commit": "4f1dce78916cccd2e7066345ae2be3394a675c46", + "sha256": "0qbd6jdaqfs43i9cgs4n4d8vkv3nbcxcmwkd9xrj1d03rdmyzxh0" }, "stable": { "version": [ - 20200309, - 413 + 20200408, + 729 ], "deps": [ "dash" ], - "commit": "4d97bf35cf0f9d58b14d13a78172c15463820382", - "sha256": "0cqzqrc8wpxav08fx9n1ljpzf97hj3wdhizywj4avnyxj3g63zwi" + "commit": "b761e41479a2564e801ac6c427956203de3d62ca", + "sha256": "1ngggz4n35bklgya6ymc98w7y2annxcpdkikd5afd5jn8w7x2vxg" } }, { @@ -61925,26 +62929,26 @@ "repo": "arthurnn/minitest-emacs", "unstable": { "version": [ - 20200224, - 1823 + 20200506, + 308 ], "deps": [ "dash" ], - "commit": "97d7d1760b24e117ffd163531b0f57fd4321677b", - "sha256": "0d8kg68yy5x1y3ivj43vzcakb3gii6bh8jm40g4sah5f53bbrs16" + "commit": "ddd152c990a528ad09a696bfad23afa4330ea4d7", + "sha256": "0mdbn8v6m4902krnagsp74r4501d4yfxc33i55l4l14gvjgx1239" }, "stable": { "version": [ 0, - 8, - 0 + 9, + 2 ], "deps": [ "dash" ], - "commit": "2bed01262b0d888473468b5c7bd7d73694d31320", - "sha256": "0nd0jl5r5drnh98wdpqj2i7pgs7zvcizsh4qbvh8n0iw0c3f0pwh" + "commit": "97d7d1760b24e117ffd163531b0f57fd4321677b", + "sha256": "0d8kg68yy5x1y3ivj43vzcakb3gii6bh8jm40g4sah5f53bbrs16" } }, { @@ -62032,6 +63036,21 @@ } }, { + "ename": "mix", + "commit": "aaa1958ac6a0e59613e1b71e0eddbe4989d93e67", + "sha256": "1wflzfr7jgvd01il9zz96wasdyjxxi5nrzva9hlrkgqhp0h877sk", + "fetcher": "github", + "repo": "ayrat555/mix.el", + "unstable": { + "version": [ + 20200419, + 820 + ], + "commit": "37916fa5f7dfe448585fb83ea6253eb0f84df15f", + "sha256": "09pk4bakqz01ci06c79ywwb8ijdfgw3rxrz0wlaz4zmlbirkzma6" + } + }, + { "ename": "mixed-pitch", "commit": "7d3c7af03e0bca3f834c32827cbcca29e29ef4db", "sha256": "1gda4jl946qlbf8rqm0mk493kwy8yqldr21cr583l6b6gl1nb4qf", @@ -62039,11 +63058,11 @@ "repo": "jabranham/mixed-pitch", "unstable": { "version": [ - 20200321, - 1331 + 20200511, + 2052 ], - "commit": "734fbdf2d2c17beee151faf39bd10174a87eea5d", - "sha256": "1i0yd7akkyqhkd8g2g793n6syiy0mbnlq9apg7p1s4xycmwxx684" + "commit": "1cad46fddf741ed7ec5fc477d70e079e908e9ce6", + "sha256": "062np4d7blbwjc1kciqcp6hngmwr8i540zsv5f8p2qki4804b8ng" }, "stable": { "version": [ @@ -62081,11 +63100,11 @@ "repo": "Mulling/mlso-theme", "unstable": { "version": [ - 20200329, - 1516 + 20200513, + 1751 ], - "commit": "a4bb7b55ce81d8dcc0ad8d92acbde309c7cc1ea0", - "sha256": "15fmzsf5rpgx5f1fr45j24hgzmz95zxkj1jihdb64p049ak2h5a9" + "commit": "059c5773403b73a14a1b04d62d1d5b077a3f6e06", + "sha256": "1a00mybf269hlfzfhpcvlkkqgwck73hz5w1qsspg5w9w78qlymkn" } }, { @@ -62228,8 +63247,8 @@ "f", "js2-mode" ], - "commit": "33e1b521a8a8d0225df353b51f1e8a4588ee32d0", - "sha256": "1ln6wz452sfxy7ii211ha9p0n3pygxyzyk0raczfla3ln8dh989q" + "commit": "cfd5b1a8a32162575f1c30b82e17b74efb67cf1c", + "sha256": "015pinqd2bxac372dvmcxnc7z9qayq4xpa254sp31bdzn4r5xns4" }, "stable": { "version": [ @@ -62476,20 +63495,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200330, - 706 + 20200513, + 601 ], - "commit": "cedb331001d0623eb003591b2f650b8e5e4069ed", - "sha256": "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0" + "commit": "4b3f6a383642fb81a3407dde5d887e2d937ec471", + "sha256": "0adbyyfpwzcc1y2vlbdf5kxwxsspm1cnxpd21rjnvcc06pvxzq4s" }, "stable": { "version": [ 0, - 7, - 0 + 8, + 1 ], - "commit": "cedb331001d0623eb003591b2f650b8e5e4069ed", - "sha256": "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0" + "commit": "89a31f6242dac52071ee6be18feadcb604b548d7", + "sha256": "0kax2pl2x37yvn9zg3vnr9vp39sfgm7650lz2svp535srhki80il" } }, { @@ -62500,20 +63519,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200330, - 706 + 20200513, + 601 ], - "commit": "cedb331001d0623eb003591b2f650b8e5e4069ed", - "sha256": "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0" + "commit": "4b3f6a383642fb81a3407dde5d887e2d937ec471", + "sha256": "0adbyyfpwzcc1y2vlbdf5kxwxsspm1cnxpd21rjnvcc06pvxzq4s" }, "stable": { "version": [ 0, - 7, - 0 + 8, + 1 ], - "commit": "cedb331001d0623eb003591b2f650b8e5e4069ed", - "sha256": "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0" + "commit": "89a31f6242dac52071ee6be18feadcb604b548d7", + "sha256": "0kax2pl2x37yvn9zg3vnr9vp39sfgm7650lz2svp535srhki80il" } }, { @@ -62676,11 +63695,11 @@ "repo": "belak/emacs-monokai-pro-theme", "unstable": { "version": [ - 20200318, - 830 + 20200504, + 237 ], - "commit": "90f34d48baad78a86f60eb3fae902c545bb82505", - "sha256": "0sjxyvv16jm2xss6kxiankn9n92z52l20p2mkv95p2bd47mxn5iw" + "commit": "06f907e4a954688ec2096420fea1c9935d819e07", + "sha256": "1k73bnwyjnmgvx4664pqrk1ig0rr0rwxzlf165dh5fspzqkmrjqh" } }, { @@ -62691,11 +63710,11 @@ "repo": "oneKelvinSmith/monokai-emacs", "unstable": { "version": [ - 20200329, - 49 + 20200416, + 2001 ], - "commit": "1b937eab15326b3b2e4183229a01376c30e6781c", - "sha256": "0c2sfzxag01w2n61xy02aw2hwv7k1nm64iwbjyf0rsqcq0m64pz8" + "commit": "4281fc13dadef98942c8d43024de024f2392fec5", + "sha256": "0049ny3m1mgn0b97m0clcmmh2xzn66flbsd8k45dn0qxm5wlaj3n" }, "stable": { "version": [ @@ -62754,20 +63773,20 @@ "repo": "jessieh/mood-line", "unstable": { "version": [ - 20191101, - 1955 + 20200429, + 309 ], - "commit": "0b07bdc7e77e19d7c722c2db803be0d3b47aa692", - "sha256": "0i40rbc0m4sya4f2lcfc6v6kn4kc6rny3j14b5rma66jyx08fcwg" + "commit": "5ff7cb514d7842901b592fa5132b75bc2b0df2e8", + "sha256": "135cl8fksl0hyh7jxmdmwng1ppcv3lc3i39v7vslkwi2xp7b0xfk" }, "stable": { "version": [ 1, 2, - 1 + 2 ], - "commit": "43682f713eb1b95b98c1ec18e4f51daebd9ad43f", - "sha256": "03ms3yfp05b7c65pgjncm00r45fqgzal9xsp5gj58cm0yhclkcsd" + "commit": "5ff7cb514d7842901b592fa5132b75bc2b0df2e8", + "sha256": "135cl8fksl0hyh7jxmdmwng1ppcv3lc3i39v7vslkwi2xp7b0xfk" } }, { @@ -62802,11 +63821,11 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20200113, - 2321 + 20200514, + 1946 ], - "commit": "2751d36152abcc2ac1479225392182b53f1e02dd", - "sha256": "1xyw4l42053595r76lj8safsx6pj25as0107wd96by3h7dg9m586" + "commit": "f6bebfe6fe51b728ebd013b7084becad23cabad3", + "sha256": "0n8p864yj5m3n7f9qiq9hy24dwfvv0a0wchx2818rppff6vfq3hf" }, "stable": { "version": [ @@ -63010,11 +64029,11 @@ "repo": "wyuenho/move-dup", "unstable": { "version": [ - 20200311, - 1424 + 20200506, + 2305 ], - "commit": "7a384e0e0889e07a9a81d007d8ccc654c7c89bd2", - "sha256": "040xg9bbficz300zqrnvk68b76ljnif9sdiag03hp61xqpzxmacm" + "commit": "fa9be365fcd6a2b89388b4d27dec93928d506678", + "sha256": "0pb5xfzk5lfdz613hqsr9x1f0i5ls61xc0np43kqaxnr4xjz2fld" }, "stable": { "version": [ @@ -63485,11 +64504,11 @@ "repo": "cdominik/mu2tex", "unstable": { "version": [ - 20200329, - 758 + 20200512, + 704 ], - "commit": "536a7a0db4ddbdb30a16fdd56c79b78c9b50d865", - "sha256": "18s4mks7yxbxlhdkn9s2bgxyl14rv7ds7n6c7g3pzjd94j404b64" + "commit": "4b84cdac955cb36a8c44a2be48f3310252e3d3ad", + "sha256": "05rgx0nb028k1kmb9gbv4b0s20ksbjl0nksyrva2zpvd7xc1nyz9" } }, { @@ -63566,14 +64585,14 @@ "repo": "agpchil/mu4e-maildirs-extension", "unstable": { "version": [ - 20200302, - 1228 + 20200508, + 712 ], "deps": [ "dash" ], - "commit": "bd81c3e1c1f690b124937960acd2a819e9a2483e", - "sha256": "0v6aih6gqzg631kpqrqgkj8nw6d7i5ih2qnmraf3i29m5y6gqync" + "commit": "4d2ece2226fa69a0e0bb23517a418145b92bd573", + "sha256": "1gyyj1fzc34qrlfbk86lrrrib46r7lrw7pdxwzrx8jz42rd38jma" }, "stable": { "version": [ @@ -63767,11 +64786,11 @@ "repo": "manateelazycat/multi-term", "unstable": { "version": [ - 20200112, - 533 + 20200514, + 428 ], - "commit": "7307ddd456db44045206253e5a905d3d8c143d5c", - "sha256": "0cqq6y7whx4zwwd8360vdmbvsmkrvmxnn7cvz6hafrh5mrcfqmvn" + "commit": "017c77c550115936860e2ea71b88e585371475d5", + "sha256": "043dqd8i8h6hbcg11rzprxin2yq5lb902zlrb7mxah44vyp8wrdi" }, "stable": { "version": [ @@ -63783,6 +64802,25 @@ } }, { + "ename": "multi-vterm", + "commit": "c87a280364597340baee7711aa33302c0a349fa7", + "sha256": "1dn1m30qmhv4sl84gki8l46rrkabn3ka7nb075q25h1b8lhhijci", + "fetcher": "github", + "repo": "suonlight/multi-vterm", + "unstable": { + "version": [ + 20200329, + 940 + ], + "deps": [ + "projectile", + "vterm" + ], + "commit": "11f1b0cc97a24aba66fb561a0a94e9a66375b30f", + "sha256": "0pzcwn13yj21qcga2agcv8as0jyrmw055fr8nbzvkp1jml4l3vwj" + } + }, + { "ename": "multi-web-mode", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", "sha256": "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5", @@ -63867,6 +64905,25 @@ } }, { + "ename": "multistate", + "commit": "c844d8250242ce3f6d9955bb236042bd31c9b360", + "sha256": "0gidbdr0hlyxvkq1r15w5xp5ssqv061cyk9sdqdry4942dy0zgvg", + "fetcher": "gitlab", + "repo": "matsievskiysv/multistate", + "unstable": { + "version": [ + 20200514, + 2206 + ], + "deps": [ + "cl-lib", + "ht" + ], + "commit": "eadd0df2745bf10500a9ad4ee8f66f3cb470bef0", + "sha256": "081rangw4iqk1lcahk01skh518ljdp6g4ww7zydjr813x7jzv2kv" + } + }, + { "ename": "multitran", "commit": "d665759fa6491b77103920a75c18a561f6800c1c", "sha256": "0nxrzzlinl5310zfrb4z5j0553cmg11m9y2gaf990j61afaw8f32", @@ -64181,14 +65238,14 @@ "repo": "mallt/mysql-to-org-mode", "unstable": { "version": [ - 20181012, - 2034 + 20200503, + 1239 ], "deps": [ "s" ], - "commit": "7c986065adcbe13a525e1da5db8aa4c80b0ef7a3", - "sha256": "15zalc1rciawf5v2nkhf0qnn16c6fdaxs3m8aard3yhyag05ic3d" + "commit": "7dcd6486f374814908bdb3c6d4c88cd6cece1e2f", + "sha256": "1jpz68pf8j7f4jin5qk4lrkxfzjwyqs16fn3j9ll21z4lc2mj2a8" }, "stable": { "version": [ @@ -64580,11 +65637,11 @@ "repo": "CeleritasCelery/emacs-native-shell-complete", "unstable": { "version": [ - 20200321, - 2300 + 20200424, + 1635 ], - "commit": "11803df3706fb23d58e418a14ce981204a64e847", - "sha256": "0maljdxigd4fvrm7pv3ssyywl3c1zhfpqdymq933iig7d2hrwxm1" + "commit": "0f290514564d3733b35e4b48d70446c1a6eb4b41", + "sha256": "0i8bss7ipwsjfrgfri7d3f9pbpkdbfh8aqz8cawr2wvf4yayk8q5" } }, { @@ -64740,11 +65797,11 @@ "repo": "nickav/naysayer-theme.el", "unstable": { "version": [ - 20200326, - 1937 + 20200405, + 123 ], - "commit": "e4d80cb70324a45102075ea923af454a563e9133", - "sha256": "0kxlbvpszb0lrj5dzfmzc1iaxgvhcjwq4hwykif22mkgdigxppx3" + "commit": "9d0bef898f31368cd30e063d53d443dee29683b0", + "sha256": "1jbp8p58bjc0wxs548niv02q9889blnwwfs64h5sm96nzhyzrkn0" } }, { @@ -64812,8 +65869,8 @@ 20161029, 2023 ], - "commit": "ae60dc55822ea1715b203775179080c5d62700d8", - "sha256": "0q46r9r2vc50vn3bh321l317lgbbmmbylhgbxllbjpyaidfqzvb9" + "commit": "f5fe5832889d7b6eab7d45724e051f4edbe1983f", + "sha256": "15ljrcmmpfwqxvci0ilmn3xgjxj19wq638zvij0wh2g0n6nil6xx" }, "stable": { "version": [ @@ -64970,6 +66027,26 @@ } }, { + "ename": "neuron-mode", + "commit": "6e4b79bc01b9ff2b00a4d0c80614f738a9e76dd6", + "sha256": "15ddpc64432013vn43amx0shnhr32cx1vkvn95chmddlkhx7ln16", + "fetcher": "github", + "repo": "felko/neuron-mode", + "unstable": { + "version": [ + 20200503, + 930 + ], + "deps": [ + "counsel", + "f", + "markdown-mode" + ], + "commit": "4329de608ca14dc67448ad576645eabb084009ef", + "sha256": "0wk4cjcj98yym1cca2k1wgail9rvxaqs7n9fkccnxv9bddjmymv9" + } + }, + { "ename": "never-comment", "commit": "ef3f8e712c10d63fea009951d7916fe376267cbe", "sha256": "0sn8y57895bfpgiynnj4m9b3x3dbb9v5fwkcwmf9jr39dbf98v6s", @@ -65215,8 +66292,8 @@ 20181024, 1439 ], - "commit": "8900fa55b56ba1e2f83b3f3ba2a1b336c97e5dc3", - "sha256": "0x6l5r5i1q7pbvziynbvb395q8rihkr1zyhp4xzw35xn55qyskiy" + "commit": "c6148b0c3377a7d12b679f99f35e09cc7f36e940", + "sha256": "088znrs8hygsfx0ndqhpfdgra3l3jf6dyfwz2l6h4s7w4kc8mlnk" }, "stable": { "version": [ @@ -65314,20 +66391,20 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20190904, - 1440 + 20200515, + 410 ], - "commit": "5b5961780f3b1c1b62453d2087f775298980f10d", - "sha256": "0lyf9vp6sivy321z8l8a2yf99kj5g15p6ly3f8gkyaf6dcq3jgnc" + "commit": "e20afb51a48b5d014292d123487f53a678c7c3f7", + "sha256": "1gbq9pmz1wv6kc128pyzi2hrsv9ax20myjmq02bwc4x5sqg6rdzq" }, "stable": { "version": [ 1, 4, - 1 + 2 ], - "commit": "2f4bd0f09c829c2c5f49be2c5455352eaa4c2e3d", - "sha256": "04xpgg9nba5m1bl7ci5l456whcb8nfhsbvgxyx89bp0zqgr005q7" + "commit": "e20afb51a48b5d014292d123487f53a678c7c3f7", + "sha256": "1gbq9pmz1wv6kc128pyzi2hrsv9ax20myjmq02bwc4x5sqg6rdzq" } }, { @@ -65498,8 +66575,8 @@ "repo": "dickmao/nndiscourse", "unstable": { "version": [ - 20200315, - 2046 + 20200418, + 2355 ], "deps": [ "anaphora", @@ -65508,8 +66585,8 @@ "json-rpc", "rbenv" ], - "commit": "280ac4943af307e6fe8d43a350c663c18c9c7ea8", - "sha256": "11ncy09y4lbivsp72l1lbg45ahqhgdzn56p9j4dxkczv5pnsg6p1" + "commit": "103eb5c13ad2d154c9386b2aa9dbea532435ee7a", + "sha256": "04nympxjg1dhahk7m71769c5lzsxxsnd9c62lqrkn22gvfzm0wm5" } }, { @@ -65520,8 +66597,8 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20200323, - 1803 + 20200407, + 1525 ], "deps": [ "anaphora", @@ -65529,8 +66606,8 @@ "dash-functional", "request" ], - "commit": "ab0db2b7e76efa8efc72c0f587a33da1f0dc9905", - "sha256": "10scn7y0v0hirwlckwxb8cr98qmdl0r6c605qdh8jigmcp4c782j" + "commit": "d5e58b373ab6c5f13174e76f5ae62539dc5cfc95", + "sha256": "0gqqdjmasjs1p6nal9s2yhas1xr2nm99rd3rns2b8cd5j04ccvaz" } }, { @@ -65556,8 +66633,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20200327, - 413 + 20200417, + 1757 ], "deps": [ "anaphora", @@ -65566,8 +66643,8 @@ "request", "virtualenvwrapper" ], - "commit": "ccba00ddd62f06e9f085f7f58532b961369d1677", - "sha256": "0fkcp3masas1sdrhp27c017b4r2gw2gp65lcjkvcfck2k9hnypip" + "commit": "7f6e3bdbfa872af8e92ed339671772b46bc7f7f0", + "sha256": "1dbb4pm2dvyvgw6lxjhhdqplb1b1jbvnywy8d3abr5dpzfqzij8s" } }, { @@ -65593,14 +66670,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20200328, - 1359 + 20200426, + 2105 ], "deps": [ "cl-lib" ], - "commit": "92661bc9b33af1e9d405d23f226c1fc80c0c9c01", - "sha256": "1c1zrfnzr7vh4fsrzyr1ivsf07ydxyr4v1776z2xv9bynvwb6lhz" + "commit": "e67d7edac513892c5997468899f177a6e7956906", + "sha256": "0b1f1lxzp2i2liysl8fs1lqcyrz220m232pzk8h6l7iq8y5fp15q" }, "stable": { "version": [ @@ -65646,8 +66723,8 @@ "dash", "request" ], - "commit": "532eb14328027ee29e124768feec23a8ef7ee798", - "sha256": "1qc9im01fw7k9907a9d2a87hndyyn3sk1kw31cylsvrzsb7ss9f9" + "commit": "ebc6a4a1cc56c01d2bb882e4a40934a6a1f4e9ca", + "sha256": "04zhhz8v6bx627g1vhvd0s8bl5g3d6a1mfgf7pb13627npsvbrdx" } }, { @@ -65907,6 +66984,21 @@ } }, { + "ename": "nothing-theme", + "commit": "8f69a676e9adfb45f8fbd4467e86a4cb0fbf6ae8", + "sha256": "0w93f50sb9swgn1lwnk8pdwwa5kpizmaaz13lvbk1qhq2xipr7yp", + "fetcher": "github", + "repo": "jaredgorski/nothing.el", + "unstable": { + "version": [ + 20200504, + 402 + ], + "commit": "d2514bb9707f66dda0d60f40f465e79914c50946", + "sha256": "1gy3zis9swkriynaq4xc8mc3xiihak0hi718pckbkxwjmnrfyvc0" + } + }, + { "ename": "notmuch", "commit": "d05fbde3aabfec4efdd19a33fd2b1297905acb5a", "sha256": "0pznpl0aqybdg4b2qypq6k4jac64sssqhgz6rvk9g2nkqhkds1x7", @@ -65914,11 +67006,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20200323, - 121 + 20200427, + 1036 ], - "commit": "1fcf068e331b9b79e14f79c8b126711fc3d72cbb", - "sha256": "1pf9xds5csw6vwkb4b15isrw29psdifx8gl8y61la7d1k7b6m517" + "commit": "627460d7bbbb6b95a07084c2b6fc7f647a5547e1", + "sha256": "07fm4ndg42c0fw2dhj2rl32yrdnyprhidgkrwyckghwj02gjfwrj" }, "stable": { "version": [ @@ -65991,34 +67083,34 @@ }, { "ename": "nov", - "commit": "cf543955ba2d5d0074fa2a5ba176f9415f6e006d", - "sha256": "0hlcncpdazi4rn5yxd0zq85v7gpjhw7a6dl2i99zf4ymsan97lhq", - "fetcher": "github", - "repo": "wasamasa/nov.el", + "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", + "sha256": "1w4il2jbn0x6v11y3rnz5w5vs0d0hhlqqzzxdpkpmrq9ycbq58hw", + "fetcher": "git", + "url": "https://depp.brause.cc/nov.el.git", "unstable": { "version": [ - 20200220, - 939 + 20200506, + 1245 ], "deps": [ "dash", "esxml" ], - "commit": "cd1b264b3f978a9285fa9297e40ad29d1434adf5", - "sha256": "02apbr5x9vdrx05mfs8qyp4ami1y30n8mmy4kpd4xw04nza9wxki" + "commit": "55a3b41aa71740826a1cd410fa8d24a313f27b7c", + "sha256": "0zw6iq2iwv06jixb5cv73b832y576v0vs51l0j80d8w5d09zpfz3" }, "stable": { "version": [ 0, - 2, - 9 + 3, + 0 ], "deps": [ "dash", "esxml" ], - "commit": "5184fbb1f3b3540be58a28f6dd469ff212ccc9bd", - "sha256": "0v01l1p35mcigixs6j4c5bpc7n7bd51kxa0p3l1xl0gr92774yq3" + "commit": "ea0c835c1b5e6e70293f4bd64e9c89bdc42f8596", + "sha256": "04phmm14ywgicjsl2bsg6w9rapd71vdkxdp5wp0brj6px27y85jz" } }, { @@ -66068,14 +67160,14 @@ "repo": "shaneikennedy/npm.el", "unstable": { "version": [ - 20200329, - 1904 + 20200406, + 1429 ], "deps": [ "transient" ], - "commit": "2201ab1d9d424146c725d5e9ad24cc8e0219ba95", - "sha256": "18bm31f6zaskyncn97mfwxdih6b31jpm8v858m920i5j45gh78r5" + "commit": "187ddd2732deb49df1e87fbaace153afb8a3e7e1", + "sha256": "0kh8y0izab3rra5vb1229h77ykz704wh28m7vv0bsfn5lg02ridx" } }, { @@ -66359,8 +67451,8 @@ "repo": "rejeep/nvm.el", "unstable": { "version": [ - 20190912, - 626 + 20200501, + 1414 ], "deps": [ "dash", @@ -66368,8 +67460,8 @@ "f", "s" ], - "commit": "e93e5216e311c665c593ac68c5456d624120ea42", - "sha256": "11fa9g05gsh2yjvhy1xjc6hkby5z98mb2bmbshdp89fvlsdksv3i" + "commit": "fc925b9afe738264cb15d5135c7426f999aeda47", + "sha256": "1mb3i7d470ggky6g9ib1jf04yfkfn9m8jd70mb18rac2ik3sy03q" }, "stable": { "version": [ @@ -66562,8 +67654,8 @@ "deps": [ "axiom-environment" ], - "commit": "2c5384b994266008a20558db4ffe0525e66c0f5f", - "sha256": "17f40w9r4whz0v007pp13w060jq87ag42p21hcj93c14py5s4g67" + "commit": "25932da0dc40c6877463cbf019b14ab05a6b0164", + "sha256": "1xbps0k4x982gh1a0pscpx4kayjjyykvm5pyj516wwkya7bac4a6" } }, { @@ -67423,14 +68515,14 @@ "repo": "clemera/objed", "unstable": { "version": [ - 20200312, - 1817 + 20200403, + 1500 ], "deps": [ "cl-lib" ], - "commit": "9bb351313799bf4fb39f1b680cdf0a7ddccccbb4", - "sha256": "0lp7j4s2w3qmk288nnmh92ad58340srxq20nqiybgrijc0kxkx5a" + "commit": "e89d8dae3b2d4331a4455d2a7b203500537d184d", + "sha256": "1xjcbfqxpda73l8imw1pj9my71qqacri269cv7wnzsfrphqh526x" }, "stable": { "version": [ @@ -67568,10 +68660,10 @@ "version": [ 1, 8, - 1 + 2 ], - "commit": "05bf3e4b39b765658a5be95d1db2a30084d1f564", - "sha256": "0h4ysh36q1fxc40inhsdq2swqpfm15lpilqqcafs5ska42pn7s68" + "commit": "9e26c0a2699b7076cebc04ece59fb354eb84c11c", + "sha256": "1dvcl108ir9nqkk4mjm9xhhj4p9dx9bmg8bnms54fizs1x3x8ar3" } }, { @@ -67641,20 +68733,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20200325, - 946 + 20200503, + 853 ], - "commit": "5f22947a41780a59dab7252ef1e3d510e6e2b28a", - "sha256": "1y84lidg5jiix7ap46jakqn3y9x1gzdlnv5473r3qv3cxzaf7l2n" + "deps": [ + "org-re-reveal" + ], + "commit": "b5ac03800294272d2deba115bcd08c9176580691", + "sha256": "08rimp8652jy54p7gnhk774gv023wn1bh73zkarxrwqrlvjkh5m5" }, "stable": { "version": [ 2, - 7, - 2 + 12, + 0 + ], + "deps": [ + "org-re-reveal" ], - "commit": "5f22947a41780a59dab7252ef1e3d510e6e2b28a", - "sha256": "1y84lidg5jiix7ap46jakqn3y9x1gzdlnv5473r3qv3cxzaf7l2n" + "commit": "b5ac03800294272d2deba115bcd08c9176580691", + "sha256": "08rimp8652jy54p7gnhk774gv023wn1bh73zkarxrwqrlvjkh5m5" } }, { @@ -67717,20 +68815,20 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20200320, - 1154 + 20200430, + 519 ], - "commit": "5dc27716c706166e1932f4a0e9f94384b6d17cb0", - "sha256": "0im6ds8mvnwfrh3z0cd05g32w9rklhl56xmhzl9i2180pv6qwil8" + "commit": "b23a05f442e3b1230f014e8054ebe3e57d22fc42", + "sha256": "18ln5i3pjzgakpyqdwd4ii8n49l9kxbdp092bsx9s92miknkl2mp" }, "stable": { "version": [ 1, 9, - 3 + 5 ], - "commit": "67e32a7754cda4c8d94227e80bfa708abb4e8e6d", - "sha256": "0928kn9yfwc2mhmja13y39iswlkk474xnszh9qza206j6r37h6p3" + "commit": "b23a05f442e3b1230f014e8054ebe3e57d22fc42", + "sha256": "18ln5i3pjzgakpyqdwd4ii8n49l9kxbdp092bsx9s92miknkl2mp" } }, { @@ -68186,8 +69284,8 @@ "request", "s" ], - "commit": "6819b6271960dcdc7c32981dadd48968a3640cef", - "sha256": "12frm9w6xh5rkfyvvvpwhdd55nlgsv8w4f52pch0sl437vidcsqg" + "commit": "4c15049079878fcd386cca5dba20b99296a1de84", + "sha256": "1avci3avwhrw040wwjgcv1hayk893y8iwln10vsjyb5rd78y9gsi" }, "stable": { "version": [ @@ -68222,16 +69320,16 @@ }, { "ename": "openwith", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0l3grbnn349cv26ap2phlmp2h94s68gqznh5zdqwc2cp7lf699sx", - "fetcher": "bitbucket", + "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203", + "sha256": "0swza74ndw0vkr7q513wp12c2yasla7aaqv0z98mzr0ssx12jld8", + "fetcher": "github", "repo": "jpkotta/openwith", "unstable": { "version": [ 20120531, 2136 ], - "commit": "aeb78782ec87680ea9f082a3f20a3675b3770cf9", + "commit": "1dc89670822966fab6e656f6519fdd7f01e8301a", "sha256": "1wl6gnxsyhaad4cl9bxjc0qbc5jzvlwbwjbajs0n1s6qr07d6r01" } }, @@ -68275,6 +69373,29 @@ } }, { + "ename": "orderless", + "commit": "3f1f2c378e63c5ce8a8d37735f914ce0663a76d3", + "sha256": "102jfzq2zskaa8jcb4mmmndcdc8221qp0hqlgvwirnzkxms9ij4a", + "fetcher": "github", + "repo": "oantolin/orderless", + "unstable": { + "version": [ + 20200504, + 706 + ], + "commit": "5b292ac136b891d574f0d9827904e6ad527a9c35", + "sha256": "0973fksap71cya30g3a58jqdd4hxkv4ia603dgl06qgirjvpl820" + }, + "stable": { + "version": [ + 0, + 3 + ], + "commit": "b69b52289fdb0023a3123b1ddec5b490125345a3", + "sha256": "0vxpaqsad3x1lqga1ky7sipm8lk8ps66wpcvz52jdqasxmxzvrjm" + } + }, + { "ename": "ordinal", "commit": "ea3dd6fe4cacc229dd1371cb66dd1cfd07321bf4", "sha256": "19s27mv7kqcg9qxa844al7q1hk0qbiqh93g1n54r3b6s980dlgcv", @@ -68565,6 +69686,44 @@ } }, { + "ename": "org-books", + "commit": "2362892068bffb99a37e77201924ec12676a5017", + "sha256": "1mp0n1x5ka2x2rc6pd4nn54cr8b3qxl7fq8dsyng7bm300gizpf2", + "fetcher": "github", + "repo": "lepisma/org-books", + "unstable": { + "version": [ + 20200510, + 844 + ], + "deps": [ + "dash", + "enlive", + "helm", + "helm-org", + "s" + ], + "commit": "44aec8dcdf4a498e13a80362dff4027cfa4b74a1", + "sha256": "10ws56ww3hhqx5gghxaygiyi5vkfb5snjf4v0djaam53yn03jl90" + }, + "stable": { + "version": [ + 0, + 2, + 18 + ], + "deps": [ + "dash", + "enlive", + "helm", + "helm-org", + "s" + ], + "commit": "44aec8dcdf4a498e13a80362dff4027cfa4b74a1", + "sha256": "10ws56ww3hhqx5gghxaygiyi5vkfb5snjf4v0djaam53yn03jl90" + } + }, + { "ename": "org-brain", "commit": "47480fbae06e4110d50bc89db7df05fa80afc7d3", "sha256": "0c05c6lbr740nnjp9p34padrbrc3q1x2pgylkyhsxadm4mfsvj0c", @@ -68572,14 +69731,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20200328, - 1700 + 20200516, + 1343 ], "deps": [ "org" ], - "commit": "ec4bd9dd290459657426bb06e78f666ac0310420", - "sha256": "18937fm3np1ngxc1rmjsg0mzrf7jr56gd87ygsi84y5cmw4j08zb" + "commit": "3ce2a33b81ce611695ad74bf21cb911ef90d9a1a", + "sha256": "0br8mqhxfx9pf1nslvlqk4x5rdlpjagixi6il0i0xpxhca7z3fya" } }, { @@ -68614,14 +69773,14 @@ "repo": "dengste/org-caldav", "unstable": { "version": [ - 20191024, - 724 + 20200510, + 2030 ], "deps": [ "org" ], - "commit": "f530b94b6f8d8d1f8a207e48986da75227bd78a0", - "sha256": "0b5gw1m646fq7xlq8966rlmqs63p5dgrq71cjc943s45mli0vvcs" + "commit": "8569941a0a5a9393ba51afc8923fd7b77b73fa7a", + "sha256": "05lgxqaffnqaqnzl24frafdkskran88hl2ml05qvyjhs4jjbgw9g" } }, { @@ -68677,14 +69836,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20200220, - 2016 + 20200512, + 2102 ], "deps": [ "org" ], - "commit": "61686fd87892e60268fc43348282abbfd879e5c9", - "sha256": "0n493p9dqx9bb6jcrb34s1rk8afwpz1fdgwrm64g7a0y2mbfga74" + "commit": "1dd73fd3db0e9382fa34d3b48c8ec608e65f3bdc", + "sha256": "0wfl416hd7f42j1fidap0f9zlcm3vhgjs12k99k672fggl0459h1" } }, { @@ -68760,11 +69919,11 @@ "repo": "justintaft/org-clock-split", "unstable": { "version": [ - 20200315, - 1716 + 20200331, + 526 ], - "commit": "322379f1bf08c74c034c5c86d8a3045675ee64ac", - "sha256": "0nigylzzxwm4wn8zp5vyrj4y41czcpkvglvy3p4dqn35agklz5mw" + "commit": "39e1d2912a7a7223e2356a5fc4dff03507ae084d", + "sha256": "0yvpmv0v56rsn43ffmwfhw8jjvfklw703qpmkx6d6paljjgy9k8l" } }, { @@ -68822,11 +69981,11 @@ "repo": "thisirs/org-context", "unstable": { "version": [ - 20200217, - 1006 + 20200418, + 1540 ], - "commit": "f354108ecd3d33cadee05a4aec95d2df4bc61ae9", - "sha256": "1zlqciqadhwkhmzlag7w0i83pn9gg0gikfcrv2qlr9nsn5rzzvj4" + "commit": "bbef096dc20b206b792b0ef310f2eed7c70ca3a0", + "sha256": "05s73wn2q3a0mfc14qlgcb1bas9addby0m43id2v8ljvxyigicr8" } }, { @@ -68852,16 +70011,16 @@ "url": "https://git.spwhitton.name/org-d20", "unstable": { "version": [ - 20190628, - 1356 + 20200416, + 2010 ], "deps": [ "dash", "s", "seq" ], - "commit": "0ca1b0a8d9ab0a7d687a9f2edb6eae2e57851129", - "sha256": "0wg95wirq964klpihhgv2flnkyjwwpdqiafn2b2l1785906csrcg" + "commit": "7ede5726d640c4f81146585f6eb907f51a0f6a19", + "sha256": "1p4irzcsq2sxmvpyrkrqs9ylp153mzwr31hvsnfh1f2nlghpicfk" }, "stable": { "version": [ @@ -68903,11 +70062,11 @@ "repo": "rudolfolah/org-doing", "unstable": { "version": [ - 20161017, - 1620 + 20200510, + 1732 ], - "commit": "07ddbfc238cba31e4990c9b52e9a2757b39111da", - "sha256": "1d9gf6wf3jp07bn2h6bbc75iy0wwdvzdlj9n4nwbc46nf3k154pa" + "commit": "df916bb13577f4de9d58332453cb8bf51eac37ba", + "sha256": "014xz7yjw97i1dzyg487r2v9rf3jk9jwc5acgg1fj5kc2n1m299m" }, "stable": { "version": [ @@ -68945,14 +70104,14 @@ "repo": "abo-abo/org-download", "unstable": { "version": [ - 20200311, - 1049 + 20200506, + 1829 ], "deps": [ "async" ], - "commit": "b96fd7ba02cbdae95cc37970ebcfae8afa8b25d2", - "sha256": "1fx621ll5kjw10n2xhba7h39m1cqvink61kyhb228p6h8cl63kss" + "commit": "d248fcb8f2592a40507682e91eed9a31ead4e4a6", + "sha256": "1m8683hkxs70754kqxxw6sb0wfvjkb9ghf9ny7zsyzvz0yj02gkm" }, "stable": { "version": [ @@ -69003,16 +70162,16 @@ "repo": "phillord/org-drill", "unstable": { "version": [ - 20200216, - 1336 + 20200412, + 1812 ], "deps": [ "org", "persist", "seq" ], - "commit": "4c114489e682e514e79701045d541ab6f3dc3fb4", - "sha256": "13y302lyscdqrba1sfx60yf5ji2xi7fbsvjsjbw7hiz63kg6rccy" + "commit": "35c1ce349949cc213f3076799211210f49431850", + "sha256": "06hc98z4sml7jrwm5zvbsw5x6q5jpa335almzkh6h85g1p8syfsn" }, "stable": { "version": [ @@ -69256,16 +70415,17 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20191018, - 921 + 20200501, + 24 ], "deps": [ "alert", + "persist", "request", "request-deferred" ], - "commit": "6821e349673e9ba8d7ae7b84789f931889273dc0", - "sha256": "12alwnk50gsiz5b9mw8qvn317f7phb5vh2x7yvi9m72zdrdaf8pz" + "commit": "2ee2b31547e6f4e33db70fb812d552e55d612fd6", + "sha256": "1gwz1avfbvn5pf72qfg3q6v8qhjihs89avzgx4v7mx6x34fgnpby" }, "stable": { "version": [ @@ -69334,6 +70494,38 @@ } }, { + "ename": "org-id-cleanup", + "commit": "2d59dfe413397ba07a74b7d344e9f9a73c0e3db0", + "sha256": "1jv4ffjd61p3p8qkki798yzky96k53hbnph4xfz77xkc8i2d6rxf", + "fetcher": "github", + "repo": "marcIhm/org-id-cleanup", + "unstable": { + "version": [ + 20200516, + 1339 + ], + "deps": [ + "dash", + "org" + ], + "commit": "05d57840893d9ae8146ed41d29d1f0571c05ded8", + "sha256": "1rsw4zgvxp77ncq4z98hcy6qsg6j72glx1y69rwfblg87lz3mj6d" + }, + "stable": { + "version": [ + 1, + 3, + 8 + ], + "deps": [ + "dash", + "org" + ], + "commit": "05d57840893d9ae8146ed41d29d1f0571c05ded8", + "sha256": "1rsw4zgvxp77ncq4z98hcy6qsg6j72glx1y69rwfblg87lz3mj6d" + } + }, + { "ename": "org-if", "commit": "09df84b60c46678ad40d8dabc08fcfe518f5ad79", "sha256": "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96", @@ -69365,20 +70557,28 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20200323, - 1404 + 20200516, + 1343 + ], + "deps": [ + "dash", + "org" ], - "commit": "601435b3aeff1b2c00f62deb39adf9b351e9b567", - "sha256": "0v6r78zcvzhj2wgaz22ddpbhjpggiii5j54hl12m02rpbqv0m524" + "commit": "f868df4aa4f49484cf818627251b7c7282d8d20e", + "sha256": "14mr03sjjkxix0sphnp7flr6f9z20g5x7ifv3hl2nvmh4794cf6n" }, "stable": { "version": [ 6, - 1, - 2 + 2, + 1 ], - "commit": "601435b3aeff1b2c00f62deb39adf9b351e9b567", - "sha256": "0v6r78zcvzhj2wgaz22ddpbhjpggiii5j54hl12m02rpbqv0m524" + "deps": [ + "dash", + "org" + ], + "commit": "f868df4aa4f49484cf818627251b7c7282d8d20e", + "sha256": "14mr03sjjkxix0sphnp7flr6f9z20g5x7ifv3hl2nvmh4794cf6n" } }, { @@ -69409,16 +70609,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20190930, - 1406 + 20200505, + 137 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "5123c29867e5da54d80e92f9a5a4259144451404", - "sha256": "1j45whlsclwq9v0c98ni4y5p04slmlwgwsbbr7saaxgv9xmv4yfc" + "commit": "c3c69aaeff743da4be415579444732c2904e9d3b", + "sha256": "02bl3qgplfn45wqj5gi43cz54j0i3c2nd2yn1ay2wjmdscm6akb0" }, "stable": { "version": [ @@ -69444,11 +70644,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20200311, - 710 + 20200514, + 1648 + ], + "deps": [ + "org" ], - "commit": "664c08e12cde19ce7dca645ba9accecda7266c32", - "sha256": "02gla6cs8w08jg8czl5855vxvs1jyxq839rh9f95d40x4jgc1rwy" + "commit": "2c43b10eed0659f8e47797e5e53d2973f939284d", + "sha256": "1ppzq6hx7nc2iy6pnpgxd39znc701mgqbi2v4v71a0yp8zl6kbgs" }, "stable": { "version": [ @@ -69603,29 +70806,29 @@ "repo": "alphapapa/org-make-toc", "unstable": { "version": [ - 20200110, - 1804 + 20200409, + 1436 ], "deps": [ "dash", "org", "s" ], - "commit": "be86a4e026befd9d10af42a22b2483c7969ccee1", - "sha256": "0348iq3bc3rxs5bqdvskyly4agqxiapamqkfm0323620kxl70agw" + "commit": "26fbd6a7e1e7f8e473fe3a5f74faec715c3a05aa", + "sha256": "08gkzl0cbgkyg31sxafqmq6v1hjgr2q62vnvncrdnhs3ly54inf8" }, "stable": { "version": [ 0, - 4 + 5 ], "deps": [ "dash", "org", "s" ], - "commit": "be86a4e026befd9d10af42a22b2483c7969ccee1", - "sha256": "0348iq3bc3rxs5bqdvskyly4agqxiapamqkfm0323620kxl70agw" + "commit": "43d4a2490a048b01ca5a6f44c5b4f24a458dfc95", + "sha256": "180ji6nnj6qj0rs1rdp1zlcrfsqf7ikb44ym8icbp5d6al2s4hnr" } }, { @@ -69636,26 +70839,26 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20200323, - 130 + 20200502, + 1133 ], "deps": [ "cl-lib" ], - "commit": "778f818ad3d101f27786556c2a7a9995d5da47c6", - "sha256": "0w3yyqn225c5y0if5pjvvszpasrvh3rh4f0bqjabrvqvrhf1q8ny" + "commit": "484bf3b0b8af461805b9e30d175510c031bcfbc3", + "sha256": "1shp3xfjifvwcj67mvfiv0dwpwyz846s6xa5zs269fwbvdvmx65q" }, "stable": { "version": [ 0, - 1, - 6 + 2, + 0 ], "deps": [ "cl-lib" ], - "commit": "f8eac8ccdec2ebf1dec87d4f5f01b4b53f86c67c", - "sha256": "0gjdhhri2fm93phvv3fnw6iz5agpafryacj521j80jf1dmj2bj5h" + "commit": "484bf3b0b8af461805b9e30d175510c031bcfbc3", + "sha256": "1shp3xfjifvwcj67mvfiv0dwpwyz846s6xa5zs269fwbvdvmx65q" } }, { @@ -69706,8 +70909,8 @@ 20200128, 1208 ], - "commit": "8f9f4f978a3c40adf2ff00eebb56bccfe4caf4e1", - "sha256": "0v0q3qzz6fwh0y9c9ci46284msr0x69jfki2ng89hpz8aab90bli" + "commit": "4fb77d9bb876e368e596d18324115cef6c1c71f3", + "sha256": "02js518d8h2qp8dxmw479gw61bdj3019j183hz6x1nn49ljx000k" }, "stable": { "version": [ @@ -69727,14 +70930,50 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20200303, - 1716 + 20200513, + 1617 ], "deps": [ "htmlize" ], - "commit": "2f521a89b106750ebafa94503cdeb043a02c5ab5", - "sha256": "1wr8qdkf75swf4jfqbv0r2hw7d5bw73nyyv7xa0msbc1hyw33b6l" + "commit": "d8a571c720b2b7dec9115fd85b114ae46d4ac4b7", + "sha256": "094nrd7fy7m7m758gks14kz7yfdcclcwvbz8p90dwg3dv311hii2" + } + }, + { + "ename": "org-multi-wiki", + "commit": "8138002578ef14e30561cac159e9a66406a4201a", + "sha256": "0wbybr9vf4hcwyi9rab8sm1xwxqmy7mbjv1jmm78j51kjh0cpgkj", + "fetcher": "github", + "repo": "akirak/org-multi-wiki", + "unstable": { + "version": [ + 20200419, + 1833 + ], + "deps": [ + "dash", + "org", + "org-ql", + "s" + ], + "commit": "8b056103d6f5320563e9fd794a008fd4e0719702", + "sha256": "1xmj2p9hcpf1nld0gsnxq12kaljh0p195fy24v23l8ygykhmqw17" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "deps": [ + "dash", + "org", + "org-ql", + "s" + ], + "commit": "80791ea872939df0578dc3a2992a2f7fd5618971", + "sha256": "0avg5xwnb3c9ylj9dqdcqmh8kykl98jsr6cl3rrivkj7l47i1rl0" } }, { @@ -69820,6 +71059,27 @@ } }, { + "ename": "org-noter-pdftools", + "commit": "caa6bf82ea660f8e1d68e45cc99c6f6427cf1327", + "sha256": "0k11njy2l8pxwpmxspy6qwvp1041p99xp9ha6pjxp3m3f7rik32h", + "fetcher": "github", + "repo": "fuxialexander/org-pdftools", + "unstable": { + "version": [ + 20200418, + 929 + ], + "deps": [ + "org", + "org-noter", + "org-pdftools", + "pdf-tools" + ], + "commit": "8cc15bb8014ed1f047eecc0abd8bf447f86c0505", + "sha256": "173118fplpz575dcbncrjjpid2ni0acsi9130r210vl6hal7yz08" + } + }, + { "ename": "org-octopress", "commit": "fba6c3c645ba903f636814b5a2bb1baca0b5283b", "sha256": "0r6ms9j4xxsrik4206g7gz4wz41wr4ylpal6yfqs4hhz88yhxrhw", @@ -69943,21 +71203,21 @@ }, { "ename": "org-parser", - "commit": "28d55005cbce276cda21021a8d9368568cb4bcc6", - "sha256": "06yb78mf486b986dhvqg3avflfyi271vykyars465qpk0v8ahq8h", - "fetcher": "bitbucket", - "repo": "zck/org-parser.el", + "commit": "d3828ad7599d13728b5571b882344c3ada434b85", + "sha256": "1galc2w2n2qnwxknym4wid1ldinf8fyf8vvh4ihnckcbh081nrhb", + "fetcher": "hg", + "url": "https://hg.sr.ht/~zck/org-parser", "unstable": { "version": [ - 20190207, - 521 + 20200417, + 301 ], "deps": [ "dash", "ht" ], - "commit": "8610aef8dc878fc001975780bcbcbab30dc929b7", - "sha256": "0vqh37y2b0dc8p9c04ici1h9n9ghd1jizcr1c2zvp75cyqsz09wv" + "commit": "fd4cb7035ff649378cc968b1ec2c386b5c565706", + "sha256": "1hnd4zhhwrd6gr1skvc64a3z9k3nmhwgcyy1cp2jfyhk0iwsrqfm" } }, { @@ -69995,53 +71255,22 @@ }, { "ename": "org-pdftools", - "commit": "62cf59d93b7b6700c4f7711e5fd22ece04896e6a", - "sha256": "0fqkq8hpcxzpj3irczkad78m3chadqk2895bdbj7xpdlr0803n32", + "commit": "d52346a042a72b76729d259c7f12f45d38ac27cd", + "sha256": "1pgfx0zgdp9kg8mxqxm5qac7vnd0j1ghfwq04rvqi9r1d51zpynl", "fetcher": "github", "repo": "fuxialexander/org-pdftools", "unstable": { "version": [ - 20200329, - 1507 + 20200422, + 1350 ], "deps": [ "org", "org-noter", "pdf-tools" ], - "commit": "96fe7275c75842732c3fd1527619088f66b6a80a", - "sha256": "1ri58hyksp4fhmm6323ndc1h3ljkxjgbzcp588h76fkpk19lzhq1" - } - }, - { - "ename": "org-pdfview", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1qhlmzf2ffcrjnx4yghv7n6rsry8bcwnkw489spgraq9vxvqklah", - "fetcher": "github", - "repo": "markus1189/org-pdfview", - "unstable": { - "version": [ - 20180225, - 1006 - ], - "deps": [ - "org", - "pdf-tools" - ], - "commit": "8b71f313634b95a1fac42fc701934fd796565f3b", - "sha256": "1gd4ari970vb4631f9a4czvql8gafaqh7iir75n4wxqdcnglnymw" - }, - "stable": { - "version": [ - 0, - 4 - ], - "deps": [ - "org", - "pdf-tools" - ], - "commit": "3a96bfb57cb158ac02cfb4225512699c66f5221d", - "sha256": "0lrcj3mcdfcdrndivhj5ds386zrsy78sfg0i8126wwwc5lfh48vq" + "commit": "8cc15bb8014ed1f047eecc0abd8bf447f86c0505", + "sha256": "173118fplpz575dcbncrjjpid2ni0acsi9130r210vl6hal7yz08" } }, { @@ -70293,8 +71522,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20200315, - 2004 + 20200501, + 1131 ], "deps": [ "dash", @@ -70309,14 +71538,14 @@ "transient", "ts" ], - "commit": "ab5e9aa9116010e5da1995bf19ff26f55b93c214", - "sha256": "0h90vagb91zskvmy06yq0b1vjbkqry0fkxiagg4d076rbx3ryc0n" + "commit": "c847afe0b538a1a44c73e40b067831cbea132ba7", + "sha256": "0x1dymh7brhfznr6xkgc2vib4p1s5aqxq9kfjlcvi8q0cfasg9b4" }, "stable": { "version": [ 0, 4, - 4 + 5 ], "deps": [ "dash", @@ -70329,8 +71558,8 @@ "s", "ts" ], - "commit": "4fef5b089f8f77b0dc25dac5f096406156e90858", - "sha256": "065wkxd269v19r5s8g2haapwhwr3s6c5amwzshfl2hq5z0bldvqi" + "commit": "5a031bf5c19d274934f80d616d6fde62a6db5786", + "sha256": "133x49kr7nf7jhi5r7ww5pydgq8wq3g31klirwgkc29698sd6n78" } }, { @@ -70365,8 +71594,8 @@ "deps": [ "alert" ], - "commit": "4f7677af740e8f3f7cfaf630ae2e594a125af760", - "sha256": "1xk4vp2138p58jdxn51vnmpnij5bzc2jbpq7y8avdcv0p7618fdc" + "commit": "a019c7186ec60c8c7c3657914cdce029811cf4e0", + "sha256": "0jyd7cbri0bmi0qzwm7d4fxdfa1224bg6izd63pqqg1x7s67x99z" }, "stable": { "version": [ @@ -70409,28 +71638,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20200206, - 712 + 20200512, + 1701 ], "deps": [ "htmlize", "org" ], - "commit": "e4460a98b6bfa01720c287a171252f49c1949801", - "sha256": "0hhwc6yfy69qwiyxca8r12rdxvrj44vzdsnvdk0yc9szsfnmn4hz" + "commit": "a9e9d4ef88417b3af7741a8d8f444ece820e7a3b", + "sha256": "0lkqq5n4dspnpiywaparn95wriwh7ffypdykz0a3mmlnv96rizyi" }, "stable": { "version": [ 2, 12, - 1 + 2 ], "deps": [ "htmlize", "org" ], - "commit": "14df7542f2a675f65501962e344e03d798cf0d39", - "sha256": "1mc01v257884pdsw37dghgddyyy6v6rd9cmnnpq45xvd5ibz1vaf" + "commit": "fa6f656f561ebb8377bfd904795aec90b4332bbd", + "sha256": "19nz77f2r49hqavz50ri222prhrd5890vhvc7jfazbascbcdjbqv" } }, { @@ -70541,8 +71770,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20200309, - 1231 + 20200509, + 1756 ], "deps": [ "dash", @@ -70556,8 +71785,8 @@ "pdf-tools", "s" ], - "commit": "e3eb9215a540ba62a0b0253d003c704b7740deeb", - "sha256": "152wzlavx5b4ap9wdl3dql5idvsjl5zq6zjwcilp9pni6dn34w12" + "commit": "4ce80644377f2369efb475bd58a57cf6950d8c41", + "sha256": "1j15agy19n0qc4a1750qpyz6wbkwlzasq0cnk16isyq60bszgxx4" }, "stable": { "version": [ @@ -70675,14 +71904,14 @@ }, { "ename": "org-roam", - "commit": "278f993cf094b39b5d049f05e0cbba61e52a6f0c", - "sha256": "1m4nw1r8kdxigdvws5arqglamrx4g62v4p482flikk7w52gcs7is", + "commit": "6358b4fe160432cee80e6c15eac26764a92aac8a", + "sha256": "16xab5rz98bavk3vjmb5bxl4r5kpynnw40m0ahy1kl6cax51kx0y", "fetcher": "github", - "repo": "jethrokuan/org-roam", + "repo": "org-roam/org-roam", "unstable": { "version": [ - 20200329, - 1330 + 20200516, + 1203 ], "deps": [ "dash", @@ -70692,13 +71921,13 @@ "org", "s" ], - "commit": "b86d2c8637f5eafd587c4cf4fe85e7d0380844f4", - "sha256": "04i8i3dixf50vqp8jrwcbf4c8d7m47g9lyzj76h49jd8bv2fqang" + "commit": "265182a698be6babcbb11718c2821c747b1cff52", + "sha256": "159zi0a392p1f8bzlxvfkwmx12xm749cia5m0b3paz23mvvhgzgi" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ @@ -70709,8 +71938,46 @@ "org", "s" ], - "commit": "1433dbc31602c412914c71ecc81aa5dcf6b03daf", - "sha256": "08pfa63k194dpk0y2gfa0nzn5lig81q0l9axkq5j4ibj6ifaap4a" + "commit": "27a63b59b176f9d2048de69eb0f525f3c7be8f5f", + "sha256": "18ljww204kf1pbgrrnx7bn6177lw1bs3npywbx2k1b5j35c3j8xv" + } + }, + { + "ename": "org-roam-bibtex", + "commit": "2931aad53fbe448c20ec1aec49ab64e4b50a8f43", + "sha256": "1s3v0r86x2azmhmvmkk3hc726lcx81igchqyjqry8aibmy79pfnn", + "fetcher": "github", + "repo": "org-roam/org-roam-bibtex", + "unstable": { + "version": [ + 20200516, + 1742 + ], + "deps": [ + "bibtex-completion", + "f", + "org", + "org-roam", + "s" + ], + "commit": "4d60c7824e028b4bcdbe5dd589e416ec682a63c8", + "sha256": "010vgf2dlafx3673dpcpy94273i65pffpn5rz5vqvh0k3wwxhqyn" + }, + "stable": { + "version": [ + 0, + 2, + 3 + ], + "deps": [ + "bibtex-completion", + "f", + "org", + "org-roam", + "s" + ], + "commit": "02803c85cb312608172343c2d33bf9684d4bcefe", + "sha256": "0403ic5zc2sbrg3ryxk55n52ii4qzg1373h4j8bibfal2jv5i3ir" } }, { @@ -70732,6 +71999,46 @@ } }, { + "ename": "org-runbook", + "commit": "1ddf4d4e4bd22cc85150c8cbf635ace1f54d64fc", + "sha256": "0dih8kv6fhqbfmw2x8ndl6gygssl3g0jr5qkbgbf4wkl5xjls3cg", + "fetcher": "github", + "repo": "tyler-dodge/org-runbook", + "unstable": { + "version": [ + 20200504, + 648 + ], + "deps": [ + "dash", + "f", + "ht", + "mustache", + "s", + "seq" + ], + "commit": "fb4026df05b8e05c6aefd9483bec0e8f43d87d7e", + "sha256": "1qf0hpcscplpxd8xzf0yzkh87chbv3fgsfrr7bxh81g0akjiw03j" + }, + "stable": { + "version": [ + 1, + 0, + 6 + ], + "deps": [ + "dash", + "f", + "ht", + "mustache", + "s", + "seq" + ], + "commit": "53e8876a1587190ec4d103f9e94380f34797ce49", + "sha256": "1cyb956s3vshh2i4gd37m1cjxwq5s0xj55pwysgganwgxxw22c8n" + } + }, + { "ename": "org-scrum", "commit": "8315b6834d76180fd050b0d5cc2239d604fe2f3b", "sha256": "1bvxcj5675kh7zf839qb0hdy6jlllpqm7ngb5ixx1klax7l8n7pr", @@ -70792,8 +72099,8 @@ "repo": "alphapapa/org-sidebar", "unstable": { "version": [ - 20200313, - 1551 + 20200501, + 1215 ], "deps": [ "dash", @@ -70803,13 +72110,14 @@ "org-super-agenda", "s" ], - "commit": "d6ddec21fd6f356dc7b77c0a61a633606965a0bf", - "sha256": "137a462cl66jldsw877jgn0jph4zsv036mhvd9rpp6pw6jsw50sy" + "commit": "6dfa3a2312e8dacc942980e4ab10f1faea922a49", + "sha256": "0byr4h9dcgv667sn110011lkcnrr327qg7wv7f87hm1gyl613cgp" }, "stable": { "version": [ 0, - 3 + 3, + 1 ], "deps": [ "dash", @@ -70819,8 +72127,8 @@ "org-super-agenda", "s" ], - "commit": "41b914c7bdc5a12c9289b134822bdfea0889ac9e", - "sha256": "1mggpxbzprmmbkiv3xklw1saafsi153n4spr4l0m59lgm4gpymgj" + "commit": "4d8f6fce5ffce8c9b495742998d0ae64bdc5959d", + "sha256": "0i7dib49yfx48df371rqq16y0yxnc6n331wka532w10ava11g5s3" } }, { @@ -70848,6 +72156,40 @@ } }, { + "ename": "org-special-block-extras", + "commit": "c6cb3b3bf575f125f892b10fc3518f3ad1663d03", + "sha256": "041l129iabm078p9bfdcwx5aax9fa3kbn852h1qbq8jgsks36jv8", + "fetcher": "github", + "repo": "alhassy/org-special-block-extras", + "unstable": { + "version": [ + 20200502, + 2057 + ], + "deps": [ + "dash", + "dash-functional", + "org", + "s" + ], + "commit": "38c3a0a2c2f9b99e0426334c7c6a9320cc6e39a5", + "sha256": "1rp9hyn9bshp4wjqgr8rpgjabyp86f3905ghpf5nnc4w4dfgq9vk" + }, + "stable": { + "version": [ + 1 + ], + "deps": [ + "dash", + "dash-functional", + "org", + "s" + ], + "commit": "d1054754d0701296bc0cde1fb022619b1f38dfde", + "sha256": "1fy1sgj3jg7l6fjl00dxb7npf7x8ldcbs81cs8w4b4ciklp30mzr" + } + }, + { "ename": "org-sql", "commit": "012573a35a302e9bb6f127cf28ac04f93796400e", "sha256": "15alnx74pmr6jc2yx2c1dbpk0fbdzil8bffj7cfj7ywj2xadmzpg", @@ -70937,11 +72279,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20200324, - 747 + 20200508, + 654 ], - "commit": "635ec9901be9d03402dd3d4b11e71f07bf1cf6f9", - "sha256": "1fc0r53209igflfxm2dncpmdh8zncr40y1ylj1j2pcyrdlghqpvw" + "commit": "38a74456af863e07ab0b838c10830ce796886302", + "sha256": "1zmmv4izv5na0y29a55df1fa309xj25jdvhpwir879pfa15807bl" }, "stable": { "version": [ @@ -71028,26 +72370,26 @@ "repo": "integral-dw/org-superstar-mode", "unstable": { "version": [ - 20200311, - 1848 + 20200416, + 2354 ], "deps": [ "org" ], - "commit": "715a9681d31968807df349280f96932f1a986f37", - "sha256": "0klq0khb59hmkwhay0dln5zhii8mbk3d7rn7rddixrrh5x5ghrlv" + "commit": "09ddc28383d363a4b353348a433e24535b4af0e3", + "sha256": "14w06v76xi4f6hpq6xzicrjjv0b802g5zc9as4mpimfy5gx2xpm0" }, "stable": { "version": [ 1, - 0, - 0 + 2, + 1 ], "deps": [ "org" ], - "commit": "2f9f9d6b21cb54c2ce6af15ab0e3c73e2b962d78", - "sha256": "0q6180qwjpha10zsiw0ni6lanyjwlj8141a6qivfcs8nwczz7nvz" + "commit": "09ddc28383d363a4b353348a433e24535b4af0e3", + "sha256": "14w06v76xi4f6hpq6xzicrjjv0b802g5zc9as4mpimfy5gx2xpm0" } }, { @@ -71247,8 +72589,8 @@ "alert", "cl-lib" ], - "commit": "baa1ce6333157fed3b3799a80e6cf8c73c9e2c18", - "sha256": "04adkz950vvwyzy3da468nnqsknpr5kw5369w2yqhnph16cwwfxb" + "commit": "1e81ea29af1ccc7b4ddb42fe4e3fbfc0adf891b0", + "sha256": "0cqk9q26qby2y1l6x39jfrdrw9x9419mlx2zhndmlb6gv3lv35f9" }, "stable": { "version": [ @@ -71360,15 +72702,15 @@ "repo": "jplindstrom/emacs-org-transform-tree-table", "unstable": { "version": [ - 20150110, - 1433 + 20200413, + 1959 ], "deps": [ "dash", "s" ], - "commit": "0a9bf07f01bc5fc3b349aff64e83999a8de83b52", - "sha256": "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3" + "commit": "d84e7fb87bf2d5fc2be252500de0cddf20facf4f", + "sha256": "16zi7rg3hdfspifr46gbvpnr1rr144a777whr1w3gp6m46xmgzhs" }, "stable": { "version": [ @@ -71416,16 +72758,35 @@ "repo": "mtekman/org-treescope.el", "unstable": { "version": [ - 20200324, - 1959 + 20200503, + 1609 ], "deps": [ "dash", "org", "org-ql" ], - "commit": "cad2aa82e5ca73bd7afc31b7a5e764da5ab716c3", - "sha256": "1jsc39xmli54mcqcdddzyaphmhlamwq167vfr2g133c3p0wx8swh" + "commit": "905029a9e2ce6ed325bb8e10f59dc589c181d148", + "sha256": "11xbm6161rd5kv2bffqw678a7bymclvhpmm1qjxsvmi8bhfk1ls0" + } + }, + { + "ename": "org-treeusage", + "commit": "8868893e4109db9b348a62bc012c89648384994e", + "sha256": "1vxal0a4k348sqpivvahjlchk7w5a02dkqvxpqgjs1rlbs7vfv90", + "fetcher": "github", + "repo": "mtekman/org-treeusage.el", + "unstable": { + "version": [ + 20200418, + 1904 + ], + "deps": [ + "dash", + "org" + ], + "commit": "fe4323bc500e2d949848c75e8f59340971b35562", + "sha256": "0v9zd2lnzvdxz3wqvw0j3bzd7228x6k8dyr7pzmimkl4l26cybqm" } }, { @@ -71436,8 +72797,8 @@ "repo": "org-trello/org-trello", "unstable": { "version": [ - 20200130, - 1748 + 20200508, + 1705 ], "deps": [ "dash", @@ -71446,14 +72807,14 @@ "request-deferred", "s" ], - "commit": "e8e88239b5130307368f554b96fbf05ff4c207b5", - "sha256": "0kzvyv8rs0fsfbqsvgdjxlfa0qyi7wsdnfjw7c0hbwi25al39zm7" + "commit": "56c519a00c6e3c8f6923cd0460342089d58c41c9", + "sha256": "09028167pi9pzgcb8fpvqgvzviq1fxvgby5lb99wvyy94vjxwnk2" }, "stable": { "version": [ 0, 8, - 1 + 2 ], "deps": [ "dash", @@ -71462,8 +72823,8 @@ "request-deferred", "s" ], - "commit": "c38c36159cdeb2348c4e9ca75246aa9cc1dfd76c", - "sha256": "02gx3kv4mkij69ln8x8wf9n28x17pbb4kv85v78d3lxph7ykqimc" + "commit": "4ddc257fe24e97c01e12b247568581ff255f0e8d", + "sha256": "18y5zdjc7zh4jlwz6k1nl13i721rknqm0vp4mxfnmq0sc5a0qva0" } }, { @@ -71477,8 +72838,8 @@ 20191207, 2022 ], - "commit": "eab07dae119129066624e692c1c75a53b2ab10a5", - "sha256": "1q9g8kza6hv6pv1sjzkl6b4gxcx6fsvv8lk5w7kk9gpws5vjz5bz" + "commit": "61a14d1a8c17930caca5c5daf893cedc9c23c5f3", + "sha256": "0acq8d8vlx3hd405wmi5w36gg88bz1c1crmlxbd2whgi8kyf506z" } }, { @@ -71602,19 +72963,20 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20200207, - 2036 + 20200516, + 1341 ], - "commit": "813c2e7af2ec1dacf037b1f971f070a4f784d2a5", - "sha256": "12dagcvcba3j74grijgibpskr3qc373m25xkp2p86ap81bg58zn8" + "commit": "c8c66a97e9adf84a4778f68e100259eaba67905b", + "sha256": "1h5ivbvzj46zkl3rgvcc0l50bn161g2q17miybm1mk70574q9fwn" }, "stable": { "version": [ 2, - 0 + 2, + 1 ], - "commit": "813c2e7af2ec1dacf037b1f971f070a4f784d2a5", - "sha256": "12dagcvcba3j74grijgibpskr3qc373m25xkp2p86ap81bg58zn8" + "commit": "c8c66a97e9adf84a4778f68e100259eaba67905b", + "sha256": "1h5ivbvzj46zkl3rgvcc0l50bn161g2q17miybm1mk70574q9fwn" } }, { @@ -71656,8 +73018,8 @@ "metaweblog", "xml-rpc" ], - "commit": "821ed77f0982dfeb1df50380931d53e6b7b7036f", - "sha256": "16hrnfz4jp5a672rvgk6ky9xfzvgxx73p5l96wh3x9294vyjd4vi" + "commit": "60eae1c8a7f82fbcc2660d785b33601daaa29f4b", + "sha256": "06ia4ba6c1yph259wr4y5sdkl1ry6pzbwhx807ia675rp0clp9hz" }, "stable": { "version": [ @@ -71683,11 +73045,11 @@ "repo": "tumashu/org2ctex", "unstable": { "version": [ - 20191024, - 610 + 20200331, + 550 ], - "commit": "d4af170f5190dad3aa31ab1cf4c6f087d56ab111", - "sha256": "0m28mxsq1d5ggr8phfn94pb38lj8x3sxykh7hfqbwhphaza3by5q" + "commit": "2e40aa5e78b0562516f46f689e7b74cdf451cc2a", + "sha256": "06ip9663xvygpr484r09v7c55nn0pxmr30455iqpmxi32dwx974g" } }, { @@ -71737,8 +73099,8 @@ "repo": "ardumont/org2jekyll", "unstable": { "version": [ - 20170225, - 915 + 20200516, + 1727 ], "deps": [ "dash-functional", @@ -71746,22 +73108,23 @@ "kv", "s" ], - "commit": "52a19a5d372116262b9d613f4ec8490a3b49e329", - "sha256": "14ld8ip487282if2sil96lfg5wx7632kg71sxhafygphbdl9vxd4" + "commit": "36d7789b7b3dfa2f4739a83692d322b601a0f4ea", + "sha256": "1j1cckvvghz9656bjkdxrc3gsfpz1wjvq3hlh6zblmnlbhhvbsan" }, "stable": { "version": [ 0, - 1, - 9 + 2, + 2 ], "deps": [ "dash-functional", "deferred", + "kv", "s" ], - "commit": "35e11ffa24b140d2e247df195489fca344bd0c08", - "sha256": "089nqbda5mg1ippqnsl5wcx9n1gpnaqhl6kz54n47kivb400bidh" + "commit": "7be4a71ce55f2fdc7fe7f6414f03d58f19d43410", + "sha256": "0cxhmbbznvv9d3nmqfn0ggr164fa6yjbfac9wqi3c58vm3zri00k" } }, { @@ -71816,11 +73179,11 @@ "repo": "kostafey/organic-green-theme", "unstable": { "version": [ - 20200301, - 1916 + 20200510, + 1645 ], - "commit": "9374259e1b22d68f30a1f5376052ab09dbad606d", - "sha256": "13jpfn4sjsw0lssrq0n75085j2g41ppmwky5mq0nyv8j0c0mmqpk" + "commit": "2a88a70a5c2a57150c80d306f2475e351a59039c", + "sha256": "1y3g180q96vx7l8qs0l2jwjv2wbmk6aqzfm2p1h130h05lhgv31w" } }, { @@ -71897,16 +73260,15 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20191205, - 2300 + 20200417, + 1720 ], "deps": [ - "dash", "magit", "org" ], - "commit": "e7cddf39e301c87c36c7de13e429dee74874d5c8", - "sha256": "00s3a8i221didw8phlbvdvihj9pxkq9k9j9vh1g1mzd7cz58dm07" + "commit": "e147f055772cc934fe1f1d8619059badeb647c93", + "sha256": "1q3v22drqbjzzr6d0zdwczz1rq37iyh78k2nk1wirbs5z4ixfyx8" }, "stable": { "version": [ @@ -71931,15 +73293,15 @@ "repo": "tarsius/orglink", "unstable": { "version": [ - 20190919, - 1859 + 20200413, + 2124 ], "deps": [ "dash", "org" ], - "commit": "988ad54db45708b0fe835829d512eb6d5f6cf161", - "sha256": "1mswfbwz7fm9lriab365g7hq8hn85gxcsg8y41by9j0n8hb3hj5q" + "commit": "a5f5da06174d22dc21bbac167a8c2361fa84bf2b", + "sha256": "0sxali4vnqzk6mj0m7d82yr2ixvxxj5lzmxffyznpa7j6yndi2mm" }, "stable": { "version": [ @@ -71963,15 +73325,15 @@ "repo": "yoshinari-nomura/orglue", "unstable": { "version": [ - 20171220, - 1226 + 20200411, + 311 ], "deps": [ "epic", "org" ], - "commit": "ae2a45c19b52e45db7891093a3ff17ba2e51c507", - "sha256": "0h3b37wz4hlk022c0sq7c9p5z3v4n6cljhy8g1qjhnxac8y7mkr0" + "commit": "9d5a8e24be9acb8c55bb4d6aa8b98e30e2677401", + "sha256": "1n2l9acc54sbpbv5d1h2ib9cn7nbidmkvhhlwihqzpvvh7bhjfj7" } }, { @@ -72002,11 +73364,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20190812, - 604 + 20200516, + 1344 ], - "commit": "1a13f7f70357f369e16bfa3038a9fb760cbffb46", - "sha256": "11qygmgvjqc53gy5f3pz0hh5zsam1li8vbyr42wflfkv6cwxypdb" + "commit": "7426df13512f5eee921c26aa68cfc6e32e3061fc", + "sha256": "18n2xzwpqq8159qwqy7hy0b93a5qxdb5rjh0ls4jk8lmahk5jrqk" } }, { @@ -72017,11 +73379,11 @@ "repo": "tbanel/orgtblasciiplot", "unstable": { "version": [ - 20151215, - 2151 + 20200411, + 711 ], - "commit": "cd91f6ae26a7402e192a1f4fd6248f5797edf19e", - "sha256": "1vbnp37xz0nrpyi0hah345928zsb1xw915mdb0wybq1fzn93mp1z" + "commit": "59618630205fc8c0fcc74fb34c4581d9712a5181", + "sha256": "1qx6la70cdxr556d2kna4ra76kdliaqkwm97jahd20nhs2izvpl1" } }, { @@ -72032,14 +73394,14 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20150121, - 2246 + 20200512, + 721 ], "deps": [ "cl-lib" ], - "commit": "ccf5e0d96e053dc289da39a048715fcf36835ff2", - "sha256": "06nc82wiha11i79izqil53dkd95fl55nb5m739gyyzvx3sksb0dg" + "commit": "5bfe2f6d53798d0fe071f9990e03d7428623e4a7", + "sha256": "16xcps2qlzh5z8c20sl0cnc0mlj8153vk6j1dnfd6l3a6kni88af" } }, { @@ -72074,16 +73436,16 @@ "repo": "gregsexton/origami.el", "unstable": { "version": [ - 20180101, - 1553 + 20200331, + 1019 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "1f38085c8f9af7842765ed63f7d6dfe4dab59366", - "sha256": "0ha1qsz2p36pqa0sa2sp83lspbgx5lr7930qxnwd585liajzdd9x" + "commit": "e558710a975e8511b9386edc81cd6bdd0a5bda74", + "sha256": "0ycjbsn03cjzx6adabcvi1j7f92yhx3xjzj3xc68m1hw9r2f2gzf" } }, { @@ -72100,8 +73462,8 @@ "deps": [ "reformatter" ], - "commit": "5d991188b511e9d650c84fc578f2f49c9f995693", - "sha256": "1x5nx064cgcjj99xwp7drcvhfmmav1f72jnwwlxllhas2is458m0" + "commit": "3141f9b65f8a68b4cbd6df4e08c64d98ce3aa3c9", + "sha256": "1j7q9rmcn6fkhbcvfh8w4y9dir2y0hhhqmjpsafs8m4zm1rvffbn" } }, { @@ -72367,11 +73729,11 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20200103, - 1239 + 20200429, + 2055 ], - "commit": "d6247aaec44f60a9bd161c1d56960f80ab314a49", - "sha256": "0mscnbbv6cap818zhzz3ig6ychrw0zw84zyl2g1rksir0qj4hznf" + "commit": "b616b0d90a7c3d7b87bd164f2d213a5e009c39eb", + "sha256": "1b2mjzym8x42rz3qvmr0va21naw3aycvc2blfxx91i7pwpp8n3qg" }, "stable": { "version": [ @@ -72391,11 +73753,11 @@ "repo": "abingham/outline-toc.el", "unstable": { "version": [ - 20170730, - 1130 + 20200401, + 1208 ], - "commit": "31f04bea19cfcfb01a94d1fd2b72391cb02b7463", - "sha256": "1pqz2ynw51n3f7d9hknz80d42017lccsggkg13zqmn51wkjpc48j" + "commit": "81d373633b40628cc3a6b6fb534fd7730076bcdb", + "sha256": "1ad6bxa5x95n6i1197p13qy5fgzn1pslwbzqsf4rfy9bvr49g6q3" } }, { @@ -72538,11 +73900,11 @@ "repo": "myTerminal/overcast-theme", "unstable": { "version": [ - 20190326, - 1646 + 20200425, + 1601 ], - "commit": "afb8098ad2234a65ec614f4028f7cf2555134f46", - "sha256": "1fp8awdhpr92fygp6pbx9bdnkc1amngbwsr6c2haj7xb8717zckj" + "commit": "e02b835a08919ead079d7221d513348ac02ba92e", + "sha256": "0fy8739fbhmixgjxgd1j5v2rjkwhsqac5kczx3mdjlfd2w55k3h7" }, "stable": { "version": [ @@ -72595,14 +73957,29 @@ "repo": "anticomputer/ovpn-mode", "unstable": { "version": [ - 20191214, - 310 + 20200509, + 236 ], "deps": [ "cl-lib" ], - "commit": "8457f72de59929d6c176883e92d1a706163d3170", - "sha256": "0qcinx4gpfzngirwfis7byrdbgbwk3pak7f8mx5fsbcdnybkk8sj" + "commit": "3fb9b09506f06cfc7678a93b5401f49d2bf538bc", + "sha256": "099pa85v3jqrfk3frkj03xbxcli8gfimaz17dn3a8p6wjcrn3w6v" + } + }, + { + "ename": "owcmd", + "commit": "13e6df2397380eba31ecbf4a7c1214dedaf9cfad", + "sha256": "0lg6mk5bmfkiifzxz4ijr10nibr5zcbfxzy9cvg6bnzxns6nhgq5", + "fetcher": "github", + "repo": "fishyfriend/owcmd", + "unstable": { + "version": [ + 20200427, + 633 + ], + "commit": "cdd2280f34328f65fe470046c928b0018914584a", + "sha256": "15601vbng2vn45zcdp51vkgycfpcfkaw0xidrq13rg5544x9h7lz" } }, { @@ -72613,30 +73990,30 @@ "repo": "aki2o/owdriver", "unstable": { "version": [ - 20200326, - 1608 + 20200410, + 1901 ], "deps": [ "log4e", "smartrep", "yaxception" ], - "commit": "a243051365eb7ac0d1845c8b468b90510998f66e", - "sha256": "05a3s01y3sls6as28wvd1y5pmasqlz9k597yba10c0spxvlaijcn" + "commit": "3c52a7b11c8275fdb2e4cf98f68f2a48ad09a3ae", + "sha256": "1lxvcbpzpzs3vkgg4pif3k89ddmj5mamk2q18wc3gx0czs6v301d" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 0 ], "deps": [ "log4e", "smartrep", "yaxception" ], - "commit": "a243051365eb7ac0d1845c8b468b90510998f66e", - "sha256": "05a3s01y3sls6as28wvd1y5pmasqlz9k597yba10c0spxvlaijcn" + "commit": "3c52a7b11c8275fdb2e4cf98f68f2a48ad09a3ae", + "sha256": "1lxvcbpzpzs3vkgg4pif3k89ddmj5mamk2q18wc3gx0czs6v301d" } }, { @@ -72798,14 +74175,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20200305, - 1413 + 20200501, + 1317 ], "deps": [ "org" ], - "commit": "1c1e3ec46785d93f4de2e71fc32604bd7c0fed40", - "sha256": "1cgwpj9x10z6y9ykbma39xakzisly5jhp5pkdiwrc5zq5psr2ddx" + "commit": "8f36181977377383cb54803651d93b24e370122d", + "sha256": "1rxkbkgvylwnh5n6zc6hiqa9zhxwc8j1if7mxribw44xrg3150a1" }, "stable": { "version": [ @@ -73112,14 +74489,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20200327, - 1636 + 20200429, + 1533 ], "deps": [ "org" ], - "commit": "ea8b5021702d8f12aa5285fb2a8561ceaeb1332e", - "sha256": "1fppdz2r8zig6r1v1n82bxmxyn2f6i1rjv9qll4n866gahkknlkr" + "commit": "e8b2801ab2210187ab1cfacad09bb07e4b61ca56", + "sha256": "0xa34y0v6z78gpida59jc3gzng68n0has5dnkccv4vdxi4yb6ii9" } }, { @@ -73417,14 +74794,14 @@ "repo": "UndeadKernel/pacfiles-mode", "unstable": { "version": [ - 20181028, - 1744 + 20200418, + 1806 ], "deps": [ "cl-lib" ], - "commit": "ff58f387e0f85ca20c4c9f119bf13303bf8b5a76", - "sha256": "1my9qhnla61wgrhf0izjx0kyjrxwyz3cfh3xp80mmnxhxrrf21kl" + "commit": "222ae3f540cddee306067c83451cfece1112c09e", + "sha256": "1ps6blv2jhm4i2gr1fbsr1lii9cpr99prhwnxvhxxxy08c9b6mrx" }, "stable": { "version": [ @@ -73500,14 +74877,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20200313, - 2359 + 20200426, + 2253 ], "deps": [ "cl-lib" ], - "commit": "90e514432661f750f2a0c9fe17f09cdcc8e4e82b", - "sha256": "0p2vzsad8biczhj80y5bif5p0agcg8id4qngvi0lmxvx8i8wvky0" + "commit": "5fe5156491145c667286cb92be4191a348eaa31e", + "sha256": "1r9ir8jqfi2sqjjx9yxs4phxrpfw8x35nm58xfrqsjw158dspzai" }, "stable": { "version": [ @@ -73544,15 +74921,15 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20200313, - 2338 + 20200419, + 406 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "0e27abf2e65340dc1523b27b923650b863472a5a", - "sha256": "1vrnriijm4c8129ndcimcai2x1mfybp2arkb1x3jpb9ak83ck9px" + "commit": "495da67557d35acb146ec1f38f7576126aec6bfc", + "sha256": "0nb83rs2hb097pvv63pkvdlyqx136mrcbzdjkyskwg3rd3rwvimq" }, "stable": { "version": [ @@ -73581,8 +74958,8 @@ "deps": [ "package-lint" ], - "commit": "0e27abf2e65340dc1523b27b923650b863472a5a", - "sha256": "1vrnriijm4c8129ndcimcai2x1mfybp2arkb1x3jpb9ak83ck9px" + "commit": "495da67557d35acb146ec1f38f7576126aec6bfc", + "sha256": "0nb83rs2hb097pvv63pkvdlyqx136mrcbzdjkyskwg3rd3rwvimq" }, "stable": { "version": [ @@ -73855,16 +75232,16 @@ "repo": "abo-abo/pamparam", "unstable": { "version": [ - 20200309, - 1703 + 20200410, + 1155 ], "deps": [ "hydra", "lispy", "worf" ], - "commit": "ed730f17074cb12a8fb9a0daa852d1abbfb34372", - "sha256": "0shzsgs5ds4lzw1fv13vdphbhxyqad5s7jwk5zqa5wg42sidxq3r" + "commit": "f9d83bbf5eb883bce6873dd6fd97484b6805215c", + "sha256": "0av69k6psrpmyadm2r0frwdbqyvpa4flzkrmi88w0vx3g0cxiv2k" } }, { @@ -73875,11 +75252,11 @@ "repo": "sebasmonia/panda", "unstable": { "version": [ - 20200317, - 1932 + 20200424, + 2206 ], - "commit": "2a17e3e5c57132777cfef9704565f6bfa129dbe2", - "sha256": "02aysxdb660dh19l07g6h2qvckrrd4aj79lryd6h7j3in1s0sn05" + "commit": "bdd9f80283d8ae4a69f8789e5f18b1560b94fe43", + "sha256": "1ld4igmmjk7p7dxm0mnfks3k0cqpqjxrvlmjdi0m7w11ba8dsah9" } }, { @@ -73992,11 +75369,11 @@ "repo": "cadadr/elisp", "unstable": { "version": [ - 20190124, - 1828 + 20200510, + 5 ], - "commit": "eab07dae119129066624e692c1c75a53b2ab10a5", - "sha256": "1q9g8kza6hv6pv1sjzkl6b4gxcx6fsvv8lk5w7kk9gpws5vjz5bz" + "commit": "61a14d1a8c17930caca5c5daf893cedc9c23c5f3", + "sha256": "0acq8d8vlx3hd405wmi5w36gg88bz1c1crmlxbd2whgi8kyf506z" } }, { @@ -74063,14 +75440,14 @@ "repo": "ajgrf/parchment", "unstable": { "version": [ - 20200322, - 1714 + 20200514, + 2047 ], "deps": [ "autothemer" ], - "commit": "bf158a064e4a00a47d24ed0c1725204ce6675064", - "sha256": "1vqvfxrwrlmnmp0bidagphajwlxs6kf480xajkpz590m0zf1xfp3" + "commit": "4fa14adbc043497fc942568fdb78505ca549e5b7", + "sha256": "1ply18yzdf1lxyia8knn6fk8wb4yzwicgdiscr2z87bpk8p5d2pb" }, "stable": { "version": [ @@ -74324,11 +75701,11 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20200303, - 2324 + 20200513, + 2352 ], - "commit": "6537b4d2a8cf34455b769b95dfd65de6a4a0e1d3", - "sha256": "1gy5rqnfnyhfa44vxy7qqqh7xada1d1gg34msczcalhhy6lm59if" + "commit": "3497b6068d78ae15ba1eaf94e4315d18e9ae6b00", + "sha256": "0vf9qrkc4dna2f9l0ry1qhfxy7yw1dlilgh38dlp42kqdyp5qny8" }, "stable": { "version": [ @@ -74408,15 +75785,15 @@ "repo": "clojure-emacs/parseedn", "unstable": { "version": [ - 20191113, - 831 + 20200419, + 1124 ], "deps": [ "a", "parseclj" ], - "commit": "f42ff988338484815ccd925c8f83a32c5d52319b", - "sha256": "0cx1zf82mjwlnj6znas8b94ws1f3n2h0imyybi9qirvsp90qd4sl" + "commit": "92bf875962e62f8c6370b56991d546f122536c6b", + "sha256": "0xli6cf0fzydnd683v3hk5kfsbxwh83s916fd64j8ak0wzjnlsfr" }, "stable": { "version": [ @@ -74556,8 +75933,8 @@ "s", "with-editor" ], - "commit": "98193d3bbb3538eda457d0db4ccccbcc4b04ce3d", - "sha256": "133b2m49jd2bw0k5f77y8gc2w53vhp3rym5mzqx7mlfgssgd795k" + "commit": "07b169ec32ad6961ed8625a0b932a663abcb01d2", + "sha256": "1dl3bck16zwhpspjrms11dknqgadnmpjqhcplkvv3v4f7vbnij6v" }, "stable": { "version": [ @@ -75050,6 +76427,21 @@ } }, { + "ename": "pdb-capf", + "commit": "f0b7e12b9f49dc4ed1cc5a6893accc882896f334", + "sha256": "0656a2s8r8dg11in8r5xx984lcxd5g5l3x6vnha50s0c4nx93x3y", + "fetcher": "github", + "repo": "muffinmad/emacs-pdb-capf", + "unstable": { + "version": [ + 20200419, + 1237 + ], + "commit": "2f4099aa1330f87df4e9cd526de057ee9b71de6c", + "sha256": "0fdzhsz3784lf50mdabz9h2b6992cab2nnn4xv7rx2a8hsyyq1mq" + } + }, + { "ename": "pdb-mode", "commit": "6aee132aa24322fe1ac88ae17ee6e77ae1ec8d11", "sha256": "1ihkxd15kx5m5xb9yxwz8wqbmyk9iaskry9szzdz1j4gjlczb6hy", @@ -75072,15 +76464,15 @@ "repo": "politza/pdf-tools", "unstable": { "version": [ - 20200214, - 536 + 20200512, + 1524 ], "deps": [ "let-alist", "tablist" ], - "commit": "0159cb1ab36f75879151e5ea24a6918ef58e50a3", - "sha256": "1ai8g6n3d40mcr2zx4h8ih3b1fxx6xzwbr0h3m8yh32vjj5qlwrp" + "commit": "c510442ab89c8a9e9881230eeb364f4663f59e76", + "sha256": "17z3cpn76g9dp62drjrgrqpp1bgf4gl5k5gspylskpvd4kj4bq4d" }, "stable": { "version": [ @@ -75276,24 +76668,6 @@ } }, { - "ename": "perl6-mode", - "commit": "4e912dccdee12f745272d26ea10d5f106a27cabc", - "sha256": "0r5q2nggb9kbjcdfv81d7sm41jqz040j9z52fnck4b9mlz2dy6d0", - "fetcher": "github", - "repo": "perl6/perl6-mode", - "unstable": { - "version": [ - 20180619, - 1159 - ], - "deps": [ - "pkg-info" - ], - "commit": "88de065795d6863b23b6042576b9e90f8cbf8798", - "sha256": "0m8kc8j1rwy30439k4l5f351jkfjjp38mjm891ax8ghp9zk5pr7h" - } - }, - { "ename": "perlbrew", "commit": "24bd9c2cd848f5003a244a7127e8fc5ef46bdca4", "sha256": "1qadwkcic2qckqy8hgrnj08ajhxayknhpyxkc6ir15vfqjk5crr8", @@ -75497,25 +76871,25 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20200326, - 2358 + 20200513, + 1416 ], "deps": [ "cl-lib" ], - "commit": "2ac6aff0569923993a251beddb3046ec44841408", - "sha256": "1z05vk85zbq4pj1xs69p5x3hwdshl829y28d5j2ckivl313p4had" + "commit": "1fc13646623f42e1d70cf1f651c4b154e12070ca", + "sha256": "1gdacw1gkng1dhm12lhfssmac0fijsh3wpbvcmsv2jz3gpnjin1g" }, "stable": { "version": [ 2, - 6 + 8 ], "deps": [ "cl-lib" ], - "commit": "2ac6aff0569923993a251beddb3046ec44841408", - "sha256": "1z05vk85zbq4pj1xs69p5x3hwdshl829y28d5j2ckivl313p4had" + "commit": "1fc13646623f42e1d70cf1f651c4b154e12070ca", + "sha256": "1gdacw1gkng1dhm12lhfssmac0fijsh3wpbvcmsv2jz3gpnjin1g" } }, { @@ -75567,19 +76941,19 @@ "repo": "Alexander-Miller/pfuture", "unstable": { "version": [ - 20200113, - 620 + 20200425, + 1357 ], - "commit": "fbecd1562b34fcd15563b7cc00d98e5af0d7e43d", - "sha256": "1imqavzc0isba3yh128jzsy27x2983sjiqkf6q2xw43mbjknl8dy" + "commit": "d7926de3ba0105a36cfd00811fd6278aea903eef", + "sha256": "1chpin5277vbl2xvsl04pzzk7a9dbcvclibm2496gz6yvd19pwsf" }, "stable": { "version": [ 1, - 8 + 9 ], - "commit": "fbecd1562b34fcd15563b7cc00d98e5af0d7e43d", - "sha256": "1imqavzc0isba3yh128jzsy27x2983sjiqkf6q2xw43mbjknl8dy" + "commit": "d7926de3ba0105a36cfd00811fd6278aea903eef", + "sha256": "1chpin5277vbl2xvsl04pzzk7a9dbcvclibm2496gz6yvd19pwsf" } }, { @@ -75748,10 +77122,10 @@ "repo": "zk-phi/phi-search", "unstable": { "version": [ - 20191106, - 233 + 20200510, + 905 ], - "commit": "2a8fe73aa9ef014e27e202964c5a4f4e94ef24b2", + "commit": "f567f048b3892062c5528b42d4f6af4b313721a3", "sha256": "15yc5nlfx2z48n8p7pb6qzgbzfpnapb83w5xx6z8lq0mywf3k5jj" }, "stable": { @@ -75979,20 +77353,20 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20200323, - 1215 + 20200507, + 1755 ], - "commit": "b5d99881002e3c62ebe874ad9f48474afc16c62d", - "sha256": "0pq7nccmrbvrf7120d48aqymdwh5jgjvzwi2820hdw8j6b7prm4h" + "commit": "a7687e454adc2e6c1e13d90beac122af32169eb8", + "sha256": "1nlikgyflksdzbd8k2l3f0nmv3gisj145fi45kw971ianihq476x" }, "stable": { "version": [ 1, - 22, - 2 + 23, + 0 ], - "commit": "433864b0755d99ec6b496ed45476c1e2eca0228c", - "sha256": "1r4bpyavlndd4c78cv5cc97bc0gkd4cggiyz4kd2vg6zlyc1nld3" + "commit": "08c6e0f6719fafa60cf76f741d83524fd84163d6", + "sha256": "0wnkcxg6djy4jvxhshiy1iw6b5cf79pjwjhfd1a060cavhfm4v5c" } }, { @@ -76071,8 +77445,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20200324, - 1347 + 20200405, + 1544 ], "deps": [ "async", @@ -76081,8 +77455,8 @@ "f", "php-runtime" ], - "commit": "31fe2ea4dbd5c2f23efd6a4ec2ec881a4ced6b05", - "sha256": "0j52n0vs85q7zz5xfqw4rgrjjpr7mzfiqbzk7vwkcdmpnax608w5" + "commit": "860d7e8784b261ee71deba354d01c3038cd777ab", + "sha256": "1d3fijh11g70xhx3a47l75mrp64bvkk7hh9lg83nl30qhn2vrbn3" }, "stable": { "version": [ @@ -76136,20 +77510,26 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20200122, - 1256 + 20200411, + 531 ], - "commit": "a1c30ca634107551c20c846b5316ca5697adb06d", - "sha256": "0b7rnzk1zkrzh978bmh2dsy78f0sb4ia1w06khyqiby52m27q9k1" + "deps": [ + "php-mode" + ], + "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101", + "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w" }, "stable": { "version": [ 0, - 3, - 3 + 5, + 0 ], - "commit": "535e172e1c561bc7b8c706b4e03bbf71689bd83a", - "sha256": "1hn1rdgymv81rm8nkibnc5jazgjrx3sz4w1lin85rgypzbfaf6wk" + "deps": [ + "php-mode" + ], + "commit": "bf9e82a63f2ccb12af02c9e79a83e7989eeb7cb1", + "sha256": "15kv5xv6lcfgf048wr2zsnpvrplbxypy3wq56zvrzbq18hwprqg1" } }, { @@ -76351,25 +77731,25 @@ "repo": "davep/pinboard.el", "unstable": { "version": [ - 20191203, - 1015 + 20200402, + 919 ], "deps": [ "cl-lib" ], - "commit": "9351a2320f1e75896f56032959c7bcbf9d9aa560", - "sha256": "080fzpr7is05cb8fj0rzhfc8pmb1rwfmkqnydj36d56da1ndrfmw" + "commit": "7c57f20667ead2bb27ab1d0a03307c28ea728bd9", + "sha256": "0d9z1hr2082sbg4dlmarksh598xd92w7c09xmdjyn1yqm39gsljw" }, "stable": { "version": [ 1, - 2 + 3 ], "deps": [ "cl-lib" ], - "commit": "e14dd43cf74f254a898ae1c698a97d58734fc1a8", - "sha256": "0ljxvp9yppnmy1lnnipqqbk09bmay523haa8h0gnfnrl02jwgs91" + "commit": "7c57f20667ead2bb27ab1d0a03307c28ea728bd9", + "sha256": "0d9z1hr2082sbg4dlmarksh598xd92w7c09xmdjyn1yqm39gsljw" } }, { @@ -76673,11 +78053,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20181216, - 1331 + 20200425, + 616 ], - "commit": "e30e37730b5f30bc0dd5b9328fbf4cb3e6f46fdd", - "sha256": "1ijx067hlbr4yz9b9h58pwlqd4rgjgm27f5s1f9f3rwb249s36s1" + "commit": "bc22301198b3f581d89352510e847454fb1cb9ff", + "sha256": "11il65myybgfj30psicfgqpjwwpa6hwapf55d497x8kbixx2kpg1" }, "stable": { "version": [ @@ -76696,14 +78076,14 @@ "repo": "abo-abo/plain-org-wiki", "unstable": { "version": [ - 20191013, - 1833 + 20200507, + 2135 ], "deps": [ "ivy" ], - "commit": "887717c184fb22dd219c78851303a8e5b917f877", - "sha256": "0wqxp46zvwswda644mnr92qxyyvakvl2l8w61sg6hy37pwfznx73" + "commit": "99cd7f90e5c741cf3327f464852203baee7c488c", + "sha256": "1s4ida511fi6mbrckn9kvssr4vmiy4w5qkkby7s1jlqvlydnsa8m" } }, { @@ -76983,11 +78363,11 @@ "repo": "flexibeast/plisp-mode", "unstable": { "version": [ - 20190914, - 513 + 20200427, + 405 ], - "commit": "02738af25707e39d8a608b09a24173bb05f5be9f", - "sha256": "133wm5fd91z9k3zpflb455nglpgy1dqyz3mz2s694xyppw4rvkia" + "commit": "59e682d77569b04e9fc80af9c4b05e4a997dbcec", + "sha256": "10v9j7sv5q9ywq8bdj2g1j262ggsy3hwqybn6rnrcim5v1f7a51r" } }, { @@ -77366,11 +78746,11 @@ "repo": "dgutov/point-stack", "unstable": { "version": [ - 20170808, - 1658 + 20200427, + 107 ], - "commit": "76e17311e3a810314c7d31ac46dc55450ff30fa2", - "sha256": "1sp3djnyg3f5ci43m4pi0f6clblrz5lrnzc415r87csbavqqgv2z" + "commit": "cddcea2c91038710c245819b3cda2dd739726134", + "sha256": "1qjf13zmh0gf90knd73b6fyn3bhwjzn4k1w1xpa1ngnh6v233da9" } }, { @@ -77718,11 +79098,11 @@ "repo": "polymode/polymode", "unstable": { "version": [ - 20200316, - 1314 + 20200411, + 915 ], - "commit": "44265e35161d77f6eaa09388ea2256b89bd5dcc8", - "sha256": "18ssl2h861dm2jkd3df6wkfr48p8zk337dbvpq5522kia7fq1lbn" + "commit": "2a61fb6d3e805bc0e4ca7b6510510a955c6bfb6a", + "sha256": "0cphikjz9hwij1k41radyar6nh7md8v98qwn2j9lzcbyz69hrvaq" }, "stable": { "version": [ @@ -77742,14 +79122,11 @@ "repo": "TatriX/pomidor", "unstable": { "version": [ - 20190523, - 1414 - ], - "deps": [ - "alert" + 20200513, + 1054 ], - "commit": "590e64d316d9210bd00cb4eb39d2f07ddc16809a", - "sha256": "0001k4p09il5f20s0jgyi96wzslfcgv3y35wfxj771gixlacnrhi" + "commit": "308a438550173685cb852a8aadef75c25701513e", + "sha256": "1w4sds6h6q80drqzkmiz51nvy942a88s99zfrvmyvfrvwv7wlqqb" }, "stable": { "version": [ @@ -77801,14 +79178,14 @@ "repo": "ponylang/pony-snippets", "unstable": { "version": [ - 20160205, - 411 + 20200418, + 354 ], "deps": [ "yasnippet" ], - "commit": "b921bd943b528f04d4293625b28fd2d4a013a1bf", - "sha256": "183vml7090w1fx99rz9d8qjfbf089wqilyflk0512xz8al3gcd8q" + "commit": "115a0d5066f89554bee9cb1045bcda5a18ebd441", + "sha256": "1g11w52bf724zwwsvrcylk3ndjci2cnbzing77c91psz6d7zjkvw" }, "stable": { "version": [ @@ -77831,26 +79208,26 @@ "repo": "ponylang/ponylang-mode", "unstable": { "version": [ - 20180804, - 1521 + 20200510, + 200 ], "deps": [ "dash" ], - "commit": "ea98ba541b4a439accc126f17120c5425f741b67", - "sha256": "0pl7hpsc3az2zd80r77qgxajbvwcmq7b5dcyphv7bfvlimgby7i3" + "commit": "d72e2a53b4b542ad8adf1807d7b94a7788ab00cf", + "sha256": "1k13fpnd40lpg90vgck28cxfg6i2m5y2pagkw27zaqcd1h8n7d59" }, "stable": { "version": [ 0, 0, - 11 + 12 ], "deps": [ "dash" ], - "commit": "963abdcdb398b71fb13a4f7d2ffde23eb20e2a23", - "sha256": "1h0y6x4h7higwdq569h2lk0iddd23c3csqjk7y5phvc0lq812xs0" + "commit": "d72e2a53b4b542ad8adf1807d7b94a7788ab00cf", + "sha256": "1k13fpnd40lpg90vgck28cxfg6i2m5y2pagkw27zaqcd1h8n7d59" } }, { @@ -77861,28 +79238,28 @@ "repo": "aki2o/emacs-pophint", "unstable": { "version": [ - 20200322, - 737 + 20200420, + 1429 ], "deps": [ "log4e", "yaxception" ], - "commit": "2c43423c87c6892b0fd16e3749e021a3743ee708", - "sha256": "0ila3vqv5wkna11qmm221iv1nzafnvffda19mqmv8fpl2iv1197s" + "commit": "5e13da4578ae7ba00e6f7bae31eb546d713cc19d", + "sha256": "01bwfswzzrjxrjaqysaqnav7h3swwyigxw7nj0cgrm3w8cp1y2a8" }, "stable": { "version": [ 1, - 1, + 3, 0 ], "deps": [ "log4e", "yaxception" ], - "commit": "2c43423c87c6892b0fd16e3749e021a3743ee708", - "sha256": "0ila3vqv5wkna11qmm221iv1nzafnvffda19mqmv8fpl2iv1197s" + "commit": "5e13da4578ae7ba00e6f7bae31eb546d713cc19d", + "sha256": "01bwfswzzrjxrjaqysaqnav7h3swwyigxw7nj0cgrm3w8cp1y2a8" } }, { @@ -77914,8 +79291,8 @@ "deps": [ "cl-lib" ], - "commit": "80829dd46381754639fb764da11c67235fe63282", - "sha256": "05j7m6mqp6hr6225blsipnp2qcncwl09f52niya5334ibqzbvvlk" + "commit": "4839797cd1db25be6f3f98bc8d401b6c2af01f9f", + "sha256": "1sxzv4zdmyra6b6nicnng0zpixlpxnczhq0qjyfzxvvhks7jyyf3" }, "stable": { "version": [ @@ -78096,30 +79473,30 @@ "repo": "jcaw/porthole", "unstable": { "version": [ - 20190721, - 1428 + 20200404, + 1454 ], "deps": [ - "elnode", "f", - "json-rpc-server" + "json-rpc-server", + "web-server" ], - "commit": "0e73b8e527cfc9ecba2fa4f88382f588fb4a300d", - "sha256": "06nf12cvxk2dxqljrga59vp8wkvsif1mm3ahvy1nbjsq6s8zryq4" + "commit": "9e68b419acf9245208f8094e10041b7f04511473", + "sha256": "0kaf00924jg50l2zdhyf1lxsh44nfp4zbc23wxbir45xdx9rzl3z" }, "stable": { "version": [ 0, - 2, - 5 + 3, + 0 ], "deps": [ - "elnode", "f", - "json-rpc-server" + "json-rpc-server", + "web-server" ], - "commit": "481a3a247586417b7643d393113ff8faf95b327e", - "sha256": "1gdywyb1vq7i983d4bdhwdkk0vk0x09rms83xyk4j75qlqb05vp1" + "commit": "9e68b419acf9245208f8094e10041b7f04511473", + "sha256": "0kaf00924jg50l2zdhyf1lxsh44nfp4zbc23wxbir45xdx9rzl3z" } }, { @@ -78154,20 +79531,20 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20200319, - 907 + 20200426, + 819 ], - "commit": "c15800a8388696474fe9f8466fce1b40735b9304", - "sha256": "14xjly5cqziqb0gnklsgg28vimdrpq8273z2inf1c0jnak8x2vzn" + "commit": "093b29a53cbeda6d637ccc9ef4dfc47123e79b9e", + "sha256": "0wca1w667h930dyi3hm1kqiqapggnwbgqjbxiwpgj7l773s7xdbw" }, "stable": { "version": [ 0, - 6, + 7, 0 ], - "commit": "9638b9d9cf8b9727a13c86f70b5d33bf938497a5", - "sha256": "12r1as9lqqc6anckq455dqv8dbqahnbdzj437i11053wv33cv5vd" + "commit": "83b4d39fdda34355c01aecc22677f7376ae0f013", + "sha256": "0cjrl4xgs70hbw1a1mqkdmpcmrxaakw8csrz365c31vj14nii0ax" } }, { @@ -78372,11 +79749,14 @@ "repo": "conao3/ppp.el", "unstable": { "version": [ - 20200318, - 806 + 20200418, + 1551 ], - "commit": "bfb9ddfbc124b8b97d7a12610947b76794c0fd06", - "sha256": "1632y0vaxv043w4js5jpd9zr36bzy9pwxnhmlh44hmkvgfw07qvn" + "deps": [ + "leaf" + ], + "commit": "27683aa4a0df67b4539bcaa2e82d865023cf1fae", + "sha256": "0azqpmlz6r2amklzrgi0wgmy89fbkz0kkpikgf5gccfmks5pij6y" }, "stable": { "version": [ @@ -78434,19 +79814,19 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20191224, - 220 + 20200412, + 1607 ], - "commit": "a194852e8022762843052e58a9d0fbdaa1df0fe5", - "sha256": "0da4s32fza42vdiqhh7cdim08by5i4909q93ivxkmgrmqfgdvz0p" + "commit": "3ab7605d997fb8337bf5ded2ad960b98ac0e1fd7", + "sha256": "081v916gnjvx2rzjbqkqhdwijz57w7iryxzg71729gwvavs25lsv" }, "stable": { "version": [ 4, - 0 + 1 ], - "commit": "ad9fbe8a17fe74b27a39bcc034f3da1865663387", - "sha256": "008hxy1vasnyz36wwg44gikpi80ng75hj85nrswk60b7z7cznbmr" + "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0", + "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3" } }, { @@ -78622,25 +80002,26 @@ "repo": "alphapapa/prism.el", "unstable": { "version": [ - 20200315, - 1926 + 20200407, + 1148 ], "deps": [ "dash" ], - "commit": "636059b6ca21d7dd2d46776d799f94b476c62ee2", - "sha256": "014zvdqizjqp1cxs8a45nj2nfpvjsfmls41780pjdvzvrvyq16p0" + "commit": "b618f2cea2dbf7c13d8b4fec1760c346eb9ab036", + "sha256": "1fn6514ii2z1xbjzmp0h1mhxl1yaqqk4n6zgswhxdywni34cb6hs" }, "stable": { "version": [ 0, + 2, 2 ], "deps": [ "dash" ], - "commit": "636059b6ca21d7dd2d46776d799f94b476c62ee2", - "sha256": "014zvdqizjqp1cxs8a45nj2nfpvjsfmls41780pjdvzvrvyq16p0" + "commit": "b618f2cea2dbf7c13d8b4fec1760c346eb9ab036", + "sha256": "1fn6514ii2z1xbjzmp0h1mhxl1yaqqk4n6zgswhxdywni34cb6hs" } }, { @@ -79035,14 +80416,14 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20200329, - 1908 + 20200507, + 650 ], "deps": [ "pkg-info" ], - "commit": "56e18fcefa2f286edfec98853189985823d0e53c", - "sha256": "0iq93ghwj96xxfsa5s90g36ngwpa92bj91zvkkk40zn9faqkdllc" + "commit": "f650faecf699e4b4659374cf5a949f6927feff3e", + "sha256": "142is55cbyya511zp0yl5d1x6i8mvxqjn8zky4gxif15rmmqrk9n" }, "stable": { "version": [ @@ -79156,8 +80537,8 @@ "repo": "asok/projectile-rails", "unstable": { "version": [ - 20200203, - 1226 + 20200417, + 1711 ], "deps": [ "f", @@ -79166,8 +80547,8 @@ "projectile", "rake" ], - "commit": "0398d940a201128946f619de842b0d1f9f0fffbd", - "sha256": "0cfrm56bxdwb96xqpdih6hqh61gvc1wal4yp7d7c414j8h0s7d02" + "commit": "11980b2bcb99208888856a9b8666ff329b6f0142", + "sha256": "0crb08byq1i9wcjmcl645wc03p1jadm4f9nd138rii69nzancwfl" }, "stable": { "version": [ @@ -79233,8 +80614,8 @@ "projectile", "sift" ], - "commit": "33b2c9ff964fe53bb55b37429faaa4e903bead7a", - "sha256": "0cb8rcxl0jwpbgz9kk136l2ranficv8lk85fhvly1lpslbjljds9" + "commit": "cdddba2d183146c340915003f1b5d09d13712c22", + "sha256": "0ln87nhq2vhsb0ywn7rp0b3hzms5z7l6cv6dng08yly12r2957if" }, "stable": { "version": [ @@ -79407,11 +80788,11 @@ "repo": "chuntaro/emacs-promise", "unstable": { "version": [ - 20200320, - 341 + 20200429, + 440 ], - "commit": "02c470bd6c7bf4ea4244d304f57997bad37c9bb7", - "sha256": "1sjwwram45pb9bjap6h24m6734qr5yhnai2lqbdvxd0nplfv91ng" + "commit": "ed9b073ee5b0975a35ee15bc12e25e02f796d787", + "sha256": "1mqqsnwkwfg2i6rhx747hcnk725siw6qsxh5yni3l1sfizbyvw03" }, "stable": { "version": [ @@ -79487,11 +80868,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20200326, - 1804 + 20200506, + 1948 ], - "commit": "9196749d55413224355409d55003f7f8c8ba0f79", - "sha256": "17ak2nbgiqwldk6y4cg4qq49hnvzw32jm4m3dqag2smvkl6rjw19" + "commit": "ea62543527e6c0fcca8bbb70695e25c2f5d89614", + "sha256": "0jzyj3a3b9b26b2cksrcby39gj9jg77dzj3d4zzbwf33j1vkvfd2" }, "stable": { "version": [ @@ -79594,17 +80975,17 @@ 20170526, 1650 ], - "commit": "dec4939439d9ca2adf2bb14edccf876c2587faf2", - "sha256": "0kxrgv1pb38lsgpgilaqjlvw6inmlbs8rdrm2bfilzcwwrr92bi9" + "commit": "63da77bc971e08c2241cc1d9e65ede4bf335c421", + "sha256": "0b0shac978n6djxid6z9h4mfb2ah4hc1vvb0rg8rf65gs4cxjzlz" }, "stable": { "version": [ 3, - 11, - 4 + 12, + 0 ], - "commit": "d0bfd5221182da1a7cc280f3337b5e41a89539cf", - "sha256": "00g61f1yd8z5l0z0svmr3hms38ph35lcx2y7hivw6fahslw0l8yw" + "commit": "0dd036d675508a4ecf69e61626fd0c88235a661d", + "sha256": "0ac0v7mx2sf4hwf61074bgh2m1q0rs88c7gc6v910sd7cw7gql3a" } }, { @@ -79718,15 +81099,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20190808, - 1626 + 20200509, + 803 ], "deps": [ "async", "cl-lib" ], - "commit": "3e97267c92b164584e06a6c70ee7491714c7c12c", - "sha256": "15frl618393bc891d0yi3mdxzvbq790a86vfvp3dyd5riz4ddg95" + "commit": "ddeccf7808cf39fedc41cd33204b0ef5fe4253b5", + "sha256": "083srsvnv8ks52qsi6hv02v4j4xlm67bld9ynm8cl8fy500ghpzz" }, "stable": { "version": [ @@ -79806,8 +81187,8 @@ "repo": "fvdbeek/emacs-pubmed", "unstable": { "version": [ - 20200315, - 1938 + 20200502, + 2153 ], "deps": [ "deferred", @@ -79815,14 +81196,13 @@ "s", "unidecode" ], - "commit": "cc5d258ac83650ad6e8043c8c01d9162c2460308", - "sha256": "13n7i80734848by8f0b3z0mqv0rh9x42hglkc8abhmilc0sg4i0y" + "commit": "d781870e2f57e40110e07768289ab81d8554f122", + "sha256": "17d2v7q6sfafk8j1ish053xsmihi4f1hbk53fkkmhwan6sw9c4sc" }, "stable": { "version": [ 0, - 4, - 2 + 5 ], "deps": [ "deferred", @@ -79830,8 +81210,8 @@ "s", "unidecode" ], - "commit": "f6e13137ad7731c8b0eb1720aed48d1a1edf4719", - "sha256": "1nanaj0liilnplh1njbmch7qsa2h7izkc51bpd4hxw6k4bslplqc" + "commit": "d781870e2f57e40110e07768289ab81d8554f122", + "sha256": "17d2v7q6sfafk8j1ish053xsmihi4f1hbk53fkkmhwan6sw9c4sc" } }, { @@ -79872,11 +81252,11 @@ "repo": "flexibeast/pulseaudio-control", "unstable": { "version": [ - 20190828, - 1136 + 20200406, + 752 ], - "commit": "1b844a9b21d549bfe767990b4c611de3bc4e2241", - "sha256": "0fz2ynxxgq3j7hvfmqq24gvbfpc08apz6zw9cjav08r5z04n1xr3" + "commit": "a931533140547510decdc368f39b2d2b97ca725f", + "sha256": "1jvjn9jszjjapi167an49jxcvr88cvgjwykglhp4b8lwhbjfqw76" } }, { @@ -79935,17 +81315,17 @@ }, { "ename": "punpun-theme", - "commit": "77a9edbb36dc9474adb23d356e6c596789aab2a2", - "sha256": "1l7nphh8v7w5w790cwmnp6nw5rciwhgzkvynkrvpiv9chhacx0xg", - "fetcher": "github", - "repo": "wasamasa/punpun-theme", + "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", + "sha256": "10mgyrxz2habhaqyg1g4c5kn13q425j0xpkkdlg10cdfvxfl9d1s", + "fetcher": "git", + "url": "https://depp.brause.cc/punpun-theme.git", "unstable": { "version": [ - 20190928, - 1413 + 20200506, + 1241 ], - "commit": "2f78125609277b2478abdebd8f9d5ee10a823b65", - "sha256": "1sgxrj3igzq86h3whfymxf4qzv9kpvcrlhbvjmnp7fwrplys0n7d" + "commit": "c1fa9f403b100aceac4c2dcb053111b2de701f16", + "sha256": "0y52kgqrnzrsybm2cwdrarjm1y92hambcr4a8nky28bkp5v73a86" } }, { @@ -79956,26 +81336,25 @@ "repo": "voxpupuli/puppet-mode", "unstable": { "version": [ - 20180813, - 1947 + 20200505, + 344 ], "deps": [ "pkg-info" ], - "commit": "7dee1b5a5debac6e56f9107492a413b6c0edb94d", - "sha256": "01isn90h50p5c6cgzwhb1jq8yacj0fxw9ppfqrnynckg6ydpvg74" + "commit": "0e2e32a3b1644edd8010bd3d44e83def683348b3", + "sha256": "082r71wn5klihv8npc8qsvsyw4jyib5mqpnqr029kv7cvlcyfghk" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ - "cl-lib", "pkg-info" ], - "commit": "d943149691abd7b66c85d58aee9657bfcf822c02", - "sha256": "0xr3s56p6fbm6wgw17galsl3kqvv8c7l1l1qvbhbay39yzs4ff14" + "commit": "73ea35bc7a3ad663c5b73f65cb6377eb0ae11d6f", + "sha256": "0c5q8qmbligzjsn05di4wh6ggpd3944j4yqb78vzd441b8ssq70i" } }, { @@ -80280,11 +81659,11 @@ "repo": "mattharrison/pycoverage.el", "unstable": { "version": [ - 20190607, - 2004 + 20200513, + 2047 ], - "commit": "01bd47171eefcab2e19d7cffd9a2dd3bd9bd6812", - "sha256": "1c7rdx5a7za0yg9c58255p4spq3zlc5pdgayrgv1mm80f3nc0sdk" + "commit": "3c69ed312121368f1b24cc04d54a29ce4ed4f743", + "sha256": "0vcg8sq8pbzary19xxdariz3kws93qd2agzssl9znw38sayj71wz" } }, { @@ -80418,8 +81797,8 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20200326, - 719 + 20200510, + 704 ], "deps": [ "async", @@ -80427,21 +81806,22 @@ "pyim-basedict", "xr" ], - "commit": "84af8e80a4ac8fa19e7b01a3f9984280e7d501b4", - "sha256": "0351mvnnm0xzmlm71byxlbn8dp7qnpw8d12ghwdmd53q87pfgz9s" + "commit": "e54153f462dd8cd8e9bb379e0483a2849ec94f42", + "sha256": "0zsw25q1nqkqc3vgi95064v9wph1ynhiqi8gvc3fqq3k8i2jgy4v" }, "stable": { "version": [ 1, - 8 + 9 ], "deps": [ "async", "popup", - "pyim-basedict" + "pyim-basedict", + "xr" ], - "commit": "8648d467d79b3bf1c3a99623f9329939cacc40da", - "sha256": "16rma4cv7xgky0g3x4an27v30jdi6i1sqw43cl99zhkqvp43l3f9" + "commit": "8fe9897f57e410a7637692d98c40876cb3bd6c2d", + "sha256": "1n9syy39rnma0giz2g1dhdfjj4nn5bls2qzswy48snfl5z5mfm5j" } }, { @@ -80494,14 +81874,14 @@ "repo": "tumashu/pyim-wbdict", "unstable": { "version": [ - 20190201, - 2300 + 20200331, + 542 ], "deps": [ "pyim" ], - "commit": "9799b689643052078f53d69342a82315251490f4", - "sha256": "1rqlckmlmwmnqvk8bbcyvwr54p6x9b1fph5f17anzlvwffdjsw5c" + "commit": "daa223e2603a5ef3e6c8e33575d8f4e4604a8d3c", + "sha256": "0inl29fa2l5grn6z2wszj43bv17yf7n9x8l77zk2xp8q3gkswd86" }, "stable": { "version": [ @@ -80570,11 +81950,11 @@ "repo": "PyCQA/pylint", "unstable": { "version": [ - 20170402, - 1255 + 20200503, + 1624 ], - "commit": "53e5406b9279008f3ae8b5f045e5cd5773771d70", - "sha256": "0c6d0pmbinj65kacnqzbsa6acb3as8blrl5f202s8bbb9zd62vam" + "commit": "1fc490c0a1d0df5d4d6a64da0ccf2dd711b9bf67", + "sha256": "0fkcn6dk67ljx73ww1zxxkmqp551xsshhz40z2fh1dxw00b470ga" } }, { @@ -80669,20 +82049,20 @@ "repo": "poppyschmo/pytest-pdb-break", "unstable": { "version": [ - 20200316, - 301 + 20200426, + 2335 ], - "commit": "007427af712df9fa2c54869388d74e97f91b2bd7", - "sha256": "14l14605lgq498j37916p4gjwkqjb8z4ky85wlk3pgyx6bp20ckz" + "commit": "22e54796b0522f812423b2fb0ec842e2984ff0f7", + "sha256": "0gsnbpk14iw4mqxk7c0409dibsb6f3j936hd781ly956mvn0afil" }, "stable": { "version": [ 0, 0, - 8 + 9 ], - "commit": "007427af712df9fa2c54869388d74e97f91b2bd7", - "sha256": "14l14605lgq498j37916p4gjwkqjb8z4ky85wlk3pgyx6bp20ckz" + "commit": "3ff296d14e7350241b22fcbe09325a16bb834d16", + "sha256": "0pipbp6i0vq3maiwf8cj8g43zk8nq3dpgbgacdk9v2bhcgwl3im3" } }, { @@ -80758,8 +82138,8 @@ 20190716, 921 ], - "commit": "0d2f783f5a868ded8a37aa5881f8952aa36b053f", - "sha256": "1cqcxdg4bv8ybw5ds5av4id39fyk711bfadc779ilj5dn0mcd4h7" + "commit": "ec253711f2bdcb3848046bb68f6405a7bf9eb0fb", + "sha256": "0m27h2ycjz212r012wh4wsahidclmb74gk9g3v6ym9a2120bk0dh" } }, { @@ -80815,11 +82195,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20200224, - 1148 + 20200508, + 1756 ], - "commit": "5bf2c0dafb086684124c3997a618d40ac8db0fb0", - "sha256": "1hz9j8k4bybvi3kgq51rqi0rwy3d7c5wqvx2kkljh6734m9x8xp2" + "commit": "a4ee6e9f60ff63f0706661e54308281ed7c900e3", + "sha256": "02gfr692xr3clrim5l6bqzn1kzcv232ylvd5k33421s21wb9vhzv" }, "stable": { "version": [ @@ -81139,11 +82519,11 @@ "repo": "lbolla/emacs-quasi-monochrome", "unstable": { "version": [ - 20181213, - 827 + 20200415, + 705 ], - "commit": "68060dbbc0bbfe4924387392874186c5a29bb434", - "sha256": "0zp2xr0bjfqrpb0bqczzick1vvbjmipjavrdi70kw6a9caynvq22" + "commit": "b38d71860fdea945e10e8a766ac9dfa1410ade67", + "sha256": "0jcwfmamvpd22r5sbicbf9442b22lvldfrqldysm4l9yyxs11jy3" }, "stable": { "version": [ @@ -81162,11 +82542,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20200329, - 719 + 20200514, + 1242 ], - "commit": "a3c4490a3bb08ee7819b330a93a284b2fd4cd70c", - "sha256": "1rm27y9zni9nscrvsmvi653nwkrlr4gd4cy5pyrynh3q32yhkqik" + "commit": "9ece62efa829c6b89ba61cb674f337764b266482", + "sha256": "1mvrpyiw53lrz6i7r7zlcfvksh8lsjb4vib6gnj5b849njzcjwhm" } }, { @@ -81275,11 +82655,11 @@ "repo": "emacsorphanage/quickrun", "unstable": { "version": [ - 20200315, - 1029 + 20200514, + 1506 ], - "commit": "50e07e769848b1e1780054fab2e221adc474777b", - "sha256": "15jj9w0z3yfxaikxi8qaxhr8ipi1jc85zckbri2gdbbdy928ypiq" + "commit": "a8752887b81fc2f4f4e4bcd3d2cf8abafb85edbb", + "sha256": "0zjhpgg6zkqx8v0gv7h7z73i64ipzszm9cqs4wwaldlz228316ra" }, "stable": { "version": [ @@ -81437,15 +82817,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20200329, - 1841 + 20200513, + 1519 ], "deps": [ "faceup", "pos-tip" ], - "commit": "c8ac9971814ca9df8ec406f3b76c9ba4878a5d57", - "sha256": "0jnw9plmw3r2c12kcy4435v2kf0vmmla9ljb670zhcg690a5cjqh" + "commit": "0f1efa4a3cdcd26de1d2b002868ffc851cff25ac", + "sha256": "1zhn50apdrysm9d6ynv92slah78i39cismj88ym4ahrllwr1jnj4" } }, { @@ -81609,6 +82989,24 @@ } }, { + "ename": "raku-mode", + "commit": "e9831cc66d9a9e6b6441e6a75d54ce57146571fd", + "sha256": "08c9mgvmcnhn2q1ldqsaabj623b9kxd7blgfjabbwrl7bqkqpwzp", + "fetcher": "github", + "repo": "Raku/raku-mode", + "unstable": { + "version": [ + 20200510, + 2005 + ], + "deps": [ + "pkg-info" + ], + "commit": "43fd5628254754bee41575a55a7d1c7ad79837fa", + "sha256": "1c1l0c4pnza3bf0s1262z5r8xmbmhq3qdvgqq28k8raawdqszqfk" + } + }, + { "ename": "rally-mode", "commit": "0914825c6d5ad26d2a8035fc33ad98df42df3c53", "sha256": "1vzsh5855bzln3p3235yccl2azpndpc4rh95zrx6p1k62h2kv0y1", @@ -82045,11 +83443,11 @@ "repo": "ChillarAnand/real-auto-save", "unstable": { "version": [ - 20190224, - 1446 + 20200505, + 1537 ], - "commit": "824ad04121493723b08838c8b96559947dca7ed9", - "sha256": "1szpjv04rp9x9ph44a5s56a2y96z5x474bccsjnmn6yhingh5qik" + "commit": "8e51241e5ba7b07b91d8188c14cf193017640292", + "sha256": "0yn0ibbda8bjqjhiqhmbvv7p8c52n65mi95v91nkfcj60hwyglnq" }, "stable": { "version": [ @@ -82068,16 +83466,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20191123, - 1341 + 20200513, + 418 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "94f283593304c2f673cb4940900197d9cb099faa", - "sha256": "00dzw6nqqsgdlcvpnq1zc2568l5hz7vynqx6vkvvbj3jafc6nwj7" + "commit": "1238d8e72945a84bb06cd39d7ded75f37105d4d2", + "sha256": "0gx5fivzksanyp9a0ijdzrcbgg8nw94mbilhdh1jkra5mw3ndr63" }, "stable": { "version": [ @@ -82325,11 +83723,11 @@ "repo": "xendk/reaper", "unstable": { "version": [ - 20200120, - 2006 + 20200420, + 1703 ], - "commit": "6602e74d6190d2e8dd61358bebb513c3ae8b89fb", - "sha256": "1pywz6xm3wjkbcj5zr7w5xh5wfggvivnw94mmsm6lybnv2zgjg1d" + "commit": "c594d2fb9a027f360e98539a1debf5db639846b7", + "sha256": "0md3aqzy8rgvpafh6f8f2dwwrc43q317bk7p1whghfvji52aindv" }, "stable": { "version": [ @@ -82352,8 +83750,8 @@ 20190710, 1037 ], - "commit": "5e6205cfede8c10c6821dfd9f9757a9d8035ec04", - "sha256": "0w25z5v551w7fcjwk73dwxhp4lydjrn4rc99swd1ffxyzp5cap56" + "commit": "7cf6fbf4e8e86ebb76d118b2703e20b968e030d4", + "sha256": "0b8p7lh0ifrw9rqvv15q3ib206d1wfv3xafpqwc70zzwaxswvk06" }, "stable": { "version": [ @@ -82453,7 +83851,7 @@ 20180205, 556 ], - "commit": "6cb762efbd0aa323f96c687b6bebc9bf00a3ceb3", + "commit": "84bbac534cb114d8d11b86790435b65d36e99e68", "sha256": "0lnnh28qax4qk9n9sng7sgb0w0mnjc8abnch3bd0ba9g5x28z8bx" } }, @@ -82629,8 +84027,8 @@ "cl-lib", "json" ], - "commit": "770ffb34b04bfa0ea8484fa1506e96c530168e13", - "sha256": "0cqln3d8yp9fdam984bwnngjl0hjnwi7yhcggdkjwribhr79cxhl" + "commit": "0062f326106ce8be3c9b7d3fa0e88ed2c7bbfa5e", + "sha256": "1y35p2q3xrvn37kligfmkjagkz4b7pl61y2c2g504kjs45v4mqd2" }, "stable": { "version": [ @@ -82734,8 +84132,8 @@ "repo": "Wilfred/refine", "unstable": { "version": [ - 20180315, - 2228 + 20200507, + 731 ], "deps": [ "dash", @@ -82743,8 +84141,8 @@ "loop", "s" ], - "commit": "0a99439a0b4ed6f79b9a240ea1270140a9e328bc", - "sha256": "1scw449mbmr70kb0r2ymhph9j0s5ym77ijp5fpwph9bri46cad3g" + "commit": "d72fa50910b86217a35bb1b7e56adea206052021", + "sha256": "02cb30ycwyqhdw54s3abb4xsdyqlpi6i8xi7rkl85avvgy2gif8y" }, "stable": { "version": [ @@ -82769,11 +84167,11 @@ "repo": "purcell/reformatter.el", "unstable": { "version": [ - 20200327, - 2358 + 20200426, + 818 ], - "commit": "e8f70b20caf6672353a2b0ee3161d4791c412696", - "sha256": "19mji7frfvj925nx2m2cdvsx0lf69dzdl5wbdppyra9717rsspbq" + "commit": "dc6278a6b1e3565604346ac41a6ffc3cbab04031", + "sha256": "147qrqs3ndc4xfbb9wiymjsskccp54qpj8bn3i19n9zwm4kmgdzr" }, "stable": { "version": [ @@ -82931,6 +84329,24 @@ } }, { + "ename": "rego-mode", + "commit": "fbc0b93675f6baab6ab023b596e65658c9e2a534", + "sha256": "0qdmn6kh4bh514qh0ii881c03p3hcdp1qlmdwpp5nlzxlkxbgp07", + "fetcher": "github", + "repo": "psibi/rego-mode", + "unstable": { + "version": [ + 20200413, + 450 + ], + "deps": [ + "reformatter" + ], + "commit": "41c99057d0406c7fb3895a03da777af3961a648d", + "sha256": "1dw6f60ysyvxgm5gpir37ay8z9csykxj0r7v9h6z38cswicg27sj" + } + }, + { "ename": "related", "commit": "555932a7b9cf11b50a61c2a9dd2636fd6844fac8", "sha256": "08cfr5qbm1h5j4v3vf3kjjwb9nxsrk74lx9gi1icdhqw631h3yxf", @@ -83448,11 +84864,11 @@ "repo": "pashky/restclient.el", "unstable": { "version": [ - 20191009, - 1208 + 20200502, + 831 ], - "commit": "e8ca809ace13549a1ddffb4e4aaa5d5fce750f3d", - "sha256": "1wdi3c9wczn6vhr5l9mrbhsnw0hj1zfxh3sz53q8v1k684q5jyjk" + "commit": "edea7b3e3d6110ebe44b9387acad1967e540d2ca", + "sha256": "1lajb0xil1jpy1hvvmmig1xgil45976yr7m3lrffavp34ma3kcbh" } }, { @@ -83470,8 +84886,8 @@ "helm", "restclient" ], - "commit": "e8ca809ace13549a1ddffb4e4aaa5d5fce750f3d", - "sha256": "1wdi3c9wczn6vhr5l9mrbhsnw0hj1zfxh3sz53q8v1k684q5jyjk" + "commit": "edea7b3e3d6110ebe44b9387acad1967e540d2ca", + "sha256": "1lajb0xil1jpy1hvvmmig1xgil45976yr7m3lrffavp34ma3kcbh" } }, { @@ -83568,8 +84984,8 @@ 20200324, 1113 ], - "commit": "030e89a38df6d194546b0629f90c9e1898370eb7", - "sha256": "1mfjwxf1l0py2ididzdv86r118ws9iscdv23a0kgf2cjd6ydpbjc" + "commit": "c42a7a585c7b85bc402f63535ae6261f68c6aa57", + "sha256": "1lx23y4dzf5ln4ahf5dnnvx3blvjf3s65n3hgfv0qi5hgi8i8f59" } }, { @@ -83639,8 +85055,8 @@ "deps": [ "helm" ], - "commit": "55d28321b480a095d29e5c6cd03c8dea9ad55553", - "sha256": "0f9h8vmfn8xi0c3qwigzbbvsck4wwxbflxl06m7ky2h5jnj6n0g3" + "commit": "88e6577a0e50f523f7da04de9f939b0bc168b514", + "sha256": "1k8330bgc9m7pnpvz3kjyjpjsmha43v4srnhns85xi0nv328g1iy" }, "stable": { "version": [ @@ -83663,16 +85079,16 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20200307, - 1623 + 20200516, + 1412 ], "deps": [ "s", "transient", "wgrep" ], - "commit": "e19c06f4c556bda6457da3d50c14b12cb97679d9", - "sha256": "0k9rz6as3867b23979lrmb0sn26rbl08n6n71pxqxr8s85nljlml" + "commit": "f5456e006f22b6bc947e799261b36d55b075c5a2", + "sha256": "120n4vkw3c1l130932pziz9ivw85wyh6b75836w82dhx9d41h4cr" }, "stable": { "version": [ @@ -83822,8 +85238,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20200329, - 1205 + 20200502, + 349 ], "deps": [ "cl-lib", @@ -83831,8 +85247,8 @@ "popup", "posframe" ], - "commit": "f78719e5d8c8d2ec6da0f66e0b1e7d660d3a5a89", - "sha256": "0pcncx1w7y8rnsg23lf055cc38xrwhx26yhrqwzdf996cad54y6w" + "commit": "daf956df30d4007f70a4495560d656e517ab69a9", + "sha256": "0wr1ski9j7m7mwizdgxnnj61z1nqpyjp6gc7dniaac0m6svxf1rf" } }, { @@ -83947,14 +85363,14 @@ "repo": "thornjad/rivet-mode", "unstable": { "version": [ - 20191230, - 1842 + 20200514, + 1617 ], "deps": [ "web-mode" ], - "commit": "ac15de8c76978638e129c26869123c75d5b1f8c7", - "sha256": "19pv8qpcm0cllbbckzpjxrbkdavirq6b8p8jm274klkf4b7k32f8" + "commit": "9f2e6c4f777dbe306b715ab42663a6fc82a7e431", + "sha256": "09rsyq28caz4mrwm32i1f8wdzz35grigp7dilzxxqg0y4fpsf81f" }, "stable": { "version": [ @@ -84262,11 +85678,11 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20200221, - 36 + 20200507, + 1824 ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", + "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" }, "stable": { "version": [ @@ -84291,8 +85707,8 @@ "deps": [ "rtags" ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", + "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" }, "stable": { "version": [ @@ -84763,11 +86179,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20200322, - 1749 + 20200513, + 812 ], - "commit": "2df6cf72163db57fd0c79fefd0e79f38f29f7d93", - "sha256": "1f8fbzkc6ifx91kcf5blx22bh3713qmm5kj95i06k8cn10nlx11f" + "commit": "bfe40565753295a4cf8403f4124710acd2827d21", + "sha256": "1bx0hfilw48cz8n58lf427yg6sfi50wr91vcmj0w0m4s26zbdrr2" }, "stable": { "version": [ @@ -84810,8 +86226,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20200304, - 2028 + 20200516, + 759 ], "deps": [ "dash", @@ -84825,8 +86241,8 @@ "spinner", "xterm-color" ], - "commit": "61032eacf0b3b7579f627ce78bca2eddbfa31a10", - "sha256": "0mxrmgdhgjlixff1fm7fyn87yn3cakhyjk8vdhdr37k0qh339k0c" + "commit": "52b632d161b64bdca3f35e35180af63b668ce9fb", + "sha256": "1pcqm8463hjlv70bn6cpl2sv3z2h992yvkzrcz0w2rpz6jgrcfg1" } }, { @@ -84861,11 +86277,11 @@ "repo": "Kungsgeten/ryo-modal", "unstable": { "version": [ - 20191017, - 1323 + 20200515, + 1703 ], - "commit": "3a54312eea7023a86ca3f8eb3c03c872554bff2f", - "sha256": "1cyvp3bi6yhckbdnq98xvghmhdzghya5y9wd7hxjawibs75rza95" + "commit": "5d988e8b3a5d3d6f2f58d97031d2f500ef55473b", + "sha256": "0p7f02h5vsf4500gf4nl95myvh7pha47rdllscgs3b9jcx1kgyz2" } }, { @@ -84879,8 +86295,8 @@ 20180406, 808 ], - "commit": "03410e6a7a2b11e47e1fea3b7d9899c7df26435e", - "sha256": "074ny8y68fhnknkjxvrijrk534xzdiwip8wkifxfbwv3va315x83" + "commit": "43ba8b563bee3426cead0e6d4ddc09398e1a349d", + "sha256": "0bqdlcg5pah9a50dww8n5n0lzc8bzmpc230fdkinw8zrxph13p12" }, "stable": { "version": [ @@ -85122,11 +86538,11 @@ "repo": "djcb/sauron", "unstable": { "version": [ - 20181216, - 1200 + 20200516, + 1406 ], - "commit": "e20eb21c93492a7c9e89579409ae5a07f77aa9fd", - "sha256": "0sm69gr05y44zxmdzyydbyf5yw4lhxszq3zgz4mflcnb544kkrj3" + "commit": "d2e06866d1045fa16015d135b8964d9caacc2985", + "sha256": "04z3hn46m6xy3jpfd00c7x24h27dgv5zcysci3lxzmmq9k4iqsg3" }, "stable": { "version": [ @@ -85270,8 +86686,8 @@ 20190413, 1246 ], - "commit": "cc2dfa14eb3922d93c15f30734e8211c77ceada1", - "sha256": "11n26dksppjylg5jafxf4j859n6c1062v85qci8fx762wicz0bkf" + "commit": "648206e2ea609e8f38599cd540368d54ff52ae8a", + "sha256": "0vsabvci7y5l1lbqmn0fw301wfnwbb7fw7vffm1gd0w7rjjhxw73" } }, { @@ -85465,14 +86881,14 @@ "repo": "technomancy/scpaste", "unstable": { "version": [ - 20190228, - 2151 + 20200415, + 40 ], "deps": [ "htmlize" ], - "commit": "568faaa70fa0413e2d165ad232cd4c6ec2815197", - "sha256": "160m4w0i9cj4zxmmsknmnvycscj9y8da39y1362kv7dpmwnxsxcp" + "commit": "ca95a8dd088e848bd1cab6be207c6a98343ee176", + "sha256": "01v199xkadcbdr627skhisixdqj0hbbyv912xgyypm1rxdjfhhx9" }, "stable": { "version": [ @@ -85581,14 +86997,14 @@ "repo": "zk-phi/scratch-pop", "unstable": { "version": [ - 20170510, - 1458 + 20200504, + 2004 ], "deps": [ "popwin" ], - "commit": "7f4172c792b10bd38898dd8963cf0ade91921869", - "sha256": "0mwjq7z0cpaqhqygzhfcpfqyx8376jsc1g2874np6ff49389bj4d" + "commit": "1a36cb5ab6668aa57b1b7192521a472feeec1ea2", + "sha256": "1hdbwzd52qhn2jc8ghkp0lwr2hzrs4zfnwj6vniffxd5xz3c21ck" } }, { @@ -85633,11 +87049,11 @@ "repo": "ideasman42/emacs-scroll-on-drag", "unstable": { "version": [ - 20200328, - 116 + 20200411, + 1050 ], - "commit": "2d79a6d9c2497f701335fd66154a67cd51073c9f", - "sha256": "0m2605k8i2z44mqw5ibviwsbn3j8g8hs4q9cih5ip14lik6hhrdz" + "commit": "42d96a60a207cd73e7a58111358deb05f084c59e", + "sha256": "00l2n5kx5p18qdlfh2y355w34yp2fy401canrglz6dq1f7615lnz" } }, { @@ -85981,6 +87397,60 @@ } }, { + "ename": "selectrum", + "commit": "4273a6e55cf797d1fab1825618aab7e9b6c01886", + "sha256": "012jmgr7w6x0gy8ygpzyyk23adyzmr7cknz2w51zjapcilkf6ghv", + "fetcher": "github", + "repo": "raxod502/selectrum", + "unstable": { + "version": [ + 20200514, + 1440 + ], + "commit": "392fb1ba8a594a291854c27d2b6824b04cd0c2e7", + "sha256": "1rr7w8jlxsfn2kpryb1ywn066qlc31px1dbwd42hafp6k5cl870n" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "5995a4ba07a7b1b5f661ff050d93ad702f9014a4", + "sha256": "105zl102dwbzvk50xh6b824nq6p24kxhky18ghdnk5yi5sv620lm" + } + }, + { + "ename": "selectrum-prescient", + "commit": "5724ebca5ab5a1c3087cc13ae0693548666ed62b", + "sha256": "1zr83pq39i56v5bx78cp5cg2lrwz01975ng4h1ziv6nrh9p7vvr0", + "fetcher": "github", + "repo": "raxod502/prescient.el", + "unstable": { + "version": [ + 20200404, + 1550 + ], + "deps": [ + "prescient", + "selectrum" + ], + "commit": "3ab7605d997fb8337bf5ded2ad960b98ac0e1fd7", + "sha256": "081v916gnjvx2rzjbqkqhdwijz57w7iryxzg71729gwvavs25lsv" + }, + "stable": { + "version": [ + 4, + 1 + ], + "deps": [ + "prescient", + "selectrum" + ], + "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0", + "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3" + } + }, + { "ename": "semaphore", "commit": "1cffd8c7720e5a262b8635a5fd1ca36766f4c824", "sha256": "0g49ld0j962k66a96z6r6hw1p13r5bxs0wddpr9iciqgjra1jcl7", @@ -86022,14 +87492,14 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20190708, - 1302 + 20200429, + 641 ], "deps": [ "flim" ], - "commit": "16228dc2d147d6ba8762c10fb25c54a3757ee9b0", - "sha256": "1hccmz9g1rl3qz77214ybnai143zay48kai214gk43dw05bcfavc" + "commit": "57a948c5f07e57e78ab3c0e6fd76ffcd591bb4ac", + "sha256": "0y73l0zf2lg7kxz7kpbirpipzq007bdrgmlqfrv8najh4q03gf8g" } }, { @@ -86040,16 +87510,16 @@ "repo": "conao3/seml-mode.el", "unstable": { "version": [ - 20200323, - 220 + 20200419, + 1022 ], "deps": [ "htmlize", "impatient-mode", "web-mode" ], - "commit": "32f0dbf5a9b39535bc079c9c70456479d0dd3fb2", - "sha256": "1284fdraamjsbaslyk8k75a3m1rfa1i8pwrh56k3vsmfmd8a0cib" + "commit": "4ca9d275948898602640a46573cb95d7eef913e5", + "sha256": "1wl5qsph19i0ll2ppn9va4563m4bfz1zpv99d7xd7w65x6cp29ci" }, "stable": { "version": [ @@ -86140,15 +87610,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20200325, - 1711 + 20200407, + 728 ], "deps": [ "dash", "edit-indirect" ], - "commit": "2ee55780eeced9b0bb086a9d731526ee1a9c3658", - "sha256": "08xxl3z7abqk0m4lwflp0cnz7pcy66f6hps8dmxfas2hgl0qyz7i" + "commit": "e9a7b4402859d73f052330106d29ad14c3d9b6f3", + "sha256": "0d9w8n497j6q879rd9mqrmzvk3ssm95ayqbyfb5x0r3pnywdjp1b" } }, { @@ -86432,20 +87902,20 @@ }, { "ename": "shackle", - "commit": "806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21", - "sha256": "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6", - "fetcher": "github", - "repo": "wasamasa/shackle", + "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", + "sha256": "0fjkp5vawxc1q1pmvzchiqwxq8rdaq463sa5ks0r7x7cxwnp8zx6", + "fetcher": "git", + "url": "https://depp.brause.cc/shackle.git", "unstable": { "version": [ - 20191020, - 1249 + 20200506, + 1231 ], "deps": [ "cl-lib" ], - "commit": "7ccbe513852a1d1700b698547efca14b8940319d", - "sha256": "0agsp8ia4irr540r898ifhjqp28n1zsq1pilv1kc272spn3qhvp9" + "commit": "4b81514191dd182a28a3e5b2fe3069264b6835fe", + "sha256": "0k3waffnd08x1vb7mj6ix21zcadn9ipx4fis26iy3dsj35cbd3fb" }, "stable": { "version": [ @@ -86736,15 +88206,15 @@ "repo": "mhayashi1120/Emacs-shelldoc", "unstable": { "version": [ - 20151115, - 325 + 20200513, + 1206 ], "deps": [ "cl-lib", "s" ], - "commit": "5df2264eb60e45066f3633df4f34834751667346", - "sha256": "1mc7y79h5p9cxqwsl40b1j5la5bm8b70n6fn4rx9wr4bi7rwph5i" + "commit": "fa69f67b6229fad3f31d936955ca8d1982009b77", + "sha256": "0ma5j74vkwax9ha945dcgbmf3r4gajj4nvl63pbfyvxvy6svn84r" }, "stable": { "version": [ @@ -86807,6 +88277,35 @@ } }, { + "ename": "shfmt", + "commit": "a20dde08de1a7cd70739a791e1ae321e8f152685", + "sha256": "1k4rr658473vd6xad2z40dl7f26sb1zv9nc1938cg61pqi10bjan", + "fetcher": "github", + "repo": "purcell/emacs-shfmt", + "unstable": { + "version": [ + 20200421, + 103 + ], + "deps": [ + "reformatter" + ], + "commit": "342c55fab27f1e62472eebbb53cfc73b0d422a34", + "sha256": "0hmxa856hlai9ydarfsn5s9i8cnfrydgpa7mkh4a36klhdj21gfh" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "reformatter" + ], + "commit": "cd94266badc71c1e981e904e10f28c6a80237a2f", + "sha256": "09w50l938phcpxvbg4ahyxl43k995ywavwac364nmcnvmip021qy" + } + }, + { "ename": "shift-number", "commit": "b06be6b25078ddfabc1ef1145c817552f679c41c", "sha256": "1sbzkmd336d0dcdpk29pzk2b5bhlahrn083x62l6m150n2xzxn4p", @@ -86856,11 +88355,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20190930, - 730 + 20200406, + 2209 ], - "commit": "cbb15424431cd5f579b12307b8fa03122d525006", - "sha256": "1wwk5q3viw32pwmf4bjhbywkj0d1prwnldgdjfjzmr3rnvfw7w9h" + "commit": "e522a44b151d69d4a176e8809225598ab540fc4d", + "sha256": "1alishzz4j1hbfyfi09rkhffx6gv16yxln7q8jx25shb9rssivyz" } }, { @@ -87024,6 +88523,35 @@ } }, { + "ename": "shrface", + "commit": "6a8dfd3ebe0cf52e1c02d2487891876963a4fda2", + "sha256": "00v6ll2jiadmmfq59w6nk7lkq9ka3kcqf6mw1r8wiw84qb2sz56c", + "fetcher": "github", + "repo": "chenyanming/shrface", + "unstable": { + "version": [ + 20200508, + 1711 + ], + "deps": [ + "org" + ], + "commit": "a146e7d25713c33999deff24338670a5d1308c6a", + "sha256": "17pm5ljn004wdsl2hryjla5my8a63mx3bpapkqfyvrkwswwzs3fw" + }, + "stable": { + "version": [ + 2, + 6 + ], + "deps": [ + "org" + ], + "commit": "c82447df5b7fb87fa17e53919dc2da81c7dddec6", + "sha256": "1nncamyrn5c88lq973w1a28qg15gsdad51ifl1mhqprzkpw7jsjq" + } + }, + { "ename": "shrink-path", "commit": "86b0d105e8a57d5f0bcde779441dc80b85e170ea", "sha256": "0fq13c6g7qbq6f2ry9dzdyg1f6p41wimkjcdaj177rnilz77alzb", @@ -87156,20 +88684,20 @@ "repo": "riscy/shx-for-emacs", "unstable": { "version": [ - 20200308, - 2356 + 20200410, + 639 ], - "commit": "0fec00c1eef75feeae0f71591762ba6a80bc2725", - "sha256": "0zl5lcy80m1pzwl4239lhcf0zb6px5jwbgjib136zh94l5k35wdb" + "commit": "e5b4bae0a1a9bb8a762da40397a04efdd0b2b397", + "sha256": "0p9b621rgy34r1hl9xfzxh4xpx9gpsr3n330ypfxhlr0s5754j73" }, "stable": { "version": [ 1, - 3, - 1 + 4, + 0 ], - "commit": "e90dccf40320ee0df306cab3f94fdb79504698b5", - "sha256": "0g4w5w53pknphxr7i7kwksq1789qi8rk8yk9gp4s788iq1f0i6vr" + "commit": "e5b4bae0a1a9bb8a762da40397a04efdd0b2b397", + "sha256": "0p9b621rgy34r1hl9xfzxh4xpx9gpsr3n330ypfxhlr0s5754j73" } }, { @@ -87195,11 +88723,11 @@ "repo": "webframp/sicp-info", "unstable": { "version": [ - 20180823, - 1222 + 20200512, + 1137 ], - "commit": "26bc593aeae01da34ad92363b5bbd6aedab66da2", - "sha256": "0qvgdrzdp92mskqfh0x5garq0zcr8r7n834jlx5ky8q00xvb1a06" + "commit": "4002d83083d520c6b5ede2df36cc2cee885d450a", + "sha256": "0c9lknrhwhi4v3qnnzmy0k24d8pr3d3mpxi9xzcxq97f5w1x4fsk" } }, { @@ -87234,11 +88762,11 @@ "repo": "nlamirault/sift.el", "unstable": { "version": [ - 20190521, - 823 + 20200421, + 1423 ], - "commit": "33b2c9ff964fe53bb55b37429faaa4e903bead7a", - "sha256": "0cb8rcxl0jwpbgz9kk136l2ranficv8lk85fhvly1lpslbjljds9" + "commit": "cdddba2d183146c340915003f1b5d09d13712c22", + "sha256": "0ln87nhq2vhsb0ywn7rp0b3hzms5z7l6cv6dng08yly12r2957if" }, "stable": { "version": [ @@ -87384,6 +88912,29 @@ } }, { + "ename": "simple-modeline", + "commit": "054a7c164fae0c76ad2b3c6891d37a03f3e08823", + "sha256": "0c2wvwxwaa62r4vrw9g1lcgr8cv57mlfpsszynkn00cb7fhlhdmk", + "fetcher": "github", + "repo": "gexplorer/simple-modeline", + "unstable": { + "version": [ + 20200427, + 717 + ], + "commit": "08197f4c37aa28c8305f0b0316619421e42a8b75", + "sha256": "1wqqaknii7nkvm8nfjr2wzwjwr4w60a2x044y1kgk6zfkfb106lh" + }, + "stable": { + "version": [ + 1, + 1 + ], + "commit": "e7e39660dadcef88e7e877ad1f24625873e90e51", + "sha256": "0s8979jd3x6yarq4ifn5wgn08s8z2kblzaagh4zywkhaj1i7mb4m" + } + }, + { "ename": "simple-mpc", "commit": "62d762308c1ec0c1d8f7b4755b7deb285cbac018", "sha256": "05x2xyys5mf6k7ndh0l6ykyiygaznb4f8bx3npbhvihrsz9ilf8r", @@ -87721,8 +89272,8 @@ "repo": "yuya373/emacs-slack", "unstable": { "version": [ - 20200320, - 457 + 20200512, + 1702 ], "deps": [ "alert", @@ -87732,8 +89283,8 @@ "request", "websocket" ], - "commit": "03345aabe728da3f5238954eaa0ddbce604807d5", - "sha256": "0kyd959a9113vd7d4prgfga7sj6y6n8zrw6nkqxsfkm5sfpv31iv" + "commit": "b30525d63bb46882240de6f86e951305bcc7af10", + "sha256": "1f35lr19g5ci1jba6b9hkl7vajg4iy1yw6wb8bhg8dyppdkwnmvy" } }, { @@ -87794,15 +89345,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20200326, - 1453 + 20200414, + 1444 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "faa0c6a0b7c77f6a2db8d3244f24563106857944", - "sha256": "1dgmakfazz3p6s64qmy03schapxi1010sa8g7p1paqkpawr9d5qp" + "commit": "221518f0d3d224403743e6690f6bb66c42d9dec9", + "sha256": "0wbxv461lq7760gsqjw5djhjkzmwxz563l97csn2637gb1wkn461" }, "stable": { "version": [ @@ -87825,27 +89376,27 @@ "repo": "anwyn/slime-company", "unstable": { "version": [ - 20200304, - 1107 + 20200424, + 1045 ], "deps": [ "company", "slime" ], - "commit": "e9153e42ec8f2089ea129ce24488dd3b5e0b9e47", - "sha256": "1dz8q9fjiip2xnw64cim0p5adbpc4lbljdiqjc5dq7bhwpff07jl" + "commit": "cec203c45ebd678b05341d1cdbe420ad07a1b8e0", + "sha256": "0dwj6kv8laivhisd9jrzdn1lxynqqxmimvyz3z0zz6qf0ijsl0wm" }, "stable": { "version": [ 1, - 1 + 3 ], "deps": [ "company", "slime" ], - "commit": "6c244690c80387a32b0cb984843e00c8b75ad6bb", - "sha256": "1hl1hqkc1pxga9k2k8k15d7dip7sfsmwf4wm4sh346m6nj606q8g" + "commit": "cec203c45ebd678b05341d1cdbe420ad07a1b8e0", + "sha256": "0dwj6kv8laivhisd9jrzdn1lxynqqxmimvyz3z0zz6qf0ijsl0wm" } }, { @@ -88013,8 +89564,8 @@ }, { "ename": "sly", - "commit": "974d8812a4c5e45221ce3c32ae72c15ed29665c3", - "sha256": "000g5qpy45zqrh3g4mk70mh2lakadfq18djrq7cabagw1qmhqy41", + "commit": "4a916e44049cf8c5616c7394389ef91e2a2b3e21", + "sha256": "1pylaiy016yiyvd27m38wymw1k3bq7sfsd2d23idrgybc8miqqp6", "fetcher": "github", "repo": "joaotavora/sly", "unstable": { @@ -88195,11 +89746,11 @@ "repo": "zenitani/elisp", "unstable": { "version": [ - 20200322, - 24 + 20200508, + 249 ], - "commit": "e2a390b9b8518ad62283046400a0fb3e81eb5b79", - "sha256": "1s23r0dr10wjnk0j5gicy1dxvbhvnz3zmbssk431vccbba1jm8yg" + "commit": "f808ac53870d32c57a3cd01dd2850ee62d3af98a", + "sha256": "0dy3idfbvlrrim3rkv7lrr12gg2s4wlml6wcwgv1mazq3kdvjvvl" } }, { @@ -88281,6 +89832,24 @@ } }, { + "ename": "smart-input-source", + "commit": "82ef5414e63fe94905f042534d8bde88fb5461c6", + "sha256": "1dx3cvbm9hrdfrj4ggf0hbmfag2hybdlrqgpzy48fc07dscv0acd", + "fetcher": "github", + "repo": "laishulu/emacs-smart-input-source", + "unstable": { + "version": [ + 20200428, + 1031 + ], + "deps": [ + "names" + ], + "commit": "6d6db53db20712570cb99cd6a03f2be0349d87b8", + "sha256": "1h8vcdzgbg80c51cl3x6ic2d8q2sjlk5dp9j4wvmzqg6qdf34a6b" + } + }, + { "ename": "smart-jump", "commit": "52f29e14e61b28cd1637ca5d6bd878d91a71251f", "sha256": "14c7p6xqasd0fgn70zj1jlpwjxldzqx44bcdqdk6nmjihw0rk632", @@ -88467,17 +90036,17 @@ }, { "ename": "smart-tab", - "commit": "091dcc3775ec2137cb61d66df4e72aca4900897a", - "sha256": "0qi8jph2c9fdsv2mqgxd7wb3q4dax3g5x2hc53kbgkjxylagjvp5", - "fetcher": "github", - "repo": "genehack/smart-tab", + "commit": "ef37935f5f8ed12323374179a0673b5a4af57cdb", + "sha256": "1dm67sc1vylpf73m723hfjfqmm2yxrdckrgp6a3nq2586hkkid4l", + "fetcher": "git", + "url": "https://git.genehack.net/genehack/smart-tab.git", "unstable": { "version": [ - 20190916, - 137 + 20200416, + 2228 ], - "commit": "0f6963ce4de403fa43f3db68b31ce059f6251c3a", - "sha256": "16rh9wwjnqjk7hf7npfvwf28wmhd7bwnsnfgh592gv70xkcwywaa" + "commit": "67bf4f93f8afca61a3dc4f6c7a34b0b8ca9ede21", + "sha256": "1ws49lbafch1rb6g0j9k5h30c9shk3vvqhbjkf4qvhaqii94lgml" } }, { @@ -88647,11 +90216,11 @@ "repo": "aaptel/smblog-mode", "unstable": { "version": [ - 20190920, - 1823 + 20200424, + 938 ], - "commit": "fe866afbe19f804f80c37e077192576e4b0aad1a", - "sha256": "19zynq5izaafkj97a1f7dz8fljdr0mxsal8xcfa938clxihydaaz" + "commit": "fc949cff7051b31f0dbc7169774144533a27b92f", + "sha256": "07ks6d3gs264wv15lxa88pfi6i851h1wd9cacxs81wc7ijqc5sia" } }, { @@ -88768,8 +90337,8 @@ "deps": [ "org" ], - "commit": "0a6374493363d10826a8151d37fc461b08cc9b9a", - "sha256": "0vfhcnlz0p4dsnn7ac0fjqbk6xklanaa6jk0zbqcrlf2ww926v29" + "commit": "531957d7356f623b026aa45923e536421f682c1a", + "sha256": "0rb8vjnkn9pp0lrmmvsfslmw7xya4n18s82vs98545phwc4bjga5" } }, { @@ -88872,15 +90441,15 @@ "repo": "kyleam/snakemake-mode", "unstable": { "version": [ - 20200222, - 1710 + 20200417, + 2230 ], "deps": [ "cl-lib", "magit-popup" ], - "commit": "701f970bfb48d2f7abb241b9f69127ff5b667c76", - "sha256": "0di8wqwj0l2vx29kkpy2h1yxrxgcq51y2lss5lmqp6kmw3avkvi2" + "commit": "03562dcd82964d53eff7314b844c2897d1d9af55", + "sha256": "1cj8628l196da5j54wl8wq7znvha44z1f6w9qqg37yw0pjynbvxz" }, "stable": { "version": [ @@ -89120,14 +90689,14 @@ "repo": "hlissner/emacs-solaire-mode", "unstable": { "version": [ - 20200120, - 455 + 20200423, + 742 ], "deps": [ "cl-lib" ], - "commit": "4ac324ccb0b751be80ce64449553462eafab4f32", - "sha256": "1klyzqrlsgx8q89zx1kn5z6wnpv1dmvbglldpv1y74hxhzi6ryps" + "commit": "adc8c0c60d914f6395eba0bee78feedda128b30b", + "sha256": "0kj6lhx57gl3809q4bmgv7cac8wk61g1sdyr4c2a0y9jkzf21x67" }, "stable": { "version": [ @@ -89150,14 +90719,14 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20200329, - 1048 + 20200411, + 1026 ], "deps": [ "dash" ], - "commit": "8cd79c8afd7563a69764c4174098d2b8e7fd0c96", - "sha256": "1x1cbyd7kr1izcbbffq1amxgg1gqfwaa5y4m17ffmdrhal37mdzb" + "commit": "c8f09494330900081ed5a4f020c972a37fd7b02e", + "sha256": "0z5srqz4g81bsyw74q04fwz30qvi4i08s7fszmwnwyr5xrf5dx42" }, "stable": { "version": [ @@ -89188,8 +90757,8 @@ "flycheck", "solidity-mode" ], - "commit": "b190993dcb8376e80fb1d9b71f3ed6170bd2a341", - "sha256": "0s5xk38k3mc1d40dszlcgfpn5rvb7nsnnpmgr3c0bwqa4xh6yqrg" + "commit": "022b3159832384a7dcdc2168809e698600826047", + "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69" }, "stable": { "version": [ @@ -89213,11 +90782,11 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20200124, - 827 + 20200418, + 921 ], - "commit": "b190993dcb8376e80fb1d9b71f3ed6170bd2a341", - "sha256": "0s5xk38k3mc1d40dszlcgfpn5rvb7nsnnpmgr3c0bwqa4xh6yqrg" + "commit": "022b3159832384a7dcdc2168809e698600826047", + "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69" }, "stable": { "version": [ @@ -89245,8 +90814,8 @@ "dash", "request" ], - "commit": "b143b5c6161e3760f42a7a5405f5f7e97079e09a", - "sha256": "01ak3sr2hp2mmn81j1qdgyvrm9np979fpg2ngbnijnb8ai3gn30f" + "commit": "9fdb75e150e78170b3ca7863a8a0638c6ecc0fc0", + "sha256": "0qvr4cga8k4bn0jbfp626cjkxgvqkac902v7hxakj7l47arxcd5z" } }, { @@ -89286,6 +90855,48 @@ } }, { + "ename": "sorcery-theme", + "commit": "cdb6f1cfbf3bbeb1eeb6440fb216e8e3b523bb0f", + "sha256": "1qsavwbqidva4m0mdw393qbwlibhkkywnxj9mshfmkwaq050ivb2", + "fetcher": "github", + "repo": "vxid/emacs-theme-sorcery", + "unstable": { + "version": [ + 20200413, + 2242 + ], + "deps": [ + "autothemer" + ], + "commit": "fb041d0d8d4ae2840ddcfb1bd56fefe687da8c52", + "sha256": "1j54m18xsn44m5xshmk2pfxn795svjn0zv77qwfxn1d2p5j0r6ni" + } + }, + { + "ename": "soria-theme", + "commit": "9196110908f0d2130f7963499a94853b5192ac8c", + "sha256": "1fmys72s4n334m60ywpmbxjbvjwp7qn14pasmnlkv3l1bw6jygsm", + "fetcher": "github", + "repo": "mssola/soria", + "unstable": { + "version": [ + 20200505, + 851 + ], + "commit": "0f73c5a87b874e72ed286cf43e0b8dfec73769c3", + "sha256": "0pmsgvmf1ilv2jpay1mwb49rjc1y3h1hhc2kg3rzjpg10p3mak1n" + }, + "stable": { + "version": [ + 0, + 3, + 2 + ], + "commit": "5edb9379cd21411fb182239ed9ac19be4a278f32", + "sha256": "103837zizm5iqv3sskxgkhjij2icjx9sjvjhq2l9zi66rlh9gca7" + } + }, + { "ename": "sort-words", "commit": "0a4bd566392d7cebe8a891d787439512e8d34cf9", "sha256": "1hvbq09byjdbqzbyashw3y1h65wins44jnqcdic7vqzd1p1mzwka", @@ -89308,14 +90919,14 @@ "repo": "rudolfolah/emacs-sos", "unstable": { "version": [ - 20141215, - 403 + 20200510, + 1734 ], "deps": [ "org" ], - "commit": "1573adca912b88b5010d99a25c83a5b2313bd39c", - "sha256": "19jwnny0v6ppakpaaxv9qhr6353mksh9kxiz61kp4h12n6sfrb7p" + "commit": "6c25beae9f6db8fc7a037112ad5d4be9f5f36986", + "sha256": "1ia90sanqbigpag63w953kvfd1gyaakcvh65fsd79pcx4k38p4ly" }, "stable": { "version": [ @@ -89552,6 +91163,21 @@ } }, { + "ename": "space-theming", + "commit": "5529fcf16b877b01ee0aff710ebfb0ad5da8dba1", + "sha256": "0khjdmqv1q2pdas0xjfqs68xjg2nqms6g21bplg54ynsqcp7asv9", + "fetcher": "github", + "repo": "p3r7/space-theming", + "unstable": { + "version": [ + 20200502, + 1032 + ], + "commit": "31dca6954df643255175f7df68a86892aa3c71a7", + "sha256": "1bc6bsilsv1p3i39n14vnsrk9bz738n7fw16jv72qv74xkvqkyr0" + } + }, + { "ename": "spacebar", "commit": "e4d1808eabdb9081441e01526efe81782ae0122f", "sha256": "0kpmgirg3s57qkzrlbicz2jwgwlyg9jlxy6kxkqxixf1h0z5wy7n", @@ -89737,14 +91363,14 @@ "repo": "ljos/sparql-mode", "unstable": { "version": [ - 20180320, - 1802 + 20200429, + 1719 ], "deps": [ "cl-lib" ], - "commit": "a00bb622c54086ac1ee96c265bf7fbef12c68089", - "sha256": "0f919alnqbp5dnc4krgmnc9acqg84xs64fmzjc78gpbmfn0kyi0m" + "commit": "62f198256453265af48bef3a0207e80143fbff1e", + "sha256": "0a49678yaq2vc04w4xp0i9lpb7bdf1fwhjkg0xnzssvnjcnk368k" }, "stable": { "version": [ @@ -89864,6 +91490,21 @@ } }, { + "ename": "spell-fu", + "commit": "abaa6522f18ca1f47788ebb3281fbfcdade2b7c7", + "sha256": "0c2yi5lz2ww7mm9ih3m374w65n73z4knhnbrvdyzd7ja3xb3l17n", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-spell-fu", + "unstable": { + "version": [ + 20200426, + 600 + ], + "commit": "e62cfc4f08fc4743d6961fe3402adbf2260d7e70", + "sha256": "1w6jsn3p6956vk5pzwlbc211sswqai8ary8ad3fbhbjwxl5z3gsc" + } + }, + { "ename": "sphinx-doc", "commit": "a3b80d346ad4fb415970beddb5f02ae795fbf1b4", "sha256": "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z", @@ -90371,11 +92012,11 @@ "repo": "srcery-colors/srcery-emacs", "unstable": { "version": [ - 20200313, - 1310 + 20200422, + 1941 ], - "commit": "465a458e8c1629baa980988d43e441c4fdb92151", - "sha256": "04bncx9y1jqc6pzzl5c7dgdvzq012ymsp6ilkifg19xnz3bdmhm6" + "commit": "9630e465cc5166f723b7c5378e326561cf2a1738", + "sha256": "0ppaicggrrd3wrbjddw75mnsfli9a8db6bg21m1k7bafjkgraxfn" }, "stable": { "version": [ @@ -90418,14 +92059,14 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20200326, - 752 + 20200512, + 2217 ], "deps": [ "cl-lib" ], - "commit": "fa0c9e1fae26780dcce266df8ad8bf5efc971c30", - "sha256": "1azdc14y2jsmqcphk16qbxaj2fc7ajddwjjhc73xbhbn67knk1af" + "commit": "fd64b75f1051c4fe59209412f00a28625371588c", + "sha256": "1rh3nhwh75b698aq45cwmflv97r0596fq36w1rj08syfhmy3aari" }, "stable": { "version": [ @@ -90509,24 +92150,25 @@ "unstable": { "version": [ 20200329, - 1535 + 1558 ], "deps": [ "dash" ], - "commit": "67975f7773bfa0140d9dc09bd67df7f5489aa6ea", - "sha256": "0vwa1szfy45xpqqv44kyasjv2x0y2n3v680wlb1v3w2mxwwg8vda" + "commit": "a5377e4317365a3d5442e06d5c255d4a7c7618db", + "sha256": "1i3zmsn0w2k7p2hlzssibckm32kf05l56mkhg96x4sf06g3pwq1d" }, "stable": { "version": [ 0, - 4 + 4, + 1 ], "deps": [ "dash" ], - "commit": "d9dbedd773ad3a831e02e162c47936d6814a850a", - "sha256": "0895n7bss4wdydic1gflr03f2cwdyqywl16gvb599lpn288jhwvz" + "commit": "a5377e4317365a3d5442e06d5c255d4a7c7618db", + "sha256": "1i3zmsn0w2k7p2hlzssibckm32kf05l56mkhg96x4sf06g3pwq1d" } }, { @@ -90537,11 +92179,11 @@ "repo": "jhgorrell/ssh-config-mode-el", "unstable": { "version": [ - 20191221, - 1051 + 20200503, + 2042 ], - "commit": "e9f009c064f63ca488c89c30ab0d3857a0155f86", - "sha256": "1f6bj718jkdsbj38f75kwvg54kk4fisv7s9dcgh3gjf0n7xalkgc" + "commit": "8fda737131fef2e55c4965a938cf907acbf03372", + "sha256": "1cjcav28a6bw8h8axx5ms2cacdqcjv6imb4pj4r4zx08jd4nljdk" } }, { @@ -90816,8 +92458,8 @@ 20171130, 1559 ], - "commit": "af37d392baa6f2e7445e9f714da743fd10153adf", - "sha256": "0bc34ri3d90fcjsin5nvli3ncqrh8x9iw8rhzdrwsbr9ildmr1ib" + "commit": "fb180610de78c68736c963236afb28ee3ac952b4", + "sha256": "106jjrbjdgxp1s41h9vn877rq7a3m1jj9brlgdz1mrjgay266gcc" }, "stable": { "version": [ @@ -91050,20 +92692,21 @@ "repo": "stepnem/stripes-el", "unstable": { "version": [ - 20200322, - 2350 + 20200330, + 2022 ], - "commit": "8b0010acb9f92c7ab2fb8396aaf354fccedea7c5", - "sha256": "0q2zw9nvs9c27c7mcj9psqwf1r7p6k86y63d6q38hps22l063c9x" + "commit": "7b1d501f44b697a0514ef6759fd126d65867f18d", + "sha256": "0mx7l751jiijrjnbn3y6awasjy2c7k4ndgjq5c455vzxrlcbwr25" }, "stable": { "version": [ 0, 3, + 1, 1 ], - "commit": "8b0010acb9f92c7ab2fb8396aaf354fccedea7c5", - "sha256": "0q2zw9nvs9c27c7mcj9psqwf1r7p6k86y63d6q38hps22l063c9x" + "commit": "7b1d501f44b697a0514ef6759fd126d65867f18d", + "sha256": "0mx7l751jiijrjnbn3y6awasjy2c7k4ndgjq5c455vzxrlcbwr25" } }, { @@ -91543,8 +93186,8 @@ 20200327, 406 ], - "commit": "17a53e5f8dd45c6bca44659a80a79ca30d161635", - "sha256": "1hrrcg42b1fnf8y0mz3fli6mp7aha7w0rv7nhrsrvhrilnq97wzl" + "commit": "48a26af6a3395a8bf3f09747d0a205c6dbc79313", + "sha256": "12gg55jdb6b5jk0xizx2cqc795bgll2kap3jp08s1vr16zkdaryn" } }, { @@ -91700,16 +93343,16 @@ "repo": "danielmartin/swift-helpful", "unstable": { "version": [ - 20200321, - 10 + 20200516, + 1836 ], "deps": [ "dash", "lsp-mode", "swift-mode" ], - "commit": "e58f26b8ab9cf0522d52fe9890d39dc9e645577e", - "sha256": "1yx73wgvaf01wi26ahc9cblsk3sj98rgljb19dxc9ab7hjyncd46" + "commit": "e990ea6f5ea932763d002c3794dd9589add1532d", + "sha256": "1a4yrj3yjqgd5jssxd38dvx06cigsszrvs6hv7slfl60p729i0lw" }, "stable": { "version": [ @@ -91733,26 +93376,26 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20191130, - 544 + 20200418, + 617 ], "deps": [ "seq" ], - "commit": "1268425311ab20f1618df4e52cb1b79e28b553df", - "sha256": "1ghm5spzxxdvwn1lk3xci62hiv12x4hzjk5xh9q522a833nl04i4" + "commit": "2ab9ea1784a12a482ed9e3fb284b7a7658f40fff", + "sha256": "0wml7f8k3gqlxm0yg744271mqh087prlsfmbiv7fvkrcs55q0592" }, "stable": { "version": [ 8, 0, - 1 + 2 ], "deps": [ "seq" ], - "commit": "86f8f62294aa5a6d44fa872278d75a4a41f403d4", - "sha256": "0sszk2nwp6h9qk7vgh5n05pzh264br3x3r1hyj97gwf8jdqzkr74" + "commit": "2ab9ea1784a12a482ed9e3fb284b7a7658f40fff", + "sha256": "0wml7f8k3gqlxm0yg744271mqh087prlsfmbiv7fvkrcs55q0592" } }, { @@ -91817,14 +93460,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200319, - 1334 + 20200503, + 1102 ], "deps": [ "ivy" ], - "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787", - "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q" + "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", + "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" }, "stable": { "version": [ @@ -91903,11 +93546,11 @@ "repo": "dimitri/switch-window", "unstable": { "version": [ - 20181104, - 340 + 20200502, + 511 ], - "commit": "204f9fc1a39868a2d16ab9370a142c8c9c7a0943", - "sha256": "0rci96asgamr6qp6nkyr5vwrnslswjxcjd96yccy4aivh0g66yfg" + "commit": "8710f6304d843365fb59b6efe7e1f729d14e557c", + "sha256": "1v8qx519dwhpwg9ba08nl3kp329n3p1dbjj7iiiwmn22580nrkqh" }, "stable": { "version": [ @@ -92019,26 +93662,26 @@ "repo": "contrapunctus/sxiv.el", "unstable": { "version": [ - 20200326, - 1433 + 20200508, + 1620 ], "deps": [ "dash" ], - "commit": "dae46e6f5890f3d97d45eaadf0194b7ff01f6baf", - "sha256": "094kvg0cznddzn5q1clgj9r26h3ygab96rpbr00qn2wnmdb79bhq" + "commit": "f1a030c538af6d47d32eef04ab6536eeef948268", + "sha256": "0qnd89zphpa9cl7xw6lchsi0yw2a48v8xbgddgbsisff183bzcfz" }, "stable": { "version": [ 0, 3, - 1 + 2 ], "deps": [ "dash" ], - "commit": "dae46e6f5890f3d97d45eaadf0194b7ff01f6baf", - "sha256": "094kvg0cznddzn5q1clgj9r26h3ygab96rpbr00qn2wnmdb79bhq" + "commit": "f1a030c538af6d47d32eef04ab6536eeef948268", + "sha256": "0qnd89zphpa9cl7xw6lchsi0yw2a48v8xbgddgbsisff183bzcfz" } }, { @@ -92081,7 +93724,7 @@ "deps": [ "f" ], - "commit": "9bd33e73ecb2a0e3e3757c55c05f46b6937227e0", + "commit": "cd344b6c2cb6a8fcf061af2c85441644a4e7a006", "sha256": "193lq58mhkq0rrinkaxiyhkk60qf7q0gx03na2968zcrahrd8w75" }, "stable": { @@ -92101,8 +93744,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20200225, - 1928 + 20200425, + 1911 ], "deps": [ "cider", @@ -92119,13 +93762,13 @@ "slime", "smartparens" ], - "commit": "c8bdd672ec7fc50f72599081b87ef48bcec45c9c", - "sha256": "04s0nacv9qy5a95hsblz2an6ipzxmqi98pz71vyc0nghzp6j24zd" + "commit": "3dba2ae3f65bd1c40e3756e05a57ced039a15a7f", + "sha256": "1j2ycsi2ipbyaknscy0vgr1ybyvzl7j1q0gvazkl5rpihshz2shl" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ @@ -92143,8 +93786,8 @@ "slime", "smartparens" ], - "commit": "c8bdd672ec7fc50f72599081b87ef48bcec45c9c", - "sha256": "04s0nacv9qy5a95hsblz2an6ipzxmqi98pz71vyc0nghzp6j24zd" + "commit": "62bd31d8647b88ec179fb8ff89f583b55a0421cc", + "sha256": "1c2y65hcd0nydhkh7a903flq061x8hld272n00xn4dd0b8kvjp29" } }, { @@ -92204,35 +93847,6 @@ } }, { - "ename": "syndicate", - "commit": "626bda1691d9c7a97fcf549f7a3f0d41d832cfde", - "sha256": "06nmldcw5dy2shhpk6nyix7gs57gsr5s9ksj57xgg8y2j3j0da95", - "fetcher": "github", - "repo": "KNX32542/syndicate", - "unstable": { - "version": [ - 20160603, - 1523 - ], - "deps": [ - "evil" - ], - "commit": "90cee202a06f5bab48268ebf9f62c43334b69f50", - "sha256": "1w0na1p9drdmbci7adj20amrabcpny9fb2v4bd967ils4f2wly75" - }, - "stable": { - "version": [ - 1, - 0 - ], - "deps": [ - "evil" - ], - "commit": "b839aaba0c8583a3254476b53976e3caac4f89a9", - "sha256": "01bymbsvbisnpb2wpqxhrvqx6cj57nh4xvpsbsr5rr1h4pm5jkzl" - } - }, - { "ename": "synonymous", "commit": "ecf2c44c63e9f41f1733849bdef0d0c301485580", "sha256": "0vawa9qwvv6z1i7vzhkjdl1l9r1yham48yn5y8w8g1xyhxxp6rs5", @@ -92307,14 +93921,14 @@ "repo": "emacs-berlin/syntactic-close", "unstable": { "version": [ - 20191119, - 1007 + 20200408, + 1148 ], "deps": [ "cl-lib" ], - "commit": "5760319d8fdb3672dd0e95880c30e9c4d92ab239", - "sha256": "0rkqflaz0npclnjsy2r6apkjrzlw5zrpa6j87sbjpnnh0jgcsmsq" + "commit": "c21ffdf6a2f8c2a83d3efc729852cd2b09fe03a6", + "sha256": "1m6y7njkn5vibgnr3pnh6nci75j2ksr93ajp01jwpxxxc0wmipa8" } }, { @@ -92343,9 +93957,9 @@ }, { "ename": "syntax-subword", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm", - "fetcher": "bitbucket", + "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203", + "sha256": "1nfbpckxfy95m7bnj08bnpf8zyxc0dyap5hq1plxl3lxb3c4fvr4", + "fetcher": "github", "repo": "jpkotta/syntax-subword", "unstable": { "version": [ @@ -92354,6 +93968,14 @@ ], "commit": "ad0db0fcb464652a1d3408f525dee9293ce2b70c", "sha256": "1wcgr6scvwwfmhhjbpq3riq0gmp4g08ffbl91fpgp72j8zrc1c6x" + }, + "stable": { + "version": [ + 0, + 2 + ], + "commit": "01b27feac37eb60cf73ff80374004d9e847e637d", + "sha256": "12jk28jbkq1pcpgsbknk8xzzghjh2dhwb54kag2hynldn4qgfkrz" } }, { @@ -92410,11 +94032,11 @@ "repo": "jabranham/system-packages", "unstable": { "version": [ - 20200310, - 1510 + 20200426, + 1714 ], - "commit": "449dcdf4fe22874c9d91ee8d929ebb8a41b1bac6", - "sha256": "105s1kr8xapp93za9z9kq7s0rqccqissavacjfg6cvfx6gqrr8gy" + "commit": "92c58d98bc7282df9fd6f24436a105f5f518cde9", + "sha256": "01hj46zgs7a1as0r0x451ag2fb40pp3gyzycvj0gm328grn6vpmk" }, "stable": { "version": [ @@ -92612,11 +94234,11 @@ "repo": "politza/tablist", "unstable": { "version": [ - 20200227, - 1918 + 20200427, + 2205 ], - "commit": "10a573dc0e66981110507ee8b8b6408be48ce891", - "sha256": "0yzzkn6k8jjjkq5awiyi0li6j4bhynv8ayqa7sp1cqbgg4hd8rd4" + "commit": "faab7a035ef2258cc4ea2182f67e3aedab7e2af9", + "sha256": "1nqp7v5jd6zibpnx0w720xj2if71z1sgly9mmlnbcryg15p7c4gz" }, "stable": { "version": [ @@ -92715,11 +94337,11 @@ "repo": "tmalsburg/tango-plus-theme", "unstable": { "version": [ - 20170214, - 1708 + 20200423, + 804 ], - "commit": "8ba8901397e3e9f1d53110487bfa0effc65015e7", - "sha256": "025dca4yqpai45s74nk41y075v8pv59fdna11c0qqz3ihyrdhbrq" + "commit": "1e9484bb392bb0aad2be159505c502320f8d0a5c", + "sha256": "1819s9c0nm4pkgcpxqnr20075krq30qn6hpg4zl54cnrxbfbiq9f" } }, { @@ -92769,11 +94391,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20200321, - 2124 + 20200513, + 1728 ], - "commit": "9ca1afb561433ff6d2e8527e3d8d9152de5912f7", - "sha256": "0a3hlwzq9ckf7jcxq6drrgl1g8hi5ad0f6lgm3nawbsqmrb6r28y" + "commit": "45625bd90cf5dbdcaed02b57baaa995e240ceb4c", + "sha256": "1s2xxscj675ps93hqczw1xcs3jsixblfzjcfpz74vbz9zkmq1ygm" }, "stable": { "version": [ @@ -92817,20 +94439,20 @@ "deps": [ "cider" ], - "commit": "6c2631e3fd68e70110aa0cc5b83b7511eab363e2", - "sha256": "1sgnzgy0b61hxkj2fzkgnlrrpgsc5v1prns9hv1za4mv60xs8f15" + "commit": "8dfb4f92db2d8598ba809636a82d210c378b4845", + "sha256": "1sdi1rr9xq7spps5hagzs8irfljxmbd5y3hh4jiyvn54cwicg3g8" }, "stable": { "version": [ 2, 0, - 2 + 3 ], "deps": [ "cider" ], - "commit": "d4ce3b51e97fd7e9f5a650796dee9ba4079f9df0", - "sha256": "1vday9jnmzspnfy3ppladj0z5by4yysfwp1dnqv7n3ayyza5r8w0" + "commit": "ce85fd9bcd008031a605ea8913577f452b49e352", + "sha256": "06dm6gdh10jbmyjr0y96s06qi3k12phq522pviis68qm7v2ryr47" } }, { @@ -92969,14 +94591,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20200329, - 1557 + 20200516, + 1007 ], "deps": [ + "rainbow-identifiers", "visual-fill-column" ], - "commit": "0da852c0b72ad3473432f9e846ce1371d7c8cd61", - "sha256": "0n4jvl6c68wkddvsjfyw82rxy5h7ikc6qrjd35h2v864080gmbjp" + "commit": "e2fd3b1b34ae659d306749ab3129ed498b3a2720", + "sha256": "0h851m3p9cqblr5wpl769g8dl5vxjgx62c6grkdk2g0ip2cm4vcf" }, "stable": { "version": [ @@ -93022,16 +94645,16 @@ "repo": "dbordak/telephone-line", "unstable": { "version": [ - 20191120, - 27 + 20200412, + 1614 ], "deps": [ "cl-generic", "cl-lib", "seq" ], - "commit": "bfe7b189d708d9cbc69ef2eaf5542108edc4257d", - "sha256": "0dkscbjms2557fzd7gawgsic6gfzypyn973skiyhy0y8zimmr406" + "commit": "65198f72f3b1ae618507aa28094f05d6de4846a9", + "sha256": "177v612ii8nj9nsmfxlf17gr3wair4whzggi3pshch7ghbxdqv5q" }, "stable": { "version": [ @@ -93665,14 +95288,14 @@ "repo": "TobiasZawada/texfrag", "unstable": { "version": [ - 20200104, - 41 + 20200424, + 205 ], "deps": [ "auctex" ], - "commit": "2a5561b4534a3b78718e2c5fe30550c89341874e", - "sha256": "1i583i2h9f5bsg663yl9xriv1lc5gb5w4ql6b5r9dwv33lg7l6mx" + "commit": "48118c4e38836117efb4eede927ab85d9a0d2013", + "sha256": "1dpvf9limh9b0sg0x41gyw9w5nf5nvkd7zzlyysswhinm6jba4iz" }, "stable": { "version": [ @@ -93836,26 +95459,26 @@ "repo": "myTerminal/theme-looper", "unstable": { "version": [ - 20200326, - 1651 + 20200410, + 1757 ], "deps": [ "cl-lib" ], - "commit": "7077ca11508c6a00d98d592dee967e92185480ff", - "sha256": "02kiaqlrb677773809sfkajz31p9fsr72k4k0g5297wlibr9ymjr" + "commit": "eece1cef4483c02402f845d6158b35f6578447c3", + "sha256": "17slczwsd0av87fq44q9y1w6nvzvjfr2qn1majz5nqxfn55i6x9x" }, "stable": { "version": [ 2, - 5, + 6, 0 ], "deps": [ "cl-lib" ], - "commit": "7077ca11508c6a00d98d592dee967e92185480ff", - "sha256": "02kiaqlrb677773809sfkajz31p9fsr72k4k0g5297wlibr9ymjr" + "commit": "0e314ad21193441a26ce1839737e7a054e6a1a1b", + "sha256": "1v4rv2w8jdjzikwfjxsxqrbfwh6nm88v9x74pdhc3mq36qwl487g" } }, { @@ -93979,18 +95602,18 @@ 20200212, 1903 ], - "commit": "9889eb8b3a3a773e8f06df327a76e408f9214cd4", - "sha256": "1vhfkfsrnhdzsk1353xl383nsb7x6a01v7r79lxdcrkj5yxppz0d" + "commit": "81d2abd9097fc3497f77d830ebf8d8386beb7127", + "sha256": "0k9yr3dx12cl07dlz0zmaaf4zfr4zh54w5ix74b0kj1ny299f9q6" }, "stable": { "version": [ 2020, - 3, - 23, + 5, + 11, 0 ], - "commit": "186d782f02d80c7d8e93be352c2011ed4097c228", - "sha256": "1wj4ng9ymi0hszl3kmdg7rqrff4zk0zipbbn1jcxcii2swrkw12g" + "commit": "99612a3f69c0aecf6c2c4535a610e888aa923820", + "sha256": "17p6ip2na9629pdbrllrhrpnhlb9ngjdcs7g9ha3yhvk0sbgz4wf" } }, { @@ -94046,20 +95669,20 @@ "deps": [ "haskell-mode" ], - "commit": "5d4bce7a9af5e39e6df0d2577962579e31964b65", - "sha256": "0hnqcfvc8gca98wyzcrjldn9kcxdc4m8aa9cdr1884kp4kf5dmvj" + "commit": "f68e58cd7f8c483307573a96307f1f872a1921a0", + "sha256": "1rwc1vk0gl1sjnvzvwz4x25m6c61r8ghf6wrjclgifrm8zf1na5d" }, "stable": { "version": [ 1, 4, - 8 + 9 ], "deps": [ "haskell-mode" ], - "commit": "b28951be9abee7dc234c318849169bb578db3c49", - "sha256": "0absv56yqrqf3mzgs064q88lh6k28a7knzqrgdmf4100gf32np4j" + "commit": "252e3be53eb1bf6bfcd1b3c52af982506c84a89e", + "sha256": "19chvk24csg5w38q6yh1wky4nk4z8361p1q5q118427njqkl5ql3" } }, { @@ -94070,8 +95693,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20200327, - 1218 + 20200504, + 832 ], "deps": [ "cl-lib", @@ -94080,8 +95703,8 @@ "s", "typescript-mode" ], - "commit": "3b45610faaab33bc53ae2d44e1e573f19f35a74a", - "sha256": "1507xp8ndhyqvzd5j2qx3y4lpxq52j40srh5mp9784bf1hm9gg2s" + "commit": "8a7c1fc5dcc9b3321c10c71f21d1436b0a62ac07", + "sha256": "14i618dbhi66z19szyjznfnb56k9w64m00732g20r8izbhjsg4nm" }, "stable": { "version": [ @@ -94376,14 +95999,14 @@ "repo": "kuanyui/tldr.el", "unstable": { "version": [ - 20200302, - 1744 + 20200330, + 1025 ], "deps": [ "request" ], - "commit": "7203d1be3dcbf12131846ffe06601933fa874d74", - "sha256": "1bw6la463l2yfm7rp76ga4makfy4kpxgwi7ni5gxk31w11g26ryk" + "commit": "269bda7001613c0b70c0662d2a74d200765c1dcb", + "sha256": "0z8hkp15sdb0x0g67v6xa8ds28awz4i2vcbryj5zfpl15d0fiqc2" } }, { @@ -94409,15 +96032,15 @@ "repo": "laishulu/emacs-tmux-pane", "unstable": { "version": [ - 20200330, - 456 + 20200419, + 1331 ], "deps": [ "names", "s" ], - "commit": "942270359587d54f4fd6e37e8d35da38373447c5", - "sha256": "1x5b0680vxvjqcj5r3674n7gnp4994js13707pikl362bhv398kw" + "commit": "6e8d0584b0bbd412c5d29c87add7364299b3d2a0", + "sha256": "054qncg530paiv1vs27hs94m2y2fzvr4iind1rr16m8v8qf7zia6" } }, { @@ -94526,8 +96149,8 @@ "deps": [ "cl-lib" ], - "commit": "052881b101d8c2d11c89ae4f1befe7a999de987e", - "sha256": "0k9sjjsqxnrh0cq6m3cd9rk44n0rjbjgqcbfv6fg33a0gpybvryf" + "commit": "bcd3d76a47b4f0e7c382fb680b14f40208dae568", + "sha256": "0sgzjddd34icbbm4pc7v1662k6288pkr70ki4p2j3q4mh9qqc8q7" } }, { @@ -94646,14 +96269,14 @@ "repo": "xuchunyang/tongbu.el", "unstable": { "version": [ - 20200321, - 1817 + 20200414, + 507 ], "deps": [ "web-server" ], - "commit": "cf3b3ee1468c3dcd1721a5e6802821c8f52f34ce", - "sha256": "0s4h711rwkpf1dbqbak4akbm95y8crd0niisx19jmk9lms5kj5n5" + "commit": "6f6e5c5446f0c5735357ab520b249ab97295653e", + "sha256": "05pg1qddsl0m4r73smrxpcvyiwa18d9jl6i8nfanlydwmmjqblb9" } }, { @@ -94960,11 +96583,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20200226, - 1612 + 20200508, + 1911 ], - "commit": "a269614c69ad8b2703e6e5093d0017d6afad6cca", - "sha256": "0w50sh55c04gacx2pp19rvi0fwj9h19c9gzd8dpa82zjiidfxckr" + "commit": "d49f85a8c1172b9f21d2fd4a54d1f802b53948fc", + "sha256": "01rnd67mc9avm4d39vqr074shfmqjsilynivb3s32dqyk13fsz8r" }, "stable": { "version": [ @@ -94977,6 +96600,24 @@ } }, { + "ename": "transient-dwim", + "commit": "0ad7091aa6129c09e457c71274a42344acd6b823", + "sha256": "1q32if4i913vjbcpcdrfznjiih4c30ipnadn84zkr72wn5ndzlpq", + "fetcher": "github", + "repo": "conao3/transient-dwim.el", + "unstable": { + "version": [ + 20200508, + 617 + ], + "deps": [ + "transient" + ], + "commit": "e075bda369bbd0df2ac5e5d5626664f4a0062676", + "sha256": "052pj4b4jgr9vk0nrap57kpy0fsplssc7b9w7lkdmpxrbdld7n6h" + } + }, + { "ename": "transmission", "commit": "9ed7e414687c0bd82b140a1bd8044084d094d18f", "sha256": "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9", @@ -94984,14 +96625,14 @@ "repo": "holomorph/transmission", "unstable": { "version": [ - 20200321, - 216 + 20200506, + 2144 ], "deps": [ "let-alist" ], - "commit": "05a80e7a90303cd80f67681df2ec8e1bac88c394", - "sha256": "02chl6k9r0mki7iy5rs9xwgd74ypf0c79q9d3p7fw1rc1wqxk9ji" + "commit": "b2c35b6f4c503976581573a4512c50e8081f9038", + "sha256": "1b0d2xq22121f64hls28gb44m284g1b6xiw3mi7x6g1fil8b3wb2" }, "stable": { "version": [ @@ -95053,20 +96694,20 @@ "repo": "shingo256/trashed", "unstable": { "version": [ - 20191124, - 1351 + 20200508, + 734 ], - "commit": "cc0243c9a4f01dc889f5c5ced3e311f918fe0750", - "sha256": "0nyipnrjwbmh4mvfv1nwz6ypg8c1j0g9y9kc4cym49q9vy3wy56c" + "commit": "075749debcaf867bf151d83a59d7845dea71a4b9", + "sha256": "1r22x2m4mdkdick40myayzmhxby2v515bm5a8pxxcppnvd8259ci" }, "stable": { "version": [ + 2, 1, - 9, - 0 + 1 ], - "commit": "f3e970c139e44fc7d36ad781566fd6b288d691a9", - "sha256": "13grdi12iwlw4fiphdfmvclfpbr6ajlgfbfyi7v41z8k3rxz4ypz" + "commit": "075749debcaf867bf151d83a59d7845dea71a4b9", + "sha256": "1r22x2m4mdkdick40myayzmhxby2v515bm5a8pxxcppnvd8259ci" } }, { @@ -95128,8 +96769,8 @@ "repo": "cyberthal/treefactor", "unstable": { "version": [ - 20200131, - 621 + 20200516, + 1631 ], "deps": [ "avy", @@ -95137,14 +96778,14 @@ "f", "org" ], - "commit": "273fe37aa4ba0fde084976f1b303ceec789a9f7b", - "sha256": "0bgbjkr81xrf4p9jcvdrb3d1nh6hyvdg6dgzbxsh7s73smal9kwk" + "commit": "75357757022a4399ab772ff0d92065bd114dabe9", + "sha256": "0ks7ilc01j1jli1p1lqmqwcr3bfzn5p6vhxybc9wn2sk2sqn2kv8" }, "stable": { "version": [ 3, 2, - 1 + 2 ], "deps": [ "avy", @@ -95152,8 +96793,8 @@ "f", "org" ], - "commit": "273fe37aa4ba0fde084976f1b303ceec789a9f7b", - "sha256": "0bgbjkr81xrf4p9jcvdrb3d1nh6hyvdg6dgzbxsh7s73smal9kwk" + "commit": "75357757022a4399ab772ff0d92065bd114dabe9", + "sha256": "0ks7ilc01j1jli1p1lqmqwcr3bfzn5p6vhxybc9wn2sk2sqn2kv8" } }, { @@ -95164,8 +96805,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200328, - 1143 + 20200516, + 1204 ], "deps": [ "ace-window", @@ -95177,13 +96818,13 @@ "pfuture", "s" ], - "commit": "4c1add44cc0c5a710c22788663353c9c24909149", - "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ 2, - 6 + 8 ], "deps": [ "ace-window", @@ -95195,8 +96836,8 @@ "pfuture", "s" ], - "commit": "e01ad21ea3cc0eba8cd460737116b51be32ffb45", - "sha256": "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1" + "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", + "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" } }, { @@ -95214,20 +96855,20 @@ "evil", "treemacs" ], - "commit": "4c1add44cc0c5a710c22788663353c9c24909149", - "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ 2, - 6 + 8 ], "deps": [ "evil", "treemacs" ], - "commit": "e01ad21ea3cc0eba8cd460737116b51be32ffb45", - "sha256": "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1" + "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", + "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" } }, { @@ -95238,27 +96879,27 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200205, - 548 + 20200510, + 2001 ], "deps": [ "cl-lib", "treemacs" ], - "commit": "4c1add44cc0c5a710c22788663353c9c24909149", - "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ 2, - 6 + 8 ], "deps": [ "cl-lib", "treemacs" ], - "commit": "e01ad21ea3cc0eba8cd460737116b51be32ffb45", - "sha256": "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1" + "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", + "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" } }, { @@ -95269,29 +96910,29 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200302, - 553 + 20200421, + 1426 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "4c1add44cc0c5a710c22788663353c9c24909149", - "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ 2, - 6 + 8 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "e01ad21ea3cc0eba8cd460737116b51be32ffb45", - "sha256": "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1" + "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", + "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" } }, { @@ -95302,16 +96943,29 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200309, - 2057 + 20200421, + 1426 + ], + "deps": [ + "dash", + "persp-mode", + "treemacs" + ], + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" + }, + "stable": { + "version": [ + 2, + 8 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "4c1add44cc0c5a710c22788663353c9c24909149", - "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" + "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", + "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" } }, { @@ -95329,20 +96983,20 @@ "projectile", "treemacs" ], - "commit": "4c1add44cc0c5a710c22788663353c9c24909149", - "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ 2, - 6 + 8 ], "deps": [ "projectile", "treemacs" ], - "commit": "e01ad21ea3cc0eba8cd460737116b51be32ffb45", - "sha256": "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1" + "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", + "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" } }, { @@ -95856,11 +97510,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20200312, - 2235 + 20200430, + 1232 ], - "commit": "102587e458d48ece6335cd708300647f22ec8b8d", - "sha256": "0i3zpg21l5id0sfpxyn496wy83mpr66afx71lrnipsy1fqwd2j5x" + "commit": "0fc729787007b5111f3584034af0f3ef2389098f", + "sha256": "0h4k5gxjx55bg7dx8ixl87qdbxrmdzym6bvg2apasjs3kz9ggan5" }, "stable": { "version": [ @@ -96197,11 +97851,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20200305, - 28 + 20200512, + 19 ], - "commit": "aae7ec9784e8fab9b33adf25eac25e745653f19f", - "sha256": "02xlfjl9z822qixk9gxwv18n8ykdq793fd0qm9g0qsz0sn57mr8n" + "commit": "2b1e53285a55ce50ca6fd60b050f2171e235d8f9", + "sha256": "0x7i7aj9fh8j0944xbym3hijr33mc0kfadl7v657k0d8nx00x3zh" } }, { @@ -96212,11 +97866,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20200221, - 1152 + 20200510, + 434 ], - "commit": "35d4cf3771d905d647a35df050abfd9015833aad", - "sha256": "0846whh01bzxhl98wlywd11ki6wk2iyzzxvc5gnlj85cdasjrz10" + "commit": "0400f15f2a0cfcedb69c06c3ff62f3f8814b62fb", + "sha256": "0f3f4svgsl5338bbglxscvk6mrscjbpcxqc2f84w2np7iyap4ls9" } }, { @@ -96647,6 +98301,29 @@ } }, { + "ename": "unobtrusive-magit-theme", + "commit": "6dd57561738c2dc3ed6dc03f57d2487ce949f035", + "sha256": "05djixlq49dn1m64xs8b6w4kg650wrr8rs2pb72p1kfvp2a53g7w", + "fetcher": "github", + "repo": "tee3/unobtrusive-magit-theme", + "unstable": { + "version": [ + 20200411, + 1349 + ], + "commit": "aede357009655d19d4468320b2b61b0f26a47593", + "sha256": "1af8c7q3vxj23l2ah5waj9hn5pfp66834b4akm76jc5wqf0sr9j1" + }, + "stable": { + "version": [ + 0, + 4 + ], + "commit": "aede357009655d19d4468320b2b61b0f26a47593", + "sha256": "1af8c7q3vxj23l2ah5waj9hn5pfp66834b4akm76jc5wqf0sr9j1" + } + }, + { "ename": "untitled-new-buffer", "commit": "de62e48115e1e5f9506e6d47a3b23c0420c1205b", "sha256": "1hpv7k7jhpif9csdrd2gpz71s3fp4svsvrd1nh8hbx7avjl66pjf", @@ -96964,30 +98641,6 @@ } }, { - "ename": "usql", - "commit": "c8f6b968312a09d062fcc8f942d29c93df2a5a3c", - "sha256": "10ks164kcly5gkb2qmn700a51kph2sry4a64jwn60p5xl7w7af84", - "fetcher": "github", - "repo": "nickbarnwell/usql.el", - "unstable": { - "version": [ - 20180305, - 2323 - ], - "commit": "bfaf428b366a9a185eef84f0d645a98dc918fe3d", - "sha256": "00b1g30l86abg65wc9f4vcn4ccqa2zmn2mi33vdjrq3phw17d2ks" - }, - "stable": { - "version": [ - 0, - 0, - 3 - ], - "commit": "bfaf428b366a9a185eef84f0d645a98dc918fe3d", - "sha256": "00b1g30l86abg65wc9f4vcn4ccqa2zmn2mi33vdjrq3phw17d2ks" - } - }, - { "ename": "utop", "commit": "30489fe52b4031184e54f994770aa3291257bc9d", "sha256": "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7", @@ -96998,17 +98651,17 @@ 20190715, 1836 ], - "commit": "30c77ce4d7996822721e97ac8042d5bc0d415584", - "sha256": "03947csh8nzqqa58z2hq5i87kqf7z65f7b19nyvy0can2flznl7q" + "commit": "952f97a46062bb3315d3ae20ecbfd58747019c25", + "sha256": "0bfi325y5yzjbwnmdww0l5bpf4h9ynwz4mwg60k8q3p3f82pkrrm" }, "stable": { "version": [ 2, - 4, - 3 + 5, + 0 ], - "commit": "ba35712f1bd1c489a54088a4fd807f8484c1d98a", - "sha256": "1bl4943qpi3qy152dbdm5glhx19zsiylmn4rcxi8l66g58hikyjp" + "commit": "471cb311159773bbb280d0f1a4b47c54456c67a9", + "sha256": "09hxi1v5wvb952rwfmj48n6ndxkqn8ciaqj1cd9xgkw62h54agq9" } }, { @@ -97274,20 +98927,19 @@ "repo": "muffinmad/emacs-vc-hgcmd", "unstable": { "version": [ - 20191223, - 1331 + 20200507, + 2139 ], - "commit": "8fc2e2c33334c9ff6d4c4d20a99d258e6cfdc567", - "sha256": "1bf9swaj49yx59c1yj96q5rj839535wz2d1ihj98an2chd5czjh4" + "commit": "7433c6cc557440893d54be05fbf6500ff0e863d7", + "sha256": "0wgr2g814a461nknqchwbrgfgax5hb5f9fp6ibz6616q56hrcbds" }, "stable": { "version": [ 1, - 9, - 4 + 11 ], - "commit": "8fc2e2c33334c9ff6d4c4d20a99d258e6cfdc567", - "sha256": "1bf9swaj49yx59c1yj96q5rj839535wz2d1ihj98an2chd5czjh4" + "commit": "7433c6cc557440893d54be05fbf6500ff0e863d7", + "sha256": "0wgr2g814a461nknqchwbrgfgax5hb5f9fp6ibz6616q56hrcbds" } }, { @@ -97612,6 +99264,25 @@ } }, { + "ename": "vega-view", + "commit": "3b97f1a40c63c1d819eb235e9c36e5dfe20015c1", + "sha256": "1j4hwd2amhmbqhx3kmc8y8c7hmrzvvnjklyxp9c6mgxg08qsy2qk", + "fetcher": "github", + "repo": "applied-science/emacs-vega-view", + "unstable": { + "version": [ + 20200510, + 726 + ], + "deps": [ + "cider", + "parseedn" + ], + "commit": "c869defa3c0d9931e8eb4050dbaedb781160410b", + "sha256": "1l57w79ljihhfs4n60ak3hc3hdzv24wxkxafv51llb4zv2b85b5k" + } + }, + { "ename": "verb", "commit": "3802b91f39ef7800afd49589d398182cb191b756", "sha256": "12hskj4d7w43a8mjqqa535p02w778hi7lsxm47mh1xjiimibad3p", @@ -97619,20 +99290,20 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20200326, - 2322 + 20200515, + 1734 ], - "commit": "2c4252b2b57f65ebd9fd2c7a7771b4d0354f1d4c", - "sha256": "0g0hi1bhrx8bj0wbxwaimfpvl491sd079551199hcyhq607pcpp2" + "commit": "af1f250fd34d53ecdf31be1756c8693b4182d452", + "sha256": "0zk52ddlf11rwsd1f70i6jjc9z81jddqapfr2dv1d4ghn6j382x5" }, "stable": { "version": [ 2, - 9, + 10, 0 ], - "commit": "2c4252b2b57f65ebd9fd2c7a7771b4d0354f1d4c", - "sha256": "0g0hi1bhrx8bj0wbxwaimfpvl491sd079551199hcyhq607pcpp2" + "commit": "ee83e62490bec3b6d99281748a2e894c2bdc9e24", + "sha256": "1zd7vkd3i3x5cr04sp3jpfd79cp0p30615c9605z1rq01jjxgm3m" } }, { @@ -97722,14 +99393,14 @@ "repo": "baron42bba/vertica-snippets", "unstable": { "version": [ - 20191213, - 1109 + 20200423, + 1200 ], "deps": [ "yasnippet" ], - "commit": "2d1c45c63392ed869625bd062c19422600c9f555", - "sha256": "1gn57jfmma5h90m3b7l698rncmbygd2dbp48vvx1d1z9ks2rm8gg" + "commit": "6ced718d9120878878700592fab430a8542b748f", + "sha256": "1x04wrf3h6f4wsh4n2cl3n4byj9pxni918ri49hqxzm8h8hivigc" } }, { @@ -97778,22 +99449,22 @@ }, { "ename": "vhdl-tools", - "commit": "69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf", - "sha256": "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw", - "fetcher": "github", - "repo": "csantosb/vhdl-tools", + "commit": "b1a3336bff4d677b3bc7fbb8ef230ffc7b78e268", + "sha256": "0xdq9sicwpv3qzy833fqhvi4yllqmqgd4p9lbgq7dn1g8qz2gakn", + "fetcher": "gitlab", + "repo": "emacs-elisp/vhdl-tools", "unstable": { "version": [ - 20200128, - 957 + 20200330, + 1819 ], "deps": [ "ggtags", "helm-rg", "outshine" ], - "commit": "3dbfe8160e22053f0a9bee70ba6f8e1e3967bc46", - "sha256": "1pr7skldslq35ry17yyslfrl2d84msxyh0q77a3djv7ssqlpd270" + "commit": "b5d1eec90bb43ba10178219245afbddb6601e85b", + "sha256": "1qfjwsxi3w2gdl258jbk5d3z645gs6zccxx2iah54zbgql17pgj9" }, "stable": { "version": [ @@ -97985,8 +99656,8 @@ "adaptive-wrap", "visual-fill-column" ], - "commit": "91fb699ead3f86663e56b48a10adeb5723ca7b84", - "sha256": "0rfrgjflgn0c9xj7f4fwdzyclp2p9fbfir19iwy77z7jnkjk78dv" + "commit": "291f6178a5423f01f2f69d6bc48603d4f605b61a", + "sha256": "15kg23xkcc060y8a5f9657gk3bvkax23myhajaa0b2i1qcd6p43i" } }, { @@ -98082,11 +99753,11 @@ "repo": "joostkremers/visual-fill-column", "unstable": { "version": [ - 20200303, - 2318 + 20200428, + 816 ], - "commit": "a19fbe8bcfab678516ffcaa84b516527a0ce45cf", - "sha256": "157f8d302vv7ds03y21j4rz5jvqbkm4639ak25zfhshd5lyacxyj" + "commit": "982606896e018c951917b73d2af6334df554cf9d", + "sha256": "19ks9wjfjyfk4s53wvhdqjnjc6847v43nh3ir0yvr66mflqxgg54" }, "stable": { "version": [ @@ -98360,11 +100031,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20200327, - 1447 + 20200515, + 1412 ], - "commit": "996c535b9cc6aa70c3595413582d97abfab16edd", - "sha256": "0f84376rc9gm54llfln1528p82svczfrz9p48d1vh9pmf5ba09vw" + "commit": "8337e77520bcdb136eebb74837dc71ac8ec67601", + "sha256": "1wf8w8w0690mkih7c9xkk11i9f7r47abvfpyw4y576ansxlr5g1f" } }, { @@ -98375,14 +100046,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20200228, - 628 + 20200516, + 1117 ], "deps": [ "vterm" ], - "commit": "24d68a0ab920875d0834598688128e692fe9a5b2", - "sha256": "0bzxd5xzpajvg7mv7ggplcba7plchhlrl1m14dnx3nrx6q0936cr" + "commit": "fd55be72e8ad19e2284c8f73d5707c033dbde46d", + "sha256": "0q3459vpj5fp2i7nbk67mfd0nf78mpkgz771nhdj4a7xwghk6xgq" } }, { @@ -98451,8 +100122,23 @@ "repo": "mihaiolteanu/vuiet", "unstable": { "version": [ - 20200326, - 1738 + 20200424, + 1400 + ], + "deps": [ + "bind-key", + "lastfm", + "mpv", + "s", + "versuri" + ], + "commit": "5da06a8acebcaf84a3581610ff24aae1b46f786b", + "sha256": "16yfnqpdzi3bih16d7dzbqmd30m7w8rkjylnsg9m951vc0lysk3p" + }, + "stable": { + "version": [ + 1, + 0 ], "deps": [ "bind-key", @@ -98461,8 +100147,8 @@ "s", "versuri" ], - "commit": "c917155a0c72d9fceb9f7c39efcc97320f9e9028", - "sha256": "14djavnczks11lvmldwf0j8nnj4jd0jmz30l6r4hv12f3zjwyk7a" + "commit": "4e15dacd6445d490fefc47070f8e5b98db5e0dc6", + "sha256": "18qcw9mh57jrd6qrgcma82q28d1dab2dy6v8pi08kadcy4w95y10" } }, { @@ -98513,8 +100199,8 @@ 20200325, 2226 ], - "commit": "cbb15424431cd5f579b12307b8fa03122d525006", - "sha256": "1wwk5q3viw32pwmf4bjhbywkj0d1prwnldgdjfjzmr3rnvfw7w9h" + "commit": "e522a44b151d69d4a176e8809225598ab540fc4d", + "sha256": "1alishzz4j1hbfyfi09rkhffx6gv16yxln7q8jx25shb9rssivyz" } }, { @@ -98602,11 +100288,11 @@ "repo": "darkstego/wakib-keys", "unstable": { "version": [ - 20200326, - 2329 + 20200430, + 2155 ], - "commit": "7564b39aaa2b38ccca0a21bc72a797f065a0b171", - "sha256": "132jwf1d54ykbvw4f9f7i27ig5hpc6wsmm1ib44m5hx1kv1kxvh6" + "commit": "d958150c053dae57445be37cda1c2b50efcbaac3", + "sha256": "0fbh10yjva3bfpl76ddsnspzlpmbxj1azr3p4n2z0az75xx24wsa" } }, { @@ -98636,15 +100322,15 @@ "repo": "abrochard/walkman", "unstable": { "version": [ - 20200319, - 1739 + 20200418, + 1554 ], "deps": [ "org", "transient" ], - "commit": "da90c9dcd501c1bb88c6bde055911c34bf4202a7", - "sha256": "04gzb1v6wva24xbl8r8rr1ys2zmz03ccl0517d3pkgbd9v1wha2f" + "commit": "07a7710084c328dc238626f8b6e7d019380502de", + "sha256": "13g8wgcv3qydx6vhznx1iypmlrzl3cm02prrkqp70gjvgblk06nm" } }, { @@ -98655,11 +100341,11 @@ "repo": "farlado/emacs-wallpaper", "unstable": { "version": [ - 20200321, - 1220 + 20200408, + 1353 ], - "commit": "762354e958dbe298de06d119493d1aee8ffd0112", - "sha256": "1vcpfamawaja9q2n5qqkfn1bn2psi3ymcniw9g66k3whkqsh0kji" + "commit": "9fb5be9c2f7279f7ef2860eefd416359b9026ba3", + "sha256": "18vm8g4iwf2a9l40bg7cvpdziv10mv24x61z86xwjmnqbr7sxd8q" } }, { @@ -98988,18 +100674,18 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20200301, - 1948 + 20200501, + 1939 ], - "commit": "b0bb4ab82ba64b6fa789212f03ad808bdaf77d68", - "sha256": "0v79xm0w8fr342jp27jlkph3av3kbzwdyip6djwykid4j6bcnv2i" + "commit": "186a7c21049c50ecfd4109eb06c91196404f8bc5", + "sha256": "1si8i21ysqwnkq38wr0r4liz3j8v8sj66y46yl6bpw77116fngx9" }, "stable": { "version": [ - 16 + 17 ], - "commit": "3ff506aae50a47b277f2b95ff7b7a7c596664e6a", - "sha256": "17dw6a8d0p304f2sa4f9zwd8r48w2wbkc3fvbmxwlg4w12h7cwf0" + "commit": "d115f8dc3052e5779938d782d9cdaa4533ef20ff", + "sha256": "0jr5a1nzp8nbdng0k2fcaymiiv9ngrbknbrqaswgqn3akvx793jk" } }, { @@ -99081,11 +100767,11 @@ "repo": "eschulte/emacs-web-server", "unstable": { "version": [ - 20200312, - 1154 + 20200330, + 1407 ], - "commit": "b49ba259cc7e490e8acdecd28e66063f5ad1325e", - "sha256": "0b5mhgzbf1xy07g1yl0nb45hr0n18h6zxvw07zvahj2x1px9s6yc" + "commit": "9edf4b5e3c6cea1738acf08241919e00437ec530", + "sha256": "1cf2g67q064pnji0hbg0x5ziqmxwim127sd4q849cifxj7a4rqaw" } }, { @@ -99132,28 +100818,28 @@ "repo": "etu/webpaste.el", "unstable": { "version": [ - 20200227, - 912 + 20200503, + 1919 ], "deps": [ "cl-lib", "request" ], - "commit": "ef33b0f298bf36cfb84b37af4870706fc376b0c3", - "sha256": "0v2yw3jbwlamkycgfmd5abxr764zyzcggyzn2ybzlkffxaxaz6dw" + "commit": "5e963e8ef17e937745b8f3b64f29690290c7a5c0", + "sha256": "1i9scalpinp87wnapgpdw51p1q0y9wjf6nv4jbskzn7irvlkhhzx" }, "stable": { "version": [ 3, - 0, - 2 + 1, + 1 ], "deps": [ "cl-lib", "request" ], - "commit": "1a6c0e967f0340d825df33f4fab339eb904f5f5f", - "sha256": "15b97rszszgcivrsdx7368nxdb8lsag6wvmcvvm977splh9yjpwi" + "commit": "5e963e8ef17e937745b8f3b64f29690290c7a5c0", + "sha256": "1i9scalpinp87wnapgpdw51p1q0y9wjf6nv4jbskzn7irvlkhhzx" } }, { @@ -99164,14 +100850,14 @@ "repo": "ahyatt/emacs-websocket", "unstable": { "version": [ - 20200321, - 102 + 20200419, + 2124 ], "deps": [ "cl-lib" ], - "commit": "31e122a9d7a1ae092e8f970df718fb8256e16574", - "sha256": "1yjdrpn2dwaarmcymf1i8lj72jyvrpp3jqwr3rv59bg8fldin0rs" + "commit": "078f83902c0846c00ed8e3b6c5add7ff9b98d8f9", + "sha256": "11nacz0vvhaa8582r0ylx5w886y2qysbvrh9s064g979vjyfh9rg" }, "stable": { "version": [ @@ -99291,8 +100977,8 @@ 20200217, 1030 ], - "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", - "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" + "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", + "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" }, "stable": { "version": [ @@ -99318,8 +101004,8 @@ "deps": [ "wgrep" ], - "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", - "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" + "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", + "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" }, "stable": { "version": [ @@ -99348,8 +101034,8 @@ "deps": [ "wgrep" ], - "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", - "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" + "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", + "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" }, "stable": { "version": [ @@ -99378,8 +101064,8 @@ "deps": [ "wgrep" ], - "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", - "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" + "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", + "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" }, "stable": { "version": [ @@ -99408,8 +101094,8 @@ "deps": [ "wgrep" ], - "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", - "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" + "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", + "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" }, "stable": { "version": [ @@ -99609,11 +101295,11 @@ "repo": "lassik/emacs-whois", "unstable": { "version": [ - 20200326, - 1909 + 20200409, + 1538 ], - "commit": "2186a52db77badd809c99d5c21502878298d78f6", - "sha256": "1dnr7navhjzca2hapwx41xdx4i5fgjyjnw2ms5na6n572xp8kgnj" + "commit": "907abd9538c4a1e088853b816af883e5040fc430", + "sha256": "1qfkppciijyyg76idqqzjy351rki8y4pffwicprnrhv1qixfhdvv" }, "stable": { "version": [ @@ -99703,8 +101389,8 @@ "makey", "s" ], - "commit": "0379c80a0c2df77cd18e95741caf6fc8acd90a41", - "sha256": "1lkmr9024x8nv9chl21qp9dnl64qlp0lrfy592pzidpr3997xkjf" + "commit": "1de068d49a6b5faf8754d217bdaa2cbfc903a9fc", + "sha256": "04gfhjpn4q8d4y6177gdffwjbqq627083pff2ckw79pbvlj9f2mm" } }, { @@ -99945,6 +101631,21 @@ } }, { + "ename": "winds", + "commit": "43a07dc1e9af8f832330131764147907826e06e5", + "sha256": "1a5kw44pyilgaydyp87his41b2hw0xijp6sggl7bd60jwgspa0wy", + "fetcher": "github", + "repo": "Javyre/winds.el", + "unstable": { + "version": [ + 20200501, + 419 + ], + "commit": "720a0cedfdc20940f4c740e74fa0e16983cb0367", + "sha256": "00s0c2ilmypygqlrfa0ajig25h5jijxwwzpcfxgwbjf71wn5g9mg" + } + }, + { "ename": "windsize", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "1fzqf86d7pimnc87xdgvpv4hnv7j6ngmk1sjvazj6726xygswkyv", @@ -100082,8 +101783,8 @@ 20191114, 2340 ], - "commit": "33b4fcdd8a17aa19d57971e4f6db5fcb7758843c", - "sha256": "09rrv89b17s4sklkqgci1pmzlnkjlrira22884dh10sbfij42vbp" + "commit": "91ec8dc32652811861116e6f750f0fb41b21b771", + "sha256": "0nc9c1agzhmlbh4ijjrsa9yx19hvxzk06gv6p4pgrlx1yg2khnli" } }, { @@ -100130,8 +101831,8 @@ "deps": [ "async" ], - "commit": "4fe66d4d55c8eacebda53a13cc38e01d32bdaaa2", - "sha256": "1lyjrh1vddnf8v4i6g05bfx1kq8angbdhyh5v3j0d27gb66cshxp" + "commit": "f25a70777d9d9c90a52249791578bd72f1b7dfd7", + "sha256": "1vb6dw07vx3zqqb1h457f9957yja8wfqcjcfcf3m78dah3l2qmr1" }, "stable": { "version": [ @@ -100188,11 +101889,11 @@ "repo": "twlz0ne/with-proxy.el", "unstable": { "version": [ - 20190920, - 24 + 20200510, + 414 ], - "commit": "a7506af86ffc943f5d4cba712ec661125799c30b", - "sha256": "1nxssc8xn8i2zf9bs9rv61im3jxi38lq1ph9qr0hazwncndcsb39" + "commit": "93b1ed2f3060f305009fa71f4fb5bb10173a10e3", + "sha256": "15cwpg1s563pw44f8vr96w31hbpix9jd3736hd5546a79ymq5vz3" } }, { @@ -100203,14 +101904,26 @@ "repo": "p3r7/with-shell-interpreter", "unstable": { "version": [ - 20200319, - 1351 + 20200510, + 1621 + ], + "deps": [ + "cl-lib" + ], + "commit": "8d78bfeffa8a7bb4973395417d6fe21e4840ee16", + "sha256": "0ygbabavrhl9xmxmqaxrjkhyf7ar5lin5v1ay94hzr1v1lyiyc9h" + }, + "stable": { + "version": [ + 0, + 2, + 2 ], "deps": [ "cl-lib" ], - "commit": "e806b1e5537ba2f23b507a3cc28aa7c3cacd2315", - "sha256": "1qklc135ydslcxjhlgbmagib3j184gm72paky6glzdjh2yf8mm50" + "commit": "5ff0c8bc0b99b28d6c696e56cd7f44c7aa9ccaf1", + "sha256": "00dc0b0kj8215z14brwmzryb73w1j82r136a03n3pnczfh2l9z4n" } }, { @@ -100221,11 +101934,11 @@ "repo": "DarwinAwardWinner/with-simulated-input", "unstable": { "version": [ - 20200215, - 1807 + 20200509, + 2010 ], - "commit": "29173588751eeb33d2392d380b26648b2e213438", - "sha256": "0qmcv1ks3cnvl7l6cmbl5a03irwp38zfc98rzp9hbd3xw7rh970b" + "commit": "0d5e910f19657ab376f72e5848be50d13d3b8e50", + "sha256": "1ksm11k8gxkjn9byacy08xrz91gvzyf7fjnxv7j5ffpsccbh0wg3" }, "stable": { "version": [ @@ -100492,8 +102205,8 @@ "repo": "pashinin/workgroups2", "unstable": { "version": [ - 20141102, - 1922 + 20200516, + 1451 ], "deps": [ "anaphora", @@ -100501,8 +102214,8 @@ "dash", "f" ], - "commit": "bbefbb2579d463b243dcd4ecbfce82e1bdac3882", - "sha256": "0md6i2sawrzqza2br1g11zhhrda286abhlx0v9pgf65mafc4ilwi" + "commit": "239a5a3ba3b210be5d8fe527546d09241bd3185c", + "sha256": "16lzv61scc1iq1vsbfvyzla91cnxh5a7s84wx3x3kq9jggzh6hbs" }, "stable": { "version": [ @@ -100635,14 +102348,14 @@ "repo": "joostkremers/writeroom-mode", "unstable": { "version": [ - 20200303, - 2331 + 20200427, + 2319 ], "deps": [ "visual-fill-column" ], - "commit": "20c761b80031f2b44b9d9fb476e044e477359016", - "sha256": "1kx2xhvi579vhajvgl4spf9jd597fqa2bjh16yqfx2nikissvkhy" + "commit": "7f7acde5e8fc4ba74e511ca295e21f9ba7874730", + "sha256": "01rc7v2kg1h3cc06qa521mx9kvdxpw2b5hg12skh9gq1v5q1pbv9" }, "stable": { "version": [ @@ -100741,20 +102454,20 @@ "repo": "redguardtoo/wucuo", "unstable": { "version": [ - 20200116, - 1447 + 20200516, + 1526 ], - "commit": "92e562077cc21dbe285ad2fa7b171c8aae7b556f", - "sha256": "0wbmprg7nbwwpxffknkrg662v0dzdvlipz9f104bhaxvfcmy36ij" + "commit": "49d2ae558068954eb8c4324b8ee7a6b2b0a00ef9", + "sha256": "1zr9fp4y9459y97zh4dj6109wwk6lj7sjfffwapyjmirnpfkxirk" }, "stable": { "version": [ 0, - 0, - 7 + 1, + 2 ], - "commit": "92e562077cc21dbe285ad2fa7b171c8aae7b556f", - "sha256": "0wbmprg7nbwwpxffknkrg662v0dzdvlipz9f104bhaxvfcmy36ij" + "commit": "49d2ae558068954eb8c4324b8ee7a6b2b0a00ef9", + "sha256": "1zr9fp4y9459y97zh4dj6109wwk6lj7sjfffwapyjmirnpfkxirk" } }, { @@ -100910,11 +102623,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20200330, - 557 + 20200427, + 1357 ], - "commit": "d75567f7f6b85830b97b18ab1b5d8e70acaa05bf", - "sha256": "1lmca03y7h584agid7fr5g2w3s9psk55n0qlrcfgg10d67nq6l75" + "commit": "17319a5e5514a61564c7314cb65b7d825ca0bb0f", + "sha256": "1y5g89kl1lbwzxmgah06z6iisj55l089q25n9dbxmwnklsxpbicw" } }, { @@ -100940,11 +102653,11 @@ "repo": "xahlee/lookup-word-on-internet", "unstable": { "version": [ - 20200225, - 31 + 20200420, + 1528 ], - "commit": "5ddd01520ca49d459f67567901fc08c84aa553bd", - "sha256": "07fx4vypgim39rw022v5m7gfp68095s393j8s28k2j038jqgzdp5" + "commit": "c97a43dc0cebbfc519d0cce5b547dcc5e22b2085", + "sha256": "1qkazkisgw5c9xzxqm6xzm124r1v4d4dcyazvw66nz5j2zl1i5qd" } }, { @@ -101009,17 +102722,17 @@ }, { "ename": "xbm-life", - "commit": "6cb4c55583338dafee61fd9c266d2ee7cae2b1ed", - "sha256": "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q", - "fetcher": "github", - "repo": "wasamasa/xbm-life", + "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", + "sha256": "02jhcz71ldb6gar3jw13w6m6prz6hv6gccacgmp40bg6cglf3czf", + "fetcher": "git", + "url": "https://depp.brause.cc/xbm-life.git", "unstable": { "version": [ - 20160103, - 1017 + 20200506, + 1217 ], - "commit": "dd6a98ac9ea81b681e68f6318fed47158e5d469e", - "sha256": "08hzsqf4gawcr9q2h3rxrf1igvdja84aaa821657k04kdq4dpcbj" + "commit": "311ef62438c4ab057c054fcdda4dbfa5980759b5", + "sha256": "1h8s5wiib9hb9bgqr3r5abpib9m61aa2pwiy3isjs5fkacvvxi9l" }, "stable": { "version": [ @@ -101393,25 +103106,19 @@ "repo": "atomontage/xterm-color", "unstable": { "version": [ - 20200103, - 1327 - ], - "deps": [ - "cl-lib" + 20200514, + 1932 ], - "commit": "4b21b619841c93c4700039a93eb1881beee9248c", - "sha256": "1v4i74xdp26k9r1nvbdz625l62acvfb2kkp1nvld05p6xkh0q68z" + "commit": "3d1a24ca84d26ad4507a79260107b010a1d6886b", + "sha256": "1qppbf4jidq6q8c7gby0syp4560xqc3kzgbdgdwl1jc5k08ln3cl" }, "stable": { "version": [ - 1, - 9 - ], - "deps": [ - "cl-lib" + 2, + 0 ], - "commit": "44e6df835bd4173ee4ccc7e29842e9dae76f2668", - "sha256": "0i9ivc5xhl5y5v0l18kbhfg8s2abb9zaimyx951b8bc0f5as68xm" + "commit": "137dfecedfdf6aff69b0f9b1c299aa0ae868fca0", + "sha256": "127lq50q62x06kd1xrf8lyc4rkqbfhfy86gsx1x4x169am2xk397" } }, { @@ -101479,6 +103186,57 @@ } }, { + "ename": "xwwp", + "commit": "83c34ae5023410cc31f93255275d6465b6152a10", + "sha256": "07r62haa1ks2xvfh4zkqadpsjdhk6kbafk1fmvcim3m13ma6gch1", + "fetcher": "github", + "repo": "canatella/xwwp", + "unstable": { + "version": [ + 20200413, + 757 + ], + "commit": "dcf6f9430dd9745e5f2705c0f42e013fab961c0e", + "sha256": "1aks12zbfcq4m4s1baxcdg2xjn2y9f4dw19576yp35hg2cb550v6" + } + }, + { + "ename": "xwwp-follow-link-helm", + "commit": "83c34ae5023410cc31f93255275d6465b6152a10", + "sha256": "0dcbhc4zy4n03fi6pz3k9hlnpk7ys6xx1v6c4rwcjzy5ly80alwq", + "fetcher": "github", + "repo": "canatella/xwwp", + "unstable": { + "version": [ + 20200331, + 800 + ], + "deps": [ + "xwwp" + ], + "commit": "dcf6f9430dd9745e5f2705c0f42e013fab961c0e", + "sha256": "1aks12zbfcq4m4s1baxcdg2xjn2y9f4dw19576yp35hg2cb550v6" + } + }, + { + "ename": "xwwp-follow-link-ivy", + "commit": "83c34ae5023410cc31f93255275d6465b6152a10", + "sha256": "0i5wqj4170iqznghy02dc2g5l5cs76hjhk88dcwwpbss1mabj8ig", + "fetcher": "github", + "repo": "canatella/xwwp", + "unstable": { + "version": [ + 20200331, + 800 + ], + "deps": [ + "xwwp" + ], + "commit": "dcf6f9430dd9745e5f2705c0f42e013fab961c0e", + "sha256": "1aks12zbfcq4m4s1baxcdg2xjn2y9f4dw19576yp35hg2cb550v6" + } + }, + { "ename": "yabin", "commit": "cc44b28e32ff9b35f60744a175c2d1e3036db8bc", "sha256": "1kmpm2rbb43c9cgp44qwd24d90mj48k3gyiir3vb6zf6k3syrc17", @@ -101555,11 +103313,11 @@ "repo": "drdv/yahtzee", "unstable": { "version": [ - 20171022, - 1412 + 20200511, + 2005 ], - "commit": "ecb66f0b77aac0123e5b3336ee1910fa07fa44f9", - "sha256": "1cvsp6x94b223g21avr2z255s5xwdwmdxnhwzq8qj2c3qrax6sx9" + "commit": "63b9b698fbb547603c3f66932c6d3e3bb217c443", + "sha256": "0v0lp2n0xdxfiasr3lcydj9q4krfvzqi568iyngq6zxlryc75wi0" } }, { @@ -101615,11 +103373,11 @@ "repo": "yoshiki/yaml-mode", "unstable": { "version": [ - 20191127, - 2314 + 20200512, + 2141 ], - "commit": "cecf4b106b0c4236931b14919fdf87ff3546e2c9", - "sha256": "10dz6zz5mhf09wnhqag93zvdcnh6zyizpsdj189jgza58dq2vp1v" + "commit": "0b33131664719c61f834e77ff3b91ded3de2cd3b", + "sha256": "0ig5hpk0wb46yz6gml6g7x9am0l3cay1bzxldms0g2qjh5swxrq4" }, "stable": { "version": [ @@ -101696,11 +103454,11 @@ "repo": "Kungsgeten/yankpad", "unstable": { "version": [ - 20200108, - 1811 + 20200409, + 1747 ], - "commit": "dd97994a8bff58e4d98aa6cb90aa08c5ddde5c82", - "sha256": "114qnr8s5v2dr3v3jvy4aagyi1wbn3fw27mrb6zdg6faxvfpd8sk" + "commit": "acfccf3633d7fd3b91d717fda4ae98e8e3345a06", + "sha256": "0xprfvgfcjdl20j1hxjk3f4gy7m3v0x9p0vyl2ygxmjj7ibgi7kw" }, "stable": { "version": [ @@ -101719,11 +103477,11 @@ "repo": "JorisE/yapfify", "unstable": { "version": [ - 20200326, - 917 + 20200406, + 830 ], - "commit": "2e5d344b6d9cf1965a1153b160b3a52582d492ff", - "sha256": "1pi1dgcqz1xn5r4z5pjxbyx4kq75cxzl3711zzp0dyn48w0a7sj3" + "commit": "3df4e8ce65f55fd69479b3417525ce83a2b00b45", + "sha256": "13q84a4q5bv56r9dhi84jqbkx7dc1bvi42s01ahh8vmdvg4h39d3" }, "stable": { "version": [ @@ -101849,14 +103607,14 @@ "repo": "joaotavora/yasnippet", "unstable": { "version": [ - 20200329, - 1434 + 20200413, + 2221 ], "deps": [ "cl-lib" ], - "commit": "7c02bc142c3b157699ab8c4f24ff98da94401248", - "sha256": "1yjqlb9jdbsmmywgg49wd25psbf9637hzgnx5i1q3diaravlnji6" + "commit": "5b1217ab085fab4abeb1118dccb260691b446703", + "sha256": "0486kd8brxwmbmw9bjf0p9i99dyl17hbc5aa03z7psqqlsw713mx" }, "stable": { "version": [ @@ -101897,25 +103655,25 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20200314, - 1030 + 20200508, + 936 ], "deps": [ "yasnippet" ], - "commit": "d9a9ec282c6eb1156b06dd1362e018404221087d", - "sha256": "0kvpp1w02mr713lz9jnq0xwbl14f879g7f1icns3n6ilf8kgb104" + "commit": "ab3c20483a39742d7c612bc006d09aa8ffa3186d", + "sha256": "16gzc33qlmgbp9hq5c3bbv24b136ai23h3v0b2f9rr2xy9ln3ccz" }, "stable": { "version": [ 0, - 20 + 22 ], "deps": [ "yasnippet" ], - "commit": "e813c1479a9fb2773d95ddba39c4aa0e7a1c33c5", - "sha256": "095w7cdmfwmmr6426mbq15n0a5izgbmv9408m9yh1pqz5x3v3vsx" + "commit": "e51a259527d685fe767b6ec951ad1940b1131a69", + "sha256": "1xcmx0frialb86z5adi07b6skqks326w3v1xn49c54gxim027i5d" } }, { @@ -102169,11 +103927,11 @@ "repo": "ryuslash/yoshi-theme", "unstable": { "version": [ - 20200307, - 704 + 20200422, + 208 ], - "commit": "25bde9dc4ca380941b6539757371aef91ca35968", - "sha256": "0p3qrp0wrqissbvz8bnpbrj67c2697mq1pni9c247fiijbcnl48j" + "commit": "caa83e4475885a2c9a126630f0feec1ce2eb0c4e", + "sha256": "0sga52lz54c2v08j6m9v3ddv7rlpdcgi9lkxn1cvajm5h60b20r8" }, "stable": { "version": [ @@ -102193,8 +103951,8 @@ "repo": "xuchunyang/youdao-dictionary.el", "unstable": { "version": [ - 20191227, - 242 + 20200429, + 259 ], "deps": [ "chinese-word-at-point", @@ -102202,8 +103960,8 @@ "popup", "pos-tip" ], - "commit": "a745e3197cf3498244265efab8e1cc1f4fedcddc", - "sha256": "0b74crwlslvl4hvjai6a5cphxy9rjnlkhjdlfprqf7s1ygycy1m0" + "commit": "bd839711e3cf6d3eb9c308cea5694369a440899e", + "sha256": "12r6avj1mxjj46s2p6kwhixhkinkm9krd62sy9ji7v9np2gqf7ll" }, "stable": { "version": [ @@ -102220,6 +103978,21 @@ } }, { + "ename": "ytel", + "commit": "ec52f03658dca774daf7301e81edb20aedf03c10", + "sha256": "0adxiw83rah9hln3k8gm6s7ks3xpqfknypjb9j51lxcabc7c1677", + "fetcher": "github", + "repo": "grastello/ytel", + "unstable": { + "version": [ + 20200510, + 1405 + ], + "commit": "828323f9acb654d8f61ccbca510b471fb00879ee", + "sha256": "1zixqicpdywzdc2pkx9h08y3kphmn9zcx44bj2rqg3h8xsmjayk5" + } + }, + { "ename": "z3-mode", "commit": "e056fb14b46b97ff31b1db3b8bd31e395a54cd87", "sha256": "183lzhgjj480ca2939za3rlnsbfn24mgi501n66h5wim950v7vgd", @@ -102388,28 +104161,28 @@ "repo": "zephir-lang/zephir-mode", "unstable": { "version": [ - 20200329, - 1235 + 20200417, + 830 ], "deps": [ "cl-lib", "pkg-info" ], - "commit": "3e112ba7c52b5caad0c230e014b6e842d6379ab1", - "sha256": "1h6lhz7fvx6c2zwgjwm5aiax5f22v65dmq3rj0s51vpasyj2k9ib" + "commit": "4e9618b77dff67c1c7b6fff78605a62311db88b8", + "sha256": "0chh35h479jm0zcjxqyd9v1gzs2adicvyihdls87g8minmwvl19r" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ "cl-lib", "pkg-info" ], - "commit": "76c310faf792db93bc6750305f5b54aa6a4963bd", - "sha256": "1najsypq8qix6jgxqqj5kkfdp7b10l3xz25qw0y5lzz4by4pzzpa" + "commit": "9adc5cf07a9117d25eaab41867ddde914c6d2f5a", + "sha256": "0g2vfscikz8qa0danvcickcjnz99yjm9jgk3sci094gmgwka3j2y" } }, { @@ -102420,26 +104193,26 @@ "url": "https://gitlab.emacsos.com/sylecn/zero-el", "unstable": { "version": [ - 20200220, - 1619 + 20200405, + 1220 ], "deps": [ "s" ], - "commit": "3e6e45482c223d3a9610fb366e9cc3aab98a7aab", - "sha256": "1qqk419f4y59vadpqf4my75pzgap9maylfbmaw7k2sqwajy2mxnl" + "commit": "729da9f4b99acb744ee6974ed7f3d4e252fd19da", + "sha256": "1bcka4gzcb5r2y5g7a06l05n6ixvs7lm37w4ghvvq12ci2ypzp04" }, "stable": { "version": [ 2, - 6, + 8, 0 ], "deps": [ "s" ], - "commit": "3e6e45482c223d3a9610fb366e9cc3aab98a7aab", - "sha256": "1qqk419f4y59vadpqf4my75pzgap9maylfbmaw7k2sqwajy2mxnl" + "commit": "729da9f4b99acb744ee6974ed7f3d4e252fd19da", + "sha256": "1bcka4gzcb5r2y5g7a06l05n6ixvs7lm37w4ghvvq12ci2ypzp04" } }, { @@ -102479,14 +104252,25 @@ "repo": "efls/zetteldeft", "unstable": { "version": [ - 20200329, - 1506 + 20200516, + 1108 + ], + "deps": [ + "deft" + ], + "commit": "f3503ec8fde88d733b7bbbd4431e85de396a3fe8", + "sha256": "0843k0i6szjvc7f51q0pm7vmxpfz68911d75m75rg54k1jbynazq" + }, + "stable": { + "version": [ + 0, + 3 ], "deps": [ "deft" ], - "commit": "1dd8b052bb4bc8fcd18740e798057ace97cb63ac", - "sha256": "16bkcp6mq98bn1qli2qi6wgf5zrkxfqs912fi9fg88bcixk50k9j" + "commit": "271ea573b0a4f265d16108db2ec7c928f3e9aa31", + "sha256": "0y709x03har1sm30vbja3k3vw4p1nfck5zii7cigl4vg0scpcri6" } }, { @@ -102638,20 +104422,20 @@ }, { "ename": "zone-nyan", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1g7i5p26gb9gny64b84x6zqml7fly5q9aykmc6l6c1kfl6pqxs94", - "fetcher": "github", - "repo": "wasamasa/zone-nyan", + "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", + "sha256": "12k55m9fxkvx57n99dynpdsx391z8pzd6cjm4bqarf88bhv7f72p", + "fetcher": "git", + "url": "https://depp.brause.cc/zone-nyan.git", "unstable": { "version": [ - 20170818, - 1644 + 20200506, + 1207 ], "deps": [ "esxml" ], - "commit": "4b1f8d95f130946718d52806489ffe2762aebfdc", - "sha256": "1axq4ch7garlfrybq9kgv6x7d8y4dw5y9pqbqlqvlwf4xmdrvzmm" + "commit": "48625814f42c39521405d08009e1d44108d880ac", + "sha256": "1ii7w9y357l2467733wy7nnpikpdacjfj9bp2a54nq8h60gfr661" }, "stable": { "version": [ @@ -102907,22 +104691,22 @@ }, { "ename": "zpresent", - "commit": "3aae38ad54490fa650c832fb7d22e2c73b0fb060", - "sha256": "0316qyspmdbg94aw620133ilh8kfpr3db1p2cifgccgcacjv3v5j", - "fetcher": "bitbucket", - "repo": "zck/zpresent.el", + "commit": "d3828ad7599d13728b5571b882344c3ada434b85", + "sha256": "0i1qrb9qplmx9kx1286xypjyy48r9y3cvnlhi06r583adfr02wab", + "fetcher": "hg", + "url": "https://hg.sr.ht/~zck/zpresent", "unstable": { "version": [ - 20180605, - 438 + 20200417, + 309 ], "deps": [ "dash", "org-parser", "request" ], - "commit": "55fc14b66e2ea506247a4e7dd622a9dfe5545c4b", - "sha256": "17wkhl1a7jmg4ks011lf5h4f2vbhf8dl6vgzdzlmljk15f9hmw35" + "commit": "406967322b7692492a5942d901335d626cace4d0", + "sha256": "1nn6dvzcayh6nv6xn3siv09iixc5c3gy9c8y1fdwzq81yny9l2fr" } }, { diff --git a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix index 54e5a89dd9f68..4320a88457a41 100644 --- a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix +++ b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Mark a rectangle of text with highlighting"; - homepage = http://emacswiki.org/emacs/RectangleMark; + homepage = "http://emacswiki.org/emacs/RectangleMark"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix index 165e0c13c8fe6..e4b739af05178 100644 --- a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix +++ b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { (add-hook 'after-init-hook 'session-initialize) */ description = "Small session management for emacs"; - homepage = http://emacs-session.sourceforge.net/; + homepage = "http://emacs-session.sourceforge.net/"; license = "GPL"; }; } diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix index fcb37e7ebad35..7e611d68a0a46 100644 --- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix +++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "sunrise-commander-6r435"; src = fetchgit { - url = https://github.com/escherdragon/sunrise-commander.git; + url = "https://github.com/escherdragon/sunrise-commander.git"; rev = "7a44ca7abd9fe79f87934c78d00dc2a91419a4f1"; sha256 = "2909beccc9daaa79e70876ac6547088c2459b624c364dda1886fe4d7adc7708b"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Two-pane file manager for Emacs based on Dired and inspired by MC"; - homepage = http://www.emacswiki.org/emacs/Sunrise_Commander; + homepage = "http://www.emacswiki.org/emacs/Sunrise_Commander"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix b/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix index bcd947983a346..211be0a908971 100644 --- a/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix +++ b/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix @@ -17,6 +17,6 @@ trivialBuild { homepage = "http://bigwalter.net/daniel/elisp/sv-kalender.el"; platforms = platforms.all; license = licenses.gpl3Plus; - maintainers = [ maintainer.rycee ]; + maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix b/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix deleted file mode 100644 index 820919b5321f9..0000000000000 --- a/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ fetchurl, lib, melpaBuild }: - -melpaBuild { - pname = "thingatpt-plus"; - version = "20170307.1539"; - - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/thingatpt+.el"; - sha256 = "1k9y354315gvhbdk0m9xpjx24w1bwrnzlnfiils8xgdwnw4py99a"; - name = "thingatpt+.el"; - }; - - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+"; - sha256 = "0w031lzjl5phvzsmbbxn2fpziwkmdyxsn08h6b9lxbss1prhx7aa"; - name = "thingatpt-plus"; - }; - - meta = { - homepage = "https://melpa.org/#/thingatpt+"; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/tramp/default.nix b/pkgs/applications/editors/emacs-modes/tramp/default.nix index 3b746c293d88c..b87390d4609f8 100644 --- a/pkgs/applications/editors/emacs-modes/tramp/default.nix +++ b/pkgs/applications/editors/emacs-modes/tramp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [ emacs texinfo ]; meta = { description = "Transparently access remote files from Emacs. Newer versions than built-in."; - homepage = https://www.gnu.org/software/tramp; + homepage = "https://www.gnu.org/software/tramp"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/update-from-overlay b/pkgs/applications/editors/emacs-modes/update-from-overlay index 26d2482e7ae69..fc5657e441960 100755 --- a/pkgs/applications/editors/emacs-modes/update-from-overlay +++ b/pkgs/applications/editors/emacs-modes/update-from-overlay @@ -7,9 +7,13 @@ set -euxo pipefail curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/elpa/elpa-generated.nix nix-instantiate ../../../.. -A emacsPackagesNg.elpaPackages --show-trace -git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "elpa-packages: $(date --iso)" -- elpa-generated.nix +git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacsPackages.elpa-packages: $(date --iso)" -- elpa-generated.nix + +curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/org/org-generated.nix +nix-instantiate ../../../.. -A emacsPackagesNg.orgPackages --show-trace +git diff --exit-code org-generated.nix > /dev/null || git commit -m "emacsPackages.org-packages: $(date --iso)" -- org-generated.nix curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages -git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "melpa-packages: $(date --iso)" -- recipes-archive-melpa.json +git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "emacsPackages.melpa-packages: $(date --iso)" -- recipes-archive-melpa.json diff --git a/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix b/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix deleted file mode 100644 index 209a99245ecd6..0000000000000 --- a/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{stdenv, fetchurl, emacs}: - -stdenv.mkDerivation { - name = "yaoddmuse-0.1.2"; - - src = fetchurl { - url = "http://emacswiki.org/emacs/download/yaoddmuse.el"; - sha256 = "0vlllq3xmnlni0ws226pqxj68nshclbl5rgqv6y11i3yvzgiazr6"; - }; - - phases = [ "buildPhase" "installPhase"]; - - buildInputs = [ emacs ]; - - buildPhase = '' - cp $src yaoddmuse.el - emacs --batch -f batch-byte-compile yaoddmuse.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install yaoddmuse.el $out/share/emacs/site-lisp - ''; - - meta = { - description = "Comprehensive Emacs integration with Oddmuse wikis"; - homepage = http://emacswiki.org/emacs/Yaoddmuse; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix b/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix index 9403a51df5324..c771f5423a953 100644 --- a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix +++ b/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Integreate Emacs with Zeitgeist"; - homepage = http://zeitgeist-project.com/; + homepage = "http://zeitgeist-project.com/"; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix index e4643102f0ef2..5bc29a046bc5d 100644 --- a/pkgs/applications/editors/emacs/25.nix +++ b/pkgs/applications/editors/emacs/25.nix @@ -121,9 +121,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The extensible, customizable GNU text editor"; - homepage = https://www.gnu.org/software/emacs/; + homepage = "https://www.gnu.org/software/emacs/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley ]; + maintainers = with maintainers; [ lovek323 peti jwiegley ]; platforms = platforms.all; longDescription = '' diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 2b40eb77e2cf3..570dc28c684f3 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm +{ stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm , Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf @@ -11,6 +11,10 @@ , withCsrc ? true , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null , siteStart ? ./site-start.el +, toolkit ? ( + if withGTK2 then "gtk2" + else if withGTK3 then "gtk3" + else "lucid") }: assert (libXft != null) -> libpng != null; # probably a bug @@ -23,12 +27,7 @@ assert withGTK2 -> !withGTK3 && gtk2-x11 != null; assert withGTK3 -> !withGTK2 && gtk3-x11 != null; assert withXwidgets -> withGTK3 && webkitgtk != null; -let - toolkit = - if withGTK2 then "gtk2" - else if withGTK3 then "gtk3" - else "lucid"; -in + stdenv.mkDerivation rec { name = "emacs-${version}${versionModifier}"; version = "26.3"; @@ -44,6 +43,11 @@ stdenv.mkDerivation rec { patches = [ ./clean-env.patch ./tramp-detect-wrapped-gvfsd.patch + # unbreak macOS unexec + (fetchpatch { + url = "https://github.com/emacs-mirror/emacs/commit/888ffd960c06d56a409a7ff15b1d930d25c56089.patch"; + sha256 = "08q3ygdigqwky70r47rcgzlkc5jy82xiq8am5kwwy891wlpl7frw"; + }) ]; postPatch = lib.optionalString srcRepo '' @@ -132,9 +136,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The extensible, customizable GNU text editor"; - homepage = https://www.gnu.org/software/emacs/; + homepage = "https://www.gnu.org/software/emacs/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley adisbladis ]; + maintainers = with maintainers; [ lovek323 peti jwiegley adisbladis ]; platforms = platforms.all; longDescription = '' diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index e9307c7e80b99..1624e62026af9 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The extensible, customizable text editor"; - homepage = https://www.gnu.org/software/emacs/; + homepage = "https://www.gnu.org/software/emacs/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jwiegley matthewbauer ]; platforms = platforms.darwin; diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index e48fba1551e78..c6089fd5308cd 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtsvg qtx11extras ]; meta = with stdenv.lib; { description = "Lightweight Qt5 Plain-Text Editor for Linux"; - homepage = https://github.com/tsujan/FeatherPad; + homepage = "https://github.com/tsujan/FeatherPad"; platforms = platforms.linux; maintainers = [ maintainers.flosse ]; license = licenses.gpl3; diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 30e8af7facdb8..c30cfcb1fb9c7 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "focuswriter"; - version = "1.7.5"; + version = "1.7.6"; src = fetchurl { url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; - sha256 = "19fqxyas941xcqjj68qpj42ayq0vw5rbd4ms5kvx8jyspp7wysqc"; + sha256 = "0h85f6cs9zbxv118mjfxqfv41j19zkx2xq36mpnlmrlzkjj7dx9l"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; diff --git a/pkgs/applications/editors/fte/default.nix b/pkgs/applications/editors/fte/default.nix index ab149131b8082..f19a264c06a56 100644 --- a/pkgs/applications/editors/fte/default.nix +++ b/pkgs/applications/editors/fte/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free text editor for developers"; - homepage = http://fte.sourceforge.net/; + homepage = "http://fte.sourceforge.net/"; license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = platforms.all; diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index 928291940cfe3..fd1e61463f8b2 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0vhl8d7xxqqyl916nh8sgm1xdaf7xlc3r18464bd2av22q9yz68n"; }; - modSha256 = "0r0yq7kgz7i1wf4gxxihdrn1c8mi4wcyhadncxbln24s9c5apxsf"; + vendorSha256 = "1c16s5xiqr36azh2w90wg14jlw67ca2flbgjijpz7qd0ypxyfqlk"; buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ ehmry filalex77 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 8e5af1e814594..3db4e5649a518 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -9,6 +9,7 @@ , gnome3 , libgit2-glib , gobject-introspection +, glade , gspell , gtk-doc , gtk3 @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { ctags flatpak gnome3.devhelp - gnome3.glade + glade libgit2-glib libpeas libportal @@ -149,9 +150,9 @@ stdenv.mkDerivation rec { currently recommend running gnome-builder inside a nix-shell with appropriate dependencies loaded. ''; - homepage = https://wiki.gnome.org/Apps/Builder; + homepage = "https://wiki.gnome.org/Apps/Builder"; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index cfd3a4289901f..695a13eecabdd 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee , tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: let - version = "3.32.0"; + version = "3.36.0"; pname = "gnome-latex"; in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1jdca9yhm7mm1aijd1a5amphgn15142kngky3id2am379ixrq1hg"; + sha256 = "1869kr1zhcp04mzbi67lwgk497w840dbbc7427i9yh9b9s7j6mqn"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; @@ -38,7 +38,7 @@ in stdenv.mkDerivation { passthru.updateScript = gnome3.updateScript { packageName = pname; }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/GNOME-LaTeX; + homepage = "https://wiki.gnome.org/Apps/GNOME-LaTeX"; description = "A LaTeX editor for the GNOME desktop"; maintainers = [ maintainers.manveru ]; license = licenses.gpl3Plus; diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index f194227932d08..e3d039e42232d 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { preConfigure = "./autogen.sh"; meta = with stdenv.lib; { - homepage = http://gobby.0x539.de/; + homepage = "http://gobby.0x539.de/"; description = "A GTK-based collaborative editor supporting multiple documents in one session and a multi-user chat"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ maintainers.phreedom ]; diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix index 4e67fc304b184..7d1830c842b63 100644 --- a/pkgs/applications/editors/heme/default.nix +++ b/pkgs/applications/editors/heme/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { description = "Portable and fast console hex editor for unix operating systems"; - homepage = http://heme.sourceforge.net/; + homepage = "http://heme.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix index c87694321f35e..a1b90b83d589b 100644 --- a/pkgs/applications/editors/hexcurse/default.nix +++ b/pkgs/applications/editors/hexcurse/default.nix @@ -15,19 +15,19 @@ stdenv.mkDerivation rec { patches = [ # gcc7 compat (fetchpatch { - url = https://github.com/LonnyGomes/hexcurse/commit/d808cb7067d1df067f8b707fabbfaf9f8931484c.patch; + url = "https://github.com/LonnyGomes/hexcurse/commit/d808cb7067d1df067f8b707fabbfaf9f8931484c.patch"; sha256 = "0h8345blmc401c6bivf0imn4cwii67264yrzxg821r46wrnfvyi2"; }) # gcc7 compat (fetchpatch { - url = https://github.com/LonnyGomes/hexcurse/commit/716b5d58ac859cc240b8ccb9cbd79ace3e0593c1.patch; + url = "https://github.com/LonnyGomes/hexcurse/commit/716b5d58ac859cc240b8ccb9cbd79ace3e0593c1.patch"; sha256 = "0v6gbp6pjpmnzswlf6d97aywiy015g3kcmfrrkspsbb7lh1y3nix"; }) ]; meta = with lib; { description = "ncurses-based console hexeditor written in C"; - homepage = https://github.com/LonnyGomes/hexcurse; + homepage = "https://github.com/LonnyGomes/hexcurse"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/applications/editors/hexdino/default.nix index 48cd58570f8a2..79e0027d50963 100644 --- a/pkgs/applications/editors/hexdino/default.nix +++ b/pkgs/applications/editors/hexdino/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage { meta = with stdenv.lib; { description = "A hex editor with vim like keybindings written in Rust"; - homepage = https://github.com/Luz/hexdino; + homepage = "https://github.com/Luz/hexdino"; license = licenses.mit; maintainers = [ maintainers.luz ]; platforms = platforms.all; diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/applications/editors/hexedit/default.nix index 09191b38e1bc3..916dd4a15948a 100644 --- a/pkgs/applications/editors/hexedit/default.nix +++ b/pkgs/applications/editors/hexedit/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "View and edit files in hexadecimal or in ASCII"; - homepage = http://prigaux.chez.com/hexedit.html; + homepage = "http://prigaux.chez.com/hexedit.html"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/applications/editors/howl/default.nix index 5e5f2f8563cb8..975016d55417e 100644 --- a/pkgs/applications/editors/howl/default.nix +++ b/pkgs/applications/editors/howl/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://howl.io/; + homepage = "https://howl.io/"; description = "A general purpose, fast and lightweight editor with a keyboard-centric minimalistic user interface"; license = licenses.mit; maintainers = with maintainers; [ pacien ]; diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix index fc1fe969bdc0d..096b69a5e82a7 100644 --- a/pkgs/applications/editors/ht/default.nix +++ b/pkgs/applications/editors/ht/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "File editor/viewer/analyzer for executables"; - homepage = http://hte.sourceforge.net; + homepage = "http://hte.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index 21a6a8475182a..fd8b53372510d 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/pkgs/applications/editors/jedit/default.nix @@ -3,11 +3,11 @@ let version = "5.2.0"; bcpg = fetchurl { - url = http://central.maven.org/maven2/org/bouncycastle/bcpg-jdk16/1.46/bcpg-jdk16-1.46.jar; + url = "http://central.maven.org/maven2/org/bouncycastle/bcpg-jdk16/1.46/bcpg-jdk16-1.46.jar"; sha256 = "16xhmwks4l65m5x150nd23y5lyppha9sa5fj65rzhxw66gbli82d"; }; jsr305 = fetchurl { - url = http://central.maven.org/maven2/com/google/code/findbugs/jsr305/2.0.0/jsr305-2.0.0.jar; + url = "http://central.maven.org/maven2/com/google/code/findbugs/jsr305/2.0.0/jsr305-2.0.0.jar"; sha256 = "0s74pv8qjc42c7q8nbc0c3b1hgx0bmk3b8vbk1z80p4bbgx56zqy"; }; in @@ -58,7 +58,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Mature programmer's text editor (Java based)"; - homepage = http://www.jedit.org; + homepage = "http://www.jedit.org"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index bca85c01016ad..07776bebe4258 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, p7zip +{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf , coreutils, gnugrep, which, git, unzip, libsecret, libnotify }: @@ -19,14 +19,14 @@ with stdenv; lib.makeOverridable mkDerivation rec { comment = lib.replaceChars ["\n"] [" "] meta.longDescription; desktopName = product; genericName = meta.description; - categories = "Application;Development;"; + categories = "Development;"; icon = execName; extraEntries = '' StartupWMClass=${wmClass} ''; }; - nativeBuildInputs = [ makeWrapper patchelf p7zip unzip ]; + nativeBuildInputs = [ makeWrapper patchelf unzip ]; patchPhase = lib.optionalString (!stdenv.isDarwin) '' get_file_size() { diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 8d5e8540aa142..2319e0560de16 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -15,7 +15,7 @@ let inherit name version src wmClass jdk; product = "CLion"; meta = with stdenv.lib; { - homepage = https://www.jetbrains.com/clion/; + homepage = "https://www.jetbrains.com/clion/"; inherit description license; longDescription = '' Enhancing productivity for every C and C++ @@ -83,7 +83,7 @@ let inherit name version src wmClass jdk; product = "DataGrip"; meta = with stdenv.lib; { - homepage = https://www.jetbrains.com/datagrip/; + homepage = "https://www.jetbrains.com/datagrip/"; inherit description license; longDescription = '' DataGrip is a new IDE from JetBrains built for database admins. @@ -100,7 +100,7 @@ let inherit name version src wmClass jdk; product = "Goland"; meta = with stdenv.lib; { - homepage = https://www.jetbrains.com/go/; + homepage = "https://www.jetbrains.com/go/"; inherit description license; longDescription = '' Goland is the codename for a new commercial IDE by JetBrains @@ -125,7 +125,7 @@ let inherit name version src wmClass jdk; product = "IDEA"; meta = with stdenv.lib; { - homepage = https://www.jetbrains.com/idea/; + homepage = "https://www.jetbrains.com/idea/"; inherit description license; longDescription = '' IDE for Java SE, Groovy & Scala development Powerful @@ -143,7 +143,7 @@ let inherit name version src wmClass jdk; product = "PhpStorm"; meta = with stdenv.lib; { - homepage = https://www.jetbrains.com/phpstorm/; + homepage = "https://www.jetbrains.com/phpstorm/"; inherit description license; longDescription = '' PhpStorm provides an editor for PHP, HTML and JavaScript @@ -160,7 +160,7 @@ let inherit name version src wmClass jdk; product = "PyCharm"; meta = with stdenv.lib; { - homepage = https://www.jetbrains.com/pycharm/; + homepage = "https://www.jetbrains.com/pycharm/"; inherit description license; longDescription = '' Python IDE with complete set of tools for productive @@ -187,7 +187,7 @@ let inherit name version src wmClass jdk; product = "Rider"; meta = with stdenv.lib; { - homepage = https://www.jetbrains.com/rider/; + homepage = "https://www.jetbrains.com/rider/"; inherit description license; longDescription = '' JetBrains Rider is a new .NET IDE based on the IntelliJ @@ -213,7 +213,7 @@ let inherit name version src wmClass jdk; product = "RubyMine"; meta = with stdenv.lib; { - homepage = https://www.jetbrains.com/ruby/; + homepage = "https://www.jetbrains.com/ruby/"; inherit description license; longDescription = description; maintainers = with maintainers; [ edwtjo ]; @@ -226,7 +226,7 @@ let inherit name version src wmClass jdk; product = "WebStorm"; meta = with stdenv.lib; { - homepage = https://www.jetbrains.com/webstorm/; + homepage = "https://www.jetbrains.com/webstorm/"; inherit description license; longDescription = '' WebStorm provides an editor for HTML, JavaScript (incl. Node.js), @@ -250,12 +250,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2019.3.5"; /* updated by script */ + version = "2020.1.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0qmhp0sqcknwgsirnbi6461lzr7mxgrgjsd0q5cxnhscbbczl7pk"; /* updated by script */ + sha256 = "0136hmknkxrsgbygxqzrq1836kg02p14hmv5mzbpp79yglhv2xml"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -263,12 +263,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2019.3.4"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1ygbi212sga6mdkassi51idh7ppchr77ifq3vi5bbm4ibgnsf2b4"; /* updated by script */ + sha256 = "0ivnicpn67mfyhmiwbx80pq5l2xa4g1cpp79mh7rgm2c5klmf201"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -276,12 +276,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2019.3.3"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "091ym7vyb0hxzz6a1jfb88x0lj499vjd04bq8swmw14m1akmk3lf"; /* updated by script */ + sha256 = "0v6vi6m94fwzsg5s357ymh8604zkv6q0zhyqfh9sj4ynzi7l4fyv"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -289,12 +289,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2019.3.4"; /* updated by script */ + version = "2020.1.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1kspj5a9z6smcgrfxdylvc0y53s7y6jv7ckfhmbkvplmrj0h0wd7"; /* updated by script */ + sha256 = "0q848swfg9mjiini5bbjdj1f0qpd1n4glxdpncjj7mbpvp7s2h5k"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -302,12 +302,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2019.3.4"; /* updated by script */ + version = "2020.1.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "1i34kcd2j1xwx3l2sqc6jh3b69wqbxwwlq5yb7kf2ms9x4144bn0"; /* updated by script */ + sha256 = "13khjc7fp28mpcdn74msdw57nzhicg32xrrvj7s7na2qd9gqz0hf"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -315,12 +315,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2019.3.4"; /* updated by script */ + version = "2020.1.1"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1bxi2i6vxpw8x4mvb4d5plqy4r938xjf8nkimfg0sspramcc4r5m"; /* updated by script */ + sha256 = "16gclbczd9czqhply0xb2ykv0bw4bgv85fihy1n2szc4rp643qdw"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -328,12 +328,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2019.3.4"; /* updated by script */ + version = "2020.1.1"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0k917si1d28fnmjyvi0fs7rkdyvi2vr0d138436lh300a6y0z6wr"; /* updated by script */ + sha256 = "0p2q01yragab7c15aicpmaby075y7mpf6iavdfipi033q4gnlnki"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -341,12 +341,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2019.3.4"; /* updated by script */ + version = "2020.1.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1hdwzkh6qzad2pqskqw9m8glj15x9d2g4csl0dxk6an82ps52naz"; /* updated by script */ + sha256 = "1lq97aqnibvg483ww7wi8slh302gydd2kdkw6p2516rjcmm6n324"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -354,12 +354,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2019.3.4"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "17axv0v31dpmjcaij5qpqqm071mwhmf1ahy0y0h96limq8cw9872"; /* updated by script */ + sha256 = "0flwq61p7827f8nmldqgfpxbfl422imclksw6w97mgzqqhcbgksd"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -367,12 +367,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2019.3.3"; /* updated by script */ + version = "2020.1.1"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0lkzb3rifr7r23vijcz7rqcxjpykx7dkghiq5prk1zz83hzi4b2j"; /* updated by script */ + sha256 = "0xhx3n2xdk0k0qx7hdiyfga16hjf2j95k219wh7mh0cys20hkrg8"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -380,12 +380,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2019.3.4"; /* updated by script */ + version = "2020.1.1"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0q3595r4m22wf5r5zyncr1zv7yap5przbzjnyf75y51mqwl1g61i"; /* updated by script */ + sha256 = "0d543g06bxpw4q2p19vmvrxpbhqsvspjbs3sqnw6hxni7wcflhkg"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix index 6f5839b3d06f6..bb227512387d2 100644 --- a/pkgs/applications/editors/joe/default.nix +++ b/pkgs/applications/editors/joe/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A full featured terminal-based screen editor"; - homepage = https://joe-editor.sourceforge.io; + homepage = "https://joe-editor.sourceforge.io"; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 2682c1e789b4a..53549986ed241 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "1.2.3"; meta = { - homepage = https://github.com/cppit/jucipp; + homepage = "https://github.com/cppit/jucipp"; description = "A lightweight, platform independent C++-IDE with support for C++11, C++14, and experimental C++17 features depending on libclang version"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/editors/jupp/default.nix b/pkgs/applications/editors/jupp/default.nix index 4a44b35a0fa77..79db7b8a558a7 100644 --- a/pkgs/applications/editors/jupp/default.nix +++ b/pkgs/applications/editors/jupp/default.nix @@ -1,18 +1,16 @@ -{ stdenv, fetchurl -, ncurses, gpm -}: +{ stdenv, fetchurl, ncurses, gpm }: stdenv.mkDerivation rec { pname = "jupp"; - version = "3.1"; - srcName = "joe-3.1jupp31"; + version = "39"; + srcName = "joe-3.1${pname}${version}"; src = fetchurl { urls = [ "https://www.mirbsd.org/MirOS/dist/jupp/${srcName}.tgz" "https://pub.allbsd.org/MirOS/dist/jupp/${srcName}.tgz" ]; - sha256 = "1fnf9jsd6p4jyybkhjjs328qx38ywy8w029ngc7j7kqp0ixn0l0s"; + sha256 = "14gys92dy3kq9ikigry7q2x4w5v2z76d97vp212bddrxiqy5np8d"; }; preConfigure = "chmod +x ./configure"; @@ -37,7 +35,7 @@ stdenv.mkDerivation rec { and has a lot of bugs fixed. It is based upon an older version of joe because these behave better overall. ''; - homepage = http://mirbsd.de/jupp; + homepage = "http://www.mirbsd.org/jupp.htm"; license = licenses.gpl1; maintainers = with maintainers; [ AndersonTorres ]; }; diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/applications/editors/jupyter/kernel.nix index 43cea9fcae93d..fba884f5a2fd4 100644 --- a/pkgs/applications/editors/jupyter/kernel.nix +++ b/pkgs/applications/editors/jupyter/kernel.nix @@ -67,7 +67,7 @@ in meta = { description = "Wrapper to create jupyter notebook kernel definitions"; - homepage = https://jupyter.org/; + homepage = "https://jupyter.org/"; maintainers = with maintainers; [ aborsu ]; }; }; diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index 72ef081070400..4bd6e34b4fcb7 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-php"; - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "1hd3ckayrwszda517zfvhihrfmzq4m3kcsrz4sqkbvib0giwsfkp"; + sha256 = "1z3mmlg5srzff0y1pjd4wfdf9k4rzk7gfdvbvzizkiy395qw1phv"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index 275aaba4f2eba..80a5436c95566 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-python"; - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "0kna6vkxc6lrfzb3gzn11qvw8jpa86gi1k996hdk83gn0lhmkvx5"; + sha256 = "0k4j2kp77sz2p8s77wmcawia81bx7vfb2nnh9lqxzdk2mmlg387c"; }; cmakeFlags = [ diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix index b33153138130d..ad83bd43af2f2 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { KDevelop-PG-Qt is the parser-generator from KDevplatform. It is used for some KDevelop-languagesupport-plugins (Ruby, PHP, CSS...). ''; - homepage = https://www.kdevelop.org; + homepage = "https://www.kdevelop.org"; license = with stdenv.lib.licenses; [ lgpl2Plus ]; }; } diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 51dfbbab61e8d..476819369cf17 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "kdevelop"; - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0438721v24pim5q0q54ivsws9a679fm7ymrm1nn9g1fv06qsm4d8"; + sha256 = "18hxwkdbfw0qs3p19jv6d8wwwdzb9m087891i8w2bzkn21fd5pmy"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index 494ad686ee3bb..f928dbb6ad13f 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -54,7 +54,7 @@ mkDerivation rec { meta = { description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment"; - homepage = https://www.kde.org/applications/office/kile/; + homepage = "https://www.kde.org/applications/office/kile/"; maintainers = with lib.maintainers; [ fridh ]; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index 9d0d91f4be549..71fa2bcd41b50 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -125,8 +125,8 @@ in (with JavaScript coming soon). Using Kha or Kore you can access all hardware at the lowest possible level in a completely portable way. ''; - homepage = http://kode.tech/; - downloadPage = https://github.com/Kode/KodeStudio/releases; + homepage = "http://kode.tech/"; + downloadPage = "https://github.com/Kode/KodeStudio/releases"; license = licenses.mit; maintainers = [ maintainers.patternspandemic ]; platforms = [ "x86_64-linux" "i686-cygwin" ]; diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index 508d2329edc4c..94fa0be017375 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A notepad clone for GTK 2.0"; - homepage = http://tarot.freeshell.org/leafpad; + homepage = "http://tarot.freeshell.org/leafpad"; platforms = platforms.linux; maintainers = [ maintainers.flosse ]; license = licenses.gpl3; diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index f7c6d80dbf1a1..f09fd2ec27799 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.2"; + version = "6.2.1"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "07f10qwvi3p7bskzxnx5rlhlfrh7rx8v0xdlc4vs2271438j1j2z"; + sha256 = "1s9jvxwzsl32clp78g92nq9p2byf08libr5widl1jnkv1cpkbvh9"; }; dontBuild = true; diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 90e8c73e075d3..26c5ee4215279 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The next generation code editor"; - homepage = http://www.lighttable.com/; + homepage = "http://www.lighttable.com/"; license = licenses.gpl3; maintainers = [ maintainers.matejc ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/editors/lite/default.nix b/pkgs/applications/editors/lite/default.nix new file mode 100644 index 0000000000000..107be43383241 --- /dev/null +++ b/pkgs/applications/editors/lite/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, fetchFromGitHub +, SDL2 +, lua52Packages +, pkg-config +, makeWrapper +} : + +stdenv.mkDerivation rec { + pname = "lite"; + version = "1.03"; + + src = fetchFromGitHub { + owner = "rxi"; + repo = pname; + rev = "v${version}"; + sha256 = "1h8z4fav5ns9sm92axs3k9v6jgkqq0vg9mixza14949blr426mlj"; + }; + + nativeBuildInputs = [ makeWrapper pkg-config ]; + + buildInputs = [ SDL2 lua52Packages.lua ]; + + postPatch = '' + # use system Lua 5.2 + rm -rf src/lib/lua52 + substituteInPlace src/api/api.h \ + --replace '"lib/lua52/lua.h"' '<lua.h>' \ + --replace '"lib/lua52/lauxlib.h"' '<lauxlib.h>' \ + --replace '"lib/lua52/lualib.h"' '<lualib.h>' + ''; + + buildPhase = '' + # extracted and adapted from build.sh + CC=$NIX_CC/bin/cc + CFLAGS="-Wall -O3 -g -std=gnu11 -Isrc -DLUA_USE_POPEN $(pkg-config --cflags lua sdl2)" + LDFLAGS="$(pkg-config --libs lua sdl2)" + for f in $(find src -name "*.c"); do + $CC -c $CFLAGS $f -o "''${f//\//_}.o" + done + $CC *.o $LDFLAGS -o lite + ''; + + installPhase = '' + mkdir -p $out/bin $out/lib/${pname} + cp -a lite $out/lib/${pname} + cp -a data $out/lib/${pname} + makeWrapper $out/lib/${pname}/lite $out/bin/lite + ''; + + meta = with stdenv.lib; { + description = "A lightweight text editor written in Lua"; + homepage = "https://github.com/rxi/lite"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index dc8eb200fff95..deeb9b36c7194 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A open-source tool for writers"; - homepage = http://www.theologeek.ch/manuskript; + homepage = "http://www.theologeek.ch/manuskript"; longDescription = '' Manuskript is a tool for those writer who like to organize and plan everything before writing. The snowflake method can help you diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index de1a5ce7879fa..612cdcc7f8811 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, libbsd, ncurses, buildPackages }: +{ stdenv, fetchFromGitHub, pkgconfig, ncurses, buildPackages }: stdenv.mkDerivation rec { pname = "mg"; - version = "20171014"; + version = "6.7"; - src = fetchurl { - url = "http://homepage.boetes.org/software/mg/${pname}-${version}.tar.gz"; - sha256 = "0hakfikzsml7z0hja8m8mcahrmfy2piy81bq9nccsjplyfc9clai"; + src = fetchFromGitHub { + owner = "ibara"; + repo = "mg"; + rev = "mg-6.7"; + sha256 = "15adwibq6xrfxbrxzk765g9250iyfn4wbcxd7kcsabiwn6apm0ai"; }; enableParallelBuilding = true; @@ -17,14 +19,13 @@ stdenv.mkDerivation rec { install -m 555 -Dt $out/bin mg install -m 444 -Dt $out/share/man/man1 mg.1 ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libbsd ncurses ]; + buildInputs = [ ncurses ]; meta = with stdenv.lib; { description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; - homepage = "https://homepage.boetes.org/software/mg"; + homepage = "https://man.openbsd.org/OpenBSD-current/man1/mg.1"; license = licenses.publicDomain; platforms = platforms.all; }; diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index e6b93f20c4886..6a1ee5d196ee7 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "micro"; - version = "1.4.1"; + version = "2.0.3"; goPackagePath = "github.com/zyedidia/micro"; @@ -10,16 +10,18 @@ buildGoPackage rec { owner = "zyedidia"; repo = "micro"; rev = "v${version}"; - sha256 = "0m9p6smb5grdazsgr3m1x4rry9ihhlgl9ildhvfp53czrifbx0m5"; + sha256 = "017m9kb3gfrgzd06f1nma1i3m5rb0hzpgdikb86lsyv8ik18y12z"; fetchSubmodules = true; }; subPackages = [ "cmd/micro" ]; - buildFlagsArray = [ "-ldflags=" "-X main.Version=${version}" ]; + buildFlagsArray = [ "-ldflags=" "-X ${goPackagePath}/internal/util.Version=${version}" ]; + + goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://micro-editor.github.io; + homepage = "https://micro-editor.github.io"; description = "Modern and intuitive terminal-based text editor"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/applications/editors/micro/deps.nix b/pkgs/applications/editors/micro/deps.nix new file mode 100644 index 0000000000000..e8ed69a9088b3 --- /dev/null +++ b/pkgs/applications/editors/micro/deps.nix @@ -0,0 +1,336 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/blang/semver"; + fetch = { + type = "git"; + url = "https://github.com/blang/semver"; + rev = "v3.5.1"; + sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy"; + }; + } + { + goPackagePath = "github.com/chzyer/logex"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/logex"; + rev = "v1.1.10"; + sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4"; + }; + } + { + goPackagePath = "github.com/chzyer/readline"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/readline"; + rev = "2972be24d48e"; + sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; + }; + } + { + goPackagePath = "github.com/chzyer/test"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/test"; + rev = "a1ea475d72b1"; + sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + { + goPackagePath = "github.com/gdamore/encoding"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/encoding"; + rev = "v1.0.0"; + sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9"; + }; + } + { + goPackagePath = "github.com/go-errors/errors"; + fetch = { + type = "git"; + url = "https://github.com/go-errors/errors"; + rev = "v1.0.1"; + sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; + }; + } + { + goPackagePath = "github.com/kballard/go-shellquote"; + fetch = { + type = "git"; + url = "https://github.com/kballard/go-shellquote"; + rev = "95032a82bc51"; + sha256 = "1rspvmnsikdq95jmx3dykxd4k1rmgl98ryjrysvl0cf18hl1vq80"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/lucasb-eyer/go-colorful"; + fetch = { + type = "git"; + url = "https://github.com/lucasb-eyer/go-colorful"; + rev = "v1.0.3"; + sha256 = "12bgz6dxbb2ki1g3x7fg9ipsjgfkd58fp7cdpv63h4kvlj2n7j69"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.11"; + sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.7"; + sha256 = "1snr8mk63vz2h44knq26dm81p83887v7kb09iywqmx0nqzngih66"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "v1.1.0"; + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/robertkrimen/otto"; + fetch = { + type = "git"; + url = "https://github.com/robertkrimen/otto"; + rev = "c382bd3c16ff"; + sha256 = "043y6l647snsz71mdy84s2d3kn22aj6rbqd6c1vd8absvamqhlxa"; + }; + } + { + goPackagePath = "github.com/sergi/go-diff"; + fetch = { + type = "git"; + url = "https://github.com/sergi/go-diff"; + rev = "v1.1.0"; + sha256 = "0ir8ali2vx0j7pipmlfd6k8c973akyy2nmbjrf008fm800zcp7z2"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.0"; + sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.4.0"; + sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; + }; + } + { + goPackagePath = "github.com/yuin/gopher-lua"; + fetch = { + type = "git"; + url = "https://github.com/yuin/gopher-lua"; + rev = "ab39c6098bdb"; + sha256 = "13b0rrpv3988qw8rq6z7npajn1my059ybhafi5mxff9jw09k9sja"; + }; + } + { + goPackagePath = "github.com/zyedidia/clipboard"; + fetch = { + type = "git"; + url = "https://github.com/zyedidia/clipboard"; + rev = "241f98e9b197"; + sha256 = "1glc8w30sijpbppcvaf3503rmx5nxqkcgw87dr2pr3q3vv1bg3zi"; + }; + } + { + goPackagePath = "github.com/zyedidia/glob"; + fetch = { + type = "git"; + url = "https://github.com/zyedidia/glob"; + rev = "dd4023a66dc3"; + sha256 = "1vqw4xbqq6j8p5m7mwxvb448w69vjvgzx0ndsfzdh2cxfirwp3y7"; + }; + } + { + goPackagePath = "github.com/zyedidia/highlight"; + fetch = { + type = "git"; + url = "https://github.com/zyedidia/highlight"; + rev = "201131ce5cf5"; + sha256 = "0blaynf32swmqddx2hcrifrfssj9c04kwnbdy42h3kzxihrwz4ps"; + }; + } + { + goPackagePath = "github.com/zyedidia/json5"; + fetch = { + type = "git"; + url = "https://github.com/zyedidia/json5"; + rev = "2da050b1a98d"; + sha256 = "1sgydazf3npr788b4w17ydmlh3fd1zmpriv9b69967ww90ckh2kz"; + }; + } + { + goPackagePath = "github.com/zyedidia/poller"; + fetch = { + type = "git"; + url = "https://github.com/zyedidia/poller"; + rev = "v1.0.1"; + sha256 = "10cjrqfk1j0l55bdbpm7kv4mqc665pngc8avai0p9chq03y2654g"; + }; + } + { + goPackagePath = "github.com/zyedidia/pty"; + fetch = { + type = "git"; + url = "https://github.com/zyedidia/pty"; + rev = "v2.0.0"; + sha256 = "1n946ld8y2v2wfbwsxv8rfaicxbw3w8pk11ryc8iybmw7hkmmf79"; + }; + } + { + goPackagePath = "github.com/zyedidia/tcell"; + fetch = { + type = "git"; + url = "https://github.com/zyedidia/tcell"; + rev = "v1.4.4"; + sha256 = "0d62a9csab15b64y09jcbvq71065wliw4bd5m7lfpl5k8rmrrdyi"; + }; + } + { + goPackagePath = "github.com/zyedidia/terminal"; + fetch = { + type = "git"; + url = "https://github.com/zyedidia/terminal"; + rev = "533c623e2415"; + sha256 = "16l628f3zgl5yp9z5zkfy2hyl2sckw4d6mg3iqv2jjvh4i8yhrsm"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "33540a1f6037"; + sha256 = "0fjcv0vzvi6za0b4xmnk3932pr9f9gczzf03y0kgq3ry9rqg169y"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.2"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "90fa682c2a6e"; + sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "41f04d3bba15"; + sha256 = "0vfk9czmlxmp6wndq8k17rhnjxal764mxfhrccza7nwlia760pjy"; + }; + } + { + goPackagePath = "gopkg.in/sourcemap.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/sourcemap.v1"; + rev = "v1.0.5"; + sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.7"; + sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj"; + }; + } + { + goPackagePath = "layeh.com/gopher-luar"; + fetch = { + type = "git"; + url = "https://github.com/layeh/gopher-luar"; + rev = "v1.0.7"; + sha256 = "1rdbni3q7zajmiy62ccvbfgqjzppk5212wpwks2ba726hvyf85mj"; + }; + } +] diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix index 9cfcf95e78b16..82aa38c14499c 100644 --- a/pkgs/applications/editors/mindforger/default.nix +++ b/pkgs/applications/editors/mindforger/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, qmake, qtbase, qtwebkit }: +{ mkDerivation, stdenv, fetchurl, qmake, qtbase, qtwebkit }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "mindforger"; version = "1.48.2"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { MindForger is actually more than an editor or IDE - it's human mind inspired personal knowledge management tool ''; - homepage = https://www.mindforger.com; + homepage = "https://www.mindforger.com"; license = licenses.gpl2Plus; platforms = platforms.all; }; diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix index 4e960524b94f7..060abda33d0d1 100644 --- a/pkgs/applications/editors/moe/default.nix +++ b/pkgs/applications/editors/moe/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { completion, directory browser, duplicate removal from prompt histories, delimiter matching, text conversion from/to UTF-8, romanization, etc. ''; - homepage = https://www.gnu.org/software/moe/; + homepage = "https://www.gnu.org/software/moe/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 8522ecf9c78fc..08841eb581002 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { TuxGuitar is a multitrack guitar tablature editor and player written in Java-SWT. It can open GuitarPro, PowerTab and TablEdit files. ''; - homepage = http://www.tuxguitar.com.ar/; + homepage = "http://www.tuxguitar.com.ar/"; license = licenses.lgpl2; maintainers = [ maintainers.ardumont ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index e3c315275dd5d..b4ce588050faa 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://www.nano-editor.org/; + homepage = "https://www.nano-editor.org/"; description = "A small, user-friendly console text editor"; license = licenses.gpl3Plus; maintainers = with maintainers; [ diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/applications/editors/nano/nanorc/default.nix index eab37fba19a74..5f3a1ac91bd67 100644 --- a/pkgs/applications/editors/nano/nanorc/default.nix +++ b/pkgs/applications/editors/nano/nanorc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Improved Nano Syntax Highlighting Files"; - homepage = https://github.com/scopatz/nanorc; + homepage = "https://github.com/scopatz/nanorc"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ nequissimus ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 2fff5cdce8543..475330a5fe57b 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -112,7 +112,7 @@ in modifications to the core source - Improve extensibility with a new plugin architecture ''; - homepage = https://www.neovim.io; + homepage = "https://www.neovim.io"; # "Contributions committed before b17d96 by authors who did not sign the # Contributor License Agreement (CLA) remain under the Vim license. # Contributions committed after b17d96 are licensed under Apache 2.0 unless diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index c77cfd9c2b6e6..06beff03f9041 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -22,7 +22,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A tool that helps controlling nvim processes from a terminal"; - homepage = https://github.com/mhinz/neovim-remote/; + homepage = "https://github.com/mhinz/neovim-remote/"; license = licenses.mit; maintainers = with maintainers; [ edanaher ]; platforms = platforms.unix; diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix index efda2c5836044..a51f5106930e2 100644 --- a/pkgs/applications/editors/notepadqq/default.nix +++ b/pkgs/applications/editors/notepadqq/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = https://notepadqq.com/; + homepage = "https://notepadqq.com/"; description = "Notepad++-like editor for the Linux desktop"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index a7a6b35a24a06..ed08954f8ba0c 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -48,8 +48,9 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.bostic.com/vi/; + homepage = "http://www.bostic.com/vi/"; description = "The Berkeley Vi Editor"; license = stdenv.lib.licenses.free; + broken = true; # since 2020-02-08 }; } diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix index 567f475203527..dcf42b55c5c59 100644 --- a/pkgs/applications/editors/nvpy/default.nix +++ b/pkgs/applications/editors/nvpy/default.nix @@ -30,7 +30,7 @@ in pythonPackages.buildPythonApplication rec { meta = with pkgs.lib; { description = "A simplenote-syncing note-taking tool inspired by Notational Velocity"; - homepage = https://github.com/cpbotha/nvpy; + homepage = "https://github.com/cpbotha/nvpy"; platforms = platforms.linux; license = licenses.bsd3; }; diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index fa63ee90adc91..b9d92409198bb 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig +{ mkDerivation, stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig , kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts , qca-qt5, shared-mime-info }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "okteta"; version = "0.26.3"; diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index 9bc8e1bc920fb..8fa85ab755704 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quilter"; - version = "2.2.2"; + version = "2.2.4"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "1bgsbcx09ca063kdqfc7nigly99d7xgx2cbkpk1nkhr0hvkyg9l9"; + sha256 = "0xmnfqqdn7p84aksb8yzs14ikgy5driylr6m4p5ffsb6i9aa0i9h"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix index 9e9766f04e83c..cb658e8fcdac3 100644 --- a/pkgs/applications/editors/qxmledit/default.nix +++ b/pkgs/applications/editors/qxmledit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple XML editor based on qt libraries" ; - homepage = https://sourceforge.net/projects/qxmledit; + homepage = "https://sourceforge.net/projects/qxmledit"; license = licenses.lgpl2; platforms = platforms.all; } ; diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 7f94b354dd29f..0cfa2b62dce3e 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.18"; + version = "2.19"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "v${version}"; - sha256 = "1m75ns6vgycyi3zjlc9w2gnry1gyfz1jxhrklcxxi6aap0jxlgnr"; + sha256 = "1y5slcwgs6p5n52whhhjg0c7053688311wnc9wqrk7vjk10qkx9d"; }; # We have not packaged tests. diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index e974238926167..7752313b2a7ed 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -54,7 +54,7 @@ in python.pkgs.buildPythonApplication { ''; meta = with stdenv.lib; { - homepage = https://github.com/retext-project/retext/; + homepage = "https://github.com/retext-project/retext/"; description = "Simple but powerful editor for Markdown and reStructuredText"; license = licenses.gpl3; maintainers = with maintainers; [ klntsky ]; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index f10578b11680a..3fe845a067b3d 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib +{ lib, mkDerivation, fetchurl, fetchpatch, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib , openssl, R, qtbase, qtxmlpatterns, qtsensors, qtwebengine, qtwebchannel , libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc , llvmPackages @@ -8,7 +8,7 @@ with lib; let verMajor = "1"; verMinor = "2"; - verPatch = "5033"; + verPatch = "5042"; version = "${verMajor}.${verMinor}.${verPatch}"; ginVer = "2.1.2"; gwtVer = "2.8.1"; @@ -26,11 +26,19 @@ mkDerivation rec { owner = "rstudio"; repo = "rstudio"; rev = "v${version}"; - sha256 = "0f3p2anz9xay2859bxj3bvyj582igsp628qxsccpkgn0jifvi4np"; + sha256 = "1n67fa357v51j3z1ma8v2ydfsx3y8n10k2svmfcf4mdzsi8w0kc5"; }; # Hack RStudio to only use the input R and provided libclang. - patches = [ ./r-location.patch ./clang-location.patch ]; + patches = [ ./r-location.patch ./clang-location.patch + (fetchpatch { + # Fetch a patch to ensure Rstudio compiles against R + # 4.0.0, should be removed next 1.2.X Rstudio update + # or possibly 1.3.X + url = "https://github.com/rstudio/rstudio/commit/3fb2397c2f208bb8ace0bbaf269481ccb96b5b20.patch"; + sha256 = "0qpgjy6aash0fc0xbns42cwpj3nsw49nkbzwyq8az01xwg81g0f3"; + }) + ]; postPatch = '' substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R} substituteInPlace src/cpp/core/libclang/LibClang.cpp \ @@ -57,7 +65,7 @@ mkDerivation rec { dictionaries = largeDicts ++ otherDicts; mathJaxSrc = fetchurl { - url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip; + url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip"; sha256 = "0wbcqb9rbfqqvvhqr1pbqax75wp8ydqdyhp91fbqfqp26xzjv6lk"; }; @@ -127,7 +135,7 @@ mkDerivation rec { meta = with lib; { description = "Set of integrated tools for the R language"; - homepage = https://www.rstudio.com/; + homepage = "https://www.rstudio.com/"; license = licenses.agpl3; maintainers = with maintainers; [ ehmry changlinli ciil ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index 78dd0d095414a..4e92856fee241 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "4.0.5"; src = fetchurl { - url = https://www.scintilla.org/scite405.tgz; + url = "https://www.scintilla.org/scite405.tgz"; sha256 = "0h16wk2986nkkhhdv5g4lxlcn02qwyja24x1r6vf02r1hf46b9q2"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.scintilla.org/SciTE.html; + homepage = "https://www.scintilla.org/SciTE.html"; description = "SCIntilla based Text Editor"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index ac171f60ead75..cbb9f7bd5b874 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -35,7 +35,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Free, open source, multi-platform ebook (ePub) editor"; - homepage = https://github.com/Sigil-Ebook/Sigil/; + homepage = "https://github.com/Sigil-Ebook/Sigil/"; license = licenses.gpl3; # currently unmaintained platforms = platforms.linux; diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index cd62c8bf65da7..18d9338f90932 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -50,7 +50,7 @@ in appimageTools.wrapType2 rec { Standard Notes is a private notes app that features unmatched simplicity, end-to-end encryption, powerful extensions, and open-source applications. ''; - homepage = https://standardnotes.org; + homepage = "https://standardnotes.org"; license = licenses.agpl3; maintainers = with maintainers; [ mgregoire ]; platforms = [ "i386-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix index 24639f3bfd462..b10008d0c4992 100644 --- a/pkgs/applications/editors/sublime/2/default.nix +++ b/pkgs/applications/editors/sublime/2/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { fetchurl { name = "sublimetext-2.0.2.tar.bz2"; url = [ - http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2 - https://download.sublimetext.com/Sublime%20Text%202.0.2.tar.bz2 + "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2" + "https://download.sublimetext.com/Sublime%20Text%202.0.2.tar.bz2" ]; sha256 = "026g5mppk28lzzzn9ibykcqkrd5msfmg0sc0z8w8jd7v3h28wcq7"; } @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { fetchurl { name = "sublimetext-2.0.2.tar.bz2"; url = [ - http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2 - https://download.sublimetext.com/Sublime%20Text%202.0.2%20x64.tar.bz2 + "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2" + "https://download.sublimetext.com/Sublime%20Text%202.0.2%20x64.tar.bz2" ]; sha256 = "115b71nbv9mv8cz6bkjwpbdf2ywnjc1zy2d3080f6ck4sqqfvfh1"; }; diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index 8e52237d949d2..22c23280d17d1 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -13,7 +13,7 @@ let primaryBinary = "sublime_text"; primaryBinaryAliases = [ "subl" "sublime" "sublime3" ]; downloadUrl = "https://download.sublimetext.com/sublime_text_3_build_${buildVersion}_${arch}.tar.bz2"; - versionUrl = "https://www.sublimetext.com/${if dev then "3dev" else "3"}"; + versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}"; versionFile = builtins.toString ./packages.nix; archSha256 = if stdenv.hostPlatform.system == "i686-linux" then @@ -133,7 +133,12 @@ in stdenv.mkDerivation (rec { set -o errexit PATH=${stdenv.lib.makeBinPath [ common-updater-scripts curl gnugrep ]} - latestVersion=$(curl -s ${versionUrl} | grep -Po '(?<=<p class="latest"><i>Version:</i> Build )([0-9]+)') + latestVersion=$(curl -s ${versionUrl}) + + if [[ "${buildVersion}" = "$latestVersion" ]]; then + echo "The new version same as the old version." + exit 0 + fi for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do # The script will not perform an update when the version attribute is up to date from previous platform run @@ -145,7 +150,7 @@ in stdenv.mkDerivation (rec { meta = with stdenv.lib; { description = "Sophisticated text editor for code, markup and prose"; - homepage = https://www.sublimetext.com/; + homepage = "https://www.sublimetext.com/"; maintainers = with maintainers; [ jtojnar wmertens demin-dmitriy zimbatm ]; license = licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix index 6714f917315c8..dc18bd694c696 100644 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ b/pkgs/applications/editors/supertux-editor/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Level editor for SuperTux"; - homepage = https://github.com/SuperTux/supertux-editor; + homepage = "https://github.com/SuperTux/supertux-editor"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mathnerd314 ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix index 48af4a99dadaa..3df13260d51f3 100644 --- a/pkgs/applications/editors/tecoc/default.nix +++ b/pkgs/applications/editors/tecoc/default.nix @@ -55,8 +55,8 @@ stdenv.mkDerivation rec { TECOC is a portable C implementation of TECO-11. ''; - homepage = https://github.com/blakemcbride/TECOC; - license = { url = https://github.com/blakemcbride/TECOC/tree/master/doc/readme-1st.txt; }; + homepage = "https://github.com/blakemcbride/TECOC"; + license = { url = "https://github.com/blakemcbride/TECOC/tree/master/doc/readme-1st.txt"; }; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/editors/texmacs/common.nix b/pkgs/applications/editors/texmacs/common.nix index ec2498aa69b9a..9479295e7471f 100644 --- a/pkgs/applications/editors/texmacs/common.nix +++ b/pkgs/applications/editors/texmacs/common.nix @@ -62,7 +62,7 @@ rec { Scheme extension language. A native spreadsheet and tools for collaborative authoring are planned for later. ''; - homepage = http://texmacs.org/; + homepage = "http://texmacs.org/"; license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index c45025dd80cc1..0b78ff54c358f 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -28,7 +28,7 @@ mkDerivation rec { LaTeX editing with completion, structure viewer, preview, spell checking and support of any compilation chain. ''; - homepage = http://www.xm1math.net/texmaker/; + homepage = "http://www.xm1math.net/texmaker/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ cfouche markuskowa ]; diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index d6db89e5c5e2b..94837023ca0d8 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -24,7 +24,7 @@ mkDerivation rec { LaTeX editing with completion, structure viewer, preview, spell checking and support of any compilation chain. ''; - homepage = http://texstudio.sourceforge.net; + homepage = "http://texstudio.sourceforge.net"; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ ajs124 cfouche ]; diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index 85006e51b6636..bb771c89010b1 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { ]; src = fetchhg { - url = http://foicica.com/hg/textadept; + url = "http://foicica.com/hg/textadept"; rev = "textadept_${version}"; sha256 = "0fai8xqddkkprmbf0cf8wwgv7ccfdb1iyim30nppm2m16whkc8fl"; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An extensible text editor based on Scintilla with Lua scripting"; - homepage = http://foicica.com/textadept; + homepage = "http://foicica.com/textadept"; license = licenses.mit; maintainers = with maintainers; [ raskin mirrexagon ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 0e73dffb20a97..bee9934a9ca1e 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tiled"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "0v8imw6zdygs9ymsgk41jclsfr1jwbracjc5balydh15r57rvwjd"; + sha256 = "0q3x1v88szxm8177qcnynfiyc7w8sn07ig6c7fjd164q7w30y24m"; }; nativeBuildInputs = [ pkgconfig qmake ]; diff --git a/pkgs/applications/editors/tweak/default.nix b/pkgs/applications/editors/tweak/default.nix index 6bfce921d0f6e..3dc7d04ede388 100644 --- a/pkgs/applications/editors/tweak/default.nix +++ b/pkgs/applications/editors/tweak/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An efficient hex editor"; - homepage = http://www.chiark.greenend.org.uk/~sgtatham/tweak; + homepage = "http://www.chiark.greenend.org.uk/~sgtatham/tweak"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 09baf383f9725..583229eb86841 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -60,9 +60,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A minimal Markdown reading & writing app"; - homepage = https://typora.io; + homepage = "https://typora.io"; license = licenses.unfree; - maintainers = with maintainers; [ jensbin worldofpeace ]; + maintainers = with maintainers; [ jensbin ]; platforms = [ "x86_64-linux"]; }; } diff --git a/pkgs/applications/editors/uemacs/default.nix b/pkgs/applications/editors/uemacs/default.nix index 0a2df6b6d4bb3..e14a07eb6835b 100644 --- a/pkgs/applications/editors/uemacs/default.nix +++ b/pkgs/applications/editors/uemacs/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "2014-12-08"; src = fetchgit { - url = git://git.kernel.org/pub/scm/editors/uemacs/uemacs.git; + url = "git://git.kernel.org/pub/scm/editors/uemacs/uemacs.git"; rev = "8841922689769960fa074fbb053cb8507f2f3ed9"; sha256 = "14yq7kpkax111cg6k7i3mnqk7sq7a65krq6qizzj7vvnm7bsj3sd"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation { buildInputs = [ ncurses ]; meta = with stdenv.lib; { - homepage = https://git.kernel.org/cgit/editors/uemacs/uemacs.git; + homepage = "https://git.kernel.org/cgit/editors/uemacs/uemacs.git"; description = "Torvalds Micro-emacs fork"; longDescription = '' uEmacs/PK 4.0 is a full screen editor based on MicroEMACS 3.9e diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/applications/editors/vbindiff/default.nix index d1aa59569e62b..110b7caaf81ac 100644 --- a/pkgs/applications/editors/vbindiff/default.nix +++ b/pkgs/applications/editors/vbindiff/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "A terminal visual binary diff viewer"; - homepage = https://www.cjmweb.net/vbindiff/; + homepage = "https://www.cjmweb.net/vbindiff/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 03b7d57b49dcb..8bdc0c0753c06 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.0343"; + version = "8.2.0510"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "063i52h8v7f87zamrw2ph057f0x2nzwf1s0izrm2psy41cyf4wa3"; + sha256 = "16ggwf238pzzkn3ng6n09qz9cgdzha9vc0ghlcxhwilnjh12l7p9"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index ae4e9ac8a9c99..95d2076153cb3 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -2,7 +2,7 @@ # default vimrc , vimrc ? fetchurl { name = "default-vimrc"; - url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/archlinux.vim?id=68f6d131750aa778807119e03eed70286a17b1cb; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/archlinux.vim?id=68f6d131750aa778807119e03eed70286a17b1cb"; sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c"; } # apple frameworks diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 92992b8896ab2..93ec48e54e0d8 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -27,13 +27,13 @@ in stdenv.mkDerivation { pname = "macvim"; - version = "8.2.319"; + version = "8.2.539"; src = fetchFromGitHub { owner = "macvim-dev"; repo = "macvim"; - rev = "snapshot-162"; - sha256 = "1mg55jlrz533wlqrx028fyv86rfhdzvm5kdi8xlf67flc5hh9vrp"; + rev = "snapshot-163"; + sha256 = "0ibc6h7zmk81dygkxd8a2rcq72zbqmr9kh64xhsm9h0p70505cdk"; }; enableParallelBuilding = true; @@ -66,7 +66,6 @@ stdenv.mkDerivation { "--with-tlib=ncurses" "--with-compiledby=Nix" "--disable-sparkle" - "LDFLAGS=-headerpad_max_install_names" ]; makeFlags = ''PREFIX=$(out) CPPFLAGS="-Wno-error"''; @@ -81,11 +80,6 @@ stdenv.mkDerivation { # This is unfortunate, but we need to use the same compiler as Xcode, # but Xcode doesn't provide a way to configure the compiler. - # - # If you're willing to modify the system files, you can do this: - # http://hamelot.co.uk/programming/add-gcc-compiler-to-xcode-6/ - # - # But we don't have that option. preConfigure = '' CC=/usr/bin/clang @@ -101,8 +95,34 @@ stdenv.mkDerivation { '' ; + # Because we're building with system clang, this means we're building against Xcode's SDK and + # linking against system libraries. The configure script is picking up Nix Libsystem (via ruby) + # so we need to patch that out or we'll get linker issues. The MacVim binary built by Xcode links + # against the system anyway so it doesn't really matter that the Vim binary will too. If we + # decide that matters, we can always patch it back to the Nix libsystem post-build. + # It also picks up libiconv, libunwind, and objc4 from Nix. These seem relatively harmless but + # let's strip them out too. + # + # Note: If we do add a post-build install_name_tool patch, we need to add the + # "LDFLAGS=-headerpad_max_install_names" flag to configureFlags and either patch it into the + # Xcode project or pass it as a flag to xcodebuild as well. postConfigure = '' - substituteInPlace src/auto/config.mk --replace "PERL_CFLAGS =" "PERL_CFLAGS = -I${darwin.libutil}/include" + substituteInPlace src/auto/config.mk \ + --replace "PERL_CFLAGS =" "PERL_CFLAGS = -I${darwin.libutil}/include" \ + --replace " -L${stdenv.cc.libc}/lib" "" \ + --replace " -L${darwin.libobjc}/lib" "" \ + --replace " -L${darwin.libunwind}/lib" "" \ + --replace " -L${darwin.libiconv}/lib" "" + + # All the libraries we stripped have -osx- in their name as of this time. + # Assert now that this pattern no longer appears in config.mk. + ( # scope variable + while IFS="" read -r line; do + if [[ "$line" == LDFLAGS*-osx-* ]]; then + echo "WARNING: src/auto/config.mk contains reference to Nix osx library" >&2 + fi + done <src/auto/config.mk + ) substituteInPlace src/MacVim/vimrc --subst-var-by CSCOPE ${cscope}/bin/cscope ''; @@ -143,7 +163,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Vim - the text editor - for macOS"; - homepage = https://github.com/macvim-dev/macvim; + homepage = "https://github.com/macvim-dev/macvim"; license = licenses.vim; maintainers = with maintainers; [ cstrahan lilyball ]; platforms = platforms.darwin; diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch index 9d5dbded26a1b..6b90b623cb68b 100644 --- a/pkgs/applications/editors/vim/macvim.patch +++ b/pkgs/applications/editors/vim/macvim.patch @@ -1,25 +1,5 @@ -diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj -index e519018de..556a4127d 100644 ---- a/src/MacVim/MacVim.xcodeproj/project.pbxproj -+++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj -@@ -1007,6 +1007,7 @@ - LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = ""; - ONLY_ACTIVE_ARCH = YES; -+ OTHER_LDFLAGS = "-headerpad_max_install_names"; - PRODUCT_BUNDLE_IDENTIFIER = org.vim.MacVim; - PRODUCT_NAME = MacVim; - VERSIONING_SYSTEM = "apple-generic"; -@@ -1039,6 +1040,7 @@ - LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = ""; - ONLY_ACTIVE_ARCH = YES; -+ OTHER_LDFLAGS = "-headerpad_max_install_names"; - PRODUCT_BUNDLE_IDENTIFIER = org.vim.MacVim; - PRODUCT_NAME = MacVim; - VERSIONING_SYSTEM = "apple-generic"; diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc -index 23a06bf37..dfb10fe94 100644 +index 23a06bf..dfb10fe 100644 --- a/src/MacVim/vimrc +++ b/src/MacVim/vimrc @@ -14,35 +14,5 @@ set backspace+=indent,eol,start @@ -61,10 +41,10 @@ index 23a06bf37..dfb10fe94 100644 +" Default cscopeprg to the Nix-installed path +set cscopeprg=@CSCOPE@ diff --git a/src/Makefile b/src/Makefile -index 32810d0a7..13a05f349 100644 +index 24c6934..d0f094e 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -1385,7 +1385,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ +@@ -1407,7 +1407,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ MacVim/MacVim.m MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o \ objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o @@ -74,10 +54,10 @@ index 32810d0a7..13a05f349 100644 MACVIMGUI_LIBS_DIR = MACVIMGUI_LIBS1 = -framework Cocoa -framework Carbon diff --git a/src/auto/configure b/src/auto/configure -index 9e6a82f4a..3c6d1a89b 100755 +index 730d6d5..0259112 100755 --- a/src/auto/configure +++ b/src/auto/configure -@@ -5829,10 +5829,7 @@ $as_echo "not found" >&6; } +@@ -5859,10 +5859,7 @@ $as_echo "not found" >&6; } for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do if test "X$path" != "X"; then @@ -89,7 +69,7 @@ index 9e6a82f4a..3c6d1a89b 100755 MZSCHEME_LIBS="${path}/libmzscheme3m.a" MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" elif test -f "${path}/libracket3m.a"; then -@@ -6217,23 +6214,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } +@@ -6247,23 +6244,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } fi if test "x$MACOS_X" = "xyes"; then @@ -113,7 +93,7 @@ index 9e6a82f4a..3c6d1a89b 100755 PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` fi -@@ -6456,13 +6436,7 @@ __: +@@ -6486,13 +6466,7 @@ __: eof eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" rm -f -- "${tmp_mkf}" @@ -128,7 +108,7 @@ index 9e6a82f4a..3c6d1a89b 100755 vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'` -@@ -6477,7 +6451,6 @@ eof +@@ -6507,7 +6481,6 @@ eof fi vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` @@ -136,7 +116,7 @@ index 9e6a82f4a..3c6d1a89b 100755 fi -@@ -6556,13 +6529,6 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -6586,13 +6559,6 @@ rm -f core conftest.err conftest.$ac_objext \ $as_echo "no" >&6; } fi @@ -150,7 +130,7 @@ index 9e6a82f4a..3c6d1a89b 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 $as_echo_n "checking if compile and link flags for Python are sane... " >&6; } cflags_save=$CFLAGS -@@ -7456,11 +7422,7 @@ $as_echo "$tclver - OK" >&6; }; +@@ -7486,11 +7452,7 @@ $as_echo "$tclver - OK" >&6; }; { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 $as_echo_n "checking for location of Tcl include... " >&6; } @@ -162,7 +142,7 @@ index 9e6a82f4a..3c6d1a89b 100755 TCL_INC= for try in $tclinc; do if test -f "$try/tcl.h"; then -@@ -7478,12 +7440,8 @@ $as_echo "<not found>" >&6; } +@@ -7508,12 +7470,8 @@ $as_echo "<not found>" >&6; } if test -z "$SKIP_TCL"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 $as_echo_n "checking for location of tclConfig.sh script... " >&6; } @@ -175,7 +155,7 @@ index 9e6a82f4a..3c6d1a89b 100755 for try in $tclcnf; do if test -f "$try/tclConfig.sh"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 -@@ -7673,10 +7631,6 @@ $as_echo "$rubyhdrdir" >&6; } +@@ -7703,10 +7661,6 @@ $as_echo "$rubyhdrdir" >&6; } if test -f "$rubylibdir/$librubya"; then librubyarg="$librubyarg" RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" @@ -187,10 +167,10 @@ index 9e6a82f4a..3c6d1a89b 100755 if test "X$librubyarg" != "X"; then diff --git a/src/vim.h b/src/vim.h -index f158aab..a714da9 100644 +index 87d1c92..8a7d5a5 100644 --- a/src/vim.h +++ b/src/vim.h -@@ -243,17 +243,6 @@ +@@ -250,17 +250,6 @@ # define SUN_SYSTEM #endif @@ -209,7 +189,7 @@ index f158aab..a714da9 100644 # include "os_amiga.h" #endif diff --git a/src/vimtutor b/src/vimtutor -index 1e8769b25..47078b0e7 100755 +index 1e8769b..47078b0 100755 --- a/src/vimtutor +++ b/src/vimtutor @@ -16,7 +16,7 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index 81948918a114a..0e3a4a1505263 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -32,7 +32,7 @@ in { enableParallelBuilding = true; # test this src = fetchgit { - url = https://bitbucket.org/equalsraf/vim-qt.git; + url = "https://bitbucket.org/equalsraf/vim-qt.git"; rev = "refs/tags/package-" + tag; inherit sha256; }; @@ -104,7 +104,7 @@ in { meta = with stdenv.lib; { description = "The most popular clone of the VI editor (Qt GUI fork)"; - homepage = https://bitbucket.org/equalsraf/vim-qt/wiki/Home; + homepage = "https://bitbucket.org/equalsraf/vim-qt/wiki/Home"; license = licenses.vim; maintainers = with maintainers; [ smironov ttuegel ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index 1bda6958206b7..85f78035a0f32 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A vim like editor"; - homepage = https://github.com/martanne/vis; + homepage = "https://github.com/martanne/vis"; license = licenses.isc; maintainers = with maintainers; [ vrthra ramkromberg ]; platforms = platforms.unix; diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index abd4a55c92b85..30060086fb535 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -78,8 +78,6 @@ in mkdir -p $out/lib/vscode $out/bin cp -r ./* $out/lib/vscode - substituteInPlace $out/lib/vscode/bin/${executableName} --replace '"$CLI" "$@"' '"$CLI" "--skip-getting-started" "$@"' - ln -s $out/lib/vscode/bin/${executableName} $out/bin mkdir -p $out/share/applications diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 765520ea9a4c5..5aa5881ec5a84 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0q1fk5a4ymndnyxzps8960y1rl657q95i2rydbqyjl37y79wmllx"; - x86_64-darwin = "02ybgp6v1ray4a867hihp2fvc872ilqla6z52qv90dfjx69g77ib"; + x86_64-linux = "16zchjp72m6n6za4ak5kn2ax1s5pjfn7l082d6gfbb2y62isvs7q"; + x86_64-darwin = "0w35s6nxagcnd6xcm6bp0m63agkqxffig61cr3nnmpbcgj9zc969"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.44.0"; + version = "1.45.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; @@ -48,8 +48,8 @@ in and code refactoring. It is also customizable, so users can change the editor's theme, keyboard shortcuts, and preferences ''; - homepage = https://code.visualstudio.com/; - downloadPage = https://code.visualstudio.com/Updates; + homepage = "https://code.visualstudio.com/"; + downloadPage = "https://code.visualstudio.com/Updates"; license = licenses.unfree; maintainers = with maintainers; [ eadwu synthetica ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 23a320ccce93f..5c7cb3fe6fc9b 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 = "1prv4rzr5z905s6jnmkmd97zr5kz8nn4m9bil483bnx4wqr2k10g"; - x86_64-darwin = "1p0a94i80s7fq6ars01bvr41qxiq35s0r6crfv857ma01g9ia7k3"; + x86_64-linux = "1wb4s2jw90irlawgl6539gwl0xwaxglaksmbcddbvnr6rq3ypn8n"; + x86_64-darwin = "16c1r7knfd5pfqhnk77nanh82azkc28pwkqfcyasbdgm70k17d3p"; }.${system}; sourceRoot = { @@ -27,12 +27,12 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.44.0"; + version = "1.45.0"; pname = "vscodium"; executableName = "codium"; longName = "VSCodium"; - shortName = "Codium"; + shortName = "vscodium"; src = fetchurl { url = "https://github.com/VSCodium/vscodium/releases/download/${version}/VSCodium-${plat}-${version}.${archive_fmt}"; @@ -51,10 +51,10 @@ in and code refactoring. It is also customizable, so users can change the editor's theme, keyboard shortcuts, and preferences ''; - homepage = https://github.com/VSCodium/vscodium; - downloadPage = https://github.com/VSCodium/vscodium/releases; + homepage = "https://github.com/VSCodium/vscodium"; + downloadPage = "https://github.com/VSCodium/vscodium/releases"; license = licenses.mit; - maintainers = with maintainers; [ synthetica ]; + maintainers = with maintainers; [ synthetica turion ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/applications/editors/wily/default.nix b/pkgs/applications/editors/wily/default.nix index aab3aecd7d693..ac741599bdab0 100644 --- a/pkgs/applications/editors/wily/default.nix +++ b/pkgs/applications/editors/wily/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An emulation of ACME"; - homepage = http://wily.sourceforge.net; + homepage = "http://wily.sourceforge.net"; license = licenses.artistic1; maintainers = [ maintainers.vrthra ]; platforms = platforms.unix; diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index 4725d8143b479..9b0fd592a6a2e 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/EUA/wxHexEditor/issues/90 (fetchpatch { - url = https://github.com/EUA/wxHexEditor/commit/d0fa3ddc3e9dc9b05f90b650991ef134f74eed01.patch; + url = "https://github.com/EUA/wxHexEditor/commit/d0fa3ddc3e9dc9b05f90b650991ef134f74eed01.patch"; sha256 = "1wcb70hrnhq72frj89prcqylpqs74xrfz3kdfdkq84p5qfz9svyj"; }) ./missing-semicolon.patch @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { a good reverse engineer tool like a good hex editor, you welcome. wxHexEditor could edit HDD/SDD disk devices or partitions in raw up to exabyte sizes. ''; - homepage = http://www.wxhexeditor.org/; + homepage = "http://www.wxhexeditor.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/editors/xmlcopyeditor/default.nix b/pkgs/applications/editors/xmlcopyeditor/default.nix index eeda097db2583..f3270fccdfe73 100644 --- a/pkgs/applications/editors/xmlcopyeditor/default.nix +++ b/pkgs/applications/editors/xmlcopyeditor/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A fast, free, validating XML editor"; - homepage = http://xml-copy-editor.sourceforge.net/; + homepage = "http://xml-copy-editor.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ candeira ]; diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index ae3871bb87af8..c7c57a9e3ef83 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { compiles to about 130Kb. ''; - homepage = https://www.gnu.org/software/zile/; + homepage = "https://www.gnu.org/software/zile/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 8734fabfdcf91..cb574ffc8f18e 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://grass.osgeo.org/; + homepage = "https://grass.osgeo.org/"; description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 80115ab8243ec..2e11f22f517b3 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -49,7 +49,7 @@ in mkDerivation rec { meta = { description = "A Free and Open Source Geographic Information System"; - homepage = http://www.qgis.org; + homepage = "http://www.qgis.org"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; maintainers = with lib.maintainers; [ lsix ]; diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 05f895bdee15c..388ac1ee7a7fb 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma, - libharu, opencv, vigra, postgresql, Cocoa, + libharu, opencv2, vigra, postgresql, Cocoa, unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }: stdenv.mkDerivation { @@ -8,7 +8,7 @@ stdenv.mkDerivation { # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin - buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma + buildInputs = [ gdal wxGTK30 proj libharu opencv2 vigra postgresql libiodbc lzma qhull giflib ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ]; diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index a10e62be46733..d81a08e290089 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "An advanced geospatial data analysis platform"; - homepage = http://www.uoguelph.ca/~hydrogeo/WhiteboxTools/index.html; + homepage = "http://www.uoguelph.ca/~hydrogeo/WhiteboxTools/index.html"; license = licenses.mit; maintainers = [ maintainers.mpickering ]; platforms = platforms.all; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 31eebf7d0a9f3..f2542301119ed 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -80,10 +80,9 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.imagemagick.org/; + homepage = "http://www.imagemagick.org/"; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; license = licenses.asl20; - maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 9cfccc7425bb6..0ded57b1a72c7 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -96,10 +96,9 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.imagemagick.org/; + homepage = "http://www.imagemagick.org/"; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ the-kenny ]; license = licenses.asl20; }; } diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix index e35a0190d8bc6..487648d07ca1a 100644 --- a/pkgs/applications/graphics/PythonMagick/default.nix +++ b/pkgs/applications/graphics/PythonMagick/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ python python.pkgs.boost imagemagick ]; meta = with stdenv.lib; { - homepage = http://www.imagemagick.org/script/api.php; + homepage = "http://www.imagemagick.org/script/api.php"; license = licenses.imagemagick; description = "PythonMagick provides object oriented bindings for the ImageMagick Library."; }; diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 87bddf9099ee2..c5f1bf8680185 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ahodesuka/ahoviewer; + homepage = "https://github.com/ahodesuka/ahoviewer"; description = "A GTK2 image viewer, manga reader, and booru browser"; maintainers = with maintainers; [ skrzyp xzfc ]; license = licenses.mit; diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix index 5132d5950aab8..6fc84e088dd39 100644 --- a/pkgs/applications/graphics/alchemy/default.nix +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Experimental in nature, Alchemy lets you brainstorm visually to explore an expanded range of ideas and possibilities in a serendipitous way. ''; - homepage = http://al.chemy.org/; + homepage = "http://al.chemy.org/"; license = licenses.gpl3Plus; maintainers = [ maintainers.marcweber ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/animbar/default.nix b/pkgs/applications/graphics/animbar/default.nix index c4f1b4218d079..771145d54b65f 100644 --- a/pkgs/applications/graphics/animbar/default.nix +++ b/pkgs/applications/graphics/animbar/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { names: picket fence animation, barrier grid animation, Moiré animation, to name a few. ''; - homepage = http://animbar.mnim.org; + homepage = "http://animbar.mnim.org"; maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 75ba3ecd55dc2..363f3b8c84d90 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -44,7 +44,7 @@ in meta = with stdenv.lib; { description = "A computer-aided design (CAD) tool from a parallel universe"; - homepage = https://github.com/mkeeter/antimony; + homepage = "https://github.com/mkeeter/antimony"; license = licenses.mit; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index 5ce36f4f10e98..e6865d2d8f07a 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit }: +{ stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit, wrapQtAppsHook, libglvnd }: stdenv.mkDerivation rec { pname = "apitrace"; @@ -15,10 +15,51 @@ stdenv.mkDerivation rec { # of games -- so it's fine to use e.g. bundled snappy. buildInputs = [ libX11 procps python2 libdwarf qtbase qtwebkit ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + # Don't automatically wrap all binaries, I prefer to explicitly only wrap + # `qapitrace`. + dontWrapQtApps = true; + + postFixup = '' + + # Since https://github.com/NixOS/nixpkgs/pull/60985, we add `/run-opengl-driver[-32]` + # to the `RUNPATH` of dispatcher libraries `dlopen()` ing OpenGL drivers. + # `RUNPATH` doesn't propagate throughout the whole application, but only + # from the module performing the `dlopen()`. + # + # Apitrace wraps programs by running them with `LD_PRELOAD` pointing to `.so` + # files in $out/lib/apitrace/wrappers. + # + # Theses wrappers effectively wrap the `dlopen()` calls from `libglvnd` + # and other dispatcher libraries, and run `dlopen()` by themselves. + # + # As `RUNPATH` doesn't propagate through the whole library, and they're now the + # library doing the real `dlopen()`, they also need to have + # `/run-opengl-driver[-32]` added to their `RUNPATH`. + # + # To stay simple, we add paths for 32 and 64 bits unconditionally. + # This doesn't have an impact on closure size, and if the 32 bit drivers + # are not available, that folder is ignored. + for i in $out/lib/apitrace/wrappers/*.so + do + echo "Patching OpenGL driver path for $i" + patchelf --set-rpath "/run/opengl-driver/lib:/run/opengl-driver-32/lib:$(patchelf --print-rpath $i)" $i + done + + # Theses open the OpenGL driver at runtime, but it is not listed as NEEDED libraries. They need + # a reference to libglvnd. + for i in $out/bin/eglretrace $out/bin/glretrace + do + echo "Patching RPath for $i" + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [libglvnd]}:$(patchelf --print-rpath $i)" $i + done + + wrapQtApp $out/bin/qapitrace + ''; meta = with stdenv.lib; { - homepage = https://apitrace.github.io; + homepage = "https://apitrace.github.io"; description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix index c64604975ab01..14af98ebc48ba 100644 --- a/pkgs/applications/graphics/autopanosiftc/default.nix +++ b/pkgs/applications/graphics/autopanosiftc/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "autopano-sift-C-2.5.1"; src = fetchurl { - url = mirror://sourceforge/hugin/autopano-sift-C-2.5.1.tar.gz; + url = "mirror://sourceforge/hugin/autopano-sift-C-2.5.1.tar.gz"; sha256 = "0dqk8ff82gmy4v5ns5nr9gpzkc1p7c2y8c8fkid102r47wsjk44s"; }; @@ -12,13 +12,13 @@ stdenv.mkDerivation { patches = [ (fetchurl { - url = https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch"; sha256 = "1bfcr5sps0ip9gl4jprji5jgf9wkczz6d2clsjjlbsy8r3ixi3lv"; }) ]; meta = { - homepage = http://hugin.sourceforge.net/; + homepage = "http://hugin.sourceforge.net/"; description = "Implementation in C of the autopano-sift algorithm for automatically stitching panoramas"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index 57e95dfef1063..cd7937f8a5498 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://autotrace.sourceforge.net/; + homepage = "http://autotrace.sourceforge.net/"; description = "Utility for converting bitmap into vector graphics"; platforms = platforms.unix; maintainers = with maintainers; [ hodapp ]; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 8b1811c645f2e..d72d52f3c2ff3 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.4.3"; + version = "4.6.3"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "03pq55mdgbaf6c2q57ww2990wr6qz8hk1r6xs1irqy8990m4afvk"; + sha256 = "1s8i82963fdx5q4wgh0cn211h0p1r1mzyss0g99bplp8d9ll40kw"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index b827a12f81c82..4d79f10a9e10f 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, flex, bison, qtdeclarative }: +{ mkDerivation, lib, fetchgit, qtbase, qmake, qtscript, flex, bison, qtdeclarative }: let @@ -11,7 +11,7 @@ let fetchSubmodules = true; }; - qtnproperty = stdenv.mkDerivation { + qtnproperty = mkDerivation { name = "qtnproperty"; inherit src; sourceRoot = "AwesomeBump/Sources/utils/QtnProperty"; @@ -22,7 +22,7 @@ let install -D bin-linux/QtnPEG $out/bin/QtnPEG ''; }; -in stdenv.mkDerivation { +in mkDerivation { pname = "awesomebump"; inherit version; @@ -30,12 +30,13 @@ in stdenv.mkDerivation { buildInputs = [ qtbase qtscript qtdeclarative ]; - nativeBuildInputs = [ qmake makeWrapper ]; + nativeBuildInputs = [ qmake ]; preBuild = '' ln -sf ${qtnproperty}/bin/QtnPEG Sources/utils/QtnProperty/bin-linux/QtnPEG ''; + dontWrapQtApps = true; postInstall = '' d=$out/libexec/AwesomeBump @@ -44,7 +45,7 @@ in stdenv.mkDerivation { cp -prd Bin/Configs Bin/Core $d/ # AwesomeBump expects to find Core and Configs in its current directory. - makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \ + makeQtWrapper $d/AwesomeBump $out/bin/AwesomeBump \ --run "cd $d" ''; @@ -53,7 +54,7 @@ in stdenv.mkDerivation { enableParallelBuilding = false; meta = { - homepage = https://github.com/kmkolasinski/AwesomeBump; + homepage = "https://github.com/kmkolasinski/AwesomeBump"; description = "A program to generate normal, height, specular or ambient occlusion textures from a single image"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.eelco ]; diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix index 2f636764e1fc8..67f1f47dccd01 100644 --- a/pkgs/applications/graphics/azpainter/default.nix +++ b/pkgs/applications/graphics/azpainter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ stdenv, fetchFromGitHub , libX11, libXext, libXi , freetype, fontconfig , libpng, libjpeg @@ -7,17 +7,15 @@ stdenv.mkDerivation rec { pname = "azpainter"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "Symbian9"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "0x5jmsprjissqcvwq75pqq9wgv4k9b7cy507hai8xk6xs3vxwgba"; + rev = "v${version}"; + sha256 = "sha256-al87Rnf4HkKdmtN3EqxC0zEHgVWwnVi7WttqT/Qxr0Q="; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libX11 libXext libXi freetype fontconfig @@ -25,14 +23,11 @@ stdenv.mkDerivation rec { zlib ]; - configureFlags = [ - "--with-freetype-dir=${stdenv.lib.getDev freetype}/include/freetype2" - ]; - meta = with stdenv.lib; { description = "Full color painting software for illustration drawing"; homepage = "https://osdn.net/projects/azpainter"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dtzWill ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix index 51156dea4a17f..3c78c8b6dbd23 100644 --- a/pkgs/applications/graphics/batik/default.nix +++ b/pkgs/applications/graphics/batik/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "batik-1.6"; builder = ./builder.sh; src = fetchurl { - url = http://tarballs.nixos.org/batik-1.6.zip; + url = "http://tarballs.nixos.org/batik-1.6.zip"; sha256 = "0cf15dspmzcnfda8w5lbsdx28m4v2rpq1dv5zx0r0n99ihqd1sh6"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Java based toolkit for handling SVG"; - homepage = https://xmlgraphics.apache.org/batik; + homepage = "https://xmlgraphics.apache.org/batik"; license = licenses.asl20; platforms = platforms.unix; knownVulnerabilities = [ diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index 55a5d49f7524c..61efec8dc9d45 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ++ stdenv.lib.optional stdenv.isDarwin Cocoa; meta = with stdenv.lib; { - homepage = http://www.itksnap.org/c3d; + homepage = "http://www.itksnap.org/c3d"; description = "Medical imaging processing tool"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index 2796a5535a03f..8e6e151aff6a4 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Viewer of CBR and CBZ files, often used to store scanned comics"; - homepage = http://comical.sourceforge.net/; + homepage = "http://comical.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix index a6b35b1d8ea61..a6cfd256ac581 100644 --- a/pkgs/applications/graphics/cq-editor/default.nix +++ b/pkgs/applications/graphics/cq-editor/default.nix @@ -6,13 +6,13 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "cq-editor"; - version = "0.1RC1"; + version = "0.1RC2"; src = fetchFromGitHub { owner = "CadQuery"; repo = "CQ-editor"; rev = version; - sha256 = "0iwcpnj15s64k16948sakvkn1lb4mqwrhmbxk3r03bczs0z33zax"; + sha256 = "0zima4pmn34s8b2axxwy6qd1f1r5ki34byq4x3rrd7n3g0hagxz5"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 771e6677b170a..b021c186b5c59 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "3.0.1"; + version = "3.0.2"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "1dvwmgnlfvi1lvdhgyddcp5apwlc8v5gwy9gmfcpra8lv8hkjjy5"; + sha256 = "1yrnkw8c47kmy2x6m1xp69hwyk02xyc8pd9kvcmyj54lzrhzdfka"; }; nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { "-DUSE_KWALLET=OFF" ]; + # Reduce the risk of collisions + postInstall = "rm -r $out/share/doc"; # darktable changed its rpath handling in commit # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the diff --git a/pkgs/applications/graphics/deskew/default.nix b/pkgs/applications/graphics/deskew/default.nix index c35aaa044aef7..422c7a0e15e80 100644 --- a/pkgs/applications/graphics/deskew/default.nix +++ b/pkgs/applications/graphics/deskew/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command line tool for deskewing scanned text documents"; - homepage = https://bitbucket.org/galfar/app-deskew/overview; + homepage = "https://bitbucket.org/galfar/app-deskew/overview"; license = licenses.mit; maintainers = with maintainers; [ryantm]; platforms = platforms.all; diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 3984cfc17ca5e..6ec54201fbfa5 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { version = "0.97.3.20170622"; src = fetchgit { - url = https://gitlab.gnome.org/GNOME/dia.git; + url = "https://gitlab.gnome.org/GNOME/dia.git"; rev = "b86085dfe2b048a2d37d587adf8ceba6fb8bc43c"; sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Gnome Diagram drawing software"; - homepage = http://live.gnome.org/Dia; + homepage = "http://live.gnome.org/Dia"; maintainers = with maintainers; [ raskin ]; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index e6e24e0e56f5d..63b8d7b3f6091 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -125,8 +125,7 @@ mkDerivation rec { meta = with lib; { description = "Photo Management Program"; license = licenses.gpl2; - homepage = https://www.digikam.org; - maintainers = with maintainers; [ the-kenny ]; + homepage = "https://www.digikam.org"; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index 7a4db535b2b0d..7a99361a03d9f 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -20,7 +20,7 @@ in buildPythonApplication { enableParallelBuilding = true; src = fetchurl { - url = mirror://sourceforge/project/dispcalgui/release/3.5.0.0/DisplayCAL-3.5.0.0.tar.gz; + url = "mirror://sourceforge/project/dispcalgui/release/3.5.0.0/DisplayCAL-3.5.0.0.tar.gz"; sha256 = "1j496sv8pbhby5hkkbp07k6bs3f7mb1l3dijmn2iga3kmix0fn5q"; }; @@ -62,7 +62,7 @@ in buildPythonApplication { meta = { description = "Display Calibration and Characterization powered by Argyll CMS"; - homepage = https://displaycal.net/; + homepage = "https://displaycal.net/"; license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index e26886b070e5e..b491c3e3ead09 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A comic strip downloader and archiver"; - homepage = https://dosage.rocks/; + homepage = "https://dosage.rocks/"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix index 144c723da20f0..ccd4fd660f76c 100644 --- a/pkgs/applications/graphics/draftsight/default.nix +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "2D design & drafting application, meant to be similar to AutoCAD"; longDescription = "Professional-grade 2D design and drafting solution from Dassault Systèmes that lets you create, edit, view and mark up any kind of 2D CAD drawing."; - homepage = https://www.3ds.com/products-services/draftsight-cad-software/; + homepage = "https://www.3ds.com/products-services/draftsight-cad-software/"; license = stdenv.lib.licenses.unfree; maintainers = with maintainers; [ hodapp ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index aa1ac0f262082..8281596374ccc 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "12.9.9"; + version = "13.0.3"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "07lx99fd4vkgdhagshzawrh8ncbv19hvxjpzgd3yjdj0nalvmxin"; + sha256 = "104pfwipm8ch9xqlsz1gh18icr1p6i3n4c77bbdjakxcy4s5n7sg"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index a8c4e6d14ba94..0ffcb5cdb410d 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -86,8 +86,8 @@ in mkDerivation rec { meta = { description = "A collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously"; - homepage = https://drawpile.net/; - downloadPage = https://drawpile.net/download/; + homepage = "https://drawpile.net/"; + downloadPage = "https://drawpile.net/download/"; license = licenses.gpl3; maintainers = with maintainers; [ fgaz ]; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix index 3b7bdfb8efc2d..bdbdf04bcd504 100644 --- a/pkgs/applications/graphics/epeg/default.nix +++ b/pkgs/applications/graphics/epeg/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/mattes/epeg; + homepage = "https://github.com/mattes/epeg"; description = "Insanely fast JPEG/ JPG thumbnail scaling"; platforms = platforms.linux ++ platforms.darwin; license = { diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index d8b08faf23982..7841e9d571b74 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Application for viewing OpenEXR images on a display at various exposure settings"; - homepage = http://openexr.com; + homepage = "http://openexr.com"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd3; }; diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix index c8928540bb656..39c23eb4fe8c3 100644 --- a/pkgs/applications/graphics/exrtools/default.nix +++ b/pkgs/applications/graphics/exrtools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Collection of utilities for manipulating OpenEXR images"; - homepage = http://scanline.ca/exrtools; + homepage = "http://scanline.ca/exrtools"; platforms = platforms.linux; license = licenses.mit; maintainers = [ maintainers.juliendehos ]; diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 3e64783df3165..7f0167f983424 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Image viewing and manipulation programs including fbi, fbgs, ida, exiftran and thumbnail.cgi"; - homepage = https://www.kraxel.org/blog/linux/fbida/; + homepage = "https://www.kraxel.org/blog/linux/fbida/"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 1eb99a9a7e415..a0e04bf4ad32a 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "feh"; - version = "3.3"; + version = "3.4"; src = fetchurl { url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; - sha256 = "04c8cgwzkax481sz7lbzy23mk79bqmjy3qpvr7vxa4c14mc9k5gk"; + sha256 = "0r83zincbfnk8g13xwm2qaccml9srnwlsmpc1f0nhwjkqyjmqm0q"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix index c364badc1742f..cd7db3d29c50d 100644 --- a/pkgs/applications/graphics/fig2dev/default.nix +++ b/pkgs/applications/graphics/fig2dev/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tool to convert Xfig files to other formats"; - homepage = http://mcj.sourceforge.net/; + homepage = "http://mcj.sourceforge.net/"; license = licenses.xfig; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index d7841fde82377..a53eb806bcf1b 100644 --- a/pkgs/applications/graphics/fluxus/default.nix +++ b/pkgs/applications/graphics/fluxus/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Livecoding environment for 3D graphics, sound, and games"; license = licenses.gpl2; - homepage = http://www.pawfal.org/fluxus/; + homepage = "http://www.pawfal.org/fluxus/"; maintainers = [ maintainers.brainrape ]; }; } diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index 7b186312301d1..877328e8823ea 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Find the most beautiful wallpapers for your desktop"; - homepage = https://github.com/calo001/fondo; + homepage = "https://github.com/calo001/fondo"; license = licenses.agpl3Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix index 3b86629760327..99ca119b3bcd3 100644 --- a/pkgs/applications/graphics/fontmatrix/default.nix +++ b/pkgs/applications/graphics/fontmatrix/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac"; - homepage = https://github.com/fontmatrix/fontmatrix; + homepage = "https://github.com/fontmatrix/fontmatrix"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index 57321220fb144..11d203746e1ae 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "freepv-0.3.0"; src = fetchurl { - url = mirror://sourceforge/freepv/freepv-0.3.0.tar.gz; + url = "mirror://sourceforge/freepv/freepv-0.3.0.tar.gz"; sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "Open source panorama viewer using GL"; - homepage = http://freepv.sourceforge.net/; + homepage = "http://freepv.sourceforge.net/"; license = [ stdenv.lib.licenses.lgpl21 ]; }; } diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix index 1d712a63fbdf9..c96ea765d43f0 100644 --- a/pkgs/applications/graphics/fstl/default.nix +++ b/pkgs/applications/graphics/fstl/default.nix @@ -2,7 +2,7 @@ mkDerivation rec { pname = "fstl"; - version = "0.9.3"; + version = "0.9.4"; buildInputs = [qtbase mesa_glu]; @@ -23,7 +23,7 @@ mkDerivation rec { owner = "mkeeter"; repo = "fstl"; rev = "v" + version; - sha256 = "1j0y9xbf0ybrrnsmfzgpyyz6bi98xgzn9ivani424j01vffns892"; + sha256 = "028hzdv11hgvcpc36q5scf4nw1256qswh37xhfn5a0iv7wycmnif"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index f729c9c2bba21..f585a0c5d29c1 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "Simple GTK 2 color selector"; - homepage = http://gcolor2.sourceforge.net/; + homepage = "http://gcolor2.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ notthemessiah ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix index 67be3ba6782c8..1c1c6ba08ee28 100644 --- a/pkgs/applications/graphics/gcolor3/default.nix +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A simple color chooser written in GTK3"; - homepage = https://www.hjdskes.nl/projects/gcolor3/; + homepage = "https://www.hjdskes.nl/projects/gcolor3/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 4275c6f0dcfd3..51c066196efde 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; - homepage = http://geeqie.sourceforge.net; + homepage = "http://geeqie.sourceforge.net"; maintainers = with maintainers; [ jfrankenau pSub ]; platforms = platforms.gnu ++ platforms.linux; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 0a06c42b5fc01..0b5e6a7f379f0 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -45,7 +45,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { */ name = "gap-2.6.0"; src = fetchurl { - url = https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2; + url = "https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2"; sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; }; NIX_LDFLAGS = "-lm"; @@ -56,7 +56,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { description = "The GIMP Animation Package"; - homepage = https://www.gimp.org; + homepage = "https://www.gimp.org"; # The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license # falls inside "free". license = with licenses; [ gpl3 free ]; @@ -143,7 +143,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { name = "wavelet-sharpen-0.1.2"; NIX_LDFLAGS = "-lm"; src = fetchurl { - url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz; + url = "http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz"; sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw"; }; installPhase = "installPlugins src/wavelet-sharpen"; # TODO translations are not copied .. How to do this on nix? @@ -156,7 +156,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { name = "lqr-plugin-0.6.1"; buildInputs = with pkgs; [ liblqr1 ]; src = fetchurl { - url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2; + url = "http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2"; sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9"; }; #postInstall = ''mkdir -p $out/nix-support; echo "${liblqr1}" > "$out/nix-support/propagated-user-env-packages"''; @@ -189,7 +189,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { meta = { description = "GIMP plugin to correct lens distortion using the lensfun library and database"; - homepage = http://lensfun.sebastiankraft.net/; + homepage = "http://lensfun.sebastiankraft.net/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; @@ -203,7 +203,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { exposureBlend = scriptDerivation { name = "exposure-blend"; src = fetchurl { - url = http://tir.astro.utoledo.edu/jdsmith/code/eb/exposure-blend.scm; + url = "http://tir.astro.utoledo.edu/jdsmith/code/eb/exposure-blend.scm"; sha256 = "1b6c9wzpklqras4wwsyw3y3jp6fjmhnnskqiwm5sabs8djknfxla"; }; meta.broken = true; @@ -212,7 +212,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { lightning = scriptDerivation { name = "Lightning"; src = fetchurl { - url = http://registry.gimp.org/files/Lightning.scm; + url = "http://registry.gimp.org/files/Lightning.scm"; sha256 = "c14a8f4f709695ede3f77348728a25b3f3ded420da60f3f8de3944b7eae98a49"; }; }; @@ -235,7 +235,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { # http://registry.gimp.org/node/153 name = "lightning-gate"; src = fetchurl { - url = http://registry.gimp.org/files/LightningGate.scm; + url = "http://registry.gimp.org/files/LightningGate.scm"; sha256 = "181w1zi9a99kn2mfxjp43wkwcgw5vbb6iqjas7a9mhm8p04csys2"; }; }; diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index fef296f45be20..be487fcb8a6bd 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Create labels and business cards"; - homepage = https://glabels.org/; + homepage = "https://glabels.org/"; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = platforms.unix; maintainers = [ maintainers.nico202 ]; diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 6cbe5448b40a2..8660f6f218e26 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "3.34.1"; + version = "3.34.2"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ifm8hmxpf9nnxddfcpkbc5wc5f5hz43yj83nnakzqr6x1mq7gdp"; + sha256 = "06ml5sf8xhpan410msqz085hmfc7082d368pb82yq646y9pcfn9w"; }; patches = [ @@ -117,9 +117,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Access, organize and share your photos"; - homepage = https://wiki.gnome.org/Apps/Photos; + homepage = "https://wiki.gnome.org/Apps/Photos"; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index 5b6dd42e09e55..fcb4bdb537437 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { - homepage = https://launchpad.net/gnuclad; + homepage = "https://launchpad.net/gnuclad"; description = "gnuclad tries to help the environment by creating trees. It's primary use will be generating cladogram trees for the GNU/Linux distro timeline project."; license = licenses.gpl3Plus; maintainers = with maintainers; [ mog ]; diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index f5fa8ca9221dd..7c586374ec513 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://jocr.sourceforge.net/; + homepage = "http://jocr.sourceforge.net/"; description = "GPL Optical Character Recognition"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 84fdb60c31efc..6fb5b91c2a92d 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open Source 3D voxel editor"; - homepage = https://guillaumechereau.github.io/goxel/; + homepage = "https://guillaumechereau.github.io/goxel/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ tilpner ]; diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index 86867cd1cca73..9e3ab37c32233 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A simple and fast image viewer for X"; - homepage = http://lxde.sourceforge.net/gpicview/; - repositories.git = git://lxde.git.sourceforge.net/gitroot/lxde/gpicview; + homepage = "http://lxde.sourceforge.net/gpicview/"; + repositories.git = "git://lxde.git.sourceforge.net/gitroot/lxde/gpicview"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index d82238f925b38..965ac5db68219 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "gqview-2.1.5"; src = fetchurl { - url = mirror://sourceforge/gqview/gqview-2.1.5.tar.gz; + url = "mirror://sourceforge/gqview/gqview-2.1.5.tar.gz"; sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A fast image viewer"; - homepage = http://gqview.sourceforge.net; + homepage = "http://gqview.sourceforge.net"; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index 039bb1917d37b..2a2a6a6759891 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance"; - homepage = http://pulkomandy.tk/projects/GrafX2; + homepage = "http://pulkomandy.tk/projects/GrafX2"; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.zoomulator ]; diff --git a/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch b/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch deleted file mode 100644 index 91eacecbf8c66..0000000000000 --- a/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch +++ /dev/null @@ -1,42 +0,0 @@ -# reduced version of commit f30492f40f78d867b43422215057dd21de4ba447 -# from upstream hg repository: -RegisterPNGImage(): Pass correct size value to strlcat(). - -diff -r 95c4711e8bee -r f30492f40f78 coders/png.c ---- a/coders/png.c Mon Jun 17 07:24:30 2019 -0500 -+++ b/coders/png.c Mon Jun 17 18:54:43 2019 -0500 -@@ -6427,26 +6427,26 @@ - - *version='\0'; - #if defined(PNG_LIBPNG_VER_STRING) -- (void) strlcat(version,"libpng ",MaxTextExtent); -- (void) strlcat(version,PNG_LIBPNG_VER_STRING,MaxTextExtent); -+ (void) strlcat(version,"libpng ",sizeof(version)); -+ (void) strlcat(version,PNG_LIBPNG_VER_STRING,sizeof(version)); - #if (PNG_LIBPNG_VER > 10005) - if (LocaleCompare(PNG_LIBPNG_VER_STRING,png_get_header_ver(NULL)) != 0) - { -- (void) strlcat(version,",",MaxTextExtent); -- (void) strlcat(version,png_get_libpng_ver(NULL),MaxTextExtent); -+ (void) strlcat(version,",",sizeof(version)); -+ (void) strlcat(version,png_get_libpng_ver(NULL),sizeof(version)); - } - #endif - #endif - - #if defined(ZLIB_VERSION) - if (*version != '\0') -- (void) strlcat(version,", ",MaxTextExtent); -- (void) strlcat(version,"zlib ",MaxTextExtent); -- (void) strlcat(version,ZLIB_VERSION,MaxTextExtent); -+ (void) strlcat(version,", ",sizeof(version)); -+ (void) strlcat(version,"zlib ",sizeof(version)); -+ (void) strlcat(version,ZLIB_VERSION,sizeof(version)); - if (LocaleCompare(ZLIB_VERSION,zlib_version) != 0) - { -- (void) strlcat(version,",",MaxTextExtent); -- (void) strlcat(version,zlib_version,MaxTextExtent); -+ (void) strlcat(version,",",sizeof(version)); -+ (void) strlcat(version,zlib_version,sizeof(version)); - } - #endif diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 403a5285e1501..b7a1a8c4a6f90 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -4,16 +4,15 @@ stdenv.mkDerivation rec { pname = "graphicsmagick"; - version = "1.3.32"; + version = "1.3.35"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "1qclp9i31idpcbbqswmnq2q11lmv0a7cvdb1y72xcky8sshaahmq"; + sha256 = "0l024l4hawm9s3jqrgi2j0lxgm61dqh8sgkj1017ma7y11hqv2hq"; }; patches = [ ./disable-popen.patch - ./1.3.32-darwin-png-strlcat-fix.patch ]; configureFlags = [ @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.graphicsmagick.org; + homepage = "http://www.graphicsmagick.org"; description = "Swiss army knife of image processing"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index d8f91638b91df..352b6b900cc65 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -100,7 +100,7 @@ perlPackages.buildPerlPackage rec { meta = { description = "A GUI to produce PDFs or DjVus from scanned documents"; - homepage = http://gscan2pdf.sourceforge.net/; + homepage = "http://gscan2pdf.sourceforge.net/"; license = licenses.gpl3; maintainers = with maintainers; [ pacien ]; }; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 4a6526fe9c6ec..27e8e00bdb3a9 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.8.3"; + version = "3.10.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1a0gss9cjcwayrcpkam5kc1giwbfy38jgqxvh33in9gfq9dgrygg"; + sha256 = "0j7cxp4hhkvkckyvll6pmqkv5rwrknlzq9j1my0grb01b8wzhw9y"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/guetzli/default.nix b/pkgs/applications/graphics/guetzli/default.nix index d7b9642596838..ccddf907e94cc 100644 --- a/pkgs/applications/graphics/guetzli/default.nix +++ b/pkgs/applications/graphics/guetzli/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Perceptual JPEG encoder"; longDescription = "Guetzli is a JPEG encoder that aims for excellent compression density at high visual quality."; - homepage = https://github.com/google/guetzli; + homepage = "https://github.com/google/guetzli"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.x86_64; maintainers = [ stdenv.lib.maintainers.seppeljordan ]; diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 8f7800a7323a6..7314ff893b00d 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://hugin.sourceforge.net/; + homepage = "http://hugin.sourceforge.net/"; description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end"; license = licenses.gpl2Plus; maintainers = with maintainers; [ hrdinka ]; diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index 3e17a045ecc11..4bf414cf8dd5d 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Insert emoji anywhere, even in non-native apps - designed for elementary OS"; - homepage = https://github.com/cassidyjames/ideogram; + homepage = "https://github.com/cassidyjames/ideogram"; license = licenses.gpl2Plus; maintainers = pantheon.maintainers; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/image_optim/default.nix b/pkgs/applications/graphics/image_optim/default.nix index 385f9825e46f7..ba437eab4122e 100644 --- a/pkgs/applications/graphics/image_optim/default.nix +++ b/pkgs/applications/graphics/image_optim/default.nix @@ -58,7 +58,7 @@ bundlerApp { meta = with lib; { description = "Command line tool and ruby interface to optimize (lossless compress, optionally lossy) jpeg, png, gif and svg images using external utilities (advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegrescan, jpegtran, optipng, pngcrush, pngout, pngquant, svgo)"; - homepage = https://github.com/toy/image_optim; + homepage = "https://github.com/toy/image_optim"; license = licenses.mit; maintainers = with maintainers; [ srghma nicknovitski ]; platforms = platforms.all; diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index 6472712bcb400..d47369f5094a0 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -32,7 +32,7 @@ let --add-flags "-jar $out/share/java/ij.jar -ijpath $out/share" ''; meta = with stdenv.lib; { - homepage = https://imagej.nih.gov/ij/; + homepage = "https://imagej.nih.gov/ij/"; description = "Image processing and analysis in Java"; longDescription = '' ImageJ is a public domain Java image processing program diff --git a/pkgs/applications/graphics/imgcat/default.nix b/pkgs/applications/graphics/imgcat/default.nix index 1fa3ec8ccc689..5943632930c57 100644 --- a/pkgs/applications/graphics/imgcat/default.nix +++ b/pkgs/applications/graphics/imgcat/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "It's like cat, but for images"; - homepage = https://github.com/eddieantonio/imgcat; + homepage = "https://github.com/eddieantonio/imgcat"; license = licenses.isc; maintainers = with maintainers; [ jwiegley ]; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix index 8ca4d71bb56cd..06549468efe98 100644 --- a/pkgs/applications/graphics/imlibsetroot/default.nix +++ b/pkgs/applications/graphics/imlibsetroot/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A Xinerama Aware Background Changer"; - homepage = http://robotmonkeys.net/2010/03/30/imlibsetroot/; + homepage = "http://robotmonkeys.net/2010/03/30/imlibsetroot/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ dwarfmaster ]; diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index 26a6cabf7841f..dd03c2c0bb26c 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -53,9 +53,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command line image viewer for tiling window managers"; - homepage = https://github.com/eXeC64/imv; + homepage = "https://github.com/eXeC64/imv"; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj markus1189 ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 3996b94ba14df..86fb6e0349152 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,54 +1,62 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perlPackages, libXft -, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 -, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper -, gsl, gtkspell2, cairo, python2, poppler, imagemagick, libwpg, librevenge -, libvisio, libcdr, libexif, potrace, cmake -, librsvg, wrapGAppsHook +{ stdenv +, boehmgc +, boost +, cairo +, cmake +, fetchpatch +, fetchurl +, gettext +, glib +, glibmm +, gsl +, gtkmm2 +, gtkspell2 +, imagemagick +, lcms +, libcdr +, libexif +, libpng +, librevenge +, librsvg +, libsigcxx +, libvisio +, libwpg +, libXft +, libxml2 +, libxslt +, makeWrapper +, perlPackages +, pkg-config +, poppler +, popt +, potrace +, python3 +, wrapGAppsHook +, zlib }: - let - python2Env = python2.withPackages(ps: with ps; - [ numpy lxml scour ]); + python3Env = python3.withPackages + (ps: with ps; [ + numpy + lxml + scour + ]); in - stdenv.mkDerivation rec { - name = "inkscape-0.92.4"; + pname = "inkscape"; + version = "0.92.5"; src = fetchurl { - url = "https://media.inkscape.org/dl/resources/file/${name}.tar.bz2"; - sha256 = "0pjinhjibfsz1aywdpgpj3k23xrsszpj4a1ya5562dkv2yl2vv2p"; + url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.bz2"; + sha256 = "ge5/aeK9ZKlzQ9g5Wkp6eQWyG4YVZu1eXZF5F41Rmgs="; }; - patches = [ - (fetchpatch { - name = "inkscape-poppler_0_76_compat.patch"; - url = "https://gitlab.com/inkscape/inkscape/commit/e831b034746f8dc3c3c1b88372751f6dcb974831.diff"; - sha256 = "096rdyi6ppjq1h9jwwsm9hb99nggfrfinik8rm23jkn4h2zl01zf"; - }) - (fetchpatch { - name = "inkscape-poppler_0_82_compat.patch"; - url = "https://gitlab.com/inkscape/inkscape/commit/835b6bb62be565efab986d5a3f30a672ad56c7eb.patch"; - sha256 = "02c6sxi2w52b885vr3pgani6kvxp9gdqqk2jgiykkdzv70hhrnm7"; - }) - (fetchpatch { - name = "inkscape-poppler_0_83_compat.patch"; - url = "https://gitlab.com/inkscape/inkscape/commit/b5360a807b12d4e8318475ffd0464b84882788b5.patch"; - sha256 = "1p44rr2q2i3zkd1y1j7xgdcbgx8yvlq6hq92im8s0bkjby6p5cpz"; - }) - ]; - # Inkscape hits the ARGMAX when linking on macOS. It appears to be # CMake’s ARGMAX check doesn’t offer enough padding for NIX_LDFLAGS. # Setting strictDeps it avoids duplicating some dependencies so it # will leave us under ARGMAX. strictDeps = true; - unpackPhase = '' - cp $src ${name}.tar.bz2 - tar xvjf ${name}.tar.bz2 > /dev/null - cd ${name} - ''; - postPatch = '' patchShebangs share/extensions patchShebangs fix-roff-punct @@ -56,24 +64,52 @@ stdenv.mkDerivation rec { # Python is used at run-time to execute scripts, e.g., those from # the "Effects" menu. substituteInPlace src/extension/implementation/script.cpp \ - --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"' + --replace '"python-interpreter", "python"' '"python-interpreter", "${python3Env}/bin/python"' ''; - nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env wrapGAppsHook ] - ++ (with perlPackages; [ perl XMLParser ]); - buildInputs = [ - libXft libpng zlib popt boehmgc - libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext - gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif potrace + nativeBuildInputs = [ + pkg-config + cmake + makeWrapper + python3Env + wrapGAppsHook + ] ++ (with perlPackages; [ + perl + XMLParser + ]); + buildInputs = [ + boehmgc + boost + gettext + glib + glibmm + gsl + gtkmm2 + imagemagick + lcms + libcdr + libexif + libpng + librevenge librsvg # for loading icons - - python2Env perlPackages.perl - ] ++ stdenv.lib.optional (!stdenv.isDarwin) gtkspell2 - ++ stdenv.lib.optional stdenv.isDarwin cairo; - - enableParallelBuilding = true; + libsigcxx + libvisio + libwpg + libXft + libxml2 + libxslt + perlPackages.perl + poppler + popt + potrace + python3Env + zlib + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + gtkspell2 + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + cairo + ]; # Make sure PyXML modules can be found at run-time. postInstall = stdenv.lib.optionalString stdenv.isDarwin '' @@ -82,9 +118,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - license = "GPL"; - homepage = https://www.inkscape.org; description = "Vector graphics editor"; + homepage = "https://www.inkscape.org"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.jtojnar ]; platforms = platforms.all; longDescription = '' Inkscape is a feature-rich vector graphics editor that edits diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 0cb09ecb6430d..6a2a8dbc18fe9 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript -, libjpeg, libpng, qtbase +, libjpeg, libpng, qtbase, mkDerivation }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "ipe-7.2.13"; src = fetchurl { @@ -20,13 +20,9 @@ stdenv.mkDerivation rec { libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript ]; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; - postFixup = '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix PATH : "${texlive}/bin" - done - ''; + qtWrapperArgs = [ ''--prefix PATH : ${texlive}/bin'' ]; enableParallelBuilding = true; @@ -34,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "An editor for drawing figures"; - homepage = http://ipe.otfried.org; + homepage = "http://ipe.otfried.org"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' Ipe is an extensible drawing editor for creating figures in PDF and Postscript format. diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index cc1ca3a0ff2a2..265ce82b8ac3f 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optimize JPEG files"; - homepage = https://www.kokkonen.net/tjko/projects.html ; + homepage = "https://www.kokkonen.net/tjko/projects.html"; license = licenses.gpl2; maintainers = [ maintainers.aristid ]; platforms = platforms.all; diff --git a/pkgs/applications/graphics/jpegrescan/default.nix b/pkgs/applications/graphics/jpegrescan/default.nix index 1c65c7da3a284..5fe35edabdf6f 100644 --- a/pkgs/applications/graphics/jpegrescan/default.nix +++ b/pkgs/applications/graphics/jpegrescan/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "losslessly shrink any JPEG file"; - homepage = https://github.com/kud/jpegrescan; + homepage = "https://github.com/kud/jpegrescan"; license = licenses.publicDomain; maintainers = [ maintainers.ramkromberg ]; platforms = platforms.all; diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index 31085cd8023dc..c74f35e4334af 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { /* glibmm 2.50 fix */ - url = https://github.com/K-3D/k3d/commit/c65889d0652490d88a573e47de7a9324bf27bff2.patch; + url = "https://github.com/K-3D/k3d/commit/c65889d0652490d88a573e47de7a9324bf27bff2.patch"; sha256 = "162icv1hicr2dirkb9ijacvg9bhz5j30yfwg7b45ijavk8rns62j"; }) ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A 3D editor with support for procedural editing"; - homepage = http://www.k-3d.org/; + homepage = "http://www.k-3d.org/"; platforms = platforms.linux; maintainers = [ maintainers.raskin ]; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 0b4e49dc2b59c..e5aac9b8823d2 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "kodelife"; - version = "0.8.8.110"; + version = "0.9.0.129"; suffix = { aarch64-linux = "linux-arm64"; @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.zip"; sha256 = { - aarch64-linux = "1lcpj1mgkvksq1d08ibh59y0dmdh7zm77wi5ziqhg3p5g9nxyasd"; - armv7l-linux = "0sljy06302x567jqw5lagbyhpc3j140jk4wccacxjrbb6hcx3l42"; - x86_64-darwin = "1b058s9kny026q395nj99v8hggxkgv43nnjkmx1a2siajw0db94c"; - x86_64-linux = "1q77cpz4gflrvfz6dm6np8sqbwyr235gq7y4pzs4hnqbrdzd4nwl"; + aarch64-linux = "0z2fqlf156348ha3zhv16kvqdx68fbwbzch2gzjm9x1na9n5k1ra"; + armv7l-linux = "1ppwgrmgl1j2ws9mhrscvvkamd69a6xw7x35df6d30cyj97r0mzy"; + x86_64-darwin = "0f8vn6m3xzsiyxm2ka5wkbp63wvzrix6g1xrbpvcm3v2llmychkl"; + x86_64-linux = "035c1nlw0nim057sz3axpkcgkafqbm6gpr8hwr097vlrqll6w3dv"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { dontBuild = true; dontStrip = true; dontPatchELF = true; + preferLocalBuild = true; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 3cc4834d756e4..f98edd1e8ae55 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -10,13 +10,16 @@ mkDerivation rec { pname = "krita"; - version = "4.2.7.1"; + version = "4.2.9"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "1sx4j4brk71bas3cpqzk4bd8bknyl3x4fdg5pv4r7pcfd3vpq2vy"; + sha256 = "0rvm9mpaq66lxyq4f09x9w6xxhgys0phza223hm5zv6kgn413xsf"; }; + # *somtimes* fails with can't find ui_manager.h, also see https://github.com/NixOS/nixpkgs/issues/35359 + enableParallelBuilding = false; + nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; buildInputs = [ @@ -45,7 +48,7 @@ mkDerivation rec { meta = with lib; { description = "A free and open source painting application"; - homepage = https://krita.org/; + homepage = "https://krita.org/"; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/applications/graphics/krop/default.nix index 401e5f6fc570b..2337dfb370efc 100644 --- a/pkgs/applications/graphics/krop/default.nix +++ b/pkgs/applications/graphics/krop/default.nix @@ -24,11 +24,15 @@ python3Packages.buildPythonApplication rec { "\${qtWrapperArgs[@]}" ]; + postInstall = '' + install -m666 -Dt $out/share/applications krop.desktop + ''; + # Disable checks because of interference with older Qt versions // xcb doCheck = false; meta = { - homepage = http://arminstraub.com/software/krop; + homepage = "http://arminstraub.com/software/krop"; description = "Graphical tool to crop the pages of PDF files"; longDescription = '' Krop is a tool that allows you to optimise your PDF files, and remove diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 201a4fe113e3b..5e950eeac04ba 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CAD program for creating virtual LEGO models"; - homepage = https://www.leocad.org/; + homepage = "https://www.leocad.org/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index 94899c937a86b..811a907746d55 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -1,9 +1,10 @@ -{ stdenv, cmake, fetchFromGitHub, pkgconfig, boost, exiv2, fftwFloat, gsl +{ stdenv, mkDerivation, cmake, fetchFromGitHub, pkgconfig +, boost, exiv2, fftwFloat, gsl , ilmbase, lcms2, libraw, libtiff, openexr , qtbase, qtdeclarative, qttools, qtwebengine, eigen }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "luminance-hdr"; version = "2.6.0"; @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { - homepage = http://qtpfsgui.sourceforge.net/; + homepage = "http://qtpfsgui.sourceforge.net/"; description = "A complete open source solution for HDR photography"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/applications/graphics/meh/default.nix index 7ad8c388a203b..0b2e5bc377747 100644 --- a/pkgs/applications/graphics/meh/default.nix +++ b/pkgs/applications/graphics/meh/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "A minimal image viewer using raw XLib"; - homepage = https://www.johnhawthorn.com/meh/; + homepage = "https://www.johnhawthorn.com/meh/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 9733f1e2efa07..6ac937dcb931f 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -126,7 +126,7 @@ in mkDerivation { meta = { description = "A system for processing and editing 3D triangular meshes."; - homepage = http://www.meshlab.net/; + homepage = "http://www.meshlab.net/"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix index d629c776194d9..2af79659cedb2 100644 --- a/pkgs/applications/graphics/minidjvu/default.nix +++ b/pkgs/applications/graphics/minidjvu/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "minidjvu-0.8"; src = fetchurl { - url = mirror://sourceforge/minidjvu/minidjvu-0.8.tar.gz; + url = "mirror://sourceforge/minidjvu/minidjvu-0.8.tar.gz"; sha256 = "0jmpvy4g68k6xgplj9zsl6brg6vi81mx3nx2x9hfbr1f4zh95j79"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://djvu.sourceforge.net/djview4.html; + homepage = "http://djvu.sourceforge.net/djview4.html"; description = "Black-and-white djvu page encoder and decoder that use interpage information"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix index 63cc4a3a8d359..e17664a018ab7 100644 --- a/pkgs/applications/graphics/mozjpeg/default.nix +++ b/pkgs/applications/graphics/mozjpeg/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { The idea is to reduce transfer times for JPEGs on the Web, thus reducing page load times. ''; - homepage = https://github.com/mozilla/mozjpeg ; + homepage = "https://github.com/mozilla/mozjpeg"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.aristid ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix index 7274bdacd9d04..91278c9881fef 100644 --- a/pkgs/applications/graphics/mtpaint/default.nix +++ b/pkgs/applications/graphics/mtpaint/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Due to its simplicity and lack of dependencies it runs well on GNU/Linux, Windows and older PC hardware. ''; - homepage = http://mtpaint.sourceforge.net/; + homepage = "http://mtpaint.sourceforge.net/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.vklquevs ]; diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 48a79e8844e85..a6bda01ebb64a 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -18,25 +18,15 @@ mkDerivation rec { pname = "nomacs"; - version = "3.12"; + version = "3.14.2"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "12582i5v85da7vwjxj8grj99hxg34ij5cn3b1578wspdfw1xfy1i"; + sha256 = "1vms13kyg7cpqi2hxvrrhlnl7cq92ijr7dm1kl5ryglpcagqv811"; }; - patches = [ - ./nomacs-iostream.patch - (fetchpatch { - name = "darwin-less-restrictive-opencv.patch"; - url = "https://github.com/nomacs/nomacs/commit/d182fce4bcd9a25bd15e3de065ca67849a32458c.patch"; - sha256 = "0j6sviwrjn69nqf59hjn30c4j838h8az7rnlwcx8ymlb21vd9x2h"; - stripLen = 1; - }) - ]; - enableParallelBuilding = true; setSourceRoot = '' @@ -63,11 +53,11 @@ mkDerivation rec { "-DUSE_SYSTEM_QUAZIP=ON"]; meta = with stdenv.lib; { - homepage = https://nomacs.org; + homepage = "https://nomacs.org"; description = "Qt-based image viewer"; maintainers = [maintainers.ahmedtd]; license = licenses.gpl3Plus; - repositories.git = https://github.com/nomacs/nomacs.git; + repositories.git = "https://github.com/nomacs/nomacs.git"; inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index 9c4a8b229391d..89d49a1514577 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.openimageio.org; + homepage = "http://www.openimageio.org"; description = "A library and tools for reading and writing images"; license = licenses.bsd3; maintainers = with maintainers; [ goibhniu jtojnar ]; diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index 23cad7e859df1..1f2861e7109c9 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.openimageio.org; + homepage = "http://www.openimageio.org"; description = "A library and tools for reading and writing images"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 2c95f6d403f2c..8ff4d6f27e039 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -58,6 +58,8 @@ mkDerivation rec { mv $out/bin/*.app $out/Applications rmdir $out/bin || true + wrapQtApp "$out"/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD + mv --target-directory=$out/Applications/OpenSCAD.app/Contents/Resources \ $out/share/openscad/{examples,color-schemes,locale,libraries,fonts} @@ -77,10 +79,9 @@ mkDerivation rec { machine parts but pretty sure is not what you are looking for when you are more interested in creating computer-animated movies. ''; - homepage = http://openscad.org/; + homepage = "http://openscad.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; - [ bjornfor raskin the-kenny gebner ]; + maintainers = with stdenv.lib.maintainers; [ bjornfor raskin gebner ]; }; } diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 719aca5096a58..c03bdd8331be8 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { #doCheck = true; meta = { - homepage = http://panotools.sourceforge.net/; + homepage = "http://panotools.sourceforge.net/"; description = "Free software suite for authoring and displaying virtual reality panoramas"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index ac01c28ebd4bf..15d70d1430812 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -59,7 +59,7 @@ mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.paraview.org/; + homepage = "http://www.paraview.org/"; description = "3D Data analysis and visualization application"; license = licenses.free; maintainers = with maintainers; [ guibert ]; diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix index 78f6d8bcbaff8..fa3034cb3b074 100644 --- a/pkgs/applications/graphics/pbrt/default.nix +++ b/pkgs/applications/graphics/pbrt/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ git flex bison cmake zlib ]; meta = with stdenv.lib; { - homepage = http://pbrt.org; + homepage = "http://pbrt.org"; description = "The renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'"; platforms = platforms.linux ; license = licenses.bsd2; diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index f31506ce73398..bcbdfb9980e8b 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -11,16 +11,15 @@ buildGoModule rec { sha256 = "0a7d36hzcvj68apzc726r2vqsjyrkcynxif5laarxapm6p67g3z4"; }; - modSha256 = "0ak34wr5cbcvblndslsxdd24vfj3h02xqjqnj5amkll5iqn5mzi1"; + vendorSha256 = "09alkpfyxapycv6zsaz7prgbr0a1jzd78n7w2mh01mg4hhb2j3k7"; subPackages = [ "cmd/pdfcpu" ]; meta = with stdenv.lib; { description = "A PDF processor written in Go"; - homepage = https://pdfcpu.io; + homepage = "https://pdfcpu.io"; license = licenses.asl20; maintainers = with maintainers; [ doronbehar ]; platforms = platforms.all; }; -} - +} \ No newline at end of file diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix index 78d16e6922611..9fec8b99c1bd0 100644 --- a/pkgs/applications/graphics/photoflow/default.nix +++ b/pkgs/applications/graphics/photoflow/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A fully non-destructive photo retouching program providing a complete RAW image editing workflow"; - homepage = https://aferrero2707.github.io/PhotoFlow/; + homepage = "https://aferrero2707.github.io/PhotoFlow/"; license = licenses.gpl3Plus; maintainers = [ maintainers.MtP ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 14c49d30004c5..71c63bc82aa23 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -40,7 +40,7 @@ mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://photoqt.org/; + homepage = "https://photoqt.org/"; description = "Simple, yet powerful and good looking image viewer"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix index 5e7fb5cf7a0a8..7020bf6c83e65 100644 --- a/pkgs/applications/graphics/phototonic/default.nix +++ b/pkgs/applications/graphics/phototonic/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }: +{ mkDerivation, stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "phototonic"; version = "2.1"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An image viewer and organizer"; - homepage = https://sourceforge.net/projects/phototonic/; + homepage = "https://sourceforge.net/projects/phototonic/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index 1409037668489..af51c78a1698d 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -74,7 +74,7 @@ buildDotnetPackage rec { ''; meta = { - homepage = http://www.pinta-project.com/; + homepage = "http://www.pinta-project.com/"; description = "Drawing/editing program modeled after Paint.NET"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix index 35ab27bcbf638..dd8e84349fad8 100644 --- a/pkgs/applications/graphics/potrace/default.nix +++ b/pkgs/applications/graphics/potrace/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://potrace.sourceforge.net/; + homepage = "http://potrace.sourceforge.net/"; description = "A tool for tracing a bitmap, which means, transforming a bitmap into a smooth, scalable image"; platforms = platforms.unix; maintainers = [ maintainers.pSub ]; diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 7639a2a9c7612..505f28a24510a 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { meta = with stdenv.lib; { description = "Powerful image viewer with minimal UI"; - homepage = http://www.pberndt.com/Programme/Linux/pqiv; + homepage = "http://www.pberndt.com/Programme/Linux/pqiv"; license = licenses.gpl3; maintainers = []; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index 9972ea7570982..cad6a35ce3f6b 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # do not download a file during build ${xmlstarlet}/bin/xmlstarlet ed --inplace -P -d '//get[@src="http://download.processing.org/reference.zip"]' build/build.xml install -D -m0444 ${fetchurl { - url = http://download.processing.org/reference.zip; + url = "http://download.processing.org/reference.zip"; sha256 = "198bpk8mzns6w5h0zdf50wr6iv7sgdi6v7jznj5rbsnpgyilxz35"; } } ./java/reference.zip @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A language and IDE for electronic arts"; - homepage = https://processing.org; + homepage = "https://processing.org"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix index 4d416a7c106d2..f9dc494b4b35a 100644 --- a/pkgs/applications/graphics/qcomicbook/default.nix +++ b/pkgs/applications/graphics/qcomicbook/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }: +{ mkDerivation, stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qcomicbook"; version = "0.9.1"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/stolowski/QComicBook; + homepage = "https://github.com/stolowski/QComicBook"; description = "Comic book reader in Qt5"; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix index 6402868b9221e..2b24a34fbc256 100644 --- a/pkgs/applications/graphics/qimgv/default.nix +++ b/pkgs/applications/graphics/qimgv/default.nix @@ -1,46 +1,57 @@ -{ mkDerivation, fetchFromGitHub, lib -, pkgconfig, cmake -, exiv2, qtbase, qtimageformats, qtsvg +{ mkDerivation +, lib +, fetchFromGitHub +, fetchpatch + +, cmake +, pkgconfig + +, exiv2 +, mpv +, opencv4 +, qtbase +, qtimageformats +, qtsvg }: mkDerivation rec { pname = "qimgv"; - version = "0.8.9"; + version = "0.9.1"; src = fetchFromGitHub { owner = "easymodo"; repo = pname; rev = "v${version}"; - sha256 = "0cmya06j466v0pirhxbzbj1vbz0346y7rbc1gbv4n9xcp6c6bln6"; + sha256 = "0b2hddps969gjim2r9a22zaxmnzp600av2zz6icq66ksfrx1rpac"; }; - cmakeFlags = [ - # Video support appears to be broken; the following gets printed upon - # attempting to view an mp4, webm, or mkv (and probably all video formats): - # - # [VideoPlayerInitProxy] Error - could not load player library - # "qimgv_player_mpv" - # - # GIFs are unaffected. If this ever gets addressed, all that is necessary is - # to add `mpv` to the arguments list and to `buildInputs`, and to remove - # `cmakeFlags`. - "-DVIDEO_SUPPORT=OFF" - ]; - nativeBuildInputs = [ - pkgconfig cmake + pkgconfig ]; buildInputs = [ exiv2 + mpv + opencv4 qtbase qtimageformats qtsvg ]; + postPatch = '' + sed -i "s@/usr/bin/mpv@${mpv}/bin/mpv@" \ + qimgv/settings.cpp + ''; + + # Wrap the library path so it can see `libqimgv_player_mpv.so`, which is used + # to play video files within qimgv itself. + qtWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib" + ]; + meta = with lib; { - description = "Qt5 image viewer with optional video support"; + description = "A Qt5 image viewer with optional video support"; homepage = "https://github.com/easymodo/qimgv"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/qimgv/qt5-12-compat.diff b/pkgs/applications/graphics/qimgv/qt5-12-compat.diff new file mode 100644 index 0000000000000..da64759e22d60 --- /dev/null +++ b/pkgs/applications/graphics/qimgv/qt5-12-compat.diff @@ -0,0 +1,13 @@ +diff --git a/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp b/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp +index 96ec9d3..6d95d08 100644 +--- a/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp ++++ b/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp +@@ -21,7 +21,7 @@ void LinuxWorker::setDescriptor(int desc) { + + void LinuxWorker::run() { + emit started(); +- isRunning.storeRelaxed(true); ++ isRunning.store(true); + + if (fd == -1) { + qDebug() << TAG << "File descriptor isn't set! Stopping"; diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index 750217d99188c..d3dd917d7b7dd 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { meta = with stdenv.lib; { description = "Quick image viewer"; - homepage = http://spiegl.de/qiv/; + homepage = "http://spiegl.de/qiv/"; inherit version; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/pkgs/applications/graphics/qscreenshot/default.nix index fafc76a76ffeb..1653ea9272062 100644 --- a/pkgs/applications/graphics/qscreenshot/default.nix +++ b/pkgs/applications/graphics/qscreenshot/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple creation and editing of screenshots"; - homepage = https://sourceforge.net/projects/qscreenshot/; + homepage = "https://sourceforge.net/projects/qscreenshot/"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index afdd2262e504f..aa6db0accdba8 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -80,7 +80,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Photo and video importer for cameras, phones, and memory cards"; - homepage = https://www.damonlynch.net/rapid/; + homepage = "https://www.damonlynch.net/rapid/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 3f89b7f8b3a36..4371bc5838ed6 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { meta = { description = "RAW converter and digital photo processing software"; - homepage = http://www.rawtherapee.com/; + homepage = "http://www.rawtherapee.com/"; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ jcumming mahe the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ jcumming mahe ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index e345fcce01e34..bf0b92b6f6d45 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -65,7 +65,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "A single-frame graphics debugger"; - homepage = https://renderdoc.org/; + homepage = "https://renderdoc.org/"; license = licenses.mit; longDescription = '' RenderDoc is a free MIT licensed stand-alone graphics debugger that diff --git a/pkgs/applications/graphics/runwayml/default.nix b/pkgs/applications/graphics/runwayml/default.nix index c3f747837e01d..eb8ecc34b8f35 100644 --- a/pkgs/applications/graphics/runwayml/default.nix +++ b/pkgs/applications/graphics/runwayml/default.nix @@ -37,7 +37,7 @@ in meta = with lib; { description = "Machine learning for creators"; - homepage = https://runwayml.com/; + homepage = "https://runwayml.com/"; license = licenses.unfree; maintainers = with maintainers; [ prusnak ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/sane/backends/airscan/default.nix b/pkgs/applications/graphics/sane/backends/airscan/default.nix index 11529eee21077..75f4a466b27d9 100644 --- a/pkgs/applications/graphics/sane/backends/airscan/default.nix +++ b/pkgs/applications/graphics/sane/backends/airscan/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, avahi, libsoup, libjpeg +{ lib, stdenv, fetchFromGitHub, pkg-config, avahi, libsoup, libjpeg, libpng , sane-backends, meson, ninja }: stdenv.mkDerivation rec { pname = "sane-airscan"; - version = "0.9.17"; + version = "0.99.0"; nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ avahi libsoup libjpeg sane-backends ]; + buildInputs = [ avahi libsoup libjpeg libpng sane-backends ]; src = fetchFromGitHub { owner = "alexpevzner"; repo = pname; rev = version; - sha256 = "03y0c1z5s3wbvxa9nvji62w42cmvcgm2sw72j7wm831995q3abmx"; + sha256 = "0bbw3s95v5fmkpmmd26v9cf1c40dm85bgxlhs06ski5my803ck0a"; }; meta = with lib; { diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index cd75088ea53c8..2ada41ac98a1d 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb }: +{ stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }: let myPatchElf = file: with stdenv.lib; '' @@ -30,13 +30,13 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ makeWrapper patchelf coreutils udevRules ]; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; dontBuild = true; patchPhase = '' ${myPatchElf "opt/brother/scanner/brscan4/brsaneconfig4"} - RPATH=${libusb.out}/lib + RPATH=${libusb-compat-0_1.out}/lib for a in usr/lib64/sane/*.so*; do if ! test -L $a; then patchelf --set-rpath $RPATH $a @@ -86,7 +86,7 @@ in stdenv.mkDerivation rec { meta = { description = "Brother brscan4 sane backend driver"; - homepage = http://www.brother.com; + homepage = "http://www.brother.com"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; diff --git a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix index da136a7f9e1e6..682e401c069bd 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother type1 scanners udev rules"; - homepage = http://www.brother.com; + homepage = "http://www.brother.com"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; diff --git a/pkgs/applications/graphics/sane/backends/dsseries/default.nix b/pkgs/applications/graphics/sane/backends/dsseries/default.nix index d4165be3784fd..37ac02987061e 100644 --- a/pkgs/applications/graphics/sane/backends/dsseries/default.nix +++ b/pkgs/applications/graphics/sane/backends/dsseries/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother DSSeries SANE backend driver"; - homepage = http://www.brother.com; + homepage = "http://www.brother.com"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [ callahad ]; diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index b00f8f6c58d7c..885dff311b8f1 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null }: +{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb-compat-0_1 ? null }: stdenv.mkDerivation rec { pname = "sane-frontends"; @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { ''; buildInputs = [ sane-backends libX11 gtk2 ] - ++ stdenv.lib.optional (libusb != null) libusb; + ++ stdenv.lib.optional (libusb-compat-0_1 != null) libusb-compat-0_1; nativeBuildInputs = [ pkgconfig ]; enableParallelBuilding = true; meta = with stdenv.lib; { description = "Scanner Access Now Easy"; - homepage = http://www.sane-project.org/; + homepage = "http://www.sane-project.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ peti ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 09b431fdb116c..04d19dee8a8e9 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng -, libusb ? null +, libusb-compat-0_1 ? null , gimpSupport ? false, gimp ? null }: @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ] - ++ (if libusb != null then [libusb] else []) + ++ (if libusb-compat-0_1 != null then [libusb-compat-0_1] else []) ++ stdenv.lib.optional gimpSupport gimp; meta = { - homepage = http://www.sane-project.org/; + homepage = "http://www.sane-project.org/"; description = "Graphical scanning frontend for sane"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [peti]; diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index f9d6c87675f7b..e4598193469b8 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -17,7 +17,7 @@ mkDerivation rec { buildInputs = [ libjpeg libpng libtiff boost qtbase ]; meta = with stdenv.lib; { - homepage = https://github.com/4lex4/scantailor-advanced; + homepage = "https://github.com/4lex4/scantailor-advanced"; description = "Interactive post-processing tool for scanned pages"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index 14efe48f30dbe..bc54f3aa627a7 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - homepage = http://scantailor.org/; + homepage = "http://scantailor.org/"; description = "Interactive post-processing tool for scanned pages"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix index 88bbbd9d86462..11e37c4bf649d 100644 --- a/pkgs/applications/graphics/screencloud/default.nix +++ b/pkgs/applications/graphics/screencloud/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://screencloud.net/; + homepage = "https://screencloud.net/"; description = "Client for Screencloud, an easy to use screenshot sharing tool"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ forkk ]; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index f84986cb598ca..b03d0a01dd6f8 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Popular photo organizer for the GNOME desktop"; - homepage = https://wiki.gnome.org/Apps/Shotwell; + homepage = "https://wiki.gnome.org/Apps/Shotwell"; license = licenses.lgpl21Plus; maintainers = with maintainers; [domenkozar]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index dd41ee4c3f845..cddc99eebe29e 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Screenshot and annotation tool"; - homepage = https://shutter-project.org/; + homepage = "https://shutter-project.org/"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index 314b4007aad50..0df161cd4731e 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_SYSTEM_FFTW=ON" ]; meta = { - homepage = https://github.com/Y-Vladimir/SmartDeblur; + homepage = "https://github.com/Y-Vladimir/SmartDeblur"; description = "Tool for restoring blurry and defocused images"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 7046caad295e2..bd084b4287dc1 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "solvespace-2.3-20190501"; rev = "e7b75f19c34c923780db776592b47152650d8f22"; src = fetchgit { - url = https://github.com/solvespace/solvespace; + url = "https://github.com/solvespace/solvespace"; inherit rev; sha256 = "07k4mbzxf0dmzwdhjx5nc09y7rn1schkaypsw9kz0l7ppylprpp2"; fetchSubmodules = true; @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.edef ]; platforms = platforms.linux; - homepage = http://solvespace.com; + homepage = "http://solvespace.com"; }; } diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index f56646e5aedd9..fc9132ec0b401 100644 --- a/pkgs/applications/graphics/swingsane/default.nix +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { simultaneous scan jobs, image transformation jobs (deskew, binarize, crop, etc), PDF and PNG output. ''; - homepage = http://swingsane.com/; + homepage = "http://swingsane.com/"; license = licenses.asl20; platforms = platforms.all; }; diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index f54299583286c..4cf0ae5557897 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple X Image Viewer"; - homepage = https://github.com/muennich/sxiv; + homepage = "https://github.com/muennich/sxiv"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 188f7cb29343a..e2ffd16025857 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A 2D animation program"; - homepage = http://www.synfig.org; + homepage = "http://www.synfig.org"; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix index 157c0b9742bfb..dc9d4ac2d595d 100644 --- a/pkgs/applications/graphics/tesseract/tesseract3.nix +++ b/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "OCR engine"; - homepage = https://github.com/tesseract-ocr/tesseract; + homepage = "https://github.com/tesseract-ocr/tesseract"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ viric earvstedt ]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index 95896337720a8..d7c3cacc1f961 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "OCR engine"; - homepage = https://github.com/tesseract-ocr/tesseract; + homepage = "https://github.com/tesseract-ocr/tesseract"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ viric earvstedt ]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/applications/graphics/timelapse-deflicker/default.nix b/pkgs/applications/graphics/timelapse-deflicker/default.nix index 8355545e8dd6d..ac382bb632780 100644 --- a/pkgs/applications/graphics/timelapse-deflicker/default.nix +++ b/pkgs/applications/graphics/timelapse-deflicker/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple script to deflicker images taken for timelapses"; - homepage = https://github.com/cyberang3l/timelapse-deflicker; + homepage = "https://github.com/cyberang3l/timelapse-deflicker"; license = licenses.gpl3; maintainers = with maintainers; [ valeriangalliat ]; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index 131d83f0d58ea..9e05a41e84837 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/sergiomb2/ufraw; + homepage = "https://github.com/sergiomb2/ufraw"; description = "Utility to read and manipulate raw images from digital cameras"; diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index 09abfc60a5282..14ff5f9a519fa 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -107,7 +107,7 @@ in meta = { description = "The Unigine Valley GPU benchmarking tool"; - homepage = http://unigine.com/products/benchmarks/valley/; + homepage = "http://unigine.com/products/benchmarks/valley/"; license = stdenv.lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf maintainers = [ stdenv.lib.maintainers.kierdavis ]; platforms = ["x86_64-linux" "i686-linux"]; diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index a80e89e72bcda..41463a7627ae7 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3; - homepage = http://siyanpanayotov.com/project/viewnior/; + homepage = "http://siyanpanayotov.com/project/viewnior/"; maintainers = [ stdenv.lib.maintainers.smironov ]; diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix index fab85052df3b9..b5e9d0b8cf2dd 100644 --- a/pkgs/applications/graphics/vimiv/default.nix +++ b/pkgs/applications/graphics/vimiv/default.nix @@ -64,7 +64,7 @@ python3Packages.buildPythonApplication rec { postInstall = "make DESTDIR=\"$out\" install"; meta = { - homepage = https://github.com/karlch/vimiv; + homepage = "https://github.com/karlch/vimiv"; description = "An image viewer with Vim-like keybindings"; license = lib.licenses.mit; platforms = lib.platforms.linux; diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix index 8d6eca7ef32c5..19c30f3ecc4d1 100644 --- a/pkgs/applications/graphics/wings/default.nix +++ b/pkgs/applications/graphics/wings/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.wings3d.com/; + homepage = "http://www.wings3d.com/"; description = "Subdivision modeler inspired by Nendo and Mirai from Izware"; license = stdenv.lib.licenses.tcltk; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix index 0f1020b0b0784..31fc404502657 100644 --- a/pkgs/applications/graphics/write_stylus/default.nix +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, qtbase, qtsvg, libglvnd, fetchurl, makeDesktopItem }: +{ mkDerivation, stdenv, lib, qtbase, qtsvg, libglvnd, fetchurl, makeDesktopItem }: let # taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon # license: Free for commercial use @@ -7,7 +7,7 @@ let sha256 = "0abdya42yf9alxbsmc2nf8jwld50zfria6z3d4ncvp1zw2a9jhb8"; }; in -stdenv.mkDerivation rec { +mkDerivation rec { pname = "write_stylus"; version = "209"; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.styluslabs.com/; + homepage = "http://www.styluslabs.com/"; description = "Write is a word processor for handwriting."; platforms = platforms.linux; license = stdenv.lib.licenses.unfree; diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index e80362c386b98..767f3aa920bfb 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://xaos.sourceforge.net/; + homepage = "http://xaos.sourceforge.net/"; description = "Fractal viewer"; license = stdenv.lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/xara/default.nix b/pkgs/applications/graphics/xara/default.nix index 56388a8a2555a..5e3c252435cd1 100644 --- a/pkgs/applications/graphics/xara/default.nix +++ b/pkgs/applications/graphics/xara/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "xaralx-0.7r1785"; src = fetchurl { - url = http://downloads2.xara.com/opensource/XaraLX-0.7r1785.tar.bz2; + url = "http://downloads2.xara.com/opensource/XaraLX-0.7r1785.tar.bz2"; sha256 = "05xbzq1i1vw2mdsv7zjqfpxfv3g1j0g5kks0gq6sh373xd6y8lyh"; }; diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/applications/graphics/xfractint/default.nix index ae4765fc9e769..8d36e4630dc57 100644 --- a/pkgs/applications/graphics/xfractint/default.nix +++ b/pkgs/applications/graphics/xfractint/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.unfree; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://www.fractint.net/; + homepage = "https://www.fractint.net/"; }; } diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 6d10a7cae231c..8a5d9c3597b83 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://xournal.sourceforge.net/; + homepage = "http://xournal.sourceforge.net/"; description = "Note-taking application (supposes stylus)"; maintainers = [ maintainers.guibert ]; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 65aa17e3b4eed..ba396bfd92c5e 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.0.17"; + version = "1.0.18"; src = fetchFromGitHub { owner = "xournalpp"; repo = pname; rev = version; - sha256 = "0xw2mcgnm4sa9hrhfgp669lfypw97drxjmz5w8i5whaprpvmkxzw"; + sha256 = "0a9ygbmd4dwgck3k8wsrm2grynqa0adb12wwspzmzvpisbadffjy"; }; nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix index de3f3a78988b1..67f43faf99a30 100644 --- a/pkgs/applications/graphics/xzgv/default.nix +++ b/pkgs/applications/graphics/xzgv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/{app-install/desktop,applications,info,pixmaps} ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/xzgv/; + homepage = "https://sourceforge.net/projects/xzgv/"; description = "Picture viewer for X with a thumbnail-based selector"; license = licenses.gpl2; maintainers = [ maintainers.womfoo ]; diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 96515a137246c..9472f9312469e 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yEd"; - version = "3.19.1.1"; + version = "3.20"; src = fetchzip { url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip"; - sha256 = "0px88rc1slf7n1n8lpk56hf29ppbnnd4lrqfyggihcr0pxmw157c"; + sha256 = "08j8lpn2nd41gavgrj03rlrxl04wcamq1y02f1x1569ykbhycb3m"; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix index 7b14d7750c3a3..6cc59a7e60bdd 100644 --- a/pkgs/applications/graphics/zgv/default.nix +++ b/pkgs/applications/graphics/zgv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://foss.aueb.gr/mirrors/linux/gentoo/media-gfx/zgv/files/zgv-5.9-libpng15.patch; + url = "https://foss.aueb.gr/mirrors/linux/gentoo/media-gfx/zgv/files/zgv-5.9-libpng15.patch"; sha256 = "1blw9n04c28bnwcmcn64si4f5zpg42s8yn345js88fyzi9zm19xw"; }) ./switch.patch @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.svgalib.org/rus/zgv/; + homepage = "http://www.svgalib.org/rus/zgv/"; description = "Picture viewer with a thumbnail-based selector"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index 76cc423f5460b..dbbfcf80c6b07 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -9,14 +9,14 @@ libarchive, libzip, # Archive tools - p7zip, lrzip, + lrzip, # Unfree tools unfreeEnableUnrar ? false, unrar, }: let - extraTools = [ p7zip lrzip ] ++ lib.optional unfreeEnableUnrar unrar; + extraTools = [ lrzip ] ++ lib.optional unfreeEnableUnrar unrar; in mkDerivation { diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 5994eaf1c7132..60df1f899dedd 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -90,6 +90,7 @@ let kalarm = callPackage ./kalarm.nix {}; kalarmcal = callPackage ./kalarmcal.nix {}; kate = callPackage ./kate.nix {}; + kbreakout = callPackage ./kbreakout.nix {}; kcachegrind = callPackage ./kcachegrind.nix {}; kcalc = callPackage ./kcalc.nix {}; kcalutils = callPackage ./kcalutils.nix {}; @@ -146,6 +147,7 @@ let krdc = callPackage ./krdc.nix {}; krfb = callPackage ./krfb.nix {}; kruler = callPackage ./kruler.nix {}; + kspaceduel = callPackage ./kspaceduel.nix {}; ksudoku = callPackage ./ksudoku.nix {}; ksystemlog = callPackage ./ksystemlog.nix {}; ktnef = callPackage ./ktnef.nix {}; diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix index f01a57a55d4dd..e0d0273efde19 100644 --- a/pkgs/applications/kde/kate.nix +++ b/pkgs/applications/kde/kate.nix @@ -14,6 +14,16 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; + # InitialPreference values are too high and end up making kate & + # kwrite defaults for anything considered text/plain. Resetting to + # 1, which is the default. + postPatch = '' + substituteInPlace kate/data/org.kde.kate.desktop \ + --replace InitialPreference=9 InitialPreference=1 + substituteInPlace kwrite/data/org.kde.kwrite.desktop \ + --replace InitialPreference=8 InitialPreference=1 + ''; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libgit2 diff --git a/pkgs/applications/kde/kbreakout.nix b/pkgs/applications/kde/kbreakout.nix new file mode 100644 index 0000000000000..fbcddd46ca856 --- /dev/null +++ b/pkgs/applications/kde/kbreakout.nix @@ -0,0 +1,22 @@ +{ mkDerivation, lib +, extra-cmake-modules +, cmake +, kdbusaddons +, ki18n +, kconfigwidgets +, kcrash +, kxmlgui +, libkdegames +}: + +mkDerivation { + name = "kbreakout"; + meta.license = with lib.licenses; [ lgpl21 gpl3 ]; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ + cmake extra-cmake-modules + ]; + propagatedBuildInputs = [ + kdbusaddons ki18n kconfigwidgets kcrash kxmlgui libkdegames + ]; +} diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix index 6ae45057f19e5..dc0b63594c457 100644 --- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix +++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw }: @@ -9,6 +9,14 @@ mkDerivation { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; + patches = [ + # Fix a bug with thumbnail.so processes hanging: + # https://bugs.kde.org/show_bug.cgi?id=404652 + (fetchpatch { + url = "https://github.com/KDE/kdegraphics-thumbnailers/commit/3e2ea6e924d0e2a2cdd9bb435b06965117d6d34c.patch"; + sha256 = "0fq85zhymmrq8vl0y6vgh87qf4c6fhcq704p4kpkaq7y0isxj4h1"; + }) + ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive kio libkexiv2 libkdcraw ]; } diff --git a/pkgs/applications/kde/keditbookmarks.nix b/pkgs/applications/kde/keditbookmarks.nix index 57741c03ad547..efe247df73763 100644 --- a/pkgs/applications/kde/keditbookmarks.nix +++ b/pkgs/applications/kde/keditbookmarks.nix @@ -9,7 +9,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kio kparts kwindowsystem ]; meta = with lib; { - homepage = http://www.kde.org; + homepage = "http://www.kde.org"; license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/applications/kde/kipi-plugins.nix b/pkgs/applications/kde/kipi-plugins.nix index 5fb953acbd62e..180d066a87cf4 100644 --- a/pkgs/applications/kde/kipi-plugins.nix +++ b/pkgs/applications/kde/kipi-plugins.nix @@ -17,7 +17,7 @@ mkDerivation { meta = { description = "Plugins for KDE-based image applications"; license = lib.licenses.gpl2; - homepage = https://cgit.kde.org/kipi-plugins.git; + homepage = "https://cgit.kde.org/kipi-plugins.git"; maintainers = with lib.maintainers; [ ttuegel ]; }; } diff --git a/pkgs/applications/kde/konqueror.nix b/pkgs/applications/kde/konqueror.nix index e6442fea2f9dc..62ed3db063ea2 100644 --- a/pkgs/applications/kde/konqueror.nix +++ b/pkgs/applications/kde/konqueror.nix @@ -12,9 +12,17 @@ mkDerivation { kdelibs4support kcmutils khtml kdesu qtwebkit qtwebengine qtx11extras qtscript qtwayland ]; + + # InitialPreference values are too high and any text/html ends up + # opening konqueror, even if firefox or chromium are also available. + # Resetting to 1, which is the default. + postPatch = '' + substituteInPlace kfmclient_html.desktop \ + --replace InitialPreference=9 InitialPreference=1 + ''; + meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ ]; }; } - diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index 1be5b0b4a8945..ed26dc08bb6c3 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -11,7 +11,7 @@ mkDerivation { name = "konsole"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = [ lib.maintainers.ttuegel ]; + maintainers = with lib.maintainers; [ ttuegel turion ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/applications/kde/krdc.nix b/pkgs/applications/kde/krdc.nix index 89ac92bb47453..2b0a1a5c51413 100644 --- a/pkgs/applications/kde/krdc.nix +++ b/pkgs/applications/kde/krdc.nix @@ -17,7 +17,7 @@ mkDerivation { --prefix PATH : ${lib.makeBinPath [ freerdp ]} ''; meta = with lib; { - homepage = http://www.kde.org; + homepage = "http://www.kde.org"; license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/applications/kde/kspaceduel.nix b/pkgs/applications/kde/kspaceduel.nix new file mode 100644 index 0000000000000..b18a3e7cf8f73 --- /dev/null +++ b/pkgs/applications/kde/kspaceduel.nix @@ -0,0 +1,22 @@ +{ mkDerivation, lib +, extra-cmake-modules +, cmake +, kdbusaddons +, ki18n +, kconfigwidgets +, kcrash +, kxmlgui +, libkdegames +}: + +mkDerivation { + name = "kspaceduel"; + meta.license = with lib.licenses; [ lgpl21 gpl3 ]; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ + cmake extra-cmake-modules + ]; + propagatedBuildInputs = [ + kdbusaddons ki18n kconfigwidgets kcrash kxmlgui libkdegames + ]; +} diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 377fbe3339a7c..3bcdb9ca84244 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -18,10 +18,19 @@ mkDerivation { kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5 qtdeclarative qtsvg threadweaver kcrash ] ++ lib.optional (!stdenv.isAarch64) chmlib; + + # InitialPreference values are too high and end up making okular + # default for anything considered text/plain. Resetting to 1, which + # is the default. + postPatch = '' + substituteInPlace generators/txt/okularApplication_txt.desktop \ + --replace InitialPreference=3 InitialPreference=1 + ''; + meta = with lib; { - homepage = http://www.kde.org; + homepage = "http://www.kde.org"; license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; - maintainers = with maintainers; [ ttuegel ]; + maintainers = with maintainers; [ ttuegel turion ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/kde/yakuake.nix b/pkgs/applications/kde/yakuake.nix index 6f9c8df300126..cb7f7070b24a1 100644 --- a/pkgs/applications/kde/yakuake.nix +++ b/pkgs/applications/kde/yakuake.nix @@ -24,7 +24,7 @@ mkDerivation { ]; meta = { - homepage = https://yakuake.kde.org; + homepage = "https://yakuake.kde.org"; description = "Quad-style terminal emulator for KDE"; maintainers = with lib.maintainers; [ fridh ]; license = lib.licenses.gpl2; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 1c409c232a82d..010e9ae7a502c 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -1,42 +1,45 @@ -{ stdenv, fetchzip }: +{ stdenv, fetchzip, autoPatchelfHook, fetchurl, xar, cpio }: stdenv.mkDerivation rec { pname = "1password"; - version = "0.7.0"; + version = "0.10.0"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - sha256 = "1lhp0ws543855rvpvh84rjvyi471259lg618cciqj8j6k04ls1g0"; + sha256 = "07j11ikd0rzsj4d8rv74rfy497svq6l2q94ndf3b0a0mr8riyazj"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - sha256 = "1sjv5qrc80fk9yz0cn2yj0cdm47ab3ch8n9hzj9hv9d64gjv4w8n"; + sha256 = "177cl4x7rj3d74kzrpmiwps5n31axmlhqdwrdpkmay2gk9inswbs"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-darwin" then - fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip"; - sha256 = "1hnixmq7mrc6ky79k3s61vv89v4qhkm31kyni3rscibfrab0r8ir"; - stripRoot = false; + fetchurl { + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg"; + sha256 = "13yxmnh77g6zvl2gqf77m5i3v5706p2plgbgsn5hqrrf3g8ql63b"; } else throw "Architecture not supported"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ xar cpio ]; + + unpackPhase = stdenv.lib.optionalString stdenv.isDarwin '' + xar -xf $src + zcat Payload | cpio -i + ''; + installPhase = '' install -D op $out/bin/op ''; - postFixup = stdenv.lib.optionalString stdenv.isLinux '' - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - $out/bin/op - ''; + + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ autoPatchelfHook ]; meta = with stdenv.lib; { description = "1Password command-line tool"; - homepage = https://support.1password.com/command-line/; - downloadPage = https://app-updates.agilebits.com/product_history/CLI; + homepage = "https://support.1password.com/command-line/"; + downloadPage = "https://app-updates.agilebits.com/product_history/CLI"; maintainers = with maintainers; [ joelburget marsam ]; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix new file mode 100644 index 0000000000000..c165003d8f8cf --- /dev/null +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, unzip, makeWrapper, autoPatchelfHook +, zlib, lttng-ust, curl, icu, openssl }: + +stdenv.mkDerivation rec { + pname = "ArchiSteamFarm"; + version = "4.2.0.6"; + + src = { + x86_64-linux = fetchurl { + url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-linux-x64.zip"; + sha256 = "05hx6q1lkbjbqhwi9xxvm7ycnsnpl1cnqzyy2yn0q4x27im399cn"; + }; + armv7l-linux = fetchurl { + url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-linux-arm.zip"; + sha256 = "0l8irqrpl5vbjj84k4makj2ph2z6kpny7qz51zrzbgwhrlw0w4vg"; + }; + aarch64-linux = fetchurl { + url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-linux-arm64.zip"; + sha256 = "0hg2g4i8sj3fxqfy4imz1iarby1d9f8dh59j266lbbdf2vfz2cml"; + }; + }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + + nativeBuildInputs = [ unzip makeWrapper autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc zlib lttng-ust curl ]; + + sourceRoot = "."; + + installPhase = '' + dist=$out/opt/asf + mkdir -p $dist + cp -r * $dist + chmod +x $dist/ArchiSteamFarm + makeWrapper $dist/ArchiSteamFarm $out/bin/ArchiSteamFarm \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ icu openssl ] }" \ + --add-flags "--path ~/.config/asf" \ + --run "mkdir -p ~/.config/asf" \ + --run "cd ~/.config/asf" \ + --run "[ -d config ] || cp --no-preserve=mode -r $dist/config ." \ + --run "[ -d logs ] || cp --no-preserve=mode -r $dist/logs ." \ + --run "[ -d plugins ] || cp --no-preserve=mode -r $dist/plugins ." \ + --run "[ -d www ] || cp --no-preserve=mode -r $dist/www ." \ + ''; + + meta = with stdenv.lib; { + description = "Application with primary purpose of idling Steam cards from multiple accounts simultaneously"; + homepage = "https://github.com/JustArchiNET/ArchiSteamFarm"; + license = licenses.asl20; + platforms = [ "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ gnidorah ]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix index f87bd4c11ec47..4c03b197b4a03 100644 --- a/pkgs/applications/misc/abook/default.nix +++ b/pkgs/applications/misc/abook/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses readline ]; meta = { - homepage = http://abook.sourceforge.net/; + homepage = "http://abook.sourceforge.net/"; description = "Text-based addressbook program designed to use with mutt mail client"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.edwtjo ]; diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index d1e4856e0523e..b67e514ce54d1 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "Adobe Reader, a viewer for PDF documents"; - homepage = http://www.adobe.com/products/reader; + homepage = "http://www.adobe.com/products/reader"; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix index 465c72d73f5cc..043f1c86bd129 100644 --- a/pkgs/applications/misc/airtame/default.nix +++ b/pkgs/applications/misc/airtame/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { dontPatchELF = true; meta = with stdenv.lib; { - homepage = https://airtame.com/download; + homepage = "https://airtame.com/download"; description = "Wireless streaming client for Airtame devices"; license = licenses.unfree; maintainers = with maintainers; [ thanegill ]; diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index b6248b8f6f131..518ec310ffbee 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -95,15 +95,21 @@ rustPlatform.buildRustPackage rec { installPhase = '' runHook preInstall - install -D target/release/alacritty $out/bin/alacritty + install -D $releaseDir/alacritty $out/bin/alacritty '' + ( if stdenv.isDarwin then '' mkdir $out/Applications - cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app + cp -r $releaseDir/osx/Alacritty.app $out/Applications/Alacritty.app '' else '' install -D extra/linux/Alacritty.desktop -t $out/share/applications/ - install -D extra/logo/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg + install -D extra/logo/compat/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg + + # patchelf generates an ELF that binutils' "strip" doesn't like: + # strip: not enough room for program headers, try linking with -N + # As a workaround, strip manually before running patchelf. + strip -S $out/bin/alacritty + patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/alacritty '' ) + '' diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 6fc5f9514651d..5c43d717913bc 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -38,7 +38,7 @@ mkDerivation rec { ''; meta = with lib; { - homepage = https://albertlauncher.github.io/; + homepage = "https://albertlauncher.github.io/"; description = "Desktop agnostic launcher"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ericsagnes synthetica ]; diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index 06321d9d6218e..b7b7cfea7c1a1 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchpatch , atk , cairo , desktop-file-utils @@ -30,6 +31,15 @@ stdenv.mkDerivation rec { sha256 = "09rxx4s4c34d1axza6ayss33v78p44r9bpx058shllh1sf5avpcb"; }; + patches = [ + # Fix gpgme detection + # https://gitlab.gnome.org/GNOME/almanah/merge_requests/7 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/almanah/commit/4b979c4145ef2fbceebb3849a70df1d0ceb1bb93.patch"; + sha256 = "q3M+osNWz7AsDQtFju5S7P4wH3cAdzKOPKnEXTJ+k3M="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils gettext @@ -64,9 +74,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small GTK application to allow to keep a diary of your life"; - homepage = https://wiki.gnome.org/Apps/Almanah_Diary; + homepage = "https://wiki.gnome.org/Apps/Almanah_Diary"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/applications/misc/aminal/default.nix b/pkgs/applications/misc/aminal/default.nix index 8c5aded5ed9ba..dff6b15494bba 100644 --- a/pkgs/applications/misc/aminal/default.nix +++ b/pkgs/applications/misc/aminal/default.nix @@ -61,7 +61,7 @@ buildGoPackage rec { - Built-in patched fonts for powerline - Retina display support ''; - homepage = https://github.com/liamg/aminal; + homepage = "https://github.com/liamg/aminal"; license = licenses.gpl3; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix index 8108b9e4ddb4c..49da252b6c0d1 100644 --- a/pkgs/applications/misc/antfs-cli/default.nix +++ b/pkgs/applications/misc/antfs-cli/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication { version = "unstable-2017-02-11"; meta = with stdenv.lib; { - homepage = https://github.com/Tigge/antfs-cli; + homepage = "https://github.com/Tigge/antfs-cli"; description = "Extracts FIT files from ANT-FS based sport watches"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index cda75ac4c0504..38b51efa240e2 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Edit the Pantheon desktop application menu"; - homepage = https://github.com/donadigo/appeditor; - maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + homepage = "https://github.com/donadigo/appeditor"; + maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index b5af1af91f36c..48efafa74fcd7 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://naihe2010.github.io/apvlv/; + homepage = "http://naihe2010.github.io/apvlv/"; description = "PDF viewer with Vim-like behaviour"; longDescription = '' apvlv is a PDF/DJVU/UMD/TXT Viewer Under Linux/WIN32 diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix index 64b592b78714b..0e345b1e273de 100644 --- a/pkgs/applications/misc/archiver/default.nix +++ b/pkgs/applications/misc/archiver/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "1yr2jhidqvbwh1y08lpqaidwpr5yx3bhvznm5fc9pk64s7z5kq3h"; }; - modSha256 = "1mrfqhd0zb78rlqlj2ncb0srwjfl7rzhy2p9mwa82pgysvlp08gv"; + vendorSha256 = "1ikrgl03r9zkn86kxkqi2kf540g3qzzz24i5wvh6g3d5q49nygl9"; meta = with lib; { description = "Easily create & extract archives, and compress & decompress files of various formats"; @@ -23,4 +23,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index b03d2aa208b55..648a2cfd99459 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An offline thesaurus based on WordNet"; - homepage = http://artha.sourceforge.net; + homepage = "http://artha.sourceforge.net"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/asciiquarium/default.nix b/pkgs/applications/misc/asciiquarium/default.nix index 0e524ede0912e..592c0938ffbd4 100644 --- a/pkgs/applications/misc/asciiquarium/default.nix +++ b/pkgs/applications/misc/asciiquarium/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Enjoy the mysteries of the sea from the safety of your own terminal!"; - homepage = https://robobunny.com/projects/asciiquarium/html/; + homepage = "https://robobunny.com/projects/asciiquarium/html/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.utdemir ]; diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 622e7169faec6..32ea821b22d67 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "Sample Rate Converter for audio"; - homepage = http://sox.sourceforge.net/; + homepage = "http://sox.sourceforge.net/"; maintainers = [ lib.maintainers.marcweber ]; license = if enableAMR then lib.licenses.unfree else lib.licenses.gpl2Plus; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index 20a754ba98ae6..59c7154fa7dea 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "An audio resampling library"; - homepage = http://soxr.sourceforge.net; + homepage = "http://soxr.sourceforge.net"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix index 0add5ed78cc53..0ca01c8d2aede 100644 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "wavesurfer-1.8.5"; src = fetchurl { - url = https://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz; + url = "https://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz"; sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Tool for recording, playing, editing, viewing and labeling of audio"; - homepage = http://www.speech.kth.se/wavesurfer/; + homepage = "http://www.speech.kth.se/wavesurfer/"; license = "BSD"; }; } diff --git a/pkgs/applications/misc/audio/wavrsocvt/default.nix b/pkgs/applications/misc/audio/wavrsocvt/default.nix index 09b75e27d46a1..ebb04a30ab866 100644 --- a/pkgs/applications/misc/audio/wavrsocvt/default.nix +++ b/pkgs/applications/misc/audio/wavrsocvt/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { supported sample rates in the standard NXT firmware). You can then upload these with e.g. nxt-python. ''; - homepage = http://bricxcc.sourceforge.net/; + homepage = "http://bricxcc.sourceforge.net/"; license = licenses.mpl11; maintainers = with maintainers; [ leenaars ]; platforms = with platforms; linux; diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix new file mode 100644 index 0000000000000..953e12a033d0a --- /dev/null +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -0,0 +1,27 @@ +{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcsclite, qtsvg, qttools, qtwebsockets +, qtquickcontrols2, qtgraphicaleffects }: + +mkDerivation rec { + pname = "AusweisApp2"; + version = "1.20.0"; + + src = fetchFromGitHub { + owner = "Governikus"; + repo = "AusweisApp2"; + rev = "${version}"; + sha256 = "0qkwdaxhig4qjim7h20j6ln6w76ycppfc786nd8l69bd1qv46m40"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ qtsvg qttools qtwebsockets qtquickcontrols2 qtgraphicaleffects pcsclite ]; + + meta = with stdenv.lib; { + description = "Authentication software for the German ID card"; + downloadPage = "https://github.com/Governikus/AusweisApp2/releases"; + homepage = "https://www.ausweisapp.bund.de/ausweisapp2/"; + license = licenses.eupl12; + maintainers = with maintainers; [ b4dm4n ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix index b00686fb24f67..a33261e7a59de 100644 --- a/pkgs/applications/misc/autospotting/default.nix +++ b/pkgs/applications/misc/autospotting/default.nix @@ -20,7 +20,7 @@ buildGoPackage { ''; meta = with stdenv.lib; { - homepage = https://github.com/AutoSpotting/AutoSpotting; + homepage = "https://github.com/AutoSpotting/AutoSpotting"; description = "Automatically convert your existing AutoScaling groups to up to 90% cheaper spot instances with minimal configuration changes"; license = licenses.free; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 165bee76b69b6..f4a56e4f92403 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "GUI for AVRDUDE (AVR microcontroller programmer)"; - homepage = https://github.com/zkemble/AVRDUDESS; + homepage = "https://github.com/zkemble/AVRDUDESS"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index 10e46176c6e6e..28b65d2b58b67 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -32,8 +32,8 @@ mkDerivation rec { Synergy was a commercialized reimplementation of the original CosmoSynergy written by Chris Schoeneman. ''; - homepage = https://github.com/debauchee/barrier; - downloadPage = https://github.com/debauchee/barrier/releases; + homepage = "https://github.com/debauchee/barrier"; + downloadPage = "https://github.com/debauchee/barrier/releases"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.phryneas ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix index 0976e7625bcf6..4a023849f3903 100644 --- a/pkgs/applications/misc/bashSnippets/default.nix +++ b/pkgs/applications/misc/bashSnippets/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A collection of small bash scripts for heavy terminal users"; - homepage = https://github.com/alexanderepstein/Bash-Snippets; + homepage = "https://github.com/alexanderepstein/Bash-Snippets"; license = licenses.mit; maintainers = with maintainers; [ infinisil ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix index 06df1df9f769a..fd7eb4990f061 100644 --- a/pkgs/applications/misc/bb/default.nix +++ b/pkgs/applications/misc/bb/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = http://aa-project.sourceforge.net/bb; + homepage = "http://aa-project.sourceforge.net/bb"; description = "AA-lib demo"; license = licenses.gpl2; maintainers = [ maintainers.rnhmjoj ]; diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 665198b3d1f48..8b17ecea3cbb9 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -1,32 +1,33 @@ -{ stdenv, fetchFromGitHub, cairo, cmake, libxkbcommon +{ stdenv, lib, fetchFromGitHub, cairo, libxkbcommon , pango, fribidi, harfbuzz, pcre, pkgconfig , ncursesSupport ? true, ncurses ? null -, waylandSupport ? true, wayland ? null +, waylandSupport ? true, wayland ? null, wayland-protocols ? null , x11Support ? true, xlibs ? null, xorg ? null }: assert ncursesSupport -> ncurses != null; -assert waylandSupport -> wayland != null; +assert waylandSupport -> ! lib.elem null [wayland wayland-protocols]; assert x11Support -> xlibs != null && xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.3.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "03k8wijdgj5nwmvgjhsrlh918n719789fhs4dqm23pd00rapxipk"; + sha256 = "1fjcs9d3533ay3nz79cx3c0lmy2chgragr2lhsy0xl2ckr0iins0"; }; - nativeBuildInputs = [ cmake pkgconfig pcre ]; + nativeBuildInputs = [ pkgconfig pcre ]; - cmakeFlags = [ - "-DBEMENU_CURSES_RENDERER=${if ncursesSupport then "ON" else "OFF"}" - "-DBEMENU_WAYLAND_RENDERER=${if waylandSupport then "ON" else "OFF"}" - "-DBEMENU_X11_RENDERER=${if x11Support then "ON" else "OFF"}" - ]; + makeFlags = ["PREFIX=$(out)"]; + + buildFlags = ["clients"] + ++ lib.optional ncursesSupport "curses" + ++ lib.optional waylandSupport "wayland" + ++ lib.optional x11Support "x11"; buildInputs = with stdenv.lib; [ cairo @@ -34,18 +35,18 @@ stdenv.mkDerivation rec { harfbuzz libxkbcommon pango - ] ++ optionals ncursesSupport [ ncurses ] - ++ optionals waylandSupport [ wayland ] + ] ++ optional ncursesSupport ncurses + ++ optionals waylandSupport [ wayland wayland-protocols ] ++ optionals x11Support [ xlibs.libX11 xlibs.libXinerama xlibs.libXft xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Cloudef/bemenu"; description = "Dynamic menu library and client program inspired by dmenu"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ thiagokokada ]; + maintainers = with maintainers; [ lheckemann ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index d0af940ac92a8..cfac79bef4bdc 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core +{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core , qtbase, qttools, qtsvg, qtwebkit }: -stdenv.mkDerivation rec { +mkDerivation rec { version = "2.11.2"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "A Qt4 Bible study tool"; - homepage = http://www.bibletime.info/; + homepage = "http://www.bibletime.info/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.piotr ]; diff --git a/pkgs/applications/misc/bicon/default.nix b/pkgs/applications/misc/bicon/default.nix index 22eb3e3d8594e..41b0d3c13a80e 100644 --- a/pkgs/applications/misc/bicon/default.nix +++ b/pkgs/applications/misc/bicon/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A bidirectional console"; - homepage = https://github.com/behdad/bicon; + homepage = "https://github.com/behdad/bicon"; license = [ licenses.lgpl21 licenses.psfl licenses.bsd0 ]; maintainers = [ maintainers.linarcx ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/birdtray/default.nix b/pkgs/applications/misc/birdtray/default.nix index 39ecaa995d145..5385cf67884d6 100644 --- a/pkgs/applications/misc/birdtray/default.nix +++ b/pkgs/applications/misc/birdtray/default.nix @@ -7,32 +7,27 @@ , qtbase , qttools , qtx11extras - , sqlite }: mkDerivation rec { pname = "birdtray"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "gyunaev"; repo = pname; - rev = "RELEASE_${version}"; - sha256 = "0wj2lq5bz1p0cf6yj43v3ifxschcrh5amwx30wqw2m4bb8syzjw1"; + rev = version; + sha256 = "15l8drdmamq1dpqpj0h9ajj2r5vcs23cx421drvhfgs6bqlzd1hl"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - qtbase qtx11extras sqlite + qtbase qttools qtx11extras ]; - installPhase = '' - install -Dm755 birdtray $out/bin/birdtray - ''; - meta = with lib; { description = "Mail system tray notification icon for Thunderbird"; - homepage = https://github.com/gyunaev/birdtray; + homepage = "https://github.com/gyunaev/birdtray"; license = licenses.gpl3Plus; maintainers = with maintainers; [ Flakebi ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index 4b2e1c6676125..0111f8519e7cc 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -54,7 +54,7 @@ pythonPackages.buildPythonApplication rec { strictDeps = false; meta = with stdenv.lib; { - homepage = http://bleachbit.sourceforge.net; + homepage = "http://bleachbit.sourceforge.net"; description = "A program to clean your computer"; longDescription = "BleachBit helps you easily clean your computer to free space and maintain privacy."; license = licenses.gpl3; diff --git a/pkgs/applications/misc/blugon/default.nix b/pkgs/applications/misc/blugon/default.nix index cdb317749efef..896daa27f7cb3 100644 --- a/pkgs/applications/misc/blugon/default.nix +++ b/pkgs/applications/misc/blugon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "blugon"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "jumper149"; repo = pname; rev = version; - sha256 = "0vdhq8v011awhpkccbcmigj9c46widyzh0m5knafapanai3kv7ii"; + sha256 = "1i67v8jxvavgax3dwvns200iwwdcvgki04liq0x64q52lg0vrh7m"; }; buildInputs = [ python3 libX11 libXrandr ]; diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 8ca6d9ae0453d..f4018cff5f431 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -71,7 +71,7 @@ with python3.pkgs; buildPythonApplication rec { meta = with stdenv.lib; { description = "Private cmdline bookmark manager"; - homepage = https://github.com/jarun/Buku; + homepage = "https://github.com/jarun/Buku"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ matthiasbeyer infinisil ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index bc3f846ad6c18..869785ef82a05 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -30,11 +30,11 @@ let in mkDerivation rec { pname = "calibre"; - version = "4.12.0"; + version = "4.15.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "144vl5p0adcywcqaarrriq5zd8q5i934yfjg9himiq1vdp9vy4fi"; + sha256 = "0m8mvyw5c1khd54jx896w6nfwaydmpi3cb6wi5p2a0hxdksqgrkm"; }; patches = [ @@ -122,7 +122,16 @@ mkDerivation rec { export PODOFO_INC_DIR=${podofo.dev}/include/podofo export PODOFO_LIB_DIR=${podofo.lib}/lib export SIP_BIN=${pypkgs.sip}/bin/sip - ${pypkgs.python.interpreter} setup.py install --prefix=$out + export XDG_DATA_HOME=$out/share + export XDG_UTILS_INSTALL_MODE="user" + + ${pypkgs.python.interpreter} setup.py install --root=$out \ + --prefix=$out \ + --libdir=$out/lib \ + --staging-root=$out \ + --staging-libdir=$out/lib \ + --staging-sharedir=$out/share + PYFILES="$out/bin/* $out/lib/calibre/calibre/web/feeds/*.py $out/lib/calibre/calibre/ebooks/metadata/*.py @@ -131,13 +140,6 @@ mkDerivation rec { sed -i "s/env python[0-9.]*/python/" $PYFILES sed -i "2i import sys; sys.argv[0] = 'calibre'" $out/bin/calibre - # Replace @out@ by the output path. - mkdir -p $out/share/applications/ - cp {$calibreDesktopItem,$ebookEditDesktopItem,$ebookViewerDesktopItem}/share/applications/* $out/share/applications/ - for entry in $out/share/applications/*.desktop; do - substituteAllInPlace $entry - done - mkdir -p $out/share cp -a man-pages $out/share/man @@ -165,79 +167,6 @@ mkDerivation rec { disallowedReferences = [ podofo.dev ]; - calibreDesktopItem = makeDesktopItem { - fileValidation = false; # fails before substitution - name = "calibre-gui"; - desktopName = "calibre"; - exec = "@out@/bin/calibre --detach %F"; - genericName = "E-book library management"; - icon = "@out@/share/calibre/images/library.png"; - comment = "Manage, convert, edit, and read e-books"; - mimeType = lib.concatStringsSep ";" [ - "application/x-mobipocket-subscription" - "application/vnd.openxmlformats-officedocument.wordprocessingml.document" - "text/html" - "application/x-cbc" - "application/ereader" - "application/oebps-package+xml" - "image/vnd.djvu" - "application/x-sony-bbeb" - "application/vnd.ms-word.document.macroenabled.12" - "text/rtf" - "text/x-markdown" - "application/pdf" - "application/x-cbz" - "application/x-mobipocket-ebook" - "application/x-cbr" - "application/x-mobi8-ebook" - "text/fb2+xml" - "application/vnd.oasis.opendocument.text" - "application/epub+zip" - "text/plain" - "application/xhtml+xml" - ]; - categories = "Office"; - extraEntries = '' - Actions=Edit;Viewer; - - [Desktop Action Edit] - Name=Edit E-book - Icon=@out@/share/calibre/images/tweak.png - Exec=@out@/bin/ebook-edit --detach %F - - [Desktop Action Viewer] - Name=E-book Viewer - Icon=@out@/share/calibre/images/viewer.png - Exec=@out@/bin/ebook-viewer --detach %F - ''; - }; - - ebookEditDesktopItem = makeDesktopItem { - fileValidation = false; # fails before substitution - name = "calibre-edit-book"; - desktopName = "Edit E-book"; - genericName = "E-book Editor"; - comment = "Edit e-books"; - icon = "@out@/share/calibre/images/tweak.png"; - exec = "@out@/bin/ebook-edit --detach %F"; - categories = "Office;Publishing"; - mimeType = "application/epub+zip"; - extraEntries = "NoDisplay=true"; - }; - - ebookViewerDesktopItem = makeDesktopItem { - fileValidation = false; # fails before substitution - name = "calibre-ebook-viewer"; - desktopName = "E-book Viewer"; - genericName = "E-book Viewer"; - comment = "Read e-books in all the major formats"; - icon = "@out@/share/calibre/images/viewer.png"; - exec = "@out@/bin/ebook-viewer --detach %F"; - categories = "Office;Viewer"; - mimeType = "application/epub+zip"; - extraEntries = "NoDisplay=true"; - }; - meta = with lib; { description = "Comprehensive e-book software"; homepage = "https://calibre-ebook.com"; diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix index 77cabc409c744..842ef2262d9fe 100644 --- a/pkgs/applications/misc/candle/default.nix +++ b/pkgs/applications/misc/candle/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }: +{ mkDerivation, stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "candle"; version = "1.1"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GRBL controller application with G-Code visualizer written in Qt"; - homepage = https://github.com/Denvi/Candle; + homepage = "https://github.com/Denvi/Candle"; license = licenses.gpl3; maintainers = with maintainers; [ matti-kariluoma ]; }; diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix index 40dbfea9801bc..83340f78dd482 100644 --- a/pkgs/applications/misc/cardpeek/default.nix +++ b/pkgs/applications/misc/cardpeek/default.nix @@ -20,7 +20,7 @@ in enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/L1L1/cardpeek; + homepage = "https://github.com/L1L1/cardpeek"; description = "A tool to read the contents of ISO7816 smart cards"; license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/applications/misc/catclock/default.nix index 09c36f9eb2f11..6b4ab1f3a8bf2 100644 --- a/pkgs/applications/misc/catclock/default.nix +++ b/pkgs/applications/misc/catclock/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { buildInputs = [ xlibsWrapper motif ]; meta = with stdenv.lib; { - homepage = http://codefromabove.com/2014/05/catclock/; + homepage = "http://codefromabove.com/2014/05/catclock/"; license = with licenses; mit; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index ac2948c2d6ef4..e7664244db7bb 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight and fast battery icon that sits in the system tray"; - homepage = https://github.com/valr/cbatticon; + homepage = "https://github.com/valr/cbatticon"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix index c05c7423d9a56..09236565d5984 100644 --- a/pkgs/applications/misc/cgminer/default.nix +++ b/pkgs/applications/misc/cgminer/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { monitoring, (over)clocking and fanspeed support for bitcoin and derivative coins. Do not use on multiple block chains at the same time! ''; - homepage = https://github.com/ckolivas/cgminer; + homepage = "https://github.com/ckolivas/cgminer"; license = licenses.gpl3; maintainers = [ maintainers.offline ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index b4765c0aae32b..ec4d71a0dce8e 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "3.9.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "0jbqflkcfdrinx1lk45klm8ml0n4cgp43nzls1376cd3hfayby1y"; + sha256 = "0indvycj972wng979mvia8mrb7bwdfay7wxq3lnj05qyxqafj5h2"; }; subPackages = [ "cmd/cheat" ]; @@ -17,10 +17,11 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' + installManPage doc/cheat.1 installShellCompletion scripts/cheat.{bash,fish,zsh} ''; - modSha256 = "1is19qca5wgzya332rmpk862nnivxzgxchkllv629f5fwwdvdgmg"; + vendorSha256 = null; meta = with stdenv.lib; { description = "Create and view interactive cheatsheets on the command-line"; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 72279e84909c7..d2ade055d6fd5 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -1,12 +1,15 @@ -{ lib, fetchurl, pythonPackages, gettext }: +{ lib, fetchFromGitHub, pythonPackages, gettext }: pythonPackages.buildPythonApplication rec { pname = "cherrytree"; - version = "0.39.1"; + version = "0.39.3"; + + src = fetchFromGitHub { + owner = "giuspen"; + repo = "cherrytree"; + rev = version; + sha256 = "1k9i7acpphx0if6ij2p9fkmj638ry6hcyr1rdr039a8zi8hq98gz"; - src = fetchurl { - url = "https://www.giuspen.com/software/${pname}-${version}.tar.xz"; - sha256 = "0qhycblnixvbybzr8psgmgcpfs6jc9m0p2h9lmd5zmiaggqlcsv7"; }; nativeBuildInputs = [ gettext ]; @@ -20,17 +23,16 @@ pythonPackages.buildPythonApplication rec { meta = with lib; { description = "An hierarchical note taking application"; longDescription = '' - Cherrytree is an hierarchical note taking application, - featuring rich text, syntax highlighting and powerful search - capabilities. It organizes all information in units called - "nodes", as in a tree, and can be very useful to store any piece - of information, from tables and links to pictures and even entire - documents. All those little bits of information you have scattered - around your hard drive can be conveniently placed into a - Cherrytree document where you can easily find it. + Cherrytree is an hierarchical note taking application, featuring rich + text, syntax highlighting and powerful search capabilities. It organizes + all information in units called "nodes", as in a tree, and can be very + useful to store any piece of information, from tables and links to + pictures and even entire documents. All those little bits of information + you have scattered around your hard drive can be conveniently placed into + a Cherrytree document where you can easily find it. ''; homepage = "http://www.giuspen.com/cherrytree"; license = licenses.gpl3; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/applications/misc/cipher/default.nix index cdcfcc00481a1..eef05fe91d200 100644 --- a/pkgs/applications/misc/cipher/default.nix +++ b/pkgs/applications/misc/cipher/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple application for encoding and decoding text, designed for elementary OS"; homepage = "https://github.com/arshubham/cipher"; - maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index 4986661e2f638..112341dcd4f0a 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/dpayne/cli-visualizer; + homepage = "https://github.com/dpayne/cli-visualizer"; description = "CLI based audio visualizer"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index f9c08d1f00a1a..c5083f2379c6d 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "clightd"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - sha256 = "0cskxy3xsy187in5vg8xcs3kwcx2s160qv009v0ahkcalp29ghz4"; + sha256 = "0pqnn52nn22k49f5cw4jcr8vcbff28n56i8fizg1mmfshy8pn891"; }; # dbus-1.pc has datadir=/etc @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux bus interface that changes screen brightness/temperature"; - homepage = https://github.com/FedeDP/Clightd; + homepage = "https://github.com/FedeDP/Clightd"; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix index a2e4525626985..ed8767419d4df 100644 --- a/pkgs/applications/misc/clight/default.nix +++ b/pkgs/applications/misc/clight/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A C daemon that turns your webcam into a light sensor"; - homepage = https://github.com/FedeDP/Clight; + homepage = "https://github.com/FedeDP/Clight"; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index 82d6272aadcda..02207fb95806f 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -4,23 +4,15 @@ stdenv.mkDerivation rec { pname = "clipit"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { - owner = "shantzu"; + owner = "CristianHenzel"; repo = "ClipIt"; - rev = "v${version}"; - sha256 = "05xi29v2y0rvb33fmvrz7r9j4l858qj7ngwd7dp4pzpkkaybjln0"; + rev = "45e2ea386d04dbfc411ea370299502450d589d0c"; + sha256 = "0byqz9hanwmdc7i55xszdby2iqrk93lws7hmjda2kv17g34apwl7"; }; - patches = [ - # gtk3 support, can be removed in the next release - (fetchpatch { - url = "https://github.com/CristianHenzel/ClipIt/commit/22e012c7d406436e1785b6dd3c4c138b25f68431.patch"; - sha256 = "0la4gc324dzxpx6nk2lqg5fmjgjpm2pyvzwddmfz1il8hqvrqg3j"; - }) - ]; - preConfigure = '' intltoolize --copy --force --automake ''; @@ -38,5 +30,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.gpl3; platforms = platforms.linux; + maintainers = with maintainers; [ kamilchm ]; }; } diff --git a/pkgs/applications/misc/cmatrix/default.nix b/pkgs/applications/misc/cmatrix/default.nix index 9f86ec94f184a..fa0e10f9eef82 100644 --- a/pkgs/applications/misc/cmatrix/default.nix +++ b/pkgs/applications/misc/cmatrix/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { CMatrix simulates the display from "The Matrix" and is based on the screensaver from the movie's website. ''; - homepage = https://github.com/abishekvashok/cmatrix; + homepage = "https://github.com/abishekvashok/cmatrix"; platforms = ncurses.meta.platforms; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/applications/misc/colort/default.nix b/pkgs/applications/misc/colort/default.nix index 554c7d8c78bbf..1eda11890e795 100644 --- a/pkgs/applications/misc/colort/default.nix +++ b/pkgs/applications/misc/colort/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A program for 'tinting' color values"; - homepage = https://github.com/neeasade/colort; + homepage = "https://github.com/neeasade/colort"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.neeasade ]; diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix index b07e0fb8c5208..bb1aacc2069b7 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/applications/misc/confclerk/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Offline conference schedule viewer"; - homepage = http://www.toastfreeware.priv.at/confclerk; + homepage = "http://www.toastfreeware.priv.at/confclerk"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ehmry ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index c9dcc97d5cd14..739ad07adbf3a 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -38,7 +38,7 @@ mkDerivation rec { feel of the old cathode tube screens. It has been designed to be eye-candy, customizable, and reasonably lightweight. ''; - homepage = https://github.com/Swordfish90/cool-retro-term; + homepage = "https://github.com/Swordfish90/cool-retro-term"; license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ skeidel ]; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 16be8e06b6865..ec2bd6b32c073 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "CopyQ"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "05nhgndiq0sm1bvb80sf5fgnm38249dclwzmfm7hzrablmkwgv3c"; + sha256 = "1wx6nqcyzknbw71sliwq4cb5qq1gy6pr9867s6x3vpg3n8g2czkf"; }; nativeBuildInputs = [ cmake ]; @@ -21,7 +21,7 @@ mkDerivation rec { ] ++ lib.optional webkitSupport qtwebkit; meta = with lib; { - homepage = https://hluk.github.io/CopyQ; + homepage = "https://hluk.github.io/CopyQ"; description = "Clipboard Manager with Advanced Features"; license = licenses.gpl3; maintainers = [ maintainers.willtim ]; diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix index c09457d2c656c..bbb7c53b61f65 100644 --- a/pkgs/applications/misc/coursera-dl/default.nix +++ b/pkgs/applications/misc/coursera-dl/default.nix @@ -38,7 +38,7 @@ in pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "CLI for downloading Coursera.org videos and naming them"; - homepage = https://github.com/coursera-dl/coursera-dl; + homepage = "https://github.com/coursera-dl/coursera-dl"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ alexfmpe ]; platforms = platforms.darwin ++ platforms.linux; diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix index dae25f6b8176f..aed44d1213ce1 100644 --- a/pkgs/applications/misc/cpp-ethereum/default.nix +++ b/pkgs/applications/misc/cpp-ethereum/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ethereum C++ client"; - homepage = https://github.com/ethereum/cpp-ethereum; + homepage = "https://github.com/ethereum/cpp-ethereum"; license = licenses.gpl3; maintainers = with maintainers; [ artuuge ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix new file mode 100644 index 0000000000000..fb81bbdd40c76 --- /dev/null +++ b/pkgs/applications/misc/cpu-x/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, ncurses +, libcpuid, pciutils, procps, wrapGAppsHook, nasm, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "cpu-x"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "X0rg"; + repo = "CPU-X"; + rev = "v${version}"; + sha256 = "00xngmlayblvkg3l0rcfpxmnkkdz49ydh4smlhpii23gqii0rds3"; + }; + + nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook nasm makeWrapper ]; + buildInputs = [ + gtk3 ncurses libcpuid pciutils procps + ]; + + postInstall = '' + wrapProgram $out/bin/cpu-x \ + --prefix PATH : ${stdenv.lib.makeBinPath [ stdenv.cc ]} + ''; + + meta = with stdenv.lib; { + description = "Free software that gathers information on CPU, motherboard and more"; + homepage = src.meta.homepage; + license = licenses.gpl3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ gnidorah ]; + }; +} diff --git a/pkgs/applications/misc/crumbs/default.nix b/pkgs/applications/misc/crumbs/default.nix index 2d612c16fef3a..889c17e6988d7 100644 --- a/pkgs/applications/misc/crumbs/default.nix +++ b/pkgs/applications/misc/crumbs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Bookmarks for the command line"; - homepage = https://github.com/fasseg/crumbs; + homepage = "https://github.com/fasseg/crumbs"; license = licenses.wtfpl; platforms = platforms.all; maintainers = with maintainers; [ thesola10 ]; diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix index 72918a40733ba..602fe43081607 100644 --- a/pkgs/applications/misc/ctodo/default.nix +++ b/pkgs/applications/misc/ctodo/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://ctodo.apakoh.dk/; + homepage = "http://ctodo.apakoh.dk/"; description = "A simple ncurses-based task list manager"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index d48efb1a1127c..1b5c7c23956ed 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -2,25 +2,26 @@ mkDerivation rec { pname = "cura"; - version = "4.5.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "0fm04s912sgmr66wyb55ly4jh39ijsj6lx4fx9wn7hchlqmw5jxi"; + sha256 = "0h1r9caa579d3gfpcmch54rdbkg5df64ds2v84iqsbxwjp0rmn4n"; }; materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; rev = version; - sha256 = "0fgkwz1anw49macq1jxjhjr79slhmx7g3zwij7g9fqyzzhrrmwqn"; + sha256 = "1k5c3qmixhpz3z2yi0fysxcyyf1yhcwmdlrcypkw827lhsialqp4"; }; buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; propagatedBuildInputs = with python3.pkgs; [ libsavitar numpy-stl pyserial requests uranium zeroconf + sentry-sdk trimesh ] ++ plugins; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; @@ -55,7 +56,7 @@ mkDerivation rec { meta = with lib; { description = "3D printer / slicing GUI built on top of the Uranium framework"; - homepage = https://github.com/Ultimaker/Cura; + homepage = "https://github.com/Ultimaker/Cura"; license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar gebner ]; diff --git a/pkgs/applications/misc/cura/lulzbot/curaengine.nix b/pkgs/applications/misc/cura/lulzbot/curaengine.nix index d7a9b63bbbf44..a5cfa937fd8dd 100644 --- a/pkgs/applications/misc/cura/lulzbot/curaengine.nix +++ b/pkgs/applications/misc/cura/lulzbot/curaengine.nix @@ -5,7 +5,7 @@ gcc8Stdenv.mkDerivation rec { version = "3.6.21"; src = fetchgit { - url = https://code.alephobjects.com/source/curaengine-lulzbot.git; + url = "https://code.alephobjects.com/source/curaengine-lulzbot.git"; rev = "ec6a1a0f0aa387ef97e5c106633cf8d7fb9cd00d"; sha256 = "0wdkvg1hmqp1gaym804lw09x4ngf5ffasd861jhflpy7djbmkfn8"; }; @@ -19,7 +19,7 @@ gcc8Stdenv.mkDerivation rec { meta = with gcc8Stdenv.lib; { description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; - homepage = https://code.alephobjects.com/source/curaengine-lulzbot/; + homepage = "https://code.alephobjects.com/source/curaengine-lulzbot/"; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ chaduffy ]; diff --git a/pkgs/applications/misc/cura/lulzbot/default.nix b/pkgs/applications/misc/cura/lulzbot/default.nix index c67fcb74047da..229966561c6d5 100644 --- a/pkgs/applications/misc/cura/lulzbot/default.nix +++ b/pkgs/applications/misc/cura/lulzbot/default.nix @@ -4,7 +4,7 @@ let # admittedly, we're using (printer firmware) blobs when we could compile them ourselves. curaBinaryDataVersion = "3.6.21"; # Marlin v2.0.0.174 for Bio, v2.0.0.144 for others. curaBinaryData = fetchgit { - url = https://code.alephobjects.com/diffusion/CBD/cura-binary-data.git; + url = "https://code.alephobjects.com/diffusion/CBD/cura-binary-data.git"; rev = "5c75d0f6c10d8b7a903e2072a48cd1f08059509e"; sha256 = "1qdsj6rczwzdwzyr7nz7fnypbphckjrnwl8c9dr6izsxyzs465c4"; }; @@ -30,7 +30,7 @@ mkDerivation rec { version = "3.6.21"; src = fetchgit { - url = https://code.alephobjects.com/source/cura-lulzbot.git; + url = "https://code.alephobjects.com/source/cura-lulzbot.git"; rev = "7faeb18604c83004846a02c60cb240708db0034f"; sha256 = "10q38s8c8x6xkh1vns4p3iqa5y267vrjh5vq8h55mg1q5001scyq"; }; @@ -74,7 +74,7 @@ mkDerivation rec { meta = with lib; { description = "3D printer / slicing GUI built on top of the Uranium framework"; - homepage = https://code.alephobjects.com/diffusion/CURA/; + homepage = "https://code.alephobjects.com/diffusion/CURA/"; license = licenses.agpl3; # a partial relicense to LGPL has happened, but not certain that all AGPL bits are expunged platforms = platforms.linux; maintainers = with maintainers; [ chaduffy ]; diff --git a/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/pkgs/applications/misc/cura/lulzbot/libarcus.nix index 733aa27da854d..5edaabbacb0f7 100644 --- a/pkgs/applications/misc/cura/lulzbot/libarcus.nix +++ b/pkgs/applications/misc/cura/lulzbot/libarcus.nix @@ -6,7 +6,7 @@ buildPythonPackage { format = "other"; src = fetchgit { - url = https://code.alephobjects.com/source/arcus.git; + url = "https://code.alephobjects.com/source/arcus.git"; rev = "aeda02d7727f45b657afb72cef203283fbf09325"; sha256 = "1ak0d4k745sx7paic27was3s4987z9h3czscjs21hxbi6qy83g99"; }; @@ -24,7 +24,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Communication library between internal components for Ultimaker software"; - homepage = https://code.alephobjects.com/source/arcus/; + homepage = "https://code.alephobjects.com/source/arcus/"; license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ chaduffy ]; diff --git a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix index e6c277959e03f..e32117a103ee0 100644 --- a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix +++ b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix @@ -7,7 +7,7 @@ buildPythonPackage { format = "other"; src = fetchgit { - url = https://code.alephobjects.com/source/savitar.git; + url = "https://code.alephobjects.com/source/savitar.git"; rev = "ee8ada42c55f54727ce4d275c294ba426d3d8234"; sha256 = "1wm5ii3cmni8dk3c65kw4wglpypkdsfpgd480d3hc1r5bqpq0d6j"; }; @@ -25,7 +25,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "C++ implementation of 3mf loading with SIP python bindings"; - homepage = https://github.com/Ultimaker/libSavitar; + homepage = "https://github.com/Ultimaker/libSavitar"; license = licenses.lgpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ chaduffy ]; diff --git a/pkgs/applications/misc/cura/lulzbot/uranium.nix b/pkgs/applications/misc/cura/lulzbot/uranium.nix index acffc741d5781..2ce0fab170ea0 100644 --- a/pkgs/applications/misc/cura/lulzbot/uranium.nix +++ b/pkgs/applications/misc/cura/lulzbot/uranium.nix @@ -8,7 +8,7 @@ buildPythonPackage { format = "other"; src = fetchgit { - url = https://code.alephobjects.com/diffusion/U/uranium.git; + url = "https://code.alephobjects.com/diffusion/U/uranium.git"; rev = "54d911edd2551c5875c554928896122835a0dd6c"; sha256 = "04bym3vwikaxw8ab0mymv9sc9n8i7yw5kfsv99ic811g9lzz3j1i"; }; @@ -29,7 +29,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "A Python framework for building Desktop applications"; - homepage = https://code.alephobjects.com/diffusion/U/; + homepage = "https://code.alephobjects.com/diffusion/U/"; license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ chaduffy ]; diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix index 35d6c97fa0b5c..9fbe647046c02 100644 --- a/pkgs/applications/misc/cura/plugins.nix +++ b/pkgs/applications/misc/cura/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, python3Packages }: +{ stdenv, fetchFromGitHub, fetchpatch, python3Packages }: let @@ -6,21 +6,24 @@ let octoprint = stdenv.mkDerivation rec { pname = "Cura-OctoPrintPlugin"; - version = "3.5.11"; + version = "3.5.12"; src = fetchFromGitHub { owner = "fieldOfView"; repo = pname; - rev = "3cef0a955ae7ccfa5c07d20d9d147c530cc9d6ec"; - sha256 = "0q9bkwgpsbfwkp1bfaxq3wm9pbwx5d7ji0jr7cwc4y5nizji81is"; + rev = "ad522c0b7ead5fbe28da686a3cc75e351274c2bc"; + sha256 = "0ln11ng32bh0smfsk54mv2j3sadh0gwf031nmm95zrvbj9cr6yc0"; }; - nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = with python3Packages; [ netifaces ]; + installPhase = '' + mkdir -p $out/lib/cura/plugins/OctoPrintPlugin + cp -rv . $out/lib/cura/plugins/OctoPrintPlugin/ + ''; + meta = with stdenv.lib; { description = "Enables printing directly to OctoPrint and monitoring the process"; homepage = "https://github.com/fieldOfView/Cura-OctoPrintPlugin"; diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix index 1972042f805e6..87d2aba891b63 100644 --- a/pkgs/applications/misc/cura/stable.nix +++ b/pkgs/applications/misc/cura/stable.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { configurePhase = ""; buildPhase = ""; - + patches = [ ./numpy-cast.patch ]; installPhase = '' @@ -66,9 +66,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "3D printing host software"; - homepage = https://github.com/daid/Cura; + homepage = "https://github.com/daid/Cura"; license = licenses.agpl3; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/misc/curabydagoma/default.nix b/pkgs/applications/misc/curabydagoma/default.nix index a367efaaef383..821b88f9b20d5 100644 --- a/pkgs/applications/misc/curabydagoma/default.nix +++ b/pkgs/applications/misc/curabydagoma/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Slicer for 3D printers built by Dagoma"; - homepage = https://dagoma.fr/cura-by-dagoma.html; + homepage = "https://dagoma.fr/cura-by-dagoma.html"; license = licenses.agpl3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ tiramiseb ]; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 2eb256935d77f..0a4ec62ca7861 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curaengine"; - version = "4.5.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "1gml8f6yqmghgncl1zggs7h2hdh05wf68jw9npg0gh7n9l7yzkk4"; + sha256 = "1fr151hmdg2lhk9pbpan1hb1pafj784nijr4pz646ljmjh12vfk2"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix index 41f110e9ee102..394a94f19ab89 100644 --- a/pkgs/applications/misc/curaengine/stable.nix +++ b/pkgs/applications/misc/curaengine/stable.nix @@ -22,9 +22,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Engine for processing 3D models into 3D printing instructions"; - homepage = https://github.com/Ultimaker/CuraEngine; + homepage = "https://github.com/Ultimaker/CuraEngine"; license = licenses.agpl3; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 64c3f8ac2828e..75edce66b94f5 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.0.2"; + version = "7.0.5"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0p75kvs9ng5i5x5cpdqxlf18y3k83pqsvrkab0i1azk3x4lfkzmd"; + sha256 = "082a0dszdlynpf7lrkwijwcs2x8xmbzrjr8rrwmrmkznhzj50gqf"; }; installPhase = '' diff --git a/pkgs/applications/misc/dbvisualizer/default.nix b/pkgs/applications/misc/dbvisualizer/default.nix index fbeb965df3805..7612c00393fa2 100644 --- a/pkgs/applications/misc/dbvisualizer/default.nix +++ b/pkgs/applications/misc/dbvisualizer/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "dbvisualizer-9.5.7"; src = fetchurl { - url = https://www.dbvis.com/product_download/dbvis-9.5.7/media/dbvis_unix_9_5_7.tar.gz; + url = "https://www.dbvis.com/product_download/dbvis-9.5.7/media/dbvis_unix_9_5_7.tar.gz"; sha256 = "1xv4fw7cji2ffvv7z8vjl5lap512pj60s2ynihirrqld7pmklnyr"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "The universal database tool"; - homepage = https://www.dbvis.com/; + homepage = "https://www.dbvis.com/"; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix index c4639150dd4b4..82730842baca6 100644 --- a/pkgs/applications/misc/ddgr/default.nix +++ b/pkgs/applications/misc/ddgr/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3, installShellFiles }: stdenv.mkDerivation rec { - version = "1.8"; + version = "1.8.1"; pname = "ddgr"; src = fetchFromGitHub { owner = "jarun"; repo = "ddgr"; rev = "v${version}"; - sha256 = "1cyaindcg2vc3ij0p6b35inr01c6ys04izxsn1h70ixhsz46qg8z"; + sha256 = "0668wzh1gqin0xscy3fly9hz370n2ny175f3kya9bsld0x0jkd5p"; }; nativeBuildInputs = [ installShellFiles ]; @@ -17,11 +17,6 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - # Version 1.8 was released as 1.7 - postPatch = '' - substituteInPlace ddgr --replace "_VERSION_ = '1.7'" "_VERSION_ = '${version}'" - ''; - postInstall = '' installShellCompletion --bash --name ddgr.bash auto-completion/bash/ddgr-completion.bash installShellCompletion --fish auto-completion/fish/ddgr.fish diff --git a/pkgs/applications/misc/deco/default.nix b/pkgs/applications/misc/deco/default.nix index a1fdabd8ccb12..ad8b56e830fad 100644 --- a/pkgs/applications/misc/deco/default.nix +++ b/pkgs/applications/misc/deco/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ebzzry/deco; + homepage = "https://github.com/ebzzry/deco"; description = "A simple root image setter"; license = licenses.mit; maintainers = [ maintainers.ebzzry ]; diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 1bfb6bbfeaf3d..69c7f0dc17fb0 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -17,7 +17,7 @@ mkDerivation { cmakeFlags = [ "-DQT5BUILD=true" ]; meta = { - homepage = http://dfilemanager.sourceforge.net/; + homepage = "http://dfilemanager.sourceforge.net/"; description = "File manager written in Qt/C++"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index 957d3ee72bbb8..17dfd08f90b21 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -11,7 +11,7 @@ mkDerivation rec { patches = [ (fetchpatch { - url = https://raw.githubusercontent.com/gentoo/gentoo/9b971631588ff46e7c2d501bc35cd0d9ce2d98e2/app-text/diffpdf/files/diffpdf-2.1.3-qt5.patch; + url = "https://raw.githubusercontent.com/gentoo/gentoo/9b971631588ff46e7c2d501bc35cd0d9ce2d98e2/app-text/diffpdf/files/diffpdf-2.1.3-qt5.patch"; sha256 = "0sax8gcqcmzf74hmdr3rarqs4nsxmml9qmh6pqyjmgl3lypxhafg"; }) ./fix_path_poppler_qt5.patch @@ -50,7 +50,7 @@ mkDerivation rec { ''; meta = { - homepage = http://www.qtrac.eu/diffpdfc.html; + homepage = "http://www.qtrac.eu/diffpdfc.html"; description = "Tool for diffing pdf files visually or textually"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index a6ae45306552c..95159d1927abf 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -7,7 +7,7 @@ , libtool , qrencode , udev -, libusb +, libusb-compat-0_1 , makeWrapper , pkgconfig , qtbase @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { libevent libtool udev - libusb + libusb-compat-0_1 qrencode qtbase diff --git a/pkgs/applications/misc/ding/default.nix b/pkgs/applications/misc/ding/default.nix index e76f95b6a50d3..374c4cf66487e 100644 --- a/pkgs/applications/misc/ding/default.nix +++ b/pkgs/applications/misc/ding/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple and fast dictionary lookup tool"; - homepage = https://www-user.tu-chemnitz.de/~fri/ding/; + homepage = "https://www-user.tu-chemnitz.de/~fri/ding/"; license = licenses.gpl2Plus; platforms = platforms.linux; # homepage says: unix-like except darwin maintainers = [ maintainers.exi ]; diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix index 8f7dbd2d2edab..623e6dc0fbef0 100644 --- a/pkgs/applications/misc/direwolf/default.nix +++ b/pkgs/applications/misc/direwolf/default.nix @@ -36,9 +36,8 @@ stdenv.mkDerivation rec { meta = { description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway"; - homepage = https://github.com/wb2osz/direwolf/; + homepage = "https://github.com/wb2osz/direwolf/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.the-kenny ]; }; } diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/pkgs/applications/misc/dmensamenu/default.nix index 1c3b413386740..cf02efdcece50 100644 --- a/pkgs/applications/misc/dmensamenu/default.nix +++ b/pkgs/applications/misc/dmensamenu/default.nix @@ -26,7 +26,7 @@ buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/dotlambda/dmensamenu; + homepage = "https://github.com/dotlambda/dmensamenu"; description = "Print German canteen menus using dmenu and OpenMensa"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 8d13ac42e1fcc..e4d0c82c4176c 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A generic, highly customizable, and efficient menu for the X Window System"; - homepage = https://tools.suckless.org/dmenu; + homepage = "https://tools.suckless.org/dmenu"; license = licenses.mit; maintainers = with maintainers; [ pSub globin ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix index 7b17d48477180..ca2e6f56e8411 100644 --- a/pkgs/applications/misc/dmenu/wayland.nix +++ b/pkgs/applications/misc/dmenu/wayland.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "dmenu-wayland-unstable"; - version = "2020-02-28"; + version = "2020-04-03"; src = fetchFromGitHub { owner = "nyyManni"; repo = "dmenu-wayland"; - rev = "68e08e8bcde10a10ac3290431f173c6c7fce4238"; - sha256 = "10b1v2brgpgb6wkzn62haj56zmkf3aq6fs3p9rp6bxiw8bs2nvlm"; + rev = "550a7c39f3f925b803d51c616609c8cb6c0ea543"; + sha256 = "0az3w1csn4x6mjyacg6lf70kykdfqamic3hbr57mj83i5jjv0jlv"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index 3888c4ce0a0db..97510bc3b4577 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec { ++ [ keybinder ]; meta = with stdenv.lib; { - homepage = https://launchpad.net/dockbar/; + homepage = "https://launchpad.net/dockbar/"; description = "DockBarX is a lightweight taskbar / panel replacement for Linux which works as a stand-alone dock"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/misc/doing/default.nix b/pkgs/applications/misc/doing/default.nix index d72a5b848261d..48e45328f67ba 100644 --- a/pkgs/applications/misc/doing/default.nix +++ b/pkgs/applications/misc/doing/default.nix @@ -17,7 +17,7 @@ bundlerEnv { in a TaskPaper-formatted text file. It allows for multiple sections/categories and flexible output formatting. ''; - homepage = https://brettterpstra.com/projects/doing/; + homepage = "https://brettterpstra.com/projects/doing/"; license = licenses.mit; maintainers = with maintainers; [ ktf nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index da36e89db1faa..999904a21d3c0 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -19,7 +19,7 @@ mkDerivation { hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; meta = with stdenv.lib; { - homepage = http://doomseeker.drdteam.org/; + homepage = "http://doomseeker.drdteam.org/"; description = "Multiplayer server browser for many Doom source ports"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/applications/misc/dotfiles/default.nix index 5150f13fb80ce..b515074fd4750 100644 --- a/pkgs/applications/misc/dotfiles/default.nix +++ b/pkgs/applications/misc/dotfiles/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Easily manage your dotfiles"; - homepage = https://github.com/jbernard/dotfiles; + homepage = "https://github.com/jbernard/dotfiles"; license = licenses.isc; }; } diff --git a/pkgs/applications/misc/dozenal/default.nix b/pkgs/applications/misc/dozenal/default.nix index 226bdea03013c..05d3ddb7cfbaa 100644 --- a/pkgs/applications/misc/dozenal/default.nix +++ b/pkgs/applications/misc/dozenal/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { Roman numerals. Arbitrary ranks and symbols may be used. Defaults to dozenal Roman numerals. ''; - homepage = https://github.com/dgoodmaniii/dozenal/; + homepage = "https://github.com/dgoodmaniii/dozenal/"; maintainers = with stdenv.lib.maintainers; [ CharlesHD ]; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 5d99cbaa988cd..052e290120d76 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://eaglemode.sourceforge.net; + homepage = "http://eaglemode.sourceforge.net"; description = "Zoomable User Interface"; license = licenses.gpl3; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index f8405f446ad18..1616c082c0179 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -80,7 +80,7 @@ python3Packages.buildPythonApplication rec { and the ability to perform transactions without downloading a copy of the blockchain. ''; - homepage = https://www.electroncash.org/; + homepage = "https://www.electroncash.org/"; platforms = platforms.linux; maintainers = with maintainers; [ lassulus nyanloutre ]; license = licenses.mit; diff --git a/pkgs/applications/misc/electrum/dash.nix b/pkgs/applications/misc/electrum/dash.nix index fc5192bb5e47b..33a8284744e50 100644 --- a/pkgs/applications/misc/electrum/dash.nix +++ b/pkgs/applications/misc/electrum/dash.nix @@ -39,7 +39,7 @@ python2Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Electrum DASH"; - homepage = https://github.com/dashpay/electrum-dash; + homepage = "https://github.com/dashpay/electrum-dash"; license = licenses.gpl3; maintainers = with maintainers; [ np ]; knownVulnerabilities = [ "CVE-2018-1000022" ]; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 924d4dc9e0b52..d1011548b2a69 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -143,7 +143,7 @@ python3Packages.buildPythonApplication { and the ability to perform transactions without downloading a copy of the blockchain. ''; - homepage = https://electrum.org/; + homepage = "https://electrum.org/"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ ehmry joachifm np ]; diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 88f44c6cc8531..b7c655caaaf42 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { about losing your litecoins to theft or hardware failure. No waiting, no lengthy blockchain downloads and no syncing to the network. ''; - homepage = https://electrum-ltc.org/; + homepage = "https://electrum-ltc.org/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/misc/elogind/default.nix b/pkgs/applications/misc/elogind/default.nix index 84982b6b0197b..78dc54497dd92 100644 --- a/pkgs/applications/misc/elogind/default.nix +++ b/pkgs/applications/misc/elogind/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = https://github.com/elogind/elogind; + homepage = "https://github.com/elogind/elogind"; description = ''The systemd project's "logind", extracted to a standalone package''; platforms = platforms.linux; # probably more license = licenses.lgpl21Plus; diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index 62358d41cc53a..e0fcc221100e1 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -29,7 +29,7 @@ EOF ''; meta = with stdenv.lib; { - homepage = https://github.com/ebzzry/emem; + homepage = "https://github.com/ebzzry/emem"; description = "A trivial Markdown to HTML converter"; license = licenses.epl10; maintainers = [ maintainers.ebzzry ]; diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index de922bb39900f..7cbae2271aea9 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://packages.debian.org/wheezy/epdfview; + homepage = "https://packages.debian.org/wheezy/epdfview"; description = "A lightweight PDF document viewer using Poppler and GTK"; longDescription = '' ePDFView is a free lightweight PDF document viewer using Poppler and diff --git a/pkgs/applications/misc/eterm/default.nix b/pkgs/applications/misc/eterm/default.nix index 56cac7ca9185c..b51acd9fa7284 100644 --- a/pkgs/applications/misc/eterm/default.nix +++ b/pkgs/applications/misc/eterm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Terminal emulator"; - homepage = http://www.eterm.org; + homepage = "http://www.eterm.org"; license = licenses.bsd2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index 27ce4708ac3b7..69e2d3d559816 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "etesync-dav"; - version = "0.15.0"; + version = "0.16.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1rjp4lhxs6g5yw99rrdg5v98vcvagsabkqf51k1fhhsmbj47mdsm"; + sha256 = "1r0d52rlhg7dz6hziplzy7ypsfx9lgbs76j3ylinh2csplwkzv69"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/eureka-editor/default.nix b/pkgs/applications/misc/eureka-editor/default.nix index e9d1317390ed9..d72aeb629c381 100644 --- a/pkgs/applications/misc/eureka-editor/default.nix +++ b/pkgs/applications/misc/eureka-editor/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://eureka-editor.sourceforge.net; + homepage = "http://eureka-editor.sourceforge.net"; description = "A map editor for the classic DOOM games, and a few related games such as Heretic and Hexen"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix index 984ade077a8a9..7a5284a527a67 100644 --- a/pkgs/applications/misc/evilvte/default.nix +++ b/pkgs/applications/misc/evilvte/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { version = "0.5.2-20140827"; src = fetchgit { - url = https://github.com/caleb-/evilvte.git; + url = "https://github.com/caleb-/evilvte.git"; rev = "8dfa41e26bc640dd8d8c7317ff7d04e3c01ded8a"; sha256 = "70f1d4234d077121e2223a735d749d1b53f0b84393507b635b8a37c3716e94d3"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "VTE based, highly customizable terminal emulator"; - homepage = http://www.calno.com/evilvte; + homepage = "http://www.calno.com/evilvte"; license = licenses.gpl2; maintainers = [ maintainers.bodil ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index a071761599a31..d983458a7ce15 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "17gvz9a0sn4p36hf4l77bxhhfipf4x998iay31layqwbnzmb4xy7"; }; - modSha256 = "0pg0hxrr6jjd03wbjn5y65x02md3h352mnm1gr6vyiv7hn4ws14m"; + vendorSha256 = "0b2m9xkac60k5rbxmb03cxf530m23av14pnsjk8067l998sm4vqi"; subPackages = [ "./exercism" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = [ maintainers.rbasso ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/misc/extract_url/default.nix b/pkgs/applications/misc/extract_url/default.nix index f96d3f0f57c7b..9daaf7268c39c 100644 --- a/pkgs/applications/misc/extract_url/default.nix +++ b/pkgs/applications/misc/extract_url/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://www.memoryhole.net/~kyle/extract_url/; + homepage = "https://www.memoryhole.net/~kyle/extract_url/"; description = "Extracts URLs from MIME messages or plain text"; license = licenses.bsd2; maintainers = [ maintainers.qyliss ]; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 7c6573630a159..de2ed0d15964b 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -74,13 +74,13 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/far2l --argv0 $out/bin/far2l ''; - stripDebugList = "bin share"; + stripDebugList = [ "bin" "share" ]; enableParallelBuilding = true; meta = with stdenv.lib; { description = "An orthodox file manager"; - homepage = https://github.com/elfmz/far2l; + homepage = "https://github.com/elfmz/far2l"; license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch b/pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch new file mode 100644 index 0000000000000..b52aeafb5f367 --- /dev/null +++ b/pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch @@ -0,0 +1,69 @@ +From 76c25147328d71960c70bbdd5a9396aac4a362a2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com> +Date: Wed, 20 May 2020 14:19:07 -0300 +Subject: [PATCH] Fix paths + +--- + fbmenugen | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/fbmenugen b/fbmenugen +index 46a18dc..0c8eb08 100755 +--- a/fbmenugen ++++ b/fbmenugen +@@ -214,9 +214,7 @@ my %CONFIG = ( + + #<<< + desktop_files_paths => [ +- '/usr/share/applications', +- '/usr/local/share/applications', +- '/usr/share/applications/kde4', ++ '/run/current-system/sw/share/applications', + "$home_dir/.local/share/applications", + ], + #>>> +@@ -232,7 +230,7 @@ my %CONFIG = ( + force_icon_size => 0, + generic_fallback => 0, + locale_support => 1, +- use_gtk3 => 0, ++ use_gtk3 => 1, + + VERSION => $version, + ); +@@ -252,7 +250,7 @@ if (not -e $config_file) { + } + + if (not -e $schema_file) { +- if (-e (my $etc_schema_file = "/etc/xdg/$pkgname/schema.pl")) { ++ if (-e (my $etc_schema_file = "@fbmenugen@/etc/xdg/$pkgname/schema.pl")) { + require File::Copy; + File::Copy::copy($etc_schema_file, $schema_file) + or warn "$0: can't copy file `$etc_schema_file' to `$schema_file': $!\n"; +@@ -570,7 +568,7 @@ EXIT + $generated_menu .= begin_category(@{$schema->{fluxbox}}) . <<"FOOTER"; + [config] (Configure) + [submenu] (System Styles) {Choose a style...} +- [stylesdir] (/usr/share/fluxbox/styles) ++ [stylesdir] (@fluxbox@/share/fluxbox/styles) + [end] + [submenu] (User Styles) {Choose a style...} + [stylesdir] (~/.fluxbox/styles) +@@ -580,12 +578,12 @@ EXIT + [exec] (Screenshot - JPG) {import screenshot.jpg && display -resize 50% screenshot.jpg} + [exec] (Screenshot - PNG) {import screenshot.png && display -resize 50% screenshot.png} + [exec] (Run) {fbrun} +- [exec] (Regen Menu) {fluxbox-generate_menu} ++ [exec] (Regen Menu) {@fluxbox@/bin/fluxbox-generate_menu} + [end] + [commanddialog] (Fluxbox Command) + [reconfig] (Reload config) + [restart] (Restart) +- [exec] (About) {(fluxbox -v; fluxbox -info | sed 1d) | xmessage -file - -center} ++ [exec] (About) {(@fluxbox@/bin/fluxbox -v; @fluxbox@/bin/fluxbox -info | @gnused@/bin/sed 1d) | @xmessage@/bin/xmessage -file - -center} + [separator] + [exit] (Exit) + [end] +-- +2.26.2 + diff --git a/pkgs/applications/misc/fbmenugen/default.nix b/pkgs/applications/misc/fbmenugen/default.nix new file mode 100644 index 0000000000000..fcf8191d3b707 --- /dev/null +++ b/pkgs/applications/misc/fbmenugen/default.nix @@ -0,0 +1,75 @@ +{ stdenv +, fetchFromGitHub +, fluxbox +, gnused +, makeWrapper +, perlPackages +, substituteAll +, xorg +, wrapGAppsHook +}: + +perlPackages.buildPerlPackage rec { + pname = "fbmenugen"; + version = "2020-05-20"; + + src = fetchFromGitHub { + owner = "trizen"; + repo = pname; + rev = "ed9a680546edbb5b05086971b6a9f42a37cb485f"; + sha256 = "1fikdl08a0s8d6k1ls1pzmw2rcwkfbbczsjfx6lr12ngd2bz222h"; + }; + + patches = [ + (substituteAll { + src = ./0001-Fix-paths.patch; + xmessage = xorg.xmessage; + inherit fluxbox gnused; + }) + ]; + + outputs = [ "out" ]; + + nativeBuildInputs = [ + makeWrapper + wrapGAppsHook + ]; + + buildInputs = [ + fluxbox + gnused + perlPackages.DataDump + perlPackages.FileDesktopEntry + perlPackages.Gtk3 + perlPackages.LinuxDesktopFiles + perlPackages.perl + xorg.xmessage + ]; + + dontConfigure = true; + + dontBuild = true; + + postPatch = '' + substituteInPlace fbmenugen --subst-var-by fbmenugen $out + ''; + + installPhase = '' + runHook preInstall + install -D -t $out/bin ${pname} + install -D -t $out/etc/xdg/${pname} schema.pl + runHook postInstall + ''; + + postFixup = '' + wrapProgram "$out/bin/${pname}" --prefix PERL5LIB : "$PERL5LIB" + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/trizen/fbmenugen"; + description = "Simple menu generator for the Fluxbox Window Manager"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index 857ef9ac27bb6..187988077435c 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An e-book reader for Linux"; - homepage = http://www.fbreader.org/; + homepage = "http://www.fbreader.org/"; license = licenses.gpl3; broken = stdenv.isDarwin # untested, might work || uiType == "gtk"; # builds, but the result is unusable, hangs a lot diff --git a/pkgs/applications/misc/fehlstart/default.nix b/pkgs/applications/misc/fehlstart/default.nix index db78f2ec92043..cae637c2c4a48 100644 --- a/pkgs/applications/misc/fehlstart/default.nix +++ b/pkgs/applications/misc/fehlstart/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Small desktop application launcher with reasonable memory footprint"; - homepage = https://gitlab.com/fehlstart/fehlstart; + homepage = "https://gitlab.com/fehlstart/fehlstart"; license = licenses.gpl3; maintainers = [ maintainers.mounium ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 9e37900902726..c1104eb0a570e 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl }: let - version = "6.4.3"; + version = "6.4.5"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "1r6k14m40ni9114i3j1lr6zwpxky6k89mycgxxg0cpdap4a0wdmh"; + sha256 = "073bjh8qbvww7f5gbd6pq640qspi7dc6cjndvm0h2jcl0a90c3yk"; }; buildInputs = [ openssl ]; diff --git a/pkgs/applications/misc/fff/default.nix b/pkgs/applications/misc/fff/default.nix index e87c86f1b4b31..1397f0a057da5 100644 --- a/pkgs/applications/misc/fff/default.nix +++ b/pkgs/applications/misc/fff/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fucking Fast File-Manager"; - homepage = https://github.com/dylanaraps/fff; + homepage = "https://github.com/dylanaraps/fff"; license = licenses.mit; maintainers = [ maintainers.tadeokondrak ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/filet/default.nix b/pkgs/applications/misc/filet/default.nix index edee9ab33e9e1..ee4b05fa689f2 100644 --- a/pkgs/applications/misc/filet/default.nix +++ b/pkgs/applications/misc/filet/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A fucking fucking fast file fucker (afffff)"; - homepage = https://github.com/buffet/filet; + homepage = "https://github.com/buffet/filet"; license = licenses.mpl20; platforms = platforms.all; maintainers = with maintainers; [ buffet ]; diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/applications/misc/firestarter/default.nix index 82bcf5a4aa07b..05c535e62c0e3 100644 --- a/pkgs/applications/misc/firestarter/default.nix +++ b/pkgs/applications/misc/firestarter/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://tu-dresden.de/zih/forschung/projekte/firestarter; + homepage = "https://tu-dresden.de/zih/forschung/projekte/firestarter"; description = "Processor Stress Test Utility"; platforms = platforms.linux; maintainers = with maintainers; [ astro ]; diff --git a/pkgs/applications/misc/fitnesstrax/default.nix b/pkgs/applications/misc/fitnesstrax/default.nix new file mode 100644 index 0000000000000..f0081c39102e2 --- /dev/null +++ b/pkgs/applications/misc/fitnesstrax/default.nix @@ -0,0 +1,43 @@ +{ fetchFromGitHub +, glib +, gtk3 +, lib +, rustPlatform +, wrapGAppsHook +}: + +rustPlatform.buildRustPackage rec { + pname = "fitnesstrax"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "luminescent-dreams"; + repo = "fitnesstrax"; + rev = "${pname}-${version}"; + sha256 = "1k6zhnbs0ggx7q0ig2abcnzprsgrychlpvsh6d36dw6mr8zpfkp7"; + }; + + nativeBuildInputs = [ + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + ]; + + cargoSha256 = "1xgyyxd2kz21xan0pk7rbxiym90s7m2qrzg2ddilcszva60bxdd9"; + + postInstall = '' + mkdir -p $out/share/glib-2.0/schemas + cp -r $src/share/* $out/share/ + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + meta = with lib; { + description = "Privacy-first fitness tracking"; + homepage = "https://github.com/luminescent-dreams/fitnesstrax"; + license = licenses.bsd3; + maintainers = with maintainers; [ savannidgerinel ]; + }; +} diff --git a/pkgs/applications/misc/flamerobin/default.nix b/pkgs/applications/misc/flamerobin/default.nix index 06cf3c06ffa6e..2e389c753e2ed 100644 --- a/pkgs/applications/misc/flamerobin/default.nix +++ b/pkgs/applications/misc/flamerobin/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Database administration tool for Firebird RDBMS"; - homepage = https://github.com/mariuz/flamerobin; + homepage = "https://github.com/mariuz/flamerobin"; license = licenses.bsdOriginal; maintainers = with maintainers; [ uralbash ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index 2ca059820ef0f..cf93729eddd33 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec{ Its user-friendly interface will help you to edit, delete, move (Drag and Drop) a row, a submenu, etc very easily. ''; - homepage = https://github.com/rdehouss/fme/; + homepage = "https://github.com/rdehouss/fme/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index afa0a06d33fc5..008e59eebee6f 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://fontmanager.github.io/; + homepage = "https://fontmanager.github.io/"; description = "Simple font management for GTK desktop environments"; longDescription = '' Font Manager is intended to provide a way for average users to diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix index b777c3b72e72a..b0224c052c4e1 100644 --- a/pkgs/applications/misc/formatter/default.nix +++ b/pkgs/applications/misc/formatter/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple formatter designed for elementary OS"; homepage = "https://github.com/Djaler/Formatter"; - maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.lgpl2Plus; }; diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix index aee3937689b3a..5774320220a16 100644 --- a/pkgs/applications/misc/freemind/default.nix +++ b/pkgs/applications/misc/freemind/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mind-mapping software"; - homepage = http://freemind.sourceforge.net/wiki/index.php/Main_Page; + homepage = "http://freemind.sourceforge.net/wiki/index.php/Main_Page"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/fsv/default.nix b/pkgs/applications/misc/fsv/default.nix index bbc78efe5cd20..8b6898958d3cf 100644 --- a/pkgs/applications/misc/fsv/default.nix +++ b/pkgs/applications/misc/fsv/default.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { hard drive, or any arbitrarily large collection of files, limited only by the host computer's memory and graphics hardware. ''; - homepage = https://github.com/mcuelenaere/fsv; + homepage = "https://github.com/mcuelenaere/fsv"; license = licenses.lgpl2; platforms = platforms.linux; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix index 67d4bd65a9f9f..2884fca623983 100644 --- a/pkgs/applications/misc/gImageReader/default.nix +++ b/pkgs/applications/misc/gImageReader/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple Gtk/Qt front-end to tesseract-ocr"; - homepage = https://github.com/manisandro/gImageReader; + homepage = "https://github.com/manisandro/gImageReader"; license = licenses.gpl3Plus; maintainers = with maintainers; [teto]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix index ecf8ae9da8d4b..1964ba6aaf73a 100644 --- a/pkgs/applications/misc/galculator/default.nix +++ b/pkgs/applications/misc/galculator/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { - Binary arithmetic of configurable bit length and signedness - Quad-precision floating point arithmetic, and 112-bit binary arithmetic ''; - homepage = http://galculator.sourceforge.net/; + homepage = "http://galculator.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 791db13e42398..6845cbcb59db0 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.13.3"; + version = "1.13.6"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0nhbhli45i2xhkmyj9mpg8fn1l58y2zmr6nnnnms557wpdpg112x"; + sha256 = "17hgryj8qsxcx3c96ir25q0wsh5q0s6c6fb33lqfdbrfxrjcixbk"; }; doCheck = false; diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index fb6902634da8b..ff3408eb8dd29 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://wammu.eu/gammu/; + homepage = "https://wammu.eu/gammu/"; description = "Command line utility and library to control mobile phones"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index 96d3d34046e1b..2e8478f41d3d1 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Project scheduling and management"; - homepage = https://www.ganttproject.biz/; - downloadPage = https://www.ganttproject.biz/download; + homepage = "https://www.ganttproject.biz/"; + downloadPage = "https://www.ganttproject.biz/download"; # GanttProject itself is GPL3+. All bundled libraries are declared # ‘GPL3-compatible’. See ${downloadPage} for detailed information. license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/pkgs/applications/misc/garmin-plugin/default.nix index b97b079ab663d..95cbdd9c19b55 100644 --- a/pkgs/applications/misc/garmin-plugin/default.nix +++ b/pkgs/applications/misc/garmin-plugin/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, garmintools, libgcrypt, libusb, pkgconfig, tinyxml, zlib }: +{ stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkgconfig, tinyxml, zlib }: stdenv.mkDerivation { name = "garmin-plugin-0.3.26"; src = fetchurl { - url = https://github.com/adiesner/GarminPlugin/archive/V0.3.26.tar.gz; + url = "https://github.com/adiesner/GarminPlugin/archive/V0.3.26.tar.gz"; sha256 = "15gads1fj4sj970m5960dgnhys41ksi4cm53ldkf67wn8dc9i4k0"; }; sourceRoot = "GarminPlugin-0.3.26/src"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ garmintools libusb libgcrypt tinyxml zlib ]; + buildInputs = [ garmintools libusb-compat-0_1 libgcrypt tinyxml zlib ]; configureFlags = [ "--with-libgcrypt-prefix=${libgcrypt.dev}" "--with-garmintools-incdir=${garmintools}/include" @@ -18,7 +18,7 @@ stdenv.mkDerivation { cp npGarminPlugin.so $out/lib/mozilla/plugins ''; meta = { - homepage = http://www.andreas-diesner.de/garminplugin; + homepage = "http://www.andreas-diesner.de/garminplugin"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.ocharles ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix index 713000d3f69af..24906b11dd597 100644 --- a/pkgs/applications/misc/gcal/default.nix +++ b/pkgs/applications/misc/gcal/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { hybrid and proleptic Julian and Gregorian calendar sheets. It also displays holiday lists for many countries around the globe. ''; - homepage = https://www.gnu.org/software/gcal/; + homepage = "https://www.gnu.org/software/gcal/"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 8381f182e5d33..d7d6ad5302d3a 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -5,13 +5,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "gcalcli"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "insanum"; repo = pname; rev = "v${version}"; - sha256 = "0746vmhfclkpkqnyaidxid2z20mlv86hv0pjxy1qglrja91vkd72"; + sha256 = "1xwrgmy2azvr99b7df92m2imj0wy4fh53bn7lvcrnghjbnh7n0l0"; }; postPatch = lib.optionalString stdenv.isLinux '' @@ -30,7 +30,7 @@ buildPythonApplication rec { meta = with lib; { description = "CLI for Google Calendar"; - homepage = https://github.com/insanum/gcalcli; + homepage = "https://github.com/insanum/gcalcli"; license = licenses.mit; maintainers = with maintainers; [ nocoolnametom ]; inherit version; diff --git a/pkgs/applications/misc/genxword/default.nix b/pkgs/applications/misc/genxword/default.nix new file mode 100644 index 0000000000000..215542003adf2 --- /dev/null +++ b/pkgs/applications/misc/genxword/default.nix @@ -0,0 +1,54 @@ +{ lib +, python3 +, fetchFromGitHub +, gettext +, gobject-introspection +, wrapGAppsHook +, pango +, gtksourceview3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "genxword"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "riverrun"; + repo = pname; + rev = "v${version}"; + sha256 = "00czdvyb5wnrk3x0g529afisl8v4frfys9ih0nzf1fs4jkzjcijg"; + }; + + nativeBuildInputs = [ + gettext + gobject-introspection + wrapGAppsHook + ]; + + buildInputs = [ + gobject-introspection + pango + gtksourceview3 + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pycairo + pygobject3 + ]; + + # to prevent double wrapping + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + # there are no tests + doCheck = false; + + meta = with lib; { + inherit (src.meta) homepage; + description = "Crossword generator"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index b7b90448e4bc1..2b0fc88ccf9ad 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "geoipupdate"; - version = "4.2.2"; + version = "4.3.0"; src = fetchFromGitHub { owner = "maxmind"; repo = "geoipupdate"; rev = "v${version}"; - sha256 = "057f9kp8g3wixjh9dm58g0qvzfcmhwbk1d573ldly4g5404r9bvf"; + sha256 = "08h14bf4z2gx9sy34jpi2pvxv3i8g9ypl222hzdjsp2ixhl0jia9"; }; - modSha256 = "1bypanvrkcqp8rk84cv2569671irgaf3cy27lcrknyina4pdvir5"; + vendorSha256 = "0q4byhvs1c1xm4qjvs2vyf98vdv121qn0z51arcf7k4ayrys5xcx"; meta = with stdenv.lib; { description = "Automatic GeoIP database updater"; @@ -20,4 +20,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ das_j ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 5db328072e436..9c05e98472027 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -33,7 +33,7 @@ perlPackages.buildPerlPackage rec { meta = { description = "Downloads TV and radio from BBC iPlayer"; license = licenses.gpl3Plus; - homepage = https://squarepenguin.co.uk/; + homepage = "https://squarepenguin.co.uk/"; platforms = platforms.all; maintainers = with maintainers; [ rika ]; }; diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix index aa901a7ba513a..8ac0b000c46d1 100644 --- a/pkgs/applications/misc/getxbook/default.nix +++ b/pkgs/applications/misc/getxbook/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A collection of tools to download books from Google Books"; - homepage = https://njw.me.uk/getxbook/; + homepage = "https://njw.me.uk/getxbook/"; license = licenses.isc; maintainers = with maintainers; [ obadz ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index f44cdd0bad725..bc7c66ee5310d 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { manager, Gtk, or any other theme. ''; - homepage = http://gkrellm.srcbox.net; + homepage = "http://gkrellm.srcbox.net"; license = licenses.gpl3Plus; maintainers = [ ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index 4a806cbb183d6..bfa5044776168 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { programs that need to ask a user's password to run another program as another user. ''; - homepage = https://www.nongnu.org/gksu/; + homepage = "https://www.nongnu.org/gksu/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.romildo ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix index 519df42c789af..88991bb40a192 100644 --- a/pkgs/applications/misc/glava/default.nix +++ b/pkgs/applications/misc/glava/default.nix @@ -82,7 +82,7 @@ in description = '' OpenGL audio spectrum visualizer ''; - homepage = https://github.com/wacossusca34/glava; + homepage = "https://github.com/wacossusca34/glava"; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix index b8f13d01424cd..d576d2b5b4760 100644 --- a/pkgs/applications/misc/glom/default.nix +++ b/pkgs/applications/misc/glom/default.nix @@ -28,7 +28,6 @@ , isocodes , gtksourceviewmm4 , postgresql -, gnome3 , gobject-introspection , yelp-tools , wrapGAppsHook @@ -125,9 +124,9 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An easy-to-use database designer and user interface"; - homepage = http://www.glom.org/; + homepage = "http://www.glom.org/"; license = [ licenses.lgpl2 licenses.gpl2 ]; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix index 50dda9510b918..eaee8fb5fb370 100644 --- a/pkgs/applications/misc/gmrun/default.nix +++ b/pkgs/applications/misc/gmrun/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { Also, supports CTRL-R / CTRL-S / "!" for searching through history. Running commands in a terminal with CTRL-Enter. URL handlers. ''; - homepage = https://sourceforge.net/projects/gmrun/; + homepage = "https://sourceforge.net/projects/gmrun/"; license = "GPL"; maintainers = []; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index db2193dbd3d7c..5ed69e7bc69ee 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "A simple MP3 and Media player client for UNIX and UNIX like systems."; - homepage = https://gmtp.sourceforge.io; + homepage = "https://gmtp.sourceforge.io"; platforms = stdenv.lib.platforms.linux; maintainers = [ ]; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/applications/misc/gnome-firmware-updater/default.nix b/pkgs/applications/misc/gnome-firmware-updater/default.nix index f05c5fd210c4f..f007f0ae52e16 100644 --- a/pkgs/applications/misc/gnome-firmware-updater/default.nix +++ b/pkgs/applications/misc/gnome-firmware-updater/default.nix @@ -6,7 +6,6 @@ , fwupd , gettext , glib -, gnome3 , gtk3 , libsoup , libxmlb @@ -70,7 +69,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater"; description = "Tool for installing firmware on devices"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/applications/misc/gnome-multi-writer/default.nix index 11bfbaaacd078..06bc0024995d8 100644 --- a/pkgs/applications/misc/gnome-multi-writer/default.nix +++ b/pkgs/applications/misc/gnome-multi-writer/default.nix @@ -54,9 +54,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for writing an ISO file to multiple USB devices at once"; - homepage = https://wiki.gnome.org/Apps/MultiWriter; + homepage = "https://wiki.gnome.org/Apps/MultiWriter"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index 01f5af339ff08..cb9d10377cb8d 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -71,8 +71,8 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Recipe management application for GNOME"; - homepage = https://wiki.gnome.org/Apps/Recipes; - maintainers = gnome3.maintainers; + homepage = "https://wiki.gnome.org/Apps/Recipes"; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.unix; }; diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index 7484998ab2053..17aa7e9aa060d 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { description = "A nice way to view information about use of system resources, like memory and disk space"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 3dffc5c77c2ad..761d05e5f9f81 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, mkDerivation , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools -, qtconnectivity, qtcharts, libusb +, qtconnectivity, qtcharts, libusb-compat-0_1 , yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper }: @@ -27,7 +27,7 @@ in mkDerivation rec { buildInputs = [ qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib - qtconnectivity qtcharts libusb + qtconnectivity qtcharts libusb-compat-0_1 ]; nativeBuildInputs = [ flex makeWrapper qmake yacc ]; @@ -39,9 +39,9 @@ in mkDerivation rec { cp src/gcconfig.pri.in src/gcconfig.pri cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri - echo 'LIBUSB_INSTALL = ${libusb}' >> src/gcconfig.pri - echo 'LIBUSB_INCLUDE = ${libusb.dev}/include' >> src/gcconfig.pri - echo 'LIBUSB_LIBS = -L${libusb}/lib -lusb' >> src/gcconfig.pri + echo 'LIBUSB_INSTALL = ${libusb-compat-0_1}' >> src/gcconfig.pri + echo 'LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include' >> src/gcconfig.pri + echo 'LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb' >> src/gcconfig.pri sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local # Use qtwebengine instead of qtwebkit diff --git a/pkgs/applications/misc/gomatrix/default.nix b/pkgs/applications/misc/gomatrix/default.nix index 5d412469617fc..0cf6c9660932a 100644 --- a/pkgs/applications/misc/gomatrix/default.nix +++ b/pkgs/applications/misc/gomatrix/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1wq55rvpyz0gjn8kiwwj49awsmi86zy1fdjcphzgb7883xalgr2m"; }; - modSha256 = "13higizadnf4ypk8qn1b5s6mdg7n6l3indb43mjp1b4cfzjsyl91"; + vendorSha256 = "1yw0gph4zfg8w4343882l6b9lggwyak2zz8ic1l1m2m44p3aq169"; meta = with lib; { description = ''Displays "The Matrix" in a terminal''; @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = with maintainers; [ skykanin ]; homepage = "https://github.com/GeertJohan/gomatrix"; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 181273752ea87..dff69130c18ac 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A world sphere viewer"; - homepage = http://earth.google.com; + homepage = "http://earth.google.com"; license = licenses.unfree; maintainers = with maintainers; [ markus1189 ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix index 3e4c9828edec2..fba36f5e8ac79 100644 --- a/pkgs/applications/misc/googler/default.nix +++ b/pkgs/applications/misc/googler/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "googler"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "13jj15ph0vmbyxjslzl6z4h5b7wyllvhwgsrb6zf7qlkcmkd4vwy"; + sha256 = "04d7n2l159s7c9xzvyvbnbii1k3zdbajagpx09x1l692cwjbvpxw"; }; propagatedBuildInputs = [ python ]; diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index 41cdf267f5de4..350cb56695f93 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { # so we explicitly disable them to avoid breaking the hash # especially as the externals appear to be unused src = fetchsvn { - url = http://svn.openstreetmap.org/applications/rendering/gosmore; + url = "http://svn.openstreetmap.org/applications/rendering/gosmore"; sha256 = "0qsckpqx7i7f8gkqhkzdamr65250afk1rpnh3nbman35kdv3dsxi"; rev = version; ignoreExternals = true; @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open Street Map viewer"; - homepage = https://sourceforge.net/projects/gosmore/; + homepage = "https://sourceforge.net/projects/gosmore/"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix index a488901441271..cd7b724a1d78f 100644 --- a/pkgs/applications/misc/gpa/default.nix +++ b/pkgs/applications/misc/gpa/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical user interface for the GnuPG"; - homepage = https://www.gnupg.org/related_software/gpa/; + homepage = "https://www.gnupg.org/related_software/gpa/"; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/pkgs/applications/misc/gpg-mdp/default.nix index 9954ff660adcd..cf3d6fe9e93e9 100644 --- a/pkgs/applications/misc/gpg-mdp/default.nix +++ b/pkgs/applications/misc/gpg-mdp/default.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation { pname = "gpg-mdp"; inherit version; meta = { - homepage = https://tamentis.com/projects/mdp/; + homepage = "https://tamentis.com/projects/mdp/"; license = [stdenv.lib.licenses.isc]; description = "Manage your passwords with GnuPG and a text editor"; }; diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index d06970e8d07cb..1235a41ffc7bf 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { digital cameras. Through libgphoto2, it supports PTP, MTP, and much more.. ''; - homepage = http://www.gphoto.org/; + homepage = "http://www.gphoto.org/"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.jcumming ]; diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix index c1c2a44bd7f29..668706ca38959 100644 --- a/pkgs/applications/misc/gphoto2/gphotofs.nix +++ b/pkgs/applications/misc/gphoto2/gphotofs.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fuse FS to mount a digital camera"; - homepage = http://www.gphoto.org/; + homepage = "http://www.gphoto.org/"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = with licenses; [ lgpl2 gpl2 ]; diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 9d244ca18f323..ef4c732ef5217 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://sources.debian.net/data/main/g/gpsbabel/1.5.3-2/debian/patches/use_minizip; + url = "https://sources.debian.net/data/main/g/gpsbabel/1.5.3-2/debian/patches/use_minizip"; sha256 = "03fpsmlx1wc48d1j405zkzp8j64hcp0z72islf4mk1immql3ibcr"; }) ]; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { process data that may (or may not be) placed on a map, such as waypoints, tracks, and routes. ''; - homepage = http://www.gpsbabel.org/; + homepage = "http://www.gpsbabel.org/"; license = licenses.gpl2Plus; maintainers = [ maintainers.rycee ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/gpsbabel/gui.nix b/pkgs/applications/misc/gpsbabel/gui.nix new file mode 100644 index 0000000000000..57eca9f47a58f --- /dev/null +++ b/pkgs/applications/misc/gpsbabel/gui.nix @@ -0,0 +1,49 @@ +{ stdenv, mkDerivation, qmake, qttools, qtwebkit, qttranslations, gpsbabel }: + +mkDerivation { + pname = "gpsbabel-gui"; + + inherit (gpsbabel) src version; + + sourceRoot = "source/gui"; + + nativeBuildInputs = [ qmake qttools ]; + buildInputs = [ qtwebkit ]; + + postPatch = '' + substituteInPlace mainwindow.cc \ + --replace "QApplication::applicationDirPath() + \"/" "\"" \ + --replace "QApplication::applicationDirPath() + '/' + " "" \ + --replace "translator.load(full_filename)" "translator.load(filename)" \ + --replace "gpsbabelfe_%1.qm" "$out/share/gpsbabel/translations/gpsbabelfe_%1.qm" \ + --replace "gpsbabel_%1.qm" "$out/share/gpsbabel/translations/gpsbabel_%1.qm" \ + --replace "qt_%1.qm" "${qttranslations}/translations/qt_%1.qm" + substituteInPlace formatload.cc \ + --replace "QApplication::applicationDirPath() + \"/" "\"" + substituteInPlace gpsbabel.desktop \ + --replace "gpsbabelfe-bin" "gpsbabelfe" + ''; + + preConfigure = '' + lrelease *.ts coretool/*.ts + ''; + + qtWrapperArgs = [ + "--prefix PATH : ${stdenv.lib.makeBinPath [ gpsbabel ]}" + ]; + + postInstall = '' + install -Dm755 objects/gpsbabelfe -t $out/bin + install -Dm644 gpsbabel.desktop -t $out/share/applications + install -Dm644 images/appicon.png $out/share/icons/hicolor/512x512/apps/gpsbabel.png + install -Dm644 *.qm coretool/*.qm -t $out/share/gpsbabel/translations + ''; + + meta = with stdenv.lib; { + description = "Qt-based GUI for gpsbabel"; + homepage = "http://www.gpsbabel.org/"; + license = licenses.gpl2; + maintainers = with maintainers; [ sikmir ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index 04ab062c1a1b1..64296688c93e9 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme libxml2 ]; meta = with stdenv.lib; { - homepage = https://blog.sarine.nl/tag/gpxviewer/; + homepage = "https://blog.sarine.nl/tag/gpxviewer/"; description = "Simple tool to visualize tracks and waypoints stored in a gpx file"; platforms = with platforms; linux; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/gpx/default.nix b/pkgs/applications/misc/gpx/default.nix index a341a212a37f6..dcf022fc44531 100644 --- a/pkgs/applications/misc/gpx/default.nix +++ b/pkgs/applications/misc/gpx/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Gcode to x3g conversion postprocessor"; - homepage = https://github.com/markwal/GPX/; + homepage = "https://github.com/markwal/GPX/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.leo60228 ]; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index eeb76091aa8de..c519bf63e0935 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,19 +2,19 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.27"; + version = "7.29"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "1yillax9npmz912c6qa6yijrqrbm1gaz2h69v2ab9fb127qv4anj"; + sha256 = "sha256-OTKyxEu7RZZy3JBHTM7YoH+G4lhoRfb1INLtQEKC5p4="; }; nativeBuildInputs = [ qmake qttools ]; preConfigure = '' - lrelease lang/*.ts + lrelease gpxsee.pro ''; postInstall = with stdenv; lib.optionalString isDarwin '' diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 84be50ccb5e50..e5a2b87f16ef9 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -58,7 +58,7 @@ in buildPythonApplication rec { meta = with stdenv.lib; { description = "Genealogy software"; - homepage = https://gramps-project.org; + homepage = "https://gramps-project.org"; license = licenses.gpl2; maintainers = with maintainers; [ joncojonathan ]; }; diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix index d86db7adb9d02..4e888f4faac89 100644 --- a/pkgs/applications/misc/green-pdfviewer/default.nix +++ b/pkgs/applications/misc/green-pdfviewer/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/schandinat/green/; + homepage = "https://github.com/schandinat/green/"; description = "Viewer for PDF files, uses SDL and libpoppler"; platforms = platforms.unix; diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index 87e636b9c030f..a4932943fa236 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://tinkerpop.apache.org/; + homepage = "https://tinkerpop.apache.org/"; description = "Console of the Apache TinkerPop graph computing framework"; license = licenses.asl20; maintainers = [ maintainers.lewo ]; diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index b70901bac8105..b1985be2c946e 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -2,11 +2,11 @@ , curl, cdparanoia, libid3tag, ncurses, libtool }: stdenv.mkDerivation rec { - name = "grip-4.1.0"; + name = "grip-4.1.1"; src = fetchurl { url = "mirror://sourceforge/grip/${name}.tar.gz"; - sha256 = "0iy7bcyrxm7zyrxah06qyxdshkgq6yqkadlw211j2qzld38a79j5"; + sha256 = "1sbjgawb7qrinixybwi0adk7mpdfb565gkffp5gxxsw8fqd068fs"; }; nativeBuildInputs = [ pkgconfig ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "GTK-based audio CD player/ripper"; - homepage = http://nostatic.org/grip; + homepage = "http://nostatic.org/grip"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ marcweber peti ]; diff --git a/pkgs/applications/misc/grsync/default.nix b/pkgs/applications/misc/grsync/default.nix index 3e1bb31091f81..8d17ff09204f1 100644 --- a/pkgs/applications/misc/grsync/default.nix +++ b/pkgs/applications/misc/grsync/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, dee, gtk2, intltool, libdbusmenu-gtk2, libunity, pkg-config, rsync }: stdenv.mkDerivation rec { - version = "1.2.6"; + version = "1.2.8"; pname = "grsync"; src = fetchurl { url = "mirror://sourceforge/grsync/grsync-${version}.tar.gz"; - sha256 = "06ani65d58p8r3jvxjwpwyqrr07ya3icdqc243nxcrv7bvmarmb6"; + sha256 = "1c86jch73cy7ig9k4shvcd3jnaxk7jppfcr8nmkz8gbylsn5zsll"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix index b84053b94adc1..e80f43f5bd9ba 100644 --- a/pkgs/applications/misc/gsctl/default.nix +++ b/pkgs/applications/misc/gsctl/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "The Giant Swarm command line interface"; - homepage = https://github.com/giantswarm/gsctl; + homepage = "https://github.com/giantswarm/gsctl"; license = licenses.asl20; maintainers = with maintainers; [ joesalisbury ]; }; diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix index ea78331e47640..e83e349b21c1e 100644 --- a/pkgs/applications/misc/gsimplecal/default.nix +++ b/pkgs/applications/misc/gsimplecal/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = { - homepage = http://dmedvinsky.github.io/gsimplecal/; + homepage = "http://dmedvinsky.github.io/gsimplecal/"; description = "Lightweight calendar application written in C++ using GTK"; longDescription = '' gsimplecal was intentionally made for use with tint2 panel in the diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix index 9b8d6a7f976b5..21ad7d757a19f 100644 --- a/pkgs/applications/misc/gtk2fontsel/default.nix +++ b/pkgs/applications/misc/gtk2fontsel/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { Font selection tool similar to xfontsel implemented using GTK 2. Trivial, but useful nonetheless. ''; - homepage = http://gtk2fontsel.sourceforge.net/; - downloadPage = https://sourceforge.net/projects/gtk2fontsel/; + homepage = "http://gtk2fontsel.sourceforge.net/"; + downloadPage = "https://sourceforge.net/projects/gtk2fontsel/"; license = licenses.gpl2; maintainers = [ maintainers.prikhi ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index f94f8f5dd707b..accf62c0c469d 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { doCheck = true; meta = { - homepage = https://www.gnu.org/software/gv/; + homepage = "https://www.gnu.org/software/gv/"; description = "PostScript/PDF document viewer"; longDescription = '' diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index c44523a8b751e..adabe22c6b64f 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gxneur-0.20.0"; src = fetchurl { - url = https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/gxneur_0.20.0.orig.tar.gz; + url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/gxneur_0.20.0.orig.tar.gz"; sha256 = "0avmhdcj0hpr55fc0iih8fjykmdhn34c8mwdnqvl8jh4nhxxchxr"; }; diff --git a/pkgs/applications/misc/havoc/default.nix b/pkgs/applications/misc/havoc/default.nix new file mode 100644 index 0000000000000..fc4cc680ca4d6 --- /dev/null +++ b/pkgs/applications/misc/havoc/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub +, pkgconfig, libxkbcommon, wayland, wayland-protocols }: + +stdenv.mkDerivation rec { + + pname = "havoc"; + version = "2019-12-08"; + + src = fetchFromGitHub { + owner = "ii8"; + repo = pname; + rev = "507446c92ed7bf8380a58c5ba2b14aba5cdf412c"; + sha256 = "13nfnan1gmy4cqxmqv0rc8a4mcb1g62v73d56hy7z2psv4am7a09"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxkbcommon wayland wayland-protocols ]; + + dontConfigure = true; + + installFlags = [ "PREFIX=$$out" ]; + + postInstall = '' + install -D -m 644 havoc.cfg -t $out/etc/${pname}/ + install -D -m 644 README.md -t $out/share/doc/${pname}-${version}/ + ''; + + meta = with stdenv.lib; { + description = "A minimal terminal emulator for Wayland"; + homepage = "https://github.com/ii8/havoc"; + license = with licenses; [ mit publicDomain ]; + platforms = with platforms; unix; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index 7353078600d1a..98f84ca68b8e3 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -35,7 +35,7 @@ buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/donnemartin/haxor-news; + homepage = "https://github.com/donnemartin/haxor-news"; description = "Browse Hacker News like a haxor"; license = licenses.asl20; maintainers = with maintainers; [ matthiasbeyer ]; diff --git a/pkgs/applications/misc/hdate/default.nix b/pkgs/applications/misc/hdate/default.nix index 989dfb886ec34..c97a67c0bd38f 100644 --- a/pkgs/applications/misc/hdate/default.nix +++ b/pkgs/applications/misc/hdate/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { description = "Hebrew calendar and solar astronomical times library and utilities"; - homepage = https://sourceforge.net/projects/libhdate/; + homepage = "https://sourceforge.net/projects/libhdate/"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ CharlesHD ]; }; diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index 8bae8ce373c78..32c8c696730f7 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { GNU Hello is a program that prints "Hello, world!" when you run it. It is fully customizable. ''; - homepage = https://www.gnu.org/software/hello/manual/; + homepage = "https://www.gnu.org/software/hello/manual/"; changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${version}"; license = licenses.gpl3Plus; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/applications/misc/hivemind/default.nix index b3fb84340f212..8a8f80f57977f 100644 --- a/pkgs/applications/misc/hivemind/default.nix +++ b/pkgs/applications/misc/hivemind/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/DarthSim/; + homepage = "https://github.com/DarthSim/"; description = "Process manager for Procfile-based applications"; license = with licenses; [ mit ]; maintainers = [ maintainers.sveitser ]; diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 279791561d908..51b08af23c5c9 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { ''; meta = { description = "3D animation application software"; - homepage = https://www.sidefx.com; + homepage = "https://www.sidefx.com"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.canndrew ]; diff --git a/pkgs/applications/misc/hovercraft/default.nix b/pkgs/applications/misc/hovercraft/default.nix index ba23078bba934..edb8114e4a416 100644 --- a/pkgs/applications/misc/hovercraft/default.nix +++ b/pkgs/applications/misc/hovercraft/default.nix @@ -28,7 +28,7 @@ buildPythonApplication rec { meta = with lib; { description = "Makes impress.js presentations from reStructuredText"; - homepage = https://github.com/regebro/hovercraft; + homepage = "https://github.com/regebro/hovercraft"; license = licenses.mit; maintainers = with maintainers; [ goibhniu makefu ]; }; diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix index 437c42b03317d..91a66bc737819 100644 --- a/pkgs/applications/misc/hr/default.nix +++ b/pkgs/applications/misc/hr/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/LuRsT/hr; + homepage = "https://github.com/LuRsT/hr"; description = "A horizontal bar for your terminal"; license = licenses.mit; maintainers = [ maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 31ecfccd5848f..b1e740fb76078 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/dvorka/hstr; + homepage = "https://github.com/dvorka/hstr"; description = "Shell history suggest box - easily view, navigate, search and use your command history"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index b2997ece5d566..bbe05e0396bbc 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Time tracking software"; - homepage = https://hubstaff.com/; + homepage = "https://hubstaff.com/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ michalrus srghma ]; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 46abf36961691..ca5eb34b95628 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -1,19 +1,33 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, libsass }: buildGoModule rec { pname = "hugo"; - version = "0.68.3"; + version = "0.71.0"; - goPackagePath = "github.com/gohugoio/hugo"; + buildInputs = [ libsass ]; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "138sv4q6f1szpkrrxnzhvxr6rrznhq1d7in0zba1pifsw3yimqq4"; + sha256 = "1cjf69y8wvjq7kpncvqzmhc03pmf21nfxqpdnh64v34d14gpa1aa"; }; - modSha256 = "04vzm65kbj9905z4cf5yh6yc6g3b0pd5vc00lrxw84pwgqgc0ykb"; + golibsass = fetchFromGitHub { + owner = "bep"; + repo = "golibsass"; + rev = "8a04397f0baba474190a9f58019ff499ec43057a"; + sha256 = "0xk3m2ynbydzx87dz573ihwc4ryq0r545vz937szz175ivgfrhh3"; + }; + + overrideModAttrs = (_: { + postBuild = '' + rm -rf vendor/github.com/bep/golibsass/ + cp -r --reflink=auto ${golibsass} vendor/github.com/bep/golibsass + ''; + }); + + vendorSha256 = "1fz1wvw0jy3rj6pl1w6vpr0xr1v8pnpf76bwdalacqy6r85lxmkl"; buildFlags = [ "-tags" "extended" ]; diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix index f21675e60b2d8..1535b1a2568eb 100644 --- a/pkgs/applications/misc/hyper/default.nix +++ b/pkgs/applications/misc/hyper/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; meta = with lib; { description = "A terminal built on web technologies"; - homepage = https://hyper.is/; + homepage = "https://hyper.is/"; maintainers = with maintainers; [ puffnfresh ]; license = licenses.mit; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index 3ee4fd8259a9e..7b642dffa5038 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "IceSL is a GPU-accelerated procedural modeler and slicer for 3D printing."; - homepage = http://shapeforge.loria.fr/icesl/index.html; + homepage = "http://shapeforge.loria.fr/icesl/index.html"; license = licenses.inria-icesl; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ mgttlinger ]; diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 8b908f1f9cf29..0c2abbd9f588c 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -2,7 +2,7 @@ , gitSupport ? false, git ? null , docutilsSupport ? false, python ? null, docutils ? null , monotoneSupport ? false, monotone ? null -, bazaarSupport ? false, bazaar ? null +, bazaarSupport ? false, breezy ? null , cvsSupport ? false, cvs ? null, cvsps ? null , subversionSupport ? false, subversion ? null , mercurialSupport ? false, mercurial ? null @@ -12,7 +12,7 @@ assert docutilsSupport -> (python != null && docutils != null); assert gitSupport -> (git != null); assert monotoneSupport -> (monotone != null); -assert bazaarSupport -> (bazaar != null); +assert bazaarSupport -> (breezy != null); assert cvsSupport -> (cvs != null && cvsps != null && perlPackages.Filechdir != null); assert subversionSupport -> (subversion != null); assert mercurialSupport -> (mercurial != null); @@ -39,7 +39,7 @@ stdenv.mkDerivation { ++ lib.optionals docutilsSupport [python docutils] ++ lib.optionals gitSupport [git] ++ lib.optionals monotoneSupport [monotone] - ++ lib.optionals bazaarSupport [bazaar] + ++ lib.optionals bazaarSupport [breezy] ++ lib.optionals cvsSupport [cvs cvsps perlPackages.Filechdir] ++ lib.optionals subversionSupport [subversion] ++ lib.optionals mercurialSupport [mercurial]; @@ -64,7 +64,7 @@ stdenv.mkDerivation { wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perlPackages.perl}/bin:$out/bin \ ${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin \''} ${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin \''} - ${lib.optionalString bazaarSupport ''--prefix PATH : ${bazaar}/bin \''} + ${lib.optionalString bazaarSupport ''--prefix PATH : ${breezy}/bin \''} ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin \''} ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin \''} ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin \''} @@ -83,7 +83,7 @@ stdenv.mkDerivation { meta = { description = "Wiki compiler, storing pages and history in a RCS"; - homepage = http://ikiwiki.info/; + homepage = "http://ikiwiki.info/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.peti ]; diff --git a/pkgs/applications/misc/img2pdf/default.nix b/pkgs/applications/misc/img2pdf/default.nix index 972e3b7e7b60a..b9c06d5122ca7 100644 --- a/pkgs/applications/misc/img2pdf/default.nix +++ b/pkgs/applications/misc/img2pdf/default.nix @@ -4,15 +4,13 @@ with python3Packages; buildPythonApplication rec { pname = "img2pdf"; - version = "0.3.4"; + version = "0.3.6"; src = fetchPypi { inherit pname version; - sha256 = "0jgfk191vvxn2r6bbdknvw5v510mx9g0xrgnmcghaxkv65zjnj0b"; + sha256 = "1yx0ljbg7phpix507wq584qvspp2jgax7flpp1148pxpc2d51mcc"; }; - doCheck = false; # needs pdfrw - propagatedBuildInputs = [ pillow ]; diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index 7daa2704e22b6..f561f15ab3ec3 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ipmicfg"; - version = "1.29.0"; - buildVersion = "181029"; + version = "1.30.0"; + buildVersion = "190710"; src = fetchzip { - url = "ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip"; - sha256 = "18nljs4xg6hffahyd0d5zlg1jhbwl7zr9ym925bkzwcnrkgqs2v3"; + url = "https://www.supermicro.com/wftp/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip"; + sha256 = "0srkzivxa4qlf3x9zdkri7xfq7kjj4fsmn978vzmzsvbxkqswd5a"; extraPostFetch = "chmod u+rwX,go-rwx+X $out/"; }; diff --git a/pkgs/applications/misc/iterm2/default.nix b/pkgs/applications/misc/iterm2/default.nix index cabe306defc88..e273eda45c315 100644 --- a/pkgs/applications/misc/iterm2/default.nix +++ b/pkgs/applications/misc/iterm2/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A replacement for Terminal and the successor to iTerm"; - homepage = https://www.iterm2.com/; + homepage = "https://www.iterm2.com/"; license = licenses.gpl2; maintainers = with maintainers; [ tricktron ]; platforms = platforms.darwin; diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index c8951059d4c84..2d7dca36d2046 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.jbidwatcher.com/; + homepage = "http://www.jbidwatcher.com/"; description = "Monitor and snipe Ebay auctions"; license = "LGPL"; diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index b421ea7179539..7bef929bea1f1 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.2.1) + activesupport (6.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - zeitwerk (~> 2.2) + zeitwerk (~> 2.2, >= 2.2.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) @@ -24,7 +24,7 @@ GEM http_parser.rb (0.6.0) i18n (1.8.2) concurrent-ruby (~> 1.0) - jekyll (4.0.0) + jekyll (4.0.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -41,7 +41,7 @@ GEM terminal-table (~> 1.8) jekyll-avatar (0.7.0) jekyll (>= 3.0, < 5.0) - jekyll-mentions (1.5.1) + jekyll-mentions (1.6.0) html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) jekyll-sass-converter (2.1.0) @@ -52,11 +52,12 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.11.1) + jemoji (0.12.0) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) - kramdown (2.1.0) + kramdown (2.2.1) + rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) @@ -65,26 +66,27 @@ GEM rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) mini_portile2 (2.4.0) - minitest (5.14.0) - nokogiri (1.10.8) + minitest (5.14.1) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.3) - rb-fsevent (0.10.3) + public_suffix (4.0.5) + rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - rouge (3.16.0) + rexml (3.2.4) + rouge (3.19.0) safe_yaml (1.0.5) - sassc (2.2.1) + sassc (2.3.0) ffi (~> 1.9) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thread_safe (0.3.6) - tzinfo (1.2.6) + tzinfo (1.2.7) thread_safe (~> 0.1) - unicode-display_width (1.6.1) - zeitwerk (2.2.2) + unicode-display_width (1.7.0) + zeitwerk (2.3.0) PLATFORMS ruby diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index d698d25cb3b98..3faa3dde82c9f 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dd6gh66ffdbhsxv33rxxsiciqyhhkm69l1yqspwdj2brvh1jzl1"; + sha256 = "1l29n9n38c9lpy5smh26r7fy7jp2bpjqlzhxgsr79cv7xpwlrbhs"; type = "gem"; }; - version = "6.0.2.1"; + version = "6.0.3.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -130,10 +130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fpckw5nf4hfr5vhhdlmaxxp5lkdmc1vyqnmijwvy9fmjn4c87aa"; + sha256 = "1gw05bh9iidnx2lxw0h5aiknbly818cmndc4a9nhq28fiafizi82"; type = "gem"; }; - version = "4.0.0"; + version = "4.0.1"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -152,10 +152,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r81nbw598s485jsppbpy9kwa471w1rdkpdn3a1mq0swg87cp67v"; + sha256 = "1n8y67plydfmay3jn865igvgb3h6s2crk8kq7ydk3wmn9h103s1r"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.0"; }; jekyll-sass-converter = { dependencies = ["sassc"]; @@ -207,20 +207,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yd77r5jvh9chf5qcp6z63gg40yp5n1sr7nv1hlmbq3xjzlhs6h6"; + sha256 = "09sxbnrqz5vf6rxmh6lzism31gz2g3hw86ymg37r1ccknclv3cp9"; type = "gem"; }; - version = "0.11.1"; + version = "0.12.0"; }; kramdown = { + dependencies = ["rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688"; + sha256 = "059mk8lmddp2a2aa6s4pp7x2yyqbqg5crx5jkn32dzlnqi2j5cn6"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.1"; }; kramdown-parser-gfm = { dependencies = ["kramdown"]; @@ -279,10 +280,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; + sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; type = "gem"; }; - version = "5.14.0"; + version = "5.14.1"; }; nokogiri = { dependencies = ["mini_portile2"]; @@ -290,10 +291,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8"; + sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; type = "gem"; }; - version = "1.10.8"; + version = "1.10.9"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -311,20 +312,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c6kq6s13idl2036b5lch8r7390f8w82cal8hcp4ml76fm2vdac7"; + sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.5"; }; rb-fsevent = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; + sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87"; type = "gem"; }; - version = "0.10.3"; + version = "0.10.4"; }; rb-inotify = { dependencies = ["ffi"]; @@ -337,15 +338,25 @@ }; version = "0.10.1"; }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + type = "gem"; + }; + version = "3.2.4"; + }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ivsvkwdxl44q4xl8bnf6kqmvy47n98akcvlfmhaz0614zlf4bxi"; + sha256 = "102rc07d78k5bkl0s9nd1gw6wz0w0zcvg4g5sl7z9xxi4r793c35"; type = "gem"; }; - version = "3.16.0"; + version = "3.19.0"; }; safe_yaml = { groups = ["default"]; @@ -363,10 +374,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bnid7r5z5hcin5hykvpvv8xig27wbbckxwis60z2aaxq4j9siz"; + sha256 = "1qzfnvb8khvc6w2sn3k91mndc2w50xxx5c84jkr6xdxlmaq1a3kg"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.0"; }; terminal-table = { dependencies = ["unicode-display_width"]; @@ -395,29 +406,29 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x"; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; type = "gem"; }; - version = "1.6.1"; + version = "1.7.0"; }; zeitwerk = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jywi63w1m2b2w9fj9rjb9n3imf6p5bfijfmml1xzdnsrdrjz0x1"; + sha256 = "1akpm3pwvyiack2zk6giv9yn3cqb8pw6g40p4394pdc3xmy3s4k0"; type = "gem"; }; - version = "2.2.2"; + version = "2.3.0"; }; } \ No newline at end of file diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index 4d4dd248bc537..54857d6142068 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -46,7 +46,8 @@ in bundlerApp { web server. Jekyll is the engine behind GitHub Pages, which you can use to host sites right from your GitHub repositories. ''; - homepage = https://jekyllrb.com/; + homepage = "https://jekyllrb.com/"; + #changelog = "https://raw.githubusercontent.com/jekyll/jekyll/v${version}/History.markdown"; license = licenses.mit; maintainers = with maintainers; [ primeos pesterhazy ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 51a835e4b9f0d..5f956f406fdcf 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.2.1) + activesupport (6.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - zeitwerk (~> 2.2) + zeitwerk (~> 2.2, >= 2.2.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) classifier-reborn (2.2.0) @@ -23,7 +23,7 @@ GEM http_parser.rb (~> 0.6.0) eventmachine (1.2.7) execjs (2.7.0) - faraday (1.0.0) + faraday (1.0.1) multipart-post (>= 1.2, < 3) fast-stemmer (1.0.2) ffi (1.12.2) @@ -35,7 +35,7 @@ GEM http_parser.rb (0.6.0) i18n (1.8.2) concurrent-ruby (~> 1.0) - jekyll (4.0.0) + jekyll (4.0.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -59,7 +59,7 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-gist (1.5.0) octokit (~> 4.2) - jekyll-mentions (1.5.1) + jekyll-mentions (1.6.0) html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) jekyll-paginate (1.1.0) @@ -73,11 +73,12 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.11.1) + jemoji (0.12.0) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) - kramdown (2.1.0) + kramdown (2.2.1) + rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) kramdown-syntax-coderay (1.0.1) @@ -92,25 +93,26 @@ GEM mercenary (0.3.6) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2019.1009) + mime-types-data (3.2020.0512) mini_portile2 (2.4.0) - minitest (5.14.0) + minitest (5.14.1) multipart-post (2.1.1) - nokogiri (1.10.8) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) - octokit (4.16.0) + octokit (4.18.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.3) - rb-fsevent (0.10.3) + public_suffix (4.0.5) + rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) rdoc (6.2.1) - rouge (3.16.0) + rexml (3.2.4) + rouge (3.19.0) safe_yaml (1.0.5) - sassc (2.2.1) + sassc (2.3.0) ffi (~> 1.9) sawyer (0.8.2) addressable (>= 2.3.5) @@ -118,12 +120,12 @@ GEM terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thread_safe (0.3.6) - tomlrb (1.2.9) - tzinfo (1.2.6) + tomlrb (1.3.0) + tzinfo (1.2.7) thread_safe (~> 0.1) - unicode-display_width (1.6.1) + unicode-display_width (1.7.0) yajl-ruby (1.4.1) - zeitwerk (2.2.2) + zeitwerk (2.3.0) PLATFORMS ruby diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index 44d7f1d0fc8c4..04844b4731059 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dd6gh66ffdbhsxv33rxxsiciqyhhkm69l1yqspwdj2brvh1jzl1"; + sha256 = "1l29n9n38c9lpy5smh26r7fy7jp2bpjqlzhxgsr79cv7xpwlrbhs"; type = "gem"; }; - version = "6.0.2.1"; + version = "6.0.3.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -132,10 +132,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11yn7mhi4rl24brs2qfwysas14csjf1zmb835cfklqz5ka032xp6"; + sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; fast-stemmer = { groups = ["default"]; @@ -227,10 +227,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fpckw5nf4hfr5vhhdlmaxxp5lkdmc1vyqnmijwvy9fmjn4c87aa"; + sha256 = "1gw05bh9iidnx2lxw0h5aiknbly818cmndc4a9nhq28fiafizi82"; type = "gem"; }; - version = "4.0.0"; + version = "4.0.1"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -282,10 +282,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r81nbw598s485jsppbpy9kwa471w1rdkpdn3a1mq0swg87cp67v"; + sha256 = "1n8y67plydfmay3jn865igvgb3h6s2crk8kq7ydk3wmn9h103s1r"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.0"; }; jekyll-paginate = { groups = ["default"]; @@ -358,20 +358,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yd77r5jvh9chf5qcp6z63gg40yp5n1sr7nv1hlmbq3xjzlhs6h6"; + sha256 = "09sxbnrqz5vf6rxmh6lzism31gz2g3hw86ymg37r1ccknclv3cp9"; type = "gem"; }; - version = "0.11.1"; + version = "0.12.0"; }; kramdown = { + dependencies = ["rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688"; + sha256 = "059mk8lmddp2a2aa6s4pp7x2yyqbqg5crx5jkn32dzlnqi2j5cn6"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.1"; }; kramdown-parser-gfm = { dependencies = ["kramdown"]; @@ -477,10 +478,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18x61fc36951vw7f74gq8cyybdpxvyg5d0azvqhrs82ddw3v16xh"; + sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; type = "gem"; }; - version = "3.2019.1009"; + version = "3.2020.0512"; }; mini_portile2 = { groups = ["default"]; @@ -497,10 +498,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; + sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; type = "gem"; }; - version = "5.14.0"; + version = "5.14.1"; }; multipart-post = { groups = ["default"]; @@ -518,10 +519,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8"; + sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; type = "gem"; }; - version = "1.10.8"; + version = "1.10.9"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -529,10 +530,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06kx258qa5k24q5pv8i4daaw3g57gif6p5k5h3gndj3q2jk6vhkn"; + sha256 = "0zvfr9njmj5svi39fcsi2b0g7pcxb0vamw9dlyas8bg814jlzhi6"; type = "gem"; }; - version = "4.16.0"; + version = "4.18.0"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -550,20 +551,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c6kq6s13idl2036b5lch8r7390f8w82cal8hcp4ml76fm2vdac7"; + sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.5"; }; rb-fsevent = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; + sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87"; type = "gem"; }; - version = "0.10.3"; + version = "0.10.4"; }; rb-inotify = { dependencies = ["ffi"]; @@ -586,15 +587,25 @@ }; version = "6.2.1"; }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + type = "gem"; + }; + version = "3.2.4"; + }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ivsvkwdxl44q4xl8bnf6kqmvy47n98akcvlfmhaz0614zlf4bxi"; + sha256 = "102rc07d78k5bkl0s9nd1gw6wz0w0zcvg4g5sl7z9xxi4r793c35"; type = "gem"; }; - version = "3.16.0"; + version = "3.19.0"; }; safe_yaml = { groups = ["default"]; @@ -612,10 +623,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bnid7r5z5hcin5hykvpvv8xig27wbbckxwis60z2aaxq4j9siz"; + sha256 = "1qzfnvb8khvc6w2sn3k91mndc2w50xxx5c84jkr6xdxlmaq1a3kg"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.0"; }; sawyer = { dependencies = ["addressable" "faraday"]; @@ -654,10 +665,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0njkyq5csj4km8spmw33b5902v254wvyvqq1b0f0kky5hs7bvrgg"; + sha256 = "00x5y9h4fbvrv4xrjk4cqlkm4vq8gv73ax4alj3ac2x77zsnnrk8"; type = "gem"; }; - version = "1.2.9"; + version = "1.3.0"; }; tzinfo = { dependencies = ["thread_safe"]; @@ -665,20 +676,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x"; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; type = "gem"; }; - version = "1.6.1"; + version = "1.7.0"; }; yajl-ruby = { groups = ["default"]; @@ -707,9 +718,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jywi63w1m2b2w9fj9rjb9n3imf6p5bfijfmml1xzdnsrdrjz0x1"; + sha256 = "1akpm3pwvyiack2zk6giv9yn3cqb8pw6g40p4394pdc3xmy3s4k0"; type = "gem"; }; - version = "2.2.2"; + version = "2.3.0"; }; } \ No newline at end of file diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 47f02e32d77d9..e6a140ec7f96c 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -1,14 +1,27 @@ -{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, pango, librsvg, libxml2, menu-cache, xorg, makeWrapper }: +{ stdenv +, fetchFromGitHub +, pkgconfig +, python3Packages +, pango +, librsvg +, libxml2 +, menu-cache +, xorg +, makeWrapper +, enableXfcePanelApplet ? false +, xfce +, gtk3 +}: stdenv.mkDerivation rec { pname = "jgmenu"; - version = "4.1.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "johanmalm"; repo = pname; rev = "v${version}"; - sha256 = "1wsh37rapb1bszlq36hvwxqvfds39hbvbl152m8as4zlh93wfvvk"; + sha256 = "00q4v31x4q7nm61wda4v0gznv18bm3qs8mp04pcns60qacdv9lkk"; }; nativeBuildInputs = [ @@ -25,9 +38,17 @@ stdenv.mkDerivation rec { xorg.libXinerama xorg.libXrandr python3Packages.python + ] ++ stdenv.lib.optionals enableXfcePanelApplet [ + gtk3 + xfce.libxfce4util + xfce.xfce4-panel ]; - makeFlags = [ "prefix=${placeholder "out"}" ]; + configureFlags = [ + ] + ++ stdenv.lib.optionals enableXfcePanelApplet [ + "--with-xfce4-panel-applet" + ]; postFixup = '' wrapPythonProgramsIn "$out/lib/jgmenu" diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index 3561fcde839d2..134354de40b75 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { # Debian sources src = fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3.orig.tar.gz; + url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3.orig.tar.gz"; sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv"; }; patches = [ (fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-4.diff.gz; + url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-4.diff.gz"; sha256 = "03zsh57fijciiv23lf55k6fbfhhzm866xjhx83x54v5s1g2h6m8y"; }) ./sizewidth.patch @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Download utility that can fetch files from several sources simultaneously"; - homepage = http://atterer.net/jigdo/; + homepage = "http://atterer.net/jigdo/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 4219851fc9d31..3c84588530ccd 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.0.179"; + version = "1.0.201"; desktopItem = makeDesktopItem { name = "Joplin"; exec = "joplin-desktop"; @@ -13,7 +13,7 @@ in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.AppImage"; - sha256 = "0v7d5wzwiznl755pl6jfg33g6jxr1cbm9j13jpbmfi497hj8w82k"; + sha256 = "060dkgamsv59vgslqyjfh1g8wg3nldrvfb9lf0y9sxjlbsv8bc55"; }; @@ -40,9 +40,9 @@ in appimageTools.wrapType2 rec { applications directly or from your own text editor. The notes are in Markdown format. ''; - homepage = https://joplin.cozic.net/; + homepage = "https://joplinapp.org"; license = licenses.mit; - maintainers = with maintainers; [ rafaelgg raquelgb ]; + maintainers = with maintainers; [ hugoreeves rafaelgg raquelgb ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index eec7a066a887a..f68de80b7012f 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,46 +1,50 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11, libXxf86vm }: - -stdenv.mkDerivation rec { +{ stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }: +let pname = "josm"; version = "16239"; - - src = fetchurl { - url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "041n81mnd587043f8wwjv8ckbx0hlsqf3pc7hzbns1y89xdghms1"; + srcs = { + jar = fetchurl { + url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; + sha256 = "041n81mnd587043f8wwjv8ckbx0hlsqf3pc7hzbns1y89xdghms1"; + }; + macosx = fetchurl { + url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip"; + sha256 = "1nlw1rvwdfp1hhsxyjli8pylm0hb7k62sa0nqvgyiw54dz78n00c"; + }; + pkg = fetchsvn { + url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; + rev = version; + sha256 = "1qqk4bal84wnb66jym6qrdi10ypzvdzihd4jk5rnyfl3wm5qafbi"; + }; }; +in +stdenv.mkDerivation { + inherit pname version; - buildInputs = [ jdk11 makeWrapper ]; - - desktopItem = makeDesktopItem { - name = "josm"; - exec = "josm"; - icon = "josm"; - desktopName = "JOSM"; - genericName = "OpenStreetMap Editor"; - comment = meta.description; - categories = "Education;Geoscience;Maps;"; - }; + dontUnpack = true; - # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin - buildCommand = '' - mkdir -p $out/bin $out/share/java - cp -v $src $out/share/java/josm.jar + buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ jre makeWrapper ]; - makeWrapper ${jdk11}/bin/java $out/bin/josm \ - --add-flags "-jar $out/share/java/josm.jar" \ - --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' + installPhase = + if stdenv.isDarwin then '' + mkdir -p $out/Applications + ${unzip}/bin/unzip ${srcs.macosx} 'JOSM.app/*' -d $out/Applications + '' else '' + install -Dm644 ${srcs.jar} $out/share/josm/josm.jar + cp -R ${srcs.pkg}/usr/share $out - mkdir -p $out/share/applications - cp $desktopItem/share/applications"/"* $out/share/applications - mkdir -p $out/share/pixmaps - ${unzip}/bin/unzip -p $src images/logo_48x48x32.png > $out/share/pixmaps/josm.png - ''; + # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin + makeWrapper ${jre}/bin/java $out/bin/josm \ + --add-flags "-Djosm.restart=true -Djava.net.useSystemProxies=true" \ + --add-flags "-jar $out/share/josm/josm.jar" \ + --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' + ''; meta = with stdenv.lib; { description = "An extensible editor for OpenStreetMap"; homepage = "https://josm.openstreetmap.de/"; license = licenses.gpl2Plus; - maintainers = [ maintainers.rycee ]; + maintainers = with maintainers; [ rycee sikmir ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index 1756aefe19a6e..70ca28b467831 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Jottacloud CLI"; - homepage = https://www.jottacloud.com/; - downloadPage = https://repo.jotta.us/archives/linux/; + homepage = "https://www.jottacloud.com/"; + downloadPage = "https://repo.jotta.us/archives/linux/"; maintainers = with maintainers; [ evenbrenden ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix index 1aece5eb4e262..d30e5d96df451 100644 --- a/pkgs/applications/misc/jp2a/default.nix +++ b/pkgs/applications/misc/jp2a/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg ]; meta = with stdenv.lib; { - homepage = https://csl.name/jp2a/; + homepage = "https://csl.name/jp2a/"; description = "A small utility that converts JPG images to ASCII"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 3260f6a506908..992b981c00376 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://maebert.github.io/jrnl/; + homepage = "http://maebert.github.io/jrnl/"; description = "A simple command line journal application that stores your journal in a plain text file"; license = licenses.mit; maintainers = with maintainers; [ zalakain ]; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 69d78575e2a36..8899654cc4c88 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optimizes PDF/DJVU files for mobile e-readers (e.g. the Kindle) and smartphones"; - homepage = http://www.willus.com/k2pdfopt; + homepage = "http://www.willus.com/k2pdfopt"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ bosu danielfullmer ]; diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index b790fb9e6c454..e6193d4356395 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.13"; + version = "1.2.14"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "0mm5sx323v1rwykd1dhvk4d3ipgvgvi3wvhrlavbja3lgay3mdwk"; + sha256 = "11bwajzidnyagdyip7i8rwni1f66acv0k4lybdm0mc4195anivjh"; }; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Kanban project management software"; - homepage = https://kanboard.net; + homepage = "https://kanboard.net"; license = licenses.mit; maintainers = with maintainers; [ fpletz lheckemann ]; }; diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index e8bdcb3711896..c3d2feb2fed78 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -44,7 +44,7 @@ mkDerivation rec { meta = with lib; { description = "KDE Connect provides several features to integrate your phone and your computer"; - homepage = https://community.kde.org/KDEConnect; + homepage = "https://community.kde.org/KDEConnect"; license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ fridh ]; }; diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix index 76ea9df78c25e..f9dbf14624f72 100644 --- a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix @@ -17,7 +17,7 @@ let meta = { description = "KeePass plugin to expose password entries securely (256bit AES/CBC) over HTTP"; - homepage = https://github.com/pfn/keepasshttp; + homepage = "https://github.com/pfn/keepasshttp"; platforms = with stdenv.lib.platforms; linux; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix index 562835159eb38..3d41c45f6dc53 100644 --- a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix @@ -12,7 +12,7 @@ let meta = with stdenv.lib; { description = "The KeePassRPC plugin that needs to be installed inside KeePass in order for Kee to be able to connect your browser to your passwords"; - homepage = https://github.com/kee-org/keepassrpc; + homepage = "https://github.com/kee-org/keepassrpc"; platforms = [ "x86_64-linux" ]; license = licenses.gpl2; maintainers = with maintainers; [ mjanczyk svsdep mgregoire ]; diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index b954d2d3cdb8a..3a1393913ef64 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchurl, buildDotnetPackage, substituteAll, makeWrapper, makeDesktopItem, - unzip, icoutils, gtk2, xorg, xdotool, xsel, plugins ? [] }: + unzip, icoutils, gtk2, xorg, xdotool, xsel, coreutils, unixtools, glib, plugins ? [] }: with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.40"; + version = "2.45"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "1gldl74wz2lvsci6rn71d6q1zmnhr52z6fjib9nsragsazq5byz9"; + sha256 = "07wyp3k2kiprr47mc4vxb7vmh7g5kshcqw0gq3qr87gi78c9i66m"; }; sourceRoot = "."; @@ -20,6 +20,9 @@ with builtins; buildDotnetPackage rec { xsel = "${xsel}/bin/xsel"; xprop = "${xorg.xprop}/bin/xprop"; xdotool = "${xdotool}/bin/xdotool"; + uname = "${coreutils}/bin/uname"; + whereis = "${unixtools.whereis}/bin/whereis"; + gsettings = "${glib}/bin/gsettings"; }) ]; @@ -107,7 +110,7 @@ with builtins; buildDotnetPackage rec { meta = { description = "GUI password manager with strong cryptography"; - homepage = http://www.keepass.info/; + homepage = "http://www.keepass.info/"; maintainers = with stdenv.lib.maintainers; [ amorsillo obadz joncojonathan jraygauthier ]; platforms = with stdenv.lib.platforms; all; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/misc/keepass/fix-paths.patch b/pkgs/applications/misc/keepass/fix-paths.patch index 318f8a358985b..0a99f506b94b5 100644 --- a/pkgs/applications/misc/keepass/fix-paths.patch +++ b/pkgs/applications/misc/keepass/fix-paths.patch @@ -1,8 +1,23 @@ +From 830d0db80f2fce09e12c117f8338b8e4b05866ff Mon Sep 17 00:00:00 2001 +From: Pascal Winkelmann <pascal@wnklmnn.de> +Date: Tue, 19 May 2020 10:28:31 +0200 +Subject: [PATCH] fixpaths + +--- + KeePass/Native/NativeMethods.Unix.cs | 2 +- + KeePass/UI/UISystemFonts.cs | 2 +- + KeePass/Util/AppLocator.cs | 2 +- + KeePass/Util/ClipboardUtil.Unix.cs | 14 +++++++------- + KeePassLib/Native/ClipboardU.cs | 2 +- + KeePassLib/Native/NativeLib.cs | 2 +- + KeePassLib/Utility/MonoWorkarounds.cs | 4 ++-- + 7 files changed, 14 insertions(+), 14 deletions(-) + diff --git a/KeePass/Native/NativeMethods.Unix.cs b/KeePass/Native/NativeMethods.Unix.cs -index 7495a1c..4ef4727 100644 +index 4c47258..79cfdb2 100644 --- a/KeePass/Native/NativeMethods.Unix.cs +++ b/KeePass/Native/NativeMethods.Unix.cs -@@ -128,7 +128,7 @@ namespace KeePass.Native +@@ -130,7 +130,7 @@ namespace KeePass.Native try { Application.DoEvents(); // E.g. for clipboard updates @@ -11,10 +26,54 @@ index 7495a1c..4ef4727 100644 Application.DoEvents(); // E.g. for clipboard updates return (strOutput ?? string.Empty); } +diff --git a/KeePass/UI/UISystemFonts.cs b/KeePass/UI/UISystemFonts.cs +index 08d6134..2bfa4a2 100644 +--- a/KeePass/UI/UISystemFonts.cs ++++ b/KeePass/UI/UISystemFonts.cs +@@ -188,7 +188,7 @@ namespace KeePass.UI + + private static void UbuntuLoadFonts() + { +- string strDef = NativeLib.RunConsoleApp("gsettings", ++ string strDef = NativeLib.RunConsoleApp("@gsettings@", + "get org.gnome.desktop.interface font-name"); + if(strDef == null) return; + +diff --git a/KeePass/Util/AppLocator.cs b/KeePass/Util/AppLocator.cs +index af02803..8a32c9d 100644 +--- a/KeePass/Util/AppLocator.cs ++++ b/KeePass/Util/AppLocator.cs +@@ -429,7 +429,7 @@ namespace KeePass.Util + if(NativeLib.GetPlatformID() == PlatformID.MacOSX) + strArgPrefix = string.Empty; // FR 3535696 + +- string str = NativeLib.RunConsoleApp("whereis", strArgPrefix + strApp); ++ string str = NativeLib.RunConsoleApp("@whereis@", strArgPrefix + strApp); + if(str == null) return null; + + str = str.Trim(); diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs -index e93a22a..3fd9a2b 100644 +index ab49ee2..7f6c50f 100644 --- a/KeePass/Util/ClipboardUtil.Unix.cs +++ b/KeePass/Util/ClipboardUtil.Unix.cs +@@ -42,7 +42,7 @@ namespace KeePass.Util + // string strGtk = GtkGetString(); + // if(strGtk != null) return strGtk; + +- return (NativeLib.RunConsoleApp("pbpaste", "-pboard general") ?? ++ return (NativeLib.RunConsoleApp("@pbpaste@", "-pboard general") ?? + string.Empty); + } + +@@ -50,7 +50,7 @@ namespace KeePass.Util + { + // if(GtkSetString(str)) return; + +- NativeLib.RunConsoleApp("pbcopy", "-pboard general", str); ++ NativeLib.RunConsoleApp("@pbcopy@", "-pboard general", str); + } + + private static string GetStringU() @@ -62,7 +62,7 @@ namespace KeePass.Util // "-out -selection clipboard"); // if(str != null) return str; @@ -51,20 +110,33 @@ index e93a22a..3fd9a2b 100644 return; } diff --git a/KeePassLib/Native/ClipboardU.cs b/KeePassLib/Native/ClipboardU.cs -index ddd8f57..150eb82 100644 +index 291c51d..3c76380 100644 --- a/KeePassLib/Native/ClipboardU.cs +++ b/KeePassLib/Native/ClipboardU.cs @@ -27,7 +27,7 @@ namespace KeePassLib.Native { internal static class ClipboardU { -- private const string XSel = "xsel"; -+ private const string XSel = "@xsel@"; +- internal const string XSel = "xsel"; ++ internal const string XSel = "@xsel@"; private const string XSelV = "--version"; private const string XSelR = "--output --clipboard"; private const string XSelC = "--clear --clipboard"; +diff --git a/KeePassLib/Native/NativeLib.cs b/KeePassLib/Native/NativeLib.cs +index 2d227a3..243f4ee 100644 +--- a/KeePassLib/Native/NativeLib.cs ++++ b/KeePassLib/Native/NativeLib.cs +@@ -145,7 +145,7 @@ namespace KeePassLib.Native + // Mono returns PlatformID.Unix on Mac OS X, workaround this + if(m_platID.Value == PlatformID.Unix) + { +- if((RunConsoleApp("uname", null) ?? string.Empty).Trim().Equals( ++ if((RunConsoleApp("@uname@", null) ?? string.Empty).Trim().Equals( + "Darwin", StrUtil.CaseIgnoreCmp)) + m_platID = PlatformID.MacOSX; + } diff --git a/KeePassLib/Utility/MonoWorkarounds.cs b/KeePassLib/Utility/MonoWorkarounds.cs -index 0da7019..f6a1022 100644 +index e20bb3a..4fd875b 100644 --- a/KeePassLib/Utility/MonoWorkarounds.cs +++ b/KeePassLib/Utility/MonoWorkarounds.cs @@ -41,7 +41,7 @@ namespace KeePassLib.Utility @@ -76,7 +148,7 @@ index 0da7019..f6a1022 100644 private static Dictionary<uint, bool> g_dForceReq = new Dictionary<uint, bool>(); private static Thread g_thFixClip = null; -@@ -303,7 +303,7 @@ namespace KeePassLib.Utility +@@ -335,7 +335,7 @@ namespace KeePassLib.Utility // } // else { Debug.Assert(false); } @@ -85,3 +157,6 @@ index 0da7019..f6a1022 100644 "-id " + strHandle + " WM_CLASS") ?? string.Empty); if(strWmClass.IndexOf("\"" + PwDefs.ResClass + "\"", +-- +2.25.4 + diff --git a/pkgs/applications/misc/keepass/keepass-plugins.patch b/pkgs/applications/misc/keepass/keepass-plugins.patch index cde6e7252bc3b..9a7e3fe99832e 100644 --- a/pkgs/applications/misc/keepass/keepass-plugins.patch +++ b/pkgs/applications/misc/keepass/keepass-plugins.patch @@ -1,13 +1,25 @@ +From 4cb0b18f5326a07927453897180289a4b254ac4f Mon Sep 17 00:00:00 2001 +From: Pascal Winkelmann <pascal@wnklmnn.de> +Date: Tue, 19 May 2020 10:43:49 +0200 +Subject: [PATCH] loadplugin + +--- + KeePass/Forms/MainForm.cs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs -index 3d5fca0..4c3f3d4 100644 +index 347eaf5..b92e1e2 100644 --- a/KeePass/Forms/MainForm.cs +++ b/KeePass/Forms/MainForm.cs -@@ -406,7 +406,$OUTPUT_LC$ @@ namespace KeePass.Forms - m_pluginManager.Initialize(m_pluginDefaultHost); +@@ -440,7 +440,7 @@ namespace KeePass.Forms + ToolStripItemCollection tsicT = m_ctxTray.Items; + ToolStripItem tsiPrevT = m_ctxTrayOptions; - m_pluginManager.UnloadAllPlugins(); -- if(AppPolicy.Current.Plugins) m_pluginManager.LoadAllPlugins(); +- m_pluginManager.LoadAllPlugins(); $DO_LOADS$+ - // Delete old files *after* loading plugins (when timestamps - // of loaded plugins have been updated already) + m_pluginManager.AddMenuItems(PluginMenuType.Main, tsicM, tsiPrevM); + m_pluginManager.AddMenuItems(PluginMenuType.Group, tsicGM, tsiPrevGM); +-- +2.25.4 + diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix index 36734a97516b9..fdd11db509fc3 100644 --- a/pkgs/applications/misc/keepassx/2.0.nix +++ b/pkgs/applications/misc/keepassx/2.0.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; - homepage = https://www.keepassx.org/; + homepage = "https://www.keepassx.org/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ qknight ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index c6bcd56167c09..469b4cf5ea6d7 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -1,4 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, qttools, darwin +{ stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, makeWrapper +, qttools +, darwin , curl , glibcLocales @@ -33,13 +39,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.5.2"; + version = "2.5.4"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "0z5bd17qaq7zpv96gw6qwv6rb4xx7xjq86ss6wm5zskcrraf7r7n"; + sha256 = "1xih9q1pxszalc0l29fmjxwn1vrrrrbnhc8gmi8brw5sclhbs6bh"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ @@ -57,6 +63,11 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch + # use wl-copy on Wayland - can be dropped with the next version update + (fetchpatch { + url = "https://github.com/keepassxreboot/keepassxc/commit/6128e5d58294f26411160f44da91087ebe7f4b07.patch"; + sha256 = "16q0h7kijqjdbskmk4ar6p3g8vcxr0bq1zrlq2bk16pk10nv4bh1"; + }) ]; cmakeFlags = [ @@ -79,7 +90,8 @@ stdenv.mkDerivation rec { export LC_ALL="en_US.UTF-8" export QT_QPA_PLATFORM=offscreen export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" - make test ARGS+="-E testgui --output-on-failure" + # testcli and testgui are flaky - skip them both + make test ARGS+="-E 'testcli|testgui' --output-on-failure" ''; nativeBuildInputs = [ cmake wrapQtAppsHook qttools ]; @@ -114,9 +126,9 @@ stdenv.mkDerivation rec { meta = { description = "Password manager to store your passwords safely and auto-type them into your everyday websites and applications"; longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI, CLI, and browser integration with the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser)."; - homepage = https://keepassxc.org/; + homepage = "https://keepassxc.org/"; license = licenses.gpl2; - maintainers = with maintainers; [ jonafato ]; + maintainers = with maintainers; [ jonafato turion ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/misc/keepassx/darwin.patch b/pkgs/applications/misc/keepassx/darwin.patch index 6232d1118a7b9..95ca5d4587fea 100644 --- a/pkgs/applications/misc/keepassx/darwin.patch +++ b/pkgs/applications/misc/keepassx/darwin.patch @@ -6,10 +6,10 @@ index 74b1a7ff..0a713a32 100644 set(PLUGIN_INSTALL_DIR ".") set(DATA_INSTALL_DIR "share") elseif(APPLE AND WITH_APP_BUNDLE) -+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications") ++ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications") + set(BUNDLE_INSTALL_DIR "${PROGNAME}.app/Contents") set(CMAKE_INSTALL_MANDIR "${PROGNAME}.app/Contents/Resources/man") set(CLI_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS") - set(PROXY_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS") @@ -369,12 +370,6 @@ set(CMAKE_AUTORCC ON) if(APPLE) diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix index 7adbcb86c501a..d0980001c8f69 100644 --- a/pkgs/applications/misc/keepassx/default.nix +++ b/pkgs/applications/misc/keepassx/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; - homepage = https://www.keepassx.org/; + homepage = "https://www.keepassx.org/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ qknight ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index c435eaefed506..323fc501c8422 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -41,6 +41,13 @@ with python3.pkgs; buildPythonApplication rec { checkInputs = [ pytest glibcLocales ]; LC_ALL = "en_US.UTF-8"; + postPatch = '' + sed -i \ + -e "s/Invalid value for \"ics\"/Invalid value for \\\'ics\\\'/" \ + -e "s/Invalid value for \"\[ICS\]\"/Invalid value for \\\'\[ICS\]\\\'/" \ + tests/cli_test.py + ''; + postInstall = '' # zsh completion install -D misc/__khal $out/share/zsh/site-functions/__khal @@ -61,7 +68,7 @@ with python3.pkgs; buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://lostpackets.de/khal/; + homepage = "http://lostpackets.de/khal/"; description = "CLI calendar application"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 0d3c9d0cbd06f..8646b9864d9eb 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,12 +1,12 @@ { stdenv, glibcLocales, python3 }: python3.pkgs.buildPythonApplication rec { - version = "0.16.0"; + version = "0.16.1"; pname = "khard"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0a1zpkq0pplmn9flxczq2wafs6zc07r9xx9qi6dqmyv9mhy9d87f"; + sha256 = "0fg4qh5gzki5wg958wlpc8a2icnk74gzg33lqxjm755cfnjng7qd"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 9269add3173b0..80cf90ced16e8 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -20,14 +20,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.17.2"; + version = "0.17.4"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "0xiwz89ynhh8aj0c9jbqfsxf129hnzs0gz4bzcparnjisq2sh3cq"; + sha256 = "1rbyj84y8r6h7qd6w7cw58v2abspippignj458ihv2m26i4als2x"; }; buildInputs = [ @@ -122,7 +122,7 @@ buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/kovidgoyal/kitty; + homepage = "https://github.com/kovidgoyal/kitty"; description = "A modern, hackable, featureful, OpenGL based terminal emulator"; license = licenses.gpl3; platforms = platforms.darwin ++ platforms.linux; diff --git a/pkgs/applications/misc/kitty/library-paths.patch b/pkgs/applications/misc/kitty/library-paths.patch index 5f8daacc3c23d..608dfb80d61f3 100644 --- a/pkgs/applications/misc/kitty/library-paths.patch +++ b/pkgs/applications/misc/kitty/library-paths.patch @@ -12,21 +12,27 @@ --- a/kitty/desktop.c +++ b/kitty/desktop.c -@@ -30,7 +30,7 @@ - static PyObject* - init_x11_startup_notification(PyObject UNUSED *self, PyObject *args) { - static bool done = false; -- static const char* libname = "libstartup-notification-1.so"; -+ static const char* libname = "@libstartup_notification@"; - // some installs are missing the .so symlink, so try the full name - static const char* libname2 = "libstartup-notification-1.so.0"; - static const char* libname3 = "libstartup-notification-1.so.0.0.0"; -@@ -105,7 +105,7 @@ load_libcanberra_functions(void) { +@@ -34,10 +34,7 @@ init_x11_startup_notification(PyObject UNUSED *self, PyObject *args) { + done = true; - static void - load_libcanberra(void) { -- static const char* libname = "libcanberra.so"; -+ static const char* libname = "@libcanberra@"; - // some installs are missing the .so symlink, so try the full name - static const char* libname2 = "libcanberra.so.0"; - static const char* libname3 = "libcanberra.so.0.2.5"; + const char* libnames[] = { +- "libstartup-notification-1.so", +- // some installs are missing the .so symlink, so try the full name +- "libstartup-notification-1.so.0", +- "libstartup-notification-1.so.0.0.0", ++ "@libstartup_notification@", + NULL + }; + for (int i = 0; libnames[i]; i++) { +@@ -113,10 +110,7 @@ load_libcanberra(void) { + if (done) return; + done = true; + const char* libnames[] = { +- "libcanberra.so", +- // some installs are missing the .so symlink, so try the full name +- "libcanberra.so.0", +- "libcanberra.so.0.2.5", ++ "@libcanberra@", + NULL + }; + for (int i = 0; libnames[i]; i++) { diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 898186b714b69..ff6b1e9de2dc6 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -9,19 +9,19 @@ with stdenv.lib; let xulrunner64_tar = fetchurl { - url = http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-x86_64.tar.bz2; + url = "http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-x86_64.tar.bz2"; sha256 = "0i3m30gm5z7qmas14id6ypvbmnb2k7jhz8aby2wz5vvv49zqmx3s"; }; xulrunnersdk64_tar = fetchurl { - url = http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-x86_64.sdk.tar.bz2; + url = "http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-x86_64.sdk.tar.bz2"; sha256 = "0z90v7c4mq15g5klmsj8vs2r10fbygj3qzynx4952hkv8ihw8n3a"; }; xulrunner32_tar = fetchurl { - url = http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-i686.tar.bz2; + url = "http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-i686.tar.bz2"; sha256 = "0yln6pxz8f6b9wm9124sx049z8mgi17lgd63rcv2hnix825y8gjb"; }; xulrunnersdk32_tar = fetchurl { - url = http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-i686.sdk.tar.bz2; + url = "http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-i686.sdk.tar.bz2"; sha256 = "1h9vcbvf8wgds6i2z20y7krpys0mqsqhv1ijyfljanp6vyll9fvi"; }; @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { meta = { description = "An offline reader for Web content"; - homepage = https://kiwix.org; + homepage = "https://kiwix.org"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ robbinch ]; diff --git a/pkgs/applications/misc/kjv/default.nix b/pkgs/applications/misc/kjv/default.nix index 7868e74d010c0..307781931e971 100644 --- a/pkgs/applications/misc/kjv/default.nix +++ b/pkgs/applications/misc/kjv/default.nix @@ -2,7 +2,7 @@ let -patch-base = https://github.com/LukeSmithxyz/kjv/commit/; +patch-base = "https://github.com/LukeSmithxyz/kjv/commit/"; add-apocrypha = fetchpatch { url = patch-base + "b92b7622285d10464f9274f11e740bef90705bbc.patch"; diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 78b32f7fca15a..784656b8b96fa 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.26.2"; + version = "0.26.5"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - sha256 = "0svyqayvr45snqw0dhx6jpnjhg4qb097pz28s8k1crx5i31nnd94"; + sha256 = "1zv8yazhdyxm33vdn0m5cciw7zzg45nwdg4rdcsydnrwg7d667r6"; }; postPatch = '' diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index 8b6b7741c7df9..816b352460ba2 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -25,7 +25,7 @@ in mkDerivation rec { meta = with lib; { description = "A powerful batch renamer for KDE"; - homepage = https://kde.org/applications/utilities/krename/; + homepage = "https://kde.org/applications/utilities/krename/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; inherit (kconfig.meta) platforms; diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index 15979def34b03..ab13c4989d9a9 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -19,8 +19,8 @@ in mkDerivation rec { meta = with lib; { description = "Norton/Total Commander clone for KDE"; license = licenses.gpl2; - homepage = http://www.krusader.org; - maintainers = with maintainers; [ sander ]; + homepage = "http://www.krusader.org"; + maintainers = with maintainers; [ sander turion ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 3fc5099acc2c2..424da3ad36051 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -3,11 +3,11 @@ mkDerivation rec { pname = "latte-dock"; - version = "0.9.10"; + version = "0.9.11"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "11s9fslr33h3ic14ifr43jphf68jpny8jmhvmrrwcz6w0p3falzw"; + sha256 = "0x7a93a7axsa0fzpbkkv1z722k9za4p51xcpzdpnh5ih1zij0csi"; name = "${pname}-${version}.tar.xz"; }; diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index 76abe7c9b4b34..532166cf6fb08 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { It allows you to focus on specific skills and exercises, on both theory and aural training. The different activities can be customized to meet your needs ''; - homepage = http://www.lenmus.org/; + homepage = "http://www.lenmus.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; linux; diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix index 846ce30984250..2bd8bfa99bcd6 100644 --- a/pkgs/applications/misc/libosmocore/default.nix +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "libosmocore"; - homepage = https://github.com/osmocom/libosmocore; + homepage = "https://github.com/osmocom/libosmocore"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ mog ]; diff --git a/pkgs/applications/misc/lighthouse/default.nix b/pkgs/applications/misc/lighthouse/default.nix index 7b5b40d65a363..9e651c59d4eb0 100644 --- a/pkgs/applications/misc/lighthouse/default.nix +++ b/pkgs/applications/misc/lighthouse/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple flexible popup dialog to run on X"; - homepage = https://github.com/emgram769/lighthouse; + homepage = "https://github.com/emgram769/lighthouse"; license = licenses.mit; maintainers = with maintainers; [ ramkromberg ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix index e4f797766e0bd..28f9625b5b667 100644 --- a/pkgs/applications/misc/lilyterm/default.nix +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { longDescription = '' LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight. ''; - homepage = https://lilyterm.luna.com.tw/; + homepage = "https://lilyterm.luna.com.tw/"; license = licenses.gpl3; maintainers = with maintainers; [ AndersonTorres Profpatsch ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 25f9b10b1e859..e2ec64932ff22 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://repo.or.cz/w/llpp.git; + homepage = "https://repo.or.cz/w/llpp.git"; description = "A MuPDF based PDF pager written in OCaml"; platforms = platforms.linux; maintainers = with maintainers; [ pSub enzime ]; diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix index 846df292eb1a2..4b201c66fe5ef 100644 --- a/pkgs/applications/misc/loxodo/default.nix +++ b/pkgs/applications/misc/loxodo/default.nix @@ -30,7 +30,7 @@ py.buildPythonApplication { meta = with stdenv.lib; { description = "A Password Safe V3 compatible password vault"; - homepage = https://www.christoph-sommer.de/loxodo/; + homepage = "https://www.christoph-sommer.de/loxodo/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix index 61151cb155061..2ceb8e91def87 100644 --- a/pkgs/applications/misc/ltwheelconf/default.nix +++ b/pkgs/applications/misc/ltwheelconf/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/thk/LTWheelConf; + homepage = "https://github.com/thk/LTWheelConf"; description = "Logitech wheels configuration tool"; license = licenses.gpl3; maintainers = [ maintainers.ebzzry ]; diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix index 6f8d690779be5..4fcbaa19a209c 100644 --- a/pkgs/applications/misc/lutris/chrootenv.nix +++ b/pkgs/applications/misc/lutris/chrootenv.nix @@ -92,9 +92,9 @@ in buildFHSUserEnv { multiPkgs = pkgs: with pkgs; [ # Common libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio - libao libusb libevdev udev libgcrypt libxml2 libusb libpng libmpeg2 libv4l + libao libevdev udev libgcrypt libxml2 libusb-compat-0_1 libpng libmpeg2 libv4l libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio - libcap libtiff libva libgphoto2 libxslt libtxc_dxtn libsndfile giflib zlib glib + libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd vulkan-loader xdg_utils sqlite gnutls libbsd @@ -105,6 +105,9 @@ in buildFHSUserEnv { cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap ocl-icd utillinux libkrb5 + # Proton + libselinux + # Winetricks fribidi ] ++ xorgDeps pkgs; diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 297596b8e39cf..2ff2a82dd4fb0 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -1,5 +1,5 @@ { buildPythonApplication, lib, fetchFromGitHub, fetchpatch -, wrapGAppsHook, gobject-introspection, gnome-desktop, libnotify, libgnome-keyring, pango +, wrapGAppsHook, gobject-introspection, glib-networking, gnome-desktop, libnotify, libgnome-keyring, pango , gdk-pixbuf, atk, webkitgtk, gst_all_1 , dbus-python, evdev, pyyaml, pygobject3, requests, pillow , xrandr, pciutils, psmisc, glxinfo, vulkan-tools, xboxdrv, pulseaudio, p7zip, xgamma @@ -40,8 +40,9 @@ in buildPythonApplication rec { sha256 = "1g093g0difnkjmnm91p20issdsxn9ri4c56zzddj5wfrbmhwdfag"; }; + nativeBuildInputs = [ wrapGAppsHook ]; buildInputs = [ - wrapGAppsHook gobject-introspection gnome-desktop libnotify libgnome-keyring pango + gobject-introspection glib-networking gnome-desktop libnotify libgnome-keyring pango gdk-pixbuf atk webkitgtk ] ++ gstDeps; diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix index 0802a32d92b18..8c002bd14b086 100644 --- a/pkgs/applications/misc/lxterminal/default.nix +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { desktop-independent VTE-based terminal emulator for LXDE without any unnecessary dependencies. ''; - homepage = https://wiki.lxde.org/en/LXTerminal; + homepage = "https://wiki.lxde.org/en/LXTerminal"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.velovix ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index f9d8599e329cd..b96e6b2a02d56 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -36,7 +36,7 @@ mkDerivation rec { meta = with lib; { description = "WYSIWYM frontend for LaTeX, DocBook"; - homepage = http://www.lyx.org; + homepage = "http://www.lyx.org"; license = licenses.gpl2Plus; maintainers = [ maintainers.vcunat ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix index 9a134343d296b..a61c66d937461 100644 --- a/pkgs/applications/misc/madonctl/default.nix +++ b/pkgs/applications/misc/madonctl/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "CLI for the Mastodon social network API"; - homepage = https://github.com/McKael/madonctl; + homepage = "https://github.com/McKael/madonctl"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch b/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch deleted file mode 100644 index 80b9ebf4d5712..0000000000000 --- a/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 81cf57e4653360af7f1718391e424fa05d8ea000 Mon Sep 17 00:00:00 2001 -From: Keshav Kini <keshav.kini@gmail.com> -Date: Thu, 9 Aug 2018 18:36:15 -0700 -Subject: [PATCH] Use `rm` from PATH - -On NixOS (a Linux distribution), there is no `/bin/rm`, but an `rm` -command will generally be available in one's path when running shell -scripts. Here, I change a couple of invocations of `/bin/rm` into -invocations of `rm` to deal with this issue. - -Since `rm` is already called elsewhere in the script without an -absolute path, I assume this change will not cause any -regressions. Still, I've tested this on a CentOS machine and a NixOS -machine, though not other platforms. ---- - makeself-header.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/makeself-header.sh b/makeself-header.sh -index 4d2c005..2babf34 100755 ---- a/makeself-header.sh -+++ b/makeself-header.sh -@@ -515,7 +515,7 @@ if test x"\$quiet" = xn; then - fi - res=3 - if test x"\$keep" = xn; then -- trap 'echo Signal caught, cleaning up >&2; cd \$TMPROOT; /bin/rm -rf "\$tmpdir"; eval \$finish; exit 15' 1 2 3 15 -+ trap 'echo Signal caught, cleaning up >&2; cd \$TMPROOT; rm -rf "\$tmpdir"; eval \$finish; exit 15' 1 2 3 15 - fi - - if test x"\$nodiskspace" = xn; then -@@ -581,7 +581,7 @@ if test x"\$script" != x; then - fi - if test x"\$keep" = xn; then - cd "\$TMPROOT" -- /bin/rm -rf "\$tmpdir" -+ rm -rf "\$tmpdir" - fi - eval \$finish; exit \$res - EOF --- -2.14.1 - diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index f2585f7814656..6fcd86596fb3a 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -1,22 +1,21 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2.4.0"; + version = "2.4.2"; pname = "makeself"; src = fetchFromGitHub { owner = "megastep"; repo = "makeself"; rev = "release-${version}"; - sha256 = "1lw3gx1zpzp2wmzrw5v7k31vfsrdzadqha9ni309fp07g8inrr9n"; + fetchSubmodules = true; + sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21"; }; - # backported from https://github.com/megastep/makeself/commit/77156e28ff21231c400423facc7049d9c60fd1bd - patches = [ ./Use-rm-from-PATH.patch ]; + patchPhase = "patchShebangs test"; - postPatch = '' - sed -e "s|^HEADER=.*|HEADER=$out/share/${pname}-${version}/makeself-header.sh|" -i makeself.sh - ''; + doCheck = true; + checkTarget = "test"; installPhase = '' mkdir -p $out/{bin,share/{${pname}-${version},man/man1}} @@ -26,8 +25,12 @@ stdenv.mkDerivation rec { cp makeself-header.sh $out/share/${pname}-${version} ''; + fixupPhase = '' + sed -e "s|^HEADER=.*|HEADER=$out/share/${pname}-${version}/makeself-header.sh|" -i $out/bin/makeself + ''; + meta = with stdenv.lib; { - homepage = http://megastep.org/makeself; + homepage = "http://megastep.org/makeself"; description = "Utility to create self-extracting packages"; license = licenses.gpl2; maintainers = [ maintainers.wmertens ]; diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix index f86effe989fa2..e1b14acb46f4f 100644 --- a/pkgs/applications/misc/mako/default.nix +++ b/pkgs/applications/misc/mako/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc , systemd, pango, cairo, gdk-pixbuf -, wayland, wayland-protocols }: +, wayland, wayland-protocols +, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mako"; @@ -13,14 +14,14 @@ stdenv.mkDerivation rec { sha256 = "0hwvibpnrximb628w9dsfjpi30b5jy7nfkm4d94z5vhp78p43vxh"; }; - nativeBuildInputs = [ meson ninja pkgconfig scdoc wayland-protocols ]; + nativeBuildInputs = [ meson ninja pkgconfig scdoc wayland-protocols wrapGAppsHook ]; buildInputs = [ systemd pango cairo gdk-pixbuf wayland ]; mesonFlags = [ "-Dzsh-completions=true" ]; meta = with stdenv.lib; { description = "A lightweight Wayland notification daemon"; - homepage = https://wayland.emersion.fr/mako/; + homepage = "https://wayland.emersion.fr/mako/"; license = licenses.mit; maintainers = with maintainers; [ dywedir synthetica ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/mapproxy/default.nix b/pkgs/applications/misc/mapproxy/default.nix index e5826c09d77d2..0261dfbe89914 100644 --- a/pkgs/applications/misc/mapproxy/default.nix +++ b/pkgs/applications/misc/mapproxy/default.nix @@ -57,8 +57,8 @@ buildPythonApplication rec { doCheck = false; meta = with lib; { description = "MapProxy is an open source proxy for geospatial data"; - homepage = https://mapproxy.org/; + homepage = "https://mapproxy.org/"; license = licenses.asl20; maintainers = with maintainers; [ rakesh4g ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index 03f30d64fb2de..b96c4d00214b8 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; meta = with stdenv.lib; { - homepage = https://github.com/visit1985/mdp; + homepage = "https://github.com/visit1985/mdp"; description = "A command-line based markdown presentation tool"; maintainers = with maintainers; [ matthiasbeyer vrthra ]; license = licenses.gpl3; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index b84bc08ddb374..79dcf10536140 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "19.09"; + version = "20.03"; pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1a2ssklg12sjsw09y8my9kf35mizi3zj7w002nspcmw28apb1x82"; + sha256 = "1f1shnycf0f1fwka9k9s250l228xjkg0k4k73h8bpld8msighgnw"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files. ''; - homepage = https://mediaarea.net/; + homepage = "https://mediaarea.net/"; license = licenses.bsd2; platforms = platforms.linux; maintainers = [ maintainers.devhell ]; diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 9fe810e41477c..07d194dbff42a 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "megacmd"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "004j8m3xs6slx03g2g6wzr97myl2v3zc09wxnfar5c62a625pd53"; + sha256 = "0czyhsms0a0237d6h9b21n9p4nm4zkjanhhbvw26k6266g6c1nyr"; fetchSubmodules = true; }; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MEGA Command Line Interactive and Scriptable Application"; - homepage = https://mega.nz/; + homepage = "https://mega.nz/"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ maintainers.wedens ]; diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index 3749f568aef29..66fe0d7207c23 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { A simple tool written in bash to memorize stuff. Memo organizes is structured through topics which are folders in ~/memo. ''; - homepage = http://palovandalo.com/memo/; - downloadPage = https://github.com/mrVanDalo/memo/releases; + homepage = "http://palovandalo.com/memo/"; + downloadPage = "https://github.com/mrVanDalo/memo/releases"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.mrVanDalo ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix index e06f2a88ade4c..22cf63e536c70 100644 --- a/pkgs/applications/misc/menumaker/default.nix +++ b/pkgs/applications/misc/menumaker/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Heuristics-driven menu generator for several window managers"; - homepage = http://menumaker.sourceforge.net; + homepage = "http://menumaker.sourceforge.net"; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 08643577b49e1..79ee45b4c1c4f 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OpenStreetMap editor"; - homepage = http://merkaartor.be/; + homepage = "http://merkaartor.be/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/applications/misc/metar/default.nix b/pkgs/applications/misc/metar/default.nix index ca4f91533ecfa..f5185c6398739 100644 --- a/pkgs/applications/misc/metar/default.nix +++ b/pkgs/applications/misc/metar/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ curl ]; meta = with stdenv.lib; { - homepage = https://github.com/keesL/metar; + homepage = "https://github.com/keesL/metar"; license = licenses.gpl2; maintainers = [ maintainers.zalakain ]; description = "Downloads weather reports and optionally decodes them"; diff --git a/pkgs/applications/misc/microcom/default.nix b/pkgs/applications/misc/microcom/default.nix new file mode 100644 index 0000000000000..8377505ec1c54 --- /dev/null +++ b/pkgs/applications/misc/microcom/default.nix @@ -0,0 +1,29 @@ +{ stdenv, + lib, + fetchFromGitHub, + readline, + autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "microcom"; + version = "2019.01.0"; + + src = fetchFromGitHub { + owner = "pengutronix"; + repo = pname; + rev = "v${version}"; + sha256 = "056v28hvagnzns6p8i3bq8609k82d3w1ab2lab5dr4cdfwhs4pqj"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ readline ]; + + meta = with lib; { + description = "A minimalistic terminal program for communicating + with devices over a serial connection"; + inherit (src.meta) homepage; + license = licenses.gpl2; + maintainers = with maintainers; [ emantor ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix index 2eee9ad40c168..84cc0e0bc8dc1 100644 --- a/pkgs/applications/misc/milu/default.nix +++ b/pkgs/applications/misc/milu/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = { description = "Higher Order Mutation Testing Tool for C and C++ programs"; - homepage = https://github.com/yuejia/Milu; + homepage = "https://github.com/yuejia/Milu"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.vrthra ]; diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index fd1aa050fe74f..0b3d65e21e37a 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "minder"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "0pfp0dglj2ig2p1h000137dxw777mjvzzqj3gcnbxjxqz3m6fzc0"; + sha256 = "00lkb1w536jyhka2znxmgbyss13j4h75yvl42z4hlgz31wljcin4"; }; nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/pkgs/applications/misc/minergate-cli/default.nix index eff93c8e99c11..61b900c40122c 100644 --- a/pkgs/applications/misc/minergate-cli/default.nix +++ b/pkgs/applications/misc/minergate-cli/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Minergate CPU/GPU console client mining software"; - homepage = https://www.minergate.com/; + homepage = "https://www.minergate.com/"; license = licenses.unfree; maintainers = with maintainers; [ bfortz ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/minergate/default.nix b/pkgs/applications/misc/minergate/default.nix index a8402d9759319..6fbe39c4da2d1 100644 --- a/pkgs/applications/misc/minergate/default.nix +++ b/pkgs/applications/misc/minergate/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Minergate CPU/GPU mining software"; - homepage = https://www.minergate.com/; + homepage = "https://www.minergate.com/"; license = licenses.unfree; maintainers = with maintainers; [ bfortz ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index b2012801e1702..f58fb13e61f00 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "mlterm"; - version = "3.8.9"; + version = "3.9.0"; src = fetchurl { url = "mirror://sourceforge/project/mlterm/01release/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1iy7wq953gcnygr1d04h5ddvhpmy8l575n5is2w0rj3ck31ihpqd"; + sha256 = "17h6j4nmbyvsx2shm8mqm7smzq9i7mbqxjw19c2m0rhf5yzqhr3k"; }; nativeBuildInputs = [ pkgconfig autoconf ]; @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi Lingual TERMinal emulator on X11"; - homepage = http://mlterm.sourceforge.net/; + homepage = "http://mlterm.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ vrthra ramkromberg ]; platforms = with platforms; linux; diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index 0a54bc98bb9a2..6a15217641561 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.43.3"; + version = "0.43.16"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "0kl7wksiqmy0hqbg6xwmzqfn3l17if2hiw7xc9x067x9rviyxrl3"; + sha256 = "1gx1hbxiilggwfw0jspyk2cw92r6qs9a8yqa8x1d2ndf493mjx9y"; }; outputs = [ "out" "udev" ]; diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 08f510a2840e2..328e106694b21 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source implementation of NVIDIA's GameStream"; - homepage = https://github.com/irtimmer/moonlight-embedded; + homepage = "https://github.com/irtimmer/moonlight-embedded"; license = licenses.gpl3; maintainers = [ maintainers.globin ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix index c0d41cda02dd4..81c236589654d 100644 --- a/pkgs/applications/misc/mop/default.nix +++ b/pkgs/applications/misc/mop/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Simple stock tracker implemented in go"; - homepage = https://github.com/mop-tracker/mop; + homepage = "https://github.com/mop-tracker/mop"; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/applications/misc/mpvc/default.nix index 35de284c0baa7..eacc4b5758c36 100644 --- a/pkgs/applications/misc/mpvc/default.nix +++ b/pkgs/applications/misc/mpvc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A mpc-like control interface for mpv"; - homepage = https://github.com/wildefyr/mpvc; + homepage = "https://github.com/wildefyr/mpvc"; license = licenses.mit; maintainers = [ maintainers.neeasade ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/mqtt-bench/default.nix b/pkgs/applications/misc/mqtt-bench/default.nix index 0e8cc2ebcea98..1f6112d7d7bbb 100644 --- a/pkgs/applications/misc/mqtt-bench/default.nix +++ b/pkgs/applications/misc/mqtt-bench/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Mosquitto benchmark tool"; - homepage = https://github.com/takanorig/mqtt-bench; + homepage = "https://github.com/takanorig/mqtt-bench"; maintainers = with maintainers; [ disassembler ]; }; } diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix index a6efb19b5774a..6717fc3c97f95 100644 --- a/pkgs/applications/misc/mrxvt/default.nix +++ b/pkgs/applications/misc/mrxvt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = mirror://sourceforge/materm/mrxvt-0.5.4.tar.gz; + url = "mirror://sourceforge/materm/mrxvt-0.5.4.tar.gz"; sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation { Multitabbed lightweight terminal emulator based on rxvt. Supports transparency, backgroundimages, freetype fonts, ... "; - homepage = https://sourceforge.net/projects/materm; + homepage = "https://sourceforge.net/projects/materm"; license = "GPL"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/misc/mucommander/default.nix index 12a0720e44730..e598e099d0650 100644 --- a/pkgs/applications/misc/mucommander/default.nix +++ b/pkgs/applications/misc/mucommander/default.nix @@ -77,7 +77,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.mucommander.com/; + homepage = "http://www.mucommander.com/"; description = "Cross-platform file manager"; license = licenses.gpl3; maintainers = with maintainers; [ volth ]; diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index ab8802a1b6917..8f90c7a581d0a 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -1,4 +1,5 @@ -{ fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, +{ fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip, + coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk, python36Packages, qt5, runtimeShell, stdenv, utillinux, wrapQtAppsHook }: # Note: Multibootusb is tricky to maintain. It relies on the @@ -19,17 +20,30 @@ python36Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook + autoPatchelfHook + unzip + zip ]; - buildInputs = [ - libxcb - mtools - p7zip + runTimeDeps = [ + coreutils + gnugrep + which parted + utillinux + qemu + p7zip + gnused + mtools procps + e2fsprogs + gptfdisk + ]; + + buildInputs = [ + libxcb python36Packages.python qt5.full - utillinux ]; src = fetchFromGitHub { @@ -52,6 +66,20 @@ python36Packages.buildPythonApplication rec { python36Packages.six ]; + # multibootusb ships zips with various versions of syslinux, we need to patchelf them + postPatch = '' + for zip in $(find . -name "*.zip"); do + zip=$(readlink -f $zip) + target="$(mktemp -d)" + pushd $target + unzip $zip + rm $zip + autoPatchelf . + zip -r $zip * + popd + done + ''; + postInstall = '' # This script doesn't work and it doesn't add much anyway rm $out/bin/multibootusb-pkexec @@ -69,6 +97,9 @@ python36Packages.buildPythonApplication rec { # Then, add the installed scripts/ directory to the python path --prefix "PYTHONPATH" ":" "$out/lib/${python36Packages.python.libPrefix}/site-packages" + # Add some runtime dependencies + --prefix "PATH" ":" "${stdenv.lib.makeBinPath runTimeDeps}" + # Finally, move to directory that contains data --run "cd $out/share/${pname}" ) @@ -76,7 +107,7 @@ python36Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Multiboot USB creator for Linux live disks"; - homepage = http://multibootusb.org/; + homepage = "http://multibootusb.org/"; license = licenses.gpl2; maintainers = []; # Looking for a maintainer! }; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 32c117c01738b..34ada062c717c 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -74,14 +74,15 @@ in stdenv.mkDerivation rec { Comment=PDF viewer Exec=$bin/bin/mupdf-x11 %f Terminal=false + MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;application/epub+zip EOF ''; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://mupdf.com; - repositories.git = git://git.ghostscript.com/mupdf.git; + homepage = "https://mupdf.com"; + repositories.git = "git://git.ghostscript.com/mupdf.git"; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; license = licenses.agpl3Plus; maintainers = with maintainers; [ vrthra fpletz ]; diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index 688ec16b15546..3be02e7c41c2a 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://jwilk.net/software/mwic; + homepage = "http://jwilk.net/software/mwic"; description = "spell-checker that groups possible misspellings and shows them in their contexts"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 03483a1a2b8ad..07ca64518e521 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -45,11 +45,11 @@ let inherit (python2.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "8.0.19"; + version = "8.0.20"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "unrszSK+tKcARSHxRSAAos+jDtYxdDcSnFENixaDJsw="; + sha256 = "0c0ig2fqfpli7fwb4v4iwvfh4szzj3grx8j9rbh40kllkc8v5qh6"; }; patches = [ @@ -142,7 +142,7 @@ in stdenv.mkDerivation rec { "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" "-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config" "-DWITH_ANTLR_JAR=${antlr4_7.jarLocation}" - # mysql-workbench 8.0.19 depends on libmysqlconnectorcpp 1.1.8. + # mysql-workbench 8.0.20 depends on libmysqlconnectorcpp 1.1.8. # Newer versions of connector still provide the legacy library when enabled # but the headers are in a different location. "-DMySQLCppConn_INCLUDE_DIR=${libmysqlconnectorcpp}/include/jdbc" diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/applications/misc/mystem/default.nix index 6a6c95b6572db..27caef9ea2eb2 100644 --- a/pkgs/applications/misc/mystem/default.nix +++ b/pkgs/applications/misc/mystem/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Morphological analysis of Russian text"; - homepage = https://yandex.ru/dev/mystem/; + homepage = "https://yandex.ru/dev/mystem/"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ abbradar ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix index b4d97c368ea21..cf7689367bd3e 100644 --- a/pkgs/applications/misc/nanoblogger/default.nix +++ b/pkgs/applications/misc/nanoblogger/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Small weblog engine written in Bash for the command line"; - homepage = http://nanoblogger.sourceforge.net/; + homepage = "http://nanoblogger.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix index 9a40e3bc1053b..80c455f41a0ee 100644 --- a/pkgs/applications/misc/navipowm/default.nix +++ b/pkgs/applications/misc/navipowm/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "navipowm-0.2.4"; src = fetchurl { - url = mirror://sourceforge/navipowm/NaviPOWM-0.2.4.tar.gz; + url = "mirror://sourceforge/navipowm/NaviPOWM-0.2.4.tar.gz"; sha256 = "1kdih8kwpgcgfh6l6njkr9gq2j5hv39xvzmzgvhip553kn6bss7b"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake4Hook ]; meta = { - homepage = http://navipowm.sourceforge.net/; + homepage = "http://navipowm.sourceforge.net/"; description = "Car navigation system"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 2263dfc1fbc06..099bcbfb25dfd 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.navit-project.org; + homepage = "https://www.navit-project.org"; description = "Car navigation system with routing engine using OSM maps"; license = licenses.gpl2; maintainers = [ maintainers.genesis ]; diff --git a/pkgs/applications/misc/neap/default.nix b/pkgs/applications/misc/neap/default.nix index 4104d35cf10c3..992a3c0248a0c 100644 --- a/pkgs/applications/misc/neap/default.nix +++ b/pkgs/applications/misc/neap/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Systray workspace pager"; - homepage = https://github.com/vzxwco/neap; + homepage = "https://github.com/vzxwco/neap"; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/misc/netsurf/browser/default.nix index c1ba5ba23b1e4..f2fdd01215d68 100644 --- a/pkgs/applications/misc/netsurf/browser/default.nix +++ b/pkgs/applications/misc/netsurf/browser/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "Free opensource web browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix index 0560b1d25b3e3..9d690546102ab 100644 --- a/pkgs/applications/misc/netsurf/buildsystem/default.nix +++ b/pkgs/applications/misc/netsurf/buildsystem/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "Build system for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/pkgs/applications/misc/netsurf/libcss/default.nix index ed0b7b12e9848..528b0d9b9585d 100644 --- a/pkgs/applications/misc/netsurf/libcss/default.nix +++ b/pkgs/applications/misc/netsurf/libcss/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE= "-Wno-error=implicit-fallthrough"; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "Cascading Style Sheets library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libdom/default.nix b/pkgs/applications/misc/netsurf/libdom/default.nix index de92219e7f979..8dde3e336cdb2 100644 --- a/pkgs/applications/misc/netsurf/libdom/default.nix +++ b/pkgs/applications/misc/netsurf/libdom/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "Document Object Model library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libhubbub/default.nix b/pkgs/applications/misc/netsurf/libhubbub/default.nix index 03ee66fc59876..7cfd0a935f3d4 100644 --- a/pkgs/applications/misc/netsurf/libhubbub/default.nix +++ b/pkgs/applications/misc/netsurf/libhubbub/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "HTML5 parser library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libnsbmp/default.nix b/pkgs/applications/misc/netsurf/libnsbmp/default.nix index b0fb18c89b1ab..a553eb3e7153d 100644 --- a/pkgs/applications/misc/netsurf/libnsbmp/default.nix +++ b/pkgs/applications/misc/netsurf/libnsbmp/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "BMP Decoder for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libnsfb/default.nix b/pkgs/applications/misc/netsurf/libnsfb/default.nix index 29b0a7867db2d..4e56ce7f5a126 100644 --- a/pkgs/applications/misc/netsurf/libnsfb/default.nix +++ b/pkgs/applications/misc/netsurf/libnsfb/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "CSS parser and selection library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libnsgif/default.nix b/pkgs/applications/misc/netsurf/libnsgif/default.nix index e826dee0d2529..8bb67df70da97 100644 --- a/pkgs/applications/misc/netsurf/libnsgif/default.nix +++ b/pkgs/applications/misc/netsurf/libnsgif/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "GIF Decoder for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libnslog/default.nix b/pkgs/applications/misc/netsurf/libnslog/default.nix index 497630c9aa65d..43b4622ab03a9 100644 --- a/pkgs/applications/misc/netsurf/libnslog/default.nix +++ b/pkgs/applications/misc/netsurf/libnslog/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "NetSurf Parametric Logging Library"; license = licenses.mit; maintainers = [ maintainers.samueldr ]; diff --git a/pkgs/applications/misc/netsurf/libnspsl/default.nix b/pkgs/applications/misc/netsurf/libnspsl/default.nix index f0abbdc049a9b..5ded38d974e0b 100644 --- a/pkgs/applications/misc/netsurf/libnspsl/default.nix +++ b/pkgs/applications/misc/netsurf/libnspsl/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "NetSurf Public Suffix List - Handling library"; license = licenses.mit; maintainers = [ maintainers.samueldr ]; diff --git a/pkgs/applications/misc/netsurf/libnsutils/default.nix b/pkgs/applications/misc/netsurf/libnsutils/default.nix index 3eaa882cb73d0..6d3a3d1f104fd 100644 --- a/pkgs/applications/misc/netsurf/libnsutils/default.nix +++ b/pkgs/applications/misc/netsurf/libnsutils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "Generalised utility library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libparserutils/default.nix b/pkgs/applications/misc/netsurf/libparserutils/default.nix index ea9d7c9ea8555..9fcd5cfebf6ef 100644 --- a/pkgs/applications/misc/netsurf/libparserutils/default.nix +++ b/pkgs/applications/misc/netsurf/libparserutils/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "Parser building library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libsvgtiny/default.nix b/pkgs/applications/misc/netsurf/libsvgtiny/default.nix index 9a4f922c2b6e6..b6e1b5a1667eb 100644 --- a/pkgs/applications/misc/netsurf/libsvgtiny/default.nix +++ b/pkgs/applications/misc/netsurf/libsvgtiny/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "NetSurf SVG decoder"; license = licenses.mit; maintainers = [ maintainers.samueldr ]; diff --git a/pkgs/applications/misc/netsurf/libutf8proc/default.nix b/pkgs/applications/misc/netsurf/libutf8proc/default.nix index 2144ccd330375..dcd56182e3208 100644 --- a/pkgs/applications/misc/netsurf/libutf8proc/default.nix +++ b/pkgs/applications/misc/netsurf/libutf8proc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "UTF8 Processing library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix index ad59b1be10e0e..f3c7bcbd1a0eb 100644 --- a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix +++ b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "String internment library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/nsgenbind/default.nix b/pkgs/applications/misc/netsurf/nsgenbind/default.nix index 88ac4f0c3eb9a..2dd4b830102a3 100644 --- a/pkgs/applications/misc/netsurf/nsgenbind/default.nix +++ b/pkgs/applications/misc/netsurf/nsgenbind/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "Generator for JavaScript bindings for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix index 31afed3061a36..05ef696f99b84 100644 --- a/pkgs/applications/misc/nix-tour/default.nix +++ b/pkgs/applications/misc/nix-tour/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "'the tour of nix' from nixcloud.io/tour as offline version"; - homepage = https://nixcloud.io/tour; + homepage = "https://nixcloud.io/tour"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ qknight ]; diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix index dec8b4ba0a7c3..92bb4ca220773 100644 --- a/pkgs/applications/misc/nixnote2/default.nix +++ b/pkgs/applications/misc/nixnote2/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "An unofficial client of Evernote"; - homepage = http://www.nixnote.org/; + homepage = "http://www.nixnote.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ htr ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index 67f0b4b392608..7adc777c00da2 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -4,17 +4,17 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "nnn"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "0kmfg61v3xnf8m4m9nna28sr7hdwqbxwivc7j91zhfj2wpdswywp"; + sha256 = "0wvn3jbxjcpdg9jzxkhx5dlc0zx2idky6mb75fpha8ww1jg7qf1g"; }; configFile = optionalString (conf != null) (builtins.toFile "nnn.h" conf); - preBuild = optionalString (conf != null) "cp ${configFile} nnn.h"; + preBuild = optionalString (conf != null) "cp ${configFile} src/nnn.h"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ readline ncurses ]; diff --git a/pkgs/applications/misc/noice/default.nix b/pkgs/applications/misc/noice/default.nix index 6cc5dc9066dc4..2be5a4ab83b93 100644 --- a/pkgs/applications/misc/noice/default.nix +++ b/pkgs/applications/misc/noice/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Small ncurses-based file browser"; - homepage = https://git.2f30.org/noice/; + homepage = "https://git.2f30.org/noice/"; license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix index 9a00959de020b..923f5fb4528ee 100644 --- a/pkgs/applications/misc/notable/default.nix +++ b/pkgs/applications/misc/notable/default.nix @@ -3,14 +3,24 @@ let pname = "notable"; version = "1.8.4"; -in -appimageTools.wrapType2 rec { + sha256 = "0rvz8zwsi62kiq89pv8n2wh9h5yb030kvdr1vf65xwqkhqcrzrby"; + name = "${pname}-${version}"; + src = fetchurl { url = "https://github.com/notable/notable/releases/download/v${version}/Notable-${version}.AppImage"; - sha256 = "0rvz8zwsi62kiq89pv8n2wh9h5yb030kvdr1vf65xwqkhqcrzrby"; + inherit sha256; + }; + + appimageContents = appimageTools.extract { + inherit name src; }; +in +appimageTools.wrapType2 rec { + + inherit name src; + profile = '' export LC_ALL=C.UTF-8 export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS @@ -18,7 +28,14 @@ appimageTools.wrapType2 rec { multiPkgs = null; # no 32bit needed extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.at-spi2-atk p.at-spi2-core ]; - extraInstallCommands = "mv $out/bin/{${name},${pname}}"; + extraInstallCommands = '' + mv $out/bin/{${name},${pname}} + install -m 444 -D ${appimageContents}/notable.desktop $out/share/applications/notable.desktop + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/1024x1024/apps/notable.png \ + $out/share/icons/hicolor/1024x1024/apps/notable.png + substituteInPlace $out/share/applications/notable.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; meta = with lib; { description = "The markdown-based note-taking app that doesn't suck"; diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 1c02441474c00..3498ef2786753 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "notejot"; - version = "1.6.0"; + version = "1.6.3"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "1b65m9gvq8ziqqgnw3vgjpjb1qw7bww40ngd3gardsjg9lcwpxaf"; + sha256 = "170dzgd6cnf2k3hfifjysmdggpskx6v1pjmblqgbwaj2d3snf3h8"; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stupidly-simple sticky notes applet"; - homepage = https://github.com/lainsce/notejot; + homepage = "https://github.com/lainsce/notejot"; license = licenses.gpl2Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index d75ec9ef2c253..36fa888e88843 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Daemon that displays passive pop-up notifications"; - homepage = https://launchpad.net/notify-osd; + homepage = "https://launchpad.net/notify-osd"; license = licenses.gpl3; maintainers = [ maintainers.imalison ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index 484ff62e9e685..e2bff00311860 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Daemon that displays passive pop-up notifications"; - homepage = https://launchpad.net/notify-osd; + homepage = "https://launchpad.net/notify-osd"; license = licenses.gpl3; maintainers = [ maintainers.bodil ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/applications/misc/nrsc5/default.nix index 3ad8377684218..ada603cba9631 100644 --- a/pkgs/applications/misc/nrsc5/default.nix +++ b/pkgs/applications/misc/nrsc5/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DUSE_COLOR=ON" "-DUSE_FAAD2=ON" ]; meta = with stdenv.lib; { - homepage = https://github.com/theori-io/nrsc5; + homepage = "https://github.com/theori-io/nrsc5"; description = "HD-Radio decoder for RTL-SDR"; platforms = stdenv.lib.platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 8b0cab3158889..8f188818d4f71 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi +{ stdenv, fetchurl, pkgconfig, neon, libusb-compat-0_1, openssl, udev, avahi, freeipmi , libtool, makeWrapper, autoreconfHook, fetchpatch }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ neon libusb openssl udev avahi freeipmi ]; + buildInputs = [ neon libusb-compat-0_1 openssl udev avahi freeipmi ]; nativeBuildInputs = [ autoreconfHook libtool pkgconfig makeWrapper ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \ - "$out/lib:${neon}/lib:${libusb.out}/lib:${avahi}/lib:${freeipmi}/lib" + "$out/lib:${neon}/lib:${libusb-compat-0_1.out}/lib:${avahi}/lib:${freeipmi}/lib" ''; meta = with stdenv.lib; { @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { interface for monitoring and administering UPS, PDU and SCD hardware. It uses a layered approach to connect all of the parts. ''; - homepage = https://networkupstools.org/; - repositories.git = https://github.com/networkupstools/nut.git; + homepage = "https://networkupstools.org/"; + repositories.git = "https://github.com/networkupstools/nut.git"; platforms = platforms.linux; maintainers = [ maintainers.pierron ]; license = with licenses; [ gpl1Plus gpl2Plus gpl3Plus ]; diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index a604349afb010..ef371dc59fff9 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -52,7 +52,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Open source document analysis and OCR system"; license = licenses.asl20; - homepage = https://github.com/tmbdev/ocropy/; + homepage = "https://github.com/tmbdev/ocropy/"; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 29a04627bef40..3c192c124cbec 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -1,5 +1,7 @@ -{ stdenv, lib, fetchFromGitHub, python2 }: - +{ pkgs, stdenv, lib, fetchFromGitHub, python3 +# To include additional plugins, pass them here as an overlay. +, packageOverrides ? self: super: {} +}: let mkOverride = attrname: version: sha256: self: super: { @@ -11,17 +13,19 @@ let }); }; - py = python2.override { + py = python3.override { + self = py; packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ - (mkOverride "flask" "0.10.1" "0wrkavjdjndknhp8ya8j850jq7a1cli4g5a93mg8nh1xz2gq50sc") - (mkOverride "flask_login" "0.2.11" "1rg3rsjs1gwi2pw6vr9jmhaqm9b3vc9c4hfcsvp4y8agbh7g3mc3") + (mkOverride "flask" "0.12.5" "fac2b9d443e49f7e7358a444a3db5950bdd0324674d92ba67f8f1f15f876b14f") + (mkOverride "flaskbabel" "0.12.2" "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii") (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d") + (mkOverride "psutil" "5.6.7" "ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa") # Octoprint holds back jinja2 to 2.8.1 due to breaking changes. # This old version does not have updated test config for pytest 4, # and pypi tarball doesn't contain tests dir anyways. - (pself: psuper: { - jinja2 = psuper.jinja2.overridePythonAttrs (oldAttrs: rec { + (self: super: { + jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec { version = "2.8.1"; src = oldAttrs.src.override { inherit version; @@ -29,74 +33,75 @@ let }; doCheck = false; }); + + httpretty = super.httpretty.overridePythonAttrs (oldAttrs: rec { + doCheck = false; + }); + + celery = super.celery.overridePythonAttrs (oldAttrs: rec { + doCheck = false; + }); }) - ]); - }; + (self: super: { + octoprint = self.buildPythonPackage rec { + pname = "OctoPrint"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "foosel"; + repo = "OctoPrint"; + rev = version; + sha256 = "0387228544v28d69dcdg2zr5gp6qavkfr6dydpjgj5awxv3w25d5"; + }; - ignoreVersionConstraints = [ - "Click" - "Flask-Assets" - "Flask-Babel" - "Flask-Principal" - "emoji" - "flask" - "future" - "futures" - "monotonic" - "markdown" - "pkginfo" - "psutil" - "pyserial" - "requests" - "rsa" - "sarge" - "scandir" - "semantic_version" - "watchdog" - "websocket-client" - "wrapt" - "sentry-sdk" - "werkzeug" # 0.16 just deprecates some stuff - ]; + propagatedBuildInputs = with super; [ + awesome-slugify flask flask_assets rsa requests pkginfo watchdog + semantic-version werkzeug flaskbabel tornado + psutil pyserial flask_login netaddr markdown + pylru pyyaml sarge feedparser netifaces click websocket_client + scandir chainmap future wrapt monotonic emoji jinja2 + frozendict cachelib sentry-sdk filetype markupsafe + ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ]; -in py.pkgs.buildPythonApplication rec { - pname = "OctoPrint"; - version = "1.3.12"; + checkInputs = with super; [ pytestCheckHook mock ddt ]; - src = fetchFromGitHub { - owner = "foosel"; - repo = "OctoPrint"; - rev = version; - sha256 = "1lmqssgwjyhknjf3x58g7cr0fqz7fs5a3rl07r69wfpch63ranyd"; - }; + postPatch = let + ignoreVersionConstraints = [ + "sentry-sdk" + ]; + in '' + sed -r -i \ + ${lib.concatStringsSep "\n" (map (e: + ''-e 's@${e}[<>=]+.*@${e}",@g' \'' + ) ignoreVersionConstraints)} + setup.py + ''; - propagatedBuildInputs = with py.pkgs; [ - awesome-slugify flask_assets rsa requests pkginfo watchdog - semantic-version flask_principal werkzeug flaskbabel tornado - psutil pyserial flask_login netaddr markdown sockjs-tornado - pylru pyyaml sarge feedparser netifaces click websocket_client - scandir chainmap future futures wrapt monotonic emoji - frozendict cachelib sentry-sdk typing filetype - ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ]; + dontUseSetuptoolsCheck = true; - checkInputs = with py.pkgs; [ nose mock ddt ]; + preCheck = '' + export HOME=$(mktemp -d) + rm pytest.ini + ''; - postPatch = '' - sed -r -i \ - ${lib.concatStringsSep "\n" (map (e: - ''-e 's@${e}[<>=]+.*@${e}",@g' \'' - ) ignoreVersionConstraints)} - setup.py - ''; + disabledTests = [ + "test_check_setup" # Why should it be able to call pip? + ] ++ lib.optionals stdenv.isDarwin [ + "test_set_external_modification" + ]; - checkPhase = '' - HOME=$(mktemp -d) nosetests ${lib.optionalString stdenv.isDarwin "--exclude=test_set_external_modification"} - ''; + passthru.python = self.python; - meta = with stdenv.lib; { - homepage = https://octoprint.org/; - description = "The snappy web interface for your 3D printer"; - license = licenses.agpl3; - maintainers = with maintainers; [ abbradar gebner ]; + meta = with stdenv.lib; { + homepage = "https://octoprint.org/"; + description = "The snappy web interface for your 3D printer"; + license = licenses.agpl3; + maintainers = with maintainers; [ abbradar gebner WhittlesJr ]; + }; + }; + }) + (import ./plugins.nix {inherit pkgs;}) + packageOverrides + ]); }; -} +in with py.pkgs; toPythonApplication octoprint diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 10c4f2f844809..b5d52f5e5f895 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -1,255 +1,255 @@ -{ stdenv, fetchgit, fetchFromGitHub, octoprint, python2Packages, marlin-calc }: +{ pkgs }: -let - buildPlugin = args: python2Packages.buildPythonPackage (args // { +with pkgs; + +self: super: let + buildPlugin = args: self.buildPythonPackage (args // { pname = "OctoPrintPlugin-${args.pname}"; inherit (args) version; - propagatedBuildInputs = (args.propagatedBuildInputs or []) ++ [ octoprint ]; + propagatedBuildInputs = (args.propagatedBuildInputs or []) ++ [ super.octoprint ]; # none of the following have tests doCheck = false; }); +in { + inherit buildPlugin; + + # Deprecated alias + m3d-fio = self.m33-fio; # added 2016-08-13 + + m33-fio = buildPlugin rec { + pname = "M33-Fio"; + version = "1.21"; + + src = fetchFromGitHub { + owner = "donovan6000"; + repo = "M33-Fio"; + rev = "V${version}"; + sha256 = "1la3611kkqn8yiwjn6cizc45ri8pnk6ckld1na4nk6mqk88jvjq7"; + }; + + patches = [ + ./m33-fio-one-library.patch + ]; + + postPatch = '' + rm -rf octoprint_m33fio/static/libraries/* + ( + cd 'shared library source' + make + ) + ''; + + meta = with stdenv.lib; { + description = "OctoPrint plugin for the Micro 3D printer"; + homepage = "https://github.com/donovan6000/M33-Fio"; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; + }; + + mqtt = buildPlugin rec { + pname = "MQTT"; + version = "0.8.6"; + + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-MQTT"; + rev = version; + sha256 = "0y1jnfplcy8mh3szrfbbvngl02j49cbdizglrfsry4fvqg50zjxd"; + }; + + propagatedBuildInputs = with super; [ paho-mqtt ]; + + meta = with stdenv.lib; { + description = "Publish printer status MQTT"; + homepage = "https://github.com/OctoPrint/OctoPrint-MQTT"; + license = licenses.agpl3; + maintainers = with maintainers; [ peterhoeg ]; + }; + }; + + titlestatus = buildPlugin rec { + pname = "TitleStatus"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "MoonshineSG"; + repo = "OctoPrint-TitleStatus"; + rev = version; + sha256 = "1l78xrabn5hcly2mgxwi17nwgnp2s6jxi9iy4wnw8k8icv74ag7k"; + }; + + meta = with stdenv.lib; { + description = "Show printers status in window title"; + homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus"; + license = licenses.agpl3; + maintainers = with maintainers; [ abbradar ]; + }; + }; + + stlviewer = buildPlugin rec { + pname = "STLViewer"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "jneilliii"; + repo = "OctoPrint-STLViewer"; + rev = version; + sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b"; + }; + + meta = with stdenv.lib; { + description = "A simple stl viewer tab for OctoPrint"; + homepage = "https://github.com/jneilliii/Octoprint-STLViewer"; + license = licenses.agpl3; + maintainers = with maintainers; [ abbradar ]; + }; + }; + + curaenginelegacy = buildPlugin rec { + pname = "CuraEngineLegacy"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "1cdb276wfyf3wcfj5g3migd6b6aqmkrxncrqjfcfx4j4k3xac965"; + }; + + meta = with stdenv.lib; { + description = "Plugin for slicing via Cura Legacy from within OctoPrint"; + homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; + }; + }; - self = { - - # Deprecated alias - m3d-fio = self.m33-fio; # added 2016-08-13 - - m33-fio = buildPlugin rec { - pname = "M33-Fio"; - version = "1.21"; - - src = fetchFromGitHub { - owner = "donovan6000"; - repo = "M33-Fio"; - rev = "V${version}"; - sha256 = "1la3611kkqn8yiwjn6cizc45ri8pnk6ckld1na4nk6mqk88jvjq7"; - }; - - patches = [ - ./m33-fio-one-library.patch - ]; - - postPatch = '' - rm -rf octoprint_m33fio/static/libraries/* - ( - cd 'shared library source' - make - ) - ''; - - meta = with stdenv.lib; { - description = "OctoPrint plugin for the Micro 3D printer"; - homepage = https://github.com/donovan6000/M33-Fio; - license = licenses.gpl3; - maintainers = with maintainers; [ abbradar ]; - }; - }; - - mqtt = buildPlugin rec { - pname = "MQTT"; - version = "0.8.6"; - - src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint-MQTT"; - rev = version; - sha256 = "0y1jnfplcy8mh3szrfbbvngl02j49cbdizglrfsry4fvqg50zjxd"; - }; - - propagatedBuildInputs = with python2Packages; [ paho-mqtt ]; - - meta = with stdenv.lib; { - description = "Publish printer status MQTT"; - homepage = https://github.com/OctoPrint/OctoPrint-MQTT; - license = licenses.agpl3; - maintainers = with maintainers; [ peterhoeg ]; - }; - }; - - titlestatus = buildPlugin rec { - pname = "TitleStatus"; - version = "0.0.4"; - - src = fetchFromGitHub { - owner = "MoonshineSG"; - repo = "OctoPrint-TitleStatus"; - rev = version; - sha256 = "1l78xrabn5hcly2mgxwi17nwgnp2s6jxi9iy4wnw8k8icv74ag7k"; - }; - - meta = with stdenv.lib; { - description = "Show printers status in window title"; - homepage = https://github.com/MoonshineSG/OctoPrint-TitleStatus; - license = licenses.agpl3; - maintainers = with maintainers; [ abbradar ]; - }; - }; - - stlviewer = buildPlugin rec { - pname = "STLViewer"; - version = "0.4.2"; - - src = fetchFromGitHub { - owner = "jneilliii"; - repo = "OctoPrint-STLViewer"; - rev = version; - sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b"; - }; - - meta = with stdenv.lib; { - description = "A simple stl viewer tab for OctoPrint"; - homepage = https://github.com/jneilliii/Octoprint-STLViewer; - license = licenses.agpl3; - maintainers = with maintainers; [ abbradar ]; - }; - }; - - curaenginelegacy = buildPlugin rec { - pname = "CuraEngineLegacy"; - version = "1.0.2"; - - src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "1cdb276wfyf3wcfj5g3migd6b6aqmkrxncrqjfcfx4j4k3xac965"; - }; - - meta = with stdenv.lib; { - description = "Plugin for slicing via Cura Legacy from within OctoPrint"; - homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy"; - license = licenses.agpl3; - maintainers = with maintainers; [ gebner ]; - }; - }; - - touchui = buildPlugin rec { - pname = "TouchUI"; - version = "0.3.13"; - - src = fetchFromGitHub { - owner = "BillyBlaze"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "0qk12ysabdzy6cna3l4f8v3qcnppppwxxsjx2i0xn1nd0cv6yzwh"; - }; - - meta = with stdenv.lib; { - description = "Touch friendly interface for a small TFT module or phone for OctoPrint"; - homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI"; - license = licenses.agpl3; - maintainers = with maintainers; [ gebner ]; - }; - }; - - psucontrol = buildPlugin rec { - pname = "PSUControl"; - version = "0.1.8"; - - src = fetchFromGitHub { - owner = "kantlivelong"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "0aj38d7b7d5pzmzq841pip18cpg18wy2vrxq2nd13875597y54b8"; - }; - - preConfigure = '' - # optional; RPi.GPIO is broken on vanilla kernels - sed /RPi.GPIO/d -i requirements.txt - ''; - - meta = with stdenv.lib; { - description = "OctoPrint plugin to control ATX/AUX power supply"; - homepage = "https://github.com/kantlivelong/OctoPrint-PSUControl"; - license = licenses.agpl3; - maintainers = with maintainers; [ gebner ]; - }; - }; - - printtimegenius = buildPlugin rec { - pname = "PrintTimeGenius"; - version = "2.2.1"; - - src = fetchFromGitHub { - owner = "eyal0"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "1dr93vbpxgxw3b1q4rwam8f4dmiwr5vnfr9796g6jx8xkpfzzy1h"; - }; - - preConfigure = '' - # PrintTimeGenius ships with marlin-calc binaries for multiple architectures - rm */analyzers/marlin-calc* - sed 's@"{}.{}".format(binary_base_name, machine)@"${marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py - ''; - - patches = [ - ./printtimegenius-logging.patch - ]; - - meta = with stdenv.lib; { - description = "Better print time estimation for OctoPrint"; - homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius"; - license = licenses.agpl3; - maintainers = with maintainers; [ gebner ]; - }; - }; - - abl-expert = buildPlugin rec { - pname = "ABL_Expert"; - version = "2019-12-21"; - - src = fetchgit { - url = "https://framagit.org/razer/Octoprint_ABL_Expert/"; - rev = "f11fbe05088ad618bfd9d064ac3881faec223f33"; - sha256 = "026r4prkyvwzxag5pv36455q7s3gaig37nmr2nbvhwq3d2lbi5s4"; - }; - - meta = with stdenv.lib; { - description = "Marlin auto bed leveling control, mesh correction, and z probe handling"; - homepage = "https://framagit.org/razer/Octoprint_ABL_Expert/"; - license = licenses.agpl3; - maintainers = with maintainers; [ WhittlesJr ]; - }; - }; - - gcodeeditor = buildPlugin rec { - pname = "GcodeEditor"; - version = "0.2.6"; - - src = fetchFromGitHub { - owner = "ieatacid"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "0c6p78r3vd6ys3kld308pyln09zjbr9yif1ljvcx6wlml2i5l1vh"; - }; - - meta = with stdenv.lib; { - description = "Edit gcode on OctoPrint"; - homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop"; - license = licenses.agpl3; - maintainers = with maintainers; [ WhittlesJr ]; - }; - }; - - simpleemergencystop = buildPlugin rec { - pname = "SimpleEmergencyStop"; - version = "0.2.5"; - - src = fetchFromGitHub { - owner = "Sebclem"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "10wadv09wv2h96igvq3byw9hz1si82n3c7v5y0ii3j7hm2d06y8p"; - }; - - meta = with stdenv.lib; { - description = "A simple plugin that add an emergency stop buton on NavBar of OctoPrint"; - homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; - license = licenses.agpl3; - maintainers = with maintainers; [ WhittlesJr ]; - }; + touchui = buildPlugin rec { + pname = "TouchUI"; + version = "0.3.14"; + + src = fetchFromGitHub { + owner = "BillyBlaze"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "033b9nk3kpnmjw9nggcaxy39hcgfviykcy2cx0j6m411agvmqbzf"; + }; + + meta = with stdenv.lib; { + description = "Touch friendly interface for a small TFT module or phone for OctoPrint"; + homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; }; }; -in self + psucontrol = buildPlugin rec { + pname = "PSUControl"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "kantlivelong"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "1cn009bdgn6c9ba9an5wfj8z02wi0xcsmbhkqggiqlnqy1fq45ca"; + }; + + preConfigure = '' + # optional; RPi.GPIO is broken on vanilla kernels + sed /RPi.GPIO/d -i requirements.txt + ''; + + meta = with stdenv.lib; { + description = "OctoPrint plugin to control ATX/AUX power supply"; + homepage = "https://github.com/kantlivelong/OctoPrint-PSUControl"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; + }; + }; + + printtimegenius = buildPlugin rec { + pname = "PrintTimeGenius"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "eyal0"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "1dr93vbpxgxw3b1q4rwam8f4dmiwr5vnfr9796g6jx8xkpfzzy1h"; + }; + + preConfigure = '' + # PrintTimeGenius ships with marlin-calc binaries for multiple architectures + rm */analyzers/marlin-calc* + sed 's@"{}.{}".format(binary_base_name, machine)@"${pkgs.marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py + ''; + + patches = [ + ./printtimegenius-logging.patch + ]; + + meta = with stdenv.lib; { + description = "Better print time estimation for OctoPrint"; + homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; + }; + }; + + abl-expert = buildPlugin rec { + pname = "ABL_Expert"; + version = "2019-12-21"; + + src = fetchgit { + url = "https://framagit.org/razer/Octoprint_ABL_Expert/"; + rev = "f11fbe05088ad618bfd9d064ac3881faec223f33"; + sha256 = "026r4prkyvwzxag5pv36455q7s3gaig37nmr2nbvhwq3d2lbi5s4"; + }; + + meta = with stdenv.lib; { + description = "Marlin auto bed leveling control, mesh correction, and z probe handling"; + homepage = "https://framagit.org/razer/Octoprint_ABL_Expert/"; + license = licenses.agpl3; + maintainers = with maintainers; [ WhittlesJr ]; + }; + }; + + gcodeeditor = buildPlugin rec { + pname = "GcodeEditor"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "ieatacid"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "0c6p78r3vd6ys3kld308pyln09zjbr9yif1ljvcx6wlml2i5l1vh"; + }; + + meta = with stdenv.lib; { + description = "Edit gcode on OctoPrint"; + homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; + license = licenses.agpl3; + maintainers = with maintainers; [ WhittlesJr ]; + }; + }; + + simpleemergencystop = buildPlugin rec { + pname = "SimpleEmergencyStop"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = "Sebclem"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "10wadv09wv2h96igvq3byw9hz1si82n3c7v5y0ii3j7hm2d06y8p"; + }; + + meta = with stdenv.lib; { + description = "A simple plugin that add an emergency stop buton on NavBar of OctoPrint"; + homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop"; + license = licenses.agpl3; + maintainers = with maintainers; [ WhittlesJr ]; + }; + }; +} diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix index 27d7ad8730b6a..47536cc9f6a48 100644 --- a/pkgs/applications/misc/omegat.nix +++ b/pkgs/applications/misc/omegat.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "omegat"; src = fetchurl { # their zip has repeated files or something, so no fetchzip - url = mirror://sourceforge/project/omegat/OmegaT%20-%20Standard/OmegaT%204.3.0/OmegaT_4.3.0_Without_JRE.zip; + url = "mirror://sourceforge/project/omegat/OmegaT%20-%20Standard/OmegaT%204.3.0/OmegaT_4.3.0_Without_JRE.zip"; sha256 = "0axz7r30p34z5hgvdglznc82g7yvm3g56dv5190jixskx6ba58rs"; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation { tool with fuzzy matching, translation memory, keyword search, glossaries, and translation leveraging into updated projects. ''; - homepage = http://www.omegat.org/; + homepage = "http://www.omegat.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ t184256 ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index 1e578cde512a7..e427519d4d6e2 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -173,7 +173,7 @@ python3.pkgs.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://launchpad.net/onboard; + homepage = "https://launchpad.net/onboard"; description = "Onscreen keyboard useful for tablet PC users and for mobility impaired users"; maintainers = with maintainers; [ johnramsden ]; license = licenses.gpl3; diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix index 8f7f74f712321..e585701032403 100644 --- a/pkgs/applications/misc/openbox-menu/default.nix +++ b/pkgs/applications/misc/openbox-menu/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installPhase = "make install prefix=$out"; meta = { - homepage = http://fabrice.thiroux.free.fr/openbox-menu_en.html; + homepage = "http://fabrice.thiroux.free.fr/openbox-menu_en.html"; description = "Dynamic XDG menu generator for Openbox"; longDescription = '' Openbox-menu is a pipemenu for Openbox window manager. It provides a diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index e943263600cda..8e990b6dffba5 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU, libGL }: +{ mkDerivation, stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU, libGL }: -stdenv.mkDerivation { +mkDerivation { name = "openbrf-unstable-2016-01-09"; src = fetchFromGitHub { @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A tool to edit resource files (BRF)"; - homepage = https://github.com/cfcohen/openbrf; + homepage = "https://github.com/cfcohen/openbrf"; maintainers = with stdenv.lib.maintainers; [ abbradar ]; license = licenses.free; platforms = platforms.linux; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 375552aaa33a4..f5a88cbaee172 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.kragniz ]; platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; - homepage = https://opencpn.org/; + homepage = "https://opencpn.org/"; }; } diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index c98defee57a09..e537180686cd6 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "openjump-1.3.1"; src = fetchurl { - url = mirror://sourceforge/jump-pilot/OpenJUMP/1.3.1/openjump-1.3.1.zip; + url = "mirror://sourceforge/jump-pilot/OpenJUMP/1.3.1/openjump-1.3.1.zip"; sha256 = "0y4z53yx0x7rp3c8rnj028ni3gr47r35apgcpqp3jl7r2di6zgqm"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = { description = "Open source Geographic Information System (GIS) written in the Java programming language"; - homepage = http://www.openjump.org/index.html; + homepage = "http://www.openjump.org/index.html"; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index c19e71e10ddbf..0ca4f11e548b5 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.36.1"; + version = "3.36.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07w3k0f791zd1pj9j6d27k7gk7c6hx112ngrdz18h573df5n9b61"; + sha256 = "0hxz8wlyjn6w3zqg1p56pwdj0p23d6vynzczklyc6n91dyvma06g"; }; patches = [ @@ -110,7 +110,7 @@ buildPythonApplication rec { Needs `services.gnome3.at-spi2-core.enable = true;` in `configuration.nix`. ''; - maintainers = with maintainers; [ berce ] ++ gnome3.maintainers; + maintainers = with maintainers; [ berce ] ++ teams.gnome.members; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix index e404da974c46f..d869b09395580 100644 --- a/pkgs/applications/misc/orpie/default.nix +++ b/pkgs/applications/misc/orpie/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses gsl ] ++ (with ocamlPackages; [ ocaml camlp4 ]); meta = { - homepage = https://github.com/pelzlpj/orpie; + homepage = "https://github.com/pelzlpj/orpie"; description = "A fullscreen RPN calculator for the console"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix index c03e57920da9d..b0f1f48d9aea3 100644 --- a/pkgs/applications/misc/osmctools/default.nix +++ b/pkgs/applications/misc/osmctools/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command line tools for transforming Open Street Map files"; homepage = [ - https://wiki.openstreetmap.org/wiki/osmconvert - https://wiki.openstreetmap.org/wiki/osmfilter - https://wiki.openstreetmap.org/wiki/osmupdate + "https://wiki.openstreetmap.org/wiki/osmconvert" + "https://wiki.openstreetmap.org/wiki/osmfilter" + "https://wiki.openstreetmap.org/wiki/osmupdate" ]; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix index 82144e9689f84..c0d20c14f7ced 100644 --- a/pkgs/applications/misc/osmium-tool/default.nix +++ b/pkgs/applications/misc/osmium-tool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "osmium-tool"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "199dvajik5d56nybk2061vdjyxwakngfd7frxj99wr2vsrp4aw2b"; + sha256 = "18afn5qzdjpip176kk5pr04mj0p7dv70dbz1n36qmqnq3gyms10q"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix index 7603a66cd3624..29dc6f54e6c25 100644 --- a/pkgs/applications/misc/overmind/default.nix +++ b/pkgs/applications/misc/overmind/default.nix @@ -8,7 +8,7 @@ buildGoPackage rec { nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram "$bin/bin/overmind" --prefix PATH : "${lib.makeBinPath [ tmux which ]}" + wrapProgram "$out/bin/overmind" --prefix PATH : "${lib.makeBinPath [ tmux which ]}" ''; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index c6cd118aea80a..202e7a2de95f8 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = optional withGtk3 "--with-gtk=3"; meta = with stdenv.lib; { - homepage = https://blog.lxde.org/category/pcmanfm/; + homepage = "https://blog.lxde.org/category/pcmanfm/"; license = licenses.gpl2Plus; description = "File manager with GTK interface"; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index 17253173a5e4f..6c3241d629b8f 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://pcman.ptt.cc; + homepage = "https://pcman.ptt.cc"; license = licenses.gpl2; description = "Telnet BBS browser with GTK interface"; maintainers = [ maintainers.sifmelcara ]; diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index 9756d9b42b0a2..d364074d4450e 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication { ''; meta = with stdenv.lib; { - homepage = https://github.com/linuxerwang/pdf-quench; + homepage = "https://github.com/linuxerwang/pdf-quench"; description = "A visual tool for cropping pdf files"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index ed54ccbb0a15c..c43ae1de9a1ef 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.3.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "jeromerobert"; repo = pname; rev = version; - sha256 = "1f8m8r81322i97wkqpmf7a4kiwnq244n6cnbldh03jc49vwq2kxx"; + sha256 = "0a9ap7p8iw57sn5nmhim7gp5as8gj6ir6l3p0bpmg4iqjsr4169h"; }; nativeBuildInputs = [ @@ -26,7 +26,8 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ pygobject3 - pypdf2 + pikepdf + setuptools ]; # incompatible with wrapGAppsHook diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/applications/misc/pdfdiff/default.nix index ee54904bfd66e..93ca8c6447983 100644 --- a/pkgs/applications/misc/pdfdiff/default.nix +++ b/pkgs/applications/misc/pdfdiff/default.nix @@ -33,7 +33,7 @@ py.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://www.cs.ox.ac.uk/people/cas.cremers/misc/pdfdiff.html; + homepage = "http://www.cs.ox.ac.uk/people/cas.cremers/misc/pdfdiff.html"; description = "Tool to view the difference between two PDF or PS files"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index fa500989cac92..d8203b9e7b5dc 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A presenter console with multi-monitor support for PDF files"; - homepage = https://pdfpc.github.io/; + homepage = "https://pdfpc.github.io/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index abf49f9368459..d189235278513 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "1k1azxz92vkb4hylk4ki0szfn47ids0lwg01zfs54yc89j0c6142"; + sha256 = "1rhv6mf6pr9aaa8516i3b7v6h622qb1p8c4jsy3j0s5wrdry5l9l"; }; unpackPhase = '' diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/applications/misc/pell/default.nix index fc4e5229c9c01..ae96ce6925e3d 100644 --- a/pkgs/applications/misc/pell/default.nix +++ b/pkgs/applications/misc/pell/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ebzzry/pell; + homepage = "https://github.com/ebzzry/pell"; description = "A simple host availability monitor"; license = licenses.mit; maintainers = [ maintainers.ebzzry ]; diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix index ae81ef3c9f6c2..5a1e5ba65dedd 100644 --- a/pkgs/applications/misc/perkeep/default.nix +++ b/pkgs/applications/misc/perkeep/default.nix @@ -13,13 +13,13 @@ let in buildGoPackage rec { name = "perkeep-${version}"; - version = "unstable-2019-07-29"; + version = "unstable-2020-03-23"; src = fetchFromGitHub { owner = "perkeep"; repo = "perkeep"; - rev = "c9f78d02adf9740f3b8d403a1418554293cc9f41"; - sha256 = "11rin94pjzg0kvizrq9ss42fjw7wfwx3g1pk8zdlhyfkiwwh2rmg"; + rev = "c2e31370ddefd86b6112a5d891100ea3382a4254"; + sha256 = "0jf02k20ms7h60wglcq6dj3vqi9rlfww7db5iplgwznbij70c1i4"; }; goPackagePath = "perkeep.org"; @@ -43,7 +43,7 @@ in buildGoPackage rec { meta = with lib; { description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)"; - homepage = https://perkeep.org; + homepage = "https://perkeep.org"; license = licenses.asl20; maintainers = with maintainers; [ cstrahan kalbasit ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 86e10ae0943ea..5fc0703e011b5 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PostgreSQL administration GUI tool"; - homepage = https://www.pgadmin.org; + homepage = "https://www.pgadmin.org"; license = licenses.gpl2; maintainers = with maintainers; [ domenkozar wmertens ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index 241d5786468e2..68f29cb9b9ace 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { PostgreSQL interface can hope to be. (Note: pgManage replaces Postage, which is no longer maintained.) ''; - homepage = https://github.com/pgManage/pgManage; + homepage = "https://github.com/pgManage/pgManage"; license = licenses.postgresql; maintainers = [ maintainers.basvandijk ]; }; diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 83e45e2558175..7532c6e9bc915 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -24,9 +24,9 @@ mkDerivation rec { meta = with stdenv.lib; { description = "A database modeling tool for PostgreSQL"; longDescription = ''pgModeler (PostgreSQL Database Modeler) is an open source database modeling tool designed for PostgreSQL.''; - homepage = https://pgmodeler.io/; + homepage = "https://pgmodeler.io/"; license = licenses.gpl3; maintainers = [ maintainers.esclear ]; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix index 6fb70f1c9a267..017383a79a2d2 100644 --- a/pkgs/applications/misc/phwmon/default.nix +++ b/pkgs/applications/misc/phwmon/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://gitlab.com/o9000/phwmon; + homepage = "https://gitlab.com/o9000/phwmon"; description = "Hardware monitor (CPU, memory, network and disk I/O) for the system tray"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 48188574ad4be..e3b7c48d2b4b6 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -9,7 +9,7 @@ , imagemagick , netcat-gnu , p7zip -, python2Packages +, python2 , unzip , wget , wine @@ -27,25 +27,25 @@ let version = "4.3.4"; - binpath = stdenv.lib.makeBinPath - [ cabextract - python2Packages.python - gettext - glxinfo - gnupg - icoutils - imagemagick - netcat-gnu - p7zip - unzip - wget - wine - xdg-user-dirs - xterm - which - curl - jq - ]; + binpath = stdenv.lib.makeBinPath [ + cabextract + python + gettext + glxinfo + gnupg + icoutils + imagemagick + netcat-gnu + p7zip + unzip + wget + wine + xdg-user-dirs + xterm + which + curl + jq + ]; ld32 = if stdenv.hostPlatform.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" @@ -54,6 +54,11 @@ let ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ]; + python = python2.withPackages(ps: with ps; [ + wxPython + setuptools + ]); + in stdenv.mkDerivation { pname = "playonlinux"; inherit version; @@ -65,15 +70,13 @@ in stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - buildInputs = - [ python2Packages.python - python2Packages.wxPython - python2Packages.setuptools - xorg.libX11 - libGL - ]; + buildInputs = [ + xorg.libX11 + libGL + python + ]; - patchPhase = '' + postPatch = '' patchShebangs python tests/python sed -i "s/ %F//g" etc/PlayOnLinux.desktop ''; @@ -85,7 +88,6 @@ in stdenv.mkDerivation { install -D -m644 etc/PlayOnLinux.desktop $out/share/applications/playonlinux.desktop makeWrapper $out/share/playonlinux/playonlinux $out/bin/playonlinux \ - --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \ --prefix PATH : ${binpath} bunzip2 $out/share/playonlinux/bin/check_dd_x86.bz2 @@ -103,7 +105,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "GUI for managing Windows programs under linux"; - homepage = https://www.playonlinux.com/; + homepage = "https://www.playonlinux.com/"; license = licenses.gpl3; maintainers = [ maintainers.a1russell ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index 8413f8c8f1023..fc86b2e885de3 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://getpolarized.io/; + homepage = "https://getpolarized.io/"; description = "Personal knowledge repository for PDF and web content supporting incremental reading and document annotation"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 1fc0162f8d083..a793ee8872430 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -26,13 +26,13 @@ assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; stdenv.mkDerivation rec { pname = "polybar"; - version = "3.4.2"; + version = "3.4.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1ss4wzy68dpqr5a4m090nn36v8wsp4a7pj6whcxxdrrimgww5r88"; + sha256 = "0fsfh3xv0c0hz10xqzvd01c0p0wvzcnanbyczi45zhaxfrisb39w"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix index 7209ee3e40090..674570ec3dd78 100644 --- a/pkgs/applications/misc/posterazor/default.nix +++ b/pkgs/applications/misc/posterazor/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://posterazor.sourceforge.net/; + homepage = "http://posterazor.sourceforge.net/"; description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster"; maintainers = [ maintainers.madjar ]; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix index 34144e35bd5ab..cadd98c742602 100644 --- a/pkgs/applications/misc/printrun/default.nix +++ b/pkgs/applications/misc/printrun/default.nix @@ -30,7 +30,7 @@ python27Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Pronterface, Pronsole, and Printcore - Pure Python 3d printing host software"; - homepage = https://github.com/kliment/Printrun; + homepage = "https://github.com/kliment/Printrun"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index cd3a46ab09ba8..1e6c558defbe0 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { patches = [ ./CVE-2014-3618.patch (fetchurl { - url = https://sources.debian.org/data/main/p/procmail/3.22-26/debian/patches/30; + url = "https://sources.debian.org/data/main/p/procmail/3.22-26/debian/patches/30"; sha256 = "11zmz1bj0v9pay3ldmyyg7473b80h89gycrhndsgg9q50yhcqaaq"; name = "CVE-2017-16844"; }) @@ -25,13 +25,13 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-3.22.tar.gz; + url = "ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-3.22.tar.gz"; sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08"; }; meta = with stdenv.lib; { description = "Mail processing and filtering utility"; - homepage = http://www.procmail.org/; + homepage = "http://www.procmail.org/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 75183e2026715..144addf02c662 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "G-code generator for 3D printer"; - homepage = https://github.com/prusa3d/PrusaSlicer; + homepage = "https://github.com/prusa3d/PrusaSlicer"; license = licenses.agpl3; maintainers = with maintainers; [ moredread tweber ]; }; diff --git a/pkgs/applications/misc/pt/default.nix b/pkgs/applications/misc/pt/default.nix index f5504721987a9..ef490702a672f 100644 --- a/pkgs/applications/misc/pt/default.nix +++ b/pkgs/applications/misc/pt/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Minimalist command-line Pivotal Tracker client"; - homepage = http://www.github.com/raul/pt; + homepage = "http://www.github.com/raul/pt"; license = licenses.mit; maintainers = with maintainers; [ ebzzry manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix index 81e316eb0ee92..a5fd55c967bb2 100644 --- a/pkgs/applications/misc/ptask/default.nix +++ b/pkgs/applications/misc/ptask/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://wpitchoune.net/ptask/; + homepage = "http://wpitchoune.net/ptask/"; description = "GTK-based GUI for taskwarrior"; license = licenses.gpl2; maintainers = [ maintainers.spacefrogg ]; diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index e90a86f225bf0..3882debd99809 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -1,19 +1,29 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.3.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "11x4y3ah9f7mv9jssws95sw7rd20fxwdh11mrhcb4vwk59cmqsjz"; + sha256 = "17v760mh5k5vb1h3xvaph5rfc5wdl6q42isil2k9n6y8bxr3yw84"; }; - cargoSha256 = "06zv3li14sg4a8bgj38zzx576ggm32ss0djmys1g0h5a0nxaaqfx"; + cargoSha256 = "1m659i3v3b5hfn5vb5126izcy690bkmlyihz2w90h2d02ig7170p"; - checkPhase = "cargo test -- --skip test_single_huge_payload"; + nativeBuildInputs = [ installShellFiles ]; + + checkFlagsArray = [ "--skip=test_single_huge_payload" ]; + + postInstall = '' + # zsh completion generation fails. See: https://github.com/Nukesor/pueue/issues/57 + for shell in bash fish; do + $out/bin/pueue completions $shell . + installShellCompletion pueue.$shell + done + ''; meta = with lib; { description = "A daemon for managing long running shell commands"; diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 91845abc8b21b..43197c6bf2768 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl -, wxGTK30, libXext, libXi, libXt, libXtst, xercesc +, wxGTK31, libXext, libXi, libXt, libXtst, xercesc , qrencode, libuuid, libyubikey, yubikey-personalization , curl, openssl, file }: stdenv.mkDerivation rec { pname = "pwsafe"; - version = "1.09.0"; + version = "3.52.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${version}"; - sha256 = "0dmazm95d53wq74qvsjvhl7r6fr4dv11nzf8sgdy47nyxv06xs1b"; + sha256 = "1ka7xsl63v0559fzf3pwc1iqr37gwr4vq5iaxa2hzar2g28hsxvh"; }; nativeBuildInputs = [ cmake gettext perl pkgconfig zip ]; buildInputs = [ - libXext libXi libXt libXtst wxGTK30 + libXext libXi libXt libXtst wxGTK31 curl qrencode libuuid openssl xercesc libyubikey yubikey-personalization file diff --git a/pkgs/applications/misc/pydf/default.nix b/pkgs/applications/misc/pydf/default.nix index ae29993a79a13..aa2835107088d 100644 --- a/pkgs/applications/misc/pydf/default.nix +++ b/pkgs/applications/misc/pydf/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec { meta = with stdenv.lib; { description = "colourised df(1)-clone"; - homepage = http://kassiopeia.juls.savba.sk/~garabik/software/pydf/; + homepage = "http://kassiopeia.juls.savba.sk/~garabik/software/pydf/"; license = licenses.publicDomain; maintainers = with maintainers; [ monsieurp ]; }; diff --git a/pkgs/applications/misc/pyditz/cerberus.nix b/pkgs/applications/misc/pyditz/cerberus.nix index 614e3ca813500..be12906e61ec3 100644 --- a/pkgs/applications/misc/pyditz/cerberus.nix +++ b/pkgs/applications/misc/pyditz/cerberus.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { checkInputs = [ pytestrunner pytest ]; meta = with stdenv.lib; { - homepage = http://python-cerberus.org/; + homepage = "http://python-cerberus.org/"; description = "Lightweight, extensible schema and data validation tool for Python dictionaries"; license = licenses.mit; }; diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix index 60de2f9abdc96..05338b38dfefe 100644 --- a/pkgs/applications/misc/pyditz/default.nix +++ b/pkgs/applications/misc/pyditz/default.nix @@ -20,7 +20,7 @@ in buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://pythonhosted.org/pyditz/; + homepage = "https://pythonhosted.org/pyditz/"; description = "Drop-in replacement for the Ditz distributed issue tracker"; maintainers = [ maintainers.ilikeavocadoes ]; license = licenses.lgpl2; diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index bb3a92e72c30f..00c4511417922 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -85,7 +85,7 @@ python3.pkgs.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pytrainer/pytrainer/wiki; + homepage = "https://github.com/pytrainer/pytrainer/wiki"; description = "Application for logging and graphing sporting excursions"; maintainers = [ maintainers.rycee ]; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix index 9775112734258..c2adcabe414c4 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -40,7 +40,7 @@ mkDerivation rec { there is no password file that can be lost or get stolen. There is also no need to trust any online password service. ''; - homepage = https://github.com/bkueng/qMasterPassword; + homepage = "https://github.com/bkueng/qMasterPassword"; license = licenses.gpl3; maintainers = [ maintainers.tadeokondrak ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/qlandkartegt/default.nix b/pkgs/applications/misc/qlandkartegt/default.nix index b9645980c64a2..d780125fbbfa3 100644 --- a/pkgs/applications/misc/qlandkartegt/default.nix +++ b/pkgs/applications/misc/qlandkartegt/default.nix @@ -79,7 +79,7 @@ mkDerivation rec { ''; meta = with lib; { - homepage = http://www.qlandkarte.org/; + homepage = "http://www.qlandkarte.org/"; description = '' QLandkarte GT is the ultimate outdoor aficionado's tool. It supports GPS maps in GeoTiff format as well as Garmin's img vector map format. diff --git a/pkgs/applications/misc/qlandkartegt/garmindev.nix b/pkgs/applications/misc/qlandkartegt/garmindev.nix index 382e7dbe12180..8705abd92596e 100644 --- a/pkgs/applications/misc/qlandkartegt/garmindev.nix +++ b/pkgs/applications/misc/qlandkartegt/garmindev.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libusb }: +{ stdenv, fetchurl, cmake, libusb-compat-0_1 }: stdenv.mkDerivation rec { pname = "garmindev"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.qlandkarte.org/; + homepage = "http://www.qlandkarte.org/"; description = "Garmin Device Drivers for QlandkarteGT"; license = licenses.gpl2; maintainers = with maintainers; [ sikmir ]; diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index c0b844d121af9..77a24413bdd65 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, udev -, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb +, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb-compat-0_1 , libsndfile, libmad }: @@ -16,7 +16,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ - udev qtmultimedia qtscript alsaLib ola libftdi1 libusb libsndfile libmad + udev qtmultimedia qtscript alsaLib ola libftdi1 libusb-compat-0_1 libsndfile libmad ]; qmakeFlags = [ "INSTALLROOT=$(out)" ]; diff --git a/pkgs/applications/misc/qmetro/default.nix b/pkgs/applications/misc/qmetro/default.nix index 49993f2f7ea75..623bd050dc9b6 100644 --- a/pkgs/applications/misc/qmetro/default.nix +++ b/pkgs/applications/misc/qmetro/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/qmetro/; + homepage = "https://sourceforge.net/projects/qmetro/"; description = "Worldwide transit maps viewer"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index c96fbab4d8121..913d2bc3c6ba3 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -20,7 +20,7 @@ mkDerivation { enableParallelBuilding = true; meta = with lib; { - homepage = https://github.com/ludios/qolibri; + homepage = "https://github.com/ludios/qolibri"; description = "EPWING reader for viewing Japanese dictionaries"; platforms = platforms.linux; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 4100ab3536b7c..3e55215f4733c 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -43,7 +43,7 @@ mkDerivation { license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://launchpad.net/qpdfview; + homepage = "https://launchpad.net/qpdfview"; updateWalker = true; }; } diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 46b446b429bf6..70d9f600fa03b 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -56,7 +56,7 @@ mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = https://github.com/sieren/QSyncthingTray/; + homepage = "https://github.com/sieren/QSyncthingTray/"; description = "A Traybar Application for Syncthing written in C++"; longDescription = '' A cross-platform status bar for Syncthing. diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/applications/misc/qt-box-editor/default.nix index 702cadfdaa91b..852f0d30f9a5b 100644 --- a/pkgs/applications/misc/qt-box-editor/default.nix +++ b/pkgs/applications/misc/qt-box-editor/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ mkDerivation +, stdenv , fetchFromGitHub , qtbase , qtsvg @@ -7,7 +8,7 @@ , tesseract }: -stdenv.mkDerivation { +mkDerivation { pname = "qt-box-editor"; version = "unstable-2019-07-12"; @@ -30,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Editor of tesseract-ocr box files"; - homepage = https://github.com/zdenop/qt-box-editor; + homepage = "https://github.com/zdenop/qt-box-editor"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 21d51f172582d..c5dfdf95fb5e3 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -28,7 +28,7 @@ mkDerivation { meta = with stdenv.lib; { description = "Bitcoin trading client"; - homepage = https://centrabit.com/; + homepage = "https://centrabit.com/"; license = licenses.gpl3; platforms = qt5.qtbase.meta.platforms; maintainers = [ maintainers.ehmry ]; diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 6b68071d4d05c..faa199147490e 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -53,7 +53,7 @@ mkDerivation rec { meta = with lib; { description = "A multi-platform GUI for pass, the standard unix password manager"; - homepage = https://qtpass.org; + homepage = "https://qtpass.org"; license = licenses.gpl3; maintainers = [ maintainers.hrdinka ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix index 948bcf33d378f..1956f0ad41d5e 100644 --- a/pkgs/applications/misc/quicksynergy/default.nix +++ b/pkgs/applications/misc/quicksynergy/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { Remember to open port 24800 (used by synergys program) if you want to host mouse and keyboard."; - homepage = https://sourceforge.net/projects/quicksynergy/; + homepage = "https://sourceforge.net/projects/quicksynergy/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.spinus ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 243913d0a0980..68ddef6569724 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "File manager with minimalistic curses interface"; - homepage = http://ranger.github.io/; + homepage = "http://ranger.github.io/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.toonn maintainers.magnetophon ]; diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index ac62ccc00cbfc..ec40347cbcb33 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -75,7 +75,7 @@ EOF meta = with lib; { description = "Cross-platform open source Redis DB management tool"; - homepage = https://redisdesktop.com/; + homepage = "https://redisdesktop.com/"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix index 2eebe67c46da3..c14eee398ceec 100644 --- a/pkgs/applications/misc/redshift-plasma-applet/default.nix +++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "KDE Plasma 5 widget for controlling Redshift"; - homepage = https://github.com/kotelnik/plasma-applet-redshift-control; + homepage = "https://github.com/kotelnik/plasma-applet-redshift-control"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ benley zraexy ]; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index e9862041f4a82..43393478ec4ab 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -93,7 +93,7 @@ rec { be set to match the lamps in your room. ''; license = licenses.gpl3Plus; - homepage = http://jonls.dk/redshift; + homepage = "http://jonls.dk/redshift"; platforms = platforms.unix; maintainers = with maintainers; [ yegortimoshenko globin ]; }; @@ -101,18 +101,19 @@ rec { redshift-wlr = mkRedshift { pname = "redshift-wlr"; - version = "2019-04-17"; + # upstream rebases so this is the push date + version = "2019-08-24"; src = fetchFromGitHub { owner = "minus7"; repo = "redshift"; - rev = "eecbfedac48f827e96ad5e151de8f41f6cd3af66"; + rev = "7da875d34854a6a34612d5ce4bd8718c32bec804"; sha256 = "0rs9bxxrw4wscf4a8yl776a8g880m5gcm75q06yx2cn3lw2b7v22"; }; meta = redshift.meta // { description = redshift.meta.description + "(with wlroots patches)"; - homepage = https://github.com/minus7/redshift; + homepage = "https://github.com/minus7/redshift"; }; }; } diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index 816a158c0319b..22f46eed7df47 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A desktop application to test regular expressions interactively"; - homepage = https://github.com/artemanufrij/regextester; + homepage = "https://github.com/artemanufrij/regextester"; maintainers = with maintainers; [ samdroid-apps ]; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 13ae1f1ba7d35..9784e24187bf8 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -5,15 +5,15 @@ let if stdenv.hostPlatform.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; - sha256 = "0mw8dh9z7pqan0yrhycmv39h5c1sc4mbw5l02cfnn17cy75xdiay"; + sha256 = "1yzbs2lg04bq0clkr6gfkx3j6wrahpnxqfiq4askk9k76y4ncd4m"; } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "1a6pc8vi2ab721kzyhvg6bmw24dr85dgmx2m9j9vbf3jyr85fv10"; + sha256 = "1njxsh601d0p6n0hxv44gcg8gd43xwym83xwqba26vj6xw82bknv"; }; in mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html - name = "rescuetime-2.14.5.2"; + name = "rescuetime-2.15.0.1"; inherit src; nativeBuildInputs = [ dpkg ]; # avoid https://github.com/NixOS/patchelf/issues/99 diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index 00640be6c74a6..d1e31b4077f4c 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { comment = "Query GUI for mongodb"; desktopName = "Robo3T"; genericName = "MongoDB management tool"; - categories = "Development;IDE;mongodb;"; + categories = "Development;IDE;"; }; nativeBuildInputs = [makeWrapper]; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://robomongo.org/; + homepage = "https://robomongo.org/"; description = "Query GUI for mongodb"; platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix index 8df4e960c180e..ef0a304729747 100644 --- a/pkgs/applications/misc/robomongo/default.nix +++ b/pkgs/applications/misc/robomongo/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://robomongo.org/; + homepage = "https://robomongo.org/"; description = "Query GUI for mongodb"; platforms = stdenv.lib.intersectLists stdenv.lib.platforms.linux stdenv.lib.platforms.x86_64; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/applications/misc/rofi-file-browser/default.nix b/pkgs/applications/misc/rofi-file-browser/default.nix new file mode 100644 index 0000000000000..10453b8584911 --- /dev/null +++ b/pkgs/applications/misc/rofi-file-browser/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, rofi, gtk3 }: + +stdenv.mkDerivation rec { + pname = "rofi-file-browser-extended"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "marvinkreis"; + repo = pname; + rev = version; + sha256 = "10wk5sif3bmvsgyk2gdy0qhpv1b37zgzf89n3h0yh7pg195fi2gn"; + fetchSubmodules = true; + }; + + prePatch = '' + substituteInPlace ./CMakeLists.txt \ + --replace ' ''${ROFI_PLUGINS_DIR}' " $out/lib/rofi" \ + --replace "/usr/share/" "$out/share/" + ''; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ rofi gtk3 ]; + + ROFI_PLUGINS_DIR = "$out/lib/rofi"; + + dontUseCmakeBuildDir = true; + + meta = with stdenv.lib; { + description = "Use rofi to quickly open files"; + homepage = "https://github.com/marvinkreis/rofi-file-browser-extended"; + license = licenses.mit; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/applications/misc/rofi-menugen/default.nix b/pkgs/applications/misc/rofi-menugen/default.nix index 2255089ab7e25..088ec29ae37b0 100644 --- a/pkgs/applications/misc/rofi-menugen/default.nix +++ b/pkgs/applications/misc/rofi-menugen/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "Generates menu based applications using rofi"; - homepage = https://github.com/octotep/menugen; + homepage = "https://github.com/octotep/menugen"; maintainers = with maintainers; [ ]; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix index 6ee9966401b5f..eefc0a0c57721 100644 --- a/pkgs/applications/misc/rsibreak/default.nix +++ b/pkgs/applications/misc/rsibreak/default.nix @@ -22,7 +22,7 @@ in mkDerivation rec { meta = with lib; { description = "RSIBreak takes care of your health and regularly breaks your work to avoid repetitive strain injury (RSI)"; license = licenses.gpl2; - homepage = https://www.kde.org/applications/utilities/rsibreak/; + homepage = "https://www.kde.org/applications/utilities/rsibreak/"; maintainers = with maintainers; [ vandenoever ]; }; } diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 20211ecb53b18..c4547e8751307 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -38,7 +38,7 @@ buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/michael-lazar/rtv; + homepage = "https://github.com/michael-lazar/rtv"; description = "Browse Reddit from your Terminal"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer wedens ]; diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix index 4f4319af6cbdc..f81709b973900 100644 --- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Change the urxvt font size on the fly"; - homepage = https://github.com/majutsushi/urxvt-font-size; + homepage = "https://github.com/majutsushi/urxvt-font-size"; license = licenses.mit; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; unix; diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix index 13e005014f105..0c95acd72057f 100644 --- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Perl extensions for the rxvt-unicode terminal emulator"; - homepage = https://github.com/effigies/urxvt-perl; + homepage = "https://github.com/effigies/urxvt-perl"; license = licenses.gpl3; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; unix; diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix index dac0414107070..53bb938c3330d 100644 --- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Perl extensions for the rxvt-unicode terminal emulator"; - homepage = https://github.com/muennich/urxvt-perls; + homepage = "https://github.com/muennich/urxvt-perls"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; platforms = with platforms; unix; diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix index 2982c02cce9ae..71a55f9293c66 100644 --- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)"; - homepage = https://github.com/mina86/urxvt-tabbedex; + homepage = "https://github.com/mina86/urxvt-tabbedex"; maintainers = with maintainers; [ abbradar ]; platforms = with platforms; unix; }; diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix index ba8ec3a6e72ab..5a84a9b472a5b 100644 --- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "urxvt plugin that allows to switch color themes during runtime"; - homepage = https://github.com/felixr/urxvt-theme-switch; + homepage = "https://github.com/felixr/urxvt-theme-switch"; license = "CCBYNC"; maintainers = with maintainers; [ ]; platforms = with platforms; unix; diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix index 3d0dec20c9a40..aebbedacef644 100644 --- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Pass mouse wheel commands to secondary screens (screen, less, nano, etc)"; - homepage = https://aur.archlinux.org/packages/urxvt-vtwheel; + homepage = "https://aur.archlinux.org/packages/urxvt-vtwheel"; license = licenses.mit; maintainers = with maintainers; [ danbst ]; platforms = with platforms; unix; diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/misc/rxvt/default.nix index acdd21a1c2194..c71973da13beb 100644 --- a/pkgs/applications/misc/rxvt/default.nix +++ b/pkgs/applications/misc/rxvt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://rxvt.sourceforge.net/; + homepage = "http://rxvt.sourceforge.net/"; description = "Colour vt102 terminal emulator with less features and lower memory consumption"; longDescription = '' rxvt (acronym for our extended virtual terminal) is a terminal diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index 125170d36c276..f6bb7133d9996 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -61,7 +61,7 @@ in buildPythonApplication rec { doCheck = false; # no tests meta = { - homepage = http://slgobinath.github.io/SafeEyes; + homepage = "http://slgobinath.github.io/SafeEyes"; description = "Protect your eyes from eye strain using this simple and beautiful, yet extensible break reminder. A Free and Open Source Linux alternative to EyeLeo"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ srghma ]; diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix index f646b4739154e..34a6142e83a18 100644 --- a/pkgs/applications/misc/sakura/default.nix +++ b/pkgs/applications/misc/sakura/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A terminal emulator based on GTK and VTE"; - homepage = http://www.pleyades.net/david/projects/sakura; + homepage = "http://www.pleyades.net/david/projects/sakura"; license = licenses.gpl2; maintainers = with maintainers; [ astsmtl codyopel ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix index 0c5494f146f70..a1f4c8f41bca2 100644 --- a/pkgs/applications/misc/sampler/default.nix +++ b/pkgs/applications/misc/sampler/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1lanighxhnn28dfzils7i55zgxbw2abd6y723mq7x9wg1aa2bd0z"; }; - modSha256 = "02ai193lpzsxdn1hpbndkfxdc88nyl4kcgbadhy122kgx13crcy8"; + vendorSha256 = "04nywhkil5xkipcibrp6vi63rfcvqgv7yxbxmmrhqys2cdxfvazv"; subPackages = [ "." ]; @@ -24,4 +24,4 @@ buildGoModule rec { maintainers = with maintainers; [ uvnikita ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix index 6f38ba5662b5f..821fbe35ca1a1 100644 --- a/pkgs/applications/misc/sbagen/default.nix +++ b/pkgs/applications/misc/sbagen/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Binaural sound generator"; - homepage = http://uazu.net/sbagen; + homepage = "http://uazu.net/sbagen"; license = "GPL"; platforms = [ "i686-linux" ]; }; diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index c95eba48bdfb4..6ee4695d1717a 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/andmarti1424/sc-im; + homepage = "https://github.com/andmarti1424/sc-im"; description = "SC-IM - Spreadsheet Calculator Improvised - SC fork"; license = licenses.bsdOriginal; maintainers = [ ]; diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index 3cebcc0101f87..997786fc10724 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"; meta = with stdenv.lib; { - homepage = https://dushistov.github.io/sdcv/; + homepage = "https://dushistov.github.io/sdcv/"; description = "Console version of StarDict"; maintainers = with maintainers; [ lovek323 ]; license = licenses.gpl2; diff --git a/pkgs/applications/misc/sent/default.nix b/pkgs/applications/misc/sent/default.nix index 9bbae33b3e411..fe8598e49157d 100644 --- a/pkgs/applications/misc/sent/default.nix +++ b/pkgs/applications/misc/sent/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple plaintext presentation tool"; - homepage = https://tools.suckless.org/sent/; + homepage = "https://tools.suckless.org/sent/"; license = licenses.isc; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index da7e501b27119..04ceed6354369 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "sequeler"; - version = "0.7.4"; + version = "0.7.91"; src = fetchFromGitHub { owner = "Alecaddd"; repo = pname; rev = "v${version}"; - sha256 = "0ki8dganj6hmvg5qwdlc3y0a4pdmx7454np790yf5wnqb6ixb6gv"; + sha256 = "071vfx7bdf7hfa4784xz97vrj9x5aipgjbp30r00kg2zhg8wa2ls"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gettext wrapGAppsHook python3 desktop-file-utils ]; diff --git a/pkgs/applications/misc/sequelpro/default.nix b/pkgs/applications/misc/sequelpro/default.nix index e81c0b99264e7..16a11342d8129 100644 --- a/pkgs/applications/misc/sequelpro/default.nix +++ b/pkgs/applications/misc/sequelpro/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "MySQL database management for macOS"; - homepage = http://www.sequelpro.com/; + homepage = "http://www.sequelpro.com/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.darwin; }; diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index 3638a1d18809b..6c55c3157f5c7 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }: let pname = "sidequest"; - version = "0.8.7"; + version = "0.10.2"; desktopItem = makeDesktopItem rec { name = "SideQuest"; @@ -16,7 +16,7 @@ src = fetchurl { url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; - sha256 = "1hbr6ml689zq4k3mzmn2xcn4r4dy717rgq3lgm32pzwgy5w92i2j"; + sha256 = "1vfxn4gx5b138gj6nk4w3jlp2l56cqpb8hq2kn5mrf4dhjii8n88"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index 2b44b0398b55d..c0e255a36e377 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Yet another simple static gallery generator"; - homepage = http://sigal.saimon.org/en/latest/index.html; + homepage = "http://sigal.saimon.org/en/latest/index.html"; license = licenses.mit; maintainers = with maintainers; [ domenkozar matthiasbeyer ]; }; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 195437250a18f..46b80dc98f04b 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -16,10 +16,10 @@ let pname = "simplenote"; - version = "1.15.1"; + version = "1.16.0"; sha256 = { - x86_64-linux = "1q1y5favj2ny0l2iq53vq39ns68zfr2z1plskxdg2d93jarvcr8x"; + x86_64-linux = "01nk3dbyhs0p7f6b4bkrng95i29g0x7vxj0rx1qb7sm3n11yi091"; }.${system} or throwSystem; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix index d2d5e9548a0c3..e93baa997c86c 100644 --- a/pkgs/applications/misc/slade/default.nix +++ b/pkgs/applications/misc/slade/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Doom editor"; - homepage = http://slade.mancubus.net/; + homepage = "http://slade.mancubus.net/"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix index 9ee30d347b0a8..1eaf907b7edfc 100644 --- a/pkgs/applications/misc/slade/git.nix +++ b/pkgs/applications/misc/slade/git.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Doom editor"; - homepage = http://slade.mancubus.net/; + homepage = "http://slade.mancubus.net/"; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ ertes ]; diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix index a32709294175b..17c5ec9be2657 100644 --- a/pkgs/applications/misc/sleepyhead/default.nix +++ b/pkgs/applications/misc/sleepyhead/default.nix @@ -1,35 +1,44 @@ -{ stdenv, fetchgit, qt5, zlib, libGLU, libX11 }: +{ lib, stdenv, mkDerivation, fetchgit, zlib, libGLU, libX11, qtbase, qtwebkit, qtserialport, wrapQtAppsHook }: let name = "sleepyhead-${version}"; version = "1.0.0-beta-git"; -in stdenv.mkDerivation { +in mkDerivation { inherit name; src = fetchgit { - url = https://gitlab.com/sleepyhead/sleepyhead-code.git; + url = "https://gitlab.com/sleepyhead/sleepyhead-code.git"; rev = "9e2329d8bca45693231b5e3dae80063717c24578"; sha256 = "0448z8gyaxpgpnksg34lzmffj36jdpm0ir4xxa5gvzagkx0wk07h"; }; buildInputs = [ - qt5.qtbase qt5.qtwebkit qt5.qtserialport + qtbase qtwebkit qtserialport zlib libGLU libX11 ]; + nativeBuildInputs = [ wrapQtAppsHook ]; + patchPhase = '' patchShebangs configure ''; - - installPhase = '' + + installPhase = if stdenv.isDarwin then '' + mkdir -p $out/Applications + cp -r sleepyhead/SleepyHead.app $out/Applications + '' else '' mkdir -p $out/bin cp sleepyhead/SleepyHead $out/bin ''; + postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + wrapQtApp "$out/Applications/SleepyHead.app/Contents/MacOS/SleepyHead" + ''; + meta = with stdenv.lib; { - homepage = https://sleepyhead.jedimark.net/; + homepage = "https://sleepyhead.jedimark.net/"; description = "Review and explore data produced by CPAP and related machines"; longDescription = '' SleepyHead is cross platform, opensource sleep tracking program for reviewing CPAP and Oximetry data, which are devices used in the treatment of Sleep Disorders like Obstructive Sleep Apnea. @@ -37,7 +46,6 @@ in stdenv.mkDerivation { license = licenses.gpl3; platforms = platforms.all; maintainers = [ maintainers.krav ]; - broken = true; }; } diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 1465b0ea05233..912deee4cb1bb 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -82,9 +82,9 @@ stdenv.mkDerivation rec { instructions for your 3D printer. It cuts the model into horizontal slices (layers), generates toolpaths to fill them and calculates the amount of material to be extruded.''; - homepage = https://slic3r.org/; + homepage = "https://slic3r.org/"; license = licenses.agpl3; platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor the-kenny ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index bfb3d010a3c7c..5c13cbf866940 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "unstable-2018-04-16"; src = fetchgit { - url = https://git.suckless.org/slstatus; + url = "https://git.suckless.org/slstatus"; rev = "97ef7c2a1d67bb2c9c379e657fbc8e35acd6aafb"; sha256 = "1777hgl10imk0l2sgnqgbkfchv1mpxrd82ninzwp7f1rgwchz36v"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = { - homepage = https://tools.suckless.org/slstatus/; + homepage = "https://tools.suckless.org/slstatus/"; description = "status monitor for window managers that use WM_NAME like dwm"; license = licenses.isc; maintainers = with maintainers; [ geistesk ]; diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index 722b0bc5077e7..d2a883c295dbd 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec { To be able to use it, make sure you have access to /dev/hidraw* files. ''; license = licenses.gpl2; - homepage = https://pwr-solaar.github.io/Solaar/; + homepage = "https://pwr-solaar.github.io/Solaar/"; platforms = platforms.linux; maintainers = with maintainers; [ spinus ysndr ]; }; diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 47e13fa250855..45dc487c8ed11 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { with built-in VFS, udev- or HAL-based device manager, customizable menu system, and bash integration ''; - homepage = http://ignorantguru.github.io/spacefm/; + homepage = "http://ignorantguru.github.io/spacefm/"; platforms = platforms.linux; license = licenses.gpl3Plus; maintainers = with maintainers; [ jagajaga obadz ]; diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/applications/misc/sqliteman/default.nix index 103075024dd5f..27d5610956d03 100644 --- a/pkgs/applications/misc/sqliteman/default.nix +++ b/pkgs/applications/misc/sqliteman/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple but powerful Sqlite3 GUI database manager"; - homepage = http://sqliteman.yarpen.cz/; + homepage = "http://sqliteman.yarpen.cz/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.eikek ]; diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix index bb1655b44632f..c52573785ef66 100644 --- a/pkgs/applications/misc/ssocr/default.nix +++ b/pkgs/applications/misc/ssocr/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Seven Segment Optical Character Recognition"; - homepage = https://github.com/auerswal/ssocr; + homepage = "https://github.com/auerswal/ssocr"; license = licenses.gpl3; maintainers = [ maintainers.kroell ]; }; diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 47d7279a47fa7..018fd9306ae59 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -4,17 +4,17 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "st-0.8.2"; + name = "st-0.8.3"; src = fetchurl { url = "https://dl.suckless.org/st/${name}.tar.gz"; - sha256 = "0ddz2mdp1c7q67rd5vrvws9r0493ln0mlqyc3d73dv8im884xdxf"; + sha256 = "0ll5wbw1szs70wdf8zy1y2ig5mfbqw2w4ls8d64r8z3y4gdf76lk"; }; inherit patches; configFile = optionalString (conf!=null) (writeText "config.def.h" conf); - preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + postPatch = optionalString (conf!=null) "cp ${configFile} config.def.h"; nativeBuildInputs = [ pkgconfig ncurses ]; buildInputs = [ libX11 libXft ] ++ extraLibs; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://st.suckless.org/; + homepage = "https://st.suckless.org/"; description = "Simple Terminal for X from Suckless.org Community"; license = licenses.mit; maintainers = with maintainers; [andsild]; diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/misc/st/xst.nix index 9407243c6a21f..3e29abee5d65d 100644 --- a/pkgs/applications/misc/st/xst.nix +++ b/pkgs/applications/misc/st/xst.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/neeasade/xst; + homepage = "https://github.com/neeasade/xst"; description = "Simple terminal fork that can load config from Xresources"; license = licenses.mit; maintainers = [ maintainers.vyp ]; diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index ebb50e685da73..6b4bf19463061 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "stag-1.0"; src = fetchgit { - url = https://github.com/seenaburns/stag.git; + url = "https://github.com/seenaburns/stag.git"; rev = "90e2964959ea8242349250640d24cee3d1966ad6"; sha256 = "1yrzjhcwrxrxq5jj695wvpgb0pz047m88yq5n5ymkcw5qr78fy1v"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/seenaburns/stag; + homepage = "https://github.com/seenaburns/stag"; description = "Terminal streaming bar graph passed through stdin"; license = stdenv.lib.licenses.bsdOriginal; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix index 8c47de3afac03..038d04adeaa84 100644 --- a/pkgs/applications/misc/stog/default.nix +++ b/pkgs/applications/misc/stog/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "XML documents and web site compiler"; - homepage = https://www.good-eris.net/stog; + homepage = "https://www.good-eris.net/stog"; license = licenses.lgpl3; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ regnat ]; diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/applications/misc/stretchly/default.nix index 9769045b9ce59..87e8316c2c4f4 100644 --- a/pkgs/applications/misc/stretchly/default.nix +++ b/pkgs/applications/misc/stretchly/default.nix @@ -53,8 +53,8 @@ stdenv.mkDerivation rec { seconds every 10 minutes. Every 30 minutes, it displays a window containing an idea for a longer 5 minute break. ''; - homepage = https://hovancik.net/stretchly; - downloadPage = https://hovancik.net/stretchly/downloads/; + homepage = "https://hovancik.net/stretchly"; + downloadPage = "https://hovancik.net/stretchly/downloads/"; license = licenses.bsd2; maintainers = with maintainers; [ cdepillabout ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix index b786b34e9553b..0a6e947f15c28 100644 --- a/pkgs/applications/misc/stupidterm/default.nix +++ b/pkgs/applications/misc/stupidterm/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple wrapper around the VTE terminal emulator widget for GTK"; - homepage = https://github.com/esmil/stupidterm; + homepage = "https://github.com/esmil/stupidterm"; license = licenses.lgpl3Plus; maintainers = [ maintainers.etu ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix index 340b59d5ff23a..67f48d67f8071 100644 --- a/pkgs/applications/misc/styx/default.nix +++ b/pkgs/applications/misc/styx/default.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Nix based static site generator"; maintainers = with maintainers; [ ericsagnes ]; - homepage = https://styx-static.github.io/styx-site/; - downloadPage = https://github.com/styx-static/styx/; + homepage = "https://styx-static.github.io/styx-site/"; + downloadPage = "https://github.com/styx-static/styx/"; platforms = platforms.all; license = licenses.mit; }; diff --git a/pkgs/applications/misc/subsurface/0001-core-fix-libgit-ifdef-to-handle-libgit2-v1.0-and-onw.patch b/pkgs/applications/misc/subsurface/0001-core-fix-libgit-ifdef-to-handle-libgit2-v1.0-and-onw.patch new file mode 100644 index 0000000000000..027e3f493e12a --- /dev/null +++ b/pkgs/applications/misc/subsurface/0001-core-fix-libgit-ifdef-to-handle-libgit2-v1.0-and-onw.patch @@ -0,0 +1,41 @@ +From dfa4bcafec4425659a409550085417af3c5c787b Mon Sep 17 00:00:00 2001 +From: Florian Klink <flokli@flokli.de> +Date: Sat, 11 Apr 2020 12:38:38 +0200 +Subject: [PATCH] core: fix libgit ifdef to handle libgit2 v1.0 and onwards + +Conditional code for older libgit versions was removed in +https://github.com/Subsurface-divelog/subsurface/pull/2737, +but it's a non-trivial backport, and master currently isn't really ready +for a release. + +So instead ship a patch fixing the one broken libgit2 conditional until +a 4.10 release has been made. + +Note the inverted logic - the if branch now handles the old libgit +condition, and the else branch the newer versions, consistent with how +it's done in the rest of the subsurface codebase. +--- + core/git-access.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/core/git-access.c b/core/git-access.c +index 3688cb90c..9997fc8fd 100644 +--- a/core/git-access.c ++++ b/core/git-access.c +@@ -359,10 +359,10 @@ static int try_to_git_merge(git_repository *repo, git_reference **local_p, git_r + } + + git_merge_init_options(&merge_options, GIT_MERGE_OPTIONS_VERSION); +-#if !LIBGIT2_VER_MAJOR && LIBGIT2_VER_MINOR > 23 +- merge_options.flags = GIT_MERGE_FIND_RENAMES; +-#else ++#if !LIBGIT2_VER_MAJOR && LIBGIT2_VER_MINOR <= 22 + merge_options.tree_flags = GIT_MERGE_TREE_FIND_RENAMES; ++#else ++ merge_options.flags = GIT_MERGE_FIND_RENAMES; + #endif + merge_options.file_favor = GIT_MERGE_FILE_FAVOR_UNION; + merge_options.rename_threshold = 100; +-- +2.25.1 + diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 960b7b9eeef5e..e189351022b92 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,19 +1,25 @@ { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkgconfig, qmake -, curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib +, curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib , qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite }: let - version = "4.8.2"; + version = "4.9.3"; + + subsurfaceSrc = (fetchFromGitHub { + owner = "Subsurface-divelog"; + repo = "subsurface"; + rev = "v${version}"; + sha256 = "1i07f7appifx9j205x5a7ng01wsipxr6n9a3692pm60jli2nsir5"; + fetchSubmodules = true; + }); libdc = stdenv.mkDerivation { pname = "libdivecomputer-ssrf"; inherit version; - src = fetchurl { - url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz"; - sha256 = "167qan59raibmilkc574gdqxfjg2f5ww2frn86xzk2kn4qg8190w"; - }; + src = subsurfaceSrc; + sourceRoot = "source/libdivecomputer"; nativeBuildInputs = [ autoreconfHook ]; @@ -22,7 +28,7 @@ let enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.libdivecomputer.org; + homepage = "http://www.libdivecomputer.org"; description = "A cross-platform and open source library for communication with dive computers from various manufacturers"; maintainers = with maintainers; [ mguentner ]; license = licenses.lgpl21; @@ -70,14 +76,14 @@ in stdenv.mkDerivation { pname = "subsurface"; inherit version; - src = fetchurl { - url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz"; - sha256 = "1fzrq6rqb6pzs36wxar2453cl509dqpcy9w7nq4gw7b1v2331wfy"; - }; + src = subsurfaceSrc; + + # remove with the 4.10 release + patches = [ ./0001-core-fix-libgit-ifdef-to-handle-libgit2-v1.0-and-onw.patch ]; buildInputs = [ libdc googlemaps - curl grantlee libgit2 libssh2 libusb libxml2 libxslt libzip + curl grantlee libgit2 libssh2 libusb-compat-0_1 libxml2 libxslt libzip qtbase qtconnectivity qtsvg qttools qtwebkit ]; @@ -100,7 +106,7 @@ in stdenv.mkDerivation { conveniently be entered using a map interface), logging of equipment used and names of other divers, and lets users rate dives and provide additional notes. ''; - homepage = https://subsurface-divelog.org; + homepage = "https://subsurface-divelog.org"; license = licenses.gpl2; maintainers = with maintainers; [ mguentner ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/super_user_spark/default.nix b/pkgs/applications/misc/super_user_spark/default.nix index 8102375479be5..dd1218282d85f 100644 --- a/pkgs/applications/misc/super_user_spark/default.nix +++ b/pkgs/applications/misc/super_user_spark/default.nix @@ -27,6 +27,6 @@ mkDerivation { jailbreak = true; description = "Configure your dotfile deployment with a DSL"; license = stdenv.lib.licenses.mit; - homepage = https://github.com/NorfairKing/super-user-spark; + homepage = "https://github.com/NorfairKing/super-user-spark"; maintainers = [ stdenv.lib.maintainers.badi ]; } diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 76a62d1762c27..926db03652d62 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -59,7 +59,7 @@ let dontStrip = true; meta = { - homepage = http://www.sweethome3d.com/index.jsp; + homepage = "http://www.sweethome3d.com/index.jsp"; inherit description; inherit license; maintainers = [ stdenv.lib.maintainers.edwtjo ]; @@ -73,14 +73,14 @@ in { application = mkSweetHome3D rec { pname = stdenv.lib.toLower module + "-application"; - version = "6.2"; + version = "6.3"; module = "SweetHome3D"; description = "Design and visualize your future home"; license = stdenv.lib.licenses.gpl2Plus; src = fetchsvn { url = "https://svn.code.sf.net/p/sweethome3d/code/tags/V_" + d2u version + "/SweetHome3D/"; - sha256 = "0a514a1zmipykvawil46v826ivkw9c00vdkyggyl6m41giay15zf"; - rev = "6822"; + sha256 = "1c13g0f73jgbzmjhdm9knqq1kh3vdl04zl3xlp30g9a1n0jkr38i"; + rev = "6896"; }; desktopName = "Sweet Home 3D"; icons = { diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index 1d3f1a41e162d..ec759572443cb 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -47,7 +47,7 @@ let dontStrip = true; meta = { - homepage = http://www.sweethome3d.com/index.jsp; + homepage = "http://www.sweethome3d.com/index.jsp"; inherit description; inherit license; maintainers = [ stdenv.lib.maintainers.edwtjo ]; diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index c12f5b176790d..751c0a48f5b37 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { the Zeitgeist engine ''; description = "Semantic launcher to start applications and find relevant files"; - homepage = https://launchpad.net/synapse-project; + homepage = "https://launchpad.net/synapse-project"; license = licenses.gpl3; maintainers = with maintainers; [ mahe ]; platforms = with platforms; all; diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix index a07fe0c75103b..38826b7735fb9 100644 --- a/pkgs/applications/misc/syncthing-tray/default.nix +++ b/pkgs/applications/misc/syncthing-tray/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Simple application tray for syncthing"; - homepage = https://github.com/alex2108/syncthing-tray; + homepage = "https://github.com/alex2108/syncthing-tray"; license = licenses.mit; maintainers = with maintainers; [ nickhu ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 16bfdfb9a032e..7af90535530ed 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -20,14 +20,14 @@ }: mkDerivation rec { - version = "0.10.8"; + version = "0.10.9"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "1g27v109m0ar090b340x6lsrzfp85hskcr3kapc2rgdhaa0mygpd"; + sha256 = "19kni5v9g0p4751bw2xb8dawg5yjkyk39vdy0m93448lsl8cqq04"; }; buildInputs = [ qtbase cpp-utilities qtutilities ] @@ -39,6 +39,12 @@ mkDerivation rec { nativeBuildInputs = [ cmake qttools ]; + # No tests are available by upstream, but we test --help anyway + doInstallCheck = true; + installCheckPhase = '' + $out/bin/syncthingtray --help | grep ${version} + ''; + cmakeFlags = [ # See https://github.com/Martchus/syncthingtray/issues/42 "-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/lib/qt-5" diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 90645c41d2592..bb922f3ca5b28 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Share one mouse and keyboard between multiple computers"; - homepage = http://synergy-project.org/; + homepage = "http://synergy-project.org/"; license = licenses.gpl2; maintainers = with maintainers; [ aszlig enzime ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/systembus-notify/default.nix b/pkgs/applications/misc/systembus-notify/default.nix new file mode 100644 index 0000000000000..28c1be4219d68 --- /dev/null +++ b/pkgs/applications/misc/systembus-notify/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, systemd }: + +stdenv.mkDerivation rec { + pname = "systembus-notify"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "rfjakob"; + repo = "systembus-notify"; + rev = "v${version}"; + sha256 = "11zq84qfmbyl51d3r6294l2bjhlgwa9bx7d263g9fkqrwsg0si0y"; + }; + + buildInputs = [ systemd ]; + + installPhase = '' + runHook preInstall + install -Dm755 systembus-notify -t $out/bin + install -Dm644 systembus-notify.desktop -t $out/etc/xdg/autostart + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "System bus notification daemon"; + homepage = "https://github.com/rfjakob/systembus-notify"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; []; + }; +} diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix index fbb1832735bea..1b29118c9b14f 100644 --- a/pkgs/applications/misc/tabula/default.nix +++ b/pkgs/applications/misc/tabula/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { out of PDF files. Tabula allows you to extract that data into a CSV or Microsoft Excel spreadsheet using a simple, easy-to-use interface. ''; - homepage = https://tabula.technology/; + homepage = "https://tabula.technology/"; license = licenses.mit; maintainers = [ maintainers.dpaetzel ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/applications/misc/taizen/default.nix index bf9770acacd8b..993606d39c0e3 100644 --- a/pkgs/applications/misc/taizen/default.nix +++ b/pkgs/applications/misc/taizen/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0chrgwm97y1a3gj218x25yqk1y1h74a6gzyxjdm023msvs58nkni"; meta = with lib; { - homepage = https://crates.io/crates/taizen; + homepage = "https://crates.io/crates/taizen"; license = licenses.mit; description = "curses based mediawiki browser"; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/applications/misc/taskjuggler/2.x/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix index a0dc7b7c71e31..a1d04a13af85a 100644 --- a/pkgs/applications/misc/taskjuggler/2.x/default.nix +++ b/pkgs/applications/misc/taskjuggler/2.x/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { installFlags = [ "kde_locale=\${out}/share/locale" ]; meta = { - homepage = http://www.taskjuggler.org; + homepage = "http://www.taskjuggler.org"; license = stdenv.lib.licenses.gpl2; description = "Project management tool"; longDescription = '' diff --git a/pkgs/applications/misc/taskjuggler/3.x/default.nix b/pkgs/applications/misc/taskjuggler/3.x/default.nix index 23252d0c48073..6b3ef60d6382e 100644 --- a/pkgs/applications/misc/taskjuggler/3.x/default.nix +++ b/pkgs/applications/misc/taskjuggler/3.x/default.nix @@ -8,7 +8,7 @@ bundlerEnv { meta = { description = "A modern and powerful project management tool"; - homepage = http://taskjuggler.org/; + homepage = "http://taskjuggler.org/"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; }; diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix index 838cc199a6cad..64753397833a6 100644 --- a/pkgs/applications/misc/taskjuggler/default.nix +++ b/pkgs/applications/misc/taskjuggler/default.nix @@ -13,7 +13,7 @@ bundlerApp { meta = with lib; { description = "A modern and powerful project management tool"; - homepage = http://taskjuggler.org/; + homepage = "http://taskjuggler.org/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ manveru nicknovitski ]; diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index 0450cb40a555b..46378aec33aed 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { - homepage = https://github.com/lharding/tasknc; + homepage = "https://github.com/lharding/tasknc"; description = "A ncurses wrapper around taskwarrior"; maintainers = with maintainers; [ matthiasbeyer infinisil ]; platforms = platforms.linux; # Cannot test others diff --git a/pkgs/applications/misc/taskopen/default.nix b/pkgs/applications/misc/taskopen/default.nix index 847092356d28b..a60ca997ee033 100644 --- a/pkgs/applications/misc/taskopen/default.nix +++ b/pkgs/applications/misc/taskopen/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Script for taking notes and open urls with taskwarrior"; - homepage = https://github.com/ValiValpas/taskopen; + homepage = "https://github.com/ValiValpas/taskopen"; platforms = platforms.linux; license = stdenv.lib.licenses.free ; maintainers = [ maintainers.winpat ]; diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index 931a27fbeff69..4c577049f44a3 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "REPL for taskwarrior"; - homepage = http://tasktools.org; + homepage = "http://tasktools.org"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index ba919fbc62674..67f2fd8927bdf 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Highly flexible command-line tool to manage TODO lists"; - homepage = https://taskwarrior.org; + homepage = "https://taskwarrior.org"; license = licenses.mit; maintainers = with maintainers; [ marcweber ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/misc/tdrop/default.nix b/pkgs/applications/misc/tdrop/default.nix index 547eea4f2d23e..020298a0c5237 100644 --- a/pkgs/applications/misc/tdrop/default.nix +++ b/pkgs/applications/misc/tdrop/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A Glorified WM-Independent Dropdown Creator"; - homepage = https://github.com/noctuid/tdrop; + homepage = "https://github.com/noctuid/tdrop"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ wedens ]; diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix index 94eacb1fe0671..ad6f9e9382b77 100644 --- a/pkgs/applications/misc/termdown/default.nix +++ b/pkgs/applications/misc/termdown/default.nix @@ -1,27 +1,29 @@ -{ stdenv, fetchFromGitHub, buildPythonApplication, -click, pyfiglet, dateutil}: - -with stdenv.lib; +{ stdenv +, fetchFromGitHub +, buildPythonApplication +, click +, pyfiglet +, dateutil +, setuptools +}: buildPythonApplication rec { - pname = "termdown"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { - rev = version; - sha256 = "0k429ss1xifm9vbgyzpp71r79byn9jclvr0rm77bai2r8nz3s2vf"; - repo = "termdown"; - owner = "trehn"; + rev = version; + sha256 = "1sd9z5n2a4ir35832wgxs68vwav7wxhq39b5h8pq934mp8sl3v2k"; + repo = "termdown"; + owner = "trehn"; }; - propagatedBuildInputs = [ dateutil click pyfiglet ]; + propagatedBuildInputs = [ dateutil click pyfiglet setuptools ]; meta = with stdenv.lib; { - description = "Starts a countdown to or from TIMESPEC"; + description = "Starts a countdown to or from TIMESPEC"; longDescription = "Countdown timer and stopwatch in your terminal"; - homepage = https://github.com/trehn/termdown; - license = licenses.gpl3; - platforms = platforms.all; + homepage = "https://github.com/trehn/termdown"; + license = licenses.gpl3; }; } diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix index 00300e65abb45..cde53ef41654b 100644 --- a/pkgs/applications/misc/terminal-notifier/default.nix +++ b/pkgs/applications/misc/terminal-notifier/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { maintainers = with maintainers; [ cstrahan ]; - homepage = https://github.com/julienXX/terminal-notifier; + homepage = "https://github.com/julienXX/terminal-notifier"; license = licenses.mit; platforms = platforms.darwin; }; diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix index ba898932f06cc..accaf62c60e2d 100644 --- a/pkgs/applications/misc/terminal-parrot/default.nix +++ b/pkgs/applications/misc/terminal-parrot/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { sha256 = "1b4vr4s1zpkpf5kc1r2kdlp3hf88qp1f7h05g8kd62zf4sfbj722"; }; - modSha256 = "01i8fim9z2l8rpdgfaih9ldvbap7gcx5767a15miv8q7sxpr90cp"; + vendorSha256 = "1qalnhhq3fmyzj0hkzc5gk9wbypr558mz3ik5msw7fid68k2i48c"; meta = with stdenv.lib; { description = "Shows colorful, animated party parrot in your terminial"; - homepage = https://github.com/jmhobbs/terminal-parrot; + homepage = "https://github.com/jmhobbs/terminal-parrot"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.heel ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix index d09c98b670905..5de8109e3a4d2 100644 --- a/pkgs/applications/misc/terminator/default.nix +++ b/pkgs/applications/misc/terminator/default.nix @@ -1,28 +1,64 @@ -{ stdenv, fetchurl, python2, keybinder3, intltool, file, gtk3, gobject-introspection -, libnotify, wrapGAppsHook, vte +{ stdenv +, fetchFromGitHub +, python3 +, keybinder3 +, intltool +, file +, gtk3 +, gobject-introspection +, libnotify +, wrapGAppsHook +, vte }: -python2.pkgs.buildPythonApplication rec { - name = "terminator-${version}"; - version = "1.91"; +python3.pkgs.buildPythonApplication rec { + pname = "terminator"; + version = "1.92"; - src = fetchurl { - url = "https://launchpad.net/terminator/gtk3/${version}/+download/${name}.tar.gz"; - sha256 = "95f76e3c0253956d19ceab2f8da709a496f1b9cf9b1c5b8d3cd0b6da3cc7be69"; + src = fetchFromGitHub { + owner = "gnome-terminator"; + repo = "terminator"; + rev = "v${version}"; + sha256 = "105f660wzf9cpn24xzwaaa09igg5h3qhchafv190v5nqck6g1ssh"; }; - nativeBuildInputs = [ file intltool wrapGAppsHook gobject-introspection ]; - buildInputs = [ gtk3 vte libnotify keybinder3 + nativeBuildInputs = [ + file + intltool + gobject-introspection + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 + keybinder3 + libnotify + python3 + vte + ]; + + propagatedBuildInputs = with python3.pkgs; [ + configobj + dbus-python + pygobject3 + psutil + pycairo ]; - propagatedBuildInputs = with python2.pkgs; [ pygobject3 psutil pycairo ]; postPatch = '' - patchShebangs . + patchShebangs run_tests tests po + # dbus-python is correctly passed in propagatedBuildInputs, but for some reason setup.py complains. + # The wrapped terminator has the correct path added, so ignore this. + substituteInPlace setup.py --replace "'dbus-python'," "" ''; checkPhase = '' + runHook preCheck + ./run_tests + + runHook postCheck ''; meta = with stdenv.lib; { @@ -33,7 +69,7 @@ python2.pkgs.buildPythonApplication rec { quadkonsole, etc. in that the main focus is arranging terminals in grids (tabs is the most common default method, which Terminator also supports). ''; - homepage = https://gnometerminator.blogspot.no/p/introduction.html; + homepage = "https://github.com/gnome-terminator/terminator"; license = licenses.gpl2; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix index fce46d120de56..4c38e530247e8 100644 --- a/pkgs/applications/misc/terminus/default.nix +++ b/pkgs/applications/misc/terminus/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; meta = with lib; { description = "A terminal for a more modern age"; - homepage = https://eugeny.github.io/terminus/; + homepage = "https://eugeny.github.io/terminus/"; maintainers = with maintainers; [ jlesquembre ]; license = licenses.mit; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 2a610edde0346..63565e207f77f 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -77,7 +77,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple VTE-based terminal"; license = licenses.lgpl2Plus; - homepage = https://github.com/thestinger/termite/; + homepage = "https://github.com/thestinger/termite/"; maintainers = with maintainers; [ koral ]; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/termpdf.py/default.nix b/pkgs/applications/misc/termpdf.py/default.nix new file mode 100644 index 0000000000000..5988f569109b0 --- /dev/null +++ b/pkgs/applications/misc/termpdf.py/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, buildPythonApplication +, fetchFromGitHub +, fetchPypi +, bibtool +, pybtex +, pymupdf +, pynvim +, pyperclip +, roman +, pdfrw +, pagelabels +, setuptools +}: + +buildPythonApplication { + pname = "termpdf.py"; + version = "2019-10-03"; + + src = fetchFromGitHub { + owner = "dsanson"; + repo = "termpdf.py"; + rev = "4f3bdf4b5a00801631f2498f2c38c81e0a588ae2"; + sha256 = "05gbj2fqzqndq1mx6g9asa7i6z8a9jdjrvilfwx8lg23cs356m6m"; + }; + + propagatedBuildInputs = [ + bibtool + pybtex + pymupdf + pyperclip + roman + pagelabels + pdfrw + pynvim + setuptools + ]; + + # upstream doesn't contain tests + doCheck = false; + + meta = with stdenv.lib; { + description = '' + A graphical pdf (and epub, cbz, ...) reader that works + inside the kitty terminal. + ''; + homepage = "https://github.com/dsanson/termpdf.py"; + maintainers = with maintainers; [ teto ]; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/misc/teseq/default.nix b/pkgs/applications/misc/teseq/default.nix index b176459198242..1ba22911c51fd 100644 --- a/pkgs/applications/misc/teseq/default.nix +++ b/pkgs/applications/misc/teseq/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; meta = { - homepage = https://www.gnu.org/software/teseq/; + homepage = "https://www.gnu.org/software/teseq/"; description = "Escape sequence illuminator"; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/applications/misc/thinking-rock/default.nix index c057fde95d7f8..fd6065010fb6a 100644 --- a/pkgs/applications/misc/thinking-rock/default.nix +++ b/pkgs/applications/misc/thinking-rock/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "thinkingrock-binary-2.2.1"; src = fetchurl { - url = mirror://sourceforge/thinkingrock/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz; + url = "mirror://sourceforge/thinkingrock/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz"; sha256 = "0hnwvvyc8miiz8w2g4iy7s4rgfy0kfbncgbgfzpsq6nrzq334kgm"; }; @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "Task management system"; - homepage = http://www.thinkingrock.com.au/; + homepage = "http://www.thinkingrock.com.au/"; license = "CDDL"; # Common Development and Distribution License platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index f8ae5587ff92b..84d37a4f461d6 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "tilda"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "lanoxx"; repo = "tilda"; rev = "${pname}-${version}"; - sha256 = "13djibj3s7ig13c57ywy38pxy3qfmqihii2c0g15fy2h9q8xp1gx"; + sha256 = "1kk69sg7ph906yr5jagkjx0qfkhr5w2nyx407wl2dsjimbps44rd"; }; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index 2fa193fc8e7a0..4707685e3dab3 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tiling terminal emulator following the Gnome Human Interface Guidelines"; - homepage = https://gnunn1.github.io/tilix-web; + homepage = "https://gnunn1.github.io/tilix-web"; license = licenses.mpl20; maintainers = with maintainers; [ midchildan worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 1a21bb43868f2..25cd3a536700a 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "timewarrior"; - version = "1.2.0"; + version = "1.3.0"; enableParallelBuilding = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "GothenburgBitFactory"; repo = "timewarrior"; rev = "v${version}"; - sha256 = "0ci8kb7gdp1dsv6xj30nbz8lidrmn50pbriw26wv8mdhs17rfk7w"; + sha256 = "1aijh1ad7gpa61cn7b57w24vy7fyjj0zx5k9z8d6m1ldzbw589cl"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index c85feff43603a..dc991402eec63 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://gitlab.com/o9000/tint2; + homepage = "https://gitlab.com/o9000/tint2"; description = "Simple panel/taskbar unintrusive and light (memory, cpu, aestetic)"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix index bbd3073a4d8ee..40505c4fdbea4 100644 --- a/pkgs/applications/misc/tnef/default.nix +++ b/pkgs/applications/misc/tnef/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { The TNEF program allows one to unpack the attachments which were encapsulated into the TNEF attachment. Thus alleviating the need to use Microsoft Outlook to view the attachment. ''; - homepage = https://github.com/verdammelt/tnef; + homepage = "https://github.com/verdammelt/tnef"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix index 74b2b770215c9..b3b3561227f15 100644 --- a/pkgs/applications/misc/todoist/default.nix +++ b/pkgs/applications/misc/todoist/default.nix @@ -11,12 +11,12 @@ buildGoModule rec { sha256 = "0d3c621jaqxd6i58xm6nvi0avrh5mk23r169i95bn73igzw62w33"; }; - modSha256 = "1nnp5ijz4n34gc97rar4wlvlbx21ndpjyb2mc6gxdk1wzx3mgswp"; + vendorSha256 = "0cznb8glh36dwyyn1gx1ggkwa9zffrrxg52k78brnaczsl0rsmky"; meta = { - homepage = https://github.com/sachaos/todoist; + homepage = "https://github.com/sachaos/todoist"; description = "Todoist CLI Client"; license = lib.licenses.mit; platforms = lib.platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix index a0d663efb3ccd..410c17be803af 100644 --- a/pkgs/applications/misc/toggldesktop/default.nix +++ b/pkgs/applications/misc/toggldesktop/default.nix @@ -140,7 +140,7 @@ buildEnv { meta = with lib; { description = "Client for Toggl time tracking service"; - homepage = https://github.com/toggl/toggldesktop; + homepage = "https://github.com/toggl/toggldesktop"; license = licenses.bsd3; maintainers = with maintainers; [ yegortimoshenko ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix index d8a6f86f104b6..ff4faf139e6cd 100644 --- a/pkgs/applications/misc/tomboy/default.nix +++ b/pkgs/applications/misc/tomboy/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Tomboy; + homepage = "https://wiki.gnome.org/Apps/Tomboy"; description = "A simple note-taking application with synchronization"; platforms = platforms.linux; license = stdenv.lib.licenses.lgpl2; diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 7f1c3648f2454..5ce35f3292bd0 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.25.2"; + version = "0.26.0"; name = "toot-${version}"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = version; - sha256 = "0g18x8pbwhk2d3aphah6dqqbhz62k48pwx63flsnqd4brccd0jkh"; + sha256 = "146jj83jixahgxwh12bbkfvci2wrz398h5x01kgppdy59m4pa4pl"; }; checkInputs = with python3Packages; [ pytest ]; diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index e619ab053e7d0..904782f3e1f85 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple Mastodon client designed for elementary OS"; - homepage = https://github.com/bleakgrey/tootle; + homepage = "https://github.com/bleakgrey/tootle"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix index b955711d0030f..2bbb95d01ae7d 100644 --- a/pkgs/applications/misc/tpmmanager/default.nix +++ b/pkgs/applications/misc/tpmmanager/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://projects.sirrix.com/trac/tpmmanager; + homepage = "https://projects.sirrix.com/trac/tpmmanager"; description = "Tool for managing the TPM"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index a2f6980abd9e2..62e66055a2f94 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "translate-shell"; - version = "0.9.6.11"; + version = "0.9.6.12"; src = fetchFromGitHub { owner = "soimort"; repo = "translate-shell"; rev = "v${version}"; - sha256 = "137fz3ahzf65hfqcs4k7hhrmfjlhlw7wr3gfsvk88bnyqkyw44sm"; + sha256 = "075vqnha21rhr1b61dim7dqlfwm1yffyzcaa83s36rpk9r5sddzx"; }; buildInputs = [ makeWrapper ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.soimort.org/translate-shell; + homepage = "https://www.soimort.org/translate-shell"; description = "Command-line translator using Google Translate, Bing Translator, Yandex.Translate, and Apertium"; license = licenses.unlicense; maintainers = with maintainers; [ ebzzry infinisil ]; diff --git a/pkgs/applications/misc/tthsum/default.nix b/pkgs/applications/misc/tthsum/default.nix index 76ac3f75b2660..792b80d04629e 100644 --- a/pkgs/applications/misc/tthsum/default.nix +++ b/pkgs/applications/misc/tthsum/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { The specification of the THEX algorithm is at: http://adc.sourceforge.net/draft-jchapweske-thex-02.html ''; - homepage = http://tthsum.devs.nu/; + homepage = "http://tthsum.devs.nu/"; license = licenses.gpl3Plus; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/tuir/default.nix b/pkgs/applications/misc/tuir/default.nix index e479dc26f175c..11bf70cb56b3b 100644 --- a/pkgs/applications/misc/tuir/default.nix +++ b/pkgs/applications/misc/tuir/default.nix @@ -3,13 +3,13 @@ with python3Packages; buildPythonApplication rec { pname = "tuir"; - version = "1.28.3"; + version = "1.29.0"; src = fetchFromGitLab { owner = "ajak"; repo = pname; rev = "v${version}"; - sha256 = "0nhpbb0vdngwb0fhlimjgm3wq2s67m4rb3vv920zyllnmfplk0lk"; + sha256 = "1fqp6bvq8kzdsf3nna4mn1phdcixpx76bya43xrivxjbzsfl59ib"; }; # Tests try to access network diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 586766e5456c4..30868a9900e7a 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "tut"; - version = "0.0.2"; + version = "0.0.8"; goPackagePath = "github.com/RasmusLindroth/tut"; goDeps = ./deps.nix; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "0c44mgkmjnfpf06cj63i6mscxcsm5cipm0l4n6pjxhc7k3qhgsfw"; + sha256 = "0wb5lf0zbhmg962p71bqlpyxn8f1n9fp1jh7y7fcg6w5mga8gqq3"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/tut/deps.nix b/pkgs/applications/misc/tut/deps.nix index 89453f121a9e2..9264153e50308 100644 --- a/pkgs/applications/misc/tut/deps.nix +++ b/pkgs/applications/misc/tut/deps.nix @@ -73,6 +73,15 @@ }; } { + goPackagePath = "github.com/gopherjs/gopherjs"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherjs"; + rev = "0766667cb4d1"; + sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; + }; + } + { goPackagePath = "github.com/gorilla/websocket"; fetch = { type = "git"; @@ -82,6 +91,15 @@ }; } { + goPackagePath = "github.com/jtolds/gls"; + fetch = { + type = "git"; + url = "https://github.com/jtolds/gls"; + rev = "v4.20.0"; + sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; + }; + } + { goPackagePath = "github.com/kyoh86/xdg"; fetch = { type = "git"; @@ -158,8 +176,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "v1.6.0"; - sha256 = "0l2830pi64fg0bdsyd5afkbw0p7879pppzdqqk3c7vjrjfmi5xbq"; + rev = "v1.7.0"; + sha256 = "0sqrwldjj2qxrgjz1diw1ffviya4ma7mz7nhdgydbisi2h55lqla"; }; } { @@ -167,8 +185,8 @@ fetch = { type = "git"; url = "https://github.com/rivo/tview"; - rev = "cd38d7432498"; - sha256 = "1rs048gf1jip0p20qir99vy5k0f3m54h7bh56l1sh8lxij5qj406"; + rev = "ca37f83cb2e7"; + sha256 = "05nifgrxv6aib8f20mhs9m0grdfdyyg5vyhk6zgwsxjlwbzaj021"; }; } { @@ -181,6 +199,24 @@ }; } { + goPackagePath = "github.com/smartystreets/assertions"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/assertions"; + rev = "b2de0cb4f26d"; + sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y"; + }; + } + { + goPackagePath = "github.com/smartystreets/goconvey"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/goconvey"; + rev = "v1.6.4"; + sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m"; + }; + } + { goPackagePath = "github.com/tomnomnom/linkheader"; fetch = { type = "git"; @@ -212,8 +248,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "118fecf932d8"; - sha256 = "1rwrqfwh2yhnnhy7x0mbmlmk0rg1mi2jjad476y45i259a0c2ym6"; + rev = "d3edc9973b7e"; + sha256 = "12zbjwcsh9b0lwycqlkrnbyg5a6a9dzgj8hhgq399bdda5bd97y7"; }; } { @@ -230,8 +266,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "12a6c2dcc1e4"; - sha256 = "0z1g49d36kh459dz0xhnss2f88vw7n5b3l3637v46f7daddvln67"; + rev = "85ca7c5b95cd"; + sha256 = "1504qkgbhhm4f0bhk77v2r1lj6x171ay5m79alkg78wjb5cign5l"; }; } { @@ -248,8 +284,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "90fa682c2a6e"; - sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak"; + rev = "ab21143f2384"; + sha256 = "15fk0psk53pplpyghz55bhay0kvsv5rikmn5hwgjnnyxq9vfy178"; }; } { @@ -262,12 +298,21 @@ }; } { + goPackagePath = "gopkg.in/ini.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/ini.v1"; + rev = "v1.55.0"; + sha256 = "1b7wsfal3b3pl5pv5n2qix09b3imh0zhirrphlsg5p2rb8fk0d0j"; + }; + } + { goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.4"; - sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2"; + rev = "v2.2.8"; + sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; }; } ] diff --git a/pkgs/applications/misc/tvbrowser/bin.nix b/pkgs/applications/misc/tvbrowser/bin.nix index 38865ca4f3d96..68d25e4e3de7a 100644 --- a/pkgs/applications/misc/tvbrowser/bin.nix +++ b/pkgs/applications/misc/tvbrowser/bin.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Electronic TV Program Guide"; - homepage = https://www.tvbrowser.org/; + homepage = "https://www.tvbrowser.org/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index cd58219721c97..69f58b828c46e 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -28,7 +28,7 @@ mkDerivation { meta = { description = "A notification system for tiling window managers"; - homepage = https://github.com/sboli/twmn; + homepage = "https://github.com/sboli/twmn"; platforms = with lib.platforms; linux; maintainers = [ lib.maintainers.matejc ]; license = lib.licenses.lgpl3; diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index 3cc4fcc1517b5..dbf721888df6d 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "udevil-0.4.4"; src = fetchurl { - url = https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz; + url = "https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz"; sha256 = "0z1bhaayambrcn7bgnrqk445k50ifabmw8q4i9qj49nnbcvxhbxd"; }; nativeBuildInputs = [ pkgconfig ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation { patches = [ ./device-info-sys-stat.patch ]; meta = { description = "A command line Linux program which mounts and unmounts removable devices without a password, shows device info, and monitors device changes"; - homepage = https://ignorantguru.github.io/udevil/; + homepage = "https://ignorantguru.github.io/udevil/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 7b2c499749739..aa2246603f33b 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Removable disk automounter for udisks"; license = licenses.mit; - homepage = https://github.com/coldfix/udiskie; + homepage = "https://github.com/coldfix/udiskie"; maintainers = with maintainers; [ AndersonTorres ]; }; } diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 5b77e13d7243f..34ca82b8d04ce 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -17,18 +17,18 @@ , librsvg }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "ulauncher"; - version = "5.6.1"; + version = "5.7.3"; disabled = python3Packages.isPy27; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; - sha256 = "14k68lp58wldldhaq4cf0ffkhi81czv4ps9xa86iw1j5b1gd2vbl"; + sha256 = "0wq2zsq3496fjfg89q01dsm7sb7kv92sycvqm6ad8z1z2kpisrbh"; }; - nativeBuildInputs = with python3Packages; [ + nativeBuildInputs = with python3Packages; [ distutils_extra intltool wrapGAppsHook @@ -71,7 +71,6 @@ python3Packages.buildPythonApplication rec { patches = [ ./fix-path.patch - ./fix-permissions.patch # ulauncher PR #523 ./0001-Adjust-get_data_path-for-NixOS.patch ./fix-extensions.patch ]; @@ -106,7 +105,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A fast application launcher for Linux, written in Python, using GTK"; - homepage = https://ulauncher.io/; + homepage = "https://ulauncher.io/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ aaronjanse worldofpeace ]; diff --git a/pkgs/applications/misc/ulauncher/fix-permissions.patch b/pkgs/applications/misc/ulauncher/fix-permissions.patch deleted file mode 100644 index 9d743c950f9db..0000000000000 --- a/pkgs/applications/misc/ulauncher/fix-permissions.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/ulauncher/utils/Theme.py b/ulauncher/utils/Theme.py -index 9cde624..4e36c4f 100644 ---- a/ulauncher/utils/Theme.py -+++ b/ulauncher/utils/Theme.py -@@ -138,6 +138,9 @@ class Theme: - rmtree(new_theme_dir) - copytree(self.path, new_theme_dir) - -+ # change file permissions (because Nix store is read-only) -+ os.chmod(new_theme_dir, 0o755) -+ - return os.path.join(new_theme_dir, 'generated.css') diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix new file mode 100644 index 0000000000000..3757c8ce3bb4f --- /dev/null +++ b/pkgs/applications/misc/upwork/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook, writeShellScript +, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype +, gdk-pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid +, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb +, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }: + +stdenv.mkDerivation rec { + pname = "upwork"; + version = "5.3.3-883"; + + src = fetchurl { + url = "https://updates-desktopapp.upwork.com/binaries/v5_3_3_883_1f817bc1fefd44e7/upwork_5.3.3.883_amd64.deb"; + sha256 = "072zns79w4h46bvbj23rvr8i12sf2l378ry0z3hchwcimkrph9wx"; + }; + + dontWrapGApps = true; + + nativeBuildInputs = [ + dpkg + wrapGAppsHook + autoPatchelfHook + ]; + + buildInputs = [ + libcxx systemd libpulseaudio + stdenv.cc.cc alsaLib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype + gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid + libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender + libXtst nspr nss libxcb pango systemd libXScrnSaver + ]; + + libPath = stdenv.lib.makeLibraryPath buildInputs; + + unpackPhase = '' + dpkg-deb -x ${src} ./ + ''; + + installPhase = '' + mv usr $out + mv opt $out + sed -e "s|/opt/Upwork|$out/bin|g" -i $out/share/applications/upwork.desktop + + makeWrapper $out/opt/Upwork/upwork \ + $out/bin/upwork \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --prefix LD_LIBRARY_PATH : ${libPath} + ''; + + meta = with stdenv.lib; { + description = "Online freelancing platform desktop application for time tracking"; + homepage = "https://www.upwork.com/ab/downloads/"; + license = licenses.unfree; + maintainers = with maintainers; [ zakkor ]; + }; +} \ No newline at end of file diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index 791075e4dd9b7..ef4684689b8ae 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Mutt and terminal url selector (similar to urlview)"; - homepage = https://github.com/firecat53/urlscan; + homepage = "https://github.com/firecat53/urlscan"; license = licenses.gpl2; maintainers = with maintainers; [ dpaetzel jfrankenau ]; }; diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix index ad29c8f94d8b9..6430a1bc7196b 100644 --- a/pkgs/applications/misc/urlview/default.nix +++ b/pkgs/applications/misc/urlview/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extract URLs from text"; - homepage = https://packages.qa.debian.org/u/urlview.html; + homepage = "https://packages.qa.debian.org/u/urlview.html"; license = licenses.gpl2; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/applications/misc/usync/default.nix b/pkgs/applications/misc/usync/default.nix index 344c07d845be1..9234d8ad202aa 100644 --- a/pkgs/applications/misc/usync/default.nix +++ b/pkgs/applications/misc/usync/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ebzzry/usync; + homepage = "https://github.com/ebzzry/usync"; description = "A simple site-to-site synchronization tool"; license = licenses.mit; maintainers = [ maintainers.ebzzry ]; diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix index 5a12465c4c494..e9e8cfed796a7 100644 --- a/pkgs/applications/misc/valentina/default.nix +++ b/pkgs/applications/misc/valentina/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg +{ mkDerivation, stdenv, fetchhg , qmake, qttools , qtbase, qtsvg, qtxmlpatterns , poppler_utils @@ -6,7 +6,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +mkDerivation rec { pname = "valentina"; version = "0.6.1"; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = { description = "An open source sewing pattern drafting software"; - homepage = https://valentinaproject.bitbucket.io/; + homepage = "https://valentinaproject.bitbucket.io/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index 6d8da4a1007a3..4241f9153293a 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -66,7 +66,7 @@ buildPythonApplication rec { meta = with lib; { description = "A wallpaper manager for Linux systems. It supports numerous desktops and wallpaper sources, including local files and online services: Flickr, Wallhaven, Unsplash, and more"; - homepage = https://github.com/varietywalls/variety; + homepage = "https://github.com/varietywalls/variety"; license = licenses.gpl3; maintainers = [ maintainers.zfnmxt ]; }; diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix index b25e7f76cefed..9519e033473e3 100644 --- a/pkgs/applications/misc/vcal/default.nix +++ b/pkgs/applications/misc/vcal/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Parser for VCalendar and ICalendar files, usable from the command line"; - homepage = https://waynemorrison.com/software/; + homepage = "https://waynemorrison.com/software/"; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index fe1de349cff92..07e0a046ac539 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = { description = "Free Open-Source filesystem on-the-fly encryption"; - homepage = https://www.veracrypt.fr/; + homepage = "https://www.veracrypt.fr/"; license = [ licenses.asl20 /* or */ "TrueCrypt License version 3.0" ]; maintainers = with maintainers; [ dsferruzza ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix index 680573fd304d1..a322756c157f0 100644 --- a/pkgs/applications/misc/verbiste/default.nix +++ b/pkgs/applications/misc/verbiste/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://sarrazip.com/dev/verbiste.html; + homepage = "http://sarrazip.com/dev/verbiste.html"; description = "French and Italian verb conjugator"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index f71e7a7a9602d..d939beb443e1d 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { platforms = if mediaSupport then platforms.linux else platforms.unix; license = licenses.gpl2; downloadPage = "https://vifm.info/downloads.shtml"; - homepage = https://vifm.info/; + homepage = "https://vifm.info/"; inherit version; updateWalker = true; }; diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 9ce37ea8a4672..03d3256e375a6 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { on the map, make new tracks and waypoints, see real-time GPS position, etc. ''; - homepage = https://sourceforge.net/projects/viking/; + homepage = "https://sourceforge.net/projects/viking/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub sikmir ]; platforms = with platforms; linux; diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index cc88cb1751ef1..4cecf07f0fa38 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -43,7 +43,7 @@ buildPythonApplication rec { description = "Interactive terminal multitool for tabular data"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.raskin ]; - platforms = lib.platforms.linux; + platforms = with lib.platforms; linux ++ darwin; homepage = "http://visidata.org/"; }; } diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index 506ab5599199d..3ae4aacb872b0 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/scottkosty/vit; + homepage = "https://github.com/scottkosty/vit"; description = "Visual Interactive Taskwarrior"; maintainers = with maintainers; [ dtzWill arcnmx ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix index 3561135ce618c..845bdae6bec78 100644 --- a/pkgs/applications/misc/volnoti/default.nix +++ b/pkgs/applications/misc/volnoti/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Lightweight volume notification for Linux"; - homepage = https://github.com/davidbrazdil/volnoti; + homepage = "https://github.com/davidbrazdil/volnoti"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.gilligan ]; diff --git a/pkgs/applications/misc/vp/default.nix b/pkgs/applications/misc/vp/default.nix index a59a25a144e92..7284fa65e8bdc 100644 --- a/pkgs/applications/misc/vp/default.nix +++ b/pkgs/applications/misc/vp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="-I${SDL}/include/SDL -I${SDL_image}/include/SDL"; meta = with stdenv.lib; { - homepage = http://brlcad.org/~erik/; + homepage = "http://brlcad.org/~erik/"; description = "SDL based picture viewer/slideshow"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index 3c6c4a87f98f2..ce45471c2f022 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -53,7 +53,7 @@ mkDerivation rec { While a tree like structure like shown on this page can be drawn by hand or any drawing software vym offers much more features to work with such maps. ''; - homepage = http://www.insilmaril.de/vym/; + homepage = "http://www.insilmaril.de/vym/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 69d6ff8426823..7ecaabe9a922e 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -7,21 +7,29 @@ , udevSupport ? true, udev , swaySupport ? true, sway , mpdSupport ? true, mpd_clientlib +, withMediaPlayer ? false, glib, gobject-introspection, python3, python38Packages, playerctl }: stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "0drlv8im5phz39jxp3gxkc40b6f85bb3piff2v3hmnfzh7ib915s"; + sha256 = "1gfxyjzwfqznyrpyr3322z3w844i1lh77kly4hcpy9y5gsfmlafy"; }; nativeBuildInputs = [ meson ninja pkgconfig scdoc wrapGAppsHook cmake + ] ++ stdenv.lib.optional withMediaPlayer gobject-introspection; + + propagatedBuildInputs = stdenv.lib.optionals withMediaPlayer [ + glib + playerctl + python38Packages.pygobject3 ]; + strictDeps = false; buildInputs = with stdenv.lib; [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ] @@ -46,6 +54,13 @@ "-Dsystemd=disabled" ]; + preFixup = stdenv.lib.optional withMediaPlayer '' + cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py + + wrapProgram $out/bin/waybar-mediaplayer.py \ + --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}" + ''; + meta = with stdenv.lib; { description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; license = licenses.mit; diff --git a/pkgs/applications/misc/wcalc/default.nix b/pkgs/applications/misc/wcalc/default.nix index ff770f516bc55..94c56ba5439c2 100644 --- a/pkgs/applications/misc/wcalc/default.nix +++ b/pkgs/applications/misc/wcalc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command line calculator"; - homepage = http://w-calc.sourceforge.net; + homepage = "http://w-calc.sourceforge.net"; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index 2748d576c692f..ce4fae1cb2293 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://fungi.yuggoth.org/weather; + homepage = "http://fungi.yuggoth.org/weather"; description = "Quick access to current weather conditions and forecasts"; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix index 9b1e9f091e253..e528dab0c9fd5 100644 --- a/pkgs/applications/misc/wikicurses/default.nix +++ b/pkgs/applications/misc/wikicurses/default.nix @@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A simple curses interface for MediaWiki sites such as Wikipedia"; - homepage = https://github.com/ids1024/wikicurses/; + homepage = "https://github.com/ids1024/wikicurses/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ pSub ]; diff --git a/pkgs/applications/misc/with-shell/default.nix b/pkgs/applications/misc/with-shell/default.nix index 6a5f7c17b2081..d3b5541ac4dbf 100644 --- a/pkgs/applications/misc/with-shell/default.nix +++ b/pkgs/applications/misc/with-shell/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { cp with $out/bin/with ''; meta = { - homepage = https://github.com/mchav/With; + homepage = "https://github.com/mchav/With"; description = "Command prefixing for continuous workflow using a single tool"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index 68f6c4df15936..8e760b787b492 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Prints or set the window manager name property of the root window"; - homepage = https://tools.suckless.org/wmname; + homepage = "https://tools.suckless.org/wmname"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 5a1093b47797b..1f0414838adba 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -41,10 +41,10 @@ stdenv.mkDerivation rec { for computational linguistics and natural language processing. ''; - homepage = https://wordnet.princeton.edu/; + homepage = "https://wordnet.princeton.edu/"; license = { fullName = "WordNet 3.0 license"; - url = https://wordnet.princeton.edu/license-and-commercial-use; + url = "https://wordnet.princeton.edu/license-and-commercial-use"; }; maintainers = [ ]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index d8d9598e54a2b..9e3022457a0e4 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "worker"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; - sha256 = "0s7i1qjnh4mfjyrfvbbr1dklqi0n2nwksls21106q633wk9qdlqx"; + sha256 = "1k2svpzq01n1h9365nhi7r2k7dmsviczxi9m6fb80ccccdz7i530"; }; buildInputs = [ libX11 ]; meta = with stdenv.lib; { description = "A two-pane file manager with advanced file manipulation features"; - homepage = http://www.boomerangsworld.de/cms/worker/index.html; + homepage = "http://www.boomerangsworld.de/cms/worker/index.html"; license = licenses.gpl2; maintainers = []; }; diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index 4fc06b5c1ad43..b0020b64ededa 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { Repetitive Strain Injury (RSI). The program frequently alerts you to take micro-pauses, rest breaks and restricts you to your daily limit. ''; - homepage = http://www.workrave.org/; - downloadPage = https://github.com/rcaelers/workrave/releases; + homepage = "http://www.workrave.org/"; + downloadPage = "https://github.com/rcaelers/workrave/releases"; license = licenses.gpl3; maintainers = with maintainers; [ prikhi ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 12780ca73a1a9..330d778c5de87 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "0pybj2h844x9vncwdcaymihyd1mwdnxxpnzpq0p29ra0cwmsxcgr"; + sha256 = "0v6yafpz3sycq6yb7w4dyxqclszvdgwbyhqs5ii8ckynqcf6ifn7"; }; - modSha256 = "00xvhajag25kfkizi2spv4ady3h06as43rnbjzfbv7z1mln844y4"; + vendorSha256 = "1q54bl1z9ljpsf63i5r6vzv7f143slja0n8lyppaxxdcg18h8gn0"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -36,4 +36,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix index 4086c0e094a18..e5dc92c4ad62d 100644 --- a/pkgs/applications/misc/xastir/default.nix +++ b/pkgs/applications/misc/xastir/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "xastir"; - version = "2.1.4"; + version = "2.1.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "Release-${version}"; - sha256 = "14f908jy5jzvgm1h1sr47hjqjq3q2nq91byhimk84kj044fn21w9"; + sha256 = "sha256-IdlRScAy7tCyVCElCceY4PvqPXWfZZ35f+MwCo3nO3s="; }; buildInputs = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical APRS client"; - homepage = https://xastir.org; + homepage = "https://xastir.org"; license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index 295d721d3c5f6..4f441d8a9a99e 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Autoclicker application, which enables you to automatically click the left mousebutton"; - homepage = http://xautoclick.sourceforge.net; + homepage = "http://xautoclick.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 8946e83c94a20..bf6b37b10286c 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { meta = with lib; { description = "An x509 certificate generation tool, handling RSA, DSA and EC keys, certificate signing requests (PKCS#10) and CRLs"; - homepage = https://hohnstaedt.de/xca/; + homepage = "https://hohnstaedt.de/xca/"; license = licenses.bsd3; maintainers = with maintainers; [ offline peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix index 8875c95fe578e..80a1ced563f8b 100644 --- a/pkgs/applications/misc/xcruiser/default.nix +++ b/pkgs/applications/misc/xcruiser/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "xcruiser-0.30"; src = fetchurl { - url = mirror://sourceforge/xcruiser/xcruiser/xcruiser-0.30/xcruiser-0.30.tar.gz; + url = "mirror://sourceforge/xcruiser/xcruiser/xcruiser-0.30/xcruiser-0.30.tar.gz"; sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { It constructs a virtually 3-D formed universe from a directory tree and allows you to "cruise" within a visualized filesystem. ''; - homepage = http://xcruiser.sourceforge.net/; + homepage = "http://xcruiser.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; platforms = with platforms; linux; diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index 56168b348596a..b4d821e1deb11 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Command line tool that generates XDG menus for several window managers"; - homepage = https://github.com/gapan/xdgmenumaker; + homepage = "https://github.com/gapan/xdgmenumaker"; license = licenses.gpl2Plus; # NOTE: exclude darwin from platforms because Travis reports hash mismatch platforms = with platforms; filter (x: !(elem x darwin)) unix; diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 444ab802673e6..29a20e0ece292 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { It is based on the popular, but discontinued, X Win Commander, which was developed by Maxim Baranov. Xfe aims to be the filemanager of choice for all the Unix addicts! ''; - homepage = https://sourceforge.net/projects/xfe/; + homepage = "https://sourceforge.net/projects/xfe/"; license = stdenv.lib.licenses.gpl2; maintainers = []; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 5d2b70a80ee41..c61e64a8a3a7b 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.x.org/; + homepage = "https://www.x.org/"; description = "Allows testing the fonts available in an X server"; license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index 2e81e9b05d34e..ae18ff72d27e0 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "xiphos"; - version = "4.0.7"; + version = "4.1.0"; src = fetchFromGitHub { owner = "crosswire"; repo = "xiphos"; rev = version; - sha256 = "1vwf1ps6nrajxl1qbs6v1cgykmq5wn4j09j10gbcd3b2nvrprf3g"; + sha256 = "14il9k4i58qbc78hcadw3gqy21sb9q661d75vlj6fwpczbzj7x1a"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook wafHook ]; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { and featureful environment for reading, study, and research using modules from The SWORD Project and elsewhere. ''; - homepage = http://www.xiphos.org/; + homepage = "http://www.xiphos.org/"; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/xkbd/default.nix b/pkgs/applications/misc/xkbd/default.nix index d6709ecc1a624..d03d78a9fd1d2 100644 --- a/pkgs/applications/misc/xkbd/default.nix +++ b/pkgs/applications/misc/xkbd/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = https://github.com/mahatma-kaganovich/xkbd; + homepage = "https://github.com/mahatma-kaganovich/xkbd"; description = "onscreen soft keyboard for X11"; license = licenses.gpl2Plus; maintainers = [ maintainers.genesis ]; diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix index abc808477a39e..296d6f38db64a 100644 --- a/pkgs/applications/misc/xkblayout-state/default.nix +++ b/pkgs/applications/misc/xkblayout-state/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small command-line program to get/set the current XKB keyboard layout"; - homepage = https://github.com/nonpop/xkblayout-state; + homepage = "https://github.com/nonpop/xkblayout-state"; license = licenses.gpl2; maintainers = [ maintainers.jagajaga ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/xkbmon/default.nix b/pkgs/applications/misc/xkbmon/default.nix index dc618e4561e6e..1e6384c7d5763 100644 --- a/pkgs/applications/misc/xkbmon/default.nix +++ b/pkgs/applications/misc/xkbmon/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = "install -D -t $out/bin xkbmon"; meta = with stdenv.lib; { - homepage = https://github.com/xkbmon/xkbmon; + homepage = "https://github.com/xkbmon/xkbmon"; description = "Command-line keyboard layout monitor for X11"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix index f65f5bc26e8ba..3e729af71fe53 100644 --- a/pkgs/applications/misc/xmind/default.nix +++ b/pkgs/applications/misc/xmind/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { GTD. Meanwhile, XMind can read FreeMind and MindManager files, and save to Evernote. ''; - homepage = https://www.xmind.net/; + homepage = "https://www.xmind.net/"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ michalrus ma27 ]; diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index a205b402bc8a1..b564c5c530fb9 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "5.10.0"; + version = "5.11.1"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "06nxhrb5vnlq3sxybiyzdpbv6ah1zam7r07s1c31sv37znlb77d5"; + sha256 = "04wsz7hcmzm5dv9q1wb26nvcz5gxdcgkf00cp5bpbr3y9vc6dyz6"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index fc3070d1dcb4c..82247d02c66eb 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -1,20 +1,20 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, libuuid, openssl +{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl , donateLevel ? 0 }: stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "5.0.1"; + version = "5.10.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "0lp11p4lf03l9x2kcpq1j19z7c1zrdvjmcfh2xyvlbw8pqx0hxkv"; + sha256 = "1p8bxp2nv30c3j3kb0bpby86378h6m7nv2vvzw06lqsj5fqbw4g5"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libuv libmicrohttpd libuuid openssl ]; + buildInputs = [ libuv libmicrohttpd openssl ]; postPatch = '' # Link dynamically against libuuid instead of statically diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index f3bbbf42d5bc4..e75055e92b804 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Utility for switching between keyboard layouts"; - homepage = https://xneur.ru; + homepage = "https://xneur.ru"; license = licenses.gpl2Plus; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix index 40f7ef9da08e1..8944011a8d730 100644 --- a/pkgs/applications/misc/xpad/default.nix +++ b/pkgs/applications/misc/xpad/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A sticky note application for jotting down things to remember"; - homepage = https://launchpad.net/xpad; + homepage = "https://launchpad.net/xpad"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ michalrus ]; diff --git a/pkgs/applications/misc/xpdf/libxpdf.nix b/pkgs/applications/misc/xpdf/libxpdf.nix index cf6f5f32ee2af..3b982b1766f97 100644 --- a/pkgs/applications/misc/xpdf/libxpdf.nix +++ b/pkgs/applications/misc/xpdf/libxpdf.nix @@ -5,25 +5,25 @@ stdenv.mkDerivation { name = "libxpdf-3.02pl4"; src = fetchurl { - url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz; + url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz"; sha256 = "000zq4ddbwyxiki4vdwpmxbnw5n9hsg9hvwra2p33hslyib7sfmk"; }; patches = [ (fetchurl { - url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch; + url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch"; sha256 = "1wxv9l0d2kkwi961ihpdwi75whdvk7cgqxkbfym8cjj11fq17xjq"; }) (fetchurl { - url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch; + url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch"; sha256 = "1nfrgsh9xj0vryd8h65myzd94bjz117y89gq0hzji9dqn23xihfi"; }) (fetchurl { - url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch; + url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch"; sha256 = "0jskkv8x6dqr9zj4azaglas8cziwqqrkbbnzrpm2kzrvsbxyhk2r"; }) (fetchurl { - url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch; + url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch"; sha256 = "1c48h7aizx0ngmzlzw0mpja1w8vqyy3pg62hyxp7c60k86al715h"; }) ./xpdf-3.02-protection.patch diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/applications/misc/xrandr-invert-colors/default.nix index 41071012ae9f6..9d57b4fcfac0a 100644 --- a/pkgs/applications/misc/xrandr-invert-colors/default.nix +++ b/pkgs/applications/misc/xrandr-invert-colors/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Inverts the colors of your screen"; license = stdenv.lib.licenses.gpl3Plus; - homepage = https://github.com/zoltanp/xrandr-invert-colors; + homepage = "https://github.com/zoltanp/xrandr-invert-colors"; maintainers = [stdenv.lib.maintainers.magnetophon ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/applications/misc/xrq/default.nix index 244a2c43a155f..e3db746ee028e 100644 --- a/pkgs/applications/misc/xrq/default.nix +++ b/pkgs/applications/misc/xrq/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "X utility for querying xrdb"; - homepage = https://github.com/arianon/xrq; + homepage = "https://github.com/arianon/xrq"; license = stdenv.lib.licenses.mit; platforms = with stdenv.lib.platforms; unix; }; diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/applications/misc/xscope/default.nix index 517105d7e1fd6..4db034476c7af 100644 --- a/pkgs/applications/misc/xscope/default.nix +++ b/pkgs/applications/misc/xscope/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "program to monitor X11/Client conversations"; - homepage = https://cgit.freedesktop.org/xorg/app/xscope/; + homepage = "https://cgit.freedesktop.org/xorg/app/xscope/"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ]; platforms = with platforms; unix; diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 8842d01e70683..109444fc51802 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "posix-ptys.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1"; + url = "https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1"; sha256 = "0czgnsxkkmkrk1idw69qxbprh0jb4sw3c24zpnqq2v76jkl7zvlr"; }); @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://invisible-island.net/xterm; + homepage = "https://invisible-island.net/xterm"; license = with stdenv.lib.licenses; [ mit ]; maintainers = with stdenv.lib.maintainers; [vrthra]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/pkgs/applications/misc/xtermcontrol/default.nix index 51575d62ed501..f7c0edf22420f 100644 --- a/pkgs/applications/misc/xtermcontrol/default.nix +++ b/pkgs/applications/misc/xtermcontrol/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { Window manipulations de-/iconify, raise/lower, maximize/restore and reset are also supported. To complete the feature set; xtermcontrol lets advanced users issue any xterm control sequence of their choosing. ''; - homepage = http://thrysoee.dk/xtermcontrol; + homepage = "http://thrysoee.dk/xtermcontrol"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.derchris ]; diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix index 612e4a557a71b..64d55322896b9 100644 --- a/pkgs/applications/misc/xxkb/default.nix +++ b/pkgs/applications/misc/xxkb/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A keyboard layout indicator and switcher"; - homepage = http://xxkb.sourceforge.net/; + homepage = "http://xxkb.sourceforge.net/"; license = stdenv.lib.licenses.artistic2; maintainers = with stdenv.lib.maintainers; [ rasendubi ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/misc/yaft/default.nix index 2135c7fd61742..e66f397a38307 100644 --- a/pkgs/applications/misc/yaft/default.nix +++ b/pkgs/applications/misc/yaft/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "MANPREFIX=$(out)/share/man" ]; meta = { - homepage = https://github.com/uobikiemukot/yaft; + homepage = "https://github.com/uobikiemukot/yaft"; description = "Yet another framebuffer terminal"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix index f2da2957bd3e4..c5489b8b9813c 100644 --- a/pkgs/applications/misc/yarssr/default.nix +++ b/pkgs/applications/misc/yarssr/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/tsyrogit/zxcvbn-c; + homepage = "https://github.com/tsyrogit/zxcvbn-c"; description = "A fork of Yarssr (a RSS reader for the GNOME Tray) from http://yarssr.sf.net with various fixes."; license = licenses.gpl1; platforms = platforms.linux; diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix index 09a6cc4a3c0a4..6c03bbc33b39b 100644 --- a/pkgs/applications/misc/yate/default.nix +++ b/pkgs/applications/misc/yate/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "Yet another telephony engine"; - homepage = http://yate.null.ro/; + homepage = "http://yate.null.ro/"; # Yate's license is GPL with an exception for linking with # OpenH323 and PWlib (licensed under MPL). license = ["GPL" "MPL"]; diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix index 6b3a4f747f47d..00507d2ee8881 100644 --- a/pkgs/applications/misc/yokadi/default.nix +++ b/pkgs/applications/misc/yokadi/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "A command line oriented, sqlite powered, todo-list"; - homepage = https://yokadi.github.io/index.html; + homepage = "https://yokadi.github.io/index.html"; license = licenses.gpl3Plus; maintainers = [ maintainers.nipav ]; }; diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index eb39a702f93fb..2fffee0f0bbb3 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "yubioath-desktop"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; - sha256 = "19ingk0ab88a22s04apcw8kx9xygxlbk8kp4xnb8pmf8z3k6l2gf"; + sha256 = "1g0jd7mmch6a6n8k5pp3w27qd5cijnvzk05lwraf0i96m68h7x1k"; }; doCheck = false; @@ -38,13 +38,13 @@ mkDerivation rec { --prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" mkdir -p $out/share/applications - cp resources/yubioath-desktop.desktop \ - $out/share/applications/yubioath-desktop.desktop + cp resources/com.yubico.yubioath.desktop \ + $out/share/applications/com.yubico.yubioath.desktop mkdir -p $out/share/yubioath/icons - cp resources/icons/*.{icns,ico,png,xpm} $out/share/yubioath/icons - substituteInPlace $out/share/applications/yubioath-desktop.desktop \ + cp resources/icons/*.{icns,ico,png,svg} $out/share/yubioath/icons + substituteInPlace $out/share/applications/com.yubico.yubioath.desktop \ --replace 'Exec=yubioath-desktop' "Exec=$out/bin/yubioath-desktop" \ - --replace 'Icon=yubioath' "Icon=$out/share/yubioath/icons/yubioath.png" + --replace 'Icon=yubioath' "Icon=$out/share/yubioath/icons/com.yubico.yubioath.png" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 4a6ef041b5401..5d37b5190d027 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -19,7 +19,7 @@ in symlinkJoin { ''; meta = with lib; { - homepage = https://git.pwmt.org/pwmt/zathura/; + homepage = "https://git.pwmt.org/pwmt/zathura/"; description = "A highly customizable and functional PDF viewer"; longDescription = '' Zathura is a highly customizable and functional PDF viewer based on the diff --git a/pkgs/applications/misc/zk-shell/default.nix b/pkgs/applications/misc/zk-shell/default.nix index ec8deadf9f54f..df6e011e4d585 100644 --- a/pkgs/applications/misc/zk-shell/default.nix +++ b/pkgs/applications/misc/zk-shell/default.nix @@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A powerful & scriptable shell for Apache ZooKeeper"; - homepage = https://github.com/rgs1/zk_shell; + homepage = "https://github.com/rgs1/zk_shell"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.mahe ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix index 18876cf355b86..402032b5cec3f 100644 --- a/pkgs/applications/misc/zscroll/default.nix +++ b/pkgs/applications/misc/zscroll/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication { meta = with stdenv.lib; { description = "A text scroller for use with panels and shells"; - homepage = https://github.com/noctuid/zscroll; + homepage = "https://github.com/noctuid/zscroll"; license = licenses.bsd2; platforms = platforms.all; }; diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix index d99a87954decd..425f4fcf2ff48 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/applications/networking/Sylk/default.nix @@ -2,7 +2,7 @@ let pname = "Sylk"; - version = "2.5.0"; + version = "2.7.2"; in appimageTools.wrapType2 rec { @@ -10,7 +10,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; - sha256 = "1jhs25zzdac3r2wz886vlpb0bz77p52mdlrbsbv28h6is79pbd69"; + hash = "sha256:1hz41jan8hw56ahpaajlb1yy5zjkyxrclzmqhklm5x59b76pd0zx"; }; profile = '' diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix index 31eb4dd7378ac..66329b64eaceb 100644 --- a/pkgs/applications/networking/brig/default.nix +++ b/pkgs/applications/networking/brig/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "File synchronization on top of ipfs with git like interface and FUSE filesystem"; - homepage = https://github.com/sahib/brig; + homepage = "https://github.com/sahib/brig"; license = licenses.agpl3; platforms = platforms.unix; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/pkgs/applications/networking/browsers/arora/default.nix index 57db827169eca..88ad2c609bfab 100644 --- a/pkgs/applications/networking/browsers/arora/default.nix +++ b/pkgs/applications/networking/browsers/arora/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { platforms = qt4.meta.platforms; maintainers = [ maintainers.phreedom ]; description = "A cross-platform Qt4 Webkit browser"; - homepage = https://github.com/Arora/arora; + homepage = "https://github.com/Arora/arora"; license = with licenses; [ gpl2 gpl3 ]; }; } diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index bab24d014567f..b3261431ccd30 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -18,6 +18,7 @@ , gtk3 , libpulseaudio , libuuid +, libdrm , libX11 , libXcomposite , libXcursor @@ -29,6 +30,7 @@ , libXrender , libXScrnSaver , libXtst +, mesa , nspr , nss , pango @@ -56,6 +58,7 @@ rpath = lib.makeLibraryPath [ glib gnome2.GConf gtk3 + libdrm libpulseaudio libX11 libXScrnSaver @@ -69,6 +72,7 @@ rpath = lib.makeLibraryPath [ libXrender libXtst libuuid + mesa nspr nss pango @@ -82,11 +86,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.5.123"; + version = "1.8.95"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "1yv6hfjqzcd60b0bjpfbj8d4s2yf10swanxhbmnslcqp6ajb2nqr"; + sha256 = "1mlffg2v31b42gj354w5yv0yzlqc2f4f3cmdnddzkplw10jgw6f1"; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix index 94e939b9ab421..3662c3badd3e8 100644 --- a/pkgs/applications/networking/browsers/browsh/default.nix +++ b/pkgs/applications/networking/browsers/browsh/default.nix @@ -53,7 +53,7 @@ in buildGoPackage rec { meta = with stdenv.lib; { description = "A fully-modern text-based browser, rendering to TTY and browsers"; - homepage = https://www.brow.sh/; + homepage = "https://www.brow.sh/"; maintainers = [ maintainers.kalbasit ]; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/pkgs/applications/networking/browsers/captive-browser/default.nix index 88bd32da8f167..3ce04842c6e48 100644 --- a/pkgs/applications/networking/browsers/captive-browser/default.nix +++ b/pkgs/applications/networking/browsers/captive-browser/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { meta = with lib; { description = "Dedicated Chrome instance to log into captive portals without messing with DNS settings"; - homepage = https://blog.filippo.io/captive-browser; + homepage = "https://blog.filippo.io/captive-browser"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ volth ]; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index edbf97e896338..7c0609730c249 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -76,7 +76,7 @@ mkChromiumDerivation (base: rec { the web. It has a minimalist user interface and provides the vast majority of source code for Google Chrome (which has some additional features). ''; - homepage = https://www.chromium.org/; + homepage = "https://www.chromium.org/"; maintainers = with maintainers; [ bendlas thefloweringash primeos ]; # Overview of the maintainer roles: # nixos-unstable: diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 9f7583b1ef5cf..8ce7c89bf7801 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -24,8 +24,13 @@ , libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone # package customization -, useVaapi ? false , useOzone ? false +, useVaapi ? !(useOzone || stdenv.isAarch64) # Built if supported, but disabled in the wrapper +# VA-API TODOs: +# - Ozone: M81 fails to build due to "ozone_platform_gbm = false" +# - Possible solutions: Write a patch to fix the build (wrong gn dependencies) +# or build with minigbm +# - AArch64: Causes serious regressions (https://github.com/NixOS/nixpkgs/pull/85253#issuecomment-614405879) , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true @@ -127,10 +132,10 @@ let libXScrnSaver libXcursor libXtst libGLU libGL pciutils protobuf speechd libXdamage at-spi2-core jre - ] ++ optional gnomeKeyringSupport libgnome-keyring3 + ] ++ optional useVaapi libva + ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional useVaapi libva ++ optional pulseSupport libpulseaudio ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; @@ -149,9 +154,9 @@ let # # ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ] # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) - ] ++ optionals (useVaapi) [ - # source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi - ./patches/vaapi-fix.patch + ] ++ optionals (useVaapi) [ # Improvements for the VA-API build: + ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi + ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium) ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 564e50b867096..df1dcb413e15a 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -6,13 +6,15 @@ , lib # package customization +# Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) , channel ? "stable" , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true , enablePepperFlash ? false , enableWideVine ? false -, useVaapi ? false # test video on radeon, before enabling this +, useVaapi ? false # Deprecated, use enableVaapi instead! +, enableVaapi ? false # Disabled by default due to unofficial support and issues on radeon , useOzone ? false , cupsSupport ? true , pulseSupport ? config.pulseaudio or stdenv.isLinux @@ -20,9 +22,7 @@ }: let - llvmPackages = if channel == "dev" - then llvmPackages_10 - else llvmPackages_9; + llvmPackages = llvmPackages_10; stdenv = llvmPackages.stdenv; callPackage = newScope chromium; @@ -33,9 +33,7 @@ let upstream-info = (callPackage ./update.nix {}).getChannel channel; mkChromiumDerivation = callPackage ./common.nix ({ - inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi useOzone; - gnChromium = gn; - } // lib.optionalAttrs (channel == "dev") { + inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone; # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-03-23"; @@ -127,6 +125,14 @@ let cp -a ${widevineCdm}/WidevineCdm $out/libexec/chromium/ '' else browser; + + optionalVaapiFlags = if useVaapi # TODO: Remove after 20.09: + then throw '' + Chromium's useVaapi was replaced by enableVaapi and you don't need to pass + "--ignore-gpu-blacklist" anymore (also no rebuilds are required anymore). + '' else lib.optionalString + (!enableVaapi) + "--add-flags --disable-accelerated-video-decode --add-flags --disable-accelerated-video-encode"; in stdenv.mkDerivation { name = "chromium${suffix}-${version}"; inherit version; @@ -146,15 +152,14 @@ in stdenv.mkDerivation { buildCommand = let browserBinary = "${chromiumWV}/libexec/chromium/chromium"; getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; - libPath = stdenv.lib.makeLibraryPath ([] - ++ stdenv.lib.optional useVaapi libva - ); + libPath = stdenv.lib.makeLibraryPath [ libva ]; in with stdenv.lib; '' mkdir -p "$out/bin" eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ + ${optionalVaapiFlags} \ ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} ed -v -s "$out/bin/chromium" << EOF diff --git a/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch b/pkgs/applications/networking/browsers/chromium/patches/enable-vdpau-support-for-nvidia.patch index b5372d1a25565..b5372d1a25565 100644 --- a/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch +++ b/pkgs/applications/networking/browsers/chromium/patches/enable-vdpau-support-for-nvidia.patch diff --git a/pkgs/applications/networking/browsers/chromium/patches/enable-video-acceleration-on-linux.patch b/pkgs/applications/networking/browsers/chromium/patches/enable-video-acceleration-on-linux.patch new file mode 100644 index 0000000000000..bd278633f67e0 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/enable-video-acceleration-on-linux.patch @@ -0,0 +1,48 @@ +From b2144fd28e09cd52e7a88a62a9d9b54cf9922f9f Mon Sep 17 00:00:00 2001 +From: Michael Weiss <dev.primeos@gmail.com> +Date: Tue, 14 Apr 2020 14:16:10 +0200 +Subject: [PATCH] Enable accelerated video decode on Linux + +This will enable accelerated video decode on Linux by default (i.e. +without "--ignore-gpu-blacklist"), but on NixOS we'll provide +"--disable-accelerated-video-decode" and +"--disable-accelerated-video-encode" by default to avoid regressions +(e.g. VA-API doesn't work properly for some radeon drivers). + +Video acceleration can then be enabled via: +chromium.override { enableVaapi = true; } +without rebuilding Chromium. +--- + gpu/config/software_rendering_list.json | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json +index 22712bdbf38f..a06dd19a50e4 100644 +--- a/gpu/config/software_rendering_list.json ++++ b/gpu/config/software_rendering_list.json +@@ -336,22 +336,6 @@ + ] + }, + { +- "id": 48, +- "description": "Accelerated video decode is unavailable on Linux", +- "cr_bugs": [137247, 1032907], +- "os": { +- "type": "linux" +- }, +- "exceptions": [ +- { +- "machine_model_name": ["Chromecast"] +- } +- ], +- "features": [ +- "accelerated_video_decode" +- ] +- }, +- { + "id": 50, + "description": "Disable VMware software renderer on older Mesa", + "cr_bugs": [145531, 332596, 571899, 629434], +-- +2.11.0 + diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 434bd77b6d185..d45a3c9f864a3 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -45,11 +45,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.344"; + version = "32.0.0.371"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "05ijlgsby9zxx0qs6f3vav1z0p6xr1cg6idl4akxvfmsl6hn6hkq"; + sha256 = "1nks2wx74b21hv0l7bnrzkxn7c6p6r8zgwbqvy3cqpi8famyr5v9"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index c5f9d60122dc7..13b501d269903 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"; - sha256bin64 = "1y70kmfz9nv507b0zdda7zfk2ac9qh9m2gq00aphdmzd0al7skj8"; - version = "81.0.4044.92"; + sha256 = "1g052h8g458qx04wbkz93j7hciw12b2b3w93x2849ag69q6g4qa9"; + sha256bin64 = "0lkjl09vnj2bd1jry3awbg4z34vjnzd88p73a6x7pyrfq079l6vb"; + version = "83.0.4103.61"; }; dev = { - sha256 = "1rydvjmv62zj95sf0fgsyipqz2hphbxm60y8q0813wq9ym35d4yy"; - sha256bin64 = "1m6740lw7xjjp1lplwp9ii4d3l7dfa9jrv5bysm4ar5pb9kywrai"; - version = "83.0.4100.3"; + sha256 = "0f7m57acv79yzq3yg2xkchqqwisdgjv8h5xngp2i2v2md9jkfkbq"; + sha256bin64 = "0b0w0nwa64gf99d617idjjgrjym3qc6p9h41kn5r9j2x46lxzply"; + version = "84.0.4143.2"; }; stable = { - sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"; - sha256bin64 = "1ig899cpahw1xfhdff5xj6w4k8jja5smxvrcbw6b0jcjmawdrf72"; - version = "81.0.4044.92"; + sha256 = "1g052h8g458qx04wbkz93j7hciw12b2b3w93x2849ag69q6g4qa9"; + sha256bin64 = "1wji1ak6gi2a7lynxwvgpqsaz7zma9h2b9qbb5x3gzbv2dj37fmd"; + version = "83.0.4103.61"; }; } diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index 8d6c99d2468c9..fa1fa76340c32 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-ssl" ]; meta = with stdenv.lib; { - homepage = https://www.dillo.org/; + homepage = "https://www.dillo.org/"; description = "A fast graphical web browser with a small footprint"; longDescription = '' Dillo is a small, fast web browser, tailored for older machines. diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 8d62bd7d5cc17..985497a095cb4 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { name = "elinks-0.12pre6"; src = fetchurl { - url = http://elinks.or.cz/download/elinks-0.12pre6.tar.bz2; + url = "http://elinks.or.cz/download/elinks-0.12pre6.tar.bz2"; sha256 = "1nnakbi01g7yd3zqwprchh5yp45br8086b0kbbpmnclabcvlcdiq"; }; @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = { description = "Full-featured text-mode web browser"; - homepage = http://elinks.or.cz; + homepage = "http://elinks.or.cz"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index b9b183a03ff35..cfccacf1ae08c 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "A new GNOME web browser"; - homepage = https://wiki.gnome.org/Apps/Eolie; + homepage = "https://wiki.gnome.org/Apps/Eolie"; license = licenses.gpl3Plus; maintainers = with maintainers; [ samdroid-apps worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index dd0365760f94b..69e8179489cfa 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "ephemeral"; - version = "6.3.1"; + version = "6.4.1"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ephemeral"; rev = version; - sha256 = "13rl26lv5xgagiv21yp5pz69bkwh4nnz1lx9wryhsplki45xm1sq"; + sha256 = "1lzcwaczh601kwbx7fzg32nrzlg67asby7p86qy10qz86xf4g608"; }; nativeBuildInputs = [ @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The always-incognito web browser"; homepage = "https://github.com/cassidyjames/ephemeral"; - maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index 6e21456a9a925..954b45a2042b4 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -36,7 +36,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "QtWebEngine based cross-platform web browser"; - homepage = https://community.kde.org/Incubator/Projects/Falkon; + homepage = "https://community.kde.org/Incubator/Projects/Falkon"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 20e08a8c3abaf..56910dd1e79f1 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "76.0b1"; + version = "77.0b7"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ach/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ach/firefox-77.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "c008d921c75cac20b6840f677739c79bceeed87a3808b60b019c0c59b713a46896a5220d9939126df7f10382ee0a7dc3d05aa35a0a6e64980617e135b15f9ed1"; + sha512 = "faa837577f00714097bdec079b1df8cef64047fc9225df81e3531c6e0adfab4abdd82cd7184155d13eab152cd117804ccdb7c43f2893b6f3ff3bc1077e125e77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/af/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/af/firefox-77.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "e68675ca9acc285eb8a466e01369e3c39ff727557ce3a69f4133eb085f8ac0b95060317c9747d3ba8c3a04bc2f2bf0517157065d6f0d01099ad610f181e30d0d"; + sha512 = "32a963ca337c71702c5a6da5b3131af4b83fff24a27236a2cdc04bf191f1fc877869ae3ad3762e78a5d0f384bd104f89a019d405f875df1984667449fe31155c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/an/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/an/firefox-77.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "27be07732ae15f9c9ea0dd080539a82440b48d766f2aadc8cefaaf0ddfe2a1cf39c907a5bd4e57f505a9919b25a1582b3147941704fb31e70ad24cf4dc771844"; + sha512 = "6729c589b1ec63e0dda604a138016d37507479205ac477d12e63859c3937e1c82d10c72b0bf419ab516d9ccb60a86e0b60cc7d3f595ee90c10f7200201c5bc39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ar/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ar/firefox-77.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "fcfb58f2bf79f3fbe35d9c229b22132f43800baa8337408e4d13b6500ebcfed9bbf594b9c3560af992d9bc1243cee21bca1a590d3b2526fe1c999938bd7f8dfc"; + sha512 = "c03744d53d95663133696f277aca2e6d22f07eef1c61c94c478893cb09605169bbc34d0558842444a454e31921e6d29349dd6cc410a9276051df5a03c1c7d6ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ast/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ast/firefox-77.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "1d86aab0f0288f4de8ca7c87c1314797e648244486fcbd26a3b95785d1f4f9357f0573cc53fa72301d7cff60a42047a249c5cfe0ff2544d1a443d550cfa98199"; + sha512 = "a361ecf02bc85ca44ba6a8e86f91ef11013b86fa9f093d330ae43e2347e560d5112b8012a5af8940afb0e34fdcd6003030149daf33dab1ba8f8717855e50d6bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/az/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/az/firefox-77.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "f61b53831dc9b83b007d1557582f6e36c0d169e7f4868c5959fe96e1840f7fb9e131df663c70de21b6657c67526d5650ab3795b28c46e4002335403f9f08988d"; + sha512 = "7a6baa17135213be0a21257ec9f0bd1522f0e402a3746f58bb605cf2cc4b947163696313fa60cb6148c073456e3b4bfeaf5d7c948905657c1517ba6cb4976b4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/be/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/be/firefox-77.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "80d9d24897ff9d20011e458306b7a3b76714f84a06ed595b70f1e6713377faeac0054b6d6d7d7571a9eea8a455af33174ebd27379f092d578f0a0326f37b043f"; + sha512 = "45f3af3d2378f48da55d2793f5b9c57835fdd2f94ac2f15614db1cb0b7b717c9ff744ea101646add604867e6ede53f62d191a12f48df071b46b57ef114dfd3d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/bg/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/bg/firefox-77.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "cdaf01b156285869a94952f9a330029c5c99d4ab098280104f1957d71cc5312dc1028a0aaa39ce1e93db76bf5510ac6c04d8c3ce759ead3f47806f8e25bdafdf"; + sha512 = "f01e95c639dd864de6dc7742260b29a4f7b9aea0f1c404d1f00068ca5ef67fb85fccefbe443ef7fc13ee58031ad3d1d38d1c71592e8b1aca7fc215f4314f50a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/bn/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/bn/firefox-77.0b7.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "6eb21882bae779ed7ada1f24a63cff5281d21034972926234a1186a6a20b144f19e157813cc041b81a4aaabdc36a8b32b30b4646fabf9817e1fc903b7c13f538"; + sha512 = "507c26d022d1935e007131252ee0798759ef93df65b789f8aee0ad1724929524f23f0a911d7ce5a8a82f6bf7ed2dc845da06b465ba23ab51103584655db12e2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/br/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/br/firefox-77.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "9bb5eb2fc197a33ddbbaef9485c16c940dab78788a52e0ebe59a43f9e8dd6c9b73ca2b9c957f0ae27451dd23e34fa394c138d5cf7669722a4f4b3cd4c27a79a5"; + sha512 = "070b062286944c8be2b11d81206f18e5ff9e35373dd70e222d7ed252c5e42bdced507bb31cdaca8f9130ab5f012282555d4c7c54a6d216e0ac2c9f222f338358"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/bs/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/bs/firefox-77.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "041640d96d7e3ceed3353faed37ba4f8ae243f48f845dec3a5e97362f0c0cbf4d7c50ee39cc96986596461eb3e2a0ce6a8f5c5bab37c0edf6d76e97c61882bfc"; + sha512 = "fea2e69feb05419faab82623296845673434f269d391d52b0bc4e0b1d4c3d55ce9b6b8b7ced70414a5a1266ef5cd55faf9c31c3dfbbfe7c08c609f821293b199"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ca-valencia/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ca-valencia/firefox-77.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "fce818eede4f8850497cc8fdf030a16b5786b05c87e28d3d184c99872d56bef47160e0bfaf70e653c97a2e89890269a8df03b9c7a903f53afd952cfb77153ab7"; + sha512 = "d2dd835fd2a9b179ec44963df2aa38b0e8bcb46ee55bca312b6c59cb3f82857039239e51cbd224f8c66f2760214ed52da9021b9895682897231c8e7d3733e89e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ca/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ca/firefox-77.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "13980c330ca6c2229d0a350fb525a88628a5ec220606ec9f0a84f8592ed95f8a37a211fdd37e219848058fd106fe407a69400e8c994550d783d9af0720dc09d5"; + sha512 = "14f626b4aa9096334d563fc853afad428d2de8d2cd7f80d512464c219f1326568530be08cb318e0edce0489c9686364471e92455db9ceabb97e497f327acecb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/cak/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/cak/firefox-77.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "5eada744dbd15a7c32b27ae897d185497caa51838cdb818cf45c052e38824909e6d90e58270194c091cc72805ba74b1062027b770290ae3f01566273a47c76ae"; + sha512 = "ab25fd7b09a8c46a452a57e3e5586188a9a614bc884cf7d133460c730c5cc20945e4d29d54229be17ac5101f1c2aadb937a0a116d2f0fa8fe83e18b3bda003d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/cs/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/cs/firefox-77.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "f47feb99877e60ee021d0398b935c5f83a4b91db4677f3b26349f931ee66f7b04a430449e8c5b92f833c5a6e3d3f407407ab01a30db248984244fbf5f42bfe22"; + sha512 = "bf62968ad7aab66d7b931b33953aaabae004de2b3224d099ca8a600ada0cb7c1e7703ab7e4fc3699942cc2a0b1b37a1af0b93aa3134fec7c6aa8e79e9eb19c74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/cy/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/cy/firefox-77.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "a2f6acd4a15312281dfbe7866c73faa45ef2d07743b9f0566fb3b59e7af57f4cc8cbbac6a2371de56d2c7eb0be31fb1669128c80e942dc15b32fd435586d92cf"; + sha512 = "0bac8d012df7364429f656e8b20e94b18ec1629111e4c3675c2f4d8b9104de929ab1833bb28ac5ebdbd20f3e8f0b0b393ad1857308c57a76b8d465e0d2c731f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/da/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/da/firefox-77.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "dfc7cc47aa160d755dcdd790c89742cdcc2515c4c2c81f5d52dc6cd508ed90798fb94605514961765f4f14302765707979c01994b6d123836b4d59d7eaf2914c"; + sha512 = "990899501c4fb0228817288f06c9af9f295101af053412a3171f2c3a368cd7047388b43c07e4fa205c3c9d4e2a19dd7232742e46bbcfa128494c274a98e01f41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/de/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/de/firefox-77.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "e21c3b489c50b40756523da080fca8b16fb77bb34ab452b58225a966840b6a387e738c576c2523fd923a6a7ce9f2bfe6ee90d55a008d27caa36aa2abbaabfbab"; + sha512 = "c093c2304f95151eccdd694f714541d92c99327534645ae3b9219b779776aea0478d5a7539cecfac4c22e6e49b02ca2e92442343a9b818a79fee6a3c100887da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/dsb/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/dsb/firefox-77.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "5114f6bc86fa3c0c395af4bfe83c974272372371eace78e5d12418785981085bb4fa4b7ac37a27b6f5b9733d393d00aa88c8b7741aa7bedb58db26e59cfa39b7"; + sha512 = "ea83c7500ed8c59b6edc128bdd77fb4ab608f25f020d91bbe1b76970f7a054fd4c5492ec8d3bf4ddb3105957cb89deca16eed82895435998233731c658c1bc1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/el/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/el/firefox-77.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "068d55f47619a1c1e281b480444c042a7346620b5291d2f0092138e7bb5864288a73afbd6d17735aaef2668bfa3d849239c3d8dd20b129f86e3776d89733ae95"; + sha512 = "c6c32e780edb3feb57874efb61a0e155ea3dd011008db47ec9fae19fa035d01657a3b4fae05407dab5ebfb72ae00dee9680023c9d2d2f572a4f59e3f7e42cbe3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/en-CA/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/en-CA/firefox-77.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "f0dd5496fe3550c8cc13159bbc10173e7f9872110cc788cdaee0bc03db228146742e05c602f62b19dfc4d6fddd8d6c906fc5b797f178801aff1e6c933175ea91"; + sha512 = "6a9a96205a2edd93c08d10ff0b9456a7964a167ac20e881b37e21cfce169455ecf3f6aab39719574f102d7f1b3322b829a20399601b156d0f9cd465a5f0a9a60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/en-GB/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/en-GB/firefox-77.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "2ad9c48ff43c64e0ed013479f489e7341ef2d1dfb58838f8a70d0c639cbadfa32adca1290853c59f87c3b05447c0f1b89ce9f749d62a3776ab4370decd2f2803"; + sha512 = "94bedfeaf71fc9f8a4d0e0d79e47790e0fa70838fc2f3759255e4f5466cb26924e72aa044de2d8ba238569eb1a77092f5dc03ca4e7267f745b26689355056fcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/en-US/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/en-US/firefox-77.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "04675d0809a12a749ab9d4733281ff91777e9701fd205d417268a37e9b022aa1e6a8a4e7df41e115fb7beeeb953122bd5c60f6af81fb1bba1e83aab723eab373"; + sha512 = "fa03a78389ecb11ff3c76e182bc1b84cdc9043eeb9d9648e38a7b3362e22f7ce2cf1fc0af9fabce3a2d103f169f74e946cae4cb655a868ae26cc765e25155dbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/eo/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/eo/firefox-77.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "b755b912eb0c4fb3a7b5af88c1340e105c1279cc8dd044011b160c24d028c651ffa37259858c52199aff69ee6e748f284cce29c977326fa9770255d346f4f75e"; + sha512 = "afd6821d1a76097f7cb8285355c554d05d694e7c5bfed2cbde0b9d5c25512d2ff5d4c338a342fe546c3094152fe0f196f4826a859ea4eeea9a69a91198660c32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/es-AR/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/es-AR/firefox-77.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "0ac533f801714d9a594b0a15061bb01681c0343a0fbd593eba54466a3ef29d9ec796a32a88363c7d079df52756c0060ed194eb1f107c2d4c696f4d0d8650b66f"; + sha512 = "90a821a4db378e64c74f2a30b951febf1d56fc91dd1746ccfe789614f9b5ca61d78b4374cc01eed4b776445a00956eba14bfe402dbd360241a6542cf37a64e5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/es-CL/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/es-CL/firefox-77.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "e17066e0b3a6891c92dcfd935dd9e5326d56f1925533c5373ad0fac50c82fb3d9e06dc43048c519b0732a082d88c93a66d64962b632541411d7addfa337e63f1"; + sha512 = "ce7c9a90de740aaf21c23404f335c16edd0647dc44167e5cbd55491f7edd4135ba8c8c220cd65a76fc7ec91972b1b53d0c9f61b571aefc920049f590074b776f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/es-ES/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/es-ES/firefox-77.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "1a388f4115f854ed8b733b4b358c5dabdd9a45104cc7e7e7d2d19607c05ff7f63d40fb185231beb4a367fc9f731c0b4c194fd1678372210011f95844515ecf04"; + sha512 = "7c3fc75ac74feff0ef0862cff2b476d2ed847dbba717889d848bd9d9265cfdbd0c8238337f116bd9976955d51d0e1165cfdb643e6d67e85137d8481abc323d29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/es-MX/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/es-MX/firefox-77.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "227778965653952dd94d88f7995422debd7ab489d8280ab26e8ea2f1d1658fc3eb3232e030778ce3d200bcc80d71654607c163d7607947faac72635b5abb2b47"; + sha512 = "c5f8b98ae9166fac5c9da9d39008bbd43aa3548ab451f0d47e096a2e22e5b5ad4acba5aedc1ae0e1d67dca8c1789a2e1e9e65124a3fa816b0eb31eeaa22d050b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/et/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/et/firefox-77.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "12ae12712cfbf97d5d163630eed0031fef0ff9e4dffd02a0568dc9edc5d5986d8398368d02b85a795371070af0df6d9617a93eb0fb8007bc2570c7350a5b4221"; + sha512 = "3ba3213746a3d22c3d332946c4a98702689b2a7427fe5742e47cb696fc04817bf9fb3511188983050e14ab33135661e7104c75e7ae1439048f3762c08b34a0b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/eu/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/eu/firefox-77.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "c7a94d0d45391522eca37bd70f2f695fb63d9f1c0d8f02e368333dddebc2e9a81843a7e0562186bf39bd3c1ffbe6f8d549132cde6273b938ff903e4bdee42e24"; + sha512 = "433eec6c2b3d03e6c4d549dd09017d04685c2079c6bd3d34773ac424c871013bcfe57f872083ee5c3e5578208cae79c151b3bc1d5943568827f6edd8de196460"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/fa/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/fa/firefox-77.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "db47c3b5f7e270ad93b98db65b433956a6f2f4137f95b66e4a83f6f2b8d3ff6d58f845d2e19af609a3069f1e4f724767c58228c1d003e5004be08a61dd4c7a6b"; + sha512 = "5cbcf27f43ac79f802fd05c90d7fd0364be88acbce0e994bb7a867f378b5aad146a1c667426d736dafe0ade86a5d91abb2de4ac1a0a897dec6d3c38a94cb62c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ff/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ff/firefox-77.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "dfa42eba7f9300771ea1dce4f6820263a7e819832781213adebe964c14fd46cb3ebe9659049cf5bbe72b641588297822485c091627e36636dae697b568bb46bd"; + sha512 = "4a0416ed025073d5a41ebfd9432ee1451917c3b1ff94403011c381170c558be4f1ed7fc052473f806be4d035c7e16c266a2d2db5b2d7a2bb2b9de1d236280077"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/fi/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/fi/firefox-77.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "c27dacd68b99f1102047a9b72ebfbf6e0ff888f665c1727388614805df83135c134a4c8d819502818a0361a81598ddba5e06d2752b6404ec8c75664dba6f80c3"; + sha512 = "3560e1528fd40497e5e16ee7c0f4ab76fe71e77e8e8f938a09e2b89fd8c6d1fb3389d4b95807267101a7dcc361f47d227e5831e5bb7416e45d0b1435bd728f5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/fr/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/fr/firefox-77.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "6bdb52fabd84fe04fb1bdc2ef8bc27b8e133f043266aa5e204245e7a1a55150283e9960703cf171729f800ddd72c5343ae7b3f73bbecc1832a166d8b49b7f007"; + sha512 = "d0e7ab281050f7d2cc8804660e5bc5e507c3dfe4fc493c3082bde5f6d6b41d596b92903f821e5d37ab94c819cc97d55f2a266627b6be42e492dcb8d2d99f826c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/fy-NL/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/fy-NL/firefox-77.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "547050b68cb5cd8b108e37add411aadb2150b81de18bb969a7e3606f46f2e4a1c5b13107c3e380332f4fb618283bce06e320201012bcf3857e4ffe7c406dcf04"; + sha512 = "5995b510a737396700316f32ac7484545c93f8957ca8faa0c40678d0271ca650ed28014e301c00b721144f386ac37c0410f28f550381f6561b1f6754a1f8df79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ga-IE/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ga-IE/firefox-77.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "2476df820a78769df6bfa0270b096e4671a0aa6b80600ea792742b8c2117a7f10028a46aa5343895be9d4788e3cd857b2030cebbc80600c57ce8ccbecacf65b8"; + sha512 = "11416a57a298db37407f1c0998833f16bb580a00a51902fe6efb7c38e6ed01806ef9007f871331882253880ed277ebf87266c0723228d5a747537be910f64858"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/gd/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/gd/firefox-77.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "81930ac202d18c6b3d5ec52edca4e5cec3beacb53af6e98a2fa55e4d82b60d1375e61f0ea27aceb9a393c38042c12642ea46ec4f58ff0fddd14ff99a4111313e"; + sha512 = "3128f71da4e849307fad30e0531a891f6de58a61641e7b641e5b0b8dc3c4e0d0883ac1581f5d1cd09c28130fb1d087c4f1a25582672b6af3efc70a2390af2884"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/gl/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/gl/firefox-77.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "0b34df2212eb393bb803407b7f79fb99c22d2b3217dc243822773be76fc9b434ebfc88485ad2e67a56364501f64936860c5f476d09a05b2799f6dcd6aa2c8c24"; + sha512 = "e0297f754c9599491d5e0f18c45f3570a0589f6b8750c2500b973b176ad963f56f5e44eeecebf23faae2d1cf549e9b7ff6a02a2b403e7cc3a05694315ed7d4c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/gn/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/gn/firefox-77.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "5135158c12b398bd0fa9caf3065135e4b84118b83e4873cf98721a8f2a93198487b1aba3935f778aa6fc0fd5ca781de175adb4cd322b501f8ef42b92e19cc459"; + sha512 = "c84d8f600b84e5c665e7acaa36e640ce7e2a6758a210a55e0a3b4d0b43890ec0d39269029d480ad9b2c4cebb2491784c99313632a3e7858d73fffbb16a77e425"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/gu-IN/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/gu-IN/firefox-77.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "b469c343d792fd9fce3bacedb04d7c309b21bd8b01c5cadfb418d4207be48fed80624c3893d36240e45c9409996d9f86b96992313494525c6e4af5e366982c48"; + sha512 = "2ee2ef40e4ec35eb36c639e0b5caaa9bad57e3ecf5056c99c6d3e5d4bc12dc116a0dda02621f06924131097d921987364d7db5beae5f1707525af251ca922ad8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/he/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/he/firefox-77.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "99f2abc9f02aabd89e03e414b317d797ad0e9c7d9debb7d7029c3381d0764504aa4e65ffe45e08c0e9c2f48f5d97986284ad1372bd7b9dc68b157e1e9a058e1d"; + sha512 = "1cd2ba19b79b94044c7da3072936e5d2c663e965bab9e7a2fe04ead68c0de1e94e4093f4321d1b07342fa10ceb6d079e0ea2dd1d818b289c6b4a8a935d3d3006"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/hi-IN/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/hi-IN/firefox-77.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "ff7fe6d665b6efa694e91a6560c83fe4210d9ddd110c9436a20742e5b657c0f46345c25c53fc0c30a82582efdb1fa1fd53d328e9f2c85c9b800be04ad796a7e0"; + sha512 = "09249512d40303a35acf62d7ac5dfb5f25d5aade17f163b7abed95f08eac9e7bc5f67c4939a539ba7c2fa521aa67d05690b08d1c7541abc329467861292d556a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/hr/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/hr/firefox-77.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "6168039b77edacad882f06e68a3591e5de7f2980619d17b7cc01b0ed41ae5d57b60f2aacc29cd7ad4a92317a87c3f5de97942cb8f78642a2a29c130c04535bf3"; + sha512 = "b2fc193b0017b81155db010ccfebb37b0f631526b18a8061ed626654d0d3f49cb973aeb0112da9e099b7dcf232a9967e2a7ae81ca2d76a6329c62d1f72d0e5c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/hsb/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/hsb/firefox-77.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "155d355bddd648bb63bb51112b1d443a212297288f8035b1a0c7dbea3209ade492c88bcff371d369fe2cf1910d1ea0027d162fd148dc648b464569e8d51545cc"; + sha512 = "7a7ace8330802da958189d06e51b61eaecc536c8808421ceadfc9599547c7314927b08e1c595ec1e73651d5e74863a1d5ecbbc09cc11879fc9ff4dd16c6baae5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/hu/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/hu/firefox-77.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "231bb489d45f47c827d7bd7a1675ed422c1e2af10da0817d599a8ef0cf27b51c06dab0f79957def6625baaa61994097020f539de2ac7263bf09efdb12c6a5ed9"; + sha512 = "4a79b19ff66417f61abb12ae77068563a493c4983d41bcea198f3ea9b646550cc43061e49a5c641d56fd030de99154c37767098dfb36209ed2287afbe8014812"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/hy-AM/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/hy-AM/firefox-77.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "4bf95879356abc7f0e7b7373da4fa3a9c12ac3dc544b05549303a8d445730987f4d4b1a6f4df11b83f2585e97e160caba5bfe8a76fab041a5c21ed89ff8ee24b"; + sha512 = "4d0ce5ab930e49bae189e3bebb84f3a05611b13b674cc0cbe71eb3760827115c24a27457a2dc4ca4277007733a785093742e331dd961edc2feebe98f6f74dc4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ia/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ia/firefox-77.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "3404f0434c4794a3cee7874649ba74e6a182164369386812a447dc088bf3733eaf1d370b90cc393d534c38d705effe558914d43725c0d7678c3240ff89e171e5"; + sha512 = "2824698f01cfe336f2e292387c0044f7ae15949ae561e0944f6ab6a44603e73b62b95eb7fb0dfe8ceaad958b111ebb0a709b5efd07ecd13644d4c6334e3bc1de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/id/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/id/firefox-77.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "33903d23a2d3d2cf0a674f5a2e396af98b5323172a17b2c2f8f57e8666d61a31fd5615fcb1b6aa7b82614a0decc2e7de1db61451809f91d1fca5196f2dd2e998"; + sha512 = "8c126ffd553fe98919a307e654321385598aa21343ee7bb4e7241b3bc59a825faa9b7e13ee1a98f3d322205d124fc19cfe53e0503f53794e01b1b28a5ed2e1b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/is/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/is/firefox-77.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "ab6dc63a4d99ef251210e267ed5c14e8a81b10b2e3aeffe030600e2cd8206d55cc89c3950900dff127270ad51a0cbf54f2569c8c5b65beb805fcaaac9e904a7b"; + sha512 = "d6885c9858853d882664577748fe5d3cc0ccde79867ec21e080b1fe799a895f0b93de2456e1332e5600ecf5286975b7d170dfd4ebaf66cdd276b7fb7d5a3f415"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/it/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/it/firefox-77.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "47dee92970f981b18b6a2bfdcb653001b44dffc165c535e5ea79a5e2b7cf2629675044d090f4e741a7a022d175c36a33f5afa225951cac0d70d999a3c63e311d"; + sha512 = "249a07a88d7e6c9fa779956547a4709fe8cb75113a40aef9f8261709aeb8412ff0a2ac776096ad043c7d00d7cc03599cdab11df021d2b7a926f8fb8261fae8bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ja/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ja/firefox-77.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "7ae184daeecd38289e6c3f4060162bec02a0324319b84b68da1588614c6afe6f28744b482b05b70b33031ff2928ee5e66fe9fdef0d3772f112b0504a3a4e0bb0"; + sha512 = "a71922abcb69e483a84aab49893caf580b6cfcc2cf25138342e45fae6a925c4ce8b71ca3be7c606f6d4bb56c5a0e32d2b8305171a45ad90285b04e4f59be7e91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ka/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ka/firefox-77.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "1cfff13b6f904cf59c6a3dc1c6677e5422beb636abf399d6cf5a6c56cf052875c34ebd6582cecc881a9351207ccf6b230389f9e860ed5ad98850dc0deaf5ee44"; + sha512 = "2af6292101878bd056844ad8bd98c1c200004faf83bb40206b979439718c2c652ac15cc5be7713648b0821aed6876bf16e68964273c307c17c38d7c7cdf4c997"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/kab/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/kab/firefox-77.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "846c208fc457b855cb3c41a62d71fbdeeee5e4414e2eeef078681653f7ee6cec3a8e1c1f83005890032d71cf417fc5589baf5007f2d262155fd0df2145964be7"; + sha512 = "bff8278ae5c4fe87daa0a04613b979386aee97ebe0aec8d80a6ac79ea13de791fc9f8ebf46d6b200d282c0fa9a6bdb3923051824ebede1a1d7ff4623b6511731"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/kk/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/kk/firefox-77.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "025cca3bc228afa9fea18f84dfd111fa9b8c1d8f529107662f963f63c7311166e812ac5e5c892d4e5a1565ddc718c915eb5981de700096e2e8ef5c699bd2d54c"; + sha512 = "9e94630f949d32e0f53cd8a9658d777ded9fbad464de542ec4f606c4befb1ade55efc56afe692c6c15ceb969b1c8b5196e342e795eae5de6eeb27744989c8d33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/km/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/km/firefox-77.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "dece035ffd0267c56242cd1ac3ef0bd001429ce3a32395e8ee27786384cec80db928148b3253fcea976858ee7c943eca5275d1b2b92ae46b7e8519c43cc7616a"; + sha512 = "8a38c0ba6ec5a37a02f7d24419cc43cef75f9549d3db8c5eaed8e5a00e534877c63c71fbdc5853a4886ea787d5a513406a73c48d9d9d8e31fbde39016551992c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/kn/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/kn/firefox-77.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "d05be55571ff99f86784089bb9b3b0f8e4435526bb7602146e29e18c8ede2d9291c64019b7d8e415d26f5badabcd549e361a817fb7769c38614b7107df521cf3"; + sha512 = "9a4b93057dc9ccaa3bf14074629e9f31e18ad188fdbf1195e6daa4c6ec31509f7e417723ddda909ea0eac121627cce716c9b6ad74bb59ab9274370141af2256d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ko/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ko/firefox-77.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "107681f2426316fbb2e61a4b9d79e8c3f79508606ba2f34c51700fcc95ff8f48f1b1d5ee6b78174ff2758cfc63aae62555176e79c299100e3814e7e215424a28"; + sha512 = "0de01ecf0815f1046c7d24fb5561dc7602dfe24d0f3d9a23cf934e6087a7b190635738f7d08c84d3dd368c62776f003db6b2cd90a9249090d479784758ecb61b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/lij/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/lij/firefox-77.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "fd590767f7e05a662a516515a25e294c3526c5676b7f6c0732dd6d00be596ad32dcf587d4218d27d059b9bd0e7caf05bb96c0605c19b78c48b227c3a9088c32a"; + sha512 = "d659155611ba762a2c8a670c2d77b7ba693816d062bed08834251c56b8c4727c580cf6b38c1e7807deb4e65b2da7db940df4c9cddabfcc1b99d1d8e00f056170"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/lt/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/lt/firefox-77.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "c84b879875b2e4792b67ac2e3dada7a1a6a11d79fbbf4f1f05bd924d8498072fde4021a542a9e80beb2c2d1f527a066cabe1dda8e5d91db27b88c9eeeddf9b1c"; + sha512 = "487c1d0be32fbed5c4ee7c5a3c8964acca6402fb03dac2e8a32534d8a2737129d06aaa69b1747e40aae18874b5b5b74aed682d59618765d7b248d388a4b4fe36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/lv/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/lv/firefox-77.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "791fa6b41e1bf7641980251acb61dd944477b280f3a3bb9cdaaebac2fd5ab7b4d0e4ef03963627e84be0477a45a42988946c6cf151b42d23d05c93c12716171e"; + sha512 = "c87501dec3fda705c7bc50d14b733cd8516d9a3f83228bb7a5805ef6195ec52e57da626c698460ba09bdeafc2e373f5b890a0d77f6b36aaa3b4603f97d87cf48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/mk/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/mk/firefox-77.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "29acfa93dd502f9ac97cee86c498f1b6a880c423d47c69f7d1a30350373da95a898fb748b8c16bcdea019865c603a7c9f275d7dfa0a3836942aeb3bf861ae06b"; + sha512 = "21167a3e6ad9d740f567270bda50ea8cb0315f1fced2b70aadb9eeb5c6de9609504cb5b81f3c51e1b69542e393d522278f649fa515b77d2e5fbc02a82d03e7f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/mr/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/mr/firefox-77.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "d28f900f5216e971577ea47ea995cdbb55dec219bc01e27a0e49ff5d87c3afbf5a95f6d6653d5f1baf881111f63085ef23ba9bee936911efbe6a7ca3259e9873"; + sha512 = "58ff22621d4158b93a773016cf766f0f90f71181d77b4c7d28ab2546e61f630447e5c01c559ee887224f6579801a6ded557a748bb89e8b5d4cd086e1e04f8bd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ms/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ms/firefox-77.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "05b0e1bd2fcdfdbc4f6429990dd9d7073522f9e3eec4a4fba371a9dac05292b144dc941f07aa7fe6bb17dafbba8ffb04656b2d857fe4aa71db9e5318748597e4"; + sha512 = "ad3e4725cff1f9b6bca01425764110df71694ede2b7afcd56da88da1982cdce93f08607c17806659917ba4fa1f0c88c4758079bb695b5145f3e717b5dcd45848"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/my/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/my/firefox-77.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "a7a43621aef2342b4ffc5e94eae8c01ae7d4bc4d88db345ae27c3a6e585a452d90b636875505910a3a84442a2a0dd1759689c037fd1ae4da9e2d16724b1b15df"; + sha512 = "c70153af55f07aa84d9fac8e9ebf9c9137f62f6028662afc1189ba8329efbe17d77d1f3d2f368d800cddd715701714ce73b24960c243f933aa239b880d658543"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/nb-NO/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/nb-NO/firefox-77.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "4eaed0fdf2de75af7bb44a6102a4a547ac6dcde61b4311c83730f8bd15f97f37ff8857d53666a80ef987fed4b865139ebaac1818f964d2b3a6f0370ffe0d6766"; + sha512 = "a3ef8dee50ae5b0aeb08b3e7007fd766916fa7703189efdd9a2f7e9938f68699232aa1a4550f42fadf1fcdfa236fc355a072173ef2de1b00f6ec867f47cdc080"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ne-NP/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ne-NP/firefox-77.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "7a547372f165073f50347ccf6c8690cd8f1939552102bb345ea79f86972ab2e0a9672d6d3a9f402c27cde428b84010f9e7d93cafcf3837f2f198048a75d86171"; + sha512 = "2fe23bbbaa450de730e8269bb530dc03f1ff6b6d08e128bb685cfc601ff3930bdf50646f0f23252d692be0e843505a57c182dd747dd60e1404883b89379d697d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/nl/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/nl/firefox-77.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "0bfea49494b20ab7307802fd63329d09514458b9f15fc2ea7dcd45a1655c4c4adda5f94be7d6a9b59158f93c3f2febe9787bb168212144b55e4c0e10586243f7"; + sha512 = "efed082f592adf33fcb1fa1619743d0f502295dfb0626eeb66c17aac2d6cbb68598013b37631050c0438cc9dccb5756becad117a82493c9ef9b4c4c46aad6eef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/nn-NO/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/nn-NO/firefox-77.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "1f6313d7b493bec8eb0319f135f6846df800473f192ae173659b2bcf963275d8dbca21992e86e17a0365cc4702f5f36e71962b044b76f572f1afdf1a02564913"; + sha512 = "6f34fee6e0beb244b567e748c8c4ffb72021061aec9f5112f782dda3cd90a76b1ba3f044e5eee7b6c0b0b39c2c9b32626cc379d3e4d1bbd37ef6b7bed8d3ae33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/oc/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/oc/firefox-77.0b7.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "330e031d4cbd7d426afbbb70b0a10ca5d916611e7a10a1a1826d4ceaf76441e0edd4c8854197ea1b529890c9962fc9f6fa5787f5b6d4468c75be43c4045f16da"; + sha512 = "cfa9c3712952e93e854300bef57cc8b4c5ac908abcab9fc06c6818936b52377ec7d2dbee8d1d28313175b7d39977b7c1294babce387e5a8bc3bce50d6de74ac8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/pa-IN/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/pa-IN/firefox-77.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "c5c738969b18a922282ee53214d89d36a67c103165d4c2c1593d253cedbcc9a3d074b81594d8ccd85127ebcac60673a6766fe82bb4da1f6f78cd79c41ed7ff0d"; + sha512 = "166c240c73de0b4c3107270b3a1a4539a9c4a0712e96f3ccbef95330842d8b1c02ff6a15187c262231bfbd3e0ed237ecd3184b1abbb666ff55e5d4f242cc6f95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/pl/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/pl/firefox-77.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e6e5dae278c07b57eae31b21eb25a11a9d3cbd68972f36e4e7dd6b1a6382a2c1553eccc9c214ad4c8b7f078e34a6eb97c46dc2af0084705ca34fea75e8655f54"; + sha512 = "5588ffb0238189fd9f18b6a50e8b421b807e50e9bb2da7fbed2c8c5d503a738a4c1b79457780ac6731e71b938879e2c8d61701cf5e21814172eb268c9d71c460"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/pt-BR/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/pt-BR/firefox-77.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "afbbc4ffd7052bc1cdd4a46e0f8b6c9b86961651d99cc50363f12eecdfd8f8f28a1f6777ef448d10397e8b032e252af1fbb9ba67fe73c5aa31109988ad7818d3"; + sha512 = "a9341b379e27f059cd26d03cc4f68124f52b8501c983e8c29653694e5d821311c92af123e2569933e6140889a701f4a7e5eeaa7f80e24502f75414be3631b57a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/pt-PT/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/pt-PT/firefox-77.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "87f98e8d9861ecf9553de23cf309ab48d31ae710bd415ba18dc9aaf240206987116336c165f7d7f7c77bef0529702d6524efd5fc8d4b0778e989e695e4c3e05c"; + sha512 = "8ce686c98f56d8e8847a567a71a52577569403daf02793f090a360e266d8fe3044088d615db0c0b8d3eea8f1da331f6f37bc21265fc4078c2a1e7d12d3be70e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/rm/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/rm/firefox-77.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "e8665a8d5c1f329bc141087f3e0cc6cdfe14e23fdbbd0d3802bc09be299c618b19cfd7de273b57153757c57a6fbdb971c21feaf0c6dda1f9fe9c99af962a4d28"; + sha512 = "d66607192e6155ad67648c9c8ec5327b58433f14ab646d8b7fc8ffe301c02258057fcfbaa37d792978de4e171e89520521d741608a2186013931c6adfbd1c04f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ro/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ro/firefox-77.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "d734b6b9881259fafd0e075d8e494c59bc4c8ec84a405da9fc17113cee4cfeef96c992400c6c19a582ed90c3f93eb7a38cd401bd826c380f163ce8390b4558a9"; + sha512 = "3c74b828b663de1e091e11534656579759a6953a7fe21b0531aaf501ad368dec9652af9a70eb183fc4a5242bdc9cead4d2ec8fbf3274d8e78963df2c78779584"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ru/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ru/firefox-77.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "50ddf9bf9d63d632e38213c3e2d1e6288dda1816f87540f3efa7dc2c78de0cae8be85f477276c104e8cab012a4a6fbe8c1217cdc232386c0afd797af799266a2"; + sha512 = "5f3a78c25b202c732ca14a98bb4b3ac5baabcf47248ae0157c83afc6cd6d628e2ef44de0ec0292e4839994e2806ebd8698dbf0dcc13716f5f6e34110ee8111a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/si/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/si/firefox-77.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "a1e984f674a53074a37e98771cd2bacd6e6a923dfbd6be59bf439af965fb408187b7c56fd202796e51224cd57e17a926618f743175f255b6ce2be3006c602982"; + sha512 = "398efe34b30ad6978e98363c978e6bbb810f359dea7066c06f904dff4bb934a49a20561e39cbd639eab9474210e9d34e3cbd97e1b78aca2755431ba7cbd83afa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/sk/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/sk/firefox-77.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "83ab99539bca4d2028551e6538c2e3325bd803f8b5068ef7b1a4f65decbc91e0c7f5f7d78c351579d3b47c2a91e886ecfdf7ee2075567416184098b117074cc8"; + sha512 = "8521f91202f18acfabb2ed2e914ab4f8a28079d1b474d86e110d1b0ceb0aae8f8b70a1a0cb3fa5a23b38a905f3abbfc2c1eb5277a400a215856c408efb0efb23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/sl/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/sl/firefox-77.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "aec8bdee4a190cc623eac9ef82f7e93c185920f3cfe35e8b9d97bb39b5f2c99e17dc71cc800f60e28f604f809613f82d41c7b5cd8e8b867bdb3c11a73bb6c5fb"; + sha512 = "e137e54527667f98a5fb1f65707d2e60a151a7296068fb1190a62f07f091c5fefd97c098217e352ef2e62b5256bb45f5e410e4eb0636ef2f1033eb9a391e397b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/son/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/son/firefox-77.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "258602af8e2283cdc14f73d51ea1af1ae5cecea273534be6521831619e76d59ad635bd6b86624b72afd53a0c71e622ad0d6eb55f8593d42e97144e3e7b521d47"; + sha512 = "924401c776f507c70e6a60c873c84f1f7540454946a4cfbb85426aa20a589973147a42f03fc106407a91cf484a3763cbb6268f8c119d72bcb3b4c46610986b57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/sq/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/sq/firefox-77.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "e6220df0ebcef2312376d1a12f6a121e6c52871dd48dee4acb8de92d92921d348c4006a14a2cfb27db341a283ceaf100088c107b3c70d0437fcc1fc6a57875d1"; + sha512 = "8615b1930cb673c7eca59e5beef70cf05f9be628b90e6a895f28f5dbdfe46cf051a14134a30940d3f55512d6d1e12714ab2568b53202bb33af2ee4f0b26e586e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/sr/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/sr/firefox-77.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "b6bd9028d35a06a2f50b2ae383b166e443bb1213f05585a2edbcfc92fd22e7c206aeb894bb7cb82f359c0bcb1fdf5250fa91244a9732348541ffd581d35fb7a7"; + sha512 = "aee6e902c58389e5794ab802c3e7f0e6750c3dd9076e8dd33894388186daad17e3bd34f48cf16b082eb1fa4e3e8a4f794fd6bd87940792d089c50214b390d35f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/sv-SE/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/sv-SE/firefox-77.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "546fddaa1d9f07578a1002711aaa10ad683e015d6a4494f571d8a1fed3c9c0f4fef1ccfe5e20076abb47b5de6c793464191b1eaa8735bd95a3a81134f7f49698"; + sha512 = "c61acff7429cbdfc14dc6aca65bb538d99417567b477e24324d7ca1f7fcd12a0e2f338ee5a8246b8ceeed0c1761b3bf8d4e6d2be9311d6fdd91bc5677ecf3cd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ta/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ta/firefox-77.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "7b77aa5ce741767f2078dddb5e8c108b1e3db2da99b06be13537e2eab2be57045c7c0979aee16bd48bed152003aa87e93ab2bc47b1304311f0152a0636b14ae0"; + sha512 = "8c9255e218e0cbbd77cd6089d02535af65301a988c74cda0070ecd71a432ce34c5bc8c71aadf1edc5d558ebbaa5d8a5b78e3c76c0c714a6afd8d4b11e1b9e3a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/te/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/te/firefox-77.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "e9e41551d2221aca5fc045269e435ed69377e1d110f0b80e4d36e8a3c3703adc1264e9f3963e9838de845624a454431671771a5839588e08eaae213cb44f6544"; + sha512 = "92afd454d7542100ea73bb71df673bc006084fcc1a31f240b6431f4bc6cff946ab57a94d8a8634a8d01ee996e52cbadd5c9dc58e3d47533d3d3a72a8d3581142"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/th/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/th/firefox-77.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "917d50125d280c839f6ac60598197102d3a40a97509e25ddddccea43cf9f78d2ced2ad1e3f47a3b043637be3df131a8d5a9f7035daaed81b91962e9f474c89f6"; + sha512 = "077e610d74fbf8d861f9ad0e3bd1b5dcf79e9d89913f7cb53bef139db94cecaa08d00dbe830a66f0775daf216a4e44416827bfd386d383272d7cee75b5493bb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/tl/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/tl/firefox-77.0b7.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "74c19eaf5ceecc4ea4d40b921520b9f7d313a445a629529624bb4c382edc59c8361f37e32657479b5a760d27dbbe5ff10f93c83a310b7e8fd5f520f299736e71"; + sha512 = "00fde9ca4590744e2877a6460e5fcccde3da81864f6ca0e7b092cb250137d449038b618bfb9a3b58f2b349dfeebe964c88e194162f83c6dc573a239e8d4d3598"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/tr/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/tr/firefox-77.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "4352f9872ccfef5f9bd39d61ef583ff270185ffca63db795580337db227a6e1c5c9450da95b28662f6c98d95433e96c78ad0db9e72470096793fe04a91f3b26e"; + sha512 = "c84b99040d24d1e13ee568c6d5a0ec336823deb2ab229ca29d0738490dd848cbb79089687009016313b5b7d80601e9d54f68d7be08138b71dcb2cd016e555867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/trs/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/trs/firefox-77.0b7.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "807f2857b8f165749fbdc7a1af0292efbd9ce834feef9dd1ca43a83022fe1e5afd259eb1771096d9b9507bf3a1a6ef53a4fa30dc30be9e978d760efbf2099bdb"; + sha512 = "7b50b2662861c4dc8a800f251297a21be22d3dbf863dabd0d2edc48406a0d190a1dba5dcfc623f3717c741b771dc338563e31f4d75484dc0fd7fb3bccb9c7a30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/uk/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/uk/firefox-77.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "1d6780ee40ba9cb55f9ed2f6a431c0077747630bec036f7b1994b6d60d273dba7ed5a764d8072dd2ad040d91c7c05c02f9bd471a84271c232dd4a3997412bde5"; + sha512 = "e2893db5b1d1199c9f823294b487e79b0c7f4e4c4c33398a3fd74db93fb11b1272292e0ccf8c6e51e706eea5ae63810dafee04ff8f53d76fc98f73cd5560ef04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ur/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ur/firefox-77.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "433a03b7c9f78733615331ef49595bee7ec21b7b3e8c5af77672ec2390b2be83bc7d943adf98d871617009bede234d56689c22fb51fa8ae3c97723b500796716"; + sha512 = "2cc0f3af1e52573b570ae07e39af53f63d0e51f6cd15121d3894a9afa96a0796d2dde9d49f0888ef7ab1a644682963c68282a4f9032a64b2093d7ff8083f35f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/uz/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/uz/firefox-77.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "5d3ceb49f6ef3c4f0e307981815f2201f07eb34eee3374c9b2d7d1d9a012364f392c1d39a6b700bfe181577da5e1a150337e01b562aa24c083b75622bce99393"; + sha512 = "10faea0201c3b350cdf52935a5df3fb0277f6ac52259b446a87a9cda1fa4f412a2d8e77c005abbaf2c2d9d3fab998a97ab8ef9833ea63e2acaa6981d194d064d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/vi/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/vi/firefox-77.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "a5583c925e1daa20f9ad6f35f28544930932cd7d04f95635f2931ce71cd08655da97dacf5acde5d90e195fa05a5cb2df998183ac6322130916931117a2c4700f"; + sha512 = "2360929b0099a6712fff7658216bee5c9a90d38fed6fb181ec9d16423a2796763b3d955fbbf9ec124320595bcafcf7e50b1877989185a35bd5f25d1321dc5325"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/xh/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/xh/firefox-77.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "792fbf676be79e8eaf8fcac9dbd060ff62e0c187b911e1af7980b2274f244d22278fa8e5c541acce6ac7cc512b62b5d2cdb50fa63cc228c77663817035eb3e76"; + sha512 = "2abd797d2f9b81f22c140bd3c57ad68baf54c10947a0d0615b639fa289a54ce3b3e72ea6c596ec6389977a9b31a1853b6c96e1bf23902f4c0eb7f4aa8a907e9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/zh-CN/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/zh-CN/firefox-77.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "1ce1c7ff55e905549ef7d26cfa52eaf3d95c5d1428f71a91265aba5815a3769c7ffaf3cb19b7809420a081e9e1f0792d9282cd40de7a5966ba1bef7bae6a182e"; + sha512 = "ec379eeb6d70eb210291651125a3fca08b1aca0f06cd22a6ccfa532ffef8d1480fa32ce79f93786f7ce3359328d5a96442ab88b4e7c78fa88a892ec08b8822ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/zh-TW/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/zh-TW/firefox-77.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "fa2d3d638f5f9bae6948e4db8e6f22b66414f55de904831fcb578e191b25064cdd785fdc64718e7b2f52fc35ac896d7a53d4ca07373734fb033c8d633998a393"; + sha512 = "fa18cc45678129584438122766b7b56705aa9332025c6f729f29fd50c3051a2f60988fac4f1f267a94d443a35f3f9d58162d3d355f978c018062a8546976a341"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ach/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ach/firefox-77.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "7d18df1fe3443f85408c6f850a2ad4cb8ea63ce3bb74e7ea07d395f647b7106eaf976855d0629308eba20e12105d61f80622084a5d295fd950d5e8d9c2ff8b4b"; + sha512 = "4f32295fa57221d2658f2bdcc4d3396ed3337944dbd9e46a1694ff478f4ac2d68ba57d8d65a6e5387c657d1e51b2a392dcece3735fc0c075da6c9e9f3a053cb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/af/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/af/firefox-77.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "5ce286cd2565c855a8234799517c30c665030481c2f0d65ef6739d7a2ffd80f58b67d1589b7952ae007427c2d2c519995f8b48003d033f2f6e5f23c7d646c349"; + sha512 = "8c88972e9f0b716d5e10f730d040188f4bd4566eef196da473f1be7206c67cbce90edb4bd08f7261e6860c276fa0c8fd15f39641e5f243715608b617ed8c27ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/an/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/an/firefox-77.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "0761d2be3847985354938b5f14e9c767a7ad6fa5a2d81d04635f56342f2b43f43b34ea36d89b063e7aed36e4c967730447c187d43402a8dde749e918cd60fbab"; + sha512 = "ee72bbd1608ef81184fe128d3274ac0eee56003230d61e7047d0d40f5d0176383e843a5b7d090391203a1e3d6a8c1014096dae3796fb47feb55fdf08e5d5f37d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ar/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ar/firefox-77.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "7742c7828d7cad40f1c18efbac94c203dacfa45205789b5aac06568693228ad21c6dcdd1166c4cdb1042397744f0c0a82d278ceef236eb3c5279948969ff4f4d"; + sha512 = "280ee75fcff94e9bf6052c139871fc1d3e54f9427be30d2b286f654468436a906905fc3b8d48a943d1e2c4eb741d941020ccc2b82a99c73280bb8a5638689bc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ast/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ast/firefox-77.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "4dd9380b8c327f653c4228ee354344a11c0bf8cd0c9340f11d94d1bcd0e8795df7fc9bd05ffd78d8a51494798cabdddac4f659425be1c072e776417df2ac327b"; + sha512 = "11a78f70db70c0ae9284c623100ac92b8af742ae389905007bcff5b9c731e18b97ad1226503b8fb7a78e981ff97595594e8ca84cd76ef48052c8440f1ff757bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/az/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/az/firefox-77.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "c69aa89cf0ef6270fe0c1c79b00cb0c6e599bf668991b130412a64b86703dd8580d9e270d89bc13131528a406d74a3b55caa74418b6a3c88a22386251c0873f4"; + sha512 = "5f6064fdf15fff16312005114e91b8957daaaa45c2bbe12277b5d2bea72d6e20b2c04f5f5731300337d7204f3114ce9964c006cdab349b9d78255b109213fdbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/be/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/be/firefox-77.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "3d6a9126c3134a7ccbe58e0d7e5dd417a082bcea3d30c38fb9c208029a6abc39397a921f61978c6748d0ee5504c189f403615c36f0f3ede89bab32569bed3fb3"; + sha512 = "08e136fd182c7c126a7c6bd410d5d1fd776797a7409e42ebdaad5dd9e0b7dc847a6fe8c5dfd9cec929c48461ba0c5da996a8eb8f34eb4be215f018fa71d290a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/bg/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/bg/firefox-77.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "7b935192feccbc34159ebd7fd1fb08851a2004a1be71d49877e0878717574a413ce5e309cb6c000557ce638ac4d9e19f5a6c214036e06a36f395db9ca8dcfe7f"; + sha512 = "fbd6a0fa6ae9e4f4232662edfcaf23b3c5b13cd8f9e33c714459ec398bf0cc06a358b448cc56fc5208b7f93315ff47d34f5b2975c90765f49d73f88d47596f9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/bn/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/bn/firefox-77.0b7.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "fe300975621e290995533ace66387a8dd2d3619cfc45da185104f1e932143459458325b08316649c95b5ca265f1d3619218c90e834385f86d495b068df1808db"; + sha512 = "5ac3c52f9e8f40bafb3edb7b3cf6483fa74f6537ce1baedaa96e41a851197d6bf74c7181a132a51bf225d450081fc57450217c9db3df8cc085f799af5aeb0b04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/br/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/br/firefox-77.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "93d2c5ed98cc55b7dfcc8eeb1d6091817b5f257aa3b2b366cc0472662be2dad7e1e426a3f5fae56934f4ff8f99d7e2a0fcd50b0d51e941f3141867a162ade19a"; + sha512 = "1311c592461fd0d23ab1e7616e120fe51b15c70790c2290340ff6f6110984a1ae9a96da40a73cccacbdcb4b2aa03717401b34b415c6509850adabbe028e9aa7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/bs/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/bs/firefox-77.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "18126891bb8471e8e1116e6eb1ec3276c02cdb10f7ec6f9f23ced45dd0eeb2101705b2a5e0c281e6284f3c0dcb956abb16d98310a8a2ded5adceb9308aa14f8a"; + sha512 = "ea11227e9e53c781542c61212397dfbfdeefb2f70ec0e8a26bafd6e7de4dde3f35e6d87e3e3fdd5e31fd1e061d7906adad355398a4dba0ec1e6ebccf517bf2c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ca-valencia/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ca-valencia/firefox-77.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "e69a617d2f4fc149a6c12efa04d2de876cef18b2a75b945599add772b030721e1af78ec3b89d1ffeac4272b3e8356a6ac9814ee3aa4681ebb6126b5071e17cdc"; + sha512 = "c858400aad550180e04bedfe10ff1094bd0bcfe5c7bcffd5edd9512eefd671d6401bf1b50679af4636c3211fada6c44c126ebc3916fbec3fa08f587f70520e1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ca/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ca/firefox-77.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "838c86688387a6e19388b1ce02b22df61bff1bfcca2fa3720445e2edd57bc0bd54bbc7df8ca6eef17c95ad476d4619869068849e2ca4ce03c6fd01e0f93d979f"; + sha512 = "2a6464c84120f2c85002554af4759f282440435a84501817c0e933de0f2fa6535a5acd59bef92ad6befecd8bd7e40a8f650fcfa75aa4dc2b20b546eafd4df056"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/cak/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/cak/firefox-77.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "4a2e76d270c85969903c12fe0fbb512cbc4b6c9a130ffcd75c03261ef7eb29992eff4bb60b01b9fe54b17af07b9435beafca37a4e5e9160b311b88f48e099332"; + sha512 = "c2d492cbc4ac4cd5ba030f1253dc987fff0cc2ebc0d3b126c52b1a6de9badf57b8601a350526934e059bd7f3b539f45fc120cb1c2f327e96abefe62b1177c439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/cs/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/cs/firefox-77.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "105312908744f72eb5b87e7f403dcba3da3bde62347f4f3dfb9051689b9328e374fef546bef3e8921cf211c00d09a916868c20c91b340fb01ded65f7048ca014"; + sha512 = "9a2eb3ec93e43d789c3a15acf826cf72ea67afd5656114a0ba1125dc2bf57741799b52f565e47f4403859bc7110f3cea100c126c8280936235289331c7292fca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/cy/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/cy/firefox-77.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "c515feead11875bdc67ba65a7dc55f5582163bc5036a743ef5737b09f23a57bb082cf3188289b54b11086cde20505c32f6c4730197ff387fd16d2bb2feca0149"; + sha512 = "9fca98e4eb686968d5608a8e253e0738f3369b943e63b960296c7ec718ab29638f522844705eed29fbccacb6b525189a7a828a7b29ce23e1bae61cacc925a73f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/da/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/da/firefox-77.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "306cc5ddfbc0ce0ffcfe2668b8861327086b72a9fbca05142d6e7464ffc09e1eb19e41c35a6b3267a44b65d5700b9a0bdb66d269ca6c105f9538edd846b3a253"; + sha512 = "9393a9198d200b757e51af3961c2cf20f42cd6a8d85a7c2194731643648dc971eec924784958e306d3ea177a4ba8c15e79195dc59063eb81e332d4010e35884d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/de/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/de/firefox-77.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "794cc8287686c527a8e7c62d57b3f23d0b625d88b76792c508d0ca4d2965da40d183b12c81282b8af71a33d0813ad484d3425446731745f8ad4141857a44ca87"; + sha512 = "22f901cc49ad275ef107a6c49607c3d8ae51315f83472088cc7d062bd980e6f74b911067f92740ee5906fca3e3fb1cfac8be63c8fc0d6cd45474f32be5f23007"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/dsb/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/dsb/firefox-77.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "d9a043754c21673cd1e65e141e2e73c8fe89325053239c8ff45b809640a7d759212a12a1f67a77acc5da83e182cc4d0cf2b10ee4fc68461904e3c479df9d5f4d"; + sha512 = "190db9d98bc335e9cc34e37921af328ac0beee967aab4804c4a513199ca9f9c4c5153351c359d91d34f25cea4e109b90735009ed1f480b2da6a80422f0ea7839"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/el/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/el/firefox-77.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "39f7818fdf6574035d89d7b0eae16cefa0ac511fc8dbebe60cdd0032c7e227986d6df888b88fac0c9dbc4a7123adcd73536d59daa0128509e26f04669e47abcf"; + sha512 = "36b0942422aabdc0dbe1959f330fd6347c0e3e0de9fdb18f33db3bbc8f7b1982a4cfe99aa126c8c4b3ccf93b0c26d01b01e74838460793cbd5d0a6a8193da4c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/en-CA/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/en-CA/firefox-77.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "8d047f18bb5136b31b51d3799a59215f923d5de921d33bd92e84a6f4fc93b8bc6da498782c606970f986b879c34fe136f50e6324522695dfd97307bcf7bfbbe6"; + sha512 = "af22e98b054cf4052120bc17735e196b56e3d8875936f7c35fe66016858c650bee94932ce892afa5ab7cef3012f880b2533d58571a752f1ecab9a6284f69f991"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/en-GB/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/en-GB/firefox-77.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "75291465efeec916442cf1e495a5b4e56d0e66e32e0563b555cdf10c613922bf3b6392fd38ffa2f0dd02157800ebe5831d2ab4a5feda30f9fd8ccbc2a0061800"; + sha512 = "34b5a9a7270d6bde97caa77e5b43c3c47bc71d9bb50e51bb6449969ac99b2e7df870349f73a4b7cafd4fef1e409720156a2f8c4082b50ed1abc042f3c53f03e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/en-US/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/en-US/firefox-77.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "f8b18128878564683986150825a9e4ed3dee081a698be8cc987a166edf3d04cee0a5289392f0acbe085f055ed483c8316214679c75792e98de2725b917cc2586"; + sha512 = "ec6dc83bd8e5cd20a47566be95e152ee63d770557b9f1c864da411fee6ca554e58aff21372e97f1ea557156381ed24a619262669190742ad705d2e48a9e9dbfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/eo/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/eo/firefox-77.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "36138fd43941b8dc0a418e24aa9af4186f9294fd8e3f685a81e6afe6a6a55762068c3b8366c0003a03ad5699052ddd62ce137ee7ad67e16b4bcd6104fa17415d"; + sha512 = "9b97b46029ccd4e47fdfe157c9c34619311755da4d02e55469e434a82e187324f1a25a4015a8fc6345ca9701c6bbf721d076132b7d953a8d55cbb8e6cca8e918"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/es-AR/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/es-AR/firefox-77.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "eb8418c1dbecebf6c609569f8b9914ce5f8109eebb80423c386870f42b8210f43b985c66cee2a0aae3c62debb6b481c26675b4fcf206b7a44fef4bb048732c2f"; + sha512 = "3dc73cbf68defecb48519996dde87f89f30788c4eda9782b89d5449e35b31bd3c842727564f9aa17dcca7acb19f4c8d27d975aebbd0045a0499217533a546362"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/es-CL/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/es-CL/firefox-77.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "ec3156b0e057b59e1220d4289484810972a473327dd6d231094108ecc2f0df217ed70237242cb4536aa9bd10a8b6f86447528fed4d3224c5024cc40ddeb36f54"; + sha512 = "dcaffcb471bfd9da4c4eb2e55061828a5fe569de2ef64492047122acf74a7885a91eac49c2057fb2d29045ad41ea4d9817ec0579aca286f186c12f3fd17020e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/es-ES/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/es-ES/firefox-77.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "d90ddb9b173076a1a145eeb52ff25c25cec45c72c195b3e7ca11593adc9babf0e12994d437cc04c518814caa3207049a4488c35ce373cea3adda7fed68426ad8"; + sha512 = "ac4cb3bcff2be801b3ef23c7b0daba5f36b6d2e5fb8e1b2baa45313963c1c32467c1a93fb1072a6fd38713b3fbde86e8de24ddc9f66b002ffd6a3d4bea9eb0a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/es-MX/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/es-MX/firefox-77.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "140741d62afaf15b676313923cebab714d9d09617f62302c861fca82b7b06551dda0d60ebf0de09bbb28139b836149ff65c964340ff5d7e7d7423f5c6481e136"; + sha512 = "79377037cdfa8a66df3d55e95b5a9a6846f8976371d7c88f2bf4f6df0bf33faee44fa0ccc9570f55367e5772750b53dc0fea6d1e847aab222599d055d64f387d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/et/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/et/firefox-77.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "2af762edd98cea3205339ccb25e4247b90fbae83eb4ecc172ee069af7c14a7accd0aa03e0b28489804e741ab6841ded0e97c170d388da30d68bfc5c43950763c"; + sha512 = "17d04657ed054a8a7f2bde5d71906064ab924e24a1055a9bc9383fa86a1c5481e2a32f63735737e5c129e32046b06458879313bac37ff72774053a437714d8cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/eu/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/eu/firefox-77.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "6690a291b2af54fc50fa8d405087833716cb0f330b9e5dd0b24d0b8efd15f5e8c8892f95afa5ffdbad3c39af4db9b823ba0257b2be7147989ac44c75a4552a0c"; + sha512 = "a87495e8f4b8035886c007421ac84fb47d8cce387f8cd16e5cdc5f5fb71a80148ef42fee553d4ecb2d794aae367d609377cde61f9388f5aa7635fe704cd268be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/fa/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/fa/firefox-77.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "195e89b37a016d22a8a53e4c01dd2370fa4e13554811e0eefa66f4caa47652e16e44e7b314db383113048056b2837696beee093957b8bfc643290784d05019cd"; + sha512 = "99b989bc71e58b09106038db336ff9de46c8381be2294010b7a6cb32b1f222de413b051062f5fb2981ee173b0879d089d74c8cc9b6022f2f544c6021a998ddae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ff/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ff/firefox-77.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "961b76ef1121a44a194a06c2e98b583718fcfb25c81ee1cadfe67875e34f4275adb8215b4065d71d3bf4f195801aa7f61a8571c378dc12d271f633ea8c437cc1"; + sha512 = "125bfb8aab76599a1b35b9bfad886735ec8a89ccdcf8d29c45a238b4e06ab56ff2b848c94febe00042b75c378c5719610613b5b35fb80257daad35cc456bd90d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/fi/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/fi/firefox-77.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "b81e0cefd5e1de67e5af360b888ff5cc9857b09fc34f797ef799689ef33e96ec09613051501e0dfbdfb66c87e2bbe0fdf971f0b7c477fd405e7f99ba54632ad5"; + sha512 = "e2f115848250093981efd9b4ad344464636bca52eba388e26f3d10795351f25d411ee71ed77ab3097c1e285676ea30d5151117a24527e8739f73431f60b346ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/fr/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/fr/firefox-77.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "7531aa720608c34525063742ac1bf005f03298ba6a7b1b26ef5614d6fbb958b2b15d92d42e17276e99c0f46c46b8df9f177a370e488c18e46aa03be19d7cb187"; + sha512 = "9960af7e15dd722c93a7620b4f30fba8651d2245933e29d4f3f6fc3e89bb79a5658aba2c8969e569de7204e2d34bee72fb2ce292e970cbbe50cdad320e030117"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/fy-NL/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/fy-NL/firefox-77.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "f0338536c0a015d9e462508f5fed459a2477f7ae5bed9155b0eec5372cedfa37bb2c45328d063ce78cc3e52875b05a933f4e364ff148c282ffe1ee7156ffa75d"; + sha512 = "aaa2ae8968ce6906a47305e78e2efe348117cce9040d7079415f082033c510ce67f833b9195d6496b831f7d8baf95f501ce1d54185009bc3f1d12b16a8275e4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ga-IE/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ga-IE/firefox-77.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "7166350fc9c9f1d8b76a6218d06ed2eee380a7e4197451af71d7561c0853896b935a4b5165a0ccec9c25f2022bdd9f5479509e614fb5c48a81706517bf855370"; + sha512 = "1b7f808948bd3dcfdf748b3e0b8f03cc6c5cc2c43edf84ab62a385ccbd51c915c971e5deae03048b4e48f7f73d671031bd55be06bbf74c050746d87b3d9213ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/gd/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/gd/firefox-77.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "2cca60d8c714ca63b3f1275cbf42cd97b58e2b9199f2bfe7f29feddc0cc05258d69c7a6859b95c5932ae7d243dc080b022ebef1259fdecca1eb83610cd54f526"; + sha512 = "2494ac50da66ec1a711a245ace28543c4d9095fd186855d968eafb48b385ff15e258b5476168464a3ed5059455bb023d3a964288bec8cc759f2421b8e3705b21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/gl/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/gl/firefox-77.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "4b685b477cdfcc0f15299c5ce98460f1538544451d3c50405bd220255fe1d4ae5ee72770bba6cb4163a64b70d1fce1e52dc273b6454ec57af4190874a84bd800"; + sha512 = "5c5345d2cf6d26b33c6526c1591fc4c4667d2f9c553fd6b5a48a77316ceb1091b7c68c1860e4e01dfe9ba02ff397a48b10cae4047474e25a53bcf09942cbfebd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/gn/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/gn/firefox-77.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "0e45f091b4865aa1a13d7639590b17dbf6c9388de3be92c1cb798d4ace06d03c3313f715d0d0710087506ca15590057550ea81a38818a3fd1d754a94c78f6da2"; + sha512 = "8e5a5b0791a937c3c4c5fd5b7862f92947e16b596842725af7c3c72597ce91946e2a8291a864ca2adb06f96b7bec9cdf0e01d9c915f68f186f80f95e245c61d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/gu-IN/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/gu-IN/firefox-77.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "0b5b6e108c80ccf9bc14840feb1f48c3af91e251d82600ba518b7305422b33dedece2e6f0a95be243f50652604d8634018e3270d53378475604f2f8a2be1383d"; + sha512 = "b12cafbb422a817073fc967b632fa80e3c08c38be5e5cd33a4648185e68be7ad2d5827ad0923c4d86e6ffddb50612175bf6a58c19992fc6ebccc3ca170b9ef73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/he/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/he/firefox-77.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "6e45fa51974f60aa8bf2717ddbcc46fa7fd82015cd4461a75dd6cd43b7cc6910876f0a522ae7ee324ae6e9c83411eeda8da90c7436e62aa003666140ea4a59e6"; + sha512 = "b97e5a8f4958499391007d4a299bd70f5978185381be0e984bd87bb79563dd691fbee5a6106210629cfbb85346ee867b8eed6136454f9c910e9a728daa3c2524"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/hi-IN/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/hi-IN/firefox-77.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "a1a945e459ccf761cd68f4219262f143b0140b184842133bb04a4a981660457c799a5b247c6b2bb35982e9574bdee9a0bca8c9a8aa93c940fb2de368790bc766"; + sha512 = "44a512fd82b840141360ba2f2c283a014649cf532a151b8ce75f5b64dc8e04ab1ec7addf8c2ce4c288b125b1bde433c05ab87891bba0d6515c1d9501239887fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/hr/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/hr/firefox-77.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "37d23b0579f24e2b09b7acf29b1ec7254a62f50595ee6581f253aab58d237147040b007096eddfffe38a3360a14c38a7dbbd946bea57cc0016dce9e0ea309424"; + sha512 = "167b1128c547c6d041d5ead144a7539ca77cee428ebdc9ca712a5a13b89c38d332f00a71f48719af7162db0c59a067001181b8dbabc0e30cbaf2dd9dcfb4fb3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/hsb/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/hsb/firefox-77.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "eac9d8effde7d36e22812fd2ca208e5e4448cb063048fd33411847577705dd5947ea170fbe217cb037fe32444152638b07a9052e769a8cb8136836e0670c5491"; + sha512 = "116ceb3aab81c56d526c8564dbb45d4a58712ab62d0ce26edf99bd903e7782be8d4fc1a3d117feadb2a36740803bbd7778b18397abae4aeb71e69b48841e6097"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/hu/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/hu/firefox-77.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "0a59efbece0b22c362e77af37ac4568723c7c88866ee6537f444474915271722c0f9bb46cabd1af468195ef651fb2431659e5fad2a1e7849a1398ecb7e51fa16"; + sha512 = "8ea1cbdf1985b065bf71209ce5a4e9cc91b0a258b873b0b65fc9e7030a67c5eed3feadd714542962aca079a191a4fe92b452cfba6c45ff7f8dff7f874b627535"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/hy-AM/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/hy-AM/firefox-77.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "a997ed67b1f2d298bfda6913f93e063e9924bd09fd16cab2e7c07ea2d1b1a5d1f4da2e7bb6b48691750402184cfc92f8642bf482e887926babf3f9dd109c65dc"; + sha512 = "6aeab5e8fd9984410d8cf95ea675336a1fa98807abe19182c2f94155ec1bef36e7bd9a10b9ffb38d2a9ef7441a56dd329d07df4f7c9c301342f46afdb5f2f348"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ia/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ia/firefox-77.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "80b4d48746a4f4edac6eeca9f3ac9aaa961a6fc7a54a30d452575eaaddb5411b0fb798c47a29aa2f7bc0f990e694047623fe02e0049a0f906995605f06ea0c80"; + sha512 = "f853d14a988c3a9c1f8d1d3182d8bdd849784f081bfc609871e592a78de14159203b64755a0e9c63d1649b812094d389172b60bf12feec8cd23c55bb5ce664cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/id/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/id/firefox-77.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "1a239030834a5ce36b00cb0253fae6febdc8a1df2d6dc8c6e8e8ebd5fcdd8299731d7414592003ca7f9b714bf1607bbd679622daac45fdd8c769cb50184259cd"; + sha512 = "897a928303027345459e2343a025fc0e926be7ab8ae7bca951afe36de5748aa6606dcc630bd33df8efa383897f5d1e24b078d94d15400496c61c6494fd9a9f2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/is/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/is/firefox-77.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "cfa78bbeccde1122e93bb24b5238f85c8839882f4795a9b4fa7ee15e1d7ac457c9ae3595711d883bb10b218e27c620b7cc2fc1e96f599e3698911159bf2887d4"; + sha512 = "b86c9ce4a0f95ebbe9865443420576fa37946bdd5ea5e060cf4b6bf2d97ae98af599a00836ed722e1d19ae002c79d4ba1a8d41e0779745061410bd4d020771cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/it/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/it/firefox-77.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "3410512d2c83f076d208e743a1afd6bfaef6e0ef6b670e22f3f0b955b1b38cae5e14a936f47dbd8d5e3f94de9698b784f7265f06d90aa0601f307f4e0ad262b5"; + sha512 = "c7320bf6f9f5ae18d7eb7edc6b070dd77b79f594795395f2158ef3c9109e6b582b992aaf9712646f7e832eec9f4a622f00b8f218ec6a742f2010d4ab9f0fe1e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ja/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ja/firefox-77.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "eb86195d5bc686e26c159d5288c161e0510394056f3e4481a50480dce29be43116abbf837e70a1b121d481c9f40a4d235d8f10170cc9b69b40dd6443b2144736"; + sha512 = "32d619b4818fcb05061c5a07f4e83115532a37bc67ed7fb655dd813ff1390fcab1f7477f34a2a78832252cdff7f31d2046583afa4c0f48ec810a97bc2a2fddc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ka/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ka/firefox-77.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "5e455f82def0b804f368a7215642caa270b35eb9fc478eae4b00601e5d644abcfa5be3fde1aa17199fa8d7e694dd5d4178f26920353a430aa8362c8ceae7494c"; + sha512 = "9f4eb01db315b8f3b13900ce05ca3d6d036eeb45f67fd2e925d1d4e50a87418a0be5a0843e789174449c105e50beab82baf00f524e4b327d2a3e4b8596866a0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/kab/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/kab/firefox-77.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "81d935f8bf20b68324972f45892d0ba913efc23988b1c09b61454f22059bffcff2856795b95328354e783124c98f1f2e03b9cbf03abb90b90302403cbfddeda0"; + sha512 = "2a57cb02f645ad0505292bfb064d908a5218928b9964761f89a1a775054fbe0f094c0e22895de68c7603e4328d33e7371ac09edc2b6d2c1737d5b662141fd0de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/kk/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/kk/firefox-77.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "02e89c01d0fe2b610a51b1a209f97bb556fa2e0ae218d4d1f9966e6e6135b7a59ab7fac5c67b3f01bf9800980e8870b1dfd6a107c6d5026a160f6aa28cbc9183"; + sha512 = "708a29a81a0f1ded29abae0d0d781883aaf809f7910db2985d9e95b8de78cea750dd40f9721b24b642719f37c917d36e4e876d6aa8aa27401e695b61a392a2d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/km/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/km/firefox-77.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "75068ad7278d51b4a44f8977495cc441945c284ec3a96055deaec0951eb0bc38dd65eb11759c338d5bc37f154a8bda4abc7c47a6f9da68398e51db42ecf90cb9"; + sha512 = "65de59b8b41f44e9e759e9bda4eeee88558e4660db30b3d9ca3f66dde0a82145a82ba463eeec55fd839f70f455c9d855d77e0507910ad234c6c883572942899e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/kn/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/kn/firefox-77.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "d7739796d00440929a3923535d53cb3dab05208fb4645dfb0de5d96991400a9f7de226e2f81a7ff2e67a5c0ae52ba21f67127da4d11f554ec7032c94f227b3a6"; + sha512 = "094c26405e965834c5483d62c0403b0a64426ac1e559c1a760bd4492b7ec1662cc998a896e06778f910ad375073d996a25ce9549bf16f4b17aa4be52dbf26ffd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ko/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ko/firefox-77.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "67751bba7a96a7974dbcd1e7946d9851c1d0b8de15a85e4e14f7a497ee67c3ee9752bc44f8dccb362b61f2966076c0bd6ac1238921552b4bc8e6f859e3917f09"; + sha512 = "642acfd183571001c25592ce0f35155dd80aebb8a79bdfdb2fc89a1130f93329b43a02d8ae550d495d277de0ad1ba5c746352c80419e97b51ea5c05169c4690f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/lij/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/lij/firefox-77.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "4bfdf475896095169d9c7fcfb4e353ff5e4df36d4c99e7acddcd78114335ee04f07026e81f5ecef2983caad0bcab960954543dcf826c0285eb0e2f03a52c0b8c"; + sha512 = "9aa044f118cb4aab69570ee08f67591662e6664b54e5989076875e59ba38b5b546047a3c2cb91a6d4ae658a89158b4ee78aca048598e5c26c79e4c79e972117f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/lt/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/lt/firefox-77.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "3d519425c081124d38f42bbc127a9331fb12d3d9a984120e39d07384f10be83eb1431dc44da6fd83b992e746b1000e031e843735c8c488b7596ca5fde0c409e7"; + sha512 = "92db275ad457450f7f7866a599082e643c106155347a18e4ad443f4123589014aa628bc485722d31ec625ad7d123d772c65579771dc0a253785ce61bd00f674b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/lv/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/lv/firefox-77.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "ec59ced3bc195f4047531715aaddfeb21a63a4c65d803066b3719613600f52a2f3ca2b98d7f7b4f80b9c2321f251a02e8a7cf4d513040109498a0b67b4d7024a"; + sha512 = "c1f5e72a8948e3fc8b240f93d9c6ebc403ca9f6c839064c830414935c4921825da39a3a9ded4c0362729c9da866c22fd24a1b5fb5a53b776b8a8e924dc862ce7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/mk/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/mk/firefox-77.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "608be1efb1adb91760031780ada28678332c21e08486241704c0f20cf83486692665f616803d4a2ebf67816d9c0006e05f30100dfb41ffcae0375f278a854304"; + sha512 = "b7fb36e20d83197e64b43b01e8f2d38f8c9ab721889a72c922df6f2d97ea8eae53cd638fa5cd18540b7c28bff6ce64a596246f535745d0890f69bd3fbc011a41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/mr/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/mr/firefox-77.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "300250e0234c3151b3f11c568e48e480573908904e7f661fb12a0e9c625006c2f51b1f6c3963214a1c7a54c0739590d288b9ee6d6255661c9743f25b6148f930"; + sha512 = "5f65d79c539eaf73ce41ac3effe9a3ba033ce3bc32a4afda3353c815645dd69daa989f85def03ad6017a759f8b5d05cfc39223bd265f4962fa01d9ba83ecacae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ms/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ms/firefox-77.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "bb7e67264b804f9fbb2f3ef18234b93ef47f3f79cc3dad6a871a82bcf339edba9ffb380e6d440e71eb04b8402a4f4765ea3aeaf88f3140d37a1d8c58793beb64"; + sha512 = "67ebaff0a9dd48dd257b93dc31857ec6e3ca190a9ccd945f93b153293f9ceae9f461370a35f52f8d4f667905198076c79e2594e49a62c436248e2e198b75946f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/my/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/my/firefox-77.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "4b5cb93a7c495f0ef4b4146f2127e0cc0c34e193b63d65b577213e9dbfc493d7bb9be50c16faf35734011fe9a8344483591e706266e72f7541d92e576695896c"; + sha512 = "aa14d4a9aca7bd601cee793f9f269b6a8009f5b8c41858d7eb3440d0037f5d31f0fd9aec05c6dff1ff294e724d487bdeaf55450d378013b79ec198761e88dfee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/nb-NO/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/nb-NO/firefox-77.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "c1b702956d2264dcb76e218ae45f1b23731ecff9dd8f1ab5e6e66787f45f4ce4c22f38c2c75098f47bad5345c2f7312d20e16d4fd963b34de144cc14bfe604ac"; + sha512 = "535df626eb1cda145fa474a0b8281480703f738dd40649e8a090ff880dc69c7c9b002a7f4fbbf149ba50eff43b05b978f7bffb73c2d994b709bb1221addeda6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ne-NP/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ne-NP/firefox-77.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "69710144c5fbb7cb3b631de69bdd5fd3571a4db24cedc8aec6081590645af73e216ffe23e76fb9defae1942d1b579cc3a8e340c8e8d4bd9ed87c661f3e0fa57e"; + sha512 = "f6d3eb4b0bf3fd9891123fbea78d8b63e205886f0f2b7d9fb4fd7217981903ee9ea2933744a682f5684c1db1d398d5aac5e62e4c331d74b5f1ba0132d44c70fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/nl/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/nl/firefox-77.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "9e7e854f6a36908355d3b994681641df5ac522e82c154db29daa48e1be728a3c57338cefa6f88a17164275cc16c586a58fd842e9a55f2228fdc2d50e8e78e4e7"; + sha512 = "02ba2f98ea4c1ecb9751feeeb603c058947df68841c803b218a3c92bdfc66f61f98c56bbb0614ebaf4cf67831e6702ec857cb7f6a8c540bc5fec3d81c5ba5ee6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/nn-NO/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/nn-NO/firefox-77.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "1fd0d26a513744563506f7ffd2ad180d2ecae603c4de4f6f1ffa7c4140cc9b943149eceec85da8436aef05d6ba984b9b9a8960fa2a013f338f742d78c9c2d18c"; + sha512 = "591ecaf523f48a27101417a963a5792329b78605928ca400a8c61b5afd653a840755fae5ed3f752b88fb1d746cb51c3acf655ced3051ffe379e165264958c0b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/oc/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/oc/firefox-77.0b7.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "d2459d39ee8fdb524b427e373a86dab5d4470b18acebf0f0fa8624342e5cb57d44de7c654532c034bcab33afb16dcd4a4bb629e4977f8b12fb04a80c183d82a5"; + sha512 = "a11bce29cede60bc9bff8adadbe22ed70b44576686b88a0e7ebb59d3fab38c69553af4827fb7ee3db29c3f587c3099da6f19d4583f4c688eb46be4bbd04d2568"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/pa-IN/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/pa-IN/firefox-77.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "b857b144ca6d1a4070d124b8cd409c3bb7d3ff15f8eb9f853e862546b42e2de29189c2861fe87ce532e63cff820113fb7d1ebdf90e4e72bfcbb696dfc84d5ffe"; + sha512 = "6c060521f85228487cedae7ff6c333e72fb3ac50269136585a0582e2ccc3ea0874ec21ac2db332cb90059dddb60014a68f434b9396a535694e65ea7207ff41bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/pl/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/pl/firefox-77.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "9ed9c53c0e553ac31c79a7d16aca513f81943bb50a32c99133daf20faed47fac644a2257ed52ba3366379df5fd1e3f952568e9f5c0b6cdeaf7636efb7971c9f0"; + sha512 = "a03d759520fdea2f911066b17082e4c322daad8bf6120643da9a1f19d2c1bb3cf3db359da614f0f876637f0edcfeaab45e18b90769568cdf2d2ea46cd6fa4902"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/pt-BR/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/pt-BR/firefox-77.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "08a7111a48ab4d9a8667c9aeaa36bad9fb192258e23ed37d146791e82343a9c9756e7b1d2e678b121e33d7d408558f64031ae6c440a32e0547073dd7983a2de8"; + sha512 = "6fdabc52c892fe28f43d7acccc5c4edbf8bbf4e2cb9939447bac1299b78315df0f47c17c6abd1dae8508b20e2053f13ab169663b3572f13d6c5b55c91f9ef216"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/pt-PT/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/pt-PT/firefox-77.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "a36f3bbd877059cf10a05bafaafb24304f17b2e4b5f912110415a045347b8ccd409f2fc323cd26c0b9cc2d1bb530b5f5587d1ce45ae3ce87ca033ce93ef129de"; + sha512 = "4be9f310a230ff5426c73786e421bbd8ee96eb3ed15d394e7ecd8514b08d6b4edbbae259587da522c25a4f3c6eb57324672f8adc3622334c7f5c48af495254f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/rm/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/rm/firefox-77.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "f80bf3304c183ebdc711b4838af6c7ce854a06795c272c4fefca0cfab80fc91450715e2315801508c05395877f0cb50cf380fda66c4b55ff5f4c5ec9250814ed"; + sha512 = "05fe442d3ea0af4bbe1901b17521d0a1eb527eefef803d9a66fade056b988bf52a6bb2f7f32fef22a6d9bef76d66b31b690e03b14e1277627e228e0ba85260e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ro/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ro/firefox-77.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "d711246248303ba0754b32baaced6d6f789d42c2318a86c1ad62e78a44c20d18bd8371ef256c4b3f554bf19c26fe8ec07e2a05bf62fc9d98622a6ad88f03a179"; + sha512 = "b3fcabb7dcf35ca9e444a618b476862050ceff0845dfea4070793b59d347018dfdb6362fc5cb2f6a5ecb6fabcc2e55511535c018e2229a6aba4b6c0266eaf6f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ru/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ru/firefox-77.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "54920b27983222bb44242abca0e06c0f9d7533e3503bbab80d5dc98de10f2f37e3f5136bffa26281f8aa8bdd02724cf07d23997c224cd42d53109333fee141ed"; + sha512 = "1e67aad86d44fdd6d7b72528b558b772868d72b9aab634224019646aadb64d23d19b7827a7b15e3e5b0e6a0247f64afecffa3ac88b171133c054b7587c2aa050"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/si/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/si/firefox-77.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "68ae5f192ce6fc53a94ec39ae52b51ac021c55f09b04f59b46f37069cbe258d9527920d2bfff59ee8973fb3af96549d78e6c4abd4bece7f8038588eeb2317c63"; + sha512 = "df01e74d2c2ac38ad574e2cbbabb057c60ffcd18a9e43f8de12483e9ed256a2368005b3c02f11cf6a742ce19d46eed7083f8834c3fdae5eaf1ab5f42b2281360"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/sk/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/sk/firefox-77.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "b2ee9384089d2b7072a3d5b213e22881d5726e06b3623d8ed3503b43c42581f091ccdceeb3dd8d9ea00839c0e44de8f652571251dcf10a21fc0530a1a811ab7e"; + sha512 = "d2db364b089b2786407c6606657b182980b4de9d09333fbe63f6d51bab8e99a493bcab417f06d528d4b178bf7cf5101e2903cd4c2998b264b9233db3be9e8330"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/sl/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/sl/firefox-77.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "a3c781959dae6e3b3c2508e60cc1a807bc5de02529a20448acfe95ea8033130b570e61f88183d61fb55ec04d3d217d0974c078df57beb372fd036c9589fe4796"; + sha512 = "5d6b3e9b918ffd18533335e32f8088dddfb66ca82e98a9af8a76fd2ff23247f4c8b05cea9895d076b555f2edd2af34776ed25a0e902be9abd589fe577e7bd659"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/son/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/son/firefox-77.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "8fa2d12f1d033e2e6d3364e6eb4953ce6353ced7db621c8b5474dbfd192dd797e1497b5c98e407c2b3c5cc13fa823fde949390547fa613556f74c240d8dbb94d"; + sha512 = "ebfecd76869650105ee62325de604413a409b97fa0560d9f0e908a002a318234cff23dd857168ea0d782095fdc5db371af1382cebc49640a2554e6a602117f90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/sq/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/sq/firefox-77.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "9a1b4984436e97d5f86ab2f391cf50efa465de58fadbf5d5cbd15a3cb6ed9c020d909e3d6ce7dfd4307286b88d68edb9a9184395b50fa67c06d9c0a7502c9cae"; + sha512 = "c94332eaecd79c0d1bec6cb9aeb9abe78a1528d855f71028a5d0eee95c9bc30c50263bebc198b86fa583d0a86ffb72fade74afa6d2a93ebd85e04154bd94b2f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/sr/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/sr/firefox-77.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "4924e0c95884aa8fb1cdca9741a20cd9680db1599e34555c83904920c796c3e0d5beebe98d9a90185b287ddd5b3e46cf0c2d6d001d33b8a0adcc3edaa0e1da14"; + sha512 = "386fcd94487ee4c360e6d5bd4cd97668c68c035100140f3ce894fb33eb179617281e3af42893abb9fe830e057d8b8a987f387861fb415bfe7af5cc49a2160763"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/sv-SE/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/sv-SE/firefox-77.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "b59829037189d0521dbd9027c6095a185007d56296ebf078ca979a26ec630e3ddfa899b2f42c62f7fc6f03ffc5324d7dad4e911d692bd3220dbcfda54930acce"; + sha512 = "d3413015adf93a6f9923b69805729e58f3826cd1db17585be10263fad78118d666e6036fb3c7e8f64057259e8f1fa93dd4fb2677e3b913bfca42b609077590d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ta/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ta/firefox-77.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "bed1f93d7d06514543582c8a153f9264f5463c506f3bec71a417124b2de11ebedaddb97a67ec32e25689dd7c408f4be97b7670bfafddbeedfe8eb54cde5a4e35"; + sha512 = "fa6365f5ed4f53f12b8f7692aebae81150b4b8df6830f0f215c854b9603bfa57157f9e984201c5edf46bef8bd2d12772b5453b9b518f8cb90b3fd927d991d69b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/te/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/te/firefox-77.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "cc46a8a8a9829c5d745a5a6e48649c9a0f9febc179b7e162f13182d991087b7a1b5ecb181f15722fee242adaef4b6c0b6404026138004832981170262a9fb04f"; + sha512 = "6eafe03b0856218a04f9fd78153552fd9b1026c2fb1b252e90decacd580b235d40cea0b54b6ba4209f9aea92c82785469cbd633e23c6ef8dfc61071f7412c491"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/th/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/th/firefox-77.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "d7f2257d83fec3d8c6034001131bec8810b495270fbf7bd583d4b542743d4e573195cd7a7c20beeda17707bb2bd419c040e451e2437e57ade3c356a2c353b993"; + sha512 = "6c18435b711a8300232eb64014305366f9eb96196e8c04cb2b30a84c8d21a738405e0c5abcbc2e2acf598d7ff6479cd170fe4b1fe9e02a1a59c0407d3d301c2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/tl/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/tl/firefox-77.0b7.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "674c4f2b8d4e3c48523fa915f4bff80f751c9a282b4e6068f4687ffedeb1c44216336d826725d2d613d9653c3162fe70c51c66b7ba11872173e49640712b2ee6"; + sha512 = "d97c291dd618fd9ee9863d021c15113355d6668904685197d355156e365aa15e8ebcc2d62959caa3e596ab6609c84a571ff1b9c2e206e763f1dc691d2c4b90ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/tr/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/tr/firefox-77.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "f906d0d197dfd368d25a27917e246b9bce1d2cba3bb0843ac5960df3a2af0b8132aa7896fc6be5b2278d8079447a2eff1811232c5cf14a9a07a7d533873f9759"; + sha512 = "4c253b3f65ad7a04759fcde055315fe30f0b8433e0b670ffecbd906b8ec2ce96825bfd133bf7f014f696c1805e38152b0e4159b29840b22c77dbdc92dde5ebc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/trs/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/trs/firefox-77.0b7.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "e5407ddfab522d96a5c77de896d2f0b5370fe495e4d3de9f0c120f6fbd9adf0a93e93ebd298ea721ab958bfb94aa3686f17a831a753da80f4648ed002d316ef4"; + sha512 = "b8d6e7ecbdfbff07a08a739cafb50a26c760b0ffb77386d57ae29255c57f67fcbc25ff95d4c3d9f1592b0aa84241493edf86a834a11af3f565ba35a1a6bac21d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/uk/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/uk/firefox-77.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "4770960c79341cfa6438615f8706bfecc1edd4352eee42df7b359cb00af223a99914a1efca56503e15adbcc8df829673c7d356f01e7dd36d123e0468f51e4c6d"; + sha512 = "d4d33614c0ee3382609d069327a7eb64dc00572c9150650f469389f13d6e8031e9ff92900fe1f8ff0bd6c8b0e77733d7dba1ded72bd598257c028fef218925ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ur/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ur/firefox-77.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "43d54d50f3140e01325ab99f7ea8caa2715e7b91ef1168418ce17ce4b6d81b628f0b42ec1a2c403eccdc1b0828be61561592c28aca874db3f16fd86e70aaf31c"; + sha512 = "b9efc510b1694a3aed04727484bd436d74f426d6c10ff491e770d4db38a0617a462015c5715e1d586490869f3d986b546a2f0da32e9c9bd7b9fb599804ec8b15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/uz/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/uz/firefox-77.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "9b24cef39ee28abacd4b8b26296221ec4a42998be4a4f378879f3dbce51f974c7d1cc855d51382381830e8db6dc173dd60711716a63e8ac28ec6a9a5ec95ce86"; + sha512 = "65b0b0daf9869d82c16956f36d470dd52f82c7521c11877420ade0726e5f859f0b5fd8a68f587ea51f668067b45b777313b96f584e8cbfb4628704bd21b8f150"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/vi/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/vi/firefox-77.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "31bc2ed67edc0b64f31bfad87a5c007648a55570ab602b726872ed534f58629d1ddf71a9dbcb4b7e49612f96bce34295dba7593630739c0d795ea2d3ae179296"; + sha512 = "4bb9160bd25f77959e9113b6fde02898193679afb2f11432271129472c8495427597c753c4ca3d7c138814278aa801957cbc73d55ab229cc05ed02a9b446b873"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/xh/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/xh/firefox-77.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "d15afc1e2d159b4941f6ecdb4ac9c729191b06389480ad0aa29bcebaabf5d62ba06b05c4e5010d771375f74b38822863f3e27b0eb2194495f2c7457e3a3f84c6"; + sha512 = "0a5b9924328080838c1a2ae2a0823d0d28954a356d431fcc57c2ca387651e4bdb20673533ae098af68a93430214ff159c2d13a0180cb7862dbfa78abb2e1dd37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/zh-CN/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/zh-CN/firefox-77.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "47d4539a71b131e4c4898a6538cad895a475f91e51a82426ed04355fe6f5c380660b23f1a0db13ebce146a333b775105307bfb0a1e54787d61503293d2d409d0"; + sha512 = "811934399498bae9a330b5a773510507fc6cd4d3d084ea9a2d866d2789576276155a8173a2e6cb4ac6c021acfb79220f64f4b484e5806a8aede252fdc726712f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/zh-TW/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/zh-TW/firefox-77.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "0d5f2ef5f4315f3d1b4d1f67c10f97cdb5551c09a14e93ebd1dcdf834cfc70ae147cfe0f3bbe57e5f7f92b7cd62a6246d8c8509c0429563e90f9006aa9b762a3"; + sha512 = "ddcee97acae9b4abfcb10e6ff095d9f69134f56e95ad46abd9dbba7f26f9fd0318aca470346add479ffa6899aa6a403c7a29563827935388dd92a49a9817faee"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index c9dbe6ba4b96f..71940c1b33ae9 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -199,10 +199,10 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { description = "Mozilla Firefox, free web browser (binary package)"; - homepage = http://www.mozilla.org/firefox/; + homepage = "http://www.mozilla.org/firefox/"; license = { free = false; - url = http://www.mozilla.org/en-US/foundation/trademarks/policy/; + url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/"; }; platforms = builtins.attrNames mozillaPlatforms; maintainers = with maintainers; [ taku0 ]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 5adac4bbb9a10..f9045a4cc19e8 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,965 @@ { - version = "76.0b1"; + version = "77.0b7"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ach/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ach/firefox-77.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "18894233ff9bb8623a9b8c0fe143759958dd2c054f9ecbc78a43e10692a90f26e43f5692443847a689c925756ef21d23685c72a7ca99bef3ea22e654cafc9deb"; + sha512 = "b377d891ec1ede4d13a55bf6dccf67e9cacdad118241902ea97a1719f784cd8dcae47fc015bc79e4bf7c4a76dd66472cc56a39173021ee1c259bcd5f0b7c3097"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/af/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/af/firefox-77.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "ede9f3fcf92dfe7ffac6a80d27f25b6792f1817aa91fe82ab8fd5f0ab0cce8d8817460230a680d32ffb740f2f2fd93a1b0acea376263b80b52a6ea584c48a674"; + sha512 = "729d7a9cff65d7d002e732a4224921621e3b29c1afa0575506863dece3290722d916ab6072ddf6701628204e9b78d19a5b0ee90c11fc27772ea2eb30ae62858e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/an/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/an/firefox-77.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "b048747cbd4275d9133b55de1a90f8182f3847fc3a536fb4f24ea8e1c5af8f79af8c02762c9d85649131ccf65916aa5b76f5b65dba296cbe9c5fdc82da15655c"; + sha512 = "7421dac51885269cbdea9514e4d96a9dc9a5acff496176f80fedf8dc570bb3113d3eceaaf25203aeadf2357b364e46b010df2d973f0d8c39cd6df7e408d286c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ar/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ar/firefox-77.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "4156da408ba6fbeda08fba6ee066aac9f4ef62d24e409c05e805c8c10e1d513462f6640f04fc6a0aa5219d5754b23aa1f01935e8859f00e9e7bf4a1f3172330a"; + sha512 = "922cc579853ee87f9055b48c12df6ae5a756dcb0e6fef8907ea0befec3f7c2d53f158b4a089bd8bd42765104e0118328d27da4ca8924e732125b207ef72887d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ast/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ast/firefox-77.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "15679e79a1bd9c3d5f8d430ea439586c4c176f63c809f2f77f9eeedb91dd64313170d828734d6ab34de2ca2265e79236c44483ee954b4e26b8fd035e534eb74a"; + sha512 = "6d193a8a8aa22a667de3fa4c2b53ce9d9a674919c7e3c95fa7357cb968e3dd36bbd123b2fec06a3cb08bc298e5fdd38c4dce690d10ff15bd31768c7694d0e6c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/az/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/az/firefox-77.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "2600940b1d499c2298f1b5cc2e129dbbc076c2904cbec45c0d9153a26d288aff2065f9e59e4e31ffcb78443df257e0426feb2480a27168d5337818d1ed287358"; + sha512 = "5048b6b859650523c1a98d6f0c471dce49833f6303a67f8bd02295dbd341981d145145671660ded3c777817aaf970b478e377bbd3fb367fcad5850402a16474b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/be/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/be/firefox-77.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "5681d42533a313403c44f167b49ec30b4b260f8e1f8773cdb7d3bc92e46276e6a732d8c7358a9ae87dcd2b27e1aae17725360f5d0fd3e779fffd325521e73b2e"; + sha512 = "0288debe1839fcbc9067e26411233b8b29960dbbe65c0878955eae67b91da7de0d51000e8adcac1e3f3e91d531c371f677e418366e50ed33337a4ce46c811b6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/bg/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/bg/firefox-77.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "cf1f5ddf935f2bded1fc04c561ee46e8b19ef673870977843ddec52970d09daf4b4e41c9e3433eeb0bf32fa611cc1037d9e6f1b9fa9d8f81985d05735fe3480b"; + sha512 = "35821fcb332de76d2dbd039e9dc417631d8303921cb30947d39e6d0e57edd62f5fa1935238899076029189250a73dd657f25662f5bfdd193a5eb6227c706fb7f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/bn/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/bn/firefox-77.0b7.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "fb7ca5932a9471eb6636bc93d72749101a8e3d1ec7d59bed0b3e48c01af7fc5465217ef9fe1228b114bc3e4eea05b2479c847b823094345e62791b2e6d913eb4"; + sha512 = "82b553daf2ad0e93232b655fbe1c24928625c7f682ef755e1f1759847cd93f0b66bd000784274a40ab5ea0e89985018bf17835208746197b546244503138db55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/br/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/br/firefox-77.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "55e44c44a5a0301f7105f591d0b88eacf0b9821c1f33ef234e934cfb6fb409d540f7ba5305742b6db6426e8e0b7e71216a0c2cfc7b34f9f993828bf6ceea5916"; + sha512 = "69952a7d21006632a77c0e719bcdd3370d72760c98df348486d4f5c9d4d6ba73641b2133a615f8c5548e5708d4d68a499466d4ac32f690c9b76eea54f988325c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/bs/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/bs/firefox-77.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "f62f178fa07f5bc24f71a9b862f5cb0b074edc7b7f56bd57aeedcdb58d30a816a889a3f889efa53ffac6344345eabd78dea268390240d87366e8cec4396aceb3"; + sha512 = "fdf0975e3b17097469f54e57b99fd99b69ed8241263600524b1599db94640b4b7bc105a67edcf67b70766188ba20ba7e9b7e96b181c2ed6de020c112af75dcd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ca-valencia/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ca-valencia/firefox-77.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "ea6c077f21afa270b1da0608eef075fea5cec7f040d7785c862be60738db42c32347a053549c1c22dbe224cd9750a606ada15e5d89d06effae40055b4179edcd"; + sha512 = "438c3e5e9f6a34bda35ffced50e00012a9b84ef589b8868a7746f4f0abbe4143e591f5710d075def1187d61b7f289df0c4a5add6ba4c37227d04509c2b645207"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ca/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ca/firefox-77.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "8cce2b63308a0f7c2e90dacbbc3b7bd7cba78ec50e39c8515572e40a090c63bebd26acdcd3eec9bebc687edfd4b56d42dbb3d6f043e27931e230200b76fce9c1"; + sha512 = "884d87560ea62da3218fc7bcb5b3b3fb9d98e70d5c13bf86627ce61e20aca5a8717db595b9141a302753fb0d704f1c1da99c0a8bb3e1f83fd3f6eddeeea5218a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/cak/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/cak/firefox-77.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "051a36aae99038b7ee456872e935cc68857587408960defcc77d4638432b5c7f62407f7a626fff11d419ec9e2f68e8372e10944a466b07f9634ad5a14c9297ef"; + sha512 = "6525cd987abbd4e871122a20c25c4ba353272437b56f82e1a9baec9581a6a10637a85942bbc261a375842660606259fd030c59e325b05aa9fe7f3dda77864a7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/cs/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/cs/firefox-77.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "ecb599f6b25f01701aa2ba20a955a174fa34dc666f82bea32061c34007b042a620fd892b4171dff06259eb69e6c27f96bcad4c8435f7894d0a3e67167c219ec0"; + sha512 = "c3eb1d943b892fc41e25ee2bf15f0877ac297483595f7abea31332311e764353d8b12b7879044f688d8cc97f3104a7bc2b0305b02b8412a78e388e59b04d29ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/cy/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/cy/firefox-77.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "7d35edcc268eeebbc8fbdc1525ff7b918656a88fa04f748b2932c0c99cd867d85a782aadf89314e584eccc7b3bcaba8ed63881fd4f06fffc053167271ebf0d7d"; + sha512 = "0a66eed4424c392f5dfaafa6aa198108757abffb069f8f665c06bdd24dfca08dff314447c57cd81815fdfaf54edc87eb67a6dd5c190e3512a15645e31d5d8428"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/da/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/da/firefox-77.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "f6cf8c1504148c59d50203b807afb1445d40b53739c4574be7229e9c8c219907a8742e01764b2ab4340fd7720bffed3f160e367178ea16f8a24c603cb3f304dd"; + sha512 = "e29aeeafc1f0d456dbe66d7ab07a632e91a25c62cfa03355eb3c4d9396529bf7908980b59acb9fe04204342b4c99f4f05ef5f440d638340272d20fd2bcfbc596"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/de/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/de/firefox-77.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "afd40e7e26375fd4ae4a51652db5e5862c8ec2aaa319065bd057804cf50dcbc322389fe2b3a318fb02cac42f14d7b867d3f68cc6883a325fb721fcb0fe86036e"; + sha512 = "b3aaec2e3d1a23976378bbe526c63503406690e23ccbf0e255f54c5eae34452491f414d5a8be6f9d8e7bf14d6d4479b9819289074b342691c607dd1a013db45c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/dsb/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/dsb/firefox-77.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "988df89ffc2f53635df25bc6c10771a470bb01c45f67929bac995d961ce5646c501c002a19ff32d4895fba9f00206d87226774e480f86ac05cb9dc631cf5734e"; + sha512 = "ebaff33285d3d78e22deb21da917174a8db140d05d511ad75dd1125361e4c1e7c6530f5fa096634f3bbe364c42c55cc0e36ca7066c05ac21822b28898841c49a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/el/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/el/firefox-77.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "8d91949902f3c51c213d7a89382049e2f1d9df55865ee3235676ca4224f486f50752f8f667d424efcb86d8b95449be45f2fa18932a2904a9f58a819556c98243"; + sha512 = "706fbbb44ecb6e7acb93d7fe8c1bd5f4fb3d3fad7a8e64648770fa69756309c0aaf0c2ff583b2bccb30c9f34450631ca886db0343ace3fa80bc1a6e7934cc134"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/en-CA/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/en-CA/firefox-77.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "05aa730044331e13cac0d35e62383f4e46aab2d35f781f427460bab0320c12ba7c918d0f2f6d17f37d2be11a48b22653aca1bbe2a6387a5d21af0cbc97baa574"; + sha512 = "62206c436f7fe811149936b8c73d62126e21874d63f66c72e7aff0e8d4f9fa26496a8adcd842071a602638ee01a14451c65c0ba8a2847f0b30b3d7da9c2625b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/en-GB/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/en-GB/firefox-77.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "663fa89ee1b0ea10c1abfb8b41da519c305152d37cdef631475287439d9f28c83e41471b63e1643b6e1e79bb1ecbe48795ed5de4127e3e9d55d2fbe566b487f7"; + sha512 = "6481706c1f34378bc4c804216217b15ca90a214baaf6ad29ca0fd80cf050b4f5eca17d29427d0e4bb0a5c966b407ad7d4ce08c085a68a193a500480c9196c760"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/en-US/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/en-US/firefox-77.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "d6d21efdac9d15b4274462280af5bcac357df959486801e2035e7ad3658cddd9794b88b231078e3cd705f5725a20a71b0ec686887a9c1ee0cd044c4bac5caaf7"; + sha512 = "74ece95a9a152addfc30de6f3daccbb64172c4081163467401d6459d4f7a65a7e459ec91663dd066f9cd7f867e7455e09fd1bad4fd9da7a6c3af20426474f95a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/eo/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/eo/firefox-77.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "974d3621d2d860b9d7a41073fea92f2052bdb49384cd845ba0fdc76ed4228c836f6ea5b9a4d79bdb7ae71f3735d3f57c0028285b273ce6b1f8db800bbc88f13e"; + sha512 = "fca83582fe7cf14948fc352981dcbbc136cafbfd19fc85732466aa8af27cfde37264dd3168e9388c12eeb624d9af561bdd4caeceffe8d42a393d1133a8c20277"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/es-AR/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/es-AR/firefox-77.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "6e37dd0b5c4c8409911d406e966dd5f87397c3d8f17cb4868e368c4d1fa1bc1eb865729d27f75f859bb8e2147aba1a9ad6fe385efbac10da44a5c8c1eec34064"; + sha512 = "442f9e533a1fa892d19aef77ca64024938ab934f4f963268ccdef1a715a2c3f2feb73f9c2f6c46751217d4dba9f72dbe88ed1b1114be22e2839c0b34a68e8c35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/es-CL/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/es-CL/firefox-77.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "f8fcab0ae6d36f6d2c88ce3dfdbbad100265b1e6706a6b902b040a9a0406fea6b45f0bc1a2b5cd10e1c2c0d04123b3b9c928d0b3f7ea6e0fe4f9fff86b5753c2"; + sha512 = "29f4c00ccf180e239a6660f5832d6ba21c733ae0b90150b1da128e7cd072b6ff5974c6479e161c7b646f1367449b8373af9ffd7d072bad2a190e50627a17816c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/es-ES/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/es-ES/firefox-77.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "0cc702dacd2355b5ada0caa24daf2607b30bd7fd6c0d82adb833df67248f8962ceb6ac585ba9339b52683f2bf2575dd5f5b03a4217ede120771514d1a5028184"; + sha512 = "f1d9ea6a116804e7deedf6e6d62b83224e1f7514255394f78fedecf500cc3343fc9fad1da1f690fde9a7eea4d3dfe0cd214a99a2f9bf3b83eb45ab00cc12de7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/es-MX/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/es-MX/firefox-77.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "2dde4ca37ffbd306ece615960289a78b4c68f15115e88420efa22822707dd3f0f9600a1e0044b1547fc6df6140895bdbd7d208e3b4de73be38d602c561aadcd1"; + sha512 = "8d4be6d04c22e1c98953b1a1468b2768d956b4d0190638cd24273d1a0356dd8479dca22566c5d45b8ec18a074be472e9ba9726b5224fbd3a2b7f05af3b46c411"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/et/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/et/firefox-77.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "85be77e74b2e796a3fcfc378ded52358d4348e646c114f6bffcccf15a5b59600ca2c024ac90901d384fd57a26355be4e82ac8cb42c2d7f15b7fb5f23dd94cbcc"; + sha512 = "2c9962437d764aa27dc3d6a6c00e3cc40a456504cd74fe3a7f74a0f0216d54e9e4d9383fe6c5368fc28ae08d0b5424f65b9f50e33a7b6dc14c344a1aafb90fd0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/eu/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/eu/firefox-77.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "12bf6c4877667c65e1d7f23e7e6fc4f03f09ed51c51ea4fa78b0ce40e7b8d62053dcfbbfb2bf08a8486e9f36b4aa56119083fc2ba62f90ee6310357ac3d4428c"; + sha512 = "c465778901b01e966fdf81e56b0f1b7667898ff0359711fd32e343692dd216704941e30c3ae7f4882f42fa297715f778e68094db85583c0e60a57cb91e95cbce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/fa/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/fa/firefox-77.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "becabc14537ddf9e71614bdcad2215109d38401ec66c0827b16216cf114fddf53112fc961dc525cbaecf570d19b1c815057929e51506769f71b75454ec2870de"; + sha512 = "e194a9be6f993b177031a2fd3d91d955abb6d7a4d249e8864d5a894f1f9af87c39034801ebc9d1cda5f934c8259706c6e7fdcea344b5602f6d4ea8008375ed53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ff/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ff/firefox-77.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "123a43f2700be827686cf88a792ad3c849199c56313f1e87c46c7a39dda9d9c5c730adf758eb39a244da42f136e7b06bdff513742aab9f6593b6bbc5995cc8ed"; + sha512 = "613dd230689ca36df61d558db43d8d204da5168ed1172bd29e732e0a640d5f954ec4f5eb03e8c6abe5646139005981bfed716dba8fcfdb2e697627e563a6ba0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/fi/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/fi/firefox-77.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "e658d443013837d2b33e8833d699113a43533b4e45409a53cf91629e12156335c5fcd2aee926f8fe03b94b4ed0767693272492531c4b348f5b9d08c3924b9a4f"; + sha512 = "63dfc7ea59a29901165707b3c11f1087c6e23a27805de1d355d677943c84303b7c54c199d0610a714b930539bbde96991a79aa895fdd3f6952174548fe014d0a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/fr/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/fr/firefox-77.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "8d57fde37423bb469b7075725aa4f8481d212318340234856a2168ccb7f49b20cf236193caf760046a50d418da2be69a4fbc859a9b726f8b732007f8bce6998f"; + sha512 = "477539bce633a1447937d5689972fedaa1592954ea3cd1537f648d1aca9801fba8441ba6c35cd2148646607982d84fec743bbb115da6807f29790c38d5c22e45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/fy-NL/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/fy-NL/firefox-77.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "32a4e7afadaec3b210dee498b0b7189c02c9307de5c52eb2deb09787cdaae1c95dc83f6aed8bc0ff843cf670bea5924513748ff24bc44313d4b32f749281b363"; + sha512 = "cab7637566adf3d41e25915b6e94020214da31aa12a6e913754d1de2fad0fac9abf61686af64bad21eb07e696f23ece8ac38d8255848d5bcc6b0c1ba4c9bd374"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ga-IE/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ga-IE/firefox-77.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "e1477bd3ed20431c036c3e9d65eea4660be028d3deb0d3f6ea7fecae0e8987daf8b9403260382bcfeb7fc2eb0928387bf8fffd3fa5aeb86da946369895c70c8f"; + sha512 = "843f136635783c6a586ed273f5d97f152b004406c53958e59d265f48e5390fd42246c2e92491ff4b39633bcfa15ab1c8c420b3749a468b87672ad900fbe23de2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/gd/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/gd/firefox-77.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "7fe8f5e41679c1c21ede2d9cbc6274c068e76a5586dd0723b957801626f58a7a3279d8f8c750645f1028b15f880660e90a9e453ffcd531582d1a8372e3195662"; + sha512 = "380ee84b44b90329eb253a604508584cb15fb3d36dd25a859dcfc8443cedefa54959fa958827132d1260cd040b70369d65319f8e18d06359aeb420b96068ea7d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/gl/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/gl/firefox-77.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "01aa3a369fee3b3d5d1eef380c7de07546649ddd08343e2c23d16d1feb071d42c7dd38a3bc7e5d9ad7091d46165ae537ed48c66d0fc59554653638bbca975177"; + sha512 = "e328dfe710d097c49062b9d0a54f42d4896177ad7ba174fb5e45b37baf78ada25089360bb0bc7211d605cab92a2f3c220cd1b78a7bc0c65ac17d15314c68dc94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/gn/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/gn/firefox-77.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "871315ffdf8418bf065f51aa0ffea0eee3a246344f33cfa93069233470707824d3ec66b31d50cc251cf82dc149f9e2caa3b84a1fb3f6298ec98e8f9e8ed39c60"; + sha512 = "2f65aa3b62e2573cbfb0591e1ccc729f983035c3ada9159e9fb8014263f38731d19e5a2da41943c0c540ff1dbc7620c9fde82c24dac49da7b2d920c1d7faa4f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/gu-IN/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/gu-IN/firefox-77.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "663cce89b88ed0c35836aec4b591d0e945a865c2ff3d40b28297fae550f762e25e69df74ff3906475d708a7301f428b183c964e0fbe602126f4391f22e5c1824"; + sha512 = "2d756897a5e3f7f038d3e000bfe6f1976611eae436ced45d5c06eea140ba26041c08588b6ceb7fc5026945a19a46715b154d0860ec7744762183f17d07b5e792"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/he/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/he/firefox-77.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "007b4163cddcbf8e4379961ea7ffd52ded3a942acf2e2d8803086b24785f0c5f750f3f743f2f9f93efc505f95e378350369f2302f62352f1b2db90b8b0f5f83e"; + sha512 = "fb5e2142f842ca0afbc5473dc3031eaba2bbc1f7ebe412d88696f05d8ab7102d9d8c57c318e7f6a8106b07e9cd6d7832ec9012868cf6b7571367ae1514959cc3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/hi-IN/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/hi-IN/firefox-77.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "85d5d996203cfb6e4b32de456fe8865181dca287898934e1a8c7d23f2f0ec0707eaba364c32762a2ccc80592e4096dd5cb99d1ed2be4a17b4aa6ca16f0be0c6f"; + sha512 = "5e779dc92115568c08ad511469e03af1b4018ed15638f88ff83df08cd5dacaf9bda39cb5877757f7eef3d0d47b43777eac5363ba4a2a4ea895663d8deedd643a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/hr/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/hr/firefox-77.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "974911c30b0103c206b3dc0e42b90c9c3946508d89014126e0ae729098bce54a79461386390f2d487b2d1d2d3c523754c60a517249c1cb12c874d792a6deec44"; + sha512 = "2d196ec8cecd41fc5ea76aa535d830f98cec1572f7d8e7d8999769c09a49cd2063c9cc59314748579b8fb0fa9446b22df96b43c4f462b25dab96c265ba4f4d41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/hsb/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/hsb/firefox-77.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "48568494ee7ce4662ddba6ba6f0ef03e802ef71de7b7082537ab74558fa96974c05c4f7c0eb0bb9d98702b68a8e14e0ca2441c1b508180d69404a799457c3b32"; + sha512 = "647bf9dbfb8f5d053b84c507abc1b121387464542621264df72236a29accdb895e8c71ecef80f7a5a241ff4a18db47e4340f67a0653669e39cc56cfa622dbc1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/hu/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/hu/firefox-77.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "ce29de70a7d9db3fc1a4e750456b7cb139f13c5828a08b8a9ed0fbe523e11844b95675c355e9690a470fb4140741ca001512cac76df4afa69de0a31852058195"; + sha512 = "7a67cd7d6c4563189c93bc2b418423d6f787b36c5b188411ce49f763421d66ed37404b9caa0bf63ec4c150019df79de1992ef5a98600e63b5a8902ab44354a0a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/hy-AM/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/hy-AM/firefox-77.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "b9dbd3dd5ec4f9550d8074d19e9ec537547d4b18ff51d344509a495accaab0653339108dd583c6b19092284d39a23b2a3604e08f1e617ab254d61aafe82f0adf"; + sha512 = "3a9fc6e362af83a1776619e0a5b36ce6f5e59cb46d2e8f9be2c57bc35b7e4e2f82b5ba4b61e637bddb470342fa67993b0374f2065946ae0ce24af1e187695211"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ia/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ia/firefox-77.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "52cf31376b91998d87216848e0074b08e8fbc8fc56598e4f7d2071a40a334260e2d426836e630da2d7980b63f11cc9fc45263aa882573bb896fcf00903da002c"; + sha512 = "5eaa3a5d9b0cfcee453de81138ab9ffbf1abb58eedb97a6b1dddc73eeb919c89bf077138d7b86bf804bb545fdec404724f7f76936cb09fca3844a93c7008dea8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/id/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/id/firefox-77.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "89d64188803178ec31c7675c874e76e14d56b1c9e929630a8bcfd41915efe1328df765cf9e80f8414b4567a0c581919b89f303dd81ca85ea2c66afe5978d3b68"; + sha512 = "714c19533e92d23d7ceb7ba07dea6842d6f378c8d705ab9fd51769720c1b7faa8fdfdc9786dee881aeb5106e5a38b840aae4f5134962db225d0d13c0a9dd886c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/is/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/is/firefox-77.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "78e2bd7cc2b5fd1e2dc93a5df1324c1c255f32bf8c13c59abfbf2e21082061b4dbe611db10f2ee465415b2c43a8ff85597fbe8b25bff3fe48d04ca744e4967bb"; + sha512 = "0b7216b9c09eb67d774fd0b8cf1a1b43a6cfd14d5327f6768136de3190974bc2fcb250f920253de8e77f7c61efcd23d0790da1eac2aeccc77e4e74fb4cc5d643"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/it/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/it/firefox-77.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "c6035edbfc0338d5a5e21f4c0db1de13b13b1d4d9c66de0c23bca0af0b92788a61da931ca12db4a50ef0b3c0e6ce3ca062e09f2ab2f101cc58c9e617dd1cbc8d"; + sha512 = "898c073e7335e7f2ef15abcbe9411f31522c2da464b62c2997550660dcb068fcaec2ab5e12fa4818816a34b37cf2a46bf9c5b36f65697a521cd5b0c05960122f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ja/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ja/firefox-77.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "66836d65141094adaaeaf08fb2e720f77e65f65d32f1f8f05800d6830198470e205f809997375c02a27d3fa5f8c38d1659b6cd512c3d38922a4e672706860d0f"; + sha512 = "f6dfd4d7aa9c1a0ced11034b59de3add54ef2b30aaff30a14081824bcfbd7bc020ef840f8c12544329b506fad1567400d2c7f57ddea22bd1fd37c17ddbe851d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ka/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ka/firefox-77.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "955fc6cbba271ddbbb082da0979843d4ef0397209b7951e1279032bf4ce2f8d56f0f5bf1e8d696b87e36d46630a734a517ca866035d237f0bd0c3a012dc84d81"; + sha512 = "5dfb93fa63f26772a52b7d52a0839f1bb624408097cf927de0222eb06fc9b9b7a9649475d2fc6a02e7c66ab1e6aecd8fe3d959452a73b1f9d3d1be6fa1aa018e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/kab/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/kab/firefox-77.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "0e3897a47143664fee6857314bb5d6540454b4b6eaff6d1a568d3e7bc91e5f8741d5c953737670998268357fc137cbf7365eef713076701bb40903764dbae4f6"; + sha512 = "767e3793cbe7e4023f227818617819026693287c3927d18193883e603d21d23c0239173266c89d776afc8ab0cbfb40ce9b4516e4663a44928abdb7672dea3f85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/kk/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/kk/firefox-77.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "d883fd471ae047b9ad71d44d5e2a00095813c3e1a91a57bbf38f2ec39b7a4d04b67fbc9855fece909410b3d7ef0267c10bfa6d66baa12d0ae882c6910b1d4018"; + sha512 = "b4b7147631146a53b9ab32f8a3319466f0837219284d4757e29588890bd518b45c7ce329cf73e3840c018a160a13f841851c407a0c4ea06cc3acce163be8cf79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/km/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/km/firefox-77.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "397634869d2ae50061ea5712f25523a73dd5aa3d3eaa9d2d83d6aeee0596539c7bf180590e75258ed846946c4422fa8c6dd5ca0f0dc359bdaf6a50f70f6a5bac"; + sha512 = "d3fc7706838fd310d34e9b45ee2fbdda352620b434e011a9b54aab598777001aaf24db2ea528da413356a486fa330729d121acf7e103905eac9bd914b5473426"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/kn/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/kn/firefox-77.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "dc702753aa322eb98e3fdbd6924359b35231e12fa3b604272bbebb0660b482d614e8d0b17f055276e00b2629e0bcfabaf08965f242948ea09b65d683cb47218d"; + sha512 = "61621680b5dddd1058e58e741d2190a7d07ca74301706dc61d823b1577ba3b76c72cccd30fa64f4b5b95748e6ee4077945d6b7dfcc21d648f13ed7be62de2eca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ko/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ko/firefox-77.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "29f5c060f78835852b10ed9db226f64e3de94bc22e0e2e9b129a17a59a58ac8c26ead1ce7115d18eeefbb8a6863eb5fe094ac1f90760fb9a86612d6ef854f308"; + sha512 = "66677835319f120fbd2290d7a050f2846484229527820e3e49daf3b7f377acbbfd0a736f2e71c388691f1d04ee013864813119e7f7c5c7528887b8061b62bc0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/lij/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/lij/firefox-77.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "618125e5072faa00efbb57de0a76d8cfef08260958e7a27e036b83d19730779f54a3dce6da1b5f8706dcf7925ecfd76dfffb31b20600ffa3608e9bf596fbbf51"; + sha512 = "d590da1e993a5d598411717a9e4ec87876066fe106ae1cf37deeed77a0508885d47836cf6653d144be30dc21917a56cf5977f99f3c38d5e9843eb52d69a7d267"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/lt/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/lt/firefox-77.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "7367024abe5c48f370b2be00786f366d2c3121d6000adb938967a5e2643799604938a494dca1fb22bf5ba43ccb2bc1f3dd73b1ac0d9d43bc89c617aecfa2df16"; + sha512 = "450772baf4bec1a8077aa4ae1dd52d84ecefffcd4f93b9c486bbb4eec12c879a8daf2cbe51dfa2f81598abab6242bd63100d8243477d3176985a689eb2688147"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/lv/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/lv/firefox-77.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "319c3bd17930ba550d54aa5390c0c3a022da2307bbbe6c33477805024a77757bb12efe73dda16145afa6b569f8a9d0cfbbab92d04aba42519f4eb22bda92463c"; + sha512 = "3ef9bcbc9356a83b20f3f3fa83530790209866456f44f9115f8f22a1dece72bc28f485f24dbfb854c77d4306e2f3da5f759f7fbaf151ac8a8f303b2dd24832ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/mk/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/mk/firefox-77.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "cdcf68e9fe5b39139febc7866c11f17ec40aa85e18759eec5c8d04d3d0ba77446b00900308c913238b50f405d636bad3c8e56469c43e3289e7481c59954a994d"; + sha512 = "59e8a7fdaa37513e11722397d9708db397aca75eecf3ae2e3b99f42a9e40e89b183c6ff36fccec1c310269b5a4ec3ff9f81985ece314a868585082e4d132012a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/mr/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/mr/firefox-77.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "abf95285a27aad3a40cf16a38b2e664f0855da60f1de92b7b2aa33cf5d42ec8b1c902a301be7e8fb1fda489553f58575bd6839f5a5d5573232be452c80b6ec1d"; + sha512 = "bb7a9577fc6080fbb82918601405e8a6da59662c9edbb568e558ceaf71e04e95aa3dbd7acfbc780759b0cdeaca4b67e24cec1aa57fec30473d8410fe717450c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ms/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ms/firefox-77.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "489f8d45cd3c1b9c5c890e26e64d954a663e1394ec886a17b81377ed4cf9e951a6d4c6c8b47be01ead23bca261cead473d597f752961cc7c38bbae1daf185f2a"; + sha512 = "e8bfbc9f54b3cb2d2a3f816329948f9e13723dc6c680c41e33cdf3bbe4825e89c9547144cf5dfd3ecebb0fe8759cbbedbe7caddd85c31007ab28b42219a8c159"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/my/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/my/firefox-77.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "d39ea6cc64b0967b2b52af5f710b1561331b4d1512e380b83ecdabc23fe6d77aaaa16812bd420f2faa0a0700d7eeb61af6e7252d377e1d37f8af529bf3e3be1a"; + sha512 = "b95c1800738ebf79b5ffc64fa1a11ef772614eef6f49faeb977677c31e545e4bbaec3c9c75567afdc75397cd40dd80a671ff03ac17bc62ede2bdf162323e6559"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/nb-NO/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/nb-NO/firefox-77.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "8ff8fddbce1cc246d69588742b5777582323e452babe8c6cefd20e97faf5b5a0522ed0bb1ccb6ae3645b298bcc1a5d59351a517838b38bcb69123d931de69873"; + sha512 = "505d68a0009efa7c8312fc5230c00e3d72c8412d6308360cc10257ceaeff98b3f22a5eea9ceaddd7566a9a690b4f0c04f91dd8a447bd338af02c915115cde506"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ne-NP/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ne-NP/firefox-77.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "0e206398cdcd0b5aab5379874be3efd25887ed9050ed1e273e0e8a36bbb5168b4d3cdd49e60522f4c414904f6cb63f45d3f77300ae69755d50a48608ee519434"; + sha512 = "01eb90cc8c93afdc34fdc0e47eb5b4a012c9fe7d3dde1301ecece240562766066901d80cd3789e97f2f7a7188d56aaf7bd67c56c4e4a210b30ad10a738ca5b1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/nl/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/nl/firefox-77.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "4632a9742bc4090597418aa18ff75e71256f54b9e99a2f0257993b766246b57f6c0d6c7a566796874b7a288ef95726f75e138401485aa9ddc1ace7aba34895c3"; + sha512 = "486aba5ffc551be80e8e9b35cd92b903e318a3870638c532dcfc10cf0a7d545825eb7ef54b74d76f66cca2e86e25614896f78eac63b3662b43ed313b853ad4e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/nn-NO/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/nn-NO/firefox-77.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "216237c9fa65d70c1f462d8564180437abf51d562260dd900d7579f4ef3a5d4ddd5237988dedc3339fbe121404d95fcdad4f91788cdd5751c66b117ca175f69a"; + sha512 = "b0e885c206d93c294997b3798a93738f99e4bbc459f7e8c7ff688414b73f69509686056f86b12407677a79b7d4bd7aa34f4dbebd5965c6a92766f3448a33cd79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/oc/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/oc/firefox-77.0b7.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "18781d9b395bc576108c0be93b74ffe8bdd4d73a4a4c4eca9a34b3024c606b7894ec42862758a9fc9294532fa7307d07b6ee9e86cd406964b12cc98b7cdc3ad4"; + sha512 = "1b04601dfa2110a2999dea0d6fcc19fc40b487296c705a403e741c9a9e0405fc90c774af7665c9335e605d6fcba3c8826701a497483b896e7911bae3a7ca7a80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/pa-IN/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/pa-IN/firefox-77.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "27be4cca7ef0e8697b6d8866fced16322a34b0e9fcec26d55e552cfe610c5512f5780c50a1c271faa18032474c9e010992b89767074921c6920f3148453add04"; + sha512 = "59d6957fcd1b2527cb77622df7cec4267d84fea180dbd2a7397871c90b2c27e8dd0b01881229eeb7219b548258d72448e690d654262ee55cfdcfa9d4a337e102"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/pl/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/pl/firefox-77.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "ab40cabd3ccd948888ac0c82151b7f190f222e70c24538dc1f50ed7001a6b1131e83ad75d26ed4226c2410d4bd0ca030b02eab3c7215e91b0cba00b48931ab82"; + sha512 = "1d18dc2e580238d59997198d9aeea8673aa1d32db329c0dae79e52d9e3e64b063f4b96695bd18ca0a449ac3fd5bf77815aeeae05c108c139dd73134199a6e599"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/pt-BR/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/pt-BR/firefox-77.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "db44f94197deeb65a7b4ae6d721e37f86100ade8e9528cca84c89e8aa57aa8f2359574aedf8c0b19c72bb72e465bd324f533cefe818ebb54e104018828656ad1"; + sha512 = "1d8bf57c135e56eb6fd823c605e870aa62f2b2c4d99f50447169411a3877fc089c588fb085d4c3a2dd62a2a955c5f7bb39cc6e8c391dad0f6c2d1f20f4a5944a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/pt-PT/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/pt-PT/firefox-77.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "d1fd0eb8a37e78cbd8daaeeb731502f0e75542be2dfa7d6abd77d52105687c77e03c20a6adfb969b0716b80cf0c86ec956ceee352e4140adbacaa8ef89dc8370"; + sha512 = "41d3c18252287a172dbbd70c713e7176de8ff107ba0bff47c6f2546b8573bdb11508ca550fd8cc56d23172a84e30e1573dfa43232d4298c1862d5e8fa0ac2451"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/rm/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/rm/firefox-77.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "c16d76d1c38ac12c2cb54676fb0873744e97da17e458a8b0e994d8fb15c1f6c0e7057e495b697e62cdc691a60fbf23a1923c4a823177e7002d60875d06a23fac"; + sha512 = "b0b485f098475c1a1d422b8bf170e77ddd3ff2b7b3432bbd43dda975522767b9103368c74b8a74b7cf5639b6fe72690380b9c7c94995afa1badf728969123f62"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ro/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ro/firefox-77.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "2f92b6658c98f02142ab9839c92daff612e9580e05b00953bf47b757d2da6608a8be57d0c0478ebceb9cf12a4e7f65cad06935b85e8e0948685c06c37bc07b5a"; + sha512 = "ad8312d0ca6595dcf0073fc2de8a52dac61610e2714500372250ce142f1220ba4449f6cd5f0c0a2754eee11aef5a71062e82c08417ffd0222d771ea701943b3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ru/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ru/firefox-77.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "f81ec39c7a53f0e560af42ea7d5e8fdbe1158f7f62269c900b65fa41774f2875d34b19aea3e3348bebf09e95c6300c90a042118003b6eed9f638df3dc72da5cf"; + sha512 = "ca9bdf02f34f92f0c752fbb55d6f69d17206f47b8745df9d224dca47d57ca1cc4b5646f374b37d1250733f66d83afe287bb698bbf783b08a6b7ddfdfe35a2e64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/si/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/si/firefox-77.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "d08287a77c9b4f72c44a0821ca11051b82901e9bcda66cca068b2803d886065abef680621c00a7b310388272460ba4d50ecd146f84419251a6b1d5569c988d83"; + sha512 = "2c621f00a6b2f2978fdbc28fceadcf2385711cc56c0b47c536c690ff3c7549a2b9cae71c9eb1ce40c7a199cc936f1402e7d3f5055a70b98b015ac25006019464"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/sk/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/sk/firefox-77.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "234f882c59f434f491a300cb6675c8897f0d97ae9ce1da9d150eeb0a53469658b34404f15fbfcc6968a79179ee41693634f1bfd2618fe2a1142e39f682ebd992"; + sha512 = "2fbbdc40f1308513fb9064f6057a383af60d5a7f60d07a4918f6631d59762a2a8cc11b23de167ed0a7317c290436cc15443e6d893b92a53df1bae2b7da3098ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/sl/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/sl/firefox-77.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "2556c3df0f6eea3771c34ecd6bff73a1f155c58ae60a2b3ffb84646716c391d8559769ebd6b450785286a00f49b25ee108207b38c21bea90ac6ad7190f1b9401"; + sha512 = "7a993dea012e011c97b98938bdacba53c498fd15bb94b9deb05b27d7b842986e3748aef6a6bf96b1e288c8bf59df5ded37337ffd10063b3bf7afa81cfb1622f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/son/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/son/firefox-77.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "9b77a1cbeb304a1ec08e1d73ebd7f36caa50dc4a9929c922c55cf1246d735a58004171f835ed02771324e318a09f1375ec278b889beba410d94a913b124b051f"; + sha512 = "22acbd2b46bc7eba4003295fcd2fd01dd9e6ea7a45b7ecb595d55801030dd7baa7363f2d8b414554b07e8e4ea7418901b0412c43e5bc7a5c3c03bcf54318c5f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/sq/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/sq/firefox-77.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "6633eef932635eb91b11ff719d0c8df8ecd04900d2e93b62f1d76b3a488f1e77f78e87dd7e9ad08c5e5d5281bb37b0c3983f5cea7db2bb8171dd49c53afbdeca"; + sha512 = "5e0f2a51073728b8b90eef284f9e632365360f45839b0622e6a52c34dd0eb41ee7ad07d320e6b3610ea6265ae48daa05cfc022bff0b2bdb97caa8dce1b38e0e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/sr/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/sr/firefox-77.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "ebf3221be0d4447ea3989fb69e54ce266f803c102a68a28339c6ccdf46ea6818f5f8df280fbed1bb075ad984f8356a565afe6b00d5f92005d3d42e7162714d63"; + sha512 = "4bdd5193455e99f98ed90aa05349e2beae496c44718f07b6d81f81abe75d755f4a88fba8dc020998fd6199dcf1271dc7fff3177625e7872e1d271da743d4de00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/sv-SE/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/sv-SE/firefox-77.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "1e535b03dfaa4e7c48e0765b948ac04dba5eed4d697e00ac5d01b41becf16318ceb7b6be9e1fa8f6d882033e33ff3eeaa90a324fcbdabdf8a8f130d185633366"; + sha512 = "14e7db0c882d5a84439926602d6d706084001499aed5db4adae6a11cf7c25e95d0c77a59340c74bbe11c6cbf960500eac902a2ea23f7bbbffb9805b789242eac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ta/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ta/firefox-77.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "d990de0d6de65e19d6b71bcbf085ead5f5e3eb606cac0ed9b08147dd5c70dc13b5386e93f64efb416172856d903f7aec383c752000fec0e04ef03724e97b7d15"; + sha512 = "f0948c827cedd46641a26facc08c30c1b8292d48d8d703fd7fa846bdd1c9f631feb64b50457fc6d10b0b2a6effcf304b659e1d5f666215613bed75307de37a6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/te/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/te/firefox-77.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "f27627f185ba3a37345fd7fa7afc1182afbdff6d90d8315371edcd9e1a7ffa1ab8d565b81035bf5645d72973a91d4b181f3847410939ffdd71a9119337f544de"; + sha512 = "a0df152f09d0c6abfdaaa1c3c352282374c71fb2cb674199ae8fe4c53b891d98a5cbb19c5c20e92e7cb602bf4be1b66ccf6db295cb91190b639e2ccac9c68b86"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/th/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/th/firefox-77.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "0e082029c8e631a46be009d2adaa64fc01c0eb56a8148b5ac25b8c0f35f3036ce003cc2b4e07869b148200cba1aec225927b7edd933cad8c7fbe6dc0365e3818"; + sha512 = "eda5d9fc2798e04addb6cf093548cd819a23ca480e392440838dc8a023e074b4b235a2df7a1ed26d4fd795c7e21c041be6f7c08d6dae35b05fefe9c31c79bb9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/tl/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/tl/firefox-77.0b7.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "5d1826b2f5312eb604722d7632d9cef63ac5bb6afa46f58fd4c9d182cb30aeefdfe866c7c70c182ddd28dd7e906cff717737981ec13078b04cb5ecd4096db6ca"; + sha512 = "09aef5e2ff0eb455284ad185274fb6fefa2ff6f768a16e6301c58be9f97aa357bb18147d7a909694c69daae683ac636ebb16f800b6e0d7d90e931426f74cf3a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/tr/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/tr/firefox-77.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "6a8e3277cf09f00faeccdd252a4778fb28472b3473a3364ef17ac7abb89b5c0889ac9c5a5bbbe08190c0f0f03534a053f6af194bff238fb3ca8809216997c87f"; + sha512 = "f936b11f4fbe0ee2f31b5c4f773e3e0044468bec15806afe21ee4e3f95862909f6cd68e35731ba29a32aa7cecc8c06120c3722500d9f3bd2912a29702045251e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/trs/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/trs/firefox-77.0b7.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "ea711c8d1cf7f53d3495c8100421aa1dc02d16631c32a5f66772bb38e8169fcbace34a9cefbf4b6af0993cc321bc0facf2803563100d1c28a49dda436873e423"; + sha512 = "4089f69168225d62d89bb34bf8c2cba4c9225b1b768e9a94b13024bdffd485d83f3389a8d9964b6afdd5575917d70070d7779dda0bd0119a15946ceed2839afe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/uk/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/uk/firefox-77.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "e0f0f30a2704a5b1f2519a165b26d1eedd234d6ffcba955156424f19451632ffa9b545781bb838fc4393b09e7b6753336ca1cf4e4dc476dc47f35b0040340482"; + sha512 = "4ecafcda0026949c745378e32a8bb68a1dcdaa292db74f7a88bd13e38dd39f2d1748a69e9e2827ad6e8a2a71f1872f0ec3cb846ff071954a41dee242ab233243"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ur/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ur/firefox-77.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "3f4c811b29d26b92f542e27e5d50d9f0af4487f826aabf83550984f23e18ea9c83f7dd5204ecc2aefd53debf3fe96f2e5dee8b1abdc5554a4537c207769da0b4"; + sha512 = "25bf5543b9586e542968aba4896a0c0c00ab5eaf99b82c8d9b7354c82c33d2eab68dbae2295823230cd5708ef02817a51e9b9f12954a43aa0c0b131a44388d72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/uz/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/uz/firefox-77.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "ceebf54d40ba52e73b70751969cd48493ddb4c6ef4179d688a018ba00b5e66ed613c6a933cb3b94c7c11aac66480cf5dcc8c7c153022689494f2e6b1ab8b5a3c"; + sha512 = "90aaa4ed0f9377d17ec0b02ceb934ea775d5f378a01f8b4c0ba7cf5c67975bbf4f7ac59103e8002116118972eb6d2a48c6dd3d6cf515f766667309d0d515f994"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/vi/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/vi/firefox-77.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "6c02eb47c9d89e255584275cb1a5ae161dff4f57b77f1371b4a7647ccb5da58767add89b19b02bc10f27da71aecb2e316e0a9ee1115492de952364f5800c2371"; + sha512 = "0fccb7e7aa3ae6f8b539864ed44c7d8349ef96ae5d55d9ebec33bdc1dbf470a9a831b440fb0cf008e86421290760422201ec55e704b5ecb388155605ddaf35a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/xh/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/xh/firefox-77.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "d02075f57fbefff722897bdecd01e4b2a50af6d7f54d8a69dffba698d1ddf240f48a8fbcb1f95b434365f273d291e887b0970cc976329dddccdc5ad4ff9b4a79"; + sha512 = "fd7d880ace4221cb8031bfcd9c90c07ed51fe345c9592791bcef61e52a29fefc035bce0a24a24594f310cb7113ebaae8525df0b2462f86560a45253b89b7a53b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/zh-CN/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/zh-CN/firefox-77.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "c622c0f8f2372abb5dbe3b1a1216f31f079c7a43f43a0c4bd6058896cf8c1a2b65249659e725b761b593e22a9b730159b02e42d6debc328e67c62f66edbc71b6"; + sha512 = "d7c386894783434732c56460fa30de8ecc360041934743b4632c8a03c36b00227fa8e23d2180a7f5dc742cb324329aceb2eaa4831c9eb9545920a95ae3b7db44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/zh-TW/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/zh-TW/firefox-77.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "deb55b3b4ec106ed211a8eb32eab1cfdb47d4e30f43ce3a35f8abb3d4b2d8353da39b065b482dde513fe317b61ed9ceeb74abd184c7e327712336c5b1b1188a3"; + sha512 = "52a64ca3d152b0afa2be9206ad08fa1edef8411d41c23d984c4015b629bbc0ba21970c1059cda76041366221a193040db474218dabad7131766e53ed6b719d81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ach/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ach/firefox-77.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "3586e46703034f223547dcae3d4633bf74026d10eb7abbd5829ff2ed3343a620dc133ad1a8d19803fe9669464df2b9a4abd3b3e3b401da8421945e5ea4c2b478"; + sha512 = "d88c9bf2fc5b38d367a3e6210b59a4488092d42b380bf020bdf82b1c0527f03ecd48c08813a8bf73fcea48ff58a77fae80b2c907498f2d9f5275fc3a7f80c5a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/af/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/af/firefox-77.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "af4e45671351ca690f3e5ad51f35d2f0094724016a75eb4791aaca799c16915fd1e95450f1a89b06722b078524f00b9b30d5138c80ab8789df71aeda731677d2"; + sha512 = "cb15b0cd5980a7021abadbe765c714604840a2127722f8b61bf9187bcce3b70af2e902220d5f0faa0cc7b3d513e64a250bbfe43a090d13ae4b8835db0c28428e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/an/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/an/firefox-77.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "4c68399112672ae59a1e6b21184414891bae79997ab0e52c8aee394482831e7c8eb18f7d11de5ce7359f83fb946e667111f485ca16f75fff214d86291eb3327b"; + sha512 = "8ee5673c42ba46e41ede5f3657a5fd7c9073fbf9f27e5583a0471802542012b67e8e0730cb58f0833fdb1d036dd887ed797b752d79290ad8982d3addf6739c44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ar/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ar/firefox-77.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "b70c5b8e1c90e2a69bd87194e652d73cb6b3b029f2cc225c5eaf57687643c45df9b018cca44b40809436c543b8188a9f9b94847ffe904f11a4f244cbd4aa187f"; + sha512 = "25a2d1144a734270e0304bfc6a42a6f6585bb79e7289b381791fb6a45b86891f570c9c4d6a71de2fb8f0aefc6533a11862363ca60bdff14f817704fed4e9bb23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ast/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ast/firefox-77.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "9cdbb8459d2baf3924dd1f16c711433a614b80eed980e22206c1d429ee43fdd5598cf761b8f9bbe7e2f36e16036b7c4ad7088ff4bde334a24f67b6f206048c2e"; + sha512 = "525fea1b71c9a51706033c4b2f523813e61666df6230ba51752a2161704c48c26ddd5d781285186beb53e90f01cb35e7de743723bb049b729fe26799eca6036b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/az/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/az/firefox-77.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "3b25dda7eb048a902053467c3ce10f39e782acc7ea2412bafb0ef15cbdca915d622619657183ba8e404662e096728a16c388c0739cd9e87489e0eeb7e33fd832"; + sha512 = "743377d9a76b6acbec6a7c005824c6286e10e26e30a6bce90a8750657d52e19f62cb6653513a241ff9a6f3cebb5caf63dc438293568db5418827cee6dfd94b56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/be/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/be/firefox-77.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "39714d86de5e3ec9b4acf55af572a6903a26270bea83bde0d4e4d7424b55eed95e545a101fb4ba63d01dfe6b8088cbe4f73179e10324e583a1a55cd484d828fc"; + sha512 = "2b96da128311fbf97cbb31e3b4b6e0d1fe0158ff7892195d7074de67e0f5b7e22f82c8131dbc0ff209e043d89191d269f5b7af224f6d2646fb5a58168b2f0d31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/bg/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/bg/firefox-77.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "2bd37c06d8d7bf5199c2ff75f7ac4daf5a9ad59b99877ab5ba3235c53e8b82f0d87e2702e5ed4713ae904c70517e60b21f22d75160d312499a4c713d2036acf6"; + sha512 = "fc5712958fd93700d39bc60799a32e99ba0db868997e1c0b4750bf6258caab3296decc55d14a48d9ed065b9beabfcbd9b7979fd9289b4243d0449fa124267e2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/bn/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/bn/firefox-77.0b7.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "e0fda1204b53d0c465150a9e6e8ed9ab812619edb01efbf7ba08c616ed0b9af972ca4f71dd4876bbb13c2f6e454b7b4860a2032fe198e9e2d8ed5e4732f0b66d"; + sha512 = "eef007d4b60b487a1a8352ed7daab3cc5fa0f3e24a235f5fc28979c2fa69390032feac2590401533b66add014ef85f573e89613334b0b4933bad903c8576d566"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/br/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/br/firefox-77.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "d19b29d8b2430d3f7e6cfd56a83fe4fdeaaea812437e9d552b3842ca726326aa294369730da81f38debb148e4ed0330b9880ef82b458e7db461e1e6daf82dc5b"; + sha512 = "51f73c61512ac4f568161ea0dbc045a11dfdf810bed9e56a109c127b8e64b649cd368f02f06791433ef694190a08eb5b2efc66db48674244553c997b783d0610"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/bs/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/bs/firefox-77.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "60e0aa12b6b775dc9e4b950f6c1ec3d77f1c0bfa47279b603ac00378738ef92e00bc41e79548b59aa1a2ea7ec456225a43e0fec7b86d80c4696f08420e56c5ee"; + sha512 = "71a6dcb6af95976882eaaf330dcbd64942decc76ad2a110e11721d8dce64c1fc28522520f2dfd1484b430c8c5a6f531c57ec96e533d35a7cb3bc3d688939ef8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ca-valencia/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ca-valencia/firefox-77.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "87267964fd97fcf6a7bb3d0c3ef29c21529cd6f76eafc5e2eb4c8fa1f2e907f4cd0c4dc251298e398be748af14b68740faf477d950a2e425e7f7eee0cee01be0"; + sha512 = "e18c221ca0781c3a9a95ca1b2542eb7bfd66a09c9ceaa88b9d0ef76396f21635fd5d79bcc4881432426673865fe9aea679b8c4986bae668587371bdd237a3a89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ca/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ca/firefox-77.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "ab5f1e61fd3842a98e47a4f7def57e0af95ba73ea0a36f3d1634b731607362737fb3120cd2875af0ca9c4a18a2fb0593afb3360851ad8abf5f0e31b7932e3df3"; + sha512 = "76135be63a3da2968dd35055207d58fd58241846b4e680aba92541047ddcb97635ebb58b218dd86f86c94aaccc58162007e964a63099b26d139cb8537787ff10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/cak/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/cak/firefox-77.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "f5598470f5e50f16a2763b35503820255918e7475491e7991e2c161254da1f3ef8204cbe4561bdfa4701f44bb75115e88c71f729e49470f6814e43521d4c1096"; + sha512 = "088e14979cca1a9e9296dc0fba4507e2e5a04b71211fd9c4d64032b6e76f2c5060eb40b331762727dffaae5595883e7162b8fa6c7915666e0c4183889ae64089"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/cs/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/cs/firefox-77.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "8072ae93b5b963306a36dfa8ed728f5047ea1c69a7b1fb73e1640e80980c54fc7087a3f9bbf4f95e010a1546114949b2d745cc665917add083e7d515c7b759ec"; + sha512 = "35dc0443d861b8345610448ec145b1933c6de5eafca6fe83580632d086f0ca2a818bfc03cab85e9cf1aeb32a7ded6f47e7f9af1859c1432d8ae47f09440d81d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/cy/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/cy/firefox-77.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "bd70c6e05a346576ac3c6b821dfc3635436d2f7f88b6ee9a9d6ab98c9671511383ab512dbb81aa9014720c285f45f0a7cf7d620e99dd285621c0c8238ed01016"; + sha512 = "5d3ffd08d02c2be15fe5e66c7fce402b2b3fa6534192fdfc38f718d3a341bdde25012a59e5f8481314986fe2cbeffbd9ed0d79726067fa4d3658d27855839af7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/da/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/da/firefox-77.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "fc8a6b48c04f0da4d09ec634f7136c3a3ca1602a7e05af480044a8a86c6929cb8c84365fd46e45ec1334d940c219d0d53a191b85640b6c6f7f884b2844be1ccf"; + sha512 = "79dc2dcb1d1dcd17da99cc668086a42b25b32f867cd381016f5cf76529363680db5c7ffe53f2660d8883eafa965e320f3d8bfca00dd84759685dfdd2d3504f5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/de/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/de/firefox-77.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "504834dc1d878cbf0884c303f9dd5465411c7fdeaae8bd963175e611c4e8c65c31e1b7070bf9b82d4d15d789f3a20d1a53059f8981449f94c5adba8d4c0c57fc"; + sha512 = "075639fd73e2595c5bf99632e0aac36664675a3aab3b1b96e9fa701fb4b4a6988a4d966cd111a206fae5a6d21a79286d7b24ebff44738fed2cba0fcb7af29ed3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/dsb/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/dsb/firefox-77.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "1b1e5dd6d1016390ee291260abef2b378bb1cc9133c3e4178344744f82d1abbf2e7b9d7f78163116778f7b04db686cb16056b4b36b221ad4b5c3ecc198ba8294"; + sha512 = "05d5b528aad3ca76449300e4708c5ee8c13951e72c8343b8c0ae7587d2470c485e7320e7ef70bf806caa2530217d525ca72a95f046ad5a1576d5fdd69a971969"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/el/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/el/firefox-77.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "982847aa23173d58889f80fd7160bd34e601361a0e5f112e94a1912fedee116b36e327943e7de9399165de5a9122e904cc9b11d38beb67826143d17f16f2b64c"; + sha512 = "08334bae31f5ca6da017fc93889303d93f39be6d27bd79031e5f4f01038d78caced4ed5f407730d3c48b2094cb40448906f53f190415830d91bf7dda1463fbd7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/en-CA/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/en-CA/firefox-77.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "f96e641a835bf0db594caaeec89818e4ad4f6bd0e66dec03c7a9dd6bdf00e76615cef60cc4ca654d23f76c8469e11df7545f0b7267dc932b8fa9ed34e34b9b43"; + sha512 = "054fe82f776c2b38175ce2ea6acc10f81c2e9f9ce3e6f96f49cd8d0521d447d26386384327011d0f7879e58a3af81c93b7f227ad4b5385fb8903ea29c28cb1ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/en-GB/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/en-GB/firefox-77.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "9f3ffb2b46bd124bd04243c40af164fdbca0086dff34b58a54edbd168d5599fb70001e2b60170f783946e17590d947a33998514b64eb3addb6f73c7e012ea2b7"; + sha512 = "82e9e546f77e94d4f91eac13b9f1600bcbbe05a250c6049693489ca46c93a3ccfc791879123f1b49c82ba83c9f472e8f6f3d00f50794cc491a99d756ee9eff22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/en-US/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/en-US/firefox-77.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "550fc9127fda2768121e93736b2f590b43f2d98ac71015a2c8a8360c205fbb6b6e8000ae46169cf8606940aca81b0fe44084e0945bf83befcd05b8e4be66f4d1"; + sha512 = "f8e5e352b94e9ff12c86f2b2d189c88b6e1c24cd912e3777eb256403e691c0a28e860c22e098d8a3b4c5d526580db2da2deb408f1e8bdea91deda5dd8cb94e9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/eo/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/eo/firefox-77.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "8bf90e8341936facce20e56125c7fe704763545e5b6bdd15f67bf8905d3e224ca3d57d12ead600ce47f12d7e16597f14584cf1f01a782bf19a2e36866e057a37"; + sha512 = "c6a806f7b7655861c1e44837e6b116c70d64a158e5f38c13179d52230d1bad34121c04865959d0608f6a3193bbd55fe081d2b6b3f9ffe9c9a41a1ea8c24d63ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/es-AR/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/es-AR/firefox-77.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "b37511d116f7f3c6c16e09af2d5435ec18b42c3bce20a038e62c6f6ba68cf909a7ebc28c562d78d7aa323ada352d550667b7dec6d4310249284592faf44a4f3a"; + sha512 = "c894fbce700c17200eee40d35fe423dfb19f5e4703b1bbf39925e4fae85e094eb5124b8dcd1e8f09f57e73be4793a92af32018b385bff09f7d111f8da06517ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/es-CL/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/es-CL/firefox-77.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "86864f44df0fe0014723cc6996f0e391f7c620e7e680e8ecfe4d7f39084a1620bc06bddc0a07a141fd836126ce2b4f4c773e073359223d708704556a11fa672b"; + sha512 = "9896a7b6a72632a42b68e4bf0effb25b0882cbf1571c782045de452a5e58608b41fcd2027cec5677d31a454f6bc82b8104df7490bf1c4b1b05a36aa170fd2e7f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/es-ES/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/es-ES/firefox-77.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "ff013d15ce72c65c75f6bc3b76d712d86716290752cdff95de99ddbc9846dcf9bad851499476504a832a7bf96e9434b5df99299eca5c04a91dbf6e5ed5d91b39"; + sha512 = "4708a94835a987f040e27342d73adde1094de3824ae444d124f2e02223de5f4bc280fbd954631eaff8f17d839896c02050c78e00dd54b4a166f291faecedf1a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/es-MX/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/es-MX/firefox-77.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "42a587b6dbb5afb24141a60d5c4d4aa5c2ed68fec09eb42e483629712b193b5fd69f406e2d348ce620abf607b2d66d17ebc82b2e0ad8ef7cfe709ffb65321667"; + sha512 = "430c0ea67e09e36b5736f039995b3f6ee4a7bc83327366acf34cf2ac11d79c49d37a336b9b0a39a61381fb4d9c47b0908f25b4f303fa4b21242fc46749498c17"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/et/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/et/firefox-77.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "7e3c26c4f1be1e50f634915c9eab15ad6430f9262dd925761cdedf75f91961ea7f63a08a19cbab9b92829d08b3db3fba5dbc016ea2e86e42bb054b16b56d3e91"; + sha512 = "e200e5b679a45d6a03784373861a7e78151289888f05561c9f58f4afd9cec36df5df85865d790483989b23435c1d762e8020863d0f3dd6e02f3fca31fbf642f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/eu/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/eu/firefox-77.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "799c2ac07feb46a3382e47a2e23443dca3d177d037662e40203bf0fea6a408c4931de445b358229a28686ecf2ddeee835b41a1069ea177aae71cd5888755023b"; + sha512 = "d7d5355aa60043fe759a86134bba37fb99ccea19978b0c56298f1acd465e5ec53d50761671e2636c535cdc6003fa82f8e99027969d254a3f0003995ba7db995f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/fa/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/fa/firefox-77.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "2a546aaca0bf12e9bb7e1fc0639bb5ddb55a28729f97816fd43d7850a4e8518d3e0a2b96cdd9b149748404eab7e90e31b4ef3572976fd29662f1356a1e6039b1"; + sha512 = "fb174f97e2e21f6ba70fa8eab316a445a0c01a32fb00237790cddd4e6a32e461e89977238a47317ef2c11268d75ea34e84ecf96eac346661da6a4e7fd1509666"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ff/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ff/firefox-77.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "290cddb3b333aa8c4fd4d978c18245751aaa773f4e7271dc62c7af770210d26e8b3b7b11b915237490eae3ebf3b641274cb18a1d7b14b33d44dfe8358e7b25b2"; + sha512 = "d453cd657ce54da24179b74723e2e0c793d6253f31bcfab914ce5cce9992266a3533b0358f53ee17aac0b1e616bc9c5c2d32112a514ac85061da61bd7b8a425e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/fi/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/fi/firefox-77.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "6d670f4091db4f0eabd17263fd78b847f2abbca9f735dd0592758b6b54ed5a223d2449131817e1d3208129b5a5f05205740d17ecb052257628735c1448b629fe"; + sha512 = "ddd65dbe5e8a9cc59b1c44b40b0f836d56b1042b5a2a37fd021166929485fe013acd14ac59f0c985b6a691b1ccd8b62f5d0bbe89ba341c414003e73fbe839546"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/fr/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/fr/firefox-77.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "6aeb79a1c98b5f4b7d430aaf7d4d424a1627f9b46c66e32060b6663a4af785e6f1a25b04b0161eeaf0c0e5592b8b73a6a69e37109b817178e4bcc214681de1c4"; + sha512 = "5473918598bad367a0f8cc71f50b54c899fc6ff015c78884040c09f558e0a80508dd104112b9ebfa92b8fe5f328262fb2c784dc8726c588ac84e41bcff95f943"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/fy-NL/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/fy-NL/firefox-77.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "24aa2f3b19662e7d0bea15cd9af03212f34cb99945a62d42a69b8e35bc33d875aefdeed34467479b3c37ad67924d8cb79c890a98249b076f601e940568e92888"; + sha512 = "5e49d9d3a9aaace6192a838697ce0220ec347b93c0896dcd1cc46f97cee9a7835aae967d4413d71770feaf917eb984a5547d1dd5b6587baff7bb895e5c2fadbf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ga-IE/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ga-IE/firefox-77.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "27e38f6444efac8d4c58028dde126e2e7d4f8e75c0e14bfcfe0796aa1e80f3bbc4252212b676d955d374d6050d60f3fc7e2838bf5c71f82b99b1af30cc225b1e"; + sha512 = "84b39f6aa3f9845d2d34ce089eddfbaad0c914a21bf68dc64e649a358739eff111e3809e48d882de0980b96537472e90b922ed2bb17a340e92000f0fedd17b4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/gd/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/gd/firefox-77.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "ddd8cc3c83d701b70fa4980655407a7c85b94548638d140c43e4a4a588365c149d64f441b58c98c22299791e3600bd717cd02014b3b7a64a0278230b8f24c5c6"; + sha512 = "88657692e941513807522e7513f480915f2f40278ed3ba36855a03e47879eea2c17d48bb626543e71a19eebd7b554d797f522b499066e7a52f8a4363c8987a44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/gl/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/gl/firefox-77.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "9a545c74db03f5cff96a9d0a386466171692f3f8a6eb0fe8a1a4b44ddee6e11599e5615fbf98ceea121f927f66dbf03c481e5e53b2d9e5063a0e575771fff4ce"; + sha512 = "21cd90d9e5010ee858fd5b499b64cb1b0a695ea04c7551fff884e426895bf80e041244a5a27ca4e37a6a283b9058723b9b62ade273446a5ec9b0f5055c612a6b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/gn/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/gn/firefox-77.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "59d09ab4aae409aa65bd8701481c3a972b8b315b730a3f1b514d807045923f243018d4df37e484eb9e4367475beeeb6c90cf0bbc3e90a0b5d665623f06079a54"; + sha512 = "23ad0e28b4d5bf1e83983e3b498d78019b78f821f17cb9c1e9b18a2f98b4c044ee25ec2de8ca43381366344010c81979c6f568ef9ccd70cf67bb933789b96179"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/gu-IN/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/gu-IN/firefox-77.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "88f60019bee5d350339eb82e690ec0a2cb18b01741520e2917fa756514cb1234d23ade76a79d482096e81212a87b938979dcdd128913b580a64ced14766b7464"; + sha512 = "6914fe4888f878904eced34e13392dfef90b313c4b66fbcdbdd02070b62a8b12a397267012267551f8ea36e826912e26e5563d0f2d8c320589ad7c572786316f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/he/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/he/firefox-77.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "0b6ff2b2c9a79f23806ae158fb98557a64cbc6af59a2d82bc91220c4e0f3ca19915879540a661deaa0e6fa2865e0f89a7f057ee2cd2c95bdac5a8ec01295ac86"; + sha512 = "453bd36930e6749afc97dc995565d72dcc8e1196d719b8ef3eba080796392297d698e439a2ffbe2c388dc78c7296baf40e2a02e539651f1c1b8bc62f9a294226"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/hi-IN/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/hi-IN/firefox-77.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "e2e767f29cc7bc0cc3e55c6070e2c1685253f1ea12f3847c7fbd725e05e940b099ba184df551dea0e333ff96f6ebf5850d7fc030312407d1ed3b63fed81abc19"; + sha512 = "67570140e8087e721ca4951fc7f8845164f6d6a6ac2bf7cbb84c2cdfc522bc1c8578a11154207097893b3556b415ee2724403ea377a59d2bca53bf1cadb78895"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/hr/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/hr/firefox-77.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "bbc6bbacb2bbf311f89e8e13edc2d99045a592094e1c327dcc5091191338df22c67b78c9fcc66e196d4254f4d0f91808d642aeb5cc82dc68c222f24c56bd0357"; + sha512 = "949d494a971d4abb4a0a7f41d994758cae50ede8db4be8c240382ee2f33b21e383bf9fe9ee53a1f767960c5c01005285f899f4c575e734dccd2ab95f6fbcbe73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/hsb/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/hsb/firefox-77.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "0d1578bb97d59429dcebc05444ba1fd8b123ea62c9dd92e0fca2cae6ff73a5503b8dba5dc907f9ffd62fbde677f55a091ef96d1444a40c4a877962411804c591"; + sha512 = "5987ac4a7b8ff18604de100f2dd5099d3f7b4217e1d921e3804a86b340686188761eee33240d8416aa6ec7cc538026039082953df34d2978d30992bd451c8e53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/hu/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/hu/firefox-77.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "c71bca7733e29d4290dde7a6b9bf053854f919fc8e67c1f5eee22c13fa779677df548936f83964183bb6a10154b104d4d66403ec9b28d9f390a9517edb90a63e"; + sha512 = "438344b07b4f788496de76cf361db5b8a8d43b71dbaabf025f05b24bb47f0fad17d93d683743a0a7673727339324d82196053e67eadccff901c5ad02b45b15bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/hy-AM/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/hy-AM/firefox-77.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "4797fa72c5fa9d9c503120bb46d48d3ada964e44f528915653b3e12651e9780e0e19f3fb2b9a66e13dccb8e192bd68e02028891d14301e5dea9e4640e8ca5074"; + sha512 = "123f20b8b235009474b3b7e3d57619131a4f607dbd600ae23bb52a8f726c458a23356fc12929fb0557da96c9eca489ac8b87909b43d2f0bf4024b8a306e99148"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ia/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ia/firefox-77.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "ec68bd7aecd1e335d0eec008a03c3ae7f88674d196be8d1e18ceeaf98286cc3ff94f89481e57f262e09db1befa51fb2a752402acf26bbd7fd8e5b73cf9c50aa3"; + sha512 = "afcc7cf79d5d8f023699d6a9d2c35897329a9372f5161f28188b75126f5b843d105e50bc49968a7ec8acdb290ecfab5ab06731d7b002d2721c0161cd46dcd01b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/id/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/id/firefox-77.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "fdaf7c6552b42a98d6da1b33d391f4827dcfbdee336843672102c2d541189d4dccd772d28c2d05cf4d1efdca5c28032c6d134b418606b3c04bc47bbd6f569c05"; + sha512 = "3b505e26ba7fb53c27aee55dd47771abe2e16ddce33413cf61d21d757be2f9744b7e406294ed86a95f2ed645c73efca2714e405a6b0947e08e19f3c667f886ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/is/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/is/firefox-77.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "8f688d3104fb15b7c15f1326c6183872be6270569583bde532dc0bd4dbb12e8cf832eaa1641549759ea622c6af5d609c7a0096d078d9b91215c2762fea931a91"; + sha512 = "7444d0cd5ab0f667a46f6e6ce685102a4a3940d422c671bcbe4c454333714dd17e2b6784cd3d865ff13fe9b5fd63c6bdff79a17188038baa2b558d0764f31d10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/it/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/it/firefox-77.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "3a3ddeca616a0cf61ba4b6ecb16f7fc4192f583ffb73f76def7bf7c6484e7d71406e40e9943ee3b8bdfaffcb3a7d3a5937730a064730bfb52a728a8da6b846c8"; + sha512 = "675f81a6a7266855ff6ebb8effa0646b3bf48da50246bc4aafcaf35aab52be107df98767e51f3aafdee7ad7b866f7304c859aabf9039ce08ab601df8f3aaebf5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ja/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ja/firefox-77.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "8c281fe548e9d220d3bcd83802aa4ac95eeabd2f69dae118925984975fcfb03d7cb81e84ccfa995a5afe51933bc7559836050b22d3973c6c1847fdce8b31acea"; + sha512 = "296f7a8ebe0e685e854d5f2674af347c2c3dbe0735bc763cbb1b12ed7862cc44592795b0cd1b01030e36b3c933e3e5cdd6288e77283633655c60182f1b91b0d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ka/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ka/firefox-77.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "485ca9e9ba3d6dacb148cfa620e1919d643c710d4d119d162196b9cabaf22851fb5750c65b26307dc21ee523a7007394784967364a534475381fd3d322d89326"; + sha512 = "514409c1bebc87ac575edc28d461d165e64779e95e54a27f83b0f9194d86d7c3473b29e34c2666e4f9ee04a0365e963c0ad54dd0d34b979b0d444c2059d3681e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/kab/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/kab/firefox-77.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "97c555fffb9c8de96c7cfa0500917e90a30594be6776a98f7199a450ba02ff67244314549a4b01e25dc6a6da8bc4f74d01ace3a01ac25572a67654758da4a80a"; + sha512 = "d53d3b7fd5cfa7c96ddc528ae531d111998c95e8ddf0fb44a5e3e55f3223492680acf87590d1fb4d26278604eda2ed48b8681cd62a398a779ff76429df7bdb5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/kk/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/kk/firefox-77.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "97bb0accfbd813f5a7b98cac840dd0184500b3a50d8b2970629b6a992eca4de9e86e3448f26a8a0a30da0742e517f3abfd82d91c45091f03de3181a44389251f"; + sha512 = "8a9fb7e5070ee73dc8d87935cf0d328616ddeb67f1f3955678cbcec6e240ec375117daca8a574f4379677959e7acd30efb65114e4941ffd204c3cfdbb848c570"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/km/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/km/firefox-77.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "510d2353b66aa5d0b11fd443ea52ac392d809663687cc6416332c94169bf31e5693dc46fd29611a0bd719a2f60f2efd43cf3d7a5be34d81a0363d347830d4c60"; + sha512 = "754254377c41865d6a5aa8f2e338353987885a6e54a7738c36b1566249a0b3becce3bcca9419905be64d935d97a90b3108f0020a313621c64cfdc568f663cc2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/kn/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/kn/firefox-77.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "c2e4cf96290b8995640a8eaf4f3e3a403523ada1af603bf49d8271f015863d7c3b9af776ed9748de3245ce27306b3ad032bb663bfa4b80db114075e9fc62a570"; + sha512 = "79cb8cb3f8daacd1015a2d23b8cab568f9622396a983cbf1a3c6e231929d8bcc40ba84ba2787c9b60a1c9bdbb0729e2637ff3bfc87501bb0e156ff29c3a98148"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ko/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ko/firefox-77.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "dd233e5e49b4c99fd0c10614bb7b467ccd5b563556028eb620c041492c1d3b8482440e84154947f9111e7497731ba7a2d912c0718ae326e5280a580f4cfe23e8"; + sha512 = "262a471319ecd41cfced36e353dd32f22c1aa79224198d203ed029d21f858bf283db75b33f3af7abc48cf3a995d7ed90d75701d70e371c8a937d6259ef50e7ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/lij/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/lij/firefox-77.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "f4c847ac00daaaa95ea95ad80ddd8dbcd0f571948bf69ae29f7c97fce0ab81330b6e59e884f88fb435d765c6afcbba02f73483769820265464ee9ba70e39a68c"; + sha512 = "59b93c56ebe8022ac3ff72acec539639cf290c0339e825a27e6fe0a6e85ae02c6c4ac62ac056ade775eddf0462131e2c7cff99639c1626f2a6d979d2d340ed6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/lt/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/lt/firefox-77.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "6fdd503a6f53ccea26cea4abd3e822b51b4bb610e5d9731686864efd0e2a6b48637a4aa74ad230d2c3cc45d0d95c6e33663c5d1d144557797b44bb4c11708be1"; + sha512 = "7578bf3f0d9428345d0d5f16c1cf6557d6fc0962382df1359e9a2c3b94feb3ef279266635da41cca1a90660640b0d5c0d20a415130a860aade0ab554b6fc8415"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/lv/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/lv/firefox-77.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "329972f3745af149d71b1f8bb090302bde3da3281791f1fe68fa9c4e67f0d21cea412afbd79ced9617504090608a416bb2911ac1a610812dfc04231224a3a4ee"; + sha512 = "610f14f6e3ddc8b2f732e40e79ad07e40e5cedc2e92dcab6b39b3b3895970d9c82749f4af90f034b7431191faef6bb0f61e230a3374efae7c5715e096048878f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/mk/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/mk/firefox-77.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "c5884cc27ff3e2c8a97e0cc498a0767c8a9f830ec92bdb98f143cafd49c4043659b9a7aaab423e2d770d3ec51cd6a2eae0c7e25cfb3f8f32364349e726b6cfac"; + sha512 = "cfddb67634a2e05d41c3595f62b88e53c05f5b07973ed16128f7620cabc9422a8f028458118e404148a2f5187fd0209910be1d5fede135caea25a2ee076811bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/mr/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/mr/firefox-77.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "9f54a29e19bdf171526eb802175cb9cd84eda0cd55d45ab334313a18fde347b0ab28760326417e454c9e5604c89743f9c6989df40becf7a57169d12bd68c2491"; + sha512 = "5bb458faf0495b24600395250f8800587f6cff04d46437fdfef4dfd1fc240c7c9bcc49f6679258bb761f587b2c8115f0bbb6ef5c0b11421b79cf8d534e70c8ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ms/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ms/firefox-77.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "b01d8f11c309a56b38a7311eb5b61718ded8f1ff392e7c3123f1954b2317f25f4b4017b02f7784bfeb4ded9641b20067ce149026e83298bb0010c90c98d2ff35"; + sha512 = "0e509780c72eb1d6154e3b3d804ca434be340f6fe8e706b87e2fd9e00aff3b82002a8b1a2f5d6994da2b566f5678f1b489e3b116af95776b323da7f5f674ea17"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/my/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/my/firefox-77.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "070e7f956e4c448936460ddba3627cd86a6d30ee6dfd26e474f333e0a9cad87843c2cca8d905c52fafbbaf16757257be6577bef4380998aa80804dce107a409a"; + sha512 = "2a036f00f40e98a5dade0d380e416f869d0c42f4004878dd1a51e99386a118cd88ad603915b741e91e16a7bedc0db9029d8627037e17f275c74736cdd69375f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/nb-NO/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/nb-NO/firefox-77.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "8fbdd844b3638a94c180c73d0e543ef2c97a4890ac2152d244ee4edd294ebb32d698c974eb9bbf73ad8256abb412f5d3fe49e0257123b9e3a5abfe851805a77d"; + sha512 = "f289ad816331cebb6634def4c7faf5ff6d1c6000cf5677502027a7823c34becca72a0cec5bbb13d5c4c16ca22fd87da941d0569b47369e1cf5ce00cbad326693"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ne-NP/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ne-NP/firefox-77.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "da253d0d4f3c6d042b04049dbee3f0be62916517c3b233e7b767ad8efef5b392c331589ce75f9484b40ea8ffb7bcfc00386222d52b07d1da80b13ea08866d580"; + sha512 = "6084544df0c3f45562a3bd380386217c4a4a6cd4968159006e3c24ece9cf6c178731c4e8fb0466ddf484776ec533e838e24018ed3d41bc5f54d9757081a963cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/nl/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/nl/firefox-77.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c04a3f3e860c0cf58d241cdb663b391f170e71745f6b4bba4ada92b5b2e922b94446295d7dac08b153c8ddf2b07d65c3c6c33fe87cc47f80ecfced653d0d4f87"; + sha512 = "1d31ffd4e7e9cbf728d552cc1cf6692037f62884cd396ce5ff3c96f89096d44a9fd789ecffef1516cdc0d66413a30ce67daffaff224854dfab2e9a3fa37e6150"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/nn-NO/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/nn-NO/firefox-77.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "00d4f4dd4b10325e9ea13cb7c4f2b705aa143fb906163f0277aaad84e31376a436adb03d534a1546a3c37daf8fd726b6dc8a793fa66441fa01bd6c2d3f4ec64a"; + sha512 = "0f97a3a2807b1087e1569e0f31cd80ef2995b89c69743c3441ad974a5786b789793c94828935027cd45f52b738a28dfdf86b1e95c5026d34de2e1f20107bf784"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/oc/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/oc/firefox-77.0b7.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "a52a46f4bbab591a713721212c4628b928cbde08de518cb1d72b8be888a403d506bf0c0f7ad0c04fab95a4248f31295817243334c36c9fa279c30bf1c8c279a7"; + sha512 = "91f5dd7f7c4ac97bde1235e9bf9594623f531a5558ed06d5ba61fe8cd584d80e6b01fdb070fe53b7c702893b2689fcdfedabd28c440ff865decbe4119bf4ef06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/pa-IN/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/pa-IN/firefox-77.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "c75fed260db1eed5e158dd1ac4d6ed8780eefaf2a2e67e0b1cb3008532bf4d35166050e070904651b69d5098071fe9eaec5c798193dadb68e34800ec97f191fd"; + sha512 = "763e900df5673e5f88fd326ff6ced28502ebdf09001fa06fa37912317bab9d0ab6c737233baf8d644de286766a7d4dfe740242ab70fe938c0c3bbcaa1aa1b314"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/pl/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/pl/firefox-77.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "d9b71dcd310b28d4223ae8643b452d2e9f9fbc9a6420b4ed474dcb5536c69dfefdac6685513626ca9c6bc7f9cf12089ec81ab415a432898af8a77faafbe796f5"; + sha512 = "1aeb0dff591ad21dd506da2cc89d7082044b762e7c987e364631cb6f28bb07618d51d138d9d7a936f244841cc4f5208dfb9bf8dcd1ee0d839fca5e6e58823c1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/pt-BR/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/pt-BR/firefox-77.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "0e529a3209ae57941cd498eeb6d89b6ef68dbfecd7160ddd44fdb550b73afebb4f62a17a8510013b953953d977d9ac487753805c826b0dd071d80ce434179327"; + sha512 = "643a666005cfcb726a18dcd81c8af6d3fefb77861c2a4db884227044c39d907659f1b2abe640950c4cf31ff3552d4d12a52fd9e7527637a68543aecd93a61763"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/pt-PT/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/pt-PT/firefox-77.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "1301af89d5cc86023fc6c4a7704e6ff8781d1b28d5c83455ed7dcf1469b31ec772f990967b7b575122fd38e53c56783bc5d5f414851221ce71abf6247994d68d"; + sha512 = "f17fff22865d6e64ba77069012072d24ab79abdf783652337a7dae7d9a901569f00f9d3cd20c2e3a268fc81188b478b9036229dfa248bd5b1ddd7a0f9c7b7201"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/rm/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/rm/firefox-77.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "e4edd9b51548fc2d9de2172cc360748b50d5d8ffecba51e293f95c283d1d7e836505c639c1656a122a0cb284ec64c8180dd2bc36cbc4c39ffb5b4f03469d7b33"; + sha512 = "3e105652654c1691bdbf8ab51f20f4ebb9b62d6a6d09f0f6527079bbc1f5832f4170800e6b200c00dd43f62dde531e7e8bd6bebd0ce27fd058552672d423a967"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ro/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ro/firefox-77.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "e005191f5d72eff47b695a8ca9021c50efd144f9f464a2e52abb3e44a500d27238fb6bd4598b7613de410c9248b1da5e4066ebcb2a5f034b303dbc6b789cb7ed"; + sha512 = "5062a90cc4712f30c9dc428d8ccbfe3bc1d0a50de3e84b5c475fbfbabad09394219fcb03db9313d7773518e24e5eb5b41dc16723ee235a87677dd07bdb1e975b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ru/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ru/firefox-77.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "b5b4ec978e332449566e5e21a03e93c7daa2a53ee7dbf6aa48e8fa5afbc7adfd3ac4224883c1464634824ef526a250fd123c341a0edc526e8495768c7489f557"; + sha512 = "5b457059285c31381a03b9e0285874989cbf93cb264a74ee875ec9e120027d5bd921a666a95275c56631ebbe3f435764890852ba25d199b0c8c8258d5b8a5807"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/si/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/si/firefox-77.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "1a883746ada6cc9fed22da12edb98b90cac2631c6c525e7e3317c66bb2b52eeeb97bf6e301634a5d7ec141229d245a23a343b39b5ca79fe9182b6467ee0a3fb7"; + sha512 = "4f8ec721ae19da2466a31e363ecdd9743f90a597d0bcfba12c12120207545ed03685a552515c9fc1deb27e79dac41345b8c87efc025dddef6c0347d21c2809a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/sk/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/sk/firefox-77.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "4ec70876ba04c07abf229f938fea5e86500037b5872f3eff06f62d811af294290125120dd1d142e54b4252dc3f685b2b2618a03adb61741d0c77af1ba6d76ddd"; + sha512 = "4953e879c353d7a9a71e517454ffdd793546d5c863676ffae3a1bc725000b5f69f0f74fdb9ba979fc54d809d576918e6def88ec1b1b7a81cdb6d1dffab624093"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/sl/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/sl/firefox-77.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "5a830186de891d80b35915481470bf583e67df45bc5c4eafb011dc86116ca3faae84ac901c2fa036f5575a72c2339e353f8c32299a9ffa29880a5df9836681bd"; + sha512 = "ce930f05f2a6f3716ff54a71af907cfafb1398d4f86999e8b161771197c60260abf82d0431093ecd8894d2de2aabc317ee5b6f348d8c05f3a823ac706bce0b2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/son/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/son/firefox-77.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "9de657a59c5dc2da3ace4972b855357d19c18709145a59d260741d5855b0c6f0adea1a68262b957f71d406ef05ad3536570834531afc2823f9db5da8be82b8df"; + sha512 = "1862101ca5ae8d8e2543f55e6b283dc8f935eacf38dece8c0e1b62a0cf83342065b467ab001a9709dc25f305294506f84a1036ce618bd7d47ed8d60f89b838db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/sq/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/sq/firefox-77.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "fc7750164759648fdce9b6df8a40cf4e08a97c60ec1c1f194d63a282a248b7cbab5131f98383de9675cf87b3ad3e924b620e48fc79ed75b12179e92caf08d106"; + sha512 = "511b7f3dba5083414d62090ff1202599d8b6d4623df06d8749c0bae2c18249b3370af71eacb87b77711982a196fac380f982c55156b2bc589572796607128763"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/sr/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/sr/firefox-77.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "21321e433ae8b3958840514bbb1fafdf31d426bbfa0e5dc1b0a834a94b658624085811328c5d1914c7acad3fe37a02a10c2bd278539209356b9749f3a8b4635e"; + sha512 = "372420a6a308e94a438b9b220a268264f3dbb0c45ebf5053fb0826948fb6f5e0598567f2e237a4c753431a135274a9867fb8d092f1abc3b90900039fa2be5322"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/sv-SE/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/sv-SE/firefox-77.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "b2cbe20c536b34203b993fd095c96001883563e1e41b1b6f059a48cb9ce10bc4ed6c596517613e384a17ab97446bd06e439b2f06f402a6b32842f30dbd15c617"; + sha512 = "cab258cbae1aff73f16f4be2217274f0be2e82bd587ffa45846308b90d0bac043953828706fb3ad33e33d06ca4eba6d0fb4d96caa684dd18f9fc96a33e1b8445"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ta/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ta/firefox-77.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "dacc36c42e031c8e26c7bb94a9100a38d99ade3eba8e860be8a9552797387795e3bafb5ad242231119948c9052e262e401a10fb5b2ea8db4f9a2a6cf7b7d7e13"; + sha512 = "dad1630c0fea645199cf5577d3928cdb06bea5bd718d4da4ab27b194aa5068107b0bcf433ac530c53050137a42b700834fc30a778834885976c090a9a6817840"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/te/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/te/firefox-77.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "bb73bf4634658cb4840f3cbeac2a01753657e74ee2e89511758bb268336eadd03cfc05bb8f5dd3573164846f07a2bc5fa35cee4476778599517e604e33c3ac08"; + sha512 = "7b903192af9e954b8b595e6f7eb7b176fa7fa91dad3891f364c676e0627a5eb7426b1f676c522943eda22565d459d049a5e10b2584e65b1e1fdf7bc27a7c2aa9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/th/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/th/firefox-77.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "9232d7cc4a78b733b5b4fbad39723a11f6c0260a3a7a760968410110043f95ee58910ff9648b3b85b1b84cd7b48b04ba90abb183c5a542cd88b3852ee4c8898e"; + sha512 = "5ddba062f7ed0de1b9b7782ad34acc32762ec5b4a33cbb3805eda39ac667d239ad23bf81777b8ea0d9dbf82d688c9a2fb273c635b4d44cd7afbe887a16c34ee6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/tl/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/tl/firefox-77.0b7.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "dd3863e44bb3a773556814363a7db844a2998e7f967d7d38c2d723ee416b7155cb4ed713a49da323be1e7e19f49e1d52c89d30bbd64087a16fd51f55c494faa5"; + sha512 = "8f78278bd75240622edf86bcfef0563d51d671a7b7731195b698f3e6baf2e467c0864ddbafe38fa7728ff00c4ae059f2e60c1cf67a81772445639cfb75fddf04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/tr/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/tr/firefox-77.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "17f732988e3565437c486bcf1d27a6e1210fa1bf91827e22ed2409b020b2f204330386a5ca7a18396e7aca61bb3dda6bec4f1e9ff150f13e0f6fc1fac6c724f4"; + sha512 = "20081f6fd914bdfa14ddf0a7896986290f3e7f35d7c77c90448be53a0ae09c5697b37ff8b63a0138ae20327d110a1eda2bcb5a41ce1927e36eb222795fb492f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/trs/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/trs/firefox-77.0b7.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "b673188a607e60b726f07017a307a2a629d9740fa665d350ac41a55ad2796231ee7654e36ea9ffb8b61a25f4c06683f63418098c5a29638dcc81bbb3eae750cc"; + sha512 = "023b6a4cc9069ba73e0072c8e4ef8d782b4e8cbbd9ab4810c921998d6eb87f8d631fe8e62771f8c3e5b0da83f43aac8a7d569a8309603e75b984b4233dd7b652"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/uk/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/uk/firefox-77.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "4db86db3777c7e655f6d33b651b9e78fc51d04a8403bd2ebae66fc56309592821f0d3a96d1989f0d388ca9c797702398cf646bc421c982555e36cb849a146122"; + sha512 = "5d9774938c64271ccd14a498151436feb8ac3a2b46f8f093c7c11bc84b7f49ec559acd620ed0c4e1d76b6f466f8be5d19d64af4d84606c12271814cca88801fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ur/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ur/firefox-77.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "c6b37a43d490e560f8f6b077e6df87b4c3f7f653b2a6729a3c7b240f272a5f35d7b4a9bb6ed8c720a3cb938f45c8ae5501a07a7a547d0741499ee4f7646a3012"; + sha512 = "73aecd84a201e7047ebddc71695cfbddcff8d7866f1ed1299217bfb81c49865ce4140deaf0d3d0ca34f82bfeb1e3598059f299f163e816fc4f85bf0a1b8d93c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/uz/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/uz/firefox-77.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "9ed33a466d8ed5d1023adcee8812d1c73399c0e31ce79048c66f79bb66df528d547c0b7ecd62f3e68b1e0e660f716238973d38afa63b0fd8c5b216ec86f62343"; + sha512 = "0b0a0f8bcc7a96222ab09c113b537b2e56d1ae38f198c9a0efd0a7defe917aae30b64b81047b404e09953146ca78588e8184127d1ec86ed05c642a8f03b0478d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/vi/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/vi/firefox-77.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "08bc1ea459f9d5133c06e973d65ae4ae5a9f57d1dafd7d8636eb722bf6f73443240159dc8e3ff2366af46c302dd5c852430db66b86716a1319854e6cf46d3e84"; + sha512 = "2b41d980f54907cf4f84ac5159ecf3d0b4ee4d6ff0003d2d26cf8ef51befbb67410c99eb75bfdba3f8afbc64c1911011946cc8ad23ec7f514982d522857a8304"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/xh/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/xh/firefox-77.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "296d0c2703baa15b7ba5f0d506e61d989e9ed3458f02423cc6b4f9038ac9f298bd78097f153b39676d25dc93572a6a7e63e804a579e118f1c5d474c83bf37e5e"; + sha512 = "9f07d1b5b54ccd5764aab35df797ef866cb6dfc705bb6db0337168eb0453d847d6068230ddd00368ef27f3f58300f8009c9848a9ad1dc3a459d90889e2f7c5aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/zh-CN/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/zh-CN/firefox-77.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "599d4b7ccae6cc399539dfe0072766f89acf863439f7d480d29b0d048a4bfc07226539e3e67a8e467eedea9448a599a6b7be7e5910a7a29689fe295242ea0854"; + sha512 = "1a5c6b1abab116fb0cf3e98e50024070c894e64334a82a3cff7c3a755b72a0ff8992f3a4c631cbb5489e2c03b5cd5dc5918dad56d5818c6050eab32335bf347b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/zh-TW/firefox-76.0b1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/zh-TW/firefox-77.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "d9e2ac951163c3445f5aa507a6683ff930431b17e465398273f42d5b432c3c48442be5233a4f5dd4390c00b6909f8e66963c2a9cdddca59a69b1fd602304b6d0"; + sha512 = "0b16ba221c9c681e44bcb8ab6ebcbc0698dc8ecdcf31d14b9b4818afd396fa8608b389cedd372d15dfd833e4e7e028dadc7087af21c4c2d423fd97e1d2c0030f"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 997d6d984050d..28a3c085a2f04 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "75.0"; + version = "76.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ach/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ach/firefox-76.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "654ce2cccf5b123e25509f71f4526f42052b3cd6eb79694de47f94363af4ab2b98b60d73020bf45c11d5aee9d0b3e246f72a7795cdf770f34a34f8c097d3cb5b"; + sha512 = "d1bd187497c76c624e010ec50a43e68bd91cdfded37f85e02047acdb53027c79c8071632f1a31f35f0a2b52eacf94c905984f2edb7b83e0a74fb0a0565eb18a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/af/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/af/firefox-76.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "615b948a59066bf7503d66a3fd574fa6523f85765f7e7f84d3929a78ef82b4833be6e810eeb95e266e3609e943703e1c84a0f7a26a542fb5e8a8bb0fcf379065"; + sha512 = "bd9e45046cb566cd3fc94eec9d5587b0270417d68091da1b29eca40645b2aff4f081c2a5b0292a0e06da410a64fd1f617543bf0702852a6fe424680fdf3ec39a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/an/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/an/firefox-76.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "070d250a2a22ae6b97efc618fb65fe93efe209b82aab53f9c13d20c3c8bf3fb9b84e209661d0322759a0dbed68e17c69ce6ef24a53d9dfd3186f1fd987e7c60c"; + sha512 = "d5df04a513a349291d629941e519617cdcdee1c004ec8bcc3c02bf02ad310dad2dc33878268d8a4a6b115b3b02bd558159a8eaddda48e83aca29f2a377225396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ar/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ar/firefox-76.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "36f7e51b0a1b7eb1c5df858cd0e90c301c162bb0413882dc3e64ed1240b4c81fde26eb0d9f7d813ce92c8bbae1e87a98e97d4a6360d765fb32ffdd84298f7f37"; + sha512 = "753550131ee986f7a770f95959a26b24b17e0a6a5f2e12ec1b7d42b31886e32b9c93a559b7824cd5348f34f1fe26901f5198fca57ab2c9f412ce032882cf7b5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ast/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ast/firefox-76.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "693cc4eedc5ec9a058ecb618ef70b322bc55b5a6159f480b219807940061ec22c92843fd288252ef30341dc1e42d0ad63586f5b9f438011726dc5fe88ad6037e"; + sha512 = "8561ba0236a9524672c7ebacde935d4c3761fe2c5fc0125951d28f53c3d27388d48c108a6fa71064cbfa54cca57a72f6fb49b3b8314d28b875e250b218be4d55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/az/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/az/firefox-76.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "9d78aa451a95f5c26685b6065c93c77c7b3f14db6cbc57ceb0b868a30ce2a023d28063d4a14b5617f65c2ebcb6eab7d2ec6ba2eab0909e44ab3f25b2b69471df"; + sha512 = "53b7a939d02ccc0a809079070afd4db528a4cb617a4fbfaa58cca573450be764e3894caf3a40477903151f8116460dc574749f0edf9bfae6981616772b649703"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/be/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/be/firefox-76.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "6b898118e72cb2311d6230a2a151505c1927a35060bf703da6ce97a5d0735b06e56b163d5e5d4542931453923cf5e0afb9b527d2392e324a509da5185f2a2720"; + sha512 = "36658c05c6b7b1f64ffe14ded709dbc08f0236f99f9457964c15a36a4ebf8d73bf482ac2f8518927b2d66fc9a1ba19289db1855a6dbc7b9502c2a3c0137bd7ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/bg/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/bg/firefox-76.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "b9a12097e8312c099622c3f506c09507a9f3cb25e36f25967001c37f3840916f58c6693f272725ef3a35b22be916c3f4eea78b3bd0ea4a110647a0db53484cfd"; + sha512 = "890066ff182d6ce79cf0adf307a92a26ced29f633cbaaacd02eb5c1c3f0e2bc2de336a7b22fbb530ec85561d26dc44f93f2ce1f58843e1d87322badbdc92e8fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/bn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/bn/firefox-76.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "b396e1e57c0e1cb7d554eb32ff4cd92db5458c5c232855bce42765aa2ab0d387ccd817f8a06624f84122f74dc1d5818992e9ca18138085a2f164ae3095485e14"; + sha512 = "c6f9bda8a95351d79ecfe1e138ace440aecee6c1dc5ad2d7c6d249e5277b75b27797cdcbfa1b8d3ec2a899974f555b8b20f7c38f03a7979ca917ab050feb6cfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/br/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/br/firefox-76.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "3aa6fb9dc3300b38038873e5fb06e40f4e9adbf30aa6fc4f3cfa7ebc399bd94d3464081f304843e83d4478989874283a8ae1be5704d34f4e43b2a699aab31466"; + sha512 = "b15b1cd34dc4799836d67ce4ed8b166b54e21076313a2f726c7b872aeabbcc40a35c7f859cf78e0f17825fcad38b6d4dfaadf5d27ef89ebea8da0ce427492311"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/bs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/bs/firefox-76.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "baf9e2909320fa15c70fc4a37e4e15a89726079d49d2a7edb72dcc4908b59cd8a8ae4917c1f4338063f5b85b119dfdd9c8d0480d71dd4fc45cca77ce465a3170"; + sha512 = "fee05346fed30422b79af7c0626a7763f404f8a3a2617bddd17b95434060bd1c47b47409a0147c130b51d08d98de2232abe8fc7ade9bc58cc1eeccaf0987aee7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ca-valencia/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ca-valencia/firefox-76.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "a3e16f4ef89e8ffa65981cee1ed53817dc2ed235f2f3f7b9ba035db92ccc58893b10f5719fa7c37a400bfb9da07309f788c142e36e5f7a91e286d7f0d9ec3092"; + sha512 = "beb5d44cabc7a80a0ceb4573e4e6fc2b554c6cc0ae38c9a5699d0d87d5f36aee892c4bee8ca1d103001b3305ef814f9a96a8fd63dc5b495363443f9abb4edc91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ca/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ca/firefox-76.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "a68a75844cf22ecccd407f0478bd38b3ed6f19cf8e6b32cef2c9e5e6d03eaa621b60be924a649c729b6cca3dbdeaf518f56676cb0bc295cb50ebb1038571e31b"; + sha512 = "1b8cc942602134a48e0d16a3244e97edafa133c74651ed4545f5e3eb515ad1881276cd2adc204e5c9cfd677dacec79030311483469174415199b9eb679729442"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/cak/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/cak/firefox-76.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "5759039f87134d0a1653d8175c53a0aa8a71379cc4aad75831282956711e4fe485e62040c3325f24684e2d676fe4208ec4319aa959cb29c9682847b35906589d"; + sha512 = "2738e924257a81bb1ff956a6717e6ef4769e96f5940bb0fad58030e3d2ce65e84ecb2807e6e04ca820eeba61bd386c85716112535cc28d2bd3c9e7a364c734b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/cs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/cs/firefox-76.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "dcb7a5c9b89c524e61f7a99a2926099cb7ba088c7fbce82f3e8450b00554efc587dd7c4b757b6567519f0ec928edf50fcfd438367c37b48a3bff7d1ef66b4d51"; + sha512 = "3d58acd8bafbd11307ca58894992fcf8325a5679585d5c5e09e397b941019a8a8f7bc9b63997bcad2722e8cbba88715b789683b0428632e4ec4b728a36b54099"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/cy/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/cy/firefox-76.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "e788954f6ce821cc68afe9428c02823870533164b36123d7f7a9bce7a4d82392606d397713e8cf28b5360dc5897ca35bd3ff6aaaafbabb7fe5106462e8f687f2"; + sha512 = "aa7aa1b06c1a28e30b532d41b4cf3bbae26c42a24a63afb1999f421577afac4e4591b465b3e659ed5c9278b2c5d2c4c449a84fcfa69b451804d2a0470524ab04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/da/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/da/firefox-76.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "4a2da0b04a3f6cd6a5dff9c4d575d83b8ac195d815d4bc64e1bf59f5993c4b7e26fd56b81d7f0c5f6e5d084365b4d21477f7d554ab06a4f73400b8c484ad0fcc"; + sha512 = "48160d3a437dee94c1070e2742c6bde4a36811e8d2eae87d7c8450476b30b912bc9cbef8a5f7d917ad4be771eeede9d7fa9315e27b154f50049ce80f4911024d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/de/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/de/firefox-76.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "6dd27ff5b7eab20c2548cb0dded8e677334b58040ee4e15a0d1095cafaa209bdde069d03b87ea7133899093375d425621bce7a9a3816f62aa603e20304be56af"; + sha512 = "fc4d0ddd9649dd555b4abd4d90f9d6cff8fe7e702bcf5d2931565c469842f51ee215286f68802304868848f043e54c8224358c8f4060435a4674401d19bd6989"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/dsb/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/dsb/firefox-76.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "abff1c0ab591a1c2572e88c25c785f218bfb7b9d86c415f4390830f4d0e2ae97f9ba44d2f0a552356fcdc2d6ef9a238b6d00f1287132df60348728b63fa322bd"; + sha512 = "3cab1a498db5900b055a8bc6398e4dc9770657c41ba9bb6bf0f196566e9c535db99f02e5c51750e7c7185f2f0b1a26e84da51403775c33ef34915b43e3a8b27c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/el/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/el/firefox-76.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "9bfa5257fbefdc079f5d372d7feb3f52f52a33137367676e141a3aa57b5fde64a1e6d218a6cf9d81941a89fb3917edb5f1c4883796148fc63a32c55554538796"; + sha512 = "d099758283e38566a4d9db744590f42b5fd28de8e985c2f240096e158995da00711e97d6feb3979bac40a2ad57cf7876da37c4ba69f3467930415d87a2d10c50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/en-CA/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/en-CA/firefox-76.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "5b6ff6a0b422bd399a5ac2893e187e4f46c6afc106aed7177d3f3a6a9f72c5cf283a589ec589625deed0ce4e3d7d1d45cd9d8a6c7015c48b7187edeb1c07b129"; + sha512 = "442e60f0d132d96c58364e0d5f70e43ade8e6508f5d0a76b3d7e5c61bed0bffa5f9bc2096c89879dcb1681bc394699e39d3c31f2d02fa790dd8e38f1b406154c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/en-GB/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/en-GB/firefox-76.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "03e20bb7811ba53b2ae3f051279c478b4a240ad9ce0381e9a15daa8d04f15b11446456b05c84f41c3f628e3c7166ab2d19b8074c77b7f3190795cc4219be9be6"; + sha512 = "8c0d31a9123d8d8baf94f73505233786f7fd2ce721f8792f4cc1db337a1659badf08393a22159dcb9d8256e43f24661c3975e6a1f801e30d21bc54083f4da041"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/en-US/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/en-US/firefox-76.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "7cbe8df35f61d82115ca1e4db4dd2e17cc96ba74cdf4e5e48aa4c1f5bdadf4e8b612b6ab58a09ce1352129ccfa68043ae92836b175fc5c328c3696f1f3426107"; + sha512 = "993e5410a946f802a47d8167c83e767fa9973754cfc1365e4cc2698a25524dc27c83f3b202990744dd654d68226c601ad9608ecc49d2c3952e50967e20ece34a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/eo/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/eo/firefox-76.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "933a872f25c6377abe21e33fe56a3184e605e299369cf11b84c0fcf420336f119abdc9568eb81b1e51bb58228616cab4c7171cfb8f8e40329bffb377a455c832"; + sha512 = "c2021ecd345cc45fd26ccd8a75ee66cd1eeb506a8e0f6b9811b4149b6bb15121edcdc9a0825703db52beea61f7249f45d23fa3822a9f47701adbc2e86c7ccaa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/es-AR/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-AR/firefox-76.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "5da5004a2985fce3a6dff5461f2c0fe174d3ad58e3dd37c4535edcd0883fad6f5a449f9f898c5bde5de3aebd9911e87e82c99bd48a06e9d953e38666e3f8fdee"; + sha512 = "c397cdeebd4527189b898db2640c1a5b8b5bd4fc1664ef384662136232b5dc21f7033686d2624ec421542d1140f46cc95c8364d47e1c89a8653d541fab52e28c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/es-CL/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-CL/firefox-76.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "c2acae33bbf335d871ef14e27d197f4378e8ad1a94b9ba2df28497e4a72fd554a1d9428692cbd7cd5e3147f575d7517dbca07b3edb5eaa66c390000e7cbf5a7d"; + sha512 = "86940cd36df65d0515634c7abe6c7c81157a8bd3576acd9844784041c2239d25aa455da2fc33ba9b8cac0e5a840546dda0cc04765589dab0608ebe9b3cd53967"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/es-ES/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-ES/firefox-76.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "ce8ca7ce217bde7b42c9ce6d64874d37306754ccfd61f0b61c898e22f84feba6e30a33468b9766ad96f5ae8e6e674eab93881f36ded52f010216d8efa5f77907"; + sha512 = "9a1404626e2b9716567e0c1b0a7d681acfc47bd488fcc585172fb40c4d18dc1bdd4356244c74d042ad085e0300aff73ff7619d651658655bdf7d668f64e72a3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/es-MX/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-MX/firefox-76.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "fe32f01fcc01ccefaf7207fdc56da4450fd17928185382cd738d7a22425b5c3761ef60d0a9f7d35d314d0b7884859d614f08903eb20fb0a679f27dd1f4b136b2"; + sha512 = "870b2b135ffe3ece3ef4d16abc74d469421742bb32fe8b0add3a39dbd580aa07e251df4137f3a2950d6992cefcf0eaff162959ad5eeeb7e493c016769ad2751d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/et/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/et/firefox-76.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "fc1855e6c7bc19f181c7e87909a79e1a5d08ce1fd38f52d65e20331daec8af8b54c1bb7f90eb1c3e53c900f141ae264f55895f6fdd3690a83945a26707eec27d"; + sha512 = "d20a3c1cb0649406d9cfcc22bffb4dacdee124b68c210ff25b1316be76a1ec26b7b9f21ee8d208cb7a6f1f733ae71b70af3fe084b92640cce03989f4d45cc375"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/eu/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/eu/firefox-76.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a285ac60590113e41f04a85183038ad02f0d7e24fb42fe1a7b313eb6d3fb5b747ac5f90364278f7c8cc3f35d0ddc86c0bfbc7f7fa7ed2adc56ef6c77c5b25ad8"; + sha512 = "fcc4a18ab042f31153e1f5a4d090c920e687687ae8be4259394a771c839e8af167efdf9b0a3cd8ae80f15e70300d24ca894ec1381bd91738b7a5c1160dcf8eac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/fa/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fa/firefox-76.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "84ee3198ca0cd8a3b20f4c696f6c08b94d35f9346e4443e1d6d6ef447d94a20fa1d58488a12124440290c4ae00ae827ee59c0cbdb7905210bdfca0c012f7e01c"; + sha512 = "7ce0bce00836d4497a440f3c66421cbab38f5b856a8b0e3dea13b88c167b689a061be7261d9daed1ddebd23f21eb806fbe72c7cf08a2f49c31ea1486287404b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ff/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ff/firefox-76.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "f3b615fc63b12ade11fad5b5532d81741147156ae84d08b1bc3c0f43f2c204993601e1bb363ce7e3ed7ed3a5d790428ca51e3cb5decf56f159bf7a25e2e43a83"; + sha512 = "41c0639955bb82c8042e0cd9e76c6c6b30c5baf8f94206f1932e8a56cbc21a2de53fc9b31b6dec656822e215d11259a7b2dc158e58d1edce48dbe41f2cda4098"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/fi/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fi/firefox-76.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "b629b55fe05c53ef814b091ff5222704afb3802630a5f44047bcaa17f8140c834725eff9e51786e55336910c462ac07b956878b551a5a48190b1ccd2904e57dd"; + sha512 = "540f26080c0b85b71e40bb0eb5acd92d8b71cd9ad8dbe72121225afc2b9821519ed6a2d2bc58cc77b445c3fa42ac6e39647c1da8c8a8935617995dcb0376b9d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/fr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fr/firefox-76.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "1794f58a31e91916492319091437ad9e5bbed95b3925854f744e6e635e9fb4c06abe73f9fed429fd04027c12cc29b63363e60a0c099640226a5a626a428b3002"; + sha512 = "ccf845aec06d7274acc7a850702e2dbfe69db8198a44537f7f0eef6b65bdf0cb71682b2a443f0e6a5e8ff310922bd29c39229813cd12ba54f70c0fa3418ff23a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/fy-NL/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fy-NL/firefox-76.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "3aa9f95eeeadd81d0ecfa93b1df9b1b455425f430968395bfe65e60a65c6aed3d9316f842673c2638acffedfbf1d93940086f6b7a113496c7d8e580aecd8f25d"; + sha512 = "5eca2e853a3458f5adf0a960cc7ec4f21db344e67e7e419ca19d34b807809bd0c954ae4011b5ee73b02d9ef88686ac57f2a0d1d3af43e6a4def2031b698cd656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ga-IE/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ga-IE/firefox-76.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "43bb9830e38dddcc59480a7e162214e37ca3516cfa0d773c4851ec60f098837ea2849917eb460ae7e388612619b13cf29d26d9b1908a8734b6fde1add36c65bc"; + sha512 = "4ceee43db5cbd6ef5b18442cba0c7c74998129280e14b20ad41de041b3053b518fe77767a7aed9c62fa2467b2d6ac36a680e276d79edbc959313b260950f7c8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/gd/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gd/firefox-76.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "8cf151995af5ebfaf9f713dc7373b9ff3d12ce582c4fd062741eb99e291aec68fe636d871709ee0a0bd628af0e9f1a412a12289c539334783c7a5d6b6b0d4822"; + sha512 = "9a5115acf49a15e10a530041029081eff7bd7a6877dac1331391d5321533083162be0dbc5dcede2bb708d8a54d47af3773c89e498d8c7d99c28f7229747c0721"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/gl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gl/firefox-76.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "da133c0af8546ab62c335faded8b35f917af2cc7fafac8cd22db1e3a867b390de60a2bc15adc7687044702907a675eee42b049cde335d41a55894537dd137fd0"; + sha512 = "435de08a8d536491b645d630e81bd9190b61e0073c3b170977a995f9599b0ebd0fe4a18279f0ef40ca242e854fd43ea36dab41a86a73c515a691b621f8b74ae2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/gn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gn/firefox-76.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "a1f6063560d70f81cab8d40f1f0e28ea866f284ec94a0093fe874c96795ad3e823c202e82dee2de7578f3ffc1231ac0e8bdcc1a21c44107cb1d4ab56cb56effe"; + sha512 = "e4e4d05239306cbc0f91cf6d1eb890af45c40fff8ac53fa47c6dde6dbaa583d31b6e5e51bfac91d2fddba9f89e51125235b11f766ebc39ec5e55da65e1ba732d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/gu-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gu-IN/firefox-76.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "60123058d668641a6c48a7a6a4247337515493267b3489a16e9f7fa2d0ab1ed8a5382974705a156fc041501560b8f6a2be3a97b47ebfdb5f6f527e63ac5acbcd"; + sha512 = "727b7db843fc1722cb5d837e02388170d06f8c6ef42aba22dde9e237808e5404820c8b14dd43ec5cf2ddfcdf4883bd678d5c9aeb2845e428c096382d8a805afa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/he/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/he/firefox-76.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "7693bad7f6505cfd1718e8268611133d26826adc49003eeb6d30bf38ddc1908c39ec270b80e20463c016e4b367ea8035dc8c9707b410299581e1b09df7a08df0"; + sha512 = "c151a281f8aaaf82a0021c20af2d12332674b27f2e5ac9c0ffea070c5c350f96de978a1662b5886f1d3b1d514061747f247ae3ebbd965e3ce940a2494c164243"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hi-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hi-IN/firefox-76.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "f5b58f3507852cb2d900d1398c934bb8de725b3578d1037d424f5b81d7cf2e0a247e6be50037e027649dece8cae55c579f81205259c93f22eefb2d67af8b0d57"; + sha512 = "5048f072162e3b2cbfbcc24885aec83599a7c47bad212fbae741fa15b903014a9e29b362f1492b42341498398b009e5d929de0801a22b4333093f9057c47b42c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hr/firefox-76.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "6504e82cb541bcc9a893c5adcc063a8de3b85e68329d3e5dee0a461a0c614b330d7b59b6f3fa0195a01d69ee011017bdf999f95fbb19ad25136b291feef1ccb3"; + sha512 = "ebd9c280598ebec64a230f6711d4d7839feb005d790c0660fe789e129a1acba78e170686eff21e0bad558dc7e9b0dc98a9139b7fff2426d9050ec0b3ed3e815b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hsb/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hsb/firefox-76.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "6d0828ce7c721aecdc66a1df441cd7ad43a1e96487797a414a5a9843bbee6edc1ad2aa23d82edac7b2bb1264a0880b1852bf2cbab184ac1f5f91da99fb4bb06d"; + sha512 = "197ea2000df14ad17191e2e7eaf54bf7bd1df21fbd25c0e18b200d2c43686c4e256be329f57254422a8e156917ea3bf312a38e332b72596b5b93b97f61319be2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hu/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hu/firefox-76.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "a252051af8e299e6b21e9d601e54cbb0413d73eebce693403b522354cb0b6ceb240ef70b50c99ab55379d2a99a0f268483e2b0a02da3f9684a5b7a958b732cd1"; + sha512 = "ce3b86d39f27f1a5f2287cb88bb45be0b70ca8adf7e814e3fd5191fd41ab7e33c427d8ee0d4f5c7c5b279e2079e318239aa3485771bd2f211c9f1ae2e654fc5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hy-AM/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hy-AM/firefox-76.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "aca7eb55987d98d69f024ac41414fc9394c8f05949bde1880d191c3b09bdea4798baedb4a92119faf923e5a36c760360d87ecfadc771a57f6425302483b6dd08"; + sha512 = "022053cf588d2f7aebb564342068d4bf3763dde50f3bbcf433dd2d7e5d90ecb134f9302b44f5bdcc84f56e74c7c965555e931ac7b6d85ce58dafe838026a91b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ia/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ia/firefox-76.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "e23d26cd4f7cd40610ca841fd2b8be72f199eb2102560002c419fb6f00b1f2fffcf5fad6fd06c6e7a0146d2b7525c006e6dc696271f4bd4f5bb3bcefb8980e9a"; + sha512 = "bd57679165653b1557569d20eaa3ca83011e5704b76e3f29730e91d2c7a5fb553ab3563a1f26d38100ff8330d7efbbd133e959c4ae5c534da2e0888dac12ca5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/id/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/id/firefox-76.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "f8ecfe334dbcf6598cc2241c56d6496ccf0755494d11c26e2624803d3f1a6001944d8c9b78c62bd8bdac85fc3d1e60b90212b8bd8b2842e0faf6824a1651a31d"; + sha512 = "72a391de2d665db794e5624f341245a85a85c45d8d2f3c71bcf526b273bbf1a06cdfca5e9d45ec05627570ee496e0899fd7756066f6f40a86df088c4e5025ac2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/is/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/is/firefox-76.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "9ce50d9746bcf6384627a83538a0e023091b7f264c6364e88de2bd8ebed0e081e1d31681ae0679d2a88f462bf9e04d7e9cd07826822cff3db1a1d338816875ac"; + sha512 = "8707e9ea8665b0f2f773c98b7c457c00c99528676afaebd56570fea1460b11ac016ca257f10397e447581a3a8966db671bf33634255c015104c8435c067fbce3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/it/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/it/firefox-76.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "9284d8657a4097696523cc07217908449102f46dba9564f98b2e4889707082be4cf285f889f650ceaa92e06f564daa19691dfcfe95b0b4a865987b767665b837"; + sha512 = "10d74b74ca47e406919ac9589937ecadc55b637678f895d6bb3700aa072c261416591378845fcc2f032755da08a4e996c726fa1694b18883feb9fb90a36ab71e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ja/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ja/firefox-76.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "68bfe86b27d5d5d71121735a627e29964b2c3dd70e33e12f8ce3a9d380d253c33bede8d33eb7f0185acc68deb388b731ae6b40c7d71ac49c6fb5ee60e44e787c"; + sha512 = "9d7d45b0e1ef893145bce37a137e648b6292febbb08e66a0f0e8b6e9765e19ed3e864483c3892d327f3c75a4f73592a5cb2957ff6c17b20d19bf18179df5b083"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ka/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ka/firefox-76.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "b784f5fcc063c98481ee3eae767eb3df60c9ba4464fbb612cd10bbdf1abf54f5b2098700345f2494358de1ced339f1fade979ab6603f036e4a2f76b25c46a33e"; + sha512 = "22730ebd0eec5fe1c9f993c8964c81b31d2bce1b1b7ba901c3a7911d9544659e459fdd19024bb551169d17c9430e15a92c039969379da28a49db2f0b04d799c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/kab/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/kab/firefox-76.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "ac26df50c827efe7fecac013ae417a4b68d2a49062ec9fd443f5ff6d47646333ccbf6a98e92e0c8c2d5aa293b170336752c92d33999e41e3ed163292a6bf3d0b"; + sha512 = "e7455deffe566f95239e6b1b6eb5a4b20d849ff9f0fa26518d993581b5e76975e41a5bdb54f69be7ff182437ceca868779b67c6a6c118155569dd8792793979e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/kk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/kk/firefox-76.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "47e516fc9fbba8e5b57fa3172df29fccf8d318fe1431233c2d70c5c657d40f2a8af1b20daf5e3d6b3978ee093b1d100dbf7ef8838385791b58ce5463d6899946"; + sha512 = "56e36532e5babf3682edf5f278b971897cbd4854b0864dde5aedffa6a7828048557dee5992f9eabdfdb67c2054abc0dc2e5d0df8ec5882b07d8b266183177e06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/km/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/km/firefox-76.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "ae0baee8e59fc4d44ebf57d7f708d3f30126989e4bd32309d8daa4478facfa4a929a96972acfb248eab0a1e04597b2dd521a4fee40f748fb0a4f6108220464de"; + sha512 = "6d1ef5fb7b555d667bc1ced25b7ef49f8832b9c077b113db79ff8509d845d693af33bcccf4039805fc0c69293139a22f24ea3294706097ebde859cd0f9aae8bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/kn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/kn/firefox-76.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "c0c37e1b36408b0d8a4d34fbba254a6d6b37c80287ddc4abce88a623ba3fd5b92108509bee27bbee500abfc08d364886ce8ed5b816b9450aacd127aeba39df94"; + sha512 = "04626f922214d666f1da224b2ba52960f1697ff76a0b40f92718c536eb07de6b319700566a9c3d702e50b137d54b7a75af474bdf56d39bf80165b8430b636944"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ko/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ko/firefox-76.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "8867aa119becc3e88c63096c5ebfb2bea3a396cbbbc18f35725d5983df098543827bf6c069292322507b871263f744ffb411a59437687780a9dcafd276d04410"; + sha512 = "e83f42c7c24b5a0536510ee736114d8e8ab6c6393ce63ca9e2f9d0e0216831b192781d0617e9793c6a8b687429275eafa6f84a8839900858412abff751256a4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/lij/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/lij/firefox-76.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "c10c9dbcbd911c3ce324aef23629f37df959797128fcea7373f3d77fb8b3d538850aed797e754bd15edf59e666412158bcee2c1a9ce8d040d1b457de9ee007f1"; + sha512 = "524261eaf2fd311f92d85df46459bba17b06ca4e1a61a14453c9edbf37c31b1de2d781d466812c250353546bbde2044c79626840297c76a3986fc6ef869db863"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/lt/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/lt/firefox-76.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "58517b58ac3c51c5aa2fddc0b5a458d100d3eec44e51c6d188a85c2e7538caf37cabb1440f4ebdc97d54d3677697a5fe07235d67ddc5c4287bcef10f9b7dc3bc"; + sha512 = "f9c0665c4f4fa6f4a8f0fcc02b92c88d0c9eefcc7b018dd54c605c6b0f024282e25645ddf14cb2bc82827f7c4c8191a83c38d4d749af45db07bb81df99ec6d44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/lv/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/lv/firefox-76.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "9e07357febaa5b67eafa435d30a2a8f75f2ad25d1e87968cf71b8a265a647ea0020169d6f2cd77c4779dff905774664f84ad26fbcc8b9d4c986dfad52000e175"; + sha512 = "b89f91a5223a2431ea272115b18fba29491d60ab5e0a69af4a1152644596b477876a7c8109ba08c5210b782ad11ddd2b65c775a4fe8cba1126b21cf31e31d1e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/mk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/mk/firefox-76.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "249c45bf3f1b22e355bcfb4f5afa829163d8d1d72a8f192111eff2158b10585152c9c2dcb2fbc9ce66d8351d83d83236a04b42da4607fad92d2b4e25acdd39a4"; + sha512 = "f10771c9b2f8634259b7252488e4fd3f9b249b33ab59ce9a02c77d0c4cdc5c567222a91271d4cf3949decd86602613e9fcf9e5e8a403f91255ad8a69bf2351dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/mr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/mr/firefox-76.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "b5860b41a310cddc4dc81074f01deffdbd10ec3f682aaf3d27881f8c190cf5ba39c428b7bae688301f8fb40ca12b3cfdd9377501a3e750ce8995e1331fc015ed"; + sha512 = "49bf1846a330c4d43d554f048bc1c5061c1059d62c57ffa224d19b3b4b2fdc806be73e6bea8409763be182b37ab6a1243652c62f5f3e48a36c3443f509a06c56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ms/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ms/firefox-76.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "a1b88f527ce9e4d9f69d4b727313a68432db2d989d360fe5716f896d61e7dc098667720a2c60e33612b43157566f95abe6f1b149f7aa507a9738753e6c3213bd"; + sha512 = "018622ef6cec81de014191bf94f88aa1a7ce732324f70a1524e3866e5500ee93dc6ac48dff4603b2f86b909301ebd2440ab87bf976cf041f6f8ecc4bc7da25fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/my/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/my/firefox-76.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "74efc375475884fb9bfa9fa4d944dde0f6c734d1c73676d37b80a909618773147f12faa94ed6570a6aab6652c4c5c32cf386ac096acc025ba6c8440d8d345026"; + sha512 = "24685648158e9da5e74bba611884c3d260e7bad4eb3b6b2e70cf57f15d505b87a7886868e88bfaf440f03f37f7da04fb6fcaa5947ac6ecb62a987b24e0be5759"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/nb-NO/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/nb-NO/firefox-76.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "c1d4eafece0ba52022c96fd939651ad047e942fd9128dd8c6bada79f2d0eba01311b4829c805eafbbcc53ec4dee34d14e015742a86ec67de07d84d6950fff41e"; + sha512 = "4fd040d08c704cbcade0a290020d591fc265bcbf63467f93c58603a3f96af06cb3b38d03aae5a32b4b78fe2c4f89ef81112a69bf539fa052b721f549423b42d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ne-NP/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ne-NP/firefox-76.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "a97b467bd40e1564973b18ad6acb10412da67184daaad25c34b84ec2a8f3a840f01fe4b9720f4774a546a7e035338d9ce297eeb882a3df2b50f6a9cffa2bee13"; + sha512 = "0708208411de209aad6a692dc1b867011d589f2fe1e60dbb5c8448f96735d811aca6a444f7a3ae2d93a2953965b57a728e3af1b2a31ff8c86d1941a21ac2147a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/nl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/nl/firefox-76.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "2d84393b851618e1742616ab6f3b1fb21b7f00cd65a98438cf3a1250275b7b184f6eb0cdb1d1425293d1ecbcf4591fba392283596146a5b18f29166111cd8844"; + sha512 = "2c6df617fe9e4c3ba1940aa86e313fa4a5e64db98f4df9abdcef2a5e7832e8586e939646e435c9725e5b97ec80da0f987b620a78faaf445c374a46cdda862f23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/nn-NO/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/nn-NO/firefox-76.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "c5782ddf73e00481ed338ccc989b2c2760f15e2b2960457cd3cf6403d6d3ad5d1b5d34cc6194b3a1ddc83df8d376796802d4e945b8ab47b7b7e1a4d5a4387a6e"; + sha512 = "5f02a673edacd9e9e9171c7324b3b45974bc5374fc5a05835a450b6aad1219dc76ee50dd4084243523fc3e10e7b65a51f33e33009f4393f790a9a8430442d87f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/oc/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/oc/firefox-76.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "cd3a3fde21ab21e08467ebbb45d0a2d32cb901c2b6807edd6298eb75bc089684f9fd26c0741295f2ea82c2e25cb375bcd1e45e26c267c59d12d285a00f0d0b74"; + sha512 = "cf24d386d8ad5a927e86929d053eebaf03be667bee4a4d0a85a76b6030e85f254b8e9b14091cb17ce3082890affa2c75ae2c1c0da8e007fed5189c9c2fb3b95a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/pa-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pa-IN/firefox-76.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "546e36c717f8a0c216c32f53cb56d2fb709702052bd52ac1184860c7cd755f9f0d657b8955c3f6347c37d382600ff9cf5add261dd066e8881e6a3e410fea151d"; + sha512 = "1a8f07e70425bc65552fa82a16eb4009e036de60a6b84aacf7a4d47c2763b00b116f61fb87aa2a5dc28d2e09a82dc3621470b5589b3fba449e2eadf2996686aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/pl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pl/firefox-76.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "837bde42f6b9c1aaca794be4fcf819fcee3e3456a883743882ed6983e71f98ba25e02292bb01811958a9f21cedac55586deb8066f52939971c348e21ef5ab75d"; + sha512 = "ba8dcd5ad68f8506d4c637be831365fe230209ef58640da8bfec20cde9447daab678229e0a82931c022aa0c6fecdd0e405e92a4bfd51d7627235b689aa78c555"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/pt-BR/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pt-BR/firefox-76.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "81a2620aee0f210782aba431e7e9e15ab2a0db49489aa61cf7a6af5944e59c62f38b65aafb198355d5d49aa5c52e1052ba60c03b1772916a972ed06aad616f25"; + sha512 = "fa1f67341221a907f24ce2953fd75a0003c04540a7673173fdc333081c82c24e68c0fcaa85e10264435a9540e356e94f0b4d5b38d892821bd307530ee10f9b7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/pt-PT/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pt-PT/firefox-76.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "c6b317d17a14c5d5d428410f7e86c7b9089442bcbefdf1a44875373390d649b2f7eff26c09c5cb32fd2f8f42293d289044a7007dae4b075bb1fc522b63f4b18a"; + sha512 = "c282b71b30ee4f2f67d98551eaeb1700d2867e8ae1f19dad417f8774b8a91db63ecc14c37712910b7476e837c4c23f4871a20d2afe37f61ba4ba0ca4b1684569"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/rm/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/rm/firefox-76.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "12e6c10fcc9419a66aef11e50969fc6adc7084db46d2cc6202a08e1a7225b797fdcdebbfb9dff6a441e3fcc782cb33753361ef37767e5ccff35af2efefd82256"; + sha512 = "70cd918ccbeade126f36dee76600f7c6e78ec3291a12e6d60f684dbf5fba322bb7ab847cda9f101af5b48d9b0374573e8f6295dd8683ff3acf9a89512117d054"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ro/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ro/firefox-76.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "c03df00b865bec9765d28bf0171a5eb6a57e3c8cd64a9002f17bf67d4d0c118414d6b25a782aa3eaca50d5997203c40e376562f64a252aac4b26fd8419872feb"; + sha512 = "acf9a4914255bdde374ecdd77b39190c945621c51ab13b2d9e1e8b1655df593c6c7e174113d89e8b1afd223e6a0f63560ef4d991706d5f23db35a939ddf793da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ru/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ru/firefox-76.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "418b70ec07a966a51c101e9ae341b0c949476452b75ed00677ee87b032d592fef65e6ce746004deb0d89b94cf9e2d18ffaf1d388026bb5024dff0994dc2fb058"; + sha512 = "9457048e428958b55ae221471cfb2874ca16ea9c1e34a33d538b9964e6ed77711283207106814f6d18ab73f8c690e6c20b2c84d361242b228cc92c7ddb675a27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/si/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/si/firefox-76.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "5adc26e616a8116fcd5b9579acccbb402fc5c88ac334cbbaca2da48e246c7e44868b6454c75bea355f5cbf6a182346efeb50f7a49b2c3f92c8fa988d50e19e52"; + sha512 = "897b488d3ba0592b902f2cdc4eeb2f454b9b6f67fb5e4c583f5f49fb062483ce1d30e64f6273894c698406f8be7dd8a2af02a67e8d9bf47f8d30a572fb18e7c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sk/firefox-76.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "d173c26b5ba44a98070fff9996efc5a35a3ad90de128c5345a996c83d4a68ca7d09e588bd75530c31abedd9f20f38561e22484a45e20fdf66f1cce682dfbc31a"; + sha512 = "2847545533829f45c22b85368c5fe262e2a43cef0e5d480a540ca47f0dacc8003b8e155b11098944c7012b03feb8ddca216649f645c46da0975183f42580e285"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sl/firefox-76.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "1b16278f2f6e4df7cd437a7bb6a17b950540dfed646e948585cf0bdeba45630b4d5bdfc249d4fb49bf37dcde8a415053ef4ac3384c2534592ba189264bcf4e0b"; + sha512 = "9b0223b409774a62216c97e522696700dd95b65e1755d889d58137602fe4302d8f5280464636d94c97cfdde8c56e49492005e487730b591d19bc947271754e1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/son/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/son/firefox-76.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "7e9c5c578d9669f47f3871a4d47e211d2ec9215633163605239603c0fc51cce1d1d4b5c3c5a06a9c29c16f82c3ff2583fef1b78652c8afbf093557375e912430"; + sha512 = "097ff1df64b7ef62eee3a29672447c42c46dc23741ebe87365c4d41159052ba3560f7a10956dbae6b67daaf80607600d2241dd997573b8ef8c54fa94f064e629"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sq/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sq/firefox-76.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "09dd8df3e07b2bcc59e77c55ff4f9b607c5c2cd343d784a3bfe172cc09fe0fa31ea519bdf671206a16ae73fa9550f08b77cfda0e030dac455de4be16750ce431"; + sha512 = "8a76a933f261708504fb637a93bf4d600514558f08832ceae8db23a404e5d911ef23803436e5513a4b7e4cb85f536e64c5ed801457ad2e1f9c559dfd1f8be807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sr/firefox-76.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "5a4dc12d716185ea86a8f31018198dc4eae0f791b04a247d2f2807d88747fd52fa39904bcd440c9da2e0225e64445c20da7cd7df75198c173a39aba59326e613"; + sha512 = "bf7d631608e91989a8cb63cc07b8e253cc2c764e9f712eb113c7b735bbe2da04ddcc91d43fc418eb208a75f4027256cfb10d15c21e82b7e3eea096ce6fce9a5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sv-SE/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sv-SE/firefox-76.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "7082fcd2db01626e90e6850230b0a2b51c0eb394d47604a76de5d03e30997366f7331a7247e7610dbddb16f50c2a3259a842be248614fd3725f0063138e18d49"; + sha512 = "cfec4b5942c193b37e881569de1d40907d44b7ffdd6a08fdc3dc44ad27151427de0e368a08e4888d9248e07fda8de54f1b7d1eb3e106f0cb41c7fa1a8e4acb10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ta/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ta/firefox-76.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "a85ff07912d369b915d543f9d06cf383a180bd14fd9355fce6d918506d8191da6f89c32fade5a9146700a95dbaa4a181fb513df1b8f28aeb7a09641baeece0ec"; + sha512 = "8f487289fff43075239d79d1d4b8b0e9e7a645a8dca26eff58ec32e534a870b5b67232ea6d43dc58b1b4bae9be8af65793f185e4b5747d9c374fe7802b92c9b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/te/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/te/firefox-76.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "5313549c22fba2a3bad6550a000e59c15595dc0bd684a14ba025fe2c4de9097a1dd47566b8f256f569b74a21d20538ae89182d5278af01c674f50e00d49c873a"; + sha512 = "a3ed83d4c34fe6d24c2d33c490d6d2de6fe56382bb87807f530bef967c25bfb9a00a1958ca13f2936357e3f1d75b029dd2bb89a13171574bc022f7da8b4f49f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/th/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/th/firefox-76.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "3f2b038b17553c962d2d964d342bb0884dc4acb4204fddfa90f8ed3dceba1aac40d537745aa32629402a7077a97cb01efd1225009ccef5412e14fd08d2aefeee"; + sha512 = "54c9f36ff4f00f1bfa3f947930988ce6985bf4e2682613a8368ab60d07abd02d3171cd2457987b2bcdd7d0929003580af9e4683b7e0f529b1ff3661004aafff7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/tl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/tl/firefox-76.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "1bd4ac5a59a06a71fc5bdf976e76da9535d0adb74da0aad922ce5ff6101bc48a7e6727c3f2d37161e1ae48be2ec47c2b7f6cb614a883739a8fa843fc5a5602b4"; + sha512 = "6dd5f5908e9ca66b7ab9e132dd6db3c5c2ea2e28eb9de211ceb6d2736746fcd50408cd327f098ffe1beb57199af6b60827bc11614c4c781d109ff315ccf9d7c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/tr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/tr/firefox-76.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "817d6e54c256d72469f5e1c6f6ffd8d95669193c3506a36d9cf06756847e074be018ad6dac9ff8e91c7720cc70811df2768124e4df85f34f2963a6a64e9f7d26"; + sha512 = "0222ab139a87a195fcc4489a2d2b1024e95b4b76d4ffd8c63408ab3f4c9ea0e4be019a57e31ef3eee3216fb0217c01cd92cbab9ea33b2d7f0a4660326dd0b8ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/trs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/trs/firefox-76.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "f3d691e6f04658aa09b4f864f0adabc9c8dd6a2fc135065126ef124f025a5ce6768ac9792470d60fb436f8d21229a92e1acb6abc848b3b84a2026179c15ae1cd"; + sha512 = "a50634af2bb7d9cdd8ae8fd268b2bd5f24bbe68e7bfcb810e51921a56db7f831e84e73f93001a12f83a269a27df956df03e70aaf6231925b08399bc54aa71de7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/uk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/uk/firefox-76.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "679b75df8c1d2d84a7cf9950a65869484cdd20b0a1c016007280d08782c2ae2ef393bc553fa5c3c85177bbf922e62158fd57bab43b222327048753934aff5bfa"; + sha512 = "9e32876027449c3b145cf7088b5b9bf7d941d3086f6d1da1dd13f3f06138b1c7c375dd7561d9342dd7a1aad1adae6da3a2f354927be1318eb79703753dbb0d00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ur/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ur/firefox-76.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e4408eb34923ec1f668b7313ade263d1cdfacf1a748b32a6aa54c3c38886c8e1ea750179b0fb6dd41dc92fb419c9307aa2f32a7acce7248e460fe136af7f175b"; + sha512 = "f4331e2c47373a612083697f4a693d7c05edda3f08518642617aa274e735f7a64ac49f28a0c1681addfe488107367377757b12dedae49a14a4752ca726d0fe02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/uz/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/uz/firefox-76.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "30a9c63cab66e47ba4b7f8bad3b798e720d3668f44f230581c564e8887b6674d2df90b8534a1d9b28684b07f1b928585a4c4b46edf1e740e3541b60b5607758c"; + sha512 = "ba7a39e9f8537bb5fff9253d01b3fb2a0c815c3d93fda024d1da6dffcaf313e7c75068c302887355b0e1b498157917be5f290fe81a2c30f8303c33ae2f23d9fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/vi/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/vi/firefox-76.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "dea4cc3161f0d1a79f91b8eaa426a6fd8ee045d843261e7a2191bbe7addc9fa131b2d9455925381957f90e91145711be13fdc3957ec4bd8fddb8252b6f8bba3e"; + sha512 = "4382a78302dac11f2ec626627c65c528d756364b8332c0124cbfd45ce9ae226d4b42eddf723e306a1b1e0b7bb3fe70c9efd3019f91993ac2e140492900fc0ab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/xh/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/xh/firefox-76.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "d1fa435a17e23f3228a767733e54d24ba000599822fdb507d3a6dc35d92485bb87a3a398c12750080f79ea7e81dcf74dc73cc1747f923c0015f4875bdf3e75c3"; + sha512 = "b23a1f3b7fa906fd6dc25638d8cafdf3adfe63346fdcdcf878b9f0f98c8803631fa608fd75086aa7808fa0d4730ea7a89998e2d695b2d1f140a178f14294d318"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/zh-CN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/zh-CN/firefox-76.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "5e236fd89a0c099da13c65c00526e93d152258049f9b7c8ff0387ce0ed6b843504163ef82cc205b01e0a0f265602b2d6ca64aa04c811cc0a6e94d1a8dc952e9b"; + sha512 = "b73405a8872f079f5f69cbd9fd69aa60e614a0e22f1f933be9a8a9e7312fca362549f57af17629548694e92679c763786978fb572faf4f9f6cb72d64b2661d60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/zh-TW/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/zh-TW/firefox-76.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "5b6b876f3dc8c2bd22ebb183cd4ee16a9157e14d93951e840d14a11a4067f85975c72873b82e49d797f7e67c00df6898e423a70360558838e8a18d95377af4ce"; + sha512 = "0069f82c583d88e9630fcb70c481969ada68a7ce919c4f5ab12ee442ca77f69d15179a46e5f2e7850a6686bcd6cd896f2e03163ddaa7e88affe6d62856d1fde6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ach/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ach/firefox-76.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "33ab7bae767308f01bb5d0a5bf7ad73fee8eec71d8393246b704702b81b46240cdbf02c041753e1910bd8171e36f380c77a21afa2f71926f25dcadcb2d6c2b2b"; + sha512 = "1e81c77813d8f489ca2d2d75dcf74ef1085ddb367df885c2d25cc7051d759f26685da89860f67920a49ae4331762be74fbd2293bc2a6e0549187ed8fde643d4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/af/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/af/firefox-76.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "83842f5ca120205597b6eaa5f03e2f1d720a91cf3323fd44723c79c9aa3bb73e2c31054665fb32300f6ce707363a32d5d34859d7407015d3b4456c831b290ecc"; + sha512 = "a753254f0e302af7aea86499c1b03cec34a83691eff48231840a20c0afff1c595fab893d804b83aa0964eb5e570185102a701d31c668764d58c4715b3d0feeea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/an/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/an/firefox-76.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "2d53551b4918ce86842645492072db26fdc50fd4eaa4edffaecf04fbd83bc597c469a5d795c62aaffba4abfd3d130752d96739fdeeb82970c35826d005af16cd"; + sha512 = "e1fa38d89cdc7d7c9a01f8de5ee19316b1ddbdce1f4f868e8ce1bbbf22e68b8f741246a5ba4f2a4e67c959b9575c73acd7b88e918e3be5fa285dc5ed42e9af61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ar/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ar/firefox-76.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "1e42d930aa9903adf8385b695bd1a3aa051d51ad494d1dffc5d2bc04ba95574472daba608c182332195d7d60069b045f2a5c5762b7505e14ed7a639086fef264"; + sha512 = "10270f9783b09b09fd7f43b8f3c4196d332644820796b097ca219819e81bd5fe23ffcd4df988d3f2f3d59fd005e38feece57b7dedb84a78aac6af7965e73421c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ast/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ast/firefox-76.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "d52c316d21089535252ca626b6774b65e5994a62732203200a39605d7a5bace9c681d1f120e1425936be212a9ac871c24f739dd7d91c0f371029083e3d3afde8"; + sha512 = "1df6b8b479fe391bd128cd9b175ddc233b19b61b3f538ee75ba7728a4b59e4cf1ec09bd9576f82df66e89048b62ebd9cd2206038a0387492cf7b1994c36d84b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/az/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/az/firefox-76.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "121c1e51d5b58f9ac912d0737c23ec34471a4c8fe99287606a350e70890edf23b28c9c145d8aa0d29d567753d047d484a0156c1f004228682a347145c1bd85af"; + sha512 = "81305694cb1601b45d09aedb7bf6c0ecdda500c95209abaa00feb2cd2aaa1f5d86f5bb18933f00cbb5a6b676710db4e96495b17141cc62dea06c26483d90976f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/be/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/be/firefox-76.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "f7c3039db50db23a43575e5ecda63643214731703179a42007b2ae44ea20649dc9629bce1f9738f35a882841666b1c3a0ff4bcfc38ed0e5005bb2b6b058b44a5"; + sha512 = "13e5c72791ccc0ee12844d8a9ffdb5ac60a2a9d79bb3f25818f4f1b3b606137b5eb3c8911f81d654028cef48a00d9cf10841465c7fe0304000357c62d964ec44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/bg/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/bg/firefox-76.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "d9853f385468a9644684f3accd7572f081395071ab62b4bb8adaebc9213cb8bad8772ba613a404f9a2f0e75469a6d224264ce5d00ea97fe2f16f8d0a044b3104"; + sha512 = "06a1ba2fc944a15375029ff12ed9f566ccf6a795ea8e63743be8084c7e11004d72693c65b8a330cf945a530fde5298c69c83a0f549edca8fa50d85a904ee744f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/bn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/bn/firefox-76.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "1bff545fa7dfc083f07c8546b5d2c18d1bab3ce4844fb1bb667d151c081c639b3fdbc2122e45230ab45bd5251364b45d937d24a7b285b69139f4dc544e525c7f"; + sha512 = "4b4c8871d5da372ddd15ac410ecfae08385a74b68e142b64e4e463d58b1e60583025f3855375b5adffb8a218839f86cf538a96dd285dabde96f8695af2ed1a4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/br/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/br/firefox-76.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "cd724a5c402333792e5d739ba274c87cef983d3c29f6371cc1788a6b285031c5150b21cab235b603b240da3551c044abbc283f8313c8dd8b0082677b65406fd8"; + sha512 = "e33d927f88d4e0a67b28f27ed32696cadba6241fd3bb48800e68248173bcd7085adfd3dd3700c8d4ddf5be3df93403e20e9c0d57db9ff5d6a141ed58b74c26b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/bs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/bs/firefox-76.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "47770c4421d2ec0035b0b3c6158462042f792f4ac87887c6704be2f3d34c8409c3e0570c6827f87e72c4697f89e5f0e0c574b9e90704798e9fbeb80c20968aa8"; + sha512 = "680587ff748248a665751f004b02d0b0d4e28f90f672141961d47cff6239823431b863e8ba702cad8f43fa70b295ad69b47954d2abe2fcec423e68f704fddc6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ca-valencia/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ca-valencia/firefox-76.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "9d23f45405e98eb5d6534d19e09237f7488cd9a6310acf85935c0f40132a91ba2f355a15a46742796d1f397d65e4f17d599aa81ccba57f2acb76da80c2d95af1"; + sha512 = "3f740ce2af373a3154372796edc4e85f8bf87b83cf4895328dcdb357aa4214e7711cdacbed596c4d7a1ce1ccc16bfba32fdf2d38749f3144faf747d05e76e208"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ca/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ca/firefox-76.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "4f27d129114a4db3f597fc253447c6f27bcfb566fb197dc4dc26a984f1abbd868242b1c0d077e6d514efe1e2e083378304ff490eaba26f669ccfb5a744d3899d"; + sha512 = "ea9b71eee4f6e967753acf4e9f0a4014eeadadc6d1bcc5fad11a5975b778f92cade729338636d86a783ca08b0363942d7d9b7e4ad65fc3186760189ead9bf0ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/cak/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/cak/firefox-76.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "522852f4ced9302068b6251a33735846cbec73bbbe9ab0371e8456d3665bcddfc81bc4c258ecf4f0e5bc8f6f15ed27d3e4f88ffe471e9e8af4beeae85aabc949"; + sha512 = "bab4ceb14749b67877a99b96f47aa7a9d6d65281e78fc416d3bc3e5296ba2133d7548ccfd4ab32637c976d178fc911f55b6acc60dc6658b4193e1c6146bb641d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/cs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/cs/firefox-76.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "1192630fffc7bbc3232c8328e066f8392f967da5a2254ba726243ed7a681c321747a39397dec8b11c5ddc4d725445712ffbb238677856b2ad2ddea41c8db090f"; + sha512 = "e33adfe91886dc66f09cce26dc33ea26cdf432915674541a8fbde09cb41d2b14c0ebb3c41683cb1c29908dd652c83c92bacea3b8cab9bb3e8d9d6010a19f9646"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/cy/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/cy/firefox-76.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "3a327e31faf8eae17c60f7787bd53249957e5177d38ac2138cade1454ec4bd870c429215f1e0a5b9cd124aa660cf4d77a091ee579d865470c5cdae0703086b02"; + sha512 = "1c5b5d518914fb69b6a978fbb8530589c0aa117da1f2f7398696fe29c6177f0ee932f88bfabeab049bdc80d6e457835a492853ee9095b10f12b68172004a2b73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/da/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/da/firefox-76.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "297291ed06c290fbd9ad6172afb790e8f8a619ff0330337f5e777d1e4ef17ef52ff1cb94b2966161639a28221dbc9ce2eb28bd9ad14029ebcb878f79053386f0"; + sha512 = "90d385bf3faaea5ec6884c4042a72e6a23c68f1454309bc933670d0fed7a5aac2210ab4c6b23755d883fed385ae0f11639a932c2540687b219aa009067a3ab89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/de/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/de/firefox-76.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "7dec33f42715250c9a765c7f3f4f177101c69f7150661fc844c4742434a8d063fe1bc9149adf81c2729e848584fd6f68d1cd3d697159a1d5b4ed46d8dd9ae9ed"; + sha512 = "7fbc20a9cef66a6760fa314f2d074d2c597b420fee45fbc8c61a85f963130564e18d47a97833299283faf5c959d12f70e4f99089dabcbc3d83f3bfbefaec0f63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/dsb/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/dsb/firefox-76.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "b5d8c78df21e8f8f1d96ddb042dcbae44b4d622d6d39a0a3d7967e89004e5e229aee84842b6fbacc90ae3c65bbc252a9a879b552a2546ae168d7f07cc312d207"; + sha512 = "2dc3dde5159c64b61a4599a0ee2aaf3e4d9e71d7a3913e086c0c187cca48e8bbaebf7d4253dab7a3cb4fbce55a1119e3f4c30026671b92b70059b8b3256e72db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/el/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/el/firefox-76.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "8888a897dec9005edb469d27f40ce9ba3446c4ba713401f40955483f329114271c34a832afb93b48e0e41adfc1910e4813f79fd619a085ea15443743a72eeba6"; + sha512 = "73bfdcc5482d5793c0c5673738ae08cb6a2187e61d8ee057ef89f4ceb801bfeec48b8c0a9f48bdd996bca8ae4a232afc61c6539a1c22c7bf96d06180364cecc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/en-CA/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/en-CA/firefox-76.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "713522e5c5305d111bd1eb55bba42cf201da74641593506b191ed1ab3eace55c1ac9c9a86182d667d7eae2bb4cf6fc9ddfa1ce4c8d31dcfdb0f2fab587fa6a8f"; + sha512 = "baf1441e6f6ce7a31ce5ff12b600b61068bdbb9beebfe74f6c9b97ed2533ec734bc34b702caa9e9c59bb4563bfdd64c2612151793067cef3ffa1fb0ada312e28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/en-GB/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/en-GB/firefox-76.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "021b66ac6720deb68e45b1bdca86d8aa7db2e74cfa7391daee108cd002dbabc3f6302f380e6c029c7b56781dfd9bd34f8cdc1135851297e4dac9dc56f762eb69"; + sha512 = "60b276043c2ec3456b6b06acd2edf6f3df5149824d20c33974f3ac77fa0ef81a03f99f337add0209bb88b390fbf4dec08a30da207ad72ef91c9a89cd36e4452d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/en-US/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/en-US/firefox-76.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "feef8046d08aba827f6dd2510cadea53a89983a4889c9c2baad3d88123639b90c8052b552e2bcfb03b6e9fb43ebda29815825ef7fd4d9ca867f238cfaa0ad1da"; + sha512 = "26eae1d8a6f9e988695d59d418749fde988e48514d7c183039ee998b400f480dae16e9d5a590ff4364954e57a4008e7104cece212fa81fe73666d2bf3f0c0020"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/eo/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/eo/firefox-76.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "49b0adb7c5dc8e1b7ecc121f65e8a6853f497a9cc151b4eb9ff6631af33b12f7b00186ac2d13390cfcadd9fbd1b361a597ec1d9da62b1a0466d85d8e313be4fa"; + sha512 = "55aee2c68a1cb6b7e374f2622c8aa30a8f26e14ea0f0119d97bbe6e807c15c7df94ec74c0f31ef071ea7b112c3bd8ee501c7d7b33ab5eae9a8126b2fc9673047"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/es-AR/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-AR/firefox-76.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "a74988338fec99d50f5a16ab6c59630ec1e535338da3f23f05c7967bdeff41cb058c238ab2e873f96cab93db821ab066e6222397761578a12fa73b42c0ffe3e9"; + sha512 = "dbd5aa229d0123a26290330df078967bff4d0484bcdcc3eb499a7cdc82176b49a2362a0ab08e2b55286141b25c8cd4970308cf48a1143a5af788eced5b84b83b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/es-CL/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-CL/firefox-76.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "b4abd3f7abf1869bf360f5987e13c37b142b4c8afde51c790feb2563351a4754f385e0880ed51a1cd7aa3a5ed907e3cc22ff3c707d2923c47459c977cfedeb08"; + sha512 = "5082bef600a311f560daa09b31945961766a0ec63ebf9f38a0f0e76560fca2a99594c1f26fd0b57a2dca0c94d1991a91501ee3e931740e59010c93d46d3e8a67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/es-ES/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-ES/firefox-76.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "8a9c61dd9329c983c394c33c97c962c703fcf51a283dce09bb781d96879450adae5d8d78ca9d0d1892380fcac7ab95651e37133a0f836865a13946e2cb8a7e39"; + sha512 = "87ef420353069862cd539aa8e53f93f50330e0c68bfa4a56913e9245bd4a972bcd271a7c159218f9ffb78c9d9be3046206f20fad4faae3d76e4e9687530ea6b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/es-MX/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-MX/firefox-76.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "a1b7dc0eab0d4a8c713e27620235617a244ecadd62a125de8b1b60de7811a4d7e65051569ad4391b2a312107cb750c74d4c541c580f3af86b88b2fb84d93ce67"; + sha512 = "d02362e93a290f34063fdfa7af8fea71a6cb92b964b872bfac8f5b5665dc6ce9cde7a38a445de1074fa8673cc2c0243af69e2663542c5c2fb8e53f2c41518cbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/et/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/et/firefox-76.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "181aaa954ff9024a4efc211bba348461c28b892b1cc04eb50989cc8da78d88a350341de520b4a60da096ae399c28ad05802aeb73cf133171e8a4ea2693cce5f9"; + sha512 = "0064c56cf6cfc38a5eff201f16df5c9037da8089655df5c88a348ffbeaf933941d5ce99b3618293d2154774b483298b4c28616c6e175fe0f6c9124ce00bb16f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/eu/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/eu/firefox-76.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "893fa9700ca874b2a460d830f2e10f7999a6b521a351a88bf480232ca0270581f4ab334ac2d4721e3f5fbaec0105497afd5ef09b13f3b96a1e84556db79d0ef9"; + sha512 = "bf5cd434f45bd057de94bdc219f25e4da878a0be58c4a864a22961ac5677d0a679204a069220cdfb353d319d493e10d3423888999de6701e33227b1dde16e43b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/fa/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fa/firefox-76.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "fbe8cefe9e626d07f360b1ab30fd04c8628669f5164d5dbfd12cca72e17e6454de367e170565e0d7f1c30e300d315f54d7c6cc06c8367e6d0c428a994e9ba067"; + sha512 = "402f980bbffd145e9f6f832ad4bff8c6dbb0db9a77a303ffe16c44b449668e621c2edf75e41686cc69684069efa10b7853d57ed5ee928298bad5ed27c253eed0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ff/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ff/firefox-76.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "7ea337b8f3cf536749cca253e063ab326e66a0a33ee0bb7863ba7c46d7d9ceef443bfec0551770346701f23f5adc2750225e8961d6fbbb48492afe7ec39a1272"; + sha512 = "baae62b09a0a7fef88f64b43b854dc8c4ff583765338c4dd1e00db9c7717adfb3d8817c776cfc88f88ae6865d490a08bf4d0c97824ae3280835769ca04fd8c71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/fi/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fi/firefox-76.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "c97d9ceb5a98acf54bf37c1397973c2872a039812bc591979b44497e7f2db1cf7bb5fab75b4a0cb70df2d48eee4cf5fc55def69c22da9a0b5964e2af81bd0457"; + sha512 = "161da9aa8cd66a9f691b218f5d11cdae19fbfb04f44a77e266731afdb7202af98f165e33107af15ee6ced477b0ae07d78f91f57d14fec0e9a6de24847cc73976"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/fr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fr/firefox-76.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "15081d21ed77c376257e23cec42ba26023792cceb634b0d0b928471e1abeba17d9245ba5454452b17e786e576e19e8e47f20478002a3df2e15c56e8cb19faaf0"; + sha512 = "150677eb9c0aafb0486dce2c846e0997f6eb1ccfb022a9ec2914628fa2affc32801fc34f0397fdade3cbe3afd1897ead515bc240043dd1cc7b879d92566a47c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/fy-NL/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fy-NL/firefox-76.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "c352989e6ed3eeda8ce724ff110bb09c2ad3ce4a5b1f45bd9335c1186dcc1c310efdd24c9a2adf7a0f31278b3989d79a683f7f770670c8b1419967ccc2e0704a"; + sha512 = "b03e12ebeed5af0150715176e32a7da3ce20a57d227f3ef6da369f6fa27059cb23a8af0b4e165027598894c572d02e4d58e8fdb9a48b86d3bdc35385a249287f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ga-IE/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ga-IE/firefox-76.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "ba27396ca8f76533033bc78066074c3aebcd687f1621b14db92a4952b226bebec0bd399f697dac92b71e14e91fefedfa6d4188dc067bbd575e07317182408510"; + sha512 = "7122e4f914f5e8d42393a86e61baeecbcdf6fff646ddb38cbb2d7324a0be90d60bf609824f2dcc696c107f856a867e0ac9717fc098b1db3571bf60fb6d3b8a28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/gd/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gd/firefox-76.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "f18b4acc47fcb9135ac28206011b6fb3fef5dd6640fab3e88d8e8f9dc23b19d427fcd461f70a00750c1739b3e3f6874c171dacd9c54b213eb9076dbb9a511b5b"; + sha512 = "f35b295657bbceb293cf1bb88a140d629f0b1fc654cf3f1ebcb5d9de84f40b17a9a7bc8973dc6699c4c6609e5cfbb858df52c0153ed4dcde6eff2e25c38f7ad0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/gl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gl/firefox-76.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "e4bec63583908fd225b903e45007e29f357e00fe7901524d5fa15bfea04211f55d2557c1ccc1fba28eff1f2dfc5b364cb7c52d438428c26f09aed3592f817c50"; + sha512 = "4a4a37fdce02108118cca5fddc2f2ebfeddb8a4fad97ef0584fb85748e09d43abe79b0d3f7b5250deeaec8ec0b2e698771100dca486831fdde09f41d8d77b093"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/gn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gn/firefox-76.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "dca1a1062e47b8644a7e1a772f6abec1ff615d8857d74d576baf9a515fbef814f6d2e89878a3ea2aa4a7efb6931caecb3845f6eefec91c70299c463c2141689c"; + sha512 = "6c4969572ce922eca81344f1b05747d3935f88486082bdc64c814825af2cfdf27eac7f8f0c25edfd4d249b9f469ada0b062abd0aff02b9849c7055e40bec5b67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/gu-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gu-IN/firefox-76.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "efa6f443a092585defac47cb75d8ce85faec76c2624ecbf4cec3b4e8ffe4e582de0fb55f4901bcebedb0d991d709338bba212117fe59b3c6496fc5f35c1a7694"; + sha512 = "a5d1daf151be8d23dde730945343bfd507ba29314ab8acb71e4d5e71b534eadc573eb4eec1bcae0ab0bd72735cd891b72d8d931b634680881bf65f63a4a7abab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/he/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/he/firefox-76.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "ea76707fa795234f36088749cdc5a139482577d4488d476856cba926e40ce24d020f76a526efeebfd8a5840b9ebb2a93d71ce9be9fa8cd9255e6940074f22a8b"; + sha512 = "87b6c4a1dfdb49bc9430d9740612d24ec9f61d74bd379caebef6d19fb3492cfd1a4c8112126ab509af1f35e3f6e10062a786a0e5397b424e057e9d13c924fd7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hi-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hi-IN/firefox-76.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "73bde105b324df05adbc581e59c1b723b1dc0ecd2b35b9029ececdb83acbd5cb9946382f78c9bd02a480635c58c9578ec982d61793ae7e64e5cf940c09c5a508"; + sha512 = "e2b96ab462227f70f4208b52b144d852e657edd3fc9885ba6b4217461a414a6aac6dedc206b4fc82d269c768662ce94ccc6cb3e0f096250d074b3d91ffa98c9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hr/firefox-76.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "e237486d9cc6418d213a006e07c23ecaa3732496d169f7a24a568866e1ec1276aa9096c16aa696baffe689096b8321c83e9d47a119257effd77c3b1b938323bd"; + sha512 = "1fcaff37d60936b68a6f2e368c414c69718e114bcdcf8f71114f5e3dfea1eb2fbfc8b5e237406576daae74f8c4371d8a824d2542dcdd36221c931a86c9ea7175"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hsb/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hsb/firefox-76.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "be2a1bd69573ae49b011f266402a5f185a4eb8eb3e9b506a606b1444ef54091b36023e6d2dea2d118fa4ca5cc58dcd1afdf2e5dcbc3d38a7ceb776e6e06756b3"; + sha512 = "5146346331ed881f0f85f42bb43f4b4884cdeb659b392db28f7a534c685a579405fa482ad14c6c4e20422e8e22b07f2fc35ead1f3756539dcee797fb0df8c1dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hu/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hu/firefox-76.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "405ce0eb8c7694ed2d9bb5548f8e56d63c14e59025cda561bd49f0deda1bf0b280c344138d154510ac8ed124e4ec95528f84212fe1634bf16477615971148f17"; + sha512 = "eb043d50e735f1b99eab7cedef601aa302dce2b0270f08a9e93c1b1fa9b85da87305aa94e8db638e81dd8f6d9bed96b6c22f87928026cb042964bbb51420fff2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hy-AM/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hy-AM/firefox-76.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "21d7c5343f62cb8a841872470013d9b836eecb0f780794108f56120c4bf26ddfe923400e630f6d981913d06875e7473dedaa3d4cbc2f9173db80ef34c3a6e0f4"; + sha512 = "eb0553646d6b53a41bff160379845b0a21c28815ea523ab0de21230ce6c519b7ee07c9d97ce26f2078f3c66448dcd1c09e978bb1f748e548d1b5c2e0fe4e7f7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ia/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ia/firefox-76.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "a8c070f164ebda582055628b324e03971602f15741314ce26024eec0539a92341020b7fee16cfd849189c5c106a0b3dc1fcb04d3177d7a4b06bd0cd2db74b614"; + sha512 = "b43efaa2e45de94e9be8b8b9bea50966b0fa089dff9e25671577c724f45d0dba502044c2da7de32cf1431a38aaa92c2e5856659fb7f1ee557e38616beb4a9c96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/id/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/id/firefox-76.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "4bc7b360f3fb9a8115541da54f867c693e7c8c98bf24685ae9ac1c052c4cf54126ccfaa3aa2c714a0450ffee0b6198370b1092ac99ba13c289bc46a202ac1189"; + sha512 = "5fd68752ab6309af0bbc6d523e2e251c8378ac0a6c2ba0627b37ddf7dbb1efc444901a254944f4384a6fc10ccd1909f6312c0fd7c9e700ba5f223ccdf76d30d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/is/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/is/firefox-76.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "c9a1c9b03d3e7089a12f2ccceaa525b5c9ce62dc1e602a3899914e8adae571bfe12dfe7b2b5e54a4b2de01c869c33fa1f7478d1bc6d54e4dcb284ce1da7b32bc"; + sha512 = "1c128e7fffc103347329cbd65037e798292d5b0e843f878ffc44d9d53c32f1d9a917acd694cb3662ba0089e79063421705f30d39e9736c88b9c439660147b949"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/it/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/it/firefox-76.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "0adc5cb03da1e36650c90de0cd82065a014bd944da4ba29f80f2fe74eee91fbff13378011c938bd79c110bacd0e04fcb5ad6ee7995fd76bd5ee98cacf32c2c98"; + sha512 = "890812041bb3ab8cb0ddc6a54222fec9f4e342f9734f3c92f9d0452122cceff739eb46d92ebef5d2571509e4c7821704a64da1ec3dfe8150193a6dc5b4aa8477"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ja/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ja/firefox-76.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "fe743972968881f327812dd0a81ffb8564e0fa7a6f739a3a59dd039f560078827ddd36ba057b80792347b1cb19e262f34c276f6ce788453089ca0d8cf8d69a55"; + sha512 = "13703e62dd8d6728553524723828cf7bd8db672febeff63324c93e300a9ed6c2f3b1919d6f4bf8f1f74164df278a0c95ac98c348531581b717ab09e921490a91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ka/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ka/firefox-76.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "0715da694820f26550e0becaa151c19d366954fcfc2af7084b880cd12b2f031b6508e69b3ff687941f71c0b3467f5d118ec3f79be2cea6cdff22d2b5e4f050ff"; + sha512 = "929b2e3ca70c8d9ee11405b1366faf957cde5075dec5631a49ebc724d4912291b1f3826ee01e5c90e2d68c09b2664599ed73e4f597298ffb066ff8419a8056d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/kab/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/kab/firefox-76.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "2de6d3cea7077ddc896cdb95104a122b85f001013c0f59902b049423fdb370d5090a8630501009803592935fd5f90ade7625ef64b3b0bfecc712141b10f2366f"; + sha512 = "83900bd13db0731508e516bfafb5bb540a43f6b8ba9c9e2e9c0878d67e9cd8f9b6b496e5b77ccf314346ea3089f6d95c1902b9280741ac3325638e972794872a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/kk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/kk/firefox-76.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "a0a1a9e7c2fda1bc92bce084472d432d4007fdc96707d7a926e884521c4ba8993374ef55179b7da7267d14699f079f5722974edf2713d449a59b76f01fb897cf"; + sha512 = "a62767e00ba2c0d522f503331c2b6eb4cc82d3abb4879711c2d9f611c8454f2cbfa5e76707e6ec6ce54df8d40f64da6ad8af2e15079ea75b3b8ec55e6273ef2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/km/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/km/firefox-76.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "4008860591482c70b0194e565f3f1fbb30b1607b486c8a3afc3e3d9465e24c3cc0da2c889905a7cad349484a386d7a2082e86e29f41fba84073cabcd75c5e358"; + sha512 = "03a47578e51da36b51bbaa98e36927a1a5b3f216ff6ed60c337d905f414902c7638cdd361b5d8f4c29960dc93b19343b18567c7b40106f0e7e95fa941c0dae88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/kn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/kn/firefox-76.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "2628e52d65223c5a1941d94435398041cdbc7d5588a2227a9f17227800576a56975d5db2283d295e82e63e10c4ce6d3bc7999329fa26dd3c8d44dea025f96640"; + sha512 = "c4cb00f4383f73c65930ff3626342cb53695ca4aaa29ec5f80400ed4d18e4dc87dc44445069c62265112980ac7a061d0839f542a792aa5d294561b201445b677"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ko/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ko/firefox-76.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "9b78d17bec3f243154cca1ae1d955282e8700dac9bd93890be6fe92852af67a1f81eaa5dc2465e2881398508af90f67fcb2c90d54edb1fe874f9717bd25dbe2b"; + sha512 = "72fc61f2429fbef846eec40e53f50bd95d3b6b728d78e2199408b052b0d85ea66fbd6d2a114cd046311f88b419eeb7447b062cc9c5824cbae572debe872656db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/lij/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/lij/firefox-76.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "01e4dbb561a962b4332cde78df74a229d6aae4cfe56bd471262fedd9fc16a948415e6f993724ed53eb878a999020b22f761f4ee3e6f006ae8447513201ed27d1"; + sha512 = "9192d46b8b16129243ee2f5af47cd0f8fdf9af3ac953ae6481452cdd1f4da9ad9b75aa9c1b96416cba47dc16ca867db3135da810f32df5a33bed233a3b68f447"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/lt/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/lt/firefox-76.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "c17fff73a4f72378dc3173ea0ecde0492937a6fcee4108935126256f0ab085eb934be830907f1f4464205673023ed3cb21794cd540533f4e8defb42325b3bc93"; + sha512 = "89a5c07f1c1b7b389bf7074feb6b7c29470bfb143b720503783c35cabb36fbd0e5c3fe31349e1004728f128db36148ad6dd07f389099fab17c8a6d078c37675d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/lv/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/lv/firefox-76.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "22c90601b8162512ac045ffcc3d186dcf4e0d9d2330885e07f7df72224a840073415de0100419b981c08b73ba4c92da01edb49d1dcc9efb1abc0ce47b94da012"; + sha512 = "1bc60805513cfd6ab6d563108fecb176766e77bf10203c942ada3878d062e6a75c54129505fa63f16aeb72f4a1c6b360f7e65e8f23433d20fe134692e53f4210"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/mk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/mk/firefox-76.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "a185e91441e302b9111d558c3ea0d7601347e843393e00adda74a903ad0f93a23ded2c8e61c5eb628996c0ef5b0fd63209fa9fd98f3a0040a9a8d419214e5df6"; + sha512 = "811449cc14b5bc3185c56a8ea2b640a3fdfcb60b309ae9ccb5498196677e1431719897e3e239dec4ee964575187430c1a0a1b4fa48fbd29dc874a1edceb7fd00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/mr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/mr/firefox-76.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "e8d5066dcaa0c7168f804d1f1047435bb188c6daaf3f8aa472654b617c7d4471f7469ac2560782b6463c315ccd9ad60efacc8582110bec9279cdd16dc7da7d09"; + sha512 = "940563e7a93a08372790ea3f0403c4facc900a6ec680c0e7d71fa10978fbe484c448f1e7bdc8096e26528a969178273223592daba724296f423b1293b79aa5fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ms/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ms/firefox-76.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "dcdb08020fca5a43581b1900316cf7acba285a87b9cc0532ecaca8f85d1ac3b188eeb9d65ba68557d4350b7f2e0fee478dd5a9ababfd3c40ef1f7b4c57f08a39"; + sha512 = "ab8d456745a815934736ae25cf597dd6eec2dc25320dfe99c6af804823ad71b482b19eae071be08763c82678e7c966bd86ab1bc285925945b6800ab725dbebe5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/my/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/my/firefox-76.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "d7005ab40feaa6053af8624130ba4e5d60e54978452b6e63a658afc8321c9f4a7eed5406f07a16961f6051e794943c6ac6582e1723cb8a518332557a94dedcc4"; + sha512 = "a8b4532eda52b3543767a28fb9550b21324c72976b71fd2101665e0ca89c63c4b1d8272a9f425feacb3bef188b43edacf603ac87fa1a3dd19c374d22877ac02f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/nb-NO/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/nb-NO/firefox-76.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b6e0894cae9d257ce4d0becdcb65f9fe3693a947cfadfc88eb51ee93a4ade9924895a7f252317d145304d5bdc866294c437a5f03c15982fef8a970145678aa0e"; + sha512 = "a68193718025329d73e07b7199fc6a11e4834cf3f0ca327efbc182d0b33bff342e8a3012ae180fec2167f842781ae9c6d63d29e312e2385ee06e4ef25c851fbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ne-NP/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ne-NP/firefox-76.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "fc7a97902679402185813d666ea65cfa059e4121c126a4b82f2fc70ac04790b7e73441c4a3e7c49ea6292e049792368f7abb9924c74b52ca342d832231e80c51"; + sha512 = "5ba2c7da5741d45b376de87c9d3abd65de5a74885cac25ba0c7c8a81d681c0dd0fb870764208b62aecbc93122daea5cd7dba1fec41a1d97eda0dc674f16dd6cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/nl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/nl/firefox-76.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c96cfd08d2b3bcfc3380cfa4e7945c92ad6c1a1ca1f47db6977769792752a4f64ee99f90f6f904811ff3f1b7b2d07ba570ad1b80337d22e34c6bbb6ed0e511cd"; + sha512 = "941cbc8f65b1b307f998c853010bd373541aa8043f1fc97e261453f7d49ed7ad9880e0cd85fd1bdb5b4b038272e210d9eeb7a5a24f27f1212ffbfde494c87b04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/nn-NO/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/nn-NO/firefox-76.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "7e10f521aa2ea9900d03a2874861f079171a62860f3508edd7dc51c39db88cef7a603ba0c6ca69469c2593182b027d354b6a8c13209beabd51a8690717d11eb4"; + sha512 = "0c0dd5ce17626e96c3e88a9771272f60e93c7ad4f1f40710d8b70d4f40a58010933de89a2b381dac94831db786621a35ef6894f46f1b19026c0eb7ce0b172459"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/oc/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/oc/firefox-76.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "43413c027b618cd5ddd36fa42fa26f99a294ce2f6f33937a299b55d698b64b6e85d04954101ef27e7a739c00407d7457322e3b32d38a90df87529372c19e1b67"; + sha512 = "169b6a1a48b2711ecdccdd6a685ee10b5f602d0300cac13b56feb331901be88edf6e8386ce6e4bfc108f419de305a5603445f5b7561b37358a75adb8e8d418e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/pa-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pa-IN/firefox-76.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "fb59faad43d729eeff12e1eeab15c0712f2429892574c526c1f59326518c9c652475177c9aba14aa591e4c449b133a6a8fcbef7bbc8d0c89b2b4d5dffd053abe"; + sha512 = "96dda02dda90aaa1de2bd31e04d87b37a179773d1f3f8094d33fcdfa6ffc78616f9d7539b4405911a6dfd31382cba91ce34ca6680c36e7aec22493d3bf6f15fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/pl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pl/firefox-76.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "406097bb810d60a16a88b675f6a893af84e0de905c222534b0e09802ae5b57912d000188920b06c4ffba198af0d096e42f9984222a94f53d45db64f41a4f3f9b"; + sha512 = "326b8b65388b6e7d8215a665fd6acd9ad9fd5a03edfd6ee428dc53b217df7b108a351094530621c5b78f3cfaed90092c17e1d1c9656a37a10c108aa441ae0e47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/pt-BR/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pt-BR/firefox-76.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "519f9777303a5dc6eca8933406ff0ffbf7654c75305c16e13f1600550d924569ded9dc6ba606050c9bacc31ecbc0d6e43dd91dbe8cb3b587ab71d20467564cd5"; + sha512 = "70a56009e39e06b701de62c7df02d3d648e04ffe94d2718f2f2cc4ee24f19e832decf0371425ab9791ed5db6a5b56d5f221163d3bd67bcbf6cd48617114353c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/pt-PT/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pt-PT/firefox-76.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "92500d0b49090382e261baa0fdd4620e5d9e4a047c9c7098ad3f7ce34a5e97bde419a87019517125239144d21589b428c11138aec691328530fd41d5a78cc5db"; + sha512 = "33a770a0ea0c177c1d839056f4045e41e8e2102e840c99c48abd2cb49733d44af2753f040696e859eb724dfbb6dddc3357bf505620f74c0c29b92211d8ab9572"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/rm/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/rm/firefox-76.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "6b8f3655d962612a047bb7d961ba74b362da0bcf740362e8f31a2263b0898da90e051951cf5894bd8a493f40d2d89fd50d6060eecc78908518f8611218a27eb3"; + sha512 = "233af09f6a4ebb88aa678362c85244f1465d5da57e193b26d676543d0d1df9e673b25096da705178d1784cf3682fb6a1d12564525b77723eca0924bad7ecb0e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ro/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ro/firefox-76.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "4f2e2012136c9821792241f2189550843320b52c44905d9902c7ef3f2be21f26dd79f930b719f752d3d4b5e7ab6ca8429d12ba6120f6bc365bf9e2f496ea85e2"; + sha512 = "6be29acfa925e3524c83ccd6915523cb8a37143855361b46fbd71465002f8791426ea9985d34486db17edffcf53d6197b7115cc0dd38a2be16502d07d3b26cf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ru/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ru/firefox-76.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "7ce2ab97b3483b9632d24a979bbe051d8db539329359f91dc9df4446db0b4c1201dcbc6422e1406400dd3df007e5c3af6bcc8279966cf7448671608cc05a4231"; + sha512 = "46b2a7b8370fc173101dd1e78ce12e363f80a852d55b2e6be9f5b31232888750e07937afa60bee2571e0b3b18ca2987ffbbad8c6065d4bb71064c34acc46c3a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/si/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/si/firefox-76.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "65edb310b0c94dbaa2f5ece2eb6593a4fa7d89b2fc9e4d3bd8c77bd43dd4517d09895a7a325b9d6a1b5fda965e9d6e3c10f7e4b889b582ad4aacc2061db6a443"; + sha512 = "934144d99326a139d994518e5aa763cf32035a7d310fa94eba7b4a2b7cf40eaff732dc20100f7bba35dbf415b7a5fc22c5122ef40a65732566063d4517321ffb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sk/firefox-76.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "4e29357906cafb6df7dfddb4c668479d8e52722a4771e043a1d9e0c254e434251768a716f7791c6969e34c5004f276d1b3ae8b8c77176bb1ba76409295126671"; + sha512 = "a892ced0d9c5dac7cda65cd67abc1232d5be3ba8ebc2c98181f504b68d43018fc392e0e5b4b12ed22f1ca1b6469be83f68b12e60fad28fd42eba18d9b8d4d7b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sl/firefox-76.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "c84cdabcb498c6a387a08b7ead1cdadfb68c173a955e34f4118a4d56417918649b7ffab2eeb88ddfa276656367f8429e17ddad4b909b1f39e120e41d1caca56c"; + sha512 = "229175292f435f3cb1db7ba671933508ba7b4daba1aa5db0ed9f03fe8bb83778a0b951b0248a27b4e4a7beaa374f9bc4eef3b2762596b22bd45045efc3038be3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/son/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/son/firefox-76.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "3fdf243217a00baef75aa36b9bcc257e1741fadc8070f5e50a4573c3c4b6b86eeb4405fab327b057e5d92543a0643429fc1159d3b77fe30ad918d8757d8970b1"; + sha512 = "44d585391132de3c4df67bdec4a5062bf71af4ae32084e0602de93d75c279e8ee76a022aa19926eee03a31022b4d7eb9feab8e349c2a6547b85f8a42f5b122d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sq/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sq/firefox-76.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "f8c32ef45297c86935bc8b99a9d6b8e4804320f76e085e70f988def0ec003f221666e8f7e34e1866c52c38dc45a3b6a39397ac1e81a7033a74652a1d42d32355"; + sha512 = "f0b04a81888f8cac58e311f9f4fe16111a414f541bd1a5b3dc2fda028cf85b3a701ae5b91d223a3d6542580c1bec5459dd4dfe90cac517d3f974c1084ed6be1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sr/firefox-76.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "10dfc0655723a00be5b5e32a280ffc660cf464df0be0686601b2bb502730ea5ee6f7c23c3f40616e9df3c5eb17638b841cc70e8b2271b442cc8b95927191dd62"; + sha512 = "c3fae910a582dbcb5b8609dbfce0d759d776667e34c737755968f1a531e83b58b098b8a88bd948ee820ab76328210631b7d85ff65a88be630f795522831a7014"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sv-SE/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sv-SE/firefox-76.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "57e77414cd484560716ef659271e28c14a8f02f7189bc858b4293a72ac07cb0acc77a6e719c25b7a9b76cd4da6b3b56df8a75236b6ddef0ace9f87113f4f8d72"; + sha512 = "fd5feca0a4a107b018329ab2fc1d7eab9c0e51d2660d8356cba4792cf73f1176fd19411580f98a469f47eb6bacb2c311134194ee612caa7ad8a5a0021b062420"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ta/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ta/firefox-76.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "396fe91815427866908619b33df4fcc503e0b30f03c567a9d4baa51bfae19d91de816cfbca4bd94a48447c7abdfb56d52a294ad0b8fff8134d935db9d6a81221"; + sha512 = "c54d20862ec7c09e4ceaca3afb120938beb7ec0bf1c38e651355fad1247c61e75acbd0fe6b96a17fc19136720ba55755a8bb04726c714c812a333c9e300b9463"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/te/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/te/firefox-76.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "87237a320372b1c34c583335335b5b8e85eaf0dd774883b0b0c74e883854c1cd14d459cc8b84db2dade7dc92b36d176c8f30bd17658f6e5660660b0f167fc715"; + sha512 = "a594904a68ccd42f5e6c0a829100fb99e37732a29775273ac202fbb65785549bbdf638e8ddbcf6b7269161cafd229354b5b350be8e2f2360892bcf17ef777e07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/th/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/th/firefox-76.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ca5ca4be8242e1fe9a9714b117965b67ebe86b578381ea4339f378dfe74e08f268b63346b5d3bcf30cf1c108a933609d8cbb393caa7f7646557d265c2b40decb"; + sha512 = "45b5fca122f7900da176ff3d55dd70a1a2d594fd9119b75760dc094b7a254e21aa6455c8370650f1b17d69ec1e81749881635d176dc72a45eec8f632d3a2e0f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/tl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/tl/firefox-76.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "99322a06d7122438715b92f176b07203246c1e15a0a42dae4349f424232778f3d2b9bcd17a7b239b8eb6273a6ada8e259480601258275f16c567d9cee51fd16f"; + sha512 = "06b3fd1f4cf030377854ea39bfe0818322123d53299a3f5d7308db32683f3992240099491422858c3104079b566958dfa60b58248c0c6adcd0153d584429fca2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/tr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/tr/firefox-76.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "95a86989879b65c85032e9b8ffa9290d9a6fa1be409786b9782b284e4c0fb894719fc464ef7e6b96554e2cb852a3276a8e042bbff02a17bdb44aaf9ddc170361"; + sha512 = "2cb1d03ced3d88344e24bda60687e9a0c34aade38fd635a63ffea3f072188bf6f5ab76cc7c54188280932c225f1e5c9b7c6cea4d2ee0b1798335e84b7826c886"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/trs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/trs/firefox-76.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "aae0652f74e82b0cdd752cb8f0747fd4f36f04fcdc50c3cd9d084c6418694cd3015e8de87d851605f5cac0b0159ddd8f9521755d81adbee0e561926b2ea1d393"; + sha512 = "6fa6eb60bef978b82e6805c3a083ee40418125416f139bfae2695c2a4b28e34081a984e8c8e092e449e28fae28d812ac2c76b808da83f79c2be4e7f5361f4536"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/uk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/uk/firefox-76.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "df038e62ba6284245212f23c5458b2df14547ed532ba66adfed2297041ae7acf693a6e01a6af9c16f4a2e141806d9baf3c4fce91bf3316e635da7211ba9b057f"; + sha512 = "e412938a9ff5bca8b770a83a2f7b9a03f92fc155df9088f60d758aa41c47bb348e331e34c8b04b1b2b5c796ec34261aebedc697c058bc5457265ee7b87d2d773"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ur/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ur/firefox-76.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "1bcc2f2e8f5e389c29fd0e7f4a5a376d91268e326758b396c9d829e59d1315a52df0449fe49e81170713f1161946c2ed224560dc96329f30a5d13c8413f26823"; + sha512 = "8a4d50ceae88d1ccb354135fa10df40a2427bc0e704dca5b7ceafafbfcb3970eb57d4d6eb427330a2198894e67e2da2532adcdf5f900f5e8ed15727e1dc4fa84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/uz/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/uz/firefox-76.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "d957e4942ead1634d792555f57c6dbe54972fd9a97071e63901b422ed6b723426b27fe85afc8c33d75087a502112a4b4b2e0dc3f3a04a9d44a48ec867dc78cb2"; + sha512 = "cb1be90d64caa7ac445cc7a6b3549350eaf8859e7a4e662e602eee4218de98944360bcd828b62bdcf18a5a602b153a1e4cfb0bdac92a802a8b071f349c88262a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/vi/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/vi/firefox-76.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "e3209382cf01d827f3e68230c46c6eda837798f92812c93ac19e81a77a0d72f3a5b53681320b71d886d8d4339fb2eb51d056bb4bc41466116aa51ffd50ff05d1"; + sha512 = "69fc97339bd8fddedf12ac5f545c2f768cb071c4786f08c43fe61775e43b2dcf065d84d23ef9b9fb3f09c6df6364413f61fec0fa1cdeea2b4b769e3ef0bf124f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/xh/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/xh/firefox-76.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "8719acd4bca1136668c6a90b3f7caaf29bd773acaab2776f2b7daca3c9028c33e73dc2c15c82d44064e92b61def23ca889a2ad09043c5bc5ad91db3214af1919"; + sha512 = "b8013f7c0e1cfad11ef950015444105b1e8512d778fe4b2a7567e0613a1191a7a929c5fdca9c15ab846da05f189fea1b0c137784ca1061b43f7ebada27376a06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/zh-CN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/zh-CN/firefox-76.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "681e276d7ff6a6f91be59994e53f9f6f082e16f9d22ec7e1d1b65813e91c6c2661f28989b0331100b6f0d4cdbbb0589204b0ed80bf5f0bc0d18016e905a71148"; + sha512 = "154bfde5424cca1af2e624596755fe95a1504be0ce977162117e937b6ab6ec6b03b1cdb470ef62c710129d19a16c42fac334477f8638de6472b742ab2395b262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/zh-TW/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/zh-TW/firefox-76.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "71ee272a7d02758187a9ef2d0a722760d04d9bf0fe11c90e841e15dc9019f44ba22483b6698e3f8eba9620e34d2678db2dbc2974c1ab5c7f0f79934aa4142432"; + sha512 = "6c3d36ba9e4682600c2a99d6837dfe76032d6d1618c0ddb8dab5633c2961d413959e9fe0a9c0fc7ef4bbbc41af469a92fab566d24458c43c1671cd3288dcaae8"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 4dc2df91f8ad4..817d17e8fad03 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -94,6 +94,11 @@ stdenv.mkDerivation ({ patches = [ ./env_var_for_system_dir.patch + # Fix for NSS 3.52 (add missing CK_GCM_PARMS field) + (fetchpatch { + url = "https://hg.mozilla.org/mozilla-central/raw-rev/463069687b3d"; + sha256 = "00yhz67flnkww3rbry0kqn6z6bm7vxfb2sgf7qikgbjcm3ysvpsm"; + }) ] ++ patches; @@ -180,7 +185,7 @@ stdenv.mkDerivation ({ $(< ${stdenv.cc}/nix-support/cc-cflags) \ ${stdenv.cc.default_cxx_stdlib_compile} \ ${lib.optionalString stdenv.cc.isClang "-idirafter ${stdenv.cc.cc}/lib/clang/${lib.getVersion stdenv.cc.cc}/include"} \ - ${lib.optionalString stdenv.cc.isGNU "-isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc} -isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/$(cc -dumpmachine)"} \ + ${lib.optionalString stdenv.cc.isGNU "-isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc} -isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/${stdenv.hostPlatform.config}"} \ $NIX_CFLAGS_COMPILE" echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch new file mode 100644 index 0000000000000..2fe30980a35c6 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch @@ -0,0 +1,23 @@ +diff -ur firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp firefox-65.0/docshell/base/nsAboutRedirector.cpp +--- firefox-76.0.orig/docshell/base/nsAboutRedirector.cpp 2020-05-03 19:01:29.926544735 +0200 ++++ firefox-76.0/docshell/base/nsAboutRedirector.cpp 2020-05-03 19:12:00.845035570 +0200 +@@ -62,8 +62,6 @@ + {"about", "chrome://global/content/aboutAbout.html", 0}, + {"addons", "chrome://mozapps/content/extensions/extensions.xhtml", + nsIAboutModule::ALLOW_SCRIPT}, +- {"buildconfig", "chrome://global/content/buildconfig.html", +- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, + {"checkerboard", "chrome://global/content/aboutCheckerboard.html", + nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + nsIAboutModule::ALLOW_SCRIPT}, +diff -ur firefox-65.0-orig/toolkit/content/jar.mn firefox-65.0/toolkit/content/jar.mn +--- firefox-65.0-orig/toolkit/content/jar.mn 2019-01-23 00:48:35.033372506 +0100 ++++ firefox-65.0/toolkit/content/jar.mn 2019-01-23 00:50:45.126565924 +0100 +@@ -36,7 +36,6 @@ + content/global/plugins.css + content/global/browser-child.js + content/global/browser-content.js +-* content/global/buildconfig.html + content/global/buildconfig.css + content/global/contentAreaUtils.js + content/global/datepicker.xhtml diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index e30ebc9afb567..092f4342e158e 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,19 +7,19 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "75.0"; + ffversion = "76.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0m3ibm6dy9cpvsxkzkzwj7na5rm5qz7sm3bpx604ibay9pccvgv59jxapisvmswzmlz2nv02l6p2gxlz3b0lbcg7rd5zasia92y7j99"; + sha512 = "0gnhfcgrz6022xf3vqia3s3639xa5pjp13h343d3c09mn8r919cmm6s38vzj1v3734fm25zb68acyarsp72xqq8z1420rh02b2pv38q"; }; patches = [ - ./no-buildconfig-ffx65.patch + ./no-buildconfig-ffx76.patch ]; meta = { description = "A web browser built from Firefox source tree"; - homepage = http://www.mozilla.com/en-US/firefox/; + homepage = "http://www.mozilla.com/en-US/firefox/"; maintainers = with lib.maintainers; [ eelco andir ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; @@ -35,10 +35,10 @@ rec { firefox-esr-68 = common rec { pname = "firefox-esr"; - ffversion = "68.7.0esr"; + ffversion = "68.8.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "29qbcc78hz1rsnz735a5miwfj0c3r1c5qm2043vyd9qz879vsh4ab82k7wncm3xa04kqdff26zh1rpbbjmdr7gwn4q8nmjzzs7wzpd3"; + sha512 = "2rl5irkamxi8caa8krj0wng93lb82kk9mf09mgci87mj9hy6fxzcrlmiiffp14s03rv0raagrn4w54pbx1336mylq6saxmfhpf676hk"; }; patches = [ diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 8256487b75181..52773bf291a6b 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,15 +2,14 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd -, jrePlugin, adoptopenjdk-icedtea-web -, bluejeans, djview4, adobe-reader -, google_talk_plugin, fribid, gnome3/*.gnome-shell*/ +, ffmpeg_4, xorg, libpulseaudio, libcanberra-gtk2, libglvnd +, gnome3/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow , tridactyl-native , fx_cast_bridge , udev , kerberos +, libva }: ## configurability of the wrapper itself @@ -26,7 +25,6 @@ let (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName) , nameSuffix ? "" , icon ? browserName - , extraPlugins ? [] , extraNativeMessagingHosts ? [] , gdkWayland ? false , cfg ? config.${browserName} or {} @@ -38,32 +36,24 @@ let enableAdobeFlash = cfg.enableAdobeFlash or false; ffmpegSupport = browser.ffmpegSupport or false; gssSupport = browser.gssSupport or false; - jre = cfg.jre or false; - icedtea = cfg.icedtea or false; - supportsJDK = - stdenv.hostPlatform.system == "i686-linux" || - stdenv.hostPlatform.system == "x86_64-linux" || - stdenv.hostPlatform.system == "armv7l-linux" || - stdenv.hostPlatform.system == "aarch64-linux"; plugins = - assert !(jre && icedtea); - if builtins.hasAttr "enableVLC" cfg - then throw "The option \"${browserName}.enableVLC\" has been removed since Firefox no longer supports npapi plugins" - else - ([ ] - ++ lib.optional enableAdobeFlash flashplayer - ++ lib.optional (cfg.enableDjvu or false) (djview4) - ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) - ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin - ++ lib.optional icedtea adoptopenjdk-icedtea-web - ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin - ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid - ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell - ++ lib.optional (cfg.enableBluejeans or false) bluejeans - ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader - ++ extraPlugins - ); + let + removed = lib.filter (a: builtins.hasAttr a cfg) [ + "enableVLC" + "enableDjvu" + "enableMPlayer" + "jre" + "icedtea" + "enableGoogleTalkPlugin" + "enableFriBIDPlugin" + "enableBluejeans" + "enableAdobeReader" + ]; + in if removed != [] + then throw "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) removed}. All plugin related options, except for the adobe flash player, have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)." + else lib.optional enableAdobeFlash flashplayer; + nativeMessagingHosts = ([ ] ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) @@ -75,8 +65,8 @@ let ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts ); - libs = lib.optional stdenv.isLinux udev - ++ lib.optional ffmpegSupport ffmpeg + libs = lib.optionals stdenv.isLinux [ udev libva ] + ++ lib.optional ffmpegSupport ffmpeg_4 ++ lib.optional gssSupport kerberos ++ lib.optional gdkWayland libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 53255ec518350..e5cd08f7df7fd 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -108,7 +108,7 @@ in stdenv.mkDerivation { --replace /opt/google/$appname/google-$appname $exe substituteInPlace $out/share/menu/google-$appname.menu \ --replace /opt $out/share \ - --replace $out/share/google/chrome/google-$appname $exe + --replace $out/share/google/$appname/google-$appname $exe for icon_file in $out/share/google/chrome*/product_logo_*[0-9].png; do num_and_suffix="''${icon_file##*logo_}" @@ -133,7 +133,7 @@ in stdenv.mkDerivation { meta = { description = "A freeware web browser developed by Google"; - homepage = https://www.google.com/chrome/browser/; + homepage = "https://www.google.com/chrome/browser/"; license = licenses.unfree; maintainers = [ maintainers.msteen ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index b09be81cc418f..d58fc8fd19bf8 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableDirectFB "--with-directfb"; meta = with stdenv.lib; { - homepage = http://links.twibright.com/; + homepage = "http://links.twibright.com/"; description = "A small browser with some graphics support"; maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index 0605eda7fc76a..bf10043e942e7 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast, small, webkit based browser framework extensible in Lua"; - homepage = https://luakit.github.io/; + homepage = "https://luakit.github.io/"; license = licenses.gpl3; platforms = platforms.linux; # Only tested linux }; diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 3f4f96d33efb6..8aeee45b9e542 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A text-mode web browser"; - homepage = https://lynx.invisible-island.net/; + homepage = "https://lynx.invisible-island.net/"; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 1d1928d168b6b..66f6384643ad0 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight WebKitGTK web browser"; - homepage = https://www.midori-browser.org/; + homepage = "https://www.midori-browser.org/"; license = with licenses; [ lgpl21Plus ]; platforms = with platforms; linux; maintainers = with maintainers; [ raskin ramkromberg ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix deleted file mode 100644 index e8841a0ab6fbe..0000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, fetchurl, xorg, gtk2, glib, gdk-pixbuf, dpkg, libXext, libXfixes -, libXrender, libuuid, libXrandr, libXcomposite, libpulseaudio -}: - -with stdenv.lib; - -let - - rpathInstaller = makeLibraryPath - [gtk2 glib stdenv.cc.cc]; - - rpathPlugin = makeLibraryPath - ([ stdenv.cc.cc gtk2 glib xorg.libX11 gdk-pixbuf libXext libXfixes libXrender libXrandr libXcomposite libpulseaudio ] ++ optional (libuuid != null) libuuid); - -in - -stdenv.mkDerivation rec { - pname = "bluejeans"; - - version = "2.180.71.8"; - - src = fetchurl { - url = "https://swdl.bluejeans.com/skinny/bjnplugin_${version}-1_amd64.deb"; - sha256 = "1fgjgzss0ghk734xpfidazyknfdn11pmyw77pc3wigl83dvx4nb2"; - }; - - unpackPhase = "${dpkg}/bin/dpkg-deb -x $src ."; - - installPhase = - '' - mkdir -p $out - cp -R usr/lib $out/ - - plugins=$out/lib/mozilla/plugins - patchelf \ - --set-rpath "${rpathPlugin}" \ - $plugins/npbjnplugin_${version}.so - - patchelf \ - --set-rpath "${rpathInstaller}" \ - $plugins/npbjninstallplugin_${version}.so - ''; - - dontStrip = true; - dontPatchELF = true; - - passthru.mozillaPlugin = "/lib/mozilla/plugins"; - - meta = { - homepage = http://bluejeans.com; - license = stdenv.lib.licenses.unfree; - maintainers = with maintainers; [ ocharles kamilchm ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 46a759cf27af4..a9f05ba1da9af 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { pname = "flashplayer"; - version = "32.0.0.344"; + version = "32.0.0.371"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1kkwijxlcs1rlqxr1vj51h95fwwrp5m0c9lngqpncgmmhh8v9dyr" + "1zrl7cxcl9hkafji15br8wp5vf9a5lb88xcpz6vi9q73j45mhzjd" else - "0r47s19fw7gsph73rd5jb2zfsjwz7mjawm6c49rir9rsa0zxrsks" + "0cgnsn9zanadbacb660mj4k103cdyb2cak7ixnp1varqklss83n6" else if arch == "x86_64" then - "1ki3i7zw0q48xf01xjfm1mpizc5flk768p9hqxpg881r4h65dh6b" + "1zc90gjixfhjng7pbx8vci1l69wf5m40149178zwzs6kz4ma5hb2" else - "1v527i60sljwyvv4l1kg9ml05skjgm3naynlswd35hsz258jnxl4"; + "0fqgas1g52a0zir2cxz3anizk3lkmwl68nbcn5rihgvjfqykbhn8"; }; nativeBuildInputs = [ unzip ]; @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { meta = { description = "Adobe Flash Player browser plugin"; - homepage = http://www.adobe.com/products/flashplayer/; + homepage = "http://www.adobe.com/products/flashplayer/"; license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [ taku0 ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 5274d30e68aa1..3015d506427d8 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { pname = "flashplayer-standalone"; - version = "32.0.0.344"; + version = "32.0.0.371"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1ymsk07xmnanyv86r58ar1l4wgjarlq0fc111ajc76pp8dsxnfx8" + "0n3bk2y1djaqrdygnr81n8lsnj2k60kaziffl41zpdvzi1jc7wgn" else - "0wiwpn4a0jxslw4ahalq74rksn82y0aqa3lrjr9qs7kdcak74vky"; + "18ll9rnfhbnz54q4d7q9fb13lix4i62zr6z6n574qvwngrvbrr8a"; }; nativeBuildInputs = [ unzip ]; @@ -95,7 +95,7 @@ stdenv.mkDerivation { meta = { description = "Adobe Flash Player standalone executable"; - homepage = https://www.adobe.com/support/flashplayer/debug_downloads.html; + homepage = "https://www.adobe.com/support/flashplayer/debug_downloads.html"; license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [ taku0 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/builder.sh deleted file mode 100644 index fb36125b3a174..0000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -source $stdenv/setup -export PREFIX=$out -configureFlags="--plugin-path=$out/lib/mozilla/plugins" -genericBuild diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix deleted file mode 100644 index 101ae99d6659b..0000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, openssl, glib, libX11, gtk2, gettext, intltool }: - -stdenv.mkDerivation rec { - pname = "fribid"; - version = "1.0.4"; - builder = ./builder.sh; - - src = fetchurl { - url = "https://fribid.se/releases/source/${pname}-${version}.tar.bz2"; - sha256 = "a679f3a0534d5f05fac10b16b49630a898c0b721cfa24d2c827fa45485476649"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl libX11 gtk2 glib gettext intltool ]; - patches = [ - ./translation-xgettext-to-intltool.patch - ./plugin-linkfix.patch - ./ipc-lazytrace.patch - ]; - - postPatch = "substituteInPlace plugin/pluginutil.c --replace strndup strndup_"; - - passthru.mozillaPlugin = "/lib/mozilla/plugins"; - - meta = with stdenv.lib; { - description = "A browser plugin to manage Swedish BankID:s"; - longDescription = '' - FriBID is an open source software for the Swedish e-id system - called BankID. FriBID also supports processor architectures and - Linux/BSD distributions that the official software doesn't - support. - ''; - homepage = http://fribid.se; - license = with licenses; [ gpl2 mpl10 ]; - maintainers = [ maintainers.edwtjo ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/ipc-lazytrace.patch b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/ipc-lazytrace.patch deleted file mode 100644 index b7d05ddd0ef56..0000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/ipc-lazytrace.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/plugin/ipc.c 2012-11-14 18:02:43.000000000 +0100 -+++ b/plugin/ipc.c 2013-09-21 08:55:39.960265058 +0200 -@@ -74,6 +74,7 @@ - //close(pipeOut[PIPE_READ_END]); - - execvp(mainBinary, (char *const *)argv); -+ fprintf(stderr, "Wanted signing executable\t<%s>\n", mainBinary); - perror(BINNAME ": Failed to execute main binary"); - exit(1); - } else { diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/plugin-linkfix.patch b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/plugin-linkfix.patch deleted file mode 100644 index 1128381238b4b..0000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/plugin-linkfix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/plugin/Makefile 2013-09-18 13:55:11.091652553 +0200 -+++ b/plugin/Makefile 2013-09-18 13:58:27.513618750 +0200 -@@ -60,7 +60,7 @@ - for path in $(NPAPI_PLUGIN_PATHS); do \ - (../configure --internal--remove-link $(DESTDIR)$$path/libfribidplugin.so $(NPAPI_PLUGIN_LIB) || exit 1) && \ - install -d $(DESTDIR)$$path && \ -- ln -sf $(NPAPI_PLUGIN_LIB) $(DESTDIR)$$path/libfribidplugin.so; \ -+ ln -sf $(DESTDIR)$(NPAPI_PLUGIN_LIB) $(DESTDIR)$$path/libfribidplugin.so; \ - done - - uninstall: diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/translation-xgettext-to-intltool.patch b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/translation-xgettext-to-intltool.patch deleted file mode 100644 index dcac4f17928b5..0000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/translation-xgettext-to-intltool.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/translations/Makefile 2013-09-18 07:25:16.503800613 +0200 -+++ b/translations/Makefile 2013-09-18 07:25:29.495869405 +0200 -@@ -38,7 +38,7 @@ - all: template.pot $(MOFILES) - - template.pot: $(POTFILES) $(DEFINES) -- xgettext -k_ -ktranslatable -d $(DOMAIN) --package-name=$(PACKAGENAME) --package-version=$(PACKAGEVERSION) --copyright-holder='YOUR NAME' -o $@ $(POTFILES) -+ intltool-update --gettext-package=$(PACKAGENAME) -o $@ sv - - .po.mo: - msgfmt $< -o $@ ---- a/translations/POTFILES.in 2013-09-16 20:28:56.766106014 +0200 -+++ b/translations/POTFILES.in 2013-09-18 13:15:05.252689648 +0200 -@@ -0,0 +1,2 @@ -+client/gtk.c -+client/gtk/sign.glade diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix deleted file mode 100644 index 93f2ab2adfa3a..0000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ /dev/null @@ -1,117 +0,0 @@ -{ stdenv, fetchurl, libGL, xorg, cairo -, libpng, gtk2, glib, gdk-pixbuf, fontconfig, freetype, curl -, dbus-glib, alsaLib, libpulseaudio, systemd, pango -}: - -with stdenv.lib; - -let - - baseURL = "http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin"; - - rpathPlugin = makeLibraryPath - [ libGL - xorg.libXt - xorg.libX11 - xorg.libXrender - cairo - libpng - gtk2 - glib - fontconfig - freetype - curl - ]; - - rpathProgram = makeLibraryPath - [ gdk-pixbuf - glib - gtk2 - xorg.libX11 - xorg.libXcomposite - xorg.libXfixes - xorg.libXrender - xorg.libXrandr - xorg.libXext - stdenv.cc.cc - alsaLib - libpulseaudio - dbus-glib - systemd - curl - pango - cairo - ]; - -in - -stdenv.mkDerivation rec { - pname = "google-talk-plugin"; - - # You can get the upstream version and SHA-256 hash from the following URLs: - # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | grep -E 'Version|SHA256' - # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages | grep -E 'Version|SHA256' - version = "5.41.3.0"; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; - sha256 = "af7e23d2b6215afc547f96615b99f04e0561557cc58c0c9302364b5a3840d97d"; - } - else if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; - sha256 = "4c46d2b7f2018640288cd7ac49adc47e309d0beadfd979eb03030e672016b4a7"; - } - else throw "Google Talk does not support your platform."; - - unpackPhase = '' - ar p "$src" data.tar.gz | tar xz - ''; - - installPhase = - '' - plugins=$out/lib/mozilla/plugins - mkdir -p $plugins - cp opt/google/talkplugin/*.so $plugins - - for i in libnpgoogletalk.so libppgoogletalk.so libppo1d.so; do - patchelf --set-rpath "${makeLibraryPath [ stdenv.cc.cc xorg.libX11 ]}:${stdenv.cc.cc.lib}/lib64" $plugins/$i - done - - for i in libgoogletalkremoting.so libnpo1d.so; do - patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.cc.cc.lib}/lib64" $plugins/$i - done - - mkdir -p $out/libexec/google/talkplugin - cp -prd opt/google/talkplugin/{data,GoogleTalkPlugin,locale,remoting24x24.png,windowpicker.glade} $out/libexec/google/talkplugin/ - - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpathProgram}:${stdenv.cc.cc.lib}/lib64" \ - $out/libexec/google/talkplugin/GoogleTalkPlugin - - # Generate an LD_PRELOAD wrapper to redirect execvp() calls to - # /opt/../GoogleTalkPlugin. - preload=$out/libexec/google/talkplugin/libpreload.so - mkdir -p $(dirname $preload) - gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC - echo $preload > $plugins/extra-ld-preload - - # Prevent a dependency on gcc. - strip -S $preload - patchELF $preload - ''; - - dontStrip = true; - dontPatchELF = true; - - passthru.mozillaPlugin = "/lib/mozilla/plugins"; - - meta = { - homepage = http://www.google.com/chat/video/; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c deleted file mode 100644 index 1e2c31d9527ac..0000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c +++ /dev/null @@ -1,60 +0,0 @@ -/* Google Talk Plugin executes a helper program in /opt. This - LD_PRELOAD library intercepts execvp() calls to redirect them to - the corresponding location in $out. */ - -#define _GNU_SOURCE -#include <stdio.h> -#include <stdarg.h> -#include <stdlib.h> -#include <string.h> -#include <dlfcn.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <limits.h> - -char origDir [] = "/opt/google/talkplugin"; -char realDir [] = OUT "/libexec/google/talkplugin"; - -const char * rewrite(const char * path, char * buf) -{ - if (strncmp(path, origDir, sizeof(origDir) - 1) != 0) return path; - if (snprintf(buf, PATH_MAX, "%s%s", realDir, path + sizeof(origDir) - 1) >= PATH_MAX) - abort(); - return buf; -} - -int execvp(const char * path, char * const argv[]) -{ - int (*_execvp) (const char *, char * const argv[]) = dlsym(RTLD_NEXT, "execvp"); - char buf[PATH_MAX]; - return _execvp(rewrite(path, buf), argv); -} - -int open(const char *path, int flags, ...) -{ - char buf[PATH_MAX]; - int (*_open) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open"); - mode_t mode = 0; - if (flags & O_CREAT) { - va_list ap; - va_start(ap, flags); - mode = va_arg(ap, mode_t); - va_end(ap); - } - return _open(rewrite(path, buf), flags, mode); -} - -int open64(const char *path, int flags, ...) -{ - char buf[PATH_MAX]; - int (*_open64) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open64"); - mode_t mode = 0; - if (flags & O_CREAT) { - va_list ap; - va_start(ap, flags); - mode = va_arg(ap, mode_t); - va_end(ap); - } - return _open64(rewrite(path, buf), flags, mode); -} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix deleted file mode 100644 index fd956f62327e2..0000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, firefox, libX11, xorgproto }: - -stdenv.mkDerivation rec { - pname = "mozplugger"; - version = "2.1.6"; - - src = fetchurl { - url = "http://mozplugger.mozdev.org/files/mozplugger-${version}.tar.gz"; - sha256 = "1vszkq4kdbaxsrqr2xn9rq6ipza9fngdri79gvjqk3bvsdmg0k19"; - }; - - buildInputs = [ firefox libX11 xorgproto ]; - - installPhase = '' - mkdir -p "$out/etc" "$out/bin" "$out/lib/mozilla/plugins" "$out/share/man/man7" - cp mozpluggerrc "$out/etc" - cp mozplugger-{helper,controller,linker,update} "$out/bin" - cp mozplugger.so "$out/lib/mozilla/plugins" - cp mozplugger.7 "$out/share/man/man7" - - mkdir -p "$out/share/${pname}-${version}/plugin" - ln -s "$out/lib/mozilla/plugins/mozplugger.so" "$out/share/${pname}-${version}/plugin" - ''; - - meta = { - description = "Mozilla plugin for launching external program for handling in-page objects"; - homepage = http://mozplugger.mozdev.org/; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix deleted file mode 100644 index a5bfda9f26c97..0000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{stdenv, fetchurl, pkgconfig, browser, libXpm, gettext}: - -stdenv.mkDerivation rec { - name = "mplayerplug-in-3.55"; - - src = fetchurl { - url = "mirror://sourceforge/mplayerplug-in/${name}.tar.gz"; - sha256 = "0zkvqrzibrbljiccvz3rhbmgifxadlrfjylqpz48jnjx9kggynms"; - }; - - postConfigure = - (if browser ? isFirefox3Like then '' - # Cause a rebuild of these file from the IDL file, needed for GNU IceCat 3 - # and Mozilla Firefox 3. - # See, e.g., http://article.gmane.org/gmane.comp.mozilla.mplayerplug-in/2104 . - rm -f Source/nsIScriptableMplayerPlugin.h - '' - else ""); - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ browser (browser.gtk) libXpm gettext ]; - - installPhase = '' - mkdir -p $out/lib/mozilla/plugins - cp -p mplayerplug-in*.so mplayerplug-in*.xpt $out/lib/mozilla/plugins - ''; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - meta = with stdenv.lib; { - description = "A browser plugin that uses mplayer to play digital media from websites"; - homepage = http://mplayerplug-in.sourceforge.net/; - license = with licenses; [ gpl2Plus lgpl2Plus "MPLv1+" ]; - }; -} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix deleted file mode 100644 index 10ae0eb1da601..0000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{stdenv, fetchurl, which, pkgconfig, file, glib, gtk2, gtk3, curl, libXt}: -let - srcData = # Generated upstream information - rec { - baseName="nspluginwrapper"; - version="1.4.4"; - name="${baseName}-${version}"; - hash="1fxjz9ifhw0drm12havlsl4jpsq1nv930gqa005kgddv5pa99vgj"; - url="http://nspluginwrapper.org/download/nspluginwrapper-1.4.4.tar.gz"; - }; -in -stdenv.mkDerivation { - inherit (srcData) name version; - - src = fetchurl{ - inherit (srcData) url; - sha256 = srcData.hash; - }; - - preConfigure = '' - sed -e 's@/usr/bin/@@g' -i configure - sed -e '/gthread[.]h/d' -i src/npw-player.c - export NIX_LDFLAGS="$NIX_LDFLAGS -lgthread-2.0" - export configureFlags="$configureFlags --target-cpu=$(uname -m)" - ''; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [which file glib gtk2 gtk3 curl libXt]; - - preferLocalBuild = true; - - meta = { - description = ''A wrapper to run browser plugins out-of-process''; - homepage = http://nspluginwrapper.org/; - license = stdenv.lib.licenses.gpl2; - platforms = [ "x64_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.raskin ]; - inherit (srcData) version; - }; -} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.upstream b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.upstream deleted file mode 100644 index 62831613a2e22..0000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -name nspluginwrapper -target default.nix -url http://nspluginwrapper.org/download/ -version_link /nspluginwrapper-[0-9]+ diff --git a/pkgs/applications/networking/browsers/next/default.nix b/pkgs/applications/networking/browsers/next/default.nix index d4726fab6511d..e03f918a587c2 100644 --- a/pkgs/applications/networking/browsers/next/default.nix +++ b/pkgs/applications/networking/browsers/next/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Infinitely extensible web-browser (with Lisp development files using WebKitGTK platform port)"; - homepage = https://next.atlas.engineer; + homepage = "https://next.atlas.engineer"; license = licenses.bsd3; maintainers = [ maintainers.lewo ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix b/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix index a71583ffbec59..8039c5492408a 100644 --- a/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix +++ b/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Infinitely extensible web-browser (user interface only)"; - homepage = https://next.atlas.engineer; + homepage = "https://next.atlas.engineer"; license = licenses.bsd3; maintainers = [ maintainers.lewo ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 7c010b91a1e6c..b22a35bc54fb5 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,25 +1,28 @@ -{ stdenv, fetchFromGitHub, makeDesktopItem +{ stdenv, lib, fetchgit, makeDesktopItem , pkgconfig, autoconf213, alsaLib, bzip2, cairo , dbus, dbus-glib, ffmpeg, file, fontconfig, freetype , gnome2, gnum4, gtk2, hunspell, libevent, libjpeg , libnotify, libstartup_notification, makeWrapper -, libGLU, libGL, perl, python, libpulseaudio +, libGLU, libGL, perl, python2, libpulseaudio , unzip, xorg, wget, which, yasm, zip, zlib + +, withGTK3 ? false, gtk3 }: let - libPath = stdenv.lib.makeLibraryPath [ ffmpeg ]; + libPath = lib.makeLibraryPath [ ffmpeg ]; + gtkVersion = if withGTK3 then "3" else "2"; in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.8.4"; + version = "28.9.1"; - src = fetchFromGitHub { - owner = "MoonchildProductions"; - repo = "UXP"; - rev = "PM${version}_Release"; - sha256 = "1k2j4rlgjwkns3a592pbiwwhrpja3fachvzby1his3d1mhdvyc6f"; + src = fetchgit { + url = "https://github.com/MoonchildProductions/Pale-Moon.git"; + rev = "${version}_Release"; + sha256 = "1772by9r9l1l0wmj4hs89r3zyckcbrq1krb09bn3pxvjjywzvkfl"; + fetchSubmodules = true; }; desktopItem = makeDesktopItem { @@ -29,7 +32,7 @@ in stdenv.mkDerivation rec { desktopName = "Pale Moon"; genericName = "Web Browser"; categories = "Application;Network;WebBrowser;"; - mimeType = stdenv.lib.concatStringsSep ";" [ + mimeType = lib.concatStringsSep ";" [ "text/html" "text/xml" "application/xhtml+xml" @@ -40,60 +43,75 @@ in stdenv.mkDerivation rec { ]; }; + nativeBuildInputs = [ + file gnum4 makeWrapper perl pkgconfig python2 wget which + ]; + buildInputs = [ - alsaLib bzip2 cairo dbus dbus-glib ffmpeg file fontconfig freetype - gnome2.GConf gnum4 gtk2 hunspell libevent libjpeg libnotify - libstartup_notification makeWrapper libGLU libGL perl - pkgconfig python libpulseaudio unzip wget which yasm zip zlib - ] ++ (with xorg; [ + alsaLib bzip2 cairo dbus dbus-glib ffmpeg fontconfig freetype + gnome2.GConf gtk2 hunspell libevent libjpeg libnotify + libstartup_notification libGLU libGL + libpulseaudio unzip yasm zip zlib + ] + ++ (with xorg; [ libX11 libXext libXft libXi libXrender libXScrnSaver libXt pixman xorgproto - ]); + ]) + ++ lib.optional withGTK3 gtk3; enableParallelBuilding = true; configurePhase = '' - export MOZBUILD_STATE_PATH=$(pwd)/mozbuild export MOZCONFIG=$(pwd)/mozconfig export MOZ_NOSPAM=1 - export builddir=$(pwd)/pmbuild - echo > $MOZCONFIG " - mk_add_options AUTOCLOBBER=1 - mk_add_options MOZ_OBJDIR=$builddir - ac_add_options --enable-application=palemoon + # Keep this similar to the official .mozconfig file, + # only minor changes for portability are permitted with branding. + # https://developer.palemoon.org/build/linux/ + echo > $MOZCONFIG ' + # Clear this if not a 64bit build + _BUILD_64=${lib.optionalString stdenv.hostPlatform.is64bit "1"} - ac_add_options --enable-optimize='-O2' - - # Please see https://www.palemoon.org/redist.shtml for restrictions when using the official branding. - ac_add_options --enable-official-branding - export MOZILLA_OFFICIAL=1 + # Set GTK Version to 2 or 3 + _GTK_VERSION=${gtkVersion} - ac_add_options --enable-default-toolkit=cairo-gtk2 + # Standard build options for Pale Moon + ac_add_options --enable-application=palemoon + ac_add_options --enable-optimize="-O2 -w" + ac_add_options --enable-default-toolkit=cairo-gtk$_GTK_VERSION ac_add_options --enable-jemalloc ac_add_options --enable-strip - ac_add_options --with-pthreads + ac_add_options --enable-devtools - ac_add_options --disable-tests ac_add_options --disable-eme - ac_add_options --disable-parental-controls - ac_add_options --disable-accessibility ac_add_options --disable-webrtc ac_add_options --disable-gamepad + ac_add_options --disable-tests + ac_add_options --disable-debug ac_add_options --disable-necko-wifi ac_add_options --disable-updater + ac_add_options --with-pthreads + + # Please see https://www.palemoon.org/redist.shtml for restrictions when using the official branding. + ac_add_options --enable-official-branding + export MOZILLA_OFFICIAL=1 + + ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]} + + export MOZ_PKG_SPECIAL=gtk$_GTK_VERSION - ac_add_options --x-libraries=${xorg.libX11.out}/lib + # + # NixOS-specific adjustments + # ac_add_options --prefix=$out - mk_add_options MOZ_MAKE_FLAGS='-j$NIX_BUILD_CORES' + + mk_add_options MOZ_MAKE_FLAGS="-j$NIX_BUILD_CORES" mk_add_options AUTOCONF=${autoconf213}/bin/autoconf - " + ' ''; - buildPhase = '' - $src/mach build - ''; + buildPhase = "$src/mach build"; installPhase = '' $src/mach install @@ -104,7 +122,7 @@ in stdenv.mkDerivation rec { for n in 16 22 24 32 48 256; do size=$n"x"$n mkdir -p $out/share/icons/hicolor/$size/apps - cp $src/application/palemoon/branding/official/default$n.png \ + cp $src/palemoon/branding/official/default$n.png \ $out/share/icons/hicolor/$size/apps/palemoon.png done @@ -112,7 +130,7 @@ in stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${libPath}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An Open Source, Goanna-based web browser focusing on efficiency and customization"; longDescription = '' Pale Moon is an Open Source, Goanna-based web browser focusing on diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 12cf9b30fa61e..edb5b2759e28c 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -21,12 +21,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.10.1"; + version = "1.11.1"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "06bcnsfb4kz92bh8xjxwaghhy9x2mmcb76wk3fv868jb1ga75vd8"; + sha256 = "0cxmmw002f5rvxzyhlhzqm2ipf64w4vspf298p6c5kpg535m8cvs"; }; # Needs tox @@ -105,7 +105,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/The-Compiler/qutebrowser; + homepage = "https://github.com/The-Compiler/qutebrowser"; description = "Keyboard-focused browser with a minimal GUI"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry ]; diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 0437ab933bd75..03571469da1f5 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { possible to embed it in another application. Furthermore, one can point surf to another URI by setting its XProperties. ''; - homepage = https://surf.suckless.org; + homepage = "https://surf.suckless.org"; license = licenses.mit; platforms = webkitgtk.meta.platforms; maintainers = with maintainers; [ joachifm ]; diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix new file mode 100644 index 0000000000000..f87acc8722e45 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix @@ -0,0 +1,94 @@ +{ stdenv, mkChromiumDerivation, channel, enableWideVine }: + +with stdenv.lib; + +mkChromiumDerivation (base: rec { + name = "chromium-browser"; + packageName = "chromium"; + buildTargets = [ "mksnapshot" "chrome_sandbox" "chrome" ]; + + outputs = ["out" "sandbox"]; + + sandboxExecutableName = "__chromium-suid-sandbox"; + + installPhase = '' + mkdir -p "$libExecPath" + cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" + cp -v "$buildPath/icudtl.dat" "$libExecPath/" + cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" + cp -v "$buildPath/chrome" "$libExecPath/$packageName" + + # Swiftshader + # See https://stackoverflow.com/a/4264351/263061 for the find invocation. + if [ -n "$(find "$buildPath/swiftshader/" -maxdepth 1 -name '*.so' -print -quit)" ]; then + echo "Swiftshader files found; installing" + mkdir -p "$libExecPath/swiftshader" + cp -v "$buildPath/swiftshader/"*.so "$libExecPath/swiftshader/" + else + echo "Swiftshader files not found" + fi + + mkdir -p "$sandbox/bin" + cp -v "$buildPath/chrome_sandbox" "$sandbox/bin/${sandboxExecutableName}" + + mkdir -vp "$out/share/man/man1" + cp -v "$buildPath/chrome.1" "$out/share/man/man1/$packageName.1" + + for icon_file in chrome/app/theme/chromium/product_logo_*[0-9].png; do + num_and_suffix="''${icon_file##*logo_}" + icon_size="''${num_and_suffix%.*}" + expr "$icon_size" : "^[0-9][0-9]*$" || continue + logo_output_prefix="$out/share/icons/hicolor" + logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps" + mkdir -vp "$logo_output_path" + cp -v "$icon_file" "$logo_output_path/$packageName.png" + done + + # Install Desktop Entry + install -D chrome/installer/linux/common/desktop.template \ + $out/share/applications/chromium-browser.desktop + + substituteInPlace $out/share/applications/chromium-browser.desktop \ + --replace "@@MENUNAME@@" "Chromium" \ + --replace "@@PACKAGE@@" "chromium" \ + --replace "Exec=/usr/bin/@@USR_BIN_SYMLINK_NAME@@" "Exec=chromium" + + # Append more mime types to the end + sed -i '/^MimeType=/ s,$,x-scheme-handler/webcal;x-scheme-handler/mailto;x-scheme-handler/about;x-scheme-handler/unknown,' \ + $out/share/applications/chromium-browser.desktop + + # See https://github.com/NixOS/nixpkgs/issues/12433 + sed -i \ + -e '/\[Desktop Entry\]/a\' \ + -e 'StartupWMClass=chromium-browser' \ + $out/share/applications/chromium-browser.desktop + ''; + + passthru = { inherit sandboxExecutableName; }; + + requiredSystemFeatures = [ "big-parallel" ]; + + meta = { + description = "An open source web browser from Google, with dependencies on Google web services removed"; + longDescription = '' + Chromium is an open source web browser from Google that aims to build a + safer, faster, and more stable way for all Internet users to experience + the web. It has a minimalist user interface and provides the vast majority + of source code for Google Chrome (which has some additional features). + ''; + homepage = "https://github.com/Eloston/ungoogled-chromium"; + maintainers = with maintainers; [ squalus ]; + # Overview of the maintainer roles: + # nixos-unstable: + # - TODO: Need a new maintainer for x86_64 [0] + # - @thefloweringash: aarch64 + # - @primeos: Provisional maintainer (x86_64) + # Stable channel: + # - TODO (need someone to test backports [0]) + # [0]: https://github.com/NixOS/nixpkgs/issues/78450 + license = if enableWideVine then licenses.unfree else licenses.bsd3; + platforms = platforms.linux; + hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; + timeout = 172800; # 48 hours + }; +}) diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix new file mode 100644 index 0000000000000..25ee5462b298e --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix @@ -0,0 +1,366 @@ +{ stdenv, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar + +# default dependencies +, bzip2, flac, speex, libopus +, libevent, expat, libjpeg, snappy +, libpng, libcap +, xdg_utils, yasm, minizip, libwebp +, libusb1, pciutils, nss, re2, zlib + +, python2Packages, perl, pkgconfig +, nspr, systemd, kerberos +, utillinux, alsaLib +, bison, gperf +, glib, gtk3, dbus-glib +, glibc +, libXScrnSaver, libXcursor, libXtst, libGLU, libGL +, protobuf, speechd, libXdamage, cups +, ffmpeg, libxslt, libxml2, at-spi2-core +, jre + +# optional dependencies +, libgcrypt ? null # gnomeSupport || cupsSupport +, libva ? null # useVaapi +, libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone + +# package customization +, useOzone ? false +, useVaapi ? !(useOzone || stdenv.isAarch64) # Built if supported, but disabled in the wrapper +# VA-API TODOs: +# - Ozone: M81 fails to build due to "ozone_platform_gbm = false" +# - Possible solutions: Write a patch to fix the build (wrong gn dependencies) +# or build with minigbm +# - AArch64: Causes serious regressions (https://github.com/NixOS/nixpkgs/pull/85253#issuecomment-614405879) +, gnomeSupport ? false, gnome ? null +, gnomeKeyringSupport ? false, libgnome-keyring3 ? null +, proprietaryCodecs ? true +, cupsSupport ? true +, pulseSupport ? false, libpulseaudio ? null +, ungoogled-chromium +, ungoogled ? false + +, upstream-info +}: + +buildFun: + +with stdenv.lib; + +# see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html + +let + # The additional attributes for creating derivations based on the chromium + # source tree. + extraAttrs = buildFun base; + + githubPatch = commit: sha256: fetchpatch { + url = "https://github.com/chromium/chromium/commit/${commit}.patch"; + inherit sha256; + }; + + mkGnFlags = + let + # Serialize Nix types into GN types according to this document: + # https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/language.md + mkGnString = value: "\"${escape ["\"" "$" "\\"] value}\""; + sanitize = value: + if value == true then "true" + else if value == false then "false" + else if isList value then "[${concatMapStringsSep ", " sanitize value}]" + else if isInt value then toString value + else if isString value then mkGnString value + else throw "Unsupported type for GN value `${value}'."; + toFlag = key: value: "${key}=${sanitize value}"; + in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); + + gnSystemLibraries = [ + "flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" + # "zlib" # version 77 reports unresolved dependency on //third_party/zlib:zlib_config + # "libjpeg" # fails with multiple undefined references to chromium_jpeg_* + # "re2" # fails with linker errors + # "ffmpeg" # https://crbug.com/731766 + # "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together + # so we can't build with one from system and other from source + ]; + + opusWithCustomModes = libopus.override { + withCustomModes = true; + }; + + defaultDependencies = [ + bzip2 flac speex opusWithCustomModes + libevent expat libjpeg snappy + libpng libcap + xdg_utils yasm minizip libwebp + libusb1 re2 zlib + ffmpeg libxslt libxml2 + # harfbuzz # in versions over 63 harfbuzz and freetype are being built together + # so we can't build with one from system and other from source + ]; + + # build paths and release info + packageName = extraAttrs.packageName or extraAttrs.name; + buildType = "Release"; + buildPath = "out/${buildType}"; + libExecPath = "$out/libexec/${packageName}"; + + versionRange = min-version: upto-version: + let inherit (upstream-info) version; + result = versionAtLeast version min-version && versionOlder version upto-version; + stable-version = (import ./upstream-info.nix).stable.version; + in if versionAtLeast stable-version upto-version + then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it." + result + else result; + + ungoogler = + let versionEntry = (import ./ungoogled-src.nix)."${upstream-info.version}"; + in ungoogled-chromium { + inherit (versionEntry) rev sha256; + }; + base = rec { + name = "${packageName}-unwrapped-${version}"; + inherit (upstream-info) channel version; + inherit packageName buildType buildPath; + + src = upstream-info.main; + + nativeBuildInputs = [ + ninja which python2Packages.python perl pkgconfig + python2Packages.ply python2Packages.jinja2 nodejs + gnutar + ] ++ optional (versionAtLeast version "83") python2Packages.setuptools; + + buildInputs = defaultDependencies ++ [ + nspr nss systemd + utillinux alsaLib + bison gperf kerberos + glib gtk3 dbus-glib + libXScrnSaver libXcursor libXtst libGLU libGL + pciutils protobuf speechd libXdamage at-spi2-core + jre + ] ++ optional useVaapi libva + ++ optional gnomeKeyringSupport libgnome-keyring3 + ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] + ++ optionals cupsSupport [ libgcrypt cups ] + ++ optional pulseSupport libpulseaudio + ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; + + patches = [ + ./patches/nix_plugin_paths_68.patch + ./patches/remove-webp-include-69.patch + ./patches/no-build-timestamps.patch + ./patches/widevine-79.patch + ./patches/dont-use-ANGLE-by-default.patch + # Unfortunately, chromium regularly breaks on major updates and + # then needs various patches backported in order to be compiled with GCC. + # Good sources for such patches and other hints: + # - https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ + # - https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium + # - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits + # + # ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ] + # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) + ] ++ optionals (useVaapi) ([ # Fixes for the VA-API build: + ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi + ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium) + ] ++ optionals (versionRange "81" "82") [ + (githubPatch "5b2ff215473e0526b5b24aeff4ad90d369b21c75" "0n00vh8wfpn2ay5fqsxcsx0zadnv7mihm72bcvnrfzh75nzbg902") + (githubPatch "98e343ab369e4262511b5fce547728e3e5eefba8" "00wwp653jk0k0yvix00vr7ymgck9dj7fxjwx4nc67ynn84dh6064") + ]); + + postPatch = '' + # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX + substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ + --replace \ + 'return sandbox_binary;' \ + 'return base::FilePath(GetDevelSandboxPath());' + + substituteInPlace services/audio/audio_sandbox_hook_linux.cc \ + --replace \ + '/usr/share/alsa/' \ + '${alsaLib}/share/alsa/' \ + --replace \ + '/usr/lib/x86_64-linux-gnu/gconv/' \ + '${glibc}/lib/gconv/' \ + --replace \ + '/usr/share/locale/' \ + '${glibc}/share/locale/' + + sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \ + chrome/browser/shell_integration_linux.cc + + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ + device/udev_linux/udev?_loader.cc + + sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ + gpu/config/gpu_info_collector_linux.cc + + sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ + chrome/browser/ui/webui/engagement/site_engagement_ui.cc + + sed -i -e '/#include/ { + i #include <algorithm> + :l; n; bl + }' gpu/config/gpu_control_list.cc + + # Allow to put extensions into the system-path. + sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc + + patchShebangs . + # use our own nodejs + mkdir -p third_party/node/linux/node-linux-x64/bin + ln -s $(which node) third_party/node/linux/node-linux-x64/bin/node + + # remove unused third-party + # in third_party/crashpad third_party/zlib contains just a header-adapter + for lib in ${toString gnSystemLibraries}; do + find -type f -path "*third_party/$lib/*" \ + \! -path "*third_party/crashpad/crashpad/third_party/zlib/*" \ + \! -path "*third_party/$lib/chromium/*" \ + \! -path "*third_party/$lib/google/*" \ + \! -path "*base/third_party/icu/*" \ + \! -path "*base/third_party/libevent/*" \ + \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \ + -delete + done + '' + optionalString stdenv.isAarch64 '' + substituteInPlace build/toolchain/linux/BUILD.gn \ + --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' + '' + optionalString stdenv.cc.isClang '' + mkdir -p third_party/llvm-build/Release+Asserts/bin + ln -s ${stdenv.cc}/bin/clang third_party/llvm-build/Release+Asserts/bin/clang + ln -s ${stdenv.cc}/bin/clang++ third_party/llvm-build/Release+Asserts/bin/clang++ + ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar + '' + optionalString ungoogled '' + ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors" + ${ungoogler}/utils/patches.py . ${ungoogler}/patches + ${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz . + ''; + + gnFlags = mkGnFlags ({ + linux_use_bundled_binutils = false; + use_lld = false; + use_gold = true; + gold_path = "${stdenv.cc}/bin"; + is_debug = false; + + proprietary_codecs = false; + use_sysroot = false; + use_gnome_keyring = gnomeKeyringSupport; + use_gio = gnomeSupport; + # ninja: error: '../../native_client/toolchain/linux_x86/pnacl_newlib/bin/x86_64-nacl-objcopy', + # needed by 'nacl_irt_x86_64.nexe', missing and no known rule to make it + enable_nacl = false; + # Enabling the Widevine component here doesn't affect whether we can + # redistribute the chromium package; the Widevine component is either + # added later in the wrapped -wv build or downloaded from Google. + enable_widevine = true; + use_cups = cupsSupport; + + treat_warnings_as_errors = false; + is_clang = stdenv.cc.isClang; + clang_use_chrome_plugins = false; + blink_symbol_level = 0; + fieldtrial_testing_like_official_build = true; + + # Google API keys, see: + # http://www.chromium.org/developers/how-tos/api-keys + # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, + # please get your own set of keys. + google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; + google_default_client_id = "404761575300.apps.googleusercontent.com"; + google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D"; + } // optionalAttrs proprietaryCodecs { + # enable support for the H.264 codec + proprietary_codecs = true; + enable_hangout_services_extension = true; + ffmpeg_branding = "Chrome"; + } // optionalAttrs useVaapi { + use_vaapi = true; + } // optionalAttrs pulseSupport { + use_pulseaudio = true; + link_pulseaudio = true; + } // optionalAttrs useOzone { + use_ozone = true; + ozone_platform_gbm = false; + use_xkbcommon = true; + use_glib = true; + use_gtk = true; + use_system_libwayland = true; + use_system_minigbm = true; + use_system_libdrm = true; + system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; + } // optionalAttrs ungoogled { + closure_compile = false; + enable_hangout_services_extension = false; + enable_mdns = false; + enable_nacl_nonsfi = false; + enable_one_click_signin = false; + enable_reading_list = false; + enable_remoting = false; + enable_reporting = false; + enable_service_discovery = false; + exclude_unwind_tables = true; + google_api_key = ""; + google_default_client_id = ""; + google_default_client_secret = ""; + optimize_webui = false; + safe_browsing_mode = 0; + use_official_google_api_keys = false; + use_unofficial_version_number = false; + } // (extraAttrs.gnFlags or {})); + + configurePhase = '' + runHook preConfigure + + # This is to ensure expansion of $out. + libExecPath="${libExecPath}" + python build/linux/unbundle/replace_gn_files.py \ + --system-libraries ${toString gnSystemLibraries} + ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt + + # Fail if `gn gen` contains a WARNING. + grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1 + + runHook postConfigure + ''; + + # Don't spam warnings about unknown warning options. This is useful because + # our Clang is always older than Chromium's and the build logs have a size + # of approx. 25 MB without this option (and this saves e.g. 66 %). + NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option"; + + buildPhase = let + # Build paralelism: on Hydra the build was frequently running into memory + # exhaustion, and even other users might be running into similar issues. + # -j is halved to avoid memory problems, and -l is slightly increased + # so that the build gets slight preference before others + # (it will often be on "critical path" and at risk of timing out) + buildCommand = target: '' + ninja -C "${buildPath}" \ + -j$(( ($NIX_BUILD_CORES+1) / 2 )) -l$(( $NIX_BUILD_CORES+1 )) \ + "${target}" + ( + source chrome/installer/linux/common/installer.include + PACKAGE=$packageName + MENUNAME="Chromium" + process_template chrome/app/resources/manpage.1.in "${buildPath}/chrome.1" + ) + ''; + targets = extraAttrs.buildTargets or []; + commands = map buildCommand targets; + in concatStringsSep "\n" commands; + + postFixup = '' + # Make sure that libGLESv2 is found by dlopen (if using EGL). + chromiumBinary="$libExecPath/$packageName" + origRpath="$(patchelf --print-rpath "$chromiumBinary")" + patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary" + ''; + }; + +# Remove some extraAttrs we supplied to the base attributes already. +in stdenv.mkDerivation (base // removeAttrs extraAttrs [ + "name" "gnFlags" "buildTargets" +]) diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix new file mode 100644 index 0000000000000..9d6c7fada7099 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix @@ -0,0 +1,215 @@ +{ newScope, config, stdenv, llvmPackages_9, llvmPackages_10 +, makeWrapper, ed +, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit +, libva ? null +, gcc, nspr, nss, patchelfUnstable, runCommand +, lib + +# package customization +# Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) +, channel ? "stable" +, gnomeSupport ? false, gnome ? null +, gnomeKeyringSupport ? false +, proprietaryCodecs ? true +, enablePepperFlash ? false +, enableWideVine ? false +, useVaapi ? false # Deprecated, use enableVaapi instead! +, enableVaapi ? false # Disabled by default due to unofficial support and issues on radeon +, ungoogled ? true +, useOzone ? false +, cupsSupport ? true +, pulseSupport ? config.pulseaudio or stdenv.isLinux +, commandLineArgs ? "" +}: + +let + llvmPackages = if channel != "stable" + then llvmPackages_10 + else llvmPackages_9; + stdenv = llvmPackages.stdenv; + + callPackage = newScope chromium; + + chromium = { + inherit stdenv llvmPackages; + + upstream-info = (callPackage ./update.nix {}).getChannel channel; + + mkChromiumDerivation = callPackage ./common.nix ({ + inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone; + inherit ungoogled; + gnChromium = gn; + } // lib.optionalAttrs (channel != "stable") { + # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): + gnChromium = gn.overrideAttrs (oldAttrs: { + version = "2020-03-23"; + src = fetchgit { + url = "https://gn.googlesource.com/gn"; + rev = "5ed3c9cc67b090d5e311e4bd2aba072173e82db9"; + sha256 = "00y2d35wvqmx9glaqhfb62wdgbfpwr77v0934nnvh9ks71vnsjqy"; + }; + }); + }); + + browser = callPackage ./browser.nix { inherit channel enableWideVine; }; + + plugins = callPackage ./plugins.nix { + inherit enablePepperFlash; + }; + + ungoogled-chromium = callPackage ./ungoogled.nix {}; + }; + + mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}"; + widevineCdm = let upstream-info = chromium.upstream-info; in stdenv.mkDerivation { + name = "chrome-widevine-cdm"; + + # The .deb file for Google Chrome + src = upstream-info.binary; + + nativeBuildInputs = [ patchelfUnstable ]; + + phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; + + unpackCmd = let + widevineCdmPath = + if upstream-info.channel == "stable" then + "./opt/google/chrome/WidevineCdm" + else if upstream-info.channel == "beta" then + "./opt/google/chrome-beta/WidevineCdm" + else if upstream-info.channel == "dev" then + "./opt/google/chrome-unstable/WidevineCdm" + else + throw "Unknown chromium channel."; + in '' + # Extract just WidevineCdm from upstream's .deb file + ar p "$src" data.tar.xz | tar xJ "${widevineCdmPath}" + + # Move things around so that we don't have to reference a particular + # chrome-* directory later. + mv "${widevineCdmPath}" ./ + + # unpackCmd wants a single output directory; let it take WidevineCdm/ + rm -rf opt + ''; + + doCheck = true; + checkPhase = '' + ! find -iname '*.so' -exec ldd {} + | grep 'not found' + ''; + + PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ]; + + patchPhase = '' + patchelf --set-rpath "$PATCH_RPATH" _platform_specific/linux_x64/libwidevinecdm.so + ''; + + installPhase = '' + mkdir -p $out/WidevineCdm + cp -a * $out/WidevineCdm/ + ''; + + meta = { + platforms = [ "x86_64-linux" ]; + license = lib.licenses.unfree; + }; + }; + + suffix = if channel != "stable" then "-" + channel else ""; + + sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName; + + version = chromium.browser.version; + + # We want users to be able to enableWideVine without rebuilding all of + # chromium, so we have a separate derivation here that copies chromium + # and adds the unfree WidevineCdm. + chromiumWV = let browser = chromium.browser; in if enableWideVine then + runCommand (browser.name + "-wv") { version = browser.version; } + '' + mkdir -p $out + cp -a ${browser}/* $out/ + chmod u+w $out/libexec/chromium + cp -a ${widevineCdm}/WidevineCdm $out/libexec/chromium/ + '' + else browser; + + optionalVaapiFlags = if useVaapi # TODO: Remove after 20.09: + then throw '' + Chromium's useVaapi was replaced by enableVaapi and you don't need to pass + "--ignore-gpu-blacklist" anymore (also no rebuilds are required anymore). + '' else lib.optionalString + (!enableVaapi) + "--add-flags --disable-accelerated-video-decode --add-flags --disable-accelerated-video-encode"; +in stdenv.mkDerivation { + name = "chromium${suffix}-${version}"; + inherit version; + + buildInputs = [ + makeWrapper ed + + # needed for GSETTINGS_SCHEMAS_PATH + gsettings-desktop-schemas glib gtk3 + + # needed for XDG_ICON_DIRS + gnome3.adwaita-icon-theme + ]; + + outputs = ["out" "sandbox"]; + + buildCommand = let + browserBinary = "${chromiumWV}/libexec/chromium/chromium"; + getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; + libPath = stdenv.lib.makeLibraryPath [ libva ]; + + in with stdenv.lib; '' + mkdir -p "$out/bin" + + eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ + --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ + ${optionalVaapiFlags} \ + ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} + + ed -v -s "$out/bin/chromium" << EOF + 2i + + if [ -x "/run/wrappers/bin/${sandboxExecutableName}" ] + then + export CHROME_DEVEL_SANDBOX="/run/wrappers/bin/${sandboxExecutableName}" + else + export CHROME_DEVEL_SANDBOX="$sandbox/bin/${sandboxExecutableName}" + fi + + '' + lib.optionalString (libPath != "") '' + # To avoid loading .so files from cwd, LD_LIBRARY_PATH here must not + # contain an empty section before or after a colon. + export LD_LIBRARY_PATH="\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}${libPath}" + '' + '' + + # libredirect causes chromium to deadlock on startup + export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')" + + export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS + + . + w + EOF + + ln -sv "${chromium.browser.sandbox}" "$sandbox" + + ln -s "$out/bin/chromium" "$out/bin/chromium-browser" + + mkdir -p "$out/share" + for f in '${chromium.browser}'/share/*; do # hello emacs */ + ln -s -t "$out/share/" "$f" + done + ''; + + inherit (chromium.browser) packageName; + meta = chromium.browser.meta; + passthru = { + inherit (chromium) upstream-info browser; + mkDerivation = chromium.mkChromiumDerivation; + inherit sandboxExecutableName; + }; +} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/dont-use-ANGLE-by-default.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/dont-use-ANGLE-by-default.patch new file mode 100644 index 0000000000000..9f14a304eb344 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/dont-use-ANGLE-by-default.patch @@ -0,0 +1,26 @@ +A field trial currently enables the passthrough command decoder, which causes +gl_factory.cc to try kGLImplementationEGLANGLE first, which causes Chromium to fail +to load libGLESv2.so on NixOS. It somehow does not try kGLImplementationDesktopGL, +and so there is no GL support at all. + +Revert to using the validating command decoder, which prevents gl_factory.cc +from touching allowed_impls, allowing it to successfully use kGLImplementationDesktopGL. + +diff --git a/ui/gl/gl_utils.cc b/ui/gl/gl_utils.cc +index 697cbed5fe2d..8419bdb21a2f 100644 +--- a/ui/gl/gl_utils.cc ++++ b/ui/gl/gl_utils.cc +@@ -71,9 +71,10 @@ bool UsePassthroughCommandDecoder(const base::CommandLine* command_line) { + } else if (switch_value == kCmdDecoderValidatingName) { + return false; + } else { +- // Unrecognized or missing switch, use the default. +- return base::FeatureList::IsEnabled( +- features::kDefaultPassthroughCommandDecoder); ++ // Ignore the field trial that enables it; disable it until ++ // gl_factory.cc kGLImplementationEGLANGLE issues are sorted ++ // out on NixOS. ++ return false; + } + } + } diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch new file mode 100644 index 0000000000000..b5372d1a25565 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch @@ -0,0 +1,74 @@ +--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc ++++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc +@@ -641,6 +641,7 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers( + // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's + // internal decoded frame. + if (buffer_allocation_mode_ != BufferAllocationMode::kNone && ++ buffer_allocation_mode_ != BufferAllocationMode::kWrapVdpau && + !vpp_vaapi_wrapper_) { + vpp_vaapi_wrapper_ = VaapiWrapper::Create( + VaapiWrapper::kVideoProcess, VAProfileNone, +@@ -665,7 +666,8 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers( + PictureBuffer buffer = buffers[i]; + buffer.set_size(requested_pic_size_); + std::unique_ptr<VaapiPicture> picture = vaapi_picture_factory_->Create( +- (buffer_allocation_mode_ == BufferAllocationMode::kNone) ++ ((buffer_allocation_mode_ == BufferAllocationMode::kNone) || ++ (buffer_allocation_mode_ == BufferAllocationMode::kWrapVdpau)) + ? vaapi_wrapper_ + : vpp_vaapi_wrapper_, + make_context_current_cb_, bind_image_cb_, buffer); +@@ -1093,6 +1095,12 @@ VaapiVideoDecodeAccelerator::GetSupportedProfiles() { + + VaapiVideoDecodeAccelerator::BufferAllocationMode + VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { ++ // NVIDIA blobs use VDPAU ++ if (VaapiWrapper::GetImplementationType() == VAImplementation::kNVIDIAVDPAU) { ++ LOG(INFO) << "VA-API driver on VDPAU backend"; ++ return BufferAllocationMode::kWrapVdpau; ++ } ++ + // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT + // |output_mode_| as well. + if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT) +@@ -1105,7 +1113,7 @@ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { + // depends on the bitstream and sometimes it's not enough to cover the amount + // of frames needed by the client pipeline (see b/133733739). + // TODO(crbug.com/911754): Enable for VP9 Profile 2. +- if (IsGeminiLakeOrLater() && ++ if (false && IsGeminiLakeOrLater() && + (profile_ == VP9PROFILE_PROFILE0 || profile_ == VP8PROFILE_ANY)) { + // Add one to the reference frames for the one being currently egressed, and + // an extra allocation for both |client_| and |decoder_|, see +--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h ++++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h +@@ -204,6 +204,7 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator + // Using |client_|s provided PictureBuffers and as many internally + // allocated. + kNormal, ++ kWrapVdpau, + }; + + // Decides the concrete buffer allocation mode, depending on the hardware +--- a/media/gpu/vaapi/vaapi_wrapper.cc ++++ b/media/gpu/vaapi/vaapi_wrapper.cc +@@ -131,6 +131,9 @@ media::VAImplementation VendorStringToImplementationType( + } else if (base::StartsWith(va_vendor_string, "Intel iHD driver", + base::CompareCase::SENSITIVE)) { + return media::VAImplementation::kIntelIHD; ++ } else if (base::StartsWith(va_vendor_string, "Splitted-Desktop Systems VDPAU", ++ base::CompareCase::SENSITIVE)) { ++ return media::VAImplementation::kNVIDIAVDPAU; + } + return media::VAImplementation::kOther; + } +--- a/media/gpu/vaapi/vaapi_wrapper.h ++++ b/media/gpu/vaapi/vaapi_wrapper.h +@@ -79,6 +79,7 @@ enum class VAImplementation { + kIntelIHD, + kOther, + kInvalid, ++ kNVIDIAVDPAU, + }; + + // This class handles VA-API calls and ensures proper locking of VA-API calls diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch new file mode 100644 index 0000000000000..bd278633f67e0 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch @@ -0,0 +1,48 @@ +From b2144fd28e09cd52e7a88a62a9d9b54cf9922f9f Mon Sep 17 00:00:00 2001 +From: Michael Weiss <dev.primeos@gmail.com> +Date: Tue, 14 Apr 2020 14:16:10 +0200 +Subject: [PATCH] Enable accelerated video decode on Linux + +This will enable accelerated video decode on Linux by default (i.e. +without "--ignore-gpu-blacklist"), but on NixOS we'll provide +"--disable-accelerated-video-decode" and +"--disable-accelerated-video-encode" by default to avoid regressions +(e.g. VA-API doesn't work properly for some radeon drivers). + +Video acceleration can then be enabled via: +chromium.override { enableVaapi = true; } +without rebuilding Chromium. +--- + gpu/config/software_rendering_list.json | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json +index 22712bdbf38f..a06dd19a50e4 100644 +--- a/gpu/config/software_rendering_list.json ++++ b/gpu/config/software_rendering_list.json +@@ -336,22 +336,6 @@ + ] + }, + { +- "id": 48, +- "description": "Accelerated video decode is unavailable on Linux", +- "cr_bugs": [137247, 1032907], +- "os": { +- "type": "linux" +- }, +- "exceptions": [ +- { +- "machine_model_name": ["Chromecast"] +- } +- ], +- "features": [ +- "accelerated_video_decode" +- ] +- }, +- { + "id": 50, + "description": "Disable VMware software renderer on older Mesa", + "cr_bugs": [145531, 332596, 571899, 629434], +-- +2.11.0 + diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/nix_plugin_paths_68.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/nix_plugin_paths_68.patch new file mode 100644 index 0000000000000..da6a4c92b4602 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/nix_plugin_paths_68.patch @@ -0,0 +1,61 @@ +diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc +index f4e119d..d9775bd 100644 +--- a/chrome/common/chrome_paths.cc ++++ b/chrome/common/chrome_paths.cc +@@ -68,21 +68,14 @@ static base::LazyInstance<base::FilePath> + g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; + + // Gets the path for internal plugins. +-bool GetInternalPluginsDirectory(base::FilePath* result) { +-#if defined(OS_MACOSX) +- // If called from Chrome, get internal plugins from a subdirectory of the +- // framework. +- if (base::mac::AmIBundled()) { +- *result = chrome::GetFrameworkBundlePath(); +- DCHECK(!result->empty()); +- *result = result->Append("Internet Plug-Ins"); +- return true; +- } +- // In tests, just look in the module directory (below). +-#endif +- +- // The rest of the world expects plugins in the module directory. +- return base::PathService::Get(base::DIR_MODULE, result); ++bool GetInternalPluginsDirectory(base::FilePath* result, ++ const std::string& ident) { ++ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; ++ const char* value = getenv(full_env.c_str()); ++ if (value == NULL) ++ return base::PathService::Get(base::DIR_MODULE, result); ++ else ++ *result = base::FilePath(value); + } + + // Gets the path for bundled implementations of components. Note that these +@@ -272,7 +265,7 @@ bool PathProvider(int key, base::FilePath* result) { + create_dir = true; + break; + case chrome::DIR_INTERNAL_PLUGINS: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "ALL")) + return false; + break; + case chrome::DIR_COMPONENTS: +@@ -280,7 +273,7 @@ bool PathProvider(int key, base::FilePath* result) { + return false; + break; + case chrome::DIR_PEPPER_FLASH_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) + return false; + cur = cur.Append(kPepperFlashBaseDirectory); + break; +@@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) { + cur = cur.DirName(); + } + #else +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PNACL")) + return false; + #endif + cur = cur.Append(FILE_PATH_LITERAL("pnacl")); diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patch new file mode 100644 index 0000000000000..6b788f43d29c0 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patch @@ -0,0 +1,17 @@ +--- chromium-70.0.3538.67/build/compute_build_timestamp.py.orig 2018-11-02 16:00:34.368933077 +0200 ++++ chromium-70.0.3538.67/build/compute_build_timestamp.py 2018-11-08 04:06:21.658105129 +0200 +@@ -94,6 +94,14 @@ + 'build_type', help='The type of build', choices=('official', 'default')) + args = argument_parser.parse_args() + ++ # I don't trust LASTCHANGE magic, and I definelly want something deterministic here ++ SOURCE_DATE_EPOCH = os.getenv("SOURCE_DATE_EPOCH", None) ++ if SOURCE_DATE_EPOCH is not None: ++ print(SOURCE_DATE_EPOCH) ++ return 0 ++ else: ++ raise RuntimeError("SOURCE_DATE_EPOCH not set") ++ + # The mtime of the revision in build/util/LASTCHANGE is stored in a file + # next to it. Read it, to get a deterministic time close to "now". + # That date is then modified as described at the top of the file so that diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/remove-webp-include-69.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/remove-webp-include-69.patch new file mode 100644 index 0000000000000..07572cf7ee947 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/remove-webp-include-69.patch @@ -0,0 +1,11 @@ +--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc ++++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc +@@ -13,7 +13,7 @@ + + #include "jpeglib.h" // for JPEG_MAX_DIMENSION + +-#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION ++#define WEBP_MAX_DIMENSION 16383 + + namespace blink { + diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patch new file mode 100644 index 0000000000000..32f0ae2fb5e66 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patch @@ -0,0 +1,13 @@ +diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn +index ed0e2f5208b..5b431a030d5 100644 +--- a/third_party/widevine/cdm/BUILD.gn ++++ b/third_party/widevine/cdm/BUILD.gn +@@ -14,7 +14,7 @@ buildflag_header("buildflags") { + + flags = [ + "ENABLE_WIDEVINE=$enable_widevine", +- "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm", ++ "BUNDLE_WIDEVINE_CDM=true", + "ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component", + ] + } diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix new file mode 100644 index 0000000000000..1dd9baa628ab5 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix @@ -0,0 +1,93 @@ +{ stdenv, gcc +, jshon +, glib +, nspr +, nss +, fetchzip +, patchelfUnstable +, enablePepperFlash ? false + +, upstream-info +}: + +with stdenv.lib; + +let + mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}"; + + # Generate a shell fragment that emits flags appended to the + # final makeWrapper call for wrapping the browser's main binary. + # + # Note that this is shell-escaped so that only the variable specified + # by the "output" attribute is substituted. + mkPluginInfo = { output ? "out", allowedVars ? [ output ] + , flags ? [], envVars ? {} + }: let + shSearch = ["'"] ++ map (var: "@${var}@") allowedVars; + shReplace = ["'\\''"] ++ map (var: "'\"\${${var}}\"'") allowedVars; + # We need to triple-escape "val": + # * First because makeWrapper doesn't do any quoting of its arguments by + # itself. + # * Second because it's passed to the makeWrapper call separated by IFS but + # not by the _real_ arguments, for example the Widevine plugin flags + # contain spaces, so they would end up as separate arguments. + # * Third in order to be correctly quoted for the "echo" call below. + shEsc = val: "'${replaceStrings ["'"] ["'\\''"] val}'"; + mkSh = val: "'${replaceStrings shSearch shReplace (shEsc val)}'"; + mkFlag = flag: ["--add-flags" (shEsc flag)]; + mkEnvVar = key: val: ["--set" (shEsc key) (shEsc val)]; + envList = mapAttrsToList mkEnvVar envVars; + quoted = map mkSh (flatten ((map mkFlag flags) ++ envList)); + in '' + mkdir -p "''$${output}/nix-support" + echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags" + ''; + + flash = stdenv.mkDerivation rec { + pname = "flashplayer-ppapi"; + version = "32.0.0.363"; + + src = fetchzip { + url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; + sha256 = "0znk8an892mykgbz56hyv3gz65vc9mhb3vn96c6bsvicwl1fn460"; + stripRoot = false; + }; + + patchPhase = '' + chmod +x libpepflashplayer.so + patchelf --set-rpath "${mkrpath [ gcc.cc ]}" libpepflashplayer.so + ''; + + doCheck = true; + checkPhase = '' + ! find -iname '*.so' -exec ldd {} + | grep 'not found' + ''; + + installPhase = '' + flashVersion="$( + "${jshon}/bin/jshon" -F manifest.json -e version -u + )" + + install -vD libpepflashplayer.so "$out/lib/libpepflashplayer.so" + + ${mkPluginInfo { + allowedVars = [ "out" "flashVersion" ]; + flags = [ + "--ppapi-flash-path=@out@/lib/libpepflashplayer.so" + "--ppapi-flash-version=@flashVersion@" + ]; + }} + ''; + + dontStrip = true; + + meta = { + license = stdenv.lib.licenses.unfree; + maintainers = with stdenv.lib.maintainers; [ taku0 ]; + platforms = platforms.x86_64; + }; + }; + +in { + enabled = optional enablePepperFlash flash; +} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix new file mode 100644 index 0000000000000..f6f3c06e93760 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix @@ -0,0 +1,6 @@ +{ + "81.0.4044.122" = { + rev = "81.0.4044.122-2"; + sha256 = "0bbr4a2gkgm3ykdgpj8x58sd3dwam6qkifhzfs2997681g7b2v2q"; + }; +} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled.nix new file mode 100644 index 0000000000000..17418c90af490 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled.nix @@ -0,0 +1,42 @@ +{ stdenv +, fetchFromGitHub +, python3Packages +, makeWrapper +, patch +}: +{ rev +, sha256 +}: + +stdenv.mkDerivation rec { + name = "ungoogled-chromium-${version}"; + + version = rev; + + src = fetchFromGitHub { + owner = "Eloston"; + repo = "ungoogled-chromium"; + inherit rev sha256; + }; + + dontBuild = true; + + buildInputs = [ + python3Packages.python + patch + ]; + + nativeBuildInputs = [ + makeWrapper + ]; + + patchPhase = '' + sed -i '/chromium-widevine/d' patches/series + ''; + + installPhase = '' + mkdir $out + cp -R * $out/ + wrapProgram $out/utils/patches.py --add-flags "apply" --prefix PATH : "${patch}/bin" + ''; +} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/update.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/update.nix new file mode 100644 index 0000000000000..6dff17c69ddb9 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/update.nix @@ -0,0 +1,271 @@ +let maybePkgs = import ../../../../../. {}; in + +{ stdenv ? maybePkgs.stdenv +, runCommand ? maybePkgs.runCommand +, fetchurl ? maybePkgs.fetchurl +, writeText ? maybePkgs.writeText +, curl ? maybePkgs.curl +, cacert ? maybePkgs.cacert +, nix ? maybePkgs.nix +}: + +let + inherit (stdenv) lib; + + sources = if builtins.pathExists ./upstream-info.nix + then import ./upstream-info.nix + else {}; + + bucketURL = "https://commondatastorage.googleapis.com/" + + "chromium-browser-official"; + + mkVerURL = version: "${bucketURL}/chromium-${version}.tar.xz"; + + debURL = "https://dl.google.com/linux/chrome/deb/pool/main/g"; + + getDebURL = channelName: version: arch: mirror: let + packageSuffix = if channelName == "dev" then "unstable" else channelName; + packageName = "google-chrome-${packageSuffix}"; + in "${mirror}/${packageName}/${packageName}_${version}-1_${arch}.deb"; + + # Untrusted mirrors, don't try to update from them! + debMirrors = [ + "http://95.31.35.30/chrome/pool/main/g" + "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" + "http://repo.fdzh.org/chrome/deb/pool/main/g" + ]; + +in { + getChannel = channel: let + chanAttrs = builtins.getAttr channel sources; + in { + inherit channel; + inherit (chanAttrs) version; + + main = fetchurl { + url = mkVerURL chanAttrs.version; + inherit (chanAttrs) sha256; + }; + + binary = fetchurl (let + mkUrls = arch: let + mkURLForMirror = getDebURL channel chanAttrs.version arch; + in map mkURLForMirror ([ debURL ] ++ debMirrors); + in if stdenv.is64bit && chanAttrs ? sha256bin64 then { + urls = mkUrls "amd64"; + sha256 = chanAttrs.sha256bin64; + } else if !stdenv.is64bit && chanAttrs ? sha256bin32 then { + urls = mkUrls "i386"; + sha256 = chanAttrs.sha256bin32; + } else throw "No Chrome plugins are available for your architecture."); + }; + + update = let + csv2nix = name: src: import (runCommand "${name}.nix" { + src = builtins.fetchurl src; + } '' + esc() { echo "\"$(echo "$1" | sed -e 's/"\\$/\\&/')\""; } # ohai emacs " + IFS=, read -r -a headings <<< "$(head -n1 "$src")" + echo "[" > "$out" + tail -n +2 "$src" | while IFS=, read -r -a line; do + echo " {" + for idx in "''${!headings[@]}"; do + echo " $(esc "''${headings[idx]}") = $(esc ''${line[$idx]});" + done + echo " }" + done >> "$out" + echo "]" >> "$out" + ''); + + channels = lib.fold lib.recursiveUpdate {} (map (attrs: { + ${attrs.os}.${attrs.channel} = attrs // { + history = let + drvName = "omahaproxy-${attrs.os}.${attrs.channel}-info"; + history = csv2nix drvName "http://omahaproxy.appspot.com/history"; + cond = h: attrs.os == h.os && attrs.channel == h.channel + && lib.versionOlder h.version attrs.current_version; + # Note that this is a *reverse* sort! + sorter = a: b: lib.versionOlder b.version a.version; + sorted = builtins.sort sorter (lib.filter cond history); + in map (lib.flip removeAttrs ["os" "channel"]) sorted; + version = attrs.current_version; + }; + }) (csv2nix "omahaproxy-info" "http://omahaproxy.appspot.com/all?csv=1")); + + /* + XXX: This is essentially the same as: + + builtins.tryEval (builtins.fetchurl url) + + ... except that tryEval on fetchurl isn't working and doesn't catch + errors for fetchurl, so we go for a different approach. + + We only have fixed-output derivations that can have networking access, so + we abuse SHA1 and its weaknesses to forge a fixed-output derivation which + is not so fixed, because it emits different contents that have the same + SHA1 hash. + + Using this method, we can distinguish whether the URL is available or + whether it's not based on the actual content. + + So let's use tryEval as soon as it's working with fetchurl in Nix. + */ + tryFetch = url: let + # SHA1 hash collisions from https://shattered.io/static/shattered.pdf: + collisions = runCommand "sha1-collisions" { + outputs = [ "out" "good" "bad" ]; + base64 = '' + QlpoOTFBWSZTWbL5V5MABl///////9Pv///v////+/////HDdK739/677r+W3/75rUNr4 + Aa/AAAAAAACgEVTRtQDQAaA0AAyGmjTQGmgAAANGgAaMIAYgGgAABo0AAAAAADQAIAGQ0 + MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk + 0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIAN + GgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRp + o0GIGgBoGQAABVTUExEZATTICnkxNR+p6E09JppoyamjGhkm0ammIyaekbUejU9JiGnqZ + qaaDxJ6m0JkZMQ2oaYmJ6gxqMyE2TUzJqfItligtJQJfYbl9Zy9QjQuB5mHQRdSSXCCTH + MgmSDYmdOoOmLTBJWiCpOhMQYpQlOYpJjn+wQUJSTCEpOMekaFaaNB6glCC0hKEJdHr6B + mUIHeph7YxS8WJYyGwgWnMTFJBDFSxSCCYljiEk7HZgJzJVDHJxMgY6tCEIIWgsKSlSZ0 + S8GckoIIF+551Ro4RCw260VCEpWJSlpWx/PMrLyVoyhWMAneDilBcUIeZ1j6NCkus0qUC + Wnahhk5KT4GpWMh3vm2nJWjTL9Qg+84iExBJhNKpbV9tvEN265t3fu/TKkt4rXFTsV+Nc + upJXhOhOhJMQQktrqt4K8mSh9M2DAO2X7uXGVL9YQxUtzQmS7uBndL7M6R7vX869VxqPu + renSuHYNq1yTXOfNWLwgvKlRlFYqLCs6OChDp0HuTzCWscmGudLyqUuwVGG75nmyZhKpJ + yOE/pOZyHyrZxGM51DYIN+Jc8yVJgAykxKCEtW55MlfudLg3KG6TtozalunXrroSxUpVL + StWrWLFihMnVpkyZOrQnUrE6xq1CGtJlbAb5ShMbV1CZgqlKC0wCFCpMmUKSEkvFLaZC8 + wHOCVAlvzaJQ/T+XLb5Dh5TNM67p6KZ4e4ZSGyVENx2O27LzrTIteAreTkMZpW95GS0CE + JYhMc4nToTJ0wQhKEyddaLb/rTqmgJSlkpnALxMhlNmuKEpkEkqhKUoEq3SoKUpIQcDgW + lC0rYahMmLuPQ0fHqZaF4v2W8IoJ2EhMhYmSw7qql27WJS+G4rUplToFi2rSv0NSrVvDU + pltQ8Lv6F8pXyxmFBSxiLSxglNC4uvXVKmAtusXy4YXGX1ixedEvXF1aX6t8adYnYCpC6 + rW1ZzdZYlCCxKEv8vpbqdSsXl8v1jCQv0KEPxPTa/5rtWSF1dSgg4z4KjfIMNtgwWoWLE + sRhKxsSA9ji7V5LRPwtumeQ8V57UtFSPIUmtQdOQfseI2Ly1DMtk4Jl8n927w34zrWG6P + i4jzC82js/46Rt2IZoadWxOtMInS2xYmcu8mOw9PLYxQ4bdfFw3ZPf/g2pzSwZDhGrZAl + 9lqky0W+yeanadC037xk496t0Dq3ctfmqmjgie8ln9k6Q0K1krb3dK9el4Xsu44LpGcen + r2eQZ1s1IhOhnE56WnXf0BLWn9Xz15fMkzi4kpVxiTKGEpffErEEMvEeMZhUl6yD1SdeJ + YbxzGNM3ak2TAaglLZlDCVnoM6wV5DRrycwF8Zh/fRsdmhkMfAO1duwknrsFwrzePWeMw + l107DWzymxdQwiSXx/lncnn75jL9mUzw2bUDqj20LTgtawxK2SlQg1CCZDQMgSpEqLjRM + sykM9zbSIUqil0zNk7Nu+b5J0DKZlhl9CtpGKgX5uyp0idoJ3we9bSrY7PupnUL5eWiDp + V5mmnNUhOnYi8xyClkLbNmAXyoWk7GaVrM2umkbpqHDzDymiKjetgzTocWNsJ2E0zPcfh + t46J4ipaXGCfF7fuO0a70c82bvqo3HceIcRlshgu73seO8BqlLIap2z5jTOY+T2ucCnBt + Atva3aHdchJg9AJ5YdKHz7LoA3VKmeqxAlFyEnQLBxB2PAhAZ8KvmuR6ELXws1Qr13Nd1 + i4nsp189jqvaNzt+0nEnIaniuP1+/UOZdyfoZh57ku8sYHKdvfW/jYSUks+0rK+qtte+p + y8jWL9cOJ0fV8rrH/t+85/p1z2N67p/ZsZ3JmdyliL7lrNxZUlx0MVIl6PxXOUuGOeArW + 3vuEvJ2beoh7SGyZKHKbR2bBWO1d49JDIcVM6lQtu9UO8ec8pOnXmkcponBPLNM2CwZ9k + NC/4ct6rQkPkQHMcV/8XckU4UJCy+VeTA== + ''; + } '' + echo "$base64" | base64 -d | tar xj + mv good.pdf "$good" + mv bad.pdf "$bad" + touch "$out" + ''; + + cacheVal = let + urlHash = builtins.hashString "sha256" url; + timeSlice = builtins.currentTime / 600; + in "${urlHash}-${toString timeSlice}"; + + in { + success = import (runCommand "check-success" { + result = stdenv.mkDerivation { + name = "tryfetch-${cacheVal}"; + inherit url; + + outputHash = "d00bbe65d80f6d53d5c15da7c6b4f0a655c5a86a"; + outputHashMode = "flat"; + outputHashAlgo = "sha1"; + + nativeBuildInputs = [ curl ]; + preferLocalBuild = true; + + inherit (collisions) good bad; + + buildCommand = '' + if SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" \ + curl -s -L -f -I "$url" > /dev/null; then + cp "$good" "$out" + else + cp "$bad" "$out" + fi + ''; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + }; + inherit (collisions) good; + } '' + if cmp -s "$result" "$good"; then + echo true > "$out" + else + echo false > "$out" + fi + ''); + value = builtins.fetchurl url; + }; + + fetchLatest = channel: let + result = tryFetch (mkVerURL channel.version); + in if result.success then result.value else fetchLatest (channel // { + version = if channel.history != [] + then (lib.head channel.history).version + else throw "Unfortunately there's no older version than " + + "${channel.version} available for channel " + + "${channel.channel} on ${channel.os}."; + history = lib.tail channel.history; + }); + + getHash = path: import (runCommand "gethash.nix" { + inherit path; + nativeBuildInputs = [ nix ]; + } '' + sha256="$(nix-hash --flat --base32 --type sha256 "$path")" + echo "\"$sha256\"" > "$out" + ''); + + isLatest = channel: version: let + ourVersion = sources.${channel}.version or null; + in if ourVersion == null then false + else lib.versionOlder version sources.${channel}.version + || version == sources.${channel}.version; + + # We only support GNU/Linux right now. + linuxChannels = let + genLatest = channelName: channel: let + newUpstream = { + inherit (channel) version; + sha256 = getHash (fetchLatest channel); + }; + keepOld = let + oldChannel = sources.${channelName}; + in { + inherit (oldChannel) version sha256; + } // lib.optionalAttrs (oldChannel ? sha256bin32) { + inherit (oldChannel) sha256bin32; + } // lib.optionalAttrs (oldChannel ? sha256bin64) { + inherit (oldChannel) sha256bin64; + }; + in if isLatest channelName channel.version then keepOld else newUpstream; + in lib.mapAttrs genLatest channels.linux; + + getLinuxFlash = channelName: channel: let + inherit (channel) version; + fetchArch = arch: tryFetch (getDebURL channelName version arch debURL); + packages = lib.genAttrs ["i386" "amd64"] fetchArch; + isNew = arch: attr: !(builtins.hasAttr attr channel) + && packages.${arch}.success; + in channel // lib.optionalAttrs (isNew "i386" "sha256bin32") { + sha256bin32 = getHash (packages.i386.value); + } // lib.optionalAttrs (isNew "amd64" "sha256bin64") { + sha256bin64 = getHash (packages.amd64.value); + }; + + newChannels = lib.mapAttrs getLinuxFlash linuxChannels; + + dumpAttrs = indent: attrs: let + mkVal = val: if lib.isAttrs val then dumpAttrs (indent + 1) val + else "\"${lib.escape ["$" "\\" "\""] (toString val)}\""; + mkIndent = level: lib.concatStrings (builtins.genList (_: " ") level); + mkAttr = key: val: "${mkIndent (indent + 1)}${key} = ${mkVal val};\n"; + attrLines = lib.mapAttrsToList mkAttr attrs; + in "{\n" + (lib.concatStrings attrLines) + (mkIndent indent) + "}"; + in writeText "chromium-new-upstream-info.nix" '' + # This file is autogenerated from update.sh in the same directory. + ${dumpAttrs 0 newChannels} + ''; +} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/update.sh b/pkgs/applications/networking/browsers/ungoogled-chromium/update.sh new file mode 100755 index 0000000000000..ea67a62c107a2 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/update.sh @@ -0,0 +1,4 @@ +#!/bin/sh -e +cd "$(dirname "$0")" +sp="$(nix-build --builders "" -Q --no-out-link update.nix -A update)" +cat "$sp" > upstream-info.nix diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix new file mode 100644 index 0000000000000..77505b47d8577 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix @@ -0,0 +1,18 @@ +# This file is autogenerated from update.sh in the same directory. +{ + beta = { + sha256 = "1s16wl101yabq0l7w0q50lxkr2gn090pcaj6l5sj6g5xvi9lhgbf"; + sha256bin64 = "0k6fsqlpiwp9vds83hb3cg9xf74hqgbfdm3ijyad2rmwc5rqk0ax"; + version = "83.0.4103.14"; + }; + dev = { + sha256 = "0djppzwzpfyyfjb1mhy5wws2379m3wpzyk2x3kw5nd0mdz35hbny"; + sha256bin64 = "1wg55qhfvd5zvigjl6496za81mh9b2c5da53zy07bk8wj91ly8pf"; + version = "84.0.4115.5"; + }; + stable = { + sha256 = "0ahqh3vmzbpai4xwn7qybgw9phc8ssjdvfc7384mxqk9swqgv7qg"; + sha256bin64 = "0gpgim244594m35qwf625blwdqgjbp4qr846wq75a9a9zqwqs05w"; + version = "81.0.4044.122"; + }; +} diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 0a72099e653cc..099d81c99f801 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { editor and also easily configurable during runtime. Vimb is mostly keyboard driven and does not detract you from your daily work. ''; - homepage = https://fanglingsu.github.io/vimb/; + homepage = "https://fanglingsu.github.io/vimb/"; license = stdenv.lib.licenses.gpl3; maintainers = []; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 776ed8f4471b4..f793491afe15e 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -5,6 +5,7 @@ , libuuid , gstreamer, gst-plugins-base, libxml2 , glib, gtk3, pango, gdk-pixbuf, cairo, atk, at-spi2-atk, at-spi2-core, gnome2 +, libdrm, mesa , nss, nspr , patchelf, makeWrapper , isSnapshot ? false @@ -17,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.11.1811.52-1"; + version = "3.0.1874.38-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0bq9ggk75xzka2nbrnc7vghq8s7jjy9nbfmyrf51kf0nni1zg1fp"; + sha256 = "03667f8rlk8shxq6ghjg4q9hqhsaw4gwpqnjpyili49qczd5423w"; }; unpackPhase = '' @@ -37,6 +38,7 @@ in stdenv.mkDerivation rec { atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr gstreamer libxml2 gst-plugins-base pango cairo gnome2.GConf + libdrm mesa ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; libPath = stdenv.lib.makeLibraryPath buildInputs diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 373fa43c72c3e..a15d6844f56df 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { LIBS = optionalString x11Support "-lX11"; meta = { - homepage = http://w3m.sourceforge.net/; + homepage = "http://w3m.sourceforge.net/"; description = "A text-mode web browser"; maintainers = [ maintainers.cstrahan ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/networking/browsers/webmacs/default.nix b/pkgs/applications/networking/browsers/webmacs/default.nix index b86ba3c39f063..7dbb6a3c53887 100644 --- a/pkgs/applications/networking/browsers/webmacs/default.nix +++ b/pkgs/applications/networking/browsers/webmacs/default.nix @@ -65,8 +65,8 @@ mkDerivationWith python3Packages.buildPythonApplication rec { Based on QtWebEngine and Python 3. Fully customizable in Python. ''; - homepage = https://webmacs.readthedocs.io/en/latest/; - changelog = https://github.com/parkouss/webmacs/blob/master/CHANGELOG.md; + homepage = "https://webmacs.readthedocs.io/en/latest/"; + changelog = "https://github.com/parkouss/webmacs/blob/master/CHANGELOG.md"; license = licenses.gpl3; maintainers = with maintainers; [ jacg ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix index c000a37ff0296..98d2f4aa81d60 100644 --- a/pkgs/applications/networking/c14/default.nix +++ b/pkgs/applications/networking/c14/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "C14 is designed for data archiving & long-term backups."; - homepage = https://www.online.net/en/storage/c14-cold-storage; + homepage = "https://www.online.net/en/storage/c14-cold-storage"; license = licenses.mit; maintainers = with maintainers; [ apeyroux ]; }; diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index 18a9bc0f42254..39ad9ef1d15fa 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "calls"; rev = "v${version}"; - sha256 = "0715cap3w8gppxlfaynhiqvc2ss512xgykjcpqq8f5syz2776skh"; + sha256 = "1wqkczl1fn4d2py00fsb6kh05avmc7c49gi49j3592fqsvi87j18"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 4c1f7ea77492d..11eb24ff70313 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -47,7 +47,7 @@ let meta = with stdenv.lib; { description = "Web Debugging Proxy"; - homepage = https://www.charlesproxy.com/; + homepage = "https://www.charlesproxy.com/"; maintainers = [ maintainers.kalbasit ]; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index d441e539aaa64..31bb18f20a828 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -1,17 +1,18 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, runCommand }: buildGoModule rec { pname = "cloudflared"; - version = "2020.2.1"; + version = "2020.3.2"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "1wyvf4bilhiwabqgdwmnhifwc845m4g17pz7xmndzvqwmfd7riw5"; + sha256 = "1vbxm5z72y9zfg4carmja3fc1vhkanmc25pgnlw550p1l14y6404"; }; - modSha256 = "1y5vh8g967rrm9b9hjlr70bs2rm09cpik673brgk3nzqxka10w7p"; + vendorSha256 = "14w2iz3ycbzfvlr8a6qn86aaa8687cm203d73wpfkfskp277hwz0"; + deleteVendor = true; buildFlagsArray = "-ldflags=-X main.Version=${version}"; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index f02b64e92c8ba..7179a29154344 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { sha256 = "12wq79h4m8wlzf18r66965mbbjjb62kvnxdj50ra7nxa8jjxpsmf"; }; - modSha256 = "1394bav1k1xv9n1rvji0j9a09mibk97xpha24640jkgmy9bnmg45"; + vendorSha256 = "0dhzr62x2lzf3w0j2r496cr7jvkdcavfqaqr2xh972k3qqc9caky"; subPackages = [ "cmd/argo" ]; @@ -41,9 +41,9 @@ buildGoModule rec { meta = with lib; { description = "Container native workflow engine for Kubernetes"; - homepage = https://github.com/argoproj/argo; + homepage = "https://github.com/argoproj/argo"; license = licenses.asl20; maintainers = with maintainers; [ groodt ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 7f9ebda93c0a3..4094989050512 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { sha256 = "01vsyrks1k5yfvrarv8ia0isr7snilr21b7lfiy860si82r2r8hj"; }; - modSha256 = "1qivg7yy7ymmgkrvl365x29d8jnsphbz18j1ykgwwysyw3n4jkdg"; + vendorSha256 = "0r2nh7v00m6zbdnhsgjn01q9pkiz41ckkqgfnpqmkxaqmjz31iyj"; nativeBuildInputs = [ packr ]; @@ -37,4 +37,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ shahrukh330 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index cb846060a3de1..b6077b5c4d827 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atlantis"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "1ylk6n13ln6yaq4nc4n7fm00wfiyqi2x33sca5avzsvd1b387kk6"; + sha256 = "16zz4xwpqipdmszbz93xxw31hbh7s8pfa9dm64ybyni7wc4lvdy6"; }; - modSha256 = "1bhplk3p780llpj9l0fwcyli74879968d6j582mvjwvf2winbqzq"; + vendorSha256 = null; subPackages = [ "." ]; @@ -22,4 +22,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ jpotier ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/chronos/default.nix b/pkgs/applications/networking/cluster/chronos/default.nix index 78be19cd81e5d..e0cc780841bfa 100644 --- a/pkgs/applications/networking/cluster/chronos/default.nix +++ b/pkgs/applications/networking/cluster/chronos/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = http://airbnb.github.io/chronos; + homepage = "http://airbnb.github.io/chronos"; license = licenses.asl20; description = "Fault tolerant job scheduler for Mesos which handles dependencies and ISO8601 based schedules"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; - broken = true; # doesn't build http://hydra.nixos.org/build/25768319 + broken = true; # doesn't build https://hydra.nixos.org/build/25768319 }; } diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix index ef90c0cde3210..2c0e73fb30dbb 100644 --- a/pkgs/applications/networking/cluster/click/default.nix +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -19,7 +19,7 @@ buildRustPackage rec { meta = with stdenv.lib; { description = ''The "Command Line Interactive Controller for Kubernetes"''; - homepage = https://github.com/databricks/click; + homepage = "https://github.com/databricks/click"; license = [ licenses.asl20 ]; maintainers = [ maintainers.mbode ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index 88dbd177da048..49d3aaa298de4 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "cni"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = pname; rev = "v${version}"; - sha256 = "15ad323dw44k82bfx9r8w5q2kn7jix60p9v4ciyzx2p5pip36wp8"; + sha256 = "02qn1br8164d99978acalisy1sx294g1axnii4yh1wji0fc735xz"; }; goPackagePath = "github.com/containernetworking/cni"; - meta = with stdenv.lib; { + + meta = with lib; { description = "Container Network Interface - networking for Linux containers"; license = licenses.asl20; - homepage = https://github.com/containernetworking/cni; + homepage = "https://github.com/containernetworking/cni"; maintainers = with maintainers; [ offline vdemeester ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/networking/cluster/cni/plugins-deps.nix b/pkgs/applications/networking/cluster/cni/plugins-deps.nix deleted file mode 100644 index a6bbd333be43e..0000000000000 --- a/pkgs/applications/networking/cluster/cni/plugins-deps.nix +++ /dev/null @@ -1,210 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/Microsoft/go-winio"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/go-winio"; - rev = "v0.4.11"; - sha256 = "14y1gryr3pb3zy09v2g8dh89m363rfd9sch0wgbabh531hfx72vn"; - }; - } - { - goPackagePath = "github.com/Microsoft/hcsshim"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/hcsshim"; - rev = "v0.7.4"; - sha256 = "0hky9p6xvkkx2jfkd4fy2d6iaikvlzalyw67gypyqyxygf2hsshg"; - }; - } - { - goPackagePath = "github.com/alexflint/go-filemutex"; - fetch = { - type = "git"; - url = "https://github.com/alexflint/go-filemutex"; - rev = "72bdc8eae2ae"; - sha256 = "082y6y9zv40q3kaqvsv6fyaw2fc42j0sn9z0dl9rbiz4szixj3c4"; - }; - } - { - goPackagePath = "github.com/buger/jsonparser"; - fetch = { - type = "git"; - url = "https://github.com/buger/jsonparser"; - rev = "f4dd9f5a6b44"; - sha256 = "12qa2n33s7yz88ywpr3k9kg3b4gm6rqgnv28iyikyxw8h5jascz5"; - }; - } - { - goPackagePath = "github.com/containernetworking/cni"; - fetch = { - type = "git"; - url = "https://github.com/containernetworking/cni"; - rev = "v0.7.0"; - sha256 = "15ad323dw44k82bfx9r8w5q2kn7jix60p9v4ciyzx2p5pip36wp8"; - }; - } - { - goPackagePath = "github.com/coreos/go-iptables"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-iptables"; - rev = "v0.4.1"; - sha256 = "0id1npqw3rd5rrkslf6i9yy6lpmd7l5qcglln38g85ylq7inysyi"; - }; - } - { - goPackagePath = "github.com/coreos/go-systemd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-systemd"; - rev = "39ca1b05acc7"; - sha256 = "1kzqrrzqspa5qm7kwslxl3m16lqzns23c24rv474ajzwmj3ixmx1"; - }; - } - { - goPackagePath = "github.com/d2g/dhcp4"; - fetch = { - type = "git"; - url = "https://github.com/d2g/dhcp4"; - rev = "f0e4d29ff023"; - sha256 = "07gn9bjvnlfz2jv9wdq3gxxxm9lpwgrwk8z65072jdrz9rs9izpr"; - }; - } - { - goPackagePath = "github.com/d2g/dhcp4client"; - fetch = { - type = "git"; - url = "https://github.com/d2g/dhcp4client"; - rev = "bed07e1bc5b8"; - sha256 = "0kyjalv1kah7sk3i96abg71cgy5s9kzpff2zc7mwj69vicbj7mi3"; - }; - } - { - goPackagePath = "github.com/d2g/dhcp4server"; - fetch = { - type = "git"; - url = "https://github.com/d2g/dhcp4server"; - rev = "477b11cea4dc"; - sha256 = "010dpw6cxrsm6dm49w1q6qpz5xz3lbi5viz6wywxk49fxvnzmx9l"; - }; - } - { - goPackagePath = "github.com/godbus/dbus"; - fetch = { - type = "git"; - url = "https://github.com/godbus/dbus"; - rev = "885f9cc04c9c"; - sha256 = "0wjpaj4vr5lvpnwc5faf3qizd7zd2v9yq0fm0558wap1hiyqb8x8"; - }; - } - { - goPackagePath = "github.com/j-keck/arping"; - fetch = { - type = "git"; - url = "https://github.com/j-keck/arping"; - rev = "2cf9dc699c56"; - sha256 = "1bid8mpx3j4546ni0a6q5xyz7hb854g95qnxqmg5jzs9vrcird3c"; - }; - } - { - goPackagePath = "github.com/juju/errors"; - fetch = { - type = "git"; - url = "https://github.com/juju/errors"; - rev = "22422dad46e1"; - sha256 = "1766ys24y9qgngaqbx0g84lmh54b3369v8hk5fa1k8si2d34fxas"; - }; - } - { - goPackagePath = "github.com/mattn/go-shellwords"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-shellwords"; - rev = "v1.0.3"; - sha256 = "1pg7pl25wvpl2dbpyrv9p1r7prnqimxlf6136vn0dfm54j2x4mnr"; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "7f8ab55aaf3b"; - sha256 = "0nas6wqdym4jx42kw9wj80b58r69k9qhnvglz009lj34g5gba7rw"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "2152b45fa28a"; - sha256 = "0amjlkawp84mmdqjgdamf93p1546cla6h4wwrx7hf5r862r2qcw2"; - }; - } - { - goPackagePath = "github.com/safchain/ethtool"; - fetch = { - type = "git"; - url = "https://github.com/safchain/ethtool"; - rev = "42ed695e3de8"; - sha256 = "0n5hkrzc1bh46nidcssx4539kvcmgj501v3kzh2pljpg27509daj"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.0.6"; - sha256 = "029irw2lsbqi944gdrbkwdw0m2794sqni4g21gsnmz142hbzds8c"; - }; - } - { - goPackagePath = "github.com/vishvananda/netlink"; - fetch = { - type = "git"; - url = "https://github.com/vishvananda/netlink"; - rev = "023a6dafdcdf"; - sha256 = "1i5q8r8rg7lxzvq2vhbf25lrkzdlgficfv0bxg9rf7cgg6z819sn"; - }; - } - { - goPackagePath = "github.com/vishvananda/netns"; - fetch = { - type = "git"; - url = "https://github.com/vishvananda/netns"; - rev = "13995c7128cc"; - sha256 = "1zk6w8158qi4niva5rijchbv9ixgmijsgqshh54wdaav4xrhjshn"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "7c1a557ab941"; - sha256 = "1f1q9mby8m7ws3gbj90v0prhnf4g2sgf74azmw31kzwd6azlar3m"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "49bb7cea24b1"; - sha256 = "111q4qm3hcjvzvyv9y5rz8ydnyg48rckcygxqy6gv63q618wz6gn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "66b7b1311ac8"; - sha256 = "00ny4r2bbj6rz939iy9g699acqydq7rfi6r6awn25w9i2dld9m13"; - }; - } -] diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 39c3b9f65072f..4aa15b218df74 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -1,24 +1,26 @@ -{ stdenv, lib, fetchFromGitHub, go, removeReferencesTo, buildGoPackage }: -buildGoPackage rec { +{ lib, fetchFromGitHub, buildGoModule, nixosTests }: + +buildGoModule rec { pname = "cni-plugins"; - version = "0.8.4"; + version = "0.8.6"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "02kz6y3klhbriybsskn4hmldwli28cycnp2klsm2x0y9c73iczdp"; + sha256 = "0f1cqxjf26sy1c4aw6y7pyd9lrz0vknby4q5j6xj77a1pab9073m"; }; - goDeps = ./plugins-deps.nix; - goPackagePath = "github.com/containernetworking/plugins"; + vendorSha256 = null; + + buildFlagsArray = [ + "-ldflags=-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=${version}" + ]; + subPackages = [ - "plugins/meta/bandwidth" - "plugins/meta/firewall" - "plugins/meta/flannel" - "plugins/meta/portmap" - "plugins/meta/sbr" - "plugins/meta/tuning" + "plugins/ipam/dhcp" + "plugins/ipam/host-local" + "plugins/ipam/static" "plugins/main/bridge" "plugins/main/host-device" "plugins/main/ipvlan" @@ -26,15 +28,21 @@ buildGoPackage rec { "plugins/main/macvlan" "plugins/main/ptp" "plugins/main/vlan" - "plugins/ipam/dhcp" - "plugins/ipam/host-local" - "plugins/ipam/static" + "plugins/meta/bandwidth" + "plugins/meta/firewall" + "plugins/meta/flannel" + "plugins/meta/portmap" + "plugins/meta/sbr" + "plugins/meta/tuning" ]; + + passthru.tests.podman = nixosTests.podman; + meta = with lib; { description = "Some standard networking plugins, maintained by the CNI team"; - homepage = https://github.com/containernetworking/plugins; + homepage = "https://github.com/containernetworking/plugins"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan saschagrunert ]; + maintainers = with maintainers; [ cstrahan ] ++ teams.podman.members; }; } diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index 115dc3835fc55..a801a12237445 100644 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "machine"; @@ -14,17 +14,17 @@ buildGoPackage rec { sha256 = "0xxzxi5v7ji9j2k7kxhi0ah91lfa7b9rg3nywgx0lkv8dlgp8kmy"; }; - postInstall = '' - mkdir -p \ - $bin/share/bash-completion/completions/ \ - $bin/share/zsh/site-functions/ + nativeBuildInputs = [ installShellFiles ]; - cp go/src/github.com/docker/machine/contrib/completion/bash/* $bin/share/bash-completion/completions/ - cp go/src/github.com/docker/machine/contrib/completion/zsh/* $bin/share/zsh/site-functions/ + postInstall = '' + pushd go/src/${goPackagePath}/contrib/completion + installShellCompletion --bash bash/* + installShellCompletion --zsh zsh/* + popd ''; meta = with stdenv.lib; { - homepage = https://docs.docker.com/machine/; + homepage = "https://docs.docker.com/machine/"; description = "Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage Docker Engine on the hosts."; license = licenses.asl20; maintainers = with maintainers; [ offline tailhook ]; diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix index 716e9da8b7e5b..0c5a716aa8a14 100644 --- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix @@ -1,22 +1,23 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath preBuild; + inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 commit; pname = "docker-machine-hyperkit"; - subPackages = [ "cmd/drivers/hyperkit" ]; - modSha256 = minikube.go-modules.outputHash; + buildPhase = '' + make docker-machine-driver-hyperkit COMMIT=${commit} + ''; - postInstall = '' - mv $out/bin/hyperkit $out/bin/docker-machine-driver-hyperkit + installPhase = '' + install out/docker-machine-driver-hyperkit -Dt $out/bin ''; meta = with lib; { - homepage = https://github.com/kubernetes/minikube/blob/master/docs/drivers.md; + homepage = "https://minikube.sigs.k8s.io/docs/drivers/hyperkit"; description = "HyperKit driver for docker-machine."; license = licenses.asl20; maintainers = with maintainers; [ atkinschang ]; platforms = platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix index de122dd2a5a24..9352ba69da88c 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix @@ -19,7 +19,7 @@ buildGoPackage rec { buildInputs = [ libvirt ]; meta = with stdenv.lib; { - homepage = https://github.com/dhiltgen/docker-machine-kvm; + homepage = "https://github.com/dhiltgen/docker-machine-kvm"; description = "KVM driver for docker-machine."; license = licenses.asl20; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index 609b7b02cbb46..60d478fe15846 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -1,22 +1,27 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath preBuild; + inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 commit; pname = "docker-machine-kvm2"; - subPackages = [ "cmd/drivers/kvm" ]; - modSha256 = minikube.go-modules.outputHash; + postPatch = '' + sed -i '/GOARCH=$*/d' Makefile + ''; + + buildPhase = '' + make docker-machine-driver-kvm2 COMMIT=${commit} + ''; - postInstall = '' - mv $out/bin/kvm $out/bin/docker-machine-driver-kvm2 + installPhase = '' + install out/docker-machine-driver-kvm2 -Dt $out/bin ''; meta = with lib; { - homepage = https://github.com/kubernetes/minikube/blob/master/docs/drivers.md; + homepage = "https://minikube.sigs.k8s.io/docs/drivers/kvm2"; description = "KVM2 driver for docker-machine."; license = licenses.asl20; maintainers = with maintainers; [ tadfisher atkinschang ]; - platforms = platforms.unix; + platforms = platforms.linux; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix index 1f1e59a56a4e8..8c63a70b6d6e4 100644 --- a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix +++ b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix @@ -30,7 +30,7 @@ buildGoPackage rec { buildInputs = [ Hypervisor vmnet ]; meta = with stdenv.lib; { - homepage = https://github.com/machine-drivers/docker-machine-driver-xhyve; + homepage = "https://github.com/machine-drivers/docker-machine-driver-xhyve"; description = "Xhyve driver for docker-machine."; license = licenses.bsd3; maintainers = with maintainers; [ periklis ]; diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index f8c73c65991ca..3d418f9a47fb8 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A distributed stream processing framework"; - homepage = https://flink.apache.org; - downloadPage = https://flink.apache.org/downloads.html; + homepage = "https://flink.apache.org"; + downloadPage = "https://flink.apache.org/downloads.html"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ mbode ]; - repositories.git = git://git.apache.org/flink.git; + repositories.git = "git://git.apache.org/flink.git"; }; } diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 10991d47cca9e..4354d72a5bd90 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1w6ndp0nrpps6pkxnq38hikbnzwahi6j9gn8l0bxd0qkf7cjc5w0"; }; - modSha256 = "0zwq7n1lggj27j5yxgfplbaccw5fhbm7vm0sja839r1jamrn3ips"; + vendorSha256 = "0w5l1lkzx4frllflkbilj8qqwf54wkz7hin7q8xn1vflkv3lxcnp"; subPackages = [ "cmd/fluxctl" ]; @@ -23,4 +23,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ Gonzih filalex77 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 88ca9b3da9473..2e4f68d6bfa75 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "helm"; - version = "3.1.2"; + version = "3.2.1"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "0pg5cwgyfb4isy2fn233kj3bdn0i8qqp90yzix0khs5maalpnrk1"; + sha256 = "1453qkd9s4z4r0xzmv8ym7qfg33szf6gizfkb5zxj590fcbsgnd7"; }; - modSha256 = "0618zzi4x37ahsrazsr82anghhfva8yaryzb3p5d737p3ixbiyv8"; + vendorSha256 = "0j25m56cwzjd9b75v7xlb26q81bsmln77k23h9n8v2f2gqwwpkrl"; subPackages = [ "cmd/helm" ]; buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ]; @@ -23,7 +23,7 @@ buildGoModule rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/kubernetes/helm; + homepage = "https://github.com/kubernetes/helm"; description = "A package manager for kubernetes"; license = licenses.asl20; maintainers = with maintainers; [ rlupton20 edude03 saschagrunert Frostman ]; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 1318ff003de3b..f193186144a29 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,6 +1,6 @@ { lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: -let version = "0.106.3"; in +let version = "0.114.0"; in buildGoModule { pname = "helmfile"; @@ -10,12 +10,12 @@ buildGoModule { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "0pwkkgdcj9vx6nk574iaqwn074qfpgqd1c44d3kr3xdbac89yfyf"; + sha256 = "0486wcfizi8xljr29mznc4p11ggz4rvk5n53qvb30f7ry4ncc8n5"; }; goPackagePath = "github.com/roboll/helmfile"; - modSha256 = "1yv2b44qac0rms66v0qg13wsga0di6hwxa4dh2l0b1xvaf75ysay"; + vendorSha256 = "0m16l3px2ykdsrmlirf7c4lwgmigs6p3rdr61l49acwsmniz2m8a"; nativeBuildInputs = [ makeWrapper ]; @@ -36,4 +36,4 @@ buildGoModule { maintainers = with lib.maintainers; [ pneumaticat yurrriq ]; platforms = lib.platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix new file mode 100644 index 0000000000000..992b6c4dc5e30 --- /dev/null +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub, ... }: + +buildGoModule rec { + pname = "helmsman"; + version = "3.3.0"; + + src = fetchFromGitHub { + owner = "Praqma"; + repo = "helmsman"; + rev = "v${version}"; + sha256 = "0i7sg3iwxb07gjxcz6chpdcx3fqykzldmf7s1c9m02hkps910ca8"; + }; + + vendorSha256 = "05vnysr5r3hbayss1pyifgp989kjw81h95iack8ady62k6ys5njl"; + + meta = with lib; { + description = "Helm Charts (k8s applications) as Code tool"; + homepage = "https://github.com/Praqma/helmsman"; + license = licenses.mit; + maintainers = with maintainers; [ lynty ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix index b9413577b1044..aa86dcbeb241a 100644 --- a/pkgs/applications/networking/cluster/heptio-ark/default.nix +++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix @@ -13,11 +13,11 @@ buildGoPackage rec { sha256 = "18h9hvp95va0hyl268gnzciwy1dqmc57bpifbj885870rdfp0ffv"; }; - postInstall = "rm $bin/bin/issue-template-gen"; + excludedPackages = [ "issue-template-gen" ]; meta = with stdenv.lib; { description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; - homepage = https://heptio.github.io/ark/; + homepage = "https://heptio.github.io/ark/"; license = licenses.asl20; maintainers = [maintainers.mbode]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix index 1d9940c8f3189..98edd849bac51 100644 --- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1iqgpmljqx6rhmvsir2675waj78amcfiw08knwvlmavjgpxx2ysw"; }; - modSha256 = "0jjrk93wdi13wrb5gchhqk7rgwm74kcizrbqsibgkgs2dszwfazh"; + vendorSha256 = "1jh2f66ys6rmrrwrf5zqfprgcvziyq6l4z8bfqwxgf1ysnxx525h"; buildFlagsArray = '' -ldflags= @@ -25,4 +25,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ eliasp ]; platforms = lib.platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch b/pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch deleted file mode 100644 index 223d6c6c2477a..0000000000000 --- a/pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 40b8eaacb3a24c466c17c8a65938330d5805b112 Mon Sep 17 00:00:00 2001 -From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com> -Date: Fri, 8 Mar 2019 14:10:11 -0800 -Subject: [PATCH] chore: fix the location of thrift - -Thrift is no longer available at the git.apache.org and it's now -distributed on GitHub at github.com/apache/thrift. - -fixes #3320 ---- - go.mod | 2 ++ - go.sum | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/go.mod b/go.mod -index 04bcc84cc..e26c4cf1d 100644 ---- a/go.mod -+++ b/go.mod -@@ -184,3 +184,5 @@ replace k8s.io/metrics => k8s.io/metrics v0.0.0-20181128195641-3954d62a524d - replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190122181752-bebe27e40fb7 - - replace k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190115164855-701b91367003+incompatible -+ -+replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 -diff --git a/go.sum b/go.sum -index c9fdf8768..6ed69e69d 100644 ---- a/go.sum -+++ b/go.sum -@@ -87,6 +87,7 @@ github.com/antham/chyle v1.4.0/go.mod h1:D94Z4aE/ECudyNoTHwkhqu77mjGPZtfPG8dNoeI - github.com/antham/envh v1.2.0/go.mod h1:ocIRPHuwwjyBVBtuUJOJc2TYzGg+d23xSAZexl4y9hQ= - github.com/antham/strumt v0.0.0-20171215230529-6776189777d3/go.mod h1:sE7EYIUE0nQzPiv5zQAmw2aVkei0j2xmb4gTIIqSFSI= - github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ= -+github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= - github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= - github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= - github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I= diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 88aa8777ee5ec..df39e5d867685 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -1,22 +1,17 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "jx"; - version = "1.3.967"; + pname = "jx"; + version = "2.1.31"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "0a25m7sz134kch21bg6l86kvwl4cg6babqf57kqidq6kid1zgdaq"; + sha256 = "1rbdmqi6m042jxd3hhqw821l567s9zzzgp0cvx8467yfi449qipn"; }; - patches = [ - # https://github.com/jenkins-x/jx/pull/3321 - ./3321-fix-location-of-thrift.patch - ]; - - modSha256 = "0ljf0c0c3pc12nmhdbrwflcaj6hs8igzjw5hi6fyhi6n9cy87vac"; + vendorSha256 = "1jn636sv6ak6hngw4fpgxqm6gfay2ip6g3gafjb3m4adcc5n9f8s"; subPackages = [ "cmd/jx" ]; @@ -28,7 +23,7 @@ buildGoModule rec { meta = with lib; { description = "JX is a command line tool for installing and using Jenkins X."; - homepage = https://jenkins-x.io; + homepage = "https://jenkins-x.io"; longDescription = '' Jenkins X provides automated CI+CD for Kubernetes with Preview Environments on Pull Requests using Jenkins, Knative Build, Prow, diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 0fd5814386815..ee1b08f8be44e 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -1,6 +1,22 @@ -{ stdenv, lib, makeWrapper, socat, iptables, iproute, bridge-utils -, conntrack-tools, buildGoPackage, git, runc, libseccomp, pkgconfig -, ethtool, utillinux, ipset, fetchFromGitHub, fetchurl, fetchzip +{ stdenv +, lib +, makeWrapper +, socat +, iptables +, iproute +, bridge-utils +, conntrack-tools +, buildGoPackage +, git +, runc +, libseccomp +, pkgconfig +, ethtool +, utillinux +, ipset +, fetchFromGitHub +, fetchurl +, fetchzip , fetchgit }: @@ -47,7 +63,7 @@ let # Note: marked as apache 2.0 license url = "https://github.com/rancher/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar"; sha256 = "12xafn5jivl8lqdcs25b28xrc4mf7yf1xif5np169nvvxgvmpdxp"; - stripRoot=false; + stripRoot = false; }; k3sPlugins = buildGoPackage rec { name = "k3s-cni-plugins"; @@ -66,7 +82,7 @@ let meta = { description = "CNI plugins, as patched by rancher for k3s"; license = licenses.asl20; - homepage = https://k3s.io; + homepage = "https://k3s.io"; maintainers = [ maintainers.euank ]; platforms = platforms.linux; }; @@ -126,8 +142,8 @@ let installPhase = '' pushd go/src/${goPackagePath} - mkdir -p "$bin/bin" - install -m 0755 -t "$bin/bin" ./bin/* + mkdir -p "$out/bin" + install -m 0755 -t "$out/bin" ./bin/* popd ''; @@ -135,7 +151,7 @@ let meta = { description = "The various binaries that get packaged into the final k3s binary."; license = licenses.asl20; - homepage = https://k3s.io; + homepage = "https://k3s.io"; maintainers = [ maintainers.euank ]; platforms = platforms.linux; }; @@ -153,6 +169,12 @@ let nativeBuildInputs = [ git pkgconfig ]; buildInputs = [ k3sBuildStage1 k3sPlugins runc ]; + # k3s appends a suffix to the final distribution binary for some arches + archSuffix = + if stdenv.hostPlatform.system == "x86_64-linux" then "" + else if stdenv.hostPlatform.system == "aarch64-linux" then "-arm64" + else throw "k3s isn't being built for ${stdenv.hostPlatform.system} yet."; + # In order to build the thick k3s binary (which is what # ./scripts/package-cli does), we need to get all the binaries that script # expects in place. @@ -181,8 +203,8 @@ let installPhase = '' pushd go/src/${goPackagePath} - mkdir -p "$bin/bin" - install -m 0755 -t "$bin/bin" ./dist/artifacts/k3s + mkdir -p "$out/bin" + install -m 0755 -T ./dist/artifacts/k3s${archSuffix} "$out/bin/k3s" popd ''; @@ -190,7 +212,7 @@ let meta = { description = "The k3s go binary which is used by the final wrapped output below."; license = licenses.asl20; - homepage = https://k3s.io; + homepage = "https://k3s.io"; maintainers = [ maintainers.euank ]; platforms = platforms.linux; }; @@ -202,12 +224,20 @@ stdenv.mkDerivation rec { # Important utilities used by the kubelet, see # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 # Note the list in that issue is stale and some aren't relevant for k3s. - k3sRuntimeDeps = [ - socat iptables iproute bridge-utils ethtool utillinux ipset conntrack-tools + k3sRuntimeDeps = [ + socat + iptables + iproute + bridge-utils + ethtool + utillinux + ipset + conntrack-tools ]; - buildInputs = [ - k3sBuild makeWrapper + buildInputs = [ + k3sBuild + makeWrapper ] ++ k3sRuntimeDeps; unpackPhase = "true"; @@ -225,11 +255,11 @@ stdenv.mkDerivation rec { --prefix PATH : "$out/bin" ''; - meta = { - description = "A lightweight Kubernetes distribution."; - license = licenses.asl20; - homepage = https://k3s.io; - maintainers = [ maintainers.euank ]; - platforms = platforms.linux; - }; + meta = { + description = "A lightweight Kubernetes distribution."; + license = licenses.asl20; + homepage = "https://k3s.io"; + maintainers = [ maintainers.euank ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/networking/cluster/k3s/patches/00-k3s.patch b/pkgs/applications/networking/cluster/k3s/patches/00-k3s.patch index afe2c356aa4d9..1e39792df5cf4 100644 --- a/pkgs/applications/networking/cluster/k3s/patches/00-k3s.patch +++ b/pkgs/applications/networking/cluster/k3s/patches/00-k3s.patch @@ -55,10 +55,17 @@ index 72d3c07ece..3e5455b262 100755 echo Building containerd-shim make -C ./vendor/github.com/containerd/containerd bin/containerd-shim diff --git a/scripts/package-cli b/scripts/package-cli -index 4c66ce32df..6d1e0c03cb 100755 +index 4c66ce32df..280b428bb8 100755 --- a/scripts/package-cli +++ b/scripts/package-cli -@@ -55,10 +55,10 @@ LDFLAGS=" +@@ -49,16 +49,16 @@ fi + + CMD_NAME=dist/artifacts/k3s${BIN_SUFFIX} + +-go generate ++CGO_ENABLED=0 env -u GOARCH go generate + LDFLAGS=" + -X github.com/rancher/k3s/pkg/version.Version=$VERSION -X github.com/rancher/k3s/pkg/version.GitCommit=${COMMIT:0:8} -w -s " diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 1cf76e1cff30c..4be3398f4be8a 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.18.1"; + version = "0.19.4"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "0a5x4yamvx2qlwngfvainbhplwp0hqwgvdqlj2jbrbz4hfhr1l59"; + sha256 = "1ya3lrw31pxd1rxzf88l5hzilaxwrng1a3ibawgn57my333hrmf6"; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - modSha256 = "0wpf6iyq6p3a8azdkn17gdp01wq9khyzr1bab6qgvsnsnhnjzcky"; + vendorSha256 = "0vvzv5v7j77v809h2ial9n23244j1sy3xhkarsv0wwkifc3swvq5"; meta = with stdenv.lib; { description = "Kubernetes CLI To Manage Your Clusters In Style."; @@ -26,4 +26,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ Gonzih ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/applications/networking/cluster/kanif/default.nix index 52abc3189903d..ebf98840ee2ba 100644 --- a/pkgs/applications/networking/cluster/kanif/default.nix +++ b/pkgs/applications/networking/cluster/kanif/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { directories to several nodes ('kaput' command), and to gather several remote files or directories locally ('kaget' command). It relies on TakTuk for efficiency and scalability.''; - homepage = http://taktuk.gforge.inria.fr/kanif; + homepage = "http://taktuk.gforge.inria.fr/kanif"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bzizou ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index 09a69f4b80e25..c01e1c8c00417 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -15,9 +15,10 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - $bin/bin/kompose completion bash > kompose.bash - $bin/bin/kompose completion zsh > kompose.zsh - installShellCompletion kompose.{bash,zsh} + for shell in bash zsh; do + $out/bin/kompose completion $shell > kompose.$shell + installShellCompletion kompose.$shell + done ''; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix index 359b289dbbcdf..87ae71f6a48dc 100644 --- a/pkgs/applications/networking/cluster/kontemplate/default.nix +++ b/pkgs/applications/networking/cluster/kontemplate/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { license = licenses.gpl3; maintainers = with maintainers; [ mbode tazjin ]; platforms = platforms.unix; - repositories.git = git://github.com/tazjin/kontemplate.git; + repositories.git = "git://github.com/tazjin/kontemplate.git"; longDescription = '' Kontemplate is a simple CLI tool that can take sets of diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 0e71e91fbc1e4..027809c61e5b9 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata, installShellFiles }: let goPackagePath = "k8s.io/kops"; @@ -18,7 +18,7 @@ let inherit sha256; }; - nativeBuildInputs = [ go-bindata ]; + nativeBuildInputs = [ go-bindata installShellFiles ]; subPackages = [ "cmd/kops" ]; buildFlagsArray = '' @@ -33,15 +33,15 @@ let ''; postInstall = '' - mkdir -p $bin/share/bash-completion/completions - mkdir -p $bin/share/zsh/site-functions - $bin/bin/kops completion bash > $bin/share/bash-completion/completions/kops - $bin/bin/kops completion zsh > $bin/share/zsh/site-functions/_kops + for shell in bash zsh; do + $out/bin/kops completion $shell > kops.$shell + installShellCompletion kops.$shell + done ''; meta = with stdenv.lib; { description = "Easiest way to get a production Kubernetes up and running"; - homepage = https://github.com/kubernetes/kops; + homepage = "https://github.com/kubernetes/kops"; license = licenses.asl20; maintainers = with maintainers; [ offline zimbatm kampka ]; platforms = platforms.unix; @@ -51,28 +51,13 @@ in rec { mkKops = generic; - kops_1_12 = mkKops { - version = "1.12.3"; - sha256 = "0rpbaz54l5v1z7ab5kpxcb4jyakkl5ysgz1sxajqmw2d6dvf7xly"; - }; - - kops_1_13 = mkKops { - version = "1.13.2"; - sha256 = "0lkkg34vn020r62ga8vg5d3a8jwvq00xlv3p1s01nkz33f6salng"; - }; - - kops_1_14 = mkKops { - version = "1.14.1"; - sha256 = "0ikd8qwrjh8s1sc95g18sm0q6p33swz2m1rjd8zw34mb2w9jv76n"; - }; - kops_1_15 = mkKops { - version = "1.15.2"; - sha256 = "1sjfd7pfi81ccq1dkgkh9xx6y94bqzlp727pvyf7l01x3d14z2b3"; + version = "1.15.3"; + sha256 = "0pzgrsl61nw8pm3s032lj020fw13x3fpzlj7lknsnd581f0gg4df"; }; kops_1_16 = mkKops { - version = "1.16.0"; - sha256 = "1b2lzf6b29rs5imbpqp8gnp3b511lk7jrm2f62y32gmx0gyjws6a"; + version = "1.16.2"; + sha256 = "1vhkjhx1n3f6ggw5cy1avs3sbqb2da6khck9zqd4s7almjbpc2h2"; }; } diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index 2eea6adb28d14..c6ae0629d7c61 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kube3d"; - version = "1.6.0"; + version = "1.7.0"; k3sVersion = "1.17.3-k3s1"; goPackagePath = "github.com/rancher/k3d"; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "0qjwqqynvgzainq66fpzczgynwk3hv7wzgfy5271fc6mj2k0zz5x"; + sha256 = "0aij2l7zmg4cxbw7pwf7ddc64di25hpjvbmp1madhz9q28rwfa9w"; }; buildFlagsArray = '' @@ -21,7 +21,7 @@ buildGoModule rec { -X github.com/rancher/k3d/version.K3sVersion=v${k3sVersion} ''; - modSha256 = "0c8bfl0hz5cfhi6jzhhylz051jiix6s7s20fn23w7wri4xaqrjn8"; + vendorSha256 = null; meta = with stdenv.lib; { homepage = "https://github.com/rancher/k3d"; @@ -30,4 +30,4 @@ buildGoModule rec { platforms = platforms.linux; maintainers = with maintainers; [ kuznero jlesquembre ngerstle ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 69d013e3f0340..bf4ec94921570 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -17,7 +17,7 @@ buildGoPackage { meta = { description = "A tool for managing Kubernetes resources as code"; - homepage = https://github.com/bitnami/kubecfg; + homepage = "https://github.com/bitnami/kubecfg"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ benley ]; platforms = lib.platforms.unix; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 004e88ff44e47..3a91efd064cc5 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.17.3"; + version = "1.18.1"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0caqczz8hrwqb8j94158hz6919i7c9v1v0zknh9m2zbbng4b1awi"; + sha256 = "1z109h0jqqfxvgyhmxsiggf6fb9kdrwvmv9wdi1n58n4yk65hvl6"; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { meta = { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; - homepage = https://kubernetes.io; + homepage = "https://kubernetes.io"; maintainers = with maintainers; [johanot offline saschagrunert]; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/cluster/kubernix/default.nix b/pkgs/applications/networking/cluster/kubernix/default.nix new file mode 100644 index 0000000000000..2251b12e499ae --- /dev/null +++ b/pkgs/applications/networking/cluster/kubernix/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "kubernix"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "saschagrunert"; + repo = pname; + rev = "v${version}"; + sha256 = "04dzfdzjwcwwaw9min322g30q0saxpq5kqzld4f22fmk820ki6gp"; + }; + + cargoSha256 = "17agwqx7nhzi124yq1s6zpqb227drrhp9c11r3jbicc08dz88bwg"; + doCheck = false; + + meta = with stdenv.lib; { + description = "Single dependency Kubernetes clusters for local testing, experimenting and development"; + homepage = "https://github.com/saschagrunert/kubernix"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ saschagrunert ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index ef87b67a36002..9ef8d943aaa28 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,23 +2,25 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.12.0"; + version = "0.12.3"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "0z51iwdc4m0y8wyyx3mcvbzxlrgws7n5wkcd0g7nr73irnsld4lh"; + sha256 = "1h8n2219xh0gl42kz3rkv3aj3wfwivvs9skwbbrvmrkwwrpxkgdj"; }; - modSha256 = "029h0zr3fpzlsv9hf1d1x5j7aalxkcsyszsxjz8fqrhjafqc7zvq"; + vendorSha256 = null; subPackages = [ "cmd/kubeseal" ]; + buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + meta = with lib; { description = "A Kubernetes controller and tool for one-way encrypted Secrets"; homepage = "https://github.com/bitnami-labs/sealed-secrets"; license = licenses.asl20; maintainers = with maintainers; [ groodt ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix index 779edad8de340..114c5f5af152e 100644 --- a/pkgs/applications/networking/cluster/kubetail/default.nix +++ b/pkgs/applications/networking/cluster/kubetail/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { multiple pods into one stream. This is the same as running "kubectl logs -f " but for multiple pods. ''; - homepage = https://github.com/johanhaleby/kubetail; + homepage = "https://github.com/johanhaleby/kubetail"; license = licenses.asl20; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index 54be5956040c4..10d75435e4214 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -2,22 +2,22 @@ buildGoModule rec { pname = "kubeval"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "instrumenta"; repo = "kubeval"; rev = "${version}"; - sha256 = "0kpwk7bv36m3i8vavm1pqc8l611c6l9qbagcc64v6r85qig4w5xv"; + sha256 = "05li0qv4q7fy2lr50r6c1r8dhx00jb1g01qmgc72a9zqp378yiq0"; }; - modSha256 = "0y9x44y3bchi8xg0a6jmp2rmi8dybkl6qlywb6nj1viab1s8dd4y"; + vendorSha256 = "1kpwvi84i3h1yjprd6m6hn8l9j235931871y3qk9cl0g8q0hv9ja"; meta = with lib; { description = "Validate your Kubernetes configuration files"; - homepage = https://github.com/instrumenta/kubeval; + homepage = "https://github.com/instrumenta/kubeval"; license = licenses.asl20; - maintainers = with maintainers; [ nicknovitski ]; + maintainers = with maintainers; [ johanot nicknovitski ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 8c0265d149149..331cef0444cdf 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,23 +2,23 @@ buildGoModule { pname = "linkerd-unstablle"; - version = "2019-07-26"; + version = "2020-05-01"; src = fetchFromGitHub { owner = "linkerd"; repo = "linkerd2"; - rev = "065dd3ec9d4b84c90383b31be16ccadd34a8ab0d"; - sha256 = "01m8g627sd126as0a74fy9svmymwd41sifd897nhn6kz78a21gq8"; + rev = "9e9f3bb1e2aeab8cf20f98f5cad159bbb6f24883"; + sha256 = "1pvj31wz1klwhcqga1m8kixdqsxwmppp9ix6r3wpp4dwfig45fm0"; }; - modSha256 = "0gahhywpcj16ww4l8s3wjwvavq24fpy258snhyf94ipy6lb797sl"; + vendorSha256 = "0vls58ld50jca5yn73kvg3lx4z83cc7skky54a90pkbj737y58pz"; subPackages = [ "cli/cmd" ]; meta = with stdenv.lib; { description = "A service mesh for Kubernetes and beyond."; - homepage = https://linkerd.io/; + homepage = "https://linkerd.io/"; license = licenses.asl20; maintainers = with maintainers; [ Gonzih ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index af20be1b0da6c..ced4c45d059d5 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "luigi"; - version = "2.8.12"; + version = "2.8.13"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1p83mxqs7w5v27a58ps7wji5mlyfz66cpkbyrndix0pv9hdyzpxn"; + sha256 = "0x14549iwj7r1knc0hmic9ny9hp960yjjqi4mxl78jb69gd3bhmf"; }; propagatedBuildInputs = with python3Packages; [ dateutil tornado_4 python-daemon boto3 ]; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs = ["--prefix PYTHONPATH . :"]; meta = with lib; { - homepage = https://github.com/spotify/luigi; + homepage = "https://github.com/spotify/luigi"; description = "Python package that helps you build complex pipelines of batch jobs"; longDescription = '' Luigi handles dependency resolution, workflow management, visualization, diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix index b7decc0c14136..df571f4cf8690 100644 --- a/pkgs/applications/networking/cluster/marathon/default.nix +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://mesosphere.github.io/marathon; + homepage = "https://mesosphere.github.io/marathon"; description = "Cluster-wide init and control system for services in cgroups or Docker containers"; license = licenses.asl20; maintainers = with maintainers; [ kamilchm pradeepchhetri ]; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index f49f1768ced4a..040447b0ccd9a 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -1,67 +1,56 @@ { stdenv , buildGoModule , fetchFromGitHub -, pkgconfig -, makeWrapper , go-bindata +, installShellFiles +, pkg-config +, which , libvirt , vmnet }: buildGoModule rec { - pname = "minikube"; - version = "1.8.1"; + pname = "minikube"; + version = "1.10.1"; + # for -ldflags - commit = "cbda04cf6bbe65e987ae52bb393c10099ab62014"; + commit = "63ab801ac27e5742ae442ce36dff7877dcccb278"; - goPackagePath = "k8s.io/minikube"; - subPackages = [ "cmd/minikube" ]; - modSha256 = "1wyz8aq291lx614ilqrcgzdc8rjxbd6v3rv1fy6r2m6snyysycfn"; + vendorSha256 = "1l9dxn7yy21x4b3cg6l5a08wx2ng8qf531ilg8yf1rznwfwjajrv"; src = fetchFromGitHub { - owner = "kubernetes"; - repo = "minikube"; - rev = "v${version}"; - sha256 = "1nf0n701rw3anp8j7k3f553ipqwpzzxci41zsi0il4l35dpln5g0"; + owner = "kubernetes"; + repo = "minikube"; + rev = "v${version}"; + sha256 = "05lv6k0j0l00s2895fryp027aa40whbf1gf3fhfg0z5d3p9sbprk"; }; - nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ libvirt ] - ++ stdenv.lib.optionals stdenv.isDarwin [ vmnet ]; - - preBuild = '' - go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/... - go-bindata -nomemcopy -o pkg/minikube/translate/translations.go -pkg translate translations/... + nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; - VERSION_MAJOR=$(grep "^VERSION_MAJOR" Makefile | sed "s/^.*\s//") - VERSION_MINOR=$(grep "^VERSION_MINOR" Makefile | sed "s/^.*\s//") - ISO_VERSION=v$VERSION_MAJOR.$VERSION_MINOR.0 - ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//") + buildInputs = if stdenv.isDarwin then [ vmnet ] else if stdenv.isLinux then [ libvirt ] else null; - export buildFlagsArray="-ldflags=\ - -X ${goPackagePath}/pkg/version.version=v${version} \ - -X ${goPackagePath}/pkg/version.isoVersion=$ISO_VERSION \ - -X ${goPackagePath}/pkg/version.isoPath=$ISO_BUCKET \ - -X ${goPackagePath}/pkg/version.gitCommitID=${commit} \ - -X ${goPackagePath}/pkg/drivers/kvm.version=v${version} \ - -X ${goPackagePath}/pkg/drivers/kvm.gitCommitID=${commit} \ - -X ${goPackagePath}/pkg/drivers/hyperkit.version=v${version} \ - -X ${goPackagePath}/pkg/drivers/hyperkit.gitCommitID=${commit}" + buildPhase = '' + make COMMIT=${commit} ''; - postInstall = '' - mkdir -p $out/share/bash-completion/completions/ - MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $out/bin/minikube completion bash > $out/share/bash-completion/completions/minikube + installPhase = '' + install out/minikube -Dt $out/bin + + export HOME=$PWD + export MINIKUBE_WANTUPDATENOTIFICATION=false + export MINIKUBE_WANTKUBECTLDOWNLOADMSG=false - mkdir -p $out/share/zsh/site-functions/ - MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $out/bin/minikube completion zsh > $out/share/zsh/site-functions/_minikube + for shell in bash zsh; do + $out/bin/minikube completion $shell > minikube.$shell + installShellCompletion minikube.$shell + done ''; meta = with stdenv.lib; { - homepage = https://github.com/kubernetes/minikube; + homepage = "https://minikube.sigs.k8s.io"; description = "A tool that makes it easy to run Kubernetes locally"; - license = licenses.asl20; + license = licenses.asl20; maintainers = with maintainers; [ ebzzry copumpkin vdemeester atkinschang ]; - platforms = with platforms; unix; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix index 43e960d9403ee..0c932396e9e25 100644 --- a/pkgs/applications/networking/cluster/minishift/default.nix +++ b/pkgs/applications/networking/cluster/minishift/default.nix @@ -48,7 +48,7 @@ in buildGoPackage rec { ''; postInstall = '' - wrapProgram "$bin/bin/minishift" \ + wrapProgram "$out/bin/minishift" \ --prefix PATH ':' '${lib.makeBinPath [ docker-machine-kvm openshift ]}' ''; @@ -59,7 +59,7 @@ in buildGoPackage rec { a single-node OpenShift cluster inside a VM. You can try out OpenShift or develop with it, day-to-day, on your local host. ''; - homepage = https://github.com/minishift/minishift; + homepage = "https://github.com/minishift/minishift"; maintainers = with maintainers; [ fpletz vdemeester ]; platforms = platforms.linux; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/applications/networking/cluster/node-problem-detector/default.nix new file mode 100644 index 0000000000000..f68d5f08e66e2 --- /dev/null +++ b/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -0,0 +1,43 @@ +{ stdenv, buildGoModule, fetchFromGitHub, systemd }: + +buildGoModule rec { + pname = "node-problem-detector"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "kubernetes"; + repo = pname; + rev = "v${version}"; + sha256 = "02avknglmkr9k933a64hkw0rjfxvyh4sc3x70p41b8q2g6vzv2gs"; + }; + + vendorSha256 = null; + + # Optionally, a log counter binary can be created to parse journald logs. + # The binary is dynamically linked against systemd libraries, making it a + # Linux-only feature. See 'ENABLE_JOURNALD' upstream: + # https://github.com/kubernetes/node-problem-detector/blob/master/Makefile + subPackages = [ "cmd/nodeproblemdetector" ] ++ + stdenv.lib.optionals stdenv.isLinux [ "cmd/logcounter" ]; + + preBuild = '' + export CGO_ENABLED=${if stdenv.isLinux then "1" else "0"} + ''; + + buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd ]; + + buildFlags = "-mod vendor" + + stdenv.lib.optionalString stdenv.isLinux " -tags journald"; + + buildFlagsArray = [ + "-ldflags=" + "-X k8s.io/${pname}/pkg/version.version=v${version}" + ]; + + meta = with stdenv.lib; { + description = "Various problem detectors running on the Kubernetes nodes"; + homepage = "https://github.com/kubernetes/node-problem-detector"; + license = licenses.asl20; + maintainers = with maintainers; [ lbpdt ]; + }; +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 1243bf7db49d3..da668b9589af5 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "nomad"; - version = "0.10.5"; + version = "0.11.1"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "0i9104anf3qaydm1izlwrzvpzizd6p1zy651hsynscnnxa56cmyk"; + sha256 = "1pcn1bk7sqhhsrm3izqljwyrwdz6bdlplrajvjzka39l3k6f9hgc"; }; # ui: @@ -32,7 +32,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - homepage = https://www.nomadproject.io/; + homepage = "https://www.nomadproject.io/"; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; platforms = platforms.unix; license = licenses.mpl20; diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index fb88dfdbb6432..b547434d8da13 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, utillinux -, coreutils, kerberos, clang +, coreutils, kerberos, ncurses, clang, installShellFiles , components ? [ "cmd/oc" "cmd/openshift" @@ -9,12 +9,12 @@ with lib; let - version = "3.11.0"; + version = "4.1.0"; ver = stdenv.lib.elemAt (stdenv.lib.splitVersion version); versionMajor = ver 0; versionMinor = ver 1; versionPatch = ver 2; - gitCommit = "0cbc58b"; + gitCommit = "b4261e0"; # version is in vendor/k8s.io/kubernetes/pkg/version/base.go k8sversion = "v1.11.1"; k8sgitcommit = "b1b2997"; @@ -28,29 +28,17 @@ in buildGoPackage rec { owner = "openshift"; repo = "origin"; rev = "v${version}"; - sha256 = "06q4v2a1mm6c659ab0rzkqz6b66vx4avqfg0s9xckwhq420lzgka"; + sha256 = "16bc6ljm418kxz92gz8ldm82491mvlqamrvigyr6ff72rf7ml7ba"; }; goPackagePath = "github.com/openshift/origin"; - buildInputs = [ kerberos ]; + buildInputs = [ kerberos ncurses ]; - nativeBuildInputs = [ which rsync go-bindata clang ]; + nativeBuildInputs = [ which rsync go-bindata clang installShellFiles ]; patchPhase = '' patchShebangs ./hack - - substituteInPlace pkg/oc/clusterup/docker/host/host.go \ - --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \ - 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt' - - substituteInPlace pkg/oc/clusterup/docker/host/host.go \ - --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \ - 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' - - substituteInPlace pkg/oc/clusterup/docker/host/host.go \ - --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \ - 'nsenter --mount=/rootfs/proc/1/ns/mnt ${coreutils}/bin/mkdir' ''; buildPhase = '' @@ -58,6 +46,7 @@ in buildGoPackage rec { # Openshift build require this variables to be set # unless there is a .git folder which is not the case with fetchFromGitHub echo "OS_GIT_VERSION=v${version}" >> os-version-defs + echo "OS_GIT_TREE_STATE=clean" >> os-version-defs echo "OS_GIT_MAJOR=${versionMajor}" >> os-version-defs echo "OS_GIT_MINOR=${versionMinor}" >> os-version-defs echo "OS_GIT_PATCH=${versionPatch}" >> os-version-defs @@ -72,16 +61,16 @@ in buildGoPackage rec { ''; installPhase = '' - mkdir -p $bin/bin - cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$bin/bin/" - install -D -t "$bin/etc/bash_completion.d" contrib/completions/bash/* - install -D -t "$bin/share/zsh/site-functions" contrib/completions/zsh/* + mkdir -p $out/bin + cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/" + installShellCompletion --bash contrib/completions/bash/* + installShellCompletion --zsh contrib/completions/zsh/* ''; meta = with stdenv.lib; { description = "Build, deploy, and manage your applications with Docker and Kubernetes"; license = licenses.asl20; - homepage = http://www.openshift.org; + homepage = "http://www.openshift.org"; maintainers = with maintainers; [offline bachp moretea]; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index de0bb015852cf..65a4a19384305 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with lib; { description = "Containerized Data Analytics"; - homepage = https://github.com/pachyderm/pachyderm; + homepage = "https://github.com/pachyderm/pachyderm"; license = licenses.asl20; maintainers = with maintainers; [offline]; }; diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix index 26c39f8cbe216..afcd736e629c6 100644 --- a/pkgs/applications/networking/cluster/pig/default.nix +++ b/pkgs/applications/networking/cluster/pig/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://pig.apache.org/; + homepage = "https://pig.apache.org/"; description = "High-level language for Apache Hadoop"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix index 0b2f798d35b46..4ad685418d35f 100644 --- a/pkgs/applications/networking/cluster/prow/default.nix +++ b/pkgs/applications/networking/cluster/prow/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "0mc3ynmbf3kidibdy8k3v3xjlvmxl8w7zm1z2m0skmhd0y4bpmk4"; }; - modSha256 = "1xajdg10a27icc7g1y3ym4pkgg64rp4afybbjlhbg3k3whir9xa1"; + vendorSha256 = "16fdc5r28andm8my4fxj0f1yygx6j2mvn92i6xdfhbcra0lvr4ql"; subPackages = [ "prow/cmd/admission" @@ -63,4 +63,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 53b421ec5521d..ddde1e50eddeb 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0krdfaha19wzi10rh0wfhki5nknbd5mndaxhrq7y9m840xy43d6d"; }; - modSha256 = "1wb15vrkb4ryvrjp68ygmadnf78s354106ya210pnmsbb53rbhaz"; + vendorSha256 = "1cyr621fb6hxwswz9lf75brc9qjy1n9rqjkwi6r8s3y6nhw20db6"; meta = with lib; { description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ groodt ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index b8d4b947e3249..162585851d0c6 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; maintainers = with maintainers; [ thoughtpolice offline kamilchm ]; - repositories.git = git://git.apache.org/spark.git; + repositories.git = "git://git.apache.org/spark.git"; }; } diff --git a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix new file mode 100644 index 0000000000000..7c948fbcdfc79 --- /dev/null +++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli }: +stdenv.mkDerivation rec { + pname = "ssm-session-manager-plugin"; + version = "1.1.61.0"; + + src = fetchurl { + url = + "https://s3.amazonaws.com/session-manager-downloads/plugin/${version}/ubuntu_64bit/session-manager-plugin.deb"; + sha256 = "0z59irrpwhjjhn379454xyraqs590hij2n6n6k25w5hh8ak7imfl"; + }; + + nativeBuildInputs = [ autoPatchelfHook dpkg ]; + + buildInputs = [ awscli ]; + + unpackPhase = "dpkg-deb -x $src ."; + + installPhase = + "install -m755 -D usr/local/sessionmanagerplugin/bin/session-manager-plugin $out/bin/session-manager-plugin"; + + meta = with lib; { + homepage = + "https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html"; + description = "Amazon SSM Session Manager Plugin"; + platforms = [ "x86_64-linux" ]; + license = licenses.unfree; + maintainers = with maintainers; [ mbaillie ]; + }; +} diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 144d46043ffe5..8ad0e8711f2fa 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildPackages, buildGoPackage, fetchFromGitHub, installShellFiles }: let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in @@ -17,13 +17,15 @@ buildGoPackage rec { goDeps = ./deps.nix; + nativeBuildInputs = [ installShellFiles ]; + postInstall = - let stern = if isCrossBuild then buildPackages.stern else "$bin"; in + let stern = if isCrossBuild then buildPackages.stern else "$out"; in '' - mkdir -p $bin/share/bash-completion/completions - ${stern}/bin/stern --completion bash > $bin/share/bash-completion/completions/stern - mkdir -p $bin/share/zsh/site-functions - ${stern}/bin/stern --completion zsh > $bin/share/zsh/site-functions/_stern + for shell in bash zsh; do + ${stern}/bin/stern --completion $shell > stern.$shell + installShellCompletion stern.$shell + done ''; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix index 3423163f59026..a5a2ace2399ba 100644 --- a/pkgs/applications/networking/cluster/taktuk/default.nix +++ b/pkgs/applications/networking/cluster/taktuk/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { network to transport commands and perform I/Os multiplexing. It doesn't require any specific software on the nodes thanks to a self-propagation algorithm.''; - homepage = http://taktuk.gforge.inria.fr/; + homepage = "http://taktuk.gforge.inria.fr/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bzizou ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/applications/networking/cluster/terraform-inventory/default.nix index 1bb8df88d0101..38fbd1b428656 100644 --- a/pkgs/applications/networking/cluster/terraform-inventory/default.nix +++ b/pkgs/applications/networking/cluster/terraform-inventory/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/adammck/terraform-inventory; + homepage = "https://github.com/adammck/terraform-inventory"; description = "Terraform state to ansible inventory adapter"; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/applications/networking/cluster/terraform-landscape/default.nix b/pkgs/applications/networking/cluster/terraform-landscape/default.nix index 32f6680b2f8bd..903aa9abb6e2b 100644 --- a/pkgs/applications/networking/cluster/terraform-landscape/default.nix +++ b/pkgs/applications/networking/cluster/terraform-landscape/default.nix @@ -10,7 +10,7 @@ bundlerApp { meta = with lib; { description = "Improve Terraform's plan output to be easier to read and understand"; - homepage = https://github.com/coinbase/terraform-landscape; + homepage = "https://github.com/coinbase/terraform-landscape"; license = with licenses; asl20; maintainers = with maintainers; [ mbode manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index d07b6321cb2c3..6994f2b85a33a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -4,9 +4,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-aci"; - rev = "v0.1.8"; - version = "0.1.8"; - sha256 = "14hya00ygz0khljjxwvkp6wbrbsavh2n8f26s2mjakph2havb8a3"; + rev = "v0.2.1"; + version = "0.2.1"; + sha256 = "1ylc3w5m68q7vvdignrgw3kwdmrw7w0blmfffxc4cam0a6a7q05l"; }; acme = { @@ -28,9 +28,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - rev = "v1.77.0"; - version = "1.77.0"; - sha256 = "0g8i8dmxzgkzylh2hh4fa9nq6x8bmxqaz0ly0f0cijb82lcbc3qf"; + rev = "v1.80.1"; + version = "1.80.1"; + sha256 = "0d483lp3rwz99f77sds717hafzbz1z7gq58dw52qzqagam8lrc10"; }; archive = { @@ -52,33 +52,33 @@ { owner = "terraform-providers"; repo = "terraform-provider-auth0"; - rev = "v0.8.1"; - version = "0.8.1"; - sha256 = "0hfmbw76p99xa9jz2sjss56p4wzqqhnf9l9gqgyamywfrdd2bn57"; + rev = "v0.9.3"; + version = "0.9.3"; + sha256 = "04dd7jxhpw2dqj6h3sbknbl1fa92jzshznm8icxrjajpxhcnbc32"; }; - aviatrix = + avi = { owner = "terraform-providers"; - repo = "terraform-provider-aviatrix"; - rev = "v2.12.0"; - version = "2.12.0"; - sha256 = "01n3cqb5k8gd0cll3nqbdmnx3mi0scm57j0xpzhxnif14kpj15g6"; + repo = "terraform-provider-avi"; + rev = "18.2.8"; + version = "18.2.8"; + sha256 = "0vpa6wksvb4gz65hgq0vizw0bky400bqh9zgf41g0mqkhv3wwb4i"; }; - avi = + aviatrix = { owner = "terraform-providers"; - repo = "terraform-provider-avi"; - rev = "v0.2.1"; - version = "0.2.1"; - sha256 = "1pyknx5maq1qxm4i2y69iz9c2ym3q3n0fd4hbwxcl83n39cb5iy6"; + repo = "terraform-provider-aviatrix"; + rev = "v2.13.0"; + version = "2.13.0"; + sha256 = "1913fp3lfvdr3npwr0vbdhb4xsvyyr1r76hv3h7rg5fidf3vpw5a"; }; aws = { owner = "terraform-providers"; repo = "terraform-provider-aws"; - rev = "v2.55.0"; - version = "2.55.0"; - sha256 = "0pxmwdy5cin0navva1nf3l02yrqqbg01xcq3hf8w0ch8fgr8mr25"; + rev = "v2.59.0"; + version = "2.59.0"; + sha256 = "0hkvjvabw8phl5mb9km2dxm64a5lf56g9aq9qf593zsij1rsjwkk"; }; azuread = { @@ -92,9 +92,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - rev = "v2.3.0"; - version = "2.3.0"; - sha256 = "195r6l0ddpjmmf947c1k5v0vdscnhsg2ilp6x7pna418pnx84y2d"; + rev = "v2.7.0"; + version = "2.7.0"; + sha256 = "0w4bafj3kn5kvkrc26ix1y9rgf3w4810x7la7g1aclpg7507fcv3"; }; azurestack = { @@ -108,9 +108,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-baiducloud"; - rev = "v1.1.0"; - version = "1.1.0"; - sha256 = "1va0b9vqfcv2nrqh8jwf80ylyl1x826jhb7h4ghnf18c144qm0i1"; + rev = "v1.2.0"; + version = "1.2.0"; + sha256 = "1s2vk4vjni5nc50pdw60pm0grrf835xy551i6d4cmfxkkpqx3f6f"; }; bigip = { @@ -180,17 +180,25 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - rev = "v2.5.0"; - version = "2.5.0"; - sha256 = "1dqxn2iwbidmfb0850sicwqh4yp6ynarkl36lnr8nqw9lasvqr5a"; + rev = "v2.6.0"; + version = "2.6.0"; + sha256 = "01z2znif5yy4bawcf76b6d0j3b67fljbx87b4b2cb5vqy4l4aamk"; + }; + cloudinit = + { + owner = "hashicorp"; + repo = "terraform-provider-cloudinit"; + rev = "v1.0.0"; + version = "1.0.0"; + sha256 = "0i926f4xkfydd2bxmim69xrvi9ymn1vrc66zl117axzsmy9200zx"; }; cloudscale = { owner = "terraform-providers"; repo = "terraform-provider-cloudscale"; - rev = "v2.1.1"; - version = "2.1.1"; - sha256 = "122yi2wbd8mqddkwp2la6vwqw0kw7c9ff5j6y4xqczjg2bwb9mph"; + rev = "v2.1.2"; + version = "2.1.2"; + sha256 = "052pa17a77fkmhvygfgmpz87xlc08qvz1apzc2scg2449xfdv7zb"; }; cloudstack = { @@ -228,9 +236,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-digitalocean"; - rev = "v1.15.1"; - version = "1.15.1"; - sha256 = "0nld6lgz5vy8n4s0y0wpssrslp866rha2znli6pd5sw1nvi6yg0z"; + rev = "v1.16.0"; + version = "1.16.0"; + sha256 = "0yymgkn66a9mif0wic4rais7ap6d4gfxij835ssr2pr3rb49ay8d"; }; dme = { @@ -268,9 +276,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-dome9"; - rev = "v1.17.0"; - version = "1.17.0"; - sha256 = "123phc71rnb25lv9glybadhmr3pdsrbzl7xm6mj8j213a78qdmn5"; + rev = "v1.18.1"; + version = "1.18.1"; + sha256 = "0m4fxpik55z9ah5nlhvy314xyxvlaldqbwdp3bx1xs9kpm3znvyl"; }; dyn = { @@ -284,9 +292,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-exoscale"; - rev = "v0.16.1"; - version = "0.16.1"; - sha256 = "0gs39nx12ws0ikal9zyqkyfiljbxbw0pj7llj9xsq96s7crvy6xr"; + rev = "v0.16.2"; + version = "0.16.2"; + sha256 = "102z4v3shk0as76v90151j4c6p93wy16m1hzzk1yp50dlc8ffsks"; }; external = { @@ -300,9 +308,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-fastly"; - rev = "v0.13.0"; - version = "0.13.0"; - sha256 = "0mcjmk21fil4q98p8v3qln7s2fqbdkjv1pvba0cf9v9d101dhhi9"; + rev = "v0.14.0"; + version = "0.14.0"; + sha256 = "1ak5gyrv66dnf5qy54hvwc4478n3cs5nxd0nwa2vf0gn2zp55bhy"; }; flexibleengine = { @@ -332,33 +340,33 @@ { owner = "terraform-providers"; repo = "terraform-provider-github"; - rev = "v2.5.1"; - version = "2.5.1"; - sha256 = "1lqnwq5gsz34n6zzwajxrh0i1cbyicl4zxakr4fch7makri2fqwg"; + rev = "v2.6.1"; + version = "2.6.1"; + sha256 = "1hg5pij2hllj6m6x8salsgw404ap7pw6yccvgynw4y4k26dl0jlr"; }; gitlab = { owner = "terraform-providers"; repo = "terraform-provider-gitlab"; - rev = "v2.5.0"; - version = "2.5.0"; - sha256 = "1g7girhjks6p7rcs82p2zd8clp6kdfn6d1synlmfwiw6d3496fvf"; + rev = "v2.6.0"; + version = "2.6.0"; + sha256 = "0qy58fgwipcjwxz473rpcnpkb22n9hqsjckx88lhc2br4pgbcbrd"; }; google-beta = { owner = "terraform-providers"; repo = "terraform-provider-google-beta"; - rev = "v3.15.0"; - version = "3.15.0"; - sha256 = "1xncw82y48dcc464v2gzfmr94l3kgh9x2rlmpmmy6g4mihiwh38b"; + rev = "v3.18.0"; + version = "3.18.0"; + sha256 = "1rsaqrgr6ddgx1pala83y70dk32s0mvf6vi877awmimxjzsa1l4r"; }; google = { owner = "terraform-providers"; repo = "terraform-provider-google"; - rev = "v3.15.0"; - version = "3.15.0"; - sha256 = "0vw7sndy441xn34kiv2k9hq9p9g649amh7bk91rf0f5p8cmyll1c"; + rev = "v3.18.0"; + version = "3.18.0"; + sha256 = "18cxl1qw1wyvzvhgjm1s3c19hbi5z9s6mipgazhrac70myw8dmy7"; }; grafana = { @@ -372,9 +380,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-gridscale"; - rev = "v1.5.0"; - version = "1.5.0"; - sha256 = "05nzia9sa555k07gkhyyckdgn9n6a50w8l3id69rjq1jjh0pngd7"; + rev = "v1.5.1"; + version = "1.5.1"; + sha256 = "0m5j9y26a7jl3frnw1j8gll999brprgf0i29p201d3c9b02pxnla"; }; hcloud = { @@ -404,9 +412,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - rev = "v2.3.0"; - version = "2.3.0"; - sha256 = "1lv3l54fw6rgj2ixkz2dvaf3djj3slhrm0nlbza5c7zjb945igfq"; + rev = "v2.4.0"; + version = "2.4.0"; + sha256 = "1rhny1mbkqkfiqshps5mc5f3ykxnpypsdi72hw4g1k29pbvr4hh8"; }; http = { @@ -428,9 +436,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-huaweicloud"; - rev = "v1.13.0"; - version = "1.13.0"; - sha256 = "1caix3lycqnd856z6c3zp9mmq3vr7rblwhhbkwn4rrcld8sv285j"; + rev = "v1.14.0"; + version = "1.14.0"; + sha256 = "10g5xl3pspzmj0bjzqbw3br4k7kh2jplph06f7sz2zg9dncl4h5z"; + }; + ibm = + { + owner = "IBM-Cloud"; + repo = "terraform-provider-ibm"; + rev = "v1.4.0"; + version = "1.4.0"; + sha256 = "147vl55g6c49ihk8z2hwfq2v7g1yj35id1qfjlz0dxalm7cwa3l6"; }; icinga2 = { @@ -464,6 +480,14 @@ version = "1.3.0"; sha256 = "19af40g8hgz2rdz6523v0fs71ww7qdlf2mh5j9vb7pfzriqwa5k9"; }; + infoblox = + { + owner = "terraform-providers"; + repo = "terraform-provider-infoblox"; + rev = "v1.0.0"; + version = "1.0.0"; + sha256 = "0p95y5w3fzddygmsjc0j60z0f4aazvy5iwbwszj0i8gs42qhda2f"; + }; jdcloud = { owner = "terraform-providers"; @@ -484,9 +508,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-launchdarkly"; - rev = "v1.1.0"; - version = "1.1.0"; - sha256 = "1gj0srv8shn6qg109y1g42dx8dybkp3qrjn412bvs6f063ggk0zs"; + rev = "v1.2.2"; + version = "1.2.2"; + sha256 = "0rvyzn2a8bh8hvd3f6whfwzpx2frqnfmh8nwlasb0r4xya8lv3bc"; }; librato = { @@ -500,9 +524,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-linode"; - rev = "v1.9.2"; - version = "1.9.2"; - sha256 = "1nrk8fi0fwkcm4csrppjwv7vd2ilpbj01dywak696nj8b15w176q"; + rev = "v1.9.3"; + version = "1.9.3"; + sha256 = "12jwvpnv4xl9crq6jynking2rcl4ci8ci22db3fadigxqs98hb4w"; }; local = { @@ -556,9 +580,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-mongodbatlas"; - rev = "v0.4.2"; - version = "0.4.2"; - sha256 = "0cb8dh7bwz9yzyhz8v9j6ksi4dgmmz8d1qpm7234rj36ccirnjmz"; + rev = "v0.5.0"; + version = "0.5.0"; + sha256 = "15m7qmn1gd7gmzlqgf2q70kmihf8ihqabpkf122pxhb3iyikwh77"; }; mysql = { @@ -604,17 +628,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-nomad"; - rev = "v1.4.4"; - version = "1.4.4"; - sha256 = "05029s8h8vx7pl0y3d9cd5nlww3483caxhwkbrmk0vs7zdgxk8ns"; + rev = "v1.4.5"; + version = "1.4.5"; + sha256 = "1sccm4mspjn92ky6nscsrmbb573mx53wzsvvapsf2p4119h9s30i"; }; ns1 = { owner = "terraform-providers"; repo = "terraform-provider-ns1"; - rev = "v1.8.0"; - version = "1.8.0"; - sha256 = "1h1pqrj11wdi0fnrrh2mkwahi59jl2vd8affy4acx7kny4n92s49"; + rev = "v1.8.1"; + version = "1.8.1"; + sha256 = "04s46f40md8hrqqiwj6wcq4qpx0115qk8hwbln9a7lsrh0zmmmb3"; }; nsxt = { @@ -644,9 +668,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-oci"; - rev = "v3.69.0"; - version = "3.69.0"; - sha256 = "17vndv6bpa9ajs7llnf64bb482b15virbv311d3ds5lrva4vvrv8"; + rev = "v3.72.0"; + version = "3.72.0"; + sha256 = "05sl702b0j9lpsy3bjac104qngjlsln0v2ni8a78j97xif8jb0an"; }; oktaasa = { @@ -660,9 +684,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-okta"; - rev = "v3.1.1"; - version = "3.1.1"; - sha256 = "1hky6hqrfyl2gj1lykb7gazj9awjgsxhc028558whm5rysx2wpsr"; + rev = "v3.2.0"; + version = "3.2.0"; + sha256 = "13z5srra4pj5p2dwzrqiny2ph4vmmp8q59ycmd7x2yi93fd02mcl"; }; oneandone = { @@ -676,9 +700,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-opc"; - rev = "v1.3.7"; - version = "1.3.7"; - sha256 = "01g09w8mqfp1d8phplsdj0vz63q5bgq9fqwy2kp4vrnwb70dq52w"; + rev = "v1.4.0"; + version = "1.4.0"; + sha256 = "1yl8bbh4pf94wlmna294zcawylr9hiaix82wr321g9wb0vi3d5l8"; }; opennebula = { @@ -692,9 +716,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - rev = "v1.26.0"; - version = "1.26.0"; - sha256 = "1vsvzs8112vbi0x99yg6niw0wr55p09x7cg85qwjd0r42gpfdfq2"; + rev = "v1.27.0"; + version = "1.27.0"; + sha256 = "0d6dms5y8vndcm10zfid1g13c5fi19z7hqll8z07jr0hgvhbzp2v"; }; opentelekomcloud = { @@ -708,9 +732,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-opsgenie"; - rev = "v0.2.9"; - version = "0.2.9"; - sha256 = "13y6awnm9j5qzq1bcmhg7ngzvx43h2dw9wmzdfi1xcpmv1ldvwpi"; + rev = "v0.3.1"; + version = "0.3.1"; + sha256 = "1ciqhibij0fk2z20yabl464mj9srp1v6dy04dyazmxkw46bm1lc5"; }; oraclepaas = { @@ -732,17 +756,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-packet"; - rev = "v2.8.0"; - version = "2.8.0"; - sha256 = "1qnjla347hll0fav0ngnifblk6slbmh1klnm7k9jv327jmv92hz5"; + rev = "v2.8.1"; + version = "2.8.1"; + sha256 = "1idrvkc2bbp3vwz2w45nazr1hq10f7bmyamb57q7mlswydcyk6b2"; }; pagerduty = { owner = "terraform-providers"; repo = "terraform-provider-pagerduty"; - rev = "v1.5.1"; - version = "1.5.1"; - sha256 = "12n12sx1qxckqklcaphzr0j9bcwzrl6p8qzdc3d2csiqccqrpdas"; + rev = "v1.7.0"; + version = "1.7.0"; + sha256 = "168v1mpl9df63yp8zjq79hyxcjj4imyzg20rdn6n71d6iz8v85g8"; }; panos = { @@ -780,9 +804,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-profitbricks"; - rev = "v1.4.4"; - version = "1.4.4"; - sha256 = "0pzcl3pdhaykihvv1v38zrv607mydchvkzrzhwcakgmdkp3vq54i"; + rev = "v1.5.0"; + version = "1.5.0"; + sha256 = "0v9x8sj9c6acmbnkv4bnjvz93dd1fmg9b98rwghiakf968hxx6hl"; }; pureport = { @@ -804,9 +828,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-rancher2"; - rev = "v1.8.1"; - version = "1.8.1"; - sha256 = "15pvz1sd1x932yxdp7d679vax3dw56bfhp3422vxqsgmdgscwg1s"; + rev = "v1.8.3"; + version = "1.8.3"; + sha256 = "1k2d9j17b7sssliraww6as196ihdcra1ylhg1qbynklpr0asiwna"; }; rancher = { @@ -884,17 +908,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-signalfx"; - rev = "v4.18.6"; - version = "4.18.6"; - sha256 = "1xjajkvkcksz0dnawjb3hv14ysp140g0vdj5warshafz8hjbys17"; + rev = "v4.19.4"; + version = "4.19.4"; + sha256 = "15cf9paqrcznj99gv6mxqvgvkd8qbxkwz2145h2qxp5vdcykj78g"; }; skytap = { owner = "terraform-providers"; repo = "terraform-provider-skytap"; - rev = "v0.14.0"; - version = "0.14.0"; - sha256 = "01cscykfw5qilf5rlvh7y2l3bqbv8f180ssqw7zqzyr9p4m6511l"; + rev = "v0.14.1"; + version = "0.14.1"; + sha256 = "0ygsdkv7czyhsjsx1q57rmmcl8x66d65yarhg40hlng5c7xpi52g"; }; softlayer = { @@ -904,6 +928,14 @@ version = "0.0.1"; sha256 = "1xcg5zm2n1pc3l7ng94k589r7ykv6fxsmr5qn9xmmpdf912rdnfq"; }; + sops = + { + owner = "carlpett"; + repo = "terraform-provider-sops"; + rev = "v0.5.0"; + version = "0.5.0"; + sha256 = "18zhqjkw1639a1vrxniws3sf5p91vrf5m7kksaj3yfiavsr5q2ki"; + }; spotinst = { owner = "terraform-providers"; @@ -928,6 +960,14 @@ version = "1.0.0"; sha256 = "1x295va6c72465cxps0kx3rrb7s9aip2cniy6icsg1b2yrsb9b26"; }; + sumologic = + { + owner = "terraform-providers"; + repo = "terraform-provider-sumologic"; + rev = "v2.0.0"; + version = "2.0.0"; + sha256 = "0j6lq9xcc3znjd4yd8gyzsbhwbbwi95k16kj1la9cicbvgra8iap"; + }; telefonicaopencloud = { owner = "terraform-providers"; @@ -948,9 +988,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-tencentcloud"; - rev = "v1.30.7"; - version = "1.30.7"; - sha256 = "0d7byng63sxbgn8f5r92lkcaqvq3r0plm619h63f47h6z6z8xarc"; + rev = "v1.32.0"; + version = "1.32.0"; + sha256 = "014zgslr14r446qifk4slq9g5qydxs7bk181gw227k9mr6krgba1"; }; terraform = { @@ -964,9 +1004,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-tfe"; - rev = "v0.15.1"; - version = "0.15.1"; - sha256 = "0372yjifsr4kvbc36hzhzf6ajlg6wy1r2x94p67m7rgr2fw061n2"; + rev = "v0.16.0"; + version = "0.16.0"; + sha256 = "0c9csyp655wijlnr3rbmymg6gaa23y4fyav0b1y99qsxaa358af5"; }; tls = { @@ -984,13 +1024,21 @@ version = "0.6.0"; sha256 = "10z032fa64sd8d6r4v2f4m7gp93v8wb2zk2r13fflzg5rfk5740z"; }; + turbot = + { + owner = "terraform-providers"; + repo = "terraform-provider-turbot"; + rev = "v1.1.0"; + version = "1.1.0"; + sha256 = "1wb5n17rv1r5jn6xdzjjafw7s96i826x9ww8w6llllihgl798zn7"; + }; ucloud = { owner = "terraform-providers"; repo = "terraform-provider-ucloud"; - rev = "v1.17.0"; - version = "1.17.0"; - sha256 = "0dpy3bkrm20sk4zpkikas5c8ygl0zf9v6cnd34iblw1m41f44n7v"; + rev = "v1.19.0"; + version = "1.19.0"; + sha256 = "17wkhhxvriqix520nv4q4jrk7gah8kkq3l4nj0rzp1kdwxphmsz0"; }; ultradns = { @@ -1004,17 +1052,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - rev = "v2.9.0"; - version = "2.9.0"; - sha256 = "0a1jkwxz45qcbnd91im0xz948k197zal78n6y45bwcbqnil32yiy"; + rev = "v2.10.0"; + version = "2.10.0"; + sha256 = "1yg8ck9z5ycw8akfhnv4pnxyfzav9dzbhizv4dp78xi2gnddrawi"; }; vcd = { owner = "terraform-providers"; repo = "terraform-provider-vcd"; - rev = "v2.7.0"; - version = "2.7.0"; - sha256 = "0bh8hqxpy6722q1v9cnpvn8fqwh5llzz1aavrbsib5brgjc8vqmy"; + rev = "v2.8.0"; + version = "2.8.0"; + sha256 = "0myj5a9mrh7vg6h3gk5f0wsdp6832nz0z10h184107sdchpv253n"; }; venafi = { @@ -1028,17 +1076,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-vra7"; - rev = "v0.5.0"; - version = "0.5.0"; - sha256 = "123yskwgzp771nx03sg49vwi5ph3zf2ajf06s7msj0blvz6wan4v"; + rev = "v1.0.1"; + version = "1.0.1"; + sha256 = "0qmldgxmrv840c5rbmskdf4f9g4v52gg9v7magm6j2w2g0dp1022"; }; vsphere = { owner = "terraform-providers"; repo = "terraform-provider-vsphere"; - rev = "v1.17.0"; - version = "1.17.0"; - sha256 = "16fglpfy8grlifaa1d1ymvjys7wh39m6py8h45g1xgs1jyfkz00s"; + rev = "v1.17.3"; + version = "1.17.3"; + sha256 = "109rg8w6szdqq2hb9jg4j3i79z5ppb6vayikl1cg8m8dsv2whhrj"; }; vthunder = { @@ -1052,9 +1100,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-vultr"; - rev = "v1.1.4"; - version = "1.1.4"; - sha256 = "14anp7b759yyh78ickas52amads2lmwg85h8i0ikln7qhrhl42d7"; + rev = "v1.1.5"; + version = "1.1.5"; + sha256 = "06sxcqklqqsninqach05fzilh6k2h9bv66mgfhf9s53ggs5nm8z7"; }; wavefront = { @@ -1068,8 +1116,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-yandex"; - rev = "v0.35.0"; - version = "0.35.0"; - sha256 = "10zj5s0zdgh54rlczyvkq292v9xj1ivvn2k9ml65l6j3h0axlgxv"; + rev = "v0.38.0"; + version = "0.38.0"; + sha256 = "16s9ffbdgws5hglfr6f48ipjv2sbkdpkg20m9s1m6v2f055nxwak"; }; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index c3c44160c1b75..82ce5a706796f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -50,9 +50,10 @@ let # These are the providers that don't fall in line with the default model special-providers = { - # Override the google providers + # Override providers that use Go modules + vendor/ folder google = patchGoModVendor automated-providers.google; google-beta = patchGoModVendor automated-providers.google-beta; + ibm = patchGoModVendor automated-providers.ibm; # providers that were moved to the `hashicorp` organization, # but haven't updated their references yet: @@ -129,12 +130,13 @@ let ''; }); - elasticsearch = callPackage ./elasticsearch {}; + # Packages that don't fit the default model + ansible = callPackage ./ansible {}; gandi = callPackage ./gandi {}; - ibm = callPackage ./ibm {}; + elasticsearch = callPackage ./elasticsearch {}; libvirt = callPackage ./libvirt {}; lxd = callPackage ./lxd {}; - ansible = callPackage ./ansible {}; + vpsadmin = callPackage ./vpsadmin {}; }; in automated-providers // special-providers diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix index 1aadbbc5ccd38..6afa63c4a525c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "0ci9gcn9ijdbx25wa99iy0b3sl7akqa7b6gi9wnnl1dawpqznj7v"; }; - modSha256 = "1xk21xswqwpv34j4ba4fj8lcbvfdd12x7rq1hrdyd21mdhmrhw0p"; + vendorSha256 = "1rdvyypdl3fk6af66gfjhyl271cnlx5xgrl1w68sc6sbvq00bqkd"; subPackages = [ "." ]; @@ -24,4 +24,4 @@ buildGoModule rec { license = licenses.mpl20; maintainers = with maintainers; [ basvandijk ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix deleted file mode 100644 index 06d7b8a9f073e..0000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: - -# -# USAGE: -# install the following package globally or in nix-shell: -# -# (terraform.withPlugins ( plugins: [ terraform-provider-ibm ])) -# -# examples: -# https://github.com/IBM-Cloud/terraform-provider-ibm/tree/master/examples -# - -buildGoPackage rec { - pname = "terraform-provider-ibm"; - version = "0.11.1"; - - goPackagePath = "github.com/terraform-providers/terraform-provider-ibm"; - subPackages = [ "./" ]; - - src = fetchFromGitHub { - owner = "IBM-Cloud"; - repo = "terraform-provider-ibm"; - sha256 = "1vp1kzadfkacn6c4illxjra8yki1fx7h77b38fixkcvc79mzasmv"; - rev = "v${version}"; - }; - - # Terraform allow checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postBuild = "mv go/bin/terraform-provider-ibm{,_v${version}}"; - - meta = with stdenv.lib; { - homepage = https://github.com/IBM-Cloud/terraform-provider-ibm; - description = "Terraform provider is used to manage IBM Cloud resources."; - platforms = platforms.all; - license = licenses.mpl20; - maintainers = with maintainers; [ jensbin ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index c2014a4d7bf13..daffb59309037 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -43,7 +43,7 @@ buildGoPackage rec { postBuild = "mv go/bin/terraform-provider-libvirt{,_v${version}}"; meta = with stdenv.lib; { - homepage = https://github.com/dmacvicar/terraform-provider-libvirt; + homepage = "https://github.com/dmacvicar/terraform-provider-libvirt"; description = "Terraform provider for libvirt"; platforms = platforms.linux; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix index fd2a6c36d65c3..69d93ac1c7547 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1k54021178zybh9dqly2ly8ji9x5rka8dn9xd6rv7gkcl5w3y6fv"; }; - modSha256 = "1h95ng9by3i3v15s1ws1fv86a47vglivn42xbffdy94s108g0908"; + vendorSha256 = "1shdpl1zsbbpc3mfs0l65ykq2h15ggvqylaixcap4j4lfl7m9my0"; postBuild = "mv ../go/bin/terraform-provider-lxd{,_v${version}}"; @@ -22,4 +22,4 @@ buildGoModule rec { license = licenses.mpl20; maintainers = with maintainers; [ gila ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all b/pkgs/applications/networking/cluster/terraform-providers/update-all index 89ed5a94f2ab5..70dfc2f825dd8 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-all +++ b/pkgs/applications/networking/cluster/terraform-providers/update-all @@ -112,8 +112,10 @@ cd "$(dirname "$0")" # individual repos to fetch slugs=( + IBM-Cloud/terraform-provider-ibm ajbosco/terraform-provider-segment camptocamp/terraform-provider-pass + carlpett/terraform-provider-sops poseidon/terraform-provider-matchbox spaceapegames/terraform-provider-wavefront tweag/terraform-provider-nixos diff --git a/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix b/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix new file mode 100644 index 0000000000000..270c7adcb47ff --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, buildGoModule }: +buildGoModule rec { + pname = "terraform-provider-vpsadmin"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "vpsfreecz"; + repo = "terraform-provider-vpsadmin"; + rev = "v${version}"; + hash = "sha256-+6jRjcManQdoKh7ewOJI1UaulY5OSbkIUHmtrBI33u4="; + }; + + vendorSha256 = "0j90fnzba23mwf9bzf9w5h0hszkl3h61p5i780s9v9c0hbzhbqsh"; + + subPackages = [ "." ]; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postInstall = "mv $out/bin/${pname}{,_v${version}}"; + + meta = with stdenv.lib; { + description = "Terraform provider for vpsAdmin"; + homepage = "https://github.com/vpsfreecz/terraform-provider-vpsadmin"; + license = licenses.mpl20; + maintainers = with maintainers; [ zimbatm ]; + }; +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index b9c82f97c4fd7..ec9f02fe9e2f3 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper -, runCommand, writeText, terraform-providers }: +{ stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper, coreutils +, runCommand, writeText, terraform-providers, fetchpatch }: let goPackagePath = "github.com/hashicorp/terraform"; @@ -18,9 +18,15 @@ let inherit sha256; }; + postPatch = '' + # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22 + substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \ + --replace "/bin/stty" "${coreutils}/bin/stty" + ''; + postInstall = '' # remove all plugins, they are part of the main binary now - for i in $bin/bin/*; do + for i in $out/bin/*; do if [[ $(basename $i) != terraform ]]; then rm "$i" fi @@ -82,7 +88,7 @@ let buildCommand = '' mkdir -p $out/bin/ - makeWrapper "${terraform.bin}/bin/terraform" "$out/bin/terraform" \ + makeWrapper "${terraform}/bin/terraform" "$out/bin/terraform" \ --set NIX_TERRAFORM_PLUGIN_DIR "${ buildEnv { name = "tf-plugin-env"; @@ -112,9 +118,15 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.24"; - sha256 = "1rjihp6qcaizp2nnv4z20kpmjnqcw95pq5rnhq381a3pdzr0cd0z"; - patches = [ ./provider-path.patch ]; + version = "0.12.25"; + sha256 = "0xq4327386x6isw82d4xyq70pw7xxlh4sgmqas0b2pvyz85jxdch"; + patches = [ + ./provider-path.patch + (fetchpatch { + name = "fix-mac-mojave-crashes.patch"; + url = "https://github.com/hashicorp/terraform/pull/24562.patch"; + sha256 = "1k70kk4hli72x8gza6fy3vpckdm3sf881w61fmssrah3hgmfmbrs"; + }) ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 1058b21d3e955..6a4e1979e8837 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -1,36 +1,33 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, terraform, makeWrapper }: -buildGoPackage rec { +buildGoModule rec { pname = "terragrunt"; - version = "0.23.2"; + version = "0.23.14"; - goPackagePath = "github.com/gruntwork-io/terragrunt"; - - src = fetchFromGitHub { - owner = "gruntwork-io"; - repo = "terragrunt"; - rev = "v${version}"; - sha256 = "1r3q7faxys0h147cr9154pcix1qgj36v41ja9hhbggm4c7vig4s1"; + src = fetchFromGitHub { + owner = "gruntwork-io"; + repo = pname; + rev = "v${version}"; + sha256 = "1znb9d4n9zv3dq10dw17kb1h04gj8iz6gwx1a741fcf4ygp8zpy1"; }; - goDeps = ./deps.nix; + vendorSha256 = "0h737h25f80zfx84vm6ry0581c32ylcb5h9givqk5k5kh5qgkbgx"; buildInputs = [ makeWrapper ]; preBuild = '' - find go/src -name vendor | xargs -I % sh -c 'echo Removing %; rm -rf %' buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}") ''; postInstall = '' - wrapProgram $bin/bin/terragrunt \ + wrapProgram $out/bin/terragrunt \ --set TERRAGRUNT_TFPATH ${lib.getBin terraform.full}/bin/terraform ''; meta = with stdenv.lib; { description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices."; - homepage = https://github.com/gruntwork-io/terragrunt/; + homepage = "https://github.com/gruntwork-io/terragrunt/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix deleted file mode 100644 index 16105dbadcb94..0000000000000 --- a/pkgs/applications/networking/cluster/terragrunt/deps.nix +++ /dev/null @@ -1,525 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "d96ccb2ba7586bb79a416471882d347754a78ce5"; - sha256 = "18f1l28665x1a8j8a5bh2i7wb2vrwj050d1g5qda50isgqaybixd"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/agext/levenshtein"; - fetch = { - type = "git"; - url = "https://github.com/agext/levenshtein"; - rev = "0ded9c86537917af2ff89bc9c78de6bd58477894"; - sha256 = "19d7q69yhcg7gl81j038rkbjz8yjb4qwnsqrmxa4zvhgzlc7d130"; - }; - } - { - goPackagePath = "github.com/apparentlymart/go-cidr"; - fetch = { - type = "git"; - url = "https://github.com/apparentlymart/go-cidr"; - rev = "b1115bf8e14a60131a196f908223e4506b0ddc35"; - sha256 = "0r938rb18c9cr2k417cwwd4pfq74aabpjp9pzvk4qkxc5279igl3"; - }; - } - { - goPackagePath = "github.com/apparentlymart/go-textseg"; - fetch = { - type = "git"; - url = "https://github.com/apparentlymart/go-textseg"; - rev = "fb01f485ebef760e5ee06d55e1b07534dda2d295"; - sha256 = "0n9xcyj7p5y8mbqilk9zprfyqvgm2y9f1g440wqw9dnn3s4fi1k4"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "572908275ed4e38fef7ccb7d507f2faacaa7ab36"; - sha256 = "07bn3v0c4pd38qdp0a0kgmsvh7q30f14qp7pbbls3jzmvpxh49zs"; - }; - } - { - goPackagePath = "github.com/bgentry/go-netrc"; - fetch = { - type = "git"; - url = "https://github.com/bgentry/go-netrc"; - rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480"; - sha256 = "0dn2h8avgavqdzdqnph8bkhj35bx0wssczry1zdczr22xv650g1l"; - }; - } - { - goPackagePath = "github.com/bmatcuk/doublestar"; - fetch = { - type = "git"; - url = "https://github.com/bmatcuk/doublestar"; - rev = "2437321e1473408f122a95f65df3d8841fec4fba"; - sha256 = "0z1jg4l746825qs95sffbc69av1yj0l37n8rjmmnwf7hxh5glxzp"; - }; - } - { - goPackagePath = "github.com/creack/pty"; - fetch = { - type = "git"; - url = "https://github.com/creack/pty"; - rev = "3a6a957789163cacdfe0e291617a1c8e80612c11"; - sha256 = "1v52599qq76dwq742mffakzj6mxqqccv2szn3hjicjld56nmd2d3"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/go-errors/errors"; - fetch = { - type = "git"; - url = "https://github.com/go-errors/errors"; - rev = "a6af135bd4e28680facf08a3d206b454abc877a4"; - sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "b5d812f8a3706043e23a9cd5babf2e5423744d30"; - sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "6f77996f0c42f7b84e5a2b252227263f93432e9b"; - sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "0cd6bf5da1e1c83f8b45653022c74f71af0538a4"; - sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "beaecbbdd8af86aa3acf14180d53828ce69400b2"; - sha256 = "1iwnm6ky1x53lgs44mw3hpdkjzrm5qd0kfs50m0qcq2ml5m1cwdm"; - }; - } - { - goPackagePath = "github.com/gruntwork-io/terratest"; - fetch = { - type = "git"; - url = "https://github.com/gruntwork-io/terratest"; - rev = "a02960d4ef0711ae95ae2651271b4e073f88da4e"; - sha256 = "0mywsimj8if8j2jbp8sf4igl5lcdlj81hd3lif86fsmyrma090vw"; - }; - } - { - goPackagePath = "github.com/hashicorp/errwrap"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/errwrap"; - rev = "8a6fb523712970c966eefc6b39ed2c5e74880354"; - sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-cleanhttp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-cleanhttp"; - rev = "eda1e5db218aad1db63ca4642c8906b26bcf2744"; - sha256 = "07kx3fhryqmaw3czacmm11qwx63js2q8cfq967vphk7xg9q377kk"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-getter"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-getter"; - rev = "f9ec369200fd2163b8f452e5e45696d83ae3f4b6"; - sha256 = "1h69946nsmpp06iqg85whwvjrfqlk1gf9q7y01f0r3sf0cb28f30"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-multierror"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-multierror"; - rev = "886a7fbe3eb1c874d46f623bfa70af45f425b3d1"; - sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-safetemp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-safetemp"; - rev = "c9a55de4fe06c920a71964b53cfe3dd293a3c743"; - sha256 = "0gydks8bkq88adlzmv8qj3rvljx15j94c8lyrp88ji2jn6dvv643"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-uuid"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-uuid"; - rev = "4f571afc59f3043a65f8fe6bf46d887b10a01d43"; - sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-version"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-version"; - rev = "ac23dc3fea5d1a983c43f6a0f6e2c13f0195d8bd"; - sha256 = "1bwi6y6111xq8ww8kjq0w1cmz15l1h9hb2id6596l8l0ag1vjj1z"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c"; - sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl2"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl2"; - rev = "318e80eefe28c3aa01b434c61bcf4c83a0cc6b25"; - sha256 = "1wlm47qk84ggn6lanafirc49kaq998r1nw2xdcv4ghdxy2ijc0rj"; - }; - } - { - goPackagePath = "github.com/hashicorp/terraform"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/terraform"; - rev = "abec0acf40d8e31ac612a244cf3886fb3bcce0bb"; - sha256 = "14js4n08rg30y0jrm0na79syglpb64cb7cxys0x3w47pcbgymrka"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "c2b33e84"; - sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; - }; - } - { - goPackagePath = "github.com/jstemmer/go-junit-report"; - fetch = { - type = "git"; - url = "https://github.com/jstemmer/go-junit-report"; - rev = "cc1f095d5cc5eca2844f5c5ea7bb37f6b9bf6cac"; - sha256 = "1knip80yir1cdsjlb3rzy0a4w3kl4ljpiciaz6hjzwqlfhnv7bkw"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "e1f7b56ace729e4a73a29a6b4fac6cd5fcda7ab3"; - sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m"; - }; - } - { - goPackagePath = "github.com/mattn/go-zglob"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-zglob"; - rev = "2ea3427bfa539cca900ca2768d8663ecc8a708c1"; - sha256 = "1sncdyq5fbd42al4amyy91h7vlzm3wm6c9vl8za2pjgfgsd581fz"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "af06845cf3004701891bf4fdb884bfe4920b3727"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-testing-interface"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-testing-interface"; - rev = "6d0b8010fcc857872e42fc6c931227569016843c"; - sha256 = "1dl2js8di858bawg7dadlf1qjpkl2g3apziihjyf5imri3znyfpw"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-wordwrap"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-wordwrap"; - rev = "9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c"; - sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "3536a929edddb9a5b34bd6861dc4a9647cb459fe"; - sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "ffdc059bfe9ce6a4e144ba849dbedead332c6053"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; - }; - } - { - goPackagePath = "github.com/ulikunitz/xz"; - fetch = { - type = "git"; - url = "https://github.com/ulikunitz/xz"; - rev = "6f934d456d51e742b4eeab20d925a827ef22320a"; - sha256 = "1qpk02c0nfgfyg110nmbaiy5x12fpn0pm8gy7h1s8pwns133n831"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "github.com/zclconf/go-cty"; - fetch = { - type = "git"; - url = "https://github.com/zclconf/go-cty"; - rev = "6fd39ad70c3a6bbdb1b4e47444e4cce72f901200"; - sha256 = "0mb0ws70jg93vlamzhdvyvyfq6x0s0ll5gf44yanb1dhlz6i1f90"; - }; - } - { - goPackagePath = "github.com/zclconf/go-cty-yaml"; - fetch = { - type = "git"; - url = "https://github.com/zclconf/go-cty-yaml"; - rev = "bc34c981dadb5ed30af852693e3aba8fb6546f42"; - sha256 = "0dams5g61n88rk7zq7sy0yap873ksjafhf81hn2fg2dpfjhcd3y2"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "9c377598961b706d1542bd2d84d538b5094d596e"; - sha256 = "05jr8gkr2w34i5wwki4zhl5ch0qrgi7cdgag5iy5gpxplhbrvbg9"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "5c40567a22f818bd14a1ea7245dad9f8ef0691aa"; - sha256 = "17g8fb9vy2sqq8vgz8jdvf6c6d2290gm2qs0i4yzsd86mgn4dlrg"; - }; - } - { - goPackagePath = "golang.org/x/exp"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/exp"; - rev = "f17229e696bd4e065144fd6ae1313e41515abbdc"; - sha256 = "0q1fij8izg7xcnx7wqh0zdnya11k3d9a5fqm0yb2r93jhlf3x128"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "910be7a94367618fd0fd25eaabbee4fdc0ac7092"; - sha256 = "08gskshgfwxhmm9i4vgd4q7kqd5i7yihqh33v6r07br6kqd0g995"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "ed3ec21bb8e252814c380df79a80f366440ddb2d"; - sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "461777fb6f67e8cb9d70cda16573678d085a74cf"; - sha256 = "0sc0llch05q6h7nqgayi3sgismsznpnlsz4gh89y4klpymdcpbh2"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33"; - sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "93c9922d18aeb82498a065f07aec7ad7fa60dfb7"; - sha256 = "0hv96nwbv0li3nrv43ldfzmf12yrrbji2cf8n44iibv8ps5kfssx"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "49b8ac185c84c5092be0953fb92b7660db9b8162"; - sha256 = "0ccsm8p9i83f0s0z5c7jwyzj7jgcg60zf20hzrmp705669wn5y67"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543c54f90421aeb9a60ef8061b5b544"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "e9c39defab7fc4be8ec95d4ce422dbeae4070400"; - sha256 = "01wjr07xnb9s32y2jc6d0rba3jxwccd2wydm6cql41yhyr3x84rd"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880"; - sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "eb0b1bdb6ae60fcfc41b8d907b50dfb346112301"; - sha256 = "0g00wfxd4z886bglyszcvfpgzak0476axqyfaqv3va62ndbqpk90"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "f495f5b15ae7ccda3b38c53a1bfcde4c1a58a2bc"; - sha256 = "09phrrsafgq6hnbw8cawvx44bdpk1p584fys17x1bwn0j0451zzs"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "afd67930eec2a9ed3e9b19f684d17a062285f16a"; - sha256 = "1rwwahmbs4dwxncwjj56likir1kps9937vm2id3rygxzzla40zal"; - }; - } -] \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 30fc9264ae1de..13f2c3d9bd9e4 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production"; - homepage = https://tilt.dev/; + homepage = "https://tilt.dev/"; license = licenses.asl20; maintainers = with maintainers; [ anton-dessiatov ]; }; diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index a84de6380668a..38a08aaf4c067 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://davmail.sourceforge.net/; + homepage = "http://davmail.sourceforge.net/"; description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers"; maintainers = [ maintainers.hinton ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 3f0a83d015da2..e8500872d52c7 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -6,8 +6,6 @@ buildGoPackage rec { goPackagePath = "github.com/StackExchange/dnscontrol"; - goDeps = ./deps.nix; - src = fetchFromGitHub { owner = "StackExchange"; repo = pname; @@ -15,9 +13,7 @@ buildGoPackage rec { sha256 = "1j8i4k7bqkqmi6dmc9fxfab49a7qigig72rlbga902lw336p6cc7"; }; - postInstall = '' - rm $bin/bin/{build,convertzone,generate,validate} - ''; + subPackages = [ "." ]; meta = with stdenv.lib; { description = "Synchronize your DNS to multiple providers from a simple DSL"; diff --git a/pkgs/applications/networking/dnscontrol/deps.nix b/pkgs/applications/networking/dnscontrol/deps.nix deleted file mode 100644 index 55cb5daa18f80..0000000000000 --- a/pkgs/applications/networking/dnscontrol/deps.nix +++ /dev/null @@ -1,1236 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "335e9e09b93e"; - sha256 = "1aiglr6d2369nf3s9ig1kc0nixsivcmh7p1fyzkcf6n6ql0p2zsm"; - }; - } - { - goPackagePath = "github.com/Azure/azure-sdk-for-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-sdk-for-go"; - rev = "v39.1.0"; - sha256 = "1s0j7gh3d3p157py7v6525c6zs07hdiry97dhg4c8z7ww35wxhj7"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/BurntSushi/xgb"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/xgb"; - rev = "27f122750802"; - sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj"; - }; - } - { - goPackagePath = "github.com/DisposaBoy/JsonConfigReader"; - fetch = { - type = "git"; - url = "https://github.com/DisposaBoy/JsonConfigReader"; - rev = "5ea4d0ddac55"; - sha256 = "022wzrkf0rni9yb15439w81kj0kb4667zx6n2zq07ysw7lk6ahqz"; - }; - } - { - goPackagePath = "github.com/TomOnTime/utfutil"; - fetch = { - type = "git"; - url = "https://github.com/TomOnTime/utfutil"; - rev = "09c41003ee1d"; - sha256 = "01d6w8migw5px19jg0mm7qhsa1ydcz9wvl838nsclfw63x5sy70i"; - }; - } - { - goPackagePath = "github.com/alecthomas/kingpin"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "fb15b899a751"; - sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "f65c72e2690d"; - sha256 = "04jyqm7m3m01ppfy1f9xk4qvrwvs78q9zml6llyf2b3v5k6b2bbc"; - }; - } - { - goPackagePath = "github.com/andreyvit/diff"; - fetch = { - type = "git"; - url = "https://github.com/andreyvit/diff"; - rev = "c7f18ee00883"; - sha256 = "1s4qjkxig5yqahpzfl4xqh4kzi9mymdpkzq6kj3f4dr5dl3hlynr"; - }; - } - { - goPackagePath = "github.com/armon/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-metrics"; - rev = "f0300d1749da"; - sha256 = "13l7c35ps0r27vxfil2w0xhhc7w5rh00awvlmn4cz0a937b9ffpv"; - }; - } - { - goPackagePath = "github.com/armon/go-radix"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-radix"; - rev = "7fddfc383310"; - sha256 = "0y8chspn14n9xpsfb9gxnnf819rfpriaz64v81p7873a42kkhxb4"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "v1.29.21"; - sha256 = "0q97abz6cjj1gf3gfd52gjx39grfhlcjax8306zw9038a8v0nadc"; - }; - } - { - goPackagePath = "github.com/bgentry/speakeasy"; - fetch = { - type = "git"; - url = "https://github.com/bgentry/speakeasy"; - rev = "v0.1.0"; - sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s"; - }; - } - { - goPackagePath = "github.com/billputer/go-namecheap"; - fetch = { - type = "git"; - url = "https://github.com/billputer/go-namecheap"; - rev = "0c7adb0710f8"; - sha256 = "09jkymml6f0nvz7md7s4ayj75xdms77ziz9rkw4kvj7jhv36302p"; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "v2.1.1"; - sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8"; - }; - } - { - goPackagePath = "github.com/census-instrumentation/opencensus-proto"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-proto"; - rev = "v0.2.1"; - sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; - }; - } - { - goPackagePath = "github.com/client9/misspell"; - fetch = { - type = "git"; - url = "https://github.com/client9/misspell"; - rev = "v0.3.4"; - sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "v2.0.0"; - sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/digitalocean/godo"; - fetch = { - type = "git"; - url = "https://github.com/digitalocean/godo"; - rev = "v1.30.0"; - sha256 = "0z38lg1zd57b5ymxdxhz5rs5rynpzhqmbvm0marhh0v7v9bbk0rx"; - }; - } - { - goPackagePath = "github.com/dimchansky/utfbom"; - fetch = { - type = "git"; - url = "https://github.com/dimchansky/utfbom"; - rev = "v1.1.0"; - sha256 = "06s61wwd32fad1p8qn5blqjd5791avzb13fnqflkkg993adw49ww"; - }; - } - { - goPackagePath = "github.com/dnsimple/dnsimple-go"; - fetch = { - type = "git"; - url = "https://github.com/dnsimple/dnsimple-go"; - rev = "v0.31.0"; - sha256 = "0i074r3m0bqggmplswymgj6yfzbsrcqw8gn6py9x8g3kyl4si0x0"; - }; - } - { - goPackagePath = "github.com/envoyproxy/go-control-plane"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/go-control-plane"; - rev = "5f8ba28d4473"; - sha256 = "1f1s764rd41vd9vgk3r14h1m6fz6pdvxj6fd83q58gxifbc4q5w4"; - }; - } - { - goPackagePath = "github.com/envoyproxy/protoc-gen-validate"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/protoc-gen-validate"; - rev = "v0.1.0"; - sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy"; - }; - } - { - goPackagePath = "github.com/exoscale/egoscale"; - fetch = { - type = "git"; - url = "https://github.com/exoscale/egoscale"; - rev = "v0.23.0"; - sha256 = "0dgc08sdvy2cj7yygrlnyp6v9m829h4v0pm3vdsj9yx3bps5v7iy"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/fatih/structs"; - fetch = { - type = "git"; - url = "https://github.com/fatih/structs"; - rev = "v1.1.0"; - sha256 = "1wrhb8wp8zpzggl61lapb627lw8yv281abvr6vqakmf569nswa9q"; - }; - } - { - goPackagePath = "github.com/go-acme/lego"; - fetch = { - type = "git"; - url = "https://github.com/go-acme/lego"; - rev = "v2.7.2"; - sha256 = "1137l22jrwk8hvdzjbmfkvd9nllp6sznzy66ngmcsc0ybp19hcry"; - }; - } - { - goPackagePath = "github.com/go-ldap/ldap"; - fetch = { - type = "git"; - url = "https://github.com/go-ldap/ldap"; - rev = "v3.0.2"; - sha256 = "1srb1nkcbs0v1hcdz6j4zhg000h763j83jlklsiwanvbp48y4lhz"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "v1.5.0"; - sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v"; - }; - } - { - goPackagePath = "github.com/go-test/deep"; - fetch = { - type = "git"; - url = "https://github.com/go-test/deep"; - rev = "042da051cf31"; - sha256 = "08bya0s7m15f5qm1kn2r42g1r4lpq0svpaqr0zaac4hmaxj7vnid"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "e7a84e9525fe"; - sha256 = "1v6vjklq06wqddv46ihajahaj1slv0imgaivlxr8bsx59i90js5q"; - }; - } - { - goPackagePath = "github.com/gofrs/uuid"; - fetch = { - type = "git"; - url = "https://github.com/gofrs/uuid"; - rev = "v3.2.0"; - sha256 = "1q63mp7bznhfgyw133c0wc0hpcj1cq9bcf7w1f8r6inkcrils1fz"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.3.1"; - sha256 = "1wnfa8njxdym1qb664dmfnkpm4pmqy22hqjlqpwaaiqhglb5g9d1"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.3"; - sha256 = "1cyyr52yhj3fzrily3rmsbqyj8va4ld75lmry0857m39rgpv8sy1"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "v0.0.1"; - sha256 = "0gp3kkzlm3wh37kgkhbqxq3zx07iqbgis5w9mf4d64h6vjq760is"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "v1.0.0"; - sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.4.0"; - sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2"; - }; - } - { - goPackagePath = "github.com/google/go-github"; - fetch = { - type = "git"; - url = "https://github.com/google/go-github"; - rev = "v17.0.0"; - sha256 = "1kvw95l77a5n5rgal9n1xjh58zxb3a40ij1j722b1h4z8yg9jhg4"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "c8c88dbee036"; - sha256 = "1yckg2052mz7ps1m68wri6kyb5n4g0vx2yf7s0xs9gdqvvscp57l"; - }; - } - { - goPackagePath = "github.com/google/martian"; - fetch = { - type = "git"; - url = "https://github.com/google/martian"; - rev = "v2.1.0"; - sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; - }; - } - { - goPackagePath = "github.com/google/pprof"; - fetch = { - type = "git"; - url = "https://github.com/google/pprof"; - rev = "54271f7e092f"; - sha256 = "14x4ydifz23rzaylggvwbm3dwlv1bc6s0bclmkxck9nbjbqw89vy"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "v2.0.5"; - sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; - }; - } - { - goPackagePath = "github.com/gopherjs/gopherjs"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherjs"; - rev = "0766667cb4d1"; - sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; - }; - } - { - goPackagePath = "github.com/gopherjs/jquery"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/jquery"; - rev = "73f4c7416038"; - sha256 = "1xhl0k52v3djalnd02a0ph572f85i1szj2x4q3lglkq40j7racd2"; - }; - } - { - goPackagePath = "github.com/hashicorp/errwrap"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/errwrap"; - rev = "v1.0.0"; - sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-cleanhttp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-cleanhttp"; - rev = "v0.5.1"; - sha256 = "07kx3fhryqmaw3czacmm11qwx63js2q8cfq967vphk7xg9q377kk"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-hclog"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-hclog"; - rev = "v0.9.2"; - sha256 = "0pakba7rdkjgq50r79sbbpavymbyib77cy613wl734mpi30ywrxm"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-immutable-radix"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-immutable-radix"; - rev = "v1.0.0"; - sha256 = "1v3nmsnk1s8bzpclrhirz7iq0g5xxbw9q5gvrg9ss6w9crs72qr6"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-multierror"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-multierror"; - rev = "v1.0.0"; - sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-plugin"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-plugin"; - rev = "v1.0.1"; - sha256 = "0aama8vdyrfzjdhxc1l4cwhmgydl989lywhq3pg3slzjg6r00rda"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-retryablehttp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-retryablehttp"; - rev = "v0.6.3"; - sha256 = "1vnhr7yry71jldmmj5gxhq49crhi9vrmqc2i41mycpnva2zd8a0i"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-rootcerts"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-rootcerts"; - rev = "v1.0.1"; - sha256 = "0ca5h7vlvrghf24dzh8l6w5px293n173qxfkjxb9kgsl6hsrsl3y"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-sockaddr"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-sockaddr"; - rev = "v1.0.2"; - sha256 = "0y106nhd3s63lj7h7k21iq0br97h0z9qjrvx028zqcsq9407k9is"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-uuid"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-uuid"; - rev = "v1.0.1"; - sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-version"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-version"; - rev = "v1.1.0"; - sha256 = "1ykh3jl5zj5a4irkgp5mq936bqkznmf9lp23qk741vh4r5874vi8"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "v0.5.1"; - sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "v1.0.0"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - { - goPackagePath = "github.com/hashicorp/yamux"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/yamux"; - rev = "2f1d1f20f75d"; - sha256 = "1fga3p6j2g24ip9qjfwn3nqjr00m4nnjz92app7ms3sz7vgq2a7s"; - }; - } - { - goPackagePath = "github.com/hexonet/go-sdk"; - fetch = { - type = "git"; - url = "https://github.com/hexonet/go-sdk"; - rev = "v2.2.3"; - sha256 = "0mgkfrc7qlm4xf1v7kb29p7wq6rmaaha9zv8kwa27r8hjx6qnb8c"; - }; - } - { - goPackagePath = "github.com/jarcoal/httpmock"; - fetch = { - type = "git"; - url = "https://github.com/jarcoal/httpmock"; - rev = "v1.0.4"; - sha256 = "1x04i9hhvdxi9xmyf0vbi5azlh7rr4blsq7fbhps8i2gdpga612y"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "2437e8417af5"; - sha256 = "1hwcbr7nrlfshwr4hrac8ch8gvfpf07qi72bpqmqi272c67ma89v"; - }; - } - { - goPackagePath = "github.com/jstemmer/go-junit-report"; - fetch = { - type = "git"; - url = "https://github.com/jstemmer/go-junit-report"; - rev = "af01ea7f8024"; - sha256 = "1lp3n94ris12hac02wi31f3whs88lcrzwgdg43a5j6cafg9p1d0s"; - }; - } - { - goPackagePath = "github.com/jtolds/gls"; - fetch = { - type = "git"; - url = "https://github.com/jtolds/gls"; - rev = "v4.20.0"; - sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/malexdev/utfutil"; - fetch = { - type = "git"; - url = "https://github.com/malexdev/utfutil"; - rev = "00c8d4a8e7a8"; - sha256 = "01d6w8migw5px19jg0mm7qhsa1ydcz9wvl838nsclfw63x5sy70i"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.0.9"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.3"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "v1.1.27"; - sha256 = "0fpd9alvhzrkb1c31n4lrxlpv1nlhy51w1yg39xxb3mjmrb7lby1"; - }; - } - { - goPackagePath = "github.com/mitchellh/cli"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/cli"; - rev = "v1.0.0"; - sha256 = "1i9kmr7rcf10d2hji8h4247hmc0nbairv7a0q51393aw2h1bnwg2"; - }; - } - { - goPackagePath = "github.com/mitchellh/copystructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/copystructure"; - rev = "v1.0.0"; - sha256 = "05njg92w1088v4yl0js0zdrpfq6k37i9j14mxkr3p90p5yd9rrrr"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.1.0"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-testing-interface"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-testing-interface"; - rev = "v1.0.0"; - sha256 = "1dl2js8di858bawg7dadlf1qjpkl2g3apziihjyf5imri3znyfpw"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-wordwrap"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-wordwrap"; - rev = "v1.0.0"; - sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "v1.1.2"; - sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; - }; - } - { - goPackagePath = "github.com/mitchellh/reflectwalk"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/reflectwalk"; - rev = "v1.0.0"; - sha256 = "0wzkp0fdx22n8f7y9y37dgmnlrlfsv9zjdb48cbx7rsqsbnny7l0"; - }; - } - { - goPackagePath = "github.com/mjibson/esc"; - fetch = { - type = "git"; - url = "https://github.com/mjibson/esc"; - rev = "v0.2.0"; - sha256 = "0ci3bdm01prm114plcwkgzbqn825lh0zc1iqaw3jicjay5sh0bis"; - }; - } - { - goPackagePath = "github.com/namedotcom/go"; - fetch = { - type = "git"; - url = "https://github.com/namedotcom/go"; - rev = "08470befbe04"; - sha256 = "00ai7fd74sn4alqmpqsiyczirli50b7m059b6zzg1izy9g4cdd4g"; - }; - } - { - goPackagePath = "github.com/oklog/run"; - fetch = { - type = "git"; - url = "https://github.com/oklog/run"; - rev = "v1.0.0"; - sha256 = "1pbjza4claaj95fpqvvfrysvs10y7dm0pl6qr5lzh6qy1vnhmcgw"; - }; - } - { - goPackagePath = "github.com/ovh/go-ovh"; - fetch = { - type = "git"; - url = "https://github.com/ovh/go-ovh"; - rev = "ba5adb4cf014"; - sha256 = "1rwxib0pn2ni6nfn2sijvb6cd424n95gnqhs21q6mz08n9hnzspy"; - }; - } - { - goPackagePath = "github.com/pascaldekloe/goe"; - fetch = { - type = "git"; - url = "https://github.com/pascaldekloe/goe"; - rev = "v0.1.0"; - sha256 = "1dqd3mfb4z2vmv6pg6fhgvfc53vhndk24wcl9lj1rz02n6m279fq"; - }; - } - { - goPackagePath = "github.com/philhug/opensrs-go"; - fetch = { - type = "git"; - url = "https://github.com/philhug/opensrs-go"; - rev = "9dfa7433020d"; - sha256 = "1bjw3llpx5n1srylw08310ch14sz1pw5mban1yakax8606q3dqdf"; - }; - } - { - goPackagePath = "github.com/pierrec/lz4"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/lz4"; - rev = "v2.0.5"; - sha256 = "0y5rh7z01zycd59nnjpkqq0ydyjmcg9j1xw15q1i600l9j9g617p"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.9.1"; - sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/posener/complete"; - fetch = { - type = "git"; - url = "https://github.com/posener/complete"; - rev = "v1.1.1"; - sha256 = "1nbdiybjizbaxbf5q0xwbq0cjqw4bl6jggvsjzrpif0w86fcjda2"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "14fe0d1b01d4"; - sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; - }; - } - { - goPackagePath = "github.com/renier/xmlrpc"; - fetch = { - type = "git"; - url = "https://github.com/renier/xmlrpc"; - rev = "ce4a1a486c03"; - sha256 = "0byvacdwhagva53r2frzqws3f5j7qzigmxzxahpcv300i8pm9i50"; - }; - } - { - goPackagePath = "github.com/robertkrimen/otto"; - fetch = { - type = "git"; - url = "https://github.com/robertkrimen/otto"; - rev = "c382bd3c16ff"; - sha256 = "043y6l647snsz71mdy84s2d3kn22aj6rbqd6c1vd8absvamqhlxa"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "v2.0.1"; - sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; - }; - } - { - goPackagePath = "github.com/ryanuber/columnize"; - fetch = { - type = "git"; - url = "https://github.com/ryanuber/columnize"; - rev = "v2.1.0"; - sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6"; - }; - } - { - goPackagePath = "github.com/ryanuber/go-glob"; - fetch = { - type = "git"; - url = "https://github.com/ryanuber/go-glob"; - rev = "v1.0.0"; - sha256 = "0mhrjy0iba3jr6bsgy7q50zjr42ar1njn1sb2fvihlkhxgb2ahv2"; - }; - } - { - goPackagePath = "github.com/sergi/go-diff"; - fetch = { - type = "git"; - url = "https://github.com/sergi/go-diff"; - rev = "v1.1.0"; - sha256 = "0ir8ali2vx0j7pipmlfd6k8c973akyy2nmbjrf008fm800zcp7z2"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "v1.0.0"; - sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; - }; - } - { - goPackagePath = "github.com/smartystreets/assertions"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/assertions"; - rev = "b2de0cb4f26d"; - sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y"; - }; - } - { - goPackagePath = "github.com/smartystreets/goconvey"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/goconvey"; - rev = "68dc04aab96a"; - sha256 = "1kas5v95fzhr88hg4rjy0vp03y4pzvy3pwwgkfz2yhn5nlj29nk6"; - }; - } - { - goPackagePath = "github.com/softlayer/softlayer-go"; - fetch = { - type = "git"; - url = "https://github.com/softlayer/softlayer-go"; - rev = "5e1c8cccc730"; - sha256 = "0jsi0f60gx92qm1n2lcz65v425bbqf59dsr0dw4x1wmychp25mk7"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.0"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.5.1"; - sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; - }; - } - { - goPackagePath = "github.com/tdewolff/minify"; - fetch = { - type = "git"; - url = "https://github.com/tdewolff/minify"; - rev = "v2.3.6"; - sha256 = "0p4v4ab49lm5y438k5aks06fpiagbjw2j2x7i8jaa273mkgicrbb"; - }; - } - { - goPackagePath = "github.com/tdewolff/parse"; - fetch = { - type = "git"; - url = "https://github.com/tdewolff/parse"; - rev = "v2.3.4"; - sha256 = "00hclphbjgc5vjrqgnclp72v8c45k35vmj84d2a0f7bw8cc88zcd"; - }; - } - { - goPackagePath = "github.com/tdewolff/test"; - fetch = { - type = "git"; - url = "https://github.com/tdewolff/test"; - rev = "v1.0.6"; - sha256 = "12glhjb4cwp6yxwd17rwa6b4gxna3lm01bgc7yn9di58chc7lyh3"; - }; - } - { - goPackagePath = "github.com/tiramiseb/go-gandi"; - fetch = { - type = "git"; - url = "https://github.com/tiramiseb/go-gandi"; - rev = "e1cf2e430b3a"; - sha256 = "1m6wzif0dgssh5hzffwqg39789k9nwvj8xaq0d492f0fr14w0nng"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v2.1.1"; - sha256 = "0znf7pim7xsl8x6pcgi9vm0px48xrqfkw6ysn4yv6xc2569zpjs1"; - }; - } - { - goPackagePath = "github.com/vultr/govultr"; - fetch = { - type = "git"; - url = "https://github.com/vultr/govultr"; - rev = "v0.2.0"; - sha256 = "09103hb2rx93d6vyr54bqdai35d6l5q3klk09k53aqrijp8pycfz"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "v0.22.0"; - sha256 = "05jr8gkr2w34i5wwki4zhl5ch0qrgi7cdgag5iy5gpxplhbrvbg9"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "2aa609cf4a9d"; - sha256 = "1yvis6fqbsd7f356aqyi18f76vnwj3bry6mxqnkvshq4cwrf92il"; - }; - } - { - goPackagePath = "golang.org/x/exp"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/exp"; - rev = "efd6b22b2522"; - sha256 = "0ysahwb7p6y09izks4ca8nk2w414gmjxzz44l5rmadlvk3k66cgp"; - }; - } - { - goPackagePath = "golang.org/x/image"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/image"; - rev = "0694c2d4d067"; - sha256 = "0v4rs4xpi7agbdzjw713mp7gzij8z89058s0yfj3276mzlns3zk4"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "959b441ac422"; - sha256 = "1mgcv5f00pkzsbwnq2y7vqvd1b4lr5a3s47cphh2qv4indfk7pck"; - }; - } - { - goPackagePath = "golang.org/x/mobile"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mobile"; - rev = "d3739f865fa6"; - sha256 = "079ck2dyikacnph9s5mf0hrjnqlk6lc8q64dwnyw45w3xbbc50mg"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "v0.2.0"; - sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "0de0cce0169b"; - sha256 = "1db7s5kbzyh2zd5lpv05n7hp8wbwdvgk0wpiwrlnig94mkr0y5aq"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "bf48bf16ab8d"; - sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "cd5d95a43a6e"; - sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "cb0a6d8edb6c"; - sha256 = "0xkrf2k6nn1qh64ckrc4rmf1vhkzs0p7f1rnhv4v4pz9mvgh3v6w"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "9d24e82272b4"; - sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "20ab64c0d93f"; - sha256 = "1gfhw6daabjy771b3c0k0yga18ja50845n648mgagsa441dxvlch"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "v0.20.0"; - sha256 = "13syr1x33k6mrn5w6l4sgdbzn368w3m60vf6kk2j10fwa45125rg"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.6.5"; - sha256 = "05hbq4cs7bqw0zl17bx8rzdkszid3nyl92100scg3jjrg70dhm7w"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "24fa4b261c55"; - sha256 = "109zhaqlfd8zkbr1hk6zqbs6vcxfrk64scjwh2nswph05gr0m84d"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "v1.27.0"; - sha256 = "1ijrmgrxyabfn51nm3p9l81iaasq5fg237wnr6mdc4dzsfcg8kd7"; - }; - } - { - goPackagePath = "gopkg.in/asn1-ber.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/asn1-ber.v1"; - rev = "f715ec2f112d"; - sha256 = "00ixms8x3lrhywbvq5v2sagcqsxa1pcnlk17dp5lnwckv3xg4psb"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "41f04d3bba15"; - sha256 = "0vfk9czmlxmp6wndq8k17rhnjxal764mxfhrccza7nwlia760pjy"; - }; - } - { - goPackagePath = "gopkg.in/ini.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/ini.v1"; - rev = "v1.42.0"; - sha256 = "18ywm8zyv091j1pp5mvx8szl7928chk8lw02br6jy568d7rk4xal"; - }; - } - { - goPackagePath = "gopkg.in/ns1/ns1-go.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/ns1/ns1-go.v2"; - rev = "c563826f4cbe"; - sha256 = "0swpsy0bdkwqlb7i0fgxs55sdfsy7pbnh6a09crhbw5xldvswq5k"; - }; - } - { - goPackagePath = "gopkg.in/sourcemap.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/sourcemap.v1"; - rev = "v1.0.5"; - sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; - }; - } - { - goPackagePath = "gopkg.in/square/go-jose.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/square/go-jose.v2"; - rev = "v2.3.1"; - sha256 = "11r93g9xrcjqj7qvq8sbd5hy5rnbpmim0vdsp6rbav8gl7wimaa3"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.8"; - sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "ea95bdfd59fc"; - sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic"; - }; - } - { - goPackagePath = "rsc.io/binaryregexp"; - fetch = { - type = "git"; - url = "https://github.com/rsc/binaryregexp"; - rev = "v0.2.0"; - sha256 = "1kar0myy85waw418zslviwx8846zj0m9cmqkxjx0fvgjdi70nc4b"; - }; - } -] diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index 0967fd95dc0b1..ad1a0c9a533cd 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with lib; { - homepage = https://github.com/odeke-em/drive; + homepage = "https://github.com/odeke-em/drive"; description = "Google Drive client for the commandline"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix index d71b863f881fb..f3f5f54f4092a 100644 --- a/pkgs/applications/networking/droopy/default.nix +++ b/pkgs/applications/networking/droopy/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Mini Web server that let others upload files to your computer"; - homepage = http://stackp.online.fr/droopy; + homepage = "http://stackp.online.fr/droopy"; license = licenses.bsd3; maintainers = [ maintainers.Profpatsch ]; }; diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index 12865bd6ca7fa..5ff47f4859aad 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -64,7 +64,6 @@ stdenv.mkDerivation { homepage = "https://www.dropbox.com"; description = "Command line client for the dropbox daemon"; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; # NOTE: Dropbox itself only works on linux, so this is ok. platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 693a701821304..b3655888e1d33 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -77,7 +77,7 @@ buildFHSUserEnv { meta = with lib; { description = "Online stored folders (daemon version)"; - homepage = http://www.dropbox.com/; + homepage = "http://www.dropbox.com/"; license = licenses.unfree; maintainers = with maintainers; [ ttuegel ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index e4612579e0fee..60a7e5b2fb215 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -19,12 +19,12 @@ buildRustPackage rec { installPhase = '' mkdir -p $out/bin - cp -p target/release/cfdyndns $out/bin/ + cp -p $releaseDir/cfdyndns $out/bin/ ''; meta = with stdenv.lib; { description = "CloudFlare Dynamic DNS Client"; - homepage = https://github.com/colemickens/cfdyndns; + homepage = "https://github.com/colemickens/cfdyndns"; license = stdenv.lib.licenses.mit; maintainers = with maintainers; [ colemickens ]; platforms = with platforms; linux; diff --git a/pkgs/applications/networking/enhanced-ctorrent/default.nix b/pkgs/applications/networking/enhanced-ctorrent/default.nix index 59b48df1cd039..76d6d39baf29b 100644 --- a/pkgs/applications/networking/enhanced-ctorrent/default.nix +++ b/pkgs/applications/networking/enhanced-ctorrent/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { CTorrent, a BitTorrent client implemented in C++, with bugfixes and performance enhancements. ''; - homepage = http://www.rahul.net/dholmes/ctorrent/; + homepage = "http://www.rahul.net/dholmes/ctorrent/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index d5dc287ecac76..642677a9addc8 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -67,7 +67,7 @@ py.pkgs.buildPythonApplication rec { meta = with lib; { description = "Chatbot designed to be simple to extend with plugins written in Python"; - homepage = http://errbot.io/; + homepage = "http://errbot.io/"; maintainers = with maintainers; [ fpletz globin ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index a1539bd71659d..0282483df8dc5 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple, lightweight tool for sniping eBay auctions"; - homepage = http://esniper.sourceforge.net; + homepage = "http://esniper.sourceforge.net"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 peti ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix index 36b4732ca2e7c..80106085e1b6b 100644 --- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { unreadable white text. An interface with almost infinite customization and extensibility using the excellent Python programming language. ''; - homepage = https://codezen.org/canto-ng/; + homepage = "https://codezen.org/canto-ng/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix index e700c5634ad65..b8279f22de4d0 100644 --- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { unreadable white text. An interface with almost infinite customization and extensibility using the excellent Python programming language. ''; - homepage = https://codezen.org/canto-ng/; + homepage = "https://codezen.org/canto-ng/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index c336d2d0bba65..f399aeaa98d10 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A modern desktop application designed to complement existing web-based RSS accounts"; - homepage = https://jangernert.github.io/FeedReader/; + homepage = "https://jangernert.github.io/FeedReader/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ edwtjo worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 5b97859304cb8..74a43f00ca830 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -16,6 +16,7 @@ rustPlatform.buildRustPackage rec { postPatch = '' substituteInPlace Makefile --replace "|| true" "" + '' + stdenv.lib.optionalString stdenv.isDarwin '' # Allow other ncurses versions on Darwin substituteInPlace config.sh \ --replace "ncurses5.4" "ncurses" @@ -25,13 +26,13 @@ rustPlatform.buildRustPackage rec { pkgconfig asciidoctor gettext - ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper libiconv ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ncurses ]; buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv gettext ]; postBuild = '' - make + make prefix="$out" ''; # TODO: Check if that's still needed diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index 7304fd2f654be..9fdee56b99b4a 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec { namePrefix = ""; meta = with stdenv.lib; { - homepage = https://offog.org/code/rawdog/; + homepage = "https://offog.org/code/rawdog/"; description = "RSS Aggregator Without Delusions Of Grandeur"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 07f3f3fde0aa8..18f154d3ff741 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -37,7 +37,7 @@ buildPythonApplication rec { meta = with lib; { description = "A tool that converts RSS/Atom newsfeeds to email."; - homepage = https://pypi.python.org/pypi/rss2email; + homepage = "https://pypi.python.org/pypi/rss2email"; license = licenses.gpl2; maintainers = with maintainers; [ jb55 Profpatsch ]; }; diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index 2bb592bfb42c1..b95d272e6512b 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "3.5.9"; + version = "3.6.2"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "0dvjcazvrgxfxg1gvznxj8kx569v4ivns0brq00cn2yxyd4wx43s"; + sha256 = "1dx7gcmrjyi115lf6d36i129zmxfb16z7wy4ff8z9m65paci24mw"; }; buildInputs = [ qtwebengine qttools ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { developed using Qt framework and with online feed synchronization support for ownCloud/Nextcloud. ''; - homepage = https://github.com/martinrotter/rssguard; + homepage = "https://github.com/martinrotter/rssguard"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index 3e7909c91c056..66228efe89528 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cppcheck, libmrss }: +{ stdenv, fetchFromGitHub, cppcheck, libmrss, libiconv }: stdenv.mkDerivation { pname = "rsstail"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "flok99"; }; - buildInputs = [ libmrss ]; + buildInputs = [ libmrss ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; checkInputs = [ cppcheck ]; postPatch = '' @@ -29,8 +29,8 @@ stdenv.mkDerivation { RSSTail is more or less an RSS reader: it monitors an RSS feed and if it detects a new entry it'll emit only that new entry. ''; - homepage = http://www.vanheusden.com/rsstail/; + homepage = "http://www.vanheusden.com/rsstail/"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index ab2ca1601520b..c6e8ab5c887b1 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { FireHOL, an iptables stateful packet filtering firewall for humans! FireQOS, a TC based bandwidth shaper for humans! ''; - homepage = https://firehol.org/; + homepage = "https://firehol.org/"; license = licenses.gpl2; maintainers = with maintainers; [ geistesk ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/firehol/iprange.nix b/pkgs/applications/networking/firehol/iprange.nix index 194dfc25ebaac..e47afba02945e 100644 --- a/pkgs/applications/networking/firehol/iprange.nix +++ b/pkgs/applications/networking/firehol/iprange.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "manage IP ranges"; - homepage = https://github.com/firehol/iprange; + homepage = "https://github.com/firehol/iprange"; license = licenses.gpl2; maintainers = with maintainers; [ geistesk ]; }; diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/applications/networking/flent/http-getter.nix index 2bebf4b09601a..a38ac8511c234 100644 --- a/pkgs/applications/networking/flent/http-getter.nix +++ b/pkgs/applications/networking/flent/http-getter.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ cmake pkgconfig curl ]; meta = with stdenv.lib; { - homepage = https://github.com/tohojo/http-getter; + homepage = "https://github.com/tohojo/http-getter"; description = "Simple getter for HTTP URLs using cURL"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 8bb38230d5c1a..780385b28f317 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,10 +1,8 @@ { stdenv , fetchurl - , dbus , gettext , gnutls -, gtk2 , libfilezilla , libidn , nettle @@ -16,33 +14,46 @@ , xdg_utils }: +let + # we can drop this when wxgtk is built with gtk3 by default + # see: https://github.com/NixOS/nixpkgs/pull/73145 + wxgtk' = wxGTK30.override { compat26 = false; withGtk2 = false; }; + +in stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.46.3"; + version = "3.48.0"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "15bkg9qs07h4pzkxba1gymp8f264dk0zrzd9brx48fcwm7qbzigi"; + sha256 = "0msxl8ihbycd56hmn1q8sl1gzmsxc7j8ar9k4zsryd0ayyz7wv05"; }; + # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769 + postPatch = '' + sed -i src/interface/Mainfrm.h \ + -e '/^#define/a #include <list>' + ''; + configureFlags = [ "--disable-manualupdatecheck" "--disable-autoupdatecheck" ]; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus gettext gnutls - gtk2 libfilezilla libidn nettle pugixml sqlite tinyxml - wxGTK30 + wxgtk' + wxgtk'.gtk xdg_utils ]; diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index cb40c347e1cfa..b6c8a534545bd 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The FTP Client that drives you anywhere"; - homepage = https://github.com/Alecaddd/taxi; + homepage = "https://github.com/Alecaddd/taxi"; license = licenses.gpl3Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix index 4a4c93128dfee..c5a5d1e970a6d 100644 --- a/pkgs/applications/networking/gdrive/default.nix +++ b/pkgs/applications/networking/gdrive/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/prasmussen/gdrive; + homepage = "https://github.com/prasmussen/gdrive"; description = "A command line utility for interacting with Google Drive"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix index ea387dad42430..a9b9436a211ae 100644 --- a/pkgs/applications/networking/gmailctl/default.nix +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gmailctl"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mbrt"; repo = "gmailctl"; rev = "v${version}"; - sha256 = "0g581gdkib7bj86blpm8skjvbnivmzh9ddikxai9hr5qq231j1pb"; + sha256 = "08q4yjfbwlldirf3j5db18l8kn6sf288wd364s50jlcx2ka8w50j"; }; - modSha256 = "0pv3lhzl96ygzh9y01hi9klrrk403ii92imr9yrbimaf7rsvyvjp"; + vendorSha256 = "0qp8n7z3vcsbc6safp7i18i0i3r4hy4nidzwl85i981sg12vcg6b"; meta = with stdenv.lib; { description = "Declarative configuration for Gmail filters"; @@ -23,5 +23,4 @@ buildGoModule rec { maintainers = [ maintainers.doronbehar ]; platforms = platforms.unix; }; -} - +} \ No newline at end of file diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 1d045afd4c004..6cfc5ed3a9907 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage }: let - stableVersion = "2.2.7"; + stableVersion = "2.2.8"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -25,8 +25,8 @@ let }; mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "1rq1cb07mvakqny848nvwgasp8f6pxdy790gd98xh55xrbi8jvxp"; - serverSrcHash = "1cf3inppj2050mgmx5sgf540iz3m3nbh53p26dx8m67x2xfyb934"; + guiSrcHash = "1qgzad9hdbvkdalzdnlg5gnlzn2f9qlpd1aj8djmi6w1mmdkf9q7"; + serverSrcHash = "1kg38dh0xk4yvi7hz0d5dq9k0wany0sfd185l0zxs3nz78zd23an"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 830eae1fc2818..ac6ad4f22fe93 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -1,26 +1,22 @@ -{ stdenv, fetchFromGitHub, zlib -, ocaml, dune, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: +{ stdenv, buildDunePackage, fetchFromGitHub +, ocamlfuse, gapi_ocaml, ocaml_sqlite3 +}: -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "google-drive-ocamlfuse"; - version = "0.7.2"; + version = "0.7.21"; src = fetchFromGitHub { owner = "astrada"; repo = "google-drive-ocamlfuse"; rev = "v${version}"; - sha256 = "1l6b4bs5x373pw210nl8xal03ns2ib1ls49y64s3lqjfh5wjmnjy"; + sha256 = "0by3qnjrr1mbxyl2n99zggx8dxnqlicsq2b2hhhxb2d0k8qn47sw"; }; - nativeBuildInputs = [ dune ]; - - buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl ]; - - buildPhase = "jbuilder build @install"; - installPhase = "mkdir $out && dune install --prefix $out"; + buildInputs = [ ocamlfuse gapi_ocaml ocaml_sqlite3 ]; meta = { - homepage = http://gdfuse.forge.ocamlcore.org/; + homepage = "http://gdfuse.forge.ocamlcore.org/"; description = "A FUSE-based file system backed by Google Drive, written in OCaml"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/gopher/gopher/default.nix b/pkgs/applications/networking/gopher/gopher/default.nix index f90e35ca7e2e5..4e57163864427 100644 --- a/pkgs/applications/networking/gopher/gopher/default.nix +++ b/pkgs/applications/networking/gopher/gopher/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preConfigure = "export LIBS=-lncurses"; meta = with stdenv.lib; { - homepage = http://gopher.quux.org:70/devel/gopher; + homepage = "http://gopher.quux.org:70/devel/gopher"; description = "A ncurses gopher client"; platforms = platforms.linux; # clang doesn't like local regex.h license = licenses.gpl2; diff --git a/pkgs/applications/networking/gopher/gopherclient/default.nix b/pkgs/applications/networking/gopher/gopherclient/default.nix deleted file mode 100644 index 45d9235afc98d..0000000000000 --- a/pkgs/applications/networking/gopher/gopherclient/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, buildGoPackage, fetchgit, makeWrapper, pkgconfig, qtbase, qtdeclarative, qtwebengine }: - -buildGoPackage rec { - pname = "gopherclient"; - version = "2016-10-02"; - rev = "91c41b5542d08001636708e2a5054521a6004702"; - - goPackagePath = "github.com/prologic/gopherclient"; - - src = fetchgit { - inherit rev; - url = "https://github.com/prologic/gopherclient"; - sha256 = "0b1gvxhv4zg930hvric9mmbfp0lnww0sqlkkfbzfkif3wz9ni5y9"; - }; - - nativeBuildInputs = [ makeWrapper pkgconfig ]; - - buildInputs = [ qtbase qtdeclarative qtwebengine ]; - - preBuild = '' - # Generate gopherclient resources with genqrc. - ln -s ${goPackagePath}/vendor/gopkg.in go/src/ - GOBIN="$(pwd)" go install -v gopkg.in/qml.v1/cmd/genqrc - PATH="$(pwd):$PATH" go generate ${goPackagePath} - ''; - - NIX_CFLAGS_COMPILE = [ - # go-qml needs private Qt headers. - "-I${qtbase.dev}/include/QtCore/${qtbase.version}" - ]; - - postInstall = '' - # https://github.com/prologic/gopherclient/#usage - wrapProgram $bin/bin/gopherclient --prefix GODEBUG , cgocheck=0 - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/prologic/gopherclient; - description = "Gopher Qt GUI client"; - license = licenses.mit; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index 75c1cdaece96e..4753cd464b13d 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -2,24 +2,16 @@ buildGoModule rec { pname = "hydroxide"; - version = "0.2.11"; + version = "0.2.14"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "0rn35iyli80kgj3yn93lrx0ybgc8fhvmkvx1d18ill7r4cmavand"; + sha256 = "0d8wjyzmw89yhrszz487f7i19rcz7xlx4w2wd4c69k5nsdrs6dys"; }; - modSha256 = "0b19rcif8yiyvhrsjd3q5nsvr580lklamlphx4dk47n456ckcqfp"; - - # FIXME: remove with next release - patches = [ - (fetchpatch { - url = "https://github.com/emersion/hydroxide/commit/80e0fa6f3e0154338fb0af8a82ca32ae6281dd15.patch"; - sha256 = "1xi0clzgz14a7sxnwr0li7sz9p05sfh3zh5iqg2qz5f415k9jknj"; - }) - ]; + vendorSha256 = "0d8yfmsl8rycbq8gjnvc657j14644lq0zmr9l88ik360szw6v6gc"; subPackages = [ "cmd/hydroxide" ]; @@ -30,4 +22,4 @@ buildGoModule rec { maintainers = with maintainers; [ filalex77 ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 9af105ad52eb6..871aba0a669f4 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Data AcQuisition library (DAQ), for packet I/O"; - homepage = https://www.snort.org; + homepage = "https://www.snort.org"; maintainers = with stdenv.lib.maintainers; [ aycanirican ]; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 88df3857ec149..92415148ed5e0 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Network intrusion prevention and detection system (IDS/IPS)"; - homepage = https://www.snort.org; + homepage = "https://www.snort.org"; maintainers = with stdenv.lib.maintainers; [ aycanirican ]; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 04c87b7c25b66..d6e9b2e743973 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -34,11 +34,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - sha256 = "1ryfa3bzd8mrq2k5kjfwmblxqqziz6b9n1dnh692mazf5z4wlc3z"; + sha256 = "1nv5aq5lpkpskkzw05hr2lshkzcs4zqj5kfv4qjlbwigmp6kwh9l"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 9d1df501369fb..8fe856f9773f7 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -1,25 +1,35 @@ {stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, zlib, file, curl -, libmaxminddb, gperftools, python, swig, rocksdb }: +, libmaxminddb, gperftools, python, swig, fetchpatch }: let preConfigure = (import ./script.nix); in stdenv.mkDerivation rec { pname = "zeek"; - version = "3.0.3"; + version = "3.1.2"; src = fetchurl { - url = "https://old.zeek.org/downloads/zeek-${version}.tar.gz"; - sha256 = "0xlw5v83qbgy23wdcddmvan2pid28mw745g4fc1z5r18kp67i8a2"; + url = "https://download.zeek.org/zeek-${version}.tar.gz"; + sha256 = "18aa4pfwav8m6vq7cr4bhfg243da54ak933rqbriljnhsrgp4n0q"; }; nativeBuildInputs = [ cmake flex bison file ]; - buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig rocksdb ]; + buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig ]; #see issue https://github.com/zeek/zeek/issues/804 to modify hardlinking duplicate files. inherit preConfigure; - + enableParallelBuilding = true; + patches = stdenv.lib.optionals stdenv.cc.isClang [ + # Fix pybind c++17 build with Clang. See: https://github.com/pybind/pybind11/issues/1604 + (fetchpatch { + url = "https://github.com/pybind/pybind11/commit/759221f5c56939f59d8f342a41f8e2d2cacbc8cf.patch"; + sha256 = "0l8z7d7chq1awd8dnfarj4c40wx36hkhcan0702p5l89x73wqk54"; + extraPrefix = "aux/broker/bindings/python/3rdparty/pybind11/"; + stripLen = 1; + }) + ]; + cmakeFlags = [ "-DPY_MOD_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}" "-DENABLE_PERFTOOLS=true" diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index 0b0491ffb8617..93858ba3027ce 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.shrew.net/software; + homepage = "https://www.shrew.net/software"; description = "IPsec Client for FreeBSD, NetBSD and many Linux based operating systems"; platforms = platforms.unix; maintainers = [ maintainers.domenkozar ]; diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix index 716989c7b565e..f5ec3d7b6bd04 100644 --- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix +++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Export Skype history to HTML"; - homepage = https://github.com/Temptin/SkypeExport; + homepage = "https://github.com/Temptin/SkypeExport"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ yegortimoshenko ]; diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/pkgs/applications/networking/instant-messengers/amsn/default.nix index 6ff51445718b2..60d4ec829cc25 100644 --- a/pkgs/applications/networking/instant-messengers/amsn/default.nix +++ b/pkgs/applications/networking/instant-messengers/amsn/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "amsn-0.98.9"; src = fetchurl { - url = mirror://sourceforge/amsn/amsn-0.98.9-src.tar.gz; + url = "mirror://sourceforge/amsn/amsn-0.98.9-src.tar.gz"; sha256 = "0b8ir7spxnsz8f7kvr9f1k91nsy8cb65q6jv2l55b04fl20x4z7r"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Instant messaging (MSN Messenger clone)"; - homepage = http://amsn-project.net; + homepage = "http://amsn-project.net"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index a3497df1716cd..ace546227b931 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { -DHAVE_INTTYPES_H -D__GLIBC__ -D__need_timeval -D__need_timespec -D__need_time_t ''; meta = { - homepage = http://www.creytiv.com/baresip.html; + homepage = "http://www.creytiv.com/baresip.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index 5094a13119f76..0b6f142f1e921 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "bitlbee-discord"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { rev = version; owner = "sm00th"; repo = "bitlbee-discord"; - sha256 = "02pigk2vbz0jdz11f96sygdvp1j762yjn62h124fkcsc070g7a2f"; + sha256 = "00qgdvrp7hv02n0ns685igp810zxmv3adsama8601122al6x041n"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Bitlbee plugin for Discord"; - homepage = https://github.com/sm00th/bitlbee-discord; + homepage = "https://github.com/sm00th/bitlbee-discord"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lassulus jb55 ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 84067dc5f19d7..78016065610b7 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "The Facebook protocol plugin for bitlbee"; - homepage = https://github.com/bitlbee/bitlbee-facebook; + homepage = "https://github.com/bitlbee/bitlbee-facebook"; license = licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 798dab2b646db..14a3319c14901 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Steam protocol plugin for BitlBee"; - homepage = https://github.com/jgeboski/bitlbee-steam; + homepage = "https://github.com/jgeboski/bitlbee-steam"; license = licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 917610216aeb0..cf3f2549c8104 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { Messenger, AIM and ICQ. ''; - homepage = https://www.bitlbee.org/; + homepage = "https://www.bitlbee.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index b6e13fe403db8..f383daa6fd029 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -7,7 +7,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec { version = "3.2.0"; src = fetchdarcs { - url = http://devel.ag-projects.com/repositories/blink-qt; + url = "http://devel.ag-projects.com/repositories/blink-qt"; rev = "release-${version}"; sha256 = "19rcwr5scw48qnj79q1pysw95fz9h98nyc3161qy2kph5g7dwkc3"; }; @@ -59,7 +59,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://icanblink.com/; + homepage = "http://icanblink.com/"; description = "A state of the art, easy to use SIP client for Voice, Video and IM"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix index daffb539676fe..52d8178764c5a 100644 --- a/pkgs/applications/networking/instant-messengers/centerim/default.nix +++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://www.centerim.org/; + homepage = "http://www.centerim.org/"; description = "Fork of CenterICQ, a curses instant messaging program"; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index e507d986510c7..67c2a0db2372a 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "a safe and secure chat client"; - homepage = https://coy.im/; + homepage = "https://coy.im/"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix index ed30dca6cce2e..5418b671633e5 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix @@ -2,13 +2,13 @@ let pname = "deltachat-electron"; - version = "1.1.0"; + version = "1.2.0"; name = "${pname}-${version}"; src = fetchurl { url = - "https://download.delta.chat/desktop/r${version}/DeltaChat-${version}.AppImage"; - sha256 = "0pbn45cyv0h3fp7s9v9q93v12ah2gj7daaq0r3z140im6zv0rkrc"; + "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage"; + sha256 = "Cyb34bfQEdwOA6XYZO+1Ri/2e/PRat15aUMn7IElmUI="; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 9cf0032cf49fa..9c286d0083209 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -4,6 +4,7 @@ , xorg, libXdmcp, libxkbcommon , libnotify, libsoup, libgee , librsvg, libsignal-protocol-c +, fetchpatch , libgcrypt , epoxy , at-spi2-core @@ -26,6 +27,15 @@ stdenv.mkDerivation rec { sha256 = "1k5cgj5n8s40i71wqdh6m1q0njl45ichfdbbywx9rga5hljz1c54"; }; + patches = [ + (fetchpatch { + # Allow newer versions of libsignal-protocol-c + url = "https://github.com/dino/dino/commit/fbd70ceaac5ebbddfa21a580c61165bf5b861303.patch"; + sha256 = "0ydpwsmwrzfsry89fsffkfalhki4n1dw99ixjvpiingdrhjmwyl2"; + excludes = [ "plugins/signal-protocol/libsignal-protocol-c" ]; + }) + ]; + nativeBuildInputs = [ vala cmake @@ -64,7 +74,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Modern Jabber/XMPP Client using GTK/Vala"; - homepage = https://github.com/dino/dino; + homepage = "https://github.com/dino/dino"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ mic92 qyliss ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index 6e4a914ecb0e8..8f4f16673d251 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -51,6 +51,8 @@ in stdenv.mkDerivation rec { mimeType = "x-scheme-handler/discord"; }; + passthru.updateScript = ./update-discord.sh; + meta = with stdenv.lib; { description = "All-in-one cross-platform voice and text chat for gamers"; homepage = "https://discordapp.com/"; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index ab15cbb22af4f..926ddeeb04831 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,5 +1,5 @@ { branch ? "stable", pkgs }: -# Generated by /maintainers/scripts/update-discord +# Generated by ./update-discord.sh let inherit (pkgs) callPackage fetchurl; in { @@ -17,20 +17,20 @@ in { pname = "discord-ptb"; binaryName = "DiscordPTB"; desktopName = "Discord PTB"; - version = "0.0.18"; + version = "0.0.19"; src = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "1v9xph7shpmabwysbc08qqlkydzgsir8rwarrjf01xmpcpyia17g"; + sha256 = "0wixmm16qsmgbr0l9144vl5pc3s2p4jqhl7cnc6kmgy1y4ig56ib"; }; }; canary = callPackage ./base.nix rec { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.102"; + version = "0.0.103"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "1zl53vprkwbkfn3v0lddpp1swignqjxksi4qxl5zqj7482j372a4"; + sha256 = "1d95q75ak4z6wkxlgcmkl7yk20gl7zf568b0xslz42hwx032fn4z"; }; }; }.${branch} diff --git a/pkgs/applications/networking/instant-messengers/discord/update-discord.sh b/pkgs/applications/networking/instant-messengers/discord/update-discord.sh new file mode 100755 index 0000000000000..34c1574c65aab --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/discord/update-discord.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env bash +# script to generate ./default.nix + +set -e +exec >"${BASH_SOURCE%/*}/default.nix" + +cat <<EOF +{ branch ? "stable", pkgs }: +# Generated by ./update-discord.sh +let + inherit (pkgs) callPackage fetchurl; +in { +EOF + +for branch in "" ptb canary; do + url=$(curl -sI "https://discordapp.com/api/download${branch:+/}${branch}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+') + version=${url##https://dl*.discordapp.net/apps/linux/} + version=${version%%/*.tar.gz} + echo " ${branch:-stable} = callPackage ./base.nix rec {" + echo " pname = \"discord${branch:+-}${branch}\";" + case $branch in + "") suffix="" ;; + ptb) suffix="PTB" ;; + canary) suffix="Canary" ;; + esac + echo " binaryName = \"Discord${suffix}\";" + echo " desktopName = \"Discord${suffix:+ }${suffix}\";" + echo " version = \"${version}\";" + echo " src = fetchurl {" + echo " url = \"${url//${version}/\$\{version\}}\";" + echo " sha256 = \"$(nix-prefetch-url "$url")\";" + echo " };" + echo " };" +done + +echo "}.\${branch}" diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 47153779e4032..05767d1a9cd6f 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -80,7 +80,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Matrix group messaging app"; - homepage = https://gitlab.gnome.org/GNOME/fractal; + homepage = "https://gitlab.gnome.org/GNOME/fractal"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill worldofpeace ]; }; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 605550beb50ec..0c5090574fa68 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A free messaging app that combines chat & messaging services into one application"; - homepage = https://meetfranz.com; + homepage = "https://meetfranz.com"; license = licenses.free; maintainers = [ maintainers.davidtwco ]; platforms = ["x86_64-linux"]; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 1fd8c47a99c23..b2be635728d73 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { ''; meta = { - homepage = http://gajim.org/; + homepage = "http://gajim.org/"; description = "Jabber client written in PyGTK"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ raskin aszlig abbradar ]; diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 2962d190d369d..c58940c6c32c6 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -5,6 +5,7 @@ buildGoModule rec { version = "2020-03-20"; goPackagePath = "maunium.net/go/gomuks"; + patches = [ ./gomod.patch ]; src = fetchFromGitHub { owner = "tulir"; @@ -13,7 +14,7 @@ buildGoModule rec { sha256 = "0f7i88vrvl1xl4hmjplq3wwihqwijbgxy6nk5fkvc8pfmm5hsjcs"; }; - modSha256 = "10w0bjhnf6bbqx5jbgfv2jxxyqswzx25p64kkjmvh5qamjzpbjz2"; + vendorSha256 = "0awiw41nzgp4gj9fd8lcgk880aa07n535jksn0ya1cmsgavcfbvc"; postInstall = '' cp -r ${ @@ -37,4 +38,4 @@ buildGoModule rec { maintainers = with maintainers; [ tilpner emily ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/instant-messengers/gomuks/gomod.patch b/pkgs/applications/networking/instant-messengers/gomuks/gomod.patch new file mode 100644 index 0000000000000..ca8a32a4d2fba --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/gomuks/gomod.patch @@ -0,0 +1,20 @@ +diff --git a/go.mod b/go.mod +index 75d4a09..ef2a7ef 100644 +--- a/go.mod ++++ b/go.mod +@@ -9,13 +9,14 @@ require ( + github.com/lithammer/fuzzysearch v1.1.0 + github.com/lucasb-eyer/go-colorful v1.0.3 + github.com/mattn/go-runewidth v0.0.8 ++ github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect + github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect + github.com/pkg/errors v0.9.1 + github.com/rivo/uniseg v0.1.0 + github.com/russross/blackfriday/v2 v2.0.1 + github.com/sasha-s/go-deadlock v0.2.0 + github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect +- github.com/stretchr/testify v1.5.1 ++ github.com/stretchr/testify v1.3.0 + go.etcd.io/bbolt v1.3.3 + golang.org/x/image v0.0.0-20200119044424-58c23975cae1 + golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e diff --git a/pkgs/applications/networking/instant-messengers/gtmess/default.nix b/pkgs/applications/networking/instant-messengers/gtmess/default.nix index 3e16a58f54bb0..0661e6d7525ed 100644 --- a/pkgs/applications/networking/instant-messengers/gtmess/default.nix +++ b/pkgs/applications/networking/instant-messengers/gtmess/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gtmess-0.97"; src = fetchurl { - url = mirror://sourceforge/gtmess/gtmess-0.97.tar.gz; + url = "mirror://sourceforge/gtmess/gtmess-0.97.tar.gz"; sha256 = "1ipmqsrj0r1ssbgs2fpr4x5vnzlxlqhx9jrnadp1jw7s0sxpjqv0"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { description = "Console MSN Messenger client for Linux and other unix systems"; - homepage = http://gtmess.sourceforge.net/; + homepage = "http://gtmess.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 47854683e0ed5..7213332a549a6 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -80,7 +80,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Desktop client for HipChat services"; - homepage = http://www.hipchat.com; + homepage = "http://www.hipchat.com"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ puffnfresh ]; diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 169ddf65b29cd..f2b026e79dacb 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -1,22 +1,23 @@ { stdenv, fetchFromGitHub, ocamlPackages }: -assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; +assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.07"; stdenv.mkDerivation { pname = "jackline"; - version = "2019-08-08"; + version = "unstable-2020-04-24"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "b934594010a563ded9c0f436e3fab8f1cae29856"; - sha256 = "076h03jd970xlii90ax6kvgyq67g81gs30yvdzps366n7zzy3yfc"; + rev = "885b97b90d565f5f7c2b5f66f5edf14a82251b87"; + sha256 = "1mdn413ya2g0a1mrdbh1b65gnygrxb08k99z5lmidhh34kd1llsj"; }; buildInputs = with ocamlPackages; [ - ocaml ocamlbuild findlib topkg ppx_sexp_conv - erm_xmpp tls nocrypto x509 ocaml_lwt otr astring - ptime notty sexplib hex uutf + ocaml ocamlbuild findlib topkg ppx_sexp_conv ppx_deriving + erm_xmpp tls mirage-crypto mirage-crypto-pk x509 domain-name + ocaml_lwt otr astring ptime notty sexplib hex uutf + dns-client base64 ]; buildPhase = "${ocamlPackages.topkg.run} build --pinned true"; @@ -24,8 +25,8 @@ stdenv.mkDerivation { inherit (ocamlPackages.topkg) installPhase; meta = with stdenv.lib; { - homepage = https://github.com/hannesm/jackline; - description = "Terminal-based XMPP client in OCaml"; + homepage = "https://github.com/hannesm/jackline"; + description = "minimalistic secure XMPP client in OCaml"; license = licenses.bsd2; maintainers = with maintainers; [ sternenseemann ]; }; diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix new file mode 100644 index 0000000000000..7afe273599f4f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, fetchurl +, appimageTools +, makeWrapper +, electron_8 +}: + +stdenv.mkDerivation rec { + pname = "jitsi-meet-electron"; + version = "2.0.2"; + + src = fetchurl { + url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; + sha256 = "04y3qn2clvsfiyp9s6ib09mfxspv3kpr9248sda8s09n1cm0jpps"; + name="${pname}-${version}.AppImage"; + }; + + appimageContents = appimageTools.extractType2 { + name = "${pname}-${version}"; + inherit src; + }; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/${pname} $out/share/applications + + cp -a ${appimageContents}/{locales,resources} $out/share/${pname} + cp -a ${appimageContents}/jitsi-meet.desktop $out/share/applications/${pname}.desktop + cp -a ${appimageContents}/usr/share/icons $out/share + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${electron_8}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/resources/app.asar \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" + ''; + + meta = with stdenv.lib; { + description = "Jitsi Meet desktop application powered by Electron"; + homepage = "https://github.com/jitsi/jitsi-meet-electron"; + license = licenses.asl20; + maintainers = with maintainers; [ prusnak ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 7e01f97fe0dfb..025b66852f4ab 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { comment = "VoIP and Instant Messaging client"; desktopName = "Jitsi"; genericName = "Instant Messaging"; - categories = "Application;Internet;"; + categories = "Application;X-Internet;"; }; libPath = lib.makeLibraryPath ([ @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://jitsi.org/; + homepage = "https://jitsi.org/"; description = "Open Source Video Calls and Chat"; license = licenses.lgpl21Plus; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index b1927395a5705..0d97fcbbf5110 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -223,14 +223,13 @@ mkDerivation rec { cp linphone.desktop $out/share/applications/ cp -r ../assets/icons $out/share/ mkdir -p $out/share/belr/grammars - ln -s ${belcard}/share/belr/grammars/* $out/share/belr/grammars/ ln -s ${liblinphone}/share/belr/grammars/* $out/share/belr/grammars/ mkdir -p $out/share/linphone ln -s ${liblinphone}/share/linphone/* $out/share/linphone/ ''; meta = with lib; { - homepage = https://www.linphone.org/; + homepage = "https://www.linphone.org/"; description = "Open source SIP phone for voice/video calls and instant messaging"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix index 012ad195a71b9..577619dcc04ef 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix @@ -784,7 +784,7 @@ let version = "2.3.0"; src = fetchurl { name = "olm-2.3.0.tar.gz"; - url = https://packages.matrix.org/npm/olm/olm-2.3.0.tgz; + url = "https://packages.matrix.org/npm/olm/olm-2.3.0.tgz"; sha256 = "1f0f037a025a44509646cb849ded7c1a1f55e7bfed240fad19676c002fcd953a"; }; }; diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index dbfc87b8e8d43..0a41c9666b68e 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -90,7 +90,7 @@ in meta = with stdenv.lib; { description = "Mattermost Desktop client"; - homepage = https://about.mattermost.com/; + homepage = "https://about.mattermost.com/"; license = licenses.asl20; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.joko ]; diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index f411112371144..98b326820b9fc 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://mcabber.com/; + homepage = "http://mcabber.com/"; description = "Small Jabber console client"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index 7d2037d16a777..5c86157f50231 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An extensible Twitter client"; - homepage = https://mikutter.hachune.net; + homepage = "https://mikutter.hachune.net"; platforms = ruby.meta.platforms; license = licenses.mit; broken = true; diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix index 7122a509215df..3bdfcbfe7d1d1 100644 --- a/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -15,7 +15,7 @@ buildGoPackage { meta = { description = "A file system based matrix client"; - homepage = https://gitlab.com/meutraa/mm; + homepage = "https://gitlab.com/meutraa/mm"; license = stdenv.lib.licenses.isc; }; } diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index f214f72214388..f3b304564cbe5 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,79 +1,82 @@ -{ lib, stdenv, fetchFromGitHub -, cmake, cmark, lmdb, mkDerivation, qtbase, qtmacextras -, qtmultimedia, qttools, mtxclient, boost, spdlog, olm, pkgconfig +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, cmark +, lmdb +, lmdbxx +, tweeny +, mkDerivation +, qtbase +, qtmacextras +, qtmultimedia +, qttools +, qtquickcontrols2 +, qtgraphicaleffects +, mtxclient +, boost17x +, spdlog +, olm +, pkgconfig , nlohmann_json }: -# These hashes and revisions are based on those from here: -# https://github.com/Nheko-Reborn/nheko/blob/v0.6.4/deps/CMakeLists.txt#L52 -let - tweeny = fetchFromGitHub { - owner = "mobius3"; - repo = "tweeny"; - rev = "b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf"; - sha256 = "1wyyq0j7dhjd6qgvnh3knr70li47hmf5394yznkv9b1indqjx4mi"; - }; - - lmdbxx = fetchFromGitHub { - owner = "bendiken"; - repo = "lmdbxx"; - rev = "0b43ca87d8cfabba392dfe884eb1edb83874de02"; - sha256 = "1whsc5cybf9rmgyaj6qjji03fv5jbgcgygp956s3835b9f9cjg1n"; - }; -in mkDerivation rec { pname = "nheko"; - version = "0.6.4"; + version = "0.7.1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "19dkc98l1q4070v6mli4ybqn0ip0za607w39hjf0x8rqdxq45iwm"; + sha256 = "12sxibbrn79sxkf9jrm7jrlj7l5vz15claxrrll7pkv9mv44wady"; }; - # If, on Darwin, you encounter the error - # error: must specify at least one argument for '...' parameter of variadic - # macro [-Werror,-Wgnu-zero-variadic-macro-arguments] - # Then adding this parameter is likely the fix you want. - # - # However, it looks like either cmake doesn't honor this CFLAGS variable, or - # darwin's compiler doesn't have the same syntax as gcc for turning off - # -Werror selectively. - # - # Anyway, this is something that will have to be debugged with access to a - # darwin-based OS. Sorry about that! - # - #preConfigure = lib.optionalString stdenv.isDarwin '' - # export CFLAGS=-Wno-error=gnu-zero-variadic-macro-arguments - #''; - - postPatch = '' - mkdir -p .deps/include/ - ln -s ${tweeny}/include .deps/include/tweeny - ln -s ${spdlog} .deps/spdlog - ''; - + nativeBuildInputs = [ + lmdbxx + cmake + pkgconfig + ]; cmakeFlags = [ - "-DTWEENY_INCLUDE_DIR=.deps/include" - "-DLMDBXX_INCLUDE_DIR=${lmdbxx}" - "-Dnlohmann_json_DIR=${nlohmann_json}/lib/cmake/nlohmann_json" + # Can be removed once either https://github.com/NixOS/nixpkgs/pull/85254 or + # https://github.com/NixOS/nixpkgs/pull/73940 are merged + "-DBoost_NO_BOOST_CMAKE=TRUE" + ]; + # commit missing from latest release and recommended by upstream: + # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619263903 + patches = [ + (fetchpatch { + name = "room-ids-escape-patch"; + url = "https://github.com/Nheko-Reborn/nheko/commit/d94ac86816f9f325cba11f71344a3ca99591130d.patch"; + sha256 = "1p0kj4a60l3jf0rfakc88adld7ccg3vfjhzia5rf2i03h35cxw8c"; + }) ]; - - nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - mtxclient olm boost lmdb spdlog cmark - qtbase qtmultimedia qttools + nlohmann_json + tweeny + mtxclient + olm + boost17x + lmdb + spdlog + cmark + qtbase + qtmultimedia + qttools + qtquickcontrols2 + qtgraphicaleffects ] ++ lib.optional stdenv.isDarwin qtmacextras; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Desktop client for the Matrix protocol"; - homepage = https://github.com/Nheko-Reborn/nheko; + homepage = "https://github.com/Nheko-Reborn/nheko"; maintainers = with maintainers; [ ekleog fpletz ]; - platforms = platforms.unix; + platforms = platforms.all; + # Should be fixable if a higher clang version is used, see: + # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 + broken = stdenv.targetPlatform.isDarwin; license = licenses.gpl3Plus; }; } diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix index 3b3b0c2fd6618..e3595e07a788c 100644 --- a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix +++ b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit version; description = "Perl Console Twitter Client"; - homepage = http://oysttyer.github.io/; + homepage = "http://oysttyer.github.io/"; maintainers = with maintainers; [ woffs ]; license = with licenses; [ ffsl ]; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix index 079fc7d57fb1d..7c2150a584fe6 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pidgin-carbons"; - version = "0.1.3"; + version = "0.2.2"; src = fetchFromGitHub { owner = "gkdr"; repo = "carbons"; rev = "v${version}"; - sha256 = "05hcqvsirb7gnpfcszsrgal5q7dajl2wdi2dy7c41zgl377syavw"; + sha256 = "1aq9bwgpmbwrigq6ywf0pjkngqcm0qxncygaj1fi57npjhcjs6ln"; }; makeFlags = [ "PURPLE_PLUGIN_DIR=$(out)/lib/pidgin" ]; @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 pidgin ]; meta = with stdenv.lib; { - homepage = https://github.com/gkdr/carbons; + homepage = "https://github.com/gkdr/carbons"; description = "XEP-0280: Message Carbons plugin for libpurple"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ jb55 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix index 4521494430960..eccb8de31e59b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation { name = "pidgin-msn-pecan-0.1.4"; src = fetchurl { - url = http://msn-pecan.googlecode.com/files/msn-pecan-0.1.4.tar.bz2; + url = "http://msn-pecan.googlecode.com/files/msn-pecan-0.1.4.tar.bz2"; sha256 = "0d43z2ay9is1r2kkc9my8pz0fwdyzv7k19vdmbird18lg7rlbjd2"; }; meta = { description = "Alternative MSN protocol plug-in for Pidgin IM"; - homepage = https://github.com/felipec/msn-pecan; + homepage = "https://github.com/felipec/msn-pecan"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index 9f5c246ede634..bdc16d101f556 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libotr pidgin intltool ]; meta = with stdenv.lib; { - homepage = https://otr.cypherpunks.ca/; + homepage = "https://otr.cypherpunks.ca/"; description = "Plugin for Pidgin 2.x which implements OTR Messaging"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index bfd4b1abd5e56..1fd248e0c89d9 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/pidgin-latex/; + homepage = "https://sourceforge.net/projects/pidgin-latex/"; description = "LaTeX rendering plugin for Pidgin IM"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix index 3555e5a7197bf..13e165ad7a13e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = https://github.com/dreadatour/pidgin-mra; + homepage = "https://github.com/dreadatour/pidgin-mra"; description = "Mail.ru Agent plugin for Pidgin / libpurple"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index 6d527f3a7e46f..067a71a93dd52 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/EionRobb/pidgin-opensteamworks; + homepage = "https://github.com/EionRobb/pidgin-opensteamworks"; description = "Plugin for Pidgin 2.x which implements Steam Friends/Steam IM compatibility"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix index ff065e7e2ce33..bf9979c19f257 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ xosd pidgin ]; meta = with stdenv.lib; { - homepage = https://github.com/mbroemme/pidgin-osd; + homepage = "https://github.com/mbroemme/pidgin-osd"; description = "Plugin for Pidgin which implements on-screen display via libxosd"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index c418b2e992a87..cae84c054e89f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; meta = with stdenv.lib; { - homepage = https://github.com/EionRobb/skype4pidgin; + homepage = "https://github.com/EionRobb/skype4pidgin"; description = "SkypeWeb plugin for Pidgin"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix index 7302ba89a715f..463b6326b5a24 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://devel.kondorgulasch.de/pidgin-xmpp-receipts/; + homepage = "http://devel.kondorgulasch.de/pidgin-xmpp-receipts/"; description = "Message delivery receipts (XEP-0184) Pidgin plugin"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix index 6695f8cb69b84..0322005ae9352 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; meta = with stdenv.lib; { - homepage = https://github.com/EionRobb/purple-discord; + homepage = "https://github.com/EionRobb/purple-discord"; description = "Discord plugin for Pidgin"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix index 5d2292b50ad0c..204d99f6d7aba 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; meta = with stdenv.lib; { - homepage = https://bitbucket.org/EionRobb/purple-hangouts; + homepage = "https://bitbucket.org/EionRobb/purple-hangouts"; description = "Native Hangouts support for pidgin"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix index e488ae73be008..0a6aa1a133d6e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/gkdr/lurch; + homepage = "https://github.com/gkdr/lurch"; description = "XEP-0384: OMEMO Encryption for libpurple"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index e9a0812e925b1..999235314fe6f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/matrix-org/purple-matrix; + homepage = "https://github.com/matrix-org/purple-matrix"; description = "Matrix support for Pidgin / libpurple"; license = licenses.gpl2; maintainers = with maintainers; [ symphorien ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix index 8022d32a081af..6739befbfea48 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pidgin intltool python ]; meta = with stdenv.lib; { - homepage = https://bitbucket.org/rekkanoryo/purple-plugin-pack; + homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack"; description = "Plugin pack for Pidgin 2.x"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix index 10973345dec99..7d7abbd1eed6f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { PKG_CONFIG_PURPLE_DATAROOTDIR = "${placeholder "out"}/share"; meta = with stdenv.lib; { - homepage = https://github.com/dylex/slack-libpurple; + homepage = "https://github.com/dylex/slack-libpurple"; description = "Slack plugin for Pidgin"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix index edb4ca3c34951..76b242659e7ad 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=1" ]; meta = { - homepage = https://bitbucket.org/olegoandreev/purple-vk-plugin; + homepage = "https://bitbucket.org/olegoandreev/purple-vk-plugin"; description = "Vk (russian social network) plugin for Pidgin / libpurple"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix index 83904531753b3..3277e12ec086d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/Junker/purple-xmpp-http-upload; + homepage = "https://github.com/Junker/purple-xmpp-http-upload"; description = "HTTP File Upload plugin for libpurple (XMPP Protocol XEP-0363)"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix index 6657ff96b11fd..253d2ddfe24a2 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ pidgin libnotify gdk-pixbuf glib dbus dbus-glib ]; meta = { - homepage = https://github.com/novas0x2a/skype4pidgin; + homepage = "https://github.com/novas0x2a/skype4pidgin"; license = stdenv.lib.licenses.gpl3Plus; description = "Plugin to use a running skype account through pidgin"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index c38ff8f454e9d..38424ca25979b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/majn/telegram-purple; + homepage = "https://github.com/majn/telegram-purple"; description = "Telegram for Pidgin / libpurple"; license = licenses.gpl2; maintainers = [ maintainers.jagajaga ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix index 41f205514e763..de48ee26a6ed4 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = https://github.com/jin-eld/tox-prpl; + homepage = "https://github.com/jin-eld/tox-prpl"; description = "Tox plugin for Pidgin / libpurple"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix index 8f86256069ce9..f576f2ad9c3e7 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pidgin ]; meta = with stdenv.lib; { - homepage = https://github.com/dm0-/window_merge; + homepage = "https://github.com/dm0-/window_merge"; description = "Pidgin plugin that merges the Buddy List window with a conversation window"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 71168e1a692c2..369ae0693246e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -67,7 +67,7 @@ let unwrapped = stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi-protocol instant messaging client"; - homepage = http://pidgin.im; + homepage = "http://pidgin.im"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/applications/networking/instant-messengers/poezio/default.nix b/pkgs/applications/networking/instant-messengers/poezio/default.nix index 31c9fb4e7c3fb..f7238419b5394 100644 --- a/pkgs/applications/networking/instant-messengers/poezio/default.nix +++ b/pkgs/applications/networking/instant-messengers/poezio/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { meta = with lib; { description = "Free console XMPP client"; - homepage = https://poez.io; + homepage = "https://poez.io"; license = licenses.mit; maintainers = [ maintainers.lsix ]; }; diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index f6c1aa14e0ff0..86e760d497ce5 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { Profanity is a console based XMPP client written in C using ncurses and libstrophe, inspired by Irssi. ''; - homepage = http://www.profanity.im/; + homepage = "http://www.profanity.im/"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.devhell ]; diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 010c06e0c2aca..f451702501054 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -6,26 +6,15 @@ stdenv.mkDerivation rec { pname = "psi-plus"; - version = "1.4.984"; + version = "1.4.1231"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "1nii2nfi37i6mn79xmygscmm8ax75ky244wxkzlga0ya8i8wfjh7"; + sha256 = "0m5p8is8nk3g0cbwiq73cff9nn2y09fcnh1pzc6rlqqhmz1acg4i"; }; - resources = fetchFromGitHub { - owner = "psi-plus"; - repo = "resources"; - rev = "2f1c12564f7506bf902a26040fdb47ead4df6b73"; - sha256 = "1dgm9k052fq7f2bpx13kchg7sxb227dkn115lyspzvhnhprnypz2"; - }; - - postUnpack = '' - cp -a "${resources}/iconsets" "$sourceRoot" - ''; - cmakeFlags = [ "-DENABLE_PLUGINS=ON" ]; @@ -38,8 +27,6 @@ stdenv.mkDerivation rec { libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "XMPP (Jabber) client"; maintainers = with maintainers; [ orivej misuzu ]; diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 111f4e728e785..d76b8dd206e46 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -31,7 +31,7 @@ python2Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://bitmessage.org/; + homepage = "https://bitmessage.org/"; description = "The official Bitmessage client"; license = licenses.mit; maintainers = with maintainers; [ jgillich ]; diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index a78e5d1c2d12e..58d6230f26aeb 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -7,7 +7,7 @@ , AVFoundation ? null }: let - version = "1.16.3"; + version = "1.17.2"; rev = "v${version}"; in mkDerivation { @@ -17,7 +17,7 @@ in mkDerivation { src = fetchFromGitHub { owner = "qTox"; repo = "qTox"; - sha256 = "0qd4nvbrjnnfnk8ghsxq3cd1n1qf1ck5zg6ib11ij2pg03s146pa"; + sha256 = "04pbv1zsxy8dph2v0r9xc8lcm5g6604pwnppi3la5w46ihbwxlb9"; inherit rev; }; @@ -43,7 +43,7 @@ in mkDerivation { meta = with lib; { description = "Qt Tox client"; - homepage = https://tox.chat; + homepage = "https://tox.chat"; license = licenses.gpl3; maintainers = with maintainers; [ akaWolf peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index ec6a497bde92d..18b590304d8d2 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -1,46 +1,47 @@ { mkDerivation, stdenv, lib, fetchFromGitHub, cmake -, qtbase, qtquickcontrols, qtkeychain, qtmultimedia, qttools -, libqmatrixclient_0_5 -, libsecret +, qtbase, qtquickcontrols, qtquickcontrols2, qtkeychain, qtmultimedia, qttools +, libquotient, libsecret }: -let - generic = version: sha256: prefix: library: mkDerivation { - pname = "quaternion"; - inherit version; - - src = fetchFromGitHub { - owner = "QMatrixClient"; - repo = "Quaternion"; - rev = "${prefix}${version}"; - inherit sha256; - }; - - buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain library libsecret ]; - - nativeBuildInputs = [ cmake qttools ]; +mkDerivation rec { + pname = "quaternion"; + version = "0.0.9.4e"; - postInstall = if stdenv.isDarwin then '' - mkdir -p $out/Applications - mv $out/bin/quaternion.app $out/Applications - rmdir $out/bin || : - '' else '' - substituteInPlace $out/share/applications/quaternion.desktop \ - --replace 'Exec=quaternion' "Exec=$out/bin/quaternion" - ''; - - meta = with lib; { - description = "Cross-platform desktop IM client for the Matrix protocol"; - homepage = "https://matrix.org/docs/projects/client/quaternion.html"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; - inherit (qtbase.meta) platforms; - inherit version; - }; + src = fetchFromGitHub { + owner = "QMatrixClient"; + repo = "Quaternion"; + rev = "${version}"; + sha256 = "sha256-2yEiILiitRPj2hCodUDM8UNVq8crb9nyX21ebuh5EEM="; }; -in rec { - quaternion = generic "0.0.9.4c" "12mkwiqqbi4774kwl7gha72jyf0jf547acy6rw8ry249zl4lja54" "" libqmatrixclient_0_5; - - quaternion-git = quaternion; + buildInputs = [ + qtbase + qtmultimedia + qtquickcontrols + qtquickcontrols2 + qtkeychain + libquotient + libsecret + ]; + + nativeBuildInputs = [ cmake qttools ]; + + postInstall = if stdenv.isDarwin then '' + mkdir -p $out/Applications + mv $out/bin/quaternion.app $out/Applications + rmdir $out/bin || : + '' else '' + substituteInPlace $out/share/applications/com.github.quaternion.desktop \ + --replace 'Exec=quaternion' "Exec=$out/bin/quaternion" + ''; + + meta = with lib; { + description = + "Cross-platform desktop IM client for the Matrix protocol"; + homepage = "https://matrix.org/docs/projects/client/quaternion.html"; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + inherit (qtbase.meta) platforms; + inherit version; + }; } diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 71102e7ed7761..74a644d189d44 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free and Open Source messaging and emailing app that combines common web applications into one"; - homepage = http://rambox.pro; + homepage = "https://rambox.pro"; license = licenses.mit; maintainers = with maintainers; [ gnidorah ma27 ]; platforms = ["i686-linux" "x86_64-linux"]; diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix index 16c96a86a412c..215aebf2b2faf 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -16,22 +16,31 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/bin $out/opt/RamboxPro $out/share/applications - asar e resources/app.asar $out/opt/RamboxPro/resources/app.asar.unpacked - ln -s ${desktopItem}/share/applications/* $out/share/applications + mkdir -p $out/{bin,resources/dist/renderer/assets/images/app,share/applications,share/icons/hicolor/256x256/apps} + + asar e resources/app.asar $out/resources + + substituteInPlace "$out/resources/dist/electron/main.js" \ + --replace ",isHidden:" ",path:\"$out/bin/ramboxpro\",isHidden:" + + cp $desktopItem/share/applications/* $out/share/applications + cp $out/resources/dist/electron/imgs/256x256.png $out/share/icons/hicolor/256x256/apps/ramboxpro.png + cp $out/resources/dist/electron/imgs/256x256.png $out/resources/dist/renderer/assets/images/app/icon.png ''; postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/ramboxpro \ - --add-flags "$out/opt/RamboxPro/resources/app.asar.unpacked --without-update" \ + --add-flags "$out/resources --without-update" \ --prefix PATH : ${xdg_utils}/bin ''; desktopItem = makeDesktopItem { name = "rambox-pro"; exec = "ramboxpro"; + icon = "ramboxpro"; type = "Application"; desktopName = "Rambox Pro"; + categories = "Network;"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 3768ecd137fb5..212ba3a31a4b9 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation { meta = { description = "FIFO based tox client"; - homepage = http://ratox.2f30.org/; + homepage = "http://ratox.2f30.org/"; license = licenses.isc; maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 96ce9c32a7d67..de46c891d1fae 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, makeDesktopItem +{ mkDerivation, stdenv, fetchurl, pkgconfig, makeDesktopItem , qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols , openssl, protobuf, qmake }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "ricochet"; version = "1.1.4"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Anonymous peer-to-peer instant messaging"; - homepage = https://ricochet.im; + homepage = "https://ricochet.im"; license = licenses.bsd3; maintainers = [ maintainers.codsl maintainers.jgillich maintainers.np ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index 97c00924d6cff..55624643a018e 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -44,7 +44,7 @@ let ]); src = fetchgit { - url = https://gitlab.savoirfairelinux.com/ring/ring-daemon.git; + url = "https://gitlab.savoirfairelinux.com/ring/ring-daemon.git"; rev = "006b8dc7be08fe9beb68709af71004e7bc1ceb5c"; sha256 = "0ih9g0rismrhx6nqcy3jqfbcs166grg0shnfmrnmykl9h0xy8z47"; }; @@ -140,7 +140,7 @@ stdenv.mkDerivation { graphical user interfaces and even scripts to control the daemon from the shell. ''; - homepage = https://ring.cx; + homepage = "https://ring.cx"; license = licenses.gpl3Plus; maintainers = with maintainers; [ taeer olynch ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix index d4298a3d32f3e..775b9015eb0e1 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { business processes. Targeting mobile, tablet, desktop, and embedded production environments. ''; - homepage = https://corvusoft.co.uk/; + homepage = "https://corvusoft.co.uk/"; license = licenses.agpl3; maintainers = with maintainers; [ taeer ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index 390b61d8d3676..959b99e68f630 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -1,15 +1,111 @@ { - "name": "riot-web", + "name": "riot-desktop", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.15", + "version": "1.6.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", + "repository": { + "type": "git", + "url": "https://github.com/vector-im/riot-desktop" + }, + "license": "Apache-2.0", + "files": [], + "scripts": { + "mkdirs": "mkdirp packages deploys", + "fetch": "yarn run mkdirs && node scripts/fetch-package.js", + "start": "electron .", + "lint": "eslint src/ scripts/ hak/", + "build:native": "yarn run hak", + "build32": "electron-builder --ia32", + "build64": "electron-builder --x64", + "build": "electron-builder", + "docker:setup": "docker build -t riot-desktop-dockerbuild dockerbuild", + "docker:build:native": "scripts/in-docker.sh yarn run hak", + "docker:build": "scripts/in-docker.sh yarn run build", + "docker:install": "scripts/in-docker.sh yarn install", + "debrepo": "scripts/mkrepo.sh", + "clean": "rimraf webapp.asar dist packages deploys", + "hak": "node scripts/hak/index.js" + }, "dependencies": { "auto-launch": "^5.0.1", "electron-store": "^2.0.0", "electron-window-state": "^4.1.0", - "minimist": "^1.2.0", + "minimist": "^1.2.3", "png-to-ico": "^1.0.2" + }, + "devDependencies": { + "asar": "^2.0.1", + "electron-builder": "^22.3.2", + "electron-builder-squirrel-windows": "^22.3.2", + "electron-devtools-installer": "^2.2.4", + "electron-notarize": "^0.2.0", + "eslint": "^5.8.0", + "eslint-config-google": "^0.7.1", + "eslint-plugin-babel": "^4.1.2", + "find-npm-prefix": "^1.0.2", + "fs-extra": "^8.1.0", + "glob": "^7.1.6", + "matrix-js-sdk": "6.1.0", + "mkdirp": "^1.0.3", + "needle": "^2.3.2", + "node-pre-gyp": "^0.14.0", + "npm": "^6.13.7", + "rimraf": "^3.0.2", + "semver": "^7.1.3", + "tar": "^6.0.1" + }, + "hakDependencies": { + "matrix-seshat": "^1.3.3" + }, + "build": { + "appId": "im.riot.app", + "electronVersion": "8.0.3", + "files": [ + "package.json", + { + "from": ".hak/hakModules", + "to": "node_modules" + }, + "src/**" + ], + "extraResources": [ + { + "from": "res/img", + "to": "img" + }, + "webapp.asar" + ], + "linux": { + "target": "deb", + "category": "Network;InstantMessaging;Chat", + "maintainer": "support@riot.im", + "desktop": { + "StartupWMClass": "riot" + } + }, + "mac": { + "category": "public.app-category.social-networking", + "darkModeSupport": true + }, + "win": { + "target": { + "target": "squirrel" + }, + "sign": "scripts/electron_winSign" + }, + "directories": { + "output": "dist" + }, + "afterSign": "scripts/electron_afterSign", + "protocols": [ + { + "name": "riot", + "schemes": [ + "riot" + ] + } + ] } } diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix index e1dce803b4089..4aa56181c4c08 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix @@ -2,19 +2,315 @@ offline_cache = linkFarm "offline" packages; packages = [ { - name = "_types_node___node_9.6.45.tgz"; + name = "7zip_bin___7zip_bin_4.0.2.tgz"; path = fetchurl { - name = "_types_node___node_9.6.45.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-9.6.45.tgz"; - sha1 = "a9e5cfd026a3abaaf17e3c0318a470da9f2f178e"; + name = "7zip_bin___7zip_bin_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-4.0.2.tgz"; + sha1 = "6abbdc22f33cab742053777a26db2e25ca527179"; }; } { - name = "ajv___ajv_6.10.0.tgz"; + name = "7zip_bin___7zip_bin_5.0.3.tgz"; path = fetchurl { - name = "ajv___ajv_6.10.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz"; - sha1 = "90d0d54439da587cd7e843bfb7045f50bd22bdf1"; + name = "7zip_bin___7zip_bin_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz"; + sha1 = "bc5b5532ecafd923a61f2fb097e3b108c0106a3f"; + }; + } + { + name = "7zip___7zip_0.0.6.tgz"; + path = fetchurl { + name = "7zip___7zip_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/7zip/-/7zip-0.0.6.tgz"; + sha1 = "9cafb171af82329490353b4816f03347aa150a30"; + }; + } + { + name = "_babel_code_frame___code_frame_7.5.5.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz"; + sha1 = "bc0782f6d69f7b7d49531219699b988f669a8f9d"; + }; + } + { + name = "_babel_highlight___highlight_7.5.0.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz"; + sha1 = "56d11312bd9248fa619591d02472be6e8cb32540"; + }; + } + { + name = "_babel_runtime___runtime_7.9.2.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.9.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz"; + sha1 = "d90df0583a3a252f09aaa619665367bae518db06"; + }; + } + { + name = "_develar_schema_utils___schema_utils_2.1.0.tgz"; + path = fetchurl { + name = "_develar_schema_utils___schema_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.1.0.tgz"; + sha1 = "eceb1695bfbed6f6bb84666d5d3abe5e1fd54e17"; + }; + } + { + name = "_iarna_cli___cli_1.2.0.tgz"; + path = fetchurl { + name = "_iarna_cli___cli_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@iarna/cli/-/cli-1.2.0.tgz"; + sha1 = "0f7af5e851afe895104583c4ca07377a8094d641"; + }; + } + { + name = "_sindresorhus_is___is_0.14.0.tgz"; + path = fetchurl { + name = "_sindresorhus_is___is_0.14.0.tgz"; + url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz"; + sha1 = "9fb3a3cf3132328151f353de4632e01e52102bea"; + }; + } + { + name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; + path = fetchurl { + name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; + sha1 = "b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"; + }; + } + { + name = "_types_color_name___color_name_1.1.1.tgz"; + path = fetchurl { + name = "_types_color_name___color_name_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz"; + sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"; + }; + } + { + name = "_types_debug___debug_4.1.5.tgz"; + path = fetchurl { + name = "_types_debug___debug_4.1.5.tgz"; + url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz"; + sha1 = "b14efa8852b7768d898906613c23f688713e02cd"; + }; + } + { + name = "_types_fs_extra___fs_extra_8.0.1.tgz"; + path = fetchurl { + name = "_types_fs_extra___fs_extra_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.0.1.tgz"; + sha1 = "a2378d6e7e8afea1564e44aafa2e207dadf77686"; + }; + } + { + name = "_types_node___node_13.7.1.tgz"; + path = fetchurl { + name = "_types_node___node_13.7.1.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-13.7.1.tgz"; + sha1 = "238eb34a66431b71d2aaddeaa7db166f25971a0d"; + }; + } + { + name = "_types_node___node_9.6.55.tgz"; + path = fetchurl { + name = "_types_node___node_9.6.55.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-9.6.55.tgz"; + sha1 = "7cc1358c9c18e71f6c020e410962971863232cf5"; + }; + } + { + name = "JSONStream___JSONStream_1.3.5.tgz"; + path = fetchurl { + name = "JSONStream___JSONStream_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz"; + sha1 = "3208c1f08d3a4d99261ab64f92302bc15e111ca0"; + }; + } + { + name = "abbrev___abbrev_1.1.1.tgz"; + path = fetchurl { + name = "abbrev___abbrev_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; + sha1 = "f8f2c887ad10bf67f634f005b6987fed3179aac8"; + }; + } + { + name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; + path = fetchurl { + name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz"; + sha1 = "294adb71b57398b0680015f0a38c563ee1db5384"; + }; + } + { + name = "acorn___acorn_6.4.0.tgz"; + path = fetchurl { + name = "acorn___acorn_6.4.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz"; + sha1 = "b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"; + }; + } + { + name = "agent_base___agent_base_4.3.0.tgz"; + path = fetchurl { + name = "agent_base___agent_base_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz"; + sha1 = "8165f01c436009bccad0b1d122f05ed770efc6ee"; + }; + } + { + name = "agent_base___agent_base_4.2.1.tgz"; + path = fetchurl { + name = "agent_base___agent_base_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz"; + sha1 = "d89e5999f797875674c07d87f260fc41e83e8ca9"; + }; + } + { + name = "agentkeepalive___agentkeepalive_3.5.2.tgz"; + path = fetchurl { + name = "agentkeepalive___agentkeepalive_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz"; + sha1 = "a113924dd3fa24a0bc3b78108c450c2abee00f67"; + }; + } + { + name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; + path = fetchurl { + name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; + sha1 = "ef916e271c64ac12171fd8384eaae6b2345854da"; + }; + } + { + name = "ajv___ajv_6.10.2.tgz"; + path = fetchurl { + name = "ajv___ajv_6.10.2.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz"; + sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52"; + }; + } + { + name = "another_json___another_json_0.2.0.tgz"; + path = fetchurl { + name = "another_json___another_json_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/another-json/-/another-json-0.2.0.tgz"; + sha1 = "b5f4019c973b6dd5c6506a2d93469cb6d32aeedc"; + }; + } + { + name = "ansi_align___ansi_align_2.0.0.tgz"; + path = fetchurl { + name = "ansi_align___ansi_align_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz"; + sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; + }; + } + { + name = "ansi_align___ansi_align_3.0.0.tgz"; + path = fetchurl { + name = "ansi_align___ansi_align_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz"; + sha1 = "b536b371cf687caaef236c18d3e21fe3797467cb"; + }; + } + { + name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; + path = fetchurl { + name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; + sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"; + }; + } + { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + } + { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + } + { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997"; + }; + } + { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; + }; + } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + }; + } + { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz"; + sha1 = "90ae75c424d008d2624c5bf29ead3177ebfcf359"; + }; + } + { + name = "ansicolors___ansicolors_0.3.2.tgz"; + path = fetchurl { + name = "ansicolors___ansicolors_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz"; + sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; + }; + } + { + name = "ansistyles___ansistyles_0.1.3.tgz"; + path = fetchurl { + name = "ansistyles___ansistyles_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz"; + sha1 = "5de60415bda071bb37127854c864f41b23254539"; + }; + } + { + name = "app_builder_bin___app_builder_bin_3.5.2.tgz"; + path = fetchurl { + name = "app_builder_bin___app_builder_bin_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.2.tgz"; + sha1 = "fba56e6e9ef76fcd37816738c5f9a0b3992d7183"; + }; + } + { + name = "app_builder_lib___app_builder_lib_22.3.2.tgz"; + path = fetchurl { + name = "app_builder_lib___app_builder_lib_22.3.2.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.3.2.tgz"; + sha1 = "d43e0bdff91d484c0bd07d7248043dbb2665b8ac"; + }; + } + { + name = "app_builder_lib___app_builder_lib_22.3.3.tgz"; + path = fetchurl { + name = "app_builder_lib___app_builder_lib_22.3.3.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.3.3.tgz"; + sha1 = "9a95a3c14f69fb6131834dd840fba561191c9998"; }; } { @@ -26,6 +322,78 @@ }; } { + name = "aproba___aproba_1.2.0.tgz"; + path = fetchurl { + name = "aproba___aproba_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; + sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a"; + }; + } + { + name = "aproba___aproba_2.0.0.tgz"; + path = fetchurl { + name = "aproba___aproba_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz"; + sha1 = "52520b8ae5b569215b354efc0caa3fe1e45a8adc"; + }; + } + { + name = "archiver_utils___archiver_utils_2.1.0.tgz"; + path = fetchurl { + name = "archiver_utils___archiver_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz"; + sha1 = "e8a460e94b693c3e3da182a098ca6285ba9249e2"; + }; + } + { + name = "archiver___archiver_3.1.1.tgz"; + path = fetchurl { + name = "archiver___archiver_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/archiver/-/archiver-3.1.1.tgz"; + sha1 = "9db7819d4daf60aec10fe86b16cb9258ced66ea0"; + }; + } + { + name = "archy___archy_1.0.0.tgz"; + path = fetchurl { + name = "archy___archy_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz"; + sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; + }; + } + { + name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; + sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; + }; + } + { + name = "argparse___argparse_1.0.10.tgz"; + path = fetchurl { + name = "argparse___argparse_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; + sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + }; + } + { + name = "asap___asap_2.0.6.tgz"; + path = fetchurl { + name = "asap___asap_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz"; + sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; + }; + } + { + name = "asar___asar_2.0.1.tgz"; + path = fetchurl { + name = "asar___asar_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/asar/-/asar-2.0.1.tgz"; + sha1 = "8518a1c62c238109c15a5f742213e83a09b9fd38"; + }; + } + { name = "asn1___asn1_0.2.4.tgz"; path = fetchurl { name = "asn1___asn1_0.2.4.tgz"; @@ -42,6 +410,30 @@ }; } { + name = "astral_regex___astral_regex_1.0.0.tgz"; + path = fetchurl { + name = "astral_regex___astral_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz"; + sha1 = "6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"; + }; + } + { + name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; + path = fetchurl { + name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz"; + sha1 = "8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3"; + }; + } + { + name = "async___async_2.6.3.tgz"; + path = fetchurl { + name = "async___async_2.6.3.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; + sha1 = "d72625e2344a3656e3a3ad4fa749fa83299d82ff"; + }; + } + { name = "asynckit___asynckit_0.4.0.tgz"; path = fetchurl { name = "asynckit___asynckit_0.4.0.tgz"; @@ -66,11 +458,35 @@ }; } { - name = "aws4___aws4_1.8.0.tgz"; + name = "aws4___aws4_1.9.0.tgz"; + path = fetchurl { + name = "aws4___aws4_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.0.tgz"; + sha1 = "24390e6ad61386b0a747265754d2a17219de862c"; + }; + } + { + name = "balanced_match___balanced_match_1.0.0.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + } + { + name = "base_x___base_x_3.0.7.tgz"; path = fetchurl { - name = "aws4___aws4_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz"; - sha1 = "f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"; + name = "base_x___base_x_3.0.7.tgz"; + url = "https://registry.yarnpkg.com/base-x/-/base-x-3.0.7.tgz"; + sha1 = "1c5a7fafe8f66b4114063e8da102799d4e7c408f"; + }; + } + { + name = "base64_js___base64_js_1.3.1.tgz"; + path = fetchurl { + name = "base64_js___base64_js_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz"; + sha1 = "58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"; }; } { @@ -90,6 +506,38 @@ }; } { + name = "bin_links___bin_links_1.1.7.tgz"; + path = fetchurl { + name = "bin_links___bin_links_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/bin-links/-/bin-links-1.1.7.tgz"; + sha1 = "34b79ea9d0e575d7308afeff0c6b2fc24c793359"; + }; + } + { + name = "bl___bl_3.0.0.tgz"; + path = fetchurl { + name = "bl___bl_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-3.0.0.tgz"; + sha1 = "3611ec00579fd18561754360b21e9f784500ff88"; + }; + } + { + name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; + path = fetchurl { + name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz"; + sha1 = "a64a0e4365658b9ab5fe875eb9dfb694189bb41c"; + }; + } + { + name = "bluebird___bluebird_3.7.2.tgz"; + path = fetchurl { + name = "bluebird___bluebird_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; + sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; + }; + } + { name = "bmp_js___bmp_js_0.0.3.tgz"; path = fetchurl { name = "bmp_js___bmp_js_0.0.3.tgz"; @@ -98,6 +546,54 @@ }; } { + name = "boxen___boxen_1.3.0.tgz"; + path = fetchurl { + name = "boxen___boxen_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz"; + sha1 = "55c6c39a8ba58d9c61ad22cd877532deb665a20b"; + }; + } + { + name = "boxen___boxen_4.2.0.tgz"; + path = fetchurl { + name = "boxen___boxen_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz"; + sha1 = "e411b62357d6d6d36587c8ac3d5d974daa070e64"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } + { + name = "browser_request___browser_request_0.3.3.tgz"; + path = fetchurl { + name = "browser_request___browser_request_0.3.3.tgz"; + url = "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz"; + sha1 = "9ece5b5aca89a29932242e18bf933def9876cc17"; + }; + } + { + name = "bs58___bs58_4.0.1.tgz"; + path = fetchurl { + name = "bs58___bs58_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz"; + sha1 = "be161e76c354f6f788ae4071f63f34e8c4f0a42a"; + }; + } + { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + path = fetchurl { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + }; + } + { name = "buffer_equal___buffer_equal_0.0.1.tgz"; path = fetchurl { name = "buffer_equal___buffer_equal_0.0.1.tgz"; @@ -106,6 +602,126 @@ }; } { + name = "buffer_from___buffer_from_1.1.1.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; + sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + }; + } + { + name = "buffer___buffer_5.4.3.tgz"; + path = fetchurl { + name = "buffer___buffer_5.4.3.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-5.4.3.tgz"; + sha1 = "3fbc9c69eb713d323e3fc1a895eee0710c072115"; + }; + } + { + name = "builder_util_runtime___builder_util_runtime_8.6.0.tgz"; + path = fetchurl { + name = "builder_util_runtime___builder_util_runtime_8.6.0.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.6.0.tgz"; + sha1 = "b7007c30126da9a90e99932128d2922c8c178649"; + }; + } + { + name = "builder_util___builder_util_22.3.2.tgz"; + path = fetchurl { + name = "builder_util___builder_util_22.3.2.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.3.2.tgz"; + sha1 = "23c61aaf0f0006f994087b33a26e47cdaec7aa8d"; + }; + } + { + name = "builder_util___builder_util_22.3.3.tgz"; + path = fetchurl { + name = "builder_util___builder_util_22.3.3.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.3.3.tgz"; + sha1 = "62f0527ceaa1a2e4a60596a9b38ad1ffe3e20ae6"; + }; + } + { + name = "builtins___builtins_1.0.3.tgz"; + path = fetchurl { + name = "builtins___builtins_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz"; + sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; + }; + } + { + name = "byline___byline_5.0.0.tgz"; + path = fetchurl { + name = "byline___byline_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz"; + sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; + }; + } + { + name = "byte_size___byte_size_5.0.1.tgz"; + path = fetchurl { + name = "byte_size___byte_size_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/byte-size/-/byte-size-5.0.1.tgz"; + sha1 = "4b651039a5ecd96767e71a3d7ed380e48bed4191"; + }; + } + { + name = "cacache___cacache_12.0.3.tgz"; + path = fetchurl { + name = "cacache___cacache_12.0.3.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz"; + sha1 = "be99abba4e1bf5df461cd5a2c1071fc432573390"; + }; + } + { + name = "cacheable_request___cacheable_request_6.1.0.tgz"; + path = fetchurl { + name = "cacheable_request___cacheable_request_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz"; + sha1 = "20ffb8bd162ba4be11e9567d823db651052ca912"; + }; + } + { + name = "call_limit___call_limit_1.1.1.tgz"; + path = fetchurl { + name = "call_limit___call_limit_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/call-limit/-/call-limit-1.1.1.tgz"; + sha1 = "ef15f2670db3f1992557e2d965abc459e6e358d4"; + }; + } + { + name = "callsites___callsites_3.1.0.tgz"; + path = fetchurl { + name = "callsites___callsites_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; + sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; + }; + } + { + name = "camelcase___camelcase_4.1.0.tgz"; + path = fetchurl { + name = "camelcase___camelcase_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz"; + sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + }; + } + { + name = "camelcase___camelcase_5.3.1.tgz"; + path = fetchurl { + name = "camelcase___camelcase_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz"; + sha1 = "e3c9b31569e106811df242f715725a1f4c494320"; + }; + } + { + name = "capture_stack_trace___capture_stack_trace_1.0.1.tgz"; + path = fetchurl { + name = "capture_stack_trace___capture_stack_trace_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz"; + sha1 = "a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"; + }; + } + { name = "caseless___caseless_0.12.0.tgz"; path = fetchurl { name = "caseless___caseless_0.12.0.tgz"; @@ -114,11 +730,267 @@ }; } { - name = "combined_stream___combined_stream_1.0.7.tgz"; + name = "chalk___chalk_2.4.2.tgz"; + path = fetchurl { + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + }; + } + { + name = "chalk___chalk_3.0.0.tgz"; + path = fetchurl { + name = "chalk___chalk_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; + sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; + }; + } + { + name = "chardet___chardet_0.7.0.tgz"; + path = fetchurl { + name = "chardet___chardet_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz"; + sha1 = "90094849f0937f2eedc2425d0d28a9e5f0cbad9e"; + }; + } + { + name = "chownr___chownr_1.1.4.tgz"; + path = fetchurl { + name = "chownr___chownr_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; + sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; + }; + } + { + name = "chownr___chownr_1.1.3.tgz"; + path = fetchurl { + name = "chownr___chownr_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz"; + sha1 = "42d837d5239688d55f303003a508230fa6727142"; + }; + } + { + name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; + path = fetchurl { + name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"; + sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; + }; + } + { + name = "ci_info___ci_info_1.6.0.tgz"; + path = fetchurl { + name = "ci_info___ci_info_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz"; + sha1 = "2ca20dbb9ceb32d4524a683303313f0304b1e497"; + }; + } + { + name = "ci_info___ci_info_2.0.0.tgz"; + path = fetchurl { + name = "ci_info___ci_info_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; + sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46"; + }; + } + { + name = "cidr_regex___cidr_regex_2.0.10.tgz"; + path = fetchurl { + name = "cidr_regex___cidr_regex_2.0.10.tgz"; + url = "https://registry.yarnpkg.com/cidr-regex/-/cidr-regex-2.0.10.tgz"; + sha1 = "af13878bd4ad704de77d6dc800799358b3afa70d"; + }; + } + { + name = "cli_boxes___cli_boxes_1.0.0.tgz"; + path = fetchurl { + name = "cli_boxes___cli_boxes_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz"; + sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; + }; + } + { + name = "cli_boxes___cli_boxes_2.2.0.tgz"; + path = fetchurl { + name = "cli_boxes___cli_boxes_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz"; + sha1 = "538ecae8f9c6ca508e3c3c95b453fe93cb4c168d"; + }; + } + { + name = "cli_columns___cli_columns_3.1.2.tgz"; + path = fetchurl { + name = "cli_columns___cli_columns_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/cli-columns/-/cli-columns-3.1.2.tgz"; + sha1 = "6732d972979efc2ae444a1f08e08fa139c96a18e"; + }; + } + { + name = "cli_cursor___cli_cursor_2.1.0.tgz"; + path = fetchurl { + name = "cli_cursor___cli_cursor_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + } + { + name = "cli_table3___cli_table3_0.5.1.tgz"; + path = fetchurl { + name = "cli_table3___cli_table3_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz"; + sha1 = "0252372d94dfc40dbd8df06005f48f31f656f202"; + }; + } + { + name = "cli_width___cli_width_2.2.0.tgz"; + path = fetchurl { + name = "cli_width___cli_width_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz"; + sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + }; + } + { + name = "cliui___cliui_3.2.0.tgz"; + path = fetchurl { + name = "cliui___cliui_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz"; + sha1 = "120601537a916d29940f934da3b48d585a39213d"; + }; + } + { + name = "cliui___cliui_4.1.0.tgz"; + path = fetchurl { + name = "cliui___cliui_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz"; + sha1 = "348422dbe82d800b3022eef4f6ac10bf2e4d1b49"; + }; + } + { + name = "cliui___cliui_6.0.0.tgz"; + path = fetchurl { + name = "cliui___cliui_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz"; + sha1 = "511d702c0c4e41ca156d7d0e96021f23e13225b1"; + }; + } + { + name = "clone_response___clone_response_1.0.2.tgz"; + path = fetchurl { + name = "clone_response___clone_response_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz"; + sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; + }; + } + { + name = "clone___clone_1.0.4.tgz"; + path = fetchurl { + name = "clone___clone_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz"; + sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; + }; + } + { + name = "cmd_shim___cmd_shim_3.0.3.tgz"; + path = fetchurl { + name = "cmd_shim___cmd_shim_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-3.0.3.tgz"; + sha1 = "2c35238d3df37d98ecdd7d5f6b8dc6b21cadc7cb"; + }; + } + { + name = "code_point_at___code_point_at_1.1.0.tgz"; + path = fetchurl { + name = "code_point_at___code_point_at_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + }; + } + { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + } + { + name = "color_name___color_name_1.1.4.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; + sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + }; + } + { + name = "colors___colors_1.4.0.tgz"; + path = fetchurl { + name = "colors___colors_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz"; + sha1 = "c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"; + }; + } + { + name = "columnify___columnify_1.5.4.tgz"; + path = fetchurl { + name = "columnify___columnify_1.5.4.tgz"; + url = "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz"; + sha1 = "4737ddf1c7b69a8a7c340570782e947eec8e78bb"; + }; + } + { + name = "combined_stream___combined_stream_1.0.8.tgz"; + path = fetchurl { + name = "combined_stream___combined_stream_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; + sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + }; + } + { + name = "commander___commander_2.20.3.tgz"; + path = fetchurl { + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; + }; + } + { + name = "compress_commons___compress_commons_2.1.1.tgz"; + path = fetchurl { + name = "compress_commons___compress_commons_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-2.1.1.tgz"; + sha1 = "9410d9a534cf8435e3fbbb7c6ce48de2dc2f0610"; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "concat_stream___concat_stream_1.6.2.tgz"; path = fetchurl { - name = "combined_stream___combined_stream_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz"; - sha1 = "2d1d24317afb8abe95d6d2c0b07b57813539d828"; + name = "concat_stream___concat_stream_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; + sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; }; } { @@ -130,6 +1002,54 @@ }; } { + name = "config_chain___config_chain_1.1.12.tgz"; + path = fetchurl { + name = "config_chain___config_chain_1.1.12.tgz"; + url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz"; + sha1 = "0fde8d091200eb5e808caf25fe618c02f48e4efa"; + }; + } + { + name = "configstore___configstore_3.1.2.tgz"; + path = fetchurl { + name = "configstore___configstore_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz"; + sha1 = "c6f25defaeef26df12dd33414b001fe81a543f8f"; + }; + } + { + name = "configstore___configstore_5.0.1.tgz"; + path = fetchurl { + name = "configstore___configstore_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz"; + sha1 = "d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"; + }; + } + { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + path = fetchurl { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + } + { + name = "content_type___content_type_1.0.4.tgz"; + path = fetchurl { + name = "content_type___content_type_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz"; + sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b"; + }; + } + { + name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; + path = fetchurl { + name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; + sha1 = "92297398cae34937fcafd6ec8139c18051f0b5e0"; + }; + } + { name = "core_util_is___core_util_is_1.0.2.tgz"; path = fetchurl { name = "core_util_is___core_util_is_1.0.2.tgz"; @@ -138,6 +1058,86 @@ }; } { + name = "crc32_stream___crc32_stream_3.0.1.tgz"; + path = fetchurl { + name = "crc32_stream___crc32_stream_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-3.0.1.tgz"; + sha1 = "cae6eeed003b0e44d739d279de5ae63b171b4e85"; + }; + } + { + name = "crc___crc_3.8.0.tgz"; + path = fetchurl { + name = "crc___crc_3.8.0.tgz"; + url = "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz"; + sha1 = "ad60269c2c856f8c299e2c4cc0de4556914056c6"; + }; + } + { + name = "create_error_class___create_error_class_3.0.2.tgz"; + path = fetchurl { + name = "create_error_class___create_error_class_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz"; + sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + }; + } + { + name = "cross_spawn___cross_spawn_5.1.0.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; + }; + } + { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; + }; + } + { + name = "cross_unzip___cross_unzip_0.0.2.tgz"; + path = fetchurl { + name = "cross_unzip___cross_unzip_0.0.2.tgz"; + url = "https://registry.yarnpkg.com/cross-unzip/-/cross-unzip-0.0.2.tgz"; + sha1 = "5183bc47a09559befcf98cc4657964999359372f"; + }; + } + { + name = "crypto_random_string___crypto_random_string_1.0.0.tgz"; + path = fetchurl { + name = "crypto_random_string___crypto_random_string_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz"; + sha1 = "a230f64f568310e1498009940790ec99545bca7e"; + }; + } + { + name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; + path = fetchurl { + name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; + sha1 = "ef2a7a966ec11083388369baa02ebead229b30d5"; + }; + } + { + name = "cuint___cuint_0.2.2.tgz"; + path = fetchurl { + name = "cuint___cuint_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz"; + sha1 = "408086d409550c2631155619e9fa7bcadc3b991b"; + }; + } + { + name = "cyclist___cyclist_1.0.1.tgz"; + path = fetchurl { + name = "cyclist___cyclist_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz"; + sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9"; + }; + } + { name = "dashdash___dashdash_1.14.1.tgz"; path = fetchurl { name = "dashdash___dashdash_1.14.1.tgz"; @@ -146,11 +1146,99 @@ }; } { - name = "deep_equal___deep_equal_1.0.1.tgz"; + name = "debug___debug_3.1.0.tgz"; path = fetchurl { - name = "deep_equal___deep_equal_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz"; - sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; + name = "debug___debug_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz"; + sha1 = "5bb5a0672628b64149566ba16819e61518c67261"; + }; + } + { + name = "debug___debug_3.2.6.tgz"; + path = fetchurl { + name = "debug___debug_3.2.6.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz"; + sha1 = "e83d17de16d8a7efb7717edbe5fb10135eee629b"; + }; + } + { + name = "debug___debug_4.1.1.tgz"; + path = fetchurl { + name = "debug___debug_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; + sha1 = "3b72260255109c6b589cee050f1d516139664791"; + }; + } + { + name = "debuglog___debuglog_1.0.1.tgz"; + path = fetchurl { + name = "debuglog___debuglog_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz"; + sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492"; + }; + } + { + name = "decamelize___decamelize_1.2.0.tgz"; + path = fetchurl { + name = "decamelize___decamelize_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + } + { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + path = fetchurl { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + } + { + name = "decompress_response___decompress_response_3.3.0.tgz"; + path = fetchurl { + name = "decompress_response___decompress_response_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz"; + sha1 = "80a4dd323748384bfa248083622aedec982adff3"; + }; + } + { + name = "deep_equal___deep_equal_1.1.1.tgz"; + path = fetchurl { + name = "deep_equal___deep_equal_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz"; + sha1 = "b5c98c942ceffaf7cb051e24e1434a25a2e6076a"; + }; + } + { + name = "deep_extend___deep_extend_0.6.0.tgz"; + path = fetchurl { + name = "deep_extend___deep_extend_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; + sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; + }; + } + { + name = "deep_is___deep_is_0.1.3.tgz"; + path = fetchurl { + name = "deep_is___deep_is_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + } + { + name = "defaults___defaults_1.0.3.tgz"; + path = fetchurl { + name = "defaults___defaults_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz"; + sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; + }; + } + { + name = "defer_to_connect___defer_to_connect_1.1.1.tgz"; + path = fetchurl { + name = "defer_to_connect___defer_to_connect_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.1.tgz"; + sha1 = "88ae694b93f67b81815a2c8c769aef6574ac8f2f"; }; } { @@ -170,6 +1258,62 @@ }; } { + name = "delegates___delegates_1.0.0.tgz"; + path = fetchurl { + name = "delegates___delegates_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + } + { + name = "detect_indent___detect_indent_5.0.0.tgz"; + path = fetchurl { + name = "detect_indent___detect_indent_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz"; + sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; + }; + } + { + name = "detect_libc___detect_libc_1.0.3.tgz"; + path = fetchurl { + name = "detect_libc___detect_libc_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + }; + } + { + name = "detect_newline___detect_newline_2.1.0.tgz"; + path = fetchurl { + name = "detect_newline___detect_newline_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz"; + sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"; + }; + } + { + name = "dezalgo___dezalgo_1.0.3.tgz"; + path = fetchurl { + name = "dezalgo___dezalgo_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz"; + sha1 = "7f742de066fc748bc8db820569dddce49bf0d456"; + }; + } + { + name = "dmg_builder___dmg_builder_22.3.2.tgz"; + path = fetchurl { + name = "dmg_builder___dmg_builder_22.3.2.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.3.2.tgz"; + sha1 = "4c052f75d601e3358da1ff9d7d57738e1c01b157"; + }; + } + { + name = "doctrine___doctrine_3.0.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; + sha1 = "addebead72a6574db783639dc87a121773973961"; + }; + } + { name = "dom_walk___dom_walk_0.1.1.tgz"; path = fetchurl { name = "dom_walk___dom_walk_0.1.1.tgz"; @@ -186,6 +1330,54 @@ }; } { + name = "dot_prop___dot_prop_5.2.0.tgz"; + path = fetchurl { + name = "dot_prop___dot_prop_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz"; + sha1 = "c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"; + }; + } + { + name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; + path = fetchurl { + name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz"; + sha1 = "3fbaf020bfd794884072ea26b1e9791d45a629f0"; + }; + } + { + name = "dotenv___dotenv_5.0.1.tgz"; + path = fetchurl { + name = "dotenv___dotenv_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/dotenv/-/dotenv-5.0.1.tgz"; + sha1 = "a5317459bd3d79ab88cff6e44057a6a3fbb1fcef"; + }; + } + { + name = "dotenv___dotenv_8.2.0.tgz"; + path = fetchurl { + name = "dotenv___dotenv_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz"; + sha1 = "97e619259ada750eea3e4ea3e26bceea5424b16a"; + }; + } + { + name = "duplexer3___duplexer3_0.1.4.tgz"; + path = fetchurl { + name = "duplexer3___duplexer3_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + } + { + name = "duplexify___duplexify_3.7.1.tgz"; + path = fetchurl { + name = "duplexify___duplexify_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz"; + sha1 = "2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"; + }; + } + { name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; path = fetchurl { name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; @@ -194,6 +1386,70 @@ }; } { + name = "editor___editor_1.0.0.tgz"; + path = fetchurl { + name = "editor___editor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/editor/-/editor-1.0.0.tgz"; + sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"; + }; + } + { + name = "ejs___ejs_3.0.1.tgz"; + path = fetchurl { + name = "ejs___ejs_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-3.0.1.tgz"; + sha1 = "30c8f6ee9948502cc32e85c37a3f8b39b5a614a5"; + }; + } + { + name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.3.3.tgz"; + path = fetchurl { + name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.3.3.tgz"; + url = "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-22.3.3.tgz"; + sha1 = "0a417af35c83b067096bd3217b6b7bd75c6c48a9"; + }; + } + { + name = "electron_builder___electron_builder_22.3.2.tgz"; + path = fetchurl { + name = "electron_builder___electron_builder_22.3.2.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.3.2.tgz"; + sha1 = "902d150fc0670cb90213262e5e0aa3c4f299ffa4"; + }; + } + { + name = "electron_devtools_installer___electron_devtools_installer_2.2.4.tgz"; + path = fetchurl { + name = "electron_devtools_installer___electron_devtools_installer_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-2.2.4.tgz"; + sha1 = "261a50337e37121d338b966f07922eb4939a8763"; + }; + } + { + name = "electron_notarize___electron_notarize_0.2.1.tgz"; + path = fetchurl { + name = "electron_notarize___electron_notarize_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-0.2.1.tgz"; + sha1 = "759e8006decae19134f82996ed910db26d9192cc"; + }; + } + { + name = "electron_publish___electron_publish_22.3.2.tgz"; + path = fetchurl { + name = "electron_publish___electron_publish_22.3.2.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.3.2.tgz"; + sha1 = "d2e60caf7a9643fe57e501c20acaf32c737b1c50"; + }; + } + { + name = "electron_publish___electron_publish_22.3.3.tgz"; + path = fetchurl { + name = "electron_publish___electron_publish_22.3.3.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.3.3.tgz"; + sha1 = "7d1e757a20ce0558fdc42900b6e3d773fdae9d9e"; + }; + } + { name = "electron_store___electron_store_2.0.0.tgz"; path = fetchurl { name = "electron_store___electron_store_2.0.0.tgz"; @@ -210,6 +1466,38 @@ }; } { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha1 = "933a04052860c85e83c122479c4748a8e4c72156"; + }; + } + { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + }; + } + { + name = "encoding___encoding_0.1.12.tgz"; + path = fetchurl { + name = "encoding___encoding_0.1.12.tgz"; + url = "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz"; + sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; + }; + } + { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + path = fetchurl { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; + }; + } + { name = "env_paths___env_paths_1.0.0.tgz"; path = fetchurl { name = "env_paths___env_paths_1.0.0.tgz"; @@ -218,19 +1506,51 @@ }; } { - name = "es_abstract___es_abstract_1.13.0.tgz"; + name = "env_paths___env_paths_2.2.0.tgz"; + path = fetchurl { + name = "env_paths___env_paths_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz"; + sha1 = "cdca557dc009152917d6166e2febe1f039685e43"; + }; + } + { + name = "err_code___err_code_1.1.2.tgz"; + path = fetchurl { + name = "err_code___err_code_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz"; + sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960"; + }; + } + { + name = "errno___errno_0.1.7.tgz"; + path = fetchurl { + name = "errno___errno_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz"; + sha1 = "4684d71779ad39af177e3f007996f7c67c852618"; + }; + } + { + name = "error_ex___error_ex_1.3.2.tgz"; + path = fetchurl { + name = "error_ex___error_ex_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; + sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; + }; + } + { + name = "es_abstract___es_abstract_1.16.3.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz"; - sha1 = "ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"; + name = "es_abstract___es_abstract_1.16.3.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.3.tgz"; + sha1 = "52490d978f96ff9f89ec15b5cf244304a5bca161"; }; } { - name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; path = fetchurl { - name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; - sha1 = "edf72478033456e8dda8ef09e00ad9650707f377"; + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; }; } { @@ -242,6 +1562,150 @@ }; } { + name = "es6_promise___es6_promise_4.2.8.tgz"; + path = fetchurl { + name = "es6_promise___es6_promise_4.2.8.tgz"; + url = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz"; + sha1 = "4eb21594c972bc40553d276e510539143db53e0a"; + }; + } + { + name = "es6_promisify___es6_promisify_5.0.0.tgz"; + path = fetchurl { + name = "es6_promisify___es6_promisify_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz"; + sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; + }; + } + { + name = "escape_goat___escape_goat_2.1.1.tgz"; + path = fetchurl { + name = "escape_goat___escape_goat_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz"; + sha1 = "1b2dc77003676c457ec760b2dc68edb648188675"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + } + { + name = "eslint_config_google___eslint_config_google_0.7.1.tgz"; + path = fetchurl { + name = "eslint_config_google___eslint_config_google_0.7.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.7.1.tgz"; + sha1 = "5598f8498e9e078420f34b80495b8d959f651fb2"; + }; + } + { + name = "eslint_plugin_babel___eslint_plugin_babel_4.1.2.tgz"; + path = fetchurl { + name = "eslint_plugin_babel___eslint_plugin_babel_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-4.1.2.tgz"; + sha1 = "79202a0e35757dd92780919b2336f1fa2fe53c1e"; + }; + } + { + name = "eslint_scope___eslint_scope_4.0.3.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz"; + sha1 = "ca03833310f6889a3264781aa82e63eb9cfe7848"; + }; + } + { + name = "eslint_utils___eslint_utils_1.4.3.tgz"; + path = fetchurl { + name = "eslint_utils___eslint_utils_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz"; + sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f"; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; + sha1 = "e2a82cea84ff246ad6fb57f9bde5b46621459ec2"; + }; + } + { + name = "eslint___eslint_5.16.0.tgz"; + path = fetchurl { + name = "eslint___eslint_5.16.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz"; + sha1 = "a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"; + }; + } + { + name = "espree___espree_5.0.1.tgz"; + path = fetchurl { + name = "espree___espree_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz"; + sha1 = "5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"; + }; + } + { + name = "esprima___esprima_4.0.1.tgz"; + path = fetchurl { + name = "esprima___esprima_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; + sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; + }; + } + { + name = "esquery___esquery_1.0.1.tgz"; + path = fetchurl { + name = "esquery___esquery_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz"; + sha1 = "406c51658b1f5991a5f9b62b1dc25b00e3e5c708"; + }; + } + { + name = "esrecurse___esrecurse_4.2.1.tgz"; + path = fetchurl { + name = "esrecurse___esrecurse_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz"; + sha1 = "007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"; + }; + } + { + name = "estraverse___estraverse_4.3.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; + sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; + }; + } + { + name = "esutils___esutils_2.0.3.tgz"; + path = fetchurl { + name = "esutils___esutils_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; + sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; + }; + } + { + name = "execa___execa_0.7.0.tgz"; + path = fetchurl { + name = "execa___execa_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz"; + sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; + }; + } + { + name = "execa___execa_1.0.0.tgz"; + path = fetchurl { + name = "execa___execa_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; + sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; + }; + } + { name = "exif_parser___exif_parser_0.1.12.tgz"; path = fetchurl { name = "exif_parser___exif_parser_0.1.12.tgz"; @@ -258,6 +1722,14 @@ }; } { + name = "external_editor___external_editor_3.1.0.tgz"; + path = fetchurl { + name = "external_editor___external_editor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz"; + sha1 = "cb03f740befae03ea4d283caed2741a83f335495"; + }; + } + { name = "extsprintf___extsprintf_1.3.0.tgz"; path = fetchurl { name = "extsprintf___extsprintf_1.3.0.tgz"; @@ -290,6 +1762,38 @@ }; } { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + path = fetchurl { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + } + { + name = "figgy_pudding___figgy_pudding_3.5.1.tgz"; + path = fetchurl { + name = "figgy_pudding___figgy_pudding_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz"; + sha1 = "862470112901c727a0e495a80744bd5baa1d6790"; + }; + } + { + name = "figures___figures_2.0.0.tgz"; + path = fetchurl { + name = "figures___figures_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz"; + sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + }; + } + { + name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; + path = fetchurl { + name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; + sha1 = "ca0f6efa6dd3d561333fb14515065c2fafdf439c"; + }; + } + { name = "file_type___file_type_3.9.0.tgz"; path = fetchurl { name = "file_type___file_type_3.9.0.tgz"; @@ -298,6 +1802,14 @@ }; } { + name = "find_npm_prefix___find_npm_prefix_1.0.2.tgz"; + path = fetchurl { + name = "find_npm_prefix___find_npm_prefix_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/find-npm-prefix/-/find-npm-prefix-1.0.2.tgz"; + sha1 = "8d8ce2c78b3b4b9e66c8acc6a37c231eb841cfdf"; + }; + } + { name = "find_up___find_up_2.1.0.tgz"; path = fetchurl { name = "find_up___find_up_2.1.0.tgz"; @@ -306,11 +1818,43 @@ }; } { - name = "for_each___for_each_0.3.3.tgz"; + name = "find_up___find_up_3.0.0.tgz"; + path = fetchurl { + name = "find_up___find_up_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz"; + sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73"; + }; + } + { + name = "find_up___find_up_4.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; + sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + }; + } + { + name = "flat_cache___flat_cache_2.0.1.tgz"; path = fetchurl { - name = "for_each___for_each_0.3.3.tgz"; - url = "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz"; - sha1 = "69b447e88a0a5d32c3e7084f3f1710034b21376e"; + name = "flat_cache___flat_cache_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz"; + sha1 = "5d296d6f04bda44a4630a301413bdbc2ec085ec0"; + }; + } + { + name = "flatted___flatted_2.0.1.tgz"; + path = fetchurl { + name = "flatted___flatted_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz"; + sha1 = "69e57caa8f0eacbc281d2e2cb458d46fdb449e08"; + }; + } + { + name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; + path = fetchurl { + name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz"; + sha1 = "8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"; }; } { @@ -330,6 +1874,78 @@ }; } { + name = "from2___from2_1.3.0.tgz"; + path = fetchurl { + name = "from2___from2_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/from2/-/from2-1.3.0.tgz"; + sha1 = "88413baaa5f9a597cfde9221d86986cd3c061dfd"; + }; + } + { + name = "from2___from2_2.3.0.tgz"; + path = fetchurl { + name = "from2___from2_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + } + { + name = "fs_constants___fs_constants_1.0.0.tgz"; + path = fetchurl { + name = "fs_constants___fs_constants_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz"; + sha1 = "6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"; + }; + } + { + name = "fs_extra___fs_extra_8.1.0.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; + sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"; + }; + } + { + name = "fs_minipass___fs_minipass_1.2.7.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz"; + sha1 = "ccff8570841e7fe4265693da88936c55aed7f7c7"; + }; + } + { + name = "fs_minipass___fs_minipass_2.0.0.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz"; + sha1 = "a6415edab02fae4b9e9230bc87ee2e4472003cd1"; + }; + } + { + name = "fs_vacuum___fs_vacuum_1.2.10.tgz"; + path = fetchurl { + name = "fs_vacuum___fs_vacuum_1.2.10.tgz"; + url = "https://registry.yarnpkg.com/fs-vacuum/-/fs-vacuum-1.2.10.tgz"; + sha1 = "b7629bec07a4031a2548fdf99f5ecf1cc8b31e36"; + }; + } + { + name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; + path = fetchurl { + name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; + sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + } + { name = "function_bind___function_bind_1.1.1.tgz"; path = fetchurl { name = "function_bind___function_bind_1.1.1.tgz"; @@ -338,6 +1954,78 @@ }; } { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + path = fetchurl { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + }; + } + { + name = "gauge___gauge_2.7.4.tgz"; + path = fetchurl { + name = "gauge___gauge_2.7.4.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + } + { + name = "genfun___genfun_5.0.0.tgz"; + path = fetchurl { + name = "genfun___genfun_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz"; + sha1 = "9dd9710a06900a5c4a5bf57aca5da4e52fe76537"; + }; + } + { + name = "gentle_fs___gentle_fs_2.3.0.tgz"; + path = fetchurl { + name = "gentle_fs___gentle_fs_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/gentle-fs/-/gentle-fs-2.3.0.tgz"; + sha1 = "13538db5029400f98684be4894e8a7d8f0d1ea7f"; + }; + } + { + name = "get_caller_file___get_caller_file_1.0.3.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz"; + sha1 = "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"; + }; + } + { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + }; + } + { + name = "get_stream___get_stream_3.0.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + }; + } + { + name = "get_stream___get_stream_4.1.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; + sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"; + }; + } + { + name = "get_stream___get_stream_5.1.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz"; + sha1 = "01203cdc92597f9b909067c3e656cc1f4d3c4dc9"; + }; + } + { name = "getpass___getpass_0.1.7.tgz"; path = fetchurl { name = "getpass___getpass_0.1.7.tgz"; @@ -346,6 +2034,30 @@ }; } { + name = "glob___glob_7.1.6.tgz"; + path = fetchurl { + name = "glob___glob_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; + sha1 = "141f33b81a7c2492e125594307480c46679278a6"; + }; + } + { + name = "global_dirs___global_dirs_0.1.1.tgz"; + path = fetchurl { + name = "global_dirs___global_dirs_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz"; + sha1 = "b319c0dd4607f353f3be9cca4c72fc148c49f445"; + }; + } + { + name = "global_dirs___global_dirs_2.0.1.tgz"; + path = fetchurl { + name = "global_dirs___global_dirs_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz"; + sha1 = "acdf3bb6685bcd55cb35e8a052266569e9469201"; + }; + } + { name = "global___global_4.3.2.tgz"; path = fetchurl { name = "global___global_4.3.2.tgz"; @@ -354,11 +2066,35 @@ }; } { - name = "graceful_fs___graceful_fs_4.1.15.tgz"; + name = "globals___globals_11.12.0.tgz"; + path = fetchurl { + name = "globals___globals_11.12.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz"; + sha1 = "ab8795338868a0babd8525758018c2a7eb95c42e"; + }; + } + { + name = "got___got_6.7.1.tgz"; + path = fetchurl { + name = "got___got_6.7.1.tgz"; + url = "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz"; + sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; + }; + } + { + name = "got___got_9.6.0.tgz"; + path = fetchurl { + name = "got___got_9.6.0.tgz"; + url = "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz"; + sha1 = "edf45e7d67f99545705de1f7bbeeeb121765ed85"; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.3.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.1.15.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz"; - sha1 = "ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"; + name = "graceful_fs___graceful_fs_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz"; + sha1 = "4a12ff1b60376ef09862c2093edd908328be8423"; }; } { @@ -378,11 +2114,43 @@ }; } { - name = "has_symbols___has_symbols_1.0.0.tgz"; + name = "has_flag___has_flag_3.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + } + { + name = "has_flag___has_flag_4.0.0.tgz"; path = fetchurl { - name = "has_symbols___has_symbols_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz"; - sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + }; + } + { + name = "has_symbols___has_symbols_1.0.1.tgz"; + path = fetchurl { + name = "has_symbols___has_symbols_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz"; + sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8"; + }; + } + { + name = "has_unicode___has_unicode_2.0.1.tgz"; + path = fetchurl { + name = "has_unicode___has_unicode_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + } + { + name = "has_yarn___has_yarn_2.1.0.tgz"; + path = fetchurl { + name = "has_yarn___has_yarn_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz"; + sha1 = "137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"; }; } { @@ -394,6 +2162,46 @@ }; } { + name = "hosted_git_info___hosted_git_info_2.8.5.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_2.8.5.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz"; + sha1 = "759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"; + }; + } + { + name = "hosted_git_info___hosted_git_info_3.0.2.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.2.tgz"; + sha1 = "8b7e3bd114b59b51786f8bade0f39ddc80275a97"; + }; + } + { + name = "http_cache_semantics___http_cache_semantics_3.8.1.tgz"; + path = fetchurl { + name = "http_cache_semantics___http_cache_semantics_3.8.1.tgz"; + url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; + sha1 = "39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"; + }; + } + { + name = "http_cache_semantics___http_cache_semantics_4.0.3.tgz"; + path = fetchurl { + name = "http_cache_semantics___http_cache_semantics_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz"; + sha1 = "495704773277eeef6e43f9ab2c2c7d259dda25c5"; + }; + } + { + name = "http_proxy_agent___http_proxy_agent_2.1.0.tgz"; + path = fetchurl { + name = "http_proxy_agent___http_proxy_agent_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz"; + sha1 = "e4821beef5b2142a2026bd73926fe537631c5405"; + }; + } + { name = "http_signature___http_signature_1.2.0.tgz"; path = fetchurl { name = "http_signature___http_signature_1.2.0.tgz"; @@ -402,6 +2210,94 @@ }; } { + name = "https_proxy_agent___https_proxy_agent_2.2.4.tgz"; + path = fetchurl { + name = "https_proxy_agent___https_proxy_agent_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz"; + sha1 = "4ee7a737abd92678a293d9b34a1af4d0d08c787b"; + }; + } + { + name = "humanize_ms___humanize_ms_1.2.1.tgz"; + path = fetchurl { + name = "humanize_ms___humanize_ms_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz"; + sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed"; + }; + } + { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; + }; + } + { + name = "iconv_lite___iconv_lite_0.5.1.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.1.tgz"; + sha1 = "b2425d3c7b18f7219f2ca663d103bddb91718d64"; + }; + } + { + name = "ieee754___ieee754_1.1.13.tgz"; + path = fetchurl { + name = "ieee754___ieee754_1.1.13.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz"; + sha1 = "ec168558e95aa181fd87d37f55c32bbcb6708b84"; + }; + } + { + name = "iferr___iferr_0.1.5.tgz"; + path = fetchurl { + name = "iferr___iferr_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz"; + sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; + }; + } + { + name = "iferr___iferr_1.0.2.tgz"; + path = fetchurl { + name = "iferr___iferr_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/iferr/-/iferr-1.0.2.tgz"; + sha1 = "e9fde49a9da06dc4a4194c6c9ed6d08305037a6d"; + }; + } + { + name = "ignore_walk___ignore_walk_3.0.3.tgz"; + path = fetchurl { + name = "ignore_walk___ignore_walk_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz"; + sha1 = "017e2447184bfeade7c238e4aefdd1e8f95b1e37"; + }; + } + { + name = "ignore___ignore_4.0.6.tgz"; + path = fetchurl { + name = "ignore___ignore_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz"; + sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc"; + }; + } + { + name = "import_fresh___import_fresh_3.2.1.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz"; + sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; + }; + } + { + name = "import_lazy___import_lazy_2.1.0.tgz"; + path = fetchurl { + name = "import_lazy___import_lazy_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz"; + sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; + }; + } + { name = "imurmurhash___imurmurhash_0.1.4.tgz"; path = fetchurl { name = "imurmurhash___imurmurhash_0.1.4.tgz"; @@ -410,6 +2306,70 @@ }; } { + name = "infer_owner___infer_owner_1.0.4.tgz"; + path = fetchurl { + name = "infer_owner___infer_owner_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz"; + sha1 = "c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "ini___ini_1.3.5.tgz"; + path = fetchurl { + name = "ini___ini_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz"; + sha1 = "eee25f56db1c9ec6085e0c22778083f596abf927"; + }; + } + { + name = "init_package_json___init_package_json_1.10.3.tgz"; + path = fetchurl { + name = "init_package_json___init_package_json_1.10.3.tgz"; + url = "https://registry.yarnpkg.com/init-package-json/-/init-package-json-1.10.3.tgz"; + sha1 = "45ffe2f610a8ca134f2bd1db5637b235070f6cbe"; + }; + } + { + name = "inquirer___inquirer_6.5.2.tgz"; + path = fetchurl { + name = "inquirer___inquirer_6.5.2.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz"; + sha1 = "ad50942375d036d327ff528c08bd5fab089928ca"; + }; + } + { + name = "invert_kv___invert_kv_1.0.0.tgz"; + path = fetchurl { + name = "invert_kv___invert_kv_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz"; + sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; + }; + } + { + name = "invert_kv___invert_kv_2.0.0.tgz"; + path = fetchurl { + name = "invert_kv___invert_kv_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz"; + sha1 = "7393f5afa59ec9ff5f67a27620d11c226e3eec02"; + }; + } + { name = "ip_regex___ip_regex_1.0.3.tgz"; path = fetchurl { name = "ip_regex___ip_regex_1.0.3.tgz"; @@ -418,6 +2378,38 @@ }; } { + name = "ip_regex___ip_regex_2.1.0.tgz"; + path = fetchurl { + name = "ip_regex___ip_regex_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz"; + sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; + }; + } + { + name = "ip___ip_1.1.5.tgz"; + path = fetchurl { + name = "ip___ip_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz"; + sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; + }; + } + { + name = "is_arguments___is_arguments_1.0.4.tgz"; + path = fetchurl { + name = "is_arguments___is_arguments_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz"; + sha1 = "3faf966c7cba0ff437fb31f6250082fcf0448cf3"; + }; + } + { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + } + { name = "is_callable___is_callable_1.1.4.tgz"; path = fetchurl { name = "is_callable___is_callable_1.1.4.tgz"; @@ -426,6 +2418,30 @@ }; } { + name = "is_ci___is_ci_1.2.1.tgz"; + path = fetchurl { + name = "is_ci___is_ci_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz"; + sha1 = "e3779c8ee17fccf428488f6e281187f2e632841c"; + }; + } + { + name = "is_ci___is_ci_2.0.0.tgz"; + path = fetchurl { + name = "is_ci___is_ci_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz"; + sha1 = "6bc6334181810e04b5c22b3d589fdca55026404c"; + }; + } + { + name = "is_cidr___is_cidr_3.1.0.tgz"; + path = fetchurl { + name = "is_cidr___is_cidr_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-cidr/-/is-cidr-3.1.0.tgz"; + sha1 = "72e233d8e1c4cd1d3f11713fcce3eba7b0e3476f"; + }; + } + { name = "is_date_object___is_date_object_1.0.1.tgz"; path = fetchurl { name = "is_date_object___is_date_object_1.0.1.tgz"; @@ -434,6 +2450,30 @@ }; } { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + }; + } + { name = "is_function___is_function_1.0.1.tgz"; path = fetchurl { name = "is_function___is_function_1.0.1.tgz"; @@ -442,6 +2482,38 @@ }; } { + name = "is_installed_globally___is_installed_globally_0.1.0.tgz"; + path = fetchurl { + name = "is_installed_globally___is_installed_globally_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz"; + sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; + }; + } + { + name = "is_installed_globally___is_installed_globally_0.3.1.tgz"; + path = fetchurl { + name = "is_installed_globally___is_installed_globally_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.1.tgz"; + sha1 = "679afef819347a72584617fd19497f010b8ed35f"; + }; + } + { + name = "is_npm___is_npm_1.0.0.tgz"; + path = fetchurl { + name = "is_npm___is_npm_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz"; + sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; + }; + } + { + name = "is_npm___is_npm_4.0.0.tgz"; + path = fetchurl { + name = "is_npm___is_npm_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz"; + sha1 = "c90dd8380696df87a7a6d823c20d0b12bbe3c84d"; + }; + } + { name = "is_obj___is_obj_1.0.1.tgz"; path = fetchurl { name = "is_obj___is_obj_1.0.1.tgz"; @@ -450,6 +2522,46 @@ }; } { + name = "is_obj___is_obj_2.0.0.tgz"; + path = fetchurl { + name = "is_obj___is_obj_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; + sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982"; + }; + } + { + name = "is_path_inside___is_path_inside_1.0.1.tgz"; + path = fetchurl { + name = "is_path_inside___is_path_inside_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz"; + sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"; + }; + } + { + name = "is_path_inside___is_path_inside_3.0.2.tgz"; + path = fetchurl { + name = "is_path_inside___is_path_inside_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz"; + sha1 = "f5220fc82a3e233757291dddc9c5877f2a1f3017"; + }; + } + { + name = "is_promise___is_promise_2.1.0.tgz"; + path = fetchurl { + name = "is_promise___is_promise_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + } + { + name = "is_redirect___is_redirect_1.0.0.tgz"; + path = fetchurl { + name = "is_redirect___is_redirect_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz"; + sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; + }; + } + { name = "is_regex___is_regex_1.0.4.tgz"; path = fetchurl { name = "is_regex___is_regex_1.0.4.tgz"; @@ -458,11 +2570,27 @@ }; } { - name = "is_symbol___is_symbol_1.0.2.tgz"; + name = "is_retry_allowed___is_retry_allowed_1.2.0.tgz"; + path = fetchurl { + name = "is_retry_allowed___is_retry_allowed_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz"; + sha1 = "d778488bd0a4666a3be8a1482b9f2baafedea8b4"; + }; + } + { + name = "is_stream___is_stream_1.1.0.tgz"; + path = fetchurl { + name = "is_stream___is_stream_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + } + { + name = "is_symbol___is_symbol_1.0.3.tgz"; path = fetchurl { - name = "is_symbol___is_symbol_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz"; - sha1 = "a055f6ae57192caee329e7a860118b497a950f38"; + name = "is_symbol___is_symbol_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz"; + sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937"; }; } { @@ -474,6 +2602,46 @@ }; } { + name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; + path = fetchurl { + name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; + sha1 = "d502d3382590ea3004893746754c89139973e232"; + }; + } + { + name = "isarray___isarray_0.0.1.tgz"; + path = fetchurl { + name = "isarray___isarray_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + } + { + name = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + } + { + name = "isbinaryfile___isbinaryfile_4.0.4.tgz"; + path = fetchurl { + name = "isbinaryfile___isbinaryfile_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.4.tgz"; + sha1 = "6803f81a8944201c642b6e17da041e24deb78712"; + }; + } + { + name = "isexe___isexe_2.0.0.tgz"; + path = fetchurl { + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + } + { name = "isstream___isstream_0.1.2.tgz"; path = fetchurl { name = "isstream___isstream_0.1.2.tgz"; @@ -498,6 +2666,22 @@ }; } { + name = "js_tokens___js_tokens_4.0.0.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; + sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; + }; + } + { + name = "js_yaml___js_yaml_3.13.1.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_3.13.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz"; + sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847"; + }; + } + { name = "jsbn___jsbn_0.1.1.tgz"; path = fetchurl { name = "jsbn___jsbn_0.1.1.tgz"; @@ -506,6 +2690,22 @@ }; } { + name = "json_buffer___json_buffer_3.0.0.tgz"; + path = fetchurl { + name = "json_buffer___json_buffer_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz"; + sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; + }; + } + { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + path = fetchurl { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; + }; + } + { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; path = fetchurl { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; @@ -522,6 +2722,14 @@ }; } { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + path = fetchurl { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + } + { name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; path = fetchurl { name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; @@ -530,6 +2738,14 @@ }; } { + name = "json5___json5_2.1.1.tgz"; + path = fetchurl { + name = "json5___json5_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz"; + sha1 = "81b6cb04e9ba496f1c7005d07b4368a2638f90b6"; + }; + } + { name = "jsonfile___jsonfile_2.4.0.tgz"; path = fetchurl { name = "jsonfile___jsonfile_2.4.0.tgz"; @@ -538,6 +2754,22 @@ }; } { + name = "jsonfile___jsonfile_4.0.0.tgz"; + path = fetchurl { + name = "jsonfile___jsonfile_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + } + { + name = "jsonparse___jsonparse_1.3.1.tgz"; + path = fetchurl { + name = "jsonparse___jsonparse_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz"; + sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; + }; + } + { name = "jsprim___jsprim_1.4.1.tgz"; path = fetchurl { name = "jsprim___jsprim_1.4.1.tgz"; @@ -546,6 +2778,158 @@ }; } { + name = "keyv___keyv_3.1.0.tgz"; + path = fetchurl { + name = "keyv___keyv_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz"; + sha1 = "ecc228486f69991e49e9476485a5be1e8fc5c4d9"; + }; + } + { + name = "latest_version___latest_version_3.1.0.tgz"; + path = fetchurl { + name = "latest_version___latest_version_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz"; + sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15"; + }; + } + { + name = "latest_version___latest_version_5.1.0.tgz"; + path = fetchurl { + name = "latest_version___latest_version_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz"; + sha1 = "119dfe908fe38d15dfa43ecd13fa12ec8832face"; + }; + } + { + name = "lazy_property___lazy_property_1.0.0.tgz"; + path = fetchurl { + name = "lazy_property___lazy_property_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/lazy-property/-/lazy-property-1.0.0.tgz"; + sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147"; + }; + } + { + name = "lazy_val___lazy_val_1.0.4.tgz"; + path = fetchurl { + name = "lazy_val___lazy_val_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz"; + sha1 = "882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65"; + }; + } + { + name = "lazystream___lazystream_1.0.0.tgz"; + path = fetchurl { + name = "lazystream___lazystream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz"; + sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; + }; + } + { + name = "lcid___lcid_1.0.0.tgz"; + path = fetchurl { + name = "lcid___lcid_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz"; + sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; + }; + } + { + name = "lcid___lcid_2.0.0.tgz"; + path = fetchurl { + name = "lcid___lcid_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz"; + sha1 = "6ef5d2df60e52f82eb228a4c373e8d1f397253cf"; + }; + } + { + name = "levn___levn_0.3.0.tgz"; + path = fetchurl { + name = "levn___levn_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + } + { + name = "libcipm___libcipm_4.0.7.tgz"; + path = fetchurl { + name = "libcipm___libcipm_4.0.7.tgz"; + url = "https://registry.yarnpkg.com/libcipm/-/libcipm-4.0.7.tgz"; + sha1 = "76cd675c98bdaae64db88b782b01b804b6d02c8a"; + }; + } + { + name = "libnpm___libnpm_3.0.1.tgz"; + path = fetchurl { + name = "libnpm___libnpm_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/libnpm/-/libnpm-3.0.1.tgz"; + sha1 = "0be11b4c9dd4d1ffd7d95c786e92e55d65be77a2"; + }; + } + { + name = "libnpmaccess___libnpmaccess_3.0.2.tgz"; + path = fetchurl { + name = "libnpmaccess___libnpmaccess_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-3.0.2.tgz"; + sha1 = "8b2d72345ba3bef90d3b4f694edd5c0417f58923"; + }; + } + { + name = "libnpmconfig___libnpmconfig_1.2.1.tgz"; + path = fetchurl { + name = "libnpmconfig___libnpmconfig_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/libnpmconfig/-/libnpmconfig-1.2.1.tgz"; + sha1 = "c0c2f793a74e67d4825e5039e7a02a0044dfcbc0"; + }; + } + { + name = "libnpmhook___libnpmhook_5.0.3.tgz"; + path = fetchurl { + name = "libnpmhook___libnpmhook_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-5.0.3.tgz"; + sha1 = "4020c0f5edbf08ebe395325caa5ea01885b928f7"; + }; + } + { + name = "libnpmorg___libnpmorg_1.0.1.tgz"; + path = fetchurl { + name = "libnpmorg___libnpmorg_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-1.0.1.tgz"; + sha1 = "5d2503f6ceb57f33dbdcc718e6698fea6d5ad087"; + }; + } + { + name = "libnpmpublish___libnpmpublish_1.1.3.tgz"; + path = fetchurl { + name = "libnpmpublish___libnpmpublish_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-1.1.3.tgz"; + sha1 = "e3782796722d79eef1a0a22944c117e0c4ca4280"; + }; + } + { + name = "libnpmsearch___libnpmsearch_2.0.2.tgz"; + path = fetchurl { + name = "libnpmsearch___libnpmsearch_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-2.0.2.tgz"; + sha1 = "9a4f059102d38e3dd44085bdbfe5095f2a5044cf"; + }; + } + { + name = "libnpmteam___libnpmteam_1.0.2.tgz"; + path = fetchurl { + name = "libnpmteam___libnpmteam_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-1.0.2.tgz"; + sha1 = "8b48bcbb6ce70dd8150c950fcbdbf3feb6eec820"; + }; + } + { + name = "libnpx___libnpx_10.2.2.tgz"; + path = fetchurl { + name = "libnpx___libnpx_10.2.2.tgz"; + url = "https://registry.yarnpkg.com/libnpx/-/libnpx-10.2.2.tgz"; + sha1 = "5a4171b9b92dd031463ef66a4af9f5cbd6b09572"; + }; + } + { name = "load_bmfont___load_bmfont_1.4.0.tgz"; path = fetchurl { name = "load_bmfont___load_bmfont_1.4.0.tgz"; @@ -554,6 +2938,14 @@ }; } { + name = "load_json_file___load_json_file_2.0.0.tgz"; + path = fetchurl { + name = "load_json_file___load_json_file_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz"; + sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + }; + } + { name = "locate_path___locate_path_2.0.0.tgz"; path = fetchurl { name = "locate_path___locate_path_2.0.0.tgz"; @@ -562,6 +2954,174 @@ }; } { + name = "locate_path___locate_path_3.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz"; + sha1 = "dbec3b3ab759758071b58fe59fc41871af21400e"; + }; + } + { + name = "locate_path___locate_path_5.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; + sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + }; + } + { + name = "lock_verify___lock_verify_2.2.0.tgz"; + path = fetchurl { + name = "lock_verify___lock_verify_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/lock-verify/-/lock-verify-2.2.0.tgz"; + sha1 = "12432feb68bb647071c78c44bde16029a0f7d935"; + }; + } + { + name = "lockfile___lockfile_1.0.4.tgz"; + path = fetchurl { + name = "lockfile___lockfile_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.4.tgz"; + sha1 = "07f819d25ae48f87e538e6578b6964a4981a5609"; + }; + } + { + name = "lodash._baseuniq___lodash._baseuniq_4.6.0.tgz"; + path = fetchurl { + name = "lodash._baseuniq___lodash._baseuniq_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz"; + sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8"; + }; + } + { + name = "lodash._createset___lodash._createset_4.0.3.tgz"; + path = fetchurl { + name = "lodash._createset___lodash._createset_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz"; + sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26"; + }; + } + { + name = "lodash._root___lodash._root_3.0.1.tgz"; + path = fetchurl { + name = "lodash._root___lodash._root_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz"; + sha1 = "fba1c4524c19ee9a5f8136b4609f017cf4ded692"; + }; + } + { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + path = fetchurl { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + }; + } + { + name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; + path = fetchurl { + name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz"; + sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; + }; + } + { + name = "lodash.difference___lodash.difference_4.5.0.tgz"; + path = fetchurl { + name = "lodash.difference___lodash.difference_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz"; + sha1 = "9ccb4e505d486b91651345772885a2df27fd017c"; + }; + } + { + name = "lodash.flatten___lodash.flatten_4.4.0.tgz"; + path = fetchurl { + name = "lodash.flatten___lodash.flatten_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; + sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; + }; + } + { + name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; + path = fetchurl { + name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; + sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; + }; + } + { + name = "lodash.union___lodash.union_4.6.0.tgz"; + path = fetchurl { + name = "lodash.union___lodash.union_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz"; + sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; + }; + } + { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + path = fetchurl { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; + }; + } + { + name = "lodash.without___lodash.without_4.4.0.tgz"; + path = fetchurl { + name = "lodash.without___lodash.without_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz"; + sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; + }; + } + { + name = "lodash___lodash_4.17.15.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.15.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; + sha1 = "b447f6670a0455bbfeedd11392eff330ea097548"; + }; + } + { + name = "loglevel___loglevel_1.6.6.tgz"; + path = fetchurl { + name = "loglevel___loglevel_1.6.6.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.6.tgz"; + sha1 = "0ee6300cc058db6b3551fa1c4bf73b83bb771312"; + }; + } + { + name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; + path = fetchurl { + name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha1 = "6f9e30b47084d971a7c820ff15a6c5167b74c26f"; + }; + } + { + name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; + path = fetchurl { + name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; + sha1 = "2603e78b7b4b0006cbca2fbcc8a3202558ac9479"; + }; + } + { + name = "lru_cache___lru_cache_4.1.5.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_4.1.5.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz"; + sha1 = "8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"; + }; + } + { + name = "lru_cache___lru_cache_5.1.1.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz"; + sha1 = "1da27e6710271947695daf6848e847f01d84b920"; + }; + } + { name = "make_dir___make_dir_1.3.0.tgz"; path = fetchurl { name = "make_dir___make_dir_1.3.0.tgz"; @@ -570,19 +3130,75 @@ }; } { - name = "mime_db___mime_db_1.38.0.tgz"; + name = "make_dir___make_dir_3.0.2.tgz"; + path = fetchurl { + name = "make_dir___make_dir_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.2.tgz"; + sha1 = "04a1acbf22221e1d6ef43559f43e05a90dbb4392"; + }; + } + { + name = "make_fetch_happen___make_fetch_happen_5.0.2.tgz"; + path = fetchurl { + name = "make_fetch_happen___make_fetch_happen_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz"; + sha1 = "aa8387104f2687edca01c8687ee45013d02d19bd"; + }; + } + { + name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; + path = fetchurl { + name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; + sha1 = "7d583a7306434c055fe474b0f45078e6e1b4b92a"; + }; + } + { + name = "matrix_js_sdk___matrix_js_sdk_6.1.0.tgz"; + path = fetchurl { + name = "matrix_js_sdk___matrix_js_sdk_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.1.0.tgz"; + sha1 = "c28ad67c113c4aa9c8bce409c7ba550170bdc2ee"; + }; + } + { + name = "meant___meant_1.0.1.tgz"; + path = fetchurl { + name = "meant___meant_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/meant/-/meant-1.0.1.tgz"; + sha1 = "66044fea2f23230ec806fb515efea29c44d2115d"; + }; + } + { + name = "mem___mem_1.1.0.tgz"; + path = fetchurl { + name = "mem___mem_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz"; + sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; + }; + } + { + name = "mem___mem_4.3.0.tgz"; + path = fetchurl { + name = "mem___mem_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz"; + sha1 = "461af497bc4ae09608cdb2e60eefb69bff744178"; + }; + } + { + name = "mime_db___mime_db_1.42.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.38.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz"; - sha1 = "1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"; + name = "mime_db___mime_db_1.42.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz"; + sha1 = "3e252907b4c7adb906597b4b65636272cf9e7bac"; }; } { - name = "mime_types___mime_types_2.1.22.tgz"; + name = "mime_types___mime_types_2.1.25.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.22.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz"; - sha1 = "fe6b355a190926ab7698c9a0556a11199b2199bd"; + name = "mime_types___mime_types_2.1.25.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz"; + sha1 = "39772d46621f93e2a80a856c53b86a62156a6437"; }; } { @@ -594,6 +3210,38 @@ }; } { + name = "mime___mime_2.4.4.tgz"; + path = fetchurl { + name = "mime___mime_2.4.4.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz"; + sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5"; + }; + } + { + name = "mimic_fn___mimic_fn_1.2.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz"; + sha1 = "820c86a39334640e99516928bd03fca88057d022"; + }; + } + { + name = "mimic_fn___mimic_fn_2.1.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; + }; + } + { + name = "mimic_response___mimic_response_1.0.1.tgz"; + path = fetchurl { + name = "mimic_response___mimic_response_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz"; + sha1 = "4923538878eef42063cb8a3e3b0798781487ab1b"; + }; + } + { name = "min_document___min_document_2.19.0.tgz"; path = fetchurl { name = "min_document___min_document_2.19.0.tgz"; @@ -602,6 +3250,14 @@ }; } { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } + { name = "minimist___minimist_0.0.8.tgz"; path = fetchurl { name = "minimist___minimist_0.0.8.tgz"; @@ -610,11 +3266,51 @@ }; } { - name = "minimist___minimist_1.2.2.tgz"; + name = "minimist___minimist_1.2.3.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.3.tgz"; + sha1 = "3db5c0765545ab8637be71f333a104a965a9ca3f"; + }; + } + { + name = "minipass___minipass_2.9.0.tgz"; + path = fetchurl { + name = "minipass___minipass_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz"; + sha1 = "e713762e7d3e32fed803115cf93e04bca9fcc9a6"; + }; + } + { + name = "minipass___minipass_3.1.1.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.2.tgz"; - sha1 = "b00a00230a1108c48c169e69a291aafda3aacd63"; + name = "minipass___minipass_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz"; + sha1 = "7607ce778472a185ad6d89082aa2070f79cedcd5"; + }; + } + { + name = "minizlib___minizlib_1.3.3.tgz"; + path = fetchurl { + name = "minizlib___minizlib_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz"; + sha1 = "2290de96818a34c29551c8a8d301216bd65a861d"; + }; + } + { + name = "minizlib___minizlib_2.1.0.tgz"; + path = fetchurl { + name = "minizlib___minizlib_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.0.tgz"; + sha1 = "fd52c645301ef09a63a2c209697c294c6ce02cf3"; + }; + } + { + name = "mississippi___mississippi_3.0.0.tgz"; + path = fetchurl { + name = "mississippi___mississippi_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz"; + sha1 = "ea0a3291f97e0b5e8776b363d5f0a12d94c67022"; }; } { @@ -626,6 +3322,270 @@ }; } { + name = "mkdirp___mkdirp_1.0.3.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.3.tgz"; + sha1 = "4cf2e30ad45959dddea53ad97d518b6c8205e1ea"; + }; + } + { + name = "move_concurrently___move_concurrently_1.0.1.tgz"; + path = fetchurl { + name = "move_concurrently___move_concurrently_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz"; + sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + }; + } + { + name = "mute_stream___mute_stream_0.0.7.tgz"; + path = fetchurl { + name = "mute_stream___mute_stream_0.0.7.tgz"; + url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz"; + sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; + }; + } + { + name = "mute_stream___mute_stream_0.0.8.tgz"; + path = fetchurl { + name = "mute_stream___mute_stream_0.0.8.tgz"; + url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz"; + sha1 = "1630c42b2251ff81e2a283de96a5497ea92e5e0d"; + }; + } + { + name = "natural_compare___natural_compare_1.4.0.tgz"; + path = fetchurl { + name = "natural_compare___natural_compare_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + } + { + name = "needle___needle_2.3.2.tgz"; + path = fetchurl { + name = "needle___needle_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz"; + sha1 = "3342dea100b7160960a450dc8c22160ac712a528"; + }; + } + { + name = "nice_try___nice_try_1.0.5.tgz"; + path = fetchurl { + name = "nice_try___nice_try_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; + sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; + }; + } + { + name = "node_fetch_npm___node_fetch_npm_2.0.2.tgz"; + path = fetchurl { + name = "node_fetch_npm___node_fetch_npm_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz"; + sha1 = "7258c9046182dca345b4208eda918daf33697ff7"; + }; + } + { + name = "node_gyp___node_gyp_5.1.0.tgz"; + path = fetchurl { + name = "node_gyp___node_gyp_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.0.tgz"; + sha1 = "8e31260a7af4a2e2f994b0673d4e0b3866156332"; + }; + } + { + name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz"; + path = fetchurl { + name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz"; + url = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz"; + sha1 = "9a0596533b877289bcad4e143982ca3d904ddc83"; + }; + } + { + name = "nopt___nopt_4.0.1.tgz"; + path = fetchurl { + name = "nopt___nopt_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz"; + sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + }; + } + { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + path = fetchurl { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8"; + }; + } + { + name = "normalize_path___normalize_path_3.0.0.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; + sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65"; + }; + } + { + name = "normalize_url___normalize_url_4.5.0.tgz"; + path = fetchurl { + name = "normalize_url___normalize_url_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz"; + sha1 = "453354087e6ca96957bd8f5baf753f5982142129"; + }; + } + { + name = "npm_audit_report___npm_audit_report_1.3.2.tgz"; + path = fetchurl { + name = "npm_audit_report___npm_audit_report_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-1.3.2.tgz"; + sha1 = "303bc78cd9e4c226415076a4f7e528c89fc77018"; + }; + } + { + name = "npm_bundled___npm_bundled_1.1.1.tgz"; + path = fetchurl { + name = "npm_bundled___npm_bundled_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz"; + sha1 = "1edd570865a94cdb1bc8220775e29466c9fb234b"; + }; + } + { + name = "npm_cache_filename___npm_cache_filename_1.0.2.tgz"; + path = fetchurl { + name = "npm_cache_filename___npm_cache_filename_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"; + sha1 = "ded306c5b0bfc870a9e9faf823bc5f283e05ae11"; + }; + } + { + name = "npm_install_checks___npm_install_checks_3.0.2.tgz"; + path = fetchurl { + name = "npm_install_checks___npm_install_checks_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-3.0.2.tgz"; + sha1 = "ab2e32ad27baa46720706908e5b14c1852de44d9"; + }; + } + { + name = "npm_lifecycle___npm_lifecycle_3.1.4.tgz"; + path = fetchurl { + name = "npm_lifecycle___npm_lifecycle_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-3.1.4.tgz"; + sha1 = "de6975c7d8df65f5150db110b57cce498b0b604c"; + }; + } + { + name = "npm_logical_tree___npm_logical_tree_1.2.1.tgz"; + path = fetchurl { + name = "npm_logical_tree___npm_logical_tree_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/npm-logical-tree/-/npm-logical-tree-1.2.1.tgz"; + sha1 = "44610141ca24664cad35d1e607176193fd8f5b88"; + }; + } + { + name = "npm_normalize_package_bin___npm_normalize_package_bin_1.0.1.tgz"; + path = fetchurl { + name = "npm_normalize_package_bin___npm_normalize_package_bin_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz"; + sha1 = "6e79a41f23fd235c0623218228da7d9c23b8f6e2"; + }; + } + { + name = "npm_package_arg___npm_package_arg_6.1.1.tgz"; + path = fetchurl { + name = "npm_package_arg___npm_package_arg_6.1.1.tgz"; + url = "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz"; + sha1 = "02168cb0a49a2b75bf988a28698de7b529df5cb7"; + }; + } + { + name = "npm_packlist___npm_packlist_1.4.8.tgz"; + path = fetchurl { + name = "npm_packlist___npm_packlist_1.4.8.tgz"; + url = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz"; + sha1 = "56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"; + }; + } + { + name = "npm_pick_manifest___npm_pick_manifest_3.0.2.tgz"; + path = fetchurl { + name = "npm_pick_manifest___npm_pick_manifest_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz"; + sha1 = "f4d9e5fd4be2153e5f4e5f9b7be8dc419a99abb7"; + }; + } + { + name = "npm_profile___npm_profile_4.0.2.tgz"; + path = fetchurl { + name = "npm_profile___npm_profile_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-profile/-/npm-profile-4.0.2.tgz"; + sha1 = "8272a71c19634d0dce9c35a5daf8ee589cbb0f52"; + }; + } + { + name = "npm_registry_fetch___npm_registry_fetch_4.0.2.tgz"; + path = fetchurl { + name = "npm_registry_fetch___npm_registry_fetch_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.2.tgz"; + sha1 = "2b1434f93ccbe6b6385f8e45f45db93e16921d7a"; + }; + } + { + name = "npm_run_path___npm_run_path_2.0.2.tgz"; + path = fetchurl { + name = "npm_run_path___npm_run_path_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + } + { + name = "npm_user_validate___npm_user_validate_1.0.0.tgz"; + path = fetchurl { + name = "npm_user_validate___npm_user_validate_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.0.tgz"; + sha1 = "8ceca0f5cea04d4e93519ef72d0557a75122e951"; + }; + } + { + name = "npm___npm_6.13.7.tgz"; + path = fetchurl { + name = "npm___npm_6.13.7.tgz"; + url = "https://registry.yarnpkg.com/npm/-/npm-6.13.7.tgz"; + sha1 = "9533a3ddc57f9792db8a8b303efabaf878047841"; + }; + } + { + name = "npmlog___npmlog_4.1.2.tgz"; + path = fetchurl { + name = "npmlog___npmlog_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; + sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; + }; + } + { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + path = fetchurl { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + } + { name = "oauth_sign___oauth_sign_0.9.0.tgz"; path = fetchurl { name = "oauth_sign___oauth_sign_0.9.0.tgz"; @@ -634,11 +3594,147 @@ }; } { - name = "object_keys___object_keys_1.1.0.tgz"; + name = "object_assign___object_assign_4.1.1.tgz"; + path = fetchurl { + name = "object_assign___object_assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + } + { + name = "object_inspect___object_inspect_1.7.0.tgz"; path = fetchurl { - name = "object_keys___object_keys_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz"; - sha1 = "11bd22348dd2e096a045ab06f6c85bcc340fa032"; + name = "object_inspect___object_inspect_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz"; + sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"; + }; + } + { + name = "object_is___object_is_1.0.1.tgz"; + path = fetchurl { + name = "object_is___object_is_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz"; + sha1 = "0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"; + }; + } + { + name = "object_keys___object_keys_1.1.1.tgz"; + path = fetchurl { + name = "object_keys___object_keys_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; + sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + }; + } + { + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; + path = fetchurl { + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; + sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "onetime___onetime_2.0.1.tgz"; + path = fetchurl { + name = "onetime___onetime_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + }; + } + { + name = "opener___opener_1.5.1.tgz"; + path = fetchurl { + name = "opener___opener_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz"; + sha1 = "6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"; + }; + } + { + name = "optionator___optionator_0.8.3.tgz"; + path = fetchurl { + name = "optionator___optionator_0.8.3.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; + sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; + }; + } + { + name = "os_homedir___os_homedir_1.0.2.tgz"; + path = fetchurl { + name = "os_homedir___os_homedir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + } + { + name = "os_locale___os_locale_2.1.0.tgz"; + path = fetchurl { + name = "os_locale___os_locale_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz"; + sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2"; + }; + } + { + name = "os_locale___os_locale_3.1.0.tgz"; + path = fetchurl { + name = "os_locale___os_locale_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz"; + sha1 = "a802a6ee17f24c10483ab9935719cef4ed16bf1a"; + }; + } + { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + path = fetchurl { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + } + { + name = "osenv___osenv_0.1.5.tgz"; + path = fetchurl { + name = "osenv___osenv_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz"; + sha1 = "85cdfafaeb28e8677f416e287592b5f3f49ea410"; + }; + } + { + name = "p_cancelable___p_cancelable_1.1.0.tgz"; + path = fetchurl { + name = "p_cancelable___p_cancelable_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz"; + sha1 = "d078d15a3af409220c886f1d9a0ca2e441ab26cc"; + }; + } + { + name = "p_defer___p_defer_1.0.0.tgz"; + path = fetchurl { + name = "p_defer___p_defer_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz"; + sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; + }; + } + { + name = "p_finally___p_finally_1.0.0.tgz"; + path = fetchurl { + name = "p_finally___p_finally_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + } + { + name = "p_is_promise___p_is_promise_2.1.0.tgz"; + path = fetchurl { + name = "p_is_promise___p_is_promise_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz"; + sha1 = "918cebaea248a62cf7ffab8e3bca8c5f882fc42e"; }; } { @@ -650,6 +3746,22 @@ }; } { + name = "p_limit___p_limit_2.2.1.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz"; + sha1 = "aa07a788cc3151c939b5131f63570f0dd2009537"; + }; + } + { + name = "p_limit___p_limit_2.2.2.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz"; + sha1 = "61279b67721f5287aa1c13a9a7fbbc48c9291b1e"; + }; + } + { name = "p_locate___p_locate_2.0.0.tgz"; path = fetchurl { name = "p_locate___p_locate_2.0.0.tgz"; @@ -658,6 +3770,22 @@ }; } { + name = "p_locate___p_locate_3.0.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz"; + sha1 = "322d69a05c0264b25997d9f40cd8a891ab0064a4"; + }; + } + { + name = "p_locate___p_locate_4.1.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; + sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + }; + } + { name = "p_try___p_try_1.0.0.tgz"; path = fetchurl { name = "p_try___p_try_1.0.0.tgz"; @@ -666,6 +3794,54 @@ }; } { + name = "p_try___p_try_2.2.0.tgz"; + path = fetchurl { + name = "p_try___p_try_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; + sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + }; + } + { + name = "package_json___package_json_4.0.1.tgz"; + path = fetchurl { + name = "package_json___package_json_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz"; + sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed"; + }; + } + { + name = "package_json___package_json_6.5.0.tgz"; + path = fetchurl { + name = "package_json___package_json_6.5.0.tgz"; + url = "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz"; + sha1 = "6feedaca35e75725876d0b0e64974697fed145b0"; + }; + } + { + name = "pacote___pacote_9.5.12.tgz"; + path = fetchurl { + name = "pacote___pacote_9.5.12.tgz"; + url = "https://registry.yarnpkg.com/pacote/-/pacote-9.5.12.tgz"; + sha1 = "1e11dd7a8d736bcc36b375a9804d41bb0377bf66"; + }; + } + { + name = "parallel_transform___parallel_transform_1.2.0.tgz"; + path = fetchurl { + name = "parallel_transform___parallel_transform_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz"; + sha1 = "9049ca37d6cb2182c3b1d2c720be94d14a5814fc"; + }; + } + { + name = "parent_module___parent_module_1.0.1.tgz"; + path = fetchurl { + name = "parent_module___parent_module_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; + sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; + }; + } + { name = "parse_bmfont_ascii___parse_bmfont_ascii_1.0.6.tgz"; path = fetchurl { name = "parse_bmfont_ascii___parse_bmfont_ascii_1.0.6.tgz"; @@ -690,11 +3866,19 @@ }; } { - name = "parse_headers___parse_headers_2.0.2.tgz"; + name = "parse_headers___parse_headers_2.0.3.tgz"; + path = fetchurl { + name = "parse_headers___parse_headers_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.3.tgz"; + sha1 = "5e8e7512383d140ba02f0c7aa9f49b4399c92515"; + }; + } + { + name = "parse_json___parse_json_2.2.0.tgz"; path = fetchurl { - name = "parse_headers___parse_headers_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.2.tgz"; - sha1 = "9545e8a4c1ae5eaea7d24992bca890281ed26e34"; + name = "parse_json___parse_json_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; }; } { @@ -706,6 +3890,14 @@ }; } { + name = "path_exists___path_exists_4.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; + sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + }; + } + { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; path = fetchurl { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; @@ -714,6 +3906,38 @@ }; } { + name = "path_is_inside___path_is_inside_1.0.2.tgz"; + path = fetchurl { + name = "path_is_inside___path_is_inside_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; + }; + } + { + name = "path_key___path_key_2.0.1.tgz"; + path = fetchurl { + name = "path_key___path_key_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + } + { + name = "path_parse___path_parse_1.0.6.tgz"; + path = fetchurl { + name = "path_parse___path_parse_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"; + sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c"; + }; + } + { + name = "path_type___path_type_2.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz"; + sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + }; + } + { name = "performance_now___performance_now_2.1.0.tgz"; path = fetchurl { name = "performance_now___performance_now_2.1.0.tgz"; @@ -730,6 +3954,14 @@ }; } { + name = "pify___pify_2.3.0.tgz"; + path = fetchurl { + name = "pify___pify_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + } + { name = "pify___pify_3.0.0.tgz"; path = fetchurl { name = "pify___pify_3.0.0.tgz"; @@ -770,6 +4002,38 @@ }; } { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + } + { + name = "prepend_http___prepend_http_1.0.4.tgz"; + path = fetchurl { + name = "prepend_http___prepend_http_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz"; + sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + }; + } + { + name = "prepend_http___prepend_http_2.0.0.tgz"; + path = fetchurl { + name = "prepend_http___prepend_http_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; + sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; + }; + } + { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + }; + } + { name = "process___process_0.5.2.tgz"; path = fetchurl { name = "process___process_0.5.2.tgz"; @@ -778,11 +4042,99 @@ }; } { - name = "psl___psl_1.1.31.tgz"; + name = "progress___progress_2.0.3.tgz"; path = fetchurl { - name = "psl___psl_1.1.31.tgz"; - url = "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz"; - sha1 = "e9aa86d0101b5b105cbe93ac6b784cd547276184"; + name = "progress___progress_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; + sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + }; + } + { + name = "promise_inflight___promise_inflight_1.0.1.tgz"; + path = fetchurl { + name = "promise_inflight___promise_inflight_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; + }; + } + { + name = "promise_retry___promise_retry_1.1.1.tgz"; + path = fetchurl { + name = "promise_retry___promise_retry_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz"; + sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d"; + }; + } + { + name = "promzard___promzard_0.3.0.tgz"; + path = fetchurl { + name = "promzard___promzard_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz"; + sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; + }; + } + { + name = "proto_list___proto_list_1.2.4.tgz"; + path = fetchurl { + name = "proto_list___proto_list_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz"; + sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + }; + } + { + name = "protoduck___protoduck_5.0.1.tgz"; + path = fetchurl { + name = "protoduck___protoduck_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz"; + sha1 = "03c3659ca18007b69a50fd82a7ebcc516261151f"; + }; + } + { + name = "prr___prr_1.0.1.tgz"; + path = fetchurl { + name = "prr___prr_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz"; + sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; + }; + } + { + name = "pseudomap___pseudomap_1.0.2.tgz"; + path = fetchurl { + name = "pseudomap___pseudomap_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + } + { + name = "psl___psl_1.6.0.tgz"; + path = fetchurl { + name = "psl___psl_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.6.0.tgz"; + sha1 = "60557582ee23b6c43719d9890fb4170ecd91e110"; + }; + } + { + name = "pump___pump_2.0.1.tgz"; + path = fetchurl { + name = "pump___pump_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz"; + sha1 = "12399add6e4cf7526d973cbc8b5ce2e2908b3909"; + }; + } + { + name = "pump___pump_3.0.0.tgz"; + path = fetchurl { + name = "pump___pump_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; + sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + }; + } + { + name = "pumpify___pumpify_1.5.1.tgz"; + path = fetchurl { + name = "pumpify___pumpify_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz"; + sha1 = "36513be246ab27570b1a374a5ce278bfd74370ce"; }; } { @@ -802,6 +4154,30 @@ }; } { + name = "pupa___pupa_2.0.1.tgz"; + path = fetchurl { + name = "pupa___pupa_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pupa/-/pupa-2.0.1.tgz"; + sha1 = "dbdc9ff48ffbea4a26a069b6f9f7abb051008726"; + }; + } + { + name = "qrcode_terminal___qrcode_terminal_0.12.0.tgz"; + path = fetchurl { + name = "qrcode_terminal___qrcode_terminal_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz"; + sha1 = "bb5b699ef7f9f0505092a3748be4464fe71b5819"; + }; + } + { + name = "qs___qs_6.9.1.tgz"; + path = fetchurl { + name = "qs___qs_6.9.1.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.9.1.tgz"; + sha1 = "20082c65cb78223635ab1a9eaca8875a29bf8ec9"; + }; + } + { name = "qs___qs_6.5.2.tgz"; path = fetchurl { name = "qs___qs_6.5.2.tgz"; @@ -810,6 +4186,30 @@ }; } { + name = "query_string___query_string_6.10.1.tgz"; + path = fetchurl { + name = "query_string___query_string_6.10.1.tgz"; + url = "https://registry.yarnpkg.com/query-string/-/query-string-6.10.1.tgz"; + sha1 = "30b3505f6fca741d5ae541964d1b3ae9dc2a0de8"; + }; + } + { + name = "qw___qw_1.0.1.tgz"; + path = fetchurl { + name = "qw___qw_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/qw/-/qw-1.0.1.tgz"; + sha1 = "efbfdc740f9ad054304426acb183412cc8b996d4"; + }; + } + { + name = "rc___rc_1.2.8.tgz"; + path = fetchurl { + name = "rc___rc_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; + sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; + }; + } + { name = "read_chunk___read_chunk_1.0.1.tgz"; path = fetchurl { name = "read_chunk___read_chunk_1.0.1.tgz"; @@ -818,6 +4218,166 @@ }; } { + name = "read_cmd_shim___read_cmd_shim_1.0.5.tgz"; + path = fetchurl { + name = "read_cmd_shim___read_cmd_shim_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz"; + sha1 = "87e43eba50098ba5a32d0ceb583ab8e43b961c16"; + }; + } + { + name = "read_config_file___read_config_file_5.0.1.tgz"; + path = fetchurl { + name = "read_config_file___read_config_file_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-5.0.1.tgz"; + sha1 = "ead3df0d9822cc96006ca16322eaa79dac8591c2"; + }; + } + { + name = "read_installed___read_installed_4.0.3.tgz"; + path = fetchurl { + name = "read_installed___read_installed_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz"; + sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067"; + }; + } + { + name = "read_package_json___read_package_json_2.1.1.tgz"; + path = fetchurl { + name = "read_package_json___read_package_json_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.1.tgz"; + sha1 = "16aa66c59e7d4dad6288f179dd9295fd59bb98f1"; + }; + } + { + name = "read_package_tree___read_package_tree_5.3.1.tgz"; + path = fetchurl { + name = "read_package_tree___read_package_tree_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.3.1.tgz"; + sha1 = "a32cb64c7f31eb8a6f31ef06f9cedf74068fe636"; + }; + } + { + name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; + path = fetchurl { + name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; + sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + }; + } + { + name = "read_pkg___read_pkg_2.0.0.tgz"; + path = fetchurl { + name = "read_pkg___read_pkg_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz"; + sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + }; + } + { + name = "read___read_1.0.7.tgz"; + path = fetchurl { + name = "read___read_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz"; + sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; + }; + } + { + name = "readable_stream___readable_stream_2.3.7.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + }; + } + { + name = "readable_stream___readable_stream_2.3.6.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.6.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz"; + sha1 = "b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"; + }; + } + { + name = "readable_stream___readable_stream_3.4.0.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz"; + sha1 = "a51c26754658e0a3c21dbf59163bd45ba6f447fc"; + }; + } + { + name = "readable_stream___readable_stream_1.1.14.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_1.1.14.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + } + { + name = "readdir_scoped_modules___readdir_scoped_modules_1.1.0.tgz"; + path = fetchurl { + name = "readdir_scoped_modules___readdir_scoped_modules_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz"; + sha1 = "8d45407b4f870a0dcaebc0e28670d18e74514309"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; + sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; + }; + } + { + name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz"; + path = fetchurl { + name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz"; + sha1 = "6b30724e306a27833eeb171b66ac8890ba37e41c"; + }; + } + { + name = "regexpp___regexpp_2.0.1.tgz"; + path = fetchurl { + name = "regexpp___regexpp_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz"; + sha1 = "8d19d31cf632482b589049f8281f93dbcba4d07f"; + }; + } + { + name = "registry_auth_token___registry_auth_token_3.4.0.tgz"; + path = fetchurl { + name = "registry_auth_token___registry_auth_token_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz"; + sha1 = "d7446815433f5d5ed6431cd5dca21048f66b397e"; + }; + } + { + name = "registry_auth_token___registry_auth_token_4.0.0.tgz"; + path = fetchurl { + name = "registry_auth_token___registry_auth_token_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.0.0.tgz"; + sha1 = "30e55961eec77379da551ea5c4cf43cbf03522be"; + }; + } + { + name = "registry_url___registry_url_3.1.0.tgz"; + path = fetchurl { + name = "registry_url___registry_url_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz"; + sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + }; + } + { + name = "registry_url___registry_url_5.1.0.tgz"; + path = fetchurl { + name = "registry_url___registry_url_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz"; + sha1 = "e98334b50d5434b81136b44ec638d9c2009c5009"; + }; + } + { name = "request___request_2.88.0.tgz"; path = fetchurl { name = "request___request_2.88.0.tgz"; @@ -826,6 +4386,134 @@ }; } { + name = "require_directory___require_directory_2.1.1.tgz"; + path = fetchurl { + name = "require_directory___require_directory_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + } + { + name = "require_main_filename___require_main_filename_1.0.1.tgz"; + path = fetchurl { + name = "require_main_filename___require_main_filename_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + } + { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + path = fetchurl { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha1 = "d0b329ecc7cc0f61649f62215be69af54aa8989b"; + }; + } + { + name = "resolve_from___resolve_from_4.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; + sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6"; + }; + } + { + name = "resolve___resolve_1.13.1.tgz"; + path = fetchurl { + name = "resolve___resolve_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz"; + sha1 = "be0aa4c06acd53083505abb35f4d66932ab35d16"; + }; + } + { + name = "responselike___responselike_1.0.2.tgz"; + path = fetchurl { + name = "responselike___responselike_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; + sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + }; + } + { + name = "restore_cursor___restore_cursor_2.0.0.tgz"; + path = fetchurl { + name = "restore_cursor___restore_cursor_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + } + { + name = "retry___retry_0.10.1.tgz"; + path = fetchurl { + name = "retry___retry_0.10.1.tgz"; + url = "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz"; + sha1 = "e76388d217992c252750241d3d3956fed98d8ff4"; + }; + } + { + name = "retry___retry_0.12.0.tgz"; + path = fetchurl { + name = "retry___retry_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + } + { + name = "rimraf___rimraf_2.6.3.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.6.3.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz"; + sha1 = "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"; + }; + } + { + name = "rimraf___rimraf_2.7.1.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; + sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; + }; + } + { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + }; + } + { + name = "run_async___run_async_2.3.0.tgz"; + path = fetchurl { + name = "run_async___run_async_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz"; + sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; + }; + } + { + name = "run_queue___run_queue_1.0.3.tgz"; + path = fetchurl { + name = "run_queue___run_queue_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz"; + sha1 = "e848396f057d223f24386924618e25694161ec47"; + }; + } + { + name = "rxjs___rxjs_6.5.3.tgz"; + path = fetchurl { + name = "rxjs___rxjs_6.5.3.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz"; + sha1 = "510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.0.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz"; + sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519"; + }; + } + { name = "safe_buffer___safe_buffer_5.1.2.tgz"; path = fetchurl { name = "safe_buffer___safe_buffer_5.1.2.tgz"; @@ -842,6 +4530,14 @@ }; } { + name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; + path = fetchurl { + name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; + url = "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz"; + sha1 = "755ebd752045931977e30b2025d340d7c9090378"; + }; + } + { name = "sax___sax_1.2.4.tgz"; path = fetchurl { name = "sax___sax_1.2.4.tgz"; @@ -850,6 +4546,78 @@ }; } { + name = "semver_diff___semver_diff_2.1.0.tgz"; + path = fetchurl { + name = "semver_diff___semver_diff_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz"; + sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; + }; + } + { + name = "semver_diff___semver_diff_3.1.1.tgz"; + path = fetchurl { + name = "semver_diff___semver_diff_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz"; + sha1 = "05f77ce59f325e00e2706afd67bb506ddb1ca32b"; + }; + } + { + name = "semver___semver_5.7.1.tgz"; + path = fetchurl { + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + }; + } + { + name = "semver___semver_6.3.0.tgz"; + path = fetchurl { + name = "semver___semver_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; + sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + }; + } + { + name = "semver___semver_7.1.3.tgz"; + path = fetchurl { + name = "semver___semver_7.1.3.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz"; + sha1 = "e4345ce73071c53f336445cfc19efb1c311df2a6"; + }; + } + { + name = "set_blocking___set_blocking_2.0.0.tgz"; + path = fetchurl { + name = "set_blocking___set_blocking_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + } + { + name = "sha___sha_3.0.0.tgz"; + path = fetchurl { + name = "sha___sha_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/sha/-/sha-3.0.0.tgz"; + sha1 = "b2f2f90af690c16a3a839a6a6c680ea51fedd1ae"; + }; + } + { + name = "shebang_command___shebang_command_1.2.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + } + { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + } + { name = "signal_exit___signal_exit_3.0.2.tgz"; path = fetchurl { name = "signal_exit___signal_exit_3.0.2.tgz"; @@ -858,6 +4626,126 @@ }; } { + name = "slice_ansi___slice_ansi_2.1.0.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz"; + sha1 = "cacd7693461a637a5788d92a7dd4fba068e81636"; + }; + } + { + name = "slide___slide_1.1.6.tgz"; + path = fetchurl { + name = "slide___slide_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz"; + sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; + }; + } + { + name = "smart_buffer___smart_buffer_4.1.0.tgz"; + path = fetchurl { + name = "smart_buffer___smart_buffer_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz"; + sha1 = "91605c25d91652f4661ea69ccf45f1b331ca21ba"; + }; + } + { + name = "socks_proxy_agent___socks_proxy_agent_4.0.2.tgz"; + path = fetchurl { + name = "socks_proxy_agent___socks_proxy_agent_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz"; + sha1 = "3c8991f3145b2799e70e11bd5fbc8b1963116386"; + }; + } + { + name = "socks___socks_2.3.3.tgz"; + path = fetchurl { + name = "socks___socks_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz"; + sha1 = "01129f0a5d534d2b897712ed8aceab7ee65d78e3"; + }; + } + { + name = "sorted_object___sorted_object_2.0.1.tgz"; + path = fetchurl { + name = "sorted_object___sorted_object_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/sorted-object/-/sorted-object-2.0.1.tgz"; + sha1 = "7d631f4bd3a798a24af1dffcfbfe83337a5df5fc"; + }; + } + { + name = "sorted_union_stream___sorted_union_stream_2.1.3.tgz"; + path = fetchurl { + name = "sorted_union_stream___sorted_union_stream_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz"; + sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7"; + }; + } + { + name = "source_map_support___source_map_support_0.5.16.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.5.16.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz"; + sha1 = "0ae069e7fe3ba7538c64c98515e35339eac5a042"; + }; + } + { + name = "source_map___source_map_0.6.1.tgz"; + path = fetchurl { + name = "source_map___source_map_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; + sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + }; + } + { + name = "spdx_correct___spdx_correct_3.1.0.tgz"; + path = fetchurl { + name = "spdx_correct___spdx_correct_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz"; + sha1 = "fb83e504445268f154b074e218c87c003cd31df4"; + }; + } + { + name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; + path = fetchurl { + name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; + sha1 = "2ea450aee74f2a89bfb94519c07fcd6f41322977"; + }; + } + { + name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; + path = fetchurl { + name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; + sha1 = "99e119b7a5da00e05491c9fa338b7904823b41d0"; + }; + } + { + name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; + path = fetchurl { + name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; + sha1 = "3694b5804567a458d3c8045842a6358632f62654"; + }; + } + { + name = "split_on_first___split_on_first_1.1.0.tgz"; + path = fetchurl { + name = "split_on_first___split_on_first_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz"; + sha1 = "f610afeee3b12bce1d0c30425e76398b78249a5f"; + }; + } + { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + } + { name = "sshpk___sshpk_1.16.1.tgz"; path = fetchurl { name = "sshpk___sshpk_1.16.1.tgz"; @@ -866,6 +4754,46 @@ }; } { + name = "ssri___ssri_6.0.1.tgz"; + path = fetchurl { + name = "ssri___ssri_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz"; + sha1 = "2a3c41b28dd45b62b63676ecb74001265ae9edd8"; + }; + } + { + name = "stat_mode___stat_mode_1.0.0.tgz"; + path = fetchurl { + name = "stat_mode___stat_mode_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz"; + sha1 = "68b55cb61ea639ff57136f36b216a291800d1465"; + }; + } + { + name = "stream_each___stream_each_1.2.3.tgz"; + path = fetchurl { + name = "stream_each___stream_each_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz"; + sha1 = "ebe27a0c389b04fbcc233642952e10731afa9bae"; + }; + } + { + name = "stream_iterate___stream_iterate_1.2.0.tgz"; + path = fetchurl { + name = "stream_iterate___stream_iterate_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/stream-iterate/-/stream-iterate-1.2.0.tgz"; + sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1"; + }; + } + { + name = "stream_shift___stream_shift_1.0.1.tgz"; + path = fetchurl { + name = "stream_shift___stream_shift_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz"; + sha1 = "d7088281559ab2778424279b0877da3c392d5a3d"; + }; + } + { name = "stream_to_buffer___stream_to_buffer_0.1.0.tgz"; path = fetchurl { name = "stream_to_buffer___stream_to_buffer_0.1.0.tgz"; @@ -882,11 +4810,259 @@ }; } { - name = "string.prototype.trim___string.prototype.trim_1.1.2.tgz"; + name = "strict_uri_encode___strict_uri_encode_2.0.0.tgz"; + path = fetchurl { + name = "strict_uri_encode___strict_uri_encode_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz"; + sha1 = "b9c7330c7042862f6b142dc274bbcc5866ce3546"; + }; + } + { + name = "string_width___string_width_1.0.2.tgz"; + path = fetchurl { + name = "string_width___string_width_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + } + { + name = "string_width___string_width_2.1.1.tgz"; + path = fetchurl { + name = "string_width___string_width_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; + sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + }; + } + { + name = "string_width___string_width_3.1.0.tgz"; + path = fetchurl { + name = "string_width___string_width_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; + sha1 = "22767be21b62af1081574306f69ac51b62203961"; + }; + } + { + name = "string_width___string_width_4.2.0.tgz"; + path = fetchurl { + name = "string_width___string_width_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz"; + sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; + }; + } + { + name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz"; + path = fetchurl { + name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz"; + sha1 = "6cc47f0d7eb8d62b0f3701611715a3954591d634"; + }; + } + { + name = "string.prototype.trimright___string.prototype.trimright_2.1.0.tgz"; + path = fetchurl { + name = "string.prototype.trimright___string.prototype.trimright_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz"; + sha1 = "669d164be9df9b6f7559fa8e89945b168a5a6c58"; + }; + } + { + name = "string_decoder___string_decoder_1.3.0.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; + sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + }; + } + { + name = "string_decoder___string_decoder_0.10.31.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_0.10.31.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + } + { + name = "string_decoder___string_decoder_1.1.1.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; + sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + }; + } + { + name = "stringify_package___stringify_package_1.0.1.tgz"; + path = fetchurl { + name = "stringify_package___stringify_package_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz"; + sha1 = "e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85"; + }; + } + { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + } + { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + } + { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; path = fetchurl { - name = "string.prototype.trim___string.prototype.trim_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz"; - sha1 = "d04de2c89e137f4d7d206f086b5ed2fae6be8cea"; + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; + }; + } + { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; + }; + } + { + name = "strip_bom___strip_bom_3.0.0.tgz"; + path = fetchurl { + name = "strip_bom___strip_bom_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + } + { + name = "strip_eof___strip_eof_1.0.0.tgz"; + path = fetchurl { + name = "strip_eof___strip_eof_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + } + { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + } + { + name = "supports_color___supports_color_5.5.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; + sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + }; + } + { + name = "supports_color___supports_color_7.1.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz"; + sha1 = "68e32591df73e25ad1c4b49108a2ec507962bfd1"; + }; + } + { + name = "table___table_5.4.6.tgz"; + path = fetchurl { + name = "table___table_5.4.6.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz"; + sha1 = "1292d19500ce3f86053b05f0e8e7e4a3bb21079e"; + }; + } + { + name = "tar_stream___tar_stream_2.1.0.tgz"; + path = fetchurl { + name = "tar_stream___tar_stream_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.0.tgz"; + sha1 = "d1aaa3661f05b38b5acc9b7020efdca5179a2cc3"; + }; + } + { + name = "tar___tar_4.4.13.tgz"; + path = fetchurl { + name = "tar___tar_4.4.13.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz"; + sha1 = "43b364bc52888d555298637b10d60790254ab525"; + }; + } + { + name = "tar___tar_6.0.1.tgz"; + path = fetchurl { + name = "tar___tar_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.0.1.tgz"; + sha1 = "7b3bd6c313cb6e0153770108f8d70ac298607efa"; + }; + } + { + name = "temp_file___temp_file_3.3.6.tgz"; + path = fetchurl { + name = "temp_file___temp_file_3.3.6.tgz"; + url = "https://registry.yarnpkg.com/temp-file/-/temp-file-3.3.6.tgz"; + sha1 = "bd7a1951338bf93b59380b498ec1804d5b76c449"; + }; + } + { + name = "term_size___term_size_1.2.0.tgz"; + path = fetchurl { + name = "term_size___term_size_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz"; + sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; + }; + } + { + name = "term_size___term_size_2.2.0.tgz"; + path = fetchurl { + name = "term_size___term_size_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz"; + sha1 = "1f16adedfe9bdc18800e1776821734086fcc6753"; + }; + } + { + name = "text_table___text_table_0.2.0.tgz"; + path = fetchurl { + name = "text_table___text_table_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + } + { + name = "through2___through2_2.0.5.tgz"; + path = fetchurl { + name = "through2___through2_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz"; + sha1 = "01c1e39eb31d07cb7d03a96a70823260b23132cd"; + }; + } + { + name = "through___through_2.3.8.tgz"; + path = fetchurl { + name = "through___through_2.3.8.tgz"; + url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + } + { + name = "timed_out___timed_out_4.0.1.tgz"; + path = fetchurl { + name = "timed_out___timed_out_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz"; + sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; + }; + } + { + name = "tiny_relative_date___tiny_relative_date_1.3.0.tgz"; + path = fetchurl { + name = "tiny_relative_date___tiny_relative_date_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz"; + sha1 = "fa08aad501ed730f31cc043181d995c39a935e07"; }; } { @@ -898,6 +5074,38 @@ }; } { + name = "tmp_promise___tmp_promise_1.1.0.tgz"; + path = fetchurl { + name = "tmp_promise___tmp_promise_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-1.1.0.tgz"; + sha1 = "bb924d239029157b9bc1d506a6aa341f8b13e64c"; + }; + } + { + name = "tmp___tmp_0.1.0.tgz"; + path = fetchurl { + name = "tmp___tmp_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz"; + sha1 = "ee434a4e22543082e294ba6201dcc6eafefa2877"; + }; + } + { + name = "tmp___tmp_0.0.33.tgz"; + path = fetchurl { + name = "tmp___tmp_0.0.33.tgz"; + url = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz"; + sha1 = "6d34335889768d21b2bcda0aa277ced3b1bfadf9"; + }; + } + { + name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; + path = fetchurl { + name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; + sha1 = "ce0aa0c2f3df6adf852efb404a783e77c0475771"; + }; + } + { name = "tough_cookie___tough_cookie_2.4.3.tgz"; path = fetchurl { name = "tough_cookie___tough_cookie_2.4.3.tgz"; @@ -906,6 +5114,22 @@ }; } { + name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; + path = fetchurl { + name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz"; + sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; + }; + } + { + name = "tslib___tslib_1.10.0.tgz"; + path = fetchurl { + name = "tslib___tslib_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz"; + sha1 = "c3c19f95973fb0a62973fb09d90d961ee43e5c8a"; + }; + } + { name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; path = fetchurl { name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; @@ -922,6 +5146,110 @@ }; } { + name = "type_check___type_check_0.3.2.tgz"; + path = fetchurl { + name = "type_check___type_check_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + } + { + name = "type_fest___type_fest_0.8.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.8.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; + sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; + }; + } + { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + path = fetchurl { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha1 = "a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"; + }; + } + { + name = "typedarray___typedarray_0.0.6.tgz"; + path = fetchurl { + name = "typedarray___typedarray_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + } + { + name = "uid_number___uid_number_0.0.6.tgz"; + path = fetchurl { + name = "uid_number___uid_number_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz"; + sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81"; + }; + } + { + name = "umask___umask_1.1.0.tgz"; + path = fetchurl { + name = "umask___umask_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz"; + sha1 = "f29cebf01df517912bb58ff9c4e50fde8e33320d"; + }; + } + { + name = "unhomoglyph___unhomoglyph_1.0.3.tgz"; + path = fetchurl { + name = "unhomoglyph___unhomoglyph_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/unhomoglyph/-/unhomoglyph-1.0.3.tgz"; + sha1 = "8d3551622b57754e10a831bf81442d7f15d1ddfd"; + }; + } + { + name = "unique_filename___unique_filename_1.1.1.tgz"; + path = fetchurl { + name = "unique_filename___unique_filename_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz"; + sha1 = "1d69769369ada0583103a1e6ae87681b56573230"; + }; + } + { + name = "unique_slug___unique_slug_2.0.2.tgz"; + path = fetchurl { + name = "unique_slug___unique_slug_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz"; + sha1 = "baabce91083fc64e945b0f3ad613e264f7cd4e6c"; + }; + } + { + name = "unique_string___unique_string_1.0.0.tgz"; + path = fetchurl { + name = "unique_string___unique_string_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz"; + sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; + }; + } + { + name = "unique_string___unique_string_2.0.0.tgz"; + path = fetchurl { + name = "unique_string___unique_string_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz"; + sha1 = "39c6451f81afb2749de2b233e3f7c5e8843bd89d"; + }; + } + { + name = "universalify___universalify_0.1.2.tgz"; + path = fetchurl { + name = "universalify___universalify_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; + sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + }; + } + { + name = "unpipe___unpipe_1.0.0.tgz"; + path = fetchurl { + name = "unpipe___unpipe_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + } + { name = "untildify___untildify_3.0.3.tgz"; path = fetchurl { name = "untildify___untildify_3.0.3.tgz"; @@ -930,6 +5258,30 @@ }; } { + name = "unzip_response___unzip_response_2.0.1.tgz"; + path = fetchurl { + name = "unzip_response___unzip_response_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz"; + sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; + }; + } + { + name = "update_notifier___update_notifier_2.5.0.tgz"; + path = fetchurl { + name = "update_notifier___update_notifier_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz"; + sha1 = "d0744593e13f161e406acb1d9408b72cad08aff6"; + }; + } + { + name = "update_notifier___update_notifier_4.1.0.tgz"; + path = fetchurl { + name = "update_notifier___update_notifier_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.0.tgz"; + sha1 = "4866b98c3bc5b5473c020b1250583628f9a328f3"; + }; + } + { name = "uri_js___uri_js_4.2.2.tgz"; path = fetchurl { name = "uri_js___uri_js_4.2.2.tgz"; @@ -938,6 +5290,22 @@ }; } { + name = "url_parse_lax___url_parse_lax_1.0.0.tgz"; + path = fetchurl { + name = "url_parse_lax___url_parse_lax_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; + sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + }; + } + { + name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; + path = fetchurl { + name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; + sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; + }; + } + { name = "url_regex___url_regex_3.2.0.tgz"; path = fetchurl { name = "url_regex___url_regex_3.2.0.tgz"; @@ -946,11 +5314,75 @@ }; } { - name = "uuid___uuid_3.3.2.tgz"; + name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; + path = fetchurl { + name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz"; + sha1 = "f45f150c4c66eee968186505ab93fcbb8ad6bf61"; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + } + { + name = "util_extend___util_extend_1.0.3.tgz"; + path = fetchurl { + name = "util_extend___util_extend_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz"; + sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f"; + }; + } + { + name = "util_promisify___util_promisify_2.1.0.tgz"; + path = fetchurl { + name = "util_promisify___util_promisify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/util-promisify/-/util-promisify-2.1.0.tgz"; + sha1 = "3c2236476c4d32c5ff3c47002add7c13b9a82a53"; + }; + } + { + name = "util.promisify___util.promisify_1.0.0.tgz"; + path = fetchurl { + name = "util.promisify___util.promisify_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz"; + sha1 = "440f7165a459c9a16dc145eb8e72f35687097030"; + }; + } + { + name = "uuid___uuid_3.3.3.tgz"; + path = fetchurl { + name = "uuid___uuid_3.3.3.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz"; + sha1 = "4568f0216e78760ee1dbf3a4d2cf53e224112866"; + }; + } + { + name = "uuid___uuid_3.4.0.tgz"; + path = fetchurl { + name = "uuid___uuid_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; + sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; + }; + } + { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + path = fetchurl { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"; + }; + } + { + name = "validate_npm_package_name___validate_npm_package_name_3.0.0.tgz"; path = fetchurl { - name = "uuid___uuid_3.3.2.tgz"; - url = "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz"; - sha1 = "1b4af4955eb3077c501c23872fc6513811587131"; + name = "validate_npm_package_name___validate_npm_package_name_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz"; + sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; }; } { @@ -962,6 +5394,54 @@ }; } { + name = "wcwidth___wcwidth_1.0.1.tgz"; + path = fetchurl { + name = "wcwidth___wcwidth_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz"; + sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; + }; + } + { + name = "which_module___which_module_2.0.0.tgz"; + path = fetchurl { + name = "which_module___which_module_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + } + { + name = "which___which_1.3.1.tgz"; + path = fetchurl { + name = "which___which_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; + sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + }; + } + { + name = "wide_align___wide_align_1.1.3.tgz"; + path = fetchurl { + name = "wide_align___wide_align_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; + sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; + }; + } + { + name = "widest_line___widest_line_2.0.1.tgz"; + path = fetchurl { + name = "widest_line___widest_line_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz"; + sha1 = "7438764730ec7ef4381ce4df82fb98a53142a3fc"; + }; + } + { + name = "widest_line___widest_line_3.1.0.tgz"; + path = fetchurl { + name = "widest_line___widest_line_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz"; + sha1 = "8292333bbf66cb45ff0de1603b136b7ae1496eca"; + }; + } + { name = "winreg___winreg_1.2.4.tgz"; path = fetchurl { name = "winreg___winreg_1.2.4.tgz"; @@ -970,11 +5450,83 @@ }; } { - name = "write_file_atomic___write_file_atomic_2.4.2.tgz"; + name = "word_wrap___word_wrap_1.2.3.tgz"; + path = fetchurl { + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; + }; + } + { + name = "worker_farm___worker_farm_1.7.0.tgz"; + path = fetchurl { + name = "worker_farm___worker_farm_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz"; + sha1 = "26a94c5391bbca926152002f69b84a4bf772e5a8"; + }; + } + { + name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + }; + } + { + name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; path = fetchurl { - name = "write_file_atomic___write_file_atomic_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.2.tgz"; - sha1 = "a7181706dfba17855d221140a9c06e15fcdd87b9"; + name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; + sha1 = "e9393ba07102e6c91a3b221478f0257cd2856e53"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { + name = "write_file_atomic___write_file_atomic_2.4.3.tgz"; + path = fetchurl { + name = "write_file_atomic___write_file_atomic_2.4.3.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz"; + sha1 = "1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"; + }; + } + { + name = "write_file_atomic___write_file_atomic_3.0.1.tgz"; + path = fetchurl { + name = "write_file_atomic___write_file_atomic_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.1.tgz"; + sha1 = "558328352e673b5bb192cf86500d60b230667d4b"; + }; + } + { + name = "write___write_1.0.3.tgz"; + path = fetchurl { + name = "write___write_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz"; + sha1 = "0800e14523b923a387e415123c865616aae0f5c3"; + }; + } + { + name = "xdg_basedir___xdg_basedir_3.0.0.tgz"; + path = fetchurl { + name = "xdg_basedir___xdg_basedir_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz"; + sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4"; + }; + } + { + name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; + path = fetchurl { + name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; + sha1 = "4bc8d9984403696225ef83a1573cbbcb4e79db13"; }; } { @@ -994,27 +5546,123 @@ }; } { - name = "xml2js___xml2js_0.4.19.tgz"; + name = "xml2js___xml2js_0.4.22.tgz"; + path = fetchurl { + name = "xml2js___xml2js_0.4.22.tgz"; + url = "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.22.tgz"; + sha1 = "4fa2d846ec803237de86f30aa9b5f70b6600de02"; + }; + } + { + name = "xmlbuilder___xmlbuilder_11.0.1.tgz"; + path = fetchurl { + name = "xmlbuilder___xmlbuilder_11.0.1.tgz"; + url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz"; + sha1 = "be9bae1c8a046e76b31127726347d0ad7002beb3"; + }; + } + { + name = "xtend___xtend_4.0.2.tgz"; + path = fetchurl { + name = "xtend___xtend_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"; + sha1 = "bb72779f5fa465186b1f438f674fa347fdb5db54"; + }; + } + { + name = "y18n___y18n_3.2.1.tgz"; + path = fetchurl { + name = "y18n___y18n_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz"; + sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; + }; + } + { + name = "y18n___y18n_4.0.0.tgz"; + path = fetchurl { + name = "y18n___y18n_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz"; + sha1 = "95ef94f85ecc81d007c264e190a120f0a3c8566b"; + }; + } + { + name = "yallist___yallist_2.1.2.tgz"; + path = fetchurl { + name = "yallist___yallist_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + }; + } + { + name = "yallist___yallist_3.1.1.tgz"; + path = fetchurl { + name = "yallist___yallist_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz"; + sha1 = "dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"; + }; + } + { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + }; + } + { + name = "yargs_parser___yargs_parser_16.1.0.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_16.1.0.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-16.1.0.tgz"; + sha1 = "73747d53ae187e7b8dbe333f95714c76ea00ecf1"; + }; + } + { + name = "yargs_parser___yargs_parser_7.0.0.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz"; + sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; + }; + } + { + name = "yargs_parser___yargs_parser_9.0.2.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_9.0.2.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz"; + sha1 = "9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"; + }; + } + { + name = "yargs___yargs_11.1.1.tgz"; + path = fetchurl { + name = "yargs___yargs_11.1.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz"; + sha1 = "5052efe3446a4df5ed669c995886cc0f13702766"; + }; + } + { + name = "yargs___yargs_15.1.0.tgz"; path = fetchurl { - name = "xml2js___xml2js_0.4.19.tgz"; - url = "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz"; - sha1 = "686c20f213209e94abf0d1bcf1efaa291c7827a7"; + name = "yargs___yargs_15.1.0.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-15.1.0.tgz"; + sha1 = "e111381f5830e863a89550bd4b136bb6a5f37219"; }; } { - name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; + name = "yargs___yargs_8.0.2.tgz"; path = fetchurl { - name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; - url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; - sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; + name = "yargs___yargs_8.0.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz"; + sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; }; } { - name = "xtend___xtend_4.0.1.tgz"; + name = "zip_stream___zip_stream_2.1.2.tgz"; path = fetchurl { - name = "xtend___xtend_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz"; - sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + name = "zip_stream___zip_stream_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-2.1.2.tgz"; + sha1 = "841efd23214b602ff49c497cba1a85d8b5fbc39c"; }; } ]; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 37fcafd961ae0..e5b815e7c8841 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub , makeWrapper, makeDesktopItem, mkYarnPackage -, electron_7, riot-web, gtk3 -, wrapGAppsHook, glib +, electron_7, riot-web }: # Notes for maintainers: # * versions of `riot-web` and `riot-desktop` should be kept in sync. @@ -9,39 +8,30 @@ let executableName = "riot-desktop"; - version = "1.5.15"; - riot-web-src = fetchFromGitHub { + version = "1.6.2"; + src = fetchFromGitHub { owner = "vector-im"; - repo = "riot-web"; + repo = "riot-desktop"; rev = "v${version}"; - sha256 = "08yk5is6n9ci1jml0b94a3swdybx01k5klbl30i1b76biyn75m77"; + sha256 = "1anmch9z3na7rphxb0p9cnk55388z22iwfnfjhmjps1ii5wx4rls"; }; electron = electron_7; in mkYarnPackage rec { name = "riot-desktop-${version}"; - inherit version; - - src = "${riot-web-src}/electron_app"; + inherit version src; packageJSON = ./riot-desktop-package.json; yarnNix = ./riot-desktop-yarndeps.nix; - nativeBuildInputs = [ wrapGAppsHook ]; - - extraBuildInputs = [ - glib - gtk3 - ]; - - dontWrapGApps = true; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' # resources mkdir -p "$out/share/riot" ln -s '${riot-web}' "$out/share/riot/webapp" - cp -r './deps/riot-web' "$out/share/riot/electron" - cp -r './deps/riot-web/img' "$out/share/riot" + cp -r './deps/riot-desktop' "$out/share/riot/electron" + cp -r './deps/riot-desktop/res/img' "$out/share/riot" rm "$out/share/riot/electron/node_modules" cp -r './node_modules' "$out/share/riot/electron" @@ -54,13 +44,10 @@ in mkYarnPackage rec { # desktop item mkdir -p "$out/share" ln -s "${desktopItem}/share/applications" "$out/share/applications" - ''; - postFixup = '' # executable wrapper makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ - --add-flags "$out/share/riot/electron" \ - "''${gappsWrapperArgs[@]}" + --add-flags "$out/share/riot/electron" ''; # Do not attempt generating a tarball for riot-web again. @@ -89,9 +76,9 @@ in mkYarnPackage rec { meta = with stdenv.lib; { description = "A feature-rich client for Matrix.org"; - homepage = https://about.riot.im/; + homepage = "https://about.riot.im/"; license = licenses.asl20; - maintainers = with maintainers; [ pacien worldofpeace ]; + maintainers = with maintainers; [ pacien worldofpeace ma27 ]; inherit (electron.meta) platforms; }; } diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 69699505bb625..e61237dbb6993 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.5.15"; + version = "1.6.2"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "09a9l1l65m2c4ldycjhnqn0mmblm3j65vc9rcjfkdxqbd6bh86h7"; + sha256 = "1cyjw3x9yh96cn84r95zziwxgifkmzd5kdf4l69b7mwnqcr78dp0"; }; installPhase = '' @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = { description = "A glossy Matrix collaboration client for the web"; - homepage = http://riot.im/; + homepage = "http://riot.im/"; maintainers = with stdenv.lib.maintainers; [ bachp pacien ma27 ]; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh b/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh index f516e4a76f0a9..d6e7259f19b94 100755 --- a/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh +++ b/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh @@ -9,9 +9,9 @@ if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then exit 1 fi -RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/riot-web/$1" +RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/riot-desktop/$1" -wget "$RIOT_WEB_SRC/electron_app/package.json" -O riot-desktop-package.json -wget "$RIOT_WEB_SRC/electron_app/yarn.lock" -O riot-desktop-yarndeps.lock +wget "$RIOT_WEB_SRC/package.json" -O riot-desktop-package.json +wget "$RIOT_WEB_SRC/yarn.lock" -O riot-desktop-yarndeps.lock yarn2nix --lockfile=riot-desktop-yarndeps.lock > riot-desktop-yarndeps.nix rm riot-desktop-yarndeps.lock diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 16cf7f5fc7791..f003bbec222f9 100755 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -5,12 +5,12 @@ mkDerivation rec { pname = "ripcord"; - version = "0.4.24"; + version = "0.4.25"; src = let appimage = fetchurl { url = "https://cancel.fm/dl/Ripcord-${version}-x86_64.AppImage"; - sha256 = "0rscmnwxvbdl0vfx1pz7x5gxs9qsjk905zmcad4f330j5l5m227z"; + sha256 = "17s4fxqirmzdw0sn9s9zyk90gr00ivsmz4s6i6knsq354zhy5fda"; name = "${pname}-${version}.AppImage"; }; in appimageTools.extract { diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index 13c7281aea7c9..6b9593a24b7f1 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -51,7 +51,7 @@ in ''; meta = with stdenv.lib; { - homepage = http://sat.goffi.org/; + homepage = "http://sat.goffi.org/"; description = "A multi-frontend XMPP client"; platforms = platforms.linux; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix index 54959383f08e2..b16659ba44cd9 100644 --- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix +++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix @@ -13,7 +13,7 @@ in python3Packages.buildPythonPackage { meta = with stdenv.lib; { description = "Non-official desktop client for Slack"; - homepage = https://github.com/raelgc/scudcloud; + homepage = "https://github.com/raelgc/scudcloud"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ volhovm ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index a062d679f7fa6..a4594a20caf73 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.6.6"; + version = "0.6.7"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "1r0w9knxa2kx5my9xgmcnhq14287ixwbqxqip5ispj78d27g4zfq"; + sha256 = "13wz2c0n89aglqjfqlma1z4jr5xnp2qlg8cqng3v9axpkkynk996"; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 454d9b2884f6f..309da8f296c52 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook +{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, nixosTests , gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.33.0"; # Please backport all updates to the stable channel. + version = "1.34.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0s403243cm8x3daj4p7cpp5z0hwmsnk21cq42zcfls2q5d30p6wz"; + sha256 = "0v9mqn43vn1w6wppzydkgpbx2752bp7mmpf50wqgvrmhchnywnkj"; }; nativeBuildInputs = [ @@ -121,6 +121,9 @@ in stdenv.mkDerivation rec { autoPatchelf --no-recurse -- $out/lib/Signal/ ''; + # Tests if the application launches and waits for "Link your phone to Signal Desktop": + passthru.tests.application-launch = nixosTests.signal-desktop; + meta = { description = "Private, simple, and secure messenger"; longDescription = '' diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index 1219440bf8335..0c84e1c5c80a5 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { buildInputs = [ perl glib ncurses ]; meta = { - homepage = http://silcnet.org/; + homepage = "http://silcnet.org/"; description = "Secure Internet Live Conferencing server"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/networking/instant-messengers/sky/default.nix b/pkgs/applications/networking/instant-messengers/sky/default.nix index cdc176be65b04..fe8b251c4048d 100644 --- a/pkgs/applications/networking/instant-messengers/sky/default.nix +++ b/pkgs/applications/networking/instant-messengers/sky/default.nix @@ -10,7 +10,7 @@ # Sky is linked to the libjpeg 8 version and checks for the version number in the code. libjpeg_original_fix = libjpeg_original.overrideAttrs (oldAttrs: { src = fetchurl{ - url = https://www.ijg.org/files/jpegsrc.v8d.tar.gz; + url = "https://www.ijg.org/files/jpegsrc.v8d.tar.gz"; sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"; }; }); @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { longDescription = '' Lync & Skype for business on linux ''; - homepage = https://tel.red/; + homepage = "https://tel.red/"; license = licenses.unfree; maintainers = [ maintainers.Scriptkiddi ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix index 8093f91feb3e4..57d1ffece71a2 100644 --- a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-lvorbis"; meta = { - homepage = http://atdot.ch/scr/; + homepage = "http://atdot.ch/scr/"; description = "Open source tool to record your Skype calls on Linux"; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 3aaaa7eb8ba04..e7ba1e7f9aace 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.58.0.93"; + version = "8.60.0.76"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -62,9 +62,10 @@ let fetchurl { urls = [ "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" + "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "1nqadil50z896jg0r202gw3xmm3diawn0pnh6n6nxn900f02avl3"; + sha256 = "1y919ki0c17vip90fln17impwky08qgprw0j1dgz239qqpwakn7a"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; @@ -111,7 +112,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Linux client for skype"; - homepage = https://www.skype.com; + homepage = "https://www.skype.com"; license = licenses.unfree; maintainers = with stdenv.lib.maintainers; [ panaeon jraygauthier ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix index d1f3e98c4ec27..c862c253c00a6 100644 --- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Slack client for your terminal"; - homepage = https://github.com/erroneousboat/slack-term; + homepage = "https://github.com/erroneousboat/slack-term"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 712d45e2b199b..9cf436ff18f3f 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -40,21 +40,25 @@ let throwSystem = throw "Unsupported system: ${system}"; sha256 = { - x86_64-darwin = "05xsbiviikrwfayjr6rvvfkm70681x2an6mgcg1cxw1fsi4sr6fd"; - x86_64-linux = "0h2rfgx92yq9a6dqsv9a0r8a6m5xfrywkljjk5w9snw49b0r1p12"; + x86_64-darwin = "0z731q00bwljlcmbjwqphyys7skqms1vg87pyi4nsvjmc7kjx7qg"; + x86_64-linux = "0wrs0i2bqv21ivy8s88khbww28b3gsw4abbbbjc76mqma9b0bajs"; + }.${system} or throwSystem; + + version = { + x86_64-darwin = "4.4.2"; + x86_64-linux = "4.4.2"; }.${system} or throwSystem; meta = with stdenv.lib; { description = "Desktop client for Slack"; - homepage = https://slack.com; + homepage = "https://slack.com"; license = licenses.unfree; maintainers = with maintainers; [ mmahut ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; }; linux = stdenv.mkDerivation rec { - inherit pname meta; - version = "4.4.0"; + inherit pname meta version; src = fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; inherit sha256; @@ -140,8 +144,7 @@ let }; darwin = stdenv.mkDerivation rec { - inherit pname meta; - version = "4.4.1"; + inherit pname meta version; phases = [ "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix index 7a9ab4d127c4d..895ad30360e97 100644 --- a/pkgs/applications/networking/instant-messengers/stride/default.nix +++ b/pkgs/applications/networking/instant-messengers/stride/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Desktop client for Atlassian Stride"; - homepage = https://www.stride.com/; + homepage = "https://www.stride.com/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ puffnfresh ]; diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix index 0f1a7478a1872..953ce2809c439 100644 --- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, qttools, scons +{ mkDerivation, stdenv, fetchurl, pkgconfig, qttools, scons , GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2 , lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "swift-im"; version = "4.0.2"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { installFlags = [ "SWIFT_INSTALLDIR=${placeholder "out"}" ]; meta = with stdenv.lib; { - homepage = https://swift.im/; + homepage = "https://swift.im/"; description = "Qt XMPP client"; license = licenses.gpl3; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index 63d922ab29949..6b5acd8344a8e 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -52,6 +52,28 @@ stdenv.mkDerivation rec { ln -s $out/opt/teams/teams $out/bin/ ''; + dontAutoPatchelf = true; + + # Includes runtimeDependencies in the RPATH of the included Node modules + # so that dynamic loading works. We cannot use directly runtimeDependencies + # here, since the libraries from runtimeDependencies are not propagated + # to the dynamically loadable node modules because of a condition in + # autoPatchElfHook since *.node modules have Type: DYN (Shared object file) + # instead of EXEC or INTERP it expects. + # Fixes: https://github.com/NixOS/nixpkgs/issues/85449 + postFixup = '' + autoPatchelf "$out" + + runtime_rpath="${lib.makeLibraryPath runtimeDependencies}" + + for mod in $(find "$out/opt/teams" -name '*.node'); do + mod_rpath="$(patchelf --print-rpath "$mod")" + + echo "Adding runtime dependencies to RPATH of Node module $mod" + patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod" + done; + ''; + meta = with stdenv.lib; { description = "Microsoft Teams"; homepage = "https://teams.microsoft.com"; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index c2a9f4be90a2e..7d2586c670817 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl -, xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, xkeyboard_config, alsaLib -, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin +, xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, qtwebsockets, xkeyboard_config +, alsaLib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin }: let @@ -13,7 +13,7 @@ let [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qtbase qtwebengine qtwebchannel qtsvg - libpulseaudio quazip llvmPackages.libcxx llvmPackages.libcxxabi + qtwebsockets libpulseaudio quazip llvmPackages.libcxx llvmPackages.libcxxabi ]; desktopItem = makeDesktopItem { @@ -33,13 +33,13 @@ in stdenv.mkDerivation rec { pname = "teamspeak-client"; - version = "3.3.2"; + version = "3.5.3"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"; sha256 = if stdenv.is64bit - then "1n916ds67dxj5bfgc5zm9nz2xh2914k85pzzspzvfyr7njcw7hpi" - else "0csl5xklcb4v8bzwvby5m2n38zjrnaw8dcvha7qvfbjllxr75yn2"; + then "0fp9v2rkxf0zgvf3wcx8nsmf93bzdc22xlqxk3r8cb0415adp76a" + else "0ni7hijprc8xygyz41568f1m9wwhl8lk5c3q28bm9m5r6qym39l6"; }; # grab the plugin sdk for the desktop icon @@ -101,10 +101,10 @@ stdenv.mkDerivation rec { meta = { description = "The TeamSpeak voice communication tool"; - homepage = https://teamspeak.com/; + homepage = "https://teamspeak.com/"; license = { fullName = "Teamspeak client license"; - url = http://sales.teamspeakusa.com/licensing.php; + url = "http://sales.teamspeakusa.com/licensing.php"; free = false; }; maintainers = [ stdenv.lib.maintainers.lhvwb ]; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 1cc3cf9cdd59a..761d7cfcbd4b3 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, autoPatchelfHook }: +{ stdenv, fetchurl, autoPatchelfHook, writeScript }: let arch = if stdenv.is64bit then "amd64" else "x86"; in stdenv.mkDerivation rec { pname = "teamspeak-server"; - version = "3.11.0"; + version = "3.12.1"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"; sha256 = if stdenv.is64bit - then "18hsr119dq46rvhz5sb9snn2gfxwiig37g6bfzk24x6wlga3xihq" - else "1lyazw328azi0asvgvcsxglc1saqih6ss0g8pc8f5pzqngk9p953"; + then "1dxbnk12ry6arn1p38hpv5jfak55pmfmxkkl7aihn3sp1aizpgyg" + else "0nfzx7pbzd95a7v08g29l84sc0lnv9fx8vz3mrmzhs0xqn9gxdkq"; }; buildInputs = [ stdenv.cc.cc ]; @@ -28,9 +28,32 @@ in stdenv.mkDerivation rec { ln -s $out/lib/teamspeak/tsdns/tsdnsserver $out/bin/tsdnsserver ''; + passthru.updateScript = writeScript "update-teampeak-server" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts curl gnugrep gnused + + set -eu -o pipefail + + version=$( \ + curl -s "https://www.teamspeak.de/download/teamspeak-3-amd64-server-linux/" \ + | grep softwareVersion \ + | sed -E -e 's/^.*<span itemprop="softwareVersion">([^<]+)<\/span>.*$/\1/' \ + ) + + versionOld=$(nix-instantiate --eval --strict -A "teamspeak_server.version") + + nixFile=pkgs/applications/networking/instant-messengers/teamspeak/server.nix + + update-source-version teamspeak_server "$version" --system=i686-linux + + sed -i -e "s/version = \"$version\";/version = $versionOld;/" "$nixFile" + + update-source-version teamspeak_server "$version" --system=x86_64-linux + ''; + meta = with stdenv.lib; { description = "TeamSpeak voice communication server"; - homepage = https://teamspeak.com/; + homepage = "https://teamspeak.com/"; license = licenses.unfreeRedistributable; platforms = platforms.linux; maintainers = with maintainers; [ arobyn gerschtli ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 862659fde8d9b..87c70464e9b4d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,32 +1,28 @@ { mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja -, qtbase, qtimageformats, enchant, xdg_utils, ffmpeg, openalSoft, lzma -, lz4, xxHash, zlib, minizip, openssl, libtgvoip, range-v3 +, qtbase, qtimageformats, libsForQt5, hunspell, xdg_utils, ffmpeg, openalSoft +, lzma, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected +, range-v3 }: with lib; mkDerivation rec { pname = "kotatogram-desktop"; - version = "1.1.5"; + version = "1.2"; src = fetchFromGitHub { owner = "kotatogram"; repo = "kotatogram-desktop"; rev = "k${version}"; - sha256 = "1j5wn3k1mr2c39szmyzm0pf720jmbllcaj40p2ydx0p3lir1s760"; + sha256 = "00pdx3cjhrihf7ihhmszcf159jrzn1bcx20vwiiizs5r1qk8l210"; fetchSubmodules = true; }; - postPatch = '' - substituteInPlace Telegram/lib_spellcheck/spellcheck/platform/linux/linux_enchant.cpp \ - --replace '"libenchant-2.so.2"' '"${enchant}/lib/libenchant-2.so.2"' - ''; - nativeBuildInputs = [ pkg-config python3 cmake ninja ]; buildInputs = [ - qtbase qtimageformats ffmpeg openalSoft lzma lz4 xxHash - zlib minizip openssl enchant libtgvoip range-v3 + qtbase qtimageformats ffmpeg openalSoft lzma lz4 xxHash libsForQt5.libdbusmenu + zlib minizip openssl hunspell libtgvoip microsoft_gsl tl-expected range-v3 ]; qtWrapperArgs = [ @@ -35,8 +31,8 @@ mkDerivation rec { cmakeFlags = [ "-DTDESKTOP_API_TEST=ON" - "-DTDESKTOP_DISABLE_GTK_INTEGRATION=ON" "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" + "-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF" ]; meta = { @@ -48,7 +44,7 @@ mkDerivation rec { ''; license = licenses.gpl3; platforms = platforms.linux; - homepage = https://kotatogram.github.io; + homepage = "https://kotatogram.github.io"; maintainers = with maintainers; [ ilya-fedin ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 60fd95a147618..f10c6b82ac213 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -2,7 +2,7 @@ , pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 -, tl-expected, microsoft_gsl, hunspell +, tl-expected, hunspell # TODO: Shouldn't be required: , pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst , xdg_utils @@ -19,12 +19,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "2.0.1"; + version = "2.1.6"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "0g3jw4can9gmp48s3b8s1w8n9xi54i142y74fszxf9jyq5drzlff"; + sha256 = "136c27pfipy9ikwm44nqxx9lqwq8qsfcs591qr8ac05ncgkh001v"; }; postPatch = '' @@ -43,7 +43,7 @@ mkDerivation rec { buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3 - tl-expected microsoft_gsl hunspell + tl-expected hunspell # TODO: Shouldn't be required: pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst ]; @@ -57,6 +57,7 @@ mkDerivation rec { "-DTDESKTOP_API_TEST=ON" "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" "-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF" + "-DDESKTOP_APP_USE_PACKAGED_GSL=OFF" "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON" "-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF" #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""' diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index a0cc73da46d86..d81af8388aac9 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://telepathy.freedesktop.org/components/telepathy-gabble/; + homepage = "https://telepathy.freedesktop.org/components/telepathy-gabble/"; description = "Jabber/XMPP connection manager for the Telepathy framework"; license = licenses.lgpl21Plus; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 769e639314e06..6d4ff62f22a8b 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # Patch from Gentoo that helps telepathy-haze build with more # recent versions of pidgin. (fetchpatch { - url = https://raw.githubusercontent.com/gentoo/gentoo/master/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch; + url = "https://raw.githubusercontent.com/gentoo/gentoo/master/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch"; sha256 = "0fa1p4n1559qd096w7ya4kvfnc1c98ykarkxzlpkwvzbczwzng3c"; }) ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index af0ca1589e5aa..f8e1f1f2c665d 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Logger service for Telepathy framework"; - homepage = https://telepathy.freedesktop.org/components/telepathy-logger/; + homepage = "https://telepathy.freedesktop.org/components/telepathy-logger/"; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.gnu ++ platforms.linux; # Arbitrary choice diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index d91cc5f8c84f2..c590b6a0896d3 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An account manager and channel dispatcher for the Telepathy framework"; - homepage = https://telepathy.freedesktop.org/components/telepathy-mission-control/; + homepage = "https://telepathy.freedesktop.org/components/telepathy-mission-control/"; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 11845ecfb26cb..1ea249a8b51bd 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }: +{ mkDerivation, stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }: # we now have libqmatrixclient so a future version of tensor that supports it # should use that -stdenv.mkDerivation rec { +mkDerivation rec { pname = "tensor-git"; version = "2017-02-21"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://matrix.org/docs/projects/client/tensor.html; + homepage = "https://matrix.org/docs/projects/client/tensor.html"; description = "Cross-platform Qt5/QML-based Matrix client"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix index edfec97edf8ae..8231f481ee0d9 100644 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/prof7bit/TorChat; + homepage = "https://github.com/prof7bit/TorChat"; description = "Instant messaging application on top of the Tor network and it's location hidden services"; license = licenses.gpl3; maintainers = [ maintainers.phreedom ]; diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index 27977dae15f89..b6017277b0a50 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/louipc/turses; + homepage = "https://github.com/louipc/turses"; description = "A Twitter client for the console"; license = licenses.gpl3; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 5ef0d9162429a..b360793e484b7 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight Tox client"; - homepage = https://github.com/uTox/uTox; + homepage = "https://github.com/uTox/uTox"; license = licenses.gpl3; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 923ce3737532b..ed320d9679d6b 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ]; # hack: needed to fix build issues in - # http://hydra.nixos.org/build/38322959/nixlog/1 + # https://hydra.nixos.org/build/38322959/nixlog/1 # should be an upstream issue but it's easy to fix NIX_LDFLAGS = "-lz"; @@ -36,6 +36,6 @@ stdenv.mkDerivation { maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.gpl3; - homepage = http://www.vacuum-im.org; + homepage = "http://www.vacuum-im.org"; }; } diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index acdec1dc99c9a..e53b8c7391e8f 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation { dontPatchELF = true; meta = { - homepage = http://www.viber.com; + homepage = "http://www.viber.com"; description = "An instant messaging and Voice over IP (VoIP) app"; license = stdenv.lib.licenses.unfree; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 7f2ce9553e9b1..bece4e467a357 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple and Convenient Messaging App for VK"; - homepage = https://vk.com/messenger; + homepage = "https://vk.com/messenger"; license = licenses.unfree; maintainers = [ maintainers.gnidorah ]; platforms = ["i686-linux" "x86_64-linux"]; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index ceb9b4a114031..1cd2df4c7ac11 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Wavebox messaging application"; - homepage = https://wavebox.io; + homepage = "https://wavebox.io"; license = licenses.mpl20; maintainers = with maintainers; [ rawkode ]; platforms = ["x86_64-linux"]; diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix index 4047eba1fbb52..52cf8e3279a03 100644 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "An XMPP client with OTR support"; - homepage = https://github.com/agl/xmpp-client; + homepage = "https://github.com/agl/xmpp-client"; license = licenses.bsd3; maintainers = with maintainers; [ codsl ]; }; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 7a46c0604cc57..92307547531d8 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "3.5.383291.0407"; + version = "5.0.408598.0517"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1l560gv1wpfiggxylz3f62mcjjchpq3p0i1j4b2b68ckgc5sj80k"; + sha256 = "1irpnrxl91pc9naz0d9m252scnbfdbdi7yh19hd3arvk3fppjk7w"; }; }; diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index 0c0c6debd79ac..1adfb71dd9b68 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,12 +5,12 @@ let pname = "zulip"; - version = "5.0.0"; + version = "5.2.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - sha256 = "0qwlhkzb3lbzk3piyfx8nn827kcafrl3j1nxrn18f8px9gwasinz"; + sha256 = "0rgvllm1pzg6smyjrhh8v1ial0dvav0h2zccxp4p5nqmq6zdvs3h"; name="${pname}-${version}.AppImage"; }; @@ -32,7 +32,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "Desktop client for Zulip Chat"; - homepage = https://zulipchat.com; + homepage = "https://zulipchat.com"; license = licenses.asl20; maintainers = with maintainers; [ jonafato ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index 3a2b32f01175e..773a07dd6c242 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { platforms = ["x86_64-linux"]; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.benley ]; - homepage = https://www.insynchq.com; + homepage = "https://www.insynchq.com"; description = "Google Drive sync and backup with multiple account support"; longDescription = '' Insync is a commercial application that syncs your Drive files to your diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index a214f222d566a..c41912794d06d 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { version = "0.12.1"; rev = "v${version}"; - modSha256 = "0bn47lcb9plzvl2vqqj7p33ishz6bbqpsgf2i6p34g13bwwpq647"; + vendorSha256 = "1n0zb3v83wsy8y3k7xbpjc2ykh1b2n6p10d5wkflhga49q7rf64h"; src = fetchFromGitHub { owner = "ipfs"; @@ -16,10 +16,9 @@ buildGoModule rec { meta = with stdenv.lib; { description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons"; - homepage = https://cluster.ipfs.io/; + homepage = "https://cluster.ipfs.io/"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ jglukasik ]; }; -} - +} \ No newline at end of file diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix index 578ac9b047975..7a9d8f6397073 100644 --- a/pkgs/applications/networking/ipfs-migrator/default.nix +++ b/pkgs/applications/networking/ipfs-migrator/default.nix @@ -1,27 +1,25 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage { +buildGoModule rec { pname = "ipfs-migrator"; - version = "7"; - - goPackagePath = "github.com/ipfs/fs-repo-migrations"; - - goDeps = ./deps.nix; + version = "1.5.1"; src = fetchFromGitHub { owner = "ipfs"; repo = "fs-repo-migrations"; - rev = "4e8e0b41d7348646c719d572c678c3d0677e541a"; - sha256 = "1i6izncgc3wgabppglnnrslffvwrv3cazbdhsk4vjfsd66hb4d37"; + rev = "v${version}"; + sha256 = "18pjxkxfbsbbj4hs4xyzfmmz991h31785ldx41dll6wa9zx4lsnm"; }; - patches = [ ./lru-repo-path-fix.patch ]; + vendorSha256 = null; + + subPackages = [ "." ]; - meta = with stdenv.lib; { - description = "Migration tool for ipfs repositories"; + meta = with lib; { + description = "Migrations for the filesystem repository of ipfs clients"; homepage = "https://ipfs.io/"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ elitak ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/ipfs-migrator/deps.nix b/pkgs/applications/networking/ipfs-migrator/deps.nix deleted file mode 100644 index b4ae5ef827ecd..0000000000000 --- a/pkgs/applications/networking/ipfs-migrator/deps.nix +++ /dev/null @@ -1,47 +0,0 @@ -[ - { - goPackagePath = "github.com/jbenet/goprocess"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/goprocess"; - rev = "b497e2f366b8624394fb2e89c10ab607bebdde0b"; - sha256 = "1lnvkzki7vnqn5c4m6bigk0k85haicmg27w903kwg30rdvblm82s"; - }; - } - { - goPackagePath = "github.com/jbenet/go-random"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-random"; - rev = "384f606e91f542a98e779e652eed88051618f0f7"; - sha256 = "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa"; - }; - } - { - goPackagePath = "github.com/jbenet/go-random-files"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-random-files"; - rev = "737479700b40b4b50e914e963ce8d9d44603e3c8"; - sha256 = "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "20f1fb78b0740ba8c3cb143a61e86ba5c8669768"; - sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "26e67e76b6c3f6ce91f7c52def5af501b4e0f3a2"; - sha256 = "17bqkd64zksi1578lb10ls4qf5lbqs7shfjcc6bi97y1qz5k31c4"; - }; - } -] diff --git a/pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch b/pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch deleted file mode 100644 index a933a7b5358bd..0000000000000 --- a/pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ipfs-1-to-2/go-datastore/lru/datastore.go b/ipfs-1-to-2/go-datastore/lru/datastore.go -index 7eb18eb..cd8dcb7 100644 ---- a/ipfs-1-to-2/go-datastore/lru/datastore.go -+++ b/ipfs-1-to-2/go-datastore/lru/datastore.go -@@ -3,7 +3,7 @@ package lru - import ( - "errors" - -- lru "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/golang-lru" -+ lru "github.com/hashicorp/golang-lru" - - ds "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/go-datastore" - dsq "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/go-datastore/query" diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 4f71fcf3b7454..5aa270aa8f0f4 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -1,26 +1,34 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchurl, nixosTests }: buildGoModule rec { pname = "ipfs"; - version = "0.4.23"; + version = "0.5.1"; rev = "v${version}"; - src = fetchFromGitHub { - owner = "ipfs"; - repo = "go-ipfs"; - inherit rev; - sha256 = "19m1bhqf1jghdv2ngdnjdk1kvjcxbkgm1ccdkmkabv4ii43h8jwm"; + # go-ipfs makes changes to it's source tarball that don't match the git source. + src = fetchurl { + url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; + sha256 = "0lpilycjbc1g9adp4d5kryfprixj18hg3235fnivakmv7fy2akkm"; }; - postPatch = '' - rm -rf test/dependencies + # tarball contains multiple files/directories + postUnpack = '' + mkdir ipfs-src + mv * ipfs-src || true + cd ipfs-src ''; - modSha256 = "12m4ind1s8zaa6kssblc28z2cafy20w2jp80kzif39hg5ar9bijm"; + sourceRoot = "."; + + subPackages = [ "cmd/ipfs" ]; + + passthru.tests.ipfs = nixosTests.ipfs; + + vendorSha256 = null; meta = with stdenv.lib; { description = "A global, versioned, peer-to-peer filesystem"; - homepage = https://ipfs.io/; + homepage = "https://ipfs.io/"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix index 9f206a8f48f3f..d137fcf296fac 100644 --- a/pkgs/applications/networking/ipget/default.nix +++ b/pkgs/applications/networking/ipget/default.nix @@ -1,32 +1,23 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "ipget"; - version = "0.3.2"; - rev = "v${version}"; - - goPackagePath = "github.com/ipfs/ipget"; - - extraSrcPaths = [ - (fetchgx { - inherit src;name = "${pname}-${version}"; - sha256 = "07l9hpkhk5phr95zp1l5wd3ii38bw91hy4dlw2rsfbzcsc8bq4s8"; - }) - ]; - - goDeps = ../../../tools/package-management/gx/deps.nix; + version = "0.6.0"; src = fetchFromGitHub { owner = "ipfs"; repo = "ipget"; - inherit rev; - sha256 = "1ljf5ddvc1p5swmgn4m1ivfj74fykk56myk2r9c4grdjzksf4a15"; + rev = "v${version}"; + sha256 = "14ygij6hj6bd4g4aw6jgfbi1fgpal0jgf1hr22zxm16dpx3vva6b"; }; + vendorSha256 = "0vy21pdqk6q5fw7wlcv51myhh9y79n2qhvy61rmblwhxlrkh6sdv"; + meta = with stdenv.lib; { description = "Retrieve files over IPFS and save them locally"; - homepage = https://ipfs.io/; + homepage = "https://ipfs.io/"; license = licenses.mit; + maintainers = with maintainers; [ Luflosi ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/iptraf-ng/default.nix b/pkgs/applications/networking/iptraf-ng/default.nix index cdece4eb644f0..1fc81be240bf2 100644 --- a/pkgs/applications/networking/iptraf-ng/default.nix +++ b/pkgs/applications/networking/iptraf-ng/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { of the Linux kernel, so it can be used on a wide variety of supported network cards. ''; - homepage = https://fedorahosted.org/iptraf-ng/; + homepage = "https://fedorahosted.org/iptraf-ng/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix index d2d9a67fb4d99..83d9a019e48bb 100644 --- a/pkgs/applications/networking/iptraf/default.nix +++ b/pkgs/applications/networking/iptraf/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "iptraf-3.0.1"; src = fetchurl { - url = ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.1.tar.gz; + url = "ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.1.tar.gz"; sha256 = "12n059j9iihhpf6spmlaspqzxz3wqan6kkpnhmlj08jdijpnk84m"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { buildInputs = [ncurses]; meta = { - homepage = http://iptraf.seul.org/; + homepage = "http://iptraf.seul.org/"; license = stdenv.lib.licenses.gpl2Plus; description = "Console-based network statistics utility for Linux"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index 43ec0910cc2b8..af67c224e7d7d 100644 --- a/pkgs/applications/networking/irc/bip/default.nix +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "An IRC proxy (bouncer)"; - homepage = http://bip.milkypond.org/; + homepage = "http://bip.milkypond.org/"; license = stdenv.lib.licenses.gpl2; downloadPage = "https://projects.duckcorp.org/projects/bip/files"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 8278f90d321c9..6cb6f2c2ef679 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple and elegant cross-platform IRC client"; - homepage = https://github.com/communi/communi-desktop; + homepage = "https://github.com/communi/communi-desktop"; license = licenses.bsd3; maintainers = with maintainers; [ hrdinka ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix index 0cf06a1f45229..cb2fa4ae6823e 100644 --- a/pkgs/applications/networking/irc/epic5/default.nix +++ b/pkgs/applications/networking/irc/epic5/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://epicsol.org; + homepage = "http://epicsol.org"; description = "A IRC client that offers a great ircII interface"; license = licenses.bsd3; maintainers = []; diff --git a/pkgs/applications/networking/irc/glowing-bear/default.nix b/pkgs/applications/networking/irc/glowing-bear/default.nix index 2d12386bafac0..59278dddad1aa 100644 --- a/pkgs/applications/networking/irc/glowing-bear/default.nix +++ b/pkgs/applications/networking/irc/glowing-bear/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A web client for Weechat"; - homepage = https://github.com/glowing-bear/glowing-bear; + homepage = "https://github.com/glowing-bear/glowing-bear"; license = licenses.gpl3Plus; maintainers = with maintainers; [ delroth ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index 263cf23c17ff3..c5b2a9f1b28e7 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A popular and easy to use graphical IRC (chat) client"; - homepage = https://hexchat.github.io/; + homepage = "https://hexchat.github.io/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index 4807f3419d15a..163dec194b15e 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://tools.suckless.org/ii/; + homepage = "https://tools.suckless.org/ii/"; license = stdenv.lib.licenses.mit; description = "Irc it, simple FIFO based irc client"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 1751812d67e88..27b37e78a1a40 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = https://irssi.org; + homepage = "https://irssi.org"; description = "A terminal based IRC client"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix index aefc48d4a3ee9..f1e0e9158ca65 100644 --- a/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "fish-irssi-20130413-e98156bebd"; src = fetchurl { - url = https://github.com/falsovsky/FiSH-irssi/tarball/e98156bebd; + url = "https://github.com/falsovsky/FiSH-irssi/tarball/e98156bebd"; name = "${name}.tar.gz"; sha256 = "1ndr51qrg66h1mfzacwzl1vd6lj39pdc4p4z5iihrj4r2f6gk11a"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp automake autoconf libtool openssl glib ]; meta = { - homepage = https://github.com/falsovsky/FiSH-irssi; + homepage = "https://github.com/falsovsky/FiSH-irssi"; license = stdenv.lib.licenses.unfree; # I can't find any mention of license maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix index 6a58241b89aa9..2890deccb800f 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/networking/irc/konversation/default.nix @@ -82,6 +82,6 @@ in mkDerivation rec { description = "Integrated IRC client for KDE"; license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ fridh ]; - homepage = https://konversation.kde.org; + homepage = "https://konversation.kde.org"; }; } diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index f78053bdc37b3..86f7793819b0a 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -80,7 +80,7 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { ''; meta = with stdenv.lib; { - homepage = https://quassel-irc.org/; + homepage = "https://quassel-irc.org/"; description = "Qt/KDE distributed IRC client suppporting a remote daemon"; longDescription = '' Quassel IRC is a cross-platform, distributed IRC client, @@ -91,7 +91,7 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { ''; license = licenses.gpl3; maintainers = with maintainers; [ phreedom ttuegel ]; - repositories.git = https://github.com/quassel/quassel.git; + repositories.git = "https://github.com/quassel/quassel.git"; inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/applications/networking/irc/qweechat/default.nix b/pkgs/applications/networking/irc/qweechat/default.nix index aedd4bdf0dd80..27adb2cefc5fc 100644 --- a/pkgs/applications/networking/irc/qweechat/default.nix +++ b/pkgs/applications/networking/irc/qweechat/default.nix @@ -22,7 +22,7 @@ python27Packages.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/weechat/qweechat; + homepage = "https://github.com/weechat/qweechat"; description = "Qt remote GUI for WeeChat"; license = licenses.gpl3; maintainers = with maintainers; [ ramkromberg ]; diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix index 4091429559705..69605af2f6603 100644 --- a/pkgs/applications/networking/irc/sic/default.nix +++ b/pkgs/applications/networking/irc/sic/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple IRC client"; - homepage = https://tools.suckless.org/sic/; + homepage = "https://tools.suckless.org/sic/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index ee850ea0eba75..a05ec290629fb 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -70,7 +70,7 @@ let ''; meta = { - homepage = http://www.weechat.org/; + homepage = "http://www.weechat.org/"; description = "A fast, light and extensible chat client"; longDescription = '' You can find more documentation as to how to customize this package @@ -78,7 +78,7 @@ let on https://nixos.org/nixpkgs/manual/#sec-weechat . ''; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ lovek323 the-kenny lheckemann ma27 ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 lheckemann ma27 ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 7b98630e85ee1..8df6c8d6124e9 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/wee-slack/wee-slack; + homepage = "https://github.com/wee-slack/wee-slack"; license = licenses.mit; maintainers = with maintainers; [ willibutz ]; description = '' diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix index 23a6996bcdd25..883ed793ced60 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Autosort is a weechat script to automatically or manually keep your buffers sorted"; - homepage = https://github.com/de-vri-es/weechat-autosort; + homepage = "https://github.com/de-vri-es/weechat-autosort"; license = licenses.gpl3; maintainers = with maintainers; [ emily ]; }; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix index ea5052f37a3f0..f1b075e6d082a 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A WeeChat script in Lua that implements the matrix.org chat protocol"; - homepage = https://github.com/torhve/weechat-matrix-protocol-script; + homepage = "https://github.com/torhve/weechat-matrix-protocol-script"; maintainers = with maintainers; [ ma27 ]; license = licenses.mit; # see https://github.com/torhve/weechat-matrix-protocol-script/blob/0052e7275ae149dc5241226391c9b1889ecc3c6b/matrix.lua#L53 platforms = platforms.unix; diff --git a/pkgs/applications/networking/irc/wraith/default.nix b/pkgs/applications/networking/irc/wraith/default.nix index 996ab72d6f5de..02bccb67bfe1f 100644 --- a/pkgs/applications/networking/irc/wraith/default.nix +++ b/pkgs/applications/networking/irc/wraith/default.nix @@ -40,7 +40,7 @@ mkDerivation rec { The binary will not run when moved onto non-NixOS systems; use patchelf to fix its runtime dependenices. ''; - homepage = https://wraith.botpack.net/; + homepage = "https://wraith.botpack.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ elitak ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/lieer/default.nix index a20728e2199f7..700ad011dff33 100644 --- a/pkgs/applications/networking/gmailieer/default.nix +++ b/pkgs/applications/networking/lieer/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - name = "gmailieer-${version}"; - version = "1.0"; + pname = "lieer"; + version = "1.2"; src = fetchFromGitHub { owner = "gauteh"; - repo = "gmailieer"; + repo = "lieer"; rev = "v${version}"; - sha256 = "1zzylv8xbcrh34bz0s29dawzcyx39lai8y8wk0bl4x75v1jfynvf"; + sha256 = "0qp8sycclzagkiszqk1pw2fr8s8s195bzy8r27dj7f5zx350nxk5"; }; propagatedBuildInputs = with python3Packages; [ @@ -27,9 +27,9 @@ python3Packages.buildPythonApplication rec { tags in the notmuch database may be pushed back remotely to your GMail account. ''; - homepage = https://github.com/gauteh/gmailieer; - repositories.git = https://github.com/gauteh/gmailieer.git; + homepage = "https://lieer.gaute.vetsj.com/"; + repositories.git = "https://github.com/gauteh/lieer.git"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ kaiha ]; + maintainers = with maintainers; [ flokli kaiha ]; }; } diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index daddf6adf7e48..f458e03913ba3 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical wireless scanning for Linux"; - homepage = https://sourceforge.net/projects/linssid/; + homepage = "https://sourceforge.net/projects/linssid/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/networking/maestral/default.nix b/pkgs/applications/networking/maestral/default.nix index 49348610be572..fe611892ae6cb 100644 --- a/pkgs/applications/networking/maestral/default.nix +++ b/pkgs/applications/networking/maestral/default.nix @@ -8,7 +8,7 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral${lib.optionalString withGui "-gui"}"; - version = "0.6.1"; + version = "0.6.4"; disabled = python3.pkgs.pythonOlder "3.6"; @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { owner = "SamSchott"; repo = "maestral-dropbox"; rev = "v${version}"; - sha256 = "06i3c7i85x879np158156mba7kxz2cwh75390sc9gwwngc95d9h9"; + sha256 = "06psbjd205qj6vx7k7ywhclz1bs5zp43xnf275hf0k80h3b064sn"; }; propagatedBuildInputs = with python3.pkgs; [ @@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec { keyring keyrings-alt lockfile + pathspec Pyro5 requests u-msgpack-python diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 7b24ed93406e3..5841283563930 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -1,6 +1,7 @@ { stdenv, buildGoModule, fetchurl , go, ncurses, notmuch, scdoc , python3, perl, w3m, dante +, fetchFromGitHub }: let @@ -14,7 +15,21 @@ in buildGoModule rec { sha256 = "1bx2fypw053v3bzalfgyi6a0s5fvv040z8jy4i63s7p53m8gmzs9"; }; - modSha256 = "127xrah6xxrvc224g5dxn432sagrssx8v7phzapcsdajsnmagq6x"; + libvterm = fetchFromGitHub { + owner = "ddevault"; + repo = "go-libvterm"; + rev = "b7d861da381071e5d3701e428528d1bfe276e78f"; + sha256 = "06vv4pgx0i6hjdjcar4ch18hp9g6q6687mbgkvs8ymmbacyhp7s6"; + }; + + vendorSha256 = "0rnyjjlsxsi0y23m6ckyd52562m33qr35fvdcdzy31mbfpi8kl2k"; + + overrideModAttrs = (_: { + postBuild = '' + cp -r --reflink=auto ${libvterm}/libvterm vendor/github.com/ddevault/go-libvterm + cp -r --reflink=auto ${libvterm}/encoding vendor/github.com/ddevault/go-libvterm + ''; + }); nativeBuildInputs = [ scdoc @@ -55,9 +70,9 @@ in buildGoModule rec { meta = with stdenv.lib; { description = "aerc is an email client for your terminal"; - homepage = https://aerc-mail.org/; + homepage = "https://aerc-mail.org/"; maintainers = with maintainers; [ tadeokondrak ]; license = licenses.mit; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index 54b3e10b5e297..8b2a6f05c4e5d 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -2,18 +2,22 @@ python3Packages.buildPythonApplication rec { pname = "afew"; - version = "2.0.0"; + version = "3.0.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0j60501nm242idf2ig0h7p6wrg58n5v2p6zfym56v9pbvnbmns0s"; + sha256 = "18j3xyzchlslcrkycr2i59jg73cb6yh5s7l3qnl6sa7vgxcbhq7c"; }; nativeBuildInputs = with python3Packages; [ sphinx setuptools_scm ]; propagatedBuildInputs = with python3Packages; [ python3Packages.setuptools python3Packages.notmuch chardet dkimpy - ] ++ stdenv.lib.optional (!python3Packages.isPy3k) subprocess32; + ]; + + checkInputs = with python3Packages; [ + freezegun notmuch + ]; makeWrapperArgs = [ ''--prefix PATH ':' "${notmuch}/bin"'' @@ -33,7 +37,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { - homepage = https://github.com/afewmail/afew; + homepage = "https://github.com/afewmail/afew"; description = "An initial tagging script for notmuch mail"; license = licenses.isc; maintainers = with maintainers; [ andir flokli ]; diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 7d62aa43888e3..171136ce22cad 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://astroidmail.github.io/; + homepage = "https://astroidmail.github.io/"; description = "GTK frontend to the notmuch mail system"; maintainers = with maintainers; [ bdimcheff SuprDewd ]; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix index e7c9d50cb9be1..055aa15b2ec8d 100644 --- a/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -1,16 +1,32 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk3, gmime, gnutls, - webkitgtk, libesmtp, openssl, libnotify, gtkspell3, gpgme, - libcanberra-gtk3, libsecret, gtksourceview, gobject-introspection, - wrapGAppsHook +{ stdenv +, fetchurl +, glib +, gmime3 +, gnutls +, gobject-introspection +, gpgme +, gtk3 +, gtksourceview +, gtkspell3 +, intltool +, libcanberra-gtk3 +, libesmtp +, libical +, libnotify +, libsecret +, openssl +, pkgconfig +, webkitgtk +, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "balsa"; - version = "2.5.9"; + version = "2.6.1"; src = fetchurl { url = "https://pawsa.fedorapeople.org/balsa/${pname}-${version}.tar.bz2"; - sha256 = "19gs1qfvbk9qx4rjmgrmvid00kl9k153zjjx8zjii2lz09w7g19i"; + sha256 = "1xkxx801p7sbfkn0bh3cz85wra4xf1z1zhjqqc80z1z1nln7fhb4"; }; nativeBuildInputs = [ @@ -22,23 +38,23 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gtk3 - gmime + gmime3 gnutls - webkitgtk - openssl - libnotify - gtkspell3 gpgme - libcanberra-gtk3 + gtk3 gtksourceview - libsecret + gtkspell3 + libcanberra-gtk3 libesmtp + libical + libnotify + libsecret + openssl + webkitgtk ]; configureFlags = [ "--with-canberra" - "--with-gpgme" "--with-gtksourceview" "--with-libsecret" "--with-ssl" @@ -52,7 +68,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://pawsa.fedorapeople.org/balsa/; + homepage = "http://pawsa.fedorapeople.org/balsa/"; description = "An e-mail client for GNOME"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix index 49f0ac5336594..b02788e677224 100644 --- a/pkgs/applications/networking/mailreaders/hasmail/default.nix +++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { sha256 = "1p6kwa5xk1mb1fkkxz1b5rcyp5kb4zc8nfif1gk6fab6wbdj9ia1"; }; - modSha256 = "0z3asz7v1izg81f9xifx9s2sp5hly173hajsn9idi3bkv0h78is2"; + vendorSha256 = "0sblgjmn3i3k31jfq5zy3bx7bv5z2cg6rjzr7aj87c57yhzzcmk7"; nativeBuildInputs = [ pkgconfig @@ -38,4 +38,4 @@ buildGoModule rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index 38e4bf5d71057..b677d82dce47b 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -10,12 +10,15 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "0f65sg6hhv6778fxwsz4hvarbm97dsb8jj0mg7a9qs273r35pqck"; }; + makeFlags = [ + "SSLCAFILE=/etc/ssl/certs/ca-bundle.crt" + "PREFIX=$(out)" + ]; - makeFlagsArray = "PREFIX=$(out)"; propagatedBuildInputs = [ openssl pcre lua ]; meta = { - homepage = https://github.com/lefcha/imapfilter; + homepage = "https://github.com/lefcha/imapfilter"; description = "Mail filtering utility"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix index 44b97fb3793c9..3dd03c9712032 100644 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Console-based email client"; - homepage = https://lumail.org/; + homepage = "https://lumail.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [orivej]; diff --git a/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/pkgs/applications/networking/mailreaders/mailcheck/default.nix index ffa3e92d390ce..96ce99580fcbc 100644 --- a/pkgs/applications/networking/mailreaders/mailcheck/default.nix +++ b/pkgs/applications/networking/mailreaders/mailcheck/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple command line tool to check for new messages"; - homepage = http://mailcheck.sourceforge.net/; + homepage = "http://mailcheck.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ kovirobi ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 4cbaee4488b15..8341cc63092cd 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -41,7 +41,7 @@ in pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "An extensible mail notification daemon"; - homepage = https://github.com/pulb/mailnag; + homepage = "https://github.com/pulb/mailnag"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 89231939bfbcf..6bd0995623db2 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -41,7 +41,7 @@ python2Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A modern, fast web-mail client with user-friendly encryption and privacy features"; - homepage = https://www.mailpile.is/; + homepage = "https://www.mailpile.is/"; license = [ licenses.asl20 licenses.agpl3 ]; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index ba8f272203bc3..fc9001e59e322 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, fetchpatch, libiconv }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, libiconv, ruby ? null }: stdenv.mkDerivation rec { pname = "mblaze"; version = "0.5.1"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ ruby ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; src = fetchFromGitHub { owner = "chneukirchen"; @@ -24,10 +24,12 @@ stdenv.mkDerivation rec { postInstall = '' install -Dm644 -t $out/share/zsh/site-functions contrib/_mblaze + '' + lib.optionalString (ruby != null) '' + install -Dt $out/bin contrib/msuck contrib/mblow ''; - meta = with stdenv.lib; { - homepage = https://github.com/chneukirchen/mblaze; + meta = with lib; { + homepage = "https://github.com/chneukirchen/mblaze"; description = "Unix utilities to deal with Maildir"; license = licenses.cc0; platforms = platforms.all; diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix index 2fb30e5ae6ada..c7554fc84b085 100644 --- a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix +++ b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/flokli/mlarchive2maildir; + homepage = "https://github.com/flokli/mlarchive2maildir"; description = "Imports mail from (pipermail) archives into a maildir"; license = licenses.mit; maintainers = with maintainers; [ andir flokli ]; diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix index fc8c167e98496..3461b3b560f95 100644 --- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix +++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Viewer for .msg files (MS Outlook)"; - homepage = https://www.washington.edu/alpine/; + homepage = "https://www.washington.edu/alpine/"; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index a53e1abc1861f..e82769ad317ad 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.13.5"; + version = "1.14.1"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0lx65a44b03rbvcrz0y9syrik67fx3hvblxyyvz5l9bb7rdipmvc"; + sha256 = "09a4hhl9h6y57yfq1gx83fzqxp3wb88y17rl8f54ndpp6p1n9m9m"; }; patches = optional smimeSupport (fetchpatch { @@ -88,9 +88,9 @@ stdenv.mkDerivation rec { meta = { description = "A small but very powerful text-based mail client"; - homepage = http://www.mutt.org; + homepage = "http://www.mutt.org"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ the-kenny rnhmjoj ]; + maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index bcd35510dce37..ad7b4debd3f2c 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell, sqlite, zlib +, glibcLocales }: stdenv.mkDerivation rec { - version = "20200320"; + version = "20200501"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "06xcl9pr8dna4kqjaqm7ss50gdy185425bwl31i0xs3l11cyjap4"; + sha256 = "1xrs2bagrcg489zp7g39l3rrpgz8n1ji9cbr21wrnasfbhqcsmnx"; }; buildInputs = [ @@ -75,11 +76,26 @@ stdenv.mkDerivation rec { doCheck = true; + preCheck = '' + cp -r ${fetchFromGitHub { + owner = "neomutt"; + repo = "neomutt-test-files"; + rev = "1ee274e9ae1330fb901eb7b8275b3079d7869222"; + sha256 = "0dhilz4rr7616jh8jcvh50a3rr09in43nsv72mm6f3vfklcqincp"; + }} $(pwd)/test-files + (cd test-files && ./setup.sh) + + export NEOMUTT_TEST_DIR=$(pwd)/test-files + export LC_ALL="en_US.UTF-8" + ''; + + checkInputs = [ glibcLocales ]; checkTarget = "test"; + postCheck = "unset NEOMUTT_TEST_DIR"; meta = with stdenv.lib; { description = "A small but very powerful text-based mail client"; - homepage = http://www.neomutt.org; + homepage = "http://www.neomutt.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ma27 ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/pkgs/applications/networking/mailreaders/notbit/default.nix index 370c4f8388704..868037c33c1ae 100644 --- a/pkgs/applications/networking/mailreaders/notbit/default.nix +++ b/pkgs/applications/networking/mailreaders/notbit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "A minimal Bitmessage client"; - homepage = https://github.com/bpeel/notbit; + homepage = "https://github.com/bpeel/notbit"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ mog ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index 86aef50113421..19b90b534efb4 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Address lookup tool for Notmuch in C"; - homepage = https://github.com/aperezdc/notmuch-addrlookup-c; + homepage = "https://github.com/aperezdc/notmuch-addrlookup-c"; maintainers = with maintainers; [ mog ]; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix index d9eae3c9c5034..0b2a76cc00f8d 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/wangp/bower; + homepage = "https://github.com/wangp/bower"; description = "A curses terminal client for the Notmuch email system"; maintainers = with maintainers; [ erictapen ]; license = licenses.gpl3; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index e4a09ec5a161e..26f47dba4617a 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions" "--bashcompletiondir=${placeholder "out"}/share/bash-completion/completions" - "--infodir=${placeholder "info"}" + "--infodir=${placeholder "info"}/share/info" ] ++ optional (!withEmacs) "--without-emacs" ++ optional (withEmacs) "--emacslispdir=${placeholder "emacs"}/share/emacs/site-lisp" ++ optional (isNull ruby) "--without-ruby"; @@ -94,9 +94,9 @@ stdenv.mkDerivation rec { meta = { description = "Mail indexer"; - homepage = https://notmuchmail.org/; + homepage = "https://notmuchmail.org/"; license = licenses.gpl3; - maintainers = with maintainers; [ flokli puckipedia the-kenny ]; + maintainers = with maintainers; [ flokli puckipedia ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix index 7382b97ba8113..18264c5c6af48 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit version; description = "Mutt support for notmuch"; - homepage = https://notmuchmail.org/; + homepage = "https://notmuchmail.org/"; license = with licenses; gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 8e1f672012072..8f268e67c3042 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ++ optional sslSupport "--enable-ssl"; meta = { - homepage = http://sylpheed.sraoss.jp/en/; + homepage = "http://sylpheed.sraoss.jp/en/"; description = "Lightweight and user-friendly e-mail client"; maintainers = with maintainers; [ eelco ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index f46e355cd570f..e9217c84fc69a 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -180,10 +180,10 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { description = "Mozilla Thunderbird, a full-featured email client (binary package)"; - homepage = http://www.mozilla.org/thunderbird/; + homepage = "http://www.mozilla.org/thunderbird/"; license = { free = false; - url = http://www.mozilla.org/en-US/foundation/trademarks/policy/; + url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/"; }; maintainers = with stdenv.lib.maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 39950bd58c5e8..c7c5dab282eec 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,615 +1,615 @@ { - version = "68.7.0"; + version = "68.8.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ar/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ar/thunderbird-68.8.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "549c2fde5a7da05f1d0da28e6e203fffef5cc7d39073baef204da5ce221fdb12da53da64b29dc84cf4518eaee7394db71cee6e22611d5d86938df1b9b3bf8e0b"; + sha512 = "0f604cf3e5efff225cc544b3f289056be05ec430cf1481162f3ab1a84234660802c2777de1552f2900ca9cbf43ff13a468d3c97a44896ea02189471676243d22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ast/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ast/thunderbird-68.8.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "92fa156e6dd72d9c0a6b0b6889e7486d97922cad3d8c8a4e572b048ff5694cd4fcd7f7f91eff718417760b72a50d045e5508befb8404f9343ec73633c8c43040"; + sha512 = "4c5a5dfdc6d81577df445cee8e4f875c95394f87037feffd47fa22bf4e153fc260f48676e8ff005d3248c31aa346b6756ba9468ae95e542e5814c5a98cfcf7e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/be/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/be/thunderbird-68.8.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "1ddce136d33b7eb6065cc1fa02f3e167b76a546308a19edf51f1102e569b259cb2bbd98d720050d48669ae04610cde6c09400ae6a9f467d611f3a5d332dcf203"; + sha512 = "fca5948534a7de3c8a6dafab22e45478b79c20d1722d58fc3f423e3c792d754bcf63993b9a8c1f1c6758ea1585dd700b1ce7631a21274b0f8a05e631992ae5ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/bg/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/bg/thunderbird-68.8.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "31aeab60348dcb199e3fee7c167eccb8e02e98a62c0a30ad48d2963fda56a1cf25ff71eb9f16bc186db481fa90d795191c6aa29eef33742adab6e2df0c2e5282"; + sha512 = "907d252bdc8cf65b8d42ca5ee95cd7f43efe48f44d822558139ee04cee2b628966e11599f1d6db0ef5cff33a8ae424d514dc1df4e049a36432647dd3fa1039bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/br/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/br/thunderbird-68.8.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "f1555dbb5e30ad7d9d7468473f042424e9abd159a85325af55fdda74963c54e780f76093d15a2fc23a555b22896c6a76ad4c449846611222b63d13745cb577b7"; + sha512 = "ca82cbb9f61c6ee285a7b075c79aaf4ae09a86b009ea004818fffb7abd8a12708943e5f2edeb89362f7841ed5f6b9099c9e15f6a7efb2dc261a1e63e569d83c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ca/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ca/thunderbird-68.8.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "44e0a8cb1feda921b6a3afb6ef0f72d2ad3aaf681f908673c015ef43a660914df5a8b61a6d987c3ddb0b6abc6cd778e0ddb07c56c737a74848942e26d4ee45a2"; + sha512 = "3cc29b0a077b48ea0ab0d3cde6fb9cf6fe6cdcb1ea914be6ed6d38e1bf382f910fad7920e918d2c9c9131845bb24b2818cfc45349270ff636e8bc216fd2b3059"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/cak/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/cak/thunderbird-68.8.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "e907643f6c7065117fd131d24b452734c229fad3bace6d445de15757ffbed875fdc69dcfc535cbe7b00b38df30c0b69b378b50560382e57fabff166c71d7ea33"; + sha512 = "184f74a10722a72ad622c54f221b62193259cdd54cd9dc4d71326219fd6dc533c723d5e926bfa0e7a3231a41864fefe578030329f0e24765ddad7459945cc75d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/cs/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/cs/thunderbird-68.8.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "1b65fe735bb61d2dbcd2d23ede39e7770a66feb6f898ec31cb7c198fdf95796d4f42876730fdb993767026c4c315a9be9cb53229cc21a5328ff443bc463ca4c3"; + sha512 = "1f76a6f2e9a4804c697d2842389d9fe0aaf1e8b30eaaf0aaf9ccd252c64a20d10b876011ec6cf54e4d6778d03a51673f4d941d1875ba66d31946bd446006daf8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/cy/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/cy/thunderbird-68.8.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "77a3beb1ce6e78fb1d5138a7f0021462efb96e7f1d13cae2213670016a4a89dbd4a46bbe0e588ad15957ec71d053643cbd01033d9cdcc4e91b9e0303726abc27"; + sha512 = "28f9314997024728691ea43b4bb2eec51a8ce8a0da26025c1f6213eb2f20c140dee0c87950a325589c7af8b037f7378025dc05346a7156ee8ea200e89705ed84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/da/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/da/thunderbird-68.8.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "b9d12257b5b4fae31cb70edf36ff02d48dc56481b37fa3f3a65bacadc38d772e407d7c1382899179299c23d70e55652c1d05f8ada855621a9db5f300b9c983a7"; + sha512 = "d65d1b71b93b08bf783a691b26d39a6749c3b0ece109889ea9342f8dce681e47d4785010548f388d943e10632e9539f9747eb4b9ec7da524d8087300961fe3df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/de/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/de/thunderbird-68.8.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "c84cd6e76e18207ed02209bb333e922e3dc928c0f0ecd0243f4f8024d49c3ad1f4c3268dde921ced90a77cacffcd41eac82beab65d226dedcd07fd7a2f821a00"; + sha512 = "e140fe5153f3c2eadc5bac3891d4c2d2e03e0823da146d78c21884a28bbaa1fc1ea394c726bceaa20ffd2bfd8c1f841966de22fedd3e789b39b8dfabc2bbd930"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/dsb/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/dsb/thunderbird-68.8.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "e29bd848258aa5b04eb60391183bead511ad8bdee038994a84982d068312c97b2e490cb5abe3821825101ed313c503c5c679e42d79011aab89bd116af7807276"; + sha512 = "6c17e859826e48d59777a022273540696ec9c1da026922b46f4538067e34561d3717d2e4d092eae8de9c98bdf7d06a76ddc1af7f2832cd690a466a05d0e0e317"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/el/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/el/thunderbird-68.8.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "b203b8cb46f51f5dd176aabfc720eadc41ed081094c8feed87658885025ba4aef422ac19f4b4773976c42c4f8ce38aa80b39bc75f56c42ec59f5313ce4b98111"; + sha512 = "c6d830ad93e67262e22dfc1b2551bd40034a3867fa61e5a4bba773db98405fc8c7683c5f606c591242ce95f1c520d754fbeb3eebb36458e3d78a4b8b19c5a3cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/en-GB/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/en-GB/thunderbird-68.8.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "998aaa3ea0dcc387568802f367ea1637806a1dc19929ac8875ab4823c691c84004f62c6450b3c4439b88e017774ecbd4abfa38f72661fd9ce97208fe920060e4"; + sha512 = "b39dc8f17de38c94332ed3dabfcd29bd8d8334e83010630cf2fc19f2a601dba9d6db64140a604dd4e1fb401d4d5dca718795503345a4e7bdab666e6fa7776d9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/en-US/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/en-US/thunderbird-68.8.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "583e9a08aff1d3e4be47e5a9f31b7595109e25a4062a36e8640468a354e29a47f389062db5fa134af6c231af5fb1caaa31368584fa662105100419a64134f0ac"; + sha512 = "ba1a090f72aa286d94dded8edfbadc7b9c05c4a7f37d485d0d91275dd97ec40322241b3c74f3c183ed13a6cdf6b1d8667858539fba130514eed72dc54e1f4a90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/es-AR/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/es-AR/thunderbird-68.8.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "d976f3b916430388af3a50f58253cd4ddcaa5adef935b3965c71f38e938a8e3ad28f7ea8d83d4a9e0d0c85d29a1613547a95d4c9c4917159dce06d700e3f8122"; + sha512 = "8b280a3329421c9949821d78c891b7a0b9f7ac6e7ad40f99e49233ad6b3848188e7ed42c40bbaa67a31b270cb19644b033d4046ebeed0b1031567a2988ba98ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/es-ES/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/es-ES/thunderbird-68.8.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "e51afeb81b39f6f3e7c501a0d5ca839d87794ed3a7f04ce552175a7f1227fee9667dec917a0c13d509687e31d6d87516bd5580dfe0158a964b13e4c26c82fb52"; + sha512 = "4f103d329c694c6b9d676739936ecb1fc61e23d7210252d8c87a28c916f063ef15437cb57949b5935269c922bc0221e2e9c6d536152503b087f0f00ea0946777"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/et/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/et/thunderbird-68.8.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "60872a5306f154af3e2b9e58dfecf6135927464c92a3a6cac7c44fb934cc074eefeef6bbb6242e7403aaad3e1fb850d475efb07aaa80a07043f213960b92bd3b"; + sha512 = "a3e61bfd84ac0c2087abdd2c311c53533ebcc79a87289469aa1708e4d276d44f41ddd657afec21b93d0b499a003014d500939af9d6bd0d4773072019cc19f59c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/eu/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/eu/thunderbird-68.8.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "5f774a38904b5881d0a5bdf0ddad71fa7f85db82daf7879de54d337e8dae17021267b1a289676a11daf1e96572f2734f74a29327f23636e8b38aed084b874bd7"; + sha512 = "898add1a1d7315993b18b2e0d0851f07379c346efe905ca1ef8ee9e5fb249f819b720a1de127ce558b576c0c6b4916c52069d117a0d050414ccdeee239e04e11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/fi/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/fi/thunderbird-68.8.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "0d977cbd85d7f1360e985844cc8ee433414abc3d10b8a33b2fbb9a03fdddcf3a91018edc12a12d96cc680d2c119e0c020549bd40cc10db9eba4188805e40dea8"; + sha512 = "d8e6a78f615af1d99c5d23ad050e49add43b06e3cccc727dae512a066d348adda414869adebcce1a4d6b32b0bf666e3a793c9150f521591fd53ab3bb2df04f25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/fr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/fr/thunderbird-68.8.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "dc6d20875579d8e788a236885859faee3ca61d83aa051a48bfe18c484afec986353c1493e7e68181a83fea7a42ee62c29d3f71cc053873743959513dddf6e8ce"; + sha512 = "67541072216f3362d81bd0f2894a735562ad6703f583b51cfd114e9f591b3f4f7bf9ba70573f124e5209ff805e192d19ab37df6068306ed34ac98ef9292e7edd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/fy-NL/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/fy-NL/thunderbird-68.8.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "add2c509cb15cebc5dc77957c44e26a80ee52eda82f395308303216ebf14d13c09338f7bee14bad46ad0ffa8187008e7f4cc101c712029ff15b3ce14904c0a69"; + sha512 = "1a2be59965ab12c8380373e0dfff660b62d6f9121549799055cb0318dc40bb517b64d203b7c18c80814f0f1a1426db04781ddc896bdcc5c679f7de234fe35068"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ga-IE/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ga-IE/thunderbird-68.8.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "d1771c8282253a80ed62dca8f49797796f202da66e2a607d27dee89a1a8fe556dda440bc03d441b8b63bf732cd9c0960ebf9b9cc047de9c07e901a1051dfc94b"; + sha512 = "37159206d5d6533b431ed445bd0fe7d22b654531a4f0f9313db35b8c2c55345d1f6cad18a1711aab6042a082324a843e3362a1399ecb20b3595575dea356b220"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/gd/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/gd/thunderbird-68.8.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "ea0f6d6287ef4e771c49b4891a4d9dff8b9766e444087456448e9ebe32c17e41d5cd9c9a17747250c393e389720a6ecb3bc6df98dc5c81f26504fc9cd6ea3e03"; + sha512 = "b42fe49465f0bfc3d950006be6d6422f60572ad3e6be69e0bf78123e4672d5e93bc1abffc51226608a23a8786cd8689f46819cd1e098f38d94b201038ee7bf5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/gl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/gl/thunderbird-68.8.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "487af69af4e9844a97d72e14a9de8f8aaf8f45efee6f72ad0d5b310019d6fe73c74288b3e4c7d2a83f6e30cb5b3fbeab2d2200d406814e6e25936ccefdbb5f14"; + sha512 = "58be0afc433eb4ea47a2467efe8470cb710b56624cb64c308a7e54955b2792fef72b2f697e3055f86faee51f17a4e111f25f23e88e2e48f2377474e59a555d21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/he/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/he/thunderbird-68.8.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "13f43a849b765ed9743947c9e03fe9cb7bffcf120446ec80e8622ae1ecc7994497617464e7597a1e883520598f5de2404e2901b8d30cc91fad78dfe58763da20"; + sha512 = "15c24a2abfc20cd8ce7207f45707bb691b742ff07aa90cce1a79dbc20199ee06bb6f80d2db7cae521672678f37b824c567cc21844e234bb4e132866da490389d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/hr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/hr/thunderbird-68.8.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "bbcb86e67a1975920a3e0fd4298b817103fbf88eea05e822eeb89f60f4690164c90940e32082cbcc19fb9222f53c30b32c39eb041a768b1f8cdf61ae866abd13"; + sha512 = "c4bd90516b22c77ea3fe667d198dc9e304b06495bad96715ea90172488b09083920099d282768d11ff86b1518cf0a9d56613c9243ab7416b0495addd85081822"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/hsb/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/hsb/thunderbird-68.8.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "23c9d885024b178a37de1f968def6e338fb1e44d2414f01d6b8757e3be082ab4b5950ca6bfb0cfb93093ebcf57d061cfeb2c7c8c46ac56274ff495b83a7754e7"; + sha512 = "e1ff1afdbb83579308927301e683d8c515928ce3dc50ca45391c81d9f66c0af8a61ca4ae140634760e0c0e4f3420a560e837d8490444282b480aea6c23ed92f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/hu/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/hu/thunderbird-68.8.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "8076d47c0b15fb565ecda807c789d5eba41b1209df356fe2184d4550a115b7ea986bb51fb6e9e8a4a279ed6025b7acb8f5c7ca88e5ccd72e4556fdaaf95619fc"; + sha512 = "aaed51d4181ff7bd6eccd9801a21a653926ea448d8049c5a52a897f83a2cb463444e1f12d5c6d4a37b69a712a1bc5428a12d42eddb823c4a02732264fc5a1c1c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/hy-AM/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/hy-AM/thunderbird-68.8.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "825f0066a329fc3e35c6a2c9038a28c1e673b93767a020a6f4297dff5b769882d6550eb2cd293b232123223fbbb0f0e0d54893c98ae9f2e35072071a26171967"; + sha512 = "5df858d448b72d5a6f320048df9ec3cfb8c08914d7c7b63006eb01b1dc6c77e9b7487a951be7e89bc41922e9c3bb9087298a55ae9da146291ea1d284967bdc6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/id/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/id/thunderbird-68.8.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "253cc87eee92b10d9b74e7885e43d5d9b146694bed63ebbb1b5e63730b18feeef53de4581ae824ded77a5770c45fce8b46d90621212d4b0e1ab32ba5fc7df1b3"; + sha512 = "3ac1a1acd6b85404594caa11da1be1e55a980179a027b23fb323fb735c4d3bcf1ad12d25608d0f1ac3a89c30cd73a81fbb031112822fccb10e93d0c911504451"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/is/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/is/thunderbird-68.8.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "0e0784865fa1f0b57f5287674c94993263a03b8876fa6a053cb9bd52cef89a93a07dace1d2425ad669656ebc86a083e37faa456ee52481844e8e8e7fe87f3c85"; + sha512 = "fb9569aa59fb4a084fa1c578c4d1ac49765e2e1a5f8a2445081797999d6c877b2e4aa13879d03b54b3f885d5d1054647cd891cc38f7e54db58b5c58b7e906486"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/it/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/it/thunderbird-68.8.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "0eca59d5adf138f2be6b9c2cd11e51252e550b711f3f6584e6971ec3564630eebb7f1774dfed4f79c6b38f3218420825300bb447b0bddd0e16379aa787edd0f8"; + sha512 = "0c3063e9deebdb4ef1bd08f0d7c0208fe16363fb87c7de0bae772987fa5a3800baf723482506c5957ed0b641cc04cdfa9a80e3e200cacf0eafd9b5fc1870a3b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ja/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ja/thunderbird-68.8.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "6a112e7ae24616115f6b5dadc72bd30d8dd046b8df16ebae1d609199d9467259f83b354659a1358d70d2e1ad8c52e71db9991f95aff6f2864649d539b9f0f139"; + sha512 = "bd12eb6ba2ac0c2c7caab313b726909ba35b2eaf21d70c7df98bd970a18e943042c69b7269a038f7edb852d0036cd2e34273aae77a2a4e31dbc05b3c61ec251e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ka/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ka/thunderbird-68.8.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "e2c71035f910648cc83d92af69bd96f3a7668be2ac4ddfcd40c97762a1fa4e94c7d67b9ff588b27783ff943330ee07940fe0f8bf1671dfd87dd34a23b78b55cf"; + sha512 = "1ba48f3544e179b75c972c376a2dad256b7657124af9b4037cdef8a87bc0a3e237be79be8a53cf5286f6f5bfd048ecfa6f09624d4559bf5eb38432b4864995ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/kab/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/kab/thunderbird-68.8.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "4e1a72147657fc0706f3cd4c4511fc22949fdb5e90e5d17a080b5c814240451d030ccb4c287ec6901d1dfd8a7ebfd74d59e617ca73530fd20c0b4fad539f9154"; + sha512 = "5f598ae0de491cf253860c87eb80fa15e1fbbd06f17667f0a78747f412ad8fee9b4a472c1a89f096c9e765ad289ad8d80f86aed50b538e52c68188c41caffa3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/kk/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/kk/thunderbird-68.8.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "61cbaa5aa674a4b6a34869f271d93234d874fdf49231b0ebf3c882863b294a0e2e0447bc81c8980c7f27c5dda4e8c29ace091c7097870d4109aa1f4718379099"; + sha512 = "7e9d7cb00122945a2b74650b71712d1c761cc6df93de74c11812f0d39d25666c911beba60eba97376d9c1212ad0604577cfb46053052be420da1d2f6d53ad445"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ko/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ko/thunderbird-68.8.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "b2d3be58c8af63b3a94888e8365cd7253858733686ee30776c61ccbb8e05db57882158ad3a9aa5af6e319c875e870bb52dae9dd8c834ea5643e811dd948b6fd2"; + sha512 = "5c4406cb82a5dc18235d158fc756eeeaa51bb2e791663ef00d315a56a595fa6290f030f0cad726a9ef98706a80146fe63a3cd5d3edea6869f7ceb4aeb1b7676e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/lt/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/lt/thunderbird-68.8.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "e878eefffd3ada9d49c3a692fe1a968159d8fd23ec8660cb71ce8019034e10c905f1acb79c6122384c7b18f3da3d1e6b91e31807c9d88ae799175fae2ef18005"; + sha512 = "3bb3655934068fcb965fb73dd8ff455e48ea4cfe578e0f33a0c442f1f001731aef9fd3d426cf720b9decf610192d1d7722f408e9b8362e25932c3715e396ae27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ms/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ms/thunderbird-68.8.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "1d6094b7ea3fbdd40d278a60684b2e2357c1608e3403037a761038460dd1c89149f3f010a9f93d795f3f408acb81c3b6fa2b5ce206f5550352db6391895fb0f3"; + sha512 = "0c6635d9e366a85b29549ba3329861d7912f9e1493bc7becb8cfa0225980c0c67b8e671f4f841a5aebb17e123ac4d38aa90ce9cc0bf72525918557a474262931"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/nb-NO/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/nb-NO/thunderbird-68.8.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "0deb1e4fb220c9b17bd68ddec7bf4569ee8425528a6586f5cdadd17f7c1948f933070700d36d7c6cc9442c172d6bb302d2681716abac131c9777d8b57d4f0a4c"; + sha512 = "2c9cca7bd403a0a20ad1911d924555612e8eba7b572d4ac3cc3d1fecf3ff294c729147e77675be1f1026702b41000e43b0930815cf08ea03f7fde757266bc15e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/nl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/nl/thunderbird-68.8.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "24c5100339da2ea1df96d515c1529f02b0132385e141520d7a2c94d194ca71a634310eb26f3a88ea0cd6a8ad0a56f33ce5055bce19c68e3465037afe33a85550"; + sha512 = "a16f58d19f6ec59e9dd557a3b1cf8cc22326596d5505289b93bcd04e801e551608a286df03832e4711b91887c9a408bf36364e9a47be4840a828ce53e0f96f49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/nn-NO/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/nn-NO/thunderbird-68.8.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "525675451d274d17d3b5dbd1d3b75d3475b3c29f32b5d0813c71d5cff6c8002f35038ee7801c245d0b2cefa596ba4288c4287a6fed66905b6497591cca96be61"; + sha512 = "10a0ce11cf64713079143cf8f357f8abc5001e9d285eb56b4c7e9f4f560d660de7e3bce544b7099e588f599a4a4b1c73241ea5e542d149d41dc8a4ccf21b332e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/pl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/pl/thunderbird-68.8.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "3ef251ebd90637c11cb64f00f429611a2621fc5841e91fa51d7a3ba97d1244ddcf383c8b0011abb009935a59bab58a3bba52e3c4db05483b28c400dbd500ba42"; + sha512 = "8a6fec22b065d43ba320508992dca6d21f0782d4c4c28dbc6721852029f74c45b1451002c03f5deac70f09f3e9d07fcb161dd1a3943239231d10da4b2972f7ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/pt-BR/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/pt-BR/thunderbird-68.8.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "fe80b879e307d6ca192bae16e13df892bc837e0e216562c4a4ddf7ae3c526e2967cdf8f8291e53a450f70759025303b2195f7e2acf683cca9d8620a00d8ed69f"; + sha512 = "d57e6e42fef8a13bbe515089d2ee761509f464cc0a97a984e369bd96022dba7cd15dd40aaa9715b63531a161d708e06ec809bcda56c92968da1f11f5e66e62ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/pt-PT/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/pt-PT/thunderbird-68.8.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "437e5390889424f126a1a229bf8c66881ac4a98d300f6308e242c5f2386d443c1977c52f78fe9e2b620952d181c14c35692718ff447d267c000e1ccc8cdafd5d"; + sha512 = "064d2b04a60bceb7e300ec5f71e13fd1dd427bb89ae471760dc1933c574a36427581bd0d671335e9f52cdfc33f6b9addafcc703a093e2223d58e96e90982c491"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/rm/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/rm/thunderbird-68.8.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "d76f9f0e992da2e28e69b20a1ae532c8e98415825d41ee5716c34639abd1a3bb456d8645a108d17423bfac848f8e8a340358ccfc2635794cc703764d6f8de0a9"; + sha512 = "4a3025096ce81672a45de762c2ec2fa43d302310206fe04331fb6bd12d73e49427c3a9b9576f39fcfedceaedfa4d44f044b26245b15a8c2ef2fd8e127befe70a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ro/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ro/thunderbird-68.8.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "0485cdcdf247ed4bd67420fe7919f7f9d845e3c369c80960d92e448c48e3ce7e55c03ddbce16aed6de84da70a5e7610d8be5f55c5f53dc4568ac712b92a7153c"; + sha512 = "7b28416c0e2cbf248a7ab9cb6d72b5280f7e60f7bf8925a45575afb9a549dbed39f38a9d9984864d7c9dd246546b7597fa51ef7dc14597330fc4cd80cfebe95b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ru/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ru/thunderbird-68.8.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "96b28866dd1e4b68846cd88adee09e4edb60af8d506f42838f3f5f1dadd59ef5339e8c331b2a8b6ed0d1ff482ed48d83861b9db174b28dce5ce90b619b3a237d"; + sha512 = "da97be95512ca48f688ff04c701bc7a0e351ad979f9c3ecf2c493aec79f694ecb09cb5399613262b90132934d6600852213d26a3281b48f1598aa692d2e13bd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/si/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/si/thunderbird-68.8.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "0ea525527ab09277fce4202f488778d838090d2d59fcb2f049b1869ff0a6d50f54eb22449dbd1063aa6b15d5e559dc119e36dbf97d8a7bbf22e9ac4971393a1e"; + sha512 = "d97a111b90bea06760ea58dcafdfb279de340ea1cdecde008e47f9eb101e77e39466890e70f874bcb7f6061de96ce32807476da7aa97c867bf8d9ac4c4d022ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sk/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/sk/thunderbird-68.8.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "26280b266d2a7956321854ec57737d8cd4ff6ecc938ca07304431e6f351f73ea43e2213e28797d0bc994e0174da41108421a957054a00adca97cc630c107e4b9"; + sha512 = "f35670ec66342aa95c50d5cff47a9eff9faf3123174bbf5cf4156bbb1fd3ba98f47972328c0c33513cb92767e0a5dc67550a4a3259981c84b1bca035731544d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/sl/thunderbird-68.8.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "3cf380bb8bab8917e3643eaa337e8382e73802d725ca6134e73fc9d991d9e137b6681fb2aaa86aa83cf6766c3f536406298a4962b97175cf63bbf81142b75618"; + sha512 = "49a9f388c696c1708b0bf76dbe3fb7a2836c128f6d40055c585f83c0b62b84b5efa3cc4e2c26889846045340ed8bf95fead053e79b8d7064b1488c3d306d9c94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sq/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/sq/thunderbird-68.8.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "daeeb1a66f65e2da8ef2a6e3c59eb07bc341bebd19a79cce606d787d16f674e2d52decb17ae12125a7df78ecdb7c7a693644b17aa726ce1fd424fd30bb05ae43"; + sha512 = "77e9090243b04cc1f0e3dbd074f55f40949556f0284962d5a4cdac53f7c31ca2740fc71602d6eb7b391f0ad71c9a8e81e699ea94871f209c5771745241783698"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/sr/thunderbird-68.8.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "01a71c036d95587adb010cdd0f0641c4559af557c3596b16e43d11accddf64290d06ed5b35ab8d0b640b9242157b04a899ded266a47ad7bf2a07e3b923bc6fb7"; + sha512 = "9fb67b03585edba5b1d25d4d5667f1cde44e53b7b9c32730fa294e2118698c63527c0abaecc90b2778943490f9167d8bc2cd4bba2aca7054a592fe653a11c759"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sv-SE/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/sv-SE/thunderbird-68.8.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "28abf6b95fc03abd0f8d5008a1a3ba5b46138a616750b20e8f7be08fc2307cc75ef0e1ac3b8e29e37542553de502d07c092a771cc94c9b794da6a5bd268e3c6e"; + sha512 = "d8aa3a745266ab30aa8c32c7ef034576ec293a02f214f8ce96beefecba877e2de3b7944aeca9a218dc587ab77b95f327a619bab5c192857327810c6e81e1b05f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/tr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/tr/thunderbird-68.8.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "a7cb235bf1db3dfc5f7bed0fb92c327fedeb2f319c602bc13727b3c452305345a053405f77895611d294578a96eb8dfe7c7e9f008c531fa2acddfc81679391b6"; + sha512 = "56ac7582ffd7fb8c0c8bc02216c2d0a5d4405e356385406c7fd6ae545d128c8c18488e75ea8d8d63de9313aa48f2fc93f3e5e1947298b2b32937af8d40c0fa51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/uk/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/uk/thunderbird-68.8.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "0fd2ea32ce4ef03150db5234561546f45724e399fb12967a4ecde42149a81f4609505bd1da5cf85ae745e71768b93738c2885c4c7ace9b7b0063d6ace566bbb5"; + sha512 = "d783440bdf153ee044204f1b1739f1fa771bfac6d8ed4c5e6fa2b72d406e3c50b3e76b5f9b644fcf5b5e0183584a51336670d5788a949070994206db7187c8e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/uz/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/uz/thunderbird-68.8.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "4394e70e02ef67428b74af0b1d35ea06964b71a23d5a0d73afa2e6fdbe8d23286abde651b17a48a2353a1ac762d5a8b169f8e699a79644f00340b05e204f05c8"; + sha512 = "7aa40bf1d31cc59d42f90f821b75a75610ca2a66a37003d103f1aaa83d5897388599d41a61346f614db7005bf14fbe0c45cfabbe3dc304c9a2704d2c5466362f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/vi/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/vi/thunderbird-68.8.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "e1eeb7b46a9ece66fc40d2d58d2781fea4cca320a97b6cfeddd02f3f6907b44539f4400390467a794cbadde50c8ffe350fb08d8012f207db60d36a61d205a368"; + sha512 = "ebe1eb9914f489e679d7b4935681b3c5c266e5cb3868507f662e1b4c6a5f791f8a653f3d1cf788758b9aed13fc436a76b20b80fd293563f25543af41372e2f7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/zh-CN/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/zh-CN/thunderbird-68.8.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "ab6839f46e41c14fbc588a59044496feb3e8a35aaaa1f0777212636e9b4dc5a6640b34a3f1e833239d5597f468960a947c0591373938306dd8bedd6c6e13283e"; + sha512 = "b15026fffffba21ef50c98a8fe391a3f949a300b104d9d238c07d154d4279b70228e261083a00aca529f69739d3e79a36da3919bbb3cc19043faf182c25464c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/zh-TW/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/zh-TW/thunderbird-68.8.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "4923f6c790335820811bad56494d24a5899c1586ab2344b3e2fc81a91651d9de5b378ec6ac0ec68597ee83a8dc0f24ef084a41bfcd98dbde128cf4831646db70"; + sha512 = "d5f654661851b4079e7fab3f71e4135f8928d59b822d87e8fa6cc8388fcd5aecc067a88790c27fa8bc4e7d95ff9fa123b8841efaa0e3eaa7bb9e97a50e2c7076"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ar/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ar/thunderbird-68.8.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "91b19e61a360062d71e090d7eb8dd78b1ff73fd3e7733573ff1ce6ef4e98c13fb297c219fda8c43c9d80299625ea8bf9566e25a5546f28d010737a399488f3fd"; + sha512 = "9608a6b9e2ad0fa3853f413ae644d5a1c9cf56432b3fe546ad9fb60cd6fda2f42cd8e1a4eff5ac4acc6b95817d03107d248cd6971f049f7f1d95419a3125b0cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ast/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ast/thunderbird-68.8.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "2edcc3b6d7c51c79b1539fe8fa4da53003af0379727ed658ca7523d608c96c251e8be6fea004098609d5b854ebfe6cc8b81830f8e1d359386edd2593f3eff6c7"; + sha512 = "1e06d68a8a7999005eee84e3da15c23c2bfc5b4fd03fd1c5ff9e8100f64f974bf894bd62e974d52db4ecf8030dc41de6446f797d83a62529679730b0f24861cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/be/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/be/thunderbird-68.8.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "84a76ba8031d25f6b097f66e4b0c74359ac313f25016c3b82e547d8e973814d8398697572014590f23ea094aad7941c13cb4130b618a776f6c4973356cccb30a"; + sha512 = "82122ff9a1b1327bd3164f1d7c8d18e47d63dbb2981765f7fa7499ebf26f2937f714cddf7882c6c47a6b4f4a480e5a43c44c35eb7a4769988461945ff657e48f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/bg/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/bg/thunderbird-68.8.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "b489ff67e47eb1d431f5b2f59f0d6b8cfcded889e167cea3a2d602057264a402769e44191ac015e15930faacf7acd9f1fccb87abbd438e3629db7b795b8fe43d"; + sha512 = "1d95aa7716f43591943be6f2f5eedf502cdcb5f08d262e359e3560da7198e9108052d0c5bc5b5d594fd2d8a2560f9332acd661f518c1e3f534843d65dffd02a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/br/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/br/thunderbird-68.8.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "3ffa33885f86bbf13f4c2a2bb15b864aec851b5558eba88e7a64e8b8b111169bf4e163e590491702465ec8436274ee72dd140a0bda2c9ba39754145de5501388"; + sha512 = "6ee97fb0942474747676c191c25c27fffd91810b3ce3d4ae24bac25c3dd90b99192210c242192d533d6e85497f3d4638b0c8d2e939bae93f4dc1648c6b5c9dee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ca/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ca/thunderbird-68.8.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "fad5eeda16877f0bfa5edfec10fd8fe5baf16a112aaf56c908c718159b0bb6b72ac314b93584536ca369d054059612fbf86c396d076158b6efc7a9d9cd2fff93"; + sha512 = "6b7a0e8b8e42b62585ccb333c16ffb19337afd2d68c673bb364f92248248a814ca57d6409a49959d2b8fa7bed1f9031bad1296e24ee7091e62b78a81c059a0bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/cak/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/cak/thunderbird-68.8.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "f4a0605533cfd5b0806c8412514de4478c520f52903a07c809df136b443ff0734be917444cec2d4c73301d0821d77e585c96bf314ab17deec4b4bd5036e83a97"; + sha512 = "faf8b1a06ffc96cbc6a16e09290652f7a9c270d8dae4aba0d5685d250f8686957341b68459affc8215522cdd6166d1b5e7c498713e9ad8c981d07a97156ca4ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/cs/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/cs/thunderbird-68.8.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "319f3a63a352a2f7831bb6d2d046d238db4c136cdc256934ac19fd4e8421344c98b4900c57a12f49af77d1844ffc8e8c7129c4ab9557d590affd59aaa0229ba4"; + sha512 = "5aaa310e3e67b174114b6c440cc1ceb2b7d0d934b10685ca89e3b7a1cc859bd026ca8fdb8607d70da16c039c853a9f1f11ef94701c90172220d988da03e902d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/cy/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/cy/thunderbird-68.8.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "4aa1974543b568168d06ec8c0004127cabab481fa798a67878a9bd5c1955d98d14d770383ef5e6af35dadc106fb20da46a1744a7156b3bfc582e416a32df1673"; + sha512 = "7523a32ca26e46cd388142850c96ae256fa2e7774f5552771b3ea13a2b632feab637a2552b762b1f4bc56b81f92bed3b8139e994b46b515e98070115dd3624e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/da/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/da/thunderbird-68.8.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "c587a13d45f5a5e94108252d8dc98548583ac7f27b35f3fc28100df0a15f696c04c68a4f786d7b9c3ee461db6120c14aef2b6ee14cfcabbe855f16ed00660861"; + sha512 = "0b528d5b0b4838fdb62e49c136f1d997ecfac946154a8c5515ac22a542e7c4e00c1a44dd8aefb4e20528301001d79c88e3fc97b60a10674ec4a3562c0807b508"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/de/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/de/thunderbird-68.8.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "5c425faa2c44d30b695ce6713b59e5720bbd8294aea20d1c7431f26173da0f6ca85b1cdb9f178e54ff670e109bc6c30abf21110df0c7029b5d5a01373c8b1510"; + sha512 = "792545f3fcbad3cb303bb5d91a90788374db1d41962180225f7d1ffaced19dd8b4352d36645df06926347dc31d6ff00eb0fee32efad27a15260115896e7cbcb0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/dsb/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/dsb/thunderbird-68.8.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "6ad04e1e43d0a7e4821c584a78b476262e77aa5f6c7d170806eb02d74b0d831f53e66568917837d11c11cb5ed19b796c23ba6d496573ca1da7029fb1eedbad9f"; + sha512 = "105c814511f32d85ede8c1991074bcde6ce72eb67280a883de13b69de4f74c4f97828dc3e5c170b1346ad22b4ad8b51329c3600979ca468bdbc444cc49b880bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/el/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/el/thunderbird-68.8.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "e9c7d89bbc736527ea9918151886705fec533969582ff37fe8e1acec3b6c1938fb33da4285c02ea92c2a87df1c6700c9c2223ca391ba342eb2e4e1fad8e06f8f"; + sha512 = "e7000a3e243b77cdaf6b46cff8380dfd1ecad3d07f69566f5d34f8e1ae15c582ef56eca8227fc75a8983bbb78736e935fe94dd1e7814e9b95158c9620985da4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/en-GB/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/en-GB/thunderbird-68.8.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "ead179d699feabcf14373aa4e02ec96f52e96f8a1413294f690d70608f2cf83fdfbccd1031f0430a0f3805bb230943d8aea269195d0f092334040d0c092cf9b7"; + sha512 = "87446eebfdc281eac83e7ad67900d06a2088b67d809f6f5ba1551a069a75d4ec4e642a241954671800ed4900b2930a11c4b8080fff06888c78acc0521d50e39e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/en-US/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/en-US/thunderbird-68.8.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "18309ddef56d0e7e50f3b5895e1c21c206b432da141c7517f9220686ada6523f7b0181e98a6722205bfe09d9023c4d2beeeb11ad60a7b6ec4242441bd60afcd0"; + sha512 = "644a6d2b6df53d624dbc26301640d4b5f601f60fafafbd4a1ed07583d9258f89a4276655686187e09268c25dd9ecf1d8400ba3bc7e6c55d21dbd19a034614bca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/es-AR/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/es-AR/thunderbird-68.8.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "d0a1ce2264c3663a529df667f800bb7e7ae446e09a5b0b09934e00ca18e523baca3943edf1bc2e3269a1b41399a47bd989b487e8650a0ce9a66b94b8bcb37726"; + sha512 = "227ddddf7bbf47527f8911b122d74f9c718639a3028ba56a22b2c93dd665521d82b543b0b0814b5bf1923fbc6ef2b39d52fa60616c1c5e5474de067b762c5af4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/es-ES/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/es-ES/thunderbird-68.8.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "5dc04a48b1997e0291265533351818b1912d73b9b002c8978f729006f7b406c03c27edf736a99d898ad9cb8328b40d732b27ca51e3f621740146b81968f87d8d"; + sha512 = "746cc55bfab6a7c71282ebf63738bd7f8c8cab67a01329a3d125a84bdc5a7c210958a52881734315612845a0d386baa75373cc26ce9c5f51c7ccbddbbd752db2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/et/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/et/thunderbird-68.8.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "8fdb9911b0da646fca7256fc0e004530339f6631fe3a91e1c0857b52d3d7f786a6fb8bf83cfea9e3c4e0faf6093d0b3afcd46a0dd1ce5c1357a40ff217393d6b"; + sha512 = "655bf1fe4942388f357d89c2e7cdeacc4c09f95e3c7a6e25d3991aebd571c6270d45fc52e4b80884c87705232d8113b50f28d657abe49f907878187e03f6b752"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/eu/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/eu/thunderbird-68.8.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "788cee146a94621d373e8d815daef246d58b46ab1e935b01dee3955fe695af43e7a482f287d611e98a376b137b5bcd5b92baed5ab322a39ef30d8815abff6640"; + sha512 = "4581e53d1202bd5fbca9b20979a71d51752e8f1883855510722f499489fa40d77070bc71834d371843e6d5a601e0bde8a6c86a5c1c9857a1150a792ca9aeebb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/fi/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/fi/thunderbird-68.8.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "b65e042905882d1c7fbc88bffb512b32fc91475b99c3b1bf6a4e10ed355f9bb3223a3c709273b0ad84c30ad3c6c405c07cb3e04eeb8a4938ec22bae3af4dfbe5"; + sha512 = "4109ca4d181485ead1ed865b101787c6d12879764fd5c399f73eeb23b157f09ad12f237d8b9460634441601d51e5cd4a3365657e3269aef614b6306339a3682f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/fr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/fr/thunderbird-68.8.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "a85af36139d6f7ab6028acaba61a8dd47c2fd6ef9114b5ae8783c78c85e16c606d72b05c15a299d1a0beb518301aeb65d3493d518b270bfb97f22c88d23bbc0a"; + sha512 = "53437450a3d67c79c4e44a223e846ac59eb2c534121e923649e0c44891437d5c180d15b43a00955706ada271ecfe651f1a9ca1c1e28830b200bbd6689411a536"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/fy-NL/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/fy-NL/thunderbird-68.8.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "60cc189b7eedc72327d3fce18809403014cc6b2c4dc53617cc8cd589dade6be25ade584416f9be18830f3c7a6060fad3e19bb930a591f17fdb3437b4597f48a6"; + sha512 = "5c9cecc67893973aafad3b2eba78e82fe459b70a5b467fbeb9839ddad93371b6f6d77f96dad6f7a757821645d680f561f1cda45a360e556229e6202d60f2a75f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ga-IE/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ga-IE/thunderbird-68.8.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "95b337d681a5292c0343bb545232b666268e5fbea0afd6b96122ff00e504da0a5628126a11495ba54d4e8500615d35b34de13851ad43f180bd9b5b1f584c7ec9"; + sha512 = "2e23ae199d505493dff47191c599d116749d7d4d362906ab9022e1cf3b06d41694247167c96a3c92d58fc7e6c39e850773b7a2dfc2e1a8dbc63385e20a4ffa87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/gd/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/gd/thunderbird-68.8.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "483a1bcc1a0066a962ed91c8f4c6f948623e3555d2977c593a473c5c08e12baf05fc4c043ef5db1fc839fb9f550764abe457f2d33e23ffc748ea6aa50d675101"; + sha512 = "1d703587272271a8787c0ea6020888b202f5f07f529e8f5e448b57adab781946625511941d37d6527e52d027d02be121ef8e5b0d6ff05494a2aad775bfa467e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/gl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/gl/thunderbird-68.8.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "0a88fc59510fa06757dd1b6994be0ceb8a0ad2cd1246077838756a0d65d6c01a64f8c48fc8ac87690686bdfea8c7d0b44e5fd96feca4c3aa59d6fb43eaeed3f2"; + sha512 = "7f07e56433349000859c8dfa420160d9388c4fe70494f0b614b9740aed4cc00f17f3be475303a74a5ef58c16bd334dc8fa8e7d73d989202841a171afca4388bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/he/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/he/thunderbird-68.8.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "9c2ae42cf2d43e4ae9d0dad829871b44321b2cf49cde1f17568f96c4d6a69793d78c9b7a72cb29b71c108718906ab749f006f7c727d6f3892efa3d56d0852449"; + sha512 = "2ca1b2f949af32e3af1fa80de361c2d35bed79e7e832dc4d7dfa3b3ac3866ae0a5d7c1fe22fe2a49f4d92f4136abb06cdccb44daa4fbce41596a8cf3f30f3711"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/hr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/hr/thunderbird-68.8.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "9e9a949fe54c23a0f73bcb05a4fe2b212c6701cbd1d68ae10dba2b62de07fcc5dad5210de0ec3c3f684f06828f8fd1c420712396e5132da6053de42f319d6454"; + sha512 = "cc01c61ef5c2fd136283b035b3baa282b57643afdc4feb82e014475c6afc7aae73f41b607e16a19367b010fb551f39cccf48250bae6650cfc2882a40e8d59d00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/hsb/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/hsb/thunderbird-68.8.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "0d3c5ca3ce6a9becaad63b2d7bf3e1d4491cad18201e1ddb634ad80d4d9d9d26c95b02034888f24ce50c5390b1197fe3bbd69525bcffd5192d95ed35203515de"; + sha512 = "abd12a6378f51ef7ec3e5f3cfc4b5f5774a7386887bd39f0d4cf715483810436f258e80753eccc204eaec61f602e90525d63f027a3ac264127eaec3261c30cdc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/hu/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/hu/thunderbird-68.8.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "4519acbc2d00cb1f97d73f17b37db4625fd16f7f25e628d5309bdddee2012feb2133ce599bc69eabb22a18f015a00c8e98d6804140ea1ae41d66f59164355f32"; + sha512 = "d4ce5b41a15b40539bf123dbf4f075b00da495007eca83c9c49c5ba5578a0744fd3e38ee71d6746432eb8ef79490ea9b5991497946ed6246537ac4d592a85b62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/hy-AM/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/hy-AM/thunderbird-68.8.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "f60cca5cef19516a5c6e4b22962567c0c0d22035ee7583b0d93a4db0db7f625ed0cfaddc78f56621371d0a8b6341948cbf9171debe81c222d170af2c759eef36"; + sha512 = "caea7744d3e7d5e76ab5bfb98d18ce27b869f8f3c8e8be206ef4ca8b34819ba8a552dbcbb409d53cb45ba709288fab550f2f46607dd8f67908272be3b64d55ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/id/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/id/thunderbird-68.8.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "75adaedcce7dae3998a063794552d3e5fd69e037422e44fafcc7871a05cabcb592c9ddb637c1f7b0639e03f6d0d99b262679087df2d6806fe2a202121cdb5563"; + sha512 = "a4e7862dbc71b7af2eb2f348de8632ea7865408c72b8ae6a3f78aaf97746662020b61757072d49639293b529395359e35f459ee11c4f37cabbb848fc363fa16f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/is/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/is/thunderbird-68.8.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "b80488a594bebecaa139a2bbac76e3daa0d3a9f3257cfdc2f6954f8cbf427c3b3ec1db3d1f55b9c5e8c37242778e53904b92adff1cb7e1907142008e69607ee8"; + sha512 = "cca9db1eba2143dc567ca454d33b7c6dbc7d1d3d3daa858bfe2e2db1910b8260c74af0a5b5cbe53d94487d42cd12e7bab143deec5dab33c2bd14f889f2ceeaa5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/it/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/it/thunderbird-68.8.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "c8a0f75f6467f6428103c98e97afce1690a0d986ea6466dbfbaa2eba2853d8f7a1e65c568d10884d6d4412fcbab39e8743d3e3233ac16f69ab57a5f698c3ac5c"; + sha512 = "185e5c4246f73bb5fc46187bfcb73ea1bf8749f67558bb162f4557e35e8657ffb19b61a04fe425b7bad32c20bcbde67894848422c350ba38a27c32624ab0829b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ja/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ja/thunderbird-68.8.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "b1abc4fb9e7af1695ca2a4fe88d2198876212923ae10977b0caedffc96dadd891fe6068fd8d53c7cb7667854523197d1378791fb71c12eb817dd9b6e338eb3a3"; + sha512 = "1ad054c656cb4d4ea906603aef9370014480f5bd4041d56027fb0f9602f5aacaee709e130fd29cf4a0b1fa638ea52085eb1b86e27e38731da9b22f5b69197e15"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ka/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ka/thunderbird-68.8.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "11e56137a0e5f9f6cc4b24e02861e6ee4c451280076e9efc46e1f28066862b3bd494ff7388f6be736be3dcf6412c5dbd141546dd37d6351aed54790deff841f9"; + sha512 = "366542d5b1ca00092fecc577d92111a2db6bc7e3fcc66753d91fc971b9536717494c13a256ccf43522fcdb9964f629870a327488e8201ef5185d6d6e2fe2a1af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/kab/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/kab/thunderbird-68.8.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "b930bd22990497a66cc9aff96f0c9bbfae4396fd9b4397893db9c72b59b602b45f6ab7388b8899890e151bf8dd1e0b788d668cdad607f4326794825508d36ebd"; + sha512 = "f19a99f2824cd65a10ee264ddc8d21516dcbe2c2d807e076e8d137b56375237307d3adedbaaaff5a3f88a1d4ed80faca292abb7941a349a42bad6207fd267ca2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/kk/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/kk/thunderbird-68.8.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "17b7ec790013cdbad015d3045ec8d4c5ee6d92b1ea9be18e2b9a5d7776f53c7b621193e7dec418f86be25e3d876e4a9cf9c8ceef0cac4051461afc1a51498353"; + sha512 = "12903b5f1df5ec077c5ea7cd53a8cec4489613fa87862bdb594819b87d70be76997f9b9c825e1335a3a5e785a070b25f75cc2ac19dac726638aa454822bd2a4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ko/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ko/thunderbird-68.8.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "1030a289a2e0793553ec3bfa8ac1b3ff3bfac3766318f5ffd9e6eff1979481b327a90a2207a5c16ca33719675c65e20d58ea8074fbd5fe9877fd334114e9b5f2"; + sha512 = "d246ac4a6f110075e7efa1da523e1a171d34415752536c8ecc40d296187d65e589e1a9a20e3da93813dbba058c6c3d820ce93f8473c207190d2b58bda6496326"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/lt/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/lt/thunderbird-68.8.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "e433d8933c1d4a41e70ae2a8bdb6f1a502d478aad1308e1f0e8489149371893deea61fe8339717eb22996d844a5a6bbef916ec6c468a57cfbb7a54751bee2408"; + sha512 = "cce06ce9899dd9cd50bcd09f2699fe8fce1a08666240bd997cf03a813befe4c1e15823e4e3ff16148a301e3725210a2bdf2af2ec72b9c55c470519860454a14c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ms/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ms/thunderbird-68.8.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "31343703e214decf4f25d724507dc706cb6c47d6247989cc2019841175099a0c328fca562fbd257f0003ec6a6fc8cdcd632c141de13e910a6a7b9c75733998bb"; + sha512 = "f9facdfbde7ba320c9d16ca41194fed7a0b7aec758b83c57c64fb2a778aef90ad9840f0b0dea838598d8786ce5318d7ea790048c877d492f1f6f77ea7ce5ad44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/nb-NO/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/nb-NO/thunderbird-68.8.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "e79708c309dd16d23bba5bc0e29a4f5b426a7dcb7dcd56b86c40875abd0d7fa532d9ca8c8b5019552fa0d07e5c4686a66f0a4173e2fdbf8865d3921c8b29f327"; + sha512 = "994d93d68806ec039ae59fb9ef5a27a940305ca7919ebc427267affc797e5b386cf96d67cbacff0f708b659d4aec8692271f376dc4eb56e510096387a83af0f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/nl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/nl/thunderbird-68.8.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "8c268bbe04c30a3dbef069add7b6e47fc576a60d0709020d0aee03b0be634f0fbfd4928489fe7b984a8c54fb1ad9ae951b9dd0c0ba04483b35a242bbbe3bbc19"; + sha512 = "8ae07cb28e0f777b79c005e0c6848854ed40f072f63b98d68841c3aab4dacab04d90131e4c76c65943eeee05ec01bdf79c3872f0a0df1b10e02be1707e2709ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/nn-NO/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/nn-NO/thunderbird-68.8.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "9c73e09e4680f3c258e7d25691dffaf805ca6946335c9c30ef091a739d7f87e0f36f5328875ceb2b7f0f2cee2bf16fe1401411f11f4e5e45ca86837c4e207d79"; + sha512 = "994e22db5edc1d1b6ec4f51dbbcdd200695e468aaf7cefa228f54c5ec4eca7aaf5faea8afeb1efcc1db5dd221e2022e666bbee65a685409790dd7614d0dc4b20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/pl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/pl/thunderbird-68.8.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "6dcb19a95e0bd8dd783a420c3f06e0980c5706c065397d4ee424969bd84daf783752d55153808df5811f656d28adeb15f826b1d4f2b9e356846c6b1c01b89a04"; + sha512 = "4efb0643491e7b469e277f98d16f106e046514a35a3f33d30ceb25809a037e521639c2c5c6304be6716fc9f7f39c216dd2ecc204d47f81bc9d1a3987808d8ac9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/pt-BR/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/pt-BR/thunderbird-68.8.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "99deb6fe54bf1f9bb1858f2c454e44246b34bca6aaeb5322db57d048acdea5de853d439d4f079c3e2587174364ecb05861cac461a34dfba495eb747bb8fc98ac"; + sha512 = "008c6291daae9eb05a981db2e5931fc5a2b72c55b349978dd3e76c8bc632ef95b78f94af8934e2e89600877899218acd1352e910ab128e8796a30eec4734dc91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/pt-PT/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/pt-PT/thunderbird-68.8.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "fd0fe715c0e816e6a92b9cb6a2afea50952851161cdd217f764cdafdc529f7cf0c5a6913546b81fc1d9532de74eecf13517c6eb8380ab5f920487df4c26d331b"; + sha512 = "be53376fc3f29cdc6f7bd13fcc4de35292dee928d9c65016dde0910333c028fa85563a688dbd644459aac9bf81a5dc68e5cba528f495170193dbeb5024042b5d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/rm/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/rm/thunderbird-68.8.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "5ff0306c7c6f88976f3080d34690e4607a74730509f9f43a0ba56fb9e5b9cdea8e85a4137333c150110fa110ab6d98cbbf265ea07ca439f199841a82af500152"; + sha512 = "a66262a586bd1b79772fc791fb93bce764b9f0cd5d39c03b26b1b9743ceb83f54e64b30bfd1fc0e03236aef8f320b90017a4e4d997090910c7b8963e30f505e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ro/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ro/thunderbird-68.8.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "9240e285135f27f82402cd0d3374f28d293a29c904a503297014802554e8257bf95c8d0cbcf18841c44d1012e0d3d8067ab24186317cb4f42f96dfeeb65255b9"; + sha512 = "43fa63b41001e01ae7e0183841d6efa5bda0c2518949b6925d035690f507586e39fe9d1bde404f15f34d807e0fb02efa8f7816efd2b584680b43896c6cdb603f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ru/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ru/thunderbird-68.8.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "0c90806ecfe1e4b2e4d17ba01a5945bf5c0d3a0e7b5caaecd36456286f5a1ea597b743743acfbaef585cdc4bada86e6f194608ebe9dd2308f24d093fbba49fa5"; + sha512 = "2d5d700879d1c95bc7ba066ba336f3b9f5681d089c019279cf27c2a837b6a12527d92940378e1bdc794bdfd516deb09c97fd5fccc07571a9b9c92c7c24bed3ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/si/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/si/thunderbird-68.8.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "a10ab6a050df683057d4532c0c1ebfbed80de96f6831ae60e53f4e4fe95a342ce97b545c7a658fa092a7b9d4c2196f4bb296e4af9b0c7e4183f112ab50b464e6"; + sha512 = "b78fa143b483cd6499cb7c4cc71821b8dc7bce79059765650d09876a3ddfa1d62a676f3b3326cd3ecfb6aff9823a7f26c7b83a2c74ada5e7aa57b59238ecb350"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sk/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/sk/thunderbird-68.8.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "1aa04c5702a89099645616f7aee86a507cc5c54f3a62696eaef17d6ca161ded644285d77782ff940c2ab128d2ff9f4c5b385999da9de678837ecf91d00f88f16"; + sha512 = "b6cd21b14fdb6334b03a6e780c6fe4815a3b6124973233e5c783ddf0db9e6e7505b0569eacfa0c2c65d0e740e4616f4ed3fa6f2b9a2461643abca1b437436cdd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/sl/thunderbird-68.8.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "afacff8423baa933c6e4b2282fc112636876dd97e607e9a63675fc5232907bf7b06dc50e1377aeedd3cc56dded6f3d71b47aa774dbea12217f6243c6182a2bf8"; + sha512 = "9c791c58cbcb91bd682d30feae3b85d8e30b016b9e64fe295b2c11dbae6f72464a2a2637858eb62815f76e83bf92c2ba1549e2e9d1b3a2c19b3720ad383a859b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sq/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/sq/thunderbird-68.8.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "6036f12337b129025c34906b8df0663ae210294d3914cceb9f97be907f058e9eaeafad2aa2e2c2ee79f83be3659a242ab2135cf7f240b34eee24dcf555aef40f"; + sha512 = "735f2aa6020787f8119dc795af0e28d04f596a001d6ea0f1a2437b90658d571a9b2c96fe2f13e6ea919d8a12ff149e562bb1949d123f0573d8f53bcf0ad0f82c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/sr/thunderbird-68.8.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "c48be7ba5b42ebd244c59a6188be08236974fabdf7cc30f3473add6b215c6c7ea80fd4ad4d739d7e62fe2f1043afb288d2a6f7e838bf0e17fcc68b5340806e45"; + sha512 = "456bc22b998665dfed7a8d87cf754d6d5cbda4e19074086c4a08176e8767244e8b16d90c25173c9f41c51dd27c8c2b83a400424e148dc266da46aed6e75b71a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sv-SE/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/sv-SE/thunderbird-68.8.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "c943304a7f40e715d1fb1194ba7f306538b917788306f02be10a86e1d01baf091b1bc58b417aad7775fba58cf90ddd8412a56cfbcf2f12e4f7581be34c328205"; + sha512 = "1ad151afb1bf9324c03fc78c98a49d9fe6fd765d245eac3e35f17edd6e96ba3c2503d8569f72e95d22982736e33c391e7f44a5141a9f850f26f9d3504a312c11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/tr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/tr/thunderbird-68.8.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "53d5c9d7db4a44ea3858c55377c0ab8f8d359440f86634a0ff5eefdaf0553dd2c7a9ca66112a2cd4fe3a8e6094cf9c1f16fe01119ab11f1a039f471fcba37609"; + sha512 = "ed539d023abf5adfcee314a3da0e1ebdf1a378720c87b75d059d072db65e5682338b58d4b9b0eb1b02920031fa253c2e237cce3635e4897ef618291df6b9a467"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/uk/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/uk/thunderbird-68.8.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "8204e0ca96902f16b92a6e02c09a788362359af3a6566f8246055727d5a74736d0b9f8570a4671a1f69233a993e25676c730001dfef9a92d034edcb8b12a5f7f"; + sha512 = "7f044b3d8d44d3f5177cf7f7fdec7fe8b8fc183a5a231ae64cd403f9a459d2d4b808e0ee08591410163358bf7841e94ba6a14ab74d955dcdddff9240c2bccc6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/uz/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/uz/thunderbird-68.8.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "496d82507602cff8e48f43b9c63a696d24020b804ffda45f2027103c5f3768543db0f03051ef062e0076c16b78b31759f7d4a4878a45e7dfac1cc0e4e9d046cb"; + sha512 = "3dbb3a4bcf800621f191b11ca3e05e2acb114348dbab49695478fbc653ad154a92f0aa62cd6d86216e1447728d6d3ddd01da678f4a9feb2b7964794f5609f7e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/vi/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/vi/thunderbird-68.8.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "f360794ecb21ed3f90552797269ab6e89024591903eb53dcf6216b25bb4dbcdf94c2526672b94ba979717f90cce5bfb6329efb3b5a2b9bec7c3d4d06d339ac9e"; + sha512 = "8724cbf93d5d7ebf6fa67b85bf559bfe905cca6b76a4e386db99252d7460ce78d3b63f3c1e5a14782f72d1434906a2d7ad2497bb66ffa6cb66aaf44dc84d0a0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/zh-CN/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/zh-CN/thunderbird-68.8.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "ec7274b2870206647fd853c30db4e30b3856896ce9c89d5d825363e9d4327d23a230c899abbb740036a8e060f1532007ba5936af010feea85318bdeb18f29e0d"; + sha512 = "3cc8703dffdedc2de263c2ce10e2fc2f374c991ec7b34ab3d5530d3441ce8049577824cbeb0ec4ab233973e2d5c0120958360b1920e3f43ae9362132b4948cdd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/zh-TW/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/zh-TW/thunderbird-68.8.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "f0fb6deda0813516753386ae69ddb7b6dce95ce89c6dfba3ba5828d80d9fe92e3eaf014e89ab56c4548d39932bbfe12d4b9c6c8ff66b77a9ebe4f7476a9f6be9"; + sha512 = "bf37041bac13932ad283d49a2f4f552cd4422aaab7baec7a18e19ffd4101b155a8e864aa666eb85683a82668c393c7210631754a375d012e9c9e200c554776c3"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 797d7b17ec2d6..ee8d36b421aa0 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "68.7.0"; + version = "68.8.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "0glskn3djf739v2dphs663a2lfg5b0lbk1vlwwbzwfj9wfshvk7l07ijp84143bamvgb0lhhh0c9zx4gy5jj3x1j4196m3s1c1n7rzs"; + "2zq65qhrg8xsz75yywcijdjbkndn79w73v5vyahiyyibc8lfjphz0zaihk67ja82fpnxlnsfvy45s8x5l42kcbb0wibkjy7m55bd6h7"; }; nativeBuildInputs = [ @@ -191,7 +191,7 @@ stdenv.mkDerivation rec { lib.getVersion stdenv.cc.cc } -isystem ${stdenv.cc.cc}/include/c++/${ lib.getVersion stdenv.cc.cc - }/$(cc -dumpmachine)" + }/${stdenv.hostPlatform.config}" } \ $NIX_CFLAGS_COMPILE" diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index f9cda71b7a5af..e8b7645db8729 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { version = "0.0.19.1"; src = fetchhg { - url = https://linuxonly@bitbucket.org/linuxonly/modem-manager-gui; + url = "https://linuxonly@bitbucket.org/linuxonly/modem-manager-gui"; rev = "version ${version}"; sha256 = "11iibh36567814h2bz41sa1072b86p1l13xyj670pwkh9k8kw8fd"; }; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { functions. You can check balance of your SIM card, send or receive SMS messages, control mobile traffic consumption and more. ''; - homepage = https://linuxonly.ru/page/modem-manager-gui; + homepage = "https://linuxonly.ru/page/modem-manager-gui"; license = licenses.gpl3; maintainers = with maintainers; [ ahuzik ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index dce1934febf43..8a0980286df9a 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.7"; + version = "1.4.9"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "0c6n5afn9pr4p7gxkv462lysrw52w9fhvavzm99c78dcp9dj5xnk"; + sha256 = "0hinmyd4lipy9wi3grwm72vv6xrpf4m08i9g9nlxzxnwfanw885q"; }; nativeBuildInputs = [ pkgconfig ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "POP3 mail retrieval agent"; - homepage = https://marlam.de/mpop; + homepage = "https://marlam.de/mpop"; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 58190944b6402..9e990dcdf33dc 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; - version = "1.8.7"; + version = "1.8.10"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "1waiiksa57byb7gvx1zmh6srvl6r8rvwqklk0slb3iaf4kfbqlws"; + sha256 = "041g921rdjiv8bapp61gp4rylq8cckfkcwzyh8bs7xwxs4wpzfna"; }; patches = [ @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple and easy to use SMTP client with excellent sendmail compatibility"; - homepage = https://marlam.de/msmtp/; + homepage = "https://marlam.de/msmtp/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 1e25b01259d07..93a899742b5d6 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -41,11 +41,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2020.3"; + version = "2020.4"; src = fetchurl { url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; - sha256 = "fac3896db78cc2ddac81abec8bc0aa324e66b453126ed35a501e422ce64b1362"; + sha256 = "17xi8g2k89vi4d0j7pr33bx9zjapa2qh4pymbrqvxwli3yhq6zwr"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 4408994ba8f07..633d6e63dce95 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -6,6 +6,7 @@ , speechdSupport ? false, speechd ? null , pulseSupport ? false, libpulseaudio ? null , iceSupport ? false, zeroc-ice ? null +, nixosTests }: assert jackSupport -> libjack2 != null; @@ -63,6 +64,8 @@ let enableParallelBuilding = true; + passthru.tests.connectivity = nixosTests.mumble; + meta = { description = "Low-latency, high quality voice chat software"; homepage = "https://mumble.info"; diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix index 42950f23a8439..931453624811e 100644 --- a/pkgs/applications/networking/ndppd/default.nix +++ b/pkgs/applications/networking/ndppd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces"; - homepage = https://github.com/DanielAdolfsson/ndppd; + homepage = "https://github.com/DanielAdolfsson/ndppd"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ fadenb globin ]; diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index c2a84971bc294..c2e51ee743b5c 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Benchmark to measure the performance of many different types of networking"; - homepage = http://www.netperf.org/netperf/; + homepage = "http://www.netperf.org/netperf/"; license = "Hewlett-Packard BSD-like license"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 6352922e33e96..f1e8905089c9d 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A GTK-based news feed aggregator"; - homepage = http://lzone.de/liferea/; + homepage = "http://lzone.de/liferea/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ vcunat romildo ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index f50d9516167a7..454e19fd8974b 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = { description = "A GTK-based Usenet newsreader good at both text and binaries"; - homepage = http://pan.rebelbase.com/; + homepage = "http://pan.rebelbase.com/"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index 2333d47d82023..1cc4be8cb27ac 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, qmake, pkgconfig, wrapQtAppsHook +{ stdenv, fetchFromGitHub, qmake, pkg-config, wrapQtAppsHook , qtbase, qttools, qtwebkit, sqlite }: stdenv.mkDerivation rec { pname = "quiterss"; - version = "0.19.3"; + version = "0.19.4"; src = fetchFromGitHub { owner = "QuiteRSS"; repo = "quiterss"; rev = version; - sha256 = "06m5mhzxvv8q2adaqcrar3sx2c1hc89h2i0qfjxmirfc5z67hdw2"; + sha256 = "1cgvl67vhn5y7bj5gbjbgk26bhb0196bgrgsp3r5fmrislarj8s6"; }; - nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; buildInputs = [ qtbase qttools qtwebkit sqlite.dev ]; meta = with stdenv.lib; { @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { QuiteRSS is a open-source cross-platform RSS/Atom news feeds reader written on Qt/C++ ''; - homepage = https://quiterss.org; + homepage = "https://quiterss.org"; + changelog = "https://github.com/QuiteRSS/quiterss/blob/${version}/CHANGELOG"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index e8fff0deddf10..1cc9c39c991d5 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The slrn (S-Lang read news) newsreader"; - homepage = http://slrn.sourceforge.net/index.html; + homepage = "http://slrn.sourceforge.net/index.html"; maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; platforms = with platforms; linux; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 7e096ca94e30b..2560bc806eac4 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -58,7 +58,7 @@ mkDerivation rec { meta = with lib; { description = "Nextcloud themed desktop client"; - homepage = https://nextcloud.com; + homepage = "https://nextcloud.com"; license = licenses.gpl2; maintainers = with maintainers; [ caugner ma27 ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/nload/default.nix b/pkgs/applications/networking/nload/default.nix index 16cc0e3d50a2e..85a39f7e656ad 100644 --- a/pkgs/applications/networking/nload/default.nix +++ b/pkgs/applications/networking/nload/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { using two graphs and provides additional info like total amount of transfered data and min/max network usage. ''; - homepage = http://www.roland-riegel.de/nload/index.html; + homepage = "http://www.roland-riegel.de/nload/index.html"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/pkgs/applications/networking/nntp-proxy/default.nix index 96bdc0b1dfa44..3986f2b67cb23 100644 --- a/pkgs/applications/networking/nntp-proxy/default.nix +++ b/pkgs/applications/networking/nntp-proxy/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "Simple NNTP proxy with SSL support"; - homepage = https://github.com/nieluj/nntp-proxy; + homepage = "https://github.com/nieluj/nntp-proxy"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.fadenb ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/networking/nym/default.nix b/pkgs/applications/networking/nym/default.nix new file mode 100644 index 0000000000000..6bb86c016ba38 --- /dev/null +++ b/pkgs/applications/networking/nym/default.nix @@ -0,0 +1,54 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkgconfig +, openssl +, libredirect +, writeText +}: + +rustPlatform.buildRustPackage rec { + pname = "nym"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "nymtech"; + repo = "nym"; + rev = "v${version}"; + sha256 = "1q9i24mzys6a9kp9n0bnxr3iwzblabmc6iif3ah75gffyf0cipk4"; + }; + + cargoSha256 = "0qas544bs4wyllvqf2r5mvqxs1nviwcvxa3rzq10dvjyjm1xyh3k"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ openssl ]; + + /* + Nym's test presence::converting_mixnode_presence_into_topology_mixnode::it_returns_resolved_ip_on_resolvable_hostname tries to resolve nymtech.net. + Since there is no external DNS resolution available in the build sandbox, we point cargo and its children (that's what we remove the 'unsetenv' call for) to a hosts file in which we statically resolve nymtech.net. + */ + preCheck = '' + export LD_PRELOAD=${libredirect.overrideAttrs (drv: { + postPatch = "sed -i -e /unsetenv/d libredirect.c"; + })}/lib/libredirect.so + export NIX_REDIRECTS=/etc/hosts=${writeText "nym_resolve_test_hosts" "127.0.0.1 nymtech.net"} + ''; + + postCheck = "unset NIX_REDIRECTS LD_PRELOAD"; + + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "A mixnet providing IP-level privacy"; + longDescription = '' + Nym routes IP packets through other participating nodes to hide their source and destination. + In contrast with Tor, it prevents timing attacks at the cost of latency. + ''; + homepage = "https://nymtech.net"; + license = licenses.asl20; + maintainers = [ maintainers.ehmry ]; + platforms = with platforms; intersectLists (linux ++ darwin) (x86 ++ x86_64); # see https://github.com/nymtech/nym/issues/179 for architectures + }; +} diff --git a/pkgs/applications/networking/nym/update.sh b/pkgs/applications/networking/nym/update.sh new file mode 100755 index 0000000000000..0c65521c7f807 --- /dev/null +++ b/pkgs/applications/networking/nym/update.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq nix-prefetch + +# adapted from rust-analyzer + +set -euo pipefail +cd "$(dirname "$0")" +nixpkgs=../../../.. + +owner=$(sed -nE 's/.*\bowner = "(.*)".*/\1/p' ./default.nix) +repo=$(sed -nE 's/.*\brepo = "(.*)".*/\1/p' ./default.nix) +rev=$( + curl -s "https://api.github.com/repos/$owner/$repo/releases" | + jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output +) +version=${rev:1} +old_version=$(sed -nE 's/.*\bversion = "(.*)".*/\1/p' ./default.nix) +if grep -q 'cargoSha256 = ""' ./default.nix; then + old_version='broken' +fi +if [[ "$version" == "$old_version" ]]; then + echo "Up to date: $version" + exit +fi +echo "$old_version -> $version" + +sha256=$(nix-prefetch -f "$nixpkgs" nym.src --rev "$rev") +# Clear cargoSha256 to avoid inconsistency. +sed -e "s/version = \".*\"/version = \"$version\"/" \ + -e "s/sha256 = \".*\"/sha256 = \"$sha256\"/" \ + -e "s/cargoSha256 = \".*\"/cargoSha256 = \"\"/" \ + --in-place ./default.nix + +echo "Prebuilding for cargoSha256" +cargo_sha256=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).nym.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") +sed "s/cargoSha256 = \".*\"/cargoSha256 = \"$cargo_sha256\"/" \ + --in-place ./default.nix diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index d91bfbae501d7..679e966373b62 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = http://vicerveza.homeunix.net/~viric/soft/offrss/offrss-1.3.tar.gz; + url = "http://vicerveza.homeunix.net/~viric/soft/offrss/offrss-1.3.tar.gz"; sha256 = "1akw1x84jj2m9z60cvlvmz21qwlaywmw18pl7lgp3bj5nw6250p6"; }; meta = { - homepage = http://vicerveza.homeunix.net/~viric/cgi-bin/offrss; + homepage = "http://vicerveza.homeunix.net/~viric/cgi-bin/offrss"; description = "Offline RSS/Atom reader"; license="AGPLv3+"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix new file mode 100644 index 0000000000000..77d08692f625a --- /dev/null +++ b/pkgs/applications/networking/onionshare/default.nix @@ -0,0 +1,113 @@ +{ + lib, + buildPythonApplication, + stdenv, + substituteAll, + fetchFromGitHub, + isPy3k, + flask, + flask-httpauth, + stem, + pyqt5, + pycrypto, + pysocks, + pytest, + qt5, + requests, + tor, + obfs4, +}: + +let + version = "2.2"; + src = fetchFromGitHub { + owner = "micahflee"; + repo = "onionshare"; + rev = "v${version}"; + sha256 = "0m8ygxcyp3nfzzhxs2dfnpqwh1vx0aws44lszpnnczz4fks3a5j4"; + }; + meta = with lib; { + description = "Securely and anonymously send and receive files"; + longDescription = '' + OnionShare is an open source tool for securely and anonymously sending + and receiving files using Tor onion services. It works by starting a web + server directly on your computer and making it accessible as an + unguessable Tor web address that others can load in Tor Browser to + download files from you, or upload files to you. It doesn't require + setting up a separate server, using a third party file-sharing service, + or even logging into an account. + + Unlike services like email, Google Drive, DropBox, WeTransfer, or nearly + any other way people typically send files to each other, when you use + OnionShare you don't give any companies access to the files that you're + sharing. So long as you share the unguessable web address in a secure way + (like pasting it in an encrypted messaging app), no one but you and the + person you're sharing with can access the files. + ''; + + homepage = "https://onionshare.org/"; + + license = licenses.gpl3Plus; + maintainers = with maintainers; [ lourkeur ]; + }; + + common = buildPythonApplication { + pname = "onionshare-common"; + inherit version meta src; + + disable = !isPy3k; + propagatedBuildInputs = [ + flask + flask-httpauth + stem + pyqt5 + pycrypto + pysocks + requests + ]; + buildInputs = [ + tor + obfs4 + ]; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit tor obfs4; + inherit (tor) geoip; + }) + ]; + postPatch = "substituteInPlace onionshare/common.py --subst-var-by common $out"; + + doCheck = false; + }; +in +{ + onionshare = stdenv.mkDerivation { + pname = "onionshare"; + inherit version meta; + + dontUnpack = true; + + inherit common; + installPhase = '' + mkdir -p $out/bin + cp $common/bin/onionshare -t $out/bin + ''; + }; + onionshare-gui = stdenv.mkDerivation { + pname = "onionshare-gui"; + inherit version meta; + + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + + dontUnpack = true; + + inherit common; + installPhase = '' + mkdir -p $out/bin + cp $common/bin/onionshare-gui -t $out/bin + wrapQtApp $out/bin/onionshare-gui + ''; + }; +} diff --git a/pkgs/applications/networking/onionshare/fix-paths.patch b/pkgs/applications/networking/onionshare/fix-paths.patch new file mode 100644 index 0000000000000..ddd0c75334bbd --- /dev/null +++ b/pkgs/applications/networking/onionshare/fix-paths.patch @@ -0,0 +1,134 @@ +diff --git a/onionshare/common.py b/onionshare/common.py +index 3373462..7fd245b 100644 +--- a/onionshare/common.py ++++ b/onionshare/common.py +@@ -87,66 +87,16 @@ class Common(object): + ), + "share", + ) +- if not os.path.exists(prefix): +- # While running tests during stdeb bdist_deb, look 3 directories up for the share folder +- prefix = os.path.join( +- os.path.dirname( +- os.path.dirname(os.path.dirname(os.path.dirname(prefix))) +- ), +- "share", +- ) +- +- elif self.platform == "BSD" or self.platform == "Linux": +- # Assume OnionShare is installed systemwide in Linux, since we're not running in dev mode +- prefix = os.path.join(sys.prefix, "share/onionshare") +- +- elif getattr(sys, "frozen", False): +- # Check if app is "frozen" +- # https://pythonhosted.org/PyInstaller/#run-time-information +- if self.platform == "Darwin": +- prefix = os.path.join(sys._MEIPASS, "share") +- elif self.platform == "Windows": +- prefix = os.path.join(os.path.dirname(sys.executable), "share") ++ else: ++ prefix = "@common@/share/onionshare" + + return os.path.join(prefix, filename) + + def get_tor_paths(self): +- if self.platform == "Linux": +- tor_path = "/usr/bin/tor" +- tor_geo_ip_file_path = "/usr/share/tor/geoip" +- tor_geo_ipv6_file_path = "/usr/share/tor/geoip6" +- obfs4proxy_file_path = "/usr/bin/obfs4proxy" +- elif self.platform == "Windows": +- base_path = os.path.join( +- os.path.dirname(os.path.dirname(self.get_resource_path(""))), "tor" +- ) +- tor_path = os.path.join(os.path.join(base_path, "Tor"), "tor.exe") +- obfs4proxy_file_path = os.path.join( +- os.path.join(base_path, "Tor"), "obfs4proxy.exe" +- ) +- tor_geo_ip_file_path = os.path.join( +- os.path.join(os.path.join(base_path, "Data"), "Tor"), "geoip" +- ) +- tor_geo_ipv6_file_path = os.path.join( +- os.path.join(os.path.join(base_path, "Data"), "Tor"), "geoip6" +- ) +- elif self.platform == "Darwin": +- base_path = os.path.dirname( +- os.path.dirname(os.path.dirname(self.get_resource_path(""))) +- ) +- tor_path = os.path.join(base_path, "Resources", "Tor", "tor") +- tor_geo_ip_file_path = os.path.join(base_path, "Resources", "Tor", "geoip") +- tor_geo_ipv6_file_path = os.path.join( +- base_path, "Resources", "Tor", "geoip6" +- ) +- obfs4proxy_file_path = os.path.join( +- base_path, "Resources", "Tor", "obfs4proxy" +- ) +- elif self.platform == "BSD": +- tor_path = "/usr/local/bin/tor" +- tor_geo_ip_file_path = "/usr/local/share/tor/geoip" +- tor_geo_ipv6_file_path = "/usr/local/share/tor/geoip6" +- obfs4proxy_file_path = "/usr/local/bin/obfs4proxy" ++ tor_path = "@tor@/bin/tor" ++ tor_geo_ip_file_path = "@geoip@/share/tor/geoip" ++ tor_geo_ipv6_file_path = "@geoip@/share/tor/geoip6" ++ obfs4proxy_file_path = "@obfs4@/bin/obfs4proxy" + + return ( + tor_path, +diff --git a/setup.py b/setup.py +index 9af72fc..53ca47b 100644 +--- a/setup.py ++++ b/setup.py +@@ -70,41 +70,41 @@ classifiers = [ + ] + data_files = [ + ( +- os.path.join(sys.prefix, "share/applications"), ++ "share/applications", + ["install/org.onionshare.OnionShare.desktop"], + ), + ( +- os.path.join(sys.prefix, "share/icons/hicolor/scalable/apps"), ++ "share/icons/hicolor/scalable/apps", + ["install/org.onionshare.OnionShare.svg"], + ), + ( +- os.path.join(sys.prefix, "share/metainfo"), ++ "share/metainfo", + ["install/org.onionshare.OnionShare.appdata.xml"], + ), +- (os.path.join(sys.prefix, "share/onionshare"), file_list("share")), +- (os.path.join(sys.prefix, "share/onionshare/images"), file_list("share/images")), +- (os.path.join(sys.prefix, "share/onionshare/locale"), file_list("share/locale")), ++ ( "share/onionshare", file_list("share")), ++ ( "share/onionshare/images", file_list("share/images")), ++ ( "share/onionshare/locale", file_list("share/locale")), + ( +- os.path.join(sys.prefix, "share/onionshare/templates"), ++ "share/onionshare/templates", + file_list("share/templates"), + ), + ( +- os.path.join(sys.prefix, "share/onionshare/static/css"), ++ "share/onionshare/static/css", + file_list("share/static/css"), + ), + ( +- os.path.join(sys.prefix, "share/onionshare/static/img"), ++ "share/onionshare/static/img", + file_list("share/static/img"), + ), + ( +- os.path.join(sys.prefix, "share/onionshare/static/js"), ++ "share/onionshare/static/js", + file_list("share/static/js"), + ), + ] + if not platform.system().endswith("BSD") and platform.system() != "DragonFly": + data_files.append( + ( +- "/usr/share/nautilus-python/extensions/", ++ "share/nautilus-python/extensions/", + ["install/scripts/onionshare-nautilus.py"], + ) + ) diff --git a/pkgs/applications/networking/openbazaar/client.nix b/pkgs/applications/networking/openbazaar/client.nix new file mode 100644 index 0000000000000..5b9ddd8bab7da --- /dev/null +++ b/pkgs/applications/networking/openbazaar/client.nix @@ -0,0 +1,57 @@ +{ stdenv +, fetchurl +, gcc-unwrapped +, dpkg +, bash +, nodePackages +, makeWrapper +, electron_6 +}: + +stdenv.mkDerivation rec { + pname = "openbazaar-client"; + version = "2.4.4"; + + src = fetchurl { + url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb"; + sha256 = "146vqwc1gv5zqcz60np8v9ps44m0d2yyjzqpmd4s0pcywvvwdvn6"; + }; + + dontBuild = true; + dontConfigure = true; + + nativeBuildInputs = [ makeWrapper ]; + + unpackPhase = '' + ${dpkg}/bin/dpkg-deb -x $src . + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/{${pname},applications,pixmaps} + + cp -a usr/lib/openbazaar2client/{locales,resources} $out/share/${pname} + cp -a usr/share/applications/openbazaar2client.desktop $out/share/applications/${pname}.desktop + cp -a usr/share/pixmaps/openbazaar2client.png $out/share/pixmaps/${pname}.png + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'openbazaar2client' 'openbazaar-client' + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${electron_6}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/resources/app \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gcc-unwrapped.lib ]}" + ''; + + meta = with stdenv.lib; { + description = "Decentralized Peer to Peer Marketplace for Bitcoin - client"; + homepage = "https://www.openbazaar.org/"; + license = licenses.mit; + maintainers = with maintainers; [ prusnak ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/openbazaar/default.nix b/pkgs/applications/networking/openbazaar/default.nix new file mode 100644 index 0000000000000..6a48b2962fa86 --- /dev/null +++ b/pkgs/applications/networking/openbazaar/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "openbazaar"; + version = "0.14.2"; + + suffix = { + i686-linux = "linux-386"; + x86_64-darwin = "darwin-10.6-amd64"; + x86_64-linux = "linux-amd64"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src = fetchurl { + url = "https://github.com/OpenBazaar/openbazaar-go/releases/download/v${version}/${pname}-go-${suffix}"; + sha256 = { + i686-linux = "02kl4ci2pz86qqsll7578q0acygncsyylaschjzzii34c86f1aym"; + x86_64-darwin = "1v5m94x4x0nc6i8zlcwb36ps1zpgqgcsz81x1ghkz5c9xzszgzbp"; + x86_64-linux = "0m0digw66rzhwl2im88qavli9cc5vxd9pwj6ix86dcf98r93xsrp"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + dontStrip = true; + dontPatchELF = true; + preferLocalBuild = true; + + installPhase = '' + install -D $src $out/bin/openbazaard + ''; + + postFixup = stdenv.lib.optionalString (!stdenv.isDarwin) '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/bin/openbazaard + ''; + + meta = with stdenv.lib; { + description = "Decentralized Peer to Peer Marketplace for Bitcoin - daemon"; + homepage = "https://www.openbazaar.org/"; + license = licenses.mit; + maintainers = with maintainers; [ prusnak ]; + platforms = [ "i686-linux" "x86_64-darwin" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index 3f48601d96f59..aa9d94ad5b6e6 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A packet traffic generator and analyzer"; - homepage = https://ostinato.org; + homepage = "https://ostinato.org"; license = licenses.gpl3; maintainers = with maintainers; [ rick68 ]; platforms = with platforms; linux ++ darwin ++ cygwin; diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix index 4dad5f4d6bdf3..3608ef982a9b8 100644 --- a/pkgs/applications/networking/owamp/default.nix +++ b/pkgs/applications/networking/owamp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://software.internet2.edu/owamp/; + homepage = "http://software.internet2.edu/owamp/"; description = ''A tool for performing one-way active measurements''; platforms = platforms.linux; maintainers = [maintainers.teto]; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 998944838e8ec..3fc9fedc4138a 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -21,7 +21,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Synchronise your ownCloud with your computer using this desktop client"; - homepage = https://owncloud.org; + homepage = "https://owncloud.org"; maintainers = [ maintainers.qknight ]; platforms = platforms.unix; license = licenses.gpl2Plus; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/1/default.nix index 63218f1c2ffc8..cafba65c788b9 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/1/default.nix @@ -32,7 +32,7 @@ pythonPackages.buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://deluge-torrent.org; + homepage = "https://deluge-torrent.org"; description = "Torrent client"; license = licenses.gpl3Plus; maintainers = with maintainers; [ domenkozar ebzzry ]; diff --git a/pkgs/applications/networking/p2p/deluge/2/default.nix b/pkgs/applications/networking/p2p/deluge/2/default.nix new file mode 100644 index 0000000000000..2e9f08ce98a87 --- /dev/null +++ b/pkgs/applications/networking/p2p/deluge/2/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages +, gtk3, glib, gobject-introspection, librsvg, wrapGAppsHook }: + +pythonPackages.buildPythonPackage rec { + pname = "deluge"; + version = "2.0.3"; + + src = fetchurl { + url = "http://download.deluge-torrent.org/source/2.0/${pname}-${version}.tar.xz"; + sha256 = "14d8kn2pvr1qv8mwqrxmj85jycr73vwfqz12hzag0ararbkfhyky"; + }; + + propagatedBuildInputs = with pythonPackages; [ + twisted Mako chardet pyxdg pyopenssl service-identity + libtorrentRasterbar.dev libtorrentRasterbar.python setuptools + setproctitle pillow rencode six zope_interface + dbus-python pygobject3 pycairo + gtk3 gobject-introspection librsvg + ]; + + nativeBuildInputs = [ intltool wrapGAppsHook glib ]; + + checkInputs = with pythonPackages; [ + pytest /* pytest-twisted */ pytestcov mock + mccabe pylint + ]; + + doCheck = false; # until pytest-twisted is packaged + + postInstall = '' + mkdir -p $out/share/applications + cp -R deluge/ui/data/pixmaps $out/share/ + cp -R deluge/ui/data/icons $out/share/ + cp deluge/ui/data/share/applications/deluge.desktop $out/share/applications + ''; + + meta = with stdenv.lib; { + homepage = "https://deluge-torrent.org"; + description = "Torrent client"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ domenkozar ebzzry ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 2692e5360cec0..9355bfa5b8d9c 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A cross-platform program that uses the Direct Connect and ADC protocols"; - homepage = https://github.com/eiskaltdcpp/eiskaltdcpp; + homepage = "https://github.com/eiskaltdcpp/eiskaltdcpp"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index 2443528848832..017f059ff6c36 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -2,7 +2,7 @@ let freenet_ext = fetchurl { - url = https://downloads.freenetproject.org/latest/freenet-ext.jar; + url = "https://downloads.freenetproject.org/latest/freenet-ext.jar"; sha256 = "17ypljdvazgx2z6hhswny1lxfrknysz3x6igx8vl3xgdpvbb7wij"; }; @@ -12,7 +12,7 @@ let sha256 = "0abmhg2h44g8c5p7skzqwfxj8xwcjh9vs84mc0hr78k1am0633jk"; }; seednodes = fetchurl { - url = https://downloads.freenetproject.org/alpha/opennet/seednodes.fref; + url = "https://downloads.freenetproject.org/alpha/opennet/seednodes.fref"; sha256 = "08awwr8n80b4cdzzb3y8hf2fzkr1f2ly4nlq779d6pvi5jymqdvv"; }; version = "build01475"; @@ -72,7 +72,7 @@ in stdenv.mkDerivation { meta = { description = "Decentralised and censorship-resistant network"; - homepage = https://freenetproject.org/; + homepage = "https://freenetproject.org/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.doublec ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix index 0449540eaff15..65e2165f64eee 100644 --- a/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -85,7 +85,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.frostwire.com/; + homepage = "https://www.frostwire.com/"; description = "BitTorrent Client and Cloud File Downloader"; license = licenses.gpl2; maintainers = with maintainers; [ gavin ]; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index e4b306453a41d..5abee0108ec30 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { network are rewarded with better service. ''; - homepage = https://gnunet.org/; + homepage = "https://gnunet.org/"; license = licenses.agpl3Plus; maintainers = with maintainers; [ vrthra ]; platforms = platforms.gnu ++ platforms.linux; diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix index e8f209239bfe6..b3d455599bf0c 100644 --- a/pkgs/applications/networking/p2p/gnunet/git.nix +++ b/pkgs/applications/networking/p2p/gnunet/git.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { name = "gnunet-git-${rev}"; src = fetchgit { - url = https://gnunet.org/git/gnunet.git; + url = "https://gnunet.org/git/gnunet.git"; inherit rev; sha256 = "0gbw920m9v4b3425c0d1h7drgl2m1fni1bwjn4fwqnyz7kdqzsgl"; }; @@ -82,7 +82,7 @@ stdenv.mkDerivation { network are rewarded with better service. ''; - homepage = https://gnunet.org/; + homepage = "https://gnunet.org/"; license = licenses.agpl3Plus; diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index e38378d09b32c..19be24bd1b184 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { meta = with lib; { description = "KDE integrated BtTorrent client"; - homepage = https://www.kde.org/applications/internet/ktorrent/; + homepage = "https://www.kde.org/applications/internet/ktorrent/"; license = licenses.gpl2; maintainers = with maintainers; [ eelco ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix index f07db173dbcfc..1dcf42b7ece17 100644 --- a/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/pkgs/applications/networking/p2p/magnetico/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1622xcl5v67lrnkjwbg7g5b5ikrawx7p91jxbj3ixc1za2f3a3fn"; }; - modSha256 = "193n323xaypm9xkpray68nqcgyf141x8qzpxzwjnrmsgfz8p6wgk"; + vendorSha256 = "0g4m0jnpy0q64xnflphyc0lmhni0q9448h7grbbr7f1s9lpqsjml"; nativeBuildInputs = [ go-bindata ]; buildPhase = '' @@ -25,9 +25,9 @@ buildGoModule rec { meta = with lib; { description = "Autonomous (self-hosted) BitTorrent DHT search engine suite."; - homepage = https://github.com/boramalper/magnetico; + homepage = "https://github.com/boramalper/magnetico"; license = licenses.agpl3; badPlatforms = platforms.darwin; maintainers = with maintainers; [ rnhmjoj ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 0ead4b7e3ec4c..786ba434b9288 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation ({ name = "mldonkey-3.1.6"; src = fetchurl { - url = https://github.com/ygrek/mldonkey/releases/download/release-3-1-6/mldonkey-3.1.6.tar.bz2; + url = "https://github.com/ygrek/mldonkey/releases/download/release-3-1-6/mldonkey-3.1.6.tar.bz2"; sha256 = "0g84islkj72ymp0zzppcj9n4r21h0vlghnq87hv2wg580mybadhv"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation ({ meta = { description = "Client for many p2p networks, with multiple frontends"; - homepage = http://mldonkey.sourceforge.net/; + homepage = "http://mldonkey.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index b28074a2fd6e0..c956f26b11653 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Modern and lightweight direct connect client with a friendly ncurses interface"; - homepage = https://dev.yorhel.nl/ncdc; + homepage = "https://dev.yorhel.nl/ncdc"; license = licenses.mit; platforms = platforms.linux; # arbitrary maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix index 46c482818f8b7..ed44ff24fecf1 100644 --- a/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://erdgeist.org/arts/software/opentracker/; + homepage = "https://erdgeist.org/arts/software/opentracker/"; license = licenses.beerware; platforms = platforms.linux; description = "Bittorrent tracker project which aims for minimal resource usage and is intended to run at your wlan router."; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 3dd55f3c5b857..964752f3b85db 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,13 +10,13 @@ with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.2.2"; + version = "4.2.5"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qbittorrent"; rev = "release-${version}"; - sha256 = "1iqgwhgwa2kx85zj1rwfnnclr1433a7m2gbs3j7w6rx39vxnzhcc"; + sha256 = "1n613ylg6i9gisgk0dbr2kpfasyizrkdjff1r8smd4vri2qrdksn"; }; # NOTE: 2018-05-31: CMake is working but it is not officially supported @@ -39,7 +39,7 @@ mkDerivation rec { meta = { description = "Featureful free software BitTorrent client"; - homepage = https://www.qbittorrent.org/; + homepage = "https://www.qbittorrent.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ Anton-Latukha ]; diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index f10714031ff01..ce6d3958c9b0e 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ""; - homepage = http://retroshare.sourceforge.net/; + homepage = "http://retroshare.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index a5e8d85f128e5..2a8a06227133d 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -51,7 +51,7 @@ mkDerivation rec { meta = with lib; { description = "Official Qt SoulSeek client"; - homepage = https://www.slsknet.org; + homepage = "https://www.slsknet.org"; license = licenses.unfree; maintainers = [ maintainers.genesis ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index 325dc653e5b43..6b1a7ace902ab 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -1,9 +1,9 @@ { lib , fetchFromGitHub -, python3 +, python3Packages }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "stig"; # This project has a different concept for pre release / alpha, # Read the project's README for details: https://github.com/rndusr/stig#stig @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { --replace "urwidtrees>=1.0.3dev0" "urwidtrees" ''; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python3Packages; [ urwid urwidtrees aiohttp @@ -38,17 +38,23 @@ python3.pkgs.buildPythonApplication rec { setproctitle ]; - checkInputs = with python3.pkgs; [ + checkInputs = with python3Packages; [ asynctest - pytest + pytestCheckHook ]; - # test_string__month_day_hour_minute_second fails on darwin - checkPhase = '' - LC_ALL=en_US.utf8 pytest tests \ - --deselect=tests/client_test/ttypes_test.py::TestTimestamp::test_string__month_day_hour_minute_second + dontUseSetuptoolsCheck = true; + + preCheck = '' + export LC_ALL=C ''; + pytestFlagsArray = [ + "tests" + # test_string__month_day_hour_minute_second fails on darwin + "--deselect=tests/client_test/ttypes_test.py::TestTimestamp::test_string__month_day_hour_minute_second" + ]; + meta = with lib; { description = "TUI and CLI for the BitTorrent client Transmission"; homepage = "https://github.com/rndusr/stig"; diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index 65cf21c1611c7..80d9078944014 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Flexible and fast BitTorrent daemon"; - homepage = https://synapse-bt.org/; + homepage = "https://synapse-bt.org/"; license = licenses.isc; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 05268bdaead12..2e14bd0eb0f27 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tixati"; - version = "2.67"; + version = "2.73"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "0510wkwmwrlv61958zd5nsc4lr0l0lka3jf4pq3dyiyfsf4k20rq"; + sha256 = "1ncrfc4wgf02la2h3zpdcz07b980n9232lg5f62q7ab79fjrcrfr"; }; installPhase = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Torrent client"; - homepage = http://www.tixati.com; + homepage = "http://www.tixati.com"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ volth ]; diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/pkgs/applications/networking/p2p/torrential/default.nix index 01da8a633742c..e432818bec75e 100644 --- a/pkgs/applications/networking/p2p/torrential/default.nix +++ b/pkgs/applications/networking/p2p/torrential/default.nix @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Download torrents in style with this speedy, minimalist torrent client for elementary OS"; - homepage = https://github.com/davidmhewitt/torrential; - maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + homepage = "https://github.com/davidmhewitt/torrential"; + maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index 51d591995b768..dbe3bb50e6d0b 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = { description = "A cross platform front-end for the Transmission Bit-Torrent client"; - homepage = https://sourceforge.net/p/transgui; + homepage = "https://sourceforge.net/p/transgui"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ ramkromberg ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix index e05ca43eb5077..7c6e35752a016 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Curses interface for the Transmission BitTorrent daemon"; - homepage = https://github.com/fagga/transmission-remote-cli; + homepage = "https://github.com/fagga/transmission-remote-cli"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 68babaddd1bc8..8e74b82b69d38 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GTK remote control for the Transmission BitTorrent client"; - homepage = https://github.com/ajf8/transmission-remote-gtk; + homepage = "https://github.com/ajf8/transmission-remote-gtk"; license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 25996953e11ac..d59cdff34fd99 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,47 +1,81 @@ -{ stdenv, fetchurl, pkgconfig, intltool, file, wrapGAppsHook -, openssl, curl, libevent, inotify-tools, systemd, zlib -, enableGTK3 ? false, gtk3 +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkgconfig +, openssl +, curl +, libevent +, inotify-tools +, systemd +, zlib +, pcre + # Build options +, enableGTK3 ? false +, gnome3 +, xorg +, wrapGAppsHook +, enableQt ? false +, qt5 , enableSystemd ? stdenv.isLinux , enableDaemon ? true , enableCli ? true }: -let inherit (stdenv.lib) optional optionals optionalString; in +let + version = "3.00"; -stdenv.mkDerivation rec { - name = "transmission-" + optionalString enableGTK3 "gtk-" + version; - version = "2.94"; +in stdenv.mkDerivation { + pname = "transmission"; + inherit version; - src = fetchurl { - url = "https://github.com/transmission/transmission-releases/raw/master/transmission-2.94.tar.xz"; - sha256 = "0zbbj7rlm6m7vb64x68a64cwmijhsrwx9l63hbwqs7zr9742qi1m"; + src = fetchFromGitHub { + owner = "transmission"; + repo = "transmission"; + rev = version; + sha256 = "0ccg0km54f700x9p0jsnncnwvfnxfnxf7kcm7pcx1cj0vw78924z"; + fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ] - ++ optionals enableGTK3 [ wrapGAppsHook ]; - buildInputs = [ intltool file openssl curl libevent zlib ] - ++ optionals enableGTK3 [ gtk3 ] - ++ optionals enableSystemd [ systemd ] - ++ optionals stdenv.isLinux [ inotify-tools ]; - - postPatch = '' - substituteInPlace ./configure \ - --replace "libsystemd-daemon" "libsystemd" \ - --replace "/usr/bin/file" "${file}/bin/file" \ - --replace "test ! -d /Developer/SDKs/MacOSX10.5.sdk" "false" - ''; - - configureFlags = [ - ("--enable-cli=" + (if enableCli then "yes" else "no")) - ("--enable-daemon=" + (if enableDaemon then "yes" else "no")) - "--disable-mac" # requires xcodebuild - ] - ++ optional enableSystemd "--with-systemd-daemon" - ++ optional enableGTK3 "--with-gtk"; - - NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation"; - - meta = with stdenv.lib; { + cmakeFlags = + let + mkFlag = opt: if opt then "ON" else "OFF"; + in + [ + "-DENABLE_MAC=OFF" # requires xcodebuild + "-DENABLE_GTK=${mkFlag enableGTK3}" + "-DENABLE_QT=${mkFlag enableQt}" + "-DENABLE_DAEMON=${mkFlag enableDaemon}" + "-DENABLE_CLI=${mkFlag enableCli}" + ]; + + nativeBuildInputs = [ + pkgconfig + cmake + ] + ++ lib.optionals enableGTK3 [ wrapGAppsHook ] + ++ lib.optionals enableQt [ qt5.wrapQtAppsHook ] + ; + + buildInputs = [ + openssl + curl + libevent + zlib + pcre + ] + ++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ] + ++ lib.optionals enableGTK3 [ gnome3.gtk xorg.libpthreadstubs ] + ++ lib.optionals enableSystemd [ systemd ] + ++ lib.optionals stdenv.isLinux [ inotify-tools ] + ; + + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; + + # Reduce the risk of collisions + postInstall = "rm -r $out/share/doc"; + + meta = { description = "A fast, easy and free BitTorrent client"; longDescription = '' Transmission is a BitTorrent client which features a simple interface @@ -54,10 +88,10 @@ stdenv.mkDerivation rec { * Bluetack (PeerGuardian) blocklists with automatic updates * Full encryption, DHT, and PEX support ''; - homepage = http://www.transmissionbt.com/; - license = licenses.gpl2; # parts are under MIT - maintainers = with maintainers; [ astsmtl vcunat wizeman ]; - platforms = platforms.unix; + homepage = "http://www.transmissionbt.com/"; + license = lib.licenses.gpl2; # parts are under MIT + maintainers = with lib.maintainers; [ astsmtl vcunat wizeman ]; + platforms = lib.platforms.unix; }; -} +} diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index e9c5f27414326..ed1129b238ac0 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -71,6 +71,11 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString enablePlayer '' --prefix LD_LIBRARY_PATH : ${vlc}/lib ''} + + mkdir -p $out/share/applications $out/share/icons $out/share/man/man1 + cp $out/Tribler/Main/Build/Ubuntu/tribler.desktop $out/share/applications/tribler.desktop + cp $out/Tribler/Main/Build/Ubuntu/tribler_big.xpm $out/share/icons/tribler.xpm + cp $out/Tribler/Main/Build/Ubuntu/tribler.1 $out/share/man/man1/tribler.1 ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index 30491470392ac..03cb381f5eb4a 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.twister.net.co/; + homepage = "http://www.twister.net.co/"; description = "Peer-to-peer microblogging"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/p2p/vuze/default.nix b/pkgs/applications/networking/p2p/vuze/default.nix index b1d3c73129aa7..be2421ef4d264 100644 --- a/pkgs/applications/networking/p2p/vuze/default.nix +++ b/pkgs/applications/networking/p2p/vuze/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Torrent client"; - homepage = http://www.vuze.com; + homepage = "http://www.vuze.com"; license = licenses.unfree; platforms = platforms.all; maintainers = with maintainers; [ volth ]; diff --git a/pkgs/applications/networking/ping/default.nix b/pkgs/applications/networking/ping/default.nix index 925618bbe9915..ed63a72f2109b 100644 --- a/pkgs/applications/networking/ping/default.nix +++ b/pkgs/applications/networking/ping/default.nix @@ -12,7 +12,9 @@ , json-glib , libsoup , libgee -, wrapGAppsHook }: +, wrapGAppsHook +, vala_0_40 +}: stdenv.mkDerivation rec { pname = "ping"; @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - vala + vala_0_40 pkgconfig python3 wrapGAppsHook @@ -57,8 +59,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A helpful tool that lets you debug what part of your API is causing you issues"; - homepage = https://github.com/jeremyvaartjes/ping; - maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + homepage = "https://github.com/jeremyvaartjes/ping"; + maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index f3d41219470de..7319dd4a44fa3 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, libsamplerate, alsaLib }: +{ stdenv, fetchFromGitHub, openssl, libsamplerate, alsaLib, AppKit }: stdenv.mkDerivation rec { pname = "pjsip"; @@ -11,12 +11,19 @@ stdenv.mkDerivation rec { sha256 = "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0"; }; - patches = [ ./fix-aarch64.patch ]; + patches = [ + ./fix-aarch64.patch + ]; - buildInputs = [ openssl libsamplerate alsaLib ]; + buildInputs = [ openssl libsamplerate ] + ++ stdenv.lib.optional stdenv.isLinux alsaLib + ++ stdenv.lib.optional stdenv.isDarwin AppKit; preConfigure = '' export LD=$CC + '' # Fixed on master, remove with 2.11 + + stdenv.lib.optionalString stdenv.isDarwin '' + NIX_CFLAGS_COMPILE+=" -framework Security" ''; postInstall = '' @@ -29,11 +36,11 @@ stdenv.mkDerivation rec { # We need the libgcc_s.so.1 loadable (for pthread_cancel to work) dontPatchELF = true; - meta = { + meta = with stdenv.lib; { description = "A multimedia communication library written in C, implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE"; - homepage = https://pjsip.org/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [olynch]; - platforms = with stdenv.lib.platforms; linux; + homepage = "https://pjsip.org/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ olynch ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/networking/protocol/default.nix b/pkgs/applications/networking/protocol/default.nix index 8785d2449b3e8..31b1bd6086ad5 100644 --- a/pkgs/applications/networking/protocol/default.nix +++ b/pkgs/applications/networking/protocol/default.nix @@ -13,7 +13,7 @@ buildPythonApplication { meta = with stdenv.lib; { description = "An ASCII Header Generator for Network Protocols"; - homepage = https://github.com/luismartingarcia/protocol; + homepage = "https://github.com/luismartingarcia/protocol"; license = licenses.gpl3; maintainers = with maintainers; [ teto ]; }; diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix index f426a7c3a581d..c48f6c8202691 100644 --- a/pkgs/applications/networking/protonvpn-cli/default.nix +++ b/pkgs/applications/networking/protonvpn-cli/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ProtonVPN Command-Line Tool"; - homepage = https://github.com/ProtonVPN/protonvpn-cli; + homepage = "https://github.com/ProtonVPN/protonvpn-cli"; maintainers = with maintainers; [ caugner ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/networking/ps2client/default.nix b/pkgs/applications/networking/ps2client/default.nix index d75f92cb25c7f..02b14b72c18b0 100644 --- a/pkgs/applications/networking/ps2client/default.nix +++ b/pkgs/applications/networking/ps2client/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Desktop clients to interact with ps2link and ps2netfs"; - homepage = https://github.com/ps2dev/ps2client; + homepage = "https://github.com/ps2dev/ps2client"; license = licenses.bsd3; maintainers = [ maintainers.genesis ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/pyload/beautifulsoup.nix b/pkgs/applications/networking/pyload/beautifulsoup.nix index 66470bf8f3147..8eb0c2298fd3a 100644 --- a/pkgs/applications/networking/pyload/beautifulsoup.nix +++ b/pkgs/applications/networking/pyload/beautifulsoup.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonPackage { doCheck = false; meta = { - homepage = http://www.crummy.com/software/BeautifulSoup/; + homepage = "http://www.crummy.com/software/BeautifulSoup/"; license = "bsd"; description = "Undemanding HTML/XML parser"; }; diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix index 3df21d414e04e..f173e56abb34e 100644 --- a/pkgs/applications/networking/pyload/default.nix +++ b/pkgs/applications/networking/pyload/default.nix @@ -52,7 +52,7 @@ in pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Free and open source downloader for 1-click-hosting sites"; - homepage = https://github.com/pyload/pyload; + homepage = "https://github.com/pyload/pyload"; license = licenses.gpl3; maintainers = [ maintainers.mahe ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 3e639c2834930..9425f260e4f07 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -5,7 +5,7 @@ let sha256 = { - x86_64-linux = "1ry21zw5ghba4xjx8dvimlpprgap7n8j9lqhjsciahbvc16vx5ks"; + x86_64-linux = "1vpfyffg1g7f1m4mxmqghswihml9rm1cipm7krmr5wvxdmcphxnk"; i386-linux = "0vjxbg5hwkqkh600rr75xviwy848r1xw9mxwf6bb6l8b0isvlsgg"; }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "5.5.4"; + version = "5.5.6"; src = fetchurl { urls = [ diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix index f6ec85f3c2cf0..a62b1bf5ee155 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/default.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix @@ -24,7 +24,7 @@ , gtk_engines , alsaLib , zlib -, version ? "19.12.0" +, version ? "20.04.0" }: let @@ -38,7 +38,7 @@ let x86hash = "16v3kgavrh62z6vxcbw6mn7h0bfishpl7m92k7g1p2882r1f8vaf"; x64suffix = "60"; x86suffix = "60"; - homepage = https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest.html; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest.html"; }; "19.8.0" = { @@ -49,7 +49,7 @@ let x86hash = "0afcqirb4q349r3izy88vqkszg6y2wg14iwypk6nrmvwgvcl6jdn"; x64suffix = "20"; x86suffix = "20"; - homepage = https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1908.html; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1908.html"; }; "19.10.0" = { @@ -60,7 +60,7 @@ let x86hash = "000zjik8wf8b6fadnsai0p77b4n2l95544zx503iyrb9pv53bj3y"; x64suffix = "15"; x86suffix = "15"; - homepage = https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1910.html; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1910.html"; }; "19.12.0" = { @@ -71,7 +71,18 @@ let x86hash = "07rfp90ksnvr8zv7ix7f0z6a59n48s7bd4kqbzilfwxgs4ddqmcy"; x64suffix = "19"; x86suffix = "19"; - homepage = https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1912.html"; + }; + + "20.04.0" = { + major = "20"; + minor = "04"; + patch = "0"; + x64hash = "E923592216F9541173846F932784E6C062CB09C9E8858219C7489607BF82A0FB"; + x86hash = "A2E2E1882723DA6796E68916B3BB2B44DD575A83DEB03CA90A262F6C81B1A53F"; + x64suffix = "21"; + x86suffix = "21"; + homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 5963c6b6c950d..66f4d38657266 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -1,67 +1,99 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, alsaLib, ffmpeg, glib, openssl, pcre, zlib -, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama, libXrandr, libXrender, libXv -, libxkbcommon, libxkbfile -, wayland -, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc -, libpulseaudio ? null -, cups ? null -, pcsclite ? null -, systemd ? null -, buildServer ? true -, nocaps ? false -}: +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg, glib, openssl +, pcre, zlib, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama +, libXrandr, libXrender, libXv, libXtst, libxkbcommon, libxkbfile, wayland +, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt +, libusb1, libpulseaudio ? null, cups ? null, pcsclite ? null, systemd ? null +, buildServer ? true, nocaps ? false }: -stdenv.mkDerivation rec { +let + cmFlag = flag: if flag then "ON" else "OFF"; + disabledTests = [ + # this one is probably due to our sandbox + { + dir = "libfreerdp/crypto/test"; + file = "Test_x509_cert_info.c"; + } + ]; + +in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.0.0-rc4"; + version = "2.1.0"; src = fetchFromGitHub { - owner = "FreeRDP"; - repo = "FreeRDP"; - rev = version; - sha256 = "0546i0m2d4nz5jh84ngwzpcm3c43fp987jk6cynqspsmvapab6da"; + owner = "FreeRDP"; + repo = "FreeRDP"; + rev = version; + sha256 = "0905374k4x647052sr27m2hgjcavbxdl0xd8n02vm5xa6whz239j"; }; - # outputs = [ "bin" "out" "dev" ]; - - prePatch = '' + postPatch = '' export HOME=$TMP + + # failing test(s) + ${lib.concatMapStringsSep "\n" (e: '' + substituteInPlace ${e.dir}/CMakeLists.txt \ + --replace ${e.file} "" + rm ${e.dir}/${e.file} + '') disabledTests} + substituteInPlace "libfreerdp/freerdp.pc.in" \ --replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@" '' + lib.optionalString (pcsclite != null) '' substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \ - --replace "libpcsclite.so" "${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so" + --replace "libpcsclite.so" "${lib.getLib pcsclite}/lib/libpcsclite.so" '' + lib.optionalString nocaps '' substituteInPlace "libfreerdp/locale/keyboard_xkbfile.c" \ --replace "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL" ''; - buildInputs = with lib; [ - alsaLib cups ffmpeg glib openssl pcre pcsclite libpulseaudio zlib - gstreamer gst-plugins-base gst-plugins-good libunwind orc - libX11 libXcursor libXdamage libXext libXi libXinerama libXrandr libXrender libXv - libxkbcommon libxkbfile - wayland - ] ++ optional stdenv.isLinux systemd; - - nativeBuildInputs = [ - cmake pkgconfig - ]; + buildInputs = with lib; + [ + alsaLib + cups + ffmpeg + glib + gst-plugins-base + gst-plugins-good + gstreamer + libX11 + libXcursor + libXdamage + libXext + libXi + libXinerama + libXrandr + libXrender + libXtst + libXv + libpulseaudio + libunwind + libusb1 + libxkbcommon + libxkbfile + libxslt + openssl + orc + pcre + pcsclite + wayland + zlib + ] ++ optional stdenv.isLinux systemd; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake pkgconfig ]; - doCheck = false; + doCheck = true; - cmakeFlags = with lib; [ - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DWITH_CUNIT=OFF" - "-DWITH_OSS=OFF" - ] ++ optional (libpulseaudio != null) "-DWITH_PULSE=ON" - ++ optional (cups != null) "-DWITH_CUPS=ON" - ++ optional (pcsclite != null) "-DWITH_PCSC=ON" - ++ optional buildServer "-DWITH_SERVER=ON" - ++ optional (stdenv.isx86_64) "-DWITH_SSE2=ON"; + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ] + ++ lib.mapAttrsToList (k: v: "-D${k}=${if v then "ON" else "OFF"}") { + BUILD_TESTING = doCheck; + WITH_CUNIT = doCheck; + WITH_CUPS = (cups != null); + WITH_OSS = false; + WITH_PCSC = (pcsclite != null); + WITH_PULSE = (libpulseaudio != null); + WITH_SERVER = buildServer; + WITH_SSE2 = stdenv.isx86_64; + }; meta = with lib; { description = "A Remote Desktop Protocol Client"; @@ -69,9 +101,9 @@ stdenv.mkDerivation rec { FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP) following the Microsoft Open Specifications. ''; - homepage = http://www.freerdp.com/; + homepage = "https://www.freerdp.com/"; license = licenses.asl20; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg lheckemann ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 49182ec182fef..804a40a614c5d 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { platforms, along with an xterm terminal emulator. It is written and maintained primarily by Simon Tatham. ''; - homepage = https://www.chiark.greenend.org.uk/~sgtatham/putty/; + homepage = "https://www.chiark.greenend.org.uk/~sgtatham/putty/"; license = licenses.mit; platforms = platforms.unix ++ platforms.windows; }; diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index 9c9abe55daa61..4c67105dafc25 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -1,21 +1,21 @@ -{stdenv, fetchFromGitHub, openssl, libX11, libgssglue, pkgconfig, autoreconfHook +{stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkgconfig, autoreconfHook , enableCredssp ? (!stdenv.isDarwin) } : stdenv.mkDerivation (rec { pname = "rdesktop"; - version = "1.8.6"; + version = "1.9.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "02sbhnqbasa54c75c86qw9w9h9sxxbnldj7bjv2gvn18lmq5rm20"; + sha256 = "1s6k1jwd28y38ymk3lfv76ch4arpfwrbdhpkbnwwy3fc4617gb78"; }; nativeBuildInputs = [pkgconfig autoreconfHook]; - buildInputs = [openssl libX11] - ++ stdenv.lib.optional enableCredssp libgssglue; + buildInputs = [openssl libX11 libXcursor libtasn1 nettle gnutls] + ++ stdenv.lib.optional enableCredssp krb5; configureFlags = [ "--with-ipv6" @@ -25,7 +25,7 @@ stdenv.mkDerivation (rec { meta = { description = "Open source client for Windows Terminal Services"; - homepage = http://www.rdesktop.org/; + homepage = "http://www.rdesktop.org/"; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 3e41649d8cc02..92f76e5e6d854 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "084yw0fd3qmzzd6xinhf4plv5bg8gfj4jnfac7zi1nif8zilf456"; + sha256 = "11s39xcy80rarkddw31v621zpai1vdr52iam367l69mcbc40xg36"; }; nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 6fe77790b74ac..dbb9d465cc7fc 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -57,7 +57,7 @@ mkDerivation rec { preferLocalBuild = true; meta = with lib; { - homepage = http://www.teamviewer.com; + homepage = "http://www.teamviewer.com"; license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/applications/networking/remote/waypipe/default.nix index d253e766284fe..03be60a99489a 100644 --- a/pkgs/applications/networking/remote/waypipe/default.nix +++ b/pkgs/applications/networking/remote/waypipe/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { serializes changes to shared memory buffers over a single socket. This makes application forwarding similar to ssh -X feasible. ''; - homepage = https://mstoeckl.com/notes/gsoc/blog.html; + homepage = "https://mstoeckl.com/notes/gsoc/blog.html"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 13bcbf9b57e11..047458067357c 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -32,7 +32,7 @@ mkDerivation { meta = with stdenv.lib; { description = "Graphical NoMachine NX3 remote desktop client"; - homepage = http://x2go.org/; + homepage = "http://x2go.org/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index 5d33f186df7bd..9941951225ca3 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -96,7 +96,7 @@ let meta = with stdenv.lib; { description = "An open source RDP server"; - homepage = https://github.com/neutrinolabs/xrdp; + homepage = "https://github.com/neutrinolabs/xrdp"; license = licenses.asl20; maintainers = [ maintainers.volth ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 14d418cd2bfb5..9b06676b0179d 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { pname = "resilio-sync"; - version = "2.6.4"; + version = "2.7.0"; src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - x86_64-linux = "1c1yksjag58p7yjm72iiz82p2r01lq7kxvq7z5phmq5z6gxdg4a8"; - i686-linux = "167baz9fzmzk50jffzvgmgyw1zw3955r3cb73z23qvw8zqzdqydc"; + x86_64-linux = "17vw4kyggmi8phm91jx1skkd7vrdhbahibv6d6zm14q87r01a56f"; + i686-linux = "0yvy3lif2g4jchcp5q1r5b8ndj8009pcq5js7r0kl20bmmcmzklg"; }.${stdenv.hostPlatform.system}; }; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Automatically sync files via secure, distributed technology"; - homepage = https://www.resilio.com/; + homepage = "https://www.resilio.com/"; license = licenses.unfreeRedistributable; platforms = platforms.linux; maintainers = with maintainers; [ domenkozar thoughtpolice cwoac ]; diff --git a/pkgs/applications/networking/scaleft/default.nix b/pkgs/applications/networking/scaleft/default.nix new file mode 100644 index 0000000000000..991780bd8206a --- /dev/null +++ b/pkgs/applications/networking/scaleft/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, rpmextract, patchelf, bash }: + +stdenv.mkDerivation rec { + pname = "scaleft"; + version = "1.41.0"; + + src = + fetchurl { + url = "http://pkg.scaleft.com/rpm/scaleft-client-tools-${version}-1.x86_64.rpm"; + sha256 = "a9a2f60cc85167a1098f44b35efd755b8155f0b88da8572e96ace767e7933c4d"; + }; + + nativeBuildInputs = [ patchelf rpmextract ]; + + libPath = + stdenv.lib.makeLibraryPath + [ stdenv.cc stdenv.cc.cc.lib ]; + + buildCommand = '' + mkdir -p $out/bin/ + cd $out + rpmextract $src + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + usr/bin/sft + patchelf \ + --set-rpath ${libPath} \ + usr/bin/sft + ln -s $out/usr/bin/sft $out/bin/sft + chmod +x $out/bin/sft + patchShebangs $out + ''; + + meta = with stdenv.lib; { + description = "ScaleFT provides Zero Trust software which you can use to secure your internal servers and services"; + homepage = "https://www.scaleft.com"; + license = licenses.unfree; + maintainers = with maintainers; [ jloyet ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 75ba68db3a808..0893ee21a558a 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "seafile-client"; - version = "7.0.5"; + version = "7.0.7"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "08ysmhvdpyzq2s16i3fvii252fzjrxly3da74x8y6wbyy8yywmjy"; + sha256 = "0szdyprljyckmbrw5sypizs22j96q84ak6nyidyr2j6gf4grh9mg"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix index dc578dccd19de..c81cc78a9b551 100644 --- a/pkgs/applications/networking/sieve-connect/default.nix +++ b/pkgs/applications/networking/sieve-connect/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { as specifed in RFC 5804. Historically, this was MANAGESIEVE as implemented by timsieved in Cyrus IMAP. ''; - homepage = https://github.com/philpennock/sieve-connect; + homepage = "https://github.com/philpennock/sieve-connect"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ das_j ]; diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix index cd697f107b358..e664ee20c237a 100644 --- a/pkgs/applications/networking/siproxd/default.nix +++ b/pkgs/applications/networking/siproxd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libosip ]; meta = { - homepage = http://siproxd.sourceforge.net/; + homepage = "http://siproxd.sourceforge.net/"; description = "A masquerading SIP Proxy Server"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index 81c48cff4a012..4cc4487c90ada 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -2,10 +2,10 @@ popt, itstool, libxml2 }: stdenv.mkDerivation rec { - name = "etherape-0.9.18"; + name = "etherape-0.9.19"; src = fetchurl { url = "mirror://sourceforge/etherape/${name}.tar.gz"; - sha256 = "0y9cfc5iv5zy82j165i9agf45n1ixka064ykdvpdhb07sr3lzhmv"; + sha256 = "0w63vg2q6if3wvy2md66in8b6cdw9q40hny5xy6yrxky58l4kmg7"; }; nativeBuildInputs = [ itstool pkgconfig (stdenv.lib.getBin libxml2) ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://etherape.sourceforge.net/; + homepage = "http://etherape.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ symphorien ]; diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index c548098baa7ef..4af8e526cd2c5 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { of many protocols and includes many features for network and host analysis. ''; - homepage = https://www.ettercap-project.org/; + homepage = "https://www.ettercap-project.org/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index 0005a5d230d7c..93ccf254a3a47 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -1,16 +1,37 @@ -{ stdenv, fetchurl, pkgconfig, libpcap, ncurses, expat, pcre, libnl }: +{ stdenv, fetchurl, pkgconfig, libpcap, pcre, libnl, zlib, libmicrohttpd +, sqlite, protobuf, protobufc, libusb1, libcap, binutils, elfutils +, withNetworkManager ? false, glib, networkmanager +, withPython ? false, python3 +, withSensors ? false, lm_sensors}: + +# couldn't get python modules to build correctly, +# waiting for some other volunteer to fix it +assert !withPython; stdenv.mkDerivation rec { pname = "kismet"; - version = "2016-07-R1"; + version = "2020-04-R2"; src = fetchurl { url = "https://www.kismetwireless.net/code/${pname}-${version}.tar.xz"; - sha256 = "0dz28y4ay4lskhl0lawqy2dkcrhgfkbg06v22qxzzw8i6caizcmx"; + sha256 = "0hxmaln0y6bk9m1rshr4swmg0sqy3ic693vfk8haj7f5gnph96cm"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libpcap ncurses expat pcre libnl ]; + + buildInputs = [ + libpcap pcre libmicrohttpd libnl zlib sqlite protobuf protobufc + libusb1 libcap binutils elfutils + ] ++ stdenv.lib.optionals withNetworkManager [ networkmanager glib ] + ++ stdenv.lib.optional withSensors lm_sensors + ++ stdenv.lib.optional withPython (python3.withPackages(ps: [ ps.setuptools ps.protobuf + ps.numpy ps.pyserial ])); + + configureFlags = [] + ++ stdenv.lib.optional (!withNetworkManager) "--disable-libnm" + ++ stdenv.lib.optional (!withPython) "--disable-python-tools" + ++ stdenv.lib.optional (!withSensors) "--disable-lmsensors"; + postConfigure = '' sed -e 's/-o $(INSTUSR)//' \ -e 's/-g $(INSTGRP)//' \ @@ -19,9 +40,11 @@ stdenv.mkDerivation rec { -i Makefile ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Wireless network sniffer"; - homepage = https://www.kismetwireless.net/; + homepage = "https://www.kismetwireless.net/"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index 5c536b8aec232..b48edd69837a5 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sngrep"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = "irontec"; repo = pname; rev = "v${version}"; - sha256 = "0fj13pim5bfm3a2nr05apspraf29klpmcnhmycklfmrlncq5xqdf"; + sha256 = "1dx5l48m4634y0zi6wjky412g80lfxqq1nphv7pi1kwvm1k5m5ri"; }; buildInputs = [ diff --git a/pkgs/applications/networking/sniffers/whsniff/default.nix b/pkgs/applications/networking/sniffers/whsniff/default.nix new file mode 100644 index 0000000000000..d2e5803d58a13 --- /dev/null +++ b/pkgs/applications/networking/sniffers/whsniff/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, libusb1 }: + +stdenv.mkDerivation rec { + pname = "whsniff"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "homewsn"; + repo = pname; + rev = "v${version}"; + sha256 = "000l5vk9c0332m35lndk8892ivdr445lgg25hmq1lajn24cash5w"; + }; + + buildInputs = [ libusb1 ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/homewsn/whsniff"; + description = "Packet sniffer for 802.15.4 wireless networks"; + maintainers = with maintainers; [ snicket2100 ]; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 7602cb5fe6afa..7166ebe93d71a 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with stdenv.lib; let - version = "3.2.3"; + version = "3.2.4"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "1fpsfjrap7j84sy728yhcr2gad9nq3n5gq03mwrmxnc6ijwf81zh"; + sha256 = "1amqgn94g6h6cfnsccm2zb4c73pfv1qmzi1i6h1hnbcyhhg4czfi"; }; cmakeFlags = [ diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix index 9de525d93245e..32a6423243e6b 100644 --- a/pkgs/applications/networking/soapui/default.nix +++ b/pkgs/applications/networking/soapui/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The Most Advanced REST & SOAP Testing Tool in the World"; - homepage = https://www.soapui.org/; + homepage = "https://www.soapui.org/"; license = "SoapUI End User License Agreement"; maintainers = with maintainers; [ gerschtli ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix index 158e6c5dad154..d673917af3161 100644 --- a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix +++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix @@ -36,7 +36,7 @@ python27Packages.buildPythonApplication { meta = { description = "A graphical client for the SoulSeek peer-to-peer system"; - homepage = https://www.nicotine-plus.org; + homepage = "https://www.nicotine-plus.org"; license = licenses.gpl3; maintainers = with maintainers; [ klntsky ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index 11c8af368b953..90d8ea5533184 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ patchelf makeWrapper ]; meta = { - homepage = https://spideroak.com; + homepage = "https://spideroak.com"; description = "Secure online backup and sychronization"; license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [ amorsillo ]; diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix index c7766889f5029..db33e7e6bb211 100644 --- a/pkgs/applications/networking/ssb/patchwork/default.nix +++ b/pkgs/applications/networking/ssb/patchwork/default.nix @@ -2,12 +2,12 @@ let pname = "ssb-patchwork"; - version = "3.17.6"; + version = "3.17.7"; name = "Patchwork-${version}"; src = fetchurl { url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage"; - sha256 = "0bq4pi0rmfsyiiapnhkkhikg2a2jzqlna4gvk6gw7wl0r8a111cs"; + sha256 = "1xj2aqy7daf4r3ypch6hkvk1s0jnx70qwh0p63c7rzm16vh8kb2f"; }; binary = appimageTools.wrapType2 { diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix index c5ff090a80768..7a70375e42c9d 100644 --- a/pkgs/applications/networking/super-productivity/default.nix +++ b/pkgs/applications/networking/super-productivity/default.nix @@ -98,7 +98,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "To Do List / Time Tracker with Jira Integration."; - homepage = https://super-productivity.com; + homepage = "https://super-productivity.com"; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix index 669ab4d1e3e52..c95647c784057 100644 --- a/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/pkgs/applications/networking/sync/acd_cli/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "A command line interface and FUSE filesystem for Amazon Cloud Drive"; - homepage = https://github.com/yadayada/acd_cli; + homepage = "https://github.com/yadayada/acd_cli"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 36c4dd46222eb..6244cd661d0ad 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/bit-team/backintime; + homepage = "https://github.com/bit-team/backintime"; description = "Simple backup tool for Linux"; license = stdenv.lib.licenses.gpl2; maintainers = [ ]; diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix index 82a99bf2df10b..461de492ae2db 100644 --- a/pkgs/applications/networking/sync/casync/default.nix +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Content-Addressable Data Synchronizer"; - homepage = https://github.com/systemd/casync; + homepage = "https://github.com/systemd/casync"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ flokli ]; diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/applications/networking/sync/desync/default.nix index d38f8b53dbbf1..9831ab34b2eb2 100644 --- a/pkgs/applications/networking/sync/desync/default.nix +++ b/pkgs/applications/networking/sync/desync/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Content-addressed binary distribution system"; longDescription = "An alternate implementation of the casync protocol and storage mechanism with a focus on production-readiness"; - homepage = https://github.com/folbricht/desync; + homepage = "https://github.com/folbricht/desync"; license = licenses.bsd3; platforms = platforms.unix; # *may* work on Windows, but varies between releases. maintainers = [ maintainers.chaduffy ]; diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index 832f7c63f275b..9573e1717de90 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/axkibe/lsyncd; + homepage = "https://github.com/axkibe/lsyncd"; description = "A utility that synchronizes local directories with remote targets"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index d6f37583abe58..2fde398b2f5fa 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, buildPackages }: +{ stdenv, buildGoPackage, fetchFromGitHub, buildPackages, installShellFiles }: buildGoPackage rec { pname = "rclone"; @@ -15,25 +15,28 @@ buildGoPackage rec { subPackages = [ "." ]; - outputs = [ "bin" "out" "man" ]; + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ installShellFiles ]; postInstall = let rcloneBin = if stdenv.buildPlatform == stdenv.hostPlatform - then "$bin" + then "$out" else stdenv.lib.getBin buildPackages.rclone; in '' - install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1 - mkdir -p $bin/share/zsh/site-functions $bin/share/bash-completion/completions/ - ${rcloneBin}/bin/rclone genautocomplete zsh $bin/share/zsh/site-functions/_rclone - ${rcloneBin}/bin/rclone genautocomplete bash $bin/share/bash-completion/completions/rclone.bash + installManPage $src/rclone.1 + for shell in bash zsh; do + ${rcloneBin}/bin/rclone genautocomplete $shell rclone.$shell + installShellCompletion rclone.$shell + done ''; meta = with stdenv.lib; { description = "Command line program to sync files and directories to and from major cloud storage"; - homepage = https://rclone.org; + homepage = "https://rclone.org"; license = licenses.mit; maintainers = with maintainers; [ danielfullmer ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix index fc4bc6c0671e4..a0522dfe82023 100644 --- a/pkgs/applications/networking/sync/rsync/base.nix +++ b/pkgs/applications/networking/sync/rsync/base.nix @@ -15,7 +15,7 @@ rec { meta = with stdenv.lib; { description = "Fast incremental file transfer utility"; - homepage = https://rsync.samba.org/; + homepage = "https://rsync.samba.org/"; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 9c49b22d94433..7b7318544c56a 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses +{stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep , enableX11 ? true}: let inherit (ocamlPackages) ocaml lablgtk; in @@ -38,14 +38,14 @@ stdenv.mkDerivation (rec { postInstall = if enableX11 then '' for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ - --run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")" + --run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | ${gnugrep}/bin/grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")" done '' else ""; dontStrip = !ocaml.nativeCompilers; meta = { - homepage = https://www.cis.upenn.edu/~bcpierce/unison/; + homepage = "https://www.cis.upenn.edu/~bcpierce/unison/"; description = "Bidirectional file synchronizer"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 920a1c97539e0..0613a5c5bcd90 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://syncplay.pl/; + homepage = "https://syncplay.pl/"; description = "Free software that synchronises media players"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 3e2b7cf67f200..cf1e053dd53c1 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -57,7 +57,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "GTK3 & python based GUI for Syncthing"; - homepage = https://github.com/syncthing/syncthing-gtk; + homepage = "https://github.com/syncthing/syncthing-gtk"; license = licenses.gpl2; maintainers = with maintainers; [ ]; platforms = syncthing.meta.platforms; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index c880f7db86696..a00d0eb819eaa 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,19 +1,19 @@ -{ buildGoModule, stdenv, lib, procps, fetchFromGitHub }: +{ buildGoModule, stdenv, lib, procps, fetchFromGitHub, nixosTests }: let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.4.2"; + version = "1.5.0"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0pfzpbdir2agwsyfjh1rxlyyd225xmyrr4k2g4vlg5r12kpcjwya"; + sha256 = "0yy31rfvr9d6kidfvvy36ljxlc14x5ir3ln19zg4k02hdqn0xkpj"; }; - modSha256 = "0qjhb55nd8mlnswbk8bgl2sb9angmv8fnympmmyqj1dqa7lcs87z"; + vendorSha256 = "03df08nghcf6k3a7xxgw03cq2mvvkmrrzzai0w18mrga0aa700c9"; patches = [ ./add-stcli-target.patch @@ -35,8 +35,13 @@ let inherit postInstall; + passthru.tests = with nixosTests; { + init = syncthing-init; + relay = syncthing-relay; + }; + meta = with lib; { - homepage = https://www.syncthing.net/; + homepage = "https://www.syncthing.net/"; description = "Open Source Continuous File Synchronization"; license = licenses.mpl20; maintainers = with maintainers; [ pshendry joko peterhoeg andrew-d ]; @@ -98,4 +103,4 @@ in { --replace /usr/bin/strelaysrv $out/bin/strelaysrv ''; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix new file mode 100644 index 0000000000000..a890aefe8cd6f --- /dev/null +++ b/pkgs/applications/networking/termius/default.nix @@ -0,0 +1,68 @@ +{ atomEnv +, autoPatchelfHook +, dpkg +, fetchurl +, makeDesktopItem +, makeWrapper +, stdenv +, udev +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "termius"; + version = "5.10.1"; + + src = fetchurl { + url = "https://deb.termius.com/pool/main/t/termius-app/termius-app_${version}_amd64.deb"; + sha256 = "04zh0zzyp906lf6mz3xzxybn2a55rv3vvrj0m12gnrb8kjb3pk5s"; + }; + + desktopItem = makeDesktopItem { + categories = "Network;"; + comment = "The SSH client that works on Desktop and Mobile"; + desktopName = "Termius"; + exec = "termius-app"; + genericName = "Cross-platform SSH client"; + icon = "termius-app"; + name = "termius-app"; + }; + + dontBuild = true; + dontConfigure = true; + dontPatchELF = true; + dontWrapGApps = true; + + nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook ]; + + buildInputs = atomEnv.packages; + + unpackPhase = "dpkg-deb -x $src ."; + + installPhase = '' + mkdir -p "$out/bin" + cp -R "opt" "$out" + cp -R "usr/share" "$out/share" + chmod -R g-w "$out" + + # Desktop file + mkdir -p "$out/share/applications" + cp "${desktopItem}/share/applications/"* "$out/share/applications" + ''; + + runtimeDependencies = [ udev.lib ]; + + postFixup = '' + makeWrapper $out/opt/Termius/termius-app $out/bin/termius-app \ + "''${gappsWrapperArgs[@]}" + ''; + + meta = with stdenv.lib; { + description = "A cross-platform SSH client with cloud data sync and more"; + homepage = "https://termius.com/"; + downloadPage = "https://termius.com/linux/"; + license = licenses.unfree; + maintainers = with maintainers; [ filalex77 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index e518502d6f372..197756d8ace43 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "testssl.sh"; - version = "3.0rc6"; + version = "3.0.2"; src = fetchFromGitHub { owner = "drwetter"; repo = pname; rev = version; - sha256 = "1ks7pqgrg382ry0a0jf1dwgcwv81snhkrhkjdbcpym6w5flmpjsv"; + sha256 = "0vfpj3g3il3imbydx3j8gx1pgzrxi0czcl9jmi749vnkf5mkmh8w"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/trebleshot/default.nix b/pkgs/applications/networking/trebleshot/default.nix index 1b049ff2dc7f0..56ebe1873ae61 100644 --- a/pkgs/applications/networking/trebleshot/default.nix +++ b/pkgs/applications/networking/trebleshot/default.nix @@ -20,7 +20,7 @@ mkDerivation rec { meta = with lib; { description = "Android file transferring tool for desktop"; - homepage = https://github.com/genonbeta/TrebleShot-Desktop; + homepage = "https://github.com/genonbeta/TrebleShot-Desktop"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index 1a19c8c96b330..d16c1bb944a2d 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Minimalistic Murmur (Mumble server)"; license = licenses.bsd3; - homepage = https://github.com/umurmur/umurmur; + homepage = "https://github.com/umurmur/umurmur"; platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 44b8a955817da..cd0f65d4d4549 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { This means that vnStat won't actually be sniffing any traffic and also ensures light use of system resources. ''; - homepage = https://humdi.net/vnstat/; + homepage = "https://humdi.net/vnstat/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 64fef08ceefd5..9887e34d7354b 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Know the forecast of the next hours & days"; - homepage = https://gitlab.com/bitseater/meteo; + homepage = "https://gitlab.com/bitseater/meteo"; license = licenses.gpl3Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/websocketd/default.nix b/pkgs/applications/networking/websocketd/default.nix index 4160e70b9c444..17f42b5ece4f9 100644 --- a/pkgs/applications/networking/websocketd/default.nix +++ b/pkgs/applications/networking/websocketd/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1qc4yi4kwy7bfi3fb17w58ff0i95yi6m4syldh8j79930syr5y8q"; }; - modSha256 = "18hamj557ln8k3vmvcrpvnydjr1dy7zi9490iacwdldw5vp870xs"; + vendorSha256 = "05k31z4h3b327mh940zh52im4xfk7kf5phb8b7xp4l9bgckhz4lb"; meta = with lib; { description = "Turn any program that uses STDIN/STDOUT into a WebSocket server"; @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = [ maintainers.bjornfor ]; license = licenses.bsd2; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index bf36a6f2bbbde..fae03846b68ed 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "znc"; - version = "1.7.5"; + version = "1.8.0"; src = fetchurl { url = "https://znc.in/releases/archive/${pname}-${version}.tar.gz"; - sha256 = "08a7yb2xs85hyyz8dpzfbsfjwj2r6kcii022lj3l4rf8hl9ix558"; + sha256 = "0m5xf60r40pgbg9lyk56dafxj2hj149pn2wf8vzsp8xgq4kv5zcl"; }; nativeBuildInputs = [ pkgconfig ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Advanced IRC bouncer"; - homepage = https://wiki.znc.in/ZNC; + homepage = "https://wiki.znc.in/ZNC"; maintainers = with maintainers; [ schneefux lnl7 ]; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 5e7bdd09b036c..3fd447b8b096b 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -31,7 +31,7 @@ in { meta = with stdenv.lib; { description = "Request backlog for IRC channels."; - homepage = https://github.com/fruitiex/znc-backlog/; + homepage = "https://github.com/fruitiex/znc-backlog/"; license = licenses.asl20; maintainers = with maintainers; [ infinisil ]; }; @@ -51,7 +51,7 @@ in { meta = with stdenv.lib; { description = "ZNC module for client specific buffers"; - homepage = https://github.com/jpnurmi/znc-clientbuffer; + homepage = "https://github.com/jpnurmi/znc-clientbuffer"; license = licenses.asl20; maintainers = with maintainers; [ hrdinka ]; }; @@ -71,7 +71,7 @@ in { meta = with stdenv.lib; { description = "ZNC clientaway module"; - homepage = https://github.com/kylef/znc-contrib; + homepage = "https://github.com/kylef/znc-contrib"; license = licenses.gpl2; maintainers = with maintainers; [ kiwi ]; }; @@ -92,7 +92,7 @@ in { meta = { description = "ZNC FiSH module"; - homepage = https://github.com/dctrwatson/znc-fish; + homepage = "https://github.com/dctrwatson/znc-fish"; maintainers = [ stdenv.lib.maintainers.offline ]; }; }; @@ -111,7 +111,7 @@ in { meta = with stdenv.lib; { description = "ZNC ignore module"; - homepage = https://github.com/kylef/znc-contrib; + homepage = "https://github.com/kylef/znc-contrib"; license = licenses.gpl2; maintainers = with maintainers; [ kiwi ]; }; @@ -151,7 +151,7 @@ in { meta = with stdenv.lib; { description = "An advanced playback module for ZNC"; - homepage = https://github.com/jpnurmi/znc-playback; + homepage = "https://github.com/jpnurmi/znc-playback"; license = licenses.asl20; maintainers = with maintainers; [ hrdinka ]; }; @@ -171,7 +171,7 @@ in { meta = { description = "ZNC privmsg module"; - homepage = https://github.com/kylef/znc-contrib; + homepage = "https://github.com/kylef/znc-contrib"; }; }; @@ -189,7 +189,7 @@ in { meta = { description = "Push notification service module for ZNC"; - homepage = https://github.com/jreese/znc-push; + homepage = "https://github.com/jreese/znc-push"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ offline schneefux ]; }; diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 0b36b3266efc9..4aa3f936b539d 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Word processing program, similar to Microsoft Word"; - homepage = https://www.abisource.com/; + homepage = "https://www.abisource.com/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ pSub ylwghst sna ]; diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix index 1e1f686ab1941..4f8c115600afb 100644 --- a/pkgs/applications/office/aesop/default.nix +++ b/pkgs/applications/office/aesop/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "aesop"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "1bqykr1mwanfm55w1v9ipqcqgzj8kbjvlm4d5b2swvhng77gnf3d"; + sha256 = "1zxyyxl959rqhyz871dyyccqga2ydybkfcpyjq4vmvdn2g9mvmb0"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/agenda/default.nix b/pkgs/applications/office/agenda/default.nix index 23efbf9c9b540..f7028ad67659a 100644 --- a/pkgs/applications/office/agenda/default.nix +++ b/pkgs/applications/office/agenda/default.nix @@ -1,7 +1,9 @@ { stdenv , fetchFromGitHub , pantheon -, cmake +, meson +, ninja +, python3 , pkg-config , vala , gettext @@ -13,20 +15,23 @@ stdenv.mkDerivation rec { pname = "agenda"; - version = "1.0.12"; + version = "1.1.0"; src = fetchFromGitHub { owner = "dahenson"; repo = pname; rev = version; - sha256 = "128c9p2jkc90imlq25xg5alqlam8q4i3gd5p1kcggf7s4amv8l8w"; + sha256 = "0yfapapsanqacaa83iagar88i335yy2jvay8y6z7gkri7avbs4am"; }; nativeBuildInputs = [ - cmake gettext - vala + glib # for glib-compile-schemas + meson + ninja pkg-config + python3 + vala wrapGAppsHook ]; @@ -37,6 +42,13 @@ stdenv.mkDerivation rec { pantheon.granite ]; + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + doCheck = true; + passthru = { updateScript = pantheon.updateScript { attrPath = pname; @@ -45,8 +57,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple, fast, no-nonsense to-do (task) list designed for elementary OS"; - homepage = https://github.com/dahenson/agenda; - maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + homepage = "https://github.com/dahenson/agenda"; + maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch b/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch index ebf2f0900d98f..ebf2f0900d98f 100644 --- a/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch +++ b/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index e6c939b277eab..c8cb294b0dc04 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace "gcc" "cc" ''; - patches = [ ./10_fix_buffer_overflow_wordole_c.patch ]; + patches = [ ./10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch ]; installTargets = [ "global_install" ]; meta = { - homepage = http://www.winfield.demon.nl/; + homepage = "http://www.winfield.demon.nl/"; description = "Convert MS Word documents to plain text or PostScript"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index 88da2442ecf21..22eee857b2086 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atlassian-cli"; - version = "9.1.1"; + version = "9.2.0"; src = fetchzip { url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip"; - sha256 = "0mdf4ybp0a6c816210g76lx901qwxw727ipyiph5kbdzl4jlrpgm"; + sha256 = "0rdnbx3zfz3lpgka7bb8jzapkr81l2yvgsbmn8hrhva5k61xwx3d"; extraPostFetch = "chmod go-w $out"; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An integrated family of CLI’s for various Atlassian applications"; - homepage = https://bobswift.atlassian.net/wiki/spaces/ACLI/overview; + homepage = "https://bobswift.atlassian.net/wiki/spaces/ACLI/overview"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ twey ]; inherit (jre.meta) platforms; diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix index 31e74ccf23a10..441a9a98e9722 100644 --- a/pkgs/applications/office/autokey/default.nix +++ b/pkgs/applications/office/autokey/default.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { dbus-python pyinotify xlib pygobject3 ]; meta = { - homepage = https://github.com/autokey/autokey; + homepage = "https://github.com/autokey/autokey"; description = "Desktop automation utility for Linux and X11"; license = with lib.licenses; [ gpl3 ]; maintainers = with lib.maintainers; [ pneumaticat ]; diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index aefd696ae4e35..916d13e7a83a4 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/simon-v/bean-add/; + homepage = "https://github.com/simon-v/bean-add/"; description = "beancount transaction entry assistant"; # The (only) source file states: diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index be6fe172e29f1..90b6c2fefc532 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk, libgee -, gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook }: +, gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook +, appstream, desktop-file-utils }: stdenv.mkDerivation rec { pname = "bookworm"; - version = "unstable-2018-11-19"; + version = "1.1.2"; src = fetchFromGitHub { owner = "babluboy"; repo = pname; - rev = "4c3061784ff42151cac77d12bf2a28bf831fdfc5"; - sha256 = "0yrqxa60xlvz249kx966z5krx8i7h17ac0hjgq9p8f0irzy5yp0n"; + rev = version; + sha256 = "0w0rlyahpgx0l6inkbj106agbnr2czil0vdcy1zzv70apnjz488j"; }; nativeBuildInputs = [ @@ -35,6 +36,8 @@ stdenv.mkDerivation rec { python2 sqlite webkitgtk + appstream + desktop-file-utils ]; postPatch = '' @@ -60,7 +63,7 @@ stdenv.mkDerivation rec { longDescription = '' Read the books you love without having to worry about different format complexities like epub, pdf, mobi, cbr, etc. ''; - homepage = https://babluboy.github.io/bookworm/; + homepage = "https://babluboy.github.io/bookworm/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 4855fbc63c3e4..6915be9b6d64a 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -60,7 +60,7 @@ mkDerivation rec { Sheets for computations, Plan for planning, and Karbon for vector graphics. ''; - homepage = https://www.calligra.org/; + homepage = "https://www.calligra.org/"; maintainers = with maintainers; [ phreedom ebzzry zraexy ]; platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index 0043648146f53..f5b8b437249f2 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Rapidly extract unformatted, or unstandardized bibliographic references from email alerts, journal Web pages and PDF files"; - homepage = http://www.molspaces.com/d_cb2bib-overview.php; + homepage = "http://www.molspaces.com/d_cb2bib-overview.php"; maintainers = with maintainers; [ edwtjo ]; license = licenses.gpl3; }; diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index def44b40e809a..28a470162cef4 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -1,6 +1,12 @@ -{ stdenv, fetchFromGitHub, fetchpatch -, meson, ninja, pkgconfig, desktop-file-utils -, python3, vala, wrapGAppsHook +{ stdenv +, fetchFromGitHub +, meson +, ninja +, pkgconfig +, desktop-file-utils +, python3 +, vala +, wrapGAppsHook , evolution-data-server , libical , libgee @@ -15,13 +21,13 @@ stdenv.mkDerivation rec { pname = "elementary-planner"; - version = "2.2.14"; + version = "2.3.5"; src = fetchFromGitHub { owner = "alainm23"; repo = "planner"; rev = version; - sha256 = "14k5kiknr0d3my17p4v20iiqzifpz3y80gdzj8vdxic8yk2yr1ap"; + sha256 = "15d51sqb3k59jjishsw1fq5ib50jmhlk194y3nga329damfv8bmy"; }; nativeBuildInputs = [ @@ -53,8 +59,15 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson/post_install.py ''; + preFixup = '' + gappsWrapperArgs+=( + # the theme is hardcoded + --prefix XDG_DATA_DIRS : "${pantheon.elementary-gtk-theme}/share" + ) + ''; + meta = with stdenv.lib; { - description = "Task and project manager designed to elementary OS"; + description = "Task manager with Todoist support designed for GNU/Linux 🚀️"; homepage = "https://planner-todo.web.app"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ] ++ pantheon.maintainers; diff --git a/pkgs/applications/office/envelope/default.nix b/pkgs/applications/office/envelope/default.nix index bb85ae2e12b9a..2a2f55a27a40e 100644 --- a/pkgs/applications/office/envelope/default.nix +++ b/pkgs/applications/office/envelope/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Personal finance manager for elementary OS"; homepage = "https://github.com/cjfloss/envelope"; - maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 2770b6917ce4f..8e1bb0d76d925 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -35,7 +35,7 @@ buildPythonApplication rec { ''; meta = { - homepage = https://beancount.github.io/fava; + homepage = "https://beancount.github.io/fava"; description = "Web interface for beancount"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index d7664b347ee1c..a8630381ebf27 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { pname = "gnucash"; - version = "3.9"; + version = "3.10"; src = fetchurl { url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2"; - sha256 = "1zxrgrjbs13vgr002rvl734w9f7zzxfq4xxmyhj777dwgkfds0ld"; + sha256 = "05kgg7mhizndwn7icnarqk3c19xrzfawf90y9nb3jdm6fv1741xn"; }; nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ]; @@ -69,7 +69,6 @@ stdenv.mkDerivation rec { ''; # TODO: The following tests FAILED: - # 61 - test-gnc-timezone (Failed) # 70 - test-load-c (Failed) # 71 - test-modsysver (Failed) # 72 - test-incompatdep (Failed) diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 710a66c25d86b..40351ba64a18f 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -7,11 +7,11 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; - version = "1.12.46"; + version = "1.12.47"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "9fdc67377af52dfe69a7db4f533938024a75f454fc5d25ab43b8e6739be0b5e1"; + sha256 = "1khrf72kiq50y8b5prbj2207k9shn36h2b2i588cc4wa28s9y5a0"; }; configureFlags = [ "--disable-component" ]; @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The GNOME Office Spreadsheet"; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://projects.gnome.org/gnumeric/; + homepage = "http://projects.gnome.org/gnumeric/"; platforms = platforms.unix; maintainers = [ maintainers.vcunat ]; }; diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 85b688b0c4d35..d4f08b141a6ed 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -1,5 +1,14 @@ -{ fetchurl, stdenv, gtk, pkgconfig, libgsf, libofx, intltool, wrapGAppsHook -, libsoup, gnome3 }: +{ fetchurl +, stdenv +, gtk +, pkgconfig +, libgsf +, libofx +, intltool +, wrapGAppsHook +, libsoup +, gnome3 +}: stdenv.mkDerivation rec { pname = "grisbi"; @@ -7,12 +16,18 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2"; - sha1 = "crv3bga72v6fw07wad0nkrgdg4war66j"; + sha256 = "1piiyyxjsjbw9gcqydvknzxmmfgh8kdqal12ywrxyxih2afwnvbw"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ gtk libgsf libofx intltool libsoup - gnome3.adwaita-icon-theme ]; + buildInputs = [ + gtk + libgsf + libofx + intltool + libsoup + gnome3.adwaita-icon-theme + ]; meta = with stdenv.lib; { description = "A personnal accounting application."; @@ -24,7 +39,7 @@ stdenv.mkDerivation rec { management and other information that make Grisbi adapted for associations. ''; - homepage = "http://grisbi.org"; + homepage = "https://grisbi.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ layus ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 3cda543eda12e..a34eadde36ea5 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.3.2"; + name = "homebank-5.4.1"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "1fr4060yqlciay98dypvifmfvr8y2kbpj89d86mcvq9gb00vij2b"; + sha256 = "1m1hpaby6zi8y0vmj2ljklp34a55l2qsr7pxw3852k2m4v5n9zsx"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free, easy, personal accounting for everyone"; - homepage = http://homebank.free.fr/; + homepage = "http://homebank.free.fr/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/ib/controller/default.nix b/pkgs/applications/office/ib/controller/default.nix index 372414c1a76d8..7be7e4467b52f 100644 --- a/pkgs/applications/office/ib/controller/default.nix +++ b/pkgs/applications/office/ib/controller/default.nix @@ -154,7 +154,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Automation Controller for the Trader Work Station of Interactive Brokers"; - homepage = https://github.com/ib-controller/ib-controller; + homepage = "https://github.com/ib-controller/ib-controller"; license = licenses.gpl3; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/ib/tws/default.nix b/pkgs/applications/office/ib/tws/default.nix index a88f1af02c655..b8b31bed7c5e0 100644 --- a/pkgs/applications/office/ib/tws/default.nix +++ b/pkgs/applications/office/ib/tws/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Trader Work Station of Interactive Brokers"; - homepage = https://www.interactivebrokers.com; + homepage = "https://www.interactivebrokers.com"; license = licenses.unfree; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index a8c318d690a92..ed8cc1dd50a73 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation { to make a slideshow with your favorite photos. ''; - homepage = http://impressive.sourceforge.net/; + homepage = "http://impressive.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index d0a7757e49d2f..01ba190cf31f1 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source bibliography reference manager"; - homepage = https://www.jabref.org; + homepage = "https://www.jabref.org"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.gebner ]; diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 7b4feed1733ac..6dc124c6a2001 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }: let - _version = "2.8.4"; - _build = "453"; + _version = "2.8.6"; + _build = "455"; version = "${_version}-${_build}"; name = "jameica-${version}"; @@ -17,7 +17,7 @@ let comment = "Free Runtime Environment for Java Applications."; desktopName = "Jameica"; genericName = "Jameica"; - categories = "Application;Office;"; + categories = "Office;"; }; in stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "willuhn"; repo = "jameica"; rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}"; - sha256 = "1imm3wpdrgh2sr2wh9vgaf2mp1ixs845vgzk5ib82mak7lg9m1zl"; + sha256 = "1pndklxsvixy6zyblqr62ki3pqaq8lfrzgasrvhclqxxh76gjlss"; }; # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.willuhn.de/products/jameica/; + homepage = "https://www.willuhn.de/products/jameica/"; description = "Free Runtime Environment for Java Applications"; longDescription = '' Runtime Environment for plugins like Hibiscus (HBCI Online Banking), diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index 2e0b3f3fed7dc..cf1b5125adf99 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -16,7 +16,7 @@ python2Packages.buildPythonApplication { meta = { description = "Note taking application"; - homepage = http://keepnote.org; + homepage = "http://keepnote.org"; license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index 8db7068f7cfa6..4900dafb08e58 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/pkgs/applications/office/kexi/default.nix @@ -49,7 +49,7 @@ mkDerivation rec { All database objects - tables, queries and forms - are stored in the database, making it easy to share data and design. ''; - homepage = http://kexi-project.org/; + homepage = "http://kexi-project.org/"; maintainers = with maintainers; [ zraexy ]; platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix index 02c645f3d849d..1962528f6b68e 100644 --- a/pkgs/applications/office/khronos/default.nix +++ b/pkgs/applications/office/khronos/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Track each task's time in a simple inobtrusive way"; homepage = "https://github.com/lainsce/khronos"; - maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 275cd826a69fd..6137a4dc1ad81 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "Personal finance manager for KDE"; - homepage = https://kmymoney.org/; + homepage = "https://kmymoney.org/"; platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/applications/office/ledger-autosync/default.nix index 62ac6a803824c..3a0f362dcf724 100644 --- a/pkgs/applications/office/ledger-autosync/default.nix +++ b/pkgs/applications/office/ledger-autosync/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "ledger-autosync"; - version = "1.0.1"; + version = "1.0.2"; # no tests included in PyPI tarball src = fetchFromGitHub { owner = "egh"; repo = "ledger-autosync"; rev = "v${version}"; - sha256 = "1h5mjngdd3rmzwmy026xmas0491kxxi1vxkd5m1xii7y6j50z14q"; + sha256 = "0sh32jcf8iznnbg1kqlrswbzfmn4h3gkw32q20xwxzz4935pz1qk"; }; propagatedBuildInputs = with python3Packages; [ @@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/egh/ledger-autosync; + homepage = "https://github.com/egh/ledger-autosync"; description = "OFX/CSV autosync for ledger and hledger"; license = licenses.gpl3; maintainers = with maintainers; [ eamsden ]; diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix index 0a8f68bc09617..ce8b401cb6b92 100644 --- a/pkgs/applications/office/ledger-web/default.nix +++ b/pkgs/applications/office/ledger-web/default.nix @@ -15,7 +15,7 @@ bundlerApp { meta = with lib; { description = "A web frontend to the Ledger CLI tool"; - homepage = https://github.com/peterkeen/ledger-web; + homepage = "https://github.com/peterkeen/ledger-web"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg manveru nicknovitski ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 99e09a8f36f2f..6ac092f27e2b7 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://ledger-cli.org/; + homepage = "https://ledger-cli.org/"; description = "A double-entry accounting system with a command-line reporting interface"; license = licenses.bsd3; @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.all; - maintainers = with maintainers; [ the-kenny jwiegley ]; + maintainers = with maintainers; [ jwiegley ]; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 9517a4404def0..976fc0fcd2d74 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -62,6 +62,11 @@ in (stdenv.mkDerivation rec { patches = [ ./xdg-open-brief.patch + (fetchpatch { + url = "https://git.pld-linux.org/gitweb.cgi?p=packages/libreoffice.git;a=blob_plain;f=poppler-0.86.patch;h=76b8356d5f22ef537a83b0f9b0debab591f152fe;hb=a2737a61353e305a9ee69640fb20d4582c218008"; + name = "poppler-0.86.patch"; + sha256 = "0q6k4l8imgp8ailcv0qx5l83afyw44hah24fi7gjrm9xgv5sbb8j"; + }) ]; tarballPath = "external/tarballs"; @@ -370,7 +375,7 @@ in (stdenv.mkDerivation rec { meta = with lib; { description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; - homepage = https://libreoffice.org/; + homepage = "https://libreoffice.org/"; license = licenses.lgpl3; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index bc329e5a8f89f..f4b14870eb791 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -728,11 +728,11 @@ md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.7.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/Python-3.7.6.tar.xz"; - sha256 = "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f"; + name = "Python-3.7.7.tar.xz"; + url = "http://dev-www.libreoffice.org/src/Python-3.7.7.tar.xz"; + sha256 = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136"; md5 = ""; - md5name = "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f-Python-3.7.6.tar.xz"; + md5name = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136-Python-3.7.7.tar.xz"; } { name = "QR-Code-generator-1.4.0.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index fb21d1292d6d5..5b62b0df95449 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,8 +8,8 @@ rec { major = "6"; minor = "4"; - patch = "1"; - tweak = "1"; + patch = "3"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "03fqpkilz4yi35l447hb9r8gjwj23l61bpdkwg21jm8blm8kkvyj"; + sha256 = "1cmbrhha7mlflnlbpla8fix07cxcgkdb7krnrgs1bylf31y5855w"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "0a7arjlxxy7hjm1brxwd124bf1gkbl92bgygi3sbbhbsv07pjdcr"; + sha256 = "06z9hz4m3kdcljjc6y5s18001axjibj9xiyakdndkl9pmnnhn9h3"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "1hfllrdyxrg5mgqry3dcrhjbdrd0d27k5mvv4sfj7nwjlmjh8rqq"; + sha256 = "0mpgrwg8z1q38j03l6m1sdpcplyjd5nz1nqaa13vfkryj2lflw45"; }; } diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix index 7c054ba520479..5b05a9f164b74 100644 --- a/pkgs/applications/office/marp/default.nix +++ b/pkgs/applications/office/marp/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Markdown presentation writer, powered by Electron"; - homepage = https://yhatt.github.io/marp/; + homepage = "https://yhatt.github.io/marp/"; license = licenses.mit; maintainers = [ maintainers.puffnfresh ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/office/minetime/default.nix b/pkgs/applications/office/minetime/default.nix index 42802409e59d4..8f90973e5f8e8 100644 --- a/pkgs/applications/office/minetime/default.nix +++ b/pkgs/applications/office/minetime/default.nix @@ -41,7 +41,7 @@ appimageTools.wrapAppImage rec { meta = with lib; { description = "Modern, intuitive and smart calendar application"; - homepage = https://minetime.ai; + homepage = "https://minetime.ai"; license = licenses.unfree; # Should be cross-platform, but for now we just grab the appimage platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index ed33d121a05fa..6d430a286bd3c 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -27,7 +27,7 @@ in meta = { description = "Easy-to-use personal finance software"; - homepage = https://www.moneymanagerex.org/; + homepage = "https://www.moneymanagerex.org/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix index 103288c03c621..85d9715bf396c 100644 --- a/pkgs/applications/office/moneyplex/default.nix +++ b/pkgs/applications/office/moneyplex/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ tstrobel ]; platforms = platforms.linux; license = licenses.unfree; - downloadPage = http://matrica.de/download/download.html; + downloadPage = "http://matrica.de/download/download.html"; }; } diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index 050222451cf64..45d9e29ebe9a8 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -31,7 +31,7 @@ in mkDerivation { meta = with stdenv.lib; { description = "Smart manager for information collecting"; - homepage = https://webhamster.ru/site/page/index/articles/projectcode/138; + homepage = "https://webhamster.ru/site/page/index/articles/projectcode/138"; license = licenses.gpl3; maintainers = [ maintainers.gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index b1311428c61d0..c3a7a5da4550f 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A handy personal organizer"; - homepage = http://clayo.org/osmo/; + homepage = "http://clayo.org/osmo/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix index 1383986cf2ed7..c549b107c541f 100644 --- a/pkgs/applications/office/paperless/default.nix +++ b/pkgs/applications/office/paperless/default.nix @@ -99,7 +99,7 @@ let meta = with lib; { description = "Scan, index, and archive all of your paper documents"; - homepage = https://github.com/the-paperless-project/paperless; + homepage = "https://github.com/the-paperless-project/paperless"; license = licenses.gpl3; maintainers = [ maintainers.earvstedt ]; }; diff --git a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix b/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix index 465da38624717..c470a56b8a11f 100644 --- a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix +++ b/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix @@ -29,7 +29,7 @@ buildPythonPackage { meta = with lib; { description = "The best way to have DRY Django forms"; - homepage = https://github.com/maraujop/django-crispy-forms; + homepage = "https://github.com/maraujop/django-crispy-forms"; license = licenses.mit; maintainers = with maintainers; [ earvstedt ]; }; diff --git a/pkgs/applications/office/paperless/python-modules/django-filter.nix b/pkgs/applications/office/paperless/python-modules/django-filter.nix index ffe94d10d5c33..d7f20bd9d37d9 100644 --- a/pkgs/applications/office/paperless/python-modules/django-filter.nix +++ b/pkgs/applications/office/paperless/python-modules/django-filter.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "A reusable Django application for allowing users to filter querysets dynamically."; - homepage = https://github.com/carltongibson/django-filter; + homepage = "https://github.com/carltongibson/django-filter"; license = licenses.bsd3; maintainers = with maintainers; [ earvstedt ]; }; diff --git a/pkgs/applications/office/paperwork/backend.nix b/pkgs/applications/office/paperwork/backend.nix index c28a4bc916dc5..af0d4c4305903 100644 --- a/pkgs/applications/office/paperwork/backend.nix +++ b/pkgs/applications/office/paperwork/backend.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = { description = "Backend part of Paperwork (Python API, no UI)"; - homepage = https://openpaper.work/; + homepage = "https://openpaper.work/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ aszlig symphorien ]; }; diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index c3930115365c9..102c3cd2564c5 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -94,7 +94,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A personal document manager for scanned documents"; - homepage = https://openpaper.work/; + homepage = "https://openpaper.work/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ aszlig symphorien ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix index 14756c3557f4d..ce175d8517f51 100644 --- a/pkgs/applications/office/pinpoint/default.nix +++ b/pkgs/applications/office/pinpoint/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cairo clutter-gtk ]; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/Pinpoint; + homepage = "https://wiki.gnome.org/action/show/Apps/Pinpoint"; description = "A tool for making hackers do excellent presentations"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 6189132d0f949..f33946d6b5a2d 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Planner; + homepage = "https://wiki.gnome.org/Apps/Planner"; description = "Project management application for GNOME"; longDescription = '' Planner is the GNOME project management tool. diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix new file mode 100644 index 0000000000000..53f3b8a3150a0 --- /dev/null +++ b/pkgs/applications/office/portfolio/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, autoPatchelfHook +, fetchurl +, glibc +, gcc-unwrapped +, gtk3 +, jre +, libsecret +, makeDesktopItem +, webkitgtk +, wrapGAppsHook +}: +let + desktopItem = makeDesktopItem { + name = "Portfolio"; + exec = "portfolio"; + icon = "portfolio"; + comment = "Calculate Investment Portfolio Performance"; + desktopName = "Portfolio Performance"; + categories = "Office;"; + }; + + runtimeLibs = stdenv.lib.makeLibraryPath [ gtk3 webkitgtk ]; +in +stdenv.mkDerivation rec { + pname = "PortfolioPerformance"; + version = "0.46.3"; + + src = fetchurl { + url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; + sha256 = "0263v0ymqmf7kcwys4smwx1p1gh8d20dh10canjfqgl4c5lfx966"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + ]; + + buildInputs = [ + glibc + gcc-unwrapped + libsecret + ]; + + installPhase = '' + mkdir -p $out/portfolio + cp -av ./* $out/portfolio + + makeWrapper $out/portfolio/PortfolioPerformance $out/bin/portfolio \ + --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ + --prefix PATH : ${jre}/bin + + # Create desktop item + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + mkdir -p $out/share/pixmaps + ln -s $out/portfolio/icon.xpm $out/share/pixmaps/portfolio.xpm + ''; + + meta = with stdenv.lib; { + description = "A simple tool to calculate the overall performance of an investment portfolio."; + homepage = "https://www.portfolio-performance.info/"; + license = licenses.epl10; + maintainers = with maintainers; [ elohmeier ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix index 769f58785ee57..7821b041064a0 100644 --- a/pkgs/applications/office/qnotero/default.nix +++ b/pkgs/applications/office/qnotero/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Quick access to Zotero references"; - homepage = http://www.cogsci.nl/software/qnotero; + homepage = "http://www.cogsci.nl/software/qnotero"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index fa2c67709fb9a..99b021429a658 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -19,7 +19,7 @@ mkDerivation rec { meta = with lib; { description = "Plain-text file notepad and todo-list manager with markdown support and ownCloud / Nextcloud integration"; - homepage = https://www.qownnotes.org/; + homepage = "https://www.qownnotes.org/"; platforms = platforms.all; license = licenses.gpl2; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index d6b73b07f0e54..779a5cb0fea38 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; description = "Desktop Publishing (DTP) and Layout program for Linux"; - homepage = https://www.scribus.net; + homepage = "https://www.scribus.net"; license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index faff45c8884a7..aa0c2dee97900 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -44,28 +44,40 @@ mkDerivation rec { }; patches = [ + # Poppler patches from + # https://github.com/scribusproject/scribus/commits/master/scribus/plugins/import/pdf + # fix build with Poppler 0.82 - ( - fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch"; - sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939"; - } - ) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch"; + sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939"; + }) # fix build with Poppler 0.83 - ( - fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch"; - sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx"; - } - ) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch"; + sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx"; + }) # fix build with Poppler 0.84 # TODO: Remove patches with scribus version > 1.5.5 as it should be fixed upstream in next version - ( - fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/3742559924136c2471ab15081c5b600dd5feaeb0.patch"; - sha256 = "1d72h7jbajy9w83bnxmhn1ca947hpfxnfbmq30g5ljlj824c7y9y"; - } - ) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/3742559924136c2471ab15081c5b600dd5feaeb0.patch"; + sha256 = "1d72h7jbajy9w83bnxmhn1ca947hpfxnfbmq30g5ljlj824c7y9y"; + }) + # Formating changes needed for the Poppler 0.86 patch to apply + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/58613b5ce44335f202a55ab15ed303d97fe274cb.patch"; + sha256 = "qwmVAZVYCijLNMVGwnOLJE8223vcRwPWfEvNKiDjw5o="; + }) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/24aba508aac3f672f5f8cd629744a3b71e58ec37.patch"; + sha256 = "sha256-OY+EIiGBTg2aIAmZOnkI8DPZVZYqFZAKnD7ychge1Dw="; + includes = [ "scribus/plugins/import/pdf/*" ]; + }) + # fix build with Poppler 0.86 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/67f8771aaff2f55d61b8246f420e762f4b526944.patch"; + sha256 = "51z+BYKhbH8a9dFph8X60NGpiogSb+5tOhW2d+m/X9M="; + }) ]; enableParallelBuilding = true; @@ -104,7 +116,7 @@ mkDerivation rec { ]; platforms = platforms.linux; description = "Desktop Publishing (DTP) and Layout program for Linux"; - homepage = "http://www.scribus.net"; + homepage = "https://www.scribus.net"; # There are a lot of licenses... https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19 license = with licenses; [ bsd3 diff --git a/pkgs/applications/office/skanlite/default.nix b/pkgs/applications/office/skanlite/default.nix index d4c1df75709b6..3c97c145c74b5 100644 --- a/pkgs/applications/office/skanlite/default.nix +++ b/pkgs/applications/office/skanlite/default.nix @@ -23,7 +23,7 @@ in mkDerivation rec { meta = with stdenv.lib; { description = "KDE simple image scanning application"; - homepage = http://www.kde.org/applications/graphics/skanlite/; + homepage = "http://www.kde.org/applications/graphics/skanlite/"; license = licenses.gpl2; maintainers = with maintainers; [ pshendry ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index 1db5ce16fe53e..66d028144ff24 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "skrooge"; - version = "2.21.1"; + version = "2.22.1"; src = fetchurl { url = "http://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz"; - sha256 = "0lv953i7cybzbxr5gx6g4libdcjj086jf152mwrwvx1avrpjavb8"; + sha256 = "194vwnc2fi7cgdhasxpr1gxjqqsiqadhadvv43d0lxaxys6f360h"; }; nativeBuildInputs = [ @@ -36,6 +36,6 @@ mkDerivation rec { description = "A personal finances manager, powered by KDE"; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ joko ]; - homepage = https://skrooge.org/; + homepage = "https://skrooge.org/"; }; } diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index 07a3b26a1a854..fed00000af3a1 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -68,8 +68,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Create simple and beautiful presentations"; - homepage = https://github.com/Philip-Scott/Spice-up; - maintainers = with maintainers; [ samdroid-apps kjuvi ] ++ pantheon.maintainers; + homepage = "https://github.com/Philip-Scott/Spice-up"; + maintainers = with maintainers; [ samdroid-apps xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; # The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+ license = licenses.gpl3Plus; diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index 24542041cc874..d826b9f54f6a1 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "tagainijisho-1.0.3"; src = fetchurl { - url = https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz; + url = "https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz"; sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg"; }; @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A free, open-source Japanese dictionary and kanji lookup tool"; - homepage = https://www.tagaini.net/; + homepage = "https://www.tagaini.net/"; license = with licenses; [ /* program */ gpl3Plus /* data */ cc-by-sa-30 diff --git a/pkgs/applications/office/timetable/default.nix b/pkgs/applications/office/timetable/default.nix index 1a63fdf0f3f30..1f1d44e749484 100644 --- a/pkgs/applications/office/timetable/default.nix +++ b/pkgs/applications/office/timetable/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Plot out your own timetable for the week and organize it"; homepage = "https://github.com/lainsce/timetable"; - maintainers = [ maintainers.kjuvi ] ++ pantheon.maintainers; + maintainers = [ maintainers.xiorcale ] ++ pantheon.maintainers; license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index 6d094ecb5dccd..579c9e115be8d 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A simple command line time tracker written in ruby"; - homepage = https://github.com/samg/timetrap; + homepage = "https://github.com/samg/timetrap"; license = licenses.mit; maintainers = with maintainers; [ jerith666 manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix index edb2c778a0a55..d711440fc340e 100644 --- a/pkgs/applications/office/todo.txt-cli/default.nix +++ b/pkgs/applications/office/todo.txt-cli/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { meta = { description = "Simple plaintext todo list manager"; - homepage = http://todotxt.com; + homepage = "http://todotxt.com"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 9aeddf1a021f2..e18a11a7448bd 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -42,7 +42,7 @@ buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pimutils/todoman; + homepage = "https://github.com/pimutils/todoman"; description = "Standards-based task manager based on iCalendar"; longDescription = '' Todoman is a simple, standards-based, cli todo (aka: task) manager. Todos diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 000fa7ff10150..d316d42870728 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { planning, requirements gathering, presentation of information, etc. ''; - homepage = http://strlen.com/treesheets/; + homepage = "http://strlen.com/treesheets/"; maintainers = with maintainers; [ obadz avery ]; platforms = platforms.linux; license = licenses.zlib; diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 3794a676d4c42..17af0b0591b97 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -13,13 +13,23 @@ let meta = with stdenv.lib; { inherit description; - homepage = https://github.com/zadam/trilium; + homepage = "https://github.com/zadam/trilium"; license = licenses.agpl3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ]; }; - version = "0.40.5"; + version = "0.42.2"; + + desktopSource = { + url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; + sha256 = "14vb5a2kad1h8kd1vipgaxpv6rch2fl6j0s2ja0y16xypga82wrx"; + }; + + serverSource = { + url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; + sha256 = "16dz2i4g0vgwz4fi69lmg261aqb8hs6ipfy004wv73vg46wf1pnv"; + }; in { @@ -28,10 +38,7 @@ in { inherit version; inherit meta; - src = fetchurl { - url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "02hmfgv8viy1hn2ix4b0gdzbcj7piddsmjdnb0b5hpwahqrikiyi"; - }; + src = fetchurl desktopSource; # Fetch from source repo, no longer included in release. # (they did special-case icon.png but we want the scalable svg) @@ -76,10 +83,7 @@ in { inherit version; inherit meta; - src = fetchurl { - url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "00b7qx2h26qrdhw2a7y0irhbr442yynnzpm1pz55hi33zpckbrc7"; - }; + src = fetchurl serverSource; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index b9f1465af1790..d0c5eb4e7b2ed 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -70,7 +70,7 @@ python3Packages.buildPythonApplication rec { It is the core base of a complete business solution providing modularity, scalability and security. ''; - homepage = http://www.tryton.org/; + homepage = "http://www.tryton.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ johbo udono ]; }; diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix index dc63acd6db641..c45562a0c8dda 100644 --- a/pkgs/applications/office/trytond/default.nix +++ b/pkgs/applications/office/trytond/default.nix @@ -45,7 +45,7 @@ python2Packages.buildPythonApplication rec { It is the core base of a complete business solution providing modularity, scalability and security. ''; - homepage = http://www.tryton.org/; + homepage = "http://www.tryton.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ udono johbo ]; }; diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix index a4734f4546055..cb3b2111372ba 100644 --- a/pkgs/applications/office/tudu/default.nix +++ b/pkgs/applications/office/tudu/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "ncurses-based hierarchical todo list manager with vim-like keybindings"; - homepage = https://code.meskio.net/tudu/; + homepage = "https://code.meskio.net/tudu/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index 7d79d79072a96..52c94ce378e1f 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, fetchpatch }: +{ stdenv, pythonPackages, fetchpatch, installShellFiles }: with pythonPackages; @@ -14,15 +14,21 @@ buildPythonApplication rec { checkPhase = '' pytest -vs tests - ''; + ''; + + postInstall = '' + installShellCompletion --bash --name watson watson.completion + installShellCompletion --zsh --name _watson watson.zsh-completion + ''; checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ]; propagatedBuildInputs = [ requests click arrow ]; + nativeBuildInputs = [ installShellFiles ]; meta = with stdenv.lib; { - homepage = https://tailordev.github.io/Watson/; + homepage = "https://tailordev.github.io/Watson/"; description = "A wonderful CLI to track your time!"; license = licenses.mit; - maintainers = with maintainers; [ mguentner nathyong ] ; + maintainers = with maintainers; [ mguentner nathyong ]; }; } diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index 199f17afda799..c2ccbabe2f161 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Text-based word processor"; - homepage = https://cowlark.com/wordgrinder; + homepage = "https://cowlark.com/wordgrinder"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 7032632da884c..2d8f4d18621c1 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -1,67 +1,112 @@ -{ stdenv, fetchurl -, libX11, glib, xorg, fontconfig, freetype -, zlib, libpng12, libICE, libXrender, cups -, alsaLib, atk, cairo, dbus, expat -, gdk-pixbuf, gtk2-x11, lzma, pango, zotero -, sqlite, libuuid, qt5, dpkg }: +{ stdenv +, mkDerivation +, fetchurl +, autoPatchelfHook +, dpkg +, wrapGAppsHook +, wrapQtAppsHook +, alsaLib +, atk +, bzip2 +, cairo +, cups +, dbus +, expat +, ffmpeg_3 +, fontconfig +, freetype +, gdk-pixbuf +, glib +, gperftools +, gtk2-x11 +, libpng12 +, libtool +, libuuid +, libxml2 +, lzma +, nspr +, nss +, openssl +, pango +, qt4 +, qtbase +, sqlite +, unixODBC +, xorg +, zlib +}: stdenv.mkDerivation rec{ pname = "wpsoffice"; - version = "11.1.0.9080"; + version = "11.1.0.9505"; src = fetchurl { - url = "http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9080/wps-office_11.1.0.9080.XA_amd64.deb"; - sha256 = "1731e9aea22ef4e558ad66b1373d863452b4f570aecf09d448ae28a821333454"; + url = "http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9505/wps-office_11.1.0.9505.XA_amd64.deb"; + sha256 = "1bvaxwd3npw3kswk7k1p6mcbfg37x0ym4sp6xis6ykz870qivqk5"; }; unpackCmd = "dpkg -x $src ."; sourceRoot = "."; - nativeBuildInputs = [ qt5.wrapQtAppsHook dpkg ]; + postUnpack = stdenv.lib.optionalString (version == "11.1.0.9505") '' + # distribution is missing libjsapiservice.so, so we should not let + # autoPatchelfHook fail on the following dead libraries + rm opt/kingsoft/wps-office/office6/{libjsetapi.so,libjswppapi.so,libjswpsapi.so} + ''; + + nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook wrapQtAppsHook ]; meta = { description = "Office program originally named Kingsoft Office"; - homepage = http://wps-community.org/; - platforms = [ "i686-linux" "x86_64-linux" ]; + homepage = "http://wps-community.org/"; + platforms = [ "x86_64-linux" ]; hydraPlatforms = []; license = stdenv.lib.licenses.unfreeRedistributable; maintainers = [ stdenv.lib.maintainers.mlatus ]; }; - libPath = with xorg; stdenv.lib.makeLibraryPath [ - libX11 - libpng12 - glib - libSM - libXext - fontconfig - zlib - freetype - libICE - cups - libXrender - libxcb - + buildInputs = with xorg; [ alsaLib atk + bzip2 cairo - dbus.daemon.lib + dbus.lib expat - fontconfig.lib + ffmpeg_3 + fontconfig + freetype gdk-pixbuf + glib + gperftools gtk2-x11 - lzma - pango - zotero - sqlite - libuuid + libICE + libSM + libX11 + libX11 + libXScrnSaver libXcomposite libXcursor libXdamage + libXext libXfixes libXi libXrandr - libXScrnSaver + libXrender libXtst + libpng12 + libtool + libuuid + libxcb + libxml2 + lzma + nspr + nss + openssl + pango + qt4 + qtbase + sqlite + unixODBC + zlib ]; dontPatchELF = true; @@ -70,25 +115,59 @@ stdenv.mkDerivation rec{ # references to nix own build directory noAuditTmpdir = true; + unvendoredLibraries = [ + # Have to use parts of the vendored qt4 + #"Qt" + "SDL2" + "bz2" + "avcodec" + "avdevice" + "avformat" + "avutil" + "swresample" + "swscale" + "jpeg" + "png" + # File saving breaks unless we are using vendored llvmPackages_8.libcxx + #"c++" + "ssl" "crypto" + "nspr" + "nss" + "odbc" + "tcmalloc" # gperftools + ]; + installPhase = '' prefix=$out/opt/kingsoft/wps-office mkdir -p $out cp -r opt $out cp -r usr/* $out - # Avoid forbidden reference error due use of patchelf - rm -r * + for lib in $unvendoredLibraries; do + rm -v "$prefix/office6/lib$lib"*.so{,.*} + done for i in wps wpp et wpspdf; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --force-rpath --set-rpath "$(patchelf --print-rpath $prefix/office6/$i):${stdenv.cc.cc.lib}/lib64:${libPath}" \ - $prefix/office6/$i substituteInPlace $out/bin/$i \ --replace /opt/kingsoft/wps-office $prefix done for i in $out/share/applications/*;do substituteInPlace $i \ - --replace /usr/bin $out/bin \ - --replace /opt/kingsoft/wps-office $prefix + --replace /usr/bin $out/bin + done + ''; + + runtimeLibPath = stdenv.lib.makeLibraryPath [ + cups.lib + ]; + + dontWrapQtApps = true; + dontWrapGApps = true; + postFixup = '' + for f in "$out"/bin/*; do + echo "Wrapping $f" + wrapProgram "$f" \ + "''${gappsWrapperArgs[@]}" \ + "''${qtWrapperArgs[@]}" \ + --suffix LD_LIBRARY_PATH : "$runtimeLibPath" done ''; -} \ No newline at end of file +} diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index b4adc947c4d19..18e7629749646 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -28,7 +28,7 @@ mkDerivation rec { meta = with lib; { description = "A powerful yet simple application to manage your day to day actions, getting your mind like water"; - homepage = https://zanshin.kde.org/; + homepage = "https://zanshin.kde.org/"; maintainers = with maintainers; [ zraexy ]; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 075552b1ec4f6..ba6351da1ddd3 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A desktop wiki"; - homepage = http://zim-wiki.org; + homepage = "http://zim-wiki.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790 diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 8a27dcd3c9fcf..55ab22cfc06e9 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "5.0.83"; + version = "5.0.85"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "1abkwxdi154hnry8nsvxbklvbsnvd7cs2as0041h2kbiz824pv31"; + sha256 = "0zqc27kld7rm3akmrnf9ba1x2hb9838cbv6i3nkqvg81ly5gfbxs"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/radio/airspy/default.nix b/pkgs/applications/radio/airspy/default.nix index 09b8499b27ab2..67a59b68cd5b8 100644 --- a/pkgs/applications/radio/airspy/default.nix +++ b/pkgs/applications/radio/airspy/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" ]; meta = with stdenv.lib; { - homepage = https://github.com/airspy/airspyone_host; + homepage = "https://github.com/airspy/airspyone_host"; description = "Host tools and driver library for the AirSpy SDR"; license = licenses.bsd3; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/radio/aldo/default.nix b/pkgs/applications/radio/aldo/default.nix index fc38f6be4ccaf..df52531a518d7 100644 --- a/pkgs/applications/radio/aldo/default.nix +++ b/pkgs/applications/radio/aldo/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Morse code training program"; - homepage = http://aldo.nongnu.org/; + homepage = "http://aldo.nongnu.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ etu ]; platforms = platforms.linux; diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index f88687b076e03..848e0ca3c01e5 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -4,11 +4,11 @@ }: python2.pkgs.buildPythonApplication rec { pname = "chirp-daily"; - version = "20200213"; + version = "20200409"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "189kg3425wggib1cggcj49bk01pq3j4b8mks7najpp1rjsl5f2i1"; + sha256 = "16zhwg2xmp5kpqx5isavwwkfq1212zgfj8gbp453ngjcrvp3m4lq"; }; propagatedBuildInputs = with python2.pkgs; [ @@ -17,9 +17,8 @@ python2.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "A free, open-source tool for programming your amateur radio"; - homepage = https://chirp.danplanet.com/; + homepage = "https://chirp.danplanet.com/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.the-kenny ]; }; } diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index 14badd6c55c57..ef4d68af54c6a 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; meta = with stdenv.lib; { - homepage = https://cubicsdr.com; + homepage = "https://cubicsdr.com"; description = "Software Defined Radio application"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lasandell ]; diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix index fba63362ab6e6..287649ddbe1e8 100644 --- a/pkgs/applications/radio/dablin/default.nix +++ b/pkgs/applications/radio/dablin/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "dablin"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "Opendigitalradio"; repo = "dablin"; rev = version; - sha256 = "0d514ixz062xyyh4k3laxwhn3k3a1l4jq4w7rxf8x46d3743zrf7"; + sha256 = "0143jnhwwh4din6mlrkbm8m2wm8vnrlk0yk9r5qcvj70r2314bgq"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Play DAB/DAB+ from ETI-NI aligned stream"; - homepage = https://github.com/Opendigitalradio/dablin; + homepage = "https://github.com/Opendigitalradio/dablin"; license = with licenses; [ gpl3 lgpl21 ]; platforms = platforms.linux; maintainers = [ maintainers.markuskowa ]; diff --git a/pkgs/applications/radio/dmrconfig/default.nix b/pkgs/applications/radio/dmrconfig/default.nix index 68b4cfe8af464..47b72669f8fda 100644 --- a/pkgs/applications/radio/dmrconfig/default.nix +++ b/pkgs/applications/radio/dmrconfig/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { longDescription = '' DMRconfig is a utility for programming digital radios via USB programming cable. ''; - homepage = https://github.com/sergev/dmrconfig; + homepage = "https://github.com/sergev/dmrconfig"; license = licenses.asl20; maintainers = [ maintainers.etu ]; platforms = platforms.linux; diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix index 3ab25d86e75ad..01af881d133a5 100644 --- a/pkgs/applications/radio/dump1090/default.nix +++ b/pkgs/applications/radio/dump1090/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "dump1090"; - version = "3.7.2"; + version = "3.8.0"; src = fetchFromGitHub { owner = "flightaware"; repo = pname; rev = "v${version}"; - sha256 = "0vlv9bd805kid202xxkrnl51rh02cyrl055gbcqlqgk51j5rrq8w"; + sha256 = "0c30x56h79hza9m6b9zp5y28jxx4f4n5xgaaw597l8agcm5iia0p"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/radio/ebook2cw/default.nix b/pkgs/applications/radio/ebook2cw/default.nix index 915d0ba84db37..d273594f4c90c 100644 --- a/pkgs/applications/radio/ebook2cw/default.nix +++ b/pkgs/applications/radio/ebook2cw/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Convert ebooks to Morse MP3s/OGGs"; - homepage = http://fkurz.net/ham/ebook2cw.html; + homepage = "http://fkurz.net/ham/ebook2cw.html"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ earldouglas ]; diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 20cf2cf628634..84908d304dfb5 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -2,12 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.1.11"; + version = "4.1.12"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1y62xn1pim38ibaf2mbl8b7aq20jdaac6lgggb9r402w9bj5b196"; + sha256 = "1yjjv2ss84xfiaidypp476mhrbpnw4zf7mb5cdqwhdh604x0svr1"; }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio diff --git a/pkgs/applications/radio/fllog/default.nix b/pkgs/applications/radio/fllog/default.nix index 49149a2d82a6b..649caae09021a 100644 --- a/pkgs/applications/radio/fllog/default.nix +++ b/pkgs/applications/radio/fllog/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem log program"; - homepage = https://sourceforge.net/projects/fldigi/; + homepage = "https://sourceforge.net/projects/fldigi/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ dysinger ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/radio/flmsg/default.nix b/pkgs/applications/radio/flmsg/default.nix index 39fbb0de06c0e..e437dffa48563 100644 --- a/pkgs/applications/radio/flmsg/default.nix +++ b/pkgs/applications/radio/flmsg/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem message program"; - homepage = https://sourceforge.net/projects/fldigi/; + homepage = "https://sourceforge.net/projects/fldigi/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ dysinger ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/radio/flwrap/default.nix b/pkgs/applications/radio/flwrap/default.nix index 6bdab0a925d30..889c212de4e95 100644 --- a/pkgs/applications/radio/flwrap/default.nix +++ b/pkgs/applications/radio/flwrap/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem file transfer program"; - homepage = https://sourceforge.net/projects/fldigi/; + homepage = "https://sourceforge.net/projects/fldigi/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ dysinger ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 005f83e0f54e7..4e423094e90e5 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -12,7 +12,7 @@ , pythonPackages , uhd , log4cpp -, openblas +, blas, lapack , matio , pugixml , protobuf @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # nothing to be gained by leaving it out. uhd log4cpp - openblas + blas lapack matio pugixml protobuf @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { # armadillo is built using both, so skip checking for them. "-DBLAS=YES" "-DLAPACK=YES" - "-DBLAS_LIBRARIES=-lopenblas" - "-DLAPACK_LIBRARIES=-lopenblas" + "-DBLAS_LIBRARIES=-lblas" + "-DLAPACK_LIBRARIES=-llapack" # Similarly, it doesn't actually use gfortran despite checking for # its presence. diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix index c26d3e77c70d8..30c2638a72f8f 100644 --- a/pkgs/applications/radio/gnuradio/ais.nix +++ b/pkgs/applications/radio/gnuradio/ais.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Gnuradio block for ais"; - homepage = https://github.com/bistromath/gr-ais; + homepage = "https://github.com/bistromath/gr-ais"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ mog ]; diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index f5c89ae51cef8..7863cf84fb124 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -1,18 +1,35 @@ -{ stdenv, fetchFromGitHub, writeText, makeWrapper +{ stdenv +, fetchFromGitHub +, makeWrapper +, writeText # Dependencies documented @ https://gnuradio.org/doc/doxygen/build_guide.html # => core dependencies -, cmake, pkgconfig, git, boost, cppunit, fftw +, cmake +, pkgconfig +, git +, boost +, cppunit +, fftw # => python wrappers # May be able to upgrade to swig3 -, python, swig2, numpy, scipy, matplotlib +, python +, swig2 +, numpy +, scipy +, matplotlib # => grc - the gnu radio companion -, Mako, cheetah, pygtk # Note: GR is migrating to Mako. Cheetah should be removed for GR3.8 +, Mako +, cheetah +, pygtk # Note: GR is migrating to Mako. Cheetah should be removed for GR3.8 # => gr-wavelet: collection of wavelet blocks , gsl # => gr-qtgui: the Qt-based GUI -, qt4, qwt, pyqt4 +, qt4 +, qwt +, pyqt4 # => gr-wxgui: the Wx-based GUI -, wxPython, lxml +, wxPython +, lxml # => gr-audio: audio subsystems (system/OS dependent) , alsaLib # linux 'audio-alsa' , CoreAudio # darwin 'audio-osx' @@ -21,7 +38,9 @@ # => gr-video-sdl: PAL and NTSC display , SDL # Other -, libusb1, orc, pyopengl +, libusb1 +, orc +, pyopengl }: stdenv.mkDerivation rec { @@ -37,17 +56,39 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig git makeWrapper cppunit orc + cmake + pkgconfig + git + makeWrapper + cppunit + orc ]; buildInputs = [ - boost fftw python swig2 lxml qt4 - qwt SDL libusb1 uhd gsl + boost + fftw + python + swig2 + lxml + qt4 + qwt + SDL + libusb1 + uhd + gsl ] ++ stdenv.lib.optionals stdenv.isLinux [ alsaLib ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreAudio ]; propagatedBuildInputs = [ - Mako cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl + Mako + cheetah + numpy + scipy + matplotlib + pyqt4 + pygtk + wxPython + pyopengl ]; NIX_LDFLAGS = "-lpthread"; @@ -116,7 +157,7 @@ stdenv.mkDerivation rec { environments to support both wireless communications research and real-world radio systems. ''; - homepage = https://www.gnuradio.org; + homepage = "https://www.gnuradio.org"; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor fpletz ]; diff --git a/pkgs/applications/radio/gnuradio/gsm.nix b/pkgs/applications/radio/gnuradio/gsm.nix index 27cdfc74aab31..e0b8d7dd44f7e 100644 --- a/pkgs/applications/radio/gnuradio/gsm.nix +++ b/pkgs/applications/radio/gnuradio/gsm.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Gnuradio block for gsm"; - homepage = https://github.com/ptrkrysik/gr-gsm; + homepage = "https://github.com/ptrkrysik/gr-gsm"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ mog ]; diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix index ec1b802c659bd..490caaaa7beab 100644 --- a/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/pkgs/applications/radio/gnuradio/limesdr.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Gnuradio source and sink blocks for LimeSDR"; - homepage = https://wiki.myriadrf.org/Gr-limesdr_Plugin_for_GNURadio; + homepage = "https://wiki.myriadrf.org/Gr-limesdr_Plugin_for_GNURadio"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.markuskowa ]; diff --git a/pkgs/applications/radio/gnuradio/nacl.nix b/pkgs/applications/radio/gnuradio/nacl.nix index 3026c81e8eff7..e3d851e2e14a9 100644 --- a/pkgs/applications/radio/gnuradio/nacl.nix +++ b/pkgs/applications/radio/gnuradio/nacl.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Gnuradio block for encryption"; - homepage = https://github.com/stwunsch/gr-nacl; + homepage = "https://github.com/stwunsch/gr-nacl"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ mog ]; diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix index 017e2e1632ce0..ad54fc8d7c4f6 100644 --- a/pkgs/applications/radio/gnuradio/osmosdr.nix +++ b/pkgs/applications/radio/gnuradio/osmosdr.nix @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gnuradio block for OsmoSDR and rtl-sdr"; - homepage = https://sdr.osmocom.org/trac/wiki/GrOsmoSDR; + homepage = "https://sdr.osmocom.org/trac/wiki/GrOsmoSDR"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ bjornfor the-kenny ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/applications/radio/gnuradio/rds.nix b/pkgs/applications/radio/gnuradio/rds.nix index e4a55fe50987c..1f8ed211ef29b 100644 --- a/pkgs/applications/radio/gnuradio/rds.nix +++ b/pkgs/applications/radio/gnuradio/rds.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gnuradio block for radio data system"; - homepage = https://github.com/bastibl/gr-rds; + homepage = "https://github.com/bastibl/gr-rds"; license = licenses.gpl2Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ mog ]; diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index f1a71804e3ff8..33b858799e2a9 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -43,6 +43,6 @@ mkDerivation rec { # it's currently unknown which version of the BSD license that is. license = licenses.gpl3Plus; platforms = platforms.linux; # should work on Darwin / macOS too - maintainers = with maintainers; [ bjornfor the-kenny fpletz ]; + maintainers = with maintainers; [ bjornfor fpletz ]; }; } diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/applications/radio/hackrf/default.nix index ea05d08e8ce2a..dfd7fabcc6e09 100644 --- a/pkgs/applications/radio/hackrf/default.nix +++ b/pkgs/applications/radio/hackrf/default.nix @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source SDR platform"; - homepage = http://greatscottgadgets.com/hackrf/; + homepage = "http://greatscottgadgets.com/hackrf/"; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ sjmackenzie the-kenny ]; + maintainers = with maintainers; [ sjmackenzie ]; }; } diff --git a/pkgs/applications/radio/kalibrate-hackrf/default.nix b/pkgs/applications/radio/kalibrate-hackrf/default.nix index 3964a8c373703..273d2d8c8e37c 100644 --- a/pkgs/applications/radio/kalibrate-hackrf/default.nix +++ b/pkgs/applications/radio/kalibrate-hackrf/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { This package is for hackrf devices. ''; - homepage = https://github.com/scateu/kalibrate-hackrf; + homepage = "https://github.com/scateu/kalibrate-hackrf"; license = licenses.bsd2; platforms = platforms.linux; maintainers = [ maintainers.mog ]; diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/pkgs/applications/radio/kalibrate-rtl/default.nix index 879cd6e3aac94..38913e827d09b 100644 --- a/pkgs/applications/radio/kalibrate-rtl/default.nix +++ b/pkgs/applications/radio/kalibrate-rtl/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { This package is for RTL-SDR devices. ''; - homepage = https://github.com/steve-m/kalibrate-rtl; + homepage = "https://github.com/steve-m/kalibrate-rtl"; license = licenses.bsd2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index aae062a87c7e8..ef36eac28e423 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Driver and GUI for LMS7002M-based SDR platforms"; - homepage = https://github.com/myriadrf/LimeSuite; + homepage = "https://github.com/myriadrf/LimeSuite"; license = licenses.asl20; maintainers = with maintainers; [ markuskowa ]; platforms = platforms.linux; diff --git a/pkgs/applications/radio/minimodem/default.nix b/pkgs/applications/radio/minimodem/default.nix index 55cd14cf70da9..e94561e46dc80 100644 --- a/pkgs/applications/radio/minimodem/default.nix +++ b/pkgs/applications/radio/minimodem/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { standard FSK protocols such as Bell103, Bell202, RTTY, NOAA SAME, and Caller-ID. ''; - homepage = http://www.whence.com/minimodem/; + homepage = "http://www.whence.com/minimodem/"; license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ relrod ]; diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/applications/radio/multimon-ng/default.nix index c0f189686ac9b..e275db4ad9196 100644 --- a/pkgs/applications/radio/multimon-ng/default.nix +++ b/pkgs/applications/radio/multimon-ng/default.nix @@ -36,9 +36,8 @@ stdenv.mkDerivation { AFSK2400 AFSK2400_2 AFSK2400_3 HAPN4800 FSK9600 DTMF ZVEI1 ZVEI2 ZVEI3 DZVEI PZVEI EEA EIA CCIR MORSE CW ''; - homepage = https://github.com/EliasOenal/multimon-ng; + homepage = "https://github.com/EliasOenal/multimon-ng"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index a00ec6c47eb8b..4c792811dc59f 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "SDR transceiver application for analog and digital modes"; - homepage = http://qradiolink.org/; + homepage = "http://qradiolink.org/"; license = licenses.agpl3; maintainers = [ maintainers.markuskowa ]; platforms = platforms.linux; diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix index a4ef5a2a0d1bf..d5d12a7140312 100644 --- a/pkgs/applications/radio/qsstv/default.nix +++ b/pkgs/applications/radio/qsstv/default.nix @@ -27,7 +27,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Qt-based slow-scan TV and fax"; - homepage = http://users.telenet.be/on4qz/; + homepage = "http://users.telenet.be/on4qz/"; platforms = platforms.linux; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ hax404 ]; diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index 69c568c3a1bb8..8fb5154ff7887 100644 --- a/pkgs/applications/radio/rtl-sdr/default.nix +++ b/pkgs/applications/radio/rtl-sdr/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; - homepage = http://sdr.osmocom.org/trac/wiki/rtl-sdr; + homepage = "http://sdr.osmocom.org/trac/wiki/rtl-sdr"; license = licenses.gpl2Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index 5faac96d28f09..78d0f8befc981 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Decode traffic from devices that broadcast on 433.9 MHz"; - homepage = https://github.com/merbanan/rtl_433; + homepage = "https://github.com/merbanan/rtl_433"; license = licenses.gpl2; maintainers = with maintainers; [ earldouglas ]; platforms = platforms.all; diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 7cb64f92f3f4d..6d0a19334decc 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -13,7 +13,7 @@ libav, libiio, libopus, libpulseaudio, -libusb, +libusb-compat-0_1, limesuite, mkDerivation, ocl-icd, @@ -51,7 +51,7 @@ in mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - glew opencv3 libusb boost libopus limesuite libav libiio libpulseaudio + glew opencv3 libusb-compat-0_1 boost libopus limesuite libav libiio libpulseaudio qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf fftwFloat codec2' cm256cc serialdv ]; diff --git a/pkgs/applications/radio/soapyairspy/default.nix b/pkgs/applications/radio/soapyairspy/default.nix index eacbe66e5e5a2..4a69e52741e7f 100644 --- a/pkgs/applications/radio/soapyairspy/default.nix +++ b/pkgs/applications/radio/soapyairspy/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapyAirspy; + homepage = "https://github.com/pothosware/SoapyAirspy"; description = "SoapySDR plugin for Airspy devices"; license = licenses.mit; maintainers = with maintainers; [ markuskowa ]; diff --git a/pkgs/applications/radio/soapybladerf/default.nix b/pkgs/applications/radio/soapybladerf/default.nix index 0bb05a204da75..7e2e17a845584 100644 --- a/pkgs/applications/radio/soapybladerf/default.nix +++ b/pkgs/applications/radio/soapybladerf/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapyBladeRF; + homepage = "https://github.com/pothosware/SoapyBladeRF"; description = "SoapySDR plugin for BladeRF devices"; license = licenses.lgpl21; maintainers = with maintainers; [ markuskowa ]; diff --git a/pkgs/applications/radio/soapyhackrf/default.nix b/pkgs/applications/radio/soapyhackrf/default.nix index 5ab4c3363f48d..e472b1cc3ae9b 100644 --- a/pkgs/applications/radio/soapyhackrf/default.nix +++ b/pkgs/applications/radio/soapyhackrf/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapyHackRF; + homepage = "https://github.com/pothosware/SoapyHackRF"; description = "SoapySDR plugin for HackRF devices"; license = licenses.mit; maintainers = with maintainers; [ markuskowa ]; diff --git a/pkgs/applications/radio/soapyremote/default.nix b/pkgs/applications/radio/soapyremote/default.nix index 2f73403a168bb..ed94693db41fe 100644 --- a/pkgs/applications/radio/soapyremote/default.nix +++ b/pkgs/applications/radio/soapyremote/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapyRemote; + homepage = "https://github.com/pothosware/SoapyRemote"; description = "SoapySDR plugin for remote access to SDRs"; license = licenses.boost; maintainers = with maintainers; [ markuskowa ]; diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix index 8bf473cb36a3c..8f342190ba7e1 100644 --- a/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapyRTLSDR; + homepage = "https://github.com/pothosware/SoapyRTLSDR"; description = "SoapySDR plugin for RTL-SDR devices"; license = licenses.mit; maintainers = with maintainers; [ ragge ]; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index e072ec97b9745..676f7d3c839e2 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, lndir, makeWrapper , fetchFromGitHub, cmake -, libusb, pkgconfig +, libusb-compat-0_1, pkgconfig , usePython ? false , python, ncurses, swig2 , extraPackages ? [] @@ -25,7 +25,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; - buildInputs = [ libusb ncurses ] + buildInputs = [ libusb-compat-0_1 ncurses ] ++ lib.optionals usePython [ python swig2 ]; propagatedBuildInputs = lib.optional usePython python.pkgs.numpy; @@ -46,7 +46,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapySDR; + homepage = "https://github.com/pothosware/SoapySDR"; description = "Vendor and platform neutral SDR support library"; license = licenses.boost; maintainers = with maintainers; [ markuskowa ]; diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix index 9e910584158df..a169116c29a1b 100644 --- a/pkgs/applications/radio/soapyuhd/default.nix +++ b/pkgs/applications/radio/soapyuhd/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapyAirspy; + homepage = "https://github.com/pothosware/SoapyAirspy"; description = "SoapySDR plugin for UHD devices"; license = licenses.gpl3; maintainers = with maintainers; [ markuskowa ]; diff --git a/pkgs/applications/radio/tlf/default.nix b/pkgs/applications/radio/tlf/default.nix index 530008702f10d..fd9ab82b321cb 100644 --- a/pkgs/applications/radio/tlf/default.nix +++ b/pkgs/applications/radio/tlf/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "tlf"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${pname}-${version}"; - sha256 = "0f97hxiwc6blp5haik871q6zzvwy0b3p2jg8ad2dvaxg07xc76l0"; + sha256 = "1xpgs4k27pjd9mianfknknp6mf34365bcp96wrv5xh4dhph573rj"; }; nativeBuildInputs = [ autoreconfHook autoconf automake pkgconfig perl ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { EU SPRINT shortwave contests (single operator) as well as a LOT MORE basic contests, general QSO and DXpedition mode. ''; - homepage = https://tlf.github.io/; + homepage = "https://tlf.github.io/"; license = licenses.gpl2; maintainers = with maintainers; [ etu ]; platforms = platforms.linux; diff --git a/pkgs/applications/radio/tqsl/default.nix b/pkgs/applications/radio/tqsl/default.nix index 451a63c3d81f2..fd5f5505a6726 100644 --- a/pkgs/applications/radio/tqsl/default.nix +++ b/pkgs/applications/radio/tqsl/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Software for using the ARRL Logbook of the World"; - homepage = https://www.arrl.org/tqsl-download; + homepage = "https://www.arrl.org/tqsl-download"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.dpflug ]; diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 850f73c492244..730b679ba61e7 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.8.5"; + version = "2.8.8"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "060npn0q7yrby2zj9hi8x7raivs91v9hvryvf45k1ipyqh8dgri6"; + sha256 = "0knymy85n9kxj364jpxjc4v9c238b00nl40rafi1ripkqx36bsfv"; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index 66a033fef25b0..ce4c872821ec5 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig -, qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2 -, faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec, lame, mpg123 }: +, qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects +, faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 }: let version = "2.1"; @@ -23,13 +23,14 @@ in mkDerivation { faad2 fftwSinglePrec lame - libusb + libusb-compat-0_1 mpg123 qtbase qtcharts qtmultimedia qtquickcontrols qtquickcontrols2 + qtgraphicaleffects rtl-sdr soapysdr-with-plugins ]; @@ -42,7 +43,7 @@ in mkDerivation { meta = with lib; { description = "A DAB/DAB+ Software Radio"; - homepage = https://www.welle.io/; + homepage = "https://www.welle.io/"; maintainers = with maintainers; [ ck3d markuskowa ]; license = licenses.gpl2; platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index 2268cdf725dbb..e92c216466fc3 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, glib, gtk2, pkgconfig, hamlib }: stdenv.mkDerivation rec { pname = "xlog"; - version = "2.0.17"; + version = "2.0.19"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/xlog/${pname}-${version}.tar.gz"; - sha256 = "0vmn8518zk7qk1mbp1h8dm0f8fx0z0jvmy42c1n15il714lj7vsl"; + sha256 = "0y38gkcm4mgv6wn31pjq6d5bm22m63rpwa55qjmrlywrmw76rppy"; }; # glib-2.62 deprecations @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { location in latitude and longitude and distance and heading in kilometers or miles, both for short and long path. ''; - homepage = https://www.nongnu.org/xlog; + homepage = "https://www.nongnu.org/xlog"; maintainers = [ maintainers.mafo ]; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix index 32d89866b5aef..cb3f3131ea14a 100644 --- a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix +++ b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib;{ - homepage = https://www.astrolabeproject.com; + homepage = "https://www.astrolabeproject.com"; description = "A Java-based tool for generating EPS files for constructing astrolabes and related tools"; license = licenses.gpl3; maintainers = [ maintainers.genesis ]; diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index e72354c86585f..340641917e4f0 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation { meta = { description = "Free space simulation"; - homepage = https://celestia.space/; + homepage = "https://celestia.space/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 9908439e10d45..38d8e23a811b3 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { extensible. GILDAS is written in Fortran-90, with a few parts in C/C++ (mainly keyboard interaction, plotting, widgets).''; - homepage = http://www.iram.fr/IRAMFR/GILDAS/gildas.html; + homepage = "http://www.iram.fr/IRAMFR/GILDAS/gildas.html"; license = stdenv.lib.licenses.free; maintainers = [ stdenv.lib.maintainers.bzizou stdenv.lib.maintainers.smaret ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index f36431beac138..1ae80c0b0aa6a 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation { ''; license = licenses.gpl2; platforms = platforms.linux; - homepage = http://gpredict.oz9aec.net/; + homepage = "http://gpredict.oz9aec.net/"; maintainers = [ maintainers.markuskowa maintainers.cmcdragonkai ]; }; } diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 15f72938effe5..0a98563ed0e54 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://gravit.slowchop.com; + homepage = "https://gravit.slowchop.com"; description = "Beautiful OpenGL-based gravity simulator"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix new file mode 100644 index 0000000000000..0b53e3e85ac3d --- /dev/null +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -0,0 +1,48 @@ +{ + mkDerivation, lib, fetchgit, + extra-cmake-modules, + + kconfig, kdoctools, kguiaddons, ki18n, kinit, kiconthemes, kio, + knewstuff, kplotting, kwidgetsaddons, kxmlgui, + + qtx11extras, qtwebsockets, + + eigen, zlib, + + cfitsio, indilib, xplanet +}: + +mkDerivation { + name = "kstars"; + + src = fetchgit { + url = "https://anongit.kde.org/kstars.git"; + rev = "7acc527939280edd22823371dc4e22494c6c626a"; + sha256 = "1n1lgi7p3dj893fdnzjbnrha40p4apl0dy8zppcabxwrb1khb84v"; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kconfig kdoctools kguiaddons ki18n kinit kiconthemes kio + knewstuff kplotting kwidgetsaddons kxmlgui + + qtx11extras qtwebsockets + + eigen zlib + + cfitsio indilib xplanet + ]; + + meta = with lib; { + description = "Virtual planetarium astronomy software"; + homepage = "https://kde.org/applications/education/org.kde.kstars"; + longDescription = '' + It provides an accurate graphical simulation of the night sky, from any location on Earth, at any date and time. + The display includes up to 100 million stars, 13.000 deep-sky objects, all 8 planets, the Sun and Moon, and thousands of comets, asteroids, supernovae, and satellites. + For students and teachers, it supports adjustable simulation speeds in order to view phenomena that happen over long timescales, the KStars Astrocalculator to predict conjunctions, and many common astronomical calculations. + ''; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ timput ]; + }; +} diff --git a/pkgs/applications/science/astronomy/openspace/default.nix b/pkgs/applications/science/astronomy/openspace/default.nix index cfdd320d201ca..566fd61f1a7b5 100644 --- a/pkgs/applications/science/astronomy/openspace/default.nix +++ b/pkgs/applications/science/astronomy/openspace/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { WARNING: This build is not very usable for now. ''; - homepage = https://www.openspaceproject.com/; + homepage = "https://www.openspaceproject.com/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; broken = true; # fails to build diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 3cb34576c46b6..7ef7776c0fe84 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "stellarium"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "1732dxkgyqd4xf0ry7v930vcbv60l8iry596869z1d47j2piibs4"; + sha256 = "1x8svan03k1x9jwqflimbpj7jpg6mjrbz26bg1sbhsqdlc8rbhky"; }; nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; @@ -24,7 +24,7 @@ mkDerivation rec { meta = with lib; { description = "Free open-source planetarium"; - homepage = http://stellarium.org/; + homepage = "http://stellarium.org/"; license = licenses.gpl2; platforms = platforms.linux; # should be mesaPlatforms, but we don't have qt on darwin diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index f306f9265abad..a314678b6ea3a 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Renders an image of the earth or other planets into the X root window"; - homepage = http://xplanet.sourceforge.net; + homepage = "http://xplanet.sourceforge.net"; license = licenses.gpl2; maintainers = with maintainers; [ lassulus sander ]; platforms = platforms.all; diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix index 978615fa4592c..7502a4ffd2abf 100644 --- a/pkgs/applications/science/biology/EZminc/default.nix +++ b/pkgs/applications/science/biology/EZminc/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libminc, bicpl, itk, fftwFloat, gsl }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, libminc, bicpl, itk4, fftwFloat, gsl }: stdenv.mkDerivation rec { pname = "EZminc"; - name = "${pname}-unstable-2019-07-25"; + name = "${pname}-unstable-2019-03-12"; src = fetchFromGitHub { owner = "BIC-MNI"; repo = pname; - rev = "9591edd5389a5bda2c1f606816c7cdb35c065adf"; - sha256 = "02k87qbpx0f48l2lbcjmlqx82py684z3sfi29va5icfg3hjd6j7b"; + rev = "5e3333ee356f914d34d66d33ea8df809c7f7fa51"; + sha256 = "0wy8cppf5xpgfqvgb3mqs1cjh81n6qzkk6zxv29wvng8nar9wsy4"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ itk libminc bicpl fftwFloat gsl ]; + buildInputs = [ itk4 libminc bicpl fftwFloat gsl ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEZMINC_BUILD_TOOLS=TRUE" diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index 6e1a2a3407ee1..20eedfaaa16c3 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ANTsX/ANTs; + homepage = "https://github.com/ANTsX/ANTs"; description = "Advanced normalization toolkit for medical image registration and other processing"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/aragorn/default.nix b/pkgs/applications/science/biology/aragorn/default.nix index a5f0ebc18abd6..956e4d884531c 100644 --- a/pkgs/applications/science/biology/aragorn/default.nix +++ b/pkgs/applications/science/biology/aragorn/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Detects tRNA, mtRNA, and tmRNA genes in nucleotide sequences"; - homepage = http://mbio-serv2.mbioekol.lu.se/ARAGORN/; + homepage = "http://mbio-serv2.mbioekol.lu.se/ARAGORN/"; license = licenses.gpl2; maintainers = [ maintainers.bzizou ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 4a6a464de4648..b847fd8b5fe47 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools for manipulating BCF2/VCF/gVCF format, SNP and short indel sequence variants"; license = licenses.mit; - homepage = http://www.htslib.org/; + homepage = "http://www.htslib.org/"; platforms = platforms.unix; maintainers = [ maintainers.mimame ]; }; diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix index 9af2ec88c3921..332e06ea0cf5a 100644 --- a/pkgs/applications/science/biology/bedtools/default.nix +++ b/pkgs/applications/science/biology/bedtools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A powerful toolset for genome arithmetic."; license = licenses.gpl2; - homepage = https://bedtools.readthedocs.io/en/latest/; + homepage = "https://bedtools.readthedocs.io/en/latest/"; maintainers = with maintainers; [ jbedo ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/biology/bftools/default.nix b/pkgs/applications/science/biology/bftools/default.nix index 29e8bca52625a..2ecefee340fd6 100644 --- a/pkgs/applications/science/biology/bftools/default.nix +++ b/pkgs/applications/science/biology/bftools/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "A bundle of scripts for using Bio-Formats on the command line with bioformats_package.jar already included"; license = licenses.gpl2; platforms = platforms.all; - homepage = https://www.openmicroscopy.org/bio-formats/; + homepage = "https://www.openmicroscopy.org/bio-formats/"; maintainers = [ maintainers.tbenst ]; }; } diff --git a/pkgs/applications/science/biology/blast/default.nix b/pkgs/applications/science/biology/blast/default.nix index ad737c6699d60..95a1b905e9e24 100644 --- a/pkgs/applications/science/biology/blast/default.nix +++ b/pkgs/applications/science/biology/blast/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''Basic Local Alignment Search Tool (BLAST) finds regions of similarity between biological sequences''; - homepage = https://blast.ncbi.nlm.nih.gov/Blast.cgi; + homepage = "https://blast.ncbi.nlm.nih.gov/Blast.cgi"; license = licenses.publicDomain; # Version 2.10.0 fails on Darwin diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index 962428d67cf9c..dc818e2fb8684 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An ultrafast and memory-efficient tool for aligning sequencing reads to long reference sequences"; license = licenses.gpl3; - homepage = http://bowtie-bio.sf.net/bowtie2; + homepage = "http://bowtie-bio.sf.net/bowtie2"; maintainers = with maintainers; [ rybern ]; platforms = platforms.all; broken = stdenv.isAarch64; diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix index 5e39320bf8355..e478c104edef9 100644 --- a/pkgs/applications/science/biology/bwa/default.nix +++ b/pkgs/applications/science/biology/bwa/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A software package for mapping low-divergent sequences against a large reference genome, such as the human genome"; license = licenses.gpl3; - homepage = http://bio-bwa.sourceforge.net/; + homepage = "http://bio-bwa.sourceforge.net/"; maintainers = with maintainers; [ luispedro ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/biology/cd-hit/default.nix b/pkgs/applications/science/biology/cd-hit/default.nix index 1a41a28a19aae..0db788b0f7431 100644 --- a/pkgs/applications/science/biology/cd-hit/default.nix +++ b/pkgs/applications/science/biology/cd-hit/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "Clustering and comparing protein or nucleotide sequences"; - homepage = http://weizhongli-lab.org/cd-hit/; + homepage = "http://weizhongli-lab.org/cd-hit/"; license = licenses.gpl2; maintainers = [ maintainers.bzizou ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/clustal-omega/default.nix b/pkgs/applications/science/biology/clustal-omega/default.nix index 00acc25028c03..71cf879853767 100644 --- a/pkgs/applications/science/biology/clustal-omega/default.nix +++ b/pkgs/applications/science/biology/clustal-omega/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "General purpose multiple sequence alignment program for protein and DNA/RNA"; - homepage = http://www.clustal.org/omega/; + homepage = "http://www.clustal.org/omega/"; license = licenses.gpl2; maintainers = [ maintainers.bzizou ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index 1ebfa2fca57a1..41805c15aed59 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ tbenst ]; platforms = platforms.all; license = licenses.gpl3; - homepage = https://www.nitrc.org/projects/cmtk/; + homepage = "https://www.nitrc.org/projects/cmtk/"; }; } diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/applications/science/biology/conglomerate/default.nix index 23182fcadc6b5..971e2f23055b2 100644 --- a/pkgs/applications/science/biology/conglomerate/default.nix +++ b/pkgs/applications/science/biology/conglomerate/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/BIC-MNI/conglomerate; + homepage = "https://github.com/BIC-MNI/conglomerate"; description = "More command-line utilities for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index 7c328034a3062..59b173ac98cd6 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "1.0.20190902"; + version = "1.0.20200331"; pname = "dcm2niix"; src = fetchFromGitHub { owner = "rordenlab"; repo = "dcm2niix"; rev = "v${version}"; - sha256 = "0h8jsadgv831lqb0jhnaxm7lldirmnp5agrhgg5bcxvn860fl15b"; + sha256 = "1cncfwhyhmg18n970lkn6yvp0i74ajznsl8dqz00asqfzmg681n1"; }; enableParallelBuilding = true; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { dcm2niix is a designed to convert neuroimaging data from the DICOM format to the NIfTI format. ''; - homepage = https://www.nitrc.org/projects/dcm2nii; + homepage = "https://www.nitrc.org/projects/dcm2nii"; license = licenses.bsd3; maintainers = [ maintainers.ashgillman ]; platforms = platforms.all; diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index c1d20a11ca96a..dd1e13ec7162e 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation { "Fast and sensitive protein alignment using DIAMOND", Nature Methods 12, 59-60 (2015). ''; - homepage = https://github.com/bbuchfink/diamond; + homepage = "https://github.com/bbuchfink/diamond"; license = { fullName = "University of Tuebingen, Benjamin Buchfink"; - url = https://raw.githubusercontent.com/bbuchfink/diamond/master/src/COPYING; + url = "https://raw.githubusercontent.com/bbuchfink/diamond/master/src/COPYING"; }; maintainers = [ maintainers.metabar ]; }; diff --git a/pkgs/applications/science/biology/ecopcr/default.nix b/pkgs/applications/science/biology/ecopcr/default.nix index 9e1b16ff94491..2e744c7b2b9ee 100644 --- a/pkgs/applications/science/biology/ecopcr/default.nix +++ b/pkgs/applications/science/biology/ecopcr/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { coverage and barcode specificity. New barcode primers can be developed using the ecoPrimers software. ''; - homepage = https://git.metabarcoding.org/obitools/ecopcr/wikis/home; + homepage = "https://git.metabarcoding.org/obitools/ecopcr/wikis/home"; license = licenses.cecill20; maintainers = [ maintainers.metabar ]; }; diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix index e11f4ebf77c54..3ef52e543933b 100644 --- a/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -33,7 +33,7 @@ python27Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Fast genome-wide functional annotation through orthology assignment"; license = licenses.gpl2; - homepage = https://github.com/eggnogdb/eggnog-mapper/wiki; + homepage = "https://github.com/eggnogdb/eggnog-mapper/wiki"; maintainers = with maintainers; [ luispedro ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix index 2110a9bcfabab..e2374bcd1e2f8 100644 --- a/pkgs/applications/science/biology/emboss/default.nix +++ b/pkgs/applications/science/biology/emboss/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { data in a variety of formats and even allows transparent retrieval of sequence data from the web.''; license = "GPL2"; - homepage = http://emboss.sourceforge.net/; + homepage = "http://emboss.sourceforge.net/"; }; } diff --git a/pkgs/applications/science/biology/est-sfs/default.nix b/pkgs/applications/science/biology/est-sfs/default.nix index dcc7252335517..1b15c06c670a1 100644 --- a/pkgs/applications/science/biology/est-sfs/default.nix +++ b/pkgs/applications/science/biology/est-sfs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/est-usfs; + homepage = "https://sourceforge.net/projects/est-usfs"; description = "Estimate the unfolded site frequency spectrum and ancestral states"; license = licenses.gpl3; maintainers = [ maintainers.bzizou ]; diff --git a/pkgs/applications/science/biology/exonerate/default.nix b/pkgs/applications/science/biology/exonerate/default.nix index 1dd6b44692a38..b2c49ab007676 100644 --- a/pkgs/applications/science/biology/exonerate/default.nix +++ b/pkgs/applications/science/biology/exonerate/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Generic tool for sequence alignment"; - homepage = https://www.ebi.ac.uk/about/vertebrate-genomics/software/exonerate; + homepage = "https://www.ebi.ac.uk/about/vertebrate-genomics/software/exonerate"; license = licenses.gpl3; maintainers = [ maintainers.bzizou ]; platforms = platforms.unix ; diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix index 7d0a36e755f62..bd80df56cb905 100644 --- a/pkgs/applications/science/biology/freebayes/default.nix +++ b/pkgs/applications/science/biology/freebayes/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Bayesian haplotype-based polymorphism discovery and genotyping"; license = licenses.mit; - homepage = https://github.com/ekg/freebayes; + homepage = "https://github.com/ekg/freebayes"; maintainers = with maintainers; [ jdagilliland ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/biology/hisat2/default.nix b/pkgs/applications/science/biology/hisat2/default.nix index 824856301145b..fb7f2cba3de3b 100644 --- a/pkgs/applications/science/biology/hisat2/default.nix +++ b/pkgs/applications/science/biology/hisat2/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graph based aligner"; license = licenses.gpl3; - homepage = https://ccb.jhu.edu/software/hisat2/index.shtml; + homepage = "https://ccb.jhu.edu/software/hisat2/index.shtml"; maintainers = with maintainers; [ jbedo ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/pkgs/applications/science/biology/hmmer/default.nix index 69ecb228697b6..3786b62f7477f 100644 --- a/pkgs/applications/science/biology/hmmer/default.nix +++ b/pkgs/applications/science/biology/hmmer/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { HMMER is designed to detect remote homologs as sensitively as possible, relying on the strength of its underlying probability models. In the past, this strength came at significant computational expense, but as of the new HMMER3 project, HMMER is now essentially as fast as BLAST. HMMER can be downloaded and installed as a command line tool on your own hardware, and now it is also more widely accessible to the scientific community via new search servers at the European Bioinformatics Institute. ''; - homepage = http://hmmer.org/; + homepage = "http://hmmer.org/"; license = licenses.gpl3; maintainers = [ maintainers.iimog ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 04699a84b692d..aa6c95071b7bb 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.broadinstitute.org/igv/; + homepage = "https://www.broadinstitute.org/igv/"; description = "A visualization tool for interactive exploration of genomic datasets"; license = licenses.lgpl21; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/itsx/default.nix b/pkgs/applications/science/biology/itsx/default.nix index 1ba8cdf22ba02..ac534a4ec3cd4 100644 --- a/pkgs/applications/science/biology/itsx/default.nix +++ b/pkgs/applications/science/biology/itsx/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Improved software detection and extraction of ITS1 and ITS2 from ribosomal ITS sequences of fungi and other eukaryotes for use in environmental sequencing"; - homepage = https://microbiology.se/software/itsx/; + homepage = "https://microbiology.se/software/itsx/"; license = licenses.gpl3; maintainers = [ maintainers.bzizou ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix index 37abcf396211a..82fe36940081b 100644 --- a/pkgs/applications/science/biology/iv/default.nix +++ b/pkgs/applications/science/biology/iv/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec meta = with stdenv.lib; { description = "InterViews graphical library for Neuron"; license = licenses.bsd3; - homepage = http://www.neuron.yale.edu/neuron; + homepage = "http://www.neuron.yale.edu/neuron"; platforms = platforms.all; }; } diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 1a3762f43264f..fc302522215fa 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1060"; + version = "1061"; src = fetchurl { url = "http://last.cbrc.jp/last-${version}.zip"; - sha256 = "0h0604rxg0z0h21dykrnxsb4679zfhibg79gss1v2ik5xpdxl8kk"; + sha256 = "1jbvcxfy5xrf90qbhif0bd6aywm9rjqrm0sx24yr312f7r7c1dnx"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/science/biology/megahit/default.nix b/pkgs/applications/science/biology/megahit/default.nix index 86414980177f8..35ef280ed676e 100644 --- a/pkgs/applications/science/biology/megahit/default.nix +++ b/pkgs/applications/science/biology/megahit/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An ultra-fast single-node solution for large and complex metagenomics assembly via succinct de Bruijn graph"; license = licenses.gpl3; - homepage = https://github.com/voutcn/megahit; + homepage = "https://github.com/voutcn/megahit"; maintainers = with maintainers; [ luispedro ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix index d485666f39313..201e38cfc5383 100644 --- a/pkgs/applications/science/biology/messer-slim/default.nix +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "An evolutionary simulation framework"; - homepage = https://messerlab.org/slim/; + homepage = "https://messerlab.org/slim/"; license = with stdenv.lib.licenses; [ gpl3 ]; maintainers = with stdenv.lib.maintainers; [ bzizou ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/science/biology/migrate/default.nix b/pkgs/applications/science/biology/migrate/default.nix index d80e6e7b30df6..0e2aa1c1a7915 100644 --- a/pkgs/applications/science/biology/migrate/default.nix +++ b/pkgs/applications/science/biology/migrate/default.nix @@ -16,7 +16,7 @@ gccStdenv.mkDerivation rec { meta = with gccStdenv.lib; { description = "Estimates population size, migration, population splitting parameters using genetic/genomic data"; - homepage = https://peterbeerli.com/migrate-html5/index.html; + homepage = "https://peterbeerli.com/migrate-html5/index.html"; license = licenses.mit; maintainers = [ maintainers.bzizou ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix index 4c8b768a56a91..db803ea4922f0 100644 --- a/pkgs/applications/science/biology/minc-tools/default.nix +++ b/pkgs/applications/science/biology/minc-tools/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/BIC-MNI/minc-tools; + homepage = "https://github.com/BIC-MNI/minc-tools"; description = "Command-line utilities for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix index bff2bcf428b53..e33a17537910b 100644 --- a/pkgs/applications/science/biology/minimap2/default.nix +++ b/pkgs/applications/science/biology/minimap2/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A versatile pairwise aligner for genomic and spliced nucleotide sequences"; - homepage = https://lh3.github.io/minimap2; + homepage = "https://lh3.github.io/minimap2"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.arcadio ]; diff --git a/pkgs/applications/science/biology/mni_autoreg/default.nix b/pkgs/applications/science/biology/mni_autoreg/default.nix index ab22fb7232ffb..254d874f9d912 100644 --- a/pkgs/applications/science/biology/mni_autoreg/default.nix +++ b/pkgs/applications/science/biology/mni_autoreg/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/BIC-MNI/mni_autoreg; + homepage = "https://github.com/BIC-MNI/mni_autoreg"; description = "Tools for automated registration using the MINC image format"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix index 717b8c3ab2f3f..21af5b82207b4 100644 --- a/pkgs/applications/science/biology/mosdepth/default.nix +++ b/pkgs/applications/science/biology/mosdepth/default.nix @@ -4,8 +4,8 @@ let hts-nim = fetchFromGitHub { owner = "brentp"; repo = "hts-nim"; - rev = "v0.2.14"; - sha256 = "0d1z4b6mrppmz3hgkxd4wcy79w68icvhi7q7n3m2k17n8f3xbdx3"; + rev = "v0.3.4"; + sha256 = "0670phk1bq3l9j2zaa8i5wcpc5dyfrc0l2a6c21g0l2mmdczffa7"; }; docopt = fetchFromGitHub { @@ -17,13 +17,13 @@ let in stdenv.mkDerivation rec { pname = "mosdepth"; - version = "0.2.6"; + version = "0.2.9"; src = fetchFromGitHub { owner = "brentp"; repo = "mosdepth"; rev = "v${version}"; - sha256 = "0i9pl9lsli3y84ygxanrr525gfg8fs9h481944cbzsmqmbldwvgk"; + sha256 = "01gm9gj2x2zs4yx6wk761fi1papi7qr3gp4ln1kkn8n2f9y9h849"; }; buildInputs = [ nim ]; @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "fast BAM/CRAM depth calculation for WGS, exome, or targeted sequencing."; license = licenses.mit; - homepage = https://github.com/brentp/mosdepth; + homepage = "https://github.com/brentp/mosdepth"; maintainers = with maintainers; [ jbedo ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/science/biology/mrbayes/default.nix b/pkgs/applications/science/biology/mrbayes/default.nix index 1dd92af58eb1e..8ee7bccf075fe 100644 --- a/pkgs/applications/science/biology/mrbayes/default.nix +++ b/pkgs/applications/science/biology/mrbayes/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { MCMC) to approximate the posterior probabilities of trees. ''; license = "GPL2"; - homepage = http://mrbayes.csit.fsu.edu/; + homepage = "http://mrbayes.csit.fsu.edu/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix index 6959b2caab8a3..528277e05e388 100644 --- a/pkgs/applications/science/biology/mrtrix/default.nix +++ b/pkgs/applications/science/biology/mrtrix/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, fetchFromGitHub, python, makeWrapper -, eigen, fftw, libtiff, zlib, ants, bc +, eigen, fftw, libtiff, libpng, zlib, ants, bc , qt5, libGL, libGLU, libX11, libXext , withGui ? true }: stdenv.mkDerivation rec { pname = "mrtrix"; - version = "3.0_RC3_latest"; + version = "3.0.0"; src = fetchFromGitHub { owner = "MRtrix3"; repo = "mrtrix3"; rev = version; - sha256 = "184nv524p8j94qicjy9l288bqcgl2yxqqs55a7042i0gfsnwp51c"; + sha256 = "1vvmmbw3m0bdfwp4szr62ygzsvkj0ss91cx5zlkspsr1rff05f9b"; fetchSubmodules = true; }; @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { python fftw libtiff - zlib ] ++ lib.optionals withGui [ + libpng + zlib + ] ++ lib.optionals withGui [ libGL libGLU libX11 @@ -34,9 +36,14 @@ stdenv.mkDerivation rec { installCheckInputs = [ bc ]; postPatch = '' - patchShebangs ./build ./configure ./run_tests ./bin/population_template + patchShebangs ./build ./configure ./run_tests ./bin/* + + # patching interpreters before fixup is needed for tests: + patchShebangs ./bin/* + patchShebangs testing/binaries/data/vectorstats/*py + substituteInPlace ./run_tests \ - --replace 'git submodule update --init >> $LOGFILE 2>&1' "" + --replace 'git submodule update --init $datadir >> $LOGFILE 2>&1' "" ''; configurePhase = '' @@ -50,7 +57,13 @@ stdenv.mkDerivation rec { (cd testing && ../build) ''; - installCheckPhase = "./run_tests"; + installCheckPhase = '' + ./run_tests units + ./run_tests binaries + + # can also `./run_tests scripts`, but this fails due to lack of FSL package + # (and there's no convenient way to disable individual tests) + ''; doInstallCheck = true; installPhase = '' @@ -63,7 +76,9 @@ stdenv.mkDerivation rec { postInstall = '' for prog in $out/bin/*; do - wrapProgram $prog --prefix PATH : ${lib.makeBinPath [ ants ]} + if [[ -x "$prog" ]]; then + wrapProgram $prog --prefix PATH : ${lib.makeBinPath [ ants ]} + fi done ''; diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix index 9cbabc7ab37ed..7ed18349259e3 100644 --- a/pkgs/applications/science/biology/muscle/default.nix +++ b/pkgs/applications/science/biology/muscle/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A multiple sequence alignment method with reduced time and space complexity"; license = licenses.publicDomain; - homepage = https://www.drive5.com/muscle/; + homepage = "https://www.drive5.com/muscle/"; maintainers = [ maintainers.unode ]; # NOTE: Supposed to be compatible with darwin/intel & PPC but currently fails. # Anyone with access to these platforms is welcome to give it a try diff --git a/pkgs/applications/science/biology/ncbi-tools/default.nix b/pkgs/applications/science/biology/ncbi-tools/default.nix index 1c24ef0925421..cc8ebf7f37d93 100644 --- a/pkgs/applications/science/biology/ncbi-tools/default.nix +++ b/pkgs/applications/science/biology/ncbi-tools/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = ''NCBI Bioinformatics toolbox (incl. BLAST)''; longDescription = ''The NCBI Bioinformatics toolsbox, including command-line utilties, libraries and include files. No X11 support''; - homepage = http://www.ncbi.nlm.nih.gov/IEB/ToolBox/; + homepage = "http://www.ncbi.nlm.nih.gov/IEB/ToolBox/"; license = "GPL"; priority = 5; # zlib.so gives a conflict with zlib broken = true; diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 4e6d3494c7216..8cad5f466c5f0 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { involving many ion-specific channels, ion accumulation, and second messengers"; license = licenses.bsd3; - homepage = http://www.neuron.yale.edu/neuron; + homepage = "http://www.neuron.yale.edu/neuron"; maintainers = [ maintainers.adev ]; # source claims it's only tested for x86 and powerpc platforms = platforms.x86_64 ++ platforms.i686; diff --git a/pkgs/applications/science/biology/niftyreg/default.nix b/pkgs/applications/science/biology/niftyreg/default.nix index 48bd1b21ecd6c..fd7dc4f1fbb4f 100644 --- a/pkgs/applications/science/biology/niftyreg/default.nix +++ b/pkgs/applications/science/biology/niftyreg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://cmictig.cs.ucl.ac.uk/wiki/index.php/NiftyReg; + homepage = "http://cmictig.cs.ucl.ac.uk/wiki/index.php/NiftyReg"; description = "Medical image registration software"; maintainers = with maintainers; [ bcdarwin ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/biology/niftyseg/default.nix b/pkgs/applications/science/biology/niftyseg/default.nix index f70054e97716b..38194697223de 100644 --- a/pkgs/applications/science/biology/niftyseg/default.nix +++ b/pkgs/applications/science/biology/niftyseg/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://cmictig.cs.ucl.ac.uk/research/software/software-nifty/niftyseg; + homepage = "http://cmictig.cs.ucl.ac.uk/research/software/software-nifty/niftyseg"; description = "Software for medical image segmentation, bias field correction, and cortical thickness calculation"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix index 731e31c588fa8..7a2dc2782ab0a 100644 --- a/pkgs/applications/science/biology/paml/default.nix +++ b/pkgs/applications/science/biology/paml/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "Phylogenetic Analysis by Maximum Likelihood (PAML)"; longDescription = ''PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc.''; license = "non-commercial"; - homepage = http://abacus.gene.ucl.ac.uk/software/paml.html; + homepage = "http://abacus.gene.ucl.ac.uk/software/paml.html"; }; } diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 246c987681017..4b455eaca6fd3 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.22.2"; + version = "2.22.8"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "11mzz483f89pb2s8jmwhl12d0m6k41kmi4xh0i6hq69rxrqi8l4s"; + sha256 = "0g387jlf7r1p2kx8gya3vxksbjy3y2ywxa7yjqmxg3y8725fyixl"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/biology/platypus/default.nix b/pkgs/applications/science/biology/platypus/default.nix index 6907c6e3ec82e..30e45d5af0ecb 100644 --- a/pkgs/applications/science/biology/platypus/default.nix +++ b/pkgs/applications/science/biology/platypus/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "The Platypus variant caller"; license = licenses.gpl3; - homepage = https://github.com/andyrimmer/Platypus; + homepage = "https://github.com/andyrimmer/Platypus"; maintainers = with maintainers; [ jbedo ]; platforms = platforms.x86_64; }; diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix index 52f8f70b7796a..0a31ff6ba4fde 100644 --- a/pkgs/applications/science/biology/plink-ng/default.nix +++ b/pkgs/applications/science/biology/plink-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, openblas, darwin}: +{ stdenv, fetchFromGitHub, zlib, blas, lapack, darwin}: stdenv.mkDerivation rec { pname = "plink-ng"; @@ -11,14 +11,20 @@ stdenv.mkDerivation rec { sha256 = "1zhffjbwpd50dxywccbnv1rxy9njwz73l4awc5j7i28rgj3davcq"; }; - buildInputs = [ zlib ] ++ (if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.Accelerate ] else [ openblas ]) ; + buildInputs = [ zlib ] ++ (if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.Accelerate ] else [ blas lapack ]) ; - buildPhase = '' + preBuild = '' sed -i 's|zlib-1.2.8/zlib.h|zlib.h|g' *.c *.h ${if stdenv.cc.isClang then "sed -i 's|g++|clang++|g' Makefile.std" else ""} - make ZLIB=-lz ${if stdenv.isDarwin then "" else "BLASFLAGS=-lopenblas"} -f Makefile.std + + makeFlagsArray+=( + ZLIB=-lz + BLASFLAGS="-lblas -lcblas -llapack" + ); ''; + makefile = "Makefile.std"; + installPhase = '' mkdir -p $out/bin cp plink $out/bin @@ -26,9 +32,8 @@ stdenv.mkDerivation rec { meta = { description = "A comprehensive update to the PLINK association analysis toolset"; - homepage = https://www.cog-genomics.org/plink2; + homepage = "https://www.cog-genomics.org/plink2"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; } - diff --git a/pkgs/applications/science/biology/plink/default.nix b/pkgs/applications/science/biology/plink/default.nix index cc48a0cb13a93..009e12aa02f0f 100644 --- a/pkgs/applications/science/biology/plink/default.nix +++ b/pkgs/applications/science/biology/plink/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Whole genome association toolkit"; - homepage = http://pngu.mgh.harvard.edu/~purcell/plink/; + homepage = "http://pngu.mgh.harvard.edu/~purcell/plink/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; broken = true; diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix index 4660a776ab219..a9f3fdb246726 100755 --- a/pkgs/applications/science/biology/poretools/default.nix +++ b/pkgs/applications/science/biology/poretools/default.nix @@ -16,7 +16,7 @@ pythonPackages.buildPythonPackage rec { meta = { description = "a toolkit for working with nanopore sequencing data from Oxford Nanopore"; license = stdenv.lib.licenses.mit; - homepage = https://poretools.readthedocs.io/en/latest/; + homepage = "https://poretools.readthedocs.io/en/latest/"; maintainers = [stdenv.lib.maintainers.rybern]; }; } diff --git a/pkgs/applications/science/biology/prodigal/default.nix b/pkgs/applications/science/biology/prodigal/default.nix index 653f4390488e2..ba51c93c38c25 100644 --- a/pkgs/applications/science/biology/prodigal/default.nix +++ b/pkgs/applications/science/biology/prodigal/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast, reliable protein-coding gene prediction for prokaryotic genomes"; - homepage = https://github.com/hyattpd/Prodigal; + homepage = "https://github.com/hyattpd/Prodigal"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ luispedro ]; diff --git a/pkgs/applications/science/biology/quast/default.nix b/pkgs/applications/science/biology/quast/default.nix new file mode 100644 index 0000000000000..e3c3ea23c2c0e --- /dev/null +++ b/pkgs/applications/science/biology/quast/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl, python3Packages, zlib, bash, coreutils }: + +let + pythonPackages = python3Packages; + inherit (pythonPackages) python; +in + +pythonPackages.buildPythonApplication rec { + pname = "quast"; + version = "5.0.2"; + + src = fetchurl { + url = "https://github.com/ablab/quast/releases/download/${pname}_${version}/${pname}-${version}.tar.gz"; + sha256 = "13ml8qywbb4cc7wf2x7z5mz1rjqg51ab8wkizwcg4f6c40zgif6d"; + }; + + pythonPath = with pythonPackages; [ simplejson joblib setuptools matplotlib ]; + + nativeBuildInputs = [ coreutils ]; + + buildInputs = [ zlib ] ++ pythonPath; + + dontConfigure = true; + + dontBuild = true; + + installPhase = '' + substituteInPlace quast_libs/bedtools/Makefile \ + --replace "/bin/bash" "${bash}/bin/bash" + mkdir -p "$out/${python.sitePackages}" + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" + ${python.interpreter} setup.py install \ + --install-lib=$out/${python.sitePackages} \ + --prefix="$out" + ''; + + postFixup = '' + for file in $(find $out -type f -type f -perm /0111); do + old_rpath=$(patchelf --print-rpath $file) && \ + patchelf --set-rpath $old_rpath:${stdenv.cc.cc.lib}/lib $file || true + done + # Link to the master program + ln -s $out/bin/quast.py $out/bin/quast + ''; + + dontPatchELF = true; + + # Tests need to download data files, so manual run after packaging is needed + doCheck = false; + + meta = with stdenv.lib ; { + description = "Evaluates genome assemblies by computing various metrics"; + homepage = "https://github.com/ablab/quast"; + license = licenses.gpl2; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix index d7ee54bfbcf03..5c7353af9315c 100644 --- a/pkgs/applications/science/biology/raxml/default.nix +++ b/pkgs/applications/science/biology/raxml/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for Phylogenetic Analysis and Post-Analysis of Large Phylogenies"; license = licenses.gpl3; - homepage = https://sco.h-its.org/exelixis/web/software/raxml/; + homepage = "https://sco.h-its.org/exelixis/web/software/raxml/"; maintainers = [ maintainers.unode ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index f2c5e9f25beba..e750eea89ac9f 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools for manipulating SAM/BAM/CRAM format"; license = licenses.mit; - homepage = http://www.htslib.org/; + homepage = "http://www.htslib.org/"; platforms = platforms.unix; maintainers = [ maintainers.mimame ]; }; diff --git a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix index 72d125ef8b6f3..d62c2a1fe7b1a 100644 --- a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix +++ b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools for manipulating SAM/BAM/CRAM format"; license = licenses.mit; - homepage = http://samtools.sourceforge.net/; + homepage = "http://samtools.sourceforge.net/"; platforms = platforms.unix; maintainers = [ maintainers.unode ]; }; diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix index d700ee50a9c6b..c68fcfada3325 100644 --- a/pkgs/applications/science/biology/snpeff/default.nix +++ b/pkgs/applications/science/biology/snpeff/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Genetic variant annotation and effect prediction toolbox."; license = licenses.lgpl3; - homepage = http://snpeff.sourceforge.net/; + homepage = "http://snpeff.sourceforge.net/"; maintainers = with maintainers; [ jbedo ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/biology/somatic-sniper/default.nix b/pkgs/applications/science/biology/somatic-sniper/default.nix index 1961c71f43bb0..17d9c3dbb55cd 100644 --- a/pkgs/applications/science/biology/somatic-sniper/default.nix +++ b/pkgs/applications/science/biology/somatic-sniper/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Identify single nucleotide positions that are different between tumor and normal"; license = licenses.mit; - homepage = https://github.com/genome/somatic-sniper; + homepage = "https://github.com/genome/somatic-sniper"; maintainers = with maintainers; [ jbedo ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix index 4adce4461ede6..1f291d1a7008d 100644 --- a/pkgs/applications/science/biology/sortmerna/default.nix +++ b/pkgs/applications/science/biology/sortmerna/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "Tools for filtering, mapping, and OTU-picking from shotgun genomics data"; license = licenses.lgpl3; platforms = platforms.x86_64; - homepage = https://bioinfo.lifl.fr/RNA/sortmerna/; + homepage = "https://bioinfo.lifl.fr/RNA/sortmerna/"; maintainers = with maintainers; [ luispedro ]; }; } diff --git a/pkgs/applications/science/biology/spades/default.nix b/pkgs/applications/science/biology/spades/default.nix index 08a6a0d250957..d555f2873a67b 100644 --- a/pkgs/applications/science/biology/spades/default.nix +++ b/pkgs/applications/science/biology/spades/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "SPAdes"; - version = "3.14.0"; + version = "3.14.1"; src = fetchurl { url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz"; - sha256 = "1ffxswd2ngkpy1d6l3lb6a9cmyy1fglbdsws00b3m1k22zaqv60q"; + sha256 = "1ji3afn6yvx7ysg7p9j0d1g28zrnxg1b7x90mhs2bj3lgs7vfafn"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix index 93a02a46bd88d..12c865162425a 100644 --- a/pkgs/applications/science/biology/stacks/default.nix +++ b/pkgs/applications/science/biology/stacks/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "stacks"; - version = "2.52"; + version = "2.53"; src = fetchurl { url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz"; - sha256 = "0gq3kbj910jsq591wylzjmd23srjlsssmrckmf46m4ysjqdqd8vm"; + sha256 = "1zchds205nwdqch1246953dr8c0019yas178qbq3jypbxvmgq7pf"; }; buildInputs = [ zlib ]; diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix index 184dcb48a0de0..a32eddcb1cd93 100644 --- a/pkgs/applications/science/biology/strelka/default.nix +++ b/pkgs/applications/science/biology/strelka/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Germline and small variant caller"; license = licenses.gpl3; - homepage = https://github.com/Illumina/strelka; + homepage = "https://github.com/Illumina/strelka"; maintainers = with maintainers; [ jbedo ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/biology/sumatools/default.nix b/pkgs/applications/science/biology/sumatools/default.nix index 5230fcd2eb62f..1e3b479d54fc7 100644 --- a/pkgs/applications/science/biology/sumatools/default.nix +++ b/pkgs/applications/science/biology/sumatools/default.nix @@ -4,7 +4,7 @@ let stdenv = gccStdenv; meta = with stdenv.lib; { description = "Fast and exact comparison and clustering of sequences"; - homepage = https://metabarcoding.org/sumatra; + homepage = "https://metabarcoding.org/sumatra"; maintainers = [ maintainers.bzizou ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/biology/trimal/default.nix b/pkgs/applications/science/biology/trimal/default.nix index d4e8fee7bc364..8d7e62b614316 100755 --- a/pkgs/applications/science/biology/trimal/default.nix +++ b/pkgs/applications/science/biology/trimal/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "A tool for the automated removal of spurious sequences or poorly aligned regions from a multiple sequence alignment"; license = licenses.gpl3; platforms = platforms.linux; - homepage = http://trimal.cgenomics.org; + homepage = "http://trimal.cgenomics.org"; maintainers = [ maintainers.bzizou ]; }; } diff --git a/pkgs/applications/science/biology/varscan/default.nix b/pkgs/applications/science/biology/varscan/default.nix index 697a444193b11..e97c8f14451f7 100644 --- a/pkgs/applications/science/biology/varscan/default.nix +++ b/pkgs/applications/science/biology/varscan/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # through the Office of Technology Management at Washington # University School of Medicine. license = licenses.unfree; - homepage = https://github.com/dkoboldt/varscan; + homepage = "https://github.com/dkoboldt/varscan"; maintainers = with maintainers; [ jbedo ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix index f6c9ad029c135..52957b58bc929 100755 --- a/pkgs/applications/science/biology/vcftools/default.nix +++ b/pkgs/applications/science/biology/vcftools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A set of tools written in Perl and C++ for working with VCF files, such as those generated by the 1000 Genomes Project"; license = licenses.lgpl3; platforms = platforms.linux; - homepage = https://vcftools.github.io/index.html; + homepage = "https://vcftools.github.io/index.html"; maintainers = [ maintainers.rybern ]; }; } diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index 6aca678480dae..96dea10333b34 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { - url = https://data.gpo.zugaina.org/fusion809/sci-chemistry/avogadro/files/avogadro-1.1.0-xlibs.patch; + url = "https://data.gpo.zugaina.org/fusion809/sci-chemistry/avogadro/files/avogadro-1.1.0-xlibs.patch"; sha256 = "1p113v19z3zwr9gxj2k599f8p97a8rwm93pa4amqvd0snn31mw0k"; }) ]; diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index 644f609ed0acd..dec63910f7092 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { # it is disabled. patches = [ ./codegen.patch ]; meta = { - homepage = http://gwyddion.net/; + homepage = "http://gwyddion.net/"; description = "Scanning probe microscopy data visualization and analysis"; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 7259705bc8048..f52621dd71af8 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Java 3D viewer for chemical structures"; - homepage = https://sourceforge.net/projects/jmol; + homepage = "https://sourceforge.net/projects/jmol"; license = licenses.lgpl2; platforms = platforms.all; maintainers = with maintainers; [ timokau mounium ]; diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index c54fb3444bb08..9512a288d80cf 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "20.9.0"; + version = "20.10.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "1c6q1vb96jsb37g5qbhzcnasd5pdqjyc190yg3caw3gwrd97889q"; + sha256 = "042ndlns48pa6mn6wyrp4q9c1v0a2vzcnhw5l766zdnxdjyv0acx"; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 87dae3b14d9e2..5e5df85a52795 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Display and manipulate molecular structures"; - homepage = http://www.cmbi.ru.nl/molden/; + homepage = "http://www.cmbi.ru.nl/molden/"; license = { fullName = "Free for academic/non-profit use"; - url = http://www.cmbi.ru.nl/molden/CopyRight.html; + url = "http://www.cmbi.ru.nl/molden/CopyRight.html"; free = false; }; platforms = platforms.linux; diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index a5abbe2d1de6d..adb31d326509b 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchFromGitLab, symlinkJoin, gfortran, perl, procps -, libyaml, libxc, fftw, openblas, gsl, netcdf, arpack, autoreconfHook +, libyaml, libxc, fftw, blas, lapack, gsl, netcdf, arpack, autoreconfHook }: +assert (!blas.isILP64) && (!lapack.isILP64); + stdenv.mkDerivation rec { pname = "octopus"; version = "9.2"; @@ -14,12 +16,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ perl procps autoreconfHook ]; - buildInputs = [ libyaml gfortran libxc openblas gsl fftw netcdf arpack ]; + buildInputs = [ libyaml gfortran libxc blas lapack gsl fftw netcdf arpack ]; configureFlags = [ "--with-yaml-prefix=${libyaml}" - "--with-blas=-lopenblas" - "--with-lapack=-lopenblas" + "--with-blas=-lblas" + "--with-lapack=-llapack" "--with-fftw-prefix=${fftw.dev}" "--with-gsl-prefix=${gsl}" "--with-libxc-prefix=${libxc}" @@ -40,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Real-space time dependent density-functional theory code"; - homepage = https://octopus-code.org; + homepage = "https://octopus-code.org"; maintainers = with maintainers; [ markuskowa ]; license = licenses.gpl2; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index d73e86d2f577d..0d74e784d7727 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -1,9 +1,11 @@ { stdenv, fetchFromGitLab, cmake, gfortran, perl -, openblas, hdf5-cpp, python3, texlive +, openblas, blas, lapack, hdf5-cpp, python3, texlive , armadillo, openmpi, globalarrays, openssh , makeWrapper, fetchpatch } : +assert blas.implementation == "openblas" && lapack.implementation == "openblas"; + let version = "19.11"; gitLabRev = "v${version}"; @@ -74,7 +76,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Advanced quantum chemistry software package"; - homepage = https://gitlab.com/Molcas/OpenMolcas; + homepage = "https://gitlab.com/Molcas/OpenMolcas"; maintainers = [ maintainers.markuskowa ]; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index e8b3b23ddd9df..474986901225a 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = description; - homepage = https://www.pymol.org/; + homepage = "https://www.pymol.org/"; license = licenses.mit; maintainers = with maintainers; [ samlich ]; }; diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index bd420519ce01b..2443e6b23aba7 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, gfortran, fftw, openblas +, gfortran, fftw, blas, lapack , mpi ? null }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patchShebangs configure ''; - buildInputs = [ fftw openblas gfortran ] + buildInputs = [ fftw blas lapack gfortran ] ++ (stdenv.lib.optionals (mpi != null) [ mpi ]); configureFlags = if (mpi != null) then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran}/bin/gfortran" ]; diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix index 9d7880f57df5a..c053c0a09cdf7 100644 --- a/pkgs/applications/science/chemistry/siesta/default.nix +++ b/pkgs/applications/science/chemistry/siesta/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, gfortran, openblas +, gfortran, blas, lapack , mpi ? null, scalapack }: @@ -16,7 +16,7 @@ stdenv.mkDerivation { inherit mpi; }; - buildInputs = [ openblas gfortran ] + buildInputs = [ blas lapack gfortran ] ++ (stdenv.lib.optionals (mpi != null) [ mpi scalapack ]); enableParallelBuilding = true; @@ -33,11 +33,11 @@ stdenv.mkDerivation { makeFlagsArray=( CC="mpicc" FC="mpifort" FPPFLAGS="-DMPI" MPI_INTERFACE="libmpi_f90.a" MPI_INCLUDE="." - COMP_LIBS="" LIBS="-lopenblas -lscalapack" + COMP_LIBS="" LIBS="-lblas -llapack -lscalapack" ); '' else '' makeFlagsArray=( - COMP_LIBS="" LIBS="-lopenblas" + COMP_LIBS="" LIBS="-lblas -llapack" ); ''; @@ -61,7 +61,7 @@ stdenv.mkDerivation { matching the quality of other approaches, such as plane-wave and all-electron methods. ''; - homepage = https://www.quantum-espresso.org/; + homepage = "https://www.quantum-espresso.org/"; license = licenses.gpl2; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/applications/science/electronics/adms/default.nix index 8b95e73b8913b..f55dd2f0528e7 100644 --- a/pkgs/applications/science/electronics/adms/default.nix +++ b/pkgs/applications/science/electronics/adms/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "automatic device model synthesizer"; - homepage = https://github.com/Qucs/adms; + homepage = "https://github.com/Qucs/adms"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [disassembler]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix index c863fe6aea856..861f6cea0b4b3 100644 --- a/pkgs/applications/science/electronics/alliance/default.nix +++ b/pkgs/applications/science/electronics/alliance/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Complete set of free CAD tools and portable libraries for VLSI design"; - homepage = http://www-asim.lip6.fr/recherche/alliance/; + homepage = "http://www-asim.lip6.fr/recherche/alliance/"; license = with licenses; gpl2Plus; maintainers = with maintainers; [ ]; platforms = with platforms; linux; diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix index 016760bde0204..1377231c152b6 100644 --- a/pkgs/applications/science/electronics/archimedes/default.nix +++ b/pkgs/applications/science/electronics/archimedes/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU package for semiconductor device simulations"; - homepage = https://www.gnu.org/software/archimedes; + homepage = "https://www.gnu.org/software/archimedes"; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index 9101f1fdbe5e1..acbdeb8cfaa2f 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -23,7 +23,7 @@ let name = "${toolName}-${version}"; meta = with stdenv.lib; { - homepage = http://bitscope.com/software/; + homepage = "http://bitscope.com/software/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index ff41a498ae71e..c90ceac6788f5 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: +{ mkDerivation, stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "caneda"; version = "0.3.1"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source EDA software focused on easy of use and portability"; - homepage = http://caneda.org; + homepage = "http://caneda.org"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index 1e125964d506e..4d3acb331d5da 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc"; - homepage = https://www.dreamsourcelab.com/; + homepage = "https://www.dreamsourcelab.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.bachp ]; diff --git a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix index f5f3ce7435a4a..7915cb0ba4ae7 100644 --- a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix +++ b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A fork of the sigrok library for usage with DSView"; - homepage = https://www.dreamsourcelab.com/; + homepage = "https://www.dreamsourcelab.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.bachp ]; diff --git a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix index b7fe5140864c9..72b2fa1b6854f 100644 --- a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix +++ b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A fork of the sigrokdecode library for usage with DSView"; - homepage = https://www.dreamsourcelab.com/; + homepage = "https://www.dreamsourcelab.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.bachp ]; diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 7c5942d825a9b..58bdd5c722da5 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -13,11 +13,11 @@ let in mkDerivation rec { pname = "eagle"; - version = "9.6.0"; + version = "9.6.1"; src = fetchurl { url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz"; - sha256 = "1crkyc7ws2zz5dfs00h6rj4z2hyqb97kp6r4hxhmcgg5647ij4z8"; + sha256 = "1iq4aahrh4g3549vbr7gka5y2h7f17n3yafzl21njc2mkqb12jdw"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix index a9528b05a3119..af0fb675880ed 100644 --- a/pkgs/applications/science/electronics/eagle/eagle7.nix +++ b/pkgs/applications/science/electronics/eagle/eagle7.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Schematic editor and PCB layout tool from CadSoft"; - homepage = http://www.cadsoftusa.com/; + homepage = "http://www.cadsoftusa.com/"; license = licenses.unfree; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix index f93fddba8cb5d..9ef47ae263463 100644 --- a/pkgs/applications/science/electronics/fped/default.nix +++ b/pkgs/applications/science/electronics/fped/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { description = "An editor that allows the interactive creation of footprints electronic components"; - homepage = http://projects.qi-hardware.com/index.php/p/fped/; + homepage = "http://projects.qi-hardware.com/index.php/p/fped/"; license = licenses.gpl2; maintainers = with maintainers; [ expipiplus1 ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 127e9c05624d9..a0442db7fed28 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "An open source prototyping tool for Arduino-based projects"; - homepage = http://fritzing.org/; + homepage = "http://fritzing.org/"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.robberer ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index 1aaa5496ff37c..54ab7ec57e277 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Full GPL'd suite of Electronic Design Automation tools"; - homepage = http://www.geda-project.org/; + homepage = "http://www.geda-project.org/"; maintainers = with maintainers; [ pjones ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix index fa5bdbbebdb6e..b0317551df8dd 100644 --- a/pkgs/applications/science/electronics/gerbv/default.nix +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "2015-10-08"; src = fetchgit { - url = git://git.geda-project.org/gerbv.git; + url = "git://git.geda-project.org/gerbv.git"; rev = "76b8b67bfa10823ce98f1c4c3b49a2afcadf7659"; sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A Gerber (RS-274X) viewer"; - homepage = http://gerbv.geda-project.org/; + homepage = "http://gerbv.geda-project.org/"; maintainers = with maintainers; [ mog ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 694adc4d63497..3d75780936e15 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "VCD/Waveform viewer for Unix and Win32"; - homepage = http://gtkwave.sourceforge.net; + homepage = "http://gtkwave.sourceforge.net"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 6bc6659622975..b7ab5fa70d997 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -2,14 +2,13 @@ , libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig , doxygen, pcre, libpthreadstubs, libXdmcp, fetchpatch, lndir, callPackages -, pname ? "kicad" , stable ? true , baseName ? "kicad" , versions ? { } , oceSupport ? false, opencascade , withOCCT ? true, opencascade-occt , ngspiceSupport ? true, libngspice -, scriptingSupport ? true, swig, python, pythonPackages, wxPython +, scriptingSupport ? true, swig, python, wxPython , debug ? false, valgrind , withI18n ? true }: @@ -20,26 +19,26 @@ with lib; let versionConfig = versions.${baseName}; - baseVersion = "${versions.${baseName}.kicadVersion.version}"; # oce on aarch64 fails a test withOCE = oceSupport && !stdenv.isAarch64; withOCC = (withOCCT && !withOCE) || (oceSupport && stdenv.isAarch64); - kicad-libraries = callPackages ./libraries.nix versionConfig.libVersion; + libraries = callPackages ./libraries.nix versionConfig.libVersion; in stdenv.mkDerivation rec { - inherit pname; - version = "base-${baseVersion}"; + i18n = libraries.i18n; + + pname = "kicad-base"; + version = "${versions.${baseName}.kicadVersion.version}"; src = fetchFromGitLab ( { group = "kicad"; owner = "code"; repo = "kicad"; - rev = baseVersion; } // versionConfig.kicadVersion.src ); @@ -57,9 +56,11 @@ stdenv.mkDerivation rec { # tagged releases don't have "unknown" # kicad nightlies use git describe --dirty # nix removes .git, so its approximated here + # "-1" appended to indicate we're adding a patch postPatch = '' substituteInPlace CMakeModules/KiCadVersion.cmake \ - --replace "unknown" ${builtins.substring 0 10 src.rev} + --replace "unknown" "${builtins.substring 0 10 src.rev}-1" \ + --replace "${version}" "${version}-1" ''; makeFlags = optional (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; @@ -113,7 +114,7 @@ stdenv.mkDerivation rec { postInstall = optional (withI18n) '' mkdir -p $out/share - lndir ${kicad-libraries.i18n}/share $out/share + lndir ${i18n}/share $out/share ''; meta = { @@ -124,7 +125,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.kicad-pcb.org/"; license = licenses.agpl3; - maintainers = with maintainers; [ evils kiwi berce ]; - platforms = with platforms; linux; + platforms = platforms.all; }; } diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index f03a0a0cceff4..a99f1b2d8d7a3 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -4,10 +4,11 @@ , librsvg, cups , pname ? "kicad" +, stable ? true , oceSupport ? false, opencascade , withOCCT ? true, opencascade-occt , ngspiceSupport ? true, libngspice -, scriptingSupport ? true, swig, python3, python3Packages +, scriptingSupport ? true, swig, python3 , debug ? false, valgrind , with3d ? true , withI18n ? true @@ -18,7 +19,6 @@ assert ngspiceSupport -> libngspice != null; with lib; let - stable = pname != "kicad-unstable"; baseName = if (stable) then "kicad" else "kicad-unstable"; versions = import ./versions.nix; @@ -31,21 +31,20 @@ let # but brings high DPI support? else wxGTK31.override { withGtk2 = false; }; - pythonPackages = python3Packages; + pythonPackages = python.pkgs; python = python3; - wxPython = python3Packages.wxPython_4_0; + wxPython = pythonPackages.wxPython_4_0; - libraries = callPackages ./libraries.nix versionConfig.libVersion; +in +stdenv.mkDerivation rec { + + passthru.libraries = callPackages ./libraries.nix versionConfig.libVersion; base = callPackage ./base.nix { - pname = baseName; inherit versions stable baseName; inherit wxGTK python wxPython; inherit debug withI18n withOCCT oceSupport ngspiceSupport scriptingSupport; }; -in -stdenv.mkDerivation rec { - inherit pname; version = versions.${baseName}.kicadVersion.version; @@ -63,7 +62,7 @@ stdenv.mkDerivation rec { # wrapGAppsHook added the equivalent to ${base}/share # though i noticed no difference without it - makeWrapperArgs = [ + makeWrapperArgs = with passthru.libraries; [ "--prefix XDG_DATA_DIRS : ${base}/share" "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" "--prefix XDG_DATA_DIRS : ${gnome3.defaultIconTheme}/share" @@ -73,47 +72,40 @@ stdenv.mkDerivation rec { "--prefix XDG_DATA_DIRS : ${cups}/share" "--prefix GIO_EXTRA_MODULES : ${gnome3.dconf}/lib/gio/modules" - "--set KISYSMOD ${libraries.footprints}/share/kicad/modules" - "--set KICAD_SYMBOL_DIR ${libraries.symbols}/share/kicad/library" - "--set KICAD_TEMPLATE_DIR ${libraries.templates}/share/kicad/template" - "--prefix KICAD_TEMPLATE_DIR : ${libraries.symbols}/share/kicad/template" - "--prefix KICAD_TEMPLATE_DIR : ${libraries.footprints}/share/kicad/template" + "--set KISYSMOD ${footprints}/share/kicad/modules" + "--set KICAD_SYMBOL_DIR ${symbols}/share/kicad/library" + "--set KICAD_TEMPLATE_DIR ${templates}/share/kicad/template" + "--prefix KICAD_TEMPLATE_DIR : ${symbols}/share/kicad/template" + "--prefix KICAD_TEMPLATE_DIR : ${footprints}/share/kicad/template" ] - ++ optionals (with3d) [ "--set KISYS3DMOD ${libraries.packages3d}/share/kicad/modules/packages3d" ] + ++ optionals (with3d) [ "--set KISYS3DMOD ${packages3d}/share/kicad/modules/packages3d" ] ++ optionals (ngspiceSupport) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ] # infinisil's workaround for #39493 ++ [ "--set GDK_PIXBUF_MODULE_FILE ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" ] ; - # dunno why i have to add $makeWrapperArgs manually... + # why does $makeWrapperArgs have to be added explicitly? # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set? - # not sure if anything has to be done with the other stuff in base/bin - # dxf2idf, idf2vrml, idfcyl, idfrect, kicad2step, kicad-ogltest - installPhase = - optionalString (scriptingSupport) '' buildPythonPath "${base} $pythonPath" - '' + - '' makeWrapper ${base}/bin/kicad $out/bin/kicad $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/pcbnew $out/bin/pcbnew $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/eeschema $out/bin/eeschema $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/gerbview $out/bin/gerbview $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/pcb_calculator $out/bin/pcb_calculator $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/pl_editor $out/bin/pl_editor $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/bitmap2component $out/bin/bitmap2component $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + # kicad-ogltest's source seems to indicate that crashing is expected behaviour... + installPhase = with lib; + let + tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ]; + utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" "kicad-ogltest" ]; + in + ( concatStringsSep "\n" + ( flatten [ + ( optionalString (scriptingSupport) "buildPythonPath \"${base} $pythonPath\" \n" ) + + # wrap each of the directly usable tools + ( map ( tool: "makeWrapper ${base}/bin/${tool} $out/bin/${tool} $makeWrapperArgs" + + optionalString (scriptingSupport) " --set PYTHONPATH \"$program_PYTHONPATH\"" + ) tools ) + + # link in the CLI utils + ( map ( util: "ln -s ${base}/bin/${util} $out/bin/${util}" ) utils ) + ]) + ) ; # can't run this for each pname @@ -123,10 +115,11 @@ stdenv.mkDerivation rec { # and can't git commit if this could be running in parallel with other scripts passthru.updateScript = [ ./update.sh "all" ]; - meta = { - description = if (stable) - then "Open Source Electronics Design Automation Suite" - else "Open Source EDA Suite, Development Build"; + meta = rec { + description = (if (stable) + then "Open Source Electronics Design Automation suite" + else "Open Source EDA suite, development build") + + (if (!with3d) then ", without 3D models" else ""); homepage = "https://www.kicad-pcb.org/"; longDescription = '' KiCad is an open source software suite for Electronic Design Automation. @@ -134,12 +127,20 @@ stdenv.mkDerivation rec { ''; license = licenses.agpl3; # berce seems inactive... - maintainers = with maintainers; [ evils kiwi berce ]; - # kicad's cross-platform, not sure what to fill in here - platforms = with platforms; linux; - } // optionalAttrs with3d { - # We can't download the 3d models on Hydra - they are a ~1 GiB download and - # they occupy ~5 GiB in store. - hydraPlatforms = []; + maintainers = with stdenv.lib.maintainers; [ evils kiwi berce ]; + # kicad is cross platform + platforms = stdenv.lib.platforms.all; + # despite that, nipkgs' wxGTK for darwin is "wxmac" + # and wxPython_4_0 does not account for this + # adjusting this package to downgrade to python2Packages.wxPython (wxPython 3), + # seems like more trouble than fixing wxPython_4_0 would be + # additionally, libngspice is marked as linux only, though it should support darwin + + hydraPlatforms = if (with3d) then [ ] else platforms; + # We can't download the 3d models on Hydra, + # they are a ~1 GiB download and they occupy ~5 GiB in store. + # as long as the base and libraries (minus 3d) are build, + # this wrapper does not need to get built + # the kicad-*small "packages" cause this to happen }; } diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/pkgs/applications/science/electronics/kicad/libraries.nix index 7cdf9373e0872..4dde2a0a1226b 100644 --- a/pkgs/applications/science/electronics/kicad/libraries.nix +++ b/pkgs/applications/science/electronics/kicad/libraries.nix @@ -13,21 +13,27 @@ with lib; let mkLib = name: - stdenv.mkDerivation - { - pname = "kicad-${name}"; - version = "${version}"; - src = fetchFromGitHub ( - { - owner = "KiCad"; - repo = "kicad-${name}"; - rev = version; - inherit name; - } // (libSources.${name} or { }) - ); - nativeBuildInputs = [ cmake ]; - meta.license = licenses.cc-by-sa-40; + stdenv.mkDerivation { + pname = "kicad-${name}"; + version = "${version}"; + src = fetchFromGitHub ( + { + owner = "KiCad"; + repo = "kicad-${name}"; + rev = version; + inherit name; + } // (libSources.${name} or { }) + ); + nativeBuildInputs = [ cmake ]; + + meta = rec { + license = licenses.cc-by-sa-40; + platforms = stdenv.lib.platforms.all; + # the 3d models are a ~1 GiB download and occupy ~5 GiB in store. + # this would exceed the hydra output limit + hydraPlatforms = if (name == "packages3d" ) then [ ] else platforms; }; + }; in { symbols = mkLib "symbols"; @@ -56,6 +62,9 @@ in ); buildInputs = [ gettext ]; nativeBuildInputs = [ cmake ]; - meta.license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3 + meta = { + license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3 + platforms = stdenv.lib.platforms.all; + }; }; } diff --git a/pkgs/applications/science/electronics/kicad/update.sh b/pkgs/applications/science/electronics/kicad/update.sh index 7dc0b008b6c25..f048ccde4ec85 100755 --- a/pkgs/applications/science/electronics/kicad/update.sh +++ b/pkgs/applications/science/electronics/kicad/update.sh @@ -1,6 +1,8 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p coreutils git nix curl +set -e + # this script will generate versions.nix in the right location # this should contain the versions' revs and hashes # the stable revs are stored only for ease of skipping @@ -50,12 +52,11 @@ for arg in "$@"; do done here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -now=$(date --iso-8601) +now=$(date --iso-8601 --utc) file="${here}/versions.nix" # just in case this runs in parallel -rand="$(head -c 3 /dev/urandom | base64)" -tmp="${here}/,versions.nix.${rand}" +tmp="${here}/,versions.nix.${RANDOM}" # libraries currently on github, move to $gitlab/libraries planned libs=( symbols templates footprints packages3d ) @@ -112,16 +113,16 @@ for version in "${all_versions[@]}"; do echo "Checking src" >&2 src_rev="$(${get_rev} "${gitlab}"/code/kicad.git "${version}" | cut -f1)" - ret="$(grep -sm 1 "\"${pname}\"" -A 4 "${file}" | grep -sm 1 "${src_rev}")" + has_rev="$(grep -sm 1 "\"${pname}\"" -A 4 "${file}" | grep -sm 1 "${src_rev}" || true)" has_hash="$(grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "sha256")" - if [[ -n ${ret} && -n ${has_hash} && -z ${clean} ]]; then + if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old ${pname}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "rev" -A 1 else printf "%8srev =\t\t\t\"%s\";\n" "" "${src_rev}" printf "%8ssha256 =\t\t\"%s\";\n" \ "" "$(${prefetch} "${gitlab_pre}${src_rev}")" - (( count++ )) + count=$((count+1)) fi printf "%6s};\n" "" printf "%4s};\n" "" @@ -132,25 +133,25 @@ for version in "${all_versions[@]}"; do echo "Checking i18n" >&2 i18n_rev="$(${get_rev} "${i18n}" "${version}" | cut -f1)" - ret="$(grep -sm 1 "\"${pname}\"" -A 11 "${file}" | grep -sm 1 "${i18n_rev}")" + has_rev="$(grep -sm 1 "\"${pname}\"" -A 11 "${file}" | grep -sm 1 "${i18n_rev}" || true)" has_hash="$(grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n.sha256")" - if [[ -n ${ret} && -n ${has_hash} && -z ${clean} ]]; then + if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old kicad-i18n-${today}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n" -A 1 else printf "%8si18n.rev =\t\t\"%s\";\n" "" "${i18n_rev}" printf "%8si18n.sha256 =\t\t\"%s\";\n" "" \ "$(${prefetch} "${i18n_pre}${i18n_rev}")" - (( count++ )) + count=$((count+1)) fi for lib in "${libs[@]}"; do echo "Checking ${lib}" >&2 url="${github}-${lib}.git" lib_rev="$(${get_rev} "${url}" "${version}" | cut -f1)" - ret="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" -A 1)" + has_rev="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" || true)" has_hash="$(grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}.sha256")" - if [[ -n ${ret} && -n ${has_hash} && -z ${clean} ]]; then + if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old kicad-${lib}-${today}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}" -A 1 else @@ -161,7 +162,7 @@ for version in "${all_versions[@]}"; do printf "\"%s\";\n" "${lib_rev}" printf "%8s%s.sha256 =\t\"%s\";\n" "" \ "${lib}" "$(${prefetch} "${github}-${lib}/archive/${lib_rev}.tar.gz")" - (( count++ )) + count=$((count+1)) fi done printf "%6s};\n" "" @@ -175,6 +176,11 @@ done printf "}\n" } > "${tmp}" +if grep '""' "${tmp}"; then + echo "empty value detected, out of space?" >&2 + exit "1" +fi + mv "${tmp}" "${file}" printf "\nFinished\nMoved output to %s\n\n" "${file}" >&2 diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 6b9a981a87c44..4a9ed0cb86dcf 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,49 +3,49 @@ { "kicad" = { kicadVersion = { - version = "5.1.5"; + version = "5.1.6"; src = { - rev = "52549c5d09cbfb0e807fcbcb07819bc9f7861544"; - sha256 = "15h3rwisjss3fdc9bam9n2wq94slhacc3fbg14bnzf4n5agsnv5b"; + rev = "c6e7f7de7df655fd59b57823499efc443009de6b"; + sha256 = "1pa3z0h0679jmgxlzc833h6q85b5paxdp69kf2h93vkaryj58622"; }; }; libVersion = { - version = "5.1.5"; + version = "5.1.6"; libSources = { - i18n.rev = "5122cbec6563fb7c8d6f960a639ac470353af91b"; - i18n.sha256 = "1rfpifl8vky1gba2angizlb2n7mwmsiai3r6ip6qma60wdj8sbd3"; - symbols.rev = "dd122ec170b49e032179511c9d263126f52f4020"; - symbols.sha256 = "048b07ffsaav1ssrchw2p870lvb4rsyb5vnniy670k7q9p16qq6h"; - templates.rev = "94761f10d06582b33cd55ea2149d72f269f65580"; - templates.sha256 = "0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g"; - footprints.rev = "e076f8f271f8db96d5fec45616b7554caebb7ef7"; - footprints.sha256 = "1c4whgn14qhz4yqkl46w13p6rpv1k0hsc9s9h9368fxfcz9knb2j"; - packages3d.rev = "8d233cdcb109aa1c3b8ba4c934ee31f6a3b6e1f4"; - packages3d.sha256 = "0cff2ms1bsw530kqb1fr1m2pjixyxzwa81mxgac3qpbcf8fnpvaz"; + i18n.rev = "5ad171ce5c8d90f4740517c2adecb310d8be51bd"; + i18n.sha256 = "0qryi8xjm23ka363zfl7bbga0v5c31fr3d4nyxp3m168vkv9zhha"; + symbols.rev = "5150eaa2a7d15cfc6bb1459c527c4ebaa66d7708"; + symbols.sha256 = "12w3rdy085drlikkpb27n9ni7cyg9l0pqy7hnr86cxjcw3l5wcx6"; + templates.rev = "9213d439f757e6049b7e54f3ea08272a0d0f44a9"; + templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg"; + footprints.rev = "a61b4e49762fb355f654e65a1c7db1aaf7bb2332"; + footprints.sha256 = "1kmf91a5mmvj9izrv40mkaw1w36yjgn8daczd9rq2wlmd0rdp1zx"; + packages3d.rev = "150ff1caf0b01dc04c84f4f966f4f88fedfa8f8c"; + packages3d.sha256 = "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2020-02-10"; + version = "2020-05-14"; src = { - rev = "1190e60dd426d246661e478db3287f266ec6cda2"; - sha256 = "0cgfad07j69cks97llj4hf3kga0d5qf728s89xwxrzcwm06k62bi"; + rev = "3b8465359135e9f6dea4b0a5fcb62377753fe890"; + sha256 = "18xsg2s0pxx176rnblygq1f8xpmryw59lcjzm897gifz0sj0nhvx"; }; }; libVersion = { - version = "2020-02-10"; + version = "2020-05-14"; libSources = { - i18n.rev = "26786c4ca804bad7eb072f1ef381f00b5a2ff3ee"; - i18n.sha256 = "0iqr1xfw4s677afjy9bn5y41z4isp327f9y90wypkxiwwq3dfkfl"; - symbols.rev = "35b7da2d211d7cc036b37ad7f5e40ef03faa1bc7"; - symbols.sha256 = "0wbfw1swbfvfp47cn48pxpqlygjs3xh568ydrrs51v3w102x8y64"; - templates.rev = "0c0490897f803ab8b7c3dad438b7eb1f80e0417c"; - templates.sha256 = "0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g"; - footprints.rev = "9357b6f09312966c57fec9f66a516941d79c3038"; - footprints.sha256 = "0cgah1q0h012ffwfl220k7qb6hgbs0i91spq2j4v3lgpfr4g638d"; - packages3d.rev = "de368eb739abe41dfc3163e0e370477e857f9cc1"; - packages3d.sha256 = "0b3p5v8g24h6l7q3sbqz7ns0gnrf9l89glj86m5ybhizvls9vrrs"; + i18n.rev = "c4460d0d8e1075691d43dc928ffc332fa1282592"; + i18n.sha256 = "1gkrbfyfzsr5q7sahhlyhgfpfwm6b83lzf0q1v854gwxdfabvi0y"; + symbols.rev = "614b5f6256fbae82c2bba399086506bbe435bd94"; + symbols.sha256 = "10ix3wdcl832r4ha5q8phpx8j97gzngb41nczdli1qkhjmiw9y8r"; + templates.rev = "7db8d4d0ea0711f1961d117853547fb3edbc3857"; + templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg"; + footprints.rev = "240804c6c89b66af808379e1fc94ea6011433cbe"; + footprints.sha256 = "1jh71004lrn7bl384zfmbqqdbs28gjb6diwn6hyb587jpivdnl3g"; + packages3d.rev = "9b560cf94a35b692ca516d37bdaf392ce10e549d"; + packages3d.sha256 = "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1"; }; }; }; diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index dacbd948241a6..de01b095e3816 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -2,14 +2,14 @@ mkDerivation { pname = "librepcb"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "LibrePCB"; repo = "LibrePCB"; fetchSubmodules = true; - rev = "56bc60d347ff67df0fe1d57807d03f0606de557f"; - sha256 = "0z6jn5zawp0x5i9zda7l787jnsv3yl8aqwnpii3g4hsnf2q3hhrh"; + rev = "ae04eef5a71b5ba66ae2cee6b631c1c933ace535"; + sha256 = "0wk5qny1jb6n4mwyyrs7syir3hmwxlwazcd80bpxharmsj7p0rzc"; }; enableParallelBuilding = true; @@ -31,7 +31,7 @@ mkDerivation { meta = with lib; { description = "A free EDA software to develop printed circuit boards"; - homepage = https://librepcb.org/; + homepage = "https://librepcb.org/"; maintainers = with maintainers; [ luz ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch b/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch new file mode 100644 index 0000000000000..1cef96ea14081 --- /dev/null +++ b/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch @@ -0,0 +1,10 @@ +diff --git a/scripts/makedbh b/scripts/makedbh +index 01e4fa5..d6299c6 100755 +--- a/scripts/makedbh ++++ b/scripts/makedbh +@@ -1,4 +1,4 @@ +-#!/bin/csh -f ++#!/usr/bin/env tcsh + # + # makes the "database.h" (1st argument, $1) file from "database.h.in" + # (2nd argument, $2), setting various mask operation definitions diff --git a/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch b/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch new file mode 100644 index 0000000000000..37ae35195503a --- /dev/null +++ b/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch @@ -0,0 +1,19 @@ +diff --git a/database/DBio.c b/database/DBio.c +index 93c4b0b..292ea5f 100644 +--- a/database/DBio.c ++++ b/database/DBio.c +@@ -2378,12 +2378,12 @@ DBCellWriteFile(cellDef, f) + + #define FPRINTF(f,s)\ + {\ +- if (fprintf(f,s) == EOF) goto ioerror;\ ++ if (fprintf(f,"%s",s) == EOF) goto ioerror;\ + DBFileOffset += strlen(s);\ + } + #define FPRINTR(f,s)\ + {\ +- if (fprintf(f,s) == EOF) return 1;\ ++ if (fprintf(f,"%s",s) == EOF) return 1;\ + DBFileOffset += strlen(s);\ + } + diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix new file mode 100644 index 0000000000000..62b830547e534 --- /dev/null +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, m4, tcsh, libX11, tcl, tk, cairo, ncurses, mesa_glu, python3 }: + +stdenv.mkDerivation { + pname = "magic-vlsi"; + version = "8.3.5"; + + src = fetchurl { + url = "http://opencircuitdesign.com/magic/archive/magic-8.3.5.tgz"; + sha256 = "0wv4zmxlqjfaakgp802icn0cd9f8ylkz2sppix83axq8p5cg90yq"; + }; + + buildInputs = [ m4 tcsh libX11 tcl tk cairo ncurses mesa_glu ]; + nativeBuildInputs = [ python3 ]; + + configureFlags = [ + "--with-tcl=${tcl}" + "--with-tk=${tk}" + "--disable-werror" + ]; + + postPatch = '' + patchShebangs scripts/* + ''; + + patches = [ + ./0001-strip-bin-prefix.patch + ./0002-fix-format-security.patch + ]; + + meta = with stdenv.lib; { + description = "VLSI layout tool written in Tcl"; + homepage = "http://opencircuitdesign.com/magic/"; + license = licenses.mit; + maintainers = [ maintainers.dkudriavtsev ]; + }; +} diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index f044f1d88e7be..951e5f66f6eed 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The Next Generation Spice (Electronic Circuit Simulator)"; - homepage = http://ngspice.sourceforge.net; + homepage = "http://ngspice.sourceforge.net"; license = with licenses; [ "BSD" gpl2 ]; maintainers = with maintainers; [ bgamari rongcuid ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index 636c494c3409c..4309f52e8b150 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Printed Circuit Board editor"; - homepage = http://pcb.geda-project.org/; + homepage = "http://pcb.geda-project.org/"; maintainers = with maintainers; [ mog ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index ae9afd95518bf..f43717389b535 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { meta = with lib; { description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)"; - homepage = https://sigrok.org/; + homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index 6ca3f80cefd37..9b6e75c77ba85 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Graphical editor for finite state machines"; - homepage = http://qfsm.sourceforge.net/; + homepage = "http://qfsm.sourceforge.net/"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix index 1bfe6df5ff534..62a9ae8b73bee 100644 --- a/pkgs/applications/science/electronics/qucs/default.nix +++ b/pkgs/applications/science/electronics/qucs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Integrated circuit simulator"; - homepage = http://qucs.sourceforge.net; + homepage = "http://qucs.sourceforge.net"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index 2c346b0e74a07..e6f912616034a 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor"; - homepage = http://www.tkgate.org/; + homepage = "http://www.tkgate.org/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.peti ]; hydraPlatforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 85f6ac42126db..189e09f8241b6 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.030"; + version = "4.034"; src = fetchurl { url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "07ldkf7xkr31n1dmx82bmzam8bvc1vsp32k76vd7yzn7r853qyky"; + sha256 = "02xqvl9ic21jpda0xldh4ihqwl4ss8389s8fklgx5d98xq37pval"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index b707db1416023..fa1efe299829e 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Icarus Verilog compiler"; - repositories.git = https://github.com/steveicarus/iverilog.git; + repositories.git = "https://github.com/steveicarus/iverilog.git"; homepage = "http://iverilog.icarus.com/"; license = licenses.lgpl21; maintainers = with maintainers; [ winden ]; diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/pkgs/applications/science/electronics/xcircuit/default.nix index d10b486492e0b..52fe9b0374143 100644 --- a/pkgs/applications/science/electronics/xcircuit/default.nix +++ b/pkgs/applications/science/electronics/xcircuit/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Generic drawing program tailored to circuit diagrams"; - homepage = http://opencircuitdesign.com/xcircuit; + homepage = "http://opencircuitdesign.com/xcircuit"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ spacefrogg thoughtpolice ]; diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index 829caacb55cb3..f8a68f31f4641 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Oscilloscope through the sound card"; - homepage = http://xoscope.sourceforge.net; + homepage = "http://xoscope.sourceforge.net"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index e8ae4d01a6d6a..7bae3d414cbf9 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Interactive geometry program"; - homepage = https://sourceforge.net/projects/ofset; + homepage = "https://sourceforge.net/projects/ofset"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/science/geometry/tetgen/1.4.nix b/pkgs/applications/science/geometry/tetgen/1.4.nix index 3a2dbf180ee31..9dd2547368345 100644 --- a/pkgs/applications/science/geometry/tetgen/1.4.nix +++ b/pkgs/applications/science/geometry/tetgen/1.4.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; - homepage = http://tetgen.org/; + homepage = "http://tetgen.org/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index 0d3a7cc2bc23a..d12e8e35844fe 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { inherit version; description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; - homepage = http://tetgen.org/; + homepage = "http://tetgen.org/"; license = stdenv.lib.licenses.agpl3Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix index 7078fd454a0af..3d9a2e9bd67b0 100644 --- a/pkgs/applications/science/logic/abella/default.nix +++ b/pkgs/applications/science/logic/abella/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { of programming languages and other logical systems which manipulate objects with binding. ''; - homepage = http://abella-prover.org/; + homepage = "http://abella-prover.org/"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ bcdarwin ciil ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index b7dc957124761..ccd0800050761 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { version = "1.5.1"; src = fetchurl { - url = https://acg.loria.fr/software/acg-1.5.1-20191113.tar.gz; + url = "https://acg.loria.fr/software/acg-1.5.1-20191113.tar.gz"; sha256 = "17595qfwhzz5q091ak6i6bg5wlppbn8zfn58x3hmmmjvx2yfajn1"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit (dune) installPhase; meta = with stdenv.lib; { - homepage = https://acg.loria.fr/; + homepage = "https://acg.loria.fr/"; description = "A toolkit for developing ACG signatures and lexicon"; license = licenses.cecill20; inherit (ocamlPackages.ocaml.meta) platforms; diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix index 0f65c9b7eaea4..aa5a59ed298a1 100644 --- a/pkgs/applications/science/logic/aiger/default.nix +++ b/pkgs/applications/science/logic/aiger/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { description = "And-Inverter Graph (AIG) utilities"; - homepage = http://fmv.jku.at/aiger/; + homepage = "http://fmv.jku.at/aiger/"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index 82458d7c5663c..c1cf9034c02a3 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ gebner ]; platforms = platforms.unix; license = licenses.asl20; - homepage = https://alviano.net/software/maxino/; + homepage = "https://alviano.net/software/maxino/"; # See pkgs/applications/science/logic/glucose/default.nix badPlatforms = [ "aarch64-linux" ]; }; diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index b43e0c6fbf1a6..78ed641a809a2 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { meta = { description = "AIGER model checking for Property Directed Reachability"; - homepage = https://arieg.bitbucket.io/avy/; + homepage = "https://arieg.bitbucket.io/avy/"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix index da0e9bf1c1dd4..44478a032b38a 100644 --- a/pkgs/applications/science/logic/beluga/default.nix +++ b/pkgs/applications/science/logic/beluga/default.nix @@ -1,34 +1,40 @@ -{ stdenv, fetchFromGitHub, ocamlPackages, omake }: +{ lib, fetchFromGitHub, ocamlPackages, rsync }: -stdenv.mkDerivation { - name = "beluga-20180403"; +ocamlPackages.buildDunePackage { + pname = "beluga"; + version = "unstable-2020-03-11"; src = fetchFromGitHub { owner = "Beluga-lang"; repo = "Beluga"; - rev = "046aa59f008be70a7c4700b723bed0214ea8b687"; - sha256 = "0m68y0r0wdw3mg2jks68bihaww7sg305zdfnic1rkndq2cxv0mld"; + rev = "6133b2f572219333f304bb4f77c177592324c55b"; + sha256 = "0sy6mi50z3mvs5z7dx38piydapk89all81rh038x3559b5fsk68q"; }; - nativeBuildInputs = with ocamlPackages; [ findlib ocamlbuild omake ]; - buildInputs = with ocamlPackages; [ ocaml ulex ocaml_extlib ]; + useDune2 = true; - installPhase = '' - mkdir -p $out - cp -r bin $out/ + buildInputs = with ocamlPackages; [ + gen sedlex_2 ocaml_extlib dune-build-info linenoise + ]; - mkdir -p $out/share/beluga - cp -r tools/ examples/ $out/share/beluga + postPatch = '' + patchShebangs ./TEST ./run_harpoon_test.sh + ''; + + checkPhase = "./TEST"; + checkInputs = [ rsync ]; + doCheck = true; + postInstall = '' mkdir -p $out/share/emacs/site-lisp/beluga/ cp -r tools/beluga-mode.el $out/share/emacs/site-lisp/beluga ''; - meta = { + meta = with lib; { description = "A functional language for reasoning about formal systems"; - homepage = http://complogic.cs.mcgill.ca/beluga/; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.bcdarwin ]; - platforms = stdenv.lib.platforms.unix; + homepage = "http://complogic.cs.mcgill.ca/beluga/"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.bcdarwin ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 4cf0b0f1ea1e2..105e911ed4fd1 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An extremely fast SMT solver for bit-vectors and arrays"; - homepage = https://boolector.github.io; + homepage = "https://boolector.github.io"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix index 4cef49788c044..2ac96df66a68d 100644 --- a/pkgs/applications/science/logic/cedille/default.nix +++ b/pkgs/applications/science/logic/cedille/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An interactive theorem-prover and dependently typed programming language, based on extrinsic (aka Curry-style) type theory"; - homepage = https://cedille.github.io/; + homepage = "https://cedille.github.io/"; license = licenses.mit; maintainers = with maintainers; [ marsam mpickering ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/celf/default.nix b/pkgs/applications/science/logic/celf/default.nix index 708270f772fd2..9dc20a61a4d2c 100644 --- a/pkgs/applications/science/logic/celf/default.nix +++ b/pkgs/applications/science/logic/celf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linear logic programming system"; - homepage = https://github.com/clf/celf; + homepage = "https://github.com/clf/celf"; license = licenses.gpl3; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/clprover/clprover.nix b/pkgs/applications/science/logic/clprover/clprover.nix index 0319069660edd..e53bbe6883718 100644 --- a/pkgs/applications/science/logic/clprover/clprover.nix +++ b/pkgs/applications/science/logic/clprover/clprover.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Resolution-based theorem prover for Coalition Logic implemented in C++"; - homepage = http://cgi.csc.liv.ac.uk/~ullrich/CLProver++/; + homepage = "http://cgi.csc.liv.ac.uk/~ullrich/CLProver++/"; license = licenses.gpl3; # Note that while the website states that it is GPLv2 but the file in the zip as well as the comments in the source state it is GPLv3 maintainers = with maintainers; [ mgttlinger ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 52a587ccb48bb..39e7cbe7f3cc8 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -34,6 +34,7 @@ let "8.10.2" = "0znxmpy71bfw0p6x47i82jf5k7v41zbz9bdpn901ysn3ir8l3wrz"; "8.11.0" = "1rfdic6mp7acx2zfwz7ziqk12g95bl9nyj68z4n20a5bcjv2pxpn"; "8.11.1" = "0qriy9dy36dajsv5qmli8gd6v55mah02ya334nw49ky19v7518m0"; + "8.11.2" = "0f77ccyxdgbf1nrj5fa8qvrk1cyfy06fv8gj9kzfvlcgn0cf48sa"; }.${version}; coq-version = stdenv.lib.versions.majorMinor version; versionAtLeast = stdenv.lib.versionAtLeast coq-version; @@ -161,7 +162,7 @@ self = stdenv.mkDerivation { together with an environment for semi-interactive development of machine-checked proofs. ''; - homepage = http://coq.inria.fr; + homepage = "http://coq.inria.fr"; license = licenses.lgpl21; branch = coq-version; maintainers = with maintainers; [ roconnor thoughtpolice vbgl Zimmi48 ]; diff --git a/pkgs/applications/science/logic/coq2html/default.nix b/pkgs/applications/science/logic/coq2html/default.nix index bebf81b030d64..2e56eda893e92 100644 --- a/pkgs/applications/science/logic/coq2html/default.nix +++ b/pkgs/applications/science/logic/coq2html/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { initially hidden, but can be revealed one by one by clicking on the "Proof" keyword. ''; - homepage = https://github.com/xavierleroy/coq2html; + homepage = "https://github.com/xavierleroy/coq2html"; license = licenses.gpl2; maintainers = with maintainers; [ jwiegley ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index b4c4cb7c047d4..8c1b3bd036946 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cryptominisat"; - version = "5.6.8"; + version = "5.7.0"; src = fetchFromGitHub { owner = "msoos"; repo = "cryptominisat"; rev = version; - sha256 = "0csimmy1nvkfcsxjra9bm4mlcyxa3ac8zarm88zfb7640ca0d0wv"; + sha256 = "0ny5ln8fc0irprs04qw01c9mppps8q27lkx01a549zazwhj4b5rm"; }; buildInputs = [ python3 boost ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An advanced SAT Solver"; - homepage = https://github.com/msoos/cryptominisat; + homepage = "https://github.com/msoos/cryptominisat"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix index d198de41f9b79..bfb6a57fb33a6 100644 --- a/pkgs/applications/science/logic/cubicle/default.nix +++ b/pkgs/applications/science/logic/cubicle/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source model checker for verifying safety properties of array-based systems"; - homepage = http://cubicle.lri.fr/; + homepage = "http://cubicle.lri.fr/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dwarfmaster ]; diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix index dfb04ad90e929..ff481fd7ab467 100644 --- a/pkgs/applications/science/logic/cvc3/default.nix +++ b/pkgs/applications/science/logic/cvc3/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { [ raskin ]; platforms = platforms.linux; license = licenses.free; - homepage = http://www.cs.nyu.edu/acsys/cvc3/index.html; + homepage = "http://www.cs.nyu.edu/acsys/cvc3/index.html"; }; passthru = { updateInfo = { diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index c0c7a53ebd441..a6e9bc69a12c0 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high-performance theorem prover and SMT solver"; - homepage = http://cvc4.cs.stanford.edu/web/; + homepage = "http://cvc4.cs.stanford.edu/web/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ vbgl thoughtpolice gebner ]; diff --git a/pkgs/applications/science/logic/drat-trim/default.nix b/pkgs/applications/science/logic/drat-trim/default.nix index 4c4ea0f14ce1b..4099236e62800 100644 --- a/pkgs/applications/science/logic/drat-trim/default.nix +++ b/pkgs/applications/science/logic/drat-trim/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { competing SAT solvers' work when they claim that a SAT instance is unsatisfiable. ''; - homepage = https://www.cs.utexas.edu/~marijn/drat-trim/; + homepage = "https://www.cs.utexas.edu/~marijn/drat-trim/"; license = licenses.mit; maintainers = with maintainers; [ kini ]; platforms = platforms.all; diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index ea3b058509904..7a7da2c5f5d23 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "elan"; - version = "0.8.0"; + version = "0.10.2"; src = fetchFromGitHub { owner = "kha"; repo = "elan"; rev = "v${version}"; - sha256 = "0n2ncssjcmp3x5kbnci7xbq5fgcihlr3vaglyhhwzrxkjy2vpmpd"; + sha256 = "0ycw1r364g5gwh8796dpv1israpg7zqwx8mcvnacv2lqj5iijmby"; }; - cargoSha256 = "1pkg0n7kxckr0zhr8dr12b9fxg5q185kj3r9k2rmnkj2dpa2mxh3"; + cargoSha256 = "0hcaiy046d2gnkp6sfpnkkprb3nd94i9q8dgqxxpwrc1j157x6z9"; nativeBuildInputs = [ pkgconfig ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' pushd $out/bin mv elan-init elan - for link in lean leanpkg leanchecker leanc; do + for link in lean leanpkg leanchecker leanc leanmake; do ln -s elan $link done popd diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index 1b021f7160787..f19d7e35c3e35 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Automated theorem prover for full first-order logic with equality"; - homepage = http://www.eprover.org/; + homepage = "http://www.eprover.org/"; license = licenses.gpl2; maintainers = with maintainers; [ raskin gebner ]; platforms = platforms.all; diff --git a/pkgs/applications/science/logic/gappa/default.nix b/pkgs/applications/science/logic/gappa/default.nix index 7522eb4790ed0..2ca1bcd309812 100644 --- a/pkgs/applications/science/logic/gappa/default.nix +++ b/pkgs/applications/science/logic/gappa/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gappa-1.3.5"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.3.5.tar.gz; + url = "https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.3.5.tar.gz"; sha256 = "0q1wdiwqj6fsbifaayb1zkp20bz8a1my81sqjsail577jmzwi07w"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { installPhase = "./remake install"; meta = { - homepage = http://gappa.gforge.inria.fr/; + homepage = "http://gappa.gforge.inria.fr/"; description = "Verifying and formally proving properties on numerical programs dealing with floating-point or fixed-point arithmetic"; license = with stdenv.lib.licenses; [ cecill20 gpl2 ]; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index d6a1eb6cbf717..dbafee7d6000a 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation { implementing combinations of deduction, execution and property checking. ''; - homepage = http://hol.sourceforge.net/; + homepage = "http://hol.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ mudri ]; platforms = with platforms; linux; diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 69ffb87e76704..9c3030517e327 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { }; patches = [(fetchpatch { - url = https://salsa.debian.org/ocaml-team/hol-light/-/raw/master/debian/patches/0004-Fix-compilation-with-camlp5-7.11.patch; + url = "https://salsa.debian.org/ocaml-team/hol-light/-/raw/master/debian/patches/0004-Fix-compilation-with-camlp5-7.11.patch"; sha256 = "180qmxbrk3vb1ix7j77hcs8vsar91rs11s5mm8ir5352rz7ylicr"; })]; @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Interactive theorem prover based on Higher-Order Logic"; - homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/; + homepage = "http://www.cl.cam.ac.uk/~jrh13/hol-light/"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice maggesi vbgl ]; diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index c4eb22a7c0306..310a95d7e7a60 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An automated first-order logic theorem prover"; - homepage = http://www.cs.man.ac.uk/~korovink/iprover/; + homepage = "http://www.cs.man.ac.uk/~korovink/iprover/"; maintainers = with maintainers; [ raskin gebner ]; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 024f2f4e82943..d2e49d8178371 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { to be expressed in a formal language and provides tools for proving those formulas in a logical calculus. ''; - homepage = http://isabelle.in.tum.de/; + homepage = "http://isabelle.in.tum.de/"; license = "LGPL"; maintainers = [ stdenv.lib.maintainers.jwiegley ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/logic/jonprl/default.nix b/pkgs/applications/science/logic/jonprl/default.nix index e503836098f19..3ee05a478bc2e 100644 --- a/pkgs/applications/science/logic/jonprl/default.nix +++ b/pkgs/applications/science/logic/jonprl/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { based on Brouwer-realizability & meaning explanations. Inspired by Nuprl ''; - homepage = https://github.com/jonsterling/JonPRL; + homepage = "https://github.com/jonsterling/JonPRL"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 594f596b5ef75..2f5943dfa9b5a 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, cmake, gmp }: +{ stdenv, fetchFromGitHub, cmake, gmp, coreutils }: stdenv.mkDerivation rec { pname = "lean"; - version = "3.8.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "0frs2vhxlzdliyydb462c1886dn585zd7yp7hdxzsri2v6gdh89g"; + sha256 = "1dlzap3j26rh93ick1lqb7g3jkqjpd33gl4gqfcbx22v62258y5b"; }; nativeBuildInputs = [ cmake ]; @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { cd src ''; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace $out/bin/leanpkg \ + --replace "greadlink" "${coreutils}/bin/readlink" + ''; + meta = with stdenv.lib; { description = "Automatic and interactive theorem prover"; homepage = "https://leanprover.github.io/"; diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index b50848a18205a..b43bfb8013582 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.bsd3; - homepage = http://www.leoprover.org/; + homepage = "http://www.leoprover.org/"; }; } diff --git a/pkgs/applications/science/logic/lingeling/default.nix b/pkgs/applications/science/logic/lingeling/default.nix index 94be89d4736ff..1805f6cdcc891 100644 --- a/pkgs/applications/science/logic/lingeling/default.nix +++ b/pkgs/applications/science/logic/lingeling/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Fast SAT solver"; - homepage = http://fmv.jku.at/lingeling/; + homepage = "http://fmv.jku.at/lingeling/"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index d6a1207b5d609..ce86b25231166 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://ozark.hendrix.edu/~burch/logisim; + homepage = "http://ozark.hendrix.edu/~burch/logisim"; description = "Educational tool for designing and simulating digital logic circuits"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index a479e31e33955..eb83eaf79c55d 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { that can be used for modelling, validation and verification of concurrent systems and protocols ''; - homepage = https://www.mcrl2.org/; + homepage = "https://www.mcrl2.org/"; license = licenses.boost; maintainers = with maintainers; [ moretea ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix index ed1218c401b32..5755abfd90788 100644 --- a/pkgs/applications/science/logic/metis-prover/default.nix +++ b/pkgs/applications/science/logic/metis-prover/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Automatic theorem prover for first-order logic with equality"; - homepage = http://www.gilith.com/research/metis/; + homepage = "http://www.gilith.com/research/metis/"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix index 6b642832b83fd..df1800e6c31b0 100644 --- a/pkgs/applications/science/logic/minisat/default.nix +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ gebner raskin ]; platforms = platforms.unix; license = licenses.mit; - homepage = http://minisat.se/; + homepage = "http://minisat.se/"; }; } diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index ba0e787af7216..63440213920ce 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -23,7 +23,7 @@ let patches = [ # Python 3.8 compatibility (fetchpatch { - url = https://github.com/sambayless/monosat/commit/a5079711d0df0451f9840f3a41248e56dbb03967.patch; + url = "https://github.com/sambayless/monosat/commit/a5079711d0df0451f9840f3a41248e56dbb03967.patch"; sha256 = "1p2y0jw8hb9c90nbffhn86k1dxd6f6hk5v70dfmpzka3y6g1ksal"; }) ]; @@ -50,7 +50,7 @@ let description = "SMT solver for Monotonic Theories"; platforms = platforms.unix; license = if includeGplCode then licenses.gpl2 else licenses.mit; - homepage = https://github.com/sambayless/monosat; + homepage = "https://github.com/sambayless/monosat"; maintainers = [ maintainers.acairncross ]; }; }; diff --git a/pkgs/applications/science/logic/open-wbo/default.nix b/pkgs/applications/science/logic/open-wbo/default.nix index 32ce9fde0c312..c314127e74bfe 100644 --- a/pkgs/applications/science/logic/open-wbo/default.nix +++ b/pkgs/applications/science/logic/open-wbo/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ gebner ]; platforms = platforms.unix; license = licenses.mit; - homepage = http://sat.inesc-id.pt/open-wbo/; + homepage = "http://sat.inesc-id.pt/open-wbo/"; }; } diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 9e5ebe008b8f3..03b3ce4ff0b77 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.gpl3; - homepage = http://code.google.com/p/opensmt/; + homepage = "http://code.google.com/p/opensmt/"; broken = true; downloadPage = "http://code.google.com/p/opensmt/downloads/list"; }; diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index fa7c3dd5e95f2..fa2ad9c4abc42 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { terms of the defined language, parsing them and replacing them by target-system terms. ''; - homepage = http://www.cl.cam.ac.uk/~pes20/ott; + homepage = "http://www.cl.cam.ac.uk/~pes20/ott"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ jwiegley ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index 547bd31e8b429..b13d871580c56 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "SAT solver with proof and core support"; - homepage = http://fmv.jku.at/picosat/; + homepage = "http://fmv.jku.at/picosat/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ roconnor thoughtpolice ]; diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index d4feb5c9e2855..98313e48cb271 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { below the tree (on single click) or in a separate window (on double or shift-click). ''; - homepage = http://askra.de/software/prooftree; + homepage = "http://askra.de/software/prooftree"; platforms = platforms.unix; maintainers = [ maintainers.jwiegley ]; license = licenses.gpl3; diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index 9528a5942a43b..fcdff8558483a 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "prover9-2009-11a"; src = fetchurl { - url = https://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz; + url = "https://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz"; sha256 = "1l2i3d3h5z7nnbzilb6z92r0rbx0kh6yaxn2c5qhn3000xcfsay3"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.cs.unm.edu/~mccune/mace4/; + homepage = "https://www.cs.unm.edu/~mccune/mace4/"; license = "GPL"; description = "Automated theorem prover for first-order and equational logic"; longDescription = '' diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/applications/science/logic/redprl/default.nix index 9da2647d11384..49245c73f2c4f 100644 --- a/pkgs/applications/science/logic/redprl/default.nix +++ b/pkgs/applications/science/logic/redprl/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { description = "A proof assistant for Nominal Computational Type Theory"; - homepage = http://www.redprl.org/; + homepage = "http://www.redprl.org/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.acowley ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix index 8e94356f376a0..f9b82b5d733bd 100644 --- a/pkgs/applications/science/logic/sad/default.nix +++ b/pkgs/applications/science/logic/sad/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { ''; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.schmitthenner ]; - homepage = http://nevidal.org/sad.en.html; + homepage = "http://nevidal.org/sad.en.html"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index d3ceeadbf9a7b..6c2b03b5b37d5 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; downloadPage = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads.php"; - homepage = http://www.ps.uni-saarland.de/~cebrown/satallax/index.php; + homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/index.php"; updateWalker = true; }; } diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 9b87b8c899e52..857aba5a26076 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -18,7 +18,7 @@ let inherit pname version src; license = lib.licenses.gpl3; - homepage = https://tamarin-prover.github.io; + homepage = "https://tamarin-prover.github.io"; description = "Security protocol verification in the symbolic model"; maintainers = [ lib.maintainers.thoughtpolice ]; }; diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix index b1c72d7c5ee75..14944f5e19b06 100644 --- a/pkgs/applications/science/logic/tlaplus/default.nix +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchFromGitHub, makeWrapper -, jdk, jre, ant +, adoptopenjdk-bin, jre, ant }: stdenv.mkDerivation rec { pname = "tlaplus"; - version = "1.5.6"; + version = "1.7.0"; src = fetchFromGitHub { owner = "tlaplus"; repo = "tlaplus"; rev = "refs/tags/v${version}"; - sha256 = "0966mvgxamknj4hsp980qbxwda886w1dv309kn7isxn0420lfv4f"; + sha256 = "1mm6r9bq79zks50yk0agcpdkw9yy994m38ibmgpb3bi3wkpq9891"; }; - buildInputs = [ makeWrapper jdk ant ]; + buildInputs = [ makeWrapper adoptopenjdk-bin ant ]; - buildPhase = "ant -f tlatools/customBuild.xml compile dist"; + buildPhase = "ant -f tlatools/org.lamport.tlatools/customBuild.xml compile dist"; installPhase = '' mkdir -p $out/share/java $out/bin - cp tlatools/dist/*.jar $out/share/java + cp tlatools/org.lamport.tlatools/dist/*.jar $out/share/java makeWrapper ${jre}/bin/java $out/bin/tlc2 \ --add-flags "-cp $out/share/java/tla2tools.jar tlc2.TLC" @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "An algorithm specification language with model checking tools"; - homepage = http://lamport.azurewebsites.net/tla/tla.html; + homepage = "http://lamport.azurewebsites.net/tla/tla.html"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix index 7c8389688d95d..cbca37ea53d16 100644 --- a/pkgs/applications/science/logic/tlaplus/tlaps.nix +++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { and scalable to large system specifications. It provides a consistent abstraction over the various “backend” verifiers. ''; - homepage = https://tla.msr-inria.inria.fr/tlaps/content/Home.html; + homepage = "https://tla.msr-inria.inria.fr/tlaps/content/Home.html"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.badi ]; diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index 91666e85d9235..f326d62f8f0b4 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = http://research.microsoft.com/en-us/um/people/lamport/tla/toolbox.html; + homepage = "http://research.microsoft.com/en-us/um/people/lamport/tla/toolbox.html"; description = "IDE for the TLA+ tools"; longDescription = '' Integrated development environment for the TLA+ tools, based on Eclipse. You can use it diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix index 161da6e4b2357..975b989bd94cb 100644 --- a/pkgs/applications/science/logic/twelf/default.nix +++ b/pkgs/applications/science/logic/twelf/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { a foundational proof-carrying-code system, and a type safety proof for Standard ML. ''; - homepage = http://twelf.org/wiki/Main_Page; + homepage = "http://twelf.org/wiki/Main_Page"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ jwiegley ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix index 42963fe5f9c6f..e5941a35fd596 100644 --- a/pkgs/applications/science/logic/vampire/default.nix +++ b/pkgs/applications/science/logic/vampire/default.nix @@ -19,19 +19,19 @@ stdenv.mkDerivation rec { # https://github.com/vprover/vampire/pull/54 (fetchpatch { name = "fix-apple-cygwin-defines.patch"; - url = https://github.com/vprover/vampire/pull/54.patch; + url = "https://github.com/vprover/vampire/pull/54.patch"; sha256 = "0i6nrc50wlg1dqxq38lkpx4rmfb3lf7s8f95l4jkvqp0nxa20cza"; }) # https://github.com/vprover/vampire/pull/55 (fetchpatch { name = "fix-wait-any.patch"; - url = https://github.com/vprover/vampire/pull/55.patch; + url = "https://github.com/vprover/vampire/pull/55.patch"; sha256 = "1pwfpwpl23bqsgkmmvw6bnniyvp5j9v8l3z9s9pllfabnfcrcz9l"; }) # https://github.com/vprover/vampire/pull/56 (fetchpatch { name = "fenv.patch"; - url = https://github.com/vprover/vampire/pull/56.patch; + url = "https://github.com/vprover/vampire/pull/56.patch"; sha256 = "0xl3jcyqmk146mg3qj5hdd0pbja6wbq3250zmfhbxqrjh40mm40g"; }) ]; diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index c5e8078eff2a2..49618d2586b1e 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { description = "Verification for C and Java programs via separation logic"; homepage = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/"; - license = stdenv.lib.licenses.msrla; + license = stdenv.lib.licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix index 2c68191b800e4..f20a832415714 100644 --- a/pkgs/applications/science/logic/verit/default.nix +++ b/pkgs/applications/science/logic/verit/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An open, trustable and efficient SMT-solver"; - homepage = http://www.verit-solver.org/; + homepage = "http://www.verit-solver.org/"; license = licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.gebner ]; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index e576446181962..51cb2a456c197 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { version = "1.2.1"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/38185/why3-1.2.1.tar.gz; + url = "https://gforge.inria.fr/frs/download.php/file/38185/why3-1.2.1.tar.gz"; sha256 = "014gkwisjp05x3342zxkryb729p02ngx1hcjjsrplpa53jzgz647"; }; diff --git a/pkgs/applications/science/machine-learning/fasttext/default.nix b/pkgs/applications/science/machine-learning/fasttext/default.nix index 0de54572862b2..64124594e1e22 100644 --- a/pkgs/applications/science/machine-learning/fasttext/default.nix +++ b/pkgs/applications/science/machine-learning/fasttext/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "fasttext"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "facebookresearch"; repo = "fastText"; rev = "v${version}"; - sha256 = "1cbzz98qn8aypp4r5kwwwc9wiq5bwzv51kcsb15xjfs9lz8h3rii"; + sha256 = "07cz2ghfq6amcljaxpdr5chbd64ph513y8zqmibfx2xwfp74xkhn"; }; nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "Library for text classification and representation learning"; - homepage = https://fasttext.cc/; + homepage = "https://fasttext.cc/"; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.danieldk ]; diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix index b1c89d299508e..a952fb559ce6a 100644 --- a/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -18,7 +18,7 @@ ''; meta = with stdenv.lib; { description = "LabelImg is a graphical image annotation tool and label object bounding boxes in images"; - homepage = https://github.com/tzutalin/labelImg; + homepage = "https://github.com/tzutalin/labelImg"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.cmcdragonkai ]; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index 988ea8c855c01..031ca55a04803 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -2,7 +2,7 @@ # data, compression , bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy # maths -, openblasCompat, eigen, nlopt, lp_solve, colpack, liblapack, glpk +, blas, lapack, eigen, nlopt, lp_solve, colpack, glpk # libraries , libarchive, libxml2 # extra support @@ -13,6 +13,8 @@ assert pythonSupport -> pythonPackages != null; assert opencvSupport -> opencv != null; +assert (!blas.isILP64) && (!lapack.isILP64); + let pname = "shogun"; version = "6.1.4"; @@ -64,8 +66,8 @@ stdenv.mkDerivation rec { CCACHE_DIR=".ccache"; buildInputs = with lib; [ - openblasCompat bzip2 cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo - protobuf nlopt snappy swig (libarchive.dev) libxml2 liblapack glpk + blas lapack bzip2 cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo + protobuf nlopt snappy swig (libarchive.dev) libxml2 lapack glpk ] ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ]) ++ optional (opencvSupport) opencv; diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/pkgs/applications/science/machine-learning/streamlit/default.nix index c7bdf0f12a404..3856b8ec841ac 100644 --- a/pkgs/applications/science/machine-learning/streamlit/default.nix +++ b/pkgs/applications/science/machine-learning/streamlit/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://streamlit.io/; + homepage = "https://streamlit.io/"; description = "The fastest way to build custom ML tools"; maintainers = with maintainers; [ yrashk ]; license = licenses.asl20; diff --git a/pkgs/applications/science/math/LiE/default.nix b/pkgs/applications/science/math/LiE/default.nix index d59ec57c1a859..f5f3bb0a42b18 100644 --- a/pkgs/applications/science/math/LiE/default.nix +++ b/pkgs/applications/science/math/LiE/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { meta = { description = "A Computer algebra package for Lie group computations"; - homepage = http://wwwmathlabo.univ-poitiers.fr/~maavl/LiE/; + homepage = "http://wwwmathlabo.univ-poitiers.fr/~maavl/LiE/"; license = stdenv.lib.licenses.lgpl3; # see the website longDescription = '' diff --git a/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch b/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch deleted file mode 100644 index 7bf32df0b7a32..0000000000000 --- a/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 85ede2cf452800710de136f4f864921d3bb9773c Mon Sep 17 00:00:00 2001 -From: Tom Hall <tahall256@protonmail.ch> -Date: Fri, 21 Feb 2020 22:56:06 +0000 -Subject: [PATCH] Disable test pending upstream fix - -See https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17718 ---- - tests/reg-tests-1d.R | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/reg-tests-1d.R b/tests/reg-tests-1d.R -index 9b551a1fc8..18ce6027ed 100644 ---- a/tests/reg-tests-1d.R -+++ b/tests/reg-tests-1d.R -@@ -3079,7 +3079,7 @@ stopifnot(exprs = { - x[1:52] %% 3 == 2:1 - -x[1:52] %% 3 == 1:2 - }) # larger x suffer from cancellation (well, warning too early now): --tools::assertWarning(x[60:68] %% 3) -+#tools::assertWarning(x[60:68] %% 3) - - - ## Hilmar Berger's on R-devel list: 'data.frame() == NULL' etc --- -2.24.1 - diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 3ee62fad44da2..52da3b4a1ac93 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng -, libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib -, less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas +, libtiff, ncurses, pango, pcre2, perl, readline, tcl, texLive, tk, xz, zlib +, less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, blas, lapack , curl, Cocoa, Foundation, libobjc, libcxx, tzdata, fetchpatch , withRecommendedPackages ? true , enableStrictBarrier ? false @@ -9,28 +9,27 @@ , static ? false }: +assert (!blas.isILP64) && (!lapack.isILP64); + stdenv.mkDerivation rec { - name = "R-3.6.3"; + name = "R-4.0.0"; src = fetchurl { - url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "13xaxwfbzj0bd6rn2n27z0n04lb93mcyq991w4vdbbg8v282jc49"; + url = "https://cran.r-project.org/src/base/R-4/${name}.tar.gz"; + sha256 = "0h1995smlyiyhx7gpg9paxsfqrcn6g9bbp5h9r47i6an3clv1gh6"; }; dontUseImakeConfigure = true; buildInputs = [ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses - pango pcre perl readline texLive xz zlib less texinfo graphviz icu - pkgconfig bison imake which openblas curl tcl tk jdk + pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu + pkgconfig bison imake which blas lapack curl tcl tk jdk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ ./no-usr-local-search-paths.patch - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [ - # Remove a test which fails on aarch64. - # See https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17718 - ./0001-Disable-test-pending-upstream-fix.patch + ./fix-failing-test.patch ]; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' @@ -43,8 +42,8 @@ stdenv.mkDerivation rec { configureFlagsArray=( --disable-lto --with${stdenv.lib.optionalString (!withRecommendedPackages) "out"}-recommended-packages - --with-blas="-L${openblas}/lib -lopenblas" - --with-lapack="-L${openblas}/lib -lopenblas" + --with-blas="-L${blas}/lib -lblas" + --with-lapack="-L${lapack}/lib -llapack" --with-readline --with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh" --with-cairo diff --git a/pkgs/applications/science/math/R/fix-failing-test.patch b/pkgs/applications/science/math/R/fix-failing-test.patch new file mode 100644 index 0000000000000..5fb3b3b9c3176 --- /dev/null +++ b/pkgs/applications/science/math/R/fix-failing-test.patch @@ -0,0 +1,25 @@ +From e8f54bc562eb301d204b5f880614be58a2b39a2b Mon Sep 17 00:00:00 2001 +From: maechler <maechler@00db46b3-68df-0310-9c12-caf00c1e9a41> +Date: Mon, 30 Mar 2020 19:15:59 +0000 +Subject: [PATCH] no longer fail in norm() check for broken OpenBLAS Lapack + 3.9.0 + +git-svn-id: https://svn.r-project.org/R/trunk@78112 00db46b3-68df-0310-9c12-caf00c1e9a41 +--- + tests/reg-tests-1d.R | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/reg-tests-1d.R b/tests/reg-tests-1d.R +index 6b7de765a95..fafd6911e7a 100644 +--- a/tests/reg-tests-1d.R ++++ b/tests/reg-tests-1d.R +@@ -3836,7 +3836,8 @@ stopifnot(is.na( norm(diag(c(1, NA)), "2") )) + ## norm(<matrix-w-NA>, "F") + (m <- cbind(0, c(NA, 0), 0:-1)) + nTypes <- eval(formals(base::norm)$type) # "O" "I" "F" "M" "2" +-stopifnot(is.na( print(vapply(nTypes, norm, 0., x = m)) )) # print(): show NA *or* NaN ++print( # stopifnot( -- for now, as Lapack is still broken in some OpenBLAS -- FIXME ++ is.na( print(vapply(nTypes, norm, 0., x = m)) )) # print(): show NA *or* NaN + ## "F" gave non-NA with LAPACK 3.9.0, before our patch in R-devel and R-patched + + diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/applications/science/math/almonds/default.nix index b5d9632c551d0..9edb0747b31e4 100644 --- a/pkgs/applications/science/math/almonds/default.nix +++ b/pkgs/applications/science/math/almonds/default.nix @@ -19,7 +19,7 @@ with python3.pkgs; buildPythonApplication rec { meta = with stdenv.lib; { description = "Terminal Mandelbrot fractal viewer"; - homepage = https://github.com/Tenchi2xh/Almonds; + homepage = "https://github.com/Tenchi2xh/Almonds"; license = licenses.mit; maintainers = with maintainers; [ infinisil ]; }; diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix index 74adcab4e7059..18b6e051b3f26 100644 --- a/pkgs/applications/science/math/bcal/default.nix +++ b/pkgs/applications/science/math/bcal/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Storage conversion and expression calculator"; - homepage = https://github.com/jarun/bcal; + homepage = "https://github.com/jarun/bcal"; license = licenses.gpl3; platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/science/math/bliss/default.nix b/pkgs/applications/science/math/bliss/default.nix index 37504fceb1416..361b088466265 100644 --- a/pkgs/applications/science/math/bliss/default.nix +++ b/pkgs/applications/science/math/bliss/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "bliss is an open source tool for computing automorphism groups and canonical forms of graphs. It has both a command line user interface as well as C++ and C programming language APIs."; - homepage = http://www.tcs.hut.fi/Software/bliss/; + homepage = "http://www.tcs.hut.fi/Software/bliss/"; license = licenses.lgpl3; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 5068abbf30767..4a6a2dc6c7e0f 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -9,7 +9,7 @@ , opencv3 , protobuf , doxygen -, openblas +, blas , Accelerate, CoreGraphics, CoreVideo , lmdbSupport ? true, lmdb , leveldbSupport ? true, leveldb, snappy @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"] ++ ["-DUSE_LMDB=${toggle lmdbSupport}"]; - buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv3 openblas ] + buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv3 blas ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudnnSupport cudnn ++ lib.optional lmdbSupport lmdb @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { modularity in mind. It is developed by the Berkeley Vision and Learning Center (BVLC) and by community contributors. ''; - homepage = http://caffe.berkeleyvision.org/; + homepage = "http://caffe.berkeleyvision.org/"; maintainers = with maintainers; [ jb55 ]; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 0d149eca3b631..8e50f48b286b4 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C-style arbitrary precision calculator"; - homepage = http://www.isthe.com/chongo/tech/comp/calc/; + homepage = "http://www.isthe.com/chongo/tech/comp/calc/"; license = licenses.lgpl21; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.all; diff --git a/pkgs/applications/science/math/calculix/calculix.patch b/pkgs/applications/science/math/calculix/calculix.patch index 311421f2ef544..5b8f492a8e7c7 100644 --- a/pkgs/applications/science/math/calculix/calculix.patch +++ b/pkgs/applications/science/math/calculix/calculix.patch @@ -15,7 +15,7 @@ index 9cab2fc..6e977b8 100755 OCCXMAIN = $(SCCXMAIN:.c=.o) -DIR=../../../SPOOLES.2.2 -+LIBS = -lpthread -lm -lc -lspooles -larpack -lopenblas ++LIBS = -lpthread -lm -lc -lspooles -larpack -lblas -llapack -LIBS = \ - $(DIR)/spooles.a \ diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/applications/science/math/calculix/default.nix index 6f2d61cd80f00..44882594550b6 100644 --- a/pkgs/applications/science/math/calculix/default.nix +++ b/pkgs/applications/science/math/calculix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, arpack, spooles, openblas }: +{ stdenv, fetchurl, gfortran, arpack, spooles, blas, lapack }: stdenv.mkDerivation rec { pname = "calculix"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran ]; - buildInputs = [ arpack spooles openblas ]; + buildInputs = [ arpack spooles blas lapack ]; NIX_CFLAGS_COMPILE = "-I${spooles}/include/spooles"; diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix index e68ceb379b049..b75f3d3f78688 100644 --- a/pkgs/applications/science/math/cbc/default.nix +++ b/pkgs/applications/science/math/cbc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # FIXME: move share/coin/Data to a separate output? meta = { - homepage = https://projects.coin-or.org/Cbc; + homepage = "https://projects.coin-or.org/Cbc"; license = lib.licenses.epl10; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/applications/science/math/cemu/default.nix b/pkgs/applications/science/math/cemu/default.nix index f91e5be517009..b41135229dd79 100644 --- a/pkgs/applications/science/math/cemu/default.nix +++ b/pkgs/applications/science/math/cemu/default.nix @@ -4,7 +4,7 @@ , SDL2 , libGL , libarchive -, libusb +, libusb-compat-0_1 , qtbase , qmake , git @@ -33,7 +33,7 @@ mkDerivation rec { SDL2 libGL libarchive - libusb + libusb-compat-0_1 qtbase libpng_apng ]; diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix index 5e770cec13b39..97ef3dd7543f3 100644 --- a/pkgs/applications/science/math/clp/default.nix +++ b/pkgs/applications/science/math/clp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - version = "1.17.5"; + version = "1.17.6"; pname = "clp"; src = fetchurl { url = "https://www.coin-or.org/download/source/Clp/Clp-${version}.tgz"; - sha256 = "0y5wg4lfffy5vh8gc20v68pmmv241ndi2jgm9pgvk39b00bzkaa9"; + sha256 = "0ap1f0lxppa6pnbc4bg7ih7a96avwaki482nig8w5fr3vg9wvkzr"; }; propagatedBuildInputs = [ zlib ]; diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index ceb87b25ba85c..401454a6b69ba 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchgit, fetchFromGitHub, cmake -, openblas, opencv3, libzip, boost, protobuf, openmpi +, openblas, blas, lapack, opencv3, libzip, boost, protobuf, openmpi , onebitSGDSupport ? false , cudaSupport ? false, addOpenGLRunpath, cudatoolkit, nvidia_x11 , cudnnSupport ? cudaSupport, cudnn }: assert cudnnSupport -> cudaSupport; +assert blas.implementation == "openblas" && lapack.implementation == "openblas"; let # Old specific version required for CNTK. @@ -95,7 +96,7 @@ in stdenv.mkDerivation rec { # Newer cub is included with cudatoolkit now and it breaks the build. # https://github.com/Microsoft/CNTK/issues/3191 broken = cudaSupport; - homepage = https://github.com/Microsoft/CNTK; + homepage = "https://github.com/Microsoft/CNTK"; description = "An open source deep-learning toolkit"; license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/applications/science/math/csdp/default.nix index 9b402fe0ac941..ef9d5e733ca73 100644 --- a/pkgs/applications/science/math/csdp/default.nix +++ b/pkgs/applications/science/math/csdp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, blas, gfortran, liblapack }: +{ lib, stdenv, fetchurl, blas, gfortran, lapack }: stdenv.mkDerivation { name = "csdp-6.1.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1f9ql6cjy2gwiyc51ylfan24v1ca9sjajxkbhszlds1lqmma8n05"; }; - buildInputs = [ blas gfortran.cc.lib liblapack ]; + buildInputs = [ blas gfortran.cc.lib lapack ]; postPatch = '' substituteInPlace Makefile --replace /usr/local/bin $out/bin @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://projects.coin-or.org/Csdp; + homepage = "https://projects.coin-or.org/Csdp"; license = lib.licenses.cpl10; maintainers = [ lib.maintainers.roconnor ]; description = "A C Library for Semidefinite Programming"; diff --git a/pkgs/applications/science/math/ecm/default.nix b/pkgs/applications/science/math/ecm/default.nix index 7b768f7077e70..3e8e5879950b2 100644 --- a/pkgs/applications/science/math/ecm/default.nix +++ b/pkgs/applications/science/math/ecm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Elliptic Curve Method for Integer Factorization"; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://ecm.gforge.inria.fr/; + homepage = "http://ecm.gforge.inria.fr/"; maintainers = [ stdenv.lib.maintainers.roconnor ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index 6d1c778d1e0ee..879ad96a93675 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Geometry Drawing Language"; - homepage = http://www.eukleides.org/; + homepage = "http://www.eukleides.org/"; license = stdenv.lib.licenses.gpl2; longDescription = '' diff --git a/pkgs/applications/science/math/form/default.nix b/pkgs/applications/science/math/form/default.nix index 0dbafebf2c06a..091372792901c 100644 --- a/pkgs/applications/science/math/form/default.nix +++ b/pkgs/applications/science/math/form/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The FORM project for symbolic manipulation of very big expressions"; - homepage = https://www.nikhef.nl/~form/; + homepage = "https://www.nikhef.nl/~form/"; license = licenses.gpl3; maintainers = [ maintainers.veprbl ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index 7d1f738641a6d..39ca53c47e6e6 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { dontStrip = true; meta = { - homepage = http://fricas.sourceforge.net/; + homepage = "http://fricas.sourceforge.net/"; description = "An advanced computer algebra system"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 7eb10d1f95250..87f4fa1203875 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -175,6 +175,6 @@ stdenv.mkDerivation rec { # is reasonable and that way the binary cache doesn't get overloaded. hydraPlatforms = lib.optionals (!keepAllPackages) meta.platforms; license = licenses.gpl2; - homepage = http://gap-system.org/; + homepage = "http://gap-system.org/"; }; } diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index bba26610a079a..1dd92267a837f 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { together geometry, algebra, spreadsheets, graphing, statistics and calculus in one easy-to-use package. ''; - homepage = https://www.geogebra.org/; + homepage = "https://www.geogebra.org/"; maintainers = with maintainers; [ ma27 ]; license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ]; platforms = platforms.all; diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix index 0ac2ea7d1b39d..ae93e89f1416d 100644 --- a/pkgs/applications/science/math/getdp/default.nix +++ b/pkgs/applications/science/math/getdp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, gfortran, openblas, openmpi, petsc, python3 }: +{ stdenv, fetchurl, cmake, gfortran, blas, lapack, openmpi, petsc, python3 }: stdenv.mkDerivation rec { name = "getdp-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake gfortran ]; - buildInputs = [ openblas openmpi petsc python3 ]; + buildInputs = [ blas lapack openmpi petsc python3 ]; meta = with stdenv.lib; { description = "A General Environment for the Treatment of Discrete Problems"; diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix index 33b003b2b5625..72d1a548c530c 100644 --- a/pkgs/applications/science/math/gfan/default.nix +++ b/pkgs/applications/science/math/gfan/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2 ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; - homepage = http://home.math.au.dk/jensen/software/gfan/gfan.html; + homepage = "http://home.math.au.dk/jensen/software/gfan/gfan.html"; }; } diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index b3777528ecda1..ea9c921f19e12 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -1,10 +1,11 @@ -{ stdenv, lib, fetchurl, fetchpatch, texlive, bison, flex, liblapack -, gmp, mpfr, pari, ntl, gsl, blas, mpfi, ecm, glpk, nauty +{ stdenv, lib, fetchurl, fetchpatch, texlive, bison, flex, lapack, blas +, gmp, mpfr, pari, ntl, gsl, mpfi, ecm, glpk, nauty , readline, gettext, libpng, libao, gfortran, perl , enableGUI ? false, libGL ? null, libGLU ? null, xorg ? null, fltk ? null }: assert enableGUI -> libGLU != null && libGL != null && xorg != null && fltk != null; +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "giac${lib.optionalString enableGUI "-with-xcas"}"; @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { # gfortran.cc default output contains static libraries compiled without -fPIC # we want libgfortran.so.3 instead (stdenv.lib.getLib gfortran.cc) - liblapack + lapack blas ] ++ stdenv.lib.optionals enableGUI [ libGL libGLU fltk xorg.libX11 ]; diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 79f20f06b2955..701445f901000 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }: stdenv.mkDerivation rec { - name = "ginac-1.7.8"; + name = "ginac-1.7.9"; src = fetchurl { url = "${meta.homepage}/${name}.tar.bz2"; - sha256 = "0rvhdagmrs8ynnylwnxnmmfz1j9zk1g2rr7w6xczsbn7lqd511hc"; + sha256 = "08cqc87qq4w6z3l053x5gfqsa4zkgkicq8skxsbsj39nli1zzkb7"; }; propagatedBuildInputs = [ cln ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GiNaC is Not a CAS"; - homepage = http://www.ginac.de/; + homepage = "http://www.ginac.de/"; maintainers = with maintainers; [ lovek323 ]; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index c11110e4bc499..09d0d5241687f 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://raffalli.eu/~christophe/glsurf/; + homepage = "https://raffalli.eu/~christophe/glsurf/"; description = "A program to draw implicit surfaces and curves"; license = stdenv.lib.licenses.lgpl21; }; diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 2c4d5f254daa5..946beff8003f2 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg +{ stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg , zlib, libGL, libGLU, xorg, opencascade-occt }: +assert (!blas.isILP64) && (!lapack.isILP64); + stdenv.mkDerivation rec { pname = "gmsh"; version = "4.5.6"; @@ -10,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0gs65bgr1ph5lz7r6manqj8cra30s7c94pxilkd2z0p5vq6fpsj6"; }; - buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU libGL + buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE opencascade-occt diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix index 4ac7c411c2dc2..1aa7bce07c5dc 100644 --- a/pkgs/applications/science/math/gurobi/default.nix +++ b/pkgs/applications/science/math/gurobi/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optimization solver for mathematical programming"; - homepage = https://www.gurobi.com; + homepage = "https://www.gurobi.com"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/science/math/hmetis/default.nix b/pkgs/applications/science/math/hmetis/default.nix index 45a13d0288949..b5e99a8dd75be 100644 --- a/pkgs/applications/science/math/hmetis/default.nix +++ b/pkgs/applications/science/math/hmetis/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "hMETIS is a set of programs for partitioning hypergraphs"; - homepage = http://glaros.dtc.umn.edu/gkhome/metis/hmetis/overview; + homepage = "http://glaros.dtc.umn.edu/gkhome/metis/hmetis/overview"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index 1d1fb96a47393..122c62888476f 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gfortran, openblas}: +{stdenv, fetchurl, gfortran, blas, lapack}: stdenv.mkDerivation rec { name = "JAGS-4.3.0"; @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz"; sha256 = "1z3icccg2ic56vmhyrpinlsvpq7kcaflk1731rgpvz9bk1bxvica"; }; - buildInputs = [gfortran openblas]; - configureFlags = [ "--with-blas=-lopenblas" "--with-lapack=-lopenblas" ]; + buildInputs = [gfortran blas lapack]; + configureFlags = [ "--with-blas=-lblas" "--with-lapack=-llapack" ]; meta = with stdenv.lib; { description = "Just Another Gibbs Sampler"; license = licenses.gpl2; - homepage = http://mcmc-jags.sourceforge.net; + homepage = "http://mcmc-jags.sourceforge.net"; maintainers = [ maintainers.andres ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/applications/science/math/lrcalc/default.nix index f407358d8f266..438a84c0e0be9 100644 --- a/pkgs/applications/science/math/lrcalc/default.nix +++ b/pkgs/applications/science/math/lrcalc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Littlewood-Richardson calculator"; - homepage = http://math.rutgers.edu/~asbuch/lrcalc/; + homepage = "http://math.rutgers.edu/~asbuch/lrcalc/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ timokau ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix index 4204b1399137e..277fb1984c44a 100644 --- a/pkgs/applications/science/math/mathematica/10.nix +++ b/pkgs/applications/science/math/mathematica/10.nix @@ -8,7 +8,7 @@ , gcc , glib , ncurses -, opencv +, opencv2 , openssl , unixODBC , xorg @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { gcc.libc glib ncurses - opencv + opencv2 openssl unixODBC libxml2 @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { meta = { description = "Wolfram Mathematica computational software system"; - homepage = http://www.wolfram.com/mathematica/; + homepage = "http://www.wolfram.com/mathematica/"; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/science/math/mathematica/11.nix b/pkgs/applications/science/math/mathematica/11.nix index 521cb70099b9f..1c698a5e5428e 100644 --- a/pkgs/applications/science/math/mathematica/11.nix +++ b/pkgs/applications/science/math/mathematica/11.nix @@ -10,7 +10,7 @@ , gcc , glib , ncurses -, opencv +, opencv2 , openssl , unixODBC , xkeyboard_config @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { gcc.libc glib ncurses - opencv + opencv2 openssl unixODBC xkeyboard_config @@ -144,7 +144,7 @@ stdenv.mkDerivation rec { meta = { description = "Wolfram Mathematica computational software system"; - homepage = http://www.wolfram.com/mathematica/; + homepage = "http://www.wolfram.com/mathematica/"; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index aaa1c02ec0a0a..d0967485c01fa 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -8,7 +8,7 @@ , gcc , glib , ncurses -, opencv +, opencv2 , openssl , unixODBC , xorg @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { gcc.libc glib ncurses - opencv + opencv2 openssl unixODBC ] ++ (with xorg; [ @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { meta = { description = "Wolfram Mathematica computational software system"; - homepage = http://www.wolfram.com/mathematica/; + homepage = "http://www.wolfram.com/mathematica/"; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 5553bb0505fac..94d72eec6ae4d 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -11,7 +11,7 @@ , glib , libssh2 , ncurses -, opencv +, opencv2 , openssl , unixODBC , xkeyboard_config @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { glib libssh2 ncurses - opencv + opencv2 openssl stdenv.cc.cc.lib unixODBC @@ -148,7 +148,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wolfram Mathematica computational software system"; - homepage = http://www.wolfram.com/mathematica/; + homepage = "http://www.wolfram.com/mathematica/"; license = licenses.unfree; maintainers = with maintainers; [ herberteuler ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/math/maxima/5.41.nix b/pkgs/applications/science/math/maxima/5.41.nix index 583391d08ddeb..829dffc6116ec 100644 --- a/pkgs/applications/science/math/maxima/5.41.nix +++ b/pkgs/applications/science/math/maxima/5.41.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation ({ meta = { description = "Computer algebra system"; - homepage = http://maxima.sourceforge.net; + homepage = "http://maxima.sourceforge.net"; license = stdenv.lib.licenses.gpl2; longDescription = '' diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 5843f38a74a88..49ff0d5d5a050 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation ({ meta = { description = "Computer algebra system"; - homepage = http://maxima.sourceforge.net; + homepage = "http://maxima.sourceforge.net"; license = stdenv.lib.licenses.gpl2; longDescription = '' diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index 643d990feb8db..db7a1c1490680 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "msieve-1.53"; src = fetchurl { - url = mirror://sourceforge/msieve/msieve/Msieve%20v1.53/msieve153_src.tar.gz; + url = "mirror://sourceforge/msieve/msieve/Msieve%20v1.53/msieve153_src.tar.gz"; sha256 = "1d1vv7j4rh3nnxsmvafi73qy7lw7n3akjlm5pjl3m936yapvmz65"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "A C library implementing a suite of algorithms to factor large integers"; license = stdenv.lib.licenses.publicDomain; - homepage = http://msieve.sourceforge.net/; + homepage = "http://msieve.sourceforge.net/"; maintainers = [ stdenv.lib.maintainers.roconnor ]; platforms = [ "x86_64-linux" ] ++ stdenv.lib.platforms.darwin; }; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index bd4725ce73c62..b006a9dd18d1a 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchurl, bash, cmake -, opencv3, gtest, openblas, liblapack, perl +, opencv3, gtest, blas, perl , cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11 , cudnnSupport ? cudaSupport, cudnn }: @@ -8,16 +8,16 @@ assert cudnnSupport -> cudaSupport; stdenv.mkDerivation rec { pname = "mxnet"; - version = "1.4.1"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/apache/incubator-mxnet/releases/download/${version}/apache-mxnet-src-${version}-incubating.tar.gz"; - sha256 = "1d0lhlpdaxycjzpwwrpgjd3v2q2ka89v5rr13ddxayy7ld2hxiaj"; + sha256 = "1vvdb7pfh63kb9fzs6gqp95q550a3ck4cj9mqxlk9wwhkh30dsq1"; }; nativeBuildInputs = [ cmake perl ]; - buildInputs = [ opencv3 gtest openblas liblapack ] + buildInputs = [ opencv3 gtest blas ] ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ] ++ lib.optional cudnnSupport cudnn; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { substituteInPlace 3rdparty/mkldnn/tests/CMakeLists.txt \ --replace "/bin/bash" "${bash}/bin/bash" - # Build against the system version of OpenMP. + # Build against the system version of OpenMP. # https://github.com/apache/incubator-mxnet/pull/12160 rm -rf 3rdparty/openmp ''; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight, Portable, Flexible Distributed/Mobile Deep Learning with Dynamic, Mutation-aware Dataflow Dep Scheduler"; - homepage = https://mxnet.incubator.apache.org/; + homepage = "https://mxnet.incubator.apache.org/"; maintainers = with maintainers; [ abbradar ]; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index a492178595681..002acbf3875fa 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , pkgconfig , vala , gtk3 @@ -25,6 +26,14 @@ stdenv.mkDerivation rec { sha256 = "036v3dx8yasp19j88lflibqnpfi5d0nk7qkcnr80zn1lvawf4wgn"; }; + patches = [ + # fix build with gcc9 + (fetchpatch { + url = "https://github.com/parnold-x/nasc/commit/46b9b80e228b6b86001bded45d85e073a9411549.patch"; + sha256 = "1sm2aw0xhw2chk036r231nmp2f2ypxcmzggwljkn7wfzgg3h1mx3"; + }) + ]; + nativeBuildInputs = [ cmake vala @@ -53,7 +62,7 @@ stdenv.mkDerivation rec { answers in to future equations and if that answer changes, so does the equations it’s used in. ''; - homepage = https://github.com/parnold-x/nasc; + homepage = "https://github.com/parnold-x/nasc"; maintainers = with maintainers; [ samdroid-apps ]; platforms = platforms.linux; license = licenses.gpl3Plus; diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index 986610eea60d7..c1d408213b98e 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -4,10 +4,10 @@ }: stdenv.mkDerivation rec { pname = "nauty"; - version = "26r12"; + version = "27r1"; src = fetchurl { url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz"; - sha256 = "1p4mxf8q5wm47nxyskxbqwa5p1vvkycv1zgswvnk9nsn6vff0al6"; + sha256 = "1nym0p2djws8ylkpr0kgpxfa6fxdlh46cmvz0gn5vd02jzgs0aww"; }; outputs = [ "out" "dev" ]; configureFlags = { @@ -37,6 +37,10 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ raskin timokau ]; platforms = platforms.unix; - homepage = http://pallini.di.uniroma1.it/; + # I'm not sure if the filename will remain the same for future changelog or + # if it will track changes to minor releases. Lets see. Better than nothing + # in any case. + changelog = "http://pallini.di.uniroma1.it/changes24-27.txt"; + homepage = "http://pallini.di.uniroma1.it/"; }; } diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index 4912b82d158fe..c0100422c64ac 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -9,16 +9,15 @@ let in stdenv.mkDerivation rec { pname = "palp"; - version = "2.1"; + version = "2.11"; src = fetchurl { url = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/palp-${version}.tar.gz"; - sha256 = "1s7s2lc5f0ig1yy7ygsh3sddm3sbq4mxwybqsj8lp9wjdxs7qfrs"; + sha256 = "0pv3rmgk8xc8z98w173f1jxc1cd67cdl8mjjgmgp3mcvifcfsrjl"; }; hardeningDisable = [ "format" - "strictoverflow" # causes runtime failure (tested in checkPhase) ]; patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' @@ -78,6 +77,9 @@ stdenv.mkDerivation rec { facet enumeration compares well with existing packages. ''; homepage = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/CYpalp.html"; + # Not really a changelog, but a one-line summary of each update that should + # be reviewed on update. + changelog = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/CYpalp.html"; # Just a link on the website pointing to gpl -- now gplv3. When the last # version was released that pointed to gplv2 however, so thats probably # the right license. diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 8f2f740f24830..8b5176c94f693 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -81,8 +81,8 @@ stdenv.mkDerivation rec { run 3 or 4 times faster.) gp2c currently only understands a subset of the GP language. ''; - homepage = http://pari.math.u-bordeaux.fr; - downloadPage = http://pari.math.u-bordeaux.fr/download.html; + homepage = "http://pari.math.u-bordeaux.fr"; + downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ertes raskin AndersonTorres timokau ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix index e743c8ae95b68..4fa63e8edabd3 100644 --- a/pkgs/applications/science/math/pari/gp2c.nix +++ b/pkgs/applications/science/math/pari/gp2c.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gp2c"; - version = "0.0.11pl2"; + version = "0.0.11pl3"; src = fetchurl { url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${pname}-${version}.tar.gz"; - sha256 = "0wqsf05wgkqvmmsx7jinvzdqav6rl56sr8haibgs31nzz4x9xz9g"; + sha256 = "0yymbrgyjw500hqgmkj5m4nmscd7c9rs9w2c96lxgrcyab8krhrm"; }; buildInputs = [ pari perl ]; @@ -25,4 +25,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ]; }; } -# TODO: add it as "source file" for default package diff --git a/pkgs/applications/science/math/pcalc/default.nix b/pkgs/applications/science/math/pcalc/default.nix index 51c93f197e4f8..f372357fe7d8e 100644 --- a/pkgs/applications/science/math/pcalc/default.nix +++ b/pkgs/applications/science/math/pcalc/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "20141224"; src = fetchgit { - url = git://git.code.sf.net/p/pcalc/code; + url = "git://git.code.sf.net/p/pcalc/code"; rev = "181d60d3c880da4344fef7138065943eb3b9255f"; sha256 = "1hd5bh20j5xzvv6qa0fmzmv0h8sf38r7zgi7y0b6nk17pjq33v90"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison flex ]; meta = { - homepage = http://pcalc.sourceforge.net/; + homepage = "http://pcalc.sourceforge.net/"; description = "Programmer's calculator"; license = licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ftrvxmtrx ]; diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index 2d150d0c30e95..55293e6c8a79a 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { around datasets arising from point samples, images, distance matrices and so forth. ''; - homepage = http://www.sas.upenn.edu/~vnanda/perseus/index.html; + homepage = "http://www.sas.upenn.edu/~vnanda/perseus/index.html"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [erikryb]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix index af338c74fd41b..95c2c3931b3cc 100644 --- a/pkgs/applications/science/math/pspp/default.nix +++ b/pkgs/applications/science/math/pspp/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.gnu.org/software/pspp/; + homepage = "https://www.gnu.org/software/pspp/"; description = "A free replacement for SPSS, a program for statistical analysis of sampled data"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index 4022383dbc7db..82e331216712d 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { It is a lite version of GiNaC as well, not implementing all the features of the full GiNaC, and it is *only* meant to be used as a Python library. ''; - homepage = http://pynac.org; + homepage = "http://pynac.org"; license = licenses.gpl3; maintainers = with maintainers; [ timokau ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix index 71d16fb626cd2..fb205a69f0385 100644 --- a/pkgs/applications/science/math/ratpoints/default.nix +++ b/pkgs/applications/science/math/ratpoints/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; - homepage = http://www.mathe2.uni-bayreuth.de/stoll/programs/; + homepage = "http://www.mathe2.uni-bayreuth.de/stoll/programs/"; updateWalker = true; }; } diff --git a/pkgs/applications/science/math/ries/default.nix b/pkgs/applications/science/math/ries/default.nix index b244ee75b304a..4adf3ef2096e0 100644 --- a/pkgs/applications/science/math/ries/default.nix +++ b/pkgs/applications/science/math/ries/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://mrob.com/pub/ries/; + homepage = "https://mrob.com/pub/ries/"; description = "Tool to produce a list of equations that approximately solve to a given number"; platforms = platforms.all; maintainers = with maintainers; [ symphorien ]; diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix index a42a5b710ce06..1c8ced5ed222c 100644 --- a/pkgs/applications/science/math/ripser/default.nix +++ b/pkgs/applications/science/math/ripser/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { #Patch from dev branch to make compilation work. #Will be removed when it gets merged into master. patches = [(fetchurl { - url = https://github.com/Ripser/ripser/commit/dc78d8ce73ee35f3828f0aad67a4e53620277ebf.patch; + url = "https://github.com/Ripser/ripser/commit/dc78d8ce73ee35f3828f0aad67a4e53620277ebf.patch"; sha256 = "1y93aqpqz8fm1cxxrf90dhh67im3ndkr8dnxgbw5y96296n4r924"; })]; @@ -59,7 +59,7 @@ stdenv.mkDerivation { meta = { description = "A lean C++ code for the computation of Vietoris–Rips persistence barcodes"; - homepage = https://github.com/Ripser/ripser; + homepage = "https://github.com/Ripser/ripser"; license = stdenv.lib.licenses.lgpl3; maintainers = with stdenv.lib.maintainers; [erikryb]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/applications/science/math/rofi-calc/default.nix index 842265cf3d5ff..84adb2358d242 100644 --- a/pkgs/applications/science/math/rofi-calc/default.nix +++ b/pkgs/applications/science/math/rofi-calc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "rofi-calc"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "00pz0s99pihjdjy8pl4ckg2qciyp32k439lmjb5iazwck512ar92"; + sha256 = "046x2zpvza7n0m81s75qkvmnpkvsvvyqqqjxcqzj7by0llpqs7wa"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/math/sage/flask-oldsessions.nix b/pkgs/applications/science/math/sage/flask-oldsessions.nix index 0899c93602b93..403dc8708fabb 100644 --- a/pkgs/applications/science/math/sage/flask-oldsessions.nix +++ b/pkgs/applications/science/math/sage/flask-oldsessions.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Provides a session class that works like the one in Flask before 0.10."; license = licenses.bsd2; maintainers = with maintainers; [ timokau ]; - homepage = https://github.com/mitsuhiko/flask-oldsessions; + homepage = "https://github.com/mitsuhiko/flask-oldsessions"; }; } diff --git a/pkgs/applications/science/math/sage/flask-openid.nix b/pkgs/applications/science/math/sage/flask-openid.nix index 9043fabd9b4a9..527173dec80a0 100644 --- a/pkgs/applications/science/math/sage/flask-openid.nix +++ b/pkgs/applications/science/math/sage/flask-openid.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Adds openid support to flask applications"; license = licenses.bsd2; maintainers = with maintainers; [ timokau ]; - homepage = https://pythonhosted.org/Flask-OpenID/; + homepage = "https://pythonhosted.org/Flask-OpenID/"; }; } diff --git a/pkgs/applications/science/math/sage/python-openid.nix b/pkgs/applications/science/math/sage/python-openid.nix index 1bfe02f50df18..4c7fdadadaf04 100644 --- a/pkgs/applications/science/math/sage/python-openid.nix +++ b/pkgs/applications/science/math/sage/python-openid.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "OpenID library for Python"; license = licenses.asl20; maintainers = with maintainers; [ timokau ]; - homepage = https://github.com/openid/python-openid/; + homepage = "https://github.com/openid/python-openid/"; }; } diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index 68e0d134ace20..626e1bf1ea92e 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -41,7 +41,8 @@ , lcalc , rubiks , flintqs -, openblasCompat +, blas +, lapack , flint , gmp , mpfr @@ -53,6 +54,8 @@ , less }: +assert (!blas.isILP64) && (!lapack.isILP64); + # This generates a `sage-env` shell file that will be sourced by sage on startup. # It sets up various environment variables, telling sage where to find its # dependencies. @@ -114,7 +117,7 @@ writeTextFile rec { # testsuite instead, but since all the packages are also runtime # dependencies it doesn't really hurt to include them here. singular - openblasCompat + blas lapack fflas-ffpack givaro gd libpng zlib diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index cd465a8c413a8..4791d12450a93 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -29,6 +29,14 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/patch?id2=8bdc326ba57d1bb9664f63cf165a9e9920cc1afc&id=dc673c17555efca611f68398d5013b66e9825463"; sha256 = "1hhannz7xzprijakn2w2d0rhd5zv2zikik9p51i87bas3nc658f7"; }) + + # `is_unitary` test in `matrix_double_dense.pyx` fails with some BLAS implementations + # https://trac.sagemath.org/ticket/29297 should be included in 9.1 + (fetchpatch { + name = "is_unitary-special-case.patch"; + url = "https://git.sagemath.org/sage.git/patch?id=cc3eb9ffa991e328b09028d32aab7e7cc2ddbb6a"; + sha256 = "0jq4w8hnp5c9q99011ldr4n3knvm1rx2g85z0hidv3i9x868p0ay"; + }) # Unfortunately inclusion in upstream sage was rejected. Instead the bug was # fixed in python, but of course not backported to 2.7. So we'll probably diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 524085e8c0128..87c1e07f5307b 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -2,7 +2,8 @@ , lib , makeWrapper , sage-env -, openblasCompat +, blas +, lapack , pkg-config , three , singular @@ -21,6 +22,9 @@ , pythonEnv }: +# lots of segfaults with (64 bit) blas +assert (!blas.isILP64) && (!lapack.isILP64); + # Wrapper that combined `sagelib` with `sage-env` to produce an actually # executable sage. No tests are run yet and no documentation is built. @@ -29,7 +33,7 @@ let pythonEnv # for patchShebangs makeWrapper pkg-config - openblasCompat # lots of segfaults with regular (64 bit) openblas + blas lapack singular three pynac diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 69f7624078eae..830d806a8bcd3 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -3,7 +3,8 @@ , perl , buildPythonPackage , arb -, openblasCompat +, blas +, lapack , brial , cliquer , cypari2 @@ -52,6 +53,8 @@ , pplpy }: +assert (!blas.isILP64) && (!lapack.isILP64); + # This is the core sage python package. Everything else is just wrappers gluing # stuff together. It is not very useful on its own though, since it will not # find many of its dependencies without `sage-env`, will not be tested without @@ -103,7 +106,8 @@ buildPythonPackage rec { m4rie mpfi ntl - openblasCompat + blas + lapack pari planarity ppl diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index 8e85cece9b286..f9abdee2d1486 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.scilab.org/; + homepage = "http://www.scilab.org/"; description = "Scientific software package for numerical computations (Matlab lookalike)"; # see http://www.scilab.org/legal_notice license = "Scilab"; diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index 02f1f4e58a9d2..24b3feef51e11 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { makeFlags = [ "all" ]; meta = { - homepage = http://www.scilab.org/; + homepage = "http://www.scilab.org/"; description = "Scientific software package for numerical computations (Matlab lookalike)"; # see http://www.scilab.org/legal license = "SciLab"; diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/applications/science/math/scotch/default.nix index 610f1ef05c0fe..75a6b2dba68c3 100644 --- a/pkgs/applications/science/math/scotch/default.nix +++ b/pkgs/applications/science/math/scotch/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { Scotch is a software package for graph and mesh/hypergraph partitioning, graph clustering, and sparse matrix ordering. ''; - homepage = http://www.labri.fr/perso/pelegrin/scotch; + homepage = "http://www.labri.fr/perso/pelegrin/scotch"; license = stdenv.lib.licenses.cecill-c; maintainers = [ stdenv.lib.maintainers.bzizou ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index fccd1489e11ca..a8c4f6bb9a09d 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { # 32 bit x86 fails with some link error: `undefined reference to `__divmoddi4@GCC_7.0.0'` platforms = subtractLists platforms.i686 platforms.unix; license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 - homepage = http://www.singular.uni-kl.de; + homepage = "http://www.singular.uni-kl.de"; downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/"; }; } diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix index 67561658eb256..4bb39ab73f5fe 100644 --- a/pkgs/applications/science/math/speedcrunch/default.nix +++ b/pkgs/applications/science/math/speedcrunch/default.nix @@ -20,7 +20,7 @@ mkDerivation rec { ''; meta = with lib; { - homepage = http://speedcrunch.org; + homepage = "http://speedcrunch.org"; license = licenses.gpl2Plus; description = "A fast power user calculator"; longDescription = '' diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index ec9ea0b85331a..c4fc19d6c6b71 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.cs.waikato.ac.nz/ml/weka/; + homepage = "http://www.cs.waikato.ac.nz/ml/weka/"; description = "Collection of machine learning algorithms for data mining tasks"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.mimame ]; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 4d6e4bea34e6f..a6afc95ac0936 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wxmaxima"; - version = "20.02.4"; + version = "20.04.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "106a7jrjwfmymzj70nsv44fm3jbxngr8pmkaghhpwy0ln38lhf54"; + sha256 = "0vrjxzfgmjdzm1rgl0crz4b4badl14jwh032y3xkcdvjl5j67lp3"; }; buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ]; diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix index ed680b1b4cde1..c19d8f0fbc17c 100644 --- a/pkgs/applications/science/math/yacas/default.nix +++ b/pkgs/applications/science/math/yacas/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Easy to use, general purpose Computer Algebra System"; - homepage = http://www.yacas.org/; + homepage = "http://www.yacas.org/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix index e135534d1acf0..279f602e3fd5d 100644 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = { description = "Medical imaging software with 2D, 3D and 4D capabilities"; - homepage = https://www.aliza-dicom-viewer.com; + homepage = "https://www.aliza-dicom-viewer.com"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ mounium ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 38b9b8ec66d1a..802abae80e1d8 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "Free software for distributed and grid computing"; - homepage = https://boinc.berkeley.edu/; + homepage = "https://boinc.berkeley.edu/"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; # arbitrary choice }; diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index da118f6bca57f..83dff3e08f157 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -1,10 +1,10 @@ -{ mkDerivation, lib, fetchpatch, fetchFromGitHub, cmake, boost, ceres-solver, eigen, +{ mkDerivation, lib, fetchpatch, fetchFromGitHub, cmake, boost17x, ceres-solver, eigen, freeimage, glog, libGLU, glew, qtbase, cudaSupport ? false, cudatoolkit ? null }: assert !cudaSupport || cudatoolkit != null; -let boost_static = boost.override { enableStatic = true; }; +let boost_static = boost17x.override { enableStatic = true; }; in mkDerivation rec { version = "3.5"; @@ -36,7 +36,7 @@ mkDerivation rec { COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. ''; - homepage = https://colmap.github.io/index.html; + homepage = "https://colmap.github.io/index.html"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ lebastr ]; diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index 8ed3deed804c9..0db007f543f3a 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -1,14 +1,23 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ stdenv, fetchurl, jre, makeWrapper, substituteAll, coreutils }: stdenv.mkDerivation rec { pname = "cytoscape"; - version = "3.7.2"; + version = "3.8.0"; src = fetchurl { - url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "125vgr8vqbmy2nsm1yl0h0q8p49lxxqfw5cmxzbx1caklcn4rryc"; + url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz"; + sha256 = "0kksx12m83cjprdygmcc286990byf25yqfx5s7c07cizc21aavyg"; }; + patches = [ + # By default, gen_vmoptions.sh tries to store custom options in $out/share + # at run time. This patch makes sure $HOME is used instead. + (substituteAll { + src = ./gen_vmoptions_to_homedir.patch; + inherit coreutils; + }) + ]; + buildInputs = [jre makeWrapper]; installPhase = '' @@ -25,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.cytoscape.org; + homepage = "http://www.cytoscape.org"; description = "A general platform for complex network analysis and visualization"; license = stdenv.lib.licenses.lgpl21; maintainers = [stdenv.lib.maintainers.mimame]; diff --git a/pkgs/applications/science/misc/cytoscape/gen_vmoptions_to_homedir.patch b/pkgs/applications/science/misc/cytoscape/gen_vmoptions_to_homedir.patch new file mode 100644 index 0000000000000..e31681e8541fd --- /dev/null +++ b/pkgs/applications/science/misc/cytoscape/gen_vmoptions_to_homedir.patch @@ -0,0 +1,19 @@ +diff -Nur a/gen_vmoptions.sh b/gen_vmoptions.sh +--- a/gen_vmoptions.sh 2020-03-30 21:57:47.000000000 +0100 ++++ b/gen_vmoptions.sh 2020-05-05 09:49:57.974989824 +0100 +@@ -1,13 +1,10 @@ + #!/bin/sh + # Generates the Cytoscape.vmoptions file + +-script_path="$(dirname -- $0)" +- +-#vm_options_path="$HOME/.cytoscape" +-vm_options_path=$script_path ++vm_options_path="$HOME/.cytoscape" + + if [ ! -e $vm_options_path ]; then +- /bin/mkdir $vm_options_path ++ @coreutils@/bin/mkdir $vm_options_path + fi + + # Determine amount of physical memory present: diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index 8d0336f582827..18def1d24e2fd 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Curve fitting and peak fitting software"; license = stdenv.lib.licenses.gpl2; - homepage = http://fityk.nieto.pl/; + homepage = "http://fityk.nieto.pl/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/misc/foldingathome/client.nix b/pkgs/applications/science/misc/foldingathome/client.nix index 9a29fde0a4380..74a53902ee09b 100644 --- a/pkgs/applications/science/misc/foldingathome/client.nix +++ b/pkgs/applications/science/misc/foldingathome/client.nix @@ -10,7 +10,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.5.1"; + version = "7.6.9"; fahclient = stdenv.mkDerivation rec { inherit version; @@ -18,7 +18,7 @@ let src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v${majMin}/fahclient_${version}_amd64.deb"; - hash = "sha256-7+RwYdMoZnJZwYFbmLxsN9ozk2P7jpOGZz9qlvTTfSY="; + sha256 = "1v4yijjjdq9qx1fp60flp9ya6ywl9qdsgkzwmzjzp8sd5gfvhyr6"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix index e8eba4c2ab2fd..91c3b8c779cd3 100644 --- a/pkgs/applications/science/misc/foldingathome/control.nix +++ b/pkgs/applications/science/misc/foldingathome/control.nix @@ -8,7 +8,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.5.1"; + version = "7.6.13"; python = python2.withPackages ( @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahcontrol/debian-stable-64bit/v${majMin}/fahcontrol_${version}-1_all.deb"; - hash = "sha256-ydN4I6vmZpI9kD+/TXxgWc+AQqIIlUvABEycWmY1tNg="; + sha256 = "0qfvhwc29cgqkwf2bkhq4gr2d1c4jgccfs58916ss03n4rwz9gng"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix index 03fa54cd73380..cdeed6536efab 100644 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -11,7 +11,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.5.1"; + version = "7.6.13"; in stdenv.mkDerivation rec { inherit version; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahviewer/debian-stable-64bit/v${majMin}/fahviewer_${version}_amd64.deb"; - hash = "sha256-yH0zGjX8aNBEJ5lq7wWydcpp2rO+9Ah++q9eJ+ldeyk="; + sha256 = "09yfvk16j1iwx8h1xg678ks3bc8760gfdn7n32j8r893kd32cwyk"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index 577c8ecfa0586..b6b53013cb4be 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A platform for visualizing and manipulating large graphs"; - homepage = https://gephi.org; + homepage = "https://gephi.org"; license = licenses.gpl3; maintainers = [ maintainers.taeer ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 9b510d432fb30..592e36370e0f4 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Desktop software for the interactive visualisation of plate-tectonics"; - homepage = https://www.gplates.org; + homepage = "https://www.gplates.org"; license = licenses.gpl2; platforms = platforms.all; broken = true; diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix index 6cdc86d20eb28..8bb64932f20ee 100644 --- a/pkgs/applications/science/misc/megam/default.nix +++ b/pkgs/applications/science/misc/megam/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { than the iterative scaling techniques used in almost every other maxent package out there. ''; - homepage = http://www.umiacs.umd.edu/~hal/megam; + homepage = "http://www.umiacs.umd.edu/~hal/megam"; license = "non-commercial"; diff --git a/pkgs/applications/science/misc/netlogo/default.nix b/pkgs/applications/science/misc/netlogo/default.nix index 9b0279bd4d099..af892441a4723 100644 --- a/pkgs/applications/science/misc/netlogo/default.nix +++ b/pkgs/applications/science/misc/netlogo/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { NetLogo is a multi-agent programmable modeling environment. It is used by many tens of thousands of students, teachers and researchers worldwide. ''; - homepage = https://ccl.northwestern.edu/netlogo/index.shtml; + homepage = "https://ccl.northwestern.edu/netlogo/index.shtml"; license = licenses.gpl2; maintainers = [ maintainers.dpaetzel ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index ed4101bdb47ca..50d4dcc1a9ff6 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake, -hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkitgtk, which, +hwloc, jre, lapack, blas, hdf5, expat, ncurses, readline, qt4, webkitgtk, which, lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison, doxygen, boost, openscenegraph, gnome2, xorg, git, bash, gtk2, makeWrapper }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { src = fetchgit (import ./src-main.nix); buildInputs = [autoconf cmake automake libtool gfortran clang gnumake - hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkitgtk which + hwloc jre lapack blas hdf5 expat ncurses readline qt4 webkitgtk which lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison doxygen boost openscenegraph gnome2.gtkglext xorg.libXmu git gtk2 makeWrapper]; @@ -40,7 +40,7 @@ stdenv.mkDerivation { for e in $(cd $out/bin && ls); do wrapProgram $out/bin/$e \ --prefix PATH : "${gnumake}/bin" \ - --prefix LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ liblapack blas ]}" + --prefix LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ lapack blas ]}" done ''; @@ -53,5 +53,3 @@ stdenv.mkDerivation { broken = true; }; } - - diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index 121e953f43af9..aea376301abd7 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "A library for computer-vision scientists and targeted for the Multiple View Geometry community"; - homepage = https://openmvg.readthedocs.io/en/latest/; + homepage = "https://openmvg.readthedocs.io/en/latest/"; license = stdenv.lib.licenses.mpl20; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ mdaiter ]; diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index bb067fbca7a9c..efdd86f0ab2dc 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A library for computer-vision scientists and especially targeted to the Multi-View Stereo reconstruction community"; - homepage = http://cdcseacave.github.io/openMVS/; + homepage = "http://cdcseacave.github.io/openMVS/"; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ mdaiter ]; diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index 839fc8f95463e..5d592c233b621 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Unit-aware calculator"; - homepage = "http://rink.tiffnix.com"; + homepage = "https://rink.tiffnix.com"; license = with licenses; [ mpl20 gpl3 ]; maintainers = with maintainers; [ sb0 filalex77 ]; }; diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 8422eb8752b11..fd06d721ebd1c 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = with stdenv.lib; { - homepage = https://root.cern.ch/; + homepage = "https://root.cern.ch/"; description = "A data analysis framework"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index b901e40a194a9..990952e21acac 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = with stdenv.lib; { - homepage = https://root.cern.ch/; + homepage = "https://root.cern.ch/"; description = "A data analysis framework"; platforms = platforms.unix; maintainers = [ maintainers.veprbl ]; diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix index ed6fa3ae886b1..bbbe80eb65686 100644 --- a/pkgs/applications/science/misc/sasview/default.nix +++ b/pkgs/applications/science/misc/sasview/default.nix @@ -67,7 +67,7 @@ python.pkgs.buildPythonApplication rec { patches = [ ./pyparsing-fix.patch ./local_config.patch ]; meta = with lib; { - homepage = https://www.sasview.org; + homepage = "https://www.sasview.org"; description = "Fitting and data analysis for small angle scattering data"; maintainers = with maintainers; [ rprospero ]; license = licenses.bsd3; diff --git a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix index 8eff2057928aa..42b9560d9b8d7 100644 --- a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix +++ b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "A pdf converter for the ReportLab Toolkit"; - homepage = https://github.com/xhtml2pdf/xhtml2pdf; + homepage = "https://github.com/xhtml2pdf/xhtml2pdf"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ rprospero ]; }; diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index b8aef4bd53fe6..0ba1cd0d2faf4 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { scheduling on distributed computing platforms ranging from simple network of workstations to Computational Grids. ''; - homepage = https://simgrid.org/; + homepage = "https://simgrid.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ mickours mpoquet ]; platforms = ["x86_64-linux"]; diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 34bdaf6bacf80..63a727f9c88ab 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "5.13.0"; + version = "5.17.0"; propagatedBuildInputs = with python3Packages; [ appdirs @@ -22,13 +22,13 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "11snr7sgv70d3y63s5svijfx8f4xpggh96g8chr6lccl4mi1s9x9"; + sha256 = "0y652i3saqq2z61yvk0i6q3lnq2xfrygcxms5gygspj71q2n4f7k"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json meta = with stdenv.lib; { - homepage = "http://snakemake.bitbucket.io"; + homepage = "https://snakemake.readthedocs.io"; license = licenses.mit; description = "Python-based execution environment for make-like workflows"; longDescription = '' diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 3f83f2f30a674..f29cd41169d44 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { data that can be tailored to the problems he or she is addressing. ''; - homepage = http://tulip.labri.fr/; + homepage = "http://tulip.labri.fr/"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 3e7c7a42eb826..0d749bb9be4fc 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { parallel or distributed applications. ''; - homepage = http://vite.gforge.inria.fr/; + homepage = "http://vite.gforge.inria.fr/"; license = stdenv.lib.licenses.cecill20; maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix index b0ed5e9463790..51978e95766d7 100644 --- a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix +++ b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.ccp5.ac.uk/DL_POLY_C; + homepage = "https://www.ccp5.ac.uk/DL_POLY_C"; description = "DL_POLY Classic is a general purpose molecular dynamics simulation package"; license = licenses.bsdOriginal; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index fadd60d9ebbf3..d345827ed4eb6 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation { - name = "gromacs-2020.1"; + name = "gromacs-2020.2"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.1.tar.gz"; - sha256 = "1kwrk3i1dxp8abhqqsl049lh361n4910h0415g052f8shdc6arp1"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.2.tar.gz"; + sha256 = "1wyjgcdl30wy4hy6jvi9lkq53bqs9fgfq6fri52dhnb3c76y8rbl"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index 234bbdab31586..5dc31695c60d7 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, libpng, gzip, fftw, openblas +, libpng, gzip, fftw, blas, lapack , mpi ? null }: let packages = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { inherit packages; }; - buildInputs = [ fftw libpng openblas gzip ] + buildInputs = [ fftw libpng blas lapack gzip ] ++ (stdenv.lib.optionals withMPI [ mpi ]); configurePhase = '' @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { funding from the DOE. It is an open-source code, distributed freely under the terms of the GNU Public License (GPL). ''; - homepage = http://lammps.sandia.gov; + homepage = "http://lammps.sandia.gov"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix new file mode 100644 index 0000000000000..46cc32fa168eb --- /dev/null +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, cmake, git, gfortran, openmpi, blas, liblapack, qt4, qwt6_qt4, pkg-config }: + +stdenv.mkDerivation rec { + pname = "elmerfem"; + version = "8.4"; + + src = fetchFromGitHub { + owner = "elmercsc"; + repo = "elmerfem"; + rev = "release-${version}"; + sha256 = "0vk31lplxlng173q8jjcpbyj1gaf98jvkqjvi9077d1nslya7vpm"; + }; + + hardeningDisable = [ "format" ]; + + nativeBuildInputs = [ cmake pkg-config git ]; + buildInputs = [ gfortran openmpi blas liblapack qt4 qwt6_qt4 ]; + + preConfigure = '' + patchShebangs ./ + ''; + + storepath = placeholder "out"; + + cmakeFlags = [ + "-DELMER_INSTALL_LIB_DIR=${storepath}/lib" + "-DWITH_OpenMP:BOOLEAN=TRUE" + "-DWITH_MPI:BOOLEAN=TRUE" + "-DWITH_ELMERGUI:BOOLEAN=TRUE" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_OpenGL_GL_PREFERENCE=GLVND" + ]; + + patches = [ + ./fix-cmake.patch + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://elmerfem.org/"; + description = "A finite element software for multiphysical problems."; + platforms = platforms.unix; + maintainers = [ maintainers.wulfsta ]; + license = licenses.lgpl21; + }; + +} diff --git a/pkgs/applications/science/physics/elmerfem/fix-cmake.patch b/pkgs/applications/science/physics/elmerfem/fix-cmake.patch new file mode 100644 index 0000000000000..098f65207330d --- /dev/null +++ b/pkgs/applications/science/physics/elmerfem/fix-cmake.patch @@ -0,0 +1,13 @@ +diff --exclude '*~' -ruN A/torch/CMakeLists.txt B/torch/CMakeLists.txt +--- A/fem/tests/CMakeLists.txt 2020-04-23 02:35:03.243388917 -0400 ++++ B/fem/tests/CMakeLists.txt 2018-12-19 20:18:40.671857320 -0400 +@@ -14,7 +14,7 @@ + SET(MESH2D_BIN "${CMAKE_BINARY_DIR}/meshgen2d/src/Mesh2D") + + MACRO(SUBDIRLIST result curdir depth) + set(glob_pattern "*") +- FOREACH(D RANGE 1 depth) ++ FOREACH(D RANGE 1 ${depth}) + FILE(GLOB children RELATIVE ${curdir} ${glob_pattern}) + FOREACH(child ${children}) + IF(IS_DIRECTORY ${curdir}/${child}) diff --git a/pkgs/applications/science/physics/quantomatic/default.nix b/pkgs/applications/science/physics/quantomatic/default.nix index b22b9d412fdc3..a9c83310b2ff4 100644 --- a/pkgs/applications/science/physics/quantomatic/default.nix +++ b/pkgs/applications/science/physics/quantomatic/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A piece of software for reasoning about monoidal theories; in particular, quantum information processing"; license = licenses.gpl3; - homepage = https://quantomatic.github.io/; + homepage = "https://quantomatic.github.io/"; maintainers = with maintainers; [ nickhu ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index 80417f0fcc184..609fea9f7dca5 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = { description = "A standalone contribution to AGILe for steering Pythia 8"; license = stdenv.lib.licenses.gpl2; - homepage = https://agile.hepforge.org/trac/wiki/Sacrifice; + homepage = "https://agile.hepforge.org/trac/wiki/Sacrifice"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index 04115399c1a7a..a672272e9e622 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sherpa"; - version = "2.2.8"; + version = "2.2.10"; src = fetchurl { url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; - sha256 = "1al1imdrknvbcy8k113xysc14lln4msbv281bf0kx7p73wz59mv3"; + sha256 = "1iwa17s8ipj6a2b8zss5csb1k5y9s5js38syvq932rxcinbyjsl4"; }; buildInputs = [ gfortran sqlite lhapdf rivet ]; @@ -21,13 +21,11 @@ stdenv.mkDerivation rec { "--enable-rivet=${rivet}" ]; - CXXFLAGS = "-std=c++11"; # needed for rivet on OSX - - meta = { + meta = with stdenv.lib; { description = "Simulation of High-Energy Reactions of PArticles in lepton-lepton, lepton-photon, photon-photon, lepton-hadron and hadron-hadron collisions"; - license = stdenv.lib.licenses.gpl2; - homepage = https://gitlab.com/sherpa-team/sherpa; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + license = licenses.gpl2; + homepage = "https://gitlab.com/sherpa-team/sherpa"; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; }; } diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 818bea7d0ff53..b992851e40a87 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, liblapack, libyaml, lynx, mela, root5, qcdnum, which }: +{ stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, lapack, libyaml, lynx, mela, root5, qcdnum, which }: stdenv.mkDerivation rec { pname = "xfitter"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran which ]; buildInputs = - [ apfel apfelgrid applgrid blas lhapdf liblapack mela root5 qcdnum ] + [ apfel apfelgrid applgrid blas lhapdf lapack mela root5 qcdnum ] # pdf2yaml requires fmemopen and open_memstream which are not readily available on Darwin ++ stdenv.lib.optional (!stdenv.isDarwin) libyaml ; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The xFitter project is an open source QCD fit framework ready to extract PDFs and assess the impact of new data"; license = licenses.gpl3; - homepage = https://www.xfitter.org/xFitter; + homepage = "https://www.xfitter.org/xFitter"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index 2c0bb84c801f4..4eeca5c1759bc 100644 --- a/pkgs/applications/science/programming/fdr/default.nix +++ b/pkgs/applications/science/programming/fdr/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "fdr-4.2.3"; src = fetchurl { - url = https://www.cs.ox.ac.uk/projects/fdr/downloads/fdr-3789-linux-x86_64.tar.gz; + url = "https://www.cs.ox.ac.uk/projects/fdr/downloads/fdr-3789-linux-x86_64.tar.gz"; sha256 = "0n2yqichym5xdawlgk3r7yha88k7ycnx6585jfrcm7043sls1i88"; }; @@ -59,7 +59,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.cs.ox.ac.uk/projects/fdr/; + homepage = "https://www.cs.ox.ac.uk/projects/fdr/"; description = "The CSP refinement checker"; license = licenses.unfreeRedistributable; platforms = platforms.linux; diff --git a/pkgs/applications/science/programming/groove/default.nix b/pkgs/applications/science/programming/groove/default.nix index e854f20d39a3e..87b7b02317a27 100644 --- a/pkgs/applications/science/programming/groove/default.nix +++ b/pkgs/applications/science/programming/groove/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GRaphs for Object-Oriented VErification"; - homepage = http://groove.cs.utwente.nl/; + homepage = "http://groove.cs.utwente.nl/"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/science/programming/scyther/default.nix b/pkgs/applications/science/programming/scyther/default.nix index b4daae1afc040..5cfe081072a4e 100644 --- a/pkgs/applications/science/programming/scyther/default.nix +++ b/pkgs/applications/science/programming/scyther/default.nix @@ -14,7 +14,7 @@ let meta = with lib; { description = "Scyther is a tool for the automatic verification of security protocols."; - homepage = https://www.cs.ox.ac.uk/people/cas.cremers/scyther/; + homepage = "https://www.cs.ox.ac.uk/people/cas.cremers/scyther/"; license = licenses.gpl2; maintainers = with maintainers; [ infinisil ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix index 0bc58c50335a0..ede698e2b0b4f 100644 --- a/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -46,7 +46,7 @@ mkDerivation rec { A GUI ground control station for autonomous vehicles using the MAVLink protocol. Includes support for the APM and PX4 based controllers. ''; - homepage = https://ardupilot.org/planner2/; + homepage = "https://ardupilot.org/planner2/"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ wucke13 ]; }; diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 31295114375df..4684ba8c1937b 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { Various types of aircraft are supported by the tool and by Betaflight, e.g. quadcopters, hexacopters, octocopters and fixed-wing aircraft. ''; - homepage = https://github.com/betaflight/betaflight/wiki; + homepage = "https://github.com/betaflight/betaflight/wiki"; license = licenses.gpl3; maintainers = with maintainers; [ wucke13 ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix index a3ebda463b913..86572e73c7563 100644 --- a/pkgs/applications/science/robotics/gazebo/default.nix +++ b/pkgs/applications/science/robotics/gazebo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, boost, protobuf, freeimage , boost-build, boost_process , xorg_sys_opengl, tbb, ogre, tinyxml-2 - , libtar, glxinfo, libusb, libxslt, ignition + , libtar, glxinfo, libusb-compat-0_1, libxslt, ignition , pythonPackages, utillinux # these deps are hidden; cmake doesn't catch them @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { tinyxml-2 libtar glxinfo - libusb + libusb-compat-0_1 libxslt ignition.math2 sdformat @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ++ optional withHdf5Support hdf5; meta = with stdenv.lib; { - homepage = http://gazebosim.org/; + homepage = "http://gazebosim.org/"; description = "Multi-robot simulator for outdoor environments"; license = licenses.asl20; maintainers = with maintainers; [ pxc ]; diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 0348d0153099e..c354dad804286 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.18"; + version = "1.8.19"; src = fetchPypi { inherit pname version; - sha256 = "1fi4m3591wws5cq43q8aljf91mzs6i9yhn9rimhpfrskbyf9knvm"; + sha256 = "1rbq2nm01212rp5xbl8p8kjl2mpgfppkwjsq3lnfw1v6g0m4359h"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix index d14c0bb0fe81e..df2c569a31c75 100644 --- a/pkgs/applications/science/robotics/yarp/default.nix +++ b/pkgs/applications/science/robotics/yarp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Yet Another Robot Platform"; - homepage = http://yarp.it; + homepage = "http://yarp.it"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix index 9d1da21492a27..9bf00801600ff 100644 --- a/pkgs/applications/search/doodle/default.nix +++ b/pkgs/applications/search/doodle/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = https://grothoff.org/christian/doodle/; + homepage = "https://grothoff.org/christian/doodle/"; description = "Tool to quickly index and search documents on a computer"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/search/grepcidr/default.nix b/pkgs/applications/search/grepcidr/default.nix index 06b2aee039205..125e67938ecde 100644 --- a/pkgs/applications/search/grepcidr/default.nix +++ b/pkgs/applications/search/grepcidr/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Filter IPv4 and IPv6 addresses matching CIDR patterns"; - homepage = http://www.pc-tools.net/unix/grepcidr/; + homepage = "http://www.pc-tools.net/unix/grepcidr/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.fadenb ]; diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/applications/search/grepm/default.nix index bad8d35623c09..d03d26d00004d 100644 --- a/pkgs/applications/search/grepm/default.nix +++ b/pkgs/applications/search/grepm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Wrapper for grepmail utilizing mutt"; - homepage = http://www.barsnick.net/sw/grepm.html; + homepage = "http://www.barsnick.net/sw/grepm.html"; license = licenses.free; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 06f3733c8f79e..425e82000b79f 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { Recoll is an Xapian frontend that can search through files, archive members, email attachments. ''; - homepage = https://www.lesbonscomptes.com/recoll/; + homepage = "https://www.lesbonscomptes.com/recoll/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.jcumming ]; diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 139a49d950533..ee1198c176f63 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -18,13 +18,14 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.6.2"; + version = "0.7.2"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "0cqzxlzdbij26qgbbngqx6njcpcymkgvm29b7ipldgkssxp1mkkg"; + sha256 ="1gd2i7gja4k9j4xac8jnls3v41d6qqhmqradz2jbsxwm2sk3cgcf"; + fetchSubmodules = true; }; nativeBuildInputs = [ @@ -61,8 +62,13 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Manage processes and monitor system resources"; + longDescription = '' + Manage processes and monitor system resources. + To use the wingpanel indicator in this application, see the Pantheon + section in the NixOS manual. + ''; homepage = "https://github.com/stsdc/monitor"; - maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/version-management/arch/default.nix b/pkgs/applications/version-management/arch/default.nix index bc62004065b34..c161d8446acfb 100644 --- a/pkgs/applications/version-management/arch/default.nix +++ b/pkgs/applications/version-management/arch/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, which, diffutils, gnupatch, gnutar }: stdenv.mkDerivation rec { - name = "tla-1.3.5"; - + pname = "tla"; + version = "1.3.5"; + src = fetchurl { - url = "ftp://ftp.gnu.org/old-gnu/gnu-arch/" + name + ".tar.gz"; + url = "https://ftp.gnu.org/old-gnu/gnu-arch/tla-${version}.tar.gz"; sha256 = "01mfzj1i6p4s8191cgd5850hds1zls88hkf9rb6qx1vqjv585aj0"; }; patches = [ ./configure-tmpdir.patch ]; - buildInputs = [which]; - - propagatedBuildInputs = [diffutils gnupatch gnutar]; + buildInputs = [ which ]; + + propagatedBuildInputs = [ diffutils gnupatch gnutar ]; # Instead of GNU Autoconf, tla uses Tom Lord's now # defunct `package-framework'. @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU Arch (aka. `tla'), a distributed revision control system"; - homepage = https://www.gnu.org/software/gnu-arch/; + homepage = "https://www.gnu.org/software/gnu-arch/"; license = "GPL"; }; } diff --git a/pkgs/applications/version-management/bazaar/CVE-2017-14176.patch b/pkgs/applications/version-management/bazaar/CVE-2017-14176.patch deleted file mode 100644 index a34ab0c6eb10b..0000000000000 --- a/pkgs/applications/version-management/bazaar/CVE-2017-14176.patch +++ /dev/null @@ -1,149 +0,0 @@ -diff --git a/bzrlib/tests/test_ssh_transport.py b/bzrlib/tests/test_ssh_transport.py -index 9e37c3b..fe9f219 100644 ---- a/bzrlib/tests/test_ssh_transport.py -+++ b/bzrlib/tests/test_ssh_transport.py -@@ -22,6 +22,7 @@ from bzrlib.transport.ssh import ( - SSHCorpSubprocessVendor, - LSHSubprocessVendor, - SSHVendorManager, -+ StrangeHostname, - ) - - -@@ -161,6 +162,19 @@ class SSHVendorManagerTests(TestCase): - - class SubprocessVendorsTests(TestCase): - -+ def test_openssh_command_tricked(self): -+ vendor = OpenSSHSubprocessVendor() -+ self.assertEqual( -+ vendor._get_vendor_specific_argv( -+ "user", "-oProxyCommand=blah", 100, command=["bzr"]), -+ ["ssh", "-oForwardX11=no", "-oForwardAgent=no", -+ "-oClearAllForwardings=yes", -+ "-oNoHostAuthenticationForLocalhost=yes", -+ "-p", "100", -+ "-l", "user", -+ "--", -+ "-oProxyCommand=blah", "bzr"]) -+ - def test_openssh_command_arguments(self): - vendor = OpenSSHSubprocessVendor() - self.assertEqual( -@@ -171,6 +185,7 @@ class SubprocessVendorsTests(TestCase): - "-oNoHostAuthenticationForLocalhost=yes", - "-p", "100", - "-l", "user", -+ "--", - "host", "bzr"] - ) - -@@ -184,9 +199,16 @@ class SubprocessVendorsTests(TestCase): - "-oNoHostAuthenticationForLocalhost=yes", - "-p", "100", - "-l", "user", -- "-s", "host", "sftp"] -+ "-s", "--", "host", "sftp"] - ) - -+ def test_openssh_command_tricked(self): -+ vendor = SSHCorpSubprocessVendor() -+ self.assertRaises( -+ StrangeHostname, -+ vendor._get_vendor_specific_argv, -+ "user", "-oProxyCommand=host", 100, command=["bzr"]) -+ - def test_sshcorp_command_arguments(self): - vendor = SSHCorpSubprocessVendor() - self.assertEqual( -@@ -209,6 +231,13 @@ class SubprocessVendorsTests(TestCase): - "-s", "sftp", "host"] - ) - -+ def test_lsh_command_tricked(self): -+ vendor = LSHSubprocessVendor() -+ self.assertRaises( -+ StrangeHostname, -+ vendor._get_vendor_specific_argv, -+ "user", "-oProxyCommand=host", 100, command=["bzr"]) -+ - def test_lsh_command_arguments(self): - vendor = LSHSubprocessVendor() - self.assertEqual( -@@ -231,6 +260,13 @@ class SubprocessVendorsTests(TestCase): - "--subsystem", "sftp", "host"] - ) - -+ def test_plink_command_tricked(self): -+ vendor = PLinkSubprocessVendor() -+ self.assertRaises( -+ StrangeHostname, -+ vendor._get_vendor_specific_argv, -+ "user", "-oProxyCommand=host", 100, command=["bzr"]) -+ - def test_plink_command_arguments(self): - vendor = PLinkSubprocessVendor() - self.assertEqual( -diff --git a/bzrlib/transport/ssh.py b/bzrlib/transport/ssh.py -index eecaa26..6f22341 100644 ---- a/bzrlib/transport/ssh.py -+++ b/bzrlib/transport/ssh.py -@@ -46,6 +46,10 @@ else: - from paramiko.sftp_client import SFTPClient - - -+class StrangeHostname(errors.BzrError): -+ _fmt = "Refusing to connect to strange SSH hostname %(hostname)s" -+ -+ - SYSTEM_HOSTKEYS = {} - BZR_HOSTKEYS = {} - -@@ -360,6 +364,11 @@ class SubprocessVendor(SSHVendor): - # tests, but beware of using PIPE which may hang due to not being read. - _stderr_target = None - -+ @staticmethod -+ def _check_hostname(arg): -+ if arg.startswith('-'): -+ raise StrangeHostname(hostname=arg) -+ - def _connect(self, argv): - # Attempt to make a socketpair to use as stdin/stdout for the SSH - # subprocess. We prefer sockets to pipes because they support -@@ -424,9 +433,9 @@ class OpenSSHSubprocessVendor(SubprocessVendor): - if username is not None: - args.extend(['-l', username]) - if subsystem is not None: -- args.extend(['-s', host, subsystem]) -+ args.extend(['-s', '--', host, subsystem]) - else: -- args.extend([host] + command) -+ args.extend(['--', host] + command) - return args - - register_ssh_vendor('openssh', OpenSSHSubprocessVendor()) -@@ -439,6 +448,7 @@ class SSHCorpSubprocessVendor(SubprocessVendor): - - def _get_vendor_specific_argv(self, username, host, port, subsystem=None, - command=None): -+ self._check_hostname(host) - args = [self.executable_path, '-x'] - if port is not None: - args.extend(['-p', str(port)]) -@@ -460,6 +470,7 @@ class LSHSubprocessVendor(SubprocessVendor): - - def _get_vendor_specific_argv(self, username, host, port, subsystem=None, - command=None): -+ self._check_hostname(host) - args = [self.executable_path] - if port is not None: - args.extend(['-p', str(port)]) -@@ -481,6 +492,7 @@ class PLinkSubprocessVendor(SubprocessVendor): - - def _get_vendor_specific_argv(self, username, host, port, subsystem=None, - command=None): -+ self._check_hostname(host) - args = [self.executable_path, '-x', '-a', '-ssh', '-2', '-batch'] - if port is not None: - args.extend(['-P', str(port)]) diff --git a/pkgs/applications/version-management/bazaar/add_certificates.patch b/pkgs/applications/version-management/bazaar/add_certificates.patch deleted file mode 100644 index 18fac36daec5f..0000000000000 --- a/pkgs/applications/version-management/bazaar/add_certificates.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru orig/bzrlib/transport/http/_urllib2_wrappers.py bzr-2.7.0/bzrlib/transport/http/_urllib2_wrappers.py ---- orig/bzr-2.7.0/bzrlib/transport/http/_urllib2_wrappers.py 2016-02-01 20:49:17.000000000 +0100 -+++ bzr-2.7.0/bzrlib/transport/http/_urllib2_wrappers.py 2016-06-18 23:15:21.089511349 +0200 -@@ -95,6 +95,7 @@ - u"/usr/local/share/certs/ca-root-nss.crt", # FreeBSD - # XXX: Needs checking, can't trust the interweb ;) -- vila 2012-01-25 - u'/etc/openssl/certs/ca-certificates.crt', # Solaris -+ u'@certPath@', - ] - - diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix deleted file mode 100644 index 097c1e86a8978..0000000000000 --- a/pkgs/applications/version-management/bazaar/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, python2Packages -, withSFTP ? true - }: - -python2Packages.buildPythonApplication rec { - version = "2.7"; - release = ".0"; - name = "bazaar-${version}${release}"; - - src = fetchurl { - url = "https://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz"; - sha256 = "1cysix5k3wa6y7jjck3ckq3abls4gvz570s0v0hxv805nwki4i8d"; - }; - - doCheck = false; - - propagatedBuildInputs = [] - ++ stdenv.lib.optionals withSFTP [ python2Packages.paramiko ]; - - patches = [ - # Bazaar can't find the certificates alone - ./add_certificates.patch - ./CVE-2017-14176.patch - ]; - postPatch = '' - substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \ - --subst-var-by certPath /etc/ssl/certs/ca-certificates.crt - ''; - - meta = with stdenv.lib; { - homepage = http://bazaar-vcs.org/; - description = "A distributed version control system that Just Works"; - platforms = platforms.unix; - license = licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix deleted file mode 100644 index 0dfa19882028b..0000000000000 --- a/pkgs/applications/version-management/bazaar/tools.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, python2Packages }: - -python2Packages.buildPythonApplication rec { - pname = "bzr-tools"; - version = "2.6.0"; - - src = fetchurl { - url = "https://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz"; - sha256 = "0n3zzc6jf5866kfhmrnya1vdr2ja137a45qrzsz8vz6sc6xgn5wb"; - }; - - doCheck = false; - - meta = with stdenv.lib; { - description = "Bazaar plugins"; - homepage = http://wiki.bazaar.canonical.com/BzrTools; - platforms = platforms.unix; - license = licenses.gpl2; - }; -} diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index d8a6ec058448a..d9a98ecce2859 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -1,12 +1,12 @@ -{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, gnome2, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qtbase, stdenv, runtimeShell }: +{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, pango, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qtbase, stdenv, runtimeShell }: stdenv.mkDerivation rec { pname = "bcompare"; - version = "4.3.2.24472"; + version = "4.3.4.24657"; src = fetchurl { url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb"; - sha256 = "1msygg01yi0n8lpk8sl226p09ls7wvd3z3k067mdgrss8rjy5va5"; + sha256 = "031ivmpy0mk43skb30r7p5zwf0m90pmsqhaq5kc08gzy6g4s0wd0"; }; unpackPhase = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc.lib gtk2 - gnome2.pango + pango cairo kio kservice diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix index e092a604142ce..78f62ebcf25cf 100644 --- a/pkgs/applications/version-management/bitkeeper/default.nix +++ b/pkgs/applications/version-management/bitkeeper/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { BitKeeper is a fast, enterprise-ready, distributed SCM that scales up to very large projects and down to tiny ones. ''; - homepage = https://www.bitkeeper.org/; + homepage = "https://www.bitkeeper.org/"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ wscott thoughtpolice ]; diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index fd4c9793d38b4..5d3c3976f3ff4 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -7,17 +7,17 @@ with stdenv; with lib; mkDerivation rec { name = "cvs-fast-export-${meta.version}"; meta = { - version = "1.51"; + version = "1.53"; description = "Export an RCS or CVS history as a fast-import stream"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dfoxfranke ]; - homepage = http://www.catb.org/esr/cvs-fast-export/; + homepage = "http://www.catb.org/esr/cvs-fast-export/"; platforms = platforms.all; }; src = fetchurl { - url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.51.tar.gz"; - sha256 = "0nn5cf8syb5nbjvkn8w561pk25clv187h4hs9pnc700g9w56chzf"; + url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.53.tar.gz"; + sha256 = "01zda8qbi9cm2p23cxw0h5cx55ysr0v7dzzbpx9qa19wpv75kisb"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 2063149dd784e..07a6b7c993c87 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "cvs-1.12.13"; src = fetchurl { - url = mirror://savannah/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2; + url = "mirror://savannah/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2"; sha256 = "0pjir8cwn0087mxszzbsi1gyfc6373vif96cw4q3m1x6p49kd1bq"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation { doCheck = false; # fails 1 of 1 tests meta = with stdenv.lib; { - homepage = http://cvs.nongnu.org; + homepage = "http://cvs.nongnu.org"; description = "Concurrent Versions System - a source control system"; license = licenses.gpl2; # library is GPLv2, main is GPLv1 platforms = platforms.all; diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index 4c818060d2204..ae1929565b6ef 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, makeWrapper , python2Packages -, cvs, subversion, git, bazaar +, cvs, subversion, git, breezy }: python2Packages.buildPythonApplication rec { @@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec { buildInputs = [ makeWrapper ]; - checkInputs = [ subversion git bazaar ]; + checkInputs = [ subversion git breezy ]; checkPhase = "python run-tests.py"; @@ -29,7 +29,7 @@ python2Packages.buildPythonApplication rec { meta = with lib; { description = "A tool to convert CVS repositories to Subversion repositories"; - homepage = http://cvs2svn.tigris.org/; + homepage = "http://cvs2svn.tigris.org/"; maintainers = [ maintainers.makefu ]; platforms = platforms.unix; license = licenses.asl20; diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix index 71130a2e28302..133d8d7cbb4e6 100644 --- a/pkgs/applications/version-management/cvsps/default.nix +++ b/pkgs/applications/version-management/cvsps/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { changes made to a collection of files, and all committed at the same time (using a single "cvs commit" command). ''; - homepage = http://www.cobite.com/cvsps/; + homepage = "http://www.cobite.com/cvsps/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/version-management/cvsq/default.nix b/pkgs/applications/version-management/cvsq/default.nix index c030d8b087846..a39c9ede5243f 100644 --- a/pkgs/applications/version-management/cvsq/default.nix +++ b/pkgs/applications/version-management/cvsq/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { repository. This is useful for commands like log, diff, etc; however it cannot be used for commits (that's what cvsq is for). ''; - homepage = https://www.linta.de/~aehlig/cvsq/; + homepage = "https://www.linta.de/~aehlig/cvsq/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ clkamp ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index fe10551771cfe..b9ac8b139cbb6 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -59,7 +59,7 @@ buildPythonApplication rec { meta = with lib; { description = "Version Control System for Machine Learning Projects"; license = licenses.asl20; - homepage = https://dvc.org; + homepage = "https://dvc.org"; maintainers = with maintainers; [ cmcdragonkai ]; }; } diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 8a41221a2671e..fa715884b6019 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { many such systems in use today. Fossil strives to distinguish itself from the others by being extremely simple to setup and operate. ''; - homepage = http://www.fossil-scm.org/; + homepage = "http://www.fossil-scm.org/"; license = stdenv.lib.licenses.bsd2; platforms = with stdenv.lib.platforms; all; maintainers = [ #Add your name here! diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix index 0d77296841636..b225782f28646 100644 --- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -27,7 +27,7 @@ in ''; meta = with stdenv.lib; { - homepage = https://rtyley.github.io/bfg-repo-cleaner/; + homepage = "https://rtyley.github.io/bfg-repo-cleaner/"; # Descriptions taken with minor modification from the homepage of bfg-repo-cleaner description = "Removes large or troublesome blobs in a git repository like git-filter-branch does, but faster"; longDescription = '' diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix index fda89e331809e..68edb8503bfcc 100644 --- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix @@ -13,7 +13,7 @@ bundlerEnv rec { meta = with lib; { description = "A command line interface to interact with BitBucket Server (formerly Atlassian Stash)"; - homepage = https://bitbucket.org/atlassian/bitbucket-server-cli; + homepage = "https://bitbucket.org/atlassian/bitbucket-server-cli"; license = licenses.mit; maintainers = with maintainers; [ jgertm nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 2039265506288..8debc642b4573 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,35 +1,27 @@ -{ stdenv, fetchurl, fetchpatch, openssl, zlib, asciidoc, libxml2, libxslt +{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt , docbook_xsl, pkgconfig, luajit , coreutils, gnused, groff, docutils -, gzip, bzip2, xz +, gzip, bzip2, lzip, xz, zstd , python, wrapPython, pygments, markdown }: stdenv.mkDerivation rec { pname = "cgit"; - version = "1.2.1"; + version = "1.2.3"; src = fetchurl { url = "https://git.zx2c4.com/cgit/snapshot/${pname}-${version}.tar.xz"; - sha256 = "1gw2j5xc5qdx2hwiwkr8h6kgya7v9d9ff9j32ga1dys0cca7qm1w"; + sha256 = "193d990ym10qlslk0p8mjwp2j6rhqa7fq0y1iff65lvbyv914pss"; }; # cgit is tightly coupled with git and needs a git source tree to build. # IMPORTANT: Remember to check which git version cgit needs on every version # bump (look for "GIT_VER" in the top-level Makefile). gitSrc = fetchurl { - url = "mirror://kernel/software/scm/git/git-2.18.0.tar.xz"; - sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b"; + url = "mirror://kernel/software/scm/git/git-2.25.1.tar.xz"; + sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; }; - patches = [ - (fetchpatch { - name = "prevent-dos-limit-path-length.patch"; - url = "https://git.zx2c4.com/cgit/patch/?id=54c407a74a35d4ee9ffae94cc5bc9096c9f7f54a"; - sha256 = "1qlbpqsc293lmc9hzwf1j4jr5qlv8cm1r249v3yij5s4wki1595j"; - }) - ]; - nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ]; buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit @@ -39,7 +31,9 @@ stdenv.mkDerivation rec { postPatch = '' sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \ -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \ + -e 's|"lzip"|"${lzip}/bin/lzip"|' \ -e 's|"xz"|"${xz.bin}/bin/xz"|' \ + -e 's|"zstd"|"${zstd}/bin/zstd"|' \ -i ui-snapshot.c substituteInPlace filters/html-converters/man2html \ @@ -76,8 +70,8 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://git.zx2c4.com/cgit/about/; - repositories.git = git://git.zx2c4.com/cgit; + homepage = "https://git.zx2c4.com/cgit/about/"; + repositories.git = "git://git.zx2c4.com/cgit"; description = "Web frontend for git repositories"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix index 454458cdec662..22d289d549af9 100644 --- a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation { meta = { description = "Converts a Darcs repository into a Git repository"; - homepage = http://www.sanityinc.com/articles/converting-darcs-repositories-to-git; + homepage = "http://www.sanityinc.com/articles/converting-darcs-repositories-to-git"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 8f46d9550f80f..9c0e0d74d2215 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -167,15 +167,21 @@ let gita = python3Packages.callPackage ./gita {}; + gitbatch = callPackage ./gitbatch { }; + gitflow = callPackage ./gitflow { }; + gitin = callPackage ./gitin { }; + gitstatus = callPackage ./gitstatus { }; + gitui = callPackage ./gitui { + inherit (darwin.apple_sdk.frameworks) Security; + }; + grv = callPackage ./grv { }; - hub = callPackage ./hub { - inherit (darwin) Security; - }; + hub = callPackage ./hub { }; lab = callPackage ./lab { }; diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index dff06d384dc77..60950dc0465ce 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -1,17 +1,26 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform, llvmPackages, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.0.17"; + version = "0.1.1"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "1j01h60snciqp4psyxf67j3gbmi02c1baprsg9frzjacawbx8cz7"; + sha256 = "1b5ap468d0gvgwkx6wqxvayzda2xw95lymd0kl38nq1fc0ica6hk"; }; - cargoSha256 = "176bfd57gc9casvk0p10ilvzw3q3rkkv7qflja778vrwr9zrmkzq"; + LLVM_CONFIG_PATH = "${llvmPackages.llvm}/bin/llvm-config"; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + + cargoSha256 = "07mjl751r9d88fnmnan0ip0m3vxqf51vq2y7k3g3yywcgasj9jgr"; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --bash --name delta.bash completion/bash/completion.sh + ''; meta = with lib; { homepage = "https://github.com/dandavison/delta"; diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index 96216e76fd315..c073edaee7d83 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diff-so-fancy"; - version = "1.2.7"; + version = "1.3.0"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "0y5cp236gi6h7llzai5d27086l4zz58mz1zs01r97xnnmjs9vw21"; + sha256 = "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl"; }; # Perl is needed here for patchShebangs @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/so-fancy/diff-so-fancy; + homepage = "https://github.com/so-fancy/diff-so-fancy"; description = "Good-looking diffs filter for git"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index c9fd33312d721..22009f10d44f7 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "190107"; src = fetchgit { - url = git://repo.or.cz/fast-export.git; + url = "git://repo.or.cz/fast-export.git"; rev = "v${version}"; sha256 = "14azfps9jd5anivcvfwflgsvqdyy6gm9jy284kzx2ng9f7871d14"; }; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Import mercurial into git"; - homepage = https://repo.or.cz/w/fast-export.git; + homepage = "https://repo.or.cz/w/fast-export.git"; license = licenses.gpl2; maintainers = [ maintainers.koral ]; platforms = platforms.unix; diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index acd09f0d0c0de..2386ac87ceab0 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gh"; - version = "0.6.4"; + version = "0.8.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "0na8zfvcmdy968i47x6qd1jwfaphy5h18ff7ym5sxyia9a27yhf8"; + sha256 = "08fy3677yq52x40rab49ijhw4r25ls2807dbv9wpna6w07n7r8v7"; }; - modSha256 = "102v30wr9wmd6n20qdvgs5mp2s639pwbqqd71r8q52f42p694bi1"; + vendorSha256 = "0s99bjmsafnzhl3s2lcybxgsw1s4i1h3vh6p40gz4vsfhndidqrq"; buildFlagsArray = [ - "-ldflags=-X github.com/cli/cli/command.Version=${version}" + "-ldflags=-s -w -X github.com/cli/cli/command.Version=${version}" ]; subPackages = [ "cmd/gh" ]; @@ -33,4 +33,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ zowoq ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index d0c468ab68ea4..3401e851b31b8 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1i0q9lxdxbyj0l0510cbkwkbycawrx8cxlbdrhb2p2fnk0vqnyiv"; }; - modSha256 = "0hlbhky3c6zva9khn73n6xgq57k5p8anskxy3g2m0wzhr72cyc41"; + vendorSha256 = "1r8lvy2xk0gvlwy6k86wh14ajb6hgs9f1fwfqk17ra1cb404l2lz"; buildFlagsArray = '' -ldflags= @@ -25,8 +25,8 @@ buildGoModule rec { meta = { description = "Remote repository management made easy"; - homepage = https://github.com/x-motemen/ghq; + homepage = "https://github.com/x-motemen/ghq"; maintainers = with stdenv.lib.maintainers; [ sigma ]; license = stdenv.lib.licenses.mit; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index 3f5cbad4c12ff..d476b896601c7 100644 --- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -1,19 +1,25 @@ -{ stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: +{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "tummychow"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "0lggv3knh6iglkh8x2zqvqcs3dlwfsdiclg7pmdrycny72la4k2j"; + sha256 = "1da6h9hf98dnnqw9jpnj1x2gr7psmsa8219gpamylfg1ifk28rkr"; }; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; - cargoSha256 = "13gikjswbb0kkpvb5zhj88qq5l667624gkfb7hd3zygh4qyhsy05"; + cargoSha256 = "1ba43m5ndyj4hwwfyg0c2hwv3ad7kzhrr7cvymsgaj2dxl7bif4w"; + + postInstall = '' + installManPage Documentation/git-absorb.1 + ''; meta = with stdenv.lib; { homepage = "https://github.com/tummychow/git-absorb"; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix index 3118eaab19b43..ad07a3dba3c8c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyqt5 git-annex-adapter ]; meta = with stdenv.lib; { - homepage = https://github.com/alpernebbi/git-annex-metadata-gui; + homepage = "https://github.com/alpernebbi/git-annex-metadata-gui"; description = "Graphical interface for git-annex metadata commands"; maintainers = with maintainers; [ dotlambda ]; license = licenses.gpl3Plus; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix index 8dd44287b5090..addfd1f5041b1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { meta = with lib; { description = "A git-annex special remote for Dropbox"; - homepage = https://pypi.org/project/git-annex-remote-dbx/; + homepage = "https://pypi.org/project/git-annex-remote-dbx/"; license = licenses.mit; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix index 5d4d9b86d83f4..260e8024a8cca 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/DanielDent/git-annex-remote-rclone; + homepage = "https://github.com/DanielDent/git-annex-remote-rclone"; description = "Use rclone supported cloud storage providers with git-annex"; license = licenses.gpl3; maintainers = [ maintainers.montag451 ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix index 081341957035e..bcfc33e55e4ca 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "git-annex-utils"; version = "0.04-3-g531bb33"; src = fetchgit { - url = http://git.mysteryvortex.com/repositories/git-annex-utils.git; + url = "http://git.mysteryvortex.com/repositories/git-annex-utils.git"; rev = "531bb33"; sha256 = "1sv7s2ykc840cjwbfn7ayy743643x9i1lvk4cd55w9l052xvzj65"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { This is a set of utilities that are handy to use with git-annex repositories. Currently there is only one utility gadu, a du like utility for annexed files. ''; - homepage = http://git-annex.mysteryvortex.com/git-annex-utils.html; + homepage = "http://git-annex.mysteryvortex.com/git-annex-utils.html"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ woffs ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix index daa0af43879db..7796f08c8a46e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = { description = "Distributed code review system for Git repos"; - homepage = https://github.com/google/git-appraise; + homepage = "https://github.com/google/git-appraise"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.vdemeester ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix index 32b9c8a980dcd..cd35c98a96965 100644 --- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix @@ -22,7 +22,7 @@ python2Packages.buildPythonApplication rec { meta = { description = "Tool for visualization of Git repositories"; - homepage = https://github.com/esc/git-big-picture; + homepage = "https://github.com/esc/git-big-picture"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.nthorne ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index ed0c8680d7530..0903af7499a70 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "git-bug"; - version = "0.7.0"; - rev = "71580c41a931a1ad2c04682e0fd701661b716c95"; + version = "0.7.1"; # the `rev` below pins the version of the source to get + rev = "2d64b85db71a17ff3277bbbf7ac9d8e81f8e416c"; goPackagePath = "github.com/MichaelMure/git-bug"; src = fetchFromGitHub { inherit rev; owner = "MichaelMure"; repo = "git-bug"; - sha256 = "0mhqvcwa6y3hrrv88vbp22k7swzr8xw6ipm80gdpx85yp8j2wdkh"; + sha256 = "01ab3mlwh5g1vr3x85fppflg18gb8ip9mjfsp2b5rfigd9lxyyns"; }; - modSha256 = "1cfn49cijiarzzczrpd28x1k7ib98xyzlvn3zghwk2ngfgiah3ld"; + vendorSha256 = "0c8b47lj4wl3s21lm0vx4z7hznylm8c4fb8b8gxm278kn3zys607"; buildFlagsArray = '' - -ldflags= + -ldflags= -X ${goPackagePath}/commands.GitCommit=${rev} -X ${goPackagePath}/commands.GitLastTag=${version} -X ${goPackagePath}/commands.GitExactTag=${version} @@ -30,9 +30,9 @@ buildGoModule rec { meta = with stdenv.lib; { description = "Distributed bug tracker embedded in Git"; - homepage = https://github.com/MichaelMure/git-bug; + homepage = "https://github.com/MichaelMure/git-bug"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ royneary ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix index 5edf9a7b5a53b..7f199894924ee 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { Chromium on Linux. ''; license = licenses.gpl2Plus; - homepage = http://git.fishsoup.net/cgit/git-bz/; + homepage = "http://git.fishsoup.net/cgit/git-bz/"; platforms = platforms.linux; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 5d1a06e039746..858383f966413 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -27,7 +27,7 @@ in buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/git-cola/git-cola; + homepage = "https://github.com/git-cola/git-cola"; description = "A sleek and powerful Git GUI"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index df0b1e78d2741..487f9b9625f49 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.agwa.name/projects/git-crypt; + homepage = "https://www.agwa.name/projects/git-crypt"; description = "Transparent file encryption in git"; longDescription = '' git-crypt enables transparent encryption and decryption of files in a git diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index cfdcd80f38b7a..f2afdd941fe46 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/tj/git-extras; + homepage = "https://github.com/tj/git-extras"; description = "GIT utilities -- repo summary, repl, changelog population, author commit percentages and more"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix index f4aa4878f62f2..782579c704464 100644 --- a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix @@ -13,7 +13,7 @@ bundlerEnv { description = '' A command-line tool that helps you summarize and pretty-print collaborators based on contributions ''; - homepage = http://oleander.io/git-fame-rb; + homepage = "http://oleander.io/git-fame-rb"; license = licenses.mit; maintainers = with maintainers; [ expipiplus1 nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index aaf22c940cb11..32350fa538db2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -1,23 +1,27 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security }: +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "v${version}"; - sha256 = "05wlng563p9iy0ky3z23a4jakcix887fb45r7j2mk0fp5ykdjmzh"; + sha256 = "0zc4cb1dg30np5yc4ymkr894qs2bk0r123i302md00niayk4njyd"; }; - cargoSha256 = "1scp9rzn59akxsf9p48j1zq6clbwdyasnyi4j28nj03ghvdv2i33"; + cargoSha256 = "1d892889ml7sqyxzmjipq5fvizb4abqhmmn450qm7yam9fn5q5wf"; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkgconfig makeWrapper installShellFiles ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + postInstall = '' + installManPage git-gone.1 + ''; + postFixup = '' wrapProgram $out/bin/git-gone --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}" ''; diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix index d8125f604bf6e..93d152baa0032 100644 --- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, darwin }: +{ stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkgconfig, openssl, darwin }: with rustPlatform; @@ -15,7 +15,7 @@ buildRustPackage rec { cargoSha256 = "0vcg2pl0s329fr8p23pwdx2jy7qahbr7n337ib61f69aaxi1xmq0"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig installShellFiles ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security @@ -23,13 +23,12 @@ buildRustPackage rec { outputs = [ "out" "man" ]; preFixup = '' - mkdir -p "$man/man/man1" - cp target/release/build/git-ignore-*/out/git-ignore.1 "$man/man/man1/" + installManPage $releaseDir/build/git-ignore-*/out/git-ignore.1 ''; meta = with stdenv.lib; { description = "Quickly and easily fetch .gitignore templates from gitignore.io"; - homepage = https://github.com/sondr3/git-ignore; + homepage = "https://github.com/sondr3/git-ignore"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.sondr3 ]; 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 528a96c9903a6..721a7784e9ca7 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 @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ] ; meta = with stdenv.lib; { - homepage = https://github.com/mhagger/git-imerge; + homepage = "https://github.com/mhagger/git-imerge"; description = "Perform a merge between two branches incrementally"; license = licenses.gpl2; platforms = platforms.all; 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 40da9045b817a..1ca0ad27de714 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.13.6"; + version = "2.14.0"; src = fetchPypi { inherit pname version; - sha256 = "0n07gm05676vgfh6vlym59jwwzym9xmibhr0zpf0drlx02fr47qy"; + sha256 = "01ch4d0r3bi9nl5nknp3dyizc2rl9w46gm1ydnvqbrzhgw65lpp0"; }; nativeBuildInputs = [ installShellFiles pbr ]; @@ -24,7 +24,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/VirtusLab/git-machete; + homepage = "https://github.com/VirtusLab/git-machete"; description = "Git repository organizer and rebase/merge workflow automation tool"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/applications/version-management/git-and-tools/git-my/default.nix b/pkgs/applications/version-management/git-and-tools/git-my/default.nix index 8a5ec250932d4..2a8a262bf3048 100644 --- a/pkgs/applications/version-management/git-and-tools/git-my/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-my/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "List remote branches if they're merged and/or available locally"; - homepage = https://github.com/davidosomething/git-my; + homepage = "https://github.com/davidosomething/git-my"; license = licenses.free; maintainers = with maintainers; [ bb010g ]; platforms = platforms.all; diff --git a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix index a7abd1eeaf468..d5278d9d24179 100644 --- a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = https://github.com/lesfurets/git-octopus; + homepage = "https://github.com/lesfurets/git-octopus"; description = "The continuous merge workflow"; license = licenses.lgpl3; platforms = platforms.unix; diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-and-tools/git-open/default.nix index 1cc3f365ea884..10f221b638825 100644 --- a/pkgs/applications/version-management/git-and-tools/git-open/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/paulirish/git-open; + homepage = "https://github.com/paulirish/git-open"; description = "Open the GitHub page or website for a repository in your browser"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix index 9fb9d4de6e3de..fc4b5850f5c70 100644 --- a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/michaeldfallen/git-radar; + homepage = "https://github.com/michaeldfallen/git-radar"; license = licenses.mit; description = "A tool you can add to your prompt to provide at-a-glance information on your git repo"; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix index 628c7dbac7f39..99b64e012eae3 100644 --- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/paulirish/git-recent; + homepage = "https://github.com/paulirish/git-recent"; description = "See your latest local git branches, formatted real fancy"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index 4e6e450657d2a..04787b0ce25b2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://spwhitton.name/tech/code/git-remote-gcrypt; + homepage = "https://spwhitton.name/tech/code/git-remote-gcrypt"; description = "A git remote helper for GPG-encrypted remotes"; license = licenses.gpl3; maintainers = with maintainers; [ ellis montag451 ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index 28e63c4f1662a..37c06d3a85e22 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://github.com/mnauw/git-remote-hg; + homepage = "https://github.com/mnauw/git-remote-hg"; description = "Semi-official Mercurial bridge from Git project"; license = licenses.gpl2; maintainers = [ ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index 8477dfac5856a..140c2647be225 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation { meta = { description = "A bash-tool to store your private data inside a git repository"; - homepage = https://git-secret.io; + homepage = "https://git-secret.io"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.lo1tuma ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix index 1da8f2a4a5ed7..1beff2a118df0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Prevents you from committing secrets and credentials into git repositories"; - homepage = https://github.com/awslabs/git-secrets; + homepage = "https://github.com/awslabs/git-secrets"; license = licenses.asl20; platforms = platforms.all; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix index ae40e011f858b..dc636571acc05 100644 --- a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A better Git subtree helper command"; - homepage = http://deliciousinsights.github.io/git-stree; + homepage = "http://deliciousinsights.github.io/git-stree"; license = licenses.mit; maintainers = [ maintainers.benley ]; platforms = platforms.unix; diff --git a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix b/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix index 54543bb48419f..708014e4af8df 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ingydotnet/git-subrepo; + homepage = "https://github.com/ingydotnet/git-subrepo"; description = "Git submodule alternative"; license = licenses.mit; platforms = platforms.unix ++ platforms.darwin; diff --git a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix index 07c63ea0119b4..df29eb1523536 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "git-subtrac"; - version = "0.01"; + version = "0.02"; src = fetchFromGitHub { owner = "apenwarr"; repo = pname; rev = "v${version}"; - sha256 = "1w6gd0x1902lzpqr74gsdrnxq36f6v14bv8h0vhlrfhbwbsih7n6"; + sha256 = "1nj950r38sxzrgw69m1xphm7a4km2g29iw2897gfx4wx57jl957k"; }; - modSha256 = "147vzllp1gydk2156hif313vwykagrj35vaiqy1swqczxs7p9hhs"; + vendorSha256 = "1ccwbhzwys8sl3m2rs2lp70snzsi2a0ahnnq8kn15rrlvsv5qahf"; meta = with lib; { description = "Keep the content for your git submodules all in one place: the parent repo"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix index 7fa15c668099e..bba355095558a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to automatically synchronize a git repository"; - homepage = https://github.com/simonthum/git-sync; + homepage = "https://github.com/simonthum/git-sync"; maintainers = with stdenv.lib.maintainers; [ imalison ]; license = stdenv.lib.licenses.cc0; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/applications/version-management/git-and-tools/git-test/default.nix b/pkgs/applications/version-management/git-and-tools/git-test/default.nix index e55799c275212..27f9bcffa34e7 100644 --- a/pkgs/applications/version-management/git-and-tools/git-test/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-test/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Test your commits"; - homepage = https://github.com/spotify/git-test; + homepage = "https://github.com/spotify/git-test"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; platforms = platforms.all; diff --git a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix index ab558ec42d92c..d843cdc307c09 100644 --- a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix @@ -2,23 +2,23 @@ rustPlatform.buildRustPackage rec { pname = "git-trim"; - version = "0.2.4"; + version = "0.3.2"; src = fetchFromGitHub { owner = "foriequal0"; repo = pname; rev = "v${version}"; - sha256 = "0gfmv9bwhh6bv0s9kfbxq9wsvrk3zz3ibavbpp9l8cpqc3145pqy"; + sha256 = "079kavm3n776wvmy25jq1g4qdvmhh3d3x1vdpb1f6pw5rkky8lyw"; }; - cargoSha256 = "0xklczk4vbh2mqf76r3rsfyclyza9imf6yss7vbkm9w4ir3ar9f3"; + cargoSha256 = "1ii5l7z9avg0gzlaav2gnfbr8wkbp008i5rz6k6bs2sfqnpnn5k6"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; postInstall = '' - install -Dm644 docs/git-trim.md.1 $out/share/man/man1/git-trim.1 + install -Dm644 -t $out/share/man/man1/ docs/git-trim.1 ''; # fails with sandbox diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index b93163e239ad5..8894c4f0f7ad5 100644 --- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "0pl5z0gx2ypkrgq7vj1cxj5iwj06vcd06x3b3nh0g7w7q7nl8pr4"; + sha256 = "0n025bnisg724d9pjcindxagj1ry63sxr0pplpkh2f2qffzm78pi"; }; - cargoSha256 = "1z4cb7rcb7ldj16xxynrjh4hg872rj39rbbp0vy15kdp3ifyi466"; + cargoSha256 = "0ikyp6pdlw2c1gr1n1snjbdmblm0fs5swx5awy36jskii99q6kr1"; buildInputs = with stdenv; lib.optional isDarwin Security; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 02df27e745f41..9c1a01f42ae85 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.25.1"; + version = "2.26.2"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; + sha256 = "0j685w6pzkn926z5nf5r8fij4ziipvw4c9yb0wc577nzf4j16rbd"; }; outputs = [ "out" ]; @@ -80,6 +80,8 @@ stdenv.mkDerivation { configureFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_fread_reads_directories=yes" "ac_cv_snprintf_returns_bogus=no" + "ac_cv_iconv_omits_bom=no" + "ac_cv_prog_CURL_CONFIG=${curl.dev}/bin/curl-config" ]; preBuild = '' @@ -189,7 +191,7 @@ stdenv.mkDerivation { ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend '' + stdenv.lib.optionalString perlSupport '' # wrap perl commands - makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc" $out/bin/git-credential-netrc \ + makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/bin/git-credential-netrc \ --set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" wrapProgram $out/libexec/git-core/git-cvsimport \ --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" @@ -330,9 +332,10 @@ stdenv.mkDerivation { meta = { - homepage = https://git-scm.com/; + homepage = "https://git-scm.com/"; description = "Distributed version control system"; license = stdenv.lib.licenses.gpl2; + changelog = "https://raw.githubusercontent.com/git/git/${version}/Documentation/RelNotes/${version}.txt"; longDescription = '' Git, a popular distributed version control system designed to @@ -340,6 +343,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ peti the-kenny wmertens globin ]; + maintainers = with stdenv.lib.maintainers; [ peti wmertens globin ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git/update.sh b/pkgs/applications/version-management/git-and-tools/git/update.sh index a9fa18be1558a..54574722b02b7 100755 --- a/pkgs/applications/version-management/git-and-tools/git/update.sh +++ b/pkgs/applications/version-management/git-and-tools/git/update.sh @@ -4,15 +4,16 @@ set -eu -o pipefail oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion git" | tr -d '"')" -latestTag="$(git ls-remote --tags --sort="v:refname" git://github.com/git/git.git | grep -v '\{\}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')" +latestTag="$(git ls-remote --tags --sort="v:refname" https://github.com/git/git.git | grep -v '\{\}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')" +targetVersion="${1:-$latestTag}" -if [ ! "${oldVersion}" = "${latestTag}" ]; then - update-source-version git "${latestTag}" +if [ ! "${oldVersion}" = "${targetVersion}" ]; then + update-source-version git "${targetVersion}" nixpkgs="$(git rev-parse --show-toplevel)" default_nix="$nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix" nix-build -A git git add "${default_nix}" - git commit -m "git: ${oldVersion} -> ${latestTag}" + git commit -m "git: ${oldVersion} -> ${targetVersion}" else echo "git is already up-to-date" fi diff --git a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix index 036f8b4114e23..34417cfaa8c8d 100644 --- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://savannah.nongnu.org/projects/git2cl; + homepage = "https://savannah.nongnu.org/projects/git2cl"; description = "Convert git logs to GNU style ChangeLog files"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix b/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix new file mode 100644 index 0000000000000..2b372cc0e213e --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "gitbatch-unstable"; + version = "2019-12-19"; + + goPackagePath = "github.com/isacikgoz/gitbatch"; + + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "isacikgoz"; + repo = "gitbatch"; + rev = "381b0df7f86056c625c0d4d2d979733c1ee5def7"; + sha256 = "sha256:0613vfqdn3k0w7fm25rqnqdr67w9vii3i56dfslqcn1vqjfrff3q"; + }; + + meta = with stdenv.lib; { + description = "Running git UI commands"; + homepage = "https://github.com/isacikgoz/gitbatch"; + license = licenses.mit; + maintainers = with maintainers; [ teto ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/gitbatch/deps.nix b/pkgs/applications/version-management/git-and-tools/gitbatch/deps.nix new file mode 100644 index 0000000000000..53784b4eacf00 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitbatch/deps.nix @@ -0,0 +1,543 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/alcortesm/tgz"; + fetch = { + type = "git"; + url = "https://github.com/alcortesm/tgz"; + rev = "9c5fe88206d7"; + sha256 = "04dcwnz2c2i4wbq2vx3g2wrdgqpncr2r1h6p1k08rdwk4bq1h8c5"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cf"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/anmitsu/go-shlex"; + fetch = { + type = "git"; + url = "https://github.com/anmitsu/go-shlex"; + rev = "648efa622239"; + sha256 = "10rgdp5d106iisgz25ic8k6f44s9adh4sjh6fyxq9ccm21gw49b7"; + }; + } + { + goPackagePath = "github.com/armon/consul-api"; + fetch = { + type = "git"; + url = "https://github.com/armon/consul-api"; + rev = "eb2c6b5be1b6"; + sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "v3.3.10"; + sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-etcd"; + rev = "v2.0.0"; + sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "v0.2.0"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/emirpasic/gods"; + fetch = { + type = "git"; + url = "https://github.com/emirpasic/gods"; + rev = "v1.9.0"; + sha256 = "1zhkppqzy149fp561pif8d5d92jd9chl3l9z4yi5f8n60ibdmmjf"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + { + goPackagePath = "github.com/flynn/go-shlex"; + fetch = { + type = "git"; + url = "https://github.com/flynn/go-shlex"; + rev = "3f9db97f8568"; + sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/gliderlabs/ssh"; + fetch = { + type = "git"; + url = "https://github.com/gliderlabs/ssh"; + rev = "v0.1.1"; + sha256 = "0bylkc7yg8bxxffhchikcnzwli5n95cfmbji6v2a4mn1h5n36mdm"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.2.0"; + sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "v1.0.0"; + sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; + }; + } + { + goPackagePath = "github.com/jbenet/go-context"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-context"; + rev = "d14ea06fba99"; + sha256 = "0q91f5549n81w3z5927n4a1mdh220bdmgl42zi3h992dcc4ls0sl"; + }; + } + { + goPackagePath = "github.com/jessevdk/go-flags"; + fetch = { + type = "git"; + url = "https://github.com/jessevdk/go-flags"; + rev = "v1.4.0"; + sha256 = "0algnnigph27spgn655zm4723yfjxjjvlf4k14z9drj3682df25a"; + }; + } + { + goPackagePath = "github.com/jroimartin/gocui"; + fetch = { + type = "git"; + url = "https://github.com/jroimartin/gocui"; + rev = "v0.4.0"; + sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47"; + }; + } + { + goPackagePath = "github.com/kevinburke/ssh_config"; + fetch = { + type = "git"; + url = "https://github.com/kevinburke/ssh_config"; + rev = "81db2a75821e"; + sha256 = "0hwmv2h83aa7r6l7yqwsxdyldnlhb4gbbkc3ww9nys7impjcjnsp"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "v1.8.0"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.1.1"; + sha256 = "0l640974j804c1yyjfgyxqlsivz0yrzmbql4mhcw2azryigkp08p"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.7"; + sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.4"; + sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "v1.0.0"; + sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "v1.1.2"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; + }; + } + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "288510b9734e"; + sha256 = "0hdyisfaf8yb55h3p03p4sbq19546mp9fy28f2kn659mycmhxqk4"; + }; + } + { + goPackagePath = "github.com/pelletier/go-buffruneio"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-buffruneio"; + rev = "v0.2.0"; + sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "v1.2.0"; + sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/sergi/go-diff"; + fetch = { + type = "git"; + url = "https://github.com/sergi/go-diff"; + rev = "v1.0.0"; + sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.4.0"; + sha256 = "1y1qjcg19z7q9sy32rhc148kdql2aw7xkcm9d6r1blrl0mdgpx0w"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "v1.1.2"; + sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "v1.3.0"; + sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "v1.0.0"; + sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "v1.3.2"; + sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh"; + }; + } + { + goPackagePath = "github.com/src-d/gcfg"; + fetch = { + type = "git"; + url = "https://github.com/src-d/gcfg"; + rev = "v1.4.0"; + sha256 = "044j95skmyrwjw5fwjk6ka32rjgsg0ar0mfp9np19sh1acwv4x4r"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "d75b2dcb6bc8"; + sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; + }; + } + { + goPackagePath = "github.com/xanzy/ssh-agent"; + fetch = { + type = "git"; + url = "https://github.com/xanzy/ssh-agent"; + rev = "v0.2.0"; + sha256 = "069nlriymqswg52ggiwi60qhwrin9nzhd2g65a7h59z2qbcvk2hy"; + }; + } + { + goPackagePath = "github.com/xordataexchange/crypt"; + fetch = { + type = "git"; + url = "https://github.com/xordataexchange/crypt"; + rev = "b2862e3d0a77"; + sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "505ab145d0a9"; + sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "161cd47e91fd"; + sha256 = "0254ld010iijygbzykib2vags1dc0wlmcmhgh4jl8iny159lhbcv"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "e225da77a7e6"; + sha256 = "0bh3583smcfw6jw3w6lp0za93rz7hpxfdz8vhxng75b7a6vdlw4p"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "a9d3bda3a223"; + sha256 = "1w45zc13xrjzl19s1sx74r5mg3lf2z2nm13wygcdq5r5pyjlhdz9"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "gopkg.in/src-d/go-billy.v4"; + fetch = { + type = "git"; + url = "https://gopkg.in/src-d/go-billy.v4"; + rev = "v4.2.1"; + sha256 = "1n8nc0m2hidbrlcl643cd0bdm07pjr0qji47gbfpfj99791sv1d1"; + }; + } + { + goPackagePath = "gopkg.in/src-d/go-git-fixtures.v3"; + fetch = { + type = "git"; + url = "https://gopkg.in/src-d/go-git-fixtures.v3"; + rev = "v3.1.1"; + sha256 = "1fq3j5chck6883jbn33gwm6dxdgzsphjq97psyn81hz9bc1ili8p"; + }; + } + { + goPackagePath = "gopkg.in/src-d/go-git.v4"; + fetch = { + type = "git"; + url = "https://gopkg.in/src-d/go-git.v4"; + rev = "v4.10.0"; + sha256 = "18bx3m5ddvb20figd8pc3lgf9hn85pifc6xy72bb83lv2nxii2rx"; + }; + } + { + goPackagePath = "gopkg.in/warnings.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/warnings.v0"; + rev = "v0.1.2"; + sha256 = "1kzj50jn708cingn7a13c2wdlzs6qv89dr2h4zj8d09647vlnd81"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + }; + } +] diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix index 57af13f597a77..1307573990a9a 100644 --- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/petervanderdoes/gitflow; + homepage = "https://github.com/petervanderdoes/gitflow"; description = "Extend git with the Gitflow branching model"; longDescription = '' A set of scripts that provide high-level repository operations diff --git a/pkgs/applications/version-management/git-and-tools/gitin/default.nix b/pkgs/applications/version-management/git-and-tools/gitin/default.nix new file mode 100644 index 0000000000000..5964af6c0f0cf --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitin/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildGoPackage +, fetchFromGitHub +, pkgconfig +, libgit2_0_27 +}: + +buildGoPackage rec { + version = "0.2.3"; + pname = "gitin"; + + goPackagePath = "github.com/isacikgoz/gitin"; + + src = fetchFromGitHub { + owner = "isacikgoz"; + repo = "gitin"; + rev = "v${version}"; + sha256 = "00z6i0bjk3hdxbc0cy12ss75b41yvzyl5pm6rdrvsjhzavry2fa3"; + }; + + goDeps = ./deps.nix; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libgit2_0_27 ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/isacikgoz/gitin"; + description = "Text-based user interface for git"; + platforms = platforms.all; + license = licenses.bsd3; + maintainers = with maintainers; [ kimat ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/gitin/deps.nix b/pkgs/applications/version-management/git-and-tools/gitin/deps.nix new file mode 100644 index 0000000000000..908665693b81d --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitin/deps.nix @@ -0,0 +1,121 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "fb15b899a75114aa79cc930e33c46b577cc664b1"; + sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "f65c72e2690dc4b403c8bd637baf4611cd4c069b"; + sha256 = "04jyqm7m3m01ppfy1f9xk4qvrwvs78q9zml6llyf2b3v5k6b2bbc"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "daf2830f2741ebb735b21709a520c5f37d642d85"; + sha256 = "086z8ssmr1fn9ba4mqnw7pnccfpys6l5yfhvycv1gdrsk7n27mvs"; + }; + } + { + goPackagePath = "github.com/isacikgoz/gia"; + fetch = { + type = "git"; + url = "https://github.com/isacikgoz/gia"; + rev = "00556493579ec25f4e199b85ee1e2a73c98d15bb"; + sha256 = "16nqi4z1pgybcw05wbp3qnbbq407smcr56hq7npnhkirngc5j822"; + }; + } + { + goPackagePath = "github.com/jroimartin/gocui"; + fetch = { + type = "git"; + url = "https://github.com/jroimartin/gocui"; + rev = "c055c87ae801372cd74a0839b972db4f7697ae5f"; + sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47"; + }; + } + { + goPackagePath = "github.com/justincampbell/timeago"; + fetch = { + type = "git"; + url = "https://github.com/justincampbell/timeago"; + rev = "027f40306f1dbe89d24087611680ef95543bf876"; + sha256 = "1p3va1cn9x5pyvq7k64mnvbxp5zy7h9z49syjyglixgg6avdbp1v"; + }; + } + { + goPackagePath = "github.com/kelseyhightower/envconfig"; + fetch = { + type = "git"; + url = "https://github.com/kelseyhightower/envconfig"; + rev = "0b417c4ec4a8a82eecc22a1459a504aa55163d61"; + sha256 = "1a7b35njpqz94gbd7wvsl3wjzpd5y1fj1lrg2sdh00yq0nax1qj9"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "14e809f6d78fcf9f48ff9b70981472b64c05f754"; + sha256 = "1mvlxcdwr0vwp8b2wqs6y7hk72y28sqh03dz5x0xkg48d4y9cplj"; + }; + } + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "38ba6e5628f1d70bac606cfd210b9ad1a16c3027"; + sha256 = "03xx5vbnavklsk6wykcc7qhmhvn2074sx0ql06b51vqsxwsa6zw2"; + }; + } + { + goPackagePath = "github.com/sahilm/fuzzy"; + fetch = { + type = "git"; + url = "https://github.com/sahilm/fuzzy"; + rev = "d88f8cb825ddd46a2ce86b60382e11645220ee33"; + sha256 = "0nl4l02s3961p11aj1vgajfy28rqlya2z6af2xjncra59gfhqvlq"; + }; + } + { + goPackagePath = "github.com/waigani/diffparser"; + fetch = { + type = "git"; + url = "https://github.com/waigani/diffparser"; + rev = "7391f219313d9175703f67561b222fd2a81bca30"; + sha256 = "0h3y3ivlghdvkyqsh5lcidqdajhc9g7m1xqm73j9a0ayby0sx1ql"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/libgit2/git2go.v27"; + fetch = { + type = "git"; + url = "https://gopkg.in/libgit2/git2go.v27"; + rev = "6cc7d3dc6aec2781fe0239315da215f49c76e2f8"; + sha256 = "0b2m4rjadngyd675bi1k21pyi9r91dsxngzd4mikacpd7yshgvaq"; + }; + } +] + diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index a444ab05039f6..eab382386ef68 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "gitstatus"; - version = "unstable-2020-03-15"; + version = "unstable-2020-04-21"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; - rev = "c07996bc3ea1912652f52a816b830a5a3ee9b49c"; - sha256 = "07s8hwx3i5mnafi2xfim44z3q2nsvlcibfdxj17w8mkjhfpywi00"; + rev = "3494f25b0b3b2eac241cf669d1fea2b49ea42fb3"; + sha256 = "0b4g14dkkgih6zps2w1krl9xf44ysj02617zj1k51z127v2lpm1f"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "10x faster implementation of `git status` command"; - homepage = https://github.com/romkatv/gitstatus; + homepage = "https://github.com/romkatv/gitstatus"; license = [ licenses.gpl3 ]; maintainers = with maintainers; [ mmlb hexa ]; diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix new file mode 100644 index 0000000000000..f1e4663022401 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -0,0 +1,24 @@ +{ stdenv, rustPlatform, fetchFromGitHub, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "gitui"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "extrawurst"; + repo = pname; + rev = "v${version}"; + sha256 = "0rdaschf6030zprz81g7xnx57idjsq3bjhjp5d9387ha5njq0bp1"; + }; + + cargoSha256 = "1k24xabhgwwdvslq81w6b8jnnjxbafj4s0zpcq2c4hals2xxwfy4"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + + meta = with stdenv.lib; { + description = "Blazing fast terminal-ui for git written in rust"; + homepage = "https://github.com/extrawurst/gitui"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix index c1839b591a7e2..64a4f8a823ce6 100644 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -36,13 +36,13 @@ buildGoPackage { installPhase = '' runHook preInstall - install -D grv $bin/bin/grv + install -D grv $out/bin/grv runHook postInstall ''; meta = with stdenv.lib; { description = "GRV is a terminal interface for viewing Git repositories"; - homepage = https://github.com/rgburke/grv; + homepage = "https://github.com/rgburke/grv"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ andir ]; diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index f868c6b3c8fab..22ffd442fdc98 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, groff, Security, utillinux }: +{ stdenv, buildGoPackage, fetchFromGitHub, groff, installShellFiles, utillinux }: buildGoPackage rec { pname = "hub"; @@ -16,8 +16,7 @@ buildGoPackage rec { sha256 = "1qjab3dpia1jdlszz3xxix76lqrm4zbmqzd9ymld7h06awzsg2vh"; }; - nativeBuildInputs = [ groff utillinux ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ groff installShellFiles utillinux ]; postPatch = '' patchShebangs . @@ -25,20 +24,20 @@ buildGoPackage rec { postInstall = '' cd go/src/${goPackagePath} - install -D etc/hub.zsh_completion "$bin/share/zsh/site-functions/_hub" - install -D etc/hub.bash_completion.sh "$bin/share/bash-completion/completions/hub" - install -D etc/hub.fish_completion "$bin/share/fish/vendor_completions.d/hub.fish" + installShellCompletion --zsh --name _hub etc/hub.zsh_completion + installShellCompletion --bash --name hub etc/hub.bash_completion.sh + installShellCompletion --fish --name hub.fish etc/hub.fish_completion LC_ALL=C.UTF8 \ make man-pages - cp -vr --parents share/man/man[1-9]/*.[1-9] $bin/ + installManPage share/man/man[1-9]/*.[1-9] ''; meta = with stdenv.lib; { description = "Command-line wrapper for git that makes you better at GitHub"; license = licenses.mit; - homepage = https://hub.github.com/; - maintainers = with maintainers; [ the-kenny globin ]; + homepage = "https://hub.github.com/"; + maintainers = with maintainers; [ globin ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index 3e47631caf694..eaab2e6c5054c 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { subPackages = [ "." ]; - modSha256 = "03fqa7s6729g0a6ffiyc61dkldpi7vg8pvvpqak4c0mqi1dycivd"; + vendorSha256 = "1lrmafvv5zfn9kc0p8g5vdz351n1zbaqwhwk861fxys0rdpqskyc"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -26,9 +26,9 @@ buildGoModule rec { meta = with stdenv.lib; { description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab"; - homepage = https://zaquestion.github.io/lab; + homepage = "https://zaquestion.github.io/lab"; license = licenses.cc0; maintainers = with maintainers; [ marsam dtzWill ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 9fc89d520ae90..613e5bf10d685 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "14rcvbzzrx0m3xijl8qhw5l2h0q10hqzad2hqm3079g893f2qad0"; }; - modSha256 = "0ih11gw2y9dhv3zw1fzjmdfjln5h6zg1bj7sl68cglf6743siqnq"; + vendorSha256 = "1pdrw4vwbj9cka2pjbjvxviigfvnrf8sgws27ixwwiblbkj4isc8"; meta = with stdenv.lib; { description = "Fast and powerful Git hooks manager for any type of projects"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ rencire ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix index 74fad30b8a9a5..24743b21a4dd3 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { meta = with lib; { license = licenses.gpl2; - homepage = https://github.com/tibirna/qgit; + homepage = "https://github.com/tibirna/qgit"; description = "Graphical front-end to Git"; maintainers = with maintainers; [ peterhoeg markuskowa ]; inherit (qtbase.meta) platforms; diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index d356991815e76..2cd4adce93978 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation { description = "A patch manager implemented on top of Git"; homepage = "http://procode.org/stgit/"; license = licenses.gpl2; - maintainers = with maintainers; [ the-kenny ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix index ac11e7469e504..1fd70aab46115 100644 --- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; longDescription = "Create writable Git mirror of a local or remote Subversion repository and use both Subversion and Git as long as you like. You may also do a fast one-time import from Subversion to Git."; - homepage = http://subgit.com; + homepage = "http://subgit.com"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index 92d7fd4e3dabf..75f6a96084128 100644 --- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }: let - version = "1.0.17"; + version = "1.0.18"; in stdenv.mkDerivation { pname = "svn-all-fast-export"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "svn-all-fast-export"; repo = "svn2git"; rev = version; - sha256 = "13gmrxh4i34scv51h9x38v8jqfjykbbd9w7zzqjnxzvzpzsczg9a"; + sha256 = "1b5yx2316hbyvw3v30vn1ljma9yd21nd59wis1gi34g92lgvqcd6"; }; nativeBuildInputs = [ qmake qttools ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-lsvn_fs-1"; meta = with stdenv.lib; { - homepage = https://github.com/svn-all-fast-export/svn2git; + homepage = "https://github.com/svn-all-fast-export/svn2git"; description = "A fast-import based converter for an svn repo to git repos"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index 821ecf3e3d8f3..b61ae80bbee14 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -31,11 +31,9 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/nirvdrum/svn2git; + homepage = "https://github.com/nirvdrum/svn2git"; description = "Tool for importing Subversion repositories into git"; license = stdenv.lib.licenses.mit; - - maintainers = [ stdenv.lib.maintainers.the-kenny ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/pkgs/applications/version-management/git-and-tools/thicket/default.nix index 42819043d58b2..4a02baa465c6c 100644 --- a/pkgs/applications/version-management/git-and-tools/thicket/default.nix +++ b/pkgs/applications/version-management/git-and-tools/thicket/default.nix @@ -1,9 +1,12 @@ { lib , fetchFromGitHub -, crystal +, crystal_0_33 }: -crystal.buildCrystalPackage rec { +let + crystal = crystal_0_33; + +in crystal.buildCrystalPackage rec { pname = "thicket"; version = "0.1.3"; @@ -14,13 +17,18 @@ crystal.buildCrystalPackage rec { sha256 = "0hkmmssiwipx373d0zw9a2yn72gqzqzcvwkqbs522m5adz6qmkzw"; }; + format = "shards"; + shardsFile = ./shards.nix; crystalBinaries.thicket.src = "src/thicket.cr"; + # there is one test that tries to clone a repo + doCheck = false; + meta = with lib; { description = "A better one-line git log"; homepage = "https://github.com/taylorthurlow/thicket"; license = licenses.mit; maintainers = with maintainers; [ filalex77 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 25754ef4de942..cb03a9b42a255 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -31,10 +31,13 @@ stdenv.mkDerivation rec { make install make install-doc + # fixes tig-completion __git-complete dependency + sed -i '1s;^;source ${git}/share/bash-completion/completions/git\n;' contrib/tig-completion.bash + substituteInPlace contrib/tig-completion.zsh \ - --replace 'e=$(dirname ''${funcsourcetrace[1]%:*})/tig-completion.bash' "e=$out/etc/bash_completion.d/tig-completion.bash" + --replace 'e=$(dirname ''${funcsourcetrace[1]%:*})/tig-completion.bash' "e=$out/share/bash-completion/completions/tig" - install -D contrib/tig-completion.bash $out/etc/bash_completion.d/tig-completion.bash + install -D contrib/tig-completion.bash $out/share/bash-completion/completions/tig install -D contrib/tig-completion.zsh $out/share/zsh/site-functions/_tig cp contrib/vim.tigrc $out/etc/ @@ -43,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://jonas.github.io/tig/; + homepage = "https://jonas.github.io/tig/"; description = "Text-mode interface for git"; maintainers = with maintainers; [ bjornfor domenkozar qknight globin ]; license = licenses.gpl2; diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index 3b8affb57edf5..589d53b3cfaad 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { encryption password can safely commit changes to the repository's non-encrypted files. ''; - homepage = https://github.com/elasticdog/transcrypt; + homepage = "https://github.com/elasticdog/transcrypt"; license = licenses.mit; maintainers = [ maintainers.elasticdog ]; platforms = platforms.all; diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/applications/version-management/git-crecord/default.nix index ec03c5bed5b1c..9481f3ebd9283 100644 --- a/pkgs/applications/version-management/git-crecord/default.nix +++ b/pkgs/applications/version-management/git-crecord/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ docutils ]; meta = { - homepage = https://github.com/andrewshadura/git-crecord; + homepage = "https://github.com/andrewshadura/git-crecord"; description = "Git subcommand to interactively select changes to commit or stage"; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix index e3190667259ea..5b2a9906a4f8e 100644 --- a/pkgs/applications/version-management/git-lfs/1.nix +++ b/pkgs/applications/version-management/git-lfs/1.nix @@ -4,7 +4,7 @@ buildGoPackage rec { pname = "git-lfs"; version = "1.5.6"; rev = "0d02fb7d9a1c599bbf8c55e146e2845a908e04e0"; - + goPackagePath = "github.com/git-lfs/git-lfs"; src = fetchFromGitHub { @@ -14,8 +14,7 @@ buildGoPackage rec { sha256 = "0wddry1lqjccf4522fvhx6grx8h57xsz17lkaf5aybnrgw677w3d"; }; - # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block' - excludedPackages = [ "test" ]; + subPackages = [ "." ]; preBuild = '' pushd go/src/github.com/git-lfs/git-lfs @@ -23,12 +22,9 @@ buildGoPackage rec { popd ''; - postInstall = '' - rm -v $bin/bin/{man,script} - ''; meta = with stdenv.lib; { description = "Git extension for versioning large files"; - homepage = https://git-lfs.github.com/; + homepage = "https://git-lfs.github.com/"; license = [ licenses.mit ]; maintainers = [ maintainers.twey ]; }; diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index eca841350deb0..80f236559f9e1 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -1,24 +1,36 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, ronn, installShellFiles }: -buildGoModule rec { +buildGoPackage rec { pname = "git-lfs"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "1y5ryk0iz5g5sqaw79ml6fr5kvjgzcah481pk5qmnb2ipb1xlng9"; + sha256 = "05qd96bn2cl7gn5qarbcv6scdpj28qiwdfzalamqk5jjiidpmng5"; }; - modSha256 = "1rvvgyg4gqbli4pwfnmyz59gf14k7925mdqj6ykp542gwnsjgjp2"; + goPackagePath = "github.com/git-lfs/git-lfs"; + + nativeBuildInputs = [ ronn installShellFiles ]; + + buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/config.Vendor=${version} -X ${goPackagePath}/config.GitCommit=${src.rev}" ]; subPackages = [ "." ]; + postBuild = '' + make -C go/src/${goPackagePath} man + ''; + + postInstall = '' + installManPage go/src/${goPackagePath}/man/*.{1,5} + ''; + meta = with stdenv.lib; { description = "Git extension for versioning large files"; homepage = "https://git-lfs.github.com/"; license = [ licenses.mit ]; - maintainers = [ maintainers.twey ]; + maintainers = [ maintainers.twey maintainers.marsam ]; }; } diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 93fb65d1031c6..eb3f95a354f40 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.5"; + version = "2.8"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "0y37s0v37gygv0dm8y9sjc4jr7ml8irix5rwmbk6smzwa74n0x8a"; + sha256 = "00sahddplisg55zpjz4v4sc7zqbh3apx36xv77g55nabwz7han8d"; }; patches = [ ./import-ssl-module.patch ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { parts of the development workflow. Repo is not meant to replace Git, only to make it easier to work with Git. ''; - homepage = https://android.googlesource.com/tools/repo; + homepage = "https://android.googlesource.com/tools/repo"; license = licenses.asl20; maintainers = [ maintainers.primeos ]; platforms = platforms.unix; diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index c48f455a64a3b..c7702cfa19516 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; meta = { - homepage = https://github.com/openstack-infra/git-review; + homepage = "https://github.com/openstack-infra/git-review"; description = "Tool to submit code to Gerrit"; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index 5812ff8c1d1d5..faed3d25a8adf 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/msiemens/PyGitUp; + homepage = "https://github.com/msiemens/PyGitUp"; description = "A git pull replacement that rebases all local branches when pulling."; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 570fb2ce56f47..fda47fb2d9679 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,5 +1,6 @@ { stdenv, buildGoPackage, fetchurl, makeWrapper , git, bash, gzip, openssh, pam +, fetchpatch , sqliteSupport ? true , pamSupport ? true }: @@ -8,11 +9,11 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.11.4"; + version = "1.11.5"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "18k6kcdq0ijpzgay2aq1w95qkgfvrn1dgh4cxyj9c4i0pwb3ar7f"; + sha256 = "0iqxwg53wjwi4vpq2h6fwmniazsi4cf68fcjrs459qbz4d6x8xa9"; }; unpackPhase = '' @@ -22,7 +23,17 @@ buildGoPackage rec { sourceRoot = "source"; - patches = [ ./static-root-path.patch ]; + patches = [ + ./static-root-path.patch + (fetchpatch { + url = "https://github.com/go-gitea/gitea/commit/1830d0ed5f4a67e3360ecbb55933b5540b6affce.patch"; + sha256 = "163531pcki28qfs56l64vv4xxaavxgksf038da1sn21j5l2jm81i"; + }) + (fetchpatch { + url = "https://github.com/go-gitea/gitea/commit/e1c00bd6af677b944a102d84314eba8c487648b3.patch"; + sha256 = "1yf48fvky4as72w38lbrk4qpl4af31i2ckr90h3x5wf61yc105wv"; + }) + ]; postPatch = '' patchShebangs . @@ -44,7 +55,7 @@ buildGoPackage rec { ) ''; - outputs = [ "bin" "out" "data" ]; + outputs = [ "out" "data" ]; postInstall = '' mkdir $data @@ -52,7 +63,7 @@ buildGoPackage rec { mkdir -p $out cp -R ./go/src/${goPackagePath}/options/locale $out/locale - wrapProgram $bin/bin/gitea \ + wrapProgram $out/bin/gitea \ --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} ''; diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix index 4467e9746ce9e..ac96706015539 100644 --- a/pkgs/applications/version-management/gitinspector/default.nix +++ b/pkgs/applications/version-management/gitinspector/default.nix @@ -16,7 +16,7 @@ python2Packages.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/ejwa/gitinspector; + homepage = "https://github.com/ejwa/gitinspector"; description = "Statistical analysis tool for git repositories"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index d83c646be208d..88f8df4e25476 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "6.5.4"; + version = "7.0.0"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "0hrxkhxp6kp82jg1pkcl6vxa5mjpgncx0k353bcnm4986ysizhj4"; + sha256 = "0ws1gb7fgy72s6hxkf9g16x565m58k1cdzx9ldcdghfffimz4cqx"; }; dontBuild = true; @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.gitkraken.com/; + homepage = "https://www.gitkraken.com/"; description = "The downright luxurious and most popular Git client for Windows, Mac & Linux"; license = licenses.unfree; platforms = platforms.linux; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 8da56229a02c7..d3f2db5e5ad22 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "12.8.8", - "repo_hash": "1y8flmssz8bp07v7x9gxazqn5889hvkxk0k6py773gdnna5fd5fb", + "version": "12.8.10", + "repo_hash": "1njkihj66d8fnk1l0r5pys38akf5srqlrgj2hzc68l5m8d51dk15", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.8.8-ee", + "rev": "v12.8.10-ee", "passthru": { - "GITALY_SERVER_VERSION": "12.8.8", + "GITALY_SERVER_VERSION": "12.8.10", "GITLAB_PAGES_VERSION": "1.16.0", "GITLAB_SHELL_VERSION": "11.0.0", - "GITLAB_WORKHORSE_VERSION": "8.21.1" + "GITLAB_WORKHORSE_VERSION": "8.21.2" } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 36859892e8c43..f3ecc6df64004 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -174,7 +174,7 @@ stdenv.mkDerivation { }; meta = with lib; { - homepage = http://www.gitlab.com/; + homepage = "http://www.gitlab.com/"; platforms = platforms.linux; maintainers = with maintainers; [ fpletz globin krav talyz ]; } // (if gitlabEnterprise then diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index b41c78f3a3dcb..0c125f5a0bf9b 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -114,7 +114,7 @@ GEM minitest (5.14.0) msgpack (1.3.1) multipart-post (2.0.0) - nokogiri (1.10.7) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index aea38245c913b..298897d67017b 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, fetchFromGitHub, buildGoPackage, ruby, - bundlerEnv, pkgconfig, libgit2 }: + bundlerEnv, pkgconfig, libgit2_0_27 }: let rubyEnv = bundlerEnv rec { @@ -18,24 +18,15 @@ let }; }; }; - libgit2_0_27 = libgit2.overrideAttrs (oldAttrs: rec { - version = "0.27.8"; - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - sha256 = "0wzx8nkyy9m7mx6cks58chjd4289vjsw97mxm9w6f1ggqsfnmbr9"; - }; - }); in buildGoPackage rec { - version = "12.8.8"; + version = "12.8.10"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "182jqglzbzq8jnlq6l634125jkvi67pfr1xck68n4k09gyzqllxv"; + sha256 = "1vhnpyggh2ch93i75np11rjzvq8d6pwv2kzvwh7ak3fa02w9qdfs"; }; # Fix a check which assumes that hook files are writeable by their @@ -65,10 +56,10 @@ in buildGoPackage rec { "'/run/gitlab/shell-config.yml'" ''; - outputs = [ "bin" "out" "ruby" ]; + outputs = [ "out" "ruby" ]; meta = with stdenv.lib; { - homepage = https://gitlab.com/gitlab-org/gitaly; + homepage = "https://gitlab.com/gitlab-org/gitaly"; description = "A Git RPC service for handling all the git calls made by GitLab"; platforms = platforms.linux; maintainers = with maintainers; [ roblabla globin fpletz talyz ]; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index d91c84b1fa295..7719a90abb5d2 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -515,10 +515,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln"; + sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; type = "gem"; }; - version = "1.10.7"; + version = "1.10.9"; }; nokogumbo = { dependencies = ["nokogiri"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 7327f7e02a8f5..2b4fddaa9c84e 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -18,13 +18,13 @@ buildGoPackage rec { goDeps = ./deps.nix; postInstall = '' - cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $bin/bin - cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $bin/ + cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $out/bin + cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $out/ ''; meta = with stdenv.lib; { description = "SSH access and repository management app for GitLab"; - homepage = http://www.gitlab.com/; + homepage = "http://www.gitlab.com/"; platforms = platforms.linux; maintainers = with maintainers; [ fpletz globin talyz ]; license = licenses.mit; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 0197e8d89b331..dda6783356754 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { pname = "gitlab-workhorse"; - version = "8.21.1"; + version = "8.21.2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1d384xw7hfrph4i61z9z315sik7ja9hgrvmhljirwxrch1fyx3m4"; + sha256 = "065yy8zfxahpybk3mbvc492by1lvssqcbqm8i4yp09m669rk239w"; }; goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse"; @@ -28,7 +28,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - homepage = http://www.gitlab.com/; + homepage = "http://www.gitlab.com/"; platforms = platforms.linux; maintainers = with maintainers; [ fpletz globin talyz ]; license = licenses.mit; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 20c713e8c39da..e8a58a6d59bb0 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -163,7 +163,7 @@ gem 'diffy', '~> 3.1.0' gem 'diff_match_patch', '~> 0.1.0' # Application server -gem 'rack', '~> 2.0.7' +gem 'rack', '~> 2.0.9' group :unicorn do gem 'unicorn', '~> 5.4.1' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index a808e85e43379..4d7b3d32a6b80 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -173,7 +173,7 @@ GEM concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) connection_pool (2.2.2) contracts (0.11.0) cork (0.3.0) @@ -783,7 +783,7 @@ GEM public_suffix (4.0.3) pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) - rack (2.0.7) + rack (2.0.9) rack-accept (0.4.5) rack (>= 0.4) rack-attack (6.2.0) @@ -854,17 +854,17 @@ GEM json recursive-open-struct (1.1.0) redis (4.1.3) - redis-actionpack (5.1.0) - actionpack (>= 4.0, < 7) - redis-rack (>= 1, < 3) + redis-actionpack (5.2.0) + actionpack (>= 5, < 7) + redis-rack (>= 2.1.0, < 3) redis-store (>= 1.1.0, < 2) redis-activesupport (5.2.0) activesupport (>= 3, < 7) redis-store (>= 1.3, < 2) redis-namespace (1.6.0) redis (>= 3.0.4) - redis-rack (2.0.6) - rack (>= 1.5, < 3) + redis-rack (2.1.2) + rack (>= 2.0.8, < 3) redis-store (>= 1.2, < 2) redis-rails (5.0.2) redis-actionpack (>= 5.0, < 6) @@ -1325,7 +1325,7 @@ DEPENDENCIES prometheus-client-mmap (~> 0.10.0) pry-byebug (~> 3.5.1) pry-rails (~> 0.3.9) - rack (~> 2.0.7) + rack (~> 2.0.9) rack-attack (~> 6.2.0) rack-cors (~> 1.0.6) rack-oauth2 (~> 1.9.3) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index f92b72361df57..dec89c43a8249 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -763,10 +763,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; type = "gem"; }; - version = "1.1.5"; + version = "1.1.6"; }; connection_pool = { groups = ["default"]; @@ -3501,10 +3501,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i"; + sha256 = "1mxzk12xylrz6d4n9jj5jasfscbf1pbk4idrb0nlf327lx9rwfkk"; type = "gem"; }; - version = "2.0.7"; + version = "2.0.9"; }; rack-accept = { dependencies = ["rack"]; @@ -3803,10 +3803,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hvai5ygkyii9wq8h98wim8shgrm7vkv0js62zpm85vdl1xzvphz"; + sha256 = "0c2276zzc0044zh37a8frx1v7hnra7z7k126154ps7njbqngfdv3"; type = "gem"; }; - version = "5.1.0"; + version = "5.2.0"; }; redis-activesupport = { dependencies = ["activesupport" "redis-store"]; @@ -3836,10 +3836,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pa19ydbk0l6wilwbxcjn6knfs4ffgj0rhaaldrlhf76pjgkaiqb"; + sha256 = "0ldw5sxyd80pv0gr89kvn6ziszlbs8lv1a573fkm6d0f11fps413"; type = "gem"; }; - version = "2.0.6"; + version = "2.1.2"; }; redis-rails = { dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"]; diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index a2a3a6d05b7ea..4c7bcefacb0d7 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix +#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.click python3Packages.click-log vgo2nix yarn2nix import click import click_log @@ -13,7 +13,6 @@ from distutils.version import LooseVersion from typing import Iterable import requests -from xml.etree import ElementTree logger = logging.getLogger(__name__) @@ -30,12 +29,11 @@ class GitLabRepo: @property def tags(self) -> Iterable[str]: - r = requests.get(self.url + "/tags?format=atom", stream=True) + r = requests.get(self.url + "/refs?sort=updated_desc&ref=master").json() + tags = r.get("Tags", []) - tree = ElementTree.fromstring(r.content) - versions = [e.text for e in tree.findall('{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}title')] # filter out versions not matching version_regex - versions = list(filter(self.version_regex.match, versions)) + versions = list(filter(self.version_regex.match, tags)) # sort, but ignore v and -ee for sorting comparisons versions.sort(key=lambda x: LooseVersion(x.replace("v", "").replace("-ee", "")), reverse=True) @@ -100,7 +98,7 @@ def cli(): @cli.command('update-data') -@click.option('--rev', default='latest', help='The rev to use, \'latest\' points to the latest (stable) tag') +@click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'') def update_data(rev: str): """Update data.nix""" repo = GitLabRepo() @@ -135,6 +133,7 @@ def update_rubyenv(): with open(rubyenv_dir / fn, 'w') as f: f.write(repo.get_file(fn, rev)) + subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir) subprocess.check_output(['bundix'], cwd=rubyenv_dir) @@ -174,6 +173,7 @@ def update_gitaly(): with open(gitaly_dir / fn, 'w') as f: f.write(repo.get_file(fn, f"v{gitaly_server_version}")) + subprocess.check_output(['bundle', 'lock'], cwd=gitaly_dir) subprocess.check_output(['bundix'], cwd=gitaly_dir) os.environ['GOROOT'] = "" @@ -227,10 +227,11 @@ def update_gitlab_workhorse(): os.unlink(gitlab_workhorse_dir / fn) @cli.command('update-all') +@click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'') @click.pass_context -def update_all(ctx): +def update_all(ctx, rev: str): """Update all gitlab components to the latest stable release""" - ctx.invoke(update_data, rev='latest') + ctx.invoke(update_data, rev=rev) ctx.invoke(update_rubyenv) ctx.invoke(update_yarnpkgs) ctx.invoke(update_gitaly) diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix index fe1cce9ba84bb..0cead50f03266 100644 --- a/pkgs/applications/version-management/gitless/default.nix +++ b/pkgs/applications/version-management/gitless/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://gitless.com/; + homepage = "https://gitless.com/"; description = "A version control system built on top of Git"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 9f298e0129ed6..60fed6954dc57 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Finely-grained git repository hosting"; - homepage = https://gitolite.com/gitolite/index.html; + homepage = "https://gitolite.com/gitolite/index.html"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.thoughtpolice maintainers.lassulus maintainers.tomberek ]; diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/applications/version-management/gitstats/default.nix index 5d29c8fcb6c30..b7432385a232b 100644 --- a/pkgs/applications/version-management/gitstats/default.nix +++ b/pkgs/applications/version-management/gitstats/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://gitstats.sourceforge.net/; + homepage = "http://gitstats.sourceforge.net/"; description = "Git history statistics generator"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 487026d8e3f96..48667ad8be390 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -34,13 +34,13 @@ buildGoPackage rec { ( optional sqliteSupport "sqlite" ++ optional pamSupport "pam"); - outputs = [ "bin" "out" "data" ]; + outputs = [ "out" "data" ]; postInstall = '' mkdir $data cp -R $src/{public,templates} $data - wrapProgram $bin/bin/gogs \ + wrapProgram $out/bin/gogs \ --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} ''; @@ -48,7 +48,7 @@ buildGoPackage rec { meta = { description = "A painless self-hosted Git service"; - homepage = https://gogs.io; + homepage = "https://gogs.io"; license = licenses.mit; maintainers = [ maintainers.schneefux ]; }; diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 2ce855d3a7f8b..683ad8711bf03 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://gource.io/; + homepage = "https://gource.io/"; description = "A Software version control visualization tool"; license = licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index 92bc9f51cac7f..1ff1030150f3e 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation { meta = { description = "Qt4 based GUI for monotone"; - homepage = https://guitone.thomaskeller.biz; - downloadPage = https://code.monotone.ca/p/guitone/; + homepage = "https://guitone.thomaskeller.biz"; + downloadPage = "https://code.monotone.ca/p/guitone/"; license = stdenv.lib.licenses.gpl3; inherit (qt4.meta) platforms; }; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index be1e8ff841ddd..3c46db6352e86 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -57,7 +57,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "Visual diff and merge tool"; - homepage = http://meldmerge.org/; + homepage = "http://meldmerge.org/"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ jtojnar mimame ]; diff --git a/pkgs/applications/version-management/mercurial/4.9.nix b/pkgs/applications/version-management/mercurial/4.9.nix index b8fc767bd3a27..f0918ab69a62d 100644 --- a/pkgs/applications/version-management/mercurial/4.9.nix +++ b/pkgs/applications/version-management/mercurial/4.9.nix @@ -60,8 +60,8 @@ in python2Packages.buildPythonApplication { meta = { inherit (mercurialSrc.meta) version; description = "A fast, lightweight SCM system for very large distributed projects"; - homepage = https://www.mercurial-scm.org; - downloadPage = https://www.mercurial-scm.org/release/; + homepage = "https://www.mercurial-scm.org"; + downloadPage = "https://www.mercurial-scm.org/release/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.eraserhd ]; updateWalker = true; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 3edfe39943471..ffbd98791358e 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -8,11 +8,11 @@ let in python3Packages.buildPythonApplication rec { pname = "mercurial"; - version = "5.3"; + version = "5.3.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "1fgr8k2ra7hs2dm8048pw01anmd41as246a5vm4m2sb7dcfzczz5"; + sha256 = "1nbjpzjrzgql4hrvslpxwbcgn885ikq6ba1yb4w6p78rw9nzkhgp"; }; format = "other"; @@ -56,8 +56,8 @@ in python3Packages.buildPythonApplication rec { meta = { inherit version; description = "A fast, lightweight SCM system for very large distributed projects"; - homepage = https://www.mercurial-scm.org; - downloadPage = https://www.mercurial-scm.org/release/; + homepage = "https://www.mercurial-scm.org"; + downloadPage = "https://www.mercurial-scm.org/release/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.eelco ]; updateWalker = true; diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix index 73acc3a6b36f1..816bfcde67f7f 100644 --- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix +++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "A program for visualising graphs"; - homepage = http://www.graphviz.org/; + homepage = "http://www.graphviz.org/"; branch = "2.0"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index 66e63fcc3750b..05ef7021f164e 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { bzr, darcs, fossil and veracity repositories, and support for other version control systems can easily be added. ''; - homepage = http://myrepos.branchable.com/; + homepage = "http://myrepos.branchable.com/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ antono henrytill ]; diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 6668631ca9a4f..07f9b442a74a0 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -31,7 +31,7 @@ buildPythonApplication rec { meta = { inherit version; description = "Strip output from Jupyter and IPython notebooks"; - homepage = https://github.com/kynan/nbstripout; + homepage = "https://github.com/kynan/nbstripout"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jluttine ]; }; diff --git a/pkgs/applications/version-management/nitpick/default.nix b/pkgs/applications/version-management/nitpick/default.nix index db9afdc0a74fd..bcb16ea867881 100644 --- a/pkgs/applications/version-management/nitpick/default.nix +++ b/pkgs/applications/version-management/nitpick/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { should pick. It's intended to be used with source code such that the issues can follow the code via whatever VCS or distribution mechanism. ''; - homepage = http://travisbrown.ca/projects/nitpick/docs/nitpick.html; + homepage = "http://travisbrown.ca/projects/nitpick/docs/nitpick.html"; license = with stdenv.lib.licenses; gpl2; maintainers = []; }; diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index 317cbfde85b03..148f122f7c8b0 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Perforce Visual Client"; - homepage = https://www.perforce.com; + homepage = "https://www.perforce.com"; license = stdenv.lib.licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; maintainers = with stdenv.lib.maintainers; [ nathyong nioncode ]; diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix index ea34617dc8b17..4cf2a2e864ca9 100644 --- a/pkgs/applications/version-management/peru/default.nix +++ b/pkgs/applications/version-management/peru/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/buildinspace/peru; + homepage = "https://github.com/buildinspace/peru"; description = "A tool for including other people's code in your projects"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index c6c0f0a52f4b2..74b793f0e77b5 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -57,7 +57,7 @@ in rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A distributed version control system"; - homepage = https://pijul.org; + homepage = "https://pijul.org"; license = with licenses; [ gpl2Plus ]; maintainers = [ maintainers.gal_bolle ]; platforms = platforms.all; diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index e9950c32549a4..2c58e15c443dd 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -34,7 +34,7 @@ python2Packages.buildPythonApplication rec { meta = { description = "Graphical tools for working with version control systems"; - homepage = http://rabbitvcs.org/; + homepage = "http://rabbitvcs.org/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.mathnerd314 ]; diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 60486e2011651..fc6a8adc2add4 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Multi-platform GUI front-end for the Subversion revision system"; - homepage = http://rapidsvn.tigris.org/; + homepage = "http://rapidsvn.tigris.org/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.viric ]; }; diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 3283a3c046a4e..404d6ae09bcec 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "format"; meta = { - homepage = https://www.gnu.org/software/rcs/; + homepage = "https://www.gnu.org/software/rcs/"; description = "Revision control system"; longDescription = '' The GNU Revision Control System (RCS) manages multiple revisions of diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile index b1c651695c796..beff147c374a0 100644 --- a/pkgs/applications/version-management/redmine/Gemfile +++ b/pkgs/applications/version-management/redmine/Gemfile @@ -1,8 +1,10 @@ source 'https://rubygems.org' +ruby '>= 2.3.0', '< 2.7.0' if Bundler::VERSION >= '1.12.0' gem "bundler", ">= 1.5.0" -gem "rails", "5.2.4.1" +gem 'rails', '5.2.4.2' +gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' gem "rouge", "~> 3.12.0" gem "request_store", "~> 1.4.1" gem "mini_mime", "~> 1.0.1" diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index 66326b282358d..60aed5e17922a 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -1,19 +1,19 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.4.1) - actionpack (= 5.2.4.1) + actioncable (5.2.4.2) + actionpack (= 5.2.4.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.4.1) - actionpack (= 5.2.4.1) - actionview (= 5.2.4.1) - activejob (= 5.2.4.1) + actionmailer (5.2.4.2) + actionpack (= 5.2.4.2) + actionview (= 5.2.4.2) + activejob (= 5.2.4.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.4.1) - actionview (= 5.2.4.1) - activesupport (= 5.2.4.1) + actionpack (5.2.4.2) + actionview (= 5.2.4.2) + activesupport (= 5.2.4.2) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -21,26 +21,26 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actionview (5.2.4.1) - activesupport (= 5.2.4.1) + actionview (5.2.4.2) + activesupport (= 5.2.4.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.4.1) - activesupport (= 5.2.4.1) + activejob (5.2.4.2) + activesupport (= 5.2.4.2) globalid (>= 0.3.6) - activemodel (5.2.4.1) - activesupport (= 5.2.4.1) - activerecord (5.2.4.1) - activemodel (= 5.2.4.1) - activesupport (= 5.2.4.1) + activemodel (5.2.4.2) + activesupport (= 5.2.4.2) + activerecord (5.2.4.2) + activemodel (= 5.2.4.2) + activesupport (= 5.2.4.2) arel (>= 9.0) - activestorage (5.2.4.1) - actionpack (= 5.2.4.1) - activerecord (= 5.2.4.1) + activestorage (5.2.4.2) + actionpack (= 5.2.4.2) + activerecord (= 5.2.4.2) marcel (~> 0.3.1) - activesupport (5.2.4.1) + activesupport (5.2.4.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -59,8 +59,8 @@ GEM regexp_parser (~> 1.5) xpath (~> 3.2) childprocess (3.0.0) - concurrent-ruby (1.1.5) - crass (1.0.5) + concurrent-ruby (1.1.6) + crass (1.0.6) css_parser (1.7.1) addressable csv (3.1.2) @@ -73,58 +73,58 @@ GEM concurrent-ruby (~> 1.0) jaro_winkler (1.5.4) json (2.3.0) - loofah (2.4.0) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) - method_source (0.9.2) - mimemagic (0.3.3) + method_source (1.0.0) + mimemagic (0.3.4) mini_magick (4.9.5) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.13.0) - mocha (1.11.1) + minitest (5.14.0) + mocha (1.11.2) mysql2 (0.5.3) net-ldap (0.16.2) nio4r (2.5.2) - nokogiri (1.10.7) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) parallel (1.19.1) - parser (2.6.5.0) + parser (2.7.1.0) ast (~> 2.4.0) pg (1.1.4) - public_suffix (4.0.1) - puma (3.12.2) - rack (2.0.8) + public_suffix (4.0.4) + puma (3.12.4) + rack (2.2.2) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.4.1) - actioncable (= 5.2.4.1) - actionmailer (= 5.2.4.1) - actionpack (= 5.2.4.1) - actionview (= 5.2.4.1) - activejob (= 5.2.4.1) - activemodel (= 5.2.4.1) - activerecord (= 5.2.4.1) - activestorage (= 5.2.4.1) - activesupport (= 5.2.4.1) + rails (5.2.4.2) + actioncable (= 5.2.4.2) + actionmailer (= 5.2.4.2) + actionpack (= 5.2.4.2) + actionview (= 5.2.4.2) + activejob (= 5.2.4.2) + activemodel (= 5.2.4.2) + activerecord (= 5.2.4.2) + activestorage (= 5.2.4.2) + activesupport (= 5.2.4.2) bundler (>= 1.3.0) - railties (= 5.2.4.1) + railties (= 5.2.4.2) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (5.2.4.1) - actionpack (= 5.2.4.1) - activesupport (= 5.2.4.1) + railties (5.2.4.2) + actionpack (= 5.2.4.2) + activesupport (= 5.2.4.2) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -135,15 +135,15 @@ GEM rbpdf-font (~> 1.19.0) rbpdf-font (1.19.1) redcarpet (3.5.0) - regexp_parser (1.6.0) + regexp_parser (1.7.0) request_store (1.4.1) rack (>= 1.4) - roadie (3.5.1) + roadie (4.0.0) css_parser (~> 1.4) nokogiri (~> 1.8) - roadie-rails (2.1.0) + roadie-rails (2.1.1) railties (>= 5.1, < 6.1) - roadie (~> 3.1) + roadie (>= 3.1, < 5.0) rouge (3.12.0) rubocop (0.76.0) jaro_winkler (~> 1.5.1) @@ -152,15 +152,15 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-performance (1.5.1) + rubocop-performance (1.5.2) rubocop (>= 0.71.0) rubocop-rails (2.3.2) rack (>= 1.1) rubocop (>= 0.72.0) ruby-openid (2.9.2) ruby-progressbar (1.10.1) - rubyzip (2.0.0) - selenium-webdriver (3.142.6) + rubyzip (2.3.0) + selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) simplecov (0.17.1) @@ -177,15 +177,15 @@ GEM sprockets (>= 3.0.0) thor (1.0.1) thread_safe (0.3.6) - tzinfo (1.2.5) + tzinfo (1.2.7) thread_safe (~> 0.1) - unicode-display_width (1.6.0) + unicode-display_width (1.6.1) websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.20) + yard (0.9.24) PLATFORMS ruby @@ -208,7 +208,7 @@ DEPENDENCIES pg (~> 1.1.4) puma (~> 3.7) rack-openid - rails (= 5.2.4.1) + rails (= 5.2.4.2) rails-dom-testing rbpdf (~> 1.20.0) redcarpet (~> 3.5.0) @@ -224,5 +224,8 @@ DEPENDENCIES tzinfo-data yard +RUBY VERSION + ruby 2.6.6p146 + BUNDLED WITH 2.1.4 diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index a133a9a6a2a99..2344e8dbd4b88 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, bundlerEnv, ruby }: let - version = "4.1.0"; + version = "4.1.1"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; inherit ruby; gemdir = ./.; - groups = [ "ldap" "openid" ]; + groups = [ "development" "ldap" "markdown" "minimagick" "openid" "test" ]; }; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1fxc0xql54cfvj4g8v31vsv19jbij326qkgdz2h5xlp09r821wli"; + sha256 = "1nndy5hz8zvfglxf1f3bsb1pkrfwinfxzkdan1vjs3rkckkszyh5"; }; buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ]; @@ -36,7 +36,7 @@ in ''; meta = with stdenv.lib; { - homepage = https://www.redmine.org/; + homepage = "https://www.redmine.org/"; platforms = platforms.linux; maintainers = [ maintainers.aanderse ]; license = licenses.gpl2; diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index e69cbb0e1c23f..9a4deb7e155af 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -1,33 +1,41 @@ { actioncable = { dependencies = ["actionpack" "nio4r" "websocket-driver"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yz5mcjl4is99650vq6rkv539xccq8mp5zsbvzh43wqzfga1llwm"; + sha256 = "0q4by8d41n972j8cdcddrwsh7qphcki50xvgm1syrawyck6w1f5v"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dbw3q3yyh7m7wgc4196hc3v86v123z0xz40llmic8iwx3d9vnda"; + sha256 = "0kg2nayy8wmxhfp52217h80yqr0mcg793xw3cjlfg9lkvdh0nb5z"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f5pm62y08j679k3vhcml8436f92kripd6j3v5dyvn760kwzz72z"; + sha256 = "1w1l9i6q9xns4yl41l582pyc5i1xi40yyyq802drm58gwylv3wax"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; actionpack-xml_parser = { dependencies = ["actionpack" "railties"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1rnm6jrw3mzcf2g3q498igmhsn0kfkxq79w0nm532iclx4g4djs0"; @@ -37,60 +45,74 @@ }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hnkyx268czfb6ljv6ipcnz9dbgsb1z9n1gcr6279z9wx9550zij"; + sha256 = "0fp3my6216lb9gp800s46y0404jwfl6xb3j9rvx4zf087497q8lp"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; activejob = { dependencies = ["activesupport" "globalid"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k4j3fcfc8m4hxwhs8xnbxazra760j3amn5r2zm2d5r1a1nqfh91"; + sha256 = "1qsvb89rwqrp779mvpn67qbzidg2q6d1fa8kwybvpc93nzb9zpvi"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; activemodel = { dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sg1yyz710pxhq9z0jsbpbgn666y8iv4aj7pywglydipp4i0bpx1"; + sha256 = "0jcfdv00kmifj86d0z347nw55q1f8vwzr1aa9jrfnwz47ndi22di"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p35d6pj1370mnlppqq9lhr7m1ck82xvv621wq6hy12v41qfdnrg"; + sha256 = "1yaqrh23c8krrjw6rvxv7pvnkpp46nk5aq9z2daby640si4xpmp5"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; activestorage = { dependencies = ["actionpack" "activerecord" "marcel"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dd8k91b88b875mypwqific2jilgzj5bx1637cwmzi4c0cy1v17f"; + sha256 = "1d51zp17c9k4brivm8y46rszcz07s5rb75gmkm0dpzg3rz3v38s9"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmlnx79sv18xv1ddm4vq7z3mwdfa4468mq5186av0k8n1k471sp"; + sha256 = "0y1397g5xxinjyxjsdmp8c92yn0y3bd2hl4wbmmrpd08bggy6flc"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; addressable = { dependencies = ["public_suffix"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; @@ -99,6 +121,8 @@ version = "2.7.0"; }; arel = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0"; @@ -107,6 +131,8 @@ version = "9.0.0"; }; ast = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; @@ -115,6 +141,8 @@ version = "2.4.0"; }; builder = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; @@ -124,6 +152,8 @@ }; capybara = { dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1bq1y3gy98rqgw8z69b42isc2klb75fvlwvpi36vycf1yk0sfmmx"; @@ -132,6 +162,8 @@ version = "3.25.0"; }; childprocess = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5"; @@ -140,23 +172,29 @@ version = "3.0.0"; }; concurrent-ruby = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; type = "gem"; }; - version = "1.1.5"; + version = "1.1.6"; }; crass = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "030sc98kjrb36rh7g21qsbdfxrj6knsjkx0mn3b7gig8zknwhp2f"; + sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw"; type = "gem"; }; - version = "1.0.5"; + version = "1.0.6"; }; css_parser = { dependencies = ["addressable"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "04c4dl8cm5rjr50k9qa6yl9r05fk9zcb1zxh0y0cdahxlsgcydfw"; @@ -165,6 +203,8 @@ version = "1.7.1"; }; csv = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "00szzw96bqz59r0kaab4p75qb0wq54iahmq37wpdg96bxc8y80f5"; @@ -173,6 +213,8 @@ version = "3.1.2"; }; docile = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif"; @@ -181,6 +223,8 @@ version = "1.3.2"; }; erubi = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; @@ -190,6 +234,8 @@ }; globalid = { dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1"; @@ -198,6 +244,8 @@ version = "0.4.2"; }; htmlentities = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; @@ -207,6 +255,8 @@ }; i18n = { dependencies = ["concurrent-ruby"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; @@ -215,6 +265,8 @@ version = "1.6.0"; }; jaro_winkler = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh"; @@ -223,6 +275,8 @@ version = "1.5.4"; }; json = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; @@ -232,15 +286,19 @@ }; loofah = { dependencies = ["crass" "nokogiri"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g7ps9m3s14cajhxrfgbzahv9i3gy47s4hqrv3mpybpj5cyr0srn"; + sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; mail = { dependencies = ["mini_mime"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; @@ -250,6 +308,8 @@ }; marcel = { dependencies = ["mimemagic"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx"; @@ -258,22 +318,28 @@ version = "0.3.3"; }; method_source = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; + sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; type = "gem"; }; - version = "0.9.2"; + version = "1.0.0"; }; mimemagic = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04cp5sfbh1qx82yqxn0q75c7hlcx8y1dr5g3kyzwm4mx6wi2gifw"; + sha256 = "0frrfvz52fh4v1sb2xr9pyxhrxm5f7jppqxagpmd7c5ific66l9p"; type = "gem"; }; - version = "0.3.3"; + version = "0.3.4"; }; mini_magick = { + groups = ["minimagick"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qy09qrd5bwh8mkbj514n5vcw9ni73218h9s3zmvbpmdwrnzi8j4"; @@ -282,6 +348,8 @@ version = "4.9.5"; }; mini_mime = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; @@ -290,6 +358,8 @@ version = "1.0.2"; }; mini_portile2 = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; @@ -298,22 +368,36 @@ version = "2.4.0"; }; minitest = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w16p7cvslh3hxd3cia8jg4pd85z7rz7xqb16vh42gj4rijn8rmi"; + sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; type = "gem"; }; - version = "5.13.0"; + version = "5.14.0"; }; mocha = { + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06i2q5qjr9mvjgjc8w41pdf3qalw340y33wjvzc0rp4a1cbbb7pp"; + sha256 = "0hxmkm8qxd04vwj8mqnpyrf2dwy7g1k9zipdfhl4y71cw7ijm9n4"; type = "gem"; }; - version = "1.11.1"; + version = "1.11.2"; }; mysql2 = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "mingw"; + } { + engine = "mingw"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; sha256 = "0d14pcy5m4hjig0zdxnl9in5f4izszc7v9zcczf2gyi5kiyxk8jw"; @@ -322,6 +406,8 @@ version = "0.5.3"; }; net-ldap = { + groups = ["ldap"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1vzfhivjfr9q65hkln7xig3qcba6fw9y4kb4384fpm7d7ww0b7xg"; @@ -330,6 +416,8 @@ version = "0.16.2"; }; nio4r = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0gnmvbryr521r135yz5bv8354m7xn6miiapfgpg1bnwsvxz8xj6c"; @@ -339,14 +427,18 @@ }; nokogiri = { dependencies = ["mini_portile2"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln"; + sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; type = "gem"; }; - version = "1.10.7"; + version = "1.10.9"; }; parallel = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2"; @@ -356,14 +448,26 @@ }; parser = { dependencies = ["ast"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09davv4ld6caqlczw64vhwf8hr41apys3cj8v2h96yxs4qg1m2iw"; + sha256 = "07awrcwm2xibglrh7qwpj24vwzn9p64m7bmfr9xbrlffaznr0ii7"; type = "gem"; }; - version = "2.6.5.0"; + version = "2.7.1.0"; }; pg = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "mingw"; + } { + engine = "mingw"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy"; @@ -372,31 +476,39 @@ version = "1.1.4"; }; public_suffix = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0"; + sha256 = "1l1kqw75asziwmzrig8rywxswxz8l91sc3pvns02ffsqac1a3wiz"; type = "gem"; }; - version = "4.0.1"; + version = "4.0.4"; }; puma = { + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07sb9xqc9bn5lvl9ia25w8x1fwzk52p5vgysnvjlc3hvn0r00ysj"; + sha256 = "0mg8yh478mh55pg7pv8z7xyvk35ra98hy61z9lwkfr8fzyyz57zs"; type = "gem"; }; - version = "3.12.2"; + version = "3.12.4"; }; rack = { + groups = ["default" "openid" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1id0jsslx1ipv0pbqjfn7mjbb2vx2xybk7qypq59a17163xp30gr"; + sha256 = "10mp9s48ssnw004aksq90gvhdvwczh8j6q82q2kqiqq92jd1zxbp"; type = "gem"; }; - version = "2.0.8"; + version = "2.2.2"; }; rack-openid = { dependencies = ["rack" "ruby-openid"]; + groups = ["openid"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0sg85yn981j3a0iri3ch4znzdwscvz29l7vrk3dafqw4fdg31llc"; @@ -406,6 +518,8 @@ }; rack-test = { dependencies = ["rack"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; @@ -415,15 +529,19 @@ }; rails = { dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1198azwbhlhq2n9xmpb19709d6smkanimip9cagvnlihagw80b20"; + sha256 = "1x8k6n4yziwf386prhvr9d9plc9fwv0j8spw2bnmkwhf54v2ias4"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; @@ -433,6 +551,8 @@ }; rails-html-sanitizer = { dependencies = ["loofah"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f"; @@ -442,14 +562,18 @@ }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iqsqyyjscwnj2d3i0zl2k9apgsm7bb92l5h4wv1zbpdbb30wsqb"; + sha256 = "1p2rnd1xdqlk19k3m5gd058yzvwjj25k5hwn4km683b5dhylpd16"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; rainbow = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; @@ -458,6 +582,8 @@ version = "3.0.0"; }; rake = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; @@ -467,6 +593,8 @@ }; rbpdf = { dependencies = ["htmlentities" "rbpdf-font"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0sdj8frakpdms820rwlil38h9bh3p24xmwnjrxsjc1p9irc3za71"; @@ -475,6 +603,8 @@ version = "1.20.1"; }; rbpdf-font = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0pxlr0l4vf785qpy55m439dyii63a26l0sd0yyhbwwcy9zm9hd1v"; @@ -483,6 +613,8 @@ version = "1.19.1"; }; redcarpet = { + groups = ["markdown"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k"; @@ -491,15 +623,19 @@ version = "3.5.0"; }; regexp_parser = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l44ml30jvqpdi3707x1n1dinq7fx9887pv3q2ywyfmi4kja7yf2"; + sha256 = "0l2vcj9qffj5b3v9jsyi4k994bdj3rjz7l9ql8x04lndqxfrrrv2"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; request_store = { dependencies = ["rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1963330z03fk382fi8y231ygcbnh86m91dqlp5rh1mwy9ihzzl6d"; @@ -509,23 +645,29 @@ }; roadie = { dependencies = ["css_parser" "nokogiri"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zihd316bkbnrinz5s1s7pg7s0cadhhj6qs7wmc713j0g6ai1k9r"; + sha256 = "01kld3drqfiih5x8c13cvr6dpvdl7jml0v9bcw4fsy322lax3kn0"; type = "gem"; }; - version = "3.5.1"; + version = "4.0.0"; }; roadie-rails = { dependencies = ["railties" "roadie"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hdkmnxrmw31dn9jq43xiypz2v6rbvg4x2yd2hgl2xbl3lm1ln7i"; + sha256 = "1fmn7kkbpgipjsx65rw7hqa3bwinlqykx5qf1x28ya9ag8v2q0ph"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.1"; }; rouge = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "08fpnxbhqv5sqpnfjasl1ysxafssyq4q1yhcqamqqzmb9czj1czw"; @@ -535,6 +677,8 @@ }; rubocop = { dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "07x51ixlx76y194xsszh5lbkaqakz44ykbrjxg3qaggbs18790q0"; @@ -544,15 +688,19 @@ }; rubocop-performance = { dependencies = ["rubocop"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kn6rb0ma32gjp5qdvrbbb9ckh66rm6xpfrw8h3kr7svirsww2h8"; + sha256 = "1fk9nd3b24avgsqp726hy2pl1iyfjrh6jni97wkky6kqy0lq6zq2"; type = "gem"; }; - version = "1.5.1"; + version = "1.5.2"; }; rubocop-rails = { dependencies = ["rack" "rubocop"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1q7ffsq1cjm4m949nh935kjzv4zf1pacnrl00siwh8flhcn3mmjf"; @@ -561,6 +709,8 @@ version = "2.3.2"; }; ruby-openid = { + groups = ["openid"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "190p1m0bxd9xkfk1j6cpcv3x5c367g36nsglg4m1fcwqdd13k3kz"; @@ -569,6 +719,8 @@ version = "2.9.2"; }; ruby-progressbar = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; @@ -577,24 +729,30 @@ version = "1.10.1"; }; rubyzip = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gz0ri0pa2xr7b6bf66yjc2wfvk51f4gi6yk7bklwl1nr65zc4gz"; + sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; type = "gem"; }; - version = "2.0.0"; + version = "2.3.0"; }; selenium-webdriver = { dependencies = ["childprocess" "rubyzip"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11abil34dr8p1kw7hlaqd6kr430v4srmhzf72zzqvhcimlfvm4yb"; + sha256 = "0adcvp86dinaqq3nhf8p3m0rl2g6q0a4h52k0i7kdnsg1qz9k86y"; type = "gem"; }; - version = "3.142.6"; + version = "3.142.7"; }; simplecov = { dependencies = ["docile" "json" "simplecov-html"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1135k46nik05sdab30yxb8264lqiz01c8v000g16cl9pjc4mxrdw"; @@ -603,6 +761,8 @@ version = "0.17.1"; }; simplecov-html = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn"; @@ -612,6 +772,8 @@ }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0jm37zpvvm1arxjwrd6am0wrdbfhrhc5y0l4p2i3p11z04bsvgap"; @@ -621,6 +783,8 @@ }; sprockets-rails = { dependencies = ["actionpack" "activesupport" "sprockets"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1"; @@ -629,6 +793,8 @@ version = "3.2.1"; }; thor = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; @@ -637,6 +803,8 @@ version = "1.0.1"; }; thread_safe = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; @@ -646,23 +814,29 @@ }; tzinfo = { dependencies = ["thread_safe"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; type = "gem"; }; - version = "1.2.5"; + version = "1.2.7"; }; unicode-display_width = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w"; + sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; websocket-driver = { dependencies = ["websocket-extensions"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2"; @@ -671,6 +845,8 @@ version = "0.7.1"; }; websocket-extensions = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m"; @@ -680,6 +856,8 @@ }; xpath = { dependencies = ["nokogiri"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; @@ -688,11 +866,13 @@ version = "3.2.0"; }; yard = { + groups = ["development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rxqwry3h2hjz069f0kfr140wgx1khgljnqf112dk5x9rm4l0xny"; + sha256 = "1g0bw2qcl48fxawrdf68l229508z53mrqisavji2lkxzv4w4j2pp"; type = "gem"; }; - version = "0.9.20"; + version = "0.9.24"; }; } \ No newline at end of file diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix index 8dd46405d31f8..f52fd30d8391f 100644 --- a/pkgs/applications/version-management/reposurgeon/default.nix +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, python27Packages, git , docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto, pypy -, bazaar ? null, cvs ? null, darcs ? null, fossil ? null +, breezy ? null, cvs ? null, darcs ? null, fossil ? null , mercurial ? null, monotone ? null, rcs ? null , subversion ? null, cvs_fast_export ? null }: @@ -13,7 +13,7 @@ in mkDerivation rec { description = "A tool for editing version-control repository history"; version = "3.44"; license = licenses.bsd3; - homepage = http://www.catb.org/esr/reposurgeon/; + homepage = "http://www.catb.org/esr/reposurgeon/"; maintainers = with maintainers; [ dfoxfranke ]; platforms = platforms.all; }; @@ -42,7 +42,7 @@ in mkDerivation rec { let binpath = makeBinPath ( filter (x: x != null) - [ out git bazaar cvs darcs fossil mercurial + [ out git breezy cvs darcs fossil mercurial monotone rcs src subversion cvs_fast_export ] ); pythonpath = makeSearchPathOutput "lib" python.sitePackages ( diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index aa2cdfab82ac4..67bda7a4fddc6 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Serverless Information Tracker"; - homepage = https://sit.fyi/; + homepage = "https://sit.fyi/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ dywedir yrashk ]; platforms = platforms.all; diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index df55f20783fa7..51fe70d3952f4 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GUI for Git, Mercurial, Subversion"; - homepage = https://www.syntevo.com/smartgit/; + homepage = "https://www.syntevo.com/smartgit/"; license = licenses.unfree; platforms = platforms.linux; maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 07935336c1e29..a40a0552338dc 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -4,14 +4,14 @@ , srht, redis, celery, pyyaml, markdown }: let - version = "0.52.5"; + version = "0.56.13"; buildWorker = src: buildGoModule { inherit src version; pname = "builds-sr-ht-worker"; goPackagePath = "git.sr.ht/~sircmpwn/builds.sr.ht/worker"; - modSha256 = "1dwp87zsbh4a48q0pacssy329kchrd4sa47c5a1k8smbqn078424"; + vendorSha256 = "0prdlihcy5yz760llwyby747yy2981dn3gy401a48df7ndlfj6lp"; }; in buildPythonPackage rec { inherit version; @@ -20,7 +20,7 @@ in buildPythonPackage rec { src = fetchgit { url = "https://git.sr.ht/~sircmpwn/builds.sr.ht"; rev = version; - sha256 = "142aycnary6yfi0y1i3zgpyndi0756fingavcz2dnqi36pkajaaj"; + sha256 = "uFoS9xaVXsZZf4neZQcUyTqKo2RshOQeifD27kaKSVE="; }; patches = [ @@ -52,9 +52,9 @@ in buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://git.sr.ht/~sircmpwn/builds.sr.ht; + homepage = "https://git.sr.ht/~sircmpwn/builds.sr.ht"; description = "Continuous integration service for the sr.ht network"; license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 8a6c3e6feb4ec..76a81ce896836 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -1,18 +1,18 @@ { stdenv, fetchgit, fetchNodeModules, buildPythonPackage -, pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests -, sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, celery, alembic -, importlib-metadata +, pgpy, flask, bleach, misaka, humanize, html5lib, markdown, psycopg2, pygments +, requests, sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, prometheus_client +, celery, alembic, importlib-metadata , sassc, nodejs , writeText }: buildPythonPackage rec { pname = "srht"; - version = "0.57.2"; + version = "0.59.13"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/core.sr.ht"; rev = version; - sha256 = "11rfpb0wf1xzrhcnpahaghmi5626snzph0vsbxlmmqx75wf0p6mf"; + sha256 = "5jc6MtG/cBry05Sq51UAFzSBvKKkdNTA67UIDvJt9uU="; }; node_modules = fetchNodeModules { @@ -36,6 +36,7 @@ buildPythonPackage rec { bleach misaka humanize + html5lib markdown psycopg2 pygments @@ -44,6 +45,7 @@ buildPythonPackage rec { cryptography beautifulsoup4 sqlalchemy-utils + prometheus_client # Unofficial runtime dependencies? celery @@ -60,7 +62,7 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; meta = with stdenv.lib; { - homepage = https://git.sr.ht/~sircmpwn/srht; + homepage = "https://git.sr.ht/~sircmpwn/srht"; description = "Core modules for sr.ht"; license = licenses.bsd3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix index a078c5acb4f32..52a49d4a0845b 100644 --- a/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "dispatchsrht"; - version = "0.13.3"; + version = "0.14.1"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/dispatch.sr.ht"; rev = version; - sha256 = "08asayfwpzafscpli5grx1p0y1ryz7pqkznf5bd9j8ir2iyhbc10"; + sha256 = "eJ+oHs9m74Q8V6fUBLOA1ksUiwdaR1/Bxlf3jcexdkA="; }; patches = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://dispatch.sr.ht/~sircmpwn/dispatch.sr.ht; + homepage = "https://dispatch.sr.ht/~sircmpwn/dispatch.sr.ht"; description = "Task dispatcher and service integration tool for the sr.ht network"; license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 93ab499e14e34..27ac5cc858dc0 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -1,17 +1,17 @@ { stdenv, fetchgit, buildPythonPackage , python , buildGoModule -, srht, pygit2, scmsrht }: +, srht, minio, pygit2, scmsrht }: let - version = "0.43.3"; + version = "0.50.3"; buildShell = src: buildGoModule { inherit src version; pname = "gitsrht-shell"; goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-shell"; - modSha256 = "0lxxxzh39bviab71kfsqqr217338yxn5l2zkak55r6qqs6iz4ccv"; + vendorSha256 = "1zvbqn4r940mibn4h1cqz94gbr476scm281ps361n0rfqlimw8g5"; }; buildDispatcher = src: buildGoModule { @@ -19,7 +19,7 @@ let pname = "gitsrht-dispatcher"; goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-dispatch"; - modSha256 = "1lmgmlin460g09dph2hw6yz25d4agqwjhrjv0qqsis7df9qpf3i1"; + vendorSha256 = "1lzkf13m54pq0gnn3bcxc80nfg76hgck4l8q8jpaicrsiwgcyrd9"; }; buildKeys = src: buildGoModule { @@ -27,7 +27,7 @@ let pname = "gitsrht-keys"; goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-keys"; - modSha256 = "1pfcw9n63zhlxm9kd3bxa2zqmzd8mgl7yl2ck055j56v3k929w3f"; + vendorSha256 = "16j7kpar318s4766pln8xn6d51xqblwig5n1jywhj0sl80qjl5cv"; }; buildUpdateHook = src: buildGoModule { @@ -35,7 +35,7 @@ let pname = "gitsrht-update-hook"; goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-update-hook"; - modSha256 = "0p8qd6hpgmnlfqk5vw6l41dqs7qjhf6xijzj5iv6wv1cf362b4wp"; + vendorSha256 = "1rmv3p60g6w4h4v9wx99jkyx0q02snslyjrjy9n1flardjs01b63"; }; in buildPythonPackage rec { inherit version; @@ -44,7 +44,7 @@ in buildPythonPackage rec { src = fetchgit { url = "https://git.sr.ht/~sircmpwn/git.sr.ht"; rev = version; - sha256 = "1f9wfyri85bq4zi9xkbfcfb69q4abh0hz7p3lghj460hh9zxc57w"; + sha256 = "dmcTee3hp6ZkwwunG4ouEVmCxQ1a9LfQ7oWpHxnKumc="; }; patches = [ @@ -55,6 +55,7 @@ in buildPythonPackage rec { propagatedBuildInputs = [ srht + minio pygit2 scmsrht ]; @@ -73,9 +74,9 @@ in buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://git.sr.ht/~sircmpwn/git.sr.ht; + homepage = "https://git.sr.ht/~sircmpwn/git.sr.ht"; description = "Git repository hosting service for the sr.ht network"; license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index 2d57012d071d0..ee6dd27075914 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "hgsrht"; - version = "0.21.1"; + version = "0.26.0"; src = fetchhg { url = "https://hg.sr.ht/~sircmpwn/hg.sr.ht"; rev = version; - sha256 = "19r8zcy4xf9imqifqw3b7ylxd46i025ncns69kn5xp11damilz66"; + sha256 = "kX0KZSEzYQ/hxL2vKh+mpaRuG16qbBKN2Xwp+e9pTxs="; }; patches = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://git.sr.ht/~sircmpwn/hg.sr.ht; + homepage = "https://git.sr.ht/~sircmpwn/hg.sr.ht"; description = "Mercurial repository hosting service for the sr.ht network"; license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index a7915a917baf3..1d915e915b109 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "listssrht"; - version = "0.40.3"; + version = "0.41.8"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/lists.sr.ht"; rev = version; - sha256 = "1s736i5wm04pqa5k7455bdjdi7vjgvq32q1v6mdsp1w7jhgy1ags"; + sha256 = "Gmt6ttupyhZhpyH/IASEt8SZGrlQmEEtV5bE11yIiXQ="; }; patches = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://git.sr.ht/~sircmpwn/lists.sr.ht; + homepage = "https://git.sr.ht/~sircmpwn/lists.sr.ht"; description = "Mailing list service for the sr.ht network"; license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index 7ed4c6a5a2488..a150b774f6145 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "mansrht"; - version = "0.14.1"; + version = "0.14.7"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/man.sr.ht"; rev = version; - sha256 = "13yar0sa24jyiq0l4p4bgq6p5crj148f26sxwyi37g76jqba4rfi"; + sha256 = "CKXWVXr2P1D6Nz9/S5rOkuOi9piy66RreQv2RQ0KSfs="; }; patches = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://git.sr.ht/~sircmpwn/man.sr.ht; + homepage = "https://git.sr.ht/~sircmpwn/man.sr.ht"; description = "Wiki service for the sr.ht network"; license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index 17b4c91446f66..5b75b5818d72c 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -1,16 +1,16 @@ { stdenv, fetchgit, buildPythonPackage , python , pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache -, sshpubkeys, weasyprint, prometheus_client }: +, sshpubkeys, weasyprint }: buildPythonPackage rec { pname = "metasrht"; - version = "0.41.10"; + version = "0.42.13"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/meta.sr.ht"; rev = version; - sha256 = "1srzrajgwq85kjryxykj708m2c98r6a84x4k4a5grwznqw3mwm6p"; + sha256 = "p7WgnfOsX09YxJJclHwdIky/jYkTOxibbYmXwcmE2S4="; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -27,7 +27,6 @@ buildPythonPackage rec { pystache sshpubkeys weasyprint - prometheus_client ]; patches = [ @@ -40,7 +39,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://git.sr.ht/~sircmpwn/meta.sr.ht; + homepage = "https://git.sr.ht/~sircmpwn/meta.sr.ht"; description = "Account management service for the sr.ht network"; license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index b629ca9bca301..e05dec5d6aaa9 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "pastesrht"; - version = "0.9.2"; + version = "0.10.3"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/paste.sr.ht"; rev = version; - sha256 = "0hiv607a7446dba524kblmpswlcz0z4i1jr49ng7g90nhpsk8dy4"; + sha256 = "i1M4L5NG152zkIEFj2vDHa9lr5aE1ioToDVPpkIqemk="; }; patches = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://git.sr.ht/~sircmpwn/paste.sr.ht; + homepage = "https://git.sr.ht/~sircmpwn/paste.sr.ht"; description = "Ad-hoc text file hosting service for the sr.ht network"; license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index add791da28403..e3210673cb73a 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "scmsrht"; - version = "0.18.1"; + version = "0.19.11"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/scm.sr.ht"; rev = version; - sha256 = "1f0h8vbbqx34v1rgzqjkgbf0z7jhnp8hdlzmrxwhs74kj6zjb134"; + sha256 = "a0JIZcO/3op409t+jq4/fImuppuGqfGxBPgBh67DGHM="; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -28,7 +28,7 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; meta = with stdenv.lib; { - homepage = https://git.sr.ht/~sircmpwn/git.sr.ht; + homepage = "https://git.sr.ht/~sircmpwn/git.sr.ht"; description = "Shared support code for sr.ht source control services."; license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 572c2919b16d8..3a5bc2c105eaf 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "todosrht"; - version = "0.55.3"; + version = "0.57.14"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/todo.sr.ht"; rev = version; - sha256 = "1j82yxdnag0q6rp0rpiq3ccn5maa1k58j2f1ilcsxf1gr13pycf5"; + sha256 = "nlTf7KV6vjqqVEXZ6OOZ5dAj1iHTDPYj4DnAD2hGp5c="; }; patches = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; meta = with stdenv.lib; { - homepage = https://todo.sr.ht/~sircmpwn/todo.sr.ht; + homepage = "https://todo.sr.ht/~sircmpwn/todo.sr.ht"; description = "Ticket tracking service for the sr.ht network"; license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix index 693af89d97853..6deca94fc15ce 100644 --- a/pkgs/applications/version-management/srcml/default.nix +++ b/pkgs/applications/version-management/srcml/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Infrastructure for exploration, analysis, and manipulation of source code"; - homepage = https://www.srcml.org; + homepage = "https://www.srcml.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars ]; }; diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index c095aa49eafb5..173333fb75c73 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -109,7 +109,7 @@ in stdenv.mkDerivation (rec { meta = with stdenv.lib; { description = "Git client from the makers of Sublime Text"; - homepage = https://www.sublimemerge.com; + homepage = "https://www.sublimemerge.com"; maintainers = with maintainers; [ zookatron ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/version-management/tkcvs/default.nix b/pkgs/applications/version-management/tkcvs/default.nix index 48558c15dc1c4..d2a7299bcd9ee 100644 --- a/pkgs/applications/version-management/tkcvs/default.nix +++ b/pkgs/applications/version-management/tkcvs/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation name = "tkcvs-8.2.1"; src = fetchurl { - url = mirror://sourceforge/tkcvs/tkcvs_8_2_1.tar.gz; + url = "mirror://sourceforge/tkcvs/tkcvs_8_2_1.tar.gz"; sha256 = "0kvj6rcx1153wq0n1lmd8imbrki6xy5wxghwzlb9i15l65sclg3i"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation ''; meta = { - homepage = https://tkcvs.sourceforge.io; + homepage = "https://tkcvs.sourceforge.io"; description = "TCL/TK GUI for cvs and subversion"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 653db11ab5d32..2743d4f827fb9 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -44,7 +44,7 @@ in python3Packages.buildPythonApplication { meta = { description = "Qt based graphical tool for working with Mercurial"; - homepage = https://tortoisehg.bitbucket.io/; + homepage = "https://tortoisehg.bitbucket.io/"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ danbst ]; diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix index 2ad6b6f2f62c5..85fe83996da31 100644 --- a/pkgs/applications/version-management/vcprompt/default.nix +++ b/pkgs/applications/version-management/vcprompt/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { A little C program that prints a short string with barebones information about the current working directory for various version control systems ''; - homepage = http://hg.gerg.ca/vcprompt; + homepage = "http://hg.gerg.ca/vcprompt"; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; linux ++ darwin; license = licenses.gpl2Plus; diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index 8a014a6339301..c4af492decea9 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Version Control System for $HOME"; - homepage = https://github.com/RichiH/vcsh; + homepage = "https://github.com/RichiH/vcsh"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ttuegel ]; platforms = platforms.unix; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index aab47ed1327b5..fab89d663fa7f 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/TheLocehiliosan/yadm; + homepage = "https://github.com/TheLocehiliosan/yadm"; description = "Yet Another Dotfiles Manager"; longDescription = '' yadm is a dotfile management tool with 3 main features: diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 00bdb370aae4e..9374d2dbc7902 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://fixounet.free.fr/avidemux/; + homepage = "http://fixounet.free.fr/avidemux/"; description = "Free video editor designed for simple video editing tasks"; maintainers = with maintainers; [ abbradar ma27 ]; # "CPU not supported" errors on AArch64 diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index f16f655b95db3..2cccbae43d2ca 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A script system that allows advanced non-linear editing"; - homepage = https://github.com/avxsynth/avxsynth; + homepage = "https://github.com/avxsynth/avxsynth"; license = licenses.gpl2Plus; maintainers = with maintainers; [ codyopel ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix index c3f5d7d796d48..4554bea61571c 100644 --- a/pkgs/applications/video/bino3d/default.nix +++ b/pkgs/applications/video/bino3d/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { meta = with lib; { description = "Stereoscopic 3D and multi-display video player"; - homepage = https://bino3d.org/; + homepage = "https://bino3d.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index a9d98a9a2a44c..d812ac4887420 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,7 +1,7 @@ -{ config, stdenv, fetchFromGitHub +{ mkDerivation, config, stdenv, fetchFromGitHub , fetchpatch, pkgconfig, perl, python, which , libX11, libxcb, libGLU, libGL -, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper +, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake , libchardet , ffmpeg @@ -29,7 +29,7 @@ assert pulseSupport -> libpulseaudio != null; assert cddaSupport -> libcdda != null; assert youtubeSupport -> youtube-dl != null; -stdenv.mkDerivation rec { +mkDerivation rec { pname = "bomi"; version = "0.9.11"; @@ -90,8 +90,9 @@ stdenv.mkDerivation rec { patchShebangs build-mpv ''; + dontWrapQtApps = true; postInstall = '' - wrapProgram $out/bin/bomi \ + wrapQtApp $out/bin/bomi \ ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"} ''; @@ -105,11 +106,11 @@ stdenv.mkDerivation rec { ++ optional cddaSupport "--enable-cdda" ; - nativeBuildInputs = [ makeWrapper pkgconfig perl python which qttools qmake ]; + nativeBuildInputs = [ pkgconfig perl python which qttools qmake ]; meta = with stdenv.lib; { description = "Powerful and easy-to-use multimedia player"; - homepage = https://bomi-player.github.io/; + homepage = "https://bomi-player.github.io/"; license = licenses.gpl2Plus; maintainers = [ maintainers.abbradar ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 10685a72f1098..f5d40a5c34cc5 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "byzanz"; src = fetchgit { - url = git://github.com/GNOME/byzanz; + url = "git://github.com/GNOME/byzanz"; rev = "1875a7f6a3903b83f6b1d666965800f47db9286a"; sha256 = "0a72fw2mxl8vdcdnzy0bwis4jk28pd7nc8qgr4vhyw5pd48dynvh"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser"; - homepage = https://github.com/GNOME/byzanz; + homepage = "https://github.com/GNOME/byzanz"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ ]; diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index 027c156be35d8..b3df290bfb094 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -8,11 +8,11 @@ buildPythonApplication rec { pname = "catt"; - version = "0.10.3"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "08rjimcy9n7nvh4dz9693gjmkq6kaq5pq1nmjjsdrb7vb89yl53i"; + hash = "sha256:1vq1wg79b7855za6v6bsfgypm0v3b4wakap4rash45mhzbgjj0kq"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 36ad39bd37c18..22533b182a0f3 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = { description = "Video Editor"; - homepage = http://www.cinelerra.org; + homepage = "http://www.cinelerra.org"; maintainers = [ stdenv.lib.maintainers.marcweber ]; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/video/clickshare-csc1/default.nix b/pkgs/applications/video/clickshare-csc1/default.nix index 53d257dd9d070..e4e72704fb0b3 100644 --- a/pkgs/applications/video/clickshare-csc1/default.nix +++ b/pkgs/applications/video/clickshare-csc1/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { version = "01.07.00.033"; src = fetchurl { name = "clickshare-csc1-${version}.zip"; - url = https://www.barco.com/services/website/de/TdeFiles/Download?FileNumber=R33050020&TdeType=3&MajorVersion=01&MinorVersion=07&PatchVersion=00&BuildVersion=033; + url = "https://www.barco.com/services/website/de/TdeFiles/Download?FileNumber=R33050020&TdeType=3&MajorVersion=01&MinorVersion=07&PatchVersion=00&BuildVersion=033"; sha256 = "0h4jqidqvk4xkaky5bizi7ilz4qzl2mh68401j21y3djnzx09br3"; }; @@ -106,8 +106,8 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.barco.com/de/support/clickshare-csc-1/drivers; - downloadPage = https://www.barco.com/de/Support/software/R33050020; + homepage = "https://www.barco.com/de/support/clickshare-csc-1/drivers"; + downloadPage = "https://www.barco.com/de/Support/software/R33050020"; platforms = [ "i686-linux" "x86_64-linux" ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.yarny ]; diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index a2de52468f29f..a094bfd904abd 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; meta = { - homepage = https://damien.douxchamps.net/ieee1394/coriander/; + homepage = "https://damien.douxchamps.net/ieee1394/coriander/"; description = "GUI for controlling a Digital Camera through the IEEE1394 bus"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index aee6fab77a23e..2ec2f68d12853 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -46,7 +46,7 @@ in buildPythonApplication { meta = with stdenv.lib; { description = "DVD Creator for Linux"; - homepage = http://www.rastersoft.com/programas/devede.html; + homepage = "http://www.rastersoft.com/programas/devede.html"; license = licenses.gpl3; maintainers = [ maintainers.bdimcheff ]; }; diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix index a032ef654aa3d..8fa88e3244947 100644 --- a/pkgs/applications/video/dvb-apps/default.nix +++ b/pkgs/applications/video/dvb-apps/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Linux DVB API applications and utilities"; - homepage = https://linuxtv.org/; + homepage = "https://linuxtv.org/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; broken = true; # 2018-04-10 diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index 61894bd22f8ef..f6e336240d3de 100644 --- a/pkgs/applications/video/dvd-slideshow/default.nix +++ b/pkgs/applications/video/dvd-slideshow/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { meta = { description = "Suite of command line programs that creates a slideshow-style video from groups of pictures"; - homepage = http://dvd-slideshow.sourceforge.net/wiki/Main_Page; + homepage = "http://dvd-slideshow.sourceforge.net/wiki/Main_Page"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.robbinch ]; diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index c15a892e69813..6be1d8a1633f2 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { description = "Tools for generating DVD files to be played on standalone DVD players"; - homepage = http://dvdauthor.sourceforge.net/; + homepage = "http://dvdauthor.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/applications/video/dvdbackup/default.nix b/pkgs/applications/video/dvdbackup/default.nix index 54be20d5faffc..e129031fd49c4 100644 --- a/pkgs/applications/video/dvdbackup/default.nix +++ b/pkgs/applications/video/dvdbackup/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool to rip video DVDs from the command line"; - homepage = http://dvdbackup.sourceforge.net/; + homepage = "http://dvdbackup.sourceforge.net/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bradediger ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index 495501e0c1872..b78f9ed816b78 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { - copy any menu object or whole menu - customize navigation using DVD scripting ''; - homepage = http://www.dvdstyler.org/; + homepage = "http://www.dvdstyler.org/"; license = with licenses; gpl2; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; linux; diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index 4fad80c27ab19..c2259ce83794c 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.15.8"; + version = "1.19.0"; src = fetchPypi { inherit pname version; - sha256 = "01lx1ki1iglg1dz6x99ciqx5zqlbj7hvfb12ga9m68ypjm0fcphl"; + sha256 = "18dpck9grnr3wgbjvdh4mjlx0zfwcxpy4rnpmc39in0yk3w7li2x"; }; propagatedBuildInputs = [ ffmpeg tqdm ]; diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index 3e26b4d68c229..3bd7785f201ca 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gnome MPlayer, a simple GUI for MPlayer"; - homepage = https://sites.google.com/site/kdekorte2/gnomemplayer; + homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer"; license = licenses.gpl2; maintainers = with maintainers; []; platforms = platforms.linux; diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix index d840f43163cf5..3b7e8913c5d1d 100644 --- a/pkgs/applications/video/gnomecast/default.nix +++ b/pkgs/applications/video/gnomecast/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { meta = with lib; { description = "A native Linux GUI for Chromecasting local files"; - homepage = https://github.com/keredson/gnomecast; + homepage = "https://github.com/keredson/gnomecast"; license = with licenses; [ gpl3 ]; }; } diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index f81f394ed0b8a..e587a5999054d 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { A multimedia packager, called MP4Box, And some server tools included in MP4Box and MP42TS applications. ''; - homepage = https://gpac.wp.imt.fr; + homepage = "https://gpac.wp.imt.fr"; license = licenses.lgpl21; maintainers = with maintainers; [ bluescreen303 mgdelacroix ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index ab70802066327..bbbb60bdf511d 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -7,9 +7,9 @@ # be nice to add the native GUI (and/or the GTK GUI) as an option too, but that # requires invoking the Xcode build system, which is non-trivial for now. -{ stdenv, lib, fetchurl, fetchpatch, +{ stdenv, lib, fetchFromGitHub, # Main build tools - python2, pkgconfig, autoconf, automake, libtool, m4, lzma, + pkgconfig, autoconf, automake, libtool, m4, lzma, python3, numactl, # Processing, video codecs, containers ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, dav1d, @@ -30,34 +30,64 @@ # for now we disable GTK GUI support on Darwin. (It may be possible to remove # this restriction later.) useGtk ? !stdenv.isDarwin, wrapGAppsHook ? null, - intltool ? null, - glib ? null, - gtk3 ? null, - libappindicator-gtk3 ? null, - libnotify ? null, - gst_all_1 ? null, - dbus-glib ? null, - udev ? null, - libgudev ? null, - hicolor-icon-theme ? null, + intltool ? null, + glib ? null, + gtk3 ? null, + libappindicator-gtk3 ? null, + libnotify ? null, + gst_all_1 ? null, + dbus-glib ? null, + udev ? null, + libgudev ? null, + hicolor-icon-theme ? null, # FDK useFdk ? false, fdk_aac ? null }: -assert stdenv.isDarwin -> AudioToolbox != null && Foundation != null - && libobjc != null && VideoToolbox != null; +assert stdenv.isDarwin -> AudioToolbox != null + && Foundation != null + && libobjc != null + && VideoToolbox != null; stdenv.mkDerivation rec { pname = "handbrake"; - version = "1.3.1"; + version = "1.3.2"; - src = fetchurl { - url = ''https://download.handbrake.fr/releases/${version}/HandBrake-${version}-source.tar.bz2''; - sha256 = "09rcrq0kjs1lc1as7w3glbpbfvzldwpx3xv0pfmkn4pl7acxw1f0"; + src = fetchFromGitHub { + owner = "HandBrake"; + repo = "HandBrake"; + rev = version; + sha256 = "04z3hcy7m5yvma849rlrsx2wdqmkilkl1qds9yrzr2ydpw697f85"; + extraPostFetch = '' + echo "DATE=$(date +"%F %T %z" -r $out/NEWS.markdown)" > $out/version.txt + ''; }; + # we put as little as possible in src.extraPostFetch as it's much easier to + # add to it here without having to fiddle with src.sha256 + # only DATE and HASH are absolutely necessary + postPatch = '' + cat >> version.txt <<_EOF +HASH=${src.rev} +SHORTHASH=${src.rev} +TAG=${version} +URL=${src.meta.homepage} +_EOF + + patchShebangs scripts + + substituteInPlace libhb/module.defs \ + --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 + + # Force using nixpkgs dependencies + sed -i '/MODULES += contrib/d' make/include/main.defs + sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \ + -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ + -i make/configure.py + ''; + nativeBuildInputs = [ - python2 pkgconfig autoconf automake libtool m4 + pkgconfig autoconf automake libtool m4 python3 ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ]; buildInputs = [ @@ -70,26 +100,12 @@ stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev libgudev hicolor-icon-theme ] ++ lib.optional useFdk fdk_aac - ++ lib.optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ] + ++ lib.optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ] # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only, # look at ./make/configure.py search "enable_nvenc" - ++ lib.optional stdenv.isLinux nv-codec-headers; + ++ lib.optional stdenv.isLinux nv-codec-headers; - preConfigure = '' - patchShebangs scripts - - substituteInPlace libhb/module.defs \ - --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 - substituteInPlace libhb/module.defs \ - --replace '$(CONTRIB.build/)include/libxml2' ${libxml2.dev}/include/libxml2 - - # Force using nixpkgs dependencies - sed -i '/MODULES += contrib/d' make/include/main.defs - sed -i '/PKG_CONFIG_PATH=/d' gtk/module.rules - sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \ - -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ - -i make/configure.py - ''; + enableParallelBuilding = true; configureFlags = [ "--disable-df-fetch" @@ -97,10 +113,10 @@ stdenv.mkDerivation rec { (if useGtk then "--disable-gtk-update-checks" else "--disable-gtk") (if useFdk then "--enable-fdk-aac" else "") (if stdenv.isDarwin then "--disable-xcode" else "") - ]; + ] ++ lib.optional (stdenv.isx86_32 || stdenv.isx86_64) "--harden"; # NOTE: 2018-12-27: Check NixOS HandBrake test if changing - NIX_LDFLAGS = toString [ + NIX_LDFLAGS = [ "-lx265" ]; @@ -109,7 +125,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://handbrake.fr/; + homepage = "http://handbrake.fr/"; description = "A tool for converting video files and ripping DVDs"; longDescription = '' Tool for converting and remuxing video files diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/applications/video/jftui/default.nix index 82774ada09eb7..eb572bac4e341 100644 --- a/pkgs/applications/video/jftui/default.nix +++ b/pkgs/applications/video/jftui/default.nix @@ -1,32 +1,27 @@ -{ stdenv, fetchFromGitHub, fetchpatch, clang, - pkg-config, curl, mpv, yajl }: +{ stdenv +, fetchFromGitHub +, pkg-config +, curl +, mpv +, yajl +}: stdenv.mkDerivation rec { pname = "jftui"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Aanok"; repo = pname; rev = "v${version}"; - sha256 = "0g93w8ahyh2v0cv2fyj5a7v6qyznavwk0dcxx1qw4kczdgmlxnkx"; + sha256 = "1az737q5i24ylvkx4g3xlq8k48ni91nz5hhbif97g4nlhwl5cqb6"; }; - patches = [ - # Remove this patch with next version - (fetchpatch { - name = "curl-capability-check-fix"; - url = "https://github.com/Aanok/jftui/commit/d63996b8bc0d2ac4b04c5de4169bc7f8ec9b2a30.patch"; - sha256 = "1d595mkzgx3carq2cykxpvmf5klgdlyaq94fk9wj8812yswqlsr7"; - }) - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ - clang curl mpv yajl diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix index 037331cad9e07..317505185d0d6 100644 --- a/pkgs/applications/video/k9copy/default.nix +++ b/pkgs/applications/video/k9copy/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { description = "DVD backup and DVD authoring program"; - homepage = http://k9copy-reloaded.sourceforge.net/; + homepage = "http://k9copy-reloaded.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ flosse ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index f38046cf8e1a2..0cdd3db852571 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { }) # https://github.com/hzbd/kazam/pull/21 (fetchpatch { - url = https://github.com/hzbd/kazam/commit/37e53a5aa61f4223a9ea03ceeda26eeba2b9d37b.patch; + url = "https://github.com/hzbd/kazam/commit/37e53a5aa61f4223a9ea03ceeda26eeba2b9d37b.patch"; sha256 = "1q5dpmdm6cvgzw8xa7bwclnqa05xc73ja1lszwmwv5glyik0fk4z"; }) ]; @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "A screencasting program created with design in mind"; - homepage = https://code.launchpad.net/kazam; + homepage = "https://code.launchpad.net/kazam"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 2a0af3ed59e4c..3f41e73dfa75c 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { name = "kino-1.3.4"; src = fetchurl { - url = mirror://sourceforge/kino/kino-1.3.4.tar.gz; + url = "mirror://sourceforge/kino/kino-1.3.4.tar.gz"; sha256 = "020s05k0ma83rq2kfs8x474pqicaqp9spar81qc816ddfrnh8k8i"; }; @@ -88,7 +88,7 @@ stdenv.mkDerivation { meta = { description = "Non-linear DV editor for GNU/Linux"; - homepage = http://www.kinodv.org/; + homepage = "http://www.kinodv.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 33ff1821640bf..274ff7cdeab79 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -42,7 +42,7 @@ mkDerivation rec { meta = with lib; { description = "MPlayer front-end for KDE"; license = with licenses; [ gpl2 lgpl2 fdl12 ]; - homepage = https://kmplayer.kde.org/; + homepage = "https://kmplayer.kde.org/"; maintainers = with maintainers; [ sander zraexy ]; }; } diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index fcb6ed4860baa..1ef3c9ee70f28 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -4,22 +4,20 @@ , boost, avahi, lame, autoreconfHook , gettext, pcre-cpp, yajl, fribidi, which , openssl, gperf, tinyxml2, taglib, libssh, swig, jre -, libX11, xorgproto, libxml2 -, libXt, libXmu, libXext -, libXinerama, libXrandr -, libXtst, libXfixes, systemd +, libxml2, systemd , alsaLib, libGLU, libGL, glew, fontconfig, freetype, ftgl , libjpeg, libpng, libtiff , libmpeg2, libsamplerate, libmad , libogg, libvorbis, flac, libxslt , lzo, libcdio, libmodplug, libass, libbluray , sqlite, libmysqlclient, nasm, gnutls, libva, libdrm -, curl, bzip2, zip, unzip, glxinfo, xdpyinfo +, curl, bzip2, zip, unzip, glxinfo , libcec, libcec_platform, dcadec, libuuid , libcrossguid, libmicrohttpd -, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp +, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1 , libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson , lirc +, x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp , dbusSupport ? true, dbus ? null , joystickSupport ? true, cwiid ? null , nfsSupport ? true, libnfs ? null @@ -27,11 +25,12 @@ , rtmpSupport ? true, rtmpdump ? null , sambaSupport ? true, samba ? null , udevSupport ? true, udev ? null -, usbSupport ? false, libusb ? null +, usbSupport ? false, libusb-compat-0_1 ? null , vdpauSupport ? true, libvdpau ? null , useWayland ? false, wayland ? null, wayland-protocols ? null , waylandpp ? null, libxkbcommon ? null , useGbm ? false, mesa ? null, libinput ? null +, buildPackages }: assert dbusSupport -> dbus != null; @@ -40,7 +39,7 @@ assert pulseSupport -> libpulseaudio != null; assert rtmpSupport -> rtmpdump != null; assert sambaSupport -> samba != null; assert udevSupport -> udev != null; -assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable +assert usbSupport -> libusb-compat-0_1 != null && ! udevSupport; # libusb-compat-0_1 won't be used if udev is avaliable assert vdpauSupport -> libvdpau != null; assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null; @@ -94,10 +93,18 @@ let sha256 = "1krsjlr949iy5l6ljxancza1yi6w1annxc5s6k283i9mb15qy8cy"; preConfigure = '' cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . + sed -i 's/ --cpu=''${CPU}//' CMakeLists.txt + sed -i 's/--strip=''${CMAKE_STRIP}/--strip=''${CMAKE_STRIP} --ranlib=''${CMAKE_RANLIB}/' CMakeLists.txt ''; - buildInputs = [ gnutls libidn libtasn1 p11-kit zlib libva ] + cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DCROSSCOMPILING=ON" + "-DCPU=${stdenv.hostPlatform.parsed.cpu.name}" + "-DOS=${stdenv.hostPlatform.parsed.kernel.name}" + "-DPKG_CONFIG_EXECUTABLE=pkgconfig" + ]; + buildInputs = [ libidn libtasn1 p11-kit zlib libva ] ++ lib.optional vdpauSupport libvdpau; - nativeBuildInputs = [ cmake nasm pkgconfig ]; + nativeBuildInputs = [ cmake nasm pkgconfig gnutls ]; }; # We can build these externally but FindLibDvd.cmake forces us to build it @@ -152,38 +159,42 @@ in stdenv.mkDerivation { buildInputs = [ gnutls libidn libtasn1 nasm p11-kit - libxml2 yasm python2Packages.python + libxml2 python2Packages.python boost libmicrohttpd gettext pcre-cpp yajl fribidi libva libdrm - openssl gperf tinyxml2 taglib libssh swig jre - libX11 xorgproto libXt libXmu libXext - libXinerama libXrandr libXtst libXfixes - alsaLib libGL libGLU glew fontconfig freetype ftgl + openssl gperf tinyxml2 taglib libssh + alsaLib libGL libGLU fontconfig freetype ftgl libjpeg libpng libtiff libmpeg2 libsamplerate libmad libogg libvorbis flac libxslt systemd lzo libcdio libmodplug libass libbluray sqlite libmysqlclient avahi lame - curl bzip2 zip unzip glxinfo xdpyinfo + curl bzip2 zip unzip glxinfo libcec libcec_platform dcadec libuuid libgcrypt libgpgerror libunistring - libcrossguid cwiid libplist - bluez giflib glib harfbuzz lcms2 libpthreadstubs libXdmcp + libcrossguid libplist + bluez giflib glib harfbuzz lcms2 libpthreadstubs ffmpeg flatbuffers fmt fstrcmp rapidjson lirc # libdvdcss libdvdnav libdvdread ] + ++ lib.optional x11Support [ + libX11 xorgproto libXt libXmu libXext.dev libXdmcp + libXinerama libXrandr.dev libXtst libXfixes + ] ++ lib.optional dbusSupport dbus - ++ lib.optionals joystickSupport [ cwiid ] + ++ lib.optional joystickSupport cwiid ++ lib.optional nfsSupport libnfs ++ lib.optional pulseSupport libpulseaudio ++ lib.optional rtmpSupport rtmpdump ++ lib.optional sambaSupport samba ++ lib.optional udevSupport udev - ++ lib.optional usbSupport libusb + ++ lib.optional usbSupport libusb-compat-0_1 ++ lib.optional vdpauSupport libvdpau ++ lib.optionals useWayland [ - wayland waylandpp + wayland + waylandpp.dev + wayland-protocols # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise libxkbcommon.dev ] @@ -200,7 +211,15 @@ in stdenv.mkDerivation { which pkgconfig gnumake autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 - ] ++ lib.optionals useWayland [ wayland-protocols ]; + jre yasm gettext python2Packages.python flatbuffers + + # for TexturePacker + giflib zlib libpng libjpeg lzo + ] ++ lib.optionals useWayland [ wayland-protocols waylandpp.bin ]; + + depsBuildBuild = [ + buildPackages.stdenv.cc + ]; cmakeFlags = [ "-Dlibdvdcss_URL=${libdvdcss.src}" @@ -210,9 +229,14 @@ in stdenv.mkDerivation { "-DENABLE_EVENTCLIENTS=ON" "-DENABLE_INTERNAL_CROSSGUID=OFF" "-DENABLE_OPTICAL=ON" + "-DLIRC_DEVICE=/run/lirc/lircd" + "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig" + "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc" + "-DPYTHON_EXECUTABLE=${buildPackages.python2Packages.python}/bin/python" ] ++ lib.optional useWayland [ "-DCORE_PLATFORM_NAME=wayland" "-DWAYLAND_RENDER_SYSTEM=gl" + "-DWAYLANDPP_SCANNER=${buildPackages.waylandpp}/bin/wayland-scanner++" ] ++ lib.optional useGbm [ "-DCORE_PLATFORM_NAME=gbm" "-DGBM_RENDER_SYSTEM=gles" @@ -224,6 +248,16 @@ in stdenv.mkDerivation { # I'm guessing there is a thing waiting to time out doCheck = false; + # Need these tools on the build system when cross compiling, + # hacky, but have found no other way. + preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + CXX=c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder + cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin" + + CXX=c++ LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker + cmakeFlags+=" -DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin" + ''; + postPatch = '' substituteInPlace xbmc/platform/linux/LinuxTimezone.cpp \ --replace 'usr/share/zoneinfo' 'etc/zoneinfo' @@ -232,9 +266,11 @@ in stdenv.mkDerivation { postInstall = '' for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ - --prefix PATH ":" "${lib.makeBinPath [ python2Packages.python glxinfo xdpyinfo ]}" \ + --prefix PATH ":" "${lib.makeBinPath ([ python2Packages.python glxinfo ] ++ lib.optional x11Support xdpyinfo)}" \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath - ([ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass ] ++ lib.optional nfsSupport libnfs)}" + ([ curl systemd libmad libvdpau libcec libcec_platform libass ] + ++ lib.optional nfsSupport libnfs + ++ lib.optional rtmpSupport rtmpdump)}" done substituteInPlace $out/share/xsessions/kodi.desktop \ @@ -251,7 +287,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Media center"; - homepage = https://kodi.tv/; + homepage = "https://kodi.tv/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ domenkozar titanous edwtjo peterhoeg sephalon ]; diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 5dc0233567205..0e23eac9a866f 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -109,7 +109,7 @@ let self = rec { }; meta = { - homepage = https://forum.kodi.tv/showthread.php?tid=85724; + homepage = "https://forum.kodi.tv/showthread.php?tid=85724"; description = "A program launcher for Kodi"; longDescription = '' Advanced Launcher allows you to start any Linux, Windows and @@ -139,7 +139,7 @@ let self = rec { }; meta = { - homepage = https://forum.kodi.tv/showthread.php?tid=287826; + homepage = "https://forum.kodi.tv/showthread.php?tid=287826"; description = "A program launcher for Kodi"; longDescription = '' Advanced Emulator Launcher is a multi-emulator front-end for Kodi @@ -200,7 +200,7 @@ let self = rec { sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5"; }; meta = { - homepage = https://forum.kodi.tv/showthread.php?tid=258159; + homepage = "https://forum.kodi.tv/showthread.php?tid=258159"; description = "A ROM launcher for Kodi that uses HyperSpin assets."; maintainers = with maintainers; [ edwtjo ]; }; @@ -273,7 +273,7 @@ let self = rec { }; meta = { - homepage = https://forum.kodi.tv/showthread.php?tid=67110; + homepage = "https://forum.kodi.tv/showthread.php?tid=67110"; description = "Watch content from SVT Play"; longDescription = '' With this addon you can stream content from SVT Play @@ -325,7 +325,7 @@ let self = rec { propagatedBuildInputs = [ steam ]; meta = { - homepage = https://forum.kodi.tv/showthread.php?tid=157499; + homepage = "https://forum.kodi.tv/showthread.php?tid=157499"; description = "Launch Steam in Big Picture Mode from Kodi"; longDescription = '' This add-on will close/minimise Kodi, launch Steam in Big @@ -352,7 +352,7 @@ let self = rec { }; meta = { - homepage = https://forum.kodi.tv/showthread.php?tid=187421; + homepage = "https://forum.kodi.tv/showthread.php?tid=187421"; description = "A comic book reader"; maintainers = with maintainers; [ edwtjo ]; }; @@ -372,7 +372,7 @@ let self = rec { }; meta = { - homepage = https://github.com/kodi-pvr/pvr.hts; + homepage = "https://github.com/kodi-pvr/pvr.hts"; description = "Kodi's Tvheadend HTSP client addon"; platforms = platforms.all; maintainers = with maintainers; [ cpages ]; @@ -394,7 +394,7 @@ let self = rec { }; meta = { - homepage = https://github.com/kodi-pvr/pvr.hdhomerun; + homepage = "https://github.com/kodi-pvr/pvr.hdhomerun"; description = "Kodi's HDHomeRun PVR client addon"; platforms = platforms.all; maintainers = with maintainers; [ titanous ]; @@ -418,7 +418,7 @@ let self = rec { }; meta = { - homepage = https://github.com/kodi-pvr/pvr.iptvsimple; + homepage = "https://github.com/kodi-pvr/pvr.iptvsimple"; description = "Kodi's IPTV Simple client addon"; platforms = platforms.all; maintainers = with maintainers; [ ]; @@ -442,7 +442,7 @@ let self = rec { }; meta = { - homepage = https://github.com/osmc/skin.osmc; + homepage = "https://github.com/osmc/skin.osmc"; description = "The default skin for OSMC"; platforms = platforms.all; maintainers = with maintainers; [ worldofpeace ]; @@ -499,7 +499,7 @@ let self = rec { ''; meta = { - homepage = https://github.com/peak3d/inputstream.adaptive; + homepage = "https://github.com/peak3d/inputstream.adaptive"; description = "Kodi inputstream addon for several manifest types"; platforms = platforms.all; maintainers = with maintainers; [ sephalon ]; @@ -508,14 +508,14 @@ let self = rec { vfs-sftp = mkKodiABIPlugin rec { namespace = "vfs.sftp"; - version = "1.0.5"; + version = "1.0.6"; plugin = namespace; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - sha256 = "10l2rwim574012vzjrkr0b153gk5q81fq48p47mijk294l7g100d"; + sha256 = "044kkzcpzvbyih4vys33r4hqw38xa82snmvl4qj1r80wnszc8af1"; }; meta = with stdenv.lib; { @@ -530,14 +530,14 @@ let self = rec { vfs-libarchive = mkKodiABIPlugin rec { namespace = "vfs.libarchive"; - version = "1.0.6"; + version = "1.0.7"; plugin = namespace; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - sha256 = "1gz39i97n8xgbja8miqligmhxsvmqimlxx75xr9v0r9lfxp7135f"; + sha256 = "01qhv095h5j67ispm4iw18pd3kl7a0mnjkgm92al9qqiyif8lzgh"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 1ab7e2c991b99..ae156574f5da6 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -65,14 +65,6 @@ let ''; dontPatchELF = true; - - meta = { - description = "Professional Non-Linear Video Editor"; - homepage = "https://www.lwks.com/"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.antonxy ]; - platforms = [ "x86_64-linux" ]; - }; }; # Lightworks expects some files in /usr/share/lightworks @@ -84,4 +76,12 @@ in buildFHSUserEnv { ]; runScript = "lightworks"; + + meta = { + description = "Professional Non-Linear Video Editor"; + homepage = "https://www.lwks.com/"; + license = stdenv.lib.licenses.unfree; + maintainers = [ stdenv.lib.maintainers.antonxy ]; + platforms = [ "x86_64-linux" ]; + }; } diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/applications/video/linuxstopmotion/default.nix index 0a422bb7f50c2..3a2d1b79e9e00 100644 --- a/pkgs/applications/video/linuxstopmotion/default.nix +++ b/pkgs/applications/video/linuxstopmotion/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Create stop-motion animation movies"; - homepage = http://linuxstopmotion.org/; + homepage = "http://linuxstopmotion.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix index 8287a176ce633..16ade40f0b5ab 100644 --- a/pkgs/applications/video/lxdvdrip/default.nix +++ b/pkgs/applications/video/lxdvdrip/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Command line tool to make a copy from a video DVD for private use"; - homepage = https://sourceforge.net/projects/lxdvdrip; + homepage = "https://sourceforge.net/projects/lxdvdrip"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 5423ffcb1422e..2364f9ec02cde 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -3,21 +3,21 @@ }: let - version = "1.15.0"; + version = "1.15.1"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - sha256 = "1zr63fqx4qcrnrbg1f97w9mp3yzzxf0dk8pw60y2d4436vanfba4"; + sha256 = "0c9661sdlld8b1g2pk8lbn3gz7cikh9bjqss11ffkriwii1x9fw0"; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - sha256 = "01pdydll37inkq74874rqd5kk0maafnm1lqcv41jzgzjrfkky8d9"; + sha256 = "0rm1zykqagy2g8hb7pjrc6akdsym8pgdnx66hnna161jbah3sssy"; }; in mkDerivation { pname = "makemkv"; @@ -53,7 +53,7 @@ in mkDerivation { expiration date. ''; license = licenses.unfree; - homepage = http://makemkv.com; + homepage = "http://makemkv.com"; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.titanous ]; }; diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix index 0d263f402b338..470908377b505 100644 --- a/pkgs/applications/video/manim/default.nix +++ b/pkgs/applications/video/manim/default.nix @@ -57,7 +57,7 @@ buildPythonApplication rec { create precise animations programmatically, as seen in the videos of 3Blue1Brown on YouTube. ''; - homepage = https://github.com/3b1b/manim; + homepage = "https://github.com/3b1b/manim"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ johnazoidberg ]; }; diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix index c302ae1730fea..20ab4d750326a 100644 --- a/pkgs/applications/video/mapmap/default.nix +++ b/pkgs/applications/video/mapmap/default.nix @@ -53,7 +53,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Open source video mapping software"; - homepage = https://github.com/mapmapteam/mapmap; + homepage = "https://github.com/mapmapteam/mapmap"; license = licenses.gpl3; maintainers = [ maintainers.erictapen ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index 9554105f20c21..7c7ceb914ae77 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)"; - homepage = https://mediathekview.de/; + homepage = "https://mediathekview.de/"; license = licenses.gpl3; maintainers = with maintainers; [ moredread ]; platforms = platforms.all; diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index 635779187a81f..690b8355340c2 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { you an endless video stream. Minitube is not about cloning the YouTube website, it aims to create a new TV-like experience. ''; - homepage = https://flavio.tordini.org/minitube; + homepage = "https://flavio.tordini.org/minitube"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index a1bdb3db98b04..7db27888782a2 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "45.0.0"; + version = "46.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "1m9ih6bgl3nrjgr0rxvfbvw8s9ska7ps1ypc2ynvyxba4gjkkyyf"; + sha256 = "1vyfvpsllnzhzaaz3s9lqlnkmnqchyhxj2d47bfyizs982r5kg24"; }; nativeBuildInputs = [ @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross-platform tools for Matroska"; - homepage = http://www.bunkus.org/videotools/mkvtoolnix/; + homepage = "http://www.bunkus.org/videotools/mkvtoolnix/"; license = licenses.gpl2; maintainers = with maintainers; [ codyopel rnhmjoj ]; platforms = platforms.linux diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index dafc6abdb0a34..dd0510f70c361 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Monitors the video signal from cameras"; - homepage = https://motion-project.github.io/; + homepage = "https://motion-project.github.io/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ puffnfresh veprbl ]; }; diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index efa495a45afe6..07b4c79a5b3d9 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, qttools, mpv }: +{ stdenv, mkDerivation, fetchFromGitLab, pkgconfig, qmake, qtx11extras, qttools, mpv }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "mpc-qt"; - version = "18.08"; + version = "2019-06-09"; - src = fetchFromGitHub { - owner = "cmdrkotori"; + src = fetchFromGitLab { + owner = "mpc-qt"; repo = "mpc-qt"; - rev = "v${version}"; - sha256 = "1rxlkg3vsrapazdlb1i6c5a1vvf2114bsqwzcm3n2wc5c93yqsna"; + rev = "2abe6e7fc643068d50522468fe75d614861555ad"; + sha256 = "1cis8dl9pm91mpnp696zvwsfp96gkwr8jgs45anbwd7ldw78w4x5"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Media Player Classic Qute Theater"; - homepage = https://github.com/cmdrkotori/mpc-qt; + homepage = "https://gitlab.com/mpc-qt/mpc-qt"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index f5559e3fb6c00..5a72fe91ddde3 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -58,7 +58,7 @@ let codecs_src = let - dir = http://www.mplayerhq.hu/MPlayer/releases/codecs/; + dir = "http://www.mplayerhq.hu/MPlayer/releases/codecs/"; version = "20071007"; in if stdenv.hostPlatform.system == "i686-linux" then fetchurl { @@ -217,7 +217,7 @@ stdenv.mkDerivation rec { meta = { description = "A movie player that supports many video formats"; - homepage = http://mplayerhq.hu; + homepage = "http://mplayerhq.hu"; license = "GPL"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index c24d25634a1b3..8bb5d5aca1f4e 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -52,7 +52,7 @@ , xvSupport ? stdenv.isLinux, libXv ? null , youtubeSupport ? true, youtube-dl ? null , zimgSupport ? true, zimg ? null -, archiveSupport ? false, libarchive ? null +, archiveSupport ? true, libarchive ? null , jackaudioSupport ? false, libjack2 ? null , openalSupport ? true, openalSoft ? null , vapoursynthSupport ? false, vapoursynth ? null @@ -184,6 +184,8 @@ in stdenv.mkDerivation rec { # Ensure youtube-dl is available in $PATH for mpv wrapperFlags = + ''--prefix LUA_CPATH ';' "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \'' + + ''--prefix LUA_PATH ';' "${luaEnv}/share/lua/${lua.luaversion}/?.lua" \'' + ''--prefix PATH : "${luaEnv}/bin" \'' + optionalString youtubeSupport '' --prefix PATH : "${youtube-dl}/bin" \ @@ -225,7 +227,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A media player that supports many video formats (MPlayer and mplayer2 fork)"; - homepage = https://mpv.io; + homepage = "https://mpv.io"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ]; platforms = platforms.darwin ++ platforms.linux; diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index faa21326fc0e8..ce0695203328f 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -2,7 +2,8 @@ , yad, mkvtoolnix-cli, libnotify }: stdenv.mkDerivation { - name = "mpv-convert-script-2016-03-18.lua"; + pname = "mpv-convert-script"; + version = "2016-03-18"; src = fetchgit { url = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0"; rev = "f95cee43e390e843a47e8ec9d1711a12a8cd343d"; @@ -24,12 +25,14 @@ stdenv.mkDerivation { dontBuild = true; installPhase = '' - cp convert_script.lua $out + mkdir -p $out/share/mpv/scripts + cp convert_script.lua $out/share/mpv/scripts ''; + passthru.scriptName = "convert_script.lua"; meta = { description = "Convert parts of a video while you are watching it in mpv"; - homepage = https://gist.github.com/Zehkul/25ea7ae77b30af959be0; + homepage = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0"; maintainers = [ lib.maintainers.Profpatsch ]; longDescription = '' When this script is loaded into mpv, you can hit Alt+W to mark the beginning diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix index e318c7afa6767..f19db554d045e 100644 --- a/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/pkgs/applications/video/mpv/scripts/mpris.nix @@ -1,28 +1,39 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gobject-introspection, mpv }: +{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, glib, mpv }: stdenv.mkDerivation rec { - name = "mpv-mpris-${version}.so"; - version = "0.4"; + pname = "mpv-mpris"; + version = "0.5"; src = fetchFromGitHub { owner = "hoyon"; repo = "mpv-mpris"; rev = version; - sha256 = "1fr3jvja8s2gdpx8qyk9r17977flms3qpm8zci62nd9r5wjdvr5i"; + sha256 = "07p6li5z38pkfd40029ag2jqx917vyl3ng5p2i4v5a0af14slcnk"; }; + patches = [ + # Enables to "make SCRIPTS_DIR=... install" https://github.com/hoyon/mpv-mpris/pull/38 + (fetchpatch { + url = "https://github.com/hoyon/mpv-mpris/commit/f1482350868bf20e4575f923943ec998469b255e.patch"; + sha256 = "1lqy867wpmj6hv3zgi6g679a7x3dv5skpw24hwd05b28galnyd4l"; + }) + ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gobject-introspection mpv ]; + buildInputs = [ glib mpv ]; - installPhase = '' - cp mpris.so $out - ''; + installFlags = [ "SCRIPTS_DIR=$(out)/share/mpv/scripts" ]; + + # Otherwise, the shared object isn't `strip`ped. See: + # https://discourse.nixos.org/t/debug-why-a-derivation-has-a-reference-to-gcc/7009 + stripDebugList = [ "share/mpv/scripts" ]; + passthru.scriptName = "mpris.so"; meta = with stdenv.lib; { description = "MPRIS plugin for mpv"; homepage = "https://github.com/hoyon/mpv-mpris"; license = licenses.mit; + platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau ]; }; } diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index 624c06414fd34..53def80e7dab8 100644 --- a/pkgs/applications/video/mpv/wrapper.nix +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -9,6 +9,6 @@ symlinkJoin { postBuild = '' wrapProgram $out/bin/mpv \ - --add-flags "${stdenv.lib.concatMapStringsSep " " (x: "--script=" + x) scripts}" + --add-flags "${stdenv.lib.concatMapStringsSep " " (x: "--script=${x}/share/mpv/scripts/${x.scriptName}") scripts}" ''; } diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 2c73d3e734ccb..2f1d3a3a1c91c 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { ++ stdenv.lib.optionals (!enableXnvctrl) [ "--disable-xnvctrl" ]; meta = with stdenv.lib; { - homepage = https://www.mythtv.org/; + homepage = "https://www.mythtv.org/"; description = "Open Source DVR"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 4617d1d17dc04..4e6c9f7ea5a2e 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -35,15 +35,15 @@ let ''; }; lodepngcpp = fetchurl { - url = https://raw.githubusercontent.com/lvandeve/lodepng/a70c086077c0eaecbae3845e4da4424de5f43361/lodepng.cpp; + url = "https://raw.githubusercontent.com/lvandeve/lodepng/a70c086077c0eaecbae3845e4da4424de5f43361/lodepng.cpp"; sha256 = "1dxkkr4jbmvlwfr7m16i1mgcj1pqxg9s1a7y3aavs9rrk0ki8ys2"; }; lodepngh = fetchurl { - url = https://raw.githubusercontent.com/lvandeve/lodepng/a70c086077c0eaecbae3845e4da4424de5f43361/lodepng.h; + url = "https://raw.githubusercontent.com/lvandeve/lodepng/a70c086077c0eaecbae3845e4da4424de5f43361/lodepng.h"; sha256 = "14drdikd0vws3wwpyqq7zzm5z3kg98svv4q4w0hr45q6zh6hs0bq"; }; CImgh = fetchurl { - url = https://raw.githubusercontent.com/dtschump/CImg/572c12d82b2f59ece21be8f52645c38f1dd407e6/CImg.h; + url = "https://raw.githubusercontent.com/dtschump/CImg/572c12d82b2f59ece21be8f52645c38f1dd407e6/CImg.h"; sha256 = "0n4qfxj8j6rmj4svf68gg2pzg8d1pb74bnphidnf8i2paj6lwniz"; }; plugins = map buildPlugin [ @@ -120,7 +120,7 @@ stdenv.mkDerivation { Node-graph based, open-source compositing software. Similar in functionalities to Adobe After Effects and Nuke by The Foundry. ''; - homepage = https://natron.fr/; + homepage = "https://natron.fr/"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.puffnfresh ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index be2a323943d04..8a2cd1728227a 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -1,6 +1,7 @@ { config, stdenv , mkDerivation , fetchFromGitHub +, addOpenGLRunpath , cmake , fdk_aac , ffmpeg @@ -35,51 +36,62 @@ let inherit (stdenv.lib) optional optionals; + in mkDerivation rec { pname = "obs-studio"; - version = "25.0.3"; + version = "25.0.8"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "11hl3lxvbsm7ackl7qhzgy2x0jsz2dfpi2qxsf8pkp908lrh3b3r"; + sha256 = "0j2k65q3wfyfxhvkl6icz4qy0s3kfqhksizy2i3ah7yml266axbj"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ]; - buildInputs = [ curl - fdk_aac - ffmpeg - jansson - libjack2 - libv4l - libxkbcommon - libpthreadstubs - libXdmcp - qtbase - qtx11extras - qtsvg - speex - x264 - vlc - makeWrapper - mbedtls - ] - ++ optionals scriptingSupport [ luajit swig python3 ] - ++ optional alsaSupport alsaLib - ++ optional pulseaudioSupport libpulseaudio; + buildInputs = [ + curl + fdk_aac + ffmpeg + jansson + libjack2 + libv4l + libxkbcommon + libpthreadstubs + libXdmcp + qtbase + qtx11extras + qtsvg + speex + x264 + vlc + makeWrapper + mbedtls + ] + ++ optionals scriptingSupport [ luajit swig python3 ] + ++ optional alsaSupport alsaLib + ++ optional pulseaudioSupport libpulseaudio; # obs attempts to dlopen libobs-opengl, it fails unless we make sure # DL_OPENGL is an explicit path. Not sure if there's a better way # to handle this. - cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\"" ]; + cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\"" + "-DOBS_VERSION_OVERRIDE=${version}" + "-Wno-dev" # kill dev warnings that are useless for packaging + ]; postInstall = '' wrapProgram $out/bin/obs \ --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${vlc}/lib" ''; + postFixup = stdenv.lib.optionalString stdenv.isLinux '' + addOpenGLRunpath $out/lib/lib*.so + addOpenGLRunpath $out/lib/obs-plugins/*.so + ''; + meta = with stdenv.lib; { description = "Free and open source software for video recording and live streaming"; longDescription = '' diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix index 134e0cb8a9e32..a33383937fb82 100644 --- a/pkgs/applications/video/obs-studio/linuxbrowser.nix +++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Browser source plugin for obs-studio based on Chromium Embedded Framework"; - homepage = https://github.com/bazukas/obs-linuxbrowser; + homepage = "https://github.com/bazukas/obs-linuxbrowser"; maintainers = with maintainers; [ puffnfresh ]; license = licenses.gpl2; platforms = with platforms; linux; diff --git a/pkgs/applications/video/obs-studio/obs-ndi.nix b/pkgs/applications/video/obs-studio/obs-ndi.nix index 452793f442ee2..79f38fa8fe406 100644 --- a/pkgs/applications/video/obs-studio/obs-ndi.nix +++ b/pkgs/applications/video/obs-studio/obs-ndi.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Network A/V plugin for OBS Studio"; - homepage = https://github.com/Palakis/obs-ndi; + homepage = "https://github.com/Palakis/obs-ndi"; maintainers = with maintainers; [ peti ]; license = licenses.gpl2; platforms = with platforms; linux; diff --git a/pkgs/applications/video/obs-studio/v4l2sink.nix b/pkgs/applications/video/obs-studio/v4l2sink.nix new file mode 100644 index 0000000000000..97eae68b6e72e --- /dev/null +++ b/pkgs/applications/video/obs-studio/v4l2sink.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, qtbase +, obs-studio +}: + +stdenv.mkDerivation rec { + pname = "obs-v4l2sink"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "CatxFish"; + repo = "obs-v4l2sink"; + rev = version; + sha256 = "0l4lavaywih5lzwgxcbnvdrxhpvkrmh56li06s3aryikngxwsk3z"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase obs-studio ]; + + patches = [ + # Fixes the segfault when stopping the plugin + (fetchpatch { + url = "https://github.com/CatxFish/obs-v4l2sink/commit/6604f01796d1b84a95714730ea51a6b8ac0e450b.diff"; + sha256 = "0crcvw02dj0aqy7hnhizjdsnhiw03zmg6cbdkasxz2mrrbyc3s88"; + }) + ]; + + cmakeFlags = with lib; [ + "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs" + ]; + + # obs-studio expects the shared object to be located in bin/32bit or bin/64bit + # https://github.com/obsproject/obs-studio/blob/d60c736cb0ec0491013293c8a483d3a6573165cb/libobs/obs-nix.c#L48 + postInstall = let + pluginPath = { + i686-linux = "bin/32bit"; + x86_64-linux = "bin/64bit"; + }.${stdenv.targetPlatform.system} or (throw "Unsupported system: ${stdenv.targetPlatform.system}"); + in '' + mkdir -p $out/share/obs/obs-plugins/v4l2sink/${pluginPath} + ln -s $out/lib/obs-plugins/v4l2sink.so $out/share/obs/obs-plugins/v4l2sink/${pluginPath} + ''; + + meta = with lib; { + description = "obs studio output plugin for Video4Linux2 device"; + homepage = "https://github.com/CatxFish/obs-v4l2sink"; + maintainers = with maintainers; [ colemickens peelz ]; + license = licenses.gpl2; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/applications/video/obs-studio/wlrobs.nix b/pkgs/applications/video/obs-studio/wlrobs.nix index 05b826c9cefc0..77ef09d3c24d2 100644 --- a/pkgs/applications/video/obs-studio/wlrobs.nix +++ b/pkgs/applications/video/obs-studio/wlrobs.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An obs-studio plugin that allows you to screen capture on wlroots based wayland compositors"; - homepage = https://hg.sr.ht/~scoopta/wlrobs; + homepage = "https://hg.sr.ht/~scoopta/wlrobs"; maintainers = with maintainers; [ grahamc ]; license = licenses.gpl3; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix index 221f4fc0e5c3c..c9c5190dc5398 100644 --- a/pkgs/applications/video/ogmtools/default.nix +++ b/pkgs/applications/video/ogmtools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { (ogmdemux) or creation of (ogmmerge) OGG media streams. Includes dvdxchap tool for extracting chapter information from DVD. ''; - homepage = https://www.bunkus.org/videotools/ogmtools/; + homepage = "https://www.bunkus.org/videotools/ogmtools/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix index 7a130bbdb4184..28df8ead0c80d 100644 --- a/pkgs/applications/video/omxplayer/default.nix +++ b/pkgs/applications/video/omxplayer/default.nix @@ -55,7 +55,7 @@ let enableParallelBuilding = true; meta = { - homepage = http://www.ffmpeg.org/; + homepage = "http://www.ffmpeg.org/"; description = "A complete, cross-platform solution to record, convert and stream audio and video"; }; }; @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { name = "omxplayer-20130328-fbee325dc2"; src = fetchurl { - url = https://github.com/huceke/omxplayer/tarball/fbee325dc2; + url = "https://github.com/huceke/omxplayer/tarball/fbee325dc2"; name = "${name}.tar.gz"; sha256 = "0fkvv8il7ffqxki2gp8cxa5shh6sz9jsy5vv3f4025g4gss6afkg"; }; @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { buildInputs = [ raspberrypifw ffmpeg pcre boost freetype zlib ]; meta = { - homepage = https://github.com/huceke/omxplayer; + homepage = "https://github.com/huceke/omxplayer"; description = "Commandline OMX player for the Raspberry Pi"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.arm; diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index e8a348b432866..cd3176249f8a1 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -36,7 +36,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://openshot.org/; + homepage = "http://openshot.org/"; description = "Free, open-source video editor"; longDescription = '' OpenShot Video Editor is a free, open-source video editor for Linux. diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index 253ef15a600ff..d1a368b43ba24 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - homepage = http://openshot.org/; + homepage = "http://openshot.org/"; description = "High-quality sound editing library"; longDescription = '' OpenShot Audio Library (libopenshot-audio) is a program that allows the diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 19852664a9f68..861ac4560291b 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_RUBY=OFF" ]; meta = { - homepage = http://openshot.org/; + homepage = "http://openshot.org/"; description = "Free, open-source video editor library"; longDescription = '' OpenShot Library (libopenshot) is an open-source project dedicated to diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix index d9eef7f4cd856..91468ea1ee60a 100644 --- a/pkgs/applications/video/p2pvc/default.nix +++ b/pkgs/applications/video/p2pvc/default.nix @@ -1,10 +1,10 @@ -{ stdenv, pkgconfig, fetchFromGitHub, opencv, ncurses, portaudio }: +{ stdenv, pkgconfig, fetchFromGitHub, opencv2, ncurses, portaudio }: stdenv.mkDerivation { name = "p2pvc"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ opencv ncurses portaudio ]; + buildInputs = [ opencv2 ncurses portaudio ]; enableParallelBuilding = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "A point to point color terminal video chat"; - homepage = https://github.com/mofarrell/p2pvc; + homepage = "https://github.com/mofarrell/p2pvc"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ trino ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index bef9537b80675..276c2fa787f22 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -68,7 +68,7 @@ in python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Non-Linear video editor utilizing the power of GStreamer"; - homepage = http://pitivi.org/; + homepage = "http://pitivi.org/"; longDescription = '' Pitivi is a video editor built upon the GStreamer Editing Services. It aims to be an intuitive and flexible application diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index a4f9d6222aa6d..d08a4a8524288 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -5,45 +5,20 @@ let # During compilation, a CMake bundle is downloaded from `artifacts.plex.tv`, # which then downloads a handful of web client-related files. To enable # sandboxed builds, we manually download them and save them so these files - # are fetched ahead-of-time instead of during the CMake build. Whenever - # plex-media-player is updated, the versions for these files are changed, - # so the build IDs (and SHAs) below will need to be updated! - depSrcs = rec { - webClientBuildId = "141-4af71961b12c68"; - webClientDesktopBuildId = "3.104.2-1b12c68"; - webClientTvBuildId = "4.3.0-4af7196"; - - webClient = fetchurl { - url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake"; - sha256 = "0fpkd1s49dbiqqlijxbillqd71a78p8y2sc23mwp0lvcmxrg265p"; - }; - webClientDesktopHash = fetchurl { - url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1"; - sha256 = "0sb0j44lwqz9zbm98nba4x6c1jxdzvs36ynwfg527avkxxna0f8f"; - }; - webClientDesktop = fetchurl { - url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz"; - sha256 = "0dxa0ka0igfsryzda4r5clwdl47ah78nmlmgj9d5pgsvyvzjp87z"; - }; - webClientTvHash = fetchurl { - url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1"; - sha256 = "086w1bavk2aqsyhv9zi5fynk31zf61sl91r6gjrdrz656wfk5bxa"; - }; - webClientTv = fetchurl { - url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz"; - sha256 = "12vbgsfnj0j2y5jd73dpi08hqsr9888sma41nvd4ydsd7qblm455"; - }; - }; + # are fetched ahead-of-time instead of during the CMake build. To update + # plex-media-player use the update.sh script, so the versions and hashes + # for these files are are also updated! + depSrcs = import ./deps.nix { inherit fetchurl; }; in mkDerivation rec { pname = "plex-media-player"; - version = "2.40.0.1007"; - vsnHash = "5482132c"; + version = "2.55.0.1069"; + vsnHash = "2369bed9"; src = fetchFromGitHub { owner = "plexinc"; repo = "plex-media-player"; rev = "v${version}-${vsnHash}"; - sha256 = "0ibdh5g8x32iy74q97jfsmxd08wnyrzs3gfiwjfgc10vaa1qdhli"; + sha256 = "1jq4592sgaia0xy2h7n3vh5i7c84sdh4l64fdc774r4i0bmg66qi"; }; nativeBuildInputs = [ pkgconfig cmake python3 ]; @@ -61,10 +36,12 @@ in mkDerivation rec { cmakeFlags = [ "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DQTROOT=${qtbase}" ]; + passthru.updateScript = ./update.sh; + meta = with stdenv.lib; { description = "Streaming media player for Plex"; license = licenses.gpl2; maintainers = with maintainers; [ kylewlacy ]; - homepage = https://plex.tv; + homepage = "https://plex.tv"; }; } diff --git a/pkgs/applications/video/plex-media-player/deps.nix b/pkgs/applications/video/plex-media-player/deps.nix new file mode 100644 index 0000000000000..26b57532615aa --- /dev/null +++ b/pkgs/applications/video/plex-media-player/deps.nix @@ -0,0 +1,28 @@ +{ fetchurl }: + +rec { + webClientBuildId = "180-afec74de50e175"; + webClientDesktopBuildId = "4.29.2-e50e175"; + webClientTvBuildId = "4.29.3-afec74d"; + + webClient = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake"; + sha256 = "0rabrg3lk9vgpswk8npa54hzqf2v8ghqqnysxpwn12wrp1pc2rr9"; + }; + webClientDesktopHash = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1"; + sha256 = "02b5yq4yc411qlg2dkw5j9lrr3cn2y4d27sin0skf6qza180473g"; + }; + webClientDesktop = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz"; + sha256 = "0l3xv48kr2rx878a40zrgwif2ga2ikv6fdcbq9pylycnmm41pxmh"; + }; + webClientTvHash = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1"; + sha256 = "0wq115y2xrgwqrzr43nhkq8ba237z20yfp426ki2kdypsq8fjqka"; + }; + webClientTv = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz"; + sha256 = "1wax1qslm226l2w53m2fnl849jw349qhg3rjghx7vip5pmb43vw9"; + }; +} diff --git a/pkgs/applications/video/plex-media-player/update.sh b/pkgs/applications/video/plex-media-player/update.sh new file mode 100755 index 0000000000000..a8493a16c9897 --- /dev/null +++ b/pkgs/applications/video/plex-media-player/update.sh @@ -0,0 +1,71 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts nix-prefetch-scripts jq + +set -xeuo pipefail + +nixpkgs="$(git rev-parse --show-toplevel)" + +oldVersion="$(nix-instantiate --eval -E "with import $nixpkgs {}; plex-media-player.version or (builtins.parseDrvName plex-media-player.name).version" | tr -d '"')" +latestTag="$(curl -s https://api.github.com/repos/plexinc/plex-media-player/tags | jq -r '.[] | .name' | sort --version-sort | tail -1)" +latestVersion="$(expr $latestTag : 'v\(.*\)-.*')" +latestHash="$(expr $latestTag : 'v.*-\(.*\)')" + +if [ ! "$oldVersion" = "$latestVersion" ]; then + # update default.nix with the new version and hash + expectedHash=$(nix-prefetch-git --url https://github.com/plexinc/plex-media-player.git --rev $latestTag --quiet | jq -r '.sha256') + update-source-version plex-media-player --version-key=vsnHash "${latestHash}" 0000 + update-source-version plex-media-player "${latestVersion}" $expectedHash + + # extract the webClientBuildId from the source folder + src="$(nix-build --no-out-link $nixpkgs -A plex-media-player.src)" + webClientBuildId="$(grep 'set(WEB_CLIENT_BUILD_ID' $src/CMakeModules/WebClient.cmake | cut -d' ' -f2 | tr -d ')')" + + # retreive the included cmake file and hash + { read -r webClientBuildIdHash; read -r webClientBuildIdPath; } < \ + <(nix-prefetch-url --print-path "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake") + webClientDesktopBuildId="$(grep 'set(DESKTOP_VERSION' $webClientBuildIdPath | cut -d' ' -f2 | tr -d ')')" + webClientTvBuildId="$(grep 'set(TV_VERSION' $webClientBuildIdPath | cut -d' ' -f2 | tr -d ')')" + + # get the hashes for the other files + webClientDesktopHash="$(nix-prefetch-url "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1")" + webClientDesktop="$(nix-prefetch-url "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz")" + webClientTvHash="$(nix-prefetch-url "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1")" + webClientTv="$(nix-prefetch-url "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz")" + + # update deps.nix + cat > $nixpkgs/pkgs/applications/video/plex-media-player/deps.nix <<EOF +{ fetchurl }: + +rec { + webClientBuildId = "${webClientBuildId}"; + webClientDesktopBuildId = "${webClientDesktopBuildId}"; + webClientTvBuildId = "${webClientTvBuildId}"; + + webClient = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/\${webClientBuildId}/buildid.cmake"; + sha256 = "${webClientBuildIdHash}"; + }; + webClientDesktopHash = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/\${webClientBuildId}/web-client-desktop-\${webClientDesktopBuildId}.tar.xz.sha1"; + sha256 = "${webClientDesktopHash}"; + }; + webClientDesktop = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/\${webClientBuildId}/web-client-desktop-\${webClientDesktopBuildId}.tar.xz"; + sha256 = "${webClientDesktop}"; + }; + webClientTvHash = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/\${webClientBuildId}/web-client-tv-\${webClientTvBuildId}.tar.xz.sha1"; + sha256 = "${webClientTvHash}"; + }; + webClientTv = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/\${webClientBuildId}/web-client-tv-\${webClientTvBuildId}.tar.xz"; + sha256 = "${webClientTv}"; + }; +} +EOF + + git add "$nixpkgs"/pkgs/applications/video/plex-media-player/{default,deps}.nix + git commit -m "plex-media-player: ${oldVersion} -> ${latestVersion}" +else + echo "plex-media-player is already up-to-date" +fi diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix index df72e200e62aa..268905e3a4c08 100644 --- a/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "plex-mpv-shim"; - version = "1.7.14"; + version = "1.7.16"; src = fetchFromGitHub { owner = "iwalton3"; repo = pname; rev = "v${version}"; - sha256 = "1rjifqvs59w2aacfird02myqfd34qadhacj9zpy5xjz25x410zza"; + sha256 = "1pnbdxaqnliwqfvv08gi7gdcvflg5vcbgk4g0fw75prgw54vnd9a"; }; propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ]; diff --git a/pkgs/applications/video/pyca/default.nix b/pkgs/applications/video/pyca/default.nix index af9ef4c1cd503..0fed17bb99997 100644 --- a/pkgs/applications/video/pyca/default.nix +++ b/pkgs/applications/video/pyca/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "A fully functional Opencast capture agent written in Python"; - homepage = https://github.com/opencast/pyCA; + homepage = "https://github.com/opencast/pyCA"; license = licenses.lgpl3; maintainers = with maintainers; [ pmiddend ]; }; diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index cd6416032da2f..26b3153019fbc 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -5,7 +5,7 @@ let in mkDerivation { name = "qarte-4.6.0"; src = fetchbzr { - url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4; + url = "http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4"; rev = "22"; sha256 = "0v4zpj8w67ydvnmanxbl8pwvn0cfv70c0mlw36a1r4n0rvgxffcn"; }; @@ -33,7 +33,7 @@ in mkDerivation { ''; meta = { - homepage = https://launchpad.net/qarte; + homepage = "https://launchpad.net/qarte"; description = "A recorder for Arte TV Guide and Arte Concert"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ vbgl ]; diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix index 1600666884627..7556727a80d3c 100644 --- a/pkgs/applications/video/qmediathekview/default.nix +++ b/pkgs/applications/video/qmediathekview/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkgconfig }: +{ mkDerivation, stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkgconfig }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "QMediathekView"; version = "2019-01-06"; diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 327a2034265e1..98af60c49379d 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -1,8 +1,28 @@ -{ stdenv, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2 -, gettext, pkgconfig, libgphoto2, gphoto2, v4l-utils, libv4l, pcre -, qwt, extra-cmake-modules }: +{ stdenv +, mkDerivation +, fetchurl +, qtbase +, qtmultimedia +, qtquickcontrols +, qtimageformats +, qtxmlpatterns +, ffmpeg +, guvcview +, cmake +, ninja +, libxml2 +, gettext +, pkgconfig +, libgphoto2 +, gphoto2 +, v4l-utils +, libv4l +, pcre +, qwt +, extra-cmake-modules +}: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qstopmotion"; version = "2.4.1"; @@ -11,11 +31,31 @@ stdenv.mkDerivation rec { sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh"; }; - buildInputs = with qt5; [ v4l-utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview - qwt qtquickcontrols qtimageformats qtxmlpatterns ]; + buildInputs = [ + qtbase + qtmultimedia + qtquickcontrols + qtimageformats + qtxmlpatterns + v4l-utils + libv4l + pcre + ffmpeg + guvcview + qwt + ]; - nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules ninja - gettext libgphoto2 gphoto2 libxml2 libv4l ]; + nativeBuildInputs = [ + pkgconfig + cmake + extra-cmake-modules + ninja + gettext + libgphoto2 + gphoto2 + libxml2 + libv4l + ]; patchPhase = '' substituteInPlace CMakeLists.txt \ @@ -25,7 +65,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.qstopmotion.org; + homepage = "http://www.qstopmotion.org"; description = "Create stopmotion animation with a (web)camera"; longDescription = '' Qstopmotion is a tool to create stopmotion @@ -36,6 +76,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ maintainers.leenaars ]; + broken = stdenv.isAarch64; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix index 8f9e3131d8aae..c4926bedd7272 100644 --- a/pkgs/applications/video/quvi/library.nix +++ b/pkgs/applications/video/quvi/library.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Web video downloader"; - homepage = http://quvi.sf.net; + homepage = "http://quvi.sf.net"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix index e54fc0eae4ba0..462c2df9962cc 100644 --- a/pkgs/applications/video/quvi/scripts.nix +++ b/pkgs/applications/video/quvi/scripts.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Web video downloader"; - homepage = http://quvi.sf.net; + homepage = "http://quvi.sf.net"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix index 972e08bb61be1..b2746ef82333b 100644 --- a/pkgs/applications/video/quvi/tool.nix +++ b/pkgs/applications/video/quvi/tool.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Web video downloader"; - homepage = http://quvi.sf.net; + homepage = "http://quvi.sf.net"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix index 56b1134b2b8af..7e2bc3a3ec0cf 100644 --- a/pkgs/applications/video/screenkey/default.nix +++ b/pkgs/applications/video/screenkey/default.nix @@ -49,7 +49,7 @@ buildPythonApplication rec { doCheck = false; meta = with lib; { - homepage = https://www.thregr.org/~wavexx/software/screenkey/; + homepage = "https://www.thregr.org/~wavexx/software/screenkey/"; description = "A screencast tool to display your keys inspired by Screenflick"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index b3c058186382a..9c0435a351c80 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.18.0"; mkDerivation rec { pname = "shotcut"; - version = "20.04.01"; + version = "20.04.12"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "10svbhsd5q8z1k055kcfibil97qifwzn3xmnf5b9sxa7ky4bkmqr"; + sha256 = "05yyv9192f722j8fhfjrphxadgp3crvbq4pi23ln560zh9s1m8r4"; }; patches = [ ./0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch ]; diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index b06f0fcd962ee..f97d1ee00373b 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -31,7 +31,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "A screen recorder for Linux"; - homepage = https://www.maartenbaert.be/simplescreenrecorder; + homepage = "https://www.maartenbaert.be/simplescreenrecorder"; license = licenses.gpl3; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 65a7f358d6fab..85c71e86a649d 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "smplayer"; - version = "19.10.2"; + version = "20.4.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0i2c15yxk4by2zyjhb7n08larz9pmpa6zw383aybjxqh0nd9zv9p"; + sha256 = "0kqdx6q2274gm83rycvdcglka60ymdk4iw2lc39iw7z1zgsv6ky3"; }; buildInputs = [ qtscript ]; @@ -19,7 +19,7 @@ mkDerivation rec { meta = { description = "A complete front-end for MPlayer"; longDescription = "Either mplayer or mpv should also be installed for smplayer to play medias"; - homepage = https://www.smplayer.info; + homepage = "https://www.smplayer.info"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index df262fa979742..1cd6fb693e81e 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -20,7 +20,7 @@ mkDerivation rec { meta = with lib; { description = "Play and download Youtube videos"; - homepage = http://smplayer.sourceforge.net/smtube.php; + homepage = "http://smplayer.sourceforge.net/smtube.php"; license = licenses.gpl2Plus; maintainers = with maintainers; [ vbgl ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index cf10bd223a14e..782b81cc23800 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,14 +1,14 @@ { stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }: pythonPackages.buildPythonApplication rec { - version = "1.3.1"; + version = "1.4.1"; pname = "streamlink"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = version; - sha256 = "0scc0mzvy56b1l6iyvrzb28l8vzrxpfkn4lcwr8nnyjb7ams2xms"; + sha256 = "1q3h48qwf7vs2wnbkwv0xnm6s65mkcyqdz7z6z3vrsmif2sb19l2"; }; checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ]; @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client isodate ]) ++ [ rtmpdump ffmpeg ]; meta = with stdenv.lib; { - homepage = https://github.com/streamlink/streamlink; + homepage = "https://github.com/streamlink/streamlink"; description = "CLI for extracting streams from various websites to video player of your choosing"; longDescription = '' Streamlink is a CLI utility that pipes flash videos from online diff --git a/pkgs/applications/video/subdl/default.nix b/pkgs/applications/video/subdl/default.nix index 36a92f0f1afb6..b2b020a20d230 100644 --- a/pkgs/applications/video/subdl/default.nix +++ b/pkgs/applications/video/subdl/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; meta = { - homepage = https://github.com/alexanderwink/subdl; + homepage = "https://github.com/alexanderwink/subdl"; description = "A command-line tool to download subtitles from opensubtitles.org"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index f628c3b214e49..29e2de6b6c0a9 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { and refine existing subtitle. This program also shows sound waves, which makes it easier to synchronise subtitles to voices. ''; - homepage = http://kitone.github.io/subtitleeditor/; + homepage = "http://kitone.github.io/subtitleeditor/"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.plcplc ]; diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix new file mode 100644 index 0000000000000..ae222ae05a799 --- /dev/null +++ b/pkgs/applications/video/tartube/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, lib +, fetchFromGitHub +, gdk-pixbuf +, gobject-introspection +, gtk3 +, libnotify +, pango +, python3Packages +, wrapGAppsHook +, youtube-dl +, glib +}: + +python3Packages.buildPythonApplication rec { + pname = "tartube"; + version = "2.0.016"; + + src = fetchFromGitHub { + owner = "axcore"; + repo = "tartube"; + rev = "v${version}"; + sha256 = "1y77ykihyi4v6xlsm5xldbs9lzq229l574rxz6qfvrjcbbwajfj9"; + }; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + + strictDeps = false; + + propagatedBuildInputs = with python3Packages; [ + moviepy + pygobject3 + pyxdg + requests + ]; + + buildInputs = [ + gdk-pixbuf + gtk3 + glib + libnotify + pango + ]; + + postInstall = '' + mkdir -p $out/share/{man/man1,applications,pixmaps} + cp pack/tartube.1 $out/share/man/man1 + cp pack/tartube.desktop $out/share/applications + cp pack/tartube.{png,xpm} $out/share/pixmaps + ''; + + doCheck = false; + + makeWrapperArgs = [ + "--prefix PATH : ${stdenv.lib.makeBinPath [ youtube-dl ]}" + ]; + + meta = with lib; { + description = "A GUI front-end for youtube-dl"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ mkg20001 luc65r ]; + homepage = "https://tartube.sourceforge.io/"; + }; +} diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/applications/video/tivodecode/default.nix index bc6561a0bbd08..33e04b77c4b47 100644 --- a/pkgs/applications/video/tivodecode/default.nix +++ b/pkgs/applications/video/tivodecode/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Converts a .TiVo file (produced by TiVoToGo) to a normal MPEG file"; - homepage = http://tivodecode.sourceforge.net; + homepage = "http://tivodecode.sourceforge.net"; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index bcffb8585b310..d025554835eff 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -46,7 +46,7 @@ outputs = [ "out" "dev" "man" ]; meta = with lib; { - homepage = http://www.tvdr.de/; + homepage = "http://www.tvdr.de/"; description = "Video Disc Recorder"; maintainers = [ maintainers.ck3d ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 2ee196baccc77..6c1e79c42debd 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -38,7 +38,7 @@ in { makeFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { - homepage = http://www.saunalahti.fi/~rahrenbe/vdr/femon/; + homepage = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/"; description = "DVB Frontend Status Monitor plugin for VDR"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; @@ -72,7 +72,7 @@ in { }; meta = with stdenv.lib; { - homepage = https://github.com/pesintta/vdr-plugin-vaapidevice; + homepage = "https://github.com/pesintta/vdr-plugin-vaapidevice"; description = "VDR SoftHDDevice Plug-in (with VA-API VPP additions)"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; @@ -118,7 +118,7 @@ in { installFlags = buildFlags; meta = with stdenv.lib; { - homepage = https://projects.vdr-developer.org/projects/plg-markad; + homepage = "https://projects.vdr-developer.org/projects/plg-markad"; description = "Ein Programm zum automatischen Setzen von Schnittmarken bei Werbeeinblendungen während einer Sendung."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; @@ -165,7 +165,7 @@ in { outputs = [ "out" "man" ]; meta = with stdenv.lib; { - homepage = http://winni.vdr-developer.org/epgsearch; + homepage = "http://winni.vdr-developer.org/epgsearch"; description = "Searchtimer and replacement of the VDR program menu"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; @@ -192,7 +192,7 @@ in { }; meta = with stdenv.lib; { - homepage = https://github.com/FernetMenta/vdr-plugin-vnsiserver; + homepage = "https://github.com/FernetMenta/vdr-plugin-vnsiserver"; description = "VDR plugin to handle KODI clients."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; @@ -227,7 +227,7 @@ in { installPhase = ":"; meta = with stdenv.lib; { - homepage = https://projects.vdr-developer.org/projects/plg-text2skin; + homepage = "https://projects.vdr-developer.org/projects/plg-text2skin"; description = "VDR Text2Skin Plugin"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; @@ -328,7 +328,7 @@ in { installFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/jowi24/vdr-fritz; + homepage = "https://github.com/jowi24/vdr-fritz"; description = "A plugin for VDR to access AVMs Fritz Box routers"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 2396a224d451f..229eeffe8f793 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross-platform media player and streaming server"; - homepage = http://www.videolan.org/vlc/; + homepage = "http://www.videolan.org/vlc/"; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/applications/video/w_scan/default.nix index 3c4f607c6affb..7710c7d67a318 100644 --- a/pkgs/applications/video/w_scan/default.nix +++ b/pkgs/applications/video/w_scan/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "Small CLI utility to scan DVB and ATSC transmissions"; - homepage = http://wirbel.htpc-forum.de/w_scan/index_en.html; + homepage = "http://wirbel.htpc-forum.de/w_scan/index_en.html"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.nico202 ] ; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/applications/video/webcamoid/default.nix new file mode 100644 index 0000000000000..41304c21ac30f --- /dev/null +++ b/pkgs/applications/video/webcamoid/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, pkgconfig, libxcb, mkDerivation, qmake +, qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 +, ffmpeg-full, gstreamer, gst_all_1, libpulseaudio, alsaLib, jack2 +, v4l-utils }: +mkDerivation rec { + pname = "webcamoid"; + version = "8.7.1"; + + src = fetchFromGitHub { + sha256 = "1d8g7mq0wf0ycds87xpdhr3zkljgjmb94n3ak9kkxj2fqp9242d2"; + rev = version; + repo = "webcamoid"; + owner = "webcamoid"; + }; + + buildInputs = [ + libxcb + qtbase qtdeclarative qtquickcontrols qtquickcontrols2 + ffmpeg-full + gstreamer gst_all_1.gst-plugins-base + alsaLib libpulseaudio jack2 + v4l-utils + ]; + + nativeBuildInputs = [ pkgconfig qmake ]; + + qmakeFlags = [ + "Webcamoid.pro" + "INSTALLQMLDIR=${placeholder "out"}/lib/qt/qml" + ]; + + meta = with stdenv.lib; { + description = "Webcam Capture Software"; + longDescription = "Webcamoid is a full featured and multiplatform webcam suite."; + homepage = "https://github.com/webcamoid/webcamoid/"; + license = [ licenses.gpl3Plus ]; + platforms = platforms.linux; + maintainers = with maintainers; [ robaca ]; + }; +} diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index 8258f8583090d..24c17daa759dc 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -78,7 +78,7 @@ meta = with stdenv.lib; { description = "Streaming torrent app for Mac, Windows, and Linux."; - homepage = https://webtorrent.io/desktop; + homepage = "https://webtorrent.io/desktop"; license = licenses.mit; maintainers = [ maintainers.flokli ]; platforms = [ diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix index ef98239f32f2e..cb97e5b1090be 100644 --- a/pkgs/applications/video/wf-recorder/default.nix +++ b/pkgs/applications/video/wf-recorder/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wf-recorder"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "ammen99"; repo = pname; rev = "v${version}"; - sha256 = "1772hrd7j8b32y65x5c392kdijlcn13iqg9hrlagfar92102vsbf"; + sha256 = "1cw6kpcbl33wh95pvy32xrsrm6kkk1awccr3phyh885xjs3b3iim"; }; nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ]; diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix index 176d9a87aed0d..32712d5b9b07a 100644 --- a/pkgs/applications/video/wxcam/default.nix +++ b/pkgs/applications/video/wxcam/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { It supports both video4linux 1 and 2 drivers, so it should work on a very large number of devices. ''; - homepage = http://wxcam.sourceforge.net/; + homepage = "http://wxcam.sourceforge.net/"; license = licenses.gpl3Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index 676c218776c82..38cce053edfd6 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { description = "TV application for Linux with apps and tools such as a teletext browser"; license = stdenv.lib.licenses.gpl2; - homepage = https://www.kraxel.org/blog/linux/xawtv/; + homepage = "https://www.kraxel.org/blog/linux/xawtv/"; maintainers = with stdenv.lib.maintainers; [ domenkozar ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index e92d738459113..f52db04928a4b 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { #NIX_LDFLAGS = "-lXext -lgcc_s"; meta = with stdenv.lib; { - homepage = http://www.xine-project.org/; + homepage = "http://www.xine-project.org/"; description = "Xlib-based interface to Xine, a video player"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix index 3c4c59a0ee8f9..dec8bdd67fce5 100644 --- a/pkgs/applications/video/xscast/default.nix +++ b/pkgs/applications/video/xscast/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/KeyboardFire/xscast; + homepage = "https://github.com/KeyboardFire/xscast"; license = licenses.mit; description = "Screencasts of windows with list of keystrokes overlayed"; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index 6e07fbb105b63..20d4d84741ccd 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "xvidcap-1.1.7"; src = fetchurl { - url = mirror://sourceforge/xvidcap/xvidcap-1.1.7.tar.gz; + url = "mirror://sourceforge/xvidcap/xvidcap-1.1.7.tar.gz"; sha256 = "0p8rhpyhxgy37crf1xk1046z4p663jg7ww776jw92pld3s024ihm"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Screencast video catpuring tool"; - homepage = http://xvidcap.sourceforge.net/; + homepage = "http://xvidcap.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix index e16fcb84b0552..464ea053cc4f7 100644 --- a/pkgs/applications/virtualization/8086tiny/default.nix +++ b/pkgs/applications/virtualization/8086tiny/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :) ''; - homepage = http://www.megalith.co.uk/8086tiny/index.html; + homepage = "http://www.megalith.co.uk/8086tiny/index.html"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index e475c4ed78aff..19ba8ced49731 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -55,8 +55,8 @@ edk2.mkDerivation projectDscPath { meta = { description = "Sample UEFI firmware for QEMU and KVM"; - homepage = https://github.com/tianocore/tianocore.github.io/wiki/OVMF; + homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF"; license = stdenv.lib.licenses.bsd2; - platforms = ["x86_64-linux" "i686-linux" "aarch64-linux"]; + platforms = ["x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin"]; }; } diff --git a/pkgs/applications/virtualization/aqemu/default.nix b/pkgs/applications/virtualization/aqemu/default.nix index 02fb256b38cea..9177f26450283 100644 --- a/pkgs/applications/virtualization/aqemu/default.nix +++ b/pkgs/applications/virtualization/aqemu/default.nix @@ -1,7 +1,7 @@ -{ cmake, fetchFromGitHub, libvncserver, qemu, qtbase, stdenv +{ mkDerivation, cmake, fetchFromGitHub, libvncserver, qemu, qtbase, stdenv }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "aqemu"; version = "0.9.2"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A virtual machine manager GUI for qemu"; - homepage = https://github.com/tobimensch/aqemu; + homepage = "https://github.com/tobimensch/aqemu"; license = licenses.gpl2; maintainers = with maintainers; [ hrdinka ]; platforms = with platforms; linux; diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index a0694b7efbe8d..a316952a010df 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { while maintaining access to the performance and functionality already on offer. ''; - homepage = https://hpc.github.io/charliecloud; + homepage = "https://hpc.github.io/charliecloud"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.bzizou ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index f046e0e44b2ca..e3ab1c6c2f80f 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A container debugging tool based on FUSE"; - homepage = https://github.com/Mic92/cntr; + homepage = "https://github.com/Mic92/cntr"; license = licenses.mit; # aarch64 support will be fixed soon platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index b09911cf6e502..bb693c121d82f 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -4,24 +4,27 @@ , glib , glibc , systemd +, nixosTests }: stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.15"; + version = "2.0.16"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "1fshcmnfqzbagzcrh5nxw7pi0dd60xpq47a2lzfghklqhl1h0b5i"; + sha256 = "0z0hds95mjxm703ig2aisghvpd2l3wn6m72jnnlv8jnz2iq2nc4g"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib systemd ] ++ - stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; + buildInputs = [ glib systemd ] + ++ stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; - installPhase = "install -Dm755 bin/${pname} $out/bin/${pname}"; + installFlags = [ "PREFIX=$(out)" ]; + + passthru.tests.podman = nixosTests.podman; meta = with stdenv.lib; { homepage = "https://github.com/containers/conmon"; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 7b48d8c19345b..4210994f43527 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -1,10 +1,12 @@ -{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, utillinux }: +{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, utillinux }: with lib; buildGoPackage rec { pname = "containerd"; version = "1.2.13"; + # git commit for the above version's tag + commit = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; src = fetchFromGitHub { owner = "containerd"; @@ -14,13 +16,13 @@ buildGoPackage rec { }; goPackagePath = "github.com/containerd/containerd"; - outputs = [ "bin" "out" "man" ]; + outputs = [ "out" "man" ]; - nativeBuildInputs = [ go-md2man utillinux ]; + nativeBuildInputs = [ go-md2man installShellFiles utillinux ]; buildInputs = [ btrfs-progs ]; - buildFlags = [ "VERSION=v${version}" ]; + buildFlags = [ "VERSION=v${version}" "REVISION=${commit}" ]; BUILDTAGS = [] ++ optional (btrfs-progs == null) "no_btrfs"; @@ -28,27 +30,20 @@ buildGoPackage rec { buildPhase = '' cd go/src/${goPackagePath} patchShebangs . - make binaries + make binaries $buildFlags ''; installPhase = '' for b in bin/*; do - install -Dm555 $b $bin/$b + install -Dm555 $b $out/$b done make man - manRoot="$man/share/man" - mkdir -p "$manRoot" - for manFile in man/*; do - manName="$(basename "$manFile")" # "docker-build.1" - number="$(echo $manName | rev | cut -d'.' -f1 | rev)" - mkdir -p "$manRoot/man$number" - gzip -c "$manFile" > "$manRoot/man$number/$manName.gz" - done + installManPage man/*.[1-9] ''; meta = { - homepage = https://containerd.io/; + homepage = "https://containerd.io/"; description = "A daemon to control runC"; license = licenses.asl20; maintainers = with maintainers; [ offline vdemeester ]; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 793d34a0dcca2..95f8580cb3978 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -1,63 +1,67 @@ -{ flavor ? "" -, stdenv +{ stdenv , btrfs-progs -, buildGoPackage +, buildGoModule , fetchFromGitHub -, git , glibc , gpgme +, installShellFiles , libapparmor -, libassuan -, libgpgerror , libseccomp , libselinux , lvm2 -, pkgconfig -, which +, pkg-config }: -let - buildTags = "apparmor seccomp selinux containers_image_ostree_stub"; -in buildGoPackage rec { - project = "cri-o"; - version = "1.17.1"; - name = "${project}-${version}${flavor}"; - - goPackagePath = "github.com/${project}/${project}"; +buildGoModule rec { + pname = "cri-o"; + version = "1.18.1"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "0zipigjcnhcnn0w69dkd8312qb6z98l65ir175wp3jfvj4cx3g28"; + sha256 = "1fd7ix329kqimysqfh8yl29c0hwrddlirq9bnz95mrllhsgn8kw2"; }; + vendorSha256 = null; + outputs = [ "out" "man" ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; - outputs = [ "bin" "out" ]; - nativeBuildInputs = [ git pkgconfig which ]; - buildInputs = [ btrfs-progs gpgme libapparmor libassuan libgpgerror - libseccomp libselinux lvm2 ] - ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; + buildInputs = [ + btrfs-progs + gpgme + libapparmor + libseccomp + libselinux + lvm2 + ] ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; + BUILDTAGS = "apparmor seccomp selinux containers_image_openpgp containers_image_ostree_stub"; buildPhase = '' - pushd go/src/${goPackagePath} + patchShebangs . + + sed -i '/version.buildDate/d' Makefile - make BUILDTAGS='${buildTags}' \ - bin/crio \ - bin/crio-status \ - bin/pinns + make binaries docs BUILDTAGS="$BUILDTAGS" ''; + installPhase = '' - install -Dm755 bin/crio $bin/bin/crio${flavor} - install -Dm755 bin/crio-status $bin/bin/crio-status${flavor} - install -Dm755 bin/pinns $bin/bin/pinns${flavor} + install -Dm755 bin/* -t $out/bin + + for shell in bash fish zsh; do + installShellCompletion --$shell completions/$shell/* + done + + installManPage docs/*.[1-9] ''; meta = with stdenv.lib; { - homepage = https://cri-o.io; - description = ''Open Container Initiative-based implementation of the - Kubernetes Container Runtime Interface''; + homepage = "https://cri-o.io"; + description = '' + Open Container Initiative-based implementation of the + Kubernetes Container Runtime Interface + ''; license = licenses.asl20; - maintainers = with maintainers; [ saschagrunert ]; + maintainers = with maintainers; [ ] ++ teams.podman.members; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix new file mode 100644 index 0000000000000..1578eaf4f585c --- /dev/null +++ b/pkgs/applications/virtualization/cri-o/wrapper.nix @@ -0,0 +1,53 @@ +{ cri-o-unwrapped +, runCommand +, makeWrapper +, lib +, extraPackages ? [] +, cri-o +, runc # Default container runtime +, crun # Container runtime (default with cgroups v2 for podman/buildah) +, conmon # Container runtime monitor +, utillinux # nsenter +, cni-plugins # not added to path +, iptables +, socat +}: + +let + cri-o = cri-o-unwrapped; + + binPath = lib.makeBinPath ([ + runc + crun + conmon + utillinux + iptables + socat + ] ++ extraPackages); + +in runCommand cri-o.name { + name = "${cri-o.pname}-wrapper-${cri-o.version}"; + inherit (cri-o) pname version; + + meta = builtins.removeAttrs cri-o.meta [ "outputsToInstall" ]; + + outputs = [ + "out" + "man" + ]; + + nativeBuildInputs = [ + makeWrapper + ]; + +} '' + ln -s ${cri-o.man} $man + + mkdir -p $out/bin + ln -s ${cri-o-unwrapped}/share $out/share + + for p in ${cri-o-unwrapped}/bin/*; do + makeWrapper $p $out/bin/''${p##*/} \ + --prefix PATH : ${binPath} + done +'' diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 28614efa7f3be..38ce277bf3ff2 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -1,5 +1,5 @@ -{ stdenv, rustPlatform, fetchgit, runCommand, symlinkJoin -, pkgconfig, minijail, dtc, libusb1, libcap +{ stdenv, lib, rustPlatform, fetchgit, runCommand, symlinkJoin +, pkgconfig, minijail, dtc, libusb1, libcap, linux }: let @@ -53,7 +53,7 @@ in ./default-seccomp-policy-dir.diff ]; - cargoSha256 = "1s9nfgfqk140hg08i0xzylnrgrx84dqss0vnvhxnydwy9q03nk7r"; + cargoSha256 = "0lhivwvdihslwp81i3sa5q88p5hr83bzkvklrcgf6x73arwk8kdz"; nativeBuildInputs = [ pkgconfig ]; @@ -73,13 +73,17 @@ in cp seccomp/${arch}/* $out/share/policy/ ''; + CROSVM_CARGO_TEST_KERNEL_BINARY = + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) + "${linux}/${stdenv.hostPlatform.platform.kernelTarget}"; + passthru = { inherit adhdSrc; src = crosvmSrc; updateScript = ./update.py; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A secure virtual machine monitor for KVM"; homepage = "https://chromium.googlesource.com/chromiumos/platform/crosvm/"; maintainers = with maintainers; [ qyliss ]; diff --git a/pkgs/applications/virtualization/crosvm/update.py b/pkgs/applications/virtualization/crosvm/update.py index 280d6ec18119b..29e68b9f57904 100755 --- a/pkgs/applications/virtualization/crosvm/update.py +++ b/pkgs/applications/virtualization/crosvm/update.py @@ -17,7 +17,7 @@ components = ['chromiumos/platform/crosvm', 'chromiumos/third_party/adhd'] git_root = 'https://chromium.googlesource.com/' manifest_versions = f'{git_root}chromiumos/manifest-versions' -buildspecs_url = f'{manifest_versions}/+/refs/heads/master/paladin/buildspecs/' +buildspecs_url = f'{manifest_versions}/+/refs/heads/master/full/buildspecs/' # CrOS version numbers look like this: # [<chrome-major-version>.]<tip-build>.<branch-build>.<branch-branch-build> diff --git a/pkgs/applications/virtualization/crosvm/upstream-info.json b/pkgs/applications/virtualization/crosvm/upstream-info.json index 690eca38bffb9..bb9cc8841b4a3 100644 --- a/pkgs/applications/virtualization/crosvm/upstream-info.json +++ b/pkgs/applications/virtualization/crosvm/upstream-info.json @@ -1,19 +1,23 @@ { - "version": "79.12607.0.0-rc4", + "version": "81.12871.0.0-rc1", "components": { "chromiumos/platform/crosvm": { "url": "https://chromium.googlesource.com/chromiumos/platform/crosvm", - "rev": "cfb7db44eb9e5a0bca9a22bfb985252ef74ab251", - "date": "2019-10-17T23:22:08+00:00", - "sha256": "0gm1ggyzh9qfizm36jmh71c3anygxj1840cm94h71kzg9kiw0330", - "fetchSubmodules": false + "rev": "8b8c01e1ad31718932491e4aee63f56109a138e2", + "date": "2020-01-25T02:28:10+00:00", + "sha256": "1qmf1k06pwynh15c3nr9m6v90z2pkk930xniwvlvbvnazrk4rllg", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false }, "chromiumos/third_party/adhd": { "url": "https://chromium.googlesource.com/chromiumos/third_party/adhd", - "rev": "a8df1c52bde3bfd2aebc1d7adcd6f195eb212cb1", - "date": "2019-10-17T18:53:18+00:00", - "sha256": "1hyvnvwr5ka9zw4h7hhl6fpsfl2acp3zy4wr5qrw8s1cn8ljr9vy", - "fetchSubmodules": false + "rev": "f361d5b02623274723bff251dafa1e2a2887b013", + "date": "2020-01-23T18:37:46+00:00", + "sha256": "1p8iwjwgmcgmzri03ik2jaid8l0ch0bzn6z9z64dix1hlrvrlliw", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } } } diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index ded793449fc72..a11d5d356d143 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -9,6 +9,7 @@ , python3 , systemd , yajl +, nixosTests }: let @@ -62,6 +63,8 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.podman = nixosTests.podman; + meta = with lib; { description = "A fast and lightweight fully featured OCI runtime and C library for running containers"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix index 0bd5d69466b0c..14c5ec0a41617 100644 --- a/pkgs/applications/virtualization/docker-compose/default.nix +++ b/pkgs/applications/virtualization/docker-compose/default.nix @@ -7,12 +7,12 @@ }: buildPythonApplication rec { - version = "1.25.4"; + version = "1.25.5"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "1ww8ckpj3n5jdg63qvmiqx3gk0fsrnynnnqj17fppymbwjzf5fps"; + sha256 = "1ijhg93zs3lswkljnm0rhww7gdy0g94psvsya2741prz2zcbcbks"; }; # lots of networking and other fails @@ -41,7 +41,7 @@ buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://docs.docker.com/compose/; + homepage = "https://docs.docker.com/compose/"; description = "Multi-container orchestration for Docker"; license = licenses.asl20; maintainers = with maintainers; [ Frostman ]; diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index a4c2be0506101..996d52bacab20 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -33,7 +33,7 @@ buildGoPackage rec { # docker-slim tries to create its state dir next to the binary (inside the nix # store), so we set it to use the working directory at the time of invocation postInstall = '' - wrapProgram "$bin/bin/docker-slim" --add-flags '--state-path "$(pwd)"' + wrapProgram "$out/bin/docker-slim" --add-flags '--state-path "$(pwd)"' ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 7f7b3a227e842..69378da2b839f 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig +{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, installShellFiles, pkgconfig , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute, lvm2, systemd -, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs +, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git , procps, libseccomp }: @@ -78,7 +78,7 @@ rec { sha256 = sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ installShellFiles pkgconfig ]; buildInputs = [ makeWrapper removeReferencesTo go-md2man go libtool ] ++ optionals (stdenv.isLinux) [ @@ -123,7 +123,7 @@ rec { outputs = ["out" "man"]; - extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]); + extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux git ]); installPhase = optionalString (stdenv.isLinux) '' install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd @@ -147,9 +147,9 @@ rec { --prefix PATH : "$out/libexec/docker:$extraPath" # completion (cli) - install -Dm644 ./components/cli/contrib/completion/bash/docker $out/share/bash-completion/completions/docker - install -Dm644 ./components/cli/contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish - install -Dm644 ./components/cli/contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker + installShellCompletion --bash ./components/cli/contrib/completion/bash/docker + installShellCompletion --fish ./components/cli/contrib/completion/fish/docker.fish + installShellCompletion --zsh ./components/cli/contrib/completion/zsh/_docker # Include contributed man pages (cli) # Generate man pages from cobra commands @@ -163,16 +163,7 @@ rec { echo "Generate legacy manpages" ./man/md2man-all.sh -q - manRoot="$man/share/man" - mkdir -p "$manRoot" - for manDir in ./man/man?; do - manBase="$(basename "$manDir")" # "man1" - for manFile in "$manDir"/*; do - manName="$(basename "$manFile")" # "docker-build.1" - mkdir -p "$manRoot/$manBase" - gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz" - done - done + installManPage man/*/*.[1-9] ''; preFixup = '' @@ -182,7 +173,7 @@ rec { ''; meta = { - homepage = https://www.docker.com/; + homepage = "https://www.docker.com/"; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; maintainers = with maintainers; [ nequissimus offline tailhook vdemeester periklis ]; @@ -206,9 +197,9 @@ rec { }; docker_19_03 = makeOverridable dockerGen { - version = "19.03.8"; - rev = "afacb8b7f0d8d4f9d2a8e8736e9c993e672b41f3"; - sha256 = "15iq16rlnkw78lvapcfpbnsnxhdjbvfvgzg3xzxhpdg1dmq40b6j"; + version = "19.03.9"; + rev = "9d988398e765e4b97f27f93c4d04b272ac64c9c7"; + sha256 = "0g2jpmqryfpvhdkapl8syi4hccx6czpihp1p1gsp1mfwz9aycsqv"; runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10 runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13 diff --git a/pkgs/applications/virtualization/docker/gc.nix b/pkgs/applications/virtualization/docker/gc.nix index dcac628e36767..08cfba59918ff 100644 --- a/pkgs/applications/virtualization/docker/gc.nix +++ b/pkgs/applications/virtualization/docker/gc.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Docker garbage collection of containers and images"; license = licenses.asl20; - homepage = https://github.com/spotify/docker-gc; + homepage = "https://github.com/spotify/docker-gc"; maintainers = with maintainers; [offline]; platforms = docker.meta.platforms; }; diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix index 3b2e1f45ae645..cb3518d7d3da1 100644 --- a/pkgs/applications/virtualization/docker/proxy.nix +++ b/pkgs/applications/virtualization/docker/proxy.nix @@ -16,13 +16,13 @@ buildGoPackage rec { goDeps = null; installPhase = '' - install -m755 -D ./go/bin/proxy $bin/bin/docker-proxy + install -m755 -D ./go/bin/proxy $out/bin/docker-proxy ''; meta = with stdenv.lib; { description = "Docker proxy binary to forward traffic between host and containers"; license = licenses.asl20; - homepage = https://github.com/docker/libnetwork; + homepage = "https://github.com/docker/libnetwork"; maintainers = with maintainers; [vdemeester]; platforms = platforms.linux; }; diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix index 069d5836a42b0..faa1076e2998c 100644 --- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Xen Subproject: Windows PV Driver"; - homepage = http://xenproject.org/downloads/windows-pv-drivers.html; + homepage = "http://xenproject.org/downloads/windows-pv-drivers.html"; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; license = licenses.bsd3; diff --git a/pkgs/applications/virtualization/driver/win-qemu/default.nix b/pkgs/applications/virtualization/driver/win-qemu/default.nix index 1fa3e76d18fde..97a1f0b3039b7 100644 --- a/pkgs/applications/virtualization/driver/win-qemu/default.nix +++ b/pkgs/applications/virtualization/driver/win-qemu/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Windows QEMU Drivers"; - homepage = https://fedoraproject.org/wiki/Windows_Virtio_Drivers; + homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers"; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix index 39ca93d4e1a88..c4684a20914fd 100644 --- a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { The drivers are signed by Univention with a Software Publishers Certificate obtained from the VeriSign CA. ''; - homepage = http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers; + homepage = "http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers"; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/pkgs/applications/virtualization/driver/win-spice/default.nix index 2b2d8568a5b7d..f327512b128e1 100644 --- a/pkgs/applications/virtualization/driver/win-spice/default.nix +++ b/pkgs/applications/virtualization/driver/win-spice/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Windows SPICE Drivers"; - homepage = https://www.spice-space.org/; + homepage = "https://www.spice-space.org/"; license = [ licenses.asl20 ]; # See https://github.com/vrozenfe/qxl-dod maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix index 351353ceb96e9..f8a52f5b898d5 100644 --- a/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Windows VirtIO Drivers"; - homepage = https://fedoraproject.org/wiki/Windows_Virtio_Drivers; + homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers"; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index 220d26c116f0b..79d1b606bcba6 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv }: let - version = "0.20.0"; + version = "0.21.1"; suffix = { x86_64-linux = "x86_64"; @@ -15,13 +15,13 @@ let }; firecracker-bin = fetchbin "firecracker" { - x86_64-linux = "073pp4q5dnyr126k8k7qdkqclqx18hj12app4gj2is0413gia8z9"; - aarch64-linux = "1w5f522imq5dnjrdidnrq7jlwcdrsiz32shv9bh66dhy336sd8qw"; + x86_64-linux = "0g4fja3bz1fsyz8vj99199yblkn46ygf33ldwd1ssw8f957vbwnb"; + aarch64-linux = "1qyppcxnh7f42fs4px5rvkk6lza57h2sq9naskvqn5zy4vsvq89s"; }; jailer-bin = fetchbin "jailer" { - x86_64-linux = "0falk6y9y0pimgav1yg6ydn6wsslz0my01qd9by8ipk3f3776531"; - aarch64-linux = "1j4x4p4zz1ydvpzbbmxszyqv28qbl4v3hiwdj2f67f1jn1cv9l7z"; + x86_64-linux = "0x89pfmqci9d3i9fi9b9zm94yr2v7pq7kp3drlb952jkdfj0njyk"; + aarch64-linux = "03fx9sk88jm23wqm8fraqd1ccfhbqvc310mkfv1f5p2ykhq2ahrk"; }; in @@ -53,7 +53,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Secure, fast, minimal micro-container virtualization"; - homepage = http://firecracker-microvm.io; + homepage = "http://firecracker-microvm.io"; license = licenses.asl20; platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/applications/virtualization/firectl/default.nix b/pkgs/applications/virtualization/firectl/default.nix index 1f74318f2ddef..47ae4637b57e1 100644 --- a/pkgs/applications/virtualization/firectl/default.nix +++ b/pkgs/applications/virtualization/firectl/default.nix @@ -4,6 +4,8 @@ buildGoModule rec { pname = "firectl"; version = "0.1.0"; + patches = [ ./gomod.patch ]; + src = fetchFromGitHub { owner = "firecracker-microvm"; repo = pname; @@ -11,13 +13,13 @@ buildGoModule rec { sha256 = "1ni3yx4rjhrkqk2038c6hkb2jwsdj2llx233wd5wgpvb6c57652p"; }; - modSha256 = "1nqjz1afklcxc3xcpmygjdh3lfxjk6zvmghr8z8fr3nw2wvw2ddr"; + vendorSha256 = "1xbpck1gvzl75xgrajf5yzl199l4f2f6j3mac5586i7b00b9jxqj"; meta = with stdenv.lib; { description = "A command-line tool to run Firecracker microVMs"; - homepage = https://github.com/firecracker-microvm/firectl; + homepage = "https://github.com/firecracker-microvm/firectl"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ xrelkd ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/virtualization/firectl/gomod.patch b/pkgs/applications/virtualization/firectl/gomod.patch new file mode 100644 index 0000000000000..96c65e7282211 --- /dev/null +++ b/pkgs/applications/virtualization/firectl/gomod.patch @@ -0,0 +1,15 @@ +diff --git a/go.mod b/go.mod +index 1044001..7bafeda 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,7 +1,10 @@ + module github.com/firecracker-microvm/firectl + ++go 1.14 ++ + require ( + github.com/firecracker-microvm/firecracker-go-sdk v0.15.1 ++ github.com/go-openapi/strfmt v0.17.1 + github.com/jessevdk/go-flags v1.4.0 + github.com/pkg/errors v0.8.0 + github.com/sirupsen/logrus v1.1.1 diff --git a/pkgs/applications/virtualization/gvisor/containerd-shim.nix b/pkgs/applications/virtualization/gvisor/containerd-shim.nix index d30897df79e9e..97623511222f0 100644 --- a/pkgs/applications/virtualization/gvisor/containerd-shim.nix +++ b/pkgs/applications/virtualization/gvisor/containerd-shim.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "077bhrmjrpcxv1z020yxhx2c4asn66j21gxlpa6hz0av3lfck9lm"; }; - modSha256 = "1jdhgbrn59ahnabwnig99i21f6kimmqx9f3dg10ffwfs3dx0gzlg"; + vendorSha256 = "11jai5jl024k7wbhz4a3zzdbvl0si07jwgwmyr8bn4i0nqx8ig2k"; buildPhase = '' make @@ -28,9 +28,9 @@ buildGoModule rec { meta = with lib; { description = "containerd shim for gVisor"; - homepage = https://github.com/google/gvisor-containerd-shim; + homepage = "https://github.com/google/gvisor-containerd-shim"; license = licenses.asl20; maintainers = with maintainers; [ andrew-d ]; platforms = [ "x86_64-linux" ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index 3d0ae35f56080..7d62b1b9fa247 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -76,7 +76,7 @@ in buildBazelPackage rec { rm -f "$bazelOut"/java.log "$bazelOut"/java.log.* ''; - sha256 = "1bn7nhv5pag8fdm8l8nvgg3fzvhpy2yv9yl2slrb16lckxzha3v6"; + sha256 = "0r11kbyp1ambgcj35gvjjmxrsrdg7b9jb9sq3kih4lik7zyljp25"; }; buildAttrs = { @@ -93,7 +93,7 @@ in buildBazelPackage rec { meta = with stdenv.lib; { description = "Container Runtime Sandbox"; - homepage = https://github.com/google/gvisor; + homepage = "https://github.com/google/gvisor"; license = licenses.asl20; maintainers = with maintainers; [ andrew-d ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index d56318555e5eb..7a6ccc67bb50d 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { extensively as possible with minimal effort and reduced maintenance overhead ''; - homepage = https://github.com/lkl/linux/; + homepage = "https://github.com/lkl/linux/"; platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; # Darwin probably works too but I haven't tested it license = licenses.gpl2; maintainers = with maintainers; [ copumpkin ]; diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index 0f53a5c4f14d6..a0ec55dd895b7 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { step required to move away from dual booting with other operating systems for legacy programs that require high performance graphics. ''; - homepage = https://looking-glass.hostfission.com/; + homepage = "https://looking-glass.hostfission.com/"; license = licenses.gpl2Plus; maintainers = [ maintainers.alexbakker ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix index e11ca04f6b36d..b56b88cf87ef9 100644 --- a/pkgs/applications/virtualization/nvidia-docker/default.nix +++ b/pkgs/applications/virtualization/nvidia-docker/default.nix @@ -76,7 +76,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/NVIDIA/nvidia-docker; + homepage = "https://github.com/NVIDIA/nvidia-docker"; description = "NVIDIA container runtime for Docker"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch b/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch index 043c1efade8a6..9ae8d6b5e756f 100644 --- a/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch +++ b/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch @@ -71,10 +71,10 @@ index 33d78dd..2b087db 100644 #endif /* HEADER_LDCACHE_H */ diff --git a/src/nvc_info.c b/src/nvc_info.c -index cc96542..3fe7612 100644 +index 30e3cfd..6d12a50 100644 --- a/src/nvc_info.c +++ b/src/nvc_info.c -@@ -163,15 +163,13 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * +@@ -167,15 +167,13 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * if (path_resolve_full(err, path, root, ldcache) < 0) return (-1); ldcache_init(&ld, err, path); @@ -91,7 +91,7 @@ index cc96542..3fe7612 100644 goto fail; info->nlibs32 = size; -@@ -179,13 +177,11 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * +@@ -183,13 +181,11 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * if (info->libs32 == NULL) goto fail; if (ldcache_resolve(&ld, LIB32_ARCH, root, libs, @@ -106,7 +106,7 @@ index cc96542..3fe7612 100644 return (rv); } -@@ -199,7 +195,7 @@ find_binary_paths(struct error *err, struct nvc_driver_info *info, const char *r +@@ -203,7 +199,7 @@ find_binary_paths(struct error *err, struct nvc_driver_info *info, const char *r char path[PATH_MAX]; int rv = -1; @@ -116,10 +116,10 @@ index cc96542..3fe7612 100644 return (-1); } diff --git a/src/nvc_ldcache.c b/src/nvc_ldcache.c -index d41a24d..65b7878 100644 +index 6ff380f..cbe6a69 100644 --- a/src/nvc_ldcache.c +++ b/src/nvc_ldcache.c -@@ -331,7 +331,7 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt) +@@ -340,7 +340,7 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt) if (validate_args(ctx, cnt != NULL) < 0) return (-1); diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix index 71c02ab4de50f..5b97d7fffa299 100644 --- a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix +++ b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, libelf, libcap, libseccomp }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, libelf, libcap, libseccomp }: with lib; let @@ -13,13 +13,13 @@ with lib; let in stdenv.mkDerivation rec { pname = "libnvidia-container"; - version = "1.0.0"; + version = "1.0.6"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "libnvidia-container"; rev = "v${version}"; - sha256 = "1ws6mfsbgxhzlb5w1r8qqg2arvxkr21n59i4cqsyz3h5jsqsflbw"; + sha256 = "1pnpc9knwh8d1zqb28zc3spkjc00w0z10vd3jna8ksvpl35jl7w3"; }; # locations of nvidia-driver libraries are not resolved via ldconfig which @@ -42,10 +42,12 @@ in stdenv.mkDerivation rec { touch deps/src/nvidia-modprobe-${modp-ver}/.download_stamp ''; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libelf libcap libseccomp ]; meta = { - homepage = https://github.com/NVIDIA/libnvidia-container; + homepage = "https://github.com/NVIDIA/libnvidia-container"; description = "NVIDIA container runtime library"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 87ec2e52f13a1..84f74ef6dd03c 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/vmware/open-vm-tools; + homepage = "https://github.com/vmware/open-vm-tools"; description = "Set of tools for VMWare guests to improve host-guest interaction"; longDescription = '' A set of services and modules that enable several features in VMware products for diff --git a/pkgs/applications/virtualization/podman-compose/default.nix b/pkgs/applications/virtualization/podman-compose/default.nix index 31755f87f63cc..de3d944bacb18 100644 --- a/pkgs/applications/virtualization/podman-compose/default.nix +++ b/pkgs/applications/virtualization/podman-compose/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchPypi, podman, pyyaml }: +{ lib, buildPythonApplication, fetchPypi, pyyaml }: buildPythonApplication rec { version = "0.1.5"; @@ -9,13 +9,13 @@ buildPythonApplication rec { sha256 = "1sgbc889zq127qhxa9frhswa1mid19fs5qnyzfihx648y5i968pv"; }; - propagatedBuildInputs = [ pyyaml podman ]; + propagatedBuildInputs = [ pyyaml ]; - meta = with lib; { + meta = { description = "An implementation of docker-compose with podman backend"; homepage = "https://github.com/containers/podman-compose"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ sikmir ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.sikmir ] ++ lib.teams.podman.members; }; } diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index cd78c12bdc51c..3ed029e55fb43 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -1,47 +1,68 @@ -{ stdenv, fetchFromGitHub, pkgconfig, installShellFiles -, buildGoPackage, gpgme, lvm2, btrfs-progs, libseccomp, systemd +{ stdenv +, fetchFromGitHub +, pkg-config +, installShellFiles +, buildGoModule +, gpgme +, lvm2 +, btrfs-progs +, libapparmor +, libseccomp +, libselinux +, systemd , go-md2man +, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "podman"; - version = "1.8.2"; + version = "1.9.3"; src = fetchFromGitHub { - owner = "containers"; - repo = "libpod"; - rev = "v${version}"; - sha256 = "1nxlkqz1ffa3l2yf4rmsxj788dx6xdp8pbi55m9jc9k1vqwc9hxs"; + owner = "containers"; + repo = "libpod"; + rev = "v${version}"; + sha256 = "0gbp12xn1vliyawkw2w2bpn6b5h2cm41g3nj72vk4jyhis0igq1s"; }; - goPackagePath = "github.com/containers/libpod"; + vendorSha256 = null; - outputs = [ "bin" "out" "man" ]; + outputs = [ "out" "man" ]; - nativeBuildInputs = [ pkgconfig go-md2man installShellFiles ]; + nativeBuildInputs = [ pkg-config go-md2man installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs libseccomp gpgme lvm2 systemd ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ + btrfs-progs + gpgme + libapparmor + libseccomp + libselinux + lvm2 + systemd + ]; buildPhase = '' - pushd go/src/${goPackagePath} patchShebangs . ${if stdenv.isDarwin then "make CGO_ENABLED=0 BUILDTAGS='remoteclient containers_image_openpgp exclude_graphdriver_devicemapper' varlink_generate all" - else "make binaries docs"} + else "make podman docs"} ''; installPhase = '' - install -Dm555 bin/podman $bin/bin/podman + install -Dm555 bin/podman $out/bin/podman installShellCompletion --bash completions/bash/podman installShellCompletion --zsh completions/zsh/_podman MANDIR=$man/share/man make install.man ''; + passthru.tests.podman = nixosTests.podman; + meta = with stdenv.lib; { homepage = "https://podman.io/"; description = "A program for managing pods, containers and container images"; license = licenses.asl20; maintainers = with maintainers; [ marsam ] ++ teams.podman.members; platforms = platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix new file mode 100644 index 0000000000000..d97d182496a4e --- /dev/null +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -0,0 +1,52 @@ +{ podman-unwrapped +, runCommand +, makeWrapper +, lib +, extraPackages ? [] +, podman # Docker compat +, runc # Default container runtime +, crun # Container runtime (default with cgroups v2 for podman/buildah) +, conmon # Container runtime monitor +, slirp4netns # User-mode networking for unprivileged namespaces +, fuse-overlayfs # CoW for images, much faster than default vfs +, utillinux # nsenter +, cni-plugins # not added to path +, iptables +}: + +let + podman = podman-unwrapped; + + binPath = lib.makeBinPath ([ + runc + crun + conmon + slirp4netns + fuse-overlayfs + utillinux + iptables + ] ++ extraPackages); + +in runCommand podman.name { + name = "${podman.pname}-wrapper-${podman.version}"; + inherit (podman) pname version passthru; + + meta = builtins.removeAttrs podman.meta [ "outputsToInstall" ]; + + outputs = [ + "out" + "man" + ]; + + nativeBuildInputs = [ + makeWrapper + ]; + +} '' + ln -s ${podman.man} $man + + mkdir -p $out/bin + ln -s ${podman-unwrapped}/share $out/share + makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \ + --prefix PATH : ${binPath} +'' diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix index 0678591fc2a35..800d601c76e64 100644 --- a/pkgs/applications/virtualization/qboot/default.nix +++ b/pkgs/applications/virtualization/qboot/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, meson, ninja, fetchFromGitHub }: stdenv.mkDerivation { - name = "qboot-20170330"; + name = "qboot-20200423"; src = fetchFromGitHub { owner = "bonzini"; repo = "qboot"; - rev = "ac9488f26528394856b94bda0797f5bd9c69a26a"; - sha256 = "0l83nbjndin1cbcimkqkiqr5df8d76cnhyk26rd3aygb2bf7cspy"; + rev = "de50b5931c08f5fba7039ddccfb249a5b3b0b18d"; + sha256 = "1d0h29zz535m0pq18k3aya93q7lqm2858mlcp8mlfkbq54n8c5d8"; }; + nativeBuildInputs = [ meson ninja ]; + installPhase = '' mkdir -p $out - cp bios.bin* $out/. + cp bios.bin bios.bin.elf $out/. ''; hardeningDisable = [ "stackprotector" "pic" ]; meta = { description = "A simple x86 firmware for booting Linux"; - homepage = https://github.com/bonzini/qboot; + homepage = "https://github.com/bonzini/qboot"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; platforms = ["x86_64-linux" "i686-linux"]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 203ee1c7cc0ed..d6611e20a9c13 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -118,16 +118,16 @@ stdenv.mkDerivation rec { ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { - url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/xattr_size_max.patch; + url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/xattr_size_max.patch"; sha256 = "1xfdjs1jlvs99hpf670yianb8c3qz2ars8syzyz8f2c2cp5y4bxb"; }) (fetchpatch { - url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch; + url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch"; sha256 = "1gm67v41gw6apzgz7jr3zv9z80wvkv0jaxd2w4d16hmipa8bhs0k"; }) ./sigrtminmax.patch (fetchpatch { - url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch; + url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch"; sha256 = "0wk0rrcqywhrw9hygy6ap0lfg314m9z1wr2hn8338r5gfcw75mav"; }) ]; @@ -187,7 +187,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://www.qemu.org/; + homepage = "http://www.qemu.org/"; description = "A generic and open source machine emulator and virtualizer"; license = licenses.gpl2Plus; maintainers = with maintainers; [ eelco ]; diff --git a/pkgs/applications/virtualization/qtemu/default.nix b/pkgs/applications/virtualization/qtemu/default.nix new file mode 100644 index 0000000000000..29f0004be830b --- /dev/null +++ b/pkgs/applications/virtualization/qtemu/default.nix @@ -0,0 +1,45 @@ +{ stdenv, mkDerivation, fetchFromGitLab, pkgconfig, qmake, qtbase, qemu, makeWrapper }: + +mkDerivation rec { + pname = "qtemu"; + version = "2.1"; + + src = fetchFromGitLab { + owner = "qtemu"; + repo = "gui"; + rev = version; + sha256 = "1555178mkfw0gwmw8bsxmg4339j2ifp0yb4b2f39nxh9hwshg07j"; + }; + + nativeBuildInputs = [ + qmake + pkgconfig + ]; + + buildInputs = [ + qtbase + qemu + ]; + + installPhase = '' + runHook preInstall + + # upstream lacks an install method + install -D -t $out/share/applications qtemu.desktop + install -D -t $out/share/pixmaps qtemu.png + install -D -t $out/bin qtemu + + # make sure that the qemu-* executables are found + wrapProgram $out/bin/qtemu --prefix PATH : ${stdenv.lib.makeBinPath [ qemu ]} + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Qt-based front-end for QEMU emulator"; + homepage = "https://qtemu.org"; + license = licenses.gpl2; + platforms = with platforms; linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix index 7b56da0f7bc30..fda95b41ab5d4 100644 --- a/pkgs/applications/virtualization/railcar/default.nix +++ b/pkgs/applications/virtualization/railcar/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Rust implementation of the Open Containers Initiative oci-runtime"; - homepage = https://github.com/oracle/railcar; + homepage = "https://github.com/oracle/railcar"; license = with licenses; [ asl20 /* or */ upl ]; maintainers = [ maintainers.spacekookie ]; platforms = platforms.all; diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index 58710365b6efb..dcc5efb6504a7 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "VirtualBox client with remote management"; - homepage = http://remotebox.knobgoblin.org.uk/; + homepage = "http://remotebox.knobgoblin.org.uk/"; license = licenses.gpl2Plus; longDescription = '' VirtualBox is traditionally considered to be a virtualization solution diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix deleted file mode 100644 index bacd175197d52..0000000000000 --- a/pkgs/applications/virtualization/rkt/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg, trousers, squashfsTools, - cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper, glibc }: - -let - # Always get the information from - # https://github.com/coreos/rkt/blob/v${VERSION}/stage1/usr_from_coreos/coreos-common.mk - coreosImageRelease = "1478.0.0"; - coreosImageSystemdVersion = "233"; - - # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor. - stage1Flavours = [ "coreos" "fly" ]; - stage1Dir = "lib/rkt/stage1-images"; - -in stdenv.mkDerivation rec { - version = "1.30.0"; - pname = "rkt"; - BUILDDIR="build-${pname}-${version}"; - - src = fetchFromGitHub { - owner = "coreos"; - repo = "rkt"; - rev = "v${version}"; - sha256 = "0dqf83b7iin1np8k8k1m8i99ybga8vx932q7n2q64yghkw7p6i00"; - }; - - stage1BaseImage = fetchurl { - url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz"; - sha256 = "0s4qdkkfp0iirfnm5ds3b3hxq0249kvpygyhflma8z90ivkzk5wq"; - }; - - buildInputs = [ - glibc.out glibc.static - autoreconfHook go file git wget gnupg trousers squashfsTools cpio acl systemd - makeWrapper - ]; - - preConfigure = '' - ./autogen.sh - configureFlagsArray=( - --with-stage1-flavors=${builtins.concatStringsSep "," stage1Flavours} - ${if lib.findFirst (p: p == "coreos") null stage1Flavours != null then " - --with-coreos-local-pxe-image-path=${stage1BaseImage} - --with-coreos-local-pxe-image-systemd-version=v${coreosImageSystemdVersion} - " else "" } - --with-stage1-default-location=$out/${stage1Dir}/stage1-${builtins.elemAt stage1Flavours 0}.aci - ); - ''; - - preBuild = '' - export BUILDDIR - export GOCACHE="$TMPDIR/go-cache" - ''; - - installPhase = '' - mkdir -p $out/bin - cp -Rv $BUILDDIR/target/bin/rkt $out/bin - - mkdir -p $out/lib/rkt/stage1-images/ - cp -Rv $BUILDDIR/target/bin/stage1-*.aci $out/${stage1Dir}/ - - wrapProgram $out/bin/rkt \ - --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib:${acl.out}/lib" \ - --prefix PATH : ${iptables}/bin - ''; - - meta = with lib; { - description = "A fast, composable, and secure App Container runtime for Linux"; - homepage = https://github.com/coreos/rkt; - license = licenses.asl20; - maintainers = with maintainers; [ ragge steveej ]; - platforms = [ "x86_64-linux" ]; - knownVulnerabilities = [ - "CVE-2019-10144: processes run with `rkt enter` are given all capabilities during stage 2" - "CVE-2019-10145: processes run with `rkt enter` do not have seccomp filtering during stage 2" - "CVE-2019-10147: processes run with `rkt enter` are not limited by cgroups during stage 2" - ]; - }; -} diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 363a41c1edfa8..367767c72a711 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -1,7 +1,16 @@ -{ lib, fetchFromGitHub, buildGoPackage, go-md2man -, pkgconfig, libapparmor, apparmor-parser, libseccomp, which }: - -with lib; +{ lib +, fetchFromGitHub +, buildGoPackage +, go-md2man +, installShellFiles +, pkg-config +, which +, libapparmor +, apparmor-parser +, libseccomp +, libselinux +, nixosTests +}: buildGoPackage rec { pname = "runc"; @@ -15,42 +24,32 @@ buildGoPackage rec { }; goPackagePath = "github.com/opencontainers/runc"; - outputs = [ "bin" "out" "man" ]; + outputs = [ "out" "man" ]; - hardeningDisable = ["fortify"]; + nativeBuildInputs = [ go-md2man installShellFiles pkg-config which ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ go-md2man libseccomp libapparmor apparmor-parser which ]; + buildInputs = [ libselinux libseccomp libapparmor apparmor-parser ]; - makeFlags = [ "BUILDTAGS+=seccomp" "BUILDTAGS+=apparmor" ]; + # these will be the default in the next release + makeFlags = [ "BUILDTAGS+=seccomp" "BUILDTAGS+=apparmor" "BUILDTAGS+=selinux" ]; buildPhase = '' cd go/src/${goPackagePath} patchShebangs . substituteInPlace libcontainer/apparmor/apparmor.go \ --replace /sbin/apparmor_parser ${apparmor-parser}/bin/apparmor_parser - make ${toString makeFlags} runc + make ${toString makeFlags} runc man ''; installPhase = '' - install -Dm755 runc $bin/bin/runc - - # Include contributed man pages - man/md2man-all.sh -q - manRoot="$man/share/man" - mkdir -p "$manRoot" - for manDir in man/man?; do - manBase="$(basename "$manDir")" # "man1" - for manFile in "$manDir"/*; do - manName="$(basename "$manFile")" # "docker-build.1" - mkdir -p "$manRoot/$manBase" - gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz" - done - done + install -Dm755 runc $out/bin/runc + installManPage man/*/*.[1-9] ''; - meta = { - homepage = https://runc.io/; + passthru.tests.podman = nixosTests.podman; + + meta = with lib; { + homepage = "https://github.com/opencontainers/runc"; description = "A CLI tool for spawning and running containers according to the OCI specification"; license = licenses.asl20; maintainers = with maintainers; [ offline ] ++ teams.podman.members; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 930afa3172299..f6a1a3bc6a91e 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -42,7 +42,7 @@ buildGoPackage rec { patchShebangs . sed -i 's|defaultPath := "[^"]*"|defaultPath := "${stdenv.lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go - ./mconfig -V ${version} -p $bin --localstatedir=/var + ./mconfig -V ${version} -p $out --localstatedir=/var # Don't install SUID binaries sed -i 's/-m 4755/-m 755/g' builddir/Makefile @@ -54,20 +54,20 @@ buildGoPackage rec { ''; installPhase = '' - make -C builddir install LOCALSTATEDIR=$bin/var - chmod 755 $bin/libexec/singularity/bin/starter-suid - wrapProgram $bin/bin/singularity --prefix PATH : ${stdenv.lib.makeBinPath propagatedBuildInputs} + make -C builddir install LOCALSTATEDIR=$out/var + chmod 755 $out/libexec/singularity/bin/starter-suid + wrapProgram $out/bin/singularity --prefix PATH : ${stdenv.lib.makeBinPath propagatedBuildInputs} ''; postFixup = '' - find $bin/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true + find $out/libexec/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true # These etc scripts shouldn't have their paths patched - cp etc/actions/* $bin/etc/singularity/actions/ + cp etc/actions/* $out/etc/singularity/actions/ ''; meta = with stdenv.lib; { - homepage = http://www.sylabs.io/; + homepage = "http://www.sylabs.io/"; description = "Application containers for linux"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 22aa31a6dea3d..f577ded70baea 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -8,6 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0n9k2kna2gd1zi6jv45zsp2jlv439nz5l5jjijirxqaycwi74srf"; }; NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; + patchFlags = [ "-uNp1" ]; + # included in the next release. + patches = [ ./timeout.diff ]; postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; diff --git a/pkgs/applications/virtualization/spice-vdagent/timeout.diff b/pkgs/applications/virtualization/spice-vdagent/timeout.diff new file mode 100644 index 0000000000000..2021e98e41f29 --- /dev/null +++ b/pkgs/applications/virtualization/spice-vdagent/timeout.diff @@ -0,0 +1,84 @@ +diff --git a/src/udscs.c b/src/udscs.c +index 4de75f8..7c99eed 100644 +--- a/src/udscs.c ++++ b/src/udscs.c +@@ -186,6 +186,7 @@ struct udscs_server *udscs_server_new( + server->read_callback = read_callback; + server->error_cb = error_cb; + server->service = g_socket_service_new(); ++ g_socket_service_stop(server->service); + + g_signal_connect(server->service, "incoming", + G_CALLBACK(udscs_server_accept_cb), server); +@@ -223,6 +224,11 @@ void udscs_server_listen_to_address(struct udscs_server *server, + g_object_unref(sock_addr); + } + ++void udscs_server_start(struct udscs_server *server) ++{ ++ g_socket_service_start(server->service); ++} ++ + void udscs_server_destroy_connection(struct udscs_server *server, + UdscsConnection *conn) + { +diff --git a/src/udscs.h b/src/udscs.h +index 45ebd3f..4f7ea36 100644 +--- a/src/udscs.h ++++ b/src/udscs.h +@@ -98,6 +98,8 @@ void udscs_server_listen_to_address(struct udscs_server *server, + const gchar *addr, + GError **err); + ++void udscs_server_start(struct udscs_server *server); ++ + void udscs_server_destroy_connection(struct udscs_server *server, + UdscsConnection *conn); + +diff --git a/src/vdagentd/vdagentd.c b/src/vdagentd/vdagentd.c +index cfd0a51..753c9bf 100644 +--- a/src/vdagentd/vdagentd.c ++++ b/src/vdagentd/vdagentd.c +@@ -1184,10 +1184,6 @@ int main(int argc, char *argv[]) + uinput_device = g_strdup(DEFAULT_UINPUT_DEVICE); + } + +- g_unix_signal_add(SIGINT, signal_handler, NULL); +- g_unix_signal_add(SIGHUP, signal_handler, NULL); +- g_unix_signal_add(SIGTERM, signal_handler, NULL); +- + openlog("spice-vdagentd", do_daemonize ? 0 : LOG_PERROR, LOG_USER); + + /* Setup communication with vdagent process(es) */ +@@ -1228,9 +1224,6 @@ int main(int argc, char *argv[]) + } + } + +- if (do_daemonize) +- daemonize(); +- + #ifdef WITH_STATIC_UINPUT + uinput = vdagentd_uinput_create(uinput_device, 1024, 768, NULL, 0, + debug > 1, uinput_fake); +@@ -1240,6 +1233,13 @@ int main(int argc, char *argv[]) + } + #endif + ++ if (do_daemonize) ++ daemonize(); ++ ++ g_unix_signal_add(SIGINT, signal_handler, NULL); ++ g_unix_signal_add(SIGHUP, signal_handler, NULL); ++ g_unix_signal_add(SIGTERM, signal_handler, NULL); ++ + if (want_session_info) + session_info = session_info_create(debug); + if (session_info) { +@@ -1252,6 +1252,7 @@ int main(int argc, char *argv[]) + + active_xfers = g_hash_table_new(g_direct_hash, g_direct_equal); + ++ udscs_server_start(server); + loop = g_main_loop_new(NULL, FALSE); + g_main_loop_run(loop); + diff --git a/pkgs/applications/virtualization/spike/default.nix b/pkgs/applications/virtualization/spike/default.nix index 4dbb7fbe4a522..0f397bc272a9f 100644 --- a/pkgs/applications/virtualization/spike/default.nix +++ b/pkgs/applications/virtualization/spike/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, dtc }: +{ stdenv, fetchgit, dtc, nixosTests }: stdenv.mkDerivation rec { pname = "spike"; @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests = { + can-run-hello-world = nixosTests.spike; + }; + meta = with stdenv.lib; { description = "A RISC-V ISA Simulator"; homepage = "https://github.com/riscv/riscv-isa-sim"; diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index fcc599b451f0e..db3fb1c96eb33 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, glibc }: stdenv.mkDerivation rec { - version = "0.18.0"; + version = "0.19.0"; pname = "tini"; src = fetchFromGitHub { owner = "krallin"; repo = "tini"; rev = "v${version}"; - sha256 ="1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; + sha256 ="1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4"; }; patchPhase = "sed -i /tini-static/d CMakeLists.txt"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tiny but valid init for containers"; - homepage = https://github.com/krallin/tini; + homepage = "https://github.com/krallin/tini"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/applications/virtualization/tinyemu/default.nix b/pkgs/applications/virtualization/tinyemu/default.nix index 224f77ed32d40..2c9098993d8f9 100644 --- a/pkgs/applications/virtualization/tinyemu/default.nix +++ b/pkgs/applications/virtualization/tinyemu/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" ''; meta = { - homepage = https://bellard.org/tinyemu/; + homepage = "https://bellard.org/tinyemu/"; description = "A system emulator for the RISC-V and x86 architectures"; longDescription = "TinyEMU is a system emulator for the RISC-V and x86 architectures. Its purpose is to be small and simple while being complete."; license = with stdenv.lib.licenses; [ mit bsd2 ]; diff --git a/pkgs/applications/virtualization/umoci/default.nix b/pkgs/applications/virtualization/umoci/default.nix index f07bb0fc164ee..d8a1f36dd5d37 100644 --- a/pkgs/applications/virtualization/umoci/default.nix +++ b/pkgs/applications/virtualization/umoci/default.nix @@ -1,6 +1,11 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib +, fetchFromGitHub +, buildGoModule +, go-md2man +, installShellFiles +}: -buildGoPackage rec { +buildGoModule rec { pname = "umoci"; version = "0.4.5"; @@ -11,10 +16,18 @@ buildGoPackage rec { sha256 = "1gzj4nnys73wajdwjn5jsskvnhzh8s2vmyl76ax8drpvw19bd5g3"; }; - goPackagePath = "github.com/openSUSE/umoci"; + vendorSha256 = null; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + nativeBuildInputs = [ go-md2man installShellFiles ]; + + postInstall = '' + sed -i '/SHELL =/d' Makefile + make local-doc + installManPage doc/man/*.[1-9] + ''; + meta = with lib; { description = "umoci modifies Open Container images"; homepage = "https://umo.ci"; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 99d20477a125e..952a30b139cf8 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://virt-manager.org; + homepage = "http://virt-manager.org"; description = "Desktop user interface for managing virtual machines"; longDescription = '' The virt-manager application is a desktop user interface for managing diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index 5b2b33d6adf39..85bc7c428ff22 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -29,7 +29,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig qttools ]; meta = with lib; { - homepage = https://f1ash.github.io/qt-virt-manager; + homepage = "https://f1ash.github.io/qt-virt-manager"; description = "Desktop user interface for managing virtual machines (QT)"; longDescription = '' The virt-manager application is a desktop user interface for managing diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix index efe985920a88e..7ad60405f1b85 100644 --- a/pkgs/applications/virtualization/virt-top/default.nix +++ b/pkgs/applications/virtualization/virt-top/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0.9"; src = fetchgit { - url = git://git.annexia.org/virt-top.git; + url = "git://git.annexia.org/virt-top.git"; rev = "v${version}"; sha256 = "0m7pm8lzlpngsj0vjv0hg8l9ck3gvwpva7r472f8f03xpjffwiga"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A top-like utility for showing stats of virtualized domains"; - homepage = https://people.redhat.com/~rjones/virt-top/; + homepage = "https://people.redhat.com/~rjones/virt-top/"; license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 3d0589032009a..41e6c425a81a5 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -11,12 +11,12 @@ with stdenv.lib; stdenv.mkDerivation rec { baseName = "virt-viewer"; - version = "8.0"; + version = "9.0"; name = "${baseName}-${version}"; src = fetchurl { url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz"; - sha256 = "1vdnjmhrva7r1n9nv09j8gc12hy0j9j5l4rka4hh0jbsbpnmiwyw"; + sha256 = "09a83mzyn3b4nd7wpa659g1zf1fjbzb79rk968bz6k5xl21k7d4i"; }; nativeBuildInputs = [ pkgconfig intltool shared-mime-info wrapGAppsHook glib ]; diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 6931e492e99c7..4d8987d6ed78b 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://virt-manager.org; + homepage = "http://virt-manager.org"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [qknight]; description = "Command line tool which provides an easy way to provision operating systems into virtual machines"; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 5d3044bdbc714..7b7929d9f1d6a 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -3,6 +3,9 @@ , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras , qttools, qtsvg, qtwayland, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 , alsaLib, curl, libvpx, nettools, dbus, substituteAll, fetchpatch +# If open-watcom-bin is not passed, VirtualBox will fall back to use +# the shipped alternative sources (assembly). +, open-watcom-bin ? null , makeself, perl , javaBindings ? true, jdk ? null # Almost doesn't affect closure size , pythonBindings ? false, python3 ? null @@ -19,10 +22,9 @@ with stdenv.lib; let python = python3; buildType = "release"; - # Remember to change the extpackRev and version in extpack.nix and - # guest-additions/default.nix as well. - main = "59f8f5774473f593e3eb5940e2a337e0674bcd9854164b2578fd43f896260c99"; - version = "6.1.4"; + # Use maintainers/scripts/update.nix to update the version and all related hashes or + # change the hashes in extpack.nix and guest-additions/default.nix as well manually. + version = "6.1.6"; iasl' = iasl.overrideAttrs (old: rec { inherit (old) pname; @@ -39,7 +41,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = main; + sha256 = "b031c30d770f28c5f884071ad933e8c1f83e65b93aaba03a4012077c1d90a54f"; }; outputs = [ "out" "modsrc" ]; @@ -108,6 +110,10 @@ in stdenv.mkDerivation { postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp + '' + optionalString headless '' + # Fix compile error in version 6.1.6 + substituteInPlace src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11-stubs.cpp \ + --replace PSHCLFORMATDATA PSHCLFORMATS ''; # first line: ugly hack, and it isn't yet clear why it's a problem @@ -145,6 +151,7 @@ in stdenv.mkDerivation { ${optionalString (!pulseSupport) "--disable-pulse"} \ ${optionalString (!enableHardening) "--disable-hardening"} \ ${optionalString (!enable32bitGuests) "--disable-vmmraw"} \ + ${optionalString (open-watcom-bin != null) "--with-ow-dir=${open-watcom-bin}"} \ --disable-kmods sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \ -i AutoConfig.kmk @@ -216,12 +223,13 @@ in stdenv.mkDerivation { passthru = { inherit version; # for guest additions inherit extensionPack; # for inclusion in profile to prevent gc + updateScript = ./update.sh; }; meta = { description = "PC emulator"; license = licenses.gpl2; - homepage = https://www.virtualbox.org/; + homepage = "https://www.virtualbox.org/"; maintainers = with maintainers; [ sander ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index ba8407e4a7368..c9918b1cedf48 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -12,13 +12,13 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "3b73798d776ff223ea8025b1a45001762f8d4e5bcd1ea61449773c1249935800"; + let value = "80b96b4b51a502141f6a8981f1493ade08a00762622c39e48319e5b122119bf3"; in assert (builtins.stringLength value) == 64; value; meta = { description = "Oracle Extension pack for VirtualBox"; license = licenses.virtualbox-puel; - homepage = https://www.virtualbox.org/; + homepage = "https://www.virtualbox.org/"; maintainers = with maintainers; [ sander cdepillabout ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index fdb393a94ebed..4275bc0542e8f 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "e2846a7576cce1b92a7c0744f41eaac750248d6e31dfca5c45d5766648b394c7"; + sha256 = "bcde4691dea7de93b65a10a43dda2b8f52e570f820992ad281c9bb5c8dede181"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/applications/virtualization/virtualbox/update.py b/pkgs/applications/virtualization/virtualbox/update.py deleted file mode 100755 index 6e8bfd5c82502..0000000000000 --- a/pkgs/applications/virtualization/virtualbox/update.py +++ /dev/null @@ -1,85 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i python3 -p python3 - -import os -import re -import json -import urllib.request - -from distutils.version import LooseVersion - -UPSTREAM_INFO_FILE = os.path.join( - os.path.dirname(os.path.abspath(__file__)), - "upstream-info.json" -) - - -def fetch_latest_version(): - url = "http://download.virtualbox.org/virtualbox/LATEST.TXT" - return urllib.request.urlopen(url).read().strip().decode() - - -def load_upstream_info(): - try: - with open(UPSTREAM_INFO_FILE, 'r') as fp: - return json.load(fp) - except FileNotFoundError: - return {'version': "0"} - - -def save_upstream_info(contents): - remark = "Generated using update.py from the same directory." - contents['__NOTE'] = remark - data = json.dumps(contents, indent=2, sort_keys=True) - with open(UPSTREAM_INFO_FILE, 'w') as fp: - fp.write(data + "\n") - - -def fetch_file_table(version): - url = "http://download.virtualbox.org/virtualbox/{}/SHA256SUMS" - url = url.format(version) - result = {} - for line in urllib.request.urlopen(url): - sha, name = line.rstrip().split() - result[name.lstrip(b'*').decode()] = sha.decode() - return result - - -def update_to_version(version): - extpack_start = 'Oracle_VM_VirtualBox_Extension_Pack-' - version_re = version.replace('.', '\\.') - attribute_map = { - 'extpack': r'^' + extpack_start + r'[^-]+-[^.]+.vbox-extpack$', - 'extpackRev': r'^' + extpack_start + r'[^-]+-([^.]+).vbox-extpack$', - 'main': r'^VirtualBox-' + version_re + r'.tar.bz2$', - 'guest': r'^VBoxGuestAdditions_' + version_re + r'.iso$', - } - table = fetch_file_table(version) - new_attrs = {'version': version} - for attr, searchexpr in attribute_map.items(): - result = [re.search(searchexpr, key) for key in table.keys()] - filtered = filter(lambda m: m is not None, result) - found = [m.groups()[0] if len(m.groups()) > 0 else table[m.group(0)] - for m in filtered if m is not None] - - if len(found) == 0: - msg = "No package found for attribute {}".format(attr) - raise AssertionError(msg) - elif len(found) != 1: - msg = "More than one package found for attribute {}: ".format(attr) - msg += ', '.join(found) - raise AssertionError(msg) - else: - new_attrs[attr] = found[0] - return new_attrs - - -info = load_upstream_info() -latest = fetch_latest_version() -if LooseVersion(info['version']) < LooseVersion(latest): - print("Updating to version {}...".format(latest), end="", flush=True) - new_attrs = update_to_version(latest) - save_upstream_info(new_attrs) - print(" done.") -else: - print("Version {} is already the latest one.".format(info['version'])) diff --git a/pkgs/applications/virtualization/virtualbox/update.sh b/pkgs/applications/virtualization/virtualbox/update.sh new file mode 100755 index 0000000000000..fcd02ae8a27b6 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/update.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts nix-prefetch-scripts jq + +set -xeuo pipefail + +nixpkgs="$(git rev-parse --show-toplevel)" + +attr=virtualbox +oldVersion="$(nix-instantiate --eval -E "with import $nixpkgs {}; $attr.version or (builtins.parseDrvName $attr.name).version" | tr -d '"')" +latestVersion="$(curl -sS https://download.virtualbox.org/virtualbox/LATEST.TXT)" + +function fileShaSum() { + echo "$1" | grep -w $2 | cut -f1 -d' ' +} +function oldHash() { + nix-instantiate --eval --strict -A "$1.drvAttrs.outputHash" | tr -d '"' +} +function nixFile() { + nix-instantiate --eval --strict -A "${1}.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/' +} + +if [ ! "$oldVersion" = "$latestVersion" ]; then + shaSums=$(curl -sS https://download.virtualbox.org/virtualbox/$latestVersion/SHA256SUMS) + + virtualBoxShaSum=$(fileShaSum "$shaSums" "VirtualBox-$latestVersion.tar.bz2") + extpackShaSum=$(fileShaSum "$shaSums" "Oracle_VM_VirtualBox_Extension_Pack-$latestVersion.vbox-extpack") + guestAdditionsShaSum=$(fileShaSum "$shaSums" "*VBoxGuestAdditions_$latestVersion.iso") + + virtualboxNixFile=$(nixFile ${attr}) + extpackNixFile=$(nixFile ${attr}Extpack) + guestAdditionsNixFile=$(nixFile linuxPackages.${attr}GuestAdditions) + + extpackOldShaSum=$(oldHash ${attr}Extpack) + guestAdditionsOldShaSum=$(oldHash linuxPackages.${attr}GuestAdditions.src) + + update-source-version $attr $latestVersion $virtualBoxShaSum + sed -i -e 's|value = "'$extpackOldShaSum'"|value = "'$extpackShaSum'"|' $extpackNixFile + sed -i -e 's|sha256 = "'$guestAdditionsOldShaSum'"|sha256 = "'$guestAdditionsShaSum'"|' $guestAdditionsNixFile + + git add $virtualboxNixFile $extpackNixFile $guestAdditionsNixFile + git commit -m "$attr: ${oldVersion} -> ${latestVersion}" +else + echo "$attr is already up-to-date" +fi diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index 7ef91e6f60949..cbaa0a579926a 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "6.6.1"; + version = "6.6.2"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "0p1ypgy45ngxxjczd986pkfh4cn5bs45cwzlfv9fm2p58fkx3aar"; + sha256 = "1skdgr2hipd7yx9c7r7nr3914gm9cm1xj6h3qdsa9f92xxm3aml1"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index f15a7ef0f9d41..7e3c73fb11d54 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -27,7 +27,7 @@ let qemuMemfdBuildFix = fetchpatch { name = "xen-4.8-memfd-build-fix.patch"; - url = https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch; + url = "https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch"; sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; }; @@ -49,7 +49,7 @@ callPackage (import ./generic.nix (rec { xenfiles = optionalAttrs withInternalQemu { qemu-xen = { src = fetchgit { - url = https://xenbits.xen.org/git-http/qemu-xen.git; + url = "https://xenbits.xen.org/git-http/qemu-xen.git"; # rev = "refs/tags/qemu-xen-${version}"; # use revision hash - reproducible but must be updated with each new version rev = "qemu-xen-${version}"; @@ -66,7 +66,7 @@ callPackage (import ./generic.nix (rec { } // optionalAttrs withInternalTraditionalQemu { qemu-xen-traditional = { src = fetchgit { - url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; + url = "https://xenbits.xen.org/git-http/qemu-xen-traditional.git"; # rev = "refs/tags/xen-${version}"; # use revision hash - reproducible but must be updated with each new version rev = "c8ea0457495342c417c3dc033bba25148b279f60"; @@ -84,7 +84,7 @@ callPackage (import ./generic.nix (rec { } // optionalAttrs withInternalSeabios { "firmware/seabios-dir-remote" = { src = fetchgit { - url = https://xenbits.xen.org/git-http/seabios.git; + url = "https://xenbits.xen.org/git-http/seabios.git"; rev = "f0cdc36d2f2424f6b40438f7ee7cc502c0eff4df"; sha256 = "1wq5pjkjrfzqnq3wyr15mcn1l4c563m65gdyf8jm97kgb13pwwfm"; }; @@ -94,7 +94,7 @@ callPackage (import ./generic.nix (rec { } // optionalAttrs withInternalOVMF { "firmware/ovmf-dir-remote" = { src = fetchgit { - url = https://xenbits.xen.org/git-http/ovmf.git; + url = "https://xenbits.xen.org/git-http/ovmf.git"; rev = "173bf5c847e3ca8b42c11796ce048d8e2e916ff8"; sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcr"; }; @@ -104,7 +104,7 @@ callPackage (import ./generic.nix (rec { # TODO: patch Xen to make this optional? "firmware/etherboot/ipxe.git" = { src = fetchgit { - url = https://git.ipxe.org/ipxe.git; + url = "https://git.ipxe.org/ipxe.git"; rev = "356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d"; sha256 = "15n400vm3id5r8y3k6lrp9ab2911a9vh9856f5gvphkazfnmns09"; }; @@ -114,7 +114,7 @@ callPackage (import ./generic.nix (rec { xen-libhvm-dir-remote = { src = fetchgit { name = "xen-libhvm"; - url = https://github.com/michalpalka/xen-libhvm; + url = "https://github.com/michalpalka/xen-libhvm"; rev = "83065d36b36d6d527c2a4e0f5aaf0a09ee83122c"; sha256 = "1jzv479wvgjkazprqdzcdjy199azmx2xl3pnxli39kc5mvjz3lzd"; }; diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index 8cc9c23d2bfd3..6fa30462df089 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -39,7 +39,7 @@ let qemuMemfdBuildFix = fetchpatch { name = "xen-4.8-memfd-build-fix.patch"; - url = https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch; + url = "https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch"; sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; }; @@ -66,7 +66,7 @@ callPackage (import ./generic.nix (rec { xenfiles = optionalAttrs withInternalQemu { qemu-xen = { src = fetchgit { - url = https://xenbits.xen.org/git-http/qemu-xen.git; + url = "https://xenbits.xen.org/git-http/qemu-xen.git"; rev = "refs/tags/qemu-xen-${version}"; sha256 = "0lb7zd5nvr6znx47z93nbq4gj8xfb3622s8r2cvmpqmwnmlc3nd4"; }; @@ -80,7 +80,7 @@ callPackage (import ./generic.nix (rec { } // optionalAttrs withInternalTraditionalQemu { qemu-xen-traditional = { src = fetchgit { - url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; + url = "https://xenbits.xen.org/git-http/qemu-xen-traditional.git"; rev = "refs/tags/xen-${version}"; sha256 = "0mryap5y53r09m7qc0b821f717ghwm654r8c3ik1w7adzxr0l5qk"; }; @@ -96,7 +96,7 @@ callPackage (import ./generic.nix (rec { } // optionalAttrs withInternalSeabios { "firmware/seabios-dir-remote" = { src = fetchgit { - url = https://xenbits.xen.org/git-http/seabios.git; + url = "https://xenbits.xen.org/git-http/seabios.git"; rev = "f0cdc36d2f2424f6b40438f7ee7cc502c0eff4df"; sha256 = "1wq5pjkjrfzqnq3wyr15mcn1l4c563m65gdyf8jm97kgb13pwwfm"; }; @@ -106,7 +106,7 @@ callPackage (import ./generic.nix (rec { } // optionalAttrs withInternalOVMF { "firmware/ovmf-dir-remote" = { src = fetchgit { - url = https://xenbits.xen.org/git-http/ovmf.git; + url = "https://xenbits.xen.org/git-http/ovmf.git"; rev = "173bf5c847e3ca8b42c11796ce048d8e2e916ff8"; sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcr"; }; @@ -116,7 +116,7 @@ callPackage (import ./generic.nix (rec { # TODO: patch Xen to make this optional? "firmware/etherboot/ipxe.git" = { src = fetchgit { - url = https://git.ipxe.org/ipxe.git; + url = "https://git.ipxe.org/ipxe.git"; rev = "356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d"; sha256 = "15n400vm3id5r8y3k6lrp9ab2911a9vh9856f5gvphkazfnmns09"; }; @@ -126,7 +126,7 @@ callPackage (import ./generic.nix (rec { xen-libhvm-dir-remote = { src = fetchgit { name = "xen-libhvm"; - url = https://github.com/michalpalka/xen-libhvm; + url = "https://github.com/michalpalka/xen-libhvm"; rev = "83065d36b36d6d527c2a4e0f5aaf0a09ee83122c"; sha256 = "1jzv479wvgjkazprqdzcdjy199azmx2xl3pnxli39kc5mvjz3lzd"; }; diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 5a8814fb9e286..854debc458a36 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -226,7 +226,7 @@ stdenv.mkDerivation (rec { # TODO(@oxij): Stop referencing args here meta = { - homepage = http://www.xen.org/; + homepage = "http://www.xen.org/"; description = "Xen hypervisor and related components" + optionalString (args ? meta && args.meta ? description) " (${args.meta.description})"; diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index e39877df82914..921a54b11a2ef 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight Virtualization on macOS Based on bhyve"; - homepage = https://github.com/mist64/xhyve; + homepage = "https://github.com/mist64/xhyve"; maintainers = [ lib.maintainers.lnl7 ]; platforms = lib.platforms.darwin; }; diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix index cd1a3a4baf7a4..0a2dd63130eb7 100644 --- a/pkgs/applications/window-managers/2bwm/default.nix +++ b/pkgs/applications/window-managers/2bwm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = "make install DESTDIR=$out PREFIX=\"\""; meta = with stdenv.lib; { - homepage = https://github.com/venam/2bwm; + homepage = "https://github.com/venam/2bwm"; description = "A fast floating WM written over the XCB library and derived from mcwm"; license = licenses.mit; maintainers = [ maintainers.sternenseemann ]; diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix index 7e68de8393fd2..001e624e1bed8 100644 --- a/pkgs/applications/window-managers/afterstep/default.nix +++ b/pkgs/applications/window-managers/afterstep/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { for flexibility of desktop configuration, improving aestetics, and efficient use of system resources. ''; - homepage = http://www.afterstep.org/; + homepage = "http://www.afterstep.org/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 54244d4dc8d8a..609723b42d417 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Highly configurable, dynamic window manager for X"; - homepage = https://awesomewm.org/; + homepage = "https://awesomewm.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lovek323 rasendubi ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/berry/default.nix b/pkgs/applications/window-managers/berry/default.nix new file mode 100644 index 0000000000000..2a41a3d3c0735 --- /dev/null +++ b/pkgs/applications/window-managers/berry/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub +, libX11, libXft, libXinerama, fontconfig, freetype }: + +stdenv.mkDerivation rec { + pname = "berry"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "JLErvin"; + repo = "berry"; + rev = version; + sha256 = "1wxbjzpwqb9x7vd7kb095fiqj271rki980dnwcxjxpqlmmrmjzyl"; + }; + + buildInputs = [ libX11 libXft libXinerama fontconfig freetype ]; + + preBuild = '' + makeFlagsArray+=( PREFIX="${placeholder "out"}" + X11INC="${libX11.dev}/include" + X11LIB="${libX11}/lib" + XINERAMALIBS="-lXinerama" + XINERAMAFLAGS="-DXINERAMA" + FREETYPELIBS="-lfontconfig -lXft" + FREETYPEINC="${freetype.dev}/include/freetype2" ) + ''; + + meta = with stdenv.lib; { + description = "A healthy, bite-sized window manager"; + longDescription = '' + berry is a healthy, bite-sized window manager written in C for unix + systems. Its main features include: + + - Controlled via a powerful command-line client, allowing users to control + windows via a hotkey daemon such as sxhkd or expand functionality via + shell scripts. + - Small, hackable source code. + - Extensible themeing options with double borders, title bars, and window + text. + - Intuitively place new windows in unoccupied spaces. + - Virtual desktops. + ''; + homepage = "https://berrywm.org/"; + license = licenses.mit; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index e863a382470f0..52f5228104376 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tiling window manager based on binary space partitioning"; - homepage = https://github.com/baskerville/bspwm; + homepage = "https://github.com/baskerville/bspwm"; maintainers = with maintainers; [ meisternu epitrochoid rvolosatovs ]; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/bspwm/unstable.nix b/pkgs/applications/window-managers/bspwm/unstable.nix index eeadfa248d75c..e52e33ec544ad 100644 --- a/pkgs/applications/window-managers/bspwm/unstable.nix +++ b/pkgs/applications/window-managers/bspwm/unstable.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "A tiling window manager based on binary space partitioning (git version)"; - homepage = https://github.com/baskerville/bspwm; + homepage = "https://github.com/baskerville/bspwm"; maintainers = [ stdenv.lib.maintainers.meisternu stdenv.lib.maintainers.epitrochoid ]; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/window-managers/btops/default.nix b/pkgs/applications/window-managers/btops/default.nix index cf90b1fad63b4..132e2ba6ddd31 100644 --- a/pkgs/applications/window-managers/btops/default.nix +++ b/pkgs/applications/window-managers/btops/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "bspwm desktop management that supports dymanic appending, removing, and renaming"; - homepage = https://github.com/cmschuetz/btops; + homepage = "https://github.com/cmschuetz/btops"; maintainers = with maintainers; [ mnacamura ]; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix index 205569ad550f7..0d9e3335f2c9a 100644 --- a/pkgs/applications/window-managers/cage/default.nix +++ b/pkgs/applications/window-managers/cage/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Wayland kiosk"; - homepage = https://www.hjdskes.nl/projects/cage/; + homepage = "https://www.hjdskes.nl/projects/cage/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/applications/window-managers/clfswm/default.nix b/pkgs/applications/window-managers/clfswm/default.nix index e2c39887a3215..e3864319f7bbc 100644 --- a/pkgs/applications/window-managers/clfswm/default.nix +++ b/pkgs/applications/window-managers/clfswm/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A(nother) Common Lisp FullScreen Window Manager"; - homepage = https://common-lisp.net/project/clfswm/; + homepage = "https://common-lisp.net/project/clfswm/"; license = licenses.gpl3; maintainers = with maintainers; [ robgssp ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index af2c9af900dcf..8f9c28c785113 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildPhase = " make "; meta = { - homepage = https://suckless.org/; + homepage = "https://suckless.org/"; description = "Dynamic window manager for X"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 69337976f88f4..176c2a0ddff9b 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -9,19 +9,19 @@ in rustPlatform.buildRustPackage rec { pname = "dwm-status"; - version = "1.6.3"; + version = "1.7.0"; src = fetchFromGitHub { owner = "Gerschtli"; repo = "dwm-status"; rev = version; - sha256 = "02sprsr7822ynkwpf3xdgmkdrgkw3vgijhlh65bayiv3b5lwb54n"; + sha256 = "1a3dpawxgi8d2a6w5jzvzm5q13rvqd656ris8mz77gj6f8qp7ddl"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "0xybd6110b29ghl66kxfs64704qlhnn9jb5vl7lfk9sv62cs564i"; + cargoSha256 = "12b6fdhj13axhwf854n071dpiycg73g4kvl7igk1qn7l3gqwsfqn"; postInstall = lib.optionalString (bins != []) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}" @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Highly performant and configurable DWM status service"; - homepage = https://github.com/Gerschtli/dwm-status; + homepage = "https://github.com/Gerschtli/dwm-status"; license = with licenses; [ mit ]; maintainers = with maintainers; [ gerschtli ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/dwm/git.nix b/pkgs/applications/window-managers/dwm/git.nix index aaa32dd6b11be..3751a8de69f72 100644 --- a/pkgs/applications/window-managers/dwm/git.nix +++ b/pkgs/applications/window-managers/dwm/git.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { buildPhase = "make"; meta = with stdenv.lib; { - homepage = https://suckless.org/; + homepage = "https://suckless.org/"; description = "Dynamic window manager for X, development version"; license = licenses.mit; maintainers = with maintainers; [xeji]; diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/pkgs/applications/window-managers/dzen2/default.nix index 96dcfb9380041..367c78ec5cac6 100644 --- a/pkgs/applications/window-managers/dzen2/default.nix +++ b/pkgs/applications/window-managers/dzen2/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/robm/dzen; + homepage = "https://github.com/robm/dzen"; license = stdenv.lib.licenses.mit; description = "X notification utility"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/window-managers/evilwm/default.nix b/pkgs/applications/window-managers/evilwm/default.nix index 1907fbb68f985..64dc784e812f9 100644 --- a/pkgs/applications/window-managers/evilwm/default.nix +++ b/pkgs/applications/window-managers/evilwm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { inherit patches; meta = with stdenv.lib; { - homepage = http://www.6809.org.uk/evilwm/; + homepage = "http://www.6809.org.uk/evilwm/"; description = "Minimalist window manager for the X Window System"; license = { shortName = "evilwm"; fullName = "Custom, inherited from aewm and 9wm"; - url = http://www.6809.org.uk/evilwm/; + url = "http://www.6809.org.uk/evilwm/"; free = true; }; # like BSD/MIT, but Share-Alike'y; See README. diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix index 404044fa3fa13..b1a11d7153c23 100644 --- a/pkgs/applications/window-managers/fluxbox/default.nix +++ b/pkgs/applications/window-managers/fluxbox/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { fast, desktop experience. It is written in C++ and licensed under MIT license. ''; - homepage = http://fluxbox.org/; + homepage = "http://fluxbox.org/"; license = licenses.mit; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index cc503b2db4f40..6b3f402975508 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional gestures libstroke; meta = { - homepage = http://fvwm.org; + homepage = "http://fvwm.org"; description = "A multiple large virtual desktop window manager"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index ca64786475f74..7dc715e126cd6 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,29 +1,47 @@ -{ stdenv, fetchurl, pkgconfig, glib, libX11, libXext, libXinerama }: +{ stdenv, fetchurl, cmake, pkgconfig, glib, libX11, libXext, libXinerama, libXrandr +, withDoc ? stdenv.buildPlatform == stdenv.targetPlatform, asciidoc ? null }: + +# Doc generation is disabled by default when cross compiling because asciidoc +# does not cross compile for now + +assert withDoc -> asciidoc != null; stdenv.mkDerivation rec { - name = "herbstluftwm-0.7.2"; + pname = "herbstluftwm"; + version = "0.8.1"; src = fetchurl { - url = "https://herbstluftwm.org/tarballs/${name}.tar.gz"; - sha256 = "1kc18aj9j3nfz6fj4qxg9s3gg4jvn6kzi3ii24hfm0vqdpy17xnz"; + url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"; + sha256 = "0c1lf82z6a56g8asin91cmqhzk3anw0xwc44b31bpjixadmns57y"; }; - patchPhase = '' - substituteInPlace config.mk \ - --replace "/usr/local" "$out" \ - --replace "/etc" "$out/etc" \ - --replace "/zsh/functions/Completion/X" "/zsh/site-functions" \ - --replace "/usr/share" "\$(PREFIX)/share" - ''; + outputs = [ + "out" + ] ++ stdenv.lib.optionals withDoc [ + "doc" + "man" + ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_SYSCONF_PREFIX=${placeholder "out"}/etc" + ] ++ stdenv.lib.optional (!withDoc) "-DWITH_DOCUMENTATION=OFF"; + + nativeBuildInputs = [ + cmake + pkgconfig + ] ++ stdenv.lib.optional withDoc asciidoc; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libX11 libXext libXinerama ]; + buildInputs = [ + libX11 + libXext + libXinerama + libXrandr + ]; meta = { description = "A manual tiling window manager for X"; - homepage = http://herbstluftwm.org/; + homepage = "https://herbstluftwm.org/"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix index acfd06235ac75..4a91865fecac9 100644 --- a/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A flexible scheduler for your i3bar blocks -- this is a fork to use with i3-gaps"; - homepage = https://github.com/Airblader/i3blocks-gaps; + homepage = "https://github.com/Airblader/i3blocks-gaps"; license = licenses.gpl3; maintainers = with maintainers; [ carlsverre ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix index 8c3101f8eb9e9..bfd76b444375b 100644 --- a/pkgs/applications/window-managers/i3/blocks.nix +++ b/pkgs/applications/window-managers/i3/blocks.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { # XDG_CONFIG_DIRS can contain multiple elements separated by colons, which should be searched in order. (fetchpatch { # https://github.com/vivien/i3blocks/pull/405 - url = https://github.com/edef1c/i3blocks/commit/d57b32f9a364aeaf36869efdd54240433c737e57.patch; + url = "https://github.com/edef1c/i3blocks/commit/d57b32f9a364aeaf36869efdd54240433c737e57.patch"; sha256 = "102xb0ax0hmg82dz2gzfag470dkckzf2yizai0izacvrz0d3ngj1"; }) ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "A flexible scheduler for your i3bar blocks"; - homepage = https://github.com/vivien/i3blocks; + homepage = "https://github.com/vivien/i3blocks"; license = licenses.gpl3; platforms = with platforms; freebsd ++ linux; }; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index fd964215d4559..3888e10f25856 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,18 +1,18 @@ -{ fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms +{ fetchurl, stdenv, which, pkgconfig, makeWrapper, installShellFiles, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev , yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon , xorgserver, xvfb_run }: stdenv.mkDerivation rec { pname = "i3"; - version = "4.18"; + version = "4.18.1"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2"; - sha256 = "0dv5g8ycfmijxfjyw8hzsxaf80v09lb73zh7x2vszy78h3amifqz"; + sha256 = "0z709cianlzw0x0qwq4361347354xd9ckj1v7vjvhb1zh3x91gws"; }; - nativeBuildInputs = [ which pkgconfig makeWrapper ]; + nativeBuildInputs = [ which pkgconfig makeWrapper installShellFiles ]; buildInputs = [ libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { sed -i 's/which/command -v/' $program done - install -vD -t $out/share/man/man1 man/*.{1,man} + installManPage man/*.1 ''; separateDebugInfo = true; diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/applications/window-managers/i3/easyfocus.nix index 9ce5486557a58..5c7a22eb76949 100644 --- a/pkgs/applications/window-managers/i3/easyfocus.nix +++ b/pkgs/applications/window-managers/i3/easyfocus.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Focus and select windows in i3"; - homepage = https://github.com/cornerman/i3-easyfocus; + homepage = "https://github.com/cornerman/i3-easyfocus"; maintainers = with maintainers; [teto]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 731555ce9f8c5..7be037ca8333f 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -3,20 +3,15 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.18"; - releaseDate = "2019-01-27"; + version = "4.18.1"; src = fetchurl { - url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "04sq2sik7j09kgnn1k87yg3vzy56pk4688bmxh49l6drl0wr1m2v"; + url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.bz2"; + sha256 = "1cxwsrdzp18r5hj0ymg9fbzp1mhkj4m9h6i0b9cdg79cjbacba9k"; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; - postUnpack = '' - echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION - ''; - # fatal error: GENERATED_config_enums.h: No such file or directory enableParallelBuilding = false; diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix index 33aac1cf4b659..7e6a18c93c56e 100644 --- a/pkgs/applications/window-managers/i3/i3ipc-glib.nix +++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C interface library to i3wm"; - homepage = https://github.com/acrisci/i3ipc-glib; + homepage = "https://github.com/acrisci/i3ipc-glib"; maintainers = with maintainers; [teto]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/applications/window-managers/i3/layout-manager.nix index c7454981400d6..f4c2a53b7a29d 100644 --- a/pkgs/applications/window-managers/i3/layout-manager.nix +++ b/pkgs/applications/window-managers/i3/layout-manager.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/klaxalk/i3-layout-manager; + homepage = "https://github.com/klaxalk/i3-layout-manager"; description = "Saving, loading and managing layouts for i3wm."; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index b6b354021d969..9b9b2dea13283 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text."; - homepage = https://github.com/meskarune/i3lock-fancy; + homepage = "https://github.com/meskarune/i3lock-fancy"; maintainers = with maintainers; [ ]; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 619345d1b96da..2bca01eeefa7d 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { a configurable image is shown, and a ring-shaped unlock-indicator gives feedback for every keystroke. After entering your password, the screen is unlocked again. ''; - homepage = https://i3wm.org/i3lock/; + homepage = "https://i3wm.org/i3lock/"; maintainers = with maintainers; [ malyn domenkozar ]; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 20ea0dd03cc34..29bda8e4e2b09 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/enkore/i3pystatus; + homepage = "https://github.com/enkore/i3pystatus"; description = "A complete replacement for i3status"; longDescription = '' i3pystatus is a growing collection of python scripts for status output compatible diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index b28c95e6bfb13..62389e1230ad5 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Very resource-friendly and feature-rich replacement for i3status"; - homepage = https://github.com/greshake/i3status-rust; + homepage = "https://github.com/greshake/i3status-rust"; license = licenses.gpl3; maintainers = with maintainers; [ backuitist globin ma27 ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index e963259b62474..6005ca3ab3a6c 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Generates a status line for i3bar, dzen2, xmobar or lemonbar"; - homepage = https://i3wm.org; + homepage = "https://i3wm.org"; maintainers = [ ]; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix index 98855517303e1..51881975266d0 100644 --- a/pkgs/applications/window-managers/i3/wk-switch.nix +++ b/pkgs/applications/window-managers/i3/wk-switch.nix @@ -26,6 +26,6 @@ python3Packages.buildPythonApplication rec { maintainers = with maintainers; [ synthetica ]; platforms = platforms.linux; license = licenses.mit; - homepage = https://travisf.net/i3-wk-switcher; + homepage = "https://travisf.net/i3-wk-switcher"; }; } diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 651669bebe525..b6b07d8d72786 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -6,6 +6,7 @@ , libpthreadstubs, pcre, libXdamage, libXcomposite, libXfixes , libsndfile, fribidi }: +with stdenv.lib; stdenv.mkDerivation rec { pname = "icewm"; version = "1.6.5"; @@ -34,13 +35,13 @@ stdenv.mkDerivation rec { cp -r ../lib/themes/{gtk2,Natural,nice,nice2,warp3,warp4,yellowmotif} $out/share/icewm/themes/ ''; - meta = with stdenv.lib; { + meta = { description = "A simple, lightweight X window manager"; longDescription = '' IceWM is a window manager for the X Window System. The goal of IceWM is speed, simplicity, and not getting in the user's way. ''; - homepage = "http://www.icewm.org/"; + homepage = "https://www.ice-wm.org/"; license = licenses.lgpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index 073af3bfd053b..57c91c2cfb724 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation { name = "ion-3-20090110"; meta = { description = "Tiling tabbed window manager designed with keyboard users in mind"; - homepage = http://modeemi.fi/~tuomov/ion; + homepage = "http://modeemi.fi/~tuomov/ion"; platforms = with stdenv.lib.platforms; linux; license = stdenv.lib.licenses.lgpl21; }; src = fetchurl { - url = http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz; + url = "http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz"; sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns"; }; buildInputs = [ xlibsWrapper lua gettext groff ]; diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 3668b344be508..601cf3cded6c2 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = { - homepage = http://joewing.net/projects/jwm/; + homepage = "http://joewing.net/projects/jwm/"; description = "Joe's Window Manager is a light-weight X11 window manager"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix index db33b27ddd81f..d6fe5b4200c4d 100644 --- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix +++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A full configuration manager for JWM"; - homepage = https://joewing.net/projects/jwm; + homepage = "https://joewing.net/projects/jwm"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix index bcfcbe3c5f525..de1a68a56bfb3 100644 --- a/pkgs/applications/window-managers/kbdd/default.nix +++ b/pkgs/applications/window-managers/kbdd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Simple daemon and library to make per window layout using XKB"; - homepage = https://github.com/qnikst/kbdd; + homepage = "https://github.com/qnikst/kbdd"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.wedens ]; diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/applications/window-managers/larswm/default.nix index f6f3132178c5c..b918c28938c1d 100644 --- a/pkgs/applications/window-managers/larswm/default.nix +++ b/pkgs/applications/window-managers/larswm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "larswm-7.5.3"; src = fetchurl { - url = mirror://sourceforge/larswm/larswm-7.5.3.tar.gz; + url = "mirror://sourceforge/larswm/larswm-7.5.3.tar.gz"; sha256 = "1xmlx9g1nhklxjrg0wvsya01s4k5b9fphnpl9zdwp29mm484ni3v"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { installTargets = [ "install" "install.man" ]; meta = { - homepage = http://www.fnurt.net/larswm; + homepage = "http://www.fnurt.net/larswm"; description = "9wm-like tiling window manager"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index 9d6e0f27f9342..89b4fecc20670 100644 --- a/pkgs/applications/window-managers/lemonbar/default.nix +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A lightweight xcb based bar"; - homepage = https://github.com/LemonBoy/bar; + homepage = "https://github.com/LemonBoy/bar"; maintainers = [ maintainers.meisternu ]; license = "Custom"; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix index ff34f1dfee78c..a70e5a4dc5c08 100644 --- a/pkgs/applications/window-managers/lemonbar/xft.nix +++ b/pkgs/applications/window-managers/lemonbar/xft.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "A lightweight xcb based bar with XFT-support"; - homepage = https://github.com/krypt-n/bar; + homepage = "https://github.com/krypt-n/bar"; license = "Custom"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/window-managers/lwm/default.nix b/pkgs/applications/window-managers/lwm/default.nix new file mode 100644 index 0000000000000..49cdc81b9ce0a --- /dev/null +++ b/pkgs/applications/window-managers/lwm/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl +, imake, libX11, libSM, libXext, libICE }: + +stdenv.mkDerivation rec { + pname = "lwm"; + version = "1.2.4"; + + src = fetchurl { + url = "http://www.jfc.org.uk/files/lwm/${pname}-${version}.tar.gz"; + sha256 = "1bcdr173f0gl61fyl43p3gr145angci7lvjqb8rl00y9f9amvh3y"; + }; + + nativeBuildInputs = [ imake ]; + + buildInputs = [ libX11 libSM libXext libICE ]; + + dontConfigure = true; + + preBuild = '' + sed -i 's|^LOCAL_LIBRARIES.*|& $(ICELIB)|' Imakefile + xmkmf + ''; + + installPhase = '' + install -dm755 $out/bin $out/share/man/man1 + install -m755 lwm $out/bin/lwm + install -m644 lwm.man $out/share/man/man1/lwm.1 + ''; + + meta = with stdenv.lib; { + description = "Lightweight Window Manager"; + longDescription = '' + lwm is a window manager for X that tries to keep out of your face. There + are no icons, no button bars, no icon docks, no root menus, no nothing: if + you want all that, then other programs can provide it. There's no + configurability either: if you want that, you want a different window + manager; one that helps your operating system in its evil conquest of your + disc space and its annexation of your physical memory. + ''; + homepage = "http://www.jfc.org.uk/software/lwm.html"; + license = licenses.gpl2; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/applications/window-managers/neocomp/default.nix index 026ee2e1287e6..57968922c390d 100644 --- a/pkgs/applications/window-managers/neocomp/default.nix +++ b/pkgs/applications/window-managers/neocomp/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/DelusionalLogic/NeoComp; + homepage = "https://github.com/DelusionalLogic/NeoComp"; license = licenses.gpl3; maintainers = with maintainers; [ twey ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index c8d526b6d2882..39329e8004c5b 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python2 +{ stdenv, fetchurl, autoreconfHook, pkgconfig, python3 , libxml2, libXinerama, libXcursor, libXau, libXrandr, libICE, libSM , imlib2, pango, libstartup_notification, makeWrapper }: @@ -7,22 +7,24 @@ stdenv.mkDerivation rec { version = "3.6.1"; nativeBuildInputs = [ + autoreconfHook pkgconfig makeWrapper - python2.pkgs.wrapPython + python3.pkgs.wrapPython ]; buildInputs = [ libxml2 libXinerama libXcursor libXau libXrandr libICE libSM libstartup_notification + python3 ]; propagatedBuildInputs = [ pango imlib2 ]; - pythonPath = with python2.pkgs; [ + pythonPath = with python3.pkgs; [ pyxdg ]; @@ -36,6 +38,15 @@ stdenv.mkDerivation rec { sha256 = "1ci9lq4qqhl31yz1jwwjiawah0f7x0vx44ap8baw7r6rdi00pyiv"; }; + patches = [ + # Use fetchurl to avoid "fetchpatch: ignores file renames" #32084 + # This patch adds python3 support + (fetchurl { + url = "https://git.archlinux.org/svntogit/community.git/plain/openbox/trunk/py3.patch?id=90cb57ef53d952bb6ab4c33a184f815bbe1791c0"; + sha256 = "1ks99awlkhd5ph9kz94s1r6m1bfvh42g4rmxd14dyg5b421p1ljc"; + }) + ]; + postBuild = "gcc -O2 -o setlayout $(pkg-config --cflags --libs x11) $setlayoutSrc"; # Openbox needs XDG_DATA_DIRS set or it can't find its default theme @@ -50,7 +61,7 @@ stdenv.mkDerivation rec { meta = { description = "X window manager for non-desktop embedded systems"; - homepage = http://openbox.org/; + homepage = "http://openbox.org/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index d449fc91c0d38..21b18a4917bd6 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A really minimalistic X window manager"; - homepage = https://www.oroborus.org/; + homepage = "https://www.oroborus.org/"; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix index 38255dce72246..da2c11c873b1b 100644 --- a/pkgs/applications/window-managers/pekwm/default.nix +++ b/pkgs/applications/window-managers/pekwm/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { appear as they should when starting applications. - Chainable Keygrabber, usability for everyone. ''; - homepage = http://www.pekwm.org; + homepage = "http://www.pekwm.org"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix index ad5f73ab17394..8ea724aa694a9 100644 --- a/pkgs/applications/window-managers/picom/default.nix +++ b/pkgs/applications/window-managers/picom/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "picom"; - version = "7.5"; + version = "8"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${version}"; - sha256 = "1l48fxl04vkzr4r94sl37nbbw7a621rn8sxmkbdv4252i1gjxd4z"; + sha256 = "04svbv7v73q8yn9la69451rda6l2pgxcphv2zlkdqaxxdbp69195"; fetchSubmodules = true; }; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 6d0e6bdac45e0..eb56e9c163905 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -44,7 +44,7 @@ python37Packages.buildPythonApplication rec { doCheck = false; # Requires X server. meta = with stdenv.lib; { - homepage = http://www.qtile.org/; + homepage = "http://www.qtile.org/"; license = licenses.mit; description = "A small, flexible, scriptable tiling window manager written in Python"; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index 11a69020ee623..4c7cdf1069f91 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.nongnu.org/ratpoison/; + homepage = "https://www.nongnu.org/ratpoison/"; description = "Simple mouse-free tiling window manager"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index f9bcb28e45579..18c3d22f944e0 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { All high-level WM functions are implemented in Lisp for future extensibility or redefinition. ''; - homepage = http://sawfish.wikia.com; + homepage = "http://sawfish.wikia.com"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/applications/window-managers/smallwm/default.nix b/pkgs/applications/window-managers/smallwm/default.nix new file mode 100644 index 0000000000000..b6d3821e8d063 --- /dev/null +++ b/pkgs/applications/window-managers/smallwm/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub +, doxygen, graphviz, libX11, libXrandr }: + +stdenv.mkDerivation rec { + + pname = "smallwm"; + version = "2020-02-28"; + + src = fetchFromGitHub { + owner = "adamnew123456"; + repo = "SmallWM"; + rev = "c2dc72afa87241bcf7e646630f4aae216ce78613"; + sha256 = "0cqhy81ymdcdyvgi55a401rr96h2akskcxi9ddzjbln4a71yjlz8"; + }; + + nativeBuildInputs = [ doxygen graphviz ]; + buildInputs = [ libX11 libXrandr ]; + + dontConfigure = true; + + makeFlags = [ "CC=${stdenv.cc}/bin/cc" "CXX=${stdenv.cc}/bin/c++" ]; + + buildFlags = [ "all" "doc" ]; + + installPhase = '' + install -dm755 $out/bin $out/share/doc/${pname}-${version} + install -m755 bin/smallwm -t $out/bin + cp -r README.markdown doc/html doc/latex $out/share/doc/${pname}-${version} + ''; + + meta = with stdenv.lib;{ + description = "A small X window manager, extended from tinywm"; + homepage = "https://github.com/adamnew123456/SmallWM"; + license = licenses.bsd2; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index 1eb19e2de6f9a..b38cb9906178a 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -1,51 +1,37 @@ -{ fetchurl -, libX11 -, libXrandr -, libXcursor -, libXft -, libXt -, libxcb -, xcbutil -, xcb-util-cursor -, xcbutilkeysyms -, xcbutilwm -, stdenv -}: +{ stdenv, fetchFromGitHub, pkgconfig, xorg }: stdenv.mkDerivation { pname = "spectrwm"; - version = "2.7.2"; + version = "3.3.0"; - src = fetchurl { - url = "https://github.com/conformal/spectrwm/archive/SPECTRWM_2_7_2.tar.gz"; - sha256 = "1yssqnhxlfl1b60gziqp8c5pzs1lr8p6anrnp9ga1zfdql3b7993"; + src = fetchFromGitHub { + owner = "conformal"; + repo = "spectrwm"; + rev = "SPECTRWM_3_3_0"; + sha256 = "139mswlr0z5dbp5migm98qqg84syq0py1qladp3226xy6q3bnn08"; }; - - buildInputs = [ - libX11 - libxcb + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with xorg; [ libXrandr libXcursor libXft libXt xcbutil - xcb-util-cursor xcbutilkeysyms xcbutilwm ]; sourceRoot = let subdir = if stdenv.isDarwin then "osx" else "linux"; - in "spectrwm-SPECTRWM_2_7_2/${subdir}"; + in "source/${subdir}"; - makeFlags = [ "PREFIX=$(out)" ]; - installPhase = "PREFIX=$out make install"; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { description = "A tiling window manager"; homepage = "https://github.com/conformal/spectrwm"; - maintainers = with maintainers; [ jb55 ]; + maintainers = with maintainers; [ christianharke ]; license = licenses.isc; platforms = platforms.all; diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix index f0f724d6cf0e4..ad0baeb97dd25 100644 --- a/pkgs/applications/window-managers/stalonetray/default.nix +++ b/pkgs/applications/window-managers/stalonetray/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stand alone tray"; - homepage = http://stalonetray.sourceforge.net; + homepage = "http://stalonetray.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/applications/window-managers/stumpish/default.nix b/pkgs/applications/window-managers/stumpish/default.nix index 00f4b95b3f273..c76a9ba762efe 100644 --- a/pkgs/applications/window-managers/stumpish/default.nix +++ b/pkgs/applications/window-managers/stumpish/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/stumpwm/stumpwm-contrib; + homepage = "https://github.com/stumpwm/stumpwm-contrib"; description = "STUMPwm Interactive SHell"; license = licenses.gpl2; maintainers = [ maintainers.ebzzry ]; diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 69b2e6ceb50f8..b059423c23c47 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -95,9 +95,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A tiling window manager for X11"; - homepage = https://github.com/stumpwm/; + homepage = "https://github.com/stumpwm/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ the-kenny ]; platforms = platforms.linux; broken = true; # 2018-04-11 }; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index a020c10a34851..66681ef0850b5 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -2,7 +2,7 @@ , meson, ninja , pkgconfig, scdoc , wayland, libxkbcommon, pcre, json_c, dbus, libevdev -, pango, cairo, libinput, libcap, pam, gdk-pixbuf +, pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg , wlroots, wayland-protocols }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland libxkbcommon pcre json_c dbus libevdev - pango cairo libinput libcap pam gdk-pixbuf + pango cairo libinput libcap pam gdk-pixbuf librsvg wlroots wayland-protocols ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "i3-compatible tiling Wayland compositor"; - homepage = https://swaywm.org; + homepage = "https://swaywm.org"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos synthetica ma27 ]; diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index 7c59b8b7cde4d..fe78e1a9ff961 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -2,7 +2,7 @@ , sway-unwrapped, swaybg , makeWrapper, symlinkJoin, writeShellScriptBin , withBaseWrapper ? true, extraSessionCommands ? "", dbus -, withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf +, withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf, glib, gtk3 , extraOptions ? [] # E.g.: [ "--verbose" ] }: @@ -14,8 +14,8 @@ let baseWrapper = writeShellScriptBin "sway" '' set -o errexit if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then - export _SWAY_WRAPPER_ALREADY_EXECUTED=1 ${extraSessionCommands} + export _SWAY_WRAPPER_ALREADY_EXECUTED=1 fi if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then export DBUS_SESSION_BUS_ADDRESS @@ -33,12 +33,14 @@ in symlinkJoin { nativeBuildInputs = [ makeWrapper ] ++ (optional withGtkWrapper wrapGAppsHook); - buildInputs = optional withGtkWrapper gdk-pixbuf; + buildInputs = optionals withGtkWrapper [ gdk-pixbuf glib gtk3 ]; + + # We want to run wrapProgram manually + dontWrapGApps = true; postBuild = '' - # We want to run wrapProgram manually to only wrap sway and add swaybg: - export dontWrapGApps=true - ${optionalString withGtkWrapper "wrapGAppsHook"} + ${optionalString withGtkWrapper "gappsWrapperArgsHook"} + wrapProgram $out/bin/sway \ --prefix PATH : "${swaybg}/bin" \ ${optionalString withGtkWrapper ''"''${gappsWrapperArgs[@]}"''} \ diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index c391532376e31..f0a427e683952 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "tabbed-20180310"; src = fetchgit { - url = https://git.suckless.org/tabbed; + url = "https://git.suckless.org/tabbed"; rev = "b5f9ec647aae2d9a1d3bd586eb7523a4e0a329a3"; sha256 = "0frj2yjaf0mfjwgyfappksfir52mx2xxd3cdg5533m5d88vbmxss"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = https://tools.suckless.org/tabbed; + homepage = "https://tools.suckless.org/tabbed"; description = "Simple generic tabbed fronted to xembed aware applications"; license = licenses.mit; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/applications/window-managers/tinywm/default.nix b/pkgs/applications/window-managers/tinywm/default.nix new file mode 100644 index 0000000000000..0e30857267bd6 --- /dev/null +++ b/pkgs/applications/window-managers/tinywm/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchFromGitHub +, libX11 }: + +stdenv.mkDerivation rec { + pname = "tinywm"; + version = "2014-04-22"; + + src = fetchFromGitHub { + owner = "mackstann"; + repo = pname; + rev = "9d05612f41fdb8bc359f1fd9cc930bf16315abb1"; + sha256 = "1s7r4f2d3lk1i8h089v2vyrr02hh0y9i3ihl9kqgk9s87hqw8q5b"; + }; + + buildInputs = [ libX11 ]; + + dontConfigure = true; + + buildPhase = '' + ${stdenv.cc}/bin/cc -Wall -pedantic -I${libX11}/include tinywm.c -L${libX11}/lib -lX11 -o tinywm + ''; + + installPhase = '' + install -dm755 $out/bin $out/share/doc/${pname}-${version} + install -m755 tinywm -t $out/bin/ + # The annotated source code is a piece of documentation + install -m644 annotated.c README -t $out/share/doc/${pname}-${version} + ''; + + meta = with stdenv.lib;{ + description = "A tiny window manger for X11"; + longDescription = '' + + TinyWM is a tiny window manager that I created as an exercise in + minimalism. It is also maybe helpful in learning some of the very basics + of creating a window manager. It is only around 50 lines of C. There is + also a Python version using python-xlib. + + It lets you do four basic things: + + - Move windows interactively with Alt+Button1 drag (left mouse button) + - Resize windows interactively with Alt+Button3 drag (right mouse button) + - Raise windows with Alt+F1 (not high on usability I know, but I needed a + keybinding in there somewhere) + - Focus windows with the mouse pointer (X does this on its own) + ''; + homepage = "http://incise.org/tinywm.html"; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = libX11.meta.platforms; + }; +} diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index 5705ae8256c87..5c3d8710e35dc 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/sargon/trayer-srg; + homepage = "https://github.com/sargon/trayer-srg"; license = licenses.mit; description = "A lightweight GTK2-based systray for UNIX desktop"; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index 3423b0e181d51..8eb42bb9a97dc 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses glib libviper libpseudo gpm libvterm ]; meta = with stdenv.lib; { - homepage = http://vwm.sourceforge.net/; + homepage = "http://vwm.sourceforge.net/"; description = "Dynamic window manager for the console"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 51da999aff0c8..4a09cac9344ac 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = { description = "Reference implementation of a Wayland compositor"; - homepage = https://wayland.freedesktop.org/; + homepage = "https://wayland.freedesktop.org/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix index 8ad63999289e6..64783ac5fbe88 100644 --- a/pkgs/applications/window-managers/windowmaker/default.nix +++ b/pkgs/applications/window-managers/windowmaker/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://windowmaker.org/; + homepage = "http://windowmaker.org/"; description = "NeXTSTEP-like window manager"; longDescription = '' Window Maker is an X11 window manager originally designed to diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix index e708682e3036f..4e1256399e768 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "alsamixer.app-0.2.1"; src = fetchgit { - url = git://repo.or.cz/dockapps.git; + url = "git://repo.or.cz/dockapps.git"; rev = "38c74350b02f35824554ce0c4f0f251d71762040"; sha256 = "0g9cwhlqg065fbhav4g4n16a4cqkk9jykl3y0zwbn5whhacfqyhl"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Alsa mixer application for Windowmaker"; - homepage = http://windowmaker.org/dockapps/?name=AlsaMixer.app; + homepage = "http://windowmaker.org/dockapps/?name=AlsaMixer.app"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bstrik ]; }; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix index e2f17d11f64dd..48f4753d674b4 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "wmCalClock-1.25"; src = fetchurl { - url = http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmCalClock-1.25.tar.gz; + url = "http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmCalClock-1.25.tar.gz"; sha256 = "4b42b55bb7c1d7c58b5ee1f0058c683d3e4f3e3380d3a69c54a50b983c7c1b3f"; }; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix index 3e8b3f7f1584d..ad255414a6923 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "wmsm.app-0.2.1"; src = fetchurl { - url = http://linux-bsd-unix.strefa.pl/wmsm.app-0.2.1.tar.bz2; + url = "http://linux-bsd-unix.strefa.pl/wmsm.app-0.2.1.tar.bz2"; sha256 = "369a8f2e5673c6b7ab0cf85166f38fbf553dd966c3c1cfeec0e32837defd32c7"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "System monitor for Windowmaker"; - homepage = http://linux-bsd-unix.strefa.pl; + homepage = "http://linux-bsd-unix.strefa.pl"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bstrik ]; }; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix index e5eb2fc559da5..3e073cd8e91b2 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "wmsystemtray-1.4"; src = fetchurl { - url = mirror://sourceforge/project/wmsystemtray/wmsystemtray/wmsystemtray-1.4.tar.gz; + url = "mirror://sourceforge/project/wmsystemtray/wmsystemtray/wmsystemtray-1.4.tar.gz"; sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { description = "Systemtray for Windowmaker"; - homepage = http://wmsystemtray.sourceforge.net; + homepage = "http://wmsystemtray.sourceforge.net"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bstrik ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix index 426fcfe8efcee..721e618b1d435 100644 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "wmii"; src = fetchurl { - url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/wmii/source-archive.zip; + url = "https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/wmii/source-archive.zip"; sha256 = "1wmkq14zvmfrmydl8752xz852cy7agrx3qp4fy2cc5asb2r9abaz"; }; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { makeFlags = [ "WMII_HGVERSION=hg${rev}" ]; meta = { - homepage = https://suckless.org/; # https://wmii.suckless.org/ does not exist anymore + homepage = "https://suckless.org/"; # https://wmii.suckless.org/ does not exist anymore description = "A small window manager controlled by a 9P filesystem"; maintainers = with stdenv.lib.maintainers; [ kovirobi ]; license = stdenv.lib.licenses.mit; diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index f7ccda273890b..7c6041b576e3a 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_LIBXFCE4PANEL_1_0_LIBDIR = "$(out)/lib"; meta = with stdenv.lib; { - homepage = https://github.com/kalj/xmonad-log-applet; + homepage = "https://github.com/kalj/xmonad-log-applet"; license = licenses.bsd3; description = "An applet that will display XMonad log information (${desktopSupport} version)"; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index f7867882d2229..10806ba78cfe6 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A modern and lightweight status bar for X window managers"; - homepage = https://github.com/geommer/yabar; + homepage = "https://github.com/geommer/yabar"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/applications/window-managers/yeahwm/default.nix b/pkgs/applications/window-managers/yeahwm/default.nix new file mode 100644 index 0000000000000..a8323ff1d386f --- /dev/null +++ b/pkgs/applications/window-managers/yeahwm/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl +, lesstif +, libX11, libXext, libXmu, libXinerama }: + +stdenv.mkDerivation rec { + + pname = "yeahwm"; + version = "0.3.5"; + + src = fetchurl { + url = "http://phrat.de/${pname}_${version}.tar.gz"; + sha256 = "01gfzjvb40n16m2ja4238nk08k4l203y6a61cydqvf68924fjb69"; + }; + + buildInputs = [ lesstif libX11 libXext libXinerama libXmu ]; + + dontConfigure = true; + + preBuild = '' + makeFlagsArray+=( CC="${stdenv.cc}/bin/cc" \ + XROOT="${libX11}" \ + INCLUDES="-I${libX11.dev}/include -I${libXext.dev}/include -I${libXinerama.dev}/include -I${libXmu.dev}/include" \ + LDPATH="-L${libX11}/lib -L${libXext}/lib -L${libXinerama}/lib -L${libXmu}/lib" \ + prefix="${placeholder "out"}" ) + ''; + + postInstall = '' + gzip -9 --stdout yeahwm.1 > yeahwm.1.gz + install -m644 yeahwm.1.gz ${placeholder "out"}/share/man/man1/ + ''; + + meta = with stdenv.lib;{ + description = "An X window manager based on evilwm and aewm"; + longDescription = '' + YeahWM is a h* window manager for X based on evilwm and aewm. + + Features + - Sloppy Focus. + - BeOS-like tabbed titles, which can be repositioned. + - Support for Xinerama. + - Simple Appearance. + - Good keyboard control. + - Creative usage of the mouse. + - Respects aspect size hints. + - Solid resize and move operations. + - Virtual Desktops. + - "Magic" Screen edges for desktop switching. + - Snapping to other windows and screen borders when moving windows. + - Small binary size(ca. 23kb). + - Little resource usage. + - It's slick. + ''; + homepage = "http://phrat.de/index.html"; + license = licenses.isc; + maintainers = [ maintainers.AndersonTorres ]; + platforms = libX11.meta.platforms; + }; +} diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 0d054eaa54690..205aff5557307 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -1,90 +1,71 @@ -# Builder for Agda packages. Mostly inspired by the cabal builder. +# Builder for Agda packages. -{ stdenv, Agda, glibcLocales -, writeShellScriptBin -, extension ? (self: super: {}) -}: +{ stdenv, lib, self, Agda, runCommandNoCC, makeWrapper, writeText, mkShell, ghcWithPackages }: -with stdenv.lib.strings; +with lib.strings; let - defaults = self : { - # There is no Hackage for Agda so we require src. - inherit (self) src name; - - isAgdaPackage = true; - - buildInputs = [ Agda ] ++ self.buildDepends; - buildDepends = []; - - buildDependsAgda = stdenv.lib.filter - (dep: dep ? isAgdaPackage && dep.isAgdaPackage) - self.buildDepends; - buildDependsAgdaShareAgda = map (x: x + "/share/agda") self.buildDependsAgda; - - # Not much choice here ;) - LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = stdenv.lib.optionalString - stdenv.isLinux - "${glibcLocales}/lib/locale/locale-archive"; - - everythingFile = "Everything.agda"; - - propagatedBuildInputs = self.buildDependsAgda; - propagatedUserEnvPkgs = self.buildDependsAgda; - - # Immediate source directories under which modules can be found. - sourceDirectories = [ ]; - - # This is used if we have a top-level element that only serves - # as the container for the source and we only care about its - # contents. The directories put here will have their - # *contents* copied over as opposed to sourceDirectories which - # would make a direct copy of the whole thing. - topSourceDirectories = [ "src" ]; - - # FIXME: `dirOf self.everythingFile` is what we really want, not hardcoded "./" - includeDirs = self.buildDependsAgdaShareAgda - ++ self.sourceDirectories ++ self.topSourceDirectories - ++ [ "." ]; - buildFlags = stdenv.lib.concatMap (x: ["-i" x]) self.includeDirs; - - agdaWithArgs = "${Agda}/bin/agda ${toString self.buildFlags}"; - - buildPhase = '' - runHook preBuild - ${self.agdaWithArgs} ${self.everythingFile} - runHook postBuild + withPackages' = { + pkgs, + ghc ? ghcWithPackages (p: with p; [ ieee ]) + }: let + pkgs' = if builtins.isList pkgs then pkgs else pkgs self; + library-file = writeText "libraries" '' + ${(concatMapStringsSep "\n" (p: "${p}/${p.libraryFile}") pkgs')} ''; - - installPhase = let - srcFiles = self.sourceDirectories - ++ map (x: x + "/*") self.topSourceDirectories; - in '' - runHook preInstall - mkdir -p $out/share/agda - cp -pR ${concatStringsSep " " srcFiles} $out/share/agda - runHook postInstall - ''; - - passthru = { - env = stdenv.mkDerivation { - name = "interactive-${self.name}"; - inherit (self) LANG LOCALE_ARCHIVE; - AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDependsAgdaShareAgda; - buildInputs = let - # Makes a wrapper available to the user. Very useful in - # nix-shell where all dependencies are -i'd. - agdaWrapper = writeShellScriptBin "agda" '' - exec ${self.agdaWithArgs} "$@" - ''; - in [agdaWrapper] ++ self.buildDepends; + pname = "agdaWithPackages"; + version = Agda.version; + in runCommandNoCC "${pname}-${version}" { + inherit pname version; + nativeBuildInputs = [ makeWrapper ]; + passthru.unwrapped = Agda; + } '' + mkdir -p $out/bin + makeWrapper ${Agda}/bin/agda $out/bin/agda \ + --add-flags "--with-compiler=${ghc}/bin/ghc" \ + --add-flags "--library-file=${library-file}" \ + --add-flags "--local-interfaces" + makeWrapper ${Agda}/bin/agda-mode $out/bin/agda-mode + ''; # Local interfaces has been added for now: See https://github.com/agda/agda/issues/4526 + + withPackages = arg: if builtins.isAttrs arg then withPackages' arg else withPackages' { pkgs = arg; }; + + + defaults = + { pname + , buildInputs ? [] + , everythingFile ? "./Everything.agda" + , libraryName ? pname + , libraryFile ? "${libraryName}.agda-lib" + , buildPhase ? null + , installPhase ? null + , ... + }: let + agdaWithArgs = withPackages (builtins.filter (p: p ? isAgdaDerivation) buildInputs); + in + { + inherit libraryName libraryFile; + + isAgdaDerivation = true; + + buildInputs = buildInputs ++ [ agdaWithArgs ]; + + buildPhase = if buildPhase != null then buildPhase else '' + runHook preBuild + agda -i ${dirOf everythingFile} ${everythingFile} + runHook postBuild + ''; + + installPhase = if installPhase != null then installPhase else '' + runHook preInstall + mkdir -p $out + find \( -name '*.agda' -or -name '*.agdai' -or -name '*.agda-lib' \) -exec cp -p --parents -t "$out" {} + + runHook postInstall + ''; }; - }; - }; in -{ mkDerivation = args: let - super = defaults self // args self; - self = super // extension self super; - in stdenv.mkDerivation self; +{ + mkDerivation = args: stdenv.mkDerivation (args // defaults args); + + inherit withPackages withPackages'; } diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix new file mode 100644 index 0000000000000..bdee6688a7407 --- /dev/null +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -0,0 +1,141 @@ +{ lib, stdenv +, lapack-reference, openblasCompat, openblas +, isILP64 ? false +, blasProvider ? if isILP64 then openblas else openblasCompat }: + +let + blasFortranSymbols = [ + "caxpy" "ccopy" "cdotc" "cdotu" "cgbmv" "cgemm" "cgemv" "cgerc" "cgeru" + "chbmv" "chemm" "chemv" "cher" "cher2" "cher2k" "cherk" "chpmv" "chpr" + "chpr2" "crotg" "cscal" "csrot" "csscal" "cswap" "csymm" "csyr2k" "csyrk" + "ctbmv" "ctbsv" "ctpmv" "ctpsv" "ctrmm" "ctrmv" "ctrsm" "ctrsv" "dasum" + "daxpy" "dcabs1" "dcopy" "ddot" "dgbmv" "dgemm" "dgemv" "dger" "dnrm2" + "drot" "drotg" "drotm" "drotmg" "dsbmv" "dscal" "dsdot" "dspmv" "dspr" + "dspr2" "dswap" "dsymm" "dsymv" "dsyr" "dsyr2" "dsyr2k" "dsyrk" "dtbmv" + "dtbsv" "dtpmv" "dtpsv" "dtrmm" "dtrmv" "dtrsm" "dtrsv" "dzasum" "dznrm2" + "icamax" "idamax" "isamax" "izamax" "lsame" "sasum" "saxpy" "scabs1" + "scasum" "scnrm2" "scopy" "sdot" "sdsdot" "sgbmv" "sgemm" "sgemv" + "sger" "snrm2" "srot" "srotg" "srotm" "srotmg" "ssbmv" "sscal" "sspmv" + "sspr" "sspr2" "sswap" "ssymm" "ssymv" "ssyr" "ssyr2" "ssyr2k" "ssyrk" + "stbmv" "stbsv" "stpmv" "stpsv" "strmm" "strmv" "strsm" "strsv" "xerbla" + "xerbla_array" "zaxpy" "zcopy" "zdotc" "zdotu" "zdrot" "zdscal" "zgbmv" + "zgemm" "zgemv" "zgerc" "zgeru" "zhbmv" "zhemm" "zhemv" "zher" "zher2" + "zher2k" "zherk" "zhpmv" "zhpr" "zhpr2" "zrotg" "zscal" "zswap" "zsymm" + "zsyr2k" "zsyrk" "ztbmv" "ztbsv" "ztpmv" "ztpsv" "ztrmm" "ztrmv" "ztrsm" + "ztrsv" + ]; + + version = "3"; + canonicalExtension = if stdenv.hostPlatform.isLinux + then "${stdenv.hostPlatform.extensions.sharedLibrary}.${version}" + else stdenv.hostPlatform.extensions.sharedLibrary; + + + isILP64 = blasProvider.blas64 or false; + blasImplementation = lib.getName blasProvider; + +in + +assert isILP64 -> (blasImplementation == "openblas" && blasProvider.blas64) || blasImplementation == "mkl"; + +stdenv.mkDerivation { + pname = "blas"; + inherit version; + + outputs = [ "out" "dev" ]; + + meta = (blasProvider.meta or {}) // { + description = "${lib.getName blasProvider} with just the BLAS C and FORTRAN ABI"; + }; + + passthru = { + inherit isILP64; + provider = blasProvider; + implementation = blasImplementation; + }; + + dontBuild = true; + dontConfigure = true; + unpackPhase = "src=$PWD"; + + dontPatchELF = true; + + installPhase = ('' + mkdir -p $out/lib $dev/include $dev/lib/pkgconfig + + libblas="${lib.getLib blasProvider}/lib/libblas${canonicalExtension}" + + if ! [ -e "$libblas" ]; then + echo "$libblas does not exist, ${blasProvider.name} does not provide libblas." + exit 1 + fi + + nm -an "$libblas" | cut -f3 -d' ' > symbols + for symbol in ${toString blasFortranSymbols}; do + grep "^$symbol_$" symbols || { echo "$symbol" was not found in "$libblas"; exit 1; } + done + + cp -L "$libblas" $out/lib/libblas${canonicalExtension} + chmod +w $out/lib/libblas${canonicalExtension} + +'' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' + patchelf --set-soname libblas${canonicalExtension} $out/lib/libblas${canonicalExtension} + patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libblas${canonicalExtension} +'' else if stdenv.hostPlatform.isDarwin then '' + install_name_tool \ + -id libblas${canonicalExtension} \ + -add_rpath ${lib.getLib blasProvider}/lib \ + $out/lib/libblas${canonicalExtension} +'' else "") + '' + + if [ "$out/lib/libblas${canonicalExtension}" != "$out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then + ln -s $out/lib/libblas${canonicalExtension} "$out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" + fi + + cat <<EOF > $dev/lib/pkgconfig/blas.pc +Name: blas +Version: ${version} +Description: BLAS FORTRAN implementation +Libs: -L$out/lib -lblas +Cflags: -I$dev/include +EOF + + libcblas="${lib.getLib blasProvider}/lib/libcblas${canonicalExtension}" + + if ! [ -e "$libcblas" ]; then + echo "$libcblas does not exist, ${blasProvider.name} does not provide libcblas." + exit 1 + fi + + cp -L "$libcblas" $out/lib/libcblas${canonicalExtension} + chmod +w $out/lib/libcblas${canonicalExtension} + +'' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' + patchelf --set-soname libcblas${canonicalExtension} $out/lib/libcblas${canonicalExtension} + patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libcblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libcblas${canonicalExtension} +'' else if stdenv.hostPlatform.isDarwin then '' + install_name_tool \ + -id libcblas${canonicalExtension} \ + -add_rpath ${lib.getLib blasProvider}/lib \ + $out/lib/libcblas${canonicalExtension} +'' else "") + '' + if [ "$out/lib/libcblas${canonicalExtension}" != "$out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then + ln -s $out/lib/libcblas${canonicalExtension} "$out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}" + fi + + cp ${lib.getDev lapack-reference}/include/cblas{,_mangling}.h $dev/include + + cat <<EOF > $dev/lib/pkgconfig/cblas.pc +Name: cblas +Version: ${version} +Description: BLAS C implementation +Cflags: -I$dev/include +Libs: -L$out/lib -lcblas +EOF +'' + stdenv.lib.optionalString (blasImplementation == "mkl") '' + mkdir -p $out/nix-support + echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook + ln -s $out/lib/libblas${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary} + ln -sf ${blasProvider}/include/* $dev/include +''); +} diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix new file mode 100644 index 0000000000000..98b458b778a76 --- /dev/null +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -0,0 +1,107 @@ +{ lib, stdenv +, lapack-reference, openblasCompat, openblas +, isILP64 ? false +, lapackProvider ? if isILP64 then openblas else openblasCompat }: + +let + + version = "3"; + canonicalExtension = if stdenv.hostPlatform.isLinux + then "${stdenv.hostPlatform.extensions.sharedLibrary}.${version}" + else stdenv.hostPlatform.extensions.sharedLibrary; + + lapackImplementation = lib.getName lapackProvider; + +in + +assert isILP64 -> (lapackImplementation == "openblas" && lapackProvider.blas64) || lapackImplementation == "mkl"; + +stdenv.mkDerivation { + pname = "lapack"; + inherit version; + + outputs = [ "out" "dev" ]; + + meta = (lapackProvider.meta or {}) // { + description = "${lib.getName lapackProvider} with just the LAPACK C and FORTRAN ABI"; + }; + + passthru = { + inherit isILP64; + provider = lapackProvider; + implementation = lapackImplementation; + }; + + dontBuild = true; + dontConfigure = true; + unpackPhase = "src=$PWD"; + + dontPatchELF = true; + + installPhase = ('' + mkdir -p $out/lib $dev/include $dev/lib/pkgconfig + + liblapack="${lib.getLib lapackProvider}/lib/liblapack${canonicalExtension}" + + if ! [ -e "$liblapack" ]; then + echo "$liblapack does not exist, ${lapackProvider.name} does not provide liblapack." + exit 1 + fi + + cp -L "$liblapack" $out/lib/liblapack${canonicalExtension} + chmod +w $out/lib/liblapack${canonicalExtension} + +'' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' + patchelf --set-soname liblapack${canonicalExtension} $out/lib/liblapack${canonicalExtension} + patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapack${canonicalExtension}):${lapackProvider}/lib" $out/lib/liblapack${canonicalExtension} +'' else "") + '' + + if [ "$out/lib/liblapack${canonicalExtension}" != "$out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then + ln -s $out/lib/liblapack${canonicalExtension} "$out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" + fi + + install -D ${lib.getDev lapack-reference}/include/lapack.h $dev/include/lapack.h + + cat <<EOF > $dev/lib/pkgconfig/lapack.pc +Name: lapack +Version: ${version} +Description: LAPACK FORTRAN implementation +Cflags: -I$dev/include +Libs: -L$out/lib -llapack +EOF + + liblapacke="${lib.getLib lapackProvider}/lib/liblapacke${canonicalExtension}" + + if ! [ -e "$liblapacke" ]; then + echo "$liblapacke does not exist, ${lapackProvider.name} does not provide liblapacke." + exit 1 + fi + + cp -L "$liblapacke" $out/lib/liblapacke${canonicalExtension} + chmod +w $out/lib/liblapacke${canonicalExtension} + +'' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' + patchelf --set-soname liblapacke${canonicalExtension} $out/lib/liblapacke${canonicalExtension} + patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapacke${canonicalExtension}):${lib.getLib lapackProvider}/lib" $out/lib/liblapacke${canonicalExtension} +'' else "") + '' + + if [ -f "$out/lib/liblapacke.so.3" ]; then + ln -s $out/lib/liblapacke.so.3 $out/lib/liblapacke.so + fi + + cp ${lib.getDev lapack-reference}/include/lapacke{,_mangling,_config}.h $dev/include + + cat <<EOF > $dev/lib/pkgconfig/lapacke.pc +Name: lapacke +Version: ${version} +Description: LAPACK C implementation +Cflags: -I$dev/include +Libs: -L$out/lib -llapacke +EOF +'' + stdenv.lib.optionalString (lapackImplementation == "mkl") '' + mkdir -p $out/nix-support + echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook + ln -s $out/lib/liblapack${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary} + ln -sf ${lapackProvider}/include/* $dev/include +''); +} diff --git a/pkgs/build-support/appimage/appimage-exec.sh b/pkgs/build-support/appimage/appimage-exec.sh index 1273effe5fe23..15eafc58a1ee7 100755 --- a/pkgs/build-support/appimage/appimage-exec.sh +++ b/pkgs/build-support/appimage/appimage-exec.sh @@ -17,7 +17,7 @@ unpack() { local appimageType=0 # https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63 - eval "$(r2 "$src" -nn -Nqc "p8j 3 @ 8" | + eval "$(r2 -nn -Nqc "p8j 3 @ 8" "$src"| jq -r '{appimageSignature: (.[:-1]|implode), appimageType: .[-1]}| @sh "appimageSignature=\(.appimageSignature) appimageType=\(.appimageType)"')" @@ -38,7 +38,7 @@ unpack() { # multiarch offset one-liner using same method as AppImage # see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93 - offset=$(r2 "$src" -nn -Nqc "pfj.elf_header @ 0" |\ + offset=$(r2 -nn -Nqc "pfj.elf_header @ 0" "$src"|\ jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)') echo "Uncompress $(basename "$src") of type $appimageType @ offset $offset." diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 84020505a6351..5cc99c6412a7a 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation { inherit targetPrefix infixSalt; - outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ]; + outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (bintools ? info) "info"); passthru = { inherit bintools libc nativeTools nativeLibc nativePrefix; @@ -259,14 +259,15 @@ stdenv.mkDerivation { printWords ${bintools_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages '' - + optionalString propagateDoc '' + + optionalString propagateDoc ('' ## ## Man page and info support ## ln -s ${bintools.man} $man + '' + optionalString (bintools ? info) '' ln -s ${bintools.info} $info - '' + '') + '' ## diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 47c72bf92602c..31c0c8e92e569 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -42,9 +42,11 @@ in stdenv.mkDerivation (fBuildAttrs // { inherit name bazelFlags bazelBuildFlags bazelFetchFlags bazelTarget; deps = stdenv.mkDerivation (fFetchAttrs // { - name = "${name}-deps"; + name = "${name}-deps.tar.gz"; inherit bazelFlags bazelBuildFlags bazelFetchFlags bazelTarget; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + nativeBuildInputs = fFetchAttrs.nativeBuildInputs or [] ++ [ bazel ]; preHook = fFetchAttrs.preHook or "" + '' @@ -120,9 +122,9 @@ in stdenv.mkDerivation (fBuildAttrs // { ln -sf "$new_target" "$symlink" done - cp -r $bazelOut/external $out + echo '${bazel.name}' > $bazelOut/external/.nix-bazel-version - echo '${bazel.name}' > $out/.nix-bazel-version + (cd $bazelOut/ && tar czf $out --sort=name --mtime='@1' --owner=0 --group=0 --numeric-owner external/) runHook postInstall ''; @@ -130,7 +132,6 @@ in stdenv.mkDerivation (fBuildAttrs // { dontFixup = true; allowedRequisites = []; - outputHashMode = "recursive"; outputHashAlgo = "sha256"; outputHash = fetchAttrs.sha256; }); @@ -146,14 +147,15 @@ in stdenv.mkDerivation (fBuildAttrs // { preConfigure = '' mkdir -p "$bazelOut" - test "${bazel.name}" = "$(<$deps/.nix-bazel-version)" || { + (cd $bazelOut && tar xfz $deps) + + test "${bazel.name}" = "$(<$bazelOut/external/.nix-bazel-version)" || { echo "fixed output derivation was built for a different bazel version" >&2 - echo " got: $(<$deps/.nix-bazel-version)" >&2 + echo " got: $(<$bazelOut/external/.nix-bazel-version)" >&2 echo "expected: ${bazel.name}" >&2 exit 1 } - cp -r $deps $bazelOut/external chmod -R +w $bazelOut find $bazelOut -type l | while read symlink; do ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink" @@ -181,9 +183,9 @@ in stdenv.mkDerivation (fBuildAttrs // { done linkopts=() host_linkopts=() - for flag in $NIX_LD_FLAGS; do - linkopts+=( "--linkopt=$flag" ) - host_linkopts+=( "--host_linkopt=$flag" ) + for flag in $NIX_LDFLAGS; do + linkopts+=( "--linkopt=-Wl,$flag" ) + host_linkopts+=( "--host_linkopt=-Wl,$flag" ) done BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index f43205f24c5c6..d75d3cf943a0a 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -3,6 +3,7 @@ { pname , version , internalDeps ? [] +, peclDeps ? [] , buildInputs ? [] , nativeBuildInputs ? [] , postPhpize ? "" @@ -16,11 +17,12 @@ stdenv.mkDerivation (args // { name = "php-${pname}-${version}"; + extensionName = pname; inherit src; nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs; - buildInputs = [ php ] ++ buildInputs; + buildInputs = [ php ] ++ peclDeps ++ buildInputs; makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 1358b167f6ecc..323ea5bfd7722 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -10,6 +10,7 @@ var_templates_list=( NIX+CFLAGS_LINK NIX+CXXSTDLIB_COMPILE NIX+CXXSTDLIB_LINK + NIX+GNATFLAGS_COMPILE ) var_templates_bool=( NIX+ENFORCE_NO_NATIVE @@ -40,6 +41,10 @@ if [ -e @out@/nix-support/cc-cflags ]; then NIX_@infixSalt@_CFLAGS_COMPILE="$(< @out@/nix-support/cc-cflags) $NIX_@infixSalt@_CFLAGS_COMPILE" fi +if [ -e @out@/nix-support/gnat-cflags ]; then + NIX_@infixSalt@_GNATFLAGS_COMPILE="$(< @out@/nix-support/gnat-cflags) $NIX_@infixSalt@_GNATFLAGS_COMPILE" +fi + if [ -e @out@/nix-support/cc-ldflags ]; then NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)" fi diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 96d48ecbc79d6..36177ec2e3586 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -8,6 +8,7 @@ { name ? "" , stdenvNoCC , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell +, zlib ? null , nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" , propagateDoc ? cc != null && cc ? man , extraTools ? [], extraPackages ? [], extraBuildCommands ? "" @@ -48,7 +49,7 @@ let coreutils_bin = if nativeTools then "" else getBin coreutils; default_cxx_stdlib_compile = if (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) && !(targetPlatform.useLLVM or false) then - "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)" + "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/${targetPlatform.config}" else if targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false) && !(targetPlatform.useLLVM or false) then "-isystem ${libcxx}/include/c++/v1" else ""; @@ -199,6 +200,16 @@ stdenv.mkDerivation { fi '' + + optionalString cc.langAda or false '' + wrap ${targetPrefix}gnatmake ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatmake + wrap ${targetPrefix}gnatbind ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatbind + wrap ${targetPrefix}gnatlink ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatlink + '' + + + optionalString cc.langD or false '' + wrap ${targetPrefix}gdc $wrapper $ccPath/${targetPrefix}gdc + '' + + optionalString cc.langFortran or false '' wrap ${targetPrefix}gfortran $wrapper $ccPath/${targetPrefix}gfortran ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}g77 @@ -214,7 +225,7 @@ stdenv.mkDerivation { ''; strictDeps = true; - propagatedBuildInputs = [ bintools ] ++ extraTools; + propagatedBuildInputs = [ bintools ] ++ extraTools ++ optionals cc.langD or false [ zlib ]; depsTargetTargetPropagated = extraPackages; wrapperName = "CC_WRAPPER"; @@ -256,8 +267,9 @@ stdenv.mkDerivation { # limits.h file in ../includes-fixed. To remedy the problem, # another -idirafter is necessary to add that directory again. echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-cflags + '' + optionalString (!(cc.langD or false)) '' echo "-idirafter ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags - '' + optionalString isGNU '' + '' + optionalString (isGNU && (!(cc.langD or false))) '' for dir in "${cc}"/lib/gcc/*/*/include-fixed; do echo '-idirafter' ''${dir} >> $out/nix-support/libc-cflags done @@ -283,6 +295,13 @@ stdenv.mkDerivation { ccLDFlags+=" -L${cc_solib}/lib" ccCFlags+=" -B${cc_solib}/lib" + '' + optionalString cc.langAda or false '' + basePath=$(echo $cc/lib/*/*/*) + ccCFlags+=" -B$basePath -I$basePath/adainclude" + gnatCFlags="-I$basePath/adainclude -I$basePath/adalib" + + echo "$gnatCFlags" > $out/nix-support/gnat-cflags + '' + '' echo "$ccLDFlags" > $out/nix-support/cc-ldflags echo "$ccCFlags" > $out/nix-support/cc-cflags '' + optionalString (targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false)) '' @@ -294,6 +313,8 @@ stdenv.mkDerivation { ln -s ${cc.man} $man ln -s ${cc.info} $info + '' + optionalString (cc.langD or false) '' + echo "-B${zlib}${zlib.libdir or "/lib/"}" >> $out/nix-support/libc-cflags '' + '' @@ -351,9 +372,11 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" stackprotector fortify pie pic" '' + optionalString targetPlatform.isNetBSD '' hardening_unsupported_flags+=" stackprotector fortify" - '' - - + optionalString targetPlatform.isWasm '' + '' + optionalString cc.langAda or false '' + hardening_unsupported_flags+=" stackprotector strictoverflow" + '' + optionalString cc.langD or false '' + hardening_unsupported_flags+=" format" + '' + optionalString targetPlatform.isWasm '' hardening_unsupported_flags+=" stackprotector fortify pie pic" '' diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh new file mode 100644 index 0000000000000..15b53d76c6307 --- /dev/null +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -0,0 +1,165 @@ +#! @shell@ +set -eu -o pipefail +o posix +shopt -s nullglob + +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + +path_backup="$PATH" + +# That @-vars are substituted separately from bash evaluation makes +# shellcheck think this, and others like it, are useless conditionals. +# shellcheck disable=SC2157 +if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then + PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin" +fi + +source @out@/nix-support/utils.bash + +# Flirting with a layer violation here. +if [ -z "${NIX_BINTOOLS_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then + source @bintools@/nix-support/add-flags.sh +fi + +# Put this one second so libc ldflags take priority. +if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then + source @out@/nix-support/add-flags.sh +fi + + +# Parse command line options and set several variables. +# For instance, figure out if linker flags should be passed. +# GCC prints annoying warnings when they are not needed. +dontLink=0 +nonFlagArgs=0 +# shellcheck disable=SC2193 + +expandResponseParams "$@" +declare -i n=0 +nParams=${#params[@]} +while (( "$n" < "$nParams" )); do + p=${params[n]} + p2=${params[n+1]:-} # handle `p` being last one + if [ "$p" = -c ]; then + dontLink=1 + elif [ "$p" = -S ]; then + dontLink=1 + elif [ "$p" = -E ]; then + dontLink=1 + elif [ "$p" = -E ]; then + dontLink=1 + elif [ "$p" = -M ]; then + dontLink=1 + elif [ "$p" = -MM ]; then + dontLink=1 + elif [[ "$p" = -x && "$p2" = *-header ]]; then + dontLink=1 + elif [[ "$p" != -?* ]]; then + # A dash alone signifies standard input; it is not a flag + nonFlagArgs=1 + fi + n+=1 +done + +# If we pass a flag like -Wl, then gcc will call the linker unless it +# can figure out that it has to do something else (e.g., because of a +# "-c" flag). So if no non-flag arguments are given, don't pass any +# linker flags. This catches cases like "gcc" (should just print +# "gcc: no input files") and "gcc -v" (should print the version). +if [ "$nonFlagArgs" = 0 ]; then + dontLink=1 +fi + +# Optionally filter out paths not refering to the store. +if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE" ]]; then + rest=() + nParams=${#params[@]} + declare -i n=0 + while (( "$n" < "$nParams" )); do + p=${params[n]} + p2=${params[n+1]:-} # handle `p` being last one + if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then + skip "${p:2}" + elif [ "$p" = -L ] && badPath "$p2"; then + n+=1; skip "$p2" + elif [ "${p:0:3}" = -I/ ] && badPath "${p:2}"; then + skip "${p:2}" + elif [ "$p" = -I ] && badPath "$p2"; then + n+=1; skip "$p2" + elif [ "${p:0:4}" = -aI/ ] && badPath "${p:3}"; then + skip "${p:3}" + elif [ "$p" = -aI ] && badPath "$p2"; then + n+=1; skip "$p2" + elif [ "${p:0:4}" = -aO/ ] && badPath "${p:3}"; then + skip "${p:3}" + elif [ "$p" = -aO ] && badPath "$p2"; then + n+=1; skip "$p2" + elif [ "$p" = -isystem ] && badPath "$p2"; then + n+=1; skip "$p2" + else + rest+=("$p") + fi + n+=1 + done + # Old bash empty array hack + params=(${rest+"${rest[@]}"}) +fi + + +# Clear march/mtune=native -- they bring impurity. +if [ "$NIX_@infixSalt@_ENFORCE_NO_NATIVE" = 1 ]; then + rest=() + # Old bash empty array hack + for p in ${params+"${params[@]}"}; do + if [[ "$p" = -m*=native ]]; then + skip "$p" + else + rest+=("$p") + fi + done + # Old bash empty array hack + params=(${rest+"${rest[@]}"}) +fi + +if [ "$(basename $0)x" = "gnatmakex" ]; then + extraBefore=("--GNATBIND=@out@/bin/gnatbind" "--GNATLINK=@out@/bin/gnatlink") + extraAfter=($NIX_@infixSalt@_GNATFLAGS_COMPILE) +fi + +if [ "$(basename $0)x" = "gnatbindx" ]; then + extraBefore=() + extraAfter=($NIX_@infixSalt@_GNATFLAGS_COMPILE) +fi + +if [ "$(basename $0)x" = "gnatlinkx" ]; then + extraBefore=() + extraAfter=("--GCC=@out@/bin/gcc") +fi + +# As a very special hack, if the arguments are just `-v', then don't +# add anything. This is to prevent `gcc -v' (which normally prints +# out the version number and returns exit code 0) from printing out +# `No input files specified' and returning exit code 1. +if [ "$*" = -v ]; then + extraAfter=() + extraBefore=() +fi + +# Optionally print debug info. +if (( "${NIX_DEBUG:-0}" >= 1 )); then + # Old bash workaround, see ld-wrapper for explanation. + echo "extra flags before to @prog@:" >&2 + printf " %q\n" ${extraBefore+"${extraBefore[@]}"} >&2 + echo "original flags to @prog@:" >&2 + printf " %q\n" ${params+"${params[@]}"} >&2 + echo "extra flags after to @prog@:" >&2 + printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2 +fi + +PATH="$path_backup" +# Old bash workaround, see above. +exec @prog@ \ + ${extraBefore+"${extraBefore[@]}"} \ + ${params+"${params[@]}"} \ + ${extraAfter+"${extraAfter[@]}"} diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 28c0d2dfcae17..83f4a9e0c01b5 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -32,7 +32,29 @@ }: # WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future. +let + + mkDbExtraCommand = contents: let + contentsList = if builtins.isList contents then contents else [ contents ]; + in '' + echo "Generating the nix database..." + echo "Warning: only the database of the deepest Nix layer is loaded." + echo " If you want to use nix commands in the container, it would" + echo " be better to only have one layer that contains a nix store." + + export NIX_REMOTE=local?root=$PWD + # A user is required by nix + # https://github.com/NixOS/nix/blob/9348f9291e5d9e4ba3c4347ea1b235640f54fd79/src/libutil/util.cc#L478 + export USER=nobody + ${nix}/bin/nix-store --load-db < ${closureInfo {rootPaths = contentsList;}}/registration + + mkdir -p nix/var/nix/gcroots/docker/ + for i in ${lib.concatStringsSep " " contentsList}; do + ln -s $i nix/var/nix/gcroots/docker/$(basename $i) + done; + ''; +in rec { examples = callPackage ./examples.nix { @@ -73,7 +95,7 @@ rec { sourceURL = "docker://${imageName}@${imageDigest}"; destNameTag = "${finalImageName}:${finalImageTag}"; } '' - skopeo --override-os ${os} --override-arch ${arch} copy "$sourceURL" "docker-archive://$out:$destNameTag" + skopeo --insecure-policy --tmpdir=$TMPDIR --override-os ${os} --override-arch ${arch} copy "$sourceURL" "docker-archive://$out:$destNameTag" ''; # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. @@ -370,14 +392,10 @@ rec { (cd layer; eval "$extraCommands") fi - # Tar up the layer and throw it into 'layer.tar'. + # Tar up the layer and throw it into 'layer.tar', while calculating its checksum. echo "Packing layer..." mkdir $out - tar --transform='s|^\./||' -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar . - - # Compute a checksum of the tarball. - echo "Computing layer checksum..." - tarhash=$(tarsum < $out/layer.tar) + tarhash=$(tar --transform='s|^\./||' -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf - . | tee $out/layer.tar | tarsum) # Add a 'checksum' field to the JSON, with the value set to the # checksum of the tarball. @@ -427,11 +445,7 @@ rec { # Tar up the layer and throw it into 'layer.tar'. echo "Packing layer..." mkdir $out - tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar . - - # Compute a checksum of the tarball. - echo "Computing layer checksum..." - tarhash=$(tarsum < $out/layer.tar) + tarhash=$(tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf - . | tee $out/layer.tar | tarsum) # Add a 'checksum' field to the JSON, with the value set to the # checksum of the tarball. @@ -515,11 +529,10 @@ rec { echo "Packing layer..." mkdir -p $out - tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar . + tarhash=$(tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf - . | + tee $out/layer.tar | + ${tarsum}/bin/tarsum) - # Compute the tar checksum and add it to the output json. - echo "Computing checksum..." - tarhash=$(${tarsum}/bin/tarsum < $out/layer.tar) cat ${baseJson} | jshon -s "$tarhash" -i checksum > $out/json # Indicate to docker that we're using schema version 1.0. echo -n "1.0" > $out/VERSION @@ -751,13 +764,17 @@ rec { mkdir image touch baseFiles + baseEnvs='[]' if [[ -n "$fromImage" ]]; then echo "Unpacking base image..." tar -C image -xpf "$fromImage" + # Store the layers and the environment variables from the base image cat ./image/manifest.json | jq -r '.[0].Layers | .[]' > layer-list + configName="$(cat ./image/manifest.json | jq -r '.[0].Config')" + baseEnvs="$(cat "./image/$configName" | jq '.config.Env // []')" - # Do not import the base image configuration and manifest + # Otherwise do not import the base image configuration and manifest chmod a+w image image/*.json rm -f image/*.json @@ -837,7 +854,8 @@ rec { ) | sponge layer-list # Create image json and image manifest - imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}") + imageJson=$(cat ${baseJson} | jq '.config.Env = $baseenv + .config.Env' --argjson baseenv "$baseEnvs") + imageJson=$(echo "$imageJson" | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}") manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]") for layerTar in $(cat ./layer-list); do @@ -874,25 +892,16 @@ rec { # contents. The main purpose is to be able to use nix commands in # the container. # Be careful since this doesn't work well with multilayer. - buildImageWithNixDb = args@{ contents ? null, extraCommands ? "", ... }: - let contentsList = if builtins.isList contents then contents else [ contents ]; - in buildImage (args // { - extraCommands = '' - echo "Generating the nix database..." - echo "Warning: only the database of the deepest Nix layer is loaded." - echo " If you want to use nix commands in the container, it would" - echo " be better to only have one layer that contains a nix store." - - export NIX_REMOTE=local?root=$PWD - # A user is required by nix - # https://github.com/NixOS/nix/blob/9348f9291e5d9e4ba3c4347ea1b235640f54fd79/src/libutil/util.cc#L478 - export USER=nobody - ${nix}/bin/nix-store --load-db < ${closureInfo {rootPaths = contentsList;}}/registration - - mkdir -p nix/var/nix/gcroots/docker/ - for i in ${lib.concatStringsSep " " contentsList}; do - ln -s $i nix/var/nix/gcroots/docker/$(basename $i) - done; - '' + extraCommands; - }); + buildImageWithNixDb = args@{ contents ? null, extraCommands ? "", ... }: ( + buildImage (args // { + extraCommands = (mkDbExtraCommand contents) + extraCommands; + }) + ); + + buildLayeredImageWithNixDb = args@{ contents ? null, extraCommands ? "", ... }: ( + buildLayeredImage (args // { + extraCommands = (mkDbExtraCommand contents) + extraCommands; + }) + ); + } diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index f42b35e64943f..d533e3abd03bd 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -69,6 +69,12 @@ rec { tag = "latest"; contents = pkgs.nginx; + extraCommands = '' + # nginx still tries to read this directory even if error_log + # directive is specifying another file :/ + mkdir -p var/log/nginx + mkdir -p var/cache/nginx + ''; runAsRoot = '' #!${pkgs.stdenv.shell} ${shadowSetup} @@ -231,14 +237,41 @@ rec { ''; }; - # 14. Create another layered image, for comparing layers with image 10. + # 14. Environment variable inheritance. + # Child image should inherit parents environment variables, + # optionally overriding them. + environmentVariables = let + parent = pkgs.dockerTools.buildImage { + name = "parent"; + tag = "latest"; + config = { + Env = [ + "FROM_PARENT=true" + "LAST_LAYER=parent" + ]; + }; + }; + in pkgs.dockerTools.buildImage { + name = "child"; + fromImage = parent; + tag = "latest"; + contents = [ pkgs.coreutils ]; + config = { + Env = [ + "FROM_CHILD=true" + "LAST_LAYER=child" + ]; + }; + }; + + # 15. Create another layered image, for comparing layers with image 10. another-layered-image = pkgs.dockerTools.buildLayeredImage { name = "another-layered-image"; tag = "latest"; config.Cmd = [ "${pkgs.hello}/bin/hello" ]; }; - # 15. Create a layered image with only 2 layers + # 16. Create a layered image with only 2 layers two-layered-image = pkgs.dockerTools.buildLayeredImage { name = "two-layered-image"; tag = "latest"; @@ -247,7 +280,7 @@ rec { maxLayers = 2; }; - # 16. Create a layered image with more packages than max layers. + # 17. Create a layered image with more packages than max layers. # coreutils and hello are part of the same layer bulk-layer = pkgs.dockerTools.buildLayeredImage { name = "bulk-layer"; @@ -258,7 +291,7 @@ rec { maxLayers = 2; }; - # 17. Create a "layered" image without nix store layers. This is not + # 18. Create a "layered" image without nix store layers. This is not # recommended, but can be useful for base images in rare cases. no-store-paths = pkgs.dockerTools.buildLayeredImage { name = "no-store-paths"; diff --git a/pkgs/build-support/docker/nix-prefetch-docker b/pkgs/build-support/docker/nix-prefetch-docker index 839dc87487a06..1b6785189c28d 100755 --- a/pkgs/build-support/docker/nix-prefetch-docker +++ b/pkgs/build-support/docker/nix-prefetch-docker @@ -38,7 +38,7 @@ get_image_digest(){ imageTag="latest" fi - skopeo inspect "docker://$imageName:$imageTag" | jq '.Digest' -r + skopeo --insecure-policy --tmpdir=$TMPDIR inspect "docker://$imageName:$imageTag" | jq '.Digest' -r } get_name() { @@ -127,9 +127,9 @@ trap "rm -rf \"$tmpPath\"" EXIT tmpFile="$tmpPath/$(get_name $finalImageName $finalImageTag)" if test -z "$QUIET"; then - skopeo --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" + skopeo --insecure-policy --tmpdir=$TMPDIR --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" else - skopeo --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" > /dev/null + skopeo --insecure-policy --tmpdir=$TMPDIR --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" > /dev/null fi # Compute the hash. diff --git a/pkgs/build-support/docker/nix-prefetch-docker.nix b/pkgs/build-support/docker/nix-prefetch-docker.nix index c1d86adc6d812..6341eb0154b05 100644 --- a/pkgs/build-support/docker/nix-prefetch-docker.nix +++ b/pkgs/build-support/docker/nix-prefetch-docker.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, nix, skopeo }: +{ stdenv, makeWrapper, nix, skopeo, jq }: with stdenv.lib; @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = '' install -vD ${./nix-prefetch-docker} $out/bin/$name; wrapProgram $out/bin/$name \ - --prefix PATH : ${makeBinPath [ nix skopeo ]} \ + --prefix PATH : ${makeBinPath [ nix skopeo jq ]} \ --set HOME /homeless-shelter ''; diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/pkgs/build-support/docker/store-path-to-layer.sh index 7e8efeea1c106..7437da51cc4a4 100755 --- a/pkgs/build-support/docker/store-path-to-layer.sh +++ b/pkgs/build-support/docker/store-path-to-layer.sh @@ -11,39 +11,36 @@ echo "Creating layer #$layerNumber for $@" mkdir -p "$layerPath" # Make sure /nix and /nix/store appear first in the archive. +# # We create the directories here and use them because # when there are other things being added to the # nix store, tar could fail, saying, # "tar: /nix/store: file changed as we read it" mkdir -p nix/store -tar -cf "$layerPath/layer.tar" \ - --mtime="@$SOURCE_DATE_EPOCH" \ - --owner=0 --group=0 \ - --transform='s,nix,/nix,' \ - nix - -# We change into the /nix/store in order to avoid a similar -# "file changed as we read it" error as above. Namely, -# if we use the absolute path of /nix/store/123-pkg -# and something new is added to the nix store while tar -# is running, it will detect a change to /nix/store and -# fail. Instead, if we cd into the nix store and copy -# the relative nix store path, tar will ignore changes -# to /nix/store. In order to create the correct structure -# in the tar file, we transform the relative nix store -# path to the absolute store path. -for storePath in "$@"; do - n=$(basename "$storePath") - tar -C /nix/store -rpf "$layerPath/layer.tar" \ + +# Then we change into the /nix/store in order to +# avoid a similar "file changed as we read it" error +# as above. Namely, if we use the absolute path of +# /nix/store/123-pkg and something new is added to the nix +# store while tar is running, it will detect a change to +# /nix/store and fail. Instead, if we cd into the nix store +# and copy the relative nix store path, tar will ignore +# changes to /nix/store. In order to create the correct +# structure in the tar file, we transform the relative nix +# store path to the absolute store path. +tarhash=$( + basename -a "$@" | + tar --create --preserve-permissions --absolute-names nix \ + --directory /nix/store --verbatim-files-from --files-from - \ --hard-dereference --sort=name \ --mtime="@$SOURCE_DATE_EPOCH" \ --owner=0 --group=0 \ - --transform="s,$n,/nix/store/$n," \ - $n -done - -# Compute a checksum of the tarball. -tarhash=$(tarsum < $layerPath/layer.tar) + --transform 's,^nix$,/\0,' \ + --transform 's,^nix/store$,/\0,' \ + --transform 's,^[^/],/nix/store/\0,rS' | + tee "$layerPath/layer.tar" | + tarsum +) # Add a 'checksum' field to the JSON, with the value set to the # checksum of the tarball. diff --git a/pkgs/build-support/fetchbzr/default.nix b/pkgs/build-support/fetchbzr/default.nix index f9250de4ee07e..2cf169de7a527 100644 --- a/pkgs/build-support/fetchbzr/default.nix +++ b/pkgs/build-support/fetchbzr/default.nix @@ -1,11 +1,11 @@ -{ stdenvNoCC, bazaar }: +{ stdenvNoCC, breezy }: { url, rev, sha256 }: stdenvNoCC.mkDerivation { name = "bzr-export"; builder = ./builder.sh; - nativeBuildInputs = [ bazaar ]; + nativeBuildInputs = [ breezy ]; outputHashAlgo = "sha256"; outputHashMode = "recursive"; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index abba76bd1ac96..43f7c5acd5ad9 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -373,6 +373,7 @@ print_results() { "url": "$(json_escape "$url")", "rev": "$(json_escape "$fullRev")", "date": "$(json_escape "$commitDateStrict8601")", + "path": "$(json_escape "$finalPath")", "$(json_escape "$hashType")": "$(json_escape "$hash")", "fetchSubmodules": $([[ -n "$fetchSubmodules" ]] && echo true || echo false), "deepClone": $([[ -n "$deepClone" ]] && echo true || echo false), diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/build-support/fetchgitlab/default.nix index 6c4d52a05337e..f1850fbaa1ea7 100644 --- a/pkgs/build-support/fetchgitlab/default.nix +++ b/pkgs/build-support/fetchgitlab/default.nix @@ -12,10 +12,11 @@ let ((optional (group != null) group) ++ [ owner repo ]); escapedSlug = replaceStrings ["." "/"] ["%2E" "%2F"] slug; + escapedRev = replaceStrings ["+"] ["%2B"] rev; in fetchzip ({ inherit name; - url = "https://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${rev}"; + url = "https://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}"; meta.homepage = "https://${domain}/${slug}/"; } // removeAttrs args [ "domain" "owner" "group" "repo" "rev" ]) // { inherit rev; } diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix index dc48a312fb379..d7ad406943be5 100644 --- a/pkgs/build-support/fetchmavenartifact/default.nix +++ b/pkgs/build-support/fetchmavenartifact/default.nix @@ -3,10 +3,10 @@ { fetchurl, stdenv }: let defaultRepos = [ - http://central.maven.org/maven2 - http://oss.sonatype.org/content/repositories/releases - http://oss.sonatype.org/content/repositories/public - http://repo.typesafe.com/typesafe/releases + "http://central.maven.org/maven2" + "http://oss.sonatype.org/content/repositories/releases" + "http://oss.sonatype.org/content/repositories/public" + "http://repo.typesafe.com/typesafe/releases" ]; in diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index 74fdc320835fb..e93c98419a672 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -47,13 +47,18 @@ tryDownload() { finish() { + local skipPostFetch="$1" + set +o noglob if [[ $executable == "1" ]]; then chmod +x $downloadedFile fi - runHook postFetch + if [ -z "$skipPostFetch" ]; then + runHook postFetch + fi + exit 0 } @@ -69,7 +74,13 @@ tryHashedMirrors() { --fail --silent --show-error --head "$url" \ --write-out "%{http_code}" --output /dev/null > code 2> log; then tryDownload "$url" - if test -n "$success"; then finish; fi + + # We skip postFetch here, because hashed-mirrors are + # already content addressed. So if $outputHash is in the + # hashed-mirror, changes from ‘postFetch’ would already be + # made. So, running postFetch will end up applying the + # change /again/, which we don’t want. + if test -n "$success"; then finish skipPostFetch; fi else # Be quiet about 404 errors, which we interpret as the file # not being present on this particular mirror. diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 7d23a3a7f8f1c..a0c48468dfac3 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -65,7 +65,7 @@ in , # Shell code to build a netrc file for BASIC auth netrcPhase ? null -, # Impure env vars (http://nixos.org/nix/manual/#sec-advanced-attributes) +, # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes) # needed for netrcPhase netrcImpureEnvVars ? [] diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index a0a61f7cc50b0..4e8b0aa99a8f1 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -2,316 +2,316 @@ # Content-addressable Nix mirrors. hashedMirrors = [ - http://tarballs.nixos.org + "http://tarballs.nixos.org" ]; # Mirrors for mirror://site/filename URIs, where "site" is # "sourceforge", "gnu", etc. luarocks = [ - https://luarocks.org - https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/ - http://luafr.org/moonrocks - http://luarocks.logiceditor.com/rocks + "https://luarocks.org" + "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/" + "http://luafr.org/moonrocks" + "http://luarocks.logiceditor.com/rocks" ]; # SourceForge. sourceforge = [ - https://downloads.sourceforge.net/ - https://prdownloads.sourceforge.net/ - https://heanet.dl.sourceforge.net/sourceforge/ - https://surfnet.dl.sourceforge.net/sourceforge/ - https://dfn.dl.sourceforge.net/sourceforge/ - https://osdn.dl.sourceforge.net/sourceforge/ - https://kent.dl.sourceforge.net/sourceforge/ + "https://downloads.sourceforge.net/" + "https://prdownloads.sourceforge.net/" + "https://heanet.dl.sourceforge.net/sourceforge/" + "https://surfnet.dl.sourceforge.net/sourceforge/" + "https://dfn.dl.sourceforge.net/sourceforge/" + "https://osdn.dl.sourceforge.net/sourceforge/" + "https://kent.dl.sourceforge.net/sourceforge/" ]; # OSDN (formerly SourceForge.jp). osdn = [ - https://osdn.dl.osdn.jp/ - https://osdn.mirror.constant.com/ - https://mirrors.gigenet.com/OSDN/ - https://osdn.dl.sourceforge.jp/ - https://jaist.dl.sourceforge.jp/ + "https://osdn.dl.osdn.jp/" + "https://osdn.mirror.constant.com/" + "https://mirrors.gigenet.com/OSDN/" + "https://osdn.dl.sourceforge.jp/" + "https://jaist.dl.sourceforge.jp/" ]; # GNU (https://www.gnu.org/prep/ftp.html). gnu = [ # This one redirects to a (supposedly) nearby and (supposedly) up-to-date # mirror. - https://ftpmirror.gnu.org/ + "https://ftpmirror.gnu.org/" - http://ftp.nluug.nl/pub/gnu/ - http://mirrors.kernel.org/gnu/ - ftp://mirror.cict.fr/gnu/ - ftp://ftp.cs.tu-berlin.de/pub/gnu/ - ftp://ftp.chg.ru/pub/gnu/ - ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/ + "http://ftp.nluug.nl/pub/gnu/" + "http://mirrors.kernel.org/gnu/" + "ftp://mirror.cict.fr/gnu/" + "ftp://ftp.cs.tu-berlin.de/pub/gnu/" + "ftp://ftp.chg.ru/pub/gnu/" + "ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/" # This one is the master repository, and thus it's always up-to-date. - http://ftp.gnu.org/pub/gnu/ + "http://ftp.gnu.org/pub/gnu/" ]; # GCC. gcc = [ - https://bigsearcher.com/mirrors/gcc/ - http://mirror.koddos.net/gcc/ - ftp://ftp.nluug.nl/mirror/languages/gcc/ - ftp://ftp.fu-berlin.de/unix/languages/gcc/ - ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/ - ftp://gcc.gnu.org/pub/gcc/ + "https://bigsearcher.com/mirrors/gcc/" + "http://mirror.koddos.net/gcc/" + "ftp://ftp.nluug.nl/mirror/languages/gcc/" + "ftp://ftp.fu-berlin.de/unix/languages/gcc/" + "ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/" + "ftp://gcc.gnu.org/pub/gcc/" ]; # GnuPG. gnupg = [ - https://gnupg.org/ftp/gcrypt/ - http://www.ring.gr.jp/pub/net/ - http://gd.tuwien.ac.at/privacy/ - http://mirrors.dotsrc.org/gcrypt/ - http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/ - http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/ + "https://gnupg.org/ftp/gcrypt/" + "http://www.ring.gr.jp/pub/net/" + "http://gd.tuwien.ac.at/privacy/" + "http://mirrors.dotsrc.org/gcrypt/" + "http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/" + "http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/" ]; # kernel.org's /pub (/pub/{linux,software}) tree. kernel = [ - http://cdn.kernel.org/pub/ - http://www.all.kernel.org/pub/ - http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/ - http://linux-kernel.uio.no/pub/ - http://kernel.osuosl.org/pub/ - ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/ + "http://cdn.kernel.org/pub/" + "http://www.all.kernel.org/pub/" + "http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/" + "http://linux-kernel.uio.no/pub/" + "http://kernel.osuosl.org/pub/" + "ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/" ]; # Mirrors from https://download.kde.org/extra/download-mirrors.html kde = [ "https://download.kde.org/download.php?url=" - https://ftp.gwdg.de/pub/linux/kde/ - https://mirrors.ocf.berkeley.edu/kde/ - http://mirrors.mit.edu/kde/ - https://mirrors.ustc.edu.cn/kde/ - http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/ - ftp://ftp.kde.org/pub/kde/ + "https://ftp.gwdg.de/pub/linux/kde/" + "https://mirrors.ocf.berkeley.edu/kde/" + "http://mirrors.mit.edu/kde/" + "https://mirrors.ustc.edu.cn/kde/" + "http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/" + "ftp://ftp.kde.org/pub/kde/" ]; # Gentoo files. gentoo = [ - http://ftp.snt.utwente.nl/pub/os/linux/gentoo/ - http://distfiles.gentoo.org/ - ftp://mirrors.kernel.org/gentoo/ + "http://ftp.snt.utwente.nl/pub/os/linux/gentoo/" + "http://distfiles.gentoo.org/" + "ftp://mirrors.kernel.org/gentoo/" ]; savannah = [ # Mirrors from https://download-mirror.savannah.gnu.org/releases/00_MIRRORS.html - http://mirror.easyname.at/nongnu/ - http://mirror2.klaus-uwe.me/nongnu/ - http://savannah.c3sl.ufpr.br/ - http://mirror.csclub.uwaterloo.ca/nongnu/ - http://mirror.cedia.org.ec/nongnu/ - http://ftp.igh.cnrs.fr/pub/nongnu/ - http://mirror6.layerjet.com/nongnu - http://mirror.netcologne.de/savannah/ - http://ftp.cc.uoc.gr/mirrors/nongnu.org/ - http://nongnu.uib.no/ - http://mirrors.fe.up.pt/pub/nongnu/ - http://mirror.lihnidos.org/GNU/savannah/ - http://savannah.mirror.si/ - http://ftp.acc.umu.se/mirror/gnu.org/savannah/ - http://ftp.twaren.net/Unix/NonGNU/ - http://ftp.yzu.edu.tw/pub/nongnu/ - http://mirror.rackdc.com/savannah/ - http://savannah-nongnu-org.ip-connect.vn.ua/ - http://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/ - http://savannah.spinellicreations.com/ - http://gnu.mirrors.pair.com/savannah/savannah/ - ftp://mirror.easyname.at/nongnu/ - ftp://mirror2.klaus-uwe.me/nongnu/ - ftp://savannah.c3sl.ufpr.br/savannah-nongnu/ - ftp://mirror.csclub.uwaterloo.ca/nongnu/ - ftp://mirror.cedia.org.ec/nongnu - ftp://ftp.igh.cnrs.fr/pub/nongnu/ - ftp://mirror6.layerjet.com/nongnu/ - ftp://mirror.netcologne.de/savannah/ - ftp://nongnu.uib.no/pub/nongnu/ - ftp://mirrors.fe.up.pt/pub/nongnu/ - ftp://savannah.mirror.si/savannah/ - ftp://ftp.twaren.net/Unix/NonGNU/ - ftp://ftp.yzu.edu.tw/pub/nongnu/ - ftp://savannah-nongnu-org.ip-connect.vn.ua/mirror/savannah.nongnu.org/ - ftp://ftp.mirrorservice.org/sites/download.savannah.gnu.org/releases/ - ftp://spinellicreations.com/gnu_dot_org_savannah_mirror/ + "http://mirror.easyname.at/nongnu/" + "http://mirror2.klaus-uwe.me/nongnu/" + "http://savannah.c3sl.ufpr.br/" + "http://mirror.csclub.uwaterloo.ca/nongnu/" + "http://mirror.cedia.org.ec/nongnu/" + "http://ftp.igh.cnrs.fr/pub/nongnu/" + "http://mirror6.layerjet.com/nongnu" + "http://mirror.netcologne.de/savannah/" + "http://ftp.cc.uoc.gr/mirrors/nongnu.org/" + "http://nongnu.uib.no/" + "http://mirrors.fe.up.pt/pub/nongnu/" + "http://mirror.lihnidos.org/GNU/savannah/" + "http://savannah.mirror.si/" + "http://ftp.acc.umu.se/mirror/gnu.org/savannah/" + "http://ftp.twaren.net/Unix/NonGNU/" + "http://ftp.yzu.edu.tw/pub/nongnu/" + "http://mirror.rackdc.com/savannah/" + "http://savannah-nongnu-org.ip-connect.vn.ua/" + "http://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/" + "http://savannah.spinellicreations.com/" + "http://gnu.mirrors.pair.com/savannah/savannah/" + "ftp://mirror.easyname.at/nongnu/" + "ftp://mirror2.klaus-uwe.me/nongnu/" + "ftp://savannah.c3sl.ufpr.br/savannah-nongnu/" + "ftp://mirror.csclub.uwaterloo.ca/nongnu/" + "ftp://mirror.cedia.org.ec/nongnu" + "ftp://ftp.igh.cnrs.fr/pub/nongnu/" + "ftp://mirror6.layerjet.com/nongnu/" + "ftp://mirror.netcologne.de/savannah/" + "ftp://nongnu.uib.no/pub/nongnu/" + "ftp://mirrors.fe.up.pt/pub/nongnu/" + "ftp://savannah.mirror.si/savannah/" + "ftp://ftp.twaren.net/Unix/NonGNU/" + "ftp://ftp.yzu.edu.tw/pub/nongnu/" + "ftp://savannah-nongnu-org.ip-connect.vn.ua/mirror/savannah.nongnu.org/" + "ftp://ftp.mirrorservice.org/sites/download.savannah.gnu.org/releases/" + "ftp://spinellicreations.com/gnu_dot_org_savannah_mirror/" ]; samba = [ - https://www.samba.org/ftp/ - http://www.samba.org/ftp/ + "https://www.samba.org/ftp/" + "http://www.samba.org/ftp/" ]; # BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html . bitlbee = [ - http://get.bitlbee.org/ - http://get.bitlbee.be/ - http://get.us.bitlbee.org/ - http://ftp.snt.utwente.nl/pub/software/bitlbee/ - http://bitlbee.intergenia.de/ + "http://get.bitlbee.org/" + "http://get.bitlbee.be/" + "http://get.us.bitlbee.org/" + "http://ftp.snt.utwente.nl/pub/software/bitlbee/" + "http://bitlbee.intergenia.de/" ]; # ImageMagick mirrors, see https://www.imagemagick.org/script/mirror.php imagemagick = [ - https://www.imagemagick.org/download/ - https://mirror.checkdomain.de/imagemagick/ - https://ftp.nluug.nl/ImageMagick/ - ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ # also contains older versions removed from most mirrors - http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ - ftp://ftp.imagemagick.org/pub/ImageMagick/ - http://ftp.fifi.org/ImageMagick/ - ftp://ftp.fifi.org/ImageMagick/ - http://imagemagick.mirrorcatalogs.com/ - ftp://imagemagick.mirrorcatalogs.com/imagemagick + "https://www.imagemagick.org/download/" + "https://mirror.checkdomain.de/imagemagick/" + "https://ftp.nluug.nl/ImageMagick/" + "ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/" # also contains older versions removed from most mirrors + "http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/" + "ftp://ftp.imagemagick.org/pub/ImageMagick/" + "http://ftp.fifi.org/ImageMagick/" + "ftp://ftp.fifi.org/ImageMagick/" + "http://imagemagick.mirrorcatalogs.com/" + "ftp://imagemagick.mirrorcatalogs.com/imagemagick" ]; # CPAN mirrors. cpan = [ - https://cpan.metacpan.org/ - https://cpan.perl.org/ - http://backpan.perl.org/ # for old releases + "https://cpan.metacpan.org/" + "https://cpan.perl.org/" + "http://backpan.perl.org/" # for old releases ]; # CentOS. centos = [ - http://mirror.centos.org/centos/ + "http://mirror.centos.org/centos/" # For old releases - http://vault.centos.org/ - https://archive.kernel.org/centos-vault/ - http://ftp.jaist.ac.jp/pub/Linux/CentOS-vault/ - http://mirrors.aliyun.com/centos-vault/ - https://mirror.chpc.utah.edu/pub/vault.centos.org/ - https://mirror.its.sfu.ca/mirror/CentOS-vault/ - https://mirror.math.princeton.edu/pub/centos-vault/ - https://mirrors.tripadvisor.com/centos-vault/ + "http://vault.centos.org/" + "https://archive.kernel.org/centos-vault/" + "http://ftp.jaist.ac.jp/pub/Linux/CentOS-vault/" + "http://mirrors.aliyun.com/centos-vault/" + "https://mirror.chpc.utah.edu/pub/vault.centos.org/" + "https://mirror.its.sfu.ca/mirror/CentOS-vault/" + "https://mirror.math.princeton.edu/pub/centos-vault/" + "https://mirrors.tripadvisor.com/centos-vault/" ]; # Debian. debian = [ - http://httpredir.debian.org/debian/ - ftp://ftp.au.debian.org/debian/ - ftp://ftp.de.debian.org/debian/ - ftp://ftp.es.debian.org/debian/ - ftp://ftp.fr.debian.org/debian/ - ftp://ftp.it.debian.org/debian/ - ftp://ftp.nl.debian.org/debian/ - ftp://ftp.ru.debian.org/debian/ - ftp://ftp.debian.org/debian/ - http://ftp.debian.org/debian/ - http://archive.debian.org/debian-archive/debian/ - ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/ + "http://httpredir.debian.org/debian/" + "ftp://ftp.au.debian.org/debian/" + "ftp://ftp.de.debian.org/debian/" + "ftp://ftp.es.debian.org/debian/" + "ftp://ftp.fr.debian.org/debian/" + "ftp://ftp.it.debian.org/debian/" + "ftp://ftp.nl.debian.org/debian/" + "ftp://ftp.ru.debian.org/debian/" + "ftp://ftp.debian.org/debian/" + "http://ftp.debian.org/debian/" + "http://archive.debian.org/debian-archive/debian/" + "ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/" ]; # Ubuntu. ubuntu = [ - http://nl.archive.ubuntu.com/ubuntu/ - http://de.archive.ubuntu.com/ubuntu/ - http://archive.ubuntu.com/ubuntu/ - http://old-releases.ubuntu.com/ubuntu/ + "http://nl.archive.ubuntu.com/ubuntu/" + "http://de.archive.ubuntu.com/ubuntu/" + "http://archive.ubuntu.com/ubuntu/" + "http://old-releases.ubuntu.com/ubuntu/" ]; # Fedora (please only add full mirrors that carry old Fedora distributions as well). # See: https://mirrors.fedoraproject.org/publiclist (but not all carry old content). fedora = [ - http://archives.fedoraproject.org/pub/fedora/ - http://fedora.osuosl.org/ - http://ftp.nluug.nl/pub/os/Linux/distr/fedora/ - http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/ - http://fedora.bhs.mirrors.ovh.net/ - http://mirror.csclub.uwaterloo.ca/fedora/ - http://ftp.linux.cz/pub/linux/fedora/ - http://ftp.heanet.ie/pub/fedora/ - http://mirror.1000mbps.com/fedora/ - http://archives.fedoraproject.org/pub/archive/fedora/ + "http://archives.fedoraproject.org/pub/fedora/" + "http://fedora.osuosl.org/" + "http://ftp.nluug.nl/pub/os/Linux/distr/fedora/" + "http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/" + "http://fedora.bhs.mirrors.ovh.net/" + "http://mirror.csclub.uwaterloo.ca/fedora/" + "http://ftp.linux.cz/pub/linux/fedora/" + "http://ftp.heanet.ie/pub/fedora/" + "http://mirror.1000mbps.com/fedora/" + "http://archives.fedoraproject.org/pub/archive/fedora/" ]; # Old SUSE distributions. Unfortunately there is no master site, # since SUSE actually delete their old distributions (see # ftp://ftp.suse.com/pub/suse/discontinued/deleted-20070817/README.txt). oldsuse = [ - ftp://ftp.gmd.de/ftp.suse.com-discontinued/ + "ftp://ftp.gmd.de/ftp.suse.com-discontinued/" ]; # openSUSE. opensuse = [ - http://opensuse.hro.nl/opensuse/distribution/ - http://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/ - http://ftp.belnet.be/mirror/ftp.opensuse.org/distribution/ - http://ftp.uni-kassel.de/opensuse/distribution/ - http://ftp.opensuse.org/pub/opensuse/distribution/ - http://ftp5.gwdg.de/pub/opensuse/discontinued/distribution/ - http://ftp.hosteurope.de/mirror/ftp.opensuse.org/discontinued/ - http://opensuse.mirror.server4you.net/distribution/ - http://ftp.nsysu.edu.tw/Linux/OpenSuSE/distribution/ + "http://opensuse.hro.nl/opensuse/distribution/" + "http://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/" + "http://ftp.belnet.be/mirror/ftp.opensuse.org/distribution/" + "http://ftp.uni-kassel.de/opensuse/distribution/" + "http://ftp.opensuse.org/pub/opensuse/distribution/" + "http://ftp5.gwdg.de/pub/opensuse/discontinued/distribution/" + "http://ftp.hosteurope.de/mirror/ftp.opensuse.org/discontinued/" + "http://opensuse.mirror.server4you.net/distribution/" + "http://ftp.nsysu.edu.tw/Linux/OpenSuSE/distribution/" ]; # Gnome (see http://ftp.gnome.org/pub/GNOME/MIRRORS). gnome = [ # This one redirects to some mirror closeby, so it should be all you need. - http://download.gnome.org/ + "http://download.gnome.org/" - http://ftp.unina.it/pub/linux/GNOME/ - http://fr2.rpmfind.net/linux/gnome.org/ - ftp://ftp.dit.upm.es/pub/GNOME/ - ftp://ftp.no.gnome.org/pub/GNOME/ - http://ftp.acc.umu.se/pub/GNOME/ - http://ftp.belnet.be/mirror/ftp.gnome.org/ - http://ftp.df.lth.se/pub/gnome/ - http://linorg.usp.br/gnome/ - http://mirror.aarnet.edu.au/pub/GNOME/ - ftp://ftp.cse.buffalo.edu/pub/Gnome/ - ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/ + "http://ftp.unina.it/pub/linux/GNOME/" + "http://fr2.rpmfind.net/linux/gnome.org/" + "ftp://ftp.dit.upm.es/pub/GNOME/" + "ftp://ftp.no.gnome.org/pub/GNOME/" + "http://ftp.acc.umu.se/pub/GNOME/" + "http://ftp.belnet.be/mirror/ftp.gnome.org/" + "http://ftp.df.lth.se/pub/gnome/" + "http://linorg.usp.br/gnome/" + "http://mirror.aarnet.edu.au/pub/GNOME/" + "ftp://ftp.cse.buffalo.edu/pub/Gnome/" + "ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/" ]; xfce = [ - http://archive.xfce.org/ - http://mirror.netcologne.de/xfce/ - http://archive.se.xfce.org/xfce/ - http://archive.be.xfce.org/xfce/ - http://mirror.perldude.de/archive.xfce.org/ - http://archive.be2.xfce.org/ - http://ftp.udc.es/xfce/ - http://archive.al-us.xfce.org/ - http://mirror.yongbok.net/X11/xfce-mirror/ - http://mirrors.tummy.com/pub/archive.xfce.org/ - http://xfce.mirror.uber.com.au/ + "http://archive.xfce.org/" + "http://mirror.netcologne.de/xfce/" + "http://archive.se.xfce.org/xfce/" + "http://archive.be.xfce.org/xfce/" + "http://mirror.perldude.de/archive.xfce.org/" + "http://archive.be2.xfce.org/" + "http://ftp.udc.es/xfce/" + "http://archive.al-us.xfce.org/" + "http://mirror.yongbok.net/X11/xfce-mirror/" + "http://mirrors.tummy.com/pub/archive.xfce.org/" + "http://xfce.mirror.uber.com.au/" ]; # X.org. xorg = [ - https://xorg.freedesktop.org/releases/ - https://ftp.x.org/archive/ + "https://xorg.freedesktop.org/releases/" + "https://ftp.x.org/archive/" ]; # Apache mirrors (see http://www.apache.org/mirrors/). apache = [ - https://www-eu.apache.org/dist/ - https://www-us.apache.org/dist/ - http://www.eu.apache.org/dist/ - ftp://ftp.fu-berlin.de/unix/www/apache/ - http://ftp.tudelft.nl/apache/ - http://mirror.cc.columbia.edu/pub/software/apache/ - https://www.apache.org/dist/ - https://archive.apache.org/dist/ # fallback for old releases - ftp://ftp.funet.fi/pub/mirrors/apache.org/ - http://apache.cs.uu.nl/ - http://apache.cs.utah.edu/ + "https://www-eu.apache.org/dist/" + "https://www-us.apache.org/dist/" + "http://www.eu.apache.org/dist/" + "ftp://ftp.fu-berlin.de/unix/www/apache/" + "http://ftp.tudelft.nl/apache/" + "http://mirror.cc.columbia.edu/pub/software/apache/" + "https://www.apache.org/dist/" + "https://archive.apache.org/dist/" # fallback for old releases + "ftp://ftp.funet.fi/pub/mirrors/apache.org/" + "http://apache.cs.uu.nl/" + "http://apache.cs.utah.edu/" ]; postgresql = [ - http://ftp.postgresql.org/pub/ - ftp://ftp.postgresql.org/pub/ - ftp://ftp-archives.postgresql.org/pub/ + "http://ftp.postgresql.org/pub/" + "ftp://ftp.postgresql.org/pub/" + "ftp://ftp-archives.postgresql.org/pub/" ]; metalab = [ - ftp://mirrors.kernel.org/metalab/ - ftp://ftp.gwdg.de/pub/linux/metalab/ - ftp://ftp.xemacs.org/sites/metalab.unc.edu/ + "ftp://mirrors.kernel.org/metalab/" + "ftp://ftp.gwdg.de/pub/linux/metalab/" + "ftp://ftp.xemacs.org/sites/metalab.unc.edu/" ]; # Bioconductor mirrors (from http://bioconductor.org/about/mirrors) @@ -323,118 +323,118 @@ # http://bioconductor.fmrp.usp.br/ # http://mirror.aarnet.edu.au/pub/bioconductor/ # http://watson.nci.nih.gov/bioc_mirror/ - http://bioconductor.jp/packages/ - http://bioconductor.statistik.tu-dortmund.de/packages/ - http://mirrors.ebi.ac.uk/bioconductor/packages/ - http://mirrors.ustc.edu.cn/bioc/ + "http://bioconductor.jp/packages/" + "http://bioconductor.statistik.tu-dortmund.de/packages/" + "http://mirrors.ebi.ac.uk/bioconductor/packages/" + "http://mirrors.ustc.edu.cn/bioc/" ]; # Hackage mirrors hackage = [ - http://hackage.haskell.org/package/ - http://hdiff.luite.com/packages/archive/package/ - http://hackage.fpcomplete.com/package/ - http://objects-us-east-1.dream.io/hackage-mirror/package/ + "http://hackage.haskell.org/package/" + "http://hdiff.luite.com/packages/archive/package/" + "http://hackage.fpcomplete.com/package/" + "http://objects-us-east-1.dream.io/hackage-mirror/package/" ]; # Roy marples mirrors roy = [ - http://roy.marples.name/downloads/ - http://roy.aydogan.net/ - http://cflags.cc/roy/ + "http://roy.marples.name/downloads/" + "http://roy.aydogan.net/" + "http://cflags.cc/roy/" ]; # Sage mirrors (http://www.sagemath.org/mirrors.html) sageupstream = [ # Africa - http://sagemath.polytechnic.edu.na/spkg/upstream/ - ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/spkg/upstream/ - http://sagemath.mirror.ac.za/spkg/upstream/ - https://ftp.leg.uct.ac.za/pub/packages/sage/spkg/upstream/ - http://mirror.ufs.ac.za/sagemath/spkg/upstream/ + "http://sagemath.polytechnic.edu.na/spkg/upstream/" + "ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/spkg/upstream/" + "http://sagemath.mirror.ac.za/spkg/upstream/" + "https://ftp.leg.uct.ac.za/pub/packages/sage/spkg/upstream/" + "http://mirror.ufs.ac.za/sagemath/spkg/upstream/" # America, North - http://mirrors-usa.go-parts.com/sage/sagemath/spkg/upstream/ - http://mirrors.mit.edu/sage/spkg/upstream/ - http://www.cecm.sfu.ca/sage/spkg/upstream/ - http://files.sagemath.org/spkg/upstream/ - http://mirror.clibre.uqam.ca/sage/spkg/upstream/ - https://mirrors.xmission.com/sage/spkg/upstream/ + "http://mirrors-usa.go-parts.com/sage/sagemath/spkg/upstream/" + "http://mirrors.mit.edu/sage/spkg/upstream/" + "http://www.cecm.sfu.ca/sage/spkg/upstream/" + "http://files.sagemath.org/spkg/upstream/" + "http://mirror.clibre.uqam.ca/sage/spkg/upstream/" + "https://mirrors.xmission.com/sage/spkg/upstream/" # America, South - http://sagemath.c3sl.ufpr.br/spkg/upstream/ - http://linorg.usp.br/sage/spkg/upstream + "http://sagemath.c3sl.ufpr.br/spkg/upstream/" + "http://linorg.usp.br/sage/spkg/upstream" # Asia - http://sage.asis.io/spkg/upstream/ - http://mirror.hust.edu.cn/sagemath/spkg/upstream/ - https://ftp.iitm.ac.in/sage/spkg/upstream/ - http://ftp.kaist.ac.kr/sage/spkg/upstream/ - http://ftp.riken.jp/sagemath/spkg/upstream/ - https://mirrors.tuna.tsinghua.edu.cn/sagemath/spkg/upstream/ - https://mirrors.ustc.edu.cn/sagemath/spkg/upstream/ - http://ftp.tsukuba.wide.ad.jp/software/sage/spkg/upstream/ - http://ftp.yz.yamagata-u.ac.jp/pub/math/sage/spkg/upstream/ - https://mirror.yandex.ru/mirrors/sage.math.washington.edu/spkg/upstream/ + "http://sage.asis.io/spkg/upstream/" + "http://mirror.hust.edu.cn/sagemath/spkg/upstream/" + "https://ftp.iitm.ac.in/sage/spkg/upstream/" + "http://ftp.kaist.ac.kr/sage/spkg/upstream/" + "http://ftp.riken.jp/sagemath/spkg/upstream/" + "https://mirrors.tuna.tsinghua.edu.cn/sagemath/spkg/upstream/" + "https://mirrors.ustc.edu.cn/sagemath/spkg/upstream/" + "http://ftp.tsukuba.wide.ad.jp/software/sage/spkg/upstream/" + "http://ftp.yz.yamagata-u.ac.jp/pub/math/sage/spkg/upstream/" + "https://mirror.yandex.ru/mirrors/sage.math.washington.edu/spkg/upstream/" # Australia - http://echidna.maths.usyd.edu.au/sage/spkg/upstream/ + "http://echidna.maths.usyd.edu.au/sage/spkg/upstream/" # Europe - http://sage.mirror.garr.it/mirrors/sage/spkg/upstream/ - http://sunsite.rediris.es/mirror/sagemath/spkg/upstream/ - http://mirror.switch.ch/mirror/sagemath/spkg/upstream/ - http://mirrors.fe.up.pt/pub/sage/spkg/upstream/ - http://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream/ - http://ftp.ntua.gr/pub/sagemath/spkg/upstream/ + "http://sage.mirror.garr.it/mirrors/sage/spkg/upstream/" + "http://sunsite.rediris.es/mirror/sagemath/spkg/upstream/" + "http://mirror.switch.ch/mirror/sagemath/spkg/upstream/" + "http://mirrors.fe.up.pt/pub/sage/spkg/upstream/" + "http://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream/" + "http://ftp.ntua.gr/pub/sagemath/spkg/upstream/" ]; # MySQL mirrors mysql = [ - http://cdn.mysql.com/Downloads/ + "http://cdn.mysql.com/Downloads/" ]; # OpenBSD mirrors openbsd = [ - http://ftp.openbsd.org/pub/OpenBSD/ - ftp://ftp.nluug.nl/pub/OpenBSD/ - ftp://ftp-stud.fht-esslingen.de/pub/OpenBSD/ - ftp://ftp.halifax.rwth-aachen.de/pub/OpenBSD/ - ftp://mirror.switch.ch/pub/OpenBSD/ + "http://ftp.openbsd.org/pub/OpenBSD/" + "ftp://ftp.nluug.nl/pub/OpenBSD/" + "ftp://ftp-stud.fht-esslingen.de/pub/OpenBSD/" + "ftp://ftp.halifax.rwth-aachen.de/pub/OpenBSD/" + "ftp://mirror.switch.ch/pub/OpenBSD/" ]; # Steam Runtime mirrors steamrt = [ - http://repo.steampowered.com/steamrt/ - https://public.abbradar.moe/steamrt/ + "http://repo.steampowered.com/steamrt/" + "https://public.abbradar.moe/steamrt/" ]; # Python PyPI mirrors pypi = [ - https://files.pythonhosted.org/packages/source/ + "https://files.pythonhosted.org/packages/source/" # pypi.io is a more semantic link, but atm it’s referencing # files.pythonhosted.org over two redirects - https://pypi.io/packages/source/ + "https://pypi.io/packages/source/" ]; # Mozilla projects. mozilla = [ - http://download.cdn.mozilla.net/pub/mozilla.org/ - https://archive.mozilla.org/pub/ + "http://download.cdn.mozilla.net/pub/mozilla.org/" + "https://archive.mozilla.org/pub/" ]; # Maven Central maven = [ - https://repo1.maven.org/maven2/ - https://central.maven.org/maven2/ + "https://repo1.maven.org/maven2/" + "https://central.maven.org/maven2/" ]; # Alsa Project alsa = [ - https://www.alsa-project.org/files/pub/ - ftp://ftp.alsa-project.org/pub/ - http://alsa.cybermirror.org/ - http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/ - http://alsa.mirror.fr/ + "https://www.alsa-project.org/files/pub/" + "ftp://ftp.alsa-project.org/pub/" + "http://alsa.cybermirror.org/" + "http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/" + "http://alsa.mirror.fr/" ]; } diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index 435bbe89c1c48..b134effab8ac3 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -1,6 +1,6 @@ { stdenv, ocaml, findlib, dune, dune_2, opaline }: -{ pname, version, buildInputs ? [], ... }@args: +{ pname, version, buildInputs ? [], enableParallelBuilding ? true, ... }@args: let Dune = if args.useDune2 or false then dune_2 else dune; in @@ -11,14 +11,16 @@ else stdenv.mkDerivation ({ + inherit enableParallelBuilding; + buildPhase = '' runHook preBuild - dune build -p ${pname} + dune build -p ${pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} runHook postBuild ''; checkPhase = '' runHook preCheck - dune runtest -p ${pname} + dune runtest -p ${pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} runHook postCheck ''; installPhase = '' diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 9759235e30e37..d6d1cebb2e91b 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -16,6 +16,9 @@ ++ [crateFeatures] ++ extraRustcOpts ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--target ${rust.toRustTarget stdenv.hostPlatform} -C linker=${stdenv.hostPlatform.config}-gcc" + # since rustc 1.42 the "proc_macro" crate is part of the default crate prelude + # https://github.com/rust-lang/cargo/commit/4d64eb99a4#diff-7f98585dbf9d30aa100c8318e2c77e79R1021-R1022 + ++ lib.optional (lib.elem "proc-macro" crateType) "--extern proc_macro" ; rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index a175ba9d7f6e0..d9ed26f1d94a7 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -13,14 +13,30 @@ let then "macos" else stdenv.hostPlatform.parsed.kernel.name; - # Create rustc arguments to link against the given list of dependencies and - # renames + # Create rustc arguments to link against the given list of dependencies + # and renames. + # + # See docs for crateRenames below. mkRustcDepArgs = dependencies: crateRenames: lib.concatMapStringsSep " " (dep: let - extern = lib.replaceStrings ["-"] ["_"] dep.libName; + normalizeName = lib.replaceStrings ["-"] ["_"]; + extern = normalizeName dep.libName; + # Find a choice that matches in name and optionally version. + findMatchOrUseExtern = choices: + lib.findFirst (choice: + (!(choice ? version) + || choice.version == dep.version or "")) + { rename = extern; } + choices; name = if lib.hasAttr dep.crateName crateRenames then - lib.strings.replaceStrings ["-"] ["_"] crateRenames.${dep.crateName} + let choices = crateRenames.${dep.crateName}; + in + normalizeName ( + if builtins.isList choices + then (findMatchOrUseExtern choices).rename + else choices + ) else extern; in (if lib.any (x: x == "lib" || x == "rlib") dep.crateType then @@ -42,11 +58,128 @@ let installCrate = import ./install-crate.nix { inherit stdenv; }; in -crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, crateOverrides, - dependencies, buildDependencies, crateRenames, - extraRustcOpts, buildTests, - preUnpack, postUnpack, prePatch, patches, postPatch, - preConfigure, postConfigure, preBuild, postBuild, preInstall, postInstall }: +/* The overridable pkgs.buildRustCrate function. + * + * Any unrecognized parameters will be passed as to + * the underlying stdenv.mkDerivation. + */ + crate_: lib.makeOverridable ( + # The rust compiler to use. + # + # Default: pkgs.rustc + { rust + # Whether to build a release version (`true`) or a debug + # version (`false`). Debug versions are faster to build + # but might be much slower at runtime. + , release + # Whether to print rustc invocations etc. + # + # Example: false + # Default: true + , verbose + # A list of rust/cargo features to enable while building the crate. + # Example: [ "std" "async" ] + , features + # Additional build inputs for building this crate. + # + # Example: [ pkgs.openssl ] + , buildInputs + # Allows to override the parameters to buildRustCrate + # for any rust dependency in the transitive build tree. + # + # Default: pkgs.defaultCrateOverrides + # + # Example: + # + # pkgs.defaultCrateOverrides // { + # hello = attrs: { buildInputs = [ openssl ]; }; + # } + , crateOverrides + # Rust library dependencies, i.e. other libaries that were built + # with buildRustCrate. + , dependencies + # Rust build dependencies, i.e. other libaries that were built + # with buildRustCrate and are used by a build script. + , buildDependencies + # Specify the "extern" name of a library if it differs from the library target. + # See above for an extended explanation. + # + # Default: no renames. + # + # Example: + # + # `crateRenames` supports two formats. + # + # The simple version is an attrset that maps the + # `crateName`s of the dependencies to their alternative + # names. + # + # ```nix + # { + # my_crate_name = "my_alternative_name"; + # # ... + # } + # ``` + # + # The extended version is also keyed by the `crateName`s but allows + # different names for different crate versions: + # + # ```nix + # { + # my_crate_name = [ + # { version = "1.2.3"; rename = "my_alternative_name01"; } + # { version = "3.2.3"; rename = "my_alternative_name03"; } + # ] + # # ... + # } + # ``` + # + # This roughly corresponds to the following snippet in Cargo.toml: + # + # ```toml + # [dependencies] + # my_alternative_name01 = { package = "my_crate_name", version = "0.1" } + # my_alternative_name03 = { package = "my_crate_name", version = "0.3" } + # ``` + # + # Dependencies which use the lib target name as extern name, do not need + # to be specified in the crateRenames, even if their crate name differs. + # + # Including multiple versions of a crate is very popular during + # ecosystem transitions, e.g. from futures 0.1 to futures 0.3. + , crateRenames + # A list of extra options to pass to rustc. + # + # Example: [ "-Z debuginfo=2" ] + # Default: [] + , extraRustcOpts + # Whether to enable building tests. + # Use true to enable. + # Default: false + , buildTests + # Passed to stdenv.mkDerivation. + , preUnpack + # Passed to stdenv.mkDerivation. + , postUnpack + # Passed to stdenv.mkDerivation. + , prePatch + # Passed to stdenv.mkDerivation. + , patches + # Passed to stdenv.mkDerivation. + , postPatch + # Passed to stdenv.mkDerivation. + , preConfigure + # Passed to stdenv.mkDerivation. + , postConfigure + # Passed to stdenv.mkDerivation. + , preBuild + # Passed to stdenv.mkDerivation. + , postBuild + # Passed to stdenv.mkDerivation. + , preInstall + # Passed to stdenv.mkDerivation. + , postInstall + }: let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverrides crate_); dependencies_ = dependencies; @@ -88,6 +221,7 @@ stdenv.mkDerivation (rec { src = crate.src or (fetchCrate { inherit (crate) crateName version sha256; }); name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}"; + version = crate.version; depsBuildBuild = [ rust stdenv.cc cargo jq ]; buildInputs = (crate.buildInputs or []) ++ buildInputs_; dependencies = map lib.getLib dependencies_; diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index fba938f623727..5597e4b0dd66a 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -197,6 +197,51 @@ let dependencies = [ (mkCrate { crateName = "foo"; libName = "foolib"; src = mkLib "src/lib.rs"; }) ]; crateRenames = { "foo" = "foo_renamed"; }; }; + crateBinRenameMultiVersion = let + crateWithVersion = version: mkCrate { + crateName = "my_lib"; + inherit version; + src = mkFile "src/lib.rs" '' + pub const version: &str = "${version}"; + ''; + }; + depCrate01 = crateWithVersion "0.1.2"; + depCrate02 = crateWithVersion "0.2.1"; + in { + crateName = "my_bin"; + src = symlinkJoin { + name = "my_bin_src"; + paths = [ + (mkFile "src/main.rs" '' + #[test] + fn my_lib_01() { assert_eq!(lib01::version, "0.1.2"); } + + #[test] + fn my_lib_02() { assert_eq!(lib02::version, "0.2.1"); } + + fn main() { } + '') + ]; + }; + dependencies = [ depCrate01 depCrate02 ]; + crateRenames = { + "my_lib" = [ + { + version = "0.1.2"; + rename = "lib01"; + } + { + version = "0.2.1"; + rename = "lib02"; + } + ]; + }; + buildTests = true; + expectedTestOutputs = [ + "test my_lib_01 ... ok" + "test my_lib_02 ... ok" + ]; + }; rustLibTestsDefault = { src = mkTestFile "src/lib.rs" "baz"; buildTests = true; @@ -412,6 +457,18 @@ let "test ignore_main ... ok" ]; }; + procMacroInPrelude = { + procMacro = true; + edition = "2018"; + src = symlinkJoin { + name = "proc-macro-in-prelude"; + paths = [ + (mkFile "src/lib.rs" '' + use proc_macro::TokenTree; + '') + ]; + }; + }; }; brotliCrates = (callPackage ./brotli-crates.nix {}); tests = lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases; diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 93770d71a10db..a6b47930c2740 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,4 +1,14 @@ -{ stdenv, cacert, git, rust, cargo, rustc, fetchCargoTarball, buildPackages, windows }: +{ stdenv +, buildPackages +, cacert +, cargo +, diffutils +, fetchCargoTarball +, git +, rust +, rustc +, windows +}: { name ? "${args.pname}-${args.version}" , cargoSha256 ? "unset" @@ -58,6 +68,10 @@ let cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; releaseDir = "target/${rustTarget}/${buildType}"; + # Specify the stdenv's `diff` by abspath to ensure that the user's build + # inputs do not cause us to find the wrong `diff`. + diff = "${diffutils}/bin/diff"; + in stdenv.mkDerivation (args // { @@ -110,7 +124,7 @@ stdenv.mkDerivation (args // { srcLockfile=$NIX_BUILD_TOP/$sourceRoot/Cargo.lock echo "Validating consistency between $srcLockfile and $cargoDepsLockfile" - if ! diff $srcLockfile $cargoDepsLockfile; then + if ! ${diff} $srcLockfile $cargoDepsLockfile; then # If the diff failed, first double-check that the file exists, so we can # give a friendlier error msg. diff --git a/pkgs/build-support/setup-hooks/audit-blas.sh b/pkgs/build-support/setup-hooks/audit-blas.sh new file mode 100644 index 0000000000000..6a40073fb2345 --- /dev/null +++ b/pkgs/build-support/setup-hooks/audit-blas.sh @@ -0,0 +1,37 @@ +# Ensure that we are always linking against “libblas.so.3” and +# “liblapack.so.3”. + +auditBlas() { + local dir="$prefix" + [ -e "$dir" ] || return 0 + + local i + while IFS= read -r -d $'\0' i; do + if ! isELF "$i"; then continue; fi + + if $OBJDUMP -p "$i" | grep 'NEEDED' | awk '{ print $2; }' | grep -q '\(libmkl_rt.so\|libopenblas.so.0\)'; then + echo "$i refers to a specific implementation of BLAS or LAPACK." + echo "This prevents users from switching BLAS/LAPACK implementations." + echo "Add \`blas' or \`lapack' to buildInputs instead of \`mkl' or \`openblas'." + exit 1 + fi + + (IFS=: + for dir in "$(patchelf --print-rpath "$i")"; do + if [ -f "$dir/libblas.so.3" ] || [ -f "$dir/libblas.so" ]; then + if [ "$dir" != "@blas@/lib" ]; then + echo "$dir is not allowed to contain a library named libblas.so.3" + exit 1 + fi + fi + if [ -f "$dir/liblapack.so.3" ] || [ -f "$dir/liblapack.so" ]; then + if [ "$dir" != "@lapack@/lib" ]; then + echo "$dir is not allowed to contain a library named liblapack.so.3" + exit 1 + fi + fi + done) + done < <(find "$dir" -type f -print0) +} + +fixupOutputHooks+=(auditBlas) diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 52c50091d08cb..72970623ed796 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -15,7 +15,7 @@ isExecutable() { # *or* there is an INTERP section. This also catches position-independent # executables, as they typically have an INTERP section but their ELF type # is DYN. - isExeResult="$(LANG=C readelf -h -l "$1" 2> /dev/null \ + isExeResult="$(LANG=C $READELF -h -l "$1" 2> /dev/null \ | grep '^ *Type: *EXEC\>\|^ *INTERP\>')" # not using grep -q, because it can cause Broken pipe [ -n "$isExeResult" ] @@ -207,7 +207,7 @@ autoPatchelf() { # outside of this function. while IFS= read -r -d $'\0' file; do isELF "$file" || continue - segmentHeaders="$(LANG=C readelf -l "$file")" + segmentHeaders="$(LANG=C $READELF -l "$file")" # Skip if the ELF file doesn't have segment headers (eg. object files). # not using grep -q, because it can cause Broken pipe [ -n "$(echo "$segmentHeaders" | grep '^Program Headers:')" ] || continue diff --git a/pkgs/build-support/skaware/clean-packaging.nix b/pkgs/build-support/skaware/clean-packaging.nix index 16bae04b21e2e..762fe25c0acf0 100644 --- a/pkgs/build-support/skaware/clean-packaging.nix +++ b/pkgs/build-support/skaware/clean-packaging.nix @@ -26,11 +26,11 @@ let writeScript "common-file-actions.sh" '' #!${stdenv.shell} set -e - DOCDIR="$1" + DOCDIR="''${1?commonFileActions: DOCDIR as argv[1] required}" shopt -s globstar extglob nullglob - ${rmNoise noiseFiles} mkdir -p "$DOCDIR" ${mvDoc docFiles} + ${rmNoise noiseFiles} ''; # Shell script to check whether the build directory is empty. diff --git a/pkgs/build-support/src-only/default.nix b/pkgs/build-support/src-only/default.nix index c2f7cfb93998d..c721fdf40c69a 100644 --- a/pkgs/build-support/src-only/default.nix +++ b/pkgs/build-support/src-only/default.nix @@ -1,6 +1,31 @@ -{ stdenv, name, src, patches ? [], buildInputs ? [] }: +{ stdenv }@orig: +# srcOnly is a utility builder that only fetches and unpacks the given `src`, +# maybe pathings it in the process with the optional `patches` and +# `buildInputs` attributes. +# +# It can be invoked directly, or be used to wrap an existing derivation. Eg: +# +# > srcOnly pkgs.hello +# +{ name +, src +, stdenv ? orig.stdenv +, patches ? [] +, # deprecated, use the nativeBuildInputs + buildInputs ? [] +, # used to pass extra unpackers + nativeBuildInputs ? [] +, # needed when passing an existing derivation + ... +}: stdenv.mkDerivation { - inherit src buildInputs patches name; + inherit + buildInputs + name + nativeBuildInputs + patches + src + ; installPhase = "cp -r . $out"; phases = ["unpackPhase" "patchPhase" "installPhase"]; } diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index c67f5845135b3..3c81a4ece657e 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -4,7 +4,8 @@ let runCommand' = runLocal: stdenv: name: env: buildCommand: stdenv.mkDerivation ({ - inherit name buildCommand; + name = lib.strings.sanitizeDerivationName name; + inherit buildCommand; passAsFile = [ "buildCommand" ]; } // (lib.optionalAttrs runLocal { diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 487a91145c516..f86e337138407 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -831,15 +831,15 @@ rec { fullName = "Ubuntu 12.04 Precise (i386)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/precise/main/binary-i386/Packages.bz2; + url = "mirror://ubuntu/dists/precise/main/binary-i386/Packages.bz2"; sha256 = "18ns9h4qhvjfcip9z55grzi371racxavgqkp6b5kfkdq2wwwax2d"; }) (fetchurl { - url = mirror://ubuntu/dists/precise/universe/binary-i386/Packages.bz2; + url = "mirror://ubuntu/dists/precise/universe/binary-i386/Packages.bz2"; sha256 = "085lkzbnzkc74kfdmwdc32sfqyfz8dr0rbiifk8kx9jih3xjw2jk"; }) ]; - urlPrefix = mirror://ubuntu; + urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" ]; }; @@ -848,15 +848,15 @@ rec { fullName = "Ubuntu 12.04 Precise (amd64)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/precise/main/binary-amd64/Packages.bz2; + url = "mirror://ubuntu/dists/precise/main/binary-amd64/Packages.bz2"; sha256 = "1aabpn0hdih6cbabyn87yvhccqj44q9k03mqmjsb920iqlckl3fc"; }) (fetchurl { - url = mirror://ubuntu/dists/precise/universe/binary-amd64/Packages.bz2; + url = "mirror://ubuntu/dists/precise/universe/binary-amd64/Packages.bz2"; sha256 = "0x4hz5aplximgb7gnpvrhkw8m7a40s80rkm5b8hil0afblwlg4vr"; }) ]; - urlPrefix = mirror://ubuntu; + urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" ]; }; @@ -865,15 +865,15 @@ rec { fullName = "Ubuntu 14.04 Trusty (i386)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/trusty/main/binary-i386/Packages.bz2; + url = "mirror://ubuntu/dists/trusty/main/binary-i386/Packages.bz2"; sha256 = "1d5y3v3v079gdq45hc07ja0bjlmzqfwdwwlq0brwxi8m75k3iz7x"; }) (fetchurl { - url = mirror://ubuntu/dists/trusty/universe/binary-i386/Packages.bz2; + url = "mirror://ubuntu/dists/trusty/universe/binary-i386/Packages.bz2"; sha256 = "03x9w92by320rfklrqhcl3qpwmnxds9c8ijl5zhcb21d6dcz5z1a"; }) ]; - urlPrefix = mirror://ubuntu; + urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; @@ -882,15 +882,15 @@ rec { fullName = "Ubuntu 14.04 Trusty (amd64)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/trusty/main/binary-amd64/Packages.bz2; + url = "mirror://ubuntu/dists/trusty/main/binary-amd64/Packages.bz2"; sha256 = "1hhzbyqfr5i0swahwnl5gfp5l9p9hspywb1vpihr3b74p1z935bh"; }) (fetchurl { - url = mirror://ubuntu/dists/trusty/universe/binary-amd64/Packages.bz2; + url = "mirror://ubuntu/dists/trusty/universe/binary-amd64/Packages.bz2"; sha256 = "04560ba8s4z4v5iawknagrkn9q1nzvpn081ycmqvhh73p3p3g1jm"; }) ]; - urlPrefix = mirror://ubuntu; + urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; @@ -899,15 +899,15 @@ rec { fullName = "Ubuntu 16.04 Xenial (i386)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/xenial/main/binary-i386/Packages.xz; + url = "mirror://ubuntu/dists/xenial/main/binary-i386/Packages.xz"; sha256 = "13r75sp4slqy8w32y5dnr7pp7p3cfvavyr1g7gwnlkyrq4zx4ahy"; }) (fetchurl { - url = mirror://ubuntu/dists/xenial/universe/binary-i386/Packages.xz; + url = "mirror://ubuntu/dists/xenial/universe/binary-i386/Packages.xz"; sha256 = "14fid1rqm3sc0wlygcvn0yx5aljf51c2jpd4x0zxij4019316hsh"; }) ]; - urlPrefix = mirror://ubuntu; + urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; @@ -916,15 +916,15 @@ rec { fullName = "Ubuntu 16.04 Xenial (amd64)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/xenial/main/binary-amd64/Packages.xz; + url = "mirror://ubuntu/dists/xenial/main/binary-amd64/Packages.xz"; sha256 = "110qnkhjkkwm316fbig3aivm2595ydz6zskc4ld5cr8ngcrqm1bn"; }) (fetchurl { - url = mirror://ubuntu/dists/xenial/universe/binary-amd64/Packages.xz; + url = "mirror://ubuntu/dists/xenial/universe/binary-amd64/Packages.xz"; sha256 = "0mm7gj491yi6q4v0n4qkbsm94s59bvqir6fk60j73w7y4la8rg68"; }) ]; - urlPrefix = mirror://ubuntu; + urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; @@ -933,15 +933,15 @@ rec { fullName = "Ubuntu 17.10 Artful (i386)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/artful/main/binary-i386/Packages.xz; + url = "mirror://ubuntu/dists/artful/main/binary-i386/Packages.xz"; sha256 = "18yrj4kqdzm39q0527m97h5ing58hkm9yq9iyj636zh2rclym3c8"; }) (fetchurl { - url = mirror://ubuntu/dists/artful/universe/binary-i386/Packages.xz; + url = "mirror://ubuntu/dists/artful/universe/binary-i386/Packages.xz"; sha256 = "1v0njw2w80xfmxi7by76cs8hyxlla5h3gqajlpdw5srjgx2qrm2g"; }) ]; - urlPrefix = mirror://ubuntu; + urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; @@ -950,15 +950,15 @@ rec { fullName = "Ubuntu 17.10 Artful (amd64)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/artful/main/binary-amd64/Packages.xz; + url = "mirror://ubuntu/dists/artful/main/binary-amd64/Packages.xz"; sha256 = "104g57j1l3vi8wb5f7rgjvjhf82ccs0vwhc59jfc4ynd51z7fqjk"; }) (fetchurl { - url = mirror://ubuntu/dists/artful/universe/binary-amd64/Packages.xz; + url = "mirror://ubuntu/dists/artful/universe/binary-amd64/Packages.xz"; sha256 = "1qzs95wfy9inaskfx9cf1l5yd3aaqwzy72zzi9xyvkxi75k5gcn4"; }) ]; - urlPrefix = mirror://ubuntu; + urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; @@ -967,15 +967,15 @@ rec { fullName = "Ubuntu 18.04 Bionic (i386)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/bionic/main/binary-i386/Packages.xz; + url = "mirror://ubuntu/dists/bionic/main/binary-i386/Packages.xz"; sha256 = "0f0v4131kwf7m7f8j3288rlqdxk1k3vqy74b7fcfd6jz9j8d840i"; }) (fetchurl { - url = mirror://ubuntu/dists/bionic/universe/binary-i386/Packages.xz; + url = "mirror://ubuntu/dists/bionic/universe/binary-i386/Packages.xz"; sha256 = "1v75c0dqr0wp0dqd4hnci92qqs4hll8frqdbpswadgxm5chn91bw"; }) ]; - urlPrefix = mirror://ubuntu; + urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; @@ -984,15 +984,15 @@ rec { fullName = "Ubuntu 18.04 Bionic (amd64)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/bionic/main/binary-amd64/Packages.xz; + url = "mirror://ubuntu/dists/bionic/main/binary-amd64/Packages.xz"; sha256 = "1ls81bjyvmfz6i919kszl7xks1ibrh1xqhsk6698ackndkm0wp39"; }) (fetchurl { - url = mirror://ubuntu/dists/bionic/universe/binary-amd64/Packages.xz; + url = "mirror://ubuntu/dists/bionic/universe/binary-amd64/Packages.xz"; sha256 = "1832nqpn4ap95b3sj870xqayrza9in4kih9jkmjax27pq6x15v1r"; }) ]; - urlPrefix = mirror://ubuntu; + urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; @@ -1000,10 +1000,10 @@ rec { name = "debian-8.11-jessie-i386"; fullName = "Debian 8.11 Jessie (i386)"; packagesList = fetchurl { - url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; + url = "mirror://debian/dists/jessie/main/binary-i386/Packages.xz"; sha256 = "0adblarhx50yga900il6m25ng0csa81i3wid1dxxmydbdmri7v7d"; }; - urlPrefix = mirror://debian; + urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; @@ -1011,10 +1011,10 @@ rec { name = "debian-8.11-jessie-amd64"; fullName = "Debian 8.11 Jessie (amd64)"; packagesList = fetchurl { - url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; + url = "mirror://debian/dists/jessie/main/binary-amd64/Packages.xz"; sha256 = "09y1mv4kqllhxpk1ibjsyl5jig5bp0qxw6pp4sn56rglrpygmn5x"; }; - urlPrefix = mirror://debian; + urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; @@ -1022,10 +1022,10 @@ rec { name = "debian-9.8-stretch-i386"; fullName = "Debian 9.8 Stretch (i386)"; packagesList = fetchurl { - url = http://snapshot.debian.org/archive/debian/20200301T030401Z/dists/stretch/main/binary-i386/Packages.xz; + url = "http://snapshot.debian.org/archive/debian/20200301T030401Z/dists/stretch/main/binary-i386/Packages.xz"; sha256 = "1jglr1d1jys3xddp8f7w9j05db39fah8xy4gfkpqbd1b5d2caslz"; }; - urlPrefix = mirror://debian; + urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; @@ -1033,10 +1033,10 @@ rec { name = "debian-9.8-stretch-amd64"; fullName = "Debian 9.8 Stretch (amd64)"; packagesList = fetchurl { - url = http://snapshot.debian.org/archive/debian/20190503T090946Z/dists/stretch/main/binary-amd64/Packages.xz; + url = "http://snapshot.debian.org/archive/debian/20190503T090946Z/dists/stretch/main/binary-amd64/Packages.xz"; sha256 = "01q00nl47p12n7wx0xclx59wf3zlkzrgj3zxpshyvb91xdnw5sh6"; }; - urlPrefix = mirror://debian; + urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; diff --git a/pkgs/common-updater/generic-updater.nix b/pkgs/common-updater/generic-updater.nix new file mode 100644 index 0000000000000..8483f9bbd1de1 --- /dev/null +++ b/pkgs/common-updater/generic-updater.nix @@ -0,0 +1,108 @@ +{ stdenv, writeScript, coreutils, gnugrep, gnused, common-updater-scripts, nix }: + +{ pname +, version +, attrPath ? pname +, versionLister +, ignoredVersions ? "" +, rev-prefix ? "" +, odd-unstable ? false +, patchlevel-unstable ? false +}: + +let + # where to print git commands and debugging messages + fileForGitCommands = "update-git-commits.txt"; + + # shell script to update package + updateScript = writeScript "update-script.sh" '' + #! ${stdenv.shell} + set -o errexit + set -x + + pname="$1" + version="$2" + attr_path="$3" + version_lister="$4" + ignored_versions="$5" + rev_prefix="$6" + odd_unstable="$7" + patchlevel_unstable="$8" + + # print header + echo "# $pname-$version" >> ${fileForGitCommands} + + function version_is_ignored() { + local tag="$1" + [ -n "$ignored_versions" ] && grep -E "$ignored_versions" <<< "$tag" + } + + function version_is_unstable() { + local tag="$1" + local enforce="$2" + if [ -n "$odd_unstable" -o -n "$enforce" ]; then + local minor=$(echo "$tag" | ${gnused}/bin/sed -rne 's,^[0-9]+\.([0-9]+).*,\1,p') + if [ $((minor % 2)) -eq 1 ]; then + return 0 + fi + fi + if [ -n "$patchlevel_unstable" -o -n "$enforce" ]; then + local patchlevel=$(echo "$tag" | ${gnused}/bin/sed -rne 's,^[0-9]+\.[0-9]+\.([0-9]+).*$,\1,p') + if ((patchlevel >= 90)); then + return 0 + fi + fi + return 1 + } + + tags=$($version_lister $pname ${fileForGitCommands}) || exit 1 + + # print available tags + for tag in $tags; do + echo "# found $pname version: $tag" >> ${fileForGitCommands} + done + + # cut any revision prefix not used in the NixOS package version + if [ -n "$rev_prefix" ]; then + tags=$(echo "$tags" | ${gnugrep}/bin/grep "^$rev_prefix") + tags=$(echo "$tags" | ${gnused}/bin/sed -e "s,^$rev_prefix,,") + fi + tags=$(echo "$tags" | ${gnugrep}/bin/grep "^[0-9]") + + # sort the tags in decreasing order + tags=$(echo "$tags" | ${coreutils}/bin/sort --reverse --version-sort) + + # find the newest tag + # do not consider development versions + for latest_tag in $tags; do + if version_is_ignored "$latest_tag"; then + echo "# skip ignored version: $pname-$latest_tag" >> ${fileForGitCommands} + latest_tag= + elif version_is_unstable "$latest_tag"; then + echo "# skip development version: $pname-$latest_tag" >> ${fileForGitCommands} + latest_tag= + else + if version_is_unstable "$latest_tag" "enforce"; then + echo "# use potential development version: $pname-$latest_tag" >> ${fileForGitCommands} + fi + break + fi + done + + if [ -n "$latest_tag" ]; then + # print commands to commit the changes + if [ "$version" != "$latest_tag" ]; then + pfile=$(EDITOR=echo ${nix}/bin/nix edit -f. "$attr_path") + echo " git add $pfile " >> ${fileForGitCommands} + echo " git commit -m '$attr_path: $version -> $latest_tag'" >> ${fileForGitCommands} + fi + + # update the nix expression + ${common-updater-scripts}/bin/update-source-version "$attr_path" "$latest_tag" + fi + + echo "" >> ${fileForGitCommands} + ''; + +in +[ updateScript pname version attrPath versionLister ignoredVersions rev-prefix odd-unstable patchlevel-unstable ] diff --git a/pkgs/common-updater/scripts.nix b/pkgs/common-updater/scripts.nix index ec897914b6bdd..739f44387b31a 100644 --- a/pkgs/common-updater/scripts.nix +++ b/pkgs/common-updater/scripts.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, coreutils, gnused, gnugrep, diffutils, nix }: +{ stdenv, makeWrapper, coreutils, gnused, gnugrep, diffutils, nix, git, jq }: stdenv.mkDerivation { name = "common-updater-scripts"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { cp ${./scripts}/* $out/bin for f in $out/bin/*; do - wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnused gnugrep nix diffutils ]} + wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnused gnugrep nix diffutils git jq ]} done ''; } diff --git a/pkgs/common-updater/scripts/list-archive-two-level-versions b/pkgs/common-updater/scripts/list-archive-two-level-versions new file mode 100755 index 0000000000000..e46652820ad2b --- /dev/null +++ b/pkgs/common-updater/scripts/list-archive-two-level-versions @@ -0,0 +1,35 @@ +#! /bin/sh + +# lists all available versions listed for a package in a site (http) + +scriptName=list-archive-two-level-versions # do not use the .wrapped name + +usage() { + echo "Usage: $scriptName <archive url> [<package name> [<debug file path>]]" +} + +archive="$1" # archive url +pname="$2" # package name +file="$3" # file for writing debugging information + +if [ -z "$archive" ]; then + echo "$scriptName: Missing archive url" + usage + exit 1 +fi + +# print a debugging message +if [ -n "$file" ]; then + echo "# Listing versions for $pname at $archive" >> $file +fi + +# list all major-minor versions from archive +tags1=$(curl -sS "$archive/") +tags1=$(echo "$tags1" | sed -rne 's,^<a href="([0-9]+\.[0-9]+)/">.*,\1,p') + +# print available versions +for tag in $tags1; do + tags2=$(curl -sS "$archive/$tag/") + tags2=$(echo "$tags2" | sed -rne "s,^<a href=\"$pname-([0-9.]+)\\.[^0-9].*\">.*,\\1,p") + echo "$tags2" +done diff --git a/pkgs/common-updater/scripts/list-git-tags b/pkgs/common-updater/scripts/list-git-tags new file mode 100755 index 0000000000000..ff09671c7cb0a --- /dev/null +++ b/pkgs/common-updater/scripts/list-git-tags @@ -0,0 +1,32 @@ +#! /bin/sh -x + +# lists all available tags from a git repository + +scriptName=list-git-tags # do not use the .wrapped name + +usage() { + echo "Usage: $scriptName <repository url> [<package name> [<debug file path>]]" +} + +repo="$1" # git repository url +pname="$2" # package name +file="$3" # file for writing debugging information + +if [ -z "$repo" ]; then + echo "$scriptName: Missing git repository url" + usage + exit 1 +fi + +# print a debugging message +if [ -n "$file" ]; then + echo "# Listing tags for $pname at $repo" >> $file +fi + +# list all tags from the remote repository +tags=$(git ls-remote --tags --refs "$repo") + +# keep only the version part of the tag +tags=$(echo "$tags" | cut --delimiter=/ --field=3) + +echo "$tags" diff --git a/pkgs/common-updater/scripts/mark-broken b/pkgs/common-updater/scripts/mark-broken new file mode 100755 index 0000000000000..d128d0d458ba7 --- /dev/null +++ b/pkgs/common-updater/scripts/mark-broken @@ -0,0 +1,86 @@ +#!/usr/bin/env bash +set -e + +scriptName=mark-broken # do not use the .wrapped name + +die() { + echo "$scriptName: error: $1" >&2 + exit 1 +} + +usage() { + echo "Usage: $scriptName <attr> [--new-value=<new-value>]" +} + +args=() + +for arg in "$@"; do + case $arg in + --new-value=*) + newValue="${arg#*=}" + ;; + --help) + usage + exit 0 + ;; + --*) + echo "$scriptName: Unknown argument: $arg" + usage + exit 1 + ;; + *) + args["${#args[*]}"]=$arg + ;; + esac +done + +attr=${args[0]} + +if (( "${#args[*]}" < 1 )); then + echo "$scriptName: Too few arguments" + usage + exit 1 +fi + +if (( "${#args[*]}" > 1 )); then + echo "$scriptName: Too many arguments" + usage + exit 1 +fi + +if [ -z $newValue ]; then + newValue="true" +fi + +nixFile=$(nix-instantiate --eval --json -E "with import ./. {}; (builtins.unsafeGetAttrPos \"description\" $attr.meta).file" | jq -r .) +if [[ ! -f "$nixFile" ]]; then + die "Couldn't evaluate 'builtins.unsafeGetAttrPos \"description\" $attr.meta' to locate the .nix file!" +fi + +# Insert broken attribute +sed -i.bak "$nixFile" -r \ + -e "/^\s*broken\s*=.*$/d" \ + -e "s/(\s*)meta\s*=.*\{/&\n\1 broken = $newValue;/" + +if cmp -s "$nixFile" "$nixFile.bak"; then + mv "$nixFile.bak" "$nixFile" + die "Failed to mark the package as broken! Does it have a meta attribute?" +fi + +if [[ "$newValue" == "true" ]]; then + # broken should evaluate to true in any case now + markedSuccessfully=$(nix-instantiate --eval -E "with import ./. {}; $attr.meta.broken" || true) + if [[ ! "$markedSuccessfully" == "true" ]]; then + mv "$nixFile.bak" "$nixFile" + die "Couldn't verify the broken attribute to be set correctly, restoring backup!" + fi +else + # we can not check if broken evaluates to the correct value, but we can check that it does evaluate + if ! nix-instantiate --eval -E "with import ./. {}; $attr.meta.broken" >/dev/null; then + mv "$nixFile.bak" "$nixFile" + die "Couldn't verify the broken attribute to be set correctly, restoring backup!" + fi +fi + +rm -f "$nixFile.bak" +rm -f "$attr.fetchlog" diff --git a/pkgs/data/documentation/bgnet/default.nix b/pkgs/data/documentation/bgnet/default.nix index 7297d18df277e..f5ac07f1b7fef 100644 --- a/pkgs/data/documentation/bgnet/default.nix +++ b/pkgs/data/documentation/bgnet/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "3.0.21"; src = fetchurl { - url = https://beej.us/guide/bgnet/bgnet.tgz; + url = "https://beej.us/guide/bgnet/bgnet.tgz"; sha256 = "00ggr5prc5i3w9gaaw2sadfq6haq7lmh0vdilaxx8xz9z5znxvyv"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Beej’s Guide to Network Programming"; - homepage = https://beej.us/guide/bgnet/; + homepage = "https://beej.us/guide/bgnet/"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ Profpatsch ]; diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index 07381a13e8008..294f210c21ff6 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0vnwya5g7fg0jhdrg9drxnx83lhk8qa2nvcrmd1sdfanlz4qfhjf"; + sha256 = "0n4rbrq5zww6gjjmicyw5hlvzi8azc6m4sisak15snkp6v4f93qr"; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "User and system administration help for the GNOME desktop"; homepage = "https://help.gnome.org/users/gnome-help/"; license = licenses.cc-by-30; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/data/documentation/man-pages-posix/default.nix b/pkgs/data/documentation/man-pages-posix/default.nix index b45edf7947ba3..8a76bcb2c4486 100644 --- a/pkgs/data/documentation/man-pages-posix/default.nix +++ b/pkgs/data/documentation/man-pages-posix/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "POSIX man-pages (0p, 1p, 3p)"; - homepage = https://www.kernel.org/doc/man-pages/; + homepage = "https://www.kernel.org/doc/man-pages/"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index c57526d307a7b..a9a64fb40299e 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "man-pages"; - version = "5.05"; + version = "5.06"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz"; - sha256 = "0izb6shcczvg37cyd3kzxsfsrffqj1qw9nqhhq9mi4kd36qkbcfm"; + sha256 = "0l7ypgl36jswa077qvdh1rcsvnwr64vja6cc32bab86sm41akf3h"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux development manual pages"; - homepage = https://www.kernel.org/doc/man-pages/; - repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages; + homepage = "https://www.kernel.org/doc/man-pages/"; + repositories.git = "http://git.kernel.org/pub/scm/docs/man-pages/man-pages"; license = licenses.gpl2Plus; platforms = with platforms; unix; priority = 30; # if a package comes with its own man page, prefer it diff --git a/pkgs/data/documentation/mustache-spec/default.nix b/pkgs/data/documentation/mustache-spec/default.nix index b2a6eaa153528..ce611c192f669 100644 --- a/pkgs/data/documentation/mustache-spec/default.nix +++ b/pkgs/data/documentation/mustache-spec/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { For a list of implementations and tips, see ${homepage}. ''; - homepage = http://mustache.github.io/; + homepage = "http://mustache.github.io/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ Profpatsch ]; platforms = lib.platforms.all; diff --git a/pkgs/data/documentation/rnrs/common.nix b/pkgs/data/documentation/rnrs/common.nix index bd38389eb47e0..3443846c83cc3 100644 --- a/pkgs/data/documentation/rnrs/common.nix +++ b/pkgs/data/documentation/rnrs/common.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { Algorithmic Language Scheme. ''; - homepage = http://swiss.csail.mit.edu/~jaffer/Scheme; + homepage = "http://swiss.csail.mit.edu/~jaffer/Scheme"; broken = true; }; diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/data/documentation/scheme-manpages/default.nix new file mode 100644 index 0000000000000..0d57b8e261ca3 --- /dev/null +++ b/pkgs/data/documentation/scheme-manpages/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "scheme-manpages-unstable"; + version = "2020-05-17"; + + src = fetchFromGitHub { + owner = "schemedoc"; + repo = "scheme-manpages"; + rev = "e97bd240d398e4e5ffc62305e506a2f2428322a4"; + sha256 = "0c0n3mvghm9c2id8rxfd829plb64nf57jkqgmxf83w7x9jczbqqb"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/man + cp -r man3/ man7/ $out/share/man/ + ''; + + meta = with stdenv.lib; { + description = "Manpages for Scheme"; + homepage = "https://github.com/schemedoc/scheme-manpages"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix index b3b2b956de872..a2f9f005eb933 100644 --- a/pkgs/data/documentation/std-man-pages/default.nix +++ b/pkgs/data/documentation/std-man-pages/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "std-man-pages-4.4.0"; src = fetchurl { - url = mirror://gcc/libstdc++/doxygen/libstdc++-man.4.4.0.tar.bz2; + url = "mirror://gcc/libstdc++/doxygen/libstdc++-man.4.4.0.tar.bz2"; sha256 = "0153py77ll759jacq41dp2z2ksr08pdcfic0rwjd6pr84dk89y9v"; }; diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix index 66f1a5033ebed..de50f6128616f 100644 --- a/pkgs/data/documentation/stdman/default.nix +++ b/pkgs/data/documentation/stdman/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { files from cppreference and generates groff-formatted manual pages for Unix-based systems. The goal is to provide excellent formatting for easy readability."; - homepage = https://github.com/jeaye/stdman; + homepage = "https://github.com/jeaye/stdman"; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.twey ]; diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 2566b162d6592..7bfe918030ed7 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { Zeal is a simple offline API documentation browser inspired by Dash (macOS app), available for Linux and Windows. ''; - homepage = https://zealdocs.org/; + homepage = "https://zealdocs.org/"; license = licenses.gpl3; maintainers = with maintainers; [ skeidel peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix index 1fffbd9dcb168..585ab6b4292c9 100644 --- a/pkgs/data/fonts/agave/default.nix +++ b/pkgs/data/fonts/agave/default.nix @@ -17,7 +17,7 @@ in fetchurl { meta = with lib; { description = "truetype monospaced typeface designed for X environments"; - homepage = https://b.agaric.net/page/agave; + homepage = "https://b.agaric.net/page/agave"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix index 0f20b9c46cf53..700680a54b27d 100644 --- a/pkgs/data/fonts/andagii/default.nix +++ b/pkgs/data/fonts/andagii/default.nix @@ -5,7 +5,7 @@ let in fetchzip { name = "andagii-${version}"; - url = http://www.i18nguy.com/unicode/andagii.zip; + url = "http://www.i18nguy.com/unicode/andagii.zip"; curlOpts = "--user-agent 'Mozilla/5.0'"; postFetch = '' unzip $downloadedFile @@ -18,7 +18,7 @@ in fetchzip { # package; but I cannot find the original source, so use it on your # own risk Debian claims it is GPL - good enough for me. meta = with lib; { - homepage = http://www.i18nguy.com/unicode/unicode-font.html; + homepage = "http://www.i18nguy.com/unicode/unicode-font.html"; description = "Unicode Plane 1 Osmanya script font"; maintainers = with maintainers; [ raskin rycee ]; license = "unknown"; diff --git a/pkgs/data/fonts/andika/default.nix b/pkgs/data/fonts/andika/default.nix index e03a800b3ad5a..5fa2f1b271080 100644 --- a/pkgs/data/fonts/andika/default.nix +++ b/pkgs/data/fonts/andika/default.nix @@ -17,7 +17,7 @@ in sha256 = "1jy9vpcprpd1k48p20wh6jhyn909ibia8lr5i747p41l0s8a7lqy"; meta = with lib; { - homepage = https://software.sil.org/andika; + homepage = "https://software.sil.org/andika"; description = "A family designed especially for literacy use taking into account the needs of beginning readers"; longDescription = '' Andika is a sans serif, Unicode-compliant font designed especially for literacy use, taking into account the needs of beginning readers. The focus is on clear, easy-to-perceive letterforms that will not be readily confused with one another. diff --git a/pkgs/data/fonts/ankacoder/condensed.nix b/pkgs/data/fonts/ankacoder/condensed.nix index 0b6340d1ba942..655c780129d86 100644 --- a/pkgs/data/fonts/ankacoder/condensed.nix +++ b/pkgs/data/fonts/ankacoder/condensed.nix @@ -15,7 +15,7 @@ fetchzip { meta = with lib; { description = "Anka/Coder Condensed font"; - homepage = https://code.google.com/archive/p/anka-coder-fonts; + homepage = "https://code.google.com/archive/p/anka-coder-fonts"; license = licenses.ofl; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/data/fonts/ankacoder/default.nix index 3a57d08dbc28e..fbf587c7c6cab 100644 --- a/pkgs/data/fonts/ankacoder/default.nix +++ b/pkgs/data/fonts/ankacoder/default.nix @@ -15,7 +15,7 @@ fetchzip { meta = with lib; { description = "Anka/Coder fonts"; - homepage = https://code.google.com/archive/p/anka-coder-fonts; + homepage = "https://code.google.com/archive/p/anka-coder-fonts"; license = licenses.ofl; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix index 4aeda64377edb..0f8289fe18aa6 100644 --- a/pkgs/data/fonts/anonymous-pro/default.nix +++ b/pkgs/data/fonts/anonymous-pro/default.nix @@ -14,7 +14,7 @@ in fetchzip rec { sha256 = "05rgzag38qc77b31sm5i2vwwrxbrvwzfsqh3slv11skx36pz337f"; meta = with lib; { - homepage = https://www.marksimonson.com/fonts/view/anonymous-pro; + homepage = "https://www.marksimonson.com/fonts/view/anonymous-pro"; description = "TrueType font set intended for source code"; longDescription = '' Anonymous Pro (2009) is a family of four fixed-width fonts diff --git a/pkgs/data/fonts/arphic/default.nix b/pkgs/data/fonts/arphic/default.nix index 1e52ea301afa4..714af585d2558 100644 --- a/pkgs/data/fonts/arphic/default.nix +++ b/pkgs/data/fonts/arphic/default.nix @@ -20,7 +20,7 @@ in { meta = with lib; { description = "CJK Unicode font Kai style"; - homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/; + homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/"; license = licenses.arphicpl; maintainers = [ maintainers.changlinli ]; @@ -45,7 +45,7 @@ in { meta = with lib; { description = "CJK Unicode font Ming style"; - homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/; + homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/"; license = licenses.arphicpl; maintainers = [ maintainers.changlinli ]; diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix index a87be94acd09a..50f456373c698 100644 --- a/pkgs/data/fonts/aurulent-sans/default.nix +++ b/pkgs/data/fonts/aurulent-sans/default.nix @@ -14,7 +14,7 @@ fetchFromGitHub rec { meta = { description = "Aurulent Sans"; longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font."; - homepage = http://delubrum.org/; + homepage = "http://delubrum.org/"; maintainers = with lib.maintainers; [ deepfire ]; license = lib.licenses.ofl; platforms = lib.platforms.all; diff --git a/pkgs/data/fonts/b612/default.nix b/pkgs/data/fonts/b612/default.nix index 1c2d7f53bad80..bf97ff30c6d6d 100644 --- a/pkgs/data/fonts/b612/default.nix +++ b/pkgs/data/fonts/b612/default.nix @@ -16,7 +16,7 @@ in fetchFromGitHub { sha256 = "0r3lana1q9w3siv8czb3p9rrb5d9svp628yfbvvmnj7qvjrmfsiq"; meta = with lib; { - homepage = http://b612-font.com/; + homepage = "http://b612-font.com/"; description = "Highly legible font family for use on aircraft cockpit screens"; longDescription = '' B612 is the result of a research project initiated by Airbus. The font diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix index da2d67c084ff5..7f2898db9f1af 100644 --- a/pkgs/data/fonts/babelstone-han/default.nix +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -6,7 +6,7 @@ in fetchzip { name = "babelstone-han-${version}"; # upstream download links are unversioned, so hash changes - url = https://web.archive.org/web/20200210125314/https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip; + url = "https://web.archive.org/web/20200210125314/https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip"; postFetch = '' mkdir -p $out/share/fonts/truetype unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype @@ -15,7 +15,7 @@ in fetchzip { meta = with lib; { description = "Unicode CJK font with over 36000 Han characters"; - homepage = https://www.babelstone.co.uk/Fonts/Han.html; + homepage = "https://www.babelstone.co.uk/Fonts/Han.html"; license = licenses.free; platforms = platforms.all; diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix index 583a7457e2dc1..92f7401b32da4 100644 --- a/pkgs/data/fonts/baekmuk-ttf/default.nix +++ b/pkgs/data/fonts/baekmuk-ttf/default.nix @@ -13,7 +13,7 @@ fetchzip rec { meta = { description = "Korean font"; - homepage = http://kldp.net/projects/baekmuk/; + homepage = "http://kldp.net/projects/baekmuk/"; license = "BSD-like"; }; } diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix index 70074a58d9642..a8c01b41e6769 100644 --- a/pkgs/data/fonts/bakoma-ttf/default.nix +++ b/pkgs/data/fonts/bakoma-ttf/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "bakoma-ttf"; - url = http://tarballs.nixos.org/sha256/1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km; + url = "http://tarballs.nixos.org/sha256/1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km"; postFetch = '' tar xjvf $downloadedFile --strip-components=1 @@ -15,6 +15,6 @@ fetchzip { meta = { description = "TrueType versions of the Computer Modern and AMS TeX Fonts"; - homepage = http://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/; + homepage = "http://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/"; }; } diff --git a/pkgs/data/fonts/behdad-fonts/default.nix b/pkgs/data/fonts/behdad-fonts/default.nix index a0fcd5f7bbf53..d5d0b2a3c1dd8 100644 --- a/pkgs/data/fonts/behdad-fonts/default.nix +++ b/pkgs/data/fonts/behdad-fonts/default.nix @@ -16,7 +16,7 @@ in fetchFromGitHub { sha256 = "0c57232462cv1jrfn0m2bl7jzcfkacirrdd2qimrc8iqhkz0ajfz"; meta = with lib; { - homepage = https://github.com/font-store/BehdadFont; + homepage = "https://github.com/font-store/BehdadFont"; description = "A Persian/Arabic Open Source Font"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/cabin/default.nix b/pkgs/data/fonts/cabin/default.nix index 0a8168cdf9e20..e68d429db2e84 100644 --- a/pkgs/data/fonts/cabin/default.nix +++ b/pkgs/data/fonts/cabin/default.nix @@ -29,7 +29,7 @@ fetchFromGitHub rec { adjusted. The curved stem endings have a 10 degree angle. E and F have shorter center arms. M is splashed. ''; - homepage = http://www.impallari.com/cabin; + homepage = "http://www.impallari.com/cabin"; license = licenses.ofl; maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/caladea/default.nix b/pkgs/data/fonts/caladea/default.nix index b1f9312a7e9c3..14a8de1b0d9e9 100644 --- a/pkgs/data/fonts/caladea/default.nix +++ b/pkgs/data/fonts/caladea/default.nix @@ -18,7 +18,7 @@ in fetchzip { meta = with lib; { # This font doesn't appear to have any official web site but this # one provides some good information and samples. - homepage = http://openfontlibrary.org/en/font/caladea; + homepage = "http://openfontlibrary.org/en/font/caladea"; description = "A serif font metric-compatible with Microsoft Cambria"; longDescription = '' Caladea is a free font that is metric-compatible with the diff --git a/pkgs/data/fonts/camingo-code/default.nix b/pkgs/data/fonts/camingo-code/default.nix index 98175373ebd52..3db1f67281859 100644 --- a/pkgs/data/fonts/camingo-code/default.nix +++ b/pkgs/data/fonts/camingo-code/default.nix @@ -5,7 +5,7 @@ let in fetchzip rec { name = "camingo-code-${version}"; - url = https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip; + url = "https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip"; postFetch = '' unzip $downloadedFile install -m444 -Dt $out/share/fonts/truetype fonts/camingo-code/*.ttf @@ -14,7 +14,7 @@ in fetchzip rec { sha256 = "16iqjwwa7pnswvcc4w8nglkd0m0fz50qsz96i1kcpqip3nwwvw7y"; meta = with lib; { - homepage = https://www.myfonts.com/fonts/jan-fromm/camingo-code/; + homepage = "https://www.myfonts.com/fonts/jan-fromm/camingo-code/"; description = "A monospaced typeface designed for source-code editors"; platforms = platforms.all; license = licenses.cc-by-nd-30; diff --git a/pkgs/data/fonts/carlito/default.nix b/pkgs/data/fonts/carlito/default.nix index 79913bb83980e..1de2e9afc0f94 100644 --- a/pkgs/data/fonts/carlito/default.nix +++ b/pkgs/data/fonts/carlito/default.nix @@ -20,7 +20,7 @@ in fetchzip { meta = with lib; { # This font doesn't appear to have any official web site but this # one provides some good information and samples. - homepage = http://openfontlibrary.org/en/font/carlito; + homepage = "http://openfontlibrary.org/en/font/carlito"; description = "A sans-serif font metric-compatible with Microsoft Calibri"; longDescription = '' Carlito is a free font that is metric-compatible with the diff --git a/pkgs/data/fonts/charis-sil/default.nix b/pkgs/data/fonts/charis-sil/default.nix index e28a718fad14f..44b40c72b58f2 100644 --- a/pkgs/data/fonts/charis-sil/default.nix +++ b/pkgs/data/fonts/charis-sil/default.nix @@ -17,7 +17,7 @@ in sha256 = "1a220s8n0flvcdkazqf5g10v6r55s2an308slvvarynpj6l7x27n"; meta = with lib; { - homepage = https://software.sil.org/charis; + homepage = "https://software.sil.org/charis"; description = "A family of highly readable fonts for broad multilingual use"; longDescription = '' This Charis SIL font is essentially the same design as the SIL Charis font first released by SIL in 1997. Charis is similar to Bitstream Charter, one of the first fonts designed specifically for laser printers. It is highly readable and holds up well in less-than-ideal reproduction environments. It also has a full set of styles – regular, italic, bold, bold italic. Charis is a serif, proportionally-spaced font optimized for readability in long printed documents. diff --git a/pkgs/data/fonts/cherry/default.nix b/pkgs/data/fonts/cherry/default.nix index 00a8a2f61fcc9..a69aa3684ab43 100644 --- a/pkgs/data/fonts/cherry/default.nix +++ b/pkgs/data/fonts/cherry/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "cherry font"; - homepage = https://github.com/turquoise-hexagon/cherry; + homepage = "https://github.com/turquoise-hexagon/cherry"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/data/fonts/cm-unicode/default.nix index c058f07ed51ca..d7437c3231d63 100644 --- a/pkgs/data/fonts/cm-unicode/default.nix +++ b/pkgs/data/fonts/cm-unicode/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { sha256 = "1rzz7yhqq3lljyqxbg46jfzfd09qgpgx865lijr4sgc94riy1ypn"; meta = with lib; { - homepage = http://canopus.iacp.dvo.ru/~panov/cm-unicode/; + homepage = "http://canopus.iacp.dvo.ru/~panov/cm-unicode/"; description = "Computer Modern Unicode fonts"; maintainers = with maintainers; [ raskin rycee ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/comfortaa/default.nix b/pkgs/data/fonts/comfortaa/default.nix index 6e4c0bb08e7ab..525c2920dbe6c 100644 --- a/pkgs/data/fonts/comfortaa/default.nix +++ b/pkgs/data/fonts/comfortaa/default.nix @@ -14,7 +14,7 @@ in fetchzip rec { sha256 = "0z7xr0cnn6ghwivrm5b5awq9bzhnay3y99qq6dkdgfkfdsaz0n9h"; meta = with lib; { - homepage = http://aajohan.deviantart.com/art/Comfortaa-font-105395949; + homepage = "http://aajohan.deviantart.com/art/Comfortaa-font-105395949"; description = "A clean and modern font suitable for headings and logos"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix index 6dcefe9005565..709d93dc2c9f0 100644 --- a/pkgs/data/fonts/comic-neue/default.nix +++ b/pkgs/data/fonts/comic-neue/default.nix @@ -20,7 +20,7 @@ in fetchzip rec { sha256 = "1gs4vhys0m3qsw06qaxzyi81f06w5v66kbyl64yw3pq2rb656779"; meta = with lib; { - homepage = http://comicneue.com/; + homepage = "http://comicneue.com/"; description = "A casual type face: Make your lemonade stand look like a fortune 500 company"; longDescription = '' It is inspired by Comic Sans but more regular. The font was diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/data/fonts/comic-relief/default.nix index d51c915b844e2..1f5ce7f642faf 100644 --- a/pkgs/data/fonts/comic-relief/default.nix +++ b/pkgs/data/fonts/comic-relief/default.nix @@ -19,7 +19,7 @@ in fetchzip rec { sha256 = "0dz0y7w6mq4hcmmxv6fn4mp6jkln9mzr4s96vsg68wrl5b7k9yff"; meta = with lib; { - homepage = http://loudifier.com/comic-relief/; + homepage = "http://loudifier.com/comic-relief/"; description = "A font metric-compatible with Microsoft Comic Sans"; longDescription = '' Comic Relief is a typeface designed to be metrically equivalent diff --git a/pkgs/data/fonts/cooper-hewitt/default.nix b/pkgs/data/fonts/cooper-hewitt/default.nix index e1635c560d667..8783b1121738a 100644 --- a/pkgs/data/fonts/cooper-hewitt/default.nix +++ b/pkgs/data/fonts/cooper-hewitt/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "cooper-hewitt-2014-06-09"; - url = https://www.cooperhewitt.org/wp-content/uploads/fonts/CooperHewitt-OTF-public.zip; + url = "https://www.cooperhewitt.org/wp-content/uploads/fonts/CooperHewitt-OTF-public.zip"; postFetch = '' mkdir -p $out/share/fonts/opentype @@ -13,7 +13,7 @@ fetchzip { sha256 = "01iwqmjvqkc6fmc2r0486vk06s6f51n9wxzl1pf9z48n0igj4gqd"; meta = with lib; { - homepage = https://www.cooperhewitt.org/open-source-at-cooper-hewitt/cooper-hewitt-the-typeface-by-chester-jenkins/; + homepage = "https://www.cooperhewitt.org/open-source-at-cooper-hewitt/cooper-hewitt-the-typeface-by-chester-jenkins/"; description = "A contemporary sans serif, with characters composed of modified-geometric curves and arches"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix index 5e06a34b6f0b4..e4107cd4b9980 100644 --- a/pkgs/data/fonts/corefonts/default.nix +++ b/pkgs/data/fonts/corefonts/default.nix @@ -18,7 +18,7 @@ let ]; eula = fetchurl { - url = http://corefonts.sourceforge.net/eula.htm; + url = "http://corefonts.sourceforge.net/eula.htm"; sha256 = "1aqbcnl032g2hd7iy56cs022g47scb0jxxp3mm206x1yqc90vs1c"; }; @@ -62,7 +62,7 @@ stdenv.mkDerivation { outputHash = "0baadsrgpqj15fgjmcn0aim0k0nk7mvivcxinw1zwg61kkcwhalx"; meta = with stdenv.lib; { - homepage = http://corefonts.sourceforge.net/; + homepage = "http://corefonts.sourceforge.net/"; description = "Microsoft's TrueType core fonts for the Web"; platforms = platforms.all; license = licenses.unfreeRedistributable; diff --git a/pkgs/data/fonts/creep/default.nix b/pkgs/data/fonts/creep/default.nix index 90b0d19ae99bf..2e66ac468b083 100644 --- a/pkgs/data/fonts/creep/default.nix +++ b/pkgs/data/fonts/creep/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A pretty sweet 4px wide pixel font"; - homepage = https://github.com/romeovs/creep; + homepage = "https://github.com/romeovs/creep"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ buffet ]; diff --git a/pkgs/data/fonts/crimson/default.nix b/pkgs/data/fonts/crimson/default.nix index a3f24985fd9d3..b8ff43a11288c 100644 --- a/pkgs/data/fonts/crimson/default.nix +++ b/pkgs/data/fonts/crimson/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { sha256 = "0mg65f0ydyfmb43jqr1f34njpd10w8npw15cbb7z0nxmy4nkl842"; meta = with lib; { - homepage = https://aldusleaf.org/crimson.html; + homepage = "https://aldusleaf.org/crimson.html"; description = "A font family inspired by beautiful oldstyle typefaces"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/culmus/default.nix b/pkgs/data/fonts/culmus/default.nix index 5aad7ff236f1a..00c472d7fe348 100644 --- a/pkgs/data/fonts/culmus/default.nix +++ b/pkgs/data/fonts/culmus/default.nix @@ -22,7 +22,7 @@ in fetchzip { longDescription = "The Culmus project aims at providing the Hebrew-speaking GNU/Linux and Unix community with a basic collection of Hebrew fonts for X Windows."; platforms = lib.platforms.all; license = lib.licenses.gpl2; - homepage = http://culmus.sourceforge.net/; - downloadPage = http://culmus.sourceforge.net/download.html; + homepage = "http://culmus.sourceforge.net/"; + downloadPage = "http://culmus.sourceforge.net/download.html"; }; } diff --git a/pkgs/data/fonts/d2coding/default.nix b/pkgs/data/fonts/d2coding/default.nix index b73da9a504b3e..25d92fc0f9eef 100644 --- a/pkgs/data/fonts/d2coding/default.nix +++ b/pkgs/data/fonts/d2coding/default.nix @@ -24,7 +24,7 @@ in fetchzip { Since verion 1.3, D2Coding font is officially supported by the font creator, with symbols for Powerline. ''; - homepage = https://github.com/naver/d2codingfont; + homepage = "https://github.com/naver/d2codingfont"; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index b14ba6479d9bc..839cb80a6b99c 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -12,7 +12,7 @@ let This package includes DejaVu Sans, DejaVu Serif, DejaVu Sans Mono, and the TeX Gyre DejaVu Math font. ''; - homepage = http://dejavu-fonts.org/wiki/Main_Page; + homepage = "http://dejavu-fonts.org/wiki/Main_Page"; # Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. # Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index 8bc1af60ab4dd..49c2194782091 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -58,8 +58,8 @@ stdenv.mkDerivation { relatively compact to allow a lot of code on screen, while (hopefully) clear enough to remain readable even at high resolutions. ''; - homepage = https://www.donationcoder.com/Software/Jibz/Dina/; - downloadPage = https://www.donationcoder.com/Software/Jibz/Dina/; + homepage = "https://www.donationcoder.com/Software/Jibz/Dina/"; + downloadPage = "https://www.donationcoder.com/Software/Jibz/Dina/"; license = licenses.free; maintainers = [ maintainers.prikhi ]; }; diff --git a/pkgs/data/fonts/dosis/default.nix b/pkgs/data/fonts/dosis/default.nix index 48b170e2e1b64..918996c5f6448 100644 --- a/pkgs/data/fonts/dosis/default.nix +++ b/pkgs/data/fonts/dosis/default.nix @@ -28,7 +28,7 @@ fetchFromGitHub rec { It comes in 7 incremental weights: ExtraLight, Light, Book, Medium, Semibold, Bold & ExtraBold ''; - homepage = http://www.impallari.com/dosis; + homepage = "http://www.impallari.com/dosis"; license = licenses.ofl; maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/doulos-sil/default.nix b/pkgs/data/fonts/doulos-sil/default.nix index 59371593f79bd..3de4cfc0cae32 100644 --- a/pkgs/data/fonts/doulos-sil/default.nix +++ b/pkgs/data/fonts/doulos-sil/default.nix @@ -17,7 +17,7 @@ in sha256 = "04a9cr7jbw7d8llcj8xsqp9rp8w6gcgbd9sdwvi02kz7jhqa0vad"; meta = with lib; { - homepage = https://software.sil.org/doulos; + homepage = "https://software.sil.org/doulos"; description = "A font that provides complete support for the International Phonetic Alphabet"; longDescription = '' This Doulos SIL font is essentially the same design as the SIL Doulos font first released by SIL in 1992. The design has been changed from the original in that it has been scaled down to be a better match with contemporary digital fonts, such as Times New Roman®. This current release is a regular typeface, with no bold or italic version available or planned. It is intended for use alongside other Times-like fonts where a range of styles (italic, bold) are not needed. Therefore, just one font is included in the Doulos SIL release: Doulos SIL Regular. diff --git a/pkgs/data/fonts/eb-garamond/default.nix b/pkgs/data/fonts/eb-garamond/default.nix index 1423326899162..869d889ef3cc0 100644 --- a/pkgs/data/fonts/eb-garamond/default.nix +++ b/pkgs/data/fonts/eb-garamond/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { sha256 = "04jq4mpln85zzbla8ybsjw7vn9qr3r0snmk5zykrm24imq7ripv3"; meta = with lib; { - homepage = http://www.georgduffner.at/ebgaramond/; + homepage = "http://www.georgduffner.at/ebgaramond/"; description = "Digitization of the Garamond shown on the Egenolff-Berner specimen"; maintainers = with maintainers; [ relrod rycee ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix index e7981f63baf30..e9c646d32d08c 100644 --- a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix +++ b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix @@ -21,7 +21,7 @@ in fetchzip { presentation of information in emacs. This package provides the fonts needed to make the package work properly. ''; - homepage = https://github.com/domtronn/all-the-icons.el; + homepage = "https://github.com/domtronn/all-the-icons.el"; /* The fonts come under a mixture of licenses - the MIT license, diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix index 171ec10c8f16f..6f5168e90d5e2 100644 --- a/pkgs/data/fonts/emojione/default.nix +++ b/pkgs/data/fonts/emojione/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source emoji set"; - homepage = http://emojione.com/; + homepage = "http://emojione.com/"; license = licenses.cc-by-40; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/data/fonts/encode-sans/default.nix index 787a83f95611a..c6bb23b43266a 100644 --- a/pkgs/data/fonts/encode-sans/default.nix +++ b/pkgs/data/fonts/encode-sans/default.nix @@ -3,7 +3,7 @@ fetchzip rec { name = "encode-sans-1.002"; - url = https://github.com/impallari/Encode-Sans/archive/11162b46892d20f55bd42a00b48cbf06b5871f75.zip; + url = "https://github.com/impallari/Encode-Sans/archive/11162b46892d20f55bd42a00b48cbf06b5871f75.zip"; postFetch = '' mkdir -p $out/share/{doc,fonts} @@ -23,7 +23,7 @@ fetchzip rec { Designed by Pablo Impallari and Andres Torresi. ''; - homepage = http://www.impallari.com/projects/overview/encode; + homepage = "http://www.impallari.com/projects/overview/encode"; license = licenses.ofl; maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/eunomia/default.nix b/pkgs/data/fonts/eunomia/default.nix index de68b17d6ebb3..e68f528ff3838 100644 --- a/pkgs/data/fonts/eunomia/default.nix +++ b/pkgs/data/fonts/eunomia/default.nix @@ -18,7 +18,7 @@ fetchzip { ''; meta = with lib; { - homepage = http://dotcolon.net/font/eunomia/; + homepage = "http://dotcolon.net/font/eunomia/"; description = "A futuristic decorative font."; platforms = platforms.all; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/data/fonts/fantasque-sans-mono/default.nix b/pkgs/data/fonts/fantasque-sans-mono/default.nix index 156db5d214ca0..e8068d7faead5 100644 --- a/pkgs/data/fonts/fantasque-sans-mono/default.nix +++ b/pkgs/data/fonts/fantasque-sans-mono/default.nix @@ -18,7 +18,7 @@ fetchzip rec { sha256 = "07y2w6xzkbaj6vr95fvvnmwq1pw9jib4z02xf8937dx812yic9ni"; meta = with lib; { - homepage = https://github.com/belluzj/fantasque-sans; + homepage = "https://github.com/belluzj/fantasque-sans"; description = "A font family with a great monospaced variant for programmers"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 71057639f9785..2048bc797c9b5 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip }: let - version = "3"; + version = "4"; in fetchzip { name = "fira-code-${version}"; - url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip"; + url = "https://github.com/tonsky/FiraCode/releases/download/${version}/Fira_Code_v${version}.zip"; postFetch = '' mkdir -p $out/share/fonts @@ -13,7 +13,7 @@ in fetchzip { unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - sha256 = "19kcqqd6c61v137q88zsvf2ra154n009sbqh6zs7l8f7r5bbipj2"; + sha256 = "0n9qkng31ydvpdjc1an4ylpfy4x883c6czhyzvhjsmavd7bv4j9a"; meta = with stdenv.lib; { homepage = "https://github.com/tonsky/FiraCode"; diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix index 2f50a83a70b4b..d29d6304cee10 100644 --- a/pkgs/data/fonts/fira-mono/default.nix +++ b/pkgs/data/fonts/fira-mono/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "fira-mono-3.206"; - url = https://github.com/mozilla/Fira/archive/4.106.zip; + url = "https://github.com/mozilla/Fira/archive/4.106.zip"; postFetch = '' mkdir -p $out/share/fonts @@ -13,7 +13,7 @@ fetchzip { sha256 = "1ci3fxhdwabvfj4nl16pwcgqnh7s2slp8vblribk8zkpx8cbp1dj"; meta = with stdenv.lib; { - homepage = https://mozilla.github.io/Fira/; + homepage = "https://mozilla.github.io/Fira/"; description = "Monospace font for Firefox OS"; longDescription = '' Fira Mono is a monospace font designed by Erik Spiekermann, diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix index fe27ac2cd5db1..039c5099b56ea 100644 --- a/pkgs/data/fonts/fira/default.nix +++ b/pkgs/data/fonts/fira/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "4.106"; + version = "4.202"; in fetchFromGitHub { name = "fira-${version}"; @@ -15,10 +15,10 @@ in fetchFromGitHub { cp otf/*.otf $out/share/fonts/opentype ''; - sha256 = "0c97nmihcq0ki7ywj8zn048a2bgrszc61lb9p0djfi65ar52jab4"; + sha256 = "1iwxbp7kw5kghh5nbycb05zby7p2ib61mywva3h6giv2wd4lpxnz"; meta = with lib; { - homepage = https://mozilla.github.io/Fira/; + homepage = "https://mozilla.github.io/Fira/"; description = "Sans-serif font for Firefox OS"; longDescription = '' Fira Sans is a sans-serif font designed by Erik Spiekermann, diff --git a/pkgs/data/fonts/fixedsys-excelsior/default.nix b/pkgs/data/fonts/fixedsys-excelsior/default.nix index 14232edee0cbc..c8d2d1c2a9eec 100644 --- a/pkgs/data/fonts/fixedsys-excelsior/default.nix +++ b/pkgs/data/fonts/fixedsys-excelsior/default.nix @@ -8,9 +8,9 @@ in fetchurl rec { name = "fixedsys-excelsior-${version}"; urls = [ - http://www.fixedsysexcelsior.com/fonts/FSEX300.ttf - https://raw.githubusercontent.com/chrissimpkins/codeface/master/fonts/fixed-sys-excelsior/FSEX300.ttf - http://tarballs.nixos.org/sha256/6ee0f3573bc5e33e93b616ef6282f49bc0e227a31aa753ac76ed2e3f3d02056d + "http://www.fixedsysexcelsior.com/fonts/FSEX300.ttf" + "https://raw.githubusercontent.com/chrissimpkins/codeface/master/fonts/fixed-sys-excelsior/FSEX300.ttf" + "http://tarballs.nixos.org/sha256/6ee0f3573bc5e33e93b616ef6282f49bc0e227a31aa753ac76ed2e3f3d02056d" ]; downloadToTemp = true; recursiveHash = true; @@ -22,7 +22,7 @@ in fetchurl rec { meta = { description = "Pan-unicode version of Fixedsys, a classic DOS font."; - homepage = http://www.fixedsysexcelsior.com/; + homepage = "http://www.fixedsysexcelsior.com/"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.publicDomain; maintainers = [ stdenv.lib.maintainers.ninjatrappeur ]; diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/pkgs/data/fonts/fontconfig-penultimate/default.nix index 601146d99a9d6..5216cf0e3d89c 100644 --- a/pkgs/data/fonts/fontconfig-penultimate/default.nix +++ b/pkgs/data/fonts/fontconfig-penultimate/default.nix @@ -15,7 +15,7 @@ fetchzip { ''; meta = with lib; { - homepage = https://github.com/ttuegel/fontconfig-penultimate; + homepage = "https://github.com/ttuegel/fontconfig-penultimate"; description = "Sensible defaults for Fontconfig"; license = licenses.asl20; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix index c5e19edea2626..5934ec3589ac3 100644 --- a/pkgs/data/fonts/freefont-ttf/default.nix +++ b/pkgs/data/fonts/freefont-ttf/default.nix @@ -19,7 +19,7 @@ fetchzip rec { (PostScript Type0, TrueType, OpenType...) fonts covering the ISO 10646/Unicode UCS (Universal Character Set). ''; - homepage = https://www.gnu.org/software/freefont/; + homepage = "https://www.gnu.org/software/freefont/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; maintainers = []; diff --git a/pkgs/data/fonts/gandom-fonts/default.nix b/pkgs/data/fonts/gandom-fonts/default.nix index 4d925b269cd32..54e0020ae6878 100644 --- a/pkgs/data/fonts/gandom-fonts/default.nix +++ b/pkgs/data/fonts/gandom-fonts/default.nix @@ -16,7 +16,7 @@ in fetchFromGitHub { sha256 = "0zsq6s9ziyb5jz0v8aj00dlxd1aly0ibxgszd05dfvykmgz051lc"; meta = with lib; { - homepage = https://github.com/rastikerdar/gandom-font; + homepage = "https://github.com/rastikerdar/gandom-font"; description = "A Persian (Farsi) Font - فونت (قلم) فارسی گندم"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/gdouros/default.nix b/pkgs/data/fonts/gdouros/default.nix index afe73aa1caf1d..eb6635ec3a386 100644 --- a/pkgs/data/fonts/gdouros/default.nix +++ b/pkgs/data/fonts/gdouros/default.nix @@ -31,7 +31,7 @@ let # no redistribution, "a single instantiation and no # network installation" license = lib.licenses.unfree; - homepage = http://users.teilar.gr/~g1951d/; + homepage = "http://users.teilar.gr/~g1951d/"; }; }; in diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix index 505b273c2d24c..2e14795ebd14a 100644 --- a/pkgs/data/fonts/gentium-book-basic/default.nix +++ b/pkgs/data/fonts/gentium-book-basic/default.nix @@ -18,7 +18,7 @@ in fetchzip rec { sha256 = "0598zr5f7d6ll48pbfbmmkrybhhdks9b2g3m2g67wm40070ffzmd"; meta = with lib; { - homepage = https://software.sil.org/gentium/; + homepage = "https://software.sil.org/gentium/"; description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; maintainers = with maintainers; [ ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index a60a39f4f01eb..3622e1c3b3c72 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -18,7 +18,7 @@ in fetchzip rec { sha256 = "1qr2wjdmm93167b0w9cidlf3wwsyjx4838ja9jmm4jkyian5whhp"; meta = with lib; { - homepage = https://software.sil.org/gentium/; + homepage = "https://software.sil.org/gentium/"; description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; longDescription = '' Gentium is a typeface family designed to enable the diverse ethnic groups diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix index bb28d3be67fa2..e887f0ffef127 100644 --- a/pkgs/data/fonts/go-font/default.nix +++ b/pkgs/data/fonts/go-font/default.nix @@ -18,7 +18,7 @@ in (fetchgit { sha256 = "1488426ya2nzmwjas947fx9h5wzxrp9wasn8nkjqf0y0mpd4f1xz"; }) // { meta = with stdenv.lib; { - homepage = https://blog.golang.org/go-fonts; + homepage = "https://blog.golang.org/go-fonts"; description = "The Go font family"; license = licenses.bsd3; maintainers = with maintainers; [ sternenseemann ]; diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index b331edf7aa1e3..e2361ef816371 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { description = '' A monospace bitmap font well suited for programming and terminal use ''; - homepage = https://font.gohu.org/; + homepage = "https://font.gohu.org/"; license = licenses.wtfpl; maintainers = with maintainers; [ epitrochoid rnhmjoj ]; }; diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 7c1af485a989f..7a3b488212df0 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://fonts.google.com; + homepage = "https://fonts.google.com"; description = "Font files available from Google Fonts"; license = with licenses; [ asl20 ofl ufl ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix index 3c49bf7f56560..0427cf36429f5 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/pkgs/data/fonts/hack/default.nix @@ -23,7 +23,7 @@ in fetchzip { The face has been re-designed with a larger glyph set, modifications of the original glyph shapes, and meticulous attention to metrics. ''; - homepage = https://sourcefoundry.org/hack/; + homepage = "https://sourcefoundry.org/hack/"; /* "The font binaries are released under a license that permits unlimited diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix index 6286cf8a1df80..d9deef80c0d7c 100644 --- a/pkgs/data/fonts/hasklig/default.nix +++ b/pkgs/data/fonts/hasklig/default.nix @@ -15,7 +15,7 @@ in fetchzip { sha256 = "0xxyx0nkapviqaqmf3b610nq17k20afirvc72l32pfspsbxz8ybq"; meta = with lib; { - homepage = https://github.com/i-tu/Hasklig; + homepage = "https://github.com/i-tu/Hasklig"; description = "A font with ligatures for Haskell code based off Source Code Pro"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix index 23f6fb29be07a..275b0d8f87110 100644 --- a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix +++ b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix @@ -15,7 +15,7 @@ in fetchzip { sha256 = "0ampp9vf9xw0sdppl4lb9i9h75ywljhdcqmzh45mx2x9m7h6xgg9"; meta = { - homepage = http://www.ephifonts.com/free-helvetica-font-helvetica-neue-lt-std.html; + homepage = "http://www.ephifonts.com/free-helvetica-font-helvetica-neue-lt-std.html"; description = "Helvetica Neue LT Std font"; longDescription = '' Helvetica Neue Lt Std is one of the most highly rated and complete diff --git a/pkgs/data/fonts/hermit/default.nix b/pkgs/data/fonts/hermit/default.nix index f641b36a1b055..3ff5dd3682923 100644 --- a/pkgs/data/fonts/hermit/default.nix +++ b/pkgs/data/fonts/hermit/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { meta = with lib; { description = "monospace font designed to be clear, pragmatic and very readable"; - homepage = https://pcaro.es/p/hermit; + homepage = "https://pcaro.es/p/hermit"; license = licenses.ofl; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/hyperscrypt/default.nix b/pkgs/data/fonts/hyperscrypt/default.nix index 726fbab95bd81..09bcc2464ba41 100644 --- a/pkgs/data/fonts/hyperscrypt/default.nix +++ b/pkgs/data/fonts/hyperscrypt/default.nix @@ -16,7 +16,7 @@ fetchzip { ''; meta = with lib; { - homepage = http://velvetyne.fr/fonts/hyper-scrypt/; + homepage = "http://velvetyne.fr/fonts/hyper-scrypt/"; description = "A modern stencil typeface inspired by stained glass technique"; longDescription = '' The Hyper Scrypt typeface was designed for the Hyper Chapelle diff --git a/pkgs/data/fonts/ia-writer-duospace/default.nix b/pkgs/data/fonts/ia-writer-duospace/default.nix index 1d910ed54a4b1..6da80a1bf830a 100644 --- a/pkgs/data/fonts/ia-writer-duospace/default.nix +++ b/pkgs/data/fonts/ia-writer-duospace/default.nix @@ -18,7 +18,7 @@ in fetchFromGitHub { meta = with lib; { description = "iA Writer Duospace Typeface"; - homepage = https://ia.net/topics/in-search-of-the-perfect-writing-font; + homepage = "https://ia.net/topics/in-search-of-the-perfect-writing-font"; license = licenses.ofl; platforms = platforms.all; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix index ffd6a49be5c85..3e507047166c5 100644 --- a/pkgs/data/fonts/ibm-plex/default.nix +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -13,7 +13,7 @@ in fetchzip { meta = with lib; { description = "IBM Plex Typeface"; - homepage = https://www.ibm.com/plex/; + homepage = "https://www.ibm.com/plex/"; license = licenses.ofl; platforms = platforms.all; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/fonts/inconsolata-nerdfont/default.nix b/pkgs/data/fonts/inconsolata-nerdfont/default.nix deleted file mode 100644 index b4356e73d5c7e..0000000000000 --- a/pkgs/data/fonts/inconsolata-nerdfont/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, fetchzip }: - -let - version = "2.0.0"; -in fetchzip { - name = "inconsolata-nerdfont-${version}"; - - url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/Inconsolata.zip"; - - postFetch = '' - mkdir -p $out/share/fonts/inconsolata-nerdfont - unzip -j $downloadedFile -d $out/share/fonts/inconsolata-nerdfont - ''; - - sha256 = "06i1akjblqd038cn5lvz67lwp6afpv31vqcfdihp66qisgbgm4w9"; - - meta = with lib; { - description = '' - Nerd Fonts is a project that attempts to patch as many developer targeted - and/or used fonts as possible. The patch is to specifically add a high - number of additional glyphs from popular 'iconic fonts' such as Font - Awesome, Devicons, Octicons, and others. - ''; - homepage = https://github.com/ryanoasis/nerd-fonts; - license = licenses.mit; - platforms = platforms.all; - }; -} diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index a170a0780a489..10568073e4b29 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.levien.com/type/myfonts/inconsolata.html; + homepage = "https://www.levien.com/type/myfonts/inconsolata.html"; description = "A monospace font for both screen and print"; maintainers = with maintainers; [ mikoim raskin rycee ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix index aec48b1208607..e69e6e02a22f1 100644 --- a/pkgs/data/fonts/inconsolata/lgc.nix +++ b/pkgs/data/fonts/inconsolata/lgc.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # See `License.txt' for details. license = licenses.ofl; - homepage = https://github.com/MihailJP/Inconsolata-LGC; + homepage = "https://github.com/MihailJP/Inconsolata-LGC"; maintainers = with maintainers; [ avnik rht ]; }; } diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix index c3d3bf4aa6a0b..2db7e259a3523 100644 --- a/pkgs/data/fonts/input-fonts/default.nix +++ b/pkgs/data/fonts/input-fonts/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { generous spacing, large punctuation, and easily distinguishable characters — but without the limitations of a fixed width. ''; - homepage = https://input.fontbureau.com; + homepage = "https://input.fontbureau.com"; license = licenses.unfree; maintainers = with maintainers; [ romildo ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/inriafonts/default.nix b/pkgs/data/fonts/inriafonts/default.nix index 5a8e3476bf802..d8127b8512743 100644 --- a/pkgs/data/fonts/inriafonts/default.nix +++ b/pkgs/data/fonts/inriafonts/default.nix @@ -17,7 +17,7 @@ in fetchFromGitHub { sha256 = "0wrwcyycyzvgvgnlmwi1ncdvwb8f6bbclynd1105rsyxgrz5dd70"; meta = with lib; { - homepage = https://black-foundry.com/work/inria; + homepage = "https://black-foundry.com/work/inria"; description = "Inria Sans and Inria Serif"; longDescription = '' Inria Sans and Inria Serif are the two members of a type family diff --git a/pkgs/data/fonts/inter-ui/default.nix b/pkgs/data/fonts/inter-ui/default.nix index d9ef6684faa6a..37b48f7ceb2f3 100644 --- a/pkgs/data/fonts/inter-ui/default.nix +++ b/pkgs/data/fonts/inter-ui/default.nix @@ -19,7 +19,7 @@ in fetchzip { sha256 = "01d2ql803jrhss6g60djvs08x9xl7z6b3snkn03vqnrajdgifcl4"; meta = with lib; { - homepage = https://rsms.me/inter/; + homepage = "https://rsms.me/inter/"; description = "A typeface specially designed for user interfaces"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/data/fonts/inter/default.nix index 83779e7618eb2..9c7ef62c76900 100644 --- a/pkgs/data/fonts/inter/default.nix +++ b/pkgs/data/fonts/inter/default.nix @@ -15,7 +15,7 @@ in fetchzip { sha256 = "1bk4q478jy84ylgm1mmh23n8cw1cd3k7gvfih77sd7ya1zv26vl1"; meta = with lib; { - homepage = https://rsms.me/inter/; + homepage = "https://rsms.me/inter/"; description = "A typeface specially designed for user interfaces"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/data/fonts/ipaexfont/default.nix index 4d7e2fa380e06..ef914d144843c 100644 --- a/pkgs/data/fonts/ipaexfont/default.nix +++ b/pkgs/data/fonts/ipaexfont/default.nix @@ -21,7 +21,7 @@ fetchzip { This is the successor to the IPA fonts. ''; - homepage = http://ipafont.ipa.go.jp/; + homepage = "http://ipafont.ipa.go.jp/"; license = licenses.ipa; maintainers = with maintainers; [ gebner ]; }; diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/data/fonts/ipafont/default.nix index d1cb007088386..eec28db883a85 100644 --- a/pkgs/data/fonts/ipafont/default.nix +++ b/pkgs/data/fonts/ipafont/default.nix @@ -19,7 +19,7 @@ fetchzip { Promotion Agency of Japan. It provides both Mincho and Gothic fonts, suitable for both display and printing. ''; - homepage = http://ipafont.ipa.go.jp/ipafont/; + homepage = "http://ipafont.ipa.go.jp/ipafont/"; license = lib.licenses.ipa; maintainers = [ lib.maintainers.auntie ]; }; diff --git a/pkgs/data/fonts/ir-standard-fonts/default.nix b/pkgs/data/fonts/ir-standard-fonts/default.nix index eef3883506efe..25ec1e5d11da7 100644 --- a/pkgs/data/fonts/ir-standard-fonts/default.nix +++ b/pkgs/data/fonts/ir-standard-fonts/default.nix @@ -16,7 +16,7 @@ in fetchFromGitHub { sha256 = "0i2vzhwk77pm6fx5z5gxl026z9f35rhh3cvl003mry2lcg1x5rhp"; meta = with lib; { - homepage = https://github.com/morealaz/ir-standard-fonts; + homepage = "https://github.com/morealaz/ir-standard-fonts"; description = "Iran Supreme Council of Information and Communication Technology (SCICT) standard Persian fonts series"; # License information is unavailable. license = licenses.unfree; diff --git a/pkgs/data/fonts/iwona/default.nix b/pkgs/data/fonts/iwona/default.nix index afa59b737a5c7..7333c5abe3583 100644 --- a/pkgs/data/fonts/iwona/default.nix +++ b/pkgs/data/fonts/iwona/default.nix @@ -14,7 +14,7 @@ in fetchzip { meta = with lib; { description = "A two-element sans-serif typeface, created by Małgorzata Budyta"; - homepage = http://jmn.pl/en/kurier-i-iwona/; + homepage = "http://jmn.pl/en/kurier-i-iwona/"; # "[...] GUST Font License (GFL), which is a free license, legally # equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or # later." - GUST website diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix index 4297d15da9487..718b6b218df25 100644 --- a/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "1.0.5"; + version = "1.0.6"; in fetchzip rec { name = "JetBrainsMono-${version}"; url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; - sha256 = "1iqqix7rr22ij0cn7vg812qs4gbjpphndgbzm57abqk658lra4kl"; + sha256 = "1198k5zw91g85h6n7rg3y7wcj1nrbby9zlr6zwlmiq0nb37n0d3g"; postFetch = '' mkdir -p $out/share/fonts diff --git a/pkgs/data/fonts/jost/default.nix b/pkgs/data/fonts/jost/default.nix index 3c1403da26396..fc06a7e98438b 100644 --- a/pkgs/data/fonts/jost/default.nix +++ b/pkgs/data/fonts/jost/default.nix @@ -14,7 +14,7 @@ in fetchzip { sha256="0l78vhmbsyfmrva5wc76pskhxqryyg8q5xddpj9g5wqsddy525dq"; meta = with stdenv.lib; { - homepage = https://github.com/indestructible-type/Jost; + homepage = "https://github.com/indestructible-type/Jost"; description = "A sans serif font by Indestructible Type"; license = licenses.ofl; maintainers = [ maintainers.ar1a ]; diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix index 41543729e1fc6..fb9b76b0efc61 100644 --- a/pkgs/data/fonts/joypixels/default.nix +++ b/pkgs/data/fonts/joypixels/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Emoji as a Service (formerly EmojiOne)"; - homepage = https://www.joypixels.com/; + homepage = "https://www.joypixels.com/"; license = licenses.unfree; maintainers = with maintainers; [ jtojnar ]; }; diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 1e1341932f560..19502cdf78fda 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -16,7 +16,7 @@ in fetchzip { sha256 = "1n170gw41lr0zr5958z5cgpg6i1aa7kj7iq9s6gdh1cqq7hhgd08"; meta = { - homepage = http://junicode.sourceforge.net/; + homepage = "http://junicode.sourceforge.net/"; description = "A Unicode font for medievalists"; maintainers = with lib.maintainers; [ ivan-timokhin ]; license = lib.licenses.ofl; diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/data/fonts/kawkab-mono/default.nix index f6a031c7faf03..1e07123badc38 100644 --- a/pkgs/data/fonts/kawkab-mono/default.nix +++ b/pkgs/data/fonts/kawkab-mono/default.nix @@ -14,7 +14,7 @@ fetchzip { meta = { description = "An arab fixed-width font"; - homepage = https://makkuk.com/kawkab-mono/; + homepage = "https://makkuk.com/kawkab-mono/"; license = lib.licenses.ofl; }; } diff --git a/pkgs/data/fonts/lalezar-fonts/default.nix b/pkgs/data/fonts/lalezar-fonts/default.nix index 2cd33e9fe1b3e..01e9d209a3177 100644 --- a/pkgs/data/fonts/lalezar-fonts/default.nix +++ b/pkgs/data/fonts/lalezar-fonts/default.nix @@ -17,7 +17,7 @@ in fetchFromGitHub { sha256 = "0jmwhr2dqgj3vn0v26jh6c0id6n3wd6as3bq39xa870zlk7v307b"; meta = with lib; { - homepage = https://github.com/BornaIz/Lalezar; + homepage = "https://github.com/BornaIz/Lalezar"; description = "A multi-script display typeface for popular culture"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/lato/default.nix b/pkgs/data/fonts/lato/default.nix index ea9d1837ef5b5..2b9f6c1114f07 100644 --- a/pkgs/data/fonts/lato/default.nix +++ b/pkgs/data/fonts/lato/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "lato-2.0"; - url = http://www.latofonts.com/download/Lato2OFL.zip; + url = "http://www.latofonts.com/download/Lato2OFL.zip"; postFetch = '' mkdir -p $out/share/fonts @@ -13,7 +13,7 @@ fetchzip { sha256 = "1amwn6vcaggxrd2s4zw21s2pr47zmzdf2xfy4x9lxa2cd9bkhvg5"; meta = with lib; { - homepage = http://www.latofonts.com/; + homepage = "http://www.latofonts.com/"; description = '' Sans-serif typeface family designed in Summer 2010 by Łukasz Dziedzic diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix index 5657b8380a969..9a80b9a43df8b 100644 --- a/pkgs/data/fonts/league-of-moveable-type/default.nix +++ b/pkgs/data/fonts/league-of-moveable-type/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { open-source, @font-face ready fonts. ''; - homepage = https://www.theleagueofmoveabletype.com/; + homepage = "https://www.theleagueofmoveabletype.com/"; license = stdenv.lib.licenses.ofl; diff --git a/pkgs/data/fonts/liberastika/default.nix b/pkgs/data/fonts/liberastika/default.nix index 1bc3b9b20927f..c42bc9f756327 100644 --- a/pkgs/data/fonts/liberastika/default.nix +++ b/pkgs/data/fonts/liberastika/default.nix @@ -17,7 +17,7 @@ in fetchzip rec { meta = with lib; { description = "Liberation Sans fork with improved cyrillic support"; - homepage = https://sourceforge.net/projects/lib-ka/; + homepage = "https://sourceforge.net/projects/lib-ka/"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/data/fonts/liberation-fonts/default.nix b/pkgs/data/fonts/liberation-fonts/default.nix new file mode 100644 index 0000000000000..838a8d4c769b4 --- /dev/null +++ b/pkgs/data/fonts/liberation-fonts/default.nix @@ -0,0 +1,67 @@ +{ stdenv, fetchFromGitHub, fontforge, python3 }: +let + inherit (python3.pkgs) fonttools; + + common = + { version, repo, sha256, nativeBuildInputs, postPatch ? null }: + stdenv.mkDerivation rec { + pname = "liberation-fonts"; + inherit version; + + src = fetchFromGitHub { + owner = "liberationfonts"; + rev = version; + inherit repo sha256; + }; + + inherit nativeBuildInputs postPatch; + + installPhase = '' + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; + + install -m444 -Dt $out/share/doc/${pname}-${version} AUTHORS || true + install -m444 -Dt $out/share/doc/${pname}-${version} ChangeLog || true + install -m444 -Dt $out/share/doc/${pname}-${version} COPYING || true + install -m444 -Dt $out/share/doc/${pname}-${version} License.txt || true + install -m444 -Dt $out/share/doc/${pname}-${version} README || true + ''; + + meta = with stdenv.lib; { + description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; + longDescription = '' + The Liberation Fonts are intended to be replacements for the three most + commonly used fonts on Microsoft systems: Times New Roman, Arial, and + Courier New. Since 2012 they are based on croscore fonts. + + There are three sets: Sans (a substitute for Arial, Albany, Helvetica, + Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times + New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono + (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and + Bitstream Vera Sans Mono). + ''; + + license = licenses.ofl; + homepage = "https://github.com/liberationfonts"; + maintainers = with maintainers; [ raskin ]; + }; + }; +in +{ + liberation_ttf_v1 = common { + repo = "liberation-1.7-fonts"; + version = "1.07.5"; + nativeBuildInputs = [ fontforge ]; + sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v"; + }; + liberation_ttf_v2 = common { + repo = "liberation-fonts"; + version = "2.1.0"; + nativeBuildInputs = [ fontforge fonttools ]; + postPatch = '' + substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \ + 'font = ttLib.TTFont(fontfile)' \ + 'font = ttLib.TTFont(fontfile, recalcTimestamp=False)' + ''; + sha256 = "03xpzaas264x5n6qisxkhc68pkpn32m7y78qdm3rdkxdwi8mv8mz"; + }; +} diff --git a/pkgs/data/fonts/liberation-sans-narrow/default.nix b/pkgs/data/fonts/liberation-sans-narrow/default.nix index 51af6a20baea1..373704f25f539 100644 --- a/pkgs/data/fonts/liberation-sans-narrow/default.nix +++ b/pkgs/data/fonts/liberation-sans-narrow/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2; - homepage = https://github.com/liberationfonts; + homepage = "https://github.com/liberationfonts"; maintainers = [ maintainers.leenaars ]; }; } diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index eb0a47e13d962..bd47998b924f1 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "linux-libertine-5.3.0"; src = fetchurl { - url = mirror://sourceforge/linuxlibertine/5.3.0/LinLibertineSRC_5.3.0_2012_07_02.tgz; + url = "mirror://sourceforge/linuxlibertine/5.3.0/LinLibertineSRC_5.3.0_2012_07_02.tgz"; sha256 = "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v"; }; @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Linux Libertine Fonts"; - homepage = http://linuxlibertine.sf.net; + homepage = "http://linuxlibertine.sf.net"; maintainers = [ maintainers.volth ]; license = licenses.ofl; }; diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/data/fonts/libertinus/default.nix index 62aad87c902bf..7d95b6a26ff37 100644 --- a/pkgs/data/fonts/libertinus/default.nix +++ b/pkgs/data/fonts/libertinus/default.nix @@ -23,7 +23,7 @@ in fetchFromGitHub rec { that started as an OpenType math companion of the Libertine font family, but grown as a full fork to address some of the bugs in the fonts. ''; - homepage = https://github.com/alif-type/libertinus; + homepage = "https://github.com/alif-type/libertinus"; license = licenses.ofl; maintainers = with maintainers; [ siddharthist ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/libre-baskerville/default.nix b/pkgs/data/fonts/libre-baskerville/default.nix index f5e6083f94466..a4be7b5b3e6bf 100644 --- a/pkgs/data/fonts/libre-baskerville/default.nix +++ b/pkgs/data/fonts/libre-baskerville/default.nix @@ -23,7 +23,7 @@ fetchFromGitHub rec { counters and less contrast that allow it to work on small sizes in any screen. ''; - homepage = http://www.impallari.com/projects/overview/libre-baskerville; + homepage = "http://www.impallari.com/projects/overview/libre-baskerville"; license = licenses.ofl; maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/libre-bodoni/default.nix b/pkgs/data/fonts/libre-bodoni/default.nix index e55d50307415f..63bbf8eba724e 100644 --- a/pkgs/data/fonts/libre-bodoni/default.nix +++ b/pkgs/data/fonts/libre-bodoni/default.nix @@ -28,7 +28,7 @@ fetchFromGitHub rec { Libre Bodoni currently features four styles: Regular, Italic, Bold and Bold Italic. ''; - homepage = https://github.com/impallari/Libre-Bodoni; + homepage = "https://github.com/impallari/Libre-Bodoni"; license = licenses.ofl; maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/pkgs/data/fonts/libre-caslon/default.nix index 7a68c9deb5a62..1b5e5b1be690b 100644 --- a/pkgs/data/fonts/libre-caslon/default.nix +++ b/pkgs/data/fonts/libre-caslon/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Caslon fonts based on hand-lettered American Caslons of 1960s"; - homepage = http://www.impallari.com/librecaslon; + homepage = "http://www.impallari.com/librecaslon"; license = licenses.ofl; maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/libre-franklin/default.nix b/pkgs/data/fonts/libre-franklin/default.nix index 97832ab56517f..b41ae8878cc25 100644 --- a/pkgs/data/fonts/libre-franklin/default.nix +++ b/pkgs/data/fonts/libre-franklin/default.nix @@ -17,7 +17,7 @@ fetchFromGitHub rec { meta = with lib; { description = "A reinterpretation and expansion based on the 1912 Morris Fuller Benton’s classic."; - homepage = https://github.com/impallari/Libre-Franklin; + homepage = "https://github.com/impallari/Libre-Franklin"; license = licenses.ofl; maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/line-awesome/default.nix b/pkgs/data/fonts/line-awesome/default.nix new file mode 100644 index 0000000000000..f100f81b3d790 --- /dev/null +++ b/pkgs/data/fonts/line-awesome/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + pname = "line-awesome"; + version = "1.3.0"; + + src = fetchurl { + url = + "https://maxst.icons8.com/vue-static/landings/line-awesome/line-awesome/${version}/line-awesome-${version}.zip"; + hash = "sha256:07qkz8s1wjh5xwqlq1b4lpihr1zah3kh6bnqvfwvncld8l9wjqfk"; + }; + + nativeBuildInputs = [ unzip ]; + + sourceRoot = "${version}/fonts"; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + mkdir -p $out/share/fonts/woff + mkdir -p $out/share/fonts/woff2 + cp *.ttf $out/share/fonts/truetype + cp *.woff $out/share/fonts/woff + cp *.woff2 $out/share/fonts/woff2 + ''; + + meta = with lib; { + description = "Replace Font Awesome with modern line icons"; + longDescription = '' + This package includes only the TTF, WOFF and WOFF2 fonts. For full CSS etc. see the project website. + ''; + homepage = "https://icons8.com/line-awesome"; + license = licenses.mit; + maintainers = with maintainers; [ puzzlewolf ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/lmmath/default.nix b/pkgs/data/fonts/lmmath/default.nix index c971a699b2a5b..a66bd48c897ad 100644 --- a/pkgs/data/fonts/lmmath/default.nix +++ b/pkgs/data/fonts/lmmath/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { meta = with lib; { description = "The Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth."; - homepage = http://www.gust.org.pl/projects/e-foundry/lm-math; + homepage = "http://www.gust.org.pl/projects/e-foundry/lm-math"; # "The Latin Modern Math font is licensed under the GUST Font License (GFL), # which is a free license, legally equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or later." - GUST website diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix index 1b277a0691ce2..53fc456d75839 100644 --- a/pkgs/data/fonts/lmodern/default.nix +++ b/pkgs/data/fonts/lmodern/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "lmodern-2.004.5"; - url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.5.orig.tar.gz; + url = "mirror://debian/pool/main/l/lmodern/lmodern_2.004.5.orig.tar.gz"; postFetch = '' tar xzvf $downloadedFile diff --git a/pkgs/data/fonts/lobster-two/default.nix b/pkgs/data/fonts/lobster-two/default.nix index 773b53c889218..d5a46b43fb493 100644 --- a/pkgs/data/fonts/lobster-two/default.nix +++ b/pkgs/data/fonts/lobster-two/default.nix @@ -70,7 +70,7 @@ in outputHash = "0if9l8pzwgfnbdjg5yblcy08dwn9yj3wzz29l0fycia46xlzd4ym"; meta = with stdenv.lib; { - homepage = https://github.com/librefonts/lobstertwo; + homepage = "https://github.com/librefonts/lobstertwo"; description = "Script font with many ligatures"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/lohit-fonts/default.nix b/pkgs/data/fonts/lohit-fonts/default.nix index 0e8b1f8fe4dbe..64ae831767bb4 100644 --- a/pkgs/data/fonts/lohit-fonts/default.nix +++ b/pkgs/data/fonts/lohit-fonts/default.nix @@ -46,7 +46,7 @@ let meta = { inherit license; description = "Free and open source fonts for Indian languages (" + label + ")"; - homepage = https://pagure.io/lohit; + homepage = "https://pagure.io/lohit"; maintainers = [ lib.maintainers.mathnerd314 lib.maintainers.ttuegel ]; # Set a non-zero priority to allow easy overriding of the # fontconfig configuration files. diff --git a/pkgs/data/fonts/luculent/default.nix b/pkgs/data/fonts/luculent/default.nix index 7e5a69a2c1f7d..9d61931db365d 100644 --- a/pkgs/data/fonts/luculent/default.nix +++ b/pkgs/data/fonts/luculent/default.nix @@ -3,7 +3,7 @@ let version = "2.0.0"; in fetchzip { name = "luculent-${version}"; - url = http://www.eastfarthing.com/luculent/luculent.tar.xz; + url = "http://www.eastfarthing.com/luculent/luculent.tar.xz"; postFetch = '' tar -xJf $downloadedFile --strip-components=1 @@ -15,7 +15,7 @@ fetchzip { meta = with lib; { description = "luculent font"; - homepage = http://www.eastfarthing.com/luculent/; + homepage = "http://www.eastfarthing.com/luculent/"; license = licenses.ofl; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/manrope/default.nix b/pkgs/data/fonts/manrope/default.nix index 9dce73a28aae6..9bf4f32caeb27 100644 --- a/pkgs/data/fonts/manrope/default.nix +++ b/pkgs/data/fonts/manrope/default.nix @@ -15,7 +15,7 @@ in fetchFromGitHub { ''; meta = with lib; { description = "Open-source modern sans-serif font family"; - homepage = https://github.com/sharanda/manrope; + homepage = "https://github.com/sharanda/manrope"; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/data/fonts/marathi-cursive/default.nix b/pkgs/data/fonts/marathi-cursive/default.nix index 60c77dddc8dd3..8c228fd91a752 100644 --- a/pkgs/data/fonts/marathi-cursive/default.nix +++ b/pkgs/data/fonts/marathi-cursive/default.nix @@ -1,24 +1,22 @@ -{ lib, fetchzip, p7zip }: +{ lib, fetchzip }: let - version = "1.2"; + version = "2.0"; in fetchzip rec { name = "marathi-cursive-${version}"; - url = "https://github.com/MihailJP/MarathiCursive/releases/download/${version}/MarathiCursive-${version}.7z"; + url = "https://github.com/MihailJP/MarathiCursive/releases/download/v${version}/MarathiCursive-${version}.tar.xz"; postFetch = '' - ${p7zip}/bin/7z x $downloadedFile - cd MarathiCursive - + tar -xJf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts/marathi-cursive *.otf *.ttf - install -m444 -Dt $out/share/doc/${name} README *.txt + install -m444 -Dt $out/share/doc/${name} README *.txt ''; - sha256 = "0wq4w79x8r5w6ikm9amcmapf0jcdgifs9zf1pbnw3fk4ncz5s551"; + sha256 = "17pj60ajnjghxhxka8a046mz6vfwr79wnby7xd6pg5hgncin2hgg"; meta = with lib; { - homepage = https://github.com/MihailJP/MarathiCursive; + homepage = "https://github.com/MihailJP/MarathiCursive"; description = "Modi script font with Graphite and OpenType support"; maintainers = with maintainers; [ mathnerd314 ]; license = licenses.mit; # It's the M+ license, M+ is MIT(-ish) diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix index 201b0dfe417ce..72dc5fe6313c0 100644 --- a/pkgs/data/fonts/material-design-icons/default.nix +++ b/pkgs/data/fonts/material-design-icons/default.nix @@ -25,7 +25,7 @@ in fetchFromGitHub { developers targeting various platforms to download icons in the format, color and size they need for any project. ''; - homepage = https://materialdesignicons.com; + homepage = "https://materialdesignicons.com"; license = with licenses; [ asl20 # for icons from: https://github.com/google/material-design-icons ofl diff --git a/pkgs/data/fonts/material-icons/default.nix b/pkgs/data/fonts/material-icons/default.nix index 0126fbac225e0..656be1b153eb3 100644 --- a/pkgs/data/fonts/material-icons/default.nix +++ b/pkgs/data/fonts/material-icons/default.nix @@ -18,7 +18,7 @@ in fetchFromGitHub { meta = with lib; { description = "System status icons by Google, featuring material design"; - homepage = https://material.io/icons; + homepage = "https://material.io/icons"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ mpcsh ]; diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix index a041f9ce907a0..2837e488389bf 100644 --- a/pkgs/data/fonts/meslo-lg/default.nix +++ b/pkgs/data/fonts/meslo-lg/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "A customized version of Apple’s Menlo-Regular font"; - homepage = https://github.com/andreberg/Meslo-Font/; + homepage = "https://github.com/andreberg/Meslo-Font/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ balajisivaraman ]; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/data/fonts/migmix/default.nix b/pkgs/data/fonts/migmix/default.nix index 8a089ea9e79f5..1b3313d4e026e 100644 --- a/pkgs/data/fonts/migmix/default.nix +++ b/pkgs/data/fonts/migmix/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high-quality Japanese font based on M+ fonts and IPA fonts"; - homepage = http://mix-mplus-ipa.osdn.jp/migmix; + homepage = "http://mix-mplus-ipa.osdn.jp/migmix"; license = licenses.ipa; maintainers = [ maintainers.mikoim ]; }; diff --git a/pkgs/data/fonts/migu/default.nix b/pkgs/data/fonts/migu/default.nix index 775d1766894cc..530fd4f543f2a 100644 --- a/pkgs/data/fonts/migu/default.nix +++ b/pkgs/data/fonts/migu/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high-quality Japanese font based on modified M+ fonts and IPA fonts"; - homepage = http://mix-mplus-ipa.osdn.jp/migu/; + homepage = "http://mix-mplus-ipa.osdn.jp/migu/"; license = licenses.ipa; maintainers = [ maintainers.mikoim ]; }; diff --git a/pkgs/data/fonts/mno16/default.nix b/pkgs/data/fonts/mno16/default.nix index 2a700be113a46..1b311d2c25a2a 100644 --- a/pkgs/data/fonts/mno16/default.nix +++ b/pkgs/data/fonts/mno16/default.nix @@ -15,7 +15,7 @@ in fetchzip rec { meta = with lib; { description = "minimalist monospaced font"; - homepage = https://sev.dev/fonts/mno16; + homepage = "https://sev.dev/fonts/mno16"; license = licenses.cc0; }; } diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix index 22714170fa4b2..f62f4961fc7af 100644 --- a/pkgs/data/fonts/monoid/default.nix +++ b/pkgs/data/fonts/monoid/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://larsenwork.com/monoid; + homepage = "http://larsenwork.com/monoid"; description = "Customisable coding font with alternates, ligatures and contextual positioning"; license = [ licenses.ofl licenses.mit ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/data/fonts/mononoki/default.nix index 658c3bdf20a79..195c39c0e817f 100644 --- a/pkgs/data/fonts/mononoki/default.nix +++ b/pkgs/data/fonts/mononoki/default.nix @@ -15,7 +15,7 @@ in fetchzip { sha256 = "19y4xg7ilm21h9yynyrwcafdqn05zknpmmjrb37qim6p0cy2glff"; meta = with lib; { - homepage = https://github.com/madmalik/mononoki; + homepage = "https://github.com/madmalik/mononoki"; description = "A font for programming and code review"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix index 4230e63360b54..10a8dc38d9549 100644 --- a/pkgs/data/fonts/mph-2b-damase/default.nix +++ b/pkgs/data/fonts/mph-2b-damase/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "MPH-2B-Damase-2"; - url = http://www.wazu.jp/downloads/damase_v.2.zip; + url = "http://www.wazu.jp/downloads/damase_v.2.zip"; postFetch = '' mkdir -p $out/share/fonts diff --git a/pkgs/data/fonts/mro-unicode/default.nix b/pkgs/data/fonts/mro-unicode/default.nix index bb5a1ed8a9f1e..9f4eda63d0fa1 100644 --- a/pkgs/data/fonts/mro-unicode/default.nix +++ b/pkgs/data/fonts/mro-unicode/default.nix @@ -10,7 +10,7 @@ fetchzip { sha256 = "1i71bjd9gdyn8ladfncbfhz6xz1h8xx8yf876j1z8lh719410c8g"; meta = with lib; { - homepage = https://github.com/phjamr/MroUnicode; + homepage = "https://github.com/phjamr/MroUnicode"; description = "Unicode-compliant Mro font"; maintainers = with maintainers; [ mathnerd314 ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/myrica/default.nix b/pkgs/data/fonts/myrica/default.nix index 444d526f5ae1b..aa5ee0ff1c380 100644 --- a/pkgs/data/fonts/myrica/default.nix +++ b/pkgs/data/fonts/myrica/default.nix @@ -15,7 +15,7 @@ fetchFromGitHub { ''; meta = with lib; { - homepage = https://myrica.estable.jp/; + homepage = "https://myrica.estable.jp/"; license = licenses.ofl; maintainers = with maintainers; [ mikoim ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix index d2aaadc42794d..11e1ccb564513 100644 --- a/pkgs/data/fonts/nafees/default.nix +++ b/pkgs/data/fonts/nafees/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { Al-Hussaini (Nafees Raqam) one of the finest calligraphers of Pakistan ''; - homepage = http://www.cle.org.pk/software/localization.htm; + homepage = "http://www.cle.org.pk/software/localization.htm"; # Used to be GPLv2. The license distributed with the fonts looks # more like a modified BSD, but still contains the GPLv2 embedded diff --git a/pkgs/data/fonts/nahid-fonts/default.nix b/pkgs/data/fonts/nahid-fonts/default.nix index b9d9025b2c08c..0e08bebea0920 100644 --- a/pkgs/data/fonts/nahid-fonts/default.nix +++ b/pkgs/data/fonts/nahid-fonts/default.nix @@ -16,7 +16,7 @@ in fetchFromGitHub { sha256 = "0df169sibq14j2mj727sq86c00jm1nz8565v85hkvh4zgz2plb7c"; meta = with lib; { - homepage = https://github.com/rastikerdar/nahid-font; + homepage = "https://github.com/rastikerdar/nahid-font"; description = "A Persian (Farsi) Font - قلم (فونت) فارسی ناهید"; license = licenses.free; platforms = platforms.all; diff --git a/pkgs/data/fonts/nanum-gothic-coding/default.nix b/pkgs/data/fonts/nanum-gothic-coding/default.nix index 7d908b62cc6d2..4785c1386a623 100644 --- a/pkgs/data/fonts/nanum-gothic-coding/default.nix +++ b/pkgs/data/fonts/nanum-gothic-coding/default.nix @@ -17,7 +17,7 @@ in fetchzip { meta = with lib; { description = "A contemporary monospaced sans-serif typeface with a warm touch"; - homepage = https://github.com/naver/nanumfont; + homepage = "https://github.com/naver/nanumfont"; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ linarcx ]; diff --git a/pkgs/data/fonts/national-park/default.nix b/pkgs/data/fonts/national-park/default.nix index bc8fc8041a81c..8ed251de53d51 100644 --- a/pkgs/data/fonts/national-park/default.nix +++ b/pkgs/data/fonts/national-park/default.nix @@ -17,7 +17,7 @@ in fetchzip { meta = with lib; { description = ''Typeface designed to mimic the national park service signs that are carved using a router bit''; - homepage = https://nationalparktypeface.com/; + homepage = "https://nationalparktypeface.com/"; license = licenses.ofl; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index 8ffd0e3e43fd8..35f43c14df485 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -1,35 +1,68 @@ -{ stdenv, fetchFromGitHub, which, withFont ? "" }: +{ stdenv +, fetchurl +, lib +, unzip +# To select only certain fonts, put a list of strings to `fonts`: every key in +# ./shas.nix is an optional font +, fonts ? [] +}: + +let + # both of these files are generated via ./update.sh + version = import ./version.nix; + fontsShas = import ./shas.nix; + knownFonts = builtins.attrNames fontsShas; + selectedFonts = if (fonts == []) then + knownFonts + else + let unknown = lib.subtractLists knownFonts fonts; in + if (unknown != []) then + throw "Unknown font(s): ${lib.concatStringsSep " " unknown}" + else + fonts + ; + selectedFontsShas = lib.attrsets.genAttrs selectedFonts ( + fName: + fontsShas."${fName}" + ); + srcs = lib.attrsets.mapAttrsToList ( + fName: + fSha: + (fetchurl { + url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/${fName}.zip"; + sha256 = fSha; + }) + ) selectedFontsShas; +in stdenv.mkDerivation rec { - version = "2.1.0"; + inherit version; + inherit srcs; pname = "nerdfonts"; - src = fetchFromGitHub { - owner = "ryanoasis"; - repo = "nerd-fonts"; - rev = version; - sha256 = "1la79y16k9rwcl2zsxk73c0kgdms2ma43kpjfqnq5jlbfdj0niwg"; - }; - dontPatchShebangs = true; - buildInputs = [ which ]; - patchPhase = '' - patchShebangs install.sh - sed -i -e 's|font_dir="\$HOME/.local/share/fonts|font_dir="$out/share/fonts/truetype|g' install.sh + nativeBuildInputs = [ + unzip + ]; + sourceRoot = "."; + buildPhase = '' + echo "selected fonts are ${toString selectedFonts}" + ls *.otf *.ttf ''; installPhase = '' - mkdir -p $out/share/fonts/truetype - ./install.sh ${withFont} + find -name \*.otf -exec mkdir -p $out/share/fonts/opentype/NerdFonts \; -exec mv {} $out/share/fonts/opentype/NerdFonts \; + find -name \*.ttf -exec mkdir -p $out/share/fonts/truetype/NerdFonts \; -exec mv {} $out/share/fonts/truetype/NerdFonts \; ''; meta = with stdenv.lib; { - description = '' + description = "Iconic font aggregator, collection, & patcher. 3,600+ icons, 50+ patched fonts"; + longDescription = '' Nerd Fonts is a project that attempts to patch as many developer targeted and/or used fonts as possible. The patch is to specifically add a high number of additional glyphs from popular 'iconic fonts' such as Font Awesome, Devicons, Octicons, and others. ''; - homepage = https://github.com/ryanoasis/nerd-fonts; + homepage = "https://nerdfonts.com/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ doronbehar ]; hydraPlatforms = []; # 'Output limit exceeded' on Hydra }; } diff --git a/pkgs/data/fonts/nerdfonts/shas.nix b/pkgs/data/fonts/nerdfonts/shas.nix new file mode 100644 index 0000000000000..e360dd042b12c --- /dev/null +++ b/pkgs/data/fonts/nerdfonts/shas.nix @@ -0,0 +1,52 @@ +{ + "3270" = "1k71zsijasn6013c58pgf52xw3h9gkqdjlsa177wlldz8qxb16xk"; + "Agave" = "0jgm31wvmckb71qc9l0nj3sg4zq2vw67piaxr6h8zkakcl2mysha"; + "AnonymousPro" = "0s3n8rrr9kfqd8gxjxksp7p8bc3q7qhcrpyq8090dksvmbcks6xm"; + "Arimo" = "1k7ldfx6dmy9sigzsvi9qwms510nddw634g8xrn0vwnw6d7infk8"; + "AurulentSansMono" = "0q35948dai8qc7gfvas8sfn5s7b64b2y4f9psz6xslrv7nw8lcaz"; + "BigBlueTerminal" = "0ymw2m2xjsx77brm79aws26icwcf2a1d7q3p3ipsd25g4cgqcd2v"; + "BitstreamVeraSansMono" = "1n2298g1fn8jb1fbvw74289n7nnmjddn7zxh88gnl58pwz8ra5dk"; + "CascadiaCode" = "1q4l5a7b7ab6h1bs5pq734r9pp3fw9b59gdk1g4hyn2w61h0kdcj"; + "CodeNewRoman" = "1mgxawj3pblaxy0y9w0hzlfgipiskmc5p028m82zh1wyaplmh2pa"; + "Cousine" = "0jr0gxrsba3dhchp53vd67qq2pgfnvmvcwbv99l1700p539bcvy1"; + "DaddyTimeMono" = "1n6vwykz084fxgylayizxc210f4ms2ijfws5b2hvl2kqmy2q6jk4"; + "DejaVuSansMono" = "03qfrkzmhnn8dwgx4qhiigbz4dxs3957hydlr0j8vxl89j8c9g1z"; + "DroidSansMono" = "187cbcn4a2whrl8dag1ix6j1v3jgv5z2jdfw1w1z9llm1znvpp7z"; + "FantasqueSansMono" = "147h15k3ni0w6chxkrah2fk4klhdhq8y1d3nbx763h9ia3mnggv6"; + "FiraCode" = "1rx7zrkq0584k6hrh6dx30xrnz5nq379xyw73pfd4gxaxnh9mpi1"; + "FiraMono" = "0f2daidakhmbbd5ph6985rghjmr87k7xzmmmf9n851dxvfyndsgl"; + "Go-Mono" = "1bzh3pgyn87j27kw7x5h02rqzhh21pm6d0zhxd5iqi5qq5mj0nvm"; + "Gohu" = "1rlkprjg9nz1s69s4ancmxii6l907qachl116gngbj8gjv3g1x21"; + "Hack" = "052mav170lwxkgzg3hij4zvnmfwyrddn45gn07a33gpzzicjx1bh"; + "Hasklig" = "0vyb0z0m04pn8477d6a711vjwb3nhvpn5fxfwnz37av9jmz3i9vk"; + "HeavyData" = "065rhq7z52dp211inw3vszwc5zrd5s0w1kmgnrh68bxc0js0xqyb"; + "Hermit" = "1ij9pjr517jxk3dlsrzmnqivsfq5i5ai6pd8hznmrkb3360cn7sm"; + "iA-Writer" = "0clksrxw6xcv5c1pbd8rl2rc3r15iak1qv8v6bn0j2mccjcss64z"; + "IBMPlexMono" = "0xkfkpnkkrvjfiv624l7lpmfji107y7645w6ah47ijyg47yxkmsg"; + "Inconsolata" = "14gbwc0k3d1j496w6pv9kry1pglswzd0armsdb0g1mqgzfdf1ci1"; + "InconsolataGo" = "0c6yhx242d82dalyjas42qniy0jagqs47cfsfarwmzar6zg3lj5m"; + "InconsolataLGC" = "1746nl1rz4hscfgbmd8642wq3z1wizvfjb50y3yyjsc1ixc1f0pd"; + "Iosevka" = "1qqd4xh98vxb99rh2a2qv9gjclilhaw84pyqdpbx225qhvw9xlkb"; + "JetBrainsMono" = "1kc8fyk1aczxkmn8dzv1gy6xfi2jywgahd8np576v2dn8kx16844"; + "Lekton" = "0mny5j9bns9104wg2wmabdw0sl80c7i3dzp4j5mxh8jybx929d3i"; + "LiberationMono" = "19bpm893assmmnfvlvhz8df54c9pr2kfv2b6anlr4g64hliy1c1h"; + "Meslo" = "08zm8nqskhrqkw80wl460zbvsrvs5fp2njlcv867phpqna9hyqzh"; + "Monofur" = "0f5khqgdxi4g0qm5n48r1sk4pd2wlk987d8yxwks2mcsqa6fraqj"; + "Monoid" = "0m7i82jfiwqmi9lhv8lmq2n723ihn0isxi5559478qbdy5b104dd"; + "Mononoki" = "074avnvfl260pcrli4h5bc55yqr4mgd54paf80qcnh101qsz325w"; + "MPlus" = "03mrfhzfmmqjfl7fa81v1ih3fdr3q2k439w6pjbd2zvl806l92yq"; + "Noto" = "1jmycnf4fflijs730vbyj258kajkxv0j42655a7hvpapym7z940z"; + "OpenDyslexic" = "0ma62xg6cy8l4chfhqvm64zzhx3mrzdj6gxwnvx8plqy3j4dn3by"; + "Overpass" = "1xs2z3ch7dd32zb5l1axzd78hyskimqglcjcrb7n4ic85qm55xxm"; + "ProFont" = "0ck4rprj0w29pv3qm4n1zg6cdq76m3kaag0ka4q1qqcnhga67zr7"; + "ProggyClean" = "0sk3gk6zj61nbv94xv6z8y67sr5blg9n079d8srv7bbw9dv96i8g"; + "RobotoMono" = "1nhbr9zc0cz81pdj95rrb56bwdkmmbqmk429nf60j35pkcqmvk8x"; + "ShareTechMono" = "1h79myy0my3jyrvqcrgfdsjqrwwm5fdy2nmzp3ynyi769p7z1dwr"; + "SourceCodePro" = "06cnsdmm84kzjlwwcmhwpj7pyfqinqpmww1c13i21l611fg6hwd7"; + "SpaceMono" = "1xmmf2gdsa3ycl3pgpr3zr919qh702wjvc5k4hsdivvs2lzfdgmk"; + "Terminus" = "0g2ybs225fwxmvwfnanc32jc2lfnag3agmliv1vrb5mxyqzm53gj"; + "Tinos" = "077n4k6yh4qbirfkl02zqn3057kymspr10zcbfkf4ldvifa36pjd"; + "Ubuntu" = "1lzdrgb8vk5dwicxhvkgbain5phf88g3zgv5ya2ihh052xsl3qih"; + "UbuntuMono" = "0wa8ri7f3g8vwd194q812qh8nzplnmhl5ak0yhgilmm44s46ad0h"; + "VictorMono" = "18z92kwggfqwrd5m09yda55hcb4b159278lps6f9hr8icwki6v9q"; +} diff --git a/pkgs/data/fonts/nerdfonts/update.sh b/pkgs/data/fonts/nerdfonts/update.sh new file mode 100755 index 0000000000000..ccfab174dd8f1 --- /dev/null +++ b/pkgs/data/fonts/nerdfonts/update.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nix-prefetch jq + +latest_release=$(curl --silent https://api.github.com/repos/ryanoasis/nerd-fonts/releases/latest) +version=$(jq -r '.tag_name' <<<"$latest_release") + +dirname="$(dirname "$0")" +echo \""${version#v}"\" >"$dirname/version.nix" + +echo Using version "$version" + +printf '{\n' > "$dirname/shas.nix" + +while + read -r name + read -r url +do + printf '\t"%s" = "%s";\n' "${name%.*}" "$(nix-prefetch-url "$url")" >>"$dirname/shas.nix" +done < <(jq -r '.assets[] | .name, .browser_download_url' <<<"$latest_release") + +printf '}\n' >> "$dirname/shas.nix" diff --git a/pkgs/data/fonts/nerdfonts/version.nix b/pkgs/data/fonts/nerdfonts/version.nix new file mode 100644 index 0000000000000..8320adbf02586 --- /dev/null +++ b/pkgs/data/fonts/nerdfonts/version.nix @@ -0,0 +1 @@ +"2.1.0" diff --git a/pkgs/data/fonts/nika-fonts/default.nix b/pkgs/data/fonts/nika-fonts/default.nix index 3f58bc5f93362..5db9bb2a95183 100644 --- a/pkgs/data/fonts/nika-fonts/default.nix +++ b/pkgs/data/fonts/nika-fonts/default.nix @@ -16,7 +16,7 @@ in fetchFromGitHub { sha256 = "1x34b2dqn1dymi1vmj5vrjcy2z8s0f3rr6cniyrz85plvid6x40i"; meta = with lib; { - homepage = https://github.com/font-store/NikaFont/; + homepage = "https://github.com/font-store/NikaFont/"; description = "Persian/Arabic Open Source Font"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/norwester/default.nix b/pkgs/data/fonts/norwester/default.nix index ae70c74c3e49f..d4e4cf1ee0fea 100644 --- a/pkgs/data/fonts/norwester/default.nix +++ b/pkgs/data/fonts/norwester/default.nix @@ -16,7 +16,7 @@ in fetchzip { sha256 = "1npsaiiz9g5z6315lnmynwcnrfl37fyxc7w1mhkw1xbzcnv74z4r"; meta = with lib; { - homepage = http://jamiewilson.io/norwester; + homepage = "http://jamiewilson.io/norwester"; description = "A condensed geometric sans serif by Jamie Wilson"; maintainers = with maintainers; [ leenaars ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 9681bb50efac0..f4a6dba302913 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -40,7 +40,7 @@ let meta = with lib; { description = "Beautiful and free fonts for many languages"; - homepage = https://www.google.com/get/noto/; + homepage = "https://www.google.com/get/noto/"; longDescription = '' When text is rendered by a computer, sometimes characters are @@ -89,7 +89,7 @@ in meta = with lib; { description = "Beautiful and free fonts for CJK languages"; - homepage = https://www.google.com/get/noto/help/cjk/; + homepage = "https://www.google.com/get/noto/help/cjk/"; longDescription = '' Noto Sans CJK is a sans serif typeface designed as an intermediate style @@ -140,7 +140,7 @@ in meta = with lib; { inherit version; description = "Color and Black-and-White emoji fonts"; - homepage = https://github.com/googlei18n/noto-emoji; + homepage = "https://github.com/googlei18n/noto-emoji"; license = with licenses; [ ofl asl20 ]; platforms = platforms.all; maintainers = with maintainers; [ mathnerd314 ]; diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index d91ace35e2c8f..3cc1570161e63 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { patches = lib.optionals isPy3k [ # Additional Python 3 compat https://github.com/googlefonts/nototools/pull/497 (fetchpatch { - url = https://github.com/googlefonts/nototools/commit/ded1f311b3260f015b5c5b80f05f7185392c4eff.patch; + url = "https://github.com/googlefonts/nototools/commit/ded1f311b3260f015b5c5b80f05f7185392c4eff.patch"; sha256 = "0bn0rlbddxicw0h1dnl0cibgj6xjalja2qcm563y7kk3z5cdwhgq"; }) ]; @@ -43,6 +43,6 @@ buildPythonPackage rec { meta = { description = "Noto fonts support tools and scripts plus web site generation"; license = lib.licenses.asl20; - homepage = https://github.com/googlefonts/nototools; + homepage = "https://github.com/googlefonts/nototools"; }; } diff --git a/pkgs/data/fonts/office-code-pro/default.nix b/pkgs/data/fonts/office-code-pro/default.nix index 4354725c90cee..0513baf486802 100644 --- a/pkgs/data/fonts/office-code-pro/default.nix +++ b/pkgs/data/fonts/office-code-pro/default.nix @@ -25,7 +25,7 @@ in fetchFromGitHub rec { Incorporated. The customizations were made specifically for text editors and coding environments, but are still very usable in other applications. ''; - homepage = https://github.com/nathco/Office-Code-Pro; + homepage = "https://github.com/nathco/Office-Code-Pro"; license = licenses.ofl; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/data/fonts/oldsindhi/default.nix b/pkgs/data/fonts/oldsindhi/default.nix index c2ea6a7180b32..e0e783fd80a50 100644 --- a/pkgs/data/fonts/oldsindhi/default.nix +++ b/pkgs/data/fonts/oldsindhi/default.nix @@ -1,26 +1,25 @@ -{ lib, fetchzip, p7zip }: +{ lib, fetchzip }: let - version = "0.1"; + version = "1.0"; in fetchzip rec { name = "oldsindhi-${version}"; - url = "https://github.com/MihailJP/oldsindhi/releases/download/0.1/OldSindhi-0.1.7z"; + url = "https://github.com/MihailJP/oldsindhi/releases/download/v${version}/OldSindhi-${version}.tar.xz"; postFetch = '' - ${p7zip}/bin/7z x $downloadedFile - - install -m444 -Dt $out/share/fonts/truetype OldSindhi/*.ttf - install -m444 -Dt $out/share/doc/${name} OldSindhi/README OldSindhi/*.txt + tar -xJf $downloadedFile --strip-components=1 + install -m444 -Dt $out/share/fonts/truetype *.ttf + install -m444 -Dt $out/share/doc/${name} README *.txt ''; - sha256 = "0d4l9cg2vmh2pvnqsla8mgcwvc7wjxzcabhlli6633h3ifj2yp7b"; + sha256 = "03c483vbrwz2fpdfbys42fmik9788zxfmjmc4fgq4s2d0mraa0j1"; meta = with lib; { - homepage = https://github.com/MihailJP/oldsindhi; + homepage = "https://github.com/MihailJP/oldsindhi"; description = "Free Sindhi Khudabadi font"; maintainers = with maintainers; [ mathnerd314 ]; - license = licenses.bsd2; + license = with licenses; [mit ofl]; platforms = platforms.all; }; } diff --git a/pkgs/data/fonts/oldstandard/default.nix b/pkgs/data/fonts/oldstandard/default.nix index cd0d0063efb2f..5284ec7e119fd 100644 --- a/pkgs/data/fonts/oldstandard/default.nix +++ b/pkgs/data/fonts/oldstandard/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { sha256 = "1qwfsyp51grr56jcnkkmnrnl3r20pmhp9zh9g88kp64m026cah6n"; meta = with lib; { - homepage = https://github.com/akryukov/oldstand; + homepage = "https://github.com/akryukov/oldstand"; description = "An attempt to revive a specific type of Modern style of serif typefaces"; maintainers = with maintainers; [ raskin rycee ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix index 8519c34689136..f22ce9f882f82 100644 --- a/pkgs/data/fonts/open-dyslexic/default.nix +++ b/pkgs/data/fonts/open-dyslexic/default.nix @@ -5,7 +5,7 @@ let in fetchzip { name = "open-dyslexic-${version}"; - url = https://github.com/antijingoist/open-dyslexic/archive/20160623-Stable.zip; + url = "https://github.com/antijingoist/open-dyslexic/archive/20160623-Stable.zip"; postFetch = '' mkdir -p $out/share/{doc,fonts} @@ -16,7 +16,7 @@ in fetchzip { sha256 = "1vl8z5rknh2hpr2f0v4b2qgs5kclx5pzyk8al7243k5db82a2cyi"; meta = with lib; { - homepage = https://opendyslexic.org/; + homepage = "https://opendyslexic.org/"; description = "Font created to increase readability for readers with dyslexia"; license = "Bitstream Vera License (https://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts)"; platforms = platforms.all; diff --git a/pkgs/data/fonts/open-sans/default.nix b/pkgs/data/fonts/open-sans/default.nix index 0c1293ebda3f3..e92f758025217 100644 --- a/pkgs/data/fonts/open-sans/default.nix +++ b/pkgs/data/fonts/open-sans/default.nix @@ -23,7 +23,7 @@ in fetchFromGitLab { Open Sans is a humanist sans serif typeface designed by Steve Matteson, Type Director of Ascender Corp. ''; - homepage = https://www.opensans.com; + homepage = "https://www.opensans.com"; license = licenses.asl20; platforms = platforms.all; maintainers = [ maintainers.worldofpeace ]; diff --git a/pkgs/data/fonts/orbitron/default.nix b/pkgs/data/fonts/orbitron/default.nix index 699345f753eb3..4c00b086e10dc 100644 --- a/pkgs/data/fonts/orbitron/default.nix +++ b/pkgs/data/fonts/orbitron/default.nix @@ -18,7 +18,7 @@ in fetchFromGitHub { sha256 = "1y9yzvpqs2v3ssnqk2iiglrh8amgsscnk8vmfgnqgqi9f4dhdvnv"; meta = with lib; { - homepage = https://www.theleagueofmoveabletype.com/orbitron; + homepage = "https://www.theleagueofmoveabletype.com/orbitron"; downloadPage = "https://www.theleagueofmoveabletype.com/orbitron/download"; description = '' Geometric sans-serif for display purposes by Matt McInerney''; diff --git a/pkgs/data/fonts/parastoo-fonts/default.nix b/pkgs/data/fonts/parastoo-fonts/default.nix index d297baddc4d78..7c713576a21c4 100644 --- a/pkgs/data/fonts/parastoo-fonts/default.nix +++ b/pkgs/data/fonts/parastoo-fonts/default.nix @@ -17,7 +17,7 @@ in fetchFromGitHub { sha256 = "10jbii6rskcy4akjl5yfcqv4mfwk3nqnx36l6sbxks43va9l04f4"; meta = with lib; { - homepage = https://github.com/rastikerdar/parastoo-font; + homepage = "https://github.com/rastikerdar/parastoo-font"; description = "A Persian (Farsi) Font - فونت ( قلم ) فارسی پرستو"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix index 6b619d232016f..54dbe3abf4eaf 100644 --- a/pkgs/data/fonts/paratype-pt/mono.nix +++ b/pkgs/data/fonts/paratype-pt/mono.nix @@ -4,8 +4,8 @@ fetchzip { name = "paratype-pt-mono"; url = [ - https://company.paratype.com/system/attachments/631/original/ptmono.zip - http://rus.paratype.ru/system/attachments/631/original/ptmono.zip + "https://company.paratype.com/system/attachments/631/original/ptmono.zip" + "http://rus.paratype.ru/system/attachments/631/original/ptmono.zip" ]; postFetch = '' @@ -17,7 +17,7 @@ fetchzip { sha256 = "07kl82ngby55khvzsvn831ddpc0q8djgz2y6gsjixkyjfdk2xjjm"; meta = with stdenv.lib; { - homepage = http://www.paratype.ru/public/; + homepage = "http://www.paratype.ru/public/"; description = "An open Paratype font"; license = "Open Paratype license"; diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix index a369280902647..afaba6804f8b9 100644 --- a/pkgs/data/fonts/paratype-pt/sans.nix +++ b/pkgs/data/fonts/paratype-pt/sans.nix @@ -4,8 +4,8 @@ fetchzip { name = "paratype-pt-sans"; url = [ - https://company.paratype.com/system/attachments/629/original/ptsans.zip - http://rus.paratype.ru/system/attachments/629/original/ptsans.zip + "https://company.paratype.com/system/attachments/629/original/ptsans.zip" + "http://rus.paratype.ru/system/attachments/629/original/ptsans.zip" ]; postFetch = '' @@ -17,7 +17,7 @@ fetchzip { sha256 = "01fkd417gv98jf3a6zyfi9w2dkqsbddy1vacga2672yf0kh1z1r0"; meta = with stdenv.lib; { - homepage = http://www.paratype.ru/public/; + homepage = "http://www.paratype.ru/public/"; description = "An open Paratype font"; license = "Open Paratype license"; diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix index d74295571e002..a6f21e425f8d2 100644 --- a/pkgs/data/fonts/paratype-pt/serif.nix +++ b/pkgs/data/fonts/paratype-pt/serif.nix @@ -4,8 +4,8 @@ fetchzip { name = "paratype-pt-serif"; url = [ - https://company.paratype.com/system/attachments/634/original/ptserif.zip - http://rus.paratype.ru/system/attachments/634/original/ptserif.zip + "https://company.paratype.com/system/attachments/634/original/ptserif.zip" + "http://rus.paratype.ru/system/attachments/634/original/ptserif.zip" ]; postFetch = '' @@ -17,7 +17,7 @@ fetchzip { sha256 = "1iw5qi4ag3yp1lwmi91lb18gr768bqwl46xskaqnkhr9i9qp0v6d"; meta = with stdenv.lib; { - homepage = http://www.paratype.ru/public/; + homepage = "http://www.paratype.ru/public/"; description = "An open Paratype font"; license = "Open Paratype license"; diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix index 1fc252421de6b..f0bdbc3ea0046 100644 --- a/pkgs/data/fonts/pecita/default.nix +++ b/pkgs/data/fonts/pecita/default.nix @@ -20,7 +20,7 @@ fetchurl { sha256 = "0pwm20f38lcbfkdqkpa2ydpc9kvmdg0ifc4h2dmipsnwbcb5rfwm"; meta = with lib; { - homepage = http://pecita.eu/police-en.php; + homepage = "http://pecita.eu/police-en.php"; description = "Handwritten font with connected glyphs"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/data/fonts/poly/default.nix index 24155f2ea5465..05b411a5ba301 100644 --- a/pkgs/data/fonts/poly/default.nix +++ b/pkgs/data/fonts/poly/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { line. Poly is a Unicode typeface family that supports Open Type features and languages that use the Latin script and its variants. ''; - homepage = http://www.fontsquirrel.com/fonts/poly; + homepage = "http://www.fontsquirrel.com/fonts/poly"; license = stdenv.lib.licenses.ofl; maintainers = with stdenv.lib.maintainers; [ relrod ]; }; diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix index f051ef76c9c10..3a2ae92c1e5a5 100644 --- a/pkgs/data/fonts/powerline-fonts/default.nix +++ b/pkgs/data/fonts/powerline-fonts/default.nix @@ -19,7 +19,7 @@ fetchFromGitHub { sha256 = "0r8p4z3db17f5p8jr7sv80nglmjxhg83ncfvwg1dszldswr0dhvr"; meta = with lib; { - homepage = https://github.com/powerline/fonts; + homepage = "https://github.com/powerline/fonts"; description = "Patched fonts for Powerline users"; longDescription = '' Pre-patched and adjusted fonts for usage with the Powerline plugin. diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/data/fonts/profont/default.nix index d1f2cd9c5af18..cba08309fac8c 100644 --- a/pkgs/data/fonts/profont/default.nix +++ b/pkgs/data/fonts/profont/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { outputs = [ "out" "otb" ]; meta = with stdenv.lib; { - homepage = https://tobiasjung.name/profont/; + homepage = "https://tobiasjung.name/profont/"; description = "A monospaced font created to be a most readable font for programming"; maintainers = with maintainers; [ myrl ]; license = licenses.mit; diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix index 51165ceac13ea..7ddfd69aeeb4c 100644 --- a/pkgs/data/fonts/proggyfonts/default.nix +++ b/pkgs/data/fonts/proggyfonts/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { outputHash = "1x196rp3wqjd7m57bgp5kfy5jmj97qncxi1vwibs925ji7dqzfgf"; meta = with stdenv.lib; { - homepage = http://upperbounds.net; + homepage = "http://upperbounds.net"; description = "A set of fixed-width screen fonts that are designed for code listings"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix index 13eb4a4da5f18..7d7a81ec7e735 100644 --- a/pkgs/data/fonts/public-sans/default.nix +++ b/pkgs/data/fonts/public-sans/default.nix @@ -20,7 +20,7 @@ in fetchzip { meta = with lib; { description = "A strong, neutral, principles-driven, open source typeface for text or display"; - homepage = https://public-sans.digital.gov/; + homepage = "https://public-sans.digital.gov/"; license = licenses.ofl; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/quattrocento-sans/default.nix b/pkgs/data/fonts/quattrocento-sans/default.nix index 429cd80c2fc7d..ed0411ceb9f6c 100644 --- a/pkgs/data/fonts/quattrocento-sans/default.nix +++ b/pkgs/data/fonts/quattrocento-sans/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { sha256 = "0g8hnn92ks4y0jbizwj7yfa097lk887wqkqpqjdmc09sd2n44343"; meta = with lib; { - homepage = http://www.impallari.com/quattrocentosans/; + homepage = "http://www.impallari.com/quattrocentosans/"; description = "A classic, elegant and sober sans-serif typeface"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/quattrocento/default.nix b/pkgs/data/fonts/quattrocento/default.nix index 7e268182eef4a..3d11321cd4b26 100644 --- a/pkgs/data/fonts/quattrocento/default.nix +++ b/pkgs/data/fonts/quattrocento/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { sha256 = "0f8l19y61y20sszn8ni8h9kgl0zy1gyzychg22z5k93ip4h7kfd0"; meta = with lib; { - homepage = http://www.impallari.com/quattrocento/; + homepage = "http://www.impallari.com/quattrocento/"; description = "A classic, elegant, sober and strong serif typeface"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix index 7fd6b80b714e0..ddded71a6fa21 100644 --- a/pkgs/data/fonts/raleway/default.nix +++ b/pkgs/data/fonts/raleway/default.nix @@ -34,7 +34,7 @@ in fetchFromGitHub { It also has a sister display family, Raleway Dots. ''; - homepage = https://github.com/impallari/Raleway; + homepage = "https://github.com/impallari/Raleway"; license = lib.licenses.ofl; maintainers = with lib.maintainers; [ Profpatsch ]; diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index 015b084aed772..210858c5aed54 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.047"; + version = "1.051"; in fetchzip { name = "recursive-${version}"; @@ -14,7 +14,7 @@ fetchzip { unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; - sha256 = "0v50m6hiv19f7i4idi987j1six6493y6hj3r9djifg075v9adxx9"; + sha256 = "1cqlljbzvrxamswcqx8jbr61q4kji7yil5ic1mh60x4yfsk9x5wn"; meta = with lib; { homepage = "https://recursive.design/"; diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix deleted file mode 100644 index 6d075424bc52c..0000000000000 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ stdenv, fetchFromGitHub, fontforge, python3 }: - -let - inherit (python3.pkgs) fonttools; - - common = - { version, repo, sha256, nativeBuildInputs, postPatch ? null }: - stdenv.mkDerivation rec { - pname = "liberation-fonts"; - inherit version; - - src = fetchFromGitHub { - owner = "liberationfonts"; - rev = version; - inherit repo sha256; - }; - - inherit nativeBuildInputs postPatch; - - installPhase = '' - find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; - - install -m444 -Dt $out/share/doc/${pname}-${version} AUTHORS || true - install -m444 -Dt $out/share/doc/${pname}-${version} ChangeLog || true - install -m444 -Dt $out/share/doc/${pname}-${version} COPYING || true - install -m444 -Dt $out/share/doc/${pname}-${version} License.txt || true - install -m444 -Dt $out/share/doc/${pname}-${version} README || true - ''; - - meta = with stdenv.lib; { - description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; - longDescription = '' - The Liberation Fonts are intended to be replacements for the three most - commonly used fonts on Microsoft systems: Times New Roman, Arial, and - Courier New. Since 2012 they are based on croscore fonts. - - There are three sets: Sans (a substitute for Arial, Albany, Helvetica, - Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times - New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono - (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and - Bitstream Vera Sans Mono). - ''; - - license = licenses.ofl; - homepage = https://github.com/liberationfonts; - maintainers = [ - maintainers.raskin - ]; - }; - }; - -in { - liberation_ttf_v1 = common { - repo = "liberation-1.7-fonts"; - version = "1.07.5"; - nativeBuildInputs = [ fontforge ]; - sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v"; - }; - liberation_ttf_v2 = common { - repo = "liberation-fonts"; - version = "2.00.4"; - nativeBuildInputs = [ fontforge fonttools ]; - postPatch = '' - substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \ - 'font = ttLib.TTFont(fontfile)' \ - 'font = ttLib.TTFont(fontfile, recalcTimestamp=False)' - ''; - sha256 = "14bn1zlhyr4qaz5z2sx4h115pnbd41ix1vky8fxm2lx76xrjjiaa"; - }; -} diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix index 33321a2c7fe18..44eea3774ffcc 100644 --- a/pkgs/data/fonts/redhat-official/default.nix +++ b/pkgs/data/fonts/redhat-official/default.nix @@ -13,7 +13,7 @@ fetchzip { sha256 = "0yb6shgq6jrv3kq9faky66qpdbv4g580c3jl942844grwyngymyj"; meta = with lib; { - homepage = https://github.com/RedHatOfficial/RedHatFont; + homepage = "https://github.com/RedHatOfficial/RedHatFont"; description = "Red Hat's Open Source Fonts - Red Hat Display and Red Hat Text"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/data/fonts/ricty/default.nix index a248bb9d4949d..13cb056dc454a 100644 --- a/pkgs/data/fonts/ricty/default.nix +++ b/pkgs/data/fonts/ricty/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high-quality Japanese font based on Inconsolata and Migu 1M"; - homepage = http://www.yusa.lab.uec.ac.jp/~yusa/ricty.html; + homepage = "http://www.yusa.lab.uec.ac.jp/~yusa/ricty.html"; license = licenses.unfree; maintainers = [ maintainers.mikoim ]; }; diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix index 50629c5f97735..fe13fdf89d1e3 100644 --- a/pkgs/data/fonts/roboto/default.nix +++ b/pkgs/data/fonts/roboto/default.nix @@ -15,7 +15,7 @@ in fetchzip { sha256 = "1s3c48wwvvwd3p4w3hfkri5v2c54j2bdxmd3bjv54klc5mrlh6z3"; meta = { - homepage = https://github.com/google/roboto; + homepage = "https://github.com/google/roboto"; description = "The Roboto family of fonts"; longDescription = '' Google’s signature family of fonts, the default font on Android and diff --git a/pkgs/data/fonts/rounded-mgenplus/default.nix b/pkgs/data/fonts/rounded-mgenplus/default.nix index 4319870249264..eccbddd1851d9 100644 --- a/pkgs/data/fonts/rounded-mgenplus/default.nix +++ b/pkgs/data/fonts/rounded-mgenplus/default.nix @@ -15,7 +15,7 @@ in fetchzip rec { meta = with lib; { description = "A Japanese font based on Rounded M+ and Noto Sans Japanese"; - homepage = http://jikasei.me/font/rounded-mgenplus/; + homepage = "http://jikasei.me/font/rounded-mgenplus/"; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ mnacamura ]; diff --git a/pkgs/data/fonts/sahel-fonts/default.nix b/pkgs/data/fonts/sahel-fonts/default.nix index 029ed33611f41..ff86338c26d4a 100644 --- a/pkgs/data/fonts/sahel-fonts/default.nix +++ b/pkgs/data/fonts/sahel-fonts/default.nix @@ -17,7 +17,7 @@ in fetchFromGitHub { sha256 = "0vj8ydv50rjanb0favd7rh4r9rv5fl39vqwvzkpgfdcdawn0xjm7"; meta = with lib; { - homepage = https://github.com/rastikerdar/sahel-font; + homepage = "https://github.com/rastikerdar/sahel-font"; description = "A Persian (farsi) Font - فونت (قلم) فارسی ساحل"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/samim-fonts/default.nix b/pkgs/data/fonts/samim-fonts/default.nix index d8d3d0d3b5ae0..e10249a1afd97 100644 --- a/pkgs/data/fonts/samim-fonts/default.nix +++ b/pkgs/data/fonts/samim-fonts/default.nix @@ -17,7 +17,7 @@ in fetchFromGitHub { sha256 = "0mmhncqg48dp0d7l725dv909zswbkk22dlqzcdfh6k6cgk2gn08q"; meta = with lib; { - homepage = https://github.com/rastikerdar/samim-font; + homepage = "https://github.com/rastikerdar/samim-font"; description = "A Persian (Farsi) Font - فونت (قلم) فارسی صمیم"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/sampradaya/default.nix b/pkgs/data/fonts/sampradaya/default.nix index 90b32f251ef63..749abb71dbd4f 100644 --- a/pkgs/data/fonts/sampradaya/default.nix +++ b/pkgs/data/fonts/sampradaya/default.nix @@ -10,7 +10,7 @@ fetchzip { sha256 = "1pqyj5r5jc7dk8yyzl7i6qq2m9zvahcjj49a66wwzdby5zyw8dqv"; meta = with lib; { - homepage = https://bitbucket.org/OorNaattaan/sampradaya/; + homepage = "https://bitbucket.org/OorNaattaan/sampradaya/"; description = "Unicode-compliant Grantha font"; maintainers = with maintainers; [ mathnerd314 ]; license = licenses.ofl; # See font metadata diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index 7e073bf56d34d..96bfaf191c3db 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -1,23 +1,24 @@ -{ lib, fetchurl, p7zip }: +{ lib, fetchurl, libarchive }: let - version = "0.8.2"; + version = "0.12.6"; in fetchurl { name = "sarasa-gothic-${version}"; url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - sha256 = "17xkpklb6spi10132lq658fwvrms3fs7ksb9j098z9vaqad1k51q"; + sha256 = "1b15gsmv2jr0r8xssr8216s8xsghr6w5wm3w3imm3qlh3kqk1qg8"; recursiveHash = true; downloadToTemp = true; postFetch = '' - ${p7zip}/bin/7z x $downloadedFile -o$out/share/fonts + mkdir -p $out/share/fonts + ${libarchive}/bin/bsdtar -xf $downloadedFile -C $out/share/fonts ''; meta = with lib; { description = "SARASA GOTHIC is a Chinese & Japanese programming font based on Iosevka and Source Han Sans"; - homepage = https://github.com/be5invis/Sarasa-Gothic; + homepage = "https://github.com/be5invis/Sarasa-Gothic"; license = licenses.ofl; maintainers = [ maintainers.ChengCat ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/scheherazade/default.nix b/pkgs/data/fonts/scheherazade/default.nix index 062b29c90397d..e7651f22d6a05 100644 --- a/pkgs/data/fonts/scheherazade/default.nix +++ b/pkgs/data/fonts/scheherazade/default.nix @@ -18,7 +18,7 @@ in fetchzip rec { sha256 = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z"; meta = with lib; { - homepage = https://software.sil.org/scheherazade/; + homepage = "https://software.sil.org/scheherazade/"; description = "A font designed in a similar style to traditional Naskh typefaces"; longDescription = '' Scheherazade, named after the heroine of the classic Arabian Nights tale, diff --git a/pkgs/data/fonts/shabnam-fonts/default.nix b/pkgs/data/fonts/shabnam-fonts/default.nix index 5834b797eeab1..5cf54697fdf60 100644 --- a/pkgs/data/fonts/shabnam-fonts/default.nix +++ b/pkgs/data/fonts/shabnam-fonts/default.nix @@ -17,7 +17,7 @@ in fetchFromGitHub { sha256 = "0wfyaaj2pq2knz12l7rsc4wc703cbz0r8gkcya5x69p0aixch8ba"; meta = with lib; { - homepage = https://github.com/rastikerdar/shabnam-font; + homepage = "https://github.com/rastikerdar/shabnam-font"; description = "A Persian (Farsi) Font - فونت (قلم) فارسی شبنم"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/shrikhand/default.nix b/pkgs/data/fonts/shrikhand/default.nix index a00036510f50c..684f3d0395e9d 100644 --- a/pkgs/data/fonts/shrikhand/default.nix +++ b/pkgs/data/fonts/shrikhand/default.nix @@ -5,14 +5,14 @@ let in fetchzip { name = "shrikhand-${version}"; - url = https://github.com/jonpinhorn/shrikhand/raw/c11c9b0720fba977fad7cb4f339ebacdba1d1394/build/Shrikhand-Regular.ttf; + url = "https://github.com/jonpinhorn/shrikhand/raw/c11c9b0720fba977fad7cb4f339ebacdba1d1394/build/Shrikhand-Regular.ttf"; postFetch = "install -D -m644 $downloadedFile $out/share/fonts/truetype/Shrikhand-Regular.ttf"; sha256 = "0s54k9cs1g2yz6lwg5gakqb12vg5qkfdz3pc8mh7mib2s6q926hs"; meta = with lib; { - homepage = https://jonpinhorn.github.io/shrikhand/; + homepage = "https://jonpinhorn.github.io/shrikhand/"; description = "A vibrant and playful typeface for both Latin and Gujarati writing systems"; maintainers = with maintainers; [ sternenseemann ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/signwriting/default.nix b/pkgs/data/fonts/signwriting/default.nix index 883e43b4381f2..ae5f0bb0fb930 100644 --- a/pkgs/data/fonts/signwriting/default.nix +++ b/pkgs/data/fonts/signwriting/default.nix @@ -18,7 +18,7 @@ runCommand "signwriting-1.1.4" { outputHash = "0cn37s3lc7gbr8036l7ia2869qmxglkmgllh3r9q5j54g3sfjc7q"; meta = with lib; { - homepage = https://github.com/Slevinski/signwriting_2010_fonts; + homepage = "https://github.com/Slevinski/signwriting_2010_fonts"; description = "Typeface for written sign languages"; maintainers = with maintainers; [ mathnerd314 ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix index 336fe48f54da0..d1e53bbb75756 100644 --- a/pkgs/data/fonts/siji/default.nix +++ b/pkgs/data/fonts/siji/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2016-05-13"; src = fetchzip { - url = https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip; + url = "https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip"; sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf"; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "bdf" "otb" ]; meta = with stdenv.lib; { - homepage = https://github.com/stark/siji; + homepage = "https://github.com/stark/siji"; description = "An iconic bitmap font based on Stlarch with additional glyphs"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix index be4d045815c77..c9518b78a65a5 100644 --- a/pkgs/data/fonts/source-code-pro/default.nix +++ b/pkgs/data/fonts/source-code-pro/default.nix @@ -5,7 +5,7 @@ let in fetchzip { name = "source-code-pro-${version}"; - url = https://github.com/adobe-fonts/source-code-pro/archive/2.030R-ro/1.050R-it.zip; + url = "https://github.com/adobe-fonts/source-code-pro/archive/2.030R-ro/1.050R-it.zip"; postFetch = '' mkdir -p $out/share/fonts @@ -18,7 +18,7 @@ in fetchzip { description = "A set of monospaced OpenType fonts designed for coding environments"; maintainers = with lib.maintainers; [ relrod ]; platforms = with lib.platforms; all; - homepage = https://adobe-fonts.github.io/source-code-pro/; + homepage = "https://adobe-fonts.github.io/source-code-pro/"; license = lib.licenses.ofl; }; } diff --git a/pkgs/data/fonts/source-han-code-jp/default.nix b/pkgs/data/fonts/source-han-code-jp/default.nix index 85f5cddd2eabd..5960e4fb6ea4d 100644 --- a/pkgs/data/fonts/source-han-code-jp/default.nix +++ b/pkgs/data/fonts/source-han-code-jp/default.nix @@ -19,7 +19,7 @@ in fetchzip { description = "A monospaced Latin font suitable for coding"; maintainers = with lib.maintainers; [ mt-caret ]; platforms = with lib.platforms; all; - homepage = https://blogs.adobe.com/CCJKType/2015/06/source-han-code-jp.html; + homepage = "https://blogs.adobe.com/CCJKType/2015/06/source-han-code-jp.html"; license = lib.licenses.ofl; }; } diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix index 5186b9fe4a5e6..7d5c7679ad8c8 100644 --- a/pkgs/data/fonts/source-sans-pro/default.nix +++ b/pkgs/data/fonts/source-sans-pro/default.nix @@ -17,7 +17,7 @@ in fetchzip { sha256 = "11jd50cqiq2s0z39rclg73iiw2j5yzgs1glfs9psw5wbbisgysmr"; meta = with lib; { - homepage = https://adobe-fonts.github.io/source-sans-pro/; + homepage = "https://adobe-fonts.github.io/source-sans-pro/"; description = "A set of OpenType fonts designed by Adobe for UIs"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix index eb776a3df26fb..86a45b80efd7b 100644 --- a/pkgs/data/fonts/source-serif-pro/default.nix +++ b/pkgs/data/fonts/source-serif-pro/default.nix @@ -17,7 +17,7 @@ in fetchzip { sha256 = "06yp8y79mqk02qzp81h8zkmzqqlhicgrkwmzkd0bm338xh8grsiz"; meta = with lib; { - homepage = https://adobe-fonts.github.io/source-serif-pro/; + homepage = "https://adobe-fonts.github.io/source-serif-pro/"; description = "A set of OpenType fonts to complement Source Sans Pro"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index c3cfec244e3aa..6994b7d4a720e 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -23,7 +23,7 @@ in fetchurl { meta = with lib; { description = "Monospaced bitmap fonts"; - homepage = https://www.cambus.net/spleen-monospaced-bitmap-fonts; + homepage = "https://www.cambus.net/spleen-monospaced-bitmap-fonts"; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/data/fonts/stix-otf/default.nix b/pkgs/data/fonts/stix-otf/default.nix index f3ff9600f5dec..894fd22c36f9a 100644 --- a/pkgs/data/fonts/stix-otf/default.nix +++ b/pkgs/data/fonts/stix-otf/default.nix @@ -15,7 +15,7 @@ in fetchzip { sha256 = "04d4qxq3i9fyapsmxk6d9v1xirjam8c74fyxs6n24d3gf2945zmw"; meta = with lib; { - homepage = http://www.stixfonts.org/; + homepage = "http://www.stixfonts.org/"; description = "Fonts for Scientific and Technical Information eXchange"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/stix-two/default.nix b/pkgs/data/fonts/stix-two/default.nix index c71b51ad75de9..e6e4009020aeb 100644 --- a/pkgs/data/fonts/stix-two/default.nix +++ b/pkgs/data/fonts/stix-two/default.nix @@ -19,7 +19,7 @@ in fetchFromGitHub { sha256 = "1ah8s0cb67yv4ll8zfs01mdh9m5i2lbkrfbmkhi1xdid6pxsk32x"; meta = with stdenv.lib; { - homepage = http://www.stixfonts.org/; + homepage = "http://www.stixfonts.org/"; description = "Fonts for Scientific and Technical Information eXchange"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/tai-languages/default.nix b/pkgs/data/fonts/tai-languages/default.nix index 7778c4a98b81f..71ca170afb1de 100644 --- a/pkgs/data/fonts/tai-languages/default.nix +++ b/pkgs/data/fonts/tai-languages/default.nix @@ -11,7 +11,7 @@ tai-ahom = fetchzip { sha256 = "03h8ql9d5bzq4j521j0cz08ddf717bzim1nszh2aar6kn0xqnp9q"; meta = with lib; { - homepage = https://github.com/enabling-languages/tai-languages; + homepage = "https://github.com/enabling-languages/tai-languages"; description = "Unicode-compliant Tai Ahom font"; maintainers = with maintainers; [ mathnerd314 ]; license = licenses.ofl; # See font metadata diff --git a/pkgs/data/fonts/tamsyn/default.nix b/pkgs/data/fonts/tamsyn/default.nix index 10f96b2b17a8d..2738925478f43 100644 --- a/pkgs/data/fonts/tamsyn/default.nix +++ b/pkgs/data/fonts/tamsyn/default.nix @@ -45,8 +45,8 @@ in stdenv.mkDerivation { font was further inspired by Gohufont, Terminus, Dina, Proggy, Fixedsys, and Consolas. ''; - homepage = http://www.fial.com/~scott/tamsyn-font/; - downloadPage = http://www.fial.com/~scott/tamsyn-font/download; + homepage = "http://www.fial.com/~scott/tamsyn-font/"; + downloadPage = "http://www.fial.com/~scott/tamsyn-font/download"; license = licenses.free; maintainers = [ maintainers.rps ]; }; diff --git a/pkgs/data/fonts/tamzen/default.nix b/pkgs/data/fonts/tamzen/default.nix new file mode 100644 index 0000000000000..c4a2be00d9445 --- /dev/null +++ b/pkgs/data/fonts/tamzen/default.nix @@ -0,0 +1,47 @@ +{ fetchFromGitHub, fontforge, mkfontscale, stdenv }: + +stdenv.mkDerivation rec { + pname = "tamzen-font"; + version = "1.11.4"; + + src = fetchFromGitHub { + owner = "sunaku"; + repo = "tamzen-font"; + rev = "Tamzen-${version}"; + sha256 = "17kgmvg6q32mqhx9g44hjvzv0si0mnpprga4z7na930g2zdd8846"; + }; + + nativeBuildInputs = [ fontforge mkfontscale ]; + + installPhase = '' + # convert pcf fonts to otb + for i in pcf/*.pcf; do + name=$(basename "$i" .pcf) + fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$name.otb\")" + done + + install -m 644 -D pcf/*.pcf -t "$out/share/fonts/misc" + install -m 644 -D psf/*.psf -t "$out/share/consolefonts" + install -m 644 -D *.otb -t "$otb/share/fonts/misc" + mkfontdir "$out/share/fonts/misc" + mkfontdir "$otb/share/fonts/misc" + ''; + + outputs = [ "out" "otb" ]; + + meta = with stdenv.lib; { + description = "Bitmapped programming font based on Tamsyn"; + longDescription = '' + Tamzen is a monospace bitmap font. It is programatically forked + from Tamsyn version 1.11, which backports glyphs from older + versions while deleting deliberately empty glyphs to allow + secondary/fallback fonts to provide real glyphs at those codepoints. + Tamzen also has fonts that additionally provide the Powerline + symbols. + ''; + homepage = "https://github.com/sunaku/tamzen-font"; + license = licenses.free; + maintainers = with maintainers; [ wishfort36 ]; + }; +} + diff --git a/pkgs/data/fonts/tempora-lgc/default.nix b/pkgs/data/fonts/tempora-lgc/default.nix index f06a5bfee27a6..d20acad663c10 100644 --- a/pkgs/data/fonts/tempora-lgc/default.nix +++ b/pkgs/data/fonts/tempora-lgc/default.nix @@ -2,19 +2,19 @@ let srcs = [ (fetchurl { - url = http://www.ttfotf.com/download-font/tempora-lgc-unicode-bold-italic.otf; + url = "http://www.ttfotf.com/download-font/tempora-lgc-unicode-bold-italic.otf"; sha256 = "1yfbi62j6gjmzglxz29m6x6lxqpxghcqjjh916qn8in74ba5v0gq"; }) (fetchurl { - url = http://www.ttfotf.com/download-font/tempora-lgc-unicode-bold.otf; + url = "http://www.ttfotf.com/download-font/tempora-lgc-unicode-bold.otf"; sha256 = "0bfbl1h9h1022km2rg1zwl9lpabhnwdsvzdp0bwmf0wbm62550cp"; }) (fetchurl { - url = http://www.ttfotf.com/download-font/tempora-lgc-unicode-italic.otf; + url = "http://www.ttfotf.com/download-font/tempora-lgc-unicode-italic.otf"; sha256 = "10m9j4bvr6c4zp691wxm4hvzhph2zlfsxk1nmbsb9vn1i6vfgz04"; }) (fetchurl { - url = http://www.ttfotf.com/download-font/tempora-lgc-unicode.otf; + url = "http://www.ttfotf.com/download-font/tempora-lgc-unicode.otf"; sha256 = "0iwa8wyydcpjss6d1jy4jibqxpvzph4vmaxwwmndpsqy1fz64y9i"; }) ]; diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix index bdd0fd7762b63..f9d25a0128ef1 100644 --- a/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -26,7 +26,7 @@ in fetchzip { Monospaced bitmap font designed for long work with computers (TTF version, mainly for Java applications) ''; - homepage = http://files.ax86.net/terminus-ttf; + homepage = "http://files.ax86.net/terminus-ttf"; license = licenses.ofl; maintainers = with maintainers; [ okasu ]; }; diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index 88ae9ac72c2e9..4c7f5d85e869d 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { 16x32. The styles are normal and bold (except for 6x12), plus EGA/VGA-bold for 8x14 and 8x16. ''; - homepage = http://terminus-font.sourceforge.net/; + homepage = "http://terminus-font.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ astsmtl ]; }; diff --git a/pkgs/data/fonts/terminus-nerdfont/default.nix b/pkgs/data/fonts/terminus-nerdfont/default.nix deleted file mode 100644 index 3c1730146b3d9..0000000000000 --- a/pkgs/data/fonts/terminus-nerdfont/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, fetchzip }: - -let - version = "2.0.0"; -in fetchzip { - name = "terminus-nerdfont-${version}"; - - url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/Terminus.zip"; - - postFetch = '' - mkdir -p $out/share/fonts/terminus-nerdfont - unzip -j $downloadedFile -d $out/share/fonts/terminus-nerdfont - ''; - - sha256 = "036i1qwwrb0r8hvcjf3h34w0g7mbsmngvrjic98jgikbz3i2f46c"; - - meta = with lib; { - description = '' - Nerd Fonts is a project that attempts to patch as many developer targeted - and/or used fonts as possible. The patch is to specifically add a high - number of additional glyphs from popular 'iconic fonts' such as Font - Awesome, Devicons, Octicons, and others. - ''; - homepage = https://github.com/ryanoasis/nerd-fonts; - license = licenses.mit; - platforms = platforms.all; - }; -} diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix index 6245032246c9d..7b67c1dd52d33 100644 --- a/pkgs/data/fonts/tewi/default.nix +++ b/pkgs/data/fonts/tewi/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { particularily useful while programming, to fit a lot of code on your screen. ''; - homepage = https://github.com/lucy/tewi-font; + homepage = "https://github.com/lucy/tewi-font"; license = { fullName = "GNU General Public License with a font exception"; url = "https://www.gnu.org/licenses/gpl-faq.html#FontException"; diff --git a/pkgs/data/fonts/tex-gyre-math/default.nix b/pkgs/data/fonts/tex-gyre-math/default.nix index 8e1d27431748f..cd3c3ab00b180 100644 --- a/pkgs/data/fonts/tex-gyre-math/default.nix +++ b/pkgs/data/fonts/tex-gyre-math/default.nix @@ -54,7 +54,7 @@ let ${displayName} family of fonts (see http://www.gust.org.pl/projects/e-foundry/tex-gyre/) in the OpenType format. ''; - homepage = http://www.gust.org.pl/projects/e-foundry/tg-math; + homepage = "http://www.gust.org.pl/projects/e-foundry/tg-math"; # "The TeX Gyre Math fonts are licensed under the GUST Font License (GFL), # which is a free license, legally equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or later." - GUST website diff --git a/pkgs/data/fonts/tex-gyre/default.nix b/pkgs/data/fonts/tex-gyre/default.nix index 7e55a70c71a9f..197d14c3f03e1 100644 --- a/pkgs/data/fonts/tex-gyre/default.nix +++ b/pkgs/data/fonts/tex-gyre/default.nix @@ -23,7 +23,7 @@ let inherit outputHash; meta = with stdenv.lib; { - homepage = http://www.gust.org.pl/projects/e-foundry/tex-gyre; + homepage = "http://www.gust.org.pl/projects/e-foundry/tex-gyre"; # "The TeX Gyre fonts are licensed under the GUST Font License (GFL), # which is a free license, legally equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or later." - GUST website diff --git a/pkgs/data/fonts/theano/default.nix b/pkgs/data/fonts/theano/default.nix index 82563205454cf..360d32f3e625c 100644 --- a/pkgs/data/fonts/theano/default.nix +++ b/pkgs/data/fonts/theano/default.nix @@ -17,7 +17,7 @@ in fetchzip rec { sha256 = "1my1symb7k80ys33iphsxvmf6432wx6vjdnxhzhkgrang1rhx1h8"; meta = with lib; { - homepage = https://github.com/akryukov/theano; + homepage = "https://github.com/akryukov/theano"; description = "An old-style font designed from historic samples"; maintainers = with maintainers; [ raskin rycee ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/tlwg/default.nix b/pkgs/data/fonts/tlwg/default.nix index 787009928313b..2e3a0a95c0552 100644 --- a/pkgs/data/fonts/tlwg/default.nix +++ b/pkgs/data/fonts/tlwg/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A collection of Thai scalable fonts available under free licenses"; - homepage = https://linux.thai.net/projects/fonts-tlwg; + homepage = "https://linux.thai.net/projects/fonts-tlwg"; license = with licenses; [ gpl2 publicDomain lppl13c free ]; maintainers = [ maintainers.yrashk ]; }; diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/data/fonts/ttf-envy-code-r/default.nix index 0f670f106fd08..4da4aa1823b72 100644 --- a/pkgs/data/fonts/ttf-envy-code-r/default.nix +++ b/pkgs/data/fonts/ttf-envy-code-r/default.nix @@ -17,7 +17,7 @@ in fetchzip { sha256 = "0x0r07nax68cmz7490x2crzzgdg4j8fg63wppcmjqm0230bggq2z"; meta = with lib; { - homepage = https://damieng.com/blog/tag/envy-code-r; + homepage = "https://damieng.com/blog/tag/envy-code-r"; description = "Free scalable coding font by DamienG"; license = licenses.unfree; maintainers = [ maintainers.lyt ]; diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix index 4e464f370229b..0e835cbedea19 100644 --- a/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -1,4 +1,4 @@ -# Based upon https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/tree/454acad50ba584d9602ccd4238fc5e585abc15c9 +# Based upon https://src.fedoraproject.org/rpms/twitter-twemoji-fonts # The main difference is that we use “Twitter Color Emoji” name (which is recognized by upstream fontconfig) { stdenv @@ -15,14 +15,14 @@ }: let - version = "12.1.2"; + version = "12.1.5"; twemojiSrc = fetchFromGitHub { name = "twemoji"; owner = "twitter"; repo = "twemoji"; rev = "v${version}"; - sha256 = "0vzmlp83vnk4njcfkn03jcc1vkg2rf12zf5kj3p3a373xr4ds1zn"; + hash = "sha256-qb3bLiUgtA8QQ13u928kvM+3qwmQpyjUk0EPKja1kSk="; }; in @@ -54,10 +54,10 @@ stdenv.mkDerivation rec { ]; patches = [ - # ImageMagick -> GrahphicsMagick + # ImageMagick -> GraphicsMagick (fetchpatch { - url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/3bc176c10ced2824fe03da5ff561e22a36bf8ccd/f/noto-emoji-use-gm.patch"; - sha256 = "0yfmfzaaiq5163c06172g4r734aysiqyv1s28siv642vqzsqh4i2"; + url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/07778605d50696f6aa929020e82611a01d254c90/f/noto-emoji-use-gm.patch"; + sha256 = "sha256-kyJwT1SKS1vnXxvPTiIMK6TRHMp1ZOSlb6rodL4Jbxs="; }) ]; @@ -114,7 +114,9 @@ stdenv.mkDerivation rec { # In twemoji source ## Artwork is Creative Commons Attribution 4.0 International ## Non-artwork is MIT + # In Fedora twitter-twemoji-fonts source + ## spec files are MIT: https://fedoraproject.org/wiki/Licensing:Main#License_of_Fedora_SPEC_Files license = with licenses; [ asl20 ofl cc-by-40 mit ]; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar emily ]; }; } diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index 7c90c16d4d1ef..0f1d5b5a4cc03 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -18,7 +18,7 @@ fetchzip { created to complement the Ubuntu tone of voice. It has a contemporary style and contains characteristics unique to the Ubuntu brand that convey a precise, reliable and free attitude."; - homepage = http://font.ubuntu.com/; + homepage = "http://font.ubuntu.com/"; license = lib.licenses.free; platforms = lib.platforms.all; maintainers = [ lib.maintainers.antono ]; diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index d363f01309be9..7168607ce099b 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -8,15 +8,15 @@ stdenv.mkDerivation { srcs = [ (fetchurl { - url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz; + url = "http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz"; sha256 = "12hgizg25fzmk10wjl0c88x97h3pg5r9ga122s3y28wixz6x2bvh"; }) (fetchurl { - url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-asian.tar.gz; + url = "http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-asian.tar.gz"; sha256 = "0ibjy4xpz5j373hsdr8bx99czfpclqmviwwv768j8n7z12z3wa51"; }) (fetchurl { - url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-75dpi100dpi.tar.gz; + url = "http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-75dpi100dpi.tar.gz"; sha256 = "08vqr8yb636xa1s28vf3pm22dzkia0gisvsi2svqjqh4kk290pzh"; }) ]; diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/pkgs/data/fonts/undefined-medium/default.nix index c98936b8096dd..4c13a297c6f6a 100644 --- a/pkgs/data/fonts/undefined-medium/default.nix +++ b/pkgs/data/fonts/undefined-medium/default.nix @@ -3,7 +3,7 @@ fetchzip rec { name = "undefined-medium-1.0"; - url = https://github.com/andirueckel/undefined-medium/archive/v1.0.zip; + url = "https://github.com/andirueckel/undefined-medium/archive/v1.0.zip"; postFetch = '' mkdir -p $out/share/fonts @@ -13,7 +13,7 @@ fetchzip rec { sha256 = "1wa04jzbffshwcxm705yb5wja8wakn8j7fvim1mlih2z1sqw0njk"; meta = with lib; { - homepage = https://undefined-medium.com/; + homepage = "https://undefined-medium.com/"; description = "A pixel grid-based monospace typeface"; longDescription = '' undefined medium is a free and open-source pixel grid-based diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix index 9cc0fb9adcc5a..58a5dbcfdbc2f 100644 --- a/pkgs/data/fonts/uni-vga/default.nix +++ b/pkgs/data/fonts/uni-vga/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "uni-vga"; src = fetchurl { - url = http://www.inp.nsk.su/~bolkhov/files/fonts/univga/uni-vga.tgz; + url = "http://www.inp.nsk.su/~bolkhov/files/fonts/univga/uni-vga.tgz"; sha256 = "05sns8h5yspa7xkl81ri7y1yxf5icgsnl497f3xnaryhx11s2rv6"; }; @@ -55,7 +55,7 @@ stdenv.mkDerivation { meta = { description = "Unicode VGA font"; maintainers = [ maintainers.ftrvxmtrx ]; - homepage = http://www.inp.nsk.su/~bolkhov/files/fonts/univga/; + homepage = "http://www.inp.nsk.su/~bolkhov/files/fonts/univga/"; license = licenses.mit; }; } diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 034c2583d268b..460efc2c581ab 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -45,10 +45,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Unicode font for Base Multilingual Plane"; - homepage = http://unifoundry.com/unifont.html; + homepage = "http://unifoundry.com/unifont.html"; # Basically GPL2+ with font exception. - license = http://unifoundry.com/LICENSE.txt; + license = "http://unifoundry.com/LICENSE.txt"; maintainers = [ maintainers.rycee maintainers.vrthra ]; platforms = platforms.all; }; diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 21d31914479fe..153c6272ca205 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -13,10 +13,10 @@ in fetchzip rec { meta = with lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; - homepage = http://unifoundry.com/unifont.html; + homepage = "http://unifoundry.com/unifont.html"; # Basically GPL2+ with font exception. - license = http://unifoundry.com/LICENSE.txt; + license = "http://unifoundry.com/LICENSE.txt"; maintainers = [ maintainers.mathnerd314 maintainers.vrthra ]; platforms = platforms.all; }; diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix index 93fe8cdfb74be..724d015a7c316 100644 --- a/pkgs/data/fonts/unscii/default.nix +++ b/pkgs/data/fonts/unscii/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { description = ''Bitmapped character-art-friendly Unicode fonts''; # Basically GPL2+ with font exception — because of the Unifont-augmented # version. The reduced version is public domain. - license = http://unifoundry.com/LICENSE.txt; + license = "http://unifoundry.com/LICENSE.txt"; maintainers = [ stdenv.lib.maintainers.raskin ]; - homepage = http://pelulamu.net/unscii/; + homepage = "http://pelulamu.net/unscii/"; }; } diff --git a/pkgs/data/fonts/uw-ttyp0/default.nix b/pkgs/data/fonts/uw-ttyp0/default.nix index 1d63b3fa54c80..96cde444d2b95 100644 --- a/pkgs/data/fonts/uw-ttyp0/default.nix +++ b/pkgs/data/fonts/uw-ttyp0/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Monospace bitmap screen fonts for X11"; - homepage = https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/; + homepage = "https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/"; license = with licenses; [ free mit ]; maintainers = with maintainers; [ rnhmjoj ]; }; diff --git a/pkgs/data/fonts/vdrsymbols/default.nix b/pkgs/data/fonts/vdrsymbols/default.nix index fd74897077f36..4b280df564419 100644 --- a/pkgs/data/fonts/vdrsymbols/default.nix +++ b/pkgs/data/fonts/vdrsymbols/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "vdrsymbols-20100612"; - url = http://andreas.vdr-developer.org/fonts/download/vdrsymbols-ttf-20100612.tgz; + url = "http://andreas.vdr-developer.org/fonts/download/vdrsymbols-ttf-20100612.tgz"; sha256 = "0wpxns8zqic98c84j18dr4zmj092v07yq07vwwgzblr0rw9n6gzr"; @@ -14,7 +14,7 @@ fetchzip { meta = with lib; { description = "DejaVu fonts with additional symbols used by VDR"; - homepage = http://andreas.vdr-developer.org/fonts/; + homepage = "http://andreas.vdr-developer.org/fonts/"; platforms = platforms.all; maintainers = with maintainers; [ ck3d ]; diff --git a/pkgs/data/fonts/vegur/default.nix b/pkgs/data/fonts/vegur/default.nix index a269f17bf0e62..af6c00e32c889 100644 --- a/pkgs/data/fonts/vegur/default.nix +++ b/pkgs/data/fonts/vegur/default.nix @@ -17,7 +17,7 @@ in fetchzip { sha256 = "0iisi2scq72lyj7pc1f36fhfjnm676n5byl4zaavhbxpdrbc6d1v"; meta = with lib; { - homepage = http://dotcolon.net/font/vegur/; + homepage = "http://dotcolon.net/font/vegur/"; description = "A humanist sans serif font."; platforms = platforms.all; maintainers = [ maintainers.samueldr ]; diff --git a/pkgs/data/fonts/vista-fonts-chs/default.nix b/pkgs/data/fonts/vista-fonts-chs/default.nix index 6a7cc71133aee..5902356703ace 100644 --- a/pkgs/data/fonts/vista-fonts-chs/default.nix +++ b/pkgs/data/fonts/vista-fonts-chs/default.nix @@ -5,7 +5,7 @@ fetchzip { name = "vista-fonts-chs-1"; - url = http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE; + url = "http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE"; postFetch = '' ${buildPackages.cabextract}/bin/cabextract --lowercase --filter '*.TTF' $downloadedFile @@ -24,7 +24,7 @@ fetchzip { meta = { description = "TrueType fonts from Microsoft Windows Vista For Simplified Chinese (Microsoft YaHei)"; - homepage = https://www.microsoft.com/typography/fonts/family.aspx?FID=350; + homepage = "https://www.microsoft.com/typography/fonts/family.aspx?FID=350"; license = lib.licenses.unfree; maintainers = [ lib.maintainers.ChengCat ]; diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index 59cff1b0f470a..df7a6e5383bfb 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "vista-fonts-1"; - url = https://web.archive.org/web/20171225132744/http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe; + url = "https://web.archive.org/web/20171225132744/http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe"; postFetch = '' ${cabextract}/bin/cabextract --lowercase --filter ppviewer.cab $downloadedFile @@ -25,7 +25,7 @@ fetchzip { meta = { description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)"; - homepage = http://www.microsoft.com/typography/ClearTypeFonts.mspx; + homepage = "http://www.microsoft.com/typography/ClearTypeFonts.mspx"; license = stdenv.lib.licenses.unfree; # haven't read the EULA, but we probably can't redistribute these files, so... # Set a non-zero priority to allow easy overriding of the diff --git a/pkgs/data/fonts/weather-icons/default.nix b/pkgs/data/fonts/weather-icons/default.nix index 172273671207f..cf45152178ec2 100644 --- a/pkgs/data/fonts/weather-icons/default.nix +++ b/pkgs/data/fonts/weather-icons/default.nix @@ -21,7 +21,7 @@ in fetchzip { ready to be dropped right into Bootstrap, or any project that needs high quality weather, maritime, and meteorological based icons! ''; - homepage = https://erikflowers.github.io/weather-icons/; + homepage = "https://erikflowers.github.io/weather-icons/"; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ pnelson ]; diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix index dc87e6b634f7b..f7d3b0333c5ef 100644 --- a/pkgs/data/fonts/wqy-microhei/default.nix +++ b/pkgs/data/fonts/wqy-microhei/default.nix @@ -14,7 +14,7 @@ fetchzip rec { meta = { description = "A (mainly) Chinese Unicode font"; - homepage = http://wenq.org; + homepage = "http://wenq.org"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.pkmx ]; platforms = lib.platforms.all; diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix index 7df1e5aeb2a81..5d461d0f5b008 100644 --- a/pkgs/data/fonts/wqy-zenhei/default.nix +++ b/pkgs/data/fonts/wqy-zenhei/default.nix @@ -17,7 +17,7 @@ in fetchzip rec { meta = { description = "A (mainly) Chinese Unicode font"; - homepage = http://wenq.org; + homepage = "http://wenq.org"; license = lib.licenses.gpl2; # with font embedding exceptions maintainers = [ lib.maintainers.pkmx ]; platforms = lib.platforms.all; diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/pkgs/data/fonts/xkcd-font/default.nix index e5dd11db72a7b..af740e4089814 100644 --- a/pkgs/data/fonts/xkcd-font/default.nix +++ b/pkgs/data/fonts/xkcd-font/default.nix @@ -19,7 +19,7 @@ in fetchFromGitHub { meta = with lib; { description = "The xkcd font"; - homepage = https://github.com/ipython/xkcd-font; + homepage = "https://github.com/ipython/xkcd-font"; license = licenses.cc-by-nc-30; platforms = platforms.all; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/data/fonts/yanone-kaffeesatz/default.nix b/pkgs/data/fonts/yanone-kaffeesatz/default.nix index e713f4d64a375..bd610938154de 100644 --- a/pkgs/data/fonts/yanone-kaffeesatz/default.nix +++ b/pkgs/data/fonts/yanone-kaffeesatz/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "yanone-kaffeesatz-2004"; - url = https://yanone.de/2015/data/UIdownloads/Yanone%20Kaffeesatz.zip; + url = "https://yanone.de/2015/data/UIdownloads/Yanone%20Kaffeesatz.zip"; postFetch = '' mkdir -p $out/share/fonts @@ -16,7 +16,7 @@ fetchzip { description = "The free font classic"; maintainers = with lib.maintainers; [ mt-caret ]; platforms = with lib.platforms; all; - homepage = https://yanone.de/fonts/kaffeesatz/; + homepage = "https://yanone.de/fonts/kaffeesatz/"; license = lib.licenses.ofl; }; } diff --git a/pkgs/data/fonts/zilla-slab/default.nix b/pkgs/data/fonts/zilla-slab/default.nix index 369fb53e6abcc..a244c04a65cd4 100644 --- a/pkgs/data/fonts/zilla-slab/default.nix +++ b/pkgs/data/fonts/zilla-slab/default.nix @@ -14,7 +14,7 @@ in fetchzip { sha256 = "1b1ys28hyjcl4qwbnsyi6527nj01g3d6id9jl23fv6f8fjm4ph0f"; meta = with lib; { - homepage = https://github.com/mozilla/zilla-slab; + homepage = "https://github.com/mozilla/zilla-slab"; description = "Zilla Slab fonts"; longDescription = '' Zilla Slab is Mozilla's core typeface, used diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index b0a8a05fc68dc..ab80305d52850 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -1,20 +1,25 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome3, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "${package-name}-${version}"; - package-name = "arc-icon-theme"; + pname = "arc-icon-theme"; version = "2016-11-22"; src = fetchFromGitHub { owner = "horst3180"; - repo = package-name; + repo = pname; rev = "55a575386a412544c3ed2b5617a61f842ee4ec15"; sha256 = "1ch3hp08qri93510hypzz6m2x4xgg2h15wvnhjwh1x1s1b7jvxjd"; }; - nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ]; + nativeBuildInputs = [ + autoreconfHook + gtk3 + ]; propagatedBuildInputs = [ + moka-icon-theme + gnome3.adwaita-icon-theme + gnome-icon-theme hicolor-icon-theme ]; @@ -24,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Arc icon theme"; - homepage = https://github.com/horst3180/arc-icon-theme; + homepage = "https://github.com/horst3180/arc-icon-theme"; license = licenses.gpl3; # moka-icon-theme dependency is restricted to linux platforms = platforms.linux; diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/pkgs/data/icons/bibata-cursors/default.nix index d2e35136a8be3..66ed71f1f9ecb 100644 --- a/pkgs/data/icons/bibata-cursors/default.nix +++ b/pkgs/data/icons/bibata-cursors/default.nix @@ -43,7 +43,7 @@ in stdenvNoCC.mkDerivation rec { meta = with stdenvNoCC.lib; { description = "Material Based Cursor"; - homepage = https://github.com/KaizIqbal/Bibata_Cursor; + homepage = "https://github.com/KaizIqbal/Bibata_Cursor"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ rawkode ]; diff --git a/pkgs/data/icons/bibata-cursors/extra.nix b/pkgs/data/icons/bibata-cursors/extra.nix index b9d4c22f878f5..7977566cb613a 100644 --- a/pkgs/data/icons/bibata-cursors/extra.nix +++ b/pkgs/data/icons/bibata-cursors/extra.nix @@ -43,7 +43,7 @@ in stdenvNoCC.mkDerivation rec { meta = with stdenvNoCC.lib; { description = "Cursors Based on Bibata"; - homepage = https://github.com/KaizIqbal/Bibata_Extra_Cursor; + homepage = "https://github.com/KaizIqbal/Bibata_Extra_Cursor"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/data/icons/bibata-cursors/translucent.nix index d5b541317b5e3..90e1102e124ce 100644 --- a/pkgs/data/icons/bibata-cursors/translucent.nix +++ b/pkgs/data/icons/bibata-cursors/translucent.nix @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation rec { meta = with stdenvNoCC.lib; { description = "Translucent Varient of the Material Based Cursor"; - homepage = https://github.com/Silicasandwhich/Bibata_Cursor_Translucent; + homepage = "https://github.com/Silicasandwhich/Bibata_Cursor_Translucent"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 3aebf09554c33..3a82c31329640 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; @@ -11,9 +11,18 @@ stdenv.mkDerivation rec { sha256 = "1f6qvpzxz759znishmr4b22n540y18glv41wmy91r78sa4g6x4sh"; }; - nativeBuildInputs = [ pkgconfig gdk-pixbuf librsvg optipng gtk3 ]; + nativeBuildInputs = [ + pkgconfig + gdk-pixbuf + librsvg + optipng + gtk3 + ]; propagatedBuildInputs = [ + pantheon.elementary-icon-theme + gnome3.adwaita-icon-theme + gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix index efce0a16e1308..9df47f8faa7c2 100644 --- a/pkgs/data/icons/faba-icon-theme/default.nix +++ b/pkgs/data/icons/faba-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "${package-name}-${version}"; @@ -12,9 +12,16 @@ stdenv.mkDerivation rec { sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n"; }; - nativeBuildInputs = [ meson ninja python3 gtk3 pantheon.elementary-icon-theme ]; + nativeBuildInputs = [ + meson + ninja + python3 + gtk3 + ]; propagatedBuildInputs = [ + pantheon.elementary-icon-theme + gnome-icon-theme hicolor-icon-theme ]; @@ -26,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A sexy and modern icon theme with Tango influences"; - homepage = https://snwh.org/moka; + homepage = "https://snwh.org/moka"; license = with licenses; [ cc-by-sa-40 gpl3 ]; platforms = platforms.all; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/data/icons/faba-mono-icons/default.nix index 96bd403115037..e403ba753ecc6 100644 --- a/pkgs/data/icons/faba-mono-icons/default.nix +++ b/pkgs/data/icons/faba-mono-icons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, faba-icon-theme, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "faba-mono-icons"; @@ -11,15 +11,21 @@ stdenv.mkDerivation rec { sha256 = "0nisfl92y6hrbakp9qxi0ygayl6avkzrhwirg6854bwqjy2dvjv9"; }; - nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ]; + nativeBuildInputs = [ + autoreconfHook + gtk3 + ]; propagatedBuildInputs = [ + moka-icon-theme + faba-icon-theme + gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; - postFixup = '' + postInstall = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done @@ -27,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The full set of Faba monochrome panel icons"; - homepage = https://snwh.org/moka; + homepage = "https://snwh.org/moka"; license = licenses.gpl3; # moka-icon-theme dependency is restricted to linux platforms = platforms.linux; diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/data/icons/flat-remix-icon-theme/default.nix index 65c2fe295fb35..b0b115f096f22 100644 --- a/pkgs/data/icons/flat-remix-icon-theme/default.nix +++ b/pkgs/data/icons/flat-remix-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub , gtk3 }: +{ stdenv, fetchFromGitHub , gtk3, breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "flat-remix-icon-theme"; @@ -11,14 +11,23 @@ stdenv.mkDerivation rec { sha256 = "14n5wydhd5ifmsbj770s2qg2ksd3xa3m61qxydid6jq39k0lxbd8"; }; - nativeBuildInputs = [ gtk3 ]; + nativeBuildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = [ + breeze-icons + pantheon.elementary-icon-theme + gnome-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; installPhase = '' mkdir -p $out/share/icons mv Flat-Remix* $out/share/icons/ - ''; - postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done @@ -26,9 +35,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flat remix is a pretty simple icon theme inspired on material design"; - homepage = https://drasite.com/flat-remix; + homepage = "https://drasite.com/flat-remix"; license = with licenses; [ gpl3 ]; platforms = platforms.linux; maintainers = with maintainers; [ mschneider ]; }; -} \ No newline at end of file +} diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index 2c0872188e02d..5eefce81a1293 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Default fallback theme used by implementations of the icon theme specification"; - homepage = https://icon-theme.freedesktop.org/releases/; + homepage = "https://icon-theme.freedesktop.org/releases/"; platforms = platforms.unix; }; } diff --git a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh index f07bab4b269ff..0fd9bf85d8310 100644 --- a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh +++ b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh @@ -10,4 +10,44 @@ hicolorIconThemeHook() { } # I think this is meant to be a runtime dep -addEnvHooks "${hostOffset:?}" hicolorIconThemeHook +addEnvHooks "${targetOffset:?}" hicolorIconThemeHook + +# Make symbolic links of parent icon themes that are inherited in the +# icon themes installed by the package. +symlinkParentIconThemes() { + if [ -e $out/share/icons ]; then + echo Symlinking parent icon themes... + local theme + local theme_name + local inheritance + local parent + local parent_theme + local dir + local parent_path + for theme in $out/share/icons/*/index.theme; do + theme_name="${theme%/*}" + theme_name="${theme_name##*/}" + echo " theme: $theme_name" + inheritance=$(sed -rne 's,^Inherits=(.*)$,\1,p' $theme) + IFS=',' read -ra parent_themes <<< "$inheritance" + for parent_theme in "${parent_themes[@]}"; do + parent_path="" + if [ -e "$out/share/icons/$parent_theme" ]; then + parent_path="$(realpath $out/share/icons/$parent_theme)" + else + IFS=':' read -ra dirs <<< $XDG_ICON_DIRS + for parent_dir in "${dirs[@]}"; do + if [ -e "$parent_dir/icons/$parent_theme/index.theme" ]; then + parent_path=$(realpath "$parent_dir/icons/$parent_theme") + ln -s "$parent_path" "$out/share/icons/" + break + fi + done + fi + echo " parent: $parent_theme -> $parent_path" + done + done + fi +} + +preFixupHooks+=(symlinkParentIconThemes) diff --git a/pkgs/data/icons/humanity-icon-theme/default.nix b/pkgs/data/icons/humanity-icon-theme/default.nix new file mode 100644 index 0000000000000..62085110f5134 --- /dev/null +++ b/pkgs/data/icons/humanity-icon-theme/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, gtk3, gnome3, hicolor-icon-theme }: + +stdenv.mkDerivation rec { + pname = "humanity-icon-theme"; + version = "0.6.15"; + + src = fetchurl { + url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${version}.tar.xz"; + sha256 = "19ja47468s3jfabvakq9wknyfclfr31a9vd11p3mhapfq8jv9g4x"; + }; + + nativeBuildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = [ + gnome3.adwaita-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + cp -a Humanity* $out/share/icons + rm $out/share/icons/*/{AUTHORS,CONTRIBUTORS,COPYING} + + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Humanity icons from Ubuntu"; + homepage = "https://launchpad.net/humanity/"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/icons/iconpack-jade/default.nix b/pkgs/data/icons/iconpack-jade/default.nix index 1b42c1af61257..1bfa8092a322b 100644 --- a/pkgs/data/icons/iconpack-jade/default.nix +++ b/pkgs/data/icons/iconpack-jade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "iconpack-jade"; @@ -13,16 +13,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; installPhase = '' - mkdir -p $out/share/icons - cp -a Jade* $out/share/icons - ''; + mkdir -p $out/share/icons + cp -a Jade* $out/share/icons - postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix index c954af9e83dcb..ae8c127381b1d 100644 --- a/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/pkgs/data/icons/iconpack-obsidian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "iconpack-obsidian"; @@ -13,16 +13,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; + # still missing parent themes: Ambiant-MATE, Mint-X, Faenza-Dark, KFaenza dontDropIconThemeCache = true; installPhase = '' - mkdir -p $out/share/icons - mv Obsidian* $out/share/icons - ''; + mkdir -p $out/share/icons + mv Obsidian* $out/share/icons - postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix index 20bc8dc0a5893..ee539981fbca3 100644 --- a/pkgs/data/icons/maia-icon-theme/default.nix +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { dontDropIconThemeCache = true; - postFixup = '' + postInstall = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Icons based on Breeze and Super Flat Remix"; - homepage = https://gitlab.manjaro.org/artwork/themes/maia; + homepage = "https://gitlab.manjaro.org/artwork/themes/maia"; license = licenses.lgpl3; maintainers = with maintainers; [ mounium ]; platforms = platforms.all; diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix index 539dfaa2d1099..d481f2df8d6ef 100644 --- a/pkgs/data/icons/moka-icon-theme/default.nix +++ b/pkgs/data/icons/moka-icon-theme/default.nix @@ -11,9 +11,15 @@ stdenv.mkDerivation rec { sha256 = "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd"; }; - nativeBuildInputs = [ meson ninja gtk3 python3 faba-icon-theme ]; + nativeBuildInputs = [ + meson + ninja + gtk3 + python3 + ]; propagatedBuildInputs = [ + faba-icon-theme hicolor-icon-theme ]; @@ -25,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An icon theme designed with a minimal flat style using simple geometry and bright colours"; - homepage = https://snwh.org/moka; + homepage = "https://snwh.org/moka"; license = with licenses; [ cc-by-sa-40 gpl3 ]; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/pkgs/data/icons/numix-cursor-theme/default.nix b/pkgs/data/icons/numix-cursor-theme/default.nix index 8e5a317082eab..d0411a8c5697d 100644 --- a/pkgs/data/icons/numix-cursor-theme/default.nix +++ b/pkgs/data/icons/numix-cursor-theme/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Numix cursor theme"; - homepage = https://numixproject.github.io; + homepage = "https://numixproject.github.io"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 96ad0e2c2b812..3c991cf1fc831 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -13,18 +13,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - buildInputs = [ numix-icon-theme ]; - - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ numix-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; installPhase = '' - install -dm 755 $out/share/icons - cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/share/icons/ - ''; + runHook preInstall + + mkdir -p $out/share/icons + cp -a Numix-Circle{,-Light} $out/share/icons - postFixup = '' for panel in $out/share/icons/*/*/panel; do ln -sf $(realpath ${numix-icon-theme}/share/icons/Numix/16/$(readlink $panel)) $panel done @@ -32,11 +30,13 @@ stdenv.mkDerivation rec { for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done + + runHook postInstall ''; meta = with stdenv.lib; { description = "Numix icon theme (circle version)"; - homepage = https://numixproject.github.io; + homepage = "https://numixproject.github.io"; license = licenses.gpl3; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 644d20cccfdba..9cebdc331065d 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -13,18 +13,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - buildInputs = [ numix-icon-theme ]; - - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ numix-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; installPhase = '' + runHook preInstall + mkdir -p $out/share/icons - cp -a Numix-Square{,-Light} $out/share/icons/ - ''; + cp -a Numix-Square{,-Light} $out/share/icons - postFixup = '' for panel in $out/share/icons/*/*/panel; do ln -sf $(realpath ${numix-icon-theme}/share/icons/Numix/16/$(readlink $panel)) $panel done @@ -32,11 +30,13 @@ stdenv.mkDerivation rec { for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done + + runHook postInstall ''; meta = with stdenv.lib; { description = "Numix icon theme (square version)"; - homepage = https://numixproject.github.io; + homepage = "https://numixproject.github.io"; license = licenses.gpl3; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 46c61d861a321..56bb2f3808fb9 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "numix-icon-theme"; @@ -13,18 +13,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ - hicolor-icon-theme - ]; + propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; installPhase = '' mkdir -p $out/share/icons cp -a Numix{,-Light} $out/share/icons/ - ''; - postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index 477960972a759..585190a7b382c 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, gnome3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "paper-icon-theme"; @@ -11,9 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0x45zkjnmbz904df63ph06npbm3phpgck4xwyymx8r8jgrfplk6v"; }; - nativeBuildInputs = [ meson ninja gtk3 python3 ]; + nativeBuildInputs = [ + meson + ninja + gtk3 + python3 + ]; propagatedBuildInputs = [ + gnome3.adwaita-icon-theme + gnome-icon-theme hicolor-icon-theme ]; @@ -30,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Modern icon theme designed around bold colours and simple geometric shapes"; - homepage = https://snwh.org/paper; + homepage = "https://snwh.org/paper"; license = with licenses; [ cc-by-sa-40 lgpl3 ]; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index d01410f28da54..a39a872063547 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -1,28 +1,33 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20200405"; + version = "20200430"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "0qv4340avm5s0640r8aznbfwjzvm6k64840qggyg9jfcy6223pdy"; + sha256 = "1dgxf3fi4x5iy504xncj1jba8cd51axkn2j1cfb220rpc6mzv25l"; }; - nativeBuildInputs = [ gtk3 ]; + nativeBuildInputs = [ + gtk3 + ]; - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ + pantheon.elementary-icon-theme + breeze-icons + gnome-icon-theme + hicolor-icon-theme + ]; dontDropIconThemeCache = true; installPhase = '' - mkdir -p $out/share/icons - mv {,e}Papirus* $out/share/icons - ''; + mkdir -p $out/share/icons + mv {,e}Papirus* $out/share/icons - postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done diff --git a/pkgs/data/icons/papirus-maia-icon-theme/default.nix b/pkgs/data/icons/papirus-maia-icon-theme/default.nix index e15e64c2101f3..4cfe50d7836bc 100644 --- a/pkgs/data/icons/papirus-maia-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-maia-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gtk3 }: +{ stdenv, fetchFromGitHub, cmake, gtk3, breeze-icons, gnome-icon-theme, papirus-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "papirus-maia-icon-theme"; @@ -16,11 +16,20 @@ stdenv.mkDerivation rec { gtk3 ]; + propagatedBuildInputs = [ + breeze-icons + gnome-icon-theme + papirus-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + postPatch = '' substituteInPlace CMakeLists.txt --replace /usr "$out" ''; - postFixup = '' + postInstall = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done @@ -28,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Manjaro variation of Papirus icon theme"; - homepage = https://github.com/Ste74/papirus-maia-icon-theme; + homepage = "https://github.com/Ste74/papirus-maia-icon-theme"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/data/icons/pop-icon-theme/default.nix b/pkgs/data/icons/pop-icon-theme/default.nix new file mode 100644 index 0000000000000..76b393dcf791f --- /dev/null +++ b/pkgs/data/icons/pop-icon-theme/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, gtk3 +, breeze-icons +, gnome3 +, pantheon +, hicolor-icon-theme +}: + +stdenv.mkDerivation rec { + pname = "pop-icon-theme"; + version = "2020-03-04"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "icon-theme"; + rev = "11f18cb48455b47b6535018f1968777100471be1"; + sha256 = "1s4pjwv2ynw400gnzgzczlxzw3gxh5s8cxxbi9zpxq4wzjg6jqyv"; + }; + + nativeBuildInputs = [ + meson + ninja + gtk3 + ]; + + propagatedBuildInputs = [ + breeze-icons + gnome3.adwaita-icon-theme + pantheon.elementary-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + meta = with stdenv.lib; { + description = "Icon theme for Pop!_OS with a semi-flat design and raised 3D motifs"; + homepage = "https://github.com/pop-os/icon-theme"; + license = with licenses; [ cc-by-sa-40 gpl3 ]; + platforms = platforms.unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix index 641b3da883e81..fa52ad176d982 100644 --- a/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3 }: +{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "qogir-icon-theme"; @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; + propagatedBuildInputs = [ hicolor-icon-theme ]; + dontDropIconThemeCache = true; installPhase = '' diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index a4a7237f97403..f1b59c2f5386d 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg -, gtk/*any version*/, hicolor-icon-theme +, gtk/*any version*/, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -14,10 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool iconnamingutils imagemagick librsvg ]; - - propagatedBuildInputs = [ - hicolor-icon-theme - ]; + propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; + # still missing parent icon themes: cristalsvg dontDropIconThemeCache = true; @@ -27,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A basic set of icons"; - homepage = http://tango.freedesktop.org/Tango_Icon_Library; + homepage = "http://tango.freedesktop.org/Tango_Icon_Library"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/data/icons/vanilla-dmz/default.nix index f271d7a44e65d..c92a80527000a 100644 --- a/pkgs/data/icons/vanilla-dmz/default.nix +++ b/pkgs/data/icons/vanilla-dmz/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { install -Dm644 DMZ-Black/index.theme $out/share/icons/Vanilla-DMZ-AA/index.theme ''; meta = with lib; { - homepage = http://jimmac.musichall.cz; + homepage = "http://jimmac.musichall.cz"; description = "A style neutral scalable cursor theme"; platforms = platforms.all; license = licenses.cc-by-nc-sa-30; diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix index c3670a6f58ce2..a8dc4539a7dd1 100644 --- a/pkgs/data/icons/zafiro-icons/default.nix +++ b/pkgs/data/icons/zafiro-icons/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, numix-icon-theme, numix-icon-theme-circle, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "zafiro-icons"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "zayronxio"; repo = pname; rev = "${version}"; - sha256 = "0gy3c0jkj1icnwcs23b6km9cj9cccv8y5z1w11nfdv91cq3mdhmb"; + sha256 = "05h8qm9izjbp8pnl9jpbw3y9sddhp0zmg94fm1k4d4hhdqnakqhv"; }; - nativeBuildInputs = [ gtk3 ]; + nativeBuildInputs = [ + gtk3 + ]; propagatedBuildInputs = [ + breeze-icons + gnome-icon-theme + numix-icon-theme + numix-icon-theme-circle hicolor-icon-theme + # still missing parent icon themes: Surfn ]; dontDropIconThemeCache = true; @@ -27,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Icon pack flat with light colors"; - homepage = https://github.com/zayronxio/Zafiro-icons; + homepage = "https://github.com/zayronxio/Zafiro-icons"; license = with licenses; [ gpl3 ]; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/data/machine-learning/mnist/default.nix b/pkgs/data/machine-learning/mnist/default.nix index fe9e83492e429..44a70ac5d1ee0 100644 --- a/pkgs/data/machine-learning/mnist/default.nix +++ b/pkgs/data/machine-learning/mnist/default.nix @@ -37,7 +37,7 @@ in Technology database) is a large database of handwritten digits that is commonly used for training various image processing systems. ''; - homepage = http://yann.lecun.com/exdb/mnist/index.html; + homepage = "http://yann.lecun.com/exdb/mnist/index.html"; license = licenses.cc-by-sa-30; platforms = platforms.all; maintainers = with maintainers; [ cmcdragonkai ]; diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/data/misc/brise/default.nix index f1e0604acf86f..4f5b2e972e13f 100644 --- a/pkgs/data/misc/brise/default.nix +++ b/pkgs/data/misc/brise/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { to support various Chinese input methods, including those based on modern dialects or historical diasystems of the Chinese language. ''; - homepage = https://rime.im; + homepage = "https://rime.im"; # Note that individual packages in this collection # may be released under different licenses license = licenses.gpl3; diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 34dd48b897f2d..27aa60ac09f5c 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; meta = { - homepage = https://curl.haxx.se/docs/caextract.html; + homepage = "https://curl.haxx.se/docs/caextract.html"; description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 3cadb477ae811..d0d18d473358a 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Monitor database for DDCcontrol"; - homepage = https://github.com/ddccontrol/ddccontrol-db; + homepage = "https://github.com/ddccontrol/ddccontrol-db"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ stdenv.lib.maintainers.pakhfn ]; diff --git a/pkgs/data/misc/freepats/default.nix b/pkgs/data/misc/freepats/default.nix index e48470a67bb78..a1fa49bae27dc 100644 --- a/pkgs/data/misc/freepats/default.nix +++ b/pkgs/data/misc/freepats/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { Freepats is a project to create a free and open set of instrument patches, in any format, that can be used with softsynths. ''; - homepage = http://freepats.zenvoid.org/; + homepage = "http://freepats.zenvoid.org/"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 8cbd526f3d3bc..4fcbe8d02832f 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "GeoLite Legacy IP geolocation databases"; - homepage = https://geolite.maxmind.com/download/geoip; + homepage = "https://geolite.maxmind.com/download/geoip"; license = licenses.cc-by-sa-30; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 960d1aef12118..932e400946e4b 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/90b24a91103dca4f0df6cb28cecb205a7d7ab650.tar.gz"; - sha256 = "1zfj8c6s9icqg83ycfvd150s4jd07ccbjg2w2mn10rx5ng76mn53"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/6515ef12bbcf8fbac87e12b4cb30b7eefa9ce9ce.tar.gz"; + sha256 = "0plf0kk0wj1lbmks09afyqrl70z0miwxzfk3zh7y2qiw3g5l1v0x"; } diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index 3124b57ac2b28..2b2d2d190650a 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip }: let - version = "20190731"; + version = "20200407"; in fetchzip { name = "iana-etc-${version}"; url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "0vqr4zm53zn7z75ynmf59xfrlhpyk8f41xd6i4v8j0f7k6hfdvpi"; + sha256 = "1zmqim0l4lz5xbq7w2wi48fzsvg2msyw6c80dzw4vxll31frpy18"; postFetch = '' tar -xzvf $downloadedFile --strip-components=1 @@ -13,7 +13,7 @@ in fetchzip { ''; meta = with stdenv.lib; { - homepage = https://github.com/Mic92/iana-etc; + homepage = "https://github.com/Mic92/iana-etc"; description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/data/misc/libkkc-data/default.nix b/pkgs/data/misc/libkkc-data/default.nix index cb446e9b0bc1b..aeb15057abf32 100644 --- a/pkgs/data/misc/libkkc-data/default.nix +++ b/pkgs/data/misc/libkkc-data/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Language model data package for libkkc"; - homepage = https://github.com/ueno/libkkc; + homepage = "https://github.com/ueno/libkkc"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vanzef ]; platforms = platforms.linux; diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index 0ac5dc51d6b51..0307bf8d0ed2d 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -23,7 +23,7 @@ in meta = with stdenv.lib; { description = "A repository of data files describing media player capabilities"; - homepage = https://www.freedesktop.org/wiki/Software/media-player-info/; + homepage = "https://www.freedesktop.org/wiki/Software/media-player-info/"; license = licenses.bsd3; maintainers = with maintainers; [ ttuegel ]; platforms = with platforms; linux; diff --git a/pkgs/data/misc/mime-types/default.nix b/pkgs/data/misc/mime-types/default.nix index 65ad964736d15..b18b66a227e64 100644 --- a/pkgs/data/misc/mime-types/default.nix +++ b/pkgs/data/misc/mime-types/default.nix @@ -13,7 +13,7 @@ in fetchzip rec { meta = with stdenv.lib; { description = "A database of common mappings of file extensions to MIME types"; - homepage = https://packages.gentoo.org/packages/app-misc/mime-types; + homepage = "https://packages.gentoo.org/packages/app-misc/mime-types"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/data/misc/miscfiles/default.nix b/pkgs/data/misc/miscfiles/default.nix index 4e1d1e02a2f4e..3d1caf9ae5173 100644 --- a/pkgs/data/misc/miscfiles/default.nix +++ b/pkgs/data/misc/miscfiles/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/miscfiles/; + homepage = "https://www.gnu.org/software/miscfiles/"; license = licenses.gpl2Plus; description = "Collection of files not of crucial importance for sysadmins"; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index a2df56c0898fe..c9f24c9e85ef8 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mobile broadband service provider database"; - homepage = https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband/ServiceProviders; + homepage = "https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband/ServiceProviders"; license = licenses.publicDomain; maintainers = [ ]; platforms = platforms.all; diff --git a/pkgs/data/misc/nixos-artwork/grub2-theme.nix b/pkgs/data/misc/nixos-artwork/grub2-theme.nix index 8bc6c8adc13e7..0a5717ba3b274 100644 --- a/pkgs/data/misc/nixos-artwork/grub2-theme.nix +++ b/pkgs/data/misc/nixos-artwork/grub2-theme.nix @@ -1,5 +1,5 @@ {fetchzip}: fetchzip { - url = https://github.com/NixOS/nixos-artwork/releases/download/bootloader-18.09-pre/grub2-installer.tar.bz2; + url = "https://github.com/NixOS/nixos-artwork/releases/download/bootloader-18.09-pre/grub2-installer.tar.bz2"; sha256 = "0rhh061m1hpgadm7587inw3fxfacnd53xjc53w3vzghlck56djq5"; } diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix index 3983869a45289..a6a368e26e075 100644 --- a/pkgs/data/misc/nixos-artwork/wallpapers.nix +++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix @@ -24,7 +24,7 @@ _EOF meta = with stdenv.lib; { inherit description; - homepage = https://github.com/NixOS/nixos-artwork; + homepage = "https://github.com/NixOS/nixos-artwork"; license = licenses.free; platforms = platforms.all; }; @@ -40,7 +40,7 @@ rec { name = "mosaic-blue-2016-02-19"; description = "Mosaic blue background for Nix"; src = fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-mosaic-blue.png; + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-mosaic-blue.png"; sha256 = "1cbcssa8qi0giza0k240w5yy4yb2bhc1p1r7pw8qmziprcmwv5n5"; }; }; @@ -49,7 +49,7 @@ rec { name = "simple-blue-2016-02-19"; description = "Simple blue background for Nix"; src = fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-blue.png; + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-blue.png"; sha256 = "1llr175m454aqixxwbp3kb5qml2hi1kn7ia6lm7829ny6y7xrnms"; }; }; @@ -58,7 +58,7 @@ rec { name = "simple-dark-gray-2016-02-19"; description = "Simple dark gray background for Nix"; src = fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-dark-gray.png; + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-dark-gray.png"; sha256 = "1282cnqc5qynp0q9gdll7bgpw23yp5bhvaqpar59ibkh3iscg8i5"; }; }; @@ -67,7 +67,7 @@ rec { name = "simple-dark-gray-bootloader-2018-08-28"; description = "Simple dark gray background for NixOS, specifically bootloaders."; src = fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/9d1f11f652ed5ffe460b6c602fbfe2e7e9a08dff/bootloader/nix-wallpaper-simple-dark-gray_bootloader.png; + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/9d1f11f652ed5ffe460b6c602fbfe2e7e9a08dff/bootloader/nix-wallpaper-simple-dark-gray_bootloader.png"; sha256 = "0v26kfydn7alr81f2qpgsqdiq2zk7yrwlgibx2j7k91z9h47dpj9"; }; }; @@ -76,7 +76,7 @@ rec { name = "simple-dark-gray-2018-08-28"; description = "Simple dark gray background for NixOS, specifically bootloaders and graphical login."; src = fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/783c38b22de09f6ee33aacc817470a4513392d83/wallpapers/nix-wallpaper-simple-dark-gray_bottom.png; + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/783c38b22de09f6ee33aacc817470a4513392d83/wallpapers/nix-wallpaper-simple-dark-gray_bottom.png"; sha256 = "13hi4jwp5ga06dpdw5l03b4znwn58fdjlkqjkg824isqsxzv6k15"; }; }; @@ -85,7 +85,7 @@ rec { name = "simple-light-gray-2016-02-19"; description = "Simple light gray background for Nix"; src = fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-light-gray.png; + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-light-gray.png"; sha256 = "0i6d0xv1nzrv7na9hjrgzl3jrwn81vnprnq2pxyznlxbjcgkjnk2"; }; }; @@ -94,7 +94,7 @@ rec { name = "simple-red-2016-02-19"; description = "Simple red background for Nix"; src = fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-red.png; + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-red.png"; sha256 = "16drprsi3q8xbxx3bxp54yld04c4lq6jankw8ww1irg7z61a6wjs"; }; }; @@ -103,7 +103,7 @@ rec { name = "stripes-logo-2016-02-19"; description = "Stripes logo background for Nix"; src = fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes-logo.png; + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes-logo.png"; sha256 = "0cqjkgp30428c1yy8s4418k4qz0ycr6fzcg4rdi41wkh5g1hzjnl"; }; }; @@ -112,7 +112,7 @@ rec { name = "stripes-2016-02-19"; description = "Stripes background for Nix"; src = fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes.png; + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes.png"; sha256 = "116337wv81xfg0g0bsylzzq2b7nbj6hjyh795jfc9mvzarnalwd3"; }; }; diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 7fb2aa2f81178..4460e7b40d7c0 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20200214"; + version = "20200515"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "1fpdb8r8kzwp1k5dc9xyy9jr2jr3haq7n9b6spamm599zvzf8nb6"; + sha256 = "1m9idmmb1sjf24lp9lgng2m1jj09mn9fa9pnz36fdv5q0lskgscj"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; diff --git a/pkgs/data/misc/pari-galdata/default.nix b/pkgs/data/misc/pari-galdata/default.nix index 2535e8cfc2509..b07be5a0c0508 100644 --- a/pkgs/data/misc/pari-galdata/default.nix +++ b/pkgs/data/misc/pari-galdata/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "PARI database needed to compute Galois group in degrees 8 through 11"; - homepage = http://pari.math.u-bordeaux.fr/; + homepage = "http://pari.math.u-bordeaux.fr/"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/data/misc/pari-seadata-small/default.nix b/pkgs/data/misc/pari-seadata-small/default.nix index 3470a0804f749..01ffd6db64fbf 100644 --- a/pkgs/data/misc/pari-seadata-small/default.nix +++ b/pkgs/data/misc/pari-seadata-small/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "PARI database needed by ellap for large primes"; - homepage = http://pari.math.u-bordeaux.fr/; + homepage = "http://pari.math.u-bordeaux.fr/"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index d14ccdec2ead4..c06e63d3e692b 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; meta = with stdenv.lib; { - homepage = https://poppler.freedesktop.org/; + homepage = "https://poppler.freedesktop.org/"; description = "Encoding files for Poppler, a PDF rendering library"; platforms = platforms.all; license = licenses.free; # more free licenses combined diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix index 72895653479b9..7e628567b6ea5 100644 --- a/pkgs/data/misc/shared-desktop-ontologies/default.nix +++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = http://oscaf.sourceforge.net/; + homepage = "http://oscaf.sourceforge.net/"; description = "Ontologies necessary for the Nepomuk semantic desktop"; longDescription = '' The shared-desktop-ontologies package brings the semantic web to the diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 4594ffc239216..4d286ad0f0a8f 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A database of common MIME types"; - homepage = http://freedesktop.org/wiki/Software/shared-mime-info; + homepage = "http://freedesktop.org/wiki/Software/shared-mime-info"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.mimame ]; diff --git a/pkgs/data/misc/sound-theme-freedesktop/default.nix b/pkgs/data/misc/sound-theme-freedesktop/default.nix index 355a2c2c577af..9082900619482 100644 --- a/pkgs/data/misc/sound-theme-freedesktop/default.nix +++ b/pkgs/data/misc/sound-theme-freedesktop/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Freedesktop reference sound theme"; - homepage = http://freedesktop.org/wiki/Specifications/sound-theme-spec; + homepage = "http://freedesktop.org/wiki/Specifications/sound-theme-spec"; # See http://cgit.freedesktop.org/sound-theme-freedesktop/tree/CREDITS: license = with licenses; [ cc-by-30 cc-by-sa-25 gpl2 gpl2Plus ]; platforms = with platforms; unix; diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/data/misc/spdx-license-list-data/default.nix index 1c68569a29aa7..20931c8ad2442 100644 --- a/pkgs/data/misc/spdx-license-list-data/default.nix +++ b/pkgs/data/misc/spdx-license-list-data/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spdx-license-list-data"; - version = "3.8"; + version = "3.9"; src = fetchFromGitHub { owner = "spdx"; repo = "license-list-data"; rev = "v${version}"; - sha256 = "1pfy0vbs7sk7m670mclmlkpcanizdmgsm1qgwzrw28w3hxfq7gdb"; + sha256 = "0qf0g7a3jby8sngdjdic30xrb6ch56d6gzpphs8lkm6giir142rj"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 3227d9a76235b..367ee06390cd3 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { setupHook = ./tzdata-setup-hook.sh; meta = with stdenv.lib; { - homepage = http://www.iana.org/time-zones; + homepage = "http://www.iana.org/time-zones"; description = "Database of current and historical time zones"; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index 43847b4b3b68d..45ff07b8efce2 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wireless regulatory database for CRDA"; - homepage = http://wireless.kernel.org/en/developers/Regulatory/; + homepage = "http://wireless.kernel.org/en/developers/Regulatory/"; license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix index 12acc424b9d17..e976fe1358d23 100644 --- a/pkgs/data/misc/xorg-rgb/default.nix +++ b/pkgs/data/misc/xorg-rgb/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = http://xorg.freedesktop.org/; + homepage = "http://xorg.freedesktop.org/"; }; } diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix index 17303e682b925..68bc6101d03c6 100644 --- a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix +++ b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Schemas for DocBook 5.0, a semantic markup language for technical documentation"; - homepage = https://docbook.org/xml/5.0/; + homepage = "https://docbook.org/xml/5.0/"; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.all; }; diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix index 9728b2f96c482..0faad5b594f6d 100644 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix @@ -3,12 +3,12 @@ let src = fetchurl { - url = http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip; + url = "http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip"; sha256 = "0f25ch7bywwhdxb1qa0hl28mgq1blqdap3rxzamm585rf4kis9i0"; }; isoents = fetchurl { - url = http://www.oasis-open.org/cover/ISOEnts.zip; + url = "http://www.oasis-open.org/cover/ISOEnts.zip"; sha256 = "1clrkaqnvc1ja4lj8blr0rdlphngkcda3snm7b9jzvcn76d3br6w"; }; diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix index 78b99081504dc..4b0ced9daaea1 100644 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix @@ -3,12 +3,12 @@ let src = fetchurl { - url = http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip; + url = "http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip"; sha256 = "04b3gp4zkh9c5g9kvnywdkdfkcqx3kjc04j4mpkr4xk7lgqgrany"; }; isoents = fetchurl { - url = http://www.oasis-open.org/cover/ISOEnts.zip; + url = "http://www.oasis-open.org/cover/ISOEnts.zip"; sha256 = "1clrkaqnvc1ja4lj8blr0rdlphngkcda3snm7b9jzvcn76d3br6w"; }; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix index 3d8e16443dbf3..a3b7067b2a42c 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "docbook-xml-ebnf-1.2b1"; dtd = fetchurl { - url = http://www.docbook.org/xml/ebnf/1.2b1/dbebnf.dtd; + url = "http://www.docbook.org/xml/ebnf/1.2b1/dbebnf.dtd"; sha256 = "0min5dsc53my13b94g2yd65q1nkjcf4x1dak00bsc4ckf86mrx95"; }; catalog = ./docbook-ebnf.cat; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix index 35e69641f1169..de126da9f9098 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix @@ -5,7 +5,7 @@ let # Urgh, DocBook 4.1.2 doesn't come with an XML catalog. Use the one # from 4.2. docbook42catalog = fetchurl { - url = http://www.docbook.org/xml/4.2/catalog.xml; + url = "http://www.docbook.org/xml/4.2/catalog.xml"; sha256 = "18lhp6q2l0753s855r638shkbdwq9blm6akdjsc9nrik24k38j17"; }; @@ -15,7 +15,7 @@ import ./generic.nix { inherit stdenv unzip findXMLCatalogs; name = "docbook-xml-4.1.2"; src = fetchurl { - url = http://www.docbook.org/xml/4.1.2/docbkx412.zip; + url = "http://www.docbook.org/xml/4.1.2/docbkx412.zip"; sha256 = "0wkp5rvnqj0ghxia0558mnn4c7s3n501j99q2isp3sp0ci069w1h"; }; postInstall = " diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix index f8c827e826d0f..f894db24827e0 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix @@ -4,7 +4,7 @@ import ./generic.nix { inherit stdenv unzip findXMLCatalogs; name = "docbook-xml-4.2"; src = fetchurl { - url = http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip; + url = "http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip"; sha256 = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2"; }; meta = { diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix index 2c253a1029d61..dc2ec36ccef71 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix @@ -4,7 +4,7 @@ import ./generic.nix { inherit stdenv unzip findXMLCatalogs; name = "docbook-xml-4.3"; src = fetchurl { - url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip; + url = "http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip"; sha256 = "0r1l2if1z4wm2v664sqdizm4gak6db1kx9y50jq89m3gxaa8l1i3"; }; meta = { diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix index d051d205808b5..93b03d854572b 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix @@ -4,7 +4,7 @@ import ./generic.nix { inherit stdenv unzip findXMLCatalogs; name = "docbook-xml-4.4"; src = fetchurl { - url = http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip; + url = "http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip"; sha256 = "141h4zsyc71sfi2zzd89v4bb4qqq9ca1ri9ix2als9f4i3mmkw82"; }; meta = { diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix index 156ee653bbe36..5bdb63e69da24 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix @@ -4,7 +4,7 @@ import ./generic.nix { inherit stdenv unzip findXMLCatalogs; name = "docbook-xml-4.5"; src = fetchurl { - url = http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip; + url = "http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip"; sha256 = "1d671lcjckjri28xfbf6dq7y3xnkppa910w1jin8rjc35dx06kjf"; }; meta = { diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix index 54ef5225d2f13..383a8750f1f81 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "xhtml1-20020801"; src = fetchurl { - url = http://www.w3.org/TR/xhtml1/xhtml1.tgz; + url = "http://www.w3.org/TR/xhtml1/xhtml1.tgz"; sha256 = "0rr0d89i0z75qvjbm8il93bippx09hbmjwy0y2sj44n9np69x3hl"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; # */ meta = { - homepage = http://www.w3.org/TR/xhtml1/; + homepage = "http://www.w3.org/TR/xhtml1/"; description = "DTDs for XHTML 1.0, the Extensible HyperText Markup Language"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index 8aa1f0b633097..28737253af5e7 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -17,7 +17,7 @@ let # Prevent a potential stack overflow # https://github.com/docbook/xslt10-stylesheets/pull/37 (fetchpatch { - url = https://src.fedoraproject.org/rpms/docbook-style-xsl/raw/e3ae7a97ed1d185594dd35954e1a02196afb205a/f/docbook-style-xsl-non-recursive-string-subst.patch; + url = "https://src.fedoraproject.org/rpms/docbook-style-xsl/raw/e3ae7a97ed1d185594dd35954e1a02196afb205a/f/docbook-style-xsl-non-recursive-string-subst.patch"; sha256 = "0lrjjg5kpwwmbhkxzz6i5zmimb6lsvrrdhzc2qgjmb3r6jnsmii3"; stripLen = "1"; }) @@ -63,7 +63,7 @@ let ''; meta = { - homepage = http://wiki.docbook.org/topic/DocBookXslStylesheets; + homepage = "http://wiki.docbook.org/topic/DocBookXslStylesheets"; description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats"; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.all; diff --git a/pkgs/data/soundfonts/fluid/default.nix b/pkgs/data/soundfonts/fluid/default.nix index 18c4160014f63..c1c318383a096 100644 --- a/pkgs/data/soundfonts/fluid/default.nix +++ b/pkgs/data/soundfonts/fluid/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Frank Wen's pro-quality GM/GS soundfont"; - homepage = http://www.hammersound.net/; + homepage = "http://www.hammersound.net/"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/data/themes/adapta-kde/default.nix b/pkgs/data/themes/adapta-kde/default.nix index 47740aa676222..fed16da929c25 100644 --- a/pkgs/data/themes/adapta-kde/default.nix +++ b/pkgs/data/themes/adapta-kde/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A port of the Adapta theme for Plasma"; - homepage = https://git.io/adapta-kde; + homepage = "https://git.io/adapta-kde"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.tadfisher ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/data/themes/adapta/default.nix b/pkgs/data/themes/adapta/default.nix index 02812b1f9397b..ca8e908009f90 100644 --- a/pkgs/data/themes/adapta/default.nix +++ b/pkgs/data/themes/adapta/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An adaptive GTK theme based on Material Design Guidelines"; - homepage = https://github.com/adapta-project/adapta-gtk-theme; + homepage = "https://github.com/adapta-project/adapta-gtk-theme"; license = with licenses; [ gpl2 cc-by-sa-30 ]; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/themes/adementary/default.nix b/pkgs/data/themes/adementary/default.nix index 1cb7ac53432f8..4c8362b346b3f 100644 --- a/pkgs/data/themes/adementary/default.nix +++ b/pkgs/data/themes/adementary/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Adwaita-based GTK theme with design influence from elementary OS and Vertex GTK theme"; - homepage = https://github.com/hrdwrrsk/adementary-theme; + homepage = "https://github.com/hrdwrrsk/adementary-theme"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.linux; diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index 7428b5fab2fd2..9d5334bc79b4d 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -34,7 +34,7 @@ mkDerivation rec { meta = with lib; { description = "A style to bend Qt applications to look like they belong into GNOME Shell"; - homepage = https://github.com/FedoraQt/adwaita-qt; + homepage = "https://github.com/FedoraQt/adwaita-qt"; license = licenses.gpl2Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/data/themes/albatross/default.nix b/pkgs/data/themes/albatross/default.nix index 870b348cc3206..1baa977d101c8 100644 --- a/pkgs/data/themes/albatross/default.nix +++ b/pkgs/data/themes/albatross/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A desktop Suite for Xfce"; - homepage = https://github.com/shimmerproject/Albatross; + homepage = "https://github.com/shimmerproject/Albatross"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/data/themes/arc-kde/default.nix b/pkgs/data/themes/arc-kde/default.nix index 4937a99daecd3..c0db85105d56b 100644 --- a/pkgs/data/themes/arc-kde/default.nix +++ b/pkgs/data/themes/arc-kde/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A port of the arc theme for Plasma"; - homepage = https://git.io/arc-kde; + homepage = "https://git.io/arc-kde"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.nixy ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index 200ce5f6061e2..9fba432656a7a 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -1,15 +1,24 @@ -{ stdenv, fetchFromGitHub, sassc, autoreconfHook, pkgconfig, gtk3, gnome3 -, gtk-engine-murrine, optipng, inkscape }: +{ stdenv +, fetchFromGitHub +, sassc +, autoreconfHook +, pkgconfig +, gtk3 +, gnome3 +, gtk-engine-murrine +, optipng +, inkscape +}: stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20190917"; + version = "20200513"; src = fetchFromGitHub { - owner = "arc-design"; - repo = pname; - rev = version; - sha256 = "1qgpk4p2hi5hd4yy0hj93kq1vs0b32wb8qkaj1wi90c8gwddq5wa"; + owner = "jnsh"; + repo = pname; + rev = version; + sha256 = "1xiaf31v3j040hflhf09kpznc93a5fqs92m5jf79y46w3dgpia0p"; }; nativeBuildInputs = [ @@ -34,7 +43,8 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--disable-gnome-shell" # 3.36 not supported + "--with-gnome-shell=${gnome3.gnome-shell.version}" + "--disable-cinnamon" # not equipped to test "--disable-unity" ]; @@ -44,9 +54,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flat theme with transparent elements for GTK 3, GTK 2 and Gnome Shell"; - homepage = https://github.com/arc-design/arc-theme; - license = licenses.gpl3; + homepage = "https://github.com/jnsh/arc-theme"; + license = licenses.gpl3; + platforms = platforms.linux; maintainers = with maintainers; [ simonvandel romildo ]; - platforms = platforms.linux; }; } diff --git a/pkgs/data/themes/blackbird/default.nix b/pkgs/data/themes/blackbird/default.nix index 7ffefb1d67f6c..f4a2fbb7bbe64 100644 --- a/pkgs/data/themes/blackbird/default.nix +++ b/pkgs/data/themes/blackbird/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Dark Desktop Suite for Gtk, Xfce and Metacity"; - homepage = https://github.com/shimmerproject/Blackbird; + homepage = "https://github.com/shimmerproject/Blackbird"; license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ]; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/data/themes/canta/default.nix b/pkgs/data/themes/canta/default.nix index f1c8ad15559ae..8534fe7a5064c 100644 --- a/pkgs/data/themes/canta/default.nix +++ b/pkgs/data/themes/canta/default.nix @@ -1,26 +1,57 @@ -{ stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ stdenv +, fetchFromGitHub +, gdk-pixbuf +, librsvg +, gtk-engine-murrine +, gtk3 +, gnome3 +, gnome-icon-theme +, numix-icon-theme-circle +, hicolor-icon-theme +}: stdenv.mkDerivation rec { pname = "canta-theme"; - version = "2020-01-31"; + version = "2020-05-17"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "070lhbhh3n7nd6rkwm52v1x4v8spyb932w6qmgs2r19g0whyn55w"; + sha256 = "0b9ffkw611xxb2wh43sjqla195jp0ygxph5a8dvifkxdw6nxc2y0"; }; - buildInputs = [ gdk-pixbuf librsvg ]; + nativeBuildInputs = [ + gtk3 + ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + buildInputs = [ + gdk-pixbuf + librsvg + ]; + + propagatedBuildInputs = [ + gnome3.adwaita-icon-theme + gnome-icon-theme + numix-icon-theme-circle + hicolor-icon-theme + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + dontDropIconThemeCache = true; installPhase = '' patchShebangs . mkdir -p $out/share/themes - name= ./install.sh -d $out/share/themes - install -D -t $out/share/backgrounds wallpaper/canta-wallpaper.svg + name= ./install.sh --dest $out/share/themes rm $out/share/themes/*/{AUTHORS,COPYING} + install -D -t $out/share/backgrounds wallpaper/canta-wallpaper.svg + mkdir -p $out/share/icons + cp -a icons/Canta $out/share/icons + gtk-update-icon-cache $out/share/icons/Canta ''; meta = with stdenv.lib; { diff --git a/pkgs/data/themes/clearlooks-phenix/default.nix b/pkgs/data/themes/clearlooks-phenix/default.nix index 2f701b9b765b6..4de923da9cf46 100644 --- a/pkgs/data/themes/clearlooks-phenix/default.nix +++ b/pkgs/data/themes/clearlooks-phenix/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { the default theme for Gnome 2. Style is also included for GTK2, Unity and for Metacity, Openbox and Xfwm4 window managers. ''; - homepage = https://github.com/jpfleury/clearlooks-phenix; - downloadPage = https://github.com/jpfleury/clearlooks-phenix/releases; + homepage = "https://github.com/jpfleury/clearlooks-phenix"; + downloadPage = "https://github.com/jpfleury/clearlooks-phenix/releases"; license = licenses.gpl3; maintainers = [ maintainers.prikhi ]; platforms = platforms.linux; diff --git a/pkgs/data/themes/e17gtk/default.nix b/pkgs/data/themes/e17gtk/default.nix index 74f0a54ccef3e..c666cc5d0aa18 100644 --- a/pkgs/data/themes/e17gtk/default.nix +++ b/pkgs/data/themes/e17gtk/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "An Enlightenment-like GTK theme with sharp corners"; - homepage = https://github.com/tsujan/E17gtk; + homepage = "https://github.com/tsujan/E17gtk"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/data/themes/gnome-breeze/default.nix b/pkgs/data/themes/gnome-breeze/default.nix index 200cc4bae051f..25d6d60d6526f 100644 --- a/pkgs/data/themes/gnome-breeze/default.nix +++ b/pkgs/data/themes/gnome-breeze/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "A GTK theme built to match KDE's breeze theme"; - homepage = https://github.com/dirruk1/gnome-breeze; + homepage = "https://github.com/dirruk1/gnome-breeze"; license = stdenv.lib.licenses.lgpl2; maintainers = with stdenv.lib.maintainers; [ bennofs ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/data/themes/lounge/default.nix b/pkgs/data/themes/lounge/default.nix index 15ec68b07570c..cda1a4e7d0b1f 100644 --- a/pkgs/data/themes/lounge/default.nix +++ b/pkgs/data/themes/lounge/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple and clean GTK theme with vintage scrollbars, inspired by Absolute, based on Adwaita"; - homepage = https://github.com/monday15/lounge-gtk-theme; + homepage = "https://github.com/monday15/lounge-gtk-theme"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index 75d31acb83fb5..f0617e56d789c 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { - pname = "matcha"; - version = "2020-04-03"; + pname = "matcha-gtk-theme"; + version = "2020-05-24"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0arnc12zsbypv550dv5j22z4hkc58yncxqhc03xcmxjw1h8lzrwv"; + sha256 = "186ypnkyaqjw671ny363xmixw6zdvrgj9xvmsrdgr8i0h3z8qwr8"; }; buildInputs = [ gdk-pixbuf librsvg ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A stylish Design theme for GTK based desktop environments"; + description = "A stylish flat Design theme for GTK based desktop environments"; homepage = "https://vinceliuice.github.io/theme-matcha"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index 4a1458ee7a5cc..a93c242d2daf2 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Material Design theme for GNOME/GTK based desktop environments"; - homepage = https://github.com/nana-4/materia-theme; + homepage = "https://github.com/nana-4/materia-theme"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.mounium ]; diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix index 0bd71b46c0d9b..751dd690d1142 100644 --- a/pkgs/data/themes/mojave/default.nix +++ b/pkgs/data/themes/mojave/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mac OSX Mojave like theme for GTK based desktop environments"; - homepage = https://github.com/vinceliuice/Mojave-gtk-theme; + homepage = "https://github.com/vinceliuice/Mojave-gtk-theme"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/themes/nordic-polar/default.nix b/pkgs/data/themes/nordic-polar/default.nix index 1ec260f5033e2..9d74ae2225001 100644 --- a/pkgs/data/themes/nordic-polar/default.nix +++ b/pkgs/data/themes/nordic-polar/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "nordic-polar"; - version = "1.6.0"; + version = "1.9.0"; srcs = [ (fetchurl { url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar.tar.xz"; - sha256 = "0cym8rcg8jpfraqlfrmymkm0jrsk1s9p7z6vcil4vxbyim9q9w16"; + sha256 = "1583mx8frkl5w26myczbyrggrp07lmpsfj00h1bzicw6lz8jbxf1"; }) (fetchurl { url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar-standard-buttons.tar.xz"; - sha256 = "0s4wf9nqpa75km905jh03gl2d2hjcdvfacmkdz3njviqm6pwqxsv"; + sha256 = "1n2qys0xcg1k28bwfrrr44cqz7q2rnfj6ry6qgd67ivgh63kmcq6"; }) ]; diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index 4979738231d77..aca72c2fb4895 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -2,32 +2,32 @@ stdenv.mkDerivation rec { pname = "nordic"; - version = "1.8.1"; + version = "1.9.0"; srcs = [ (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic.tar.xz"; - sha256 = "0jvc6l093gj9azkrjswdc1kqlyc6drnhsxgpzylzcgjxvxyi9vmd"; + url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic.tar.xz"; + sha256 = "12x13h9w4yqk56a009zpj1kq3vn2hn290xryfv1b0vyf2r45rsn7"; }) (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-standard-buttons.tar.xz"; - sha256 = "049hcvccjds465v78sk3cjg7zck36l1zpyrf4p8xinj2h3b74zr8"; + url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-standard-buttons.tar.xz"; + sha256 = "0f38nx1rvp9l6xz62yx6cbab4im8d425gxr52jkc8gfqpl5lrf0q"; }) (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-darker.tar.xz"; - sha256 = "1qaj4x451ic8mx4aak1axw29jm6ymwgh5w3n3mw5kjm1fwg4b5dz"; + url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-darker.tar.xz"; + sha256 = "0frp0jf7hbiapl3m67av7rbm3sx8db52zi3j01k2hysh6kba7x33"; }) (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-darker-standard-buttons.tar.xz"; - sha256 = "19wczzppimp7sql9v0sq1sc5j0ix51270c58j22mg01kd2h2iivy"; + url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-darker-standard-buttons.tar.xz"; + sha256 = "0grfsjr9kq0lszmqxvjvpgvf4avm34446nqykz1zfpdg50j7r54b"; }) (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-bluish-accent.tar.xz"; - sha256 = "1jvjjxiz8q9583f3gidky65s2g5pd5bkvbx0jvwn0p0kz8vlzmzk"; + url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-bluish-accent.tar.xz"; + sha256 = "0zndldwavir22ay2r0jazpikzzww3hc09gsmbiyjmw54v29qhl9r"; }) (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-bluish-accent-standard-buttons.tar.xz"; - sha256 = "0wqn0aszddq8nbh6c667rwhy7c1zky23a9q3d8gci421n20l6lyd"; + url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-bluish-accent-standard-buttons.tar.xz"; + sha256 = "1b9d2fvdndyh7lh3xhmc75csfbapl4gv59y7wy15k2awisvlvz07"; }) ]; diff --git a/pkgs/data/themes/numix-solarized/default.nix b/pkgs/data/themes/numix-solarized/default.nix index 0596141da80b3..ae8a1d7145e7e 100644 --- a/pkgs/data/themes/numix-solarized/default.nix +++ b/pkgs/data/themes/numix-solarized/default.nix @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { and icons to use the solarized theme with a solarized green accent color. This theme supports both the dark and light theme, just as Numix proper. ''; - homepage = https://github.com/Ferdi265/numix-solarized-gtk-theme; - downloadPage = https://github.com/Ferdi265/numix-solarized-gtk-theme/releases; + homepage = "https://github.com/Ferdi265/numix-solarized-gtk-theme"; + downloadPage = "https://github.com/Ferdi265/numix-solarized-gtk-theme/releases"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.offline ]; diff --git a/pkgs/data/themes/numix-sx/default.nix b/pkgs/data/themes/numix-sx/default.nix index 72e87e2e27401..7c8cf77dfc402 100644 --- a/pkgs/data/themes/numix-sx/default.nix +++ b/pkgs/data/themes/numix-sx/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Gray variation of Numix theme"; - homepage = https://www.gnome-look.org/p/1117412/; + homepage = "https://www.gnome-look.org/p/1117412/"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.sauyon ]; diff --git a/pkgs/data/themes/numix/default.nix b/pkgs/data/themes/numix/default.nix index e01f8174e9ea3..879a135615332 100644 --- a/pkgs/data/themes/numix/default.nix +++ b/pkgs/data/themes/numix/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Modern flat theme with a combination of light and dark elements (GNOME, Unity, Xfce and Openbox)"; - homepage = https://numixproject.github.io; + homepage = "https://numixproject.github.io"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index 25d6218e4bfe8..3fb3af9436e2a 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.11"; + version = "2.12"; src = fetchFromGitHub { owner = "madmaxms"; repo = "theme-obsidian-2"; rev = "v${version}"; - sha256 = "0n64cml2h8dw2m2m6j90d515saqapqzjz6xcv4kr544ibv62hn61"; + sha256 = "1srl6wm6fjdc5pi9fjl5nghn4q40hn5jcxxl8qjvz8lkczylynnb"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/data/themes/onestepback/default.nix b/pkgs/data/themes/onestepback/default.nix index 64ead2f75f4b6..0385ca90f61e6 100644 --- a/pkgs/data/themes/onestepback/default.nix +++ b/pkgs/data/themes/onestepback/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gtk theme inspired by the NextStep look"; - homepage = http://www.vide.memoire.free.fr/perso/OneStepBack; + homepage = "http://www.vide.memoire.free.fr/perso/OneStepBack"; license = licenses.gpl3; platforms = platforms.all; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/themes/orion/default.nix b/pkgs/data/themes/orion/default.nix index 9ba8cd368cf79..b44cc857c6299 100644 --- a/pkgs/data/themes/orion/default.nix +++ b/pkgs/data/themes/orion/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/shimmerproject/Orion; + homepage = "https://github.com/shimmerproject/Orion"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/data/themes/paper-gtk/default.nix b/pkgs/data/themes/paper-gtk/default.nix index e7235a900cf9d..6f6c8b7851fba 100644 --- a/pkgs/data/themes/paper-gtk/default.nix +++ b/pkgs/data/themes/paper-gtk/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A modern desktop theme suite featuring a mostly flat with a minimal use of shadows for depth"; - homepage = https://snwh.org/paper; + homepage = "https://snwh.org/paper"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.simonvandel maintainers.romildo ]; diff --git a/pkgs/data/themes/plano/default.nix b/pkgs/data/themes/plano/default.nix index ff1825f63410d..7ac245b920f2a 100644 --- a/pkgs/data/themes/plano/default.nix +++ b/pkgs/data/themes/plano/default.nix @@ -1,27 +1,40 @@ -{ stdenv, fetchFromGitHub, gdk-pixbuf, gtk_engines, gtk-engine-murrine, librsvg }: +{ stdenv +, fetchFromGitHub +, meson +, ninja +, gdk-pixbuf +, gtk_engines +, gtk-engine-murrine +, librsvg +, sassc +}: stdenv.mkDerivation rec { pname = "plano-theme"; - version = "3.34-2"; + version = "3.36-1"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "0spbyvzb47vyfhcn3gr0z1gdb5xrprynm6442y1z32znai2bgpnd"; + sha256 = "1rngn5a7hwjqpznbg5kvgs237d2q1anywg37k1cz153ipa96snrv"; }; - buildInputs = [ gdk-pixbuf gtk_engines librsvg ]; + nativeBuildInputs = [ + meson + ninja + sassc + ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + buildInputs = [ + gdk-pixbuf + gtk_engines + librsvg + ]; - dontBuild = true; - - installPhase = '' - install -dm 755 $out/share/themes/Plano - cp -a * $out/share/themes/Plano/ - rm $out/share/themes/Plano/{LICENSE,README.md} - ''; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; meta = with stdenv.lib; { description = "Flat theme for GNOME and Xfce"; diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index 08f178b30e83e..3ccd58ccdc004 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "plata-theme"; - version = "0.9.3"; + version = "0.9.7"; src = fetchFromGitLab { owner = "tista500"; repo = "plata-theme"; rev = version; - sha256 = "183kas7b5vxm6l2m5c4yh8cnq05sfa82afcp9h6cfj2rh2iv6kqy"; + sha256 = "0rm3xl7d3082kdkbds7ib8b85wpynvpaqravpyb4r5pys0y16fws"; }; preferLocalBuild = true; diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/data/themes/pop-gtk/default.nix index 9bb2beae4d31f..730f7754d8f56 100644 --- a/pkgs/data/themes/pop-gtk/default.nix +++ b/pkgs/data/themes/pop-gtk/default.nix @@ -9,17 +9,18 @@ , gtk-engine-murrine , gdk-pixbuf , librsvg +, python3 }: stdenv.mkDerivation rec { pname = "pop-gtk-theme"; - version = "2020-02-10"; + version = "2020-04-22"; src = fetchFromGitHub { owner = "pop-os"; repo = "gtk-theme"; - rev = "ed888e9dd5de142cb899e362beedaf694594cc7e"; - sha256 = "0ryr1jx9pzij6pkv7sam07f90w5lbrzx0fj5vdxl94612mh76aad"; + rev = "b3f98dfd61cfff81f69cdc7f57bce7a9efaa36f4"; + sha256 = "0vhcc694x33sgcpbqkrc5bycbd7017k4iii0mjjxgd22jd5lzgkb"; }; nativeBuildInputs = [ @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { gtk3 inkscape optipng + python3 ]; buildInputs = [ @@ -41,9 +43,9 @@ stdenv.mkDerivation rec { ]; postPatch = '' - for file in $(find -name render-\*.sh); do - patchShebangs "$file" + patchShebangs . + for file in $(find -name render-\*.sh); do substituteInPlace "$file" \ --replace 'INKSCAPE="/usr/bin/inkscape"' \ 'INKSCAPE="inkscape"' \ diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix index c949965cb8796..719b1ce1a487b 100644 --- a/pkgs/data/themes/qtcurve/default.nix +++ b/pkgs/data/themes/qtcurve/default.nix @@ -53,7 +53,7 @@ in mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/QtCurve/qtcurve; + homepage = "https://github.com/QtCurve/qtcurve"; description = "Widget styles for Qt5/Plasma 5 and gtk2"; platforms = platforms.linux; license = licenses.lgpl21Plus; diff --git a/pkgs/data/themes/shades-of-gray/default.nix b/pkgs/data/themes/shades-of-gray/default.nix index 171f7010897e5..718fb2b5d4ca6 100644 --- a/pkgs/data/themes/shades-of-gray/default.nix +++ b/pkgs/data/themes/shades-of-gray/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "shades-of-gray-theme"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "WernerFP"; repo = pname; rev = version; - sha256 = "153isyxly7nvivaz87zk2v1bqzcb3wk0j9vhgxzcz6qkf754q61s"; + sha256 = "13ydym0i3032g5dyrnl5wxpvxv57b43q7iaq5achpmaixgn58gs8"; }; buildInputs = [ gtk_engines ]; diff --git a/pkgs/data/themes/sierra/default.nix b/pkgs/data/themes/sierra/default.nix index 0c9cef9e09772..470010eb54a20 100644 --- a/pkgs/data/themes/sierra/default.nix +++ b/pkgs/data/themes/sierra/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Mac OSX like theme for GTK based desktop environments"; - homepage = https://github.com/vinceliuice/Sierra-gtk-theme; + homepage = "https://github.com/vinceliuice/Sierra-gtk-theme"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/themes/solarc/default.nix b/pkgs/data/themes/solarc/default.nix index 96843e8d78b46..b8e937564a55d 100644 --- a/pkgs/data/themes/solarc/default.nix +++ b/pkgs/data/themes/solarc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Solarized version of the Arc theme"; - homepage = https://github.com/schemar/solarc-theme; + homepage = "https://github.com/schemar/solarc-theme"; license = licenses.gpl3; maintainers = [ maintainers.bricewge ]; platforms = platforms.linux; diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 27a879af18426..b63d70b3c69a7 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -1,27 +1,30 @@ { stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, - python3, gtk3, gnome3, gtk-engine-murrine }: + python3, gtk3, gnome3, gtk-engine-murrine, humanity-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "yaru"; - version = "20.04.1"; + version = "20.04.7"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - sha256 = "0c9az0bmnrnkgxfifp6nkan5bvjrkqrpg38zsp2vg493bm3bpbg1"; + sha256 = "05fpr928kgyly7ac3zf6hfw9wqgc7fjn6980ih54iqc2qffcglsk"; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; buildInputs = [ gtk3 gnome3.gnome-themes-extra ]; + propagatedBuildInputs = [ humanity-icon-theme hicolor-icon-theme ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + dontDropIconThemeCache = true; + postPatch = "patchShebangs ."; meta = with stdenv.lib; { description = "Ubuntu community theme 'yaru' - default Ubuntu theme since 18.10"; - homepage = https://github.com/ubuntu/yaru; + homepage = "https://github.com/ubuntu/yaru"; license = with licenses; [ cc-by-sa-40 gpl3 ]; platforms = platforms.linux; maintainers = [ maintainers.jD91mZM2 ]; diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix index aa3e3f78b9130..60ea33ca6ba57 100644 --- a/pkgs/desktops/cdesktopenv/default.nix +++ b/pkgs/desktops/cdesktopenv/default.nix @@ -70,7 +70,7 @@ EOF meta = with stdenv.lib; { description = "Common Desktop Environment"; - homepage = https://sourceforge.net/projects/cdesktopenv/; + homepage = "https://sourceforge.net/projects/cdesktopenv/"; license = licenses.lgpl2; maintainers = [ maintainers.gnidorah ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 56ff4b106e33a..96910052ac9ff 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "0hplck17rksfgqm2z58ajvz4p2m4zg6ksdpbc27ki20iv4fv620s"; + sha256 = "1bkhzgdinsk4ahp1b4jf50phxwv2da23rh35cmg9fbm5c88701ga"; }; patches = [ diff --git a/pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix b/pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix index 87f670c8c099d..7fb983d6136e9 100644 --- a/pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix +++ b/pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix @@ -27,11 +27,11 @@ in stdenv.mkDerivation { # needed to build gnome3.gjs (fetchpatch { name = "mozjs52-disable-mozglue.patch"; - url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/mozjs52-disable-mozglue.patch?h=packages/js52&id=4279d2e18d9a44f6375f584911f63d13de7704be; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/mozjs52-disable-mozglue.patch?h=packages/js52&id=4279d2e18d9a44f6375f584911f63d13de7704be"; sha256 = "18wkss0agdyff107p5lfflk72qiz350xqw2yqc353alkx4fsfpz0"; }) (fetchpatch { - url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/no-error.diff?h=packages/js52; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/no-error.diff?h=packages/js52"; sha256 = "1vsw6558lxiy0r1mg6y49cgddan1mfqvqlkyv734bgxyg6n3pb9i"; }) ./fix-werror.patch @@ -79,7 +79,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; - homepage = https://developer.mozilla.org/en/SpiderMonkey; + homepage = "https://developer.mozilla.org/en/SpiderMonkey"; license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.abbradar ]; platforms = platforms.linux; diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index d4415c4bf040b..a7e22dc3d033c 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -1,6 +1,7 @@ { fetchFromGitHub , stdenv , gnome3 +, gnome-icon-theme , hicolor-icon-theme , gtk3 }: @@ -16,8 +17,9 @@ stdenv.mkDerivation rec { sha256 = "1c2a79ylk363i982czwwqcwc7cw6dyzlqphcypqm6nll7xlafq8s"; }; - propagatedUserEnvPkgs = [ + propagatedBuildInputs = [ gnome3.adwaita-icon-theme + gnome-icon-theme hicolor-icon-theme ]; @@ -25,15 +27,19 @@ stdenv.mkDerivation rec { gtk3 ]; - postFixup = '' - gtk-update-icon-cache $out/share/icons/* - ''; - dontDropIconThemeCache = true; installPhase = '' + runHook preInstall + mkdir -p $out mv usr/share $out + + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix index 9f7b0e478e1b2..06d921cce6d82 100644 --- a/pkgs/desktops/deepin/dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dbus-factory/default.nix @@ -1,4 +1,10 @@ -{ stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator, deepin }: +{ stdenv +, fetchFromGitHub +, jq +, libxml2 +, go-dbus-generator +, deepin +}: stdenv.mkDerivation rec { pname = "dbus-factory"; @@ -17,17 +23,19 @@ stdenv.mkDerivation rec { go-dbus-generator ]; - makeFlags = [ "GOPATH=${placeholder "out"}/share/go" ]; + makeFlags = [ + "GOPATH=${placeholder "out"}/share/go" + ]; postPatch = '' sed -i -e 's:/share/gocode:/share/go:' Makefile ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Generates static DBus bindings for Golang and QML at build-time"; - homepage = https://github.com/linuxdeepin/dbus-factory; + homepage = "https://github.com/linuxdeepin/dbus-factory"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix index 3c0718570d045..325f62f37818b 100644 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -1,25 +1,28 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, - alsaLib, - bc, - blur-effect, - coreutils, - dbus-factory, - deepin, - deepin-gettext-tools, - fontconfig, - go, - go-dbus-factory, - go-gir-generator, - go-lib, - grub2, - gtk3, - libcanberra, - libgudev, - librsvg, - poppler, - pulseaudio, - rfkill, - xcur2png +{ stdenv +, buildGoPackage +, fetchFromGitHub +, pkgconfig +, alsaLib +, bc +, blur-effect +, coreutils +, dbus-factory +, deepin +, deepin-gettext-tools +, fontconfig +, go +, go-dbus-factory +, go-gir-generator +, go-lib +, grub2 +, gtk3 +, libcanberra +, libgudev +, librsvg +, poppler +, pulseaudio +, rfkill +, xcur2png }: buildGoPackage rec { @@ -37,8 +40,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - outputs = [ "out" ]; - nativeBuildInputs = [ pkgconfig deepin-gettext-tools # build @@ -109,18 +110,18 @@ buildGoPackage rec { installPhase = '' make install PREFIX="$out" SYSTEMD_LIB_DIR="$out/lib" -C go/src/${goPackagePath} mv $out/share/gocode $out/share/go - remove-references-to -t ${go} $out/bin/* $out/lib/deepin-api/* + remove-references-to -t ${go} $out/lib/deepin-api/* ''; postFixup = '' searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Go-lang bindings for dde-daemon"; - homepage = https://github.com/linuxdeepin/dde-api; + homepage = "https://github.com/linuxdeepin/dde-api"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix index 5460a93296299..094f3447c6b77 100644 --- a/pkgs/desktops/deepin/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/dde-calendar/default.nix @@ -1,5 +1,13 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, qttools, - deepin-gettext-tools, dtkcore, dtkwidget, deepin +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, cmake +, qttools +, deepin-gettext-tools +, dtkcore +, dtkwidget +, deepin }: mkDerivation rec { @@ -37,11 +45,11 @@ mkDerivation rec { -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert," ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Calendar for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/dde-calendar; + homepage = "https://github.com/linuxdeepin/dde-calendar"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix index a644da2e9a9c6..850e39b93676c 100644 --- a/pkgs/desktops/deepin/dde-control-center/default.nix +++ b/pkgs/desktops/deepin/dde-control-center/default.nix @@ -1,9 +1,40 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, deepin, qttools, qtdeclarative, - networkmanager, qtsvg, qtx11extras, dtkcore, dtkwidget, geoip, gsettings-qt, - dde-network-utils, networkmanager-qt, xorg, mtdev, fontconfig, freetype, dde-api, - dde-daemon, qt5integration, deepin-desktop-base, deepin-desktop-schemas, dbus, - systemd, dde-qt-dbus-factory, qtmultimedia, qtbase, glib, gnome3, which, - substituteAll, tzdata, wrapGAppsHook +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, cmake +, deepin +, qttools +, qtdeclarative +, networkmanager +, qtsvg +, qtx11extras +, dtkcore +, dtkwidget +, geoip +, gsettings-qt +, dde-network-utils +, networkmanager-qt +, xorg +, mtdev +, fontconfig +, freetype +, dde-api +, dde-daemon +, qt5integration +, deepin-desktop-base +, deepin-desktop-schemas +, dbus +, systemd +, dde-qt-dbus-factory +, qtmultimedia +, qtbase +, glib +, gnome3 +, which +, substituteAll +, tzdata +, wrapGAppsHook }: mkDerivation rec { @@ -90,7 +121,7 @@ mkDerivation rec { substituteInPlace dde-control-center.desktop \ --replace "dbus-send" "${dbus}/bin/dbus-send" substituteInPlace com.deepin.controlcenter.addomain.policy \ - --replace "/bin/systemctl" "${systemd}/bin/systemctl" + --replace "/bin/systemctl" "/run/current-system/sw/bin/systemctl" ''; dontWrapQtApps = true; @@ -107,11 +138,11 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Control panel of Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/dde-control-center; + homepage = "https://github.com/linuxdeepin/dde-control-center"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo worldofpeace ]; diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index 6e5435315e319..b89b2c2544644 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -1,10 +1,38 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig, - dbus-factory, go-dbus-factory, go-gir-generator, go-lib, - deepin-gettext-tools, gettext, dde-api, deepin-desktop-schemas, - deepin-wallpapers, deepin-desktop-base, alsaLib, glib, gtk3, - libgudev, libinput, libnl, librsvg, linux-pam, networkmanager, - pulseaudio, python3, hicolor-icon-theme, glibc, tzdata, go, - deepin, makeWrapper, xkeyboard_config, wrapGAppsHook }: +{ stdenv +, buildGoPackage +, fetchFromGitHub +, fetchpatch +, pkgconfig +, dbus-factory +, go-dbus-factory +, go-gir-generator +, go-lib +, deepin-gettext-tools +, gettext +, dde-api +, deepin-desktop-schemas +, deepin-wallpapers +, deepin-desktop-base +, alsaLib +, glib +, gtk3 +, libgudev +, libinput +, libnl +, librsvg +, linux-pam +, networkmanager +, pulseaudio +, python3 +, hicolor-icon-theme +, glibc +, tzdata +, go +, deepin +, makeWrapper +, xkeyboard_config +, wrapGAppsHook +}: buildGoPackage rec { pname = "dde-daemon"; @@ -22,15 +50,13 @@ buildGoPackage rec { patches = [ # https://github.com/linuxdeepin/dde-daemon/issues/51 (fetchpatch { - url = https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.8.0.patch; + url = "https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.8.0.patch"; sha256 = "1ampdsp9zlg263flswdw9gj10n7gxh7zi6w6z9jgh29xlai05pvh"; }) ]; goDeps = ./deps.nix; - outputs = [ "out" ]; - nativeBuildInputs = [ pkgconfig dbus-factory @@ -123,11 +149,11 @@ buildGoPackage rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Daemon for handling Deepin Desktop Environment session settings"; - homepage = https://github.com/linuxdeepin/dde-daemon; + homepage = "https://github.com/linuxdeepin/dde-daemon"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix index 62d5622340c2b..68f2caa63191f 100644 --- a/pkgs/desktops/deepin/dde-dock/default.nix +++ b/pkgs/desktops/deepin/dde-dock/default.nix @@ -1,94 +1,116 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras, - qtsvg, polkit, gsettings-qt, dtkcore, dtkwidget, - dde-qt-dbus-factory, dde-network-utils, dde-daemon, - deepin-desktop-schemas, xorg, glib, wrapGAppsHook, deepin, - plugins ? [], symlinkJoin, makeWrapper, libdbusmenu }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, qttools +, qtx11extras +, qtsvg +, polkit +, gsettings-qt +, dtkcore +, dtkwidget +, dde-qt-dbus-factory +, dde-network-utils +, dde-daemon +, deepin-desktop-schemas +, xorg +, glib +, wrapGAppsHook +, deepin +, plugins ? [ ] +, symlinkJoin +, makeWrapper +, libdbusmenu +}: let -unwrapped = mkDerivation rec { - pname = "dde-dock"; - version = "5.0.0"; + unwrapped = mkDerivation rec { + pname = "dde-dock"; + version = "5.0.0"; - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "12dshsqhzajnxm7r53qg0c84b6xlj313qnssnx2m25z4jdp5i7pr"; - }; + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "12dshsqhzajnxm7r53qg0c84b6xlj313qnssnx2m25z4jdp5i7pr"; + }; - nativeBuildInputs = [ - cmake - pkgconfig - qttools - wrapGAppsHook - deepin.setupHook - ]; + nativeBuildInputs = [ + cmake + pkgconfig + qttools + wrapGAppsHook + deepin.setupHook + ]; - buildInputs = [ - dde-daemon - dde-network-utils - dde-qt-dbus-factory - deepin-desktop-schemas - dtkcore - dtkwidget - glib - gsettings-qt - libdbusmenu - polkit - qtsvg - qtx11extras - xorg.libXdmcp - xorg.libXtst - xorg.libpthreadstubs - ]; + buildInputs = [ + dde-daemon + dde-network-utils + dde-qt-dbus-factory + deepin-desktop-schemas + dtkcore + dtkwidget + glib + gsettings-qt + libdbusmenu + polkit + qtsvg + qtx11extras + xorg.libXdmcp + xorg.libXtst + xorg.libpthreadstubs + ]; - patches = [ - ./dde-dock.plugins-dir.patch - ]; + patches = [ + ./dde-dock.plugins-dir.patch + ]; - postPatch = '' - searchHardCodedPaths - patchShebangs translate_generation.sh - fixPath $out /etc/dde-dock plugins/keyboard-layout/CMakeLists.txt - fixPath $out /usr cmake/DdeDock/DdeDockConfig.cmake - fixPath $out /usr dde-dock.pc - fixPath $out /usr/bin/dde-dock frame/com.deepin.dde.Dock.service - fixPath $out /usr/share/dbus-1 CMakeLists.txt - fixPath ${dde-daemon} /usr/lib/deepin-daemon frame/item/showdesktopitem.cpp - fixPath ${dde-network-utils} /usr/share/dde-network-utils frame/main.cpp - fixPath ${polkit} /usr/bin/pkexec plugins/overlay-warning/overlay-warning-plugin.cpp + postPatch = '' + searchHardCodedPaths + patchShebangs translate_generation.sh + fixPath $out /etc/dde-dock plugins/keyboard-layout/CMakeLists.txt + fixPath $out /usr cmake/DdeDock/DdeDockConfig.cmake + fixPath $out /usr dde-dock.pc + fixPath $out /usr/bin/dde-dock frame/com.deepin.dde.Dock.service + fixPath $out /usr/share/dbus-1 CMakeLists.txt + fixPath ${dde-daemon} /usr/lib/deepin-daemon frame/item/showdesktopitem.cpp + fixPath ${dde-network-utils} /usr/share/dde-network-utils frame/main.cpp + fixPath ${polkit} /usr/bin/pkexec plugins/overlay-warning/overlay-warning-plugin.cpp - substituteInPlace frame/controller/dockpluginscontroller.cpp --subst-var-by out $out - substituteInPlace plugins/tray/system-trays/systemtrayscontroller.cpp --subst-var-by out $out - ''; + substituteInPlace frame/controller/dockpluginscontroller.cpp --subst-var-by out $out + substituteInPlace plugins/tray/system-trays/systemtrayscontroller.cpp --subst-var-by out $out + ''; - cmakeFlags = [ "-DDOCK_TRAY_USE_NATIVE_POPUP=YES" ]; + cmakeFlags = [ "-DDOCK_TRAY_USE_NATIVE_POPUP=YES" ]; - dontWrapQtApps = true; + dontWrapQtApps = true; - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; + preFixup = '' + gappsWrapperArgs+=( + "''${qtWrapperArgs[@]}" + ) + ''; - postFixup = '' - searchHardCodedPaths $out - ''; + postFixup = '' + searchHardCodedPaths $out + ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; - meta = with stdenv.lib; { - description = "Dock for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/dde-dock; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; + meta = with stdenv.lib; { + description = "Dock for Deepin Desktop Environment"; + homepage = "https://github.com/linuxdeepin/dde-dock"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; }; -}; -in if plugins == [] then unwrapped - else import ./wrapper.nix { - inherit makeWrapper symlinkJoin plugins; - dde-dock = unwrapped; - } +in +if plugins == [ ] +then unwrapped +else import ./wrapper.nix { + inherit makeWrapper symlinkJoin plugins; + dde-dock = unwrapped; +} diff --git a/pkgs/desktops/deepin/dde-dock/wrapper.nix b/pkgs/desktops/deepin/dde-dock/wrapper.nix index 8f6d8a67b1a91..1690230a99e59 100644 --- a/pkgs/desktops/deepin/dde-dock/wrapper.nix +++ b/pkgs/desktops/deepin/dde-dock/wrapper.nix @@ -1,4 +1,8 @@ -{ makeWrapper, symlinkJoin, dde-dock, plugins }: +{ makeWrapper +, symlinkJoin +, dde-dock +, plugins +}: symlinkJoin { name = "dde-dock-with-plugins-${dde-dock.version}"; diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix index 62931dfcd811d..4258e2aa859ea 100644 --- a/pkgs/desktops/deepin/dde-file-manager/default.nix +++ b/pkgs/desktops/deepin/dde-file-manager/default.nix @@ -1,13 +1,52 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, avfs, dde-daemon, - dde-dock, dde-polkit-agent, dde-qt-dbus-factory, deepin, - deepin-anything, deepin-desktop-schemas, deepin-gettext-tools, - deepin-movie-reborn, deepin-shortcut-viewer, deepin-terminal, - disomaster, dtkcore, dtkwidget, ffmpegthumbnailer, file, glib, - gnugrep, gsettings-qt, gvfs, jemalloc, kcodecs, libX11, libsecret, - polkit, polkit-qt, poppler, procps, qmake, qt5integration, - qtmultimedia, qtsvg, qttools, qtx11extras, runtimeShell, samba, - shadow, taglib, udisks2-qt5, xdg-user-dirs, xorg, zlib, - wrapGAppsHook }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, avfs +, dde-daemon +, dde-dock +, dde-polkit-agent +, dde-qt-dbus-factory +, deepin +, deepin-anything +, deepin-desktop-schemas +, deepin-gettext-tools +, deepin-movie-reborn +, deepin-shortcut-viewer +, deepin-terminal +, disomaster +, dtkcore +, dtkwidget +, ffmpegthumbnailer +, file +, glib +, gnugrep +, gsettings-qt +, gvfs +, jemalloc +, kcodecs +, libX11 +, libsecret +, polkit +, polkit-qt +, poppler +, procps +, qmake +, qt5integration +, qtmultimedia +, qtsvg +, qttools +, qtx11extras +, runtimeShell +, samba +, shadow +, taglib +, udisks2-qt5 +, xdg-user-dirs +, xorg +, zlib +, wrapGAppsHook +}: mkDerivation rec { pname = "dde-file-manager"; @@ -247,11 +286,11 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "File manager and desktop module for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/dde-file-manager; + homepage = "https://github.com/linuxdeepin/dde-file-manager"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dde-kwin/default.nix b/pkgs/desktops/deepin/dde-kwin/default.nix index 850186953f635..ce1a1a8dda036 100644 --- a/pkgs/desktops/deepin/dde-kwin/default.nix +++ b/pkgs/desktops/deepin/dde-kwin/default.nix @@ -74,7 +74,9 @@ mkDerivation rec { # Need to add kwayland around: # * https://github.com/linuxdeepin/dde-kwin/blob/5226bb984c844129f9fa589da56e77decb7b39a1/plugins/kwineffects/blur/CMakeLists.txt#L14 - NIX_CFLAGS_COMPILE = "-I${kwayland.dev}/include/KF5"; + NIX_CFLAGS_COMPILE = [ + "-I${kwayland.dev}/include/KF5" + ]; cmakeFlags = [ "-DKWIN_VERSION=${(builtins.parseDrvName kwin.name).version}" @@ -128,7 +130,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "KWin configuration for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix index eae074381f3b7..0a50f7177bae9 100644 --- a/pkgs/desktops/deepin/dde-launcher/default.nix +++ b/pkgs/desktops/deepin/dde-launcher/default.nix @@ -1,7 +1,24 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, dde-qt-dbus-factory, - dde-session-ui, deepin, deepin-desktop-schemas, deepin-wallpapers, - dtkcore, dtkwidget, gsettings-qt, qtsvg, qttools, qtx11extras, - which, xdg_utils, wrapGAppsHook, glib }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, cmake +, dde-qt-dbus-factory +, dde-session-ui +, deepin +, deepin-desktop-schemas +, deepin-wallpapers +, dtkcore +, dtkwidget +, gsettings-qt +, qtsvg +, qttools +, qtx11extras +, which +, xdg_utils +, wrapGAppsHook +, glib +}: mkDerivation rec { pname = "dde-launcher"; @@ -72,11 +89,11 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin Desktop Environment launcher module"; - homepage = https://github.com/linuxdeepin/dde-launcher; + homepage = "https://github.com/linuxdeepin/dde-launcher"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix index 778481fc65164..d54558acf080b 100644 --- a/pkgs/desktops/deepin/dde-network-utils/default.nix +++ b/pkgs/desktops/deepin/dde-network-utils/default.nix @@ -1,5 +1,15 @@ -{ stdenv, mkDerivation, fetchFromGitHub, substituteAll, qmake, pkgconfig, qttools, - dde-qt-dbus-factory, proxychains, which, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, substituteAll +, qmake +, pkgconfig +, qttools +, dde-qt-dbus-factory +, proxychains +, which +, deepin +}: mkDerivation rec { pname = "dde-network-utils"; @@ -41,11 +51,11 @@ mkDerivation rec { searchHardCodedPaths $out # for debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin network utils"; - homepage = https://github.com/linuxdeepin/dde-network-utils; + homepage = "https://github.com/linuxdeepin/dde-network-utils"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix index 7aaddf5387238..1ca9a80abaf1a 100644 --- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix +++ b/pkgs/desktops/deepin/dde-polkit-agent/default.nix @@ -1,5 +1,15 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, polkit-qt, - dtkcore, dtkwidget, dde-qt-dbus-factory, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, qttools +, polkit-qt +, dtkcore +, dtkwidget +, dde-qt-dbus-factory +, deepin +}: mkDerivation rec { pname = "dde-polkit-agent"; @@ -38,11 +48,11 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "PolicyKit agent for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/dde-polkit-agent; + homepage = "https://github.com/linuxdeepin/dde-polkit-agent"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix index ba237bcf7554f..c7efb0f4b044f 100644 --- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchFromGitHub, qmake, python3, deepin }: +{ stdenv +, fetchFromGitHub +, qmake +, python3 +, deepin +}: stdenv.mkDerivation rec { pname = "dde-qt-dbus-factory"; @@ -26,11 +31,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Qt DBus interface library for Deepin software"; - homepage = https://github.com/linuxdeepin/dde-qt-dbus-factory; + homepage = "https://github.com/linuxdeepin/dde-qt-dbus-factory"; license = with licenses; [ gpl3Plus lgpl2Plus ]; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix index a664defae5630..ff785f16c81df 100644 --- a/pkgs/desktops/deepin/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/dde-session-ui/default.nix @@ -1,9 +1,33 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, dbus, dde-daemon, - dde-qt-dbus-factory, deepin, deepin-desktop-schemas, - deepin-gettext-tools, deepin-icon-theme, deepin-wallpapers, dtkcore, - dtkwidget, gnugrep, gsettings-qt, lightdm_qt, - onboard, qtsvg, qttools, qtx11extras, setxkbmap, utillinux, which, - xkeyboard_config, xorg, xrandr, wrapGAppsHook }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, dbus +, dde-daemon +, dde-qt-dbus-factory +, deepin +, deepin-desktop-schemas +, deepin-gettext-tools +, deepin-icon-theme +, deepin-wallpapers +, dtkcore +, dtkwidget +, gnugrep +, gsettings-qt +, lightdm_qt +, onboard +, qtsvg +, qttools +, qtx11extras +, setxkbmap +, utillinux +, which +, xkeyboard_config +, xorg +, xrandr +, wrapGAppsHook +}: mkDerivation rec { pname = "dde-session-ui"; @@ -121,11 +145,11 @@ mkDerivation rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin desktop-environment - Session UI module"; - homepage = https://github.com/linuxdeepin/dde-session-ui; + homepage = "https://github.com/linuxdeepin/dde-session-ui"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix index 184153a3981d9..5fa6c93951d0f 100644 --- a/pkgs/desktops/deepin/deepin-anything/default.nix +++ b/pkgs/desktops/deepin/deepin-anything/default.nix @@ -1,5 +1,14 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qtbase, udisks2-qt5, utillinux, - dtkcore, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, fetchpatch +, pkgconfig +, qtbase +, udisks2-qt5 +, utillinux +, dtkcore +, deepin +}: mkDerivation rec { pname = "deepin-anything"; @@ -12,6 +21,16 @@ mkDerivation rec { sha256 = "1kvyffrii4b012f6ld1ih14qrn7gg5cxbdpbkac0wxb22hnz0azm"; }; + patches = [ + # fix compilation error and add support to kernel 5.6 + # https://github.com/linuxdeepin/deepin-anything/pull/27 + (fetchpatch { + name = "linux-5.6.patch"; + url = "https://github.com/linuxdeepin/deepin-anything/commit/764b820c2bcd7248993349b32f91043fc58ee958.patch"; + sha256 = "1ww4xllxc2s04px6fy8wp5cyw54xaz155ry30sqz21vl8awfr36h"; + }) + ]; + outputs = [ "out" "modsrc" ]; nativeBuildInputs = [ @@ -51,11 +70,11 @@ mkDerivation rec { searchHardCodedPaths $modsrc # for debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin file search tool"; - homepage = https://github.com/linuxdeepin/deepin-anything; + homepage = "https://github.com/linuxdeepin/deepin-anything"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix index 26f2b99612e62..67ead7d314aaf 100644 --- a/pkgs/desktops/deepin/deepin-calculator/default.nix +++ b/pkgs/desktops/deepin/deepin-calculator/default.nix @@ -1,5 +1,14 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, dtkcore, - dtkwidget, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, qttools +, qtsvg +, dtkcore +, dtkwidget +, deepin +}: mkDerivation rec { pname = "deepin-calculator"; @@ -36,11 +45,11 @@ mkDerivation rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Easy to use calculator for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/deepin-calculator; + homepage = "https://github.com/linuxdeepin/deepin-calculator"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix index 0ca42a8876110..74fa53b715d0f 100644 --- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchFromGitHub, deepin-wallpapers, deepin }: +{ stdenv +, fetchFromGitHub +, deepin-wallpapers +, deepin +}: stdenv.mkDerivation rec { pname = "deepin-desktop-base"; @@ -11,9 +15,13 @@ stdenv.mkDerivation rec { sha256 = "0rs7bjy35k5gc5nbba1cijhdz16zny30lgmcf2ckx1pkdszk2vra"; }; - nativeBuildInputs = [ deepin.setupHook ]; + nativeBuildInputs = [ + deepin.setupHook + ]; - buildInputs = [ deepin-wallpapers ]; + buildInputs = [ + deepin-wallpapers + ]; # TODO: Fedora recommended dependencies: # deepin-wallpapers @@ -40,7 +48,7 @@ stdenv.mkDerivation rec { ln -s ../lib/deepin/desktop-version $out/etc/deepin-version ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Base assets and definitions for Deepin Desktop Environment"; @@ -52,7 +60,7 @@ stdenv.mkDerivation rec { - login screen background image - language information ''; - homepage = https://github.com/linuxdeepin/deepin-desktop-base; + homepage = "https://github.com/linuxdeepin/deepin-desktop-base"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix index 579ceb442be6a..15f9498cf0db5 100644 --- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix @@ -1,5 +1,14 @@ -{ stdenv, fetchFromGitHub, python3, dconf, glib, deepin-gtk-theme, - deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, deepin }: +{ stdenv +, fetchFromGitHub +, python3 +, dconf +, glib +, deepin-gtk-theme +, deepin-icon-theme +, deepin-sound-theme +, deepin-wallpapers +, deepin +}: stdenv.mkDerivation rec { pname = "deepin-desktop-schemas"; @@ -46,7 +55,9 @@ stdenv.mkDerivation rec { # /usr/share/desktop-directories ''; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; doCheck = true; checkTarget = "test"; @@ -56,11 +67,11 @@ stdenv.mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "GSettings deepin desktop-wide schemas"; - homepage = https://github.com/linuxdeepin/deepin-desktop-schemas; + homepage = "https://github.com/linuxdeepin/deepin-desktop-schemas"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-editor/default.nix b/pkgs/desktops/deepin/deepin-editor/default.nix index 0aea9558ec008..0124ca8cc9e23 100644 --- a/pkgs/desktops/deepin/deepin-editor/default.nix +++ b/pkgs/desktops/deepin/deepin-editor/default.nix @@ -1,10 +1,18 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, deepin, - dtkcore, dtkwidget, kcodecs, qttools, syntax-highlighting, - wrapQtAppsHook +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, cmake +, deepin +, dtkcore +, dtkwidget +, kcodecs +, qttools +, syntax-highlighting +, wrapQtAppsHook }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-editor"; version = "1.2.9.1"; @@ -52,11 +60,11 @@ stdenv.mkDerivation rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Simple editor for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/deepin-editor; + homepage = "https://github.com/linuxdeepin/deepin-editor"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo worldofpeace ]; diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix index 915cb8c6ac766..432add458debf 100644 --- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix +++ b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix @@ -1,4 +1,10 @@ -{ stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages, deepin }: +{ stdenv +, fetchFromGitHub +, gettext +, python3Packages +, perlPackages +, deepin +}: stdenv.mkDerivation rec { pname = "deepin-gettext-tools"; @@ -23,7 +29,9 @@ stdenv.mkDerivation rec { python3Packages.python ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; postPatch = '' sed -e 's/sudo cp/cp/' -i src/generate_mo.py @@ -35,11 +43,11 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin Internationalization utilities"; - homepage = https://github.com/linuxdeepin/deepin-gettext-tools; + homepage = "https://github.com/linuxdeepin/deepin-gettext-tools"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix index 7c10e8732094c..eee074705852b 100644 --- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchFromGitHub, gtk-engine-murrine, deepin }: +{ stdenv +, fetchFromGitHub +, gtk-engine-murrine +, deepin +}: stdenv.mkDerivation rec { pname = "deepin-gtk-theme"; @@ -11,15 +15,19 @@ stdenv.mkDerivation rec { sha256 = "0zs6mq70yd1k3d9zm3q6zxnw1md56r4imad5imdxwx58yxdx47fw"; }; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin GTK Theme"; - homepage = https://github.com/linuxdeepin/deepin-gtk-theme; + homepage = "https://github.com/linuxdeepin/deepin-gtk-theme"; license = licenses.lgpl3; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix index b6b9feb410b57..464d6f19ceda7 100644 --- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -1,4 +1,11 @@ -{ stdenv, fetchFromGitHub, gtk3, xcursorgen, papirus-icon-theme, deepin, hicolor-icon-theme }: +{ stdenv +, fetchFromGitHub +, gtk3 +, xcursorgen +, papirus-icon-theme +, deepin +, hicolor-icon-theme +}: stdenv.mkDerivation rec { pname = "deepin-icon-theme"; @@ -11,11 +18,13 @@ stdenv.mkDerivation rec { sha256 = "12rzzjp906np95ckbxrd4mb345lm198wz69kxy48f8q1zg78q8iw"; }; - nativeBuildInputs = [ gtk3 xcursorgen ]; - - buildInputs = [ papirus-icon-theme ]; + nativeBuildInputs = [ + gtk3 + xcursorgen + ]; propagatedBuildInputs = [ + papirus-icon-theme hicolor-icon-theme ]; @@ -39,11 +48,11 @@ stdenv.mkDerivation rec { cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/ ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Icons for the Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/deepin-icon-theme; + homepage = "https://github.com/linuxdeepin/deepin-icon-theme"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix index aa13eb76055c2..43c18c85abcbd 100644 --- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix @@ -1,6 +1,18 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, - qtx11extras, dtkcore, dtkwidget, qt5integration, freeimage, libraw, - libexif, deepin +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, qttools +, qtsvg +, qtx11extras +, dtkcore +, dtkwidget +, qt5integration +, freeimage +, libraw +, libexif +, deepin }: mkDerivation rec { @@ -41,11 +53,11 @@ mkDerivation rec { -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Image Viewer for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/deepin-image-viewer; + homepage = "https://github.com/linuxdeepin/deepin-image-viewer"; license = licenses.gpl3Plus; platforms = platforms.linux; badPlatforms = [ "aarch64-linux" ]; # See https://github.com/NixOS/nixpkgs/pull/46463#issuecomment-420274189 diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix index b23a7491aaf6a..983fe4e1c4d5a 100644 --- a/pkgs/desktops/deepin/deepin-menu/default.nix +++ b/pkgs/desktops/deepin/deepin-menu/default.nix @@ -1,5 +1,13 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, - qt5integration, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, dtkcore +, dtkwidget +, qt5integration +, deepin +}: mkDerivation rec { pname = "deepin-menu"; @@ -34,11 +42,11 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin menu service"; - homepage = https://github.com/linuxdeepin/deepin-menu; + homepage = "https://github.com/linuxdeepin/deepin-menu"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix index b3930c8e399ee..6763292b626cb 100644 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -1,6 +1,22 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkgconfig, qttools, qtx11extras, - dtkcore, dtkwidget, ffmpeg, ffmpegthumbnailer, mpv, pulseaudio, - libdvdnav, libdvdread, xorg, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, fetchpatch +, cmake +, pkgconfig +, qttools +, qtx11extras +, dtkcore +, dtkwidget +, ffmpeg +, ffmpegthumbnailer +, mpv +, pulseaudio +, libdvdnav +, libdvdread +, xorg +, deepin +}: mkDerivation rec { pname = "deepin-movie-reborn"; @@ -48,7 +64,6 @@ mkDerivation rec { NIX_LDFLAGS = "-ldvdnav"; - postPatch = '' searchHardCodedPaths # debugging @@ -58,11 +73,11 @@ mkDerivation rec { --replace "Exec=deepin-movie" "Exec=$out/bin/deepin-movie" ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin movie player"; - homepage = https://github.com/linuxdeepin/deepin-movie-reborn; + homepage = "https://github.com/linuxdeepin/deepin-movie-reborn"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/pkgs/desktops/deepin/deepin-screenshot/default.nix index 374af8be2be86..0ccc350962a08 100644 --- a/pkgs/desktops/deepin/deepin-screenshot/default.nix +++ b/pkgs/desktops/deepin/deepin-screenshot/default.nix @@ -1,6 +1,19 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkgconfig, xdg_utils, qttools, qtx11extras, - dtkcore, dtkwidget, dtkwm, deepin-turbo, deepin-shortcut-viewer, - deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, fetchpatch +, cmake +, pkgconfig +, xdg_utils +, qttools +, qtx11extras +, dtkcore +, dtkwidget +, dtkwm +, deepin-turbo +, deepin-shortcut-viewer +, deepin +}: mkDerivation rec { pname = "deepin-screenshot"; @@ -31,7 +44,7 @@ mkDerivation rec { patches = [ (fetchpatch { - url = https://github.com/linuxdeepin/deepin-screenshot/pull/52/commits/e14508b223fd9965854ed41c944cea2ea19e6e0c.patch; + url = "https://github.com/linuxdeepin/deepin-screenshot/pull/52/commits/e14508b223fd9965854ed41c944cea2ea19e6e0c.patch"; sha256 = "18zvz98z3hr8pcdyb706za6h2nwx23zsjb1hgyp21ycinhzr9j9h"; }) ]; @@ -48,11 +61,11 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Easy-to-use screenshot tool for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/deepin-screenshot; + homepage = "https://github.com/linuxdeepin/deepin-screenshot"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo flokli ]; diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix index a8d143ff8b0c8..76d8847b73fce 100644 --- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix @@ -1,5 +1,13 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, - qt5integration, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, dtkcore +, dtkwidget +, qt5integration +, deepin +}: mkDerivation rec { pname = "deepin-shortcut-viewer"; @@ -25,11 +33,11 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Pop-up shortcut viewer for Deepin applications"; - homepage = https://github.com/linuxdeepin/deepin-shortcut-viewer; + homepage = "https://github.com/linuxdeepin/deepin-shortcut-viewer"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix index 378945ac1dde6..e71c0cb77c5bd 100644 --- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, deepin }: +{ stdenv +, fetchFromGitHub +, deepin +}: stdenv.mkDerivation rec { pname = "deepin-sound-theme"; @@ -11,13 +14,15 @@ stdenv.mkDerivation rec { sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9"; }; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin sound theme"; - homepage = https://github.com/linuxdeepin/deepin-sound-theme; + homepage = "https://github.com/linuxdeepin/deepin-sound-theme"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index 93e81bf6a6fc0..ae31213794278 100644 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -1,8 +1,39 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, vala_0_40, fetchpatch, - gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib, - libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1, - libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux, gnutls, pcre2, - libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pkgconfig +, cmake +, ninja +, vala_0_40 +, fetchpatch +, gettext +, at-spi2-core +, dbus +, epoxy +, expect +, gtk3 +, json-glib +, libXdmcp +, libgee +, libpthreadstubs +, librsvg +, libsecret +, libtasn1 +, libxcb +, libxkbcommon +, p11-kit +, pcre +, vte +, wnck +, libselinux +, gnutls +, pcre2 +, libsepol +, utillinux +, deepin-menu +, deepin-shortcut-viewer +, deepin +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "deepin-terminal"; @@ -69,7 +100,7 @@ stdenv.mkDerivation rec { "-DVERSION=${version}" ]; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Default terminal emulator for Deepin"; @@ -77,8 +108,8 @@ stdenv.mkDerivation rec { Deepin terminal, it sharpens your focus in the world of command line! It is an advanced terminal emulator with workspace, multiple windows, remote management, quake mode and other features. - ''; - homepage = https://github.com/linuxdeepin/deepin-terminal; + ''; + homepage = "https://github.com/linuxdeepin/deepin-terminal"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix index 3aa6003592b62..6bba51ac674b9 100644 --- a/pkgs/desktops/deepin/deepin-turbo/default.nix +++ b/pkgs/desktops/deepin/deepin-turbo/default.nix @@ -1,4 +1,11 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, qtbase +, deepin +}: mkDerivation rec { pname = "deepin-turbo"; @@ -31,11 +38,11 @@ mkDerivation rec { searchHardCodedPaths $out # for debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "A daemon that helps to launch applications faster"; - homepage = https://github.com/linuxdeepin/deepin-turbo; + homepage = "https://github.com/linuxdeepin/deepin-turbo"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix index 6baee0eda1108..4fa3d6043d5cb 100644 --- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix +++ b/pkgs/desktops/deepin/deepin-wallpapers/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchFromGitHub, dde-api, deepin }: +{ stdenv +, fetchFromGitHub +, dde-api +, deepin +}: stdenv.mkDerivation rec { pname = "deepin-wallpapers"; @@ -11,7 +15,10 @@ stdenv.mkDerivation rec { sha256 = "09cfnxbpms98ibqbi4xd51181q3az5n8rmndcdr9w12kyzniz7xv"; }; - nativeBuildInputs = [ dde-api deepin.setupHook ]; + nativeBuildInputs = [ + dde-api + deepin.setupHook + ]; postPatch = '' searchHardCodedPaths # debugging @@ -33,11 +40,11 @@ stdenv.mkDerivation rec { $out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Wallpapers for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/deepin-wallpapers; + homepage = "https://github.com/linuxdeepin/deepin-wallpapers"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 64dbdbfd104c6..8d33ac154afa4 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -1,10 +1,16 @@ { pkgs, makeScope, libsForQt5 }: - let packages = self: with self; { setupHook = ./setup-hook.sh; - updateScript = callPackage ./update.nix { }; + # Update script tailored to deepin packages from git repository + updateScript = { pname, version, src }: + pkgs.genericUpdater { + inherit pname version; + attrPath = "deepin.${pname}"; + versionLister = "${pkgs.common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + ignoredVersions = "^2014(\\.|rc)|^v[0-9]+"; + }; dbus-factory = callPackage ./dbus-factory { }; dde-api = callPackage ./dde-api { }; @@ -56,4 +62,4 @@ let }; in - makeScope libsForQt5.newScope packages +makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/disomaster/default.nix b/pkgs/desktops/deepin/disomaster/default.nix index 3ce2adba098d6..758c8ff76c3e8 100644 --- a/pkgs/desktops/deepin/disomaster/default.nix +++ b/pkgs/desktops/deepin/disomaster/default.nix @@ -1,4 +1,12 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qtbase, libisoburn, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, qtbase +, libisoburn +, deepin +}: mkDerivation rec { pname = "disomaster"; @@ -29,11 +37,11 @@ mkDerivation rec { libdisomaster/libdisomaster.pro ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "A libisoburn wrapper for Qt"; - homepage = https://github.com/linuxdeepin/disomaster; + homepage = "https://github.com/linuxdeepin/disomaster"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo worldofpeace ]; diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix index ed01cd92c7c74..2caef7ce91661 100644 --- a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix +++ b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix @@ -1,5 +1,12 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, gnome3, - dde-polkit-agent, deepin }: +{ stdenv +, fetchFromGitHub +, pkgconfig +, qmake +, qttools +, gnome3 +, dde-polkit-agent +, deepin +}: stdenv.mkDerivation rec { pname = "dpa-ext-gnomekeyring"; @@ -30,11 +37,11 @@ stdenv.mkDerivation rec { fixPath $out /usr dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "GNOME keyring extension for dde-polkit-agent"; - homepage = https://github.com/linuxdeepin/dpa-ext-gnomekeyring; + homepage = "https://github.com/linuxdeepin/dpa-ext-gnomekeyring"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix index 8ae1c6f0952fe..570b0cc2c11ea 100644 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ b/pkgs/desktops/deepin/dtkcore/default.nix @@ -1,4 +1,12 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, gsettings-qt +, pythonPackages +, deepin +}: mkDerivation rec { pname = "dtkcore"; @@ -43,11 +51,11 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin tool kit core library"; - homepage = https://github.com/linuxdeepin/dtkcore; + homepage = "https://github.com/linuxdeepin/dtkcore"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix index 751fe02562f0c..9be222830db45 100644 --- a/pkgs/desktops/deepin/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/dtkwidget/default.nix @@ -1,6 +1,19 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, qtmultimedia, - qtsvg, qtx11extras, librsvg, libstartup_notification, gsettings-qt, - dde-qt-dbus-factory, dtkcore, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, qttools +, qtmultimedia +, qtsvg +, qtx11extras +, librsvg +, libstartup_notification +, gsettings-qt +, dde-qt-dbus-factory +, dtkcore +, deepin +}: mkDerivation rec { pname = "dtkwidget"; @@ -40,11 +53,11 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin graphical user interface library"; - homepage = https://github.com/linuxdeepin/dtkwidget; + homepage = "https://github.com/linuxdeepin/dtkwidget"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix index ead96fe25338b..56031f11492a4 100644 --- a/pkgs/desktops/deepin/dtkwm/default.nix +++ b/pkgs/desktops/deepin/dtkwm/default.nix @@ -1,4 +1,13 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, pkgconfig, qmake, qtx11extras, dtkcore, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, fetchpatch +, pkgconfig +, qmake +, qtx11extras +, dtkcore +, deepin +}: mkDerivation rec { pname = "dtkwm"; @@ -37,11 +46,11 @@ mkDerivation rec { "LIB_INSTALL_DIR=${outRef}/lib" ]; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin graphical user interface library"; - homepage = https://github.com/linuxdeepin/dtkwm; + homepage = "https://github.com/linuxdeepin/dtkwm"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix index 0b7c6cfdc9142..1c1afd9d099c0 100644 --- a/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, deepin }: +{ stdenv +, fetchFromGitHub +, deepin +}: stdenv.mkDerivation rec { pname = "go-dbus-factory"; @@ -11,17 +14,19 @@ stdenv.mkDerivation rec { sha256 = "06fqyad9f50gcjsjkh7929yyaprahdjhnd0dr4gl2797a7wysl3f"; }; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; postPatch = '' sed -i -e 's:/share/gocode:/share/go:' Makefile ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "GoLang DBus factory for the Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/go-dbus-factory; + homepage = "https://github.com/linuxdeepin/go-dbus-factory"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix index fed8b6f2c6aed..d0b2d8c07e679 100644 --- a/pkgs/desktops/deepin/go-dbus-generator/default.nix +++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchFromGitHub, go, go-lib, deepin }: +{ stdenv +, fetchFromGitHub +, go +, go-lib +, deepin +}: stdenv.mkDerivation rec { pname = "go-dbus-generator"; @@ -21,11 +26,11 @@ stdenv.mkDerivation rec { "GOCACHE=$(TMPDIR)/go-cache" ]; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Convert dbus interfaces to go-lang or qml wrapper code"; - homepage = https://github.com/linuxdeepin/go-dbus-generator; + homepage = "https://github.com/linuxdeepin/go-dbus-generator"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix index c499d4a1fb4b4..0c282aaa22766 100644 --- a/pkgs/desktops/deepin/go-gir-generator/default.nix +++ b/pkgs/desktops/deepin/go-gir-generator/default.nix @@ -1,5 +1,12 @@ -{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, go, gobject-introspection, - libgudev, deepin }: +{ stdenv +, fetchpatch +, fetchFromGitHub +, pkgconfig +, go +, gobject-introspection +, libgudev +, deepin +}: stdenv.mkDerivation rec { pname = "go-gir-generator"; @@ -40,11 +47,11 @@ stdenv.mkDerivation rec { "GOCACHE=$(TMPDIR)/go-cache" ]; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Generate static golang bindings for GObject"; - homepage = https://github.com/linuxdeepin/go-gir-generator; + homepage = "https://github.com/linuxdeepin/go-gir-generator"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix index 730412a58f31e..d45351fd6dcb9 100644 --- a/pkgs/desktops/deepin/go-lib/default.nix +++ b/pkgs/desktops/deepin/go-lib/default.nix @@ -1,5 +1,12 @@ -{ stdenv, fetchFromGitHub, glib, xorg, gdk-pixbuf, pulseaudio, - mobile-broadband-provider-info, deepin }: +{ stdenv +, fetchFromGitHub +, glib +, xorg +, gdk-pixbuf +, pulseaudio +, mobile-broadband-provider-info +, deepin +}: stdenv.mkDerivation rec { pname = "go-lib"; @@ -27,11 +34,11 @@ stdenv.mkDerivation rec { rm -r $out/share/go/src/pkg.deepin.io/lib/debian ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Go bindings for Deepin Desktop Environment development"; - homepage = https://github.com/linuxdeepin/go-lib; + homepage = "https://github.com/linuxdeepin/go-lib"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix index 38ca4f3b67667..fb6bb89d93938 100644 --- a/pkgs/desktops/deepin/qcef/default.nix +++ b/pkgs/desktops/deepin/qcef/default.nix @@ -1,12 +1,35 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, - qtwebchannel, qtx11extras, - gnome2, nss, nspr, alsaLib, atk, cairo, cups, dbus, - expat, fontconfig, gdk-pixbuf, glib, gtk2, - libxcb, pango, pulseaudio, xorg, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, cmake +, qtbase +, qttools +, qtwebchannel +, qtx11extras +, gnome2 +, nss +, nspr +, alsaLib +, atk +, cairo +, cups +, dbus +, expat +, fontconfig +, gdk-pixbuf +, glib +, gtk2 +, libxcb +, pango +, pulseaudio +, xorg +, deepin +}: let rpahtLibraries = [ - stdenv.cc.cc.lib # libstdc++.so.6 + stdenv.cc.cc.lib # libstdc++.so.6 alsaLib atk cairo @@ -35,9 +58,10 @@ let xorg.libXrender xorg.libXtst ]; + libPath = stdenv.lib.makeLibraryPath rpahtLibraries; -in +in mkDerivation rec { pname = "qcef"; version = "1.1.7"; @@ -90,14 +114,14 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version; src = (builtins.head srcs); }; meta = with stdenv.lib; { description = "Qt5 binding of Chromium Embedded Framework"; - homepage = https://github.com/linuxdeepin/qcef; + homepage = "https://github.com/linuxdeepin/qcef"; license = licenses.lgpl3; platforms = platforms.linux; - badPlatforms = [ "aarch64-linux" ]; # the cef-binary is not available + badPlatforms = [ "aarch64-linux" ]; # the cef-binary is not available maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index 6b1f212716cf0..4aa10fb1a93bc 100644 --- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -1,5 +1,15 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM, - mtdev, cairo, deepin, qtbase }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, qtx11extras +, libSM +, mtdev +, cairo +, deepin +, qtbase +}: mkDerivation rec { pname = "qt5dxcb-plugin"; @@ -43,11 +53,11 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version; src = (builtins.head srcs); }; meta = with stdenv.lib; { description = "Qt platform theme integration plugin for DDE"; - homepage = https://github.com/linuxdeepin/qt5dxcb-plugin; + homepage = "https://github.com/linuxdeepin/qt5dxcb-plugin"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix index 5de46f8a1dd4c..cc427611c34af 100644 --- a/pkgs/desktops/deepin/qt5integration/default.nix +++ b/pkgs/desktops/deepin/qt5integration/default.nix @@ -1,6 +1,19 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, mtdev, - lxqt, qtx11extras, qtmultimedia, qtsvg, - qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, mtdev +, lxqt +, qtx11extras +, qtmultimedia +, qtsvg +, qt5dxcb-plugin +, qtstyleplugins +, dtkcore +, dtkwidget +, deepin +}: mkDerivation rec { pname = "qt5integration"; @@ -40,11 +53,11 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Qt platform theme integration plugins for DDE"; - homepage = https://github.com/linuxdeepin/qt5integration; + homepage = "https://github.com/linuxdeepin/qt5integration"; license = with licenses; [ gpl3 lgpl2Plus bsd2 ]; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/startdde/default.nix b/pkgs/desktops/deepin/startdde/default.nix index 9200088261699..7d03b00928e3d 100644 --- a/pkgs/desktops/deepin/startdde/default.nix +++ b/pkgs/desktops/deepin/startdde/default.nix @@ -1,13 +1,42 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, alsaLib, - coreutils, dbus-factory, dde-api, dde-daemon, dde-dock, - dde-file-manager, dde-polkit-agent, dde-session-ui, deepin, - deepin-desktop-base, deepin-desktop-schemas, deepin-turbo, - dde-kwin, glib, gnome3, go, go-dbus-factory, go-gir-generator, - go-lib, gtk3, jq, kmod, libX11, libXi, libcgroup, pciutils, psmisc, - pulseaudio, systemd, xorg, wrapGAppsHook }: +{ stdenv +, buildGoPackage +, fetchFromGitHub +, pkgconfig +, alsaLib +, coreutils +, dbus-factory +, dde-api +, dde-daemon +, dde-dock +, dde-file-manager +, dde-polkit-agent +, dde-session-ui +, deepin +, deepin-desktop-base +, deepin-desktop-schemas +, deepin-turbo +, dde-kwin +, glib +, gnome3 +, go +, go-dbus-factory +, go-gir-generator +, go-lib +, gtk3 +, jq +, kmod +, libX11 +, libXi +, libcgroup +, pciutils +, psmisc +, pulseaudio +, systemd +, xorg +, wrapGAppsHook +}: buildGoPackage rec { - name = "${pname}-${version}"; pname = "startdde"; version = "5.0.1"; @@ -22,8 +51,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - outputs = [ "out" ]; - nativeBuildInputs = [ pkgconfig dbus-factory @@ -114,7 +141,7 @@ buildGoPackage rec { installPhase = '' make install PREFIX="$out" -C go/src/${goPackagePath} rm -rf $out/share/lightdm # this is uselesss for NixOS - remove-references-to -t ${go} $out/bin/* $out/sbin/* + remove-references-to -t ${go} $out/sbin/* ''; postFixup = '' @@ -122,13 +149,13 @@ buildGoPackage rec { ''; passthru = { - updateScript = deepin.updateScript { inherit name; }; + updateScript = deepin.updateScript { inherit pname version src; }; providedSessions = [ "deepin" ]; }; meta = with stdenv.lib; { description = "Starter of deepin desktop environment"; - homepage = https://github.com/linuxdeepin/startdde; + homepage = "https://github.com/linuxdeepin/startdde"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix index 7972d8f9a3f7b..385fedfc47807 100644 --- a/pkgs/desktops/deepin/udisks2-qt5/default.nix +++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix @@ -1,4 +1,10 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, qmake +, qtbase +, deepin +}: mkDerivation rec { pname = "udisks2-qt5"; @@ -28,11 +34,11 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "UDisks2 D-Bus interfaces binding for Qt5"; - homepage = https://github.com/linuxdeepin/udisks2-qt5; + homepage = "https://github.com/linuxdeepin/udisks2-qt5"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/update.nix b/pkgs/desktops/deepin/update.nix deleted file mode 100644 index 089d9289827eb..0000000000000 --- a/pkgs/desktops/deepin/update.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, lib, writeScript, coreutils, curl, gnugrep, gnused, jq, common-updater-scripts, nix }: -{ name, ignored-versions ? "^2014(\\.|rc)|^v[0-9]+" }: - -let - nameAndVersion = builtins.parseDrvName name; - packageVersion = nameAndVersion.version; - packageName = nameAndVersion.name; - attrPath = "deepin.${packageName}"; -in - -writeScript "update-${packageName}" '' - #!${stdenv.shell} - set -o errexit - set -x - - # search for the latest version of the package on github - PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused jq ]} - tags=$(curl -s https://api.github.com/repos/linuxdeepin/${packageName}/tags) - tags=$(echo "$tags" | jq -r '.[] | .name') - echo "# ${name}" >> git-commits.txt - echo "# available tags:" >> git-commits.txt - echo "$tags" | ${gnused}/bin/sed -e 's/^/# /' >> git-commits.txt - if [ -n "${ignored-versions}" ]; then - tags=$(echo "$tags" | grep -vE "${ignored-versions}") - fi - latest_tag=$(echo "$tags" | sort --version-sort | tail -1) - - # generate commands to commit the changes - if [ "${packageVersion}" != "$latest_tag" ]; then - pfile=$(EDITOR=echo ${nix}/bin/nix edit -f. ${attrPath}) - echo " git add $pfile " >> git-commits.txt - echo " git commit -m \"${attrPath}: ${packageVersion} -> $latest_tag\"" >> git-commits.txt - fi - - # update the nix expression - update-source-version "${attrPath}" "$latest_tag" - echo "" >> git-commits.txt -'' diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix index 9aca09a510a3b..1979b4518a708 100644 --- a/pkgs/desktops/enlightenment/econnman.nix +++ b/pkgs/desktops/enlightenment/econnman.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, efl, python3Packages, dbus, makeWrapper }: stdenv.mkDerivation rec { pname = "econnman"; @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0"; }; - nativeBuildInputs = [ makeWrapper pkgconfig python2Packages.wrapPython ]; + nativeBuildInputs = [ makeWrapper pkgconfig python3Packages.wrapPython ]; - buildInputs = [ efl python2Packages.python dbus ]; + buildInputs = [ efl python3Packages.python dbus ]; - pythonPath = [ python2Packages.pythonefl python2Packages.dbus-python ]; + pythonPath = [ python3Packages.pythonefl python3Packages.dbus-python ]; postInstall = '' wrapPythonPrograms @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A user interface for the connman network connection manager"; - homepage = https://enlightenment.org/; + homepage = "https://enlightenment.org/"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index b4b271fb38f30..78f8f3966ed59 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -1,20 +1,63 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, SDL, SDL2, alsaLib, - avahi, bullet, check, curl, dbus, doxygen, expat, fontconfig, - freetype, fribidi, ghostscript, giflib, glib, gst_all_1, gtk3, - harfbuzz, ibus, jbig2dec, libGL, libdrm, libinput, libjpeg, libpng, - libpulseaudio, libraw, librsvg, libsndfile, libspectre, libtiff, - libwebp, libxkbcommon, luajit, lz4, mesa, openjpeg, openssl, - poppler, python27Packages, systemd, udev, utillinux, writeText, - xorg, zlib +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, SDL2 +, alsaLib +, bullet +, check +, curl +, dbus +, doxygen +, expat +, fontconfig +, freetype +, fribidi +, ghostscript +, giflib +, glib +, gst_all_1 +, gtk3 +, harfbuzz +, hicolor-icon-theme +, ibus +, jbig2dec +, libGL +, libdrm +, libinput +, libjpeg +, libpng +, libpulseaudio +, libraw +, librsvg +, libsndfile +, libspectre +, libtiff +, libwebp +, libxkbcommon +, luajit +, lz4 +, mesa +, openjpeg +, openssl +, poppler +, python3Packages +, systemd +, udev +, utillinux +, writeText +, xorg +, zlib }: stdenv.mkDerivation rec { pname = "efl"; - version = "1.23.3"; + version = "1.24.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "00b9lp3h65254kdb1ys15fv7p3ln7qsvf15jkw4kli5ymagadkjk"; + sha256 = "1xsbz5kl74cgzyzwmjy3p50m0iigvi53lklkp92v49k4j99zpak7"; }; nativeBuildInputs = [ @@ -26,8 +69,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - SDL - avahi fontconfig freetype giflib @@ -51,6 +92,7 @@ stdenv.mkDerivation rec { xorg.libXcursor xorg.xorgproto zlib + # still missing parent icon themes: Mint-X, RAVE-X, Faenza ]; propagatedBuildInputs = [ @@ -77,7 +119,6 @@ stdenv.mkDerivation rec { luajit openjpeg poppler - python27Packages.dbus-python utillinux xorg.libXScrnSaver xorg.libXcomposite @@ -86,23 +127,22 @@ stdenv.mkDerivation rec { xorg.libXfixes xorg.libXi xorg.libXinerama - xorg.libXp xorg.libXrandr xorg.libXrender xorg.libXtst xorg.libxcb - xorg.libxkbfile - xorg.xcbutilkeysyms ]; + dontDropIconThemeCache = true; + mesonFlags = [ "--buildtype=release" "-D build-tests=false" # disable build tests, which are not working "-D drm=true" + "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disalbed by default, scim is not availabe in nixpkgs "-D embedded-lz4=false" - "-D evas-loaders-disabler=json" "-D fb=true" - "-D opengl=full" + "-D network-backend=connman" "-D sdl=true" ]; @@ -151,7 +191,7 @@ stdenv.mkDerivation rec { meta = { description = "Enlightenment foundation libraries"; - homepage = https://enlightenment.org/; + homepage = "https://enlightenment.org/"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index 0fb249135a24e..8ba0dffc8a4d0 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The Compositing Window Manager and Desktop Shell"; - homepage = https://www.enlightenment.org; + homepage = "https://www.enlightenment.org"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix index b00b3d7a84623..36719200c7616 100644 --- a/pkgs/desktops/enlightenment/ephoto.nix +++ b/pkgs/desktops/enlightenment/ephoto.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Image viewer and editor written using the Enlightenment Foundation Libraries"; - homepage = https://smhouston.us/projects/ephoto/; + homepage = "https://smhouston.us/projects/ephoto/"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index f0a9799e5b499..3c4de19fa9191 100644 --- a/pkgs/desktops/enlightenment/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Video + Audio player along the lines of mplayer"; - homepage = https://enlightenment.org/; + homepage = "https://enlightenment.org/"; maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx romildo ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index ee140e091505b..3eff9292cb6c4 100644 --- a/pkgs/desktops/enlightenment/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "terminology"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0xxx4xyhis6fy3frgb34ip0aj0kc4zashf60gzbxmq5gadbb0p5r"; + sha256 = "11qan2k6w94cglysh95yxkbv6hw9x15ri927hkiy3k0hbmpbrxc8"; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Powerful terminal emulator based on EFL"; - homepage = https://www.enlightenment.org/about-terminology; + homepage = "https://www.enlightenment.org/about-terminology"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix index 7d8365337aa87..bf811961226db 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.pygtk.org; + homepage = "http://www.pygtk.org"; description = "Python bindings for GNOME desktop packages"; license = licenses.lgpl21; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix index 37bd631adbcb4..455e3fe267324 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://pygtk.org/; + homepage = "http://pygtk.org/"; description = "Python wrapper for GNOME libraries"; platforms = platforms.linux; license = licenses.lgpl2; diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index 5a81c1bcb1ae3..68c1b3b5da439 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tray status icon, which notifies us when new email arrives"; - homepage = https://www.nongnu.org/mailnotify/; + homepage = "https://www.nongnu.org/mailnotify/"; license = with licenses; [ gpl3 ]; platforms = platforms.unix; maintainers = [ maintainers.eleanor ]; diff --git a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix index 7c713cb912212..e5892c0659f6d 100644 --- a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix +++ b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "scrollkeeper-0.3.14"; src = fetchurl { - url = mirror://gnome/sources/scrollkeeper/0.3/scrollkeeper-0.3.14.tar.bz2; + url = "mirror://gnome/sources/scrollkeeper/0.3/scrollkeeper-0.3.14.tar.bz2"; sha256 = "08n1xgj1f53zahwm0wpn3jid3rfbhi3iwby0ilaaldnid5qriqgc"; }; diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index 606ba93d3fcd6..81330218d49d9 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -18,12 +18,12 @@ in stdenv.mkDerivation rec { # fixed in upstream version 0.32.2 (fetchpatch{ name = "CVE-2012-2738-1.patch"; - url = https://gitlab.gnome.org/GNOME/vte/commit/feeee4b5832b17641e505b7083e0d299fdae318e.patch; + url = "https://gitlab.gnome.org/GNOME/vte/commit/feeee4b5832b17641e505b7083e0d299fdae318e.patch"; sha256 = "1455i6zxcx4rj2cz639s8qdc04z2nshprwl7k00mcsw49gv3hk5n"; }) (fetchpatch{ name = "CVE-2012-2738-2.patch"; - url = https://gitlab.gnome.org/GNOME/vte/commit/98ce2f265f986fb88c38d508286bb5e3716b9e74.patch; + url = "https://gitlab.gnome.org/GNOME/vte/commit/98ce2f265f986fb88c38d508286bb5e3716b9e74.patch"; sha256 = "0n24vw49h89w085ggq23iwlnnb6ajllfh2dg4vsar21d82jxc0sn"; }) ]; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.gnome.org/; + homepage = "https://www.gnome.org/"; description = "A library implementing a terminal emulator widget for GTK"; longDescription = '' VTE is a library (libvte) implementing a terminal emulator widget for diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index f13ff57124275..9d3e3a9be2095 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://projects.gnome.org/gconf/; + homepage = "https://projects.gnome.org/gconf/"; description = "Deprecated system for storing application preferences"; platforms = platforms.unix; }; diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index ef18f0783ce3a..f30c48b08e966 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://projects.gnome.org/ORBit2/; + homepage = "https://projects.gnome.org/ORBit2/"; description = "A CORBA 2.4-compliant Object Request Broker"; platforms = platforms.unix; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix b/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix index c3aee9024a207..e50ddeb94112d 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "gnome-mime-data-2.18.0"; src = fetchurl { - url = mirror://gnome/sources/gnome-mime-data/2.18/gnome-mime-data-2.18.0.tar.bz2; + url = "mirror://gnome/sources/gnome-mime-data/2.18/gnome-mime-data-2.18.0.tar.bz2"; sha256 = "1mvg8glb2a40yilmyabmb7fkbzlqd3i3d31kbkabqnq86xdnn69p"; }; buildInputs = [ intltool ]; diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 522c5ce6b061c..193ae1f3c226a 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://projects.gnome.org/gtkglext/; + homepage = "https://projects.gnome.org/gtkglext/"; description = "GtkGLExt, an OpenGL extension to GTK"; longDescription = '' GtkGLExt is an OpenGL extension to GTK. It provides additional GDK diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index d51cccf790664..aa7e3b938c8b2 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "libglade-2.6.4"; src = fetchurl { - url = mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2; + url = "mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2"; sha256 = "1v2x2s04jry4gpabws92i0wq2ghd47yr5n9nhgnkd7c38xv1wdk4"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix index d2539889fdba8..b3ac327f8c311 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libgnomecanvasmm-2.26.0"; src = fetchurl { - url = mirror://gnome/sources/libgnomecanvasmm/2.26/libgnomecanvasmm-2.26.0.tar.bz2; + url = "mirror://gnome/sources/libgnomecanvasmm/2.26/libgnomecanvasmm-2.26.0.tar.bz2"; sha256 = "996577f97f459a574919e15ba7fee6af8cda38a87a98289e9a4f54752d83e918"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix index bd74fe335ebd0..e535fe832d5a0 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libgnomeprintui-2.18.6"; src = fetchurl { - url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.6.tar.bz2; + url = "mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.6.tar.bz2"; sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index 838e513374531..d248ad37d02c3 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "0001-gnome-scores.h-Convert-to-UTF-8.patch"; - url = https://github.com/GNOME/libgnomeui/commit/30334c28794ef85d8973f4ed0779b5ceed6594f2.diff; + url = "https://github.com/GNOME/libgnomeui/commit/30334c28794ef85d8973f4ed0779b5ceed6594f2.diff"; sha256 = "1sn8j8dkam14wfkpw8nga3gk63wniff243mzv3jp0fvv52q8sqhk"; }) ]; diff --git a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix index cf34c7e7c686c..0d362a28519e3 100644 --- a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libgtkhtml-2.11.1"; src = fetchurl { - url = mirror://gnome/sources/libgtkhtml/2.11/libgtkhtml-2.11.1.tar.bz2; + url = "mirror://gnome/sources/libgtkhtml/2.11/libgtkhtml-2.11.1.tar.bz2"; sha256 = "0msajafd42545dxzyr5zqka990cjrxw2yz09ajv4zs8m1w6pm9rw"; }; diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 0ceafeea439e7..192c179a93f38 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -17,13 +17,13 @@ python3.pkgs.buildPythonApplication rec { name = "accerciser-${version}"; - version = "3.36.0"; + version = "3.36.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1iwi7mnayw1f90s439flh0zkgmj4qx10dzgj38nd5f3wvqmhabk3"; + sha256 = "1ig9zcg8z7yv2c28q0a4q57ckkpmzjsbnancx01rjihrrjbg9ib2"; }; nativeBuildInputs = [ @@ -64,9 +64,9 @@ }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Accerciser; + homepage = "https://wiki.gnome.org/Apps/Accerciser"; description = "Interactive Python accessibility explorer"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index b3bb1e1093c9c..05a1cdbc088e4 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -51,9 +51,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Cheese; + homepage = "https://wiki.gnome.org/Apps/Cheese"; description = "Take photos and videos with your webcam, with fun graphical effects"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 971c16dee5eb8..467971b2dba4e 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1f3cwc05gw75yqficcxns95r96lv7an4aih6d7hng3n3pqfwyfl7"; + sha256 = "12ii8crp4v4bpdxrc2rkxwdxqz3qjizyfgfrmir9pcyxlg0lh2f5"; }; nativeBuildInputs = [ @@ -125,9 +125,9 @@ stdenv.mkDerivation rec { PKG_CONFIG_LIBEDATASERVERUI_1_2_UIMODULEDIR = "${placeholder "out"}/lib/evolution-data-server/ui-modules"; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Evolution; + homepage = "https://wiki.gnome.org/Apps/Evolution"; description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index b6e592031822d..a735d9f446d25 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "file-roller"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0p22jxcagamvp08xfglz4cz1sp8w4p101npw0ggrkhh7vm8yb9bh"; + sha256 = "1lkb0m8ys13sy3b6c1kj3cqrqf5d1dqvhbp8spz8v9yjv3d7z3r6"; }; LANG = "en_US.UTF-8"; # postinstall.py @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/FileRoller; + homepage = "https://wiki.gnome.org/Apps/FileRoller"; description = "Archive manager for the GNOME desktop environment"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index c63a51324f013..ea33bc29324fa 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11z3lhc5i3z0gqw0qmprsm4rmvhbbm4gz6wy0f73c73x4bd8xhvd"; + sha256 = "15s1almlhjlgl3m8lxg6jpzln8jhgdxxjr635a3b7cf58d35b1v8"; }; nativeBuildInputs = [ @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Gedit; + homepage = "https://wiki.gnome.org/Apps/Gedit"; description = "Official text editor of the GNOME desktop environment"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix index 0998dbd069db3..7de5ffc1add05 100644 --- a/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix @@ -75,10 +75,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Ghex; + homepage = "https://wiki.gnome.org/Apps/Ghex"; description = "Hex editor for GNOME desktop environment"; platforms = platforms.unix; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix deleted file mode 100644 index 7449e22d69d6f..0000000000000 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, intltool, fetchurl, python3 -, pkgconfig, gtk3, glib, gobject-introspection -, wrapGAppsHook, itstool, libxml2, docbook_xsl -, gnome3, gdk-pixbuf, libxslt, gsettings-desktop-schemas }: - -stdenv.mkDerivation rec { - pname = "glade"; - version = "3.22.2"; - - src = fetchurl { - url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08bayb1rrpblxf6jhhbw2n3c425w170is4l94pampldl4kmsdvzd"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "glade"; attrPath = "gnome3.glade"; }; - }; - - nativeBuildInputs = [ - pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt libxml2 gobject-introspection - ]; - buildInputs = [ - gtk3 glib libxml2 python3 python3.pkgs.pygobject3 - gsettings-desktop-schemas - gdk-pixbuf gnome3.adwaita-icon-theme - ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = "https://wiki.gnome.org/Apps/Glade"; - description = "User interface designer for GTK applications"; - maintainers = gnome3.maintainers; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix index 628442c307531..7432e8e96ed23 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Books; + homepage = "https://wiki.gnome.org/Apps/Books"; description = "An e-book manager application for GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 54afc3dbcd60b..e2ac4cb4b89d9 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "3.36.2"; + version = "3.36.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "01hjlz9hljk2skrwfqxpy3934wjs6figs71sw8bm8g2vnyaqwq7a"; + sha256 = "18imxv1859gr53z4yay02611p5f1rd2pwnbaq093gmn77l0j9292"; }; doCheck = true; @@ -133,9 +133,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple GNOME 3 application to access remote or virtual systems"; - homepage = https://wiki.gnome.org/Apps/Boxes; + homepage = "https://wiki.gnome.org/Apps/Boxes"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index db32efc62ea46..88284c540e3b4 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-calendar"; - version = "3.36.0"; + version = "3.36.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1cxy4qf83s8w1ys94rcc4ksf7ywi0hkkpfs0szkkip2v8g3j6kq2"; + sha256 = "0ql3f509bj17riqs0jfpp434s97dzjgkjcd978i4m4y80nq2131v"; }; passthru = { @@ -32,9 +32,9 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Calendar; + homepage = "https://wiki.gnome.org/Apps/Calendar"; description = "Simple and beautiful calendar application for GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index fa9a7b003c3cf..987fa594ae527 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Design/Apps/CharacterMap"; description = "Simple utility application to find and insert unusual characters"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index e725c50983d66..b64094002bb8d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -27,22 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "3.36.0"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ij9xwp3c96gsnnlhkqkiw3y45a4lpw7a09d4yysx7bvgw68p5sc"; + sha256 = "8RsbIuwfKF5QmINoTAsfSlFJauoQVZEjnlsm+JhnUeY="; }; - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-clocks"; - attrPath = "gnome3.gnome-clocks"; - }; - }; - - doCheck = true; - nativeBuildInputs = [ vala meson @@ -55,6 +46,7 @@ stdenv.mkDerivation rec { libxml2 gobject-introspection # for finding vapi files ]; + buildInputs = [ gtk3 glib @@ -76,10 +68,19 @@ stdenv.mkDerivation rec { ) ''; + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-clocks"; + attrPath = "gnome3.gnome-clocks"; + }; + }; + meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Clocks; + homepage = "https://wiki.gnome.org/Apps/Clocks"; description = "Clock application designed for GNOME 3"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 5aa39e09cd6fa..8d5501537a0ff 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Documents"; description = "Document manager application designed to work with GNOME 3"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index 79e92aece74cb..bd02a5f0cc602 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-getting-started-docs"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "09bf9r6brmll14z87ljgivw0nr0nggcgjpbx6lg2835zq36vfmi9"; + sha256 = "1ihxa9g687rbb4s2gxd2pf726adx98ahq4kfad868swl7a8vi504"; }; passthru = { @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { buildInputs = [ intltool itstool libxml2 ]; meta = with stdenv.lib; { - homepage = https://live.gnome.org/DocumentationProject; + homepage = "https://live.gnome.org/DocumentationProject"; description = "Help a new user get started in GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.cc-by-sa-30; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index c80238740e543..acd4386d2e734 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -1,25 +1,57 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook -, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gnome3 +, glib +, gtk3 +, wrapGAppsHook +, gettext +, itstool +, libxml2 +, libxslt +, docbook_xsl +, docbook_xml_dtd_43 +, systemd +, python3 +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "gnome-logs"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16jfwg912asirrdmipf6wh7zr5zrww3nyhf99mi230y8hmqazx0m"; + sha256 = "RHZrYaaJnhtMUe16iEBgjmuSd/NB+Fah5cCNvXpzNnA="; }; - mesonFlags = [ - "-Dman=true" - ]; - nativeBuildInputs = [ python3 - meson ninja pkgconfig wrapGAppsHook gettext itstool - libxml2 libxslt docbook_xsl docbook_xml_dtd_43 + meson + ninja + pkgconfig + wrapGAppsHook + gettext + itstool + libxml2 + libxslt + docbook_xsl + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + gtk3 + systemd + gsettings-desktop-schemas + gnome3.adwaita-icon-theme + ]; + + mesonFlags = [ + "-Dman=true" ]; - buildInputs = [ glib gtk3 systemd gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x meson_post_install.py @@ -36,9 +68,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Logs; + homepage = "https://wiki.gnome.org/Apps/Logs"; description = "A log viewer for the systemd journal"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index e10460f622a0f..a722ab9616ed3 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.36.1"; + version = "3.36.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1yajq2pxd4fbzngwhn92h55rn02psxih8bbdcdxgg66qdbcyychs"; + sha256 = "114pia3nd8k7j6ll7za7qzv0ggcdvcw6b3w4lppqqrwqvswik8jv"; }; doCheck = true; @@ -48,9 +48,9 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Maps; + homepage = "https://wiki.gnome.org/Apps/Maps"; description = "A map application for GNOME 3"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 2a4c5026ed294..26cebe076ea42 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -30,13 +30,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.36.1"; + version = "3.36.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0cn33r9v2raizq1b8s7s0kb506y91iarc0knm0sljcsqs4qgd03v"; + sha256 = "19c2x7h9gq4kh4995y1qcn5pyry4x04lh5n7md0q33zsxcx43bdb"; }; nativeBuildInputs = [ @@ -103,7 +103,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Music"; description = "Music player and management application for the GNOME desktop environment"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix index 37401af3ce602..88072912b6630 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-nettool"; description = "A collection of networking tools"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 5f47cd1fd0cf3..03edd5c9bfe9f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -81,9 +81,9 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Note editor designed to remain simple to use"; - homepage = https://wiki.gnome.org/Apps/Notes; + homepage = "https://wiki.gnome.org/Apps/Notes"; license = licenses.gpl3; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix index fd47f54eb899f..4a92052763efa 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -51,9 +51,9 @@ in stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://projects-old.gnome.org/gnome-power-manager/; + homepage = "https://projects-old.gnome.org/gnome-power-manager/"; description = "View battery and power statistics provided by UPower"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix index 3996a2e7564a8..f4a72fdfb482d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple and modern sound recorder"; - homepage = https://wiki.gnome.org/Apps/SoundRecorder; + homepage = "https://wiki.gnome.org/Apps/SoundRecorder"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix index f5c4eedc48d57..d837ce3968e49 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix @@ -81,9 +81,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Personal task manager for GNOME"; - homepage = https://wiki.gnome.org/Apps/Todo; + homepage = "https://wiki.gnome.org/Apps/Todo"; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index 085131d80fca2..84be3f5274345 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "3.36.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15ahfgqj0rz16y2bdxb7sa4b3b3larg8hn3b41pc5ddnwf9x63zi"; + sha256 = "11z75ky6xp9hx7lm24xng7ydr20bzh4d6p9sbi9c8ccz2m3fdrk8"; }; nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ]; @@ -37,9 +37,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Weather; + homepage = "https://wiki.gnome.org/Apps/Weather"; description = "Access current weather conditions and forecasts"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index b01e1e8106a4d..363d3c49af853 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -5,13 +5,13 @@ let pname = "polari"; - version = "3.36.1"; + version = "3.36.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1rmmq74g22qrmsg0mjvpzk5403kkpfw0iznvnwxfqbi0dfkamhn4"; + sha256 = "12i0gp2kwp0b7af135q32qygkhh2025f74dqbaylfbmzacbdpz5c"; }; patches = [ @@ -45,9 +45,9 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Polari; + homepage = "https://wiki.gnome.org/Apps/Polari"; description = "IRC chat client designed to integrate with the GNOME desktop"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 245a1b287a2b8..ec6791e323111 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -76,9 +76,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Seahorse; + homepage = "https://wiki.gnome.org/Apps/Seahorse"; description = "Application for managing encryption keys and passwords in the GnomeKeyring"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index c5377157ef0c9..e04238b4b16fb 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Remote desktop viewer for GNOME"; - homepage = https://wiki.gnome.org/Apps/Vinagre; + homepage = "https://wiki.gnome.org/Apps/Vinagre"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index 1fe5b6fb89712..68c09cc9180cb 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "3.36.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "066m3vd6k6xf3ap1ahrbw5hnx2322wf0qsnywcxjsj6snq9225qs"; + sha256 = "0kgiq712lfidd81yzx0yk7qwlj3q8cymp6npnxyzsk844y353674"; }; # For convenience, we can specify adwaita-icon-theme only in packages @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk3 ]; + dontDropIconThemeCache = true; + # remove a tree of dirs with no files within postInstall = '' rm -rf "$out/locale" ''; @@ -29,6 +31,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = with platforms; linux ++ darwin; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index 5817d8ff942a0..af39d3a3c053e 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -26,9 +26,9 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical application to analyse disk usage in any GNOME environment"; - homepage = https://wiki.gnome.org/Apps/DiskUsageAnalyzer; + homepage = "https://wiki.gnome.org/Apps/DiskUsageAnalyzer"; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index bad06bae40549..b9da1ab1c163a 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { # Fix crash in GNOME Flashback # https://bugzilla.gnome.org/show_bug.cgi?id=791001 (fetchurl { - url = https://bugzilla.gnome.org/attachment.cgi?id=364774; + url = "https://bugzilla.gnome.org/attachment.cgi?id=364774"; sha256 = "15k1455grf6knlrxqbjnk7sals1730b0whj30451scp46wyvykvd"; }) ]; @@ -46,9 +46,9 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An input assistive technology intended for switch and pointer users"; - homepage = https://wiki.gnome.org/Projects/Caribou; + homepage = "https://wiki.gnome.org/Projects/Caribou"; license = licenses.lgpl21; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 45c3185bc2979..860b7b957b974 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -3,13 +3,13 @@ let pname = "dconf-editor"; - version = "3.36.0"; + version = "3.36.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "14q678bwgmhzmi7565xhhw51y8b0pv3cqh0f411qwzwif1bd1vkj"; + sha256 = "1iz1ngb26llhqnm2s4p55ysvnav41iv0fx0pbw98k181gy3cikpd"; }; nativeBuildInputs = [ @@ -33,6 +33,6 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 0677725246228..83c1f5d4a56f4 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -138,9 +138,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Empathy; + homepage = "https://wiki.gnome.org/Apps/Empathy"; description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = [ licenses.gpl2 ]; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 02b8707b03786..db15cf2555c82 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -4,13 +4,13 @@ let pname = "eog"; - version = "3.36.1"; + version = "3.36.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "15cwghcbx9x1xmv1dwmwcdxplnhf25w6f4dhx8hk6fjymaks2m74"; + sha256 = "135pw7ifr585grz1rbmynyyrmhd8w880pilg7c4nvq58jl16n1aw"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ]; @@ -43,9 +43,9 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNOME image viewer"; - homepage = https://wiki.gnome.org/Apps/EyeOfGnome; + homepage = "https://wiki.gnome.org/Apps/EyeOfGnome"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index ff564d47e4568..c41f5d79eb71b 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { python3 wrapGAppsHook buildPackages.glib + buildPackages.gtk3 ]; buildInputs = [ @@ -101,9 +102,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Epiphany; + homepage = "https://wiki.gnome.org/Apps/Epiphany"; description = "WebKit based web browser for GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 60bef88341613..88e5d78c4c34e 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "3.36.0"; + version = "3.36.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1a7v534sqbg7rlrvg9x1rffdf6p9n37blp3wix6anyfl6i99n7c5"; + sha256 = "1msbb66lasikpfjpkwsvi7h22hqmk275850ilpdqwbd0b39vzf4c"; }; postPatch = '' @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Evince; + homepage = "https://wiki.gnome.org/Apps/Evince"; description = "GNOME's document viewer"; longDescription = '' @@ -128,6 +128,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; - maintainers = gnome3.maintainers ++ [ maintainers.vcunat ]; + maintainers = teams.gnome.members ++ [ maintainers.vcunat ]; }; } diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index f1e4a8a572652..0d3c786690d11 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.36.1"; + version = "3.36.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15k7k225jfv5a45hmjk94xq90np2r9f5v8yj0xi3166vvlp2n4hk"; + sha256 = "0yz9fsnbnnlj2iidd81i9w7d0dhidrzqkixrnfjfdkhnxk7p9qlq"; }; patches = [ @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Unified backend for programs that work with contacts, tasks, and calendar information"; - homepage = https://wiki.gnome.org/Apps/Evolution; + homepage = "https://wiki.gnome.org/Apps/Evolution"; license = licenses.lgpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index ba660a64418cc..58c898a5f0dd9 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -95,9 +95,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A program that manages graphical display servers and handles graphical user logins"; - homepage = https://wiki.gnome.org/Projects/GDM; + homepage = "https://wiki.gnome.org/Projects/GDM"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index 518b86adf7f95..e8463c5b704ec 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.unix; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index 5dd9525507738..ed647bb87d812 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -43,9 +43,9 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en; + homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en"; description = "Application that let you manage Bluetooth in the GNOME destkop"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index c3de61d66166a..e14d8d136cd86 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -37,9 +37,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Calculator; + homepage = "https://wiki.gnome.org/Apps/Calculator"; description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix index 341fd13bfa739..69655e2364d30 100644 --- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set of graphical utilities for color management to be used in the GNOME desktop"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix index f2eb65e50bbf9..fb0b0f875440f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome-common tends to require which meta = with stdenv.lib; { - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 648e9d232b52d..6e933e7b9af0f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "3.36"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0yvgsfmqm8dxbhay12m20xp6qi9v31wwyv1gz4fx7j4kklhd5jzf"; + sha256 = "0qb2kgyk6f6wr129a0gzhvpy5wdjpwjbksxyfs6zxv183jl9s73z"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; @@ -55,9 +55,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Contacts; + homepage = "https://wiki.gnome.org/Apps/Contacts"; description = "GNOME’s integrated address book"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 00f5ff5cd7a6b..79d28ae8ced80 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -68,11 +68,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1466swjyw5vjym001qda94x6sisd4xhpyb6vq91grhkyzwf2vqzk"; + sha256 = "05vqhj5z4w4vaphp541zxxkx6x781m371l2gqnq2vhnnqvqfz9g0"; }; nativeBuildInputs = [ @@ -178,7 +178,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities to configure the GNOME desktop"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 213cb890ef6d6..94de64c9ea98f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "3.36.1"; + version = "3.36.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1058h1ndl6pmlh8rmbqq5lw15glws3anin88cm7lw4vzasgfavwc"; + sha256 = "12f724inw3sv289xqprvwh8r3qw89z67m74j3hyhkbp1n7f99y9q"; }; nativeBuildInputs = [ @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { description = "Library with common API for various GNOME modules"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index f43f98bdd9b62..a19f0b6a276e6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Dictionary; + homepage = "https://wiki.gnome.org/Apps/Dictionary"; description = "Dictionary is the GNOME application to look up definitions"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 671331460b1a9..a7f66e68eeff0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://en.wikipedia.org/wiki/GNOME_Disks; + homepage = "https://en.wikipedia.org/wiki/GNOME_Disks"; description = "A udisks graphical front-end"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 0589dfe728540..d0ceef61c25a2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Program that can preview fonts and create thumbnails for fonts"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index 67d5c11ae9f9c..fb801ca19a616 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1sfn6bdz8snc2qmi3nzb07vlkdhy9s1ipwxxj0v2i36a7n0gv6ci"; + sha256 = "0mjp2j4smikmr4fa0y8wrw2srlfjahiixzphz3dmc30hx8df92sg"; }; nativeBuildInputs = [ @@ -103,6 +103,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/gnome-initial-setup"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 447a6bf654b8d..9ffd32e85f704 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications"; - homepage = https://wiki.gnome.org/Projects/GnomeKeyring; + homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix index b21e3f6f68a7c..ede2f2792483c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners; + homepage = "https://wiki.gnome.org/Projects/GnomeOnlineMiners"; description = "A set of crawlers that go through your online content and index them locally in Tracker"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix index 0971e65e5a475..a77aee4b890cc 100644 --- a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, meson, ninja, pkgconfig, python3, wrapGAppsHook -, glib, pipewire, systemd, libvncserver, libsecret, libnotify, gdk-pixbuf, gnome3 }: +, glib, pipewire, systemd, libvncserver, libsecret, libnotify, gdk-pixbuf }: stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Mutter/RemoteDesktop; + homepage = "https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"; description = "GNOME Remote Desktop server"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 03a790967c3a5..2eacfc2de7771 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -34,9 +34,9 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://en.wikipedia.org/wiki/GNOME_Screenshot; + homepage = "https://en.wikipedia.org/wiki/GNOME_Screenshot"; description = "Utility used in the GNOME desktop environment for taking screenshots"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 03a56db3ed94a..b25688ea5a9d0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -71,9 +71,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNOME session manager"; - homepage = https://wiki.gnome.org/Projects/SessionManagement; + homepage = "https://wiki.gnome.org/Projects/SessionManagement"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index c4b1ab867c7d5..2ee07fb09aa86 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "3.36.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jddz8f2j4ps7csgq9b694h9hjxsyhlimik6rb2f8nbcxhrg0bzs"; + sha256 = "0jzf2nznpcrjqq7fjwk66kw8a6x87kgbdjidc2msaqmm379xncry"; }; patches = [ @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index ef7b0fee26b94..a501f9122774e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "3.36.0"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1rmi6ccqfdisvmmzaiqr2r031r0f3h8qxgw5qwq62x859nbrzcmm"; + sha256 = "0gq0z0k02b5cfaqrikk2hzbqzjkb6qwcanaqi2jh7nswa7g050lp"; }; passthru = { @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions; + homepage = "https://wiki.gnome.org/Projects/GnomeShell/Extensions"; description = "Modify and extend GNOME Shell functionality and behavior"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index d099e58283943..d3fb419aabccb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -6,7 +6,9 @@ , accountsservice, gdk-pixbuf, gdm, upower, ibus, libnma, libgnomekbd, gnome-desktop , gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3 , sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon -, gnome-autoar, asciidoc-full }: +, gnome-autoar, asciidoc-full +, bash-completion +}: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -15,11 +17,11 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "3.36.0"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1phkkkwrrigchz58xs324vf6snd1fm7mxa2iaqwwj526vh5c1s2q"; + sha256 = "0lqpxhvn073bshnzarnisym3da3k3awsi3h906hm85hz3wm9n4iv"; }; LANG = "en_US.UTF-8"; @@ -48,17 +50,12 @@ in stdenv.mkDerivation rec { # not declared at build time, but typelib is needed at runtime libgweather libnma + + # for gnome-extension tool + bash-completion ]; patches = [ - # Fix dependencies. - # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1114 - (fetchpatch { - name = "0001-build-Add-missing-dependency-to-run-js-test.patch"; - url = https://bug787864.bugzilla-attachments.gnome.org/attachment.cgi?id=360016; - sha256 = "1dmahd8ysbzh33rxglba0fbq127aw9h14cl2a2bw9913vjxhxijm"; - }) - # Hardcode paths to various dependencies so that they can be found at runtime. (substituteAll { src = ./fix-paths.patch; @@ -66,32 +63,26 @@ in stdenv.mkDerivation rec { gsettings = "${glib.bin}/bin/gsettings"; }) - # Fix ibus launching regression. - # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1080 + # Install bash-completions to correct prefix. + # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1194 (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/94f6976ddd6337593203fdcdd2e3644774408dfa.patch"; - sha256 = "PGmFQhqqd3gK+3kp0dlmlYd2G5ZTIQpfE++Q03Ghkx0="; + url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/9f1ad5d86ddbabaa840eb2860279d53f4e635453.patch"; + sha256 = "f8MDFbfg9D7ORF84Ld9GIvf0xRCYuSszo3QLMji2VaE="; }) - # Fix typing regression with ibus. - # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1084 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/b18469427e5c19402111de5fe9888bceec0eaacd.patch"; - sha256 = "1M+3kjt7K61BFgk1Zf9XfK1ziilQGa60PD8xtVjnQec="; - }) + # Use absolute path for libshew installation to make our patched gobject-introspection + # aware of the location to hardcode in the generated GIR file. + ./shew-gir-path.patch - # Fix theming breakage after Shell restart on X11. - # https://gitlab.gnome.org/GNOME/gnome-shell/issues/2329 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/72c4f148ef88b4bffb2106b99434da5c05c0bb64.patch"; - sha256 = "RBA+JHz4ZvmbJZMnGNieD6D5LONRgFU4iOFIMQQ2kHQ="; - }) + # Make D-Bus services wrappable. + ./wrap-services.patch - # Fix Telepathy chat integration. - # https://gitlab.gnome.org/GNOME/gnome-shell/issues/2449 + # Fix greeter logo being too big. + # https://gitlab.gnome.org/GNOME/gnome-shell/issues/2591 (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/766288eec1bd3bd50dfc4ddf410c2b507187e603.patch"; - sha256 = "Cp6xLohCM0gmMxtyYjSukS2oV60Khmxf4iQd9EDAlIc="; + url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/ffb8bd5fa7704ce70ce7d053e03549dd15dce5ae.patch"; + revert = true; + sha256 = "9DdzjEnDiBL+JmdfgKwjYPn1O2wJ/6n1sMDT1ylUB5I="; }) ]; @@ -112,6 +103,13 @@ in stdenv.mkDerivation rec { ) ''; + postFixup = '' + # The services need typelibs. + for svc in org.gnome.Shell.Extensions org.gnome.Shell.Notifications; do + wrapGApp $out/share/gnome-shell/$svc + done + ''; + passthru = { mozillaPlugin = "/lib/mozilla/plugins"; updateScript = gnome3.updateScript { @@ -122,9 +120,9 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Core user interface for the GNOME 3 desktop"; - homepage = https://wiki.gnome.org/Projects/GnomeShell; + homepage = "https://wiki.gnome.org/Projects/GnomeShell"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch b/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch new file mode 100644 index 0000000000000..2d7bdf303151d --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch @@ -0,0 +1,11 @@ +--- a/subprojects/shew/src/meson.build ++++ b/subprojects/shew/src/meson.build +@@ -13,7 +13,7 @@ shew_sources = [ + libshew = library(full_name, + sources: shew_sources, + dependencies: [gtk_dep], +- install_dir: pkglibdir, ++ install_dir: get_option('prefix') / pkglibdir, + install: true, + ) + diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/wrap-services.patch b/pkgs/desktops/gnome-3/core/gnome-shell/wrap-services.patch new file mode 100644 index 0000000000000..bc494caea9dd0 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-shell/wrap-services.patch @@ -0,0 +1,57 @@ +diff --git a/js/dbusServices/dbus-service.in b/js/dbusServices/dbus-service.in +old mode 100644 +new mode 100755 +index 524166102..100b81a63 +--- a/js/dbusServices/dbus-service.in ++++ b/js/dbusServices/dbus-service.in +@@ -1,3 +1,9 @@ ++#!@gjs@ ++ ++// gjs determines the package name from argv[0], which is .*-wrapped ++// so we need to override it to the original one. ++imports.package._findEffectiveEntryPointName = () => '@service@' ++ + imports.package.start({ + name: '@PACKAGE_NAME@', + prefix: '@prefix@', +diff --git a/js/dbusServices/dbus-service.service.in b/js/dbusServices/dbus-service.service.in +index 3b0d09abe..4fd4bb66d 100644 +--- a/js/dbusServices/dbus-service.service.in ++++ b/js/dbusServices/dbus-service.service.in +@@ -1,3 +1,3 @@ + [D-BUS Service] + Name=@service@ +-Exec=@gjs@ @pkgdatadir@/@service@ ++Exec=@pkgdatadir@/@service@ +diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build +index c749f45dc..11bcb0c9e 100644 +--- a/js/dbusServices/meson.build ++++ b/js/dbusServices/meson.build +@@ -2,6 +2,7 @@ launcherconf = configuration_data() + launcherconf.set('PACKAGE_NAME', meson.project_name()) + launcherconf.set('prefix', prefix) + launcherconf.set('libdir', libdir) ++launcherconf.set('gjs', gjs.path()) + + dbus_services = { + 'org.gnome.Shell.Extensions': 'extensions', +@@ -11,16 +12,17 @@ dbus_services = { + config_dir = '@0@/..'.format(meson.current_build_dir()) + + foreach service, dir : dbus_services ++ svc_launcherconf = launcherconf ++ svc_launcherconf.set('service', service) + configure_file( + input: 'dbus-service.in', + output: service, +- configuration: launcherconf, ++ configuration: svc_launcherconf, + install_dir: pkgdatadir, + ) + + serviceconf = configuration_data() + serviceconf.set('service', service) +- serviceconf.set('gjs', gjs.path()) + serviceconf.set('pkgdatadir', pkgdatadir) + + configure_file( diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 26debc798f7c3..46201629ce7ab 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -57,9 +57,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Software store that lets you install and update applications and system extensions"; - homepage = https://wiki.gnome.org/Apps/Software; + homepage = "https://wiki.gnome.org/Apps/Software"; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 8b26a2a2d6d38..82ec3c9a9d766 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/SystemMonitor; + homepage = "https://wiki.gnome.org/Apps/SystemMonitor"; description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 75864c8d658af..821d5707c7c9d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.36.1.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xm3g3kanfhs1q3xh3x58r55v8906806wvqjbg4c2xvdwyhhimzk"; + sha256 = "0inzmkmxv8xw4px2zjfw7236d08yjcv7znxcjki6dh4pvjivdla1"; }; buildInputs = [ @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The GNOME Terminal Emulator"; - homepage = https://wiki.gnome.org/Apps/Terminal; + homepage = "https://wiki.gnome.org/Apps/Terminal"; platforms = platforms.linux; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix index 5cd8f24948157..fa2f4921fd91b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 -, gdk-pixbuf }: +, gdk-pixbuf, hicolor-icon-theme }: let pname = "gnome-themes-extra"; @@ -19,14 +19,17 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf ]; + propagatedBuildInputs = [ gnome3.adwaita-icon-theme hicolor-icon-theme ]; - postFixup = '' + dontDropIconThemeCache = true; + + postInstall = '' gtk-update-icon-cache "$out"/share/icons/HighContrast ''; meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix index 108ff9afca701..719e97647f7a5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix @@ -74,7 +74,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-tour"; description = "GNOME Greeter & Tour"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 6207dd42a61a6..90acee076a342 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { patches = [ # fix gio-unix-2.0 lookup (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gnome-user-share/commit/8772980d4732c15505b15dccff2ca3c97e96d49d.patch; + url = "https://gitlab.gnome.org/GNOME/gnome-user-share/commit/8772980d4732c15505b15dccff2ca3c97e96d49d.patch"; sha256 = "03clzhrx72pq1cbmg2y24hvw4i1xsvrg9ip113fi5bc3w4gcji7p"; }) ]; @@ -87,9 +87,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-user-share/3.8; + homepage = "https://help.gnome.org/users/gnome-user-share/3.8"; description = "Service that exports the contents of the Public folder in your home directory on the local network"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index b6e8b4c11c03f..fe24ac8708a0c 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -44,7 +44,7 @@ let }; in stdenv.mkDerivation rec { pname = "gucharmap"; - version = "13.0.0"; + version = "13.0.2"; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "17arjigs1lw1h428s9g171n0idrpf9ks23sndldsik1zvvwzlldh"; + sha256 = "099za9mc6qdq9pwcbjp3d7hxjbaa43vk2w9qw4yiyswl1xq3jw62"; }; nativeBuildInputs = [ @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { description = "GNOME Character Map, based on the Unicode Character Database"; homepage = "https://wiki.gnome.org/Apps/Gucharmap"; license = licenses.gpl3; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix index bc0f5683a75fc..0b9aacf0ddfa6 100644 --- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Framework for managing passwords and other secrets"; - homepage = https://wiki.gnome.org/Projects/GnomeKeyring; + homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; inherit (glib.meta) platforms maintainers; diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix index 51d3c4115d9c8..8769698785064 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "mutter"; - version = "3.34.4"; + version = "3.34.5"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18hbw98p4h3d4qz57415smwmfg72s9a0nk8mb04ds1gn2lsm2d01"; + sha256 = "1i3r51ghfld1rf1rczzi3jhybz3mhywqcj2jyiqhfcyp1svlklfi"; }; mesonFlags = [ @@ -111,6 +111,13 @@ stdenv.mkDerivation rec { sha256 = "0imy2j8af9477jliwdq4jc40yw1cifsjjf196gnmwxr9rkj0hbrd"; }) + # gnome-3-34 2020-04-24 + # also fixes https://mail.gnome.org/archives/distributor-list/2020-April/msg00001.html + (fetchpatch { + url = "https://github.com/GNOME/mutter/compare/3.34.5..3bafd234248fdcd84bc62fef5e31c29fbb613909.patch"; + sha256 = "1a7krbdfmvx204p6av44rbp4ckp6ddg1mms8wkixxh2p871zq1pi"; + }) + # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 ./drop-inheritable.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 3c8a139d3e154..3274044bde9bc 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { pname = "mutter"; - version = "3.36.0"; + version = "3.36.2"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18lvj158w6gwc6xpvn699v8ykh1r5szry7sqascl6f1i8g628v2x"; + sha256 = "1x6svmd1k6w6a2m6ssq4hi997nxyq6z64fjjaid97z2rn177dcvm"; }; mesonFlags = [ @@ -121,13 +121,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit zenity; }) - - # Fix crash when opening submenus from «always on visible workspace» windows - # https://gitlab.gnome.org/GNOME/mutter/issues/1083 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/mutter/commit/7e32cc05ce2e5b3931ddcf46ce9ead603a0de39e.patch"; - sha256 = "5ZzOMizucfrSnHNYjHIUObLHCvAIjrE6fY/CxLp4c7k="; - }) ]; postPatch = '' @@ -149,7 +142,7 @@ stdenv.mkDerivation rec { description = "A window manager for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/mutter"; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index a716ad2799193..b926f9b627f1e 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "3.36.1.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1pkvxyfm2fl06fpyq2jr147hhpc91y4rgdlxlilg7n8ih982y9gr"; + sha256 = "1yknaz8n0l949sr8j3b7kdm0cm5mx2dp4n4k577m492hk6akqrr6"; }; nativeBuildInputs = [ @@ -99,9 +99,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The file manager for GNOME"; - homepage = https://wiki.gnome.org/Apps/Files; + homepage = "https://wiki.gnome.org/Apps/Files"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix index 415974d0c2b71..1ace6a5f77726 100644 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -98,9 +98,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A home media solution (UPnP AV MediaServer) that allows you to easily share audio, video and pictures to other devices"; - homepage = https://wiki.gnome.org/Projects/Rygel; + homepage = "https://wiki.gnome.org/Projects/Rygel"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 63f2eb2a03a7f..1fefa7dd393d8 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -1,24 +1,60 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, python3, wrapGAppsHook -, cairo, gdk-pixbuf, colord, glib, gtk3, gusb, packagekit, libwebp -, libxml2, sane-backends, vala, gnome3, gobject-introspection }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gettext +, itstool +, python3 +, wrapGAppsHook +, cairo +, gdk-pixbuf +, colord +, glib +, gtk3 +, gusb +, packagekit +, libwebp +, libxml2 +, sane-backends +, vala +, gnome3 +, gobject-introspection +}: stdenv.mkDerivation rec { pname = "simple-scan"; - version = "3.36.1"; + version = "3.36.2.1"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0bprm9gfnlrs0k8jvy9pqm1rjq47z5pgahqjjj1i7q2k4a8g09vl"; + sha256 = "u4zldQzQQF4U5KyLCfSlh8L6OkGGFK1CWmaUyYG7ASs="; }; - buildInputs = [ - cairo gdk-pixbuf colord glib gnome3.adwaita-icon-theme gusb - gtk3 libwebp packagekit sane-backends vala - ]; nativeBuildInputs = [ - meson ninja gettext itstool pkgconfig python3 wrapGAppsHook libxml2 - # For setup hook - gobject-introspection + meson + ninja + gettext + itstool + pkgconfig + python3 + wrapGAppsHook + libxml2 + gobject-introspection # For setup hook + ]; + + buildInputs = [ + cairo + gdk-pixbuf + colord + glib + gnome3.adwaita-icon-theme + gusb + gtk3 + libwebp + packagekit + sane-backends + vala ]; postPatch = '' @@ -43,9 +79,9 @@ stdenv.mkDerivation rec { XSANE uses. This means that all existing scanners will work and the interface is well tested. ''; - homepage = https://gitlab.gnome.org/GNOME/simple-scan; + homepage = "https://gitlab.gnome.org/GNOME/simple-scan"; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 2d6d398fb4597..4bdc409d81664 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://en.wikipedia.org/wiki/Sushi_(software)"; description = "A quick previewer for Nautilus"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 50e30d2717eed..50ab50e58b2c9 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -48,9 +48,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Videos; + homepage = "https://wiki.gnome.org/Apps/Videos"; description = "Movie player for the GNOME desktop based on GStreamer"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index 7d4f2f36515e9..09019e6758c1c 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp; + homepage = "https://wiki.gnome.org/Apps/Yelp"; description = "Yelp's universal stylesheets for Mallard and DocBook"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = [licenses.gpl2 licenses.lgpl2]; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 76a124b0c61c8..1235447c032a1 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp; + homepage = "https://wiki.gnome.org/Apps/Yelp"; description = "The help viewer in Gnome"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index 16ef06d8d9dfe..5750fa0d001c4 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { description = "Tool to display dialogs from the commandline and shell scripts"; homepage = "https://wiki.gnome.org/Projects/Zenity"; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 25a8ba6573ab1..846eefa9fa984 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -18,8 +18,6 @@ lib.makeScope pkgs.newScope (self: with self; { in lib.filter (x: !(builtins.elem (lib.getName x) namesToRemove)) packages; - maintainers = lib.teams.gnome.members; - libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; gnome3 = self // { recurseForDerivations = false; }; @@ -166,8 +164,6 @@ lib.makeScope pkgs.newScope (self: with self; { ghex = callPackage ./apps/ghex { }; - glade = callPackage ./apps/glade { }; - gnome-books = callPackage ./apps/gnome-books { }; gnome-boxes = callPackage ./apps/gnome-boxes { }; @@ -354,9 +350,13 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) networkmanagerapplet; # added 2019-12-12 + inherit (pkgs) glade; # added 2020-05-15 + vino = throw "vino is deprecated, use gnome-remote-desktop instead."; # added 2020-03-13 gnome-screensaver = throw "gnome-screensaver is deprecated. If you are using GNOME Flashback, it now has a built-in lock screen. If you are using it elsewhere, you can try xscreenlock or other alternatives."; # added 2020-03-19 + maintainers = lib.teams.gnome.members; + mutter328 = throw "Removed as Pantheon is upgraded to mutter334."; }) diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index 4f5562bbffa50..efd36d4d4affe 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Software development studio"; - homepage = http://anjuta.org/; + homepage = "http://anjuta.org/"; license = licenses.gpl2; maintainers = with maintainers; []; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 1a6acbd461360..11bad7b89d1df 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "devhelp"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0gcakbq2fci6cf5z8lakydqnynasp74djfy53bh7jjmw0a9yry2c"; + sha256 = "0phcjdxnwgg0a0z9kyidp977jy365pny6bh2qhdyzcpvkqqq8nlb"; }; nativeBuildInputs = [ @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { description = "API documentation browser for GNOME"; homepage = "https://wiki.gnome.org/Apps/Devhelp"; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix index 81f63941729f7..3a53e592b5fc6 100644 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { buildInputs = [ intltool itstool libxml2 ]; meta = with stdenv.lib; { - homepage = https://github.com/GNOME/gnome-devel-docs; + homepage = "https://github.com/GNOME/gnome-devel-docs"; description = "Developer documentation for GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.fdl12; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix index db1741e72bb56..7bd31f587f675 100644 --- a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix +++ b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ]; + uuid = "arc-menu@linxgem33.com"; + meta = with stdenv.lib; { description = "Gnome shell extension designed to replace the standard menu found in Gnome 3"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix b/pkgs/desktops/gnome-3/extensions/battery-status/default.nix index b7bde83915c1e..44b3f04f79d68 100644 --- a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix +++ b/pkgs/desktops/gnome-3/extensions/battery-status/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; broken = true; # not compatable with latest GNOME maintainers = with maintainers; [ jonafato ]; - homepage = https://github.com/milliburn/gnome-shell-extension-battery_status; + homepage = "https://github.com/milliburn/gnome-shell-extension-battery_status"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index f04999a449c2e..5308d4bee5acb 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -1,29 +1,56 @@ -{stdenv, fetchurl, cmake, ninja, jq, python3, gnome3, wrapGAppsHook}: +{ stdenv +, fetchurl +, cmake +, ninja +, jq +, python3 +, gnome3 +, wrapGAppsHook +, gobject-introspection +}: let - version = "10.1"; - inherit (python3.pkgs) python pygobject3 requests; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "chrome-gnome-shell"; - inherit version; + version = "10.1"; src = fetchurl { url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${pname}-${version}.tar.xz"; sha256 = "0f54xyamm383ypbh0ndkza0pif6ljddg2f947p265fkqj3p4zban"; }; - nativeBuildInputs = [ cmake ninja jq wrapGAppsHook ]; - buildInputs = [ gnome3.gnome-shell python pygobject3 requests ]; + nativeBuildInputs = [ + cmake + ninja + jq + wrapGAppsHook + gobject-introspection # for setup-hook + ]; + + buildInputs = [ + gnome3.gnome-shell + python + pygobject3 + requests + gobject-introspection # for Gio typelib + ]; + + cmakeFlags = [ + "-DBUILD_EXTENSION=OFF" + ]; + + wrapPrefixVariables = [ + "PYTHONPATH" + ]; - preConfigure = '' - substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc" - ''; # cmake setup hook changes /etc/opt into /var/empty dontFixCmake = true; - cmakeFlags = [ "-DBUILD_EXTENSION=OFF" ]; - wrapPrefixVariables = [ "PYTHONPATH" ]; + preConfigure = '' + substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc" + ''; passthru = { updateScript = gnome3.updateScript { @@ -33,12 +60,12 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNOME Shell integration for Chrome"; - homepage = https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome; + homepage = "https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"; longDescription = '' To use the integration, install the <link xlink:href="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome/Installation">browser extension</link>, and then set <option>services.gnome3.chrome-gnome-shell.enable</option> to <literal>true</literal>. ''; license = licenses.gpl3; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix index 0faadbcd2b688..640903bfe4ed1 100644 --- a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix +++ b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-clipboard-indicator"; - version = "30"; + version = "34"; src = fetchFromGitHub { owner = "Tudmotu"; repo = "gnome-shell-extension-clipboard-indicator"; rev = "v${version}"; - sha256 = "1fmgmxv2y678bj0kmymkgnnglcpqk8ww053izlq46xg7s27jjdf6"; + sha256 = "0i00psc1ky70zljd14jzr627y7nd8xwnwrh4xpajl1f6djabh12s"; }; uuid = "clipboard-indicator@tudmotu.com"; @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ jonafato ]; platforms = platforms.linux; - homepage = https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator; + homepage = "https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix index 36404cf7b2949..5a546bd157944 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix @@ -1,27 +1,36 @@ -{ stdenv, fetchFromGitHub, glib, gettext }: +{ stdenv +, fetchFromGitHub +, glib +, gettext +}: stdenv.mkDerivation rec { pname = "gnome-shell-dash-to-dock-unstable"; - version = "2020-03-19"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "micheleg"; repo = "dash-to-dock"; # rev = "extensions.gnome.org-v" + version; - rev = "c58004802b2eedfde96966a4ec0151fea2a1bd98"; - sha256 = "IjunykPFP2CbGcd8XVqhPuNUOUOOgDAQFIytLaoyqRg="; + rev = "1788f31b049b622f78d0e65c56bef76169022ca9"; + sha256 = "M3tlRbQ1PjKvNrKNtg0+CBEtzLSFQYauXJXQojdkHuk="; }; nativeBuildInputs = [ - glib gettext + glib + gettext ]; - makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; + makeFlags = [ + "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" + ]; + + uuid = "dash-to-dock@micxgx.gmail.com"; meta = with stdenv.lib; { description = "A dock for the Gnome Shell"; + homepage = "https://micheleg.github.io/dash-to-dock/"; license = licenses.gpl2; - maintainers = with maintainers; [ eperuffo ]; - homepage = https://micheleg.github.io/dash-to-dock/; + maintainers = with maintainers; [ eperuffo jtojnar ]; }; } diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix index 84662505a374b..e97b34460d078 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; + uuid = "dash-to-panel@jderose9.github.com"; + meta = with stdenv.lib; { description = "An icon taskbar for Gnome Shell"; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index d7e599105111b..db113924ae607 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -73,9 +73,11 @@ stdenv.mkDerivation rec { done ''; + uuid = "gsconnect@andyholmes.github.io"; + meta = with stdenv.lib; { description = "KDE Connect implementation for Gnome Shell"; - homepage = https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki; + homepage = "https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki"; license = licenses.gpl2; maintainers = with maintainers; [ etu ]; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix index 8bfd681625f29..efaef03f3b111 100644 --- a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix +++ b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ jonafato ]; platforms = gnome3.gnome-shell.meta.platforms; - homepage = https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider; + homepage = "https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider"; broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/pkgs/desktops/gnome-3/extensions/impatience/default.nix b/pkgs/desktops/gnome-3/extensions/impatience/default.nix index 2f5c48a5a3259..230498f5d7bc1 100644 --- a/pkgs/desktops/gnome-3/extensions/impatience/default.nix +++ b/pkgs/desktops/gnome-3/extensions/impatience/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "Speed up builtin gnome-shell animations"; license = licenses.gpl3Plus; maintainers = with maintainers; [ timbertson tiramiseb ]; - homepage = http://gfxmonk.net/dist/0install/gnome-shell-impatience.xml; + homepage = "http://gfxmonk.net/dist/0install/gnome-shell-impatience.xml"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix index f9f72bd77f027..25ef7ddf82790 100644 --- a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix +++ b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix @@ -25,9 +25,11 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; + uuid = "no-title-bar@franglais125.gmail.com"; + meta = with stdenv.lib; { description = "Integrates maximized windows with the top panel"; - homepage = https://github.com/franglais125/no-title-bar; + homepage = "https://github.com/franglais125/no-title-bar"; license = licenses.gpl2; broken = true; # https://github.com/franglais125/no-title-bar/issues/114 maintainers = with maintainers; [ jonafato svsdep ]; diff --git a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix index cffe96894cc7f..e13941ee04553 100644 --- a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix +++ b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix @@ -21,8 +21,10 @@ stdenv.mkDerivation rec { mv *.js metadata.json dbus.xml schemas locale "$extensions_dir" ''; + uuid = "pidgin@muffinmad"; + meta = with stdenv.lib; { - homepage = https://github.com/muffinmad/pidgin-im-gnome-shell-extension; + homepage = "https://github.com/muffinmad/pidgin-im-gnome-shell-extension"; description = "Make Pidgin IM conversations appear in the Gnome Shell message tray"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix index fbbd56f1c0f9f..acb0e3624298f 100644 --- a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix +++ b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "Remove dropdown arrows from GNOME Shell Menus"; license = licenses.gpl3; maintainers = with maintainers; [ jonafato ]; - homepage = https://github.com/mpdeimos/gnome-shell-remove-dropdown-arrows; + homepage = "https://github.com/mpdeimos/gnome-shell-remove-dropdown-arrows"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index 4327f30c95b98..489a4c5587fa6 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "Display system informations in gnome shell status bar"; license = licenses.gpl3Plus; maintainers = with maintainers; [ tiramiseb ]; - homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet; + homepage = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet"; # 3.36 support not yet ready # https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/564 broken = stdenv.lib.versionAtLeast gnome3.gnome-shell.version "3.34"; diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix index 1e44cd4de5c2e..b4b690c3007c2 100644 --- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix +++ b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "GNOME Shell TaskWarrior GUI"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jonafato ]; - homepage = https://github.com/cinatic/taskwhisperer; + homepage = "https://github.com/cinatic/taskwhisperer"; broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesnt't support 3.34 }; } diff --git a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix b/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix index 22f857a7809d7..60ca1dcbef379 100644 --- a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix +++ b/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Tiling window management for GNOME Shell"; license = licenses.gpl2; maintainers = with maintainers; [ benley ]; - homepage = https://github.com/rliang/gnome-shell-extension-tilingnome; + homepage = "https://github.com/rliang/gnome-shell-extension-tilingnome"; platforms = gnome3.gnome-shell.meta.platforms; }; } diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome-3/extensions/timepp/default.nix index 04e98d51b0c4c..6ac9a4a0331e8 100644 --- a/pkgs/desktops/gnome-3/extensions/timepp/default.nix +++ b/pkgs/desktops/gnome-3/extensions/timepp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A todo.txt manager, time tracker, timer, stopwatch, pomodoro, and alarms gnome-shell extension."; - homepage = https://github.com/zagortenay333/timepp__gnome; + 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/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix index 22d58662e2bb2..860a77d2856b1 100644 --- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix +++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix @@ -17,11 +17,13 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ]; + uuid = "TopIcons@phocean.net"; + meta = with stdenv.lib; { description = "Brings all icons back to the top panel, so that it's easier to keep track of apps running in the backround"; license = licenses.gpl2; maintainers = with maintainers; [ eperuffo ]; - homepage = https://github.com/phocean/TopIcons-plus; + homepage = "https://github.com/phocean/TopIcons-plus"; # Unmaintained and no longer working with GNOME Shell 3.34+ broken = stdenv.lib.versionAtLeast gnome3.gnome-shell.version "3.32"; }; diff --git a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix index a278ec1d5e525..44402fc6e135d 100644 --- a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix +++ b/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "GNOME Shell extension showing a video preview on the corner of the screen"; license = licenses.mit; maintainers = with maintainers; [ jtojnar ]; - homepage = https://github.com/medenagan/window-corner-preview; + homepage = "https://github.com/medenagan/window-corner-preview"; broken = stdenv.lib.versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix b/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix new file mode 100644 index 0000000000000..15871e661c12d --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-window-is-ready-remover"; + version = "1.02"; + + src = fetchFromGitHub { + owner = "nunofarruca"; + repo = "WindowIsReady_Remover"; + rev = "v${version}"; + sha256 = "1xaf95gn0if44avvkjxyf8fl29y28idn9shnrks0m9k67jcwv8ns"; + }; + + uuid = "windowIsReady_Remover@nunofarruca@gmail.com"; + + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions/ + cp -r ${uuid} $out/share/gnome-shell/extensions/${uuid} + ''; + + meta = with stdenv.lib; { + description = "GNOME Shell extension removing window is ready notification"; + homepage = "https://github.com/nunofarruca/WindowIsReady_Remover"; + license = licenses.asl20; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix b/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix index b97b2c902baaa..adcaf3126f38a 100644 --- a/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix +++ b/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "Arrange workspaces in a two dimensional grid with workspace thumbnails"; license = licenses.gpl3Plus; maintainers = with maintainers; [ chkno ]; - homepage = https://github.com/mzur/gnome-shell-wsmatrix; + homepage = "https://github.com/mzur/gnome-shell-wsmatrix"; }; } diff --git a/pkgs/desktops/gnome-3/find-latest-version.py b/pkgs/desktops/gnome-3/find-latest-version.py index b0359f7996997..ad80af24bcb8a 100644 --- a/pkgs/desktops/gnome-3/find-latest-version.py +++ b/pkgs/desktops/gnome-3/find-latest-version.py @@ -1,10 +1,13 @@ import argparse +import math import json import requests import sys + def version_to_list(version): - return list(map(int, version.split('.'))) + return list(map(int, version.split("."))) + def odd_unstable(version_str, selected): version = version_to_list(version_str) @@ -14,47 +17,58 @@ def odd_unstable(version_str, selected): even = version[1] % 2 == 0 prerelease = (version[1] >= 90 and version[1] < 100) or (version[1] >= 900 and version[1] < 1000) stable = even and not prerelease - if selected == 'stable': + if selected == "stable": return stable else: return True + def no_policy(version, selected): return True + version_policies = { - 'odd-unstable': odd_unstable, - 'none': no_policy, + "odd-unstable": odd_unstable, + "none": no_policy, } -def make_version_policy(version_predicate, selected): - return lambda version: version_predicate(version, selected) -parser = argparse.ArgumentParser(description='Find latest version for a GNOME package by crawling their release server.') -parser.add_argument('package-name', help='Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.') -parser.add_argument('version-policy', help='Policy determining which versions are considered stable. For most GNOME packages, odd minor versions are unstable but there are exceptions.', choices=version_policies.keys(), nargs='?', default='odd-unstable') -parser.add_argument('requested-release', help='Most of the time, we will want to update to stable version but sometimes it is useful to test.', choices=['stable', 'unstable'], nargs='?', default='stable') +def make_version_policy(version_predicate, selected, upper_bound): + if not upper_bound: + upper_bound = [math.inf, math.inf] + else: + upper_bound = version_to_list(upper_bound) + + return lambda version: version_predicate(version, selected) and version_to_list(version) < upper_bound + + +parser = argparse.ArgumentParser(description="Find latest version for a GNOME package by crawling their release server.") +parser.add_argument("package-name", help="Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.") +parser.add_argument("version-policy", help="Policy determining which versions are considered stable. For most GNOME packages, odd minor versions are unstable but there are exceptions.", choices=version_policies.keys(), nargs="?", default="odd-unstable") +parser.add_argument("requested-release", help="Most of the time, we will want to update to stable version but sometimes it is useful to test.", choices=["stable", "unstable"], nargs="?", default="stable") +parser.add_argument("--upper-bound", dest="upper-bound", help="Only look for versions older than this one (useful for pinning dependencies).") -if __name__ == '__main__': +if __name__ == "__main__": args = parser.parse_args() - package_name = getattr(args, 'package-name') - requested_release = getattr(args, 'requested-release') - version_predicate = version_policies[getattr(args, 'version-policy')] - version_policy = make_version_policy(version_predicate, requested_release) + package_name = getattr(args, "package-name") + requested_release = getattr(args, "requested-release") + upper_bound = getattr(args, "upper-bound") + version_predicate = version_policies[getattr(args, "version-policy")] + version_policy = make_version_policy(version_predicate, requested_release, upper_bound) # The structure of cache.json: https://gitlab.gnome.org/Infrastructure/sysadmin-bin/blob/master/ftpadmin#L762 - cache = json.loads(requests.get('https://ftp.gnome.org/pub/GNOME/sources/{}/cache.json'.format(package_name)).text) + cache = json.loads(requests.get(f"https://ftp.gnome.org/pub/GNOME/sources/{package_name}/cache.json").text) if type(cache) != list or cache[0] != 4: - print('Unknown format of cache.json file.', file=sys.stderr) + print("Unknown format of cache.json file.", file=sys.stderr) sys.exit(1) versions = cache[2][package_name] versions = sorted(filter(version_policy, versions), key=version_to_list) if len(versions) == 0: - print('No versions matched.', file=sys.stderr) + print("No versions matched.", file=sys.stderr) sys.exit(1) print(versions[-1]) diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix index 474c49fb58411..e4de15c79b292 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Aisleriot; + homepage = "https://wiki.gnome.org/Apps/Aisleriot"; description = "A collection of patience games written in guile scheme"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix index ec9895b3bf556..28cc020b2d805 100644 --- a/pkgs/desktops/gnome-3/games/atomix/default.nix +++ b/pkgs/desktops/gnome-3/games/atomix/default.nix @@ -29,9 +29,9 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Puzzle game where you move atoms to build a molecule"; - homepage = https://wiki.gnome.org/Apps/Atomix; + homepage = "https://wiki.gnome.org/Apps/Atomix"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix index 9bb1286c8d929..ca69395eb2359 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Five_or_more"; description = "Remove colored balls from the board by forming lines"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index d047db68ef59e..1523da990e37e 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "four-in-a-row"; - version = "3.36.0"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1bl63npcbr5ymka2y06wps612qynxa4hsqlzn7bvwpz2v53pai1z"; + sha256 = "1pjwaly0f36gn8ashf19b6w1yldmqpa8grdxcyb6h7b0k3bd54z6"; }; nativeBuildInputs = [ @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Four-in-a-row; + homepage = "https://wiki.gnome.org/Apps/Four-in-a-row"; description = "Make lines of the same color to win"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index c67d8fa8ffef3..21348370579d5 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Chess; + homepage = "https://wiki.gnome.org/Apps/Chess"; description = "Play the classic two-player boardgame of chess"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index 62fc7bf8d67d8..ac15ebadce92e 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-klotski"; - version = "3.36.0"; + version = "3.36.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "06gsg3s8hyhhsk11f1ld2anzv1czg1429483gbv9lr2p7fnq7pyy"; + sha256 = "1w7fp79hc2v98r7ffg57d6na3wwr355gg9jrdd7w2ad362dfg1kw"; }; nativeBuildInputs = [ @@ -34,9 +34,9 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Klotski; + homepage = "https://wiki.gnome.org/Apps/Klotski"; description = "Slide blocks to solve the puzzle"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index 1a04b90c09e29..fc706b89f1dc9 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-mahjongg"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1a5h55amr0pab36y2iqm6ynv6mmb8al1b92rfk18wzfcfz7mhxzd"; + sha256 = "15xfp2acqdnn0pcwg5d77dpv758jjyclwb042wm12gg07rbg3s6j"; }; passthru = { @@ -32,9 +32,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Mahjongg; + homepage = "https://wiki.gnome.org/Apps/Mahjongg"; description = "Disassemble a pile of tiles by removing matching pairs"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index 00b4d15b4429a..f49634c6ada09 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Mines; + homepage = "https://wiki.gnome.org/Apps/Mines"; description = "Clear hidden mines from a minefield"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 1600ddc9e8a85..9dcc8744d2e2b 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Guide a worm around a maze"; - homepage = https://wiki.gnome.org/Apps/Nibbles; + homepage = "https://wiki.gnome.org/Apps/Nibbles"; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index c5565e92f1260..2ba6d4e7044c8 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Robots; + homepage = "https://wiki.gnome.org/Apps/Robots"; description = "Avoid the robots and make them crash into each other"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index efeecf04aaeb0..0a84e1065f3aa 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Sudoku; + homepage = "https://wiki.gnome.org/Apps/Sudoku"; description = "Test your logic skills in this number grid puzzle"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index 9ac0cf88b6ea6..ad549a7c68299 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-taquin"; - version = "3.36.0"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16ss2d8s6glb3k0wnb5ihmbqvk9i1yi18wv9hzgxfyhs1rvk496f"; + sha256 = "0pi8kxici7p3jys8673ib0kigpif4mfkq0zlq48rsibhdqfhrlij"; }; passthru = { @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Taquin; + homepage = "https://wiki.gnome.org/Apps/Taquin"; description = "Move tiles so that they reach their places"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index de81e76d3cd44..7061610ced1e0 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-tetravex"; - version = "3.36.0"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1xbd0flh77v3x0dh4dsfspykwb6rwvga7kqwn1fq7gk421mq6n52"; + sha256 = "0qf6s3gl5qrs5rwsgx0191b0xyknhz2n9whx5i6ma5yw5ikslmq4"; }; passthru = { @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Tetravex; + homepage = "https://wiki.gnome.org/Apps/Tetravex"; description = "Complete the puzzle by matching numbered tiles"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index fa82365d166df..8d1c9e3dd65b7 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -57,9 +57,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Hitori; + homepage = "https://wiki.gnome.org/Apps/Hitori"; description = "GTK application to generate and let you play games of Hitori"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index cf4e8595f96b7..c3df9bd1099d9 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "iagno"; - version = "3.36.0"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ysb021mf5sy1ywicys35rn5c9v355rffjrlhxmr3z6yplrljm5b"; + sha256 = "0hgn2iqvnfiiwm57bir28dz61b1kkp1zh6av8f342q153rxx10g6"; }; nativeBuildInputs = [ @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Iagno; + homepage = "https://wiki.gnome.org/Apps/Iagno"; description = "Computer version of the game Reversi, more popularly called Othello"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index 3d0c3f72396b0..fd44bbece9963 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Lightsoff; + homepage = "https://wiki.gnome.org/Apps/Lightsoff"; description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index 34dc18968dabe..a4c139f0671c9 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "quadrapassel"; - version = "3.36.00"; + version = "3.36.02"; src = fetchurl { url = "mirror://gnome/sources/quadrapassel/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1xk9x1pp71armj47vxja7fsj6gs116kcjkd8xgwf8wi4zr4kgx7g"; + sha256 = "0c80pzipxricyh4wydffsc94wj6ymnanqr9bg6wdx51hz1mmmilb"; }; nativeBuildInputs = [ @@ -32,9 +32,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Classic falling-block game, Tetris"; - homepage = https://wiki.gnome.org/Apps/Quadrapassel; + homepage = "https://wiki.gnome.org/Apps/Quadrapassel"; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index 02a61d46c73d1..4b12609d3f3d9 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -28,9 +28,9 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Swell%20Foop; + homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; description = "Puzzle game, previously known as Same GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index 39b98663b4ef8..62df1cd1e3da9 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Tali; + homepage = "https://wiki.gnome.org/Apps/Tali"; description = "Sort of poker with dice and less money"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index afb406ae861c1..0326e38aba766 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "geary"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07rhmzznfa4asx5gbmvnfpybd5czy7xmzk75xrk4r1qcnr24ml03"; + sha256 = "09l2lbcn3ar3scw6iylmdqi1lhpb408iqs6056d0wzx2l9nkmqis"; }; nativeBuildInputs = [ @@ -78,9 +78,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Geary; + homepage = "https://wiki.gnome.org/Apps/Geary"; description = "Mail client for GNOME 3"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index d5617ee493d3e..c4849f00d3b94 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Gitg; + homepage = "https://wiki.gnome.org/Apps/Gitg"; description = "GNOME GUI client to view git repositories"; maintainers = with maintainers; [ domenkozar ]; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix index 50d0372d66282..ef87571e038b6 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -24,13 +24,13 @@ let pname = "gnome-applets"; - version = "3.36.2"; + version = "3.36.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1hlblnajjkvlcd45lxfdxscx7j51nwyvri5jci6ylgpaxlwwm1s8"; + sha256 = "02jwh5yxka2mnzdqnr55lfijplvscy97isv7lqx1zvsi2p7hy38m"; }; nativeBuildInputs = [ @@ -76,9 +76,9 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Applets for use with the GNOME panel"; - homepage = https://wiki.gnome.org/Projects/GnomeApplets; + homepage = "https://wiki.gnome.org/Projects/GnomeApplets"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix index 8f1d193a6d367..baa43bdedb3e5 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl21; description = "Library to integrate compressed files management with GNOME"; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index 123261330e903..cde21551a8a31 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -30,7 +30,7 @@ let pname = "gnome-flashback"; - version = "3.36.1"; + version = "3.36.3"; # From data/sessions/Makefile.am requiredComponentsCommon = [ @@ -61,7 +61,7 @@ let src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "16gknn5mj29i8svlncarj92qi0swdlziggxpg9rryqslsy896a2x"; + sha256 = "19y1a4kq6db6a19basss76l4rypiz0lwr32ajli1ra1d1yj9xfid"; }; # make .desktop Execs absolute @@ -189,9 +189,9 @@ let meta = with stdenv.lib; { description = "GNOME 2.x-like session for GNOME 3"; - homepage = https://wiki.gnome.org/Projects/GnomeFlashback; + homepage = "https://wiki.gnome.org/Projects/GnomeFlashback"; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index ce6d943c39faa..63a6512588232 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.freedesktop.org/software/PackageKit/; + homepage = "https://www.freedesktop.org/software/PackageKit/"; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; description = "Tools for installing software on the GNOME desktop using PackageKit"; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix index a69331f2e8b69..d390a5b27a288 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix @@ -91,9 +91,9 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Component of Gnome Flashback that provides panels and default applets for the desktop"; - homepage = https://wiki.gnome.org/Projects/GnomePanel; + homepage = "https://wiki.gnome.org/Projects/GnomePanel"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index f40911577c118..0271992b6407d 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -45,9 +45,9 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool; + homepage = "https://wiki.gnome.org/action/show/Apps/GnomeTweakTool"; description = "A tool to customize advanced GNOME 3 options"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index 1ee9e5b933b6e..b6a88e5864b4c 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -5,7 +5,6 @@ , clutter , gjs , glib -, gnome3 , gobject-introspection , gtk3 , meson @@ -77,6 +76,6 @@ stdenv.mkDerivation rec { description = "Clipboard management system with GNOME 3 integration"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix index a607a6eb6a078..9550de32fbeaa 100644 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix index a1f4a74275470..1f9afefd2e486 100644 --- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix @@ -28,9 +28,9 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small library intended for internal use by GNOME Games, but it may be used by others"; - homepage = https://wiki.gnome.org/Apps/Games; + homepage = "https://wiki.gnome.org/Apps/Games"; license = licenses.lgpl3; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix index 347b936e757ca..e62c6fe7fee3a 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -62,9 +62,9 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Window manager used in Gnome Flashback"; - homepage = https://wiki.gnome.org/Projects/Metacity; + homepage = "https://wiki.gnome.org/Projects/Metacity"; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix index 4c2a551b1c739..e8c523277e182 100644 --- a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix +++ b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix @@ -54,9 +54,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Python bindings for the Nautilus Extension API"; - homepage = https://wiki.gnome.org/Projects/NautilusPython; + homepage = "https://wiki.gnome.org/Projects/NautilusPython"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index 1dbd9ce5bfeba..b9489526dd710 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-pomodoro"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "codito"; repo = "gnome-pomodoro"; rev = version; - sha256 = "1bjsjkbms9irn7nkzi0hmgr5vwcgh9xzr5vw4sk2n711wj5d96bi"; + sha256 = "0s9wzx7wbynpqgj7nlgs5wwx4w2akz7nli89sy7pxcn4xpnahqgn"; }; nativeBuildInputs = [ @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://gnomepomodoro.org/; + homepage = "https://gnomepomodoro.org/"; description = "Time management utility for GNOME based on the pomodoro technique"; longDescription = '' This GNOME utility helps to manage time according to Pomodoro Technique. diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome-3/update.nix index f42b67239505a..1bceddf77eb5b 100644 --- a/pkgs/desktops/gnome-3/update.nix +++ b/pkgs/desktops/gnome-3/update.nix @@ -1,8 +1,18 @@ -{ stdenv, lib, writeScript, python3, common-updater-scripts }: -{ packageName, attrPath ? packageName, versionPolicy ? "odd-unstable" }: +{ stdenv, pkgs, lib, writeScript, python3, common-updater-scripts }: +{ packageName, attrPath ? packageName, versionPolicy ? "odd-unstable", freeze ? false }: let python = python3.withPackages (p: [ p.requests ]); + upperBoundFlag = + let + package = lib.attrByPath (lib.splitString "." attrPath) (throw "Cannot find attribute ‘${attrPath}’.") pkgs; + packageVersion = lib.getVersion package; + versionComponents = lib.versions.splitVersion packageVersion; + minorVersion = lib.versions.minor packageVersion; + minorAvailable = builtins.length versionComponents > 1 && builtins.match "[0-9]+" minorVersion != null; + nextMinor = builtins.fromJSON minorVersion + 1; + upperBound = "${lib.versions.major packageVersion}.${builtins.toString nextMinor}"; + in lib.optionalString (freeze && minorAvailable) ''--upper-bound="${upperBound}"''; updateScript = writeScript "gnome-update-script" '' #!${stdenv.shell} set -o errexit @@ -10,7 +20,7 @@ let attr_path="$2" version_policy="$3" PATH=${lib.makeBinPath [ common-updater-scripts python ]} - latest_tag=$(python "${./find-latest-version.py}" "$package_name" "$version_policy" "stable") + latest_tag=$(python "${./find-latest-version.py}" "$package_name" "$version_policy" "stable" ${upperBoundFlag}) update-source-version "$attr_path" "$latest_tag" ''; in [ updateScript packageName attrPath versionPolicy ] diff --git a/pkgs/desktops/gnustep/libobjc2/default.nix b/pkgs/desktops/gnustep/libobjc2/default.nix index b058bd87989de..0124e91a9b7ce 100644 --- a/pkgs/desktops/gnustep/libobjc2/default.nix +++ b/pkgs/desktops/gnustep/libobjc2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libobjc2"; - version = "2.0"; + version = "1.9"; src = fetchFromGitHub { owner = "gnustep"; repo = "libobjc2"; rev = "v${version}"; - sha256 = "1b4h0a4pqr8j6300qr2wmi33r7ysvp705gs0ypx69hbmifln0mlf"; + sha256 = "00pscl3ly3rv6alf9vk70kxnnxq2rfgpc1ylcv6cgjs9jxdnrqmn"; }; nativeBuildInputs = [ cmake ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Objective-C runtime for use with GNUstep"; - homepage = http://gnustep.org/; + homepage = "http://gnustep.org/"; license = licenses.mit; maintainers = with maintainers; [ ashalkhakov matthewbauer ]; platforms = platforms.unix; diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix index 64e9332a3066b..9b8692f0da5f7 100644 --- a/pkgs/desktops/gnustep/make/default.nix +++ b/pkgs/desktops/gnustep/make/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; meta = { description = "A build manager for GNUstep"; - homepage = http://gnustep.org/; + homepage = "http://gnustep.org/"; license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ ashalkhakov matthewbauer ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix index 7bb287c3fa598..580fbdc5d8845 100644 --- a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix +++ b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (args // { GNUSTEP_MAKEFILES = "${make}/share/GNUstep/Makefiles"; meta = { - homepage = http://gnustep.org/; + homepage = "http://gnustep.org/"; license = stdenv.lib.licenses.lgpl2Plus; diff --git a/pkgs/desktops/lumina/lumina-calculator/default.nix b/pkgs/desktops/lumina/lumina-calculator/default.nix index 70e0f2e3511c0..7451fa3facf5f 100644 --- a/pkgs/desktops/lumina/lumina-calculator/default.nix +++ b/pkgs/desktops/lumina/lumina-calculator/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qttools }: +{ stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lumina-calculator"; - version = "2019-04-27"; + version = "1.6.0"; src = fetchFromGitHub { owner = "lumina-desktop"; repo = pname; - rev = "ccb792fc713aa7163fffd37fc20c83ffe9ca7523"; - sha256 = "0cdyz94znycsc3qxg5bmg51bwms7586d4ja1bsmj8cb9pd3lv980"; + rev = "v${version}"; + sha256 = "1238d1m0mjkwkdpgq165a4ql9aql0aji5f41rzdzny6m7ws9nm2y"; }; sourceRoot = "source/src-qt5"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Scientific calculator for the Lumina Desktop"; - homepage = https://github.com/lumina-desktop/lumina-calculator; + homepage = "https://github.com/lumina-desktop/lumina-calculator"; license = licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/lumina/lumina-pdf/default.nix b/pkgs/desktops/lumina/lumina-pdf/default.nix index 62d59d18cc551..b4e5039af1fe8 100644 --- a/pkgs/desktops/lumina/lumina-pdf/default.nix +++ b/pkgs/desktops/lumina/lumina-pdf/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, poppler }: +{ stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools, poppler }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lumina-pdf"; - version = "2019-04-27"; + version = "1.6.0"; src = fetchFromGitHub { owner = "lumina-desktop"; repo = pname; - rev = "645ed591ef91c3607d3ab87dd86f7acfd08b05c9"; - sha256 = "0gl943jb9c9rcgb5wksx3946hwlifghfd27r97skm9is8ih6k0vn"; + rev = "v${version}"; + sha256 = "08caj4nashp79fbvj94rabn0iaa1hymifqmb782x03nb2vkn38r6"; }; sourceRoot = "source/src-qt5"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PDF viewer for the Lumina Desktop"; - homepage = https://github.com/lumina-desktop/lumina-pdf; + homepage = "https://github.com/lumina-desktop/lumina-pdf"; license = licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix index c758fc38a1b95..fb5a0cbea5c1c 100644 --- a/pkgs/desktops/lumina/lumina/default.nix +++ b/pkgs/desktops/lumina/lumina/default.nix @@ -1,4 +1,5 @@ { stdenv, + mkDerivation, fetchFromGitHub, desktop-file-utils, fluxbox, @@ -14,15 +15,15 @@ wrapGAppsHook }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lumina"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "lumina-desktop"; repo = pname; rev = "v${version}"; - sha256 = "0rj2gzifr98db7i82cg3hg7l5yfik810pjpawg6n54qbzq987z25"; + sha256 = "0bvs12c9pkc6fnkfcr7rrxc8jfbzbslch4nlfjrzwi203fcv4avw"; }; nativeBuildInputs = [ @@ -81,7 +82,7 @@ stdenv.mkDerivation rec { that is designed for use on any Unix-like operating system. It is based on QT5. ''; - homepage = https://lumina-desktop.org; + homepage = "https://lumina-desktop.org"; license = licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix index c06a99eb36c27..ea64b75214f61 100644 --- a/pkgs/desktops/lxde/core/lxappearance/default.nix +++ b/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight program for configuring the theme and fonts of gtk applications"; - homepage = https://lxde.org/; + homepage = "https://lxde.org/"; maintainers = [ stdenv.lib.maintainers.hinton ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix index 550e98c9dcc86..572d86b652ee7 100644 --- a/pkgs/desktops/lxde/core/lxmenu-data.nix +++ b/pkgs/desktops/lxde/core/lxmenu-data.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool ]; meta = { - homepage = https://lxde.org/; + homepage = "https://lxde.org/"; license = stdenv.lib.licenses.gpl2; description = "Freedesktop.org desktop menus for LXDE"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index a24a33c2e76ba..20b5a35fc3090 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight X11 desktop panel for LXDE"; - homepage = https://lxde.org/; + homepage = "https://lxde.org/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.ryneeverett ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/lxde/core/lxrandr/default.nix b/pkgs/desktops/lxde/core/lxrandr/default.nix index 0866fd104d23c..421c999ea2f94 100644 --- a/pkgs/desktops/lxde/core/lxrandr/default.nix +++ b/pkgs/desktops/lxde/core/lxrandr/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LXRandR is the standard screen manager of LXDE."; - homepage = https://lxde.org/; + homepage = "https://lxde.org/"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ rawkode ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix index 0646078d82571..2bb281494bd75 100644 --- a/pkgs/desktops/lxde/core/lxtask/default.nix +++ b/pkgs/desktops/lxde/core/lxtask/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { Desktop Environment, it's totally desktop independent and only requires pure GTK. ''; - homepage = https://wiki.lxde.org/en/LXTask; + homepage = "https://wiki.lxde.org/en/LXTask"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index e639996f7c6aa..b41d766c1adf2 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -1,15 +1,23 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt, - libconfig }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, qtbase +, qttools +, lxqt +, libconfig +}: mkDerivation rec { pname = "compton-conf"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0bx21r83ahmsqf7bm1h17pi4y9js1iqsv7nwnlq58rc0ddkkhcdb"; + sha256 = "1wqnajarkrpmc60jr1zw5w39lvlf9ii4ri9wgyn55hh1rkbzi7py"; }; nativeBuildInputs = [ @@ -27,11 +35,13 @@ mkDerivation rec { preConfigure = '' substituteInPlace autostart/CMakeLists.txt \ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ - ''; + ''; + + passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; }; meta = with lib; { description = "GUI configuration tool for compton X composite manager"; - homepage = https://github.com/lxqt/compton-conf; + homepage = "https://github.com/lxqt/compton-conf"; license = licenses.lgpl21; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 6b03c2a6c9e8b..45714260381b4 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -1,48 +1,55 @@ { pkgs, makeScope, libsForQt5 }: - let packages = self: with self; { + # Update script tailored to LXQt packages from git repository + lxqtUpdateScript = { pname, version, src }: + pkgs.genericUpdater { + inherit pname version; + attrPath = "lxqt.${pname}"; + versionLister = "${pkgs.common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + }; + # For compiling information, see: # - https://github.com/lxqt/lxqt/wiki/Building-from-source ### BASE - libqtxdg = callPackage ./libqtxdg { }; - lxqt-build-tools = callPackage ./lxqt-build-tools { }; - libsysstat = callPackage ./libsysstat { }; - liblxqt = callPackage ./liblxqt { }; + libqtxdg = callPackage ./libqtxdg {}; + lxqt-build-tools = callPackage ./lxqt-build-tools {}; + libsysstat = callPackage ./libsysstat {}; + liblxqt = callPackage ./liblxqt {}; ### CORE 1 - libfm-qt = callPackage ./libfm-qt { }; - lxqt-about = callPackage ./lxqt-about { }; - lxqt-admin = callPackage ./lxqt-admin { }; - lxqt-config = callPackage ./lxqt-config { }; - lxqt-globalkeys = callPackage ./lxqt-globalkeys { }; - lxqt-notificationd = callPackage ./lxqt-notificationd { }; - lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass { }; - lxqt-policykit = callPackage ./lxqt-policykit { }; - lxqt-powermanagement = callPackage ./lxqt-powermanagement { }; - lxqt-qtplugin = callPackage ./lxqt-qtplugin { }; - lxqt-session = callPackage ./lxqt-session { }; - lxqt-sudo = callPackage ./lxqt-sudo { }; - lxqt-themes = callPackage ./lxqt-themes { }; - pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt { }; - qtermwidget = callPackage ./qtermwidget { }; + libfm-qt = callPackage ./libfm-qt {}; + lxqt-about = callPackage ./lxqt-about {}; + lxqt-admin = callPackage ./lxqt-admin {}; + lxqt-config = callPackage ./lxqt-config {}; + lxqt-globalkeys = callPackage ./lxqt-globalkeys {}; + lxqt-notificationd = callPackage ./lxqt-notificationd {}; + lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass {}; + lxqt-policykit = callPackage ./lxqt-policykit {}; + lxqt-powermanagement = callPackage ./lxqt-powermanagement {}; + lxqt-qtplugin = callPackage ./lxqt-qtplugin {}; + lxqt-session = callPackage ./lxqt-session {}; + lxqt-sudo = callPackage ./lxqt-sudo {}; + lxqt-themes = callPackage ./lxqt-themes {}; + pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt {}; + qtermwidget = callPackage ./qtermwidget {}; ### CORE 2 - lxqt-panel = callPackage ./lxqt-panel { }; - lxqt-runner = callPackage ./lxqt-runner { }; - pcmanfm-qt = callPackage ./pcmanfm-qt { }; + lxqt-panel = callPackage ./lxqt-panel {}; + lxqt-runner = callPackage ./lxqt-runner {}; + pcmanfm-qt = callPackage ./pcmanfm-qt {}; ### OPTIONAL - qterminal = callPackage ./qterminal { }; - compton-conf = pkgs.qt5.callPackage ./compton-conf { }; - obconf-qt = callPackage ./obconf-qt { }; - lximage-qt = callPackage ./lximage-qt { }; - qps = callPackage ./qps { }; - screengrab = callPackage ./screengrab { }; - qlipper = callPackage ./qlipper { }; - lxqt-archiver = callPackage ./lxqt-archiver { }; + qterminal = callPackage ./qterminal {}; + compton-conf = pkgs.qt5.callPackage ./compton-conf {}; + obconf-qt = callPackage ./obconf-qt {}; + lximage-qt = callPackage ./lximage-qt {}; + qps = callPackage ./qps {}; + screengrab = callPackage ./screengrab {}; + qlipper = callPackage ./qlipper {}; + lxqt-archiver = callPackage ./lxqt-archiver {}; preRequisitePackages = [ pkgs.gvfs # virtual file systems support for PCManFM-QT @@ -107,5 +114,5 @@ let ]; }; - -in makeScope libsForQt5.newScope packages +in +makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index 39cece7724eb4..fc97906ab7d2f 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -1,18 +1,28 @@ -{ - lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, - pcre, libexif, xorg, libfm, menu-cache, - qtx11extras, qttools +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, pcre +, libexif +, xorg +, libfm +, menu-cache +, qtx11extras +, qttools +, lxqtUpdateScript }: mkDerivation rec { - pname = "libfm-qt-unstable"; - version = "2019-09-22"; + pname = "libfm-qt"; + version = "0.15.1"; src = fetchFromGitHub { owner = "lxqt"; repo = "libfm-qt"; - rev = "7c94e9efb996df0602f1f2b34b0216ba9b6df498"; - sha256 = "1fnli2kh7n4hxmqwcb1n06lyk67d9a2fx6z70gas5jzym7r2h5vw"; + rev = version; + sha256 = "1gjxml6c9m3xn094zbr9835sr4749dpxk4nc0ap9lg27qim63gx3"; }; nativeBuildInputs = [ @@ -33,9 +43,11 @@ mkDerivation rec { menu-cache ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Core library of PCManFM-Qt (Qt binding for libfm)"; - homepage = https://github.com/lxqt/libfm-qt; + homepage = "https://github.com/lxqt/libfm-qt"; license = licenses.lgpl21; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index f5ab9c9ae8e7d..e72593548cc0f 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -1,15 +1,27 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, - qttools, qtsvg, libqtxdg, polkit-qt, kwindowsystem, xorg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtx11extras +, qttools +, qtsvg +, libqtxdg +, polkit-qt +, kwindowsystem +, xorg +, lxqtUpdateScript +}: mkDerivation rec { pname = "liblxqt"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0g2502lcws5j74p82qhfryz9n51cvi85hb50r5s227xhkv91q65k"; + sha256 = "1dqxsz8fy6xyzbkxhsymmr71yw4d5dwjgqd4rdjn0r9gk8ajrfzp"; }; nativeBuildInputs = [ @@ -31,9 +43,11 @@ mkDerivation rec { sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt ''; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Core utility library for all LXQt components"; - homepage = https://github.com/lxqt/liblxqt; + homepage = "https://github.com/lxqt/liblxqt"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 5f7485fc63b37..f5da7a4b2356d 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -1,31 +1,47 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtsvg, lxqt-build-tools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qtbase +, qtsvg +, lxqt-build-tools +, lxqtUpdateScript +}: mkDerivation rec { pname = "libqtxdg"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "16jqnpc740a6phq7vcgy85hl7253yzyw4m5h71r0vijk79ir73b5"; + sha256 = "00dzs6zc8prc0mxmvq0pmpy1qi8rysg97as7jfd0ndk5jii0nd85"; }; - nativeBuildInputs = [ cmake lxqt-build-tools ]; + nativeBuildInputs = [ + cmake + lxqt-build-tools + ]; - buildInputs = [ qtbase qtsvg ]; + buildInputs = [ + qtbase + qtsvg + ]; preConfigure = '' cmakeFlagsArray+=( - "-DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix" + "-DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix/iconengines" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_LIBDIR=lib" ) ''; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Qt implementation of freedesktop.org xdg specs"; - homepage = https://github.com/lxqt/libqtxdg; + homepage = "https://github.com/lxqt/libqtxdg"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix index dc2ce54d6ae6d..642b57fe0d75e 100644 --- a/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/libsysstat/default.nix @@ -1,23 +1,37 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, lxqt-build-tools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qtbase +, lxqt-build-tools +, lxqtUpdateScript +}: mkDerivation rec { pname = "libsysstat"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "10h9n7km7yx8bnmzxi4nn1yqq03hizjkrx4745j0mczy7niiffsz"; + sha256 = "1dlshyv7pd7gwl55rd3msppjdpz2pwp5f4da9a9wapg7kiskqahf"; }; - nativeBuildInputs = [ cmake lxqt-build-tools ]; + nativeBuildInputs = [ + cmake + lxqt-build-tools + ]; - buildInputs = [ qtbase ]; + buildInputs = [ + qtbase + ]; + + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { description = "Library used to query system info and statistics"; - homepage = https://github.com/lxqt/libsysstat; + homepage = "https://github.com/lxqt/libsysstat"; license = licenses.lgpl21Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index 33e6a1f99e5c7..22ce26526acb8 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -1,15 +1,28 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, - qtx11extras, qtsvg, xorg, lxqt-build-tools, libfm-qt, libexif }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, qtbase +, qttools +, qtx11extras +, qtsvg +, xorg +, lxqt-build-tools +, libfm-qt +, libexif +, lxqtUpdateScript +}: mkDerivation rec { pname = "lximage-qt"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "175l2w5w6iag01v05jq90pxx0al24wpw3mgsbcgqhl4z6h860r32"; + sha256 = "1pz0ird5vyrz1xycfn2vqh628f2mzwrx0psnp4hqdmj1xk9bjkbp"; }; nativeBuildInputs = [ @@ -29,9 +42,11 @@ mkDerivation rec { libexif ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "The image viewer and screenshot tool for lxqt"; - homepage = https://github.com/lxqt/lximage-qt; + homepage = "https://github.com/lxqt/lximage-qt"; license = licenses.gpl2; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index 5fa074120ff77..01365129467d4 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -1,14 +1,26 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtx11extras +, qttools +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-about"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0dj2rhbhnkzmv1iqqyq0bcp03imwnvxdr7rnpqnrs9kkjacm8zvr"; + sha256 = "0bgwh9jbvpnsdcij0bfkgzg0pb0ljjalv65q4q0hlha430pmpv3x"; }; nativeBuildInputs = [ @@ -25,9 +37,11 @@ mkDerivation rec { libqtxdg ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Dialogue window providing information about LXQt and the system it's running on"; - homepage = https://github.com/lxqt/lxqt-about; + homepage = "https://github.com/lxqt/lxqt-about"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index 9f0b22bf6cc0f..21a637bc66935 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -1,14 +1,27 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit-qt }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtx11extras +, qttools +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +, polkit-qt +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-admin"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "121qj46app2bqdr24g5sz2mdjfd9w86wpgkwap46s0zgxm4li44i"; + sha256 = "16fbnlvla8lq6rkv5gpmkw2jj9h1wzd3jcf8sjrbns6ygyfdxx3a"; }; nativeBuildInputs = [ @@ -31,9 +44,11 @@ mkDerivation rec { -i lxqt-admin-user/CMakeLists.txt ''; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "LXQt system administration tool"; - homepage = https://github.com/lxqt/lxqt-admin; + homepage = "https://github.com/lxqt/lxqt-admin"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index 205ea2fd2016f..93e5ffec2a0a9 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -1,15 +1,26 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, json-glib, libfm-qt, qtbase, qttools, qtx11extras }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, json-glib +, libfm-qt +, qtbase +, qttools +, qtx11extras +, lxqtUpdateScript +}: mkDerivation rec { - # pname = "lxqt-archiver"; - pname = "lxqt-archiver-unstable"; - version = "2019-09-25"; + pname = "lxqt-archiver"; + version = "0.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-archiver"; - rev = "62501255434b2ba6a8fd043a5af13dc0df038a5b"; - sha256 = "1af58k68karmnay7xgngzlmcgkmvx6hay5m1xbl5id9hh16n20in"; + rev = version; + sha256 = "1cip2dbvxbdlx1axz5sn4mwigwvfxb1q14byn09crv71adyfprw5"; }; nativeBuildInputs = [ @@ -26,13 +37,13 @@ mkDerivation rec { qtx11extras ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - hardeningDisable = [ "format" ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Archive tool for the LXQt desktop environment"; - homepage = https://github.com/lxqt/lxqt-archiver/; + homepage = "https://github.com/lxqt/lxqt-archiver/"; license = licenses.gpl2; platforms = with platforms; unix; maintainers = with maintainers; [ jchw ]; diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 626c99fcf9c9e..92ce3c2fe5088 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -1,19 +1,36 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, glib }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, pcre +, qtbase +, glib +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-build-tools"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0i7m9s4g5rsw28vclc9nh0zcapx85cqfwxkx7rrw7wa12svy7pm2"; + sha256 = "18l1w9lyf3nyj05wjhaj4lclak6qydlhw9bqi6kxgr1bv8k709lf"; }; - nativeBuildInputs = [ cmake pkgconfig setupHook ]; + nativeBuildInputs = [ + cmake + pkgconfig + setupHook + ]; - buildInputs = [ qtbase glib pcre ]; + buildInputs = [ + qtbase + glib + pcre + ]; setupHook = ./setup-hook.sh; @@ -24,9 +41,11 @@ mkDerivation rec { cp ${./LXQtConfigVars.cmake} $out/share/cmake/lxqt-build-tools/modules/LXQtConfigVars.cmake ''; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Various packaging tools and scripts for LXQt applications"; - homepage = https://github.com/lxqt/lxqt-build-tools; + homepage = "https://github.com/lxqt/lxqt-build-tools"; license = licenses.lgpl21; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index d34c419ae661c..677b90b25c533 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -1,16 +1,30 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, - qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, - libqtxdg, xorg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, qtbase +, qtx11extras +, qttools +, qtsvg +, kwindowsystem +, libkscreen +, liblxqt +, libqtxdg +, xorg +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-config"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0x1k08587i2pakxlrj2n0l82r179sfywnzn2cphxiy89r5zpn7vi"; + sha256 = "1nqkc716rl4c0rad4vqlqadm6lljrhwpdflaa5k9lrdiingr0s7s"; }; nativeBuildInputs = [ @@ -41,9 +55,11 @@ mkDerivation rec { sed -i "/\''${XORG_LIBINPUT_INCLUDE_DIRS}/a ${xorg.xf86inputlibinput.dev}/include/xorg" lxqt-config-input/CMakeLists.txt ''; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Tools to configure LXQt and the underlying operating system"; - homepage = https://github.com/lxqt/lxqt-config; + homepage = "https://github.com/lxqt/lxqt-config"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index 9f844b4676b85..59e2096dea43a 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -1,14 +1,27 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qttools +, qtx11extras +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-globalkeys"; - version = "0.14.3"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1ij9abjnqbnkcb7qqk3x7y4amr6l7kkmwhdpc0x2qk4yikn5ijdg"; + sha256 = "09vib713zbmnwicijycl3n9q35l45lrcw129lf9z95s3ch81x1hm"; }; nativeBuildInputs = [ @@ -26,9 +39,11 @@ mkDerivation rec { libqtxdg ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "LXQt service for global keyboard shortcuts registration"; - homepage = https://github.com/lxqt/lxqt-globalkeys; + homepage = "https://github.com/lxqt/lxqt-globalkeys"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index af64f523d4855..43f9bf3193246 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -1,14 +1,27 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qttools +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +, qtx11extras +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-notificationd"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1ihaf2i361j2snyy6kg8ccpfnc8hppvacmxjqzb1lpyaf1ajd139"; + sha256 = "0vqk1rc4fn2s0ls6sl03vzsb16xczrxab4rzjim3azm4pwsxjd1k"; }; nativeBuildInputs = [ @@ -26,9 +39,11 @@ mkDerivation rec { qtx11extras ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "The LXQt notification daemon"; - homepage = https://github.com/lxqt/lxqt-notificationd; + homepage = "https://github.com/lxqt/lxqt-notificationd"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index 5f270b8efc9be..a164571800ac9 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -1,14 +1,27 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qttools +, qtsvg +, qtx11extras +, kwindowsystem +, liblxqt +, libqtxdg +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-openssh-askpass"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "04jmvhhlhhspwzj4hfq7fnaa3h7h02z3rlq8p55hzlzkvshqqh1q"; + sha256 = "056bj3ssp4vqapzqg3da3m95vi92043j7mv70lmpznxdwyjwgxc3"; }; nativeBuildInputs = [ @@ -26,9 +39,11 @@ mkDerivation rec { libqtxdg ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "GUI to query passwords on behalf of SSH agents"; - homepage = https://github.com/lxqt/lxqt-openssh-askpass; + homepage = "https://github.com/lxqt/lxqt-openssh-askpass"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index 8310ae95f0946..a0bdd9bfae611 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -1,21 +1,42 @@ -{ - lib, mkDerivation, fetchFromGitHub, - cmake, pkgconfig, lxqt-build-tools, - qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid, - kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat, - xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache, - lxmenu-data, pcre, libXdamage +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, alsaLib +, kguiaddons +, kwindowsystem +, libXdamage +, libdbusmenu +, liblxqt +, libpulseaudio +, libqtxdg +, libstatgrab +, libsysstat +, lm_sensors +, lxmenu-data +, lxqt-build-tools +, lxqt-globalkeys +, lxqtUpdateScript +, menu-cache +, pcre +, qtbase +, qtsvg +, qttools +, qtx11extras +, solid +, xorg }: mkDerivation rec { pname = "lxqt-panel"; - version = "0.14.1"; + version = "0.15.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1py3i7qgm6h2iwjwqfjml1rp06s7ls1d7z5i9iizsmfshdzkaq86"; + sha256 = "0f3sjzkria61nz342daxps2w57wnx6laq9iww8hha7rbi24yw2sd"; }; nativeBuildInputs = [ @@ -25,33 +46,35 @@ mkDerivation rec { ]; buildInputs = [ - qtbase - qttools - qtx11extras - qtsvg - libdbusmenu - kwindowsystem - solid + alsaLib kguiaddons + kwindowsystem + libXdamage + libdbusmenu liblxqt + libpulseaudio libqtxdg - lxqt-globalkeys - libsysstat - xorg.libpthreadstubs - xorg.libXdmcp libstatgrab + libsysstat lm_sensors - libpulseaudio - alsaLib - menu-cache lxmenu-data + lxqt-globalkeys + menu-cache pcre - libXdamage + qtbase + qtsvg + qttools + qtx11extras + solid + xorg.libXdmcp + xorg.libpthreadstubs ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "The LXQt desktop panel"; - homepage = https://github.com/lxqt/lxqt-panel; + homepage = "https://github.com/lxqt/lxqt-panel"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index a64d682bf1cd1..7575c805a31cf 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -1,18 +1,30 @@ -{ - lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, - qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt, - libqtxdg, pcre +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, qtbase +, qttools +, qtx11extras +, qtsvg +, polkit-qt +, kwindowsystem +, liblxqt +, libqtxdg +, pcre +, lxqtUpdateScript }: mkDerivation rec { pname = "lxqt-policykit"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0mh9jw09r0mk8xmgvmzk3yyfix0pzqya28rcx71fqjpbdv1sc44l"; + sha256 = "001zgjxgvzp7clfqr46sx8m3a7v38xxgxjqrpz01lxx18zik3d9h"; }; nativeBuildInputs = [ @@ -33,9 +45,11 @@ mkDerivation rec { pcre ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "The LXQt PolicyKit agent"; - homepage = https://github.com/lxqt/lxqt-policykit; + homepage = "https://github.com/lxqt/lxqt-policykit"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index d415cb618cca3..2b48a2a04b5a2 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -1,14 +1,29 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, solid, kidletime, liblxqt, libqtxdg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qttools +, qtx11extras +, qtsvg +, kwindowsystem +, solid +, kidletime +, liblxqt +, libqtxdg +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-powermanagement"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1nhp4a28bpczhwz8b8da355zsxr1qwmkrm3bwllwp39liw947clx"; + sha256 = "0gqxy4d05gibsvq27qdfwp5v19310l0ln4bvwaan6ailbyyya90f"; }; nativeBuildInputs = [ @@ -28,9 +43,11 @@ mkDerivation rec { libqtxdg ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Power management module for LXQt"; - homepage = https://github.com/lxqt/lxqt-powermanagement; + homepage = "https://github.com/lxqt/lxqt-powermanagement"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index a67efaee37a27..02a43b4a8c171 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -1,18 +1,27 @@ -{ - lib, mkDerivation, fetchFromGitHub, - cmake, lxqt-build-tools, - qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg, libfm-qt +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qtx11extras +, qttools +, qtsvg +, libdbusmenu +, libqtxdg +, libfm-qt +, lxqtUpdateScript }: mkDerivation rec { pname = "lxqt-qtplugin"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "16n50lxnya03zcviw65sy5dyg9dsrn64k91mrqfvraf6d90md4al"; + sha256 = "17x5jr78rbsf4pbvc4y3wwkpvsmynzkxy2ifvwhqyc2gmjspp8il"; }; nativeBuildInputs = [ @@ -35,9 +44,11 @@ mkDerivation rec { --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix" ''; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "LXQt Qt platform integration plugin"; - homepage = https://github.com/lxqt/lxqt-qtplugin; + homepage = "https://github.com/lxqt/lxqt-qtplugin"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index db05d80389172..8a27ef41610e0 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -1,15 +1,32 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-globalkeys, qtx11extras, -menu-cache, muparser, pcre }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, qtbase +, qttools +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +, lxqt-globalkeys +, qtx11extras +, menu-cache +, muparser +, pcre +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-runner"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "01a8ycpkzcbh85y4025pd3nbpnzxh98ll1xwz4ykz13yvm0l2n1w"; + sha256 = "1x6s4k27cvj2k51hwpcp3l686c2am504ckry4fm76h0mlnkffjm5"; }; nativeBuildInputs = [ @@ -32,9 +49,11 @@ mkDerivation rec { pcre ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Tool used to launch programs quickly by typing their names"; - homepage = https://github.com/lxqt/lxqt-runner; + homepage = "https://github.com/lxqt/lxqt-runner"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index 458a5080bcfa5..2e513b23988fa 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -1,14 +1,30 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, qtbase +, qttools +, qtsvg +, qtx11extras +, kwindowsystem +, liblxqt +, libqtxdg +, xorg +, xdg-user-dirs +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-session"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0s6b0lblb795zz1p7sy677c1iznhmdzc4vw3jkc2agmsrhm7if7s"; + sha256 = "0kbk13dpmr75yd905n30k51cl7srrxz31ma4kacx450qgr5rwawn"; }; nativeBuildInputs = [ @@ -30,9 +46,11 @@ mkDerivation rec { xdg-user-dirs ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "An alternative session manager ported from the original razor-session"; - homepage = https://github.com/lxqt/lxqt-session; + homepage = "https://github.com/lxqt/lxqt-session"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index c0e7443d3dd0a..5f8fbcd2a6a6a 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -1,14 +1,28 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg, sudo }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qttools +, qtx11extras +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +, sudo +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-sudo"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1my0wpic20493rdlabp9ghag1g3nhwafk2yklkgczlajmarakgpc"; + sha256 = "1j8pxqxb2c10hrfq34nfx75pc0cz6044j4w458nnxbgvl5b8cdcb"; }; nativeBuildInputs = [ @@ -27,9 +41,11 @@ mkDerivation rec { sudo ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "GUI frontend for sudo/su"; - homepage = https://github.com/lxqt/lxqt-sudo; + homepage = "https://github.com/lxqt/lxqt-sudo"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index f464818814045..4613017b8a96c 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -1,14 +1,20 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-themes"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "09dkcgnf3lmfly8v90p6wjlj5rin83pbailvvpx2jr8a48a8zb9f"; + sha256 = "1magzckhgrac2b5jm83hj3s8x4hyfnbh2v86lfa4c36whnfvsz29"; }; nativeBuildInputs = [ @@ -16,9 +22,11 @@ mkDerivation rec { lxqt-build-tools ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Themes, graphics and icons for LXQt"; - homepage = https://github.com/lxqt/lxqt-themes; + homepage = "https://github.com/lxqt/lxqt-themes"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index 1333d027fca4a..91baba60d8a6d 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -1,15 +1,27 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, qttools, - qtx11extras, xorg, lxqt-build-tools, openbox }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, pcre +, qtbase +, qttools +, qtx11extras +, xorg +, lxqt-build-tools +, openbox +, lxqtUpdateScript +}: mkDerivation rec { pname = "obconf-qt"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "15dizs072ylmld1lxwgqkvybqy8ms8zki5586xm305jnlmrkb4lq"; + sha256 = "13bah70k78kscrr01z7dwdzwhay8mz0f7gfsg2a6w113mgqkn7ib"; }; nativeBuildInputs = [ @@ -29,9 +41,11 @@ mkDerivation rec { openbox ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "The Qt port of obconf, the Openbox configuration tool"; - homepage = https://github.com/lxqt/obconf-qt; + homepage = "https://github.com/lxqt/obconf-qt"; license = licenses.gpl2; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index 7b7d7290320b7..24343d4237449 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -1,15 +1,25 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio, - pcre, qtbase, qttools, qtx11extras }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt +, libpulseaudio +, pcre +, qtbase +, qttools +, qtx11extras +}: mkDerivation rec { pname = "pavucontrol-qt"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "124dk41v8l5pv7afi1h7fgbhm8zj605yfd8b769sn7id2bqj7bis"; + sha256 = "0ppm79c6pkz2hvs1rri55d3s46j6r0vhiv634wzap9qshjb1j367"; }; nativeBuildInputs = [ @@ -26,9 +36,11 @@ mkDerivation rec { pcre ]; + passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "A Pulseaudio mixer in Qt (port of pavucontrol)"; - homepage = https://github.com/lxqt/pavucontrol-qt; + homepage = "https://github.com/lxqt/pavucontrol-qt"; license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index 168b7f35ad271..7465eefc3c32f 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -1,15 +1,27 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt, qtbase, qttools, - qtx11extras, libfm-qt, menu-cache, lxmenu-data }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt +, qtbase +, qttools +, qtx11extras +, libfm-qt +, menu-cache +, lxmenu-data +, lxqtUpdateScript +}: mkDerivation rec { pname = "pcmanfm-qt"; - version = "0.14.1"; + version = "0.15.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1zchxlbyiifing94mqwh45pp7z3ihldknqiaz0kanq1cnma1jj6k"; + sha256 = "12rzcv5n4s299c8787islkn4xcjb9bbrj12mxcd5ii91jq39aii4"; }; nativeBuildInputs = [ @@ -28,9 +40,11 @@ mkDerivation rec { lxmenu-data ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)"; - homepage = https://github.com/lxqt/pcmanfm-qt; + homepage = "https://github.com/lxqt/pcmanfm-qt"; license = licenses.gpl2; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix index df717debbae86..fca585c459314 100644 --- a/pkgs/desktops/lxqt/qlipper/default.nix +++ b/pkgs/desktops/lxqt/qlipper/default.nix @@ -1,23 +1,37 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qttools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qtbase +, qttools +, lxqtUpdateScript +}: mkDerivation rec { pname = "qlipper"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "pvanek"; repo = pname; rev = version; - sha256 = "0vlm4ab9isi7i2bimnyrk6083j2dfdrs14qj59vjcjri7mcwmf76"; + sha256 = "0zpkcqfylcfwvadp1bidcrr64d8ls5c7bdnkfqwjjd32sd35ly60"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; - buildInputs = [ qtbase qttools ]; + buildInputs = [ + qtbase + qttools + ]; + + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { description = "Cross-platform clipboard history applet"; - homepage = https://github.com/pvanek/qlipper; + homepage = "https://github.com/pvanek/qlipper"; license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index cb8e5b2569c54..7ef9db40f7c1e 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -1,26 +1,49 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtx11extras, qttools, - lxqt-build-tools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, kwindowsystem +, liblxqt +, libqtxdg +, lxqt-build-tools +, lxqtUpdateScript +, qtbase +, qttools +, qtx11extras +}: mkDerivation rec { pname = "qps"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "03rl59yk3b24j0y0k8dpdpb3yi4f1l642zn5pp5br3s2vwx1vzkg"; + sha256 = "0jg7sfhdm5xsahzcw8hc2vpp5p3sqzdqwp4my65nj85i7wzgxmva"; }; - nativeBuildInputs = [ cmake lxqt-build-tools ]; + nativeBuildInputs = [ + cmake + lxqt-build-tools + ]; - buildInputs = [ qtbase qtx11extras qttools ]; + buildInputs = [ + kwindowsystem + liblxqt + libqtxdg + qtbase + qttools + qtx11extras + ]; + + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { description = "Qt based process manager"; - homepage = https://github.com/lxqt/qps; + homepage = "https://github.com/lxqt/qps"; license = licenses.gpl2; - platforms = with platforms; linux; # does not build on darwin + platforms = with platforms; linux; # does not build on darwin maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index 10f525eb9e6cb..c7bcf6dad3bcf 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -1,15 +1,24 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtermwidget, - qtbase, qttools, qtx11extras }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtermwidget +, qtbase +, qttools +, qtx11extras +, lxqtUpdateScript +}: mkDerivation rec { pname = "qterminal"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0bq6lvns56caijdmjm05nsj9vg69v9x5vid24bfxasck6q8nw24w"; + sha256 = "1vna0fvdasrdx7l5zxaaxi1v9fy34g2qblgkdhpczxivnmmxm5a3"; }; nativeBuildInputs = [ @@ -24,9 +33,11 @@ mkDerivation rec { qtermwidget ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "A lightweight Qt-based terminal emulator"; - homepage = https://github.com/lxqt/qterminal; + homepage = "https://github.com/lxqt/qterminal"; license = licenses.gpl2; platforms = with platforms; unix; maintainers = with maintainers; [ romildo globin ]; diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index e61360f6a3b4f..fc3fb4a5db0eb 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -1,23 +1,39 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qttools, lxqt-build-tools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qtbase +, qttools +, lxqt-build-tools +, lxqtUpdateScript +}: mkDerivation rec { pname = "qtermwidget"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1pz8dwb86jpga4vfyn5v9n2s6dx3zh74yfp1kjsmsmhf878zs6lv"; + sha256 = "07wvcc650998yav9hr4hpm842j0iqdvls3mn9n2n4v8xvm7cii2m"; }; - nativeBuildInputs = [ cmake lxqt-build-tools ]; + nativeBuildInputs = [ + cmake + lxqt-build-tools + ]; - buildInputs = [ qtbase qttools ]; + buildInputs = [ + qtbase + qttools + ]; + + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { description = "A terminal emulator widget for Qt 5"; - homepage = https://github.com/lxqt/qtermwidget; + homepage = "https://github.com/lxqt/qtermwidget"; license = licenses.gpl2; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index 7eff539091fcc..6a2e14fa50d8f 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -1,14 +1,28 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg, autoPatchelfHook }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, qtbase +, qttools +, qtx11extras +, qtsvg +, kwindowsystem +, libqtxdg +, xorg +, autoPatchelfHook +, lxqtUpdateScript +}: mkDerivation rec { pname = "screengrab"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1syvdqq45dr8hwigl9ax1wxr33m8z23nh6xzzlqbflyyd93xzjmn"; + sha256 = "07wm9q0nkrvmyb12kvh0709qrwizlxgy6i5j2czhb4giljrpr4x6"; }; nativeBuildInputs = [ @@ -28,6 +42,8 @@ mkDerivation rec { xorg.libXdmcp ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Crossplatform tool for fast making screenshots"; homepage = "https://github.com/lxqt/screengrab"; diff --git a/pkgs/desktops/lxqt/update.sh b/pkgs/desktops/lxqt/update.sh deleted file mode 100755 index 47d3dfb3d5fe4..0000000000000 --- a/pkgs/desktops/lxqt/update.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p libarchive curl common-updater-scripts - -set -eu -o pipefail - -cd "$(dirname "${BASH_SOURCE[0]}")" -root=../../.. -export NIXPKGS_ALLOW_UNFREE=1 - -lxqt_version=0.14.1 -lxqtrepo=https://downloads.lxqt.org/${lxqt_version}.html - -version() { - (cd "$root" && nix-instantiate --eval --strict -A "$1.version" 2>/dev/null | tr -d '"') -} - -update_lxqt() { - local pname - local pversion - curl -sS ${lxqtrepo} | sed -rne 's|.*<a href=.*>(.+) (.+)</a><br>|\1 \2|p' | - while read pname pversion; do - local pversionold=$(version lxqt.$pname) - if [[ "$pversion" = "$pversionold" ]]; then - echo "nothing to do, $pname $pversion is current" - else - echo "$pname: $pversionold -> $pversion" - (cd "$root" - local pfile=$(EDITOR=echo nix edit -f. lxqt.$pname 2>/dev/null) - update-source-version lxqt.$pname "$pversion" - git add $pfile - git commit -m "lxqt.$pname: $pversionold -> $pversion" - ) - fi - echo - done - echo DONE -} - -update_lxqt diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 26d8f86985b9a..a429e1e66e3dd 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -11,11 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gtk3 ]; - buildInputs = [ mate.mate-icon-theme ]; - - propagatedBuildInputs = [ - hicolor-icon-theme - ]; + propagatedBuildInputs = [ mate.mate-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix deleted file mode 100644 index aaf9986fbb2d6..0000000000000 --- a/pkgs/desktops/maxx/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, autoPatchelfHook, gnused -, gcc, bash, gtk-engine-murrine, gtk_engines, librsvg - -, libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm -, libXinerama, libXdamage, libICE, libXtst, libXaw, fontconfig, pango, cairo, glib, libxml2, atk, gtk2 -, gdk-pixbuf, libGL, ncurses5 - -, dmidecode, pciutils, usbutils -}: - -stdenv.mkDerivation rec { - pname = "MaXX"; - version = "2.0.1"; - codename = "Indigo"; - - srcs = [ - (fetchurl { - url = "http://maxxdesktop.arcadedaydream.com/${codename}-Releases/Installers/MaXX-${codename}-${version}-x86_64.tar.gz"; - sha256 = "17hd3j8773kmvvhyf657in6zmhnw4mbvyn4r6dfip5bdaz66pj01"; - }) - ]; - - nativeBuildInputs = [ makeWrapper autoPatchelfHook gnused ]; - buildInputs = [ - stdenv.cc.cc libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm - libXinerama libXdamage libICE libXtst libXaw fontconfig pango cairo glib libxml2 atk gtk2 - gdk-pixbuf libGL ncurses5 - ]; - - buildPhase = '' - sed -i "s/\(LD_LIBRARY_PATH=.*\)$/\1:\$LD_LIBRARY_PATH/p" etc/system.desktopenv - - substituteInPlace bin/adminterm \ - --replace /bin/bash ${bash}/bin/bash - - substituteInPlace share/misc/HOME/initMaXX-Desktop-Home.sh \ - --replace "cp " "cp --no-preserve=mode " - ''; - - installPhase = '' - maxx=$out/opt/MaXX - mkdir -p "$maxx" $out/share $maxx/sbin - - mv -- ./* "$maxx" - ln -s $maxx/share/icons $out/share - - wrapProgram $maxx/etc/skel/Xsession.dt \ - --prefix GTK_PATH : "${gtk-engine-murrine}/lib/gtk-2.0:${gtk_engines}/lib/gtk-2.0" \ - --prefix GDK_PIXBUF_MODULE_FILE : "$(echo ${librsvg.out}/lib/gdk-pixbuf-2.0/*/loaders.cache)" - - while IFS= read -r -d ''$'\0' i; do - if isExecutable "$i"; then - wrapProgram "$i" \ - --prefix PATH : ${gcc}/bin - fi - done < <(find "$maxx" -type f -print0) - - wrapProgram $maxx/bin/hinv \ - --prefix PATH : ${stdenv.lib.makeBinPath [ dmidecode pciutils usbutils ]} - ''; - - meta = with stdenv.lib; { - description = "A replica of IRIX Interactive Desktop"; - homepage = https://www.facebook.com/maxxdesktop/; - license = { - fullName = "The MaXX Interactive Desktop for Linux License Agreement"; - url = http://maxxdesktop.arcadedaydream.com/Indigo-Releases/docs/license.html; - free = false; # redistribution is only allowed to *some* hardware, etc. - }; - maintainers = [ maintainers.gnidorah ]; - platforms = ["x86_64-linux"]; - longDescription = '' - A clone of IRIX Interactive Desktop made in agreement with SGI. - Provides simple and fast retro desktop environment. - ''; - }; -} diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 81415420873f5..656428fa7f00a 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "12gql86vn12zbkw368blxk0cl9fgs22dyj02xnimjc8b6s80yib4"; + sha256 = "0nhgf5lgy74liml3kzijldan3qgrxh2721yvjdk4jf83b0g1b7yb"; }; passthru = { @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/elementary/appcenter; + homepage = "https://github.com/elementary/appcenter"; description = "An open, pay-what-you-want app store for indie developers, designed for elementary OS"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 8d394b824a5eb..f2f6faedc5ad5 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/elementary/calculator; + homepage = "https://github.com/elementary/calculator"; description = "Calculator app designed for elementary OS"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index c7e36d0902262..ec11ae7516b26 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Desktop calendar app designed for elementary OS"; - homepage = https://github.com/elementary/calendar; + homepage = "https://github.com/elementary/calendar"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index eb456df6d167b..712f2bec8d5e7 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Camera app designed for elementary OS"; - homepage = https://github.com/elementary/camera; + homepage = "https://github.com/elementary/camera"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index e77d94c22fdee..82036c8b8e215 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Code editor designed for elementary OS"; - homepage = https://github.com/elementary/code; + homepage = "https://github.com/elementary/code"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index fb56b3d1b33ae..e54841275f6f7 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GitHub Issue Reporter designed for elementary OS"; - homepage = https://github.com/elementary/feedback; + homepage = "https://github.com/elementary/feedback"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index a0495de7f4654..ed557da5449f6 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "File browser designed for elementary OS"; - homepage = https://github.com/elementary/files; + homepage = "https://github.com/elementary/files"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index ea74686e5041a..5c6d34a55a515 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pname = "elementary-photos"; - version = "2.6.5"; + version = "2.7.0"; repoName = "photos"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0r6d9y936nw4bn0jvixi1p62dy8qsgl2bx8g3889fndnhfnhbjv0"; + sha256 = "09jjic165rmprc2cszsgj2m3j3f5p8v9pxx5mj66a0gj3ar3hfbd"; }; passthru = { @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Photo viewer and organizer designed for elementary OS"; - homepage = https://github.com/elementary/photos; + homepage = "https://github.com/elementary/photos"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix index befa2bbbb0205..078d496bf0db8 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Screenshot tool designed for elementary OS"; - homepage = https://github.com/elementary/screenshot; + homepage = "https://github.com/elementary/screenshot"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index c8bde49439923..c3da10d1cf396 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "elementary-videos"; - version = "2.7.0"; + version = "2.7.1"; repoName = "videos"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1b6dqqmxa83fwlh9r0v918ikxd3mnwk0j5xssw1wk5l7q72s43w7"; + sha256 = "00arim4i9bv9mbms1irkp44grkgrfnmqzraswyn1xiz9nvl1bsb9"; }; passthru = { @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Video player and library app designed for elementary OS"; - homepage = https://github.com/elementary/videos; + homepage = "https://github.com/elementary/videos"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index e2c522355f654..01048d881d525 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/elementary/sideload; + homepage = "https://github.com/elementary/sideload"; description = "Flatpak installer, designed for elementary OS"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index e1868b39f2832..6348f7c93a306 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Universal Access Plug"; - homepage = https://github.com/elementary/switchboard-plug-a11y; + homepage = "https://github.com/elementary/switchboard-plug-a11y"; license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index d501cba7c066e..76b4eeebdf122 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-about"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1z58d21xrjghvjx0ng53pcxwdk2f5d00dvngcyjja0kf7sixba71"; + sha256 = "1cjhip0abc0y5w6cqnjcgi48bfrackp45gz7955l66hxhnm5wyw6"; }; passthru = { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard About Plug"; - homepage = https://github.com/elementary/switchboard-plug-about; + homepage = "https://github.com/elementary/switchboard-plug-about"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 0d0a7507afea2..9cd92d0a5ed87 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-applications"; - version = "2.1.6"; + version = "2.1.7"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "19l979sdn9jzibvn98ag3ys28ka7zqlsbs0gj2gs9jcxhzngrxvg"; + sha256 = "0wzm390g8di4ks3w637a0wl4j7g89j321xkz5msd9058gksvaaxs"; }; passthru = { @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Applications Plug"; - homepage = https://github.com/elementary/switchboard-plug-applications; + homepage = "https://github.com/elementary/switchboard-plug-applications"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index b5adf7c97e28c..8ceaee93bdbf7 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Bluetooth Plug"; - homepage = https://github.com/elementary/switchboard-plug-bluetooth; + homepage = "https://github.com/elementary/switchboard-plug-bluetooth"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index 271c2e156140a..adb6e187915fa 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Date & Time Plug"; - homepage = https://github.com/elementary/switchboard-plug-datetime; + homepage = "https://github.com/elementary/switchboard-plug-datetime"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index bd9669e249978..aaf980a313ff2 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-display"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0mr89kyq034wffzixqlq6lmhyc4jry3dcgxrk306dhks2myindqh"; + sha256 = "1racp0mxiaix9afx25ryskdcyi335fz8yh8nwgdxbqbm6jpyq4zs"; }; passthru = { @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Displays Plug"; - homepage = https://github.com/elementary/switchboard-plug-display; + homepage = "https://github.com/elementary/switchboard-plug-display"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index bb563796eab9e..10468cdc553bc 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Keyboard Plug"; - homepage = https://github.com/elementary/switchboard-plug-keyboard; + homepage = "https://github.com/elementary/switchboard-plug-keyboard"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index 5a4eaf79b3840..956d53d6980f3 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-mouse-touchpad"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1ls5jxzmd7cmbv8h67q6mcmfrfksgwjndqd6r9gxivsz2lcji3x7"; + sha256 = "19y1n05pc3j0px5pql5338vzrq6hjw209s8l2l70ha4i4r978qir"; }; passthru = { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Mouse & Touchpad Plug"; - homepage = https://github.com/elementary/switchboard-plug-mouse-touchpad; + homepage = "https://github.com/elementary/switchboard-plug-mouse-touchpad"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 99880e318f53f..04763c3dc3f8e 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Networking Plug"; - homepage = https://github.com/elementary/switchboard-plug-network; + homepage = "https://github.com/elementary/switchboard-plug-network"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index c81781a764ae3..b4564abd770c0 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Notifications Plug"; - homepage = https://github.com/elementary/switchboard-plug-notifications; + homepage = "https://github.com/elementary/switchboard-plug-notifications"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch deleted file mode 100644 index a1b019179d1bd..0000000000000 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/set-wallpaper-contract/set-wallpaper.vala b/set-wallpaper-contract/set-wallpaper.vala -index 3e02089..7ce7041 100644 ---- a/set-wallpaper-contract/set-wallpaper.vala -+++ b/set-wallpaper-contract/set-wallpaper.vala -@@ -38,7 +38,7 @@ namespace SetWallpaperContractor { - </transition> - """; - -- const string SYSTEM_BACKGROUNDS_PATH = "/usr/share/backgrounds"; -+ const string SYSTEM_BACKGROUNDS_PATH = "/run/current-system/sw/share/backgrounds"; - - private int delay_value = 60; - -diff --git a/src/Views/Wallpaper.vala b/src/Views/Wallpaper.vala -index 4be14fa..aa8832f 100644 ---- a/src/Views/Wallpaper.vala -+++ b/src/Views/Wallpaper.vala -@@ -38,7 +38,7 @@ public class Wallpaper : Gtk.Grid { - FileAttribute.THUMBNAIL_IS_VALID - }; - -- const string SYSTEM_BACKGROUNDS_PATH = "/usr/share/backgrounds"; -+ const string SYSTEM_BACKGROUNDS_PATH = "/run/current-system/sw/share/backgrounds"; - - public Switchboard.Plug plug { get; construct set; } - private GLib.Settings settings; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index ab9ecbc5a3363..a70fee63094f1 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-pantheon-shell"; - version = "2.8.2"; + version = "2.8.4"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0l4js2gqvn8lmky5b3jjqw6mzxcv9i2gjqr1vka0z40px6vfzf0z"; + sha256 = "1nnsv745inbdqk3xnbcaqmj87vr3kzh5hazbh8v3ib33cpi7wy88"; }; passthru = { @@ -42,13 +42,9 @@ stdenv.mkDerivation rec { switchboard ]; - patches = [ - ./backgrounds.patch # Having https://github.com/elementary/switchboard-plug-pantheon-shell/issues/166 would make this patch uneeded - ]; - meta = with stdenv.lib; { description = "Switchboard Desktop Plug"; - homepage = https://github.com/elementary/switchboard-plug-pantheon-shell; + homepage = "https://github.com/elementary/switchboard-plug-pantheon-shell"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index fbea249788ee2..58c135d9c663b 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Power Plug"; - homepage = https://github.com/elementary/switchboard-plug-power; + homepage = "https://github.com/elementary/switchboard-plug-power"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 67e8a3c213466..1d71ae1f7cceb 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Printers Plug"; - homepage = https://github.com/elementary/switchboard-plug-printers; + homepage = "https://github.com/elementary/switchboard-plug-printers"; license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index 9d457aedc969d..c07e48736d7ec 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-security-privacy"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1dwq9rqswgnnglhrgcpvrp6shn3pb4x8f8f23x84sqakb430idp7"; + sha256 = "1rgbw2kfcq7cdpvl6sy6r6d4iprm1j2n3knbnbxy8sylfc83bwri"; }; passthru = { @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Security & Privacy Plug"; - homepage = https://github.com/elementary/switchboard-plug-security-privacy; + homepage = "https://github.com/elementary/switchboard-plug-security-privacy"; license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index 4f5f424746db6..55ed654f75faa 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Sharing Plug"; - homepage = https://github.com/elementary/switchboard-plug-sharing; + homepage = "https://github.com/elementary/switchboard-plug-sharing"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index 9677a547fcb6f..df553a515eac6 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Sound Plug"; - homepage = https://github.com/elementary/switchboard-plug-sound; + homepage = "https://github.com/elementary/switchboard-plug-sound"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index 7b00a403c1596..6b451931a46cd 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extensible System Settings app for Pantheon"; - homepage = https://github.com/elementary/switchboard; + homepage = "https://github.com/elementary/switchboard"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index c1af68e8d5ba3..9deee9c9abe1d 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GTK theme designed to be smooth, attractive, fast, and usable"; - homepage = https://github.com/elementary/stylesheet; + homepage = "https://github.com/elementary/stylesheet"; license = licenses.gpl3; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index 291977349bd16..3d448954cca79 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { longDescription = '' An original set of vector icons designed specifically for elementary OS and its desktop environment: Pantheon. ''; - homepage = https://github.com/elementary/icons; + homepage = "https://github.com/elementary/icons"; license = licenses.gpl3; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix index df2475ce82a31..50a455885162f 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Font for concealing text"; - homepage = https://github.com/png2378/redacted-elementary; + homepage = "https://github.com/png2378/redacted-elementary"; license = licenses.ofl; maintainers = pantheon.maintainers; platforms = platforms.linux; diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix index c19a465e9b145..f95e68153058f 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set of system sounds for elementary"; - homepage = https://github.com/elementary/sound-theme; + homepage = "https://github.com/elementary/sound-theme"; license = licenses.unlicense; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix index 2f3b0ee059fc2..82f45c95d6114 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Collection of wallpapers for elementary"; - homepage = https://github.com/elementary/wallpapers; + homepage = "https://github.com/elementary/wallpapers"; license = licenses.publicDomain; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 40cc18c3ce2fa..4e8d8bfeb150f 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Default settings and configuration files for elementary"; - homepage = https://github.com/elementary/default-settings; + homepage = "https://github.com/elementary/default-settings"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 1a268c35fa2e0..64c4509280a05 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -103,6 +103,9 @@ stdenv.mkDerivation rec { # for the compositor --prefix PATH : "$out/bin" + + # the theme is hardcoded + --prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share" ) ''; @@ -118,7 +121,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LightDM Greeter for Pantheon"; - homepage = https://github.com/elementary/greeter; + homepage = "https://github.com/elementary/greeter"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index 2056c73a97e07..02a87159aefbd 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Onboarding app for new users designed for elementary OS"; - homepage = https://github.com/elementary/onboarding; + homepage = "https://github.com/elementary/onboarding"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix index e79a85bee9587..e8ea57b8bb9aa 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple shim for printing support via Contractor"; - homepage = https://github.com/elementary/print; + homepage = "https://github.com/elementary/print"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index c22444422be94..089c9188d6cdc 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -146,7 +146,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Session settings for elementary"; - homepage = https://github.com/elementary/session-settings; + homepage = "https://github.com/elementary/session-settings"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index 2ddfcf23c6a95..2cdb2c2350788 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A native OS-wide shortcut overlay to be launched by Gala"; - homepage = https://github.com/elementary/shortcut-overlay; + homepage = "https://github.com/elementary/shortcut-overlay"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix index 8e180ca83a664..bfeda383ea4ea 100644 --- a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix +++ b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extra contractor files for elementary"; - homepage = https://github.com/worldofpeace/extra-elementary-contracts; + homepage = "https://github.com/worldofpeace/extra-elementary-contracts"; license = licenses.gpl2; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index cbe870af8e470..9b370847fc84e 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "02g6x190lylng8d07pwx2bqcc71rq48f0dxh30mgndfii6k21qgs"; + sha256 = "03cq9ihgjasnv1n4v3dn1m3ypzj26k2ybd5b1a7yrbprb35zbrs4"; }; passthru = { @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A window & compositing manager based on mutter and designed by elementary for use with Pantheon"; - homepage = https://github.com/elementary/gala; + homepage = "https://github.com/elementary/gala"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/bc.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/bc.patch deleted file mode 100644 index 264a4a5b26da7..0000000000000 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/bc.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/lib/synapse-plugins/calculator-plugin.vala b/lib/synapse-plugins/calculator-plugin.vala -index 1b5fa06..076c0c7 100644 ---- a/lib/synapse-plugins/calculator-plugin.vala -+++ b/lib/synapse-plugins/calculator-plugin.vala -@@ -51,9 +51,7 @@ namespace Synapse { - _("Calculator"), - _("Calculate basic expressions."), - "accessories-calculator", -- register_plugin, -- Environment.find_program_in_path ("bc") != null, -- _("bc is not installed")); -+ register_plugin); - } - - static construct { -@@ -90,7 +88,7 @@ namespace Synapse { - if (matched) { - Pid pid; - int read_fd, write_fd; -- string[] argv = {"bc", "-l"}; -+ string[] argv = {"@exec@", "-l"}; - string? solution = null; - - try { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 34c29c1b72aca..7adcdb21d7881 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "wingpanel-applications-menu"; - version = "2.5.0"; + version = "2.6.0"; repoName = "applications-menu"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1zry9xvcljsn5fnl8qs21x7q8rpwv0sxvp2dmnx3ddqnvj4q2m7d"; + sha256 = "16ki1x6697jmfqajynx2zvwqrpjpshnd08y7vf6g7xc7zwwh38c5"; }; passthru = { @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight and stylish app launcher for Pantheon"; - homepage = https://github.com/elementary/applications-menu; + homepage = "https://github.com/elementary/applications-menu"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 93ddb0e1dee2b..979d6af8f0ccf 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -7,6 +7,7 @@ , ninja , vala , gtk3 +, glib , granite , libnotify , wingpanel @@ -16,13 +17,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-bluetooth"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "05v3qy4rxi4l3g1ql99vcjylb01hz3galh19c2jc3lqc1mf1z1j1"; + sha256 = "0ylbpai05b300h07b94xcmw9xi7qx13l1q38zlg2n95d3c5264dp"; }; passthru = { @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + glib # for glib-compile-schemas libxml2 meson ninja @@ -41,6 +43,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + glib granite gtk3 libgee @@ -55,7 +58,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Bluetooth Indicator for Wingpanel"; - homepage = https://github.com/elementary/wingpanel-indicator-bluetooth; + homepage = "https://github.com/elementary/wingpanel-indicator-bluetooth"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/207.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/207.patch new file mode 100644 index 0000000000000..c4d6d8574a530 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/207.patch @@ -0,0 +1,4726 @@ +From 20228e34bf97f67b1dd542a22e92cd90f0db5c72 Mon Sep 17 00:00:00 2001 +From: Dirli <litandrej85@gmail.com> +Date: Thu, 9 Apr 2020 16:30:16 +0300 +Subject: [PATCH 1/8] added a single namespace + +--- + meson.build | 14 +- + src/DateIterator.vala | 82 ----- + src/DateRange.vala | 66 ---- + src/Indicator.vala | 341 +++++++++--------- + .../calendar => Models}/CalendarModel.vala | 4 +- + src/Services/TimeManager.vala | 230 ++++++------ + src/Util/DateIterator.vala | 84 +++++ + src/Util/DateRange.vala | 68 ++++ + src/{Widgets/calendar => Util}/Util.vala | 8 +- + src/Widgets/CalendarView.vala | 185 ++++++++++ + src/Widgets/EventRow.vala | 184 +++++----- + src/Widgets/{calendar => }/Grid.vala | 12 +- + src/Widgets/GridDay.vala | 180 +++++++++ + src/Widgets/PanelLabel.vala | 80 ++-- + src/Widgets/calendar/CalendarView.vala | 183 ---------- + src/Widgets/calendar/GridDay.vala | 178 --------- + 16 files changed, 957 insertions(+), 942 deletions(-) + delete mode 100644 src/DateIterator.vala + delete mode 100644 src/DateRange.vala + rename src/{Widgets/calendar => Models}/CalendarModel.vala (99%) + create mode 100644 src/Util/DateIterator.vala + create mode 100644 src/Util/DateRange.vala + rename src/{Widgets/calendar => Util}/Util.vala (96%) + create mode 100644 src/Widgets/CalendarView.vala + rename src/Widgets/{calendar => }/Grid.vala (95%) + create mode 100644 src/Widgets/GridDay.vala + delete mode 100644 src/Widgets/calendar/CalendarView.vala + delete mode 100644 src/Widgets/calendar/GridDay.vala + +diff --git a/meson.build b/meson.build +index 2555723..b44c5bd 100644 +--- a/meson.build ++++ b/meson.build +@@ -39,16 +39,16 @@ endif + shared_module( + meson.project_name(), + gresource, +- 'src/DateIterator.vala', +- 'src/DateRange.vala', + 'src/Indicator.vala', ++ 'src/Util/DateIterator.vala', ++ 'src/Util/DateRange.vala', ++ 'src/Util/Util.vala', ++ 'src/Models/CalendarModel.vala', ++ 'src/Widgets/CalendarView.vala', + 'src/Widgets/EventRow.vala', ++ 'src/Widgets/Grid.vala', ++ 'src/Widgets/GridDay.vala', + 'src/Widgets/PanelLabel.vala', +- 'src/Widgets/calendar/CalendarModel.vala', +- 'src/Widgets/calendar/CalendarView.vala', +- 'src/Widgets/calendar/Grid.vala', +- 'src/Widgets/calendar/GridDay.vala', +- 'src/Widgets/calendar/Util.vala', + 'src/Services/TimeManager.vala', + dependencies: [ + dependency('glib-2.0'), +diff --git a/src/DateIterator.vala b/src/DateIterator.vala +deleted file mode 100644 +index 961895b..0000000 +--- a/src/DateIterator.vala ++++ /dev/null +@@ -1,82 +0,0 @@ +-/* +- * Copyright 2011-2018 elementary, Inc. (https://elementary.io) +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * You should have received a copy of the GNU General Public +- * License along with this program; if not, write to the +- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02110-1301 USA. +- * +- * Authored by: Corentin Noël <corentin@elementaryos.org> +- */ +- +-public class Util.DateIterator : Object, Gee.Traversable<GLib.DateTime>, Gee.Iterator<GLib.DateTime> { +- public GLib.DateTime current { get; construct set; } +- public Util.DateRange range { get; construct; } +- +- // Required by Gee.Iterator +- public bool valid { +- get { +- return true; +- } +- } +- +- // Required by Gee.Iterator +- public bool read_only { +- get { +- return false; +- } +- } +- +- public DateIterator (Util.DateRange range) { +- Object ( +- range: range, +- current: range.first_dt.add_days (-1) +- ); +- } +- +- public bool @foreach (Gee.ForallFunc<GLib.DateTime> f) { +- var element = range.first_dt; +- +- while (element.compare (range.last_dt) < 0) { +- if (f (element) == false) { +- return false; +- } +- +- element = element.add_days (1); +- } +- +- return true; +- } +- +- public bool next () { +- if (!has_next ()) { +- return false; +- } +- +- current = this.current.add_days (1); +- +- return true; +- } +- +- public bool has_next () { +- return current.compare (range.last_dt) < 0; +- } +- +- public new GLib.DateTime get () { +- return current; +- } +- +- public void remove () { +- assert_not_reached (); +- } +-} +diff --git a/src/DateRange.vala b/src/DateRange.vala +deleted file mode 100644 +index 08e4c00..0000000 +--- a/src/DateRange.vala ++++ /dev/null +@@ -1,66 +0,0 @@ +-/* +- * Copyright 2011-2019 elementary, Inc. (https://elementary.io) +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * You should have received a copy of the GNU General Public +- * License along with this program; if not, write to the +- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02110-1301 USA. +- * +- * Authored by: Corentin Noël <corentin@elementaryos.org> +- */ +- +-/* Represents date range from 'first' to 'last' inclusive */ +-public class Util.DateRange : Object, Gee.Traversable<GLib.DateTime>, Gee.Iterable<GLib.DateTime> { +- public GLib.DateTime first_dt { get; construct; } +- public GLib.DateTime last_dt { get; construct; } +- +- public bool @foreach (Gee.ForallFunc<GLib.DateTime> f) { +- foreach (var date in this) { +- if (f (date) == false) { +- return false; +- } +- } +- +- return true; +- } +- +- public DateRange (GLib.DateTime first, GLib.DateTime last) { +- Object ( +- first_dt: first, +- last_dt: last +- ); +- } +- +- public bool equals (DateRange other) { +- return (first_dt == other.first_dt && last_dt == other.last_dt); +- } +- +- public Gee.Iterator<GLib.DateTime> iterator () { +- return new DateIterator (this); +- } +- +- public Gee.List<GLib.DateTime> to_list () { +- var list = new Gee.ArrayList<GLib.DateTime> ((Gee.EqualDataFunc<GLib.DateTime>? )datetime_equal_func); +- +- foreach (var date in this) { +- list.add (date); +- } +- +- return list; +- } +- +- /* Returns true if 'a' and 'b' are the same GLib.DateTime */ +- private bool datetime_equal_func (GLib.DateTime a, GLib.DateTime b) { +- return a.equal (b); +- } +-} +diff --git a/src/Indicator.vala b/src/Indicator.vala +index 77aa35c..b712c12 100644 +--- a/src/Indicator.vala ++++ b/src/Indicator.vala +@@ -17,218 +17,219 @@ + * Boston, MA 02110-1301 USA. + */ + +-public class DateTime.Indicator : Wingpanel.Indicator { +- public static GLib.Settings settings; +- +- private Widgets.PanelLabel panel_label; +- private Gtk.Grid main_grid; +- private Widgets.CalendarView calendar; +- private Gtk.ListBox event_listbox; +- private uint update_events_idle_source = 0; +- +- public Indicator () { +- Object ( +- code_name: Wingpanel.Indicator.DATETIME, +- display_name: _("Date & Time"), +- description: _("The date and time indicator") +- ); +- } +- +- static construct { +- settings = new GLib.Settings ("io.elementary.desktop.wingpanel.datetime"); +- } ++namespace DateTimeIndicator { ++ public class Indicator : Wingpanel.Indicator { ++ public static GLib.Settings settings; ++ ++ private Widgets.PanelLabel panel_label; ++ private Gtk.Grid main_grid; ++ private Widgets.CalendarView calendar; ++ private Gtk.ListBox event_listbox; ++ private uint update_events_idle_source = 0; ++ ++ public Indicator () { ++ Object ( ++ code_name: Wingpanel.Indicator.DATETIME, ++ display_name: _("Date & Time"), ++ description: _("The date and time indicator") ++ ); ++ } + +- construct { +- visible = true; +- } ++ static construct { ++ settings = new GLib.Settings ("io.elementary.desktop.wingpanel.datetime"); ++ } + +- public override Gtk.Widget get_display_widget () { +- if (panel_label == null) { +- panel_label = new Widgets.PanelLabel (); ++ construct { ++ visible = true; + } + +- return panel_label; +- } ++ public override Gtk.Widget get_display_widget () { ++ if (panel_label == null) { ++ panel_label = new Widgets.PanelLabel (); ++ } + +- public override Gtk.Widget? get_widget () { +- if (main_grid == null) { +- calendar = new Widgets.CalendarView (); +- calendar.margin_bottom = 6; +- +- var placeholder_label = new Gtk.Label (_("No Events on This Day")); +- placeholder_label.wrap = true; +- placeholder_label.wrap_mode = Pango.WrapMode.WORD; +- placeholder_label.margin_start = 12; +- placeholder_label.margin_end = 12; +- placeholder_label.max_width_chars = 20; +- placeholder_label.justify = Gtk.Justification.CENTER; +- placeholder_label.show_all (); +- +- var placeholder_style_context = placeholder_label.get_style_context (); +- placeholder_style_context.add_class (Gtk.STYLE_CLASS_DIM_LABEL); +- placeholder_style_context.add_class (Granite.STYLE_CLASS_H3_LABEL); +- +- event_listbox = new Gtk.ListBox (); +- event_listbox.selection_mode = Gtk.SelectionMode.NONE; +- event_listbox.set_header_func (header_update_func); +- event_listbox.set_placeholder (placeholder_label); +- event_listbox.set_sort_func (sort_function); +- +- var scrolled_window = new Gtk.ScrolledWindow (null, null); +- scrolled_window.hscrollbar_policy = Gtk.PolicyType.NEVER; +- scrolled_window.add (event_listbox); +- +- var settings_button = new Gtk.ModelButton (); +- settings_button.text = _("Date & Time Settings…"); +- +- main_grid = new Gtk.Grid (); +- main_grid.margin_top = 12; +- main_grid.attach (calendar, 0, 0); +- main_grid.attach (new Gtk.Separator (Gtk.Orientation.VERTICAL), 1, 0); +- main_grid.attach (scrolled_window, 2, 0); +- main_grid.attach (new Wingpanel.Widgets.Separator (), 0, 2, 3); +- main_grid.attach (settings_button, 0, 3, 3); +- +- var size_group = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL); +- size_group.add_widget (calendar); +- size_group.add_widget (event_listbox); +- +- calendar.day_double_click.connect (() => { +- close (); +- }); ++ return panel_label; ++ } + +- calendar.selection_changed.connect ((date) => { +- idle_update_events (); +- }); ++ public override Gtk.Widget? get_widget () { ++ if (main_grid == null) { ++ calendar = new Widgets.CalendarView (); ++ calendar.margin_bottom = 6; ++ ++ var placeholder_label = new Gtk.Label (_("No Events on This Day")); ++ placeholder_label.wrap = true; ++ placeholder_label.wrap_mode = Pango.WrapMode.WORD; ++ placeholder_label.margin_start = 12; ++ placeholder_label.margin_end = 12; ++ placeholder_label.max_width_chars = 20; ++ placeholder_label.justify = Gtk.Justification.CENTER; ++ placeholder_label.show_all (); ++ ++ var placeholder_style_context = placeholder_label.get_style_context (); ++ placeholder_style_context.add_class (Gtk.STYLE_CLASS_DIM_LABEL); ++ placeholder_style_context.add_class (Granite.STYLE_CLASS_H3_LABEL); ++ ++ event_listbox = new Gtk.ListBox (); ++ event_listbox.selection_mode = Gtk.SelectionMode.NONE; ++ event_listbox.set_header_func (header_update_func); ++ event_listbox.set_placeholder (placeholder_label); ++ event_listbox.set_sort_func (sort_function); ++ ++ var scrolled_window = new Gtk.ScrolledWindow (null, null); ++ scrolled_window.hscrollbar_policy = Gtk.PolicyType.NEVER; ++ scrolled_window.add (event_listbox); ++ ++ var settings_button = new Gtk.ModelButton (); ++ settings_button.text = _("Date & Time Settings…"); ++ ++ main_grid = new Gtk.Grid (); ++ main_grid.margin_top = 12; ++ main_grid.attach (calendar, 0, 0); ++ main_grid.attach (new Gtk.Separator (Gtk.Orientation.VERTICAL), 1, 0); ++ main_grid.attach (scrolled_window, 2, 0); ++ main_grid.attach (new Wingpanel.Widgets.Separator (), 0, 2, 3); ++ main_grid.attach (settings_button, 0, 3, 3); ++ ++ var size_group = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL); ++ size_group.add_widget (calendar); ++ size_group.add_widget (event_listbox); ++ ++ calendar.day_double_click.connect (() => { ++ close (); ++ }); ++ ++ calendar.selection_changed.connect ((date) => { ++ idle_update_events (); ++ }); ++ ++ event_listbox.row_activated.connect ((row) => { ++ calendar.show_date_in_maya (((EventRow) row).date); ++ close (); ++ }); ++ ++ settings_button.clicked.connect (() => { ++ try { ++ AppInfo.launch_default_for_uri ("settings://time", null); ++ } catch (Error e) { ++ warning ("Failed to open time and date settings: %s", e.message); ++ } ++ }); ++ } + +- event_listbox.row_activated.connect ((row) => { +- calendar.show_date_in_maya (((DateTime.EventRow) row).date); +- close (); +- }); ++ return main_grid; ++ } + +- settings_button.clicked.connect (() => { +- try { +- AppInfo.launch_default_for_uri ("settings://time", null); +- } catch (Error e) { +- warning ("Failed to open time and date settings: %s", e.message); ++ private void header_update_func (Gtk.ListBoxRow lbrow, Gtk.ListBoxRow? lbbefore) { ++ var row = (EventRow) lbrow; ++ if (lbbefore != null) { ++ var before = (EventRow) lbbefore; ++ if (row.is_allday == before.is_allday) { ++ row.set_header (null); ++ return; + } +- }); +- } + +- return main_grid; +- } ++ if (row.is_allday != before.is_allday) { ++ var header_label = new Granite.HeaderLabel (_("During the Day")); ++ header_label.margin_start = header_label.margin_end = 6; + +- private void header_update_func (Gtk.ListBoxRow lbrow, Gtk.ListBoxRow? lbbefore) { +- var row = (DateTime.EventRow) lbrow; +- if (lbbefore != null) { +- var before = (DateTime.EventRow) lbbefore; +- if (row.is_allday == before.is_allday) { +- row.set_header (null); ++ row.set_header (header_label); ++ return; ++ } ++ } else { ++ if (row.is_allday) { ++ var allday_header = new Granite.HeaderLabel (_("All Day")); ++ allday_header.margin_start = allday_header.margin_end = 6; ++ ++ row.set_header (allday_header); ++ } + return; + } ++ } + +- if (row.is_allday != before.is_allday) { +- var header_label = new Granite.HeaderLabel (_("During the Day")); +- header_label.margin_start = header_label.margin_end = 6; ++ [CCode (instance_pos = -1)] ++ private int sort_function (Gtk.ListBoxRow child1, Gtk.ListBoxRow child2) { ++ var e1 = (EventRow) child1; ++ var e2 = (EventRow) child2; + +- row.set_header (header_label); +- return; ++ if (e1.start_time.compare (e2.start_time) != 0) { ++ return e1.start_time.compare (e2.start_time); + } +- } else { +- if (row.is_allday) { +- var allday_header = new Granite.HeaderLabel (_("All Day")); +- allday_header.margin_start = allday_header.margin_end = 6; + +- row.set_header (allday_header); ++ // If they have the same date, sort them wholeday first ++ if (e1.is_allday) { ++ return -1; ++ } else if (e2.is_allday) { ++ return 1; + } +- return; +- } +- } +- +- [CCode (instance_pos = -1)] +- private int sort_function (Gtk.ListBoxRow child1, Gtk.ListBoxRow child2) { +- var e1 = (EventRow) child1; +- var e2 = (EventRow) child2; + +- if (e1.start_time.compare (e2.start_time) != 0) { +- return e1.start_time.compare (e2.start_time); ++ return 0; + } + +- // If they have the same date, sort them wholeday first +- if (e1.is_allday) { +- return -1; +- } else if (e2.is_allday) { +- return 1; ++ private void update_events_model (E.Source source, Gee.Collection<ECal.Component> events) { ++ idle_update_events (); + } + +- return 0; +- } +- +- private void update_events_model (E.Source source, Gee.Collection<ECal.Component> events) { +- idle_update_events (); +- } ++ private void idle_update_events () { ++ if (update_events_idle_source > 0) { ++ GLib.Source.remove (update_events_idle_source); ++ } + +- private void idle_update_events () { +- if (update_events_idle_source > 0) { +- GLib.Source.remove (update_events_idle_source); ++ update_events_idle_source = GLib.Idle.add (update_events); + } + +- update_events_idle_source = GLib.Idle.add (update_events); +- } +- +- private bool update_events () { +- foreach (unowned Gtk.Widget widget in event_listbox.get_children ()) { +- widget.destroy (); +- } ++ private bool update_events () { ++ foreach (unowned Gtk.Widget widget in event_listbox.get_children ()) { ++ widget.destroy (); ++ } + +- if (calendar.selected_date == null) { +- update_events_idle_source = 0; +- return GLib.Source.REMOVE; +- } ++ if (calendar.selected_date == null) { ++ update_events_idle_source = 0; ++ return GLib.Source.REMOVE; ++ } + +- var date = calendar.selected_date; ++ var date = calendar.selected_date; + +- var model = Widgets.CalendarModel.get_default (); ++ var model = Models.CalendarModel.get_default (); + +- var events_on_day = new Gee.TreeMap<string, DateTime.EventRow> (); ++ var events_on_day = new Gee.TreeMap<string, EventRow> (); + +- model.source_events.@foreach ((source, component_map) => { +- foreach (var comp in component_map.get_values ()) { +- if (Util.calcomp_is_on_day (comp, date)) { +- unowned ICal.Component ical = comp.get_icalcomponent (); +- var event_uid = ical.get_uid (); +- if (!events_on_day.has_key (event_uid)) { +- events_on_day[event_uid] = new DateTime.EventRow (date, ical, source); ++ model.source_events.@foreach ((source, component_map) => { ++ foreach (var comp in component_map.get_values ()) { ++ if (Util.calcomp_is_on_day (comp, date)) { ++ unowned ICal.Component ical = comp.get_icalcomponent (); ++ var event_uid = ical.get_uid (); ++ if (!events_on_day.has_key (event_uid)) { ++ events_on_day[event_uid] = new EventRow (date, ical, source); + +- event_listbox.add (events_on_day[event_uid]); ++ event_listbox.add (events_on_day[event_uid]); ++ } + } + } +- } +- }); ++ }); + +- event_listbox.show_all (); +- update_events_idle_source = 0; +- return GLib.Source.REMOVE; +- } ++ event_listbox.show_all (); ++ update_events_idle_source = 0; ++ return GLib.Source.REMOVE; ++ } + +- public override void opened () { +- calendar.show_today (); ++ public override void opened () { ++ calendar.show_today (); + +- Widgets.CalendarModel.get_default ().events_added.connect (update_events_model); +- Widgets.CalendarModel.get_default ().events_updated.connect (update_events_model); +- Widgets.CalendarModel.get_default ().events_removed.connect (update_events_model); +- } ++ Models.CalendarModel.get_default ().events_added.connect (update_events_model); ++ Models.CalendarModel.get_default ().events_updated.connect (update_events_model); ++ Models.CalendarModel.get_default ().events_removed.connect (update_events_model); ++ } + +- public override void closed () { +- Widgets.CalendarModel.get_default ().events_added.disconnect (update_events_model); +- Widgets.CalendarModel.get_default ().events_updated.disconnect (update_events_model); +- Widgets.CalendarModel.get_default ().events_removed.disconnect (update_events_model); ++ public override void closed () { ++ Models.CalendarModel.get_default ().events_added.disconnect (update_events_model); ++ Models.CalendarModel.get_default ().events_updated.disconnect (update_events_model); ++ Models.CalendarModel.get_default ().events_removed.disconnect (update_events_model); ++ } + } + } +- + public Wingpanel.Indicator get_indicator (Module module) { + debug ("Activating DateTime Indicator"); +- var indicator = new DateTime.Indicator (); ++ var indicator = new DateTimeIndicator.Indicator (); + + return indicator; + } +diff --git a/src/Widgets/calendar/CalendarModel.vala b/src/Models/CalendarModel.vala +similarity index 99% +rename from src/Widgets/calendar/CalendarModel.vala +rename to src/Models/CalendarModel.vala +index 7602303..965b93e 100644 +--- a/src/Widgets/calendar/CalendarModel.vala ++++ b/src/Models/CalendarModel.vala +@@ -15,8 +15,8 @@ + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +-namespace DateTime.Widgets { +- public class CalendarModel : Object { ++namespace DateTimeIndicator { ++ public class Models.CalendarModel : Object { + /* The data_range is the range of dates for which this model is storing + * data. + * +diff --git a/src/Services/TimeManager.vala b/src/Services/TimeManager.vala +index b68f158..5baa136 100644 +--- a/src/Services/TimeManager.vala ++++ b/src/Services/TimeManager.vala +@@ -32,153 +32,155 @@ interface FDO.Accounts : Object { + public abstract string find_user_by_name (string username) throws GLib.Error; + } + +-public class DateTime.Services.TimeManager : Gtk.Calendar { +- private static TimeManager? instance = null; ++namespace DateTimeIndicator { ++ public class Services.TimeManager : Gtk.Calendar { ++ private static TimeManager? instance = null; + +- public signal void minute_changed (); ++ public signal void minute_changed (); + +- private GLib.DateTime? current_time = null; +- private uint timeout_id = 0; +- private Manager? manager = null; ++ private GLib.DateTime? current_time = null; ++ private uint timeout_id = 0; ++ private Manager? manager = null; + +- public bool clock_show_seconds { get; set; } +- public bool is_12h { get; set; } ++ public bool clock_show_seconds { get; set; } ++ public bool is_12h { get; set; } + +- public TimeManager () { +- update_current_time (); +- +- if (current_time == null) { +- return; +- } ++ public TimeManager () { ++ update_current_time (); + +- add_timeout (); +- try { +- var clock_settings = new GLib.Settings ("io.elementary.desktop.wingpanel.datetime"); +- clock_settings.bind ("clock-show-seconds", this, "clock-show-seconds", SettingsBindFlags.DEFAULT); ++ if (current_time == null) { ++ return; ++ } + +- notify["clock-show-seconds"].connect (() => { +- add_timeout (); +- }); ++ add_timeout (); ++ try { ++ var clock_settings = new GLib.Settings ("io.elementary.desktop.wingpanel.datetime"); ++ clock_settings.bind ("clock-show-seconds", this, "clock-show-seconds", SettingsBindFlags.DEFAULT); + +- // Listen for the D-BUS server that controls time settings +- Bus.watch_name (BusType.SYSTEM, "org.freedesktop.timedate1", BusNameWatcherFlags.NONE, on_watch, on_unwatch); +- // Listen for the signal that is fired when waking up from sleep, then update time +- manager = Bus.get_proxy_sync (BusType.SYSTEM, "org.freedesktop.login1", "/org/freedesktop/login1"); +- manager.prepare_for_sleep.connect ((sleeping) => { +- if (!sleeping) { +- update_current_time (); +- minute_changed (); ++ notify["clock-show-seconds"].connect (() => { + add_timeout (); +- } +- }); +- } catch (Error e) { +- warning (e.message); ++ }); ++ ++ // Listen for the D-BUS server that controls time settings ++ Bus.watch_name (BusType.SYSTEM, "org.freedesktop.timedate1", BusNameWatcherFlags.NONE, on_watch, on_unwatch); ++ // Listen for the signal that is fired when waking up from sleep, then update time ++ manager = Bus.get_proxy_sync (BusType.SYSTEM, "org.freedesktop.login1", "/org/freedesktop/login1"); ++ manager.prepare_for_sleep.connect ((sleeping) => { ++ if (!sleeping) { ++ update_current_time (); ++ minute_changed (); ++ add_timeout (); ++ } ++ }); ++ } catch (Error e) { ++ warning (e.message); ++ } + } +- } +- +- construct { +- setup_time_format.begin (); +- } + +- private async void setup_time_format () { +- try { +- var accounts_service = yield GLib.Bus.get_proxy<FDO.Accounts> (GLib.BusType.SYSTEM, +- "org.freedesktop.Accounts", +- "/org/freedesktop/Accounts"); +- var user_path = accounts_service.find_user_by_name (GLib.Environment.get_user_name ()); +- +- var greeter_act = yield GLib.Bus.get_proxy<Pantheon.AccountsService> (GLib.BusType.SYSTEM, +- "org.freedesktop.Accounts", +- user_path, +- GLib.DBusProxyFlags.GET_INVALIDATED_PROPERTIES); +- is_12h = ("12h" in greeter_act.time_format); +- ((GLib.DBusProxy) greeter_act).g_properties_changed.connect ((changed_properties, invalidated_properties) => { +- if (changed_properties.lookup_value ("TimeFormat", GLib.VariantType.STRING) != null) { +- is_12h = ("12h" in greeter_act.time_format); +- } +- }); +- } catch (Error e) { +- critical (e.message); +- // Connect to the GSettings instead +- var clock_settings = new GLib.Settings ("org.gnome.desktop.interface"); +- clock_settings.changed["clock-format"].connect (() => { +- is_12h = ("12h" in clock_settings.get_string ("clock-format")); +- }); +- +- is_12h = ("12h" in clock_settings.get_string ("clock-format")); ++ construct { ++ setup_time_format.begin (); + } +- } + +- private void on_watch (DBusConnection conn) { +- // Start updating the time display quicker because someone is changing settings +- add_timeout (true); +- } ++ private async void setup_time_format () { ++ try { ++ var accounts_service = yield GLib.Bus.get_proxy<FDO.Accounts> (GLib.BusType.SYSTEM, ++ "org.freedesktop.Accounts", ++ "/org/freedesktop/Accounts"); ++ var user_path = accounts_service.find_user_by_name (GLib.Environment.get_user_name ()); ++ ++ var greeter_act = yield GLib.Bus.get_proxy<Pantheon.AccountsService> (GLib.BusType.SYSTEM, ++ "org.freedesktop.Accounts", ++ user_path, ++ GLib.DBusProxyFlags.GET_INVALIDATED_PROPERTIES); ++ is_12h = ("12h" in greeter_act.time_format); ++ ((GLib.DBusProxy) greeter_act).g_properties_changed.connect ((changed_properties, invalidated_properties) => { ++ if (changed_properties.lookup_value ("TimeFormat", GLib.VariantType.STRING) != null) { ++ is_12h = ("12h" in greeter_act.time_format); ++ } ++ }); ++ } catch (Error e) { ++ critical (e.message); ++ // Connect to the GSettings instead ++ var clock_settings = new GLib.Settings ("org.gnome.desktop.interface"); ++ clock_settings.changed["clock-format"].connect (() => { ++ is_12h = ("12h" in clock_settings.get_string ("clock-format")); ++ }); + +- private void on_unwatch (DBusConnection conn) { +- // Stop updating the time display quicker +- add_timeout (false); +- } ++ is_12h = ("12h" in clock_settings.get_string ("clock-format")); ++ } ++ } + +- private void add_timeout (bool update_fast = false) { +- uint interval; +- if (update_fast || clock_show_seconds) { +- interval = 500; +- } else { +- interval = calculate_time_until_next_minute (); ++ private void on_watch (DBusConnection conn) { ++ // Start updating the time display quicker because someone is changing settings ++ add_timeout (true); + } + +- if (timeout_id > 0) { +- Source.remove (timeout_id); ++ private void on_unwatch (DBusConnection conn) { ++ // Stop updating the time display quicker ++ add_timeout (false); + } + +- timeout_id = Timeout.add (interval, () => { +- update_current_time (); +- minute_changed (); +- add_timeout (update_fast); ++ private void add_timeout (bool update_fast = false) { ++ uint interval; ++ if (update_fast || clock_show_seconds) { ++ interval = 500; ++ } else { ++ interval = calculate_time_until_next_minute (); ++ } + +- return false; +- }); +- } ++ if (timeout_id > 0) { ++ Source.remove (timeout_id); ++ } + +- public string format (string format) { +- if (current_time == null) { +- return "undef"; ++ timeout_id = Timeout.add (interval, () => { ++ update_current_time (); ++ minute_changed (); ++ add_timeout (update_fast); ++ ++ return false; ++ }); + } + +- return current_time.format (format); +- } ++ public string format (string format) { ++ if (current_time == null) { ++ return "undef"; ++ } + +- public GLib.DateTime get_current_time () { +- return current_time; +- } ++ return current_time.format (format); ++ } + +- private void update_current_time () { +- var local_time = new GLib.DateTime.now_local (); ++ public GLib.DateTime get_current_time () { ++ return current_time; ++ } + +- if (local_time == null) { +- critical ("Can't get the local time."); ++ private void update_current_time () { ++ var local_time = new GLib.DateTime.now_local (); + +- return; +- } ++ if (local_time == null) { ++ critical ("Can't get the local time."); + +- current_time = local_time; +- } ++ return; ++ } + +- private uint calculate_time_until_next_minute () { +- if (current_time == null) { +- return 60 * 1000; ++ current_time = local_time; + } + +- var seconds_until_next_minute = 60 - (current_time.to_unix () % 60); ++ private uint calculate_time_until_next_minute () { ++ if (current_time == null) { ++ return 60 * 1000; ++ } + +- return (uint)seconds_until_next_minute * 1000; +- } ++ var seconds_until_next_minute = 60 - (current_time.to_unix () % 60); + +- public static TimeManager get_default () { +- if (instance == null) { +- instance = new TimeManager (); ++ return (uint)seconds_until_next_minute * 1000; + } + +- return instance; ++ public static TimeManager get_default () { ++ if (instance == null) { ++ instance = new TimeManager (); ++ } ++ ++ return instance; ++ } + } + } +diff --git a/src/Util/DateIterator.vala b/src/Util/DateIterator.vala +new file mode 100644 +index 0000000..c2c771e +--- /dev/null ++++ b/src/Util/DateIterator.vala +@@ -0,0 +1,84 @@ ++/* ++ * Copyright 2011-2018 elementary, Inc. (https://elementary.io) ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public ++ * License along with this program; if not, write to the ++ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301 USA. ++ * ++ * Authored by: Corentin Noël <corentin@elementaryos.org> ++ */ ++ ++namespace DateTimeIndicator { ++ public class Util.DateIterator : Object, Gee.Traversable<GLib.DateTime>, Gee.Iterator<GLib.DateTime> { ++ public GLib.DateTime current { get; construct set; } ++ public Util.DateRange range { get; construct; } ++ ++ // Required by Gee.Iterator ++ public bool valid { ++ get { ++ return true; ++ } ++ } ++ ++ // Required by Gee.Iterator ++ public bool read_only { ++ get { ++ return false; ++ } ++ } ++ ++ public DateIterator (Util.DateRange range) { ++ Object ( ++ range: range, ++ current: range.first_dt.add_days (-1) ++ ); ++ } ++ ++ public bool @foreach (Gee.ForallFunc<GLib.DateTime> f) { ++ var element = range.first_dt; ++ ++ while (element.compare (range.last_dt) < 0) { ++ if (f (element) == false) { ++ return false; ++ } ++ ++ element = element.add_days (1); ++ } ++ ++ return true; ++ } ++ ++ public bool next () { ++ if (!has_next ()) { ++ return false; ++ } ++ ++ current = this.current.add_days (1); ++ ++ return true; ++ } ++ ++ public bool has_next () { ++ return current.compare (range.last_dt) < 0; ++ } ++ ++ public new GLib.DateTime get () { ++ return current; ++ } ++ ++ public void remove () { ++ assert_not_reached (); ++ } ++ } ++} +diff --git a/src/Util/DateRange.vala b/src/Util/DateRange.vala +new file mode 100644 +index 0000000..82da7c8 +--- /dev/null ++++ b/src/Util/DateRange.vala +@@ -0,0 +1,68 @@ ++/* ++ * Copyright 2011-2019 elementary, Inc. (https://elementary.io) ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public ++ * License along with this program; if not, write to the ++ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301 USA. ++ * ++ * Authored by: Corentin Noël <corentin@elementaryos.org> ++ */ ++ ++namespace DateTimeIndicator { ++/* Represents date range from 'first' to 'last' inclusive */ ++ public class Util.DateRange : Object, Gee.Traversable<GLib.DateTime>, Gee.Iterable<GLib.DateTime> { ++ public GLib.DateTime first_dt { get; construct; } ++ public GLib.DateTime last_dt { get; construct; } ++ ++ public bool @foreach (Gee.ForallFunc<GLib.DateTime> f) { ++ foreach (var date in this) { ++ if (f (date) == false) { ++ return false; ++ } ++ } ++ ++ return true; ++ } ++ ++ public DateRange (GLib.DateTime first, GLib.DateTime last) { ++ Object ( ++ first_dt: first, ++ last_dt: last ++ ); ++ } ++ ++ public bool equals (DateRange other) { ++ return (first_dt == other.first_dt && last_dt == other.last_dt); ++ } ++ ++ public Gee.Iterator<GLib.DateTime> iterator () { ++ return new DateIterator (this); ++ } ++ ++ public Gee.List<GLib.DateTime> to_list () { ++ var list = new Gee.ArrayList<GLib.DateTime> ((Gee.EqualDataFunc<GLib.DateTime>? )datetime_equal_func); ++ ++ foreach (var date in this) { ++ list.add (date); ++ } ++ ++ return list; ++ } ++ ++ /* Returns true if 'a' and 'b' are the same GLib.DateTime */ ++ private bool datetime_equal_func (GLib.DateTime a, GLib.DateTime b) { ++ return a.equal (b); ++ } ++ } ++} +diff --git a/src/Widgets/calendar/Util.vala b/src/Util/Util.vala +similarity index 96% +rename from src/Widgets/calendar/Util.vala +rename to src/Util/Util.vala +index e51f784..c261f4b 100644 +--- a/src/Widgets/calendar/Util.vala ++++ b/src/Util/Util.vala +@@ -19,7 +19,7 @@ + * Authored by: Corentin Noël <corentin@elementaryos.org> + */ + +-namespace Util { ++namespace DateTimeIndicator.Util { + static bool has_scrolled = false; + + public bool on_scroll_event (Gdk.EventScroll event) { +@@ -35,7 +35,7 @@ namespace Util { + + /* It's mouse scroll ! */ + if (choice == 1 || choice == -1) { +- DateTime.Widgets.CalendarModel.get_default ().change_month ((int)choice); ++ Models.CalendarModel.get_default ().change_month ((int)choice); + + return true; + } +@@ -46,14 +46,14 @@ namespace Util { + + if (choice > 0.3) { + reset_timer.begin (); +- DateTime.Widgets.CalendarModel.get_default ().change_month (1); ++ Models.CalendarModel.get_default ().change_month (1); + + return true; + } + + if (choice < -0.3) { + reset_timer.begin (); +- DateTime.Widgets.CalendarModel.get_default ().change_month (-1); ++ Models.CalendarModel.get_default ().change_month (-1); + + return true; + } +diff --git a/src/Widgets/CalendarView.vala b/src/Widgets/CalendarView.vala +new file mode 100644 +index 0000000..65cee28 +--- /dev/null ++++ b/src/Widgets/CalendarView.vala +@@ -0,0 +1,185 @@ ++/*- ++ * Copyright (c) 2011–2018 elementary, Inc. (https://elementary.io) ++ * ++ * This program is free software: you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation, either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ * ++ * Authored by: Maxwell Barvian ++ * Corentin Noël <corentin@elementaryos.org> ++ */ ++ ++namespace DateTimeIndicator { ++ public class Widgets.CalendarView : Gtk.Grid { ++ public signal void day_double_click (); ++ public signal void event_updates (); ++ public signal void selection_changed (GLib.DateTime? new_date); ++ ++ public GLib.DateTime? selected_date { get; private set; } ++ ++ private Widgets.Grid grid; ++ private Gtk.Stack stack; ++ private Gtk.Grid big_grid; ++ ++ construct { ++ var label = new Gtk.Label (new GLib.DateTime.now_local ().format (_("%OB, %Y"))); ++ label.hexpand = true; ++ label.margin_start = 6; ++ label.xalign = 0; ++ label.width_chars = 13; ++ ++ var provider = new Gtk.CssProvider (); ++ provider.load_from_resource ("/io/elementary/desktop/wingpanel/datetime/ControlHeader.css"); ++ ++ var label_style_context = label.get_style_context (); ++ label_style_context.add_class ("header-label"); ++ label_style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++ ++ var left_button = new Gtk.Button.from_icon_name ("pan-start-symbolic"); ++ var center_button = new Gtk.Button.from_icon_name ("office-calendar-symbolic"); ++ center_button.tooltip_text = _("Go to today's date"); ++ var right_button = new Gtk.Button.from_icon_name ("pan-end-symbolic"); ++ ++ var box_buttons = new Gtk.Grid (); ++ box_buttons.margin_end = 6; ++ box_buttons.valign = Gtk.Align.CENTER; ++ box_buttons.get_style_context ().add_class (Gtk.STYLE_CLASS_LINKED); ++ box_buttons.add (left_button); ++ box_buttons.add (center_button); ++ box_buttons.add (right_button); ++ ++ big_grid = create_big_grid (); ++ ++ stack = new Gtk.Stack (); ++ stack.add (big_grid); ++ stack.show_all (); ++ stack.expand = true; ++ ++ stack.notify["transition-running"].connect (() => { ++ if (stack.transition_running == false) { ++ stack.get_children ().foreach ((child) => { ++ if (child != stack.visible_child) { ++ child.destroy (); ++ } ++ }); ++ } ++ }); ++ ++ column_spacing = 6; ++ row_spacing = 6; ++ margin_start = margin_end = 10; ++ attach (label, 0, 0); ++ attach (box_buttons, 1, 0); ++ attach (stack, 0, 1, 2); ++ ++ var model = Models.CalendarModel.get_default (); ++ model.notify["data-range"].connect (() => { ++ label.label = model.month_start.format (_("%OB, %Y")); ++ ++ sync_with_model (); ++ ++ selected_date = null; ++ selection_changed (selected_date); ++ }); ++ ++ left_button.clicked.connect (() => { ++ model.change_month (-1); ++ }); ++ ++ right_button.clicked.connect (() => { ++ model.change_month (1); ++ }); ++ ++ center_button.clicked.connect (() => { ++ show_today (); ++ }); ++ } ++ ++ private Gtk.Grid create_big_grid () { ++ grid = new Widgets.Grid (); ++ grid.show_all (); ++ ++ grid.on_event_add.connect ((date) => { ++ show_date_in_maya (date); ++ day_double_click (); ++ }); ++ ++ grid.selection_changed.connect ((date) => { ++ selected_date = date; ++ selection_changed (date); ++ }); ++ ++ return grid; ++ } ++ ++ public void show_today () { ++ var calmodel = Models.CalendarModel.get_default (); ++ var today = Util.strip_time (new GLib.DateTime.now_local ()); ++ var start = Util.get_start_of_month (today); ++ selected_date = today; ++ if (!start.equal (calmodel.month_start)) { ++ calmodel.month_start = start; ++ } ++ sync_with_model (); ++ ++ grid.set_focus_to_today (); ++ } ++ ++ // TODO: As far as maya supports it use the Dbus Activation feature to run the calendar-app. ++ public void show_date_in_maya (GLib.DateTime date) { ++ var command = "io.elementary.calendar --show-day %s".printf (date.format ("%F")); ++ ++ try { ++ var appinfo = AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE); ++ appinfo.launch_uris (null, null); ++ } catch (GLib.Error e) { ++ var dialog = new Granite.MessageDialog.with_image_from_icon_name ( ++ _("Unable To Launch Calendar"), ++ _("The program \"io.elementary.calendar\" may not be installed"), ++ "dialog-error" ++ ); ++ dialog.show_error_details (e.message); ++ dialog.run (); ++ dialog.destroy (); ++ } ++ } ++ ++ /* Sets the calendar widgets to the date range of the model */ ++ private void sync_with_model () { ++ var model = Models.CalendarModel.get_default (); ++ if (grid.grid_range != null && (model.data_range.equals (grid.grid_range) || grid.grid_range.first_dt.compare (model.data_range.first_dt) == 0)) { ++ grid.update_today (); ++ return; // nothing else to do ++ } ++ ++ GLib.DateTime previous_first = null; ++ if (grid.grid_range != null) ++ previous_first = grid.grid_range.first_dt; ++ ++ big_grid = create_big_grid (); ++ stack.add (big_grid); ++ ++ grid.set_range (model.data_range, model.month_start); ++ grid.update_weeks (model.data_range.first_dt, model.num_weeks); ++ ++ if (previous_first != null) { ++ if (previous_first.compare (grid.grid_range.first_dt) == -1) { ++ stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT; ++ } else { ++ stack.transition_type = Gtk.StackTransitionType.SLIDE_RIGHT; ++ } ++ } ++ ++ stack.set_visible_child (big_grid); ++ } ++ } ++} +diff --git a/src/Widgets/EventRow.vala b/src/Widgets/EventRow.vala +index 8e0513e..1268311 100644 +--- a/src/Widgets/EventRow.vala ++++ b/src/Widgets/EventRow.vala +@@ -17,104 +17,106 @@ + * Boston, MA 02110-1301 USA. + */ + +-public class DateTime.EventRow : Gtk.ListBoxRow { +- public GLib.DateTime date { get; construct; } +- public unowned ICal.Component component { get; construct; } +- public unowned E.SourceCalendar cal { get; construct; } +- +- public GLib.DateTime start_time { get; private set; } +- public GLib.DateTime? end_time { get; private set; } +- public bool is_allday { get; private set; default = false; } +- +- private static Services.TimeManager time_manager; +- private static Gtk.CssProvider css_provider; +- +- private Gtk.Grid grid; +- private Gtk.Image event_image; +- private Gtk.Label time_label; +- +- public EventRow (GLib.DateTime date, ICal.Component component, E.Source source) { +- Object ( +- component: component, +- date: date, +- cal: (E.SourceCalendar?) source.get_extension (E.SOURCE_EXTENSION_CALENDAR) +- ); +- } +- +- static construct { +- css_provider = new Gtk.CssProvider (); +- css_provider.load_from_resource ("/io/elementary/desktop/wingpanel/datetime/EventRow.css"); +- +- time_manager = Services.TimeManager.get_default (); +- } ++namespace DateTimeIndicator { ++ public class EventRow : Gtk.ListBoxRow { ++ public GLib.DateTime date { get; construct; } ++ public unowned ICal.Component component { get; construct; } ++ public unowned E.SourceCalendar cal { get; construct; } ++ ++ public GLib.DateTime start_time { get; private set; } ++ public GLib.DateTime? end_time { get; private set; } ++ public bool is_allday { get; private set; default = false; } ++ ++ private static Services.TimeManager time_manager; ++ private static Gtk.CssProvider css_provider; ++ ++ private Gtk.Grid grid; ++ private Gtk.Image event_image; ++ private Gtk.Label time_label; ++ ++ public EventRow (GLib.DateTime date, ICal.Component component, E.Source source) { ++ Object ( ++ component: component, ++ date: date, ++ cal: (E.SourceCalendar?) source.get_extension (E.SOURCE_EXTENSION_CALENDAR) ++ ); ++ } + +- construct { +- start_time = Util.ical_to_date_time (component.get_dtstart ()); +- end_time = Util.ical_to_date_time (component.get_dtend ()); ++ static construct { ++ css_provider = new Gtk.CssProvider (); ++ css_provider.load_from_resource ("/io/elementary/desktop/wingpanel/datetime/EventRow.css"); + +- if (end_time != null && Util.is_the_all_day (start_time, end_time)) { +- is_allday = true; ++ time_manager = Services.TimeManager.get_default (); + } + +- unowned string icon_name = "office-calendar-symbolic"; +- if (end_time == null) { +- icon_name = "alarm-symbolic"; ++ construct { ++ start_time = Util.ical_to_date_time (component.get_dtstart ()); ++ end_time = Util.ical_to_date_time (component.get_dtend ()); ++ ++ if (end_time != null && Util.is_the_all_day (start_time, end_time)) { ++ is_allday = true; ++ } ++ ++ unowned string icon_name = "office-calendar-symbolic"; ++ if (end_time == null) { ++ icon_name = "alarm-symbolic"; ++ } ++ ++ event_image = new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.MENU); ++ event_image.valign = Gtk.Align.START; ++ ++ unowned Gtk.StyleContext event_image_context = event_image.get_style_context (); ++ event_image_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++ ++ var name_label = new Gtk.Label (component.get_summary ()); ++ name_label.hexpand = true; ++ name_label.ellipsize = Pango.EllipsizeMode.END; ++ name_label.lines = 3; ++ name_label.max_width_chars = 30; ++ name_label.wrap = true; ++ name_label.wrap_mode = Pango.WrapMode.WORD_CHAR; ++ name_label.xalign = 0; ++ ++ unowned Gtk.StyleContext name_label_context = name_label.get_style_context (); ++ name_label_context.add_class ("title"); ++ name_label_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++ ++ time_label = new Gtk.Label (null); ++ time_label.use_markup = true; ++ time_label.xalign = 0; ++ time_label.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL); ++ ++ grid = new Gtk.Grid (); ++ grid.column_spacing = 6; ++ grid.margin = 3; ++ grid.margin_start = grid.margin_end = 6; ++ grid.attach (event_image, 0, 0); ++ grid.attach (name_label, 1, 0); ++ if (!is_allday) { ++ grid.attach (time_label, 1, 1); ++ } ++ ++ unowned Gtk.StyleContext grid_context = grid.get_style_context (); ++ grid_context.add_class ("event"); ++ grid_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++ ++ add (grid); ++ ++ set_color (); ++ cal.notify["color"].connect (set_color); ++ ++ update_timelabel (); ++ time_manager.notify["is-12h"].connect (update_timelabel); + } + +- event_image = new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.MENU); +- event_image.valign = Gtk.Align.START; +- +- unowned Gtk.StyleContext event_image_context = event_image.get_style_context (); +- event_image_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); +- +- var name_label = new Gtk.Label (component.get_summary ()); +- name_label.hexpand = true; +- name_label.ellipsize = Pango.EllipsizeMode.END; +- name_label.lines = 3; +- name_label.max_width_chars = 30; +- name_label.wrap = true; +- name_label.wrap_mode = Pango.WrapMode.WORD_CHAR; +- name_label.xalign = 0; +- +- unowned Gtk.StyleContext name_label_context = name_label.get_style_context (); +- name_label_context.add_class ("title"); +- name_label_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); +- +- time_label = new Gtk.Label (null); +- time_label.use_markup = true; +- time_label.xalign = 0; +- time_label.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL); +- +- grid = new Gtk.Grid (); +- grid.column_spacing = 6; +- grid.margin = 3; +- grid.margin_start = grid.margin_end = 6; +- grid.attach (event_image, 0, 0); +- grid.attach (name_label, 1, 0); +- if (!is_allday) { +- grid.attach (time_label, 1, 1); ++ private void update_timelabel () { ++ var time_format = Granite.DateTime.get_default_time_format (time_manager.is_12h); ++ time_label.label = "<small>%s – %s</small>".printf (start_time.format (time_format), end_time.format (time_format)); + } + +- unowned Gtk.StyleContext grid_context = grid.get_style_context (); +- grid_context.add_class ("event"); +- grid_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); +- +- add (grid); +- +- set_color (); +- cal.notify["color"].connect (set_color); +- +- update_timelabel (); +- time_manager.notify["is-12h"].connect (update_timelabel); +- } +- +- private void update_timelabel () { +- var time_format = Granite.DateTime.get_default_time_format (time_manager.is_12h); +- time_label.label = "<small>%s – %s</small>".printf (start_time.format (time_format), end_time.format (time_format)); +- } +- +- private void set_color () { +- Util.set_event_calendar_color (cal, grid); +- Util.set_event_calendar_color (cal, event_image); ++ private void set_color () { ++ Util.set_event_calendar_color (cal, grid); ++ Util.set_event_calendar_color (cal, event_image); ++ } + } + } +diff --git a/src/Widgets/calendar/Grid.vala b/src/Widgets/Grid.vala +similarity index 95% +rename from src/Widgets/calendar/Grid.vala +rename to src/Widgets/Grid.vala +index 2b48636..165d11d 100644 +--- a/src/Widgets/calendar/Grid.vala ++++ b/src/Widgets/Grid.vala +@@ -20,11 +20,11 @@ + * Corentin Noël <corentin@elementaryos.org> + */ + +-namespace DateTime.Widgets { ++namespace DateTimeIndicator { + /** + * Represents the entire date grid as a table. + */ +- public class Grid : Gtk.Grid { ++ public class Widgets.Grid : Gtk.Grid { + public Util.DateRange grid_range { get; private set; } + + /* +@@ -59,7 +59,7 @@ namespace DateTime.Widgets { + hexpand = true; + attach (week_sep_revealer, 1, 1, 1, 6); + +- DateTime.Indicator.settings.bind ("show-weeks", week_sep_revealer, "reveal-child", GLib.SettingsBindFlags.DEFAULT); ++ Indicator.settings.bind ("show-weeks", week_sep_revealer, "reveal-child", GLib.SettingsBindFlags.DEFAULT); + + data = new Gee.HashMap<uint, GridDay> (); + events |= Gdk.EventMask.SCROLL_MASK; +@@ -77,7 +77,7 @@ namespace DateTime.Widgets { + day.set_selected (true); + day.set_state_flags (Gtk.StateFlags.FOCUSED, false); + selection_changed (selected_date); +- var calmodel = CalendarModel.get_default (); ++ var calmodel = Models.CalendarModel.get_default (); + var date_month = selected_date.get_month () - calmodel.month_start.get_month (); + var date_year = selected_date.get_year () - calmodel.month_start.get_year (); + +@@ -127,7 +127,7 @@ namespace DateTime.Widgets { + /* Create new widgets for the new range */ + + var date = Util.strip_time (today); +- date = date.add_days (CalendarModel.get_default ().week_starts_on - date.get_day_of_week ()); ++ date = date.add_days (Models.CalendarModel.get_default ().week_starts_on - date.get_day_of_week ()); + foreach (var label in header_labels) { + label.label = date.format ("%a"); + date = date.add_days (1); +@@ -221,7 +221,7 @@ namespace DateTime.Widgets { + week_labels[c].add (week_label); + week_labels[c].show_all (); + +- DateTime.Indicator.settings.bind ("show-weeks", week_labels[c], "reveal-child", GLib.SettingsBindFlags.DEFAULT); ++ Indicator.settings.bind ("show-weeks", week_labels[c], "reveal-child", GLib.SettingsBindFlags.DEFAULT); + + attach (week_labels[c], 0, c + 1); + +diff --git a/src/Widgets/GridDay.vala b/src/Widgets/GridDay.vala +new file mode 100644 +index 0000000..8c44443 +--- /dev/null ++++ b/src/Widgets/GridDay.vala +@@ -0,0 +1,180 @@ ++// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*- ++/*- ++ * Copyright (c) 2011–2018 elementary, Inc. (https://elementary.io) ++ * ++ * This program is free software: you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation, either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ * ++ * Authored by: Maxwell Barvian ++ * Corentin Noël <corentin@elementaryos.org> ++ */ ++ ++namespace DateTimeIndicator { ++/** ++ * Represents a single day on the grid. ++ */ ++ public class Widgets.GridDay : Gtk.EventBox { ++ /* ++ * Event emitted when the day is double clicked or the ENTER key is pressed. ++ */ ++ public signal void on_event_add (GLib.DateTime date); ++ ++ public GLib.DateTime date { get; construct set; } ++ ++ private static Gtk.CssProvider provider; ++ private static Models.CalendarModel model; ++ ++ private Gee.HashMap<string, Gtk.Widget> event_dots; ++ private Gtk.Grid event_grid; ++ private Gtk.Label label; ++ private bool valid_grab = false; ++ ++ public GridDay (GLib.DateTime date) { ++ Object (date: date); ++ } ++ ++ static construct { ++ model = Models.CalendarModel.get_default (); ++ ++ provider = new Gtk.CssProvider (); ++ provider.load_from_resource ("/io/elementary/desktop/wingpanel/datetime/GridDay.css"); ++ } ++ ++ construct { ++ unowned Gtk.StyleContext style_context = get_style_context (); ++ style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++ style_context.add_class ("circular"); ++ ++ label = new Gtk.Label (null); ++ ++ event_grid = new Gtk.Grid (); ++ event_grid.halign = Gtk.Align.CENTER; ++ event_grid.height_request = 6; ++ ++ var grid = new Gtk.Grid (); ++ grid.halign = grid.valign = Gtk.Align.CENTER; ++ grid.attach (label, 0, 0); ++ grid.attach (event_grid, 0, 1); ++ ++ can_focus = true; ++ events |= Gdk.EventMask.BUTTON_PRESS_MASK; ++ events |= Gdk.EventMask.KEY_PRESS_MASK; ++ events |= Gdk.EventMask.SMOOTH_SCROLL_MASK; ++ set_size_request (35, 35); ++ halign = Gtk.Align.CENTER; ++ hexpand = true; ++ add (grid); ++ show_all (); ++ ++ // Signals and handlers ++ button_press_event.connect (on_button_press); ++ key_press_event.connect (on_key_press); ++ scroll_event.connect ((event) => {return Util.on_scroll_event (event);}); ++ ++ notify["date"].connect (() => { ++ label.label = date.get_day_of_month ().to_string (); ++ }); ++ ++ event_dots = new Gee.HashMap<string, Gtk.Widget> (); ++ ++ model.events_added.connect (add_event_dots); ++ model.events_removed.connect (remove_event_dots); ++ } ++ ++ private void add_event_dots (E.Source source, Gee.Collection<ECal.Component> events) { ++ foreach (var component in events) { ++ if (event_dots.size >= 3) { ++ return; ++ } ++ ++ if (Util.calcomp_is_on_day (component, date)) { ++ unowned ICal.Component ical = component.get_icalcomponent (); ++ ++ var event_uid = ical.get_uid (); ++ if (!event_dots.has_key (event_uid)) { ++ var event_dot = new Gtk.Image (); ++ event_dot.gicon = new ThemedIcon ("pager-checked-symbolic"); ++ event_dot.pixel_size = 6; ++ ++ unowned Gtk.StyleContext style_context = event_dot.get_style_context (); ++ style_context.add_class (Granite.STYLE_CLASS_ACCENT); ++ style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++ ++ var source_calendar = (E.SourceCalendar?) source.get_extension (E.SOURCE_EXTENSION_CALENDAR); ++ Util.set_event_calendar_color (source_calendar, event_dot); ++ ++ event_dots[event_uid] = event_dot; ++ ++ event_grid.add (event_dot); ++ } ++ } ++ } ++ ++ event_grid.show_all (); ++ } ++ ++ private void remove_event_dots (E.Source source, Gee.Collection<ECal.Component> events) { ++ foreach (var component in events) { ++ unowned ICal.Component ical = component.get_icalcomponent (); ++ var event_uid = ical.get_uid (); ++ var dot = event_dots[event_uid]; ++ if (dot != null) { ++ dot.destroy (); ++ event_dots.remove (event_uid); ++ } ++ } ++ } ++ ++ public void set_selected (bool selected) { ++ if (selected) { ++ set_state_flags (Gtk.StateFlags.SELECTED, true); ++ } else { ++ set_state_flags (Gtk.StateFlags.NORMAL, true); ++ } ++ } ++ ++ public void grab_focus_force () { ++ valid_grab = true; ++ grab_focus (); ++ } ++ ++ public override void grab_focus () { ++ if (valid_grab) { ++ base.grab_focus (); ++ valid_grab = false; ++ } ++ } ++ ++ public void sensitive_container (bool sens) { ++ label.sensitive = sens; ++ event_grid.sensitive = sens; ++ } ++ ++ private bool on_button_press (Gdk.EventButton event) { ++ if (event.type == Gdk.EventType.2BUTTON_PRESS && event.button == Gdk.BUTTON_PRIMARY) ++ on_event_add (date); ++ valid_grab = true; ++ grab_focus (); ++ return false; ++ } ++ ++ private bool on_key_press (Gdk.EventKey event) { ++ if (event.keyval == Gdk.keyval_from_name ("Return") ) { ++ on_event_add (date); ++ return true; ++ } ++ ++ return false; ++ } ++ } ++} +diff --git a/src/Widgets/PanelLabel.vala b/src/Widgets/PanelLabel.vala +index f253f9b..dff9a21 100644 +--- a/src/Widgets/PanelLabel.vala ++++ b/src/Widgets/PanelLabel.vala +@@ -17,55 +17,57 @@ + * Boston, MA 02110-1301 USA. + */ + +-public class DateTime.Widgets.PanelLabel : Gtk.Grid { +- private Gtk.Label date_label; +- private Gtk.Label time_label; +- private Services.TimeManager time_manager; ++namespace DateTimeIndicator { ++ public class Widgets.PanelLabel : Gtk.Grid { ++ private Gtk.Label date_label; ++ private Gtk.Label time_label; ++ private Services.TimeManager time_manager; + +- public string clock_format { get; set; } +- public bool clock_show_seconds { get; set; } +- public bool clock_show_weekday { get; set; } ++ public string clock_format { get; set; } ++ public bool clock_show_seconds { get; set; } ++ public bool clock_show_weekday { get; set; } + +- construct { +- date_label = new Gtk.Label (null); +- date_label.margin_end = 12; ++ construct { ++ date_label = new Gtk.Label (null); ++ date_label.margin_end = 12; + +- var date_revealer = new Gtk.Revealer (); +- date_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_LEFT; +- date_revealer.add (date_label); ++ var date_revealer = new Gtk.Revealer (); ++ date_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_LEFT; ++ date_revealer.add (date_label); + +- time_label = new Gtk.Label (null); ++ time_label = new Gtk.Label (null); + +- valign = Gtk.Align.CENTER; +- add (date_revealer); +- add (time_label); ++ valign = Gtk.Align.CENTER; ++ add (date_revealer); ++ add (time_label); + +- var clock_settings = new GLib.Settings ("io.elementary.desktop.wingpanel.datetime"); +- clock_settings.bind ("clock-format", this, "clock-format", SettingsBindFlags.DEFAULT); +- clock_settings.bind ("clock-show-seconds", this, "clock-show-seconds", SettingsBindFlags.DEFAULT); +- clock_settings.bind ("clock-show-date", date_revealer, "reveal_child", SettingsBindFlags.DEFAULT); +- clock_settings.bind ("clock-show-weekday", this, "clock-show-weekday", SettingsBindFlags.DEFAULT); ++ var clock_settings = new GLib.Settings ("io.elementary.desktop.wingpanel.datetime"); ++ clock_settings.bind ("clock-format", this, "clock-format", SettingsBindFlags.DEFAULT); ++ clock_settings.bind ("clock-show-seconds", this, "clock-show-seconds", SettingsBindFlags.DEFAULT); ++ clock_settings.bind ("clock-show-date", date_revealer, "reveal_child", SettingsBindFlags.DEFAULT); ++ clock_settings.bind ("clock-show-weekday", this, "clock-show-weekday", SettingsBindFlags.DEFAULT); + +- notify.connect (() => { +- update_labels (); +- }); ++ notify.connect (() => { ++ update_labels (); ++ }); + +- time_manager = Services.TimeManager.get_default (); +- time_manager.minute_changed.connect (update_labels); +- time_manager.notify["is-12h"].connect (update_labels); +- } +- +- private void update_labels () { +- string date_format; +- if (clock_format == "ISO8601") { +- date_format = "%F"; +- } else { +- date_format = Granite.DateTime.get_default_date_format (clock_show_weekday, true, false); ++ time_manager = Services.TimeManager.get_default (); ++ time_manager.minute_changed.connect (update_labels); ++ time_manager.notify["is-12h"].connect (update_labels); + } + +- date_label.label = time_manager.format (date_format); ++ private void update_labels () { ++ string date_format; ++ if (clock_format == "ISO8601") { ++ date_format = "%F"; ++ } else { ++ date_format = Granite.DateTime.get_default_date_format (clock_show_weekday, true, false); ++ } + +- string time_format = Granite.DateTime.get_default_time_format (time_manager.is_12h, clock_show_seconds); +- time_label.label = time_manager.format (time_format); ++ date_label.label = time_manager.format (date_format); ++ ++ string time_format = Granite.DateTime.get_default_time_format (time_manager.is_12h, clock_show_seconds); ++ time_label.label = time_manager.format (time_format); ++ } + } + } +diff --git a/src/Widgets/calendar/CalendarView.vala b/src/Widgets/calendar/CalendarView.vala +deleted file mode 100644 +index ef3f8f9..0000000 +--- a/src/Widgets/calendar/CalendarView.vala ++++ /dev/null +@@ -1,183 +0,0 @@ +-/*- +- * Copyright (c) 2011–2018 elementary, Inc. (https://elementary.io) +- * +- * This program is free software: you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program. If not, see <http://www.gnu.org/licenses/>. +- * +- * Authored by: Maxwell Barvian +- * Corentin Noël <corentin@elementaryos.org> +- */ +- +-public class DateTime.Widgets.CalendarView : Gtk.Grid { +- public signal void day_double_click (); +- public signal void event_updates (); +- public signal void selection_changed (GLib.DateTime? new_date); +- +- public GLib.DateTime? selected_date { get; private set; } +- +- private Grid grid; +- private Gtk.Stack stack; +- private Gtk.Grid big_grid; +- +- construct { +- var label = new Gtk.Label (new GLib.DateTime.now_local ().format (_("%OB, %Y"))); +- label.hexpand = true; +- label.margin_start = 6; +- label.xalign = 0; +- label.width_chars = 13; +- +- var provider = new Gtk.CssProvider (); +- provider.load_from_resource ("/io/elementary/desktop/wingpanel/datetime/ControlHeader.css"); +- +- var label_style_context = label.get_style_context (); +- label_style_context.add_class ("header-label"); +- label_style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); +- +- var left_button = new Gtk.Button.from_icon_name ("pan-start-symbolic"); +- var center_button = new Gtk.Button.from_icon_name ("office-calendar-symbolic"); +- center_button.tooltip_text = _("Go to today's date"); +- var right_button = new Gtk.Button.from_icon_name ("pan-end-symbolic"); +- +- var box_buttons = new Gtk.Grid (); +- box_buttons.margin_end = 6; +- box_buttons.valign = Gtk.Align.CENTER; +- box_buttons.get_style_context ().add_class (Gtk.STYLE_CLASS_LINKED); +- box_buttons.add (left_button); +- box_buttons.add (center_button); +- box_buttons.add (right_button); +- +- big_grid = create_big_grid (); +- +- stack = new Gtk.Stack (); +- stack.add (big_grid); +- stack.show_all (); +- stack.expand = true; +- +- stack.notify["transition-running"].connect (() => { +- if (stack.transition_running == false) { +- stack.get_children ().foreach ((child) => { +- if (child != stack.visible_child) { +- child.destroy (); +- } +- }); +- } +- }); +- +- column_spacing = 6; +- row_spacing = 6; +- margin_start = margin_end = 10; +- attach (label, 0, 0); +- attach (box_buttons, 1, 0); +- attach (stack, 0, 1, 2); +- +- var model = CalendarModel.get_default (); +- model.notify["data-range"].connect (() => { +- label.label = model.month_start.format (_("%OB, %Y")); +- +- sync_with_model (); +- +- selected_date = null; +- selection_changed (selected_date); +- }); +- +- left_button.clicked.connect (() => { +- model.change_month (-1); +- }); +- +- right_button.clicked.connect (() => { +- model.change_month (1); +- }); +- +- center_button.clicked.connect (() => { +- show_today (); +- }); +- } +- +- private Gtk.Grid create_big_grid () { +- grid = new DateTime.Widgets.Grid (); +- grid.show_all (); +- +- grid.on_event_add.connect ((date) => { +- show_date_in_maya (date); +- day_double_click (); +- }); +- +- grid.selection_changed.connect ((date) => { +- selected_date = date; +- selection_changed (date); +- }); +- +- return grid; +- } +- +- public void show_today () { +- var calmodel = CalendarModel.get_default (); +- var today = Util.strip_time (new GLib.DateTime.now_local ()); +- var start = Util.get_start_of_month (today); +- selected_date = today; +- if (!start.equal (calmodel.month_start)) { +- calmodel.month_start = start; +- } +- sync_with_model (); +- +- grid.set_focus_to_today (); +- } +- +- // TODO: As far as maya supports it use the Dbus Activation feature to run the calendar-app. +- public void show_date_in_maya (GLib.DateTime date) { +- var command = "io.elementary.calendar --show-day %s".printf (date.format ("%F")); +- +- try { +- var appinfo = AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE); +- appinfo.launch_uris (null, null); +- } catch (GLib.Error e) { +- var dialog = new Granite.MessageDialog.with_image_from_icon_name ( +- _("Unable To Launch Calendar"), +- _("The program \"io.elementary.calendar\" may not be installed"), +- "dialog-error" +- ); +- dialog.show_error_details (e.message); +- dialog.run (); +- dialog.destroy (); +- } +- } +- +- /* Sets the calendar widgets to the date range of the model */ +- private void sync_with_model () { +- var model = CalendarModel.get_default (); +- if (grid.grid_range != null && (model.data_range.equals (grid.grid_range) || grid.grid_range.first_dt.compare (model.data_range.first_dt) == 0)) { +- grid.update_today (); +- return; // nothing else to do +- } +- +- GLib.DateTime previous_first = null; +- if (grid.grid_range != null) +- previous_first = grid.grid_range.first_dt; +- +- big_grid = create_big_grid (); +- stack.add (big_grid); +- +- grid.set_range (model.data_range, model.month_start); +- grid.update_weeks (model.data_range.first_dt, model.num_weeks); +- +- if (previous_first != null) { +- if (previous_first.compare (grid.grid_range.first_dt) == -1) { +- stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT; +- } else { +- stack.transition_type = Gtk.StackTransitionType.SLIDE_RIGHT; +- } +- } +- +- stack.set_visible_child (big_grid); +- } +-} +diff --git a/src/Widgets/calendar/GridDay.vala b/src/Widgets/calendar/GridDay.vala +deleted file mode 100644 +index a9b5a28..0000000 +--- a/src/Widgets/calendar/GridDay.vala ++++ /dev/null +@@ -1,178 +0,0 @@ +-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*- +-/*- +- * Copyright (c) 2011–2018 elementary, Inc. (https://elementary.io) +- * +- * This program is free software: you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program. If not, see <http://www.gnu.org/licenses/>. +- * +- * Authored by: Maxwell Barvian +- * Corentin Noël <corentin@elementaryos.org> +- */ +- +-/** +- * Represents a single day on the grid. +- */ +-public class DateTime.Widgets.GridDay : Gtk.EventBox { +- /* +- * Event emitted when the day is double clicked or the ENTER key is pressed. +- */ +- public signal void on_event_add (GLib.DateTime date); +- +- public GLib.DateTime date { get; construct set; } +- +- private static Gtk.CssProvider provider; +- private static Widgets.CalendarModel model; +- +- private Gee.HashMap<string, Gtk.Widget> event_dots; +- private Gtk.Grid event_grid; +- private Gtk.Label label; +- private bool valid_grab = false; +- +- public GridDay (GLib.DateTime date) { +- Object (date: date); +- } +- +- static construct { +- model = Widgets.CalendarModel.get_default (); +- +- provider = new Gtk.CssProvider (); +- provider.load_from_resource ("/io/elementary/desktop/wingpanel/datetime/GridDay.css"); +- } +- +- construct { +- unowned Gtk.StyleContext style_context = get_style_context (); +- style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); +- style_context.add_class ("circular"); +- +- label = new Gtk.Label (null); +- +- event_grid = new Gtk.Grid (); +- event_grid.halign = Gtk.Align.CENTER; +- event_grid.height_request = 6; +- +- var grid = new Gtk.Grid (); +- grid.halign = grid.valign = Gtk.Align.CENTER; +- grid.attach (label, 0, 0); +- grid.attach (event_grid, 0, 1); +- +- can_focus = true; +- events |= Gdk.EventMask.BUTTON_PRESS_MASK; +- events |= Gdk.EventMask.KEY_PRESS_MASK; +- events |= Gdk.EventMask.SMOOTH_SCROLL_MASK; +- set_size_request (35, 35); +- halign = Gtk.Align.CENTER; +- hexpand = true; +- add (grid); +- show_all (); +- +- // Signals and handlers +- button_press_event.connect (on_button_press); +- key_press_event.connect (on_key_press); +- scroll_event.connect ((event) => {return Util.on_scroll_event (event);}); +- +- notify["date"].connect (() => { +- label.label = date.get_day_of_month ().to_string (); +- }); +- +- event_dots = new Gee.HashMap<string, Gtk.Widget> (); +- +- model.events_added.connect (add_event_dots); +- model.events_removed.connect (remove_event_dots); +- } +- +- private void add_event_dots (E.Source source, Gee.Collection<ECal.Component> events) { +- foreach (var component in events) { +- if (event_dots.size >= 3) { +- return; +- } +- +- if (Util.calcomp_is_on_day (component, date)) { +- unowned ICal.Component ical = component.get_icalcomponent (); +- +- var event_uid = ical.get_uid (); +- if (!event_dots.has_key (event_uid)) { +- var event_dot = new Gtk.Image (); +- event_dot.gicon = new ThemedIcon ("pager-checked-symbolic"); +- event_dot.pixel_size = 6; +- +- unowned Gtk.StyleContext style_context = event_dot.get_style_context (); +- style_context.add_class (Granite.STYLE_CLASS_ACCENT); +- style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); +- +- var source_calendar = (E.SourceCalendar?) source.get_extension (E.SOURCE_EXTENSION_CALENDAR); +- Util.set_event_calendar_color (source_calendar, event_dot); +- +- event_dots[event_uid] = event_dot; +- +- event_grid.add (event_dot); +- } +- } +- } +- +- event_grid.show_all (); +- } +- +- private void remove_event_dots (E.Source source, Gee.Collection<ECal.Component> events) { +- foreach (var component in events) { +- unowned ICal.Component ical = component.get_icalcomponent (); +- var event_uid = ical.get_uid (); +- var dot = event_dots[event_uid]; +- if (dot != null) { +- dot.destroy (); +- event_dots.remove (event_uid); +- } +- } +- } +- +- public void set_selected (bool selected) { +- if (selected) { +- set_state_flags (Gtk.StateFlags.SELECTED, true); +- } else { +- set_state_flags (Gtk.StateFlags.NORMAL, true); +- } +- } +- +- public void grab_focus_force () { +- valid_grab = true; +- grab_focus (); +- } +- +- public override void grab_focus () { +- if (valid_grab) { +- base.grab_focus (); +- valid_grab = false; +- } +- } +- +- public void sensitive_container (bool sens) { +- label.sensitive = sens; +- event_grid.sensitive = sens; +- } +- +- private bool on_button_press (Gdk.EventButton event) { +- if (event.type == Gdk.EventType.2BUTTON_PRESS && event.button == Gdk.BUTTON_PRIMARY) +- on_event_add (date); +- valid_grab = true; +- grab_focus (); +- return false; +- } +- +- private bool on_key_press (Gdk.EventKey event) { +- if (event.keyval == Gdk.keyval_from_name ("Return") ) { +- on_event_add (date); +- return true; +- } +- +- return false; +- } +-} + +From 11f11073d74dac1d831560c3a92687531aaf846e Mon Sep 17 00:00:00 2001 +From: Dirli <litandrej85@gmail.com> +Date: Thu, 9 Apr 2020 20:46:31 +0300 +Subject: [PATCH 2/8] Events list moved to a separate file + +--- + meson.build | 1 + + src/Indicator.vala | 113 +++------------------------------ + src/Widgets/EventsListBox.vala | 102 +++++++++++++++++++++++++++++ + 3 files changed, 113 insertions(+), 103 deletions(-) + create mode 100644 src/Widgets/EventsListBox.vala + +diff --git a/meson.build b/meson.build +index b44c5bd..1b52276 100644 +--- a/meson.build ++++ b/meson.build +@@ -46,6 +46,7 @@ shared_module( + 'src/Models/CalendarModel.vala', + 'src/Widgets/CalendarView.vala', + 'src/Widgets/EventRow.vala', ++ 'src/Widgets/EventsListBox.vala', + 'src/Widgets/Grid.vala', + 'src/Widgets/GridDay.vala', + 'src/Widgets/PanelLabel.vala', +diff --git a/src/Indicator.vala b/src/Indicator.vala +index b712c12..6a8d001 100644 +--- a/src/Indicator.vala ++++ b/src/Indicator.vala +@@ -22,9 +22,9 @@ namespace DateTimeIndicator { + public static GLib.Settings settings; + + private Widgets.PanelLabel panel_label; +- private Gtk.Grid main_grid; + private Widgets.CalendarView calendar; +- private Gtk.ListBox event_listbox; ++ private Widgets.EventsListBox event_listbox; ++ private Gtk.Grid main_grid; + private uint update_events_idle_source = 0; + + public Indicator () { +@@ -56,24 +56,7 @@ namespace DateTimeIndicator { + calendar = new Widgets.CalendarView (); + calendar.margin_bottom = 6; + +- var placeholder_label = new Gtk.Label (_("No Events on This Day")); +- placeholder_label.wrap = true; +- placeholder_label.wrap_mode = Pango.WrapMode.WORD; +- placeholder_label.margin_start = 12; +- placeholder_label.margin_end = 12; +- placeholder_label.max_width_chars = 20; +- placeholder_label.justify = Gtk.Justification.CENTER; +- placeholder_label.show_all (); +- +- var placeholder_style_context = placeholder_label.get_style_context (); +- placeholder_style_context.add_class (Gtk.STYLE_CLASS_DIM_LABEL); +- placeholder_style_context.add_class (Granite.STYLE_CLASS_H3_LABEL); +- +- event_listbox = new Gtk.ListBox (); +- event_listbox.selection_mode = Gtk.SelectionMode.NONE; +- event_listbox.set_header_func (header_update_func); +- event_listbox.set_placeholder (placeholder_label); +- event_listbox.set_sort_func (sort_function); ++ event_listbox = new Widgets.EventsListBox (); + + var scrolled_window = new Gtk.ScrolledWindow (null, null); + scrolled_window.hscrollbar_policy = Gtk.PolicyType.NEVER; +@@ -84,11 +67,11 @@ namespace DateTimeIndicator { + + main_grid = new Gtk.Grid (); + main_grid.margin_top = 12; +- main_grid.attach (calendar, 0, 0); +- main_grid.attach (new Gtk.Separator (Gtk.Orientation.VERTICAL), 1, 0); +- main_grid.attach (scrolled_window, 2, 0); +- main_grid.attach (new Wingpanel.Widgets.Separator (), 0, 2, 3); +- main_grid.attach (settings_button, 0, 3, 3); ++ main_grid.attach (calendar, 0, 0); ++ main_grid.attach (new Wingpanel.Widgets.Separator (), 0, 1); ++ main_grid.attach (settings_button, 0, 2); ++ main_grid.attach (new Gtk.Separator (Gtk.Orientation.VERTICAL), 1, 0, 1, 3); ++ main_grid.attach (scrolled_window, 2, 0, 1, 3); + + var size_group = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL); + size_group.add_widget (calendar); +@@ -119,52 +102,6 @@ namespace DateTimeIndicator { + return main_grid; + } + +- private void header_update_func (Gtk.ListBoxRow lbrow, Gtk.ListBoxRow? lbbefore) { +- var row = (EventRow) lbrow; +- if (lbbefore != null) { +- var before = (EventRow) lbbefore; +- if (row.is_allday == before.is_allday) { +- row.set_header (null); +- return; +- } +- +- if (row.is_allday != before.is_allday) { +- var header_label = new Granite.HeaderLabel (_("During the Day")); +- header_label.margin_start = header_label.margin_end = 6; +- +- row.set_header (header_label); +- return; +- } +- } else { +- if (row.is_allday) { +- var allday_header = new Granite.HeaderLabel (_("All Day")); +- allday_header.margin_start = allday_header.margin_end = 6; +- +- row.set_header (allday_header); +- } +- return; +- } +- } +- +- [CCode (instance_pos = -1)] +- private int sort_function (Gtk.ListBoxRow child1, Gtk.ListBoxRow child2) { +- var e1 = (EventRow) child1; +- var e2 = (EventRow) child2; +- +- if (e1.start_time.compare (e2.start_time) != 0) { +- return e1.start_time.compare (e2.start_time); +- } +- +- // If they have the same date, sort them wholeday first +- if (e1.is_allday) { +- return -1; +- } else if (e2.is_allday) { +- return 1; +- } +- +- return 0; +- } +- + private void update_events_model (E.Source source, Gee.Collection<ECal.Component> events) { + idle_update_events (); + } +@@ -174,42 +111,12 @@ namespace DateTimeIndicator { + GLib.Source.remove (update_events_idle_source); + } + +- update_events_idle_source = GLib.Idle.add (update_events); +- } +- +- private bool update_events () { +- foreach (unowned Gtk.Widget widget in event_listbox.get_children ()) { +- widget.destroy (); +- } ++ update_events_idle_source = GLib.Idle.add (() => { ++ event_listbox.update_events (calendar.selected_date); + +- if (calendar.selected_date == null) { + update_events_idle_source = 0; + return GLib.Source.REMOVE; +- } +- +- var date = calendar.selected_date; +- +- var model = Models.CalendarModel.get_default (); +- +- var events_on_day = new Gee.TreeMap<string, EventRow> (); +- +- model.source_events.@foreach ((source, component_map) => { +- foreach (var comp in component_map.get_values ()) { +- if (Util.calcomp_is_on_day (comp, date)) { +- unowned ICal.Component ical = comp.get_icalcomponent (); +- var event_uid = ical.get_uid (); +- if (!events_on_day.has_key (event_uid)) { +- events_on_day[event_uid] = new EventRow (date, ical, source); +- +- event_listbox.add (events_on_day[event_uid]); +- } +- } +- } + }); +- +- event_listbox.show_all (); +- update_events_idle_source = 0; +- return GLib.Source.REMOVE; + } + + public override void opened () { +diff --git a/src/Widgets/EventsListBox.vala b/src/Widgets/EventsListBox.vala +new file mode 100644 +index 0000000..547e4c5 +--- /dev/null ++++ b/src/Widgets/EventsListBox.vala +@@ -0,0 +1,102 @@ ++namespace DateTimeIndicator { ++ public class Widgets.EventsListBox : Gtk.ListBox { ++ ++ public EventsListBox () { ++ selection_mode = Gtk.SelectionMode.NONE; ++ ++ var placeholder_label = new Gtk.Label (_("No Events on This Day")); ++ placeholder_label.wrap = true; ++ placeholder_label.wrap_mode = Pango.WrapMode.WORD; ++ placeholder_label.margin_start = 12; ++ placeholder_label.margin_end = 12; ++ placeholder_label.max_width_chars = 20; ++ placeholder_label.justify = Gtk.Justification.CENTER; ++ placeholder_label.show_all (); ++ ++ var placeholder_style_context = placeholder_label.get_style_context (); ++ placeholder_style_context.add_class (Gtk.STYLE_CLASS_DIM_LABEL); ++ placeholder_style_context.add_class (Granite.STYLE_CLASS_H3_LABEL); ++ ++ set_header_func (header_update_func); ++ set_placeholder (placeholder_label); ++ set_sort_func (sort_function); ++ } ++ ++ public void update_events (GLib.DateTime? selected_date) { ++ foreach (unowned Gtk.Widget widget in get_children ()) { ++ widget.destroy (); ++ } ++ ++ if (selected_date == null) { ++ return; ++ } ++ ++ var model = Models.CalendarModel.get_default (); ++ ++ var events_on_day = new Gee.TreeMap<string, EventRow> (); ++ ++ model.source_events.@foreach ((source, component_map) => { ++ foreach (var comp in component_map.get_values ()) { ++ if (Util.calcomp_is_on_day (comp, selected_date)) { ++ unowned ICal.Component ical = comp.get_icalcomponent (); ++ var event_uid = ical.get_uid (); ++ if (!events_on_day.has_key (event_uid)) { ++ events_on_day[event_uid] = new EventRow (selected_date, ical, source); ++ ++ add (events_on_day[event_uid]); ++ } ++ } ++ } ++ }); ++ ++ show_all (); ++ return; ++ } ++ ++ private void header_update_func (Gtk.ListBoxRow lbrow, Gtk.ListBoxRow? lbbefore) { ++ var row = (EventRow) lbrow; ++ if (lbbefore != null) { ++ var before = (EventRow) lbbefore; ++ if (row.is_allday == before.is_allday) { ++ row.set_header (null); ++ return; ++ } ++ ++ if (row.is_allday != before.is_allday) { ++ var header_label = new Granite.HeaderLabel (_("During the Day")); ++ header_label.margin_start = header_label.margin_end = 6; ++ ++ row.set_header (header_label); ++ return; ++ } ++ } else { ++ if (row.is_allday) { ++ var allday_header = new Granite.HeaderLabel (_("All Day")); ++ allday_header.margin_start = allday_header.margin_end = 6; ++ ++ row.set_header (allday_header); ++ } ++ return; ++ } ++ } ++ ++ [CCode (instance_pos = -1)] ++ private int sort_function (Gtk.ListBoxRow child1, Gtk.ListBoxRow child2) { ++ var e1 = (EventRow) child1; ++ var e2 = (EventRow) child2; ++ ++ if (e1.start_time.compare (e2.start_time) != 0) { ++ return e1.start_time.compare (e2.start_time); ++ } ++ ++ // If they have the same date, sort them wholeday first ++ if (e1.is_allday) { ++ return -1; ++ } else if (e2.is_allday) { ++ return 1; ++ } ++ ++ return 0; ++ } ++ } ++} + +From 262d91676f78f031bcfbff637344e52c63ab89bd Mon Sep 17 00:00:00 2001 +From: Dirli <litandrej85@gmail.com> +Date: Sat, 11 Apr 2020 21:56:33 +0300 +Subject: [PATCH 3/8] added event manager + +--- + meson.build | 1 + + src/Indicator.vala | 38 ++++-- + src/Models/CalendarModel.vala | 224 +------------------------------ + src/Services/EventsManager.vala | 226 ++++++++++++++++++++++++++++++++ + src/Util/Util.vala | 57 ++------ + src/Widgets/CalendarView.vala | 9 ++ + src/Widgets/EventsListBox.vala | 7 +- + src/Widgets/Grid.vala | 31 +++++ + src/Widgets/GridDay.vala | 111 +++++++++++----- + 9 files changed, 385 insertions(+), 319 deletions(-) + create mode 100644 src/Services/EventsManager.vala + +diff --git a/meson.build b/meson.build +index 1b52276..e348e3d 100644 +--- a/meson.build ++++ b/meson.build +@@ -50,6 +50,7 @@ shared_module( + 'src/Widgets/Grid.vala', + 'src/Widgets/GridDay.vala', + 'src/Widgets/PanelLabel.vala', ++ 'src/Services/EventsManager.vala', + 'src/Services/TimeManager.vala', + dependencies: [ + dependency('glib-2.0'), +diff --git a/src/Indicator.vala b/src/Indicator.vala +index 6a8d001..bf4358f 100644 +--- a/src/Indicator.vala ++++ b/src/Indicator.vala +@@ -24,9 +24,14 @@ namespace DateTimeIndicator { + private Widgets.PanelLabel panel_label; + private Widgets.CalendarView calendar; + private Widgets.EventsListBox event_listbox; ++ ++ private Services.EventsManager event_manager; ++ + private Gtk.Grid main_grid; + private uint update_events_idle_source = 0; + ++ private bool opened_widget = false; ++ + public Indicator () { + Object ( + code_name: Wingpanel.Indicator.DATETIME, +@@ -56,10 +61,22 @@ namespace DateTimeIndicator { + calendar = new Widgets.CalendarView (); + calendar.margin_bottom = 6; + ++ event_manager = new Services.EventsManager (); ++ event_manager.events_updated.connect (update_events_model); ++ event_manager.events_added.connect ((source, events) => { ++ calendar.add_event_dots (source, events); ++ update_events_model (source, events); ++ }); ++ event_manager.events_removed.connect ((source, events) => { ++ calendar.remove_event_dots (source, events); ++ update_events_model (source, events); ++ }); ++ + event_listbox = new Widgets.EventsListBox (); + + var scrolled_window = new Gtk.ScrolledWindow (null, null); + scrolled_window.hscrollbar_policy = Gtk.PolicyType.NEVER; ++ scrolled_window.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC; + scrolled_window.add (event_listbox); + + var settings_button = new Gtk.ModelButton (); +@@ -90,6 +107,12 @@ namespace DateTimeIndicator { + close (); + }); + ++ var model = Models.CalendarModel.get_default (); ++ model.notify["month-start"].connect (() => { ++ model.compute_ranges (); ++ event_manager.load_all_sources (); ++ }); ++ + settings_button.clicked.connect (() => { + try { + AppInfo.launch_default_for_uri ("settings://time", null); +@@ -103,7 +126,9 @@ namespace DateTimeIndicator { + } + + private void update_events_model (E.Source source, Gee.Collection<ECal.Component> events) { +- idle_update_events (); ++ if (opened_widget) { ++ idle_update_events (); ++ } + } + + private void idle_update_events () { +@@ -112,7 +137,7 @@ namespace DateTimeIndicator { + } + + update_events_idle_source = GLib.Idle.add (() => { +- event_listbox.update_events (calendar.selected_date); ++ event_listbox.update_events (calendar.selected_date, event_manager.source_events); + + update_events_idle_source = 0; + return GLib.Source.REMOVE; +@@ -122,18 +147,15 @@ namespace DateTimeIndicator { + public override void opened () { + calendar.show_today (); + +- Models.CalendarModel.get_default ().events_added.connect (update_events_model); +- Models.CalendarModel.get_default ().events_updated.connect (update_events_model); +- Models.CalendarModel.get_default ().events_removed.connect (update_events_model); ++ opened_widget = true; + } + + public override void closed () { +- Models.CalendarModel.get_default ().events_added.disconnect (update_events_model); +- Models.CalendarModel.get_default ().events_updated.disconnect (update_events_model); +- Models.CalendarModel.get_default ().events_removed.disconnect (update_events_model); ++ opened_widget = false; + } + } + } ++ + public Wingpanel.Indicator get_indicator (Module module) { + debug ("Activating DateTime Indicator"); + var indicator = new DateTimeIndicator.Indicator (); +diff --git a/src/Models/CalendarModel.vala b/src/Models/CalendarModel.vala +index 965b93e..d60a9ac 100644 +--- a/src/Models/CalendarModel.vala ++++ b/src/Models/CalendarModel.vala +@@ -35,17 +35,6 @@ namespace DateTimeIndicator { + /* The start of week, ie. Monday=1 or Sunday=7 */ + public GLib.DateWeekday week_starts_on { get; set; } + +- public HashTable<E.Source, Gee.TreeMultiMap<string, ECal.Component>> source_events { get; private set; } +- +- /* Notifies when events are added, updated, or removed */ +- public signal void events_added (E.Source source, Gee.Collection<ECal.Component> events); +- public signal void events_updated (E.Source source, Gee.Collection<ECal.Component> events); +- public signal void events_removed (E.Source source, Gee.Collection<ECal.Component> events); +- +- private E.SourceRegistry registry { get; private set; } +- private HashTable<string, ECal.Client> source_client; +- private HashTable<string, ECal.ClientView> source_view; +- + private static CalendarModel? calendar_model = null; + + public static CalendarModel get_default () { +@@ -59,12 +48,6 @@ namespace DateTimeIndicator { + } + + construct { +- open.begin (); +- +- source_client = new HashTable<string, ECal.Client> (str_hash, str_equal); +- source_events = new HashTable<E.Source, Gee.TreeMultiMap<string, ECal.Component> > (Util.source_hash_func, Util.source_equal_func); +- source_view = new HashTable<string, ECal.ClientView> (str_hash, str_equal); +- + int week_start = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0]; + if (week_start >= 1 && week_start <= 7) { + week_starts_on = (GLib.DateWeekday) (week_start - 1); +@@ -72,66 +55,6 @@ namespace DateTimeIndicator { + + month_start = Util.get_start_of_month (); + compute_ranges (); +- notify["month-start"].connect (on_parameter_changed); +- } +- +- private async void open () { +- try { +- registry = yield new E.SourceRegistry (null); +- registry.source_removed.connect (remove_source); +- registry.source_added.connect ((source) => add_source_async.begin (source)); +- +- // Add sources +- registry.list_sources (E.SOURCE_EXTENSION_CALENDAR).foreach ((source) => { +- E.SourceCalendar cal = (E.SourceCalendar)source.get_extension (E.SOURCE_EXTENSION_CALENDAR); +- if (cal.selected == true && source.enabled == true) { +- add_source_async.begin (source); +- } +- }); +- +- load_all_sources (); +- } catch (GLib.Error error) { +- critical (error.message); +- } +- } +- +- private void load_all_sources () { +- lock (source_client) { +- foreach (var id in source_client.get_keys ()) { +- var source = registry.ref_source (id); +- E.SourceCalendar cal = (E.SourceCalendar)source.get_extension (E.SOURCE_EXTENSION_CALENDAR); +- +- if (cal.selected == true && source.enabled == true) { +- load_source (source); +- } +- } +- } +- } +- +- private void remove_source (E.Source source) { +- debug ("Removing source '%s'", source.dup_display_name ()); +- /* Already out of the model, so do nothing */ +- unowned string uid = source.get_uid (); +- +- if (!source_view.contains (uid)) { +- return; +- } +- +- var current_view = source_view.get (uid); +- try { +- current_view.stop (); +- } catch (Error e) { +- warning (e.message); +- } +- +- source_view.remove (uid); +- lock (source_client) { +- source_client.remove (uid); +- } +- +- var events = source_events.get (source).get_values ().read_only_view; +- events_removed (source, events); +- source_events.remove (source); + } + + public void change_month (int relative) { +@@ -144,7 +67,7 @@ namespace DateTimeIndicator { + + /* --- Helper Methods ---// */ + +- private void compute_ranges () { ++ public void compute_ranges () { + var month_end = month_start.add_full (0, 1, -1); + + int dow = month_start.get_day_of_week (); +@@ -182,150 +105,5 @@ namespace DateTimeIndicator { + + debug (@"Date ranges: ($data_range_first <= $month_start < $month_end <= $data_range_last)"); + } +- +- private void load_source (E.Source source) { +- /* create empty source-event map */ +- var events = new Gee.TreeMultiMap<string, ECal.Component> ( +- (GLib.CompareDataFunc<ECal.Component>?) GLib.strcmp, +- (GLib.CompareDataFunc<ECal.Component>?) Util.calcomponent_compare_func +- ); +- source_events.set (source, events); +- /* query client view */ +- var iso_first = ECal.isodate_from_time_t ((time_t)data_range.first_dt.to_unix ()); +- var iso_last = ECal.isodate_from_time_t ((time_t)data_range.last_dt.add_days (1).to_unix ()); +- var query = @"(occur-in-time-range? (make-time \"$iso_first\") (make-time \"$iso_last\"))"; +- +- ECal.Client client; +- lock (source_client) { +- client = source_client.get (source.dup_uid ()); +- } +- +- if (client == null) { +- return; +- } +- +- debug ("Getting client-view for source '%s'", source.dup_display_name ()); +- client.get_view.begin (query, null, (obj, results) => { +- var view = on_client_view_received (results, source, client); +- view.objects_added.connect ((objects) => on_objects_added (source, client, objects)); +- view.objects_removed.connect ((objects) => on_objects_removed (source, client, objects)); +- view.objects_modified.connect ((objects) => on_objects_modified (source, client, objects)); +- try { +- view.start (); +- } catch (Error e) { +- critical (e.message); +- } +- +- source_view.set (source.dup_uid (), view); +- }); +- } +- +- private async void add_source_async (E.Source source) { +- debug ("Adding source '%s'", source.dup_display_name ()); +- try { +- var client = (ECal.Client) ECal.Client.connect_sync (source, ECal.ClientSourceType.EVENTS, -1, null); +- source_client.insert (source.dup_uid (), client); +- } catch (Error e) { +- critical (e.message); +- } +- +- Idle.add (() => { +- load_source (source); +- +- return false; +- }); +- } +- +- private void debug_event (E.Source source, ECal.Component event) { +- unowned ICal.Component comp = event.get_icalcomponent (); +- debug (@"Event ['$(comp.get_summary())', $(source.dup_display_name()), $(comp.get_uid()))]"); +- } +- +- /* --- Signal Handlers ---// */ +- private void on_parameter_changed () { +- compute_ranges (); +- load_all_sources (); +- } +- +- private ECal.ClientView on_client_view_received (AsyncResult results, E.Source source, ECal.Client client) { +- ECal.ClientView view; +- try { +- debug ("Received client-view for source '%s'", source.dup_display_name ()); +- bool status = client.get_view.end (results, out view); +- assert (status == true); +- } catch (Error e) { +- critical ("Error loading client-view from source '%s': %s", source.dup_display_name (), e.message); +- } +- +- return view; +- } +- +-#if E_CAL_2_0 +- private void on_objects_added (E.Source source, ECal.Client client, SList<ICal.Component> objects) { +-#else +- private void on_objects_added (E.Source source, ECal.Client client, SList<weak ICal.Component> objects) { +-#endif +- debug (@"Received $(objects.length()) added event(s) for source '%s'", source.dup_display_name ()); +- var events = source_events.get (source); +- var added_events = new Gee.ArrayList<ECal.Component> ((Gee.EqualDataFunc<ECal.Component>?) Util.calcomponent_equal_func); +- objects.foreach ((comp) => { +- unowned string uid = comp.get_uid (); +-#if E_CAL_2_0 +- client.generate_instances_for_object_sync (comp, (time_t) data_range.first_dt.to_unix (), (time_t) data_range.last_dt.to_unix (), null, (comp, start, end) => { +- var event = new ECal.Component.from_icalcomponent (comp); +-#else +- client.generate_instances_for_object_sync (comp, (time_t) data_range.first_dt.to_unix (), (time_t) data_range.last_dt.to_unix (), (event, start, end) => { +-#endif +- debug_event (source, event); +- events.set (uid, event); +- added_events.add (event); +- return true; +- }); +- }); +- } +- +-#if E_CAL_2_0 +- private void on_objects_modified (E.Source source, ECal.Client client, SList<ICal.Component> objects) { +-#else +- private void on_objects_modified (E.Source source, ECal.Client client, SList<weak ICal.Component> objects) { +-#endif +- debug (@"Received $(objects.length()) modified event(s) for source '%s'", source.dup_display_name ()); +- var updated_events = new Gee.ArrayList<ECal.Component> ((Gee.EqualDataFunc<ECal.Component>?) Util.calcomponent_equal_func); +- +- objects.foreach ((comp) => { +- unowned string uid = comp.get_uid (); +- var events = source_events.get (source).get (uid); +- updated_events.add_all (events); +- foreach (var event in events) { +- debug_event (source, event); +- } +- }); +- +- events_updated (source, updated_events.read_only_view); +- } +- +-#if E_CAL_2_0 +- private void on_objects_removed (E.Source source, ECal.Client client, SList<ECal.ComponentId?> cids) { +-#else +- private void on_objects_removed (E.Source source, ECal.Client client, SList<weak ECal.ComponentId?> cids) { +-#endif +- debug (@"Received $(cids.length()) removed event(s) for source '%s'", source.dup_display_name ()); +- var events = source_events.get (source); +- var removed_events = new Gee.ArrayList<ECal.Component> ((Gee.EqualDataFunc<ECal.Component>?) Util.calcomponent_equal_func); +- +- cids.foreach ((cid) => { +- if (cid == null) { +- return; +- } +- +- var comps = events.get (cid.get_uid ()); +- foreach (ECal.Component event in comps) { +- removed_events.add (event); +- debug_event (source, event); +- } +- }); +- +- events_removed (source, removed_events.read_only_view); +- } + } + } +diff --git a/src/Services/EventsManager.vala b/src/Services/EventsManager.vala +new file mode 100644 +index 0000000..d939777 +--- /dev/null ++++ b/src/Services/EventsManager.vala +@@ -0,0 +1,226 @@ ++namespace DateTimeIndicator { ++ public class Services.EventsManager : GLib.Object { ++ public signal void events_added (E.Source source, Gee.Collection<ECal.Component> events); ++ public signal void events_updated (E.Source source, Gee.Collection<ECal.Component> events); ++ public signal void events_removed (E.Source source, Gee.Collection<ECal.Component> events); ++ ++ public HashTable<E.Source, Gee.TreeMultiMap<string, ECal.Component>> source_events { get; private set; } ++ ++ private E.SourceRegistry registry { get; private set; } ++ private HashTable<string, ECal.Client> source_client; ++ private HashTable<string, ECal.ClientView> source_view; ++ ++ public EventsManager () { ++ ++ } ++ ++ construct { ++ source_client = new HashTable<string, ECal.Client> (str_hash, str_equal); ++ source_events = new HashTable<E.Source, Gee.TreeMultiMap<string, ECal.Component> > (Util.source_hash_func, Util.source_equal_func); ++ source_view = new HashTable<string, ECal.ClientView> (str_hash, str_equal); ++ ++ open.begin (); ++ } ++ ++ private async void open () { ++ try { ++ registry = yield new E.SourceRegistry (null); ++ registry.source_removed.connect (remove_source); ++ registry.source_added.connect ((source) => add_source_async.begin (source)); ++ ++ // Add sources ++ registry.list_sources (E.SOURCE_EXTENSION_CALENDAR).foreach ((source) => { ++ E.SourceCalendar cal = (E.SourceCalendar)source.get_extension (E.SOURCE_EXTENSION_CALENDAR); ++ if (cal.selected == true && source.enabled == true) { ++ add_source_async.begin (source); ++ } ++ }); ++ ++ load_all_sources (); ++ } catch (GLib.Error error) { ++ critical (error.message); ++ } ++ } ++ ++ public void load_all_sources () { ++ lock (source_client) { ++ foreach (var id in source_client.get_keys ()) { ++ var source = registry.ref_source (id); ++ E.SourceCalendar cal = (E.SourceCalendar)source.get_extension (E.SOURCE_EXTENSION_CALENDAR); ++ ++ if (cal.selected == true && source.enabled == true) { ++ load_source (source); ++ } ++ } ++ } ++ } ++ ++ private void remove_source (E.Source source) { ++ debug ("Removing source '%s'", source.dup_display_name ()); ++ /* Already out of the model, so do nothing */ ++ unowned string uid = source.get_uid (); ++ ++ if (!source_view.contains (uid)) { ++ return; ++ } ++ ++ var current_view = source_view.get (uid); ++ try { ++ current_view.stop (); ++ } catch (Error e) { ++ warning (e.message); ++ } ++ ++ source_view.remove (uid); ++ lock (source_client) { ++ source_client.remove (uid); ++ } ++ ++ var events = source_events.get (source).get_values ().read_only_view; ++ events_removed (source, events); ++ source_events.remove (source); ++ } ++ ++ private void load_source (E.Source source) { ++ var model = Models.CalendarModel.get_default (); ++ ++ /* create empty source-event map */ ++ var events = new Gee.TreeMultiMap<string, ECal.Component> ( ++ (GLib.CompareDataFunc<ECal.Component>?) GLib.strcmp, ++ (GLib.CompareDataFunc<ECal.Component>?) Util.calcomponent_compare_func ++ ); ++ source_events.set (source, events); ++ /* query client view */ ++ var iso_first = ECal.isodate_from_time_t ((time_t) model.data_range.first_dt.to_unix ()); ++ var iso_last = ECal.isodate_from_time_t ((time_t) model.data_range.last_dt.add_days (1).to_unix ()); ++ var query = @"(occur-in-time-range? (make-time \"$iso_first\") (make-time \"$iso_last\"))"; ++ ++ ECal.Client client; ++ lock (source_client) { ++ client = source_client.get (source.dup_uid ()); ++ } ++ ++ if (client == null) { ++ return; ++ } ++ ++ debug ("Getting client-view for source '%s'", source.dup_display_name ()); ++ client.get_view.begin (query, null, (obj, results) => { ++ var view = on_client_view_received (results, source, client); ++ view.objects_added.connect ((objects) => on_objects_added (source, client, objects)); ++ view.objects_removed.connect ((objects) => on_objects_removed (source, client, objects)); ++ view.objects_modified.connect ((objects) => on_objects_modified (source, client, objects)); ++ try { ++ view.start (); ++ } catch (Error e) { ++ critical (e.message); ++ } ++ ++ source_view.set (source.dup_uid (), view); ++ }); ++ } ++ ++ private async void add_source_async (E.Source source) { ++ debug ("Adding source '%s'", source.dup_display_name ()); ++ try { ++ var client = (ECal.Client) ECal.Client.connect_sync (source, ECal.ClientSourceType.EVENTS, -1, null); ++ source_client.insert (source.dup_uid (), client); ++ } catch (Error e) { ++ critical (e.message); ++ } ++ ++ Idle.add (() => { ++ load_source (source); ++ ++ return false; ++ }); ++ } ++ ++ private void debug_event (E.Source source, ECal.Component event) { ++ unowned ICal.Component comp = event.get_icalcomponent (); ++ debug (@"Event ['$(comp.get_summary())', $(source.dup_display_name()), $(comp.get_uid()))]"); ++ } ++ ++ private ECal.ClientView on_client_view_received (AsyncResult results, E.Source source, ECal.Client client) { ++ ECal.ClientView view; ++ try { ++ debug ("Received client-view for source '%s'", source.dup_display_name ()); ++ bool status = client.get_view.end (results, out view); ++ assert (status == true); ++ } catch (Error e) { ++ critical ("Error loading client-view from source '%s': %s", source.dup_display_name (), e.message); ++ } ++ ++ return view; ++ } ++ ++#if E_CAL_2_0 ++ private void on_objects_added (E.Source source, ECal.Client client, SList<ICal.Component> objects) { ++#else ++ private void on_objects_added (E.Source source, ECal.Client client, SList<weak ICal.Component> objects) { ++#endif ++ debug (@"Received $(objects.length()) added event(s) for source '%s'", source.dup_display_name ()); ++ var events = source_events.get (source); ++ var added_events = new Gee.ArrayList<ECal.Component> ((Gee.EqualDataFunc<ECal.Component>?) Util.calcomponent_equal_func); ++ var model = Models.CalendarModel.get_default (); ++ objects.foreach ((comp) => { ++ unowned string uid = comp.get_uid (); ++#if E_CAL_2_0 ++ client.generate_instances_for_object_sync (comp, (time_t) model.data_range.first_dt.to_unix (), (time_t) model.data_range.last_dt.to_unix (), null, (comp, start, end) => { ++ var event = new ECal.Component.from_icalcomponent (comp); ++#else ++ client.generate_instances_for_object_sync (comp, (time_t) model.data_range.first_dt.to_unix (), (time_t) model.data_range.last_dt.to_unix (), (event, start, end) => { ++#endif ++ debug_event (source, event); ++ events.set (uid, event); ++ added_events.add (event); ++ return true; ++ }); ++ }); ++ } ++ ++#if E_CAL_2_0 ++ private void on_objects_modified (E.Source source, ECal.Client client, SList<ICal.Component> objects) { ++#else ++ private void on_objects_modified (E.Source source, ECal.Client client, SList<weak ICal.Component> objects) { ++#endif ++ debug (@"Received $(objects.length()) modified event(s) for source '%s'", source.dup_display_name ()); ++ var updated_events = new Gee.ArrayList<ECal.Component> ((Gee.EqualDataFunc<ECal.Component>?) Util.calcomponent_equal_func); ++ ++ objects.foreach ((comp) => { ++ unowned string uid = comp.get_uid (); ++ var events = source_events.get (source).get (uid); ++ updated_events.add_all (events); ++ foreach (var event in events) { ++ debug_event (source, event); ++ } ++ }); ++ ++ events_updated (source, updated_events.read_only_view); ++ } ++ ++#if E_CAL_2_0 ++ private void on_objects_removed (E.Source source, ECal.Client client, SList<ECal.ComponentId?> cids) { ++#else ++ private void on_objects_removed (E.Source source, ECal.Client client, SList<weak ECal.ComponentId?> cids) { ++#endif ++ debug (@"Received $(cids.length()) removed event(s) for source '%s'", source.dup_display_name ()); ++ var events = source_events.get (source); ++ var removed_events = new Gee.ArrayList<ECal.Component> ((Gee.EqualDataFunc<ECal.Component>?) Util.calcomponent_equal_func); ++ ++ cids.foreach ((cid) => { ++ if (cid == null) { ++ return; ++ } ++ ++ var comps = events.get (cid.get_uid ()); ++ foreach (ECal.Component event in comps) { ++ removed_events.add (event); ++ debug_event (source, event); ++ } ++ }); ++ ++ events_removed (source, removed_events.read_only_view); ++ } ++ } ++} +diff --git a/src/Util/Util.vala b/src/Util/Util.vala +index c261f4b..b0bdf98 100644 +--- a/src/Util/Util.vala ++++ b/src/Util/Util.vala +@@ -20,47 +20,6 @@ + */ + + namespace DateTimeIndicator.Util { +- static bool has_scrolled = false; +- +- public bool on_scroll_event (Gdk.EventScroll event) { +- double delta_x; +- double delta_y; +- event.get_scroll_deltas (out delta_x, out delta_y); +- +- double choice = delta_x; +- +- if (((int)delta_x).abs () < ((int)delta_y).abs ()) { +- choice = delta_y; +- } +- +- /* It's mouse scroll ! */ +- if (choice == 1 || choice == -1) { +- Models.CalendarModel.get_default ().change_month ((int)choice); +- +- return true; +- } +- +- if (has_scrolled == true) { +- return true; +- } +- +- if (choice > 0.3) { +- reset_timer.begin (); +- Models.CalendarModel.get_default ().change_month (1); +- +- return true; +- } +- +- if (choice < -0.3) { +- reset_timer.begin (); +- Models.CalendarModel.get_default ().change_month (-1); +- +- return true; +- } +- +- return false; +- } +- + public GLib.DateTime get_start_of_month (owned GLib.DateTime? date = null) { + if (date == null) { + date = new GLib.DateTime.now_local (); +@@ -225,12 +184,12 @@ namespace DateTimeIndicator.Util { + return a.dup_uid () == b.dup_uid (); + } + +- public async void reset_timer () { +- has_scrolled = true; +- Timeout.add (500, () => { +- has_scrolled = false; +- +- return false; +- }); +- } ++ // public async void reset_timer () { ++ // has_scrolled = true; ++ // Timeout.add (500, () => { ++ // has_scrolled = false; ++ // ++ // return false; ++ // }); ++ // } + } +diff --git a/src/Widgets/CalendarView.vala b/src/Widgets/CalendarView.vala +index 65cee28..070580f 100644 +--- a/src/Widgets/CalendarView.vala ++++ b/src/Widgets/CalendarView.vala +@@ -181,5 +181,14 @@ namespace DateTimeIndicator { + + stack.set_visible_child (big_grid); + } ++ ++ public void add_event_dots (E.Source source, Gee.Collection<ECal.Component> events) { ++ grid.add_event_dots (source, events); ++ } ++ ++ ++ public void remove_event_dots (E.Source source, Gee.Collection<ECal.Component> events) { ++ grid.remove_event_dots (source, events); ++ } + } + } +diff --git a/src/Widgets/EventsListBox.vala b/src/Widgets/EventsListBox.vala +index 547e4c5..c25af2e 100644 +--- a/src/Widgets/EventsListBox.vala ++++ b/src/Widgets/EventsListBox.vala +@@ -1,6 +1,5 @@ + namespace DateTimeIndicator { + public class Widgets.EventsListBox : Gtk.ListBox { +- + public EventsListBox () { + selection_mode = Gtk.SelectionMode.NONE; + +@@ -22,7 +21,7 @@ namespace DateTimeIndicator { + set_sort_func (sort_function); + } + +- public void update_events (GLib.DateTime? selected_date) { ++ public void update_events (GLib.DateTime? selected_date, HashTable<E.Source, Gee.TreeMultiMap<string, ECal.Component>> source_events) { + foreach (unowned Gtk.Widget widget in get_children ()) { + widget.destroy (); + } +@@ -31,11 +30,9 @@ namespace DateTimeIndicator { + return; + } + +- var model = Models.CalendarModel.get_default (); +- + var events_on_day = new Gee.TreeMap<string, EventRow> (); + +- model.source_events.@foreach ((source, component_map) => { ++ source_events.@foreach ((source, component_map) => { + foreach (var comp in component_map.get_values ()) { + if (Util.calcomp_is_on_day (comp, selected_date)) { + unowned ICal.Component ical = comp.get_icalcomponent (); +diff --git a/src/Widgets/Grid.vala b/src/Widgets/Grid.vala +index 165d11d..660f212 100644 +--- a/src/Widgets/Grid.vala ++++ b/src/Widgets/Grid.vala +@@ -261,5 +261,36 @@ namespace DateTimeIndicator { + return date.get_year () * 10000 + date.get_month () * 100 + date.get_day_of_month (); + } + ++ public void add_event_dots (E.Source source, Gee.Collection<ECal.Component> events) { ++ data.foreach ((entry) => { ++ ++ foreach (var component in events) { ++ if (entry.value.skip_day ()) { ++ return true; ++ } ++ ++ if (Util.calcomp_is_on_day (component, entry.value.date)) { ++ entry.value.add_dots (source, component.get_icalcomponent ()); ++ } ++ } ++ ++ entry.value.show_event_grid (); ++ ++ return true; ++ }); ++ } ++ ++ public void remove_event_dots (E.Source source, Gee.Collection<ECal.Component> events) { ++ foreach (var component in events) { ++ unowned ICal.Component ical = component.get_icalcomponent (); ++ var event_uid = ical.get_uid (); ++ data.foreach ((entry) => { ++ if (entry.value.exist_event (event_uid)) { ++ entry.value.remove_dots (event_uid); ++ } ++ return true; ++ }); ++ } ++ } + } + } +diff --git a/src/Widgets/GridDay.vala b/src/Widgets/GridDay.vala +index 8c44443..00f82ea 100644 +--- a/src/Widgets/GridDay.vala ++++ b/src/Widgets/GridDay.vala +@@ -31,6 +31,8 @@ namespace DateTimeIndicator { + + public GLib.DateTime date { get; construct set; } + ++ private bool has_scrolled = false; ++ + private static Gtk.CssProvider provider; + private static Models.CalendarModel model; + +@@ -79,59 +81,100 @@ namespace DateTimeIndicator { + // Signals and handlers + button_press_event.connect (on_button_press); + key_press_event.connect (on_key_press); +- scroll_event.connect ((event) => {return Util.on_scroll_event (event);}); ++ scroll_event.connect (on_scroll_event); + + notify["date"].connect (() => { + label.label = date.get_day_of_month ().to_string (); + }); + + event_dots = new Gee.HashMap<string, Gtk.Widget> (); +- +- model.events_added.connect (add_event_dots); +- model.events_removed.connect (remove_event_dots); + } + +- private void add_event_dots (E.Source source, Gee.Collection<ECal.Component> events) { +- foreach (var component in events) { +- if (event_dots.size >= 3) { +- return; +- } ++ public bool on_scroll_event (Gdk.EventScroll event) { ++ double delta_x; ++ double delta_y; ++ event.get_scroll_deltas (out delta_x, out delta_y); ++ ++ double choice = delta_x; ++ ++ if (((int)delta_x).abs () < ((int)delta_y).abs ()) { ++ choice = delta_y; ++ } ++ ++ /* It's mouse scroll ! */ ++ if (choice == 1 || choice == -1) { ++ Models.CalendarModel.get_default ().change_month ((int)choice); + +- if (Util.calcomp_is_on_day (component, date)) { +- unowned ICal.Component ical = component.get_icalcomponent (); ++ return true; ++ } + +- var event_uid = ical.get_uid (); +- if (!event_dots.has_key (event_uid)) { +- var event_dot = new Gtk.Image (); +- event_dot.gicon = new ThemedIcon ("pager-checked-symbolic"); +- event_dot.pixel_size = 6; ++ if (has_scrolled == true) { ++ return true; ++ } + +- unowned Gtk.StyleContext style_context = event_dot.get_style_context (); +- style_context.add_class (Granite.STYLE_CLASS_ACCENT); +- style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++ if (choice > 0.3) { ++ reset_timer.begin (); ++ Models.CalendarModel.get_default ().change_month (1); + +- var source_calendar = (E.SourceCalendar?) source.get_extension (E.SOURCE_EXTENSION_CALENDAR); +- Util.set_event_calendar_color (source_calendar, event_dot); ++ return true; ++ } + +- event_dots[event_uid] = event_dot; ++ if (choice < -0.3) { ++ reset_timer.begin (); ++ Models.CalendarModel.get_default ().change_month (-1); + +- event_grid.add (event_dot); +- } +- } ++ return true; + } + ++ return false; ++ } ++ ++ public async void reset_timer () { ++ has_scrolled = true; ++ Timeout.add (500, () => { ++ has_scrolled = false; ++ ++ return false; ++ }); ++ } ++ ++ public bool skip_day () { ++ return event_dots.size >= 3 ? true : false; ++ } ++ ++ public void show_event_grid () { + event_grid.show_all (); + } + +- private void remove_event_dots (E.Source source, Gee.Collection<ECal.Component> events) { +- foreach (var component in events) { +- unowned ICal.Component ical = component.get_icalcomponent (); +- var event_uid = ical.get_uid (); +- var dot = event_dots[event_uid]; +- if (dot != null) { +- dot.destroy (); +- event_dots.remove (event_uid); +- } ++ public void add_dots (E.Source source, ICal.Component ical) { ++ var event_uid = ical.get_uid (); ++ if (!event_dots.has_key (event_uid)) { ++ var event_dot = new Gtk. Image (); ++ event_dot.gicon = new ThemedIcon ("pager-checked-symbolic"); ++ event_dot.pixel_size = 6; ++ ++ unowned Gtk.StyleContext style_context = event_dot.get_style_context (); ++ style_context.add_class (Granite.STYLE_CLASS_ACCENT); ++ style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++ ++ var source_calendar = (E.SourceCalendar?) source.get_extension (E.SOURCE_EXTENSION_CALENDAR); ++ Util.set_event_calendar_color (source_calendar, event_dot); ++ ++ event_dots[event_uid] = event_dot; ++ ++ event_grid.add (event_dot); ++ } ++ } ++ ++ public bool exist_event (string ical_uid) { ++ return event_dots.has_key (ical_uid); ++ } ++ ++ public void remove_dots (string event_uid) { ++ var dot = event_dots[event_uid]; ++ if (dot != null) { ++ dot.destroy (); ++ event_dots.unset (event_uid); + } + } + + +From c99db5e63b9c48aa1d069b97b98b0c07481de27d Mon Sep 17 00:00:00 2001 +From: Dirli <litandrej85@gmail.com> +Date: Sat, 11 Apr 2020 23:44:14 +0300 +Subject: [PATCH 4/8] rename calendar elements + +--- + meson.build | 4 +-- + .../{GridDay.vala => CalendarDay.vala} | 4 +-- + src/Widgets/{Grid.vala => CalendarGrid.vala} | 26 +++++++-------- + src/Widgets/CalendarView.vala | 33 +++++++++---------- + 4 files changed, 33 insertions(+), 34 deletions(-) + rename src/Widgets/{GridDay.vala => CalendarDay.vala} (98%) + rename src/Widgets/{Grid.vala => CalendarGrid.vala} (91%) + +diff --git a/meson.build b/meson.build +index e348e3d..dcdd9b2 100644 +--- a/meson.build ++++ b/meson.build +@@ -44,11 +44,11 @@ shared_module( + 'src/Util/DateRange.vala', + 'src/Util/Util.vala', + 'src/Models/CalendarModel.vala', ++ 'src/Widgets/CalendarDay.vala', ++ 'src/Widgets/CalendarGrid.vala', + 'src/Widgets/CalendarView.vala', + 'src/Widgets/EventRow.vala', + 'src/Widgets/EventsListBox.vala', +- 'src/Widgets/Grid.vala', +- 'src/Widgets/GridDay.vala', + 'src/Widgets/PanelLabel.vala', + 'src/Services/EventsManager.vala', + 'src/Services/TimeManager.vala', +diff --git a/src/Widgets/GridDay.vala b/src/Widgets/CalendarDay.vala +similarity index 98% +rename from src/Widgets/GridDay.vala +rename to src/Widgets/CalendarDay.vala +index 00f82ea..a5ca920 100644 +--- a/src/Widgets/GridDay.vala ++++ b/src/Widgets/CalendarDay.vala +@@ -23,7 +23,7 @@ namespace DateTimeIndicator { + /** + * Represents a single day on the grid. + */ +- public class Widgets.GridDay : Gtk.EventBox { ++ public class Widgets.CalendarDay : Gtk.EventBox { + /* + * Event emitted when the day is double clicked or the ENTER key is pressed. + */ +@@ -41,7 +41,7 @@ namespace DateTimeIndicator { + private Gtk.Label label; + private bool valid_grab = false; + +- public GridDay (GLib.DateTime date) { ++ public CalendarDay (GLib.DateTime date) { + Object (date: date); + } + +diff --git a/src/Widgets/Grid.vala b/src/Widgets/CalendarGrid.vala +similarity index 91% +rename from src/Widgets/Grid.vala +rename to src/Widgets/CalendarGrid.vala +index 660f212..66e2757 100644 +--- a/src/Widgets/Grid.vala ++++ b/src/Widgets/CalendarGrid.vala +@@ -24,7 +24,7 @@ namespace DateTimeIndicator { + /** + * Represents the entire date grid as a table. + */ +- public class Widgets.Grid : Gtk.Grid { ++ public class Widgets.CalendarGrid : Gtk.Grid { + public Util.DateRange grid_range { get; private set; } + + /* +@@ -34,8 +34,8 @@ namespace DateTimeIndicator { + + public signal void selection_changed (GLib.DateTime new_date); + +- private Gee.HashMap<uint, GridDay> data; +- private GridDay selected_gridday; ++ private Gee.HashMap<uint, Widgets.CalendarDay> data; ++ private Widgets.CalendarDay selected_gridday; + private Gtk.Label[] header_labels; + private Gtk.Revealer[] week_labels; + +@@ -61,12 +61,12 @@ namespace DateTimeIndicator { + + Indicator.settings.bind ("show-weeks", week_sep_revealer, "reveal-child", GLib.SettingsBindFlags.DEFAULT); + +- data = new Gee.HashMap<uint, GridDay> (); ++ data = new Gee.HashMap<uint, Widgets.CalendarDay> (); + events |= Gdk.EventMask.SCROLL_MASK; + events |= Gdk.EventMask.SMOOTH_SCROLL_MASK; + } + +- private void on_day_focus_in (GridDay day) { ++ private void on_day_focus_in (Widgets.CalendarDay day) { + debug ("on_day_focus_in %s", day.date.to_string ()); + if (selected_gridday != null) { + selected_gridday.set_selected (false); +@@ -94,7 +94,7 @@ namespace DateTimeIndicator { + Gee.List<GLib.DateTime> dates = grid_range.to_list (); + for (int i = 0; i < dates.size; i++) { + var date = dates[i]; +- GridDay? day = data[day_hash (date)]; ++ Widgets.CalendarDay? day = data[day_hash (date)]; + if (day != null && day.name == "today") { + day.grab_focus_force (); + return; +@@ -119,7 +119,7 @@ namespace DateTimeIndicator { + + var new_dates = new_range.to_list (); + +- var data_new = new Gee.HashMap<uint, GridDay> (); ++ var data_new = new Gee.HashMap<uint, Widgets.CalendarDay> (); + + /* Assert that a valid number of weeks should be displayed */ + assert (new_dates.size % 7 == 0); +@@ -138,7 +138,7 @@ namespace DateTimeIndicator { + + for (i = 0; i < new_dates.size; i++) { + var new_date = new_dates[i]; +- GridDay day; ++ Widgets.CalendarDay day; + + if (i < old_dates.size) { + /* A widget already exists for this date, just change it */ +@@ -147,7 +147,7 @@ namespace DateTimeIndicator { + day = update_day (data[day_hash (old_date)], new_date, today, month_start); + } else { + /* Still update_day to get the color of etc. right */ +- day = update_day (new GridDay (new_date), new_date, today, month_start); ++ day = update_day (new Widgets.CalendarDay (new_date), new_date, today, month_start); + day.on_event_add.connect ((date) => on_event_add (date)); + day.scroll_event.connect ((event) => { scroll_event (event); return false; }); + day.focus_in_event.connect ((event) => { +@@ -182,9 +182,9 @@ namespace DateTimeIndicator { + } + + /** +- * Updates the given GridDay so that it shows the given date. Changes to its style etc. ++ * Updates the given CalendarDay so that it shows the given date. Changes to its style etc. + */ +- private GridDay update_day (GridDay day, GLib.DateTime new_date, GLib.DateTime today, GLib.DateTime month_start) { ++ private Widgets.CalendarDay update_day (Widgets.CalendarDay day, GLib.DateTime new_date, GLib.DateTime today, GLib.DateTime month_start) { + update_today_style (day, new_date, today); + if (new_date.get_month () == month_start.get_month ()) { + day.sensitive_container (true); +@@ -237,13 +237,13 @@ namespace DateTimeIndicator { + int i = 0; + for (i = 0; i < dates.size; i++) { + var date = dates[i]; +- GridDay? day = data[day_hash (date)]; ++ Widgets.CalendarDay? day = data[day_hash (date)]; + if (day == null) return; + update_today_style (day, date, today); + } + } + +- private void update_today_style (GridDay day, GLib.DateTime date, GLib.DateTime today) { ++ private void update_today_style (Widgets.CalendarDay day, GLib.DateTime date, GLib.DateTime today) { + if (date.get_day_of_year () == today.get_day_of_year () && date.get_year () == today.get_year ()) { + day.name = "today"; + day.get_style_context ().add_class (Granite.STYLE_CLASS_ACCENT); +diff --git a/src/Widgets/CalendarView.vala b/src/Widgets/CalendarView.vala +index 070580f..db2139c 100644 +--- a/src/Widgets/CalendarView.vala ++++ b/src/Widgets/CalendarView.vala +@@ -26,7 +26,7 @@ namespace DateTimeIndicator { + + public GLib.DateTime? selected_date { get; private set; } + +- private Widgets.Grid grid; ++ private Widgets.CalendarGrid calendar_grid; + private Gtk.Stack stack; + private Gtk.Grid big_grid; + +@@ -105,20 +105,20 @@ namespace DateTimeIndicator { + } + + private Gtk.Grid create_big_grid () { +- grid = new Widgets.Grid (); +- grid.show_all (); ++ calendar_grid = new Widgets.CalendarGrid (); ++ calendar_grid.show_all (); + +- grid.on_event_add.connect ((date) => { ++ calendar_grid.on_event_add.connect ((date) => { + show_date_in_maya (date); + day_double_click (); + }); + +- grid.selection_changed.connect ((date) => { ++ calendar_grid.selection_changed.connect ((date) => { + selected_date = date; + selection_changed (date); + }); + +- return grid; ++ return calendar_grid; + } + + public void show_today () { +@@ -131,7 +131,7 @@ namespace DateTimeIndicator { + } + sync_with_model (); + +- grid.set_focus_to_today (); ++ calendar_grid.set_focus_to_today (); + } + + // TODO: As far as maya supports it use the Dbus Activation feature to run the calendar-app. +@@ -156,23 +156,23 @@ namespace DateTimeIndicator { + /* Sets the calendar widgets to the date range of the model */ + private void sync_with_model () { + var model = Models.CalendarModel.get_default (); +- if (grid.grid_range != null && (model.data_range.equals (grid.grid_range) || grid.grid_range.first_dt.compare (model.data_range.first_dt) == 0)) { +- grid.update_today (); ++ if (calendar_grid.grid_range != null && (model.data_range.equals (calendar_grid.grid_range) || calendar_grid.grid_range.first_dt.compare (model.data_range.first_dt) == 0)) { ++ calendar_grid.update_today (); + return; // nothing else to do + } + + GLib.DateTime previous_first = null; +- if (grid.grid_range != null) +- previous_first = grid.grid_range.first_dt; ++ if (calendar_grid.grid_range != null) ++ previous_first = calendar_grid.grid_range.first_dt; + + big_grid = create_big_grid (); + stack.add (big_grid); + +- grid.set_range (model.data_range, model.month_start); +- grid.update_weeks (model.data_range.first_dt, model.num_weeks); ++ calendar_grid.set_range (model.data_range, model.month_start); ++ calendar_grid.update_weeks (model.data_range.first_dt, model.num_weeks); + + if (previous_first != null) { +- if (previous_first.compare (grid.grid_range.first_dt) == -1) { ++ if (previous_first.compare (calendar_grid.grid_range.first_dt) == -1) { + stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT; + } else { + stack.transition_type = Gtk.StackTransitionType.SLIDE_RIGHT; +@@ -183,12 +183,11 @@ namespace DateTimeIndicator { + } + + public void add_event_dots (E.Source source, Gee.Collection<ECal.Component> events) { +- grid.add_event_dots (source, events); ++ calendar_grid.add_event_dots (source, events); + } + +- + public void remove_event_dots (E.Source source, Gee.Collection<ECal.Component> events) { +- grid.remove_event_dots (source, events); ++ calendar_grid.remove_event_dots (source, events); + } + } + } + +From 6b1b15305a9c90ff8b7e7244727a225984d34a14 Mon Sep 17 00:00:00 2001 +From: Dirli <litandrej85@gmail.com> +Date: Sun, 12 Apr 2020 03:10:24 +0300 +Subject: [PATCH 5/8] evolution data server now optional + +--- + meson.build | 55 ++++++++++++++--------- + meson_options.txt | 1 + + src/Indicator.vala | 43 ++++++++++-------- + src/Util/Util.vala | 85 ++++++++++++++++------------------- + src/Widgets/CalendarDay.vala | 2 + + src/Widgets/CalendarGrid.vala | 2 + + src/Widgets/CalendarView.vala | 2 + + 7 files changed, 104 insertions(+), 86 deletions(-) + create mode 100644 meson_options.txt + +diff --git a/meson.build b/meson.build +index dcdd9b2..5fee9ab 100644 +--- a/meson.build ++++ b/meson.build +@@ -24,18 +24,40 @@ gresource = gnome.compile_resources( + wingpanel_dep = dependency('wingpanel-2.0') + wingpanel_indicatorsdir = wingpanel_dep.get_pkgconfig_variable('indicatorsdir', define_variable: ['libdir', libdir]) + ++deps = [ ++ dependency('glib-2.0'), ++ dependency('gobject-2.0'), ++ dependency('granite'), ++ dependency('gtk+-3.0'), ++ wingpanel_dep, ++ meson.get_compiler('vala').find_library('posix') ++] + +-libecal_dep = dependency('libecal-2.0', required: false) +-if libecal_dep.found() +- libical_dep = dependency('libical-glib') +- add_project_arguments('--define=E_CAL_2_0', language: 'vala') +- add_project_arguments('-DLIBICAL_GLIB_UNSTABLE_API=1', language: 'c') +-else +- libecal_dep = dependency('libecal-1.2', version: '>=3.8.0') +- libical_dep = dependency('libical') +- add_project_arguments('--vapidir', join_paths(meson.current_source_dir(), 'vapi'), language: 'vala') ++opt_files = [] ++ ++if get_option('evo') ++ libecal_dep = dependency ('libecal-2.0', required: false) ++ if libecal_dep.found() ++ deps += dependency('libical-glib') ++ deps += libecal_dep ++ add_project_arguments('--define=E_CAL_2_0', language: 'vala') ++ add_project_arguments('-DLIBICAL_GLIB_UNSTABLE_API=1', language: 'c') ++ else ++ deps += dependency('libecal-1.2', version: '>=3.8.0') ++ deps += dependency('libical') ++ add_project_arguments('--vapidir', join_paths(meson.current_source_dir(), 'vapi'), language: 'vala') ++ endif ++ ++ deps += dependency ('libedataserver-1.2') ++ opt_files += files ( ++ 'src/Widgets/EventRow.vala', ++ 'src/Widgets/EventsListBox.vala', ++ 'src/Services/EventsManager.vala', ++ ) ++ add_project_arguments('--define=USE_EVO', language: 'vala') + endif + ++ + shared_module( + meson.project_name(), + gresource, +@@ -47,21 +69,10 @@ shared_module( + 'src/Widgets/CalendarDay.vala', + 'src/Widgets/CalendarGrid.vala', + 'src/Widgets/CalendarView.vala', +- 'src/Widgets/EventRow.vala', +- 'src/Widgets/EventsListBox.vala', + 'src/Widgets/PanelLabel.vala', +- 'src/Services/EventsManager.vala', + 'src/Services/TimeManager.vala', +- dependencies: [ +- dependency('glib-2.0'), +- dependency('gobject-2.0'), +- dependency('granite'), +- dependency('gtk+-3.0'), +- libecal_dep, +- dependency('libedataserver-1.2'), +- libical_dep, +- wingpanel_dep, +- ], ++ opt_files, ++ dependencies: deps, + install: true, + install_dir : wingpanel_indicatorsdir, + ) +diff --git a/meson_options.txt b/meson_options.txt +new file mode 100644 +index 0000000..a1c9f0e +--- /dev/null ++++ b/meson_options.txt +@@ -0,0 +1 @@ ++option ('evo', type : 'boolean', value : true) +diff --git a/src/Indicator.vala b/src/Indicator.vala +index bf4358f..31c7af5 100644 +--- a/src/Indicator.vala ++++ b/src/Indicator.vala +@@ -23,9 +23,11 @@ namespace DateTimeIndicator { + + private Widgets.PanelLabel panel_label; + private Widgets.CalendarView calendar; +- private Widgets.EventsListBox event_listbox; + ++#if USE_EVO ++ private Widgets.EventsListBox event_listbox; + private Services.EventsManager event_manager; ++#endif + + private Gtk.Grid main_grid; + private uint update_events_idle_source = 0; +@@ -60,7 +62,20 @@ namespace DateTimeIndicator { + if (main_grid == null) { + calendar = new Widgets.CalendarView (); + calendar.margin_bottom = 6; ++ calendar.day_double_click.connect (() => { ++ close (); ++ }); ++ ++ var settings_button = new Gtk.ModelButton (); ++ settings_button.text = _("Date & Time Settings…"); + ++ main_grid = new Gtk.Grid (); ++ main_grid.margin_top = 12; ++ main_grid.attach (calendar, 0, 0); ++ main_grid.attach (new Wingpanel.Widgets.Separator (), 0, 1); ++ main_grid.attach (settings_button, 0, 2); ++ ++#if USE_EVO + event_manager = new Services.EventsManager (); + event_manager.events_updated.connect (update_events_model); + event_manager.events_added.connect ((source, events) => { +@@ -73,20 +88,16 @@ namespace DateTimeIndicator { + }); + + event_listbox = new Widgets.EventsListBox (); ++ event_listbox.row_activated.connect ((row) => { ++ calendar.show_date_in_maya (((EventRow) row).date); ++ close (); ++ }); + + var scrolled_window = new Gtk.ScrolledWindow (null, null); + scrolled_window.hscrollbar_policy = Gtk.PolicyType.NEVER; + scrolled_window.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC; + scrolled_window.add (event_listbox); + +- var settings_button = new Gtk.ModelButton (); +- settings_button.text = _("Date & Time Settings…"); +- +- main_grid = new Gtk.Grid (); +- main_grid.margin_top = 12; +- main_grid.attach (calendar, 0, 0); +- main_grid.attach (new Wingpanel.Widgets.Separator (), 0, 1); +- main_grid.attach (settings_button, 0, 2); + main_grid.attach (new Gtk.Separator (Gtk.Orientation.VERTICAL), 1, 0, 1, 3); + main_grid.attach (scrolled_window, 2, 0, 1, 3); + +@@ -94,23 +105,17 @@ namespace DateTimeIndicator { + size_group.add_widget (calendar); + size_group.add_widget (event_listbox); + +- calendar.day_double_click.connect (() => { +- close (); +- }); +- + calendar.selection_changed.connect ((date) => { + idle_update_events (); + }); +- +- event_listbox.row_activated.connect ((row) => { +- calendar.show_date_in_maya (((EventRow) row).date); +- close (); +- }); ++#endif + + var model = Models.CalendarModel.get_default (); + model.notify["month-start"].connect (() => { + model.compute_ranges (); ++#if USE_EVO + event_manager.load_all_sources (); ++#endif + }); + + settings_button.clicked.connect (() => { +@@ -125,6 +130,7 @@ namespace DateTimeIndicator { + return main_grid; + } + ++#if USE_EVO + private void update_events_model (E.Source source, Gee.Collection<ECal.Component> events) { + if (opened_widget) { + idle_update_events (); +@@ -143,6 +149,7 @@ namespace DateTimeIndicator { + return GLib.Source.REMOVE; + }); + } ++#endif + + public override void opened () { + calendar.show_today (); +diff --git a/src/Util/Util.vala b/src/Util/Util.vala +index b0bdf98..26b343a 100644 +--- a/src/Util/Util.vala ++++ b/src/Util/Util.vala +@@ -32,38 +32,6 @@ namespace DateTimeIndicator.Util { + return datetime.add_full (0, 0, 0, -datetime.get_hour (), -datetime.get_minute (), -datetime.get_second ()); + } + +- /** +- * Converts the given ICal.Time to a DateTime. +- */ +- public TimeZone timezone_from_ical (ICal.Time date) { +- int is_daylight; +- var interval = date.get_timezone ().get_utc_offset (null, out is_daylight); +- bool is_positive = interval >= 0; +- interval = interval.abs (); +- var hours = (interval / 3600); +- var minutes = (interval % 3600) / 60; +- var hour_string = "%s%02d:%02d".printf (is_positive ? "+" : "-", hours, minutes); +- +- return new TimeZone (hour_string); +- } +- +- /** +- * Converts the given ICal.Time to a DateTime. +- * XXX : Track next versions of evolution in order to convert ICal.Timezone to GLib.TimeZone with a dedicated function… +- */ +- public GLib.DateTime ical_to_date_time (ICal.Time date) { +-#if E_CAL_2_0 +- int year, month, day, hour, minute, second; +- date.get_date (out year, out month, out day); +- date.get_time (out hour, out minute, out second); +- return new GLib.DateTime (timezone_from_ical (date), year, month, +- day, hour, minute, second); +-#else +- return new GLib.DateTime (timezone_from_ical (date), date.year, date.month, +- date.day, date.hour, date.minute, date.second); +-#endif +- } +- + /** + * Say if an event lasts all day. + */ +@@ -78,6 +46,7 @@ namespace DateTimeIndicator.Util { + } + } + ++#if USE_EVO + private Gee.HashMap<string, Gtk.CssProvider>? providers; + public void set_event_calendar_color (E.SourceCalendar cal, Gtk.Widget widget) { + if (providers == null) { +@@ -104,6 +73,38 @@ namespace DateTimeIndicator.Util { + style_context.add_provider (providers[color], Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); + } + ++ /** ++ * Converts the given ICal.Time to a DateTime. ++ */ ++ public TimeZone timezone_from_ical (ICal.Time date) { ++ int is_daylight; ++ var interval = date.get_timezone ().get_utc_offset (null, out is_daylight); ++ bool is_positive = interval >= 0; ++ interval = interval.abs (); ++ var hours = (interval / 3600); ++ var minutes = (interval % 3600) / 60; ++ var hour_string = "%s%02d:%02d".printf (is_positive ? "+" : "-", hours, minutes); ++ ++ return new TimeZone (hour_string); ++ } ++ ++ /** ++ * Converts the given ICal.Time to a DateTime. ++ * XXX : Track next versions of evolution in order to convert ICal.Timezone to GLib.TimeZone with a dedicated function… ++ */ ++ public GLib.DateTime ical_to_date_time (ICal.Time date) { ++#if E_CAL_2_0 ++ int year, month, day, hour, minute, second; ++ date.get_date (out year, out month, out day); ++ date.get_time (out hour, out minute, out second); ++ return new GLib.DateTime (timezone_from_ical (date), year, month, ++ day, hour, minute, second); ++#else ++ return new GLib.DateTime (timezone_from_ical (date), date.year, date.month, ++ date.day, date.hour, date.minute, date.second); ++#endif ++ } ++ + /* + * Gee Utility Functions + */ +@@ -113,6 +114,11 @@ namespace DateTimeIndicator.Util { + return key.dup_uid (). hash (); + } + ++ /* Returns true if 'a' and 'b' are the same E.Source */ ++ public bool source_equal_func (E.Source a, E.Source b) { ++ return a.dup_uid () == b.dup_uid (); ++ } ++ + /* Returns true if 'a' and 'b' are the same ECal.Component */ + public bool calcomponent_equal_func (ECal.Component a, ECal.Component b) { + return a.get_id ().equal (b.get_id ()); +@@ -178,18 +184,5 @@ namespace DateTimeIndicator.Util { + + return false; + } +- +- /* Returns true if 'a' and 'b' are the same E.Source */ +- public bool source_equal_func (E.Source a, E.Source b) { +- return a.dup_uid () == b.dup_uid (); +- } +- +- // public async void reset_timer () { +- // has_scrolled = true; +- // Timeout.add (500, () => { +- // has_scrolled = false; +- // +- // return false; +- // }); +- // } ++#endif + } +diff --git a/src/Widgets/CalendarDay.vala b/src/Widgets/CalendarDay.vala +index a5ca920..f9c742a 100644 +--- a/src/Widgets/CalendarDay.vala ++++ b/src/Widgets/CalendarDay.vala +@@ -146,6 +146,7 @@ namespace DateTimeIndicator { + event_grid.show_all (); + } + ++#if USE_EVO + public void add_dots (E.Source source, ICal.Component ical) { + var event_uid = ical.get_uid (); + if (!event_dots.has_key (event_uid)) { +@@ -177,6 +178,7 @@ namespace DateTimeIndicator { + event_dots.unset (event_uid); + } + } ++#endif + + public void set_selected (bool selected) { + if (selected) { +diff --git a/src/Widgets/CalendarGrid.vala b/src/Widgets/CalendarGrid.vala +index 66e2757..1d1e06c 100644 +--- a/src/Widgets/CalendarGrid.vala ++++ b/src/Widgets/CalendarGrid.vala +@@ -261,6 +261,7 @@ namespace DateTimeIndicator { + return date.get_year () * 10000 + date.get_month () * 100 + date.get_day_of_month (); + } + ++#if USE_EVO + public void add_event_dots (E.Source source, Gee.Collection<ECal.Component> events) { + data.foreach ((entry) => { + +@@ -292,5 +293,6 @@ namespace DateTimeIndicator { + }); + } + } ++#endif + } + } +diff --git a/src/Widgets/CalendarView.vala b/src/Widgets/CalendarView.vala +index db2139c..77c233c 100644 +--- a/src/Widgets/CalendarView.vala ++++ b/src/Widgets/CalendarView.vala +@@ -182,6 +182,7 @@ namespace DateTimeIndicator { + stack.set_visible_child (big_grid); + } + ++#if USE_EVO + public void add_event_dots (E.Source source, Gee.Collection<ECal.Component> events) { + calendar_grid.add_event_dots (source, events); + } +@@ -189,5 +190,6 @@ namespace DateTimeIndicator { + public void remove_event_dots (E.Source source, Gee.Collection<ECal.Component> events) { + calendar_grid.remove_event_dots (source, events); + } ++#endif + } + } + +From 16715f5114c0597d6961880bf877f04414400334 Mon Sep 17 00:00:00 2001 +From: Dirli <litandrej85@gmail.com> +Date: Mon, 13 Apr 2020 22:21:07 +0300 +Subject: [PATCH 6/8] returned dots in the calendar + +--- + src/Indicator.vala | 6 ++-- + src/Services/EventsManager.vala | 28 +++++---------- + src/Widgets/CalendarDay.vala | 62 ++++++++++++++++++--------------- + src/Widgets/CalendarGrid.vala | 29 ++++++--------- + 4 files changed, 57 insertions(+), 68 deletions(-) + +diff --git a/src/Indicator.vala b/src/Indicator.vala +index 31c7af5..c7550aa 100644 +--- a/src/Indicator.vala ++++ b/src/Indicator.vala +@@ -105,8 +105,10 @@ namespace DateTimeIndicator { + size_group.add_widget (calendar); + size_group.add_widget (event_listbox); + +- calendar.selection_changed.connect ((date) => { +- idle_update_events (); ++ event_manager.open.begin ((obj, res) => { ++ calendar.selection_changed.connect ((date) => { ++ idle_update_events (); ++ }); + }); + #endif + +diff --git a/src/Services/EventsManager.vala b/src/Services/EventsManager.vala +index d939777..ad0397d 100644 +--- a/src/Services/EventsManager.vala ++++ b/src/Services/EventsManager.vala +@@ -10,33 +10,25 @@ namespace DateTimeIndicator { + private HashTable<string, ECal.Client> source_client; + private HashTable<string, ECal.ClientView> source_view; + +- public EventsManager () { +- +- } +- + construct { + source_client = new HashTable<string, ECal.Client> (str_hash, str_equal); + source_events = new HashTable<E.Source, Gee.TreeMultiMap<string, ECal.Component> > (Util.source_hash_func, Util.source_equal_func); + source_view = new HashTable<string, ECal.ClientView> (str_hash, str_equal); +- +- open.begin (); + } + +- private async void open () { ++ public async void open () { + try { + registry = yield new E.SourceRegistry (null); + registry.source_removed.connect (remove_source); +- registry.source_added.connect ((source) => add_source_async.begin (source)); ++ registry.source_added.connect (add_source); + + // Add sources + registry.list_sources (E.SOURCE_EXTENSION_CALENDAR).foreach ((source) => { +- E.SourceCalendar cal = (E.SourceCalendar)source.get_extension (E.SOURCE_EXTENSION_CALENDAR); ++ E.SourceCalendar cal = (E.SourceCalendar) source.get_extension (E.SOURCE_EXTENSION_CALENDAR); + if (cal.selected == true && source.enabled == true) { +- add_source_async.begin (source); ++ add_source (source); + } + }); +- +- load_all_sources (); + } catch (GLib.Error error) { + critical (error.message); + } +@@ -46,7 +38,7 @@ namespace DateTimeIndicator { + lock (source_client) { + foreach (var id in source_client.get_keys ()) { + var source = registry.ref_source (id); +- E.SourceCalendar cal = (E.SourceCalendar)source.get_extension (E.SOURCE_EXTENSION_CALENDAR); ++ E.SourceCalendar cal = (E.SourceCalendar) source.get_extension (E.SOURCE_EXTENSION_CALENDAR); + + if (cal.selected == true && source.enabled == true) { + load_source (source); +@@ -120,7 +112,7 @@ namespace DateTimeIndicator { + }); + } + +- private async void add_source_async (E.Source source) { ++ private void add_source (E.Source source) { + debug ("Adding source '%s'", source.dup_display_name ()); + try { + var client = (ECal.Client) ECal.Client.connect_sync (source, ECal.ClientSourceType.EVENTS, -1, null); +@@ -129,11 +121,7 @@ namespace DateTimeIndicator { + critical (e.message); + } + +- Idle.add (() => { +- load_source (source); +- +- return false; +- }); ++ load_source (source); + } + + private void debug_event (E.Source source, ECal.Component event) { +@@ -177,6 +165,8 @@ namespace DateTimeIndicator { + return true; + }); + }); ++ ++ events_added (source, added_events.read_only_view); + } + + #if E_CAL_2_0 +diff --git a/src/Widgets/CalendarDay.vala b/src/Widgets/CalendarDay.vala +index f9c742a..a2c4922 100644 +--- a/src/Widgets/CalendarDay.vala ++++ b/src/Widgets/CalendarDay.vala +@@ -36,7 +36,8 @@ namespace DateTimeIndicator { + private static Gtk.CssProvider provider; + private static Models.CalendarModel model; + +- private Gee.HashMap<string, Gtk.Widget> event_dots; ++ // private Gee.HashMap<string, Gtk.Widget> event_dots; ++ private Gee.ArrayList<string> event_dots; + private Gtk.Grid event_grid; + private Gtk.Label label; + private bool valid_grab = false; +@@ -87,7 +88,8 @@ namespace DateTimeIndicator { + label.label = date.get_day_of_month ().to_string (); + }); + +- event_dots = new Gee.HashMap<string, Gtk.Widget> (); ++ // event_dots = new Gee.HashMap<string, Gtk.Widget> (); ++ event_dots = new Gee.ArrayList<string> (); + } + + public bool on_scroll_event (Gdk.EventScroll event) { +@@ -138,44 +140,46 @@ namespace DateTimeIndicator { + }); + } + +- public bool skip_day () { +- return event_dots.size >= 3 ? true : false; +- } +- +- public void show_event_grid () { +- event_grid.show_all (); +- } +- + #if USE_EVO + public void add_dots (E.Source source, ICal.Component ical) { + var event_uid = ical.get_uid (); +- if (!event_dots.has_key (event_uid)) { +- var event_dot = new Gtk. Image (); +- event_dot.gicon = new ThemedIcon ("pager-checked-symbolic"); +- event_dot.pixel_size = 6; ++ if (event_dots.contains (event_uid)) { ++ return; ++ } + +- unowned Gtk.StyleContext style_context = event_dot.get_style_context (); +- style_context.add_class (Granite.STYLE_CLASS_ACCENT); +- style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++ event_dots.add (event_uid); ++ if (event_dots.size > 3) { ++ return; ++ } + +- var source_calendar = (E.SourceCalendar?) source.get_extension (E.SOURCE_EXTENSION_CALENDAR); +- Util.set_event_calendar_color (source_calendar, event_dot); ++ var event_dot = new Gtk.Image (); ++ event_dot.gicon = new ThemedIcon ("pager-checked-symbolic"); ++ event_dot.pixel_size = 6; + +- event_dots[event_uid] = event_dot; ++ unowned Gtk.StyleContext style_context = event_dot.get_style_context (); ++ style_context.add_class (Granite.STYLE_CLASS_ACCENT); ++ style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); + +- event_grid.add (event_dot); +- } +- } ++ var source_calendar = (E.SourceCalendar?) source.get_extension (E.SOURCE_EXTENSION_CALENDAR); ++ Util.set_event_calendar_color (source_calendar, event_dot); + +- public bool exist_event (string ical_uid) { +- return event_dots.has_key (ical_uid); ++ event_grid.add (event_dot); ++ event_dot.show (); + } + + public void remove_dots (string event_uid) { +- var dot = event_dots[event_uid]; +- if (dot != null) { +- dot.destroy (); +- event_dots.unset (event_uid); ++ if (event_dots.contains (event_uid)) { ++ return; ++ } ++ ++ event_dots.remove (event_uid); ++ if (event_dots.size >= 3) { ++ return; ++ } ++ ++ var w = event_grid.get_children (); ++ if (w.length () > 0) { ++ w.nth_data (0).destroy (); + } + } + #endif +diff --git a/src/Widgets/CalendarGrid.vala b/src/Widgets/CalendarGrid.vala +index 1d1e06c..c544404 100644 +--- a/src/Widgets/CalendarGrid.vala ++++ b/src/Widgets/CalendarGrid.vala +@@ -263,22 +263,16 @@ namespace DateTimeIndicator { + + #if USE_EVO + public void add_event_dots (E.Source source, Gee.Collection<ECal.Component> events) { +- data.foreach ((entry) => { +- +- foreach (var component in events) { +- if (entry.value.skip_day ()) { +- return true; +- } +- +- if (Util.calcomp_is_on_day (component, entry.value.date)) { +- entry.value.add_dots (source, component.get_icalcomponent ()); +- } ++ foreach (var component in events) { ++ unowned ICal.Component? icomp = component.get_icalcomponent (); ++ ICal.Time? start_time = icomp.get_dtstart (); ++ time_t start_unix = start_time.as_timet (); ++ var t = new DateTime.from_unix_utc (start_unix); ++ var d_hash = day_hash (t); ++ if (data.has_key (d_hash)) { ++ data[d_hash].add_dots (source, component.get_icalcomponent ()); + } +- +- entry.value.show_event_grid (); +- +- return true; +- }); ++ } + } + + public void remove_event_dots (E.Source source, Gee.Collection<ECal.Component> events) { +@@ -286,9 +280,8 @@ namespace DateTimeIndicator { + unowned ICal.Component ical = component.get_icalcomponent (); + var event_uid = ical.get_uid (); + data.foreach ((entry) => { +- if (entry.value.exist_event (event_uid)) { +- entry.value.remove_dots (event_uid); +- } ++ entry.value.remove_dots (event_uid); ++ + return true; + }); + } + +From 149da28659883b01ceb0773b35c018d31aa1d912 Mon Sep 17 00:00:00 2001 +From: Dirli <litandrej85@gmail.com> +Date: Tue, 14 Apr 2020 00:16:01 +0300 +Subject: [PATCH 7/8] issue #55 + +--- + src/Services/EventsManager.vala | 2 ++ + src/Widgets/CalendarDay.vala | 2 +- + src/Widgets/CalendarGrid.vala | 11 +++++++---- + 3 files changed, 10 insertions(+), 5 deletions(-) + +diff --git a/src/Services/EventsManager.vala b/src/Services/EventsManager.vala +index ad0397d..959762f 100644 +--- a/src/Services/EventsManager.vala ++++ b/src/Services/EventsManager.vala +@@ -208,6 +208,8 @@ namespace DateTimeIndicator { + removed_events.add (event); + debug_event (source, event); + } ++ ++ events.remove_all (cid.get_uid ()); + }); + + events_removed (source, removed_events.read_only_view); +diff --git a/src/Widgets/CalendarDay.vala b/src/Widgets/CalendarDay.vala +index a2c4922..10d088c 100644 +--- a/src/Widgets/CalendarDay.vala ++++ b/src/Widgets/CalendarDay.vala +@@ -168,7 +168,7 @@ namespace DateTimeIndicator { + } + + public void remove_dots (string event_uid) { +- if (event_dots.contains (event_uid)) { ++ if (!event_dots.contains (event_uid)) { + return; + } + +diff --git a/src/Widgets/CalendarGrid.vala b/src/Widgets/CalendarGrid.vala +index c544404..6e6cbdb 100644 +--- a/src/Widgets/CalendarGrid.vala ++++ b/src/Widgets/CalendarGrid.vala +@@ -279,11 +279,14 @@ namespace DateTimeIndicator { + foreach (var component in events) { + unowned ICal.Component ical = component.get_icalcomponent (); + var event_uid = ical.get_uid (); +- data.foreach ((entry) => { +- entry.value.remove_dots (event_uid); + +- return true; +- }); ++ ICal.Time? start_time = ical.get_dtstart (); ++ time_t start_unix = start_time.as_timet (); ++ var t = new DateTime.from_unix_utc (start_unix); ++ var d_hash = day_hash (t); ++ if (data.has_key (d_hash)) { ++ data[d_hash].remove_dots (event_uid); ++ } + } + } + #endif + +From a3910e2b8242b8c4837cc764da7f268a02d05d6e Mon Sep 17 00:00:00 2001 +From: Dirli <litandrej85@gmail.com> +Date: Fri, 17 Apr 2020 00:52:53 +0300 +Subject: [PATCH 8/8] issue #127 + +--- + src/Indicator.vala | 1 + + src/Models/CalendarModel.vala | 17 ++++++--- + src/Services/EventsManager.vala | 17 +++++++++ + src/Widgets/CalendarDay.vala | 3 +- + src/Widgets/CalendarGrid.vala | 66 ++++++++++++++++++++++----------- + src/Widgets/CalendarView.vala | 17 ++++----- + src/Widgets/EventsListBox.vala | 6 ++- + 7 files changed, 87 insertions(+), 40 deletions(-) + +diff --git a/src/Indicator.vala b/src/Indicator.vala +index c7550aa..63614e0 100644 +--- a/src/Indicator.vala ++++ b/src/Indicator.vala +@@ -116,6 +116,7 @@ namespace DateTimeIndicator { + model.notify["month-start"].connect (() => { + model.compute_ranges (); + #if USE_EVO ++ event_listbox.clear_list (); + event_manager.load_all_sources (); + #endif + }); +diff --git a/src/Models/CalendarModel.vala b/src/Models/CalendarModel.vala +index d60a9ac..48b6e78 100644 +--- a/src/Models/CalendarModel.vala ++++ b/src/Models/CalendarModel.vala +@@ -57,12 +57,17 @@ namespace DateTimeIndicator { + compute_ranges (); + } + +- public void change_month (int relative) { +- month_start = month_start.add_months (relative); +- } +- +- public void change_year (int relative) { +- month_start = month_start.add_years (relative); ++ public void change_month (int m_relative, int y_relative = 0) { ++ if (y_relative == 0) { ++ month_start = month_start.add_months (m_relative); ++ } else { ++ if (m_relative == 0) { ++ month_start = month_start.add_years (y_relative); ++ } else { ++ GLib.DateTime tmp_date = month_start.add_months (m_relative); ++ month_start = tmp_date.add_years (y_relative); ++ } ++ } + } + + /* --- Helper Methods ---// */ +diff --git a/src/Services/EventsManager.vala b/src/Services/EventsManager.vala +index 959762f..6ece557 100644 +--- a/src/Services/EventsManager.vala ++++ b/src/Services/EventsManager.vala +@@ -1,3 +1,20 @@ ++/* ++ * Copyright (c) 2011-2020 elementary, Inc. (https://elementary.io) ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public ++ * License as published by the Free Software Foundation; either ++ * version 3 of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ + namespace DateTimeIndicator { + public class Services.EventsManager : GLib.Object { + public signal void events_added (E.Source source, Gee.Collection<ECal.Component> events); +diff --git a/src/Widgets/CalendarDay.vala b/src/Widgets/CalendarDay.vala +index 10d088c..735fdc1 100644 +--- a/src/Widgets/CalendarDay.vala ++++ b/src/Widgets/CalendarDay.vala +@@ -36,7 +36,6 @@ namespace DateTimeIndicator { + private static Gtk.CssProvider provider; + private static Models.CalendarModel model; + +- // private Gee.HashMap<string, Gtk.Widget> event_dots; + private Gee.ArrayList<string> event_dots; + private Gtk.Grid event_grid; + private Gtk.Label label; +@@ -105,7 +104,7 @@ namespace DateTimeIndicator { + + /* It's mouse scroll ! */ + if (choice == 1 || choice == -1) { +- Models.CalendarModel.get_default ().change_month ((int)choice); ++ Models.CalendarModel.get_default ().change_month ((int) choice); + + return true; + } +diff --git a/src/Widgets/CalendarGrid.vala b/src/Widgets/CalendarGrid.vala +index 6e6cbdb..ef8edb6 100644 +--- a/src/Widgets/CalendarGrid.vala ++++ b/src/Widgets/CalendarGrid.vala +@@ -32,7 +32,7 @@ namespace DateTimeIndicator { + */ + public signal void on_event_add (GLib.DateTime date); + +- public signal void selection_changed (GLib.DateTime new_date); ++ public signal void selection_changed (GLib.DateTime new_date, bool up); + + private Gee.HashMap<uint, Widgets.CalendarDay> data; + private Widgets.CalendarDay selected_gridday; +@@ -66,25 +66,32 @@ namespace DateTimeIndicator { + events |= Gdk.EventMask.SMOOTH_SCROLL_MASK; + } + +- private void on_day_focus_in (Widgets.CalendarDay day) { +- debug ("on_day_focus_in %s", day.date.to_string ()); ++ private bool on_day_focus_in (Gdk.EventFocus event) { ++ var day = get_focus_child (); ++ if (day == null) { ++ return false; ++ } ++ + if (selected_gridday != null) { + selected_gridday.set_selected (false); + } + +- var selected_date = day.date; +- selected_gridday = day; +- day.set_selected (true); ++ var selected_date = (day as Widgets.CalendarDay).date; ++ selected_gridday = day as Widgets.CalendarDay; ++ (day as Widgets.CalendarDay).set_selected (true); + day.set_state_flags (Gtk.StateFlags.FOCUSED, false); +- selection_changed (selected_date); + var calmodel = Models.CalendarModel.get_default (); + var date_month = selected_date.get_month () - calmodel.month_start.get_month (); + var date_year = selected_date.get_year () - calmodel.month_start.get_year (); + + if (date_month != 0 || date_year != 0) { +- calmodel.change_month (date_month); +- calmodel.change_year (date_year); ++ selection_changed (selected_date, false); ++ calmodel.change_month (date_month, date_year); ++ } else { ++ selection_changed (selected_date, true); + } ++ ++ return false; + } + + public void set_focus_to_today () { +@@ -106,7 +113,7 @@ namespace DateTimeIndicator { + * Sets the given range to be displayed in the grid. Note that the number of days + * must remain the same. + */ +- public void set_range (Util.DateRange new_range, GLib.DateTime month_start) { ++ public void set_range (Util.DateRange new_range, GLib.DateTime month_start, GLib.DateTime? selected_date) { + var today = new GLib.DateTime.now_local (); + + Gee.List<GLib.DateTime> old_dates; +@@ -138,28 +145,46 @@ namespace DateTimeIndicator { + + for (i = 0; i < new_dates.size; i++) { + var new_date = new_dates[i]; +- Widgets.CalendarDay day; ++ Widgets.CalendarDay? day = null; + + if (i < old_dates.size) { + /* A widget already exists for this date, just change it */ + + var old_date = old_dates[i]; +- day = update_day (data[day_hash (old_date)], new_date, today, month_start); +- } else { ++ var d_hash = day_hash (old_date); ++ if (data.has_key (d_hash)) { ++ day = data[d_hash]; ++ } ++ } ++ ++ if (day == null) { + /* Still update_day to get the color of etc. right */ +- day = update_day (new Widgets.CalendarDay (new_date), new_date, today, month_start); ++ day = new Widgets.CalendarDay (new_date); + day.on_event_add.connect ((date) => on_event_add (date)); +- day.scroll_event.connect ((event) => { scroll_event (event); return false; }); +- day.focus_in_event.connect ((event) => { +- on_day_focus_in (day); +- ++ day.scroll_event.connect ((event) => { ++ scroll_event (event); + return false; + }); ++ day.focus_in_event.connect (on_day_focus_in); + + attach (day, col + 2, row); + day.show_all (); + } + ++ update_day (day, new_date, month_start); ++ update_today_style (day, new_date, today); ++ if (selected_date != null && day.date.equal (selected_date)) { ++ /* disabled the signal to avoid unnecessary signals and selected ++ * the specified day from the new period */ ++ debug (@"focus selected day $selected_date"); ++ day.focus_in_event.disconnect (on_day_focus_in); ++ day.grab_focus_force (); ++ day.set_selected (true); ++ day.set_state_flags (Gtk.StateFlags.FOCUSED, false); ++ selected_gridday = day; ++ day.focus_in_event.connect (on_day_focus_in); ++ } ++ + col = (col + 1) % 7; + row = (col == 0) ? row + 1 : row; + data_new.set (day_hash (new_date), day); +@@ -184,8 +209,7 @@ namespace DateTimeIndicator { + /** + * Updates the given CalendarDay so that it shows the given date. Changes to its style etc. + */ +- private Widgets.CalendarDay update_day (Widgets.CalendarDay day, GLib.DateTime new_date, GLib.DateTime today, GLib.DateTime month_start) { +- update_today_style (day, new_date, today); ++ private void update_day (Widgets.CalendarDay day, GLib.DateTime new_date, GLib.DateTime month_start) { + if (new_date.get_month () == month_start.get_month ()) { + day.sensitive_container (true); + } else { +@@ -193,8 +217,6 @@ namespace DateTimeIndicator { + } + + day.date = new_date; +- +- return day; + } + + public void update_weeks (GLib.DateTime date, int nr_of_weeks) { +diff --git a/src/Widgets/CalendarView.vala b/src/Widgets/CalendarView.vala +index 77c233c..fe957ab 100644 +--- a/src/Widgets/CalendarView.vala ++++ b/src/Widgets/CalendarView.vala +@@ -85,10 +85,7 @@ namespace DateTimeIndicator { + model.notify["data-range"].connect (() => { + label.label = model.month_start.format (_("%OB, %Y")); + +- sync_with_model (); +- +- selected_date = null; +- selection_changed (selected_date); ++ sync_with_model (selected_date != null); + }); + + left_button.clicked.connect (() => { +@@ -113,9 +110,11 @@ namespace DateTimeIndicator { + day_double_click (); + }); + +- calendar_grid.selection_changed.connect ((date) => { ++ calendar_grid.selection_changed.connect ((date, up) => { + selected_date = date; +- selection_changed (date); ++ if (up) { ++ selection_changed (date); ++ } + }); + + return calendar_grid; +@@ -154,9 +153,9 @@ namespace DateTimeIndicator { + } + + /* Sets the calendar widgets to the date range of the model */ +- private void sync_with_model () { ++ private void sync_with_model (bool show_selected = false) { + var model = Models.CalendarModel.get_default (); +- if (calendar_grid.grid_range != null && (model.data_range.equals (calendar_grid.grid_range) || calendar_grid.grid_range.first_dt.compare (model.data_range.first_dt) == 0)) { ++ if (!show_selected && calendar_grid.grid_range != null && (model.data_range.equals (calendar_grid.grid_range) || calendar_grid.grid_range.first_dt.compare (model.data_range.first_dt) == 0)) { + calendar_grid.update_today (); + return; // nothing else to do + } +@@ -168,7 +167,7 @@ namespace DateTimeIndicator { + big_grid = create_big_grid (); + stack.add (big_grid); + +- calendar_grid.set_range (model.data_range, model.month_start); ++ calendar_grid.set_range (model.data_range, model.month_start, show_selected ? selected_date : null); + calendar_grid.update_weeks (model.data_range.first_dt, model.num_weeks); + + if (previous_first != null) { +diff --git a/src/Widgets/EventsListBox.vala b/src/Widgets/EventsListBox.vala +index c25af2e..9022072 100644 +--- a/src/Widgets/EventsListBox.vala ++++ b/src/Widgets/EventsListBox.vala +@@ -21,10 +21,14 @@ namespace DateTimeIndicator { + set_sort_func (sort_function); + } + +- public void update_events (GLib.DateTime? selected_date, HashTable<E.Source, Gee.TreeMultiMap<string, ECal.Component>> source_events) { ++ public void clear_list () { + foreach (unowned Gtk.Widget widget in get_children ()) { + widget.destroy (); + } ++ } ++ ++ public void update_events (GLib.DateTime? selected_date, HashTable<E.Source, Gee.TreeMultiMap<string, ECal.Component>> source_events) { ++ clear_list (); + + if (selected_date == null) { + return; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 7194a649d0041..c6a0e2f7779ff 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchFromGitHub +, fetchFromGitHub , pantheon , pkgconfig , meson @@ -28,6 +28,15 @@ stdenv.mkDerivation rec { sha256 = "0a0pqrpmrdd5pch30lizr9righlc7165z7krmnaxrzd0fvfkbr2h"; }; + patches = [ + # https://github.com/elementary/wingpanel-indicator-datetime/pull/207 + # Fixes lots of issues despite being rejected upstream + # https://github.com/elementary/wingpanel-indicator-datetime/issues/206 + # https://github.com/elementary/wingpanel-indicator-datetime/issues/55 + # https://github.com/elementary/wingpanel-indicator-datetime/issues/127 + ./207.patch + ]; + passthru = { updateScript = pantheon.updateScript { attrPath = "pantheon.${pname}"; @@ -60,7 +69,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Date & Time Indicator for Wingpanel"; - homepage = https://github.com/elementary/wingpanel-indicator-datetime; + homepage = "https://github.com/elementary/wingpanel-indicator-datetime"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index e6f05a58d763b..120cf8260a9f7 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Keyboard Indicator for Wingpanel"; - homepage = https://github.com/elementary/wingpanel-indicator-keyboard; + homepage = "https://github.com/elementary/wingpanel-indicator-keyboard"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index c86bf45719e2c..0b9d95faf0b12 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Network Indicator for Wingpanel"; - homepage = https://github.com/elementary/wingpanel-indicator-network; + homepage = "https://github.com/elementary/wingpanel-indicator-network"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 5a9a28382ca9a..9ec593afe4a84 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Night Light Indicator for Wingpanel"; - homepage = https://github.com/elementary/wingpanel-indicator-nightlight; + homepage = "https://github.com/elementary/wingpanel-indicator-nightlight"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 3921bc50f76ec..d8d5f44b82bce 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Notifications Indicator for Wingpanel"; - homepage = https://github.com/elementary/wingpanel-indicator-notifications; + homepage = "https://github.com/elementary/wingpanel-indicator-notifications"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 80dc22b152e9c..907b31d930a6d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Power Indicator for Wingpanel"; - homepage = https://github.com/elementary/wingpanel-indicator-power; + homepage = "https://github.com/elementary/wingpanel-indicator-power"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index d26e237b87c8e..14c87036ec8c4 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Session Indicator for Wingpanel"; - homepage = https://github.com/elementary/wingpanel-indicator-session; + homepage = "https://github.com/elementary/wingpanel-indicator-session"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index 4025c5a767d38..cd387a9fca480 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sound Indicator for Wingpanel"; - homepage = https://github.com/elementary/wingpanel-indicator-sound; + homepage = "https://github.com/elementary/wingpanel-indicator-sound"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index b5a5f9395c6d1..ff9925c53574f 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "wingpanel"; - version = "unstable-2020-04-04"; + version = "2.3.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; - rev = "366f0f6ffa59f7ee2583d000dd334cb764f9a2b8"; - sha256 = "172r1k8m1saq80q6g2hxy4ajks8liaw9pl6lixasrzi2hsnrx53h"; + rev = version; + sha256 = "0yvn1crylrdc9gq6gc7v4ynb5ii4n0c3bnswfq72p8cs3vvvvv24"; }; passthru = { @@ -65,13 +65,20 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + preFixup = '' + gappsWrapperArgs+=( + # this theme is required + --prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share" + ) + ''; + meta = with stdenv.lib; { description = "The extensible top panel for Pantheon"; longDescription = '' Wingpanel is an empty container that accepts indicators as extensions, including the applications menu. ''; - homepage = https://github.com/elementary/wingpanel; + homepage = "https://github.com/elementary/wingpanel"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index b8c9021dd1585..ec40e1e8f72de 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { Granite is a companion library for GTK and GLib. Among other things, it provides complex widgets and convenience functions designed for use in apps built for elementary OS. ''; - homepage = https://github.com/elementary/granite; + homepage = "https://github.com/elementary/granite"; license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index d41750f8dfc03..7f17fb5d5a9d5 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "elementary-capnet-assist"; - version = "2.2.4"; + version = "2.2.5"; repoName = "capnet-assist"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0yz827gs1qv6csgv4v993rjmqzc6dbymbvznsy45ghlh19l4l7j1"; + sha256 = "09pl1ynrmqjj844np4ww2i18z7kgx5kmj5ggfp8lqmxgsny7g8m3"; }; passthru = { @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small WebKit app that assists a user with login when a captive portal is detected"; - homepage = https://github.com/elementary/capnet-assist; + homepage = "https://github.com/elementary/capnet-assist"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix index 4ec1df36bea24..7eeb156e02819 100644 --- a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sets DPMS settings found in org.pantheon.dpms"; - homepage = https://github.com/elementary/dpms-helper; + homepage = "https://github.com/elementary/dpms-helper"; license = licenses.gpl2; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index 0f919c7c94d4d..905e2cc9aadf5 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "pantheon-agent-geoclue2"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1fhgdcykn0ykn8fp7inn2akygpglhdwfpdkpnih86kqmqj8siahv"; + sha256 = "1lky7pw47d5mdza3bhq0ahdhgdv159ixngdsc1ys6j1kszsfxc1f"; }; passthru = { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pantheon Geoclue2 Agent"; - homepage = https://github.com/elementary/pantheon-agent-geoclue2; + homepage = "https://github.com/elementary/pantheon-agent-geoclue2"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index f244e0e463713..3663ff2640dd9 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "pantheon-agent-polkit"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1yybblprcn0cgcf9j76yckqcimm4h8l41cczxjvgp789p1pki3bn"; + sha256 = "137809mplrsff1isxwbwa2v2y9ixhwzm4khiijm4mmjchi75wpvx"; }; passthru = { @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Polkit Agent for the Pantheon Desktop"; - homepage = https://github.com/elementary/pantheon-agent-polkit; + homepage = "https://github.com/elementary/pantheon-agent-polkit"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index a199a4a959db1..07b464258149a 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -87,7 +87,7 @@ let ]; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; - homepage = http://www.kde.org; + homepage = "http://www.kde.org"; } // (args.meta or {}); in mkDerivation (args // { diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 0e1709d8245c7..c3e9e2b9c2451 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -11,11 +11,10 @@ kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui, - plasma-framework, qtsensors, libcap, libdrm + plasma-framework, qtsensors, libcap, libdrm, mesa }: # TODO (ttuegel): investigate qmlplugindump failure -# TODO (ttuegel): investigate gbm dependency mkDerivation { name = "kwin"; @@ -30,7 +29,7 @@ mkDerivation { kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework - libcap libdrm + libcap libdrm mesa ]; outputs = [ "bin" "dev" "out" ]; patches = [ diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index b7c4015320913..cc7de2168e481 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -71,7 +71,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Fast, lightweight, gtk2 file manager"; - homepage = http://rox.sourceforge.net/desktop; + homepage = "http://rox.sourceforge.net/desktop"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; maintainers = [ maintainers.eleanor ]; diff --git a/pkgs/desktops/xfce/applications/gigolo/default.nix b/pkgs/desktops/xfce/applications/gigolo/default.nix index 32486aab981f0..251866528e641 100644 --- a/pkgs/desktops/xfce/applications/gigolo/default.nix +++ b/pkgs/desktops/xfce/applications/gigolo/default.nix @@ -3,9 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "gigolo"; - version = "0.5.0"; + version = "0.5.1"; + odd-unstable = false; - sha256 = "1lqsxb0d5i8p9vbzx8s4p3rga7va5h1q146xgmsa41j5v40wrlw6"; + sha256 = "11a35z5apr26nl6fpmbsvvv3xf5w61sgzcb505plavrchpfbdxjn"; nativeBuildInputs = [ exo ]; buildInputs = [ gtk3 glib gvfs ]; diff --git a/pkgs/desktops/xfce/applications/orage/default.nix b/pkgs/desktops/xfce/applications/orage/default.nix index 4a48cc83dda4e..08b78ec400674 100644 --- a/pkgs/desktops/xfce/applications/orage/default.nix +++ b/pkgs/desktops/xfce/applications/orage/default.nix @@ -8,7 +8,7 @@ let in mkXfceDerivation { - category = "apps"; + category = "archive"; pname = "orage"; version = "4.12.1"; @@ -28,7 +28,7 @@ mkXfceDerivation { # Fix build with libical 3.0 (fetchpatch { name = "fix-libical3.patch"; - url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/libical3.patch?h=packages/orage&id=7b1b06c42dda034d538977b9f3550b28e370057f; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/libical3.patch?h=packages/orage&id=7b1b06c42dda034d538977b9f3550b28e370057f"; sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf"; }) ]; diff --git a/pkgs/desktops/xfce/applications/parole/default.nix b/pkgs/desktops/xfce/applications/parole/default.nix index 20b899165f095..bfb8651844873 100644 --- a/pkgs/desktops/xfce/applications/parole/default.nix +++ b/pkgs/desktops/xfce/applications/parole/default.nix @@ -7,9 +7,9 @@ mkXfceDerivation { category = "apps"; pname = "parole"; - version = "1.0.4"; + version = "1.0.5"; - sha256 = "18j4bmny37crryh4pvxcjjvj99mln6ljq2vy69awxhvrjx9ljv13"; + sha256 = "0qgis2gnkcvg7xwp76cbi0ihqdjprvvw2d66hk7klhrafp7c0v13"; postPatch = '' substituteInPlace src/plugins/mpris2/Makefile.am \ diff --git a/pkgs/desktops/xfce/applications/xfburn/default.nix b/pkgs/desktops/xfce/applications/xfburn/default.nix index 08f2bd511a872..8aff25df49436 100644 --- a/pkgs/desktops/xfce/applications/xfburn/default.nix +++ b/pkgs/desktops/xfce/applications/xfburn/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "apps"; pname = "xfburn"; - version = "0.6.1"; + version = "0.6.2"; - sha256 = "0a1ly79x7j5pgr3vbsabb4i0jd5rryaigj9z8iqzr8p9miypx20v"; + sha256 = "02axhsbbsvd31jb0xs1d2qxr614qb29pajv0sm2p1n1c2cv2fjh1"; nativeBuildInputs = [ libxslt docbook_xsl ]; buildInputs = [ exo gtk3 libburn libisofs libxfce4ui ]; diff --git a/pkgs/desktops/xfce/applications/xfce4-dict/default.nix b/pkgs/desktops/xfce/applications/xfce4-dict/default.nix index b2682080216ca..7e582abc05f73 100644 --- a/pkgs/desktops/xfce/applications/xfce4-dict/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-dict/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-dict"; - version = "0.8.2"; + version = "0.8.3"; - sha256 = "1zbb0k0984ny7wy4gbk6ymkh87rbfakpim54yq4r3h5ymslx7iv7"; + sha256 = "0p7k2ffknr23hh3j17dhh5q8adn736p2piwx0sg8f5dvvhhc5whz"; patches = [ ./configure-gio.patch ]; diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index a991e8c81807a..c9a6148884047 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-notifyd"; - version = "0.4.4"; + version = "0.6.1"; - sha256 = "1lmm9h3ych8dz9jpjkxg91f9ln14xs527nxjxsryks00kmqk4kai"; + sha256 = "18d2q5b54df8j2281lash8gm0826c6apn39q4igfz2zfcyqjh1if"; buildInputs = [ exo gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix index 012486baac9b0..8c0fa3e3edb6e 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix @@ -3,9 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-screenshooter"; - version = "1.9.5"; + version = "1.9.7"; + odd-unstable = false; - sha256 = "1h14sywvk9l06p3z1cpb79911j8w2wqbk03ldknjkia2rfymjk06"; + sha256 = "14vbd7iigaw57hl47rnixk873c20q5clqynzkm9zzpqc568dxixd"; buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ]; diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix index e3d8b4b87d94e..9a923025c94df 100644 --- a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-taskmanager"; - version = "1.2.2"; + version = "1.2.3"; - sha256 = "03js0pmhrybxa7hrp3gx4rm7j061ansv0bp2dwhnbrdpmzjysysc"; + sha256 = "0818chns7vkvjqakgz8z790adkygcq4jlw59dv6kyzk17hxq6cxv"; nativeBuildInputs = [ exo ]; buildInputs = [ gtk3 libwnck3 libXmu ]; diff --git a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix index 3b9cd268d55ae..56de8d3bfb834 100644 --- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-terminal"; - version = "0.8.8"; + version = "0.8.9.2"; - sha256 = "0sg9vwyvhh7pjp83biv7gvf42423a7ly4dc7q2gn28kp6bds2qcp"; + sha256 = "1vlpfsrdalqmsd86aj0kvvam5skzn6xngigjziwli6q6il6lb9fj"; buildInputs = [ gtk3 libxfce4ui vte xfconf pcre2 ]; diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix b/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix index dafb72582b316..aec898161ffb0 100644 --- a/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix @@ -1,9 +1,11 @@ { stdenv, fetchurl, pkgconfig, makeWrapper , gstreamer, gtk2, gst-plugins-base, libnotify -, keybinder, xfconf +, keybinder, xfconf, xfce }: let + category = "apps"; + # The usual Gstreamer plugins package has a zillion dependencies # that we don't need for a simple mixer, so build a minimal package. gst_plugins_minimal = gst-plugins-base.override { @@ -13,15 +15,13 @@ let in stdenv.mkDerivation rec { - p_name = "xfce4-volumed"; - ver_maj = "0.1"; - ver_min = "13"; + pname = "xfce4-volumed"; + version = "0.1.13"; src = fetchurl { - url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1aa0a1sbf9yzi7bc78kw044m0xzg1li3y4w9kf20wqv5kfjs7v2c"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = [ gstreamer gst_plugins_minimal gtk2 @@ -36,8 +36,14 @@ stdenv.mkDerivation rec { --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" ''; + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; + meta = with stdenv.lib; { - homepage = https://www.xfce.org/projects/xfce4-volumed; # referenced but inactive + homepage = "https://www.xfce.org/projects/xfce4-volumed"; # referenced but inactive description = "A volume keys control daemon for the Xfce desktop environment"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/desktops/xfce/applications/xfdashboard/default.nix b/pkgs/desktops/xfce/applications/xfdashboard/default.nix index a17c29f6723e8..a9610125b5b53 100644 --- a/pkgs/desktops/xfce/applications/xfdashboard/default.nix +++ b/pkgs/desktops/xfce/applications/xfdashboard/default.nix @@ -17,10 +17,11 @@ mkXfceDerivation { category = "apps"; pname = "xfdashboard"; - version = "0.7.5"; - rev = "0.7.5"; + version = "0.7.7"; + rev-prefix = ""; + odd-unstable = false; - sha256 = "0d0kg90h3li41bs75z3xldljsglkz220pba39c54qznnzb8v8a2i"; + sha256 = "0b9pl3k8wl7svwhb9knhvr86gjg2904n788l8cbczwy046ql7pyc"; buildInputs = [ clutter diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix index 6ac601c6685ef..526b703059177 100644 --- a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix +++ b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix @@ -1,23 +1,44 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome-icon-theme, tango-icon-theme, hicolor-icon-theme, xfce }: + +let + category = "art"; +in stdenv.mkDerivation rec { - p_name = "xfce4-icon-theme"; - ver_maj = "4.4"; - ver_min = "3"; + pname = "xfce4-icon-theme"; + version = "4.4.3"; src = fetchurl { - url = "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1yk6rx3zr9grm4jwpjvqdkl13pisy7qn1wm5cqzmd2kbsn96cy6l"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk2 ]; + nativeBuildInputs = [ + pkgconfig + intltool + gtk3 + ]; + + buildInputs = [ + gnome-icon-theme + tango-icon-theme + hicolor-icon-theme + # missing parent icon theme Industrial + ]; + + dontDropIconThemeCache = true; + + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = https://www.xfce.org/; + meta = with stdenv.lib; { + homepage = "https://www.xfce.org/"; description = "Icons for Xfce"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.eelco ]; }; } diff --git a/pkgs/desktops/xfce/art/xfwm4-themes.nix b/pkgs/desktops/xfce/art/xfwm4-themes.nix index 783fbb13c83ce..db0a1779a41b9 100644 --- a/pkgs/desktops/xfce/art/xfwm4-themes.nix +++ b/pkgs/desktops/xfce/art/xfwm4-themes.nix @@ -1,18 +1,26 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, xfce }: + +let + category = "art"; +in stdenv.mkDerivation rec { - p_name = "xfwm4-themes"; - ver_maj = "4.10"; - ver_min = "0"; + pname = "xfwm4-themes"; + version = "4.10.0"; src = fetchurl { - url = "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "0xfmdykav4rf6gdxbd6fhmrfrvbdc1yjihz7r7lba0wp1vqda51j"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; + + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; meta = with stdenv.lib; { - homepage = https://www.xfce.org/; + homepage = "https://www.xfce.org/"; description = "Themes for Xfce"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/desktops/xfce/core/exo/default.nix b/pkgs/desktops/xfce/core/exo/default.nix index 59ab5823314ee..ee58c76ea02be 100644 --- a/pkgs/desktops/xfce/core/exo/default.nix +++ b/pkgs/desktops/xfce/core/exo/default.nix @@ -1,15 +1,26 @@ -{ mkXfceDerivation, docbook_xsl, glib, libxslt, perlPackages, gtk3 +{ mkXfceDerivation, docbook_xsl, glib, libxslt, perlPackages, gtk2, gtk3 , libxfce4ui, libxfce4util }: mkXfceDerivation { category = "xfce"; pname = "exo"; - version = "0.12.8"; + version = "0.12.11"; - sha256 = "013am7q4pwfncf4hk2a3hv7yx2vxgzb5xm8qsi9mxkj29xdhrvs5"; + sha256 = "1db7w6jk3i501x4qw0hs0ydrm1fjdkxmahzbv5iag859wnnlg0pd"; - nativeBuildInputs = [ libxslt perlPackages.URI docbook_xsl ]; - buildInputs = [ gtk3 glib libxfce4ui libxfce4util ]; + nativeBuildInputs = [ + libxslt + perlPackages.URI + docbook_xsl + ]; + + buildInputs = [ + gtk2 # some xfce plugins still uses gtk2 + gtk3 + glib + libxfce4ui + libxfce4util + ]; # Workaround https://bugzilla.xfce.org/show_bug.cgi?id=15825 NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/xfce/core/thunar-volman/default.nix b/pkgs/desktops/xfce/core/thunar-volman/default.nix index fc6db0fcce4fd..ecc26ccb8fea7 100644 --- a/pkgs/desktops/xfce/core/thunar-volman/default.nix +++ b/pkgs/desktops/xfce/core/thunar-volman/default.nix @@ -9,6 +9,8 @@ mkXfceDerivation { sha256 = "1qrlpn0q5g9psd41l6y80r3bvbg8jaic92m6r400zzwcvivf95z0"; + odd-unstable = false; + meta = { description = "Thunar extension for automatic management of removable drives and media"; }; diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 11220141d2a01..24df606e24667 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -21,9 +21,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "1.8.9"; + version = "1.8.14"; - sha256 = "01w60csbs2nq1bhb8n1bnmjmx48fm0va3qbnq84z0h2dxpr80b1w"; + sha256 = "1ph9bcqfm2nccliagl8zdl1dizh62qnr8m5hacri3cs2jhc0jjpy"; nativeBuildInputs = [ docbook_xsl diff --git a/pkgs/desktops/xfce/core/tumbler/default.nix b/pkgs/desktops/xfce/core/tumbler/default.nix index b795007ca7c1d..1a615b8f66a50 100644 --- a/pkgs/desktops/xfce/core/tumbler/default.nix +++ b/pkgs/desktops/xfce/core/tumbler/default.nix @@ -14,9 +14,9 @@ mkXfceDerivation { category = "xfce"; pname = "tumbler"; - version = "0.2.7"; + version = "0.2.8"; - sha256 = "14ql3fcxyz81qr9s0vcwh6j2ks5fl8jf9scwnkilv5jy0ii9l0ry"; + sha256 = "1y9sphaz3izal96v53lps692xxzp5pad1d09kxsmmpm7pic4n1r2"; buildInputs = [ ffmpegthumbnailer diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index f4d86247c6cdf..b7bede9e27bb7 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.14.0"; + version = "4.14.4"; - sha256 = "1v3f2xjz9gwa8maqqvv9w2dh1cgy03v89a9ny7nrv0cjsxwwrr15"; + sha256 = "1srzgb9vsvfrbhym74zkz9hdhxcrvbffxpfgv5vprhlwxw3vk3fq"; nativeBuildInputs = [ gobject-introspection ]; buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ]; diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix index fb3f05b36646e..9f9a552b8cc6a 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-power-manager"; - version = "1.6.5"; + version = "1.6.6"; - sha256 = "0zazm2cgkz5xj7rvy9gbh4kaay2anfcmawg4gj38pnq3a8zcwwd5"; + sha256 = "0lyp3dp4ijbpf21vanrvgm6rmfp8v0zyqxibdj5gxnadmvcq38iy"; nativeBuildInputs = [ automakeAddFlags exo ]; buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ]; diff --git a/pkgs/desktops/xfce/core/xfce4-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix index 0ab362aa21d07..c7442a01957a6 100644 --- a/pkgs/desktops/xfce/core/xfce4-session/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-session"; - version = "4.14.0"; + version = "4.14.2"; - sha256 = "0v0xzkdr5rgv6219c1dy96cghgw8bqnb313jccxihfgddf363104"; + sha256 = "1gr6j96l792v33lbh7rqpbdjmy8m68hy14bsndx6bykv10zvmgx2"; buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ]; diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix index 74ab96ed1bcd4..9b263e5ee7334 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-settings"; - version = "4.14.0"; + version = "4.14.3"; - sha256 = "13gmxd4sfgd6wky7s03bar58w9vl4i6jv2wncd6iajww791y5akn"; + sha256 = "1zzngdj7mp2r6rcs8gvda1218zlz5gpnc6gsp20z32l69psp3yld"; postPatch = '' for f in $(find . -name \*.c); do diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix index a0923f0fda1b4..357f4b2341088 100644 --- a/pkgs/desktops/xfce/core/xfconf/default.nix +++ b/pkgs/desktops/xfce/core/xfconf/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfconf"; - version = "4.14.1"; + version = "4.14.3"; - sha256 = "1mbqc1463xgn7gafbh2fyshshdxin33iwk96y4nw2gl48nhx4sgs"; + sha256 = "0yxpdcyz81di7w9493jzps09bgrlgianjj5abnzahqmkpmpvb0rh"; buildInputs = [ libxfce4util ]; diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix index afcd0d19dc33f..75e9fc8cb653a 100644 --- a/pkgs/desktops/xfce/core/xfdesktop/default.nix +++ b/pkgs/desktops/xfce/core/xfdesktop/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfdesktop"; - version = "4.14.1"; + version = "4.14.2"; - sha256 = "006w4xwmpwp34q2qkkixr3xz0vb0kny79pw64yj4304wsb5jr14g"; + sha256 = "04fhm1pf9290sy3ymrmnfnm2x6fq5ldzvj5bjd9kz6zkx0nsq1za"; buildInputs = [ exo diff --git a/pkgs/desktops/xfce/core/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix index ed77699f191e4..1d119014cab61 100644 --- a/pkgs/desktops/xfce/core/xfwm4/default.nix +++ b/pkgs/desktops/xfce/core/xfwm4/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfwm4"; - version = "4.14.0"; # TODO: remove xfce4-14 alias when this gets bumped + version = "4.14.2"; - sha256 = "1z5aqij2d8n9wnha88b0qzkvss54jvqs8w1w5m3mzjl4c9mn9n8m"; + sha256 = "1zzc4q1j55hjljksmlyghk58bx7kxyq3scihsr9zgyqc24ww1ks3"; nativeBuildInputs = [ exo librsvg ]; diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 9f49299c03a8e..579e863bf9c89 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -3,6 +3,14 @@ lib.makeScope pkgs.newScope (self: with self; { #### NixOS support + updateScript = pkgs.genericUpdater; + + gitLister = url: + "${pkgs.common-updater-scripts}/bin/list-git-tags ${url}"; + + archiveLister = category: name: + "${pkgs.common-updater-scripts}/bin/list-archive-two-level-versions https://archive.xfce.org/src/${category}/${name}"; + mkXfceDerivation = callPackage ./mkXfceDerivation.nix { }; automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh; @@ -109,8 +117,6 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin { }; - xfce4-dict-plugin = callPackage ./panel-plugins/xfce4-dict-plugin.nix { }; - xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin.nix { }; xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin.nix { }; @@ -179,7 +185,6 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4_cpufreq_plugin = xfce4-cpufreq-plugin; xfce4_cpugraph_plugin = xfce4-cpugraph-plugin; xfce4_datetime_plugin = xfce4-datetime-plugin; - xfce4_dict_plugin = xfce4-dict-plugin; xfce4_dockbarx_plugin = xfce4-dockbarx-plugin; xfce4_embed_plugin = xfce4-embed-plugin; xfce4_eyes_plugin = xfce4-eyes-plugin; @@ -203,6 +208,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; # added 2019-08-18 gtk-xfce-engine = throw "deprecated 2019-09-17: Xfce 4.14 deprecated gtk-xfce-engine"; # added 2019-09-17 + xfce4-dict-plugin = throw "deprecated 2020-04-19: xfce4-dict-plugin is now part of xfce4-dict."; # added 2020-04-19 # added 2019-11-04 libxfce4ui_gtk3 = libxfce4ui; diff --git a/pkgs/desktops/xfce/mkXfceDerivation.nix b/pkgs/desktops/xfce/mkXfceDerivation.nix index b7dc832256966..4c6edf99b611a 100644 --- a/pkgs/desktops/xfce/mkXfceDerivation.nix +++ b/pkgs/desktops/xfce/mkXfceDerivation.nix @@ -1,6 +1,16 @@ -{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, wrapGAppsHook }: - -{ category, pname, version, rev ? "${pname}-${version}", sha256, ... } @ args: +{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook }: + +{ category +, pname +, version +, attrPath ? "xfce.${pname}" +, rev-prefix ? "${pname}-" +, rev ? "${rev-prefix}${version}" +, sha256 +, odd-unstable ? true +, patchlevel-unstable ? true +, ... +} @ args: let inherit (builtins) filter getAttr head isList; @@ -12,7 +22,7 @@ let concatAttrLists = attrsets: zipAttrsWithNames (filterAttrNames isList (head attrsets)) (_: concatLists) attrsets; - template = { + template = rec { name = "${pname}-${version}"; nativeBuildInputs = [ pkgconfig xfce4-dev-tools wrapGAppsHook ]; @@ -27,6 +37,13 @@ let enableParallelBuilding = true; outputs = [ "out" "dev" ]; + pos = builtins.unsafeGetAttrPos "pname" args; + + passthru.updateScript = xfce.updateScript { + inherit pname version attrPath rev-prefix odd-unstable patchlevel-unstable; + versionLister = xfce.gitLister src.url; + }; + meta = with stdenv.lib; { homepage = "https://git.xfce.org/${category}/${pname}/about"; license = licenses.gpl2; # some libraries are under LGPLv2+ diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix index 3966e256b1604..0d047447e0c2b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix @@ -1,11 +1,12 @@ { mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-battery-plugin"; - version = "1.1.2"; - rev = version; - sha256 = "0329miiclc8da6j0sz495p99hyrf9fjhvpmdl0556fphybz5agc0"; + version = "1.1.3"; + rev-prefix = ""; + odd-unstable = false; + sha256 = "0ligdiasrfc3170kd7sif2ml6lvlpp11lbxz3xdvklqkv7p3323y"; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix index bd1a3b5e5e357..2349b4bf3e8d6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix @@ -1,11 +1,10 @@ { mkXfceDerivation, gtk3, libXtst, libxfce4ui, libxfce4util, xfce4-panel, xfconf, exo }: -mkXfceDerivation rec { +mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-clipman-plugin"; - version = "1.4.3"; - rev = version; - sha256 = "1xk79xh1zk0x4r1z9m1dakp79pip0zh3naviybvl1dnpwwfc03gq"; + version = "1.6.1"; + sha256 = "03akijvry1n1fkziyvxwcksl4vy4lmnpgd5izjs8jai5sndhsszl"; buildInputs = [ exo gtk3 libXtst libxfce4ui libxfce4util xfce4-panel xfconf ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix index 321e4792e4bcb..38ad759e700cc 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix @@ -1,23 +1,46 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, hicolor-icon-theme }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, hicolor-icon-theme, xfce }: + +let + category = "panel-plugins"; +in -with stdenv.lib; stdenv.mkDerivation rec { - p_name = "xfce4-cpugraph-plugin"; - ver_maj = "1.0"; - ver_min = "5"; + pname = "xfce4-cpugraph-plugin"; + version = "1.1.0"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1izl53q95m5xm2fiq7385vb1i9nwgjizxkmgpgh33zdckb40xnl5"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "193bj1p54l4zrvgdjj0pvjn161d6dn82jh9invcy09sqwlj0mkiy"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel xfconf gtk2 hicolor-icon-theme ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + glib + exo + libXtst + xorgproto + libxfce4util + libxfce4ui + xfce4-panel + xfconf + gtk3 + hicolor-icon-theme + ]; + + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; + meta = with stdenv.lib; { + homepage = "https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin"; description = "CPU graph show for Xfce panel"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix index 3cfb010b12da7..15f528fd5fc79 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix @@ -7,13 +7,12 @@ , gettext }: -mkXfceDerivation rec { +mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-datetime-plugin"; version = "0.8.0"; - rev = "datetime-${version}"; - + rev-prefix = "datetime-"; sha256 = "12drh7y70d70r93lpv43fkj5cbyl0vciz4a41nxrknrfbhxrvyah"; nativeBuildInputs = [ diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix deleted file mode 100644 index d5982ea3c12ad..0000000000000 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2}: - -with stdenv.lib; -stdenv.mkDerivation rec { - p_name = "xfce4-dict-plugin"; - ver_maj = "0.3"; - ver_min = "0"; - - src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.gz"; - sha256 = "1x0imfnsdfq7fbhka8bc0yjjspkcljc1jafhrwzb08qi9bk2wbar"; - }; - name = "${p_name}-${ver_maj}.${ver_min}"; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; - - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; - description = "Dictionary plugin for Xfce panel"; - platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; - broken = true; # see https://goodies.xfce.org/projects/panel-plugins/xfce4-dict-plugin - }; -} diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix index db74da2939de3..673b0a24fb61f 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix @@ -2,9 +2,10 @@ , dockbarx, gtk2, xfce, pythonPackages, wafHook }: stdenv.mkDerivation rec { + pname = "xfce4-dockbarx-plugin"; + version = "${ver}-${rev}"; ver = "0.5"; rev = "a2dcb66"; - name = "xfce4-dockbarx-plugin-${ver}-${rev}"; src = fetchFromGitHub { owner = "TiZ-EX1"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix index 94c26f9e1b2b6..2b2027bcf4bcb 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix @@ -1,23 +1,41 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2 }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2, xfce }: + +let + category = "panel-plugins"; +in with stdenv.lib; stdenv.mkDerivation rec { - p_name = "xfce4-embed-plugin"; - ver_maj = "1.6"; - ver_min = "0"; + pname = "xfce4-embed-plugin"; + version = "1.6.0"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "0a72kqsjjh45swimqlpyrahdnplp0383v0i4phr4n6g8c1ixyry7"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + gtk2 + ]; + + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-embed-plugin"; description = "Embed arbitrary app windows on Xfce panel"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix index 1932a9e9968e3..220e250685825 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix @@ -1,25 +1,42 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: + +let + category = "panel-plugins"; +in -with stdenv.lib; stdenv.mkDerivation rec { - p_name = "xfce4-eyes-plugin"; - ver_maj = "4.4"; - ver_min = "4"; + pname = "xfce4-eyes-plugin"; + version = "4.5.0"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1jh02hylvsvfpxrx0bq6fzgy6vnxf9qakgpbfvr63lfkd1dyh314"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "17gj6fbvvrdzvz61czmia8hqynllsnmhk61fs4aml443cc1h1bpx"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + xfconf + gtk3 + ]; + + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; - description = "Eyes following you!"; + meta = with stdenv.lib; { + homepage = "https://docs.xfce.org/panel-plugins/xfce4-eyes-plugin"; + description = "Rolling eyes (following mouse pointer) plugin for the Xfce panel"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; - broken = true; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix index 54bb4817d7e20..b67e63f5c6449 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix @@ -1,25 +1,42 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: + +let + category = "panel-plugins"; +in -with stdenv.lib; stdenv.mkDerivation rec { - p_name = "xfce4-fsguard-plugin"; - ver_maj = "1.0"; - ver_min = "2"; + pname = "xfce4-fsguard-plugin"; + version = "1.1.1"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1bj021h4q68bc03f32pkyqy4gfd1sz6s21nxdg7j6gdfhs9xbj52"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "05nmfkrmifm76bsywqmbjd1qdvzagv5cbvnwbkb57156j055vl6n"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + xfconf + gtk3 + ]; + + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; - description = "Filesystem monitor"; + meta = with stdenv.lib; { + homepage = "https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin"; + description = "Filesystem usage monitor plugin for the Xfce panel"; + license = licenses.bsd2; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; - broken = true; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix index dd9827dcc5a9d..417001fed53be 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix @@ -1,25 +1,41 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: + +let + category = "panel-plugins"; +in -with stdenv.lib; stdenv.mkDerivation rec { - p_name = "xfce4-genmon-plugin"; - ver_maj = "3.4"; - ver_min = "0"; + pname = "xfce4-genmon-plugin"; + version = "4.0.2"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "11q3g6lmgz3d5lyh6614mxkd9cblfdyf9jgki7f26mn895xk79dh"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "1ai3pwgv61nv7i2dyrvncnc63r8kdjbkp40vp51vzak1dx924v15"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + gtk3 + ]; + + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; - description = "Cyclically spawns a command and captures its output"; + meta = with stdenv.lib; { + homepage = "https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin"; + description = "Generic monitor plugin for the Xfce panel"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; - broken = true; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix index 40810abfc079b..d8775c4b7045a 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, autoreconfHook, gnome2, gtkmm2, - libgtop, libxfce4ui, libxfce4util, xfce4-panel, lm_sensors + libgtop, libxfce4ui, libxfce4util, xfce4-panel, lm_sensors, xfce }: stdenv.mkDerivation rec { @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; + meta = with stdenv.lib; { + homepage = "https://goodies.xfce.org/projects/panel-plugins/xfce4-hardware-monitor-plugin"; description = "Hardware monitor plugin for the XFCE4 panel"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix index 058f259171618..3d60d8b18f9a4 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix @@ -1,27 +1,45 @@ { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, - xfconf, gtk2, exo, gnutls, libgcrypt }: + gtk2, exo, gnutls, libgcrypt, xfce }: + +let + category = "panel-plugins"; +in -with stdenv.lib; stdenv.mkDerivation rec { - p_name = "xfce4-mailwatch-plugin"; - ver_maj = "1.2"; - ver_min = "0"; + pname = "xfce4-mailwatch-plugin"; + version = "1.2.0"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1bfw3smwivr9mzdyq768biqrl4aq94zqi3xjzq6kqnd8561cqjk2"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel - xfconf gtk2 exo gnutls libgcrypt ]; + nativeBuildInputs = [ + intltool + pkgconfig + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + gtk2 + exo # needs exo with gtk2 support + gnutls + libgcrypt + ]; + + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; - description = "Mailwatch plugin for Xfce panel"; + meta = with stdenv.lib; { + homepage = "https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin"; + description = "Mail watcher plugin for Xfce panel"; + license = licenses.gpl2; platforms = platforms.linux; maintainers = [ ]; - broken = true; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix index b936d2e441c05..bb56e875c865a 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix @@ -1,27 +1,43 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, - xfconf, gtk2, exo }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, + libxfce4ui, gtk3, exo, xfce }: + +let + category = "panel-plugins"; +in -with stdenv.lib; stdenv.mkDerivation rec { - p_name = "xfce4-mpc-plugin"; - ver_maj = "0.4"; - ver_min = "5"; - name = "${p_name}-${ver_maj}.${ver_min}"; + pname = "xfce4-mpc-plugin"; + version = "0.5.2"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1kvgq1pq7cykqdc3227dq0izad093ppfw3nfsrcp9i8mi6i5f7z7"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "0q3pysdp85b3c7g3b59y3c69g4nw6bvbf518lnri4lxrnsvpizpf"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel - xfconf gtk2 exo ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + gtk3 + exo + ]; + + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; + meta = with stdenv.lib; { + homepage = "https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin"; description = "MPD plugin for Xfce panel"; platforms = platforms.linux; + license = licenses.bsd2; maintainers = [ ]; - broken = true; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix index 8c6c91e25194d..affc957c51df9 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/TiZ-EX1/xfce4-namebar-plugin; + homepage = "https://github.com/TiZ-EX1/xfce4-namebar-plugin"; description = "A plugins which integrates titlebar and window controls into the xfce4-panel"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix index d774649b53695..8d258220175b9 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix @@ -1,11 +1,12 @@ { mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-netload-plugin"; - version = "1.3.1"; - rev = "version-${version}"; - sha256 = "0nm8advafw4jpc9p1qszyfqa56194sz51z216rdh4c6ilcrrpy1h"; + version = "1.3.2"; + rev-prefix = "version-"; + odd-unstable = false; + sha256 = "1py1l4z5ah4nlq8l2912k47ffsa5z7p1gbvlk7nw6b9r1x4ykdfl"; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix index 516d86f56abb7..d6910d367a632 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix @@ -1,25 +1,45 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique, xfce }: + +let + category = "panel-plugins"; +in -with stdenv.lib; stdenv.mkDerivation rec { - p_name = "xfce4-notes-plugin"; - ver_maj = "1.7"; - ver_min = "7"; + pname = "xfce4-notes-plugin"; + version = "1.8.1"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "05sjbwgch1j93m3r23ksbjnpfk11sf7xjmbb9pm5vl3snc2s3fm7"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "1cjlvvcsigyh40xa26b2vc5zylgss0nlaw72sablzhii2kkw7907"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 libunique ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + xfconf + gtk2 + libunique + ]; + + hardeningDisable = [ "format" ]; + + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; + meta = with stdenv.lib; { + homepage = "https://docs.xfce.org/panel-plugins/xfce4-notes-plugin"; description = "Sticky notes plugin for Xfce panel"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; - broken = true; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix index 64916f92a6ff0..10850974bb7d3 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix @@ -2,6 +2,7 @@ , automakeAddFlags , dbus-glib , dbus +, exo , gtk3 , libpulseaudio , libnotify @@ -16,8 +17,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-pulseaudio-plugin"; - version = "0.4.2"; - sha256 = "1s996mcniskq42vv7cb9i165pmrfp9c95p5f9rx14hqq8in9mvc5"; + version = "0.4.3"; + sha256 = "1rfw2w8gl95iawiy57qlvz958dqjc8bmxnc3dma4rqzm6g46jkgq"; nativeBuildInputs = [ automakeAddFlags @@ -30,6 +31,7 @@ mkXfceDerivation { ''; buildInputs = [ + exo glib gtk3 keybinder3 diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix index 56cad888168dd..8b8dbf3e022cb 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2, libxfce4ui, - libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxfce4ui, + libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu, xfce }: +let + category = "panel-plugins"; +in + stdenv.mkDerivation rec { - name = "${pname}-${ver_maj}.${ver_min}"; pname = "xfce4-sensors-plugin"; - ver_maj = "1.2"; - ver_min = "6"; + version = "1.3.92"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${pname}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1h0vpqxcziml3gwrbvd8xvy1mwh9mf2a68dvxsy03rs5pm1ghpi3"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "04jibw23ibi61f19gc9xy400yhcdiya4px6zp8c7fjq65hyn9iix"; }; nativeBuildInputs = [ @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 + gtk3 libxfce4ui libxfce4util xfce4-panel @@ -35,12 +37,18 @@ stdenv.mkDerivation rec { "--with-pathhddtemp=${hddtemp}/bin/hddtemp" "--with-pathnetcat=${netcat-gnu}/bin/netcat" ]; + + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; + meta = with stdenv.lib; { + homepage = "https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin"; description = "A panel plug-in for different sensors using acpi, lm_sensors and hddtemp"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix index 95fb9358f946f..52da6a29ea42f 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix @@ -1,23 +1,40 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: + +let + category = "panel-plugins"; +in -with stdenv.lib; stdenv.mkDerivation rec { - p_name = "xfce4-systemload-plugin"; - ver_maj = "1.1"; - ver_min = "2"; + pname = "xfce4-systemload-plugin"; + version = "1.2.3"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0z4as6sxdz93d4jpgv0665dg4sykfvc5068mc689phlfl2rvcsdl"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "0x87a8h5l3ashz1ksfaxcpn9a392jzlsbx5n5pga8g90fp2hf905"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel gtk2 ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + gtk3 + ]; + + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; + meta = with stdenv.lib; { + homepage = "https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin"; description = "System load plugin for Xfce panel"; + license = licenses.bsd2; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix index 4070156c2239d..00b497c918d8f 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix @@ -1,31 +1,44 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel -, libxfce4ui, xfconf, gtk2, hicolor-icon-theme }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, hicolor-icon-theme, xfce }: + +let + category = "panel-plugins"; +in -with stdenv.lib; stdenv.mkDerivation rec { - p_name = "xfce4-timer-plugin"; - ver_maj = "1.6"; - ver_min = "0"; + pname = "xfce4-timer-plugin"; + version = "1.7.0"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0z46gyw3ihcd1jf0m5z1dsc790xv1cpi8mk1dagj3i4v14gx5mrr"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "16vypwwjwfk7nn4n16rfgn0z78jqrmbgxmc1r46269lrwd1m6kif"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf - gtk2 hicolor-icon-theme ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; - nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + gtk3 + hicolor-icon-theme + ]; hardeningDisable = [ "format" ]; + + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; - description = "A simple XFCE panel plugin that lets the user run an alarm at a specified time or at the end of a specified countdown period"; + meta = with stdenv.lib; { + homepage = "https://docs.xfce.org/panel-plugins/xfce4-timer-plugin"; + description = "Simple countdown and alarm plugin for the Xfce panel"; platforms = platforms.linux; license = licenses.gpl2; maintainers = [ ]; - broken = true; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix index 43e943f194acd..525bd6e5fd7d6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "xfce4-vala-panel-appmenu-plugin"; - version = "0.6.94"; + version = "0.7.3"; src = fetchFromGitHub { owner = "rilian-la-te"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { rev = version; fetchSubmodules = true; - sha256 = "0xxn3zs60a9nfix8wrdp056wviq281cm1031hznzf1l38lp3wr5p"; + sha256 = "06rykdr2c9rnzxwinwdynd73v9wf0gjkx6qfva7sx2n94ajsdnaw"; }; nativeBuildInputs = [ pkgconfig cmake vala libxml2.bin ]; @@ -41,6 +41,12 @@ stdenv.mkDerivation rec { mv cmake/FallbackVersion.cmake.in cmake/FallbackVersion.cmake ''; + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.gitLister src.meta.homepage; + }; + meta = with stdenv.lib; { description = "Global Menu applet for XFCE4"; license = licenses.lgpl3; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix index 288aaddfb9823..5a98173ea00c2 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix @@ -1,10 +1,10 @@ { lib, mkXfceDerivation, gtk3, libxfce4ui, pcre, libxfce4util, xfce4-panel, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-verve-plugin"; version = "2.0.0"; - rev = version; + rev-prefix = ""; sha256 = "09vpa6m0ah7pgmra094c16vb79xrcwva808g6zpawwrhcwz85lcz"; buildInputs = [ gtk3 libxfce4ui pcre libxfce4util xfce4-panel ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix index 0914c4cb7d97c..cff2ef251ad4b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix @@ -1,29 +1,48 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2, libxml2, libsoup, upower, -libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsoup, upower, + libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme, xfce }: + +let + category = "panel-plugins"; +in stdenv.mkDerivation rec { - name = "${p_name}-${ver_maj}.${ver_min}"; - p_name = "xfce4-weather-plugin"; - ver_maj = "0.8"; - ver_min = "10"; + pname = "xfce4-weather-plugin"; + version = "0.10.1"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1f7ac2zr5s5w6krdpgsq252wxhhmcblia3j783132ilh8k246vgf"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "12bs2rfmmy021087i10vxibdbbvd5vld0vk3h5hymhpz7rgszcmg"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; - buildInputs = [ gtk2 libxml2 libsoup upower libxfce4ui libxfce4util - xfce4-panel hicolor-icon-theme ]; + buildInputs = [ + gtk3 + libxml2 + libsoup + upower + libxfce4ui + libxfce4util + xfce4-panel + hicolor-icon-theme + ]; enableParallelBuilding = true; + + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; + meta = with stdenv.lib; { + homepage = "https://docs.xfce.org/panel-plugins/xfce4-weather-plugin"; description = "Weather plugin for the Xfce desktop environment"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index 884b8ee3a2942..859a580bb70ba 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -1,15 +1,20 @@ -{ mkXfceDerivation, gtk3, glib, cmake, exo, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: +{ mkXfceDerivation, gettext, gtk3, glib, cmake, exo, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.4.3"; - rev = "v${version}"; - sha256 = "1cs3fps1bj0dd5az7fwrvw1xl3y621qk4dma3n73p7rr19j7fpsn"; + version = "2.4.4"; + rev-prefix = "v"; + sha256 = "08b82j9xp3vzjlc740s9svcjkbsal71ggp23y7dvjqppch7sdxzw"; nativeBuildInputs = [ cmake ]; - buildInputs = [ exo garcon gtk3 glib libxfce4ui libxfce4util xfce4-panel xfconf ]; + buildInputs = [ gettext exo garcon gtk3 glib libxfce4ui libxfce4util xfce4-panel xfconf ]; + + postPatch = '' + substituteInPlace panel-plugin/xfce4-popup-whiskermenu.in \ + --replace gettext ${gettext}/bin/gettext + ''; postInstall = '' substituteInPlace $out/bin/xfce4-popup-whiskermenu \ diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix index eba7be91ef9da..e629a08c5537e 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix @@ -1,21 +1,34 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, python3, imagemagick, libwnck, gtk2 -, exo, libxfce4ui, libxfce4util, xfce4-panel, xfconf, xfce4-dev-tools }: +, exo, libxfce4ui, libxfce4util, xfce4-panel, xfconf, xfce4-dev-tools, xfce }: stdenv.mkDerivation rec { - p_name = "xfce4-windowck-plugin"; - version = "0.4.4"; + pname = "xfce4-windowck-plugin"; + version = "0.4.6"; src = fetchFromGitHub { owner = "cedl38"; - repo = "xfce4-windowck-plugin"; + repo = pname; rev = "v${version}"; - sha256 = "0c6a1ibh39dpq9x0dha5lsg0vzmgaf051fgwz0nlky0s94nwzvgv"; + sha256 = "1gwrbjfv4cnlsqh05h42w41z3xs15yjj6j8y9gxvvvvlgzzp4p3g"; }; - name = "${p_name}-${version}"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool python3 imagemagick libwnck gtk2 - exo libxfce4ui libxfce4util xfce4-panel xfconf xfce4-dev-tools ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + python3 + imagemagick + libwnck + gtk2 + exo + libxfce4ui + libxfce4util + xfce4-panel + xfconf + xfce4-dev-tools + ]; preConfigure = '' ./autogen.sh @@ -24,9 +37,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.gitLister src.meta.homepage; + rev-prefix = "v"; + }; + meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; - description = "Set of two plugins which allows you to put the maximized window title and windows buttons on the panel"; + homepage = "https://goodies.xfce.org/projects/panel-plugins/xfce4-windowck-plugin"; + description = "Xfce plugins which allows to put the maximized window title and buttons on the panel"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.volth ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix index 4497a7b0e36aa..a08621594890f 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix @@ -1,10 +1,10 @@ { lib, mkXfceDerivation, gtk3, librsvg, libwnck3, libxklavier, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-xkb-plugin"; version = "0.8.1"; - rev = version; + rev-prefix = ""; sha256 = "1gyky4raynp2ggdnq0g96c6646fjm679fzipcsmf1q0aymr8d5ky"; buildInputs = [ garcon gtk3 librsvg libxfce4ui libxfce4util libxklavier libwnck3 xfce4-panel xfconf ]; diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index e3c72d3b50e2f..6b255dc720124 100644 --- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -1,6 +1,5 @@ { stdenv , mkXfceDerivation -, fetchFromGitHub , gtk3 , thunar , exo @@ -9,7 +8,7 @@ , gettext }: -mkXfceDerivation rec { +mkXfceDerivation { category = "thunar-plugins"; pname = "thunar-archive-plugin"; version = "0.4.0"; diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index 8674c586552cb..61e9d94acc5d0 100644 --- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -5,6 +5,7 @@ , thunar , cmake , ninja +, xfce }: stdenv.mkDerivation rec { @@ -31,6 +32,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.thunar-dropbox-plugin"; + versionLister = xfce.gitLister src.meta.homepage; + }; + meta = with stdenv.lib; { homepage = "https://github.com/Jeinzi/thunar-dropbox"; description = "A plugin that adds context-menu items for Dropbox to Thunar"; diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index f8be40eecab52..04420370ff1cd 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -82,7 +82,10 @@ rec { }; clang = wrapCCWith { - cc = binaries; + cc = binaries // { + # for packages expecting libcompiler-rt, etc. to come from here (stdenv.cc.cc.lib) + lib = targetAndroidndkPkgs.libraries; + }; bintools = binutils; libc = targetAndroidndkPkgs.libraries; extraBuildCommands = '' diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 9849afb2c2df8..3512dcbd2bcf7 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchurl, jdk, ant -, libusb, libusb1, unzip, zlib, ncurses, readline +, libusb-compat-0_1, libusb1, unzip, zlib, ncurses, readline , withGui ? false, gtk2 ? null, withTeensyduino ? false /* Packages needed for Teensyduino */ , upx, fontconfig, xorg, gcc @@ -42,7 +42,7 @@ let glib gtk2 libpng12 - libusb + libusb-compat-0_1 pango udev xorg.libSM @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { }; - buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline + buildInputs = [ jdk ant libusb-compat-0_1 libusb1 unzip zlib ncurses5 readline ] ++ stdenv.lib.optionals withTeensyduino [ upx ]; downloadSrcList = builtins.attrValues externalDownloads; downloadDstList = builtins.attrNames externalDownloads; @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { javaPath = lib.makeBinPath [jdk]; # Everything else will be patched into rpath - rpath = (lib.makeLibraryPath [zlib libusb libusb1 readline ncurses5 stdenv.cc.cc]); + rpath = (lib.makeLibraryPath [zlib libusb-compat-0_1 libusb1 readline ncurses5 stdenv.cc.cc]); installPhase = '' mkdir -p $out/share/arduino @@ -217,7 +217,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source electronics prototyping platform"; - homepage = http://arduino.cc/; + homepage = "http://arduino.cc/"; license = if withTeensyduino then licenses.unfreeRedistributable else licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ antono auntie robberer bjornfor bergey ]; diff --git a/pkgs/development/arduino/arduino-mk/default.nix b/pkgs/development/arduino/arduino-mk/default.nix index f450d4f850f31..ff7b7274ca97b 100644 --- a/pkgs/development/arduino/arduino-mk/default.nix +++ b/pkgs/development/arduino/arduino-mk/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Makefile for Arduino sketches"; - homepage = https://github.com/sudar/Arduino-Makefile; + homepage = "https://github.com/sudar/Arduino-Makefile"; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.eyjhb ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index 83b72488bfd45..c51d3f89d0708 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -38,9 +38,9 @@ python2Packages.buildPythonApplication rec { meta = { description = "Command line toolkit for working with Arduino hardware"; - homepage = http://inotool.org/; + homepage = "http://inotool.org/"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ antono the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ antono ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index 7beb2cba9c50e..0d333a49d37ae 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -34,6 +34,8 @@ let "commands/test_test.py::test_local_env" "test_builder.py::test_build_flags" "test_builder.py::test_build_unflags" + "test_builder.py::test_debug_default_build_flags" + "test_builder.py::test_debug_custom_build_flags" "test_misc.py::test_api_cache" "test_misc.py::test_ping_internet_ips" "test_misc.py::test_platformio_cli" @@ -49,14 +51,14 @@ let in buildPythonApplication rec { pname = "platformio"; - version = "4.1.0"; + version = "4.3.1"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "10v9jw1zjfqr3wl6kills3cfp0ky7xbm1gc3z0n57wrqbc6cmz95"; + sha256 = "1dxnjy60zpkgyrbvbf6b9qi6m37gm8gwjmxwfj30npr1y7rvxwrw"; }; propagatedBuildInputs = [ @@ -79,11 +81,6 @@ in buildPythonApplication rec { patches = [ ./fix-searchpath.patch - (fetchpatch { - url = "https://github.com/platformio/platformio-core/commit/442a7e357636522e844d95375c246644b21a7802.patch"; - sha256 = "0a3kj3k02237gr2yk30gpwc6vm04dsd1wxldj4dsbzs4a9yyi70m"; - excludes = ["HISTORY.rst"]; - }) ./use-local-spdx-license-list.patch ]; @@ -95,7 +92,7 @@ in buildPythonApplication rec { meta = with stdenv.lib; { broken = stdenv.isAarch64; description = "An open source ecosystem for IoT development"; - homepage = http://platformio.org; + homepage = "http://platformio.org"; license = licenses.asl20; maintainers = with maintainers; [ mog makefu ]; }; diff --git a/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch b/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch index 90251d668bc74..16294a4d6cd68 100644 --- a/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch +++ b/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch @@ -1,14 +1,14 @@ diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py -index f1d68e08..9b7b1da8 100644 +index be49b3ee..d1390a88 100644 --- a/platformio/package/manifest/schema.py +++ b/platformio/package/manifest/schema.py -@@ -174,9 +174,5 @@ class ManifestSchema(Schema): +@@ -240,9 +240,5 @@ class ManifestSchema(BaseSchema): @staticmethod @memoized(expire="1h") def load_spdx_licenses(): - r = requests.get( - "https://raw.githubusercontent.com/spdx/license-list-data" -- "/v3.7/json/licenses.json" +- "/v3.8/json/licenses.json" - ) - r.raise_for_status() - return r.json() diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix index e3ff823924eb6..26070ce73bfa9 100644 --- a/pkgs/development/beam-modules/hex/default.nix +++ b/pkgs/development/beam-modules/hex/default.nix @@ -46,7 +46,7 @@ let meta = { description = "Package manager for the Erlang VM https://hex.pm"; license = stdenv.lib.licenses.mit; - homepage = https://github.com/hexpm/hex; + homepage = "https://github.com/hexpm/hex"; maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; }; diff --git a/pkgs/development/beam-modules/pgsql/default.nix b/pkgs/development/beam-modules/pgsql/default.nix index 6edee5d8bc65f..c7e7aee100193 100644 --- a/pkgs/development/beam-modules/pgsql/default.nix +++ b/pkgs/development/beam-modules/pgsql/default.nix @@ -22,7 +22,7 @@ let meta = { description = "Erlang PostgreSQL Driver"; license = stdenv.lib.licenses.mit; - homepage = https://github.com/semiocast/pgsql; + homepage = "https://github.com/semiocast/pgsql"; maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; }; diff --git a/pkgs/development/beam-modules/webdriver/default.nix b/pkgs/development/beam-modules/webdriver/default.nix index d772ad7a3c715..8f06f8ed7a851 100644 --- a/pkgs/development/beam-modules/webdriver/default.nix +++ b/pkgs/development/beam-modules/webdriver/default.nix @@ -28,7 +28,7 @@ let meta = { description = "WebDriver implementation in Erlang"; license = stdenv.lib.licenses.mit; - homepage = https://github.com/Quviq/webdrv; + homepage = "https://github.com/Quviq/webdrv"; maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; }; diff --git a/pkgs/development/chez-modules/chez-matchable/default.nix b/pkgs/development/chez-modules/chez-matchable/default.nix index 2b3de233f9b7c..d3f4e3fbe6362 100644 --- a/pkgs/development/chez-modules/chez-matchable/default.nix +++ b/pkgs/development/chez-modules/chez-matchable/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "This is a Library for ChezScheme providing the protable hygenic pattern matcher by Alex Shinn"; - homepage = https://github.com/fedeinthemix/chez-matchable/; + homepage = "https://github.com/fedeinthemix/chez-matchable/"; maintainers = [ stdenv.lib.maintainers.jitwit ]; license = stdenv.lib.licenses.publicDomain; }; diff --git a/pkgs/development/chez-modules/chez-mit/default.nix b/pkgs/development/chez-modules/chez-mit/default.nix index 3614e97d9eac3..fc2c0f7ba4f1a 100644 --- a/pkgs/development/chez-modules/chez-mit/default.nix +++ b/pkgs/development/chez-modules/chez-mit/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "This is a MIT/GNU Scheme compatibility library for Chez Scheme"; - homepage = https://github.com/fedeinthemix/chez-mit/; + homepage = "https://github.com/fedeinthemix/chez-mit/"; maintainers = [ stdenv.lib.maintainers.jitwit ]; license = stdenv.lib.licenses.free; }; diff --git a/pkgs/development/chez-modules/chez-scmutils/default.nix b/pkgs/development/chez-modules/chez-scmutils/default.nix index ceebef11363e6..861ff4ff46b74 100644 --- a/pkgs/development/chez-modules/chez-scmutils/default.nix +++ b/pkgs/development/chez-modules/chez-scmutils/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "This is a port of the ‘MIT Scmutils’ library to Chez Scheme"; - homepage = https://github.com/fedeinthemix/chez-scmutils/; + homepage = "https://github.com/fedeinthemix/chez-scmutils/"; maintainers = [ stdenv.lib.maintainers.jitwit ]; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/development/chez-modules/chez-srfi/default.nix b/pkgs/development/chez-modules/chez-srfi/default.nix index 7f88b8fe7b0b9..f055a14884a24 100644 --- a/pkgs/development/chez-modules/chez-srfi/default.nix +++ b/pkgs/development/chez-modules/chez-srfi/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "This package provides a collection of SRFI libraries for Chez Scheme"; - homepage = https://github.com/fedeinthemix/chez-srfi/; + homepage = "https://github.com/fedeinthemix/chez-srfi/"; maintainers = [ stdenv.lib.maintainers.jitwit ]; license = stdenv.lib.licenses.free; }; diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index 44f72a93c3a3f..005e4186b1520 100644 --- a/pkgs/development/compilers/abcl/default.nix +++ b/pkgs/development/compilers/abcl/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ant, jre, jdk}: stdenv.mkDerivation rec { pname = "abcl"; - version = "1.6.0"; + version = "1.6.1"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "0hvbcsffr8n2xwdixc8wyw1bfl9fxn2gyy0c4nma7j9zbn0wwgw9"; + sha256 = "04myiba6g0vij2ym2dmb0156k20ki2lz13dxwp2bk9kvjn2zg88b"; }; configurePhase = '' mkdir nix-tools @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3 ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://common-lisp.net/project/armedbear/; + homepage = "https://common-lisp.net/project/armedbear/"; }; } diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix index dd03ce0171fed..72ed184357c1a 100644 --- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix +++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { programming language and an implementation of Java Web Start, originally based on the NetX project. ''; - homepage = https://github.com/adoptopenjdk/icedtea-web; + homepage = "https://github.com/adoptopenjdk/icedtea-web"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix index 604838e883163..09ccf9510bbd8 100644 --- a/pkgs/development/compilers/aldor/default.nix +++ b/pkgs/development/compilers/aldor/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { # Please become a maintainer to fix this package broken = true; - homepage = http://www.aldor.org/; + homepage = "http://www.aldor.org/"; description = "Programming language with an expressive type system"; license = stdenv.lib.licenses.asl20; diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index 08d0005c99ebf..d3208b12dd68c 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -1,4 +1,4 @@ -{stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkgconfig, perl, gnome2, pango, sqlite, libxml2, zlib, gmp, smlnj }: +{stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkg-config, perl, gnome2, gtk2, pango, sqlite, libxml2, zlib, gmp, smlnj }: stdenv.mkDerivation { name = "aliceml-1.4-7d44dc8e"; @@ -11,16 +11,16 @@ stdenv.mkDerivation { }; gecodeSrc = fetchurl { - url = http://www.gecode.org/download/gecode-1.3.1.tar.gz; + url = "http://www.gecode.org/download/gecode-1.3.1.tar.gz"; sha256 = "0mgc6llbq166jmlq3alvagqsg3730670zvbwwkdgsqklw70v9355"; }; buildInputs = [ stdenv gcc glibc libtool gnumake autoconf automake - file which zsh m4 gnome2.gtk zlib gmp + file which zsh m4 gtk2 zlib gmp gnome2.libgnomecanvas pango sqlite - libxml2 pkgconfig perl smlnj + libxml2 pkg-config perl smlnj ]; makePatch = ./make.patch; @@ -49,7 +49,7 @@ stdenv.mkDerivation { extended with rich support for concurrent, distributed, and constraint programming. ''; - homepage = https://www.ps.uni-saarland.de/alice/; + homepage = "https://www.ps.uni-saarland.de/alice/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.doublec ]; broken = true; diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 0b5ff3817302c..613f3fa186aa1 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { is a textual bitstream representation for assembly by the IceStorm [2] icepack command. ''; - homepage = https://github.com/cseed/arachne-pnr; + homepage = "https://github.com/cseed/arachne-pnr"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix index 3cbb7577f34c0..230ed36fff51c 100644 --- a/pkgs/development/compilers/asn1c/default.nix +++ b/pkgs/development/compilers/asn1c/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://lionet.info/asn1c/compiler.html; + homepage = "http://lionet.info/asn1c/compiler.html"; description = "Open Source ASN.1 Compiler"; license = licenses.bsd2; platforms = platforms.all; diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix index 4b216761259dc..94dc813d78a27 100644 --- a/pkgs/development/compilers/aspectj/default.nix +++ b/pkgs/development/compilers/aspectj/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [jre]; meta = { - homepage = http://www.eclipse.org/aspectj/; + homepage = "http://www.eclipse.org/aspectj/"; description = "A seamless aspect-oriented extension to the Java programming language"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.epl10; diff --git a/pkgs/development/compilers/avian/default.nix b/pkgs/development/compilers/avian/default.nix index 34d1e64c484f2..7c5db45f31b45 100644 --- a/pkgs/development/compilers/avian/default.nix +++ b/pkgs/development/compilers/avian/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { to provide a useful subset of Java’s features, suitable for building self-contained applications. ''; - homepage = https://readytalk.github.io/avian/; + homepage = "https://readytalk.github.io/avian/"; license = stdenv.lib.licenses.isc; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.earldouglas ]; diff --git a/pkgs/development/compilers/avra/default.nix b/pkgs/development/compilers/avra/default.nix index 88a34bd6fd6ee..56bf3e657becd 100644 --- a/pkgs/development/compilers/avra/default.nix +++ b/pkgs/development/compilers/avra/default.nix @@ -21,9 +21,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Assembler for the Atmel AVR microcontroller family"; - homepage = http://avra.sourceforge.net/; + homepage = "http://avra.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index 6e768e65091b0..32116048a4387 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Efficient Scheme compiler"; - homepage = http://www-sop.inria.fr/indes/fp/Bigloo/; + homepage = "http://www-sop.inria.fr/indes/fp/Bigloo/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index d372324376688..3a03f633ff0d0 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,11 +1,11 @@ { stdenv, cmake, python3, fetchFromGitHub, emscriptenRev ? null, substituteAll }: let - defaultVersion = "91"; + defaultVersion = "93"; # Map from git revs to SHA256 hashes sha256s = { - version_91 = "1qsjqnzc5w9ny9v01bxkdvhh4kgbsia01x5vvac72m075v4mpgs4"; + version_93 = "15y3703ha6mxcq168br0wlydas5rq66msrcsd650zrjz0ndxwsfx"; "1.39.1" = "0ygm9m5322h4vfpf3j63q32qxk2l26yk62hh7dkb49j51zwl1y3y"; }; in @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ]; meta = with stdenv.lib; { - homepage = https://github.com/WebAssembly/binaryen; + homepage = "https://github.com/WebAssembly/binaryen"; description = "Compiler infrastructure and toolchain library for WebAssembly, in C++"; platforms = platforms.all; maintainers = with maintainers; [ asppsa ]; diff --git a/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/pkgs/development/compilers/bs-platform/build-bs-platform.nix index d7d0fe0b12be2..71ba415d6202a 100644 --- a/pkgs/development/compilers/bs-platform/build-bs-platform.nix +++ b/pkgs/development/compilers/bs-platform/build-bs-platform.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -rf jscomp lib ${bin_folder} vendor odoc_gen native bsb bsc bsrefmt $out - mkdir $out/lib/ocaml + mkdir -p $out/lib/ocaml cp jscomp/runtime/js.* jscomp/runtime/*.cm* $out/lib/ocaml cp jscomp/others/*.ml jscomp/others/*.mli jscomp/others/*.cm* $out/lib/ocaml cp jscomp/stdlib-406/*.ml jscomp/stdlib-406/*.mli jscomp/stdlib-406/*.cm* $out/lib/ocaml diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/development/compilers/bs-platform/default.nix index 6912cc6e9ff50..0fd696c69f0a1 100644 --- a/pkgs/development/compilers/bs-platform/default.nix +++ b/pkgs/development/compilers/bs-platform/default.nix @@ -4,20 +4,20 @@ let in (build-bs-platform rec { inherit stdenv runCommand fetchFromGitHub ninja nodejs python3; - version = "7.2.0"; + version = "7.3.2"; ocaml-version = "4.06.1"; src = fetchFromGitHub { owner = "BuckleScript"; repo = "bucklescript"; rev = version; - sha256 = "1fsx7gvcp6rbqd0qf5fix02mbbmk9rgm09zbwjrx0lp5cjv3n2s4"; + sha256 = "1nvp7wiiv149r4qf9bgc84bm4w7s44sjq9i7j103v24wllzz218s"; fetchSubmodules = true; }; }).overrideAttrs (attrs: { meta = with stdenv.lib; { description = "A JavaScript backend for OCaml focused on smooth integration and clean generated code."; - homepage = https://bucklescript.github.io; + homepage = "https://bucklescript.github.io"; license = licenses.lgpl3; maintainers = with maintainers; [ turbomack gamb anmonteiro ]; platforms = platforms.all; diff --git a/pkgs/development/compilers/bupc/default.nix b/pkgs/development/compilers/bupc/default.nix index ad10845e98cfc..ecdfe8d461a2a 100644 --- a/pkgs/development/compilers/bupc/default.nix +++ b/pkgs/development/compilers/bupc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { parallelism is fixed at program startup time, typically with a single thread of execution per processor. ''; - homepage = https://upc.lbl.gov/; + homepage = "https://upc.lbl.gov/"; license = licenses.mit; platforms = with platforms; [ linux ]; maintainers = with maintainers; [ zimbatm ]; diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix index e02880b314ebf..f6c27436c7674 100644 --- a/pkgs/development/compilers/carp/default.nix +++ b/pkgs/development/compilers/carp/default.nix @@ -38,7 +38,7 @@ haskellPackages.mkDerivation rec { ''; description = "A statically typed lisp, without a GC, for real-time applications"; - homepage = https://github.com/carp-lang/Carp; + homepage = "https://github.com/carp-lang/Carp"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ jluttine ]; diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index ec166352267e4..573d36cd3f67d 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Clozure Common Lisp"; - homepage = https://ccl.clozure.com/; + homepage = "https://ccl.clozure.com/"; maintainers = with maintainers; [ raskin muflax tohl ]; platforms = attrNames options; license = licenses.lgpl21; diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index c0fd742082f3b..2d2e0df1ec9b4 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = { description = "A powerful and incredibly fast R6RS Scheme compiler"; - homepage = https://cisco.github.io/ChezScheme/; + homepage = "https://cisco.github.io/ChezScheme/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix index 380755bf01ec5..11f4eaada6043 100644 --- a/pkgs/development/compilers/chicken/4/chicken.nix +++ b/pkgs/development/compilers/chicken/4/chicken.nix @@ -61,9 +61,9 @@ stdenv.mkDerivation { # TODO: Assert csi -R files -p '(pathname-file (repository-path))' == binaryVersion meta = { - homepage = http://www.call-cc.org/; + homepage = "http://www.call-cc.org/"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ]; + maintainers = with stdenv.lib.maintainers; [ corngood ]; platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix description = "A portable compiler for the Scheme programming language"; longDescription = '' diff --git a/pkgs/development/compilers/chicken/4/egg2nix.nix b/pkgs/development/compilers/chicken/4/egg2nix.nix index 8f796d09ee560..977f34692f901 100644 --- a/pkgs/development/compilers/chicken/4/egg2nix.nix +++ b/pkgs/development/compilers/chicken/4/egg2nix.nix @@ -19,9 +19,9 @@ eggDerivation { meta = { description = "Generate nix-expression from CHICKEN scheme eggs"; - homepage = https://github.com/the-kenny/egg2nix; + homepage = "https://github.com/the-kenny/egg2nix"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ]; + maintainers = with stdenv.lib.maintainers; [ corngood ]; }; } diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index eefd8e35a2726..f07b63ea26f4d 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -43,9 +43,9 @@ stdenv.mkDerivation { # TODO: Assert csi -R files -p '(pathname-file (repository-path))' == binaryVersion meta = { - homepage = http://www.call-cc.org/; + homepage = "http://www.call-cc.org/"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ]; + maintainers = with stdenv.lib.maintainers; [ corngood ]; platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix description = "A portable compiler for the Scheme programming language"; longDescription = '' diff --git a/pkgs/development/compilers/chicken/5/egg2nix.nix b/pkgs/development/compilers/chicken/5/egg2nix.nix index 77ed32cafe1af..0c18b8db2ded4 100644 --- a/pkgs/development/compilers/chicken/5/egg2nix.nix +++ b/pkgs/development/compilers/chicken/5/egg2nix.nix @@ -21,9 +21,9 @@ eggDerivation { meta = { description = "Generate nix-expression from CHICKEN scheme eggs"; - homepage = https://github.com/the-kenny/egg2nix; + homepage = "https://github.com/the-kenny/egg2nix"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ]; + maintainers = with stdenv.lib.maintainers; [ corngood ]; }; } diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix index 03a5cec500412..0dfd05030b98d 100644 --- a/pkgs/development/compilers/clean/default.nix +++ b/pkgs/development/compilers/clean/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { and generic functions. ''; - homepage = http://wiki.clean.cs.ru.nl/Clean; + homepage = "http://wiki.clean.cs.ru.nl/Clean"; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.kkallio ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 5204932448b1c..b8b02cb9d68b5 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20200315"; + version = "20200517"; src = fetchurl { url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "0akif1wgsyyqrfkidkwhw47dsx471h3b4zsjhnh4rf6kv7by3q65"; + sha256 = "05bbsrxw2nxjlcfc22w1ympi66jnmzymivg29cvidh5n28jgwba2"; }; sourceRoot = "."; diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index edde6af615f06..87d3f0ef00ce4 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { inference with Variational inference (ADVI) and penalized maximum likelihood estimation with Optimization (L-BFGS). ''; - homepage = https://mc-stan.org/interfaces/cmdstan.html; + homepage = "https://mc-stan.org/interfaces/cmdstan.html"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 3f93ea9e1bac8..480a7e522b53c 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { ANSI Common Lisp standard. ''; license = stdenv.lib.licenses.free; # public domain - homepage = http://www.cons.org/cmucl/; + homepage = "http://www.cons.org/cmucl/"; maintainers = [stdenv.lib.maintainers.tohl]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index cc8e9f827b7fa..06a56dc42eaf8 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A programming language for the analysis and transformation of computer languages"; - homepage = http://www.colm.net/open-source/colm; + homepage = "http://www.colm.net/open-source/colm"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/compilers/computecpp/default.nix b/pkgs/development/compilers/computecpp/default.nix index 36b71f3f38a06..68d11bdf8b194 100644 --- a/pkgs/development/compilers/computecpp/default.nix +++ b/pkgs/development/compilers/computecpp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Accelerate Complex C++ Applications on Heterogeneous Compute Systems using Open Standards"; - homepage = https://www.codeplay.com/products/computesuite/computecpp; + homepage = "https://www.codeplay.com/products/computesuite/computecpp"; license = licenses.unfree; maintainers = with maintainers; [ davidtwco ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 00816fca36bd3..2a44279209c1d 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -3,7 +3,6 @@ , fetchpatch , which , cmake -, clang , llvmPackages , libunwind , gettext @@ -31,12 +30,12 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { # glibc 2.26 - url = https://github.com/dotnet/coreclr/commit/a8f83b615708c529b112898e7d2fbc3f618b26ee.patch; + url = "https://github.com/dotnet/coreclr/commit/a8f83b615708c529b112898e7d2fbc3f618b26ee.patch"; sha256 = "047ph5gip4z2h7liwdxsmpnlaq0sd3hliaw4nyqjp647m80g3ffq"; }) (fetchpatch { # clang 5 - url = https://github.com/dotnet/coreclr/commit/9b22e1a767dee38f351001c5601f56d78766a43e.patch; + url = "https://github.com/dotnet/coreclr/commit/9b22e1a767dee38f351001c5601f56d78766a43e.patch"; sha256 = "1w1lxw5ryvhq8m5m0kv880c4bh6y9xdgypkr76sqbh3v568yghzg"; }) ]; @@ -44,7 +43,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which cmake - clang + llvmPackages.clang ]; buildInputs = [ @@ -92,7 +91,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/dotnet/core/; + homepage = "https://github.com/dotnet/core/"; description = ".NET is a general purpose development platform"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kuznero ]; diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix index 8ffa89a11b4ae..856c6e58bc18e 100644 --- a/pkgs/development/compilers/crystal/build-package.nix +++ b/pkgs/development/compilers/crystal/build-package.nix @@ -1,53 +1,109 @@ -{ stdenv, lib, crystal, linkFarm, fetchFromGitHub }: -{ # Generate shards.nix with `nix-shell -p crystal2nix --run crystal2nix` in the projects root - shardsFile ? null +{ stdenv, lib, crystal, shards, git, pkgconfig, which, linkFarm, fetchFromGitHub, installShellFiles }: + +{ # Some projects do not include a lock file, so you can pass one + lockFile ? null + # Generate shards.nix with `nix-shell -p crystal2nix --run crystal2nix` in the projects root +, shardsFile ? null + # We support different builders. To make things more straight forward, make it + # user selectable instead of trying to autodetect +, format ? "make" +, installManPages ? true # Specify binaries to build in the form { foo.src = "src/foo.cr"; } # The default `crystal build` options can be overridden with { foo.options = [ "--no-debug" ]; } -, crystalBinaries ? {} -, ... -}@args: +, crystalBinaries ? { }, ... }@args: + +assert (builtins.elem format [ "make" "crystal" "shards" ]); + let - mkDerivationArgs = builtins.removeAttrs args [ "shardsFile" "crystalBinaries" ]; + mkDerivationArgs = builtins.removeAttrs args [ + "format" + "installManPages" + "lockFile" + "shardsFile" + "crystalBinaries" + ]; crystalLib = linkFarm "crystal-lib" (lib.mapAttrsToList (name: value: { inherit name; path = fetchFromGitHub value; }) (import shardsFile)); - defaultOptions = [ "--release" "--progress" "--no-debug" "--verbose" ]; + # we previously had --no-debug here but that is not recommended by upstream + defaultOptions = [ "--release" "--progress" "--verbose" ]; + buildDirectly = shardsFile == null || crystalBinaries != { }; in stdenv.mkDerivation (mkDerivationArgs // { - configurePhase = args.configurePhase or '' - runHook preConfigure - ${lib.optionalString (shardsFile != null) "ln -s ${crystalLib} lib"} - runHook postConfigure - ''; + configurePhase = args.configurePhase or lib.concatStringsSep "\n" ([ + "runHook preConfigure" + ] ++ lib.optional (lockFile != null) "ln -s ${lockFile} ./shard.lock" + ++ lib.optional (shardsFile != null) "ln -s ${crystalLib} lib" + ++ [ "runHook postConfigure "]); - buildInputs = args.buildInputs or [] ++ [ crystal ]; - - buildPhase = args.buildPhase or '' - runHook preBuild - ${lib.concatStringsSep "\n" (lib.mapAttrsToList (bin: attrs: '' - crystal ${lib.escapeShellArgs ([ - "build" - "-o" bin - (attrs.src or (throw "No source file for crystal binary ${bin} provided")) - ] ++ attrs.options or defaultOptions)} - '') crystalBinaries)} - runHook postBuild - ''; + CRFLAGS = lib.concatStringsSep " " defaultOptions; + + PREFIX = placeholder "out"; + + buildInputs = args.buildInputs or [ ] ++ [ crystal ] + ++ lib.optional (format != "crystal") shards; + + nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ git installShellFiles pkgconfig which ]; + + buildPhase = args.buildPhase or (lib.concatStringsSep "\n" ([ + "runHook preBuild" + ] ++ lib.optional (format == "make") + ''make ''${buildTargets:-build} $makeFlags'' + ++ lib.optionals (format == "crystal") (lib.mapAttrsToList (bin: attrs: '' + crystal ${lib.escapeShellArgs (["build" "-o" bin + (attrs.src or (throw "No source file for crystal binary ${bin} provided")) + ] ++ (attrs.options or defaultOptions))} + '') crystalBinaries) + ++ lib.optional (format == "shards") + "shards build --local --production ${lib.concatStringsSep " " defaultOptions}" + ++ [ "runHook postBuild" ])); + + installPhase = args.installPhase or (lib.concatStringsSep "\n" ([ + "runHook preInstall" + ] ++ lib.optional (format == "make") + ''make ''${installTargets:-install} $installFlags'' + ++ lib.optionals (format == "crystal") (map (bin: '' + install -Dm555 ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]} + '') (lib.attrNames crystalBinaries)) + ++ lib.optional (format == "shards") + ''install -Dm555 bin/* -t $out/bin'' + ++ [ + '' + for f in README* *.md LICENSE; do + test -f $f && install -Dm444 $f -t $out/share/doc/${args.pname} + done + '' + ] ++ (lib.optional installManPages '' + if [ -d man ]; then + installManPage man/*.? + fi + '') ++ [ + "runHook postInstall" + ])); + + doCheck = args.doCheck or true; + + checkPhase = args.checkPhase or (lib.concatStringsSep "\n" ([ + "runHook preCheck" + ] ++ lib.optional (format == "make") + ''make ''${checkTarget:-test} $checkFlags'' + ++ lib.optional (format != "make") + ''crystal ''${checkTarget:-spec} $checkFlags'' + ++ [ "runHook postCheck" ])); + + doInstallCheck = args.doInstallCheck or true; - installPhase = args.installPhase or '' - runHook preInstall - mkdir -p "$out/bin" - ${lib.concatMapStringsSep "\n" (bin: '' - mv ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]} - '') (lib.attrNames crystalBinaries)} - runHook postInstall + installCheckPhase = args.installCheckPhase or '' + for f in $out/bin/*; do + $f --help + done ''; - meta = args.meta or {} // { + meta = args.meta or { } // { platforms = args.meta.platforms or crystal.meta.platforms; }; }) diff --git a/pkgs/development/compilers/crystal/crystal2nix.nix b/pkgs/development/compilers/crystal/crystal2nix.nix index ac69b9b3d965b..5fc40cd23741d 100644 --- a/pkgs/development/compilers/crystal/crystal2nix.nix +++ b/pkgs/development/compilers/crystal/crystal2nix.nix @@ -1,4 +1,5 @@ { lib, crystal, nix-prefetch-git }: + crystal.buildCrystalPackage { pname = "crystal2nix"; version = "unstable-2018-07-31"; @@ -6,11 +7,16 @@ crystal.buildCrystalPackage { nixPrefetchGit = "${lib.getBin nix-prefetch-git}/bin/nix-prefetch-git"; unpackPhase = "substituteAll ${./crystal2nix.cr} crystal2nix.cr"; + format = "crystal"; + crystalBinaries.crystal2nix.src = "crystal2nix.cr"; + # it will blow up without a shard.yml file + doInstallCheck = false; + meta = with lib; { description = "Utility to convert Crystal's shard.lock files to a Nix file"; license = licenses.mit; - maintainers = [ maintainers.manveru ]; + maintainers = with maintainers; [ manveru ]; }; } diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 89dbda4e2a9a9..a04d48dd0e5a6 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper -, coreutils, git, gmp, nettools, openssl, readline, tzdata, libxml2, libyaml +, coreutils, git, gmp, hostname, openssl, readline, tzdata, libxml2, libyaml , boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib, pkgconfig , callPackage }: @@ -62,9 +62,12 @@ let substituteInPlace src/crystal/system/unix/time.cr \ --replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo - ln -s spec/compiler spec/std + ln -sf spec/compiler spec/std + + # Dirty fix for when no sandboxing is enabled + rm -rf /tmp/crystal + mkdir -p /tmp/crystal - mkdir /tmp/crystal substituteInPlace spec/std/file_spec.cr \ --replace '/bin/ls' '${coreutils}/bin/ls' \ --replace '/usr/share' '/tmp/crystal' \ @@ -81,7 +84,7 @@ let --replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "' substituteInPlace spec/std/system_spec.cr \ - --replace '`hostname`' '`${nettools}/bin/hostname`' + --replace '`hostname`' '`${hostname}/bin/hostname`' # See https://github.com/crystal-lang/crystal/pull/8640 substituteInPlace spec/std/http/cookie_spec.cr \ @@ -108,6 +111,8 @@ let "all" "docs" ]; + LLVM_CONFIG = "${llvm}/bin/llvm-config"; + FLAGS = [ "--release" "--single-module" # needed for deterministic builds @@ -170,7 +175,7 @@ let meta = with lib; { description = "A compiled language with Ruby like syntax and type inference"; - homepage = https://crystal-lang.org/; + homepage = "https://crystal-lang.org/"; license = licenses.asl20; maintainers = with maintainers; [ manveru david50407 peterhoeg ]; platforms = builtins.attrNames archs; @@ -178,33 +183,6 @@ let })); in rec { - binaryCrystal_0_27 = genericBinary { - version = "0.27.2"; - sha256s = { - x86_64-linux = "05l5x7kx2acgnv42fj3rr17z73ix06zvi05h7d7vf3kw0izxrasm"; - i686-linux = "1iwizkvn6pglc0azkyfhlmk9ap793krdgcnbihd1kvrvs4cz0mm9"; - x86_64-darwin = "14c69ac2dmfwmb5q56ps3xyxxb0mrbc91ahk9h07c8fiqfii3k9g"; - }; - }; - - binaryCrystal_0_29 = genericBinary { - version = "0.29.0"; - sha256s = { - x86_64-linux = "1wrk29sfx35akg7hxwpdiikvl18wd40gq1kwirw7x522hnq7vlna"; - i686-linux = "1nx0piis2k3nn7kqiijqazzbvlaavhgvsln0l3dxmpfa4i4dz5h2"; - x86_64-darwin = "1fd0fbyf05abivnp3igjlrm2axf65n2wdmg4aq6nqj60ipc01rvd"; - }; - }; - - binaryCrystal_0_30 = genericBinary { - version = "0.30.1"; - sha256s = { - x86_64-linux = "1k2mb74jh3ns3m7y73j4wpf571sayn73zbn6d7q81d09r280zrma"; - i686-linux = "0vsq1ayf922spydp2g2mmimc797jmm7nl5nljhfppcclrwygdyk2"; - x86_64-darwin = "1p3s4lwdgykb7h7aysjhrs7vm0zhinzw5d7rfv6jsyin4j8yxhzz"; - }; - }; - binaryCrystal_0_31 = genericBinary { version = "0.31.1"; sha256s = { @@ -214,32 +192,11 @@ in rec { }; }; - crystal_0_27 = generic { - version = "0.27.2"; - sha256 = "0vxqnpqi85yh0167nrkbksxsni476iwbh6y3znbvbjbbfhsi3nsj"; - doCheck = false; # about 20 tests out of more than 15000 are failing - binary = binaryCrystal_0_27; - }; - - crystal_0_29 = generic { - version = "0.29.0"; - sha256 = "0v9l253b2x8yw6a43vvalywpwciwr094l3g5wakmndfrzak2s3zr"; - doCheck = false; # 6 checks are failing now - binary = binaryCrystal_0_29; - }; - - crystal_0_30 = generic { - version = "0.30.1"; - sha256 = "0fbk784zjflsl3hys5a1xmn8mda8kb2z7ql58wpyfavivswxanbs"; - doCheck = false; # 6 checks are failing now - binary = binaryCrystal_0_29; - }; - crystal_0_31 = generic { version = "0.31.1"; sha256 = "1dswxa32w16gnc6yjym12xj7ibg0g6zk3ngvl76lwdjqb1h6lwz8"; doCheck = false; # 5 checks are failing now - binary = binaryCrystal_0_30; + binary = binaryCrystal_0_31; }; crystal_0_32 = generic { @@ -248,7 +205,21 @@ in rec { binary = binaryCrystal_0_31; }; - crystal = crystal_0_32; + crystal_0_33 = generic { + version = "0.33.0"; + sha256 = "1zg0qixcws81s083wrh54hp83ng2pa8iyyafaha55mzrh8293jbi"; + binary = binaryCrystal_0_31; + doCheck = false; # 4 checks are failing now + }; + + crystal_0_34 = generic { + version = "0.34.0"; + sha256 = "110lfpxk9jnqyznbfnilys65ixj5sdmy8pvvnlhqhc3ccvrlnmq4"; + binary = crystal_0_33; + doCheck = false; # 4 checks are failing now + }; + + crystal = crystal_0_34; crystal2nix = callPackage ./crystal2nix.nix {}; } diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix index 9c70e96a9c09d..cbe4e7ec92600 100644 --- a/pkgs/development/compilers/dale/default.nix +++ b/pkgs/development/compilers/dale/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation { Dale is a system (no GC) programming language that uses S-expressions for syntax and supports syntactic macros. ''; - homepage = https://github.com/tomhrr/dale; + homepage = "https://github.com/tomhrr/dale"; license = licenses.bsd3; maintainers = with maintainers; [ amiloradovsky ]; platforms = with platforms; [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix index 37f79933b779f..88b46561241af 100644 --- a/pkgs/development/compilers/dev86/default.nix +++ b/pkgs/development/compilers/dev86/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Linux 8086 development environment"; - homepage = http://v3.sk/~lkundrak/dev86/; + homepage = "http://v3.sk/~lkundrak/dev86/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/dmd/binary.nix b/pkgs/development/compilers/dmd/binary.nix new file mode 100644 index 0000000000000..cd3a15889b21a --- /dev/null +++ b/pkgs/development/compilers/dmd/binary.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, glibc +, version, hashes }: +with stdenv; +let + OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; + MODEL = toString hostPlatform.parsed.cpu.bits; +in mkDerivation { + pname = "dmd-bootstrap"; + inherit version; + + src = fetchurl rec { + name = "dmd.${version}.${OS}.tar.xz"; + url = "http://downloads.dlang.org/releases/2.x/${version}/${name}"; + sha256 = hashes.${OS} or (throw "missing bootstrap sha256 for OS ${OS}"); + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ fixDarwinDylibNames autoPatchelfHook ]; + propagatedBuildInputs = [ curl tzdata ] ++ lib.optional hostPlatform.isLinux glibc; + + installPhase = '' + mkdir -p $out + + # try to copy model-specific binaries into bin first + mv ${OS}/bin${MODEL} $out/bin || true + + mv src license.txt ${OS}/* $out/ + + # move man into place + mkdir -p $out/share + mv man $out/share/ + + # move docs into place + mkdir -p $out/share/doc + mv html/d $out/share/doc/ + + # fix paths in dmd.conf (one level less) + substituteInPlace $out/bin/dmd.conf --replace "/../../" "/../" + ''; + + meta = with lib; { + inherit version; + description = "Digital Mars D Compiler Package"; + # As of 2.075 all sources and binaries use the boost license + license = licenses.boost; + maintainers = [ maintainers.lionello ]; + homepage = "https://dlang.org/"; + platforms = [ "x86_64-darwin" "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/compilers/dmd/bootstrap.nix b/pkgs/development/compilers/dmd/bootstrap.nix new file mode 100644 index 0000000000000..087781ae2ca42 --- /dev/null +++ b/pkgs/development/compilers/dmd/bootstrap.nix @@ -0,0 +1,9 @@ +{ callPackage }: +callPackage ./binary.nix { + version = "2.090.1"; + hashes = { + # Get these from `nix-prefetch-url http://downloads.dlang.org/releases/2.x/2.090.1/dmd.2.090.1.linux.tar.xz` etc.. + osx = "0rbn7j4dr3q0y09fblpj999bi063pi4230rqd5xgd3gwxxa0cz7l"; + linux = "1vk6lsvd6y7ccvffd23yial4ig90azaxf2rxc6yvidqd1qhan807"; + }; +} diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 6cae1fa073b34..a6d4f7e1e20a7 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,11 +1,13 @@ { stdenv, lib, fetchFromGitHub , makeWrapper, unzip, which, writeTextFile -, curl, tzdata, gdb, darwin, git -, targetPackages, ldc -, version ? "2.085.1" -, dmdSha256 ? "0ccidfcawrcwdpfjwjiln5xwr4ffp8i2hwx52p8zn3xmc5yxm660" -, druntimeSha256 ? "109f2glsqrlshk06761xlw4r5v22mivp873cq9g5gcax3g00k617" -, phobosSha256 ? "0giispqqx8j8xg6c0hm7nx77bcahiwic8rvf12sws3sv5pizv8pr" +, curl, tzdata, gdb, darwin, git, callPackage +, targetPackages, fetchpatch, bash +, dmdBootstrap ? callPackage ./bootstrap.nix { } +, HOST_DMD ? "${dmdBootstrap}/bin/dmd" +, version ? "2.091.1" +, dmdSha256 ? "0brz0n84jdkhr4sq4k91w48p739psbhbb1jk2pi9q60psmx353yr" +, druntimeSha256 ? "0smgpmfriffh110ksski1s5j921kmxbc2zjy0dyj9ksyrxbzklbl" +, phobosSha256 ? "1n00anajgibrfs1xzvrmag28hvbvkc0w1fwlimqbznvhf28rhrxs" }: let @@ -51,7 +53,17 @@ stdenv.mkDerivation rec { }) ]; - patchFlags = [ "--directory=dmd" "-p1" ]; + patchFlags = [ "--directory=dmd" "-p1" "-F3" ]; + patches = [ + (fetchpatch { + url = "https://github.com/dlang/dmd/commit/4157298cf04f7aae9f701432afd1de7b7e05c30f.patch"; + sha256 = "0v4xgqmrx5r8vbx5a4v88s0xnm23mam9nm99yfga7s2sxr0hi5p2"; + }) + (fetchpatch { + url = "https://github.com/dlang/dmd/commit/1b8a4c90b040bf2f0b68a2739de4991315580b13.patch"; + sha256 = "1iih6aalv4fsw9mbrlrybhngkkchzzrzg7q8zl047w36c0x397cs"; + }) + ]; sourceRoot = "."; @@ -62,15 +74,17 @@ stdenv.mkDerivation rec { patchShebangs . ''; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + postPatch = '' + substituteInPlace dmd/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash" + '' + + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" '' - + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" ''; - nativeBuildInputs = [ ldc makeWrapper unzip which gdb git ] + nativeBuildInputs = [ makeWrapper unzip which gdb git ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Foundation @@ -89,7 +103,7 @@ stdenv.mkDerivation rec { # Buid and install are based on http://wiki.dlang.org/Building_DMD buildPhase = '' cd dmd - make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=ldmd2 + make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=${HOST_DMD} cd ../druntime make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} cd ../phobos @@ -143,12 +157,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Official reference compiler for the D language"; - homepage = http://dlang.org/; + homepage = "http://dlang.org/"; # Everything is now Boost licensed, even the backend. # https://github.com/dlang/dmd/pull/6680 license = licenses.boost; - maintainers = with maintainers; [ ThomasMader ]; + maintainers = with maintainers; [ ThomasMader lionello ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; } - diff --git a/pkgs/development/compilers/dotnet/buildDotnet.nix b/pkgs/development/compilers/dotnet/buildDotnet.nix index 5ba57ed691809..6f4237d2dce12 100644 --- a/pkgs/development/compilers/dotnet/buildDotnet.nix +++ b/pkgs/development/compilers/dotnet/buildDotnet.nix @@ -13,10 +13,14 @@ assert builtins.elem type [ "aspnetcore" "netcore" "sdk"]; , curl }: let pname = if type == "aspnetcore" then "aspnetcore-runtime" else if type == "netcore" then "dotnet-runtime" else "dotnet-sdk"; + suffix = { + x86_64-linux = "x64"; + aarch64-linux = "arm64"; + }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); urls = { - aspnetcore = "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/${version}/${pname}-${version}-linux-x64.tar.gz"; - netcore = "https://dotnetcli.azureedge.net/dotnet/Runtime/${version}/${pname}-${version}-linux-x64.tar.gz"; - sdk = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-linux-x64.tar.gz"; + aspnetcore = "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/${version}/${pname}-${version}-linux-${suffix}.tar.gz"; + netcore = "https://dotnetcli.azureedge.net/dotnet/Runtime/${version}/${pname}-${version}-linux-${suffix}.tar.gz"; + sdk = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-linux-${suffix}.tar.gz"; }; descriptions = { aspnetcore = "ASP .NET Core runtime ${version}"; @@ -30,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = builtins.getAttr type urls; - inherit sha512; + sha512 = sha512."${stdenv.hostPlatform.system}" or (throw "Missing hash for host system: ${stdenv.hostPlatform.system}"); }; sourceRoot = "."; @@ -59,9 +63,9 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://dotnet.github.io/; + homepage = "https://dotnet.github.io/"; description = builtins.getAttr type descriptions; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ kuznero ]; license = licenses.mit; }; diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 7b7a564ba374e..6497e8bdf9653 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -5,27 +5,37 @@ dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_2_2 sdk_ { callPackage }: let buildDotnet = attrs: callPackage (import ./buildDotnet.nix attrs) {}; - buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; } ); - buildNetCore = attrs: buildDotnet (attrs // { type = "netcore"; } ); - buildNetCoreSdk = attrs: buildDotnet (attrs // { type = "sdk"; } ); -in rec { + buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); + buildNetCore = attrs: buildDotnet (attrs // { type = "netcore"; }); + buildNetCoreSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); +in +rec { combinePackages = attrs: callPackage (import ./combinePackages.nix attrs) {}; # v2.1.15 (LTS) aspnetcore_2_1 = buildAspNetCore { version = "2.1.16"; - sha512 = "0awdzi8dysbg8xcy4l8wx2sb8gaaklphmwv61qxh7dj6ih4nla34l02xdax1l8nw41znnnqzsa77avglnrz36pckm9mc52m7wc7877h"; + sha512 = { + x86_64-linux = "0awdzi8dysbg8xcy4l8wx2sb8gaaklphmwv61qxh7dj6ih4nla34l02xdax1l8nw41znnnqzsa77avglnrz36pckm9mc52m7wc7877h"; + aarch64-linux = null; # no aarch64 version of this package is available + }; }; netcore_2_1 = buildNetCore { version = "2.1.16"; - sha512 = "07vvmza32hsblpw4zpcksm2gicy4agh0d1fwradqj16y6xbh3frdp87mqgbj5m54mmyfp5bc8c46v1w6dfm1w3y80v2y46aynild45l"; + sha512 = { + x86_64-linux = "07vvmza32hsblpw4zpcksm2gicy4agh0d1fwradqj16y6xbh3frdp87mqgbj5m54mmyfp5bc8c46v1w6dfm1w3y80v2y46aynild45l"; + aarch64-linux = "27ab982vz9rn2vzpq68dqfzhryfixq3s0apx7vi0cwiray3scgfmf45fm7qj63k9mvaqnk5g69i339109yasw3q5vpvpyjc1ykbi710"; + }; }; sdk_2_1 = buildNetCoreSdk { version = "2.1.804"; - sha512 = "1kbzxcdgyvs94kkm6ikr1j0p0k3zq30d10sl69ig0rgbqbqm4rpqi6dq94jjbw7q3jlwz83vgq3549q38d2s9kalmzv9lmddn2kkc42"; + sha512 = { + x86_64-linux = "1kbzxcdgyvs94kkm6ikr1j0p0k3zq30d10sl69ig0rgbqbqm4rpqi6dq94jjbw7q3jlwz83vgq3549q38d2s9kalmzv9lmddn2kkc42"; + aarch64-linux = "2d97xvhxnkdgghqlichkwdxxh641dzkd9hq5xgffgvbqv1qsh31k9yib2q1nsarpnbx0d758bdn2jm2wvsj7nx0gpxlb3nab0b3hc2g"; + }; }; # v2.2 @@ -36,33 +46,51 @@ in rec { aspnetcore_3_0 = buildAspNetCore { version = "3.0.3"; - sha512 = "342v6kxxbxky09d1c392vvr9rm30lf75wccka1bk2h4advlcga5nlgv93g7vrq48bsyxfi5gc36r3b0dlwl1g409g5mlk1042n6d0yq"; + sha512 = { + x86_64-linux = "342v6kxxbxky09d1c392vvr9rm30lf75wccka1bk2h4advlcga5nlgv93g7vrq48bsyxfi5gc36r3b0dlwl1g409g5mlk1042n6d0yq"; + aarch64-linux = "2xkg4q88q5jw6jdz6cxj8vsjr475nd0fcvifkv1shdm2j9dsjy233hwpxbr140m5n5ggyh6z99238z9j4kp2az977y8y8irz8m8ppvf"; + }; }; netcore_3_0 = buildNetCore { version = "3.0.3"; - sha512 = "32ykpcw2xx708r2lxcwcbxnmy4sk159rlfjfvkw990qh7n79pm3lm2qwa3zhqcslznmpg18kwxz8qb5fgsa0h49g843xx4kyai0n7rx"; + sha512 = { + x86_64-linux = "32ykpcw2xx708r2lxcwcbxnmy4sk159rlfjfvkw990qh7n79pm3lm2qwa3zhqcslznmpg18kwxz8qb5fgsa0h49g843xx4kyai0n7rx"; + aarch64-linux = "1lp8din7d5jv5fkyq1a7m01i1xg9jwpiljvam1kcyzsnwzvi0cb4ji336cfx4lqrn95gvc75gkzi6q8b4fz0h21gvk6z6kmlcr63nyg"; + }; }; sdk_3_0 = buildNetCoreSdk { version = "3.0.103"; - sha512 = "2diiplgxs92fkb6ym68b02d79z4qn63x5qlky5lvr757c1zkh0vfpk3khawdg94kdn4qkn6dmyqr0msxqgmiqyhp63cadzqq4vx7b12"; + sha512 = { + x86_64-linux = "2diiplgxs92fkb6ym68b02d79z4qn63x5qlky5lvr757c1zkh0vfpk3khawdg94kdn4qkn6dmyqr0msxqgmiqyhp63cadzqq4vx7b12"; + aarch64-linux = "32843q2lj7dgciq62g9v1q31vwfjyv5vaxrz712d942mcg5lyzjygwri106bv4naq3a22131ldzwnsifbdn2vq1iz60raqdb7ss9vnf"; + }; }; # v3.1.1 (LTS) aspnetcore_3_1 = buildAspNetCore { version = "3.1.2"; - sha512 = "27708bk5liz8r39p4dzs41clgq298d49g8ipzdj56pz613vkfyv7bp91666ydz36aazm265j2g9ji3sk1f9kbgv6024zwrly5w9vqrm"; + sha512 = { + x86_64-linux = "27708bk5liz8r39p4dzs41clgq298d49g8ipzdj56pz613vkfyv7bp91666ydz36aazm265j2g9ji3sk1f9kbgv6024zwrly5w9vqrm"; + aarch64-linux = "2sm5yf376w5dm0za3gbcj251kc909fmlasmlyn70zhqp2jiii075vcqh40racjlwlhsfydx32cw7kgnv238lad5mw5jxy143zql5xl3"; + }; }; netcore_3_1 = buildNetCore { version = "3.1.2"; - sha512 = "3zwg1anrcni9kagmjxn485bpjvb146hkm7irmikq3v879gjhd2fgpscg226ds83l4pxll3r7lwris6ij952xmy8lsqraapd9111ba14"; + sha512 = { + x86_64-linux = "3zwg1anrcni9kagmjxn485bpjvb146hkm7irmikq3v879gjhd2fgpscg226ds83l4pxll3r7lwris6ij952xmy8lsqraapd9111ba14"; + aarch64-linux = "3hf61d5adlfffy51627ypp36qc5r55g9xwgfxqd0c7vj9bqmpiph673bvqqpr189df9shxr21p94cwrc5n36z72a37vw4ic8ks2yayx"; + }; }; sdk_3_1 = buildNetCoreSdk { version = "3.1.102"; - sha512 = "0lmz8ac5j0i4zcq4904kr6qibvyjcm2ckfg27kqyqfii00qmm80xb5sk3i7f06xqkbgkrqkbg9rsldk75akw6m5dxg932j602bxrb4w"; + sha512 = { + x86_64-linux = "0lmz8ac5j0i4zcq4904kr6qibvyjcm2ckfg27kqyqfii00qmm80xb5sk3i7f06xqkbgkrqkbg9rsldk75akw6m5dxg932j602bxrb4w"; + aarch64-linux = "34k6cm69gxm7vcd9m6bp47sdx96j32z6lfhb2vjcdznc6xgs2wy8zcang3b1mjm5919dq7v6iysm6ffcpgjhhphy7prlnaqa69q5mks"; + }; }; } diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index 78e5eccbf1455..a444dea443036 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Device Tree Compiler"; - homepage = https://git.kernel.org/cgit/utils/dtc/dtc.git; + homepage = "https://git.kernel.org/cgit/utils/dtc/dtc.git"; license = licenses.gpl2; # dtc itself is GPLv2, libfdt is dual GPL/BSD maintainers = [ maintainers.dezgeg ]; platforms = platforms.unix; diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index 375b38f1dc683..65f6884cd5588 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = "Lisp implementation aiming to be small, fast and easy to embed"; - homepage = https://common-lisp.net/project/ecl/; + homepage = "https://common-lisp.net/project/ecl/"; license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 47aa8e249f8e1..8a18b6306c27d 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -1,4 +1,17 @@ -{ stdenv, fetchgit, fetchpatch, libuuid, python3, iasl, bc }: +{ + stdenv, + clangStdenv, + fetchgit, + fetchpatch, + libuuid, + python3, + iasl, + bc, + clang_9, + llvmPackages_9, + overrideCC, + lib, +}: let pythonEnv = python3.withPackages (ps: [ps.tkinter]); @@ -12,7 +25,17 @@ else if stdenv.isAarch64 then else throw "Unsupported architecture"; -edk2 = stdenv.mkDerivation { +buildStdenv = if stdenv.isDarwin then + overrideCC clangStdenv [ clang_9 llvmPackages_9.llvm llvmPackages_9.lld ] +else + stdenv; + +buildType = if stdenv.isDarwin then + "CLANGPDB" + else + "GCC5"; + +edk2 = buildStdenv.mkDerivation { pname = "edk2"; version = "201911"; @@ -25,8 +48,10 @@ edk2 = stdenv.mkDerivation { buildInputs = [ libuuid pythonEnv ]; - makeFlags = [ "-C BaseTools" ]; - NIX_CFLAGS_COMPILE = "-Wno-return-type -Wno-error=stringop-truncation"; + makeFlags = [ "-C BaseTools" ] + ++ lib.optional (stdenv.cc.isClang) [ "BUILD_CC=clang BUILD_CXX=clang++ BUILD_AS=clang" ]; + + NIX_CFLAGS_COMPILE = "-Wno-return-type" + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation"; hardeningDisable = [ "format" "fortify" ]; @@ -38,15 +63,15 @@ edk2 = stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Intel EFI development kit"; - homepage = https://sourceforge.net/projects/edk2/; + homepage = "https://sourceforge.net/projects/edk2/"; license = licenses.bsd2; - platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" ]; }; passthru = { - mkDerivation = projectDscPath: attrs: stdenv.mkDerivation ({ + mkDerivation = projectDscPath: attrs: buildStdenv.mkDerivation ({ inherit (edk2) src; buildInputs = [ bc pythonEnv ] ++ attrs.buildInputs or []; @@ -65,7 +90,7 @@ edk2 = stdenv.mkDerivation { buildPhase = '' runHook preBuild - build -a ${targetArch} -b RELEASE -t GCC5 -p ${projectDscPath} -n $NIX_BUILD_CORES $buildFlags + build -a ${targetArch} -b RELEASE -t ${buildType} -p ${projectDscPath} -n $NIX_BUILD_CORES $buildFlags runHook postBuild ''; diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix index 90c2b8fd23c41..61e5fd70a7c6a 100644 --- a/pkgs/development/compilers/eli/default.nix +++ b/pkgs/development/compilers/eli/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { construction with extensive libraries implementing common tasks, yet handling arbitrary special cases. Output is the C subset of C++. ''; - homepage = http://eli-project.sourceforge.net/; + homepage = "http://eli-project.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ timokau ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 3e2d3ce2ad2f8..625d7adab4115 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -4,7 +4,7 @@ let fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; }; - hsPkgs = haskell.packages.ghc881.override { + hsPkgs = haskell.packages.ghc883.override { overrides = self: super: with haskell.lib; let elmPkgs = rec { elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: { @@ -28,7 +28,7 @@ let `package/nix/build.sh` */ elm-format = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-format.nix {}) (drv: { - # GHC 8.8.1 support + # GHC 8.8.3 support # https://github.com/avh4/elm-format/pull/640 patches = [( fetchpatch { @@ -106,6 +106,14 @@ let ln -sf ${elm-instrument}/bin/elm-instrument unpacked_bin/elm-instrument ''; }; + + create-elm-app = patchBinwrap [elmi-to-json] (nodePkgs.create-elm-app.override { + preRebuild = '' + rm node_modules/elm/install.js + echo "console.log('no-op');" > node_modules/elm/install.js + ''; + }); + elm-language-server = nodePkgs."@elm-tooling/elm-language-server"; inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse; diff --git a/pkgs/development/compilers/elm/makeDotElm.nix b/pkgs/development/compilers/elm/makeDotElm.nix index 0831d382c4b29..b8076d72e4817 100644 --- a/pkgs/development/compilers/elm/makeDotElm.nix +++ b/pkgs/development/compilers/elm/makeDotElm.nix @@ -11,6 +11,14 @@ ver: deps: inherit (info) sha256; }; + configurePhase = '' + true + ''; + + buildPhase = '' + true + ''; + installPhase = '' mkdir -p $out cp -r * $out diff --git a/pkgs/development/compilers/elm/packages/elm-instrument.nix b/pkgs/development/compilers/elm/packages/elm-instrument.nix index 54077994fbdd4..4d7efcf1083bb 100644 --- a/pkgs/development/compilers/elm/packages/elm-instrument.nix +++ b/pkgs/development/compilers/elm/packages/elm-instrument.nix @@ -28,7 +28,7 @@ mkDerivation { quickcheck-io split tasty tasty-golden tasty-hunit tasty-quickcheck text ]; - homepage = "http://elm-lang.org"; + homepage = "https://elm-lang.org"; description = "Instrumentation library for Elm"; license = stdenv.lib.licenses.bsd3; } diff --git a/pkgs/development/compilers/elm/packages/node-packages.json b/pkgs/development/compilers/elm/packages/node-packages.json index 643aad746fa2d..29d00ef23ecc9 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.json +++ b/pkgs/development/compilers/elm/packages/node-packages.json @@ -7,5 +7,6 @@ "elm-test", "elm-upgrade", "elm-verify-examples", - "elm-xref" + "elm-xref", + "create-elm-app" ] diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index 1c8956f4beaca..32bee20ce9def 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -4,6 +4,654 @@ let sources = { + "@babel/cli-7.2.3" = { + name = "_at_babel_slash_cli"; + packageName = "@babel/cli"; + version = "7.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.2.3.tgz"; + sha512 = "bfna97nmJV6nDJhXNPeEfxyMjWnt6+IjUAaDPiYRTBlm8L41n8nvw6UAqUCbvpFfU246gHPxW7sfWwqtF4FcYA=="; + }; + }; + "@babel/code-frame-7.0.0" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz"; + sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="; + }; + }; + "@babel/code-frame-7.8.3" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz"; + sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; + }; + }; + "@babel/core-7.3.4" = { + name = "_at_babel_slash_core"; + packageName = "@babel/core"; + version = "7.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/core/-/core-7.3.4.tgz"; + sha512 = "jRsuseXBo9pN197KnDwhhaaBzyZr2oIcLHHTt2oDdQrej5Qp57dCCJafWx5ivU8/alEYDpssYqv1MUqcxwQlrA=="; + }; + }; + "@babel/generator-7.9.4" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz"; + sha512 = "rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA=="; + }; + }; + "@babel/helper-annotate-as-pure-7.8.3" = { + name = "_at_babel_slash_helper-annotate-as-pure"; + packageName = "@babel/helper-annotate-as-pure"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz"; + sha512 = "6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw=="; + }; + }; + "@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" = { + name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; + packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz"; + sha512 = "5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw=="; + }; + }; + "@babel/helper-create-regexp-features-plugin-7.8.8" = { + name = "_at_babel_slash_helper-create-regexp-features-plugin"; + packageName = "@babel/helper-create-regexp-features-plugin"; + version = "7.8.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz"; + sha512 = "LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg=="; + }; + }; + "@babel/helper-define-map-7.8.3" = { + name = "_at_babel_slash_helper-define-map"; + packageName = "@babel/helper-define-map"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz"; + sha512 = "PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g=="; + }; + }; + "@babel/helper-explode-assignable-expression-7.8.3" = { + name = "_at_babel_slash_helper-explode-assignable-expression"; + packageName = "@babel/helper-explode-assignable-expression"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz"; + sha512 = "N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw=="; + }; + }; + "@babel/helper-function-name-7.8.3" = { + name = "_at_babel_slash_helper-function-name"; + packageName = "@babel/helper-function-name"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz"; + sha512 = "BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA=="; + }; + }; + "@babel/helper-get-function-arity-7.8.3" = { + name = "_at_babel_slash_helper-get-function-arity"; + packageName = "@babel/helper-get-function-arity"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz"; + sha512 = "FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA=="; + }; + }; + "@babel/helper-hoist-variables-7.8.3" = { + name = "_at_babel_slash_helper-hoist-variables"; + packageName = "@babel/helper-hoist-variables"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz"; + sha512 = "ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg=="; + }; + }; + "@babel/helper-member-expression-to-functions-7.8.3" = { + name = "_at_babel_slash_helper-member-expression-to-functions"; + packageName = "@babel/helper-member-expression-to-functions"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz"; + sha512 = "fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA=="; + }; + }; + "@babel/helper-module-imports-7.8.3" = { + name = "_at_babel_slash_helper-module-imports"; + packageName = "@babel/helper-module-imports"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz"; + sha512 = "R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg=="; + }; + }; + "@babel/helper-module-transforms-7.9.0" = { + name = "_at_babel_slash_helper-module-transforms"; + packageName = "@babel/helper-module-transforms"; + version = "7.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz"; + sha512 = "0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA=="; + }; + }; + "@babel/helper-optimise-call-expression-7.8.3" = { + name = "_at_babel_slash_helper-optimise-call-expression"; + packageName = "@babel/helper-optimise-call-expression"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz"; + sha512 = "Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ=="; + }; + }; + "@babel/helper-plugin-utils-7.8.3" = { + name = "_at_babel_slash_helper-plugin-utils"; + packageName = "@babel/helper-plugin-utils"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz"; + sha512 = "j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ=="; + }; + }; + "@babel/helper-regex-7.8.3" = { + name = "_at_babel_slash_helper-regex"; + packageName = "@babel/helper-regex"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz"; + sha512 = "BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ=="; + }; + }; + "@babel/helper-remap-async-to-generator-7.8.3" = { + name = "_at_babel_slash_helper-remap-async-to-generator"; + packageName = "@babel/helper-remap-async-to-generator"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz"; + sha512 = "kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA=="; + }; + }; + "@babel/helper-replace-supers-7.8.6" = { + name = "_at_babel_slash_helper-replace-supers"; + packageName = "@babel/helper-replace-supers"; + version = "7.8.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz"; + sha512 = "PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA=="; + }; + }; + "@babel/helper-simple-access-7.8.3" = { + name = "_at_babel_slash_helper-simple-access"; + packageName = "@babel/helper-simple-access"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz"; + sha512 = "VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw=="; + }; + }; + "@babel/helper-split-export-declaration-7.8.3" = { + name = "_at_babel_slash_helper-split-export-declaration"; + packageName = "@babel/helper-split-export-declaration"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz"; + sha512 = "3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA=="; + }; + }; + "@babel/helper-validator-identifier-7.9.0" = { + name = "_at_babel_slash_helper-validator-identifier"; + packageName = "@babel/helper-validator-identifier"; + version = "7.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz"; + sha512 = "6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw=="; + }; + }; + "@babel/helper-wrap-function-7.8.3" = { + name = "_at_babel_slash_helper-wrap-function"; + packageName = "@babel/helper-wrap-function"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz"; + sha512 = "LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ=="; + }; + }; + "@babel/helpers-7.9.2" = { + name = "_at_babel_slash_helpers"; + packageName = "@babel/helpers"; + version = "7.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz"; + sha512 = "JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA=="; + }; + }; + "@babel/highlight-7.9.0" = { + name = "_at_babel_slash_highlight"; + packageName = "@babel/highlight"; + version = "7.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz"; + sha512 = "lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ=="; + }; + }; + "@babel/parser-7.9.4" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz"; + sha512 = "bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA=="; + }; + }; + "@babel/plugin-proposal-async-generator-functions-7.8.3" = { + name = "_at_babel_slash_plugin-proposal-async-generator-functions"; + packageName = "@babel/plugin-proposal-async-generator-functions"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz"; + sha512 = "NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw=="; + }; + }; + "@babel/plugin-proposal-json-strings-7.8.3" = { + name = "_at_babel_slash_plugin-proposal-json-strings"; + packageName = "@babel/plugin-proposal-json-strings"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz"; + sha512 = "KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q=="; + }; + }; + "@babel/plugin-proposal-object-rest-spread-7.9.0" = { + name = "_at_babel_slash_plugin-proposal-object-rest-spread"; + packageName = "@babel/plugin-proposal-object-rest-spread"; + version = "7.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz"; + sha512 = "UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow=="; + }; + }; + "@babel/plugin-proposal-optional-catch-binding-7.8.3" = { + name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; + packageName = "@babel/plugin-proposal-optional-catch-binding"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz"; + sha512 = "0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw=="; + }; + }; + "@babel/plugin-proposal-unicode-property-regex-7.8.8" = { + name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; + packageName = "@babel/plugin-proposal-unicode-property-regex"; + version = "7.8.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz"; + sha512 = "EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A=="; + }; + }; + "@babel/plugin-syntax-async-generators-7.8.4" = { + name = "_at_babel_slash_plugin-syntax-async-generators"; + packageName = "@babel/plugin-syntax-async-generators"; + version = "7.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; + sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; + }; + }; + "@babel/plugin-syntax-json-strings-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-json-strings"; + packageName = "@babel/plugin-syntax-json-strings"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; + sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; + }; + }; + "@babel/plugin-syntax-object-rest-spread-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-object-rest-spread"; + packageName = "@babel/plugin-syntax-object-rest-spread"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; + sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA=="; + }; + }; + "@babel/plugin-syntax-optional-catch-binding-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-optional-catch-binding"; + packageName = "@babel/plugin-syntax-optional-catch-binding"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; + sha512 = "6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q=="; + }; + }; + "@babel/plugin-transform-arrow-functions-7.8.3" = { + name = "_at_babel_slash_plugin-transform-arrow-functions"; + packageName = "@babel/plugin-transform-arrow-functions"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz"; + sha512 = "0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg=="; + }; + }; + "@babel/plugin-transform-async-to-generator-7.8.3" = { + name = "_at_babel_slash_plugin-transform-async-to-generator"; + packageName = "@babel/plugin-transform-async-to-generator"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz"; + sha512 = "imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ=="; + }; + }; + "@babel/plugin-transform-block-scoped-functions-7.8.3" = { + name = "_at_babel_slash_plugin-transform-block-scoped-functions"; + packageName = "@babel/plugin-transform-block-scoped-functions"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz"; + sha512 = "vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg=="; + }; + }; + "@babel/plugin-transform-block-scoping-7.8.3" = { + name = "_at_babel_slash_plugin-transform-block-scoping"; + packageName = "@babel/plugin-transform-block-scoping"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz"; + sha512 = "pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w=="; + }; + }; + "@babel/plugin-transform-classes-7.9.2" = { + name = "_at_babel_slash_plugin-transform-classes"; + packageName = "@babel/plugin-transform-classes"; + version = "7.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz"; + sha512 = "TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ=="; + }; + }; + "@babel/plugin-transform-computed-properties-7.8.3" = { + name = "_at_babel_slash_plugin-transform-computed-properties"; + packageName = "@babel/plugin-transform-computed-properties"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz"; + sha512 = "O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA=="; + }; + }; + "@babel/plugin-transform-destructuring-7.8.8" = { + name = "_at_babel_slash_plugin-transform-destructuring"; + packageName = "@babel/plugin-transform-destructuring"; + version = "7.8.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz"; + sha512 = "eRJu4Vs2rmttFCdhPUM3bV0Yo/xPSdPw6ML9KHs/bjB4bLA5HXlbvYXPOD5yASodGod+krjYx21xm1QmL8dCJQ=="; + }; + }; + "@babel/plugin-transform-dotall-regex-7.8.3" = { + name = "_at_babel_slash_plugin-transform-dotall-regex"; + packageName = "@babel/plugin-transform-dotall-regex"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz"; + sha512 = "kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw=="; + }; + }; + "@babel/plugin-transform-duplicate-keys-7.8.3" = { + name = "_at_babel_slash_plugin-transform-duplicate-keys"; + packageName = "@babel/plugin-transform-duplicate-keys"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz"; + sha512 = "s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ=="; + }; + }; + "@babel/plugin-transform-exponentiation-operator-7.8.3" = { + name = "_at_babel_slash_plugin-transform-exponentiation-operator"; + packageName = "@babel/plugin-transform-exponentiation-operator"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz"; + sha512 = "zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ=="; + }; + }; + "@babel/plugin-transform-for-of-7.9.0" = { + name = "_at_babel_slash_plugin-transform-for-of"; + packageName = "@babel/plugin-transform-for-of"; + version = "7.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz"; + sha512 = "lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ=="; + }; + }; + "@babel/plugin-transform-function-name-7.8.3" = { + name = "_at_babel_slash_plugin-transform-function-name"; + packageName = "@babel/plugin-transform-function-name"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz"; + sha512 = "rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ=="; + }; + }; + "@babel/plugin-transform-literals-7.8.3" = { + name = "_at_babel_slash_plugin-transform-literals"; + packageName = "@babel/plugin-transform-literals"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz"; + sha512 = "3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A=="; + }; + }; + "@babel/plugin-transform-modules-amd-7.9.0" = { + name = "_at_babel_slash_plugin-transform-modules-amd"; + packageName = "@babel/plugin-transform-modules-amd"; + version = "7.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz"; + sha512 = "vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q=="; + }; + }; + "@babel/plugin-transform-modules-commonjs-7.9.0" = { + name = "_at_babel_slash_plugin-transform-modules-commonjs"; + packageName = "@babel/plugin-transform-modules-commonjs"; + version = "7.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz"; + sha512 = "qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g=="; + }; + }; + "@babel/plugin-transform-modules-systemjs-7.9.0" = { + name = "_at_babel_slash_plugin-transform-modules-systemjs"; + packageName = "@babel/plugin-transform-modules-systemjs"; + version = "7.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz"; + sha512 = "FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ=="; + }; + }; + "@babel/plugin-transform-modules-umd-7.9.0" = { + name = "_at_babel_slash_plugin-transform-modules-umd"; + packageName = "@babel/plugin-transform-modules-umd"; + version = "7.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz"; + sha512 = "uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ=="; + }; + }; + "@babel/plugin-transform-named-capturing-groups-regex-7.8.3" = { + name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; + packageName = "@babel/plugin-transform-named-capturing-groups-regex"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz"; + sha512 = "f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw=="; + }; + }; + "@babel/plugin-transform-new-target-7.8.3" = { + name = "_at_babel_slash_plugin-transform-new-target"; + packageName = "@babel/plugin-transform-new-target"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz"; + sha512 = "QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw=="; + }; + }; + "@babel/plugin-transform-object-super-7.8.3" = { + name = "_at_babel_slash_plugin-transform-object-super"; + packageName = "@babel/plugin-transform-object-super"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz"; + sha512 = "57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ=="; + }; + }; + "@babel/plugin-transform-parameters-7.9.3" = { + name = "_at_babel_slash_plugin-transform-parameters"; + packageName = "@babel/plugin-transform-parameters"; + version = "7.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz"; + sha512 = "fzrQFQhp7mIhOzmOtPiKffvCYQSK10NR8t6BBz2yPbeUHb9OLW8RZGtgDRBn8z2hGcwvKDL3vC7ojPTLNxmqEg=="; + }; + }; + "@babel/plugin-transform-regenerator-7.8.7" = { + name = "_at_babel_slash_plugin-transform-regenerator"; + packageName = "@babel/plugin-transform-regenerator"; + version = "7.8.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz"; + sha512 = "TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA=="; + }; + }; + "@babel/plugin-transform-runtime-7.3.4" = { + name = "_at_babel_slash_plugin-transform-runtime"; + packageName = "@babel/plugin-transform-runtime"; + version = "7.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.3.4.tgz"; + sha512 = "PaoARuztAdd5MgeVjAxnIDAIUet5KpogqaefQvPOmPYCxYoaPhautxDh3aO8a4xHsKgT/b9gSxR0BKK1MIewPA=="; + }; + }; + "@babel/plugin-transform-shorthand-properties-7.8.3" = { + name = "_at_babel_slash_plugin-transform-shorthand-properties"; + packageName = "@babel/plugin-transform-shorthand-properties"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz"; + sha512 = "I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w=="; + }; + }; + "@babel/plugin-transform-spread-7.8.3" = { + name = "_at_babel_slash_plugin-transform-spread"; + packageName = "@babel/plugin-transform-spread"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz"; + sha512 = "CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g=="; + }; + }; + "@babel/plugin-transform-sticky-regex-7.8.3" = { + name = "_at_babel_slash_plugin-transform-sticky-regex"; + packageName = "@babel/plugin-transform-sticky-regex"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz"; + sha512 = "9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw=="; + }; + }; + "@babel/plugin-transform-template-literals-7.8.3" = { + name = "_at_babel_slash_plugin-transform-template-literals"; + packageName = "@babel/plugin-transform-template-literals"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz"; + sha512 = "820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ=="; + }; + }; + "@babel/plugin-transform-typeof-symbol-7.8.4" = { + name = "_at_babel_slash_plugin-transform-typeof-symbol"; + packageName = "@babel/plugin-transform-typeof-symbol"; + version = "7.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz"; + sha512 = "2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg=="; + }; + }; + "@babel/plugin-transform-unicode-regex-7.8.3" = { + name = "_at_babel_slash_plugin-transform-unicode-regex"; + packageName = "@babel/plugin-transform-unicode-regex"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz"; + sha512 = "+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw=="; + }; + }; + "@babel/preset-env-7.3.4" = { + name = "_at_babel_slash_preset-env"; + packageName = "@babel/preset-env"; + version = "7.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.3.4.tgz"; + sha512 = "2mwqfYMK8weA0g0uBKOt4FE3iEodiHy9/CW0b+nWXcbL+pGzLx8ESYc+j9IIxr6LTDHWKgPm71i9smo02bw+gA=="; + }; + }; + "@babel/runtime-7.3.4" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.4.tgz"; + sha512 = "IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g=="; + }; + }; + "@babel/runtime-7.9.2" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz"; + sha512 = "NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q=="; + }; + }; + "@babel/template-7.8.6" = { + name = "_at_babel_slash_template"; + packageName = "@babel/template"; + version = "7.8.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz"; + sha512 = "zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg=="; + }; + }; + "@babel/traverse-7.9.0" = { + name = "_at_babel_slash_traverse"; + packageName = "@babel/traverse"; + version = "7.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz"; + sha512 = "jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w=="; + }; + }; + "@babel/types-7.9.0" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz"; + sha512 = "BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng=="; + }; + }; "@cnakazawa/watch-1.0.4" = { name = "_at_cnakazawa_slash_watch"; packageName = "@cnakazawa/watch"; @@ -13,6 +661,60 @@ let sha512 = "v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ=="; }; }; + "@hapi/address-2.1.4" = { + name = "_at_hapi_slash_address"; + packageName = "@hapi/address"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz"; + sha512 = "QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ=="; + }; + }; + "@hapi/bourne-1.3.2" = { + name = "_at_hapi_slash_bourne"; + packageName = "@hapi/bourne"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz"; + sha512 = "1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="; + }; + }; + "@hapi/hoek-8.5.1" = { + name = "_at_hapi_slash_hoek"; + packageName = "@hapi/hoek"; + version = "8.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz"; + sha512 = "yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="; + }; + }; + "@hapi/joi-15.1.1" = { + name = "_at_hapi_slash_joi"; + packageName = "@hapi/joi"; + version = "15.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz"; + sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ=="; + }; + }; + "@hapi/topo-3.1.6" = { + name = "_at_hapi_slash_topo"; + packageName = "@hapi/topo"; + version = "3.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz"; + sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; + }; + }; + "@mrmlnc/readdir-enhanced-2.2.1" = { + name = "_at_mrmlnc_slash_readdir-enhanced"; + packageName = "@mrmlnc/readdir-enhanced"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz"; + sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; + }; + }; "@nodelib/fs.scandir-2.1.3" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; @@ -22,6 +724,15 @@ let sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw=="; }; }; + "@nodelib/fs.stat-1.1.3" = { + name = "_at_nodelib_slash_fs.stat"; + packageName = "@nodelib/fs.stat"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz"; + sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; + }; + }; "@nodelib/fs.stat-2.0.3" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; @@ -67,6 +778,15 @@ let sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ=="; }; }; + "@types/anymatch-1.3.1" = { + name = "_at_types_slash_anymatch"; + packageName = "@types/anymatch"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz"; + sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="; + }; + }; "@types/cacheable-request-6.0.1" = { name = "_at_types_slash_cacheable-request"; packageName = "@types/cacheable-request"; @@ -85,6 +805,33 @@ let sha512 = "rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="; }; }; + "@types/events-3.0.0" = { + name = "_at_types_slash_events"; + packageName = "@types/events"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"; + sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; + }; + }; + "@types/glob-7.1.1" = { + name = "_at_types_slash_glob"; + packageName = "@types/glob"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz"; + sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w=="; + }; + }; + "@types/html-minifier-terser-5.0.0" = { + name = "_at_types_slash_html-minifier-terser"; + packageName = "@types/html-minifier-terser"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.0.0.tgz"; + sha512 = "q95SP4FdkmF0CwO0F2q0H6ZgudsApaY/yCtAQNRn1gduef5fGpyEphzy0YCq/N0UFvDSnLg5V8jFK/YGXlDiCw=="; + }; + }; "@types/http-cache-semantics-4.0.0" = { name = "_at_types_slash_http-cache-semantics"; packageName = "@types/http-cache-semantics"; @@ -103,13 +850,31 @@ let sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw=="; }; }; - "@types/node-13.9.1" = { + "@types/minimatch-3.0.3" = { + name = "_at_types_slash_minimatch"; + packageName = "@types/minimatch"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"; + sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; + }; + }; + "@types/node-13.11.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.9.1"; + version = "13.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-13.11.0.tgz"; + sha512 = "uM4mnmsIIPK/yeO+42F2RQhGUIs39K2RFmugcJANppXe6J1nvH87PvzPZYpza7Xhhs8Yn9yIAVdLZ84z61+0xQ=="; + }; + }; + "@types/q-1.5.2" = { + name = "_at_types_slash_q"; + packageName = "@types/q"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.9.1.tgz"; - sha512 = "E6M6N0blf/jiZx8Q3nb0vNaswQeEyn0XlupO+xN6DtJ6r6IT4nXrTry7zhIfYvFCl3/8Cu6WIysmUBKiqV0bqQ=="; + url = "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz"; + sha512 = "ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw=="; }; }; "@types/responselike-1.0.0" = { @@ -121,6 +886,231 @@ let sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; }; }; + "@types/source-list-map-0.1.2" = { + name = "_at_types_slash_source-list-map"; + packageName = "@types/source-list-map"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz"; + sha512 = "K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="; + }; + }; + "@types/tapable-1.0.5" = { + name = "_at_types_slash_tapable"; + packageName = "@types/tapable"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.5.tgz"; + sha512 = "/gG2M/Imw7cQFp8PGvz/SwocNrmKFjFsm5Pb8HdbHkZ1K8pmuPzOX4VeVoiEecFCVf4CsN1r3/BRvx+6sNqwtQ=="; + }; + }; + "@types/uglify-js-3.0.5" = { + name = "_at_types_slash_uglify-js"; + packageName = "@types/uglify-js"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.0.5.tgz"; + sha512 = "L7EbSkhSaWBpkl+PZAEAqZTqtTeIsq7s/oX/q0LNnxxJoRVKQE0T81XDVyaxjiiKQwiV2vhVeYRqxdRNqGOGJw=="; + }; + }; + "@types/webpack-4.41.10" = { + name = "_at_types_slash_webpack"; + packageName = "@types/webpack"; + version = "4.41.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.10.tgz"; + sha512 = "vIy0qaq8AjOjZLuFPqpo7nAJzcoVXMdw3mvpNN07Uvdy0p1IpJeLNBe3obdRP7FX2jIusDE7z1pZa0A6qYUgnA=="; + }; + }; + "@types/webpack-sources-0.1.7" = { + name = "_at_types_slash_webpack-sources"; + packageName = "@types/webpack-sources"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.7.tgz"; + sha512 = "XyaHrJILjK1VHVC4aVlKsdNN5KBTwufMb43cQs+flGxtPAf/1Qwl8+Q0tp5BwEGaI8D6XT1L+9bSWXckgkjTLw=="; + }; + }; + "@webassemblyjs/ast-1.9.0" = { + name = "_at_webassemblyjs_slash_ast"; + packageName = "@webassemblyjs/ast"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz"; + sha512 = "C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA=="; + }; + }; + "@webassemblyjs/floating-point-hex-parser-1.9.0" = { + name = "_at_webassemblyjs_slash_floating-point-hex-parser"; + packageName = "@webassemblyjs/floating-point-hex-parser"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz"; + sha512 = "TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA=="; + }; + }; + "@webassemblyjs/helper-api-error-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-api-error"; + packageName = "@webassemblyjs/helper-api-error"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz"; + sha512 = "NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw=="; + }; + }; + "@webassemblyjs/helper-buffer-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-buffer"; + packageName = "@webassemblyjs/helper-buffer"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz"; + sha512 = "qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA=="; + }; + }; + "@webassemblyjs/helper-code-frame-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-code-frame"; + packageName = "@webassemblyjs/helper-code-frame"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz"; + sha512 = "ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA=="; + }; + }; + "@webassemblyjs/helper-fsm-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-fsm"; + packageName = "@webassemblyjs/helper-fsm"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz"; + sha512 = "OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw=="; + }; + }; + "@webassemblyjs/helper-module-context-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-module-context"; + packageName = "@webassemblyjs/helper-module-context"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz"; + sha512 = "MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g=="; + }; + }; + "@webassemblyjs/helper-wasm-bytecode-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; + packageName = "@webassemblyjs/helper-wasm-bytecode"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz"; + sha512 = "R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw=="; + }; + }; + "@webassemblyjs/helper-wasm-section-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-wasm-section"; + packageName = "@webassemblyjs/helper-wasm-section"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz"; + sha512 = "XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw=="; + }; + }; + "@webassemblyjs/ieee754-1.9.0" = { + name = "_at_webassemblyjs_slash_ieee754"; + packageName = "@webassemblyjs/ieee754"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz"; + sha512 = "dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg=="; + }; + }; + "@webassemblyjs/leb128-1.9.0" = { + name = "_at_webassemblyjs_slash_leb128"; + packageName = "@webassemblyjs/leb128"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz"; + sha512 = "ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw=="; + }; + }; + "@webassemblyjs/utf8-1.9.0" = { + name = "_at_webassemblyjs_slash_utf8"; + packageName = "@webassemblyjs/utf8"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz"; + sha512 = "GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w=="; + }; + }; + "@webassemblyjs/wasm-edit-1.9.0" = { + name = "_at_webassemblyjs_slash_wasm-edit"; + packageName = "@webassemblyjs/wasm-edit"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz"; + sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw=="; + }; + }; + "@webassemblyjs/wasm-gen-1.9.0" = { + name = "_at_webassemblyjs_slash_wasm-gen"; + packageName = "@webassemblyjs/wasm-gen"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz"; + sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA=="; + }; + }; + "@webassemblyjs/wasm-opt-1.9.0" = { + name = "_at_webassemblyjs_slash_wasm-opt"; + packageName = "@webassemblyjs/wasm-opt"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz"; + sha512 = "Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A=="; + }; + }; + "@webassemblyjs/wasm-parser-1.9.0" = { + name = "_at_webassemblyjs_slash_wasm-parser"; + packageName = "@webassemblyjs/wasm-parser"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz"; + sha512 = "9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA=="; + }; + }; + "@webassemblyjs/wast-parser-1.9.0" = { + name = "_at_webassemblyjs_slash_wast-parser"; + packageName = "@webassemblyjs/wast-parser"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz"; + sha512 = "qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw=="; + }; + }; + "@webassemblyjs/wast-printer-1.9.0" = { + name = "_at_webassemblyjs_slash_wast-printer"; + packageName = "@webassemblyjs/wast-printer"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz"; + sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA=="; + }; + }; + "@xtuc/ieee754-1.2.0" = { + name = "_at_xtuc_slash_ieee754"; + packageName = "@xtuc/ieee754"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; + sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; + }; + }; + "@xtuc/long-4.2.2" = { + name = "_at_xtuc_slash_long"; + packageName = "@xtuc/long"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"; + sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; + }; + }; "abbrev-1.1.1" = { name = "abbrev"; packageName = "abbrev"; @@ -139,6 +1129,24 @@ let sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; + "acorn-6.4.1" = { + name = "acorn"; + packageName = "acorn"; + version = "6.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz"; + sha512 = "ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="; + }; + }; + "address-1.0.3" = { + name = "address"; + packageName = "address"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/address/-/address-1.0.3.tgz"; + sha512 = "z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg=="; + }; + }; "ajv-6.12.0" = { name = "ajv"; packageName = "ajv"; @@ -148,6 +1156,60 @@ let sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="; }; }; + "ajv-errors-1.0.1" = { + name = "ajv-errors"; + packageName = "ajv-errors"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz"; + sha512 = "DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="; + }; + }; + "ajv-keywords-3.4.1" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; + sha512 = "RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ=="; + }; + }; + "alphanum-sort-1.0.2" = { + name = "alphanum-sort"; + packageName = "alphanum-sort"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz"; + sha1 = "97a1119649b211ad33691d9f9f486a8ec9fbe0a3"; + }; + }; + "ansi-colors-3.2.4" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "3.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz"; + sha512 = "hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA=="; + }; + }; + "ansi-escapes-3.2.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; + sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; + }; + }; + "ansi-html-0.0.7" = { + name = "ansi-html"; + packageName = "ansi-html"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz"; + sha1 = "813584021962a9e9e6fd039f940d12f56ca7859e"; + }; + }; "ansi-regex-2.1.1" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -157,6 +1219,15 @@ let sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; }; }; + "ansi-regex-3.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + }; "ansi-regex-4.1.0" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -220,6 +1291,24 @@ let sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="; }; }; + "aproba-1.2.0" = { + name = "aproba"; + packageName = "aproba"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + }; + }; + "argparse-1.0.10" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; + }; + }; "arr-diff-4.0.0" = { name = "arr-diff"; packageName = "arr-diff"; @@ -247,6 +1336,15 @@ let sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; }; }; + "array-filter-0.0.1" = { + name = "array-filter"; + packageName = "array-filter"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz"; + sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; + }; + }; "array-flatten-1.1.1" = { name = "array-flatten"; packageName = "array-flatten"; @@ -256,6 +1354,42 @@ let sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; }; }; + "array-flatten-2.1.2" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"; + sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="; + }; + }; + "array-map-0.0.0" = { + name = "array-map"; + packageName = "array-map"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz"; + sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; + }; + }; + "array-reduce-0.0.0" = { + name = "array-reduce"; + packageName = "array-reduce"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz"; + sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; + }; + }; + "array-union-1.0.2" = { + name = "array-union"; + packageName = "array-union"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz"; + sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; + }; + }; "array-union-2.1.0" = { name = "array-union"; packageName = "array-union"; @@ -265,6 +1399,15 @@ let sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; }; }; + "array-uniq-1.0.3" = { + name = "array-uniq"; + packageName = "array-uniq"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"; + sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; + }; + }; "array-unique-0.3.2" = { name = "array-unique"; packageName = "array-unique"; @@ -274,6 +1417,15 @@ let sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; }; }; + "asap-2.0.6" = { + name = "asap"; + packageName = "asap"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; + sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; + }; + }; "asn1-0.2.4" = { name = "asn1"; packageName = "asn1"; @@ -283,6 +1435,24 @@ let sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; + "asn1.js-4.10.1" = { + name = "asn1.js"; + packageName = "asn1.js"; + version = "4.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; + sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="; + }; + }; + "assert-1.5.0" = { + name = "assert"; + packageName = "assert"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz"; + sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA=="; + }; + }; "assert-plus-1.0.0" = { name = "assert-plus"; packageName = "assert-plus"; @@ -292,6 +1462,15 @@ let sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; + "assets-webpack-plugin-3.9.12" = { + name = "assets-webpack-plugin"; + packageName = "assets-webpack-plugin"; + version = "3.9.12"; + src = fetchurl { + url = "https://registry.npmjs.org/assets-webpack-plugin/-/assets-webpack-plugin-3.9.12.tgz"; + sha512 = "iqXT/CtP013CO+IZJG7f4/KmUnde+nn6FSksAhrGRbT1GODsFU3xocP6A5NkTFoey3XOI9n1ZY0QmX/mY74gNA=="; + }; + }; "assign-symbols-1.0.0" = { name = "assign-symbols"; packageName = "assign-symbols"; @@ -310,6 +1489,42 @@ let sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; }; }; + "async-0.9.2" = { + name = "async"; + packageName = "async"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + }; + "async-1.0.0" = { + name = "async"; + packageName = "async"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-1.0.0.tgz"; + sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9"; + }; + }; + "async-2.6.3" = { + name = "async"; + packageName = "async"; + version = "2.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.6.3.tgz"; + sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; + }; + }; + "async-each-1.0.3" = { + name = "async-each"; + packageName = "async-each"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz"; + sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; + }; + }; "async-limiter-1.0.1" = { name = "async-limiter"; packageName = "async-limiter"; @@ -337,6 +1552,15 @@ let sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; }; }; + "autoprefixer-8.6.5" = { + name = "autoprefixer"; + packageName = "autoprefixer"; + version = "8.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-8.6.5.tgz"; + sha512 = "PLWJN3Xo/rycNkx+mp8iBDMTm3FeWe4VmYaZDSqL5QQB9sLsQkG5k8n+LNDFnhh9kdq2K+egL/icpctOmDHwig=="; + }; + }; "aws-sign2-0.7.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -355,6 +1579,51 @@ let sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="; }; }; + "babel-extract-comments-1.0.0" = { + name = "babel-extract-comments"; + packageName = "babel-extract-comments"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-extract-comments/-/babel-extract-comments-1.0.0.tgz"; + sha512 = "qWWzi4TlddohA91bFwgt6zO/J0X+io7Qp184Fw0m2JYRSTZnJbFR8+07KmzudHCZgOiKRCrjhylwv9Xd8gfhVQ=="; + }; + }; + "babel-loader-8.0.4" = { + name = "babel-loader"; + packageName = "babel-loader"; + version = "8.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.4.tgz"; + sha512 = "fhBhNkUToJcW9nV46v8w87AJOwAJDz84c1CL57n3Stj73FANM/b9TbCUK4YhdOwEyZ+OxhYpdeZDNzSI29Firw=="; + }; + }; + "babel-plugin-dynamic-import-node-2.3.0" = { + name = "babel-plugin-dynamic-import-node"; + packageName = "babel-plugin-dynamic-import-node"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz"; + sha512 = "o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ=="; + }; + }; + "babel-plugin-syntax-object-rest-spread-6.13.0" = { + name = "babel-plugin-syntax-object-rest-spread"; + packageName = "babel-plugin-syntax-object-rest-spread"; + version = "6.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz"; + sha1 = "fd6536f2bce13836ffa3a5458c4903a597bb3bf5"; + }; + }; + "babel-plugin-transform-object-rest-spread-6.26.0" = { + name = "babel-plugin-transform-object-rest-spread"; + packageName = "babel-plugin-transform-object-rest-spread"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz"; + sha1 = "0f36692d50fef6b7e2d4b3ac1478137a963b7b06"; + }; + }; "babel-runtime-6.18.0" = { name = "babel-runtime"; packageName = "babel-runtime"; @@ -364,6 +1633,24 @@ let sha1 = "0f4177ffd98492ef13b9f823e9994a02584c9078"; }; }; + "babel-runtime-6.26.0" = { + name = "babel-runtime"; + packageName = "babel-runtime"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"; + sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; + }; + }; + "babylon-6.18.0" = { + name = "babylon"; + packageName = "babylon"; + version = "6.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz"; + sha512 = "q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="; + }; + }; "balanced-match-1.0.0" = { name = "balanced-match"; packageName = "balanced-match"; @@ -382,6 +1669,15 @@ let sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; }; }; + "base64-js-1.3.1" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz"; + sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; + }; + }; "batch-0.6.1" = { name = "batch"; packageName = "batch"; @@ -400,6 +1696,24 @@ let sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; + "big.js-3.2.0" = { + name = "big.js"; + packageName = "big.js"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz"; + sha512 = "+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="; + }; + }; + "big.js-5.2.2" = { + name = "big.js"; + packageName = "big.js"; + version = "5.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"; + sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; + }; + }; "binary-0.3.0" = { name = "binary"; packageName = "binary"; @@ -409,6 +1723,15 @@ let sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79"; }; }; + "binary-extensions-1.13.1" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "1.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz"; + sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; + }; + }; "binary-extensions-2.0.0" = { name = "binary-extensions"; packageName = "binary-extensions"; @@ -418,6 +1741,15 @@ let sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow=="; }; }; + "bindings-1.5.0" = { + name = "bindings"; + packageName = "bindings"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"; + sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; + }; + }; "binwrap-0.2.2" = { name = "binwrap"; packageName = "binwrap"; @@ -436,6 +1768,15 @@ let sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; }; + "bn.js-4.11.8" = { + name = "bn.js"; + packageName = "bn.js"; + version = "4.11.8"; + src = fetchurl { + url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz"; + sha512 = "ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="; + }; + }; "body-parser-1.18.2" = { name = "body-parser"; packageName = "body-parser"; @@ -454,6 +1795,24 @@ let sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; }; + "bonjour-3.5.0" = { + name = "bonjour"; + packageName = "bonjour"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz"; + sha1 = "8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"; + }; + }; + "boolbase-1.0.0" = { + name = "boolbase"; + packageName = "boolbase"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"; + sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; + }; + }; "brace-expansion-1.1.11" = { name = "brace-expansion"; packageName = "brace-expansion"; @@ -481,6 +1840,96 @@ let sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; }; + "brorand-1.1.0" = { + name = "brorand"; + packageName = "brorand"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"; + sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; + }; + }; + "browserify-aes-1.2.0" = { + name = "browserify-aes"; + packageName = "browserify-aes"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"; + sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA=="; + }; + }; + "browserify-cipher-1.0.1" = { + name = "browserify-cipher"; + packageName = "browserify-cipher"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; + sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="; + }; + }; + "browserify-des-1.0.2" = { + name = "browserify-des"; + packageName = "browserify-des"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz"; + sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; + }; + }; + "browserify-rsa-4.0.1" = { + name = "browserify-rsa"; + packageName = "browserify-rsa"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; + sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; + }; + }; + "browserify-sign-4.0.4" = { + name = "browserify-sign"; + packageName = "browserify-sign"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz"; + sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; + }; + }; + "browserify-zlib-0.2.0" = { + name = "browserify-zlib"; + packageName = "browserify-zlib"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; + sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; + }; + }; + "browserslist-3.2.8" = { + name = "browserslist"; + packageName = "browserslist"; + version = "3.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz"; + sha512 = "WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ=="; + }; + }; + "browserslist-4.1.1" = { + name = "browserslist"; + packageName = "browserslist"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.1.1.tgz"; + sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; + }; + }; + "browserslist-4.11.1" = { + name = "browserslist"; + packageName = "browserslist"; + version = "4.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.11.1.tgz"; + sha512 = "DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g=="; + }; + }; "bser-2.1.1" = { name = "bser"; packageName = "bser"; @@ -490,6 +1939,42 @@ let sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ=="; }; }; + "buffer-4.9.2" = { + name = "buffer"; + packageName = "buffer"; + version = "4.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz"; + sha512 = "xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg=="; + }; + }; + "buffer-from-1.1.1" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + }; + }; + "buffer-indexof-1.1.1" = { + name = "buffer-indexof"; + packageName = "buffer-indexof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; + sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="; + }; + }; + "buffer-xor-1.0.3" = { + name = "buffer-xor"; + packageName = "buffer-xor"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"; + sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; + }; + }; "buffers-0.1.1" = { name = "buffers"; packageName = "buffers"; @@ -499,6 +1984,15 @@ let sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"; }; }; + "builtin-status-codes-3.0.0" = { + name = "builtin-status-codes"; + packageName = "builtin-status-codes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; + sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; + }; + }; "bytes-3.0.0" = { name = "bytes"; packageName = "bytes"; @@ -517,6 +2011,24 @@ let sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; }; + "cacache-10.0.4" = { + name = "cacache"; + packageName = "cacache"; + version = "10.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz"; + sha512 = "Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA=="; + }; + }; + "cacache-12.0.4" = { + name = "cacache"; + packageName = "cacache"; + version = "12.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz"; + sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="; + }; + }; "cache-base-1.0.1" = { name = "cache-base"; packageName = "cache-base"; @@ -526,13 +2038,13 @@ let sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; }; }; - "cacheable-lookup-2.0.0" = { + "cacheable-lookup-2.0.1" = { name = "cacheable-lookup"; packageName = "cacheable-lookup"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.0.tgz"; - sha512 = "s2piO6LvA7xnL1AR03wuEdSx3BZT3tIJpZ56/lcJwzO/6DTJZlTs7X3lrvPxk6d1PlDe6PrVe2TjlUIZNFglAQ=="; + url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.1.tgz"; + sha512 = "EMMbsiOTcdngM/K6gV/OxF2x0t07+vMOWxZNSCRQMjO2MY2nhZQ6OYhOOpyQrbhqsgtvKGI7hcq6xjnA92USjg=="; }; }; "cacheable-request-2.1.4" = { @@ -553,6 +2065,60 @@ let sha512 = "lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw=="; }; }; + "call-me-maybe-1.0.1" = { + name = "call-me-maybe"; + packageName = "call-me-maybe"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz"; + sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; + }; + }; + "caller-callsite-2.0.0" = { + name = "caller-callsite"; + packageName = "caller-callsite"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz"; + sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; + }; + }; + "caller-path-2.0.0" = { + name = "caller-path"; + packageName = "caller-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz"; + sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; + }; + }; + "callsites-2.0.0" = { + name = "callsites"; + packageName = "callsites"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz"; + sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; + }; + }; + "camel-case-4.1.1" = { + name = "camel-case"; + packageName = "camel-case"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz"; + sha512 = "7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q=="; + }; + }; + "camelcase-3.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; + }; + }; "camelcase-5.3.1" = { name = "camelcase"; packageName = "camelcase"; @@ -562,6 +2128,24 @@ let sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; + "caniuse-api-3.0.0" = { + name = "caniuse-api"; + packageName = "caniuse-api"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz"; + sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; + }; + }; + "caniuse-lite-1.0.30001039" = { + name = "caniuse-lite"; + packageName = "caniuse-lite"; + version = "1.0.30001039"; + src = fetchurl { + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001039.tgz"; + sha512 = "SezbWCTT34eyFoWHgx8UWso7YtvtM7oosmFoXbCkdC6qJzRfBTeTgE9REtKtiuKXuMwWTZEvdnFNGAyVMorv8Q=="; + }; + }; "capture-exit-2.0.0" = { name = "capture-exit"; packageName = "capture-exit"; @@ -571,6 +2155,15 @@ let sha512 = "PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g=="; }; }; + "case-sensitive-paths-webpack-plugin-2.3.0" = { + name = "case-sensitive-paths-webpack-plugin"; + packageName = "case-sensitive-paths-webpack-plugin"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz"; + sha512 = "/4YgnZS8y1UXXmC02xD5rRrBEu6T5ub+mQHLNRj0fzTRbgdBYhsNo2V5EqwgqrExjxsjtF/OpAKAMkKsxbD5XQ=="; + }; + }; "caseless-0.12.0" = { name = "caseless"; packageName = "caseless"; @@ -607,6 +2200,15 @@ let sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; + "chalk-2.4.1" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz"; + sha512 = "ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ=="; + }; + }; "chalk-2.4.2" = { name = "chalk"; packageName = "chalk"; @@ -625,6 +2227,15 @@ let sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; }; }; + "chardet-0.7.0" = { + name = "chardet"; + packageName = "chardet"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"; + sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; + }; + }; "charenc-0.0.2" = { name = "charenc"; packageName = "charenc"; @@ -634,6 +2245,15 @@ let sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; }; }; + "chokidar-2.1.8" = { + name = "chokidar"; + packageName = "chokidar"; + version = "2.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz"; + sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg=="; + }; + }; "chokidar-3.0.2" = { name = "chokidar"; packageName = "chokidar"; @@ -670,6 +2290,24 @@ let sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; + "chrome-trace-event-1.0.2" = { + name = "chrome-trace-event"; + packageName = "chrome-trace-event"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz"; + sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ=="; + }; + }; + "cipher-base-1.0.4" = { + name = "cipher-base"; + packageName = "cipher-base"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"; + sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q=="; + }; + }; "class-utils-0.3.6" = { name = "class-utils"; packageName = "class-utils"; @@ -679,6 +2317,60 @@ let sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; }; }; + "clean-css-4.2.3" = { + name = "clean-css"; + packageName = "clean-css"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz"; + sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; + }; + }; + "cli-cursor-2.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + }; + "cli-table-0.3.1" = { + name = "cli-table"; + packageName = "cli-table"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz"; + sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"; + }; + }; + "cli-width-2.2.0" = { + name = "cli-width"; + packageName = "cli-width"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz"; + sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + }; + }; + "cliui-3.2.0" = { + name = "cliui"; + packageName = "cliui"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; + sha1 = "120601537a916d29940f934da3b48d585a39213d"; + }; + }; + "cliui-4.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz"; + sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ=="; + }; + }; "cliui-5.0.0" = { name = "cliui"; packageName = "cliui"; @@ -706,6 +2398,24 @@ let sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; }; }; + "coa-2.0.2" = { + name = "coa"; + packageName = "coa"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz"; + sha512 = "q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA=="; + }; + }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; "collection-visit-1.0.0" = { name = "collection-visit"; packageName = "collection-visit"; @@ -715,6 +2425,15 @@ let sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; }; }; + "color-3.1.2" = { + name = "color"; + packageName = "color"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/color/-/color-3.1.2.tgz"; + sha512 = "vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg=="; + }; + }; "color-convert-1.9.3" = { name = "color-convert"; packageName = "color-convert"; @@ -751,6 +2470,33 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; + "color-string-1.5.3" = { + name = "color-string"; + packageName = "color-string"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz"; + sha512 = "dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw=="; + }; + }; + "colors-1.0.3" = { + name = "colors"; + packageName = "colors"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; + sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; + }; + }; + "colors-1.4.0" = { + name = "colors"; + packageName = "colors"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"; + sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; + }; + }; "combined-stream-1.0.8" = { name = "combined-stream"; packageName = "combined-stream"; @@ -760,6 +2506,15 @@ let sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; + "commander-2.14.1" = { + name = "commander"; + packageName = "commander"; + version = "2.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz"; + sha512 = "+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="; + }; + }; "commander-2.17.1" = { name = "commander"; packageName = "commander"; @@ -769,6 +2524,15 @@ let sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="; }; }; + "commander-2.20.3" = { + name = "commander"; + packageName = "commander"; + version = "2.20.3"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; + sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; + }; + }; "commander-3.0.2" = { name = "commander"; packageName = "commander"; @@ -778,6 +2542,33 @@ let sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow=="; }; }; + "commander-4.1.1" = { + name = "commander"; + packageName = "commander"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz"; + sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; + }; + }; + "common-tags-1.8.0" = { + name = "common-tags"; + packageName = "common-tags"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz"; + sha512 = "6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw=="; + }; + }; + "commondir-1.0.1" = { + name = "commondir"; + packageName = "commondir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"; + sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; + }; + }; "compare-versions-3.6.0" = { name = "compare-versions"; packageName = "compare-versions"; @@ -796,6 +2587,24 @@ let sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; }; }; + "compressible-2.0.18" = { + name = "compressible"; + packageName = "compressible"; + version = "2.0.18"; + src = fetchurl { + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"; + sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="; + }; + }; + "compression-1.7.4" = { + name = "compression"; + packageName = "compression"; + version = "1.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"; + sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; + }; + }; "concat-map-0.0.1" = { name = "concat-map"; packageName = "concat-map"; @@ -814,6 +2623,15 @@ let sha1 = "708978624d856af41a5a741defdd261da752c266"; }; }; + "concat-stream-1.6.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; + }; + }; "config-chain-1.1.12" = { name = "config-chain"; packageName = "config-chain"; @@ -823,6 +2641,33 @@ let sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; }; }; + "connect-history-api-fallback-1.6.0" = { + name = "connect-history-api-fallback"; + packageName = "connect-history-api-fallback"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"; + sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="; + }; + }; + "console-browserify-1.2.0" = { + name = "console-browserify"; + packageName = "console-browserify"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz"; + sha512 = "ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="; + }; + }; + "constants-browserify-1.0.0" = { + name = "constants-browserify"; + packageName = "constants-browserify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz"; + sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; + }; + }; "content-disposition-0.5.2" = { name = "content-disposition"; packageName = "content-disposition"; @@ -850,6 +2695,15 @@ let sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; + "convert-source-map-1.7.0" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz"; + sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA=="; + }; + }; "cookie-0.3.1" = { name = "cookie"; packageName = "cookie"; @@ -877,6 +2731,15 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; + "copy-concurrently-1.0.5" = { + name = "copy-concurrently"; + packageName = "copy-concurrently"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; + sha512 = "f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A=="; + }; + }; "copy-descriptor-0.1.1" = { name = "copy-descriptor"; packageName = "copy-descriptor"; @@ -886,6 +2749,15 @@ let sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; }; }; + "copy-webpack-plugin-5.1.1" = { + name = "copy-webpack-plugin"; + packageName = "copy-webpack-plugin"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz"; + sha512 = "P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg=="; + }; + }; "core-js-2.6.11" = { name = "core-js"; packageName = "core-js"; @@ -913,6 +2785,51 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; + "cosmiconfig-2.2.2" = { + name = "cosmiconfig"; + packageName = "cosmiconfig"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz"; + sha512 = "GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A=="; + }; + }; + "cosmiconfig-5.2.1" = { + name = "cosmiconfig"; + packageName = "cosmiconfig"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; + sha512 = "H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA=="; + }; + }; + "create-ecdh-4.0.3" = { + name = "create-ecdh"; + packageName = "create-ecdh"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz"; + sha512 = "GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw=="; + }; + }; + "create-hash-1.2.0" = { + name = "create-hash"; + packageName = "create-hash"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz"; + sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg=="; + }; + }; + "create-hmac-1.1.7" = { + name = "create-hmac"; + packageName = "create-hmac"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz"; + sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; + }; + }; "crocks-0.12.1" = { name = "crocks"; packageName = "crocks"; @@ -967,6 +2884,15 @@ let sha512 = "u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg=="; }; }; + "cross-spawn-7.0.2" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz"; + sha512 = "PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw=="; + }; + }; "crypt-0.0.2" = { name = "crypt"; packageName = "crypt"; @@ -976,6 +2902,195 @@ let sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; }; }; + "crypto-browserify-3.12.0" = { + name = "crypto-browserify"; + packageName = "crypto-browserify"; + version = "3.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; + sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg=="; + }; + }; + "css-color-names-0.0.4" = { + name = "css-color-names"; + packageName = "css-color-names"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz"; + sha1 = "808adc2e79cf84738069b646cb20ec27beb629e0"; + }; + }; + "css-declaration-sorter-4.0.1" = { + name = "css-declaration-sorter"; + packageName = "css-declaration-sorter"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz"; + sha512 = "BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA=="; + }; + }; + "css-loader-3.4.2" = { + name = "css-loader"; + packageName = "css-loader"; + version = "3.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/css-loader/-/css-loader-3.4.2.tgz"; + sha512 = "jYq4zdZT0oS0Iykt+fqnzVLRIeiPWhka+7BqPn+oSIpWJAHak5tmB/WZrJ2a21JhCeFyNnnlroSl8c+MtVndzA=="; + }; + }; + "css-select-1.2.0" = { + name = "css-select"; + packageName = "css-select"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz"; + sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858"; + }; + }; + "css-select-2.1.0" = { + name = "css-select"; + packageName = "css-select"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz"; + sha512 = "Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ=="; + }; + }; + "css-select-base-adapter-0.1.1" = { + name = "css-select-base-adapter"; + packageName = "css-select-base-adapter"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz"; + sha512 = "jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="; + }; + }; + "css-tree-1.0.0-alpha.37" = { + name = "css-tree"; + packageName = "css-tree"; + version = "1.0.0-alpha.37"; + src = fetchurl { + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz"; + sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; + }; + }; + "css-tree-1.0.0-alpha.39" = { + name = "css-tree"; + packageName = "css-tree"; + version = "1.0.0-alpha.39"; + src = fetchurl { + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz"; + sha512 = "7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA=="; + }; + }; + "css-what-2.1.3" = { + name = "css-what"; + packageName = "css-what"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz"; + sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="; + }; + }; + "css-what-3.2.1" = { + name = "css-what"; + packageName = "css-what"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css-what/-/css-what-3.2.1.tgz"; + sha512 = "WwOrosiQTvyms+Ti5ZC5vGEK0Vod3FTt1ca+payZqvKuGJF+dq7bG63DstxtN0dpm6FxY27a/zS3Wten+gEtGw=="; + }; + }; + "cssesc-3.0.0" = { + name = "cssesc"; + packageName = "cssesc"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"; + sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; + }; + }; + "cssnano-4.1.10" = { + name = "cssnano"; + packageName = "cssnano"; + version = "4.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz"; + sha512 = "5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ=="; + }; + }; + "cssnano-preset-default-4.0.7" = { + name = "cssnano-preset-default"; + packageName = "cssnano-preset-default"; + version = "4.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz"; + sha512 = "x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA=="; + }; + }; + "cssnano-util-get-arguments-4.0.0" = { + name = "cssnano-util-get-arguments"; + packageName = "cssnano-util-get-arguments"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz"; + sha1 = "ed3a08299f21d75741b20f3b81f194ed49cc150f"; + }; + }; + "cssnano-util-get-match-4.0.0" = { + name = "cssnano-util-get-match"; + packageName = "cssnano-util-get-match"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz"; + sha1 = "c0e4ca07f5386bb17ec5e52250b4f5961365156d"; + }; + }; + "cssnano-util-raw-cache-4.0.1" = { + name = "cssnano-util-raw-cache"; + packageName = "cssnano-util-raw-cache"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz"; + sha512 = "qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA=="; + }; + }; + "cssnano-util-same-parent-4.0.1" = { + name = "cssnano-util-same-parent"; + packageName = "cssnano-util-same-parent"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz"; + sha512 = "WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="; + }; + }; + "csso-4.0.3" = { + name = "csso"; + packageName = "csso"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz"; + sha512 = "NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ=="; + }; + }; + "cycle-1.0.3" = { + name = "cycle"; + packageName = "cycle"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; + sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; + }; + }; + "cyclist-1.0.1" = { + name = "cyclist"; + packageName = "cyclist"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz"; + sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9"; + }; + }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -1003,6 +3118,15 @@ let sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; }; }; + "debug-4.1.1" = { + name = "debug"; + packageName = "debug"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; + sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; + }; + }; "decamelize-1.2.0" = { name = "decamelize"; packageName = "decamelize"; @@ -1039,6 +3163,24 @@ let sha512 = "TLZWWybuxWgoW7Lykv+gq9xvzOsUjQ9tF09Tj6NSTYGMTCHNXzrPnD6Hi+TgZq19PyTAGH4Ll/NIM/eTGglnMw=="; }; }; + "deep-equal-0.2.2" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz"; + sha1 = "84b745896f34c684e98f2ce0e42abaf43bba017d"; + }; + }; + "deep-equal-1.1.1" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz"; + sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; + }; + }; "deep-extend-0.6.0" = { name = "deep-extend"; packageName = "deep-extend"; @@ -1102,6 +3244,15 @@ let sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; }; }; + "del-4.1.1" = { + name = "del"; + packageName = "del"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/del/-/del-4.1.1.tgz"; + sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ=="; + }; + }; "delayed-stream-1.0.0" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -1129,6 +3280,15 @@ let sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; }; }; + "des.js-1.0.1" = { + name = "des.js"; + packageName = "des.js"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz"; + sha512 = "Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA=="; + }; + }; "destroy-1.0.4" = { name = "destroy"; packageName = "destroy"; @@ -1138,6 +3298,42 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; + "detect-node-2.0.4" = { + name = "detect-node"; + packageName = "detect-node"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz"; + sha512 = "ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw=="; + }; + }; + "detect-port-alt-1.1.6" = { + name = "detect-port-alt"; + packageName = "detect-port-alt"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz"; + sha512 = "5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q=="; + }; + }; + "diffie-hellman-5.0.3" = { + name = "diffie-hellman"; + packageName = "diffie-hellman"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; + sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="; + }; + }; + "dir-glob-2.2.2" = { + name = "dir-glob"; + packageName = "dir-glob"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz"; + sha512 = "f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw=="; + }; + }; "dir-glob-3.0.1" = { name = "dir-glob"; packageName = "dir-glob"; @@ -1147,6 +3343,141 @@ let sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; }; }; + "dns-equal-1.0.0" = { + name = "dns-equal"; + packageName = "dns-equal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz"; + sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d"; + }; + }; + "dns-packet-1.3.1" = { + name = "dns-packet"; + packageName = "dns-packet"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz"; + sha512 = "0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg=="; + }; + }; + "dns-txt-2.0.2" = { + name = "dns-txt"; + packageName = "dns-txt"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz"; + sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; + }; + }; + "dom-converter-0.2.0" = { + name = "dom-converter"; + packageName = "dom-converter"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz"; + sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA=="; + }; + }; + "dom-serializer-0.2.2" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz"; + sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; + }; + }; + "domain-browser-1.2.0" = { + name = "domain-browser"; + packageName = "domain-browser"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz"; + sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="; + }; + }; + "domelementtype-1.3.1" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz"; + sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; + }; + }; + "domelementtype-2.0.1" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz"; + sha512 = "5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ=="; + }; + }; + "domhandler-2.4.2" = { + name = "domhandler"; + packageName = "domhandler"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz"; + sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="; + }; + }; + "domutils-1.5.1" = { + name = "domutils"; + packageName = "domutils"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; + sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; + }; + }; + "domutils-1.7.0" = { + name = "domutils"; + packageName = "domutils"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz"; + sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; + }; + }; + "dot-case-3.0.3" = { + name = "dot-case"; + packageName = "dot-case"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-case/-/dot-case-3.0.3.tgz"; + sha512 = "7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA=="; + }; + }; + "dot-prop-5.2.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz"; + sha512 = "uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A=="; + }; + }; + "dotenv-5.0.1" = { + name = "dotenv"; + packageName = "dotenv"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz"; + sha512 = "4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow=="; + }; + }; + "duplexer-0.1.1" = { + name = "duplexer"; + packageName = "duplexer"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; + sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + }; + }; "duplexer3-0.1.4" = { name = "duplexer3"; packageName = "duplexer3"; @@ -1156,6 +3487,15 @@ let sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; }; }; + "duplexify-3.7.1" = { + name = "duplexify"; + packageName = "duplexify"; + version = "3.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz"; + sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; + }; + }; "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; @@ -1174,6 +3514,24 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; + "electron-to-chromium-1.3.397" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.3.397"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.397.tgz"; + sha512 = "zcUd1p/7yzTSdWkCTrqGvbnEOASy96d0RJL/lc5BDJoO23Z3G/VHd0yIPbguDU9n8QNUTCigLO7oEdtOb7fp2A=="; + }; + }; + "elliptic-6.5.2" = { + name = "elliptic"; + packageName = "elliptic"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz"; + sha512 = "f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw=="; + }; + }; "elm-0.19.1" = { name = "elm"; packageName = "elm"; @@ -1183,6 +3541,15 @@ let sha512 = "rehOtJKZvoYDddlrd7AX5NAf0H+LUllnBg3AHaeaIOKWzw4W316d7Bkhlbo7aSG+hVUVWP2ihKwyYkDi589TfA=="; }; }; + "elm-0.19.1-3" = { + name = "elm"; + packageName = "elm"; + version = "0.19.1-3"; + src = fetchurl { + url = "https://registry.npmjs.org/elm/-/elm-0.19.1-3.tgz"; + sha512 = "6y36ewCcVmTOx8lj7cKJs3bhI5qMfoVEigePZ9PhEUNKpwjjML/pU2u2YSpHVAznuCcojoF6KIsrS1Ci7GtVaQ=="; + }; + }; "elm-analyse-git://github.com/elm-tooling/elm-analyse#1a665a6e540d7d11b29b3c5e3c52089704325d9c" = { name = "elm-analyse"; packageName = "elm-analyse"; @@ -1193,6 +3560,15 @@ let sha256 = "a442bce37ae37a65c1488c66e477c404da1c7f137a6668d89c4b09de845ca374"; }; }; + "elm-asset-webpack-loader-1.1.2" = { + name = "elm-asset-webpack-loader"; + packageName = "elm-asset-webpack-loader"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-asset-webpack-loader/-/elm-asset-webpack-loader-1.1.2.tgz"; + sha512 = "jrXYtxk13LXtbxCiT23+RuNhUgbJgGBRW2sCqkMGojTZTFKttL1E8mSUvsIuomUiKLJOSXUZb3HjvwXNkJjTNA=="; + }; + }; "elm-hot-1.1.4" = { name = "elm-hot"; packageName = "elm-hot"; @@ -1202,6 +3578,15 @@ let sha512 = "qPDP/o/Fkifriaxaf3E7hHFB5L6Ijihyg8is4A6xna6/h/zebUiNssbQrxywI2oxNUkr6W/leEu/WlIC1tmVnw=="; }; }; + "elm-hot-webpack-loader-1.1.6" = { + name = "elm-hot-webpack-loader"; + packageName = "elm-hot-webpack-loader"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-hot-webpack-loader/-/elm-hot-webpack-loader-1.1.6.tgz"; + sha512 = "fY+36uG8/h/PvlO2HZSXBa6qGNkVCwn+QjoL/5WWHOocf7EfYAYFgJlWQqsgNQi/eYO4/dt/OglRuSsFfkFvtA=="; + }; + }; "elm-test-0.19.1" = { name = "elm-test"; packageName = "elm-test"; @@ -1211,6 +3596,24 @@ let sha512 = "SyZgZ/hxq62budS3k0M1Qj1E8fIRvldSxFSm4XfzE6qRRuHAT2a82fxprZRZl1yG2GwnImGmhuKH5hSyjPpzjA=="; }; }; + "elm-test-0.19.1-revision2" = { + name = "elm-test"; + packageName = "elm-test"; + version = "0.19.1-revision2"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision2.tgz"; + sha512 = "zVs2mVeyIE+K9y7/8b333h5xRMDWAoqbBDm7ThLDhyTi7ICxeL3t5uOS4KZCrRk9+4sP6+voSbcBlgr46Q+GiQ=="; + }; + }; + "elm-webpack-loader-6.0.0" = { + name = "elm-webpack-loader"; + packageName = "elm-webpack-loader"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-webpack-loader/-/elm-webpack-loader-6.0.0.tgz"; + sha512 = "g5eKUo/F8ixHtXU4hf9mTtA4IzJ9yOHfwH1/C9Mo3mfkiz23UFaXtbGvEILa+8jLGFRTp8wuVtKcC5fuhCnSMA=="; + }; + }; "elmi-to-json-1.2.0" = { name = "elmi-to-json"; packageName = "elmi-to-json"; @@ -1247,6 +3650,24 @@ let sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; }; + "emojis-list-2.1.0" = { + name = "emojis-list"; + packageName = "emojis-list"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz"; + sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; + }; + }; + "emojis-list-3.0.0" = { + name = "emojis-list"; + packageName = "emojis-list"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz"; + sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="; + }; + }; "encodeurl-1.0.2" = { name = "encodeurl"; packageName = "encodeurl"; @@ -1265,13 +3686,58 @@ let sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; - "es-abstract-1.17.4" = { + "enhanced-resolve-4.1.1" = { + name = "enhanced-resolve"; + packageName = "enhanced-resolve"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz"; + sha512 = "98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA=="; + }; + }; + "entities-1.1.2" = { + name = "entities"; + packageName = "entities"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz"; + sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; + }; + }; + "entities-2.0.0" = { + name = "entities"; + packageName = "entities"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz"; + sha512 = "D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw=="; + }; + }; + "errno-0.1.7" = { + name = "errno"; + packageName = "errno"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz"; + sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg=="; + }; + }; + "error-ex-1.3.2" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; + }; + }; + "es-abstract-1.17.5" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.17.4"; + version = "1.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz"; - sha512 = "Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz"; + sha512 = "BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg=="; }; }; "es-to-primitive-1.2.1" = { @@ -1310,6 +3776,51 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; + "escape-string-regexp-2.0.0" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; + sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="; + }; + }; + "eslint-scope-4.0.3" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz"; + sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg=="; + }; + }; + "esprima-4.0.1" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; + }; + }; + "esrecurse-4.2.1" = { + name = "esrecurse"; + packageName = "esrecurse"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz"; + sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ=="; + }; + }; + "estraverse-4.3.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; + }; + }; "etag-1.8.1" = { name = "etag"; packageName = "etag"; @@ -1328,6 +3839,51 @@ let sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="; }; }; + "eventemitter3-4.0.0" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz"; + sha512 = "qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg=="; + }; + }; + "events-3.1.0" = { + name = "events"; + packageName = "events"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/events/-/events-3.1.0.tgz"; + sha512 = "Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg=="; + }; + }; + "eventsource-0.1.6" = { + name = "eventsource"; + packageName = "eventsource"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz"; + sha1 = "0acede849ed7dd1ccc32c811bb11b944d4f29232"; + }; + }; + "eventsource-1.0.7" = { + name = "eventsource"; + packageName = "eventsource"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz"; + sha512 = "4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ=="; + }; + }; + "evp_bytestokey-1.0.3" = { + name = "evp_bytestokey"; + packageName = "evp_bytestokey"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; + sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="; + }; + }; "exec-sh-0.3.4" = { name = "exec-sh"; packageName = "exec-sh"; @@ -1364,6 +3920,15 @@ let sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; }; }; + "expand-tilde-2.0.2" = { + name = "expand-tilde"; + packageName = "expand-tilde"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; + }; + }; "express-4.16.3" = { name = "express"; packageName = "express"; @@ -1427,6 +3992,15 @@ let sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; }; }; + "external-editor-3.1.0" = { + name = "external-editor"; + packageName = "external-editor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"; + sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; + }; + }; "extglob-2.0.4" = { name = "extglob"; packageName = "extglob"; @@ -1445,6 +4019,15 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; + "eyes-0.1.8" = { + name = "eyes"; + packageName = "eyes"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; + sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + }; + }; "fast-deep-equal-3.1.1" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; @@ -1463,6 +4046,15 @@ let sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; }; }; + "fast-glob-2.2.7" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "2.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz"; + sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; + }; + }; "fast-glob-3.2.2" = { name = "fast-glob"; packageName = "fast-glob"; @@ -1481,13 +4073,31 @@ let sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; - "fastq-1.6.1" = { + "fastq-1.7.0" = { name = "fastq"; packageName = "fastq"; - version = "1.6.1"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fastq/-/fastq-1.7.0.tgz"; + sha512 = "YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ=="; + }; + }; + "faye-websocket-0.10.0" = { + name = "faye-websocket"; + packageName = "faye-websocket"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"; + sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; + }; + }; + "faye-websocket-0.11.3" = { + name = "faye-websocket"; + packageName = "faye-websocket"; + version = "0.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.6.1.tgz"; - sha512 = "mpIH5sKYueh3YyeJwqtVo8sORi0CgtmkVbK6kZStpQlZBYQuTzG2CZ7idSiJuA7bY0SFCWUc5WIs+oYumGCQNw=="; + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz"; + sha512 = "D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA=="; }; }; "fb-watchman-2.0.1" = { @@ -1499,6 +4109,51 @@ let sha512 = "DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg=="; }; }; + "figgy-pudding-3.5.2" = { + name = "figgy-pudding"; + packageName = "figgy-pudding"; + version = "3.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; + sha512 = "0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw=="; + }; + }; + "figures-2.0.0" = { + name = "figures"; + packageName = "figures"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; + sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + }; + }; + "file-loader-1.1.11" = { + name = "file-loader"; + packageName = "file-loader"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz"; + sha512 = "TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg=="; + }; + }; + "file-uri-to-path-1.0.0" = { + name = "file-uri-to-path"; + packageName = "file-uri-to-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; + }; + }; + "filesize-3.6.1" = { + name = "filesize"; + packageName = "filesize"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz"; + sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="; + }; + }; "fill-range-4.0.0" = { name = "fill-range"; packageName = "fill-range"; @@ -1553,6 +4208,24 @@ let sha1 = "4b73f1ff9e56ad91b76e716407fe5ffe6554bb8c"; }; }; + "find-cache-dir-1.0.0" = { + name = "find-cache-dir"; + packageName = "find-cache-dir"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz"; + sha1 = "9288e3e9e3cc3748717d39eade17cf71fc30ee6f"; + }; + }; + "find-cache-dir-2.1.0" = { + name = "find-cache-dir"; + packageName = "find-cache-dir"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz"; + sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ=="; + }; + }; "find-elm-dependencies-2.0.2" = { name = "find-elm-dependencies"; packageName = "find-elm-dependencies"; @@ -1571,6 +4244,24 @@ let sha1 = "33c44b429ab2b2f0646299c5f9f718f376ff8d54"; }; }; + "find-up-1.1.2" = { + name = "find-up"; + packageName = "find-up"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; + sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; + }; + }; + "find-up-2.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; + sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + }; + }; "find-up-3.0.0" = { name = "find-up"; packageName = "find-up"; @@ -1607,13 +4298,22 @@ let sha512 = "8KcmfI0jgSECnzdhucm0i7vrwef3BWwgjimW2YkRC5eSFwjb5DibVoA0YvgkYwwxuJi9c+7M7X3b3lX8o9B6wg=="; }; }; - "follow-redirects-1.10.0" = { + "flush-write-stream-1.1.1" = { + name = "flush-write-stream"; + packageName = "flush-write-stream"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz"; + sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w=="; + }; + }; + "follow-redirects-1.11.0" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.10.0.tgz"; - sha512 = "4eyLK6s6lH32nOvLLwlIOnr9zrL8Sm+OvW4pVTJNoXeGzYIkHVf+pADQi+OJ0E67hiuSLezPVPyBcIZO50TmmQ=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.11.0.tgz"; + sha512 = "KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA=="; }; }; "for-in-1.0.2" = { @@ -1715,6 +4415,15 @@ let sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA=="; }; }; + "fs-extra-7.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz"; + sha512 = "YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw=="; + }; + }; "fs-extra-8.1.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -1733,6 +4442,24 @@ let sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; }; }; + "fs-readdir-recursive-1.1.0" = { + name = "fs-readdir-recursive"; + packageName = "fs-readdir-recursive"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz"; + sha512 = "GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA=="; + }; + }; + "fs-write-stream-atomic-1.0.10" = { + name = "fs-write-stream-atomic"; + packageName = "fs-write-stream-atomic"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; + sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; + }; + }; "fs.realpath-1.0.0" = { name = "fs.realpath"; packageName = "fs.realpath"; @@ -1742,6 +4469,15 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; + "fsevents-1.2.12" = { + name = "fsevents"; + packageName = "fsevents"; + version = "1.2.12"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.12.tgz"; + sha512 = "Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q=="; + }; + }; "fsevents-2.1.2" = { name = "fsevents"; packageName = "fsevents"; @@ -1760,6 +4496,15 @@ let sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; + "get-caller-file-1.0.3" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz"; + sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; + }; + }; "get-caller-file-2.0.5" = { name = "get-caller-file"; packageName = "get-caller-file"; @@ -1769,6 +4514,15 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; + "get-own-enumerable-property-symbols-3.0.2" = { + name = "get-own-enumerable-property-symbols"; + packageName = "get-own-enumerable-property-symbols"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; + sha512 = "I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="; + }; + }; "get-proxy-2.1.0" = { name = "get-proxy"; packageName = "get-proxy"; @@ -1841,13 +4595,58 @@ let sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; }; }; - "glob-parent-5.1.0" = { + "glob-parent-3.1.0" = { name = "glob-parent"; packageName = "glob-parent"; - version = "5.1.0"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"; + sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + }; + }; + "glob-parent-5.1.1" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; + sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; + }; + }; + "glob-to-regexp-0.3.0" = { + name = "glob-to-regexp"; + packageName = "glob-to-regexp"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz"; + sha1 = "8c5a1494d2066c570cc3bfe4496175acc4d502ab"; + }; + }; + "global-modules-1.0.0" = { + name = "global-modules"; + packageName = "global-modules"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; + sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg=="; + }; + }; + "global-prefix-1.0.2" = { + name = "global-prefix"; + packageName = "global-prefix"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"; + sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; + }; + }; + "globals-11.12.0" = { + name = "globals"; + packageName = "globals"; + version = "11.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz"; - sha512 = "qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw=="; + url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; + sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; "globby-11.0.0" = { @@ -1859,13 +4658,40 @@ let sha512 = "iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg=="; }; }; - "got-10.6.0" = { + "globby-6.1.0" = { + name = "globby"; + packageName = "globby"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; + sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; + }; + }; + "globby-7.1.1" = { + name = "globby"; + packageName = "globby"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz"; + sha1 = "fb2ccff9401f8600945dfada97440cca972b8680"; + }; + }; + "globby-8.0.1" = { + name = "globby"; + packageName = "globby"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz"; + sha512 = "oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw=="; + }; + }; + "got-10.7.0" = { name = "got"; packageName = "got"; - version = "10.6.0"; + version = "10.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-10.6.0.tgz"; - sha512 = "3LIdJNTdCFbbJc+h/EH0V5lpNpbJ6Bfwykk21lcQvQsEcrzdi/ltCyQehFHLzJ/ka0UMH4Slg0hkYvAZN9qUDg=="; + url = "https://registry.npmjs.org/got/-/got-10.7.0.tgz"; + sha512 = "aWTDeNw9g+XqEZNcTjMMZSy7B7yE9toWOFYip7ofFTLleJhvZwUxxTxkTpKvF+p1SAA4VHmuEy7PiHTHyq8tJg=="; }; }; "got-8.3.2" = { @@ -1886,6 +4712,24 @@ let sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="; }; }; + "gzip-size-5.0.0" = { + name = "gzip-size"; + packageName = "gzip-size"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gzip-size/-/gzip-size-5.0.0.tgz"; + sha512 = "5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA=="; + }; + }; + "handle-thing-2.0.1" = { + name = "handle-thing"; + packageName = "handle-thing"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz"; + sha512 = "9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="; + }; + }; "har-schema-2.0.0" = { name = "har-schema"; packageName = "har-schema"; @@ -2003,6 +4847,141 @@ let sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; + "hash-base-3.0.4" = { + name = "hash-base"; + packageName = "hash-base"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz"; + sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; + }; + }; + "hash.js-1.1.7" = { + name = "hash.js"; + packageName = "hash.js"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz"; + sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; + }; + }; + "he-1.2.0" = { + name = "he"; + packageName = "he"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; + sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; + }; + }; + "hex-color-regex-1.1.0" = { + name = "hex-color-regex"; + packageName = "hex-color-regex"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz"; + sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="; + }; + }; + "hmac-drbg-1.0.1" = { + name = "hmac-drbg"; + packageName = "hmac-drbg"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; + sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; + }; + }; + "homedir-polyfill-1.0.3" = { + name = "homedir-polyfill"; + packageName = "homedir-polyfill"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; + }; + }; + "hosted-git-info-2.8.8" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.8.8"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; + sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="; + }; + }; + "hpack.js-2.1.6" = { + name = "hpack.js"; + packageName = "hpack.js"; + version = "2.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz"; + sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2"; + }; + }; + "hsl-regex-1.0.0" = { + name = "hsl-regex"; + packageName = "hsl-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz"; + sha1 = "d49330c789ed819e276a4c0d272dffa30b18fe6e"; + }; + }; + "hsla-regex-1.0.0" = { + name = "hsla-regex"; + packageName = "hsla-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz"; + sha1 = "c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"; + }; + }; + "html-comment-regex-1.1.2" = { + name = "html-comment-regex"; + packageName = "html-comment-regex"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz"; + sha512 = "P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ=="; + }; + }; + "html-entities-1.2.1" = { + name = "html-entities"; + packageName = "html-entities"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz"; + sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; + }; + }; + "html-minifier-terser-5.0.5" = { + name = "html-minifier-terser"; + packageName = "html-minifier-terser"; + version = "5.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.0.5.tgz"; + sha512 = "cBSFFghQh/uHcfSiL42KxxIRMF7A144+3E44xdlctIjxEmkEfCvouxNyFH2wysXk1fCGBPwtcr3hDWlGTfkDew=="; + }; + }; + "html-webpack-plugin-4.0.4" = { + name = "html-webpack-plugin"; + packageName = "html-webpack-plugin"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.0.4.tgz"; + sha512 = "BREQzUbFfIQS39KqxkT2L1Ot0tuu1isako1CaCQLrgEQ43zi2ScHAe3SMTnVBWsStnIsGtl8jprDdxwZkNhrwQ=="; + }; + }; + "htmlparser2-3.10.1" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "3.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz"; + sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="; + }; + }; "http-cache-semantics-3.8.1" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; @@ -2021,6 +5000,15 @@ let sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; }; }; + "http-deceiver-1.2.7" = { + name = "http-deceiver"; + packageName = "http-deceiver"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz"; + sha1 = "fa7168944ab9a519d337cb0bec7284dc3e723d87"; + }; + }; "http-errors-1.6.2" = { name = "http-errors"; packageName = "http-errors"; @@ -2057,6 +5045,15 @@ let sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; }; }; + "http-parser-js-0.4.10" = { + name = "http-parser-js"; + packageName = "http-parser-js"; + version = "0.4.10"; + src = fetchurl { + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz"; + sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4"; + }; + }; "http-proxy-1.17.0" = { name = "http-proxy"; packageName = "http-proxy"; @@ -2066,6 +5063,33 @@ let sha512 = "Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g=="; }; }; + "http-proxy-1.18.0" = { + name = "http-proxy"; + packageName = "http-proxy"; + version = "1.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz"; + sha512 = "84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ=="; + }; + }; + "http-proxy-middleware-0.19.1" = { + name = "http-proxy-middleware"; + packageName = "http-proxy-middleware"; + version = "0.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz"; + sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; + }; + }; + "http-proxy-middleware-0.20.0" = { + name = "http-proxy-middleware"; + packageName = "http-proxy-middleware"; + version = "0.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.20.0.tgz"; + sha512 = "dNJAk71nEJhPiAczQH9hGvE/MT9kEs+zn2Dh+Hi94PGZe1GluQirC7mw5rdREUtWx6qGS1Gu0bZd4qEAg+REgw=="; + }; + }; "http-signature-1.2.0" = { name = "http-signature"; packageName = "http-signature"; @@ -2075,6 +5099,15 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; + "https-browserify-1.0.0" = { + name = "https-browserify"; + packageName = "https-browserify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz"; + sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; + }; + }; "human-signals-1.1.1" = { name = "human-signals"; packageName = "human-signals"; @@ -2084,6 +5117,15 @@ let sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="; }; }; + "i-0.3.6" = { + name = "i"; + packageName = "i"; + version = "0.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/i/-/i-0.3.6.tgz"; + sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d"; + }; + }; "iconv-lite-0.4.19" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -2102,6 +5144,42 @@ let sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; + "icss-utils-4.1.1" = { + name = "icss-utils"; + packageName = "icss-utils"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz"; + sha512 = "4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA=="; + }; + }; + "ieee754-1.1.13" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz"; + sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; + }; + }; + "iferr-0.1.5" = { + name = "iferr"; + packageName = "iferr"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz"; + sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; + }; + }; + "ignore-3.3.10" = { + name = "ignore"; + packageName = "ignore"; + version = "3.3.10"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz"; + sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="; + }; + }; "ignore-5.1.4" = { name = "ignore"; packageName = "ignore"; @@ -2111,6 +5189,60 @@ let sha512 = "MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A=="; }; }; + "immer-1.7.2" = { + name = "immer"; + packageName = "immer"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/immer/-/immer-1.7.2.tgz"; + sha512 = "4Urocwu9+XLDJw4Tc6ZCg7APVjjLInCFvO4TwGsAYV5zT6YYSor14dsZR0+0tHlDIN92cFUOq+i7fC00G5vTxA=="; + }; + }; + "import-fresh-2.0.0" = { + name = "import-fresh"; + packageName = "import-fresh"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz"; + sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; + }; + }; + "import-local-2.0.0" = { + name = "import-local"; + packageName = "import-local"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz"; + sha512 = "b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ=="; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; + "indexes-of-1.0.1" = { + name = "indexes-of"; + packageName = "indexes-of"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz"; + sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607"; + }; + }; + "infer-owner-1.0.4" = { + name = "infer-owner"; + packageName = "infer-owner"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz"; + sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; + }; + }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -2120,6 +5252,15 @@ let sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; }; }; + "inherits-2.0.1" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + }; "inherits-2.0.3" = { name = "inherits"; packageName = "inherits"; @@ -2147,6 +5288,15 @@ let sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; }; }; + "inquirer-6.2.0" = { + name = "inquirer"; + packageName = "inquirer"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-6.2.0.tgz"; + sha512 = "QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg=="; + }; + }; "internal-ip-4.3.0" = { name = "internal-ip"; packageName = "internal-ip"; @@ -2165,6 +5315,42 @@ let sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; }; }; + "invariant-2.2.4" = { + name = "invariant"; + packageName = "invariant"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz"; + sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="; + }; + }; + "invert-kv-1.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; + sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; + }; + }; + "invert-kv-2.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz"; + sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="; + }; + }; + "ip-1.1.5" = { + name = "ip"; + packageName = "ip"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz"; + sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; + }; + }; "ip-regex-2.1.0" = { name = "ip-regex"; packageName = "ip-regex"; @@ -2183,6 +5369,24 @@ let sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; }; + "is-absolute-url-2.1.0" = { + name = "is-absolute-url"; + packageName = "is-absolute-url"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz"; + sha1 = "50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"; + }; + }; + "is-absolute-url-3.0.3" = { + name = "is-absolute-url"; + packageName = "is-absolute-url"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz"; + sha512 = "opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q=="; + }; + }; "is-accessor-descriptor-0.1.6" = { name = "is-accessor-descriptor"; packageName = "is-accessor-descriptor"; @@ -2201,6 +5405,42 @@ let sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; }; }; + "is-arguments-1.0.4" = { + name = "is-arguments"; + packageName = "is-arguments"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz"; + sha512 = "xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="; + }; + }; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + }; + "is-arrayish-0.3.2" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz"; + sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; + }; + }; + "is-binary-path-1.0.1" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz"; + sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; + }; + }; "is-binary-path-2.1.0" = { name = "is-binary-path"; packageName = "is-binary-path"; @@ -2228,6 +5468,15 @@ let sha512 = "ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="; }; }; + "is-color-stop-1.1.0" = { + name = "is-color-stop"; + packageName = "is-color-stop"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz"; + sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; + }; + }; "is-data-descriptor-0.1.4" = { name = "is-data-descriptor"; packageName = "is-data-descriptor"; @@ -2273,6 +5522,15 @@ let sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; }; }; + "is-directory-0.3.1" = { + name = "is-directory"; + packageName = "is-directory"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz"; + sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; + }; + }; "is-extendable-0.1.1" = { name = "is-extendable"; packageName = "is-extendable"; @@ -2300,6 +5558,15 @@ let sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; "is-fullwidth-code-point-2.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -2318,6 +5585,15 @@ let sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; }; + "is-glob-3.1.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + }; + }; "is-glob-4.0.1" = { name = "is-glob"; packageName = "is-glob"; @@ -2345,6 +5621,24 @@ let sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; + "is-obj-1.0.1" = { + name = "is-obj"; + packageName = "is-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; + sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + }; + }; + "is-obj-2.0.0" = { + name = "is-obj"; + packageName = "is-obj"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz"; + sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; + }; + }; "is-object-1.0.1" = { name = "is-object"; packageName = "is-object"; @@ -2354,6 +5648,33 @@ let sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; }; }; + "is-path-cwd-2.2.0" = { + name = "is-path-cwd"; + packageName = "is-path-cwd"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; + sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="; + }; + }; + "is-path-in-cwd-2.1.0" = { + name = "is-path-in-cwd"; + packageName = "is-path-in-cwd"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; + sha512 = "rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ=="; + }; + }; + "is-path-inside-2.1.0" = { + name = "is-path-inside"; + packageName = "is-path-inside"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz"; + sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg=="; + }; + }; "is-plain-obj-1.1.0" = { name = "is-plain-obj"; packageName = "is-plain-obj"; @@ -2372,6 +5693,15 @@ let sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; + "is-promise-2.1.0" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + }; "is-regex-1.0.5" = { name = "is-regex"; packageName = "is-regex"; @@ -2381,6 +5711,24 @@ let sha512 = "vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ=="; }; }; + "is-regexp-1.0.0" = { + name = "is-regexp"; + packageName = "is-regexp"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz"; + sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069"; + }; + }; + "is-resolvable-1.1.0" = { + name = "is-resolvable"; + packageName = "is-resolvable"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz"; + sha512 = "qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="; + }; + }; "is-retry-allowed-1.2.0" = { name = "is-retry-allowed"; packageName = "is-retry-allowed"; @@ -2390,6 +5738,15 @@ let sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="; }; }; + "is-root-2.0.0" = { + name = "is-root"; + packageName = "is-root"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-root/-/is-root-2.0.0.tgz"; + sha512 = "F/pJIk8QD6OX5DNhRB7hWamLsUilmkDGho48KbgZ6xg/lmAZXHxzXQ91jzB3yRSw5kdQGGGc4yz8HYhTYIMWPg=="; + }; + }; "is-stream-1.1.0" = { name = "is-stream"; packageName = "is-stream"; @@ -2408,6 +5765,15 @@ let sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; }; }; + "is-svg-3.0.0" = { + name = "is-svg"; + packageName = "is-svg"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz"; + sha512 = "gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ=="; + }; + }; "is-symbol-1.0.3" = { name = "is-symbol"; packageName = "is-symbol"; @@ -2426,6 +5792,15 @@ let sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; + "is-utf8-0.2.1" = { + name = "is-utf8"; + packageName = "is-utf8"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; + sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; + }; + }; "is-windows-1.0.2" = { name = "is-windows"; packageName = "is-windows"; @@ -2498,6 +5873,33 @@ let sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="; }; }; + "js-levenshtein-1.1.6" = { + name = "js-levenshtein"; + packageName = "js-levenshtein"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz"; + sha512 = "X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g=="; + }; + }; + "js-tokens-4.0.0" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; + }; + }; + "js-yaml-3.13.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; + }; + }; "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; @@ -2507,6 +5909,24 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; + "jsesc-0.5.0" = { + name = "jsesc"; + packageName = "jsesc"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"; + sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; + }; + }; + "jsesc-2.5.2" = { + name = "jsesc"; + packageName = "jsesc"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"; + sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; + }; + }; "json-buffer-3.0.0" = { name = "json-buffer"; packageName = "json-buffer"; @@ -2525,6 +5945,15 @@ let sha512 = "4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="; }; }; + "json-parse-better-errors-1.0.2" = { + name = "json-parse-better-errors"; + packageName = "json-parse-better-errors"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; + }; + }; "json-schema-0.2.3" = { name = "json-schema"; packageName = "json-schema"; @@ -2543,6 +5972,15 @@ let sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; + "json-stable-stringify-1.0.1" = { + name = "json-stable-stringify"; + packageName = "json-stable-stringify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; + sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; + }; + }; "json-stringify-safe-5.0.1" = { name = "json-stringify-safe"; packageName = "json-stringify-safe"; @@ -2552,6 +5990,42 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; + "json3-3.3.3" = { + name = "json3"; + packageName = "json3"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz"; + sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="; + }; + }; + "json5-0.5.1" = { + name = "json5"; + packageName = "json5"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; + sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + }; + }; + "json5-1.0.1" = { + name = "json5"; + packageName = "json5"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; + sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; + }; + }; + "json5-2.1.2" = { + name = "json5"; + packageName = "json5"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz"; + sha512 = "MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ=="; + }; + }; "jsonfile-2.4.0" = { name = "jsonfile"; packageName = "jsonfile"; @@ -2570,6 +6044,15 @@ let sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; }; }; + "jsonify-0.0.0" = { + name = "jsonify"; + packageName = "jsonify"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; + sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; + }; + }; "jsprim-1.4.1" = { name = "jsprim"; packageName = "jsprim"; @@ -2597,6 +6080,15 @@ let sha512 = "U7ioE8AimvRVLfw4LffyOIRhL2xVgmE8T22L6i0BucSnBUyv4w+I7VN/zVZwRKHOI6ZRUcdMdWHQ8KSUvGpEog=="; }; }; + "killable-1.0.1" = { + name = "killable"; + packageName = "killable"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz"; + sha512 = "LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="; + }; + }; "kind-of-3.2.2" = { name = "kind-of"; packageName = "kind-of"; @@ -2642,6 +6134,15 @@ let sha1 = "42b76894701169cc910fd0d19ce677b5fb378af1"; }; }; + "last-call-webpack-plugin-3.0.0" = { + name = "last-call-webpack-plugin"; + packageName = "last-call-webpack-plugin"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz"; + sha512 = "7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w=="; + }; + }; "latest-version-4.0.0" = { name = "latest-version"; packageName = "latest-version"; @@ -2651,6 +6152,69 @@ let sha512 = "b4Myk7aQiQJvgssw2O8yITjELdqKRX4JQJUF1IUplgLaA8unv7s+UsAOwH6Q0/a09czSvlxEm306it2LBXrCzg=="; }; }; + "lcid-1.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; + sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; + }; + }; + "lcid-2.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz"; + sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA=="; + }; + }; + "load-json-file-1.1.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; + sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; + }; + }; + "loader-runner-2.4.0" = { + name = "loader-runner"; + packageName = "loader-runner"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz"; + sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="; + }; + }; + "loader-utils-1.1.0" = { + name = "loader-utils"; + packageName = "loader-utils"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz"; + sha1 = "c98aef488bcceda2ffb5e2de646d6a754429f5cd"; + }; + }; + "loader-utils-1.4.0" = { + name = "loader-utils"; + packageName = "loader-utils"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz"; + sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA=="; + }; + }; + "locate-path-2.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; + sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + }; + }; "locate-path-3.0.0" = { name = "locate-path"; packageName = "locate-path"; @@ -2678,6 +6242,78 @@ let sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; }; }; + "lodash._reinterpolate-3.0.0" = { + name = "lodash._reinterpolate"; + packageName = "lodash._reinterpolate"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"; + sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d"; + }; + }; + "lodash.memoize-4.1.2" = { + name = "lodash.memoize"; + packageName = "lodash.memoize"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; + sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; + }; + }; + "lodash.template-4.5.0" = { + name = "lodash.template"; + packageName = "lodash.template"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz"; + sha512 = "84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A=="; + }; + }; + "lodash.templatesettings-4.2.0" = { + name = "lodash.templatesettings"; + packageName = "lodash.templatesettings"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz"; + sha512 = "stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ=="; + }; + }; + "lodash.uniq-4.5.0" = { + name = "lodash.uniq"; + packageName = "lodash.uniq"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; + }; + }; + "loglevel-1.6.7" = { + name = "loglevel"; + packageName = "loglevel"; + version = "1.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz"; + sha512 = "cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A=="; + }; + }; + "loose-envify-1.4.0" = { + name = "loose-envify"; + packageName = "loose-envify"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"; + sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; + }; + }; + "lower-case-2.0.1" = { + name = "lower-case"; + packageName = "lower-case"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz"; + sha512 = "LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ=="; + }; + }; "lowercase-keys-1.0.0" = { name = "lowercase-keys"; packageName = "lowercase-keys"; @@ -2714,6 +6350,33 @@ let sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; }; + "lru-cache-5.1.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; + }; + }; + "make-dir-1.3.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz"; + sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ=="; + }; + }; + "make-dir-2.1.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz"; + sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; + }; + }; "makeerror-1.0.11" = { name = "makeerror"; packageName = "makeerror"; @@ -2723,6 +6386,15 @@ let sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c"; }; }; + "map-age-cleaner-0.1.3" = { + name = "map-age-cleaner"; + packageName = "map-age-cleaner"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; + sha512 = "bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w=="; + }; + }; "map-cache-0.2.2" = { name = "map-cache"; packageName = "map-cache"; @@ -2750,6 +6422,33 @@ let sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9"; }; }; + "md5.js-1.3.5" = { + name = "md5.js"; + packageName = "md5.js"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz"; + sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; + }; + }; + "mdn-data-2.0.4" = { + name = "mdn-data"; + packageName = "mdn-data"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz"; + sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="; + }; + }; + "mdn-data-2.0.6" = { + name = "mdn-data"; + packageName = "mdn-data"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz"; + sha512 = "rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA=="; + }; + }; "media-typer-0.3.0" = { name = "media-typer"; packageName = "media-typer"; @@ -2759,6 +6458,33 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; + "mem-4.3.0" = { + name = "mem"; + packageName = "mem"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz"; + sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w=="; + }; + }; + "memory-fs-0.4.1" = { + name = "memory-fs"; + packageName = "memory-fs"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz"; + sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; + }; + }; + "memory-fs-0.5.0" = { + name = "memory-fs"; + packageName = "memory-fs"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz"; + sha512 = "jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA=="; + }; + }; "merge-descriptors-1.0.1" = { name = "merge-descriptors"; packageName = "merge-descriptors"; @@ -2813,6 +6539,15 @@ let sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; }; }; + "miller-rabin-4.0.1" = { + name = "miller-rabin"; + packageName = "miller-rabin"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz"; + sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA=="; + }; + }; "mime-1.4.1" = { name = "mime"; packageName = "mime"; @@ -2840,6 +6575,15 @@ let sha512 = "QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw=="; }; }; + "mime-2.4.4" = { + name = "mime"; + packageName = "mime"; + version = "2.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz"; + sha512 = "LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="; + }; + }; "mime-db-1.43.0" = { name = "mime-db"; packageName = "mime-db"; @@ -2858,6 +6602,15 @@ let sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ=="; }; }; + "mimic-fn-1.2.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; + sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; + }; + }; "mimic-fn-2.1.0" = { name = "mimic-fn"; packageName = "mimic-fn"; @@ -2885,6 +6638,33 @@ let sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; }; }; + "mini-css-extract-plugin-0.4.5" = { + name = "mini-css-extract-plugin"; + packageName = "mini-css-extract-plugin"; + version = "0.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.5.tgz"; + sha512 = "dqBanNfktnp2hwL2YguV9Jh91PFX7gu7nRLs4TGsbAfAG6WOtlynFRYzwDwmmeSb5uIwHo9nx1ta0f7vAZVp2w=="; + }; + }; + "minimalistic-assert-1.0.1" = { + name = "minimalistic-assert"; + packageName = "minimalistic-assert"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; + sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; + }; + }; + "minimalistic-crypto-utils-1.0.1" = { + name = "minimalistic-crypto-utils"; + packageName = "minimalistic-crypto-utils"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; + sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + }; + }; "minimatch-3.0.4" = { name = "minimatch"; packageName = "minimatch"; @@ -2930,6 +6710,24 @@ let sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; }; }; + "mississippi-2.0.0" = { + name = "mississippi"; + packageName = "mississippi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz"; + sha512 = "zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw=="; + }; + }; + "mississippi-3.0.0" = { + name = "mississippi"; + packageName = "mississippi"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz"; + sha512 = "x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA=="; + }; + }; "mixin-deep-1.3.2" = { name = "mixin-deep"; packageName = "mixin-deep"; @@ -2948,6 +6746,15 @@ let sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg=="; }; }; + "mkdirp-0.5.5" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + }; + }; "moment-2.24.0" = { name = "moment"; packageName = "moment"; @@ -2957,6 +6764,15 @@ let sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; }; }; + "move-concurrently-1.0.1" = { + name = "move-concurrently"; + packageName = "move-concurrently"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz"; + sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; + }; + }; "ms-2.0.0" = { name = "ms"; packageName = "ms"; @@ -2984,6 +6800,24 @@ let sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; + "multicast-dns-6.2.3" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "6.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz"; + sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g=="; + }; + }; + "multicast-dns-service-types-1.1.0" = { + name = "multicast-dns-service-types"; + packageName = "multicast-dns-service-types"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"; + sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; + }; + }; "murmur-hash-js-1.0.0" = { name = "murmur-hash-js"; packageName = "murmur-hash-js"; @@ -3002,6 +6836,33 @@ let sha512 = "RERvMFdLpaFfSRIEe632yDm5nsd0SDKn8hGmcUwswnyiE5mtdZLDybtHAz6hjJhawokF0hXvGLtx9mrQfm6FkA=="; }; }; + "mute-stream-0.0.7" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz"; + sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; + }; + }; + "mute-stream-0.0.8" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"; + sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; + }; + }; + "nan-2.14.0" = { + name = "nan"; + packageName = "nan"; + version = "2.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; + sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; + }; + }; "nanomatch-1.2.13" = { name = "nanomatch"; packageName = "nanomatch"; @@ -3011,6 +6872,15 @@ let sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; }; }; + "ncp-1.0.1" = { + name = "ncp"; + packageName = "ncp"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz"; + sha1 = "d15367e5cb87432ba117d2bf80fdf45aecfb4246"; + }; + }; "negotiator-0.6.2" = { name = "negotiator"; packageName = "negotiator"; @@ -3020,6 +6890,15 @@ let sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; + "neo-async-2.6.1" = { + name = "neo-async"; + packageName = "neo-async"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz"; + sha512 = "iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="; + }; + }; "nice-try-1.0.5" = { name = "nice-try"; packageName = "nice-try"; @@ -3029,6 +6908,15 @@ let sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; }; }; + "no-case-3.0.3" = { + name = "no-case"; + packageName = "no-case"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz"; + sha512 = "ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw=="; + }; + }; "node-elm-compiler-5.0.4" = { name = "node-elm-compiler"; packageName = "node-elm-compiler"; @@ -3038,6 +6926,15 @@ let sha512 = "VQsT8QSierYGkHzRed+b4MnccQVF1+qPHunE8jBoU7jD6YpuRqCDPzEoC2zfyEJS80qVnlMZrqobLnyjzX9lJg=="; }; }; + "node-forge-0.9.0" = { + name = "node-forge"; + packageName = "node-forge"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz"; + sha512 = "7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ=="; + }; + }; "node-int64-0.4.0" = { name = "node-int64"; packageName = "node-int64"; @@ -3047,6 +6944,24 @@ let sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; }; }; + "node-libs-browser-2.2.1" = { + name = "node-libs-browser"; + packageName = "node-libs-browser"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz"; + sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q=="; + }; + }; + "node-releases-1.1.53" = { + name = "node-releases"; + packageName = "node-releases"; + version = "1.1.53"; + src = fetchurl { + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz"; + sha512 = "wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ=="; + }; + }; "node-watch-0.5.5" = { name = "node-watch"; packageName = "node-watch"; @@ -3065,6 +6980,15 @@ let sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; }; }; + "normalize-package-data-2.5.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; + }; + }; "normalize-path-2.1.1" = { name = "normalize-path"; packageName = "normalize-path"; @@ -3083,6 +7007,15 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; + "normalize-range-0.1.2" = { + name = "normalize-range"; + packageName = "normalize-range"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"; + sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942"; + }; + }; "normalize-url-2.0.1" = { name = "normalize-url"; packageName = "normalize-url"; @@ -3092,6 +7025,15 @@ let sha512 = "D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw=="; }; }; + "normalize-url-3.3.0" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz"; + sha512 = "U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="; + }; + }; "normalize-url-4.5.0" = { name = "normalize-url"; packageName = "normalize-url"; @@ -3128,6 +7070,33 @@ let sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; }; }; + "nth-check-1.0.2" = { + name = "nth-check"; + packageName = "nth-check"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz"; + sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; + }; + }; + "num2fraction-1.2.2" = { + name = "num2fraction"; + packageName = "num2fraction"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz"; + sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; "oauth-sign-0.9.0" = { name = "oauth-sign"; packageName = "oauth-sign"; @@ -3164,6 +7133,15 @@ let sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="; }; }; + "object-is-1.0.2" = { + name = "object-is"; + packageName = "object-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz"; + sha512 = "Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ=="; + }; + }; "object-keys-1.1.1" = { name = "object-keys"; packageName = "object-keys"; @@ -3191,6 +7169,15 @@ let sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; }; }; + "object.entries-1.1.1" = { + name = "object.entries"; + packageName = "object.entries"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.1.tgz"; + sha512 = "ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ=="; + }; + }; "object.getownpropertydescriptors-2.1.0" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; @@ -3209,6 +7196,24 @@ let sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; }; }; + "object.values-1.1.1" = { + name = "object.values"; + packageName = "object.values"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz"; + sha512 = "WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA=="; + }; + }; + "obuf-1.1.2" = { + name = "obuf"; + packageName = "obuf"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz"; + sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="; + }; + }; "on-finished-2.3.0" = { name = "on-finished"; packageName = "on-finished"; @@ -3218,6 +7223,15 @@ let sha1 = "20f1336481b083cd75337992a16971aa2d906947"; }; }; + "on-headers-1.0.2" = { + name = "on-headers"; + packageName = "on-headers"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; + }; + }; "once-1.4.0" = { name = "once"; packageName = "once"; @@ -3227,6 +7241,15 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; + "onetime-2.0.1" = { + name = "onetime"; + packageName = "onetime"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + }; + }; "onetime-5.1.0" = { name = "onetime"; packageName = "onetime"; @@ -3263,6 +7286,15 @@ let sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA=="; }; }; + "optimize-css-assets-webpack-plugin-5.0.3" = { + name = "optimize-css-assets-webpack-plugin"; + packageName = "optimize-css-assets-webpack-plugin"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz"; + sha512 = "q9fbvCRS6EYtUKKSwI87qm2IxlyJK5b4dygW1rKUBT6mMDhdG5e5bZT63v6tnJR9F9FB/H5a0HTmtw+laUBxKA=="; + }; + }; "options-0.0.6" = { name = "options"; packageName = "options"; @@ -3272,6 +7304,24 @@ let sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; }; }; + "original-1.0.2" = { + name = "original"; + packageName = "original"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/original/-/original-1.0.2.tgz"; + sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg=="; + }; + }; + "os-browserify-0.3.0" = { + name = "os-browserify"; + packageName = "os-browserify"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz"; + sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; + }; + }; "os-homedir-1.0.2" = { name = "os-homedir"; packageName = "os-homedir"; @@ -3281,6 +7331,24 @@ let sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; }; }; + "os-locale-1.4.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; + sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; + }; + }; + "os-locale-3.1.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz"; + sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q=="; + }; + }; "os-tmpdir-1.0.2" = { name = "os-tmpdir"; packageName = "os-tmpdir"; @@ -3290,6 +7358,15 @@ let sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; }; + "output-file-sync-2.0.1" = { + name = "output-file-sync"; + packageName = "output-file-sync"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/output-file-sync/-/output-file-sync-2.0.1.tgz"; + sha512 = "mDho4qm7WgIXIGf4eYU1RHN2UU5tPfVYVSRwDJw0uTmj35DQUt/eNp19N7v6T3SrR0ESTEf2up2CGO73qI35zQ=="; + }; + }; "p-cancelable-0.4.1" = { name = "p-cancelable"; packageName = "p-cancelable"; @@ -3308,6 +7385,15 @@ let sha512 = "wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg=="; }; }; + "p-defer-1.0.0" = { + name = "p-defer"; + packageName = "p-defer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz"; + sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; + }; + }; "p-event-4.1.0" = { name = "p-event"; packageName = "p-event"; @@ -3335,6 +7421,24 @@ let sha1 = "9c9456989e9f6588017b0434d56097675c3da05e"; }; }; + "p-is-promise-2.1.0" = { + name = "p-is-promise"; + packageName = "p-is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz"; + sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="; + }; + }; + "p-limit-1.3.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"; + sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; + }; + }; "p-limit-2.2.2" = { name = "p-limit"; packageName = "p-limit"; @@ -3344,6 +7448,15 @@ let sha512 = "WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ=="; }; }; + "p-locate-2.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; + sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + }; + }; "p-locate-3.0.0" = { name = "p-locate"; packageName = "p-locate"; @@ -3362,6 +7475,24 @@ let sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; }; }; + "p-map-2.1.0" = { + name = "p-map"; + packageName = "p-map"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz"; + sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; + }; + }; + "p-retry-3.0.1" = { + name = "p-retry"; + packageName = "p-retry"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz"; + sha512 = "XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w=="; + }; + }; "p-timeout-2.0.1" = { name = "p-timeout"; packageName = "p-timeout"; @@ -3371,6 +7502,15 @@ let sha512 = "88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA=="; }; }; + "p-try-1.0.0" = { + name = "p-try"; + packageName = "p-try"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + }; + }; "p-try-2.2.0" = { name = "p-try"; packageName = "p-try"; @@ -3389,6 +7529,69 @@ let sha512 = "EeHQFFTlEmLrkIQoxbE9w0FuAWHoc1XpthDqnZ/i9keOt701cteyXwAxQFLpVqVjj3feh2TodkihjLaRUtIgLg=="; }; }; + "pako-1.0.11" = { + name = "pako"; + packageName = "pako"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz"; + sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; + }; + }; + "parallel-transform-1.2.0" = { + name = "parallel-transform"; + packageName = "parallel-transform"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz"; + sha512 = "P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg=="; + }; + }; + "param-case-3.0.3" = { + name = "param-case"; + packageName = "param-case"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/param-case/-/param-case-3.0.3.tgz"; + sha512 = "VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA=="; + }; + }; + "parse-asn1-5.1.5" = { + name = "parse-asn1"; + packageName = "parse-asn1"; + version = "5.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz"; + sha512 = "jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ=="; + }; + }; + "parse-json-2.2.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + }; + "parse-json-4.0.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + }; + }; + "parse-passwd-1.0.0" = { + name = "parse-passwd"; + packageName = "parse-passwd"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; + sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; + }; + }; "parseurl-1.3.3" = { name = "parseurl"; packageName = "parseurl"; @@ -3398,6 +7601,15 @@ let sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; }; }; + "pascal-case-3.1.1" = { + name = "pascal-case"; + packageName = "pascal-case"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.1.tgz"; + sha512 = "XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA=="; + }; + }; "pascalcase-0.1.1" = { name = "pascalcase"; packageName = "pascalcase"; @@ -3407,6 +7619,33 @@ let sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; }; }; + "path-browserify-0.0.1" = { + name = "path-browserify"; + packageName = "path-browserify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz"; + sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="; + }; + }; + "path-dirname-1.0.2" = { + name = "path-dirname"; + packageName = "path-dirname"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"; + sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + }; + }; + "path-exists-2.1.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; + sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + }; + }; "path-exists-3.0.0" = { name = "path-exists"; packageName = "path-exists"; @@ -3434,6 +7673,15 @@ let sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; + "path-is-inside-1.0.2" = { + name = "path-is-inside"; + packageName = "path-is-inside"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; + }; + }; "path-key-2.0.1" = { name = "path-key"; packageName = "path-key"; @@ -3452,6 +7700,15 @@ let sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; }; + "path-parse-1.0.6" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + }; + }; "path-to-regexp-0.1.7" = { name = "path-to-regexp"; packageName = "path-to-regexp"; @@ -3461,6 +7718,24 @@ let sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; }; + "path-type-1.1.0" = { + name = "path-type"; + packageName = "path-type"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; + sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; + }; + }; + "path-type-3.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz"; + sha512 = "T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg=="; + }; + }; "path-type-4.0.0" = { name = "path-type"; packageName = "path-type"; @@ -3470,6 +7745,15 @@ let sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; }; + "pbkdf2-3.0.17" = { + name = "pbkdf2"; + packageName = "pbkdf2"; + version = "3.0.17"; + src = fetchurl { + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz"; + sha512 = "U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA=="; + }; + }; "pem-1.14.2" = { name = "pem"; packageName = "pem"; @@ -3488,13 +7772,22 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "picomatch-2.2.1" = { + "picomatch-2.2.2" = { name = "picomatch"; packageName = "picomatch"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz"; - sha512 = "ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; + sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; + }; + }; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; }; }; "pify-3.0.0" = { @@ -3506,6 +7799,33 @@ let sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; }; }; + "pify-4.0.1" = { + name = "pify"; + packageName = "pify"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"; + sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="; + }; + }; + "pinkie-2.0.4" = { + name = "pinkie"; + packageName = "pinkie"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + }; + "pinkie-promise-2.0.1" = { + name = "pinkie-promise"; + packageName = "pinkie-promise"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + }; "pjson-1.0.9" = { name = "pjson"; packageName = "pjson"; @@ -3515,6 +7835,60 @@ let sha512 = "4hRJH3YzkUpOlShRzhyxAmThSNnAaIlWZCAb27hd0pVUAXNUAHAO7XZbsPPvsCYwBFEScTmCCL6DGE8NyZ8BdQ=="; }; }; + "pkg-dir-2.0.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz"; + sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; + }; + }; + "pkg-dir-3.0.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz"; + sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw=="; + }; + }; + "pkg-up-2.0.0" = { + name = "pkg-up"; + packageName = "pkg-up"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz"; + sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; + }; + }; + "pkginfo-0.3.1" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"; + sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; + }; + }; + "pkginfo-0.4.1" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz"; + sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff"; + }; + }; + "portfinder-1.0.25" = { + name = "portfinder"; + packageName = "portfinder"; + version = "1.0.25"; + src = fetchurl { + url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz"; + sha512 = "6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg=="; + }; + }; "posix-character-classes-0.1.1" = { name = "posix-character-classes"; packageName = "posix-character-classes"; @@ -3524,6 +7898,393 @@ let sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; }; }; + "postcss-6.0.23" = { + name = "postcss"; + packageName = "postcss"; + version = "6.0.23"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz"; + sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag=="; + }; + }; + "postcss-7.0.27" = { + name = "postcss"; + packageName = "postcss"; + version = "7.0.27"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz"; + sha512 = "WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ=="; + }; + }; + "postcss-calc-7.0.2" = { + name = "postcss-calc"; + packageName = "postcss-calc"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz"; + sha512 = "rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ=="; + }; + }; + "postcss-colormin-4.0.3" = { + name = "postcss-colormin"; + packageName = "postcss-colormin"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz"; + sha512 = "WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw=="; + }; + }; + "postcss-convert-values-4.0.1" = { + name = "postcss-convert-values"; + packageName = "postcss-convert-values"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz"; + sha512 = "Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ=="; + }; + }; + "postcss-discard-comments-4.0.2" = { + name = "postcss-discard-comments"; + packageName = "postcss-discard-comments"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz"; + sha512 = "RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg=="; + }; + }; + "postcss-discard-duplicates-4.0.2" = { + name = "postcss-discard-duplicates"; + packageName = "postcss-discard-duplicates"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz"; + sha512 = "ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ=="; + }; + }; + "postcss-discard-empty-4.0.1" = { + name = "postcss-discard-empty"; + packageName = "postcss-discard-empty"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz"; + sha512 = "B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w=="; + }; + }; + "postcss-discard-overridden-4.0.1" = { + name = "postcss-discard-overridden"; + packageName = "postcss-discard-overridden"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz"; + sha512 = "IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg=="; + }; + }; + "postcss-flexbugs-fixes-3.3.1" = { + name = "postcss-flexbugs-fixes"; + packageName = "postcss-flexbugs-fixes"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-3.3.1.tgz"; + sha512 = "9y9kDDf2F9EjKX6x9ueNa5GARvsUbXw4ezH8vXItXHwKzljbu8awP7t5dCaabKYm18Vs1lo5bKQcnc0HkISt+w=="; + }; + }; + "postcss-load-config-1.2.0" = { + name = "postcss-load-config"; + packageName = "postcss-load-config"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz"; + sha1 = "539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"; + }; + }; + "postcss-load-options-1.2.0" = { + name = "postcss-load-options"; + packageName = "postcss-load-options"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.2.0.tgz"; + sha1 = "b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c"; + }; + }; + "postcss-load-plugins-2.3.0" = { + name = "postcss-load-plugins"; + packageName = "postcss-load-plugins"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz"; + sha1 = "745768116599aca2f009fad426b00175049d8d92"; + }; + }; + "postcss-loader-2.1.5" = { + name = "postcss-loader"; + packageName = "postcss-loader"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.5.tgz"; + sha512 = "pV7kB5neJ0/1tZ8L1uGOBNTVBCSCXQoIsZMsrwvO8V2rKGa2tBl/f80GGVxow2jJnRJ2w1ocx693EKhZAb9Isg=="; + }; + }; + "postcss-merge-longhand-4.0.11" = { + name = "postcss-merge-longhand"; + packageName = "postcss-merge-longhand"; + version = "4.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz"; + sha512 = "alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw=="; + }; + }; + "postcss-merge-rules-4.0.3" = { + name = "postcss-merge-rules"; + packageName = "postcss-merge-rules"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz"; + sha512 = "U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ=="; + }; + }; + "postcss-minify-font-values-4.0.2" = { + name = "postcss-minify-font-values"; + packageName = "postcss-minify-font-values"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz"; + sha512 = "j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg=="; + }; + }; + "postcss-minify-gradients-4.0.2" = { + name = "postcss-minify-gradients"; + packageName = "postcss-minify-gradients"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz"; + sha512 = "qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q=="; + }; + }; + "postcss-minify-params-4.0.2" = { + name = "postcss-minify-params"; + packageName = "postcss-minify-params"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz"; + sha512 = "G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg=="; + }; + }; + "postcss-minify-selectors-4.0.2" = { + name = "postcss-minify-selectors"; + packageName = "postcss-minify-selectors"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz"; + sha512 = "D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g=="; + }; + }; + "postcss-modules-extract-imports-2.0.0" = { + name = "postcss-modules-extract-imports"; + packageName = "postcss-modules-extract-imports"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz"; + sha512 = "LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ=="; + }; + }; + "postcss-modules-local-by-default-3.0.2" = { + name = "postcss-modules-local-by-default"; + packageName = "postcss-modules-local-by-default"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz"; + sha512 = "jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ=="; + }; + }; + "postcss-modules-scope-2.2.0" = { + name = "postcss-modules-scope"; + packageName = "postcss-modules-scope"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz"; + sha512 = "YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ=="; + }; + }; + "postcss-modules-values-3.0.0" = { + name = "postcss-modules-values"; + packageName = "postcss-modules-values"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz"; + sha512 = "1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg=="; + }; + }; + "postcss-normalize-charset-4.0.1" = { + name = "postcss-normalize-charset"; + packageName = "postcss-normalize-charset"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz"; + sha512 = "gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g=="; + }; + }; + "postcss-normalize-display-values-4.0.2" = { + name = "postcss-normalize-display-values"; + packageName = "postcss-normalize-display-values"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz"; + sha512 = "3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ=="; + }; + }; + "postcss-normalize-positions-4.0.2" = { + name = "postcss-normalize-positions"; + packageName = "postcss-normalize-positions"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz"; + sha512 = "Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA=="; + }; + }; + "postcss-normalize-repeat-style-4.0.2" = { + name = "postcss-normalize-repeat-style"; + packageName = "postcss-normalize-repeat-style"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz"; + sha512 = "qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q=="; + }; + }; + "postcss-normalize-string-4.0.2" = { + name = "postcss-normalize-string"; + packageName = "postcss-normalize-string"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz"; + sha512 = "RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA=="; + }; + }; + "postcss-normalize-timing-functions-4.0.2" = { + name = "postcss-normalize-timing-functions"; + packageName = "postcss-normalize-timing-functions"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz"; + sha512 = "acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A=="; + }; + }; + "postcss-normalize-unicode-4.0.1" = { + name = "postcss-normalize-unicode"; + packageName = "postcss-normalize-unicode"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz"; + sha512 = "od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg=="; + }; + }; + "postcss-normalize-url-4.0.1" = { + name = "postcss-normalize-url"; + packageName = "postcss-normalize-url"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz"; + sha512 = "p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA=="; + }; + }; + "postcss-normalize-whitespace-4.0.2" = { + name = "postcss-normalize-whitespace"; + packageName = "postcss-normalize-whitespace"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz"; + sha512 = "tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA=="; + }; + }; + "postcss-ordered-values-4.1.2" = { + name = "postcss-ordered-values"; + packageName = "postcss-ordered-values"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz"; + sha512 = "2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw=="; + }; + }; + "postcss-reduce-initial-4.0.3" = { + name = "postcss-reduce-initial"; + packageName = "postcss-reduce-initial"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz"; + sha512 = "gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA=="; + }; + }; + "postcss-reduce-transforms-4.0.2" = { + name = "postcss-reduce-transforms"; + packageName = "postcss-reduce-transforms"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz"; + sha512 = "EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg=="; + }; + }; + "postcss-safe-parser-4.0.2" = { + name = "postcss-safe-parser"; + packageName = "postcss-safe-parser"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz"; + sha512 = "Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g=="; + }; + }; + "postcss-selector-parser-3.1.2" = { + name = "postcss-selector-parser"; + packageName = "postcss-selector-parser"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"; + sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; + }; + }; + "postcss-selector-parser-6.0.2" = { + name = "postcss-selector-parser"; + packageName = "postcss-selector-parser"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz"; + sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg=="; + }; + }; + "postcss-svgo-4.0.2" = { + name = "postcss-svgo"; + packageName = "postcss-svgo"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz"; + sha512 = "C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw=="; + }; + }; + "postcss-unique-selectors-4.0.1" = { + name = "postcss-unique-selectors"; + packageName = "postcss-unique-selectors"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz"; + sha512 = "+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg=="; + }; + }; + "postcss-value-parser-3.3.1" = { + name = "postcss-value-parser"; + packageName = "postcss-value-parser"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz"; + sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="; + }; + }; + "postcss-value-parser-4.0.3" = { + name = "postcss-value-parser"; + packageName = "postcss-value-parser"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz"; + sha512 = "N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg=="; + }; + }; "prepend-http-2.0.0" = { name = "prepend-http"; packageName = "prepend-http"; @@ -3533,6 +8294,42 @@ let sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; }; }; + "pretty-bytes-5.3.0" = { + name = "pretty-bytes"; + packageName = "pretty-bytes"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz"; + sha512 = "hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg=="; + }; + }; + "pretty-error-2.1.1" = { + name = "pretty-error"; + packageName = "pretty-error"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz"; + sha1 = "5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"; + }; + }; + "private-0.1.8" = { + name = "private"; + packageName = "private"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz"; + sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="; + }; + }; + "process-0.11.10" = { + name = "process"; + packageName = "process"; + version = "0.11.10"; + src = fetchurl { + url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz"; + sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; + }; + }; "process-nextick-args-1.0.7" = { name = "process-nextick-args"; packageName = "process-nextick-args"; @@ -3551,6 +8348,33 @@ let sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; + "promise-8.1.0" = { + name = "promise"; + packageName = "promise"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz"; + sha512 = "W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q=="; + }; + }; + "promise-inflight-1.0.1" = { + name = "promise-inflight"; + packageName = "promise-inflight"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; + }; + }; + "prompt-1.0.0" = { + name = "prompt"; + packageName = "prompt"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prompt/-/prompt-1.0.0.tgz"; + sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; + }; + }; "proto-list-1.2.4" = { name = "proto-list"; packageName = "proto-list"; @@ -3569,6 +8393,15 @@ let sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; }; }; + "prr-1.0.1" = { + name = "prr"; + packageName = "prr"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"; + sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; + }; + }; "pseudomap-1.0.2" = { name = "pseudomap"; packageName = "pseudomap"; @@ -3578,13 +8411,31 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "psl-1.7.0" = { + "psl-1.8.0" = { name = "psl"; packageName = "psl"; - version = "1.7.0"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; + }; + }; + "public-encrypt-4.0.3" = { + name = "public-encrypt"; + packageName = "public-encrypt"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz"; + sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="; + }; + }; + "pump-2.0.1" = { + name = "pump"; + packageName = "pump"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz"; - sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="; + url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"; + sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="; }; }; "pump-3.0.0" = { @@ -3596,6 +8447,24 @@ let sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; }; }; + "pumpify-1.5.1" = { + name = "pumpify"; + packageName = "pumpify"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz"; + sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ=="; + }; + }; + "punycode-1.3.2" = { + name = "punycode"; + packageName = "punycode"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }; + }; "punycode-1.4.1" = { name = "punycode"; packageName = "punycode"; @@ -3614,6 +8483,15 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; + "q-1.5.1" = { + name = "q"; + packageName = "q"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz"; + sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; + }; + }; "qs-6.5.1" = { name = "qs"; packageName = "qs"; @@ -3650,6 +8528,51 @@ let sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="; }; }; + "querystring-0.2.0" = { + name = "querystring"; + packageName = "querystring"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; + }; + }; + "querystring-es3-0.2.1" = { + name = "querystring-es3"; + packageName = "querystring-es3"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"; + sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; + }; + }; + "querystringify-2.1.1" = { + name = "querystringify"; + packageName = "querystringify"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz"; + sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="; + }; + }; + "randombytes-2.1.0" = { + name = "randombytes"; + packageName = "randombytes"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; + }; + }; + "randomfill-1.0.4" = { + name = "randomfill"; + packageName = "randomfill"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz"; + sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw=="; + }; + }; "range-parser-1.2.1" = { name = "range-parser"; packageName = "range-parser"; @@ -3686,6 +8609,60 @@ let sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; }; + "react-dev-utils-6.1.1" = { + name = "react-dev-utils"; + packageName = "react-dev-utils"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-6.1.1.tgz"; + sha512 = "ThbJ86coVd6wV/QiTo8klDTvdAJ1WsFCGQN07+UkN+QN9CtCSsl/+YuDJToKGeG8X4j9HMGXNKbk2QhPAZr43w=="; + }; + }; + "react-error-overlay-4.0.1" = { + name = "react-error-overlay"; + packageName = "react-error-overlay"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-4.0.1.tgz"; + sha512 = "xXUbDAZkU08aAkjtUvldqbvI04ogv+a1XdHxvYuHPYKIVk/42BIOD0zSKTHAWV4+gDy3yGm283z2072rA2gdtw=="; + }; + }; + "react-error-overlay-5.1.6" = { + name = "react-error-overlay"; + packageName = "react-error-overlay"; + version = "5.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-5.1.6.tgz"; + sha512 = "X1Y+0jR47ImDVr54Ab6V9eGk0Hnu7fVWGeHQSOXHf/C2pF9c6uy3gef8QUeuUiWlNb0i08InPSE5a/KJzNzw1Q=="; + }; + }; + "read-1.0.7" = { + name = "read"; + packageName = "read"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/read/-/read-1.0.7.tgz"; + sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; + }; + }; + "read-pkg-1.1.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; + sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + }; + }; + "read-pkg-up-1.0.1" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; + sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + }; + }; "readable-stream-2.0.6" = { name = "readable-stream"; packageName = "readable-stream"; @@ -3704,6 +8681,24 @@ let sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; }; + "readable-stream-3.6.0" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + }; + }; + "readdirp-2.2.1" = { + name = "readdirp"; + packageName = "readdirp"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz"; + sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; + }; + }; "readdirp-3.1.3" = { name = "readdirp"; packageName = "readdirp"; @@ -3722,13 +8717,67 @@ let sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; }; }; - "readdirp-3.3.0" = { + "readdirp-3.4.0" = { name = "readdirp"; packageName = "readdirp"; - version = "3.3.0"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz"; + sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ=="; + }; + }; + "recursive-readdir-2.2.2" = { + name = "recursive-readdir"; + packageName = "recursive-readdir"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"; + sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg=="; + }; + }; + "regenerate-1.4.0" = { + name = "regenerate"; + packageName = "regenerate"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz"; + sha512 = "1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="; + }; + }; + "regenerate-unicode-properties-8.2.0" = { + name = "regenerate-unicode-properties"; + packageName = "regenerate-unicode-properties"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; + sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA=="; + }; + }; + "regenerator-runtime-0.11.1" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; + sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; + }; + }; + "regenerator-runtime-0.12.1" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz"; - sha512 = "zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ=="; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz"; + sha512 = "odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="; + }; + }; + "regenerator-runtime-0.13.5" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.13.5"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; + sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="; }; }; "regenerator-runtime-0.9.6" = { @@ -3740,6 +8789,15 @@ let sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029"; }; }; + "regenerator-transform-0.14.4" = { + name = "regenerator-transform"; + packageName = "regenerator-transform"; + version = "0.14.4"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz"; + sha512 = "EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw=="; + }; + }; "regex-not-1.0.2" = { name = "regex-not"; packageName = "regex-not"; @@ -3749,6 +8807,24 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; + "regexp.prototype.flags-1.3.0" = { + name = "regexp.prototype.flags"; + packageName = "regexp.prototype.flags"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; + sha512 = "2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ=="; + }; + }; + "regexpu-core-4.7.0" = { + name = "regexpu-core"; + packageName = "regexpu-core"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz"; + sha512 = "TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ=="; + }; + }; "registry-auth-token-3.4.0" = { name = "registry-auth-token"; packageName = "registry-auth-token"; @@ -3767,6 +8843,33 @@ let sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; }; }; + "regjsgen-0.5.1" = { + name = "regjsgen"; + packageName = "regjsgen"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz"; + sha512 = "5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg=="; + }; + }; + "regjsparser-0.6.4" = { + name = "regjsparser"; + packageName = "regjsparser"; + version = "0.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz"; + sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw=="; + }; + }; + "relateurl-0.2.7" = { + name = "relateurl"; + packageName = "relateurl"; + version = "0.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"; + sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9"; + }; + }; "remove-trailing-separator-1.1.0" = { name = "remove-trailing-separator"; packageName = "remove-trailing-separator"; @@ -3776,6 +8879,15 @@ let sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; }; }; + "renderkid-2.0.3" = { + name = "renderkid"; + packageName = "renderkid"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz"; + sha512 = "z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA=="; + }; + }; "repeat-element-1.1.3" = { name = "repeat-element"; packageName = "repeat-element"; @@ -3839,6 +8951,24 @@ let sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; }; + "require-from-string-1.2.1" = { + name = "require-from-string"; + packageName = "require-from-string"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz"; + sha1 = "529c9ccef27380adfec9a2f965b649bbee636418"; + }; + }; + "require-main-filename-1.0.1" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + }; "require-main-filename-2.0.0" = { name = "require-main-filename"; packageName = "require-main-filename"; @@ -3857,6 +8987,42 @@ let sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; + "resolve-1.15.1" = { + name = "resolve"; + packageName = "resolve"; + version = "1.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz"; + sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w=="; + }; + }; + "resolve-cwd-2.0.0" = { + name = "resolve-cwd"; + packageName = "resolve-cwd"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz"; + sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; + }; + }; + "resolve-dir-1.0.1" = { + name = "resolve-dir"; + packageName = "resolve-dir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"; + sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; + }; + }; + "resolve-from-3.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz"; + sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; + }; + }; "resolve-url-0.2.1" = { name = "resolve-url"; packageName = "resolve-url"; @@ -3884,6 +9050,15 @@ let sha512 = "xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw=="; }; }; + "restore-cursor-2.0.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + }; "ret-0.1.15" = { name = "ret"; packageName = "ret"; @@ -3893,6 +9068,15 @@ let sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; }; + "retry-0.12.0" = { + name = "retry"; + packageName = "retry"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + }; "reusify-1.0.4" = { name = "reusify"; packageName = "reusify"; @@ -3902,6 +9086,33 @@ let sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; }; }; + "revalidator-0.1.8" = { + name = "revalidator"; + packageName = "revalidator"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"; + sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b"; + }; + }; + "rgb-regex-1.0.1" = { + name = "rgb-regex"; + packageName = "rgb-regex"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz"; + sha1 = "c0e0d6882df0e23be254a475e8edd41915feaeb1"; + }; + }; + "rgba-regex-1.0.0" = { + name = "rgba-regex"; + packageName = "rgba-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz"; + sha1 = "43374e2e2ca0968b0ef1523460b7d730ff22eeb3"; + }; + }; "rimraf-2.6.3" = { name = "rimraf"; packageName = "rimraf"; @@ -3920,6 +9131,15 @@ let sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; }; }; + "ripemd160-2.0.2" = { + name = "ripemd160"; + packageName = "ripemd160"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz"; + sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="; + }; + }; "rsvp-4.8.5" = { name = "rsvp"; packageName = "rsvp"; @@ -3929,6 +9149,15 @@ let sha512 = "nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA=="; }; }; + "run-async-2.4.0" = { + name = "run-async"; + packageName = "run-async"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz"; + sha512 = "xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg=="; + }; + }; "run-parallel-1.1.9" = { name = "run-parallel"; packageName = "run-parallel"; @@ -3938,13 +9167,22 @@ let sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="; }; }; - "rxjs-6.5.4" = { + "run-queue-1.0.3" = { + name = "run-queue"; + packageName = "run-queue"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz"; + sha1 = "e848396f057d223f24386924618e25694161ec47"; + }; + }; + "rxjs-6.5.5" = { name = "rxjs"; packageName = "rxjs"; - version = "6.5.4"; + version = "6.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz"; - sha512 = "naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz"; + sha512 = "WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ=="; }; }; "safe-buffer-5.1.1" = { @@ -4010,6 +9248,60 @@ let sha512 = "hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA=="; }; }; + "sax-1.2.4" = { + name = "sax"; + packageName = "sax"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; + }; + }; + "schema-utils-0.4.7" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "0.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz"; + sha512 = "v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ=="; + }; + }; + "schema-utils-1.0.0" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz"; + sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g=="; + }; + }; + "schema-utils-2.6.5" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "2.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz"; + sha512 = "5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ=="; + }; + }; + "select-hose-2.0.0" = { + name = "select-hose"; + packageName = "select-hose"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz"; + sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; + }; + }; + "selfsigned-1.10.7" = { + name = "selfsigned"; + packageName = "selfsigned"; + version = "1.10.7"; + src = fetchurl { + url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz"; + sha512 = "8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA=="; + }; + }; "semver-5.7.1" = { name = "semver"; packageName = "semver"; @@ -4073,6 +9365,24 @@ let sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; + "serialize-javascript-1.9.1" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz"; + sha512 = "0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A=="; + }; + }; + "serialize-javascript-2.1.2" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz"; + sha512 = "rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ=="; + }; + }; "serve-index-1.9.1" = { name = "serve-index"; packageName = "serve-index"; @@ -4118,6 +9428,15 @@ let sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="; }; }; + "setimmediate-1.0.5" = { + name = "setimmediate"; + packageName = "setimmediate"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; + sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + }; + }; "setprototypeof-1.0.3" = { name = "setprototypeof"; packageName = "setprototypeof"; @@ -4145,6 +9464,15 @@ let sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; + "sha.js-2.4.11" = { + name = "sha.js"; + packageName = "sha.js"; + version = "2.4.11"; + src = fetchurl { + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"; + sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; + }; + }; "shebang-command-1.2.0" = { name = "shebang-command"; packageName = "shebang-command"; @@ -4181,13 +9509,49 @@ let sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; }; - "signal-exit-3.0.2" = { + "shell-quote-1.6.1" = { + name = "shell-quote"; + packageName = "shell-quote"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz"; + sha1 = "f4781949cce402697127430ea3b3c5476f481767"; + }; + }; + "signal-exit-3.0.3" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; + sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; + }; + }; + "simple-swizzle-0.2.2" = { + name = "simple-swizzle"; + packageName = "simple-swizzle"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; + sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; + }; + }; + "slash-1.0.0" = { + name = "slash"; + packageName = "slash"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"; + sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; + }; + }; + "slash-2.0.0" = { + name = "slash"; + packageName = "slash"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz"; + sha512 = "ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="; }; }; "slash-3.0.0" = { @@ -4235,6 +9599,33 @@ let sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; }; }; + "sockjs-0.3.19" = { + name = "sockjs"; + packageName = "sockjs"; + version = "0.3.19"; + src = fetchurl { + url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz"; + sha512 = "V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw=="; + }; + }; + "sockjs-client-1.1.5" = { + name = "sockjs-client"; + packageName = "sockjs-client"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.5.tgz"; + sha1 = "1bb7c0f7222c40f42adf14f4442cbd1269771a83"; + }; + }; + "sockjs-client-1.4.0" = { + name = "sockjs-client"; + packageName = "sockjs-client"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz"; + sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; + }; + }; "sort-keys-2.0.0" = { name = "sort-keys"; packageName = "sort-keys"; @@ -4244,6 +9635,15 @@ let sha1 = "658535584861ec97d730d6cf41822e1f56684128"; }; }; + "source-list-map-2.0.1" = { + name = "source-list-map"; + packageName = "source-list-map"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz"; + sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="; + }; + }; "source-map-0.5.7" = { name = "source-map"; packageName = "source-map"; @@ -4253,6 +9653,15 @@ let sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; }; }; + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + }; + }; "source-map-resolve-0.5.3" = { name = "source-map-resolve"; packageName = "source-map-resolve"; @@ -4262,6 +9671,15 @@ let sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; }; + "source-map-support-0.5.16" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.5.16"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz"; + sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ=="; + }; + }; "source-map-url-0.4.0" = { name = "source-map-url"; packageName = "source-map-url"; @@ -4271,6 +9689,60 @@ let sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; }; }; + "spdx-correct-3.1.0" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz"; + sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q=="; + }; + }; + "spdx-exceptions-2.2.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; + sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; + }; + }; + "spdx-expression-parse-3.0.0" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; + sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; + }; + }; + "spdx-license-ids-3.0.5" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; + sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; + }; + }; + "spdy-4.0.2" = { + name = "spdy"; + packageName = "spdy"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz"; + sha512 = "r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA=="; + }; + }; + "spdy-transport-3.0.0" = { + name = "spdy-transport"; + packageName = "spdy-transport"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz"; + sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw=="; + }; + }; "split-1.0.1" = { name = "split"; packageName = "split"; @@ -4289,6 +9761,15 @@ let sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; }; }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; "sshpk-1.16.1" = { name = "sshpk"; packageName = "sshpk"; @@ -4298,6 +9779,42 @@ let sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; + "ssri-5.3.0" = { + name = "ssri"; + packageName = "ssri"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz"; + sha512 = "XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ=="; + }; + }; + "ssri-6.0.1" = { + name = "ssri"; + packageName = "ssri"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz"; + sha512 = "3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA=="; + }; + }; + "stable-0.1.8" = { + name = "stable"; + packageName = "stable"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz"; + sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="; + }; + }; + "stack-trace-0.0.10" = { + name = "stack-trace"; + packageName = "stack-trace"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"; + sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; + }; + }; "static-extend-0.1.2" = { name = "static-extend"; packageName = "static-extend"; @@ -4334,6 +9851,42 @@ let sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; }; }; + "stream-browserify-2.0.2" = { + name = "stream-browserify"; + packageName = "stream-browserify"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz"; + sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg=="; + }; + }; + "stream-each-1.2.3" = { + name = "stream-each"; + packageName = "stream-each"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz"; + sha512 = "vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw=="; + }; + }; + "stream-http-2.8.3" = { + name = "stream-http"; + packageName = "stream-http"; + version = "2.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz"; + sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw=="; + }; + }; + "stream-shift-1.0.1" = { + name = "stream-shift"; + packageName = "stream-shift"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"; + sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; + }; + }; "strict-uri-encode-1.1.0" = { name = "strict-uri-encode"; packageName = "strict-uri-encode"; @@ -4343,6 +9896,33 @@ let sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; }; }; + "string-replace-loader-2.2.0" = { + name = "string-replace-loader"; + packageName = "string-replace-loader"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-replace-loader/-/string-replace-loader-2.2.0.tgz"; + sha512 = "Ukt4ZC8+xVWdBRut3/iwnPJCNL1yV8AbVKXn8UcWdYrHgtuW4UDDAbBSi/J/CQDEWQBt824AJvPYahF23eJLRg=="; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "string-width-2.1.1" = { + name = "string-width"; + packageName = "string-width"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; + }; + }; "string-width-3.1.0" = { name = "string-width"; packageName = "string-width"; @@ -4361,22 +9941,40 @@ let sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; }; }; - "string.prototype.trimleft-2.1.1" = { + "string.prototype.trimend-1.0.0" = { + name = "string.prototype.trimend"; + packageName = "string.prototype.trimend"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz"; + sha512 = "EEJnGqa/xNfIg05SxiPSqRS7S9qwDhYts1TSLR1BQfYUfPe1stofgGKvwERK9+9yf+PpfBMlpBaCHucXGPQfUA=="; + }; + }; + "string.prototype.trimleft-2.1.2" = { name = "string.prototype.trimleft"; packageName = "string.prototype.trimleft"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz"; - sha512 = "iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag=="; + url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz"; + sha512 = "gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw=="; }; }; - "string.prototype.trimright-2.1.1" = { + "string.prototype.trimright-2.1.2" = { name = "string.prototype.trimright"; packageName = "string.prototype.trimright"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz"; - sha512 = "qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g=="; + url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; + sha512 = "ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg=="; + }; + }; + "string.prototype.trimstart-1.0.0" = { + name = "string.prototype.trimstart"; + packageName = "string.prototype.trimstart"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz"; + sha512 = "iCP8g01NFYiiBOnwG1Xc3WZLyoo+RuBymwIlWncShXDDJYWN6DbnM3odslBJdgCdRlq94B5s63NWAZlcn2CS4w=="; }; }; "string_decoder-0.10.31" = { @@ -4397,6 +9995,15 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; + "stringify-object-3.3.0" = { + name = "stringify-object"; + packageName = "stringify-object"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz"; + sha512 = "rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw=="; + }; + }; "strip-ansi-3.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -4406,6 +10013,15 @@ let sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; }; }; + "strip-ansi-4.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + }; "strip-ansi-5.2.0" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -4424,6 +10040,24 @@ let sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; }; }; + "strip-bom-2.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; + sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + }; + }; + "strip-comments-1.0.2" = { + name = "strip-comments"; + packageName = "strip-comments"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-comments/-/strip-comments-1.0.2.tgz"; + sha512 = "kL97alc47hoyIQSV165tTt9rG5dn4w1dNnBhOQ3bOU1Nc1hel09jnXANaHJ7vzHLd4Ju8kseDGzlev96pghLFw=="; + }; + }; "strip-eof-1.0.0" = { name = "strip-eof"; packageName = "strip-eof"; @@ -4451,6 +10085,24 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; + "style-loader-0.21.0" = { + name = "style-loader"; + packageName = "style-loader"; + version = "0.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/style-loader/-/style-loader-0.21.0.tgz"; + sha512 = "T+UNsAcl3Yg+BsPKs1vd22Fr8sVT+CJMtzqc6LEw9bbJZb43lm9GoeIfUcDEefBSWC0BhYbcdupV1GtI4DGzxg=="; + }; + }; + "stylehacks-4.0.3" = { + name = "stylehacks"; + packageName = "stylehacks"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz"; + sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; + }; + }; "sums-0.2.4" = { name = "sums"; packageName = "sums"; @@ -4478,6 +10130,15 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; + "supports-color-6.1.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz"; + sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ=="; + }; + }; "supports-color-7.1.0" = { name = "supports-color"; packageName = "supports-color"; @@ -4487,6 +10148,15 @@ let sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g=="; }; }; + "svgo-1.3.2" = { + name = "svgo"; + packageName = "svgo"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz"; + sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; + }; + }; "table-5.4.6" = { name = "table"; packageName = "table"; @@ -4496,6 +10166,15 @@ let sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; }; }; + "tapable-1.1.3" = { + name = "tapable"; + packageName = "tapable"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz"; + sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="; + }; + }; "tar-4.4.13" = { name = "tar"; packageName = "tar"; @@ -4523,6 +10202,33 @@ let sha512 = "WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA=="; }; }; + "terser-4.6.10" = { + name = "terser"; + packageName = "terser"; + version = "4.6.10"; + src = fetchurl { + url = "https://registry.npmjs.org/terser/-/terser-4.6.10.tgz"; + sha512 = "qbF/3UOo11Hggsbsqm2hPa6+L4w7bkr+09FNseEe8xrcVD3APGLFqE+Oz1ZKAxjYnFsj80rLOfgAtJ0LNJjtTA=="; + }; + }; + "terser-webpack-plugin-1.4.3" = { + name = "terser-webpack-plugin"; + packageName = "terser-webpack-plugin"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz"; + sha512 = "QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA=="; + }; + }; + "text-table-0.2.0" = { + name = "text-table"; + packageName = "text-table"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + }; "through-2.3.8" = { name = "through"; packageName = "through"; @@ -4550,6 +10256,15 @@ let sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; + "thunky-1.1.0" = { + name = "thunky"; + packageName = "thunky"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz"; + sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="; + }; + }; "timed-out-4.0.1" = { name = "timed-out"; packageName = "timed-out"; @@ -4559,6 +10274,24 @@ let sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; }; }; + "timers-browserify-2.0.11" = { + name = "timers-browserify"; + packageName = "timers-browserify"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz"; + sha512 = "60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ=="; + }; + }; + "timsort-0.3.0" = { + name = "timsort"; + packageName = "timsort"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz"; + sha1 = "405411a8e7e6339fe64db9a234de11dc31e02bd4"; + }; + }; "tmp-0.0.31" = { name = "tmp"; packageName = "tmp"; @@ -4595,6 +10328,24 @@ let sha1 = "23640dd7b42d00433911140820e5cf440e521dd1"; }; }; + "to-arraybuffer-1.0.1" = { + name = "to-arraybuffer"; + packageName = "to-arraybuffer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"; + sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; + }; + }; + "to-fast-properties-2.0.0" = { + name = "to-fast-properties"; + packageName = "to-fast-properties"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + }; "to-object-path-0.3.0" = { name = "to-object-path"; packageName = "to-object-path"; @@ -4703,6 +10454,15 @@ let sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="; }; }; + "tty-browserify-0.0.0" = { + name = "tty-browserify"; + packageName = "tty-browserify"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"; + sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; + }; + }; "tunnel-agent-0.6.0" = { name = "tunnel-agent"; packageName = "tunnel-agent"; @@ -4748,6 +10508,24 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; + "uglify-es-3.3.10" = { + name = "uglify-es"; + packageName = "uglify-es"; + version = "3.3.10"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.10.tgz"; + sha512 = "rPzPisCzW68Okj1zNrfa2dR9uEm43SevDmpR6FChoZABFk9dANGnzzBMgHYUXI3609//63fnVkyQ1SQmAMyjww=="; + }; + }; + "uglifyjs-webpack-plugin-1.3.0" = { + name = "uglifyjs-webpack-plugin"; + packageName = "uglifyjs-webpack-plugin"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz"; + sha512 = "ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw=="; + }; + }; "ultron-1.0.2" = { name = "ultron"; packageName = "ultron"; @@ -4766,6 +10544,42 @@ let sha512 = "UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="; }; }; + "unicode-canonical-property-names-ecmascript-1.0.4" = { + name = "unicode-canonical-property-names-ecmascript"; + packageName = "unicode-canonical-property-names-ecmascript"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; + sha512 = "jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="; + }; + }; + "unicode-match-property-ecmascript-1.0.4" = { + name = "unicode-match-property-ecmascript"; + packageName = "unicode-match-property-ecmascript"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; + sha512 = "L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg=="; + }; + }; + "unicode-match-property-value-ecmascript-1.2.0" = { + name = "unicode-match-property-value-ecmascript"; + packageName = "unicode-match-property-value-ecmascript"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; + sha512 = "wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ=="; + }; + }; + "unicode-property-aliases-ecmascript-1.1.0" = { + name = "unicode-property-aliases-ecmascript"; + packageName = "unicode-property-aliases-ecmascript"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; + sha512 = "PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg=="; + }; + }; "union-value-1.0.1" = { name = "union-value"; packageName = "union-value"; @@ -4775,6 +10589,42 @@ let sha512 = "tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg=="; }; }; + "uniq-1.0.1" = { + name = "uniq"; + packageName = "uniq"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz"; + sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; + }; + }; + "uniqs-2.0.0" = { + name = "uniqs"; + packageName = "uniqs"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz"; + sha1 = "ffede4b36b25290696e6e165d4a59edb998e6b02"; + }; + }; + "unique-filename-1.1.1" = { + name = "unique-filename"; + packageName = "unique-filename"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz"; + sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; + }; + }; + "unique-slug-2.0.2" = { + name = "unique-slug"; + packageName = "unique-slug"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz"; + sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; + }; + }; "universalify-0.1.2" = { name = "universalify"; packageName = "universalify"; @@ -4793,6 +10643,15 @@ let sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; }; }; + "unquote-1.1.1" = { + name = "unquote"; + packageName = "unquote"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz"; + sha1 = "8fded7324ec6e88a0ff8b905e7c098cdc086d544"; + }; + }; "unset-value-1.0.0" = { name = "unset-value"; packageName = "unset-value"; @@ -4811,6 +10670,15 @@ let sha512 = "NG1h/MdGIX3HzyqMjyj1laBCmlPYhcO4xEy7gEqqzGiSLw7XqDQCnY4nYSn5XSaH8mQ6TFkaujrO8d/PIZN85A=="; }; }; + "upath-1.2.0" = { + name = "upath"; + packageName = "upath"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz"; + sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="; + }; + }; "upgrade-1.1.0" = { name = "upgrade"; packageName = "upgrade"; @@ -4838,6 +10706,33 @@ let sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; }; }; + "url-0.11.0" = { + name = "url"; + packageName = "url"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz"; + sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + }; + }; + "url-loader-1.1.2" = { + name = "url-loader"; + packageName = "url-loader"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/url-loader/-/url-loader-1.1.2.tgz"; + sha512 = "dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg=="; + }; + }; + "url-parse-1.4.7" = { + name = "url-parse"; + packageName = "url-parse"; + version = "1.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz"; + sha512 = "d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg=="; + }; + }; "url-parse-lax-3.0.0" = { name = "url-parse-lax"; packageName = "url-parse-lax"; @@ -4865,6 +10760,24 @@ let sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; }; }; + "util-0.10.3" = { + name = "util"; + packageName = "util"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz"; + sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + }; + }; + "util-0.11.1" = { + name = "util"; + packageName = "util"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.11.1.tgz"; + sha512 = "HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ=="; + }; + }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; @@ -4874,6 +10787,15 @@ let sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; + "util.promisify-1.0.0" = { + name = "util.promisify"; + packageName = "util.promisify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"; + sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA=="; + }; + }; "util.promisify-1.0.1" = { name = "util.promisify"; packageName = "util.promisify"; @@ -4883,6 +10805,24 @@ let sha512 = "g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA=="; }; }; + "utila-0.4.0" = { + name = "utila"; + packageName = "utila"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz"; + sha1 = "8a16a05d445657a3aea5eecc5b12a4fa5379772c"; + }; + }; + "utile-0.3.0" = { + name = "utile"; + packageName = "utile"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utile/-/utile-0.3.0.tgz"; + sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a"; + }; + }; "utils-merge-1.0.1" = { name = "utils-merge"; packageName = "utils-merge"; @@ -4901,6 +10841,15 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; + "validate-npm-package-license-3.0.4" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; + }; + }; "vary-1.1.2" = { name = "vary"; packageName = "vary"; @@ -4910,6 +10859,15 @@ let sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; }; }; + "vendors-1.0.4" = { + name = "vendors"; + packageName = "vendors"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz"; + sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; + }; + }; "verror-1.10.0" = { name = "verror"; packageName = "verror"; @@ -4919,6 +10877,15 @@ let sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; + "vm-browserify-1.1.2" = { + name = "vm-browserify"; + packageName = "vm-browserify"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz"; + sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; + }; + }; "vscode-jsonrpc-5.0.1" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; @@ -4982,6 +10949,24 @@ let sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb"; }; }; + "watchpack-1.6.1" = { + name = "watchpack"; + packageName = "watchpack"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz"; + sha512 = "+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA=="; + }; + }; + "wbuf-1.7.3" = { + name = "wbuf"; + packageName = "wbuf"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz"; + sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; + }; + }; "web-tree-sitter-0.16.2" = { name = "web-tree-sitter"; packageName = "web-tree-sitter"; @@ -4991,6 +10976,87 @@ let sha512 = "vxZHqu4nItCARmE+oGvTgjFBrMbhEuGI9PWYSgF4ET/nLuW3K11KQQIVhAsoGtYvTI9jdbjc/THj38P7nhYwow=="; }; }; + "webpack-4.42.1" = { + name = "webpack"; + packageName = "webpack"; + version = "4.42.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz"; + sha512 = "SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg=="; + }; + }; + "webpack-dev-middleware-3.7.2" = { + name = "webpack-dev-middleware"; + packageName = "webpack-dev-middleware"; + version = "3.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz"; + sha512 = "1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw=="; + }; + }; + "webpack-dev-server-3.10.3" = { + name = "webpack-dev-server"; + packageName = "webpack-dev-server"; + version = "3.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz"; + sha512 = "e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ=="; + }; + }; + "webpack-log-2.0.0" = { + name = "webpack-log"; + packageName = "webpack-log"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz"; + sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg=="; + }; + }; + "webpack-manifest-plugin-2.2.0" = { + name = "webpack-manifest-plugin"; + packageName = "webpack-manifest-plugin"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-2.2.0.tgz"; + sha512 = "9S6YyKKKh/Oz/eryM1RyLVDVmy3NSPV0JXMRhZ18fJsq+AwGxUY34X54VNwkzYcEmEkDwNxuEOboCZEebJXBAQ=="; + }; + }; + "webpack-sources-1.4.3" = { + name = "webpack-sources"; + packageName = "webpack-sources"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz"; + sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; + }; + }; + "websocket-driver-0.7.3" = { + name = "websocket-driver"; + packageName = "websocket-driver"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz"; + sha512 = "bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg=="; + }; + }; + "websocket-extensions-0.1.3" = { + name = "websocket-extensions"; + packageName = "websocket-extensions"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz"; + sha512 = "nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg=="; + }; + }; + "whatwg-fetch-2.0.4" = { + name = "whatwg-fetch"; + packageName = "whatwg-fetch"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz"; + sha512 = "dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng=="; + }; + }; "which-1.3.1" = { name = "which"; packageName = "which"; @@ -5018,6 +11084,15 @@ let sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; }; + "which-module-1.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"; + sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; + }; + }; "which-module-2.0.0" = { name = "which-module"; packageName = "which-module"; @@ -5027,6 +11102,177 @@ let sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; }; }; + "winston-2.1.1" = { + name = "winston"; + packageName = "winston"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-2.1.1.tgz"; + sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; + }; + }; + "workbox-background-sync-4.3.1" = { + name = "workbox-background-sync"; + packageName = "workbox-background-sync"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-4.3.1.tgz"; + sha512 = "1uFkvU8JXi7L7fCHVBEEnc3asPpiAL33kO495UMcD5+arew9IbKW2rV5lpzhoWcm/qhGB89YfO4PmB/0hQwPRg=="; + }; + }; + "workbox-broadcast-update-4.3.1" = { + name = "workbox-broadcast-update"; + packageName = "workbox-broadcast-update"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-4.3.1.tgz"; + sha512 = "MTSfgzIljpKLTBPROo4IpKjESD86pPFlZwlvVG32Kb70hW+aob4Jxpblud8EhNb1/L5m43DUM4q7C+W6eQMMbA=="; + }; + }; + "workbox-build-4.3.1" = { + name = "workbox-build"; + packageName = "workbox-build"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-build/-/workbox-build-4.3.1.tgz"; + sha512 = "UHdwrN3FrDvicM3AqJS/J07X0KXj67R8Cg0waq1MKEOqzo89ap6zh6LmaLnRAjpB+bDIz+7OlPye9iii9KBnxw=="; + }; + }; + "workbox-cacheable-response-4.3.1" = { + name = "workbox-cacheable-response"; + packageName = "workbox-cacheable-response"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-4.3.1.tgz"; + sha512 = "Rp5qlzm6z8IOvnQNkCdO9qrDgDpoPNguovs0H8C+wswLuPgSzSp9p2afb5maUt9R1uTIwOXrVQMmPfPypv+npw=="; + }; + }; + "workbox-core-4.3.1" = { + name = "workbox-core"; + packageName = "workbox-core"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-core/-/workbox-core-4.3.1.tgz"; + sha512 = "I3C9jlLmMKPxAC1t0ExCq+QoAMd0vAAHULEgRZ7kieCdUd919n53WC0AfvokHNwqRhGn+tIIj7vcb5duCjs2Kg=="; + }; + }; + "workbox-expiration-4.3.1" = { + name = "workbox-expiration"; + packageName = "workbox-expiration"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-4.3.1.tgz"; + sha512 = "vsJLhgQsQouv9m0rpbXubT5jw0jMQdjpkum0uT+d9tTwhXcEZks7qLfQ9dGSaufTD2eimxbUOJfWLbNQpIDMPw=="; + }; + }; + "workbox-google-analytics-4.3.1" = { + name = "workbox-google-analytics"; + packageName = "workbox-google-analytics"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-4.3.1.tgz"; + sha512 = "xzCjAoKuOb55CBSwQrbyWBKqp35yg1vw9ohIlU2wTy06ZrYfJ8rKochb1MSGlnoBfXGWss3UPzxR5QL5guIFdg=="; + }; + }; + "workbox-navigation-preload-4.3.1" = { + name = "workbox-navigation-preload"; + packageName = "workbox-navigation-preload"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-4.3.1.tgz"; + sha512 = "K076n3oFHYp16/C+F8CwrRqD25GitA6Rkd6+qAmLmMv1QHPI2jfDwYqrytOfKfYq42bYtW8Pr21ejZX7GvALOw=="; + }; + }; + "workbox-precaching-4.3.1" = { + name = "workbox-precaching"; + packageName = "workbox-precaching"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-4.3.1.tgz"; + sha512 = "piSg/2csPoIi/vPpp48t1q5JLYjMkmg5gsXBQkh/QYapCdVwwmKlU9mHdmy52KsDGIjVaqEUMFvEzn2LRaigqQ=="; + }; + }; + "workbox-range-requests-4.3.1" = { + name = "workbox-range-requests"; + packageName = "workbox-range-requests"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-4.3.1.tgz"; + sha512 = "S+HhL9+iTFypJZ/yQSl/x2Bf5pWnbXdd3j57xnb0V60FW1LVn9LRZkPtneODklzYuFZv7qK6riZ5BNyc0R0jZA=="; + }; + }; + "workbox-routing-4.3.1" = { + name = "workbox-routing"; + packageName = "workbox-routing"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-routing/-/workbox-routing-4.3.1.tgz"; + sha512 = "FkbtrODA4Imsi0p7TW9u9MXuQ5P4pVs1sWHK4dJMMChVROsbEltuE79fBoIk/BCztvOJ7yUpErMKa4z3uQLX+g=="; + }; + }; + "workbox-strategies-4.3.1" = { + name = "workbox-strategies"; + packageName = "workbox-strategies"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-4.3.1.tgz"; + sha512 = "F/+E57BmVG8dX6dCCopBlkDvvhg/zj6VDs0PigYwSN23L8hseSRwljrceU2WzTvk/+BSYICsWmRq5qHS2UYzhw=="; + }; + }; + "workbox-streams-4.3.1" = { + name = "workbox-streams"; + packageName = "workbox-streams"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-streams/-/workbox-streams-4.3.1.tgz"; + sha512 = "4Kisis1f/y0ihf4l3u/+ndMkJkIT4/6UOacU3A4BwZSAC9pQ9vSvJpIi/WFGQRH/uPXvuVjF5c2RfIPQFSS2uA=="; + }; + }; + "workbox-sw-4.3.1" = { + name = "workbox-sw"; + packageName = "workbox-sw"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-sw/-/workbox-sw-4.3.1.tgz"; + sha512 = "0jXdusCL2uC5gM3yYFT6QMBzKfBr2XTk0g5TPAV4y8IZDyVNDyj1a8uSXy3/XrvkVTmQvLN4O5k3JawGReXr9w=="; + }; + }; + "workbox-webpack-plugin-4.3.1" = { + name = "workbox-webpack-plugin"; + packageName = "workbox-webpack-plugin"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-4.3.1.tgz"; + sha512 = "gJ9jd8Mb8wHLbRz9ZvGN57IAmknOipD3W4XNE/Lk/4lqs5Htw4WOQgakQy/o/4CoXQlMCYldaqUg+EJ35l9MEQ=="; + }; + }; + "workbox-window-4.3.1" = { + name = "workbox-window"; + packageName = "workbox-window"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-window/-/workbox-window-4.3.1.tgz"; + sha512 = "C5gWKh6I58w3GeSc0wp2Ne+rqVw8qwcmZnQGpjiek8A2wpbxSJb1FdCoQVO+jDJs35bFgo/WETgl1fqgsxN0Hg=="; + }; + }; + "worker-farm-1.7.0" = { + name = "worker-farm"; + packageName = "worker-farm"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz"; + sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; + }; + }; + "wrap-ansi-2.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + }; + }; "wrap-ansi-5.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -5117,6 +11363,15 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; + "y18n-3.2.1" = { + name = "y18n"; + packageName = "y18n"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; + sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; + }; + }; "y18n-4.0.0" = { name = "y18n"; packageName = "y18n"; @@ -5144,6 +11399,15 @@ let sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; }; }; + "yargs-12.0.5" = { + name = "yargs"; + packageName = "yargs"; + version = "12.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz"; + sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw=="; + }; + }; "yargs-13.3.2" = { name = "yargs"; packageName = "yargs"; @@ -5162,6 +11426,24 @@ let sha512 = "92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA=="; }; }; + "yargs-6.6.0" = { + name = "yargs"; + packageName = "yargs"; + version = "6.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; + sha1 = "782ec21ef403345f830a808ca3d513af56065208"; + }; + }; + "yargs-parser-11.1.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "11.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz"; + sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ=="; + }; + }; "yargs-parser-13.1.2" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -5171,13 +11453,22 @@ let sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; }; }; - "yargs-parser-18.1.1" = { + "yargs-parser-18.1.2" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "18.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz"; + sha512 = "hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ=="; + }; + }; + "yargs-parser-4.2.1" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "18.1.1"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.1.tgz"; - sha512 = "KRHEsOM16IX7XuLnMOqImcPNbLVXMNHYAoFc3BKR8Ortl5gzDbtXvvEoGx9imk5E+X1VeNKNlcHr8B8vi+7ipA=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; + sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; }; }; "yn-4.0.0" = { @@ -5313,7 +11604,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-1.0.7" sources."proxy-addr-2.0.6" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.7.0" sources."range-parser-1.2.1" @@ -5475,7 +11766,7 @@ in sources."get-caller-file-2.0.5" sources."getpass-0.1.7" sources."glob-7.1.4" - sources."glob-parent-5.1.0" + sources."glob-parent-5.1.1" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -5511,7 +11802,7 @@ in sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.3" + sources."mkdirp-0.5.5" sources."moment-2.24.0" sources."murmur-hash-js-1.0.0" sources."mustache-3.2.1" @@ -5535,9 +11826,9 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."performance-now-2.1.0" - sources."picomatch-2.2.1" + sources."picomatch-2.2.2" sources."pseudomap-1.0.2" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readdirp-3.1.3" @@ -5609,7 +11900,7 @@ in sources."strip-ansi-6.0.0" ]; }) - sources."yargs-parser-18.1.1" + sources."yargs-parser-18.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -5711,7 +12002,7 @@ in sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -5931,7 +12222,7 @@ in sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -5984,8 +12275,10 @@ in }) sources."statuses-1.5.0" sources."strict-uri-encode-1.1.0" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.0" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.0" sources."string_decoder-1.1.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" @@ -6040,10 +12333,10 @@ in "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage { name = "_at_elm-tooling_slash_elm-language-server"; packageName = "@elm-tooling/elm-language-server"; - version = "1.6.3"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.6.3.tgz"; - sha512 = "8liKU5tfKrldgNtE8GNGEUlZM+o7Qfjycn3gnyzzKqWEBCjkxeuU6VwWaIozw5k/xfJqHcIDb5nFPsqEadO5Ig=="; + url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.7.1.tgz"; + sha512 = "/VsKUfM5wnthtoAGbofnuknXhHFTbh+aeloRQtoSP6uXTMY0UwvaSEXI0YsvigWL+OpxT71bCXAVjkbkBhUFiw=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" @@ -6073,7 +12366,7 @@ in sources."cookie-signature-1.0.6" sources."core-js-2.6.11" sources."core-util-is-1.0.2" - sources."cross-spawn-7.0.1" + sources."cross-spawn-7.0.2" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."delayed-stream-1.0.0" @@ -6121,7 +12414,7 @@ in sources."fast-diff-1.2.0" sources."fast-glob-3.2.2" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.6.1" + sources."fastq-1.7.0" sources."fill-range-7.0.1" (sources."finalhandler-1.1.1" // { dependencies = [ @@ -6136,7 +12429,7 @@ in sources."fs-extra-2.0.0" sources."get-stream-5.1.0" sources."getpass-0.1.7" - sources."glob-parent-5.1.0" + sources."glob-parent-5.1.1" sources."globby-11.0.0" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" @@ -6192,11 +12485,11 @@ in sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."performance-now-2.1.0" - sources."picomatch-2.2.1" + sources."picomatch-2.2.2" sources."pjson-1.0.9" sources."process-nextick-args-1.0.7" sources."proxy-addr-2.0.6" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" @@ -6212,7 +12505,7 @@ in }) sources."reusify-1.0.4" sources."run-parallel-1.1.9" - sources."rxjs-6.5.4" + sources."rxjs-6.5.5" sources."safe-buffer-5.1.1" sources."safer-buffer-2.1.2" (sources."send-0.16.2" // { @@ -6226,7 +12519,7 @@ in sources."setprototypeof-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."slash-3.0.0" sources."sshpk-1.16.1" sources."statuses-1.5.0" @@ -6324,7 +12617,7 @@ in }) sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - (sources."follow-redirects-1.10.0" // { + (sources."follow-redirects-1.11.0" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -6333,7 +12626,7 @@ in sources."fresh-0.5.2" sources."fsevents-2.1.2" sources."get-stream-4.1.0" - sources."glob-parent-5.1.0" + sources."glob-parent-5.1.1" sources."has-ansi-2.0.0" sources."http-errors-1.7.3" sources."http-proxy-1.17.0" @@ -6364,11 +12657,11 @@ in sources."parseurl-1.3.3" sources."path-key-2.0.1" sources."pem-1.14.2" - sources."picomatch-2.2.1" + sources."picomatch-2.2.2" sources."pseudomap-1.0.2" sources."pump-3.0.0" sources."range-parser-1.2.1" - sources."readdirp-3.3.0" + sources."readdirp-3.4.0" sources."requires-port-1.0.0" sources."semver-5.7.1" (sources."send-0.17.1" // { @@ -6381,7 +12674,7 @@ in sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."statuses-1.5.0" sources."strip-ansi-3.0.1" sources."strip-eof-1.0.0" @@ -6466,7 +12759,7 @@ in sources."fsevents-2.1.2" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."glob-parent-5.1.0" + sources."glob-parent-5.1.1" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -6494,7 +12787,7 @@ in sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.3" + sources."mkdirp-0.5.5" sources."murmur-hash-js-1.0.0" sources."mustache-3.2.1" sources."nice-try-1.0.5" @@ -6513,8 +12806,8 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."performance-now-2.1.0" - sources."picomatch-2.2.1" - sources."psl-1.7.0" + sources."picomatch-2.2.2" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readdirp-3.2.0" @@ -6573,9 +12866,9 @@ in sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-13.9.1" + sources."@types/node-13.11.0" sources."@types/responselike-1.0.0" - sources."cacheable-lookup-2.0.0" + sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.1" sources."caw-2.0.1" (sources."clone-response-1.0.2" // { @@ -6591,7 +12884,7 @@ in sources."fs-extra-8.1.0" sources."get-proxy-2.1.0" sources."get-stream-5.1.0" - sources."got-10.6.0" + sources."got-10.7.0" sources."graceful-fs-4.2.3" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" @@ -6718,7 +13011,7 @@ in sources."get-caller-file-2.0.5" sources."getpass-0.1.7" sources."glob-7.1.4" - sources."glob-parent-5.1.0" + sources."glob-parent-5.1.1" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -6748,7 +13041,7 @@ in sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.3" + sources."mkdirp-0.5.5" sources."murmur-hash-js-1.0.0" sources."mustache-3.2.1" sources."nice-try-1.0.5" @@ -6769,8 +13062,8 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."performance-now-2.1.0" - sources."picomatch-2.2.1" - sources."psl-1.7.0" + sources."picomatch-2.2.2" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readdirp-3.1.3" @@ -6873,4 +13166,1830 @@ in bypassCache = true; reconstructLock = true; }; + create-elm-app = nodeEnv.buildNodePackage { + name = "create-elm-app"; + packageName = "create-elm-app"; + version = "4.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/create-elm-app/-/create-elm-app-4.2.4.tgz"; + sha512 = "BtALhZG5T+95hYpmgobaxn5XhgcuQDgP5Gt8/HGbD2OREhHxo09qiU6wx+UJfAGf5BYjPH1s5hWRBU+DwS52AA=="; + }; + dependencies = [ + sources."@babel/cli-7.2.3" + sources."@babel/code-frame-7.8.3" + sources."@babel/core-7.3.4" + sources."@babel/generator-7.9.4" + sources."@babel/helper-annotate-as-pure-7.8.3" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" + sources."@babel/helper-create-regexp-features-plugin-7.8.8" + sources."@babel/helper-define-map-7.8.3" + sources."@babel/helper-explode-assignable-expression-7.8.3" + sources."@babel/helper-function-name-7.8.3" + sources."@babel/helper-get-function-arity-7.8.3" + sources."@babel/helper-hoist-variables-7.8.3" + sources."@babel/helper-member-expression-to-functions-7.8.3" + sources."@babel/helper-module-imports-7.8.3" + sources."@babel/helper-module-transforms-7.9.0" + sources."@babel/helper-optimise-call-expression-7.8.3" + sources."@babel/helper-plugin-utils-7.8.3" + sources."@babel/helper-regex-7.8.3" + sources."@babel/helper-remap-async-to-generator-7.8.3" + sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-simple-access-7.8.3" + sources."@babel/helper-split-export-declaration-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/helper-wrap-function-7.8.3" + sources."@babel/helpers-7.9.2" + sources."@babel/highlight-7.9.0" + sources."@babel/parser-7.9.4" + sources."@babel/plugin-proposal-async-generator-functions-7.8.3" + sources."@babel/plugin-proposal-json-strings-7.8.3" + sources."@babel/plugin-proposal-object-rest-spread-7.9.0" + sources."@babel/plugin-proposal-optional-catch-binding-7.8.3" + sources."@babel/plugin-proposal-unicode-property-regex-7.8.8" + sources."@babel/plugin-syntax-async-generators-7.8.4" + sources."@babel/plugin-syntax-json-strings-7.8.3" + sources."@babel/plugin-syntax-object-rest-spread-7.8.3" + sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" + sources."@babel/plugin-transform-arrow-functions-7.8.3" + sources."@babel/plugin-transform-async-to-generator-7.8.3" + sources."@babel/plugin-transform-block-scoped-functions-7.8.3" + sources."@babel/plugin-transform-block-scoping-7.8.3" + sources."@babel/plugin-transform-classes-7.9.2" + sources."@babel/plugin-transform-computed-properties-7.8.3" + sources."@babel/plugin-transform-destructuring-7.8.8" + sources."@babel/plugin-transform-dotall-regex-7.8.3" + sources."@babel/plugin-transform-duplicate-keys-7.8.3" + sources."@babel/plugin-transform-exponentiation-operator-7.8.3" + sources."@babel/plugin-transform-for-of-7.9.0" + sources."@babel/plugin-transform-function-name-7.8.3" + sources."@babel/plugin-transform-literals-7.8.3" + sources."@babel/plugin-transform-modules-amd-7.9.0" + sources."@babel/plugin-transform-modules-commonjs-7.9.0" + sources."@babel/plugin-transform-modules-systemjs-7.9.0" + sources."@babel/plugin-transform-modules-umd-7.9.0" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" + sources."@babel/plugin-transform-new-target-7.8.3" + sources."@babel/plugin-transform-object-super-7.8.3" + sources."@babel/plugin-transform-parameters-7.9.3" + sources."@babel/plugin-transform-regenerator-7.8.7" + sources."@babel/plugin-transform-runtime-7.3.4" + sources."@babel/plugin-transform-shorthand-properties-7.8.3" + sources."@babel/plugin-transform-spread-7.8.3" + sources."@babel/plugin-transform-sticky-regex-7.8.3" + sources."@babel/plugin-transform-template-literals-7.8.3" + sources."@babel/plugin-transform-typeof-symbol-7.8.4" + sources."@babel/plugin-transform-unicode-regex-7.8.3" + sources."@babel/preset-env-7.3.4" + (sources."@babel/runtime-7.3.4" // { + dependencies = [ + sources."regenerator-runtime-0.12.1" + ]; + }) + sources."@babel/template-7.8.6" + sources."@babel/traverse-7.9.0" + sources."@babel/types-7.9.0" + sources."@hapi/address-2.1.4" + sources."@hapi/bourne-1.3.2" + sources."@hapi/hoek-8.5.1" + sources."@hapi/joi-15.1.1" + sources."@hapi/topo-3.1.6" + sources."@mrmlnc/readdir-enhanced-2.2.1" + sources."@nodelib/fs.stat-1.1.3" + sources."@types/anymatch-1.3.1" + sources."@types/color-name-1.1.1" + sources."@types/events-3.0.0" + sources."@types/glob-7.1.1" + sources."@types/html-minifier-terser-5.0.0" + sources."@types/minimatch-3.0.3" + sources."@types/node-13.11.0" + sources."@types/q-1.5.2" + sources."@types/source-list-map-0.1.2" + sources."@types/tapable-1.0.5" + (sources."@types/uglify-js-3.0.5" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."@types/webpack-4.41.10" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."@types/webpack-sources-0.1.7" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."@webassemblyjs/ast-1.9.0" + sources."@webassemblyjs/floating-point-hex-parser-1.9.0" + sources."@webassemblyjs/helper-api-error-1.9.0" + sources."@webassemblyjs/helper-buffer-1.9.0" + sources."@webassemblyjs/helper-code-frame-1.9.0" + sources."@webassemblyjs/helper-fsm-1.9.0" + sources."@webassemblyjs/helper-module-context-1.9.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" + sources."@webassemblyjs/helper-wasm-section-1.9.0" + sources."@webassemblyjs/ieee754-1.9.0" + sources."@webassemblyjs/leb128-1.9.0" + sources."@webassemblyjs/utf8-1.9.0" + sources."@webassemblyjs/wasm-edit-1.9.0" + sources."@webassemblyjs/wasm-gen-1.9.0" + sources."@webassemblyjs/wasm-opt-1.9.0" + sources."@webassemblyjs/wasm-parser-1.9.0" + sources."@webassemblyjs/wast-parser-1.9.0" + sources."@webassemblyjs/wast-printer-1.9.0" + sources."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.2" + sources."accepts-1.3.7" + sources."acorn-6.4.1" + sources."address-1.0.3" + sources."ajv-6.12.0" + sources."ajv-errors-1.0.1" + sources."ajv-keywords-3.4.1" + sources."alphanum-sort-1.0.2" + sources."ansi-colors-3.2.4" + sources."ansi-escapes-3.2.0" + sources."ansi-html-0.0.7" + sources."ansi-regex-2.1.1" + sources."ansi-styles-3.2.1" + sources."anymatch-3.1.1" + sources."aproba-1.2.0" + sources."argparse-1.0.10" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-filter-0.0.1" + sources."array-flatten-2.1.2" + sources."array-map-0.0.0" + sources."array-reduce-0.0.0" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."array-unique-0.3.2" + sources."asap-2.0.6" + sources."asn1-0.2.4" + sources."asn1.js-4.10.1" + (sources."assert-1.5.0" // { + dependencies = [ + sources."inherits-2.0.1" + sources."util-0.10.3" + ]; + }) + sources."assert-plus-1.0.0" + (sources."assets-webpack-plugin-3.9.12" // { + dependencies = [ + sources."mkdirp-0.5.3" + ]; + }) + sources."assign-symbols-1.0.0" + sources."async-0.9.2" + sources."async-each-1.0.3" + sources."async-limiter-1.0.1" + sources."asynckit-0.4.0" + sources."atob-2.1.2" + (sources."autoprefixer-8.6.5" // { + dependencies = [ + sources."browserslist-3.2.8" + ]; + }) + sources."aws-sign2-0.7.0" + sources."aws4-1.9.1" + sources."babel-extract-comments-1.0.0" + sources."babel-loader-8.0.4" + sources."babel-plugin-dynamic-import-node-2.3.0" + sources."babel-plugin-syntax-object-rest-spread-6.13.0" + sources."babel-plugin-transform-object-rest-spread-6.26.0" + (sources."babel-runtime-6.26.0" // { + dependencies = [ + sources."regenerator-runtime-0.11.1" + ]; + }) + sources."babylon-6.18.0" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."base64-js-1.3.1" + sources."batch-0.6.1" + sources."bcrypt-pbkdf-1.0.2" + sources."big.js-5.2.2" + sources."binary-0.3.0" + sources."binary-extensions-2.0.0" + sources."bindings-1.5.0" + sources."binwrap-0.2.2" + sources."bluebird-3.7.2" + sources."bn.js-4.11.8" + (sources."body-parser-1.19.0" // { + dependencies = [ + sources."bytes-3.1.0" + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."qs-6.7.0" + ]; + }) + (sources."bonjour-3.5.0" // { + dependencies = [ + sources."deep-equal-1.1.1" + ]; + }) + sources."boolbase-1.0.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."brorand-1.1.0" + sources."browserify-aes-1.2.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.2" + sources."browserify-rsa-4.0.1" + sources."browserify-sign-4.0.4" + sources."browserify-zlib-0.2.0" + sources."browserslist-4.11.1" + sources."buffer-4.9.2" + sources."buffer-from-1.1.1" + sources."buffer-indexof-1.1.1" + sources."buffer-xor-1.0.3" + sources."buffers-0.1.1" + sources."builtin-status-codes-3.0.0" + sources."bytes-3.0.0" + sources."cacache-12.0.4" + sources."cache-base-1.0.1" + sources."call-me-maybe-1.0.1" + sources."caller-callsite-2.0.0" + sources."caller-path-2.0.0" + sources."callsites-2.0.0" + sources."camel-case-4.1.1" + sources."camelcase-5.3.1" + sources."caniuse-api-3.0.0" + sources."caniuse-lite-1.0.30001039" + sources."case-sensitive-paths-webpack-plugin-2.3.0" + sources."caseless-0.12.0" + sources."chainsaw-0.1.0" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."chardet-0.7.0" + (sources."chokidar-3.3.0" // { + dependencies = [ + sources."glob-parent-5.1.1" + ]; + }) + sources."chownr-1.1.4" + sources."chrome-trace-event-1.0.2" + sources."cipher-base-1.0.4" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."clean-css-4.2.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."cli-cursor-2.1.0" + sources."cli-table-0.3.1" + sources."cli-width-2.2.0" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."strip-ansi-3.0.1" + ]; + }) + sources."coa-2.0.2" + sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" + sources."color-3.1.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."color-string-1.5.3" + sources."colors-1.0.3" + sources."combined-stream-1.0.8" + sources."commander-2.20.3" + sources."common-tags-1.8.0" + sources."commondir-1.0.1" + sources."component-emitter-1.3.0" + sources."compressible-2.0.18" + (sources."compression-1.7.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."connect-history-api-fallback-1.6.0" + sources."console-browserify-1.2.0" + sources."constants-browserify-1.0.0" + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."convert-source-map-1.7.0" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."copy-concurrently-1.0.5" + sources."copy-descriptor-0.1.1" + (sources."copy-webpack-plugin-5.1.1" // { + dependencies = [ + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."make-dir-2.1.0" + sources."p-limit-2.2.2" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."pify-4.0.1" + sources."pkg-dir-3.0.0" + ]; + }) + sources."core-js-2.6.11" + sources."core-util-is-1.0.2" + sources."cosmiconfig-5.2.1" + sources."create-ecdh-4.0.3" + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" + sources."cross-spawn-6.0.5" + sources."crypto-browserify-3.12.0" + sources."css-color-names-0.0.4" + (sources."css-declaration-sorter-4.0.1" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."css-loader-3.4.2" // { + dependencies = [ + sources."postcss-7.0.27" + sources."postcss-value-parser-4.0.3" + sources."schema-utils-2.6.5" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + sources."css-select-1.2.0" + sources."css-select-base-adapter-0.1.1" + (sources."css-tree-1.0.0-alpha.37" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."css-what-2.1.3" + sources."cssesc-3.0.0" + (sources."cssnano-4.1.10" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."cssnano-preset-default-4.0.7" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + sources."cssnano-util-get-arguments-4.0.0" + sources."cssnano-util-get-match-4.0.0" + (sources."cssnano-util-raw-cache-4.0.1" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + sources."cssnano-util-same-parent-4.0.1" + (sources."csso-4.0.3" // { + dependencies = [ + sources."css-tree-1.0.0-alpha.39" + sources."mdn-data-2.0.6" + sources."source-map-0.6.1" + ]; + }) + sources."cycle-1.0.3" + sources."cyclist-1.0.1" + sources."dashdash-1.14.1" + sources."debug-4.1.1" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."deep-equal-0.2.2" + sources."default-gateway-4.2.0" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + (sources."del-4.1.1" // { + dependencies = [ + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + sources."pify-4.0.1" + ]; + }) + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."des.js-1.0.1" + sources."destroy-1.0.4" + sources."detect-node-2.0.4" + (sources."detect-port-alt-1.1.6" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."diffie-hellman-5.0.3" + sources."dir-glob-2.2.2" + sources."dns-equal-1.0.0" + sources."dns-packet-1.3.1" + sources."dns-txt-2.0.2" + sources."dom-converter-0.2.0" + (sources."dom-serializer-0.2.2" // { + dependencies = [ + sources."domelementtype-2.0.1" + ]; + }) + sources."domain-browser-1.2.0" + sources."domelementtype-1.3.1" + sources."domhandler-2.4.2" + sources."domutils-1.5.1" + sources."dot-case-3.0.3" + sources."dot-prop-5.2.0" + sources."dotenv-5.0.1" + sources."duplexer-0.1.1" + sources."duplexify-3.7.1" + sources."ecc-jsbn-0.1.2" + sources."ee-first-1.1.1" + sources."electron-to-chromium-1.3.397" + sources."elliptic-6.5.2" + sources."elm-0.19.1-3" + sources."elm-asset-webpack-loader-1.1.2" + sources."elm-hot-1.1.4" + sources."elm-hot-webpack-loader-1.1.6" + (sources."elm-test-0.19.1-revision2" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."cross-spawn-7.0.1" + sources."fs-extra-8.1.0" + sources."has-flag-4.0.0" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."supports-color-7.1.0" + sources."which-2.0.1" + ]; + }) + sources."elm-webpack-loader-6.0.0" + sources."elmi-to-json-1.3.0" + sources."emojis-list-3.0.0" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" + (sources."enhanced-resolve-4.1.1" // { + dependencies = [ + sources."memory-fs-0.5.0" + ]; + }) + sources."entities-2.0.0" + sources."errno-0.1.7" + sources."error-ex-1.3.2" + sources."es-abstract-1.17.5" + sources."es-to-primitive-1.2.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-2.0.0" + sources."eslint-scope-4.0.3" + sources."esprima-4.0.1" + sources."esrecurse-4.2.1" + sources."estraverse-4.3.0" + sources."etag-1.8.1" + sources."eventemitter3-4.0.0" + sources."events-3.1.0" + sources."eventsource-0.1.6" + sources."evp_bytestokey-1.0.3" + sources."execa-1.0.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + sources."expand-tilde-2.0.2" + (sources."express-4.17.1" // { + dependencies = [ + sources."array-flatten-1.1.1" + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."qs-6.7.0" + ]; + }) + sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."external-editor-3.1.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."extsprintf-1.3.0" + sources."eyes-0.1.8" + sources."fast-deep-equal-3.1.1" + (sources."fast-glob-2.2.7" // { + dependencies = [ + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) + sources."fast-json-stable-stringify-2.1.0" + sources."faye-websocket-0.11.3" + sources."figgy-pudding-3.5.2" + (sources."figures-2.0.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) + (sources."file-loader-1.1.11" // { + dependencies = [ + sources."schema-utils-0.4.7" + ]; + }) + sources."file-uri-to-path-1.0.0" + sources."filesize-3.6.1" + sources."fill-range-7.0.1" + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."find-cache-dir-1.0.0" + (sources."find-elm-dependencies-2.0.2" // { + dependencies = [ + sources."firstline-1.2.0" + ]; + }) + sources."find-parent-dir-0.3.0" + sources."find-up-2.1.0" + sources."firstline-2.0.2" + sources."flush-write-stream-1.1.1" + (sources."follow-redirects-1.11.0" // { + dependencies = [ + sources."debug-3.2.6" + ]; + }) + sources."for-in-1.0.2" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."forwarded-0.1.2" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."from2-2.3.0" + sources."fs-extra-6.0.1" + sources."fs-minipass-1.2.7" + sources."fs-readdir-recursive-1.1.0" + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" + sources."fsevents-2.1.2" + sources."function-bind-1.1.1" + sources."get-caller-file-1.0.3" + sources."get-own-enumerable-property-symbols-3.0.2" + sources."get-stream-4.1.0" + sources."get-value-2.0.6" + sources."getpass-0.1.7" + sources."glob-7.1.6" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."glob-to-regexp-0.3.0" + sources."global-modules-1.0.0" + sources."global-prefix-1.0.2" + sources."globals-11.12.0" + (sources."globby-7.1.1" // { + dependencies = [ + sources."slash-1.0.0" + ]; + }) + sources."graceful-fs-4.2.3" + sources."gzip-size-5.0.0" + sources."handle-thing-2.0.1" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."has-1.0.3" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + sources."hash-base-3.0.4" + sources."hash.js-1.1.7" + sources."he-1.2.0" + sources."hex-color-regex-1.1.0" + sources."hmac-drbg-1.0.1" + sources."homedir-polyfill-1.0.3" + sources."hosted-git-info-2.8.8" + sources."hpack.js-2.1.6" + sources."hsl-regex-1.0.0" + sources."hsla-regex-1.0.0" + sources."html-comment-regex-1.1.2" + sources."html-entities-1.2.1" + (sources."html-minifier-terser-5.0.5" // { + dependencies = [ + sources."commander-4.1.1" + ]; + }) + (sources."html-webpack-plugin-4.0.4" // { + dependencies = [ + sources."util.promisify-1.0.0" + ]; + }) + (sources."htmlparser2-3.10.1" // { + dependencies = [ + sources."entities-1.1.2" + sources."readable-stream-3.6.0" + ]; + }) + sources."http-deceiver-1.2.7" + (sources."http-errors-1.7.2" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."http-parser-js-0.4.10" + sources."http-proxy-1.18.0" + sources."http-proxy-middleware-0.20.0" + sources."http-signature-1.2.0" + sources."https-browserify-1.0.0" + sources."i-0.3.6" + sources."iconv-lite-0.4.24" + (sources."icss-utils-4.1.1" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + sources."ieee754-1.1.13" + sources."iferr-0.1.5" + sources."ignore-3.3.10" + sources."immer-1.7.2" + sources."import-fresh-2.0.0" + (sources."import-local-2.0.0" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.2.2" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."pkg-dir-3.0.0" + ]; + }) + sources."imurmurhash-0.1.4" + sources."indexes-of-1.0.1" + sources."infer-owner-1.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + (sources."inquirer-6.2.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."mute-stream-0.0.7" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + sources."internal-ip-4.3.0" + sources."invariant-2.2.4" + sources."invert-kv-1.0.0" + sources."ip-1.1.5" + sources."ip-regex-2.1.0" + sources."ipaddr.js-1.9.1" + sources."is-absolute-url-2.1.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-arguments-1.0.4" + sources."is-arrayish-0.2.1" + sources."is-binary-path-2.1.0" + sources."is-buffer-1.1.6" + sources."is-callable-1.1.5" + sources."is-color-stop-1.1.0" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.2" + sources."is-descriptor-1.0.2" + sources."is-directory-0.3.1" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."is-obj-2.0.0" + sources."is-path-cwd-2.2.0" + sources."is-path-in-cwd-2.1.0" + sources."is-path-inside-2.1.0" + sources."is-plain-obj-1.1.0" + sources."is-plain-object-2.0.4" + sources."is-promise-2.1.0" + sources."is-regex-1.0.5" + sources."is-regexp-1.0.0" + sources."is-resolvable-1.1.0" + sources."is-root-2.0.0" + sources."is-stream-1.1.0" + sources."is-svg-3.0.0" + sources."is-symbol-1.0.3" + sources."is-typedarray-1.0.0" + sources."is-utf8-0.2.1" + sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."isstream-0.1.2" + sources."js-levenshtein-1.1.6" + sources."js-tokens-4.0.0" + sources."js-yaml-3.13.1" + sources."jsbn-0.1.1" + sources."jsesc-2.5.2" + sources."json-parse-better-errors-1.0.2" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."json3-3.3.3" + sources."json5-2.1.2" + sources."jsonfile-4.0.0" + sources."jsonify-0.0.0" + sources."jsprim-1.4.1" + sources."killable-1.0.1" + sources."kind-of-6.0.3" + sources."last-call-webpack-plugin-3.0.0" + sources."lcid-1.0.0" + (sources."load-json-file-1.1.0" // { + dependencies = [ + sources."parse-json-2.2.0" + sources."pify-2.3.0" + ]; + }) + sources."loader-runner-2.4.0" + (sources."loader-utils-1.4.0" // { + dependencies = [ + sources."json5-1.0.1" + ]; + }) + sources."locate-path-2.0.0" + sources."lodash-4.17.15" + sources."lodash._reinterpolate-3.0.0" + sources."lodash.memoize-4.1.2" + sources."lodash.template-4.5.0" + sources."lodash.templatesettings-4.2.0" + sources."lodash.uniq-4.5.0" + sources."loglevel-1.6.7" + sources."loose-envify-1.4.0" + sources."lower-case-2.0.1" + sources."lru-cache-5.1.1" + sources."make-dir-1.3.0" + sources."map-age-cleaner-0.1.3" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."md5.js-1.3.5" + sources."mdn-data-2.0.4" + sources."media-typer-0.3.0" + (sources."mem-4.3.0" // { + dependencies = [ + sources."mimic-fn-2.1.0" + ]; + }) + sources."memory-fs-0.4.1" + sources."merge-descriptors-1.0.1" + sources."merge2-1.3.0" + sources."methods-1.1.2" + sources."micromatch-4.0.2" + sources."miller-rabin-4.0.1" + sources."mime-2.4.4" + sources."mime-db-1.43.0" + sources."mime-types-2.1.26" + sources."mimic-fn-1.2.0" + sources."mini-css-extract-plugin-0.4.5" + sources."minimalistic-assert-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."mississippi-3.0.0" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-0.5.5" + sources."move-concurrently-1.0.1" + sources."ms-2.1.2" + sources."multicast-dns-6.2.3" + sources."multicast-dns-service-types-1.1.0" + sources."murmur-hash-js-1.0.0" + sources."mustache-3.2.1" + sources."mute-stream-0.0.8" + sources."nan-2.14.0" + sources."nanomatch-1.2.13" + sources."ncp-1.0.1" + sources."negotiator-0.6.2" + sources."neo-async-2.6.1" + sources."nice-try-1.0.5" + sources."no-case-3.0.3" + sources."node-elm-compiler-5.0.4" + sources."node-forge-0.9.0" + (sources."node-libs-browser-2.2.1" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."node-releases-1.1.53" + sources."normalize-package-data-2.5.0" + sources."normalize-path-3.0.0" + sources."normalize-range-0.1.2" + sources."normalize-url-3.3.0" + sources."npm-run-path-2.0.2" + sources."nth-check-1.0.2" + sources."num2fraction-1.2.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-inspect-1.7.0" + sources."object-is-1.0.2" + sources."object-keys-1.1.1" + sources."object-visit-1.0.1" + sources."object.assign-4.1.0" + sources."object.entries-1.1.1" + sources."object.getownpropertydescriptors-2.1.0" + sources."object.pick-1.3.0" + sources."object.values-1.1.1" + sources."obuf-1.1.2" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."opn-5.4.0" + sources."optimize-css-assets-webpack-plugin-5.0.3" + sources."original-1.0.2" + sources."os-browserify-0.3.0" + sources."os-homedir-1.0.2" + sources."os-locale-1.4.0" + sources."os-tmpdir-1.0.2" + sources."output-file-sync-2.0.1" + sources."p-defer-1.0.0" + sources."p-finally-1.0.0" + sources."p-is-promise-2.1.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-map-2.1.0" + sources."p-retry-3.0.1" + sources."p-try-1.0.0" + sources."pako-1.0.11" + sources."parallel-transform-1.2.0" + sources."param-case-3.0.3" + sources."parse-asn1-5.1.5" + sources."parse-json-4.0.0" + sources."parse-passwd-1.0.0" + sources."parseurl-1.3.3" + sources."pascal-case-3.1.1" + sources."pascalcase-0.1.1" + sources."path-browserify-0.0.1" + sources."path-dirname-1.0.2" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-parse-1.0.6" + sources."path-to-regexp-0.1.7" + sources."path-type-3.0.0" + sources."pbkdf2-3.0.17" + sources."performance-now-2.1.0" + sources."picomatch-2.2.2" + sources."pify-3.0.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pkg-dir-2.0.0" + sources."pkg-up-2.0.0" + sources."pkginfo-0.4.1" + (sources."portfinder-1.0.25" // { + dependencies = [ + sources."async-2.6.3" + sources."debug-3.2.6" + ]; + }) + sources."posix-character-classes-0.1.1" + (sources."postcss-6.0.23" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."postcss-calc-7.0.2" // { + dependencies = [ + sources."postcss-7.0.27" + sources."postcss-value-parser-4.0.3" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-colormin-4.0.3" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-convert-values-4.0.1" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-discard-comments-4.0.2" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-discard-duplicates-4.0.2" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-discard-empty-4.0.1" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-discard-overridden-4.0.1" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + sources."postcss-flexbugs-fixes-3.3.1" + (sources."postcss-load-config-1.2.0" // { + dependencies = [ + sources."cosmiconfig-2.2.2" + sources."parse-json-2.2.0" + ]; + }) + (sources."postcss-load-options-1.2.0" // { + dependencies = [ + sources."cosmiconfig-2.2.2" + sources."parse-json-2.2.0" + ]; + }) + (sources."postcss-load-plugins-2.3.0" // { + dependencies = [ + sources."cosmiconfig-2.2.2" + sources."parse-json-2.2.0" + ]; + }) + (sources."postcss-loader-2.1.5" // { + dependencies = [ + sources."schema-utils-0.4.7" + ]; + }) + (sources."postcss-merge-longhand-4.0.11" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-merge-rules-4.0.3" // { + dependencies = [ + sources."postcss-7.0.27" + sources."postcss-selector-parser-3.1.2" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-minify-font-values-4.0.2" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-minify-gradients-4.0.2" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-minify-params-4.0.2" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-minify-selectors-4.0.2" // { + dependencies = [ + sources."postcss-7.0.27" + sources."postcss-selector-parser-3.1.2" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-modules-extract-imports-2.0.0" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-modules-local-by-default-3.0.2" // { + dependencies = [ + sources."postcss-7.0.27" + sources."postcss-value-parser-4.0.3" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-modules-scope-2.2.0" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-modules-values-3.0.0" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-normalize-charset-4.0.1" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-normalize-display-values-4.0.2" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-normalize-positions-4.0.2" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-normalize-repeat-style-4.0.2" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-normalize-string-4.0.2" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-normalize-timing-functions-4.0.2" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-normalize-unicode-4.0.1" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-normalize-url-4.0.1" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-normalize-whitespace-4.0.2" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-ordered-values-4.1.2" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-reduce-initial-4.0.3" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-reduce-transforms-4.0.2" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-safe-parser-4.0.2" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + sources."postcss-selector-parser-6.0.2" + (sources."postcss-svgo-4.0.2" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."postcss-unique-selectors-4.0.1" // { + dependencies = [ + sources."postcss-7.0.27" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + sources."postcss-value-parser-3.3.1" + sources."pretty-bytes-5.3.0" + sources."pretty-error-2.1.1" + sources."private-0.1.8" + sources."process-0.11.10" + sources."process-nextick-args-2.0.1" + sources."promise-8.1.0" + sources."promise-inflight-1.0.1" + (sources."prompt-1.0.0" // { + dependencies = [ + sources."colors-1.4.0" + ]; + }) + sources."proxy-addr-2.0.6" + sources."prr-1.0.1" + sources."pseudomap-1.0.2" + sources."psl-1.8.0" + sources."public-encrypt-4.0.3" + sources."pump-3.0.0" + (sources."pumpify-1.5.1" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + sources."punycode-2.1.1" + sources."q-1.5.1" + sources."qs-6.5.2" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + sources."querystringify-2.1.1" + sources."randombytes-2.1.0" + sources."randomfill-1.0.4" + sources."range-parser-1.2.1" + (sources."raw-body-2.4.0" // { + dependencies = [ + sources."bytes-3.1.0" + ]; + }) + (sources."react-dev-utils-6.1.1" // { + dependencies = [ + sources."@babel/code-frame-7.0.0" + sources."ansi-regex-3.0.0" + sources."big.js-3.2.0" + sources."browserslist-4.1.1" + sources."chalk-2.4.1" + sources."debug-2.6.9" + sources."emojis-list-2.1.0" + sources."escape-string-regexp-1.0.5" + sources."find-up-3.0.0" + sources."globby-8.0.1" + sources."json5-0.5.1" + sources."loader-utils-1.1.0" + sources."locate-path-3.0.0" + sources."ms-2.0.0" + sources."p-limit-2.2.2" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."react-error-overlay-5.1.6" + sources."slash-1.0.0" + sources."sockjs-client-1.1.5" + sources."strip-ansi-4.0.0" + ]; + }) + sources."react-error-overlay-4.0.1" + sources."read-1.0.7" + (sources."read-pkg-1.1.0" // { + dependencies = [ + sources."path-type-1.1.0" + sources."pify-2.3.0" + ]; + }) + (sources."read-pkg-up-1.0.1" // { + dependencies = [ + sources."find-up-1.1.2" + sources."path-exists-2.1.0" + ]; + }) + sources."readable-stream-2.3.7" + sources."readdirp-3.2.0" + sources."recursive-readdir-2.2.2" + sources."regenerate-1.4.0" + sources."regenerate-unicode-properties-8.2.0" + sources."regenerator-runtime-0.13.5" + (sources."regenerator-transform-0.14.4" // { + dependencies = [ + sources."@babel/runtime-7.9.2" + ]; + }) + sources."regex-not-1.0.2" + sources."regexp.prototype.flags-1.3.0" + sources."regexpu-core-4.7.0" + sources."regjsgen-0.5.1" + (sources."regjsparser-0.6.4" // { + dependencies = [ + sources."jsesc-0.5.0" + ]; + }) + sources."relateurl-0.2.7" + sources."remove-trailing-separator-1.1.0" + (sources."renderkid-2.0.3" // { + dependencies = [ + sources."strip-ansi-3.0.1" + ]; + }) + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."request-2.88.2" + sources."request-promise-4.2.5" + sources."request-promise-core-1.1.3" + sources."require-directory-2.1.1" + sources."require-from-string-1.2.1" + sources."require-main-filename-1.0.1" + sources."requires-port-1.0.0" + sources."resolve-1.15.1" + sources."resolve-cwd-2.0.0" + sources."resolve-dir-1.0.1" + sources."resolve-from-3.0.0" + sources."resolve-url-0.2.1" + sources."restore-cursor-2.0.0" + sources."ret-0.1.15" + sources."retry-0.12.0" + sources."revalidator-0.1.8" + sources."rgb-regex-1.0.1" + sources."rgba-regex-1.0.0" + sources."rimraf-2.7.1" + sources."ripemd160-2.0.2" + sources."run-async-2.4.0" + sources."run-queue-1.0.3" + sources."rxjs-6.5.5" + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."schema-utils-1.0.0" + sources."select-hose-2.0.0" + sources."selfsigned-1.10.7" + sources."semver-5.7.1" + (sources."send-0.17.1" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."mime-1.6.0" + sources."ms-2.1.1" + ]; + }) + sources."serialize-javascript-2.1.2" + (sources."serve-index-1.9.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."http-errors-1.6.3" + sources."inherits-2.0.3" + sources."ms-2.0.0" + sources."setprototypeof-1.1.0" + ]; + }) + sources."serve-static-1.14.1" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."setimmediate-1.0.5" + sources."setprototypeof-1.1.1" + sources."sha.js-2.4.11" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."shell-quote-1.6.1" + sources."signal-exit-3.0.3" + (sources."simple-swizzle-0.2.2" // { + dependencies = [ + sources."is-arrayish-0.3.2" + ]; + }) + sources."slash-2.0.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."sockjs-0.3.19" // { + dependencies = [ + sources."faye-websocket-0.10.0" + ]; + }) + (sources."sockjs-client-1.4.0" // { + dependencies = [ + sources."debug-3.2.6" + sources."eventsource-1.0.7" + ]; + }) + sources."source-list-map-2.0.1" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.3" + (sources."source-map-support-0.5.16" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."source-map-url-0.4.0" + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.5" + sources."spdy-4.0.2" + (sources."spdy-transport-3.0.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."split-1.0.1" + sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + sources."sshpk-1.16.1" + sources."ssri-6.0.1" + sources."stable-0.1.8" + sources."stack-trace-0.0.10" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."statuses-1.5.0" + sources."stealthy-require-1.1.1" + sources."stream-browserify-2.0.2" + sources."stream-each-1.2.3" + sources."stream-http-2.8.3" + sources."stream-shift-1.0.1" + sources."string-replace-loader-2.2.0" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."strip-ansi-3.0.1" + ]; + }) + sources."string.prototype.trimend-1.0.0" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.0" + sources."string_decoder-1.1.1" + (sources."stringify-object-3.3.0" // { + dependencies = [ + sources."is-obj-1.0.1" + ]; + }) + (sources."strip-ansi-6.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + ]; + }) + sources."strip-bom-2.0.0" + sources."strip-comments-1.0.2" + sources."strip-eof-1.0.0" + (sources."style-loader-0.21.0" // { + dependencies = [ + sources."schema-utils-0.4.7" + ]; + }) + (sources."stylehacks-4.0.3" // { + dependencies = [ + sources."postcss-7.0.27" + sources."postcss-selector-parser-3.1.2" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + sources."supports-color-5.5.0" + (sources."svgo-1.3.2" // { + dependencies = [ + sources."css-select-2.1.0" + sources."css-what-3.2.1" + sources."domutils-1.7.0" + ]; + }) + sources."tapable-1.1.3" + sources."tar-4.4.13" + (sources."temp-0.9.1" // { + dependencies = [ + sources."rimraf-2.6.3" + ]; + }) + (sources."terser-4.6.10" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."terser-webpack-plugin-1.4.3" // { + dependencies = [ + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."make-dir-2.1.0" + sources."p-limit-2.2.2" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."pify-4.0.1" + sources."pkg-dir-3.0.0" + sources."source-map-0.6.1" + ]; + }) + sources."text-table-0.2.0" + sources."through-2.3.8" + sources."through2-2.0.5" + sources."thunky-1.1.0" + sources."timers-browserify-2.0.11" + sources."timsort-0.3.0" + sources."tmp-0.0.33" + sources."to-arraybuffer-1.0.1" + sources."to-fast-properties-2.0.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.0" + sources."tough-cookie-2.5.0" + sources."traverse-0.3.9" + sources."tslib-1.11.1" + sources."tty-browserify-0.0.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.18" + sources."typedarray-0.0.6" + (sources."uglify-es-3.3.10" // { + dependencies = [ + sources."commander-2.14.1" + sources."source-map-0.6.1" + ]; + }) + (sources."uglifyjs-webpack-plugin-1.3.0" // { + dependencies = [ + sources."cacache-10.0.4" + sources."lru-cache-4.1.5" + sources."mississippi-2.0.0" + sources."pump-2.0.1" + sources."schema-utils-0.4.7" + sources."serialize-javascript-1.9.1" + sources."source-map-0.6.1" + sources."ssri-5.3.0" + sources."yallist-2.1.2" + ]; + }) + sources."unicode-canonical-property-names-ecmascript-1.0.4" + sources."unicode-match-property-ecmascript-1.0.4" + sources."unicode-match-property-value-ecmascript-1.2.0" + sources."unicode-property-aliases-ecmascript-1.1.0" + sources."union-value-1.0.1" + sources."uniq-1.0.1" + sources."uniqs-2.0.0" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" + sources."universalify-0.1.2" + sources."unpipe-1.0.0" + sources."unquote-1.1.1" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."unzip-stream-0.3.0" + sources."upath-1.2.0" + sources."uri-js-4.2.2" + sources."urix-0.1.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."url-loader-1.1.2" + sources."url-parse-1.4.7" + sources."use-3.1.1" + (sources."util-0.11.1" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."util-deprecate-1.0.2" + sources."util.promisify-1.0.1" + sources."utila-0.4.0" + sources."utile-0.3.0" + sources."utils-merge-1.0.1" + sources."uuid-3.4.0" + sources."validate-npm-package-license-3.0.4" + sources."vary-1.1.2" + sources."vendors-1.0.4" + sources."verror-1.10.0" + sources."vm-browserify-1.1.2" + (sources."watchpack-1.6.1" // { + dependencies = [ + sources."anymatch-2.0.0" + sources."binary-extensions-1.13.1" + sources."braces-2.3.2" + sources."chokidar-2.1.8" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."fsevents-1.2.12" + sources."is-binary-path-1.0.1" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."normalize-path-2.1.1" + sources."readdirp-2.2.1" + sources."to-regex-range-2.1.1" + ]; + }) + sources."wbuf-1.7.3" + (sources."webpack-4.42.1" // { + dependencies = [ + sources."braces-2.3.2" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) + sources."webpack-dev-middleware-3.7.2" + (sources."webpack-dev-server-3.10.3" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."anymatch-2.0.0" + sources."binary-extensions-1.13.1" + sources."braces-2.3.2" + sources."chokidar-2.1.8" + (sources."cliui-4.1.0" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."find-up-3.0.0" + sources."fsevents-1.2.12" + sources."http-proxy-middleware-0.19.1" + sources."invert-kv-2.0.0" + sources."is-absolute-url-3.0.3" + sources."is-binary-path-1.0.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."lcid-2.0.0" + sources."locate-path-3.0.0" + sources."micromatch-3.1.10" + sources."normalize-path-2.1.1" + sources."opn-5.5.0" + sources."os-locale-3.1.0" + sources."p-limit-2.2.2" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."readdirp-2.2.1" + sources."semver-6.3.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + sources."strip-ansi-3.0.1" + sources."supports-color-6.1.0" + sources."to-regex-range-2.1.1" + sources."which-module-2.0.0" + sources."yargs-12.0.5" + sources."yargs-parser-11.1.1" + ]; + }) + sources."webpack-log-2.0.0" + (sources."webpack-manifest-plugin-2.2.0" // { + dependencies = [ + sources."fs-extra-7.0.1" + ]; + }) + (sources."webpack-sources-1.4.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."websocket-driver-0.7.3" + sources."websocket-extensions-0.1.3" + sources."whatwg-fetch-2.0.4" + sources."which-1.3.1" + sources."which-module-1.0.0" + (sources."winston-2.1.1" // { + dependencies = [ + sources."async-1.0.0" + sources."pkginfo-0.3.1" + ]; + }) + sources."workbox-background-sync-4.3.1" + sources."workbox-broadcast-update-4.3.1" + (sources."workbox-build-4.3.1" // { + dependencies = [ + sources."fs-extra-4.0.3" + ]; + }) + sources."workbox-cacheable-response-4.3.1" + sources."workbox-core-4.3.1" + sources."workbox-expiration-4.3.1" + sources."workbox-google-analytics-4.3.1" + sources."workbox-navigation-preload-4.3.1" + sources."workbox-precaching-4.3.1" + sources."workbox-range-requests-4.3.1" + sources."workbox-routing-4.3.1" + sources."workbox-strategies-4.3.1" + sources."workbox-streams-4.3.1" + sources."workbox-sw-4.3.1" + sources."workbox-webpack-plugin-4.3.1" + sources."workbox-window-4.3.1" + sources."worker-farm-1.7.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."strip-ansi-3.0.1" + ]; + }) + sources."wrappy-1.0.2" + sources."ws-6.2.1" + sources."xmlbuilder-13.0.2" + sources."xtend-4.0.2" + sources."y18n-4.0.0" + sources."yallist-3.1.1" + (sources."yargs-6.6.0" // { + dependencies = [ + sources."camelcase-3.0.0" + sources."y18n-3.2.1" + ]; + }) + (sources."yargs-parser-4.2.1" // { + dependencies = [ + sources."camelcase-3.0.0" + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Elm apps with zero configuration"; + homepage = "https://github.com/halfzebra/create-elm-app#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; } \ No newline at end of file diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index d0af770a2a493..cd5142acce88b 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/emscripten-core/emscripten; + homepage = "https://github.com/emscripten-core/emscripten"; description = "An LLVM-to-JavaScript Compiler"; platforms = platforms.all; maintainers = with maintainers; [ qknight matthewbauer ]; diff --git a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix index 91a42f53d2826..520a34afe58d7 100644 --- a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix +++ b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/emscripten-core/emscripten-fastcomp; + homepage = "https://github.com/emscripten-core/emscripten-fastcomp"; description = "Emscripten LLVM"; platforms = platforms.all; maintainers = with maintainers; [ qknight matthewbauer ]; diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index 314a2d0fc525a..2c7edb9c17032 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4"; src = fetchurl { - url = https://downloads.factorcode.org/releases/0.98/factor-src-0.98.zip; + url = "https://downloads.factorcode.org/releases/0.98/factor-src-0.98.zip"; sha256 = "01ip9mbnar4sv60d2wcwfz62qaamdvbykxw3gbhzqa25z36vi3ri"; }; @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://factorcode.org; + homepage = "https://factorcode.org"; license = licenses.bsd2; description = "A concatenative, stack-based programming language"; diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index fd3bb8d4c4292..c595c86615b8e 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { pname = "fasm-bin"; - version = "1.73.22"; + version = "1.73.24"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "1pb0rcfdsb0h89khjjrbikz5wjdllavj3ajim0rcyh7x12xr1hw5"; + sha256 = "142vxhs8mh8isvlzq7ir0asmqda410phzxmk9gk9b43dldskkj7k"; }; installPhase = '' @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "x86(-64) macro assembler to binary, MZ, PE, COFF, and ELF"; - homepage = https://flatassembler.net/download.php; + homepage = "https://flatassembler.net/download.php"; license = licenses.bsd2; maintainers = with maintainers; [ orivej ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index a3f5e30aea82e..42804677dc083 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free Pascal Compiler from a source distribution"; - homepage = https://www.freepascal.org; + homepage = "https://www.freepascal.org"; maintainers = [ maintainers.raskin ]; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index faf0408599913..701dcae2fcfec 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, makeWrapper , fpc, gtk2, glib, pango, atk, gdk-pixbuf , libXi, xorgproto, libX11, libXext +, gdb, gnumake, binutils }: stdenv.mkDerivation rec { pname = "lazarus"; - version = "2.0.6"; + version = "2.0.8"; src = fetchurl { url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}.tar.gz"; - sha256 = "0v1ax6039nm2bksh646znrkah20ak2zmhaz5p3mz2p60y2qazkc2"; + sha256 = "1iciqydb0miqdrh89aj59gy7kfcwikkycqssq9djcqsw1ql3gc4h"; }; buildInputs = [ @@ -34,13 +35,17 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'" \ - --prefix LCL_PLATFORM ' ' "'$LCL_PLATFORM'" + wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' \ + "$(echo "$NIX_LDFLAGS" | sed -re 's/-rpath [^ ]+//g')" \ + --prefix NIX_${binutils.infixSalt}_LDFLAGS ' ' \ + "$(echo "$NIX_LDFLAGS" | sed -re 's/-rpath [^ ]+//g')" \ + --prefix LCL_PLATFORM ' ' "$LCL_PLATFORM" \ + --prefix PATH ':' "${fpc}/bin:${gdb}/bin:${gnumake}/bin:${binutils}/bin" ''; meta = with stdenv.lib; { description = "Lazarus graphical IDE for FreePascal language"; - homepage = http://www.lazarus.freepascal.org; + homepage = "http://www.lazarus.freepascal.org"; license = licenses.gpl2Plus ; platforms = platforms.linux; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index bcb95d9ca9062..0c60403a6beee 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "A functional CLI language"; - homepage = https://fsharp.org/; + homepage = "https://fsharp.org/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix index e497deb2e873b..8a4fa303937cf 100644 --- a/pkgs/development/compilers/fsharp41/default.nix +++ b/pkgs/development/compilers/fsharp41/default.nix @@ -117,7 +117,7 @@ EOF meta = { description = "A functional CLI language"; - homepage = https://fsharp.org/; + homepage = "https://fsharp.org/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 533140631a542..548abeff78d0c 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper }: +{ stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles }: stdenv.mkDerivation rec { pname = "fstar"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0wix7l229afkn6c6sk4nwkfq0nznsiqdkds4ixi2yyf72immwmmb"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; buildInputs = with ocamlPackages; [ z3 ocaml findlib batteries menhir stdint @@ -33,11 +33,14 @@ stdenv.mkDerivation rec { installFlags = [ "-C" "src/ocaml-output" ]; postInstall = '' wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin" + installShellCompletion --bash .completion/bash/fstar.exe.bash + installShellCompletion --fish .completion/fish/fstar.exe.fish + installShellCompletion --zsh --name _fstar.exe .completion/zsh/__fstar.exe ''; meta = with stdenv.lib; { description = "ML-like functional programming language aimed at program verification"; - homepage = https://www.fstar-lang.org; + homepage = "https://www.fstar-lang.org"; license = licenses.asl20; platforms = with platforms; darwin ++ linux; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index 2fb9e3ce2fc46..ec963ab3b8d4e 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -1,6 +1,10 @@ -{ stdenv, fetchurl, autoconf, gcc, coreutils, ... }: +# This derivation is a reduced-functionality variant of Gambit stable, +# used to compile the full version of Gambit stable *and* unstable. -stdenv.mkDerivation { +{ gccStdenv, lib, fetchurl, autoconf, gcc, coreutils, gambit-support, ... }: +# As explained in build.nix, GCC compiles Gambit 10x faster than Clang, for code 3x better + +gccStdenv.mkDerivation { pname = "gambit-bootstrap"; version = "4.9.3"; @@ -16,29 +20,25 @@ stdenv.mkDerivation { CPP=${gcc}/bin/cpp CXXCPP=${gcc}/bin/cpp LD=${gcc}/bin/ld \ XMKMF=${coreutils}/bin/false unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS - ./configure --prefix=$out + ./configure --prefix=$out/gambit ''; buildPhase = '' # Copy the (configured) sources now, not later, so we don't have to filter out # all the intermediate build products. - mkdir -p $out ; cp -rp . $out/ + mkdir -p $out/gambit ; cp -rp . $out/gambit/ # build the gsc-boot* compiler - make bootstrap + make -j$NIX_BUILD_CORES bootstrap ''; installPhase = '' - cp -fa ./ $out/ + cp -fa ./ $out/gambit/ ''; forceShare = [ "info" ]; - meta = { + meta = gambit-support.meta // { description = "Optimizing Scheme to C compiler, bootstrap step"; - homepage = "http://gambitscheme.org"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; }; } diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index e17241b6d98d9..c6a48bd744e75 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -1,11 +1,13 @@ -{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, gcc, src, coreutils }: +{ gccStdenv, lib, git, openssl, autoconf, pkgs, makeStaticLibraries, gcc, coreutils, gnused, gnugrep, + src, version, git-version, + gambit-support, optimizationSetting ? "-O1", gambit-params ? pkgs.gambit-support.stable-params }: # Note that according to a benchmark run by Marc Feeley on May 2018, # clang is 10x (with default settings) to 15% (with -O2) slower than GCC at compiling # Gambit output, producing code that is 3x slower. IIRC the benchmarks from Gambit@30, # the numbers were still heavily in favor of GCC in October 2019. # Thus we use GCC over clang, even on macOS. - +# # Also note that I (fare) just ran benchmarks from https://github.com/ecraven/r7rs-benchmarks # with Gambit 4.9.3 with -O1 vs -O2 vs -Os on Feb 2020. Which wins depends on the benchmark. # The fight is unclear between -O1 and -O2, where -O1 wins more often, by up to 17%, @@ -13,29 +15,33 @@ # However, -Os seems more consistent in winning slightly against both -O1 and -O2, # and is overall 15% faster than -O2. As for compile times, -O1 is fastest, # -Os is about 29%-33% slower than -O1, while -O2 is about 40%-50% slower than -O1. -# Overall, -Os seems like the best choice, and that's what we now use. +# +# Overall, -Os seems like the best choice, but I care more about compile-time, +# so I stick with -O1 (in the defaults above), which is also the default for Gambit. -stdenv.mkDerivation rec { - pname = "gambit"; - inherit version; - inherit src; +gccStdenv.mkDerivation rec { - bootstrap = import ./bootstrap.nix ( pkgs ); + pname = "gambit"; + inherit src version git-version; + bootstrap = gambit-support.gambit-bootstrap; # TODO: if/when we can get all the library packages we depend on to have static versions, # we could use something like (makeStaticLibraries openssl) to enable creation # of statically linked binaries by gsc. buildInputs = [ git autoconf bootstrap openssl ]; + # TODO: patch gambit's source so it has the full path to sed, grep, fgrep? Is there more? + # Or wrap relevant programs to add a suitable PATH ? + #runtimeDeps = [ gnused gnugrep ]; + configureFlags = [ "--enable-single-host" - "--enable-c-opt=-Os" + "--enable-c-opt=${optimizationSetting}" "--enable-gcc-opts" "--enable-shared" "--enable-absolute-shared-libs" # Yes, NixOS will want an absolute path, and fix it. - "--enable-poll" "--enable-openssl" - "--enable-default-runtime-options=f8,-8,t8" # Default to UTF-8 for source and all I/O + "--enable-default-runtime-options=${gambit-params.defaultRuntimeOptions}" # "--enable-debug" # Nope: enables plenty of good stuff, but also the costly console.log # "--enable-multiple-versions" # Nope, NixOS already does version multiplexing # "--enable-guide" @@ -50,14 +56,22 @@ stdenv.mkDerivation rec { # "--enable-coverage" # "--enable-inline-jumps" # "--enable-char-size=1" # default is 4 - ]; + ] ++ + # due not enable poll on darwin due to https://github.com/gambit/gambit/issues/498 + lib.optional (!gccStdenv.isDarwin) "--enable-poll"; configurePhase = '' - export CC=${gcc}/bin/gcc CXX=${gcc}/bin/g++ \ - CPP=${gcc}/bin/cpp CXXCPP=${gcc}/bin/cpp LD=${gcc}/bin/ld \ + export CC=${gcc}/bin/gcc \ + CXX=${gcc}/bin/g++ \ + CPP=${gcc}/bin/cpp \ + CXXCPP=${gcc}/bin/cpp \ + LD=${gcc}/bin/ld \ XMKMF=${coreutils}/bin/false unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS - ./configure --prefix=$out ${builtins.concatStringsSep " " configureFlags} + + ${gambit-params.fix-stamp git-version} + + ./configure --prefix=$out/gambit ${builtins.concatStringsSep " " configureFlags} # OS-specific paths are hardcoded in ./configure substituteInPlace config.status \ @@ -69,28 +83,26 @@ stdenv.mkDerivation rec { buildPhase = '' # Make bootstrap compiler, from release bootstrap mkdir -p boot && - cp -rp ${bootstrap}/. boot/. && + cp -rp ${bootstrap}/gambit/. boot/. && chmod -R u+w boot && cd boot && - cp ../gsc/makefile.in ../gsc/*.scm gsc && # */ + cp ../gsc/makefile.in ../gsc/*.scm gsc/ && # */ ./configure && - for i in lib gsi gsc ; do (cd $i ; make ) ; done && + for i in lib gsi gsc ; do (cd $i ; make -j$NIX_BUILD_CORES) ; done && cd .. && cp boot/gsc/gsc gsc-boot && # Now use the bootstrap compiler to build the real thing! - make -j2 from-scratch + make -j$NIX_BUILD_CORES from-scratch + ''; + + postInstall = '' + mkdir $out/bin + cd $out/bin + ln -s ../gambit/bin/* . ''; doCheck = true; - meta = { - description = "Optimizing Scheme to C compiler"; - homepage = "http://gambitscheme.org"; - license = stdenv.lib.licenses.lgpl2; - # NB regarding platforms: only actually tested on Linux, *should* work everywhere, - # but *might* need adaptation e.g. on macOS. - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; - }; + meta = gambit-support.meta; } diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 303f6a30aadb3..8f77daa4173be 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,10 +1,10 @@ -{ stdenv, callPackage, fetchurl }: +{ callPackage, fetchurl }: -callPackage ./build.nix { +callPackage ./build.nix rec { version = "4.9.3"; + git-version = version; src = fetchurl { url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_3.tgz"; sha256 = "1p6172vhcrlpjgia6hsks1w4fl8rdyjf9xjh14wxfkv7dnx8a5hk"; }; - inherit stdenv; } diff --git a/pkgs/development/compilers/gambit/gambit-support.nix b/pkgs/development/compilers/gambit/gambit-support.nix new file mode 100644 index 0000000000000..0e78831f2e4eb --- /dev/null +++ b/pkgs/development/compilers/gambit/gambit-support.nix @@ -0,0 +1,33 @@ +{ pkgs, lib }: + +rec { + stable-params = { + defaultRuntimeOptions = "f8,-8,t8"; + buildRuntimeOptions = "f8,-8,t8"; + fix-stamp = git-version : ""; + }; + + unstable-params = { + defaultRuntimeOptions = "iL,fL,-L,tL"; + buildRuntimeOptions = "i8,f8,-8,t8"; + fix-stamp = git-version : '' + substituteInPlace configure \ + --replace "$(grep '^PACKAGE_VERSION=.*$' configure)" 'PACKAGE_VERSION="v${git-version}"' \ + --replace "$(grep '^PACKAGE_STRING=.*$' configure)" 'PACKAGE_STRING="Gambit v${git-version}"' ; + ''; + }; + + export-gambopt = params : "export GAMBOPT=${params.buildRuntimeOptions} ;"; + + gambit-bootstrap = import ./bootstrap.nix ( pkgs ); + + meta = { + description = "Optimizing Scheme to C compiler"; + homepage = "http://gambitscheme.org"; + license = lib.licenses.lgpl21; # dual, also asl20 + # NB regarding platforms: continuously tested on Linux, + # tested on macOS once in a while, *should* work everywhere. + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ thoughtpolice raskin fare ]; + }; +} diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 4c33c83c67b1c..3ac4f5363195e 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,13 @@ -{ stdenv, callPackage, fetchFromGitHub }: +{ callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix { - version = "unstable-2020-02-24"; -# git-version = "4.9.3-979-gc69e9f70"; + version = "unstable-2020-05-15"; + git-version = "4.9.3-1109-g3c4d40de"; src = fetchFromGitHub { owner = "feeley"; repo = "gambit"; - rev = "c69e9f70dfdc6545353b135a5d5e2f9234f1e1cc"; - sha256 = "1f69n7yzzdv3wpnjlrbck38xpa8115vbady43mc544l39ckklr0k"; + rev = "3c4d40de908ae03ca0e3d854edc2234ef401b36c"; + sha256 = "1c9a6rys2kiiqb79gvw29nv3dwwk6hmi1q4jk1whcx7mds7q5dvr"; }; - inherit stdenv; + gambit-params = gambit-support.unstable-params; } diff --git a/pkgs/development/compilers/gavrasm/default.nix b/pkgs/development/compilers/gavrasm/default.nix index 92781d79cc7f6..58e8b45b61af7 100644 --- a/pkgs/development/compilers/gavrasm/default.nix +++ b/pkgs/development/compilers/gavrasm/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.avr-asm-tutorial.net/gavrasm; + homepage = "http://www.avr-asm-tutorial.net/gavrasm"; description = "AVR Assembler for ATMEL AVR-Processors"; license = licenses.unfree; maintainers = with maintainers; [ mafo ]; diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix new file mode 100644 index 0000000000000..5e0a25ea60bd7 --- /dev/null +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -0,0 +1,285 @@ +{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs +, langC ? true, langCC ? true, langFortran ? false +, langAda ? false +, langObjC ? stdenv.targetPlatform.isDarwin +, langObjCpp ? stdenv.targetPlatform.isDarwin +, langGo ? false +, profiledCompiler ? false +, staticCompiler ? false +, enableShared ? true +, enableLTO ? true +, texinfo ? null +, perl ? null # optional, for texi2pod (then pod2man) +, gmp, mpfr, libmpc, gettext, which +, libelf # optional, for link-time optimizations (LTO) +, isl ? null # optional, for the Graphite optimization framework. +, zlib ? null +, gnatboot ? null +, enableMultilib ? false +, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins +, name ? "gcc" +, libcCross ? null +, threadsCross ? null # for MinGW +, crossStageStatic ? false +, # Strip kills static libs of other archs (hence no cross) + stripped ? stdenv.hostPlatform == stdenv.buildPlatform + && stdenv.targetPlatform == stdenv.hostPlatform +, gnused ? null +, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, buildPackages +}: + +# LTO needs libelf and zlib. +assert libelf != null -> zlib != null; + +# Make sure we get GNU sed. +assert stdenv.hostPlatform.isDarwin -> gnused != null; + +# The go frontend is written in c++ +assert langGo -> langCC; +assert langAda -> gnatboot != null; + +# threadsCross is just for MinGW +assert threadsCross != null -> stdenv.targetPlatform.isWindows; + +with stdenv.lib; +with builtins; + +let majorVersion = "10"; + version = "${majorVersion}.1.0"; + + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + patches = + optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + ++ optional noSysDirs ../no-sys-dirs.patch + /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied + url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; + sha256 = ""; # TODO: uncomment and check hash when available. + }) */ + ++ optional langAda ../gnat-cflags.patch + ++ optional langFortran ../gfortran-driving.patch + ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch + ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { + url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch"; + sha256 = "1in5kvcknlpi9z1vvjw6jfmwy8k12zvbqlqfnq84qpm99r0rh00a"; + }); + + /* Cross-gcc settings (build == host != target) */ + crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; + stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; + crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + +in + +stdenv.mkDerivation ({ + pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}"; + inherit version; + + builder = ../builder.sh; + + src = fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; + sha256 = "b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2"; + }; + + inherit patches; + + outputs = [ "out" "lib" "man" "info" ]; + setOutputFlags = false; + NIX_NO_SELF_RPATH = true; + + libc_dev = stdenv.cc.libc_dev; + + hardeningDisable = [ "format" "pie" ]; + + # This should kill all the stdinc frameworks that gcc and friends like to + # insert into default search paths. + prePatch = stdenv.lib.optionalString hostPlatform.isDarwin '' + substituteInPlace gcc/config/darwin-c.c \ + --replace 'if (stdinc)' 'if (0)' + + substituteInPlace libgcc/config/t-slibgcc-darwin \ + --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)" + + substituteInPlace libgfortran/configure \ + --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname" + ''; + + postPatch = '' + configureScripts=$(find . -name configure) + for configureScript in $configureScripts; do + patchShebangs $configureScript + done + '' + ( + if targetPlatform != hostPlatform || stdenv.cc.libc != null then + # On NixOS, use the right path to the dynamic linker instead of + # `/lib/ld*.so'. + let + libc = if libcCross != null then libcCross else stdenv.cc.libc; + in + ( + '' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..." + for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h + do + grep -q _DYNAMIC_LINKER "$header" || continue + echo " fixing \`$header'..." + sed -i "$header" \ + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \ + -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' + done + '' + + stdenv.lib.optionalString (targetPlatform.libc == "musl") + '' + sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' + '' + ) + else "") + + stdenv.lib.optionalString targetPlatform.isAvr '' + makeFlagsArray+=( + 'LIMITS_H_TEST=false' + ) + ''; + + inherit noSysDirs staticCompiler crossStageStatic + libcCross crossMingw; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ texinfo which gettext ] + ++ (optional (perl != null) perl); + + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (isl != null) isl) + ++ (optional (zlib != null) zlib) + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional hostPlatform.isDarwin gnused) + ++ (optional langAda gnatboot) + ; + + depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + + NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + + preConfigure = import ../common/pre-configure.nix { + inherit (stdenv) lib; + inherit version hostPlatform gnatboot langAda langGo; + }; + + dontDisableStatic = true; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + + configureFlags = import ../common/configure-flags.nix { + inherit + stdenv + targetPackages + crossStageStatic libcCross + version + + gmp mpfr libmpc libelf isl + + enableLTO + enableMultilib + enablePlugin + enableShared + + langC + langCC + langFortran + langAda + langGo + langObjC + langObjCpp + ; + }; + + targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + + buildFlags = optional + (targetPlatform == hostPlatform && hostPlatform == buildPlatform) + (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + + dontStrip = !stripped; + + installTargets = optional stripped "install-strip"; + + # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; + + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the + # library headers and binaries, regarless of the language being compiled. + # + # Likewise, the LTO code doesn't find zlib. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. + + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + )); + + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); + + inherit + (import ../common/extra-target-flags.nix { + inherit stdenv crossStageStatic libcCross threadsCross; + }) + EXTRA_TARGET_FLAGS + EXTRA_TARGET_LDFLAGS + ; + + passthru = { + inherit langC langCC langObjC langObjCpp langAda langFortran langGo version; + isGNU = true; + }; + + enableParallelBuilding = true; + inherit enableMultilib; + + inherit (stdenv) is64bit; + + meta = { + homepage = "https://gcc.gnu.org/"; + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + description = "GNU Compiler Collection, version ${version}" + + (if stripped then "" else " (with debugging info)"); + + longDescription = '' + The GNU Compiler Collection includes compiler front ends for C, C++, + Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as + libraries for these languages (libstdc++, libgomp,...). + + GCC development is a part of the GNU Project, aiming to improve the + compiler used in the GNU system including the GNU/Linux variant. + ''; + + maintainers = with stdenv.lib.maintainers; [ synthetica ]; + + platforms = + stdenv.lib.platforms.linux ++ + stdenv.lib.platforms.freebsd ++ + stdenv.lib.platforms.illumos ++ + stdenv.lib.platforms.darwin; + }; +} + +// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { + makeFlags = [ "all-gcc" "all-target-libgcc" ]; + installTargets = "install-gcc install-target-libgcc"; +} + +// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } +) diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index ef697b74bbe3e..7e8870cf2e24f 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -89,7 +89,7 @@ let majorVersion = "4"; # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a # binary distribution here to allow the whole chain to be bootstrapped. javaAntlr = fetchurl { - url = https://www.antlr.org/download/antlr-4.4-complete.jar; + url = "https://www.antlr.org/download/antlr-4.4-complete.jar"; sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz"; }; @@ -278,7 +278,7 @@ stdenv.mkDerivation ({ inherit (stdenv) is64bit; meta = { - homepage = https://gcc.gnu.org/; + homepage = "https://gcc.gnu.org/"; license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 270d118f97eb2..dd448ccbe5f92 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -100,7 +100,7 @@ let majorVersion = "4"; # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a # binary distribution here to allow the whole chain to be bootstrapped. javaAntlr = fetchurl { - url = https://www.antlr.org/download/antlr-4.4-complete.jar; + url = "https://www.antlr.org/download/antlr-4.4-complete.jar"; sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz"; }; @@ -289,7 +289,7 @@ stdenv.mkDerivation ({ inherit (stdenv) is64bit; meta = { - homepage = https://gcc.gnu.org/; + homepage = "https://gcc.gnu.org/"; license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index b1a981cfdf7f9..c04e424b2faa4 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -1,5 +1,6 @@ { stdenv, targetPackages, fetchurl, fetchpatch, fetchFromGitHub, noSysDirs , langC ? true, langCC ? true, langFortran ? false +, langAda ? false , langObjC ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin , langJava ? false @@ -15,6 +16,7 @@ , libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null +, gnatboot ? null , zip ? null, unzip ? null, pkgconfig ? null , gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null @@ -48,6 +50,8 @@ assert stdenv.hostPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; +assert langAda -> gnatboot != null; + # threadsCross is just for MinGW assert threadsCross != null -> stdenv.targetPlatform.isWindows; @@ -63,6 +67,7 @@ let majorVersion = "6"; [ ../use-source-date-epoch.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch + ++ optional langAda ../gnat-cflags.patch ++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { @@ -82,7 +87,7 @@ let majorVersion = "6"; # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a # binary distribution here to allow the whole chain to be bootstrapped. javaAntlr = fetchurl { - url = https://www.antlr.org/download/antlr-4.4-complete.jar; + url = "https://www.antlr.org/download/antlr-4.4-complete.jar"; sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz"; }; @@ -200,6 +205,7 @@ stdenv.mkDerivation ({ # The builder relies on GNU sed (for instance, Darwin's `sed' fails with # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. ++ (optional hostPlatform.isDarwin gnused) + ++ (optional langAda gnatboot) ; depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; @@ -208,7 +214,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit (stdenv) lib; - inherit version hostPlatform langJava langGo; + inherit version hostPlatform gnatboot langJava langAda langGo; }; dontDisableStatic = true; @@ -234,6 +240,7 @@ stdenv.mkDerivation ({ langCC langFortran langJava javaAwtGtk javaAntlr javaEcj + langAda langGo langObjC langObjCpp @@ -292,7 +299,7 @@ stdenv.mkDerivation ({ ; passthru = { - inherit langC langCC langObjC langObjCpp langFortran langGo version; + inherit langC langCC langObjC langObjCpp langFortran langAda langGo version; isGNU = true; }; @@ -302,7 +309,7 @@ stdenv.mkDerivation ({ inherit (stdenv) is64bit; meta = { - homepage = https://gcc.gnu.org/; + homepage = "https://gcc.gnu.org/"; license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 22d772cff6d6c..2ae2f8e758cb6 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -260,7 +260,7 @@ stdenv.mkDerivation ({ inherit (stdenv) is64bit; meta = { - homepage = https://gcc.gnu.org/; + homepage = "https://gcc.gnu.org/"; license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 58248093d24d4..c2edba0ba908a 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -247,7 +247,7 @@ stdenv.mkDerivation ({ inherit (stdenv) is64bit; meta = { - homepage = https://gcc.gnu.org/; + homepage = "https://gcc.gnu.org/"; license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 46918b1f0a1c4..4ceeda318318e 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -1,7 +1,9 @@ { stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs , langC ? true, langCC ? true, langFortran ? false +, langAda ? false , langObjC ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin +, langD ? false , langGo ? false , profiledCompiler ? false , staticCompiler ? false @@ -13,6 +15,7 @@ , libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null +, gnatboot ? null , enableMultilib ? false , enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" @@ -35,6 +38,7 @@ assert stdenv.hostPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; +assert langAda -> gnatboot != null; # threadsCross is just for MinGW assert threadsCross != null -> stdenv.targetPlatform.isWindows; @@ -54,6 +58,8 @@ let majorVersion = "9"; url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; sha256 = ""; # TODO: uncomment and check hash when available. }) */ + ++ optional langAda ../gnat-cflags.patch + ++ optional langD ../libphobos.patch ++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { @@ -132,10 +138,10 @@ stdenv.mkDerivation ({ ) else "") + stdenv.lib.optionalString targetPlatform.isAvr '' - makeFlagsArray+=( - 'LIMITS_H_TEST=false' - ) - ''; + makeFlagsArray+=( + 'LIMITS_H_TEST=false' + ) + ''; inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; @@ -160,6 +166,7 @@ stdenv.mkDerivation ({ # The builder relies on GNU sed (for instance, Darwin's `sed' fails with # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. ++ (optional hostPlatform.isDarwin gnused) + ++ (optional langAda gnatboot) ; depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; @@ -168,7 +175,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit (stdenv) lib; - inherit version hostPlatform langGo; + inherit version hostPlatform gnatboot langAda langGo; }; dontDisableStatic = true; @@ -191,8 +198,10 @@ stdenv.mkDerivation ({ enableShared langC + langD langCC langFortran + langAda langGo langObjC langObjCpp @@ -229,14 +238,14 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; + inherit stdenv crossStageStatic langD libcCross threadsCross; }) EXTRA_TARGET_FLAGS EXTRA_TARGET_LDFLAGS ; passthru = { - inherit langC langCC langObjC langObjCpp langFortran langGo version; + inherit langC langCC langObjC langObjCpp langAda langFortran langGo langD version; isGNU = true; }; @@ -246,7 +255,7 @@ stdenv.mkDerivation ({ inherit (stdenv) is64bit; meta = { - homepage = https://gcc.gnu.org/; + homepage = "https://gcc.gnu.org/"; license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 22a21e5b25c65..8d03e0104646d 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -216,6 +216,7 @@ postInstall() { moveToOutput "${targetConfig+$targetConfig/}lib/lib*.so*" "$lib" moveToOutput "${targetConfig+$targetConfig/}lib/lib*.la" "$lib" moveToOutput "${targetConfig+$targetConfig/}lib/lib*.dylib" "$lib" + moveToOutput "${targetConfig+$targetConfig/}lib/lib*.dll.a" "$lib" moveToOutput "share/gcc-*/python" "$lib" for i in "$lib/${targetConfig}"/lib/*.{la,py}; do diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index aa0fcb5062894..437042baf4135 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -14,8 +14,10 @@ , langC , langCC +, langD ? false , langFortran , langJava ? false, javaAwtGtk ? false, javaAntlr ? null, javaEcj ? null +, langAda ? false , langGo , langObjC , langObjCpp @@ -113,8 +115,10 @@ let lib.concatStrings (lib.intersperse "," ( lib.optional langC "c" ++ lib.optional langCC "c++" + ++ lib.optional langD "d" ++ lib.optional langFortran "fortran" ++ lib.optional langJava "java" + ++ lib.optional langAda "ada" ++ lib.optional langGo "go" ++ lib.optional langObjC "objc" ++ lib.optional langObjCpp "obj-c++" @@ -140,6 +144,9 @@ let "--enable-cloog-backend=isl" ] + # Ada options + ++ lib.optional langAda "--enable-libada" + # Java options ++ lib.optionals langJava [ "--with-ecj-jar=${javaEcj}" @@ -169,6 +176,9 @@ let "libat_cv_have_ifunc=no" "--disable-gnu-indirect-function" ] + ++ lib.optionals (langD) [ + "--with-target-system-zlib=yes" + ] ; in configureFlags diff --git a/pkgs/development/compilers/gcc/common/extra-target-flags.nix b/pkgs/development/compilers/gcc/common/extra-target-flags.nix index bce9a8d47381a..f1696f182c04b 100644 --- a/pkgs/development/compilers/gcc/common/extra-target-flags.nix +++ b/pkgs/development/compilers/gcc/common/extra-target-flags.nix @@ -1,4 +1,4 @@ -{ stdenv, crossStageStatic, libcCross, threadsCross }: +{ stdenv, crossStageStatic, langD ? false, libcCross, threadsCross }: let inherit (stdenv) lib hostPlatform targetPlatform; @@ -6,13 +6,13 @@ in { EXTRA_TARGET_FLAGS = let - mkFlags = dep: lib.optionals (targetPlatform != hostPlatform && dep != null) ([ + mkFlags = dep: langD: lib.optionals (targetPlatform != hostPlatform && dep != null && !langD) ([ "-idirafter ${lib.getDev dep}${dep.incdir or "/include"}" ] ++ stdenv.lib.optionals (! crossStageStatic) [ "-B${lib.getLib dep}${dep.libdir or "/lib"}" ]); - in mkFlags libcCross - ++ lib.optionals (!crossStageStatic) (mkFlags threadsCross) + in mkFlags libcCross langD + ++ lib.optionals (!crossStageStatic) (mkFlags threadsCross langD) ; EXTRA_TARGET_LDFLAGS = let diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix index 4c86d37e2434f..85b854e19b9a0 100644 --- a/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -1,6 +1,11 @@ -{ lib, version, hostPlatform, langJava ? false, langGo }: +{ lib, version, hostPlatform +, gnatboot ? null +, langAda ? false +, langJava ? false +, langGo }: assert langJava -> lib.versionOlder version "7"; +assert langAda -> gnatboot != null; lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` @@ -9,4 +14,6 @@ lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET" '' + lib.optionalString (lib.versionOlder version "7" && (langJava || langGo)) '' export lib=$out; +'' + lib.optionalString langAda '' + export PATH=${gnatboot}/bin:$PATH '' diff --git a/pkgs/development/compilers/gcc/gnat-cflags.patch b/pkgs/development/compilers/gcc/gnat-cflags.patch new file mode 100644 index 0000000000000..a16266bbf39c2 --- /dev/null +++ b/pkgs/development/compilers/gcc/gnat-cflags.patch @@ -0,0 +1,35 @@ +diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in +index 4e74252bd74..0d848b5b4e3 100644 +--- a/gcc/ada/gcc-interface/Makefile.in ++++ b/gcc/ada/gcc-interface/Makefile.in +@@ -111,7 +111,7 @@ NO_OMIT_ADAFLAGS = -fno-omit-frame-pointer + NO_SIBLING_ADAFLAGS = -fno-optimize-sibling-calls + NO_REORDER_ADAFLAGS = -fno-toplevel-reorder + GNATLIBFLAGS = -W -Wall -gnatpg -nostdinc +-GNATLIBCFLAGS = -g -O2 ++GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET) + # Pretend that _Unwind_GetIPInfo is available for the target by default. This + # should be autodetected during the configuration of libada and passed down to + # here, but we need something for --disable-libada and hope for the best. +@@ -198,7 +198,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR)) + # Link flags used to build gnat tools. By default we prefer to statically + # link with libgcc to avoid a dependency on shared libgcc (which is tricky + # to deal with as it may conflict with the libgcc provided by the system). +-GCC_LINK_FLAGS=-static-libstdc++ -static-libgcc ++GCC_LINK_FLAGS=-static-libstdc++ -static-libgcc $(CFLAGS_FOR_TARGET) + + # End of variables for you to override. + +diff --git a/libada/Makefile.in b/libada/Makefile.in +index 522b9207326..ca866c74471 100644 +--- a/libada/Makefile.in ++++ b/libada/Makefile.in +@@ -59,7 +59,7 @@ LDFLAGS= + CFLAGS=-g + PICFLAG = @PICFLAG@ + GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc +-GNATLIBCFLAGS= -g -O2 ++GNATLIBCFLAGS= -g -O2 $(CFLAGS) + GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(CFLAGS_FOR_TARGET) \ + -fexceptions -DIN_RTS @have_getipinfo@ @have_capability@ + diff --git a/pkgs/development/compilers/gcc/libphobos.patch b/pkgs/development/compilers/gcc/libphobos.patch new file mode 100644 index 0000000000000..a16ea5416ffbf --- /dev/null +++ b/pkgs/development/compilers/gcc/libphobos.patch @@ -0,0 +1,119 @@ +diff --git a/Makefile.in b/Makefile.in +index a375471..83c5ecb 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -804,7 +804,7 @@ BASE_FLAGS_TO_PASS = \ + "STAGE1_LANGUAGES=$(STAGE1_LANGUAGES)" \ + "GNATBIND=$(GNATBIND)" \ + "GNATMAKE=$(GNATMAKE)" \ +- "GDC=$(GDC)" \ ++ "`echo 'GDC=$(GDC)' | sed -e 's/-idirafter [^ ]*//g'`" \ + "GDCFLAGS=$(GDCFLAGS)" \ + "AR_FOR_TARGET=$(AR_FOR_TARGET)" \ + "AS_FOR_TARGET=$(AS_FOR_TARGET)" \ +@@ -817,7 +817,7 @@ BASE_FLAGS_TO_PASS = \ + "GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \ + "GOC_FOR_TARGET=$(GOC_FOR_TARGET)" \ + "GOCFLAGS_FOR_TARGET=$(GOCFLAGS_FOR_TARGET)" \ +- "GDC_FOR_TARGET=$(GDC_FOR_TARGET)" \ ++ "`echo 'GDC_FOR_TARGET=$(GDC_FOR_TARGET)' | sed -e 's/-idirafter [^ ]*//g'`" \ + "GDCFLAGS_FOR_TARGET=$(GDCFLAGS_FOR_TARGET)" \ + "LD_FOR_TARGET=$(LD_FOR_TARGET)" \ + "LIPO_FOR_TARGET=$(LIPO_FOR_TARGET)" \ +@@ -890,7 +890,7 @@ EXTRA_HOST_FLAGS = \ + 'DLLTOOL=$(DLLTOOL)' \ + 'GFORTRAN=$(GFORTRAN)' \ + 'GOC=$(GOC)' \ +- 'GDC=$(GDC)' \ ++ "`echo 'GDC=$(GDC)' | sed -e 's/-idirafter [^ ]*//g'`" \ + 'LD=$(LD)' \ + 'LIPO=$(LIPO)' \ + 'NM=$(NM)' \ +@@ -966,8 +966,11 @@ EXTRA_TARGET_FLAGS = \ + 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \ + 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \ + "TFLAGS=$$TFLAGS" ++EXTRA_TARGET_FLAGS_D = \ ++ "`echo $(EXTRA_TARGET_FLAGS) | sed -e 's/-idirafter [^ ]*//g'`" + + TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) ++TARGET_FLAGS_TO_PASS_D = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS_D) + + # Flags to pass down to gcc. gcc builds a library, libgcc.a, so it + # unfortunately needs the native compiler and the target ar and +@@ -47285,7 +47288,7 @@ check-target-libphobos: + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libphobos && \ +- $(MAKE) $(TARGET_FLAGS_TO_PASS) check) ++ $(MAKE) $(TARGET_FLAGS_TO_PASS_D) check) + + @endif target-libphobos + +@@ -47300,7 +47303,7 @@ install-target-libphobos: installdirs + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libphobos && \ +- $(MAKE) $(TARGET_FLAGS_TO_PASS) install) ++ $(MAKE) $(TARGET_FLAGS_TO_PASS_D) install) + + @endif target-libphobos + +@@ -47315,7 +47318,7 @@ install-strip-target-libphobos: installdirs + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libphobos && \ +- $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip) ++ $(MAKE) $(TARGET_FLAGS_TO_PASS_D) install-strip) + + @endif target-libphobos + +diff --git a/Makefile.tpl b/Makefile.tpl +index 41cae58..b3d32e7 100644 +--- a/Makefile.tpl ++++ b/Makefile.tpl +@@ -721,8 +721,11 @@ EXTRA_TARGET_FLAGS = \ + 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \ + 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \ + "TFLAGS=$$TFLAGS" ++EXTRA_TARGET_FLAGS_D = \ ++ "`echo $(EXTRA_TARGET_FLAGS) | sed -e 's/-idirafter [^ ]*//g'`" + + TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) ++TARGET_FLAGS_TO_PASS_D = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS_D) + + # Flags to pass down to gcc. gcc builds a library, libgcc.a, so it + # unfortunately needs the native compiler and the target ar and +diff --git a/libphobos/Makefile.in b/libphobos/Makefile.in +index e894417..2d18dcb 100644 +--- a/libphobos/Makefile.in ++++ b/libphobos/Makefile.in +@@ -365,6 +365,7 @@ AM_MAKEFLAGS = \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ + "MAKE=$(MAKE)" \ ++ "`echo 'MAKEFLAGS=$(MAKEFLAGS)' | sed -e 's/-j[0-9]+/-j1/'`" \ + "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ + "PICFLAG=$(PICFLAG)" \ + "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ +@@ -694,6 +695,8 @@ uninstall-am: + + .PRECIOUS: Makefile + ++.NOTPARALLEL: ++ + # GNU Make needs to see an explicit $(MAKE) variable in the command it + # runs to enable its job server during parallel builds. Hence the + # comments below. +diff --git a/libphobos/configure b/libphobos/configure +index b3cb5f3..25adf2b 100755 +--- a/libphobos/configure ++++ b/libphobos/configure +@@ -5122,6 +5122,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ++GDC=`$as_echo "$GDC" | sed -e 's/-idirafter [^ ]*//g'` + + ac_ext=d + ac_compile='$GDC -c $GDCFLAGS conftest.$ac_ext >&5' diff --git a/pkgs/development/compilers/gcc/libstdc++-hook.sh b/pkgs/development/compilers/gcc/libstdc++-hook.sh index 19db70597ce54..60c610a8e7a88 100644 --- a/pkgs/development/compilers/gcc/libstdc++-hook.sh +++ b/pkgs/development/compilers/gcc/libstdc++-hook.sh @@ -1,4 +1,4 @@ # See pkgs/build-support/setup-hooks/role.bash getHostRole -export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)" +export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/@targetConfig@" diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index e3c2d0e09de3c..a8a1bf9fc1bda 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; patches = [(fetchurl { - url = https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-lisp/gcl/files/gcl-2.6.12-gcc5.patch; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-lisp/gcl/files/gcl-2.6.12-gcc5.patch"; sha256 = "00jbsn0qp8ki2w7dx8caha7g2hr9076xa6bg48j3qqqncff93zdh"; })]; diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 21c2936fa0f80..8297dafff8e2d 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -1,34 +1,34 @@ -{ stdenv, makeStaticLibraries, - coreutils, rsync, bash, +{ pkgs, gccStdenv, lib, coreutils, bash, # makeStaticLibraries, openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql, - version, git-version, gambit, src }: + version, git-version, + gambit-support, + gambit ? pkgs.gambit, gambit-params ? pkgs.gambit-support.stable-params, src }: + +# We use Gambit, that works 10x better with GCC than Clang. See ../gambit/build.nix +let stdenv = gccStdenv; in stdenv.mkDerivation rec { pname = "gerbil"; inherit version; inherit src; - # Use makeStaticLibraries to enable creation of statically linked binaries buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml libmysqlclient lmdb leveldb postgresql ]; - buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; - buildInputs = [ gambit rsync bash ] - ++ buildInputs_libraries ++ buildInputs_staticLibraries; + # TODO: either fix all of Gerbil's dependencies to provide static libraries, + # or give up and delete all tentative support for static libraries. + #buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; + + buildInputs = [ gambit ] + ++ buildInputs_libraries; # ++ buildInputs_staticLibraries; NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; postPatch = '' - echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm - - patchShebangs . - + echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm ; + patchShebangs . ; grep -Fl '#!/usr/bin/env' `find . -type f -executable` | while read f ; do - substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' - done - grep -Fl '"gsc"' `find . -type f -name '*.s*'` | while read f ; do - substituteInPlace "$f" --replace '"gsc"' '"${gambit}/bin/gsc"' - done - substituteInPlace "etc/gerbil.el" --replace '"gxc"' "\"$out/bin/gxc\"" + substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' ; + done ; ''; ## TODO: make static compilation work. @@ -47,22 +47,31 @@ stdenv.mkDerivation rec { # LEVELDB=${makeStaticLibraries leveldb}/lib/libleveldb.a # EOF + configurePhase = '' + (cd src && ./configure \ + --prefix=$out/gerbil \ + --with-gambit=${gambit}/gambit \ + --enable-libxml \ + --enable-libyaml \ + --enable-zlib \ + --enable-sqlite \ + --enable-mysql \ + --enable-lmdb \ + --enable-leveldb) + ''; + buildPhase = '' runHook preBuild - # Enable all optional libraries - substituteInPlace "src/std/build-features.ss" --replace '#f' '#t' - - # Enable autodetection of a default GERBIL_HOME - for i in src/gerbil/boot/gx-init-exe.scm src/gerbil/boot/gx-init.scm ; do - substituteInPlace "$i" --replace '(getenv "GERBIL_HOME" #f)' "(getenv \"GERBIL_HOME\" \"$out\")" - done - for i in src/gerbil/boot/gxi-init.scm src/gerbil/compiler/driver.ss src/gerbil/runtime/gx-gambc.scm src/std/build.ss src/tools/build.ss ; do - substituteInPlace "$i" --replace '(getenv "GERBIL_HOME")' "(getenv \"GERBIL_HOME\" \"$out\")" - done - # gxprof testing uses $HOME/.cache/gerbil/gxc - export HOME=$$PWD + export HOME=$PWD + export GERBIL_BUILD_CORES=$NIX_BUILD_CORES + export GERBIL_GXC=$PWD/bin/gxc + export GERBIL_BASE=$PWD + export GERBIL_HOME=$PWD + export GERBIL_PATH=$PWD/lib + export PATH=$PWD/bin:$PATH + ${gambit-support.export-gambopt gambit-params} # Build, replacing make by build.sh ( cd src && sh build.sh ) @@ -72,19 +81,9 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/ - cp -fa bin lib etc doc $out/ - - cat > $out/bin/gxi <<EOF -#!${bash}/bin/bash -e -export GERBIL_HOME=$out -case "\$1" in -:*) GSIOPTIONS=\$1 ; shift ;; esac -if [[ \$# = 0 ]] ; then - exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - -else - exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@" -fi -EOF + mkdir -p $out/gerbil $out/bin + (cd src; ./install) + (cd $out/bin ; ln -s ../gerbil/bin/* .) runHook postInstall ''; @@ -93,10 +92,10 @@ EOF meta = { description = "Gerbil Scheme"; homepage = "https://github.com/vyzo/gerbil"; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl21; # also asl20, like Gambit # NB regarding platforms: regularly tested on Linux, only occasionally on macOS. # Please report success and/or failure to fare. - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ fare ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; }; } diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index 8c6b1a87cd379..3367ae581b2e0 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,14 +1,12 @@ -{ stdenv, callPackage, fetchFromGitHub, gambit }: +{ callPackage, fetchFromGitHub }: callPackage ./build.nix rec { - version = "0.15.1"; - git-version = "0.15.1"; - inherit gambit; + version = "0.16"; + git-version = version; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; rev = "v${version}"; - sha256 = "0qpqms66hz41wwhxb1z0fnzj96ivkm7qi9h9d7lhlr3fsxm1kp1n"; + sha256 = "0vng0kxpnwsg8jbjdpyn4sdww36jz7zfpfbzayg9sdpz6bjxjy0f"; }; - inherit stdenv; } diff --git a/pkgs/development/compilers/gerbil/gerbil-support.nix b/pkgs/development/compilers/gerbil/gerbil-support.nix new file mode 100644 index 0000000000000..4e94b6e65de14 --- /dev/null +++ b/pkgs/development/compilers/gerbil/gerbil-support.nix @@ -0,0 +1,64 @@ +{ pkgs, gccStdenv, callPackage, fetchFromGitHub }: +# See ../gambit/build.nix regarding gccStdenv + +rec { + # Gerbil libraries + gerbilPackages-unstable = { + gerbil-utils = callPackage ./gerbil-utils.nix { }; + }; + + # Use this function in any package that uses Gerbil libraries, to define the GERBIL_LOADPATH. + gerbilLoadPath = + gerbilInputs : builtins.concatStringsSep ":" (map (x : x + "/gerbil/lib") gerbilInputs); + + # Use this function to create a Gerbil library. See gerbil-utils as an example. + gerbilPackage = { + pname, version, src, meta, package, + git-version ? "", version-path ? "config/version.ss", + gerbil ? pkgs.gerbil-unstable, + gambit-params ? pkgs.gambit-support.stable-params, + gerbilInputs ? [], + buildInputs ? [], + softwareName ? "" } : + let buildInputs_ = buildInputs; in + gccStdenv.mkDerivation rec { + inherit src meta pname version; + buildInputs = [ gerbil ] ++ gerbilInputs ++ buildInputs_; + postPatch = '' + set -e ; + if [ -n "${version-path}" ] ; then + echo '(import :clan/utils/version)\n(register-software "${softwareName}" "${git-version}")\n' > "${version-path}" + fi + patchShebangs . ; + ''; + + postConfigure = '' + export GERBIL_BUILD_CORES=$NIX_BUILD_CORES + export GERBIL_PATH=$PWD/.build + export GERBIL_LOADPATH=${gerbilLoadPath gerbilInputs} + ${pkgs.gambit-support.export-gambopt gambit-params} + ''; + + buildPhase = '' + runHook preBuild + ./build.ss + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/gerbil/lib + cp -fa .build/lib $out/gerbil/ + bins=(.build/bin/*) + if [ 0 -lt ''${#bins} ] ; then + cp -fa .build/bin $out/gerbil/ + mkdir $out/bin + cd $out/bin + ln -s ../gerbil/bin/* . + fi + runHook postInstall + ''; + + dontFixup = true; + }; +} diff --git a/pkgs/development/compilers/gerbil/gerbil-utils.nix b/pkgs/development/compilers/gerbil/gerbil-utils.nix new file mode 100644 index 0000000000000..075a63d7bf4c3 --- /dev/null +++ b/pkgs/development/compilers/gerbil/gerbil-utils.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "gerbil-utils"; + version = "unstable-2020-05-17"; + git-version = "33ef720"; + package = "clan"; + gerbil = gerbil-unstable; + gambit-params = gambit-support.unstable-params; + version-path = ""; + src = fetchFromGitHub { + owner = "fare"; + repo = "gerbil-utils"; + rev = "33ef720799ba98dc9eec773c662f070af4bac016"; + sha256 = "0dsb97magbxzjqqfzwq4qwf7i80llv0s1dsy9nkzkvkq8drxlmqf"; + }; + meta = { + description = "Gerbil Clan: Community curated Collection of Common Utilities"; + homepage = "https://github.com/fare/gerbil-utils"; + license = lib.licenses.lgpl21; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; +} diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index eb78eed35ee9c..9de6dc42907a6 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,15 +1,15 @@ -{ stdenv, callPackage, fetchFromGitHub, gambit, gambit-unstable }: +{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support }: -callPackage ./build.nix { - version = "unstable-2020-02-27"; - git-version = "0.16-DEV-493-g1ffb74db"; - #gambit = gambit-unstable; - gambit = gambit; +callPackage ./build.nix rec { + version = "unstable-2020-05-17"; + git-version = "0.16-1-g36a31050"; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; - rev = "1ffb74db5ffd49b4bad751586cef5e619c891d41"; - sha256 = "1szmdp8lvy5gpcwn5bpa7x383m6vywl35xa7hz9a5vs1rq4w2097"; + rev = "36a31050f6c80e7e1a49dfae96a57b2ad0260698"; + sha256 = "0k3fypam9qx110sjxgzxa1mdf5b631w16s9p5v37cb8ll26vqfiv"; }; - inherit stdenv; + inherit gambit-support; + gambit = gambit-unstable; + gambit-params = gambit-support.unstable-params; } diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix index e90e0dc3d983e..d2a2a7a85e3c3 100644 --- a/pkgs/development/compilers/gforth/default.nix +++ b/pkgs/development/compilers/gforth/default.nix @@ -22,9 +22,8 @@ stdenv.mkDerivation { meta = { description = "The Forth implementation of the GNU project"; - homepage = https://www.gnu.org/software/gforth/; + homepage = "https://www.gnu.org/software/gforth/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index 9198d08cef451..c70efe1fdef3c 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -27,7 +27,7 @@ # platform). Static libs are always built. enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt -, # Whetherto build terminfo. +, # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows , # What flavour to build. An empty string indicates no @@ -73,7 +73,7 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; @@ -84,7 +84,9 @@ let targetCC = builtins.head toolsForTarget; - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false); + # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; in stdenv.mkDerivation (rec { @@ -158,10 +160,10 @@ stdenv.mkDerivation (rec { "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ @@ -174,7 +176,7 @@ stdenv.mkDerivation (rec { "--disable-large-address-space" ]; - # Make sure we never relax`$PATH` and hooks support for compatability. + # Make sure we never relax`$PATH` and hooks support for compatibility. strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. @@ -227,7 +229,7 @@ stdenv.mkDerivation (rec { }; meta = { - homepage = http://haskell.org/ghc; + homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 57d6a108de091..a4174c47046e4 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -24,7 +24,7 @@ # platform). Static libs are always built. enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt -, # Whetherto build terminfo. +, # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows , # What flavour to build. An empty string indicates no @@ -79,7 +79,9 @@ let targetCC = builtins.head toolsForTarget; - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false); + # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; in stdenv.mkDerivation (rec { @@ -184,7 +186,7 @@ stdenv.mkDerivation (rec { "--disable-large-address-space" ]; - # Make sure we never relax`$PATH` and hooks support for compatability. + # Make sure we never relax`$PATH` and hooks support for compatibility. strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. @@ -241,7 +243,7 @@ stdenv.mkDerivation (rec { }; meta = { - homepage = http://haskell.org/ghc; + homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index e276d9b12b935..06266556cf331 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -27,7 +27,7 @@ # platform). Static libs are always built. enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt -, # Whetherto build terminfo. +, # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows , # What flavour to build. An empty string indicates no @@ -84,7 +84,9 @@ let targetCC = builtins.head toolsForTarget; - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false); + # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; in stdenv.mkDerivation (rec { @@ -183,7 +185,7 @@ stdenv.mkDerivation (rec { "--disable-large-address-space" ]; - # Make sure we never relax`$PATH` and hooks support for compatability. + # Make sure we never relax`$PATH` and hooks support for compatibility. strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. @@ -244,7 +246,7 @@ stdenv.mkDerivation (rec { }; meta = { - homepage = http://haskell.org/ghc; + homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix deleted file mode 100644 index cc9dab51df739..0000000000000 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ /dev/null @@ -1,234 +0,0 @@ -{ stdenv, pkgsBuildTarget, targetPackages - -# build-tools -, bootPkgs -, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx -, bash - -, libiconv ? null, ncurses - -, # GHC can be built with system libffi or a bundled one. - libffi ? null - -, useLLVM ? !stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isiOS -, # LLVM is conceptually a run-time-only depedendency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt - -, # Whetherto build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) - (if useLLVM then "perf-cross" else "perf-cross-ncg") - -, # Whether to disable the large address space allocator - # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 -}: - -assert !enableIntegerSimple -> gmp != null; - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = stdenv.lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} - CrossCompilePrefix = ${targetPrefix} - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC - GhcRtsHcOpts += -fPIC - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' - EXTRA_CC_OPTS += -std=gnu99 - ''; - - # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo ncurses - ++ [libffi] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; - - toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false); - -in -stdenv.mkDerivation (rec { - version = "8.8.1"; - name = "${targetPrefix}ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "06kj4fhvijinjafiy4s873n60qly323rdlz9bmc79nhlp3cq72lh"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - postPatch = "patchShebangs ."; - - # GHC is a bit confused on its cross terminology. - preConfigure = '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - - echo -n "${buildMK}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' - sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + stdenv.lib.optionalString targetPlatform.isMusl '' - echo "patching llvm-targets for musl targets..." - echo "Cloning these existing '*-linux-gnu*' targets:" - grep linux-gnu llvm-targets | sed 's/^/ /' - echo "(go go gadget sed)" - sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets - echo "llvm-targets now contains these '*-linux-musl*' targets:" - grep linux-musl llvm-targets | sed 's/^/ /' - - echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" - # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) - for x in configure aclocal.m4; do - substituteInPlace $x \ - --replace '*-android*|*-gnueabi*)' \ - '*-android*|*-gnueabi*|*-musleabi*)' - done - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals useLdGold [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ - "--disable-large-address-space" - ]; - - # Make sure we never relax`$PATH` and hooks support for compatability. - strictDeps = true; - - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - - nativeBuildInputs = [ - perl autoconf automake m4 python3 sphinx - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); - - propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ stdenv.lib.optional useLLVM llvmPackages.llvm; - - depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - checkTarget = "test"; - - hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; - - postInstall = '' - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i - done - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - inherit enableShared; - - # Our Cabal compiler name - haskellCompilerName = "ghc-${version}"; - }; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { - dontStrip = true; - dontPatchELF = true; - noAuditTmpdir = true; -}) diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix index 0f9fd7731d321..305226b340797 100644 --- a/pkgs/development/compilers/ghc/8.8.2.nix +++ b/pkgs/development/compilers/ghc/8.8.2.nix @@ -27,7 +27,7 @@ # platform). Static libs are always built. enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt -, # Whetherto build terminfo. +, # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows , # What flavour to build. An empty string indicates no @@ -73,7 +73,7 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; @@ -84,7 +84,9 @@ let targetCC = builtins.head toolsForTarget; - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false); + # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; in stdenv.mkDerivation (rec { @@ -158,10 +160,10 @@ stdenv.mkDerivation (rec { "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ @@ -174,7 +176,7 @@ stdenv.mkDerivation (rec { "--disable-large-address-space" ]; - # Make sure we never relax`$PATH` and hooks support for compatability. + # Make sure we never relax`$PATH` and hooks support for compatibility. strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. @@ -227,7 +229,7 @@ stdenv.mkDerivation (rec { }; meta = { - homepage = http://haskell.org/ghc; + homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix index e4ece9b8d8c16..b199dc34fa377 100644 --- a/pkgs/development/compilers/ghc/8.8.3.nix +++ b/pkgs/development/compilers/ghc/8.8.3.nix @@ -27,7 +27,7 @@ # platform). Static libs are always built. enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt -, # Whetherto build terminfo. +, # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows , # What flavour to build. An empty string indicates no @@ -73,7 +73,7 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; @@ -84,7 +84,9 @@ let targetCC = builtins.head toolsForTarget; - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false); + # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; in stdenv.mkDerivation (rec { @@ -158,10 +160,10 @@ stdenv.mkDerivation (rec { "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ @@ -174,7 +176,7 @@ stdenv.mkDerivation (rec { "--disable-large-address-space" ]; - # Make sure we never relax`$PATH` and hooks support for compatability. + # Make sure we never relax`$PATH` and hooks support for compatibility. strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. @@ -227,7 +229,7 @@ stdenv.mkDerivation (rec { }; meta = { - homepage = http://haskell.org/ghc; + homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 2dd7d5f30c4d8..a15ef7f7dbf81 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -2,13 +2,17 @@ # build-tools , bootPkgs -, autoconf, autoreconfHook, automake, coreutils, fetchgit, fetchpatch, perl, python3, m4, sphinx +, autoconf, autoreconfHook, automake, coreutils, fetchgit, perl, python3, m4, sphinx , bash , libiconv ? null, ncurses +, # GHC can be built with system libffi or a bundled one. + libffi ? null + , enableDwarf ? !stdenv.targetPlatform.isDarwin && - !stdenv.targetPlatform.isWindows, elfutils # for DWARF support + !stdenv.targetPlatform.isWindows +, elfutils # for DWARF support , useLLVM ? !stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isiOS , # LLVM is conceptually a run-time-only depedendency, but for @@ -18,7 +22,8 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms) +, gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform @@ -27,10 +32,10 @@ # platform). Static libs are always built. enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt -, # Whetherto build terminfo. +, # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows -, version ? "8.10.20191119" +, version ? "8.11.20200505" , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) @@ -75,6 +80,7 @@ let # Splicer will pull out correct variations libDeps = platform: stdenv.lib.optional enableTerminfo ncurses + ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv ++ stdenv.lib.optional enableDwarf elfutils; @@ -85,7 +91,9 @@ let targetCC = builtins.head toolsForTarget; - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false); + # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; in stdenv.mkDerivation (rec { @@ -95,17 +103,14 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://gitlab.haskell.org/ghc/ghc.git/"; - rev = "0418c38d55c7a47967187dce2db5ea2ab1021b1e"; - sha256 = "1d8g30ii0w4xh6fh61bxbalsqqyanny99nn3p727fx7favnhgvxi"; + rev = "40c71c2cf38b4e134d81b7184a4d5e02949ae70c"; + sha256 = "04h9rcyzm9w3an1z00hjs062dp7dl19b8pkyxjsypr7a2i9dmvkb"; }; enableParallelBuilding = true; outputs = [ "out" "doc" ]; - patches = [ - ]; - postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. @@ -128,8 +133,8 @@ stdenv.mkDerivation (rec { export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" echo -n "${buildMK}" > mk/build.mk - echo ${version} >VERSION - echo ${src.rev} >GIT_COMMIT_ID + echo ${version} > VERSION + echo ${src.rev} > GIT_COMMIT_ID ./boot sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' @@ -159,31 +164,40 @@ stdenv.mkDerivation (rec { # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + # `--with` flags for libraries needed for RTS linker configureFlags = [ "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + "--with-curses-libraries=${ncurses.out}/lib" + ] ++ stdenv.lib.optionals (libffi != null) [ + "--with-system-libffi" + "--with-ffi-includes=${targetPackages.libffi.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + "--with-gmp-includes=${targetPackages.gmp.dev}/include" + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" ] ++ stdenv.lib.optionals useLdGold [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ - "--disable-large-address-space" - ] ++ stdenv.lib.optionals enableDwarf [ + ] ++ stdenv.lib.optional disableLargeAddressSpace "--disable-large-address-space" + ++ stdenv.lib.optionals enableDwarf [ "--enable-dwarf-unwind" "--with-libdw-includes=${stdenv.lib.getDev elfutils}/include" "--with-libdw-libraries=${stdenv.lib.getLib elfutils}/lib" ]; - # Make sure we never relax`$PATH` and hooks support for compatability. + # Make sure we never relax`$PATH` and hooks support for compatibility. strictDeps = true; + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + nativeBuildInputs = [ perl autoconf autoreconfHook automake m4 python3 sphinx ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour @@ -231,7 +245,7 @@ stdenv.mkDerivation (rec { }; meta = { - homepage = http://haskell.org/ghc; + homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 7b6fbc460a95d..6d56c410aabdf 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -102,6 +102,7 @@ in stdenv.mkDerivation { inherit passthru; - meta.platforms = passthru.bootPkgs.ghc.meta.platforms; + meta.broken = true; # build does not succeed + meta.platforms = lib.platforms.none; # passthru.bootPkgs.ghc.meta.platforms; meta.maintainers = [lib.maintainers.elvishjerricco]; } diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix new file mode 100644 index 0000000000000..6d1fae3373407 --- /dev/null +++ b/pkgs/development/compilers/ghdl/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, gnat, zlib, llvm, lib +, backend ? "mcode" }: + +assert backend == "mcode" || backend == "llvm"; + +stdenv.mkDerivation rec { + pname = "ghdl-${backend}"; + version = "0.37"; + + src = fetchFromGitHub { + owner = "ghdl"; + repo = "ghdl"; + rev = "v${version}"; + sha256 = "0b53yl4im33c1cd4mdyc4ks9cmrpixym17gzchfmplrl22w3l17y"; + }; + + LIBRARY_PATH = "${stdenv.cc.libc}/lib"; + + buildInputs = [ gnat zlib ]; + + preConfigure = '' + # If llvm 7.0 works, 7.x releases should work too. + sed -i 's/check_version 7.0/check_version 7/g' configure + ''; + + configureFlags = lib.optional (backend == "llvm") + "--with-llvm-config=${llvm}/bin/llvm-config"; + + hardeningDisable = [ "format" ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/ghdl/ghdl"; + description = "VHDL 2008/93/87 simulator"; + maintainers = with maintainers; [ lucus16 ]; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 5179142e40e10..1fa8720a400ad 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "1bcxq7bgn0kf1vdw6id8s3izz6mwf3ivr8iph4miig302qm9lmmr"; + sha256 = "05n8a7b63i9946fvbxphfh8n6ib20qnbv44ghlzcjwca9qvlx7i7"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "17bvms65frxhw0d196qswh3jjqlriidq3xi3mfjjgfh6n17rh608"; + cargoSha256 = "1ga5dinkmibkg53bfr6vc0i4bbgyn2y3d5qjf5bd965c1v7ba1jl"; meta = with stdenv.lib; { description = "A statically typed language for the Erlang VM"; diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix new file mode 100644 index 0000000000000..cb643d6123a6d --- /dev/null +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + pname = "gentoo-gnatboot"; + version = "4.1"; + + src = if stdenv.system == "i686-linux" then + fetchurl { + url = mirror://gentoo/distfiles/gnatboot-4.1-i386.tar.bz2; + sha256 = "0665zk71598204bf521vw68i5y6ccqarq9fcxsqp7ccgycb4lysr"; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + url = mirror://gentoo/distfiles/gnatboot-4.1-amd64.tar.bz2; + sha256 = "1li4d52lmbnfs6llcshlbqyik2q2q4bvpir0f7n38nagp0h6j0d4"; + } + else + throw "Platform not supported"; + + dontStrip = 1; + + installPhase = '' + mkdir -p $out + cp -R * $out + + set +e + for a in $out/bin/* ; do + patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath $(cat $NIX_CC/nix-support/orig-libc)/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib $a + done + set -e + + mv $out/bin/gnatgcc_2wrap $out/bin/gnatgcc + ln -s $out/bin/gnatgcc $out/bin/gcc + ''; + + passthru = { + langC = true; # TRICK for gcc-wrapper to wrap it + langCC = false; + langFortran = false; + langAda = true; + }; + + meta = with stdenv.lib; { + homepage = "https://gentoo.org"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.lucus16 ]; + + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix index df5202cb1c204..146af98093d02 100644 --- a/pkgs/development/compilers/gnu-cobol/default.nix +++ b/pkgs/development/compilers/gnu-cobol/default.nix @@ -32,9 +32,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open-source COBOL compiler"; - homepage = https://sourceforge.net/projects/open-cobol/; + homepage = "https://sourceforge.net/projects/open-cobol/"; license = licenses.gpl3; - maintainers = with maintainers; [ ericsagnes the-kenny ]; + maintainers = with maintainers; [ ericsagnes ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index 1035091654a6d..f48cd6dfa1b13 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { course), as well as under Windows. Smalltalk is a dynamic object-oriented language, well-versed to scripting tasks. ''; - homepage = http://smalltalk.gnu.org/; + homepage = "http://smalltalk.gnu.org/"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; maintainers = with maintainers; [ skeidel ]; diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix index a39ee351f21ec..6c00d5ee6ce55 100644 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0l6cwky2xl7m8nnc9abp76bhkdcf2ldbbv3r8p30xv2yr5wd1j8i"; }; - modSha256 = "1b6hz5a66hhlzpcv1badxr1b4nmk4lw0507d5jks7lqzvvwd0sxq"; + vendorSha256 = "1vdv0nq31mjprxzxf8x0diaigissy07vnm338h8jrk5i74x5by39"; subPackages = [ "cmd/jsonnet" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ nshalman ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix deleted file mode 100644 index 3b4091bf1140c..0000000000000 --- a/pkgs/development/compilers/go/1.12.nix +++ /dev/null @@ -1,247 +0,0 @@ -{ stdenv, fetchurl, tzdata, iana-etc, runCommand -, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation -, mailcap, runtimeShell -, buildPackages, pkgsTargetTarget -}: - -let - - inherit (stdenv.lib) optionals optionalString; - - goBootstrap = runCommand "go-bootstrap" {} '' - mkdir $out - cp -rf ${buildPackages.go_bootstrap}/* $out/ - chmod -R u+w $out - find $out -name "*.c" -delete - cp -rf $out/bin/* $out/share/go/bin/ - ''; - - goarch = platform: { - i686 = "386"; - x86_64 = "amd64"; - aarch64 = "arm64"; - arm = "arm"; - armv5tel = "arm"; - armv6l = "arm"; - armv7l = "arm"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system"); - -in - -stdenv.mkDerivation rec { - pname = "go"; - version = "1.12.17"; - - src = fetchurl { - url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "09cbl90maxry713wd18jdqrms3ivbvcm472csnxc78rsqhc851yy"; - }; - - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch procps ]; - buildInputs = [ cacert pcre ] - ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; - - hardeningDisable = [ "all" ]; - - prePatch = '' - patchShebangs ./ # replace /bin/bash - - # This source produces shell script at run time, - # and thus it is not corrected by patchShebangs. - substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${runtimeShell}' - - # Patch the mimetype database location which is missing on NixOS. - substituteInPlace src/mime/type_unix.go \ - --replace '/etc/mime.types' '${mailcap}/etc/mime.types' - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{listen,parse}_test.go - rm src/syscall/exec_linux_test.go - - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/areturn' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/areturn' src/time/format_test.go - # Remove the api check as it never worked - sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go - # Remove the coverage test as we have removed this utility - sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go - # Remove the timezone naming test - sed -i '/TestLoadFixed/areturn' src/time/time_test.go - # Remove disable setgid test - sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go - # Remove cert tests that conflict with NixOS's cert resolution - sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go - # TestWritevError hangs sometimes - sed -i '/TestWritevError/areturn' src/net/writev_test.go - # TestVariousDeadlines fails sometimes - sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go - - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go - - # Disable cgo lookup tests not works, they depend on resolver - rm src/net/cgo_unix_test.go - - # Disable TestGcSys because it's flakey in our tests, but the failure is not - # reproducible by multiple people in other environments. - # See https://github.com/NixOS/nixpkgs/issues/68361#issuecomment-537849272 and following - # NOTE: Try re-enabling for releases newer than 1.12.9 - sed -i '/TestGcSys/areturn' src/runtime/gc_test.go - - '' + optionalString stdenv.isLinux '' - sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + optionalString stdenv.isAarch32 '' - echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash - '' + optionalString stdenv.isDarwin '' - substituteInPlace src/race.bash --replace \ - "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true - sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - - sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go - sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go - sed -i '/TestRead0/areturn' src/os/os_test.go - sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go - - sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - - # TestCurrent fails because Current is not implemented on Darwin - sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go - sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - ''; - - patches = [ - ./remove-tools-1.11.patch - ./ssl-cert-file-1.12.1.patch - ./remove-test-pie.patch - ./creds-test.patch - ./go-1.9-skip-flaky-19608.patch - ./go-1.9-skip-flaky-20072.patch - ./skip-external-network-tests.patch - ./skip-nohup-tests.patch - ] ++ [ - # breaks under load: https://github.com/golang/go/issues/25628 - (if stdenv.isAarch32 - then ./skip-test-extra-files-on-aarch32.patch - else ./skip-test-extra-files-on-386.patch) - ]; - - postPatch = '' - find . -name '*.orig' -exec rm {} ';' - ''; - - GOOS = stdenv.targetPlatform.parsed.kernel.name; - GOARCH = goarch stdenv.targetPlatform; - # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. - # Go will nevertheless build a for host system that we will copy over in - # the install phase. - GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; - GOHOSTARCH = goarch stdenv.buildPlatform; - - # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those - # to be different from CC/CXX - CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" - else - null; - CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" - else - null; - - GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - # Hopefully avoids test timeouts on Hydra - GO_TEST_TIMEOUT_SCALE = 3; - - # Indicate that we are running on build infrastructure - # Some tests assume things like home directories and users exists - GO_BUILDER_NAME = "nix"; - - GOROOT_BOOTSTRAP="${goBootstrap}/share/go"; - - postConfigure = '' - export GOCACHE=$TMPDIR/go-cache - # this is compiled into the binary - export GOROOT_FINAL=$out/share/go - - export PATH=$(pwd)/bin:$PATH - - # Independent from host/target, CC should produce code for the building system. - export CC=${buildPackages.stdenv.cc}/bin/cc - ulimit -a - ''; - - postBuild = '' - (cd src && ./make.bash) - ''; - - doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; - - checkPhase = '' - runHook preCheck - (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) - runHook postCheck - ''; - - preInstall = '' - rm -r pkg/{bootstrap,obj} - # Contains the wrong perl shebang when cross compiling, - # since it is not used for anything we can deleted as well. - rm src/regexp/syntax/make_perl_groups.pl - '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' - mv bin/*_*/* bin - rmdir bin/*_* - ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} - ''} - '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' - rm -rf bin/*_* - ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} - ''} - '' else ""); - - installPhase = '' - runHook preInstall - mkdir -p $GOROOT_FINAL - cp -a bin pkg src lib misc api doc $GOROOT_FINAL - ln -s $GOROOT_FINAL/bin $out/bin - runHook postInstall - ''; - - setupHook = ./setup-hook.sh; - - disallowedReferences = [ goBootstrap ]; - - meta = with stdenv.lib; { - branch = "1.12"; - homepage = http://golang.org/; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs Frostman ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index 36345bb0dab8b..b524d3d6b0933 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.13.8"; + version = "1.13.11"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0d7cxffk72568h46srzswrxd0bsdip7amgkf499wzn6l6d3g0fxi"; + sha256 = "0y86q2k00lh8c7wj3lha43g804iwr61nap8j3i907l2sway1mvc9"; }; # perl is used for testing go vet @@ -229,13 +229,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - setupHook = ./setup-hook.sh; - disallowedReferences = [ goBootstrap ]; meta = with stdenv.lib; { branch = "1.13"; - homepage = http://golang.org/; + homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs kalbasit Frostman ]; diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index b8038a5d9dd0c..9ee5b6fa62425 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14"; + version = "1.14.2"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "12a3nzj4k4p5ica447sjfva9pvvj84a03b4xlg3mhl2nmm33wr3d"; + sha256 = "0z3zxsnhmsxplnwfw1l9gr6jgglwp50sr3p5njknv9i6jzk89plq"; }; # perl is used for testing go vet @@ -235,7 +235,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { branch = "1.14"; - homepage = http://golang.org/; + homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs kalbasit Frostman ]; diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index c3c46de1fce05..fc3fb0ad0e5ad 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { branch = "1.4"; - homepage = http://golang.org/; + homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/development/compilers/go/remove-test-pie.patch b/pkgs/development/compilers/go/remove-test-pie.patch deleted file mode 100644 index fb8e116af76f4..0000000000000 --- a/pkgs/development/compilers/go/remove-test-pie.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- source.org/src/cmd/dist/test.go 2018-02-22 10:40:40.089632339 +0000 -+++ source/src/cmd/dist/test.go 2018-02-22 10:56:53.075193788 +0000 -@@ -526,21 +526,6 @@ - }) - } - -- // Test internal linking of PIE binaries where it is supported. -- if goos == "linux" && goarch == "amd64" && !isAlpineLinux() { -- // Issue 18243: We don't have a way to set the default -- // dynamic linker used in internal linking mode. So -- // this test is skipped on Alpine. -- t.tests = append(t.tests, distTest{ -- name: "pie_internal", -- heading: "internal linking of -buildmode=pie", -- fn: func(dt *distTest) error { -- t.addCmd(dt, "src", t.goTest(), "reflect", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) -- return nil -- }, -- }) -- } -- - // sync tests - t.tests = append(t.tests, distTest{ - name: "sync_cpu", diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch b/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch deleted file mode 100644 index aa3116d76c125..0000000000000 --- a/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -Naur a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go ---- a/src/crypto/x509/root_cgo_darwin.go 2019-03-15 11:33:55.920232337 -0700 -+++ b/src/crypto/x509/root_cgo_darwin.go 2019-03-15 11:34:53.323180897 -0700 -@@ -270,11 +270,20 @@ - import "C" - import ( - "errors" -+ "io/ioutil" -+ "os" - "unsafe" - ) - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - - var data C.CFDataRef = 0 - var untrustedData C.CFDataRef = 0 -diff -Naur a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go ---- a/src/crypto/x509/root_darwin.go 2019-03-15 11:33:55.920232337 -0700 -+++ b/src/crypto/x509/root_darwin.go 2019-03-15 11:36:21.205123541 -0700 -@@ -92,6 +92,14 @@ - verifyCh = make(chan rootCandidate) - ) - -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } -+ - // Using 4 goroutines to pipe into verify-cert seems to be - // about the best we can do. The verify-cert binary seems to - // just RPC to another server with coarse locking anyway, so -diff -Naur a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go ---- a/src/crypto/x509/root_unix.go 2019-03-15 11:33:55.920232337 -0700 -+++ b/src/crypto/x509/root_unix.go 2019-03-15 11:37:15.737326340 -0700 -@@ -38,6 +38,13 @@ - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - - files := certFiles - if f := os.Getenv(certFileEnv); f != "" { diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index b823bf9bdd44d..0a1cc51287342 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = https://www.gnu.org/software/gprolog/; + homepage = "https://www.gnu.org/software/gprolog/"; description = "GNU Prolog, a free Prolog compiler with constraint solving over finite domains"; license = stdenv.lib.licenses.lgpl3Plus; diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index b3066b3098cbe..244ee4c010ea9 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -116,31 +116,31 @@ let }; jvmci8-mxcache = [ - rec { sha1 = "53addc878614171ff0fcbc8f78aed12175c22cdb"; name = "JACOCOCORE_0.8.4_${sha1}/jacococore-0.8.4.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.8.4/org.jacoco.core-0.8.4.jar; } - rec { sha1 = "9bd1fa334d941005bc9ab3ac92478a590f5b7d73"; name = "JACOCOCORE_0.8.4_${sha1}/jacococore-0.8.4.sources.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.8.4/org.jacoco.core-0.8.4-sources.jar; } - rec { sha1 = "e5ca9511493b7e3bc2cabdb8ded92e855f3aac32"; name = "JACOCOREPORT_0.8.4_${sha1}/jacocoreport-0.8.4.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.8.4/org.jacoco.report-0.8.4.jar; } - rec { sha1 = "eb61e479b35b467954f28a565c094c563b790e19"; name = "JACOCOREPORT_0.8.4_${sha1}/jacocoreport-0.8.4.sources.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.8.4/org.jacoco.report-0.8.4-sources.jar; } - rec { sha1 = "869021a6d90cfb008b12e83fccbe42eca29e5355"; name = "JACOCOAGENT_0.8.4_${sha1}/jacocoagent-0.8.4.jar"; url = mirror://maven/org/jacoco/org.jacoco.agent/0.8.4/org.jacoco.agent-0.8.4-runtime.jar; } - rec { sha1 = "306816fb57cf94f108a43c95731b08934dcae15c"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar; } - rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.sources.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar; } - rec { sha1 = "fa29aa438674ff19d5e1386d2c3527a0267f291e"; name = "ASM_7.1_${sha1}/asm-7.1.jar"; url = mirror://maven/org/ow2/asm/asm/7.1/asm-7.1.jar; } - rec { sha1 = "9d170062d595240da35301362b079e5579c86f49"; name = "ASM_7.1_${sha1}/asm-7.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm/7.1/asm-7.1-sources.jar; } - rec { sha1 = "a3662cf1c1d592893ffe08727f78db35392fa302"; name = "ASM_TREE_7.1_${sha1}/asm-tree-7.1.jar"; url = mirror://maven/org/ow2/asm/asm-tree/7.1/asm-tree-7.1.jar; } - rec { sha1 = "157238292b551de8680505fa2d19590d136e25b9"; name = "ASM_TREE_7.1_${sha1}/asm-tree-7.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-tree/7.1/asm-tree-7.1-sources.jar; } - rec { sha1 = "379e0250f7a4a42c66c5e94e14d4c4491b3c2ed3"; name = "ASM_ANALYSIS_7.1_${sha1}/asm-analysis-7.1.jar"; url = mirror://maven/org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1.jar; } - rec { sha1 = "36789198124eb075f1a5efa18a0a7812fb16f47f"; name = "ASM_ANALYSIS_7.1_${sha1}/asm-analysis-7.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1-sources.jar; } - rec { sha1 = "431dc677cf5c56660c1c9004870de1ed1ea7ce6c"; name = "ASM_COMMONS_7.1_${sha1}/asm-commons-7.1.jar"; url = mirror://maven/org/ow2/asm/asm-commons/7.1/asm-commons-7.1.jar; } - rec { sha1 = "a62ff3ae6e37affda7c6fb7d63b89194c6d006ee"; name = "ASM_COMMONS_7.1_${sha1}/asm-commons-7.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-commons/7.1/asm-commons-7.1-sources.jar; } - rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar; } - rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.sources.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar; } - rec { sha1 = "442447101f63074c61063858033fbfde8a076873"; name = "JMH_1_21_${sha1}/jmh-1-21.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21.jar; } - rec { sha1 = "a6fe84788bf8cf762b0e561bf48774c2ea74e370"; name = "JMH_1_21_${sha1}/jmh-1-21.sources.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21-sources.jar; } - rec { sha1 = "7aac374614a8a76cad16b91f1a4419d31a7dcda3"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21.jar; } - rec { sha1 = "fb48e2a97df95f8b9dced54a1a37749d2a64d2ae"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.sources.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21-sources.jar; } - rec { sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec"; name = "JUNIT_${sha1}/junit.jar"; url = mirror://maven/junit/junit/4.12/junit-4.12.jar; } - rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT_${sha1}/junit.sources.jar"; url = mirror://maven/junit/junit/4.12/junit-4.12-sources.jar; } - rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}/hamcrest.jar"; url = mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar; } - rec { sha1 = "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"; name = "HAMCREST_${sha1}/hamcrest.sources.jar"; url = mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar; } + rec { sha1 = "53addc878614171ff0fcbc8f78aed12175c22cdb"; name = "JACOCOCORE_0.8.4_${sha1}/jacococore-0.8.4.jar"; url = "mirror://maven/org/jacoco/org.jacoco.core/0.8.4/org.jacoco.core-0.8.4.jar"; } + rec { sha1 = "9bd1fa334d941005bc9ab3ac92478a590f5b7d73"; name = "JACOCOCORE_0.8.4_${sha1}/jacococore-0.8.4.sources.jar"; url = "mirror://maven/org/jacoco/org.jacoco.core/0.8.4/org.jacoco.core-0.8.4-sources.jar"; } + rec { sha1 = "e5ca9511493b7e3bc2cabdb8ded92e855f3aac32"; name = "JACOCOREPORT_0.8.4_${sha1}/jacocoreport-0.8.4.jar"; url = "mirror://maven/org/jacoco/org.jacoco.report/0.8.4/org.jacoco.report-0.8.4.jar"; } + rec { sha1 = "eb61e479b35b467954f28a565c094c563b790e19"; name = "JACOCOREPORT_0.8.4_${sha1}/jacocoreport-0.8.4.sources.jar"; url = "mirror://maven/org/jacoco/org.jacoco.report/0.8.4/org.jacoco.report-0.8.4-sources.jar"; } + rec { sha1 = "869021a6d90cfb008b12e83fccbe42eca29e5355"; name = "JACOCOAGENT_0.8.4_${sha1}/jacocoagent-0.8.4.jar"; url = "mirror://maven/org/jacoco/org.jacoco.agent/0.8.4/org.jacoco.agent-0.8.4-runtime.jar"; } + rec { sha1 = "306816fb57cf94f108a43c95731b08934dcae15c"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.jar"; url = "mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar"; } + rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.sources.jar"; url = "mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar"; } + rec { sha1 = "fa29aa438674ff19d5e1386d2c3527a0267f291e"; name = "ASM_7.1_${sha1}/asm-7.1.jar"; url = "mirror://maven/org/ow2/asm/asm/7.1/asm-7.1.jar"; } + rec { sha1 = "9d170062d595240da35301362b079e5579c86f49"; name = "ASM_7.1_${sha1}/asm-7.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm/7.1/asm-7.1-sources.jar"; } + rec { sha1 = "a3662cf1c1d592893ffe08727f78db35392fa302"; name = "ASM_TREE_7.1_${sha1}/asm-tree-7.1.jar"; url = "mirror://maven/org/ow2/asm/asm-tree/7.1/asm-tree-7.1.jar"; } + rec { sha1 = "157238292b551de8680505fa2d19590d136e25b9"; name = "ASM_TREE_7.1_${sha1}/asm-tree-7.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-tree/7.1/asm-tree-7.1-sources.jar"; } + rec { sha1 = "379e0250f7a4a42c66c5e94e14d4c4491b3c2ed3"; name = "ASM_ANALYSIS_7.1_${sha1}/asm-analysis-7.1.jar"; url = "mirror://maven/org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1.jar"; } + rec { sha1 = "36789198124eb075f1a5efa18a0a7812fb16f47f"; name = "ASM_ANALYSIS_7.1_${sha1}/asm-analysis-7.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1-sources.jar"; } + rec { sha1 = "431dc677cf5c56660c1c9004870de1ed1ea7ce6c"; name = "ASM_COMMONS_7.1_${sha1}/asm-commons-7.1.jar"; url = "mirror://maven/org/ow2/asm/asm-commons/7.1/asm-commons-7.1.jar"; } + rec { sha1 = "a62ff3ae6e37affda7c6fb7d63b89194c6d006ee"; name = "ASM_COMMONS_7.1_${sha1}/asm-commons-7.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-commons/7.1/asm-commons-7.1-sources.jar"; } + rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.jar"; url = "mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar"; } + rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.sources.jar"; url = "mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar"; } + rec { sha1 = "442447101f63074c61063858033fbfde8a076873"; name = "JMH_1_21_${sha1}/jmh-1-21.jar"; url = "mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21.jar"; } + rec { sha1 = "a6fe84788bf8cf762b0e561bf48774c2ea74e370"; name = "JMH_1_21_${sha1}/jmh-1-21.sources.jar"; url = "mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21-sources.jar"; } + rec { sha1 = "7aac374614a8a76cad16b91f1a4419d31a7dcda3"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.jar"; url = "mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21.jar"; } + rec { sha1 = "fb48e2a97df95f8b9dced54a1a37749d2a64d2ae"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.sources.jar"; url = "mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21-sources.jar"; } + rec { sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec"; name = "JUNIT_${sha1}/junit.jar"; url = "mirror://maven/junit/junit/4.12/junit-4.12.jar"; } + rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT_${sha1}/junit.sources.jar"; url = "mirror://maven/junit/junit/4.12/junit-4.12-sources.jar"; } + rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}/hamcrest.jar"; url = "mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"; } + rec { sha1 = "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"; name = "HAMCREST_${sha1}/hamcrest.sources.jar"; url = "mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar"; } rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "hsdis_${sha1}/hsdis.so"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hsdis/intel/hsdis-amd64-linux-${sha1}.so"; } ] ++ lib.optionals stdenv.isLinux [ rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "hsdis_${sha1}/hsdis.so"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hsdis/intel/hsdis-amd64-linux-${sha1}.so"; } @@ -150,60 +150,60 @@ let ]; graal-mxcache = jvmci8-mxcache ++ [ - # rec { sha1 = "5001adab652fc4eb35e30cdefbb0765442f8b7db"; name = "LLVM_ORG_LIBCXX_SRC_${sha1}/llvm-org-libcxx-src.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/compiler-rt-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz; } - rec { sha1 = "5001adab652fc4eb35e30cdefbb0765442f8b7db"; name = "LLVM_ORG_COMPILER_RT_LINUX_${sha1}/llvm-org-compiler-rt-linux.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/compiler-rt-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz; } - rec { sha1 = "a990b2dba1c706f5c43c56fedfe70bad9a695852"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.jar"; url = mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2.jar; } - rec { sha1 = "decbd95d46092fa9afaf2523b5b23d07ad7ad6bc"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.sources.jar"; url = mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-sources.jar; } - rec { sha1 = "cfa6a0259d98bff5aa8d41ba11b4d1dad648fbaa"; name = "JAVACPP_${sha1}/javacpp.jar"; url = mirror://maven/org/bytedeco/javacpp/1.4.2/javacpp-1.4.2.jar; } - rec { sha1 = "fdb2d2c17f6b91cdd5421554396da8905f0dfed2"; name = "JAVACPP_${sha1}/javacpp.sources.jar"; url = mirror://maven/org/bytedeco/javacpp/1.4.2/javacpp-1.4.2-sources.jar; } + # rec { sha1 = "5001adab652fc4eb35e30cdefbb0765442f8b7db"; name = "LLVM_ORG_LIBCXX_SRC_${sha1}/llvm-org-libcxx-src.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/compiler-rt-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz"; } + rec { sha1 = "5001adab652fc4eb35e30cdefbb0765442f8b7db"; name = "LLVM_ORG_COMPILER_RT_LINUX_${sha1}/llvm-org-compiler-rt-linux.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/compiler-rt-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz"; } + rec { sha1 = "a990b2dba1c706f5c43c56fedfe70bad9a695852"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.jar"; url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2.jar"; } + rec { sha1 = "decbd95d46092fa9afaf2523b5b23d07ad7ad6bc"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.sources.jar"; url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-sources.jar"; } + rec { sha1 = "cfa6a0259d98bff5aa8d41ba11b4d1dad648fbaa"; name = "JAVACPP_${sha1}/javacpp.jar"; url = "mirror://maven/org/bytedeco/javacpp/1.4.2/javacpp-1.4.2.jar"; } + rec { sha1 = "fdb2d2c17f6b91cdd5421554396da8905f0dfed2"; name = "JAVACPP_${sha1}/javacpp.sources.jar"; url = "mirror://maven/org/bytedeco/javacpp/1.4.2/javacpp-1.4.2-sources.jar"; } rec { sha1 = "702ca2d0ae93841c5ab75e4d119b29780ec0b7d9"; name = "NINJA_SYNTAX_${sha1}/ninja-syntax.tar.gz"; url = "https://pypi.org/packages/source/n/ninja_syntax/ninja_syntax-1.7.2.tar.gz"; } - rec { sha1 = "f2cfb09cee12469ff64f0d698b13de19903bb4f7"; name = "NanoHTTPD-WebSocket_${sha1}/nanohttpd-websocket.jar"; url = mirror://maven/org/nanohttpd/nanohttpd-websocket/2.3.1/nanohttpd-websocket-2.3.1.jar; } - rec { sha1 = "a8d54d1ca554a77f377eff6bf9e16ca8383c8f6c"; name = "NanoHTTPD_${sha1}/nanohttpd.jar"; url = mirror://maven/org/nanohttpd/nanohttpd/2.3.1/nanohttpd-2.3.1.jar; } - rec { sha1 = "946f8aa9daa917dd81a8b818111bec7e288f821a"; name = "ANTLR4_${sha1}/antlr4.jar"; url = mirror://maven/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1.jar; } - rec { sha1 = "c3aeac59c022bdc497c8c48ed86fa50450e4896a"; name = "JLINE_${sha1}/jline.jar"; url = mirror://maven/jline/jline/2.14.6/jline-2.14.6.jar; } - rec { sha1 = "d0bdc21c5e6404726b102998e44c66a738897905"; name = "JAVA_ALLOCATION_INSTRUMENTER_${sha1}/java-allocation-instrumenter.jar"; url = mirror://maven/com/google/code/java-allocation-instrumenter/java-allocation-instrumenter/3.1.0/java-allocation-instrumenter-3.1.0.jar; } - rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}/asm5.jar"; url = mirror://maven/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar; } - rec { sha1 = "396ce0c07ba2b481f25a70195c7c94922f0d1b0b"; name = "ASM_TREE5_${sha1}/asm-tree5.jar"; url = mirror://maven/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar; } - rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_SOURCES_${sha1}/libffi-sources.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz; } - rec { sha1 = "8819cea8bfe22c9c63f55465e296b3855ea41786"; name = "TruffleJSON_${sha1}/trufflejson.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/trufflejson-20180130.jar; } - rec { sha1 = "9712a8124c40298015f04a74f61b3d81a51513af"; name = "CHECKSTYLE_8.8_${sha1}/checkstyle-8.8.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/checkstyle-8.8-all.jar; } - rec { sha1 = "8dc5a90bed5f51d7538d05b8c31c31b7dfddbd66"; name = "VISUALVM_COMMON_${sha1}/visualvm-common.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20.tar.gz; } - rec { sha1 = "e6e60889b7211a80b21052a249bd7e0f88f79fee"; name = "Java-WebSocket_${sha1}/java-websocket.jar"; url = mirror://maven/org/java-websocket/Java-WebSocket/1.3.9/Java-WebSocket-1.3.9.jar; } - rec { sha1 = "7a4d00d5ec5febd252a6182e8b6e87a0a9821f81"; name = "ICU4J_${sha1}/icu4j.jar"; url = mirror://maven/com/ibm/icu/icu4j/62.1/icu4j-62.1.jar; } + rec { sha1 = "f2cfb09cee12469ff64f0d698b13de19903bb4f7"; name = "NanoHTTPD-WebSocket_${sha1}/nanohttpd-websocket.jar"; url = "mirror://maven/org/nanohttpd/nanohttpd-websocket/2.3.1/nanohttpd-websocket-2.3.1.jar"; } + rec { sha1 = "a8d54d1ca554a77f377eff6bf9e16ca8383c8f6c"; name = "NanoHTTPD_${sha1}/nanohttpd.jar"; url = "mirror://maven/org/nanohttpd/nanohttpd/2.3.1/nanohttpd-2.3.1.jar"; } + rec { sha1 = "946f8aa9daa917dd81a8b818111bec7e288f821a"; name = "ANTLR4_${sha1}/antlr4.jar"; url = "mirror://maven/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1.jar"; } + rec { sha1 = "c3aeac59c022bdc497c8c48ed86fa50450e4896a"; name = "JLINE_${sha1}/jline.jar"; url = "mirror://maven/jline/jline/2.14.6/jline-2.14.6.jar"; } + rec { sha1 = "d0bdc21c5e6404726b102998e44c66a738897905"; name = "JAVA_ALLOCATION_INSTRUMENTER_${sha1}/java-allocation-instrumenter.jar"; url = "mirror://maven/com/google/code/java-allocation-instrumenter/java-allocation-instrumenter/3.1.0/java-allocation-instrumenter-3.1.0.jar"; } + rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}/asm5.jar"; url = "mirror://maven/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar"; } + rec { sha1 = "396ce0c07ba2b481f25a70195c7c94922f0d1b0b"; name = "ASM_TREE5_${sha1}/asm-tree5.jar"; url = "mirror://maven/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar"; } + rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_SOURCES_${sha1}/libffi-sources.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz"; } + rec { sha1 = "8819cea8bfe22c9c63f55465e296b3855ea41786"; name = "TruffleJSON_${sha1}/trufflejson.jar"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/trufflejson-20180130.jar"; } + rec { sha1 = "9712a8124c40298015f04a74f61b3d81a51513af"; name = "CHECKSTYLE_8.8_${sha1}/checkstyle-8.8.jar"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/checkstyle-8.8-all.jar"; } + rec { sha1 = "8dc5a90bed5f51d7538d05b8c31c31b7dfddbd66"; name = "VISUALVM_COMMON_${sha1}/visualvm-common.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20.tar.gz"; } + rec { sha1 = "e6e60889b7211a80b21052a249bd7e0f88f79fee"; name = "Java-WebSocket_${sha1}/java-websocket.jar"; url = "mirror://maven/org/java-websocket/Java-WebSocket/1.3.9/Java-WebSocket-1.3.9.jar"; } + rec { sha1 = "7a4d00d5ec5febd252a6182e8b6e87a0a9821f81"; name = "ICU4J_${sha1}/icu4j.jar"; url = "mirror://maven/com/ibm/icu/icu4j/62.1/icu4j-62.1.jar"; } # This duplication of asm with underscore and minus is totally weird - rec { sha1 = "c01b6798f81b0fc2c5faa70cbe468c275d4b50c7"; name = "ASM-6.2.1_${sha1}/asm-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1.jar; } - rec { sha1 = "cee28077ac7a63d3de0b205ec314d83944ff6267"; name = "ASM-6.2.1_${sha1}/asm-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1-sources.jar; } - rec { sha1 = "332b022092ecec53cdb6272dc436884b2d940615"; name = "ASM_TREE-6.2.1_${sha1}/asm-tree-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1.jar; } - rec { sha1 = "072bd64989090e4ed58e4657e3d4481d96f643af"; name = "ASM_TREE-6.2.1_${sha1}/asm-tree-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1-sources.jar; } - rec { sha1 = "e8b876c5ccf226cae2f44ed2c436ad3407d0ec1d"; name = "ASM_ANALYSIS-6.2.1_${sha1}/asm-analysis-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1.jar; } - rec { sha1 = "b0b249bd185677648692e7c57b488b6d7c2a6653"; name = "ASM_ANALYSIS-6.2.1_${sha1}/asm-analysis-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1-sources.jar; } - rec { sha1 = "eaf31376d741a3e2017248a4c759209fe25c77d3"; name = "ASM_COMMONS-6.2.1_${sha1}/asm-commons-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1.jar; } - rec { sha1 = "667fa0f9d370e7848b0e3d173942855a91fd1daf"; name = "ASM_COMMONS-6.2.1_${sha1}/asm-commons-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1-sources.jar; } + rec { sha1 = "c01b6798f81b0fc2c5faa70cbe468c275d4b50c7"; name = "ASM-6.2.1_${sha1}/asm-6.2.1.jar"; url = "mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1.jar"; } + rec { sha1 = "cee28077ac7a63d3de0b205ec314d83944ff6267"; name = "ASM-6.2.1_${sha1}/asm-6.2.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1-sources.jar"; } + rec { sha1 = "332b022092ecec53cdb6272dc436884b2d940615"; name = "ASM_TREE-6.2.1_${sha1}/asm-tree-6.2.1.jar"; url = "mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1.jar"; } + rec { sha1 = "072bd64989090e4ed58e4657e3d4481d96f643af"; name = "ASM_TREE-6.2.1_${sha1}/asm-tree-6.2.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1-sources.jar"; } + rec { sha1 = "e8b876c5ccf226cae2f44ed2c436ad3407d0ec1d"; name = "ASM_ANALYSIS-6.2.1_${sha1}/asm-analysis-6.2.1.jar"; url = "mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1.jar"; } + rec { sha1 = "b0b249bd185677648692e7c57b488b6d7c2a6653"; name = "ASM_ANALYSIS-6.2.1_${sha1}/asm-analysis-6.2.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1-sources.jar"; } + rec { sha1 = "eaf31376d741a3e2017248a4c759209fe25c77d3"; name = "ASM_COMMONS-6.2.1_${sha1}/asm-commons-6.2.1.jar"; url = "mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1.jar"; } + rec { sha1 = "667fa0f9d370e7848b0e3d173942855a91fd1daf"; name = "ASM_COMMONS-6.2.1_${sha1}/asm-commons-6.2.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1-sources.jar"; } # From here on the deps are new - rec { sha1 = "400d664d7c92a659d988c00cb65150d1b30cf339"; name = "ASM_UTIL-6.2.1_${sha1}/asm-util-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-util/6.2.1/asm-util-6.2.1.jar; } - rec { sha1 = "c9f7246bf93bb0dc7fe9e7c9eca531a8fb98d252"; name = "ASM_UTIL-6.2.1_${sha1}/asm-util-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-util/6.2.1/asm-util-6.2.1-sources.jar; } - rec { sha1 = "4b52bd03014f6d080ef0528865c1ee50621e35c6"; name = "NETBEANS_PROFILER_${sha1}/netbeans-profiler.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/org-netbeans-lib-profiler-8.2-201609300101.jar; } - rec { sha1 = "b5840706cc8ce639fcafeab1bc61da2d8aa37afd"; name = "NASHORN_INTERNAL_TESTS_${sha1}/nashorn-internal-tests.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/nashorn-internal-tests-700f5e3f5ff2.jar; } - rec { sha1 = "9577018f9ce3636a2e1cb0a0c7fe915e5098ded5"; name = "JACKSON_ANNOTATIONS_${sha1}/jackson-annotations.jar"; url = mirror://maven/com/fasterxml/jackson/core/jackson-annotations/2.8.6/jackson-annotations-2.8.6.jar; } - rec { sha1 = "2ef7b1cc34de149600f5e75bc2d5bf40de894e60"; name = "JACKSON_CORE_${sha1}/jackson-core.jar"; url = mirror://maven/com/fasterxml/jackson/core/jackson-core/2.8.6/jackson-core-2.8.6.jar; } - rec { sha1 = "c43de61f74ecc61322ef8f402837ba65b0aa2bf4"; name = "JACKSON_DATABIND_${sha1}/jackson-databind.jar"; url = mirror://maven/com/fasterxml/jackson/core/jackson-databind/2.8.6/jackson-databind-2.8.6.jar; } - rec { sha1 = "2838952e91baa37ac73ed817451268a193ba440a"; name = "JCODINGS_${sha1}/jcodings.jar"; url = mirror://maven/org/jruby/jcodings/jcodings/1.0.40/jcodings-1.0.40.jar; } - rec { sha1 = "0ed89e096c83d540acac00d6ee3ea935b4c905ff"; name = "JCODINGS_${sha1}/jcodings.sources.jar"; url = mirror://maven/org/jruby/jcodings/jcodings/1.0.40/jcodings-1.0.40-sources.jar; } - rec { sha1 = "5dbb09787a9b8780737b71fbf942235ef59051b9"; name = "JONI_${sha1}/joni.jar"; url = mirror://maven/org/jruby/joni/joni/2.1.25/joni-2.1.25.jar; } - rec { sha1 = "505a09064f6e2209616f38724f6d97d8d889aa92"; name = "JONI_${sha1}/joni.sources.jar"; url = mirror://maven/org/jruby/joni/joni/2.1.25/joni-2.1.25-sources.jar; } - rec { sha1 = "c4f7d054303948eb6a4066194253886c8af07128"; name = "XZ-1.8_${sha1}/xz-1.8.jar"; url = mirror://maven/org/tukaani/xz/1.8/xz-1.8.jar; } - rec { sha1 = "9314d3d372b05546a33791fbc8dd579c92ebd16b"; name = "GNUR_${sha1}/gnur.tar.gz"; url = http://cran.rstudio.com/src/base/R-3/R-3.5.1.tar.gz; } - rec { sha1 = "90aa8308da72ae610207d8f6ca27736921be692a"; name = "ANTLR4_COMPLETE_${sha1}/antlr4-complete.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/antlr-4.7.1-complete.jar; }] ++ + rec { sha1 = "400d664d7c92a659d988c00cb65150d1b30cf339"; name = "ASM_UTIL-6.2.1_${sha1}/asm-util-6.2.1.jar"; url = "mirror://maven/org/ow2/asm/asm-util/6.2.1/asm-util-6.2.1.jar"; } + rec { sha1 = "c9f7246bf93bb0dc7fe9e7c9eca531a8fb98d252"; name = "ASM_UTIL-6.2.1_${sha1}/asm-util-6.2.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-util/6.2.1/asm-util-6.2.1-sources.jar"; } + rec { sha1 = "4b52bd03014f6d080ef0528865c1ee50621e35c6"; name = "NETBEANS_PROFILER_${sha1}/netbeans-profiler.jar"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/org-netbeans-lib-profiler-8.2-201609300101.jar"; } + rec { sha1 = "b5840706cc8ce639fcafeab1bc61da2d8aa37afd"; name = "NASHORN_INTERNAL_TESTS_${sha1}/nashorn-internal-tests.jar"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/nashorn-internal-tests-700f5e3f5ff2.jar"; } + rec { sha1 = "9577018f9ce3636a2e1cb0a0c7fe915e5098ded5"; name = "JACKSON_ANNOTATIONS_${sha1}/jackson-annotations.jar"; url = "mirror://maven/com/fasterxml/jackson/core/jackson-annotations/2.8.6/jackson-annotations-2.8.6.jar"; } + rec { sha1 = "2ef7b1cc34de149600f5e75bc2d5bf40de894e60"; name = "JACKSON_CORE_${sha1}/jackson-core.jar"; url = "mirror://maven/com/fasterxml/jackson/core/jackson-core/2.8.6/jackson-core-2.8.6.jar"; } + rec { sha1 = "c43de61f74ecc61322ef8f402837ba65b0aa2bf4"; name = "JACKSON_DATABIND_${sha1}/jackson-databind.jar"; url = "mirror://maven/com/fasterxml/jackson/core/jackson-databind/2.8.6/jackson-databind-2.8.6.jar"; } + rec { sha1 = "2838952e91baa37ac73ed817451268a193ba440a"; name = "JCODINGS_${sha1}/jcodings.jar"; url = "mirror://maven/org/jruby/jcodings/jcodings/1.0.40/jcodings-1.0.40.jar"; } + rec { sha1 = "0ed89e096c83d540acac00d6ee3ea935b4c905ff"; name = "JCODINGS_${sha1}/jcodings.sources.jar"; url = "mirror://maven/org/jruby/jcodings/jcodings/1.0.40/jcodings-1.0.40-sources.jar"; } + rec { sha1 = "5dbb09787a9b8780737b71fbf942235ef59051b9"; name = "JONI_${sha1}/joni.jar"; url = "mirror://maven/org/jruby/joni/joni/2.1.25/joni-2.1.25.jar"; } + rec { sha1 = "505a09064f6e2209616f38724f6d97d8d889aa92"; name = "JONI_${sha1}/joni.sources.jar"; url = "mirror://maven/org/jruby/joni/joni/2.1.25/joni-2.1.25-sources.jar"; } + rec { sha1 = "c4f7d054303948eb6a4066194253886c8af07128"; name = "XZ-1.8_${sha1}/xz-1.8.jar"; url = "mirror://maven/org/tukaani/xz/1.8/xz-1.8.jar"; } + rec { sha1 = "9314d3d372b05546a33791fbc8dd579c92ebd16b"; name = "GNUR_${sha1}/gnur.tar.gz"; url = "http://cran.rstudio.com/src/base/R-3/R-3.5.1.tar.gz"; } + rec { sha1 = "90aa8308da72ae610207d8f6ca27736921be692a"; name = "ANTLR4_COMPLETE_${sha1}/antlr4-complete.jar"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/antlr-4.7.1-complete.jar"; }] ++ lib.optionals stdenv.isLinux [ - rec { sha1 = "df4c1f784294d02a82d78664064248283bfcc297"; name = "LLVM_ORG_${sha1}/llvm-org.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/llvm-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz; } - rec { sha1 = "344483aefa15147c121a8fb6fb35a2406768cc5c"; name = "LLVM_PLATFORM_SPECIFIC_${sha1}/llvm-platform-specific.jar"; url = mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-linux-x86_64.jar; } - rec { sha1 = "fd1a723d62cbbc591041d303e8b151d89f131643"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20-linux-amd64.tar.gz; } + rec { sha1 = "df4c1f784294d02a82d78664064248283bfcc297"; name = "LLVM_ORG_${sha1}/llvm-org.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/llvm-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz"; } + rec { sha1 = "344483aefa15147c121a8fb6fb35a2406768cc5c"; name = "LLVM_PLATFORM_SPECIFIC_${sha1}/llvm-platform-specific.jar"; url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-linux-x86_64.jar"; } + rec { sha1 = "fd1a723d62cbbc591041d303e8b151d89f131643"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20-linux-amd64.tar.gz"; } rec { sha1 = "987234c4ce45505c21302e097c24efef4873325c"; name = "NINJA_${sha1}/ninja.zip"; url = "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip"; isNinja = true; }] ++ lib.optionals stdenv.isDarwin [ - rec { sha1 = "0fa1af180755fa4cc018ee9be33f2d7d827593c4"; name = "LLVM_ORG_${sha1}/llvm-org.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/llvm-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-darwin-amd64.tar.gz; } - rec { sha1 = "57bc74574104a9e0a2dc4d7a71ffcc5731909e57"; name = "LLVM_PLATFORM_SPECIFIC_${sha1}/llvm-platform-specific.jar"; url = mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-macosx-x86_64.jar; } - rec { sha1 = "ae23bb365930f720acc88c62640bae6852a37d67"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20-macosx-x86_64.tar.gz; } + rec { sha1 = "0fa1af180755fa4cc018ee9be33f2d7d827593c4"; name = "LLVM_ORG_${sha1}/llvm-org.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/llvm-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-darwin-amd64.tar.gz"; } + rec { sha1 = "57bc74574104a9e0a2dc4d7a71ffcc5731909e57"; name = "LLVM_PLATFORM_SPECIFIC_${sha1}/llvm-platform-specific.jar"; url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-macosx-x86_64.jar"; } + rec { sha1 = "ae23bb365930f720acc88c62640bae6852a37d67"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20-macosx-x86_64.tar.gz"; } rec { sha1 = "8142c497f7dfbdb052a1e31960fdfe2c6f9a5ca2"; name = "NINJA_${sha1}/ninja.zip"; url = "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip"; isNinja = true; }]; @@ -225,7 +225,7 @@ let findbugs = fetchzip { name = "findbugs-3.0.0"; - url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/findbugs-3.0.0.zip; + url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/findbugs-3.0.0.zip"; sha256 = "0sf5f9h1s6fmhfigjy81i109j1ani5kzdr4njlpq0mnkkh9fpr7m"; }; @@ -271,7 +271,7 @@ in rec { --set FINDBUGS_HOME ${findbugs} ''; meta = with stdenv.lib; { - homepage = https://github.com/graalvm/mx; + homepage = "https://github.com/graalvm/mx"; description = "Command-line tool used for the development of Graal projects"; license = licenses.gpl2; platforms = python27.meta.platforms; @@ -528,7 +528,7 @@ in rec { passthru.home = graalvm8; meta = with stdenv.lib; { - homepage = https://github.com/oracle/graal; + homepage = "https://github.com/oracle/graal"; description = "High-Performance Polyglot VM"; license = licenses.gpl2; maintainers = with maintainers; [ volth hlolli ]; diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix index f8271baa5883d..5a6c965076492 100644 --- a/pkgs/development/compilers/graalvm/enterprise-edition.nix +++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix @@ -160,7 +160,7 @@ let passthru.home = graalvmXXX-ee; meta = with stdenv.lib; { - homepage = https://www.graalvm.org/; + homepage = "https://www.graalvm.org/"; description = "High-Performance Polyglot VM"; license = licenses.unfree; maintainers = with maintainers; [ volth hlolli ]; diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix index f15e1060203b1..14bf940fadf18 100644 --- a/pkgs/development/compilers/gwt/2.4.0.nix +++ b/pkgs/development/compilers/gwt/2.4.0.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.gwtproject.org/; + homepage = "http://www.gwtproject.org/"; description = "A development toolkit for building and optimizing complex browser-based applications"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 44c079af9263a..356ebe2317298 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -1,7 +1,10 @@ { llvmPackages, lib, fetchFromGitHub, cmake -, libpng, libjpeg, mesa, eigen, openblas +, libpng, libjpeg, mesa, eigen +, openblas, blas, lapack }: +assert blas.implementation == "openblas" && lapack.implementation == "openblas"; + let version = "2019_08_27"; diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 5329cf59aa373..a3110c0c1af16 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -11,7 +11,7 @@ let buildInputs = [ocaml zlib pcre neko camlp4]; src = fetchgit { - url = https://github.com/HaxeFoundation/haxe.git; + url = "https://github.com/HaxeFoundation/haxe.git"; inherit sha256; fetchSubmodules = true; rev = "refs/tags/${version}"; @@ -76,7 +76,7 @@ let meta = with stdenv.lib; { description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++"; - homepage = https://haxe.org; + homepage = "https://haxe.org"; license = with licenses; [ gpl2 bsd2 /*?*/ ]; # -> docs/license.txt maintainers = [ maintainers.marcweber ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/compilers/hop/default.nix b/pkgs/development/compilers/hop/default.nix index 3db916e6003cb..f63f4169bc361 100644 --- a/pkgs/development/compilers/hop/default.nix +++ b/pkgs/development/compilers/hop/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A multi-tier programming language for the Web 2.0 and the so-called diffuse Web"; - homepage = http://hop.inria.fr/; + homepage = "http://hop.inria.fr/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index 1e7a46e780722..d68fba1d624c0 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Intel ACPI Compiler"; - homepage = http://www.acpica.org/; + homepage = "http://www.acpica.org/"; license = stdenv.lib.licenses.iasl; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix index 2a6551aad1876..62bd0142f3232 100644 --- a/pkgs/development/compilers/inform7/default.nix +++ b/pkgs/development/compilers/inform7/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A design system for interactive fiction."; - homepage = http://inform7.com/; + homepage = "http://inform7.com/"; license = licenses.artistic2; maintainers = with maintainers; [ mbbx6spp ]; platforms = platforms.unix; diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 92b312ba19e55..e3dfa8ea324c0 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/intel/intel-graphics-compiler; + homepage = "https://github.com/intel/intel-graphics-compiler"; description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/compilers/intercal/default.nix b/pkgs/development/compilers/intercal/default.nix index d890dc0fdfad4..8b91e3f2c6d80 100644 --- a/pkgs/development/compilers/intercal/default.nix +++ b/pkgs/development/compilers/intercal/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { languages. The language largely succeeds in this goal, apart from its use of an assignment statement. ''; - homepage = http://www.catb.org/~esr/intercal/; + homepage = "http://www.catb.org/~esr/intercal/"; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index c6431363ae635..01e1eaca6e1d9 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,42 +1,44 @@ -{stdenv, fetchFromGitHub, cmake, which, m4, python, bison, flex, llvmPackages, -testedTargets ? ["sse2"] # the default test target is sse4, but that is not supported by all Hydra agents +{ stdenv, fetchFromGitHub +, cmake, which, m4, python3, bison, flex, llvmPackages + + # the default test target is sse4, but that is not supported by all Hydra agents +, testedTargets ? [ "sse2" ] }: stdenv.mkDerivation rec { - version = "1.10.0"; - rev = "v${version}"; - - inherit testedTargets; - - pname = "ispc"; + pname = "ispc"; + version = "1.13.0"; src = fetchFromGitHub { - owner = "ispc"; - repo = "ispc"; - inherit rev; - sha256 = "1x07n2gaff3v32yvddrb659mx5gg12bnbsqbyfimp396wn04w60b"; + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1l74xkpwwxc38k2ngg7mpvswziiy91yxslgfad6688hh1n5jvayd"; }; - doCheck = stdenv.isLinux; - - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake which m4 bison flex python3 ]; buildInputs = with llvmPackages; [ - which - m4 - python - bison - flex - llvm - llvmPackages.clang-unwrapped # we need to link against libclang, so we need the unwrapped + # we need to link against libclang, so we need the unwrapped + llvm llvmPackages.clang-unwrapped ]; - postPatch = "sed -i -e 's/curses/ncurses/g' CMakeLists.txt"; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace curses ncurses + substituteInPlace cmake/GenerateBuiltins.cmake \ + --replace 'bit 32 64' 'bit 64' + ''; + + inherit testedTargets; - # TODO: this correctly catches errors early, but also some things that are just weird and don't seem to be real - # errors - #configurePhase = '' - # makeFlagsArray=( SHELL="${bash}/bin/bash -o pipefail" ) - #''; + # needs 'transcendentals' executable, which is only on linux + doCheck = stdenv.isLinux; + + # the compiler enforces -Werror, and -fno-strict-overflow makes it mad. + # hilariously this is something of a double negative: 'disable' the + # 'strictoverflow' hardening protection actually means we *allow* the compiler + # to do strict overflow optimization. somewhat misleading... + hardeningDisable = [ "strictoverflow" ]; checkPhase = '' export ISPC_HOME=$PWD/bin @@ -55,13 +57,14 @@ stdenv.mkDerivation rec { "-DCLANG_EXECUTABLE=${llvmPackages.clang}/bin/clang" "-DISPC_INCLUDE_EXAMPLES=OFF" "-DISPC_INCLUDE_UTILS=OFF" - ]; + "-DARM_ENABLED=FALSE" + ]; meta = with stdenv.lib; { - homepage = https://ispc.github.io/ ; + homepage = "https://ispc.github.io/"; description = "Intel 'Single Program, Multiple Data' Compiler, a vectorised language"; - license = licenses.bsd3; - platforms = ["x86_64-linux" "x86_64-darwin"]; # TODO: buildable on more platforms? - maintainers = [ maintainers.aristid ]; + license = licenses.bsd3; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; # TODO: buildable on more platforms? + maintainers = with maintainers; [ aristid thoughtpolice ]; }; } diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/pkgs/development/compilers/javacard-devkit/default.nix index f49d3d6e21097..5b691530d34bf 100644 --- a/pkgs/development/compilers/javacard-devkit/default.nix +++ b/pkgs/development/compilers/javacard-devkit/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { converter -applet [AppletAID] [MyApplet] [myPackage] [PackageAID] [Version] For more details, please refer to the documentation by Oracle ''; - homepage = https://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html; + homepage = "https://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html"; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.ekleog ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index bc850a53c51e4..510fca1838ec1 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jsonnet"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "google"; repo = "jsonnet"; - sha256 = "06imnpbc5mn1dis051f54q6nq80dbm51nhxmba61rdyhf1131ml8"; + sha256 = "0wxhc0ghjk88zrrn9a18h979ipkia2rx12489515gzhlplfx6724"; }; enableParallelBuilding = true; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Purely-functional configuration language that helps you define JSON data"; maintainers = with lib.maintainers; [ benley copumpkin ]; license = lib.licenses.asl20; - homepage = https://github.com/google/jsonnet; + homepage = "https://github.com/google/jsonnet"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix index 5b1300ba240ba..b67a78b4a5abe 100644 --- a/pkgs/development/compilers/julia/1.3.nix +++ b/pkgs/development/compilers/julia/1.3.nix @@ -7,28 +7,22 @@ # standard library dependencies , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 # linear algebra -, openblas, arpack +, blas, lapack, arpack # Darwin frameworks , CoreServices, ApplicationServices }: +assert (!blas.isILP64) && (!lapack.isILP64); + with stdenv.lib; -# All dependencies must use the same OpenBLAS. -let - arpack_ = arpack; -in let - arpack = arpack_.override { inherit openblas; }; -in - -let majorVersion = "1"; minorVersion = "3"; maintenanceVersion = "1"; src_sha256 = "0q9a7yc3b235psrwl5ghyxgwly25lf8n818l8h6bkf2ymdbsv5p6"; version = "${majorVersion}.${minorVersion}.${maintenanceVersion}"; -in +in stdenv.mkDerivation rec { pname = "julia"; @@ -67,7 +61,7 @@ stdenv.mkDerivation rec { buildInputs = [ arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr - pcre2.dev openblas openlibm openspecfun readline utf8proc + pcre2.dev blas lapack openlibm openspecfun readline utf8proc zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] @@ -94,13 +88,9 @@ stdenv.mkDerivation rec { "SHELL=${stdenv.shell}" "USE_SYSTEM_BLAS=1" - "USE_BLAS64=${if openblas.blas64 then "1" else "0"}" - "LIBBLAS=-lopenblas" - "LIBBLASNAME=libopenblas" + "USE_BLAS64=${if blas.isILP64 then "1" else "0"}" "USE_SYSTEM_LAPACK=1" - "LIBLAPACK=-lopenblas" - "LIBLAPACKNAME=libopenblas" "USE_SYSTEM_ARPACK=1" "USE_SYSTEM_FFTW=1" @@ -123,7 +113,7 @@ stdenv.mkDerivation rec { ]; LD_LIBRARY_PATH = makeLibraryPath [ - arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm + arpack fftw fftwSinglePrec gmp libgit2 mpfr blas openlibm openspecfun pcre2 ]; @@ -161,7 +151,7 @@ stdenv.mkDerivation rec { meta = { description = "High-level performance-oriented dynamical language for technical computing"; - homepage = https://julialang.org/; + homepage = "https://julialang.org/"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix index c706f2facec79..29ac41150506a 100644 --- a/pkgs/development/compilers/julia/shared.nix +++ b/pkgs/development/compilers/julia/shared.nix @@ -15,20 +15,14 @@ # standard library dependencies , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 # linear algebra -, openblas, arpack +, blas, lapack, arpack # Darwin frameworks , CoreServices, ApplicationServices }: with stdenv.lib; -# All dependencies must use the same OpenBLAS. -let - arpack_ = arpack; -in -let - arpack = arpack_.override { inherit openblas; }; -in +assert (!blas.isILP64) && (!lapack.isILP64); let dsfmtVersion = "2.2.3"; @@ -118,7 +112,7 @@ stdenv.mkDerivation rec { buildInputs = [ arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr - pcre2.dev openblas openlibm openspecfun readline utf8proc + pcre2.dev blas lapack openlibm openspecfun readline utf8proc zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] @@ -143,13 +137,9 @@ stdenv.mkDerivation rec { "SHELL=${stdenv.shell}" "USE_SYSTEM_BLAS=1" - "USE_BLAS64=${if openblas.blas64 then "1" else "0"}" - "LIBBLAS=-lopenblas" - "LIBBLASNAME=libopenblas" + "USE_BLAS64=${if blas.isILP64 then "1" else "0"}" "USE_SYSTEM_LAPACK=1" - "LIBLAPACK=-lopenblas" - "LIBLAPACKNAME=libopenblas" "USE_SYSTEM_ARPACK=1" "USE_SYSTEM_FFTW=1" @@ -173,7 +163,7 @@ stdenv.mkDerivation rec { ]; LD_LIBRARY_PATH = makeLibraryPath [ - arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm + arpack fftw fftwSinglePrec gmp libgit2 mpfr blas lapack openlibm openspecfun pcre2 ]; @@ -211,7 +201,7 @@ stdenv.mkDerivation rec { meta = { description = "High-level performance-oriented dynamical language for technical computing"; - homepage = https://julialang.org/; + homepage = "https://julialang.org/"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index d4f37d4f5cce3..4e2810fa893c6 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.3.71"; + version = "1.3.72"; in stdenv.mkDerivation { inherit version; pname = "kotlin"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0jp7z2lys02d0wmycdlfg9c08ji4qvjaz2wzvrxjyvcwv7d7gnvs"; + sha256 = "0v6c4vjiflwbjjc1lmiyzrilxwbqcz5ll6ls40zhw70zk23xpl6c"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/ldc/binary.nix b/pkgs/development/compilers/ldc/binary.nix new file mode 100644 index 0000000000000..56d40be86194b --- /dev/null +++ b/pkgs/development/compilers/ldc/binary.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2 +, version, hashes }: +with stdenv; +let + OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; + ARCH = toString hostPlatform.parsed.cpu.name; +in mkDerivation { + pname = "ldc-bootstrap"; + inherit version; + + src = fetchurl rec { + name = "ldc2-${version}-${OS}-${ARCH}.tar.xz"; + url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/${name}"; + sha256 = hashes."${OS}-${ARCH}" or (throw "missing bootstrap sha256 for ${OS}-${ARCH}"); + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ fixDarwinDylibNames autoPatchelfHook ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxml2 stdenv.cc.cc ]; + + propagatedBuildInputs = [ curl tzdata ]; + + installPhase = '' + mkdir -p $out + + mv bin etc import lib LICENSE README $out/ + ''; + + meta = with lib; { + inherit version; + description = "The LLVM-based D Compiler"; + homepage = "https://github.com/ldc-developers/ldc"; + # from https://github.com/ldc-developers/ldc/blob/master/LICENSE + license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; + maintainers = with maintainers; [ ThomasMader lionello ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; + }; +} diff --git a/pkgs/development/compilers/ldc/bootstrap.nix b/pkgs/development/compilers/ldc/bootstrap.nix new file mode 100644 index 0000000000000..fde4c84268489 --- /dev/null +++ b/pkgs/development/compilers/ldc/bootstrap.nix @@ -0,0 +1,10 @@ +{ callPackage }: +callPackage ./binary.nix { + version = "1.19.0"; + hashes = { + # Get these from `nix-prefetch-url https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc.. + osx-x86_64 = "1bp3xkh9zp64dzq8isanib1gacb3nfbl70qv15qygwk1zan6zgy7"; + linux-x86_64 = "146grr2lwarfk13wgkpyb77xb6b3as1is2rf4s2hipqjmc8biy1h"; + linux-aarch64 = "1fv6jshfvi15m7masgxq1hgp216qjd5amizrqdf26vhrq3a08li3"; + }; +} diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 7ed716bf866fe..5a4baabcf8d87 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -1,173 +1,5 @@ -{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata -, libconfig, lit, gdb, unzip, darwin, bash -, callPackage, makeWrapper, runCommand, targetPackages -, bootstrapVersion ? false -, version ? "1.17.0" -, ldcSha256 ? "1aag5jfrng6p4ms0fs90hjbv9bcj3hj8h52r68c3cm6racdajbva" -}: - -let - bootstrapLdc = if !bootstrapVersion then - # LDC 0.17.x is the last version which doesn't need a working D compiler to - # build so we use that version to bootstrap the actual build. - callPackage ./default.nix { - bootstrapVersion = true; - version = "0.17.6"; - ldcSha256 = "0qf5kbxddgmg3kqzi0kf4bgv8vdrnv16y07hcpm0cwv9mc3qr2w6"; - } - else - ""; - - pathConfig = runCommand "ldc-lib-paths" {} '' - mkdir $out - echo ${tzdata}/share/zoneinfo/ > $out/TZDatabaseDirFile - echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > $out/LibcurlPathFile - ''; -in - -stdenv.mkDerivation rec { - pname = "ldc"; - inherit version; - - enableParallelBuilding = true; - - src = fetchurl { - url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; - sha256 = ldcSha256; - }; - - # https://issues.dlang.org/show_bug.cgi?id=19553 - hardeningDisable = [ "fortify" ]; - - postUnpack = '' - patchShebangs . - '' - - + stdenv.lib.optionalString (!bootstrapVersion) '' - rm ldc-${version}-src/tests/d2/dmd-testsuite/fail_compilation/mixin_gc.d - rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/xtest46_gc.d - rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/testptrref_gc.d - - # test depends on current year - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ddocYear.d - '' - - + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - # https://github.com/NixOS/nixpkgs/issues/34817 - rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall - ''; - - postPatch = '' - # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow - substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" - '' - - + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isLinux) '' - substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" - '' - - + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" - '' - - + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - # Was not able to compile on darwin due to "__inline_isnanl" - # being undefined. - # TODO Remove with version > 0.17.6 - substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan - ''; - - nativeBuildInputs = [ cmake ninja makeWrapper unzip ] - ++ stdenv.lib.optionals (!bootstrapVersion) [ - bootstrapLdc lit lit.python - ] - ++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) - # https://github.com/NixOS/nixpkgs/issues/57120 - # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 - llvm_5 - ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) - llvm_8 - ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) - # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 - gdb - ++ stdenv.lib.optionals (bootstrapVersion) [ - libconfig llvm_5 - ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin - darwin.apple_sdk.frameworks.Foundation; - - - buildInputs = [ curl tzdata ]; - - cmakeFlags = stdenv.lib.optionals (!bootstrapVersion) [ - "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J${pathConfig}" - "-DCMAKE_BUILD_TYPE=Release" - ]; - - postConfigure = '' - export DMD=$PWD/bin/ldmd2 - ''; - - makeFlags = [ "DMD=$DMD" ]; - - fixNames = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - fixDarwinDylibNames() { - local flags=() - - for fn in "$@"; do - flags+=(-change "$(basename "$fn")" "$fn") - done - - for fn in "$@"; do - if [ -L "$fn" ]; then continue; fi - echo "$fn: fixing dylib" - install_name_tool -id "$fn" "''${flags[@]}" "$fn" - done - } - - fixDarwinDylibNames $(find "$(pwd)/lib" -name "*.dylib") - export DYLD_LIBRARY_PATH=$(pwd)/lib - ''; - - # https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746 - additionalExceptions = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin - "|druntime-test-shared"; - - doCheck = !bootstrapVersion; - - checkPhase = stdenv.lib.optionalString doCheck '' - # Build default lib test runners - ninja -j$NIX_BUILD_CORES all-test-runners - - ${fixNames} - - # Run dmd testsuite - export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD CC=$CXX" - ctest -V -R "dmd-testsuite" - - # Build and run LDC D unittests. - ctest --output-on-failure -R "ldc2-unittest" - - # Run LIT testsuite. - ctest -V -R "lit-tests" - - # Run default lib unittests - ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}" - ''; - - postInstall = '' - wrapProgram $out/bin/ldc2 \ - --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ - --set-default CC "${targetPackages.stdenv.cc}/bin/cc" - ''; - - meta = with stdenv.lib; { - description = "The LLVM-based D compiler"; - homepage = https://github.com/ldc-developers/ldc; - # from https://github.com/ldc-developers/ldc/blob/master/LICENSE - license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; - maintainers = with maintainers; [ ThomasMader ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - }; +import ./generic.nix { + version = "1.20.1"; + ldcSha256 = "1bqsgab22v02pc3c9gcyf15y7aimadv24d68icaw5lpgnvzxy89b"; } diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/development/compilers/ldc/generic.nix new file mode 100644 index 0000000000000..c93d423945cbd --- /dev/null +++ b/pkgs/development/compilers/ldc/generic.nix @@ -0,0 +1,143 @@ +{ version, ldcSha256 }: +{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata +, libconfig, lit, gdb, unzip, darwin, bash +, callPackage, makeWrapper, runCommand, targetPackages +, ldcBootstrap ? callPackage ./bootstrap.nix { } +}: + +let + pathConfig = runCommand "ldc-lib-paths" {} '' + mkdir $out + echo ${tzdata}/share/zoneinfo/ > $out/TZDatabaseDirFile + echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > $out/LibcurlPathFile + ''; + +in + +stdenv.mkDerivation rec { + pname = "ldc"; + inherit version; + + enableParallelBuilding = true; + + src = fetchurl { + url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; + sha256 = ldcSha256; + }; + + # https://issues.dlang.org/show_bug.cgi?id=19553 + hardeningDisable = [ "fortify" ]; + + postUnpack = '' + patchShebangs . + '' + + '' + rm ldc-${version}-src/tests/d2/dmd-testsuite/fail_compilation/mixin_gc.d + rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/xtest46_gc.d + rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/testptrref_gc.d + + # test depends on current year + rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ddocYear.d + '' + + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + # https://github.com/NixOS/nixpkgs/issues/34817 + rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall + ''; + + postPatch = '' + # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow + substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" + '' + + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" + '' + + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" + ''; + + nativeBuildInputs = [ + cmake ninja makeWrapper unzip ldcBootstrap lit lit.python + ] + ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + # https://github.com/NixOS/nixpkgs/issues/57120 + # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 + llvm_5 + ] + ++ stdenv.lib.optionals (!stdenv.hostPlatform.isDarwin) [ + llvm_8 + # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 + gdb + ]; + + buildInputs = [ curl tzdata ]; + + cmakeFlags = [ + "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J${pathConfig}" + "-DCMAKE_BUILD_TYPE=Release" + ]; + + postConfigure = '' + export DMD=$PWD/bin/ldmd2 + ''; + + makeFlags = [ "DMD=$DMD" ]; + + fixNames = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + fixDarwinDylibNames() { + local flags=() + + for fn in "$@"; do + flags+=(-change "$(basename "$fn")" "$fn") + done + + for fn in "$@"; do + if [ -L "$fn" ]; then continue; fi + echo "$fn: fixing dylib" + install_name_tool -id "$fn" "''${flags[@]}" "$fn" + done + } + + fixDarwinDylibNames $(find "$(pwd)/lib" -name "*.dylib") + export DYLD_LIBRARY_PATH=$(pwd)/lib + ''; + + # https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746 + additionalExceptions = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin + "|druntime-test-shared"; + + checkPhase = '' + # Build default lib test runners + ninja -j$NIX_BUILD_CORES all-test-runners + + ${fixNames} + + # Run dmd testsuite + export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD" + ctest -V -R "dmd-testsuite" + + # Build and run LDC D unittests. + ctest --output-on-failure -R "ldc2-unittest" + + # Run LIT testsuite. + ctest -V -R "lit-tests" + + # Run default lib unittests + ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}" + ''; + + postInstall = '' + wrapProgram $out/bin/ldc2 \ + --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ + --set-default CC "${targetPackages.stdenv.cc}/bin/cc" + ''; + + meta = with stdenv.lib; { + description = "The LLVM-based D compiler"; + homepage = "https://github.com/ldc-developers/ldc"; + # from https://github.com/ldc-developers/ldc/blob/master/LICENSE + license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; + maintainers = with maintainers; [ ThomasMader lionello ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix index 61008b5c12a1f..10026ca4eb19a 100644 --- a/pkgs/development/compilers/llvm/10/clang/default.nix +++ b/pkgs/development/compilers/llvm/10/clang/default.nix @@ -95,7 +95,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = "https://llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/10/compiler-rt-armv7l.patch b/pkgs/development/compilers/llvm/10/compiler-rt-armv7l.patch new file mode 100644 index 0000000000000..120cfe6feb2a6 --- /dev/null +++ b/pkgs/development/compilers/llvm/10/compiler-rt-armv7l.patch @@ -0,0 +1,32 @@ +diff -ur compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake +--- compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake 2020-03-24 00:01:02.000000000 +0900 ++++ compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:42:00.883450706 +0900 +@@ -24,7 +24,7 @@ + + + set(ARM64 aarch64) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) + set(HEXAGON hexagon) + set(X86 i386) + set(X86_64 x86_64) +diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt +--- compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt 2020-03-24 00:01:02.000000000 +0900 ++++ compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:44:49.468579650 +0900 +@@ -474,6 +474,7 @@ + set(armv7_SOURCES ${arm_SOURCES}) + set(armv7s_SOURCES ${arm_SOURCES}) + set(armv7k_SOURCES ${arm_SOURCES}) ++set(armv7l_SOURCES ${arm_SOURCES}) + set(arm64_SOURCES ${aarch64_SOURCES}) + + # macho_embedded archs +@@ -595,7 +596,7 @@ + foreach (arch ${BUILTIN_SUPPORTED_ARCH}) + if (CAN_TARGET_${arch}) + # For ARM archs, exclude any VFP builtins if VFP is not supported +- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") + check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) + if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/pkgs/development/compilers/llvm/10/compiler-rt.nix b/pkgs/development/compilers/llvm/10/compiler-rt.nix index 02bbc17c9673c..68f64ef42560a 100644 --- a/pkgs/development/compilers/llvm/10/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix @@ -1,4 +1,13 @@ { stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: + +let + + useLLVM = stdenv.hostPlatform.useLLVM or false; + bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; + inherit (stdenv.hostPlatform) isMusl; + +in + stdenv.mkDerivation rec { pname = "compiler-rt"; inherit version; @@ -11,27 +20,26 @@ stdenv.mkDerivation rec { "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" ]; - cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + cmakeFlags = [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" - "-DCMAKE_C_FLAGS=-nodefaultlibs" - "-DCMAKE_CXX_COMPILER_WORKS=ON" + ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" + ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" + ] ++ stdenv.lib.optionals (useLLVM) [ + "-DCOMPILER_RT_BUILD_BUILTINS=ON" + "-DCMAKE_C_FLAGS=-nodefaultlibs" #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" - "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" - "-DCOMPILER_RT_BUILD_XRAY=OFF" - "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" - "-DCOMPILER_RT_BUILD_PROFILE=OFF" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform.parsed.kernel.name == "none") [ - "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + ] ++ stdenv.lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" ]; @@ -40,17 +48,22 @@ stdenv.mkDerivation rec { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ./find-darwin-sdk-version.patch # don't test for macOS being >= 10.15 - ];# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; + # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) '' + '' + stdenv.lib.optionalString (useLLVM) '' substituteInPlace lib/builtins/int_util.c \ --replace "#include <stdlib.h>" "" substituteInPlace lib/builtins/clear_cache.c \ @@ -62,7 +75,7 @@ stdenv.mkDerivation rec { # Hack around weird upsream RPATH bug postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' ln -s "$out/lib"/*/* "$out/lib" - '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) '' + '' + stdenv.lib.optionalString (useLLVM) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index 462f246b89da9..4181ab29bd7fa 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -7,6 +7,7 @@ let release_version = "10.0.0"; version = release_version; # differentiating these (variables) is important for rc's + targetConfig = stdenv.targetPlatform.config; fetch = name: sha256: fetchurl { url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz"; @@ -60,7 +61,12 @@ let libstdcxxHook targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = mkExtraBuildCommands cc; + extraBuildCommands = '' + echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags + echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags + echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags + echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags + '' + mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix index 9e3529a046fc0..ed76ce77a8bb3 100644 --- a/pkgs/development/compilers/llvm/10/libc++/default.nix +++ b/pkgs/development/compilers/llvm/10/libc++/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = "https://libcxx.llvm.org/"; description = "A new implementation of the C++ standard library, targeting C++11"; license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/10/libc++abi.nix b/pkgs/development/compilers/llvm/10/libc++abi.nix index b58c12bd9ab49..ab45f27d24f42 100644 --- a/pkgs/development/compilers/llvm/10/libc++abi.nix +++ b/pkgs/development/compilers/llvm/10/libc++abi.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling install_name_tool -id $out/$file $file done make install @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = "https://libcxxabi.llvm.org/"; description = "A new implementation of low level support for a standard C++ library"; license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/llvm/10/lld.nix b/pkgs/development/compilers/llvm/10/lld.nix index 4bde3d74636e1..6a0032de2ac4c 100644 --- a/pkgs/development/compilers/llvm/10/lld.nix +++ b/pkgs/development/compilers/llvm/10/lld.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = "https://lld.llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/10/lldb.nix b/pkgs/development/compilers/llvm/10/lldb.nix index 46c991de817a8..90716f67f836f 100644 --- a/pkgs/development/compilers/llvm/10/lldb.nix +++ b/pkgs/development/compilers/llvm/10/lldb.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (rec { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://lldb.llvm.org; + homepage = "https://lldb.llvm.org"; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix index 73265419cfb79..dd0728b40c948 100644 --- a/pkgs/development/compilers/llvm/10/llvm.nix +++ b/pkgs/development/compilers/llvm/10/llvm.nix @@ -16,6 +16,7 @@ , enableSharedLibraries ? true , enablePFM ? !(stdenv.isDarwin || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + || stdenv.isAarch32 # broken for the armv7l builder ) , enablePolly ? true }: @@ -159,9 +160,10 @@ in stdenv.mkDerivation (rec { enableParallelBuilding = true; + requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = "https://llvm.org/"; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/10/openmp.nix b/pkgs/development/compilers/llvm/10/openmp.nix index 4dd45ba94e632..624c99bc86835 100644 --- a/pkgs/development/compilers/llvm/10/openmp.nix +++ b/pkgs/development/compilers/llvm/10/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = "https://openmp.llvm.org/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index e391ce046dbc0..1016398992fbb 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -83,7 +83,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = "https://llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/5/compiler-rt-armv7l.patch b/pkgs/development/compilers/llvm/5/compiler-rt-armv7l.patch new file mode 100644 index 0000000000000..77bf2640c4774 --- /dev/null +++ b/pkgs/development/compilers/llvm/5/compiler-rt-armv7l.patch @@ -0,0 +1,23 @@ +diff -ur compiler-rt-5.0.2.src/cmake/builtin-config-ix.cmake compiler-rt-5.0.2.src-patched/cmake/builtin-config-ix.cmake +--- compiler-rt-5.0.2.src/cmake/builtin-config-ix.cmake 2017-05-25 00:53:24.000000000 +0900 ++++ compiler-rt-5.0.2.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:24:24.937433155 +0900 +@@ -24,7 +24,7 @@ + + + set(ARM64 aarch64) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) + set(X86 i386 i686) + set(X86_64 x86_64) + set(MIPS32 mips mipsel) +diff -ur compiler-rt-5.0.2.src/lib/builtins/CMakeLists.txt compiler-rt-5.0.2.src-patched/lib/builtins/CMakeLists.txt +--- compiler-rt-5.0.2.src/lib/builtins/CMakeLists.txt 2017-07-13 04:33:30.000000000 +0900 ++++ compiler-rt-5.0.2.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:24:45.945075423 +0900 +@@ -444,6 +444,7 @@ + set(armv7_SOURCES ${arm_SOURCES}) + set(armv7s_SOURCES ${arm_SOURCES}) + set(armv7k_SOURCES ${arm_SOURCES}) ++set(armv7l_SOURCES ${arm_SOURCES}) + set(arm64_SOURCES ${aarch64_SOURCES}) + + # macho_embedded archs diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix index 4740180eb294f..624034b522865 100644 --- a/pkgs/development/compilers/llvm/5/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix @@ -1,5 +1,13 @@ { stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: -with stdenv.lib; + +let + + useLLVM = stdenv.hostPlatform.useLLVM or false; + bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; + inherit (stdenv.hostPlatform) isMusl; + +in + stdenv.mkDerivation { pname = "compiler-rt"; inherit version; @@ -8,16 +16,40 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - configureFlags = [ + NIX_CFLAGS_COMPILE = [ + "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" + ]; + + cmakeFlags = [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" + "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" + "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" + ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [ + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + "-DCOMPILER_RT_BUILD_XRAY=OFF" + "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" + "-DCOMPILER_RT_BUILD_PROFILE=OFF" + ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" + "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" + ] ++ stdenv.lib.optionals (useLLVM) [ + "-DCOMPILER_RT_BUILD_BUILTINS=ON" + "-DCMAKE_C_FLAGS=-nodefaultlibs" + #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program + "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" + ] ++ stdenv.lib.optionals (bareMetal) [ + "-DCOMPILER_RT_OS_DIR=baremetal" ]; outputs = [ "out" "dev" ]; patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ] ++ optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch - ++ optional (stdenv.hostPlatform.libc == "glibc") ./compiler-rt-sys-ustat.patch; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "glibc") ./compiler-rt-sys-ustat.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra @@ -27,11 +59,23 @@ stdenv.mkDerivation { postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + '' + stdenv.lib.optionalString (useLLVM) '' + substituteInPlace lib/builtins/int_util.c \ + --replace "#include <stdlib.h>" "" + substituteInPlace lib/builtins/clear_cache.c \ + --replace "#include <assert.h>" "" + substituteInPlace lib/builtins/cpu_model.c \ + --replace "#include <assert.h>" "" ''; # Hack around weird upsream RPATH bug - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' ln -s "$out/lib"/*/* "$out/lib" + '' + stdenv.lib.optionalString (useLLVM) '' + ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o + ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o + ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o + ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/linux/crtendS.o ''; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 3c1b07e7ca706..e7083a6ed13a7 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -7,6 +7,7 @@ let release_version = "5.0.2"; version = release_version; # differentiating these is important for rc's + targetConfig = stdenv.targetPlatform.config; fetch = name: sha256: fetchurl { url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; @@ -56,7 +57,12 @@ let extraPackages = [ targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = mkExtraBuildCommands cc; + extraBuildCommands = '' + echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags + echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags + echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags + echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags + '' + mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index b02e09a83a81e..88ad3c29c3e28 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = "https://libcxx.llvm.org/"; description = "A new implementation of the C++ standard library, targeting C++11"; license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix index 1b891af09ed14..96d6e78e01e4a 100644 --- a/pkgs/development/compilers/llvm/5/libc++abi.nix +++ b/pkgs/development/compilers/llvm/5/libc++abi.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling install_name_tool -id $out/$file $file done make install @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = "https://libcxxabi.llvm.org/"; description = "A new implementation of low level support for a standard C++ library"; license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix index bfee91d91bf6a..3d9ed6ee66358 100644 --- a/pkgs/development/compilers/llvm/5/lld.nix +++ b/pkgs/development/compilers/llvm/5/lld.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = "https://lld.llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; badPlatforms = [ "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix index a91a7e4354ef1..e0698e1dcf3dd 100644 --- a/pkgs/development/compilers/llvm/5/lldb.nix +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; + homepage = "https://llvm.org/"; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 2ce17765d633a..987e6258527ac 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation ({ requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = "https://llvm.org/"; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix index 559377bcc1b74..da328de24d137 100644 --- a/pkgs/development/compilers/llvm/5/openmp.nix +++ b/pkgs/development/compilers/llvm/5/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = "https://openmp.llvm.org/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index 9374fc0bda9f5..e2f7166354ae5 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -83,7 +83,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = "https://llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/6/compiler-rt-armv7l.patch b/pkgs/development/compilers/llvm/6/compiler-rt-armv7l.patch new file mode 100644 index 0000000000000..ca2ed632faa23 --- /dev/null +++ b/pkgs/development/compilers/llvm/6/compiler-rt-armv7l.patch @@ -0,0 +1,32 @@ +diff -ur compiler-rt-6.0.1.src/cmake/builtin-config-ix.cmake compiler-rt-6.0.1.src-patched/cmake/builtin-config-ix.cmake +--- compiler-rt-6.0.1.src/cmake/builtin-config-ix.cmake 2017-12-01 06:04:11.000000000 +0900 ++++ compiler-rt-6.0.1.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:30:01.939694303 +0900 +@@ -24,7 +24,7 @@ + + + set(ARM64 aarch64) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) + set(X86 i386) + set(X86_64 x86_64) + set(MIPS32 mips mipsel) +diff -ur compiler-rt-6.0.1.src/lib/builtins/CMakeLists.txt compiler-rt-6.0.1.src-patched/lib/builtins/CMakeLists.txt +--- compiler-rt-6.0.1.src/lib/builtins/CMakeLists.txt 2017-12-25 06:11:32.000000000 +0900 ++++ compiler-rt-6.0.1.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:30:44.814964156 +0900 +@@ -452,6 +452,7 @@ + set(armv7_SOURCES ${arm_SOURCES}) + set(armv7s_SOURCES ${arm_SOURCES}) + set(armv7k_SOURCES ${arm_SOURCES}) ++set(armv7l_SOURCES ${arm_SOURCES}) + set(arm64_SOURCES ${aarch64_SOURCES}) + + # macho_embedded archs +@@ -521,7 +522,7 @@ + set(_arch ${arch}) + if("${arch}" STREQUAL "armv6m") + set(_arch "arm|armv6m") +- elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + set(_arch "arm") + endif() + diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix index b3b6e86fc525f..5ae8bb01f050f 100644 --- a/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -1,5 +1,13 @@ { stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: -with stdenv.lib; + +let + + useLLVM = stdenv.hostPlatform.useLLVM or false; + bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; + inherit (stdenv.hostPlatform) isMusl; + +in + stdenv.mkDerivation { pname = "compiler-rt"; inherit version; @@ -8,29 +16,68 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - configureFlags = [ + NIX_CFLAGS_COMPILE = [ + "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" + ]; + + cmakeFlags = [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" + "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" + "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" + ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [ + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + "-DCOMPILER_RT_BUILD_XRAY=OFF" + "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" + "-DCOMPILER_RT_BUILD_PROFILE=OFF" + ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" + "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" + ] ++ stdenv.lib.optionals (useLLVM) [ + "-DCOMPILER_RT_BUILD_BUILTINS=ON" + "-DCMAKE_C_FLAGS=-nodefaultlibs" + #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program + "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" + ] ++ stdenv.lib.optionals (bareMetal) [ + "-DCOMPILER_RT_OS_DIR=baremetal" ]; outputs = [ "out" "dev" ]; patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ] ++ optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + '' + stdenv.lib.optionalString (useLLVM) '' + substituteInPlace lib/builtins/int_util.c \ + --replace "#include <stdlib.h>" "" + substituteInPlace lib/builtins/clear_cache.c \ + --replace "#include <assert.h>" "" + substituteInPlace lib/builtins/cpu_model.c \ + --replace "#include <assert.h>" "" ''; # Hack around weird upsream RPATH bug - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' ln -s "$out/lib"/*/* "$out/lib" + '' + stdenv.lib.optionalString (useLLVM) '' + ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o + ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o + ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o + ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/linux/crtendS.o ''; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index ba704f972c313..b544a4f6ba69f 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -7,6 +7,7 @@ let release_version = "6.0.1"; version = release_version; # differentiating these is important for rc's + targetConfig = stdenv.targetPlatform.config; fetch = name: sha256: fetchurl { url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; @@ -56,7 +57,12 @@ let extraPackages = [ targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = mkExtraBuildCommands cc; + extraBuildCommands = '' + echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags + echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags + echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags + echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags + '' + mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 831c6c9c70027..57f1431f4711e 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = "https://libcxx.llvm.org/"; description = "A new implementation of the C++ standard library, targeting C++11"; license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix index ac1f4f653e6a9..246bc6153e599 100644 --- a/pkgs/development/compilers/llvm/6/libc++abi.nix +++ b/pkgs/development/compilers/llvm/6/libc++abi.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling install_name_tool -id $out/$file $file done make install @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = "https://libcxxabi.llvm.org/"; description = "A new implementation of low level support for a standard C++ library"; license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix index 58b9b8060fa33..81b94df311940 100644 --- a/pkgs/development/compilers/llvm/6/lld.nix +++ b/pkgs/development/compilers/llvm/6/lld.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = "https://lld.llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix index 30d72d944264f..80e298eaf8c0c 100644 --- a/pkgs/development/compilers/llvm/6/lldb.nix +++ b/pkgs/development/compilers/llvm/6/lldb.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; + homepage = "https://llvm.org/"; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 80acd3fa2fe1c..22dbb75d2d501 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -147,9 +147,10 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; + requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = "https://llvm.org/"; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix index 447904b9ad5fc..c1a4480a5524c 100644 --- a/pkgs/development/compilers/llvm/6/openmp.nix +++ b/pkgs/development/compilers/llvm/6/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = "https://openmp.llvm.org/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index 6e01f4259ee03..18ea46ea39c40 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -93,7 +93,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = "https://llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/7/compiler-rt-armv7l.patch b/pkgs/development/compilers/llvm/7/compiler-rt-armv7l.patch new file mode 100644 index 0000000000000..89d7f1aec918c --- /dev/null +++ b/pkgs/development/compilers/llvm/7/compiler-rt-armv7l.patch @@ -0,0 +1,38 @@ +diff -ur compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake +--- compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake 2018-05-25 06:36:27.000000000 +0900 ++++ compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-09 20:26:33.030608692 +0900 +@@ -24,7 +24,7 @@ + + + set(ARM64 aarch64) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) + set(HEXAGON hexagon) + set(X86 i386) + set(X86_64 x86_64) +diff -ur compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt +--- compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt 2018-07-31 03:18:59.000000000 +0900 ++++ compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-09 20:27:38.893409318 +0900 +@@ -453,6 +453,7 @@ + set(armv7_SOURCES ${arm_SOURCES}) + set(armv7s_SOURCES ${arm_SOURCES}) + set(armv7k_SOURCES ${arm_SOURCES}) ++set(armv7l_SOURCES ${arm_SOURCES}) + set(arm64_SOURCES ${aarch64_SOURCES}) + + # macho_embedded archs +@@ -563,12 +564,12 @@ + set(_arch ${arch}) + if("${arch}" STREQUAL "armv6m") + set(_arch "arm|armv6m") +- elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + set(_arch "arm") + endif() + + # For ARM archs, exclude any VFP builtins if VFP is not supported +- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") + check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) + if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix index 7a5e3d4c8fc93..e9853c58ca572 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" ]; - cmakeFlags = stdenv.lib.optionals (useLLVM || stdenv.isDarwin) [ + cmakeFlags = [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" @@ -48,14 +48,18 @@ stdenv.mkDerivation { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ] ++ stdenv.lib.optional (useLLVM) ./crtbegin-and-end.patch - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch; + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + stdenv.lib.optionalString (useLLVM) '' @@ -68,7 +72,7 @@ stdenv.mkDerivation { ''; # Hack around weird upsream RPATH bug - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' ln -s "$out/lib"/*/* "$out/lib" '' + stdenv.lib.optionalString (useLLVM) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 5124a5df00b30..0b71c3a28d237 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -7,6 +7,7 @@ let release_version = "7.1.0"; version = release_version; # differentiating these is important for rc's + targetConfig = stdenv.targetPlatform.config; fetch = name: sha256: fetchurl { url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; @@ -63,7 +64,12 @@ let extraPackages = [ targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = mkExtraBuildCommands cc; + extraBuildCommands = '' + echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags + echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags + echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags + echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags + '' + mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index f2cdd2f6f5fa5..96cb671fa431f 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = "https://libcxx.llvm.org/"; description = "A new implementation of the C++ standard library, targeting C++11"; license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix index 9067bf43a8fa5..97141a0bd402a 100644 --- a/pkgs/development/compilers/llvm/7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/7/libc++abi.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling install_name_tool -id $out/$file $file done make install @@ -45,7 +45,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = "https://libcxxabi.llvm.org/"; description = "A new implementation of low level support for a standard C++ library"; license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/llvm/7/lld.nix b/pkgs/development/compilers/llvm/7/lld.nix index 823e9640cf4ed..bee9202ed6c18 100644 --- a/pkgs/development/compilers/llvm/7/lld.nix +++ b/pkgs/development/compilers/llvm/7/lld.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = "https://lld.llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix index ace6ae812fded..8fadd3cf7849e 100644 --- a/pkgs/development/compilers/llvm/7/lldb.nix +++ b/pkgs/development/compilers/llvm/7/lldb.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; + homepage = "https://llvm.org/"; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index d7fb1fe4b93f3..dc57d0d6bd5c3 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -17,6 +17,7 @@ , enableSharedLibraries ? true , enablePFM ? !(stdenv.isDarwin || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + || stdenv.isAarch32 # broken for the armv7l builder ) , enablePolly ? false }: @@ -168,9 +169,10 @@ in stdenv.mkDerivation ({ enableParallelBuilding = true; + requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = "https://llvm.org/"; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/pkgs/development/compilers/llvm/7/openmp.nix index 7adc2aa588e37..898d49dce834e 100644 --- a/pkgs/development/compilers/llvm/7/openmp.nix +++ b/pkgs/development/compilers/llvm/7/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = "https://openmp.llvm.org/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix index 81a069e6c01b1..3b398628e567c 100644 --- a/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/pkgs/development/compilers/llvm/8/clang/default.nix @@ -103,7 +103,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = "https://llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/8/compiler-rt-armv7l.patch b/pkgs/development/compilers/llvm/8/compiler-rt-armv7l.patch new file mode 100644 index 0000000000000..89d7f1aec918c --- /dev/null +++ b/pkgs/development/compilers/llvm/8/compiler-rt-armv7l.patch @@ -0,0 +1,38 @@ +diff -ur compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake +--- compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake 2018-05-25 06:36:27.000000000 +0900 ++++ compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-09 20:26:33.030608692 +0900 +@@ -24,7 +24,7 @@ + + + set(ARM64 aarch64) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) + set(HEXAGON hexagon) + set(X86 i386) + set(X86_64 x86_64) +diff -ur compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt +--- compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt 2018-07-31 03:18:59.000000000 +0900 ++++ compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-09 20:27:38.893409318 +0900 +@@ -453,6 +453,7 @@ + set(armv7_SOURCES ${arm_SOURCES}) + set(armv7s_SOURCES ${arm_SOURCES}) + set(armv7k_SOURCES ${arm_SOURCES}) ++set(armv7l_SOURCES ${arm_SOURCES}) + set(arm64_SOURCES ${aarch64_SOURCES}) + + # macho_embedded archs +@@ -563,12 +564,12 @@ + set(_arch ${arch}) + if("${arch}" STREQUAL "armv6m") + set(_arch "arm|armv6m") +- elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + set(_arch "arm") + endif() + + # For ARM archs, exclude any VFP builtins if VFP is not supported +- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") + check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) + if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix index 795c81f421967..1f58cb98e3d3c 100644 --- a/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" ]; - cmakeFlags = stdenv.lib.optionals (useLLVM || stdenv.isDarwin) [ + cmakeFlags = [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" @@ -48,14 +48,18 @@ stdenv.mkDerivation { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch - ++ stdenv.lib.optional (useLLVM) ./crtbegin-and-end.patch; + ++ stdenv.lib.optional (useLLVM) ./crtbegin-and-end.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + stdenv.lib.optionalString (useLLVM) '' diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index 105011595c8b2..d9383d042bbca 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -7,6 +7,7 @@ let release_version = "8.0.1"; version = release_version; # differentiating these is important for rc's + targetConfig = stdenv.targetPlatform.config; fetch = name: sha256: fetchurl { url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz"; @@ -63,7 +64,12 @@ let extraPackages = [ targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = mkExtraBuildCommands cc; + extraBuildCommands = '' + echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags + echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags + echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags + echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags + '' + mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix index 883d9c8776f33..24bca6aafcd1c 100644 --- a/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = "https://libcxx.llvm.org/"; description = "A new implementation of the C++ standard library, targeting C++11"; license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/pkgs/development/compilers/llvm/8/libc++abi.nix index 58a1241d82368..590872aaab649 100644 --- a/pkgs/development/compilers/llvm/8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/8/libc++abi.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling install_name_tool -id $out/$file $file done make install @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = "https://libcxxabi.llvm.org/"; description = "A new implementation of low level support for a standard C++ library"; license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/llvm/8/lld.nix b/pkgs/development/compilers/llvm/8/lld.nix index fc52d691d030f..ba9cf3c57d773 100644 --- a/pkgs/development/compilers/llvm/8/lld.nix +++ b/pkgs/development/compilers/llvm/8/lld.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = "https://lld.llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/8/lldb.nix b/pkgs/development/compilers/llvm/8/lldb.nix index 75be5b993df3b..298ce737fc73e 100644 --- a/pkgs/development/compilers/llvm/8/lldb.nix +++ b/pkgs/development/compilers/llvm/8/lldb.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; + homepage = "https://llvm.org/"; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix index a9c4a6b0ba25e..0f6179c2d310f 100644 --- a/pkgs/development/compilers/llvm/8/llvm.nix +++ b/pkgs/development/compilers/llvm/8/llvm.nix @@ -16,6 +16,7 @@ , enableSharedLibraries ? true , enablePFM ? !(stdenv.isDarwin || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + || stdenv.isAarch32 # broken for the armv7l builder ) , enablePolly ? false }: @@ -143,9 +144,10 @@ in stdenv.mkDerivation ({ enableParallelBuilding = true; + requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = "https://llvm.org/"; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/8/openmp.nix b/pkgs/development/compilers/llvm/8/openmp.nix index 166e7f68eb3b3..42cc7adf4f00d 100644 --- a/pkgs/development/compilers/llvm/8/openmp.nix +++ b/pkgs/development/compilers/llvm/8/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = "https://openmp.llvm.org/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix index d8df52df553cb..c938a01f8979e 100644 --- a/pkgs/development/compilers/llvm/9/clang/default.nix +++ b/pkgs/development/compilers/llvm/9/clang/default.nix @@ -98,7 +98,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = "https://llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/9/compiler-rt-armv7l.patch b/pkgs/development/compilers/llvm/9/compiler-rt-armv7l.patch new file mode 100644 index 0000000000000..89d7f1aec918c --- /dev/null +++ b/pkgs/development/compilers/llvm/9/compiler-rt-armv7l.patch @@ -0,0 +1,38 @@ +diff -ur compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake +--- compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake 2018-05-25 06:36:27.000000000 +0900 ++++ compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-09 20:26:33.030608692 +0900 +@@ -24,7 +24,7 @@ + + + set(ARM64 aarch64) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) + set(HEXAGON hexagon) + set(X86 i386) + set(X86_64 x86_64) +diff -ur compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt +--- compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt 2018-07-31 03:18:59.000000000 +0900 ++++ compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-09 20:27:38.893409318 +0900 +@@ -453,6 +453,7 @@ + set(armv7_SOURCES ${arm_SOURCES}) + set(armv7s_SOURCES ${arm_SOURCES}) + set(armv7k_SOURCES ${arm_SOURCES}) ++set(armv7l_SOURCES ${arm_SOURCES}) + set(arm64_SOURCES ${aarch64_SOURCES}) + + # macho_embedded archs +@@ -563,12 +564,12 @@ + set(_arch ${arch}) + if("${arch}" STREQUAL "armv6m") + set(_arch "arm|armv6m") +- elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + set(_arch "arm") + endif() + + # For ARM archs, exclude any VFP builtins if VFP is not supported +- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") + check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) + if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix index 0cfd8d7c9e723..3b92264ad6926 100644 --- a/pkgs/development/compilers/llvm/9/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" ]; - cmakeFlags = stdenv.lib.optionals (useLLVM || stdenv.isDarwin) [ + cmakeFlags = [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" @@ -47,14 +47,18 @@ stdenv.mkDerivation rec { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ];# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + stdenv.lib.optionalString (useLLVM) '' diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index d42e5187c3c7b..3b6db967b6a2e 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -7,6 +7,7 @@ let release_version = "9.0.1"; version = release_version; # differentiating these is important for rc's + targetConfig = stdenv.targetPlatform.config; fetch = name: sha256: fetchurl { url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz"; @@ -63,7 +64,12 @@ let extraPackages = [ targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = mkExtraBuildCommands cc; + extraBuildCommands = '' + echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags + echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags + echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags + echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags + '' + mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { diff --git a/pkgs/development/compilers/llvm/9/libc++/default.nix b/pkgs/development/compilers/llvm/9/libc++/default.nix index 9e3525574d5c6..f3081d1f26991 100644 --- a/pkgs/development/compilers/llvm/9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/9/libc++/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = "https://libcxx.llvm.org/"; description = "A new implementation of the C++ standard library, targeting C++11"; license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/9/libc++abi.nix b/pkgs/development/compilers/llvm/9/libc++abi.nix index fbc9a3731ef8c..5b63560282c04 100644 --- a/pkgs/development/compilers/llvm/9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/9/libc++abi.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling install_name_tool -id $out/$file $file done make install @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = "https://libcxxabi.llvm.org/"; description = "A new implementation of low level support for a standard C++ library"; license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/llvm/9/lld.nix b/pkgs/development/compilers/llvm/9/lld.nix index 775dc2e190569..488870e729a52 100644 --- a/pkgs/development/compilers/llvm/9/lld.nix +++ b/pkgs/development/compilers/llvm/9/lld.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = "https://lld.llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/9/lldb.nix b/pkgs/development/compilers/llvm/9/lldb.nix index 506fc1c3e5058..a8e193c27b173 100644 --- a/pkgs/development/compilers/llvm/9/lldb.nix +++ b/pkgs/development/compilers/llvm/9/lldb.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; + homepage = "https://llvm.org/"; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/pkgs/development/compilers/llvm/9/llvm.nix index 2cdc5a5fd0669..013e5bb36b947 100644 --- a/pkgs/development/compilers/llvm/9/llvm.nix +++ b/pkgs/development/compilers/llvm/9/llvm.nix @@ -16,6 +16,7 @@ , enableSharedLibraries ? true , enablePFM ? !(stdenv.isDarwin || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + || stdenv.isAarch32 # broken for the armv7l builder ) , enablePolly ? false }: @@ -160,9 +161,10 @@ in stdenv.mkDerivation (rec { enableParallelBuilding = true; + requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = "https://llvm.org/"; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/9/openmp.nix b/pkgs/development/compilers/llvm/9/openmp.nix index 4e0a5535ae351..84f898ec06a13 100644 --- a/pkgs/development/compilers/llvm/9/openmp.nix +++ b/pkgs/development/compilers/llvm/9/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = "https://openmp.llvm.org/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix index adfde05e6584a..8d2ad8e6bbc56 100644 --- a/pkgs/development/compilers/manticore/default.nix +++ b/pkgs/development/compilers/manticore/default.nix @@ -50,6 +50,6 @@ in stdenv.mkDerivation { parallel array comprehensions. ''; - homepage = http://manticore.cs.uchicago.edu/; + homepage = "http://manticore.cs.uchicago.edu/"; }; } diff --git a/pkgs/development/compilers/matter-compiler/default.nix b/pkgs/development/compilers/matter-compiler/default.nix index f415fa8c01249..89daf7b27ebaa 100644 --- a/pkgs/development/compilers/matter-compiler/default.nix +++ b/pkgs/development/compilers/matter-compiler/default.nix @@ -12,7 +12,7 @@ bundlerApp { Matter Compiler is a API Blueprint AST Media Types to API Blueprint conversion tool. It composes an API blueprint from its serialzed AST media-type. ''; - homepage = https://github.com/apiaryio/matter_compiler/; + homepage = "https://github.com/apiaryio/matter_compiler/"; license = licenses.mit; maintainers = with maintainers; [ rvlander manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix index d715114793397..bf0db4c1f6cd5 100644 --- a/pkgs/development/compilers/mcpp/default.nix +++ b/pkgs/development/compilers/mcpp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-mcpplib" ]; meta = with stdenv.lib; { - homepage = http://mcpp.sourceforge.net/; + homepage = "http://mcpp.sourceforge.net/"; description = "A portable c preprocessor"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index 5c26d5ab117b2..d534e2483d635 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mercury"; - version = "20.01.1"; + version = "20.01.2"; src = fetchurl { url = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz"; - sha256 = "0vxp9f0jmr228n13p6znhbxncav6ay0bnl4ypy6r3lw5lh7z172p"; + sha256 = "084ml6kswgaqjgmib3gq7zjnqsimz3f35w13ff6z0dv4d9csmq4m"; }; buildInputs = [ gcc flex bison texinfo jdk erlang makeWrapper diff --git a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix index 3869bdad84f60..a5c7054c3a617 100644 --- a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix +++ b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation { name = "meta-build-env-0.1"; src = fetchurl { - url = http://www.meta-environment.org/releases/meta-build-env-0.1.tar.gz ; + url = "http://www.meta-environment.org/releases/meta-build-env-0.1.tar.gz"; sha256 = "1imn1gaan4fv73v8w3k3lgyjzkcn7bdp69k6hlz0vqdg17ysd1x3"; }; diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix index c0b535747133c..a90076c9eccde 100644 --- a/pkgs/development/compilers/mezzo/default.nix +++ b/pkgs/development/compilers/mezzo/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://protz.github.io/mezzo/; + homepage = "http://protz.github.io/mezzo/"; description = "A programming language in the ML tradition, which places strong emphasis on the control of aliasing and access to mutable memory"; license = licenses.gpl2; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix index a18202b9f884b..ba3e388c3992b 100644 --- a/pkgs/development/compilers/microscheme/default.nix +++ b/pkgs/development/compilers/microscheme/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://microscheme.org; + homepage = "http://microscheme.org"; description = "A Scheme subset for Atmel microcontrollers"; longDescription = '' Microscheme is a Scheme subset/variant designed for Atmel diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index 78cce113e9b48..d1d103c047fbf 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -1,27 +1,36 @@ -{ lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which, libyaml }: -crystal.buildCrystalPackage rec { - version = "0.7.1"; +{ lib, fetchFromGitHub, crystal_0_33, openssl }: + +let crystal = crystal_0_33; +in crystal.buildCrystalPackage rec { + version = "0.9.0"; pname = "mint"; + src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; rev = version; - sha256 = "18cg96kl4dn89bj6fm3080zzyd1r7rsfi17agdjjayd2v9fgs95l"; + sha256 = "0y1qr616x7s0pjgih6s1n4wiwb8kn8l1knnzmib6j4jmqax0jhz0"; }; - buildInputs = [ openssl ]; + postPatch = '' + export HOME=$TMP + ''; + + format = "shards"; # Update with # nix-shell -p crystal2nix --run crystal2nix # with mint's shard.lock file in the current directory shardsFile = ./shards.nix; - crystalBinaries.mint.src = "src/mint.cr"; - meta = { + buildInputs = [ openssl ]; + + meta = with lib; { description = "A refreshing language for the front-end web"; - homepage = https://mint-lang.com/; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ manveru ]; + homepage = "https://mint-lang.com/"; + license = licenses.bsd3; + maintainers = with maintainers; [ manveru ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + broken = lib.versionOlder crystal.version "0.33"; }; } diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix index b3583ac2cbaa7..8e2b6b6ad4df2 100644 --- a/pkgs/development/compilers/mint/shards.nix +++ b/pkgs/development/compilers/mint/shards.nix @@ -2,26 +2,26 @@ admiral = { owner = "jwaldrip"; repo = "admiral.cr"; - rev = "v1.7.3"; - sha256 = "0b98qjy43wsrc08am7lkhcdsxc7gplf9hcmbvd4p3dw4g107rk91"; + rev = "v1.9.0"; + sha256 = "0y8gsh1qz42bc9jawcrn0i49mzzfvf8znmivd8lybapf0f53fblz"; }; ameba = { - owner = "veelenga"; + owner = "crystal-ameba"; repo = "ameba"; - rev = "v0.10.1"; - sha256 = "0dcw7px7g0c5pxpdlirhirqzhcc7gdwdfiwb9kgm4x1k74ghjgxq"; + rev = "v0.12.0"; + sha256 = "0g68yijbm2j4ig536fwq49d1z7x2iv9kp4g3gjklf5zn1sbqhm12"; }; baked_file_system = { owner = "schovi"; repo = "baked_file_system"; - rev = "v0.9.7"; - sha256 = "1fi6zag1a6h4xwrfizy01dls3hhraqw0cmpwj7rjv1qcddjgig5z"; + rev = "v0.9.8"; + sha256 = "12l375jllg1lxvfh610dz0a39p803xw6q9fxlmnc6hy55i0gm0y3"; }; diff = { owner = "MakeNowJust"; repo = "crystal-diff"; - rev = "51962dc36f9bbb1b926d557f7cb8993a6c73cc63"; - sha256 = "1nwnsxm8srfw8jg0yfi2v19x6j3dadx62hq0xpxra40qcqz9dbnp"; + rev = "v1.1.0"; + sha256 = "1q5q2d5mp1r8c6k5v4755sb3b6awiz85d1j280djzhbd0pggk3z7"; }; dotenv = { owner = "gdotdesign"; @@ -32,14 +32,14 @@ exception_page = { owner = "crystal-loot"; repo = "exception_page"; - rev = "v0.1.2"; - sha256 = "0j5ishhyriq9p339yaawrmawl9wgmp1paniq30a8d6a0568h3avq"; + rev = "v0.1.4"; + sha256 = "0bsp2m89sl0bg9d5szbs1nxyk7yk58rkk24aibr39hhb5zi70pqi"; }; kemal = { owner = "kemalcr"; repo = "kemal"; - rev = "v0.25.1"; - sha256 = "1334i905xj6vlmp8acyybwwlaxsgmf90b59da7brzpnf28wci782"; + rev = "v0.26.1"; + sha256 = "169pwkjmk7x6j8i0rf5rpyk1y0hl7jaf9h6yrq4ha2ag9yq9i8fr"; }; kilt = { owner = "jeromegn"; diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index ef7ad9b32669a..b2fa8fba0ddf7 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation { development cycle. ''; - homepage = https://www.gnu.org/software/mit-scheme/; + homepage = "https://www.gnu.org/software/mit-scheme/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index 405846343cf14..baaf978d2984c 100644 --- a/pkgs/development/compilers/mkcl/default.nix +++ b/pkgs/development/compilers/mkcl/default.nix @@ -40,7 +40,7 @@ with stdenv.lib; stdenv.mkDerivation rec { meta = { description = "ANSI Common Lisp Implementation"; - homepage = https://common-lisp.net/project/mkcl/; + homepage = "https://common-lisp.net/project/mkcl/"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ tohl ]; diff --git a/pkgs/development/compilers/mlton/meta.nix b/pkgs/development/compilers/mlton/meta.nix index c4dc9c430bc27..1e4c0aacfc3c2 100644 --- a/pkgs/development/compilers/mlton/meta.nix +++ b/pkgs/development/compilers/mlton/meta.nix @@ -9,7 +9,7 @@ Description taken from http://en.wikipedia.org/wiki/Mlton . ''; - homepage = http://mlton.org/; + homepage = "http://mlton.org/"; license = "bsd"; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"]; } diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 85d64de6c233d..f22771a35e9de 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { inherit enableParallelBuilding; meta = with stdenv.lib; { - homepage = https://mono-project.com/; + homepage = "https://mono-project.com/"; description = "Cross platform, open source .NET development framework"; platforms = with platforms; darwin ++ linux; maintainers = with maintainers; [ thoughtpolice obadz vrthra ]; diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index 36a457125fad2..d08a4ebef24da 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = { description = "Collection of modular and reusable compiler and toolchain technologies - Mono build"; - homepage = http://llvm.org/; + homepage = "http://llvm.org/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/development/compilers/mosml/default.nix index 19324593a30ca..3d94303cbaa59 100644 --- a/pkgs/development/compilers/mosml/default.nix +++ b/pkgs/development/compilers/mosml/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { Moscow ML is a light-weight implementation of Standard ML (SML), a strict functional language used in teaching and research. ''; - homepage = https://mosml.org/; + homepage = "https://mosml.org/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ vaibhavsagar ]; diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index 8eb35f1b5f7a6..66d642dbbbd14 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.mozart-oz.org/; + homepage = "http://www.mozart-oz.org/"; description = "Multiplatform implementation of the Oz programming language"; longDescription = '' The Mozart Programming System combines ongoing research in diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix index e4c756e9c7d31..f6a7fc2f1433c 100644 --- a/pkgs/development/compilers/mruby/default.nix +++ b/pkgs/development/compilers/mruby/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An embeddable implementation of the Ruby language"; - homepage = https://mruby.org; + homepage = "https://mruby.org"; maintainers = [ maintainers.nicknovitski ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index f5645ae021921..67665c3bab184 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="-Wno-error=attributes"; meta = with stdenv.lib; { - homepage = https://www.nasm.us/; + homepage = "https://www.nasm.us/"; description = "An 80x86 and x86-64 assembler designed for portability and modularity"; platforms = platforms.unix; maintainers = with maintainers; [ pSub willibutz ]; diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 79c4aacbed5b9..705b222a86cba 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high-level dynamically typed programming language"; - homepage = https://nekovm.org; + homepage = "https://nekovm.org"; license = licenses.lgpl21; maintainers = [ maintainers.marcweber ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index b0fbc2eb8d13e..cce22207a3608 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -79,7 +79,7 @@ with stdenv; mkDerivation rec { meta = with lib; { description = "Place and route tool for FPGAs"; - homepage = https://github.com/yosyshq/nextpnr; + homepage = "https://github.com/yosyshq/nextpnr"; license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice emily ]; diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index fa49bf9dd7327..2f7a1c7a96438 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://developer.nvidia.com/cg-toolkit; + homepage = "https://developer.nvidia.com/cg-toolkit"; license = lib.licenses.unfreeRedistributable; }; } diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index a6d2bcd875e18..8f26790020c8c 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (rec { ''; meta = { - homepage = http://caml.inria.fr/ocaml; + homepage = "http://caml.inria.fr/ocaml"; license = with stdenv.lib.licenses; [ qpl lgpl2 ]; description = "Most popular variant of the Caml language"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index f582ef9834a62..946013562c229 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://caml.inria.fr/ocaml; + homepage = "http://caml.inria.fr/ocaml"; license = with licenses; [ qpl /* compiler */ lgpl2 /* library */ diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index 1026b1bd8d75d..f90d61744f566 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://caml.inria.fr/ocaml; + homepage = "http://caml.inria.fr/ocaml"; branch = "3.12"; license = with licenses; [ qpl /* compiler */ diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index a4b21251bd182..81a8e0034feb8 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://caml.inria.fr/ocaml; + homepage = "http://caml.inria.fr/ocaml"; branch = "4.00"; license = with licenses; [ qpl /* compiler */ diff --git a/pkgs/development/compilers/ocaml/4.11.nix b/pkgs/development/compilers/ocaml/4.11.nix new file mode 100644 index 0000000000000..db77d989c1df7 --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.11.nix @@ -0,0 +1,6 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "11"; + patch_version = "0+alpha1"; + sha256 = "02sbwm00h2zxzyq5q90lg2a6m93zr797azshkb2qcwcf1kr7ddqg"; +} diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix index bbaee35849028..a6ddcd8ce8f40 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi-Stage Programming extension for OCaml"; - homepage = http://okmij.org/ftp/ML/MetaOCaml.html; + homepage = "http://okmij.org/ftp/ML/MetaOCaml.html"; license = with licenses; [ /* compiler */ qpl /* library */ lgpl2 ]; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 12369ebcc6f11..f2b61ab700dad 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (args // { }; meta = with stdenv.lib; { - homepage = http://caml.inria.fr/ocaml; + homepage = "http://caml.inria.fr/ocaml"; branch = versionNoPatch; license = with licenses; [ qpl /* compiler */ diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index 1f53c4f0e7829..8459f26367e08 100644 --- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation ({ ''; meta = { - homepage = http://www.metaocaml.org/; + homepage = "http://www.metaocaml.org/"; license = with stdenv.lib.licenses; [ qpl lgpl2 ]; description = "A compiled, type-safe, multi-stage programming language"; broken = true; diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index da1df6f30bbd8..c20e0d0ef991d 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { web applications using a single technology. Among the the many features of Opa are these: Opa is concise, simple, concurrent, dynamically distributed, and secure. ''; - homepage = http://opalang.org/; + homepage = "http://opalang.org/"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.kkallio ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/compilers/open-watcom-bin/default.nix b/pkgs/development/compilers/open-watcom-bin/default.nix new file mode 100644 index 0000000000000..a9c6b221065c2 --- /dev/null +++ b/pkgs/development/compilers/open-watcom-bin/default.nix @@ -0,0 +1,122 @@ +{ stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }: + +let + + # We execute all OpenWatcom binaries in qemu-user, because otherwise + # some binaries (most notably the installer itself and wlib) fail to + # use the stat() systemcall. The failure mode is that it returns + # EOVERFLOW for completely legitimate requests. This seems like an + # incompatibility of new Linux kernels to run this ancient binary. + wrapLegacyBinary = writeScript "wrapLegacyBinary" '' + #!${bash}/bin/bash + + set -eu + + if [ $# -ne 2 ]; then + echo "Usage: $0 unwrapped-binary wrapped-binary" + exit 1 + fi + + IN="$(${coreutils}/bin/realpath $1)" + OUT="$2" + ARGV0="$(basename $2)" + + cat > "$OUT" <<EOF + #!${bash}/bin/bash + + TERMINFO=${ncurses}/share/terminfo TERM=vt100 exec ${qemu}/bin/qemu-i386 -0 $ARGV0 $IN "\$@" + EOF + + chmod +x "$OUT" + ''; + + wrapInPlace = writeScriptBin "wrapInPlace" '' + #!${bash}/bin/bash + + set -eu + + if [ $# -ne 1 ]; then + echo "Usage: $0 unwrapped-binary" + exit 1 + fi + + TARGET="$1" + + mv "$TARGET" "$TARGET-unwrapped" + chmod +x "$TARGET-unwrapped" + + exec ${wrapLegacyBinary} "$TARGET-unwrapped" "$TARGET" + ''; + + # Do a scripted installation of OpenWatcom with its original installer. + # + # If maintaining this expect script turns out to be too much of a + # hassle, we can switch to just using `unzip' on the installer and + # the correct file permissions manually. + performInstall = writeScriptBin "performInstall" '' + #!${expect}/bin/expect -f + + spawn [lindex $argv 0] + + # Wait for button saying "I agree" with escape sequences. + expect "gree" + + # Navigate to "I Agree!" and hit enter. + send "\t\t\n" + + expect "Install Open Watcom" + + # Where do we want to install to. + send "$env(out)\n" + + expect "will be installed" + + # Select Full Installation, Next + send "fn" + + expect "Setup will now copy" + + # Next + send "n" + + expect "completed successfully" + send "\n" + ''; + +in +stdenvNoCC.mkDerivation rec { + pname = "open-watcom-bin"; + version = "1.9"; + + src = fetchurl { + url = "http://ftp.openwatcom.org/install/open-watcom-c-linux-${version}"; + sha256 = "1wzkvc6ija0cjj5mcyjng5b7hnnc5axidz030c0jh05pgvi4nj7p"; + }; + + nativeBuildInputs = [ wrapInPlace performInstall ]; + + dontUnpack = true; + dontConfigure = true; + + buildPhase = '' + cp ${src} install-bin-unwrapped + wrapInPlace install-bin-unwrapped + ''; + + installPhase = '' + performInstall ./install-bin-unwrapped + + for e in $(find $out/binl -type f -executable); do + echo "Wrapping $e" + wrapInPlace "$e" + done + ''; + + meta = with stdenvNoCC.lib; { + description = "A C/C++ Compiler (binary distribution)"; + homepage = "http://www.openwatcom.org/"; + license = licenses.watcom; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ maintainers.blitz ]; + }; +} diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index e11bb7251a601..dbe7e44b1d788 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation { name = "opendylan-2013.2"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86_64-linux.tar.bz2; + url = "https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86_64-linux.tar.bz2"; sha256 = "035brbw3hm7zrs593q4zc42yglj1gmmkw3b1r7zzlw3ks4i2lg7h"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86-linux.tar.bz2; + url = "https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86-linux.tar.bz2"; sha256 = "0c61ihvblcsjrw6ncr8x8ylhskcrqs8pajs4mg5di36cvqw12nq5"; } else throw "platform ${stdenv.hostPlatform.system} not supported."; @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://opendylan.org; + homepage = "https://opendylan.org"; description = "A multi-paradigm functional and object-oriented programming language"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index 8e732d7d8bf4a..5abc40cc3bb52 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "opendylan-2016.1pre"; src = fetchgit { - url = https://github.com/dylan-lang/opendylan; + url = "https://github.com/dylan-lang/opendylan"; rev = "cd9a8395586d33cc43a8611c1dc0513e69ee82dd"; sha256 = "00r1dm7mjy5p4hfm13vc4b6qryap40zinia3y15rhvalc3i2np4b"; fetchSubmodules = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation { postInstall = "wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin"; meta = { - homepage = https://opendylan.org; + homepage = "https://opendylan.org"; description = "A multi-paradigm functional and object-oriented programming language"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 2081d33967070..ef496f5f7c521 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -132,7 +132,7 @@ let disallowedReferences = [ openjdk11-bootstrap ]; meta = with stdenv.lib; { - homepage = http://openjdk.java.net/; + homepage = "http://openjdk.java.net/"; license = licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index 094bd57e6e985..16c2fd766bcec 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -41,7 +41,7 @@ let # so grab the work-around from # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 (fetchurl { - url = https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch; + url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; }) ] ++ lib.optionals (!headless && enableGnome2) [ @@ -114,7 +114,7 @@ let # Set JAVA_HOME automatically. mkdir -p $out/nix-support cat <<EOF > $out/nix-support/setup-hook - if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi EOF ''; @@ -140,7 +140,7 @@ let disallowedReferences = [ openjdk11 ]; meta = with stdenv.lib; { - homepage = http://openjdk.java.net/; + homepage = "http://openjdk.java.net/"; license = licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix new file mode 100644 index 0000000000000..b3842ba7cad22 --- /dev/null +++ b/pkgs/development/compilers/openjdk/13.nix @@ -0,0 +1,155 @@ +{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip +, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama +, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap +, setJavaClassPath +, headless ? false +, enableJavaFX ? openjfx.meta.available, openjfx +, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +}: + +let + major = "13"; + update = ".0.2"; + build = "-ga"; + + openjdk = stdenv.mkDerivation rec { + pname = "openjdk" + lib.optionalString headless "-headless"; + version = "${major}${update}${build}"; + + src = fetchurl { + url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; + sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv"; + }; + + nativeBuildInputs = [ pkgconfig autoconf ]; + buildInputs = [ + cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib + libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst + libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap + ] ++ lib.optionals (!headless && enableGnome2) [ + gtk3 gnome_vfs GConf glib + ]; + + patches = [ + ./fix-java-home-jdk10.patch + ./read-truststore-from-env-jdk10.patch + ./currency-date-range-jdk10.patch + ./increase-javadoc-heap-jdk13.patch + # -Wformat etc. are stricter in newer gccs, per + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 + # so grab the work-around from + # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 + (fetchurl { + url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; + sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; + }) + ] ++ lib.optionals (!headless && enableGnome2) [ + ./swing-use-gtk-jdk13.patch + ]; + + prePatch = '' + chmod +x configure + patchShebangs --build configure + ''; + + configureFlags = [ + "--with-boot-jdk=${openjdk13-bootstrap.home}" + "--enable-unlimited-crypto" + "--with-native-debug-symbols=internal" + "--with-libjpeg=system" + "--with-giflib=system" + "--with-libpng=system" + "--with-zlib=system" + "--with-lcms=system" + "--with-stdc++lib=dynamic" + ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" + ++ lib.optional headless "--enable-headless-only" + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; + + separateDebugInfo = true; + + NIX_CFLAGS_COMPILE = "-Wno-error"; + + NIX_LDFLAGS = toString (lib.optionals (!headless) [ + "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" + ] ++ lib.optionals (!headless && enableGnome2) [ + "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + ]); + + buildFlags = [ "all" ]; + + installPhase = '' + mkdir -p $out/lib + + mv build/*/images/jdk $out/lib/openjdk + + # Remove some broken manpages. + rm -rf $out/lib/openjdk/man/ja* + + # Mirror some stuff in top-level. + mkdir -p $out/share + ln -s $out/lib/openjdk/include $out/include + ln -s $out/lib/openjdk/man $out/share/man + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Remove crap from the installation. + rm -rf $out/lib/openjdk/demo + ${lib.optionalString headless '' + rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so + ''} + + ln -s $out/lib/openjdk/bin $out/bin + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook so that any package + # that depends on the JDK has $CLASSPATH set up properly. + mkdir -p $out/nix-support + #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 + echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat <<EOF > $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi + EOF + ''; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $outputs; do + if [ "$output" = debug ]; then continue; fi + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" + done + # Add the local library paths to remove dependencies on the bootstrap + for output in $outputs; do + if [ "$output" = debug ]; then continue; fi + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + ''; + + disallowedReferences = [ openjdk13-bootstrap ]; + + meta = with stdenv.lib; { + homepage = "http://openjdk.java.net/"; + license = licenses.gpl2; + description = "The open-source Java Development Kit"; + maintainers = with maintainers; [ edwtjo ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; + }; + + passthru = { + architecture = ""; + home = "${openjdk}/lib/openjdk"; + }; + }; +in openjdk diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index f47d7939e48c7..828df621b6f1f 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -257,7 +257,7 @@ let disallowedReferences = [ openjdk8-bootstrap ]; meta = with lib; { - homepage = http://openjdk.java.net/; + homepage = "http://openjdk.java.net/"; license = licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo nequissimus ]; diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix index 775fd3cd3c43f..c6498cb45302d 100644 --- a/pkgs/development/compilers/openjdk/darwin/default.nix +++ b/pkgs/development/compilers/openjdk/darwin/default.nix @@ -7,11 +7,11 @@ let }; jdk = stdenv.mkDerivation rec { - name = "zulu13.29.9-ca-jdk13.0.2"; + name = "zulu14.28.21-ca-jdk14.0.1"; src = fetchurl { url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz"; - sha256 = "1x8ja3x880a1izrwi7bdrwz1ljdvracjx627slzjd2xk8c4211pf"; + sha256 = "1pc0y3fxhlf42a51qbdha1fabci61yzq70kk5c1rzk0ai78d92q8"; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; }; diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 24828f16e7bec..063976d8765fc 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama -, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap +, libXcursor, libXrandr, fontconfig, openjdk14-bootstrap , setJavaClassPath , headless ? false , enableJavaFX ? openjfx.meta.available, openjfx @@ -9,8 +9,8 @@ }: let - major = "13"; - update = ".0.2"; + major = "14"; + update = ".0.1"; build = "-ga"; openjdk = stdenv.mkDerivation rec { @@ -19,14 +19,14 @@ let src = fetchurl { url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; - sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv"; + sha256 = "0ic7dcrzk62jc65yrshs6xlclmsha7z52bia5s2bkllw1zpmdmip"; }; nativeBuildInputs = [ pkgconfig autoconf ]; buildInputs = [ cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap + libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ gtk3 gnome_vfs GConf glib ]; @@ -41,7 +41,7 @@ let # so grab the work-around from # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 (fetchurl { - url = https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch; + url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; }) ] ++ lib.optionals (!headless && enableGnome2) [ @@ -54,7 +54,7 @@ let ''; configureFlags = [ - "--with-boot-jdk=${openjdk13-bootstrap.home}" + "--with-boot-jdk=${openjdk14-bootstrap.home}" "--enable-unlimited-crypto" "--with-native-debug-symbols=internal" "--with-libjpeg=system" @@ -137,10 +137,10 @@ let done ''; - disallowedReferences = [ openjdk13-bootstrap ]; + disallowedReferences = [ openjdk14-bootstrap ]; meta = with stdenv.lib; { - homepage = http://openjdk.java.net/; + homepage = "http://openjdk.java.net/"; license = licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index b5ac58e6c6770..7ba04ed50cc01 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -104,7 +104,7 @@ in makePackage { passthru.deps = deps; meta = with stdenv.lib; { - homepage = http://openjdk.java.net/projects/openjfx/; + homepage = "http://openjdk.java.net/projects/openjfx/"; license = licenses.gpl2; description = "The next-generation Java client toolkit."; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/13.nix b/pkgs/development/compilers/openjdk/openjfx/14.nix index 632724a9ac004..12d9448595e38 100644 --- a/pkgs/development/compilers/openjdk/openjfx/13.nix +++ b/pkgs/development/compilers/openjdk/openjfx/14.nix @@ -1,22 +1,24 @@ -{ stdenv, lib, fetchurl, writeText, openjdk11_headless, gradleGen +{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen , pkgconfig, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib , ffmpeg, python, ruby }: let - major = "13"; - update = ".0.2"; - build = "1"; - repover = "${major}${update}+${build}"; + major = "14"; + update = ""; + build = "-ga"; + repover = "${major}${update}${build}"; gradle_ = (gradleGen.override { java = openjdk11_headless; - }).gradle_4_10; + }).gradle_5_6; makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}-${build}"; + version = "${major}${update}${build}"; - src = fetchurl { - url = "https://hg.openjdk.java.net/openjfx/${major}-dev/rt/archive/${repover}.tar.gz"; - sha256 = "1si9wpb9malnf8zzz57l6b80088z2370zfxp1b0kk6rs0cnvpr74"; + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx"; + rev = repover; + sha256 = "16aj15xksc266gv3y42m0g277pfvp71901lrngndcnpr7i2zshnr"; }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ]; @@ -75,9 +77,6 @@ in makePackage { COMPILE_WEBKIT = true ''; - #openjdk build fails if licenses are identical, so we must patch this trivial difference - patches = [ ./openjfx-mesa-license.patch ]; - preBuild = '' swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" substituteInPlace build.gradle \ @@ -107,7 +106,7 @@ in makePackage { passthru.deps = deps; meta = with stdenv.lib; { - homepage = http://openjdk.java.net/projects/openjfx/; + homepage = "http://openjdk.java.net/projects/openjfx/"; license = licenses.gpl2; description = "The next-generation Java client toolkit."; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/openjfx-mesa-license.patch b/pkgs/development/compilers/openjdk/openjfx/openjfx-mesa-license.patch deleted file mode 100644 index d3bf9e17c22bc..0000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/openjfx-mesa-license.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/modules/javafx.graphics/src/main/legal/mesa3d.md 1969-12-31 19:00:01.000000000 -0500 -+++ b/modules/javafx.graphics/src/main/legal/mesa3d.md 2019-08-08 01:05:04.000000000 -0400 -@@ -1,7 +1,7 @@ - ## Mesa 3-D Graphics Library v5.0 - - ### Mesa License --``` -+<pre> - - Mesa 3-D graphics library - Version: 5.0 -@@ -25,4 +25,4 @@ - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --``` -+</pre> diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/development/compilers/openspin/default.nix index b1e95bb704cbb..fe10f43abd5ef 100644 --- a/pkgs/development/compilers/openspin/default.nix +++ b/pkgs/development/compilers/openspin/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Compiler for SPIN/PASM languages for Parallax Propeller MCU"; - homepage = https://github.com/parallaxinc/OpenSpin; + homepage = "https://github.com/parallaxinc/OpenSpin"; license = licenses.mit; maintainers = [ maintainers.redvers ]; platforms = platforms.all; diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index ed313a9d00e78..3c4a2b7850f13 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -1,10 +1,10 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "241"; - sha256.i686-linux = "1niiwifby8zqvsh0ccdf3n21vlqfvvms223dc3kw2c2rksch3yg4"; - sha256.x86_64-linux = "1jz8d6663jspxgw8yxxx5ca6jaa3g67dbbi5d83pdxjmg1kk57a1"; - sha256.armv7l-linux = "1pjzyi1qd4nzfwvh0z5fpwga7j8mksiv5h8wzirv2ccdyy4wqw24"; - sha256.aarch64-linux = "1zliv4a0ygrsdpq36b89yl7jf7kidmxqbnp1sk2661y471x02p9l"; + patchVersion = "251"; + sha256.i686-linux = "0c6d25c09459e435570204f1a22a1cb765ce5d62c5bced92c9a9546b7be337f2"; + sha256.x86_64-linux = "777a8d689e863275a647ae52cb30fd90022a3af268f34fc5b9867ce32f1b374e"; + sha256.armv7l-linux = "f1b0c979e1b61ec52ebd5e1d0b754d7681d8623b09ac90c69718a553ef9b0cd1"; + sha256.aarch64-linux = "58baeaab7da97dd5a6b02ad2dcd77c14b3b6ba014029ee67dbc2bd5f0fa98d1b"; jceName = "jce_policy-8.zip"; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; } diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 987c86ba26490..34e79945f612a 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The Oil Runtime Compiler"; - homepage = https://gstreamer.freedesktop.org/projects/orc.html; + homepage = "https://gstreamer.freedesktop.org/projects/orc.html"; # The source code implementing the Marsenne Twister algorithm is licensed # under the 3-clause BSD license. The rest is 2-clause BSD license. license = with licenses; [ bsd3 bsd2 ]; diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 59c15f7d38fb6..e9ca1bf35b880 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -31,7 +31,7 @@ in clangStdenv.mkDerivation rec { # TODO: How important is partio? CMake doesn't seem to find it meta = with stdenv.lib; { description = "Advanced shading language for production GI renderers"; - homepage = http://opensource.imageworks.com/?p=osl; + homepage = "http://opensource.imageworks.com/?p=osl"; maintainers = with maintainers; [ hodapp ]; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 94b6daa888e5b..0183039b11d8a 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -77,7 +77,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.informatik.uni-kiel.de/~pakcs/; + homepage = "http://www.informatik.uni-kiel.de/~pakcs/"; description = "An implementation of the multi-paradigm declarative language Curry"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/pforth/default.nix b/pkgs/development/compilers/pforth/default.nix index 67d444428e928..c13d28c6a3bbf 100644 --- a/pkgs/development/compilers/pforth/default.nix +++ b/pkgs/development/compilers/pforth/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Portable ANSI style Forth written in ANSI C"; - homepage = http://www.softsynth.com/pforth/; + homepage = "http://www.softsynth.com/pforth/"; license = stdenv.lib.licenses.publicDomain; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ yrashk ]; diff --git a/pkgs/development/compilers/picat/default.nix b/pkgs/development/compilers/picat/default.nix index 87af63c671a56..91e29a740c2fb 100644 --- a/pkgs/development/compilers/picat/default.nix +++ b/pkgs/development/compilers/picat/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "2.8-2"; src = fetchurl { - url = http://picat-lang.org/download/picat28_src.tar.gz; + url = "http://picat-lang.org/download/picat28_src.tar.gz"; sha256 = "10hf2fxxbpq28gi39icr8c9wafdiy9ddfkk6l4rx7kkqyrdi7n85"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation { Picat is a simple, and yet powerful, logic-based multi-paradigm programming language aimed for general-purpose applications. ''; - homepage = http://picat-lang.org/; + homepage = "http://picat-lang.org/"; license = stdenv.lib.licenses.mpl20; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.earldouglas ]; diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix index 70a56e6f41ed6..714adfb0e4cba 100644 --- a/pkgs/development/compilers/polyml/5.6.nix +++ b/pkgs/development/compilers/polyml/5.6.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { longDescription = '' Poly/ML is a full implementation of Standard ML. ''; - homepage = https://www.polyml.org/; + homepage = "https://www.polyml.org/"; license = stdenv.lib.licenses.lgpl21; platforms = with stdenv.lib.platforms; linux; maintainers = [ #Add your name here! diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix index 5b2d127f377f6..ce8c033e4bedf 100644 --- a/pkgs/development/compilers/polyml/5.7.nix +++ b/pkgs/development/compilers/polyml/5.7.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { longDescription = '' Poly/ML is a full implementation of Standard ML. ''; - homepage = https://www.polyml.org/; + homepage = "https://www.polyml.org/"; license = licenses.lgpl21; platforms = with platforms; (linux ++ darwin); maintainers = with maintainers; [ maggesi ]; diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index dafcdc3d6868c..657673465375d 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { longDescription = '' Poly/ML is a full implementation of Standard ML. ''; - homepage = https://www.polyml.org/; + homepage = "https://www.polyml.org/"; license = licenses.lgpl21; platforms = with platforms; (linux ++ darwin); maintainers = with maintainers; [ maggesi kovirobi ]; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 250690cefe8bf..e48e454a0a402 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation ( rec { meta = with stdenv.lib; { description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language"; - homepage = https://www.ponylang.org; + homepage = "https://www.ponylang.org"; license = licenses.bsd2; maintainers = with maintainers; [ doublec kamilchm patternspandemic ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index 23e7f3b28f7f3..0a526023902fb 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple dependency manager for the Pony language."; - homepage = https://www.ponylang.org; + homepage = "https://www.ponylang.org"; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ dipinhora kamilchm patternspandemic ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 94ed520ee6c17..5c452d6925385 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://reasonml.github.io/; + homepage = "https://reasonml.github.io/"; description = "Facebook's friendly syntax to OCaml"; license = licenses.mit; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index 06202901563e4..9ae7e51e5fef8 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -25,7 +25,7 @@ rec { inherit src; meta = with stdenv.lib; { - homepage = http://www.rust-lang.org/; + homepage = "http://www.rust-lang.org/"; description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ qknight ]; license = [ licenses.mit licenses.asl20 ]; @@ -71,7 +71,7 @@ rec { inherit src; meta = with stdenv.lib; { - homepage = http://www.rust-lang.org/; + homepage = "http://www.rust-lang.org/"; description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ qknight ]; license = [ licenses.mit licenses.asl20 ]; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 6625367262a0f..65614b9480e7c 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage { doCheck = false; meta = with stdenv.lib; { - homepage = https://crates.io; + homepage = "https://crates.io"; description = "Downloads your Rust project's dependencies and builds your project"; maintainers = with maintainers; [ retrry ]; license = [ licenses.mit licenses.asl20 ]; diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index 9793eee1708b6..f8ed0bce2e0d4 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A tool for formatting Rust code according to style guidelines"; - homepage = https://github.com/rust-lang-nursery/rustfmt; + homepage = "https://github.com/rust-lang-nursery/rustfmt"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ globin basvandijk ]; platforms = platforms.all; diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 9c777cc75728e..81afe64ed5378 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lisp compiler"; - homepage = http://www.sbcl.org; + homepage = "http://www.sbcl.org"; license = licenses.publicDomain; # and FreeBSD maintainers = [maintainers.raskin maintainers.tohl]; platforms = attrNames options; diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix index 16e0389ad0311..d41442afaf130 100644 --- a/pkgs/development/compilers/scala/2.10.nix +++ b/pkgs/development/compilers/scala/2.10.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { Code sizes are typically reduced by a factor of two to three when compared to an equivalent Java application. ''; - homepage = https://www.scala-lang.org/; + homepage = "https://www.scala-lang.org/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; branch = "2.10"; diff --git a/pkgs/development/compilers/scala/2.11.nix b/pkgs/development/compilers/scala/2.11.nix index db1a8f4edcad7..d8fcd3f9a88f1 100644 --- a/pkgs/development/compilers/scala/2.11.nix +++ b/pkgs/development/compilers/scala/2.11.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { Code sizes are typically reduced by a factor of two to three when compared to an equivalent Java application. ''; - homepage = https://www.scala-lang.org/; + homepage = "https://www.scala-lang.org/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; branch = "2.11"; diff --git a/pkgs/development/compilers/scala/2.12.nix b/pkgs/development/compilers/scala/2.12.nix index 3f61669b938d5..4c9d57624f72c 100644 --- a/pkgs/development/compilers/scala/2.12.nix +++ b/pkgs/development/compilers/scala/2.12.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { Code sizes are typically reduced by a factor of two to three when compared to an equivalent Java application. ''; - homepage = https://www.scala-lang.org/; + homepage = "https://www.scala-lang.org/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/scala/2.13.nix b/pkgs/development/compilers/scala/2.13.nix index b140d4e2a2db6..04086321bef1d 100644 --- a/pkgs/development/compilers/scala/2.13.nix +++ b/pkgs/development/compilers/scala/2.13.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.13.1"; + name = "scala-2.13.2"; src = fetchurl { url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "1nq49acx3j6vnw0lhyrfqa23f671y3kc9lja4nki0j73jk2cq639"; + sha256 = "1gvdxwlhgjmn8i5a8kcp19700rscjq9ylb35p8vj7nqys94zjkap"; }; propagatedBuildInputs = [ jre ] ; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { Code sizes are typically reduced by a factor of two to three when compared to an equivalent Java application. ''; - homepage = https://www.scala-lang.org/; + homepage = "https://www.scala-lang.org/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix index 675e91b302a79..d3f126052f5d4 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, ncurses }: stdenv.mkDerivation rec { - version = "0.20.0-RC1"; + version = "0.23.0-RC1"; pname = "dotty-bare"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz"; - sha256 = "08qs3m32cbh6516gcwraa1b5k935awmjxls6kg6xll722hkdd9l6"; + sha256 = "0c64dw2qp8mhgsll8viqaiy34wq1ablkbc4bi813a1r4nqg57sv0"; }; propagatedBuildInputs = [ jre ncurses.dev ] ; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { and try to boil down Scala’s types into a smaller set of more fundamental constructs. The theory behind these constructs is researched in DOT, a calculus for dependent object types. ''; - homepage = http://dotty.epfl.ch/; + homepage = "http://dotty.epfl.ch/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [maintainers.karolchmist maintainers.virusdave]; diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index e87f758bcde0b..3d3d43a55e506 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { Rabbit 3000A). Work is in progress on supporting the Microchip PIC16 and PIC18 targets. It can be retargeted for other microprocessors. ''; - homepage = http://sdcc.sourceforge.net/; + homepage = "http://sdcc.sourceforge.net/"; license = with licenses; if (gputils == null) then gpl2 else unfreeRedistributable; maintainers = with maintainers; [ bjornfor yorickvp ]; platforms = platforms.all; diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix index f6b732f02aeb7..580fc3b761dbf 100644 --- a/pkgs/development/compilers/seexpr/default.nix +++ b/pkgs/development/compilers/seexpr/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ cmake libGLU libpng zlib qt4 pythonPackages.pyqt4 bison flex ]; meta = with stdenv.lib; { description = "Embeddable expression evaluation engine from Disney Animation"; - homepage = https://www.disneyanimation.com/technology/seexpr.html; + homepage = "https://www.disneyanimation.com/technology/seexpr.html"; maintainers = with maintainers; [ hodapp ]; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix index 6f1156897db9f..2459127f425a9 100644 --- a/pkgs/development/compilers/serpent/default.nix +++ b/pkgs/development/compilers/serpent/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { style, and at the same time adding special domain-specific features for contract programming. ''; - homepage = https://github.com/ethereum/wiki/wiki/Serpent; + homepage = "https://github.com/ethereum/wiki/wiki/Serpent"; license = with licenses; [ wtfpl ]; maintainers = with maintainers; [ chris-martin ]; platforms = with platforms; linux; diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix index e2103fb718fad..55d96266ac976 100644 --- a/pkgs/development/compilers/smlnj/bootstrap.nix +++ b/pkgs/development/compilers/smlnj/bootstrap.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Compiler for the Standard ML '97 programming language"; - homepage = http://www.smlnj.org; + homepage = "http://www.smlnj.org"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.darwin; maintainers = [ stdenv.lib.maintainers.jwiegley ]; diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index a79c9a702c4f3..18562bc487aab 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -81,7 +81,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Standard ML of New Jersey, a compiler"; - homepage = http://smlnj.org; + homepage = "http://smlnj.org"; license = licenses.bsd3; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 0f71ed79e7ee3..ac4bc324868a1 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, boost, cmake, ncurses, python2 +{ stdenv, fetchzip, boost, cmake, ncurses, python3, coreutils , z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null , cln ? null, gmp ? null }: @@ -7,7 +7,7 @@ assert z3Support -> z3 != null && stdenv.lib.versionAtLeast z3.version "4.6.0"; assert cvc4Support -> cvc4 != null && cln != null && gmp != null; let - jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.9.2.tar.gz; + jsoncppURL = "https://github.com/open-source-parsers/jsoncpp/archive/1.9.2.tar.gz"; jsoncpp = fetchzip { url = jsoncppURL; sha256 = "037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg"; @@ -16,12 +16,12 @@ in stdenv.mkDerivation rec { pname = "solc"; - version = "0.5.15"; + version = "0.6.8"; # upstream suggests avoid using archive generated by github src = fetchzip { url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz"; - sha256 = "1nfvsaci5ja5ss603z04197wndwkvcq9nm5mdab1kpdr91djxh2y"; + sha256 = "1nxds6c10hjqjjk893qw2yljws57li0xigbf3ih85y8y6d587ph0"; }; postPatch = '' @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost ] ++ stdenv.lib.optionals z3Support [ z3 ] ++ stdenv.lib.optionals cvc4Support [ cvc4 cln gmp ]; - checkInputs = [ ncurses python2 ]; + checkInputs = [ ncurses python3 ]; # Test fails on darwin for unclear reason doCheck = stdenv.hostPlatform.isLinux; @@ -56,13 +56,7 @@ stdenv.mkDerivation rec { pushd .. # IPC tests need aleth avaliable, so we disable it sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh - for i in ./scripts/*.sh; do - patchShebangs "$i" - done - for i in ./scripts/*.py; do - patchShebangs "$i" - done - for i in ./test/*.sh; do + for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh; do patchShebangs "$i" done TERM=xterm ./scripts/tests.sh @@ -71,7 +65,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compiler for Ethereum smart contract language Solidity"; - homepage = https://github.com/ethereum/solidity; + homepage = "https://github.com/ethereum/solidity"; license = licenses.gpl3; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ dbrock akru lionello sifmelcara ]; diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 1ee0b9ed0cc88..73af5f0c9852e 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/KhronosGroup/SPIRV-LLVM-Translator; + homepage = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator"; description = "A tool and a library for bi-directional translation between SPIR-V and LLVM IR"; license = licenses.ncsa; platforms = platforms.all; diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index c8379fe90909f..4687ce86a90aa 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { capabilities. It also includes a customisable framework for creating dynamic HTTP servers and interactively extensible Web sites. ''; - homepage = http://squeakvm.org/; - downloadPage = http://squeakvm.org/unix/index.html; + homepage = "http://squeakvm.org/"; + downloadPage = "http://squeakvm.org/unix/index.html"; license = with licenses; [ asl20 mit ]; platforms = platforms.linux; }; diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix index 09045ee2c11e8..430bc251b4bd9 100644 --- a/pkgs/development/compilers/stalin/default.nix +++ b/pkgs/development/compilers/stalin/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.ece.purdue.edu/~qobi/software.html; + homepage = "http://www.ece.purdue.edu/~qobi/software.html"; license = stdenv.lib.licenses.gpl2Plus; description = "Stalin, an optimizing Scheme compiler"; diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 25accf8c94934..0cd1f704421e3 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -317,7 +317,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The Swift Programming Language"; - homepage = https://github.com/apple/swift; + homepage = "https://github.com/apple/swift"; maintainers = with maintainers; [ dtzWill ]; license = licenses.asl20; # Swift doesn't support 32bit Linux, unknown on other platforms. diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 63557d61019a5..e8478828c1b08 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A low-level counterpart to Lua"; - homepage = http://terralang.org/; + homepage = "http://terralang.org/"; platforms = platforms.x86_64; maintainers = with maintainers; [ jb55 thoughtpolice ]; license = licenses.mit; diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix index 41cc9b3860678..6768d0c1cbed0 100644 --- a/pkgs/development/compilers/teyjus/default.nix +++ b/pkgs/development/compilers/teyjus/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An efficient implementation of the Lambda Prolog language"; - homepage = https://github.com/teyjus/teyjus; + homepage = "https://github.com/teyjus/teyjus"; license = stdenv.lib.licenses.gpl3; maintainers = [ maintainers.bcdarwin ]; platforms = platforms.linux; diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index 412dfa53feb16..b3176cac78a33 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -1,18 +1,32 @@ { lib, buildGoModule, fetchFromGitHub, llvm, clang-unwrapped, lld, avrgcc -, avrdude, openocd, gcc-arm-embedded, makeWrapper }: +, avrdude, openocd, gcc-arm-embedded, makeWrapper, fetchurl }: +let main = ./main.go; + gomod = ./go.mod; +in buildGoModule rec { pname = "tinygo"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "tinygo-org"; repo = "tinygo"; rev = "v${version}"; - sha256 = "0dw3kxf55p617pb0bj3knsqcfvap5scxlvhh3a9g9ia92kann4v1"; + sha256 = "0das5z5y2x1970yi9c4yssxvwrrjhdmsj495q0r5mb02amvc954v"; }; + + overrideModAttrs = (_: { + patches = []; + preBuild = '' + rm -rf * + cp ${main} main.go + cp ${gomod} go.mod + ''; + }); - modSha256 = "1bjq4vaf38hi204lr9w3r3wcy1rzj06ygi5gzfa7dl3kx10hw6p0"; + preBuild = "cp ${gomod} go.mod"; + + vendorSha256 = "19194dlzpl6zzw2gqybma5pwip71rw8z937f104k6c158qzzgy62"; enableParallelBuilding = true; subPackages = [ "." ]; buildInputs = [ llvm clang-unwrapped makeWrapper ]; diff --git a/pkgs/development/compilers/tinygo/go.mod b/pkgs/development/compilers/tinygo/go.mod new file mode 100644 index 0000000000000..f01b38d3e5127 --- /dev/null +++ b/pkgs/development/compilers/tinygo/go.mod @@ -0,0 +1,13 @@ +module github.com/tinygo-org/tinygo + +go 1.14 + +require ( + github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2 + github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf + github.com/marcinbor85/gohex v0.0.0-20180128172054-7a43cd876e46 + go.bug.st/serial v1.0.0 + golang.org/x/tools v0.0.0-20200512001501-aaeff5de670a + google.golang.org/appengine v1.4.0 + tinygo.org/x/go-llvm v0.0.0-20200401165421-8d120882fc7a +) diff --git a/pkgs/development/compilers/tinygo/main.go b/pkgs/development/compilers/tinygo/main.go new file mode 100644 index 0000000000000..050cf8afe39f1 --- /dev/null +++ b/pkgs/development/compilers/tinygo/main.go @@ -0,0 +1,18 @@ +package main + +import ( + "fmt" + + _ "github.com/blakesmith/ar" + _ "github.com/google/shlex" + _ "github.com/marcinbor85/gohex" + _ "go.bug.st/serial" + _ "golang.org/x/tools/go/ast/astutil" + _ "golang.org/x/tools/go/ssa" + _ "google.golang.org/appengine" + _ "tinygo.org/x/go-llvm" +) + +func main() { + fmt.Println("vim-go") +} diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index c24786cd9a04d..c17f85b4936a1 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -4,18 +4,18 @@ stdenv.mkDerivation rec { pname = "unison-code-manager"; - milestone_id = "M1h"; + milestone_id = "M1l"; version = "1.0.${milestone_id}-alpha"; src = if (stdenv.isDarwin) then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz"; - sha256 = "0iivm5gmbk0fq0zr3lvck6p1c2i7i54l3rf70z677529w9irzchp"; + sha256 = "0qbxakrp3p3k3k8a1m2g24ivs3c8j5rj7ij84i7k548505rva9qr"; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz"; - sha256 = "0fb84c1yn8pidflh7kq696j3v4blkvbk1fsqp36h30p7vv676yci"; + sha256 = "152yzv7j4nyp228ngzbhki9fid1xdqrjvl1rwxc05wq30jwwqx0x"; }; # The tarball is just the prebuilt binary, in the archive root. @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Modern, statically-typed purely functional language"; - homepage = https://unisonweb.org/; + homepage = "https://unisonweb.org/"; license = with licenses; [ mit bsd3 ]; maintainers = [ maintainers.virusdave ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/development/compilers/urn/default.nix index f3ff864f81b13..812792a125eab 100644 --- a/pkgs/development/compilers/urn/default.nix +++ b/pkgs/development/compilers/urn/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://urn-lang.com; + homepage = "https://urn-lang.com"; description = "Yet another Lisp variant which compiles to Lua"; license = licenses.bsd3; maintainers = with maintainers; [ CrazedProgrammer ]; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 792b8d9ea620b..34e6835fc1f67 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -94,7 +94,7 @@ let meta = with stdenv.lib; { description = "Compiler for GObject type system"; - homepage = https://wiki.gnome.org/Projects/Vala; + homepage = "https://wiki.gnome.org/Projects/Vala"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg worldofpeace ]; diff --git a/pkgs/development/compilers/wcc/default.nix b/pkgs/development/compilers/wcc/default.nix index d21d886367f37..b6030da49d3ff 100644 --- a/pkgs/development/compilers/wcc/default.nix +++ b/pkgs/development/compilers/wcc/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/endrazine/wcc; + homepage = "https://github.com/endrazine/wcc"; description = "Witchcraft compiler collection: tools to convert and script ELF files"; license = licenses.mit; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/compilers/wla-dx/default.nix b/pkgs/development/compilers/wla-dx/default.nix index 5f83845a12a94..f50d9e0598b1f 100644 --- a/pkgs/development/compilers/wla-dx/default.nix +++ b/pkgs/development/compilers/wla-dx/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = http://www.villehelin.com/wla.html; + homepage = "http://www.villehelin.com/wla.html"; description = "Yet Another GB-Z80/Z80/6502/65C02/6510/65816/HUC6280/SPC-700 Multi Platform Cross Assembler Package"; license = licenses.gpl2; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix index 147ec13c5556a..cc4788e3ce03f 100644 --- a/pkgs/development/compilers/x11basic/default.nix +++ b/pkgs/development/compilers/x11basic/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://x11-basic.sourceforge.net/; + homepage = "http://x11-basic.sourceforge.net/"; description = "A Basic interpreter and compiler with graphics capabilities."; license = licenses.gpl2; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index e6fdd03bb6781..100fb236c838b 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fpermissive"; meta = { - homepage = http://www.dcc.fc.up.pt/~vsc/Yap/; + homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/"; description = "A ISO-compatible high-performance Prolog compiler"; license = stdenv.lib.licenses.artistic2; diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix index 5aea623b91d4f..923a11c1466a8 100644 --- a/pkgs/development/compilers/yasm/default.nix +++ b/pkgs/development/compilers/yasm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://www.tortall.net/projects/yasm/; + homepage = "http://www.tortall.net/projects/yasm/"; description = "Complete rewrite of the NASM assembler"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index 961e28da82e7f..20ce0b5ff5eea 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,26 +1,48 @@ -{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib }: +{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib, substituteAll }: -stdenv.mkDerivation rec { - version = "0.5.0"; +llvmPackages.stdenv.mkDerivation rec { + version = "0.6.0"; pname = "zig"; src = fetchFromGitHub { owner = "ziglang"; repo = pname; rev = version; - sha256 = "0xyl0riakh6kwb3yvxihb451kqs4ai4q0aygqygnlb2rlr1dn1zb"; + sha256 = "13dwm2zpscn4n0p5x8ggs9n7mwmq9cgip383i3qqphg7m3pkls8z"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 zlib ]; + buildInputs = [ + llvmPackages.clang-unwrapped + llvmPackages.llvm + llvmPackages.lld + libxml2 + zlib + ]; + + patches = [ + (substituteAll { + src = ./llvm10_polly.patch; + llvm_extras = "-Wl,${llvmPackages.llvm}/lib/LLVMPolly.so"; + }) + ]; preBuild = '' export HOME=$TMPDIR; ''; + checkPhase = '' + runHook preCheck + ./zig test $src/test/stage1/behavior.zig + runHook postCheck + ''; + + doCheck = true; + meta = with stdenv.lib; { - description = "Programming languaged designed for robustness, optimality, and clarity"; - homepage = https://ziglang.org/; + description = + "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; + homepage = "https://ziglang.org/"; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.andrewrk ]; diff --git a/pkgs/development/compilers/zig/llvm10_polly.patch b/pkgs/development/compilers/zig/llvm10_polly.patch new file mode 100644 index 0000000000000..72449c35d91ff --- /dev/null +++ b/pkgs/development/compilers/zig/llvm10_polly.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 97608cddf..e451c0711 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -369,4 +369,5 @@ target_link_libraries(zig_cpp LINK_PUBLIC + ${CLANG_LIBRARIES} + ${LLD_LIBRARIES} + ${LLVM_LIBRARIES} ++ @llvm_extras@ + ) diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index d05ec1a682aad..ed3d67ff86219 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = https://www.azul.com/products/zulu/; + homepage = "https://www.azul.com/products/zulu/"; license = licenses.gpl2; description = "Certified builds of OpenJDK"; longDescription = '' diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 5fe2473bac6d6..d13e574a81a14 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = https://www.azul.com/products/zulu/; + homepage = "https://www.azul.com/products/zulu/"; license = licenses.gpl2; description = "Certified builds of OpenJDK"; longDescription = '' diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index d145586af43be..1346ec92fade3 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://color.inria.fr/; + homepage = "http://color.inria.fr/"; description = "CoLoR is a library of formal mathematical definitions and proofs of theorems on rewriting theory and termination whose correctness has been mechanically checked by the Coq proof assistant."; maintainers = with maintainers; [ jpas jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/pkgs/development/coq-modules/HoTT/default.nix index fb01da8d59cc0..7b52838505e2c 100644 --- a/pkgs/development/coq-modules/HoTT/default.nix +++ b/pkgs/development/coq-modules/HoTT/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://homotopytypetheory.org/; + homepage = "http://homotopytypetheory.org/"; description = "Homotopy type theory"; maintainers = with maintainers; [ siddharthist ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index c1894d3666c69..7f3c77c75e614 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/QuickChick/QuickChick; + homepage = "https://github.com/QuickChick/QuickChick"; description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index ee08af40c51ee..9507dc6751ae6 100644 --- a/pkgs/development/coq-modules/autosubst/default.nix +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "5b40a32e"; src = fetchgit { - url = git://github.com/uds-psl/autosubst.git; + url = "git://github.com/uds-psl/autosubst.git"; rev = "1c3bb3bbf5477e3b33533a0fc090399f45fe3034"; sha256 = "06pcjbngzwqyncvfwzz88j33wvdj9kizxyg5adp7y6186h8an341"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = with stdenv.lib; { - homepage = https://www.ps.uni-saarland.de/autosubst/; + homepage = "https://www.ps.uni-saarland.de/autosubst/"; description = "Automation for de Bruijn syntax and substitution in Coq"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index d61d5968ea037..0e8cead0b31ef 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -18,8 +18,8 @@ let params = { sha256 = "03qz1w2xb2j5p06liz5yyafl0fl9vprcqm6j0iwi7rxwghl00p01"; }; "8.10" = { - rev = "V8.10+beta1"; - sha256 = "1slw227idwjw9a21vj3s6kal22mrmvvlpg8r7xk590ml99bn6404"; + rev = "V8.10.0"; + sha256 = "0bpb4flckn4nqxbs3wjiznyx1k7r8k93qdigp3qwmikp2lxvcbw5"; }; "8.11" = { rev = "V8.11.0"; diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index 025a67a1e70b1..1178b1558ff78 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { name = "coq${coq.coq-version}-category-theory-${param.version}"; src = fetchgit { - url = git://github.com/jwiegley/category-theory.git; + url = "git://github.com/jwiegley/category-theory.git"; inherit (param) rev sha256; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/jwiegley/category-theory; + homepage = "https://github.com/jwiegley/category-theory"; description = "A formalization of category theory in Coq for personal study and practical work"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix index 8362c704d95f7..d2787f0948e00 100644 --- a/pkgs/development/coq-modules/contribs/default.nix +++ b/pkgs/development/coq-modules/contribs/default.nix @@ -1031,10 +1031,10 @@ let mkContrib = repo: revs: param: sha256 = "0iwkpmc22nwasrk4g7ki4s5y05zjs7kmqk3j98giwp2wiavhgapn"; }; - zorns-lemma = mkContrib "zorns-lemma" [ "8.6" "8.7" "8.8" "8.9" ] { - version = "v8.9.0"; - rev = "6ac9bb914f6017cdd9a544ff4b0bef73fd33b44c"; - sha256 = "1vdsl5gxpadkjjjw314s4fawzlssdmp4qkwrjz5qdmyl2dcpil4p"; + zorns-lemma = mkContrib "zorns-lemma" [ "8.10" "8.11" ] { + version = "v8.11.0"; + rev = "a573b50fff994f996b8e15dec2079490a5233dc6"; + sha256 = "0jbp1ay6abal66glbablbqsh5hzgd5fv81dc1vzn65jw0iiznxyq"; }; zsearch-trees = mkContrib "zsearch-trees" [ "8.6" "8.7" ] { diff --git a/pkgs/development/coq-modules/coq-bits/default.nix b/pkgs/development/coq-modules/coq-bits/default.nix index ed6118dbb55d0..05dcb7898e50e 100644 --- a/pkgs/development/coq-modules/coq-bits/default.nix +++ b/pkgs/development/coq-modules/coq-bits/default.nix @@ -9,9 +9,9 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "coq-community"; - repo = "coq-bits"; - rev = "f74498a6c67e97d9565e139d62be8eaae7111f06"; - sha256 = "1ibg37qxgkmpbpvc78qcb179bcnzl149z1kzwdm8n98xk5ibavrf"; + repo = "bits"; + rev = "1.0.0"; + sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl"; }; buildInputs = [ coq ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/coq-community/coq-bits; + homepage = "https://github.com/coq-community/coq-bits"; description = "A formalization of bitset operations in Coq"; license = licenses.asl20; maintainers = with maintainers; [ ptival ]; diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 8bbf74b607841..17f9c2c46114d 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = with stdenv.lib; { - homepage = https://github.com/coq-ext-lib/coq-ext-lib; + homepage = "https://github.com/coq-ext-lib/coq-ext-lib"; description = "A collection of theories and plugins that may be useful in other Coq developments"; maintainers = with maintainers; [ jwiegley ptival ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/coq-extensible-records/default.nix b/pkgs/development/coq-modules/coq-extensible-records/default.nix index 3b93b6b2de22c..531c152876165 100644 --- a/pkgs/development/coq-modules/coq-extensible-records/default.nix +++ b/pkgs/development/coq-modules/coq-extensible-records/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/gmalecha/coq-extensible-records; + homepage = "https://github.com/gmalecha/coq-extensible-records"; description = "Implementation of extensible records in Coq"; license = licenses.mit; maintainers = with maintainers; [ ptival ]; diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix index e9263fb2be1e4..7c86a7d55f340 100644 --- a/pkgs/development/coq-modules/coq-haskell/default.nix +++ b/pkgs/development/coq-modules/coq-haskell/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { name = "coq${coq.coq-version}-coq-haskell-${param.version}"; src = fetchgit { - url = git://github.com/jwiegley/coq-haskell.git; + url = "git://github.com/jwiegley/coq-haskell.git"; inherit (param) rev sha256; }; @@ -48,7 +48,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/jwiegley/coq-haskell; + homepage = "https://github.com/jwiegley/coq-haskell"; description = "A library for formalizing Haskell types and functions in Coq"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix index 7d9ec5e7312b3..16813ac4f1195 100644 --- a/pkgs/development/coq-modules/coqhammer/default.nix +++ b/pkgs/development/coq-modules/coqhammer/default.nix @@ -13,8 +13,12 @@ let buildInputs = [ coq.ocamlPackages.camlp5 ]; }; "8.10" = { - version = "1.1.1"; - sha256 = "0b6r7bsygl1axbqybkhkr7zlwcd51ski5ql52994klrrxvjd58df"; + version = "1.2"; + sha256 = "1ir313mmkgp2c65wgw8c681a15clvri1wb1hyjqmj7ymx4shkl56"; + }; + "8.11" = { + version = "1.2"; + sha256 = "1w317h7r5llyamzn1kqb8j6p5sxks2j8vq8wnpzrx01jqbyibxgy"; }; }; param = params.${coq.coq-version}; diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index aaf867baf2582..a049fa94d415d 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -1,22 +1,26 @@ -{ stdenv, fetchFromGitHub, coq, bignums }: - -let params = - let v_8_8 = { - version = "8.8"; - sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5"; - }; - in - { - "8.7" = { - version = "8.7.2"; - sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k"; - }; - "8.8" = v_8_8; - "8.9" = v_8_8; - "8.10" = v_8_8; - }; - param = params.${coq.coq-version} -; in +{ stdenv, which, fetchFromGitHub, coq, bignums }: + +let + params = + let v_8_8 = { + version = "8.8"; + sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5"; + }; + in + { + "8.7" = { + version = "8.7.2"; + sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k"; + }; + "8.8" = v_8_8; + "8.9" = v_8_8; + "8.10" = { + version = "8.10"; + sha256 = "0r9gnh5a5ykiiz5h1i8xnzgiydpwc4z9qhndxyya85xq0f910qaz"; + }; + }; + param = params.${coq.coq-version}; +in stdenv.mkDerivation rec { @@ -30,7 +34,7 @@ stdenv.mkDerivation rec { inherit (param) sha256; }; - buildInputs = [ coq ]; + buildInputs = [ which coq ]; propagatedBuildInputs = [ bignums ]; diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index 3b916b5e40bb0..2eb3021ada731 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { installPhase = "./remake install"; meta = { - homepage = http://coquelicot.saclay.inria.fr/; + homepage = "http://coquelicot.saclay.inria.fr/"; description = "A Coq library for Reals"; license = stdenv.lib.licenses.lgpl3; maintainers = [ stdenv.lib.maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix index 97bb884c92e2f..14ff74506f37f 100644 --- a/pkgs/development/coq-modules/corn/default.nix +++ b/pkgs/development/coq-modules/corn/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = { - homepage = http://c-corn.github.io/; + homepage = "http://c-corn.github.io/"; license = stdenv.lib.licenses.gpl2; description = "A Coq library for constructive analysis"; maintainers = [ stdenv.lib.maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 300c5a9f44826..689745003df26 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -36,6 +36,8 @@ let params = { param = params.${coq.coq-version}; in +let hasWarning = stdenv.lib.versionAtLeast coq.ocamlPackages.ocaml.version "4.08"; in + stdenv.mkDerivation { name = "coq${coq.coq-version}-dpdgraph-${param.version}"; src = fetchFromGitHub { @@ -49,6 +51,14 @@ stdenv.mkDerivation { buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ocamlgraph ]); + # dpd_compute.ml uses deprecated Pervasives.compare + # Versions prior to 0.6.5 do not have the WARN_ERR build flag + preConfigure = stdenv.lib.optionalString hasWarning '' + substituteInPlace Makefile.in --replace "-warn-error +a " "" + ''; + + buildFlags = stdenv.lib.optional hasWarning "WARN_ERR="; + preInstall = '' mkdir -p $out/bin ''; @@ -61,7 +71,7 @@ stdenv.mkDerivation { meta = { description = "Build dependency graphs between Coq objects"; license = stdenv.lib.licenses.lgpl21; - homepage = https://github.com/Karmaki/coq-dpdgraph/; + homepage = "https://github.com/Karmaki/coq-dpdgraph/"; maintainers = with stdenv.lib.maintainers; [ vbgl ]; platforms = coq.meta.platforms; }; diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index 9ea9ac2167180..060fa3b4c81e5 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -21,15 +21,21 @@ let }; "8.9" = { - version = "1.2"; - rev = "v1.2-8.9"; - sha256 = "1q3wvicr43bgy7xn1diwh4j43mnrhprrc2xd22qlbz9cl6bhf8bj"; + version = "1.2.1"; + rev = "v1.2.1-8.9"; + sha256 = "0d8ddj6nc6p0k25cd8fs17cq427zhzbc3v9pk2wd2fnvk70nlfij"; }; "8.10" = { - version = "1.2"; - rev = "v1.2-8.10"; - sha256 = "1v5kx0xzxzsbs5r4w08rm1lrmjjggnd3ap0sd1my88ds17jzyasd"; + version = "1.2.1"; + rev = "v1.2.1-8.10-2"; + sha256 = "0j3z4l5nrbyi9zbbyqkc6kassjanwld2188mwmrbqspaypm2ys68"; + }; + + "8.11" = { + version = "1.2.1"; + rev = "v1.2.1-8.11"; + sha256 = "06k0h7lansxs479is3vj5ikg8s5k4c6svnqcwmxbni4wx8bhmg17"; }; }; param = params.${coq.coq-version}; @@ -54,7 +60,7 @@ stdenv.mkDerivation rec { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = with stdenv.lib; { - homepage = https://mattam82.github.io/Coq-Equations/; + homepage = "https://mattam82.github.io/Coq-Equations/"; description = "A plugin for Coq to add dependent pattern-matching"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix index 4abaec6528a97..fd3ade0c64b50 100644 --- a/pkgs/development/coq-modules/fiat/HEAD.nix +++ b/pkgs/development/coq-modules/fiat/HEAD.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://plv.csail.mit.edu/fiat/; + homepage = "http://plv.csail.mit.edu/fiat/"; description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index d9ad7d6e3be15..e0c32bc430edd 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://flocq.gforge.inria.fr/; + homepage = "http://flocq.gforge.inria.fr/"; description = "A floating-point formalization for the Coq system"; license = licenses.lgpl3; maintainers = with maintainers; [ jwiegley ]; diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index c610039eeec9c..eb431b9faf25c 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, which, coq, flocq }: stdenv.mkDerivation { - name = "coq${coq.coq-version}-gappalib-1.4.1"; + name = "coq${coq.coq-version}-gappalib-1.4.3"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/37917/gappalib-coq-1.4.1.tar.gz; - sha256 = "0d3f23a871haglg8hq1jgxz3y5nryiwy12b5xfnfjn279jfqqjw4"; + url = "https://gforge.inria.fr/frs/download.php/file/38302/gappalib-coq-1.4.3.tar.gz"; + sha256 = "108k9dks04wbcqz38pf0zz11hz5imbzimpnkgjrk5gp1hifih370"; }; nativeBuildInputs = [ which ]; @@ -18,13 +18,13 @@ stdenv.mkDerivation { meta = { description = "Coq support library for Gappa"; license = stdenv.lib.licenses.lgpl21; - homepage = http://gappa.gforge.inria.fr/; + homepage = "http://gappa.gforge.inria.fr/"; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (coq.meta) platforms; }; passthru = { - compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.7" "8.8" "8.9" ]; + compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.8" "8.9" "8.10" "8.11" ]; }; } diff --git a/pkgs/development/coq-modules/heq/default.nix b/pkgs/development/coq-modules/heq/default.nix index 5d3c94c5f5c88..d0445c83ca592 100644 --- a/pkgs/development/coq-modules/heq/default.nix +++ b/pkgs/development/coq-modules/heq/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}" ]; meta = with stdenv.lib; { - homepage = https://www.mpi-sws.org/~gil/Heq/; + homepage = "https://www.mpi-sws.org/~gil/Heq/"; description = "Heq : a Coq library for Heterogeneous Equality"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 73a0a07f704c8..9e78a9f38829f 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { installPhase = "./remake install"; meta = with stdenv.lib; { - homepage = http://coq-interval.gforge.inria.fr/; + homepage = "http://coq-interval.gforge.inria.fr/"; description = "Tactics for simplifying the proofs of inequalities on expressions of real numbers for the Coq proof assistant"; license = licenses.cecill-c; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index 7aad4261fd32f..9ab77418cce12 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = with stdenv.lib; { - homepage = https://math-classes.github.io; + homepage = "https://math-classes.github.io"; description = "A library of abstract interfaces for mathematical structures in Coq."; maintainers = with maintainers; [ siddharthist jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index aeb53a995e55c..140bf8ab53644 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -1,97 +1,151 @@ -{ stdenv, fetchFromGitHub, ncurses, which, graphviz, coq, - recurseIntoAttrs, withDoc ? false +############################# +# Main derivation: mathcomp # +######################################################################## +# This file mainly provides the `mathcomp` derivation, which is # +# essentially a meta-package containing all core mathcomp libraries # +# (ssreflect fingroup algebra solvable field character). They can be # +# accessed individually through the paththrough attributes of mathcomp # +# bearing the same names (mathcomp.ssreflect, etc). # +# # +# Do not use overrideAttrs, but overrideMathcomp instead, which # +# regenerate a full mathcomp derivation with sub-derivations, and # +# behave the same as `mathcomp_`, described below. # +######################################################################## + +############################################################ +# Compiling a custom version of mathcomp using `mathcomp_` # +############################################################################## +# The prefered way to compile a custom version of mathcomp (other than a # +# released version which should be added to `mathcomp-config-initial` # +# and pushed to nixpkgs), is to apply the function `coqPackages.mathcomp_` # +# to either: # +# - a string without slash, which is interpreted as a github revision, # +# i.e. either a tag, a branch or a commit hash # +# - a string with slashes "owner/p_1/.../p_n", which is interpreted as # +# github owner "owner" and revision "p_1/.../p_n". # +# - a path which is interpreted as a local source for the repository, # +# the name of the version is taken to be the basename of the path # +# i.e. if the path is /home/you/git/package/branch/, # +# then "branch" is the name of the version # +# - an attribute set which overrides some attributes (e.g. the src) # +# if the version is updated, the name is automatically regenerated using # +# the conventional schema "coq${coq.coq-version}-${pkgname}-${version}" # +# - a "standard" override function (old: new_attrs) to override the default # +# attribute set, so that you can use old.${field} to patch the derivation. # +############################################################################## + +######################################################################### +# Example of use: https://github.com/math-comp/math-comp/wiki/Using-nix # +######################################################################### + +################################# +# Adding a new mathcomp version # +############################################################################# +# When adding a new version of mathcomp, add an attribute to `sha256` (use # +# ```sh # +# nix-prefetch-url --unpack # +# https://github.com/math-comp/math-comp/archive/version.tar.gz # +# ``` # +# to get the corresponding `sha256`) and to `coq-version` (read the release # +# notes to check which versions of coq it is compatible with). Then add # +# it in `preference version`, if not all mathcomp-extra packages are # +# ready, you might want to give new release secondary priority. # +############################################################################# + + +{ stdenv, fetchFromGitHub, ncurses, which, graphviz, + recurseIntoAttrs, withDoc ? false, + coqPackages, + mathcomp_, mathcomp, mathcomp-config, }: with builtins // stdenv.lib; let - #################################### - # CONFIGURATION (please edit this) # - #################################### - # sha256 of released mathcomp versions - mathcomp-sha256 = { - "1.10.0" = "1b9m6pwxxyivw7rgx82gn5kmgv2mfv3h3y0mmjcjfypi8ydkrlbv"; - "1.9.0" = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r"; - "1.8.0" = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp"; - "1.7.0" = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1"; - "1.6.1" = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i"; - }; - # versions of coq compatible with released mathcomp versions - mathcomp-coq-versions = { - "1.10.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; - "1.9.0" = flip elem ["8.7" "8.8" "8.9" "8.10"]; - "1.8.0" = flip elem ["8.7" "8.8" "8.9"]; - "1.7.0" = flip elem ["8.6" "8.7" "8.8" "8.9"]; - "1.6.1" = flip elem ["8.5"]; + mathcomp-config-initial = rec { + ####################################################################### + # CONFIGURATION (please edit this), it is exported as mathcomp-config # + ####################################################################### + # sha256 of released mathcomp versions + sha256 = { + "1.11.0+beta1" = "12i3zznwajlihzpqsiqniv20rklj8d8401lhd241xy4s21fxkkjm"; + "1.10.0" = "1b9m6pwxxyivw7rgx82gn5kmgv2mfv3h3y0mmjcjfypi8ydkrlbv"; + "1.9.0" = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r"; + "1.8.0" = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp"; + "1.7.0" = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1"; + "1.6.1" = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i"; + }; + # versions of coq compatible with released mathcomp versions + coq-versions = { + "1.11.0+beta1" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; + "1.10.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; + "1.9.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" ]; + "1.8.0" = flip elem [ "8.7" "8.8" "8.9" ]; + "1.7.0" = flip elem [ "8.6" "8.7" "8.8" "8.9" ]; + "1.6.1" = flip elem [ "8.5"]; + }; + + # sets the default version of mathcomp given a version of Coq + # this is currently computed using version-perference below + # but it can be set to a fixed version number + preferred-version = let v = head ( + filter (mc: mathcomp-config.coq-versions.${mc} coq.coq-version) + mathcomp-config.version-preferences ++ ["0.0.0"]); + in if v == "0.0.0" then head mathcomp-config.version-preferences else v; + + # mathcomp preferred versions by decreasing order + # (the first version in the list will be tried first) + version-preferences = + [ "1.10.0" "1.9.0" "1.11.0+beta1" "1.8.0" "1.7.0" "1.6.1" ]; + + # list of core mathcomp packages sorted by dependency order + packages = _version: # unused in current versions of mathcomp + # because the following list of packages is fixed for + # all versions of mathcomp up to 1.11.0 + [ "ssreflect" "fingroup" "algebra" "solvable" "field" "character" "all" ]; + + # compute the dependencies of the core package pkg + # (assuming the total ordering above, change if necessary) + deps = version: pkg: if pkg == "single" then [] else + (pred-split-list (x: x == pkg) (mathcomp-config.packages version)).left; }; - # computes the default version of mathcomp given a version of Coq - max-mathcomp-version = last (naturalSort (attrNames mathcomp-coq-versions)); - # mathcomp prefered version by decreasing order - # (the first version in the list will be tried first) - mathcomp-version-preference = [ "1.8.0" "1.9.0" "1.10.0" "1.7.0" "1.6.1" ]; ############################################################## # COMPUTED using the configuration above (edit with caution) # ############################################################## - default-mathcomp-version = let v = head ( - filter (mc: mathcomp-coq-versions.${mc} coq.coq-version) - mathcomp-version-preference ++ ["0.0.0"]); - in if v == "0.0.0" then max-mathcomp-version else v; - - # list of core mathcomp packages sorted by dependency order - mathcomp-packages = - [ "ssreflect" "fingroup" "algebra" "solvable" "field" "character" "all" ]; - # compute the dependencies of the core package pkg - # (assuming the total ordering above, rewrite if necessary) - mathcomp-deps = pkg: if pkg == "single" then [] else - (split (x: x == pkg) mathcomp-packages).left; # generic split function (TODO: move to lib?) - split = pred: l: + pred-split-list = pred: l: let loop = v: l: if l == [] then {left = v; right = [];} else let hd = builtins.head l; tl = builtins.tail l; in if pred hd then {left = v; right = tl;} else loop (v ++ [hd]) tl; in loop [] l; - # exported, documented at the end. - mathcompGen = mkMathcompGenFrom (_: {}) mathcomp-packages; + pkgUp = l: r: l // r // { + meta = (l.meta or {}) // (r.meta or {}); + passthru = (l.passthru or {}) // (r.passthru or {}); + }; - # exported, documented at the end. - mathcompGenSingle = mkMathcompGen (_: {}) "single"; + coq = coqPackages.coq; + mathcomp-deps = mathcomp-config.deps mathcomp.config.preferred-version; - # mkMathcompGen: internal mathcomp package generator - # returns {error = ...} if impossible to generate - # returns {${mathcomp-pkg} = <derivation>} otherwise - mkMathcompGenFrom = o: l: mcv: fold (pkg: pkgs: pkgs // mkMathcompGen o pkg mcv) {} l; - mkMathcompGen = overrides: mathcomp-pkg: mathcomp-version: + # default set of attributes given a 'package' name. + # this attribute set will be extended using toOverrideFun + default-attrs = package: let - coq-version-check = mathcomp-coq-versions.${mathcomp-version} or (_: false); - pkgpath = {single = "mathcomp";}.${mathcomp-pkg} or "mathcomp/${mathcomp-pkg}"; - pkgname = {single = "mathcomp";}.${mathcomp-pkg} or "mathcomp-${mathcomp-pkg}"; + pkgpath = if package == "single" then "mathcomp" else "mathcomp/${package}"; + pkgname = if package == "single" then "mathcomp" else "mathcomp-${package}"; pkgallMake = '' - echo "all.v" > Make - echo "-I ." >> Make - echo "-R . mathcomp.all" >> Make + echo "all.v" > Make + echo "-I ." >> Make + echo "-R . mathcomp.all" >> Make ''; - is-released = builtins.isString mathcomp-version; - custom-version = if is-released then mathcomp-version else "custom"; - - # the base set of attributes for mathcomp - attrs = { - name = "coq${coq.coq-version}-${pkgname}-${custom-version}"; - - # used in ssreflect - version = custom-version; - - src = if is-released then fetchFromGitHub { - owner = "math-comp"; - repo = "math-comp"; - rev = "mathcomp-${mathcomp-version}"; - sha256 = mathcomp-sha256.${mathcomp-version}; - } else mathcomp-version; + in + rec { + version = "master"; + name = "coq${coq.coq-version}-${pkgname}-${version}"; nativeBuildInputs = optionals withDoc [ graphviz ]; buildInputs = [ ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]); - propagatedBuildInputs = [ coq ] ++ - attrValues (mkMathcompGenFrom overrides (mathcomp-deps mathcomp-pkg) mathcomp-version); + propagatedBuildInputs = [ coq ]; enableParallelBuilding = true; buildFlags = optional withDoc "doc"; @@ -101,7 +155,7 @@ let preBuild = '' patchShebangs etc/utils/ssrcoqdep || true cd ${pkgpath} - '' + optionalString (mathcomp-pkg == "all") pkgallMake; + '' + optionalString (package == "all") pkgallMake; installPhase = '' make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install @@ -110,67 +164,98 @@ let ''; meta = with stdenv.lib; { - homepage = "https://math-comp.github.io/"; - license = licenses.cecill-b; - maintainers = [ maintainers.vbgl maintainers.jwiegley ]; - platforms = coq.meta.platforms; + homepage = "https://math-comp.github.io/"; + license = licenses.cecill-b; + maintainers = [ maintainers.vbgl maintainers.jwiegley maintainers.cohencyril ]; + platforms = coq.meta.platforms; }; passthru = { - compatibleCoqVersions = coq-version-check; - currentOverrides = overrides; - overrideMathcomp = moreOverrides: - (mkMathcompGen (old: let new = overrides old; in new // moreOverrides new) - mathcomp-pkg mathcomp-version).${mathcomp-pkg}; - mathcompGen = moreOverrides: - (mkMathcompGenFrom (old: let new = overrides old; in new // moreOverrides new) - mathcomp-packages mathcomp-version); + mathcompDeps = mathcomp-deps package; + inherit package mathcomp-config; + compatibleCoqVersions = _: true; }; }; + + # converts a string, path or attribute set into an override function + toOverrideFun = overrides: + if isFunction overrides then overrides else old: + let + pkgname = if old.passthru.package == "single" then "mathcomp" + else "mathcomp-${old.passthru.package}"; + + string-attrs = if hasAttr overrides mathcomp-config.sha256 then + let version = overrides; + in { + inherit version; + src = fetchFromGitHub { + owner = "math-comp"; + repo = "math-comp"; + rev = "mathcomp-${version}"; + sha256 = mathcomp-config.sha256.${version}; + }; + passthru = old.passthru // { + compatibleCoqVersions = mathcomp-config.coq-versions.${version}; + mathcompDeps = mathcomp-config.deps version old.passthru.package; + }; + } + else + let splitted = filter isString (split "/" overrides); + owner = head splitted; + ref = concatStringsSep "/" (tail splitted); + version = head (reverseList splitted); + in if length splitted == 1 then { + inherit version; + src = fetchTarball "https://github.com/math-comp/math-comp/archive/${version}.tar.gz"; + } else { + inherit version; + src = fetchTarball "https://github.com/${owner}/math-comp/archive/${ref}.tar.gz"; + }; + + attrs = + if overrides == null || overrides == "" then _: {} + else if isString overrides then string-attrs + else if isPath overrides then { version = baseNameOf overrides; src = overrides; } + else if isAttrs overrides then pkgUp old overrides + else let overridesStr = toString overrides; in + abort "${overridesStr} not a legitimate overrides"; + in + attrs // (if attrs?version && ! (attrs?name) + then { name = "coq${coq.coq-version}-${pkgname}-${attrs.version}"; } else {}); + + # generates {ssreflect = «derivation ...» ; ... ; character = «derivation ...», ...} + mkMathcompGenSet = pkgs: o: + fold (pkg: pkgs: pkgs // {${pkg} = mkMathcompGen pkg o;}) {} pkgs; + # generates the derivation of one mathcomp package. + mkMathcompGen = package: overrides: + let + up = x: o: x // (toOverrideFun o x); + fixdeps = attrs: + let version = attrs.version or "master"; + mcdeps = if package == "single" then {} + else mkMathcompGenSet (filter isString attrs.passthru.mathcompDeps) overrides; + allmc = mkMathcompGenSet (mathcomp-config.packages version ++ [ "single" ]) overrides; + in { + propagatedBuildInputs = [ coq ] + ++ filter isDerivation attrs.passthru.mathcompDeps + ++ attrValues mcdeps + ; + passthru = allmc // + { overrideMathcomp = o: mathcomp_ (old: up (up old overrides) o); }; + }; in - {${mathcomp-pkg} = stdenv.mkDerivation (attrs // overrides attrs);}; - -getAttrOr = a: n: a.${n} or (throw a.error); - -mathcompCorePkgs_1_7 = mathcompGen "1.7.0"; -mathcompCorePkgs_1_8 = mathcompGen "1.8.0"; -mathcompCorePkgs_1_9 = mathcompGen "1.9.0"; -mathcompCorePkgs_1_10 = mathcompGen "1.10.0"; -mathcompCorePkgs = recurseIntoAttrs - (mapDerivationAttrset dontDistribute (mathcompGen default-mathcomp-version)); - -in { -# mathcompGenSingle: given a version of mathcomp -# generates an attribute set {single = <drv>;} with the single mathcomp derivation -inherit mathcompGenSingle; -mathcomp_1_7_single = getAttrOr (mathcompGenSingle "1.7.0") "single"; -mathcomp_1_8_single = getAttrOr (mathcompGenSingle "1.8.0") "single"; -mathcomp_1_9_single = getAttrOr (mathcompGenSingle "1.9.0") "single"; -mathcomp_1_10_single = getAttrOr (mathcompGenSingle "1.10.0") "single"; -mathcomp_single = dontDistribute - (getAttrOr (mathcompGenSingle default-mathcomp-version) "single"); - -# mathcompGen: given a version of mathcomp -# generates an attribute set {ssreflect = <drv>; ... character = <drv>; all = <drv>;}. -# each of these have a special attribute overrideMathcomp which -# must be used instead of overrideAttrs in order to also fix the dependencies -inherit mathcompGen mathcompCorePkgs - mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs_1_9 - mathcompCorePkgs_1_10 - ; - - -mathcomp = getAttrOr mathcompCorePkgs "all"; -mathcomp_1_7 = getAttrOr mathcompCorePkgs_1_7 "all"; -mathcomp_1_8 = getAttrOr mathcompCorePkgs_1_8 "all"; -mathcomp_1_9 = getAttrOr mathcompCorePkgs_1_9 "all"; -mathcomp_1_10 = getAttrOr mathcompCorePkgs_1_10 "all"; - -ssreflect = getAttrOr mathcompCorePkgs "ssreflect"; - -} // -(mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = pkg;}) mathcompCorePkgs) // -(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_7"; value = pkg;}) mathcompCorePkgs_1_7) // -(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_8"; value = pkg;}) mathcompCorePkgs_1_8) // -(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_9"; value = pkg;}) mathcompCorePkgs_1_9) // -(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_10"; value = pkg;}) mathcompCorePkgs_1_10) + stdenv.mkDerivation (up (up (default-attrs package) overrides) fixdeps); +in +{ + mathcomp-config = mathcomp-config-initial; + mathcomp_ = mkMathcompGen "all"; + mathcomp = mathcomp_ mathcomp-config.preferred-version; + # mathcomp-single = mathcomp.single; + ssreflect = mathcomp.ssreflect; + mathcomp-ssreflect = mathcomp.ssreflect; + mathcomp-fingroup = mathcomp.fingroup; + mathcomp-algebra = mathcomp.algebra; + mathcomp-solvable = mathcomp.solvable; + mathcomp-field = mathcomp.field; + mathcomp-character = mathcomp.character; +} diff --git a/pkgs/development/coq-modules/mathcomp/extra.nix b/pkgs/development/coq-modules/mathcomp/extra.nix index 2df9cbe58c726..d37608658b4f5 100644 --- a/pkgs/development/coq-modules/mathcomp/extra.nix +++ b/pkgs/development/coq-modules/mathcomp/extra.nix @@ -1,202 +1,371 @@ -{ stdenv, fetchFromGitHub, coq, ssreflect, coqPackages, - recurseIntoAttrs }: +########################################################## +# Main derivation: # +# mathcomp-finmap mathcomp-analysis mathcomp-bigenough # +# mathcomp-multinomials mathcomp-real-closed coqeal # +# Additionally: # +# mathcomp-extra-all contains all the extra packages # +# mathcomp-extra-fast contains the one not marked slow # +######################################################################## +# This file mainly provides the above derivations, which are packages # +# extra mathcomp libraries based on mathcomp. # +######################################################################## + +##################################################### +# Compiling customs versions using `mathcomp-extra` # +############################################################################## +# The prefered way to compile a custom version of mathcomp extra packages # +# (other than released versions which should be added to # +# `rec-mathcomp-extra-config` and pushed to nixpkgs, see below), # +# is to use `coqPackages.mathcomp-extra name version` where # +# 1. `name` is a string representing the name of a declared package # +# OR undeclared package. # +# 2. `version` is either: # +# - a string without slash, which is interpreted as a github revision, # +# i.e. either a tag, a branch or a commit hash # +# - a string with slashes "owner/p_1/.../p_n", which is interpreted as # +# github owner "owner" and revision "p_1/.../p_n". # +# - a path which is interpreted as a local source for the repository, # +# the name of the version is taken to be the basename of the path # +# i.e. if the path is /home/you/git/package/branch/, # +# then "branch" is the name of the version # +# - an attribute set which overrides some attributes (e.g. the src) # +# if the version is updated, the name is automatically regenerated using # +# the conventional schema "coq${coq.coq-version}-${pkgname}-${version}" # +# - a "standard" override function (old: new_attrs) to override the default # +# attribute set, so that you can use old.${field} to patch the derivation. # +# # +# Should you choose to use `pkg.overrideAttrs` instead, we provide the # +# function mathcomp-extra-override which takes a name and a version exactly # +# as above and returns an override function. # +############################################################################## + +######################################################################### +# Example of use: https://github.com/math-comp/math-comp/wiki/Using-nix # +######################################################################### + +########################################### +# Adding a new package or package version # +################################################################################ +# 1. Update or add a `package` entry to `initial`, it must be a function # +# taking the version as argument and returning an attribute set. Everything # +# is optional and the default for the sources of the repository and the # +# homepage will be https://github.com/math-comp/${package}. # +# # +# 2. Update or add a `package` entry to `sha256` for each release. # +# You may use # +# ```sh # +# nix-prefetch-url --unpack # +# https://github.com/math-comp/math-comp/archive/version.tar.gz # +# ``` # +# # +# 3. Update or create a new consistent set of extra packages. # +# /!\ They must all be co-compatible. /!\ # +# Do not use versions that may disappear: it must either be # +# - a tag from the main repository (e.g. version or tag), or # +# - a revision hash that has been *merged in master* # +################################################################################ + +{ stdenv, fetchFromGitHub, recurseIntoAttrs, + which, mathcomp, coqPackages, + mathcomp-extra-config, mathcomp-extra-override, + mathcomp-extra, current-mathcomp-extra, +}: with builtins // stdenv.lib; -let current-ssreflect = ssreflect; in let -# configuring packages -param = { - finmap = { - version-sha256 = { - "1.2.1" = "0jryb5dq8js3imbmwrxignlk5zh8gwfb1wr4b1s7jbwz410vp7zf"; - "1.2.0" = "0b6wrdr0d7rcnv86s37zm80540jl2wmiyf39ih7mw3dlwli2cyj4"; - "1.1.0" = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a"; - "1.0.0" = "0sah7k9qm8sw17cgd02f0x84hki8vj8kdz7h15i7rmz08rj0whpa"; - }; - description = "A finset and finmap library"; - }; - bigenough = { - version-sha256 = {"1.0.0" = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg";}; - description = "A small library to do epsilon - N reasonning"; - }; - multinomials = { - version-sha256 = { - "1.3" = "0l3vi5n094nx3qmy66hsv867fnqm196r8v605kpk24gl0aa57wh4"; - "1.2" = "1mh1w339dslgv4f810xr1b8v2w7rpx6fgk9pz96q0fyq49fw2xcq"; - "1.1" = "1q8alsm89wkc0lhcvxlyn0pd8rbl2nnxg81zyrabpz610qqjqc3s"; - "1.0" = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; - }; - description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; - }; - analysis = { - version-sha256 = { - "0.2.2" = "1d5dwg9di2ppdzfg21zr0a691zigb5kz0lcw263jpyli1nrq7cvk"; - "0.2.0" = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd"; - "0.1.0" = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al"; - }; - compatibleCoqVersions = flip elem ["8.8" "8.9"]; - description = "Analysis library compatible with Mathematical Components"; - license = stdenv.lib.licenses.cecill-c; - }; - real-closed = { - version-sha256 = { - "1.0.3" = "1xbzkzqgw5p42dx1liy6wy8lzdk39zwd6j14fwvv5735k660z7yb"; - "1.0.2" = "0097pafwlmzd0gyfs31bxpi1ih04i72nxhn99r93aj20mn7mcsgl"; - "1.0.1" = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg"; - }; - description = "Mathematical Components Library on real closed fields"; - }; - coqeal = { - version-sha256 = { - "1.0.0" = "1had6f1n85lmh9x31avbmgl3m0rsiw9f8ma95qzk5b57fjg5k1ii"; - }; - description = "CoqEAL - The Coq Effective Algebra Library"; - owner = "CoqEAL"; - compatibleCoqVersions = flip elem ["8.7" "8.8" "8.9"]; - license = stdenv.lib.licenses.mit; - }; -}; -versions = { - "1.9.0" = { - finmap.version = "1.2.1"; - bigenough.version = "1.0.0"; - analysis = { - version = "0.2.2"; - core-deps = with coqPackages; [ mathcomp-field_1_9 ]; - extra-deps = with coqPackages; [ mathcomp_1_9-finmap mathcomp_1_9-bigenough ]; - }; - multinomials = { - version = "1.3"; - core-deps = with coqPackages; [ mathcomp-algebra_1_9 ]; - extra-deps = with coqPackages; [ mathcomp_1_9-finmap mathcomp_1_9-bigenough ]; - }; - real-closed = { - version = "1.0.3"; - core-deps = with coqPackages; [ mathcomp-field_1_9 ]; - extra-deps = with coqPackages; [ mathcomp_1_9-bigenough ]; - }; - }; - "1.8.0" = { - finmap.version = "1.2.1"; - bigenough.version = "1.0.0"; - analysis = { - version = "0.2.2"; - core-deps = with coqPackages; [ mathcomp-field_1_8 ]; - extra-deps = with coqPackages; [ mathcomp_1_8-finmap mathcomp_1_8-bigenough ]; - }; - multinomials = { - version = "1.3"; - core-deps = with coqPackages; [ mathcomp-algebra_1_8 ]; - extra-deps = with coqPackages; [ mathcomp_1_8-finmap mathcomp_1_8-bigenough ]; - }; - real-closed = { - version = "1.0.3"; - core-deps = with coqPackages; [ mathcomp-field_1_8 ]; - extra-deps = with coqPackages; [ mathcomp_1_8-bigenough ]; - }; - coqeal = { - version = "1.0.0"; - core-deps = with coqPackages; [ mathcomp-algebra_1_8 ]; - extra-deps = with coqPackages; [ bignums paramcoq mathcomp_1_8-multinomials ]; - }; - }; - "1.7.0" = { - finmap.version = "1.1.0"; - bigenough.version = "1.0.0"; - analysis = { - version = "0.1.0"; - core-deps = with coqPackages; [ mathcomp-field_1_7 ]; - extra-deps = with coqPackages; [ mathcomp_1_7-finmap mathcomp_1_7-bigenough ]; - }; - multinomials = { - version = "1.1"; - core-deps = with coqPackages; [ mathcomp-algebra_1_7 ]; - extra-deps = with coqPackages; [ mathcomp_1_7-finmap_1_0 mathcomp_1_7-bigenough ]; - }; - real-closed = { - version = "1.0.1"; - core-deps = with coqPackages; [ mathcomp-field_1_7 ]; - extra-deps = with coqPackages; [ mathcomp_1_7-bigenough ]; - }; - }; -}; - -# generic package generator -packageGen = { - # optional arguments - src ? "", - owner ? "math-comp", - extra-deps ? [], - ssreflect ? current-ssreflect, - core-deps ? null, - compatibleCoqVersions ? null, - license ? ssreflect.meta.license, - # mandatory - package, version ? "broken", version-sha256, description - }: - let - theCompatibleCoqVersions = if compatibleCoqVersions == null - then ssreflect.compatibleCoqVersions - else compatibleCoqVersions; - mc-core-deps = if builtins.isNull core-deps then [ssreflect] else core-deps; - in - { ${package} = let from = src; in + ############################## + # CONFIGURATION, please edit # + ############################## + ############################ + # Packages base delaration # + ############################ + rec-mathcomp-extra-config = { + initial = { + mathcomp-finmap = version: { + meta = { + description = "A finset and finmap library"; + repo = "finmap"; + homepage = "https://github.com/math-comp/finmap"; + }; + passthru.compatibleCoqVersions = flip elem [ "8.8" "8.9" "8.10" "8.11" ]; + }; - stdenv.mkDerivation rec { - inherit version; - name = "coq${coq.coq-version}-mathcomp${ssreflect.version}-${package}-${version}"; + mathcomp-bigenough = version: { + meta = { + description = "A small library to do epsilon - N reasonning"; + repo = "bigenough"; + homepage = "https://github.com/math-comp/bigenough"; + }; + passthru.compatibleCoqVersions = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; + }; - src = if from == "" then fetchFromGitHub { - owner = owner; - repo = package; - rev = version; - sha256 = version-sha256.${version}; - } else from; + multinomials = version: { + buildInputs = [ which ]; + propagatedBuildInputs = with coqPackages; + [ mathcomp.algebra mathcomp-finmap mathcomp-bigenough ]; + meta = { + description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; + repo = "multinomials"; + homepage = "https://github.com/math-comp/multinomials"; + }; + passthru.compatibleCoqVersions = flip elem [ "8.9" "8.10" "8.11" ]; + }; - propagatedBuildInputs = [ coq ] ++ mc-core-deps ++ extra-deps; + mathcomp-analysis = version: { + propagatedBuildInputs = with coqPackages; + [ mathcomp.field mathcomp-finmap mathcomp-bigenough ]; + meta = { + description = "Analysis library compatible with Mathematical Components"; + homepage = "https://github.com/math-comp/analysis"; + repo = "analysis"; + license = stdenv.lib.licenses.cecill-c; + }; + passthru.compatibleCoqVersions = flip elem ["8.8" "8.9" "8.10" "8.11" ]; + }; - installFlags = [ "-f" "Makefile.coq" "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; + mathcomp-real-closed = version: { + propagatedBuildInputs = with coqPackages; + [ coq mathcomp.field mathcomp-bigenough ]; + meta = { + description = "Mathematical Components Library on real closed fields"; + repo = "real-closed"; + homepage = "https://github.com/math-comp/real-closed"; + }; + passthru.compatibleCoqVersions = flip elem ["8.8" "8.9" "8.10" "8.11" ]; + }; - meta = { - inherit description; - inherit license; - inherit (src.meta) homepage; - inherit (ssreflect.meta) platforms; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - broken = (version == "broken"); + coqeal = version: { + buildInputs = [ which ]; + propagatedBuildInputs = with coqPackages; + [ mathcomp-algebra bignums paramcoq multinomials ]; + meta = { + description = "CoqEAL - The Coq Effective Algebra Library"; + homepage = "https://github.com/coqeal/coqeal"; + license = stdenv.lib.licenses.mit; + owner = "CoqEAL"; + }; + passthru.compatibleCoqVersions = flip elem [ "8.9" "8.10" "8.11" ]; + }; }; - passthru = { - inherit version-sha256; - compatibleCoqVersions = if meta.broken then _: false - else theCompatibleCoqVersions; + ############################### + # sha256 of released versions # + ############################### + sha256 = { + mathcomp-finmap = { + "1.5.0" = "0vx9n1fi23592b3hv5p5ycy7mxc8qh1y5q05aksfwbzkk5zjkwnq"; + "1.4.1" = "0kx4nx24dml1igk0w0qijmw221r5bgxhwhl5qicnxp7ab3c35s8p"; + "1.4.0+coq-8.11" = "1fd00ihyx0kzq5fblh9vr8s5mr1kg7p6pk11c4gr8svl1n69ppmb"; + "1.4.0" = "0mp82mcmrs424ff1vj3cvd8353r9vcap027h3p0iprr1vkkwjbzd"; + "1.3.4" = "0f5a62ljhixy5d7gsnwd66gf054l26k3m79fb8nz40i2mgp6l9ii"; + "1.3.3" = "1n844zjhv354kp4g4pfbajix0plqh7yxv6471sgyb46885298am5"; + "1.3.1" = "14rvm0rm5hd3pd0srgak3jqmddzfv6n7gdpjwhady5xcgrc7gsx7"; + "1.2.1" = "0jryb5dq8js3imbmwrxignlk5zh8gwfb1wr4b1s7jbwz410vp7zf"; + "1.2.0" = "0b6wrdr0d7rcnv86s37zm80540jl2wmiyf39ih7mw3dlwli2cyj4"; + "1.1.0" = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a"; + "1.0.0" = "0sah7k9qm8sw17cgd02f0x84hki8vj8kdz7h15i7rmz08rj0whpa"; + }; + mathcomp-bigenough = { + "1.0.0" = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg"; + }; + mathcomp-analysis = { + "0.2.3" = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966"; + "0.2.2" = "1d5dwg9di2ppdzfg21zr0a691zigb5kz0lcw263jpyli1nrq7cvk"; + "0.2.0" = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd"; + "0.1.0" = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al"; + }; + multinomials = { + "1.5.1" = "13nlfm2wqripaq671gakz5mn4r0xwm0646araxv0nh455p9ndjs3"; + "1.5" = "064rvc0x5g7y1a0nip6ic91vzmq52alf6in2bc2dmss6dmzv90hw"; + "1.4" = "0vnkirs8iqsv8s59yx1fvg1nkwnzydl42z3scya1xp1b48qkgn0p"; + "1.3" = "0l3vi5n094nx3qmy66hsv867fnqm196r8v605kpk24gl0aa57wh4"; + "1.2" = "1mh1w339dslgv4f810xr1b8v2w7rpx6fgk9pz96q0fyq49fw2xcq"; + "1.1" = "1q8alsm89wkc0lhcvxlyn0pd8rbl2nnxg81zyrabpz610qqjqc3s"; + "1.0" = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; + }; + mathcomp-real-closed = { + "1.0.5" = "0q8nkxr9fba4naylr5xk7hfxsqzq2pvwlg1j0xxlhlgr3fmlavg2"; + "1.0.4" = "058v9dj973h9kfhqmvcy9a6xhhxzljr90cf99hdfcdx68fi2ha1b"; + "1.0.3" = "1xbzkzqgw5p42dx1liy6wy8lzdk39zwd6j14fwvv5735k660z7yb"; + "1.0.2" = "0097pafwlmzd0gyfs31bxpi1ih04i72nxhn99r93aj20mn7mcsgl"; + "1.0.1" = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg"; + }; + coqeal = { + "1.0.3" = "0hc63ny7phzbihy8l7wxjvn3haxx8jfnhi91iw8hkq8n29i23v24"; + "1.0.2" = "1brmf3gj03iky1bcl3g9vx8vknny7xfvs0y2rfr85am0296sxsfj"; + "1.0.1" = "19jhdrv2yp9ww0h8q73ihb2w1z3glz4waf2d2n45klafxckxi7bm"; + "1.0.0" = "1had6f1n85lmh9x31avbmgl3m0rsiw9f8ma95qzk5b57fjg5k1ii"; + }; }; + + ################################ + # CONSISTENT sets of packages. # + ################################ + for-coq-and-mc = let + v5 = { + mathcomp-finmap = "1.5.0"; + mathcomp-bigenough = "1.0.0"; + mathcomp-analysis = "678d3cc37f5f3c71b1bd550836eb44e3ba2a5459"; + multinomials = "1.5.1"; + mathcomp-real-closed = "1.0.5"; + coqeal = "CohenCyril/bdfc96771644b082e41268edc43d61dc5fda2358"; + }; + v4 = v3 // { coqeal = "1.0.3"; }; + v3 = { + mathcomp-finmap = "1.4.0"; + mathcomp-bigenough = "1.0.0"; + mathcomp-analysis = "0.2.3"; + multinomials = "1.5"; + mathcomp-real-closed = "1.0.4"; + coqeal = "1.0.0"; + }; + v2 = { + mathcomp-finmap = "1.3.4"; + mathcomp-bigenough = "1.0.0"; + mathcomp-analysis = "0.2.3"; + multinomials = "1.4"; + mathcomp-real-closed = "1.0.3"; + coqeal = "1.0.0"; + }; + v1 = { + mathcomp-finmap = "1.1.0"; + mathcomp-bigenough = "1.0.0"; + multinomials = "1.1"; + mathcomp-real-closed = "1.0.1"; + coqeal = "1.0.0"; + }; + in + { + "8.11" = { + "1.11.0+beta1" = v5; + "1.10.0" = v4 // {mathcomp-finmap = "1.4.0+coq-8.11";}; + }; + "8.10" = { + "1.11.0+beta1" = v5; + "1.10.0" = v4; + "1.9.0" = removeAttrs v3 ["coqeal"]; + }; + "8.9" = { + "1.11.0+beta1" = removeAttrs v5 ["mathcomp-analysis"]; + "1.10.0" = v4; + "1.9.0" = removeAttrs v3 ["coqeal"]; + "1.8.0" = removeAttrs v2 ["coqeal"]; + }; + "8.8" = { + "1.11.0+beta1" = removeAttrs v5 ["mathcomp-analysis"]; + "1.10.0" = removeAttrs v4 ["mathcomp-analysis"]; + "1.9.0" = removeAttrs v3 ["coqeal"]; + "1.8.0" = removeAttrs v2 ["coqeal"]; + "1.7.0" = removeAttrs v1 ["coqeal" "multinomials"]; + }; + "8.7" = { + "1.11.0+beta1" = removeAttrs v5 ["mathcomp-analysis"]; + "1.10.0" = removeAttrs v4 ["mathcomp-analysis"]; + "1.9.0" = removeAttrs v3 ["coqeal"]; + "1.8.0" = removeAttrs v2 ["coqeal"]; + "1.7.0" = removeAttrs v1 ["coqeal" "multinomials"]; + }; + }; }; + + ############################## + # GENERATION, EDIT WITH CARE # + ############################## + coq = coqPackages.coq; + + default-attrs = { + version = "master"; + buildInputs = []; + propagatedBuildInputs = (with coqPackages; [ ssreflect ]); + installFlags = [ "-f" "Makefile.coq" "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; + meta = { + inherit (mathcomp.meta) platforms license; + owner = "math-comp"; + maintainers = [ maintainers.vbgl maintainers.cohencyril ]; + }; + passthru.compatibleCoqVersions = (_: true); }; -current-versions = versions.${current-ssreflect.version} or {}; + pkgUp = recursiveUpdateUntil (path: l: r: !(isAttrs l && isAttrs r) || path == ["src"]); -select = x: mapAttrs (n: pkg: {package = n;} // pkg) (recursiveUpdate param x); + # Fixes a partial attribute set using the configuration + # in the style of the above mathcomp-extra-config.initial, + # and generates a name according to the conventional naming scheme below + fix-attrs = pkgcfg: + let attrs = pkgUp default-attrs pkgcfg; in + pkgUp attrs (rec { + name = "coq${coq.coq-version}mathcomp${mathcomp.version}-${attrs.meta.repo or attrs.meta.package or "anonymous"}-${attrs.version}"; + src = attrs.src or (fetchTarball "${meta.homepage}/archive/${attrs.version}.tar.gz"); + meta = rec { + homepage = attrs.meta.homepage or attrs.src.meta.homepage or "https://github.com/${owner}/${repo}"; + owner = attrs.meta.owner or "math-comp"; + repo = attrs.meta.repo or attrs.meta.package or "math-comp-nix"; + }; + }); -for-version = v: suffix: (mapAttrs' (n: pkg: - {name = "mathcomp_${suffix}-${n}"; - value = (packageGen ({ - ssreflect = coqPackages."mathcomp-ssreflect_${suffix}"; - } // pkg)).${n};}) - (select versions.${v})); + # Gets a version out of a string, path or attribute set. + getVersion = arg: + if isFunction arg then (arg {}).version + else if arg == "" then "master" + else if isDerivation arg then arg.drvAttrs.version or "master" + else if isAttrs arg then arg.version or "master" + else if isString arg then head (reverseList (split "/" arg)) + else if isPath arg then (baseNameOf arg) + else "master"; -all = (for-version "1.7.0" "1_7") // - (for-version "1.8.0" "1_8") // - (for-version "1.9.0" "1_9") // - (recurseIntoAttrs (mapDerivationAttrset dontDistribute ( - mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = (packageGen pkg).${n};}) - (select current-versions)))); + # Converts a string, path or attribute set into an override function + # It tries to fill the `old` argument of the override function using + # `mathcomp-extra-config.initial` first and finishes with `fix-attrs` + rec-mathcomp-extra-override = generic: old: let + version = getVersion generic; + package = old.meta.package or "math-comp-nix"; + cfg = pkgUp ((mathcomp-extra-config.initial.${package} or (_: {})) version) old + // { inherit version; }; + fix = attrs: fix-attrs (pkgUp cfg attrs); + in + if isFunction generic then fix (generic cfg) + else if generic == null || generic == "" then fix {} + else if isDerivation generic then fix generic.drvAttrs + else if isAttrs generic then fix generic + else if generic == "broken" then fix { meta.broken = true; passthru.compatibleCoqVersions = _: false; } + else let fixedcfg = fix cfg; in fixedcfg // ( + if isString generic then + if (mathcomp-extra-config.sha256.${package} or {})?${generic} then { + src = fetchFromGitHub { + inherit (fixedcfg.meta) owner repo; + rev = version; + sha256 = mathcomp-extra-config.sha256.${package}.${version}; + }; + } + else let splitted = filter isString (split "/" generic); in { + src = fetchTarball + ("https://github.com/" + + (if length splitted == 1 then "${fixedcfg.meta.owner}/${fixedcfg.meta.repo}/archive/${version}.tar.gz" + else "${head splitted}/${fixedcfg.meta.repo}/archive/${concatStringsSep "/" (tail splitted)}.tar.gz")); + } + else if isPath generic then { src = generic; } + else abort "${toString generic} not a legitimate generic version/override"); + + # applies mathcomp-extra-config.for-coq-and-mc to the current mathcomp version + for-this = mathcomp-extra-config.for-coq-and-mc.${coq.coq-version}.${mathcomp.version} or {}; + + # specializes mathcomp-extra to the current mathcomp version. + rec-current-mathcomp-extra = package: mathcomp-extra package (for-this.${package} or {}); in -{ -mathcompExtraGen = packageGen; -mathcomp_1_7-finmap_1_0 = - (packageGen (select {finmap = {version = "1.0.0"; - ssreflect = coqPackages.mathcomp-ssreflect_1_7;}; - }).finmap).finmap; -multinomials = all.mathcomp-multinomials; -coqeal = all.mathcomp-coqeal; -} // all + { + mathcomp-extra-override = rec-mathcomp-extra-override; + mathcomp-extra-config = rec-mathcomp-extra-config; + current-mathcomp-extra = rec-current-mathcomp-extra; + mathcomp-extra = package: version: + stdenv.mkDerivation (mathcomp-extra-override version {meta = {inherit package;};}); + + mathcomp-finmap = current-mathcomp-extra "mathcomp-finmap"; + mathcomp-analysis = current-mathcomp-extra "mathcomp-analysis"; + mathcomp-bigenough = current-mathcomp-extra "mathcomp-bigenough"; + multinomials = current-mathcomp-extra "multinomials"; + mathcomp-real-closed = current-mathcomp-extra "mathcomp-real-closed"; + coqeal = current-mathcomp-extra "coqeal"; + + mathcomp-extra-fast = map (pkg: current-mathcomp-extra pkg) + (attrNames (filterAttrs (pkg: config: !(config?slow && config.slow)) for-this)); + mathcomp-extra-all = map (pkg: current-mathcomp-extra pkg) (attrNames for-this); + } diff --git a/pkgs/development/coq-modules/metalib/default.nix b/pkgs/development/coq-modules/metalib/default.nix index c196bdbcd7661..a0268a543a5a4 100644 --- a/pkgs/development/coq-modules/metalib/default.nix +++ b/pkgs/development/coq-modules/metalib/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "20170713"; src = fetchgit { - url = https://github.com/plclub/metalib.git; + url = "https://github.com/plclub/metalib.git"; rev = "44e40aa082452dd333fc1ca2d2cc55311519bd52"; sha256 = "1pra0nvx69q8d4bvpcvh9ngic1cy6z1chi03x56nisfqnc61b6y9"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "lngen"; version = "0.0.1"; src = fetchgit { - url = https://github.com/plclub/lngen; + url = "https://github.com/plclub/lngen"; rev = "ea73ad315de33afd25f87ca738c71f358f1cd51c"; sha256 = "1a0sj8n3lmsl1wlnqfy176k9lb9s8rl422bvg3ihl2i70ql8wisd"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { isExecutable = true; libraryHaskellDepends = [ base containers mtl parsec syb ]; executableHaskellDepends = [ base ]; - homepage = https://github.com/plclub/lngen; + homepage = "https://github.com/plclub/lngen"; description = "Tool for generating Locally Nameless definitions and proofs in Coq, working together with Ott"; license = stdenv.lib.licenses.mit; }; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/plclub/metalib; + homepage = "https://github.com/plclub/metalib"; license = licenses.mit; maintainers = [ maintainers.jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix index 4c0ca46730052..9d8a7a315a558 100644 --- a/pkgs/development/coq-modules/paco/default.nix +++ b/pkgs/development/coq-modules/paco/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://plv.mpi-sws.org/paco/; + homepage = "http://plv.mpi-sws.org/paco/"; description = "A Coq library implementing parameterized coinduction"; maintainers = with maintainers; [ jwiegley ptival ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix deleted file mode 100644 index 01df38375efb5..0000000000000 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, coq, ncurses, which -, graphviz, mathcomp, withDoc ? false -}: - -stdenv.mkDerivation rec { - name = "coq${coq.coq-version}-ssreflect-${version}"; - - inherit (mathcomp) src version meta; - - nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ]; - buildInputs = [ coq ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]); - - enableParallelBuilding = true; - - COQBIN = "${coq}/bin/"; - - preBuild = '' - patchShebangs etc/utils/ssrcoqdep || true - cd mathcomp/ssreflect - ''; - - installPhase = '' - make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install - ''; - - postInstall = stdenv.lib.optionalString withDoc '' - mkdir -p $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/ - cp -r html $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/ - ''; - - passthru.compatibleCoqVersions = mathcomp.compatibleCoqVersions; -} diff --git a/pkgs/development/dotnet-modules/python-language-server/create_deps.sh b/pkgs/development/dotnet-modules/python-language-server/create_deps.sh new file mode 100755 index 0000000000000..f3cdcbc0c108b --- /dev/null +++ b/pkgs/development/dotnet-modules/python-language-server/create_deps.sh @@ -0,0 +1,36 @@ +#! /usr/bin/env nix-shell +#! nix-shell -p python3 dotnet-sdk_3 -i bash + +# Run this script to generate deps.nix +# ./create_deps.sh /path/to/microsoft/python/language/server/source/checkout + +SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" + +if [ -d "$1" ]; then + CHECKOUT_PATH="$1" +else + echo "First argument must be a directory, the path to the Microsoft Python Language Server source checkout" + exit 1 +fi + +# Generate lockfiles in source checkout +cd $CHECKOUT_PATH/src +dotnet nuget locals all --clear +dotnet restore -v normal --no-cache PLS.sln --use-lock-file -r linux-x64 + +# Use the lockfiles to make a file with two columns: name and version number +# for all possible package dependencies +cd $SCRIPTDIR +echo "" > all_versions.txt +for lockfile in $(find "$CHECKOUT_PATH" -name packages.lock.json); do + echo "Processing lockfile $lockfile" + python ./process_lockfile.py "$lockfile" >> all_versions.txt +done +# Add extra manually added packages +cat ./manual_deps.txt >> all_versions.txt +cat all_versions.txt | sed '/^$/d' | sort | uniq > tmp +mv tmp all_versions.txt + +# Retrieve sha256 hashes for each dependency and format fetchNuGet calls into deps.nix +./format-deps.sh all_versions.txt > deps.nix +rm all_versions.txt diff --git a/pkgs/development/dotnet-modules/python-language-server/default.nix b/pkgs/development/dotnet-modules/python-language-server/default.nix new file mode 100644 index 0000000000000..77154485118e6 --- /dev/null +++ b/pkgs/development/dotnet-modules/python-language-server/default.nix @@ -0,0 +1,104 @@ +{ stdenv +, fetchFromGitHub +, fetchurl +, makeWrapper +, dotnet-sdk_3 +, openssl +, icu +, patchelf +, Nuget +}: + +let deps = import ./deps.nix { inherit fetchurl; }; + + version = "2020-04-24"; + + # Build the nuget source needed for the later build all by itself + # since it's a time-consuming step that only depends on ./deps.nix. + # This makes it easier to experiment with the main build. + nugetSource = stdenv.mkDerivation { + pname = "python-language-server-nuget-deps"; + inherit version; + + dontUnpack = true; + + nativeBuildInputs = [ Nuget ]; + + buildPhase = '' + export HOME=$(mktemp -d) + + mkdir -p $out/lib + + # disable default-source so nuget does not try to download from online-repo + nuget sources Disable -Name "nuget.org" + # add all dependencies to the source + for package in ${toString deps}; do + nuget add $package -Source $out/lib + done + ''; + + dontInstall = true; + }; + +in + +stdenv.mkDerivation { + pname = "python-language-server"; + inherit version; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "python-language-server"; + rev = "d480cd12649dcff78ed271c92c274fab60c00f2f"; + sha256 = "0p2sw6w6fymdlxn8r5ndvija2l7rd77f5rddq9n71dxj1nicljh3"; + }; + + buildInputs = [dotnet-sdk_3 openssl icu]; + + nativeBuildInputs = [ + Nuget + makeWrapper + patchelf + ]; + + buildPhase = '' + mkdir home + export HOME=$(mktemp -d) + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + + pushd src + nuget sources Disable -Name "nuget.org" + dotnet restore --source ${nugetSource}/lib -r linux-x64 + popd + + pushd src/LanguageServer/Impl + dotnet publish --no-restore -c Release -r linux-x64 + popd + ''; + + installPhase = '' + mkdir -p $out + cp -r output/bin/Release/linux-x64/publish $out/lib + + mkdir $out/bin + makeWrapper $out/lib/Microsoft.Python.LanguageServer $out/bin/python-language-server + ''; + + postFixup = '' + patchelf --set-rpath ${icu}/lib $out/lib/System.Globalization.Native.so + patchelf --set-rpath ${openssl.out}/lib $out/lib/System.Security.Cryptography.Native.OpenSsl.so + ''; + + # If we don't disable stripping, the executable fails to start with an error about being unable + # to find some of the packaged DLLs. + dontStrip = true; + + meta = with stdenv.lib; { + description = "Microsoft Language Server for Python"; + homepage = "https://github.com/microsoft/python-language-server"; + license = licenses.asl20; + maintainers = with maintainers; [ thomasjm ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/dotnet-modules/python-language-server/deps.nix b/pkgs/development/dotnet-modules/python-language-server/deps.nix new file mode 100644 index 0000000000000..803f33f892d50 --- /dev/null +++ b/pkgs/development/dotnet-modules/python-language-server/deps.nix @@ -0,0 +1,1321 @@ +# This file is autogenerated. +# To regenerate, run "create_deps.sh $PATH_TO_LANGUAGE_SERVER_CHECKOUT" + +{ fetchurl }: let + + fetchNuGet = { name, version, sha256 }: fetchurl { + inherit sha256; + url = "https://www.nuget.org/api/v2/package/${name}/${version}"; + }; + +in [ + + (fetchNuGet { + name = "Ben.Demystifier"; + version = "0.1.6"; + sha256 = "03rk7imb2k3iass507rkr9chdnyk4h8ppyf20cdz3c2m3v1a5k9n"; + }) + + (fetchNuGet { + name = "Castle.Core"; + version = "4.4.0"; + sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; + }) + + (fetchNuGet { + name = "FluentAssertions"; + version = "5.9.0"; + sha256 = "11mpnl6aar2yn7l6b1k4m3rdnl82ydmqbsja4rn84dhz1qdzfp8x"; + }) + + (fetchNuGet { + name = "LiteDB"; + version = "4.1.4"; + sha256 = "1g9258mv3jm9ps2s5wcxbmszh9nqiiw3d9nrfqis8x72jqiqi6js"; + }) + + (fetchNuGet { + name = "MSTest.TestAdapter"; + version = "2.1.0"; + sha256 = "1g1v8yjnk4nr1c36k3cz116889bnpiw1i1jkmqnpb19wms7sq7cz"; + }) + + (fetchNuGet { + name = "MSTest.TestFramework"; + version = "2.1.0"; + sha256 = "0mac4h7ylw953chclhz0lrn19yks3bab9dn9x9fpjqi7309gid0p"; + }) + + (fetchNuGet { + name = "MessagePack"; + version = "2.1.90"; + sha256 = "1j5wjl7aq7nn5ga3j6zaaivdf2wlfyd7w66ak0i7krgrmv26lb8i"; + }) + + (fetchNuGet { + name = "MessagePack.Annotations"; + version = "2.1.90"; + sha256 = "08sghhwbz8h7ji9lg0klhwcyndxg6v11pq9jac975sb38samnm11"; + }) + + (fetchNuGet { + name = "MicroBuild.Core"; + version = "0.3.0"; + sha256 = "190d755l60j3l5m1661wj19gj9w6ngza56q3vkijkkmbbabdmqln"; + }) + + (fetchNuGet { + name = "Microsoft.AspNetCore.App.Ref"; + version = "3.0.1"; + sha256 = "0k2ry757qhm99xwm0wh4zalxn9nmxhfswd184z1fjr42szr511fb"; + }) + + (fetchNuGet { + name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "3.0.2"; + sha256 = "0d4r744n3bk4v7ddfjpy5ils150h0693bil3c7v27n84037hqndj"; + }) + + (fetchNuGet { + name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "3.0.3"; + sha256 = "1jcqy8i9fzb1pmkazi80yqr09zi5nk30n57i46ggr5ky45jngfq9"; + }) + + (fetchNuGet { + name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "3.1.2"; + sha256 = "19wfh9yg4n2khbl7pvf6ngx95m5p8lw4l9y935pv7nh4xgwk02p9"; + }) + + (fetchNuGet { + name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "3.1.3"; + sha256 = "0kvnzb9xjii48kg30ac63qdf0fn1y8j3nblbrfaqv2aiy6kp0iwn"; + }) + + (fetchNuGet { + name = "Microsoft.Bcl.AsyncInterfaces"; + version = "1.0.0"; + sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; + }) + + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.0.1"; + sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; + }) + + (fetchNuGet { + name = "Microsoft.CodeCoverage"; + version = "16.5.0"; + sha256 = "0610wzn4qyywf9lb4538vwqhprxc4g0g7gjbmnjzvx97jr5nd5mf"; + }) + + (fetchNuGet { + name = "Microsoft.Extensions.FileSystemGlobbing"; + version = "3.1.2"; + sha256 = "1zwvzp0607irs7irfbq8vnclg5nj2jpyggw9agm4a32la5ngg27m"; + }) + + (fetchNuGet { + name = "Microsoft.NET.Test.Sdk"; + version = "16.5.0"; + sha256 = "19f5bvzci5mmfz81jwc4dax4qdf7w4k67n263383mn8mawf22bfq"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.1"; + sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "2.0.0"; + sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "3.1.0"; + sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + + (fetchNuGet { + name = "Microsoft.NetCore.App.Host.linux-x64"; + version = "3.0.2"; + sha256 = "0y14y2x3wbi44i23ndmf4323cii8wrqw9s289gcab3s393l71sf5"; + }) + + (fetchNuGet { + name = "Microsoft.NetCore.App.Host.linux-x64"; + version = "3.0.3"; + sha256 = "19igfvwsjzwkh90gqzabl6pdkyygslj2iwpsxg680phffzr411w4"; + }) + + (fetchNuGet { + name = "Microsoft.NetCore.App.Host.linux-x64"; + version = "3.1.3"; + sha256 = "013ibnhsimgqj5l2dqma035xvsvrb47bn65z6xbxgg88383hpgvw"; + }) + + (fetchNuGet { + name = "Microsoft.NetCore.App.Ref"; + version = "3.0.0"; + sha256 = "1qi382157ln7yngazvr3nskpjkab4x8sqx11l13xyg56vyyjyyiw"; + }) + + (fetchNuGet { + name = "Microsoft.NetCore.App.Ref"; + version = "3.1.0"; + sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; + }) + + (fetchNuGet { + name = "Microsoft.NetCore.App.Runtime.linux-x64"; + version = "3.0.2"; + sha256 = "1h6d0nl495k0bh4my43l578l7m8qwah7ll42aax7jrib2py354f1"; + }) + + (fetchNuGet { + name = "Microsoft.NetCore.App.Runtime.linux-x64"; + version = "3.0.3"; + sha256 = "1ykgfnphbkyck0gqbbh5n96w59z2bq47g896ygal1j4nblj3s44v"; + }) + + (fetchNuGet { + name = "Microsoft.NetCore.App.Runtime.linux-x64"; + version = "3.1.2"; + sha256 = "0a332ia5pabnz7mdfc99a5hlc7drnwzlc7cj9b5c3an6dq636p66"; + }) + + (fetchNuGet { + name = "Microsoft.NetCore.App.Runtime.linux-x64"; + version = "3.1.3"; + sha256 = "1ynhzsr8a0hfby2wjhzkdiimj18izgfzp7m2yp3pby2iwb4v3xy9"; + }) + + (fetchNuGet { + name = "Microsoft.TestPlatform.ObjectModel"; + version = "16.5.0"; + sha256 = "02h7j1fr0fwcggn0wgddh59k8b2wmly3snckwhswzqvks5rvfnnw"; + }) + + (fetchNuGet { + name = "Microsoft.TestPlatform.TestHost"; + version = "16.5.0"; + sha256 = "08cvss66lqa92h55dxkbrzn796jckhlyj53zz22x3qyr6xi21v5v"; + }) + + (fetchNuGet { + name = "Microsoft.VisualStudio.Threading"; + version = "16.4.33"; + sha256 = "09djx2xz22w48csd0bkpwi1rgpjpaj3mml16wfy8jlsnc66swmnh"; + }) + + (fetchNuGet { + name = "Microsoft.VisualStudio.Threading"; + version = "16.4.45"; + sha256 = "16p61kxsnwanp3nac0gkarl7a94c02qyqjzdkijl5va9k3fa97m6"; + }) + + (fetchNuGet { + name = "Microsoft.VisualStudio.Threading.Analyzers"; + version = "16.4.45"; + sha256 = "12m0f037pz3ynm69810p4c96nrlnqihx6w4qyrs0kqsxiajf16jc"; + }) + + (fetchNuGet { + name = "Microsoft.VisualStudio.Validation"; + version = "15.3.15"; + sha256 = "1v3r2rlichlvxjrmj1grii1blnl9lp9npg2p6q3q4j6lamskxa9r"; + }) + + (fetchNuGet { + name = "Microsoft.VisualStudio.Validation"; + version = "15.5.31"; + sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; + }) + + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + }) + + (fetchNuGet { + name = "Microsoft.Win32.Registry"; + version = "4.5.0"; + sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; + }) + + (fetchNuGet { + name = "Microsoft.Win32.Registry"; + version = "4.7.0"; + sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; + }) + + (fetchNuGet { + name = "NETStandard.Library"; + version = "1.6.1"; + sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; + }) + + (fetchNuGet { + name = "NETStandard.Library"; + version = "2.0.3"; + sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; + }) + + (fetchNuGet { + name = "NSubstitute"; + version = "4.2.1"; + sha256 = "0wgfjh032qds994fmgxvsg88nhgjrx7p9rnv6z678jm62qi14asy"; + }) + + (fetchNuGet { + name = "Nerdbank.Streams"; + version = "2.4.60"; + sha256 = "01554nbs6dj4fjd59b95kaw84j27kfb5y5ixjbl23nh62kpgrd3r"; + }) + + (fetchNuGet { + name = "NewtonSoft.Json"; + version = "12.0.3"; + sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + }) + + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "12.0.2"; + sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; + }) + + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "12.0.3"; + sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + }) + + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "9.0.1"; + sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; + }) + + (fetchNuGet { + name = "NuGet.Frameworks"; + version = "5.0.0"; + sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; + }) + + (fetchNuGet { + name = "StreamJsonRpc"; + version = "2.3.103"; + sha256 = "0z8ahxkbbrzsn56ylzlciriiid4bslf6y1rk49wzahwpvzlik1iw"; + }) + + (fetchNuGet { + name = "System.AppContext"; + version = "4.3.0"; + sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; + }) + + (fetchNuGet { + name = "System.Buffers"; + version = "4.3.0"; + sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; + }) + + (fetchNuGet { + name = "System.Buffers"; + version = "4.5.0"; + sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; + }) + + (fetchNuGet { + name = "System.Collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + + (fetchNuGet { + name = "System.Collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.3.0"; + sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; + }) + + (fetchNuGet { + name = "System.Collections.Immutable"; + version = "1.5.0"; + sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; + }) + + (fetchNuGet { + name = "System.Collections.NonGeneric"; + version = "4.3.0"; + sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; + }) + + (fetchNuGet { + name = "System.Collections.Specialized"; + version = "4.3.0"; + sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; + }) + + (fetchNuGet { + name = "System.ComponentModel"; + version = "4.3.0"; + sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; + }) + + (fetchNuGet { + name = "System.ComponentModel.Primitives"; + version = "4.3.0"; + sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; + }) + + (fetchNuGet { + name = "System.ComponentModel.TypeConverter"; + version = "4.3.0"; + sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; + }) + + (fetchNuGet { + name = "System.Configuration.ConfigurationManager"; + version = "4.4.0"; + sha256 = "1hjgmz47v5229cbzd2pwz2h0dkq78lb2wp9grx8qr72pb5i0dk7v"; + }) + + (fetchNuGet { + name = "System.Console"; + version = "4.3.0"; + sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; + }) + + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.0.11"; + sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; + }) + + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) + + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.3.0"; + sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; + }) + + (fetchNuGet { + name = "System.Diagnostics.TextWriterTraceListener"; + version = "4.3.0"; + sha256 = "09db74f36wkwg30f7v7zhz1yhkyrnl5v6bdwljq1jdfgzcfch7c3"; + }) + + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; + }) + + (fetchNuGet { + name = "System.Diagnostics.TraceSource"; + version = "4.3.0"; + sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; + }) + + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.3.0"; + sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; + }) + + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.0.11"; + sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; + }) + + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.3.0"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + }) + + (fetchNuGet { + name = "System.Globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }) + + (fetchNuGet { + name = "System.Globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; + }) + + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.3.0"; + sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; + }) + + (fetchNuGet { + name = "System.IO"; + version = "4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + }) + + (fetchNuGet { + name = "System.IO"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + + (fetchNuGet { + name = "System.IO.Compression"; + version = "4.3.0"; + sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; + }) + + (fetchNuGet { + name = "System.IO.Compression.ZipFile"; + version = "4.3.0"; + sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; + }) + + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }) + + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + }) + + (fetchNuGet { + name = "System.IO.Pipelines"; + version = "4.5.3"; + sha256 = "1z44vn1qp866lkx78cfqdd4vs7xn1hcfn7in6239sq2kgf5qiafb"; + }) + + (fetchNuGet { + name = "System.IO.Pipelines"; + version = "4.6.0"; + sha256 = "0r9ygjbxpyi6jgb67qnpbp42b7yvvhgmcjxnb50k3lb416claavh"; + }) + + (fetchNuGet { + name = "System.Linq"; + version = "4.1.0"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + }) + + (fetchNuGet { + name = "System.Linq"; + version = "4.3.0"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }) + + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }) + + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.3.0"; + sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + }) + + (fetchNuGet { + name = "System.Memory"; + version = "4.5.3"; + sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; + }) + + (fetchNuGet { + name = "System.Net.Http"; + version = "4.3.0"; + sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; + }) + + (fetchNuGet { + name = "System.Net.Http"; + version = "4.3.4"; + sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; + }) + + (fetchNuGet { + name = "System.Net.NameResolution"; + version = "4.3.0"; + sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; + }) + + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.3.0"; + sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; + }) + + (fetchNuGet { + name = "System.Net.Sockets"; + version = "4.3.0"; + sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; + }) + + (fetchNuGet { + name = "System.Net.WebSockets"; + version = "4.3.0"; + sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; + }) + + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.0.12"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }) + + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.3.0"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + }) + + (fetchNuGet { + name = "System.Private.Uri"; + version = "4.3.0"; + sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; + }) + + (fetchNuGet { + name = "System.Reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) + + (fetchNuGet { + name = "System.Reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) + + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) + + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) + + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.6.0"; + sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; + }) + + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.0.1"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; + }) + + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.3.0"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + }) + + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.3.0"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; + }) + + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.6.0"; + sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; + }) + + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.0.1"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; + }) + + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) + + (fetchNuGet { + name = "System.Reflection.Metadata"; + version = "1.6.0"; + sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; + }) + + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.0.1"; + sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; + }) + + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }) + + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.1.0"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + }) + + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.3.0"; + sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; + }) + + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.0.1"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; + }) + + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) + + (fetchNuGet { + name = "System.Runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.2"; + sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; + }) + + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.6.0"; + sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; + }) + + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.1.0"; + sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; + }) + + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) + + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) + + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }) + + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) + + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.3.0"; + sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; + }) + + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.3.0"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + }) + + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.1.1"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; + }) + + (fetchNuGet { + name = "System.Security.AccessControl"; + version = "4.5.0"; + sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; + }) + + (fetchNuGet { + name = "System.Security.AccessControl"; + version = "4.7.0"; + sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.3.0"; + sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.3.0"; + sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.3.0"; + sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.3.0"; + sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.3.0"; + sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.ProtectedData"; + version = "4.4.0"; + sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.3.0"; + sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + }) + + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.3.0"; + sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; + }) + + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.5.0"; + sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; + }) + + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.7.0"; + sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; + }) + + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }) + + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.0.11"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }) + + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) + + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.1.0"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }) + + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }) + + (fetchNuGet { + name = "System.Threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) + + (fetchNuGet { + name = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.0.11"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }) + + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) + + (fetchNuGet { + name = "System.Threading.Tasks.Dataflow"; + version = "4.9.0"; + sha256 = "1g6s9pjg4z8iy98df60y9a01imdqy59zd767vz74rrng78jl2dk5"; + }) + + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) + + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.5.3"; + sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; + }) + + (fetchNuGet { + name = "System.Threading.ThreadPool"; + version = "4.3.0"; + sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + }) + + (fetchNuGet { + name = "System.Threading.Timer"; + version = "4.3.0"; + sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; + }) + + (fetchNuGet { + name = "System.ValueTuple"; + version = "4.5.0"; + sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; + }) + + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.0.11"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; + }) + + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.3.0"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }) + + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.0.11"; + sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; + }) + + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.3.0"; + sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; + }) + + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.3.0"; + sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + }) + + (fetchNuGet { + name = "runtime.any.System.Collections"; + version = "4.3.0"; + sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; + }) + + (fetchNuGet { + name = "runtime.any.System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; + }) + + (fetchNuGet { + name = "runtime.any.System.Diagnostics.Tracing"; + version = "4.3.0"; + sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; + }) + + (fetchNuGet { + name = "runtime.any.System.Globalization"; + version = "4.3.0"; + sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; + }) + + (fetchNuGet { + name = "runtime.any.System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; + }) + + (fetchNuGet { + name = "runtime.any.System.IO"; + version = "4.3.0"; + sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; + }) + + (fetchNuGet { + name = "runtime.any.System.Reflection"; + version = "4.3.0"; + sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; + }) + + (fetchNuGet { + name = "runtime.any.System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; + }) + + (fetchNuGet { + name = "runtime.any.System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; + }) + + (fetchNuGet { + name = "runtime.any.System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; + }) + + (fetchNuGet { + name = "runtime.any.System.Runtime"; + version = "4.3.0"; + sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; + }) + + (fetchNuGet { + name = "runtime.any.System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; + }) + + (fetchNuGet { + name = "runtime.any.System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; + }) + + (fetchNuGet { + name = "runtime.any.System.Text.Encoding"; + version = "4.3.0"; + sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; + }) + + (fetchNuGet { + name = "runtime.any.System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; + }) + + (fetchNuGet { + name = "runtime.any.System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; + }) + + (fetchNuGet { + name = "runtime.any.System.Threading.Timer"; + version = "4.3.0"; + sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; + }) + + (fetchNuGet { + name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; + }) + + (fetchNuGet { + name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; + }) + + (fetchNuGet { + name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; + }) + + (fetchNuGet { + name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; + }) + + (fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; + }) + + (fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; + }) + + (fetchNuGet { + name = "runtime.native.System"; + version = "4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) + + (fetchNuGet { + name = "runtime.native.System.IO.Compression"; + version = "4.3.0"; + sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; + }) + + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.3.0"; + sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; + }) + + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; + }) + + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) + + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; + }) + + (fetchNuGet { + name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; + }) + + (fetchNuGet { + name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; + }) + + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }) + + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; + }) + + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; + }) + + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }) + + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; + }) + + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }) + + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; + }) + + (fetchNuGet { + name = "runtime.unix.Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Console"; + version = "4.3.0"; + sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; + }) + + (fetchNuGet { + name = "runtime.unix.System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Net.Primitives"; + version = "4.3.0"; + sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Net.Sockets"; + version = "4.3.0"; + sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Private.Uri"; + version = "4.3.0"; + sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; + }) + +] diff --git a/pkgs/development/dotnet-modules/python-language-server/format-deps.sh b/pkgs/development/dotnet-modules/python-language-server/format-deps.sh new file mode 100755 index 0000000000000..c2115edb18acf --- /dev/null +++ b/pkgs/development/dotnet-modules/python-language-server/format-deps.sh @@ -0,0 +1,40 @@ +#! /usr/bin/env nix-shell +#! nix-shell -p gawk nix -i bash + +# Retrieve sha256 hashes for each dependency in and format fetchNuGet calls +echo "" > deps.nix +urlbase="https://www.nuget.org/api/v2/package" +cat << EOL +# This file is autogenerated. +# To regenerate, run "create_deps.sh \$PATH_TO_LANGUAGE_SERVER_CHECKOUT" + +{ fetchurl }: let + + fetchNuGet = { name, version, sha256 }: fetchurl { + inherit sha256; + url = "$urlbase/\${name}/\${version}"; + }; + +in [ +EOL +IFS='' +while read line; do + name=$(echo $line | awk '{print $1}') + version=$(echo $line | awk '{print $2}') + sha256=$(nix-prefetch-url "$urlbase/$name/$version" 2>/dev/null) + + if [ -n "$sha256" ]; then + cat << EOL + + (fetchNuGet { + name = "$name"; + version = "$version"; + sha256 = "$sha256"; + }) +EOL + fi +done < $1 +cat << EOL + +] +EOL diff --git a/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt b/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt new file mode 100644 index 0000000000000..169ddfbb7b51e --- /dev/null +++ b/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt @@ -0,0 +1,14 @@ +Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.3 +Microsoft.AspNetCore.App.Ref 3.0.1 +Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.2 +Microsoft.AspNetCore.App.Runtime.linux-x64 3.0.3 +Microsoft.AspNetCore.App.Runtime.linux-x64 3.0.2 +Microsoft.NetCore.App.Ref 3.1.0 +Microsoft.NetCore.App.Ref 3.0.0 +Microsoft.NetCore.App.Runtime.linux-x64 3.1.3 +Microsoft.NetCore.App.Runtime.linux-x64 3.1.2 +Microsoft.NetCore.App.Runtime.linux-x64 3.0.2 +Microsoft.NetCore.App.Runtime.linux-x64 3.0.3 +Microsoft.NetCore.App.Host.linux-x64 3.1.3 +Microsoft.NetCore.App.Host.linux-x64 3.0.2 +Microsoft.NetCore.App.Host.linux-x64 3.0.3 diff --git a/pkgs/development/dotnet-modules/python-language-server/process_lockfile.py b/pkgs/development/dotnet-modules/python-language-server/process_lockfile.py new file mode 100755 index 0000000000000..d67bdf048c8a1 --- /dev/null +++ b/pkgs/development/dotnet-modules/python-language-server/process_lockfile.py @@ -0,0 +1,37 @@ +#!/usr/bin/python + +import json +import sys + + +def process_section(name, section): + packages = set() + + if "resolved" in section: + packages.add((name, section["resolved"])) + + if "dependencies" in section: + for name in section["dependencies"]: + packages.add((name, section["dependencies"][name])) + + return packages + + +def main(): + with open(sys.argv[1], 'r') as f: + tree = json.loads(f.read()) + + packages = set() + + topDependencies = tree["dependencies"] + + for area in topDependencies: + for name in topDependencies[area]: + packages = packages.union(process_section(name, topDependencies[area][name])) + + for (name, version) in packages: + print("%s %s" % (name, version)) + + +if __name__ == "__main__": + main() diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 42b446b9fa862..9baeefe1b2cb2 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -13,12 +13,15 @@ # path to go.mod and go.sum directory , modRoot ? "./" -# modSha256 is the sha256 of the vendored dependencies +# vendorSha256 is the sha256 of the vendored dependencies # -# CAUTION: if `null` is used as a value, the derivation won't be a -# fixed-output derivation but disable the build sandbox instead. Don't use -# this in nixpkgs as Hydra won't build those packages. -, modSha256 +# if vendorSha256 is null, then we won't fetch any dependencies and +# rely on the vendor folder within the source. +, vendorSha256 ? null +# Whether to delete the vendor folder supplied with the source. +, deleteVendor ? false + +, modSha256 ? null # We want parallel builds by default , enableParallelBuilding ? true @@ -37,21 +40,26 @@ with builtins; let - args = removeAttrs args' [ "overrideModAttrs" "modSha256" "disabled" ]; + args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "disabled" ]; removeReferences = [ ] ++ lib.optional (!allowGoReference) go; removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}''; - go-modules = go.stdenv.mkDerivation (let modArgs = { + deleteFlag = if deleteVendor then "true" else "false"; + + go-modules = if vendorSha256 != null then go.stdenv.mkDerivation (let modArgs = { + name = "${name}-go-modules"; - nativeBuildInputs = [ go git cacert ]; + nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ go git cacert ]; inherit (args) src; inherit (go) GOOS GOARCH; patches = args.patches or []; + preBuild = args.preBuild or ""; + sourceRoot = args.sourceRoot or ""; GO111MODULE = "on"; @@ -64,7 +72,6 @@ let export GOCACHE=$TMPDIR/go-cache export GOPATH="$TMPDIR/go" - mkdir -p "''${GOPATH}/pkg/mod/cache/download" cd "${modRoot}" runHook postConfigure ''; @@ -72,7 +79,16 @@ let buildPhase = args.modBuildPhase or '' runHook preBuild - go mod download + if [ ${deleteFlag} == "true" ]; then + rm -rf vendor + fi + + if [ -e vendor ]; then + echo "vendor folder exists, please set 'vendorSha256=null;' or 'deleteVendor=true;' in your expression" + exit 10 + fi + go mod vendor + mkdir -p vendor runHook postBuild ''; @@ -81,23 +97,19 @@ let runHook preInstall # remove cached lookup results and tiles - rm -rf "''${GOPATH}/pkg/mod/cache/download/sumdb" - cp -r "''${GOPATH}/pkg/mod/cache/download" $out + cp -r --reflink=auto vendor $out runHook postInstall ''; dontFixup = true; }; in modArgs // ( - if modSha256 == null then - { __noChroot = true; } - else { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = modSha256; + outputHash = vendorSha256; } - ) // overrideModAttrs modArgs); + ) // overrideModAttrs modArgs) else ""; package = go.stdenv.mkDerivation (args // { nativeBuildInputs = [ removeReferencesTo go ] ++ nativeBuildInputs; @@ -105,6 +117,7 @@ let inherit (go) GOOS GOARCH; GO111MODULE = "on"; + GOFLAGS = "-mod=vendor"; configurePhase = args.configurePhase or '' runHook preConfigure @@ -112,9 +125,12 @@ let export GOCACHE=$TMPDIR/go-cache export GOPATH="$TMPDIR/go" export GOSUMDB=off - export GOPROXY=file://${go-modules} - + export GOPROXY=off cd "$modRoot" + if [ -n "${go-modules}" ]; then + rm -rf vendor + ln -s ${go-modules} vendor + fi runHook postConfigure ''; @@ -212,7 +228,7 @@ let disallowedReferences = lib.optional (!allowGoReference) go; - passthru = passthru // { inherit go go-modules modSha256; }; + passthru = passthru // { inherit go go-modules vendorSha256 ; }; meta = { # Add default meta information @@ -225,5 +241,8 @@ let }); in if disabled then throw "${package.name} not supported for go ${go.meta.branch}" +else if modSha256 != null then + lib.warn "modSha256 is deprecated and will be removed in the next release (20.09), use vendorSha256 instead" ( + import ./old.nix { inherit go cacert git lib removeReferencesTo stdenv; } args') else package diff --git a/pkgs/development/go-modules/generic/old.nix b/pkgs/development/go-modules/generic/old.nix new file mode 100644 index 0000000000000..42b446b9fa862 --- /dev/null +++ b/pkgs/development/go-modules/generic/old.nix @@ -0,0 +1,229 @@ +{ go, cacert, git, lib, removeReferencesTo, stdenv }: + +{ name ? "${args'.pname}-${args'.version}" +, src +, buildInputs ? [] +, nativeBuildInputs ? [] +, passthru ? {} +, patches ? [] + +# A function to override the go-modules derivation +, overrideModAttrs ? (_oldAttrs : {}) + +# path to go.mod and go.sum directory +, modRoot ? "./" + +# modSha256 is the sha256 of the vendored dependencies +# +# CAUTION: if `null` is used as a value, the derivation won't be a +# fixed-output derivation but disable the build sandbox instead. Don't use +# this in nixpkgs as Hydra won't build those packages. +, modSha256 + +# We want parallel builds by default +, enableParallelBuilding ? true + +# Disabled flag +, disabled ? false + +# Do not enable this without good reason +# IE: programs coupled with the compiler +, allowGoReference ? false + +, meta ? {} + +, ... }@args': + +with builtins; + +let + args = removeAttrs args' [ "overrideModAttrs" "modSha256" "disabled" ]; + + removeReferences = [ ] ++ lib.optional (!allowGoReference) go; + + removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}''; + + go-modules = go.stdenv.mkDerivation (let modArgs = { + name = "${name}-go-modules"; + + nativeBuildInputs = [ go git cacert ]; + + inherit (args) src; + inherit (go) GOOS GOARCH; + + patches = args.patches or []; + + GO111MODULE = "on"; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" "SOCKS_SERVER" + ]; + + configurePhase = args.modConfigurePhase or '' + runHook preConfigure + + export GOCACHE=$TMPDIR/go-cache + export GOPATH="$TMPDIR/go" + mkdir -p "''${GOPATH}/pkg/mod/cache/download" + cd "${modRoot}" + runHook postConfigure + ''; + + buildPhase = args.modBuildPhase or '' + runHook preBuild + + go mod download + + runHook postBuild + ''; + + installPhase = args.modInstallPhase or '' + runHook preInstall + + # remove cached lookup results and tiles + rm -rf "''${GOPATH}/pkg/mod/cache/download/sumdb" + cp -r "''${GOPATH}/pkg/mod/cache/download" $out + + runHook postInstall + ''; + + dontFixup = true; + }; in modArgs // ( + if modSha256 == null then + { __noChroot = true; } + else + { + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = modSha256; + } + ) // overrideModAttrs modArgs); + + package = go.stdenv.mkDerivation (args // { + nativeBuildInputs = [ removeReferencesTo go ] ++ nativeBuildInputs; + + inherit (go) GOOS GOARCH; + + GO111MODULE = "on"; + + configurePhase = args.configurePhase or '' + runHook preConfigure + + export GOCACHE=$TMPDIR/go-cache + export GOPATH="$TMPDIR/go" + export GOSUMDB=off + export GOPROXY=file://${go-modules} + + cd "$modRoot" + + runHook postConfigure + ''; + + buildPhase = args.buildPhase or '' + runHook preBuild + + buildGoDir() { + local d; local cmd; + cmd="$1" + d="$2" + . $TMPDIR/buildFlagsArray + echo "$d" | grep -q "\(/_\|examples\|Godeps\|testdata\)" && return 0 + [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 + local OUT + if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v -p $NIX_BUILD_CORES $d 2>&1)"; then + if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then + echo "$OUT" >&2 + return 1 + fi + fi + if [ -n "$OUT" ]; then + echo "$OUT" >&2 + fi + return 0 + } + + getGoDirs() { + local type; + type="$1" + if [ -n "$subPackages" ]; then + echo "$subPackages" | sed "s,\(^\| \),\1./,g" + else + find . -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort --unique + fi + } + + if (( "''${NIX_DEBUG:-0}" >= 1 )); then + buildFlagsArray+=(-x) + fi + + if [ ''${#buildFlagsArray[@]} -ne 0 ]; then + declare -p buildFlagsArray > $TMPDIR/buildFlagsArray + else + touch $TMPDIR/buildFlagsArray + fi + if [ -z "$enableParallelBuilding" ]; then + export NIX_BUILD_CORES=1 + fi + for pkg in $(getGoDirs ""); do + echo "Building subPackage $pkg" + buildGoDir install "$pkg" + done + '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + # normalize cross-compiled builds w.r.t. native builds + ( + dir=$GOPATH/bin/${go.GOOS}_${go.GOARCH} + if [[ -n "$(shopt -s nullglob; echo $dir/*)" ]]; then + mv $dir/* $dir/.. + fi + if [[ -d $dir ]]; then + rmdir $dir + fi + ) + '' + '' + runHook postBuild + ''; + + doCheck = args.doCheck or false; + checkPhase = args.checkPhase or '' + runHook preCheck + + for pkg in $(getGoDirs test); do + buildGoDir test "$pkg" + done + + runHook postCheck + ''; + + installPhase = args.installPhase or '' + runHook preInstall + + mkdir -p $out + dir="$GOPATH/bin" + [ -e "$dir" ] && cp -r $dir $out + + runHook postInstall + ''; + + preFixup = (args.preFixup or "") + '' + find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true + ''; + + strictDeps = true; + + disallowedReferences = lib.optional (!allowGoReference) go; + + passthru = passthru // { inherit go go-modules modSha256; }; + + meta = { + # Add default meta information + platforms = go.meta.platforms or lib.platforms.all; + } // meta // { + # add an extra maintainer to every package + maintainers = (meta.maintainers or []) ++ + [ lib.maintainers.kalbasit ]; + }; + }); +in if disabled then + throw "${package.name} not supported for go ${go.meta.branch}" +else + package diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 388280a905fb2..54d1c743bee00 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -203,15 +203,15 @@ let installPhase = args.installPhase or '' runHook preInstall - mkdir -p $bin + mkdir -p $out dir="$NIX_BUILD_TOP/go/bin" - [ -e "$dir" ] && cp -r $dir $bin + [ -e "$dir" ] && cp -r $dir $out runHook postInstall ''; preFixup = preFixup + '' - find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true + find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true ''; strictDeps = true; @@ -235,18 +235,11 @@ let enableParallelBuilding = enableParallelBuilding; - # I prefer to call this dev but propagatedBuildInputs expects $out to exist - outputs = args.outputs or [ "bin" "out" ]; - meta = { # Add default meta information homepage = "https://${goPackagePath}"; platforms = go.meta.platforms or lib.platforms.all; - } // meta // { - # add an extra maintainer to every package - maintainers = (meta.maintainers or []) ++ - [ lib.maintainers.lethalman ]; - }; + } // meta; }); in if disabled then throw "${package.name} not supported for go ${go.meta.branch}" diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 8377dad690f6b..690fce9da66bb 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { maintained graphics library with all of the benefits of Scheme: memory management, exceptions, macros, and a dynamic programming environment. ''; - homepage = https://www.nongnu.org/guile-cairo/; + homepage = "https://www.nongnu.org/guile-cairo/"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.linux; diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/development/guile-modules/guile-fibers/default.nix index cfb56790221e4..88ba443b6b8ac 100644 --- a/pkgs/development/guile-modules/guile-fibers/default.nix +++ b/pkgs/development/guile-modules/guile-fibers/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Concurrent ML-like concurrency for Guile"; - homepage = https://github.com/wingo/fibers; + homepage = "https://github.com/wingo/fibers"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.linux; diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix index 6ffcc153ec45a..aee74c0ac4dc0 100644 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "0001-fix-prototypes.patch"; - url = https://aur.archlinux.org/cgit/aur.git/plain/reader_flag.patch?h=guile-reader&id=63ac0413a1aa65eb6a0db57bc16ef4481b70dc31; + url = "https://aur.archlinux.org/cgit/aur.git/plain/reader_flag.patch?h=guile-reader&id=63ac0413a1aa65eb6a0db57bc16ef4481b70dc31"; sha256 = "01ar34xgpxyli8v2bk4kj6876kyrxhxhfpv9v07lx36d254bzrjb"; }) ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { "token readers" of a standard Scheme readers. For example, it is used to implement Skribilo's R5RS-derived document syntax. ''; - homepage = https://www.nongnu.org/guile-reader/; + homepage = "https://www.nongnu.org/guile-reader/"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.gnu; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9ecf7e3bd1f0a..6ce71eb4731b7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -45,18 +45,6 @@ self: super: { # Needs older QuickCheck version attoparsec-varword = dontCheck super.attoparsec-varword; - # https://github.com/koalaman/shellcheck/issues/1778 - ShellCheck = overrideCabal super.ShellCheck (drv: { - patches = [ - # cabal 3.0 support - ( pkgs.fetchpatch { - url = "https://github.com/koalaman/shellcheck/commit/2c026f1ec7c205c731ff2a0ccd85365f37245.patch"; - sha256 = "0z6yf350ngr6rwfkvdy670c476fgzj8a0n4ppdm1xr8r1lij7sfz"; - excludes = [ "Dockerfile" ]; - }) - ]; - }); - # Tests are failing # https://github.com/bos/statistics/issues/123 statistics = dontCheck super.statistics; @@ -83,7 +71,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1jjw6ar8ddcncwzksyx2xky50sm2jg1zjr7iiqk0vn8qq0fn2gwy"; + sha256 = "0adw72lw3ygls87w6i7hirf26gz991dkm992jb5f0h5nvy6d44pl"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -126,13 +114,8 @@ self: super: { # Depends on broken "hails" package. hails-bin = dontDistribute super.hails-bin; - # Switch levmar build to openblas. bindings-levmar = overrideCabal super.bindings-levmar (drv: { - preConfigure = '' - sed -i bindings-levmar.cabal \ - -e 's,extra-libraries: lapack blas,extra-libraries: openblas,' - ''; - extraLibraries = [ pkgs.openblasCompat ]; + extraLibraries = [ pkgs.blas ]; }); # The Haddock phase fails for one reason or another. @@ -189,6 +172,9 @@ self: super: { # Test suite build depends on ancient tasty 0.11.x. cryptohash-sha512 = dontCheck super.cryptohash-sha512; + # Test suite depends on source code being available + simple-affine-space = dontCheck super.simple-affine-space; + # https://github.com/kazu-yamamoto/simple-sendfile/issues/17 simple-sendfile = dontCheck super.simple-sendfile; @@ -347,6 +333,7 @@ self: super: { nats-queue = dontCheck super.nats-queue; netpbm = dontCheck super.netpbm; network = dontCheck super.network; + network_2_6_3_1 = dontCheck super.network_2_6_3_1; network-dbus = dontCheck super.network-dbus; notcpp = dontCheck super.notcpp; ntp-control = dontCheck super.ntp-control; @@ -385,7 +372,7 @@ self: super: { static-resources = dontCheck super.static-resources; strive = dontCheck super.strive; # fails its own hlint test with tons of warnings svndump = dontCheck super.svndump; - tar = dontCheck super.tar; #http://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit) + tar = dontCheck super.tar; #https://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit) th-printf = dontCheck super.th-printf; thumbnail-plus = dontCheck super.thumbnail-plus; tickle = dontCheck super.tickle; @@ -606,6 +593,12 @@ self: super: { elm-server = markBroken super.elm-server; elm-yesod = markBroken super.elm-yesod; + # https://github.com/Euterpea/Euterpea2/issues/40 + Euterpea = appendPatch super.Euterpea (pkgs.fetchpatch { + url = "https://github.com/Euterpea/Euterpea2/pull/38.patch"; + sha256 = "13g462qmj8c7if797gnyvf8h0cddmm3xy0pjldw48w8f8sr4qsj0"; + }); + # https://github.com/athanclark/sets/issues/2 sets = dontCheck super.sets; @@ -698,7 +691,7 @@ self: super: { # Djinn's last release was 2014, incompatible with Semigroup-Monoid Proposal # https://github.com/augustss/djinn/pull/8 djinn = appendPatch super.djinn (pkgs.fetchpatch { - url = https://github.com/augustss/djinn/commit/6cb9433a137fb6b5194afe41d616bd8b62b95630.patch; + url = "https://github.com/augustss/djinn/commit/6cb9433a137fb6b5194afe41d616bd8b62b95630.patch"; sha256 = "0s021y5nzrh74gfp8xpxpxm11ivzfs3jwg6mkrlyry3iy584xqil"; }); @@ -716,10 +709,19 @@ self: super: { ''; }); - # The standard libraries are compiled separately - idris = generateOptparseApplicativeCompletion "idris" ( - doJailbreak (dontCheck super.idris) - ); + # The standard libraries are compiled separately. + # The megaparsec-7 override is needed because https://github.com/idris-lang/Idris-dev/issues/4826 declares that + # idris1 has no plans to migrate to megaparsec-8. + # The idris-lang/Idris-dev#4808 patch is for GHC 8.8 compatibility, and can likely be removed with the next release. + idris = generateOptparseApplicativeCompletion "idris" (doJailbreak (dontCheck + (appendPatches + (super.idris.override { megaparsec = self.megaparsec_7_0_5; }) [ + (pkgs.fetchpatch { + url = "https://github.com/idris-lang/Idris-dev/pull/4808.diff"; + sha256 = "060ib1rczy34ip8xf3bv1pf28655f6s0bvvij19jhh5dpcr0pf71"; + excludes = [ ".travis.yml" "Makefile" "appveyor.yml" ]; + }) + ]))); # https://github.com/bos/math-functions/issues/25 math-functions = dontCheck super.math-functions; @@ -1060,45 +1062,14 @@ self: super: { # https://github.com/haskell-hvr/hgettext/issues/14 hgettext = doJailbreak super.hgettext; - # 2.23.0 supports GHC 8.x and up - haddock = super.haddock_2_22_0; - # haddock-api-2.22.0: Break out of “QuickCheck ==2.11.*, hspec >=2.4.4 && <2.6” - haddock-api = dontHaddock (doJailbreak (super.haddock-api_2_22_0)); - # The test suite is broken. Break out of "base-compat >=0.9.3 && <0.10, hspec >=2.4.4 && <2.5". haddock-library = doJailbreak (dontCheck super.haddock-library); + haddock-library_1_9_0 = doJailbreak (dontCheck super.haddock-library_1_9_0); # Generate shell completion. cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; - - stack = - let - stackWithOverrides = - super.stack.override { - # stack-2.1.3.1 requires pantry-0.2.0.0. - pantry = self.pantry_0_2_0_0; - }; - in - generateOptparseApplicativeCompletion - "stack" - (appendPatches stackWithOverrides [ - # This PR fixes stack up to be able to build with Cabal-3. This patch - # can probably be dropped when the next stack release is made after - # 2.1.3.1. - (pkgs.fetchpatch { - url = "https://github.com/commercialhaskell/stack/pull/5156.diff"; - sha256 = "0knk6f9fh1b4fxkhvx5gfrwclal4vi2va4zy34gpmwnjr7knf42y"; - excludes = [ - "snapshot-lts-12.yaml" - "snapshot-nightly.yaml" - "snapshot.yaml" - ]; - }) - # This patch fixes stack up to be able to build various GHC-8.8 changes. - # This can hopefully be dropped when the next stack release is made - # after 2.1.3.1 (assuming the next stack release uses GHC-8.8). - ./patches/stack-ghc882-support.patch - ]); + stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: { http-download = self.http-download_0_2_0_0; })); + http-download_0_2_0_0 = dontCheck super.http-download_0_2_0_0; # musl fixes # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test @@ -1310,12 +1281,12 @@ self: super: { snap-server = overrideCabal super.snap-server (drv: { patches = [(pkgs.fetchpatch { # allow compilation with network >= 3 - url = https://github.com/snapframework/snap-server/pull/126/commits/4338fe15d68e11e3c7fd0f9862f818864adc1d45.patch; + url = "https://github.com/snapframework/snap-server/pull/126/commits/4338fe15d68e11e3c7fd0f9862f818864adc1d45.patch"; sha256 = "1nlw9lckm3flzkmhkzwc7zxhdh9ns33w8p8ds8nf574nqr5cr8bv"; }) (pkgs.fetchpatch { # prefer fdSocket over unsafeFdSocket - url = https://github.com/snapframework/snap-server/pull/126/commits/410de2df123b1d56b3093720e9c6a1ad79fe9de6.patch; + url = "https://github.com/snapframework/snap-server/pull/126/commits/410de2df123b1d56b3093720e9c6a1ad79fe9de6.patch"; sha256 = "08psvw0xny64q4bw1nwg01pkzh01ak542lw6k1ps7cdcwaxk0n94"; })]; }); @@ -1453,8 +1424,8 @@ self: super: { # details. cryptonite = dontCheck super.cryptonite; - # The test suite depends on an impure cabal-install installation - # in $HOME, which we don't have in our build sandbox. + # The test suite depends on an impure cabal-install installation in + # $HOME, which we don't have in our build sandbox. cabal-install-parsers = dontCheck super.cabal-install-parsers; # haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2. @@ -1465,7 +1436,9 @@ self: super: { vty = self.vty_5_28_2; }); + # Test suite requires database persistent-mysql = dontCheck super.persistent-mysql; + persistent-postgresql = dontCheck super.persistent-postgresql; # Fix EdisonAPI and EdisonCore for GHC 8.8: # https://github.com/robdockins/edison/pull/16 @@ -1499,7 +1472,51 @@ self: super: { polysemy = self.polysemy_1_3_0_0; }; - # Fixed at head, but hasn't cut a release in awhile. - darcs = doJailbreak super.darcs; + # Test suite requires running a database server. Testing is done upstream. + hasql-pool = dontCheck super.hasql-pool; + + # This bumps optparse-applicative to <0.16 in the cabal file, as otherwise + # the version bounds are not satisfied. This can be removed if the PR at + # https://github.com/ananthakumaran/webify/pull/27 is merged and a new + # release of webify is published. + webify = appendPatch super.webify (pkgs.fetchpatch { + url = "https://github.com/ananthakumaran/webify/pull/27/commits/6d653e7bdc1ffda75ead46851b5db45e87cb2aa0.patch"; + sha256 = "sha256:0xbfhzhzg94b4r5qy5dg1c40liswwpqarrc2chcwgfbfnrmwkfc2"; + }); + + # Depends on selective >= 0.4, but the default of selective is 0.3 + headed-megaparsec = super.headed-megaparsec.override { + selective = self.selective_0_4_1; + }; + + # Needed for ghcide + haskell-lsp_0_19_0_0 = super.haskell-lsp_0_19_0_0.override { + haskell-lsp-types = self.haskell-lsp-types_0_19_0_0; + }; + + # this will probably need to get updated with every ghcide update, + # we need an override because ghcide is tracking haskell-lsp closely. + ghcide = dontCheck (super.ghcide.override rec { + haskell-lsp-types = self.haskell-lsp-types_0_19_0_0; + haskell-lsp = self.haskell-lsp_0_19_0_0; + }); + + # stackage right now is not new enough for hlint-3.0 + ghc-lib-parser-ex_8_10_0_8 = super.ghc-lib-parser-ex_8_10_0_8.override { + ghc-lib-parser = self.ghc-lib-parser_8_10_1_20200412; + }; + + hlint = super.hlint.override { + ghc-lib-parser = self.ghc-lib-parser_8_10_1_20200412; + ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_8; + extra = self.extra_1_7_1; + filepattern = self.filepattern.override { + extra = self.extra_1_7_1; + }; + }; + + # hasn‘t bumped upper bounds + # upstream: https://github.com/obsidiansystems/which/pull/6 + which = doJailbreak super.which; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index f9e9e189a9a5b..54e3557736b85 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -42,10 +42,32 @@ self: super: { unix = null; xhtml = null; + # The proper 3.2.0.0 release does not compile with ghc-8.10.1, so we take the + # hitherto unreleased next version from the '3.2' branch of the upstream git + # repository for the time being. + cabal-install = assert super.cabal-install.version == "3.2.0.0"; + overrideCabal super.cabal-install (drv: { + postUnpack = "sourceRoot+=/cabal-install; echo source root reset to $sourceRoot"; + version = "3.2.0.0-git"; + editedCabalFile = null; + src = pkgs.fetchgit { + url = "git://github.com/haskell/cabal.git"; + rev = "9bd4cc0591616aeae78e17167338371a2542a475"; + sha256 = "005q1shh7vqgykkp72hhmswmrfpz761x0q0jqfnl3wqim4xd9dg0"; + }; + }); + + # Deviate from Stackage LTS-15.x to fix the build. + haddock-library = self.haddock-library_1_9_0; + # Jailbreak to fix the build. async = doJailbreak super.async; ChasingBottoms = doJailbreak super.ChasingBottoms; + ed25519 = doJailbreak super.ed25519; + email-validate = doJailbreak super.email-validate; # https://github.com/Porges/email-validate-hs/issues/51 + feed = doJailbreak super.feed; # https://github.com/bergmark/feed/issues/48 hashable = doJailbreak super.hashable; + pandoc = doJailbreak super.pandoc; parallel = doJailbreak super.parallel; regex-base = doJailbreak super.regex-base; regex-compat = doJailbreak super.regex-compat; @@ -53,12 +75,70 @@ self: super: { regex-posix = doJailbreak super.regex-posix; regex-tdfa = doJailbreak super.regex-tdfa; split = doJailbreak super.split; + system-fileio = doJailbreak super.system-fileio; tar = doJailbreak super.tar; tasty-expected-failure = doJailbreak super.tasty-expected-failure; + tasty-rerun = doJailbreak super.tasty-rerun; # https://github.com/ocharles/tasty-rerun/issues/18 unliftio-core = doJailbreak super.unliftio-core; vector = doJailbreak super.vector; zlib = doJailbreak super.zlib; # Use the latest version to fix the build. + dhall = self.dhall_1_32_0; + ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_4; + lens = self.lens_4_19_2; + optics-core = self.optics-core_0_3; + repline = self.repline_0_3_0_0; + singletons = self.singletons_2_7; + th-desugar = self.th-desugar_1_11; + + # `ghc-lib-parser-ex` (see conditionals in its `.cabal` file) does not need + # the `ghc-lib-parser` dependency on GHC >= 8.8. However, because we have + # multiple verions of `ghc-lib-parser(-ex)` available, and the default ones + # are older ones, those older ones will complain. Because we have a newer + # GHC, we can just set the dependency to `null` as it is not used. + ghc-lib-parser-ex_8_10_0_4 = super.ghc-lib-parser-ex_8_10_0_4.override { ghc-lib-parser = null; }; + + # Jailbreak to fix the build. + aeson-diff = doJailbreak super.aeson-diff; + brick = doJailbreak super.brick; + cborg = doJailbreak super.cborg; + cborg-json = doJailbreak super.cborg-json; + exact-pi = doJailbreak super.exact-pi; + policeman = doJailbreak super.policeman; + relude = dontCheck (doJailbreak super.relude); + serialise = doJailbreak super.serialise; + setlocale = doJailbreak super.setlocale; + shellmet = doJailbreak super.shellmet; + weeder = doJailbreak super.weeder; # https://github.com/ocharles/weeder/issues/15 + xmobar = doJailbreak super.xmobar; + + # The shipped Setup.hs file is broken. + csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; }); + + # Apply patch from https://github.com/finnsson/template-helper/issues/12#issuecomment-611795375 to fix the build. + language-haskell-extract = appendPatch (doJailbreak super.language-haskell-extract) (pkgs.fetchpatch { + name = "language-haskell-extract-0.2.4.patch"; + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/e48738ee1be774507887a90a0d67ad1319456afc/patches/language-haskell-extract-0.2.4.patch?inline=false"; + sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; + }); + + # Only 0.8 is compatible with ghc 8.10 https://hackage.haskell.org/package/apply-refact/changelog + apply-refact = super.apply-refact_0_8_0_0; + + # Apply patch to fix the build. + cabal-plan = appendPatch super.cabal-plan (pkgs.fetchpatch { + name = "cabal-plan-fix-for-ghc-8.10.x.patch"; + url = "https://github.com/haskell-hvr/cabal-plan/pull/55.patch"; + sha256 = "0lhs4vx5qg5ldhnyb9z7k0jmxhmd2f34x4xbwv6vsljs9vr02pd8"; + }); + + # https://github.com/commercialhaskell/pantry/issues/21 + pantry = appendPatch super.pantry (pkgs.fetchpatch { + name = "add-cabal-3.2.x-support.patch"; + url = "https://patch-diff.githubusercontent.com/raw/commercialhaskell/pantry/pull/22.patch"; + sha256 = "198hsfjsy83s7rp71llf05cwa3vkm74g73djg5p4sk4awm9s6vf2"; + excludes = ["package.yaml"]; + }); } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index ce52ccb116937..f1260735479b0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -63,7 +63,7 @@ self: super: { # https://github.com/jystic/hadoop-tools/issues/31 hadoop-rpc = let patch = pkgs.fetchpatch - { url = https://github.com/shlevy/hadoop-tools/commit/f03a46cd15ce3796932c3382e48bcbb04a6ee102.patch; + { url = "https://github.com/shlevy/hadoop-tools/commit/f03a46cd15ce3796932c3382e48bcbb04a6ee102.patch"; sha256 = "09ls54zy6gx84fmzwgvx18ssgm740cwq6ds70p0p125phi54agcp"; stripLen = 1; }; @@ -73,7 +73,7 @@ self: super: { # https://github.com/NICTA/coordinate/pull/4 coordinate = let patch = pkgs.fetchpatch - { url = https://github.com/NICTA/coordinate/pull/4.patch; + { url = "https://github.com/NICTA/coordinate/pull/4.patch"; sha256 = "06sfxk5cyd8nqgjyb95jkihxxk8m6dw9m3mlv94sm2qwylj86gqy"; }; in appendPatch super.coordinate patch; @@ -91,4 +91,7 @@ self: super: { ListLike = addBuildDepend super.ListLike self.semigroups; base-compat-batteries = addBuildDepend super.base-compat-batteries self.contravariant; + # ghc versions prior to 8.8.x needs additional dependency to compile successfully. + ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 785bab743a4f8..d5ae77e8246ef 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -59,7 +59,7 @@ self: super: { # https://github.com/jystic/hadoop-tools/issues/31 hadoop-rpc = let patch = pkgs.fetchpatch - { url = https://github.com/shlevy/hadoop-tools/commit/f03a46cd15ce3796932c3382e48bcbb04a6ee102.patch; + { url = "https://github.com/shlevy/hadoop-tools/commit/f03a46cd15ce3796932c3382e48bcbb04a6ee102.patch"; sha256 = "09ls54zy6gx84fmzwgvx18ssgm740cwq6ds70p0p125phi54agcp"; stripLen = 1; }; @@ -86,4 +86,7 @@ self: super: { # The old Haddock cannot process the newer documentation syntax. fast-logger = dontHaddock super.fast-logger; + # ghc versions prior to 8.8.x needs additional dependency to compile successfully. + ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index ff69c809288a1..57c38b22ccd8c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -88,4 +88,9 @@ self: super: { stylish-cabal = doDistribute (markUnbroken (super.stylish-cabal.override { haddock-library = self.haddock-library_1_7_0; })); haddock-library_1_7_0 = dontCheck super.haddock-library_1_7_0; + # ghc versions prior to 8.8.x needs additional dependency to compile successfully. + ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; + + # Only 0.6 is compatible with ghc 8.6 https://hackage.haskell.org/package/apply-refact/changelog + apply-refact = super.apply-refact_0_6_0_0; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 8b38f8cef74cd..7395d059b4d7f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -41,6 +41,10 @@ self: super: { unix = null; xhtml = null; + # GHC 8.8.x can build haddock version 2.23.* + haddock = self.haddock_2_23_1; + haddock-api = self.haddock-api_2_23_1; + # These builds need Cabal 3.2.x. cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_0_0; }; cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; }); @@ -91,4 +95,15 @@ self: super: { # ghc-8.8: # https://github.com/adnelson/semver-range/issues/15 semver-range = dontCheck super.semver-range; + + # The current version 2.14.2 does not compile with ghc-8.8.x or newer because + # of issues with Cabal 3.x. + darcs = dontDistribute super.darcs; + + # Only 0.7 is compatible with ghc 8.7 https://hackage.haskell.org/package/apply-refact/changelog + apply-refact = super.apply-refact_0_7_0_0; + + # The package needs the latest Cabal version. + cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; }); + } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 2f6a0b8978d2b..a30e4d93e6a54 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -72,7 +72,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 15.6 + # LTS Haskell 15.12 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -259,7 +259,7 @@ default-package-overrides: - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 - - autoexporter ==1.1.15 + - autoexporter ==1.1.16 - auto-update ==0.1.6 - avers ==0.0.17.1 - avro ==0.4.7.0 @@ -309,7 +309,7 @@ default-package-overrides: - bitarray ==0.0.1.1 - bits ==0.5.2 - bitset-word8 ==0.1.1.1 - - bits-extra ==0.0.1.5 + - bits-extra ==0.0.2.0 - bitvec ==1.0.3.0 - blake2 ==0.3.0 - blanks ==0.3.0 @@ -319,7 +319,7 @@ default-package-overrides: - blaze-bootstrap ==0.1.0.1 - blaze-builder ==0.4.1.0 - blaze-html ==0.9.1.2 - - blaze-markup ==0.8.2.4 + - blaze-markup ==0.8.2.5 - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.1.0 - bmp ==1.2.6.3 @@ -346,7 +346,7 @@ default-package-overrides: - buffer-builder ==0.2.4.7 - buffer-pipe ==0.0 - bugsnag-hs ==0.1.0.0 - - butcher ==1.3.2.3 + - butcher ==1.3.3.1 - bv ==0.5 - bv-little ==1.1.1 - byteable ==0.1.1 @@ -378,6 +378,8 @@ default-package-overrides: - can-i-haz ==0.3.1.0 - ca-province-codes ==1.0.0.0 - carray ==0.1.6.8 + - casa-client ==0.0.1 + - casa-types ==0.0.1 - cased ==0.1.0.0 - case-insensitive ==1.2.1.0 - cases ==0.1.3.2 @@ -388,7 +390,7 @@ default-package-overrides: - cast ==0.1.0.2 - category ==0.2.5.0 - cayley-client ==0.4.12 - - cborg ==0.2.2.1 + - cborg ==0.2.3.0 - cborg-json ==0.2.2.0 - cereal ==0.5.8.1 - cereal-conduit ==0.8.0 @@ -408,7 +410,7 @@ default-package-overrides: - chimera ==0.3.1.0 - choice ==0.2.2 - chronologique ==0.3.1.1 - - chronos ==1.1 + - chronos ==1.1.1 - chronos-bench ==0.2.0.2 - chunked-data ==0.3.1 - cipher-aes ==0.2.11 @@ -437,9 +439,9 @@ default-package-overrides: - codec-rpm ==0.2.2 - code-page ==0.2 - coercible-utils ==0.1.0 - - co-log ==0.4.0.0 - - co-log-core ==0.2.1.0 - - co-log-polysemy ==0.0.1.1 + - co-log ==0.4.0.1 + - co-log-core ==0.2.1.1 + - co-log-polysemy ==0.0.1.2 - Color ==0.1.4 - colorful-monoids ==0.2.1.2 - colorize-haskell ==1.0.1 @@ -496,7 +498,7 @@ default-package-overrides: - core-text ==0.2.3.3 - countable ==1.0 - cpio-conduit ==0.7.0 - - cpphs ==1.20.9 + - cpphs ==1.20.9.1 - cprng-aes ==0.6.1 - cpu ==0.1.2 - cpuinfo ==0.1.0.1 @@ -556,10 +558,10 @@ default-package-overrides: - data-default-instances-dlist ==0.0.1 - data-default-instances-old-locale ==0.0.1 - data-diverse ==4.7.0.0 - - datadog ==0.2.4.0 - - data-dword ==0.3.1.3 + - datadog ==0.2.5.0 + - data-dword ==0.3.2 - data-endian ==0.1.1 - - data-fix ==0.2.0 + - data-fix ==0.2.1 - data-has ==0.3.0.0 - data-interval ==2.0.1 - data-inttrie ==0.1.4 @@ -574,7 +576,7 @@ default-package-overrides: - data-tree-print ==0.1.0.2 - dataurl ==0.1.0.0 - DAV ==1.3.4 - - dbus ==1.2.13 + - dbus ==1.2.14 - debian-build ==0.10.2.0 - debug-trace-var ==0.2.0 - dec ==0.0.3 @@ -587,7 +589,7 @@ default-package-overrides: - deque ==0.4.3 - deriveJsonNoPrefix ==0.1.0.1 - deriving-compat ==0.5.8 - - derulo ==1.0.7 + - derulo ==1.0.8 - detour-via-sci ==1.0.0 - dhall ==1.30.0 - dhall-bash ==1.0.28 @@ -599,7 +601,7 @@ default-package-overrides: - diagrams-lib ==1.4.3 - diagrams-postscript ==1.5 - diagrams-rasterific ==1.4.2 - - diagrams-solve ==0.1.1 + - diagrams-solve ==0.1.2 - diagrams-svg ==1.4.3 - di-core ==1.0.4 - dictionary-sharing ==0.1.0.0 @@ -613,9 +615,9 @@ default-package-overrides: - disk-free-space ==0.1.0.1 - distributed-closure ==0.4.2.0 - distribution-opensuse ==1.1.1 - - distributive ==0.6.1 + - distributive ==0.6.2 - dl-fedora ==0.7.4 - - dlist ==0.8.0.7 + - dlist ==0.8.0.8 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - dns ==4.0.1 @@ -664,11 +666,11 @@ default-package-overrides: - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - emacs-module ==0.1.1 - - email-validate ==2.3.2.12 + - email-validate ==2.3.2.13 - emojis ==0.1 - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 - - entropy ==0.4.1.5 + - entropy ==0.4.1.6 - enummapset ==0.6.0.2 - enumset ==0.0.5 - enum-subset-generate ==0.1.0.0 @@ -706,7 +708,7 @@ default-package-overrides: - extensible-exceptions ==0.1.1.4 - extra ==1.6.21 - extractable-singleton ==0.0.1 - - extrapolate ==0.4.1 + - extrapolate ==0.4.2 - fail ==4.9.0.0 - failable ==1.2.4.0 - fakedata ==0.5.0 @@ -747,9 +749,10 @@ default-package-overrides: - flat-mcmc ==1.5.1 - FloatingHex ==0.4 - floatshow ==0.2.4 - - flow ==1.0.19 + - flow ==1.0.20 - flush-queue ==1.0.0 - fmlist ==0.9.3 + - fmt ==0.6.1.2 - fn ==0.3.0.2 - focus ==1.0.1.3 - focuslist ==0.1.0.2 @@ -822,23 +825,23 @@ default-package-overrides: - genvalidity-scientific ==0.2.1.1 - genvalidity-text ==0.7.0.2 - genvalidity-time ==0.3.0.0 - - genvalidity-typed-uuid ==0.0.0.1 + - genvalidity-typed-uuid ==0.0.0.2 - genvalidity-unordered-containers ==0.3.0.1 - - genvalidity-uuid ==0.1.0.3 + - genvalidity-uuid ==0.1.0.4 - genvalidity-vector ==0.3.0.1 - - geojson ==4.0.1 + - geojson ==4.0.2 - getopt-generics ==0.13.0.4 - ghc-compact ==0.1.0.0 - ghc-core ==0.5.6 - ghc-exactprint ==0.6.2 - - ghcid ==0.8.5 + - ghcid ==0.8.6 - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - - ghc-lib ==8.8.3.20200224 - - ghc-lib-parser ==8.8.3.20200224 + - ghc-lib ==8.8.3.20200412.1 + - ghc-lib-parser ==8.8.3.20200412.1 - ghc-lib-parser-ex ==8.8.5.8 - ghc-paths ==0.1.0.12 - - ghc-prof ==1.4.1.6 + - ghc-prof ==1.4.1.7 - ghc-source-gen ==0.3.0.0 - ghc-syntax-highlighter ==0.0.5.0 - ghc-tcplugins-extra ==0.4 @@ -858,15 +861,15 @@ default-package-overrides: - gi-glib ==2.0.23 - gi-gobject ==2.0.22 - gi-graphene ==1.0.1 - - gi-gtk ==3.0.32 + - gi-gtk ==3.0.33 - gi-gtk-hs ==0.3.8.1 - gingersnap ==0.3.1.0 - gi-pango ==1.0.22 - giphy-api ==0.7.0.0 - - githash ==0.1.3.3 + - githash ==0.1.4.0 - github-rest ==1.0.2 - github-types ==0.2.1 - - gitlab-haskell ==0.1.7 + - gitlab-haskell ==0.1.8 - gitrev ==1.3.1 - gi-xlib ==2.0.8 - gl ==0.9 @@ -888,14 +891,15 @@ default-package-overrides: - graphviz ==2999.20.0.4 - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 - - greskell ==1.0.0.1 + - greskell ==1.0.1.0 - greskell-core ==0.1.3.2 - - greskell-websocket ==0.1.2.1 + - greskell-websocket ==0.1.2.2 - groom ==0.1.2.1 - group-by-date ==0.1.0.3 - groups ==0.4.1.0 - guarded-allocation ==0.0.1 - hackage-db ==2.1.0 + - hackage-security ==0.6.0.1 - haddock-library ==1.8.0 - half ==0.3 - hamtsolo ==1.0.3 @@ -908,7 +912,7 @@ default-package-overrides: - hashmap ==1.3.3 - hashtables ==1.2.3.4 - haskeline ==0.7.5.0 - - haskell-gi ==0.23.0 + - haskell-gi ==0.23.1 - haskell-gi-base ==0.23.0 - haskell-gi-overloading ==1.0 - haskell-import-graph ==1.0.4 @@ -922,7 +926,7 @@ default-package-overrides: - haskell-src-meta ==0.8.5 - haskey-btree ==0.3.0.1 - haskoin-core ==0.10.1 - - haskoin-node ==0.9.16 + - haskoin-node ==0.9.21 - hasql ==1.4.2 - hasql-optparse-applicative ==0.3.0.5 - hasql-pool ==0.5.1 @@ -931,6 +935,8 @@ default-package-overrides: - HaXml ==1.25.5 - haxr ==3000.11.4 - hdaemonize ==0.5.6 + - HDBC ==2.4.0.3 + - HDBC-session ==0.1.2.0 - headroom ==0.1.3.0 - heap ==1.0.4 - heaps ==0.3.6.1 @@ -957,7 +963,7 @@ default-package-overrides: - highlighting-kate ==0.6.4 - hinfo ==0.0.3.0 - hinotify ==0.4 - - hint ==0.9.0.2 + - hint ==0.9.0.3 - hjsmin ==0.2.0.4 - hkgr ==0.2.5.2 - hlibcpuid ==0.2.0 @@ -977,6 +983,7 @@ default-package-overrides: - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.9 + - hpack ==0.33.0 - hpc-codecov ==0.1.0.0 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 @@ -985,7 +992,7 @@ default-package-overrides: - hsc2hs ==0.68.7 - hscolour ==1.24.4 - hsdns ==1.8 - - hsebaysdk ==0.4.0.0 + - hsebaysdk ==0.4.1.0 - hsemail ==2.2.0 - hset ==2.2.0 - hs-functors ==0.1.6.0 @@ -995,10 +1002,10 @@ default-package-overrides: - HSlippyMap ==3.0.1 - hslogger ==1.3.1.0 - hslua ==1.0.3.2 - - hslua-aeson ==1.0.0 + - hslua-aeson ==1.0.1 - hslua-module-system ==0.2.1 - hslua-module-text ==0.2.1 - - HsOpenSSL ==0.11.4.17 + - HsOpenSSL ==0.11.4.18 - hsp ==0.10.0 - hspec ==2.7.1 - hspec-attoparsec ==0.1.0.2 @@ -1032,7 +1039,7 @@ default-package-overrides: - html-entities ==1.1.4.3 - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - - http2 ==2.0.3 + - http2 ==2.0.4 - HTTP ==4000.3.14 - http-api-data ==0.4.1.1 - http-client ==0.6.4.1 @@ -1053,39 +1060,39 @@ default-package-overrides: - human-readable-duration ==0.2.1.4 - HUnit ==1.6.0.0 - HUnit-approx ==1.1.1.1 - - hunit-dejafu ==2.0.0.1 + - hunit-dejafu ==2.0.0.2 - hvect ==0.4.0.0 - hvega ==0.5.0.0 - - hw-balancedparens ==0.3.0.5 - - hw-bits ==0.7.1.5 - - hw-conduit ==0.2.0.6 - - hw-conduit-merges ==0.2.0.0 - - hw-diagnostics ==0.0.0.7 - - hw-dsv ==0.4.0 + - hw-balancedparens ==0.3.1.0 + - hw-bits ==0.7.2.0 + - hw-conduit ==0.2.1.0 + - hw-conduit-merges ==0.2.1.0 + - hw-diagnostics ==0.0.1.0 + - hw-dsv ==0.4.1.0 - hweblib ==0.6.3 - - hw-eliasfano ==0.1.1.1 - - hw-excess ==0.2.2.3 - - hw-fingertree ==0.1.1.1 - - hw-fingertree-strict ==0.1.1.3 - - hw-hedgehog ==0.1.0.5 - - hw-hspec-hedgehog ==0.1.0.9 - - hw-int ==0.0.0.4 - - hw-ip ==2.4.1.0 - - hw-json ==1.3.1.1 - - hw-json-simd ==0.1.0.4 - - hw-json-simple-cursor ==0.1.0.2 - - hw-json-standard-cursor ==0.2.1.2 - - hw-mquery ==0.2.0.2 - - hw-packed-vector ==0.2.0.1 - - hw-parser ==0.1.0.2 - - hw-prim ==0.6.2.40 - - hw-rankselect ==0.13.3.2 - - hw-rankselect-base ==0.3.3.0 - - hw-simd ==0.1.1.5 - - hw-streams ==0.0.0.12 + - hw-eliasfano ==0.1.2.0 + - hw-excess ==0.2.3.0 + - hw-fingertree ==0.1.2.0 + - hw-fingertree-strict ==0.1.2.0 + - hw-hedgehog ==0.1.1.0 + - hw-hspec-hedgehog ==0.1.1.0 + - hw-int ==0.0.2.0 + - hw-ip ==2.4.2.0 + - hw-json ==1.3.2.0 + - hw-json-simd ==0.1.1.0 + - hw-json-simple-cursor ==0.1.1.0 + - hw-json-standard-cursor ==0.2.3.1 + - hw-mquery ==0.2.1.0 + - hw-packed-vector ==0.2.1.0 + - hw-parser ==0.1.1.0 + - hw-prim ==0.6.3.0 + - hw-rankselect ==0.13.4.0 + - hw-rankselect-base ==0.3.4.0 + - hw-simd ==0.1.2.0 + - hw-streams ==0.0.1.0 - hw-string-parse ==0.0.0.4 - hw-succinct ==0.1.0.1 - - hw-xml ==0.5.0.0 + - hw-xml ==0.5.1.0 - hxt ==9.3.1.18 - hxt-charproperties ==9.4.0.0 - hxt-css ==0.1.0.3 @@ -1104,7 +1111,7 @@ default-package-overrides: - if ==0.1.0.0 - iff ==0.0.6 - ihs ==0.1.0.3 - - ilist ==0.4.0.0 + - ilist ==0.4.0.1 - imagesize-conduit ==1.1 - Imlib ==0.1.2 - immortal ==0.3 @@ -1112,17 +1119,17 @@ default-package-overrides: - incremental-parser ==0.4.0.1 - indents ==0.5.0.1 - indexed ==0.1.3 - - indexed-list-literals ==0.2.1.2 + - indexed-list-literals ==0.2.1.3 - indexed-profunctors ==0.1 - infer-license ==0.2.0 - inflections ==0.4.0.5 - - influxdb ==1.7.1.2 + - influxdb ==1.7.1.3 - ini ==0.4.1 - inj ==1.0 - - inline-c ==0.9.0.0 + - inline-c ==0.9.1.0 - inline-c-cpp ==0.4.0.2 - - insert-ordered-containers ==0.2.3 - - inspection-testing ==0.4.2.2 + - insert-ordered-containers ==0.2.3.1 + - inspection-testing ==0.4.2.4 - instance-control ==0.1.2.0 - int-cast ==0.2.0.0 - integer-logarithms ==1.0.3 @@ -1149,8 +1156,8 @@ default-package-overrides: - ip6addr ==1.0.1 - iproute ==1.7.9 - IPv6Addr ==1.1.3 - - ipynb ==0.1 - - ipython-kernel ==0.10.1.0 + - ipynb ==0.1.0.1 + - ipython-kernel ==0.10.2.0 - irc ==0.6.1.0 - irc-client ==1.1.1.1 - irc-conduit ==0.3.0.4 @@ -1163,13 +1170,13 @@ default-package-overrides: - ix-shapable ==0.1.0 - jack ==0.7.1.4 - jira-wiki-markup ==1.0.0 - - jose ==0.8.2.0 + - jose ==0.8.2.1 - jose-jwt ==0.8.0 - js-dgtable ==0.5.2 - js-flot ==0.8.3 - js-jquery ==3.3.1 - json-alt ==1.0.0 - - json-feed ==1.0.8 + - json-feed ==1.0.9 - jsonpath ==0.2.0.0 - json-rpc ==1.0.1 - json-rpc-generic ==0.2.1.5 @@ -1181,21 +1188,21 @@ default-package-overrides: - jwt ==0.10.0 - kan-extensions ==5.2 - kanji ==3.4.1 - - katip ==0.8.3.0 + - katip ==0.8.4.0 - kawhi ==0.3.0 - kazura-queue ==0.1.0.4 - kdt ==0.2.4 - keycode ==0.2.2 - keys ==3.12.3 - kind-apply ==0.3.2.0 - - kind-generics ==0.4.0.0 - - kind-generics-th ==0.2.1.0 + - kind-generics ==0.4.1.0 + - kind-generics-th ==0.2.2.0 - kmeans ==0.1.3 - koofr-client ==1.0.0.3 - - kubernetes-webhook-haskell ==0.2.0.0 + - kubernetes-webhook-haskell ==0.2.0.1 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==1.0.11 + - lackey ==1.0.12 - LambdaHack ==0.9.5.0 - lame ==0.2.0 - language-avro ==0.1.2.0 @@ -1205,7 +1212,7 @@ default-package-overrides: - language-java ==0.2.9 - language-javascript ==0.7.1.0 - language-protobuf ==1.0.1 - - language-puppet ==1.4.6.2 + - language-puppet ==1.4.6.3 - lapack-carray ==0.0.3 - lapack-comfort-array ==0.0.0.1 - lapack-ffi ==0.0.2 @@ -1218,7 +1225,7 @@ default-package-overrides: - lazyio ==0.1.0.4 - lca ==0.3.1 - leancheck ==0.9.3 - - leancheck-instances ==0.0.3 + - leancheck-instances ==0.0.4 - leapseconds-announced ==2017.1.0.1 - learn-physics ==0.6.5 - lens ==4.18.1 @@ -1239,7 +1246,7 @@ default-package-overrides: - libmpd ==0.9.1.0 - libyaml ==0.1.2 - LibZip ==1.0.1 - - lifted-async ==0.10.0.5 + - lifted-async ==0.10.0.6 - lifted-base ==0.2.3.12 - lift-generics ==0.1.3 - linear ==1.20.9 @@ -1249,7 +1256,7 @@ default-package-overrides: - List ==0.6.2 - ListLike ==4.6.3 - listsafe ==0.1.0.1 - - list-singleton ==1.0.0.2 + - list-singleton ==1.0.0.3 - list-t ==1.0.4 - ListTree ==0.2.3 - llvm-hs ==9.0.1 @@ -1258,7 +1265,7 @@ default-package-overrides: - load-env ==0.2.1.0 - loch-th ==0.2.2 - lockfree-queue ==0.2.3.1 - - log-base ==0.8.0.0 + - log-base ==0.8.0.1 - log-domain ==0.13 - logfloat ==0.13.3.3 - logging-effect ==1.3.9 @@ -1272,6 +1279,7 @@ default-package-overrides: - lsp-test ==0.10.2.0 - lucid ==2.9.12 - lucid-extras ==0.2.2 + - lukko ==0.1.1.2 - lzma ==0.0.0.3 - lzma-conduit ==1.2.1 - machines ==0.7 @@ -1316,7 +1324,7 @@ default-package-overrides: - microlens-mtl ==0.2.0.1 - microlens-platform ==0.4.1 - microlens-process ==0.2.0.1 - - microlens-th ==0.4.3.4 + - microlens-th ==0.4.3.5 - microspec ==0.2.1.3 - microstache ==1.0.1.1 - midair ==0.2.0.1 @@ -1344,7 +1352,7 @@ default-package-overrides: - mnist-idx ==0.1.2.8 - mockery ==0.3.5 - mod ==0.1.1.0 - - modern-uri ==0.3.1.0 + - modern-uri ==0.3.2.0 - modular ==0.1.0.8 - monad-control ==1.0.2.3 - monad-control-aligned ==0.0.1.1 @@ -1469,7 +1477,7 @@ default-package-overrides: - OneTuple ==0.2.2.1 - Only ==0.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.6.7004.1 + - opaleye ==0.6.7004.2 - OpenAL ==1.7.0.5 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 @@ -1501,9 +1509,10 @@ default-package-overrides: - pandoc ==2.9.1.1 - pandoc-citeproc ==0.16.4.1 - pandoc-csv2table ==1.0.8 - - pandoc-plot ==0.2.1.0 + - pandoc-plot ==0.2.2.0 - pandoc-pyplot ==2.3.0.1 - pandoc-types ==1.20 + - pantry ==0.4.0.1 - papillon ==0.1.1.1 - parallel ==3.2.2.0 - parallel-io ==0.3.3 @@ -1539,6 +1548,7 @@ default-package-overrides: - perfect-vector-shuffle ==0.1.1.1 - persist ==0.1.1.4 - persistable-record ==0.6.0.4 + - persistable-types-HDBC-pg ==0.0.3.5 - persistent ==2.10.5.2 - persistent-mysql ==2.10.2.3 - persistent-pagination ==0.1.1.1 @@ -1623,7 +1633,7 @@ default-package-overrides: - print-console-colors ==0.1.0.0 - process-extras ==0.7.4 - product-isomorphic ==0.0.3.3 - - product-profunctors ==0.10.0.0 + - product-profunctors ==0.10.0.1 - profiterole ==0.1 - profunctors ==5.5.2 - projectroot ==0.2.0.1 @@ -1654,9 +1664,9 @@ default-package-overrides: - PyF ==0.9.0.1 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - - qrcode-core ==0.9.2 - - qrcode-juicypixels ==0.8.0 - - quadratic-irrational ==0.1.0 + - qrcode-core ==0.9.3 + - qrcode-juicypixels ==0.8.1 + - quadratic-irrational ==0.1.1 - QuasiText ==0.1.2.6 - QuickCheck ==2.13.2 - quickcheck-arbitrary-adt ==0.3.1.0 @@ -1685,10 +1695,10 @@ default-package-overrides: - range-set-list ==0.1.3.1 - rank1dynamic ==0.4.0 - rank2classes ==1.3.2.1 - - Rasterific ==0.7.5.1 + - Rasterific ==0.7.5.2 - rasterific-svg ==0.3.3.2 - - ratel ==1.0.9 - - ratel-wai ==1.1.1 + - ratel ==1.0.10 + - ratel-wai ==1.1.2 - rattle ==0.1 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 @@ -1702,7 +1712,7 @@ default-package-overrides: - read-env-var ==1.0.0.0 - reanimate-svg ==0.9.8.0 - rebase ==1.4.1 - - record-dot-preprocessor ==0.2.2 + - record-dot-preprocessor ==0.2.5 - record-hasfield ==1.0 - records-sop ==0.1.0.3 - recursion-schemes ==5.1.3 @@ -1713,21 +1723,25 @@ default-package-overrides: - RefSerialize ==0.4.0 - regex ==1.1.0.0 - regex-applicative ==0.3.3.1 + - regex-applicative-text ==0.1.0.1 - regex-base ==0.94.0.0 - regex-compat ==0.95.2.0 - regex-compat-tdfa ==0.95.1.4 - regex-pcre ==0.95.0.0 - - regex-pcre-builtin ==0.95.1.1.8.43 + - regex-pcre-builtin ==0.95.1.2.8.43 - regex-posix ==0.96.0.0 - regex-tdfa ==1.3.1.0 - regex-with-pcre ==1.1.0.0 + - registry ==0.1.7.1 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.2.2 + - relational-query-HDBC ==0.7.2.0 + - relational-record ==0.2.2.0 - relational-schemas ==0.1.8.0 - relude ==0.6.0.0 - renderable ==0.2.0.1 - - replace-attoparsec ==1.2.1.0 + - replace-attoparsec ==1.2.2.0 - replace-megaparsec ==1.2.1.0 - repline ==0.2.2.0 - req ==3.1.0 @@ -1735,15 +1749,15 @@ default-package-overrides: - rerebase ==1.4.1 - resolv ==0.1.2.0 - resource-pool ==0.2.3.2 - - resourcet ==1.2.3 + - resourcet ==1.2.4 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - - retry ==0.8.1.0 + - retry ==0.8.1.2 - rev-state ==0.1.2 - rfc1751 ==0.1.2 - rfc5051 ==0.1.0.4 - rigel-viz ==0.2.0.0 - - rio ==0.1.14.1 + - rio ==0.1.15.1 - rio-orphans ==0.1.1.0 - rio-prettyprint ==0.1.0.0 - roc-id ==0.1.0.0 @@ -1758,7 +1772,7 @@ default-package-overrides: - runmemo ==1.0.0.1 - run-st ==0.1.1.0 - safe ==0.3.18 - - safecopy ==0.10.2 + - safecopy ==0.10.3 - safe-decimal ==0.2.0.0 - safe-exceptions ==0.1.7.0 - safe-exceptions-checked ==0.1.0 @@ -1770,21 +1784,21 @@ default-package-overrides: - salak ==0.3.6 - salak-yaml ==0.3.5.3 - saltine ==0.1.1.0 - - salve ==1.0.8 + - salve ==1.0.9 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.3 - say ==0.1.0.1 - sbp ==2.6.3 - - scalpel ==0.6.1 - - scalpel-core ==0.6.1 + - scalpel ==0.6.2 + - scalpel-core ==0.6.2 - scanf ==0.1.0.0 - scanner ==0.3.1 - scheduler ==1.4.2.2 - scientific ==0.3.6.2 - scotty ==0.11.5 - scrypt ==0.5.0 - - sdl2 ==2.5.1.0 + - sdl2 ==2.5.2.0 - sdl2-gfx ==0.2 - sdl2-image ==2.0.0 - sdl2-mixer ==1.1.0 @@ -1809,7 +1823,7 @@ default-package-overrides: - sequence-formats ==1.4.1 - sequenceTools ==1.4.0.5 - serf ==0.1.1.0 - - serialise ==0.2.2.0 + - serialise ==0.2.3.0 - servant ==0.16.2 - servant-auth ==0.3.2.0 - servant-auth-server ==0.4.5.1 @@ -1822,7 +1836,7 @@ default-package-overrides: - servant-client-core ==0.16 - servant-conduit ==0.15 - servant-docs ==0.11.4 - - servant-elm ==0.7.1 + - servant-elm ==0.7.2 - servant-foreign ==0.15 - servant-js ==0.9.4.1 - servant-JuicyPixels ==0.3.0.5 @@ -1841,7 +1855,7 @@ default-package-overrides: - servant-swagger-ui-redoc ==0.3.3.1.22.3 - servant-websockets ==2.0.0 - servant-yaml ==0.1.0.1 - - serverless-haskell ==0.10.2 + - serverless-haskell ==0.10.5 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - ses-html ==0.4.0.0 @@ -1853,7 +1867,7 @@ default-package-overrides: - shared-memory ==0.2.0.0 - shell-conduit ==4.7.0 - shell-escape ==0.2.0 - - shellmet ==0.0.3.0 + - shellmet ==0.0.3.1 - shelltestrunner ==1.9 - shell-utility ==0.0 - shelly ==1.9.0 @@ -1862,7 +1876,7 @@ default-package-overrides: - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - silently ==1.2.5.1 - - simple-affine-space ==0.1 + - simple-affine-space ==0.1.1 - simple-cabal ==0.1.1 - simple-cmd ==0.2.1 - simple-cmd-args ==0.1.6 @@ -1875,7 +1889,7 @@ default-package-overrides: - simplistic-generics ==0.1.0.0 - since ==0.0.0 - singleton-bool ==0.1.5 - - singleton-nats ==0.4.4 + - singleton-nats ==0.4.5 - singletons ==2.6 - singletons-presburger ==0.3.0.0 - siphash ==1.0.3 @@ -1884,9 +1898,9 @@ default-package-overrides: - sized ==0.4.0.0 - skein ==1.0.9.4 - skip-var ==0.1.1.0 - - skylighting ==0.8.3.2 - - skylighting-core ==0.8.3.2 - - slist ==0.1.0.0 + - skylighting ==0.8.4 + - skylighting-core ==0.8.4 + - slist ==0.1.1.0 - small-bytearray-builder ==0.3.4.0 - smallcheck ==1.1.5 - smoothie ==0.4.2.10 @@ -1908,7 +1922,7 @@ default-package-overrides: - sparse-tensor ==0.2.1.3 - spatial-math ==0.5.0.1 - special-values ==0.1.0.0 - - speculate ==0.4.1 + - speculate ==0.4.2 - speedy-slice ==0.3.0 - Spintax ==0.3.4 - splice ==0.6.1.1 @@ -1943,7 +1957,7 @@ default-package-overrides: - streaming ==0.2.3.0 - streaming-bytestring ==0.1.6 - streaming-commons ==0.2.1.2 - - streamly ==0.7.1 + - streamly ==0.7.2 - streams ==3.3 - strict ==0.3.2 - strict-base-types ==0.6.1 @@ -1954,12 +1968,13 @@ default-package-overrides: - string-combinators ==0.6.0.5 - string-conv ==0.1.2 - string-conversions ==0.4.0.1 + - string-interpolate ==0.2.1.0 - string-qq ==0.0.4 - stringsearch ==0.3.6.6 - string-transform ==1.1.1 - - stripe-concepts ==1.0.2.0 - - stripe-signature ==1.0.0.1 - - strive ==5.0.9 + - stripe-concepts ==1.0.2.2 + - stripe-signature ==1.0.0.2 + - strive ==5.0.10 - structs ==0.1.3 - structured-cli ==2.5.2.0 - stylish-haskell ==0.10.0.0 @@ -1995,10 +2010,10 @@ default-package-overrides: - tardis ==0.4.1.0 - tasty ==1.2.3 - tasty-ant-xml ==1.1.6 - - tasty-dejafu ==2.0.0.1 + - tasty-dejafu ==2.0.0.3 - tasty-discover ==4.2.1 - tasty-expected-failure ==0.11.1.2 - - tasty-golden ==2.3.3 + - tasty-golden ==2.3.3.2 - tasty-hedgehog ==1.0.0.2 - tasty-hspec ==1.1.5.1 - tasty-hunit ==0.10.0.2 @@ -2032,7 +2047,7 @@ default-package-overrides: - test-framework-th ==0.2.4 - testing-feat ==1.1.0.0 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.0.1 + - texmath ==0.12.0.2 - text-binary ==0.2.1.1 - text-builder ==0.6.6.1 - text-conversions ==0.3.0 @@ -2057,11 +2072,11 @@ default-package-overrides: - these ==1.0.1 - these-lens ==1 - these-optics ==1 - - th-expand-syns ==0.4.5.0 + - th-expand-syns ==0.4.6.0 - th-extras ==0.0.0.4 - th-lift ==0.8.1 - - th-lift-instances ==0.1.14 - - th-orphans ==0.13.9 + - th-lift-instances ==0.1.16 + - th-orphans ==0.13.10 - th-printf ==0.7 - thread-hierarchy ==0.3.0.1 - thread-local-storage ==0.2 @@ -2075,7 +2090,7 @@ default-package-overrides: - th-strict-compat ==0.1.0.1 - th-test-utils ==1.0.1 - thyme ==0.3.5.5 - - tidal ==1.4.8 + - tidal ==1.4.9 - tile ==0.3.0.0 - time-compat ==1.9.3 - timeit ==2.0 @@ -2102,7 +2117,7 @@ default-package-overrides: - topograph ==1.0.0.1 - torsor ==0.1 - tostring ==0.2.1.1 - - tracing ==0.0.4.0 + - tracing ==0.0.5.1 - transaction ==0.1.1.3 - transformers-base ==0.4.5.2 - transformers-bifunctors ==0.1 @@ -2115,20 +2130,20 @@ default-package-overrides: - triplesec ==0.2.2.1 - trivial-constraint ==0.6.0.0 - tsv2csv ==0.1.0.2 - - ttc ==0.2.0.0 + - ttc ==0.2.1.0 - ttl-hashtables ==1.4.1.0 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.18 + - turtle ==1.5.19 - TypeCompose ==0.9.14 - typed-process ==0.2.6.0 - typed-uuid ==0.0.0.2 - type-equality ==1 - type-errors ==0.2.0.0 - - type-errors-pretty ==0.0.1.0 + - type-errors-pretty ==0.0.1.1 - type-fun ==0.1.1 - type-hint ==0.1 - type-level-integers ==0.0.1 @@ -2140,7 +2155,7 @@ default-package-overrides: - type-of-html ==1.5.1.0 - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 - - typerep-map ==0.3.2 + - typerep-map ==0.3.3.0 - type-spec ==0.4.0.0 - tzdata ==0.1.20190911.0 - ua-parser ==0.7.5.1 @@ -2196,9 +2211,9 @@ default-package-overrides: - uuid-types ==1.0.3 - validation ==1.1 - validity ==0.9.0.3 - - validity-aeson ==0.2.0.3 + - validity-aeson ==0.2.0.4 - validity-bytestring ==0.4.1.1 - - validity-containers ==0.5.0.1 + - validity-containers ==0.5.0.3 - validity-path ==0.4.0.1 - validity-primitive ==0.0.0.1 - validity-scientific ==0.2.0.3 @@ -2208,7 +2223,7 @@ default-package-overrides: - validity-uuid ==0.1.0.3 - validity-vector ==0.2.0.3 - valor ==0.1.0.0 - - vault ==0.3.1.3 + - vault ==0.3.1.4 - vec ==0.3 - vector ==0.12.1.2 - vector-algorithms ==0.8.0.3 @@ -2219,7 +2234,7 @@ default-package-overrides: - vector-instances ==3.4 - vector-mmap ==0.0.3 - vector-rotcev ==0.1.0.0 - - vector-sized ==1.4.0.0 + - vector-sized ==1.4.1.0 - vector-space ==0.16 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.7 @@ -2245,7 +2260,7 @@ default-package-overrides: - wai-session ==0.3.3 - wai-slack-middleware ==0.2.0 - wai-websockets ==3.0.1.2 - - warp ==3.3.9 + - warp ==3.3.10 - warp-tls ==3.2.11 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 @@ -2255,7 +2270,7 @@ default-package-overrides: - webex-teams-conduit ==0.2.0.0 - webex-teams-pipes ==0.2.0.0 - webrtc-vad ==0.1.0.3 - - websockets ==0.12.7.0 + - websockets ==0.12.7.1 - websockets-snap ==0.10.3.1 - weigh ==0.0.16 - wide-word ==0.1.1.1 @@ -2281,7 +2296,7 @@ default-package-overrides: - writer-cps-exceptions ==0.1.0.1 - writer-cps-mtl ==0.1.1.6 - writer-cps-transformers ==0.5.6.1 - - wuss ==1.1.15 + - wuss ==1.1.16 - X11 ==1.9.1 - X11-xft ==0.3.1 - x11-xim ==0.0.9.0 @@ -2315,12 +2330,12 @@ default-package-overrides: - xss-sanitize ==0.3.6 - xturtle ==0.2.0.0 - xxhash-ffi ==0.2.0.0 - - yaml ==0.11.3.0 + - yaml ==0.11.4.0 - yesod ==1.6.0.1 - yesod-auth ==1.6.10 - yesod-auth-hashdb ==1.7.1.2 - yesod-bin ==1.6.0.4 - - yesod-core ==1.6.17.3 + - yesod-core ==1.6.18 - yesod-form ==1.6.7 - yesod-gitrev ==0.2.1 - yesod-newsfeed ==1.7.0.0 @@ -2355,6 +2370,9 @@ extra-packages: - ansi-terminal == 0.10.3 # required by cabal-plan, and policeman in ghc-8.8.x - aeson-pretty < 0.8 # required by elm compiler - apply-refact < 0.4 # newer versions don't work with GHC 8.0.x + - apply-refact == 0.6.0.0 # works with GHC 8.6.x https://hackage.haskell.org/package/apply-refact/changelog + - apply-refact == 0.7.0.0 # works with GHC 8.8.x https://hackage.haskell.org/package/apply-refact/changelog + - apply-refact == 0.8.0.0 # works with GHC 8.10.x https://hackage.haskell.org/package/apply-refact/changelog - binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers - blank-canvas < 0.6.3 # more recent versions depend on base-compat-batteries == 0.10.* but we're on base-compat-0.9.* @@ -2373,11 +2391,14 @@ extra-packages: - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x - haddock == 2.22.* # required on GHC 8.0.x - - haddock-api == 2.22.* # required on GHC 7.8.x + - haddock == 2.23.* # required on GHC < 8.10.x + - haddock-api == 2.23.* # required on GHC < 8.10.x - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 - happy <1.19.6 # newer versions break Agda - happy == 1.19.9 # for purescript - haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support + - haskell-lsp == 0.19.* # required for ghcide 0.1.0 + - haskell-lsp-types == 0.19.* # required for ghcide 0.1.0 - haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - hoogle == 5.0.14 # required by hie-hoogle @@ -2385,8 +2406,10 @@ extra-packages: - http-conduit ^>= 2.2 # pre-lts-11.x versions neeed by git-annex 6.20180227 - inline-c < 0.6 # required on GHC 8.0.x - inline-c-cpp < 0.2 # required on GHC 8.0.x + - lens-family ==1.2.3 # required for tensorflow + - lens-family-core ==1.2.3 # required for tensorflow - lens-labels == 0.1.* # required for proto-lens-descriptors - - mainland-pretty == 0.6.2.* # required for tensorflow-opgen-0.1.0.0 + - megaparsec >= 7.0.4 && < 8 # required for idris: https://github.com/idris-lang/Idris-dev/issues/4826 - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below @@ -2398,9 +2421,11 @@ extra-packages: - persistent-sqlite < 2.7 # pre-lts-11.x versions neeed by git-annex 6.20180227 - prettyprinter == 1.6.1 # required by ghc 8.8.x, and dhall-1.29.0 - primitive == 0.5.1.* # required to build alex with GHC 6.12.3 - - proto-lens == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x - - proto-lens-protobuf-types == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x - - proto-lens-protoc == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x + - proto-lens == 0.5.* # required for tensorflow-proto + - proto-lens-protobuf-types == 0.5.* # required for tensorflow-proto + - proto-lens-protoc == 0.5.* # required for tensorflow-proto + - proto-lens-runtime == 0.5.* # required for tensorflow-proto + - proto-lens-setup == 0.4.0.2 # required for tensorflow-proto - QuickCheck < 2 # required by test-framework-quickcheck and its users - resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x - resourcet ==1.1.* # pre-lts-11.x versions neeed by git-annex 6.20180227 @@ -2677,11 +2702,13 @@ broken-packages: - activitypub - activitystreams-aeson - actor + - acts - Adaptive - Adaptive-Blaisorblade - adaptive-containers - adaptive-tuple - adb + - addy - adhoc-network - adict - adobe-swatch-exchange @@ -2706,7 +2733,6 @@ broken-packages: - aeson-diff-generic - aeson-filthy - aeson-flowtyped - - aeson-gadt-th - aeson-injector - aeson-iproute - aeson-native @@ -2768,6 +2794,7 @@ broken-packages: - amazon-emailer - amazon-emailer-client-snap - amazon-products + - amazonka-dynamodb - amby - AMI - ampersand @@ -2799,10 +2826,12 @@ broken-packages: - anticiv - antigate - antimirov + - antiope-dynamodb - antisplice - antlr-haskell - antlrc - anydbm + - aop-prelude - aosd - apart - apecs-stm @@ -2861,6 +2890,7 @@ broken-packages: - arguedit - ariadne - arion + - arithmetic-circuits - armada - armor - arpa @@ -2947,6 +2977,7 @@ broken-packages: - authenticate-ldap - authinfo-hs - authoring + - autoapply - AutoForms - autom - automata @@ -2960,6 +2991,7 @@ broken-packages: - avl-static - AvlTree - avr-shake + - avro-piper - avwx - awesome-prelude - awesomium @@ -3024,6 +3056,7 @@ broken-packages: - barrie - barrier - barrier-monad + - base-encoding - base-feature-macros - base-generics - base-io-access @@ -3103,7 +3136,6 @@ broken-packages: - binary-protocol-zmq - binary-search - binary-streams - - binary-strict - binary-typed - bind-marshal - BinderAnn @@ -3129,6 +3161,7 @@ broken-packages: - bindings-libg15 - bindings-librrd - bindings-libstemmer + - bindings-libusb - bindings-libv4l2 - bindings-linux-videodev2 - bindings-monetdb-mapi @@ -3355,6 +3388,7 @@ broken-packages: - cabal-dependency-licenses - cabal-dev - cabal-dir + - cabal-fmt - cabal-ghc-dynflags - cabal-ghci - cabal-graphdeps @@ -3388,6 +3422,7 @@ broken-packages: - cabin - cabocha - cached + - cacophony - cafeteria-prelude - caffegraph - cairo-core @@ -3398,6 +3433,7 @@ broken-packages: - cal3d - cal3d-examples - cal3d-opengl + - calamity - calc - calculator - caldims @@ -3487,6 +3523,7 @@ broken-packages: - cereal-time - certificate - cf + - cfenv - cfipu - cflp - cfopu @@ -3539,6 +3576,7 @@ broken-packages: - church-maybe - cielo - cil + - cimple - cinvoke - cio - cipher-blowfish @@ -3659,6 +3697,7 @@ broken-packages: - collections-api - collections-base-instances - colonnade + - Color - color-counter - colorless - colorless-http-client @@ -3919,6 +3958,7 @@ broken-packages: - cspmchecker - cspretty - css + - css-selectors - css-syntax - csv-enumerator - csv-nptools @@ -3939,6 +3979,7 @@ broken-packages: - curves - custom-prelude - CV + - cv-combinators - cypher - d-bus - d10 @@ -4107,6 +4148,7 @@ broken-packages: - demarcate - denominate - dense-int-set + - dependent-hashmap - dependent-monoidal-map - dependent-state - dependent-sum-aeson-orphans @@ -4146,6 +4188,7 @@ broken-packages: - dhall-yaml - dhcp-lease-parser - dhrun + - di-polysemy - dia-base - dia-functions - diagrams-boolean @@ -4183,6 +4226,7 @@ broken-packages: - DigitalOcean - digitalocean-kzs - digits + - digraph - dimensional-codata - dimensional-tf - DimensionalHash @@ -4324,7 +4368,6 @@ broken-packages: - duet - dumb-cas - dump-core - - dunai - dunai-core - dunai-test - Dung @@ -4388,6 +4431,7 @@ broken-packages: - effect-stack - effin - egison-quote + - egison-tutorial - ehaskell - ehs - eibd-client-simple @@ -4395,6 +4439,7 @@ broken-packages: - Eight-Ball-Pool-Hack-Cheats - either-unwrap - EitherT + - ejdb2-binding - ekg-bosun - ekg-carbon - ekg-elastic @@ -4408,6 +4453,8 @@ broken-packages: - elision - elm-street - elm-websocket + - elynx + - elynx-markov - elynx-seq - elynx-tools - elynx-tree @@ -4503,7 +4550,6 @@ broken-packages: - eths-rlp - euphoria - eurofxref - - Euterpea - eve - eve-cli - event @@ -4564,6 +4610,7 @@ broken-packages: - extensible-data - extensible-effects-concurrent - extensible-skeleton + - extensions - external-sort - Extra - extract-dependencies @@ -4620,6 +4667,7 @@ broken-packages: - fca - fcache - fcd + - fcf-containers - fcg - fckeditor - fclabels-monadlib @@ -4691,6 +4739,7 @@ broken-packages: - findhttp - fingertree-psqueue - fingertree-tf + - finitary - finitary-derive - FiniteMap - firefly-example @@ -4805,6 +4854,7 @@ broken-packages: - fraction - frag - Frames-beam + - Frames-dsv - franchise - Frank - fraxl @@ -4888,6 +4938,7 @@ broken-packages: - funpat - funsat - funspection + - fused-effects-readline - fused-effects-squeal - fusion - fusion-plugin @@ -4996,6 +5047,7 @@ broken-packages: - ghc-dump-tree - ghc-dump-util - ghc-dup + - ghc-events-analyze - ghc-events-parallel - ghc-generic-instances - ghc-imported-from @@ -5022,7 +5074,6 @@ broken-packages: - ghci-lib - ghci-ng - ghci-pretty - - ghcide - ghcjs-dom-jsffi - ghcjs-fetch - ghcjs-hplay @@ -5064,6 +5115,7 @@ broken-packages: - git-remote-ipfs - git-repair - git-sanity + - git-vogue - gitdo - github-backup - github-data @@ -5323,7 +5375,6 @@ broken-packages: - haddock-leksah - haddock-test - haddocset - - hadolint - hadoop-formats - hadoop-rpc - hadoop-tools @@ -5352,6 +5403,7 @@ broken-packages: - hakyll-R - hakyll-series - hakyll-shortcode + - hakyll-shortcut-links - hakyll-typescript - hal - halberd @@ -5368,6 +5420,7 @@ broken-packages: - hamsql - hamtmap - hamusic + - hanabi-dealer - handa-gdata - handle-like - HandlerSocketClient @@ -5613,11 +5666,9 @@ broken-packages: - hasql-migration - hasql-notifications - hasql-optparse-applicative - - hasql-pool - hasql-postgres - hasql-postgres-options - hasql-simple - - hasql-th - hastache - hastache-aeson - haste @@ -5699,7 +5750,6 @@ broken-packages: - hdph-closure - hdr-histogram - HDRUtils - - headed-megaparsec - headergen - heapsort - heart-app @@ -5822,7 +5872,6 @@ broken-packages: - hichi - hid-examples - hidden-char - - hie-bios - hie-core - hieraclus - hierarchical-exceptions @@ -5988,6 +6037,7 @@ broken-packages: - hoovie - hopencc - hopencl + - HOpenCV - hOpenPGP - hopenpgp-tools - hopfield @@ -6084,6 +6134,7 @@ broken-packages: - hs-rs-notify - hs-scrape - hs-snowtify + - hs-speedscope - hs-twitter - hs-twitterarchiver - hs-vcard @@ -6131,7 +6182,6 @@ broken-packages: - Hsed - hsenv - HSet - - hsexif - hsfacter - hsfcsh - HSFFIG @@ -6319,7 +6369,16 @@ broken-packages: - huzzy - hvega-theme - hVOIDP + - hw-all - hw-ci-assist + - hw-dsv + - hw-json + - hw-json-lens + - hw-json-simd + - hw-json-simple-cursor + - hw-json-standard-cursor + - hw-kafka-avro + - hw-simd - hwall-auth-iitk - hweblib - hwhile @@ -6386,12 +6445,12 @@ broken-packages: - ideas - ideas-math - ideas-math-types + - ideas-statistics - idempotent - identicon-style-squares - identifiers - idiii - idna2008 - - idris - IDynamic - ieee-utils - iexcloud @@ -6403,9 +6462,20 @@ broken-packages: - ignore - igraph - igrf + - ihaskell + - ihaskell-aeson - ihaskell-basic + - ihaskell-blaze + - ihaskell-charts + - ihaskell-diagrams - ihaskell-display + - ihaskell-gnuplot + - ihaskell-graphviz + - ihaskell-hatex + - ihaskell-hvega - ihaskell-inline-r + - ihaskell-juicypixels + - ihaskell-magic - ihaskell-parsec - ihaskell-plot - ihaskell-rlangqq @@ -6643,6 +6713,7 @@ broken-packages: - json-rpc-client - json-schema - json-sop + - json-syntax - json-togo - json-tokens - json-tracer @@ -6862,6 +6933,9 @@ broken-packages: - language-vhdl - language-webidl - lapack + - lapack-carray + - lapack-comfort-array + - lapack-ffi - large-hashable - Lastik - lat @@ -6890,6 +6964,7 @@ broken-packages: - lda - ldap-client - ldapply + - LDAPv3 - ldif - leaf - leaky @@ -6964,6 +7039,7 @@ broken-packages: - libxslt - licensor - lie + - life-sync - lifted-base-tf - lifted-protolude - lifted-stm @@ -7036,6 +7112,8 @@ broken-packages: - liszt - lit - literals + - LiterateMarkdown + - little-logger - live-sequencer - ll-picosat - llsd @@ -7129,6 +7207,7 @@ broken-packages: - lsystem - ltext - ltk + - LTS - lua-bc - luachunk - luautils @@ -7152,6 +7231,7 @@ broken-packages: - lz4-conduit - lzma-enumerator - lzma-streams + - lzo - maam - mac - macaroon-shop @@ -7230,6 +7310,9 @@ broken-packages: - marxup - masakazu-bot - MASMGen + - massiv + - massiv-io + - massiv-test - master-plan - matchable - matchable-th @@ -7242,6 +7325,7 @@ broken-packages: - mathlink - matrix-as-xyz - matrix-market + - matrix-sized - matsuri - maude - maxent @@ -7323,6 +7407,7 @@ broken-packages: - miconix-test - micro-recursion-schemes - microaeson + - microbase - microformats2-parser - microformats2-types - microgroove @@ -7347,6 +7432,7 @@ broken-packages: - miniforth - minilens - minilight + - minilight-lua - minimung - minions - minioperational @@ -7487,6 +7573,9 @@ broken-packages: - mp - mpdmate - mpi-hs + - mpi-hs-binary + - mpi-hs-cereal + - mpi-hs-store - mpppc - mpretty - mpris @@ -7501,8 +7590,10 @@ broken-packages: - ms - msgpack - msgpack-aeson + - msgpack-binary - msgpack-idl - msgpack-rpc + - msgpack-rpc-conduit - msh - msi-kb-backlit - MSQueue @@ -7514,9 +7605,11 @@ broken-packages: - mtl-tf - mtlx - mtp + - mu-avro - mu-grpc-client - mu-grpc-common - mu-grpc-server + - mu-kafka - mu-protobuf - MuCheck - MuCheck-Hspec @@ -7733,6 +7826,7 @@ broken-packages: - nix-deploy - nix-eval - nix-freeze-tree + - nix-narinfo - nix-tools - nixfromnpm - nixpkgs-update @@ -7807,12 +7901,14 @@ broken-packages: - ObjectIO - objective - ocaml-export + - ochan - octane - octohat - octopus - Octree - oculus - odbc + - odd-jobs - OddWord - oden-go-packages - oeis2 @@ -7837,6 +7933,7 @@ broken-packages: - onama - ONC-RPC - oneormore + - online-csv - onpartitions - OnRmt - onu-course @@ -7851,6 +7948,7 @@ broken-packages: - OpenAFP - OpenAFP-Utils - openapi-petstore + - openapi-typed - opench-meteo - OpenCL - OpenCLRaw @@ -7859,10 +7957,12 @@ broken-packages: - opendatatable - OpenGLCheck - opengles + - openid-connect - OpenSCAD - opensoundcontrol-ht - openssh-github-keys - openssh-protocol + - opentelemetry-extra - opentelemetry-http-client - opentelemetry-lightstep - opentelemetry-wai @@ -7897,6 +7997,7 @@ broken-packages: - orders - Ordinary - ordrea + - oref - organize-imports - orgmode - origami @@ -7916,6 +8017,7 @@ broken-packages: - otp-authenticator - ottparse-pretty - overload + - overloaded - overloaded-records - overture - pack @@ -8094,7 +8196,6 @@ broken-packages: - persistent-migration - persistent-mongoDB - persistent-mysql-haskell - - persistent-postgresql - persistent-protobuf - persistent-ratelimit - persistent-redis @@ -8215,6 +8316,7 @@ broken-packages: - plugins-multistage - plur - plural + - plzwrk - png-file - pngload - pngload-fixed @@ -8280,7 +8382,6 @@ broken-packages: - postgresql-simple-typed - postgresql-typed - postgresql-typed-lifted - - postgrest - postgrest-ws - postie - postmark @@ -8318,6 +8419,7 @@ broken-packages: - prelude-plus - preprocess-haskell - preprocessor + - preql - presburger - present - press @@ -8329,6 +8431,7 @@ broken-packages: - prettyprinter-graphviz - prettyprinter-vty - preview + - prim - prim-array - prim-ref - primes-type @@ -8647,6 +8750,7 @@ broken-packages: - reflex-basic-host - reflex-dom-retractable - reflex-dom-svg + - reflex-dynamic-containers - reflex-fsnotify - reflex-ghci - reflex-gloss @@ -8655,6 +8759,7 @@ broken-packages: - reflex-orphans - reflex-process - reflex-sdl2 + - reflex-test-host - reflex-transformers - reflex-vty - reformat @@ -8704,7 +8809,6 @@ broken-packages: - relation - relational-postgresql8 - relative-date - - releaser - relevant-time - reload - remark @@ -8789,7 +8893,6 @@ broken-packages: - rhine - rhine-gloss - rhythm-game-tutorial - - rib - ribbit - RichConditional - ridley @@ -8828,6 +8931,8 @@ broken-packages: - robots-txt - roc-cluster - roc-cluster-demo + - rock + - rocksdb-query - roku-api - rollbar - rollbar-hs @@ -8901,6 +9006,7 @@ broken-packages: - saferoute - sai-shape-syb - sajson + - sak - salak-toml - Salsa - saltine-quickcheck @@ -8947,7 +9053,10 @@ broken-packages: - scgi - schedevr - schedule-planner + - scheduler - schedyield + - schema + - schemas - schematic - scholdoc - scholdoc-citeproc @@ -8956,6 +9065,7 @@ broken-packages: - sci-ratio - SciBaseTypes - scidb-hquery + - scientific-notation - SciFlow - SciFlow-drmaa - scion @@ -9139,6 +9249,7 @@ broken-packages: - shake-pack - shake-path - shake-persist + - shakebook - shaker - shakespeare-babel - shakespeare-sass @@ -9165,10 +9276,18 @@ broken-packages: - shivers-cfg - shoap - shopify + - shortcut-links - shorten-strings - ShortestPathProblems - show-prettyprint - showdown + - Shpadoinkle + - Shpadoinkle-backend-pardiff + - Shpadoinkle-backend-snabbdom + - Shpadoinkle-backend-static + - Shpadoinkle-html + - Shpadoinkle-router + - Shpadoinkle-widgets - shpider - shuffle - si-clock @@ -9183,7 +9302,6 @@ broken-packages: - simgi - simple - simple-actors - - simple-affine-space - simple-atom - simple-bluetooth - simple-c-value @@ -9284,9 +9402,11 @@ broken-packages: - smsaero - smt-lib - SmtLib + - smtlib2 - smtlib2-debug - smtlib2-pipe - smtlib2-quickcheck + - smtlib2-timing - smtp-mail-ng - SMTPClient - smtps-gmail @@ -9534,12 +9654,14 @@ broken-packages: - stern-brocot - stgi - STL + - STLinkUSB - stm-chunked-queues - stm-containers - stm-firehose - stm-hamt - stm-promise - stm-stats + - STM32-Zombie - stmcontrol - stochastic - StockholmAlignment @@ -9767,9 +9889,12 @@ broken-packages: - telegram-api - telegram-bot - telegram-bot-simple + - telegram-raw-api + - telegram-types - teleport - teleshell - tellbot + - tempi - template-default - template-haskell-util - template-hsml @@ -9784,9 +9909,7 @@ broken-packages: - tensorflow - tensorflow-core-ops - tensorflow-logging - - tensorflow-opgen - tensorflow-ops - - tensorflow-proto - termbox - termbox-banana - termbox-bindings @@ -9823,7 +9946,6 @@ broken-packages: - text-and-plots - text-ansi - text-containers - - text-format - text-format-heavy - text-generic-pretty - text-icu-normalized @@ -10067,6 +10189,7 @@ broken-packages: - turingMachine - turtle-options - tweak + - tweet-hs - twentefp-eventloop-graphics - twentefp-eventloop-trees - twentefp-graphs @@ -10119,6 +10242,7 @@ broken-packages: - type-tree - typeable-th - TypeClass + - typed-encoding - typed-streams - typed-wire - typedflow @@ -10231,6 +10355,7 @@ broken-packages: - urn - urn-random - urxml + - usb - usb-enumerator - usb-hid - usb-id-database @@ -10349,6 +10474,7 @@ broken-packages: - visual-graphrewrite - visual-prof - visualize-cbn + - vitrea - vivid - vivid-osc - vivid-supercollider @@ -10367,6 +10493,7 @@ broken-packages: - vty-ui - vty-ui-extras - vulkan + - VulkanMemoryAllocator - waargonaut - wacom-daemon - waddle @@ -10463,7 +10590,6 @@ broken-packages: - webdriver-w3c - WeberLogic - webfinger-client - - webify - webkit-javascriptcore - Webrexp - webserver @@ -10479,7 +10605,6 @@ broken-packages: - wheb-mongo - wheb-redis - wheb-strapped - - which - while-lang-parser - whim - whiskers @@ -10531,6 +10656,7 @@ broken-packages: - wraxml - wrecker - wrecker-ui + - wreq-patchable - wreq-sb - wright - writer-cps-full @@ -10541,6 +10667,7 @@ broken-packages: - wsdl - wsedit - wshterm + - wstunnel - wtk - wtk-gtk - wu-wei @@ -10841,3 +10968,5 @@ broken-packages: - ztar - zuramaru - Zwaluw + - zxcvbn-dvorak + - zxcvbn-hs diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 4aa3327e2b483..6d0c93e85a563 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -283,11 +283,11 @@ self: super: builtins.intersectAttrs super { caramia = dontCheck super.caramia; llvm-hs = - let llvmHsWithLlvm8 = super.llvm-hs.override { llvm-config = pkgs.llvm_8; }; + let llvmHsWithLlvm9 = super.llvm-hs.override { llvm-config = pkgs.llvm_9; }; in if pkgs.stdenv.isDarwin then - overrideCabal llvmHsWithLlvm8 (oldAttrs: { + overrideCabal llvmHsWithLlvm9 (oldAttrs: { # One test fails on darwin. doCheck = false; # llvm-hs's Setup.hs file tries to add the lib/ directory from LLVM8 to @@ -298,7 +298,7 @@ self: super: builtins.intersectAttrs super { substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()" ''; }) - else llvmHsWithLlvm8; + else llvmHsWithLlvm9; # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; @@ -572,23 +572,9 @@ self: super: builtins.intersectAttrs super { # The test-suite requires a running PostgreSQL server. Frames-beam = dontCheck super.Frames-beam; - # * Compile manpages (which are in RST and are compiled with Sphinx). - # - # * Wrap so that binary can find GCC and OpenCL headers (dubious if - # a good idea). + # Compile manpages (which are in RST and are compiled with Sphinx). futhark = with pkgs; - let maybeWrap = - if pkgs.stdenv.isDarwin then "" - else - let path = stdenv.lib.makeBinPath [ gcc ]; - in '' - wrapProgram $out/bin/futhark \ - --prefix PATH : "${path}" \ - --set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \ - --set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \ - --set NIX_CFLAGS_LINK "-L${ocl-icd}/lib" - ''; - in overrideCabal (addBuildTools super.futhark [makeWrapper python37Packages.sphinx]) + overrideCabal (addBuildTools super.futhark [makeWrapper python37Packages.sphinx]) (_drv: { postBuild = (_drv.postBuild or "") + '' make -C docs man @@ -597,8 +583,7 @@ self: super: builtins.intersectAttrs super { postInstall = (_drv.postInstall or "") + '' mkdir -p $out/share/man/man1 mv docs/_build/man/*.1 $out/share/man/man1/ - '' - + maybeWrap; + ''; }); git-annex = with pkgs; @@ -643,11 +628,6 @@ self: super: builtins.intersectAttrs super { http-download = dontCheck super.http-download; pantry = dontCheck super.pantry; - # Hadolint wants to build a statically linked binary by default. - hadolint = overrideCabal super.hadolint (drv: { - preConfigure = "sed -i -e /ld-options:/d hadolint.cabal"; - }); - # gtk2hs-buildtools is listed in setupHaskellDepends, but we # need it during the build itself, too. cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools; @@ -655,22 +635,19 @@ self: super: builtins.intersectAttrs super { spago = let - # Spago needs a patch for MonadFail changes. - # https://github.com/purescript/spago/pull/584 - # This can probably be removed when a version after spago-0.14.0 is released. + # Spago needs a small patch to work with the latest versions of rio. + # https://github.com/purescript/spago/pull/616 + # This can probably be removed when a version after spago-0.15.1 is released. spagoWithPatches = appendPatch super.spago (pkgs.fetchpatch { - url = "https://github.com/purescript/spago/pull/584/commits/898a8e48665e5a73ea03525ce2c973455ab9ac52.patch"; - sha256 = "05gs1hjlcf60cr6728rhgwwgxp3ildly14v4l2lrh6ma2fljhyjy"; + url = "https://github.com/purescript/spago/pull/616/commits/95b5fa0f1d3bfb07972d1ef5004b8bee8a070667.patch"; + sha256 = "0v3890lwhddfrq9mhbq92962pkxra8kwbin97wg3s0b02dk65ysc"; }); # Spago basically compiles with LTS-14, but it requires a newer version # of directory. This is to work around a bug only present on windows, so # we can safely jailbreak spago and use the older directory package from # LTS-14. - spagoWithOverrides = doJailbreak (spagoWithPatches.override { - # spago requires dhall-1.29.0. - dhall = self.dhall_1_29_0; - }); + spagoWithOverrides = doJailbreak spagoWithPatches; # This defines the version of the purescript-docs-search release we are using. # This is defined in the src/Spago/Prelude.hs file in the spago source. @@ -738,8 +715,39 @@ self: super: builtins.intersectAttrs super { # break infinite recursion with base-orphans primitive = dontCheck super.primitive; - # dhall-1.29.0 tests access the network. This override can be removed when - # dhall_1_29_0 is no longer used, since more recent versions of dhall don't - # access the network in checks. + # dhall's tests access the network. dhall_1_29_0 = dontCheck super.dhall_1_29_0; + dhall_1_31_1 = dontCheck super.dhall_1_31_1; + + cut-the-crap = + let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg ]; + in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: { + postInstall = '' + wrapProgram $out/bin/cut-the-crap \ + --prefix PATH : "${path}" + ''; + }); + + # Tests access homeless-shelter. + hie-bios = dontCheck super.hie-bios; + + # Compiling the readme throws errors and has no purpose in nixpkgs + aeson-gadt-th = + disableCabalFlag (doJailbreak (super.aeson-gadt-th)) "build-readme"; + + neuron = overrideCabal (super.neuron) (drv: { + # neuron expects the neuron-search script to be in PATH at built-time. + buildTools = [ pkgs.makeWrapper ]; + preConfigure = '' + mkdir -p $out/bin + cp src-bash/neuron-search $out/bin/neuron-search + chmod +x $out/bin/neuron-search + wrapProgram $out/bin/neuron-search --prefix 'PATH' ':' ${ + with pkgs; + lib.makeBinPath [ fzf ripgrep gawk bat findutils envsubst ] + } + PATH=$PATH:$out/bin + ''; + }); + } diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix index 71ae70335fd44..aab416b9a87b6 100644 --- a/pkgs/development/haskell-modules/configuration-tensorflow.nix +++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix @@ -4,63 +4,91 @@ with haskellLib; self: super: let + # This contains updates to the dependencies, without which it would + # be even more work to get it to build. + # As of 2020-04, there's no new release in sight, which is why we're + # pulling from Github. tensorflow-haskell = pkgs.fetchFromGitHub { owner = "tensorflow"; repo = "haskell"; - rev = "85bf0bb12cecfcdfcf31dea43b67cbe44576f685"; - sha256 = "1xbwc8y4a7n2163g746dpyh1q86rbxaw3d41kcy1mbhvmfqq56x7"; + rev = "0f322b2e0611cbe7011c84ba8b6cb822e4725ebc"; + sha256 = "15gn66i547q20sd50ixwm6yk1g00syfgxp8xa6xjd0i3kcsl3gs1"; fetchSubmodules = true; }; - setSourceRoot = dir: drv: drv.overrideAttrs (_oldAttrs: {sourceRoot = "source/${dir}";}); + setTensorflowSourceRoot = dir: drv: + (overrideCabal drv (drv: { src = tensorflow-haskell; })) + .overrideAttrs (_oldAttrs: {sourceRoot = "source/${dir}";}); - proto-lens = self.proto-lens_0_2_2_0; - proto-lens-protoc = self.proto-lens-protoc_0_2_2_3; - proto-lens-protobuf-types = self.proto-lens-protobuf-types_0_2_2_0; - mainland-pretty = self.mainland-pretty_0_6_2; + proto-lens = self.proto-lens_0_5_1_0; + proto-lens-protoc = self.proto-lens-protoc_0_5_0_0; + proto-lens-runtime = self.proto-lens-runtime_0_5_0_0; + proto-lens-protobuf-types = self.proto-lens-protobuf-types_0_5_0_0; + proto-lens-setup = self.proto-lens-setup_0_4_0_2; + lens-family = self.lens-family_1_2_3; in { - proto-lens_0_2_2_0 = appendPatch super.proto-lens_0_2_2_0 ./patches/proto-lens-0.2.2.0.patch; - proto-lens-descriptors = doJailbreak (super.proto-lens-descriptors.override { - inherit proto-lens; - lens-labels = self.lens-labels_0_1_0_2; + lens-family_1_2_3 = super.lens-family_1_2_3.override { + lens-family-core = self.lens-family-core_1_2_3; + }; + + proto-lens_0_5_1_0 = (appendPatch (doJailbreak super.proto-lens_0_5_1_0) ./patches/proto-lens-0.5.1.0.patch).override { + inherit lens-family; + }; + + proto-lens-runtime_0_5_0_0 = doJailbreak (super.proto-lens-runtime_0_5_0_0.override { + inherit lens-family proto-lens; }); - proto-lens-protoc_0_2_2_3 = appendPatch (addBuildDepend (super.proto-lens-protoc_0_2_2_3.override { - inherit proto-lens; + + proto-lens-protoc_0_5_0_0 = doJailbreak (super.proto-lens-protoc_0_5_0_0.override { + inherit lens-family proto-lens; haskell-src-exts = self.haskell-src-exts_1_19_1; - }) self.semigroups) ./patches/proto-lens-protoc-0.2.2.3.patch; - proto-lens-protobuf-types_0_2_2_0 = doJailbreak (super.proto-lens-protobuf-types_0_2_2_0.override { - inherit proto-lens proto-lens-protoc; }); + proto-lens-setup_0_4_0_2 = appendPatch (doJailbreak (super.proto-lens-setup_0_4_0_2.override { + inherit proto-lens-protoc; + })) ./patches/proto-lens-setup-0.4.0.2.patch; - lens-labels_0_1_0_2 = doJailbreak super.lens-labels_0_1_0_2; + proto-lens-protobuf-types_0_5_0_0 = doJailbreak (super.proto-lens-protobuf-types_0_5_0_0.override { + inherit lens-family proto-lens proto-lens-runtime proto-lens-setup; + }); - haskell-src-exts_1_19_1 = appendPatch (doJailbreak super.haskell-src-exts_1_19_1) ( + haskell-src-exts_1_19_1 = appendPatches (doJailbreak super.haskell-src-exts_1_19_1) [ # Adapt to the Semigroup–Monoid Proposal (enables building on GHC >= 8.4) - pkgs.fetchpatch { - url = https://github.com/haskell-suite/haskell-src-exts/commit/258e072fe9e37f94360b7488b58ea2832843bbb8.patch; - sha256 = "0ja6ai41v9plinlhjwja282m6ahn6mw4xi79np0jxqk83cg0z1ff"; - } - ); + (pkgs.fetchpatch { + url = "https://github.com/haskell-suite/haskell-src-exts/commit/258e072fe9e37f94360b7488b58ea2832843bbb8.patch"; + sha256 = "0ja6ai41v9plinlhjwja282m6ahn6mw4xi79np0jxqk83cg0z1ff"; + }) + # Adapt to MonadFail proposal (enables building on GHC >= 8.8) + (pkgs.fetchpatch { + url = "https://gist.githubusercontent.com/mikesperber/0f2addaf3fbe97ffb4a5234d8711ba41/raw/e09e20998283c7195e82d546ba9266d290eb000d/gistfile1.txt"; + sha256 = "18clvli7vpqsqlf2f3qidn71738j9zdlpana6wha3x0dxwan5ly0"; + }) ]; - tensorflow-proto = super.tensorflow-proto.override { - inherit proto-lens proto-lens-protobuf-types; + tensorflow-proto = (setTensorflowSourceRoot "tensorflow-proto" super.tensorflow-proto).override { + inherit proto-lens proto-lens-runtime proto-lens-setup proto-lens-protobuf-types; }; - tensorflow = super.tensorflow.override { - inherit mainland-pretty proto-lens; + + tensorflow = (setTensorflowSourceRoot "tensorflow" super.tensorflow).override { + inherit lens-family proto-lens; + # the "regular" Python package does not seem to include the binary library + libtensorflow = pkgs.libtensorflow-bin; }; - tensorflow-core-ops = super.tensorflow-core-ops.override { - inherit mainland-pretty proto-lens; + + tensorflow-core-ops = (setTensorflowSourceRoot "tensorflow-core-ops" super.tensorflow-core-ops).override { + inherit lens-family proto-lens; }; - tensorflow-logging = super.tensorflow-logging.override { - inherit proto-lens; + + tensorflow-logging = (setTensorflowSourceRoot "tensorflow-logging" super.tensorflow-logging).override { + inherit lens-family proto-lens; }; - tensorflow-mnist = overrideCabal (super.tensorflow-mnist.override { - inherit proto-lens; + + tensorflow-mnist = (setTensorflowSourceRoot "tensorflow-mnist" super.tensorflow-mnist).override { + inherit lens-family proto-lens; # https://github.com/tensorflow/haskell/issues/215 tensorflow-mnist-input-data = self.tensorflow-mnist-input-data; - }) (_drv: { broken = false; }); - tensorflow-mnist-input-data = setSourceRoot "tensorflow-mnist-input-data" (super.callPackage ( + }; + + tensorflow-mnist-input-data = setTensorflowSourceRoot "tensorflow-mnist-input-data" (super.callPackage ( { mkDerivation, base, bytestring, Cabal, cryptonite, directory , filepath, HTTP, network-uri, stdenv }: @@ -81,7 +109,6 @@ in mkDerivation { pname = "tensorflow-mnist-input-data"; version = "0.1.0.0"; - src = tensorflow-haskell; enableSeparateDataOutput = true; setupHaskellDepends = [ base bytestring Cabal cryptonite directory filepath HTTP @@ -96,10 +123,12 @@ in license = stdenv.lib.licenses.asl20; } ) {}); - tensorflow-opgen = super.tensorflow-opgen.override { - inherit mainland-pretty proto-lens; + + tensorflow-opgen = (setTensorflowSourceRoot "tensorflow-opgen" super.tensorflow-opgen).override { + inherit lens-family proto-lens; }; - tensorflow-ops = super.tensorflow-ops.override { - inherit proto-lens; + + tensorflow-ops = (setTensorflowSourceRoot "tensorflow-ops" super.tensorflow-ops).override { + inherit lens-family proto-lens; }; } diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index ac22f903c9b56..de5bf631bf0d6 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -48,12 +48,8 @@ in , isExecutable ? false, isLibrary ? !isExecutable , jailbreak ? false , license -# We cannot enable -j<n> parallelism for libraries because GHC is far more -# likely to generate a non-determistic library ID in that case. Further -# details are at <https://github.com/peti/ghc-library-id-bug>. -# -# Currently disabled for aarch64. See https://ghc.haskell.org/trac/ghc/ticket/15449. -, enableParallelBuilding ? ((stdenv.lib.versionOlder "7.8" ghc.version && !isLibrary) || stdenv.lib.versionOlder "8.0.1" ghc.version) && !(stdenv.buildPlatform.isAarch64) + # aarch64 sometimes crashes for -jn with n>1: https://ghc.haskell.org/trac/ghc/ticket/15449 +, enableParallelBuilding ? !stdenv.buildPlatform.isAarch64 , maintainers ? [] , doCoverage ? false , doHaddock ? !(ghc.isHaLVM or false) @@ -82,7 +78,7 @@ in # same package in the (recursive) dependencies of the package being # built. Will delay failures, if any, to compile time. allowInconsistentDependencies ? false -, maxBuildCores ? 4 # GHC usually suffers beyond -j4. https://ghc.haskell.org/trac/ghc/ticket/9221 +, maxBuildCores ? 16 # more cores usually don't improve performance: https://ghc.haskell.org/trac/ghc/ticket/9221 , # If set to true, this builds a pre-linked .o file for this Haskell library. # This can make it slightly faster to load this library into GHCi, but takes # extra disk space and compile time. @@ -181,6 +177,8 @@ let (optionalString enableHsc2hsViaAsm "--hsc2hs-option=--via-asm") ]; + parallelBuildingFlags = "-j$NIX_BUILD_CORES" + optionalString stdenv.isLinux " +RTS -A64M -RTS"; + crossCabalFlagsString = stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags); @@ -199,7 +197,7 @@ let "--package-db=$packageConfDir" (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}") (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") - (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES") + (optionalString enableParallelBuilding "--ghc-options=${parallelBuildingFlags}") (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") (enableFeature (enableDeadCodeElimination && !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs") (enableFeature enableLibraryProfiling "library-profiling") @@ -227,9 +225,9 @@ let setupCompileFlags = [ (optionalString (!coreSetup) "-${nativePackageDbFlag}=$setupPackageConfDir") - (optionalString (isGhcjs || isHaLVM || versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES") - # https://github.com/haskell/cabal/issues/2398 - (optionalString (versionOlder "7.10" ghc.version && !isHaLVM) "-threaded") + (optionalString enableParallelBuilding (parallelBuildingFlags)) + "-threaded" # https://github.com/haskell/cabal/issues/2398 + "-rtsopts" # allow us to pass RTS flags to the generated Setup executable ]; isHaskellPkg = x: x ? isHaskellLibrary; @@ -385,7 +383,8 @@ stdenv.mkDerivation ({ for d in $(grep '^dynamic-library-dirs:' "$packageConfDir"/* | cut -d' ' -f2- | tr ' ' '\n' | sort -u); do for lib in "$d/"*.{dylib,so}; do - ln -s "$lib" "$dynamicLinksDir" + # Allow overwriting because C libs can be pulled in multiple times. + ln -sf "$lib" "$dynamicLinksDir" done done # Edit the local package DB to reference the links directory. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1a9e75a37cd1d..a03d6a9b33d9b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1528,7 +1528,7 @@ self: { base colour diagrams-cairo diagrams-lib directory either-unwrap filepath parsec ParsecTools StockholmAlignment SVGFonts text vector ]; - description = "Libary for Hidden Markov Models in HMMER3 format"; + description = "Libary for Hidden Markov Models in HMMER3 format."; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -2511,7 +2511,7 @@ self: { version = "0.3.1.0"; sha256 = "0dlb761kj33v9p53fw44gg4r7j8kcl4jxvvgi7rz0pv8v7nh6255"; libraryHaskellDepends = [ base ]; - description = "Definition of a CSP core-language"; + description = "Definition of a CSP core-language."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -2912,7 +2912,7 @@ self: { version = "0.3"; sha256 = "10m7l701p3a2w0kxi2b93g2ii6s4s71zyjypqk3mi79siv8yilif"; libraryHaskellDepends = [ base mtl ]; - description = "A monad for complex manipulation of a stream"; + description = "A monad for complex manipulation of a stream."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -3328,6 +3328,8 @@ self: { benchmarkHaskellDepends = [ base colour criterion deepseq random ]; description = "Color spaces and conversions between them"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Combinatorrent" = callPackage @@ -3439,25 +3441,6 @@ self: { broken = true; }) {}; - "ConcurrentUtils" = callPackage - ({ mkDerivation, array, arrows, base, containers, hashable - , hashtables, list-extras, monad-loops, MonadRandom, monads-tf - , parallel, stm, strict, tagged, ttrie - }: - mkDerivation { - pname = "ConcurrentUtils"; - version = "0.4.5.0"; - sha256 = "1kf5g4d8q28hs4wfd0fvc7k1bfir40z7rzx3lxflci36inr1d6dc"; - libraryHaskellDepends = [ - array arrows base containers hashable hashtables list-extras - monad-loops MonadRandom monads-tf parallel stm strict tagged ttrie - ]; - description = "Concurrent utilities"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - "Concurrential" = callPackage ({ mkDerivation, async, base }: mkDerivation { @@ -3639,7 +3622,7 @@ self: { version = "0.1"; sha256 = "027dv53jrfk46dmiidnnrrdvhyin60i862znp414213w72yjrbhh"; libraryHaskellDepends = [ base template-haskell ]; - description = "Practical typed lazy contracts"; + description = "Practical typed lazy contracts."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -5533,8 +5516,6 @@ self: { ]; description = "Library for computer music research and education"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "EventSocket" = callPackage @@ -5623,7 +5604,7 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers haskell98 ]; - description = "A set of computational morphology tools for Swedish diachronic lexicons"; + description = "A set of computational morphology tools for Swedish diachronic lexicons."; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -6356,8 +6337,8 @@ self: { }: mkDerivation { pname = "Frames"; - version = "0.6.2"; - sha256 = "1pbwrjcd8fm56hnxw6q42adn9n7maj96j3a2qyb6a668pc8q8jyx"; + version = "0.6.4"; + sha256 = "1z1bv3dqna9gp6k2rjnbl54hxkaxl4khdlfy52r0cv51ah8969ri"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6395,7 +6376,7 @@ self: { base beam-core beam-migrate beam-postgres bytestring conduit Frames generics-sop hspec hspec-core QuickCheck text vinyl ]; - description = "A library for accessing Postgres tables as in-memory data structures"; + description = "A library for accessing Postgres tables as in-memory data structures."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -6416,6 +6397,8 @@ self: { testHaskellDepends = [ base Frames hspec pipes ]; description = "Alternative CSV parser for the Frames package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Frames-map-reduce" = callPackage @@ -6752,8 +6735,8 @@ self: { }: mkDerivation { pname = "GPipe"; - version = "2.2.4"; - sha256 = "0l3s3j41fwwcjdc0nymzqmdsd7wlvaqyn1lg7n1wdx65wy4iz6j0"; + version = "2.2.5"; + sha256 = "1k4hxgd5vpdl9fqjk3i81rcyqn53giahcpygb9lm3nyfvxzzwg3z"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean containers exception-transformers gl hashtables linear @@ -7201,8 +7184,8 @@ self: { ({ mkDerivation, base, mtl, split, threepenny-gui }: mkDerivation { pname = "Gleam"; - version = "0.1.0.0"; - sha256 = "0j822hblrd0p343w9ds0fa75s3grgpiyv180hsw3ld3pj30fcc8b"; + version = "0.1.1.0"; + sha256 = "08nabgn7v0rw4aihbihbijqgajrvyc7z7nl67jmka39fh5zm6blm"; libraryHaskellDepends = [ base mtl split threepenny-gui ]; description = "HTML Canvas graphics, animations and simulations"; license = stdenv.lib.licenses.bsd3; @@ -8680,16 +8663,14 @@ self: { }) {}; "HListPP" = callPackage - ({ mkDerivation, applicative-quoters, base, regex-applicative }: + ({ mkDerivation, base, regex-applicative }: mkDerivation { pname = "HListPP"; - version = "0.2.1"; - sha256 = "0rqn8rybp0mi86yyqhclqqrblcn9l04wiq4yv8xy9x1852ff4588"; + version = "0.2.2"; + sha256 = "009i1i4daa6cb8pix0545gs5w5c7hsxwiqz98gdsc6awszxbhg7l"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ - applicative-quoters base regex-applicative - ]; + executableHaskellDepends = [ base regex-applicative ]; description = "A preprocessor for HList labelable labels"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -8827,6 +8808,8 @@ self: { executablePkgconfigDepends = [ opencv ]; description = "A binding for the OpenCV computer vision library"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) opencv;}; "HPDF" = callPackage @@ -9153,7 +9136,7 @@ self: { base bytestring DebugTraceHelpers directory filepath HSH HStringTemplateHelpers MissingH mtl regex-pcre unix ]; - description = "Convenience functions that use HSH, instances for HSH"; + description = "Convenience functions that use HSH, instances for HSH."; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -9364,8 +9347,8 @@ self: { }: mkDerivation { pname = "HTab"; - version = "1.7.2"; - sha256 = "1xn2ljw97j625l5q7a9chqscdbi4cj29zg1yy4jz4mcivzwbjqii"; + version = "1.7.3"; + sha256 = "0w5zjd9q87a79vaslxs4r7xllq37vyg546ramgfnw43l1cmkica6"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -9666,8 +9649,8 @@ self: { pname = "HaXml"; version = "1.25.5"; sha256 = "0d8jbiv53r3ndg76r3937idqdg34nhmb99vj087i73hjnv21mifb"; - revision = "1"; - editedCabalFile = "1xnni9hdvi87incm1pcx0b7jv410maww99acdfkx1cwhlb6k91ag"; + revision = "2"; + editedCabalFile = "0vlczcac2is5dbvkcwbsry1i10pbh1r316n1sq2py35alw7kzp1j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10685,20 +10668,6 @@ self: { ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.4.17"; - sha256 = "0qivl9clmybfglwxqp2sq308rv4ia4rhwshcsc8b029bvpp0mpsi"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring network time ]; - librarySystemDepends = [ openssl ]; - testHaskellDepends = [ base bytestring ]; - description = "Partial OpenSSL binding for Haskell"; - license = stdenv.lib.licenses.publicDomain; - }) {inherit (pkgs) openssl;}; - - "HsOpenSSL_0_11_4_18" = callPackage - ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: - mkDerivation { - pname = "HsOpenSSL"; version = "0.11.4.18"; sha256 = "1nz4d6pwcnv775ncyg85ckx8kkzj2y3h17i40jc0yna8ai7driyx"; setupHaskellDepends = [ base Cabal ]; @@ -10707,7 +10676,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Partial OpenSSL binding for Haskell"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "HsOpenSSL-x509-system" = callPackage @@ -12071,6 +12039,8 @@ self: { ]; description = "Lightweight Directory Access Protocol (LDAP) version 3"; license = stdenv.lib.licenses.gpl2Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "LParse" = callPackage @@ -12098,6 +12068,28 @@ self: { broken = true; }) {}; + "LTS" = callPackage + ({ mkDerivation, base, criterion, fin, QuickCheck, smallcheck + , tasty, tasty-hunit, tasty-smallcheck, time + }: + mkDerivation { + pname = "LTS"; + version = "0.1.0.0"; + sha256 = "0wiyly7yhpdsbpnv1lkbyy3b5p3vsri5zhr6d7bcrhmrn3wbc0hb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base fin ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck smallcheck tasty tasty-hunit tasty-smallcheck + ]; + benchmarkHaskellDepends = [ base criterion time ]; + description = "LTS: Labelled Transition System"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "LTree" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -12586,6 +12578,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ListLike_4_7" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string + , vector + }: + mkDerivation { + pname = "ListLike"; + version = "4.7"; + sha256 = "1209xa73cxzajp8wx2bw2017vjb84yibm5q5sp0i0ifhi5syv4jl"; + libraryHaskellDepends = [ + array base bytestring containers deepseq dlist fmlist text + utf8-string vector + ]; + testHaskellDepends = [ + array base bytestring containers dlist fmlist HUnit QuickCheck + random text utf8-string vector + ]; + description = "Generalized support for list-like structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ListT" = callPackage ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck , transformers, util @@ -12594,8 +12608,8 @@ self: { pname = "ListT"; version = "0.1.2.0"; sha256 = "0ygj695w1xrv0kkpnm55gfjnks7xdbw6vrlqx1a5as4s36hq11zr"; - revision = "1"; - editedCabalFile = "1bc361psymmj12akdb3vdl4qsm5fp37dwbsqapj9sglnmv3w7bhg"; + revision = "3"; + editedCabalFile = "037gbqvqqlqh1b18z4y24rcgkmn3yh0yg3p1aqq1frm3cbkawcps"; libraryHaskellDepends = [ base transformers util ]; testHaskellDepends = [ base smallcheck tasty tasty-smallcheck transformers util @@ -12642,6 +12656,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "LiterateMarkdown" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "LiterateMarkdown"; + version = "0.1.0.0"; + sha256 = "0v9j7kqjvkrafxl4ahfqj1xvigim9vnd3kflgqagzccrgx9kz5gv"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + doHaddock = false; + description = "Converter to convert from .lhs to .md and vice versa."; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "Logic" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -13272,8 +13304,8 @@ self: { }: mkDerivation { pname = "MiniAgda"; - version = "0.2019.12.13"; - sha256 = "15v5yijhylrwy0lc4n9a8p75dadr9xc57xajgir3jg618l0wh5lc"; + version = "0.2020.4.14"; + sha256 = "0fj0fk2i47yrfqiapl3wkj8n74rjpndvwxg2dzx3185glb06cjxj"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -13309,19 +13341,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "MissingH_1_4_2_1" = callPackage + "MissingH_1_4_3_0" = callPackage ({ mkDerivation, array, base, containers, directory , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network - , old-locale, old-time, parsec, process, random, regex-compat, time - , unix + , network-bsd, old-locale, old-time, parsec, process, random + , regex-compat, time, unix }: mkDerivation { pname = "MissingH"; - version = "1.4.2.1"; - sha256 = "1m9qdgs2ma1svjcagv7qd31xcvym2mnzx001qwchdh46q9y288k1"; + version = "1.4.3.0"; + sha256 = "196cniya5wzcv2d777nr0f7hinclpals4ia1mkzzv35870pqr6lw"; libraryHaskellDepends = [ array base containers directory filepath hslogger mtl network - old-locale old-time parsec process random regex-compat time unix + network-bsd old-locale old-time parsec process random regex-compat + time unix ]; testHaskellDepends = [ base containers directory errorcall-eq-instance filepath HUnit @@ -16263,6 +16296,8 @@ self: { pname = "QuickCheck-safe"; version = "0.1.0.6"; sha256 = "1f868s6iq66m4m305xrx3mfw46zvzaahkvz6xjlqzk0cragai1kp"; + revision = "1"; + editedCabalFile = "0my9s0kcxkizbfckb35l5hyr1pmhx32l2lviy7zqh93mlmv9ig4s"; libraryHaskellDepends = [ base containers QuickCheck ]; description = "Safe reimplementation of QuickCheck's core"; license = stdenv.lib.licenses.mit; @@ -16797,23 +16832,6 @@ self: { }: mkDerivation { pname = "Rasterific"; - version = "0.7.5.1"; - sha256 = "0n2kamiymfnh93yc8zn3bjjnxlz1q2yyc33f9h2ahyn4wzfw64n6"; - libraryHaskellDepends = [ - base bytestring containers dlist FontyFruity free JuicyPixels mtl - primitive transformers vector vector-algorithms - ]; - description = "A pure haskell drawing engine"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Rasterific_0_7_5_2" = callPackage - ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity - , free, JuicyPixels, mtl, primitive, transformers, vector - , vector-algorithms - }: - mkDerivation { - pname = "Rasterific"; version = "0.7.5.2"; sha256 = "0f2qskrkxpj728zplrjz3j6h5cxwqvr0qi3614krjgcx69iym3sx"; libraryHaskellDepends = [ @@ -16822,7 +16840,6 @@ self: { ]; description = "A pure haskell drawing engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ReadArgs" = callPackage @@ -17488,6 +17505,8 @@ self: { ]; description = "STLink USB interface in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "STM32-Zombie" = callPackage @@ -17504,6 +17523,8 @@ self: { ]; description = "control a STM32F103 microcontroller"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "STM32F103xx-SVD" = callPackage @@ -17944,17 +17965,16 @@ self: { }) {}; "ShellCheck" = callPackage - ({ mkDerivation, aeson, array, base, bytestring, Cabal, containers + ({ mkDerivation, aeson, array, base, bytestring, containers , deepseq, Diff, directory, filepath, mtl, parsec, process , QuickCheck, regex-tdfa }: mkDerivation { pname = "ShellCheck"; - version = "0.7.0"; - sha256 = "1vx895cp5k5h0680xfwj74lk97m9y627n965x6srds0gfnbkzy9s"; + version = "0.7.1"; + sha256 = "06m4wh891nah3y0br4wh3adpsb16zawkb2ijgf1vcz61fznj6ps1"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ aeson array base bytestring containers deepseq Diff directory filepath mtl parsec process QuickCheck regex-tdfa @@ -18077,6 +18097,164 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Shpadoinkle" = callPackage + ({ mkDerivation, base, jsaddle, jsaddle-warp, text, unliftio }: + mkDerivation { + pname = "Shpadoinkle"; + version = "0.1.0.0"; + sha256 = "0527rd9dh5sjh3y7sir9bpydad05rx43nr6ba20sa4ha8zvvl583"; + libraryHaskellDepends = [ + base jsaddle jsaddle-warp text unliftio + ]; + description = "A programming model for declarative, high performance user interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "Shpadoinkle-backend-pardiff" = callPackage + ({ mkDerivation, base, compactable, containers, file-embed, jsaddle + , lens, mtl, neat-interpolation, random, semialign, Shpadoinkle + , text, these, unliftio, uuid + }: + mkDerivation { + pname = "Shpadoinkle-backend-pardiff"; + version = "0.1.0.1"; + sha256 = "1b1ab062fm1qz0pnp4jws7wmhsb2hfvj5mb6jrrgbm9yjv7k725v"; + libraryHaskellDepends = [ + base compactable containers file-embed jsaddle lens mtl + neat-interpolation random semialign Shpadoinkle text these unliftio + uuid + ]; + description = "A Virtual Dom in pure Haskell, based on Html as an Alignable Functor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "Shpadoinkle-backend-snabbdom" = callPackage + ({ mkDerivation, base, file-embed, jsaddle, mtl, Shpadoinkle, text + }: + mkDerivation { + pname = "Shpadoinkle-backend-snabbdom"; + version = "0.1.0.0"; + sha256 = "1j00ivjlmpb55h4ygldlads9135qnx3q0k0w946xqqlbyca1qzir"; + libraryHaskellDepends = [ + base file-embed jsaddle mtl Shpadoinkle text + ]; + description = "Use the high-performance Snabbdom virtual dom library written in JavaScript"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "Shpadoinkle-backend-static" = callPackage + ({ mkDerivation, base, compactable, Shpadoinkle, text }: + mkDerivation { + pname = "Shpadoinkle-backend-static"; + version = "0.1.0.0"; + sha256 = "1mpia2qzv8cmd3ss20sj0bc15zjjkdj1g0byvnb3yakpbjky44j5"; + libraryHaskellDepends = [ base compactable Shpadoinkle text ]; + description = "A backend for rendering Shpadoinkle as Text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "Shpadoinkle-examples" = callPackage + ({ mkDerivation, aeson, base, beam-core, beam-sqlite, bytestring + , containers, exceptions, file-embed, lens, mtl + , optparse-applicative, servant, servant-client, servant-server + , Shpadoinkle, Shpadoinkle-backend-pardiff + , Shpadoinkle-backend-snabbdom, Shpadoinkle-backend-static + , Shpadoinkle-html, Shpadoinkle-lens, Shpadoinkle-router + , Shpadoinkle-widgets, sqlite-simple, stm, text, unliftio, wai + , wai-app-static, warp + }: + mkDerivation { + pname = "Shpadoinkle-examples"; + version = "0.0.0.1"; + sha256 = "19iq8yw2m14y8j67slry1x30fnayx1d4sjwg2cafbgz9g7l1g7f1"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base beam-core beam-sqlite bytestring containers exceptions + file-embed lens mtl optparse-applicative servant servant-client + servant-server Shpadoinkle Shpadoinkle-backend-pardiff + Shpadoinkle-backend-snabbdom Shpadoinkle-backend-static + Shpadoinkle-html Shpadoinkle-lens Shpadoinkle-router + Shpadoinkle-widgets sqlite-simple stm text unliftio wai + wai-app-static warp + ]; + description = "Example usages of Shpadoinkle"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {Shpadoinkle-lens = null;}; + + "Shpadoinkle-html" = callPackage + ({ mkDerivation, base, containers, ghcjs-dom, jsaddle, jsaddle-dom + , Shpadoinkle, stm, template-haskell, text, unliftio + }: + mkDerivation { + pname = "Shpadoinkle-html"; + version = "0.1.0.0"; + sha256 = "1v5dxg7axg2a508rcphchihr5krrwagxx1a41660r7js7wba9bk8"; + libraryHaskellDepends = [ + base containers ghcjs-dom jsaddle jsaddle-dom Shpadoinkle stm + template-haskell text unliftio + ]; + description = "A typed, template generated Html DSL, and helpers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "Shpadoinkle-router" = callPackage + ({ mkDerivation, aeson, base, bytestring, compactable, exceptions + , ghcjs-dom, http-api-data, jsaddle, jsaddle-dom, lens, network-uri + , servant, servant-client, servant-server, Shpadoinkle + , Shpadoinkle-backend-static, text, unliftio, wai, wai-app-static + , warp + }: + mkDerivation { + pname = "Shpadoinkle-router"; + version = "0.1.0.1"; + sha256 = "08kv5gbs2kkkspnmkzv0q5y3hnvv69yliwc4815wsyh8hdrn3ks6"; + libraryHaskellDepends = [ + aeson base bytestring compactable exceptions ghcjs-dom + http-api-data jsaddle jsaddle-dom lens network-uri servant + servant-client servant-server Shpadoinkle + Shpadoinkle-backend-static text unliftio wai wai-app-static warp + ]; + description = "A single page application rounter for Shpadoinkle based on Servant"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "Shpadoinkle-widgets" = callPackage + ({ mkDerivation, aeson, base, compactable, containers + , edit-distance, email-validate, hspec, jsaddle, mtl, QuickCheck + , Shpadoinkle, Shpadoinkle-html, stm, template-haskell, text + , unliftio + }: + mkDerivation { + pname = "Shpadoinkle-widgets"; + version = "0.0.0.2"; + sha256 = "1n85pjzkn1rjhl9rqswm7cra631qqabqf42wimfq2v17l8ymrlky"; + libraryHaskellDepends = [ + aeson base compactable containers edit-distance email-validate + jsaddle mtl Shpadoinkle Shpadoinkle-html stm template-haskell text + unliftio + ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + description = "A collection of common reusable types and components"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "Shrub" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -19060,7 +19238,7 @@ self: { version = "0.1.4"; sha256 = "0rpjd93lsqg3dqfjndm9l1nzyrbfs5nnvc61lmbmbhg0bcy0jms8"; libraryHaskellDepends = [ base template-haskell ]; - description = "TH implementation of effects"; + description = "TH implementation of effects."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -20272,6 +20450,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "VulkanMemoryAllocator" = callPackage + ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: + mkDerivation { + pname = "VulkanMemoryAllocator"; + version = "0.3"; + sha256 = "1b16vbhml17knx2jk22dqv3hjq98p23g9vmqnd4c0igw76ih46nb"; + libraryHaskellDepends = [ + base bytestring transformers vector vulkan + ]; + description = "Bindings to the VulkanMemoryAllocator library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "WAVE" = callPackage ({ mkDerivation, base, bytestring, containers, parseargs }: mkDerivation { @@ -20290,6 +20483,45 @@ self: { broken = true; }) {}; + "WEditor" = callPackage + ({ mkDerivation, base, directory, filepath }: + mkDerivation { + pname = "WEditor"; + version = "0.2.1.1"; + sha256 = "0p0vrvg96va4jppcxr3r5m14ykb5jybn8iyj677dxpziwh5brhmq"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base directory filepath ]; + doHaddock = false; + description = "Generic text-editor logic for use with fixed-width fonts"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "WEditorBrick" = callPackage + ({ mkDerivation, base, brick, microlens, vty, WEditor }: + mkDerivation { + pname = "WEditorBrick"; + version = "0.2.0.1"; + sha256 = "1bzrfbw14c0ad477z5s51n8181cgcxw6q93bdj1d1nrfgawq7znb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base brick microlens vty WEditor ]; + executableHaskellDepends = [ base brick vty WEditor ]; + description = "Text-editor widget with dynamic line-wrapping for use with Brick"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "WEditorHyphen" = callPackage + ({ mkDerivation, base, directory, hyphenation, WEditor }: + mkDerivation { + pname = "WEditorHyphen"; + version = "0.1.0.5"; + sha256 = "05f7dh75dx27q35bcj84mn3q6w0sd6jkcilykrlad9gm5ihbbcbk"; + libraryHaskellDepends = [ base hyphenation WEditor ]; + testHaskellDepends = [ base directory hyphenation WEditor ]; + description = "Language-specific hyphenation policies for WEditor"; + license = stdenv.lib.licenses.asl20; + }) {}; + "WL500gPControl" = callPackage ({ mkDerivation, base, directory, filepath, mtl, unix, WL500gPLib }: @@ -20885,6 +21117,8 @@ self: { pname = "X"; version = "0.3.1.0"; sha256 = "10paczbaiwag50v8ay9pl0f6whqds6y0yy14z0h8s6j04p9zd50f"; + revision = "1"; + editedCabalFile = "1c24q6bh9zq1a9rm9wqi8kasfzcn3cvbzdcgya8clwh3k7xbsvmg"; libraryHaskellDepends = [ base bytestring deepseq text text-short ]; @@ -22399,6 +22633,8 @@ self: { pname = "acme-circular-containers"; version = "0.1.0.0"; sha256 = "1xngqlx0avn84qx696hjm8cdqqs9p0ls90kklkz5rs48fbcma3pr"; + revision = "2"; + editedCabalFile = "0zshb422bmcjisa1hq2mfvmijcsgk9lyi3f5wai62ydablxqdhbm"; libraryHaskellDepends = [ base containers graph-wrapper ]; testHaskellDepends = [ base containers doctest doctest-discover graph-wrapper @@ -23118,6 +23354,8 @@ self: { doHaddock = false; description = "Semigroup actions and torsors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ad" = callPackage @@ -23216,6 +23454,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "addy" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, hedgehog + , http-types, ip, lens, relude, tasty, tasty-hedgehog, tasty-hunit + , text, text-icu, validation-selective + }: + mkDerivation { + pname = "addy"; + version = "0.1.0.0"; + sha256 = "10p7q0infa1bawhg7hxw8rqjqdj3w737j5s3g41hy4in2nfp5ji0"; + libraryHaskellDepends = [ + attoparsec base bytestring ip lens relude text text-icu + validation-selective + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring hedgehog http-types ip lens relude + tasty tasty-hedgehog tasty-hunit text text-icu validation-selective + ]; + description = "A full-featured library for parsing, validating, and rendering email addresses"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "adhoc-network" = callPackage ({ mkDerivation, base, bytestring, containers, Crypto, dataenc , HaXml, hsgnutls, network, old-locale, parsec, pkcs1, random, time @@ -23264,6 +23525,8 @@ self: { pname = "adjunction"; version = "0.0.0.0"; sha256 = "1n83ak423jwyj3w708alj9ngczzll05jyn60d0fgx8bvr3hlmi0i"; + revision = "1"; + editedCabalFile = "1q5bgf7zk11rbxa0gy0fm4vap38jwg42lk1qhb3nlm93j9jgfn36"; libraryHaskellDepends = [ base hs-functors ]; testHaskellDepends = [ base hs-functors ]; benchmarkHaskellDepends = [ base gauge hs-functors ]; @@ -23848,8 +24111,6 @@ self: { ]; description = "Derivation of Aeson instances for GADTs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aeson-generic-compat" = callPackage @@ -24144,8 +24405,8 @@ self: { }: mkDerivation { pname = "aeson-schema"; - version = "0.4.1.3"; - sha256 = "17w0hih9l7x9r14s2mxywjzysm00f6bz6rqsgknvv9injakpscn3"; + version = "0.4.2.0"; + sha256 = "0d7x5c2s4jx3663wgrmzvdgxq5b3slcnmr09pk3i7kkrc1wf3yky"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson attoparsec base bytestring containers fail ghc-prim mtl @@ -24199,6 +24460,8 @@ self: { pname = "aeson-schemas"; version = "1.1.0"; sha256 = "1w01mdixja6f8176ra0lrkhbrr68hcsiib7sq8sdfh1rsx3hsn62"; + revision = "1"; + editedCabalFile = "1z74b2barkaq4hmx29i39lgbq925z2ws226ad9cyicz8nlgrghbv"; libraryHaskellDepends = [ aeson base bytestring first-class-families megaparsec template-haskell text unordered-containers @@ -24372,6 +24635,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "aeson-via" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, newtype-generics, text + }: + mkDerivation { + pname = "aeson-via"; + version = "0.1.0"; + sha256 = "0zlx4pxfh3qll8ymfya0rfqx3gd7ag0wag86fa8fvni6h07ynryf"; + libraryHaskellDepends = [ + aeson aeson-casing base newtype-generics text + ]; + description = "Wrappers to derive-via Aeson ToJSON/FromJSON typeclasses"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "aeson-with" = callPackage + ({ mkDerivation, aeson, base, hashmap, lens, lens-aeson, scientific + , text, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-with"; + version = "0.0.1.0"; + sha256 = "05xhbcfym586qb0giwr9rayqgyp25bc026kwbn7x5ln4nmzp2x9n"; + libraryHaskellDepends = [ + aeson base hashmap lens lens-aeson scientific text + unordered-containers vector + ]; + description = "withXField combinators for aeson"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-yak" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { @@ -24433,6 +24726,8 @@ self: { pname = "affine"; version = "0.1.1.0"; sha256 = "094h5b5l755sm79mr47dm5brp2jvfd2g0mdz23mcw1pz57lm0c8i"; + revision = "1"; + editedCabalFile = "1avxd17y9k0afqjgb8gq254a6ys7dpncgiyrp6mxbngdcvjyahyc"; libraryHaskellDepends = [ alg base ]; description = "Affine spaces (generalized)"; license = stdenv.lib.licenses.bsd3; @@ -26751,6 +27046,8 @@ self: { ]; description = "Amazon DynamoDB SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-dynamodb-dax" = callPackage @@ -29344,6 +29641,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-dynamodb_7_5_1" = callPackage @@ -29367,6 +29666,7 @@ self: { description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-es" = callPackage @@ -29766,15 +30066,17 @@ self: { }) {}; "aop-prelude" = callPackage - ({ mkDerivation, base, ghc-prim }: + ({ mkDerivation, base, ghc-prim, integer-gmp }: mkDerivation { pname = "aop-prelude"; - version = "0.1.0.0"; - sha256 = "0jgv33h50mb5i0fignmxngijcrv59wnnljnf1idrf7n57kgrrjlg"; - libraryHaskellDepends = [ base ghc-prim ]; + version = "0.3.0.2"; + sha256 = "0ix3jr27yasr6zkfdrwpy9nfdgz7x5rn004rq0vsarg6dssiq46k"; + libraryHaskellDepends = [ base ghc-prim integer-gmp ]; testHaskellDepends = [ base ghc-prim ]; description = "prelude for Algebra of Programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aos-signature" = callPackage @@ -30750,7 +31052,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "apply-refact" = callPackage + "apply-refact_0_6_0_0" = callPackage + ({ mkDerivation, base, containers, directory, filemanip, filepath + , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact + , silently, syb, tasty, tasty-expected-failure, tasty-golden + , temporary, transformers, unix-compat + }: + mkDerivation { + pname = "apply-refact"; + version = "0.6.0.0"; + sha256 = "0p2mqgjcqr1zcmk8zgr0yq7g8z1agsa6l493lkj6g3ya9lyhxgig"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filemanip ghc ghc-exactprint mtl process + refact syb temporary transformers unix-compat + ]; + executableHaskellDepends = [ + base containers directory filemanip filepath ghc ghc-exactprint mtl + optparse-applicative process refact syb temporary transformers + unix-compat + ]; + testHaskellDepends = [ + base containers directory filemanip filepath ghc ghc-exactprint mtl + optparse-applicative process refact silently syb tasty + tasty-expected-failure tasty-golden temporary transformers + unix-compat + ]; + description = "Perform refactorings specified by the refact library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "apply-refact_0_7_0_0" = callPackage ({ mkDerivation, base, containers, directory, filemanip, filepath , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact , silently, syb, tasty, tasty-expected-failure, tasty-golden @@ -30779,6 +31113,38 @@ self: { ]; description = "Perform refactorings specified by the refact library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "apply-refact" = callPackage + ({ mkDerivation, base, containers, directory, filemanip, filepath + , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact + , silently, syb, tasty, tasty-expected-failure, tasty-golden + , temporary, transformers, unix-compat + }: + mkDerivation { + pname = "apply-refact"; + version = "0.8.0.0"; + sha256 = "0hh7flildjfbigs0knhd3bfd4r3wnhg4ji4cpkx1qagnp5cs4pk0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filemanip ghc ghc-exactprint mtl process + refact syb temporary transformers unix-compat + ]; + executableHaskellDepends = [ + base containers directory filemanip filepath ghc ghc-exactprint mtl + optparse-applicative process refact syb temporary transformers + unix-compat + ]; + testHaskellDepends = [ + base containers directory filemanip filepath ghc ghc-exactprint mtl + optparse-applicative process refact silently syb tasty + tasty-expected-failure tasty-golden temporary transformers + unix-compat + ]; + description = "Perform refactorings specified by the refact library"; + license = stdenv.lib.licenses.bsd3; }) {}; "apportionment" = callPackage @@ -31204,8 +31570,8 @@ self: { }: mkDerivation { pname = "archive-sig"; - version = "1.0.0.0"; - sha256 = "1n8b10l5fq11kvph6j3qysm4ih6yi02167hixx98sa5c6bgba5z5"; + version = "1.0.2.0"; + sha256 = "0n9z13p76c9hxxy9ljjf3y1w9mh952rvihz4xgn0xpb03i1agj65"; libraryHaskellDepends = [ base bytestring composition-prelude dir-traverse ]; @@ -31660,6 +32026,8 @@ self: { ]; description = "Arithmetic circuits for zkSNARKs"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arithmoi" = callPackage @@ -31672,6 +32040,8 @@ self: { pname = "arithmoi"; version = "0.10.0.0"; sha256 = "1qrrmwg40bw5j51w658ilm5wg6awfbsylpmzjw0r0rgh6ml8irk9"; + revision = "1"; + editedCabalFile = "0vl9ki92sfsgqmgfg4f69rqqkl0q4a4klffsskhns6bjbcnzdg8z"; configureFlags = [ "-f-llvm" ]; isLibrary = true; isExecutable = true; @@ -31692,6 +32062,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "arithmoi_0_11_0_0" = callPackage + ({ mkDerivation, array, base, chimera, constraints, containers + , deepseq, exact-pi, gauge, integer-gmp, integer-logarithms + , integer-roots, mod, QuickCheck, quickcheck-classes, random + , semirings, smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-rerun, tasty-smallcheck, transformers, vector + }: + mkDerivation { + pname = "arithmoi"; + version = "0.11.0.0"; + sha256 = "14zhrlml6029n21h0ihspydg2zr7f93k4lji0nyi23c5y67pi9sk"; + configureFlags = [ "-f-llvm" ]; + libraryHaskellDepends = [ + array base chimera constraints containers deepseq exact-pi + integer-gmp integer-logarithms integer-roots mod random semirings + transformers vector + ]; + testHaskellDepends = [ + base containers exact-pi integer-gmp integer-roots mod QuickCheck + quickcheck-classes semirings smallcheck tasty tasty-hunit + tasty-quickcheck tasty-rerun tasty-smallcheck transformers vector + ]; + benchmarkHaskellDepends = [ + array base constraints containers deepseq gauge integer-logarithms + mod random semirings vector + ]; + description = "Efficient basic number-theoretic functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "arity-generic-liftA" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { @@ -32137,21 +32538,20 @@ self: { }) {}; "ascii" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive - , hashable, semigroups, text + ({ mkDerivation, ascii-case, ascii-char, ascii-group + , ascii-predicates, ascii-superset, ascii-th, base, bytestring + , data-ascii, text }: mkDerivation { pname = "ascii"; - version = "0.0.5.2"; - sha256 = "1kbf6iml4nvkzf78xqvxy67469vznd05ig8aprq7zx5vr9njliby"; - revision = "1"; - editedCabalFile = "0d04wmgahgbgi6y6p8887xs6bxcjdwjhkrrprahylw5y9b95fxi8"; + version = "1.0.0.0"; + sha256 = "0sgn93l08fgaxqgfpxmymqfqh5697cx6765yifpzdr7ayxfpf8b2"; libraryHaskellDepends = [ - base blaze-builder bytestring case-insensitive hashable semigroups - text + ascii-case ascii-char ascii-group ascii-predicates ascii-superset + ascii-th base bytestring data-ascii text ]; - description = "Type-safe, bytestring-based ASCII values"; - license = stdenv.lib.licenses.bsd3; + description = "The ASCII character set and encoding"; + license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -32171,6 +32571,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ascii-case" = callPackage + ({ mkDerivation, ascii-char, base, hashable }: + mkDerivation { + pname = "ascii-case"; + version = "1.0.0.0"; + sha256 = "10j65n9pdm5gxq0bsp06s1k7n4357kyw4xjy0mzncp9d81mbz9w4"; + libraryHaskellDepends = [ ascii-char base hashable ]; + description = "ASCII letter case"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "ascii-char" = callPackage + ({ mkDerivation, base, hashable }: + mkDerivation { + pname = "ascii-char"; + version = "1.0.0.0"; + sha256 = "1y50m20np2id71lvfl3z9ysh5qblcajgqcl5gi1ggg7wvg2r4r97"; + libraryHaskellDepends = [ base hashable ]; + description = "A Char type representing an ASCII character"; + license = stdenv.lib.licenses.asl20; + }) {}; + "ascii-cows" = callPackage ({ mkDerivation, base, random-extras, random-fu, text }: mkDerivation { @@ -32198,6 +32620,17 @@ self: { broken = true; }) {}; + "ascii-group" = callPackage + ({ mkDerivation, ascii-char, base, hashable }: + mkDerivation { + pname = "ascii-group"; + version = "1.0.0.0"; + sha256 = "0a6sx8hxjwzhbd7cz74k3zqw4vr8ykim1ds95zp7rl646mhlv4bk"; + libraryHaskellDepends = [ ascii-char base hashable ]; + description = "ASCII character groups"; + license = stdenv.lib.licenses.asl20; + }) {}; + "ascii-holidays" = callPackage ({ mkDerivation, base, random, random-shuffle, terminfo, time }: mkDerivation { @@ -32213,6 +32646,17 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "ascii-predicates" = callPackage + ({ mkDerivation, ascii-char, base }: + mkDerivation { + pname = "ascii-predicates"; + version = "1.0.0.0"; + sha256 = "1d44m97nqvfzxgxk2l7ch1693kccbx91fbg2hspfmkk3kyq16vk0"; + libraryHaskellDepends = [ ascii-char base ]; + description = "Various categorizations of ASCII characters"; + license = stdenv.lib.licenses.asl20; + }) {}; + "ascii-progress" = callPackage ({ mkDerivation, async, base, concurrent-output, data-default , hspec, QuickCheck, time @@ -32257,6 +32701,19 @@ self: { broken = true; }) {}; + "ascii-superset" = callPackage + ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: + mkDerivation { + pname = "ascii-superset"; + version = "1.0.0.0"; + sha256 = "0cpva5r2bxrbkqg1mifp3gcz01hnzlylyc9gqxcms4xxvi3sj22q"; + libraryHaskellDepends = [ + ascii-char base bytestring hashable text + ]; + description = "Representing ASCII with refined supersets"; + license = stdenv.lib.licenses.asl20; + }) {}; + "ascii-table" = callPackage ({ mkDerivation, aeson, base, containers, dlist, hashable, text , unordered-containers, vector, wl-pprint-extras @@ -32275,6 +32732,20 @@ self: { broken = true; }) {}; + "ascii-th" = callPackage + ({ mkDerivation, ascii-char, ascii-superset, base, template-haskell + }: + mkDerivation { + pname = "ascii-th"; + version = "1.0.0.0"; + sha256 = "1wh9zssgjrxd7z8wg5p0h3advbmc0v9p8lwjhra2c6860xzli9an"; + libraryHaskellDepends = [ + ascii-char ascii-superset base template-haskell + ]; + description = "Template Haskell support for ASCII"; + license = stdenv.lib.licenses.asl20; + }) {}; + "ascii-vector-avc" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, deepseq , deepseq-generics, HUnit, split, zlib @@ -34095,16 +34566,16 @@ self: { broken = true; }) {}; - "aur_6_3_1" = callPackage - ({ mkDerivation, aeson, base, http-client, http-client-tls, servant - , servant-client, tasty, tasty-hunit, text + "aur_7_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client + , http-client-tls, http-types, tasty, tasty-hunit, text }: mkDerivation { pname = "aur"; - version = "6.3.1"; - sha256 = "049n21n8b2qllig40fqrc72ah16d4r2ajhxxj851nkyi44fvz0ba"; + version = "7.0.1"; + sha256 = "17gizmkbclgxsllsy4lcvxyw09bz5l51l40j74y8bzxzryvwdrq8"; libraryHaskellDepends = [ - aeson base http-client servant servant-client text + aeson base bytestring http-client http-types text ]; testHaskellDepends = [ base http-client http-client-tls tasty tasty-hunit @@ -34134,38 +34605,32 @@ self: { }) {}; "aura" = callPackage - ({ mkDerivation, aeson, aeson-pretty, algebraic-graphs, aur, base - , bytestring, containers, errors, filepath, generic-lens - , http-client, http-client-tls, http-types, language-bash - , megaparsec, microlens, microlens-ghc, mwc-random, network-uri - , nonempty-containers, optparse-applicative, paths, pretty-simple - , prettyprinter, prettyprinter-ansi-terminal, rio, scheduler - , semigroupoids, servant-client-core, stm, tasty, tasty-hunit, text - , these, time, transformers, typed-process, unliftio, versions - , witherable-class + ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring + , containers, filepath, hashable, http-client, http-client-tls + , http-types, language-bash, megaparsec, microlens, network-uri + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , rio, scheduler, stm, tasty, tasty-hunit, text, time, transformers + , typed-process, unliftio, versions }: mkDerivation { pname = "aura"; - version = "2.2.1"; - sha256 = "01biz0slwjn9pbjfpg2lc1fywjyk9y0zvhjrbv4kx9nxnbrb7b2b"; + version = "2.3.0"; + sha256 = "0m0f06qbg3dn4l5di5fmidjyk9qi14ppbbgbh126naccybjj3231"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty algebraic-graphs aur base bytestring containers - errors filepath generic-lens http-client http-types language-bash - megaparsec microlens microlens-ghc mwc-random network-uri - nonempty-containers paths prettyprinter prettyprinter-ansi-terminal - rio scheduler semigroupoids servant-client-core stm text these time - transformers typed-process unliftio versions witherable-class + aeson algebraic-graphs aur base bytestring containers filepath + hashable http-client http-types language-bash megaparsec microlens + network-uri prettyprinter prettyprinter-ansi-terminal rio scheduler + stm text time transformers typed-process unliftio versions ]; executableHaskellDepends = [ - base bytestring containers errors http-client http-client-tls - microlens nonempty-containers optparse-applicative paths - pretty-simple prettyprinter prettyprinter-ansi-terminal rio text - transformers typed-process versions + base bytestring containers http-client http-client-tls microlens + optparse-applicative prettyprinter prettyprinter-ansi-terminal rio + text transformers typed-process versions ]; testHaskellDepends = [ - base bytestring containers megaparsec microlens paths rio tasty + base bytestring containers megaparsec microlens rio tasty tasty-hunit text versions ]; description = "A secure package manager for Arch Linux and the AUR"; @@ -34226,6 +34691,8 @@ self: { pname = "authenticate-oauth"; version = "1.6.0.1"; sha256 = "1hry1zbi7gbyfi94w9cyg6m7ii7xm68jnsph63zxdj2s4ns0ylp0"; + revision = "1"; + editedCabalFile = "0pyivmsmlzhpnzpi3jcmqyjjx5a1p7cl1grjyw8571pmxz6735w3"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring crypto-pubkey-types data-default http-client http-types random RSA SHA time @@ -34297,12 +34764,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "autoapply" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, logict, mtl + , template-haskell, th-desugar, transformers, unification-fd + }: + mkDerivation { + pname = "autoapply"; + version = "0.4"; + sha256 = "0b7la51399kcj9a4z9j49xd9v2zs172vygs3djz5qid7fsl37pgm"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base logict mtl template-haskell th-desugar transformers + unification-fd + ]; + testHaskellDepends = [ base doctest ]; + description = "Template Haskell to automatically pass values to functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "autoexporter" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; - version = "1.1.15"; - sha256 = "061pincl8110ifm2d6jahxkgpvwid1anv3hvswbs4zqwkg6ll8lx"; + version = "1.1.16"; + sha256 = "1cr3fdj57p959dgsilnsl5m8ifih6jzxmkpkvgx6hiqxkxkxlzvg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -34695,7 +35182,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "avro_0_5_1_0" = callPackage + "avro_0_5_2_0" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors , binary, bytestring, containers, data-binary-ieee754, deepseq , directory, doctest, doctest-discover, extra, fail, gauge @@ -34707,8 +35194,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.5.1.0"; - sha256 = "0yhv29ahwbj97l30knaid8l6v1n9k3ayv67qfkchd2m6qhzm7ns5"; + version = "0.5.2.0"; + sha256 = "1apvqny4dikx5b7yqxs8a4hsxipl5xvz2i3c5bna1faiagxav1i1"; libraryHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring containers data-binary-ieee754 deepseq fail HasBigDecimal hashable @@ -34763,6 +35250,8 @@ self: { ]; description = "Tool for decoding avro"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "avwx" = callPackage @@ -36258,16 +36747,16 @@ self: { }) {}; "barbies" = callPackage - ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit + ({ mkDerivation, base, distributive, QuickCheck, tasty, tasty-hunit , tasty-quickcheck, transformers }: mkDerivation { pname = "barbies"; - version = "2.0.0.0"; - sha256 = "0rbwdx9s940wfrlkay772i0q11rbywnhzigh5wy8sppx19pgfq9z"; - libraryHaskellDepends = [ base transformers ]; + version = "2.0.1.0"; + sha256 = "0d2a1d9w8xlviarlrrnlrfs82zf6gzxv09i6sa4ci1bl8df64wmj"; + libraryHaskellDepends = [ base distributive transformers ]; testHaskellDepends = [ - base QuickCheck tasty tasty-hunit tasty-quickcheck + base distributive QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "Classes for working with types that can change clothes"; license = stdenv.lib.licenses.bsd3; @@ -36277,8 +36766,8 @@ self: { ({ mkDerivation, barbies, base, template-haskell }: mkDerivation { pname = "barbies-th"; - version = "0.1"; - sha256 = "1rabviwnyp4c9r6ym958nxgrjz18gdajrj1crdniyyd586giadh4"; + version = "0.1.2"; + sha256 = "1zirafvm8x1badsh478hy8hh8zwqxkzcn3bscsvcp0vpyl8xxcma"; libraryHaskellDepends = [ barbies base template-haskell ]; testHaskellDepends = [ barbies base ]; description = "Create strippable HKD via TH"; @@ -36419,12 +36908,12 @@ self: { broken = true; }) {}; - "base_4_12_0_0" = callPackage + "base_4_14_0_0" = callPackage ({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }: mkDerivation { pname = "base"; - version = "4.12.0.0"; - sha256 = "0ka18cvw1cjvjdd20n03rjmxfm10083mh19wxwz1f1kqiyc92g3w"; + version = "4.14.0.0"; + sha256 = "108bg791pplf1mlc6x95jza6hq28yc5s8a8vv8fxvn33vwm058an"; libraryHaskellDepends = [ ghc-prim invalid-cabal-flag-settings rts ]; @@ -36480,15 +36969,15 @@ self: { }: mkDerivation { pname = "base-encoding"; - version = "0.1.0.0"; - sha256 = "1chmx5qvglf91i0c9ih9xydzb37v8j4bykvmb2g6pyg7wdq0s8si"; - revision = "2"; - editedCabalFile = "0flfvs03zs7k04x7yhsc3jiw3zpnx7n3637jyy10flpqv90fy6sx"; + version = "0.2.0.0"; + sha256 = "028b7pbpbnph2k4jzvp9kyn2s7d0zd62panh21digwn4nnc3hbp1"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring text ]; description = "Binary-to-text encodings (e.g. base64)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "base-feature-macros" = callPackage @@ -36581,13 +37070,16 @@ self: { "base16" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, criterion - , deepseq, memory, random-bytestring, tasty, tasty-hunit, text + , deepseq, memory, primitive, random-bytestring, tasty, tasty-hunit + , text, text-short }: mkDerivation { pname = "base16"; - version = "0.2.0.0"; - sha256 = "0j4mk7w8bg3q3ln5lcffdvaz36frizzq82z05l699y5g25abzrx4"; - libraryHaskellDepends = [ base bytestring text ]; + version = "0.2.1.0"; + sha256 = "192wnfqb97qhpjrjlq2da5jrjz9zjqjp57rgh1xdvdrnp7900r0s"; + libraryHaskellDepends = [ + base bytestring primitive text text-short + ]; testHaskellDepends = [ base base16-bytestring bytestring memory random-bytestring tasty tasty-hunit text @@ -36830,6 +37322,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "base64-bytestring_1_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , HUnit, QuickCheck, split, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "base64-bytestring"; + version = "1.1.0.0"; + sha256 = "1adcnkcx4nh3d59k94bkndj0wkgbvchz576qwlpaa7148a86q391"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring containers HUnit QuickCheck split test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq + ]; + description = "Fast base64 encoding and decoding for ByteStrings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base64-bytestring-type" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , binary, bytestring, cereal, deepseq, hashable, http-api-data @@ -37046,8 +37560,8 @@ self: { pname = "basic"; version = "0.1.0.0"; sha256 = "13ikd2pkg2qspkdq0h21wa3clyaj47cm41239024g0sdv8m03bpb"; - revision = "1"; - editedCabalFile = "1zdychkb5s1j8hyniz7v527q89ciwj1h33x34ghlqqpm0igai52k"; + revision = "2"; + editedCabalFile = "1b5kw2y4mrxn8lxcsc0dy00ixjyh58j52x9gs9yppvkry0v6c2x9"; libraryHaskellDepends = [ base stm template-haskell transformers util ]; @@ -37367,6 +37881,21 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "bazel-runfiles_0_12" = callPackage + ({ mkDerivation, base, directory, filepath, transformers }: + mkDerivation { + pname = "bazel-runfiles"; + version = "0.12"; + sha256 = "1x9w6j5yb0rxaaymzvv2hr5g00cy4zhkv79xgb8ns9frnv2bx2km"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath transformers ]; + executableHaskellDepends = [ base filepath ]; + description = "Locate Bazel runfiles location"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bbdb" = callPackage ({ mkDerivation, base, hspec, parsec }: mkDerivation { @@ -37771,12 +38300,12 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.13.1.1"; - sha256 = "0gqlwj30rghlqsik1i7w2yrccpf7h4pm3adnq6v7dprnhfcz1pkw"; + version = "0.13.1.2"; + sha256 = "0jqb1jn6jdrg6pm80zhd86rwsa05rxn0675lxv0m8c2z07g5601c"; libraryHaskellDepends = [ base dunai MonadRandom mtl simple-affine-space transformers ]; - description = "A replacement of Yampa based on Monadic Stream Functions"; + description = "FRP Yampa replacement implemented with Monadic Stream Functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -38006,8 +38535,8 @@ self: { ({ mkDerivation, base, bytestring, mtl, time }: mkDerivation { pname = "benchpress"; - version = "0.2.2.12"; - sha256 = "0r5b1mdjm08nsxni1qzwq3kap13jflcq7ksd30zl7vaxgz9yhwfm"; + version = "0.2.2.13"; + sha256 = "1x14mynjwjd8j7l0dl8nn6w8wf5y95wvww445glkih4p1yvzqm8z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl time ]; @@ -38131,7 +38660,7 @@ self: { ghc-paths haskeline haskell-src-exts language-python monads-tf parseargs process transformers ]; - description = "An implementation of Python 3"; + description = "An implementation of Python 3."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -38459,6 +38988,8 @@ self: { pname = "bifunctor"; version = "0.1.0.0"; sha256 = "056fbcmrbzdagxr37nzq06668r9js8q9h79pnz6hv19lfljgspb1"; + revision = "1"; + editedCabalFile = "1yc56avikf0xnmd7cm2hh93vgwcpxyiw1d208s4hp80i8iprkp2n"; libraryHaskellDepends = [ base category ]; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; @@ -38754,6 +39285,8 @@ self: { pname = "binary-bits"; version = "0.5"; sha256 = "1577bd5q4lhw024v4hfil10iyx7v4cf72ldhxb8xhm27i80lllqn"; + revision = "1"; + editedCabalFile = "08x9vx9akj46aw1l9k9xhhvqpxwffbz7fcr2dk5vr001a2ya4ngm"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base binary bytestring QuickCheck random test-framework @@ -38929,6 +39462,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "binary-io" = callPackage + ({ mkDerivation, base, binary, bytestring, hspec, process }: + mkDerivation { + pname = "binary-io"; + version = "0.0.1"; + sha256 = "1w0wqi60wdfhlmif7ji47cvf5608fg1b9hh7cz657ybv1lpc6s89"; + libraryHaskellDepends = [ base binary bytestring ]; + testHaskellDepends = [ base binary bytestring hspec process ]; + description = "Read and write values of types that implement Binary from and to Handles"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "binary-list" = callPackage ({ mkDerivation, base, binary, bytestring, criterion, deepseq , phantom-state, transformers @@ -39153,14 +39698,12 @@ self: { ({ mkDerivation, array, base, bytestring, mtl }: mkDerivation { pname = "binary-strict"; - version = "0.4.8.5"; - sha256 = "1m1r6dnvnj5ghvhb2wsh5sczvqx500xyh2f8qs1j1ddzn70bb6wp"; + version = "0.4.8.6"; + sha256 = "11s4hgmxdqdwh5p73kq1a0gshx4fqmbnjwb6ig015832sk3xnsgq"; libraryHaskellDepends = [ array base bytestring mtl ]; testHaskellDepends = [ base bytestring ]; description = "Binary deserialisation using strict ByteStrings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "binary-tagged" = callPackage @@ -39261,6 +39804,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "binaryen" = callPackage + ({ mkDerivation, base, binaryen }: + mkDerivation { + pname = "binaryen"; + version = "0.0.1.1"; + sha256 = "059j67lq63nzyivsmkwblsmbw8f3x079bng9cb174snp8yra8v8k"; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ binaryen ]; + description = "Haskell bindings to binaryen"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) binaryen;}; + "bind-marshal" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim , monads-tf, mtl, numeric-prelude, random, stm, strict @@ -39697,7 +40252,7 @@ self: { description = "Low level bindings to the C levmar (Levenberg-Marquardt) library"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; + }) {inherit (pkgs) blas; liblapack = null;}; "bindings-libcddb" = callPackage ({ mkDerivation, base, bindings-DSL, libcddb }: @@ -39735,7 +40290,7 @@ self: { license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) libftdi; inherit (pkgs) libusb;}; + }) {inherit (pkgs) libftdi; libusb = null;}; "bindings-libg15" = callPackage ({ mkDerivation, base, bindings-DSL, g15 }: @@ -39793,7 +40348,9 @@ self: { libraryPkgconfigDepends = [ libusb ]; description = "Low level bindings to libusb"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libusb;}; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {libusb = null;}; "bindings-libv4l2" = callPackage ({ mkDerivation, base, bindings-DSL, v4l2 }: @@ -40019,7 +40576,7 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ sipc ]; executableHaskellDepends = [ base ]; - description = "Low level bindings to SIPC"; + description = "Low level bindings to SIPC."; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -40345,8 +40902,8 @@ self: { }: mkDerivation { pname = "bioinformatics-toolkit"; - version = "0.9.2"; - sha256 = "1glf8wnswn60mcyrwn6y1ma6db1k6zckjmzbm28nvr961plp108b"; + version = "0.9.3.1"; + sha256 = "106aiq3147zrd6dh689zamqi8q03cfvsmsvjlivwcdgybg7zrdr4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty attoparsec base bytestring bytestring-lexing @@ -40460,8 +41017,8 @@ self: { }: mkDerivation { pname = "birch-beer"; - version = "0.2.3.0"; - sha256 = "1lq5mxq2pci3jh3a0pv7k6a3ncz39g45hvj9r78xwmqxn5s5hffw"; + version = "0.2.4.2"; + sha256 = "09bk2qsq6rpa2sk817vb9w1y21rqjkj25i74cfw4rgzy2c550ffj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41071,8 +41628,8 @@ self: { }: mkDerivation { pname = "bits-extra"; - version = "0.0.1.5"; - sha256 = "1f29jn8gxmi9nrwnrykq4z88cg8zsknbw7licmf44hlid0s5glf5"; + version = "0.0.2.0"; + sha256 = "1c54008kinzcx93kc8vcp7wq7la662m8nk82ax76i9b0gvbkk21f"; libraryHaskellDepends = [ base ghc-prim vector ]; testHaskellDepends = [ base doctest doctest-discover ghc-prim hedgehog hspec hw-hedgehog @@ -41281,8 +41838,8 @@ self: { pname = "bitwise"; version = "1.0.0.1"; sha256 = "03xyzdkyb99gvm9g5chl07rqbnm7qrxba7wgmrfmal0rkwm0ibkn"; - revision = "2"; - editedCabalFile = "1mnh3629kgfivjwbbqwrkcyvg6iah5pncc5jzgq3ka5cq0kg09gz"; + revision = "3"; + editedCabalFile = "0sx6i1b9slicisnj53sv2jbdryyqd66amcm43xxqlv5srsqqijdm"; libraryHaskellDepends = [ array base bytestring ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ array base bytestring criterion ]; @@ -41297,8 +41854,8 @@ self: { }: mkDerivation { pname = "bitwise-enum"; - version = "1.0.0"; - sha256 = "11klr2qxbly9ppcv7b1pcrvqfw6h0l3qqwy0wzlv05jqhaywjxwc"; + version = "1.0.0.1"; + sha256 = "0y7x2yyvbdvwg5g5rrl9dbh2syvl1y74pwlccq2w2v5rhr8ql2cb"; libraryHaskellDepends = [ aeson array base deepseq mono-traversable vector ]; @@ -41490,6 +42047,18 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "blake3" = callPackage + ({ mkDerivation, base, memory, tasty, tasty-hunit }: + mkDerivation { + pname = "blake3"; + version = "0.1"; + sha256 = "005d7zqxbr0yc18c15llpd3mqwhvvc3nqgv9djmlf8xhzbmll4ar"; + libraryHaskellDepends = [ base memory ]; + testHaskellDepends = [ base memory tasty tasty-hunit ]; + description = "BLAKE3 hashing algorithm"; + license = stdenv.lib.licenses.asl20; + }) {}; + "blakesum" = callPackage ({ mkDerivation, base, bytestring, text, vector }: mkDerivation { @@ -41907,8 +42476,8 @@ self: { }: mkDerivation { pname = "blaze-markup"; - version = "0.8.2.4"; - sha256 = "0xb2hd5n6ymax6yw5hyi05lgllq5ldw28mgfxjpljrws9m8i078w"; + version = "0.8.2.5"; + sha256 = "0qbnydx79pappwd4mzmmqq0pilpkiq7f6rqmqzpi2jjyfxlbmlqv"; libraryHaskellDepends = [ base blaze-builder bytestring text ]; testHaskellDepends = [ base blaze-builder bytestring containers HUnit QuickCheck tasty @@ -42939,8 +43508,8 @@ self: { ({ mkDerivation, base, mtl, semigroups, template-haskell, text }: mkDerivation { pname = "boomerang"; - version = "1.4.5.7"; - sha256 = "11ycghpgngnw0ks47h3wmp0xdfl3qw1wnwdil1vmr1b5a4gngzi1"; + version = "1.4.6"; + sha256 = "09angcdqf75f03rh7m02rsqz5rr304dw4c5cszj9alpq4qxlsyqc"; libraryHaskellDepends = [ base mtl semigroups template-haskell text ]; @@ -43405,8 +43974,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "box-tuples"; - version = "0.1.1.0"; - sha256 = "1j0s7pb9milrz5spqsxwwhva1zwa7ywwd8nbb5y0z97p84wvyy7k"; + version = "0.2.0.3"; + sha256 = "12a3jj3z1gni8925n16ipqyah8vg244lx88v289f2rldiyvh3bvf"; libraryHaskellDepends = [ base ghc-prim ]; description = "A hack to use GHC.Prim primitives in GHCi"; license = stdenv.lib.licenses.mit; @@ -43622,6 +44191,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "brick_0_53" = callPackage + ({ mkDerivation, base, bytestring, config-ini, containers + , contravariant, data-clist, deepseq, directory, dlist, exceptions + , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm + , template-haskell, text, text-zipper, transformers, unix, vector + , vty, word-wrap + }: + mkDerivation { + pname = "brick"; + version = "0.53"; + sha256 = "15k9sc5y3xcjd3kfjs0rnsqxbiy9k34khncbi7jyyl3khq7rhw5n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring config-ini containers contravariant data-clist + deepseq directory dlist exceptions filepath microlens microlens-mtl + microlens-th stm template-haskell text text-zipper transformers + unix vector vty word-wrap + ]; + testHaskellDepends = [ + base containers microlens QuickCheck vector + ]; + description = "A declarative terminal user interface library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "brick-dropdownmenu" = callPackage ({ mkDerivation, base, brick, containers, microlens, microlens-ghc , microlens-th, pointedlist, vector, vty @@ -43954,18 +44550,20 @@ self: { "brok" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, classy-prelude - , directory, file-embed, http-client, http-conduit, tasty - , tasty-discover, tasty-expected-failure, tasty-hunit, text, time + , connection, directory, file-embed, http-client, http-client-tls + , http-conduit, tasty, tasty-discover, tasty-expected-failure + , tasty-hunit, template-haskell, text, time }: mkDerivation { pname = "brok"; - version = "0.2.0.0"; - sha256 = "1fsh05433gkm89j4nf9whcif0iiscxbd32q307rjm1fwsfwp9c46"; + version = "1.0.0"; + sha256 = "07zi88xsacacqw6mg87ipic5y72vjpn9mx789bk9gk4jvd69z7x1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal attoparsec base classy-prelude directory file-embed - http-client http-conduit text time + ansi-terminal attoparsec base classy-prelude connection directory + file-embed http-client http-client-tls http-conduit + template-haskell text time ]; executableHaskellDepends = [ base classy-prelude file-embed ]; testHaskellDepends = [ @@ -44088,8 +44686,8 @@ self: { pname = "brotli-streams"; version = "0.0.0.0"; sha256 = "14jc1nhm50razsl99d95amdf4njf75dnzx8vqkihgrgp7qisyz3z"; - revision = "1"; - editedCabalFile = "1mpd5wf027g1f46a9a2g1wvsaxhr1asyj5f3k69vq3226dfisnn7"; + revision = "2"; + editedCabalFile = "0xp1raxz3ddaq4hvpsw9yqwdfy51wwjiirh51nnxdgxqcwpy5w8s"; libraryHaskellDepends = [ base brotli bytestring io-streams ]; testHaskellDepends = [ base bytestring HUnit io-streams QuickCheck test-framework @@ -44567,6 +45165,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bugsnag-hs_0_1_0_1" = callPackage + ({ mkDerivation, aeson, auto-update, base, bytestring, hedgehog + , http-client, stm, text, time, unordered-containers + }: + mkDerivation { + pname = "bugsnag-hs"; + version = "0.1.0.1"; + sha256 = "1b9ps0yhqvph9ax767xfq1v9v6pggm66ngsv96kww9lj8isg0y5d"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson auto-update base bytestring http-client stm text time + unordered-containers + ]; + testHaskellDepends = [ aeson base bytestring hedgehog stm ]; + description = "A Bugsnag client for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bugzilla" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection , containers, data-default, http-conduit, http-types, iso8601-time @@ -44842,6 +45459,23 @@ self: { broken = true; }) {}; + "burrito" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec, parsec + , QuickCheck, template-haskell, text, transformers + }: + mkDerivation { + pname = "burrito"; + version = "1.1.0.0"; + sha256 = "16kw74sn3i6mfn0wakxyn2p71f8j924xqirzqrkdb6x9rr5y94di"; + libraryHaskellDepends = [ + base bytestring containers parsec template-haskell text + transformers + ]; + testHaskellDepends = [ base containers hspec QuickCheck text ]; + description = "Parse and render URI templates"; + license = stdenv.lib.licenses.isc; + }) {}; + "burst-detection" = callPackage ({ mkDerivation, base, criterion, deepseq }: mkDerivation { @@ -44964,10 +45598,8 @@ self: { }: mkDerivation { pname = "butcher"; - version = "1.3.2.3"; - sha256 = "0lpicayq9k59m2ydz989xsypr653xwhp6mmhlp7nmjzk6jwpq5q5"; - revision = "2"; - editedCabalFile = "1751sllw8s81x3s1dhilbr5lqnv9cpdqiv17c8by466aa6304dxa"; + version = "1.3.3.1"; + sha256 = "0nqn057b5g8p6nj9xpbg52swiwzncirgfmzp3l1z5d8yn641zp1n"; libraryHaskellDepends = [ base bifunctors containers deque extra free microlens microlens-th mtl multistate pretty transformers unsafe void @@ -45078,21 +45710,20 @@ self: { }) {}; "bv-sized" = callPackage - ({ mkDerivation, base, containers, lens, mtl, parameterized-utils - , pretty, QuickCheck, random + ({ mkDerivation, base, bitwise, bytestring, hedgehog, panic + , parameterized-utils, tasty, tasty-hedgehog, th-lift }: mkDerivation { pname = "bv-sized"; - version = "0.7.0"; - sha256 = "04fiqpd5kcq7lyas40axqn6mcngr1yymi1aiqgzip519qmdg73vl"; + version = "1.0.1"; + sha256 = "12l69p95z1ihwbfhlm0wyr1bdhs52ng4fvdsqxhgn0bpx9skzw73"; libraryHaskellDepends = [ - base containers lens mtl parameterized-utils pretty QuickCheck - random + base bitwise bytestring panic parameterized-utils th-lift ]; testHaskellDepends = [ - base lens parameterized-utils pretty QuickCheck random + base bytestring hedgehog parameterized-utils tasty tasty-hedgehog ]; - description = "a BitVector datatype that is parameterized by the vector width"; + description = "a bitvector datatype that is parameterized by the vector width"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -45193,6 +45824,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytebuild_0_3_5_0" = callPackage + ({ mkDerivation, base, byteslice, bytestring, gauge + , integer-logarithms, natural-arithmetic, primitive + , primitive-offset, primitive-unlifted, QuickCheck + , quickcheck-classes, quickcheck-instances, run-st, tasty + , tasty-hunit, tasty-quickcheck, text, text-short, vector + , wide-word + }: + mkDerivation { + pname = "bytebuild"; + version = "0.3.5.0"; + sha256 = "15ccfbhrvb6pj9py99qpbdrrfla83797ywmxjry2c7raaz3kpr73"; + libraryHaskellDepends = [ + base byteslice bytestring integer-logarithms natural-arithmetic + primitive primitive-offset primitive-unlifted run-st text-short + wide-word + ]; + testHaskellDepends = [ + base byteslice bytestring natural-arithmetic primitive + primitive-unlifted QuickCheck quickcheck-classes + quickcheck-instances tasty tasty-hunit tasty-quickcheck text vector + wide-word + ]; + benchmarkHaskellDepends = [ + base byteslice gauge natural-arithmetic primitive text-short + ]; + description = "Serialize to a small byte arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bytedump" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -45207,6 +45869,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytehash" = callPackage + ({ mkDerivation, base, byte-order, byteslice, bytesmith, bytestring + , entropy, gauge, hedgehog, primitive, primitive-checked + , primitive-unlifted, split, tasty, tasty-hedgehog, tasty-hunit + , transformers, unordered-containers + }: + mkDerivation { + pname = "bytehash"; + version = "0.1.0.0"; + sha256 = "1jc8fz8rv7072is0srcp730ff37xkb68xl6s6yssba4anxc8s5nm"; + libraryHaskellDepends = [ + base byte-order byteslice bytestring entropy primitive + primitive-unlifted transformers + ]; + testHaskellDepends = [ + base byteslice entropy hedgehog primitive-checked tasty + tasty-hedgehog tasty-hunit + ]; + benchmarkHaskellDepends = [ + base byteslice bytesmith bytestring entropy gauge primitive + primitive-unlifted split unordered-containers + ]; + description = "Universal hashing of bytes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bytelog" = callPackage ({ mkDerivation, base, bytebuild, byteslice, natural-arithmetic , posix-api, primitive @@ -45290,6 +45978,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "byteslice_0_2_3_0" = callPackage + ({ mkDerivation, base, bytestring, gauge, primitive, primitive-addr + , primitive-unlifted, quickcheck-classes, run-st, tasty + , tasty-hunit, tasty-quickcheck, tuples, vector + }: + mkDerivation { + pname = "byteslice"; + version = "0.2.3.0"; + sha256 = "1xbsnlryx9ggvp46kv6m0f4hf9vs0bc2ia13jym9aji5rd7qvyfp"; + libraryHaskellDepends = [ + base primitive primitive-addr primitive-unlifted run-st tuples + vector + ]; + testHaskellDepends = [ + base bytestring primitive quickcheck-classes tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base gauge primitive ]; + description = "Slicing managed and unmanaged memory"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bytesmith" = callPackage ({ mkDerivation, base, byte-order, byteslice, bytestring , contiguous, gauge, primitive, run-st, tasty, tasty-hunit @@ -45855,16 +46566,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bz2_1_0_0_2" = callPackage - ({ mkDerivation, base, bytestring, bzlib, bzlib-conduit, c2hs - , conduit, cpphs, criterion, deepseq, directory, filepath, pipes - , pipes-bytestring, pipes-bzip, pipes-safe, tasty, tasty-golden - , tasty-hunit, temporary + "bz2_1_0_1_0" = callPackage + ({ mkDerivation, base, bytestring, bzlib, c2hs, cpphs, criterion + , deepseq, directory, filepath, tasty, tasty-golden, tasty-hunit + , temporary }: mkDerivation { pname = "bz2"; - version = "1.0.0.2"; - sha256 = "12w3rz137g45cw3s5n0ajk9pvilfvh3fszjrnn07fsjck0r5mnyx"; + version = "1.0.1.0"; + sha256 = "1kskfgdfjpg2nn807298m605lc7jafnsi1phz3bp6jds48zwrfhq"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; @@ -45873,8 +46583,7 @@ self: { tasty-hunit ]; benchmarkHaskellDepends = [ - base bytestring bzlib bzlib-conduit conduit criterion filepath - pipes pipes-bytestring pipes-bzip pipes-safe temporary + base bytestring bzlib criterion filepath temporary ]; benchmarkToolDepends = [ cpphs ]; description = "Bindings to libbz2"; @@ -46288,6 +46997,8 @@ self: { pname = "cabal-cache"; version = "1.0.1.8"; sha256 = "0yxq73bdw1ai0yv54prcxpm1ygkpa8m0jnznwm975b82qlmplynw"; + revision = "1"; + editedCabalFile = "1rikn1g6v8yga0cs031ckxywfcf9g21ww9s5rkjf6lr4xvfqps2s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46550,6 +47261,8 @@ self: { doHaddock = false; description = "Format .cabal files"; license = "GPL-3.0-or-later AND BSD-3-Clause"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-ghc-dynflags" = callPackage @@ -46604,17 +47317,14 @@ self: { "cabal-helper" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-plan, clock - , containers, directory, filepath, ghc, ghc-paths, mtl, pretty-show - , process, semigroupoids, semigroups, SHA, template-haskell - , temporary, text, time, transformers, unix, unix-compat - , utf8-string + , containers, directory, filepath, ghc, mtl, pretty-show, process + , semigroupoids, semigroups, SHA, template-haskell, temporary, text + , time, transformers, unix, unix-compat, utf8-string }: mkDerivation { pname = "cabal-helper"; - version = "1.0.0.0"; - sha256 = "1lgr2ys50vb8gsn0rwswjbyb4x87ylcfan9qr8qa7a64m6rs5wjl"; - revision = "1"; - editedCabalFile = "0r1lc3rih1n8y5byhls4daa5ka8x8aj4vfrwr8lm41m3l4l19mb9"; + version = "1.1.0.0"; + sha256 = "1f4s46l60s1lcdia7nv2r3y71z5c6pg6ljcc0601abl1aklx303p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46624,11 +47334,10 @@ self: { ]; testHaskellDepends = [ base bytestring Cabal cabal-plan clock containers directory - filepath ghc ghc-paths mtl pretty-show process semigroupoids - semigroups SHA template-haskell temporary text time transformers - unix unix-compat utf8-string + filepath ghc mtl pretty-show process semigroupoids semigroups SHA + template-haskell temporary text time transformers unix unix-compat + utf8-string ]; - doHaddock = false; doCheck = false; description = "Give Haskell development tools access to Cabal project environment"; license = stdenv.lib.licenses.asl20; @@ -46754,22 +47463,25 @@ self: { "cabal-install-parsers" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring , binary, binary-instances, bytestring, Cabal, containers - , cryptohash-sha256, directory, filepath, lukko, network-uri - , parsec, pretty, tar, tasty, tasty-golden, tasty-hunit, text, time - , transformers, tree-diff + , criterion, cryptohash-sha256, deepseq, directory, filepath, lukko + , network-uri, parsec, pretty, tar, tasty, tasty-golden + , tasty-hunit, text, time, transformers, tree-diff }: mkDerivation { pname = "cabal-install-parsers"; - version = "0.2"; - sha256 = "14bfiw8ddfm323a8870wazdb6rlyq52ykrhhm24vd2lxg61sn4aa"; + version = "0.3.0.1"; + sha256 = "1skv3psqs26m68n5xqsw4jil2f3dz5yv8hmskl58sg0q22mjbspm"; libraryHaskellDepends = [ aeson base base16-bytestring binary binary-instances bytestring - Cabal containers cryptohash-sha256 directory filepath lukko + Cabal containers cryptohash-sha256 deepseq directory filepath lukko network-uri parsec pretty tar text time transformers ]; testHaskellDepends = [ ansi-terminal base bytestring Cabal containers directory filepath - tasty tasty-golden tasty-hunit tree-diff + pretty tasty tasty-golden tasty-hunit tree-diff + ]; + benchmarkHaskellDepends = [ + base bytestring Cabal containers criterion directory filepath ]; description = "Utilities to work with cabal-install files"; license = "GPL-2.0-or-later AND BSD-3-Clause"; @@ -47235,8 +47947,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.15.1"; - sha256 = "1gdwri0x7kw96y0c6j9rdqa68arrxkpisq43ld58applxcvr1cs7"; + version = "2.15.3"; + sha256 = "1l4jhl842g5jmwhmi1gqljkxa8ia80xbk2vmlhg6hlw1nkl9wfrz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47456,6 +48168,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cache-polysemy" = callPackage + ({ mkDerivation, base, cache, clock, hashable, polysemy + , polysemy-plugin + }: + mkDerivation { + pname = "cache-polysemy"; + version = "0.1.2"; + sha256 = "1psgf0x9hjhhnn7kn954b26kxd1c94cbhgv8xd2w3nxpmv2qh0m2"; + libraryHaskellDepends = [ + base cache clock hashable polysemy polysemy-plugin + ]; + testHaskellDepends = [ + base cache clock hashable polysemy polysemy-plugin + ]; + description = "cached hashmaps"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cached" = callPackage ({ mkDerivation, base, containers, directory, doctest, filepath , protolude, QuickCheck, quickcheck-assertions, shake, text @@ -47603,6 +48333,8 @@ self: { ]; description = "A library implementing the Noise protocol"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "caf" = callPackage @@ -47849,6 +48581,35 @@ self: { broken = true; }) {}; + "calamity" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, concurrent-extra + , containers, data-default-class, deepseq, deque, df1, di-polysemy + , exceptions, fmt, focus, generic-lens, generic-override + , generic-override-aeson, hashable, http-date, http-types, lens + , lens-aeson, mtl, polysemy, polysemy-plugin, reflection + , safe-exceptions, scientific, stm, stm-chans, stm-containers, text + , text-show, time, typerep-map, unagi-chan, unordered-containers + , vector, websockets, wreq-patchable, wuss + }: + mkDerivation { + pname = "calamity"; + version = "0.1.8.0"; + sha256 = "1fn2nq1hzcn3lpk3y7i8s3xlbp68h6ikxmi0hvcp9mx9xhlw8yk0"; + libraryHaskellDepends = [ + aeson async base bytestring concurrent-extra containers + data-default-class deepseq deque df1 di-polysemy exceptions fmt + focus generic-lens generic-override generic-override-aeson hashable + http-date http-types lens lens-aeson mtl polysemy polysemy-plugin + reflection safe-exceptions scientific stm stm-chans stm-containers + text text-show time typerep-map unagi-chan unordered-containers + vector websockets wreq-patchable wuss + ]; + description = "A library for writing discord bots"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "calc" = callPackage ({ mkDerivation, array, base, harpy, haskell98, mtl }: mkDerivation { @@ -48401,37 +49162,36 @@ self: { ({ mkDerivation, async, base, bytes, bytestring, containers, cpu , data-default, data-default-instances-vector, deepseq, directory , exceptions, filepath, focus, hashable, heredoc, hspec, list-t - , mtl, network, network-simple, pretty-show, primitive, process - , process-extras, QuickCheck, quickcheck-instances, quickcheck-io - , reinterpret-cast, resourcet, safe-exceptions, stm, stm-containers - , supervisors, text, transformers, vector, wl-pprint-text + , monad-stm, mtl, network, network-simple, pretty-show, primitive + , process, process-extras, QuickCheck, quickcheck-instances + , quickcheck-io, reinterpret-cast, resourcet, safe-exceptions, stm + , stm-containers, supervisors, text, transformers, vector + , wl-pprint-text }: mkDerivation { pname = "capnp"; - version = "0.4.0.0"; - sha256 = "1dzabszp3nn13rmvqmdl2gimwmkdpjzd303chbi0jw8248s14bfx"; - revision = "1"; - editedCabalFile = "16h6xvl3xr91rfn5l9lyg2jq14mffxjnkzhva4gn4bds01g2d2jl"; + version = "0.6.0.0"; + sha256 = "1w5cp3jp0dm8vf3zmkfpvpz7jl3pamlnxsl75ds3f4xxyx907qcg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base bytes bytestring containers cpu data-default - data-default-instances-vector exceptions focus hashable list-t mtl - network network-simple pretty-show primitive reinterpret-cast - safe-exceptions stm stm-containers supervisors text transformers - vector + data-default-instances-vector exceptions focus hashable list-t + monad-stm mtl network network-simple pretty-show primitive + reinterpret-cast safe-exceptions stm stm-containers supervisors + text transformers vector ]; executableHaskellDepends = [ base bytes bytestring containers data-default directory exceptions - filepath mtl primitive reinterpret-cast safe-exceptions text - transformers vector wl-pprint-text + filepath monad-stm mtl primitive reinterpret-cast safe-exceptions + text transformers vector wl-pprint-text ]; testHaskellDepends = [ async base bytes bytestring containers data-default deepseq - directory exceptions heredoc hspec mtl network network-simple - pretty-show primitive process process-extras QuickCheck - quickcheck-instances quickcheck-io reinterpret-cast resourcet - safe-exceptions stm supervisors text transformers vector + directory exceptions heredoc hspec monad-stm mtl network + network-simple pretty-show primitive process process-extras + QuickCheck quickcheck-instances quickcheck-io reinterpret-cast + resourcet safe-exceptions stm supervisors text transformers vector ]; description = "Cap'n Proto for Haskell"; license = stdenv.lib.licenses.mit; @@ -48554,6 +49314,63 @@ self: { broken = true; }) {}; + "cardano-coin-selection" = callPackage + ({ mkDerivation, base, bytestring, containers, cryptonite, deepseq + , fmt, hspec, memory, QuickCheck, quiet, random, text, transformers + , vector + }: + mkDerivation { + pname = "cardano-coin-selection"; + version = "1.0.1"; + sha256 = "1nvnkd5g0vq4vqj1w55hd1b1v7rwzhb3anhavablw9wy3w230qja"; + libraryHaskellDepends = [ + base bytestring containers cryptonite deepseq quiet text + transformers + ]; + testHaskellDepends = [ + base bytestring containers cryptonite deepseq fmt hspec memory + QuickCheck quiet random text transformers vector + ]; + description = "Algorithms for coin selection and fee balancing"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "cardano-transactions" = callPackage + ({ mkDerivation, ansi-terminal, base, base58-bytestring, bytestring + , cardano-binary, cardano-crypto, cardano-crypto-wrapper + , cardano-ledger, cardano-ledger-test, cardano-tx, cborg + , cryptonite, extra, hedgehog-quickcheck, hspec, memory + , optparse-applicative, process, QuickCheck, text + }: + mkDerivation { + pname = "cardano-transactions"; + version = "1.0.0"; + sha256 = "0qzf1yf85m0fwiayjb8g09w9dxq1zyg9xwjcd9p98i3dj6722yfa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base58-bytestring bytestring cardano-binary cardano-crypto + cardano-crypto-wrapper cardano-ledger cborg cryptonite extra memory + text + ]; + executableHaskellDepends = [ + ansi-terminal base bytestring cborg memory optparse-applicative + text + ]; + testHaskellDepends = [ + base bytestring cardano-crypto-wrapper cardano-ledger + cardano-ledger-test cborg hedgehog-quickcheck hspec process + QuickCheck text + ]; + testToolDepends = [ cardano-tx ]; + description = "Library utilities for constructing and signing Cardano transactions"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {cardano-binary = null; cardano-crypto = null; + cardano-crypto-wrapper = null; cardano-ledger = null; + cardano-ledger-test = null; cardano-tx = null;}; + "carettah" = callPackage ({ mkDerivation, base, cairo, directory, filepath, gtk , gtk2hs-buildtools, hcwiid, highlighting-kate, mtl, pandoc, pango @@ -49775,8 +50592,8 @@ self: { }: mkDerivation { pname = "cborg"; - version = "0.2.2.1"; - sha256 = "10v1dip11zlpbj69k95n1zm1msp41hkw8snd93h19zlji0v0v4ms"; + version = "0.2.3.0"; + sha256 = "14y7yckj1xzldadyq8g84dgsdaygf9ss0gd38vjfw62smdjq1in8"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim half integer-gmp primitive text @@ -50335,6 +51152,8 @@ self: { ]; description = "A library getting the environment when running on Cloud Foundry"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cfipu" = callPackage @@ -50546,7 +51365,7 @@ self: { array base binary bytestring Codec-Image-DevIL containers data-reify directory GLUT OpenGLRaw process time ]; - description = "Combinators for building and processing 2D images"; + description = "Combinators for building and processing 2D images."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -50559,7 +51378,7 @@ self: { version = "0.1"; sha256 = "1gvnp176j8gd0s6wzq10zpiqkn3wma99pwn3f78wgxm9rh588gh2"; libraryHaskellDepends = [ array base chalkboard GLUT OpenGL time ]; - description = "OpenGL based viewer for chalkboard rendered images"; + description = "OpenGL based viewer for chalkboard rendered images."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -50674,8 +51493,8 @@ self: { }: mkDerivation { pname = "character-cases"; - version = "0.1.0.3"; - sha256 = "05vpi3q44ywljkbxrcx9xqxsw86dxh2ipcsbfmn55d9vkl901hry"; + version = "0.1.0.4"; + sha256 = "0097d5p1q2l76jb1qm8zsqm7d3qfcr35v2ip0v52i1ri57b03iya"; libraryHaskellDepends = [ base containers here megaparsec prettyprinter template-haskell ]; @@ -51672,8 +52491,8 @@ self: { }: mkDerivation { pname = "chronos"; - version = "1.1"; - sha256 = "0g41hchir6rxfnd8halg49y80pc9dr38k7b7cik18gqdasswwg6c"; + version = "1.1.1"; + sha256 = "10nxhnj5y984c3mf2wkc2zl6afbph0b0vj7f722g0yp7cq4908yj"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive semigroups text torsor vector @@ -51910,6 +52729,28 @@ self: { broken = true; }) {}; + "cimple" = callPackage + ({ mkDerivation, aeson, alex, array, base, bytestring, compact + , containers, groom, happy, hspec, mtl, text + }: + mkDerivation { + pname = "cimple"; + version = "0.0.1"; + sha256 = "06sqdyqmvkaf4nsh1cq287pmki0dbzvh4yzlbcm5l7c2clxc7yg5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base bytestring compact containers mtl text + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ base bytestring groom text ]; + testHaskellDepends = [ base hspec ]; + description = "Simple C-like programming language"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "cinvoke" = callPackage ({ mkDerivation, base, bytestring, cinvoke }: mkDerivation { @@ -52601,8 +53442,8 @@ self: { }: mkDerivation { pname = "clash-ghc"; - version = "1.2.0"; - sha256 = "1rv8bjs563c8r543crj69dnp1610bch3dsxb5c0wckf799l8bmpn"; + version = "1.2.1"; + sha256 = "0bczw02kgpiczagnv2aq2yjj0g2619gl8dzwpzsvfz5r1p8kp6f3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52631,8 +53472,8 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "1.2.0"; - sha256 = "0w5ilrqagc7xj14ngjg0rgcc3vhkxhsrz21rgl9qhygcs1cam5j2"; + version = "1.2.1"; + sha256 = "1l6xibxbkfz91wkl55548wv48gba6n4pmbymb1fbhs43nx3hssil"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal attoparsec base binary bytestring clash-prelude @@ -52668,10 +53509,10 @@ self: { }) {}; "clash-prelude" = callPackage - ({ mkDerivation, array, base, bifunctors, binary, bytestring - , constraints, containers, criterion, data-binary-ieee754 - , data-default-class, deepseq, doctest, ghc-prim - , ghc-typelits-extra, ghc-typelits-knownnat + ({ mkDerivation, array, base, bifunctors, binary, bytestring, Cabal + , cabal-doctest, constraints, containers, criterion + , data-binary-ieee754, data-default-class, deepseq, doctest + , ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat , ghc-typelits-natnormalise, half, hashable, hint, integer-gmp , lens, QuickCheck, quickcheck-classes-base, recursion-schemes , reflection, singletons, tasty, tasty-hunit, tasty-quickcheck @@ -52680,8 +53521,9 @@ self: { }: mkDerivation { pname = "clash-prelude"; - version = "1.2.0"; - sha256 = "181ccw3ajdfhmlwjs9jiqy10b7whsp3pcqyxw166s8rda7h3pvpj"; + version = "1.2.1"; + sha256 = "18smrj545fvry8wj0hvawwcwc9yf1h1nsyyl337yh7xnxq9bycsy"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base bifunctors binary bytestring constraints containers data-binary-ieee754 data-default-class deepseq ghc-prim @@ -52967,8 +53809,8 @@ self: { "clckwrks" = callPackage ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base - , blaze-html, bytestring, Cabal, cereal, containers, directory - , filepath, happstack-authenticate, happstack-hsp, happstack-jmacro + , blaze-html, bytestring, cereal, containers, directory, filepath + , happstack-authenticate, happstack-hsp, happstack-jmacro , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs , ixset, jmacro, lens, mtl, network, network-uri, old-locale , openssl, process, random, reform, reform-happstack, reform-hsp @@ -52979,10 +53821,9 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.25.4"; - sha256 = "0mlrkyhs095b8bwsk4mjq4wys6ydn4m9nds37lxqnw6qzl6rk5hl"; + version = "0.25.5"; + sha256 = "1sis7xqvnbaqw513xibzrfyvhbcfsg7yz6syd3lx9rqz26b1byih"; enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate @@ -53008,8 +53849,8 @@ self: { }: mkDerivation { pname = "clckwrks-cli"; - version = "0.3.0.1"; - sha256 = "0f44ndvnkivwc72lxfr779kyn20g7f4wy3prqazdhk47xvl1fps6"; + version = "0.3.0.2"; + sha256 = "0gan0x38ymi9s0bxv34girdh6pz2dy797yrifnzkv9p8gnlh0648"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53153,19 +53994,17 @@ self: { }) {}; "clckwrks-plugin-page" = callPackage - ({ mkDerivation, acid-state, aeson, attoparsec, base, Cabal - , clckwrks, containers, directory, filepath, happstack-hsp - , happstack-server, hsp, hsx2hs, ixset, mtl, old-locale, random - , reform, reform-happstack, reform-hsp, safecopy, tagsoup - , template-haskell, text, time, time-locale-compat, uuid - , uuid-orphans, web-plugins, web-routes, web-routes-happstack - , web-routes-th + ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks + , containers, directory, filepath, happstack-hsp, happstack-server + , hsp, hsx2hs, ixset, mtl, old-locale, random, reform + , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell + , text, time, time-locale-compat, uuid, uuid-orphans, web-plugins + , web-routes, web-routes-happstack, web-routes-th }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.3.19"; - sha256 = "06lvr3sq5slcfc1r3vmip9flh5dn50mz6ar7x11zk4dm365g4vhk"; - setupHaskellDepends = [ base Cabal ]; + version = "0.4.3.20"; + sha256 = "0w1vyw5jvypbha4i5m7f7kpwmyqarm9wzdklldabx41cm3ab48li"; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -54545,8 +55384,8 @@ self: { }: mkDerivation { pname = "co-log"; - version = "0.4.0.0"; - sha256 = "1ayxsxw96yy72h6bsy6vwi4xwdawcq1hgsyc0s626bp84is7fm5c"; + version = "0.4.0.1"; + sha256 = "08sqrsy55wrfc5bg5sz22hah0ix14wrxn20lka17ri17a818w9p7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54565,12 +55404,23 @@ self: { broken = true; }) {}; + "co-log-concurrent" = callPackage + ({ mkDerivation, base, co-log-core, stm }: + mkDerivation { + pname = "co-log-concurrent"; + version = "0.5.0.0"; + sha256 = "07z4aklk7dc2fhbc30kd9hbdvq71sa4ip6r2pyifcpn3p2pr3mna"; + libraryHaskellDepends = [ base co-log-core stm ]; + description = "Asynchronous backend for co-log library"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "co-log-core" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "co-log-core"; - version = "0.2.1.0"; - sha256 = "1jfdjcbhd4mjj00fr2xk7g220kxz4jzbv84j32sqkjnrx49cziz0"; + version = "0.2.1.1"; + sha256 = "04w8j39n1cfmzvvllbjj21w7g53lgppf5crk7n4i9hgspaxbwyik"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; description = "Composable Contravariant Comonadic Logging Library"; @@ -54581,8 +55431,8 @@ self: { ({ mkDerivation, base, co-log-core, polysemy }: mkDerivation { pname = "co-log-polysemy"; - version = "0.0.1.1"; - sha256 = "0wm5zcn3df4hc5rbbj1mlm9y1fs5pkpvvm1c98r5dnvs7lfmnzpd"; + version = "0.0.1.2"; + sha256 = "0g1qr6akgbnqs64xammvdpqjf5n5drx4a48w7lxw7l6n7z99rr4n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base co-log-core polysemy ]; @@ -54640,8 +55490,8 @@ self: { }: mkDerivation { pname = "cobot"; - version = "0.1.1.1"; - sha256 = "12bq23am5q0cb58sgifdihc53rwg91m1wvkyr06nkjddh8vgfc3g"; + version = "0.1.1.4"; + sha256 = "0sskb87cjq6b6splwyl4dc11vwyx4jqp4xwdsgk78awfl1zcqhxd"; libraryHaskellDepends = [ array base bytestring containers deepseq lens linear megaparsec mtl split template-haskell text @@ -54666,8 +55516,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.1"; - sha256 = "1b64ixkcagcx8d7y5nym9njllndbbb108cp1k31qr4p6yijyw15m"; + version = "0.1.3.4"; + sha256 = "059lijjlf31xw94fqp8ylzmvdf99v43vwa35q8an7qg5df81yc1j"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -54898,22 +55748,23 @@ self: { , bytestring, cereal, cereal-text, containers, deepseq , dependent-sum, ghc-prim, hashable, HUnit, monad-loops, mtl , random, ref-tf, reflex, template-haskell, test-framework - , test-framework-hunit, text, time + , test-framework-hunit, text, time, witherable }: mkDerivation { pname = "codeworld-api"; - version = "0.4.0"; - sha256 = "0smw8xjigq1sl3rppbhvifsrzjfbhy4d41m0rpjf1d1ahvby64ja"; + version = "0.5.0"; + sha256 = "17s1353jk5l93hxv7wnnf4hxzw0ds1gq16kxkf7ig985141cah1n"; libraryHaskellDepends = [ aeson base base64-bytestring blank-canvas bytestring cereal cereal-text containers deepseq dependent-sum ghc-prim hashable monad-loops mtl random ref-tf reflex template-haskell text time + witherable ]; testHaskellDepends = [ aeson base base64-bytestring blank-canvas bytestring cereal cereal-text containers deepseq dependent-sum ghc-prim hashable HUnit monad-loops mtl random ref-tf reflex template-haskell - test-framework test-framework-hunit text time + test-framework test-framework-hunit text time witherable ]; description = "Graphics library for CodeWorld"; license = stdenv.lib.licenses.asl20; @@ -54986,6 +55837,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "coercible-subtypes" = callPackage + ({ mkDerivation, base, profunctors }: + mkDerivation { + pname = "coercible-subtypes"; + version = "0.1.0.0"; + sha256 = "1z5fmdgv52x410x2z4gxyac18f98226dymzdvhcvkx7mw2k9q44x"; + libraryHaskellDepends = [ base profunctors ]; + description = "Coercible but only in one direction"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "coercible-utils" = callPackage ({ mkDerivation, base, gauge }: mkDerivation { @@ -55638,6 +56500,18 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "colourista_0_1_0_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, text }: + mkDerivation { + pname = "colourista"; + version = "0.1.0.0"; + sha256 = "1iglvl6k8vrq45h5r8r2ng575dgg30jfw1zq19zld72914mmvjdz"; + libraryHaskellDepends = [ ansi-terminal base bytestring text ]; + description = "Convenient interface for printing colourful messages"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "coltrane" = callPackage ({ mkDerivation, base, bytestring, HTTP, http-types, HUnit, mtl , regex-compat, text, wai, wai-extra, warp @@ -56221,10 +57095,8 @@ self: { }: mkDerivation { pname = "compact"; - version = "0.1.0.1"; - sha256 = "0lynnbvsyr07driy7lm9llrhvmk9wprjdbfc34svzfwldghk71gf"; - revision = "2"; - editedCabalFile = "1sy8szbmbhn13s54bq04ni234kk05najm3xm0sh6r9qnvg7pcjd7"; + version = "0.2.0.0"; + sha256 = "0xv24vd2h76928355rr8gzdbkyn2j17yf6wjyghnzw7qyhsbb9h3"; libraryHaskellDepends = [ base binary bytestring ghc-compact ]; testHaskellDepends = [ base directory ]; description = "Non-GC'd, contiguous storage for immutable data structures"; @@ -56918,8 +57790,8 @@ self: { ({ mkDerivation, base, base-prelude }: mkDerivation { pname = "compound-types"; - version = "0.1.4"; - sha256 = "1lnmlql90v66vs2dr5lqg2lzfvf7m3z8naazfzj7zdyqjf9jnpkc"; + version = "0.1.4.1"; + sha256 = "0rlmpyx6h8mhzlr6falqh8kd6nm5nqgkhb9vh1znnqwrb3lzzi0x"; libraryHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base-prelude ]; description = "Sum and Product types and such"; @@ -57365,14 +58237,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_9_0_0" = callPackage + "concurrency_1_11_0_0" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.9.0.0"; - sha256 = "1bmj1g9dnjj6390ky1xkddb1azff1ibphaiyyy2dix351m9dhc3s"; + version = "1.11.0.0"; + sha256 = "19a4za0c65gi2a5n882nyi26cgxrsry64rkd3qiqhvzf7m34cjxd"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -57644,8 +58516,8 @@ self: { pname = "concurrent-utilities"; version = "0.2.0.2"; sha256 = "1phc9a90nvx6dk741hmg3w5m9y8ra5a7zsgmzw173ibaapr2yhqi"; - revision = "1"; - editedCabalFile = "1phqnmgq7mj7751d4g599jy3brz4fmlm1z7qd88gkyr94mn5pm23"; + revision = "2"; + editedCabalFile = "1jf0sx6yq557aspa3wm12hkc64pmfnc39kbc5wsa2k7ksash3k15"; libraryHaskellDepends = [ base ]; description = "More utilities and broad-used datastructures for concurrency"; license = stdenv.lib.licenses.bsd3; @@ -58797,36 +59669,28 @@ self: { "configuration-tools" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base-unicode-symbols, base64-bytestring, bytestring, Cabal - , case-insensitive, connection, data-default, deepseq, directory - , dlist, enclosed-exceptions, filepath, http-client - , http-client-tls, http-types, monad-control, mtl, network-uri + , base-unicode-symbols, bytestring, Cabal, case-insensitive + , deepseq, directory, dlist, filepath, mtl, network-uri , optparse-applicative, process, profunctors, semigroupoids - , semigroups, text, tls, transformers, unordered-containers, wai - , warp, warp-tls, x509, x509-system, x509-validation, yaml + , semigroups, text, transformers, unordered-containers, yaml }: mkDerivation { pname = "configuration-tools"; - version = "0.4.2"; - sha256 = "08wzgd38adlrgp9s8330hsp3h1jmhnlaj3fyvkxgljlmyyzlw70q"; - revision = "1"; - editedCabalFile = "1x30k0jbx62689rnjwg74v9mwcf81rpjvbkm0gj94slzsx66adpp"; + version = "0.5.0"; + sha256 = "0pgx2wzzqxgafgf3qjys05hp89lz4fwczsx0i581n8ngs3p4i0wh"; setupHaskellDepends = [ base bytestring Cabal directory filepath process ]; libraryHaskellDepends = [ aeson ansi-wl-pprint attoparsec base base-unicode-symbols - base64-bytestring bytestring Cabal case-insensitive connection - data-default deepseq directory dlist enclosed-exceptions filepath - http-client http-client-tls http-types monad-control mtl - network-uri optparse-applicative process profunctors semigroupoids - semigroups text tls transformers unordered-containers x509 - x509-system x509-validation yaml + bytestring Cabal case-insensitive deepseq directory dlist filepath + mtl network-uri optparse-applicative process profunctors + semigroupoids semigroups text transformers unordered-containers + yaml ]; testHaskellDepends = [ - base base-unicode-symbols bytestring Cabal enclosed-exceptions - http-types monad-control mtl text transformers unordered-containers - wai warp warp-tls yaml + base base-unicode-symbols bytestring Cabal mtl text transformers + unordered-containers yaml ]; description = "Tools for specifying and parsing configurations"; license = stdenv.lib.licenses.mit; @@ -58905,8 +59769,8 @@ self: { }: mkDerivation { pname = "configurator-pg"; - version = "0.2.1"; - sha256 = "0hlzh1608gcz86sh0wg1qgfz2v805hdjwga9sib1hb5cpmfc9c4j"; + version = "0.2.3"; + sha256 = "0vbs52za4smxy8nag08ag2c9mjbpiw1a7ai5vd8is7db9732skfa"; libraryHaskellDepends = [ base containers megaparsec protolude scientific text ]; @@ -59172,7 +60036,7 @@ self: { version = "0.1.0.1"; sha256 = "16s8y035f30gyla620diwnsqi8lbmmfyxjpj4dlq24d45k5wfnsd"; libraryHaskellDepends = [ attoparsec base bytestring vector ]; - description = "Parse ByteStrings of a prescribed length"; + description = "Parse ByteStrings of a prescribed length."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -59227,8 +60091,8 @@ self: { pname = "constrained-category"; version = "0.1.0.0"; sha256 = "01r5jyydixfh82zynjpacsv5dc0mz28bcm8xaz2pgf2pc4gcfl9h"; - revision = "1"; - editedCabalFile = "1kgkrzzvdjbdhkr53dlrm4qyxa8sxva9vkjyl7kd3lha5sdpids3"; + revision = "2"; + editedCabalFile = "1zjb5pzq479r3i4mphmxs7rqb4jiivhf1mm7273fzjrfykx50y4c"; libraryHaskellDepends = [ alg base category constraint unconstrained ]; @@ -59273,7 +60137,7 @@ self: { base containers criterion deepseq nat-sized-numbers QuickCheck smallcheck transformers vector ]; - description = "Typeclasses and instances for monads with constraints"; + description = "Typeclasses and instances for monads with constraints."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -59555,10 +60419,10 @@ self: { }: mkDerivation { pname = "consumers"; - version = "2.2.0.1"; - sha256 = "14gs07nl759qfnmi44pyhj24xqmd2xl3ikwhl8s5zykavdpjaimx"; + version = "2.2.0.2"; + sha256 = "0nml5hn6n95ngy1qvj6w4rkwa8r6qax0nc2vgimk68bawv4z97qd"; revision = "1"; - editedCabalFile = "1rh1hk1zr0yd82hsam8fjjs6jsssk49lvaasd3dqyx6d4nl1y63i"; + editedCabalFile = "150f62zfb5kpa8iwp08fq9gdmv142swfldkjrrjyx0jpvf6qcjxc"; libraryHaskellDepends = [ base containers exceptions extra hpqtypes lifted-base lifted-threads log-base monad-control monad-time mtl stm time @@ -59912,6 +60776,17 @@ self: { broken = true; }) {}; + "contracheck-applicative" = callPackage + ({ mkDerivation, base, containers, contravariant, mmorph }: + mkDerivation { + pname = "contracheck-applicative"; + version = "0.1.2"; + sha256 = "0vfw5fp6max40wrfkcsl0km8qpdp231b6agc16y758cg9isxbllg"; + libraryHaskellDepends = [ base containers contravariant mmorph ]; + description = "Validation types/typeclass based on the contravariance"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "contravariant" = callPackage ({ mkDerivation, base, StateVar, transformers }: mkDerivation { @@ -59945,6 +60820,8 @@ self: { pname = "control"; version = "0.1.1.0"; sha256 = "1393w30mgzhgppfrzjsh62gdw9agbjfxw9ahxphjabf0zdf34xzg"; + revision = "1"; + editedCabalFile = "1nngr12zwv1lxjq79qcxrwrw86yvyg1cxiahy3jn46bnw0k20ym2"; libraryHaskellDepends = [ base basic stm template-haskell transformers ]; @@ -61169,8 +62046,8 @@ self: { }: mkDerivation { pname = "cpkg"; - version = "0.2.5.0"; - sha256 = "0h2h19qld1n26vap7vmcf8fzpjgdryjd09qf0ky5smhcqq81kyrj"; + version = "0.2.5.4"; + sha256 = "1269zgvcvd18zdmg4rf73mh89a3gcph91fqm46p5h05wz500179w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61242,22 +62119,6 @@ self: { ({ mkDerivation, base, directory, polyparse, time }: mkDerivation { pname = "cpphs"; - version = "1.20.9"; - sha256 = "07qb1k9iq76a3l0506s08mw3a16i7qvp0hrmn7wxvwj3f6pg53cp"; - revision = "1"; - editedCabalFile = "1zsyi2h2b7kcmbda2kr3a1xg81d26a92zqg78ziqqyc5aw1j5z6b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base directory polyparse time ]; - executableHaskellDepends = [ base directory polyparse time ]; - description = "A liberalised re-implementation of cpp, the C pre-processor"; - license = "LGPL"; - }) {}; - - "cpphs_1_20_9_1" = callPackage - ({ mkDerivation, base, directory, polyparse, time }: - mkDerivation { - pname = "cpphs"; version = "1.20.9.1"; sha256 = "17wi7fma2qaqdm1hwgaam3fd140v9bpa8ky0wg708h1pqc5v2nbz"; isLibrary = true; @@ -61266,7 +62127,6 @@ self: { executableHaskellDepends = [ base directory polyparse time ]; description = "A liberalised re-implementation of cpp, the C pre-processor"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cprng-aes" = callPackage @@ -62132,6 +62992,8 @@ self: { pname = "criterion-compare"; version = "0.1.0.0"; sha256 = "034cm3hap9x6cwp44hrd03b09mifcm076a9pn3lgql5ardx91yl7"; + revision = "1"; + editedCabalFile = "0nzwqk0mrchrymbmim2542s37i3dvvs5ks25839z9x0fp6gpxiq6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -62504,18 +63366,17 @@ self: { "crypto-classical" = callPackage ({ mkDerivation, base, bytestring, containers, crypto-numbers - , crypto-random, microlens, microlens-th, modular-arithmetic - , QuickCheck, text, transformers + , crypto-random, modular-arithmetic, QuickCheck, text, transformers }: mkDerivation { pname = "crypto-classical"; - version = "0.2.1"; - sha256 = "0mqvygx8pvvmaalqzr94nf400smq8y22shyvfhxrh69hs6q0dgw6"; + version = "0.3.0"; + sha256 = "1jkgdaln74sznkqr1knainpn3pbjih76rk3r7wmx28jvy57pm1b3"; libraryHaskellDepends = [ - base bytestring containers crypto-numbers crypto-random microlens - microlens-th modular-arithmetic text transformers + base bytestring containers crypto-numbers crypto-random + modular-arithmetic text transformers ]; - testHaskellDepends = [ base bytestring microlens QuickCheck ]; + testHaskellDepends = [ base bytestring QuickCheck ]; description = "An educational tool for studying classical cryptography schemes"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -62551,6 +63412,8 @@ self: { pname = "crypto-enigma"; version = "0.1.1.6"; sha256 = "07qxrpwg9r2w2l0d2nrvn703vzsfhchznly93bnr2pfpbwj4iv2z"; + revision = "1"; + editedCabalFile = "15n8jb3g89x1cj5vk9a3x3g55c3agdz611sjlp5ixvqzf1kz5jiq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers split text ]; @@ -62558,7 +63421,7 @@ self: { ansi-terminal base containers optparse-applicative split text ]; testHaskellDepends = [ base HUnit QuickCheck ]; - description = "An Enigma machine simulator with display"; + description = "An Enigma machine simulator with display."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -62732,8 +63595,8 @@ self: { }: mkDerivation { pname = "crypto-rng"; - version = "0.1.1.0"; - sha256 = "1h7pqps4f25sn28dhbs1jd58gl4ml9scc1s4dixbz8mvyv5aslkf"; + version = "0.1.2.0"; + sha256 = "0vmfxg5anp3bx8k84rmy3fs0z9h7aw8nhlv52z9js9k469xg9c6j"; libraryHaskellDepends = [ base bytestring crypto-api DRBG exceptions monad-control mtl transformers-base @@ -62910,8 +63773,8 @@ self: { pname = "cryptohash-md5"; version = "0.11.100.1"; sha256 = "1y8q7s2bn4gdknw1wjikdnar2b5pgz3nv3220lxrlgpsf23x82vi"; - revision = "4"; - editedCabalFile = "0gzaibjkipijwj9m9l6wrhfk5s3kdvfbhdl7cl1373cjfs41v0m3"; + revision = "5"; + editedCabalFile = "1dxakry5p9dv9p9h617c0295plrfy2n5k13lsgp4gxwb6yzji9d4"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring pureMD5 tasty tasty-hunit @@ -63440,6 +64303,8 @@ self: { ]; description = "Parsing, rendering and manipulating css selectors in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "css-syntax" = callPackage @@ -63450,8 +64315,8 @@ self: { pname = "css-syntax"; version = "0.1.0.0"; sha256 = "02f000nzc0dhjhlp1z82q4far8ablvzalpk918lg54f63lbqdwsh"; - revision = "1"; - editedCabalFile = "14241m9nm3wbbhajw95gdj9mvfzf4hmrzvk2wgjvkm71mg4yhwnr"; + revision = "5"; + editedCabalFile = "1i3svb2zy7i3g2xrv8hki5dn6fd5rh2pwjxv72rbmbgl1adp3w3s"; libraryHaskellDepends = [ base scientific text ]; testHaskellDepends = [ base directory hspec QuickCheck scientific text @@ -63527,7 +64392,7 @@ self: { attoparsec attoparsec-enumerator base bytestring containers directory enumerator safe transformers unix-compat ]; - description = "A flexible, fast, enumerator-based CSV parser library for Haskell"; + description = "A flexible, fast, enumerator-based CSV parser library for Haskell."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -63835,7 +64700,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {cudd = null;}; + }) {inherit (pkgs) cudd;}; "cue-sheet" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, hspec @@ -64044,8 +64909,8 @@ self: { pname = "curry"; version = "0.0.0.0"; sha256 = "09kwv72pww29xhp4sp7czp3pgjdggzs5ggj8cmzng8xzzgsgd1dv"; - revision = "1"; - editedCabalFile = "1mb2472j8ypxayd5sgbzl27xrhjwbsjd43dqflqjhllwk1ysm7lb"; + revision = "2"; + editedCabalFile = "15blz8y7jvxznm3j6sak4kcqq5c4apd4fkh60ixc36pbgc2q9kip"; libraryHaskellDepends = [ base ]; description = "Curry types"; license = stdenv.lib.licenses.bsd3; @@ -64392,6 +65257,8 @@ self: { ]; description = "Functional Combinators for Computer Vision"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cve" = callPackage @@ -64703,10 +65570,8 @@ self: { }: mkDerivation { pname = "darcs"; - version = "2.14.2"; - sha256 = "0zm2486gyhiga1amclbg92cd09bvki6vgh0ll75hv5kl72j61lb5"; - revision = "1"; - editedCabalFile = "0xl7j5cm704pbl2ms0dkydh7jvrz0ym76d725ifpg4h902m1zkhg"; + version = "2.14.4"; + sha256 = "0qk70a2i5p69lai0vzrckjql3rz8sfiq5vnpafmscmq8018i2wp7"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -64724,7 +65589,8 @@ self: { testHaskellDepends = [ array base bytestring cmdargs containers directory filepath FindBin HUnit mtl QuickCheck shelly split test-framework - test-framework-hunit test-framework-quickcheck2 text zip-archive + test-framework-hunit test-framework-quickcheck2 text transformers + zip-archive ]; doCheck = false; postInstall = '' @@ -65171,6 +66037,8 @@ self: { pname = "data-accessor-template"; version = "0.2.1.16"; sha256 = "15gd6xlrq5ica514m5rdcz2dl8bibdmbsmnc98ddhx491c9g5rwk"; + revision = "1"; + editedCabalFile = "0zz2v420zvinphs6jnngc40x7h8jn5rqj3nj8alpgfyqx59w41my"; libraryHaskellDepends = [ base data-accessor template-haskell utility-ht ]; @@ -65189,6 +66057,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-ascii" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive + , hashable, semigroups, text + }: + mkDerivation { + pname = "data-ascii"; + version = "1.0.0.0"; + sha256 = "1dlcfli1fggalxqg4hvdq3g5c1k1f60mwiyz7sha70sa3lp0pw88"; + libraryHaskellDepends = [ + base blaze-builder bytestring case-insensitive hashable semigroups + text + ]; + description = "Type-safe, bytestring-based ASCII values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-aviary" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -65280,8 +66164,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "data-category"; - version = "0.7"; - sha256 = "000x29a8x2ca7m85z0h7snm0297jf9ndr46dh3arv43fjlvfy3ag"; + version = "0.10"; + sha256 = "1mb72r17982w2sslmvi5nzpf7i702iikc7j4h68gzlfnm426jk9q"; description = "Category theory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -65679,10 +66563,8 @@ self: { }: mkDerivation { pname = "data-dword"; - version = "0.3.1.3"; - sha256 = "1l4g8xbsix6xqljadfq49rs39m2lsbrfz4i7l80q0yhafbm4ax8b"; - revision = "1"; - editedCabalFile = "0gz9pqbi47f4dhn2c9v7y9nzgprbkbp9pd2vq5kpzj18hf53bvdm"; + version = "0.3.2"; + sha256 = "1avpf18pqpa9a53l1isk2par3jdk3yb84kfkrvl14ry57hikkjys"; libraryHaskellDepends = [ base data-bword ghc-prim hashable template-haskell ]; @@ -65884,8 +66766,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "data-fix"; - version = "0.2.0"; - sha256 = "14hk6hq5hdb3l5bhmzhw086jpzlvp9qbw9dzw30wlz5jbh2ihmvy"; + version = "0.2.1"; + sha256 = "05mhbcb04gxj1zl5y3zjss4p5lab5wyvzwk9pbg04ax2l24qmwih"; libraryHaskellDepends = [ base ]; description = "Fixpoint data types"; license = stdenv.lib.licenses.bsd3; @@ -65898,7 +66780,7 @@ self: { version = "0.0.2"; sha256 = "1xn6qnir5dss23y8d71dsy78sdk7hczwprxir8v6la15c43rf9p2"; libraryHaskellDepends = [ base containers data-fix transformers ]; - description = "Common subexpression elimination for the fixploint types"; + description = "Common subexpression elimination for the fixploint types."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -65943,8 +66825,8 @@ self: { pname = "data-forest"; version = "0.1.0.7"; sha256 = "1q41cwinvv0ys260f1f7005403pvz1gbwn0d6cnwh8b7rlgp8f4j"; - revision = "1"; - editedCabalFile = "1kwvjmbchz6nv770x81q7f8i3blfzzifhjqww702c8zbnnafzgar"; + revision = "2"; + editedCabalFile = "15s9pv56mi2vqns70vcad1q841rp5yav2wh93qd1ialp109j54j4"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "A simple multi-way tree data structure"; @@ -66766,8 +67648,8 @@ self: { ({ mkDerivation, base, containers, mtl }: mkDerivation { pname = "data-transform"; - version = "0.1.0.2"; - sha256 = "0r4j295b8688x88knbw19z6f4ggnpxgs7adpl1r00njjykdhdzac"; + version = "0.1.1.0"; + sha256 = "0l0pbr0fg7i09lv05bhv0gl80x2mxxyvxa0n5jdknh5xfphqga96"; libraryHaskellDepends = [ base containers mtl ]; description = "Functions to transform data structures"; license = stdenv.lib.licenses.bsd3; @@ -66905,8 +67787,8 @@ self: { }: mkDerivation { pname = "datadog"; - version = "0.2.4.0"; - sha256 = "063avwbrrv6g1icw6fl7yv04izlmh6wcpngxdzzjz1qqmirb8qn4"; + version = "0.2.5.0"; + sha256 = "15vbx09f2l250wlmk1wcnfrdmma81dghmy5gbyc6z7s8aqf9vib6"; libraryHaskellDepends = [ aeson auto-update base buffer-builder bytestring containers dlist http-client http-client-tls http-types lens lifted-base @@ -67034,6 +67916,23 @@ self: { broken = true; }) {}; + "dataflower" = callPackage + ({ mkDerivation, base, criterion, hashable, hspec, mtl, pretty-show + , QuickCheck, stm, time, transformers, vector + }: + mkDerivation { + pname = "dataflower"; + version = "0.1.4.0"; + sha256 = "1ncm6rw8f0zcg7mnqkk027l48zqvg1xi27qjhxq00dhgbsnz42rp"; + libraryHaskellDepends = [ + base hashable mtl pretty-show stm time transformers vector + ]; + testHaskellDepends = [ base hspec QuickCheck stm ]; + benchmarkHaskellDepends = [ base criterion stm ]; + description = "A Pure-Haskell Timely Dataflow System"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "datalog" = callPackage ({ mkDerivation, base, containers, exceptions, hashable, haskeline , HUnit, parsec, pretty, test-framework, test-framework-hunit, text @@ -67487,8 +68386,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.2.13"; - sha256 = "0v5f2n00v1lsfkjz2isgdx4sfyg2cf9ik0nda3j13xh749bgqh38"; + version = "1.2.14"; + sha256 = "0w304j28vc90dmyz6zqsijjdjj2967grdc8f3zf5jiq50rzgmrr8"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -67505,6 +68404,34 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "dbus_1_2_15_1" = callPackage + ({ mkDerivation, base, bytestring, cereal, conduit, containers + , criterion, deepseq, directory, exceptions, extra, filepath, lens + , network, parsec, process, QuickCheck, random, resourcet, split + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , th-lift, transformers, unix, vector, xml-conduit, xml-types + }: + mkDerivation { + pname = "dbus"; + version = "1.2.15.1"; + sha256 = "1fq1ds5lkgysi5cpbwh97233vil6w9djxn6dcp5sjj7r5gb76vj7"; + libraryHaskellDepends = [ + base bytestring cereal conduit containers deepseq exceptions + filepath lens network parsec random split template-haskell text + th-lift transformers unix vector xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring cereal containers directory extra filepath network + parsec process QuickCheck random resourcet tasty tasty-hunit + tasty-quickcheck text transformers unix vector + ]; + benchmarkHaskellDepends = [ base criterion ]; + doCheck = false; + description = "A client library for the D-Bus IPC system"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dbus-client" = callPackage ({ mkDerivation, base, containers, dbus-core, monads-tf, text , transformers @@ -67692,7 +68619,7 @@ self: { libraryHaskellDepends = [ base containers deepseq parsec transformers wl-pprint ]; - description = "Disciplined Disciple Compiler common utilities"; + description = "Disciplined Disciple Compiler common utilities."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -68527,8 +69454,8 @@ self: { pname = "deepseq-generics"; version = "0.2.0.0"; sha256 = "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh"; - revision = "4"; - editedCabalFile = "0928s2qnbqsjzrm94x88rvmvbigfmhcyp4m73gw6asinp2qg1kii"; + revision = "5"; + editedCabalFile = "1iqgza1larap5n4f1z7d7ag1s3b0zzlvgb91lrwwa5khgw2m7mrg"; libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base deepseq ghc-prim HUnit test-framework test-framework-hunit @@ -68772,6 +69699,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dejafu_2_3_0_0" = callPackage + ({ mkDerivation, base, concurrency, containers, contravariant + , deepseq, exceptions, leancheck, profunctors, random, transformers + }: + mkDerivation { + pname = "dejafu"; + version = "2.3.0.0"; + sha256 = "09lqniw3gacyykmk23vl4icyhiixdyjps50cwvcmlwd8k4941gwa"; + libraryHaskellDepends = [ + base concurrency containers contravariant deepseq exceptions + leancheck profunctors random transformers + ]; + description = "A library for unit-testing concurrent programs"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "deka" = callPackage ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }: mkDerivation { @@ -69079,6 +70023,8 @@ self: { ]; description = "Dependent hash maps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dependent-map" = callPackage @@ -69499,8 +70445,8 @@ self: { ({ mkDerivation, aeson, base, bytestring }: mkDerivation { pname = "deriving-aeson"; - version = "0.2.2"; - sha256 = "0hv7c9fyfm9zynz5kha1ws0qsizkrcjnwy84lhyixxzlqh3rl16d"; + version = "0.2.5"; + sha256 = "1pvrc139af0sh657ygj0lw1wi1rk3nr4y906l7l00iz5sa52j0cc"; libraryHaskellDepends = [ aeson base ]; testHaskellDepends = [ aeson base bytestring ]; description = "Type driven generic aeson instance customisation"; @@ -69558,8 +70504,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "derulo"; - version = "1.0.7"; - sha256 = "0ph4szgn009asgcpd6rzdach41jzyrwilk4x9vnrqk3mjk36zxy5"; + version = "1.0.8"; + sha256 = "1qmmhnvzn3dip5y757wmwjj51ah5i5db82ni85xl2ckk1k765v9c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -70034,34 +70980,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_31_1" = callPackage + "dhall_1_32_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, bytestring, case-insensitive, cborg, cborg-json, containers , contravariant, cryptonite, data-fix, deepseq, Diff, directory , doctest, dotgen, either, exceptions, filepath, foldl, gauge - , generic-random, hashable, haskeline, http-client, http-client-tls - , http-types, lens-family-core, megaparsec, memory, mockery, mtl - , network-uri, optparse-applicative, parser-combinators, parsers - , pretty-simple, prettyprinter, prettyprinter-ansi-terminal - , profunctors, QuickCheck, quickcheck-instances, repline - , scientific, semigroups, serialise, special-values, spoon, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , template-haskell, text, text-manipulate, th-lift-instances - , transformers, transformers-compat, turtle, unordered-containers - , uri-encode, vector + , generic-random, half, hashable, haskeline, http-client + , http-client-tls, http-types, lens-family-core, megaparsec, memory + , mockery, mtl, network-uri, optparse-applicative + , parser-combinators, parsers, pretty-simple, prettyprinter + , prettyprinter-ansi-terminal, profunctors, QuickCheck + , quickcheck-instances, repline, scientific, semigroups, serialise + , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, template-haskell, text, text-manipulate + , th-lift-instances, transformers, transformers-compat, turtle + , unordered-containers, uri-encode, vector }: mkDerivation { pname = "dhall"; - version = "1.31.1"; - sha256 = "18v7vvcbcm9s7slh6h43rj9yakkkxwnwgj6kv84i6qzd2j7d80mc"; + version = "1.32.0"; + sha256 = "1imj0bh5365pdizvjbw2wqz0g9hakigf1zm4fr6379qdchxpp90p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal atomic-write base bytestring case-insensitive cborg cborg-json containers contravariant cryptonite data-fix deepseq Diff directory dotgen either exceptions - filepath hashable haskeline http-client http-client-tls http-types - lens-family-core megaparsec memory mtl network-uri + filepath half hashable haskeline http-client http-client-tls + http-types lens-family-core megaparsec memory mtl network-uri optparse-applicative parser-combinators parsers pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors repline scientific serialise template-haskell text text-manipulate @@ -70107,14 +71053,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-bash_1_0_29" = callPackage + "dhall-bash_1_0_30" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text }: mkDerivation { pname = "dhall-bash"; - version = "1.0.29"; - sha256 = "0hmhk2lmqr1szrjx1kqa3zlylcblwigi6lqmkqnh0z1dh3kc1a1w"; + version = "1.0.30"; + sha256 = "1r2xr8c8kzmrxrb8m6f9dzjn81sqxzx97w0406kwrx9vzfj7ci1q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70213,7 +71159,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-json_1_6_3" = callPackage + "dhall-json_1_6_4" = callPackage ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal , base, bytestring, containers, dhall, exceptions, filepath , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal @@ -70222,8 +71168,10 @@ self: { }: mkDerivation { pname = "dhall-json"; - version = "1.6.3"; - sha256 = "1dm6lrn8nd29c8d1sp1l3jnxfxkhhqpvinrgn1hm0lcp3jgzchbb"; + version = "1.6.4"; + sha256 = "0vr6a02frfk5bh0qj0m4qlc5pp08m29gxp8ixqihrqakkna6409z"; + revision = "1"; + editedCabalFile = "1cnm3jww2cfw0fsrykcijrsixmci2j309k7f7kbplp7iy08dk5h0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70272,8 +71220,10 @@ self: { }: mkDerivation { pname = "dhall-lsp-server"; - version = "1.0.6"; - sha256 = "1pbxzs9axnbwqfgdz44cbaabq9v10jsk752ix8i0cz1vmwyrcnlv"; + version = "1.0.7"; + sha256 = "08nyai9y7s8facdjyfxc1z8dp8qd150y5554vxpvfr98xxj5kf41"; + revision = "1"; + editedCabalFile = "12gsy624cg1v98npanwmmmj4i37193lkqngjrrxj3z2ifr6s327i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70295,16 +71245,17 @@ self: { "dhall-nix" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, hnix - , neat-interpolation, optparse-generic, text + , lens-family-core, neat-interpolation, optparse-generic, text }: mkDerivation { pname = "dhall-nix"; - version = "1.1.13"; - sha256 = "0sdnrhr9f29ds4zdj2qs123k44vg15r8kn8w2zwkmdabilzlgg9k"; + version = "1.1.14"; + sha256 = "1sm7n8539y9944jlc6xk6qx0xssjwz0jjv1505swgi5qcrhdwsij"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-fix dhall hnix neat-interpolation text + base containers data-fix dhall hnix lens-family-core + neat-interpolation text ]; executableHaskellDepends = [ base dhall hnix optparse-generic text @@ -70394,7 +71345,7 @@ self: { broken = true; }) {}; - "dhall-yaml_1_0_3" = callPackage + "dhall-yaml_1_1_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall , dhall-json, exceptions, HsYAML, HsYAML-aeson , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal @@ -70402,8 +71353,8 @@ self: { }: mkDerivation { pname = "dhall-yaml"; - version = "1.0.3"; - sha256 = "1lnxp2wqbgzg5f2kadhnbd8i5zgwy3g1nz17mmbdqwlx30p4scdn"; + version = "1.1.0"; + sha256 = "06lwzis9jjfis6rv4r9gd0iq1da5ymcd6jl8x3rbcimg87k9r4bj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70560,6 +71511,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "di-polysemy" = callPackage + ({ mkDerivation, base, df1, di-core, di-df1, di-handle, polysemy }: + mkDerivation { + pname = "di-polysemy"; + version = "0.1.3.0"; + sha256 = "0fxm9m6cz687ihdh1nsms5cbxpngb9h6v62wdr82g83srvwgcflf"; + libraryHaskellDepends = [ + base df1 di-core di-df1 di-handle polysemy + ]; + description = "DI logger wrapped for Polysemy"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "dia-base" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -71062,10 +72028,8 @@ self: { }: mkDerivation { pname = "diagrams-solve"; - version = "0.1.1"; - sha256 = "17agchqkmj14b17sw50kzxq4hm056g5d8yy0wnqn5w8h1d0my7x4"; - revision = "5"; - editedCabalFile = "1yl8cs05fzqcz49p601am1ij66m9pa70yamhfxgcvya2pf8nimlf"; + version = "0.1.2"; + sha256 = "1qzycw3aj4107dqpgir3ak7pnja3a6i4ax15gd2q2fjzmp4p3z24"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base deepseq tasty tasty-hunit tasty-quickcheck @@ -71084,8 +72048,8 @@ self: { pname = "diagrams-svg"; version = "1.4.3"; sha256 = "1ysv6cz0fngrndl4wjmw4hrdj2rik5fxa1dkxzwnlgf1xwpvxgk8"; - revision = "1"; - editedCabalFile = "092kl3hnqlji71nxychw9v1sddxaim6ha00g1afi1ph2zm4f6s7c"; + revision = "2"; + editedCabalFile = "07149rnzc8787mwh0aac5hfg9f41dxgs5wc9yv60fmgk9h5qnw1n"; libraryHaskellDepends = [ base base64-bytestring bytestring colour containers diagrams-core diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl @@ -71153,8 +72117,8 @@ self: { }: mkDerivation { pname = "dialogflow-fulfillment"; - version = "0.1.0.0"; - sha256 = "0pz5qyz6sf00c5155mrraya7jr8sp99hmfm1642hv4zhj08ky0j7"; + version = "0.1.1.1"; + sha256 = "1fha1raifdzkv3g52wl9cx6xpan3jsv11ysd3cz4sffylygcyg71"; libraryHaskellDepends = [ aeson base bytestring containers text unordered-containers ]; @@ -71177,6 +72141,8 @@ self: { pname = "dib"; version = "0.7.2"; sha256 = "0r1hk45fdyhygmscnphl4n6dcs0rvgavhbg5si0aqsck4wsnql83"; + revision = "1"; + editedCabalFile = "08lhqgh1apzik4mrz0g0qwnpafgl3hm2cb49rwghzv1bf66wxq4n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71211,13 +72177,14 @@ self: { }: mkDerivation { pname = "dice-entropy-conduit"; - version = "1.0.0.1"; - sha256 = "01xwxajwyvv6ac48j9if6xsv05aqg1p02i7d25ivk1k56ky41l1s"; + version = "1.0.0.3"; + sha256 = "0pk1mhmy9683rbr2c589jqq1ra4w154nqcyvy3krw043hzd5y90n"; libraryHaskellDepends = [ base bytestring conduit entropy transformers ]; testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 + base bytestring conduit entropy QuickCheck test-framework + test-framework-quickcheck2 transformers ]; description = "Cryptographically secure n-sided dice via rejection sampling"; license = stdenv.lib.licenses.lgpl21; @@ -71566,6 +72533,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "digest-sig" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "digest-sig"; + version = "0.1.0.0"; + sha256 = "1a855bhy9bs10lj5g38d0ivxc5068qpzi8w9nkc39zwaazaskgh9"; + revision = "1"; + editedCabalFile = "18ll6xlhsh588ryqhljz964i64vmlxx0ssr49k9m0yk5xrffajvf"; + libraryHaskellDepends = [ base bytestring ]; + doHaddock = false; + description = "Signature for digest"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "digestive-bootstrap" = callPackage ({ mkDerivation, base, blaze-bootstrap, blaze-html , digestive-functors, digestive-functors-blaze, http-types, text @@ -71609,10 +72590,8 @@ self: { }: mkDerivation { pname = "digestive-functors"; - version = "0.8.4.0"; - sha256 = "17l70z0bn5aahjaydg3qcwyip6jk0q4vkar5abhrhls59j5hk6z0"; - revision = "2"; - editedCabalFile = "1a8z8fmjvwab222ayc04xd3wxqagfq6nwf68ynljcbwdbbjyjb7b"; + version = "0.8.4.2"; + sha256 = "0x0mh43rli77vqs9bpqd85w5wwr68qchfl5086nn137358583lrn"; libraryHaskellDepends = [ base bytestring containers mtl old-locale semigroups text time ]; @@ -71669,8 +72648,8 @@ self: { }: mkDerivation { pname = "digestive-functors-happstack"; - version = "0.6.1.2"; - sha256 = "18i4hb39rkgj2jz2ii697gayxi02dqpfbx5arv6zyjvmp1ydynvz"; + version = "0.6.1.3"; + sha256 = "1kjmjxmlaaawfkk96wzlzd0kbcb5j0pvqssh3ynjm074cy6h89fd"; libraryHaskellDepends = [ base bytestring digestive-functors happstack-server text ]; @@ -71827,6 +72806,8 @@ self: { testHaskellDepends = [ base fgl hashable massiv QuickCheck ]; description = "Directed Graphs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dihaa" = callPackage @@ -72327,8 +73308,8 @@ self: { }: mkDerivation { pname = "dirtree"; - version = "0.1.1"; - sha256 = "18iahbw6hzjxsnmr3yi80w0xvf6iphdxb2yg5kpnww26lmlgk6dc"; + version = "0.1.3"; + sha256 = "1x2wff1iqjwdygb6yn7v63bplig4ad4qh6brqaj66y1qpnhb5vja"; libraryHaskellDepends = [ base bytestring containers deepseq directory filepath lens unix zip-archive @@ -72418,8 +73399,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.5.0"; - sha256 = "1449ap68c917z1318wg67cv7yk7cmfr61m0ikbf132gzsfyx69kv"; + version = "1.5.2"; + sha256 = "1xpgbxmf70jlgm2mfnyb3mylvp0xzgp501iybbf3s12b7d0kk17b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73448,8 +74429,8 @@ self: { }: mkDerivation { pname = "distributive"; - version = "0.6.1"; - sha256 = "1wnayzzb4vk8rhh9gzhdpd9f64366k4vmbhximavmqqmp3cv2jbp"; + version = "0.6.2"; + sha256 = "1j93zkfffm6s16kgr0j0z87y5ds28rw0r2gyc5ncwcylvrqy4kl2"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans tagged transformers ]; testHaskellDepends = [ base doctest generic-deriving hspec ]; @@ -73646,25 +74627,12 @@ self: { ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: mkDerivation { pname = "dlist"; - version = "0.8.0.7"; - sha256 = "0b5spkzvj2kx8pk86xz0djkxs13j7dryf5fl16dk4mlp1wh6mh53"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base Cabal QuickCheck ]; - description = "Difference lists"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dlist_0_8_0_8" = callPackage - ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: - mkDerivation { - pname = "dlist"; version = "0.8.0.8"; sha256 = "0va9xk8g2iag24x042q3w6z77xdqd91112kh0piq8cwd0qccyabi"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base Cabal QuickCheck ]; description = "Difference lists"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dlist-instances" = callPackage @@ -73944,32 +74912,32 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "dobutokO"; - version = "0.3.1.0"; - sha256 = "0vsh9ygxaqy9qv193hbvk4fx4bj34m95qnqfippv76l0f4lpa8bz"; + version = "0.3.2.0"; + sha256 = "1qps4zvk3qn2d93778cs2b6kf1k9fjgw5248hyx9v0n05crfw2i8"; libraryHaskellDepends = [ base ]; description = "The library is intended to print updated messages on the terminal screen"; license = stdenv.lib.licenses.mit; }) {}; "dobutokO2" = callPackage - ({ mkDerivation, base, directory, mmsyn2, mmsyn3, mmsyn6ukr - , mmsyn7s, mmsyn7ukr, process, vector + ({ mkDerivation, base, bytestring, directory, mmsyn2, mmsyn3 + , mmsyn6ukr, mmsyn7s, mmsyn7ukr, process, vector }: mkDerivation { pname = "dobutokO2"; - version = "0.22.1.0"; - sha256 = "1mx1q8z5a950ji8nnmw2jcarqadlkm58qszzyz0hh31rni26p1k5"; + version = "0.39.1.0"; + sha256 = "0nlgw32a5fbfpikdg8cs2ivc5gn4dcdqhmzgjl1qx07lhl0v8cyq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7s mmsyn7ukr process - vector + base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7s mmsyn7ukr + process vector ]; executableHaskellDepends = [ - base directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7s mmsyn7ukr process - vector + base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7s mmsyn7ukr + process vector ]; - description = "A program and a library to create experimental music from a mono audio and a Ukrainian text"; + description = "Helps to create experimental music from a file (or its part) and a Ukrainian text"; license = stdenv.lib.licenses.mit; }) {}; @@ -74053,8 +75021,8 @@ self: { }: mkDerivation { pname = "docker"; - version = "0.6.0.3"; - sha256 = "0vvvw7ijzsra1kknv196fla1vc9jigp4dafycvh2djaxmj73d1vi"; + version = "0.6.0.4"; + sha256 = "07j1c526gazy0kw98iklac767jhslhx9mcnzjazmwqsgyj8n217f"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit conduit-combinators conduit-extra containers data-default-class directory exceptions @@ -74262,7 +75230,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "doctemplates_0_8_1" = callPackage + "doctemplates_0_8_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific , tasty, tasty-golden, tasty-hunit, temporary, text @@ -74270,8 +75238,8 @@ self: { }: mkDerivation { pname = "doctemplates"; - version = "0.8.1"; - sha256 = "02xysm510m3hbifwb7ngx39wj1ycxjrws4ngnm0d7ywqm9cv1hbb"; + version = "0.8.2"; + sha256 = "14xymm4lp0nfbm2y8jcyaisb52mrwjz40dz5n5c8m48rkqqb4qzl"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers doclayout filepath HsYAML mtl parsec safe @@ -74557,6 +75525,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dom-events" = callPackage + ({ mkDerivation, base, text, unordered-containers }: + mkDerivation { + pname = "dom-events"; + version = "0.0.0.4"; + sha256 = "1yyhinrv6pm275fi9kg8hdi3vzv33i8nm785fih402fw0a9g8r35"; + libraryHaskellDepends = [ base text unordered-containers ]; + testHaskellDepends = [ base ]; + description = "DOM Events expressed as Haskell types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dom-lt" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq }: mkDerivation { @@ -75757,8 +76737,8 @@ self: { pname = "dual-game"; version = "0.1.0.1"; sha256 = "1w69d7d2xbpi82n41gq08qdmldh834ka7qwvy159vsac556wwcfg"; - revision = "5"; - editedCabalFile = "1i87w3frlicplbc3gkp0msz1ck1irfmy9ym2n2ffxglv18vaczb6"; + revision = "6"; + editedCabalFile = "10hj6snshirfx6apbrdb2jm45xsgvsis0c7i5a33wwl0lnklxwj2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -75899,8 +76879,8 @@ self: { pname = "dumb-cas"; version = "0.2.0.0"; sha256 = "1zcq9r2p5gjpfivprjp9hspqpayrj9in2jck5vf5ibxpc671isb4"; - revision = "1"; - editedCabalFile = "1269wjyywvi86gmpqdpq2niv5ifns0bqr1i5229w69jdlzrc6dqg"; + revision = "2"; + editedCabalFile = "1a6xj7qszi815xr5nks13593kc90wqalq78kxsnmmhn2m2r1aq2q"; libraryHaskellDepends = [ base containers decimal-literals hashable template-haskell unordered-containers @@ -75964,8 +76944,23 @@ self: { ]; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "dunai_0_7_0" = callPackage + ({ mkDerivation, base, MonadRandom, simple-affine-space, tasty + , tasty-hunit, transformers, transformers-base + }: + mkDerivation { + pname = "dunai"; + version = "0.7.0"; + sha256 = "1gii02d557ak0h4sq5ra4n40y4sl88z74n6mwd0937xxlpiahwsh"; + libraryHaskellDepends = [ + base MonadRandom simple-affine-space transformers transformers-base + ]; + testHaskellDepends = [ base tasty tasty-hunit transformers ]; + description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dunai-core" = callPackage @@ -75988,8 +76983,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.1.0.0"; - sha256 = "0jkn1740adzv9jwsp6qa0sxfxg6x5cvqlss1yjwcr1chsvpk2d1m"; + version = "0.7.0"; + sha256 = "08pbfw10dkds8dwr913p0rikvs7vxfwyj5rdsr7njzh39fz9lqli"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -76228,8 +77223,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "dwergaz"; - version = "0.2.0.3"; - sha256 = "080wwa3ffd8lb5ri324ijkpj8pd6nw7zscz23gc01m1hyavwpqip"; + version = "0.2.0.4"; + sha256 = "01gdh96p5nwca9g5sa0nrv65vaial3jqprngk67n9wxbj74pwr8f"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A minimal testing library"; @@ -76402,7 +77397,7 @@ self: { version = "0.1.1.0"; sha256 = "1agk7q556yf6v776568apvc4dgvxiqfshina12f69ky8afvjr6qz"; libraryHaskellDepends = [ base containers template-haskell unix ]; - description = "Automatically derive dynamic linking methods from a data type"; + description = "Automatically derive dynamic linking methods from a data type."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -76429,7 +77424,7 @@ self: { version = "0.1.0.5"; sha256 = "0hsy9mgnl2yf94kqxy69wgmr5hjqxpp55qvij3f53sxxywjrxdi2"; libraryHaskellDepends = [ base primitive vector ]; - description = "A wrapper around MVector that enables pushing, popping and extending"; + description = "A wrapper around MVector that enables pushing, popping and extending."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -76467,6 +77462,8 @@ self: { pname = "dynamic-plot"; version = "0.4.1.0"; sha256 = "1nly6ra0kd72q42hiaqism94vmyg5hp4ppyd024iiq9pcbgpq7r6"; + revision = "1"; + editedCabalFile = "0chaa06bzf3jd55c9s6wcnl7i8j2wl55rr9g50aia4gsc47azgxr"; libraryHaskellDepends = [ base colour colour-space constrained-categories containers data-default deepseq diagrams-cairo diagrams-core diagrams-gtk @@ -76734,6 +77731,17 @@ self: { broken = true; }) {}; + "earcut" = callPackage + ({ mkDerivation, base, vector }: + mkDerivation { + pname = "earcut"; + version = "0.1.0.2"; + sha256 = "080picb31ihv0gzxg0nnxx90g0n08l0hz9y57k2jihsibmkszwsi"; + libraryHaskellDepends = [ base vector ]; + description = "Binding to C++ earcut library"; + license = stdenv.lib.licenses.isc; + }) {}; + "ease" = callPackage ({ mkDerivation, base, data-default }: mkDerivation { @@ -77603,6 +78611,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "egison_4_0_0" = callPackage + ({ mkDerivation, array, base, containers, criterion, deepseq + , directory, filepath, ghc, ghc-paths, Glob, hashable, haskeline + , HUnit, megaparsec, mini-egison, mtl, optparse-applicative, parsec + , parser-combinators, prettyprinter, process, random, regex-tdfa + , split, test-framework, test-framework-hunit, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "egison"; + version = "4.0.0"; + sha256 = "00dps0p1n3izfclvdykh6y10lnjis11352ndqbyv55wl6n3xjb2p"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base containers directory ghc ghc-paths hashable haskeline + megaparsec mini-egison mtl optparse-applicative parsec + parser-combinators prettyprinter process random regex-tdfa split + text transformers unordered-containers vector + ]; + executableHaskellDepends = [ + array base containers directory filepath ghc ghc-paths haskeline + mtl optparse-applicative parsec prettyprinter process regex-tdfa + split text transformers unordered-containers vector + ]; + testHaskellDepends = [ + base filepath Glob HUnit mtl test-framework test-framework-hunit + transformers + ]; + benchmarkHaskellDepends = [ + base criterion deepseq mtl transformers + ]; + description = "Programming language with non-linear pattern-matching against non-free data"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "egison-pattern-src" = callPackage ({ mkDerivation, base, containers, free, megaparsec, mtl , parser-combinators, prettyprinter, recursion-schemes, tasty @@ -77683,23 +78729,23 @@ self: { }) {}; "egison-tutorial" = callPackage - ({ mkDerivation, array, base, bytestring, containers, directory - , egison, filepath, ghc, ghc-paths, haskeline, mtl, parsec - , regex-posix, transformers, unordered-containers + ({ mkDerivation, base, directory, egison, filepath, haskeline, mtl + , regex-posix, transformers }: mkDerivation { pname = "egison-tutorial"; - version = "3.10.0"; - sha256 = "109j17iskxs7gwgvxyyvmipf3xsbnysjxj20z6hhjzz1sb3sw5x5"; + version = "4.0.0"; + sha256 = "0kma4i6qhjwcr9dhlgl63gd8f676agigbv1qii7p6fvq3hj38ddg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base bytestring containers directory egison filepath ghc - ghc-paths haskeline mtl parsec regex-posix transformers - unordered-containers + base directory egison filepath haskeline mtl regex-posix + transformers ]; description = "A tutorial program for the Egison programming language"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "egyptian-fractions" = callPackage @@ -77864,6 +78910,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ejdb2-binding" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, ejdb2 + , libejdb2, mtl, tasty, tasty-hunit, unordered-containers, vector + }: + mkDerivation { + pname = "ejdb2-binding"; + version = "0.3.0.0"; + sha256 = "06zqdnycpzpaymfnimz87v1rc5a8xlnr8mcd49a90ivza967vmmr"; + libraryHaskellDepends = [ + aeson base bytestring mtl unordered-containers + ]; + librarySystemDepends = [ ejdb2 ]; + libraryPkgconfigDepends = [ libejdb2 ]; + testHaskellDepends = [ + aeson base directory tasty tasty-hunit unordered-containers vector + ]; + description = "Binding to EJDB2 C library, an embedded JSON noSQL database"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {ejdb2 = null; libejdb2 = null;}; + "ekg" = callPackage ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json , filepath, network, snap-core, snap-server, text, time @@ -77946,6 +79014,8 @@ self: { pname = "ekg-core"; version = "0.1.1.7"; sha256 = "04nv6iwzrb63fs97ixb0amj8p6zhabg3ggbrg4nbkq7xjhmkz0a5"; + revision = "1"; + editedCabalFile = "17rfxsns0za7jqp3069mwp0lbd433gwb7lrnla02y7hfxbpnldf4"; libraryHaskellDepends = [ base containers ghc-prim text unordered-containers ]; @@ -78014,8 +79084,8 @@ self: { pname = "ekg-json"; version = "0.1.0.6"; sha256 = "0iyx0ix4dcyhh9xg4ia1lm7x2q0iffswnr33khfg9fr81am80shy"; - revision = "5"; - editedCabalFile = "0qc3fdycamm97lhhvwgvl8kvj169qrwr5ds4vkvyclpv0s90ijva"; + revision = "6"; + editedCabalFile = "111495nizf5d9s91nbss78y3rh7vj5p1021m7pz96li37i5ps13m"; libraryHaskellDepends = [ aeson base ekg-core text unordered-containers ]; @@ -78337,6 +79407,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "elm-bridge_0_6_0" = callPackage + ({ mkDerivation, aeson, base, containers, hspec, QuickCheck + , template-haskell, text + }: + mkDerivation { + pname = "elm-bridge"; + version = "0.6.0"; + sha256 = "1sn4fdillziikydn832sknmn1wjb5idxfx8n2avahjwn5sdg7dwp"; + libraryHaskellDepends = [ aeson base template-haskell ]; + testHaskellDepends = [ + aeson base containers hspec QuickCheck text + ]; + description = "Derive Elm types and Json code from Haskell types, using aeson's options"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elm-build-lib" = callPackage ({ mkDerivation, base, bytestring, containers, elm-compiler , elm-core-sources, file-embed, template-haskell @@ -78811,29 +79898,68 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "elynx" = callPackage + ({ mkDerivation, aeson, base, bytestring, elynx-tools + , optparse-applicative, slynx, tlynx + }: + mkDerivation { + pname = "elynx"; + version = "0.2.2"; + sha256 = "19fj65klv8pyan6n6i0mzcwpsprkhvxirh82hdmr3b3y2zaw10h6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring elynx-tools optparse-applicative slynx tlynx + ]; + description = "Validate and (optionally) redo ELynx analyses"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "elynx-markov" = callPackage + ({ mkDerivation, base, bytestring, containers, elynx-seq + , elynx-tools, elynx-tree, hmatrix, hspec, hspec-megaparsec + , integration, math-functions, megaparsec, mwc-random, parallel + , primitive, statistics, vector + }: + mkDerivation { + pname = "elynx-markov"; + version = "0.2.2"; + sha256 = "1w7wxha82xaanfnzyn8ygfpxmk7lalfvzwr157crz8nm59ai4c05"; + libraryHaskellDepends = [ + base bytestring containers elynx-seq elynx-tools elynx-tree hmatrix + integration math-functions megaparsec mwc-random parallel primitive + statistics vector + ]; + testHaskellDepends = [ + base bytestring containers elynx-tools elynx-tree hmatrix hspec + hspec-megaparsec integration math-functions megaparsec mwc-random + parallel primitive statistics vector + ]; + description = "Simulate molecular sequences along trees"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "elynx-seq" = callPackage - ({ mkDerivation, async, base, bytestring, containers - , data-memocombinators, elynx-tools, elynx-tree, hmatrix, hspec - , hspec-megaparsec, integration, math-functions, matrices - , megaparsec, mwc-random, optparse-applicative, parallel, primitive - , statistics, transformers, vector, vector-th-unbox, word8 + ({ mkDerivation, aeson, base, bytestring, containers, elynx-tools + , hspec, hspec-megaparsec, matrices, megaparsec, mwc-random + , parallel, primitive, vector, vector-th-unbox, word8 }: mkDerivation { pname = "elynx-seq"; - version = "0.1.0"; - sha256 = "07kykql8i5msy2n091bwbawagbfpw8q553k5s89j3y5bi6d4aahg"; + version = "0.2.2"; + sha256 = "1m09indy34zgx16m2rnmwjf9fvrhi8qcdxpfz7myjl2hxbp8hz1j"; libraryHaskellDepends = [ - async base bytestring containers data-memocombinators elynx-tools - elynx-tree hmatrix integration math-functions matrices megaparsec - mwc-random optparse-applicative parallel primitive statistics - transformers vector vector-th-unbox word8 + aeson base bytestring containers elynx-tools matrices megaparsec + mwc-random parallel primitive vector vector-th-unbox word8 ]; testHaskellDepends = [ - async base bytestring containers data-memocombinators elynx-tools - elynx-tree hmatrix hspec hspec-megaparsec integration - math-functions matrices megaparsec mwc-random optparse-applicative - parallel primitive statistics transformers vector vector-th-unbox - word8 + aeson base bytestring containers elynx-tools hspec hspec-megaparsec + matrices megaparsec mwc-random parallel primitive vector + vector-th-unbox word8 ]; description = "Handle molecular sequences"; license = stdenv.lib.licenses.gpl3; @@ -78842,22 +79968,23 @@ self: { }) {}; "elynx-tools" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , cryptohash-sha256, deepseq, fast-logger, hmatrix, lifted-base - , matrices, megaparsec, monad-control, monad-logger, mwc-random - , optparse-applicative, parallel, primitive, template-haskell, text - , time, transformers, transformers-base, vector, zlib + ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring + , containers, cryptohash-sha256, deepseq, directory, fast-logger + , hmatrix, matrices, megaparsec, monad-control, monad-logger + , mwc-random, optparse-applicative, parallel, primitive + , template-haskell, text, time, transformers, transformers-base + , vector, zlib }: mkDerivation { pname = "elynx-tools"; - version = "0.1.0"; - sha256 = "0dhri3chyyqq8svw1lkl89hdrjb7b2bin50gqv3d6hrxs9813yz3"; + version = "0.2.2"; + sha256 = "0gdnfyag704yfvrakc7d0adh3mb9r1kf1v8cpdrspaxxr77brw9q"; libraryHaskellDepends = [ - aeson async base bytestring containers cryptohash-sha256 deepseq - fast-logger hmatrix lifted-base matrices megaparsec monad-control - monad-logger mwc-random optparse-applicative parallel primitive - template-haskell text time transformers transformers-base vector - zlib + aeson async base base16-bytestring bytestring containers + cryptohash-sha256 deepseq directory fast-logger hmatrix matrices + megaparsec monad-control monad-logger mwc-random + optparse-applicative parallel primitive template-haskell text time + transformers transformers-base vector zlib ]; description = "Tools for ELynx"; license = stdenv.lib.licenses.gpl3; @@ -78867,31 +79994,26 @@ self: { "elynx-tree" = callPackage ({ mkDerivation, base, bytestring, containers, criterion - , elynx-tools, hspec, hspec-megaparsec, lifted-async - , math-functions, megaparsec, mwc-random, optparse-applicative - , parallel, primitive, QuickCheck, quickcheck-instances, statistics - , transformers, vector + , elynx-tools, hspec, hspec-megaparsec, math-functions, megaparsec + , mwc-random, primitive, QuickCheck, quickcheck-instances + , statistics }: mkDerivation { pname = "elynx-tree"; - version = "0.1.0"; - sha256 = "1mg4k03xx1zmsn54ip5q27p3qll13dcfk2gh2xyfy097b4mlwrzp"; + version = "0.2.2"; + sha256 = "00c7rli9vfi1crz9plpc5xgh960ba245kisxihbx54vqlc94b5hj"; libraryHaskellDepends = [ - base bytestring containers elynx-tools lifted-async math-functions - megaparsec mwc-random optparse-applicative parallel primitive - QuickCheck quickcheck-instances statistics transformers vector + base bytestring containers elynx-tools math-functions megaparsec + mwc-random primitive statistics ]; testHaskellDepends = [ base bytestring containers elynx-tools hspec hspec-megaparsec - lifted-async math-functions megaparsec mwc-random - optparse-applicative parallel primitive QuickCheck - quickcheck-instances statistics transformers vector + math-functions megaparsec mwc-random primitive QuickCheck + quickcheck-instances statistics ]; benchmarkHaskellDepends = [ - base bytestring containers criterion elynx-tools lifted-async - math-functions megaparsec mwc-random optparse-applicative parallel - primitive QuickCheck quickcheck-instances statistics transformers - vector + base bytestring containers criterion elynx-tools math-functions + megaparsec mwc-random primitive statistics ]; description = "Handle phylogenetic trees"; license = stdenv.lib.licenses.gpl3; @@ -79002,8 +80124,8 @@ self: { }: mkDerivation { pname = "email-validate"; - version = "2.3.2.12"; - sha256 = "0ar3cfjia3x11chb7w60mi7hp5djanms883ddk875l6lifr2lyqf"; + version = "2.3.2.13"; + sha256 = "0wh955b9wwqwl8jbkzyxxaf8q9y80dbh0f6vaxxzh2cc7zqc31im"; libraryHaskellDepends = [ attoparsec base bytestring template-haskell ]; @@ -79315,8 +80437,8 @@ self: { }: mkDerivation { pname = "encoding"; - version = "0.8.2"; - sha256 = "1lfh5pyc4f73870xz6dydksp5nspnzbkj4fvinhwdknhc5ii8353"; + version = "0.8.5"; + sha256 = "1kqi6ic5sa8y01ya99v7r5j9rl68vgy2lsixhbnavi8fx2200hcs"; setupHaskellDepends = [ base Cabal containers filepath ghc-prim HaXml ]; @@ -79515,8 +80637,8 @@ self: { }: mkDerivation { pname = "entropy"; - version = "0.4.1.5"; - sha256 = "0szf8hi1pi8g0kxnkcymh65gk1b0niyl1nnkckzdqyar87qal0jm"; + version = "0.4.1.6"; + sha256 = "0qmzz0zgad13zl0kjrxz6cxg8ckn2w8saas2a2j72vbafpzmkixd"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ base bytestring unix ]; description = "A platform independent entropy source"; @@ -80828,8 +81950,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding"; - version = "0.1.0.2"; - sha256 = "1z65vm457af7ffiih8yzgds059kamaiskvjfl72qqb24fmgj9jxm"; + version = "0.1.0.3"; + sha256 = "1kycm3a2rbz8shcjz8j1yl2c5pvpkr9mp3g3pgmcnhdr7wq4smlk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80851,8 +81973,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-gloss"; - version = "0.1.0.1"; - sha256 = "0716mwww68x8v2r6fz6ah8m26w5h98kgd662rirh56nmwr219zk5"; + version = "0.1.0.3"; + sha256 = "0ggwh1d57isda9k5l4g7g92l77m1b9hj2vva3r0fvmnidsny41n0"; libraryHaskellDepends = [ base essence-of-live-coding foreign-store gloss syb transformers ]; @@ -80868,8 +81990,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-pulse"; - version = "0.1.0.1"; - sha256 = "18f6wrq5ar14yb44yl6m8xfi9c721yywl4gzwcrx65n6wn3h16va"; + version = "0.1.0.3"; + sha256 = "044vjp637gaq2q2c8d83c9ixp6zg5x752ifw4nmnwigi1w53y1wq"; libraryHaskellDepends = [ base essence-of-live-coding foreign-store pulse-simple transformers ]; @@ -80885,8 +82007,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-quickcheck"; - version = "0.1.0.1"; - sha256 = "0wkffsy3jxz85lxlbppi477wkzlx2zvxmjc70rgf8bjw8s631a22"; + version = "0.1.0.3"; + sha256 = "1sp4s69jlc679yhix5smwx1n0gk8msrjmrsyca2lf59l71l3gadc"; libraryHaskellDepends = [ base boltzmann-samplers essence-of-live-coding QuickCheck syb transformers @@ -81701,6 +82823,8 @@ self: { pname = "eventloop"; version = "0.8.2.8"; sha256 = "1k10f8mihxb9xsvjkmzxphin4l49f5pwbfxfan1ar7wzxyv85vjj"; + revision = "1"; + editedCabalFile = "0qzrfk1riyf33b7kyjpdzzi8c40wh559wr0m0rjziykzxy0s92m2"; libraryHaskellDepends = [ aeson base bytestring concurrent-utilities deepseq network stm suspend text timers websockets @@ -81990,6 +83114,20 @@ self: { broken = true; }) {}; + "example-haskell-project" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "example-haskell-project"; + version = "0.1.0.0"; + sha256 = "0ar83c7rgh4n70d45rjr00ajdxds8bq543q9isfprkiv23pasbq3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + description = "Example Haskell Project"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "except-exceptions" = callPackage ({ mkDerivation, base, exceptions, transformers }: mkDerivation { @@ -82331,8 +83469,8 @@ self: { }: mkDerivation { pname = "exinst"; - version = "0.7"; - sha256 = "01m50pixmrw6mrd04nxw6qwx0z5k857pn3nqfiybpmp4zbc3bwac"; + version = "0.8"; + sha256 = "08axj8yqnqbmxq4yi0fy2rffnkn7lcab2j13b9qlwl5ykc2jrhfh"; libraryHaskellDepends = [ base binary constraints deepseq hashable profunctors QuickCheck singletons @@ -82353,8 +83491,8 @@ self: { }: mkDerivation { pname = "exinst-aeson"; - version = "0.7"; - sha256 = "1dn08xqcfp3bsgvrhcv491kdfmky6925wa33zry8aijwxkchva67"; + version = "0.7.1"; + sha256 = "1rl9sg6bqac944dh4v6xish6fw6x5mr6a937nyq0yrjmg8d3gswp"; libraryHaskellDepends = [ aeson base constraints exinst singletons ]; @@ -82374,8 +83512,8 @@ self: { }: mkDerivation { pname = "exinst-bytes"; - version = "0.7"; - sha256 = "05k2jzlz6aj5wwy3bnysszr6kw85n0j73wkda5vwcrsha4prmf9r"; + version = "0.7.1"; + sha256 = "0carx1qbs97pxj9bq6splar46myfjz8l0imqmy2nr868sf7an7q5"; libraryHaskellDepends = [ base bytes constraints exinst singletons ]; @@ -82395,8 +83533,8 @@ self: { }: mkDerivation { pname = "exinst-cereal"; - version = "0.7"; - sha256 = "1qdz4a4qzi3fbkigvng36hz5j322zbbwya2vrs0shja8ry6rvi74"; + version = "0.7.1"; + sha256 = "1ffya75sjy1b60a2c10zymshc8qi1b79rzgpa2mpvlr0glf5i32d"; libraryHaskellDepends = [ base cereal constraints exinst singletons ]; @@ -82444,8 +83582,8 @@ self: { }: mkDerivation { pname = "exinst-serialise"; - version = "0.7"; - sha256 = "0a51534sifdhq764qa9hrhwnv48f1y08a7f11mhhx3r23pxh4588"; + version = "0.7.1"; + sha256 = "06fqhxcqwam7160i2m0hsmbdkb0q21kv0vy5azilrbphhz4ycfvp"; libraryHaskellDepends = [ base constraints exinst serialise singletons ]; @@ -83020,6 +84158,29 @@ self: { broken = true; }) {}; + "extended-containers" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, transformers, vector }: + mkDerivation { + pname = "extended-containers"; + version = "0.1.0.0"; + sha256 = "04m3i90iljx36yc528yz6dcgcrfvzkvjvghqjp741mqvmixdjsip"; + libraryHaskellDepends = [ base transformers vector ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "Heap and Vector container types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "extended-containers-lens" = callPackage + ({ mkDerivation, base, extended-containers, lens }: + mkDerivation { + pname = "extended-containers-lens"; + version = "0.1.0.0"; + sha256 = "107nfyrp62h6qwc3ra08cd9vyaanc7442wcbfmm83aw05fav3p43"; + libraryHaskellDepends = [ base extended-containers lens ]; + description = "lens instances for extended-containers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "extended-reals" = callPackage ({ mkDerivation, base, deepseq, hashable, HUnit, QuickCheck, tasty , tasty-hunit, tasty-quickcheck, tasty-th @@ -83177,6 +84338,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "extensions" = callPackage + ({ mkDerivation, base, bytestring, Cabal, colourista, containers + , directory, filepath, ghc-boot-th, hedgehog, hspec, hspec-hedgehog + , optparse-applicative, parsec, text + }: + mkDerivation { + pname = "extensions"; + version = "0.0.0.1"; + sha256 = "0wxkkdvsq8pqirw5w8ss20iyblw9197q420cpwnqzbl2xb0cjk6n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers directory filepath ghc-boot-th + parsec text + ]; + executableHaskellDepends = [ + base colourista containers directory filepath optparse-applicative + text + ]; + testHaskellDepends = [ + base bytestring containers ghc-boot-th hedgehog hspec + hspec-hedgehog text + ]; + description = "Parse Haskell Language Extensions"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "external-sort" = callPackage ({ mkDerivation, base, binary, bytestring, EdisonAPI, EdisonCore }: mkDerivation { @@ -83305,8 +84495,8 @@ self: { }: mkDerivation { pname = "extrapolate"; - version = "0.4.1"; - sha256 = "1rhwgbx8skq8hl1h5hnv28qavy3v1p71vdlib1kwbdp1r7niwp8l"; + version = "0.4.2"; + sha256 = "1dhljcsqahpyn3khxjbxc15ih1r6kgqcagr5gbpg1d705ji7y3j0"; libraryHaskellDepends = [ base express leancheck speculate template-haskell ]; @@ -83346,8 +84536,8 @@ self: { pname = "ez3"; version = "0.1.0.0"; sha256 = "0p2i8ingh27qn61rizh79ink63ydf3wcm86q57f4kd4arbnp7gs4"; - revision = "1"; - editedCabalFile = "13pr43yrrkxp0fmdw1s4wavz8zak5pw1aq2wf1zc8fskysyfx67w"; + revision = "2"; + editedCabalFile = "1x0fskz64l9xvywiif9jmmnjkkr7pbdri9y6k3cxgl47yipi0kf2"; libraryHaskellDepends = [ base transformers z3 ]; description = "Z3 bonds with pure interface"; license = stdenv.lib.licenses.bsd3; @@ -83613,6 +84803,8 @@ self: { pname = "fair"; version = "0.1.0.0"; sha256 = "0x8nz1476pdmcaq99gvzs0ila78z1zhvdkyw886ly8ivfp49ix17"; + revision = "1"; + editedCabalFile = "0w9wx223yj70k9xb6alwy61pwax8pvi3q25b7gmrihhbpbdzyjhg"; libraryHaskellDepends = [ base util ]; testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; benchmarkHaskellDepends = [ base criterion ]; @@ -83754,8 +84946,8 @@ self: { }: mkDerivation { pname = "faktory"; - version = "1.0.1.1"; - sha256 = "1wz7f1ai73xc5n06db8mjbmbdyf5r9p78ysx3q1yiq32h2mvjd3m"; + version = "1.0.1.2"; + sha256 = "12pabsmy21il88qmdbg91152y9nzqci9y2cn9ljizlcndnsy7s5l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84618,6 +85810,8 @@ self: { testHaskellDepends = [ base doctest first-class-families Glob ]; description = "Data structures and algorithms for first-class-families"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fcg" = callPackage @@ -85808,6 +87002,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "file-embed_0_0_12_0" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , template-haskell + }: + mkDerivation { + pname = "file-embed"; + version = "0.0.12.0"; + sha256 = "13b2bcyifyrs1i9yk0qkj5md68ysnwma7zb1xrb1x2i4z3lk342p"; + libraryHaskellDepends = [ + base bytestring directory filepath template-haskell + ]; + testHaskellDepends = [ base filepath ]; + description = "Use Template Haskell to embed file contents directly"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "file-embed-lzma" = callPackage ({ mkDerivation, base, base-compat, bytestring, directory, filepath , lzma, template-haskell, text, th-lift-instances, transformers @@ -86009,8 +87220,8 @@ self: { pname = "filepath"; version = "1.4.2.1"; sha256 = "04jlcaaab4fvlkgpss2mfmr5ixnp1k8f8051nqf8avfg0qan6hqb"; - revision = "1"; - editedCabalFile = "1harx8x3g3badj3087c662sd15fk850jqzx0lz5h16zbsv438lqa"; + revision = "2"; + editedCabalFile = "0jpmcdm852wr18kliyp0a69iij3v9rp6wx92gkkk2nc9vns3mwdg"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Library for manipulating FilePaths in a cross platform way"; @@ -86442,25 +87653,29 @@ self: { }) {}; "finitary" = callPackage - ({ mkDerivation, base, bitvec, coercible-utils, finite-typelits - , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog - , monad-loops, primitive, template-haskell, typelits-witnesses + ({ mkDerivation, base, bitvec, finite-typelits + , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog, hspec + , hspec-hedgehog, primitive, template-haskell, typelits-witnesses , vector, vector-sized }: mkDerivation { pname = "finitary"; - version = "1.2.0.0"; - sha256 = "1r9knjg3vypzyvlawl5pysvsjv7vf6cadh8d5kqqj6xsk3qdnnp5"; + version = "2.0.0.0"; + sha256 = "19b0sm9lb5k459bhq51srx5rcdgk9rjhfha34a3kcsmlqam9fak7"; libraryHaskellDepends = [ - base bitvec coercible-utils finite-typelits ghc-typelits-knownnat + base bitvec finite-typelits ghc-typelits-knownnat ghc-typelits-natnormalise primitive template-haskell typelits-witnesses vector vector-sized ]; testHaskellDepends = [ - base bitvec finite-typelits hedgehog monad-loops vector-sized + base bitvec finite-typelits ghc-typelits-knownnat + ghc-typelits-natnormalise hedgehog hspec hspec-hedgehog primitive + template-haskell typelits-witnesses vector vector-sized ]; description = "A better, more type-safe Enum"; license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "finitary-derive" = callPackage @@ -86634,6 +87849,8 @@ self: { pname = "first-class-families"; version = "0.8.0.0"; sha256 = "190jl3vs7glkbm8ap90x9yzlj01yzxd818s3i0w4pz21b6d6sxav"; + revision = "1"; + editedCabalFile = "02z6wixk9kdgshxsz99lag29lb70kadg9wn6vsgk906wj014fv52"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; description = "First class type families"; @@ -87795,8 +89012,8 @@ self: { ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: mkDerivation { pname = "flow"; - version = "1.0.19"; - sha256 = "00pfsyfn7wpgghsw9xgakrxa3n04lizfhrxkg9jbyw0gvd5w6hi9"; + version = "1.0.20"; + sha256 = "1pxb87rmw1ryls8k4g82wy1gg6wxw5n4s4nyn248gnam1xgls9li"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck template-haskell ]; description = "Write more understandable Haskell"; @@ -90587,10 +91804,8 @@ self: { ({ mkDerivation, base, bifunctors, lens, optparse-applicative }: mkDerivation { pname = "friendly"; - version = "0.1.0.0"; - sha256 = "0ikbfki5yvagc3xjbqwmzzp29idfviaylnan6cr39kna6fc8ajgx"; - revision = "2"; - editedCabalFile = "12j953w8zcix2iyqwkn08zpw1r1dd7jk8p8a3v5hs5rya1qb74si"; + version = "0.1.0.1"; + sha256 = "0860zmvlccdnjycmjr4wmi8ighps9dig5zik8hpj2h3z208ph8qp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90662,8 +91877,8 @@ self: { }: mkDerivation { pname = "front"; - version = "0.0.0.6"; - sha256 = "0380d9c9mv8jp04igjm4h9njijgc18x34xg13d5pgm7f5yz8aipk"; + version = "0.0.0.8"; + sha256 = "07hx4a4hkg8ch29zax67ja099p7npgsaci45h5002cqp91il1khv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91897,6 +93112,8 @@ self: { testHaskellDepends = [ base ]; description = "A readline-like effect and carrier for fused-effects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fused-effects-resumable" = callPackage @@ -91947,12 +93164,17 @@ self: { }) {}; "fusion-plugin" = callPackage - ({ mkDerivation, base, fusion-plugin-types, ghc, syb }: + ({ mkDerivation, base, containers, directory, filepath + , fusion-plugin-types, ghc, syb, time, transformers + }: mkDerivation { pname = "fusion-plugin"; - version = "0.2.0"; - sha256 = "0fbsmlkvxxfiwajl3ihidp2xmsds4y47sbqigng9pp78lhln35am"; - libraryHaskellDepends = [ base fusion-plugin-types ghc syb ]; + version = "0.2.1"; + sha256 = "08v43q428s6nw3diqaasdr0c9arrzvzvldcybj8wp2r66aw613ic"; + libraryHaskellDepends = [ + base containers directory filepath fusion-plugin-types ghc syb time + transformers + ]; description = "GHC plugin to make stream fusion more predictable"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -91972,30 +93194,28 @@ self: { "futhark" = callPackage ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary - , blaze-html, bytestring, containers, data-binary-ieee754 - , directory, directory-tree, dlist, file-embed, filepath, free - , gitrev, happy, haskeline, http-client, http-client-tls - , http-conduit, language-c-quote, mainland-pretty, markdown - , megaparsec, mtl, neat-interpolation, parallel, parser-combinators - , process, process-extras, QuickCheck, random, regex-tdfa, srcloc - , tasty, tasty-hunit, tasty-quickcheck, template-haskell, temporary - , terminal-size, text, time, transformers, unordered-containers - , utf8-string, vector, vector-binary-instances, versions - , zip-archive, zlib + , blaze-html, bytestring, cmark-gfm, containers + , data-binary-ieee754, directory, directory-tree, dlist, file-embed + , filepath, free, gitrev, happy, haskeline, language-c-quote + , mainland-pretty, megaparsec, mtl, neat-interpolation, parallel + , parser-combinators, pcg-random, process, process-extras + , QuickCheck, regex-tdfa, srcloc, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, terminal-size + , text, time, transformers, unordered-containers, utf8-string + , vector, vector-binary-instances, versions, zip-archive, zlib }: mkDerivation { pname = "futhark"; - version = "0.15.3"; - sha256 = "067hzxvvkkz0d9sg67pswi6k061ri314vw4j979skhjibfb7g0hx"; + version = "0.15.6"; + sha256 = "16abw20ziw3ik28dry0nr63glmszzzw92dcz1vzm4q76j9sjl0py"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal array base binary blaze-html bytestring - containers data-binary-ieee754 directory directory-tree dlist - file-embed filepath free gitrev haskeline http-client - http-client-tls http-conduit language-c-quote mainland-pretty - markdown megaparsec mtl neat-interpolation parallel - parser-combinators process process-extras random regex-tdfa srcloc + cmark-gfm containers data-binary-ieee754 directory directory-tree + dlist file-embed filepath free gitrev haskeline language-c-quote + mainland-pretty megaparsec mtl neat-interpolation parallel + pcg-random process process-extras regex-tdfa srcloc template-haskell temporary terminal-size text time transformers unordered-containers utf8-string vector vector-binary-instances versions zip-archive zlib @@ -92436,25 +93656,25 @@ self: { }) {}; "galois-field" = callPackage - ({ mkDerivation, base, bitvec, criterion, groups, integer-gmp - , MonadRandom, poly, protolude, semirings, tasty, tasty-quickcheck - , vector, wl-pprint-text + ({ mkDerivation, base, bitvec, criterion, groups, integer-gmp, mod + , MonadRandom, poly, protolude, QuickCheck, semirings, tasty + , tasty-quickcheck, vector, wl-pprint-text }: mkDerivation { pname = "galois-field"; - version = "1.0.1"; - sha256 = "04zy8fmsjaba37kcf2k3dchmwv59kqj3k61jc2bm2ji7vwprnvf7"; + version = "1.0.2"; + sha256 = "17khwhh0annwlbbsdj5abh3jv2csg84qvhgn1ircgc69fzb0r59d"; libraryHaskellDepends = [ - base bitvec groups integer-gmp MonadRandom poly protolude semirings - tasty-quickcheck vector wl-pprint-text + base bitvec groups integer-gmp mod MonadRandom poly protolude + QuickCheck semirings vector wl-pprint-text ]; testHaskellDepends = [ - base bitvec groups integer-gmp MonadRandom poly protolude semirings - tasty tasty-quickcheck vector wl-pprint-text + base bitvec groups integer-gmp mod MonadRandom poly protolude + QuickCheck semirings tasty tasty-quickcheck vector wl-pprint-text ]; benchmarkHaskellDepends = [ - base bitvec criterion groups integer-gmp MonadRandom poly protolude - semirings tasty-quickcheck vector wl-pprint-text + base bitvec criterion groups integer-gmp mod MonadRandom poly + protolude QuickCheck semirings vector wl-pprint-text ]; description = "Galois field library"; license = stdenv.lib.licenses.mit; @@ -92691,6 +93911,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gather" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "gather"; + version = "0.1.0.0"; + sha256 = "0ajh8ygks61knc17vgsm5dsnqhkcrz2s0gaw6xyppq415wijgv0m"; + libraryHaskellDepends = [ base ]; + description = "An applicative for parsing unordered things, heterogenous sorting"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gauge" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, directory , foundation, process, vector @@ -93452,15 +94683,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "generic-data_0_8_2_0" = callPackage + "generic-data_0_8_3_0" = callPackage ({ mkDerivation, base, base-orphans, contravariant, criterion , deepseq, doctest, generic-lens, ghc-boot-th, Glob, one-liner , QuickCheck, show-combinators, tasty, tasty-hunit }: mkDerivation { pname = "generic-data"; - version = "0.8.2.0"; - sha256 = "03ix1zc47baqjvwi3xqsbhbb9wrfiamlbjmahcakp2jbzmx2vy6l"; + version = "0.8.3.0"; + sha256 = "090qwd898sacn0d4ryfhbx0jdcvhy84df5f10929zng7swh88hk7"; libraryHaskellDepends = [ base base-orphans contravariant ghc-boot-th show-combinators ]; @@ -93480,8 +94711,8 @@ self: { }: mkDerivation { pname = "generic-data-surgery"; - version = "0.2.0.0"; - sha256 = "02pnxdhmc5m7i9m269s1pggn6gsqj73flv6d86zfkpnqwwsvd5qs"; + version = "0.2.1.0"; + sha256 = "0mjx8yi4f1wvf5w2wp5vzzrh3z5n6900qsp2lbhd2xzzq4zlvzy7"; libraryHaskellDepends = [ base first-class-families generic-data ]; testHaskellDepends = [ base generic-data tasty tasty-hunit ]; description = "Surgery for generic data types"; @@ -94196,6 +95427,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity_0_11_0_0" = callPackage + ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random + , validity + }: + mkDerivation { + pname = "genvalidity"; + version = "0.11.0.0"; + sha256 = "0kqhmgq7p94980br47jd6k9m2vjb62idx8x5hrcmybf0dakyscbl"; + libraryHaskellDepends = [ base QuickCheck random validity ]; + testHaskellDepends = [ base hspec hspec-core QuickCheck ]; + description = "Testing utilities for the validity library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-aeson" = callPackage ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec , genvalidity-scientific, genvalidity-text @@ -94238,6 +95484,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-bytestring_0_6_0_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, genvalidity + , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck + , random, validity, validity-bytestring + }: + mkDerivation { + pname = "genvalidity-bytestring"; + version = "0.6.0.0"; + sha256 = "0d15cjp4pxi7hb9nilbf88mia8sv3wzwxgy3kn46bvhz4w726z5d"; + libraryHaskellDepends = [ + base bytestring genvalidity QuickCheck random validity + validity-bytestring + ]; + testHaskellDepends = [ + base bytestring deepseq genvalidity genvalidity-hspec hspec + QuickCheck validity + ]; + benchmarkHaskellDepends = [ + base bytestring criterion genvalidity genvalidity-criterion + QuickCheck + ]; + description = "GenValidity support for ByteString"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-containers" = callPackage ({ mkDerivation, base, containers, criterion, genvalidity , genvalidity-criterion, genvalidity-hspec, genvalidity-property @@ -94278,6 +95550,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-criterion_0_2_0_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, genvalidity, QuickCheck + }: + mkDerivation { + pname = "genvalidity-criterion"; + version = "0.2.0.0"; + sha256 = "1r28kqqwaaavchdncdwa4q52z3li5515rfa9wz5lcnyrscim62xg"; + libraryHaskellDepends = [ + base criterion deepseq genvalidity QuickCheck + ]; + benchmarkHaskellDepends = [ + base criterion genvalidity QuickCheck + ]; + description = "Criterion benchmarks for generators"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-hspec" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-property, hspec , hspec-core, QuickCheck, transformers, validity @@ -94566,14 +95856,14 @@ self: { }) {}; "genvalidity-typed-uuid" = callPackage - ({ mkDerivation, base, genvalidity, genvalidity-hspec - , genvalidity-hspec-aeson, genvalidity-uuid, hspec, QuickCheck - , typed-uuid + ({ mkDerivation, base, criterion, genvalidity + , genvalidity-criterion, genvalidity-hspec, genvalidity-hspec-aeson + , genvalidity-uuid, hspec, QuickCheck, typed-uuid }: mkDerivation { pname = "genvalidity-typed-uuid"; - version = "0.0.0.1"; - sha256 = "12b9pqly41kwvyqzlqs2nv882m0vvkf06bshngvhjl4ykn7almqk"; + version = "0.0.0.2"; + sha256 = "16h2y11mn2p11pgqkabip0xgwfx1am8s9ja8qikz27jb87x1q410"; libraryHaskellDepends = [ base genvalidity genvalidity-uuid QuickCheck typed-uuid ]; @@ -94581,6 +95871,10 @@ self: { base genvalidity genvalidity-hspec genvalidity-hspec-aeson genvalidity-uuid hspec QuickCheck typed-uuid ]; + benchmarkHaskellDepends = [ + base criterion genvalidity genvalidity-criterion genvalidity-uuid + QuickCheck typed-uuid + ]; description = "Generators for Phantom-Typed version of UUID"; license = stdenv.lib.licenses.mit; }) {}; @@ -94607,19 +95901,23 @@ self: { }) {}; "genvalidity-uuid" = callPackage - ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec - , QuickCheck, uuid, validity, validity-uuid + ({ mkDerivation, base, criterion, genvalidity + , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck, uuid + , validity, validity-uuid }: mkDerivation { pname = "genvalidity-uuid"; - version = "0.1.0.3"; - sha256 = "1kjvl1i4nih5yyydilwsq1mssw1ljiipi20k5pxjh5rgb4f1p520"; + version = "0.1.0.4"; + sha256 = "02iln9qvcqmsjljflfrq8jckch8pvsarjb6lx0bkk7j3cw2cgn2r"; libraryHaskellDepends = [ base genvalidity QuickCheck uuid validity validity-uuid ]; testHaskellDepends = [ base genvalidity genvalidity-hspec hspec QuickCheck uuid ]; + benchmarkHaskellDepends = [ + base criterion genvalidity genvalidity-criterion QuickCheck uuid + ]; description = "GenValidity support for UUID"; license = stdenv.lib.licenses.mit; }) {}; @@ -94794,27 +96092,6 @@ self: { }: mkDerivation { pname = "geojson"; - version = "4.0.1"; - sha256 = "100k6j57r14yxxhfpqlgm9q1x5hrj3qdzm7cpbs5rfyqi5g7kyrj"; - libraryHaskellDepends = [ - aeson base containers deepseq lens scientific semigroups text - transformers validation vector - ]; - testHaskellDepends = [ - aeson base bytestring containers hlint tasty tasty-hspec - tasty-quickcheck text validation - ]; - description = "A thin GeoJSON Layer above the aeson library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "geojson_4_0_2" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , hlint, lens, scientific, semigroups, tasty, tasty-hspec - , tasty-quickcheck, text, transformers, validation, vector - }: - mkDerivation { - pname = "geojson"; version = "4.0.2"; sha256 = "0csbg4pdh686bxk689968bi94njx78iv1sm5g6lp915pg6cfnd66"; libraryHaskellDepends = [ @@ -94827,7 +96104,6 @@ self: { ]; description = "A thin GeoJSON Layer above the aeson library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geojson-types" = callPackage @@ -95051,7 +96327,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc_8_6_5" = callPackage + "ghc_8_10_1" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap , ghci, hpc, process, template-haskell, terminfo, time @@ -95059,8 +96335,8 @@ self: { }: mkDerivation { pname = "ghc"; - version = "8.6.5"; - sha256 = "13sh7f40pib5v00wd5bdxrwz7m5q398l93kky0z14q47130mpp20"; + version = "8.10.1"; + sha256 = "0j5cmb0bqndmrgr92zysa6yiccammdr2pgm9swwkipm5jz4g6d5s"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath ghc-boot ghc-boot-th ghc-heap ghci hpc process template-haskell @@ -95083,14 +96359,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-boot_8_8_1" = callPackage + "ghc-boot_8_8_3" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , ghc-boot-th }: mkDerivation { pname = "ghc-boot"; - version = "8.8.1"; - sha256 = "1f1701nkyn6cig2mh8wb5wn3vwddkfmfqz8lykh8k1sm76qx7yva"; + version = "8.8.3"; + sha256 = "0h4nayld1qa08aly5y3z91z4n778g25s92fggvcxga8bxs49sh50"; + revision = "1"; + editedCabalFile = "0rzc0759sy8n7dp4csy464vb8kvaapzvxzjr1scmwh2gk9v3s1lk"; libraryHaskellDepends = [ base binary bytestring directory filepath ghc-boot-th ]; @@ -95099,18 +96377,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot-th_8_8_1" = callPackage + "ghc-boot-th_8_10_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "8.8.1"; - sha256 = "14aa5jb5wz1yz12l0ixbbwiqj2rg1vgyd2rlfgm2ixsrryans4cb"; + version = "8.10.1"; + sha256 = "0vhhmsd32p7zn9vhpv4d0k0b55n2dyhzy42xblndrma617kz8gli"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the `template-haskell` library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ghc-byteorder" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ghc-byteorder"; + version = "4.11.0.0.10"; + sha256 = "1dhzd7ygwm7b3hsrlm48iq4p634laby4hf7c8i7xp0c1g64hmrc6"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + doHaddock = false; + description = "\"GHC.ByteOrder\" API Compatibility Layer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghc-call-stack-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -95123,17 +96414,17 @@ self: { }) {}; "ghc-check" = callPackage - ({ mkDerivation, base, ghc, ghc-paths, template-haskell - , transformers + ({ mkDerivation, base, filepath, ghc, ghc-paths, process + , template-haskell, transformers }: mkDerivation { pname = "ghc-check"; - version = "0.1.0.3"; - sha256 = "1zrlnk3gzdb96592is2krk8qpk386bib0bpgw47yqj8qfcxqf76v"; + version = "0.3.0.1"; + sha256 = "180xqs4g90v9sdjb0b3baqk62gbnw1xkv76wdq5ap49q0730s3vz"; libraryHaskellDepends = [ - base ghc ghc-paths template-haskell transformers + base filepath ghc ghc-paths process template-haskell transformers ]; - description = "Detect mismatches between compile-time and run-time versions of the ghc api"; + description = "detect mismatches between compile-time and run-time versions of the ghc api"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -95300,8 +96591,8 @@ self: { }: mkDerivation { pname = "ghc-events"; - version = "0.12.0"; - sha256 = "08lrpi6dn32m9ih2w6s7s7fq95k5k015jxkj73z1kss092l3pwi6"; + version = "0.13.0"; + sha256 = "1b4d1h71czskm2vgbhkrkdkj5h218b34zn7pjhyp314wfqkmn935"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95334,6 +96625,8 @@ self: { ]; description = "Analyze and visualize event logs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-events-parallel" = callPackage @@ -95440,8 +96733,8 @@ self: { }: mkDerivation { pname = "ghc-heap-view"; - version = "0.6.1"; - sha256 = "04lmj3ihdwcz483w2cpjs4zcpld8yk3aslkw2gl4mal3fpwf0vhx"; + version = "0.6.2"; + sha256 = "1wj11g24zap7r2xvp46dir54hwyki025xnkgymc73224lisc3134"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ @@ -95545,8 +96838,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "8.8.3.20200224"; - sha256 = "0qwv8i4x4ylixrbipxkii0zxz3j33cpahlckbn6chpp9b59bfdpa"; + version = "8.8.3.20200412.1"; + sha256 = "07xfj3p8w5964jv5py19p2pbcpbjcbwzpd4b46d43j80abzavgxg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -95557,15 +96850,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-lib_8_10_1_20200324" = callPackage + "ghc-lib_8_10_1_20200412" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy , hpc, pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib"; - version = "8.10.1.20200324"; - sha256 = "09d0254ic650n9h6j863xl3cvd506ww84369qdszxwkizlzk7gr3"; + version = "8.10.1.20200412"; + sha256 = "0y680izyflncjs9k1d0bjb2cym6vyp9nnahqhrrgfrhl4xlk0qmi"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -95584,8 +96877,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "8.8.3.20200224"; - sha256 = "0hdn3sd4l1ph26f715i6mlqw6l6w8nnfp9jmlcwrjph14rpn1y15"; + version = "8.8.3.20200412.1"; + sha256 = "1bfyi3haq6qz9x5dbnjvf7m7wqrxqmv3i4kdivlh2v416d56apqd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -95596,15 +96889,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-lib-parser_8_10_1_20200324" = callPackage + "ghc-lib-parser_8_10_1_20200412" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty , process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "8.10.1.20200324"; - sha256 = "0i3ab7a2xq8pjd94kfyrlnp9wnjfkl0qi74zb1m23l6k5zm4g9y8"; + version = "8.10.1.20200412"; + sha256 = "0cndflf4kfz5vf4q83716ambkkh53kw0j0ak5li2fd0kkwiz1q1z"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -95635,14 +96928,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-lib-parser-ex_8_10_0_2" = callPackage + "ghc-lib-parser-ex_8_10_0_8" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "8.10.0.2"; - sha256 = "17khl1ma4q1k16wya96nq8i805b8jkg8spjlrac5273icc550qn2"; + version = "8.10.0.8"; + sha256 = "0y5yxrgmmb69jq5z7b90hm1ialik1b4x1rmankh7kbynfmhl0h3q"; libraryHaskellDepends = [ base bytestring containers ghc-lib-parser uniplate ]; @@ -95801,8 +97094,8 @@ self: { ({ mkDerivation, base, cpphs, ghc, happy }: mkDerivation { pname = "ghc-parser"; - version = "0.2.1.0"; - sha256 = "0z6gr3zs89agyc2iw2lv8rddw78yn6wxzyzkip7gfca1n9f7xwd9"; + version = "0.2.2.0"; + sha256 = "1pygg0538nah42ll0zai081y8hv8z7lwl0vr9l2k273i4fdif7hb"; libraryHaskellDepends = [ base ghc ]; libraryToolDepends = [ cpphs happy ]; description = "Haskell source parser from GHC"; @@ -95858,12 +97151,12 @@ self: { broken = true; }) {}; - "ghc-prim_0_5_3" = callPackage + "ghc-prim_0_6_1" = callPackage ({ mkDerivation, rts }: mkDerivation { pname = "ghc-prim"; - version = "0.5.3"; - sha256 = "07s75s4yj33p87zzpvp68hgf72xsxg6rm47g4aaymmlf52aywmv9"; + version = "0.6.1"; + sha256 = "06nc87f4mcqcddllysb75qj942y5mmdwss7h9z3m0m93lbxxy6a2"; libraryHaskellDepends = [ rts ]; description = "GHC primitives"; license = stdenv.lib.licenses.bsd3; @@ -95876,8 +97169,8 @@ self: { }: mkDerivation { pname = "ghc-prof"; - version = "1.4.1.6"; - sha256 = "1rypk644xpgvawymn8ib992n4qkc2fc796arf574hhikdffr5a14"; + version = "1.4.1.7"; + sha256 = "0js799sf957xlki8f7jgwj803iygi35j4bp4p4hh8gzj4icvcqfz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96072,28 +97365,45 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-syntax-highlighter_0_0_6_0" = callPackage + ({ mkDerivation, base, ghc-lib-parser, hspec, hspec-discover, text + }: + mkDerivation { + pname = "ghc-syntax-highlighter"; + version = "0.0.6.0"; + sha256 = "1dxm4w44y339flwl4ivsmvml3nvzzlxq585by9mm7j56ljlb4aja"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ghc-lib-parser text ]; + testHaskellDepends = [ base hspec text ]; + testToolDepends = [ hspec-discover ]; + description = "Syntax highlighter for Haskell using lexer of GHC itself"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-tags-core" = callPackage ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq - , directory, filepath, ghc, lattices, mtl, pipes, pipes-attoparsec - , pipes-bytestring, pipes-text, QuickCheck, quickcheck-instances - , tasty, tasty-golden, tasty-quickcheck, text, transformers + , directory, filepath, filepath-bytestring, ghc, lattices, mtl + , pipes, pipes-attoparsec, pipes-bytestring, QuickCheck + , quickcheck-instances, tasty, tasty-golden, tasty-quickcheck, text + , transformers }: mkDerivation { pname = "ghc-tags-core"; - version = "0.1.0.0"; - sha256 = "0agn5601fwq4nr2k6xya0lmwm4hw63rvmpi4rk0jr362vn7d219n"; + version = "0.2.0.0"; + sha256 = "1i7jr8zzkybh1f0ljg3l4airfc4ayy4z7v16avj6j5h3k8dksd3f"; libraryHaskellDepends = [ - attoparsec base bytestring directory filepath ghc mtl pipes - pipes-attoparsec pipes-bytestring pipes-text text transformers + attoparsec base bytestring directory filepath-bytestring ghc mtl + pipes pipes-attoparsec pipes-bytestring text transformers ]; testHaskellDepends = [ - attoparsec base bytestring directory filepath lattices mtl pipes - QuickCheck quickcheck-instances tasty tasty-golden tasty-quickcheck - text + attoparsec base bytestring directory filepath filepath-bytestring + lattices mtl pipes QuickCheck quickcheck-instances tasty + tasty-golden tasty-quickcheck text ]; benchmarkHaskellDepends = [ - base bytestring criterion deepseq mtl pipes pipes-attoparsec - pipes-bytestring pipes-text text + base bytestring criterion deepseq filepath-bytestring mtl pipes + pipes-attoparsec pipes-bytestring text ]; description = "a library to work with tags created from Haskell parsed tree"; license = stdenv.lib.licenses.mpl20; @@ -96102,20 +97412,21 @@ self: { }) {}; "ghc-tags-plugin" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, ghc - , ghc-tags-core, mtl, optparse-applicative, pipes, pipes-attoparsec - , pipes-bytestring, pipes-safe, pipes-text, text + ({ mkDerivation, base, bytestring, directory, filepath + , filepath-bytestring, ghc, ghc-tags-core, mtl + , optparse-applicative, pipes, pipes-attoparsec, pipes-bytestring + , pipes-safe, text, unix }: mkDerivation { pname = "ghc-tags-plugin"; - version = "0.1.6.0"; - sha256 = "148whav3lpkglgfk51az3f3cfnp50psnznrw0a7mdbqxmkhfb41i"; + version = "0.2.0.0"; + sha256 = "0prl25wd8fcga2ndx78rvsyzk4ar9m7wrs10mbcmia9pi4kax7y9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring directory filepath ghc ghc-tags-core mtl - optparse-applicative pipes pipes-attoparsec pipes-bytestring - pipes-safe pipes-text text + base bytestring directory filepath filepath-bytestring ghc + ghc-tags-core mtl optparse-applicative pipes pipes-attoparsec + pipes-bytestring pipes-safe text unix ]; description = "A compiler plugin which generates tags file from GHC parsed syntax tree"; license = stdenv.lib.licenses.mpl20; @@ -96182,8 +97493,8 @@ self: { ({ mkDerivation, base, bytestring, criterion, text }: mkDerivation { pname = "ghc-trace-events"; - version = "0.1.0"; - sha256 = "0i68zk3k02f3hp6yvkgmdvdjfm8kgh3pwhr3qff4bc9isfh6qks2"; + version = "0.1.0.1"; + sha256 = "1krr97njpcxw161fgkm899h1ckwhgivprqyv85hhbbr4d5cg6yby"; libraryHaskellDepends = [ base bytestring text ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Faster traceEvent and traceMarker, and binary object logging for eventlog"; @@ -96342,15 +97653,15 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "ghci_8_6_5" = callPackage + "ghci_8_10_1" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap , template-haskell, transformers, unix }: mkDerivation { pname = "ghci"; - version = "8.6.5"; - sha256 = "0h011kixzv5x5bjb2i71bl9dnffc6if7k6jmsncbyvj0vvchrrn8"; + version = "8.10.1"; + sha256 = "14r7h3nj61mhap15r3cq6824b6fib9krj6b6qa77bl7jqdqpfxsq"; libraryHaskellDepends = [ array base binary bytestring containers deepseq filepath ghc-boot ghc-boot-th ghc-heap template-haskell transformers unix @@ -96516,8 +97827,8 @@ self: { }: mkDerivation { pname = "ghcid"; - version = "0.8.5"; - sha256 = "15zj78wasix4yz8mxx5hl6x1gj364vsbwn5arp7sbq13rywhs2qy"; + version = "0.8.6"; + sha256 = "00zyf8m3jj72ax7sj0c4j0yivrvj72vqfwra7hzgywf8fc2qxfv1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96576,8 +97887,6 @@ self: { ]; description = "The core of an IDE"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ghcjs-ajax" = callPackage @@ -97467,8 +98776,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "3.0.32"; - sha256 = "0div9lqmirys1f3dy6bskvai72hb82g6rvcg0kwg1im974xp5m8l"; + version = "3.0.33"; + sha256 = "03fvazdkg1m9svp39bn4gz7cfy23pp01yfcf6ambkdrq9msqsjak"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi @@ -97763,8 +99072,8 @@ self: { }: mkDerivation { pname = "gi-poppler"; - version = "0.18.21"; - sha256 = "1mfi3yn7yrwg2cdpqp0av4cabmmqpmm2hywsrm5d78cxix4z1s7f"; + version = "0.18.22"; + sha256 = "0bqmkijnmxi4k30nbn8zsx03i9y7mlp06ikmd2dbxj22lyazqjz4"; setupHaskellDepends = [ base Cabal gi-cairo gi-gio gi-glib gi-gobject haskell-gi ]; @@ -98231,8 +99540,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20200330"; - sha256 = "0xy0ld7kr4cfdl4g4yzvrzl5r60dcj33cxm28a4qz6nqm2yhd4sv"; + version = "8.20200501"; + sha256 = "19rggaymvqy7r61n2rl2nigwdi2hzq5l1afcd5l0k1vbacwgq4jl"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -98282,20 +99591,20 @@ self: { inherit (pkgs) which;}; "git-brunch" = callPackage - ({ mkDerivation, base, brick, hspec, microlens, process, vector - , vty + ({ mkDerivation, base, brick, hspec, microlens + , optparse-applicative, process, vector, vty }: mkDerivation { pname = "git-brunch"; - version = "1.1.2.0"; - sha256 = "02swvnwa5iqnrsw6r709qxy1hjp7df4i0qlhkqhshfdva6xy3376"; + version = "1.3.1.0"; + sha256 = "0k1q3f9hyyagv67mpaj1159vic4kc44nk10nswg0pql38ai5bqvx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base brick microlens process vector vty + base brick hspec microlens optparse-applicative process vector vty ]; testHaskellDepends = [ - base brick hspec microlens process vector vty + base brick hspec microlens optparse-applicative process vector vty ]; description = "git checkout command-line tool"; license = stdenv.lib.licenses.bsd3; @@ -98585,13 +99894,14 @@ self: { }: mkDerivation { pname = "git-repair"; - version = "1.20200102"; - sha256 = "13xlnfwaf914n4d57c4q6n1dkhw7jz1grrnw6shqvh3v09ywqsnz"; + version = "1.20200504"; + sha256 = "1k5sildrc46mhwxzwxfjxv267322gavcvvs3gc56mz1vfs8ip4b8"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base bytestring Cabal data-default directory exceptions filepath - hslogger IfElse mtl process split unix unix-compat + filepath-bytestring hslogger IfElse mtl process split unix + unix-compat ]; executableHaskellDepends = [ async attoparsec base bytestring containers data-default deepseq @@ -98599,7 +99909,7 @@ self: { mtl network network-uri optparse-applicative process QuickCheck split text time transformers unix unix-compat utf8-string ]; - description = "repairs a damanged git repisitory"; + description = "repairs a damaged git repository"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -98653,6 +99963,8 @@ self: { testToolDepends = [ git ]; description = "A framework for pre-commit checks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gitHUD" = callPackage @@ -98718,25 +100030,6 @@ self: { }: mkDerivation { pname = "githash"; - version = "0.1.3.3"; - sha256 = "19xhs2nzm1myyjx3nkc3invy15c19cfx790vbcrl050n9sb330jr"; - libraryHaskellDepends = [ - base bytestring directory filepath process template-haskell - ]; - testHaskellDepends = [ - base bytestring directory filepath hspec process template-haskell - temporary unliftio - ]; - description = "Compile git revision info into Haskell projects"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "githash_0_1_4_0" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, hspec - , process, template-haskell, temporary, unliftio - }: - mkDerivation { - pname = "githash"; version = "0.1.4.0"; sha256 = "0rsz230srhszwybg5a40vhzzp9z0r4yvdz4xg2hwwwphmbi8pfy3"; libraryHaskellDepends = [ @@ -98748,7 +100041,6 @@ self: { ]; description = "Compile git revision info into Haskell projects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github" = callPackage @@ -98854,24 +100146,21 @@ self: { }) {}; "github-release" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client + ({ mkDerivation, aeson, base, burrito, bytestring, http-client , http-client-tls, http-types, mime-types, optparse-generic, text - , unordered-containers, uri-templater + , unordered-containers }: mkDerivation { pname = "github-release"; - version = "1.2.5"; - sha256 = "1ilmq8sjxidyna41gm97ygskjzkbf3rggb2m6lqpxpjcycay7jfr"; + version = "1.3.0"; + sha256 = "08nr6a763zc0zszbw1lci4d86z3rpcyr1444a10q3a0dj64krwab"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring http-client http-client-tls http-types - mime-types optparse-generic text unordered-containers uri-templater - ]; - executableHaskellDepends = [ - aeson base bytestring http-client http-client-tls http-types - mime-types optparse-generic text unordered-containers uri-templater + aeson base burrito bytestring http-client http-client-tls + http-types mime-types optparse-generic text unordered-containers ]; + executableHaskellDepends = [ base ]; description = "Upload files to GitHub releases"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -99001,8 +100290,8 @@ self: { }: mkDerivation { pname = "github-webhooks"; - version = "0.12.0"; - sha256 = "0p029a2pl77arldqllr84gnizhi3fib2mxf4cfggvykhdcrc856h"; + version = "0.13.0"; + sha256 = "08yqkxgmd9mqv75wzqi0mxhnb9jv1wawxkikgf6nzqwpdfml967y"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite deepseq deepseq-generics memory text time vector @@ -99122,8 +100411,8 @@ self: { }: mkDerivation { pname = "gitlab-haskell"; - version = "0.1.7"; - sha256 = "1l7z7sqnipkbf4355zzmjrj9ig8bb9jysyj5r7rgqk8pr1znj524"; + version = "0.1.8"; + sha256 = "13s2vpxvcm000b817p9w8v05frdmsq9xjm9g6i07v97vrgpch1mv"; libraryHaskellDepends = [ aeson base bytestring connection http-conduit http-types text time transformers unliftio unliftio-core @@ -99801,16 +101090,16 @@ self: { }) {}; "gll" = callPackage - ({ mkDerivation, array, base, containers, pretty, random-strings - , regex-applicative, text, time, TypeCompose + ({ mkDerivation, array, base, containers, pretty, regex-applicative + , text, time, TypeCompose }: mkDerivation { pname = "gll"; - version = "0.4.0.12"; - sha256 = "1ls01s36ixik53c0fyr9sy3bhyh2kfn0yjkh3mp8izgw6l8aydwr"; + version = "0.4.0.13"; + sha256 = "1kw1wmc59fz87z8xwdbg9988ghvhdyfj594cxnd28gw0z04gsz4m"; libraryHaskellDepends = [ - array base containers pretty random-strings regex-applicative text - time TypeCompose + array base containers pretty regex-applicative text time + TypeCompose ]; description = "GLL parser with simple combinator interface"; license = stdenv.lib.licenses.bsd3; @@ -103344,13 +104633,14 @@ self: { "gopro-plus" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, exceptions , filepath, generic-deriving, HUnit, lens, lens-aeson, mtl, random - , retry, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, unix, unliftio, unordered-containers, vector, wreq + , raw-strings-qq, retry, tasty, tasty-hunit, tasty-quickcheck, text + , time, transformers, unix, unliftio, unordered-containers, vector + , wreq }: mkDerivation { pname = "gopro-plus"; - version = "0.3.0.0"; - sha256 = "16fk23q5qz6c4bjhbm8xcnkdckyk5ziz4gky9x1vndk5wxm2srr1"; + version = "0.3.1.1"; + sha256 = "0gjdz5c165hk4nbynp3s633kzivq62y3riz45w0l0k2qrirpkd14"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving lens lens-aeson mtl random retry text time @@ -103358,9 +104648,9 @@ self: { ]; testHaskellDepends = [ aeson base bytestring containers exceptions filepath - generic-deriving HUnit lens lens-aeson mtl random retry tasty - tasty-hunit tasty-quickcheck text time transformers unix unliftio - unordered-containers vector wreq + generic-deriving HUnit lens lens-aeson mtl random raw-strings-qq + retry tasty tasty-hunit tasty-quickcheck text time transformers + unix unliftio unordered-containers vector wreq ]; description = "GoPro Plus Client API"; license = stdenv.lib.licenses.bsd3; @@ -104475,21 +105765,22 @@ self: { "graphql" = callPackage ({ mkDerivation, aeson, base, containers, hspec, hspec-expectations - , hspec-megaparsec, megaparsec, raw-strings-qq, text, transformers - , unordered-containers + , hspec-megaparsec, megaparsec, parser-combinators, QuickCheck + , raw-strings-qq, text, transformers, unordered-containers }: mkDerivation { pname = "graphql"; - version = "0.6.1.0"; - sha256 = "0x0526kb29ndrhb9dy9iwxj9r3qij7sy4zjhjqfx3hc7334rdpda"; + version = "0.7.0.0"; + sha256 = "03bfg4whf7blf91x0h4qk6q7f1j7nfvhmqh4ggpnbyxdbyzx9sk4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base containers megaparsec text transformers - unordered-containers + aeson base containers megaparsec parser-combinators text + transformers unordered-containers ]; testHaskellDepends = [ aeson base containers hspec hspec-expectations hspec-megaparsec - megaparsec raw-strings-qq text transformers unordered-containers + megaparsec parser-combinators QuickCheck raw-strings-qq text + transformers unordered-containers ]; description = "Haskell GraphQL implementation"; license = stdenv.lib.licenses.bsd3; @@ -104653,7 +105944,7 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; - description = "GRASP implementation for the AMMM project"; + description = "GRASP implementation for the AMMM project."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -104764,8 +106055,8 @@ self: { }: mkDerivation { pname = "greenclip"; - version = "3.2.0"; - sha256 = "09ygvyrczxqsp2plwmwx021wmbq2vln9i4b5iaj0j26j7prykikq"; + version = "3.3.0"; + sha256 = "02w84wmkih9j9iil9ilwb77qkbvfa6nhllavrcj6rgb7zp264w84"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -104869,8 +106160,29 @@ self: { }: mkDerivation { pname = "greskell"; - version = "1.0.0.1"; - sha256 = "070qqvp4dp7zng6yr1dipcranqhgccnps6k767ag6nh6cprz09qw"; + version = "1.0.1.0"; + sha256 = "0gknzbaldmziy7lj23g3l8q3ymxdr5vbis109j6r7zbjap1jy0in"; + libraryHaskellDepends = [ + aeson base exceptions greskell-core hashable semigroups text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover greskell-core hint + hspec text unordered-containers + ]; + description = "Haskell binding for Gremlin graph query language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "greskell_1_1_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover + , exceptions, greskell-core, hashable, hint, hspec, semigroups + , text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "greskell"; + version = "1.1.0.0"; + sha256 = "10zvz33pd5h2zslmvhilsiqzg6j91azrh8dixc0z75dwrrwyhaa2"; libraryHaskellDepends = [ aeson base exceptions greskell-core hashable semigroups text transformers unordered-containers vector @@ -104881,6 +106193,7 @@ self: { ]; description = "Haskell binding for Gremlin graph query language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "greskell-core" = callPackage @@ -104911,8 +106224,8 @@ self: { }: mkDerivation { pname = "greskell-websocket"; - version = "0.1.2.1"; - sha256 = "0wz4x7n64cwdjsmyziy9v76aa7p3kxjmbd9bfxc4rpqdjyfk34px"; + version = "0.1.2.2"; + sha256 = "1iq8ir7xcqy1vf7x23rl3vp2a165xzmz5c0hwid2n0nj7q3k0i93"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring greskell-core hashtables safe-exceptions stm text unordered-containers uuid @@ -105587,15 +106900,16 @@ self: { "gscholar-rss" = callPackage ({ mkDerivation, base, feed, http-conduit, scalpel-core, text, uri + , xml-types }: mkDerivation { pname = "gscholar-rss"; - version = "0.2.4.1"; - sha256 = "09f6l7j8pax8c07myg3zbla3davgi88aib3g0nb55vnlcs33qrq6"; + version = "0.3.0.0"; + sha256 = "1hvmnzfh4qqbx41kih1py9hn9kxkribk8vfj0wx9i8v0sac5g87s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base feed http-conduit scalpel-core text uri + base feed http-conduit scalpel-core text uri xml-types ]; description = "scrapes google scholar, provides RSS feed"; license = stdenv.lib.licenses.gpl3; @@ -106555,7 +107869,7 @@ self: { license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {cudd = null; epd = null; inherit (pkgs) mtr; + }) {inherit (pkgs) cudd; epd = null; inherit (pkgs) mtr; inherit (pkgs) st; util = null;}; "hCM" = callPackage @@ -106944,7 +108258,7 @@ self: { license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; + }) {inherit (pkgs) blas; liblapack = null;}; "hXmixer" = callPackage ({ mkDerivation, base, directory, gtk3, process, split, text }: @@ -107656,10 +108970,8 @@ self: { }: mkDerivation { pname = "hackage-security"; - version = "0.6.0.0"; - sha256 = "1y9vs30y474ri8b9jqkbwfkcfh7p7jaafzwxina9z0xl32d0bn1c"; - revision = "1"; - editedCabalFile = "0iw1vy9xapwrwsg38pb6lr26yprwhz1j2w2kzkqfapxmwx37v639"; + version = "0.6.0.1"; + sha256 = "05rgz31cmp52137j4jk0074z8lfgk8mrf2x56bzw28asmxrv8qli"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -107967,7 +109279,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haddock" = callPackage + "haddock_2_23_1" = callPackage ({ mkDerivation, base, filepath, haddock-api }: mkDerivation { pname = "haddock"; @@ -107981,27 +109293,43 @@ self: { preCheck = "unset GHC_PACKAGE_PATH"; description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haddock-api_2_22_0" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, containers - , deepseq, directory, filepath, ghc, ghc-boot, ghc-paths - , haddock-library, hspec, hspec-discover, QuickCheck, transformers - , xhtml + "haddock" = callPackage + ({ mkDerivation, base, filepath, haddock-api }: + mkDerivation { + pname = "haddock"; + version = "2.24.0"; + sha256 = "08hbn6i6rac8c1l80dfnv9161gh8rs7npdxyk87wqz910h6f4iip"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base haddock-api ]; + testHaskellDepends = [ base filepath ]; + doCheck = false; + preCheck = "unset GHC_PACKAGE_PATH"; + description = "A documentation-generation tool for Haskell libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "haddock-api_2_23_1" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , directory, filepath, ghc, ghc-boot, ghc-paths, haddock-library + , hspec, hspec-discover, QuickCheck, transformers, xhtml }: mkDerivation { pname = "haddock-api"; - version = "2.22.0"; - sha256 = "149q4zlf4m7wcrr4af2n2flh0jxjsypshbc229vsj1m0kmz4z014"; + version = "2.23.1"; + sha256 = "14dl17ajlr8354rmc49w4fsqxmrn0dl7wps3r4iipms5nhj5bm3d"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base bytestring Cabal containers deepseq directory filepath - ghc ghc-boot ghc-paths haddock-library transformers xhtml + array base bytestring containers deepseq directory filepath ghc + ghc-boot ghc-paths haddock-library transformers xhtml ]; testHaskellDepends = [ - array base bytestring Cabal containers deepseq directory filepath - ghc ghc-boot ghc-paths haddock-library hspec QuickCheck - transformers xhtml + array base bytestring containers deepseq directory filepath ghc + ghc-boot ghc-paths haddock-library hspec QuickCheck transformers + xhtml ]; testToolDepends = [ hspec-discover ]; description = "A documentation-generation tool for Haskell libraries"; @@ -108016,8 +109344,8 @@ self: { }: mkDerivation { pname = "haddock-api"; - version = "2.23.1"; - sha256 = "14dl17ajlr8354rmc49w4fsqxmrn0dl7wps3r4iipms5nhj5bm3d"; + version = "2.24.0"; + sha256 = "0bbyhwyshafzcfbzjyv1b09lb8bxcimpj3b605pw5gssxgjh1s8i"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath ghc @@ -108030,7 +109358,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "A documentation-generation tool for Haskell libraries"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.bsd2; }) {}; "haddock-cheatsheet" = callPackage @@ -108111,6 +109439,29 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "haddock-library_1_9_0" = callPackage + ({ mkDerivation, base, base-compat, bytestring, containers, deepseq + , directory, filepath, hspec, hspec-discover, optparse-applicative + , parsec, QuickCheck, text, transformers, tree-diff + }: + mkDerivation { + pname = "haddock-library"; + version = "1.9.0"; + sha256 = "0c37mhmvr4saw5m4snyj1nij786dwmk9kch7hafgd1xswb9k4c5c"; + libraryHaskellDepends = [ + base bytestring containers parsec text transformers + ]; + testHaskellDepends = [ + base base-compat bytestring containers deepseq directory filepath + hspec optparse-applicative parsec QuickCheck text transformers + tree-diff + ]; + testToolDepends = [ hspec-discover ]; + description = "Library exposing some functionality of Haddock"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haddock-test" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath , process, syb, xhtml, xml @@ -108159,8 +109510,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.17.3"; - sha256 = "00lyf2m6q866383q79b705xhn987504wz3fp3zh7m8580v8phy5p"; + version = "1.17.6"; + sha256 = "02xfkssxpyi7q7d1aj1gna8m4374pajqilbcgq0ii0hfrxiilc1k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108177,8 +109528,6 @@ self: { ]; description = "Dockerfile Linter JavaScript API"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hadoop-formats" = callPackage @@ -108223,14 +109572,15 @@ self: { }) {}; "hadoop-streaming" = callPackage - ({ mkDerivation, base, conduit, extra, hspec, hspec-discover, text + ({ mkDerivation, base, bytestring, conduit, extra, hspec + , hspec-discover, text }: mkDerivation { pname = "hadoop-streaming"; - version = "0.1.0.0"; - sha256 = "0nbmq0lb2dydc47x4i3gvbwyy216dzwcvirpsra06dcz2yi3vkmm"; - libraryHaskellDepends = [ base conduit extra text ]; - testHaskellDepends = [ base conduit extra hspec text ]; + version = "0.2.0.2"; + sha256 = "140kb8v9bz293v83w91zlf5qdm98gawsyvswh3yq533g2a5f5qs3"; + libraryHaskellDepends = [ base bytestring conduit extra text ]; + testHaskellDepends = [ base bytestring conduit extra hspec ]; testToolDepends = [ hspec-discover ]; description = "A simple Hadoop streaming library"; license = stdenv.lib.licenses.bsd3; @@ -108286,8 +109636,8 @@ self: { ({ mkDerivation, base, intervals, mtl, QuickCheck }: mkDerivation { pname = "hafar"; - version = "0.1.0.0"; - sha256 = "0qyly669y8nav9g3y8y74pxmvq47r1l541l5ncq7fn50kvhpmnrj"; + version = "0.1.1.0"; + sha256 = "1cr1qb2p55n3hazxd4c4ziwwwyl5y3acqp5hhhv9m68pn53nqpas"; libraryHaskellDepends = [ base intervals mtl ]; testHaskellDepends = [ base intervals mtl QuickCheck ]; description = "Affine arithmetic library for Haskell"; @@ -108386,8 +109736,8 @@ self: { }: mkDerivation { pname = "haiji"; - version = "0.3.2.0"; - sha256 = "1clxvpqwfsybfap746nq8g6gshdizjhbpafs09mnaxp7fi1196xz"; + version = "0.3.3.0"; + sha256 = "1fmdiimjk2cnafjb2v8xdbnlwp6m79khl920l8gv1jcvqjmv9vvs"; libraryHaskellDepends = [ aeson attoparsec base data-default mtl scientific tagged template-haskell text transformers unordered-containers vector @@ -108672,8 +110022,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.13.2.0"; - sha256 = "0g52lip9i6zanjja0v86v5sypjvnfpfwzzddrpj04pml733nsnfj"; + version = "4.13.3.0"; + sha256 = "1wadcvxpr7w1gm1pmi9j8bm6x0i44ik806j73mzfb1d4wb1ck10p"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -108883,7 +110233,7 @@ self: { libraryHaskellDepends = [ base containers data-default filepath hakyll ]; - description = "Allow Hakyll to create hierarchical menues from directories"; + description = "Allow Hakyll to create hierarchical menues from directories."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -109049,6 +110399,8 @@ self: { testHaskellDepends = [ base hspec mtl pandoc text ]; description = "Use shortcut-links in markdown file for Hakyll"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-typescript" = callPackage @@ -109501,13 +110853,15 @@ self: { ({ mkDerivation, base, containers, random }: mkDerivation { pname = "hanabi-dealer"; - version = "0.7.2.0"; - sha256 = "0w54ybsd7hkykifw0nsgr3mdss7945y76rbjmlk7zl9lqi780ia7"; + version = "0.9.1.0"; + sha256 = "1gksjmrz1rbkfm2cw1hfz74ws0hyxv3491fw6j2j5f1gjp46fwf7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers random ]; description = "Hanabi card game"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "handa-data" = callPackage @@ -109986,8 +111340,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.4.0.2"; - sha256 = "16f4rs4h3lznkci5axibliiwfr3vrm03arxcjfjiv6mypkcpnp2r"; + version = "2.4.0.3"; + sha256 = "1pz75kmvmbpki9k957ymwhj427ghpd9qqsjplgd5mz4v2ikpng50"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang @@ -110285,7 +111639,7 @@ self: { base containers happstack-data happstack-util mtl syb syb-with-class template-haskell ]; - description = "Efficient relational queries on Haskell sets"; + description = "Efficient relational queries on Haskell sets."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -110314,8 +111668,8 @@ self: { ({ mkDerivation, base, bytestring, happstack-server, mtl, text }: mkDerivation { pname = "happstack-lite"; - version = "7.3.6"; - sha256 = "1mvzpbmjgf5gv9ls5kmg0s6cr765jl701vy2kmbynjkg6jimjmp8"; + version = "7.3.7"; + sha256 = "12vyyjl0n9dqp8mh5279930rnbwaxxlzw34651sa7h9gir9hv1zv"; libraryHaskellDepends = [ base bytestring happstack-server mtl text ]; @@ -111835,8 +113189,8 @@ self: { pname = "haskell-awk"; version = "1.1.1"; sha256 = "0s6vzfsqh2wwsp98l8zpg6cvh7jwz5wha44idz3yavhmy6z08zgd"; - revision = "1"; - editedCabalFile = "1rrplmf2n4vkwisi367gi4a6yyh0ri2sdjqmdix7xyvfdad7m9cb"; + revision = "2"; + editedCabalFile = "1nq69vqp5dphhkq3h94c1gw2hpgyn2snnsig6kjwm4z60ww87viw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111952,23 +113306,22 @@ self: { "haskell-ci" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base-compat , bytestring, Cabal, cabal-install-parsers, containers, deepseq - , Diff, directory, exceptions, filepath, generic-lens, HsYAML - , lattices, microlens, mtl, network-uri, optparse-applicative - , parsec, pretty, process, tasty, tasty-golden, temporary, text - , transformers, unordered-containers + , Diff, directory, exceptions, filepath, generic-lens-lite, HsYAML + , lattices, mtl, network-uri, optparse-applicative, parsec, pretty + , process, tasty, tasty-golden, temporary, text, transformers + , unordered-containers }: mkDerivation { pname = "haskell-ci"; - version = "0.8"; - sha256 = "1wm5fs8fdy85lvjyy9n0yh66ax6bs0ll4gq7d8ba0ibsp69g6pm3"; + version = "0.10"; + sha256 = "09v103azd8rd1ps1h14f6rv8s9nga9ja679ma4j44236yfgswxg5"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ aeson base base-compat bytestring Cabal cabal-install-parsers - containers deepseq directory exceptions filepath generic-lens - HsYAML lattices microlens mtl network-uri optparse-applicative - parsec pretty process temporary text transformers - unordered-containers + containers deepseq directory exceptions filepath generic-lens-lite + HsYAML lattices mtl network-uri optparse-applicative parsec pretty + process temporary text transformers unordered-containers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -112295,22 +113648,22 @@ self: { }) {}; "haskell-gi" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers - , directory, doctest, filepath, glib, gobject-introspection - , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe - , text, transformers, xdg-basedir, xml-conduit + ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal + , containers, directory, doctest, filepath, glib + , gobject-introspection, haskell-gi-base, mtl, pretty-show, process + , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit }: mkDerivation { pname = "haskell-gi"; - version = "0.23.0"; - sha256 = "04d2lxmbbq7g0yrc5rz9n7zscza9g63vvbz0qv3427y7hbq1xn4a"; + version = "0.23.1"; + sha256 = "1jvl9b229b43pcnp9fadkls7ym9laqyjcdzwxzdc4j2mpchysva8"; libraryHaskellDepends = [ - attoparsec base bytestring Cabal containers directory filepath - haskell-gi-base mtl pretty-show process regex-tdfa safe text - transformers xdg-basedir xml-conduit + ansi-terminal attoparsec base bytestring Cabal containers directory + filepath haskell-gi-base mtl pretty-show process regex-tdfa safe + text transformers xdg-basedir xml-conduit ]; libraryPkgconfigDepends = [ glib gobject-introspection ]; - testHaskellDepends = [ base doctest process ]; + testHaskellDepends = [ attoparsec base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; @@ -112482,6 +113835,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-lsp_0_19_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, data-default, directory, filepath, hashable + , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl + , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay + , sorted-list, stm, temporary, text, time, unordered-containers + }: + mkDerivation { + pname = "haskell-lsp"; + version = "0.19.0.0"; + sha256 = "0cjmjrcd3rg8jc6rfk73jirmvay07jps9gdjd97clxz90w3mm24i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring containers data-default + directory filepath hashable haskell-lsp-types hslogger lens mtl + network-uri rope-utf16-splay sorted-list stm temporary text time + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable hspec lens network-uri QuickCheck quickcheck-instances + rope-utf16-splay sorted-list stm text + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-lsp" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, filepath, hashable @@ -112511,7 +113894,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp_0_21_0_0" = callPackage + "haskell-lsp_0_22_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, filepath, hashable , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl @@ -112520,8 +113903,8 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.21.0.0"; - sha256 = "0ic9gn5ww8vxmvidj28msark0nybj7fj1j5xsykiac5cgiy5ysnv"; + version = "0.22.0.0"; + sha256 = "0mh2b3dza633plxp370zhvml50kfx4szk4hrzmcfm6aij2di2l0w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112563,6 +113946,24 @@ self: { broken = true; }) {}; + "haskell-lsp-types_0_19_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, deepseq + , filepath, hashable, lens, network-uri, scientific, text + , unordered-containers + }: + mkDerivation { + pname = "haskell-lsp-types"; + version = "0.19.0.0"; + sha256 = "089rxcdz02hq68ihc26r7dwsn8hl7f7096vcb0dyd2jda0ganhm9"; + libraryHaskellDepends = [ + aeson base bytestring data-default deepseq filepath hashable lens + network-uri scientific text unordered-containers + ]; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-lsp-types" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, deepseq , filepath, hashable, lens, network-uri, scientific, text @@ -112580,15 +113981,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp-types_0_21_0_0" = callPackage + "haskell-lsp-types_0_22_0_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, data-default , deepseq, filepath, hashable, lens, network-uri, scientific, text , unordered-containers }: mkDerivation { pname = "haskell-lsp-types"; - version = "0.21.0.0"; - sha256 = "0x5xhn9vy09r0r76wvmzp6nh23y4p2kgm35p8qqqgvnx6w5cvi92"; + version = "0.22.0.0"; + sha256 = "05475d5rwkmsh50q18lans7zzd34jhfdpg80m7aijg829dkphskm"; libraryHaskellDepends = [ aeson base binary bytestring data-default deepseq filepath hashable lens network-uri scientific text unordered-containers @@ -112998,6 +114399,20 @@ self: { broken = true; }) {}; + "haskell-say" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "haskell-say"; + version = "1.0.0.0"; + sha256 = "1m7nif7w4fwk48hp6wzsp4ipi934gl1rb97mnc6364c7l24wgpx1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + description = "Let the Haskell logo talk to your users!"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-snake" = callPackage ({ mkDerivation, base, containers, lens, linear, mtl, random, sdl2 , sdl2-ttf, text, vector @@ -113760,8 +115175,8 @@ self: { }: mkDerivation { pname = "haskell-updater"; - version = "1.3.1"; - sha256 = "0q2aix579mm3ksi0hipcmw8g2p5xfbgk6ph7jnraq5i2rxjchg7v"; + version = "1.3.2"; + sha256 = "0z1f6qajg191fqfnkh3g2c1iq802yh1plxzvzwl822bzd49m32j9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -114088,7 +115503,7 @@ self: { version = "1.0.0"; sha256 = "0j1aqix21pqcsw7skl897pd1ir6hg836g4zb2h5338h4gih6blx0"; libraryHaskellDepends = [ base haskelldb hsql mtl old-time ]; - description = "HaskellDB support for HSQL"; + description = "HaskellDB support for HSQL."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -114591,6 +116006,37 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "haskoin-core_0_13_4" = callPackage + ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring + , cereal, conduit, containers, cryptonite, deepseq, entropy + , hashable, hspec, hspec-discover, HUnit, memory, mtl, murmur3 + , network, QuickCheck, safe, scientific, secp256k1-haskell, split + , string-conversions, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "haskoin-core"; + version = "0.13.4"; + sha256 = "0bxn1jfb2s308gpdiwwnvar606qc3fqnvf6k0hdz2x43pqkc15lb"; + libraryHaskellDepends = [ + aeson array base base16-bytestring bytestring cereal conduit + containers cryptonite deepseq entropy hashable memory mtl murmur3 + network safe scientific secp256k1-haskell split string-conversions + text time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson array base base16-bytestring bytestring cereal conduit + containers cryptonite deepseq entropy hashable hspec HUnit memory + mtl murmur3 network QuickCheck safe scientific secp256k1-haskell + split string-conversions text time transformers + unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Bitcoin & Bitcoin Cash library for Haskell"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskoin-crypto" = callPackage ({ mkDerivation, base, binary, byteable, bytestring, containers , cryptohash, haskoin-util, HUnit, mtl, QuickCheck, test-framework @@ -114625,8 +116071,8 @@ self: { }: mkDerivation { pname = "haskoin-node"; - version = "0.9.16"; - sha256 = "0k84jxlahk5axixn2y4hg63qbj6383hmidrrx2nll86vjifanv4f"; + version = "0.9.21"; + sha256 = "1yhrxw1j4ynrn7bp1lpnbi13d32pdzg8waf96gx3r6shybb9nx4k"; libraryHaskellDepends = [ base bytestring cereal conduit conduit-extra containers data-default hashable haskoin-core monad-logger mtl network nqe @@ -114647,6 +116093,38 @@ self: { broken = true; }) {}; + "haskoin-node_0_13_0" = callPackage + ({ mkDerivation, base, base64, bytestring, cereal, conduit + , conduit-extra, containers, data-default, hashable, haskoin-core + , hspec, hspec-discover, HUnit, monad-logger, mtl, network, nqe + , random, resourcet, rocksdb-haskell, rocksdb-query, safe + , string-conversions, text, time, transformers, unliftio + , unordered-containers + }: + mkDerivation { + pname = "haskoin-node"; + version = "0.13.0"; + sha256 = "0s6l25n9w4g5r2xafb6x1gdqaghfmrnzh9i3nn64c3g26xzk3vnp"; + libraryHaskellDepends = [ + base bytestring cereal conduit conduit-extra containers + data-default hashable haskoin-core monad-logger mtl network nqe + random resourcet rocksdb-haskell rocksdb-query string-conversions + text time transformers unliftio unordered-containers + ]; + testHaskellDepends = [ + base base64 bytestring cereal conduit conduit-extra containers + data-default hashable haskoin-core hspec HUnit monad-logger mtl + network nqe random resourcet rocksdb-haskell rocksdb-query safe + string-conversions text time transformers unliftio + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskoin Node P2P library for Bitcoin and Bitcoin Cash"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "haskoin-protocol" = callPackage ({ mkDerivation, base, binary, bytestring, haskoin-crypto , haskoin-util, HUnit, QuickCheck, test-framework @@ -114694,38 +116172,38 @@ self: { }) {}; "haskoin-store" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, conduit + ({ mkDerivation, aeson, base, base64, bytestring, cereal, conduit , containers, data-default, deepseq, filepath, hashable - , haskoin-core, haskoin-node, hspec, hspec-discover, http-types - , monad-logger, mtl, network, nqe, optparse-applicative, QuickCheck - , random, resourcet, rocksdb-haskell, rocksdb-query, scotty - , string-conversions, text, time, transformers, unliftio - , unordered-containers, wai, warp + , haskoin-core, haskoin-node, haskoin-store-data, hedis, hspec + , hspec-discover, http-types, monad-logger, mtl, network, nqe + , optparse-applicative, QuickCheck, random, rocksdb-haskell + , rocksdb-query, scotty, string-conversions, text, time + , transformers, unliftio, unordered-containers, wai, warp }: mkDerivation { pname = "haskoin-store"; - version = "0.20.0"; - sha256 = "1ljm662q0p3csq1f6xxyas6snv8bcr8vpl1m5n94nmjhb44qn44h"; + version = "0.29.3"; + sha256 = "1h28zn5fmps5jc2x2rx32z9yn7mz7j50ai4xs8mqzacsszj3sz95"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring cereal conduit containers data-default - deepseq hashable haskoin-core haskoin-node http-types monad-logger - mtl network nqe QuickCheck random resourcet rocksdb-haskell + deepseq hashable haskoin-core haskoin-node haskoin-store-data hedis + http-types monad-logger mtl network nqe random rocksdb-haskell rocksdb-query scotty string-conversions text time transformers unliftio unordered-containers wai warp ]; executableHaskellDepends = [ aeson base bytestring cereal conduit containers data-default - deepseq filepath hashable haskoin-core haskoin-node http-types - monad-logger mtl network nqe optparse-applicative QuickCheck random - resourcet rocksdb-haskell rocksdb-query scotty string-conversions - text time transformers unliftio unordered-containers wai warp + deepseq filepath hashable haskoin-core haskoin-node + haskoin-store-data monad-logger mtl nqe optparse-applicative random + string-conversions text time transformers unliftio + unordered-containers ]; testHaskellDepends = [ - aeson base bytestring cereal conduit containers data-default - deepseq hashable haskoin-core haskoin-node hspec http-types - monad-logger mtl network nqe QuickCheck random resourcet + aeson base base64 bytestring cereal conduit containers data-default + deepseq hashable haskoin-core haskoin-node haskoin-store-data hedis + hspec http-types monad-logger mtl network nqe QuickCheck random rocksdb-haskell rocksdb-query scotty string-conversions text time transformers unliftio unordered-containers wai warp ]; @@ -114736,6 +116214,29 @@ self: { broken = true; }) {}; + "haskoin-store-data" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, containers + , deepseq, hashable, haskoin-core, hspec, hspec-discover, network + , QuickCheck, scotty, string-conversions, text + }: + mkDerivation { + pname = "haskoin-store-data"; + version = "0.29.3"; + sha256 = "04ndllkxw3ly67d8irgjq8dhjvqh37qfcliz3978saa1i8bz3nav"; + libraryHaskellDepends = [ + aeson base bytestring cereal containers deepseq hashable + haskoin-core network scotty string-conversions text + ]; + testHaskellDepends = [ + aeson base bytestring cereal containers deepseq hashable + haskoin-core hspec network QuickCheck scotty string-conversions + text + ]; + testToolDepends = [ hspec-discover ]; + description = "Data for Haskoin Store"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "haskoin-util" = callPackage ({ mkDerivation, base, binary, bytestring, containers, either , HUnit, mtl, QuickCheck, test-framework, test-framework-hunit @@ -115749,16 +117250,16 @@ self: { "hasql-migration" = callPackage ({ mkDerivation, base, bytestring, contravariant, cryptonite - , data-default-class, directory, hasql, hasql-transaction, hspec - , memory, text, time, transformers + , directory, hasql, hasql-transaction, hspec, memory, text, time + , transformers }: mkDerivation { pname = "hasql-migration"; - version = "0.2.0"; - sha256 = "03dd0m2ggsv094nga0d8yaqcqb0r9ngdh3zvvr8127n9ka6805l1"; + version = "0.3.0"; + sha256 = "0qk9cds6crdbjrn0niv6dfaj2pa3qpmwh1l96rl2hvqyq2dz148q"; libraryHaskellDepends = [ - base bytestring contravariant cryptonite data-default-class - directory hasql hasql-transaction memory text time + base bytestring contravariant cryptonite directory hasql + hasql-transaction memory text time ]; testHaskellDepends = [ base bytestring hasql hasql-transaction hspec transformers @@ -115820,8 +117321,19 @@ self: { testHaskellDepends = [ base-prelude hasql hspec ]; description = "A pool of connections for Hasql"; license = stdenv.lib.licenses.mit; + }) {}; + + "hasql-pool_0_5_2" = callPackage + ({ mkDerivation, base-prelude, hasql, hspec, resource-pool, time }: + mkDerivation { + pname = "hasql-pool"; + version = "0.5.2"; + sha256 = "0l870d58a53akwbzgrcxfmz8mqc598qh1786d5ks937q0w219wlz"; + libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; + testHaskellDepends = [ base-prelude hasql hspec ]; + description = "A pool of connections for Hasql"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hasql-postgres" = callPackage @@ -115896,33 +117408,21 @@ self: { }) {}; "hasql-th" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , contravariant, fast-builder, foldl, hashable, hasql - , headed-megaparsec, hedgehog, megaparsec, parser-combinators - , selective, template-haskell, template-haskell-compat-v0208, text - , text-builder, tuple-th, unordered-containers, uuid, vector + ({ mkDerivation, base, bytestring, containers, contravariant, foldl + , hasql, postgresql-syntax, template-haskell + , template-haskell-compat-v0208, text, uuid, vector }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.6"; - sha256 = "0s9c2aa0mpxiqsvpaf3l5k2gqchrjv4x9jpjmw7v3ywnv9pcxpkf"; + version = "0.4.0.8"; + sha256 = "14h71s7dha1g0zfi3vsg5y6lsn09x8c9nqv1nqiqmw2m19adx7gi"; libraryHaskellDepends = [ - base bytestring case-insensitive containers contravariant - fast-builder foldl hashable hasql headed-megaparsec megaparsec - parser-combinators selective template-haskell - template-haskell-compat-v0208 text text-builder - unordered-containers uuid vector - ]; - testHaskellDepends = [ - base bytestring case-insensitive containers contravariant - fast-builder foldl hashable hasql headed-megaparsec hedgehog - megaparsec parser-combinators selective template-haskell text - text-builder tuple-th unordered-containers uuid vector + base bytestring containers contravariant foldl hasql + postgresql-syntax template-haskell template-haskell-compat-v0208 + text uuid vector ]; description = "Template Haskell utilities for Hasql"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hasql-transaction" = callPackage @@ -116754,7 +118254,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; + }) {inherit (pkgs) blas; liblapack = null;}; "hblock" = callPackage ({ mkDerivation, aeson, base, blaze-markup, bytestring, cereal @@ -117126,7 +118626,7 @@ self: { executableHaskellDepends = [ base directory HaskellForMaths QuickCheck text ]; - description = "Virtual Rubik's cube of arbitrary size"; + description = "Virtual Rubik's cube of arbitrary size."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -117647,8 +119147,6 @@ self: { ]; description = "More informative parser"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "headergen" = callPackage @@ -117696,6 +119194,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "headroom_0_2_2_1" = callPackage + ({ mkDerivation, aeson, base, doctest, either, file-embed, hspec + , mustache, optparse-applicative, pcre-light, QuickCheck, rio, time + , yaml + }: + mkDerivation { + pname = "headroom"; + version = "0.2.2.1"; + sha256 = "02s1s6v0fsn5a2anpi91za3dqafcp50lckr4xpir270l66lzdc2g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base either file-embed mustache optparse-applicative + pcre-light rio time yaml + ]; + executableHaskellDepends = [ base optparse-applicative rio ]; + testHaskellDepends = [ + aeson base doctest hspec optparse-applicative pcre-light QuickCheck + rio + ]; + description = "License Header Manager"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "heap" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -118028,8 +119551,8 @@ self: { pname = "hedgehog"; version = "1.0.2"; sha256 = "1058d5fcv3hhvlx34a8xkg8r75p93l2yhacdbga8d4radiayy34f"; - revision = "2"; - editedCabalFile = "1qh7yaijp04li1i10cd5j6bc58fcagynxxmvs32wc8m1fvgzi05w"; + revision = "3"; + editedCabalFile = "0y9glrf68jx8h8wsrrcdgxwmf0im1rh3g050mf0lk8iv0cdvdd2m"; libraryHaskellDepends = [ ansi-terminal async base bytestring concurrent-output containers directory erf exceptions fail lifted-async mmorph monad-control mtl @@ -118083,6 +119606,8 @@ self: { pname = "hedgehog-classes"; version = "0.2.4.1"; sha256 = "0qa938cy1bm3shq0l4rfdq5cmb54jjy0qpp6cmx1xjd6yrdqrkxc"; + revision = "2"; + editedCabalFile = "0fs236sygw068v7l70myv23r3wpy961jjfiwvfd3l93ifsjrxm79"; libraryHaskellDepends = [ aeson base binary comonad containers hedgehog pretty-show primitive semirings silently transformers wl-pprint-annotated @@ -119008,8 +120533,8 @@ self: { ({ mkDerivation, base, doctest, time }: mkDerivation { pname = "herf-time"; - version = "0.3.0"; - sha256 = "00ar1kb29gjvna7rcdg6wj3f22dil2pzbzy8zblvyc452zjy03y2"; + version = "0.3.1"; + sha256 = "06ai2f2l2g4lxvvly5wrr0yrz7fq3ljzympywcxqvyg7dbf6k6hc"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base doctest ]; description = "haskell time manipulation in a 'kerf like' style"; @@ -119747,6 +121272,29 @@ self: { broken = true; }) {}; + "hextream" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, Cabal + , cabal-doctest, containers, data-default, doctest, filepath + , parsers, pretty-simple, resourcet, streaming-attoparsec + , streaming-bytestring, tasty, tasty-golden, tasty-hunit, text + }: + mkDerivation { + pname = "hextream"; + version = "0.2.0.0"; + sha256 = "045q4glzqdl79w4baq4yvqjiqaih48p2iixkb3dv96nwmgr8xl8r"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-compat containers parsers text + ]; + testHaskellDepends = [ + attoparsec base base-compat data-default doctest filepath parsers + pretty-simple resourcet streaming-attoparsec streaming-bytestring + tasty tasty-golden tasty-hunit text + ]; + description = "Streaming-friendly XML parsers"; + license = stdenv.lib.licenses.cc0; + }) {}; + "heyefi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, configurator , directory, exceptions, filepath, HandsomeSoup, hspec, hspec-wai @@ -120180,8 +121728,8 @@ self: { }: mkDerivation { pname = "hgeometry-ipe"; - version = "0.9.0.0"; - sha256 = "1lj5yvxlgn8q1z2ad4ais7cksflsbyag9zdz6vii9r680swr0ib7"; + version = "0.10.0.0"; + sha256 = "1802yl65sy489s7pk58cd92qvzvdnw9z3ms6jr8wcrs6ipfqsa60"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bifunctors bytestring colour containers data-clist @@ -120609,32 +122157,33 @@ self: { "hid-examples" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, cassava - , Chart, Chart-diagrams, data-default, directory, doctest, extra - , filepath, fmt, hedgehog, hint, http-client, mtl - , optparse-applicative, random, req, safe, safe-exceptions, split - , system-locale, tasty, tasty-golden, tasty-hedgehog, tasty-hspec - , text, time, transformers, unix-compat + , Chart, Chart-diagrams, containers, criterion, deepseq, directory + , doctest, extra, filepath, fingertree, fmt, hedgehog, hint + , http-client, mtl, optparse-applicative, random, req, safe + , safe-exceptions, split, tasty, tasty-golden, tasty-hedgehog + , tasty-hspec, text, time, transformers, unix-compat }: mkDerivation { pname = "hid-examples"; - version = "0.4"; - sha256 = "11r2ln131axkw31afki3jnrz1md668z0qnvx915qwyppga62rk8l"; + version = "0.5"; + sha256 = "1hs0cpls8x89dvv0ws1swagz92vrfcn84nw7jdaidc850168dygx"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base hedgehog safe safe-exceptions split + base fingertree hedgehog safe safe-exceptions split ]; executableHaskellDepends = [ aeson base blaze-html bytestring cassava Chart Chart-diagrams - data-default directory extra filepath fmt hedgehog hint http-client - mtl optparse-applicative random req safe safe-exceptions - system-locale text time transformers unix-compat + containers directory extra filepath fmt hedgehog hint http-client + mtl optparse-applicative random req safe safe-exceptions text time + transformers unix-compat ]; testHaskellDepends = [ base doctest filepath hedgehog tasty tasty-golden tasty-hedgehog tasty-hspec ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; doHaddock = false; description = "Examples to accompany the book \"Haskell in Depth\""; license = stdenv.lib.licenses.bsd3; @@ -120702,8 +122251,35 @@ self: { ]; description = "Set up a GHC API session"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "hie-bios_0_5_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , conduit, conduit-extra, containers, cryptohash-sha1, deepseq + , directory, extra, file-embed, filepath, ghc, hslogger, process + , tasty, tasty-hunit, temporary, text, time, transformers + , unix-compat, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hie-bios"; + version = "0.5.0"; + sha256 = "1096d9i4xx1ca9csm2gqi4wnm8q8wya4a5k37qc5ihwix531wx02"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring conduit conduit-extra + containers cryptohash-sha1 deepseq directory extra file-embed + filepath ghc hslogger process temporary text time transformers + unix-compat unordered-containers vector yaml + ]; + executableHaskellDepends = [ base directory filepath ghc ]; + testHaskellDepends = [ + base directory extra filepath ghc tasty tasty-hunit text + unordered-containers yaml + ]; + description = "Set up a GHC API session"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hie-core" = callPackage @@ -121485,21 +123061,20 @@ self: { }) {}; "hint" = callPackage - ({ mkDerivation, base, containers, directory, exceptions - , extensible-exceptions, filepath, ghc, ghc-boot, ghc-paths, HUnit - , mtl, random, temporary, unix + ({ mkDerivation, base, containers, directory, exceptions, filepath + , ghc, ghc-boot, ghc-paths, HUnit, random, stm, temporary + , transformers, unix }: mkDerivation { pname = "hint"; - version = "0.9.0.2"; - sha256 = "06xnlfpf9h7i4fvm3p69accm18h7hblh7173040vlk5qvjywblhf"; + version = "0.9.0.3"; + sha256 = "0kp2hngmk2sf4ariv02rgrrd190zzb7nlk0pj8fq7rsckcxc87ra"; libraryHaskellDepends = [ - base directory exceptions filepath ghc ghc-boot ghc-paths mtl - random temporary unix + base directory exceptions filepath ghc ghc-boot ghc-paths random + temporary transformers unix ]; testHaskellDepends = [ - base containers directory exceptions extensible-exceptions filepath - HUnit unix + base containers directory exceptions filepath HUnit stm unix ]; description = "Runtime Haskell interpreter (GHC API wrapper)"; license = stdenv.lib.licenses.bsd3; @@ -121530,8 +123105,8 @@ self: { pname = "hinter"; version = "0.1.0.0"; sha256 = "0r790y7j64y79rqg7ip4dk5a8pbpryisp008lcmswzc0si35jfgl"; - revision = "2"; - editedCabalFile = "0jzaaiwviyw5as3pzjrsl19mrw0qsm4w08pywvl64ld3x2ldfj2y"; + revision = "3"; + editedCabalFile = "1l58br388rmqj6d30ar8i6ivjgx35v33gld9liih5x4mgx7jp0a1"; libraryHaskellDepends = [ base directory exceptions filepath ghc ghc-boot ghc-paths mtl random unix @@ -121554,8 +123129,8 @@ self: { }: mkDerivation { pname = "hinterface"; - version = "1.0.0"; - sha256 = "18vhpmhpfam1nbh5fgbcfjnmsnsbkzq9qmr64alldlvwf6brs0kp"; + version = "2.0.0"; + sha256 = "1n1mp34s0ks7hkd2ddhfva9pbjwkciy1jjmqznmca244xg095yia"; libraryHaskellDepends = [ array async base binary bytestring containers cryptonite deepseq exceptions lifted-async lifted-base memory monad-control @@ -121609,8 +123184,8 @@ self: { }: mkDerivation { pname = "hip"; - version = "1.5.5.0"; - sha256 = "1qy74a471bh849cil9b3f92gxgl3434x8hcvrzn83v3xa6vnh2cd"; + version = "1.5.6.0"; + sha256 = "122zcrid9x831hlv3dvh1afzffz2xg3s3k0dn1vf4b4cpd9w50mh"; libraryHaskellDepends = [ array base bytestring Chart Chart-diagrams colour deepseq directory filepath JuicyPixels netpbm primitive process random repa temporary @@ -122119,10 +123694,10 @@ self: { }: mkDerivation { pname = "hjsonschema"; - version = "1.9.0"; - sha256 = "051i5y557g82hd5zcn63f65jyxk07d9wnvfmwdps391zxza8ifki"; - revision = "2"; - editedCabalFile = "0110dyc8lbd8x0cbmxgwwbvzckxkfj84krd5p51p0jaixvrrl53r"; + version = "1.10.0"; + sha256 = "1ya93a1jh40aia3adrg2ipdzyxww6cpnzcdw41r51h8x6f2m0n77"; + revision = "1"; + editedCabalFile = "1563di5mfclj4ms6wd9vszdyghxpqm3r8q9vfkanw9wjlw7kq56q"; libraryHaskellDepends = [ aeson base bytestring containers file-embed filepath hashable hjsonpointer http-client http-client-tls http-types pcre-heavy @@ -122130,8 +123705,10 @@ self: { unordered-containers vector ]; testHaskellDepends = [ - aeson async base bytestring directory filepath hjsonpointer hspec - profunctors protolude QuickCheck text unordered-containers vector + aeson async base bytestring containers directory file-embed + filepath hashable hjsonpointer hspec http-client http-client-tls + http-types pcre-heavy profunctors protolude QuickCheck + safe-exceptions scientific text unordered-containers vector wai-app-static warp ]; description = "JSON Schema library"; @@ -122833,24 +124410,22 @@ self: { "hlint" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, data-default, directory, extra, file-embed - , filepath, filepattern, ghc, ghc-boot, ghc-boot-th - , ghc-lib-parser-ex, haskell-src-exts, haskell-src-exts-util + , filepath, filepattern, ghc-lib-parser, ghc-lib-parser-ex , hscolour, process, refact, text, transformers, uniplate , unordered-containers, utf8-string, vector, yaml }: mkDerivation { pname = "hlint"; - version = "2.2.11"; - sha256 = "1xyavrrxm1ihvga2j1k3h96wjpnjb30lk6mgiyrvx3rj7m7yq5bw"; + version = "3.1.1"; + sha256 = "1q3c7xjhzs0m1spd443nzpy7pxx6kjqklxvxkagfnjckxck8cpvv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal base bytestring cmdargs containers cpphs - data-default directory extra file-embed filepath filepattern ghc - ghc-boot ghc-boot-th ghc-lib-parser-ex haskell-src-exts - haskell-src-exts-util hscolour process refact text transformers - uniplate unordered-containers utf8-string vector yaml + data-default directory extra file-embed filepath filepattern + ghc-lib-parser ghc-lib-parser-ex hscolour process refact text + transformers uniplate unordered-containers utf8-string vector yaml ]; executableHaskellDepends = [ base ]; description = "Source code suggestions"; @@ -122877,8 +124452,8 @@ self: { pname = "hlist"; version = "0.0.0.0"; sha256 = "128y1l4bjyrsvx188mx58x8a98j7jk931h0nv5bprpxjkc71c32k"; - revision = "1"; - editedCabalFile = "0lrapxdl62xnhfbjw9i60zlq0360rrxxg4zapqxhdc1igb6259mn"; + revision = "2"; + editedCabalFile = "0qcvl0krnhyvvn857p1b6mc65mglbplywcmx8n8vb8ikw5vhkh68"; libraryHaskellDepends = [ base ]; description = "Heterogeneous list"; license = stdenv.lib.licenses.bsd3; @@ -122945,6 +124520,8 @@ self: { pname = "hlrdb"; version = "0.3.1.0"; sha256 = "19sxpyv331sjldanf40gw598gcj98n9xwc985cz9k2m38ck3vwhr"; + revision = "1"; + editedCabalFile = "0ikina8r7b3n7gywj0fclarj8g4m20wd23vxwlswikbx4f9mpwgf"; libraryHaskellDepends = [ base base64-bytestring bytestring cryptonite hashable hedis hlrdb-core memory random store time unordered-containers @@ -123106,7 +124683,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) liblapack;}; + }) {liblapack = null;}; "hmatrix-csv" = callPackage ({ mkDerivation, base, bytestring, cassava, hmatrix, vector }: @@ -123195,7 +124772,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; + }) {inherit (pkgs) blas; liblapack = null;}; "hmatrix-nipals" = callPackage ({ mkDerivation, base, hmatrix }: @@ -123979,6 +125556,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hoauth2_1_12_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, exceptions + , http-conduit, http-types, microlens, text, unordered-containers + , uri-bytestring, uri-bytestring-aeson + }: + mkDerivation { + pname = "hoauth2"; + version = "1.12.0"; + sha256 = "0v3brbwq07qa7fszdlxaf1q2nfxvr273qq7zg0x5nqvaa63ghdlc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring exceptions http-conduit http-types + microlens text unordered-containers uri-bytestring + uri-bytestring-aeson + ]; + description = "Haskell OAuth2 authentication client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hob" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango @@ -124372,8 +125970,8 @@ self: { }: mkDerivation { pname = "holmes"; - version = "0.2.0.0"; - sha256 = "13x48fvjfvh65c9cz3b81hk7ka43i0zz7gih7v3jpjwq0s7hqic8"; + version = "0.3.0.1"; + sha256 = "0b7ifnmg2n3jfb1zgdzy3fylifqq0mxp00r2iwp9wrnf29rdzxp3"; libraryHaskellDepends = [ base containers hashable hedgehog logict mtl primitive transformers unordered-containers @@ -124524,6 +126122,19 @@ self: { broken = true; }) {}; + "homura-stopwatch" = callPackage + ({ mkDerivation, base, hourglass, split }: + mkDerivation { + pname = "homura-stopwatch"; + version = "0.1.3"; + sha256 = "0daq08k77dscg8fcqh7pwpyyvjdv8xdl8gq37rwhrbinll177qs0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hourglass split ]; + executableHaskellDepends = [ base hourglass split ]; + license = stdenv.lib.licenses.mit; + }) {}; + "honi" = callPackage ({ mkDerivation, base, bytestring, freenect, hspec, HUnit, OpenNI2 , text @@ -125539,6 +127150,18 @@ self: { broken = true; }) {}; + "hout" = callPackage + ({ mkDerivation, base, do-notation, indexed }: + mkDerivation { + pname = "hout"; + version = "0.1.0.0"; + sha256 = "14facdqcfwc8f61rmzgkfx05pzbw6can9hc8aihnxsih9dznx4l2"; + libraryHaskellDepends = [ base indexed ]; + testHaskellDepends = [ base do-notation indexed ]; + description = "Non-interactive proof assistant monad for first-order logic"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hp2any-core" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , directory, filepath, network, old-locale, process, time @@ -125673,6 +127296,45 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hpack_0_34_1" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, cryptonite, deepseq, directory, filepath, Glob, hspec + , hspec-discover, http-client, http-client-tls, http-types, HUnit + , infer-license, interpolate, mockery, pretty, QuickCheck + , scientific, template-haskell, temporary, text, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.34.1"; + sha256 = "0c0nnhg6yjcr6rmw2ffminjivjj8hd00cbimfkm6blxzmmxsv46i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob hspec http-client http-client-tls + http-types HUnit infer-license interpolate mockery pretty + QuickCheck scientific template-haskell temporary text transformers + unordered-containers vector yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A modern format for Haskell packages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec @@ -125882,19 +127544,17 @@ self: { "hpath-directory" = callPackage ({ mkDerivation, base, bytestring, exceptions, hpath-filepath , hpath-posix, hspec, HUnit, IfElse, process, safe-exceptions - , streamly, streamly-bytestring, time, unix, unix-bytestring - , utf8-string + , streamly, streamly-bytestring, streamly-posix, time, transformers + , unix, unix-bytestring, utf8-string }: mkDerivation { pname = "hpath-directory"; - version = "0.13.2"; - sha256 = "1nxn1wz63h4wgspwnd1y4krf5k6adjbp1c3y0wr5kjhcnj4z20kl"; - revision = "1"; - editedCabalFile = "1zhrq3qcp4cx0djpx5bcw2f71kn16czqnb38k3cw78048q6mn7fg"; + version = "0.13.4"; + sha256 = "0cg80zsh0cwkaq4hd6y41afvn340a4byrk6h4dspiksgym5i8ny0"; libraryHaskellDepends = [ base bytestring exceptions hpath-filepath hpath-posix IfElse - safe-exceptions streamly streamly-bytestring time unix - unix-bytestring utf8-string + safe-exceptions streamly streamly-bytestring streamly-posix time + transformers unix unix-bytestring utf8-string ]; testHaskellDepends = [ base bytestring hpath-filepath hpath-posix hspec HUnit IfElse @@ -125922,8 +127582,8 @@ self: { }: mkDerivation { pname = "hpath-io"; - version = "0.13.1"; - sha256 = "0bpjr4hqwz7hlj81ndi2lyi95halm822mmpyw91pimq6k2m635wk"; + version = "0.13.2"; + sha256 = "10dph69qsl73k5rjvr5mvcplwgcmq7qylaxmr2yx7hzcjzsdgg4z"; libraryHaskellDepends = [ base bytestring exceptions hpath hpath-directory hpath-posix safe-exceptions streamly time unix @@ -125936,8 +127596,8 @@ self: { ({ mkDerivation, base, bytestring, hpath-filepath, unix }: mkDerivation { pname = "hpath-posix"; - version = "0.13.1"; - sha256 = "0axpzi2vl8cs3y5xsp1pa1fsgq13ry77rw8h8z5aivrzfvrj26d0"; + version = "0.13.2"; + sha256 = "1gxqrlxcm01ysd3hs61rhzfa3inxsj1w0hncydf1q66skshabzmf"; libraryHaskellDepends = [ base bytestring hpath-filepath unix ]; description = "Some low-level POSIX glue code, that is not in 'unix'"; license = stdenv.lib.licenses.bsd3; @@ -125980,6 +127640,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hpc-codecov_0_2_0_0" = callPackage + ({ mkDerivation, array, base, bytestring, directory, filepath, hpc + , tar, tasty, tasty-hunit + }: + mkDerivation { + pname = "hpc-codecov"; + version = "0.2.0.0"; + sha256 = "0ha97zldwbsx86ji4sjaw9jf7kzgrk41zabzdd1b6sdlf20p883k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring directory filepath hpc + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory filepath tar tasty tasty-hunit + ]; + description = "Generate codecov report from hpc data"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hpc-coveralls" = callPackage ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs , containers, curl, directory, directory-tree, hpc, HUnit, process @@ -126207,8 +127889,8 @@ self: { }: mkDerivation { pname = "hpp"; - version = "0.6.2"; - sha256 = "0k8rc2hnan346i3ykam8ps89n56vgcw91d9k1450klyi3l50b5xv"; + version = "0.6.3"; + sha256 = "0gnmkh0m640qc71bp63p4qkcbcyy1j9z0x6svfbd36cpqb6kdivs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126260,8 +127942,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.10.2.0"; - sha256 = "16x7innivjrnsamn6lrjg1a2v0wy1w6r3ariw3ncrwfpcfdmr45n"; + version = "1.10.2.1"; + sha256 = "06vx7llfyidldp5ar80a3dkw14xv19v1s8kc7kf6vs1gb3vx8r5n"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions fields-json hpqtypes lifted-base log-base monad-control mtl safe @@ -126782,6 +128464,18 @@ self: { license = "GPL"; }) {}; + "hs-bibutils_6_10_0_0" = callPackage + ({ mkDerivation, base, syb }: + mkDerivation { + pname = "hs-bibutils"; + version = "6.10.0.0"; + sha256 = "1wnpy1v5rbii2iwlcc9psnww8pkirv9zl21s64cmbi6q7dv15g3n"; + libraryHaskellDepends = [ base syb ]; + description = "Haskell bindings to bibutils, the bibliography conversion utilities"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hs-blake2" = callPackage ({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion , cryptohash, libb2, QuickCheck, tasty, tasty-quickcheck @@ -127482,6 +129176,8 @@ self: { executableHaskellDepends = [ base ]; description = "Convert an eventlog into the speedscope json format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-twitter" = callPackage @@ -128754,16 +130450,17 @@ self: { }) {}; "hsebaysdk" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client, http-types - , text, time, transformers, unordered-containers + ({ mkDerivation, aeson, base, bytestring, http-client + , http-client-tls, http-types, text, time, transformers + , unordered-containers }: mkDerivation { pname = "hsebaysdk"; - version = "0.4.0.0"; - sha256 = "00c9vwlmx4i2a436ajznv1bwaqj5lgq05gpc928vn59v27gx0f07"; + version = "0.4.1.0"; + sha256 = "0y1q667j0caqqaf57yjvcyyifvzpm4iwxk3y7awnp4c3ihf0ayb3"; libraryHaskellDepends = [ - aeson base bytestring http-client http-types text time transformers - unordered-containers + aeson base bytestring http-client http-client-tls http-types text + time transformers unordered-containers ]; description = "Haskell eBay SDK"; license = stdenv.lib.licenses.bsd3; @@ -128794,6 +130491,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsendxmpp" = callPackage + ({ mkDerivation, base, hslogger, pontarius-xmpp + , pontarius-xmpp-extras, string-class + }: + mkDerivation { + pname = "hsendxmpp"; + version = "0.1.2.0"; + sha256 = "16mjcxkd706kfv9ifs1vn1gqry0wq8zqfwl8mig6vvav18n79l6q"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base hslogger pontarius-xmpp pontarius-xmpp-extras string-class + ]; + description = "sendxmpp clone, sending XMPP messages via CLI"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsenv" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, file-embed , filepath, http-streams, io-streams, mtl, process, safe, split @@ -128857,8 +130572,6 @@ self: { ]; description = "EXIF handling library in pure Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hsfacter" = callPackage @@ -129020,8 +130733,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) blas; inherit (pkgs) gsl; - inherit (pkgs) liblapack;}; + }) {inherit (pkgs) blas; inherit (pkgs) gsl; liblapack = null;}; "hsilop" = callPackage ({ mkDerivation, base, directory, filepath, haskeline, xdg-basedir @@ -129197,6 +130909,8 @@ self: { pname = "hslogger"; version = "1.3.1.0"; sha256 = "0nyar9xcblx5jwks85y8f4jfy9k1h4ss6rvj4mdbiidrq3v688vz"; + revision = "1"; + editedCabalFile = "1g58f8lxcrmv4wh0k48car5lcl5j0k9lwfq5nfkjj9f5gim5yrc8"; libraryHaskellDepends = [ base bytestring containers deepseq network network-bsd old-locale time unix @@ -129333,10 +131047,8 @@ self: { }: mkDerivation { pname = "hslua-aeson"; - version = "1.0.0"; - sha256 = "0wvcf0adv2b5fn7mvi8p6ydzsyzbn43qyk1kjvvi9achrgvc59zz"; - revision = "1"; - editedCabalFile = "1ysgh5s99zv0khkwqw1kcli2r2vi77r7wz3yc0y0i7qr35shzklh"; + version = "1.0.1"; + sha256 = "13fmw1ajwc9xz2vsl2xaj6irij5c7sb5ifd774irajlcp31bwj8l"; libraryHaskellDepends = [ aeson base hashable hslua scientific text unordered-containers vector @@ -129349,6 +131061,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hslua-module-doclayout" = callPackage + ({ mkDerivation, base, doclayout, hslua, tasty, tasty-hunit + , tasty-lua, text + }: + mkDerivation { + pname = "hslua-module-doclayout"; + version = "0.1.0"; + sha256 = "1hkzddgz427fh69bdyiyx5vyngslw3ab9xjg7i5rfjhzzmsn0hha"; + libraryHaskellDepends = [ base doclayout hslua text ]; + testHaskellDepends = [ + base doclayout hslua tasty tasty-hunit tasty-lua + ]; + description = "Lua module wrapping Text.DocLayout."; + license = stdenv.lib.licenses.mit; + }) {}; + "hslua-module-system" = callPackage ({ mkDerivation, base, containers, directory, exceptions, hslua , tasty, tasty-hunit, temporary, text @@ -130034,8 +131762,8 @@ self: { }: mkDerivation { pname = "hspec-hedgehog"; - version = "0.0.1.1"; - sha256 = "1x61lslkpc67k7rbrggwabx6s60wv2v3iqarrb8746dgn0p225vj"; + version = "0.0.1.2"; + sha256 = "17gbr4ssnzjk7nvpsnh47av6vd9wz27ax92xvr4jwyw0z7h2wn13"; libraryHaskellDepends = [ base hedgehog hspec hspec-core HUnit QuickCheck splitmix ]; @@ -130344,6 +132072,18 @@ self: { broken = true; }) {}; + "hspec-tables" = callPackage + ({ mkDerivation, base, hspec, hspec-core }: + mkDerivation { + pname = "hspec-tables"; + version = "0.0.1"; + sha256 = "07z85920dr85kc763hfqd6rrzl81cc39cjgc0ymy95ycgpdz2w1q"; + libraryHaskellDepends = [ base hspec-core ]; + testHaskellDepends = [ base hspec hspec-core ]; + description = "Table-driven (by-example) HSpec tests"; + license = stdenv.lib.licenses.mit; + }) {}; + "hspec-test-framework" = callPackage ({ mkDerivation, base, hspec, hspec-contrib, hspec-core, HUnit , QuickCheck @@ -130604,7 +132344,7 @@ self: { sha256 = "0lz9zjy1xgjjbabbi2hcrvsnfid6c78y2cb2703qjwr93xy54f1f"; libraryHaskellDepends = [ base hsql old-time ]; librarySystemDepends = [ unixODBC ]; - description = "A Haskell Interface to ODBC"; + description = "A Haskell Interface to ODBC."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -130618,7 +132358,7 @@ self: { sha256 = "0yj0jalpapjvpxmc79yd6bn93ax13pp87dipbg2c9mxf3p38jc9z"; libraryHaskellDepends = [ base hsql old-time ]; librarySystemDepends = [ postgresql ]; - description = "A Haskell Interface to PostgreSQL via the PQ library"; + description = "A Haskell Interface to PostgreSQL via the PQ library."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -130936,18 +132676,20 @@ self: { }) {}; "hstar" = callPackage - ({ mkDerivation, archive-libarchive, archive-sig, base, bytestring - , bz2, cpphs, lz4-hs, lzlib, lzma, optparse-applicative, zlib, zstd + ({ mkDerivation, archive-libarchive, archive-sig, base, brotli + , bytestring, bz2, cpphs, lz4-hs, lzlib, lzma, lzo + , optparse-applicative, zlib, zstd }: mkDerivation { pname = "hstar"; - version = "0.1.0.0"; - sha256 = "0li4bvh92ijw5prwyrhcmrvi989w3b343yfbxjdhzqkwvpbp98ag"; + version = "0.1.0.4"; + sha256 = "1c28xbcg8lmh7zkpl8xpg30niv6adjk8zggwcxi72ylb9z2y3fqr"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ - archive-libarchive archive-sig base bytestring bz2 lz4-hs lzlib - lzma optparse-applicative zlib zstd + archive-libarchive archive-sig base brotli bytestring bz2 lz4-hs + lzlib lzma lzo optparse-applicative zlib zstd ]; executableToolDepends = [ cpphs ]; description = "Haskell version of tar CLI utility"; @@ -132212,6 +133954,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-client-openssl_0_3_1_0" = callPackage + ({ mkDerivation, base, bytestring, HsOpenSSL, hspec, http-client + , http-types, network + }: + mkDerivation { + pname = "http-client-openssl"; + version = "0.3.1.0"; + sha256 = "16h2f4ap35g63mdg66iihp10p1s4nwsrb06hplwm9i4akdr9gws2"; + libraryHaskellDepends = [ + base bytestring HsOpenSSL http-client network + ]; + testHaskellDepends = [ + base HsOpenSSL hspec http-client http-types + ]; + doCheck = false; + description = "http-client backend using the OpenSSL library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-client-overrides" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client , http-client-tls, http-types, network-uri, tasty, tasty-hunit @@ -132624,8 +134386,8 @@ self: { }: mkDerivation { pname = "http-io-streams"; - version = "0.1.2.0"; - sha256 = "1xn3lbpxsbl79qgaq9qmhlr78g44h0qpx0jyyb3z8q28z5p39wcy"; + version = "0.1.3.0"; + sha256 = "1m8nj92v21mgrb2mxlvc6smkpvd01664ng4kwikadb4j8bfpb15r"; libraryHaskellDepends = [ attoparsec base base64-bytestring blaze-builder brotli-streams bytestring case-insensitive containers directory HsOpenSSL @@ -132732,8 +134494,8 @@ self: { pname = "http-media"; version = "0.8.0.0"; sha256 = "0lww5cxrc9jlvzsysjv99lca33i4rb7cll66p3c0rdpmvz8pk0ir"; - revision = "2"; - editedCabalFile = "0qvkhbxdz33lis5vca3jm1b44fkm7aalf4iz1gblr8xivnpmq885"; + revision = "3"; + editedCabalFile = "1ndz5x6njl35h73il5c6qpaqd4ynvg21n6k7sb8aq09gfbg544d8"; libraryHaskellDepends = [ base bytestring case-insensitive containers utf8-string ]; @@ -133093,37 +134855,6 @@ self: { }: mkDerivation { pname = "http2"; - version = "2.0.3"; - sha256 = "14qh1g0f0m0gj8ciww7rh9mcsxxjyvp5sv3ggyyxb0qf3prhalds"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring case-insensitive containers http-types - network network-byte-order psqueues stm time-manager - ]; - testHaskellDepends = [ - aeson aeson-pretty array base base16-bytestring bytestring - case-insensitive containers directory doctest filepath Glob hspec - http-types network network-byte-order psqueues stm text - time-manager unordered-containers vector - ]; - benchmarkHaskellDepends = [ - array base bytestring case-insensitive containers gauge heaps - mwc-random network-byte-order psqueues stm - ]; - description = "HTTP/2 library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http2_2_0_4" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, base - , base16-bytestring, bytestring, case-insensitive, containers - , directory, doctest, filepath, gauge, Glob, heaps, hspec - , http-types, mwc-random, network, network-byte-order, psqueues - , stm, text, time-manager, unordered-containers, vector - }: - mkDerivation { - pname = "http2"; version = "2.0.4"; sha256 = "0rqfx6vvcrlic4sw5xlqzk3xvdsbw13d0ymppx8yjhkkzign6227"; isLibrary = true; @@ -133144,7 +134875,6 @@ self: { ]; description = "HTTP/2 library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http2-client" = callPackage @@ -133662,11 +135392,23 @@ self: { ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "2.0.0.1"; - sha256 = "0n7npk8ksp14f2ib47navmc50rlnqrcsgdnxmd5qylg431h15sfz"; + version = "2.0.0.2"; + sha256 = "07bsf9wv1i1mzhbj216n0k22k9mwpkcvnh4gin8z4zldpj0vyqm4"; + libraryHaskellDepends = [ base dejafu exceptions HUnit ]; + description = "Deja Fu support for the HUnit test framework"; + license = stdenv.lib.licenses.mit; + }) {}; + + "hunit-dejafu_2_0_0_3" = callPackage + ({ mkDerivation, base, dejafu, exceptions, HUnit }: + mkDerivation { + pname = "hunit-dejafu"; + version = "2.0.0.3"; + sha256 = "03kjpc26bpym06ccz0kvbid2n38xdq5j0nd1cywfjbii8zyjmgzg"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hunit-gui" = callPackage @@ -133833,16 +135575,15 @@ self: { }) {hunt-client = null;}; "hup" = callPackage - ({ mkDerivation, base, bytestring, cmdargs, directory, doctest - , filepath, Glob, hspec, hspec-core, hspec-wai, http-client - , http-client-tls, http-types, mtl, QuickCheck, shelly, simple - , split, tagsoup, tar, temporary, text, transformers, wai - , wai-extra, zlib + ({ mkDerivation, base, bytestring, cmdargs, directory, filepath + , hspec, hspec-core, hspec-wai, http-client, http-client-tls + , http-types, mtl, QuickCheck, shelly, simple, split, tagsoup, tar + , temporary, text, transformers, wai, wai-extra, zlib }: mkDerivation { pname = "hup"; - version = "0.3.0.0"; - sha256 = "1aby486naf17d3sp0mmhhpm9rvy3x85574zap6fjnkjvrr07b9iz"; + version = "0.3.0.2"; + sha256 = "05xgbdzy3jg9qpxrxrfb6mjydw80wa65gkjcpqj2ckmk0vd6hmhr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133854,9 +135595,8 @@ self: { transformers ]; testHaskellDepends = [ - base bytestring doctest filepath Glob hspec hspec-core hspec-wai - http-client http-types QuickCheck simple temporary transformers wai - wai-extra + base bytestring filepath hspec hspec-core hspec-wai http-client + http-types QuickCheck simple temporary transformers wai wai-extra ]; description = "Upload packages or documentation to a hackage server"; license = stdenv.lib.licenses.bsd2; @@ -133875,26 +135615,30 @@ self: { executableHaskellDepends = [ array base bytestring containers kangaroo ]; - description = "Extract function names from Windows DLLs"; + description = "Extract function names from Windows DLLs."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; "hurl" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, containers - , directory, filepath, http-client, http-client-tls, http-types - , network-uri, process, text, xml-conduit, zlib + ({ mkDerivation, async, base, base64-bytestring, bytestring + , connection, containers, directory, filepath, http-client + , http-client-tls, http-types, network-uri, process, text + , xml-conduit, zlib }: mkDerivation { pname = "hurl"; - version = "1.3.0.0"; - sha256 = "1fb70wsqpy5jq5w8vrd0qszrpg670mfh25kw4ldapiw652az7w69"; + version = "1.4.1.0"; + sha256 = "1n7688m5n5f62h59jjh2w5aa4ir87ni3x9wqnkc902crsqrgj2js"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base base64-bytestring bytestring containers directory filepath - http-client http-client-tls http-types network-uri process text - xml-conduit zlib + async base base64-bytestring bytestring connection containers + directory filepath http-client http-client-tls http-types + network-uri process text xml-conduit zlib ]; + executableHaskellDepends = [ base directory network-uri ]; description = "Haskell URL resolver"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -134064,14 +135808,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hvega_0_7_0_1" = callPackage + "hvega_0_8_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , filepath, tasty, tasty-golden, text, unordered-containers }: mkDerivation { pname = "hvega"; - version = "0.7.0.1"; - sha256 = "16s58m7kk72hr52k9gci17ac5k38r1zy08wll2frzjxissgza4cj"; + version = "0.8.0.0"; + sha256 = "1pz4wha9xg58zgxbfahgjz01s0frdk9mlns0m3bwcdgn26n5np68"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base text unordered-containers ]; @@ -134088,8 +135832,8 @@ self: { ({ mkDerivation, base, hvega, text }: mkDerivation { pname = "hvega-theme"; - version = "0.1.0.0"; - sha256 = "03rm4fl8vgl3yv60wx6vrj1dfbwsxwksm1dbiz0wzz1scdax1gc4"; + version = "0.2.0.4"; + sha256 = "0g2h5is0gbr43fn8pbfj2nzh4wlgx6kjayq4lcnbr10z0j3vpqpv"; libraryHaskellDepends = [ base hvega text ]; description = "Theme for hvega"; license = stdenv.lib.licenses.gpl3; @@ -134098,13 +135842,18 @@ self: { }) {}; "hw-aeson" = callPackage - ({ mkDerivation, aeson, base, hedgehog, hspec, text }: + ({ mkDerivation, aeson, base, doctest, doctest-discover, hedgehog + , hspec, hspec-discover, text + }: mkDerivation { pname = "hw-aeson"; - version = "0.1.0.2"; - sha256 = "11i0w0w5mi9k94p14c4pi1lsgwbr2cnnyhl7fbmxc7lqwr2a7k3s"; + version = "0.1.1.0"; + sha256 = "0d50yghgnxhynbm6w5kgkhgr8xgnghr8g1xn7zf0p9ax8dxkdy00"; libraryHaskellDepends = [ aeson base text ]; - testHaskellDepends = [ aeson base hedgehog hspec ]; + testHaskellDepends = [ + aeson base doctest doctest-discover hedgehog hspec + ]; + testToolDepends = [ doctest-discover hspec-discover ]; description = "Convenience functions for Aeson"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -134134,6 +135883,8 @@ self: { ]; description = "Demo library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-balancedparens" = callPackage @@ -134144,8 +135895,8 @@ self: { }: mkDerivation { pname = "hw-balancedparens"; - version = "0.3.0.5"; - sha256 = "0mc1qxng09891rpdw8g6cbx61b7pvvd7v4jm3ngzi5byamm0sbxp"; + version = "0.3.1.0"; + sha256 = "1nr3p3qcd72i4av71vf9kxv483mdg13c10dnpynabxfh7vx49vc9"; libraryHaskellDepends = [ base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim hw-rankselect-base vector @@ -134163,6 +135914,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-balancedparens_0_4_1_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, directory + , doctest, doctest-discover, generic-lens, hedgehog, hspec + , hspec-discover, hw-bits, hw-excess, hw-fingertree + , hw-hspec-hedgehog, hw-int, hw-prim, hw-rankselect-base, lens + , mmap, optparse-applicative, transformers, vector + }: + mkDerivation { + pname = "hw-balancedparens"; + version = "0.4.1.0"; + sha256 = "1ddxg00pwjvlrd4zdx9b9y7hm8rgxsxkvzzvwc34p2y75rivp21l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-int + hw-prim hw-rankselect-base vector + ]; + executableHaskellDepends = [ + base bytestring generic-lens hw-bits hw-prim lens mmap + optparse-applicative vector + ]; + testHaskellDepends = [ + base directory doctest doctest-discover hedgehog hspec hw-bits + hw-hspec-hedgehog hw-int hw-prim hw-rankselect-base transformers + vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion deepseq directory generic-lens hedgehog hw-bits + hw-prim lens vector + ]; + doHaddock = false; + description = "Balanced parentheses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-bits" = callPackage ({ mkDerivation, base, bitvec, bytestring, criterion, deepseq , doctest, doctest-discover, hedgehog, hspec, hspec-discover @@ -134170,8 +135958,8 @@ self: { }: mkDerivation { pname = "hw-bits"; - version = "0.7.1.5"; - sha256 = "0gvbsnirlgsj58363zqg960j0ydx2bhgw4lwql71jf9kg7hd4kqb"; + version = "0.7.2.0"; + sha256 = "1i985qgcvwphawh91qh2r1wvh8y4kfa7s7wwwr92pgw4qsrvfkzi"; libraryHaskellDepends = [ base bitvec bytestring deepseq hw-int hw-prim hw-string-parse vector @@ -134211,19 +135999,22 @@ self: { "hw-conduit" = callPackage ({ mkDerivation, array, base, bytestring, conduit - , conduit-combinators, criterion, hspec, hspec-discover, mmap, time - , transformers, unliftio-core, vector, word8 + , conduit-combinators, criterion, doctest, doctest-discover, hspec + , hspec-discover, mmap, time, transformers, unliftio-core, vector + , word8 }: mkDerivation { pname = "hw-conduit"; - version = "0.2.0.6"; - sha256 = "0z90nslvvd5lkzkivklln3kbpgpwn4l6b45bdn7nhn9qa50ii1rc"; + version = "0.2.1.0"; + sha256 = "1xnkkpqcgyii7f16jjh2k2qh4ydpsff5q2xnggyg4jf7m69yrih2"; libraryHaskellDepends = [ array base bytestring conduit conduit-combinators time transformers unliftio-core word8 ]; - testHaskellDepends = [ base bytestring conduit hspec ]; - testToolDepends = [ hspec-discover ]; + testHaskellDepends = [ + base bytestring conduit doctest doctest-discover hspec + ]; + testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ base bytestring conduit criterion mmap vector ]; @@ -134233,29 +136024,30 @@ self: { "hw-conduit-merges" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec - , mtl, QuickCheck + , hspec-discover, mtl, QuickCheck }: mkDerivation { pname = "hw-conduit-merges"; - version = "0.2.0.0"; - sha256 = "1302b2dsvv8yazvq5vz9cs2fbqvdsh6zyprijb41g881riqa5klv"; - revision = "1"; - editedCabalFile = "1azji7zc0ygqjgd2shbqw7p8a2ll2qp3b1yq5i3665448brlwpvc"; + version = "0.2.1.0"; + sha256 = "042i1cs7qpjs8q8birr6xjzyxp28y7l6isv2fwkisv4agx8kfgm0"; libraryHaskellDepends = [ base conduit conduit-extra mtl ]; testHaskellDepends = [ base bytestring conduit conduit-extra hspec mtl QuickCheck ]; + testToolDepends = [ hspec-discover ]; description = "Additional merges and joins for Conduit"; license = stdenv.lib.licenses.bsd3; }) {}; "hw-diagnostics" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, doctest, doctest-discover }: mkDerivation { pname = "hw-diagnostics"; - version = "0.0.0.7"; - sha256 = "1wfmrdpkvk2p045xchvwhnd1glq527ksgg0bs2qg5r0nyhsg55zi"; + version = "0.0.1.0"; + sha256 = "111g54c5bhgjii6vbyb116bg3dxywa9l693r8xjjrxpamzvi0avj"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest doctest-discover ]; + testToolDepends = [ doctest-discover ]; description = "Diagnostics library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -134266,24 +136058,25 @@ self: { , generic-lens, ghc-prim, hedgehog, hspec, hspec-discover, hw-bits , hw-hspec-hedgehog, hw-ip, hw-prim, hw-rankselect , hw-rankselect-base, hw-simd, lens, mmap, optparse-applicative - , resourcet, text, vector, weigh + , resourcet, text, transformers, vector, weigh }: mkDerivation { pname = "hw-dsv"; - version = "0.4.0"; - sha256 = "1cpjfq3z4q5wmnlaskrzxhyybb07andc7gli7vv7njm9552bwyvf"; - revision = "2"; - editedCabalFile = "167zvbxwjmb25xmhcdhrshk03b98kh5ldrf2b6a4v8xlkj4p33qm"; + version = "0.4.1.0"; + sha256 = "1wv0yg662c3bq4kpgfqfjks59v17i5h3v3mils1qpxn4c57jr3s8"; + revision = "1"; + editedCabalFile = "1xhdvqmqm44ky8mbwi64fj3bawqswf58ghlbj2bvk136yflvz2c7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bits-extra bytestring deepseq ghc-prim hw-bits hw-prim - hw-rankselect hw-rankselect-base hw-simd vector + hw-rankselect hw-rankselect-base hw-simd transformers vector ]; executableHaskellDepends = [ appar base bits-extra bytestring deepseq generic-lens ghc-prim hedgehog hw-bits hw-ip hw-prim hw-rankselect hw-rankselect-base - hw-simd lens optparse-applicative resourcet text vector + hw-simd lens optparse-applicative resourcet text transformers + vector ]; testHaskellDepends = [ base bits-extra bytestring cassava deepseq directory doctest @@ -134298,18 +136091,22 @@ self: { ]; description = "Unbelievably fast streaming DSV file parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-dump" = callPackage - ({ mkDerivation, base, bits-extra, bytestring, criterion - , generic-lens, hedgehog, hspec, hspec-discover, hw-bits - , hw-hspec-hedgehog, hw-prim, lens, optparse-applicative + ({ mkDerivation, base, bits-extra, bytestring, criterion, doctest + , doctest-discover, generic-lens, hedgehog, hspec, hspec-discover + , hw-bits, hw-hspec-hedgehog, hw-prim, lens, optparse-applicative , QuickCheck, safe, vector }: mkDerivation { pname = "hw-dump"; - version = "0.1.0.1"; - sha256 = "0iswbvvviaj1j34zvm04nzpjicwyzs5imc4rc8vkwmx41nlypxdv"; + version = "0.1.1.0"; + sha256 = "14ya18i3xvay5xn8j20b06msqyd49h34w526k1x1fxdp0i2l3rwr"; + revision = "1"; + editedCabalFile = "0v310296cxsv92k2rjrc9zrwh7yb7lkjwivndpbh5hv5p8ll0zm6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134320,10 +136117,10 @@ self: { optparse-applicative vector ]; testHaskellDepends = [ - base bits-extra bytestring hedgehog hspec hw-bits hw-hspec-hedgehog - hw-prim QuickCheck vector + base bits-extra bytestring doctest doctest-discover hedgehog hspec + hw-bits hw-hspec-hedgehog hw-prim QuickCheck vector ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ base bits-extra bytestring criterion hw-bits hw-prim vector ]; @@ -134333,17 +136130,18 @@ self: { "hw-eliasfano" = callPackage ({ mkDerivation, base, binary, bytestring, criterion, deepseq - , generic-lens, hedgehog, hspec, hspec-discover, hw-bits - , hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-packed-vector, hw-prim - , hw-rankselect, hw-rankselect-base, lens, mmap - , optparse-applicative, resourcet, temporary-resourcet, vector + , doctest, doctest-discover, generic-lens, hedgehog, hspec + , hspec-discover, hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-int + , hw-packed-vector, hw-prim, hw-rankselect, hw-rankselect-base + , lens, mmap, optparse-applicative, resourcet, temporary-resourcet + , vector }: mkDerivation { pname = "hw-eliasfano"; - version = "0.1.1.1"; - sha256 = "0fmbcddw13m49xvw8gnpjh246mw4k9h3hr94k956bi1vdvywyqv7"; + version = "0.1.2.0"; + sha256 = "1wqpzznmz6bl88wzhrfcbgi49dw7w7i0p92hyc0m58nanqm1zgnj"; revision = "1"; - editedCabalFile = "1i5in5h9jnx4p873qv80jmdd1ak6yyyf70002j3lhxyaxx9byy7k"; + editedCabalFile = "0qqshcj482x0yfmb76fj6ng57sf3i0r8daz93kzab8lscarh31j9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134356,10 +136154,11 @@ self: { resourcet temporary-resourcet vector ]; testHaskellDepends = [ - base hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog hw-int - hw-packed-vector hw-prim hw-rankselect hw-rankselect-base vector + base doctest doctest-discover hedgehog hspec hw-bits hw-hedgehog + hw-hspec-hedgehog hw-int hw-packed-vector hw-prim hw-rankselect + hw-rankselect-base vector ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ base bytestring criterion hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog hw-int hw-packed-vector hw-prim mmap vector @@ -134376,10 +136175,8 @@ self: { }: mkDerivation { pname = "hw-excess"; - version = "0.2.2.3"; - sha256 = "1rlw53nbhjdvjqb1f0kacnmiiwhx04az6p4mf0iv5fwxcjh94q2r"; - revision = "1"; - editedCabalFile = "1bll4amizah25w4c6xplndig77hd6jh65q6zjyr5x4vr11vg6xbx"; + version = "0.2.3.0"; + sha256 = "0xiyf3xyg6f4kgkils9ycx6q0qcsbd6rw4m9lizw9295mnp05s3g"; libraryHaskellDepends = [ base hw-bits hw-prim hw-rankselect-base safe vector ]; @@ -134396,85 +136193,90 @@ self: { }) {}; "hw-fingertree" = callPackage - ({ mkDerivation, base, deepseq, hedgehog, hspec, hspec-discover - , hw-hspec-hedgehog, hw-prim + ({ mkDerivation, base, deepseq, doctest, doctest-discover, hedgehog + , hspec, hspec-discover, hw-hspec-hedgehog, hw-prim }: mkDerivation { pname = "hw-fingertree"; - version = "0.1.1.1"; - sha256 = "01ghnnnbbrdy9s84rcw37v3yvlrw5awgdmcrzh0xd5dxpw557psf"; + version = "0.1.2.0"; + sha256 = "0b1aff5aa9ifapyf2qvqggxfm36x5w7l7c37bfy9qdll264pdh0i"; libraryHaskellDepends = [ base deepseq hw-prim ]; testHaskellDepends = [ - base deepseq hedgehog hspec hw-hspec-hedgehog + base deepseq doctest doctest-discover hedgehog hspec + hw-hspec-hedgehog ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; description = "Generic finger-tree structure, with example instances"; license = stdenv.lib.licenses.bsd3; }) {}; "hw-fingertree-strict" = callPackage - ({ mkDerivation, base, deepseq, hedgehog, hspec, hspec-discover - , HUnit, hw-hspec-hedgehog, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2 + ({ mkDerivation, base, deepseq, doctest, doctest-discover, hedgehog + , hspec, hspec-discover, HUnit, hw-hspec-hedgehog, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "hw-fingertree-strict"; - version = "0.1.1.3"; - sha256 = "1fy492nl10a7p9a0b0jrqj1yiar8wir2g3qms2mmd814brbfkm80"; - revision = "1"; - editedCabalFile = "1s7fcimgyf0vskkkms371icazjkkmscv9bkz2ysdhx708bza96v5"; + version = "0.1.2.0"; + sha256 = "1zhh694m8hbin7059ys8c6sqjvyfsazcsp0jxqg59w5ypqjznzca"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ - base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 + base doctest doctest-discover hedgehog hspec HUnit + hw-hspec-hedgehog QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; description = "Generic strict finger-tree structure"; license = stdenv.lib.licenses.bsd3; }) {}; "hw-hedgehog" = callPackage - ({ mkDerivation, base, hedgehog, vector }: + ({ mkDerivation, base, doctest, doctest-discover, hedgehog, vector + }: mkDerivation { pname = "hw-hedgehog"; - version = "0.1.0.5"; - sha256 = "1wnfgmybccznrm2i6rrkg87mwxqng9y115wsbf4r40y6pica7kbi"; + version = "0.1.1.0"; + sha256 = "0a2pic2h983kdkai68wabclzwjbk5i9vz229jlwvs0hyw6b0mzz9"; libraryHaskellDepends = [ base hedgehog vector ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest doctest-discover ]; + testToolDepends = [ doctest-discover ]; description = "Extra hedgehog functionality"; license = stdenv.lib.licenses.bsd3; }) {}; "hw-hspec-hedgehog" = callPackage - ({ mkDerivation, base, call-stack, hedgehog, hspec, hspec-discover - , HUnit, transformers + ({ mkDerivation, base, call-stack, doctest, doctest-discover + , hedgehog, hspec, hspec-discover, HUnit, transformers }: mkDerivation { pname = "hw-hspec-hedgehog"; - version = "0.1.0.9"; - sha256 = "1rfcz7fq7gp8xxlax8l1vfr88h9sh50ghs1iihy9jqv135d1dbky"; + version = "0.1.1.0"; + sha256 = "04r30hb4664yciwfl3kyx0xn6sqc6abwhavb4wxiaas8b4px9kyn"; libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit transformers ]; - testHaskellDepends = [ base call-stack hedgehog hspec HUnit ]; - testToolDepends = [ hspec-discover ]; + testHaskellDepends = [ + base call-stack doctest doctest-discover hedgehog hspec HUnit + ]; + testToolDepends = [ doctest-discover hspec-discover ]; description = "Interoperability between hspec and hedgehog"; license = stdenv.lib.licenses.bsd3; }) {}; "hw-int" = callPackage - ({ mkDerivation, base, hedgehog, hspec, hspec-discover, hw-hedgehog - , hw-hspec-hedgehog + ({ mkDerivation, base, doctest, doctest-discover, hedgehog, hspec + , hspec-discover, hw-hedgehog, hw-hspec-hedgehog }: mkDerivation { pname = "hw-int"; - version = "0.0.0.4"; - sha256 = "0im0fk23v6gh6hwfr35swai5fnvkpw0rrssc3s0ac978c899a8iz"; + version = "0.0.2.0"; + sha256 = "13ifa28b12hiibhmwas5hn3dmmiz2rihlc837hhii0z1ng03s360"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ - base hedgehog hspec hw-hedgehog hw-hspec-hedgehog + base doctest doctest-discover hedgehog hspec hw-hedgehog + hw-hspec-hedgehog ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; description = "Additional facilities for Integers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -134487,10 +136289,8 @@ self: { }: mkDerivation { pname = "hw-ip"; - version = "2.4.1.0"; - sha256 = "1zjl078xzing927fwwpck36ib8z5aggpi7g0z5gnhxd8isgqs6zh"; - revision = "1"; - editedCabalFile = "1dg3aa6wavdr3vh7va3yx3j272pb4zw48rm7r5a6xv6xrrd01a33"; + version = "2.4.2.0"; + sha256 = "1bvh4fkg1ffr3y8wink62rgkynlcgjhmra7a4w01h1dmw1vb2vfx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134512,18 +136312,20 @@ self: { "hw-json" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , bits-extra, bytestring, criterion, directory, dlist, generic-lens - , hedgehog, hspec, hspec-discover, hw-balancedparens, hw-bits - , hw-hspec-hedgehog, hw-json-simd, hw-json-simple-cursor - , hw-json-standard-cursor, hw-mquery, hw-parser, hw-prim - , hw-rankselect, hw-rankselect-base, hw-simd, lens, mmap - , optparse-applicative, scientific, text, transformers, vector - , word8 + , bits-extra, bytestring, criterion, directory, dlist, doctest + , doctest-discover, generic-lens, hedgehog, hspec, hspec-discover + , hw-balancedparens, hw-bits, hw-hspec-hedgehog, hw-json-simd + , hw-json-simple-cursor, hw-json-standard-cursor, hw-mquery + , hw-parser, hw-prim, hw-rankselect, hw-rankselect-base, hw-simd + , lens, mmap, optparse-applicative, scientific, text, transformers + , unordered-containers, vector, word8 }: mkDerivation { pname = "hw-json"; - version = "1.3.1.1"; - sha256 = "0w0k8zkswpvawp3ni3av8ak18a8wj509dll0v3cq7i4lljv51b5l"; + version = "1.3.2.0"; + sha256 = "00pdd813phgfi9g9xs6r7iw03iifwmlzfb0b424q1cq6d9z37v2f"; + revision = "2"; + editedCabalFile = "1lg2l399fnx7vg2bxf6chcwpl9q3pblzrmwzzijxczvyfrsy5m41"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134533,59 +136335,66 @@ self: { hw-rankselect-base hw-simd mmap text vector word8 ]; executableHaskellDepends = [ - base bytestring dlist generic-lens hw-balancedparens hw-json-simd - hw-json-simple-cursor hw-json-standard-cursor hw-mquery hw-prim - hw-rankselect hw-rankselect-base lens mmap optparse-applicative - text vector + aeson base bytestring dlist generic-lens hw-balancedparens + hw-json-simd hw-json-simple-cursor hw-json-standard-cursor + hw-mquery hw-prim hw-rankselect hw-rankselect-base lens mmap + optparse-applicative text unordered-containers vector ]; testHaskellDepends = [ - aeson attoparsec base bytestring hedgehog hspec hw-balancedparens - hw-bits hw-hspec-hedgehog hw-json-simple-cursor - hw-json-standard-cursor hw-prim hw-rankselect hw-rankselect-base - scientific text transformers vector + aeson attoparsec base bytestring doctest doctest-discover hedgehog + hspec hw-balancedparens hw-bits hw-hspec-hedgehog + hw-json-simple-cursor hw-json-standard-cursor hw-prim hw-rankselect + hw-rankselect-base scientific text transformers vector ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ base bytestring criterion directory hw-json-standard-cursor mmap ]; description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-json-lens" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, hedgehog - , hspec, hspec-discover, hw-balancedparens, hw-bits - , hw-hspec-hedgehog, hw-json, hw-json-standard-cursor, hw-prim - , lens, scientific, text, vector, word8 + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , doctest, doctest-discover, hedgehog, hspec, hspec-discover + , hw-balancedparens, hw-bits, hw-hspec-hedgehog, hw-json + , hw-json-standard-cursor, hw-prim, lens, scientific, text, vector + , word8 }: mkDerivation { pname = "hw-json-lens"; - version = "0.2.0.0"; - sha256 = "0byl0hqizqgpbajcgid0xca6jiqzm6syiz48jlywzg27niv3xdpd"; + version = "0.2.1.0"; + sha256 = "1v3ws69pyrw5ja00r326kqlq6hd7r5np119fk2la7f74aqhajjf6"; + revision = "1"; + editedCabalFile = "1gxqds8889dzkfncnlncjb7avw4zm7dzj3063mq4rsb05gyrplhz"; libraryHaskellDepends = [ - base bytestring containers hw-json lens scientific text word8 + aeson base bytestring containers hw-json lens scientific text word8 ]; testHaskellDepends = [ - base bytestring hedgehog hspec hw-balancedparens hw-bits - hw-hspec-hedgehog hw-json hw-json-standard-cursor hw-prim lens - vector + base bytestring doctest doctest-discover hedgehog hspec + hw-balancedparens hw-bits hw-hspec-hedgehog hw-json + hw-json-standard-cursor hw-prim lens vector ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ base bytestring criterion hw-json lens ]; description = "Lens for hw-json"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-json-simd" = callPackage - ({ mkDerivation, base, bytestring, c2hs, hw-prim, lens - , optparse-applicative, vector + ({ mkDerivation, base, bytestring, c2hs, doctest, doctest-discover + , hw-prim, lens, optparse-applicative, transformers, vector }: mkDerivation { pname = "hw-json-simd"; - version = "0.1.0.4"; - sha256 = "1qpk7vzya28y56qlb2fmx3ic39n9x2z8dh932rn0fp2d8n4dw8sa"; + version = "0.1.1.0"; + sha256 = "0bpfyx2bd7pcr8y8bfahcdm30bznqixfawraq3xzy476vy9ppa9n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring hw-prim lens vector ]; @@ -134593,22 +136402,30 @@ self: { executableHaskellDepends = [ base bytestring hw-prim lens optparse-applicative vector ]; - testHaskellDepends = [ base bytestring hw-prim lens vector ]; + testHaskellDepends = [ + base bytestring doctest doctest-discover hw-prim lens transformers + vector + ]; + testToolDepends = [ doctest-discover ]; description = "SIMD-based JSON semi-indexer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-json-simple-cursor" = callPackage - ({ mkDerivation, base, bytestring, criterion, directory - , generic-lens, hedgehog, hspec, hspec-discover, hw-balancedparens - , hw-bits, hw-hspec-hedgehog, hw-json-simd, hw-prim, hw-rankselect - , hw-rankselect-base, lens, mmap, optparse-applicative, text - , vector, word8 + ({ mkDerivation, base, bytestring, criterion, directory, doctest + , doctest-discover, generic-lens, hedgehog, hspec, hspec-discover + , hw-balancedparens, hw-bits, hw-hspec-hedgehog, hw-json-simd + , hw-prim, hw-rankselect, hw-rankselect-base, lens, mmap + , optparse-applicative, text, vector, word8 }: mkDerivation { pname = "hw-json-simple-cursor"; - version = "0.1.0.2"; - sha256 = "1yknymn8flni5bkfifaxmkv6b6r530ljvm6vx9m3kqwzikly9lpn"; + version = "0.1.1.0"; + sha256 = "1kwxnqsa2mkw5sa8rc9rixjm6f75lyjdaz7f67yyhwls5v4315bl"; + revision = "2"; + editedCabalFile = "144afi48rm613gcb8gccfyw5ybx9mzsfzsfq1nvsmlyijl8rgc1x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134621,28 +136438,32 @@ self: { text vector ]; testHaskellDepends = [ - base bytestring hedgehog hspec hw-balancedparens hw-bits - hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base vector + base bytestring doctest doctest-discover hedgehog hspec + hw-balancedparens hw-bits hw-hspec-hedgehog hw-prim hw-rankselect + hw-rankselect-base vector ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ base bytestring criterion directory mmap ]; description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-json-standard-cursor" = callPackage ({ mkDerivation, array, base, bits-extra, bytestring, criterion - , directory, generic-lens, hedgehog, hspec, hspec-discover - , hw-balancedparens, hw-bits, hw-hspec-hedgehog, hw-json-simd - , hw-prim, hw-rankselect, hw-rankselect-base, lens, mmap - , optparse-applicative, text, vector, word8 + , directory, doctest, doctest-discover, generic-lens, hedgehog + , hspec, hspec-discover, hw-balancedparens, hw-bits + , hw-hspec-hedgehog, hw-json-simd, hw-prim, hw-rankselect + , hw-rankselect-base, lens, mmap, optparse-applicative, text + , vector, word8 }: mkDerivation { pname = "hw-json-standard-cursor"; - version = "0.2.1.2"; - sha256 = "1lfbzfbpzn06gyv35s0sbc14n7ccwfqci7yikq78a7iwypkb9nff"; + version = "0.2.3.1"; + sha256 = "1mpsspp6ba2zqv38a0rcv93mbwb1rb8snmxklf32g02djj8b4vir"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134656,15 +136477,18 @@ self: { text vector ]; testHaskellDepends = [ - base bytestring hedgehog hspec hw-balancedparens hw-bits - hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base vector + base bits-extra bytestring doctest doctest-discover hedgehog hspec + hw-balancedparens hw-bits hw-hspec-hedgehog hw-prim hw-rankselect + hw-rankselect-base vector ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ base bytestring criterion directory mmap ]; description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-kafka-avro" = callPackage @@ -134675,8 +136499,8 @@ self: { }: mkDerivation { pname = "hw-kafka-avro"; - version = "5.0.0"; - sha256 = "1j2al3xmymjzqc6009wm83b3bpddgshsmrlgp5129801bssc8s5w"; + version = "5.1.0"; + sha256 = "11j1c881g08vgyaf26rfylydii0zk824i210pxb393616npyg9h5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134691,17 +136515,19 @@ self: { ]; description = "Avro support for Kafka infrastructure"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-kafka-client" = callPackage ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers - , either, hspec, monad-loops, random, rdkafka, text, transformers - , unix + , either, hspec, hspec-discover, monad-loops, random, rdkafka, text + , transformers, unix }: mkDerivation { pname = "hw-kafka-client"; - version = "3.0.0"; - sha256 = "1b2f9mxlnvd1jmnhpvsliy8b1xcygmgqdanggmdi44iikchmv62y"; + version = "3.1.0"; + sha256 = "0dnqswvkxqwvhcxkr2vh5qskbj4dmqm52n17y57n4nk5wkr30knz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134713,6 +136539,7 @@ self: { base bifunctors bytestring containers either hspec monad-loops random text transformers ]; + testToolDepends = [ hspec-discover ]; description = "Kafka bindings for Haskell"; license = stdenv.lib.licenses.mit; }) {inherit (pkgs) rdkafka;}; @@ -134720,12 +136547,13 @@ self: { "hw-kafka-conduit" = callPackage ({ mkDerivation, base, bifunctors, bytestring, conduit , conduit-extra, containers, exceptions, extra, hspec - , hw-kafka-client, mtl, QuickCheck, resourcet, transformers + , hspec-discover, hw-kafka-client, mtl, QuickCheck, resourcet + , transformers }: mkDerivation { pname = "hw-kafka-conduit"; - version = "2.6.0"; - sha256 = "0z3rhxzj8zni2z0mb7aka21dblyniqby0qf2y6cnnjw6gmvrkc1b"; + version = "2.7.0"; + sha256 = "1ld0kmfk0i87rqyk4hxnrchl4asjy6bf6qvp5f1dcrp69r02mqy0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134736,42 +136564,45 @@ self: { base bifunctors bytestring conduit conduit-extra containers extra hspec hw-kafka-client mtl QuickCheck resourcet transformers ]; + testToolDepends = [ hspec-discover ]; description = "Conduit bindings for hw-kafka-client"; license = stdenv.lib.licenses.mit; }) {}; "hw-mquery" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, dlist, hedgehog, hspec - , hspec-discover, hw-hspec-hedgehog, lens, semigroups + ({ mkDerivation, ansi-wl-pprint, base, dlist, doctest + , doctest-discover, hedgehog, hspec, hspec-discover + , hw-hspec-hedgehog, lens }: mkDerivation { pname = "hw-mquery"; - version = "0.2.0.2"; - sha256 = "1vcxyin3cyc0pkhbfjyjm4r44yxk17gny5jhfg6hdlgivp150yij"; + version = "0.2.1.0"; + sha256 = "1qhd8jcwffr57mjraw0g3xj9kb0jd75ybqaj1sbxw31lc2hr9w9j"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - ansi-wl-pprint base dlist lens semigroups - ]; + libraryHaskellDepends = [ ansi-wl-pprint base dlist lens ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base dlist hedgehog hspec hw-hspec-hedgehog lens + base dlist doctest doctest-discover hedgehog hspec + hw-hspec-hedgehog lens ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; description = "Monadic query DSL"; license = stdenv.lib.licenses.bsd3; }) {}; "hw-packed-vector" = callPackage ({ mkDerivation, base, binary, bytestring, criterion, deepseq - , directory, generic-lens, hedgehog, hspec, hspec-discover, hw-bits - , hw-hedgehog, hw-hspec-hedgehog, hw-prim, lens - , optparse-applicative, vector + , directory, doctest, doctest-discover, generic-lens, hedgehog + , hspec, hspec-discover, hw-bits, hw-hedgehog, hw-hspec-hedgehog + , hw-prim, lens, optparse-applicative, vector }: mkDerivation { pname = "hw-packed-vector"; - version = "0.2.0.1"; - sha256 = "12181b9fp11cdgf6xngjla9012j8rag3zcssz70x5a7xxgnwfmfc"; + version = "0.2.1.0"; + sha256 = "13hly2yzx6kx4j56iksgj4i3wmvg7rmxq57d0g87lmybzhha9q38"; + revision = "1"; + editedCabalFile = "070ac32s0azzhnqwrvhnfa18sxn60ayhmlikr6zk4vl1v03y0xbc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134782,10 +136613,10 @@ self: { optparse-applicative vector ]; testHaskellDepends = [ - base bytestring hedgehog hspec hw-bits hw-hedgehog - hw-hspec-hedgehog hw-prim vector + base bytestring doctest doctest-discover hedgehog hspec hw-bits + hw-hedgehog hw-hspec-hedgehog hw-prim vector ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ base criterion directory hedgehog hspec hw-prim vector ]; @@ -134794,18 +136625,21 @@ self: { }) {}; "hw-parser" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, hedgehog, hspec - , hspec-discover, hw-hspec-hedgehog, hw-prim, text + ({ mkDerivation, attoparsec, base, bytestring, doctest + , doctest-discover, hedgehog, hspec, hspec-discover + , hw-hspec-hedgehog, hw-prim, text }: mkDerivation { pname = "hw-parser"; - version = "0.1.0.2"; - sha256 = "170dk943s2jbqqggxxfjxj23fbfk1532hgsrg63mr0v1ag9hlz1i"; + version = "0.1.1.0"; + sha256 = "1zsbw725mw3fn4814qricqanbvx1kgbnqvgwijqgfv8jz7yf5gxa"; libraryHaskellDepends = [ attoparsec base bytestring hw-prim text ]; - testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; - testToolDepends = [ hspec-discover ]; + testHaskellDepends = [ + base doctest doctest-discover hedgehog hspec hw-hspec-hedgehog + ]; + testToolDepends = [ doctest-discover hspec-discover ]; description = "Simple parser support"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -134813,27 +136647,25 @@ self: { "hw-prim" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, directory , doctest, doctest-discover, exceptions, ghc-prim, hedgehog, hspec - , hspec-discover, hw-hspec-hedgehog, mmap, QuickCheck, semigroups - , transformers, unliftio-core, vector + , hspec-discover, hw-hspec-hedgehog, mmap, QuickCheck, transformers + , unliftio-core, vector }: mkDerivation { pname = "hw-prim"; - version = "0.6.2.40"; - sha256 = "0vm5mcnlb5yas2z7rvzd1kzv39d3qw4bkrkfmv0i7vsdg33yb3fd"; - revision = "1"; - editedCabalFile = "04pzny5b3hk8jjzh89bgz01hdc5z3ygn6a8pw81xky4m1gw7jc6b"; + version = "0.6.3.0"; + sha256 = "0gqn7s0ki9x951n5whyh0pkcbbqz4kpcn80xxpsv1c0v34946xv7"; libraryHaskellDepends = [ - base bytestring deepseq ghc-prim mmap semigroups transformers - unliftio-core vector + base bytestring deepseq ghc-prim mmap transformers unliftio-core + vector ]; testHaskellDepends = [ base bytestring directory doctest doctest-discover exceptions - hedgehog hspec hw-hspec-hedgehog mmap QuickCheck semigroups - transformers vector + hedgehog hspec hw-hspec-hedgehog mmap QuickCheck transformers + vector ]; testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ - base bytestring criterion mmap semigroups transformers vector + base bytestring criterion mmap transformers vector ]; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; @@ -134869,10 +136701,10 @@ self: { }: mkDerivation { pname = "hw-rankselect"; - version = "0.13.3.2"; - sha256 = "1p4b5nm8mgxlc7p5gcwh6dy85xgydpbw999zv27755dbfcv9nk4v"; + version = "0.13.4.0"; + sha256 = "0chk3n4vb55px943w0l3q7pxhgbvqm64vn7lkhi7k0l2dpybycp7"; revision = "1"; - editedCabalFile = "1byrp7zda5pxcd22jwsb16gr6kw1w7j1d7xyyn67c14fm3vym1mr"; + editedCabalFile = "03p711rvs3qn9x5rfc90yxrbyp5fqsi9i2wbiwrs3vq6if66vc5z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134899,25 +136731,24 @@ self: { }) {}; "hw-rankselect-base" = callPackage - ({ mkDerivation, base, bits-extra, bitvec, criterion, hedgehog - , hspec, hspec-discover, hw-bits, hw-hedgehog, hw-hspec-hedgehog - , hw-int, hw-prim, hw-string-parse, QuickCheck, vector + ({ mkDerivation, base, bits-extra, bitvec, criterion, doctest + , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits + , hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse + , QuickCheck, vector }: mkDerivation { pname = "hw-rankselect-base"; - version = "0.3.3.0"; - sha256 = "17h4kmi9zcgm4sdpbmqh6rzygz7w0v95lfc6rmhc9a8bmmg30i5b"; - revision = "1"; - editedCabalFile = "03svpzjia8mbgy33lhmjhwpd6yq0n97l3fkmfnpyi3blc3yb3bd0"; + version = "0.3.4.0"; + sha256 = "0rfk06fwmvpw2s7m397xm2s0831ad743325pv6yrd7019jcbiayl"; libraryHaskellDepends = [ base bits-extra bitvec hw-bits hw-int hw-prim hw-string-parse vector ]; testHaskellDepends = [ - base bits-extra bitvec hedgehog hspec hw-bits hw-hedgehog - hw-hspec-hedgehog hw-prim QuickCheck vector + base bits-extra bitvec doctest doctest-discover hedgehog hspec + hw-bits hw-hedgehog hw-hspec-hedgehog hw-prim QuickCheck vector ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ base bits-extra criterion hw-bits hw-prim vector ]; @@ -134927,59 +136758,61 @@ self: { "hw-simd" = callPackage ({ mkDerivation, base, bits-extra, bytestring, c2hs, cassava - , containers, criterion, deepseq, directory, hedgehog, hspec - , hspec-discover, hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-prim - , hw-rankselect, hw-rankselect-base, lens, mmap, text, vector + , containers, criterion, deepseq, directory, doctest + , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits + , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect + , hw-rankselect-base, lens, mmap, text, transformers, vector }: mkDerivation { pname = "hw-simd"; - version = "0.1.1.5"; - sha256 = "0nhy3hi7gxbbjwh6rj4459nzbmlij2cjdg2zvdjgx3z3j5algqyb"; + version = "0.1.2.0"; + sha256 = "1r202xzqprb1v8ajd9n6ixckjfdy17mn8jibx4j2xgknx595v24f"; libraryHaskellDepends = [ base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect - hw-rankselect-base vector + hw-rankselect-base transformers vector ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ - base bits-extra bytestring deepseq directory hedgehog hspec hw-bits - hw-hedgehog hw-hspec-hedgehog hw-prim hw-rankselect - hw-rankselect-base lens text vector + base bits-extra bytestring deepseq directory doctest + doctest-discover hedgehog hspec hw-bits hw-hedgehog + hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base lens + text vector ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ base bits-extra bytestring cassava containers criterion deepseq directory hw-bits hw-prim hw-rankselect hw-rankselect-base mmap - vector + transformers vector ]; description = "SIMD library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-streams" = callPackage - ({ mkDerivation, base, bytestring, criterion, directory, exceptions - , ghc-prim, hedgehog, hspec, hspec-discover, hw-bits - , hw-hspec-hedgehog, hw-prim, mmap, primitive, QuickCheck - , semigroups, transformers, vector + ({ mkDerivation, base, bytestring, criterion, directory, doctest + , doctest-discover, exceptions, ghc-prim, hedgehog, hspec + , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-prim, mmap + , primitive, QuickCheck, transformers, vector }: mkDerivation { pname = "hw-streams"; - version = "0.0.0.12"; - sha256 = "087sn4gxhf29vg9ydx8sfq33q16cz6cmda5r63k9xdki4ba761m4"; - revision = "1"; - editedCabalFile = "1y5sw9mgkxwvgf91hl22p3q5kxy99phwfmx2lh87339w7d5bjdbw"; + version = "0.0.1.0"; + sha256 = "0hzpx1j06h98y0zcmysklzn3s3mvpbb1nkwg4zkbdxvzzqs5hnm5"; libraryHaskellDepends = [ - base bytestring ghc-prim hw-bits hw-prim mmap primitive semigroups + base bytestring ghc-prim hw-bits hw-prim mmap primitive transformers vector ]; testHaskellDepends = [ - base bytestring directory exceptions ghc-prim hedgehog hspec - hw-bits hw-hspec-hedgehog hw-prim mmap primitive QuickCheck - semigroups transformers vector + base bytestring directory doctest doctest-discover exceptions + ghc-prim hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim mmap + primitive QuickCheck transformers vector ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ base bytestring criterion ghc-prim hw-bits hw-prim mmap primitive - semigroups transformers vector + transformers vector ]; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; @@ -135027,6 +136860,8 @@ self: { pname = "hw-uri"; version = "0.2.1.0"; sha256 = "1bwdzvms0n86k7gbkhk0jj3m1pcc9vbjk13kgpchqxpxm971srbs"; + revision = "1"; + editedCabalFile = "0bbsv8dj0z6wvgn0ldgvbrhji8mw5514pqwrp4ih8i2mjnfcdh2a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135064,16 +136899,19 @@ self: { "hw-xml" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base - , bytestring, cereal, containers, criterion, deepseq, generic-lens - , ghc-prim, hedgehog, hspec, hspec-discover, hw-balancedparens - , hw-bits, hw-hspec-hedgehog, hw-parser, hw-prim, hw-rankselect - , hw-rankselect-base, lens, mmap, mtl, optparse-applicative - , resourcet, text, transformers, vector, word8 + , bytestring, cereal, containers, criterion, deepseq, doctest + , doctest-discover, generic-lens, ghc-prim, hedgehog, hspec + , hspec-discover, hw-balancedparens, hw-bits, hw-hspec-hedgehog + , hw-parser, hw-prim, hw-rankselect, hw-rankselect-base, lens, mmap + , mtl, optparse-applicative, resourcet, text, transformers, vector + , word8 }: mkDerivation { pname = "hw-xml"; - version = "0.5.0.0"; - sha256 = "0cqrs19bd9yh67yczhhb1yf5dhcx2v6xikybd88vqwxdh51pxyyn"; + version = "0.5.1.0"; + sha256 = "0g81kknllbc6v5wx7kgzhh78409njfzr3h7lfdx7ip0nkhhnpmw4"; + revision = "2"; + editedCabalFile = "1zi0ma6fmzghlc65dxpznsyiyp4ij7cwz1yw35i0jjm314mhi4va"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -135089,11 +136927,11 @@ self: { resourcet text vector ]; testHaskellDepends = [ - attoparsec base bytestring hedgehog hspec hw-balancedparens hw-bits - hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base text - vector + attoparsec base bytestring doctest doctest-discover hedgehog hspec + hw-balancedparens hw-bits hw-hspec-hedgehog hw-prim hw-rankselect + hw-rankselect-base text vector ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ base bytestring criterion hw-balancedparens hw-bits hw-prim mmap resourcet vector @@ -135495,7 +137333,7 @@ self: { base containers directory filepath haskell98 HTTP HUnit hxt network parsec process ]; - description = "A collection of tools for processing XML with Haskell (Filter variant)"; + description = "A collection of tools for processing XML with Haskell (Filter variant)."; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -136296,8 +138134,8 @@ self: { pname = "hyraxAbif"; version = "0.2.3.21"; sha256 = "0ghhfv8gzs9sg13nj3mhqd24zbrkjj1dgsjz3sql6276kpa1p2kc"; - revision = "1"; - editedCabalFile = "0rg4wldliyaixmgcyina2cnm7l6gwpcdd2bim1q83clnfk32scar"; + revision = "2"; + editedCabalFile = "05fnq87n1rprz3mlw89g74b1arzhldn8yqj3la04g3r3m39fh2v1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136443,19 +138281,19 @@ self: { }) {}; "i3blocks-hs-contrib" = callPackage - ({ mkDerivation, aeson, attoparsec, base, lens, lens-aeson, text - , time, transformers, turtle, wreq + ({ mkDerivation, aeson, attoparsec, base, http-client + , http-client-tls, text, time, transformers, turtle }: mkDerivation { pname = "i3blocks-hs-contrib"; - version = "1.0.0"; - sha256 = "1lg60cgmyavlmn5a9ywa45vxskndqfbpy18vc6r6kxl49xgcqmpn"; + version = "2.1.0"; + sha256 = "191jrmid5q3pfamyhlmyh7ypws5slr1x95ajaxijcnsqnivb4sac"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text turtle ]; executableHaskellDepends = [ - aeson attoparsec base lens lens-aeson text time transformers turtle - wreq + aeson attoparsec base http-client http-client-tls text time + transformers turtle ]; description = "Base i3blocks written in haskell"; license = stdenv.lib.licenses.mit; @@ -136464,16 +138302,16 @@ self: { }) {}; "i3ipc" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers, hspec - , network, text, typed-process, vector + ({ mkDerivation, aeson, base, binary, bytestring, containers + , exceptions, hspec, network, text, typed-process, vector }: mkDerivation { pname = "i3ipc"; - version = "0.1.0.1"; - sha256 = "128dixb0nad1h2gf302r84kng2lw9g6vrnyjs61sqipbn6bn4ygd"; + version = "0.2.0.0"; + sha256 = "1h4vj027h0n3pvwxq4ipzdxpw03skbpi1qc6griwlkslk1qwyv8w"; libraryHaskellDepends = [ - aeson base binary bytestring containers network text typed-process - vector + aeson base binary bytestring containers exceptions network text + typed-process vector ]; testHaskellDepends = [ aeson base bytestring hspec ]; description = "A type-safe wrapper around i3's IPC"; @@ -136616,8 +138454,8 @@ self: { }: mkDerivation { pname = "icepeak"; - version = "0.7.2.0"; - sha256 = "0vs2lfwqxss2f4ajzj4pqzr5mxk69hs0jl4kz7y2qn7161x4vcd2"; + version = "0.7.3.0"; + sha256 = "0in02r708s5j8n22900jvnf4iiw87bvs1q5mjmr1yc4vn8vrf4vv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136855,6 +138693,23 @@ self: { broken = true; }) {}; + "ideas-statistics" = callPackage + ({ mkDerivation, base, containers, ideas, ideas-math-types }: + mkDerivation { + pname = "ideas-statistics"; + version = "1.0"; + sha256 = "1pniy4v4w3zs3ihwsx0zyb6x6hyqsbdka7flrdq9kj4abph6f1rb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers ideas ideas-math-types + ]; + description = "Interactive domain reasoner for statistics"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "idempotent" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck }: mkDerivation { @@ -137052,8 +138907,6 @@ self: { ]; description = "Functional Programming Language with Dependent Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gmp;}; "ieee" = callPackage @@ -137293,14 +139146,14 @@ self: { }) {inherit (pkgs) igraph;}; "igrf" = callPackage - ({ mkDerivation, ad, base, polynomial }: + ({ mkDerivation, ad, base, poly, semirings, text, vector-space }: mkDerivation { pname = "igrf"; - version = "0.2.0.0"; - sha256 = "04ipbhry1v3cpkflshqa9sp46px0k6g67n8apvdqykk5fsssdpm1"; - revision = "1"; - editedCabalFile = "0kqyrvv7wnr35nlyip14g1shjb8zfqg7x4vm0qqhc57vc6s6qqbx"; - libraryHaskellDepends = [ ad base polynomial ]; + version = "0.4.0.0"; + sha256 = "0n3xchwxslrc25sb06y2vg9gwgifpsfs57xhy7z6g2j43r187x1w"; + libraryHaskellDepends = [ + ad base poly semirings text vector-space + ]; description = "International Geomagnetic Reference Field"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -137318,10 +139171,8 @@ self: { }: mkDerivation { pname = "ihaskell"; - version = "0.10.0.2"; - sha256 = "01jk48kj5z7n547z1lg78c0bphpjyv2nfzjrh4jv7xygkw5asqxb"; - revision = "1"; - editedCabalFile = "0jhgnw5wrpmbp3g6zllwlmmyzyja5ry8i7dss7q8gpbvk2inlfl3"; + version = "0.10.1.1"; + sha256 = "10rsdcc2l0gkhapvi5vzjc7m2bwv67k4iy3vjkx8i92jk6023y64"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -137342,6 +139193,8 @@ self: { ]; description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-aeson" = callPackage @@ -137357,6 +139210,8 @@ self: { ]; description = "IHaskell display instances for Aeson"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-basic" = callPackage @@ -137381,6 +139236,8 @@ self: { libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ]; description = "IHaskell display instances for blaze-html types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-charts" = callPackage @@ -137397,6 +139254,8 @@ self: { ]; description = "IHaskell display instances for charts types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-diagrams" = callPackage @@ -137413,6 +139272,8 @@ self: { ]; description = "IHaskell display instances for diagram types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-display" = callPackage @@ -137437,6 +139298,8 @@ self: { libraryHaskellDepends = [ base bytestring gnuplot ihaskell ]; description = "IHaskell display instance for Gnuplot (from gnuplot package)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-graphviz" = callPackage @@ -137448,6 +139311,8 @@ self: { libraryHaskellDepends = [ base bytestring ihaskell process ]; description = "IHaskell display instance for GraphViz (external binary)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-hatex" = callPackage @@ -137459,6 +139324,8 @@ self: { libraryHaskellDepends = [ base HaTeX ihaskell text ]; description = "IHaskell display instances for hatex"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-hvega" = callPackage @@ -137470,6 +139337,8 @@ self: { libraryHaskellDepends = [ aeson base hvega ihaskell text ]; description = "IHaskell display instance for hvega types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-inline-r" = callPackage @@ -137503,6 +139372,8 @@ self: { ]; description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-magic" = callPackage @@ -137519,6 +139390,8 @@ self: { ]; description = "IHaskell display instances for bytestrings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-parsec" = callPackage @@ -137628,8 +139501,8 @@ self: { }: mkDerivation { pname = "ilist"; - version = "0.4.0.0"; - sha256 = "105qz5x03fa713ghxvmivawsaq3l9zf5ab4n09j7i7ryj3dwp4nv"; + version = "0.4.0.1"; + sha256 = "016wa9n4glxcyvbifvfz2khk9i1i5wzfyl952vp1fhwpjrr8aj04"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec transformers ]; benchmarkHaskellDepends = [ @@ -137655,7 +139528,7 @@ self: { libraryToolDepends = [ alex ]; executableHaskellDepends = [ array base containers html xhtml ]; executableToolDepends = [ alex ]; - description = "A fast syntax highlighting library built with alex"; + description = "A fast syntax highlighting library built with alex."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -137670,7 +139543,7 @@ self: { revision = "1"; editedCabalFile = "1wl2sv2g7iwxldk582h1z6a2b3ks4wzk8rx8bflcxwlh6s4kq0s7"; libraryHaskellDepends = [ base bytestring ]; - description = "Determine the type of an image by reading the first bytes"; + description = "Determine the type of an image by reading the first bytes."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -138466,6 +140339,29 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "incremental-parser_0_4_0_2" = callPackage + ({ mkDerivation, base, bytestring, checkers, criterion, deepseq + , monoid-subclasses, parsers, QuickCheck, rank2classes, tasty + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "incremental-parser"; + version = "0.4.0.2"; + sha256 = "11vip6qxw0y5yza4dcq4iah4kw3lyjsbxgbq1j17p1gr3c3xiafa"; + libraryHaskellDepends = [ + base monoid-subclasses parsers rank2classes transformers + ]; + testHaskellDepends = [ + base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq monoid-subclasses text + ]; + description = "Generic parser library capable of providing partial results from partial input"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "incremental-sat-solver" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -138704,10 +140600,8 @@ self: { ({ mkDerivation, base, hspec, Only }: mkDerivation { pname = "indexed-list-literals"; - version = "0.2.1.2"; - sha256 = "043xl356q9n1nw2bw8a8msymy18d6f7nwcyrrpzak9qr75dsx5nq"; - revision = "1"; - editedCabalFile = "198hmw2m3539vmh3s58d33h6vl5d0fqpdms8rp8cwj196diipjlc"; + version = "0.2.1.3"; + sha256 = "179z0df99ixaplr1qv7dawj3h8fq5qhgfn8mg0i4ix6xhpi9kqr6"; libraryHaskellDepends = [ base Only ]; testHaskellDepends = [ base hspec ]; description = "Type safe indexed list literals"; @@ -138802,7 +140696,7 @@ self: { sha256 = "08fjmza05wlj11mvdjwfcp3fn6k5zi1hsld84805clipd55sbp0r"; libraryHaskellDepends = [ array base deepseq vector ]; testHaskellDepends = [ array base deepseq QuickCheck text vector ]; - description = "Non-contiguous interval data types with potentially infinite ranges"; + description = "Non-contiguous interval data types with potentially infinite ranges."; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -138847,16 +140741,18 @@ self: { "infernal" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive - , containers, exceptions, heart-app, heart-core, http-client - , http-types, mtl, text, unliftio, unordered-containers, wai + , exceptions, hashable, http-client, http-types, little-logger + , little-rio, microlens, microlens-mtl, microlens-th, mtl, text + , unliftio-core, unordered-containers, wai }: mkDerivation { pname = "infernal"; - version = "0.3.0"; - sha256 = "0iixw8np4rh66ql2lm2gkhz9yzkgxw0mch3gxsflqi0a96y2jcik"; + version = "0.5.0"; + sha256 = "0zn4zj9c9jhvchg6yli3ig2c0hnwpk9na2r0bbizjlngzky6vfrr"; libraryHaskellDepends = [ - aeson base binary bytestring case-insensitive containers exceptions - heart-app heart-core http-client http-types mtl text unliftio + aeson base binary bytestring case-insensitive exceptions hashable + http-client http-types little-logger little-rio microlens + microlens-mtl microlens-th mtl text unliftio-core unordered-containers wai ]; description = "The Infernal Machine - An AWS Lambda Custom Runtime for Haskell"; @@ -138970,33 +140866,6 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.7.1.2"; - sha256 = "01rjbavv9b4gay4bvmxxljvps591xvp7lrx68658xkjwfi2phzhs"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson attoparsec base bytestring clock containers foldl http-client - http-types lens network optional-args scientific tagged text time - unordered-containers vector - ]; - testHaskellDepends = [ - base containers doctest raw-strings-qq tasty tasty-hunit - template-haskell time - ]; - description = "Haskell client library for InfluxDB"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "influxdb_1_7_1_3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal - , cabal-doctest, clock, containers, doctest, foldl, http-client - , http-types, lens, network, optional-args, raw-strings-qq - , scientific, tagged, tasty, tasty-hunit, template-haskell, text - , time, unordered-containers, vector - }: - mkDerivation { - pname = "influxdb"; version = "1.7.1.3"; sha256 = "079f8xwhnzbdzjy0kbhsaklplp0d0nb9gxc193g9nl6v299zb8gv"; isLibrary = true; @@ -139013,7 +140882,6 @@ self: { ]; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "informative" = callPackage @@ -139230,8 +141098,8 @@ self: { }: mkDerivation { pname = "inline-c"; - version = "0.9.0.0"; - sha256 = "086kqca1vcxhi7wdzmdv3rjwh9k50k3wj4rzig1yjz3x12d0h6q6"; + version = "0.9.1.0"; + sha256 = "0xi9ic5qjdfwblkaphf989lb37r1wc2z9kkhz1ailhw1lzq7g5l2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139324,8 +141192,8 @@ self: { }: mkDerivation { pname = "inline-r"; - version = "0.10.2"; - sha256 = "1lwdmdd4mx800zmiyg5z8nkpg2x31lqw74pgb515kyb9v97jykr4"; + version = "0.10.3"; + sha256 = "15wkf1lxc7syp6kcf7d10lxn013q5mnvdl113sbhnchq92q7npgj"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deepseq exceptions inline-c mtl pretty primitive process reflection setenv @@ -139391,8 +141259,8 @@ self: { }: mkDerivation { pname = "insert-ordered-containers"; - version = "0.2.3"; - sha256 = "1307v5w8lzxc1pmi5dvw1d2vmfs6z253xbr0nfzcgxfjmqvj60ik"; + version = "0.2.3.1"; + sha256 = "020a56280mxjk9k97q2m1424m73m1sf1ccl0wm0ci9msyw2g51za"; libraryHaskellDepends = [ aeson base base-compat hashable lens optics-core optics-extra semigroupoids semigroups text transformers unordered-containers @@ -139442,8 +141310,8 @@ self: { }: mkDerivation { pname = "inspection-testing"; - version = "0.4.2.2"; - sha256 = "1bppz99p6ix6hah8lbr9mapl2zxgmkg9i7h6hk8wq6zf54hwz3yp"; + version = "0.4.2.4"; + sha256 = "11nz8j56l3h7sn927mcsms9af9rpqkmxc0c0vf9mln567wpb75h3"; libraryHaskellDepends = [ base containers ghc mtl template-haskell transformers ]; @@ -139733,12 +141601,12 @@ self: { license = stdenv.lib.licenses.isc; }) {}; - "integer-gmp_1_0_2_0" = callPackage + "integer-gmp_1_0_3_0" = callPackage ({ mkDerivation, ghc-prim }: mkDerivation { pname = "integer-gmp"; - version = "1.0.2.0"; - sha256 = "1aaz2mdmwbrfxahhycpiz92hdvfn9mm7964wfypf8m0m8libhs6k"; + version = "1.0.3.0"; + sha256 = "06302vwkc99l5gdbk3r25w84gi9cj18jcf8ipi189vpnmw42awwf"; libraryHaskellDepends = [ ghc-prim ]; description = "Integer library based on GMP"; license = stdenv.lib.licenses.bsd3; @@ -140359,6 +142227,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "intro_0_7_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, dlist + , extra, hashable, lens, mtl, optics, QuickCheck, safe, text + , transformers, unordered-containers, writer-cps-mtl + }: + mkDerivation { + pname = "intro"; + version = "0.7.0.0"; + sha256 = "18ddkcm77jxqpqjaaqs1qmzvn8zgincrybb3d4zcsggrp6llghc3"; + libraryHaskellDepends = [ + base bytestring containers deepseq dlist extra hashable mtl safe + text transformers unordered-containers writer-cps-mtl + ]; + testHaskellDepends = [ + base bytestring containers deepseq dlist extra hashable lens mtl + optics QuickCheck safe text transformers unordered-containers + writer-cps-mtl + ]; + description = "Safe and minimal prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "intro-prelude" = callPackage ({ mkDerivation, intro }: mkDerivation { @@ -140502,8 +142393,8 @@ self: { pname = "invertible-grammar"; version = "0.1.2"; sha256 = "1nf7dchcxs8wwd2hgfpf04qd63ws22pafjwb5911lq7da8k1y57j"; - revision = "2"; - editedCabalFile = "0j6zmj0dlhiq4qjrbjbvdsmky1l4z1qwqikixk1b9dpa05n01ykf"; + revision = "3"; + editedCabalFile = "023nln2rhsijx4z7cm914283fm7fv2azk0w65nlbgky7cbmn021w"; libraryHaskellDepends = [ base bifunctors containers mtl prettyprinter profunctors semigroups tagged template-haskell text transformers @@ -140900,8 +142791,8 @@ self: { ({ mkDerivation, base, binary, bytestring, iproute }: mkDerivation { pname = "ip2location"; - version = "8.2.0"; - sha256 = "01ia5647y608xr5kqkxaamhaxs39k3x81wpj8aqzf24mirkalf23"; + version = "8.2.1"; + sha256 = "1ccr15yn2ska5wgwlcnfpi9w1xxkly0pwqibmdl9a1ggmwfsskv0"; libraryHaskellDepends = [ base binary bytestring iproute ]; description = "IP2Location Haskell package for IP geolocation"; license = stdenv.lib.licenses.mit; @@ -140913,8 +142804,8 @@ self: { ({ mkDerivation, base, binary, bytestring, iproute }: mkDerivation { pname = "ip2proxy"; - version = "2.2.0"; - sha256 = "12j8jd0ir24xgghvmac2npf9zqfbfq7fwj1ni2xdi8p673k3d0kd"; + version = "2.2.1"; + sha256 = "08ywvg39n59i8p66fpapcpj722lkam7pyd38525p3w4z735d8842"; libraryHaskellDepends = [ base binary bytestring iproute ]; description = "IP2Proxy Haskell package for proxy detection"; license = stdenv.lib.licenses.mit; @@ -141095,6 +142986,8 @@ self: { pname = "iproute"; version = "1.7.9"; sha256 = "1m306fi39ifqq53sklwn81q96wam8nvx7mr5hv4m9f26kiczlism"; + revision = "1"; + editedCabalFile = "1vbzch9lainl05ydym5z8x0kz0a0ywwba45d7xgg5fb8cp2n5zxh"; libraryHaskellDepends = [ appar base byteorder bytestring containers network ]; @@ -141160,8 +143053,8 @@ self: { }: mkDerivation { pname = "ipynb"; - version = "0.1"; - sha256 = "0daadhzil4q573mqb0rpvjzm0vpkzgzqcimw480qpvlh6rhppwj5"; + version = "0.1.0.1"; + sha256 = "0lwpz0ip7r1rxkirqb6p48ql19fzamqkrnf3khx7bfl5wsxi6yrb"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring containers text unordered-containers @@ -141177,21 +143070,21 @@ self: { "ipython-kernel" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text - , containers, cryptonite, directory, filepath, memory, mtl, process - , temporary, text, transformers, unordered-containers, uuid - , zeromq4-haskell + , containers, cryptonite, directory, filepath, memory, mtl, parsec + , process, temporary, text, transformers, unordered-containers + , uuid, zeromq4-haskell }: mkDerivation { pname = "ipython-kernel"; - version = "0.10.1.0"; - sha256 = "03sygh5jvigfjg3il49wy41p6ac1wh2gx8wj3hg2rvsh91p9f4dw"; + version = "0.10.2.0"; + sha256 = "0ylqbcs7xdhkm0if18f1cmz4144gx0p4r9wgggbzphfx8v8lhz9a"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring cereal cereal-text containers cryptonite - directory filepath memory mtl process temporary text transformers - unordered-containers uuid zeromq4-haskell + directory filepath memory mtl parsec process temporary text + transformers unordered-containers uuid zeromq4-haskell ]; description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; @@ -141424,8 +143317,8 @@ self: { }: mkDerivation { pname = "ircbot"; - version = "0.6.5.3"; - sha256 = "0i9wrnlwf51wp3xgksj451nw6rxf2qghyhcjz7ihdxmqivbc6167"; + version = "0.6.6"; + sha256 = "1nmqgimmmxry4pj1y5mfsp662hkivn0vr9n8rx1yn0aldlzrxdm8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141659,6 +143552,18 @@ self: { broken = true; }) {}; + "iso-deriving" = callPackage + ({ mkDerivation, base, mtl, profunctors }: + mkDerivation { + pname = "iso-deriving"; + version = "0.0.8"; + sha256 = "1w9fvnyanzmxs7yab9qhf3k9qy1lik7y5y5gzfv3jrxzwm0hivbi"; + libraryHaskellDepends = [ base mtl profunctors ]; + testHaskellDepends = [ base mtl ]; + description = "Deriving via arbitrary isomorphisms"; + license = stdenv.lib.licenses.mit; + }) {}; + "iso3166-country-codes" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -141835,6 +143740,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "it-has" = callPackage + ({ mkDerivation, base, generic-lens, QuickCheck }: + mkDerivation { + pname = "it-has"; + version = "0.1.0.0"; + sha256 = "11vfh01hwxg2jg2qwignvnjlms2issm94sqqvqy4mnm1vgphdbyx"; + libraryHaskellDepends = [ base generic-lens ]; + testHaskellDepends = [ base generic-lens QuickCheck ]; + description = "Automatically derivable Has instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "itanium-abi" = callPackage ({ mkDerivation, base, boomerang, HUnit, process, test-framework , test-framework-hunit, text, transformers, unordered-containers @@ -142408,6 +144325,8 @@ self: { pname = "ix"; version = "0.1.1.0"; sha256 = "0y3nvh2r4vpjn77innf8h0s6q89h1zk7yg8gbjnvz9482np44xam"; + revision = "1"; + editedCabalFile = "0r6mb33zr50vibkb31jijw6h5nzizi01skccfbiz9yqwvlqnfq4v"; libraryHaskellDepends = [ base base-unicode-symbols category transformers util ]; @@ -143213,12 +145132,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "jira-wiki-markup_1_2_0" = callPackage + "jira-wiki-markup_1_3_0" = callPackage ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: mkDerivation { pname = "jira-wiki-markup"; - version = "1.2.0"; - sha256 = "10ywmldxwwcl9n5xm5745xc979fbrz6b7vxq08n4vi2yrkkh04nb"; + version = "1.3.0"; + sha256 = "01jv2xrp0xkx00fdxglik85mnbnkhgxfyya6kvkm4fgifj111h4s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec text ]; @@ -143525,8 +145444,8 @@ self: { }: mkDerivation { pname = "jose"; - version = "0.8.2.0"; - sha256 = "0kv2kmws9kwymx8pm6j8nnlk1d8pwv22hw2ka2kwlipjvmb7mld4"; + version = "0.8.2.1"; + sha256 = "1mfnxfzgcxlsjfwzg4syih6wasi7mq25j3dawar9aihvdkpwqlfh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143546,6 +145465,38 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "jose_0_8_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, concise, containers, cryptonite, hspec, lens, memory + , monad-time, mtl, network-uri, pem, QuickCheck + , quickcheck-instances, safe, semigroups, tasty, tasty-hspec + , tasty-quickcheck, template-haskell, text, time + , unordered-containers, vector, x509 + }: + mkDerivation { + pname = "jose"; + version = "0.8.3"; + sha256 = "0izrbjcmsiv67d2vmiqgmnzn27pvs0kvka3rw5x33fwjgq0b3jyv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite lens memory monad-time mtl network-uri + QuickCheck quickcheck-instances safe semigroups template-haskell + text time unordered-containers vector x509 + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite hspec lens memory monad-time mtl network-uri + pem QuickCheck quickcheck-instances safe semigroups tasty + tasty-hspec tasty-quickcheck template-haskell text time + unordered-containers vector x509 + ]; + description = "Javascript Object Signing and Encryption and JSON Web Token library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jose-jwt" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal , containers, criterion, cryptonite, doctest, either, hspec, HUnit @@ -143857,6 +145808,8 @@ self: { pname = "json"; version = "0.10"; sha256 = "1fjnd2r4gl2hfqx158db3cn3rsyin4ch7rf9scb2hcy90cy6l10c"; + revision = "1"; + editedCabalFile = "16fp0y95gaibjravzj1hxdkng1cr8zqjqzd14m48kf4jrq3npz6r"; libraryHaskellDepends = [ array base bytestring containers mtl parsec pretty syb text ]; @@ -143903,8 +145856,8 @@ self: { }: mkDerivation { pname = "json-api-lib"; - version = "0.2.0.0"; - sha256 = "0cay3yrzfbd0vnfq1a2f74nnqwbiwribhnfy90nhvbi6dxxp14a1"; + version = "0.2.1.0"; + sha256 = "1dfi978ypgy1mlg7xmb4qja88pvvzvn2k26il2xiki3pcxnc4hsl"; libraryHaskellDepends = [ aeson base containers data-default deepseq lens lens-aeson text unordered-containers uri-encode @@ -143994,8 +145947,8 @@ self: { }: mkDerivation { pname = "json-autotype"; - version = "3.0.5"; - sha256 = "0kvbx4iyhh2r0abnswbvf862xfj08jlgvdd21xiz4zpnp2d1fx0h"; + version = "3.1.2"; + sha256 = "1wg1198jwgiy6yxr0msz1cvrkkv3zjx72ck3cykddy2hwx55113g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144164,8 +146117,8 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "1.0.8"; - sha256 = "1sagnnk73510vxdhqr2798k1s00jcsp6yfb689fpar360vfzwssm"; + version = "1.0.9"; + sha256 = "10jm25dydg49nb9xpdhbv7cbpd35wwnsnqdkkia0y2r7d5xlc5jy"; libraryHaskellDepends = [ aeson base bytestring mime-types network-uri tagsoup text time ]; @@ -144531,30 +146484,32 @@ self: { "json-syntax" = callPackage ({ mkDerivation, aeson, array-builder, array-chunks, base - , byteslice, bytesmith, bytestring, gauge, neat-interpolation - , primitive, scientific, scientific-notation - , small-bytearray-builder, tasty, tasty-hunit, text, text-short - , unordered-containers, vector + , bytebuild, byteslice, bytesmith, bytestring, gauge + , neat-interpolation, primitive, scientific, scientific-notation + , tasty, tasty-hunit, text, text-short, unordered-containers + , vector }: mkDerivation { pname = "json-syntax"; - version = "0.1.0.0"; - sha256 = "1z997wqg233nrbhzimqvlmq62ywa4abk0fygbwb79h1agq67jhc1"; + version = "0.1.1.0"; + sha256 = "08an68dh7ci5a84p25qzyfijhqbqsmsps0cyv8j5s3jfisaggbp5"; libraryHaskellDepends = [ - array-builder array-chunks base byteslice bytesmith bytestring - primitive scientific-notation text-short + array-builder array-chunks base bytebuild byteslice bytesmith + bytestring primitive scientific-notation text-short ]; testHaskellDepends = [ - aeson array-chunks base byteslice bytestring neat-interpolation - primitive scientific scientific-notation small-bytearray-builder - tasty tasty-hunit text text-short unordered-containers vector + aeson array-chunks base bytebuild byteslice bytestring + neat-interpolation primitive scientific scientific-notation tasty + tasty-hunit text text-short unordered-containers vector ]; benchmarkHaskellDepends = [ aeson base byteslice bytestring gauge neat-interpolation primitive scientific-notation text ]; - description = "High-performance JSON parser"; + description = "High-performance JSON parser and encoder"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json-togo" = callPackage @@ -144672,7 +146627,7 @@ self: { base blaze-builder bytestring containers json2-types mtl old-locale parsec pretty time utf8-string ]; - description = "Library provides support for JSON"; + description = "Library provides support for JSON."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -145048,8 +147003,8 @@ self: { }: mkDerivation { pname = "juicy-gcode"; - version = "0.1.0.5.1"; - sha256 = "1xdmlgickzg94asqy48ms895prjzyzcn767276f99f7mx9pqb5jr"; + version = "0.1.0.7"; + sha256 = "000qbmbm4gm9wv0q1vgn6y17g6ah0cx5jhcv311mwdfiq70k6ga4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -145122,6 +147077,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "junit-xml_0_1_0_1" = callPackage + ({ mkDerivation, base, tasty, tasty-golden, text, xml-conduit }: + mkDerivation { + pname = "junit-xml"; + version = "0.1.0.1"; + sha256 = "1r75ncsmr5yj7xbgrw4sipjii7l3v7hj6nfi1lidc26n4m7r8ib1"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base text xml-conduit ]; + testHaskellDepends = [ base tasty tasty-golden ]; + description = "Producing JUnit-style XML test reports"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jupyter" = callPackage ({ mkDerivation, aeson, async, base, bytestring, cereal, containers , directory, exceptions, extra, filepath, monad-control, mtl @@ -145219,22 +147188,23 @@ self: { "jvm-binary" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, containers , criterion, data-binary-ieee754, deepseq, deriving-compat - , directory, filepath, generic-random, hspec, hspec-discover - , hspec-expectations-pretty-diff, mtl, QuickCheck, template-haskell - , text, vector, zip-archive + , directory, doctest, filepath, generic-random, hspec + , hspec-discover, hspec-expectations-pretty-diff, mtl, QuickCheck + , template-haskell, text, vector, zip-archive }: mkDerivation { pname = "jvm-binary"; - version = "0.8.0"; - sha256 = "0mzzfdsxh6r8blx447c25bdzv3y8gqb984p48y5cfpvrn2dwhs41"; + version = "0.9.0"; + sha256 = "1ks5mbp1anrgm100sf3ycv1prwm3vj1vyag7l0ihs4cr2sqzq3a2"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base binary bytestring containers data-binary-ieee754 deepseq deriving-compat mtl template-haskell text vector ]; testHaskellDepends = [ attoparsec base binary bytestring containers data-binary-ieee754 - deepseq deriving-compat directory filepath generic-random hspec - hspec-discover hspec-expectations-pretty-diff mtl QuickCheck + deepseq deriving-compat directory doctest filepath generic-random + hspec hspec-discover hspec-expectations-pretty-diff mtl QuickCheck template-haskell text vector zip-archive ]; testToolDepends = [ hspec-discover ]; @@ -145788,41 +147758,6 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.8.3.0"; - sha256 = "0wpqchpgrp7awrf7hirg0768g8nnqrydnwcw8xgxw6w47zcb71d0"; - libraryHaskellDepends = [ - aeson async auto-update base bytestring containers either hostname - microlens microlens-th monad-control mtl old-locale resourcet - safe-exceptions scientific semigroups stm string-conv - template-haskell text time transformers transformers-base - transformers-compat unix unliftio-core unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring containers directory microlens - quickcheck-instances regex-tdfa safe-exceptions stm tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - time time-locale-compat unordered-containers - ]; - benchmarkHaskellDepends = [ - aeson async base blaze-builder criterion deepseq directory filepath - safe-exceptions text time transformers unix - ]; - description = "A structured logging framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "katip_0_8_4_0" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , bytestring, containers, criterion, deepseq, directory, either - , filepath, hostname, microlens, microlens-th, monad-control, mtl - , old-locale, quickcheck-instances, regex-tdfa, resourcet - , safe-exceptions, scientific, semigroups, stm, string-conv, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell - , text, time, time-locale-compat, transformers, transformers-base - , transformers-compat, unix, unliftio-core, unordered-containers - }: - mkDerivation { - pname = "katip"; version = "0.8.4.0"; sha256 = "0hkhvkdyk4m5pdr0yj1lbdwqvrfr7sq49jw683mk0lxjlyc39xm6"; libraryHaskellDepends = [ @@ -145844,7 +147779,6 @@ self: { ]; description = "A structured logging framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katip-datadog" = callPackage @@ -146312,8 +148246,8 @@ self: { }: mkDerivation { pname = "keera-hails-i18n"; - version = "0.0.3.3"; - sha256 = "0aih2mxgyfnrfnvqqsdv5g7r4jgjg5cfqykgalcsb9wqv0gq6d4i"; + version = "0.5.0"; + sha256 = "1kjm9gf857f29a8zd18l4f1zvvdgz4k21rhlh7j14nwffx4i2wf7"; libraryHaskellDepends = [ base directory filepath glib hgettext MissingK setlocale utf8-string @@ -146341,8 +148275,8 @@ self: { }: mkDerivation { pname = "keera-hails-mvc-environment-gtk"; - version = "0.0.3.3"; - sha256 = "0bk3191x8bsvmmnqyf7jzmrlg71q26z2kn4xfahdnpgxw3qskwmr"; + version = "0.5.0"; + sha256 = "0011q0pphzrsrp14nh6nw5szvmvm2gqq7m8vi9w0yi39s10azn97"; libraryHaskellDepends = [ base keera-hails-mvc-model-protectedmodel keera-hails-mvc-view keera-hails-mvc-view-gtk @@ -146377,8 +148311,8 @@ self: { }: mkDerivation { pname = "keera-hails-mvc-model-protectedmodel"; - version = "0.0.3.5"; - sha256 = "14jm1116j3plzglxygjdymfy8z3p5k8zinnh8wazkxgc5y9kkcsx"; + version = "0.5.0"; + sha256 = "0snlswhdxgliaf8pn3h4x99b8zvbvwlrhd896f89cp0am7084ily"; libraryHaskellDepends = [ base containers keera-hails-reactivevalues MissingK stm template-haskell @@ -146488,8 +148422,8 @@ self: { }: mkDerivation { pname = "keera-hails-reactive-network"; - version = "0.1"; - sha256 = "1d1r9p5ray60yfrxs89byc7rmdsm340k2b8klv25k0wh2fvrx2yw"; + version = "0.5.0"; + sha256 = "0s6zmqqidvd2ibs0hy6hrlflhsg7nlp8yjradpc7xzsr2g9gs8an"; libraryHaskellDepends = [ base bytestring keera-hails-reactivevalues network network-bsd ]; @@ -146519,8 +148453,8 @@ self: { ({ mkDerivation, base, keera-hails-reactivevalues, wx, wxcore }: mkDerivation { pname = "keera-hails-reactive-wx"; - version = "0.0.3.3"; - sha256 = "02ikqqfgwr3nrr18qdd1jshqm0dlnwbybqpzpj2ba7zbwpabd5bw"; + version = "0.5.0"; + sha256 = "110363gzkawik4hhcbpd0ljqzzqvlzylp3n52j1sbnxj5p01ym7k"; libraryHaskellDepends = [ base keera-hails-reactivevalues wx wxcore ]; @@ -146561,19 +148495,20 @@ self: { }) {}; "keera-hails-reactivevalues" = callPackage - ({ mkDerivation, base, contravariant, directory, filepath, hlint - , HUnit, mtl, process, QuickCheck, regex-posix, tasty, tasty-hunit - , tasty-quickcheck + ({ mkDerivation, base, cabal-install, contravariant, directory + , filepath, hlint, HUnit, mtl, process, QuickCheck, regex-posix + , tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "keera-hails-reactivevalues"; - version = "0.2.2.2"; - sha256 = "0iwx40gmcmj9pz0qi6058pbn665q0ca6qc7jnk88k42nqvjm1i8h"; + version = "0.5.0"; + sha256 = "163jm6iz6j67qmz4r9rsb24xqb2s9b97assl3la3is3bkvj397z9"; libraryHaskellDepends = [ base contravariant ]; testHaskellDepends = [ base directory filepath hlint HUnit mtl process QuickCheck regex-posix tasty tasty-hunit tasty-quickcheck ]; + testToolDepends = [ cabal-install ]; description = "Haskell on Rails - Reactive Values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -147071,8 +149006,8 @@ self: { ({ mkDerivation, base, kind-apply }: mkDerivation { pname = "kind-generics"; - version = "0.4.0.0"; - sha256 = "1w3rpvdvgfczsc86y00qbr9s9r8vmv442m4x975f3zcqs4algfhp"; + version = "0.4.1.0"; + sha256 = "1ldfi5rvs3mxlbpy0nfyx8mq58xjkk76c13fmvmgqcpgb8gvmrnx"; libraryHaskellDepends = [ base kind-apply ]; description = "Generic programming in GHC style for arbitrary kinds and GADTs"; license = stdenv.lib.licenses.bsd3; @@ -147084,8 +149019,8 @@ self: { }: mkDerivation { pname = "kind-generics-th"; - version = "0.2.1.0"; - sha256 = "08mswzwm1byxx2hfc8h2b90pnn2p4y83kdrvl4mlcn6v488k2lkb"; + version = "0.2.2.0"; + sha256 = "1cllhh2lvz86nah2knsgcl0cqnvs1x6ggi8cq2jh1wqlarpy1sgk"; libraryHaskellDepends = [ base ghc-prim kind-generics template-haskell th-abstraction ]; @@ -147148,6 +149083,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "kleene-list" = callPackage + ({ mkDerivation, base, base-compat, Cabal, cabal-doctest, deepseq + , doctest, QuickCheck, template-haskell + }: + mkDerivation { + pname = "kleene-list"; + version = "0.1.0.0"; + sha256 = "1iqwpy8ds617inr1hljxbhdwjlxcw7jkq5znsvc9p5mv3wnz6f32"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base base-compat deepseq doctest QuickCheck template-haskell + ]; + description = "A list type based on the Kleene star and plus"; + license = stdenv.lib.licenses.asl20; + }) {}; + "kmeans" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -147252,6 +149204,23 @@ self: { broken = true; }) {}; + "knit" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, hashtables + , vector + }: + mkDerivation { + pname = "knit"; + version = "0.1.0.0"; + sha256 = "0ypa7bj89zbkgyryms6nzwhqpp15hs52ynjvisdsng1xpgmf65dy"; + libraryHaskellDepends = [ + base bytestring containers deepseq hashtables vector + ]; + testHaskellDepends = [ base ]; + doHaddock = false; + description = "Ties the knot on data structures that reference each other by unique keys"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "knit-haskell" = callPackage ({ mkDerivation, aeson-pretty, base, base64-bytestring , blaze-colonnade, blaze-html, bytestring, case-insensitive @@ -147350,29 +149319,21 @@ self: { }) {}; "kontrakcja-templates" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, hslogger - , HStringTemplate, html, HUnit, MissingH, mtl, old-time, parsec - , string-templates, syb, test-framework, test-framework-hunit - , test-framework-quickcheck2, time, transformers, utf8-string + ({ mkDerivation, base, containers, directory, exceptions + , HStringTemplate, html, json, monad-control, mtl, time + , transformers, transformers-base }: mkDerivation { pname = "kontrakcja-templates"; - version = "0.1"; - sha256 = "020vcd04dxaxcd3bb9vwgw1qvxnz5gx590mjkbnnxrcjhl9yd9j8"; + version = "0.11"; + sha256 = "09fivafr368kfj5pp0g9r13jvrihhcwhx9ay2f45qilcpv4qbb1r"; libraryHaskellDepends = [ - base bytestring containers directory HStringTemplate html MissingH - mtl old-time parsec transformers utf8-string - ]; - testHaskellDepends = [ - base containers directory hslogger HStringTemplate HUnit MissingH - mtl old-time string-templates syb test-framework - test-framework-hunit test-framework-quickcheck2 time + base containers directory exceptions HStringTemplate html json + monad-control mtl time transformers transformers-base ]; description = "Utilities for working with many HStringTemplate templates from files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {string-templates = null;}; + }) {}; "koofr-client" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, http-client @@ -147453,8 +149414,8 @@ self: { pname = "kraken"; version = "0.1.0"; sha256 = "12l24z6alscbdicp11nfc8fwmlhk5mjdjyh6xdqyvlzphp5yfp1k"; - revision = "2"; - editedCabalFile = "141qx2fb3dimv20qsl2q1bagwcn9i0r72z2ha1w7191m557in319"; + revision = "3"; + editedCabalFile = "1l4i9nhwvy958ka6l6gb5w5cxgjhdm1h7ycvcc2nrqlw2iwk16v1"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls mtl ]; @@ -147465,24 +149426,31 @@ self: { }) {}; "krank" = callPackage - ({ mkDerivation, aeson, base, hspec, megaparsec, mtl - , optparse-applicative, PyF, replace-megaparsec, req - , safe-exceptions, text, unordered-containers, utf8-string + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , hspec-expectations, http-client, http-types, lifted-async, mtl + , optparse-applicative, pcre-heavy, pretty-terminal, PyF, req + , safe-exceptions, text, unordered-containers }: mkDerivation { pname = "krank"; - version = "0.1.0"; - sha256 = "121010sm7a2ggi1s75cy4f68z4nr2dp1i9cxq6snzbkl3dv5mmys"; + version = "0.2.1"; + sha256 = "0lg7g5zzjpzjvdzd7ps3dygiqp33891dph35jrf704hkf3ksmqs2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base megaparsec mtl PyF replace-megaparsec req - safe-exceptions text unordered-containers utf8-string + aeson base bytestring containers http-client http-types + lifted-async mtl pcre-heavy pretty-terminal PyF req safe-exceptions + text unordered-containers ]; executableHaskellDepends = [ - base mtl optparse-applicative PyF safe-exceptions text + base containers mtl optparse-applicative pcre-heavy pretty-terminal + PyF text + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec hspec-expectations + http-client http-types lifted-async mtl pcre-heavy pretty-terminal + PyF req safe-exceptions text unordered-containers ]; - testHaskellDepends = [ base hspec megaparsec PyF ]; description = "Krank checks your code source comments for important markers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -147645,8 +149613,8 @@ self: { }: mkDerivation { pname = "kubernetes-webhook-haskell"; - version = "0.2.0.0"; - sha256 = "0yxavjq6xxia81yfw7skgdmirbq0wmlvbsklppq6a6y1m6drbyww"; + version = "0.2.0.1"; + sha256 = "10qf41gx4631793d19wibyhc2nm8wv3qjb53rhlgpxbjy547y2rr"; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring text unordered-containers @@ -147914,8 +149882,8 @@ self: { ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; - version = "1.0.11"; - sha256 = "0sch6xpmkb3941bfv7g3qjvgsm9z74ra4z24y22j8w264naag601"; + version = "1.0.12"; + sha256 = "0fc6g9bydh27yv4j45f7g49rq5gdxb1x175q5w9yni5xam5z7hl2"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; @@ -148947,8 +150915,8 @@ self: { }: mkDerivation { pname = "language-bash"; - version = "0.9.0"; - sha256 = "1n4icdd478b1j0rr79qyxx2g4xm8yvsplfw3mkdsskb79zmq5gga"; + version = "0.9.2"; + sha256 = "0pkl0cvkxhlpx492qlklizc27xw3yax6n8h27xq3bw1vlk3c0a36"; libraryHaskellDepends = [ base parsec prettyprinter transformers ]; testHaskellDepends = [ base directory filepath parsec process QuickCheck tasty @@ -149150,8 +151118,8 @@ self: { ({ mkDerivation, base, pretty }: mkDerivation { pname = "language-css"; - version = "0.0.3"; - sha256 = "1g0mh08rz44533473isrqbfn6hp12np9dxm85cn5xpx68jl9ni9g"; + version = "0.0.3.1"; + sha256 = "0gwsa9i9jxlnp60z3dh1rkk2zds74llxwjxzrsnhbmi71rmmiggx"; libraryHaskellDepends = [ base pretty ]; description = "CSS 2.1 syntax"; license = stdenv.lib.licenses.bsd3; @@ -149276,7 +151244,7 @@ self: { libraryHaskellDepends = [ base containers language-ecmascript parsec uniplate ]; - description = "JavaScript static analysis library"; + description = "JavaScript static analysis library."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -149296,7 +151264,7 @@ self: { hashable lens mtl parsec pretty text unordered-containers ]; libraryToolDepends = [ alex ]; - description = "Parser and pretty printer for the Eiffel language"; + description = "Parser and pretty printer for the Eiffel language."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -149330,7 +151298,7 @@ self: { sha256 = "16kzdvhxpmfiia68c4y36fv1sjymy7sblba4iz77qqnwfqz3zka4"; libraryHaskellDepends = [ array base haskell-src parsec syb ]; libraryToolDepends = [ alex happy ]; - description = "Fortran lexer and parser, language support, and extensions"; + description = "Fortran lexer and parser, language support, and extensions."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -149815,8 +151783,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.4.6.2"; - sha256 = "07rv00rpxza9pg0jg19bh5pnk065mxadb7qcxw5i822ad22b85yn"; + version = "1.4.6.3"; + sha256 = "0g84x311hivlchz23kw0lwqcml3r0wkwh24bqvpgkb2m7rmi8mwx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -149858,7 +151826,7 @@ self: { array base containers monads-tf pretty transformers utf8-string ]; libraryToolDepends = [ alex happy ]; - description = "Parsing and pretty printing of Python code"; + description = "Parsing and pretty printing of Python code."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -149875,7 +151843,7 @@ self: { executableHaskellDepends = [ base haskell98 language-python xhtml ]; - description = "Generate coloured XHTML for Python code"; + description = "Generate coloured XHTML for Python code."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -150164,6 +152132,8 @@ self: { ]; description = "Auto-generated interface to Fortran LAPACK via CArrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lapack-comfort-array" = callPackage @@ -150180,6 +152150,8 @@ self: { ]; description = "Auto-generated interface to Fortran LAPACK via comfort-array"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lapack-ffi" = callPackage @@ -150192,7 +152164,9 @@ self: { libraryPkgconfigDepends = [ liblapack ]; description = "Auto-generated interface to Fortran LAPACK"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) liblapack;}; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {liblapack = null;}; "lapack-ffi-tools" = callPackage ({ mkDerivation, base, bytestring, cassava, containers @@ -150431,8 +152405,8 @@ self: { }: mkDerivation { pname = "latex-svg-hakyll"; - version = "0.1"; - sha256 = "119mln1k2qlzddz7fwjpvqzkd9gwi9ijmrlzlcxly63a8ffvylcn"; + version = "0.2"; + sha256 = "0brpnsd96r5q01mdaamny74mwphhjyhnz1zjy620i13d2cswl1rw"; libraryHaskellDepends = [ base hakyll latex-svg-image latex-svg-pandoc lrucache pandoc-types ]; @@ -150447,8 +152421,8 @@ self: { }: mkDerivation { pname = "latex-svg-image"; - version = "0.1"; - sha256 = "0g27rg4ip5rg2dkfwxv3khnfn8bjpgwrr3sakxvsrhvsxgb6lwf3"; + version = "0.2"; + sha256 = "1vr66sk1g4g8rhm78ply1mfk0ybcmpg420z26nniw51zr79lvnvn"; libraryHaskellDepends = [ base base64-bytestring bytestring cryptohash-sha256 deepseq directory filepath parsec process temporary transformers @@ -150463,8 +152437,8 @@ self: { }: mkDerivation { pname = "latex-svg-pandoc"; - version = "0.1"; - sha256 = "17n5gfdl7vdy06pph32yii9sww0mby10mdki6lh9k8wlvm15khv8"; + version = "0.2.1"; + sha256 = "12rwapjx4whsw4id4rijwcqksfblp0mnvf0xrvj6pf17pgg4qh52"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150512,8 +152486,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "1.0.3"; - sha256 = "1xiy76ahwl83fmpj522nzrp9i7rvvn9xjjj6wzrl3vhbjdbmq4m5"; + version = "2.0.0"; + sha256 = "0dfs9nq3vcf8w2k1x51pixb4wb47rg9nzyjgfpzx6vip296ivyf7"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring bytestring-conversion clock containers cryptohash exceptions extra @@ -151127,8 +153101,8 @@ self: { }: mkDerivation { pname = "lean-peano"; - version = "1.0.1.0"; - sha256 = "1h673y0rafh1dh8hy95spr2xwqc64pkkd094p6bd4cqvcmy72nd6"; + version = "1.0.2.0"; + sha256 = "0wvc7cxds6xmwm18bh3i8g7ck11nfpgdg26nyw1rr73rph8sl7ai"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ @@ -151168,8 +153142,8 @@ self: { }: mkDerivation { pname = "leancheck-instances"; - version = "0.0.3"; - sha256 = "1h6aw2fvdcjaz9r90l3c9znykn0y9gvg74ycvkrqw823sd9ywwd6"; + version = "0.0.4"; + sha256 = "1l1hwkhxgmy7ssqhrbi8xngb99zhdfnchzq4668gi35a932a1id7"; libraryHaskellDepends = [ array base bytestring containers leancheck nats text time ]; @@ -151317,6 +153291,41 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "leb128" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim + , QuickCheck, test-framework, test-framework-quickcheck2 + , transformers + }: + mkDerivation { + pname = "leb128"; + version = "0.1.0.0"; + sha256 = "097xzdj1q17whnzwlpwnfapppgc4lqwmmfcv2694gzlil84rqwk7"; + libraryHaskellDepends = [ base bytestring ghc-prim transformers ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; + description = "LEB128 encoding logic for and in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "leb128-cereal" = callPackage + ({ mkDerivation, base, bytestring, cereal, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "leb128-cereal"; + version = "1.0"; + sha256 = "1qjxcvcgdf4l1wzps7410yv3i5mi3ax17mq2f9wgbfbnm33329i7"; + libraryHaskellDepends = [ base bytestring cereal ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit tasty-quickcheck + ]; + description = "LEB128 and SLEB128 encoding"; + license = stdenv.lib.licenses.mit; + }) {}; + "leetify" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -151575,7 +153584,7 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "lens_4_19_1" = callPackage + "lens_4_19_2" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors , bytestring, Cabal, cabal-doctest, call-stack, comonad, containers , contravariant, criterion, deepseq, directory, distributive @@ -151583,14 +153592,13 @@ self: { , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect , tagged, template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, test-framework-th, text - , th-abstraction, transformers, transformers-compat - , unordered-containers, vector + , test-framework-quickcheck2, text, th-abstraction, transformers + , transformers-compat, unordered-containers, vector }: mkDerivation { pname = "lens"; - version = "4.19.1"; - sha256 = "0qbcwn7ll374630ijnw5jhwkqcaisvfwnh7cvz1957ayh84ipkq3"; + version = "4.19.2"; + sha256 = "0fy2vr5r11cc6ana8m2swqgs3zals4kims55vd6119bi76p5iy2j"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring call-stack comonad @@ -151604,8 +153612,8 @@ self: { base bytestring containers deepseq directory doctest filepath generic-deriving HUnit mtl nats parallel QuickCheck semigroups simple-reflect test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th text transformers - unordered-containers vector + test-framework-quickcheck2 text transformers unordered-containers + vector ]; benchmarkHaskellDepends = [ base base-compat bytestring comonad containers criterion deepseq @@ -151713,8 +153721,8 @@ self: { ({ mkDerivation, base, bytestring, cassava, lens }: mkDerivation { pname = "lens-csv"; - version = "0.1.0.0"; - sha256 = "1sfglf9g6ac14f85bjabbmvjijrd76asm8kzbrlvkzvv7bhiw8sk"; + version = "0.1.1.0"; + sha256 = "0kkwb32ndhxhlz01pn4xh825x95l8g45cs4h5wxkjh24rywl3rrp"; libraryHaskellDepends = [ base bytestring cassava lens ]; testHaskellDepends = [ base bytestring cassava lens ]; license = stdenv.lib.licenses.bsd3; @@ -151743,6 +153751,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-family_1_2_3" = callPackage + ({ mkDerivation, base, containers, lens-family-core, mtl + , transformers + }: + mkDerivation { + pname = "lens-family"; + version = "1.2.3"; + sha256 = "0a8fvvc3fsi5fzk5bnqvbgdz22xvvw55nyfac6411q0pm6vy4nc0"; + libraryHaskellDepends = [ + base containers lens-family-core mtl transformers + ]; + description = "Lens Families"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-family" = callPackage ({ mkDerivation, base, containers, lens-family-core, mtl , transformers @@ -151774,6 +153798,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lens-family-core_1_2_3" = callPackage + ({ mkDerivation, base, containers, transformers }: + mkDerivation { + pname = "lens-family-core"; + version = "1.2.3"; + sha256 = "009rf10pj1cb50v44cc1pq7qvfrmkkk9dikahs9qmvbvgl3mykwi"; + libraryHaskellDepends = [ base containers transformers ]; + description = "Haskell 98 Lens Families"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-family-core" = callPackage ({ mkDerivation, base, containers, transformers }: mkDerivation { @@ -152017,12 +154053,15 @@ self: { }) {}; "lens-th-rewrite" = callPackage - ({ mkDerivation, base, ghc, lens }: + ({ mkDerivation, base, ghc, ghc-exactprint, lens }: mkDerivation { pname = "lens-th-rewrite"; - version = "0.1.0.0"; - sha256 = "08nk7fglx1751zak82h8w0ld3lplzaghxraqwqrkvj39gwm4mqgx"; + version = "0.3.0.0"; + sha256 = "077lwxn3a2i2y1586dbyipxq8z5a6w1gzv66wvjlxamjv4xwl0kg"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ghc lens ]; + executableHaskellDepends = [ base ghc ghc-exactprint lens ]; description = "Rewrites Template Haskell splices using the API"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -152046,8 +154085,8 @@ self: { }: mkDerivation { pname = "lens-toml-parser"; - version = "0.1.0.3"; - sha256 = "1b81v3lncqpmsc0899wk7hnddn359qjwqkmrxcj5yh4ijjqdrrmg"; + version = "0.1.0.4"; + sha256 = "01gxm5p7bhylp1mkad4mng5rkh3wn2cvjcxkqp11pc51f4mkkqml"; libraryHaskellDepends = [ base profunctors text time toml-parser ]; testHaskellDepends = [ base containers dwergaz hlint lens-family text toml-parser @@ -152493,8 +154532,8 @@ self: { }: mkDerivation { pname = "lhs2tex"; - version = "1.23"; - sha256 = "1i55ssw6kzmc2ybqczpns3fpsd3043w6w42dni0kq7rkh87s1xc6"; + version = "1.24"; + sha256 = "09mkcklm9aixn4xwdcmy8z4x5myh4f5ky0nnadj1wgfjcychbmzc"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ @@ -153205,6 +155244,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "libsodium" = callPackage + ({ mkDerivation, base, hedgehog, libsodium, tasty, tasty-hedgehog + , tasty-hunit + }: + mkDerivation { + pname = "libsodium"; + version = "1.0.18.0"; + sha256 = "1qp3ca673d71fiz48pgnc0ywgchar9j62wzayqgdvjkpbwq731am"; + libraryHaskellDepends = [ base ]; + libraryPkgconfigDepends = [ libsodium ]; + testHaskellDepends = [ + base hedgehog tasty tasty-hedgehog tasty-hunit + ]; + testPkgconfigDepends = [ libsodium ]; + description = "Low-level bindings to the libsodium C library"; + license = stdenv.lib.licenses.isc; + }) {inherit (pkgs) libsodium;}; + "libssh2" = callPackage ({ mkDerivation, base, bytestring, c2hs, libssh2, network, syb , time, unix @@ -153465,8 +155522,8 @@ self: { }: mkDerivation { pname = "licensor"; - version = "0.4.0"; - sha256 = "17pflw248h54xcsskki8wy9lxkcl1dh3cc5s87f0z49i6h6w8fjg"; + version = "0.4.1"; + sha256 = "0p1wnyff2v23405v42ks5m3lyxhcahmcs3vh2qc5kz4q7ybnks7b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153535,6 +155592,8 @@ self: { ]; description = "Synchronize personal configs across multiple machines"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lift-generics" = callPackage @@ -153574,27 +155633,6 @@ self: { }: mkDerivation { pname = "lifted-async"; - version = "0.10.0.5"; - sha256 = "1x3dzw6bh50h0na3y7f49im786x49w1skwj6qbqjh3h6cmh2dd87"; - libraryHaskellDepends = [ - async base constraints lifted-base monad-control transformers-base - ]; - testHaskellDepends = [ - async base HUnit lifted-base monad-control mtl tasty - tasty-expected-failure tasty-hunit tasty-th - ]; - benchmarkHaskellDepends = [ async base criterion deepseq ]; - description = "Run lifted IO operations asynchronously and wait for their results"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lifted-async_0_10_0_6" = callPackage - ({ mkDerivation, async, base, constraints, criterion, deepseq - , HUnit, lifted-base, monad-control, mtl, tasty - , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base - }: - mkDerivation { - pname = "lifted-async"; version = "0.10.0.6"; sha256 = "1nnhb9sdn5ilwzdrzk9hfchcgvk3kb28fciriqhhxzi2qqzmdxbj"; libraryHaskellDepends = [ @@ -153607,7 +155645,6 @@ self: { benchmarkHaskellDepends = [ async base criterion deepseq ]; description = "Run lifted IO operations asynchronously and wait for their results"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lifted-base" = callPackage @@ -153640,8 +155677,8 @@ self: { pname = "lifted-base-tf"; version = "0.1.0.0"; sha256 = "1g3h86b6qrwq9sb5ppnpp4vygnfq4c77mhvzkk87yi56vvd6acix"; - revision = "2"; - editedCabalFile = "0n9216wfajawnbnk2bkga4v66bx12i4rknc69gzyrhm3waa86a1y"; + revision = "3"; + editedCabalFile = "1z56yldhppy56bj8g25a7l0g7ihqwymjr3ds0clc5iva3mlvvw39"; libraryHaskellDepends = [ base basic control ]; testHaskellDepends = [ base basic control HUnit lifted-base test-framework @@ -154329,8 +156366,8 @@ self: { ({ mkDerivation, base, sbv }: mkDerivation { pname = "linearEqSolver"; - version = "2.0"; - sha256 = "0dianwg8r4b6x6z17d994kmhjmqwdx083vlm9rzakfkn7p773l8w"; + version = "2.3"; + sha256 = "0lrrgix4m2sbfw9ydcqnx45lka0grl8ndiiy3cs1xg4xpcy2fkjw"; libraryHaskellDepends = [ base sbv ]; description = "Use SMT solvers to solve linear systems over integers and rationals"; license = stdenv.lib.licenses.bsd3; @@ -154346,8 +156383,8 @@ self: { }: mkDerivation { pname = "linearmap-category"; - version = "0.4.0.0"; - sha256 = "18fk6fj98w660mid7sadq8algmm5a5gz5150ac62kdp4rrk6igjk"; + version = "0.4.0.1"; + sha256 = "1zc7zns49d832wm22dsbv5xvh5x6s4zg6ky1vr941rs1z9jskmyj"; libraryHaskellDepends = [ base call-stack constrained-categories containers free-vector-spaces ieee754 lens linear manifolds-core QuickCheck @@ -155101,6 +157138,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "list-duplicate" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "list-duplicate"; + version = "0.1.0.0"; + sha256 = "14b380qv59897ds612vsqplc02g97g6k3gb7s10vgmwy9y8g4x1i"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "Group and delete duplicates from a list"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "list-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -155112,6 +157161,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "list-filter" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "list-filter"; + version = "0.1.1.0"; + sha256 = "0q5a93yik9lqqcahav2w7qw3sds2hgk3kfbfhd493gzw85vzxifq"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "Special takes and drops on lists"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "list-fusion-probe" = callPackage ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { @@ -155150,6 +157211,18 @@ self: { broken = true; }) {}; + "list-predicate" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "list-predicate"; + version = "0.1.0.1"; + sha256 = "1zl2qk4g4wva7gkwbdrpjfvwhh9xa1fngyhhaa8bdl91559v9yrd"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "Predicates on lists"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "list-prompt" = callPackage ({ mkDerivation, ansi-terminal, base, data-default, hspec, stm , terminal-size, vty @@ -155204,8 +157277,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "list-singleton"; - version = "1.0.0.2"; - sha256 = "0nl363fr751s2jlvkql96pdj5kvkzz3h0kbd02y5vqc3r13pchaq"; + version = "1.0.0.3"; + sha256 = "1k6kygngf88a8cxy9fvh0snhg4bhd3z7x6l1zsis4wjn0fpfzvrc"; libraryHaskellDepends = [ base ]; description = "Easily and clearly create lists with only one element in them"; license = stdenv.lib.licenses.isc; @@ -155349,8 +157422,8 @@ self: { }: mkDerivation { pname = "list-tries"; - version = "0.6.6"; - sha256 = "0n837h2ffgqgram5kvnshlqk5jc87bw49z4pxa94qdmc323z51ak"; + version = "0.6.7"; + sha256 = "110y66kkbi6m55b3ba7p1r25xnf6n59yz2kdp4qf6s8c7a5i0wzh"; libraryHaskellDepends = [ base binary containers dlist ]; testHaskellDepends = [ base binary ChasingBottoms HUnit QuickCheck template-haskell @@ -155561,6 +157634,36 @@ self: { broken = true; }) {}; + "little-logger" = callPackage + ({ mkDerivation, base, co-log, co-log-core, microlens, mtl, text }: + mkDerivation { + pname = "little-logger"; + version = "0.1.0"; + sha256 = "1ibcvcjh5wfdzi2p30dy7q1n6ac34mjckybmp8cn0xwyf9zs9zlw"; + libraryHaskellDepends = [ + base co-log co-log-core microlens mtl text + ]; + description = "Basic logging based on co-log"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "little-rio" = callPackage + ({ mkDerivation, base, exceptions, microlens, microlens-mtl, mtl + , unliftio-core + }: + mkDerivation { + pname = "little-rio"; + version = "0.1.1"; + sha256 = "0yxxmad9709h1gpxzjhvqmjhn3m8dcishd9gs6bakc2hrapw2ss2"; + libraryHaskellDepends = [ + base exceptions microlens microlens-mtl mtl unliftio-core + ]; + description = "When you need just the RIO monad"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "live-sequencer" = callPackage ({ mkDerivation, alsa-core, alsa-seq, base, bytestring, cgi , concurrent-split, containers, data-accessor @@ -155824,8 +157927,8 @@ self: { }: mkDerivation { pname = "llvm-extra"; - version = "0.10"; - sha256 = "0g2872wl1gmdlw3gdimcb1wcdsckjwjlk1ciwz8sy0rx9v3kif1m"; + version = "0.10.1"; + sha256 = "0m8fxip4345k92nq5n0dqdbjyahah0nind6lrwa5r7f9ff9j8gc9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155997,7 +158100,7 @@ self: { base directory filepath llvm-hs llvm-hs-pure mtl tasty tasty-golden tasty-hspec tasty-hunit text transformers ]; - description = "A pretty printer for LLVM IR"; + description = "A pretty printer for LLVM IR."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -156352,7 +158455,7 @@ self: { libraryHaskellDepends = [ base combinatorial-problems containers erf random ]; - description = "Generalised local search within Haskell, for applications in combinatorial optimisation"; + description = "Generalised local search within Haskell, for applications in combinatorial optimisation."; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -156581,10 +158684,8 @@ self: { }: mkDerivation { pname = "log-base"; - version = "0.8.0.0"; - sha256 = "15539v6y6s46kgb86ns13rh17c1qnidwdajk26yaxyqky58yx2m6"; - revision = "1"; - editedCabalFile = "0kdkvyw39ywly1qv1l0sq5qzr1akigl8410vr647hy2cn46anva0"; + version = "0.8.0.1"; + sha256 = "0s8w464yalbcgq3vq819mw9fsgj6a9rfbf00843311kqryml2a49"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions mmorph monad-control monad-time mtl semigroups stm text time @@ -156684,10 +158785,8 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.7.1.1"; - sha256 = "1mx43qbv9rbzzkxz7qgwgp26aq00a97rwka7a823l5hm5hamx74k"; - revision = "1"; - editedCabalFile = "012vyqrw0ncwxdrlbcb97x9lcmaizxspfc9dd5jxq8dfmqw5xgq7"; + version = "0.7.1.3"; + sha256 = "132q4cx0a2malzncm7bscjikpqaaz6fwzz6n8mhqianbpq02s0v1"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq hpqtypes http-client lifted-base log-base mtl semigroups split text @@ -157632,29 +159731,31 @@ self: { }) {}; "lorentz" = callPackage - ({ mkDerivation, base-noprelude, bimap, bytestring, constraints - , containers, data-default, first-class-families, fmt, formatting - , ghc-prim, hspec, HUnit, interpolate, lens, morley, morley-prelude - , named, optparse-applicative, pretty-terminal, QuickCheck - , singletons, spoon, tasty, tasty-discover, tasty-hunit-compat - , tasty-quickcheck, template-haskell, text, type-spec - , unordered-containers, vinyl + ({ mkDerivation, aeson-pretty, base-noprelude, bimap, bytestring + , constraints, containers, data-default, filepath + , first-class-families, fmt, formatting, ghc-prim, HUnit + , interpolate, lens, morley, morley-prelude, mtl, named + , optparse-applicative, pretty-terminal, QuickCheck, singletons + , spoon, tasty, tasty-discover, tasty-hunit-compat + , tasty-quickcheck, template-haskell, text, tezos-bake-monitor-lib + , type-spec, unordered-containers, vinyl }: mkDerivation { pname = "lorentz"; - version = "0.1.0"; - sha256 = "065y6sx7pafhk1b15hs5hcm3sd69ma2qwklxbhj0xdxdgx5g8z1v"; + version = "0.2.0"; + sha256 = "1az5phibdmxvr2g0lb1808rvlywd5d2cc647gzkybz5bwi837328"; libraryHaskellDepends = [ - base-noprelude bimap bytestring constraints containers data-default - first-class-families fmt formatting ghc-prim hspec HUnit - interpolate lens morley morley-prelude named optparse-applicative - pretty-terminal QuickCheck singletons tasty template-haskell text - unordered-containers vinyl + aeson-pretty base-noprelude bimap bytestring constraints containers + data-default first-class-families fmt formatting ghc-prim HUnit + interpolate lens morley morley-prelude mtl named + optparse-applicative pretty-terminal QuickCheck singletons + template-haskell text tezos-bake-monitor-lib unordered-containers + vinyl ]; testHaskellDepends = [ base-noprelude bimap bytestring constraints containers data-default - first-class-families fmt formatting HUnit morley morley-prelude - QuickCheck singletons spoon tasty tasty-hunit-compat + filepath first-class-families fmt formatting HUnit morley + morley-prelude QuickCheck singletons spoon tasty tasty-hunit-compat tasty-quickcheck text type-spec unordered-containers vinyl ]; testToolDepends = [ tasty-discover ]; @@ -157662,7 +159763,7 @@ self: { license = stdenv.lib.licenses.agpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {}; + }) {tezos-bake-monitor-lib = null;}; "loris" = callPackage ({ mkDerivation, base, c2hs, loris, vector }: @@ -157766,6 +159867,18 @@ self: { broken = true; }) {}; + "lowlin" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "lowlin"; + version = "0.2.0.1"; + sha256 = "0n1sf7panh2c8nhdpalvf74lvjvymn9dy05lkxnqzaz0vq7v5pcf"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Low dimensional linear algebra"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lp-diagrams" = callPackage ({ mkDerivation, base, containers, gasp, graphviz, labeled-tree , lens, mtl, parsek, polynomials-bernstein, process, reflection @@ -157902,6 +160015,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lsp-test_0_11_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base + , bytestring, conduit, conduit-parse, containers, data-default + , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl + , parser-combinators, process, text, transformers, unix + , unordered-containers + }: + mkDerivation { + pname = "lsp-test"; + version = "0.11.0.1"; + sha256 = "0s2sabykaaklw32z6j9z1m7l22ayc736sih39fhlq83iwgpv1917"; + revision = "1"; + editedCabalFile = "08lqzsw41vps1z8zihhsja95h5k73g5gpf689x2ryxn6ch13052v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal async base bytestring conduit + conduit-parse containers data-default Diff directory filepath Glob + haskell-lsp lens mtl parser-combinators process text transformers + unix unordered-containers + ]; + testHaskellDepends = [ + aeson base data-default directory filepath haskell-lsp hspec lens + text unordered-containers + ]; + description = "Functional test framework for LSP servers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lss" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , hspec2, language-css, language-css-attoparsec, text, xmlhtml @@ -158123,6 +160266,8 @@ self: { pname = "lucid"; version = "2.9.12"; sha256 = "156wniydd1hlb7rygbm95zln8ky8lai8rn2apkkv0rax9cdw6jrh"; + revision = "1"; + editedCabalFile = "1f0whk5ncanxfjjanrf6rqyncig2xgc5mh2j0sqy3nrlyjr9aqq9"; libraryHaskellDepends = [ base blaze-builder bytestring containers hashable mmorph mtl text transformers unordered-containers @@ -158596,8 +160741,8 @@ self: { }: mkDerivation { pname = "lz4-hs"; - version = "0.1.4.0"; - sha256 = "1biwiqc43wd2njfinrpfzg7pglsrcb2xjhvrm62ida04djrh8s4y"; + version = "0.1.4.1"; + sha256 = "15jm8lbwhgp29yvnwsxsmbixvgpxrnw7jc96zwmzbqx365r4dfqr"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; @@ -158625,8 +160770,8 @@ self: { }: mkDerivation { pname = "lzlib"; - version = "1.0.6.0"; - sha256 = "1qirn7kbcnxx6ihhk0r6p2jyfbs8cqsinfnmn774i3vkj1fahpn1"; + version = "1.0.7.0"; + sha256 = "0dwwnpfzy5sg4cylpcz3d1aq26grdq0jvidw97x2fkcq2j4d9bak"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ @@ -158735,6 +160880,23 @@ self: { broken = true; }) {}; + "lzo" = callPackage + ({ mkDerivation, base, binary, bytestring, criterion, digest, tasty + , tasty-hunit + }: + mkDerivation { + pname = "lzo"; + version = "0.1.1.2"; + sha256 = "0dypzlxkkby937l2m9g4bz50sgchazqsbagbhkic70ak6iyasamf"; + libraryHaskellDepends = [ base binary bytestring digest ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + description = "minilzo bundled for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "mDNSResponder-client" = callPackage ({ mkDerivation, base, bytestring, Cabal, ctrie, data-endian , network, network-msg, transformers @@ -159322,10 +161484,10 @@ self: { ({ mkDerivation, base, deepseq, profunctors, semigroups }: mkDerivation { pname = "magma"; - version = "0.4.0.0"; - sha256 = "18s93ap84cd74sl89fy89dpj89j6qxayc1v771n0zhshbp7g9gkz"; + version = "0.5.0.0"; + sha256 = "17ca22bs44whr597p7shv4fnpngbrb8vdxs6zbglfhb69bgjljyy"; libraryHaskellDepends = [ base deepseq profunctors semigroups ]; - description = "magma is an algebraic structure consisting a set together with an binary operation"; + description = "magma is an algebraic structure"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -159512,20 +161674,6 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "mainland-pretty_0_6_2" = callPackage - ({ mkDerivation, base, containers, srcloc, text, transformers }: - mkDerivation { - pname = "mainland-pretty"; - version = "0.6.2"; - sha256 = "0w3w1176a2lhcin45vf6f886srggqydj4rgjhrghh715cgh5cxxk"; - libraryHaskellDepends = [ - base containers srcloc text transformers - ]; - description = "Pretty printing designed for printing source code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "mainland-pretty" = callPackage ({ mkDerivation, base, containers, srcloc, text, transformers }: mkDerivation { @@ -160199,8 +162347,8 @@ self: { }: mkDerivation { pname = "manifold-random"; - version = "0.5.0.4"; - sha256 = "0wf0ya7w73ikd0ivg7m8q4nnc3mv7426l5xlf04zs5gh982x33gl"; + version = "0.5.1.0"; + sha256 = "0zip7ni06zljhj94d5vdf6sb6fbsm9iidcsrl85bdh7i7dkb3avr"; libraryHaskellDepends = [ base constrained-categories linearmap-category manifolds random-fu semigroups vector-space @@ -160222,8 +162370,8 @@ self: { }: mkDerivation { pname = "manifolds"; - version = "0.5.0.4"; - sha256 = "0cng3sp2lg8bfi8g9w4p7ccmg5b177svljl5cki286kdjqsvl320"; + version = "0.5.1.0"; + sha256 = "12w1whsr8zbsvv06iwdd27hjnvs8s041hrsp5c85chl4xqxwkl5h"; libraryHaskellDepends = [ array base binary call-stack comonad constrained-categories containers deepseq free free-vector-spaces ieee754 lens linear @@ -160246,8 +162394,8 @@ self: { ({ mkDerivation, base, call-stack, tagged, vector-space }: mkDerivation { pname = "manifolds-core"; - version = "0.5.0.4"; - sha256 = "0b1acwmmjcgq6bb0qijh227wq49vl295gd0d4iz8lpk1g1pwb2v2"; + version = "0.5.1.0"; + sha256 = "1bvmr0gcfj7zd0rff0qjlzjy8hqdbh52ljiiazrmqmb9abdsciq3"; libraryHaskellDepends = [ base call-stack tagged vector-space ]; description = "The basic classes for the manifolds hierarchy"; license = stdenv.lib.licenses.gpl3; @@ -160320,8 +162468,8 @@ self: { pname = "map-syntax"; version = "0.3"; sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k"; - revision = "2"; - editedCabalFile = "1cpiarychx4cmv7v71rbd5ccfsjac928isd52sf42mzs2nb492ya"; + revision = "3"; + editedCabalFile = "19p79gjwlpgx210zlc9625vwp6mjmnb9mvxaz1h5zmgir8dwb4lv"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers deepseq hspec HUnit mtl QuickCheck transformers @@ -160392,12 +162540,12 @@ self: { }) {}; "maquinitas-tidal" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, tidal }: mkDerivation { pname = "maquinitas-tidal"; - version = "0.2.1"; - sha256 = "14j4469yl1ypw97m33r2v37mlqxa689ish84k7ggwjdqxj9f64n2"; - libraryHaskellDepends = [ base ]; + version = "0.2.4"; + sha256 = "0apr5qkir3b6mnczi50lf3p349p1q3bl1sn4yg9dls2n3m147mf7"; + libraryHaskellDepends = [ base tidal ]; description = "library for MIDI control of hardware"; license = stdenv.lib.licenses.mit; }) {}; @@ -160864,15 +163012,15 @@ self: { }) {}; "mason" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, integer-gmp, network - , text + ({ mkDerivation, array, base, bytestring, ghc-prim, integer-gmp + , network, text }: mkDerivation { pname = "mason"; - version = "0.1"; - sha256 = "1h9ch2q84n9hbcr6nvb7vllxb05m81vjwlk1vkarp31qjbfcmh29"; + version = "0.2"; + sha256 = "1nwxkbzzifgck6f4r4il790g149vx9bwd9m73c5k6b52v70h37sd"; libraryHaskellDepends = [ - base bytestring ghc-prim integer-gmp network text + array base bytestring ghc-prim integer-gmp network text ]; description = "Fast and extensible bytestring builder"; license = stdenv.lib.licenses.bsd3; @@ -160899,9 +163047,11 @@ self: { ]; description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; - "massiv_0_5_1_0" = callPackage + "massiv_0_5_2_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest , data-default-class, deepseq, doctest, exceptions , mersenne-random-pure64, primitive, QuickCheck, random, scheduler @@ -160909,8 +163059,8 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.5.1.0"; - sha256 = "062b9mg1nqsg7lfv4a85s994jg1fipikpvxdb9w6ci3dqiq41dx0"; + version = "0.5.2.0"; + sha256 = "0j44as40bgzjixiga4l06gr3fpgk8vifmz2y12asczxwfv6k0xp1"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions primitive @@ -160923,6 +163073,7 @@ self: { description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "massiv-io" = callPackage @@ -160946,6 +163097,8 @@ self: { ]; description = "Import/export of Image files into massiv Arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "massiv-scheduler" = callPackage @@ -160987,6 +163140,8 @@ self: { ]; description = "Library that contains generators, properties and tests for Massiv Array Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "massiv-test_0_1_3" = callPackage @@ -161010,6 +163165,7 @@ self: { description = "Library that contains generators, properties and tests for Massiv Array Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "master-plan" = callPackage @@ -161447,19 +163603,26 @@ self: { }) {}; "matrix-sized" = callPackage - ({ mkDerivation, base, primitive, singletons, tasty - , tasty-quickcheck, vector + ({ mkDerivation, base, bytestring, bytestring-lexing, conduit + , conduit-extra, data-ordlist, ieee754, primitive, singletons + , store, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "matrix-sized"; - version = "0.0.3"; - sha256 = "1c43cgcw43y777l1wfkdagkis5sbb79fdwhckzwx11av6br02x5g"; - libraryHaskellDepends = [ base primitive singletons vector ]; + version = "0.1.0"; + sha256 = "0qmbckk1bmmg8lszdnd8lcgplniqzd53iq1aqv9jky96zdmmrna6"; + libraryHaskellDepends = [ + base bytestring bytestring-lexing conduit conduit-extra primitive + singletons store vector + ]; testHaskellDepends = [ - base primitive singletons tasty tasty-quickcheck vector + base conduit data-ordlist ieee754 singletons store tasty + tasty-quickcheck vector ]; description = "Haskell matrix library with interface to C++ linear algebra libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "matrix-static" = callPackage @@ -162376,6 +164539,27 @@ self: { broken = true; }) {}; + "megaparsec_7_0_5" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , criterion, deepseq, mtl, parser-combinators, scientific, text + , transformers, weigh + }: + mkDerivation { + pname = "megaparsec"; + version = "7.0.5"; + sha256 = "0bqx1icbmk8s7wmbcdzsgnlh607c7kzg8l80cp02dxr5valjxp7j"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers deepseq mtl + parser-combinators scientific text transformers + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq text weigh + ]; + description = "Monadic parser combinators"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "megaparsec" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, mtl, parser-combinators, scientific, text @@ -162566,6 +164750,21 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "membrain_0_0_0_2" = callPackage + ({ mkDerivation, base, doctest, Glob, hedgehog, hspec, type-spec }: + mkDerivation { + pname = "membrain"; + version = "0.0.0.2"; + sha256 = "1nizjkiggm2ws8kkjw6v96a611kim4yjg4kdrk0rd83fa1zcf7cc"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest Glob hedgehog hspec type-spec + ]; + description = "Type-safe memory units"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "memcache" = callPackage ({ mkDerivation, base, binary, blaze-builder, bytestring, criterion , data-default-class, hashable, network, resource-pool, time @@ -163213,7 +165412,7 @@ self: { version = "0.0.8"; sha256 = "0rdw0laqx9kypfwzqb4ir18r07sjxgm4pwfs82bjpwq0gf58nzas"; libraryHaskellDepends = [ arrows base random Stream ]; - description = "Generalised local search within Haskell, for applications in combinatorial optimisation"; + description = "Generalised local search within Haskell, for applications in combinatorial optimisation."; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -163515,12 +165714,14 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "microbase"; - version = "4.14.0.0.2"; - sha256 = "11w2nscia78cw9pccf9ibcn0i3yfykwfvhzhn0x0xy5lav69p01q"; + version = "4.14.0.0.6"; + sha256 = "1wnng6ik7p4id5p7crbk9gwy0c4rg2rggkphc4wqfmc2zgpl1ywq"; libraryHaskellDepends = [ base ]; doHaddock = false; description = "A minimal base to work around GHC bugs"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "microbench" = callPackage @@ -163742,8 +165943,8 @@ self: { }: mkDerivation { pname = "microlens-th"; - version = "0.4.3.4"; - sha256 = "08cixz1840ycc1y2b8anf1pqzlhnh89i6wskixd5s5brf8jl0l79"; + version = "0.4.3.5"; + sha256 = "0zk5wi8wrhhs7chdsxc9sm57w3zrjr7c9v80qh53ac4p3varjgfh"; libraryHaskellDepends = [ base containers microlens template-haskell th-abstraction transformers @@ -164468,8 +166669,8 @@ self: { }: mkDerivation { pname = "minilight"; - version = "0.4.3"; - sha256 = "1qsmrb6bfwrv302pmm26nkkfky10h0mdkflvj3lfjmnz0bv7aw4g"; + version = "0.5.0"; + sha256 = "1qxyl7n2pwfr8ixkak118sr0n3c7l3bj0r48hk51qpwm5x227g9y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164491,6 +166692,28 @@ self: { broken = true; }) {}; + "minilight-lua" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, hslua + , lens, linear, minilight, mtl, sdl2, sdl2-ttf, text, unix-time + }: + mkDerivation { + pname = "minilight-lua"; + version = "0.2.0.0"; + sha256 = "0q3w90rk7rlsy3p0iz91f3p7fsrbdsvirxq7xsb87hdbqxdwsavh"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers exceptions hslua linear minilight mtl + sdl2 sdl2-ttf text unix-time + ]; + executableHaskellDepends = [ base lens minilight mtl ]; + description = "A binding library of minilight for Lua langauge"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "minimal-configuration" = callPackage ({ mkDerivation, base, containers, directory, filepath }: mkDerivation { @@ -164682,7 +166905,7 @@ self: { base containers directory filepath monads-tf parsec pretty transformers xhtml ]; - description = "an interpreter for an operational semantics for the STG machine"; + description = "an interpreter for an operational semantics for the STG machine."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -164719,6 +166942,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "minizinc-process" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , hashable, process-extras, stringsearch, text + }: + mkDerivation { + pname = "minizinc-process"; + version = "0.1.0.0"; + sha256 = "0p2jb69k2n3dy47vx56pwh6pafccsm9r0nzqd60zss5fdrnxddf8"; + libraryHaskellDepends = [ + aeson base bytestring containers directory hashable process-extras + stringsearch text + ]; + description = "A set of helpers to call minizinc models"; + license = stdenv.lib.licenses.asl20; + }) {}; + "minlen" = callPackage ({ mkDerivation, base, mono-traversable, semigroups, transformers }: @@ -164949,15 +167188,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "miso_1_5_0_0" = callPackage + "miso_1_5_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-api-data , http-types, lucid, network-uri, servant, servant-lucid, text , transformers, vector }: mkDerivation { pname = "miso"; - version = "1.5.0.0"; - sha256 = "08843wyd41hs38vrixcfdnmar9vkvayk11323kav4qq85s3yhsd3"; + version = "1.5.1.0"; + sha256 = "1vnpfqnkg89ax5znkppqnnp2dgmps2hwdyc05rph2xqvyg5wq9qd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164986,8 +167225,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "miso-examples"; - version = "1.5.0.0"; - sha256 = "0k0rf7kb65nqckmz8gc27rssnn3ja0nswmrbslfmm0nz7293jaiw"; + version = "1.5.1.0"; + sha256 = "14zbzrh3rvqhpn0gd02wd1jdd40inlpy8v4a1qv1aq1c39ip2csb"; isLibrary = false; isExecutable = true; description = "A tasty Haskell front-end framework"; @@ -165393,8 +167632,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "mmsyn2"; - version = "0.1.7.0"; - sha256 = "1laskxwmylmg7mzm4h6z013s7rhfxf9y1mrvy4dp1cc80kq3scg0"; + version = "0.1.8.0"; + sha256 = "1qdbf89i5yx6ag9k4a9scc6wbm765b8zhq0gi12zx0bq75jjz3qz"; libraryHaskellDepends = [ base vector ]; description = "The library that can be used for multiple (Ord a) => a -> b transformations"; license = stdenv.lib.licenses.mit; @@ -165404,8 +167643,8 @@ self: { ({ mkDerivation, base, directory }: mkDerivation { pname = "mmsyn3"; - version = "0.1.4.0"; - sha256 = "1i93744jprkg94lwcas2hvb341m6j08ncn1lzlz6d8z2blpd5z4w"; + version = "0.1.5.0"; + sha256 = "0fpn0lzr93aaha9741spc7vmlg5c4x5wb3p4qvxzp57w85zqdwm3"; libraryHaskellDepends = [ base directory ]; description = "A small library to deal with executable endings"; license = stdenv.lib.licenses.mit; @@ -165416,10 +167655,13 @@ self: { }: mkDerivation { pname = "mmsyn4"; - version = "0.1.6.0"; - sha256 = "0kz7wpfpvfayb6jgd0wwrb3dljcigmqdiixb7b86vyh36nzxhcfj"; - isLibrary = false; + version = "0.2.0.0"; + sha256 = "0915a1kh0sl9maq0i5hp6d87n19wihncx6sgm7wznfmzlvgs36qw"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + base directory mmsyn2 mmsyn3 process vector + ]; executableHaskellDepends = [ base directory mmsyn2 mmsyn3 process vector ]; @@ -165431,8 +167673,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mmsyn5"; - version = "0.4.3.0"; - sha256 = "02ndmx1ndm87i2xlnaarw8yljjki1k7ak0jyb5s0c7hkvlrl7qax"; + version = "0.4.4.0"; + sha256 = "1yvsx82x7m5y2swxllhb7zzgspb3lfdhrbw6n5v3xsa9vxhwa35l"; libraryHaskellDepends = [ base ]; description = "Various additional operations on lists (some with intermediate Monads)"; license = stdenv.lib.licenses.mit; @@ -165444,8 +167686,8 @@ self: { }: mkDerivation { pname = "mmsyn6ukr"; - version = "0.6.3.1"; - sha256 = "0iyyw02w4mw2g66dqs2ihd5qs4qrs4dcaql7y8gd3gc26mhn7svq"; + version = "0.7.2.0"; + sha256 = "03h2rcv8214jbbfw5wb4f1icv9lwn6jwvjp3a2cjpli425ira7kj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -165465,8 +167707,8 @@ self: { }: mkDerivation { pname = "mmsyn7h"; - version = "0.7.5.0"; - sha256 = "17haan991lzs5qs4gzywhk4vpn9dvgasdm9ff8hzs5h6a0604sfn"; + version = "0.7.6.0"; + sha256 = "0z8r6d7my2hbp8g2l3258461f53kx8zm3fzyq605vk4y9z6k6icb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165485,8 +167727,8 @@ self: { ({ mkDerivation, base, directory, mmsyn2, mmsyn7ukr, vector }: mkDerivation { pname = "mmsyn7l"; - version = "0.4.2.0"; - sha256 = "1dpilwaffrkihfgbpq7p1095qpx9qgcpzbs8q3kld948hliihix7"; + version = "0.4.3.0"; + sha256 = "0kr5aig2zgps846bx9psrci7hm35zdnaxbd5pm3ir1c7pxqf4csx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory mmsyn2 mmsyn7ukr vector ]; @@ -165501,8 +167743,8 @@ self: { ({ mkDerivation, base, mmsyn2, mmsyn5, mmsyn6ukr, vector }: mkDerivation { pname = "mmsyn7s"; - version = "0.6.6.0"; - sha256 = "0hmsf7l3p2b2zj5ydjzxzkgqsj53yjwn71vgw8qzhbxjihk5x6l2"; + version = "0.6.7.0"; + sha256 = "14siy618rby0x9s94cqlpn4ymx6d589vb9f3mnqly7ykf53rwbi3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mmsyn2 mmsyn5 mmsyn6ukr vector ]; @@ -165517,8 +167759,8 @@ self: { }: mkDerivation { pname = "mmsyn7ukr"; - version = "0.15.3.0"; - sha256 = "02556sgfwi0fzlwj0x22hmyi9pgq0j7w4yfpjy2ni1px8vanwq5j"; + version = "0.15.4.0"; + sha256 = "0qiv2bc5aizpizmrjcsr2j6pi427xbk9pbgjyv4fr8mf7q3vcdjv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -165727,10 +167969,10 @@ self: { }: mkDerivation { pname = "modern-uri"; - version = "0.3.1.0"; - sha256 = "1pi7la2rrpfa9qszz7zm4dd7dihakm4kjrhjzvxpbp4n34ihl8h5"; - revision = "2"; - editedCabalFile = "0slfswzl4khpn0z8g7frn63gx7hw9n7nc3yff659q18nq7c6vjxd"; + version = "0.3.2.0"; + sha256 = "162s88yayalh4vlngman5gz3k0gnszxrksh1wk5227qihbpsiwhb"; + revision = "1"; + editedCabalFile = "13a9wh31pm151d1xz00wp2nfs73s2ysr1g97vx91rl2caak14ab0"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec mtl profunctors QuickCheck reflection tagged @@ -166012,10 +168254,10 @@ self: { }: mkDerivation { pname = "mole"; - version = "0.0.6"; - sha256 = "0shsx1sc6rc5jxijvrc4bzqpjw4xdjq5ghlj8jnmm7gp8b6h6y5b"; - revision = "2"; - editedCabalFile = "1qykba99djdhwm0mmkrfbjdyjcx47gi5clxm8kz87ccx9qs72kfy"; + version = "0.0.7"; + sha256 = "03qlvvwciw0mwcki7kk90pvx5qy15fkx5zdalwxk2pldpv5diyza"; + revision = "1"; + editedCabalFile = "116a00rm6jf3s0kyk3kny650jcimcwgvk2w4s7lvwpb678s635y9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -166124,8 +168366,8 @@ self: { }: mkDerivation { pname = "monad-bayes"; - version = "0.1.0.0"; - sha256 = "1ldzzk3k578z5n5yb9i2fv5rx8jamy8jjy33k40y698a07p8wzyz"; + version = "0.1.1.0"; + sha256 = "1pmhj377h8jwaxh6pv3s8fq2sm82lrilyxys2m84a2ln6g0aw664"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167374,6 +169616,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monadic-recursion-schemes" = callPackage + ({ mkDerivation, base, comonad, containers, free, mtl + , recursion-schemes, transformers + }: + mkDerivation { + pname = "monadic-recursion-schemes"; + version = "0.1.7.0"; + sha256 = "16smzgbachi31xr9pmps7habwfb5577i3s0c9x2a81zl5wg23p30"; + libraryHaskellDepends = [ + base comonad containers free mtl recursion-schemes transformers + ]; + testHaskellDepends = [ base ]; + description = "Recursion Schemes for Monadic version"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "monadiccp" = callPackage ({ mkDerivation, base, containers, mtl, parsec, pretty, random , semigroups @@ -167509,7 +169767,7 @@ self: { revision = "1"; editedCabalFile = "11v5zdsb9mp1rxvgcrxcr2xnc610xi16krwa9r4i5d6njmphfbdp"; libraryHaskellDepends = [ base ]; - description = "Haskell98 partial maps and filters over MonadPlus"; + description = "Haskell98 partial maps and filters over MonadPlus."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -168247,37 +170505,38 @@ self: { }) {morfeusz = null;}; "morley" = callPackage - ({ mkDerivation, aeson, aeson-options, aeson-pretty, base-noprelude + ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base-noprelude , base16-bytestring, base58-bytestring, binary, bytestring , constraints, containers, cryptonite, data-default, directory - , filepath, first-class-families, fmt, formatting, ghc-prim, gitrev - , hex-text, hspec, hspec-expectations, HUnit, interpolate, lens - , megaparsec, memory, morley-prelude, mtl, named + , filepath, first-class-families, fmt, formatting, gauge, ghc-prim + , gitrev, hex-text, hspec, hspec-expectations, HUnit, interpolate + , lens, megaparsec, memory, morley-prelude, mtl, named , optparse-applicative, parser-combinators, pretty-simple , QuickCheck, quickcheck-arbitrary-adt, quickcheck-instances , show-type, singletons, syb, tasty, tasty-ant-xml, tasty-discover , tasty-hspec, tasty-hunit-compat, tasty-quickcheck - , template-haskell, text, th-lift, th-lift-instances, time, timerep - , transformers-compat, unordered-containers, vector, vinyl - , wl-pprint-text + , template-haskell, text, tezos-bake-monitor-lib, th-lift + , th-lift-instances, time, timerep, transformers-compat + , unordered-containers, vector, vinyl, wl-pprint-text }: mkDerivation { pname = "morley"; - version = "1.0.0"; - sha256 = "0c7sbfib751066bzlqnmsj03livgar4i27pf0rag91apmlzgh057"; + version = "1.2.0"; + sha256 = "1id9sqh105p9b35g7rnk6x43h3h2d4v71bg13mz4gk5ny186d512"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-options aeson-pretty base-noprelude base16-bytestring + aeson aeson-casing aeson-pretty base-noprelude base16-bytestring base58-bytestring binary bytestring constraints containers cryptonite data-default first-class-families fmt formatting - ghc-prim gitrev hex-text hspec HUnit interpolate lens megaparsec - memory morley-prelude mtl named parser-combinators QuickCheck + ghc-prim gitrev hex-text hspec hspec-expectations HUnit interpolate + lens megaparsec memory morley-prelude mtl named + optparse-applicative parser-combinators QuickCheck quickcheck-arbitrary-adt quickcheck-instances show-type singletons syb tasty tasty-ant-xml tasty-hunit-compat tasty-quickcheck - template-haskell text th-lift th-lift-instances time timerep - transformers-compat unordered-containers vector vinyl - wl-pprint-text + template-haskell text tezos-bake-monitor-lib th-lift + th-lift-instances time timerep transformers-compat + unordered-containers vector vinyl wl-pprint-text ]; executableHaskellDepends = [ base-noprelude fmt morley-prelude named optparse-applicative @@ -168291,11 +170550,14 @@ self: { tasty-hunit-compat tasty-quickcheck text unordered-containers ]; testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base-noprelude containers gauge megaparsec morley-prelude + ]; description = "Developer tools for the Michelson Language"; license = stdenv.lib.licenses.agpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {}; + }) {tezos-bake-monitor-lib = null;}; "morley-prelude" = callPackage ({ mkDerivation, base-noprelude, universum }: @@ -168352,6 +170614,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "morpheus-graphql_0_11_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, megaparsec + , mtl, scientific, tasty, tasty-hunit, template-haskell, text + , th-lift-instances, transformers, unliftio-core + , unordered-containers, uuid, vector, websockets + }: + mkDerivation { + pname = "morpheus-graphql"; + version = "0.11.0"; + sha256 = "1cwq1wa43df8d681x409ra9cnv9qfxb2wpbf6mm3fcbnkkaza351"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers megaparsec mtl scientific + template-haskell text th-lift-instances transformers unliftio-core + unordered-containers uuid vector websockets + ]; + testHaskellDepends = [ + aeson base bytestring containers megaparsec mtl scientific tasty + tasty-hunit template-haskell text th-lift-instances transformers + unliftio-core unordered-containers uuid vector websockets + ]; + description = "Morpheus GraphQL"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "morpheus-graphql-cli" = callPackage ({ mkDerivation, base, bytestring, filepath, morpheus-graphql , optparse-applicative @@ -168508,19 +170796,19 @@ self: { "moto" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , cryptohash-sha1, df1, di, di-core, di-df1, directory, filepath - , mtl, optparse-applicative, pipes, pipes-attoparsec + , mtl, optparse-applicative, pipes, pipes-aeson, pipes-attoparsec , pipes-bytestring, random, safe-exceptions, tasty, tasty-hunit , tasty-quickcheck, text, time, transformers }: mkDerivation { pname = "moto"; - version = "0.0.3"; - sha256 = "1grvw5dlg6gjf83rhz45hnh73p74v85kmyn9yfi2gwbxcs7fsmvx"; + version = "0.0.4"; + sha256 = "04i85y0h5dqaz6iy7wrirgrm4bncygnmjjb5ncjzdf9c0lvmnab9"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers cryptohash-sha1 df1 di-core di-df1 directory filepath mtl optparse-applicative pipes - pipes-attoparsec pipes-bytestring safe-exceptions text time - transformers + pipes-aeson pipes-attoparsec pipes-bytestring safe-exceptions text + time transformers ]; testHaskellDepends = [ base bytestring containers di di-core directory filepath random @@ -168533,15 +170821,16 @@ self: { }) {}; "moto-postgresql" = callPackage - ({ mkDerivation, base, bytestring, moto, postgresql-simple - , safe-exceptions + ({ mkDerivation, base, bytestring, df1, di-df1, moto + , postgresql-simple, safe-exceptions, text }: mkDerivation { pname = "moto-postgresql"; - version = "0.0.1"; - sha256 = "0z5kxphsgywmnv33lf95by9gxlgr6i8y8lq7sqy495f87b1jv62d"; + version = "0.0.2"; + sha256 = "1n6xzcg6iqh9l4jkhq03hl11kh0614z41kv2pvw26bsknv4rp0cx"; libraryHaskellDepends = [ - base bytestring moto postgresql-simple safe-exceptions + base bytestring df1 di-df1 moto postgresql-simple safe-exceptions + text ]; description = "PostgreSQL-based migrations registry for moto"; license = stdenv.lib.licenses.asl20; @@ -168746,8 +171035,8 @@ self: { ({ mkDerivation, base, bytestring, c2hs, monad-loops, mpich }: mkDerivation { pname = "mpi-hs"; - version = "0.7.1.0"; - sha256 = "1xja12laj9pznwkgllgn2126g0izgv7mp267jv0ihlzy4yv2ps8m"; + version = "0.7.1.2"; + sha256 = "0dhhvvncmsg6rnb16pi1da4zb82hlwyia0l5xxqz6s7518q0amkh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring monad-loops ]; @@ -168763,6 +171052,63 @@ self: { broken = true; }) {inherit (pkgs) mpich;}; + "mpi-hs-binary" = callPackage + ({ mkDerivation, base, binary, bytestring, monad-loops, mpi-hs }: + mkDerivation { + pname = "mpi-hs-binary"; + version = "0.1.1.0"; + sha256 = "10wlrm31drjgdviqzsvxlnj1mn1lli3n41z1xbfp0i80vmh29av3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring monad-loops mpi-hs + ]; + executableHaskellDepends = [ base mpi-hs ]; + testHaskellDepends = [ base ]; + description = "MPI bindings for Haskell"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "mpi-hs-cereal" = callPackage + ({ mkDerivation, base, bytestring, cereal, monad-loops, mpi-hs }: + mkDerivation { + pname = "mpi-hs-cereal"; + version = "0.1.0.0"; + sha256 = "1sdizjk4xpc2hdh71s9ckjhq22appqj1c9s10mwxjgb9vd7bz07b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cereal monad-loops mpi-hs + ]; + executableHaskellDepends = [ base mpi-hs ]; + testHaskellDepends = [ base ]; + description = "MPI bindings for Haskell"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "mpi-hs-store" = callPackage + ({ mkDerivation, base, bytestring, monad-loops, mpi-hs, store }: + mkDerivation { + pname = "mpi-hs-store"; + version = "0.1.0.0"; + sha256 = "1afgamdbv7dq9r8jd7hn5y09rly75rhjk48da0d8hk0spcfdmnvq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring monad-loops mpi-hs store + ]; + executableHaskellDepends = [ base mpi-hs ]; + testHaskellDepends = [ base ]; + description = "MPI bindings for Haskell"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "mplayer-spot" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, conduit , conduit-extra, directory, filepath, process, semigroupoids @@ -168967,8 +171313,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "mr-env"; - version = "0.1.0.2"; - sha256 = "1bw0ga59lf1crhjx4hlmsnzllsf3nfwzzsfcll0xf04fkj0jgxlg"; + version = "0.1.0.3"; + sha256 = "01dq9wac3jvbhll3kqjid5xy66hf11r382w8c1hhvmfd5j9bp0n4"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A simple way to read environment variables in Haskell"; @@ -169057,6 +171403,8 @@ self: { pname = "msgpack"; version = "1.0.1.0"; sha256 = "1ljb9rdhdbxqs32brrwd42c8v3z7yrl6pr4mzmid1rfqdipard77"; + revision = "1"; + editedCabalFile = "1gdn6cwkczn4i9ssx4m5v352hh5k20pd4c93am0inrldq8zncyx8"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 deepseq hashable mtl text unordered-containers vector @@ -169114,6 +171462,8 @@ self: { ]; description = "A Haskell implementation of MessagePack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "msgpack-idl" = callPackage @@ -169180,6 +171530,8 @@ self: { testHaskellDepends = [ async base bytestring hspec mtl network ]; description = "A MessagePack-RPC Implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "msgpack-types" = callPackage @@ -169502,8 +171854,8 @@ self: { }: mkDerivation { pname = "mu-avro"; - version = "0.2.0.0"; - sha256 = "12cjq2pfaksa8s93j731p6i572xlnpl7p42lz1kvyyn4bg5r222y"; + version = "0.3.0.0"; + sha256 = "0p5j3pzx2b8hj7zn7gdj7xg2n99yhzvbkhbr5cv6jwcd5gpz3pkn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -169515,10 +171867,43 @@ self: { executableHaskellDepends = [ avro base bytestring mu-schema ]; description = "Avro serialization support for Mu microservices"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; + "mu-graphql" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , conduit, graphql-parser, http-types, list-t, mtl, mu-rpc + , mu-schema, parsers, regex-tdfa, scientific, sop-core, stm + , stm-chans, stm-conduit, stm-containers, template-haskell, text + , unordered-containers, uuid, wai, wai-extra, wai-websockets, warp + , warp-tls, websockets + }: + mkDerivation { + pname = "mu-graphql"; + version = "0.3.0.0"; + sha256 = "1371h6w3v10qcmp8zp3mjxfhvknk39qgcn9laslssci4yrrr5a09"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring conduit graphql-parser + http-types list-t mtl mu-rpc mu-schema parsers scientific sop-core + stm stm-chans stm-conduit stm-containers template-haskell text + unordered-containers uuid wai wai-websockets warp warp-tls + websockets + ]; + executableHaskellDepends = [ + base conduit mu-rpc mu-schema regex-tdfa text wai-extra warp + ]; + description = "GraphQL support for Mu"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {graphql-parser = null;}; + "mu-grpc-client" = callPackage - ({ mkDerivation, async, base, bytestring, conduit, http2 + ({ mkDerivation, async, avro, base, bytestring, conduit, http2 , http2-client, http2-client-grpc, http2-grpc-types, mu-grpc-common , mu-optics, mu-protobuf, mu-rpc, mu-schema, optics-core, sop-core , stm, stm-chans, stm-conduit, template-haskell, text @@ -169526,13 +171911,13 @@ self: { }: mkDerivation { pname = "mu-grpc-client"; - version = "0.2.0.0"; - sha256 = "0dy9nfzyls5410dh7crgk03bfwcrxgcwryqhplsg25x5rxplkcfb"; + version = "0.3.0.0"; + sha256 = "08z92rm1dcr02qwmd92inplzb1hgari0bsmw19xlmkdlsjldj5v0"; libraryHaskellDepends = [ - async base bytestring conduit http2 http2-client http2-client-grpc - http2-grpc-types mu-grpc-common mu-optics mu-protobuf mu-rpc - mu-schema optics-core sop-core stm stm-chans stm-conduit - template-haskell text th-abstraction + async avro base bytestring conduit http2 http2-client + http2-client-grpc http2-grpc-types mu-grpc-common mu-optics + mu-protobuf mu-rpc mu-schema optics-core sop-core stm stm-chans + stm-conduit template-haskell text th-abstraction ]; description = "gRPC clients from Mu definitions"; license = stdenv.lib.licenses.asl20; @@ -169547,8 +171932,8 @@ self: { }: mkDerivation { pname = "mu-grpc-common"; - version = "0.2.0.0"; - sha256 = "04984ibj6ma880jchibmr1z696mrik29gc2qnaf0vsp0nxwqr9vv"; + version = "0.3.0.0"; + sha256 = "1ipqzg799lfy2apl3galhgnqqpf5z9nr0dvb9gp9cmv0y9bn3iv6"; libraryHaskellDepends = [ avro base binary bytestring http2-grpc-proto3-wire http2-grpc-types mu-avro mu-protobuf mu-rpc mu-schema @@ -169560,24 +171945,24 @@ self: { }) {}; "mu-grpc-server" = callPackage - ({ mkDerivation, async, base, binary, bytestring, conduit + ({ mkDerivation, async, avro, base, binary, bytestring, conduit , http2-grpc-types, mtl, mu-grpc-common, mu-protobuf, mu-rpc , mu-schema, sop-core, stm, stm-conduit, wai, warp, warp-grpc , warp-tls }: mkDerivation { pname = "mu-grpc-server"; - version = "0.2.0.0"; - sha256 = "1g3dr66b6915ci53lhygahw8ganqivd42a918amv1xcxq7li1m76"; + version = "0.3.0.0"; + sha256 = "1z8mhychrr5y6zrxg3xx398x221cwyyw7yss8gfn0f5c7j64r693"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base binary bytestring conduit http2-grpc-types mtl + async avro base binary bytestring conduit http2-grpc-types mtl mu-grpc-common mu-protobuf mu-rpc mu-schema sop-core stm stm-conduit wai warp warp-grpc warp-tls ]; executableHaskellDepends = [ - async base binary bytestring conduit http2-grpc-types mtl + async avro base binary bytestring conduit http2-grpc-types mtl mu-grpc-common mu-protobuf mu-rpc mu-schema sop-core stm stm-conduit wai warp warp-grpc warp-tls ]; @@ -169587,13 +171972,31 @@ self: { broken = true; }) {}; + "mu-kafka" = callPackage + ({ mkDerivation, avro, base, bytestring, conduit, hw-kafka-client + , hw-kafka-conduit, mu-avro, mu-schema, resourcet + }: + mkDerivation { + pname = "mu-kafka"; + version = "0.3.0.0"; + sha256 = "0flz0567rgky7ckl0nzinfd93bb7x0w1dz031y7hk3wcpp98y5i3"; + libraryHaskellDepends = [ + avro base bytestring conduit hw-kafka-client hw-kafka-conduit + mu-avro mu-schema resourcet + ]; + description = "Utilities for interoperation between Mu and Kafka"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "mu-optics" = callPackage ({ mkDerivation, base, containers, mu-schema, optics-core, sop-core }: mkDerivation { pname = "mu-optics"; - version = "0.2.0.0"; - sha256 = "1b3954pq7iia4vq2bnl1gw2qakdrwkh647qpb1sl1dmrpi0mc77m"; + version = "0.3.0.0"; + sha256 = "0263nd5xwyn2jb99d6vn7fk8lzmkgarfx9n6lrc4dpa5immfypnq"; libraryHaskellDepends = [ base containers mu-schema optics-core sop-core ]; @@ -169607,8 +172010,8 @@ self: { }: mkDerivation { pname = "mu-persistent"; - version = "0.2.0.0"; - sha256 = "1n81dpayp0q0i19w1pchgwwblxz0jd510q01r8mvwpf099gb27pa"; + version = "0.3.0.0"; + sha256 = "1jd0h2cqr4nbwk2vyaq3wamrgwi1dkzmyhqg6b7002wdvm1h822j"; libraryHaskellDepends = [ base monad-logger mu-schema persistent resourcet transformers ]; @@ -169624,8 +172027,8 @@ self: { }: mkDerivation { pname = "mu-protobuf"; - version = "0.2.0.0"; - sha256 = "10yxb4dfdm9bm41gpd2jbb7jz79gk7s5yzqf3d994zqcq0d5k5fh"; + version = "0.3.0.0"; + sha256 = "02wk2bhx6lflgri9fm4dq09yz07xsm82fbxgm130zs7s6015chxf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -169649,8 +172052,8 @@ self: { }: mkDerivation { pname = "mu-rpc"; - version = "0.2.0.0"; - sha256 = "1rw4gci0m5isij0bgngbm7zjxafnkibmg3qsxs6dym19mxgqs9nk"; + version = "0.3.0.0"; + sha256 = "02m19ddp8q3khp8j6cgax24srf6dlpakq2wkjpqsa31vawn06a9g"; libraryHaskellDepends = [ base conduit mtl mu-schema sop-core template-haskell text ]; @@ -169665,8 +172068,8 @@ self: { }: mkDerivation { pname = "mu-schema"; - version = "0.2.0.0"; - sha256 = "1rdv2mvp66xy41l0g8v03szn5ndg8wji4mzpnqdd90z2xzim4z0w"; + version = "0.3.0.0"; + sha256 = "0b943w2mfrgrc2cgq4vjg1wgyb5ijdqfq9argv0k6i6b3hj97kqg"; libraryHaskellDepends = [ aeson base bytestring containers sop-core template-haskell text th-abstraction unordered-containers vector @@ -170866,8 +173269,8 @@ self: { }: mkDerivation { pname = "musicScroll"; - version = "0.2.2.0"; - sha256 = "1r1n22g98sqi8hnrkwb6cyv805ggq8770iwa4bzwiq7a59x3rlm6"; + version = "0.2.3.2"; + sha256 = "0xfjjmmf0w72x15dliaad00yi9x67xn4jfkijzdr310ppwr7j5bd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -170878,7 +173281,7 @@ self: { ]; executableHaskellDepends = [ base ]; executablePkgconfigDepends = [ gtk3 ]; - description = "Supply your tunes info without leaving your music player"; + description = "Supply your tunes info without leaving your music player."; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -171108,6 +173511,23 @@ self: { broken = true; }) {}; + "mutable-lens" = callPackage + ({ mkDerivation, base, checkers, doctest, lens, primitive, stm + , tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "mutable-lens"; + version = "0.1.0.0"; + sha256 = "12biaarl37n953bzq7rndfy49s70jmxhvraf4pm1zxgyz2skwgdc"; + libraryHaskellDepends = [ base lens primitive stm ]; + testHaskellDepends = [ + base checkers doctest lens primitive stm tasty tasty-hunit + tasty-quickcheck + ]; + description = "Interoperate mutable references with regular lens"; + license = stdenv.lib.licenses.asl20; + }) {}; + "mute-unmute" = callPackage ({ mkDerivation, base, directory, filepath, hslogger , hslogger-template, mtl, network-dbus, process @@ -171207,6 +173627,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mwc-probability_2_3_0" = callPackage + ({ mkDerivation, base, containers, mwc-random, primitive + , transformers + }: + mkDerivation { + pname = "mwc-probability"; + version = "2.3.0"; + sha256 = "1rk5n015a24bv49m2qnc66iv5hcw99zk9zflqv99pxxbpia6kiyj"; + libraryHaskellDepends = [ + base containers mwc-random primitive transformers + ]; + description = "Sampling function-based probability distributions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mwc-probability-transition" = callPackage ({ mkDerivation, base, exceptions, ghc-prim, hspec, logging-effect , mtl, mwc-probability, primitive, QuickCheck, transformers @@ -172028,6 +174464,8 @@ self: { pname = "named"; version = "0.3.0.1"; sha256 = "0dnp4qbhn6ci2dlp230gpq8c5z26wb2liani1myc598g2b3c2qij"; + revision = "1"; + editedCabalFile = "01hay5wlp803f35qp3wab1gjxrcv5lyk1hgz4r80k22xkh6dax99"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Named parameters (keyword arguments) for Haskell"; @@ -172630,8 +175068,8 @@ self: { pname = "natural-transformation"; version = "0.4"; sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma"; - revision = "7"; - editedCabalFile = "03nkhdrwki9j81clgfck4yl7ylv6dwa7gi77kknzq3s3nqlp728v"; + revision = "8"; + editedCabalFile = "007vgw2zaf2z9fyi9f0spmqn6fd8j438r3vnkgmazzvb43szmi0n"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers quickcheck-instances tasty tasty-quickcheck @@ -173191,21 +175629,21 @@ self: { }) {}; "net-mqtt-rpc" = callPackage - ({ mkDerivation, base, bytestring, net-mqtt, network-uri - , optparse-applicative, random, stm, text, uuid + ({ mkDerivation, base, bytestring, exceptions, net-mqtt + , network-uri, optparse-applicative, random, stm, text, uuid }: mkDerivation { pname = "net-mqtt-rpc"; - version = "0.1.0.0"; - sha256 = "0wzpsjyskgbnyyy7bbbg7plsypwnyi2rblvyn17a33ak43zi1fx5"; + version = "0.1.2.0"; + sha256 = "035ry63b432gy487bx9fsb7b9ql75a70ss74lrd7aby5iw8nhibl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring net-mqtt random stm text uuid + base bytestring exceptions net-mqtt random stm text uuid ]; executableHaskellDepends = [ - base bytestring net-mqtt network-uri optparse-applicative random - stm text uuid + base bytestring exceptions net-mqtt network-uri + optparse-applicative random stm text uuid ]; description = "Make RPC calls via an MQTT broker"; license = stdenv.lib.licenses.bsd3; @@ -173220,8 +175658,8 @@ self: { }: mkDerivation { pname = "net-spider"; - version = "0.4.2.0"; - sha256 = "1jpqkwgi13a0hw99andw6f8jsq8isqsqlqjc42bapy97wxba2bii"; + version = "0.4.3.1"; + sha256 = "0r0l078ljhvpacay1pwql4zccwpj8646zdzdz0gazh0yj2zs8g01"; libraryHaskellDepends = [ aeson base containers data-interval extended-reals greskell greskell-websocket hashable monad-logger regex-applicative @@ -173265,8 +175703,8 @@ self: { }: mkDerivation { pname = "net-spider-pangraph"; - version = "0.2.0.0"; - sha256 = "1ijaa4zsbm583s0bmhrc475p6q1gkx1wz3sg6698aciw0ip14kjs"; + version = "0.2.0.1"; + sha256 = "0n19hlyzb2r9kkkw1ivaify0msjv4iq69rv14cdak8x50dmvn4wq"; libraryHaskellDepends = [ base bytestring greskell net-spider pangraph text time ]; @@ -173286,8 +175724,8 @@ self: { }: mkDerivation { pname = "net-spider-rpl"; - version = "0.4.1.0"; - sha256 = "0j0w1sgr1b0vn5249agz94vlz1az9pfi8fswd72s84lpcn9jyw89"; + version = "0.4.1.1"; + sha256 = "09iwz5yrzcfb5rmlhskhzilyqbvf1al8j8qv7ag5jn6kq3pgipw3"; libraryHaskellDepends = [ aeson base conduit conduit-parse greskell hashable ip monad-logger mtl net-spider regex-applicative safe-exceptions text time @@ -173303,24 +175741,26 @@ self: { }) {}; "net-spider-rpl-cli" = callPackage - ({ mkDerivation, base, greskell, hspec, ip, monad-logger - , net-spider, net-spider-cli, net-spider-rpl, optparse-applicative - , text, time, unordered-containers + ({ mkDerivation, base, bytestring, fast-logger, fgl, greskell + , hashable, hspec, ip, monad-logger, net-spider, net-spider-cli + , net-spider-rpl, optparse-applicative, text, time, transformers + , unordered-containers }: mkDerivation { pname = "net-spider-rpl-cli"; - version = "0.1.2.2"; - sha256 = "1l8h3d3m7h48n6vn7lhzlisf6hqr311q1yjxxp2ywkyx1fn3s9pp"; + version = "0.1.3.1"; + sha256 = "0y1bagnlazd7pj240ka1lf970qclf569qbsdxas27pj1pi91jb0r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base greskell monad-logger net-spider net-spider-cli net-spider-rpl - optparse-applicative text time unordered-containers + base fgl greskell monad-logger net-spider net-spider-cli + net-spider-rpl optparse-applicative text time transformers + unordered-containers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base hspec ip net-spider net-spider-cli net-spider-rpl - optparse-applicative + base bytestring fast-logger hashable hspec ip monad-logger + net-spider net-spider-cli net-spider-rpl optparse-applicative text ]; description = "CLI executable of NetSpider.RPL."; license = stdenv.lib.licenses.bsd3; @@ -173654,7 +176094,7 @@ self: { libraryHaskellDepends = [ base containers directory filepath mtl nettle-openflow unix ]; - description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs"; + description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -173672,7 +176112,7 @@ self: { array base bimap binary binary-strict bytestring containers HList mtl network parsec syb ]; - description = "OpenFlow protocol messages, binary formats, and servers"; + description = "OpenFlow protocol messages, binary formats, and servers."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -173912,8 +176352,8 @@ self: { }: mkDerivation { pname = "network-arbitrary"; - version = "0.5.0.0"; - sha256 = "1d3m0ycibbvnjbns4havp25x9i5ri6kirv579k1xnb82by4nkqap"; + version = "0.6.0.0"; + sha256 = "0yj93r7p4nbfwhklxb7wgkaq1bfl7qjqmn3q0qlxlghbb2xhmmh1"; libraryHaskellDepends = [ base bytestring http-media http-types network-uri QuickCheck ]; @@ -174025,6 +176465,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-byte-order_0_1_5" = callPackage + ({ mkDerivation, base, bytestring, doctest }: + mkDerivation { + pname = "network-byte-order"; + version = "0.1.5"; + sha256 = "0480asy7acf1bdc4n0761rax7dijbkjkyrqfl9rdwqvmbr3viy6c"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring doctest ]; + description = "Network byte order utilities"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-bytestring" = callPackage ({ mkDerivation, base, bytestring, network, unix }: mkDerivation { @@ -174478,8 +176931,8 @@ self: { ({ mkDerivation, base, bytestring, network }: mkDerivation { pname = "network-run"; - version = "0.2.2"; - sha256 = "1znf2pafcg1gcrb3yyc69h6y5mb8hilibr5khcwil09i5djsjyxx"; + version = "0.2.3"; + sha256 = "026l8j1nfgvs3lknn3fvsjj4x4niykhn99h5kywc47347b91xl3n"; libraryHaskellDepends = [ base bytestring network ]; description = "Simple network runner library"; license = stdenv.lib.licenses.bsd3; @@ -174863,8 +177316,8 @@ self: { ({ mkDerivation, base, doctest, network-uri, template-haskell }: mkDerivation { pname = "network-uri-static"; - version = "0.1.2.1"; - sha256 = "0sfyqkm49vgw6x2xkgaa0lv2fmrzwgcz33ch333jsib0qbmji5vw"; + version = "0.1.2.2"; + sha256 = "1dxmfgd3iq9ss9c7irfnwal2fm1kpgqgmb0bc29hcqwyw6gpn8hw"; libraryHaskellDepends = [ base network-uri template-haskell ]; testHaskellDepends = [ base doctest ]; description = "A small utility to declare type-safe static URIs"; @@ -175023,6 +177476,46 @@ self: { broken = true; }) {inherit (pkgs) blas;}; + "neuron" = callPackage + ({ mkDerivation, aeson, aeson-gadt-th, algebraic-graphs, base, clay + , containers, data-default, dependent-sum, dependent-sum-template + , dhall, directory, exceptions, file-embed, filepath, filepattern + , foldl, gitrev, hspec, lucid, megaparsec, mmark, mmark-ext + , modern-uri, mtl, optparse-applicative, pandoc, parser-combinators + , QuickCheck, relude, rib, shake, text, time, unix, uuid, which + , with-utf8 + }: + mkDerivation { + pname = "neuron"; + version = "0.4.0.0"; + sha256 = "1iw63qnq484zhi2fil050hswz1hl9cvygpqalhbbhnvry3f9bqkf"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson algebraic-graphs base containers filepath filepattern + megaparsec mmark mtl parser-combinators relude text time + ]; + executableHaskellDepends = [ + aeson aeson-gadt-th algebraic-graphs base clay containers + data-default dependent-sum dependent-sum-template dhall directory + exceptions file-embed filepath filepattern foldl gitrev lucid + megaparsec mmark mmark-ext modern-uri mtl optparse-applicative + pandoc parser-combinators relude rib shake text time unix uuid + which with-utf8 + ]; + testHaskellDepends = [ + aeson aeson-gadt-th algebraic-graphs base clay containers + data-default dependent-sum dependent-sum-template dhall directory + exceptions file-embed filepath filepattern foldl gitrev hspec lucid + megaparsec mmark mmark-ext modern-uri mtl optparse-applicative + pandoc parser-combinators QuickCheck relude rib shake text time + unix uuid which with-utf8 + ]; + description = "Haskell meets Zettelkasten, for your plain-text delight"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "newhope" = callPackage ({ mkDerivation, AES, base, bytestring, containers, deepseq, hspec , HUnit, mtl, parallel, QuickCheck, raw-strings-qq, statistics @@ -175369,8 +177862,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "0.4.6.0"; - sha256 = "0bvyh1b8q2mh2labaykc7lndr2rfhzmkw8c7b56pxsa2fypfl232"; + version = "0.4.8.0"; + sha256 = "1jw6ny4qnckxyvszislqy079bh6vnq9q0f4wig8n1diljs057waj"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -175379,18 +177872,18 @@ self: { }) {}; "ngx-export-tools-extra" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, base64, bytestring - , case-insensitive, containers, ede, enclosed-exceptions - , http-client, http-types, ngx-export, ngx-export-tools, snap-core - , snap-server, template-haskell, text, time, trifecta - , unordered-containers + ({ mkDerivation, aeson, ansi-wl-pprint, base, base64, binary + , bytestring, case-insensitive, containers, ede + , enclosed-exceptions, http-client, http-types, ngx-export + , ngx-export-tools, snap-core, snap-server, template-haskell, text + , time, trifecta, unordered-containers }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "0.3.2.1"; - sha256 = "0dc7g592xcby4ycq7y19879xz83kq1d5vjh7d9ymgfmxa3nl1hrk"; + version = "0.4.1.1"; + sha256 = "15d5dj8mdihj8m559lrfwwpb55nkkkapwd9x84jxsv6pmnh5m0qh"; libraryHaskellDepends = [ - aeson ansi-wl-pprint base base64 bytestring case-insensitive + aeson ansi-wl-pprint base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client http-types ngx-export ngx-export-tools snap-core snap-server template-haskell text time trifecta unordered-containers @@ -175596,7 +178089,7 @@ self: { revision = "1"; editedCabalFile = "08hgvqbb13n2scs4shqjdyzm7kblgllndk0429pdiwdx21k5391q"; libraryHaskellDepends = [ base bytestring http-conduit xml ]; - description = "Haskell interface to the nist random beacon"; + description = "Haskell interface to the nist random beacon."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -175692,20 +178185,20 @@ self: { "nix-derivation" = callPackage ({ mkDerivation, attoparsec, base, containers, criterion, deepseq - , pretty-show, QuickCheck, system-filepath, text, vector + , filepath, pretty-show, QuickCheck, text, vector }: mkDerivation { pname = "nix-derivation"; - version = "1.0.2"; - sha256 = "16xx4817ncgqvhmydbfr35lhgiw34js2n5liyfing3qvbfprmscw"; + version = "1.1.0"; + sha256 = "09r1818j838a6mzgsqsvf7a98l3h0v7vqrnmimvycaaxri3rxmhz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base containers deepseq system-filepath text vector + attoparsec base containers deepseq filepath text vector ]; executableHaskellDepends = [ attoparsec base pretty-show text ]; testHaskellDepends = [ - attoparsec base QuickCheck system-filepath text vector + attoparsec base filepath QuickCheck text vector ]; benchmarkHaskellDepends = [ attoparsec base criterion text ]; description = "Parse and render *.drv files"; @@ -175714,18 +178207,17 @@ self: { "nix-diff" = callPackage ({ mkDerivation, attoparsec, base, containers, Diff, mtl - , nix-derivation, optparse-applicative, system-filepath, text, unix - , vector + , nix-derivation, optparse-applicative, text, unix, vector }: mkDerivation { pname = "nix-diff"; - version = "1.0.9"; - sha256 = "0gqrx0l6f10gwsz645dby2gascd0sanajvd2rkg65c61g8j7pxv4"; + version = "1.0.10"; + sha256 = "0lcm4s28c4dgry3r1wj5zmb59izfi6vvyivxkpgyv9fhqmyiid4c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ attoparsec base containers Diff mtl nix-derivation - optparse-applicative system-filepath text unix vector + optparse-applicative text unix vector ]; description = "Explain why two Nix derivations differ"; license = stdenv.lib.licenses.bsd3; @@ -175778,6 +178270,27 @@ self: { broken = true; }) {}; + "nix-narinfo" = callPackage + ({ mkDerivation, attoparsec, base, containers, filepath, hspec + , QuickCheck, text + }: + mkDerivation { + pname = "nix-narinfo"; + version = "0.1.0.0"; + sha256 = "1jv7bwjfp2b2c63gfnlznmc1r4bnf6mvlkngcipvyhnxr0mwpxfy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ attoparsec base containers text ]; + executableHaskellDepends = [ attoparsec base text ]; + testHaskellDepends = [ + attoparsec base filepath hspec QuickCheck text + ]; + description = "Parse and render .narinfo files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "nix-paths" = callPackage ({ mkDerivation, base, nix, process }: mkDerivation { @@ -176395,6 +178908,8 @@ self: { pname = "nonce"; version = "1.0.7"; sha256 = "1q9ph0aq51mvdvydnriqd12sfin36pfb8f588zgac1ybn8r64ksb"; + revision = "1"; + editedCabalFile = "1i6f4nwp4xn31as6plqrf6wp6gn3ylwdi77h99572jy7p3985aw1"; libraryHaskellDepends = [ base base64-bytestring bytestring entropy text transformers unliftio unliftio-core @@ -176680,7 +179195,7 @@ self: { version = "0.1.1"; sha256 = "1mm1j0l3h8qxpk0bis4g1f6zp5407rkq2z5ldyr036frbvfwqaj5"; libraryHaskellDepends = [ base ]; - description = "Useful utility functions that only depend on base"; + description = "Useful utility functions that only depend on base."; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -177066,6 +179581,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nuha" = callPackage + ({ mkDerivation, base, vector }: + mkDerivation { + pname = "nuha"; + version = "0.2.0.0"; + sha256 = "1xcxr7nq8k2lj3xl3h3p2d4wn4zqjzy5bwc8pixl3nf5q57nz3gi"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ base vector ]; + description = "Multidimensional arrays, Linear algebra"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "null-canvas" = callPackage ({ mkDerivation, aeson, base, containers, filepath, scotty, split , stm, text, transformers, wai-extra, warp @@ -177666,10 +180193,8 @@ self: { }: mkDerivation { pname = "nvim-hs"; - version = "2.1.0.2"; - sha256 = "0amlvrh213n9cfqax5gcy7zq3fd8q9hcskhjkbayvzsyf5hhr1rn"; - revision = "1"; - editedCabalFile = "1v52rmk7hbdn40964r50jjz3lanfc5q8xrdqpv1wmwviw3j4rip8"; + version = "2.1.0.3"; + sha256 = "19834hldpywsg52144i9b372msmw5pcj7v0fwiii14pns4sf6v7v"; libraryHaskellDepends = [ base bytestring cereal cereal-conduit conduit containers data-default deepseq foreign-store hslogger megaparsec messagepack @@ -178178,6 +180703,26 @@ self: { broken = true; }) {}; + "ochan" = callPackage + ({ mkDerivation, async, base, bytestring, mtl, oref, text + , transformers + }: + mkDerivation { + pname = "ochan"; + version = "0.1.0"; + sha256 = "0hzk5y7qnx3mv6x913k98qgnnq7niq6gvic2qjz3vdxpi2rx303d"; + libraryHaskellDepends = [ + async base bytestring mtl oref text transformers + ]; + testHaskellDepends = [ + async base bytestring mtl oref text transformers + ]; + description = "Owned channels in the Ownership Monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ochintin-daicho" = callPackage ({ mkDerivation, base, bookkeeping, doctest, Glob, mono-traversable , text, transaction @@ -178324,6 +180869,56 @@ self: { broken = true; }) {inherit (pkgs) unixODBC;}; + "odd-jobs" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , direct-daemonize, directory, either, fast-logger, filepath + , foreign-store, friendly-time, hedgehog, hostname, lifted-async + , lifted-base, lucid, mmorph, monad-control, monad-logger, mtl + , optparse-applicative, postgresql-simple, random, resource-pool + , safe, servant, servant-lucid, servant-server, string-conv, tasty + , tasty-discover, tasty-hedgehog, tasty-hunit, text + , text-conversions, time, timing-convenience, unix, unliftio + , unliftio-core, unordered-containers, warp + }: + mkDerivation { + pname = "odd-jobs"; + version = "0.1.0"; + sha256 = "0l1b63j76a8rbhligj7s282bzrw2dgb7jv8cki1a7ss0v58k3c4s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring direct-daemonize directory either fast-logger + filepath friendly-time hostname lucid monad-control monad-logger + mtl optparse-applicative postgresql-simple resource-pool safe + servant servant-lucid servant-server string-conv text + text-conversions time timing-convenience unix unliftio + unliftio-core unordered-containers warp + ]; + executableHaskellDepends = [ + aeson base bytestring direct-daemonize directory either fast-logger + filepath foreign-store friendly-time hostname lucid monad-control + monad-logger mtl optparse-applicative postgresql-simple + resource-pool safe servant servant-lucid servant-server string-conv + text text-conversions time timing-convenience unix unliftio + unliftio-core unordered-containers warp + ]; + testHaskellDepends = [ + aeson base bytestring containers direct-daemonize directory either + fast-logger filepath friendly-time hedgehog hostname lifted-async + lifted-base lucid mmorph monad-control monad-logger mtl + optparse-applicative postgresql-simple random resource-pool safe + servant servant-lucid servant-server string-conv tasty + tasty-discover tasty-hedgehog tasty-hunit text text-conversions + time timing-convenience unix unliftio unliftio-core + unordered-containers warp + ]; + testToolDepends = [ tasty-discover ]; + description = "A full-featured PostgreSQL-backed job queue (with an admin UI)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "oden-go-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text , unordered-containers @@ -178924,6 +181519,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "online-csv" = callPackage + ({ mkDerivation, attoparsec, base, box, doctest, foldl + , generic-lens, lens, numhask-prelude, scientific, text + , text-format + }: + mkDerivation { + pname = "online-csv"; + version = "0.0.1"; + sha256 = "0fibv9k9py6mszjnj501cak4jhdz6iyy6qp56cp1vvsbkv44m8ll"; + libraryHaskellDepends = [ + attoparsec base box foldl generic-lens lens numhask-prelude + scientific text text-format + ]; + testHaskellDepends = [ base doctest numhask-prelude ]; + description = "See readme.md"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "only" = callPackage ({ mkDerivation, base, parsec, regex-compat }: mkDerivation { @@ -178998,8 +181613,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.6.7004.1"; - sha256 = "09jgdqkw8hp82b3x0fg9906gyxwl9gz3hifv2dvrj915fvgiybg1"; + version = "0.6.7004.2"; + sha256 = "0lmfpbrfy6l7nlkjn26smmv3n992b54xnplwm67jjpryaz7psdz1"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -179275,6 +181890,27 @@ self: { broken = true; }) {}; + "openapi-typed" = callPackage + ({ mkDerivation, aeson, base, hspec, optics-core, optics-extra + , text, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "openapi-typed"; + version = "0.0.0.1"; + sha256 = "06wbcd5cr2dfdj1hbzi01byfr2lvvv0sncjsbx9n6vq2anh54wkm"; + libraryHaskellDepends = [ + aeson base text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base hspec optics-core optics-extra text unordered-containers + yaml + ]; + description = "Types for OpenAPI"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "opench-meteo" = callPackage ({ mkDerivation, aeson, base, data-default, text, time }: mkDerivation { @@ -179532,6 +182168,8 @@ self: { ]; description = "An OpenID Connect library that does all the heavy lifting for you"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "openpgp" = callPackage @@ -179757,26 +182395,50 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "opentelemetry_0_2_0" = callPackage - ({ mkDerivation, async, base, bytestring, clock, directory - , exceptions, hashable, random, stm, tasty, tasty-discover - , tasty-hunit, tasty-quickcheck, text, unordered-containers - }: + "opentelemetry_0_4_0" = callPackage + ({ mkDerivation, base, bytestring, exceptions }: mkDerivation { pname = "opentelemetry"; - version = "0.2.0"; - sha256 = "1nxkghxwjkgvdk6xhpssa7aifryn6rr0agbhyc0ybf2c76r1pr8b"; + version = "0.4.0"; + sha256 = "1wp6r6625qangiw3lk2nj64khbb0jnp7rxb8s78q37icpdax9ck8"; + libraryHaskellDepends = [ base bytestring exceptions ]; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "opentelemetry-extra" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, clock, containers + , directory, exceptions, filepath, ghc-events, hashable + , http-client, http-client-tls, http-types, opentelemetry + , QuickCheck, random, scientific, splitmix, stm, tasty + , tasty-discover, tasty-hunit, tasty-quickcheck, text, text-show + , typed-process, unordered-containers + }: + mkDerivation { + pname = "opentelemetry-extra"; + version = "0.4.0"; + sha256 = "07bzs9nz6hmy2cqa84wi3vbhfz0l6da5w5ihzmajxi7b2w940h0r"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base bytestring clock directory exceptions hashable random stm text + aeson async base bytestring clock containers directory exceptions + filepath ghc-events hashable http-client http-client-tls http-types + opentelemetry random scientific splitmix stm text text-show unordered-containers ]; + executableHaskellDepends = [ + async base clock exceptions filepath http-client http-client-tls + opentelemetry text typed-process + ]; testHaskellDepends = [ - async base bytestring tasty tasty-discover tasty-hunit - tasty-quickcheck + base bytestring ghc-events hashable opentelemetry QuickCheck tasty + tasty-discover tasty-hunit tasty-quickcheck text text-show + unordered-containers ]; testToolDepends = [ tasty-discover ]; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "opentelemetry-http-client" = callPackage @@ -179795,32 +182457,44 @@ self: { }) {}; "opentelemetry-lightstep" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, exceptions - , http-client, http-client-tls, http-types, network, opentelemetry - , scientific, stm, text, unordered-containers + ({ mkDerivation, aeson, async, base, bytestring, clock, containers + , exceptions, filepath, ghc-events, http-client, http-client-tls + , http-types, network, opentelemetry, opentelemetry-extra + , scientific, splitmix, stm, text, typed-process + , unordered-containers }: mkDerivation { pname = "opentelemetry-lightstep"; - version = "0.2.0"; - sha256 = "03fv2lgwkqngp26rdrk2fzvnccdgjc7xsv3sl3adb3xwzppkn0xh"; + version = "0.4.0"; + sha256 = "13glzxw93nx7gxqyisn7ikg2g9gl19mapl75p13binhip5ygcvpd"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson async base bytestring exceptions http-client http-client-tls - http-types network opentelemetry scientific stm text - unordered-containers + http-types network opentelemetry opentelemetry-extra scientific stm + text unordered-containers + ]; + executableHaskellDepends = [ + async base bytestring clock containers exceptions filepath + ghc-events http-client http-types opentelemetry opentelemetry-extra + splitmix text typed-process unordered-containers ]; - testHaskellDepends = [ async base opentelemetry ]; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; "opentelemetry-wai" = callPackage - ({ mkDerivation, base, http-types, opentelemetry, text, wai }: + ({ mkDerivation, base, bytestring, http-types, opentelemetry, text + , wai + }: mkDerivation { pname = "opentelemetry-wai"; - version = "0.2.0"; - sha256 = "1n27g8xjij05g7xxx8z50k39nmclhm707xs2pfqy830zdq1ldfl4"; - libraryHaskellDepends = [ base http-types opentelemetry text wai ]; + version = "0.4.0"; + sha256 = "00nvclimx6jh8sa3hfdrfag8sa29yqqknfqh3sg37sh0fbcqghjg"; + libraryHaskellDepends = [ + base bytestring http-types opentelemetry text wai + ]; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -180086,8 +182760,8 @@ self: { }: mkDerivation { pname = "openweathermap"; - version = "0.0.0"; - sha256 = "1ndd54pwbgkk10ah6125hgs8gn6l2bzz2r0mkc2f30y90m8mr7ll"; + version = "0.1.0"; + sha256 = "140m5jlbcrz42m5fr7cmq0n7zbdb0gcxwcvlpl0cb6r1vg4xp9qj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180261,6 +182935,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optics_0_3" = callPackage + ({ mkDerivation, array, base, bytestring, containers, criterion + , indexed-profunctors, inspection-testing, lens, mtl, optics-core + , optics-extra, optics-th, QuickCheck, random, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "optics"; + version = "0.3"; + sha256 = "0v0kgj9ihb655a6n9j5w55s2lrkfd31pf9z17ida4xcrimzv6q02"; + libraryHaskellDepends = [ + array base containers mtl optics-core optics-extra optics-th + transformers + ]; + testHaskellDepends = [ + base containers indexed-profunctors inspection-testing mtl + optics-core QuickCheck random tasty tasty-hunit tasty-quickcheck + template-haskell + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion lens transformers + unordered-containers vector + ]; + description = "Optics as an abstract interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optics-core" = callPackage ({ mkDerivation, array, base, containers, indexed-profunctors , transformers @@ -180278,6 +182981,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optics-core_0_3" = callPackage + ({ mkDerivation, array, base, containers, indexed-profunctors + , transformers + }: + mkDerivation { + pname = "optics-core"; + version = "0.3"; + sha256 = "0gjxbrgp7c9k40782i2hm0pmb4fdrzcwbkq1xsj1835xszzxlp8n"; + libraryHaskellDepends = [ + array base containers indexed-profunctors transformers + ]; + description = "Optics as an abstract interface: core definitions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optics-extra" = callPackage ({ mkDerivation, array, base, bytestring, containers, hashable , indexed-profunctors, mtl, optics-core, text, transformers @@ -180295,6 +183014,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optics-extra_0_3" = callPackage + ({ mkDerivation, array, base, bytestring, containers, hashable + , indexed-profunctors, mtl, optics-core, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "optics-extra"; + version = "0.3"; + sha256 = "15vnznmi4h9xrrp7dk6fqgz9cwlqlmdr2h4nx1n5q6hi2ic1bmm4"; + libraryHaskellDepends = [ + array base bytestring containers hashable indexed-profunctors mtl + optics-core text transformers unordered-containers vector + ]; + description = "Extra utilities and instances for optics-core"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optics-th" = callPackage ({ mkDerivation, base, containers, mtl, optics-core , template-haskell, th-abstraction, transformers @@ -180312,6 +183049,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optics-th_0_3" = callPackage + ({ mkDerivation, base, containers, mtl, optics-core, tagged + , template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "optics-th"; + version = "0.3"; + sha256 = "1k8kwii9jn1gjswkf7p5j5yvq7p9z8rs09ak78s5lmvxkh4c7035"; + libraryHaskellDepends = [ + base containers mtl optics-core template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base optics-core tagged ]; + description = "Optics construction using TemplateHaskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optics-vl" = callPackage ({ mkDerivation, base, indexed-profunctors, optics-core , profunctors @@ -180327,6 +183082,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optics-vl_0_2_1" = callPackage + ({ mkDerivation, base, indexed-profunctors, optics-core + , profunctors + }: + mkDerivation { + pname = "optics-vl"; + version = "0.2.1"; + sha256 = "1xrkak0cn2imgqr641wzysgynykyj438m3ywgdm9h14k17inv55v"; + libraryHaskellDepends = [ + base indexed-profunctors optics-core profunctors + ]; + description = "Utilities for compatibility with van Laarhoven optics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optima" = callPackage ({ mkDerivation, attoparsec, attoparsec-data, base , optparse-applicative, rerebase, text, text-builder @@ -180820,6 +183591,8 @@ self: { pname = "orders"; version = "0.1.0.0"; sha256 = "1ry6flg5sh3hl1xpkqk67ayd4y0xx3j2pwcz26q1pgqn6m84plzr"; + revision = "1"; + editedCabalFile = "1ilyg95l97xp4ym402g499ysfbwqsw413kpk4gvi5hd861xx2laj"; libraryHaskellDepends = [ base containers ]; description = "basic orders"; license = stdenv.lib.licenses.bsd3; @@ -180843,6 +183616,22 @@ self: { broken = true; }) {}; + "oref" = callPackage + ({ mkDerivation, base, containers, either, mtl, transformers }: + mkDerivation { + pname = "oref"; + version = "0.0.3"; + sha256 = "0cfs0nhxbi580gffba9lz0j36cggwqafxkz821xrd4j4i36a7k5v"; + libraryHaskellDepends = [ + base containers either mtl transformers + ]; + testHaskellDepends = [ base containers either mtl transformers ]; + description = "Owned references in the Ownership Monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "org-mode" = callPackage ({ mkDerivation, base, containers, filepath, hashable, megaparsec , parser-combinators, tasty, tasty-hunit, text @@ -181069,6 +183858,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ormolu_0_0_5_0" = callPackage + ({ mkDerivation, base, bytestring, containers, dlist, exceptions + , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl + , optparse-applicative, path, path-io, syb, text + }: + mkDerivation { + pname = "ormolu"; + version = "0.0.5.0"; + sha256 = "1sf22silpj89sldd7wanlr34nsv77bq0cf4i0q1x2r20pz7s4w4m"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers dlist exceptions ghc-lib-parser mtl syb + text + ]; + executableHaskellDepends = [ + base ghc-lib-parser gitrev optparse-applicative text + ]; + testHaskellDepends = [ + base containers filepath hspec path path-io text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "os-release" = callPackage ({ mkDerivation, base, containers, hlint, hspec, parsec, process , regex-compat, temporary, transformers @@ -181352,27 +184169,31 @@ self: { }) {}; "overloaded" = callPackage - ({ mkDerivation, base, bin, bytestring, containers, fin - , generic-lens, ghc, HUnit, lens, optics-core, ral, record-hasfield - , singleton-bool, sop-core, split, syb, symbols, tasty, tasty-hunit - , text, time, vec + ({ mkDerivation, assoc, base, bin, boring, bytestring, constraints + , containers, fin, generic-lens-lite, ghc, hmatrix, HUnit, lens + , optics-core, QuickCheck, ral, record-hasfield, singleton-bool + , sop-core, split, syb, symbols, tasty, tasty-hunit + , tasty-quickcheck, text, time, vec }: mkDerivation { pname = "overloaded"; - version = "0.2"; - sha256 = "1kp3vbdfwp9caicmj2k1qznbsn844pm75sy8ywwm86334f08vshk"; + version = "0.2.1"; + sha256 = "1qa2xq2hf792ivi92mimznwj86x9y1dpwz7rwcz99zvfk7a3hsis"; libraryHaskellDepends = [ - base bin bytestring containers fin ghc optics-core ral + assoc base bin bytestring containers fin ghc optics-core ral record-hasfield sop-core split syb symbols text time vec ]; testHaskellDepends = [ - base bin bytestring containers fin generic-lens HUnit lens - optics-core ral record-hasfield singleton-bool sop-core symbols - tasty tasty-hunit text time vec + assoc base bin boring bytestring constraints containers fin + generic-lens-lite hmatrix HUnit lens optics-core QuickCheck ral + record-hasfield singleton-bool sop-core symbols tasty tasty-hunit + tasty-quickcheck text time vec ]; doHaddock = false; description = "Overloaded pragmas as a plugin"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "overloaded-records" = callPackage @@ -181496,6 +184317,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "packcheck_0_5_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "packcheck"; + version = "0.5.0"; + sha256 = "1ch6q58sxzv6dld8dwpkcd7wkakh3swnv6sgsvw9ri8zgygpn4ck"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base ]; + description = "Universal build and CI testing for Haskell packages"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "packdeps" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, optparse-applicative, process, semigroups, split, tar @@ -181561,7 +184396,7 @@ self: { base binary criterion deepseq mtl unordered-containers vector vector-binary-instances ]; - description = "Generation and traversal of highly compressed directed acyclic word graphs"; + description = "Generation and traversal of highly compressed directed acyclic word graphs."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -181822,19 +184657,18 @@ self: { }) {}; "pagure-cli" = callPackage - ({ mkDerivation, base, bytestring, http-client, http-client-tls - , microlens, microlens-aeson, optparse-applicative, simple-cmd-args - , text + ({ mkDerivation, aeson, base, bytestring, filepath, http-conduit + , lens, lens-aeson, optparse-applicative, simple-cmd-args, text }: mkDerivation { pname = "pagure-cli"; - version = "0.1"; - sha256 = "092frs6240wf4nyqdkhny3jkd4v7gjmnd5gwxv9vlprimszns1vi"; + version = "0.2"; + sha256 = "0hl1m23kwx5xd1nbaswnnqm0qrr8mcc7zvb28q47bdgfix2yhy7r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring http-client http-client-tls microlens - microlens-aeson optparse-applicative simple-cmd-args text + aeson base bytestring filepath http-conduit lens lens-aeson + optparse-applicative simple-cmd-args text ]; description = "Pagure client"; license = stdenv.lib.licenses.gpl2; @@ -181879,8 +184713,8 @@ self: { }: mkDerivation { pname = "pairing"; - version = "1.0.0"; - sha256 = "0mcjd463ffgq2ghvbi2h02dxy0p40ilhazznn2zqzqp7gksrhvfd"; + version = "1.1.0"; + sha256 = "1k19bmdnc9dlm62b6hvjnc4k7j3yi5hsc0m8yvw33qb63ci36mmk"; libraryHaskellDepends = [ base bytestring elliptic-curve errors galois-field groups MonadRandom protolude tasty-quickcheck @@ -182366,12 +185200,12 @@ self: { }) {}; "pandoc-lens" = callPackage - ({ mkDerivation, base, containers, lens, pandoc-types }: + ({ mkDerivation, base, containers, lens, pandoc-types, text }: mkDerivation { pname = "pandoc-lens"; - version = "0.6.3"; - sha256 = "1gv9n753qp8l7fivi96sgb8qsia5bijw2fla21dxyn81qza3fk6v"; - libraryHaskellDepends = [ base containers lens pandoc-types ]; + version = "0.7.0"; + sha256 = "0prc0wv808l1l7m6rg78r6alwqgajj0h2yn3w7sgxmsvxdr8aj1w"; + libraryHaskellDepends = [ base containers lens pandoc-types text ]; description = "Lenses for Pandoc documents"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -182462,8 +185296,41 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "0.2.1.0"; - sha256 = "1q5ai86bmxdx1vw0wmp1gbg3sd4ys4gq58hivri5nz3ggfjdvy3b"; + version = "0.2.2.0"; + sha256 = "15xs3rrqc7hygmmiylfykdqhqsr7giqdhw3hmmnff8s8k708qv33"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-default-class directory filepath hashable mtl + pandoc pandoc-types parallel-io shakespeare temporary text turtle + typed-process yaml + ]; + executableHaskellDepends = [ + base data-default-class deepseq directory filepath open-browser + optparse-applicative pandoc pandoc-types template-haskell temporary + text + ]; + testHaskellDepends = [ + base data-default-class directory filepath hspec hspec-expectations + mtl pandoc-types tasty tasty-hspec tasty-hunit temporary text + ]; + description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "pandoc-plot_0_3_0_0" = callPackage + ({ mkDerivation, base, containers, data-default-class, deepseq + , directory, filepath, hashable, hspec, hspec-expectations, mtl + , open-browser, optparse-applicative, pandoc, pandoc-types + , parallel-io, shakespeare, tasty, tasty-hspec, tasty-hunit + , template-haskell, temporary, text, turtle, typed-process, yaml + }: + mkDerivation { + pname = "pandoc-plot"; + version = "0.3.0.0"; + sha256 = "143kr0s4p155apnspjjkv3xc7ffm6vl4bvifyr8rl72yk0lx81ac"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182611,8 +185478,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.2.5"; - sha256 = "1nj56liyyrgmng4290p19zf89c3lyi6pzqjrqr4bfc0gmmkm4719"; + version = "0.2.7"; + sha256 = "1fagym17jg4df445d8jr2lc52rx9irmnz7kv4g236py311z7bmbq"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -182857,6 +185724,48 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pantry_0_5_0_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal + , casa-client, casa-types, conduit, conduit-extra, containers + , cryptonite, cryptonite-conduit, digest, exceptions, filelock + , generic-deriving, hackage-security, hedgehog, hpack, hspec + , http-client, http-client-tls, http-conduit, http-download + , http-types, memory, mtl, network-uri, path, path-io, persistent + , persistent-sqlite, persistent-template, primitive, QuickCheck + , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint + , tar-conduit, text, text-metrics, time, transformers, unix-compat + , unliftio, unordered-containers, vector, yaml, zip-archive + }: + mkDerivation { + pname = "pantry"; + version = "0.5.0.0"; + sha256 = "1v5nnmrg62phnwym8cw6bjld8impdmrkq9cwxmyrab48gjwds41l"; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest filelock generic-deriving hackage-security hpack http-client + http-client-tls http-conduit http-download http-types memory mtl + network-uri path path-io persistent persistent-sqlite + persistent-template primitive resourcet rio rio-orphans + rio-prettyprint tar-conduit text text-metrics time transformers + unix-compat unliftio unordered-containers vector yaml zip-archive + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest exceptions filelock generic-deriving hackage-security + hedgehog hpack hspec http-client http-client-tls http-conduit + http-download http-types memory mtl network-uri path path-io + persistent persistent-sqlite persistent-template primitive + QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint + tar-conduit text text-metrics time transformers unix-compat + unliftio unordered-containers vector yaml zip-archive + ]; + description = "Content addressable Haskell package management"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pantry-tmp" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans , base64-bytestring, bytestring, Cabal, conduit, conduit-extra @@ -183354,12 +186263,28 @@ self: { broken = true; }) {}; + "par-dual" = callPackage + ({ mkDerivation, async, base, hedgehog, refined, template-haskell + , validators + }: + mkDerivation { + pname = "par-dual"; + version = "0.1.0.0"; + sha256 = "0ys01vw0jyr51wwi0nccb552csc5d21np2pi7pi8jzi0k3g35i1v"; + libraryHaskellDepends = [ async base validators ]; + testHaskellDepends = [ + base hedgehog refined template-haskell validators + ]; + description = "ParDual class for Parallel <-> Sequential"; + license = stdenv.lib.licenses.asl20; + }) {}; + "par-traverse" = callPackage ({ mkDerivation, base, directory, filepath, parallel-io }: mkDerivation { pname = "par-traverse"; - version = "0.2.0.0"; - sha256 = "1cbanrhaad3fq2kkpdkb3rh7c8qrc1v7by8v6mg4lrgghdx3msk8"; + version = "0.2.1.0"; + sha256 = "0rmv6wyisdg4srzjykikqqigfji6x5zn1cz2v3cyl0dms4yr4lig"; libraryHaskellDepends = [ base directory filepath parallel-io ]; description = "Traverse a directory in parallel"; license = stdenv.lib.licenses.bsd3; @@ -183944,10 +186869,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "parsec1"; - version = "1.0.0.6"; - sha256 = "0wwmghla8cqmmpwx9wwcmh39d9np9cgc1d0w3xf18k4adb1sg636"; - revision = "1"; - editedCabalFile = "0wnyg8blygix98w8gwqrm8z8r774zr9y2qvhkfb336zgdvdlif9x"; + version = "1.0.0.7"; + sha256 = "1v9kq4g378v8pkj8ldpqwh9dwlng5idbxqqb8ywmzdjnglih34rf"; libraryHaskellDepends = [ base ]; description = "Portable monadic parser combinators"; license = stdenv.lib.licenses.bsd3; @@ -184517,6 +187440,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "password_2_0_1_0" = callPackage + ({ mkDerivation, base, base-compat, base64, bytestring, Cabal + , cabal-doctest, cryptonite, doctest, memory, QuickCheck + , quickcheck-instances, scrypt, tasty, tasty-quickcheck + , template-haskell, text + }: + mkDerivation { + pname = "password"; + version = "2.0.1.0"; + sha256 = "1f4bzjhpvxp3ms0nnh04g91wd77l09hvp1m7l6clc51frflh3j04"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base64 bytestring cryptonite memory text + ]; + testHaskellDepends = [ + base base-compat bytestring cryptonite doctest memory QuickCheck + quickcheck-instances scrypt tasty tasty-quickcheck template-haskell + text + ]; + description = "Hashing and checking of passwords"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "password-instances" = callPackage ({ mkDerivation, aeson, base, doctest, http-api-data, password , persistent, QuickCheck, quickcheck-instances @@ -184535,6 +187482,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "password-instances_2_0_0_1" = callPackage + ({ mkDerivation, aeson, base, base-compat, Cabal, cabal-doctest + , doctest, http-api-data, password, persistent, QuickCheck + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, text + }: + mkDerivation { + pname = "password-instances"; + version = "2.0.0.1"; + sha256 = "1az6j3yh92nr1ksh4f966y7v8v81l9l14r8qfakf5h62iznwqv2q"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson base http-api-data password persistent text + ]; + testHaskellDepends = [ + aeson base base-compat doctest http-api-data password persistent + QuickCheck quickcheck-instances tasty tasty-hunit tasty-quickcheck + template-haskell text + ]; + description = "typeclass instances for password package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "passwords" = callPackage ({ mkDerivation, base, containers, MonadRandom, random }: mkDerivation { @@ -185832,6 +188803,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "penntreebank-megaparsec" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover + , megaparsec, mtl, template-haskell, text, transformers + }: + mkDerivation { + pname = "penntreebank-megaparsec"; + version = "0.2.0"; + sha256 = "1238y2wya0ryas58n0b0l4gjmsrzl0dwns0f4gx5m8q6aq4d33c9"; + libraryHaskellDepends = [ + base containers megaparsec mtl template-haskell transformers + ]; + testHaskellDepends = [ + base containers hspec megaparsec mtl template-haskell text + transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Parser combinators for trees in the Penn Treebank format"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "penny" = callPackage ({ mkDerivation, action-permutations, anonymous-sums, base , bytestring, cereal, containers, contravariant, either, matchers @@ -185987,8 +188978,8 @@ self: { }: mkDerivation { pname = "perceptual-hash"; - version = "0.1.3.3"; - sha256 = "15f36b1xv5lq7gw7nd10mmhfyi935v07rdq04vzl2msdd6cn0j3d"; + version = "0.1.3.5"; + sha256 = "0f36sy9ixwbx55m3634lr0hrhllj68wv5jilzq0xik2171g3rx2p"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -186321,6 +189312,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persist_0_1_1_5" = callPackage + ({ mkDerivation, base, bytestring, containers, QuickCheck + , test-framework, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "persist"; + version = "0.1.1.5"; + sha256 = "19s0jpbcas6c64lzl9plhp1b3qk89g3jrqhj2ljxvkzk81dbr2r3"; + libraryHaskellDepends = [ base bytestring containers text ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 text + ]; + description = "Minimal serialization library with focus on performance"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persist2er" = callPackage ({ mkDerivation, base, optparse-applicative, persistent, text }: mkDerivation { @@ -186832,8 +189841,6 @@ self: { ]; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "persistent-protobuf" = callPackage @@ -186882,7 +189889,7 @@ self: { version = "0.3.0.0"; sha256 = "05h7wlw82ljjic50qhzlldhidz344id1fpf0yaxrhqvx7wkgyi2m"; libraryHaskellDepends = [ base time yesod ]; - description = "A library for rate limiting activities with a persistent backend"; + description = "A library for rate limiting activities with a persistent backend."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -187063,6 +190070,35 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-template_2_8_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, deepseq-generics, file-embed, hspec, http-api-data + , monad-control, monad-logger, path-pieces, persistent, QuickCheck + , template-haskell, text, th-lift-instances, transformers + , unordered-containers + }: + mkDerivation { + pname = "persistent-template"; + version = "2.8.3.0"; + sha256 = "0ss6xa8lg6fg7ch9b2ps2s0nn87dp070xwm23z33mj2m5jd6n7kr"; + libraryHaskellDepends = [ + aeson base bytestring containers http-api-data monad-control + monad-logger path-pieces persistent template-haskell text + th-lift-instances transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec persistent QuickCheck text + ]; + benchmarkHaskellDepends = [ + base criterion deepseq deepseq-generics file-embed persistent + template-haskell text + ]; + description = "Type-safe, non-relational, multi-backend persistence"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-template-classy" = callPackage ({ mkDerivation, base, lens, persistent, persistent-sqlite , persistent-template, template-haskell, text @@ -190585,6 +193621,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "plzwrk" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hashable + , haskell-src-meta, hspec, mtl, parsec, split, template-haskell + , text, transformers, unordered-containers + }: + mkDerivation { + pname = "plzwrk"; + version = "0.0.0.9"; + sha256 = "0wszr36ypaig8bijhn7v0d487vas423whrkxsv5q5l2xganr05cp"; + libraryHaskellDepends = [ + aeson base bytestring containers hashable haskell-src-meta mtl + parsec split template-haskell text transformers + unordered-containers + ]; + testHaskellDepends = [ base hspec mtl text unordered-containers ]; + description = "A front-end framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "png-file" = callPackage ({ mkDerivation, array, base, binary-file, bytestring, monads-tf , template-haskell, zlib @@ -191068,6 +194125,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "poly_0_4_0_0" = callPackage + ({ mkDerivation, base, deepseq, gauge, mod, primitive, QuickCheck + , quickcheck-classes, semirings, tasty, tasty-quickcheck, vector + , vector-algorithms + }: + mkDerivation { + pname = "poly"; + version = "0.4.0.0"; + sha256 = "14fqwzpivk5ic06ip5b2axvmzyrfqsba8iq4mdl70k6icv7nc8jr"; + libraryHaskellDepends = [ + base deepseq primitive semirings vector vector-algorithms + ]; + testHaskellDepends = [ + base mod QuickCheck quickcheck-classes semirings tasty + tasty-quickcheck vector + ]; + benchmarkHaskellDepends = [ base deepseq gauge semirings vector ]; + description = "Polynomials"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "poly-arity" = callPackage ({ mkDerivation, base, constraints }: mkDerivation { @@ -191457,6 +194536,8 @@ self: { pname = "pomaps"; version = "0.2.0.0"; sha256 = "1a3vf0r69263gpq1aass2x5wcmgrfk16pnsf4wsvrnka5lgnsijp"; + revision = "1"; + editedCabalFile = "1srihzg6wm2ydg6kr3q2n7pqk4wp4mhqscansi670pdzblv7ljkn"; libraryHaskellDepends = [ base containers deepseq ghc-prim lattices ]; @@ -191609,6 +194690,22 @@ self: { broken = true; }) {}; + "pontarius-xmpp-extras" = callPackage + ({ mkDerivation, base, data-default, pontarius-xmpp, text, time + , xml-types + }: + mkDerivation { + pname = "pontarius-xmpp-extras"; + version = "0.1.0.1"; + sha256 = "04qaq8m2c8l8my89n0p6x2r3hqw9nmivk1mjkip0wgw2cj3ia7h6"; + libraryHaskellDepends = [ + base data-default pontarius-xmpp text time xml-types + ]; + description = "XEPs implementation on top of pontarius-xmpp"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pontarius-xpmn" = callPackage ({ mkDerivation, base, containers, pontarius-xmpp, random, text , xml-types @@ -191718,6 +194815,25 @@ self: { broken = true; }) {}; + "popkey" = callPackage + ({ mkDerivation, base, bitvec, bytestring, containers, hspec + , hspec-discover, hw-bits, hw-prim, hw-rankselect + , hw-rankselect-base, profunctors, QuickCheck, store, text, vector + }: + mkDerivation { + pname = "popkey"; + version = "0.0.0.1"; + sha256 = "1gplzbbj6whmxchxr78zv32ixlf79sjgdz950jixl7z9p5pdrki7"; + libraryHaskellDepends = [ + base bitvec bytestring containers hw-bits hw-prim hw-rankselect + hw-rankselect-base profunctors store text vector + ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Static key-value storage backed by poppy"; + license = stdenv.lib.licenses.mit; + }) {}; + "poppler" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers , gdk-pixbuf, glib, gtk, gtk2, gtk2hs-buildtools, mtl, pango @@ -192890,19 +196006,28 @@ self: { }) {}; "postgresql-syntax" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, pg_query, rerebase - , text + ({ mkDerivation, base, bytestring, case-insensitive, fast-builder + , hashable, headed-megaparsec, hedgehog, megaparsec + , parser-combinators, QuickCheck, quickcheck-instances, rerebase + , tasty, tasty-hunit, tasty-quickcheck, text, text-builder + , unordered-containers }: mkDerivation { pname = "postgresql-syntax"; - version = "0.1"; - sha256 = "1x658jg0507n3085g8m24qixlixjz9ngxn6c5wqislh9i1rl5d7k"; - libraryHaskellDepends = [ base base-prelude bytestring text ]; - librarySystemDepends = [ pg_query ]; - testHaskellDepends = [ rerebase ]; - description = "PostgreSQL SQL syntax utilities"; + version = "0.3.0.2"; + sha256 = "1gl0k3idcgpnahh8mv01mjzhc4yx6i3f7shfa7mqhcgs6r1ccdhz"; + libraryHaskellDepends = [ + base bytestring case-insensitive fast-builder hashable + headed-megaparsec megaparsec parser-combinators text text-builder + unordered-containers + ]; + testHaskellDepends = [ + hedgehog QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "PostgreSQL AST parsing and rendering"; license = stdenv.lib.licenses.mit; - }) {pg_query = null;}; + }) {}; "postgresql-transactional" = callPackage ({ mkDerivation, base, monad-control, mtl, postgresql-simple }: @@ -192981,8 +196106,8 @@ self: { }: mkDerivation { pname = "postgrest"; - version = "6.0.2"; - sha256 = "0c1yapjwsccqmj6jh8bkgv15p83dh7bd7ib68cd80pi3n9dplqvw"; + version = "7.0.0"; + sha256 = "03iya4w39qp25ms8m58mw6pvlriw80h6rdg1cb7az7353m2ndzys"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192996,9 +196121,9 @@ self: { wai-cors wai-extra wai-middleware-static ]; executableHaskellDepends = [ - auto-update base base64-bytestring bytestring directory hasql - hasql-pool hasql-transaction network protolude retry text time unix - warp + auto-update base base64-bytestring bytestring directory either + hasql hasql-pool hasql-transaction network protolude retry text + time unix wai warp ]; testHaskellDepends = [ aeson aeson-qq async auto-update base base64-bytestring bytestring @@ -193009,8 +196134,6 @@ self: { ]; description = "REST API for any Postgres database"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "postgrest-ws" = callPackage @@ -194071,6 +197194,8 @@ self: { testToolDepends = [ alex happy ]; description = "safe PostgreSQL queries using Quasiquoters"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "presburger" = callPackage @@ -194602,11 +197727,13 @@ self: { ({ mkDerivation, ghc-prim }: mkDerivation { pname = "prim"; - version = "0.1.0.1"; - sha256 = "01h93hrlmz3aps1xic8arkh7s28jnch5b47lpn4rxazi0fr8pgdw"; + version = "0.1.0.9"; + sha256 = "15igqxb77ycl9lfs1bl1l9x3cynsg4kqzkr54q46ly4l315bsrq4"; libraryHaskellDepends = [ ghc-prim ]; description = "An ergonomic but conservative interface to ghc-prim"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prim-array" = callPackage @@ -194668,8 +197795,8 @@ self: { ({ mkDerivation, base, dependent-sum, primitive }: mkDerivation { pname = "prim-uniq"; - version = "0.1.0.1"; - sha256 = "1zssi4zaihjaf3an10ar39d4qb155wcl1j66aymfrr9z2f2rf1gv"; + version = "0.2"; + sha256 = "1l7jlv3pfasn89n2wpgff972npy423vqsidkkn5crxfyqjyzxbdv"; libraryHaskellDepends = [ base dependent-sum primitive ]; description = "Opaque unique identifiers in primitive state monads"; license = stdenv.lib.licenses.publicDomain; @@ -195287,14 +198414,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "process_1_6_8_2" = callPackage + "process_1_6_9_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.8.2"; - sha256 = "1gdz227gmpax92xmwrvj9nrylybh4kk7m4yqr8qwa9i34dg1jzqx"; + version = "1.6.9.0"; + sha256 = "1shxwl392swdqffxdg2940y3yiml24iww9cy2pk89pv8r89x7yzy"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -195455,7 +198582,7 @@ self: { semigroups tasty tasty-hunit text transformers transformers-compat void ]; - description = "Streaming interface to system processes"; + description = "Streaming interface to system processes."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -195493,7 +198620,7 @@ self: { base data-default GLUT hsnoise NumInstances OpenGL random time transformers utf8-string vector-space ]; - description = "Computer graphics for kids and artists with Processing implemented in Haskell"; + description = "Computer graphics for kids and artists with Processing implemented in Haskell."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -195593,8 +198720,8 @@ self: { pname = "product"; version = "0.1.0.0"; sha256 = "1dh1bf5mc2q6jb4srajn448fww5s8ixcwiswqp7pk9638sdh6dgk"; - revision = "1"; - editedCabalFile = "1464s441018jq75351jk9q16cjfmd4ifsjigd5rn0z0788l72sxh"; + revision = "2"; + editedCabalFile = "0ssd2yc8c3h2y5yra8y49sphxwpj8jd7ss6h058nabld0hrbvjm2"; libraryHaskellDepends = [ base category ]; description = "Product category"; license = stdenv.lib.licenses.bsd3; @@ -195618,10 +198745,8 @@ self: { }: mkDerivation { pname = "product-profunctors"; - version = "0.10.0.0"; - sha256 = "0s0ssl2900r16992mgl0idkryg3l7psp8nljyg9brr7fqa3pd3dd"; - revision = "4"; - editedCabalFile = "0vf9w949qfi6p1nqr0cxb9shxdz15mmrd8r0w4gxid56fjc2kaia"; + version = "0.10.0.1"; + sha256 = "15q6mgn42in4df61251q8h2d7hgvflik93xngc7jyyxj4ymaz5yh"; libraryHaskellDepends = [ base bifunctors contravariant profunctors tagged template-haskell ]; @@ -196349,8 +199474,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.10.1"; - sha256 = "1ymjlfp7gri82sa26s6a10lqqmzplvl68siai04wshx3jwr3b5y8"; + version = "5.10.2"; + sha256 = "1yagzlpn6myj46ihcy8v43kxjf8kba42q5vahy22aanpwbp9lij8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196463,15 +199588,16 @@ self: { }) {}; "prosidyc" = callPackage - ({ mkDerivation, base, free, hashable, microlens, mtl, prosidy - , text, unordered-containers + ({ mkDerivation, base, containers, free, hashable, microlens + , prettyprinter, profunctors, prosidy, text, unordered-containers }: mkDerivation { pname = "prosidyc"; - version = "0.2.0.0"; - sha256 = "19nq969mjnpc51nwa6giv93hz7pyn590yhfbsspr5wp5i9xim39i"; + version = "0.3.0.0"; + sha256 = "18i9d955md2pan18541x2z2aj1hvl34g9zm2vvf3nwpf5m9s5ggl"; libraryHaskellDepends = [ - base free hashable microlens mtl prosidy text unordered-containers + base containers free hashable microlens prettyprinter profunctors + prosidy text unordered-containers ]; description = "A DSL for processing Prosidy documents"; license = stdenv.lib.licenses.mpl20; @@ -196518,8 +199644,8 @@ self: { ({ mkDerivation, base, bytestring, c2hs, libpulseaudio }: mkDerivation { pname = "proteaaudio"; - version = "0.7.1.0"; - sha256 = "1mmfcy7wwyniv5cpakcd73fapzy6z9n1yz66zsnk15ds2jclmqip"; + version = "0.8.0"; + sha256 = "0fwanb1i4cq7352kci3wxkb5nyi5cm6298r559faw1bfyj2lmfbh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -196570,18 +199696,24 @@ self: { broken = true; }) {}; - "proto-lens_0_2_2_0" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , data-default-class, lens-family, parsec, pretty, text - , transformers, void + "proto-lens_0_5_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim + , lens-family, parsec, pretty, primitive, profunctors, QuickCheck + , tagged, test-framework, test-framework-quickcheck2, text + , transformers, vector, void }: mkDerivation { pname = "proto-lens"; - version = "0.2.2.0"; - sha256 = "173sz83pw237qp037j6spy055ghayinfjg5m4p4mvgmjnnzpw1cj"; + version = "0.5.1.0"; + sha256 = "1jv88j9spv3q679syq0fbpbq8xjggaww5644as31gmvihjfaxby1"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - attoparsec base bytestring containers data-default-class - lens-family parsec pretty text transformers void + base bytestring containers deepseq ghc-prim lens-family parsec + pretty primitive profunctors tagged text transformers vector void + ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 vector ]; description = "A lens-based implementation of protocol buffers in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -196694,17 +199826,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "proto-lens-protobuf-types_0_2_2_0" = callPackage + "proto-lens-protobuf-types_0_5_0_0" = callPackage ({ mkDerivation, base, Cabal, lens-family, proto-lens - , proto-lens-protoc, protobuf, text + , proto-lens-runtime, proto-lens-setup, protobuf, text }: mkDerivation { pname = "proto-lens-protobuf-types"; - version = "0.2.2.0"; - sha256 = "0b6n7qwyxql7966accdg0ms5mmxygjy1jx31j5bgdpkdayz4hf72"; - setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + version = "0.5.0.0"; + sha256 = "1j37g1w6b7hph61x7hrvvs7sp5kzl24slmbnlyn8a7z04kbhgr90"; + setupHaskellDepends = [ base Cabal proto-lens-setup ]; libraryHaskellDepends = [ - base lens-family proto-lens proto-lens-protoc text + base lens-family proto-lens proto-lens-runtime text ]; libraryToolDepends = [ protobuf ]; description = "Basic protocol buffer message types"; @@ -196730,27 +199862,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) protobuf;}; - "proto-lens-protoc_0_2_2_3" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers - , data-default-class, directory, filepath, haskell-src-exts - , lens-family, lens-labels, process, proto-lens - , proto-lens-descriptors, protobuf, text + "proto-lens-protoc_0_5_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, filepath + , haskell-src-exts, lens-family, pretty, proto-lens, protobuf, text }: mkDerivation { pname = "proto-lens-protoc"; - version = "0.2.2.3"; - sha256 = "08s93h25l66z7w45jmy632lhhkddqarj94bpwn3wmv5kdpsp33pq"; + version = "0.5.0.0"; + sha256 = "0r6il4gvvcggxxbz2hq1kkw1qwk1rspqcb2j04ngd06pmvicw78n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring Cabal containers data-default-class directory - filepath haskell-src-exts lens-family lens-labels process - proto-lens proto-lens-descriptors text + base containers filepath haskell-src-exts lens-family pretty + proto-lens text ]; libraryToolDepends = [ protobuf ]; executableHaskellDepends = [ - base bytestring containers data-default-class filepath - haskell-src-exts lens-family proto-lens proto-lens-descriptors text + base bytestring containers lens-family proto-lens text ]; description = "Protocol buffer compiler for the proto-lens library"; license = stdenv.lib.licenses.bsd3; @@ -196778,6 +199906,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) protobuf;}; + "proto-lens-runtime_0_5_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, filepath + , lens-family, proto-lens, text, vector + }: + mkDerivation { + pname = "proto-lens-runtime"; + version = "0.5.0.0"; + sha256 = "0hd1hcrirnj92nkd15l1m081wvxas62az3zijg1cr4lf93rg9hgc"; + libraryHaskellDepends = [ + base bytestring containers deepseq filepath lens-family proto-lens + text vector + ]; + doHaddock = false; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-runtime" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, filepath , lens-family, proto-lens, text, vector @@ -196794,6 +199939,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "proto-lens-setup_0_4_0_2" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, deepseq + , directory, filepath, process, proto-lens-protoc, temporary, text + }: + mkDerivation { + pname = "proto-lens-setup"; + version = "0.4.0.2"; + sha256 = "1zqlkkzdg9myfy2myv0y19zmsjsvcd5rcimf6f48gnijl3001i8v"; + libraryHaskellDepends = [ + base bytestring Cabal containers deepseq directory filepath process + proto-lens-protoc temporary text + ]; + description = "Cabal support for codegen with proto-lens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-setup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, deepseq , directory, filepath, process, proto-lens-protoc, temporary, text @@ -197068,6 +200230,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "protolude_0_3_0" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text + , transformers, transformers-compat + }: + mkDerivation { + pname = "protolude"; + version = "0.3.0"; + sha256 = "1b6wprbwfdjyvds2bm6na0fbqgzdkj5ikkk33whbkyh3krd3i0s0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async base bytestring containers deepseq ghc-prim hashable + mtl mtl-compat stm text transformers transformers-compat + ]; + description = "A small prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protolude-lifted" = callPackage ({ mkDerivation, async, base, lifted-async, lifted-base, protolude }: @@ -197248,6 +200430,8 @@ self: { pname = "pseudo-boolean"; version = "0.1.9.0"; sha256 = "00n5mf7abprhr9xvh3k1mw40jn4l94wwxpc2h0546h0n9v7srb1b"; + revision = "1"; + editedCabalFile = "14lgfxazr83nmbcdprygx2add8233hsq1hpdsiffx5zprgvr78vv"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec void @@ -197894,14 +201078,15 @@ self: { "purebred-email" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring - , case-insensitive, concise, deepseq, lens, QuickCheck + , case-insensitive, concise, deepseq, hedgehog, lens, QuickCheck , quickcheck-instances, semigroupoids, semigroups, stringsearch - , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text, time + , tasty, tasty-golden, tasty-hedgehog, tasty-hunit + , tasty-quickcheck, text, time }: mkDerivation { pname = "purebred-email"; - version = "0.3.0.0"; - sha256 = "0c2qmw29pbnh5kz9pkl7h4gvcs0nc671y2pjfdj3vsj0av3xqz9n"; + version = "0.4.1"; + sha256 = "0fkdmd0glp8p2dyzfpm3ah6nbfw4jqfzx7ai6yl2f9yrssb0ckp9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197910,9 +201095,9 @@ self: { time ]; testHaskellDepends = [ - attoparsec base bytestring case-insensitive lens QuickCheck - quickcheck-instances semigroups tasty tasty-golden tasty-hunit - tasty-quickcheck text time + attoparsec base bytestring case-insensitive hedgehog lens + QuickCheck quickcheck-instances semigroups tasty tasty-golden + tasty-hedgehog tasty-hunit tasty-quickcheck text time ]; description = "types and parser for email messages (including MIME)"; license = stdenv.lib.licenses.agpl3; @@ -198188,20 +201373,20 @@ self: { "push-notify-apn" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring - , containers, data-default, hspec, http2, http2-client - , optparse-applicative, random, semigroups, text, time, tls, x509 - , x509-store + , containers, data-default, hspec, http2, http2-client, lifted-base + , mtl, optparse-applicative, random, resource-pool, semigroups + , text, time, tls, x509, x509-store }: mkDerivation { pname = "push-notify-apn"; - version = "0.2.0.0"; - sha256 = "0lkdjpgd04b7jxcrqvn395bhdac0ms0jbxdigd1xpvj6d9w7f9x3"; + version = "0.2.0.1"; + sha256 = "1p33nwazxk4kk52vw6i8rrsgy8i3bzn0klp56bv6nj1751z3mzbj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base16-bytestring binary bytestring containers - data-default http2 http2-client random semigroups text time tls - x509 x509-store + data-default http2 http2-client lifted-base mtl random + resource-pool semigroups text time tls x509 x509-store ]; executableHaskellDepends = [ base bytestring optparse-applicative semigroups text @@ -198907,8 +202092,8 @@ self: { }: mkDerivation { pname = "qrcode-core"; - version = "0.9.2"; - sha256 = "17a21a65n3hm739q7kgvpd4wvqz3i5y9bdkl6072ch87j0baqmpy"; + version = "0.9.3"; + sha256 = "08kp0qp7kvld99kk2iwr6cxpxji2w9vjydivqc3nwxbk5ay2mpjg"; libraryHaskellDepends = [ base binary bytestring case-insensitive containers dlist primitive text vector @@ -198923,8 +202108,8 @@ self: { }: mkDerivation { pname = "qrcode-juicypixels"; - version = "0.8.0"; - sha256 = "14cjf8gykh22ps5i8sh5im2m4sq81kgz4cdxmqyc9rpidqh763wk"; + version = "0.8.1"; + sha256 = "0yd22dygh2z8i0yhgdgr1m25ag9bdkpmd1ciq4iq42k0yhk6iqx9"; libraryHaskellDepends = [ base base64-bytestring bytestring JuicyPixels qrcode-core text vector @@ -198970,8 +202155,8 @@ self: { }: mkDerivation { pname = "qtah-cpp-qt5"; - version = "0.6.0"; - sha256 = "1v355mfs67rh2rcn71rkai0c16y3aqcb7q33ykhrghcl7238ym9h"; + version = "0.7.0"; + sha256 = "1i5h5j7cy94ab41x9aqkiv7vyx5h7cda8v1jccpna8lr7ccicczp"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ base process qtah-generator ]; librarySystemDepends = [ qtbase ]; @@ -198987,8 +202172,8 @@ self: { }: mkDerivation { pname = "qtah-examples"; - version = "0.6.0"; - sha256 = "0zak709bgc9r8bydj834hkzix9zripnhi5z792ryr3k7anmyy6fv"; + version = "0.7.0"; + sha256 = "09svfzi73gjy4bsz4snp1mciqin25xqr6n3kya8367q4j01mdrrv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -199007,8 +202192,8 @@ self: { }: mkDerivation { pname = "qtah-generator"; - version = "0.6.0"; - sha256 = "0w7fsn2j5g5miv12gm3d0x52xypbshdmxza6imjnpz01kljhqhpm"; + version = "0.7.0"; + sha256 = "1zh4ih8kfp82gs5rhns6pw1bljv3v0g3kk9lyvz9rkp4j4wh6dl7"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -199031,8 +202216,8 @@ self: { }: mkDerivation { pname = "qtah-qt5"; - version = "0.6.0"; - sha256 = "1irinnq1iryphnnqg05l3icirvzkh5xm4cdwhqvshbin7i6gv0bs"; + version = "0.7.0"; + sha256 = "0wndmrrz4c3gfx9wjj9v13zjjpjandg2qkq7fkxp5z3rgw4hmm8f"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator @@ -199060,14 +202245,16 @@ self: { "quadratic-irrational" = callPackage ({ mkDerivation, arithmoi, base, containers, directory, doctest - , filepath, mtl, numbers, QuickCheck, tasty, tasty-quickcheck - , transformers + , filepath, integer-roots, mtl, numbers, QuickCheck, tasty + , tasty-quickcheck, transformers }: mkDerivation { pname = "quadratic-irrational"; - version = "0.1.0"; - sha256 = "0kfgvixvcawfhw4vv0zg2r0d6hrlak01q9isqc3n3lc63qaifxgy"; - libraryHaskellDepends = [ arithmoi base containers transformers ]; + version = "0.1.1"; + sha256 = "11nksvr6wnbrphq3ymg93w2xpqw6in3j1qpgbl2f3x9bgiss2l7s"; + libraryHaskellDepends = [ + arithmoi base containers integer-roots transformers + ]; testHaskellDepends = [ arithmoi base directory doctest filepath mtl numbers QuickCheck tasty tasty-quickcheck @@ -199195,8 +202382,8 @@ self: { }: mkDerivation { pname = "quarantimer"; - version = "1.20200326"; - sha256 = "1q0rraxq1gv86chi64ijxxkx4dm8w9v2610wj58315bap3d3m91c"; + version = "1.20200422"; + sha256 = "1wcf9rh6543pv1dpf55jk12x6zsak29izy94q1l4hc31w32gi8xz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -201045,6 +204232,8 @@ self: { pname = "ral-optics"; version = "0.1"; sha256 = "0sky2zbh6wn4xlfc6sbrx7lvvy01qv69j80k0n4w9fyrq9ammb3r"; + revision = "1"; + editedCabalFile = "0b2j3iqzbaly8niw3snsmn1z5a34kv4jw8sh3fscsja6zfx0ffgv"; libraryHaskellDepends = [ base bin fin optics-core ral ]; description = "Length-indexed random access lists: optics utilities"; license = stdenv.lib.licenses.gpl2Plus; @@ -201075,7 +204264,7 @@ self: { sha256 = "14fnk2q702qm0mh30r9kznbh4ikpv4fsd5mrnwphm5d06vmq6hq9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base haskell98 ]; - description = "'$' in reverse"; + description = "'$' in reverse."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -201102,8 +204291,8 @@ self: { ({ mkDerivation, base, criterion, hspec }: mkDerivation { pname = "rampart"; - version = "1.0.0.2"; - sha256 = "17apaldhpqwz8xdnjvz9lwsdlhpvad5107xw5d4v6ql8zvjgz0yw"; + version = "1.1.0.0"; + sha256 = "1bzgc5pij7i1c47b1jbyfsx7b3lk961fh5817qfmwlwx096g462f"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; @@ -201995,8 +205184,8 @@ self: { }: mkDerivation { pname = "ratel"; - version = "1.0.9"; - sha256 = "1kwn7ahjbp8w83ph73w43mh0szywqd2f817b7mz2wqimzb153k5b"; + version = "1.0.10"; + sha256 = "0riawgz2nyy1c5n2a6s2cmay8q5hxcc86chflqqmbkjbm4vqxcq3"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types text uuid @@ -202015,8 +205204,8 @@ self: { }: mkDerivation { pname = "ratel-wai"; - version = "1.1.1"; - sha256 = "1qpbhi1g7j5qbn15s0h8vdhc6zisz5j2hgr6qwg2kipi4kvvsgy9"; + version = "1.1.2"; + sha256 = "1jcv32l1f610a78da77qrsknnyyqfj6khg2hlzsm4vlaz3hsss7q"; libraryHaskellDepends = [ base bytestring case-insensitive containers http-client ratel wai ]; @@ -202122,8 +205311,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "9.0.9"; - sha256 = "1i638s8q0vnwkn1s2gwdz98p28vg9rmlz0hc24maks80vbyjraba"; + version = "9.1.1"; + sha256 = "11q115yfjjafq2dyn88xc6xnynqw2i6yn7g9n8yy9qaa8jpgibzz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202339,6 +205528,28 @@ self: { broken = true; }) {}; + "rbst" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, Glob, hspec, hspec-core, hspec-expectations + , mersenne-random-pure64, mwc-random, QuickCheck, text + , transformers + }: + mkDerivation { + pname = "rbst"; + version = "0.0.0.1"; + sha256 = "0f2pp1vqrwcn0lh0261acmhbwlcmc6sh2dkqhcl67xk2h62d9ipj"; + libraryHaskellDepends = [ + base bytestring containers deepseq mersenne-random-pure64 text + transformers + ]; + testHaskellDepends = [ + base doctest Glob hspec hspec-core hspec-expectations QuickCheck + ]; + benchmarkHaskellDepends = [ base gauge mwc-random ]; + description = "Randomized Binary Search Trees"; + license = stdenv.lib.licenses.mit; + }) {}; + "rc" = callPackage ({ mkDerivation, base, dde, hmatrix, Learning, linear, random , vector @@ -203197,8 +206408,8 @@ self: { }: mkDerivation { pname = "reanimate"; - version = "0.2.0.2"; - sha256 = "14912rzn8bgrz92q7nv3yjxyfdjcznfgs2x1rnw1mc6q8imrfppy"; + version = "0.3.1.0"; + sha256 = "02fvr4smzmgksi8cvxz8yms0qzyxxzypcl3fzl0lsfsm9sdwmcaz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-wl-pprint attoparsec base base64-bytestring bytestring @@ -203385,25 +206596,8 @@ self: { }: mkDerivation { pname = "record-dot-preprocessor"; - version = "0.2.2"; - sha256 = "1rxa8dzh0ga9xrlwrwzf5lm9miql9lkmcyiy0nrc3s5lkxdsppww"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base extra ghc uniplate ]; - executableHaskellDepends = [ base extra ]; - testHaskellDepends = [ base extra filepath record-hasfield ]; - description = "Preprocessor to allow record.field syntax"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "record-dot-preprocessor_0_2_3" = callPackage - ({ mkDerivation, base, extra, filepath, ghc, record-hasfield - , uniplate - }: - mkDerivation { - pname = "record-dot-preprocessor"; - version = "0.2.3"; - sha256 = "0pmy59xihjsn31ahq76cjsla779b4vidzf7m9g4j8z88pk65rk7z"; + version = "0.2.5"; + sha256 = "10f054da8iz38mplgbq4j78r4jl4l07iridd89ivk9d366z1c0ly"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base extra ghc uniplate ]; @@ -203411,7 +206605,6 @@ self: { testHaskellDepends = [ base extra filepath record-hasfield ]; description = "Preprocessor to allow record.field syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "record-encode" = callPackage @@ -203550,6 +206743,8 @@ self: { pname = "records-sop"; version = "0.1.0.3"; sha256 = "120kb6z4si5wqkahbqxqhm3qb8xpc9ivwg293ymz8a4ri1hdr0a5"; + revision = "1"; + editedCabalFile = "0492a3cabdl5ccncc7lk7bvh55in4hzm345fl3xpidp9jx6mv1x4"; libraryHaskellDepends = [ base deepseq generics-sop ghc-prim ]; testHaskellDepends = [ base deepseq generics-sop hspec should-not-typecheck @@ -203625,6 +206820,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "recursion-schemes-ix" = callPackage + ({ mkDerivation, base, containers, hspec, mtl, QuickCheck + , singlethongs + }: + mkDerivation { + pname = "recursion-schemes-ix"; + version = "0.1.0.0"; + sha256 = "1hg0ggba40n1455nd85wb6h2fr3hixf69a3d75a6g5dcahaqh39n"; + libraryHaskellDepends = [ base singlethongs ]; + testHaskellDepends = [ + base containers hspec mtl QuickCheck singlethongs + ]; + description = "Recursion schemes over indexed Functors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "recursive-line-count" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, gtk, mtl , process @@ -203662,8 +206873,8 @@ self: { }: mkDerivation { pname = "red-black-record"; - version = "2.1.0.3"; - sha256 = "0g1av0w52m0admcqif5imkla43yk6id4y8jmiy843xbdqs3qzcx4"; + version = "2.1.3.0"; + sha256 = "0qaa7y4n4hv6mlipnmfkvfbsi9gd1zg9npaf14l9y6v9g39wx27x"; libraryHaskellDepends = [ base sop-core ]; testHaskellDepends = [ aeson base bytestring doctest profunctors sop-core tasty @@ -203975,6 +207186,22 @@ self: { broken = true; }) {}; + "ref-extras" = callPackage + ({ mkDerivation, base, hashable, little-rio, microlens, stm + , unliftio, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "ref-extras"; + version = "0.1.1"; + sha256 = "0cv8h2v7vp6gv2lslzc7rpagaa871bi5drzml3090wna1kqnd0nq"; + libraryHaskellDepends = [ + base hashable little-rio microlens stm unliftio unliftio-core + unordered-containers + ]; + description = "Extra stuff for mutable references"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ref-fd" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { @@ -204202,8 +207429,8 @@ self: { }: mkDerivation { pname = "reflex"; - version = "0.7.0.0"; - sha256 = "107xi9mwz20zcn9s941lfdyx79py3yvqn7117yqa2h7lnimda9fm"; + version = "0.7.1.0"; + sha256 = "0qxxhgkh3cv3fzxd9pgy78kxhi9b4q72jcq4n002h9qh8i6wwp7a"; libraryHaskellDepends = [ base bifunctors comonad constraints-extras containers data-default dependent-map dependent-sum exception-transformers haskell-src-exts @@ -204323,8 +207550,8 @@ self: { }: mkDerivation { pname = "reflex-dom"; - version = "0.5.3"; - sha256 = "04xnalhrckz5idnx1d4d93nz8fnxnjsd03kciln36wwd895bcmrk"; + version = "0.6.0.0"; + sha256 = "1iimsk89akb7v2i1k1gaa6a6bhdyf2rsggac9k1xizxkylara5k4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -204372,32 +207599,33 @@ self: { }) {}; "reflex-dom-core" = callPackage - ({ mkDerivation, aeson, base, bifunctors, bimap, blaze-builder - , bytestring, chrome-test-utils, constraints, constraints-extras - , containers, contravariant, data-default, dependent-map - , dependent-sum, dependent-sum-template, directory - , exception-transformers, exceptions, filepath, ghcjs-dom, hlint - , hspec, hspec-core, hspec-webdriver, http-types, HUnit, jsaddle - , jsaddle-warp, keycode, lens, lifted-base, monad-control, mtl - , network, network-uri, primitive, process, random, ref-tf, reflex + ({ mkDerivation, aeson, async, base, bifunctors, bimap + , blaze-builder, bytestring, case-insensitive, chrome-test-utils + , constraints, constraints-extras, containers, contravariant + , data-default, dependent-map, dependent-sum + , dependent-sum-template, directory, exception-transformers + , exceptions, filepath, ghcjs-dom, hlint, hspec, hspec-core + , hspec-webdriver, http-types, HUnit, jsaddle, jsaddle-warp + , keycode, lens, lifted-base, monad-control, mtl, network + , network-uri, primitive, process, random, ref-tf, reflex , semialign, semigroups, silently, stm, template-haskell, temporary , text, these, transformers, unix, wai, wai-websockets, warp , webdriver, websockets, which, zenc }: mkDerivation { pname = "reflex-dom-core"; - version = "0.5.3"; - sha256 = "0znymqld4d6fp8l14y0gn86nbffaw8b0ql0y7bj3vnx80crjc32j"; + version = "0.6.0.0"; + sha256 = "0819858z5p6847ac1rb1hsfr5ikn7x5xii8vgqbih4fg39mqfy14"; libraryHaskellDepends = [ - aeson base bifunctors bimap blaze-builder bytestring constraints - containers contravariant data-default dependent-map dependent-sum - dependent-sum-template directory exception-transformers ghcjs-dom - jsaddle keycode lens monad-control mtl network-uri primitive random - ref-tf reflex semialign semigroups stm template-haskell text these - transformers unix zenc + aeson base bifunctors bimap blaze-builder bytestring + case-insensitive constraints containers contravariant data-default + dependent-map dependent-sum dependent-sum-template directory + exception-transformers ghcjs-dom jsaddle keycode lens monad-control + mtl network-uri primitive random ref-tf reflex semialign semigroups + stm template-haskell text these transformers unix zenc ]; testHaskellDepends = [ - aeson base bytestring chrome-test-utils constraints + aeson async base bytestring chrome-test-utils constraints constraints-extras containers dependent-map dependent-sum dependent-sum-template directory exceptions filepath ghcjs-dom hlint hspec hspec-core hspec-webdriver http-types HUnit jsaddle @@ -204482,14 +207710,38 @@ self: { broken = true; }) {}; + "reflex-dynamic-containers" = callPackage + ({ mkDerivation, base, binary, containers, deepseq, dependent-map + , dependent-sum, hashable, hspec, hspec-contrib, HUnit, ilist + , reflex, reflex-test-host, relude, these + }: + mkDerivation { + pname = "reflex-dynamic-containers"; + version = "0.1.0.0"; + sha256 = "161klhbz4528rljv4fhkzf4yad3xxiflignbc46il1j9lw99bh0k"; + libraryHaskellDepends = [ + base binary containers deepseq dependent-map dependent-sum hashable + ilist reflex reflex-test-host relude these + ]; + testHaskellDepends = [ + base binary containers deepseq dependent-map dependent-sum hashable + hspec hspec-contrib HUnit ilist reflex reflex-test-host relude + these + ]; + description = "various dynamic containers for Reflex"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "reflex-fsnotify" = callPackage ({ mkDerivation, base, containers, directory, filepath, fsnotify , reflex }: mkDerivation { pname = "reflex-fsnotify"; - version = "0.2.0.0"; - sha256 = "0nxi3zjwwq36212qncpxi7rn30lgh0zy4swz10wxm55zb480dm8m"; + version = "0.2.1.1"; + sha256 = "0r7fv01dgg5l45yspgj3n2gh6yq0qkjv19hj9vq6284x04vldnqj"; libraryHaskellDepends = [ base containers directory filepath fsnotify reflex ]; @@ -204671,6 +207923,24 @@ self: { broken = true; }) {}; + "reflex-test-host" = callPackage + ({ mkDerivation, base, dependent-sum, hspec, hspec-contrib, HUnit + , ref-tf, reflex, these + }: + mkDerivation { + pname = "reflex-test-host"; + version = "0.1.0.0"; + sha256 = "0yg1lg68xr5rs8l68i0znj5zp0z6rq7b515sfz3qvnmyv7qah946"; + libraryHaskellDepends = [ base dependent-sum ref-tf reflex these ]; + testHaskellDepends = [ + base dependent-sum hspec hspec-contrib HUnit ref-tf reflex these + ]; + description = "reflex host methods for testing without external events"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "reflex-transformers" = callPackage ({ mkDerivation, base, containers, lens, mtl, reflex, semigroups , stateWriter, transformers @@ -204696,8 +207966,8 @@ self: { }: mkDerivation { pname = "reflex-vty"; - version = "0.1.3.0"; - sha256 = "1200svlgpy4zqdfarx1b8n64vgskb9jl00p548ya4pwi0bsv95y7"; + version = "0.1.4.0"; + sha256 = "0z4yca6hh5rwgybsf6ssklhvpl34ikvi9j6wq99df5y0hpy9185f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -204809,6 +208079,8 @@ self: { pname = "refractor"; version = "0.0.1.0"; sha256 = "1isc9d2dsfz7dkf45c8z7syypi8c6cvjmgx5xh732li23wx9qlnf"; + revision = "1"; + editedCabalFile = "1wrixl8fp6hzb0j0mpyz94813i7mqdnazcxk1cz9is1fl37f8zka"; libraryHaskellDepends = [ base base-unicode-symbols category hs-functors transformers ]; @@ -205005,6 +208277,8 @@ self: { pname = "regex-compat"; version = "0.95.2.0"; sha256 = "01l44zrfpqb4k1rrzd1j18hn6922xhrl9h7s0hjfs363dx3hxj8z"; + revision = "1"; + editedCabalFile = "1d2k9zj51rhy695vlx6cfcmik6a0yyk5kl6aza7nqsqc6zwhidif"; libraryHaskellDepends = [ array base regex-base regex-posix ]; description = "Replaces/Enhances \"Text.Regex\""; license = stdenv.lib.licenses.bsd3; @@ -205187,6 +208461,8 @@ self: { pname = "regex-pcre"; version = "0.95.0.0"; sha256 = "0nn76q4bsjnxim0j0d01jifmh36as9jdpcvm001a851vvq86zb8n"; + revision = "1"; + editedCabalFile = "1s5jdwvymc9hxdfa23x5amnv2kkcsm2p119f38df2vjdxfvjfiq4"; libraryHaskellDepends = [ array base bytestring containers regex-base ]; @@ -205201,8 +208477,8 @@ self: { }: mkDerivation { pname = "regex-pcre-builtin"; - version = "0.95.1.1.8.43"; - sha256 = "1akis4b9jp4a0qbwnpwm0nzlg76kb54wn2vlicc6yb4qha210fsd"; + version = "0.95.1.2.8.43"; + sha256 = "1bxn8d3g9w1a5q5vcz744yx019d2rd79i07qcjq4jqkjafni1bml"; libraryHaskellDepends = [ array base bytestring containers regex-base text ]; @@ -205691,8 +208967,8 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.1.7.0"; - sha256 = "14da74d1fijib9w6xi2x904c9iqhdja685lq63c0wc6zgi7ss2ln"; + version = "0.1.7.1"; + sha256 = "163mkxrd30hxhp4awd05b3qxhqrg18lzl4m9m5r74j82s0yhq7l0"; libraryHaskellDepends = [ base containers exceptions hashable mmorph mtl protolude resourcet semigroupoids semigroups template-haskell text transformers-base @@ -205719,8 +208995,8 @@ self: { }: mkDerivation { pname = "registry-hedgehog"; - version = "0.2.1.0"; - sha256 = "1gx7grxy7p08bbvmxrhr3ciw9jg7isz3xsa2ha3s3pg4ifas4g59"; + version = "0.2.1.1"; + sha256 = "1s94xb7ma6rq81z30wjaczy2w3v1myqwhkx257p4nh69dv4wzd8d"; libraryHaskellDepends = [ base containers hedgehog mmorph multimap protolude registry tasty tasty-discover tasty-hedgehog tasty-th template-haskell text @@ -205956,8 +209232,8 @@ self: { }: mkDerivation { pname = "relation"; - version = "0.5.1.0"; - sha256 = "0hsixpln8wf47cqan8yhx86n1k1vww35l4zzf0bjarqazd060pyv"; + version = "0.5.2.0"; + sha256 = "1sinb0rw2jq1xjy80rsxnjf5va33n2i67km55hxfls9w15wsg2yw"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest doctest-discover hedgehog hspec @@ -206134,22 +209410,20 @@ self: { "releaser" = callPackage ({ mkDerivation, base, Cabal, pretty-terminal, process, regex-tdfa - , regex-tdfa-text, text + , text }: mkDerivation { pname = "releaser"; - version = "0.2.1.0"; - sha256 = "1nmbqilik3zdcyi7b5hq7xrk1f62g6lw0i8014zxqz56lcwkaj4z"; + version = "0.3.0.0"; + sha256 = "0fz8zlkdrk8pjyqxyfyhlvvn68yi9d299z50indyhdnwgd4g94lr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal pretty-terminal process regex-tdfa regex-tdfa-text text + base Cabal pretty-terminal process regex-tdfa text ]; executableHaskellDepends = [ base ]; description = "Automation of Haskell package release process"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "relevant-time" = callPackage @@ -206236,6 +209510,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "relude_0_7_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "relude"; + version = "0.7.0.0"; + sha256 = "1gx1h3656wz80v72acqky88iv7a2shinfv6apzzyjxii8lc22jf7"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable mtl stm text + transformers unordered-containers + ]; + testHaskellDepends = [ + base bytestring containers doctest Glob hedgehog text + ]; + benchmarkHaskellDepends = [ base gauge unordered-containers ]; + description = "Safe, performant, user-friendly and lightweight Haskell Standard Library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "remark" = callPackage ({ mkDerivation, base, GenericPretty, tasty, tasty-golden , tasty-hunit @@ -206850,28 +210146,28 @@ self: { }: mkDerivation { pname = "replace-attoparsec"; - version = "1.2.1.0"; - sha256 = "0i88mylhbm3hx7rj59ms125xnzinxrcjv98df73xzzz54cjf123j"; + version = "1.2.2.0"; + sha256 = "1byrd62j7aafjn959xciam6s17zjvrisfi6q4y6ndvla77rg09cm"; libraryHaskellDepends = [ attoparsec base bytestring text ]; testHaskellDepends = [ attoparsec base bytestring Cabal parsers text ]; - description = "Find, replace, and edit text patterns with Attoparsec parsers"; + description = "Find, replace, and edit text patterns with Attoparsec parsers (instead of regex)"; license = stdenv.lib.licenses.bsd2; }) {}; - "replace-attoparsec_1_2_2_0" = callPackage + "replace-attoparsec_1_4_0_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Cabal, parsers, text }: mkDerivation { pname = "replace-attoparsec"; - version = "1.2.2.0"; - sha256 = "1byrd62j7aafjn959xciam6s17zjvrisfi6q4y6ndvla77rg09cm"; + version = "1.4.0.0"; + sha256 = "1w0dlwfipli94g3fbqh118pmwgyzgrcwp32s60sk7a78cbr5mic4"; libraryHaskellDepends = [ attoparsec base bytestring text ]; testHaskellDepends = [ attoparsec base bytestring Cabal parsers text ]; - description = "Find, replace, and edit text patterns with Attoparsec parsers (instead of regex)"; + description = "Find, replace, and split string patterns with Attoparsec parsers (instead of regex)"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -206888,15 +210184,15 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "replace-megaparsec_1_3_2_0" = callPackage + "replace-megaparsec_1_4_1_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }: mkDerivation { pname = "replace-megaparsec"; - version = "1.3.2.0"; - sha256 = "0bhxjk2yc0h49i9b8irszhgg5041s63clrrcrd6l58s2nmfr3zw5"; + version = "1.4.1.0"; + sha256 = "0a51fsdmjq3iaamdnwslyrv99psh03qhqk8j0k3ikbjxqj3md3br"; libraryHaskellDepends = [ base bytestring megaparsec text ]; testHaskellDepends = [ base bytestring Cabal megaparsec text ]; - description = "Find, replace, and edit text patterns with Megaparsec parsers (instead of regex)"; + description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -207252,30 +210548,31 @@ self: { }) {}; "require" = callPackage - ({ mkDerivation, base, bytestring, criterion, directory, inliterate - , megaparsec, optparse-generic, tasty, tasty-hspec, text, universum + ({ mkDerivation, ansi-terminal, base, bytestring, criterion + , directory, dlist, megaparsec, mtl, optparse-generic, relude + , tasty, tasty-hspec, text }: mkDerivation { pname = "require"; - version = "0.4.4"; - sha256 = "1y7n1dyccwfy5fplinw72fsq1vjzp5nrngvr5g08yfqykaidpc8r"; + version = "0.4.9"; + sha256 = "0f04cpgcgl5d0zj8j5d2wfg8m1g2zw5lw39qj8797y3shxh8jdih"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring directory inliterate megaparsec optparse-generic - text universum + ansi-terminal base bytestring directory dlist megaparsec mtl + optparse-generic relude text ]; executableHaskellDepends = [ - base bytestring directory inliterate megaparsec optparse-generic - text universum + ansi-terminal base bytestring directory dlist megaparsec mtl + optparse-generic relude text ]; testHaskellDepends = [ - base bytestring directory inliterate megaparsec optparse-generic - tasty tasty-hspec text universum + ansi-terminal base bytestring directory dlist megaparsec mtl + optparse-generic relude tasty tasty-hspec text ]; benchmarkHaskellDepends = [ - base bytestring criterion directory inliterate megaparsec - optparse-generic text universum + ansi-terminal base bytestring criterion directory dlist megaparsec + mtl optparse-generic relude text ]; description = "Scrap your qualified import clutter"; license = stdenv.lib.licenses.asl20; @@ -207629,8 +210926,8 @@ self: { }: mkDerivation { pname = "resourcet"; - version = "1.2.3"; - sha256 = "1ig7a22i5hn0ya7d4bg3xq0yy9mqgwawx4sv88db0fvdsnzg868s"; + version = "1.2.4"; + sha256 = "017v0r9qk4d7dd04dc03ghghyk1d4qj82gligyzg5fdz2rkg8i8x"; libraryHaskellDepends = [ base containers exceptions mtl primitive transformers unliftio-core ]; @@ -208006,8 +211303,8 @@ self: { pname = "rethinkdb-client-driver"; version = "0.0.25"; sha256 = "15l9z7ki81cv97lajxcbddavbd254c5adcdi8yw6df31rmbc378g"; - revision = "4"; - editedCabalFile = "1fjavc5gmz15za1yzj4b23gd50b2jj83l0d5pc2kmz8f6bs5nx9f"; + revision = "5"; + editedCabalFile = "051fgkx8zdlbpnsgvqm4jqk9a21xszz9sdhcmchx6h4ilyn7byjy"; libraryHaskellDepends = [ aeson base binary bytestring containers hashable mtl network old-locale scientific stm template-haskell text time @@ -208073,8 +211370,8 @@ self: { }: mkDerivation { pname = "retrie"; - version = "0.1.0.1"; - sha256 = "01giwrn6cxkpcjflarpphyvbz6japjq6xjilpg29wfq40c64nzyn"; + version = "0.1.1.0"; + sha256 = "1nzanirprfhyrh4g2miin89z3vmqsk3zacsfylns1ihdpcnpva4b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -208102,8 +211399,8 @@ self: { }: mkDerivation { pname = "retry"; - version = "0.8.1.0"; - sha256 = "02k03r86amg1vbrsvb644342ym13d9jwkzki9sk93pdg5l8j35dj"; + version = "0.8.1.2"; + sha256 = "0nwyis42xpmxfw8nz8qn59r3v7q0dkfzkzkhllgn30cdjbbmwhf5"; libraryHaskellDepends = [ base exceptions ghc-prim random transformers ]; @@ -208268,8 +211565,8 @@ self: { }: mkDerivation { pname = "rex"; - version = "0.6"; - sha256 = "024qxr75269l8j8bklxg7a98xvrymmnczcpflgqjiqn5kvdrn5yz"; + version = "0.6.1"; + sha256 = "1zdsdwagrcjlfy2qfvn1gr8z9xz41s2vwf2y4dwrlvh11xswxvhb"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers haskell-src-exts haskell-src-meta @@ -208542,15 +211839,16 @@ self: { "rhine" = callPackage ({ mkDerivation, base, containers, deepseq, dunai, free - , MonadRandom, random, time, transformers, vector-sized + , MonadRandom, random, simple-affine-space, time, transformers + , vector-sized }: mkDerivation { pname = "rhine"; - version = "0.5.1.1"; - sha256 = "1f7sgdlnjf25znhnjdcq7yibxcfnjq7cldl6z9ydmg62az839ms2"; + version = "0.6.0"; + sha256 = "0dmdf1i1z5xj5l9p6vlln8yyy3pa1nd6m1b7spwm8kpfzzw3545f"; libraryHaskellDepends = [ - base containers deepseq dunai free MonadRandom random time - transformers vector-sized + base containers deepseq dunai free MonadRandom random + simple-affine-space time transformers vector-sized ]; description = "Functional Reactive Programming with type-level clocks"; license = stdenv.lib.licenses.bsd3; @@ -208562,8 +211860,8 @@ self: { ({ mkDerivation, base, dunai, gloss, rhine }: mkDerivation { pname = "rhine-gloss"; - version = "0.5.1.0"; - sha256 = "0nq5m74ivkdk15qcqpqs8bp816454k3k2big0av6lq2dzk8cjrll"; + version = "0.6.0.1"; + sha256 = "1j3sbdlfn6hkksfxa5nw874pm9yxmc8hy14msjfsl3g3y0d501bh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base dunai gloss rhine ]; @@ -208667,34 +211965,40 @@ self: { "rib" = callPackage ({ mkDerivation, aeson, async, base-noprelude, binary, clay - , cmdargs, containers, dhall, directory, exceptions, foldl - , fsnotify, lucid, megaparsec, mmark, mmark-ext, modern-uri, mtl - , pandoc, pandoc-include-code, pandoc-types, path, path-io, relude - , safe-exceptions, shake, text, wai, wai-app-static, warp + , cmdargs, containers, dhall, directory, exceptions, filepath + , foldl, fsnotify, hspec, lucid, megaparsec, mmark, mmark-ext + , modern-uri, mtl, optparse-applicative, pandoc + , pandoc-include-code, pandoc-types, QuickCheck, relude + , safe-exceptions, shake, text, time, wai, wai-app-static, warp }: mkDerivation { pname = "rib"; - version = "0.7.0.0"; - sha256 = "0yi8g6c2hfl09l9906v7vljry9jb98xgxrfbngi17d5iqlld9qz4"; + version = "0.10.0.0"; + sha256 = "129riz7843x9h2c9iz9wdcngj74x3rrvlbmd9y7ymmrh5d2kq1qv"; libraryHaskellDepends = [ aeson async base-noprelude binary clay cmdargs containers dhall - directory exceptions foldl fsnotify lucid megaparsec mmark - mmark-ext modern-uri mtl pandoc pandoc-include-code pandoc-types - path path-io relude safe-exceptions shake text wai wai-app-static - warp + directory exceptions filepath foldl fsnotify lucid megaparsec mmark + mmark-ext modern-uri mtl optparse-applicative pandoc + pandoc-include-code pandoc-types relude safe-exceptions shake text + time wai wai-app-static warp ]; - description = "Static site generator using Shake"; + testHaskellDepends = [ + aeson async base-noprelude binary clay cmdargs containers dhall + directory exceptions filepath foldl fsnotify hspec lucid megaparsec + mmark mmark-ext modern-uri mtl optparse-applicative pandoc + pandoc-include-code pandoc-types QuickCheck relude safe-exceptions + shake text time wai wai-app-static warp + ]; + description = "Static site generator based on Shake"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ribbit" = callPackage ({ mkDerivation, base, Only, postgresql-simple, text, time }: mkDerivation { pname = "ribbit"; - version = "1.1.0.0"; - sha256 = "1pmg7ii6mpl22hlgmripwp44cz4pwp2yqa4z32f21lfr0y9slz8j"; + version = "1.1.0.1"; + sha256 = "076m5w4w08z8migb0v8vb6lybs06x1bfvxqfi9g633lz464hyi9v"; libraryHaskellDepends = [ base Only postgresql-simple text time ]; description = "Type-level Relational DB combinators"; license = stdenv.lib.licenses.mit; @@ -208811,8 +212115,8 @@ self: { }: mkDerivation { pname = "ridley"; - version = "0.3.1.3"; - sha256 = "0j7wvzk2x3xpvwwfkz1bll9awfrlbn1lcl50hm582plnl2pgddq0"; + version = "0.3.1.4"; + sha256 = "120yqfrkp4ziz8yn6xgzzhdszrvq1dk1szzh3q2m8w36c0g2qdhy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async base containers ekg-core ekg-prometheus-adapter inline-c @@ -208970,33 +212274,8 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.1.14.1"; - sha256 = "0ysbjxaby846vp2w60747b7sm1zy30i62qg0bgsr7z52jamrx3qm"; - libraryHaskellDepends = [ - base bytestring containers deepseq directory exceptions filepath - hashable microlens mtl primitive process text time typed-process - unix unliftio unliftio-core unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring containers deepseq directory exceptions filepath - hashable hspec microlens mtl primitive process QuickCheck text time - typed-process unix unliftio unliftio-core unordered-containers - vector - ]; - description = "A standard library for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rio_0_1_15_0" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , exceptions, filepath, hashable, hspec, microlens, mtl, primitive - , process, QuickCheck, text, time, typed-process, unix, unliftio - , unliftio-core, unordered-containers, vector - }: - mkDerivation { - pname = "rio"; - version = "0.1.15.0"; - sha256 = "0171sgxysksyhpcnpqrlawp1zrb279a0lr9bp5j5f4g0ak59h4p6"; + version = "0.1.15.1"; + sha256 = "05mkxjwy9vp6ldzj5wci1frd2chvbg3l4vw1q8bpjdsj8svr2g5i"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath hashable microlens mtl primitive process text time typed-process @@ -209010,7 +212289,6 @@ self: { ]; description = "A standard library for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rio-orphans" = callPackage @@ -209118,6 +212396,8 @@ self: { pname = "risc-v"; version = "0.0.2.0"; sha256 = "1g6j9illgqraskcp4rjzk3xvdwf4avn1x732sd6jbm99d7vy9c1f"; + revision = "1"; + editedCabalFile = "0gp1mf452hnd82gppy12w0nfaaa21jrmivb6720r330z22iqc42h"; libraryHaskellDepends = [ base base-unicode-symbols clash-prelude util ]; @@ -209576,6 +212856,8 @@ self: { ]; description = "A build system for incremental, parallel, and demand-driven computations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rocksdb-haskell" = callPackage @@ -209616,6 +212898,8 @@ self: { ]; description = "RocksDB database querying library for Haskell"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "roguestar" = callPackage @@ -210210,10 +213494,8 @@ self: { }: mkDerivation { pname = "roundtrip"; - version = "0.2.0.5"; - sha256 = "10b57yfcnsgrkx4djgiinnyh46hwbysskmlh27bajp82p91v7xfa"; - revision = "1"; - editedCabalFile = "1kxlgbgwlrln9pal7yq4i487yy6jyf04s6fpb63w7z16anxly4bs"; + version = "0.2.0.7"; + sha256 = "130ad9kryygd3gikzrqcvwkparbpn57hp257v5wwr35q9p6ndhbj"; libraryHaskellDepends = [ base containers pretty safe template-haskell text xml-types ]; @@ -210594,33 +213876,33 @@ self: { }) {}; "rss-conduit" = callPackage - ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring - , conduit, conduit-combinators, containers, data-default - , dublincore-xml-conduit, filepath, lens-simple, mono-traversable - , QuickCheck, quickcheck-instances, resourcet, safe - , safe-exceptions, singletons, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, text, time, timerep, uri-bytestring, vinyl - , xml-conduit, xml-types + ({ mkDerivation, atom-conduit, base, base-compat-batteries + , blaze-builder, bytestring, conduit, conduit-combinators + , containers, data-default, dublincore-xml-conduit, filepath + , lens-simple, mono-traversable, QuickCheck, quickcheck-instances + , resourcet, safe, safe-exceptions, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text, time, timerep + , uri-bytestring, xml-conduit, xml-types }: mkDerivation { pname = "rss-conduit"; - version = "0.4.3.1"; - sha256 = "09bf66hk1kv5jn01wwqicmjvhzl4cvkn7qlf9bh5jyq3g17vybsq"; + version = "0.5.1.0"; + sha256 = "199l9ky1nb9ispl1gdn5wvn7c7sd89xa8qpk110w2k5nzi8hmsz5"; libraryHaskellDepends = [ - atom-conduit base conduit conduit-combinators containers - dublincore-xml-conduit lens-simple safe safe-exceptions singletons - text time timerep uri-bytestring vinyl xml-conduit xml-types + atom-conduit base base-compat-batteries conduit conduit-combinators + containers dublincore-xml-conduit lens-simple safe safe-exceptions + text time timerep uri-bytestring xml-conduit xml-types ]; testHaskellDepends = [ - atom-conduit base blaze-builder bytestring conduit - conduit-combinators data-default dublincore-xml-conduit filepath - lens-simple mono-traversable QuickCheck quickcheck-instances - resourcet safe-exceptions singletons tasty tasty-golden tasty-hunit - tasty-quickcheck text time uri-bytestring vinyl xml-conduit + atom-conduit base base-compat-batteries blaze-builder bytestring + conduit conduit-combinators data-default dublincore-xml-conduit + filepath lens-simple mono-traversable QuickCheck + quickcheck-instances resourcet safe-exceptions tasty tasty-golden + tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit xml-types ]; description = "Streaming parser/renderer for the RSS standard"; - license = stdenv.lib.licenses.publicDomain; + license = stdenv.lib.licenses.cc0; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -211237,8 +214519,8 @@ self: { pname = "safe-exceptions"; version = "0.1.7.0"; sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q"; - revision = "5"; - editedCabalFile = "0yghh99yg24pzhzrflvgi4ip56ln7a56871pl3q70sm8rszy8vbr"; + revision = "6"; + editedCabalFile = "0x82m44qwf3fls3ypbdca958l9hhfqyfip6rzzxi7648f0sasv21"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec void ]; description = "Safe, consistent, and easy exception handling"; @@ -211336,6 +214618,8 @@ self: { pname = "safe-json"; version = "1.1.0"; sha256 = "18zsf2dccgf755a8g4ar3zc7ilmampsrvqa6f9p27zrayl7j87hw"; + revision = "1"; + editedCabalFile = "04bwgnv53acmiw50wj3k5lb791b4702mdzhsphshlwk2bc34ybqg"; libraryHaskellDepends = [ aeson base bytestring containers dlist hashable scientific tasty tasty-hunit tasty-quickcheck text time unordered-containers @@ -211537,8 +214821,8 @@ self: { }: mkDerivation { pname = "safecopy"; - version = "0.10.2"; - sha256 = "0x8j27qmvqk009q2jhs1a6rdi81xvgp76bwnbp0y8yvzynjcaagk"; + version = "0.10.3"; + sha256 = "142ghv6pa3y0s7x141x9f9r5sn0315vvkfw6f7lgnndlncs5y354"; libraryHaskellDepends = [ array base bytestring cereal containers generic-data old-time template-haskell text time transformers vector @@ -211759,22 +215043,26 @@ self: { }) {}; "sak" = callPackage - ({ mkDerivation, base, bytestring, bz2, cpphs, directory, filepath - , lz4-hs, lzlib, lzma, optparse-applicative, zlib, zstd + ({ mkDerivation, base, brotli, bytestring, bz2, cpphs, directory + , filepath, lz4-hs, lzlib, lzma, lzo, optparse-applicative + , parallel-io, snappy-lazy, zlib, zstd }: mkDerivation { pname = "sak"; - version = "0.1.1.0"; - sha256 = "0k40jkdg2029h549zgkq4ciayx162lb280l4lkna47dd3r5mf3xd"; + version = "0.1.2.5"; + sha256 = "1xz3g7ksq1v8239xq2cddprlq4g8imid002w7wak15kv8aqvil1l"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ - base bytestring bz2 directory filepath lz4-hs lzlib lzma - optparse-applicative zlib zstd + base brotli bytestring bz2 directory filepath lz4-hs lzlib lzma lzo + optparse-applicative parallel-io snappy-lazy zlib zstd ]; executableToolDepends = [ cpphs ]; description = "Compression command-line tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sakuraio-platform" = callPackage @@ -211915,8 +215203,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "salve"; - version = "1.0.8"; - sha256 = "1hgcyincccib0v671kd8qybgf8q9m0n8lcrpj37pgq9wzq6x34sm"; + version = "1.0.9"; + sha256 = "1anh6v4dfvy1ymffz3y77rlj859mmjamf026f2fqlagmql2lbj73"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Semantic version numbers and constraints"; @@ -212089,6 +215377,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "sampling_0_3_4" = callPackage + ({ mkDerivation, base, containers, criterion, foldl, mwc-random + , primitive, vector + }: + mkDerivation { + pname = "sampling"; + version = "0.3.4"; + sha256 = "1cwx64llg6x6dnsld6lx6bmb4cljz8abqp0d6vmh4wk11vzjsly0"; + libraryHaskellDepends = [ + base containers foldl mwc-random primitive vector + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Sample values from collections"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "samtools" = callPackage ({ mkDerivation, base, bytestring, c2hs, seqloc, vector, zlib }: mkDerivation { @@ -212758,8 +216064,8 @@ self: { }: mkDerivation { pname = "scalpel"; - version = "0.6.1"; - sha256 = "0cq9zslaqcs1vq85xznc11vis5bkvmhjsnwxrc2p01bsxbvwxsh6"; + version = "0.6.2"; + sha256 = "04hhvk0yjxha3yg6n9fxivrz97hpjjiiblnj0bvs5myax1ggkjch"; libraryHaskellDepends = [ base bytestring case-insensitive data-default http-client http-client-tls scalpel-core tagsoup text @@ -212770,16 +216076,16 @@ self: { "scalpel-core" = callPackage ({ mkDerivation, base, bytestring, containers, criterion - , data-default, fail, HUnit, pointedlist, regex-base, regex-tdfa - , tagsoup, text, vector + , data-default, fail, HUnit, mtl, pointedlist, regex-base + , regex-tdfa, tagsoup, text, transformers, vector }: mkDerivation { pname = "scalpel-core"; - version = "0.6.1"; - sha256 = "199g005ps5grjj3y7mxajck3ybyc60fs72p8jk859ji3svpqdfyn"; + version = "0.6.2"; + sha256 = "07mjff8aqwabx8yhq8bd7jpnarkkrjqss8h8s2wkfmfj808fllmf"; libraryHaskellDepends = [ - base bytestring containers data-default fail pointedlist regex-base - regex-tdfa tagsoup text vector + base bytestring containers data-default fail mtl pointedlist + regex-base regex-tdfa tagsoup text transformers vector ]; testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ]; benchmarkHaskellDepends = [ base criterion tagsoup text ]; @@ -212793,6 +216099,8 @@ self: { pname = "scan"; version = "0.1.0.9"; sha256 = "0imc8zmg0d42pzbrxiyi8lqx5q24i73ajj3pmb3kqinfhm465jgv"; + revision = "1"; + editedCabalFile = "0gazdr6qljf7hri91ypb9x2n4sns0hzxy1kxsvg0pi76fm0cs7d5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base parsec ]; @@ -212990,8 +216298,8 @@ self: { }: mkDerivation { pname = "schedule"; - version = "0.2.0.0"; - sha256 = "02sfzvkz0r1lyqbsiba866jhcfb5f223z09zj437d31vayn6nzay"; + version = "0.3.0.0"; + sha256 = "08h8iiy2srnd89652k8q8vjcvmvsqjihj6qj9k8z49vfylpr8ibx"; libraryHaskellDepends = [ async base containers extra lens primitive safe stm system-time-monotonic text time transformers @@ -213050,6 +216358,8 @@ self: { ]; description = "Work stealing scheduler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "schedyield" = callPackage @@ -213077,18 +216387,20 @@ self: { ]; description = "Encoding-independent schemas for Haskell data types"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "schemas" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bifunctors, bytestring , free, generic-lens, generics-sop, hashable, hspec, lens , lens-aeson, mtl, pretty-simple, profunctors, QuickCheck - , scientific, text, transformers, unordered-containers, vector + , scientific, syb, text, transformers, unordered-containers, vector }: mkDerivation { pname = "schemas"; - version = "0.4.0.1"; - sha256 = "13i7q7krahvmirb6ryqsygcckmjdkmnk8qxh1pxsnihkkn6dj22k"; + version = "0.4.0.2"; + sha256 = "0b05xjkpwx4a9hwxjaxk28v47d4c3xyy7wagc5nblqppxpvb9zqr"; libraryHaskellDepends = [ aeson base bifunctors bytestring free generics-sop hashable lens lens-aeson mtl profunctors scientific text transformers @@ -213096,11 +216408,13 @@ self: { ]; testHaskellDepends = [ aeson aeson-pretty base bytestring generic-lens generics-sop hspec - lens mtl pretty-simple QuickCheck text transformers + lens mtl pretty-simple QuickCheck syb text transformers unordered-containers ]; description = "schema guided serialization"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "schematic" = callPackage @@ -213364,18 +216678,21 @@ self: { }) {}; "scientific-notation" = callPackage - ({ mkDerivation, aeson, attoparsec, base, byteslice, bytesmith - , bytestring, gauge, primitive, QuickCheck, run-st, scientific - , tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, aeson, attoparsec, base, bytebuild, byteslice + , bytesmith, bytestring, gauge, natural-arithmetic, primitive + , QuickCheck, run-st, scientific, tasty, tasty-hunit + , tasty-quickcheck }: mkDerivation { pname = "scientific-notation"; - version = "0.1.1.0"; - sha256 = "1s0iyj6dn0nbn8s31b5wwwlyfx5jcnwa3i9gp45idcwfsz5hmdvq"; - libraryHaskellDepends = [ base bytesmith ]; + version = "0.1.2.0"; + sha256 = "19yfg032ppiy70y28fbildxp4h6y4krs9ayh7a8sdbxibpqb82cx"; + libraryHaskellDepends = [ + base bytebuild bytesmith natural-arithmetic + ]; testHaskellDepends = [ - base byteslice bytesmith bytestring primitive QuickCheck tasty - tasty-hunit tasty-quickcheck + base bytebuild byteslice bytesmith bytestring primitive QuickCheck + tasty tasty-hunit tasty-quickcheck ]; benchmarkHaskellDepends = [ aeson attoparsec base byteslice bytesmith bytestring gauge @@ -213383,6 +216700,8 @@ self: { ]; description = "Scientific notation intended for tokenization"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scion" = callPackage @@ -214133,8 +217452,8 @@ self: { }: mkDerivation { pname = "sdl2"; - version = "2.5.1.0"; - sha256 = "087df61fsmfsdc7pdn6sgsp5lf20nampa41illszii5jfr13s7gw"; + version = "2.5.2.0"; + sha256 = "18cgckkq4yj0xwj3pmsfsqxazl7rcmb3f7b45kv9nwvjwyqi0hcw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -214614,6 +217933,30 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {libsecp256k1 = null;}; + "secp256k1-haskell_0_2_2" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, cereal + , deepseq, entropy, hashable, hspec, hspec-discover, HUnit + , libsecp256k1, mtl, QuickCheck, string-conversions + }: + mkDerivation { + pname = "secp256k1-haskell"; + version = "0.2.2"; + sha256 = "10yz62z5s23b0q4pla8047cv5ksrd78j9l8y156b0yjjnmlxd013"; + libraryHaskellDepends = [ + base base16-bytestring bytestring cereal deepseq entropy hashable + QuickCheck string-conversions + ]; + libraryPkgconfigDepends = [ libsecp256k1 ]; + testHaskellDepends = [ + base base16-bytestring bytestring cereal deepseq entropy hashable + hspec HUnit mtl QuickCheck string-conversions + ]; + testToolDepends = [ hspec-discover ]; + description = "Bindings for secp256k1 library from Bitcoin Core"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {libsecp256k1 = null;}; + "secp256k1-legacy" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal , cryptohash, entropy, HUnit, mtl, QuickCheck, string-conversions @@ -214667,14 +218010,14 @@ self: { }: mkDerivation { pname = "secret-sharing"; - version = "1.0.1.0"; - sha256 = "16j4xz4kkcicqfl9r8831il310ns02kxwj7mga8pvssfnhzv9zpv"; + version = "1.0.1.2"; + sha256 = "0965nbzaiia0jbx1r149liyg8fsix7z5nlxybpavrkkn0b4ncn89"; libraryHaskellDepends = [ base binary bytestring dice-entropy-conduit finite-field vector ]; testHaskellDepends = [ - base bytestring QuickCheck test-framework - test-framework-quickcheck2 + base binary bytestring dice-entropy-conduit finite-field QuickCheck + test-framework test-framework-quickcheck2 vector ]; description = "Information-theoretic secure secret sharing"; license = stdenv.lib.licenses.lgpl21; @@ -215120,6 +218463,8 @@ self: { pname = "semialign-optics"; version = "1.1"; sha256 = "1ffibnk1hsdnny5jm85j07f05k81pzzai4jljlj12nn687rbb59y"; + revision = "1"; + editedCabalFile = "0l7wkq1s51k04dy815mqvwcf94r1l4a40ngzz958gi3vc07xyppx"; libraryHaskellDepends = [ base containers hashable optics-extra semialign these unordered-containers vector @@ -215893,8 +219238,8 @@ self: { }: mkDerivation { pname = "serialise"; - version = "0.2.2.0"; - sha256 = "17m1xs3hdvbkba1b8qjcv58drhl2wgvjkp7a2m38mkwn6xxvpg1k"; + version = "0.2.3.0"; + sha256 = "0vp4wyxpximpx10pssfgdsir1pc23zb62fg3kj3iblpzqfrryy69"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable primitive text time unordered-containers vector @@ -215913,6 +219258,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "serialise-uuid" = callPackage + ({ mkDerivation, base, bytestring, cborg, serialise, tasty + , tasty-hunit, tasty-quickcheck, uuid-types + }: + mkDerivation { + pname = "serialise-uuid"; + version = "0.1"; + sha256 = "0sw1vim04yflkznxkcdcljrns1nb6v0zjvwkx5spbb5dc0gk12v5"; + libraryHaskellDepends = [ + base bytestring cborg serialise uuid-types + ]; + testHaskellDepends = [ + base bytestring serialise tasty tasty-hunit tasty-quickcheck + uuid-types + ]; + description = "Encode and decode UUID values in CBOR using uuid-types, cborg and serialise"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "serialize-instances" = callPackage ({ mkDerivation, base, cereal, hashable, semigroups , unordered-containers @@ -216887,6 +220251,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-docs-simple" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hspec + , hspec-core, ordered-containers, prettyprinter, raw-strings-qq + , servant, text, unordered-containers + }: + mkDerivation { + pname = "servant-docs-simple"; + version = "0.2.0.1"; + sha256 = "0r9lq4vv88fvh8dfw5z7kxsw57vr7877gixwjfmsy5q1yam91d9d"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring ordered-containers prettyprinter + servant text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring hspec hspec-core + ordered-containers prettyprinter raw-strings-qq servant text + unordered-containers + ]; + description = "Generate endpoints overview for Servant API"; + license = stdenv.lib.licenses.mit; + }) {}; + "servant-ede" = callPackage ({ mkDerivation, aeson, base, bytestring, ede, either, filepath , http-media, http-types, semigroups, servant, servant-server, text @@ -216945,8 +220331,8 @@ self: { }: mkDerivation { pname = "servant-elm"; - version = "0.7.1"; - sha256 = "1r24hqv4xs1k280a0c3lcmfjrywh0663hh8xi8fpzlmsgmn2s464"; + version = "0.7.2"; + sha256 = "1hn7qkz4aw5snc4lbprbshzr3dagfry1bms0fx9bfif61312swqy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -216967,8 +220353,8 @@ self: { }: mkDerivation { pname = "servant-errors"; - version = "0.1.3.1"; - sha256 = "120rl4adz54c3psb6qv8l6im4xv2649kwazvfr7h0l11jjfb6hni"; + version = "0.1.4.0"; + sha256 = "1qg8p69yhkkdqa51n4pp59y254a5q6rl255fh380z4kzh4vsdjcn"; libraryHaskellDepends = [ aeson base bytestring http-api-data http-media http-types scientific servant string-conversions text unordered-containers wai @@ -218792,8 +222178,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.10.2"; - sha256 = "1iy69394dqv38dlh71m8sarcfps9gaaq90zpc4f169vnhpr59wak"; + version = "0.10.5"; + sha256 = "187pah3k88vp27k1imwj1mqxavd9zykms3is517xrp209ldx5kw1"; libraryHaskellDepends = [ aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute lens network @@ -218810,6 +222196,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "serverless-haskell_0_11_3" = callPackage + ({ mkDerivation, aeson, aeson-casing, amazonka-core + , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive + , hspec, hspec-discover, http-client, http-types, iproute, lens + , raw-strings-qq, safe-exceptions, text, time, unix + , unordered-containers + }: + mkDerivation { + pname = "serverless-haskell"; + version = "0.11.3"; + sha256 = "14jaykiwi5xzf9cvkkk35gqgk203yah1ln0skr7gi847bh95v7qf"; + libraryHaskellDepends = [ + aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base + bytestring case-insensitive http-client http-types iproute lens + safe-exceptions text time unix unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base + bytestring case-insensitive hspec hspec-discover http-client + http-types iproute lens raw-strings-qq safe-exceptions text time + unix unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Deploying Haskell code onto AWS Lambda using Serverless"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "serversession" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, data-default, hashable, hspec, nonce, path-pieces @@ -219397,6 +222811,8 @@ self: { pname = "sexp-grammar"; version = "2.1.0"; sha256 = "139sqr50bba74h2r6gdivzsgkqjwq1gcah54zw2jkwzhlfk03fm1"; + revision = "1"; + editedCabalFile = "07rjcyk1zz775znhibaaqwxfkb8vfdbr5qsd20g5ywld0302scb1"; libraryHaskellDepends = [ array base bytestring containers deepseq invertible-grammar prettyprinter recursion-schemes scientific semigroups text @@ -219467,17 +222883,20 @@ self: { }) {}; "sexpresso" = callPackage - ({ mkDerivation, base, containers, megaparsec, smallcheck, tasty - , tasty-hunit, tasty-smallcheck, text + ({ mkDerivation, base, bifunctors, containers, megaparsec + , recursion-schemes, smallcheck, tasty, tasty-hunit + , tasty-smallcheck, text }: mkDerivation { pname = "sexpresso"; - version = "1.0.0.2"; - sha256 = "1pyhzxpnzc34dyhs4xh29dzqp8f5zqgdhb20g2gy2l63lh0fickn"; - libraryHaskellDepends = [ base containers megaparsec text ]; + version = "1.1.0.0"; + sha256 = "0y08m020bs1133b6jh6lb20bpa1kpd1ib0b51vdpf9n2pzpqy3jr"; + libraryHaskellDepends = [ + base bifunctors containers megaparsec recursion-schemes text + ]; testHaskellDepends = [ - base containers megaparsec smallcheck tasty tasty-hunit - tasty-smallcheck text + base bifunctors containers megaparsec recursion-schemes smallcheck + tasty tasty-hunit tasty-smallcheck text ]; description = "A flexible library for parsing and printing S-expression"; license = "unknown"; @@ -219828,15 +223247,15 @@ self: { }) {}; "shake-bindist" = callPackage - ({ mkDerivation, archive-sig, base, bytestring, bz2, lzlib, lzma - , shake, zlib, zstd + ({ mkDerivation, archive-sig, base, bytestring, bz2, lzlib, shake + , zlib, zstd }: mkDerivation { pname = "shake-bindist"; - version = "1.0.1.0"; - sha256 = "0rlbn367czab885l44k698wiyavs0jf1rbzn4hk48mfhqxpcihky"; + version = "1.0.0.0"; + sha256 = "0fzq62a8rjh9jc9dc7rfi6ypp0fax7fhlf632a30mrbpk1hqyfz8"; libraryHaskellDepends = [ - archive-sig base bytestring bz2 lzlib lzma shake zlib zstd + archive-sig base bytestring bz2 lzlib shake zlib zstd ]; description = "Rules for binary distributions"; license = stdenv.lib.licenses.bsd3; @@ -220051,6 +223470,54 @@ self: { broken = true; }) {}; + "shake-plus" = callPackage + ({ mkDerivation, base, comonad, extra, hashable, path, rio, shake + , within + }: + mkDerivation { + pname = "shake-plus"; + version = "0.1.3.0"; + sha256 = "1s7mx4xsl31y8j4cm0hv7xwj6hf4smfby86d38fxw3mw3pcjw385"; + libraryHaskellDepends = [ + base comonad extra hashable path rio shake within + ]; + description = "Re-export of Shake using well-typed paths and ReaderT"; + license = stdenv.lib.licenses.mit; + }) {}; + + "shakebook" = callPackage + ({ mkDerivation, aeson, base, comonad, doctemplates, extra, feed + , free, lens, lens-aeson, mustache, optparse-applicative, pandoc + , pandoc-types, path, relude, rio, shake, shake-plus, slick, split + , tasty, tasty-golden, text-time, within, zipper-extra + }: + mkDerivation { + pname = "shakebook"; + version = "0.2.2.0"; + sha256 = "19aa021sl9k2q5im3nfh73rhydald8f7f3z7c1ncnqszbfkhf8xh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base comonad doctemplates extra feed free lens lens-aeson + mustache pandoc pandoc-types path relude rio shake shake-plus slick + split text-time within zipper-extra + ]; + executableHaskellDepends = [ + aeson base comonad doctemplates extra feed free lens lens-aeson + mustache optparse-applicative pandoc pandoc-types path relude rio + shake shake-plus slick split text-time within zipper-extra + ]; + testHaskellDepends = [ + aeson base comonad doctemplates extra feed free lens lens-aeson + mustache pandoc pandoc-types path relude rio shake shake-plus slick + split tasty tasty-golden text-time within zipper-extra + ]; + description = "Shake-based technical documentation generator; HTML & PDF"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "shaker" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, ghc, ghc-paths, haskeline, haskell-src, HUnit, mtl @@ -220601,8 +224068,8 @@ self: { }: mkDerivation { pname = "shellmet"; - version = "0.0.3.0"; - sha256 = "1i39zl8khsriadi7k28rn0w2y8wf6jmnz5x3nlkdd9spkdy1qz49"; + version = "0.0.3.1"; + sha256 = "099v8w3b6s66mz79igjh57v98b90il6zkqh5wnqi3rvagbs89w5r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process text ]; @@ -220948,14 +224415,17 @@ self: { }) {}; "shortcut-links" = callPackage - ({ mkDerivation, base, text }: + ({ mkDerivation, base, doctest, text }: mkDerivation { pname = "shortcut-links"; - version = "0.5.0.0"; - sha256 = "0y5q3m5sqwwhahq8fx1alc2531jfgr4nng8yfpib8sg57n0wggwf"; + version = "0.5.1.0"; + sha256 = "0gi3w7hh261nc2bmcwvagbgdazllk50sxn4vpzdhc2wb046mcida"; libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base doctest ]; description = "Link shortcuts for use in text markup"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shorten-strings" = callPackage @@ -221016,6 +224486,8 @@ self: { pname = "show-combinators"; version = "0.2.0.0"; sha256 = "07ds87ldl9165hj3k5h84iawc6vqlbggni3dg1nhbxww1spxn0n9"; + revision = "1"; + editedCabalFile = "1pczjf7z43nzfgza9fa29flbmvkj07p4dw16v9bjv36i8dv6cjc7"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Combinators to write Show instances"; @@ -221046,6 +224518,8 @@ self: { pname = "show-prettyprint"; version = "0.3.0.1"; sha256 = "030dzprz07ib41f8pg2409zdxymvkk8jq4m0vczvgaajq3gghkdk"; + revision = "1"; + editedCabalFile = "1sfspc1a5nhwap6mwx1wn75ar8csb2kx8r0rpampdrpk427idvzs"; libraryHaskellDepends = [ ansi-wl-pprint base prettyprinter trifecta ]; @@ -221266,7 +224740,7 @@ self: { version = "0.1.0.1"; sha256 = "19zjwzh3i8ql5xz9rvmbz7n2l3z7dcq683ikrpvqx3wxnc06058m"; libraryHaskellDepends = [ base ]; - description = "Sieve is an implementation of the Sieve abstract data type"; + description = "Sieve is an implementation of the Sieve abstract data type."; license = stdenv.lib.licenses.gpl2; }) {}; @@ -221496,8 +224970,8 @@ self: { }: mkDerivation { pname = "simple"; - version = "0.11.3"; - sha256 = "0qifp6wacsmykb09ddx03yv4pbk7c1rhs16jjlfafm2wc2025rac"; + version = "1.0.0"; + sha256 = "18kzgs897xpvhxl68z49l850j3p4559r27i3sdp5nffyir32lwa5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -221545,16 +225019,14 @@ self: { }: mkDerivation { pname = "simple-affine-space"; - version = "0.1"; - sha256 = "02cy4vnl3fy18dsfxazh60bqgk5c1gw2x460x6i1fb5qysw7q8nh"; + version = "0.1.1"; + sha256 = "172yn8kispqbn6zrdn610mh3l728ffb6lwa1zk5qgwm0lfpx3849"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base directory filepath hlint process regex-posix ]; description = "A simple library for affine and vector spaces"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "simple-atom" = callPackage @@ -222069,8 +225541,8 @@ self: { }: mkDerivation { pname = "simple-postgresql-orm"; - version = "0.9.0.1"; - sha256 = "0j1v64ywfchxjdidy5pb1dzab0qhn516vcy580incw1bminyh3rz"; + version = "1.0.0"; + sha256 = "0dl62x99j331371m8ailvk1pajnb43nsygl33j9vnq5alz7kpifp"; libraryHaskellDepends = [ base bytestring directory filepath postgresql-orm postgresql-simple resource-pool simple transformers @@ -222147,8 +225619,8 @@ self: { }: mkDerivation { pname = "simple-session"; - version = "0.10.1.1"; - sha256 = "1hg7925p14hk1p8v65n5ysd41qyfsccrjm40192bd000m2vrr74a"; + version = "1.0.0"; + sha256 = "0lgs260wcqa796mw9vsg9dfgx0d8kd5m067cr4s7cp4fbssja0kp"; libraryHaskellDepends = [ base base64-bytestring blaze-builder byteable bytestring containers cookie cryptohash http-types simple transformers wai wai-extra @@ -222279,6 +225751,25 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; + "simple-templates_1_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, hspec, HUnit, scientific + , text, unordered-containers, vector + }: + mkDerivation { + pname = "simple-templates"; + version = "1.0.0"; + sha256 = "0vm30fdjm5fydv4ns3z2cvmqadyxb47kvj8nzwkk5jff35jaglrf"; + libraryHaskellDepends = [ + aeson attoparsec base scientific text unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base hspec HUnit scientific vector + ]; + description = "A basic template language for the Simple web framework"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-text-format" = callPackage ({ mkDerivation, attoparsec, base, hspec, microlens-platform, text , unordered-containers @@ -222578,6 +226069,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simplistic-generics_2_0_0" = callPackage + ({ mkDerivation, base, containers, deepseq, kind-apply, mtl + , template-haskell + }: + mkDerivation { + pname = "simplistic-generics"; + version = "2.0.0"; + sha256 = "178sy401xh8g4a7gs0iiwpcgqb9nif8yaa7rsr0ryjkhi5xpbb6q"; + libraryHaskellDepends = [ + base containers deepseq kind-apply mtl template-haskell + ]; + description = "Generic programming without too many type classes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simseq" = callPackage ({ mkDerivation, base, bio, bytestring, random }: mkDerivation { @@ -222659,6 +226166,18 @@ self: { broken = true; }) {}; + "singlethongs" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "singlethongs"; + version = "0.1"; + sha256 = "14f7nnlw4hwvv767qgm6cb3ywijm9gyzjprr0i4ffa04r283mm3q"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base ]; + description = "Like singletons, but much smaller"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "singleton-bool" = callPackage ({ mkDerivation, base, dec }: mkDerivation { @@ -222689,8 +226208,8 @@ self: { ({ mkDerivation, base, singletons }: mkDerivation { pname = "singleton-nats"; - version = "0.4.4"; - sha256 = "14am0aggfrnd2w5g8cjljx0vmmrhy6r36xpkfrxpralhkr7h52m8"; + version = "0.4.5"; + sha256 = "0qmkqfj8rch9qcczs05lm5l3sx29slmqw156g4hhr3d735xg4nk1"; libraryHaskellDepends = [ base singletons ]; description = "Unary natural numbers relying on the singletons infrastructure"; license = stdenv.lib.licenses.bsd3; @@ -223334,25 +226853,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.8.3.2"; - sha256 = "03kbvz66r4fp1zq09c6arnhi2s81iwsmv8lv2kz0g7a8dr0hpaq2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers skylighting-core - ]; - description = "syntax highlighting library"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "skylighting_0_8_3_4" = callPackage - ({ mkDerivation, base, binary, bytestring, containers - , skylighting-core - }: - mkDerivation { - pname = "skylighting"; - version = "0.8.3.4"; - sha256 = "1fqjz2s8i9i235mrp4364ycidax2zl7xrgcahsqpbr4cx7vgy9qz"; + version = "0.8.4"; + sha256 = "08fy9c3ms6xwzxispgksf1cji9mvcyy8swaj3dwvc2dc66h06xky"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223360,7 +226862,6 @@ self: { ]; description = "syntax highlighting library"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skylighting-core" = callPackage @@ -223373,40 +226874,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.8.3.2"; - sha256 = "04l1qcfqkvi7c4hv5nra4nl2zk5r6l6jkj95wvq466anls8x35rj"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal attoparsec base base64-bytestring binary - blaze-html bytestring case-insensitive colour containers directory - filepath hxt mtl regex-pcre-builtin safe text transformers - utf8-string - ]; - testHaskellDepends = [ - aeson base bytestring containers Diff directory filepath HUnit - pretty-show QuickCheck random tasty tasty-golden tasty-hunit - tasty-quickcheck text - ]; - benchmarkHaskellDepends = [ - base containers criterion directory filepath text - ]; - description = "syntax highlighting library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "skylighting-core_0_8_3_4" = callPackage - ({ mkDerivation, aeson, ansi-terminal, attoparsec, base - , base64-bytestring, binary, blaze-html, bytestring - , case-insensitive, colour, containers, criterion, Diff, directory - , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random - , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, text, transformers, utf8-string - }: - mkDerivation { - pname = "skylighting-core"; - version = "0.8.3.4"; - sha256 = "0jcryl83873jjn6lximl1pnshf84nlln1hdvrdcybhrpjyd56qdc"; + version = "0.8.4"; + sha256 = "0wyhiark5d1r1hi04xiq14ykikr9yd4dmzqbr7qswl05b0bk7gam"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223425,7 +226894,6 @@ self: { ]; description = "syntax highlighting library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skylighting-extensions" = callPackage @@ -223571,6 +227039,31 @@ self: { broken = true; }) {}; + "slack-progressbar" = callPackage + ({ mkDerivation, aeson, base, bytestring, interpolate, lens + , lens-aeson, mtl, network-uri, text, transformers, wreq + }: + mkDerivation { + pname = "slack-progressbar"; + version = "0.1.0.0"; + sha256 = "0jdjl8cs29jlk7likvvci4l435rgngj2a4fnj258rq2ws3c5zxgn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring interpolate lens lens-aeson mtl network-uri + text transformers wreq + ]; + executableHaskellDepends = [ + aeson base bytestring interpolate lens lens-aeson mtl network-uri + text transformers wreq + ]; + testHaskellDepends = [ + aeson base bytestring interpolate lens lens-aeson mtl network-uri + text transformers wreq + ]; + license = stdenv.lib.licenses.mit; + }) {}; + "slack-verify" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite , hspec @@ -223778,8 +227271,8 @@ self: { ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "slist"; - version = "0.1.0.0"; - sha256 = "0yvcy8v9qpg517njy3sr5vqr4jgpynii7lw8gqh9pwjk40q628wf"; + version = "0.1.1.0"; + sha256 = "046v580i8kxx9fpsvavwpydyfsffky3m735c45dafixrkbhjz55d"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; description = "Sized list"; @@ -223894,29 +227387,26 @@ self: { }) {}; "slynx" = callPackage - ({ mkDerivation, async, base, bytestring, containers - , data-memocombinators, elynx-seq, elynx-tools, elynx-tree, hmatrix - , integration, math-functions, matrices, megaparsec, monad-logger - , mwc-random, optparse-applicative, parallel, primitive, statistics - , text, transformers, vector, vector-th-unbox, word8 + ({ mkDerivation, async, base, bytestring, containers, elynx-markov + , elynx-seq, elynx-tools, elynx-tree, hmatrix, megaparsec + , monad-logger, mwc-random, optparse-applicative, scientific, text + , transformers, vector }: mkDerivation { pname = "slynx"; - version = "0.1.0"; - sha256 = "0bxdjwwxzpl437a2fzjb8vazbsz16jk2szxhbr63y12hckgjpzrj"; + version = "0.2.2"; + sha256 = "0jja57dcalxd1qp7fj338jwbpaxm1l3ika2zyd9rv3dk2k1xn6rj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base bytestring containers data-memocombinators elynx-seq - elynx-tools elynx-tree hmatrix integration math-functions matrices - megaparsec monad-logger mwc-random optparse-applicative parallel - primitive statistics text transformers vector vector-th-unbox word8 + async base bytestring containers elynx-markov elynx-seq elynx-tools + elynx-tree hmatrix megaparsec monad-logger mwc-random + optparse-applicative scientific text transformers vector ]; executableHaskellDepends = [ - async base bytestring containers data-memocombinators elynx-seq - elynx-tools hmatrix integration math-functions matrices megaparsec - monad-logger mwc-random optparse-applicative parallel primitive - statistics text transformers vector vector-th-unbox word8 + async base bytestring containers elynx-seq elynx-tools hmatrix + megaparsec monad-logger mwc-random optparse-applicative scientific + text transformers vector ]; description = "Handle molecular sequences"; license = stdenv.lib.licenses.gpl3; @@ -224224,6 +227714,57 @@ self: { broken = true; }) {}; + "smash" = callPackage + ({ mkDerivation, base, bifunctors, binary, deepseq, hashable }: + mkDerivation { + pname = "smash"; + version = "0.1.1.0"; + sha256 = "1vr6zc8mw2w510vcs3m8ngqbdscxywiqimvqs8jimjfyi86g30rb"; + revision = "1"; + editedCabalFile = "1p43gdh5d3vm5zx4mdi3zfka5i0zx332454aia4r7zrqs2x82csr"; + libraryHaskellDepends = [ + base bifunctors binary deepseq hashable + ]; + testHaskellDepends = [ base ]; + description = "Combinators for Maybe types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "smash-aeson" = callPackage + ({ mkDerivation, aeson, base, smash, unordered-containers }: + mkDerivation { + pname = "smash-aeson"; + version = "0.1.0.0"; + sha256 = "0vmazs3ypqxaw4zdywimxfzrsvidnyk5damx6fpy549ny9319rqs"; + libraryHaskellDepends = [ aeson base smash unordered-containers ]; + description = "Aeson support for the smash library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "smash-lens" = callPackage + ({ mkDerivation, base, lens, smash }: + mkDerivation { + pname = "smash-lens"; + version = "0.1.0.0"; + sha256 = "05f2swr4qv3x12fwpyxa0ph90awgf484gn9y8rlxlvql0h213rnm"; + libraryHaskellDepends = [ base lens smash ]; + testHaskellDepends = [ base ]; + description = "Optics for the `smash` library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "smash-microlens" = callPackage + ({ mkDerivation, base, microlens, smash }: + mkDerivation { + pname = "smash-microlens"; + version = "0.1.0.0"; + sha256 = "164vmvrgfsq777408skndzybhg4cp0d97vrijk6b66nnv9k4ril0"; + libraryHaskellDepends = [ base microlens smash ]; + testHaskellDepends = [ base ]; + description = "Optics for the `smash` library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "smcdel" = callPackage ({ mkDerivation, ansi-terminal, array, base, containers, criterion , cudd, directory, file-embed, filepath, graphviz, HasCacBDD, hspec @@ -224442,6 +227983,8 @@ self: { ]; description = "A type-safe interface to communicate with an SMT solver"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smtlib2-debug" = callPackage @@ -224511,6 +228054,8 @@ self: { libraryHaskellDepends = [ base dependent-sum mtl smtlib2 time ]; description = "Get timing informations for SMT queries"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smtp-mail" = callPackage @@ -225587,6 +229132,8 @@ self: { pname = "snaplet-postgresql-simple"; version = "1.2.0.0"; sha256 = "0an9b72vfnb562k49bz5wh72s637r3vrbm4x9brwf483rrmlmvrf"; + revision = "1"; + editedCabalFile = "1zzidcr5j6i6xnzrlzxlmpj6fs60knkbkjbagawa3y1v1wg3vmq7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -226002,6 +229549,20 @@ self: { broken = true; }) {}; + "snappy-lazy" = callPackage + ({ mkDerivation, base, binary, bytestring, snappy, snappy-framing + }: + mkDerivation { + pname = "snappy-lazy"; + version = "0.1.0.0"; + sha256 = "02c2zxlzs5p29rsjj3vsnc2hdamr40is7fzybq6mf5rl9nkicggh"; + libraryHaskellDepends = [ + base binary bytestring snappy snappy-framing + ]; + description = "Lazy bytestring compression and decompression"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sndfile-enumerators" = callPackage ({ mkDerivation, base, binary, bytestring, containers, filepath , iteratee, listlike-instances, MonadCatchIO-transformers @@ -226871,19 +230432,22 @@ self: { }) {}; "souffle-haskell" = callPackage - ({ mkDerivation, base, hspec, mtl, souffle, template-haskell, text + ({ mkDerivation, base, deepseq, directory, filepath, hspec, mtl + , process, souffle, template-haskell, temporary, text , type-errors-pretty, vector }: mkDerivation { pname = "souffle-haskell"; - version = "0.1.0"; - sha256 = "0m8p9fx4avv4kf4hbr248rk9k3vixzkx4gqmcslfra3d79akjyad"; + version = "0.2.2"; + sha256 = "1835yq0prh42x9yakfx963hv1lzkhizz02ba344z099rx4fx9fji"; libraryHaskellDepends = [ - base mtl template-haskell text type-errors-pretty vector + base deepseq directory filepath mtl process template-haskell + temporary text type-errors-pretty vector ]; libraryToolDepends = [ souffle ]; testHaskellDepends = [ - base hspec mtl template-haskell text type-errors-pretty vector + base deepseq directory filepath hspec mtl process template-haskell + temporary text type-errors-pretty vector ]; testToolDepends = [ souffle ]; description = "Souffle Datalog bindings for Haskell"; @@ -227097,8 +230661,8 @@ self: { }: mkDerivation { pname = "spacecookie"; - version = "0.2.1.1"; - sha256 = "0l3knzsqab58yyk6kafpxxh465ncgqr2gi388k89gxwrlcqkl8wr"; + version = "0.2.1.2"; + sha256 = "0cb51kji78vfg17mcnz3a5jlfbnyavh880x09b18y9syqwx4in7l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227535,7 +231099,7 @@ self: { aeson base blaze-markup bytestring cereal deepseq hashable mwc-random path-pieces primitive safecopy text uuid ]; - description = "Simple data types that help me here and there"; + description = "Simple data types that help me here and there."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -227609,8 +231173,8 @@ self: { }: mkDerivation { pname = "spectral-clustering"; - version = "0.3.1.3"; - sha256 = "0izf0lvk989y4d04240hbnsr5lc5lbl9200c5km0p72lv1v07mgf"; + version = "0.3.2.2"; + sha256 = "03f4mdrrfdivf0ynk4rfl64mng4nd82k8a64p05b3bymvd8lsdhn"; libraryHaskellDepends = [ base clustering containers hmatrix hmatrix-svdlibc mwc-random safe sparse-linear-algebra statistics vector @@ -227625,8 +231189,8 @@ self: { ({ mkDerivation, base, cmdargs, containers, express, leancheck }: mkDerivation { pname = "speculate"; - version = "0.4.1"; - sha256 = "1fyj6kizwwb2vpvn17s7gx4swmzsziwmf6mmxaldbrzkha46y9hn"; + version = "0.4.2"; + sha256 = "01ahb1g7f19qxf8lz9afxbf2inywrsqkawx784gx3af1wlzj61d9"; libraryHaskellDepends = [ base cmdargs containers express leancheck ]; @@ -228517,11 +232081,11 @@ self: { ({ mkDerivation, base, logging, text, transformers, unixODBC }: mkDerivation { pname = "sqlcli"; - version = "0.2.0.1"; - sha256 = "09x9g3rjz1idyr0rh885y4pdddn08g7hwcspa47n6yf5wlx33gln"; + version = "0.2.2.0"; + sha256 = "1kscw8l14cx7q55vq72vg8ydfz19s41prdlbg9b11fhzv691iwgd"; libraryHaskellDepends = [ base logging text transformers ]; librarySystemDepends = [ unixODBC ]; - description = "Sql Call-Level Interface bindings for Haskell"; + description = "Bindings for SQL/CLI (ODBC) C API"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) unixODBC;}; @@ -228645,30 +232209,38 @@ self: { }) {}; "squeal-postgresql" = callPackage - ({ mkDerivation, aeson, async, base, binary-parser, bytestring - , bytestring-strict-builder, deepseq, doctest, generics-sop, hspec - , mmorph, mtl, network-ip, postgresql-binary, postgresql-libpq + ({ mkDerivation, aeson, async, base, binary, binary-parser + , bytestring, bytestring-strict-builder, deepseq, doctest + , free-categories, gauge, generic-random, generics-sop, hedgehog + , hspec, mmorph, monad-loops, mtl, network-ip, postgresql-binary + , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances , records-sop, resource-pool, scientific, text, time, transformers - , unliftio, unliftio-pool, uuid-types, vector + , unliftio, unliftio-pool, uuid-types, vector, with-utf8 }: mkDerivation { pname = "squeal-postgresql"; - version = "0.5.2.0"; - sha256 = "09mmpk42lllrx69mkfnbj7pgy5iclrv22dy3cndfv8y0vk70nhr1"; + version = "0.6.0.2"; + sha256 = "0798aw0ahjdjczz5i8n1dwix8vzd0ccl7cbf473x5mxn549nh0qm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base binary-parser bytestring bytestring-strict-builder - deepseq generics-sop mmorph mtl network-ip postgresql-binary - postgresql-libpq records-sop resource-pool scientific text time + aeson base binary binary-parser bytestring + bytestring-strict-builder deepseq free-categories generics-sop + mmorph mtl network-ip postgresql-binary postgresql-libpq + profunctors records-sop resource-pool scientific text time transformers unliftio unliftio-pool uuid-types vector ]; executableHaskellDepends = [ base bytestring generics-sop mtl text transformers vector ]; testHaskellDepends = [ - async base bytestring doctest generics-sop hspec text transformers - vector + async base bytestring doctest generics-sop hedgehog hspec mtl + scientific text time vector with-utf8 + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq gauge generic-random generics-sop + monad-loops mtl QuickCheck quickcheck-instances scientific text + with-utf8 ]; description = "Squeal PostgreSQL Library"; license = stdenv.lib.licenses.bsd3; @@ -229055,8 +232627,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "stable-marriage"; - version = "0.1.2.0"; - sha256 = "1xm99zdgzdlaz48njpyl0ji9hmyxcf9zxjs0dg46si4lj64qavmz"; + version = "0.1.3.0"; + sha256 = "04nd7c34gsx6njiwqzzx14ff745naam1cxc0cr4s7yyr9h7ikdai"; libraryHaskellDepends = [ base ghc-prim ]; description = "algorithms around stable marriage"; license = stdenv.lib.licenses.bsd3; @@ -229115,6 +232687,8 @@ self: { pname = "stache"; version = "2.1.1"; sha256 = "06pn7pm5vgk9f4bsh3m29cik514nv5w655ip04k7p5jv9xgmn4ld"; + revision = "1"; + editedCabalFile = "1cs3pnbxmjpzizydncai7wr5aj454374wr1sc0h705c4cbxqlfs0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath @@ -229135,28 +232709,27 @@ self: { "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array , async, attoparsec, base, base64-bytestring, bytestring, Cabal - , colour, conduit, conduit-extra, containers, cryptonite - , cryptonite-conduit, deepseq, directory, echo, exceptions, extra - , file-embed, filelock, filepath, fsnotify, generic-deriving - , hackage-security, hashable, hi-file-parser, hpack, hpc, hspec - , http-client, http-client-tls, http-conduit, http-download - , http-types, memory, microlens, mintty, mono-traversable, mtl - , mustache, neat-interpolation, network-uri, open-browser - , optparse-applicative, pantry, path, path-io, persistent - , persistent-sqlite, persistent-template, pretty, primitive - , process, project-template, QuickCheck, raw-strings-qq - , regex-applicative-text, resource-pool, resourcet, retry, rio - , rio-prettyprint, semigroups, smallcheck, split, stm - , streaming-commons, tar, template-haskell, temporary - , terminal-size, text, text-metrics, th-reify-many, time, tls + , casa-client, casa-types, colour, conduit, conduit-extra + , containers, cryptonite, cryptonite-conduit, deepseq, directory + , echo, exceptions, extra, file-embed, filelock, filepath, fsnotify + , generic-deriving, hackage-security, hashable, hi-file-parser + , hpack, hpc, hspec, http-client, http-client-tls, http-conduit + , http-download, http-types, memory, microlens, mintty + , mono-traversable, mtl, mustache, neat-interpolation, network-uri + , open-browser, optparse-applicative, pantry, path, path-io + , persistent, persistent-sqlite, persistent-template, pretty + , primitive, process, project-template, QuickCheck, raw-strings-qq + , regex-applicative-text, retry, rio, rio-prettyprint, semigroups + , smallcheck, split, stm, streaming-commons, tar, template-haskell + , temporary, text, text-metrics, th-reify-many, time, tls , transformers, typed-process, unicode-transforms, unix , unix-compat, unliftio, unordered-containers, vector, yaml , zip-archive, zlib }: mkDerivation { pname = "stack"; - version = "2.1.3.1"; - sha256 = "1q2nagnc24fvyj3hwnpgyp3rqhxswhscyw4pw2dazqx34ad3d0zr"; + version = "2.3.1"; + sha256 = "1l17jdkr6ca3hwm4v8bshq2zbadqhb35hk2gfjy2dri1mdibcsdr"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -229166,55 +232739,53 @@ self: { setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal array async attoparsec base - base64-bytestring bytestring Cabal colour conduit conduit-extra - containers cryptonite cryptonite-conduit deepseq directory echo - exceptions extra file-embed filelock filepath fsnotify - generic-deriving hackage-security hashable hi-file-parser hpack hpc - http-client http-client-tls http-conduit http-download http-types - memory microlens mintty mono-traversable mtl mustache - neat-interpolation network-uri open-browser optparse-applicative - pantry path path-io persistent persistent-sqlite - persistent-template pretty primitive process project-template - regex-applicative-text resource-pool resourcet retry rio - rio-prettyprint semigroups split stm streaming-commons tar - template-haskell temporary terminal-size text text-metrics - th-reify-many time tls transformers typed-process - unicode-transforms unix unix-compat unliftio unordered-containers - vector yaml zip-archive zlib + base64-bytestring bytestring Cabal casa-client casa-types colour + conduit conduit-extra containers cryptonite cryptonite-conduit + deepseq directory echo exceptions extra file-embed filelock + filepath fsnotify generic-deriving hackage-security hashable + hi-file-parser hpack hpc http-client http-client-tls http-conduit + http-download http-types memory microlens mintty mono-traversable + mtl mustache neat-interpolation network-uri open-browser + optparse-applicative pantry path path-io persistent + persistent-sqlite persistent-template pretty primitive process + project-template regex-applicative-text retry rio rio-prettyprint + semigroups split stm streaming-commons tar template-haskell + temporary text text-metrics th-reify-many time tls transformers + typed-process unicode-transforms unix unix-compat unliftio + unordered-containers vector yaml zip-archive zlib ]; executableHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal array async attoparsec base - base64-bytestring bytestring Cabal colour conduit conduit-extra - containers cryptonite cryptonite-conduit deepseq directory echo - exceptions extra file-embed filelock filepath fsnotify - generic-deriving hackage-security hashable hi-file-parser hpack hpc - http-client http-client-tls http-conduit http-download http-types - memory microlens mintty mono-traversable mtl mustache - neat-interpolation network-uri open-browser optparse-applicative - pantry path path-io persistent persistent-sqlite - persistent-template pretty primitive process project-template - regex-applicative-text resource-pool resourcet retry rio - rio-prettyprint semigroups split stm streaming-commons tar - template-haskell temporary terminal-size text text-metrics - th-reify-many time tls transformers typed-process - unicode-transforms unix unix-compat unliftio unordered-containers - vector yaml zip-archive zlib + base64-bytestring bytestring Cabal casa-client casa-types colour + conduit conduit-extra containers cryptonite cryptonite-conduit + deepseq directory echo exceptions extra file-embed filelock + filepath fsnotify generic-deriving hackage-security hashable + hi-file-parser hpack hpc http-client http-client-tls http-conduit + http-download http-types memory microlens mintty mono-traversable + mtl mustache neat-interpolation network-uri open-browser + optparse-applicative pantry path path-io persistent + persistent-sqlite persistent-template pretty primitive process + project-template regex-applicative-text retry rio rio-prettyprint + semigroups split stm streaming-commons tar template-haskell + temporary text text-metrics th-reify-many time tls transformers + typed-process unicode-transforms unix unix-compat unliftio + unordered-containers vector yaml zip-archive zlib ]; testHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal array async attoparsec base - base64-bytestring bytestring Cabal colour conduit conduit-extra - containers cryptonite cryptonite-conduit deepseq directory echo - exceptions extra file-embed filelock filepath fsnotify - generic-deriving hackage-security hashable hi-file-parser hpack hpc - hspec http-client http-client-tls http-conduit http-download - http-types memory microlens mintty mono-traversable mtl mustache - neat-interpolation network-uri open-browser optparse-applicative - pantry path path-io persistent persistent-sqlite - persistent-template pretty primitive process project-template - QuickCheck raw-strings-qq regex-applicative-text resource-pool - resourcet retry rio rio-prettyprint semigroups smallcheck split stm - streaming-commons tar template-haskell temporary terminal-size text - text-metrics th-reify-many time tls transformers typed-process + base64-bytestring bytestring Cabal casa-client casa-types colour + conduit conduit-extra containers cryptonite cryptonite-conduit + deepseq directory echo exceptions extra file-embed filelock + filepath fsnotify generic-deriving hackage-security hashable + hi-file-parser hpack hpc hspec http-client http-client-tls + http-conduit http-download http-types memory microlens mintty + mono-traversable mtl mustache neat-interpolation network-uri + open-browser optparse-applicative pantry path path-io persistent + persistent-sqlite persistent-template pretty primitive process + project-template QuickCheck raw-strings-qq regex-applicative-text + retry rio rio-prettyprint semigroups smallcheck split stm + streaming-commons tar template-haskell temporary text text-metrics + th-reify-many time tls transformers typed-process unicode-transforms unix unix-compat unliftio unordered-containers vector yaml zip-archive zlib ]; @@ -229515,10 +233086,8 @@ self: { }: mkDerivation { pname = "stack2cabal"; - version = "1.0.5"; - sha256 = "15swq7rv997fh1qka7ga5hc90gc889xzkx61910jz3an6sy5zx0p"; - revision = "2"; - editedCabalFile = "12dkq7shcsyp8yrr2vvzf968w3x11kgxqlam1h0m33zvjksbw6dq"; + version = "1.0.6"; + sha256 = "0x6hvcflrh073v84c56073f4zm4v2bcmp74w3brkxvd3rhzdvbkz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230645,8 +234214,8 @@ self: { }: mkDerivation { pname = "staversion"; - version = "0.2.3.4"; - sha256 = "0b3hkk6m2wpcyj1zkl3az4v2m9cb7djxk7iz00rxz5j13ngxgfci"; + version = "0.2.3.5"; + sha256 = "1jm6cyql0zinw1bfs30986jpmb7ws4jmzfyxwmdfkdcz73bf1867"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -231597,8 +235166,8 @@ self: { }: mkDerivation { pname = "store"; - version = "0.7.2"; - sha256 = "1vavjbwys2l97ncb2d761rn7kk14f0gqmhvday8lqyxv91skq124"; + version = "0.7.4"; + sha256 = "1lipkzhdr6m5555r2p3s5g5i2am9kg34dznfakcsxv5z20vzd31z"; libraryHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors bytestring containers contravariant cryptohash deepseq directory @@ -231731,15 +235300,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_51_0" = callPackage + "stratosphere_0_52_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.51.0"; - sha256 = "053q621zw2c0nf08qc232mnh1cn4qxyzshayis6siqabdnjlqnk2"; + version = "0.52.0"; + sha256 = "1js5rb5f0p7ryja5slpxjpvqfq4f72bw9f66ysd70cjvw3zf3hbh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232062,7 +235631,7 @@ self: { base containers directory doctest filepath streaming streaming-commons tasty tasty-hunit ]; - description = "A resource management decorator for \"streaming\""; + description = "A resource management decorator for \"streaming\"."; license = stdenv.lib.licenses.mit; }) {}; @@ -232472,15 +236041,14 @@ self: { "streamly" = callPackage ({ mkDerivation, atomic-primops, base, containers, deepseq - , directory, exceptions, fusion-plugin-types, gauge, ghc, ghc-prim - , heaps, hspec, lockfree-queue, monad-control, mtl, network - , primitive, QuickCheck, random, transformers, transformers-base - , typed-process + , directory, exceptions, fusion-plugin-types, ghc, ghc-prim, heaps + , hspec, lockfree-queue, monad-control, mtl, network, primitive + , QuickCheck, random, transformers, transformers-base }: mkDerivation { pname = "streamly"; - version = "0.7.1"; - sha256 = "0jzs2jaznjqrnzwqnjyg0zxggsrid3q8r5v4cnlzvkcn053yam3m"; + version = "0.7.2"; + sha256 = "007i3rfza0v8zy34lq9ipq2biarg82prmd1vxr5f2zz5xln37wrm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232492,9 +236060,6 @@ self: { base containers exceptions ghc hspec mtl QuickCheck random transformers ]; - benchmarkHaskellDepends = [ - base deepseq gauge mtl random typed-process - ]; description = "Beautiful Streaming, Concurrent and Reactive Composition"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -232565,15 +236130,15 @@ self: { "streamly-posix" = callPackage ({ mkDerivation, base, bytestring, filepath, hpath-posix, hspec , hspec-discover, safe-exceptions, streamly, streamly-bytestring - , temporary, unix, word8 + , temporary, transformers, unix, word8 }: mkDerivation { pname = "streamly-posix"; - version = "0.1.0.0"; - sha256 = "0pjrmpsm0925jhxnhqka3rlwllcww9xinyh1dg0k2g6b4pxr9gbx"; + version = "0.1.0.1"; + sha256 = "1z6hmnhgglr5zwsaakn7c6d0cgq32pwcdds8fkn28y9p3yc89bvv"; libraryHaskellDepends = [ base bytestring hpath-posix safe-exceptions streamly - streamly-bytestring unix word8 + streamly-bytestring transformers unix word8 ]; testHaskellDepends = [ base filepath hpath-posix hspec hspec-discover temporary unix @@ -232803,12 +236368,27 @@ self: { pname = "strict-tuple"; version = "0.1.3"; sha256 = "0dyiwgkbr1d97jbri7a2q4by7g0wiszpw3hgfgqv4rfp25lsv39j"; + revision = "1"; + editedCabalFile = "1bkizfki8v5p0n8sy59s4zqjmv1mnv3s45327cig9cr081ibv9yy"; libraryHaskellDepends = [ base bifunctors deepseq hashable ]; testHaskellDepends = [ base ]; description = "Strict tuples"; license = stdenv.lib.licenses.bsd3; }) {}; + "strict-tuple-lens" = callPackage + ({ mkDerivation, base, lens, strict-tuple }: + mkDerivation { + pname = "strict-tuple-lens"; + version = "0.1.0.1"; + sha256 = "1vvhbzbyfvkx76scygg8gwfp01cw6ks38hk0gb70xdl2lyzi80wg"; + revision = "1"; + editedCabalFile = "0875r7kva6ym17fdklh18vm4s04sd9pj0w55km8jv2kmbkmfja8k"; + libraryHaskellDepends = [ base lens strict-tuple ]; + description = "Optics for the `strict-tuple` library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "strict-types" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , hashable, text, unordered-containers, vector @@ -232954,29 +236534,28 @@ self: { }) {}; "string-interpolate" = callPackage - ({ mkDerivation, base, bytestring, criterion, formatting - , haskell-src-meta, hspec, interpolate, interpolatedstring-perl6 + ({ mkDerivation, base, bytestring, criterion, deepseq, formatting + , haskell-src-exts, haskell-src-meta, hspec, interpolate , neat-interpolation, QuickCheck, quickcheck-instances - , quickcheck-text, quickcheck-unicode, random-shuffle - , template-haskell, text, text-conversions, unordered-containers - , utf8-string + , quickcheck-text, quickcheck-unicode, split, template-haskell + , text, text-conversions, unordered-containers, utf8-string }: mkDerivation { pname = "string-interpolate"; - version = "0.2.0.0"; - sha256 = "084mkh9xx9dcy7j92kca6rv580v8223n7xgm9csy51mn0h2lg6wq"; + version = "0.2.1.0"; + sha256 = "0wply8lqfhc1xnqxq88xwygwqxbq86gjrwphygbn7nz66g2abgda"; libraryHaskellDepends = [ - base bytestring haskell-src-meta template-haskell text - text-conversions utf8-string + base bytestring haskell-src-exts haskell-src-meta split + template-haskell text text-conversions utf8-string ]; testHaskellDepends = [ base bytestring hspec QuickCheck quickcheck-instances - quickcheck-text quickcheck-unicode random-shuffle text + quickcheck-text quickcheck-unicode template-haskell text unordered-containers ]; benchmarkHaskellDepends = [ - base bytestring criterion formatting interpolate - interpolatedstring-perl6 neat-interpolation QuickCheck text + base bytestring criterion deepseq formatting interpolate + neat-interpolation QuickCheck text ]; description = "Haskell string/text/bytestring interpolation that just works"; license = stdenv.lib.licenses.bsd3; @@ -232999,6 +236578,17 @@ self: { broken = true; }) {}; + "string-like" = callPackage + ({ mkDerivation, base, bytestring, text }: + mkDerivation { + pname = "string-like"; + version = "0.1.0.0"; + sha256 = "1b87532fhv2wn6pnzsaw20lzj5j399smlfn7lai0h0ph2axb2dbi"; + libraryHaskellDepends = [ base bytestring text ]; + description = "A package that aims to provide a uniform interface to string-like types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "string-qq" = callPackage ({ mkDerivation, base, HUnit, template-haskell, text }: mkDerivation { @@ -233243,8 +236833,8 @@ self: { ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "stripe-concepts"; - version = "1.0.2.0"; - sha256 = "0a8p4pm8v83kcgxm3jpmpl4811pdjjn2rmdl0mkq649rfnm3cg2k"; + version = "1.0.2.2"; + sha256 = "18dqw3fkviysazx1iy2ljnk6ngpck83ld0msnn8pn68l4qvvhl4r"; libraryHaskellDepends = [ base bytestring text ]; description = "Types for the Stripe API"; license = stdenv.lib.licenses.mit; @@ -233330,10 +236920,8 @@ self: { }: mkDerivation { pname = "stripe-scotty"; - version = "1.0.0.0"; - sha256 = "195v1a3sl5skz2jr71r1b4za033s6hib7ld59f4fdrfdr5658sbs"; - revision = "1"; - editedCabalFile = "0c3r39217650yjxxs1523ywvyiirrh2f209gl4hfznyigkx2kg41"; + version = "1.0.0.2"; + sha256 = "1dvmagbxgmlf7970rwf0cjdk8fcpxkl1isiki1bpq4zd07cjnsfv"; libraryHaskellDepends = [ aeson base bytestring http-types scotty stripe-concepts stripe-signature text unordered-containers @@ -233348,8 +236936,8 @@ self: { }: mkDerivation { pname = "stripe-signature"; - version = "1.0.0.1"; - sha256 = "1l5gw1lv63mpi8f2z70wv4b5809ljsi2zzdgj2mwc2zrdqfnharn"; + version = "1.0.0.2"; + sha256 = "1jjn4znk22993dpzwdqndnsyn4k76v7zqgm7j7dhvlgiwak6yxh6"; libraryHaskellDepends = [ base base16-bytestring bytestring cryptonite memory stripe-concepts text @@ -233384,8 +236972,8 @@ self: { }: mkDerivation { pname = "stripe-wreq"; - version = "1.0.1.0"; - sha256 = "0i5d0c9zha4v9361p92kq5bpma5dq5aqdkqdrghwpzx0pppfpx3y"; + version = "1.0.1.2"; + sha256 = "0hjk9d0xlg2a6nc2rmc19fmifcyrdj5m69100fy5xkq6brcqxjz1"; libraryHaskellDepends = [ aeson base bytestring lens stripe-concepts text unordered-containers wreq @@ -233415,8 +237003,8 @@ self: { }: mkDerivation { pname = "strive"; - version = "5.0.9"; - sha256 = "1022ir4m0r43717rdb1miynd61mfkfd3mp0dcv5ryb983znn3ag2"; + version = "5.0.10"; + sha256 = "0im35yqww85l9vkijhafdn4xp2ihxnis4g97m5sv79nbql3x0rfh"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers @@ -233835,8 +237423,8 @@ self: { }: mkDerivation { pname = "stylist"; - version = "1.2.0.0"; - sha256 = "1b3kz8kp2dda4f0vghbaxc6y29r39k197fzphy4av8p6vxgp2ka0"; + version = "2.2.0.0"; + sha256 = "0pmyjxdg7m0fh9m0nrimi02q4lqk47kfbws65mb22rj7ckm7gw68"; libraryHaskellDepends = [ async base css-syntax hashable network-uri text unordered-containers @@ -234626,6 +238214,8 @@ self: { pname = "supervisors"; version = "0.2.0.0"; sha256 = "0q6r211sbb9dyrplr61xajbwcfvz7z93401mhqxhw3pz55vyrg8i"; + revision = "1"; + editedCabalFile = "1p91gji7qgvash13d4c6av573czk70p89g9i4x8gnklzbrpz2qg7"; libraryHaskellDepends = [ async base containers safe-exceptions stm ]; @@ -234689,10 +238279,8 @@ self: { }: mkDerivation { pname = "sv"; - version = "1.4"; - sha256 = "02ymnnknfppx59b922y62grkmarwsyy77iv6bmyp2bzm8vbvnvd5"; - revision = "2"; - editedCabalFile = "0kacp654mmj9h038mrxnq69ln5ipbbp2ifvyzqixgjask2bf9f41"; + version = "1.4.0.1"; + sha256 = "1ak58rqg9f8xh43sgflcqnvpc62580y3ip1sxdg9w2scr8fqc6y2"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring contravariant hw-dsv semigroupoids sv-core transformers utf8-string validation @@ -234744,8 +238332,8 @@ self: { pname = "sv-core"; version = "0.5"; sha256 = "1x5gmv2pbn3hx1dhpkigivjkbg6n6xy7lc36wmccsw2qqn9r5qxa"; - revision = "2"; - editedCabalFile = "066kpnyvpzl6bvc11ng6xq4mdd84lxjiif83i265mkjc8hq21xd4"; + revision = "3"; + editedCabalFile = "0z077qfw5v6ar1jmlfgzjjj35zqpc77xzjqwihk5v5h6hifanp9d"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant deepseq double-conversion lens mtl parsec profunctors readable @@ -234768,8 +238356,8 @@ self: { pname = "sv-svfactor"; version = "0.2"; sha256 = "1fjgryypq6i4r3w9zdb282aq5lqp4577mzzycafklphc0d2ancgb"; - revision = "2"; - editedCabalFile = "1igmg66d7zs8pcia4j7nhr7iivnbanqz34wcpfx967823vc2whpw"; + revision = "3"; + editedCabalFile = "1qvpbc5qhljmfaxlbfjddiq51dymd9zlp66ya99sypb0anydc5n2"; libraryHaskellDepends = [ base bytestring lens profunctors sv-core svfactor validation ]; @@ -235083,6 +238671,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "swagger2_2_6" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries + , bytestring, Cabal, cabal-doctest, containers, cookie, doctest + , generics-sop, Glob, hashable, hspec, hspec-discover, http-media + , HUnit, insert-ordered-containers, lens, mtl, network, optics-core + , optics-th, QuickCheck, quickcheck-instances, scientific + , template-haskell, text, time, transformers, transformers-compat + , unordered-containers, utf8-string, uuid-types, vector + }: + mkDerivation { + pname = "swagger2"; + version = "2.6"; + sha256 = "0vkhikxf1gpspc9qjgnvz3glb01bd54bnc5kraac7dyn8cxzwak8"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat-batteries bytestring containers + cookie generics-sop hashable http-media insert-ordered-containers + lens mtl network optics-core optics-th QuickCheck scientific + template-haskell text time transformers transformers-compat + unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + aeson base base-compat-batteries bytestring containers doctest Glob + hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck + quickcheck-instances template-haskell text time + unordered-containers utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Swagger 2.0 data model"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "swapper" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, happstack-data , happstack-state, parallel, tokyocabinet @@ -235174,7 +238795,7 @@ self: { base containers hashable HUnit network-uri old-locale semigroups test-framework test-framework-hunit text time ]; - description = "A semantic web toolkit"; + description = "A semantic web toolkit."; license = stdenv.lib.licenses.lgpl21; }) {}; @@ -236455,16 +240076,16 @@ self: { "system-linux-proc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers - , directory, errors, hedgehog, text + , directory, errors, hedgehog, pretty-show, text }: mkDerivation { pname = "system-linux-proc"; - version = "0.1.0.3"; - sha256 = "0gljgsbyzya0grh0m13sld6v2cj7g9j5jcgh6yxff2mmqfcf3z7p"; + version = "0.1.1"; + sha256 = "12iq9vw5y0pvag9gj6pzm76lh9vfvziawzqzvi35mhdn1hjwhg4b"; libraryHaskellDepends = [ attoparsec base bytestring containers directory errors text ]; - testHaskellDepends = [ base hedgehog ]; + testHaskellDepends = [ base directory hedgehog pretty-show ]; description = "A library for accessing the /proc filesystem in Linux"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -236614,6 +240235,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "systemd_2_3_0" = callPackage + ({ mkDerivation, base, bytestring, network, transformers, unix }: + mkDerivation { + pname = "systemd"; + version = "2.3.0"; + sha256 = "1fa65j996snrdq83kh3jzzs2dsf2ddsscx596p03ykgknz1q1f16"; + libraryHaskellDepends = [ + base bytestring network transformers unix + ]; + testHaskellDepends = [ base network unix ]; + description = "Systemd facilities (Socket activation, Notify)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "systemstats" = callPackage ({ mkDerivation, base, micrologger, optparse-applicative, statgrab , text, text-format, transformers @@ -236725,7 +240361,7 @@ self: { libraryHaskellDepends = [ base containers ghc-prim mtl Takusen template-haskell time ]; - description = "Transito Abierto: convenience library when using Takusen and Oracle"; + description = "Transito Abierto: convenience library when using Takusen and Oracle."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -236768,8 +240404,8 @@ self: { }: mkDerivation { pname = "table-layout"; - version = "0.8.0.5"; - sha256 = "1gvajqjw5i2l97zcx607xlc143xq1sli5i1321msgi585h7ksnd4"; + version = "0.9.0.0"; + sha256 = "1dbh2j0520xfab6sn0zmi05xw8kv20pqqwk57b1h1xa01mh68xld"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -237744,8 +241380,8 @@ self: { }: mkDerivation { pname = "tar-bytestring"; - version = "0.6.3.1"; - sha256 = "09hmsgbjsk2ddnl9hfmhq1l274r7ay2fzs4rmqgs6x09q1kc5i5p"; + version = "0.6.3.2"; + sha256 = "10jmxjs808n3vcp997d42dy6256j67rk729awiviv2i76r7anzlv"; libraryHaskellDepends = [ array base bytestring containers deepseq hpath-directory hpath-filepath hpath-posix safe-exceptions these time unix word8 @@ -237850,14 +241486,12 @@ self: { }: mkDerivation { pname = "tart"; - version = "0.1.2"; - sha256 = "1ik86xbai9513gr9k60m55xf5pj5bdw3wbjc0gd260j9k9j4p73k"; - revision = "1"; - editedCabalFile = "04xkrc0xfbx2kk6f8b41zf611s4k848ahczbbs85pd9lqqpkbhzj"; + version = "0.2"; + sha256 = "03pi46lr5b9qcc35ffwxwzv9ll51cyv526kjcvaags3ky917rxxn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base binary bytestring microlens-platform mtl vty + array base binary bytestring microlens-platform mtl text vty ]; executableHaskellDepends = [ base brick containers directory microlens-platform microlens-th mtl @@ -237984,10 +241618,8 @@ self: { }: mkDerivation { pname = "taskwarrior"; - version = "0.1.2.2"; - sha256 = "0iy2fxgxhjdhi62zbd7iwbvblgr9shlqwg4a92k7b3cd9mqwskv6"; - revision = "1"; - editedCabalFile = "0fyidh845imi20r9h5sh4nvhnzylj5wg1rkfp9zpml7ifvpv609v"; + version = "0.2.1.0"; + sha256 = "1ladijvlvr6w35y1qlxbp0y34bby58a9bfyhqiynn0s4m5bj55c6"; libraryHaskellDepends = [ aeson base bytestring process random text time unordered-containers uuid @@ -238018,6 +241650,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty_1_3" = callPackage + ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl + , optparse-applicative, stm, tagged, unbounded-delays, unix + , wcwidth + }: + mkDerivation { + pname = "tasty"; + version = "1.3"; + sha256 = "0c9vmy31z6i4ligrsk0lcn8ir9qajc2yp3zdn8nnjd0myzddzf3b"; + libraryHaskellDepends = [ + ansi-terminal async base clock containers mtl optparse-applicative + stm tagged unbounded-delays unix wcwidth + ]; + description = "Modern and extensible testing framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-ant-xml" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers @@ -238061,11 +241711,23 @@ self: { ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "2.0.0.1"; - sha256 = "19cgzr1gcy1khvw2a6bfd620zmrc4szkdwyf3rfyacxgbgqy1b1z"; + version = "2.0.0.3"; + sha256 = "02qzyrn33ylfbk2mgwj08lphprxvzh85c0dz2540qp1j6xa5zxpn"; + libraryHaskellDepends = [ base dejafu random tagged tasty ]; + description = "Deja Fu support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + }) {}; + + "tasty-dejafu_2_0_0_4" = callPackage + ({ mkDerivation, base, dejafu, random, tagged, tasty }: + mkDerivation { + pname = "tasty-dejafu"; + version = "2.0.0.4"; + sha256 = "0jryp6kndaaxfjd4vsws18igx9ivd36iqyqdbjpxmxbx34d1h6kn"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-discover" = callPackage @@ -238128,23 +241790,47 @@ self: { "tasty-golden" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , directory, filepath, mtl, optparse-applicative, process, tagged - , tasty, tasty-hunit, temporary + , tasty, tasty-hunit, temporary, text }: mkDerivation { pname = "tasty-golden"; - version = "2.3.3"; - sha256 = "07sk9hw41am2xcpfkzy1jv43wlyxkdd4ajwk8rw2jabva91kv68x"; + version = "2.3.3.2"; + sha256 = "19dif84p71hks8czmaff6nlylsz34bqy0nki7mclr4ysawz1hdm9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers deepseq directory filepath mtl + optparse-applicative process tagged tasty temporary text + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary + ]; + description = "Golden tests support for tasty"; + license = stdenv.lib.licenses.mit; + }) {}; + + "tasty-golden_2_3_3_3" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, mtl, optparse-applicative, process, tagged + , tasty, tasty-hunit, temporary, text, unix-compat + }: + mkDerivation { + pname = "tasty-golden"; + version = "2.3.3.3"; + sha256 = "1h0nz276fxhdxjiqnrkpmsndrsfvbd13r7i6i8arxgldl1n86h24"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base bytestring containers deepseq directory filepath mtl - optparse-applicative process tagged tasty temporary + optparse-applicative process tagged tasty temporary text + unix-compat ]; testHaskellDepends = [ base directory filepath process tasty tasty-hunit temporary ]; description = "Golden tests support for tasty"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-groundhog-converters" = callPackage @@ -238175,6 +241861,8 @@ self: { pname = "tasty-hedgehog"; version = "1.0.0.2"; sha256 = "1vsv3m6brhshpqm8qixz97m7h0nx67cj6ira4cngbk7mf5rqylv5"; + revision = "2"; + editedCabalFile = "1v4jp3xk5ikik638vkyf2jxkhaf2n6fsw8zxqxxjv65x60082kl7"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -238215,8 +241903,8 @@ self: { pname = "tasty-hspec"; version = "1.1.5.1"; sha256 = "0i9kdzjpk750sa078jj3iyhp72k0177zk7vxl131r6dkyz09x27y"; - revision = "4"; - editedCabalFile = "1yppwhs2r2rlwrzli9ccv5ldgl95h5p7pqhsr898r3das6daf6sk"; + revision = "6"; + editedCabalFile = "0xa7h0p5r41m2a3l5r9ggmm4bc2a6wzgb4qvcqfl0dd2yb922bkz"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck @@ -238329,6 +242017,21 @@ self: { broken = true; }) {}; + "tasty-json" = callPackage + ({ mkDerivation, base, bytestring, containers, stm, tagged, tasty + , text + }: + mkDerivation { + pname = "tasty-json"; + version = "0.1.0.0"; + sha256 = "0k6zzi2w675pghxfv5y6m67n2cv8bb22dq9zgb5yfwycfj3va4bp"; + libraryHaskellDepends = [ + base bytestring containers stm tagged tasty text + ]; + description = "JSON reporter for the tasty testing framework"; + license = stdenv.lib.licenses.mit; + }) {}; + "tasty-kat" = callPackage ({ mkDerivation, base, bytestring, mtl, tasty, tasty-hunit , tasty-quickcheck @@ -238465,6 +242168,8 @@ self: { pname = "tasty-rerun"; version = "1.1.17"; sha256 = "0hiafrknk700gi8rm675akz8q6abk8iwlmygwnlx1fy3znalkqad"; + revision = "2"; + editedCabalFile = "0jkkydcq8fx3ia92pn9dnbfhx18wz70366y7xlv9yj9zysqcr8yl"; libraryHaskellDepends = [ base containers mtl optparse-applicative split stm tagged tasty transformers @@ -238625,8 +242330,8 @@ self: { pname = "tasty-wai"; version = "0.1.1.0"; sha256 = "1ix1ksibdkqrycrcnyi6vablp17kg3ajw5kghff1ia7wd2nb9fbk"; - revision = "1"; - editedCabalFile = "1zwfdad5kp3l1lysz9x5hxwp0yphsdbhgbp33yczw8c8sai3l7xb"; + revision = "2"; + editedCabalFile = "18p5lk4p1ppq5ascykf7b89sc8c8g013w5j5i4q74iwxmah1va2g"; libraryHaskellDepends = [ base bytestring http-types tasty wai wai-extra ]; @@ -238873,8 +242578,8 @@ self: { pname = "tdigest"; version = "0.2.1"; sha256 = "0kmqmzjcs406hv2fv9bkfayxpsd41dbry8bpkhy4y1jdgh33hvnl"; - revision = "4"; - editedCabalFile = "0830zzgbf5xffa1yqwcvy4xm1wzzydvy5wmy3sqk3a5n85v295by"; + revision = "5"; + editedCabalFile = "1crjfhxhs8ihbl2xn1dqr5w19g7w74mcf2w889my6zb935l7lyjs"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-compat binary deepseq reducers semigroupoids transformers @@ -238896,8 +242601,8 @@ self: { pname = "tdigest-Chart"; version = "0.2"; sha256 = "1ciq7d187as9sk1dpccm2s02b6jdhij1l477wff0a7labgw21l0l"; - revision = "2"; - editedCabalFile = "07fg2pnj06vz2cwyxqyx40ghd0d7p9byazds7lhim4z397gngk0f"; + revision = "3"; + editedCabalFile = "0y7248myrk6zn4bbbi1v6vv4hmrbqr3wb47xl7q1akrcfi687033"; libraryHaskellDepends = [ base base-compat Chart colour lens semigroupoids tdigest ]; @@ -239071,10 +242776,8 @@ self: { }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.2.0"; - sha256 = "1aafj27zj69hvzxv58cz7h8pjbc9c74hmg92swg2sy8ai1rcb34a"; - revision = "1"; - editedCabalFile = "1li6b3m9glhfg8agr9h0mrbxpr8zr46l57mzjfdqndm248ddbklv"; + version = "0.3.0"; + sha256 = "196zb03nj37qfmxgn5lagjdl759bgmnr1vsh26dbbv1zsmlp0pva"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -239095,6 +242798,55 @@ self: { broken = true; }) {}; + "telegram-raw-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, deriving-aeson + , generic-lens, hashable, http-client, http-client-tls, http-media + , lens, servant, servant-client, servant-client-core + , servant-multipart, telegram-types, text, time + }: + mkDerivation { + pname = "telegram-raw-api"; + version = "0.3.0"; + sha256 = "0dlazp70jpffpbpdlbyzv7s33jr1ff8z4xjhvkgqyhs23mzi46rc"; + libraryHaskellDepends = [ + aeson base bytestring deriving-aeson generic-lens hashable + http-media lens servant servant-client servant-multipart + telegram-types text time + ]; + testHaskellDepends = [ + aeson base bytestring deriving-aeson generic-lens hashable + http-client http-client-tls http-media lens servant servant-client + servant-client-core servant-multipart telegram-types text time + ]; + description = "Servant bindings to the Telegram bot API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "telegram-types" = callPackage + ({ mkDerivation, aeson, base, bytestring, deriving-aeson, filepath + , generic-lens, lens, mime-types, open-union, servant + , servant-multipart, text, time + }: + mkDerivation { + pname = "telegram-types"; + version = "0.4.0"; + sha256 = "1giv1d713rfdc8svcba2ws8mv6g957f7v1dm3qr9p8082nry2llm"; + libraryHaskellDepends = [ + aeson base bytestring deriving-aeson filepath generic-lens lens + mime-types open-union servant servant-multipart text time + ]; + testHaskellDepends = [ + aeson base bytestring deriving-aeson filepath generic-lens lens + mime-types open-union servant servant-multipart text time + ]; + description = "Types used in Telegram bot API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "teleport" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring , configurator, optparse-applicative, system-filepath, text, turtle @@ -239183,6 +242935,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tempi" = callPackage + ({ mkDerivation, base, time }: + mkDerivation { + pname = "tempi"; + version = "1.0.2.0"; + sha256 = "08hjgs32cx3vcm6sga4xc7ijcj3lbjlg133vkri06xfi0v3hjgnp"; + libraryHaskellDepends = [ base time ]; + description = "For representing musical tempi"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "template" = callPackage ({ mkDerivation, base, mtl, text }: mkDerivation { @@ -239207,13 +242972,13 @@ self: { broken = true; }) {}; - "template-haskell_2_15_0_0" = callPackage - ({ mkDerivation, base, ghc-boot-th, pretty }: + "template-haskell_2_16_0_0" = callPackage + ({ mkDerivation, base, ghc-boot-th, ghc-prim, pretty }: mkDerivation { pname = "template-haskell"; - version = "2.15.0.0"; - sha256 = "16p8szb5by7gyk5r5cnrdp3b613vp5wasqj8dz63my17l2lsp2wl"; - libraryHaskellDepends = [ base ghc-boot-th pretty ]; + version = "2.16.0.0"; + sha256 = "1nk1cv35szp80qkhbyh5gn6vn194zzl0wz186qrqdrdx3a9r9w4g"; + libraryHaskellDepends = [ base ghc-boot-th ghc-prim pretty ]; description = "Support library for Template Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -239717,8 +243482,6 @@ self: { ]; description = "Code generation for TensorFlow operations"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tensorflow-ops" = callPackage @@ -239767,8 +243530,6 @@ self: { libraryToolDepends = [ protobuf ]; description = "TensorFlow protocol buffers"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) protobuf;}; "tensorflow-records" = callPackage @@ -240156,22 +243917,24 @@ self: { "tesla" = callPackage ({ mkDerivation, aeson, base, bytestring, casing, containers - , generic-deriving, HUnit, lens, lens-aeson, mtl, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, text, time - , vector, wreq + , exceptions, generic-deriving, HUnit, lens, lens-aeson + , monad-logger, mtl, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, text, time, unliftio-core, vector, wreq }: mkDerivation { pname = "tesla"; - version = "0.1.0.1"; - sha256 = "0rk1i9pl6x6f58hbij287aaab7ac3iy3ngs2bqb2990zqfh12ir4"; + version = "0.2.0.0"; + sha256 = "0gpzkrh5238n42h158np1k14a28y11kgicwbv6w4br6h0rnbr9d3"; libraryHaskellDepends = [ - aeson base bytestring casing containers generic-deriving lens - lens-aeson mtl template-haskell text time vector wreq + aeson base bytestring casing containers exceptions generic-deriving + lens lens-aeson monad-logger mtl template-haskell text time + unliftio-core vector wreq ]; testHaskellDepends = [ - aeson base bytestring casing containers generic-deriving HUnit lens - lens-aeson mtl tasty tasty-hunit tasty-quickcheck template-haskell - text time vector wreq + aeson base bytestring casing containers exceptions generic-deriving + HUnit lens lens-aeson monad-logger mtl tasty tasty-hunit + tasty-quickcheck template-haskell text time unliftio-core vector + wreq ]; description = "Tesla API client"; license = stdenv.lib.licenses.bsd3; @@ -240872,8 +244635,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.12.0.1"; - sha256 = "1halp1vn2334ym3j3fxfbrpkr15nc201c7vfwmzimya6vnyknsxs"; + version = "0.12.0.2"; + sha256 = "116i1f1qnkraygf05lpw7vg3h6zk8lh14k4i2yx6prb649d2iv1g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -241078,16 +244841,14 @@ self: { pname = "text-format"; version = "0.3.2"; sha256 = "1qxs8xyjk8nzzzam62lqqml9s0p08m749jri0lfaa844mnw3frij"; - revision = "1"; - editedCabalFile = "155bddqabsxdfzdr7wl67qw9w777c2qkwxgjpx625875cvyhqkpa"; + revision = "2"; + editedCabalFile = "05findgw709h930wshaq514maxarjyjhsam6pkyzq83iz1yc2gra"; libraryHaskellDepends = [ array base double-conversion ghc-prim integer-gmp old-locale text time transformers ]; description = "Text formatting"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "text-format-heavy" = callPackage @@ -241616,8 +245377,8 @@ self: { pname = "text-show-instances"; version = "3.8.3"; sha256 = "11v335p3wzf9ijqlkls5mk4m16dfak8fckn4gj7mahs8c7l9lm5d"; - revision = "4"; - editedCabalFile = "0qdnzgwnpgizdm0bvmdwhdf0hwg0kabjswkmnhijkac688rkw1m2"; + revision = "5"; + editedCabalFile = "1czi0gl7kxc64kk8v36xw2ln0vjj2pls3x9nmh754nvdg0616jfj"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -242180,25 +245941,12 @@ self: { ({ mkDerivation, base, containers, syb, template-haskell }: mkDerivation { pname = "th-expand-syns"; - version = "0.4.5.0"; - sha256 = "1p4wfyycan8zsp9wi7npx36qwbfsbcgdyxi3ii51scf69dkrx42y"; - libraryHaskellDepends = [ base containers syb template-haskell ]; - testHaskellDepends = [ base template-haskell ]; - description = "Expands type synonyms in Template Haskell ASTs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-expand-syns_0_4_6_0" = callPackage - ({ mkDerivation, base, containers, syb, template-haskell }: - mkDerivation { - pname = "th-expand-syns"; version = "0.4.6.0"; sha256 = "1dz8bl4yb6sis74knmvqxa21y9yws9l8gafzsi0chaqx15b5asxj"; libraryHaskellDepends = [ base containers syb template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Expands type synonyms in Template Haskell ASTs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-extras" = callPackage @@ -242354,8 +246102,8 @@ self: { }: mkDerivation { pname = "th-lift-instances"; - version = "0.1.14"; - sha256 = "0r1b4jnvcj64wp4hfccwkl4a70n1p1q7qzyx6ax7cmd8k961jz78"; + version = "0.1.16"; + sha256 = "08ivlz37ir2xyl8ch5x4n2gb34rgk5ryaybfr2xbfc4ah4zfjfav"; libraryHaskellDepends = [ base bytestring containers template-haskell text th-lift transformers vector @@ -242386,10 +246134,8 @@ self: { }: mkDerivation { pname = "th-orphans"; - version = "0.13.9"; - sha256 = "1xj1gssv77hdx1r3ndg8k49v3ipj3a6r7crkyvx13jrps3m6ng1z"; - revision = "1"; - editedCabalFile = "100gpi0np50vxlapyl6d05w8ss9l2gqacn28i228hsvhvrxxwjdy"; + version = "0.13.10"; + sha256 = "0a69jrvialwg9g1h3j729jahl47h9ar5xxjqbi3pxyfc94v5fcs4"; libraryHaskellDepends = [ base mtl template-haskell th-lift th-lift-instances th-reify-many ]; @@ -242510,6 +246256,8 @@ self: { pname = "th-test-utils"; version = "1.0.1"; sha256 = "1qbxj4zarw1nm0c2shrr4wrrkmqlxx2qdh9q3q9arkic4lwgsxcx"; + revision = "1"; + editedCabalFile = "0x4kwp1lj663dd4nfr348y2z5qq1hkly5r289wmqhy5dxlx7cb9n"; libraryHaskellDepends = [ base template-haskell transformers ]; testHaskellDepends = [ base tasty tasty-hunit template-haskell transformers @@ -242800,8 +246548,8 @@ self: { pname = "these-optics"; version = "1"; sha256 = "0gmsykzcjx5h6dbfny4dw3jrm33ykcw6rpngf5awwdpg3a4cfgi7"; - revision = "2"; - editedCabalFile = "04iahn4y52qj3q99r20zp0cgj764m7k073jmkf66qf819133afl8"; + revision = "3"; + editedCabalFile = "0nmn7gkq9gx1zfs6sbib3m7zrrjhndfhx2m6sw68nkmc1baipg33"; libraryHaskellDepends = [ base optics-core these ]; description = "Optics for These"; license = stdenv.lib.licenses.bsd3; @@ -243057,8 +246805,8 @@ self: { }: mkDerivation { pname = "threadscope"; - version = "0.2.12"; - sha256 = "10aalch81w4wrz7asp8amc1353khabqxms9b2r3f30s9kys3703x"; + version = "0.2.13"; + sha256 = "1y5d6mgrx3mv6vdivv4ih1hvgp3bjrz26mr922gim08ryfh1hm43"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -243499,8 +247247,8 @@ self: { }: mkDerivation { pname = "tidal"; - version = "1.4.8"; - sha256 = "163ndsx6spicipsy52iqsrm97z6pfr4mm93d2dz7ffckbzsklmdb"; + version = "1.4.9"; + sha256 = "0np32jnvqmnnqy166a17i367c5j5xc9mniqzr0x76wk7mb5zlwzj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bifunctors bytestring clock colour containers deepseq hosc @@ -244513,6 +248261,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "timezone-olson_0_2_0" = callPackage + ({ mkDerivation, base, binary, bytestring, extensible-exceptions + , time, timezone-series + }: + mkDerivation { + pname = "timezone-olson"; + version = "0.2.0"; + sha256 = "0b9vh27b9nz803yhd93d5z63bs370lvn4vkdajxaak9clxlw6mwg"; + libraryHaskellDepends = [ + base binary bytestring extensible-exceptions time timezone-series + ]; + description = "A pure Haskell parser and renderer for binary Olson timezone files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "timezone-olson-th" = callPackage ({ mkDerivation, base, template-haskell, time, timezone-olson , timezone-series @@ -244899,7 +248663,7 @@ self: { sha256 = "1snw5cdkyqyninqqqwa6qfndfmwfr4lkdg0v94267g7xbwcqjj8h"; libraryHaskellDepends = [ base containers network-uri text ]; testHaskellDepends = [ base HUnit network-uri text ]; - description = "This project separates subdomains, domains, and top-level-domains from URLs"; + description = "This project separates subdomains, domains, and top-level-domains from URLs."; license = stdenv.lib.licenses.mit; }) {}; @@ -245011,29 +248775,29 @@ self: { }) {}; "tlynx" = callPackage - ({ mkDerivation, array, base, bytestring, containers, elynx-seq - , elynx-tools, elynx-tree, lifted-async, math-functions, megaparsec - , monad-logger, MonadRandom, mwc-random, optparse-applicative - , parallel, primitive, QuickCheck, quickcheck-instances, statistics - , text, transformers, vector + ({ mkDerivation, aeson, array, base, bytestring, comonad + , containers, elynx-tools, elynx-tree, gnuplot, lifted-async + , megaparsec, monad-logger, mwc-random, optparse-applicative + , parallel, primitive, scientific, statistics, text, transformers + , vector }: mkDerivation { pname = "tlynx"; - version = "0.1.0"; - sha256 = "0l4i4hyyw0m8kj2fqy4arcfyn9vnl4zdsbicz191hlc1nx935byn"; + version = "0.2.2"; + sha256 = "0hf70zvcndjmlwbd2n2ncbl89xi2xmkr7ymq48hmdlg3vp0bdz62"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bytestring containers elynx-seq elynx-tools elynx-tree - lifted-async math-functions megaparsec monad-logger MonadRandom - mwc-random optparse-applicative parallel primitive QuickCheck - quickcheck-instances statistics text transformers vector + aeson array base bytestring comonad containers elynx-tools + elynx-tree gnuplot lifted-async megaparsec monad-logger mwc-random + optparse-applicative parallel primitive scientific statistics text + transformers vector ]; executableHaskellDepends = [ - array base bytestring containers elynx-tools elynx-tree - lifted-async math-functions megaparsec monad-logger MonadRandom - mwc-random optparse-applicative parallel primitive QuickCheck - quickcheck-instances statistics text transformers vector + aeson array base bytestring comonad containers elynx-tools gnuplot + lifted-async megaparsec monad-logger mwc-random + optparse-applicative parallel primitive scientific statistics text + transformers vector ]; description = "Handle phylogenetic trees"; license = stdenv.lib.licenses.gpl3; @@ -245447,15 +249211,25 @@ self: { }) {}; "tokstyle" = callPackage - ({ mkDerivation, array, base, deepseq, filepath, language-c }: + ({ mkDerivation, aeson, array, base, bytestring, compact + , containers, deepseq, filepath, groom, hspec, language-c, mtl + , servant, servant-server, text, wai, wai-cors, wai-extra, warp + }: mkDerivation { pname = "tokstyle"; - version = "0.0.1"; - sha256 = "1rjaj1dh4lh4pcyvy235ys8yzkiik13jnw81xj444lla7wsww2w1"; + version = "0.0.5"; + sha256 = "1b5s43srz8gyg2fajchsi7gzgk6q8vp269h8q7rzznrl8kxkvl5z"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ array base deepseq filepath language-c ]; - executableHaskellDepends = [ base ]; + libraryHaskellDepends = [ + aeson array base bytestring compact containers deepseq filepath + groom language-c mtl text + ]; + executableHaskellDepends = [ + base bytestring groom servant servant-server text wai wai-cors + wai-extra warp + ]; + testHaskellDepends = [ base hspec ]; description = "TokTok C code style checker"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -245479,13 +249253,17 @@ self: { }) {}; "tokyocabinet-haskell" = callPackage - ({ mkDerivation, base, bytestring, mtl, tokyocabinet }: + ({ mkDerivation, base, bytestring, directory, HUnit, mtl + , tokyocabinet + }: mkDerivation { pname = "tokyocabinet-haskell"; - version = "0.0.5"; - sha256 = "1v6s39q8a6cnc0ggpspz9i0xw6aih4ixn9bhn4hwf9kwgcspardg"; + version = "0.0.6"; + sha256 = "1cav27hnl49ghl6f7mhyaqmvfdqib6s76z251vai4vih9psis8rk"; libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ tokyocabinet ]; + testHaskellDepends = [ base bytestring directory HUnit mtl ]; + testSystemDepends = [ tokyocabinet ]; description = "Haskell binding of Tokyo Cabinet"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -245758,8 +249536,8 @@ self: { }: mkDerivation { pname = "too-many-cells"; - version = "0.2.2.1"; - sha256 = "17g9pr25jhki9r3jfvgbx8avpjikcglb9hg45rfkvk9y50wxrk15"; + version = "0.2.2.2"; + sha256 = "091hqg4wxki8v7xkrzmnh1hpm81pif936pbmrzvr5p84sbbyyj91"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -245957,8 +249735,8 @@ self: { ({ mkDerivation, base, void }: mkDerivation { pname = "total"; - version = "1.0.5"; - sha256 = "0kv9jb2d8mh4p9b91jg5367ar4p837xclzlwgjrjgvxl62z7h84j"; + version = "1.0.6"; + sha256 = "0zr3b83pwjbarxsl9kva6va3cp9b4npfp77yp0nh9q1za00344vk"; libraryHaskellDepends = [ base void ]; description = "Exhaustive pattern matching using lenses, traversals, and prisms"; license = stdenv.lib.licenses.bsd3; @@ -246038,31 +249816,35 @@ self: { }) {}; "toxcore" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring - , bytestring-arbitrary, data-default-class, directory, hspec - , QuickCheck, saltine, toxcore + ({ mkDerivation, async, base, base16-bytestring, binary + , binary-bits, bytestring, clock, containers, entropy, groom, hspec + , integer-gmp, iproute, lens-family, MonadRandom, msgpack-binary + , msgpack-rpc-conduit, msgpack-types, mtl, network, QuickCheck + , random, saltine, text, transformers }: mkDerivation { pname = "toxcore"; - version = "0.2.0"; - sha256 = "01pnl2x86zjs26cbp0m7ayx827s8l5ad2pgx7n48ziqrjyldp1f1"; + version = "0.2.11"; + sha256 = "1bsrp37b0mnib66slj8z1fvallq55qd5hzfaqm208skr6vaw6m91"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring data-default-class ]; - librarySystemDepends = [ toxcore ]; - executableHaskellDepends = [ - base base16-bytestring bytestring directory + libraryHaskellDepends = [ + base base16-bytestring binary binary-bits bytestring clock + containers entropy integer-gmp iproute lens-family MonadRandom + msgpack-binary msgpack-rpc-conduit mtl network QuickCheck random + saltine transformers ]; - executableSystemDepends = [ toxcore ]; + executableHaskellDepends = [ base binary bytestring groom text ]; testHaskellDepends = [ - base base16-bytestring bytestring bytestring-arbitrary - data-default-class hspec QuickCheck saltine + async base binary binary-bits bytestring containers hspec + msgpack-binary msgpack-rpc-conduit msgpack-types mtl QuickCheck + saltine text ]; - description = "Haskell bindings to the C reference implementation of Tox"; + description = "A Tox protocol implementation in Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {toxcore = null;}; + }) {}; "toxcore-c" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring @@ -246258,20 +250040,21 @@ self: { "tptp" = callPackage ({ mkDerivation, attoparsec, base, Cabal, directory, extra - , generic-random, prettyprinter, QuickCheck, scientific, text + , filepath, generic-random, prettyprinter, QuickCheck, scientific + , text }: mkDerivation { pname = "tptp"; - version = "0.1.1.0"; - sha256 = "0cwjl8531zzl9mmgp7hq9jr9i9m32yf2j016v2p6h3r93kysbhrf"; + version = "0.1.2.0"; + sha256 = "0ccffd1pskfybyysaa1ilbsbgw0vga4x0q0awmj2wy05gbbzfb1y"; libraryHaskellDepends = [ attoparsec base prettyprinter scientific text ]; testHaskellDepends = [ - attoparsec base Cabal directory extra generic-random prettyprinter - QuickCheck scientific text + attoparsec base Cabal directory extra filepath generic-random + prettyprinter QuickCheck scientific text ]; - description = "A parser and a pretty printer for the TPTP language"; + description = "Parser and pretty printer for the TPTP language"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -246367,17 +250150,16 @@ self: { "tracing" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , case-insensitive, containers, hspec, http-client, ip, mtl - , network, random, stm, text, time, transformers, unliftio + , case-insensitive, containers, hspec, http-client, mtl, network + , random, stm, text, time, transformers, unliftio }: mkDerivation { pname = "tracing"; - version = "0.0.4.0"; - sha256 = "1l0sh9rmbysjysh169902hzx86dahiffgss8wnac8vcz95kc5qjb"; + version = "0.0.5.1"; + sha256 = "06d4fik133jbwbznk6fccwhw21n750gnigw9gj25sgjkghydmllb"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive containers - http-client ip mtl network random stm text time transformers - unliftio + http-client mtl network random stm text time transformers unliftio ]; testHaskellDepends = [ base containers hspec mtl stm text unliftio @@ -248239,8 +252021,8 @@ self: { }: mkDerivation { pname = "ttc"; - version = "0.2.0.0"; - sha256 = "1vl3fp0d9v674gg6zbmafvrb97zqxcjlpp5j77msjn1kl7ki6xs7"; + version = "0.2.1.0"; + sha256 = "1cx2v2rjb3d3qifa6ssnvxwd70cm3qacsr0i1ndrm1mrl8j1ffqp"; libraryHaskellDepends = [ base bytestring template-haskell text ]; testHaskellDepends = [ base bytestring tasty tasty-hunit template-haskell text @@ -248688,8 +252470,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.5.18"; - sha256 = "0xdkn6vhmir7sxazi5sxrgvwsi8zqyqbcyvjnqvckz0ac5d8zj68"; + version = "1.5.19"; + sha256 = "06hxmhz1i6f5r8k3bf5h54g4ahjsvxhv44sa4xiy52rz6qp0211g"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -248807,6 +252589,8 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; description = "Command-line tool for twitter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twentefp" = callPackage @@ -248886,7 +252670,7 @@ self: { libraryHaskellDepends = [ base twentefp-eventloop-graphics twentefp-number ]; - description = "RoseTree type and show functions for lab assignment of University of Twente"; + description = "RoseTree type and show functions for lab assignment of University of Twente."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -249210,31 +252994,28 @@ self: { "twitter-conduit" = callPackage ({ mkDerivation, aeson, attoparsec, authenticate-oauth, base - , bytestring, Cabal, cabal-doctest, case-insensitive, conduit - , conduit-extra, containers, data-default, doctest, exceptions - , hlint, hspec, hspec-discover, http-client, http-conduit - , http-types, lens, lens-aeson, network-uri, resourcet - , template-haskell, text, time, transformers, transformers-base + , bytestring, Cabal, cabal-doctest, conduit, conduit-extra + , containers, data-default, doctest, exceptions, ghc-prim, hlint + , hspec, hspec-discover, http-client, http-conduit, http-types + , lens, lens-aeson, resourcet, text, time, transformers , twitter-types, twitter-types-lens }: mkDerivation { pname = "twitter-conduit"; - version = "0.4.0"; - sha256 = "1i1ppwha497vhbj0z9gdspg9anqsikrix3j9vzpz0pcn9ij5rwrg"; + version = "0.5.0"; + sha256 = "1rh68ll9dv0axql5npvk547ykqbarak3frpwdflblfm3hrfnwfgf"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec authenticate-oauth base bytestring conduit - conduit-extra containers data-default exceptions http-client - http-conduit http-types lens lens-aeson resourcet template-haskell - text time transformers transformers-base twitter-types - twitter-types-lens + conduit-extra containers data-default exceptions ghc-prim + http-client http-conduit http-types lens lens-aeson resourcet text + time transformers twitter-types twitter-types-lens ]; testHaskellDepends = [ - aeson attoparsec authenticate-oauth base bytestring - case-insensitive conduit conduit-extra containers data-default - doctest hlint hspec http-client http-conduit http-types lens - lens-aeson network-uri resourcet template-haskell text time - twitter-types twitter-types-lens + aeson attoparsec authenticate-oauth base bytestring conduit + conduit-extra containers data-default doctest hlint hspec + http-client http-conduit http-types lens lens-aeson resourcet text + time twitter-types twitter-types-lens ]; testToolDepends = [ hspec-discover ]; description = "Twitter API package with conduit interface and Streaming API support"; @@ -249645,8 +253426,8 @@ self: { ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "type-errors-pretty"; - version = "0.0.1.0"; - sha256 = "1xp72vsmqamgg9k8w7pimy6q3dn73ammg7zda98a0hb4q9pdcrml"; + version = "0.0.1.1"; + sha256 = "1z6rqah3qnvnlckcw3xhsp4yyfd21harw6kzqbz20y6k7a22jlf0"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; description = "Combinators for writing pretty type errors easily"; @@ -250236,6 +254017,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "typed-encoding" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, doctest + , doctest-discover, hspec, QuickCheck, quickcheck-instances + , symbols, text + }: + mkDerivation { + pname = "typed-encoding"; + version = "0.2.1.0"; + sha256 = "0z5wp666293d5nsajqa3c8b03n1s85kr3v5hrkvsqv9lq3s49jnp"; + libraryHaskellDepends = [ + base base64-bytestring bytestring symbols text + ]; + testHaskellDepends = [ + base base64-bytestring bytestring doctest doctest-discover hspec + QuickCheck quickcheck-instances symbols text + ]; + description = "Type safe string transformations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "typed-process" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec , process, stm, temporary, transformers, unliftio-core @@ -250313,6 +254116,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "typed-uuid_0_1_0_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, deepseq, hashable + , http-api-data, random, text, uuid, validity, validity-uuid + , yamlparse-applicative + }: + mkDerivation { + pname = "typed-uuid"; + version = "0.1.0.0"; + sha256 = "1smwrjn63wsvy7lickdapgfqbvndypvy1qlnfrn5iymi2mg1kyxi"; + libraryHaskellDepends = [ + aeson base binary bytestring deepseq hashable http-api-data random + text uuid validity validity-uuid yamlparse-applicative + ]; + description = "Phantom-Typed version of UUID"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "typed-wire" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, gitrev, HTF, http-types, mtl, optparse-applicative @@ -250427,6 +254248,8 @@ self: { pname = "typelevel-rewrite-rules"; version = "0.1"; sha256 = "1gm3xbsi90dgppwhhhlmq1rwwnx9bxhm7zv9x4yr0952fwxrm8x8"; + revision = "1"; + editedCabalFile = "0wgryhys24671j46s58prbh7agrlxdcbains6qv37kp6xly726nj"; libraryHaskellDepends = [ base ghc ghc-prim ghc-tcplugins-extra term-rewriting transformers ]; @@ -250522,30 +254345,25 @@ self: { "typerep-map" = callPackage ({ mkDerivation, base, containers, criterion, deepseq , dependent-map, dependent-sum, ghc-prim, ghc-typelits-knownnat - , hedgehog, primitive, QuickCheck, tasty, tasty-discover - , tasty-hedgehog, tasty-hspec, vector + , hedgehog, hspec, hspec-hedgehog, primitive, vector }: mkDerivation { pname = "typerep-map"; - version = "0.3.2"; - sha256 = "0s77hj0m9jiqgybccdfl1x88j05fx7grkg16q6kldd1lgqrvrgb0"; - revision = "3"; - editedCabalFile = "032y3parcz7ffmsqichmshczk7zxkg66dciwvr5d7fznqvy3sg1s"; + version = "0.3.3.0"; + sha256 = "0j7f7k0knpdsh41p0bzg7yv32nz684s3vrxc8pig5ckmmadc4mh4"; libraryHaskellDepends = [ base containers deepseq ghc-prim primitive vector ]; testHaskellDepends = [ - base ghc-typelits-knownnat hedgehog QuickCheck tasty tasty-discover - tasty-hedgehog tasty-hspec + base ghc-typelits-knownnat hedgehog hspec hspec-hedgehog ]; - testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ base criterion deepseq dependent-map dependent-sum ghc-typelits-knownnat ]; doHaddock = false; description = "Efficient implementation of a dependent map with types as keys"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -251163,18 +254981,17 @@ self: { }) {}; "ulid" = callPackage - ({ mkDerivation, base, binary, bytestring, crockford, crypto-api - , deepseq, format-numbers, hashable, hspec, random, text, time + ({ mkDerivation, base, binary, bytestring, crypto-api, deepseq + , format-numbers, hashable, hspec, random, text, time }: mkDerivation { pname = "ulid"; - version = "0.2.0.0"; - sha256 = "1fw50j6ajrrfc1nzgf814rzj1x06dls220ngpxpdvs278spc1hns"; + version = "0.3.0.0"; + sha256 = "1ghdh18cngwksr1vlqgdh04asm4gcivcpzhizaf6d4z9sl9qz5mp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring crockford crypto-api deepseq hashable random - time + base binary bytestring crypto-api deepseq hashable random text time ]; executableHaskellDepends = [ base crypto-api ]; testHaskellDepends = [ @@ -251183,7 +255000,7 @@ self: { benchmarkHaskellDepends = [ base deepseq format-numbers text time ]; - description = "Implementation of ULID, lexicographically sortable unique identifiers"; + description = "Implementation of ULID - Universally Unique Lexicographically Sortable Identifier"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -251340,8 +255157,8 @@ self: { }: mkDerivation { pname = "unbound-generics"; - version = "0.4.0"; - sha256 = "04amv54wrabzdmlig1mxi51ikq1lmfcm504184y0nm0xjahfssmx"; + version = "0.4.1"; + sha256 = "02wwn78fccb37lx95jvr0v2n55kv35nilllb0gj75y8bplya5blb"; libraryHaskellDepends = [ ansi-wl-pprint base containers contravariant deepseq exceptions mtl profunctors template-haskell transformers transformers-compat @@ -251414,6 +255231,8 @@ self: { pname = "unboxed-containers"; version = "0.0.2.4"; sha256 = "0yahavqjjnlf4ps8kd41s9s64nbhx2hf7qzk2xxkmq0i3b91d123"; + revision = "1"; + editedCabalFile = "16j16v36jabr9lpmjm52zbfz82m0ckd4p0f3z8123aawvzcvayji"; libraryHaskellDepends = [ base containers ]; description = "Self-optimizing unboxed sets using view patterns and data families"; license = stdenv.lib.licenses.bsd3; @@ -251537,8 +255356,8 @@ self: { }: mkDerivation { pname = "unexceptionalio"; - version = "0.5.0"; - sha256 = "04jrmv075cas6qs58m3j0q9h4w14kd4b87bp42k3x3v6hcl62xi9"; + version = "0.5.1"; + sha256 = "07py2nffdgxpz8sryvqcghzb2kiiagpdf5ja1dia4z0rpwi79smh"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -251554,6 +255373,8 @@ self: { pname = "unexceptionalio-trans"; version = "0.5.1"; sha256 = "100sfbrpaldz37a176qpfkk1nx5acyh8pchjmb8g5vhzbhyrqniz"; + revision = "1"; + editedCabalFile = "0f15n8hqqczwjrcqxwjp2mrd9iycv53sylv407c95nb6d4hw93ci"; libraryHaskellDepends = [ base transformers unexceptionalio ]; description = "A wrapper around UnexceptionalIO using monad transformers"; license = "unknown"; @@ -251579,10 +255400,10 @@ self: { }: mkDerivation { pname = "unfoldable"; - version = "0.9.6"; - sha256 = "18gaay37mjgyd5rfpfs84p4q7vqdnv4lcjabaprgm315pblym46d"; - revision = "2"; - editedCabalFile = "08rx8ci2jpa77q1dl4lghlyhd27if990ic9kaz30hczsazlzi44b"; + version = "1.0"; + sha256 = "0ilzv4ks76f9fx12ilsam0v232fm2mvvsz6s50p0nllldwgkgm6a"; + revision = "1"; + editedCabalFile = "167jqv6cw9d1c9n0j2sxp5asaaqbh6ay3g8nyg8ndy96jnjb34zb"; libraryHaskellDepends = [ base containers ghc-prim one-liner QuickCheck random transformers ]; @@ -251852,6 +255673,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unicode-tricks" = callPackage + ({ mkDerivation, base, data-default, hspec, hspec-discover + , QuickCheck, text + }: + mkDerivation { + pname = "unicode-tricks"; + version = "0.7.0.0"; + sha256 = "0lwpdqzprm0s7dgn5pvb6plklr45s4qqa0cbash296zcx8195imx"; + libraryHaskellDepends = [ base data-default QuickCheck text ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Functions to work with unicode blocks more convenient"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "unicoder" = callPackage ({ mkDerivation, attoparsec, base, data-default, directory , filepath, text, twitch @@ -252198,8 +256034,8 @@ self: { ({ mkDerivation, base, template-haskell, units }: mkDerivation { pname = "units-defs"; - version = "2.1.0.1"; - sha256 = "1ck50r8mhcvjyfx3wdkn8s89rrzjkxpn439zarg5s2vqmqji7gyy"; + version = "2.2"; + sha256 = "1g55hnhd9bgqp649jgmq41s5i5j0gfpn3iwqaxvmikwaasyr69ki"; libraryHaskellDepends = [ base template-haskell units ]; description = "Definitions for use with the units package"; license = stdenv.lib.licenses.bsd3; @@ -252507,8 +256343,8 @@ self: { pname = "unix"; version = "2.7.2.2"; sha256 = "1b6ygkasn5bvmdci8g3zjkahl34kfqhf5jrayibvnrcdnaqlxpcq"; - revision = "3"; - editedCabalFile = "1bbn41bx46b9h8hbri50rw69996h75nfhm9zgyvnr8lzgfhnk4p6"; + revision = "4"; + editedCabalFile = "092d2qzfk4wm7xaa5wjyxgb97knilsh86vhk420j8rd0qlygk4wy"; libraryHaskellDepends = [ base bytestring time ]; description = "POSIX functionality"; license = stdenv.lib.licenses.bsd3; @@ -252653,8 +256489,8 @@ self: { }: mkDerivation { pname = "unjson"; - version = "0.15.2.1"; - sha256 = "1zx66qjx4rikbs8f2j1vazasin5fr6pxks3j5b7fkpriyxk49khs"; + version = "0.15.3"; + sha256 = "1p2bk9j5ww0zbkaw1wvl2122h763zn4ddjzg5rka948q3d6zivvi"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers free hashable invariant pretty primitive scientific semigroups text time @@ -253588,8 +257424,8 @@ self: { pname = "uri-templater"; version = "0.3.1.0"; sha256 = "1hj93jgn8xch9bw9fs76qsfqarb15csfy0ddnr1dxcq04vznbri1"; - revision = "1"; - editedCabalFile = "0vl1nv40yzns9fnaz6h34x72vpfaaws8f0zm8qlr82333pxg2scw"; + revision = "2"; + editedCabalFile = "1fc0agzm3qasslhns64qbyhml31s1akib0mfaj2298iqm8075jyg"; libraryHaskellDepends = [ ansi-wl-pprint base bytestring charset containers dlist HTTP mtl parsers template-haskell text time trifecta unordered-containers @@ -253814,6 +257650,8 @@ self: { ]; description = "Communicate with USB devices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "usb-enumerator" = callPackage @@ -254055,6 +257893,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "utf8-conversions" = callPackage + ({ mkDerivation, base, bytestring, charsetdetect-ae, hspec, text + , text-short, utf8-string + }: + mkDerivation { + pname = "utf8-conversions"; + version = "0.1.0.4"; + sha256 = "0j5jskj35njz5c9yqs3sc0a8zmmjmnil8996pwr8akghj282b4wz"; + libraryHaskellDepends = [ + base bytestring text text-short utf8-string + ]; + testHaskellDepends = [ + base bytestring charsetdetect-ae hspec text text-short utf8-string + ]; + description = "A string conversion library that assumes utf8"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "utf8-env" = callPackage ({ mkDerivation, base, mtl, utf8-string }: mkDerivation { @@ -254144,8 +258000,8 @@ self: { pname = "util-exception"; version = "0.2.0.0"; sha256 = "0dx617saxbz8ij78kspm4j9zibf77d2hpjbci1c3ag7dhxagvjbx"; - revision = "1"; - editedCabalFile = "0fdwzjjr7izfn9r6lgp3lajvd9giid8v0c68l729hc25cz344nqk"; + revision = "2"; + editedCabalFile = "1h5s7qkdgfifw35dg7wzsr42q1dcficrjvw9b1qhff00m7avdam0"; libraryHaskellDepends = [ base basic control lifted-base-tf util ]; description = "Exceptional utilities"; license = stdenv.lib.licenses.bsd3; @@ -254190,6 +258046,8 @@ self: { pname = "util-primitive"; version = "0.1.0.0"; sha256 = "193y0fvr0szpdhg7ysvj99mfm983yvrmvpq77gv994vyjigq4y6w"; + revision = "1"; + editedCabalFile = "0wlgp8cq7gg585x041djxprm6a3kih1dkx2fbpg6bwi850ihglir"; libraryHaskellDepends = [ base primitive ]; description = "Primitive memory-related utilities"; license = stdenv.lib.licenses.bsd3; @@ -254205,6 +258063,8 @@ self: { pname = "util-primitive-control"; version = "0.1.1.0"; sha256 = "1sld7sh38smqmwi4nn2klbsh67419j77wbswblbv00rvh20xpl1h"; + revision = "1"; + editedCabalFile = "1f6p7swl027lljsh8kbnalvym8lqpg942y7srm8v0ps8r48qpxxg"; libraryHaskellDepends = [ base control primitive util ]; testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Utilities for stateful primitive types and types based on them"; @@ -254221,6 +258081,8 @@ self: { pname = "util-universe"; version = "0.1.0.0"; sha256 = "1jpi5ic14knr3g8qmz6ls430ll4m9wi5ag1ngmlz46h1zlw53l8y"; + revision = "1"; + editedCabalFile = "076yx4zz3m7ppcp751jazs3z8zpjz1q2i87mhpc8yrrmln3pm7pc"; libraryHaskellDepends = [ base universe-base universe-instances-base ]; @@ -254303,6 +258165,8 @@ self: { pname = "uu-interleaved"; version = "0.2.0.2"; sha256 = "1nfh6250j9r8az16wm3pwrmx2hsyh6bdn2qcpwdghz188ppw72nz"; + revision = "1"; + editedCabalFile = "1wzc2aacqh1ndyk2dawzqbig7m0khdb05q9pzplhhfhfrbgn4pjr"; libraryHaskellDepends = [ base ]; description = "An interleaving combinator for use with applicative style implementations"; license = stdenv.lib.licenses.mit; @@ -254316,6 +258180,8 @@ self: { pname = "uu-options"; version = "0.2.0.0"; sha256 = "11gixk6lxsakcdxir9jla5nk71phmlzd9hxp8wq23n550xw91ij6"; + revision = "1"; + editedCabalFile = "0bpamp1gdq81nxw0qmzgycadz8k3dnzldmid6p3dbics438nl559"; libraryHaskellDepends = [ base lenses mtl template-haskell transformers uu-interleaved uu-parsinglib @@ -254537,8 +258403,8 @@ self: { }: mkDerivation { pname = "uuid-orphans"; - version = "1.4.4"; - sha256 = "1qmlnzqdm9wrczlknw53y91yvdzfjbxs10szxvg9xaa4bj7gs5rw"; + version = "1.4.5"; + sha256 = "14d7gyf3sa2874r0dhj3ydvmb1iz174kp4pxz7aq984zb4m6d87z"; libraryHaskellDepends = [ base safecopy text th-lift uuid-types web-routes ]; @@ -254933,8 +258799,8 @@ self: { }: mkDerivation { pname = "validation-selective"; - version = "0.0.0.0"; - sha256 = "01awbhfday2j0jcfgqq074yqxxasqddwxhlwigsbjgv94b4c55bd"; + version = "0.1.0.0"; + sha256 = "0ia3g2c1137pa0ns97yf8vbfvwmjhqnqhzn9lzgxvxwzchvwpnf7"; libraryHaskellDepends = [ base deepseq selective ]; testHaskellDepends = [ base doctest hedgehog hspec hspec-hedgehog selective text @@ -255009,18 +258875,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity_0_11_0_0" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "validity"; + version = "0.11.0.0"; + sha256 = "1jawa7d37al29zp2b5hba9w348g926ckbxp51l9bprii5v47lyln"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "Validity typeclass"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-aeson" = callPackage - ({ mkDerivation, aeson, base, validity, validity-scientific + ({ mkDerivation, aeson, base, hspec, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector }: mkDerivation { pname = "validity-aeson"; - version = "0.2.0.3"; - sha256 = "0rvhlbnm27yfywavp46iyhvkbwxzcnwl8p82k8xpncy4gc2493b7"; + version = "0.2.0.4"; + sha256 = "1k0x6va9mmz0z9hgd1is71ks4fgbziw53rm7r6jsidp4ksszdzm0"; libraryHaskellDepends = [ aeson base validity validity-scientific validity-text validity-unordered-containers validity-vector ]; + testHaskellDepends = [ aeson base hspec validity ]; description = "Validity instances for aeson"; license = stdenv.lib.licenses.mit; }) {}; @@ -255040,8 +258920,8 @@ self: { ({ mkDerivation, base, containers, validity }: mkDerivation { pname = "validity-containers"; - version = "0.5.0.1"; - sha256 = "1rhr3ibxj94gipdqq2ar1qkklpavs2yj53n3qrnfawhs2sih9kpd"; + version = "0.5.0.3"; + sha256 = "064sd52y3cmfz9j1yhfz6wsm3993mnh9xgyzy6jzd4cdfmh19sdd"; libraryHaskellDepends = [ base containers validity ]; description = "Validity instances for containers"; license = stdenv.lib.licenses.mit; @@ -255319,8 +259199,8 @@ self: { }: mkDerivation { pname = "vault"; - version = "0.3.1.3"; - sha256 = "0vdm472vn734xa27jjm2mjacl37mxiqaaahvm4hzqjgyh4cqq377"; + version = "0.3.1.4"; + sha256 = "0na31n56p6713az0vfhdrv53n03bb3yrnyszf3vxsjlgvrax472v"; libraryHaskellDepends = [ base containers hashable semigroups unordered-containers ]; @@ -255617,6 +259497,8 @@ self: { pname = "vec-optics"; version = "0.3"; sha256 = "13g0j9hn27jfjlrm7c6bdsb2lhwrg016cal7hdic8azdxgdp8n0a"; + revision = "1"; + editedCabalFile = "10abn334qhbik8s8lx1r54vcbj3d2s091j2w98mq3cllksa8dmv0"; libraryHaskellDepends = [ base fin optics-core vec ]; description = "Vec: length-indexed (sized) list: optics support"; license = stdenv.lib.licenses.bsd3; @@ -256032,8 +259914,8 @@ self: { }: mkDerivation { pname = "vector-sized"; - version = "1.4.0.0"; - sha256 = "1rh8jjbpw8c6mprwqzd8x7n1kcm5kld3ajrrsahnm91aaw9z1cy6"; + version = "1.4.1.0"; + sha256 = "14l6c8l8l29f6kdffknd70kkccfjcf105i1zd0kchgsgjnr9p6l1"; libraryHaskellDepends = [ adjunctions base binary comonad deepseq distributive finite-typelits hashable indexed-list-literals primitive vector @@ -256480,6 +260362,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "versions_3_5_4" = callPackage + ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "versions"; + version = "3.5.4"; + sha256 = "1n6mayi2qinlv12bf83qskiazwzgl37d4nxvglmwmddb7lpyxbrw"; + libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; + testHaskellDepends = [ + base megaparsec microlens QuickCheck tasty tasty-hunit + tasty-quickcheck text + ]; + description = "Types and parsers for software version numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vflow-types" = callPackage ({ mkDerivation, aeson, base, bytestring, ip, json-alt , json-autotype, neat-interpolation, QuickCheck, quickcheck-classes @@ -256675,8 +260575,8 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0.32"; - sha256 = "0kij1cscfjg6bvh0gm6avsrd2n225dwg2pn8wk3xydvxq1wpcg2b"; + version = "0.0.0.33"; + sha256 = "1xj9b2b3wi0sr75fafcjh054aqs4g9sdqryc4w5lwr7wndi0qjgr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -256696,7 +260596,7 @@ self: { version = "1.0"; sha256 = "0kzwp58lki3jvx09n6w8rc97idhy947xqik72p2fqjyigkymv04h"; libraryHaskellDepends = [ base mtl ]; - description = "Views allow you to run a State monad on part of a state"; + description = "Views allow you to run a State monad on part of a state."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -256831,10 +260731,8 @@ self: { }: mkDerivation { pname = "vinyl"; - version = "0.12.1"; - sha256 = "0bwy1814762vy2din5i73h4d6mmf4hw71ix5c1mnnzmbmjnmbqc0"; - revision = "1"; - editedCabalFile = "0v5rhc9xxb1q8z1kj1y2c0zy5ijx044fggvvk1844hz2z93f5x83"; + version = "0.12.2"; + sha256 = "1h5q5y3ni7vx48rmammf66nzjmbclwh5n1c41gln8fm98n6n96yn"; libraryHaskellDepends = [ array base ghc-prim ]; testHaskellDepends = [ aeson base doctest hspec lens lens-aeson microlens mtl @@ -257124,6 +261022,8 @@ self: { libraryHaskellDepends = [ base mtl profunctors ]; description = "Profunctor optics via the profunctor representation theorem"; license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vivid" = callPackage @@ -257547,18 +261447,12 @@ self: { }) {}; "vulkan" = callPackage - ({ mkDerivation, base, bytestring, transformers, vector - , vector-sized, vulkan - }: + ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.0.0.0"; - sha256 = "1kz0b5kn6dm70i1php7aywjsamjn4ymka87j7c4md93gy9z20ia5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring transformers vector vector-sized - ]; + version = "3.3"; + sha256 = "18xch9fs4xnknfvxx867yg3mbp2y9fv4lldrlk7nkqp8hlsgzh1k"; + libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; license = stdenv.lib.licenses.bsd3; @@ -258239,8 +262133,8 @@ self: { }: mkDerivation { pname = "wai-log"; - version = "0.1.0.0"; - sha256 = "1a0fs008nj47pbr8cjf8wh5j4dqqpgrp0dg75k2x5gx8v28d6q3n"; + version = "0.2.0.0"; + sha256 = "02lsvkh7mkqd6p69qffrl62pdxzn5h1a4wnqflb3sycifi8dmj9b"; libraryHaskellDepends = [ aeson base http-types log-base string-conversions text time wai ]; @@ -258344,31 +262238,32 @@ self: { , blaze-builder, blaze-html, bytestring, case-insensitive, cereal , clientsession, cookie, exceptions, hedgehog, hoauth2, http-client , http-client-tls, http-conduit, http-reverse-proxy, http-types - , optparse-simple, regex-posix, safe-exceptions, shakespeare, text - , time, unix-compat, unordered-containers, uri-bytestring, vault - , wai, wai-app-static, wai-extra, warp, yaml + , jose, microlens, mtl, optparse-simple, regex-posix + , safe-exceptions, shakespeare, tasty, tasty-hedgehog, tasty-hunit + , text, time, unix-compat, unordered-containers, uri-bytestring + , vault, wai, wai-app-static, wai-extra, warp, yaml }: mkDerivation { pname = "wai-middleware-auth"; - version = "0.2.1.0"; - sha256 = "16gm0r4jlmzx5qd4s03whqlc8siy139fwrb6q26a053c85n5lw0f"; - revision = "1"; - editedCabalFile = "14aicx9vvp5p77hxmx0zqmqmz4qgv7adr7rsvxy76k0rszz8s8d6"; + version = "0.2.3.0"; + sha256 = "0cah1g4j8vzncp00x0im5clhq198z8k4bq2q4hxcz9n7libz7l3r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base64-bytestring binary blaze-builder blaze-html bytestring case-insensitive cereal clientsession cookie exceptions hoauth2 http-client http-client-tls http-conduit http-reverse-proxy - http-types regex-posix safe-exceptions shakespeare text time - unix-compat unordered-containers uri-bytestring vault wai - wai-app-static wai-extra yaml + http-types jose microlens mtl regex-posix safe-exceptions + shakespeare text time unix-compat unordered-containers + uri-bytestring vault wai wai-app-static wai-extra yaml ]; executableHaskellDepends = [ - base bytestring cereal clientsession optparse-simple warp + base bytestring cereal clientsession optparse-simple wai-extra warp ]; testHaskellDepends = [ - base binary bytestring hedgehog hoauth2 text + aeson base binary bytestring clientsession cookie hedgehog hoauth2 + http-types jose microlens mtl tasty tasty-hedgehog tasty-hunit text + time uri-bytestring wai wai-extra warp ]; description = "Authentication middleware that secures WAI application"; license = stdenv.lib.licenses.mit; @@ -259583,8 +263478,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.3.9"; - sha256 = "1hb8984sp0dri2a65sql0j310x47063dn4mbpmax0bkn13l4b6j3"; + version = "3.3.10"; + sha256 = "0i2pmcqni2j00jff634ajlngixfkz3fvdfhncwzzc4k2zqbnazpz"; libraryHaskellDepends = [ array async auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types @@ -259606,6 +263501,40 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp_3_3_11" = callPackage + ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked + , bytestring, case-insensitive, containers, directory, gauge + , ghc-prim, hashable, hspec, http-client, http-date, http-types + , http2, HUnit, iproute, lifted-base, network, process, QuickCheck + , simple-sendfile, stm, streaming-commons, text, time, time-manager + , unix, unix-compat, vault, wai, word8, x509 + }: + mkDerivation { + pname = "warp"; + version = "3.3.11"; + sha256 = "09jqdgxpgkch3i9b8mqjp10dljidgmgyg5as72r9c908m75n7a21"; + libraryHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers ghc-prim hashable http-date http-types + http2 iproute network simple-sendfile stm streaming-commons text + time-manager unix unix-compat vault wai word8 x509 + ]; + testHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers directory ghc-prim hashable hspec + http-client http-date http-types http2 HUnit iproute lifted-base + network process QuickCheck simple-sendfile stm streaming-commons + text time time-manager unix unix-compat vault wai word8 x509 + ]; + benchmarkHaskellDepends = [ + auto-update base bytestring containers gauge hashable http-date + http-types network time-manager unix unix-compat x509 + ]; + description = "A fast, light-weight web server for WAI applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -260163,8 +264092,8 @@ self: { }: mkDerivation { pname = "web-rep"; - version = "0.3.1"; - sha256 = "03rm0qa9y43fd9mbaix4vhrsjk6vdkd6yqji7d5m89q3j0xamm3v"; + version = "0.3.2"; + sha256 = "0an5vhqm62j0xrxqqf22kjzi7ch57j5nay5g98ngq3r0rvbk1lv3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -260370,8 +264299,8 @@ self: { }: mkDerivation { pname = "web3"; - version = "0.8.3.2"; - sha256 = "1yk24r1pbavvp8si8yxk4p5n4s80h1klz5rav49sgrw8zj69n3x7"; + version = "0.8.4.0"; + sha256 = "1sib2s0zkn8a26y4mfyyy7vjxj3b5x4nmanj27zijnh2aa8rr51c"; libraryHaskellDepends = [ aeson async base basement bytestring cereal cryptonite data-default exceptions generics-sop http-client http-client-tls machines memory @@ -260800,8 +264729,6 @@ self: { ]; description = "webfont generator"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "webkit" = callPackage @@ -260975,8 +264902,8 @@ self: { }: mkDerivation { pname = "websockets"; - version = "0.12.7.0"; - sha256 = "11jz0d7hgbl449dvz789gyf85gdwm6h0klq05vilmplpdx61h4az"; + version = "0.12.7.1"; + sha256 = "1jqlvgw1ffw0236y4g7li188m9ac37a2yp07vkvcmbz63rmhfmnk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -261374,8 +265301,6 @@ self: { libraryHaskellDepends = [ base shelly template-haskell text ]; description = "Determine the full path to an executable"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "while-lang-parser" = callPackage @@ -261499,6 +265424,8 @@ self: { pname = "wide-word"; version = "0.1.1.1"; sha256 = "19mxi6mfri4q96lqh3zllmacaln2wdp0ipzmhk7v9xqbphpfjrfj"; + revision = "1"; + editedCabalFile = "0dyq104qxbsvab6x5jxg0ssqbjzgkmd4z5366byf7fvc0c4m2ink"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base bytestring ghc-prim hedgehog primitive QuickCheck @@ -261877,15 +265804,20 @@ self: { }) {}; "with-utf8" = callPackage - ({ mkDerivation, base, deepseq, hedgehog, HUnit, safe-exceptions - , tasty, tasty-discover, tasty-hedgehog, tasty-hunit, temporary - , text, unix + ({ mkDerivation, base, deepseq, directory, filepath, hedgehog + , HUnit, process, safe-exceptions, tasty, tasty-discover + , tasty-hedgehog, tasty-hunit, temporary, text, th-env, unix }: mkDerivation { pname = "with-utf8"; - version = "1.0.0.0"; - sha256 = "06xznaszw7d6rznvzhzw3y4z31b4vx4djms85rq4qsbpfbdrh2zc"; + version = "1.0.2.0"; + sha256 = "0zb2xrxf1as38iykljm62kdq6in02miw8xvckh86sfn79csggjvg"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base safe-exceptions text ]; + executableHaskellDepends = [ + base directory filepath process safe-exceptions th-env + ]; testHaskellDepends = [ base deepseq hedgehog HUnit safe-exceptions tasty tasty-hedgehog tasty-hunit temporary text unix @@ -261945,6 +265877,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "within" = callPackage + ({ mkDerivation, base, comonad, exceptions, free, hashable, path }: + mkDerivation { + pname = "within"; + version = "0.1.1.0"; + sha256 = "107gi32zsp7srb2lgmbmrdzry2irgshnznkf81sw3f1n07qhci40"; + libraryHaskellDepends = [ + base comonad exceptions free hashable path + ]; + description = "A value within another path"; + license = stdenv.lib.licenses.mit; + }) {}; + "witness" = callPackage ({ mkDerivation, base, constraints, semigroupoids, transformers }: mkDerivation { @@ -262304,6 +266249,8 @@ self: { pname = "word"; version = "0.1.0.1"; sha256 = "1k7hz3w8isbdmj0f2klyj4drrk31lbs3fzdnin7pas7l0ai286qf"; + revision = "1"; + editedCabalFile = "0qx6n35m7f2hwm41lrps2haqf80insns0zlk9nhpls08ldn5vdw1"; libraryHaskellDepends = [ base Fin natural-induction peano transformers ]; @@ -262923,6 +266870,46 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wreq-patchable" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec + , authenticate-oauth, base, base16-bytestring, base64-bytestring + , bytestring, Cabal, cabal-doctest, case-insensitive, containers + , cryptonite, directory, doctest, exceptions, filepath, ghc-prim + , hashable, http-client, http-client-tls, http-types, HUnit, lens + , lens-aeson, memory, mime-types, network-info, psqueues + , QuickCheck, snap-core, snap-server, template-haskell, temporary + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, time-locale-compat, transformers, unix-compat + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "wreq-patchable"; + version = "1.0.0.0"; + sha256 = "0dj1cq8jmvwk12r5b5hmlj5m9hbhkhjz8bm3zxahwqap5kbi7c1c"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec authenticate-oauth base base16-bytestring + bytestring case-insensitive containers cryptonite exceptions + ghc-prim hashable http-client http-client-tls http-types lens + lens-aeson memory mime-types psqueues template-haskell text time + time-locale-compat unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring + case-insensitive containers directory doctest filepath hashable + http-client http-types HUnit lens lens-aeson network-info + QuickCheck snap-core snap-server temporary test-framework + test-framework-hunit test-framework-quickcheck2 text time + transformers unix-compat unordered-containers uuid vector + ]; + description = "An easy-to-use HTTP client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "wreq-sb" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec , authenticate-oauth, base, base16-bytestring, base64-bytestring @@ -263287,6 +267274,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wstunnel" = callPackage + ({ mkDerivation, async, base, base64-bytestring, binary, bytestring + , classy-prelude, cmdargs, connection, hslogger, hspec, iproute + , mtl, network, network-conduit-tls, streaming-commons, text + , unordered-containers, websockets + }: + mkDerivation { + pname = "wstunnel"; + version = "0.3.0.1"; + sha256 = "17qbf9sy82lrnqz8aa3brggdps7adlizm75x3x5byib769v1k1pa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base base64-bytestring binary bytestring classy-prelude + connection hslogger iproute mtl network network-conduit-tls + streaming-commons text unordered-containers websockets + ]; + executableHaskellDepends = [ + async base bytestring classy-prelude cmdargs hslogger text + ]; + testHaskellDepends = [ + async base binary bytestring classy-prelude hspec network + network-conduit-tls streaming-commons text + ]; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "wtk" = callPackage ({ mkDerivation, base, old-locale, time, transformers }: mkDerivation { @@ -263360,7 +267377,7 @@ self: { revision = "1"; editedCabalFile = "1jszf2hdipr9iry6pcdhhk42aglcq6m3zvg9rgmnickfdzd4k71h"; libraryHaskellDepends = [ base containers time vector-space ]; - description = "Pure Haskell PostScript and SVG generation"; + description = "Pure Haskell PostScript and SVG generation."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -263423,8 +267440,8 @@ self: { }: mkDerivation { pname = "wuss"; - version = "1.1.15"; - sha256 = "1i2q96mapld4mnhmy321qyzzizw3k3schhm473qrszdi1yxc837q"; + version = "1.1.16"; + sha256 = "1rhc0i4bkx09iv291531mawll9h89bp57xmpkwg0j3kfklilcavl"; libraryHaskellDepends = [ base bytestring connection network websockets ]; @@ -264622,8 +268639,10 @@ self: { }: mkDerivation { pname = "xml-conduit-stylist"; - version = "1.1.0.0"; - sha256 = "0bj6mcd4k6wlrzizf3j2mnmbbl624k0xcsfrz9c3wpvdxb9iyqsr"; + version = "2.2.0.0"; + sha256 = "0zd7irwy8fl9zkpzj85lg9xv4m01cr4dzvlxyz8nh6l1rwvhqang"; + revision = "2"; + editedCabalFile = "0h20v462sfq4cli5b9d574qjhxs1vgzh5yb2spgj6w9pmf7ydf61"; libraryHaskellDepends = [ base containers css-syntax network-uri stylist text unordered-containers xml-conduit @@ -266449,8 +270468,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.11.3.0"; - sha256 = "01lafh83rp0v49f052vyv4gcbdgzcf42cmg0iqlykk6c586ksvh4"; + version = "0.11.4.0"; + sha256 = "0v69d10ni6ydj4g63ajcmnx6a2j3kbl91vpz678l7k5mkd3chkns"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -266668,6 +270687,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yamlparse-applicative" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , genvalidity-aeson, genvalidity-containers, genvalidity-hspec + , genvalidity-scientific, genvalidity-text + , genvalidity-unordered-containers, hspec, optparse-applicative + , path, path-io, prettyprinter, QuickCheck, scientific, text + , unordered-containers, validity, validity-text, vector, yaml + }: + mkDerivation { + pname = "yamlparse-applicative"; + version = "0.1.0.1"; + sha256 = "089s5f3i3yz833g7q2rd55v9hn93cdzprhniymw37qdmhv5jw960"; + libraryHaskellDepends = [ + aeson base bytestring containers optparse-applicative path path-io + prettyprinter scientific text unordered-containers validity + validity-text vector yaml + ]; + testHaskellDepends = [ + aeson base containers genvalidity-aeson genvalidity-containers + genvalidity-hspec genvalidity-scientific genvalidity-text + genvalidity-unordered-containers hspec QuickCheck scientific text + unordered-containers + ]; + description = "Declaritive configuration parsing with free docs"; + license = stdenv.lib.licenses.mit; + }) {}; + "yampa-canvas" = callPackage ({ mkDerivation, base, blank-canvas, stm, time, Yampa }: mkDerivation { @@ -266977,8 +271023,8 @@ self: { }: mkDerivation { pname = "yaya"; - version = "0.2.1.2"; - sha256 = "179mq32b5gjlwfpldm4msqnxv316gb2gj3s0kzhkcyk0l3i3y8fi"; + version = "0.3.0.0"; + sha256 = "0jwk4pym5rclgk080lwc3ww1wa42xpzlnf31i8clwg1b9h05c8f2"; libraryHaskellDepends = [ base bifunctors comonad constraints containers distributive either errors free kan-extensions lens profunctors template-haskell @@ -266992,21 +271038,38 @@ self: { ({ mkDerivation, base, deriving-compat, hedgehog, yaya }: mkDerivation { pname = "yaya-hedgehog"; - version = "0.1.2.1"; - sha256 = "18lyhb7fqdbp2p71y5jydcb8xzbahqzy1jmsnsb4hym8v8ax71cv"; + version = "0.2.0.0"; + sha256 = "1pc87r0angyg8mym450hwkswnkf3jv8gmxmyalrxwrf5dwh0029y"; libraryHaskellDepends = [ base deriving-compat hedgehog yaya ]; description = "Hedgehog testing support for the Yaya recursion scheme library"; license = stdenv.lib.licenses.agpl3; }) {}; + "yaya-test" = callPackage + ({ mkDerivation, base, deriving-compat, hedgehog, yaya + , yaya-hedgehog + }: + mkDerivation { + pname = "yaya-test"; + version = "0.3.0.0"; + sha256 = "1jbj9z5bxf1r5c8sdsyrc66rwlf1pgw2xs7iy4bxs5h37l74bqg6"; + isLibrary = false; + isExecutable = false; + testHaskellDepends = [ + base deriving-compat hedgehog yaya yaya-hedgehog + ]; + description = "Test suites for `yaya`"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "yaya-unsafe" = callPackage ({ mkDerivation, base, bifunctors, comonad, either, free, lens , yaya }: mkDerivation { pname = "yaya-unsafe"; - version = "0.1.1.2"; - sha256 = "0cvfrzqx5d56nld60p1n5qmwn4j4gbsvy7jf5lk4ar5da4w8a90c"; + version = "0.2.0.0"; + sha256 = "0j4cf7v5pzp4cck2mvs56xpsim7z3z9b8hgpivhp64g529wnzszr"; libraryHaskellDepends = [ base bifunctors comonad either free lens yaya ]; @@ -267014,6 +271077,22 @@ self: { license = stdenv.lib.licenses.agpl3; }) {}; + "yaya-unsafe-test" = callPackage + ({ mkDerivation, base, hedgehog, yaya, yaya-hedgehog, yaya-unsafe + }: + mkDerivation { + pname = "yaya-unsafe-test"; + version = "0.1.1.2"; + sha256 = "0qfhgb3mzm6s04y4rxlba9yz2yr37z5qmqwp1p6hkdbr38z5z9p5"; + isLibrary = false; + isExecutable = false; + testHaskellDepends = [ + base hedgehog yaya yaya-hedgehog yaya-unsafe + ]; + description = "Test suites for `yaya-unsafe`"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "ycextra" = callPackage ({ mkDerivation, base, containers, csv, mtl, uniplate, yhccore }: mkDerivation { @@ -267924,43 +272003,6 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.17.3"; - sha256 = "0w2i18rjqz9mzldq0bdiaikn5mxws2f9ab0ngmab6rzywcqsvg22"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq fast-logger http-types memory - monad-logger mtl parsec path-pieces primitive random resourcet - shakespeare template-haskell text time transformers unix-compat - unliftio unordered-containers vector wai wai-extra wai-logger warp - word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces random resourcet shakespeare streaming-commons - template-haskell text transformers unliftio wai wai-extra warp - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text - ]; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_6_18" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, bytestring, case-insensitive, cereal, clientsession - , conduit, conduit-extra, containers, cookie, deepseq, fast-logger - , gauge, hspec, hspec-expectations, http-types, HUnit, memory - , monad-logger, mtl, network, parsec, path-pieces, primitive - , random, resourcet, shakespeare, streaming-commons - , template-haskell, text, time, transformers, unix-compat, unliftio - , unordered-containers, vector, wai, wai-extra, wai-logger, warp - , word8 - }: - mkDerivation { - pname = "yesod-core"; version = "1.6.18"; sha256 = "1hm0frswqcj34scvapszdryjfmnrqq5fhf5hv7qcz8sj3qf46zkd"; libraryHaskellDepends = [ @@ -267983,7 +272025,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -269428,30 +273469,29 @@ self: { "yet-another-logger" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base - , base-unicode-symbols, bytestring, Cabal, case-insensitive, clock + , base-unicode-symbols, bytestring, Cabal, clock , configuration-tools, deepseq, enclosed-exceptions, exceptions - , lens, lifted-base, monad-control, mtl, optparse-applicative, stm - , stm-chans, tagged, tasty, tasty-hunit, text, time, transformers - , transformers-base, void + , lifted-base, microlens, monad-control, mtl, optparse-applicative + , stm, stm-chans, tagged, tasty, tasty-hunit, text, time + , transformers, transformers-base, void }: mkDerivation { pname = "yet-another-logger"; - version = "0.3.1"; - sha256 = "1dbwrkya2c7wf5ccsvhnk7isc90pp7vwi8ff6yq15vsn4jbirpsq"; + version = "0.4.0"; + sha256 = "11nylldbb6fd0hvpddhqc8s1s9w6c0r5iv15wvg8wyw738vgvh69"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal async base base-unicode-symbols bytestring - case-insensitive clock configuration-tools deepseq - enclosed-exceptions exceptions lens lifted-base monad-control mtl - optparse-applicative stm stm-chans text time transformers - transformers-base void + clock configuration-tools deepseq enclosed-exceptions exceptions + lifted-base microlens monad-control mtl optparse-applicative stm + stm-chans text time transformers transformers-base void ]; executableHaskellDepends = [ base Cabal ]; testHaskellDepends = [ async base base-unicode-symbols configuration-tools - enclosed-exceptions lens lifted-base tagged tasty tasty-hunit text - transformers transformers-base void + enclosed-exceptions lifted-base microlens tagged tasty tasty-hunit + text transformers transformers-base void ]; description = "Yet Another Logger"; license = stdenv.lib.licenses.asl20; @@ -270611,6 +274651,30 @@ self: { broken = true; }) {}; + "zeolite-lang" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hashable + , mtl, parsec, regex-tdfa, transformers, unix + }: + mkDerivation { + pname = "zeolite-lang"; + version = "0.6.0.0"; + sha256 = "12g5dsyvc47r236yr4lqa9dzkjqcn646xszw92559w9j555a74lf"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers directory filepath hashable mtl parsec regex-tdfa + transformers unix + ]; + executableHaskellDepends = [ + base containers directory filepath unix + ]; + testHaskellDepends = [ base directory filepath ]; + doHaddock = false; + description = "Zeolite is a statically-typed, general-purpose programming language"; + license = stdenv.lib.licenses.asl20; + }) {}; + "zephyr" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base , base-compat, boxes, bytestring, containers, directory, filepath @@ -271091,7 +275155,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "zip_1_4_1" = callPackage + "zip_1_5_0" = callPackage ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive , cereal, conduit, conduit-extra, containers, digest, directory , dlist, exceptions, filepath, hspec, monad-control, mtl @@ -271100,8 +275164,8 @@ self: { }: mkDerivation { pname = "zip"; - version = "1.4.1"; - sha256 = "0jnvqss17zjfs91flsammlx4flw527iddlav37jzqihi6j65aqp2"; + version = "1.5.0"; + sha256 = "00lqf0bw6abxdj9rs658blbhabzr1fd1w9dh0qflyxqkd8fqj7h5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -271245,6 +275309,20 @@ self: { broken = true; }) {}; + "zipper-extra" = callPackage + ({ mkDerivation, base, comonad, comonad-extras, exceptions, split + }: + mkDerivation { + pname = "zipper-extra"; + version = "0.1.1.0"; + sha256 = "1hmbn4vs1k4w24szq8m1qkvsa042d19xvvxiaj4chj39w2wc9gjr"; + libraryHaskellDepends = [ + base comonad comonad-extras exceptions split + ]; + description = "Zipper utils that weren't in Control.Comonad.Store.Zipper"; + license = stdenv.lib.licenses.mit; + }) {}; + "zippers" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest , fail, lens, profunctors, semigroupoids, semigroups @@ -271618,35 +275696,54 @@ self: { }) {}; "zre" = callPackage - ({ mkDerivation, async, attoparsec, base, binary, binary-strict - , bytestring, config-ini, containers, data-default, lifted-async - , monad-control, mtl, network, network-info, network-multicast - , optparse-applicative, process, random, repline, sockaddr, stm + ({ mkDerivation, async, attoparsec, base, binary, bytestring + , config-ini, containers, data-default, directory, filepath + , lifted-async, monad-control, mtl, network, network-bsd + , network-info, network-multicast, optparse-applicative, process + , QuickCheck, quickcheck-instances, random, repline, sockaddr, stm , text, time, transformers-base, uuid, zeromq4-haskell }: mkDerivation { pname = "zre"; - version = "0.1.0.1"; - sha256 = "0ddd7ppx8ivgrcvaj1d74vxjrgly8y5k5yr181dmi0z0jfkkkfx4"; + version = "0.1.0.2"; + sha256 = "09h1vsnm9p4yds8k4k7c5ixn8q6cikwkiw6wxf7srl9bbrwxhj9l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async attoparsec base binary binary-strict bytestring config-ini - containers data-default monad-control mtl network network-info - network-multicast optparse-applicative process random sockaddr stm - text time transformers-base uuid zeromq4-haskell + async attoparsec base binary bytestring config-ini containers + data-default directory filepath monad-control mtl network + network-bsd network-info network-multicast optparse-applicative + process random sockaddr stm text time transformers-base uuid + zeromq4-haskell ]; executableHaskellDepends = [ async base bytestring lifted-async monad-control mtl repline stm time ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-instances uuid + ]; description = "ZRE protocol implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; + "zsdd" = callPackage + ({ mkDerivation, base, containers, hashable, mtl + , unordered-containers + }: + mkDerivation { + pname = "zsdd"; + version = "0.2.1.0"; + sha256 = "107mw1xyx1imi2w0lz5f768yj8r9plamz7f988yhw89i8l51wx80"; + libraryHaskellDepends = [ + base containers hashable mtl unordered-containers + ]; + description = "Zero-Suppressed and Reduced Decision Diagrams"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zsh-battery" = callPackage ({ mkDerivation, base, directory, filepath, mtl }: mkDerivation { @@ -271721,21 +275818,21 @@ self: { }) {}; "ztar" = callPackage - ({ mkDerivation, base, bytestring, bytestring-arbitrary, deepseq - , directory, filepath, path, path-io, process, QuickCheck, tasty + ({ mkDerivation, base, bytestring, deepseq, directory, filepath + , path, path-io, process, QuickCheck, quickcheck-instances, tasty , tasty-quickcheck, text, unix-compat, zip, zlib }: mkDerivation { pname = "ztar"; - version = "1.0.1"; - sha256 = "13nqbl1bakyw0nn7nihs49qfqz3lx78h3nvq8d9pxm2jvp9x32j9"; + version = "1.0.2"; + sha256 = "081ip4fmkavrwhlqa8jwv4pdf40dvhfd7d4w3iqk3p9qpdnbjm3j"; libraryHaskellDepends = [ base bytestring deepseq directory filepath path process text unix-compat zip zlib ]; testHaskellDepends = [ - base bytestring bytestring-arbitrary filepath path path-io - QuickCheck tasty tasty-quickcheck + base bytestring filepath path path-io QuickCheck + quickcheck-instances tasty tasty-quickcheck ]; description = "Creating and extracting arbitrary archives"; license = stdenv.lib.licenses.bsd3; @@ -271810,6 +275907,8 @@ self: { ]; description = "Password strength estimation based on zxcvbn"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zxcvbn-hs" = callPackage @@ -271848,6 +275947,8 @@ self: { ]; description = "Password strength estimation based on zxcvbn"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; } diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index aebab7b6f040e..58d50592ac427 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -86,6 +86,11 @@ rec { future. Instead of jailbreaking, you can patch the cabal file. + + Note that jailbreaking at this time, doesn't lift bounds on + conditional branches. + https://github.com/peti/jailbreak-cabal/issues/7 has further details. + */ doJailbreak = drv: overrideCabal drv (drv: { jailbreak = true; }); diff --git a/pkgs/development/haskell-modules/patches/darcs-2.14.2-Compile-against-GHC-8.8.patch b/pkgs/development/haskell-modules/patches/darcs-2.14.2-Compile-against-GHC-8.8.patch new file mode 100644 index 0000000000000..04ff068e1d02e --- /dev/null +++ b/pkgs/development/haskell-modules/patches/darcs-2.14.2-Compile-against-GHC-8.8.patch @@ -0,0 +1,333 @@ +From 2490fa65eeba52699a7c0e303aa5cb9b78c2b1cf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me> +Date: Fri, 17 Apr 2020 20:49:23 +0200 +Subject: [PATCH] Compile against GHC 8.8 + +--- + Setup.hs | 15 --------------- + src/Darcs/Patch/Depends.hs | 2 +- + src/Darcs/Patch/Match.hs | 12 ++++++------ + src/Darcs/Patch/PatchInfoAnd.hs | 2 +- + src/Darcs/Patch/Prim/V1/Apply.hs | 6 +++--- + src/Darcs/Patch/Prim/V1/Commute.hs | 1 + + src/Darcs/Patch/ReadMonads.hs | 1 + + src/Darcs/Patch/V1/Commute.hs | 1 + + src/Darcs/Repository/Diff.hs | 2 +- + src/Darcs/Repository/Match.hs | 2 +- + src/Darcs/Util/Tree/Monad.hs | 4 ++-- + 12 files changed, 30 insertions(+), 42 deletions(-) + +diff --git a/Setup.hs b/Setup.hs +index f5cc3e8..05caac4 100644 +--- a/Setup.hs ++++ b/Setup.hs +@@ -75,21 +75,6 @@ + postInst = \ _ flags pkg lbi -> + installManpage pkg lbi (fromFlag $ installVerbosity flags) NoCopyDest, + +- sDistHook = \ pkg lbi hooks flags -> do +- let pkgVer = packageVersion pkg +- verb = fromFlag $ sDistVerbosity flags +- x <- versionPatches verb pkgVer +- y <- context verb +- rewriteFileEx silent "release/distributed-version" $ show x +- rewriteFileEx silent "release/distributed-context" $ show y +- putStrLn "about to hand over" +- let pkg' = pkg { library = sanity (library pkg) } +- sanity (Just lib) = Just $ lib { libBuildInfo = sanity' $ libBuildInfo lib } +- sanity _ = error "eh" +- sanity' bi = bi { otherModules = [ m | m <- otherModules bi, toFilePath m /= "Version" ] } +- +- sDistHook simpleUserHooks pkg' lbi hooks flags +- , + postConf = \_ _ _ _ -> return () --- Usually this checked for external C + --- dependencies, but we already have performed such + --- check in the confHook +--- a/darcs.cabal 1970-01-01 01:00:01.000000000 +0100 ++++ b/darcs.cabal 2020-04-18 10:26:07.605129733 +0200 +@@ -1,6 +1,5 @@ + Name: darcs + version: 2.14.2 +-x-revision: 1 + License: GPL-2 + License-file: COPYING + Author: David Roundy <droundy@darcs.net>, <darcs-devel@darcs.net> +@@ -75,7 +74,7 @@ + description: Use libcurl for HTTP support. + + -- in future this could extend to any other external libraries, +--- e.g. libiconv ++-- e.g. libiconv + flag pkgconfig + description: Use pkgconfig to configure libcurl + default: False +@@ -113,7 +112,7 @@ + -- ---------------------------------------------------------------------- + + custom-setup +- setup-depends: base >= 4.9 && < 4.13, ++ setup-depends: base >= 4.9 && <5, + Cabal >= 1.24, + process >= 1.2.3.0 && < 1.7, + filepath >= 1.4.1 && < 1.5.0.0, +@@ -381,7 +380,7 @@ + else + build-depends: unix >= 2.7.1.0 && < 2.8 + +- build-depends: base >= 4.9 && < 4.13, ++ build-depends: base >= 4.9 && <5, + stm >= 2.1 && < 2.6, + binary >= 0.5 && < 0.10, + containers >= 0.5.6.2 && < 0.7, +@@ -402,19 +401,19 @@ + tar >= 0.5 && < 0.6, + data-ordlist == 0.4.*, + attoparsec >= 0.13.0.1 && < 0.14, +- zip-archive >= 0.3 && < 0.5, ++ zip-archive >= 0.3 && <1, + async >= 2.0.2 && < 2.3, +- sandi >= 0.4 && < 0.6, ++ sandi >= 0.4 && <1, + unix-compat >= 0.4.2 && < 0.6, + bytestring >= 0.10.6 && < 0.11, + old-time >= 1.1.0.3 && < 1.2, + time >= 1.5.0.1 && < 1.10, +- text >= 1.2.1.3 && < 1.3, ++ text >= 1.2.1.3 && <2, + directory >= 1.2.6.2 && < 1.4, + process >= 1.2.3.0 && < 1.7, + array >= 0.5.1.0 && < 0.6, + random >= 1.1 && < 1.2, +- hashable >= 1.2.3.3 && < 1.3, ++ hashable >= 1.2.3.3 && <2, + mmap >= 0.5.9 && < 0.6, + zlib >= 0.6.1.2 && < 0.7.0.0, + network-uri == 2.6.*, +@@ -443,7 +442,7 @@ + + -- The terminfo package cannot be built on Windows. + if flag(terminfo) && !os(windows) +- build-depends: terminfo >= 0.4.0.2 && < 0.5 ++ build-depends: terminfo >= 0.4.0.2 && <1 + cpp-options: -DHAVE_TERMINFO + + default-extensions: +@@ -500,7 +499,7 @@ + cc-options: -D_REENTRANT + + build-depends: darcs, +- base >= 4.9 && < 4.13 ++ base >= 4.9 && <5 + + -- ---------------------------------------------------------------------- + -- unit test driver +@@ -518,7 +517,7 @@ + build-depends: Win32 >= 2.3.1 && < 2.4 + + build-depends: darcs, +- base >= 4.9 && < 4.13, ++ base >= 4.9 && <5, + array >= 0.5.1.0 && < 0.6, + bytestring >= 0.10.6 && < 0.11, + cmdargs >= 0.10.10 && < 0.11, +@@ -527,15 +526,15 @@ + mtl >= 2.2.1 && < 2.3, + shelly >= 1.6.8 && < 1.9, + split >= 0.2.2 && < 0.3, +- text >= 1.2.1.3 && < 1.3, ++ text >= 1.2.1.3 && <2, + directory >= 1.2.6.2 && < 1.4, + FindBin >= 0.0.5 && < 0.1, +- QuickCheck >= 2.8.2 && < 2.13, ++ QuickCheck >= 2.8.2 && <3, + HUnit >= 1.3 && < 1.7, + test-framework >= 0.8.1.1 && < 0.9, + test-framework-hunit >= 0.3.0.2 && < 0.4, + test-framework-quickcheck2 >= 0.3.0.3 && < 0.4, +- zip-archive >= 0.3 && < 0.5 ++ zip-archive >= 0.3 && <1 + + -- https://github.com/yesodweb/Shelly.hs/issues/177 + if os(windows) +diff --git a/src/Darcs/Patch/Depends.hs b/src/Darcs/Patch/Depends.hs +index 8531294..a4c71cb 100644 +--- a/src/Darcs/Patch/Depends.hs ++++ b/src/Darcs/Patch/Depends.hs +@@ -251,7 +251,7 @@ splitOnTag _ (PatchSet NilRL NilRL) = Nothing + unwrapOneTagged :: (Monad m) => PatchSet rt p wX wY -> m (PatchSet rt p wX wY) + unwrapOneTagged (PatchSet (ts :<: Tagged t _ tps) ps) = + return $ PatchSet ts (tps :<: t +<+ ps) +-unwrapOneTagged _ = fail "called unwrapOneTagged with no Tagged's in the set" ++unwrapOneTagged _ = error "called unwrapOneTagged with no Tagged's in the set" + + -- | @getUncovered ps@ returns the 'PatchInfo' for all the patches in + -- @ps@ that are not depended on by anything else *through explicit +diff --git a/src/Darcs/Patch/Match.hs b/src/Darcs/Patch/Match.hs +index aba6c7a..2b6f53a 100644 +--- a/src/Darcs/Patch/Match.hs ++++ b/src/Darcs/Patch/Match.hs +@@ -421,7 +421,7 @@ getNonrangeMatchS fs repo = + Just m -> if nonrangeMatcherIsTag fs + then getTagS m repo + else getMatcherS Exclusive m repo +- Nothing -> fail "Pattern not specified in getNonrangeMatch." ++ Nothing -> error "Pattern not specified in getNonrangeMatch." + + -- | @firstMatch fs@ tells whether @fs@ implies a "first match", that + -- is if we match against patches from a point in the past on, rather +@@ -441,7 +441,7 @@ getFirstMatchS fs repo = + Just (_,b) -> unpullLastN repo b -- b is chronologically earlier than a + Nothing -> + case firstMatcher fs of +- Nothing -> fail "Pattern not specified in getFirstMatchS." ++ Nothing -> error "Pattern not specified in getFirstMatchS." + Just m -> if firstMatcherIsTag fs + then getTagS m repo + else getMatcherS Inclusive m repo +@@ -462,7 +462,7 @@ checkMatchSyntax :: [MatchFlag] -> IO () + checkMatchSyntax opts = + case getMatchPattern opts of + Nothing -> return () +- Just p -> either fail (const $ return ()) (parseMatch p::Either String (MatchFun rt DummyPatch)) ++ Just p -> either error (const $ return ()) (parseMatch p::Either String (MatchFun rt DummyPatch)) + + getMatchPattern :: [MatchFlag] -> Maybe String + getMatchPattern [] = Nothing +@@ -718,7 +718,7 @@ getMatcherS :: (ApplyMonad (ApplyState p) m, Matchable p) => + getMatcherS ioe m repo = + if matchExists m repo + then applyInvToMatcher ioe m repo +- else fail $ "Couldn't match pattern "++ show m ++ else error $ "Couldn't match pattern "++ show m + + getTagS :: (ApplyMonad (ApplyState p) m, MonadProgress m, Matchable p) => + Matcher rt p -> PatchSet rt p Origin wX -> m () +diff --git a/src/Darcs/Patch/PatchInfoAnd.hs b/src/Darcs/Patch/PatchInfoAnd.hs +index 2da7ec8..1147410 100644 +--- a/src/Darcs/Patch/PatchInfoAnd.hs ++++ b/src/Darcs/Patch/PatchInfoAnd.hs +@@ -167,7 +167,7 @@ conscientiously er (PIAP pinf hp) = + + -- | @hopefullyM@ is a version of @hopefully@ which calls @fail@ in a + -- monad instead of erroring. +-hopefullyM :: Monad m => PatchInfoAnd rt p wA wB -> m (WrappedNamed rt p wA wB) ++hopefullyM :: MonadFail m => PatchInfoAnd rt p wA wB -> m (WrappedNamed rt p wA wB) + hopefullyM (PIAP pinf hp) = case hopefully2either hp of + Right p -> return p + Left e -> fail $ renderString +diff --git a/src/Darcs/Patch/Prim/V1/Apply.hs b/src/Darcs/Patch/Prim/V1/Apply.hs +index bea7e41..7984d21 100644 +--- a/src/Darcs/Patch/Prim/V1/Apply.hs ++++ b/src/Darcs/Patch/Prim/V1/Apply.hs +@@ -41,13 +41,13 @@ instance Apply Prim where + apply (FP f (TokReplace t o n)) = mModifyFilePS f doreplace + where doreplace fc = + case tryTokReplace t (BC.pack o) (BC.pack n) fc of +- Nothing -> fail $ "replace patch to " ++ fn2fp f ++ Nothing -> error $ "replace patch to " ++ fn2fp f + ++ " couldn't apply." + Just fc' -> return fc' + apply (FP f (Binary o n)) = mModifyFilePS f doapply + where doapply oldf = if o == oldf + then return n +- else fail $ "binary patch to " ++ fn2fp f ++ else error $ "binary patch to " ++ fn2fp f + ++ " couldn't apply." + apply (DP d AddDir) = mCreateDirectory d + apply (DP d RmDir) = mRemoveDirectory d +@@ -115,7 +115,7 @@ applyHunk f h fc = + case applyHunkLines h fc of + Right fc' -> return fc' + Left msg -> +- fail $ ++ error $ + "### Error applying:\n" ++ renderHunk h ++ + "\n### to file " ++ fn2fp f ++ ":\n" ++ BC.unpack fc ++ + "### Reason: " ++ msg +diff --git a/src/Darcs/Patch/Prim/V1/Commute.hs b/src/Darcs/Patch/Prim/V1/Commute.hs +index 7639dbd..e1432e6 100644 +--- a/src/Darcs/Patch/Prim/V1/Commute.hs ++++ b/src/Darcs/Patch/Prim/V1/Commute.hs +@@ -58,6 +58,7 @@ instance Monad Perhaps where + Failed >>= _ = Failed + Unknown >>= _ = Unknown + return = Succeeded ++instance MonadFail Perhaps where + fail _ = Unknown + + instance Alternative Perhaps where +diff --git a/src/Darcs/Patch/ReadMonads.hs b/src/Darcs/Patch/ReadMonads.hs +index 62a4f81..e1cb149 100644 +--- a/src/Darcs/Patch/ReadMonads.hs ++++ b/src/Darcs/Patch/ReadMonads.hs +@@ -237,6 +237,7 @@ failSM _ = SM (\_ -> Nothing) + instance Monad SM where + (>>=) = bindSM + return = returnSM ++instance MonadFail SM where + fail = failSM + + instance ParserM SM where +diff --git a/src/Darcs/Patch/V1/Commute.hs b/src/Darcs/Patch/V1/Commute.hs +index 0bb41a3..c6c3382 100644 +--- a/src/Darcs/Patch/V1/Commute.hs ++++ b/src/Darcs/Patch/V1/Commute.hs +@@ -93,6 +93,7 @@ instance Monad Perhaps where + Failed >>= _ = Failed + Unknown >>= _ = Unknown + return = Succeeded ++instance MonadFail Perhaps where + fail _ = Unknown + + instance Alternative Perhaps where +diff --git a/src/Darcs/Repository/Diff.hs b/src/Darcs/Repository/Diff.hs +index 8078d49..e0e2341 100644 +--- a/src/Darcs/Repository/Diff.hs ++++ b/src/Darcs/Repository/Diff.hs +@@ -138,7 +138,7 @@ treeDiff da ft t1 t2 = do + do rmDirP <- diff p (Removed subtree) + addFileP <- diff p (Changed (File emptyBlob) b') + return $ joinGap (+>+) rmDirP addFileP +- diff p _ = fail $ "Missing case at path " ++ show p ++ diff p _ = error $ "Missing case at path " ++ show p + + text_diff p a b + | BL.null a && BL.null b = emptyGap NilFL +diff --git a/src/Darcs/Repository/Match.hs b/src/Darcs/Repository/Match.hs +index 08c9f13..f33cabe 100644 +--- a/src/Darcs/Repository/Match.hs ++++ b/src/Darcs/Repository/Match.hs +@@ -60,7 +60,7 @@ getNonrangeMatch :: (ApplyMonad (ApplyState p) DefaultIO, IsRepoType rt, RepoPat + getNonrangeMatch r = withRecordedMatch r . getMatch where + getMatch fs = case hasIndexRange fs of + Just (n, m) | n == m -> applyNInv (n-1) +- | otherwise -> fail "Index range is not allowed for this command." ++ | otherwise -> error "Index range is not allowed for this command." + _ -> getNonrangeMatchS fs + + getOnePatchset :: (IsRepoType rt, RepoPatch p) +diff --git a/src/Darcs/Util/Tree/Monad.hs b/src/Darcs/Util/Tree/Monad.hs +index 0e01d9b..296fdc4 100644 +--- a/src/Darcs/Util/Tree/Monad.hs ++++ b/src/Darcs/Util/Tree/Monad.hs +@@ -216,7 +216,7 @@ instance (Monad m) => TreeRO (TreeMonad m) where + t <- gets tree + let f = findFile t p' + case f of +- Nothing -> fail $ "No such file " ++ show p' ++ Nothing -> error $ "No such file " ++ show p' + Just x -> lift (readBlob x) + + currentDirectory = ask +@@ -251,7 +251,7 @@ instance (Monad m) => TreeRW (TreeMonad m) where + let item = find tr from' + found_to = find tr to' + unless (isNothing found_to) $ +- fail $ "Error renaming: destination " ++ show to ++ " exists." ++ error $ "Error renaming: destination " ++ show to ++ " exists." + unless (isNothing item) $ do + modifyItem from Nothing + modifyItem to item +-- +2.23.1 + diff --git a/pkgs/development/haskell-modules/patches/darcs-setup.patch b/pkgs/development/haskell-modules/patches/darcs-setup.patch new file mode 100644 index 0000000000000..fbc7efde428e3 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/darcs-setup.patch @@ -0,0 +1,120 @@ +--- darcs-2.14.2/Setup.hs 2019-01-27 03:14:51.000000000 +1300 ++++ darcs.net/Setup.hs 2019-10-18 02:41:57.000000000 +1300 +@@ -11,7 +11,9 @@ + , TestSuite(testBuildInfo) + , updatePackageDescription + , cppOptions, ccOptions +- , library, libBuildInfo, otherModules ) ++ , library, libBuildInfo, otherModules ++ , ComponentName(CExeName) ++ ) + import Distribution.Package + ( packageVersion ) + import Distribution.Version( Version ) +@@ -21,24 +23,27 @@ + import Distribution.Simple.Setup + (buildVerbosity, copyDest, copyVerbosity, fromFlag, + haddockVerbosity, installVerbosity, sDistVerbosity, replVerbosity ) +-import Distribution.Simple.BuildPaths ( autogenModulesDir ) ++import Distribution.Simple.BuildPaths ( autogenPackageModulesDir ) + import Distribution.System + ( OS(Windows), buildOS ) + import Distribution.Simple.Utils + (copyFiles, createDirectoryIfMissingVerbose, rawSystemStdout, +- rewriteFile ) ++ rewriteFileEx) ++import Distribution.Types.UnqualComponentName + import Distribution.Verbosity +- ( Verbosity ) ++ ( Verbosity, silent ) + import Distribution.Text + ( display ) +-import Control.Monad ( unless, void ) + ++import Control.Monad ( unless, when, void ) + import System.Directory + ( doesDirectoryExist, doesFileExist ) + import System.IO + ( openFile, IOMode(..) ) + import System.Process (runProcess) + import Data.List( isInfixOf, lines ) ++import qualified Data.Map as M ++import Data.Maybe ( isJust ) + import System.FilePath ( (</>) ) + import Foreign.Marshal.Utils ( with ) + import Foreign.Storable ( peek ) +@@ -75,8 +80,8 @@ + verb = fromFlag $ sDistVerbosity flags + x <- versionPatches verb pkgVer + y <- context verb +- rewriteFile "release/distributed-version" $ show x +- rewriteFile "release/distributed-context" $ show y ++ rewriteFileEx silent "release/distributed-version" $ show x ++ rewriteFileEx silent "release/distributed-context" $ show y + putStrLn "about to hand over" + let pkg' = pkg { library = sanity (library pkg) } + sanity (Just lib) = Just $ lib { libBuildInfo = sanity' $ libBuildInfo lib } +@@ -105,8 +110,7 @@ + littleEndian <- testEndianness + let args = ("-DPACKAGE_VERSION=" ++ show' version) : + [arg | (arg, True) <- -- include fst iff snd. +- [-- We have MAPI iff building on/for Windows. +- ("-DHAVE_MAPI", buildOS == Windows), ++ [ + ("-DLITTLEENDIAN", littleEndian), + ("-DBIGENDIAN", not littleEndian)]] + bi = emptyBuildInfo { cppOptions = args, ccOptions = args } +@@ -133,20 +137,26 @@ + -- man page + -- --------------------------------------------------------------------- + ++hasDarcsExe :: LocalBuildInfo -> Bool ++hasDarcsExe = isJust . M.lookup darcsExe . componentNameMap where ++ darcsExe = CExeName (mkUnqualComponentName "darcs") ++ + buildManpage :: LocalBuildInfo -> IO () +-buildManpage lbi = do +- let darcs = buildDir lbi </> "darcs/darcs" +- manpage = buildDir lbi </> "darcs/darcs.1" +- manpageHandle <- openFile manpage WriteMode +- void $ runProcess darcs ["help","manpage"] +- Nothing Nothing Nothing (Just manpageHandle) Nothing ++buildManpage lbi = ++ when (hasDarcsExe lbi) $ do ++ let darcs = buildDir lbi </> "darcs/darcs" ++ manpage = buildDir lbi </> "darcs/darcs.1" ++ manpageHandle <- openFile manpage WriteMode ++ void $ runProcess darcs ["help","manpage"] ++ Nothing Nothing Nothing (Just manpageHandle) Nothing + +-installManpage :: PackageDescription -> LocalBuildInfo +- -> Verbosity -> CopyDest -> IO () ++installManpage :: PackageDescription -> LocalBuildInfo -> Verbosity -> CopyDest -> IO () + installManpage pkg lbi verbosity copy = +- copyFiles verbosity +- (mandir (absoluteInstallDirs pkg lbi copy) </> "man1") +- [(buildDir lbi </> "darcs", "darcs.1")] ++ when (hasDarcsExe lbi) $ ++ copyFiles ++ verbosity ++ (mandir (absoluteInstallDirs pkg lbi copy) </> "man1") ++ [(buildDir lbi </> "darcs", "darcs.1")] + + -- --------------------------------------------------------------------- + -- version module +@@ -187,12 +197,13 @@ + generateVersionModule :: Verbosity -> LocalBuildInfo + -> String -> String -> IO () + generateVersionModule verbosity lbi version state = do +- let dir = autogenModulesDir lbi ++ let dir = autogenPackageModulesDir lbi + createDirectoryIfMissingVerbose verbosity True dir + ctx <- context verbosity + hash <- weakhash verbosity +- rewriteFile (dir </> "Version.hs") $ unlines ++ rewriteFileEx silent (dir </> "Version.hs") $ unlines + ["module Version where" ++ ,"import Darcs.Prelude" + ,"version, weakhash, context :: String" + ,"version = \"" ++ version ++ " (" ++ state ++ ")\"" + ,"weakhash = " ++ case hash of diff --git a/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch b/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch new file mode 100644 index 0000000000000..7ed390d3f237e --- /dev/null +++ b/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch @@ -0,0 +1,383 @@ +Only in dbus-1.2.13-new: .codeclimate.yml +diff -ur dbus-1.2.13-old/dbus.cabal dbus-1.2.13-new/dbus.cabal +--- dbus-1.2.13-old/dbus.cabal 2020-04-25 19:29:27.372272952 +0200 ++++ dbus-1.2.13-new/dbus.cabal 2020-04-25 19:26:36.140991920 +0200 +@@ -1,172 +1,180 @@ +-cabal-version: >=1.8 + name: dbus + version: 1.2.13 + license: Apache-2.0 + license-file: license.txt +-maintainer: Andrey Sverdlichenko <blaze@ruddy.ru> + author: John Millikin <john@john-millikin.com> ++maintainer: Andrey Sverdlichenko <blaze@ruddy.ru> ++build-type: Simple ++cabal-version: >= 1.8 ++category: Network, Desktop + stability: experimental + homepage: https://github.com/rblaze/haskell-dbus#readme ++ + synopsis: A client library for the D-Bus IPC system. + description: +- D-Bus is a simple, message-based protocol for inter-process +- communication, which allows applications to interact with other parts of +- the machine and the user's session using remote procedure calls. +- . +- D-Bus is a essential part of the modern Linux desktop, where it replaces +- earlier protocols such as CORBA and DCOP. +- . +- This library is an implementation of the D-Bus protocol in Haskell. It +- can be used to add D-Bus support to Haskell applications, without the +- awkward interfaces common to foreign bindings. +- . +- Example: connect to the session bus, and get a list of active names. +- . +- @ +- {-\# LANGUAGE OverloadedStrings \#-} +- . +- import Data.List (sort) +- import DBus +- import DBus.Client +- . +- main = do +-   client <- connectSession +-   // +-   \-- Request a list of connected clients from the bus +-   reply <- call_ client (methodCall \"\/org\/freedesktop\/DBus\" \"org.freedesktop.DBus\" \"ListNames\") +-   { methodCallDestination = Just \"org.freedesktop.DBus\" +-   } +-   // +-   \-- org.freedesktop.DBus.ListNames() returns a single value, which is +-   \-- a list of names (here represented as [String]) +-   let Just names = fromVariant (methodReturnBody reply !! 0) +-   // +-   \-- Print each name on a line, sorted so reserved names are below +-   \-- temporary names. +-   mapM_ putStrLn (sort names) +- @ +- . +- >$ ghc --make list-names.hs +- >$ ./list-names +- >:1.0 +- >:1.1 +- >:1.10 +- >:1.106 +- >:1.109 +- >:1.110 +- >ca.desrt.dconf +- >org.freedesktop.DBus +- >org.freedesktop.Notifications +- >org.freedesktop.secrets +- >org.gnome.ScreenSaver +-category: Network, Desktop +-build-type: Simple ++ D-Bus is a simple, message-based protocol for inter-process ++ communication, which allows applications to interact with other parts of ++ the machine and the user's session using remote procedure calls. ++ . ++ D-Bus is a essential part of the modern Linux desktop, where it replaces ++ earlier protocols such as CORBA and DCOP. ++ . ++ This library is an implementation of the D-Bus protocol in Haskell. It ++ can be used to add D-Bus support to Haskell applications, without the ++ awkward interfaces common to foreign bindings. ++ . ++ Example: connect to the session bus, and get a list of active names. ++ . ++ @ ++ {-\# LANGUAGE OverloadedStrings \#-} ++ . ++ import Data.List (sort) ++ import DBus ++ import DBus.Client ++ . ++ main = do ++   client <- connectSession ++   ++   -- Request a list of connected clients from the bus ++   reply <- call_ client (methodCall \"\/org\/freedesktop\/DBus\" \"org.freedesktop.DBus\" \"ListNames\") ++   { methodCallDestination = Just \"org.freedesktop.DBus\" ++   } ++   ++   -- org.freedesktop.DBus.ListNames() returns a single value, which is ++   -- a list of names (here represented as [String]) ++   let Just names = fromVariant (methodReturnBody reply !! 0) ++   ++   -- Print each name on a line, sorted so reserved names are below ++   -- temporary names. ++   mapM_ putStrLn (sort names) ++ @ ++ . ++ >$ ghc --make list-names.hs ++ >$ ./list-names ++ >:1.0 ++ >:1.1 ++ >:1.10 ++ >:1.106 ++ >:1.109 ++ >:1.110 ++ >ca.desrt.dconf ++ >org.freedesktop.DBus ++ >org.freedesktop.Notifications ++ >org.freedesktop.secrets ++ >org.gnome.ScreenSaver ++ ++ + extra-source-files: +- examples/dbus-monitor.hs +- examples/export.hs +- examples/introspect.hs +- examples/list-names.hs +- idlxml/dbus.xml ++ examples/dbus-monitor.hs ++ examples/export.hs ++ examples/introspect.hs ++ examples/list-names.hs ++ idlxml/dbus.xml + + source-repository head +- type: git +- location: https://github.com/rblaze/haskell-dbus ++ type: git ++ location: https://github.com/rblaze/haskell-dbus + + library +- exposed-modules: +- DBus +- DBus.Client +- DBus.Generation +- DBus.Internal.Address +- DBus.Internal.Message +- DBus.Internal.Types +- DBus.Internal.Wire +- DBus.Introspection +- DBus.Introspection.Parse +- DBus.Introspection.Render +- DBus.Introspection.Types +- DBus.Socket +- DBus.TH +- DBus.Transport +- hs-source-dirs: lib +- ghc-options: -W -Wall +- build-depends: +- base ==4.*, +- bytestring <0.11, +- cereal <0.6, +- conduit >=1.3.0 && <1.4, +- containers <0.7, +- deepseq <1.5, +- exceptions <0.11, +- filepath <1.5, +- lens <4.20, +- network >=3.0.1.0 && <3.2, +- parsec <3.2, +- random <1.2, +- split <0.3, +- template-haskell <2.16.0.0, +- text <1.3, +- th-lift <0.9, +- transformers <0.6, +- unix <2.8, +- vector <0.13, +- xml-conduit >=1.9.0.0 && <1.10.0.0, +- xml-types <0.4 ++ ghc-options: -W -Wall ++ hs-source-dirs: lib ++ ++ build-depends: ++ base >=4 && <5 ++ , bytestring ++ , cereal ++ , conduit >= 1.3.0 ++ , containers ++ , deepseq ++ , exceptions ++ , filepath ++ , lens < 4.20 ++ , network >= 3.0.1.0 && < 3.2 ++ , parsec ++ , random ++ , split ++ , template-haskell < 2.17.0.0 ++ , text ++ , th-lift < 0.9 ++ , transformers ++ , unix ++ , vector ++ , xml-conduit >= 1.9.0.0 && < 1.10.0.0 ++ , xml-types ++ ++ exposed-modules: ++ DBus ++ DBus.Client ++ DBus.Generation ++ DBus.Internal.Address ++ DBus.Internal.Message ++ DBus.Internal.Types ++ DBus.Internal.Wire ++ DBus.Introspection ++ DBus.Introspection.Parse ++ DBus.Introspection.Render ++ DBus.Introspection.Types ++ DBus.Socket ++ DBus.TH ++ DBus.Transport + + test-suite dbus_tests +- type: exitcode-stdio-1.0 +- main-is: DBusTests.hs +- hs-source-dirs: tests +- other-modules: +- DBusTests.Address +- DBusTests.BusName +- DBusTests.Client +- DBusTests.ErrorName +- DBusTests.Generation +- DBusTests.Integration +- DBusTests.InterfaceName +- DBusTests.Introspection +- DBusTests.MemberName +- DBusTests.Message +- DBusTests.ObjectPath +- DBusTests.Serialization +- DBusTests.Signature +- DBusTests.Socket +- DBusTests.TH +- DBusTests.Transport +- DBusTests.Util +- DBusTests.Variant +- DBusTests.Wire +- ghc-options: -W -Wall -fno-warn-orphans +- build-depends: +- dbus -any, +- base ==4.*, +- bytestring <0.11, +- cereal <0.6, +- containers <0.7, +- directory <1.4, +- extra <1.8, +- filepath <1.5, +- network >=3.0.1.0 && <3.2, +- parsec <3.2, +- process <1.7, +- QuickCheck <2.15, +- random <1.2, +- resourcet <1.3, +- tasty <1.3, +- tasty-hunit <0.11, +- tasty-quickcheck <0.11, +- text <1.3, +- transformers <0.6, +- unix <2.8, +- vector <0.13 ++ type: exitcode-stdio-1.0 ++ main-is: DBusTests.hs ++ hs-source-dirs: tests ++ ghc-options: -W -Wall -fno-warn-orphans ++ ++ build-depends: ++ dbus ++ , base >=4 && <5 ++ , bytestring ++ , cereal ++ , containers ++ , directory ++ , extra < 1.8 ++ , filepath ++ , network >= 3.0.1.0 && < 3.2 ++ , parsec ++ , process ++ , QuickCheck < 2.15 ++ , random ++ , resourcet ++ , tasty ++ , tasty-hunit ++ , tasty-quickcheck ++ , text ++ , transformers ++ , unix ++ , vector ++ ++ other-modules: ++ DBusTests.Address ++ DBusTests.BusName ++ DBusTests.Client ++ DBusTests.ErrorName ++ DBusTests.Generation ++ DBusTests.Integration ++ DBusTests.InterfaceName ++ DBusTests.Introspection ++ DBusTests.MemberName ++ DBusTests.Message ++ DBusTests.ObjectPath ++ DBusTests.Serialization ++ DBusTests.Signature ++ DBusTests.Socket ++ DBusTests.TH ++ DBusTests.Transport ++ DBusTests.Util ++ DBusTests.Variant ++ DBusTests.Wire + + benchmark dbus_benchmarks +- type: exitcode-stdio-1.0 +- main-is: DBusBenchmarks.hs +- hs-source-dirs: benchmarks +- ghc-options: -Wall -fno-warn-orphans +- build-depends: +- dbus -any, +- base ==4.*, +- criterion <1.6 ++ type: exitcode-stdio-1.0 ++ main-is: DBusBenchmarks.hs ++ hs-source-dirs: benchmarks ++ ghc-options: -Wall -fno-warn-orphans ++ ++ build-depends: ++ dbus ++ , base >=4 && <5 ++ , criterion +Only in dbus-1.2.13-new: .git +Only in dbus-1.2.13-new: .gitignore +diff -ur dbus-1.2.13-old/lib/DBus/Generation.hs dbus-1.2.13-new/lib/DBus/Generation.hs +--- dbus-1.2.13-old/lib/DBus/Generation.hs 2019-02-14 16:37:47.000000000 +0100 ++++ dbus-1.2.13-new/lib/DBus/Generation.hs 2020-04-25 19:26:36.144991997 +0200 +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + {-# LANGUAGE OverloadedStrings #-} + {-# LANGUAGE TemplateHaskell #-} + module DBus.Generation where +@@ -26,6 +27,13 @@ + import Prelude hiding (mapM) + import System.Posix.Types (Fd(..)) + ++-- | Compatibility helper to create (total) tuple expressions ++mkTupE :: [Exp] -> Exp ++mkTupE = TupE ++#if MIN_VERSION_template_haskell(2,16,0) ++ . map Just ++#endif ++ + type ClientBusPathR a = ReaderT (Client, T.BusName, T.ObjectPath) IO a + + dbusInvoke :: (Client -> T.BusName -> T.ObjectPath -> a) -> ClientBusPathR a +@@ -232,8 +240,8 @@ + finalOutputNames <- buildOutputNames + let variantListExp = map makeToVariantApp methodArgNames + mapOrHead' = mapOrHead outputLength +- fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames TupE +- finalResultTuple = mapOrHead' VarE finalOutputNames TupE ++ fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames mkTupE ++ finalResultTuple = mapOrHead' VarE finalOutputNames mkTupE + maybeExtractionPattern = mapOrHead' makeJustPattern finalOutputNames TupP + getMethodCallDefDec = [d| + $( varP methodCallDefN ) = +@@ -432,7 +440,7 @@ + } + |] + let mapOrHead' = mapOrHead argCount +- fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames TupE ++ fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames mkTupE + maybeExtractionPattern = mapOrHead' makeJustPattern toHandlerOutputNames TupP + applyToName toApply n = AppE toApply $ VarE n + finalApplication = foldl applyToName (VarE handlerArgN) diff --git a/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch b/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch deleted file mode 100644 index 100a828a501af..0000000000000 --- a/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur proto-lens-0.2.2.0/proto-lens.cabal proto-lens-0.2.2.0-patched/proto-lens.cabal ---- proto-lens-0.2.2.0/proto-lens.cabal 2018-08-13 18:05:41.704823370 +0200 -+++ proto-lens-0.2.2.0-patched/proto-lens.cabal 2018-08-13 18:07:42.352372300 +0200 -@@ -33,7 +33,7 @@ - Data.ProtoLens.Encoding.Wire - Data.ProtoLens.TextFormat.Parser - build-depends: attoparsec == 0.13.* -- , base >= 4.8 && < 4.11 -+ , base >= 4.8 - , bytestring == 0.10.* - , containers == 0.5.* - , data-default-class >= 0.0 && < 0.2 -diff -Naur proto-lens-0.2.2.0/src/Data/ProtoLens/TextFormat.hs proto-lens-0.2.2.0-patched/src/Data/ProtoLens/TextFormat.hs ---- proto-lens-0.2.2.0/src/Data/ProtoLens/TextFormat.hs 2017-04-28 02:16:46.000000000 +0200 -+++ proto-lens-0.2.2.0-patched/src/Data/ProtoLens/TextFormat.hs 2018-08-13 18:08:06.371486594 +0200 -@@ -17,6 +17,7 @@ - readMessageOrDie, - ) where - -+import Prelude hiding ((<>)) - import Lens.Family2 ((&),(^.),(.~), set, over) - import Control.Arrow (left) - import qualified Data.ByteString diff --git a/pkgs/development/haskell-modules/patches/proto-lens-0.5.1.0.patch b/pkgs/development/haskell-modules/patches/proto-lens-0.5.1.0.patch new file mode 100644 index 0000000000000..b50d3f1cdbfc7 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/proto-lens-0.5.1.0.patch @@ -0,0 +1,23 @@ +diff --git a/src/Data/ProtoLens/Encoding/Parser/Internal.hs b/src/Data/ProtoLens/Encoding/Parser/Internal.hs +index 30eeaad..f2703e7 100644 +--- a/src/Data/ProtoLens/Encoding/Parser/Internal.hs ++++ b/src/Data/ProtoLens/Encoding/Parser/Internal.hs +@@ -1,4 +1,5 @@ + {-# LANGUAGE LambdaCase #-} ++{-# LANGUAGE CPP #-} + -- | Definition of the parsing monad, plus internal + -- unsafe functions. + module Data.ProtoLens.Encoding.Parser.Internal +@@ -36,8 +37,11 @@ instance Applicative Parser where + (<*>) = ap + + instance Monad Parser where +- fail s = Parser $ \_ _ -> return $ ParseFailure s + return = pure + Parser f >>= g = Parser $ \end pos -> f end pos >>= \case + ParseSuccess pos' x -> unParser (g x) end pos' + ParseFailure s -> return $ ParseFailure s ++#if MIN_VERSION_base(4,13,0) ++instance MonadFail Parser where ++#endif ++ fail s = Parser $ \_ _ -> return $ ParseFailure s diff --git a/pkgs/development/haskell-modules/patches/proto-lens-protoc-0.2.2.3.patch b/pkgs/development/haskell-modules/patches/proto-lens-protoc-0.2.2.3.patch deleted file mode 100644 index 87fd2aeab21bc..0000000000000 --- a/pkgs/development/haskell-modules/patches/proto-lens-protoc-0.2.2.3.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Naur proto-lens-protoc-0.2.2.3/proto-lens-protoc.cabal proto-lens-protoc-0.2.2.3-patched/proto-lens-protoc.cabal ---- proto-lens-protoc-0.2.2.3/proto-lens-protoc.cabal 2018-07-21 22:55:12.041698876 +0200 -+++ proto-lens-protoc-0.2.2.3-patched/proto-lens-protoc.cabal 2018-08-13 19:44:44.993147985 +0200 -@@ -37,8 +37,8 @@ - default-language: Haskell2010 - hs-source-dirs: src - build-depends: -- Cabal >= 1.22 && < 2.1 -- , base >= 4.8 && < 4.11 -+ Cabal >= 1.22 -+ , base >= 4.8 - , bytestring == 0.10.* - , containers == 0.5.* - , data-default-class >= 0.0 && < 0.2 -@@ -53,6 +53,7 @@ - , proto-lens == 0.2.2.* - , proto-lens-descriptors == 0.2.2.* - , text == 1.2.* -+ , semigroups - reexported-modules: - -- Modules that are needed by the generated Haskell files. - -- For forwards compatibility, reexport them as new module names so that -@@ -76,7 +77,7 @@ - main-is: protoc-gen-haskell.hs - - build-depends: -- base >= 4.8 && < 4.11 -+ base >= 4.8 - , bytestring == 0.10.* - , containers == 0.5.* - , data-default-class >= 0.0 && < 0.2 -diff -Naur proto-lens-protoc-0.2.2.3/src/Data/ProtoLens/Compiler/Definitions.hs proto-lens-protoc-0.2.2.3-patched/src/Data/ProtoLens/Compiler/Definitions.hs ---- proto-lens-protoc-0.2.2.3/src/Data/ProtoLens/Compiler/Definitions.hs 2017-08-07 06:52:21.000000000 +0200 -+++ proto-lens-protoc-0.2.2.3-patched/src/Data/ProtoLens/Compiler/Definitions.hs 2018-08-13 19:14:07.240505220 +0200 -@@ -35,6 +35,7 @@ - import qualified Data.Map as Map - import Data.Maybe (fromMaybe) - import Data.Monoid -+import qualified Data.Semigroup as Semigroup - import qualified Data.Set as Set - import Data.String (IsString(..)) - import Data.Text (Text, cons, splitOn, toLower, uncons, unpack) -@@ -139,7 +140,7 @@ - -- a 'Symbol' is used to construct both the type-level argument to - -- @HasLens@ and the name of the function @foo@. - newtype Symbol = Symbol String -- deriving (Eq, Ord, IsString, Monoid) -+ deriving (Eq, Ord, IsString, Semigroup.Semigroup, Monoid) - - nameFromSymbol :: Symbol -> Name - nameFromSymbol (Symbol s) = fromString s diff --git a/pkgs/development/haskell-modules/patches/proto-lens-setup-0.4.0.2.patch b/pkgs/development/haskell-modules/patches/proto-lens-setup-0.4.0.2.patch new file mode 100644 index 0000000000000..a95df00e5dbf6 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/proto-lens-setup-0.4.0.2.patch @@ -0,0 +1,154 @@ +diff --git a/src/Data/ProtoLens/Setup.hs b/src/Data/ProtoLens/Setup.hs +index e68f32b..f381199 100644 +--- a/src/Data/ProtoLens/Setup.hs ++++ b/src/Data/ProtoLens/Setup.hs +@@ -41,9 +41,6 @@ import Distribution.PackageDescription + , exeName + , exposedModules + , extraSrcFiles +-#if !MIN_VERSION_Cabal(2,0,0) +- , hsSourceDirs +-#endif + #if MIN_VERSION_Cabal(2,4,0) + , specVersion + #endif +@@ -53,7 +50,7 @@ import Distribution.PackageDescription + , testBuildInfo + , testName + ) +-import qualified Distribution.Simple.BuildPaths as BuildPaths ++import Distribution.Simple.BuildPaths (autogenComponentModulesDir) + import Distribution.Simple.InstallDirs (datadir) + import Distribution.Simple.LocalBuildInfo + ( LocalBuildInfo(..) +@@ -61,9 +58,10 @@ import Distribution.Simple.LocalBuildInfo + , ComponentName(..) + , ComponentLocalBuildInfo + , componentPackageDeps +-#if MIN_VERSION_Cabal(2,0,0) + , allComponentsInBuildOrder + , componentNameMap ++#if MIN_VERSION_Cabal(3,0,0) ++ , LibraryName(..) + #endif + ) + import qualified Distribution.Simple.PackageIndex as PackageIndex +@@ -205,16 +203,6 @@ generatingSpecificProtos root getProtos hooks = hooks + { buildHook = \p l h f -> generate l >> buildHook hooks p l h f + , haddockHook = \p l h f -> generate l >> haddockHook hooks p l h f + , replHook = \p l h f args -> generate l >> replHook hooks p l h f args +-#if !MIN_VERSION_Cabal(2,0,0) +- -- Older versions of Cabal don't support the autogen-modules field. +- -- Work around it by manually generating the modules and putting them +- -- in a place where `cabal sdist` will pick them up. +- , sDistHook = \p maybe_l h f -> case maybe_l of +- Nothing -> error "Can't run protoc; run 'cabal configure' first." +- Just l -> do +- generate l +- sDistHook hooks (fudgePackageDesc l p) maybe_l h f +-#endif + , postCopy = \a flags pkg lbi -> do + let verb = fromFlag $ copyVerbosity flags + let destDir = datadir (absoluteInstallDirs pkg lbi +@@ -316,39 +304,6 @@ copyProtosToDataDir verb root destDir files = do + protoLensImportsPrefix :: FilePath + protoLensImportsPrefix = "proto-lens-imports" + +-#if !MIN_VERSION_Cabal(2,0,0) +--- | Add the autogen directory to the hs-source-dirs of all the targets in the +--- .cabal file. Used to fool 'sdist' by pointing it to the generated source +--- files. +-fudgePackageDesc :: LocalBuildInfo -> PackageDescription -> PackageDescription +-fudgePackageDesc lbi p = p +- { library = +- (\lib -> lib { libBuildInfo = fudgeBuildInfo CLibName $ libBuildInfo lib }) +- <$> library p +- , executables = +- (\exe -> exe { buildInfo = fudgeBuildInfo (CExeName $ exeName exe) +- $ buildInfo exe }) +- <$> executables p +- , testSuites = +- (\test -> test { testBuildInfo = fudgeBuildInfo (CTestName $ testName test) +- $ testBuildInfo test }) +- <$> testSuites p +- , benchmarks = +- (\bench -> bench { benchmarkBuildInfo = +- fudgeBuildInfo (CBenchName $ benchmarkName bench) +- $ benchmarkBuildInfo bench }) +- <$> benchmarks p +- } +- where +- comps = allComponents lbi +- fudgeBuildInfo n bi +- | Just compLBI <- Map.lookup n comps +- = bi { hsSourceDirs = autogenComponentModulesDir lbi compLBI +- : hsSourceDirs bi } +- | otherwise = bi -- Could happen if a component isn't active; try +- -- anyway and see whether Cabal complains later on. +-#endif +- + -- | Returns whether the @root@ is a parent folder of @f@. + isSubdirectoryOf :: FilePath -> FilePath -> Bool + isSubdirectoryOf root f +@@ -423,15 +378,18 @@ collectActiveModules + collectActiveModules l = map (\(n, c) -> (c, f n)) $ Map.toList $ allComponents l + where + p = localPkgDescr l +- f CLibName = maybeToList (library p) >>= ++#if MIN_VERSION_Cabal(3,0,0) ++ f (CLibName LMainLibName) ++#else ++ f CLibName ++#endif ++ = maybeToList (library p) >>= + \lib -> exposedModules lib + ++ otherModules (libBuildInfo lib) + f (CExeName n) = otherModules . buildInfo $ exes Map.! n + f (CTestName n) = otherModules . testBuildInfo $ tests Map.! n + f (CBenchName n) = otherModules . benchmarkBuildInfo $ benchs Map.! n +-#if MIN_VERSION_Cabal(2,0,0) + f _ = [] -- TODO: other lib kinds; for now just suppress the warning +-#endif + exes = Map.fromList [(exeName e, e) | e <- executables p] + tests = Map.fromList [(testName e, e) | e <- testSuites p] + benchs = Map.fromList [(benchmarkName e, e) | e <- benchmarks p] +@@ -441,22 +399,14 @@ collectActiveModules l = map (\(n, c) -> (c, f n)) $ Map.toList $ allComponents + + -- | List all the packages that this one depends on. + collectDeps :: LocalBuildInfo -> [InstalledPackageInfo.InstalledPackageInfo] +-#if MIN_VERSION_Cabal(2,0,0) + collectDeps l = do + c <- allComponentsInBuildOrder l + (i,_) <- componentPackageDeps c + Just p <- [PackageIndex.lookupUnitId (installedPkgs l) i] + return p +-#else +-collectDeps l = do +- (_, c ,_) <- componentsConfigs l +- (_, i) <- componentPackageDeps c +- PackageIndex.lookupSourcePackageId (installedPkgs l) i +-#endif + + -- | All the components that will be built by this Cabal command. + allComponents :: LocalBuildInfo -> Map.Map ComponentName ComponentLocalBuildInfo +-#if MIN_VERSION_Cabal(2,0,0) + allComponents l = fmap requireOne $ componentNameMap l + where + -- TODO: this doesn't support Backpack, which can have more than one +@@ -464,16 +414,3 @@ allComponents l = fmap requireOne $ componentNameMap l + requireOne [x] = x + requireOne xs = error $ "Data.ProtoLens.Setup.allComponents: expected one " + ++ "component per name, got " ++ show xs +- +-#else +-allComponents l = Map.fromList [(c, b) | (c, b, _) <- componentsConfigs l] +-#endif +- +--- | Get the component-level "autogen" directory where we're putting the +--- generated .hs files. (For Cabal-1.0, use the shared 'BuildPaths.autogenModulesDir'.) +-autogenComponentModulesDir :: LocalBuildInfo -> ComponentLocalBuildInfo -> FilePath +-#if MIN_VERSION_Cabal(2,0,0) +-autogenComponentModulesDir = BuildPaths.autogenComponentModulesDir +-#else +-autogenComponentModulesDir lbi _ = BuildPaths.autogenModulesDir lbi +-#endif diff --git a/pkgs/development/haskell-modules/patches/stack-ghc882-support.patch b/pkgs/development/haskell-modules/patches/stack-ghc882-support.patch deleted file mode 100644 index 0d906638e7fa8..0000000000000 --- a/pkgs/development/haskell-modules/patches/stack-ghc882-support.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff --git a/src/Stack/Coverage.hs b/src/Stack/Coverage.hs -index d95fa332..f80e121a 100644 ---- a/src/Stack/Coverage.hs -+++ b/src/Stack/Coverage.hs -@@ -235,7 +235,7 @@ generateHpcReportForTargets opts tixFiles targetNames = do - case nc of - CTest testName -> - liftM (pkgPath </>) $ parseRelFile (T.unpack testName ++ "/" ++ T.unpack testName ++ ".tix") -- _ -> fail $ -+ _ -> liftIO $ fail $ - "Can't specify anything except test-suites as hpc report targets (" ++ - packageNameString name ++ - " is used with a non test-suite target)" -diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs -index b69337ce..08eb9b9f 100644 ---- a/src/Stack/Package.hs -+++ b/src/Stack/Package.hs -@@ -463,7 +463,7 @@ makeObjectFilePathFromC - makeObjectFilePathFromC cabalDir namedComponent distDir cFilePath = do - relCFilePath <- stripProperPrefix cabalDir cFilePath - relOFilePath <- -- parseRelFile (replaceExtension (toFilePath relCFilePath) "o") -+ parseRelFile (System.FilePath.replaceExtension (toFilePath relCFilePath) "o") - return (componentOutputDir namedComponent distDir </> relOFilePath) - - -- | Make the global autogen dir if Cabal version is new enough. -diff --git a/src/Stack/Script.hs b/src/Stack/Script.hs -index c63c9f62..70257be1 100644 ---- a/src/Stack/Script.hs -+++ b/src/Stack/Script.hs -@@ -172,8 +172,8 @@ scriptCmd opts = do - - toExeName fp = - if osIsWindows -- then replaceExtension fp "exe" -- else dropExtension fp -+ then System.FilePath.replaceExtension fp "exe" -+ else System.FilePath.dropExtension fp - - getPackagesFromImports - :: FilePath -- ^ script filename -diff --git a/src/Stack/Setup.hs b/src/Stack/Setup.hs -index 8bbfc45c..5c5b028c 100644 ---- a/src/Stack/Setup.hs -+++ b/src/Stack/Setup.hs -@@ -876,7 +876,7 @@ buildGhcFromSource getSetupInfo' installed (CompilerRepository url) commitId fla - (_,files) <- listDir (cwd </> bindistPath) - let - isBindist p = "ghc-" `isPrefixOf` (toFilePath (filename p)) -- && fileExtension (filename p) == ".xz" -+ && (maybe "" id (fileExtension (filename p))) == ".xz" - mbindist = filter isBindist files - case mbindist of - [bindist] -> do -diff --git a/src/Stack/Storage/Project.hs b/src/Stack/Storage/Project.hs -index dc5318d8..984e6259 100644 ---- a/src/Stack/Storage/Project.hs -+++ b/src/Stack/Storage/Project.hs -@@ -12,6 +12,9 @@ - {-# LANGUAGE UndecidableInstances #-} - {-# OPTIONS_GHC -Wno-unused-top-binds -Wno-identities #-} - -+{-# LANGUAGE DerivingStrategies #-} -+{-# LANGUAGE StandaloneDeriving #-} -+ - -- | Work with SQLite database used for caches across a single project. - module Stack.Storage.Project - ( initProjectStorage -diff --git a/src/Stack/Storage/User.hs b/src/Stack/Storage/User.hs -index 3845b094..09695344 100644 ---- a/src/Stack/Storage/User.hs -+++ b/src/Stack/Storage/User.hs -@@ -12,6 +12,9 @@ - {-# LANGUAGE UndecidableInstances #-} - {-# OPTIONS_GHC -Wno-unused-top-binds -Wno-identities #-} - -+{-# LANGUAGE DerivingStrategies #-} -+{-# LANGUAGE StandaloneDeriving #-} -+ - -- | Work with SQLite database used for caches across an entire user account. - module Stack.Storage.User - ( initUserStorage -diff --git a/src/Stack/Types/Config.hs b/src/Stack/Types/Config.hs -index a5cc22b5..a329d353 100644 ---- a/src/Stack/Types/Config.hs -+++ b/src/Stack/Types/Config.hs -@@ -406,7 +406,7 @@ instance FromJSON CabalConfigKey where - instance FromJSONKey CabalConfigKey where - fromJSONKey = FromJSONKeyTextParser parseCabalConfigKey - --parseCabalConfigKey :: Monad m => Text -> m CabalConfigKey -+parseCabalConfigKey :: MonadFail m => Text -> m CabalConfigKey - parseCabalConfigKey "$targets" = pure CCKTargets - parseCabalConfigKey "$locals" = pure CCKLocals - parseCabalConfigKey "$everything" = pure CCKEverything -@@ -974,7 +974,7 @@ parseConfigMonoidObject rootDir obj = do - - return ConfigMonoid {..} - where -- handleExplicitSetupDep :: Monad m => (Text, Bool) -> m (Maybe PackageName, Bool) -+ handleExplicitSetupDep :: MonadFail m => (Text, Bool) -> m (Maybe PackageName, Bool) - handleExplicitSetupDep (name', b) = do - name <- - if name' == "*" diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 49beed8549db4..081190188742c 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -127,7 +127,18 @@ symlinkJoin { rm $f-tmp done '') + '' - ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"} + ${lib.optionalString hasLibraries '' + # GHC 8.10 changes. + # Instead of replacing package.cache[.lock] with the new file, + # ghc-pkg is now trying to open the file. These file are symlink + # to another nix derivation, so they are not writable. Removing + # them allow the correct behavior of ghc-pkg recache + # See: https://github.com/NixOS/nixpkgs/issues/79441 + rm $out/lib/${ghc.name}/package.conf.d/package.cache.lock + rm $out/lib/${ghc.name}/package.conf.d/package.cache + + $out/bin/${ghcCommand}-pkg recache + ''} ${# ghcjs will read the ghc_libdir file when resolving plugins. lib.optionalString (isGhcjs && ghcLibdir != null) '' mkdir -p "${libDir}" diff --git a/pkgs/development/idris-modules/array.nix b/pkgs/development/idris-modules/array.nix index 38d25827d5084..faed6443c48c7 100644 --- a/pkgs/development/idris-modules/array.nix +++ b/pkgs/development/idris-modules/array.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "Primitive flat arrays containing Idris values"; - homepage = https://github.com/idris-hackers/idris-array; + homepage = "https://github.com/idris-hackers/idris-array"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/bi.nix b/pkgs/development/idris-modules/bi.nix index 844ce98cd4c33..51f6497e18218 100644 --- a/pkgs/development/idris-modules/bi.nix +++ b/pkgs/development/idris-modules/bi.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "Idris Binary Integer Arithmetic, porting PArith, NArith, and ZArith from Coq"; - homepage = https://github.com/sbp/idris-bi; + homepage = "https://github.com/sbp/idris-bi"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/bifunctors.nix b/pkgs/development/idris-modules/bifunctors.nix index 3a915cd67f41d..15c7a6dd013f2 100644 --- a/pkgs/development/idris-modules/bifunctors.nix +++ b/pkgs/development/idris-modules/bifunctors.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "A small bifunctor library for idris"; - homepage = https://github.com/japesinator/Idris-Bifunctors; + homepage = "https://github.com/japesinator/Idris-Bifunctors"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/bytes.nix b/pkgs/development/idris-modules/bytes.nix index ad63cb28399dc..eaff512d5d397 100644 --- a/pkgs/development/idris-modules/bytes.nix +++ b/pkgs/development/idris-modules/bytes.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "FFI-based byte buffers for Idris"; - homepage = https://github.com/ziman/idris-bytes; + homepage = "https://github.com/ziman/idris-bytes"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/canvas.nix b/pkgs/development/idris-modules/canvas.nix index 0f6e258ee202e..77851c87179b7 100644 --- a/pkgs/development/idris-modules/canvas.nix +++ b/pkgs/development/idris-modules/canvas.nix @@ -17,7 +17,7 @@ build-idris-package { meta = { description = "Idris FFI binding for html5 canvas 2d api"; - homepage = https://github.com/JinWuZhao/idriscanvas; + homepage = "https://github.com/JinWuZhao/idriscanvas"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/categories.nix b/pkgs/development/idris-modules/categories.nix index 91ee174dadffe..adbe6d4f8ad47 100644 --- a/pkgs/development/idris-modules/categories.nix +++ b/pkgs/development/idris-modules/categories.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "Category Theory"; - homepage = https://github.com/danilkolikov/categories; + homepage = "https://github.com/danilkolikov/categories"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/coda.nix b/pkgs/development/idris-modules/coda.nix index c5e33f4594f2c..ecd7af4436898 100644 --- a/pkgs/development/idris-modules/coda.nix +++ b/pkgs/development/idris-modules/coda.nix @@ -17,7 +17,7 @@ build-idris-package { meta = { description = "Some Idris libraries including nodejs bindings and ISO8601 Date and Time"; - homepage = https://github.com/ostera/idris-coda; + homepage = "https://github.com/ostera/idris-coda"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/comonad.nix b/pkgs/development/idris-modules/comonad.nix index a47739d52b1ab..31fd8dbc9aa87 100644 --- a/pkgs/development/idris-modules/comonad.nix +++ b/pkgs/development/idris-modules/comonad.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "Comonads for Idris"; - homepage = https://github.com/vmchale/comonad; + homepage = "https://github.com/vmchale/comonad"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/composition.nix b/pkgs/development/idris-modules/composition.nix index de93d39395bcf..5d6d2f891a63a 100644 --- a/pkgs/development/idris-modules/composition.nix +++ b/pkgs/development/idris-modules/composition.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Composition extras for Idris"; - homepage = https://github.com/vmchale/composition; + homepage = "https://github.com/vmchale/composition"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/config.nix b/pkgs/development/idris-modules/config.nix index 5c37961b7cb34..3771313d17846 100644 --- a/pkgs/development/idris-modules/config.nix +++ b/pkgs/development/idris-modules/config.nix @@ -21,7 +21,7 @@ build-idris-package { meta = { description = "Parsers for various configuration files written in Idris."; - homepage = https://github.com/benclifford/idris-config; + homepage = "https://github.com/benclifford/idris-config"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/console.nix b/pkgs/development/idris-modules/console.nix index 71785483ce66c..e60ac20f4d408 100644 --- a/pkgs/development/idris-modules/console.nix +++ b/pkgs/development/idris-modules/console.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "An Idris library to interact with the browser console"; - homepage = https://github.com/pierrebeaucamp/idris-console; + homepage = "https://github.com/pierrebeaucamp/idris-console"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/containers.nix b/pkgs/development/idris-modules/containers.nix index 2fe783da4486c..e98285ca9306c 100644 --- a/pkgs/development/idris-modules/containers.nix +++ b/pkgs/development/idris-modules/containers.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "Various data structures for use in the Idris Language."; - homepage = https://github.com/jfdm/idris-containers; + homepage = "https://github.com/jfdm/idris-containers"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/cube.nix b/pkgs/development/idris-modules/cube.nix index 7ccda5f21c064..8a0f66829d852 100644 --- a/pkgs/development/idris-modules/cube.nix +++ b/pkgs/development/idris-modules/cube.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "An implementation of the Lambda Cube in Idris"; - homepage = https://github.com/aatxe/cube.idr; + homepage = "https://github.com/aatxe/cube.idr"; license = lib.licenses.agpl3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/data.nix b/pkgs/development/idris-modules/data.nix index 1c515ec39754a..0517edec2d240 100644 --- a/pkgs/development/idris-modules/data.nix +++ b/pkgs/development/idris-modules/data.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Functional data structures in Idris"; - homepage = https://github.com/jdevuyst/idris-data; + homepage = "https://github.com/jdevuyst/idris-data"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/derive.nix b/pkgs/development/idris-modules/derive.nix index 7f3164f3160d0..7ab87d71d063f 100644 --- a/pkgs/development/idris-modules/derive.nix +++ b/pkgs/development/idris-modules/derive.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "Type class deriving with elaboration reflection"; - homepage = https://github.com/davlum/derive-all-the-instances; + homepage = "https://github.com/davlum/derive-all-the-instances"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/descncrunch.nix b/pkgs/development/idris-modules/descncrunch.nix index 8c808447f64c4..95f49a524bc01 100644 --- a/pkgs/development/idris-modules/descncrunch.nix +++ b/pkgs/development/idris-modules/descncrunch.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Descriptions, levitation, and reflecting the elaborator"; - homepage = https://github.com/ahmadsalim/desc-n-crunch; + homepage = "https://github.com/ahmadsalim/desc-n-crunch"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.brainrape ]; broken = true; diff --git a/pkgs/development/idris-modules/dict.nix b/pkgs/development/idris-modules/dict.nix index c17ed9eefa290..24cc7c0359d1a 100644 --- a/pkgs/development/idris-modules/dict.nix +++ b/pkgs/development/idris-modules/dict.nix @@ -22,7 +22,7 @@ build-idris-package { meta = { description = "Dict k v in Idris"; - homepage = https://github.com/be5invis/idris-dict; + homepage = "https://github.com/be5invis/idris-dict"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/dom.nix b/pkgs/development/idris-modules/dom.nix index e215e069609aa..f88827fb2654b 100644 --- a/pkgs/development/idris-modules/dom.nix +++ b/pkgs/development/idris-modules/dom.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "Idris library to interact with the DOM"; - homepage = https://github.com/pierrebeaucamp/idris-dom; + homepage = "https://github.com/pierrebeaucamp/idris-dom"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/electron.nix b/pkgs/development/idris-modules/electron.nix index 8b968c9732abf..172f1980a90b0 100644 --- a/pkgs/development/idris-modules/electron.nix +++ b/pkgs/development/idris-modules/electron.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "Electron bindings for Idris"; - homepage = https://github.com/jheiling/idris-electron; + homepage = "https://github.com/jheiling/idris-electron"; license = lib.licenses.unlicense; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/eternal.nix b/pkgs/development/idris-modules/eternal.nix index 9e0529628fefa..673df485a3801 100644 --- a/pkgs/development/idris-modules/eternal.nix +++ b/pkgs/development/idris-modules/eternal.nix @@ -25,7 +25,7 @@ build-idris-package { meta = { description = "Infix pipe operators and some Nat, Float, String conversions"; - homepage = https://github.com/Heather/Control.Eternal.Idris; + homepage = "https://github.com/Heather/Control.Eternal.Idris"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/farrp.nix b/pkgs/development/idris-modules/farrp.nix index bf0e609a61035..88f852ba20c05 100644 --- a/pkgs/development/idris-modules/farrp.nix +++ b/pkgs/development/idris-modules/farrp.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Arrowized FRP library for Idris with static safety guarantees"; - homepage = https://github.com/lambda-11235/FarRP; + homepage = "https://github.com/lambda-11235/FarRP"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/free.nix b/pkgs/development/idris-modules/free.nix index 06b8ec5e82d2c..6f7a5f56d4f96 100644 --- a/pkgs/development/idris-modules/free.nix +++ b/pkgs/development/idris-modules/free.nix @@ -17,7 +17,7 @@ build-idris-package { meta = { description = "Free Monads and useful constructions to work with them"; - homepage = https://github.com/idris-hackers/idris-free; + homepage = "https://github.com/idris-hackers/idris-free"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/fsm.nix b/pkgs/development/idris-modules/fsm.nix index c6d8d8cf9133b..5da5f01da3483 100644 --- a/pkgs/development/idris-modules/fsm.nix +++ b/pkgs/development/idris-modules/fsm.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "Comonads for Idris"; - homepage = https://github.com/ctford/flying-spaghetti-monster; + homepage = "https://github.com/ctford/flying-spaghetti-monster"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/glfw.nix b/pkgs/development/idris-modules/glfw.nix index 882058bb1856f..da23ae18331c2 100644 --- a/pkgs/development/idris-modules/glfw.nix +++ b/pkgs/development/idris-modules/glfw.nix @@ -27,7 +27,7 @@ build-idris-package { meta = { description = "GLFW bindings for Idris"; - homepage = https://github.com/eckart/glfw-idris; + homepage = "https://github.com/eckart/glfw-idris"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/graphviz.nix b/pkgs/development/idris-modules/graphviz.nix index 47c2ee638c545..650f0e0b99bcd 100644 --- a/pkgs/development/idris-modules/graphviz.nix +++ b/pkgs/development/idris-modules/graphviz.nix @@ -22,7 +22,7 @@ build-idris-package { meta = { description = "Parser and library for graphviz dot files"; - homepage = https://gitlab.com/mgttlinger/idris-graphviz; + homepage = "https://gitlab.com/mgttlinger/idris-graphviz"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/hamt.nix b/pkgs/development/idris-modules/hamt.nix index 79df925323ed3..3c6868fcc5925 100644 --- a/pkgs/development/idris-modules/hamt.nix +++ b/pkgs/development/idris-modules/hamt.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "Idris Hash Array Mapped Trie"; - homepage = https://github.com/bamboo/idris-hamt; + homepage = "https://github.com/bamboo/idris-hamt"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/hezarfen.nix b/pkgs/development/idris-modules/hezarfen.nix index f538cb29850c9..acbc2770ea525 100644 --- a/pkgs/development/idris-modules/hezarfen.nix +++ b/pkgs/development/idris-modules/hezarfen.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "a theorem prover for intuitionistic propositional logic in Idris, with metaprogramming features"; - homepage = https://github.com/joom/hezarfen; + homepage = "https://github.com/joom/hezarfen"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/hrtime.nix b/pkgs/development/idris-modules/hrtime.nix index 9e9736d25661e..7f4d0769cc414 100644 --- a/pkgs/development/idris-modules/hrtime.nix +++ b/pkgs/development/idris-modules/hrtime.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "Idris library for high resolution time"; - homepage = https://github.com/pierrebeaucamp/idris-hrtime; + homepage = "https://github.com/pierrebeaucamp/idris-hrtime"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/html.nix b/pkgs/development/idris-modules/html.nix index a44f0e70252d8..2ab7534936aa8 100644 --- a/pkgs/development/idris-modules/html.nix +++ b/pkgs/development/idris-modules/html.nix @@ -24,7 +24,7 @@ build-idris-package { meta = { description = "Idris library to interact with HTML"; - homepage = https://github.com/pierrebeaucamp/idris-html; + homepage = "https://github.com/pierrebeaucamp/idris-html"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/http.nix b/pkgs/development/idris-modules/http.nix index beec74a2f6576..45e505be056ba 100644 --- a/pkgs/development/idris-modules/http.nix +++ b/pkgs/development/idris-modules/http.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "An HTTP library for idris"; - homepage = https://github.com/uwap/idris-http; + homepage = "https://github.com/uwap/idris-http"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/http4idris.nix b/pkgs/development/idris-modules/http4idris.nix index 80e95745f0332..11e9d62c051e5 100644 --- a/pkgs/development/idris-modules/http4idris.nix +++ b/pkgs/development/idris-modules/http4idris.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "An experimental HTTP framework for Idris"; - homepage = https://github.com/A1kmm/http4idris; + homepage = "https://github.com/A1kmm/http4idris"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/iaia.nix b/pkgs/development/idris-modules/iaia.nix index f317b980d5297..865d533750f99 100644 --- a/pkgs/development/idris-modules/iaia.nix +++ b/pkgs/development/idris-modules/iaia.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Recursion scheme library for Idris"; - homepage = https://github.com/sellout/Iaia; + homepage = "https://github.com/sellout/Iaia"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/idrishighlighter.nix b/pkgs/development/idris-modules/idrishighlighter.nix index 5629221d601b5..6b1ae30ad4039 100644 --- a/pkgs/development/idris-modules/idrishighlighter.nix +++ b/pkgs/development/idris-modules/idrishighlighter.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "Semantic highlighter for Idris code"; - homepage = https://github.com/david-christiansen/idris-code-highlighter; + homepage = "https://github.com/david-christiansen/idris-code-highlighter"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/idrisscript.nix b/pkgs/development/idris-modules/idrisscript.nix index 4365c588769bd..805facda84c60 100644 --- a/pkgs/development/idris-modules/idrisscript.nix +++ b/pkgs/development/idris-modules/idrisscript.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "FFI Bindings to interact with the unsafe world of JavaScript"; - homepage = https://github.com/idris-hackers/IdrisScript; + homepage = "https://github.com/idris-hackers/IdrisScript"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/ipkgparser.nix b/pkgs/development/idris-modules/ipkgparser.nix index 3a4c0954fe814..6bdcd9e9f5576 100644 --- a/pkgs/development/idris-modules/ipkgparser.nix +++ b/pkgs/development/idris-modules/ipkgparser.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "Parser for Idris iPkg files written in Idris using Lightyear"; - homepage = https://github.com/emptyflash/idris-ipkg-parser; + homepage = "https://github.com/emptyflash/idris-ipkg-parser"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/jheiling-extras.nix b/pkgs/development/idris-modules/jheiling-extras.nix index 58f8a13864a46..ae933b264ae41 100644 --- a/pkgs/development/idris-modules/jheiling-extras.nix +++ b/pkgs/development/idris-modules/jheiling-extras.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Some useful functions for Idris"; - homepage = https://github.com/jheiling/idris-extras; + homepage = "https://github.com/jheiling/idris-extras"; license = lib.licenses.unlicense; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/jheiling-js.nix b/pkgs/development/idris-modules/jheiling-js.nix index dae310cda053b..b192e8ff1c0b7 100644 --- a/pkgs/development/idris-modules/jheiling-js.nix +++ b/pkgs/development/idris-modules/jheiling-js.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "Js library for Idris"; - homepage = https://github.com/jheiling/idris-js; + homepage = "https://github.com/jheiling/idris-js"; license = lib.licenses.unlicense; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/js.nix b/pkgs/development/idris-modules/js.nix index 55169caaa1011..61ce415e60563 100644 --- a/pkgs/development/idris-modules/js.nix +++ b/pkgs/development/idris-modules/js.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "Js libraries for idris"; - homepage = https://github.com/rbarreiro/idrisjs; + homepage = "https://github.com/rbarreiro/idrisjs"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/lens.nix b/pkgs/development/idris-modules/lens.nix index 490fd7bd2ed01..e829309fbc018 100644 --- a/pkgs/development/idris-modules/lens.nix +++ b/pkgs/development/idris-modules/lens.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "van Laarhoven lenses for Idris"; - homepage = https://github.com/HuwCampbell/idris-lens; + homepage = "https://github.com/HuwCampbell/idris-lens"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/lightyear.nix b/pkgs/development/idris-modules/lightyear.nix index fd014db30ef74..34c19eea4ac46 100644 --- a/pkgs/development/idris-modules/lightyear.nix +++ b/pkgs/development/idris-modules/lightyear.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Parser combinators for Idris"; - homepage = https://github.com/ziman/lightyear; + homepage = "https://github.com/ziman/lightyear"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ siddharthist brainrape ]; }; diff --git a/pkgs/development/idris-modules/logic.nix b/pkgs/development/idris-modules/logic.nix index 2346c89c48c49..35670462dcf33 100644 --- a/pkgs/development/idris-modules/logic.nix +++ b/pkgs/development/idris-modules/logic.nix @@ -21,7 +21,7 @@ build-idris-package { meta = { description = "Propositional logic tools, inspired by the Coq standard library"; - homepage = https://github.com/yurrriq/idris-logic; + homepage = "https://github.com/yurrriq/idris-logic"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/mapping.nix b/pkgs/development/idris-modules/mapping.nix index a4ac168dc4fb8..6f978fccd5e00 100644 --- a/pkgs/development/idris-modules/mapping.nix +++ b/pkgs/development/idris-modules/mapping.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "Idris mapping library"; - homepage = https://github.com/zaoqi/Mapping.idr; + homepage = "https://github.com/zaoqi/Mapping.idr"; license = lib.licenses.agpl3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/mhd.nix b/pkgs/development/idris-modules/mhd.nix index 197cb1552cbdc..1ef304bbf1c8e 100644 --- a/pkgs/development/idris-modules/mhd.nix +++ b/pkgs/development/idris-modules/mhd.nix @@ -23,7 +23,7 @@ build-idris-package { meta = { description = "A binding of the GNU libmicrohttpd library to the Idris C backend"; - homepage = https://github.com/colin-adams/idris-libmicrohttpd; + homepage = "https://github.com/colin-adams/idris-libmicrohttpd"; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/pacman.nix b/pkgs/development/idris-modules/pacman.nix index 4ebffa3e87c27..cda3662dce279 100644 --- a/pkgs/development/idris-modules/pacman.nix +++ b/pkgs/development/idris-modules/pacman.nix @@ -23,7 +23,7 @@ build-idris-package { meta = { description = "Proof that Idris is pacman complete"; - homepage = https://github.com/jdublu10/pacman; + homepage = "https://github.com/jdublu10/pacman"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/patricia.nix b/pkgs/development/idris-modules/patricia.nix index 5ce9ad7e915d4..586c33837d65e 100644 --- a/pkgs/development/idris-modules/patricia.nix +++ b/pkgs/development/idris-modules/patricia.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Immutable map from integer keys to values based on patricia tree. Basically persistent array."; - homepage = https://github.com/ChShersh/idris-patricia; + homepage = "https://github.com/ChShersh/idris-patricia"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/permutations.nix b/pkgs/development/idris-modules/permutations.nix index 21b81f4a95c57..b11bce39e1eeb 100644 --- a/pkgs/development/idris-modules/permutations.nix +++ b/pkgs/development/idris-modules/permutations.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "Type-safe way of working with permutations in Idris"; - homepage = https://github.com/vmchale/permutations; + homepage = "https://github.com/vmchale/permutations"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/pfds.nix b/pkgs/development/idris-modules/pfds.nix index f9fbd26a0ddb3..d82ec49018565 100644 --- a/pkgs/development/idris-modules/pfds.nix +++ b/pkgs/development/idris-modules/pfds.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Purely functional data structures in Idris"; - homepage = https://github.com/timjb/idris-pfds; + homepage = "https://github.com/timjb/idris-pfds"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/pipes.nix b/pkgs/development/idris-modules/pipes.nix index 0f62d73b9dac4..69b8d721705a6 100644 --- a/pkgs/development/idris-modules/pipes.nix +++ b/pkgs/development/idris-modules/pipes.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "Composable and effectful production, transformation and consumption of streams of data"; - homepage = https://github.com/QuentinDuval/IdrisPipes; + homepage = "https://github.com/QuentinDuval/IdrisPipes"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/posix.nix b/pkgs/development/idris-modules/posix.nix index 194b60bd29834..30bff9eb7e7a9 100644 --- a/pkgs/development/idris-modules/posix.nix +++ b/pkgs/development/idris-modules/posix.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "System POSIX bindings for Idris."; - homepage = https://github.com/idris-hackers/idris-posix; + homepage = "https://github.com/idris-hackers/idris-posix"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/protobuf.nix b/pkgs/development/idris-modules/protobuf.nix index 1c2a58a6b7cbb..ebfc3c275082e 100644 --- a/pkgs/development/idris-modules/protobuf.nix +++ b/pkgs/development/idris-modules/protobuf.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "A partial implementation of Protocol Buffers in Idris"; - homepage = https://github.com/artagnon/idris-protobuf; + homepage = "https://github.com/artagnon/idris-protobuf"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/quantities.nix b/pkgs/development/idris-modules/quantities.nix index 63cc2184504b6..8141465d751bd 100644 --- a/pkgs/development/idris-modules/quantities.nix +++ b/pkgs/development/idris-modules/quantities.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "Type-safe physical computations and unit conversions in Idris"; - homepage = https://github.com/timjb/quantities; + homepage = "https://github.com/timjb/quantities"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ imuli ]; }; diff --git a/pkgs/development/idris-modules/rationals.nix b/pkgs/development/idris-modules/rationals.nix index 7ce290c824ecf..91aa294d1c553 100644 --- a/pkgs/development/idris-modules/rationals.nix +++ b/pkgs/development/idris-modules/rationals.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "An idris rational number type built from paths in the Stern Brocot tree"; - homepage = https://github.com/mcgordonite/idris-binary-rationals; + homepage = "https://github.com/mcgordonite/idris-binary-rationals"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/recursion_schemes.nix b/pkgs/development/idris-modules/recursion_schemes.nix index dab6913ee8bc2..b326113c6351a 100644 --- a/pkgs/development/idris-modules/recursion_schemes.nix +++ b/pkgs/development/idris-modules/recursion_schemes.nix @@ -22,7 +22,7 @@ build-idris-package { meta = { description = "Recursion schemes for Idris"; - homepage = https://github.com/vmchale/recursion_schemes; + homepage = "https://github.com/vmchale/recursion_schemes"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/refined.nix b/pkgs/development/idris-modules/refined.nix index 433fdf6476973..11fd6b782818a 100644 --- a/pkgs/development/idris-modules/refined.nix +++ b/pkgs/development/idris-modules/refined.nix @@ -17,7 +17,7 @@ build-idris-package { meta = { description = "Port of Scala/Haskell Refined library to Idris"; - homepage = https://github.com/janschultecom/idris-refined; + homepage = "https://github.com/janschultecom/idris-refined"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/sdl.nix b/pkgs/development/idris-modules/sdl.nix index 4495e60d6bb6c..105cfdce65b7b 100644 --- a/pkgs/development/idris-modules/sdl.nix +++ b/pkgs/development/idris-modules/sdl.nix @@ -22,7 +22,7 @@ build-idris-package { meta = { description = "SDL-idris framework for Idris"; - homepage = https://github.com/edwinb/SDL-idris; + homepage = "https://github.com/edwinb/SDL-idris"; maintainers = [ lib.maintainers.brainrape ]; # Can't find file sdlrun.o broken = true; diff --git a/pkgs/development/idris-modules/sdl2.nix b/pkgs/development/idris-modules/sdl2.nix index e4a1fbae562c0..606b5a38a5f0f 100644 --- a/pkgs/development/idris-modules/sdl2.nix +++ b/pkgs/development/idris-modules/sdl2.nix @@ -24,12 +24,12 @@ build-idris-package rec { owner = "steshaw"; repo = "idris-sdl2"; rev = version; - sha256 = sha256:1jslnlzyw04dcvcd7xsdjqa7waxzkm5znddv76sv291jc94xhl4a; + sha256 = "sha256:1jslnlzyw04dcvcd7xsdjqa7waxzkm5znddv76sv291jc94xhl4a"; }; meta = { description = "SDL2 binding for Idris"; - homepage = https://github.com/steshaw/idris-sdl2; + homepage = "https://github.com/steshaw/idris-sdl2"; maintainers = with lib.maintainers; [ brainrape steshaw diff --git a/pkgs/development/idris-modules/semidirect.nix b/pkgs/development/idris-modules/semidirect.nix index 8e7428665cd28..30cc144003eee 100644 --- a/pkgs/development/idris-modules/semidirect.nix +++ b/pkgs/development/idris-modules/semidirect.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "Semidirect products in Idris"; - homepage = https://github.com/clayrat/idris-semidirect; + homepage = "https://github.com/clayrat/idris-semidirect"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/setoids.nix b/pkgs/development/idris-modules/setoids.nix index 6db49c3c3c9f9..aa66d84759590 100644 --- a/pkgs/development/idris-modules/setoids.nix +++ b/pkgs/development/idris-modules/setoids.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Idris proofs for extensional equalities"; - homepage = https://github.com/danilkolikov/setoids; + homepage = "https://github.com/danilkolikov/setoids"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/smproc.nix b/pkgs/development/idris-modules/smproc.nix index 97ed06d307ad9..4917f76285550 100644 --- a/pkgs/development/idris-modules/smproc.nix +++ b/pkgs/development/idris-modules/smproc.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Well-typed symmetric-monoidal category of concurrent processes"; - homepage = https://github.com/jameshaydon/smproc; + homepage = "https://github.com/jameshaydon/smproc"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/snippets.nix b/pkgs/development/idris-modules/snippets.nix index 6d752fed0f98a..2d5473545c54d 100644 --- a/pkgs/development/idris-modules/snippets.nix +++ b/pkgs/development/idris-modules/snippets.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "Collection of Idris snippets"; - homepage = https://github.com/palladin/idris-snippets; + homepage = "https://github.com/palladin/idris-snippets"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/software_foundations.nix b/pkgs/development/idris-modules/software_foundations.nix index 577482433029c..0f45da3ed67bb 100644 --- a/pkgs/development/idris-modules/software_foundations.nix +++ b/pkgs/development/idris-modules/software_foundations.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Code for Software Foundations in Idris"; - homepage = https://github.com/idris-hackers/software-foundations; + homepage = "https://github.com/idris-hackers/software-foundations"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/specdris.nix b/pkgs/development/idris-modules/specdris.nix index 06982a0b2bad6..b20902d743285 100644 --- a/pkgs/development/idris-modules/specdris.nix +++ b/pkgs/development/idris-modules/specdris.nix @@ -21,7 +21,7 @@ build-idris-package { meta = { description = "A testing library for Idris"; - homepage = https://github.com/pheymann/specdris; + homepage = "https://github.com/pheymann/specdris"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/idris-modules/tap.nix b/pkgs/development/idris-modules/tap.nix index 98f4b4ea4d63a..9edbbaea359c7 100644 --- a/pkgs/development/idris-modules/tap.nix +++ b/pkgs/development/idris-modules/tap.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "A simple TAP producer and consumer/reporter for Idris"; - homepage = https://github.com/ostera/tap-idris; + homepage = "https://github.com/ostera/tap-idris"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/test.nix b/pkgs/development/idris-modules/test.nix index ccb575e270ccc..073b4e20b8508 100644 --- a/pkgs/development/idris-modules/test.nix +++ b/pkgs/development/idris-modules/test.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "Testing Utilities for Idris programs"; - homepage = https://github.com/jfdm/idris-testing; + homepage = "https://github.com/jfdm/idris-testing"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/tlhydra.nix b/pkgs/development/idris-modules/tlhydra.nix index ffe1e46d86e11..e2c07ac5fb715 100644 --- a/pkgs/development/idris-modules/tlhydra.nix +++ b/pkgs/development/idris-modules/tlhydra.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "Idris parser and serializer/deserealizer for TL language"; - homepage = https://github.com/Termina1/tlhydra; + homepage = "https://github.com/Termina1/tlhydra"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/tomladris.nix b/pkgs/development/idris-modules/tomladris.nix index 402b5a01b7655..64728ab305eca 100644 --- a/pkgs/development/idris-modules/tomladris.nix +++ b/pkgs/development/idris-modules/tomladris.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "TOML parser for Idris"; - homepage = https://github.com/emptyflash/tomladris; + homepage = "https://github.com/emptyflash/tomladris"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ siddharthist brainrape ]; }; diff --git a/pkgs/development/idris-modules/tp.nix b/pkgs/development/idris-modules/tp.nix index 1823e76c290d3..0cfdc78f6673c 100644 --- a/pkgs/development/idris-modules/tp.nix +++ b/pkgs/development/idris-modules/tp.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Strongly Typed Paths for Idris"; - homepage = https://github.com/superfunc/tp; + homepage = "https://github.com/superfunc/tp"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix index 67020898ff3f8..84f88e1598bb6 100644 --- a/pkgs/development/idris-modules/tparsec.nix +++ b/pkgs/development/idris-modules/tparsec.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "TParsec - Total Parser Combinators in Idris"; - homepage = https://github.com/gallais/idris-tparsec; + homepage = "https://github.com/gallais/idris-tparsec"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/transducers.nix b/pkgs/development/idris-modules/transducers.nix index 8f10f9bd247e9..39a4cdf0cc7bb 100644 --- a/pkgs/development/idris-modules/transducers.nix +++ b/pkgs/development/idris-modules/transducers.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "Composable algorithmic transformation"; - homepage = https://github.com/QuentinDuval/IdrisReducers; + homepage = "https://github.com/QuentinDuval/IdrisReducers"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/trees.nix b/pkgs/development/idris-modules/trees.nix index 69042e27d3d5c..8fda8d138ad19 100644 --- a/pkgs/development/idris-modules/trees.nix +++ b/pkgs/development/idris-modules/trees.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "Trees in Idris"; - homepage = https://github.com/clayrat/idris-trees; + homepage = "https://github.com/clayrat/idris-trees"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/union_type.nix b/pkgs/development/idris-modules/union_type.nix index 3a6dced48ceee..2ad8f280fce58 100644 --- a/pkgs/development/idris-modules/union_type.nix +++ b/pkgs/development/idris-modules/union_type.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "UnionType in Idris"; - homepage = https://github.com/berewt/UnionType; + homepage = "https://github.com/berewt/UnionType"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/vdom.nix b/pkgs/development/idris-modules/vdom.nix index f6fdaf7a75e24..3ece0056a3f1e 100644 --- a/pkgs/development/idris-modules/vdom.nix +++ b/pkgs/development/idris-modules/vdom.nix @@ -17,7 +17,7 @@ build-idris-package { meta = { description = "Virtual DOM in pure Idris"; - homepage = https://github.com/brandondyck/idris-vdom; + homepage = "https://github.com/brandondyck/idris-vdom"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/vecspace.nix b/pkgs/development/idris-modules/vecspace.nix index bf7e56cf8c094..2336291338b3d 100644 --- a/pkgs/development/idris-modules/vecspace.nix +++ b/pkgs/development/idris-modules/vecspace.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Abstract vector spaces in Idris"; - homepage = https://github.com/clayrat/idris-vecspace; + homepage = "https://github.com/clayrat/idris-vecspace"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/webgl.nix b/pkgs/development/idris-modules/webgl.nix index ddd0dec03a4ac..271501aa52981 100644 --- a/pkgs/development/idris-modules/webgl.nix +++ b/pkgs/development/idris-modules/webgl.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Idris library to interact with WebGL"; - homepage = https://github.com/pierrebeaucamp/idris-webgl; + homepage = "https://github.com/pierrebeaucamp/idris-webgl"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/wl-pprint.nix b/pkgs/development/idris-modules/wl-pprint.nix index baceb2214e3cc..a368e0582d822 100644 --- a/pkgs/development/idris-modules/wl-pprint.nix +++ b/pkgs/development/idris-modules/wl-pprint.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "Wadler-Leijen pretty-printing library"; - homepage = https://github.com/shayan-najd/wl-pprint; + homepage = "https://github.com/shayan-najd/wl-pprint"; license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/idris-modules/wyvern.nix b/pkgs/development/idris-modules/wyvern.nix index 870bf1a6b9b8e..750b5dd2fd071 100644 --- a/pkgs/development/idris-modules/wyvern.nix +++ b/pkgs/development/idris-modules/wyvern.nix @@ -23,7 +23,7 @@ build-idris-package { meta = { description = "Little web server written in Idris"; - homepage = https://github.com/ericqweinstein/wyvern; + homepage = "https://github.com/ericqweinstein/wyvern"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/xhr.nix b/pkgs/development/idris-modules/xhr.nix index 9e6f40b963ff8..9c198e2893895 100644 --- a/pkgs/development/idris-modules/xhr.nix +++ b/pkgs/development/idris-modules/xhr.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Idris library to interact with xhr"; - homepage = https://github.com/pierrebeaucamp/idris-xhr; + homepage = "https://github.com/pierrebeaucamp/idris-xhr"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/yaml.nix b/pkgs/development/idris-modules/yaml.nix index 61efb8cd575e4..b7fffd3953d67 100644 --- a/pkgs/development/idris-modules/yaml.nix +++ b/pkgs/development/idris-modules/yaml.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "Idris YAML lib"; - homepage = https://github.com/Heather/Idris.Yaml; + homepage = "https://github.com/Heather/Idris.Yaml"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/yampa.nix b/pkgs/development/idris-modules/yampa.nix index ebe92f4689824..33ebacc6d55b5 100644 --- a/pkgs/development/idris-modules/yampa.nix +++ b/pkgs/development/idris-modules/yampa.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "Idris implementation of Yampa FRP library as described in Reactive Programming through Dependent Types"; - homepage = https://github.com/BartAdv/idris-yampa; + homepage = "https://github.com/BartAdv/idris-yampa"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 8d93492209c62..39b243a0ce6a9 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -4,15 +4,15 @@ let hashes = { "8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r"; - "8.2" = "1x33kv6w9cbqzvyrihn61pzmqlvnk3drm8ksd5v0arg38i95awi3"; + "8.3" = "0c0wimaf16nrr3d6cxq6p7nr7rxffvpmn66hkpwc1m6zpcipf0y5"; }; revs = { "8.0" = "8.0"; - "8.2" = "8.2"; + "8.3" = "8.3"; }; in stdenv.mkDerivation rec { pname = "acl2"; - version = "8.2"; + version = "8.3"; src = fetchFromGitHub { owner = "acl2-devel"; @@ -62,8 +62,8 @@ in stdenv.mkDerivation rec { ACL2 have been removed because it is not currently possible to build them with Nix. ''; - homepage = http://www.cs.utexas.edu/users/moore/acl2/; - downloadPage = https://github.com/acl2-devel/acl2-devel/releases; + homepage = "http://www.cs.utexas.edu/users/moore/acl2/"; + downloadPage = "https://github.com/acl2-devel/acl2-devel/releases"; # There are a bunch of licenses in the community books, but since # they currently get deleted during the build, we don't mention # their licenses here. ACL2 proper is released under a BSD @@ -72,6 +72,7 @@ in stdenv.mkDerivation rec { #[ free bsd3 mit gpl2 llgpl21 cc0 publicDomain ]; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ kini raskin ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.all; + broken = stdenv.isAarch64 && stdenv.isLinux; }; } diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 744106bce5d05..bbc38e515424e 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -1,23 +1,27 @@ -{ stdenv, fetchzip, gnugrep }: +{ stdenv, fetchzip, coreutils, gnugrep }: stdenv.mkDerivation rec { pname = "bats"; - version = "1.1.0"; + version = "1.2.0"; src = fetchzip { url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz"; - sha256 = "1kkh0j2alql3xiyhw9wsvcc3xclv52g0ivgyk8h85q9fn3qdqakz"; + sha256 = "0f59zh4d4pa1a7ybs5zl6h0csbqqv11lbnq0jl1dgwm1s6p49bsq"; }; patchPhase = '' patchShebangs ./install.sh - substituteInPlace ./libexec/bats-core/bats-format-tap-stream --replace grep ${gnugrep}/bin/grep + + substituteInPlace ./libexec/bats-core/bats \ + --replace 'type -p greadlink readlink' 'type -p ${coreutils}/bin/readlink' + substituteInPlace ./libexec/bats-core/bats-format-tap-stream \ + --replace grep ${gnugrep}/bin/grep ''; installPhase = "./install.sh $out"; meta = with stdenv.lib; { - homepage = https://github.com/bats-core/bats-core; + homepage = "https://github.com/bats-core/bats-core"; description = "Bash Automated Testing System"; maintainers = [ maintainers.lnl7 ]; license = licenses.mit; diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix index cde9146f78c65..de12185b96f0b 100644 --- a/pkgs/development/interpreters/ceptre/default.nix +++ b/pkgs/development/interpreters/ceptre/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ceptre-2016-11-27"; src = fetchgit { - url = https://github.com/chrisamaphone/interactive-lp; + url = "https://github.com/chrisamaphone/interactive-lp"; rev = "e436fda2ccd44e9c9d226feced9d204311deacf5"; sha256 = "174pxfnw3qyn2w8qxmx45fa68iddf106mkfi0kcmyqxzsc9jprh8"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A linear logic programming language for modeling generative interactive systems"; - homepage = https://github.com/chrisamaphone/interactive-lp; + homepage = "https://github.com/chrisamaphone/interactive-lp"; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; }; diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index 2ad0bc0285e5a..f0de3f6409188 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit name; meta = { - homepage = https://github.com/ashinn/chibi-scheme; + homepage = "https://github.com/ashinn/chibi-scheme"; description = "Small Footprint Scheme for use as a C Extension Language"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix index c70bfd9406e09..cf0710f36a1a9 100644 --- a/pkgs/development/interpreters/clips/default.nix +++ b/pkgs/development/interpreters/clips/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { description = "A Tool for Building Expert Systems"; - homepage = http://www.clipsrules.net/; + homepage = "http://www.clipsrules.net/"; longDescription = '' Developed at NASA's Johnson Space Center from 1985 to 1996, CLIPS is a rule-based programming language useful for creating diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 5dcfa42c92fc8..1b7ff2c8cba32 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { meta = { description = "ANSI Common Lisp Implementation"; - homepage = http://clisp.cons.org; + homepage = "http://clisp.cons.org"; maintainers = with stdenv.lib.maintainers; [raskin tohl]; platforms = stdenv.lib.platforms.unix; # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062 diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix index 550535f30aeed..6898f84669f7e 100644 --- a/pkgs/development/interpreters/clisp/hg.nix +++ b/pkgs/development/interpreters/clisp/hg.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { meta = { description = "ANSI Common Lisp Implementation"; - homepage = http://clisp.cons.org; + homepage = "http://clisp.cons.org"; maintainers = with stdenv.lib.maintainers; [raskin tohl]; # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062 platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index db849bb542de9..c023aa65fdaac 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -1,24 +1,25 @@ -{ stdenv, fetchurl, graalvm8 }: +{ stdenv, fetchurl, graalvm8, glibcLocales }: with stdenv.lib; stdenv.mkDerivation rec { pname = "babashka"; - version = "0.0.78"; + version = "0.0.97"; reflectionJson = fetchurl { name = "reflection.json"; url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json"; - sha256 = "1m1nwdxjsc6bkdzkbsll316ly0c3qxaimjzyfph1220irjxnm7xf"; + sha256 = "1gd9ih9l02n1j9qkbxb36d3cb5sddwvxiw8kkicgc4xig77lsa7z"; }; src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "01w990zk5qjrbnc846snh6na002kdyrlrfnqwg03ibx20g3mr7if"; + sha256 = "08py6bawfrhg90fbcnv2mq4c91g5wa1q2q6zdjy2i1b9q4x1654r"; }; dontUnpack = true; - buildInputs = [ graalvm8 ]; + LC_ALL = "en_US.UTF-8"; + nativeBuildInputs = [ graalvm8 glibcLocales ]; buildPhase = '' native-image \ @@ -40,7 +41,8 @@ stdenv.mkDerivation rec { --no-fallback \ --no-server \ --report-unsupported-elements-at-runtime \ - "-J-Xmx3g" + "--initialize-at-run-time=org.postgresql.sspi.SSPIClient" \ + "-J-Xmx4500m" ''; installPhase = '' @@ -51,14 +53,14 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Clojure babushka for the grey areas of Bash"; longDescription = '' - The main idea behind babashka is to leverage Clojure in places where you + The main idea behind babashka is to leverage Clojure in places where you would be using bash otherwise. As one user described it: - I’m quite at home in Bash most of the time, but there’s a substantial - grey area of things that are too complicated to be simple in bash, but - too simple to be worth writing a clj/s script for. Babashka really + I’m quite at home in Bash most of the time, but there’s a substantial + grey area of things that are too complicated to be simple in bash, but + too simple to be worth writing a clj/s script for. Babashka really seems to hit the sweet spot for those cases. Goals: @@ -67,7 +69,7 @@ stdenv.mkDerivation rec { - Easy installation: grab the self-contained binary and run. No JVM needed. - Familiarity and portability: - Scripts should be compatible with JVM Clojure as much as possible - - Scripts should be platform-independent as much as possible. Babashka + - Scripts should be platform-independent as much as possible. Babashka offers support for linux, macOS and Windows. - Allow interop with commonly used classes like java.io.File and System - Multi-threading support (pmap, future, core.async) @@ -77,6 +79,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/borkdude/babashka"; license = licenses.epl10; platforms = graalvm8.meta.platforms; - maintainers = with maintainers; [ bhougland DerGuteMoritz jlesquembre ]; + maintainers = with maintainers; [ bandresen bhougland DerGuteMoritz jlesquembre ]; }; } diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index 369d84708dc4f..d51fa76003b23 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "A lightweight IDE for Clojure"; - homepage = https://github.com/arthuredelstein/clooj; + homepage = "https://github.com/arthuredelstein/clooj"; license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 01fba17f104fb..e8c3e7b098ab7 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "A Lisp dialect for the JVM"; - homepage = https://clojure.org/; + homepage = "https://clojure.org/"; license = licenses.epl10; longDescription = '' Clojure is a dynamic programming language that targets the Java diff --git a/pkgs/development/interpreters/clojurescript/lumo/package.json b/pkgs/development/interpreters/clojurescript/lumo/package.json index 6ab3f9616c781..acfd5c4ed498d 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/package.json +++ b/pkgs/development/interpreters/clojurescript/lumo/package.json @@ -27,7 +27,7 @@ "glob": "^7.1.3", "gunzip-maybe": "^1.4.1", "insert-module-globals": "^7.2.0", - "jszip": "github:anmonteiro/jszip#patch-1", + "jszip": "2.x", "mkdirp": "^1.0.3", "ncp": "^2.0.0", "node-fetch": "^2.2.1", diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index cff1885e2798b..050e7f14979cd 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, version ? "2.7.1" }: +{ stdenv, fetchurl, unzip, version ? "2.7.2" }: let @@ -24,29 +24,29 @@ let url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; sha256 = "1p5bn04gr91chcszgmw5ng8mlzgwsrdr2v7k7ppwr1slkx97fsrh"; }; - "2.7.1-x86_64-linux" = fetchurl { + "2.7.2-x86_64-linux" = fetchurl { url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "1zjd9hxxg1dsyzkzgqjvl933kprf8h143z5qi4mj1iczxv7zp27a"; + sha256 = "0vvsgda1smqdjn35yiq9pxx8f5haxb4hqnspcsfs6sn5c36k854v"; }; - "2.7.1-i686-linux" = fetchurl { + "2.7.2-i686-linux" = fetchurl { url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "0cggr1jbhzahmazlhba0vw2chz9zxd98jgk6zxvxdnw5hvkx8si1"; + sha256 = "0dj01d2wwrp3cc5x73vs6fzhs6db60gkbjlrw3w9j04wcx69i38m"; }; - "2.7.1-aarch64-linux" = fetchurl { + "2.7.2-aarch64-linux" = fetchurl { url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "0m4qlc3zy87habr61npykvpclggn5k4hadl59v2b0ymvxa4h5zfh"; + sha256 = "1p66fkdh1kv0ypmadmg67c3y3li3aaf1lahqh2g6r6qrzbh5da2p"; }; - "2.8.0-dev.10.0-x86_64-linux" = fetchurl { + "2.9.0-4.0.dev-x86_64-linux" = fetchurl { url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "17x0q94zampm99dd2sn6q1644lfwcl0ig2rdlmfzd9i4llj2ddbl"; + sha256 = "16d9842fb3qbc0hy0zmimav9zndfkq96glgykj20xssc88qpjk2r"; }; - "2.8.0-dev.10.0-i686-linux" = fetchurl { + "2.9.0-4.0.dev-i686-linux" = fetchurl { url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "0hmkg4jrffzh8x2mxn8nbf7dl7k0v2vacbmxgpsl382vw9wwj96j"; + sha256 = "105wgyxmi491c7qw0z3zhn4lv52h80ngyz4ch9dyj0sq8nndz2rc"; }; - "2.8.0-dev.10.0-aarch64-linux" = fetchurl { + "2.9.0-4.0.dev-aarch64-linux" = fetchurl { url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "185ipcmr9h76g44kzlj5pyj99cljlap82rhd1c2larfklyj5ryvv"; + sha256 = "1x6mlmc4hccmx42k7srhma18faxpxvghjwqahna80508rdpljwgc"; }; }; @@ -79,7 +79,7 @@ stdenv.mkDerivation { dontStrip = true; meta = { - homepage = https://www.dartlang.org/; + homepage = "https://www.dartlang.org/"; maintainers = with maintainers; [ grburst ]; description = "Scalable programming language, with robust libraries and runtimes, for building web, server, and mobile apps"; longDescription = '' diff --git a/pkgs/development/interpreters/dhall/build-dhall-package.nix b/pkgs/development/interpreters/dhall/build-dhall-package.nix index 739dc9b3d52ec..9303244eb8857 100644 --- a/pkgs/development/interpreters/dhall/build-dhall-package.nix +++ b/pkgs/development/interpreters/dhall/build-dhall-package.nix @@ -1,4 +1,4 @@ -{ haskell, haskellPackages, lib, lndir, runCommand, writeText }: +{ dhall, haskell, lib, lndir, runCommand, writeText }: { name @@ -34,18 +34,9 @@ }: let - # `buildDhallPackage` requires version 1.25.0 or newer of the Haskell - # interpreter for Dhall. Given that the default version is 1.24.0 we choose - # the latest available version instead until the default is upgraded. - # # HTTP support is disabled in order to force that HTTP dependencies are built # using Nix instead of using Dhall's support for HTTP imports. - dhall = - haskell.lib.justStaticExecutables - (haskell.lib.appendConfigureFlag - haskellPackages.dhall_1_29_0 - "-f-with-http" - ); + dhallNoHTTP = haskell.lib.appendConfigureFlag dhall "-f-with-http"; file = writeText "${name}.dhall" code; @@ -69,13 +60,13 @@ in mkdir -p $out/${cacheDhall} - ${dhall}/bin/dhall --alpha --file '${file}' > $out/${sourceFile} + ${dhallNoHTTP}/bin/dhall --alpha --file '${file}' > $out/${sourceFile} - SHA_HASH=$(${dhall}/bin/dhall hash <<< $out/${sourceFile}) + SHA_HASH=$(${dhallNoHTTP}/bin/dhall hash <<< $out/${sourceFile}) HASH_FILE="''${SHA_HASH/sha256:/1220}" - ${dhall}/bin/dhall encode --file $out/${sourceFile} > $out/${cacheDhall}/$HASH_FILE + ${dhallNoHTTP}/bin/dhall encode --file $out/${sourceFile} > $out/${cacheDhall}/$HASH_FILE echo "missing $SHA_HASH" > $out/binary.dhall diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix index 369c3840b8749..53cbbad8e553f 100644 --- a/pkgs/development/interpreters/duktape/default.nix +++ b/pkgs/development/interpreters/duktape/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An embeddable Javascript engine, with a focus on portability and compact footprint"; - homepage = https://duktape.org/; - downloadPage = https://duktape.org/download.html; + homepage = "https://duktape.org/"; + downloadPage = "https://duktape.org/download.html"; license = licenses.mit; maintainers = [ maintainers.fgaz ]; platforms = platforms.linux; diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix index 9da2b0d899d7d..c848ebc604793 100644 --- a/pkgs/development/interpreters/eff/default.nix +++ b/pkgs/development/interpreters/eff/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { checkTarget = "test"; meta = with stdenv.lib; { - homepage = https://www.eff-lang.org; + homepage = "https://www.eff-lang.org"; description = "A functional programming language based on algebraic effects and their handlers"; longDescription = '' Eff is a functional language with handlers of not only exceptions, diff --git a/pkgs/development/interpreters/elixir/1.10.nix b/pkgs/development/interpreters/elixir/1.10.nix index afab770da3531..d63a94d98d6d8 100644 --- a/pkgs/development/interpreters/elixir/1.10.nix +++ b/pkgs/development/interpreters/elixir/1.10.nix @@ -3,7 +3,7 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz mkDerivation { - version = "1.10.2"; - sha256 = "04yi1hljq7ii9flh6pmb5411z7q1bdq9f9sq8323k9hm1f5jwkx6"; + version = "1.10.3"; + sha256 = "18bqqqzvhr1zj491wc3d36a310mg1wcs12npp70zfmgqrc60q65a"; minimumOTPVersion = "21"; } diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 571f39203f8f4..54b046beaab20 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -60,7 +60,7 @@ in pos = builtins.unsafeGetAttrPos "sha256" args; meta = with stdenv.lib; { - homepage = https://elixir-lang.org/; + homepage = "https://elixir-lang.org/"; description = "A functional, meta-programming aware language built on top of the Erlang VM"; longDescription = '' @@ -73,6 +73,6 @@ in license = licenses.epl10; platforms = platforms.unix; - maintainers = with maintainers; [ the-kenny havvy couchemar ankhers filalex77 ]; + maintainers = with maintainers; [ havvy couchemar ankhers filalex77 ]; }; }) diff --git a/pkgs/development/interpreters/erlang/R16B02-basho.nix b/pkgs/development/interpreters/erlang/R16B02-basho.nix index 11637868ed0f4..c94528e674f43 100644 --- a/pkgs/development/interpreters/erlang/R16B02-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-basho.nix @@ -42,7 +42,7 @@ mkDerivation { ''; meta = { - homepage = https://github.com/basho/otp/; + homepage = "https://github.com/basho/otp/"; description = "Programming language used for massively scalable soft real-time systems, Basho fork"; longDescription = '' diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index c0203e5915f7e..f80e1f344f7f2 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -108,7 +108,7 @@ in stdenv.mkDerivation ({ setupHook = ./setup-hook.sh; meta = with stdenv.lib; ({ - homepage = https://www.erlang.org/; + homepage = "https://www.erlang.org/"; downloadPage = "https://www.erlang.org/download.html"; description = "Programming language used for massively scalable soft real-time systems"; @@ -122,7 +122,7 @@ in stdenv.mkDerivation ({ ''; platforms = platforms.unix; - maintainers = with maintainers; [ the-kenny sjmackenzie couchemar gleber ]; + maintainers = with maintainers; [ sjmackenzie couchemar gleber ]; license = licenses.asl20; } // meta); } diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index fa8050a21ff0f..4430298beb5f7 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; - rev = "239e431c58d04c641da22af791e4d3e1b894365e"; - sha256 = "0vkcis06gwsqfwvrl8xcf74mfcs6j77b9fhcz5rrh77mwl7ixsdc"; + rev = "582ce09f216d4812f7d152f6eedf0b034fc4dbbd"; + sha256 = "12hlqgh74z8vmd7fkxh4vk3dqp8hlhzkxnbyywk6nphi562n6w5w"; }; - cargoSha256 = "0pamwqhw3sj4anqc1112l5cayhqzibdhqjc28apfrkf2m63cclzi"; + cargoSha256 = "0yr8vwlpfsg47sg0032yrsdcgxyky0hy4963zkh0pmjykbyqkb3h"; nativeBuildInputs = [ pkgconfig makeWrapper cmake ]; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index 9b38d1e4ad541..26a30ef2cd3c1 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "R7RS Scheme scripting engine"; - homepage = https://practical-scheme.net/gauche/; + homepage = "https://practical-scheme.net/gauche/"; maintainers = with maintainers; [ mnacamura ]; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index c2a3556cfea25..f01cfc2444bc7 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free interpreter for the APL programming language"; - homepage = https://www.gnu.org/software/apl/; + homepage = "https://www.gnu.org/software/apl/"; license = licenses.gpl3Plus; maintainers = [ maintainers.kovirobi ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index 158987d4e0efc..6057480476f28 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "Embeddable Scheme implementation"; - homepage = https://www.gnu.org/software/guile/; + homepage = "https://www.gnu.org/software/guile/"; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index af71d5cc80d7b..b5b83e180254a 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -101,7 +101,7 @@ meta = { description = "Embeddable Scheme implementation"; - homepage = https://www.gnu.org/software/guile/; + homepage = "https://www.gnu.org/software/guile/"; license = stdenv.lib.licenses.lgpl3Plus; maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/development/interpreters/hugs/default.nix index 2177ae22db56d..35463b161572b 100644 --- a/pkgs/development/interpreters/hugs/default.nix +++ b/pkgs/development/interpreters/hugs/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { name = "hugs98-200609"; src = fetchurl { - url = http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz; + url = "http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz"; sha256 = "1dj65c39zpy6qqvvrwns2hzj6ipnd4ih655xj7kgyk2nfdvd5x1w"; }; patches = [ (fetchurl { - url = https://aur.archlinux.org/cgit/aur.git/plain/hsbase_inline.patch?h=hugs; + url = "https://aur.archlinux.org/cgit/aur.git/plain/hsbase_inline.patch?h=hugs"; name = "hsbase_inline.patch"; sha256 = "1h0sp16d17hlm6gj7zdbgwrjwi2l4q02m8p0wd60dp4gn9i9js0v"; }) @@ -40,7 +40,7 @@ stdenv.mkDerivation { ]; meta = with stdenv.lib; { - homepage = https://www.haskell.org/hugs; + homepage = "https://www.haskell.org/hugs"; description = "Haskell interpreter"; maintainers = with maintainers; [ joachifm ]; license = licenses.bsd3; diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix index 5816b3a175c6e..a3aca532b0f3e 100644 --- a/pkgs/development/interpreters/hy/default.nix +++ b/pkgs/development/interpreters/hy/default.nix @@ -1,23 +1,32 @@ -{ stdenv, fetchurl, python2Packages }: +{ stdenv, python3Packages }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "hy"; - version = "0.17.0"; + version = "0.18.0"; - src = python2Packages.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1gdbqsirsdxj320wnp7my5awzs1kfs6m4fqmkzbd1zd47qzj0zfi"; + sha256 = "04dfwm336gw61fmgwikvh0cnxk682p19b4w555wl5d7mlym4rwj2"; }; - propagatedBuildInputs = with python2Packages; [ + checkInputs = with python3Packages; [ flake8 pytest ]; + + propagatedBuildInputs = with python3Packages; [ appdirs astor clint + colorama fastentrypoints funcparserlib rply + pygments ]; + # Hy does not include tests in the source distribution from PyPI, so only test executable. + checkPhase = '' + $out/bin/hy --help > /dev/null + ''; + meta = with stdenv.lib; { description = "A LISP dialect embedded in Python"; homepage = "http://hylang.org/"; diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index d243ae9bc5802..d85448a9677c0 100644 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ b/pkgs/development/interpreters/icon-lang/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ vrthra yurrriq ]; platforms = with platforms; linux ++ darwin; license = licenses.publicDomain; - homepage = https://www.cs.arizona.edu/icon/; + homepage = "https://www.cs.arizona.edu/icon/"; }; } diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index f763274c15d74..42af3cc427b40 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Io programming language"; - homepage = http://iolanguage.org/; + homepage = "http://iolanguage.org/"; license = licenses.bsd3; maintainers = with maintainers; [ diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index 791ac6dd3381d..8e6b434281eb1 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchFromGitHub, readline, libedit, bc }: +{ stdenv, fetchFromGitHub, readline, libedit, bc +, avxSupport ? false +}: stdenv.mkDerivation rec { pname = "j"; - version = "807"; - jtype = "release"; + version = "901"; + jtype = "release-e"; src = fetchFromGitHub { owner = "jsoftware"; repo = "jsource"; rev = "j${version}-${jtype}"; - sha256 = "1qciw2yg9x996zglvj2461qby038x89xcmfb3qyrh3myn8m1nq2n"; + sha256 = "13ky37rrl6mc66fckrdnrw64gmvq1qlv6skzd513lab4d0wigshw"; + name = "jsource"; }; buildInputs = [ readline libedit bc ]; @@ -18,6 +21,9 @@ stdenv.mkDerivation rec { if stdenv.isLinux then "linux" else if stdenv.isDarwin then "darwin" else "unknown"; + variant = if stdenv.isx86_64 && avxSupport then "avx" else ""; + + j64x="j${bits}${variant}"; doCheck = true; @@ -26,57 +32,33 @@ stdenv.mkDerivation rec { export HOME=$TMPDIR export JLIB=$SOURCE_DIR/jlibrary - export jbld=$HOME/bld - export jplatform=${platform} - export jmake=$SOURCE_DIR/make - export jgit=$SOURCE_DIR - export JBIN=$jbld/j${bits}/bin - mkdir -p $JBIN - echo $OUT_DIR - cd make + cd make2 patchShebangs . - sed -i jvars.sh -e " - s@~/git/jsource@$SOURCE_DIR@; - s@~/jbld@$HOME@; - " - sed -i $JLIB/bin/profile.ijs -e "s@'/usr/share/j/.*'@'$out/share/j'@;" - # For future versions, watch - # https://github.com/jsoftware/jsource/pull/4 - cp ./jvars.sh $HOME + j64x="${j64x}" ./build_all.sh - echo ' - #define jversion "${version}" - #define jplatform "${platform}" - #define jtype "${jtype}" // release,beta,... - #define jlicense "GPL3" - #define jbuilder "nixpkgs" // website or email - ' > ../jsrc/jversion.h - - ./build_jconsole.sh j${bits} - ./build_libj.sh j${bits} + cp $SOURCE_DIR/bin/${platform}/j${bits}*/* "$JLIB/bin" ''; checkPhase = '' - echo 'i. 5' | $JBIN/jconsole | fgrep "0 1 2 3 4" + + echo 'i. 5' | $JLIB/bin/jconsole | fgrep "0 1 2 3 4" # Now run the real tests cd $SOURCE_DIR/test for f in *.ijs do echo $f - $JBIN/jconsole < $f > /dev/null || echo FAIL && echo PASS + $JLIB/bin/jconsole < $f > /dev/null || echo FAIL && echo PASS done ''; installPhase = '' mkdir -p "$out" - cp -r $JBIN "$out/bin" - rm $out/bin/*.txt # Remove logs from the bin folder mkdir -p "$out/share/j" cp -r $JLIB/{addons,system} "$out/share/j" @@ -88,6 +70,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin synthetica ]; platforms = with platforms; linux ++ darwin; license = licenses.gpl3Plus; - homepage = http://jsoftware.com/; + homepage = "http://jsoftware.com/"; }; } diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 828cf3a724429..f6f4e36532ec8 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.8.1"; + version = "1.9.1"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "1v2kgbx6w1ii83a1c9ridm1i52rmcjb0g1d23fhqn7hya5bwrhr6"; + sha256 = "1zdiwddnppwg5zrizy2ypd449zj4mivib76h73xhvr1syl7dk7sc"; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/interpreters/jelly/default.nix b/pkgs/development/interpreters/jelly/default.nix new file mode 100644 index 0000000000000..a317f35d2a787 --- /dev/null +++ b/pkgs/development/interpreters/jelly/default.nix @@ -0,0 +1,28 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication { + pname = "jelly"; + version = "0.1.31"; + + src = fetchFromGitHub { + owner = "DennisMitchell"; + repo = "jellylanguage"; + rev = "70c9fd93ab009c05dc396f8cc091f72b212fb188"; + sha256 = "1rpclqagvigp5qhvgnjavvy463f1drshnc1mfxm6z7ygzs0l0yz6"; + }; + + propagatedBuildInputs = [ python3Packages.sympy ]; + + # checks are disabled because jelly has no tests, and the default is to run + # the output binary with no arguments, which exits with status 1 and causes + # the build to fail + doCheck = false; + + meta = with lib; { + description = "A recreational programming language inspired by J"; + homepage = https://github.com/DennisMitchell/jellylanguage; + license = licenses.mit; + maintainers = [ maintainers.tckmn ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index b176c55cbfd12..789816c34d040 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "joker"; - version = "0.15.0"; + version = "0.15.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "03lbvxmkn0rr7yv7kj6c4dh4zayiwbhrkqbz2m22dw568rjbp8az"; + sha256 = "1pxj6flyhf522zjab1dfvxfajyx3v3rzs7l8ma7ma6b8zmwp2wdn"; }; - modSha256 = "1mylgim9nm0v5wybgzi74nqzmvzwzws0027wzl86dbj5id83ab9v"; + vendorSha256 = "1rn8ijq3v3fzlbyvm7g4i3qpwcl3vrl4rbcvlbzv05wxrgcw9iqb"; preBuild = '' go generate ./... @@ -26,4 +26,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ andrestylianos ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index 9b7f36f4c8749..041616cc1f637 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An interpreter of K, APL-like programming language"; - homepage = https://github.com/kevinlawler/kona/; + homepage = "https://github.com/kevinlawler/kona/"; maintainers = with maintainers; [ raskin ]; platforms = platforms.all; license = licenses.isc; diff --git a/pkgs/development/interpreters/lolcode/default.nix b/pkgs/development/interpreters/lolcode/default.nix index 3ef239e89a9a1..bd4b93b835fc6 100644 --- a/pkgs/development/interpreters/lolcode/default.nix +++ b/pkgs/development/interpreters/lolcode/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { postInstall = "mv $out/bin/lci $out/bin/lolcode-lci"; meta = { - homepage = http://lolcode.org; + homepage = "http://lolcode.org"; description = "An esoteric programming language"; longDescription = '' LOLCODE is a funny esoteric programming language, a bit Pascal-like, diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index e1ca3ded20833..dbe3f6fa2df09 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 meta = { - homepage = http://love2d.org; + homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; license = stdenv.lib.licenses.zlib; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix index 3bf8aee0d07b2..6f09c0764412d 100644 --- a/pkgs/development/interpreters/love/0.7.nix +++ b/pkgs/development/interpreters/love/0.7.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://love2d.org; + homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; license = stdenv.lib.licenses.zlib; diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix index a2182f4543616..79b83f0643f15 100644 --- a/pkgs/development/interpreters/love/0.9.nix +++ b/pkgs/development/interpreters/love/0.9.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 meta = { - homepage = http://love2d.org; + homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; license = stdenv.lib.licenses.zlib; diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix index 3629345baf6ae..2ef3a4ca05a43 100644 --- a/pkgs/development/interpreters/love/11.1.nix +++ b/pkgs/development/interpreters/love/11.1.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 meta = { - homepage = http://love2d.org; + homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; license = stdenv.lib.licenses.zlib; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix index 64050ea95f877..a3e633bbab17b 100644 --- a/pkgs/development/interpreters/lua-5/filesystem.nix +++ b/pkgs/development/interpreters/lua-5/filesystem.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/keplerproject/luafilesystem; + homepage = "https://github.com/keplerproject/luafilesystem"; hydraPlatforms = stdenv.lib.platforms.linux; maintainers = [ ]; }; diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 6fc2e53b96177..98e4684e0921e 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -97,7 +97,7 @@ self = stdenv.mkDerivation rec { }; meta = { - homepage = http://www.lua.org; + homepage = "http://www.lua.org"; description = "Powerful, fast, lightweight, embeddable scripting language"; longDescription = '' Lua combines simple procedural syntax with powerful data diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix index f0eb1becc5783..73fbbc3e66a6e 100644 --- a/pkgs/development/interpreters/lua-5/sockets.nix +++ b/pkgs/development/interpreters/lua-5/sockets.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ lua5 ]; meta = { - homepage = http://w3.impa.br/~diego/software/luasocket/; + homepage = "http://w3.impa.br/~diego/software/luasocket/"; hydraPlatforms = stdenv.lib.platforms.linux; maintainers = [ ]; }; diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index 7db3830447f75..3f0fa7303ebbb 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,9 +1,10 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; - version = "2.0.5"; + version = "2.0.5-2020-03-20"; + rev = "e613105"; isStable = true; - sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7"; + sha256 = "0k843z90s4hi0qhri6ixy8sv21nig8jwbznpqgqg845ji530kqj7"; extraMeta = { # this isn't precise but it at least stops the useless Hydra build platforms = with lib; filter (p: p != "aarch64-linux") (platforms.linux ++ platforms.darwin); diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index e8f1b8b338c49..b5a7894e98d9e 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,7 +1,8 @@ { self, callPackage }: callPackage ./default.nix { inherit self; - version = "2.1.0-beta3"; + version = "2.1.0-2020-03-20"; + rev = "9143e86"; isStable = false; - sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs"; + sha256 = "1zw1yr0375d6jr5x20zvkvk76hkaqamjynbswpl604w6r6id070b"; } diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 08c0564847c58..9bc76c44937f3 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, buildPackages +{ stdenv, fetchFromGitHub, buildPackages , name ? "luajit-${version}" , isStable , sha256 +, rev , version , extraMeta ? {} , callPackage @@ -10,6 +11,7 @@ , enableFFI ? true , enableJIT ? true , enableJITDebugModule ? enableJIT +, enableGC64 ? stdenv.hostPlatform.isAarch64 , enable52Compat ? false , enableValgrindSupport ? false , valgrind ? null @@ -28,6 +30,7 @@ let optional (!enableFFI) "-DLUAJIT_DISABLE_FFI" ++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT" ++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT" + ++ optional (!enableGC64) "-DLUAJIT_DISABLE_GC64" ++ optional useSystemMalloc "-DLUAJIT_USE_SYSMALLOC" ++ optional enableValgrindSupport "-DLUAJIT_USE_VALGRIND" ++ optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT" @@ -37,9 +40,10 @@ let in stdenv.mkDerivation rec { inherit name version; - src = fetchurl { - url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; - inherit sha256; + src = fetchFromGitHub { + owner = "LuaJIT"; + repo = "LuaJIT"; + inherit sha256 rev; }; luaversion = "5.1"; @@ -97,7 +101,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High-performance JIT compiler for Lua 5.1"; - homepage = http://luajit.org; + homepage = "http://luajit.org"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ thoughtpolice smironov vcunat andir ]; diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index 721cfe3886558..e4e984fc4ac61 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { enableParallelBuilding = false; meta = { - homepage = http://maude.cs.illinois.edu/; + homepage = "http://maude.cs.illinois.edu/"; description = "High-level specification language"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index 42b95f341ba97..66352cfdda4b1 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -2,23 +2,17 @@ stdenv.mkDerivation { pname = "metamath"; - version = "0.181"; + version = "0.182"; buildInputs = [ autoreconfHook ]; src = fetchFromGitHub { owner = "metamath"; repo = "metamath-exe"; - rev = "67cbfa8468deb6f8ad5bedafc6399bee59064764"; - sha256 = "1mk3g41qz26j38j68i9qmnl8khkd8jwrzj4vxkb855h4b819s000"; + rev = "5df616efe4119ff88daf77e7041d45b6fa39c578"; + sha256 = "0amjdgy42c7jypf6sz98iczlxcyl9bqx67ws1q8w2zdqk2izsyjp"; }; - # the files necessary to build the DATA target are not in this distribution - # luckily, they're not really needed so we don't build it. - makeFlags = [ "DATA=" ]; - - installTargets = [ "install-exec" ]; - meta = with stdenv.lib; { description = "Interpreter for the metamath proof language"; longDescription = '' @@ -27,7 +21,7 @@ stdenv.mkDerivation { in the Metamath Proof Explorer, and it generated its web pages. The *.mm ASCII databases (set.mm and others) are also included in this derivation. ''; - homepage = http://us.metamath.org; + homepage = "http://us.metamath.org"; downloadPage = "http://us.metamath.org/#downloads"; license = licenses.gpl2; maintainers = [ maintainers.taneb ]; diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index aef23ad6881dc..692aed3e4ee6a 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mujs"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { url = "https://mujs.com/downloads/mujs-${version}.tar.xz"; - sha256 = "1q9w2dcspfp580pzx7sw7x9gbn8j0ak6dvj75wd1ml3f3q3i43df"; + sha256 = "1ilhay15z4k7mlzs6g2d00snivin7vp72dfw5wwpmc0x70jr31l2"; }; buildInputs = [ readline ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = https://mujs.com/; + homepage = "https://mujs.com/"; description = "A lightweight, embeddable Javascript interpreter"; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index bde2f5d9fa968..0c976f2f0b058 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { meta = { description = "Run programs defined in nix expressions"; - homepage = https://github.com/shlevy/nix-exec; + homepage = "https://github.com/shlevy/nix-exec"; license = stdenv.lib.licenses.mit; platforms = nix.meta.platforms; broken = true; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 4a63d1862014c..06d69ed8117f7 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -21,7 +21,7 @@ , zlib , curl , qrupdate -, openblas +, blas, lapack , arpack , libwebp , gl2ps @@ -53,17 +53,7 @@ , darwin }: -let - suitesparseOrig = suitesparse; - qrupdateOrig = qrupdate; -in -# integer width is determined by openblas, so all dependencies must be built -# with exactly the same openblas -let - suitesparse = - if suitesparseOrig != null then suitesparseOrig.override { inherit openblas; } else null; - qrupdate = if qrupdateOrig != null then qrupdateOrig.override { inherit openblas; } else null; -in +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { version = "5.2.0"; @@ -85,7 +75,8 @@ stdenv.mkDerivation rec { fltk zlib curl - openblas + blas + lapack libsndfile fftw fftwSinglePrec @@ -134,15 +125,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # See https://savannah.gnu.org/bugs/?50339 - F77_INTEGER_8_FLAG = if openblas.blas64 then "-fdefault-integer-8" else ""; + F77_INTEGER_8_FLAG = if blas.isILP64 then "-fdefault-integer-8" else ""; configureFlags = [ - "--with-blas=openblas" - "--with-lapack=openblas" + "--with-blas=blas" + "--with-lapack=lapack" + (if blas.isILP64 then "--enable-64" else "--disable-64") ] ++ (if stdenv.isDarwin then [ "--enable-link-all-dependencies" ] else [ ]) ++ stdenv.lib.optionals enableReadline [ "--enable-readline" ] - ++ stdenv.lib.optionals openblas.blas64 [ "--enable-64" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "--with-x=no" ] ++ stdenv.lib.optionals enableQt [ "--with-qt=5" ] ++ stdenv.lib.optionals enableJIT [ "--enable-jit" ] diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 8f8b63a261e5c..cc43a7d2f858c 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -162,7 +162,7 @@ let ''; # */ meta = { - homepage = https://www.perl.org/; + homepage = "https://www.perl.org/"; description = "The standard implementation of the Perl 5 programmming language"; license = licenses.artistic1; maintainers = [ maintainers.eelco ]; @@ -170,11 +170,11 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "ba90816ef2c24dc06fd6cd2c854abcfa1aae00a3"; # Nov 22, 2019 + crossVersion = "1.3.2"; # Mar 21, 2020 perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "19jq5fz6l64s0v6j64n5mkk5v2srpyfn9sc09hwbpkp9n74q82j4"; + sha256 = "1283crdjsyi45mgdiak4jmy907mqn09frxzxp21b18hvxmfn4smq"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -202,15 +202,15 @@ in { perl530 = common { perl = pkgs.perl530; buildPerl = buildPackages.perl530; - version = "5.30.1"; - sha256 = "0r7r8a7pkgxp3w5lza559ahxczw6hzpwvhkpc4c99vpi3xbjagdz"; + version = "5.30.2"; + sha256 = "128nfdxcvxfn5kq55qcfrx2851ys8hv794dcdxbyny8rm7w7vnv6"; }; # the latest Devel version perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.31.6"; - sha256 = "08n3c8xm1brxpckqy8i1xgjrpl4afrhcva9bhxswr938n675x71k"; + version = "5.31.10"; + sha256 = "1gvv5zs54gzb947x7ryjkaalm9rbqf8l8hwjwdm9lbfgkpg07kny"; }; } diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 1d6576b383cdf..4b112de1f0e7c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -1,250 +1,282 @@ # We have tests for PCRE and PHP-FPM in nixos/tests/php/ or # both in the same attribute named nixosTests.php -{ callPackage, config, fetchurl, lib, makeWrapper, stdenv, symlinkJoin -, writeText , autoconf, automake, bison, flex, libtool, pkgconfig, re2c -, apacheHttpd, libargon2, libxml2, pcre, pcre2 , systemd, valgrind -}: +{ callPackage, lib, stdenv, nixosTests }@_args: let generic = - { version - , sha256 - , extraPatches ? [] - - # Sapi flags - , cgiSupport ? config.php.cgi or true - , cliSupport ? config.php.cli or true - , fpmSupport ? config.php.fpm or true - , pearSupport ? config.php.pear or true - , pharSupport ? config.php.phar or true - , phpdbgSupport ? config.php.phpdbg or true - - - # Misc flags - , apxs2Support ? config.php.apxs2 or (!stdenv.isDarwin) - , argon2Support ? config.php.argon2 or true - , cgotoSupport ? config.php.cgoto or false - , embedSupport ? config.php.embed or false - , ipv6Support ? config.php.ipv6 or true - , systemdSupport ? config.php.systemd or stdenv.isLinux - , valgrindSupport ? config.php.valgrind or true - , ztsSupport ? (config.php.zts or false) || (apxs2Support) - }: let - pcre' = if (lib.versionAtLeast version "7.3") then pcre2 else pcre; - in stdenv.mkDerivation { - pname = "php"; - - inherit version; - - enableParallelBuilding = true; - - nativeBuildInputs = [ autoconf automake bison flex libtool pkgconfig re2c ]; - - buildInputs = - # PCRE extension - [ pcre' ] - - # Enable sapis - ++ lib.optional pearSupport [ libxml2.dev ] - - # Misc deps - ++ lib.optional apxs2Support apacheHttpd - ++ lib.optional argon2Support libargon2 - ++ lib.optional systemdSupport systemd - ++ lib.optional valgrindSupport valgrind - ; - - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; - - configureFlags = - # Disable all extensions - [ "--disable-all" ] - - # PCRE - ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre'.dev}" ] - ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre'.dev}" ] - ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre'.dev}" ] - ++ [ "PCRE_LIBDIR=${pcre'}" ] - - - # Enable sapis - ++ lib.optional (!cgiSupport) "--disable-cgi" - ++ lib.optional (!cliSupport) "--disable-cli" - ++ lib.optional fpmSupport "--enable-fpm" - ++ lib.optional pearSupport [ "--with-pear=$(out)/lib/php/pear" "--enable-xml" "--with-libxml" ] - ++ lib.optional (pearSupport && (lib.versionOlder version "7.4")) "--enable-libxml" - ++ lib.optional pharSupport "--enable-phar" - ++ lib.optional phpdbgSupport "--enable-phpdbg" - - - # Misc flags - ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" - ++ lib.optional argon2Support "--with-password-argon2=${libargon2}" - ++ lib.optional cgotoSupport "--enable-re2c-cgoto" - ++ lib.optional embedSupport "--enable-embed" - ++ lib.optional (!ipv6Support) "--disable-ipv6" - ++ lib.optional systemdSupport "--with-fpm-systemd" - ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" - ++ lib.optional ztsSupport "--enable-maintainer-zts" - ; - - hardeningDisable = [ "bindnow" ]; - - preConfigure = '' - # Don't record the configure flags since this causes unnecessary - # runtime dependencies - for i in main/build-defs.h.in scripts/php-config.in; do - substituteInPlace $i \ - --replace '@CONFIGURE_COMMAND@' '(omitted)' \ - --replace '@CONFIGURE_OPTIONS@' "" \ - --replace '@PHP_LDFLAGS@' "" - done - - export EXTENSION_DIR=$out/lib/php/extensions - - ./buildconf --copy --force - - if test -f $src/genfiles; then - ./genfiles - fi - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace configure --replace "-lstdc++" "-lc++" - ''; - - postInstall = '' - test -d $out/etc || mkdir $out/etc - cp php.ini-production $out/etc/php.ini - ''; - - postFixup = '' - mkdir -p $dev/bin $dev/share/man/man1 - mv $out/bin/phpize $out/bin/php-config $dev/bin/ - mv $out/share/man/man1/phpize.1.gz \ - $out/share/man/man1/php-config.1.gz \ - $dev/share/man/man1/ - ''; - - src = fetchurl { - url = "https://www.php.net/distributions/php-${version}.tar.bz2"; - inherit sha256; - }; - - patches = [ ./fix-paths-php7.patch ] ++ extraPatches; - - separateDebugInfo = true; - - outputs = [ "out" "dev" ]; - - meta = with stdenv.lib; { - description = "An HTML-embedded scripting language"; - homepage = "https://www.php.net/"; - license = licenses.php301; - maintainers = with maintainers; [ globin etu ma27 ]; - platforms = platforms.all; - outputsToInstall = [ "out" "dev" ]; - }; - }; - - generic' = { version, sha256, self, selfWithExtensions, ... }@args: - let - php = generic (builtins.removeAttrs args [ "self" "selfWithExtensions" ]); - - php-packages = (callPackage ../../../top-level/php-packages.nix { - php = self; - phpWithExtensions = selfWithExtensions; - }); - - buildEnv = { extensions ? (_: []), extraConfig ? "" }: - let - getExtName = ext: lib.removePrefix "php-" (builtins.parseDrvName ext.name).name; - enabledExtensions = extensions php-packages.extensions; - - # Generate extension load configuration snippets from the - # extension parameter. This is an attrset suitable for use - # with textClosureList, which is used to put the strings in - # the right order - if a plugin which is dependent on - # another plugin is placed before its dependency, it will - # fail to load. - extensionTexts = - lib.listToAttrs - (map (ext: + { callPackage, lib, stdenv, nixosTests, config, fetchurl, makeWrapper + , symlinkJoin, writeText, autoconf, automake, bison, flex, libtool + , pkgconfig, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2 + , systemd, valgrind + + , version + , sha256 + , extraPatches ? [] + + # Sapi flags + , cgiSupport ? true + , cliSupport ? true + , fpmSupport ? true + , pearSupport ? true + , pharSupport ? true + , phpdbgSupport ? true + + # Misc flags + , apxs2Support ? !stdenv.isDarwin + , argon2Support ? true + , cgotoSupport ? false + , embedSupport ? false + , ipv6Support ? true + , systemdSupport ? stdenv.isLinux + , valgrindSupport ? true + , ztsSupport ? apxs2Support + }@args: + let + # buildEnv wraps php to provide additional extensions and + # configuration. Its usage is documented in + # doc/languages-frameworks/php.section.md. + # + # Create a buildEnv with earlier overridden values and + # extensions functions in its closure. This is necessary for + # consecutive calls to buildEnv and overrides to work as + # expected. + mkBuildEnv = prevArgs: prevExtensionFunctions: lib.makeOverridable ( + { extensions ? ({...}: []), extraConfig ? "", ... }@innerArgs: + let + allArgs = args // prevArgs // innerArgs; + filteredArgs = builtins.removeAttrs allArgs [ "extensions" "extraConfig" ]; + php = generic filteredArgs; + + php-packages = (callPackage ../../../top-level/php-packages.nix { + php = phpWithExtensions; + }); + + allExtensionFunctions = prevExtensionFunctions ++ [ extensions ]; + enabledExtensions = + builtins.foldl' + (state: f: + f { enabled = state; all = php-packages.extensions; }) + [] + allExtensionFunctions; + + getExtName = ext: lib.removePrefix "php-" (builtins.parseDrvName ext.name).name; + + # Recursively get a list of all internal dependencies + # for a list of extensions. + getDepsRecursively = extensions: let - extName = getExtName ext; - type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension"; + deps = lib.concatMap + (ext: (ext.internalDeps or []) ++ (ext.peclDeps or [])) + extensions; in - lib.nameValuePair extName { - text = "${type}=${ext}/lib/php/extensions/${extName}.so"; - deps = lib.optionals (ext ? internalDeps) - (map getExtName ext.internalDeps); - }) - enabledExtensions); - - extNames = map getExtName enabledExtensions; - extraInit = writeText "custom-php.ini" '' - ${lib.concatStringsSep "\n" - (lib.textClosureList extensionTexts extNames)} - ${extraConfig} + if ! (deps == []) then + deps ++ (getDepsRecursively deps) + else + deps; + + # Generate extension load configuration snippets from the + # extension parameter. This is an attrset suitable for use + # with textClosureList, which is used to put the strings in + # the right order - if a plugin which is dependent on + # another plugin is placed before its dependency, it will + # fail to load. + extensionTexts = + lib.listToAttrs + (map (ext: + let + extName = getExtName ext; + phpDeps = (ext.internalDeps or []) ++ (ext.peclDeps or []); + type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension"; + in + lib.nameValuePair extName { + text = "${type}=${ext}/lib/php/extensions/${extName}.so"; + deps = map getExtName phpDeps; + }) + (enabledExtensions ++ (getDepsRecursively enabledExtensions))); + + extNames = map getExtName enabledExtensions; + extraInit = writeText "php.ini" '' + ${lib.concatStringsSep "\n" + (lib.textClosureList extensionTexts extNames)} + ${extraConfig} + ''; + + phpWithExtensions = symlinkJoin rec { + name = "php-with-extensions-${version}"; + inherit (php) version; + nativeBuildInputs = [ makeWrapper ]; + passthru = { + buildEnv = mkBuildEnv allArgs allExtensionFunctions; + withExtensions = mkWithExtensions allArgs allExtensionFunctions; + phpIni = "${phpWithExtensions}/lib/php.ini"; + unwrapped = php; + tests = nixosTests.php; + inherit (php-packages) packages extensions buildPecl; + meta = php.meta // { + outputsToInstall = [ "out" ]; + }; + }; + paths = [ php ]; + postBuild = '' + cp ${extraInit} $out/lib/php.ini + + wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib + + if test -e $out/bin/php-fpm; then + wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib + fi + ''; + }; + in + phpWithExtensions); + + mkWithExtensions = prevArgs: prevExtensionFunctions: extensions: + mkBuildEnv prevArgs prevExtensionFunctions { inherit extensions; }; + + pcre' = if (lib.versionAtLeast version "7.3") then pcre2 else pcre; + in + stdenv.mkDerivation { + pname = "php"; + + inherit version; + + enableParallelBuilding = true; + + nativeBuildInputs = [ autoconf automake bison flex libtool pkgconfig re2c ]; + + buildInputs = + # PCRE extension + [ pcre' ] + + # Enable sapis + ++ lib.optional pearSupport [ libxml2.dev ] + + # Misc deps + ++ lib.optional apxs2Support apacheHttpd + ++ lib.optional argon2Support libargon2 + ++ lib.optional systemdSupport systemd + ++ lib.optional valgrindSupport valgrind + ; + + CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; + + configureFlags = + # Disable all extensions + [ "--disable-all" ] + + # PCRE + ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre'.dev}" ] + ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre'.dev}" ] + ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre'.dev}" ] + ++ [ "PCRE_LIBDIR=${pcre'}" ] + + + # Enable sapis + ++ lib.optional (!cgiSupport) "--disable-cgi" + ++ lib.optional (!cliSupport) "--disable-cli" + ++ lib.optional fpmSupport "--enable-fpm" + ++ lib.optional pearSupport [ "--with-pear=$(out)/lib/php/pear" "--enable-xml" "--with-libxml" ] + ++ lib.optional (pearSupport && (lib.versionOlder version "7.4")) "--enable-libxml" + ++ lib.optional pharSupport "--enable-phar" + ++ lib.optional phpdbgSupport "--enable-phpdbg" + + + # Misc flags + ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" + ++ lib.optional argon2Support "--with-password-argon2=${libargon2}" + ++ lib.optional cgotoSupport "--enable-re2c-cgoto" + ++ lib.optional embedSupport "--enable-embed" + ++ lib.optional (!ipv6Support) "--disable-ipv6" + ++ lib.optional systemdSupport "--with-fpm-systemd" + ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" + ++ lib.optional ztsSupport "--enable-maintainer-zts" + ; + + hardeningDisable = [ "bindnow" ]; + + preConfigure = '' + # Don't record the configure flags since this causes unnecessary + # runtime dependencies + for i in main/build-defs.h.in scripts/php-config.in; do + substituteInPlace $i \ + --replace '@CONFIGURE_COMMAND@' '(omitted)' \ + --replace '@CONFIGURE_OPTIONS@' "" \ + --replace '@PHP_LDFLAGS@' "" + done + + export EXTENSION_DIR=$out/lib/php/extensions + + ./buildconf --copy --force + + if test -f $src/genfiles; then + ./genfiles + fi + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace "-lstdc++" "-lc++" ''; - in - symlinkJoin { - name = "php-with-extensions-${version}"; - inherit (php) version; - nativeBuildInputs = [ makeWrapper ]; - passthru = { - inherit buildEnv withExtensions enabledExtensions; - inherit (php-packages) packages extensions; - }; - paths = [ php ]; - postBuild = '' - cp ${extraInit} $out/lib/custom-php.ini - - wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib - - if test -e $out/bin/php-fpm; then - wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib - fi - ''; + + postInstall = '' + test -d $out/etc || mkdir $out/etc + cp php.ini-production $out/etc/php.ini + ''; + + postFixup = '' + mkdir -p $dev/bin $dev/share/man/man1 + mv $out/bin/phpize $out/bin/php-config $dev/bin/ + mv $out/share/man/man1/phpize.1.gz \ + $out/share/man/man1/php-config.1.gz \ + $dev/share/man/man1/ + ''; + + src = fetchurl { + url = "https://www.php.net/distributions/php-${version}.tar.bz2"; + inherit sha256; }; - withExtensions = extensions: buildEnv { inherit extensions; }; - in - php.overrideAttrs (_: { - passthru = { - enabledExtensions = []; - inherit buildEnv withExtensions; - inherit (php-packages) packages extensions; + patches = [ ./fix-paths-php7.patch ] ++ extraPatches; + + separateDebugInfo = true; + + outputs = [ "out" "dev" ]; + + passthru = { + buildEnv = mkBuildEnv {} []; + withExtensions = mkWithExtensions {} []; + }; + + meta = with stdenv.lib; { + description = "An HTML-embedded scripting language"; + homepage = "https://www.php.net/"; + license = licenses.php301; + maintainers = teams.php.members; + platforms = platforms.all; + outputsToInstall = [ "out" "dev" ]; + }; }; - }); - php72base = generic' { + php72base = callPackage generic (_args // { version = "7.2.29"; sha256 = "08xry2fgqgg8s0ym1hh11wkbr36av3zq1bn4krbciw1b7x8gb8ga"; - self = php72base; - selfWithExtensions = php72; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php72-darwin-isfinite.patch; - }; + }); - php73base = generic' { + php73base = callPackage generic (_args // { version = "7.3.16"; sha256 = "0bh499v9dfgh9k51w4rird1slb9rh9whp5h37fb84c98d992s1xq"; - self = php73base; - selfWithExtensions = php73; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; - }; + }); - php74base = generic' { - version = "7.4.4"; - sha256 = "17w2m4phhpj76x5fx67vgjrlkcczqvky3f5in1kjg2pch90qz3ih"; - self = php74base; - selfWithExtensions = php74; - }; + php74base = callPackage generic (_args // { + version = "7.4.6"; + sha256 = "0j133pfwa823d4jhx2hkrrzjl4hswvz00b1z58r5c82xd5sr9vd6"; + }); - defaultPhpExtensions = extensions: with extensions; ([ + defaultPhpExtensions = { all, ... }: with all; ([ bcmath calendar curl ctype dom exif fileinfo filter ftp gd gettext gmp iconv intl json ldap mbstring mysqli mysqlnd opcache openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite pgsql @@ -252,13 +284,13 @@ let tokenizer xmlreader xmlwriter zip zlib ] ++ lib.optionals (!stdenv.isDarwin) [ imap ]); - defaultPhpExtensionsWithHash = extensions: - (defaultPhpExtensions extensions) ++ [ extensions.hash ]; + defaultPhpExtensionsWithHash = { all, ... }: + (defaultPhpExtensions { inherit all; }) ++ [ all.hash ]; php74 = php74base.withExtensions defaultPhpExtensions; php73 = php73base.withExtensions defaultPhpExtensionsWithHash; php72 = php72base.withExtensions defaultPhpExtensionsWithHash; in { - inherit php72base php73base php74base php72 php73 php74; + inherit php72 php73 php74; } diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix index 6e57ad250bb4b..f7343f6e4d607 100644 --- a/pkgs/development/interpreters/picoc/default.nix +++ b/pkgs/development/interpreters/picoc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # Tests are currently broken on i686 see - # http://hydra.nixos.org/build/24003763/nixlog/1 + # https://hydra.nixos.org/build/24003763/nixlog/1 doCheck = if stdenv.isi686 then false else true; checkTarget = "test"; @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { very sparing of data space. This means it can work well in small embedded devices. ''; - homepage = https://github.com/zsaleeba/picoc; - downloadPage = https://code.google.com/p/picoc/downloads/list; + homepage = "https://github.com/zsaleeba/picoc"; + downloadPage = "https://code.google.com/p/picoc/downloads/list"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 1a0a781b91883..c49437717c159 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple Lisp with an integrated database"; - homepage = https://picolisp.com/; + homepage = "https://picolisp.com/"; license = licenses.mit; platforms = platforms.all; broken = stdenv.isDarwin; # times out diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index 02f6d34a0305d..9b57e153aa05a 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -84,7 +84,7 @@ let ''; meta = { description = "A clojure-like lisp, built with the pypy vm toolkit"; - homepage = https://github.com/pixie-lang/pixie; + homepage = "https://github.com/pixie-lang/pixie"; license = stdenv.lib.licenses.lgpl3; platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; maintainers = with stdenv.lib.maintainers; [ bendlas ]; diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix index 30a601ef8dfd0..40eb1daf49c81 100644 --- a/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -14,7 +14,7 @@ python2Packages.buildPythonPackage { doCheck = false; meta = { - homepage = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/; + homepage = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/"; description = "A language for writing Python extension modules"; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index 69a930891885d..e518edba1b396 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -14,7 +14,7 @@ python2Packages.buildPythonPackage { doCheck = false; meta = { - homepage = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/; + homepage = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/"; description = "A language for writing Python extension modules"; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 77b37c5f5c396..696be2136ecce 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -263,7 +263,7 @@ in with passthru; stdenv.mkDerivation ({ doCheck = false; # expensive, and fails meta = { - homepage = http://python.org; + homepage = "http://python.org"; description = "A high-level dynamically-typed programming language"; longDescription = '' Python is a remarkably powerful dynamic programming language that diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index abf2e223a4d14..43d635f3a33a8 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -276,7 +276,7 @@ in with passthru; stdenv.mkDerivation { enableParallelBuilding = true; meta = { - homepage = http://python.org; + homepage = "http://python.org"; description = "A high-level dynamically-typed programming language"; longDescription = '' Python is a remarkably powerful dynamic programming language that diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix index e27959c05e8d2..e033858acc018 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "python27-docs-html-2.7.16"; src = fetchurl { - url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-html.tar.bz2; + url = "http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-html.tar.bz2"; sha256 = "1razs1grzhai65ihaiyph8kz6ncjkgp1gsn3c8v7kanf13lqim02"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix index 0226f7cd88094..c9a770a6fcf1c 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "python27-docs-pdf-a4-2.7.16"; src = fetchurl { - url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-a4.tar.bz2; + url = "http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-a4.tar.bz2"; sha256 = "14ml1ynrlbhg43737bdsb8k5y39wsffqj4iwhylhb8n8l5dplfdq"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix index 88d1a69316684..e03d031bae487 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "python27-docs-pdf-letter-2.7.16"; src = fetchurl { - url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-letter.tar.bz2; + url = "http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-letter.tar.bz2"; sha256 = "019i8n48m71mn31v8d85kkwyqfgcgqnqh506y4a7fcgf656bajs0"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix index ea35e9fb6a350..d19d7be193572 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "python27-docs-text-2.7.16"; src = fetchurl { - url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-text.tar.bz2; + url = "http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-text.tar.bz2"; sha256 = "1da7swlykvc013684nywycinfz3v8dqkcmv0zj8p7l5lyi5mq03r"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix index 45783eb82632f..a83363b5c4738 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "python37-docs-html-3.7.2"; src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-html.tar.bz2; + url = "http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-html.tar.bz2"; sha256 = "19wbrawpdam09fmyipfy92sxwn1rl93v8jkfqsfx028qhvzf0422"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix index 998af644c718d..e60032f71bf8b 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "python37-docs-pdf-a4-3.7.2"; src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-a4.tar.bz2; + url = "http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-a4.tar.bz2"; sha256 = "0vdx762m30hjaabn6w88awcj2qpbz0b6z59zn9wmamd35k59lfba"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix index 1c6aea5ee3c16..b737a1e32995b 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "python37-docs-pdf-letter-3.7.2"; src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-letter.tar.bz2; + url = "http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-letter.tar.bz2"; sha256 = "17g57vlyvqx0k916q84q2pcx7y8myw0fda9fvg9kh0ph930c837x"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix index 32388780f6ff9..2897042ec04a3 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "python37-docs-text-3.7.2"; src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-text.tar.bz2; + url = "http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-text.tar.bz2"; sha256 = "0h50rlr8jclwfxa106b42q2vn2ynp219c4zsy5qz65n5m3b7y1g2"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 099632b1e8539..2def54de12d1a 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -23,8 +23,6 @@ with pkgs; }; in rec { isPy27 = pythonVersion == "2.7"; - isPy33 = pythonVersion == "3.3"; # TODO: remove - isPy34 = pythonVersion == "3.4"; # TODO: remove isPy35 = pythonVersion == "3.5"; isPy36 = pythonVersion == "3.6"; isPy37 = pythonVersion == "3.7"; @@ -57,10 +55,10 @@ in { sourceVersion = { major = "2"; minor = "7"; - patch = "17"; + patch = "18"; suffix = ""; }; - sha256 = "0hds28cg226m8j8sr394nm9yc4gxhvlv109w0avsf2mxrlrz0hsd"; + sha256 = "0hzgxl94hnflis0d6m4szjx0b52gah7wpmcg5g00q7am6xwhwb5n"; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh b/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh index 3185b1f9fae93..1fcc0bbd4b130 100644 --- a/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh +++ b/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh @@ -4,12 +4,14 @@ venvShellHook() { if [ -d "${venvDir}" ]; then echo "Skipping venv creation, '${venvDir}' already exists" + source "${venvDir}/bin/activate" else echo "Creating new venv environment in path: '${venvDir}'" @pythonInterpreter@ -m venv "${venvDir}" - fi - source "${venvDir}/bin/activate" + source "${venvDir}/bin/activate" + runHook postVenvCreation + fi runHook postShellHook echo "Finished executing venvShellHook" diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 54400ae3e0a41..e5828fdd3740b 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -53,6 +53,10 @@ in with passthru; stdenv.mkDerivation rec { hardeningDisable = optional stdenv.isi686 "pic"; + # Remove bootstrap python from closure + dontPatchShebangs = true; + disallowedReferences = [ python ]; + C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" buildInputs; LIBRARY_PATH = makeLibraryPath buildInputs; LD_LIBRARY_PATH = makeLibraryPath (filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs); @@ -151,7 +155,7 @@ in with passthru; stdenv.mkDerivation rec { enableParallelBuilding = true; # almost no parallelization without STM meta = with stdenv.lib; { - homepage = http://pypy.org/; + homepage = "http://pypy.org/"; description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; license = licenses.mit; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 7ac8037293ff9..0ebd33648343d 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -117,7 +117,7 @@ in with passthru; stdenv.mkDerivation { inherit passthru; meta = with stdenv.lib; { - homepage = http://pypy.org/; + homepage = "http://pypy.org/"; description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; license = licenses.mit; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 55065c45d576a..6c4a6ae8e21cb 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -9,6 +9,7 @@ let envs = let inherit python; pythonEnv = python.withPackages(ps: with ps; [ ]); + pythonVirtualEnv = python.withPackages(ps: with ps; [ virtualenv ]); in { # Plain Python interpreter plain = rec { @@ -16,6 +17,20 @@ let interpreter = env.interpreter; is_venv = "False"; is_nixenv = "False"; + is_virtualenv = "False"; + }; + } // lib.optionalAttrs (python.isPy3k && !python.isPyPy) { + # Use virtualenv from a Nix env. + # Does not function with Python 2 + # ValueError: source and destination is the same /nix/store/38kz3j1a87cq5y59k5w7k9yk4cqgc5b2-python-2.7.18/lib/python2.7/os.py + nixenv-virtualenv = rec { + env = runCommand "${python.name}-virtualenv" {} '' + ${pythonVirtualEnv.interpreter} -m virtualenv $out + ''; + interpreter = "${env}/bin/${python.executable}"; + is_venv = "False"; + is_nixenv = "True"; + is_virtualenv = "True"; }; } // lib.optionalAttrs (python.implementation != "graal") { # Python Nix environment (python.buildEnv) @@ -24,6 +39,7 @@ let interpreter = env.interpreter; is_venv = "False"; is_nixenv = "True"; + is_virtualenv = "True"; }; } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { # Venv built using plain Python @@ -36,23 +52,26 @@ let interpreter = "${env}/bin/${python.executable}"; is_venv = "True"; is_nixenv = "False"; + is_virtualenv = "True"; }; + } // lib.optionalAttrs (python.pythonAtLeast "3.8") { # Venv built using Python Nix environment (python.buildEnv) # TODO: Cannot create venv from a nix env # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1. - # nixenv-venv = rec { - # env = runCommand "${python.name}-venv" {} '' - # ${pythonEnv.interpreter} -m venv $out - # ''; - # interpreter = "${env}/bin/${pythonEnv.executable}"; - # is_venv = "True"; - # is_nixenv = "True"; - # }; + nixenv-venv = rec { + env = runCommand "${python.name}-venv" {} '' + ${pythonEnv.interpreter} -m venv $out + ''; + interpreter = "${env}/bin/${pythonEnv.executable}"; + is_venv = "True"; + is_nixenv = "True"; + is_virtualenv = "True"; + }; }; # All PyPy package builds are broken at the moment - integrationTests = lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { + integrationTests = lib.optionalAttrs (python.pythonAtLeast "3.7" && (!python.isPyPy)) rec { # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { interpreter = python; diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix index 06219a69fcafd..8d330fcdbfc94 100644 --- a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage }: +{ buildPythonPackage, pythonOlder }: buildPythonPackage { @@ -8,4 +8,6 @@ buildPythonPackage { src = ./.; + disabled = pythonOlder "3.7"; + } diff --git a/pkgs/development/interpreters/python/tests/test_python.py b/pkgs/development/interpreters/python/tests/test_python.py index 011978c625479..41a7e687d2637 100644 --- a/pkgs/development/interpreters/python/tests/test_python.py +++ b/pkgs/development/interpreters/python/tests/test_python.py @@ -16,6 +16,7 @@ ENV = "@env@" INTERPRETER = "@interpreter@" PYTHON_VERSION = "@pythonVersion@" +IS_VIRTUALENV = @is_virtualenv@ IS_VENV = @is_venv@ IS_NIXENV = @is_nixenv@ IS_PYPY = platform.python_implementation() == "PyPy" @@ -37,7 +38,7 @@ class TestCasePython(unittest.TestCase): @unittest.skipIf(IS_PYPY or sys.version_info.major==2, "Python 2 does not have base_prefix") def test_base_prefix(self): - if IS_VENV or IS_NIXENV: + if IS_VENV or IS_NIXENV or IS_VIRTUALENV: self.assertNotEqual(sys.prefix, sys.base_prefix) else: self.assertEqual(sys.prefix, sys.base_prefix) diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix index d49886da8f548..1762edbbdb7df 100644 --- a/pkgs/development/interpreters/qnial/default.nix +++ b/pkgs/development/interpreters/qnial/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "An array language from Nial Systems"; - homepage = https://github.com/vrthra/qnial; + homepage = "https://github.com/vrthra/qnial"; license = stdenv.lib.licenses.artistic1; maintainers = [ stdenv.lib.maintainers.vrthra ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 8e66bf96e8ca0..1db01c0d77583 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { pname = "racket"; - version = "7.6"; # always change at once with ./minimal.nix + version = "7.7"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: fetchurl { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { } )) { name = "${pname}-${version}"; - sha256 = "0yagy7qrnz96gwafnj3whh2vs54788k1ci3vkm100h68gsw638b8"; + sha256 = "0cx5h3k0n58cb442qzp3jlc7n1b9dbaxv9blg2rjil2rn119yrb2"; }; FONTCONFIG_FILE = fontsConf; @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { libraries support applications from web servers and databases to GUIs and charts. ''; - homepage = https://racket-lang.org/; + homepage = "https://racket-lang.org/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ kkallio henrytill vrthra ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" ]; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 9e817b7600037..a4a7a5c12cd47 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec { name = "racket-minimal-${oldAttrs.version}"; src = oldAttrs.src.override { inherit name; - sha256 = "0id094q9024hj2n3907l7dblp3iix1v5289xzskmh5c26xfygp9y"; + sha256 = "1lxcd4ix8q3089xql48hwccxvcpkinfxwxnc6fhcjdgzqcyxh3ln"; }; meta = oldAttrs.meta // { diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 9d0f47d90d2a4..e4501d8523899 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2020.02.1"; + version = "2020.05"; src = fetchurl { url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "1qfaiqfclqd6zz04xl90yiqkvmm610r905nnbd6gszgyq1k77ckv"; + sha256 = "08d1591k8lhyw3kmxq53lf24wg6d61lg2xc81zzcglask9n9ilc6"; }; buildInputs = [ icu zlib gmp perl ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Raku implementation on top of Moar virtual machine"; - homepage = https://www.rakudo.org; + homepage = "https://www.rakudo.org"; license = licenses.artistic2; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index ade97b56a648b..a7b57c9287acf 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2020.02.1"; + version = "2020.05"; src = fetchurl { url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "0cnnyjyci24pbws2cic80xdr7a5g3qvrsi221c6bpbnpkar81jw2"; + sha256 = "0jw29846nky7gz129knjcx58qr7nbn8j7hs8k92i11zaj73d4s4k"; }; buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index f12e60b14f068..40133287f9e02 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2020.02.1"; + version = "2020.05"; src = fetchurl { url = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "0zw3g7viyq4n4qwy0laww2mzz6wrzkfcq4fm82scy1mh65r7bdgj"; + sha256 = "0xxm0vlra1g467cxc5v65p8pc46w7r9wkcddjl8nk2lnvgcr46r9"; }; buildInputs = [ perl ]; diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 9a8c11324a214..5c8fe16408b48 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "1fscv8fbaa5l8dcwclmq3hvg3c59l4dvyjqb316mgnc5anxpzy2f"; + sha256 = "02a3awnjr1mgb9275xvp3xms80vcxkq55ffi8sbjzxpwyadj5y5k"; }; buildInputs = [ rakudo makeWrapper ]; diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index 22eee0f6ead85..8b802043fe3fa 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.rascal-mpl.org/; + homepage = "https://www.rascal-mpl.org/"; description = "Command-line REPL for the Rascal metaprogramming language"; license = stdenv.lib.licenses.epl10; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix index 274b70b2c7984..b26af7f0b1b7f 100644 --- a/pkgs/development/interpreters/rebol/default.nix +++ b/pkgs/development/interpreters/rebol/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ vrthra ]; platforms = [ "x86_64-linux" ]; license = licenses.asl20; - homepage = http://www.rebol.com/; + homepage = "http://www.rebol.com/"; }; } diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix index 2121f54a3b112..e1460ec51a22f 100644 --- a/pkgs/development/interpreters/red/default.nix +++ b/pkgs/development/interpreters/red/default.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ uralbash ]; platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.bsd3; - homepage = https://www.red-lang.org/; + homepage = "https://www.red-lang.org/"; }; } diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 759a44b5760fc..d09d150bd79cf 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ren'Py Visual Novel Engine"; - homepage = https://renpy.org/; + homepage = "https://renpy.org/"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index da8d5ce20f472..1756c13b53d1a 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -190,7 +190,7 @@ let meta = with stdenv.lib; { description = "The Ruby language"; - homepage = http://www.ruby-lang.org/en/; + homepage = "http://www.ruby-lang.org/en/"; license = licenses.ruby; maintainers = with maintainers; [ vrthra manveru ]; platforms = platforms.all; diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index 3caac2447e2ee..0bbcadba3f512 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Package management framework for Ruby"; - homepage = https://rubygems.org/; + homepage = "https://rubygems.org/"; license = with licenses; [ mit /* or */ ruby ]; maintainers = with maintainers; [ qyliss zimbatm ]; }; diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/development/interpreters/scheme48/default.nix index e01aef98303c6..5a1e3f265b24b 100644 --- a/pkgs/development/interpreters/scheme48/default.nix +++ b/pkgs/development/interpreters/scheme48/default.nix @@ -4,15 +4,14 @@ stdenv.mkDerivation { name = "scheme48-1.9.2"; meta = { - homepage = http://s48.org/; + homepage = "http://s48.org/"; description = "Scheme 48"; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = with stdenv.lib.platforms; unix; license = stdenv.lib.licenses.bsd3; }; src = fetchurl { - url = http://s48.org/1.9.2/scheme48-1.9.2.tgz; + url = "http://s48.org/1.9.2/scheme48-1.9.2.tgz"; sha256 = "1x4xfm3lyz2piqcw1h01vbs1iq89zq7wrsfjgh3fxnlm1slj2jcw"; }; } diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index 85c9434f08138..bb4f418f502a0 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A Scheme shell"; - homepage = http://www.scsh.net/; + homepage = "http://www.scsh.net/"; license = licenses.bsd3; maintainers = with maintainers; [ joachifm ]; platforms = with platforms; unix; diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix index 43f5758e4c495..ccf85f1d1c4d3 100644 --- a/pkgs/development/interpreters/self/default.nix +++ b/pkgs/development/interpreters/self/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine"; - homepage = http://selflanguage.org/; + homepage = "http://selflanguage.org/"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.doublec ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index fe77a27d449a4..37efeba3f9b6e 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; - homepage = https://developer.mozilla.org/en/SpiderMonkey; + homepage = "https://developer.mozilla.org/en/SpiderMonkey"; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix index 89bbd713a5c64..d2aabfe64d9aa 100644 --- a/pkgs/development/interpreters/spidermonkey/38.nix +++ b/pkgs/development/interpreters/spidermonkey/38.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; - homepage = https://developer.mozilla.org/en/SpiderMonkey; + homepage = "https://developer.mozilla.org/en/SpiderMonkey"; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix index f6a4483edba74..42731421d81d7 100644 --- a/pkgs/development/interpreters/spidermonkey/60.nix +++ b/pkgs/development/interpreters/spidermonkey/60.nix @@ -75,7 +75,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; - homepage = https://developer.mozilla.org/en/SpiderMonkey; + homepage = "https://developer.mozilla.org/en/SpiderMonkey"; license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.abbradar ]; platforms = platforms.linux; diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 67a7f8975f127..eed0bdc5807ee 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -9,12 +9,12 @@ in mkDerivation rec { pname = "supercollider"; - version = "3.10.4"; + version = "3.11.0"; src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2"; - sha256 = "168r0c0axgajsdzc1caklydrnagy4flv7i7jcyqwpc9agsqy0nnf"; + sha256 = "0l5j7sqrjlm85ql91ybcrvdykfkkwfqd7w3m4llbymw720r2ln9p"; }; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index fd84d93ba7562..9aaf8223837d7 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The Tcl scripting language"; - homepage = https://www.tcl.tk/; + homepage = "https://www.tcl.tk/"; license = licenses.tcltk; platforms = platforms.all; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/development/interpreters/tinyscheme/default.nix index ca897ec692c19..b49a37a728565 100644 --- a/pkgs/development/interpreters/tinyscheme/default.nix +++ b/pkgs/development/interpreters/tinyscheme/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { TinyScheme is a lightweight Scheme interpreter that implements as large a subset of R5RS as was possible without getting very large and complicated. ''; - homepage = http://tinyscheme.sourceforge.net/; + homepage = "http://tinyscheme.sourceforge.net/"; license = licenses.bsdOriginal; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix index bb4a2d01499d0..d908346f19625 100644 --- a/pkgs/development/interpreters/unicon-lang/default.nix +++ b/pkgs/development/interpreters/unicon-lang/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ vrthra ]; platforms = platforms.linux; license = licenses.gpl2; - homepage = http://unicon.org; + homepage = "http://unicon.org"; }; } diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index d3d9cf87207db..404c0731c349c 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "0.16.2"; + version = "0.17.0"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = version; - sha256 = "124zq772kz9a7n3qpxgmp4awqj41l8mhhwc0y3r77i1q02i1sy7z"; + sha256 = "05g4h0xkqd14wnmijiiwmhk6l909fjxr6a2zplrjfxk5bypdalpm"; fetchSubmodules = true; }; - cargoSha256 = "1qqysvcviimpm2zhzsbn8vhy91rxzaknh9hv75y38xd5ggnnh9m6"; + cargoSha256 = "1ssmgx9fjvkq7ycyzjanqmlm5b80akllq6qyv3mj0k5fvs659wcq"; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index eaecd1eb89b92..dd6e3eb4a7f41 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,28 +2,28 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "v0.12.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "${pname}"; - rev = "${version}"; - sha256 = "08dhk5s8rv41mjqbwfqwqmp6p6p9y7qc5yc76ljjd9l7j1phl7mr"; + rev = "v${version}"; + sha256 = "1zlljqkkcw8h94ff1w47sqn9pn0zal06s06i8nciv5i2d1xaqg5n"; fetchSubmodules = true; }; - cargoSha256 = "0wqd2yy6ih1rcz1fq7x3aiqq1ma2nmif1w8r8x0vpxjxk395zil9"; + cargoSha256 = "1hb7l7a76lgbji0qm9qd80m35cp346hyi4rphfk6p80v142cw8hh"; nativeBuildInputs = [ python cmake clang ]; buildInputs = [ llvmPackages.libclang ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - doCheck = false; # https://github.com/bytecodealliance/wasmtime/issues/1197 + doCheck = true; meta = with lib; { description = "Standalone JIT-style runtime for WebAssembly, using Cranelift"; - homepage = https://github.com/CraneStation/wasmtime; + homepage = "https://github.com/CraneStation/wasmtime"; license = licenses.asl20; maintainers = [ maintainers.matthewbauer ]; platforms = platforms.unix; diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix index 80f19ab65f5c6..574629d8efd3b 100644 --- a/pkgs/development/java-modules/jogl/default.nix +++ b/pkgs/development/java-modules/jogl/default.nix @@ -6,7 +6,7 @@ version = "2.3.2"; gluegen-src = fetchgit { - url = git://jogamp.org/srv/scm/gluegen.git; + url = "git://jogamp.org/srv/scm/gluegen.git"; rev = "v${version}"; sha256 = "00hybisjwqs88p24dds652bzrwbbmhn2dpx56kp4j6xpadkp33d0"; fetchSubmodules = true; @@ -16,7 +16,7 @@ inherit version; src = fetchgit { - url = git://jogamp.org/srv/scm/jogl.git; + url = "git://jogamp.org/srv/scm/jogl.git"; rev = "v${version}"; sha256 = "0msi2gxiqm2yqwkmxqbh521xdrimw1fly20g890r357rcgj8fsn3"; fetchSubmodules = true; @@ -56,7 +56,7 @@ meta = with stdenv.lib; { description = "Java libraries for 3D Graphics, Multimedia and Processing"; - homepage = https://jogamp.org/; + homepage = "https://jogamp.org/"; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix index 6f86cede51200..dbbce6b626246 100644 --- a/pkgs/development/java-modules/junit/default.nix +++ b/pkgs/development/java-modules/junit/default.nix @@ -19,7 +19,7 @@ in rec { m2Path = "/junit/junit/${version}"; meta = { - homepage = https://junit.org/junit4/; + homepage = "https://junit.org/junit4/"; description = "Simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks"; license = stdenv.lib.licenses.epl10; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix index b8e128ac728cd..b4639d9ee1d1f 100644 --- a/pkgs/development/java-modules/maven-hello/default.nix +++ b/pkgs/development/java-modules/maven-hello/default.nix @@ -18,7 +18,7 @@ in rec { m2Path = "/com/nequissimus/maven-hello/${version}"; meta = { - homepage = https://github.com/NeQuissimus/maven-hello/; + homepage = "https://github.com/NeQuissimus/maven-hello/"; description = "Maven Hello World"; license = stdenv.lib.licenses.unlicense; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix index 69cb24fc0b0c1..01041d7753981 100644 --- a/pkgs/development/java-modules/postgresql_jdbc/default.nix +++ b/pkgs/development/java-modules/postgresql_jdbc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://jdbc.postgresql.org/; + homepage = "https://jdbc.postgresql.org/"; description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix index 1ae6346cbe581..ab9440c303459 100644 --- a/pkgs/development/libraries/AntTweakBar/default.nix +++ b/pkgs/development/libraries/AntTweakBar/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { (compatibility and core profiles), DirectX 9, DirectX 10 or DirectX 11 to interactively tweak parameters on-screen ''; - homepage = http://anttweakbar.sourceforge.net/; + homepage = "http://anttweakbar.sourceforge.net/"; license = stdenv.lib.licenses.zlib; maintainers = [ stdenv.lib.maintainers.razvan ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/CGAL/4.nix b/pkgs/development/libraries/CGAL/4.nix index 60c244009ceb9..ad900744f5459 100644 --- a/pkgs/development/libraries/CGAL/4.nix +++ b/pkgs/development/libraries/CGAL/4.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Computational Geometry Algorithms Library"; - homepage = http://cgal.org; + homepage = "http://cgal.org"; license = with licenses; [ gpl3Plus lgpl3Plus]; platforms = platforms.all; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix index f251d2bed0c51..7adb6e6437e7d 100644 --- a/pkgs/development/libraries/CoinMP/default.nix +++ b/pkgs/development/libraries/CoinMP/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = https://projects.coin-or.org/CoinMP/; + homepage = "https://projects.coin-or.org/CoinMP/"; description = "COIN-OR lightweight API for COIN-OR libraries CLP, CBC, and CGL"; platforms = platforms.unix; license = licenses.epl10; diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix index 418900ddeeb5a..fb747dc9f33c1 100644 --- a/pkgs/development/libraries/LASzip/default.nix +++ b/pkgs/development/libraries/LASzip/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Turn quickly bulky LAS files into compact LAZ files without information loss"; - homepage = https://laszip.org; + homepage = "https://laszip.org"; license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.michelk ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index d9ace4deddd1e..93d708e7d31fd 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A cross-platform multimedia library"; - homepage = http://www.libsdl.org/; + homepage = "http://www.libsdl.org/"; license = licenses.zlib; platforms = platforms.all; maintainers = with maintainers; [ cpages ]; diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index d57bb6cbc9408..1ed56c6750ffb 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { code. Its is written in plain C and can be used in C++ code. ''; - homepage = http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/; + homepage = "http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/"; license = licenses.zlib; maintainers = with maintainers; [ cpages ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index 326d9d66264d9..00de774ba6e32 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SDL image library"; - homepage = http://www.libsdl.org/projects/SDL_image/; + homepage = "http://www.libsdl.org/projects/SDL_image/"; platforms = platforms.unix; license = licenses.zlib; maintainers = with maintainers; [ cpages ]; diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 58c76e3a3f536..4fa9df617a6a2 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SDL multi-channel audio mixer library"; platforms = platforms.unix; - homepage = https://www.libsdl.org/projects/SDL_mixer/; + homepage = "https://www.libsdl.org/projects/SDL_mixer/"; maintainers = with maintainers; [ MP2E ]; license = licenses.zlib; }; diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix index 309102e70b5ef..0bec12cdb24b5 100644 --- a/pkgs/development/libraries/SDL2_net/default.nix +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SDL multiplatform networking library"; - homepage = https://www.libsdl.org/projects/SDL_net; + homepage = "https://www.libsdl.org/projects/SDL_net"; license = licenses.zlib; maintainers = with maintainers; [ MP2E ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index 50e47bc1d3621..571c953a81bc4 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "SDL TrueType library"; platforms = platforms.unix; license = licenses.zlib; - homepage = https://www.libsdl.org/projects/SDL_ttf/; + homepage = "https://www.libsdl.org/projects/SDL_ttf/"; }; } diff --git a/pkgs/development/libraries/SDL_Pango/default.nix b/pkgs/development/libraries/SDL_Pango/default.nix index e330ccef6116c..9340b9f709150 100644 --- a/pkgs/development/libraries/SDL_Pango/default.nix +++ b/pkgs/development/libraries/SDL_Pango/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://sources.debian.org/data/main/s/sdlpango/0.1.2-6/debian/patches/api_additions.patch; + url = "https://sources.debian.org/data/main/s/sdlpango/0.1.2-6/debian/patches/api_additions.patch"; sha256 = "00p5ry5gd3ixm257p9i2c4jg0qj8ipk8nf56l7c9fma8id3zxyld"; }) ./fixes.patch @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Connects the Pango rendering engine to SDL"; license = licenses.lgpl21Plus; platforms = platforms.all; - homepage = http://sdlpango.sourceforge.net/; + homepage = "http://sdlpango.sourceforge.net/"; maintainers = with maintainers; [ puckipedia ]; }; } diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 74a31d946874b..3696e485ad72a 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { code. Its is written in plain C and can be used in C++ code. ''; - homepage = https://sourceforge.net/projects/sdlgfx/; + homepage = "https://sourceforge.net/projects/sdlgfx/"; license = licenses.zlib; maintainers = with maintainers; [ bjg ]; diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index 427439f496e93..e52273052b530 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SDL multi-channel audio mixer library"; - homepage = http://www.libsdl.org/projects/SDL_mixer/; + homepage = "http://www.libsdl.org/projects/SDL_mixer/"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; license = licenses.zlib; diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix index 6ac91a6d129d2..a24020da01576 100644 --- a/pkgs/development/libraries/SDL_net/default.nix +++ b/pkgs/development/libraries/SDL_net/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = "SDL networking library"; platforms = platforms.unix; license = licenses.zlib; - homepage = https://www.libsdl.org/projects/SDL_net/release-1.2.html; + homepage = "https://www.libsdl.org/projects/SDL_net/release-1.2.html"; }; } diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix index 66fa8888fd195..8d37124d31174 100644 --- a/pkgs/development/libraries/SDL_sixel/default.nix +++ b/pkgs/development/libraries/SDL_sixel/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A cross-platform multimedia library, that supports sixel graphics on consoles"; - homepage = https://github.com/saitoha/SDL1.2-SIXEL; + homepage = "https://github.com/saitoha/SDL1.2-SIXEL"; maintainers = with maintainers; [ vrthra ]; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix index 94534ecd6999b..bdc97e98f3414 100644 --- a/pkgs/development/libraries/SDL_sound/default.nix +++ b/pkgs/development/libraries/SDL_sound/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = "SDL sound library"; platforms = platforms.unix; license = licenses.lgpl21; - homepage = https://www.icculus.org/SDL_sound/; + homepage = "https://www.icculus.org/SDL_sound/"; }; } diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/pkgs/development/libraries/SDL_stretch/default.nix index 9695d51ed8972..1f068c9e9768e 100644 --- a/pkgs/development/libraries/SDL_stretch/default.nix +++ b/pkgs/development/libraries/SDL_stretch/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stretch Functions For SDL"; - homepage = http://sdl-stretch.sourceforge.net/; + homepage = "http://sdl-stretch.sourceforge.net/"; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix index 96b60b1061fda..cd6355c9ce2bf 100644 --- a/pkgs/development/libraries/SDL_ttf/default.nix +++ b/pkgs/development/libraries/SDL_ttf/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "SDL TrueType library"; license = licenses.zlib; platforms = platforms.all; - homepage = https://www.libsdl.org/projects/SDL_ttf/release-1.2.html; + homepage = "https://www.libsdl.org/projects/SDL_ttf/release-1.2.html"; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 3e496b7e981fd..d26a910638e96 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "Xaw3d-1.6.3"; src = fetchurl { - url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2; + url = "https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2"; sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; }; dontUseImakeConfigure = true; diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix index 5ff5e609723ee..8ed47b91e5dec 100644 --- a/pkgs/development/libraries/a52dec/default.nix +++ b/pkgs/development/libraries/a52dec/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "ATSC A/52 stream decoder"; - homepage = http://liba52.sourceforge.net/; + homepage = "http://liba52.sourceforge.net/"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index 8b1878b0cc301..94453264419c0 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "aalib-1.4rc5"; src = fetchurl { - url = mirror://sourceforge/aa-project/aalib-1.4rc5.tar.gz; + url = "mirror://sourceforge/aa-project/aalib-1.4rc5.tar.gz"; sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv"; }; diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/default.nix index bd896fb9c65d9..45e73410d28ee 100644 --- a/pkgs/development/libraries/abseil-cpp/default.nix +++ b/pkgs/development/libraries/abseil-cpp/default.nix @@ -2,23 +2,22 @@ stdenv.mkDerivation rec { pname = "abseil-cpp"; - date = "20191119"; - rev = "8ba96a8244bbe334d09542e92d566673a65c1f78"; - version = "${date}-${rev}"; + version = "20200225.2"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; - rev = rev; - sha256 = "089bvlspgdgi40fham20qy1m97gr1jh5k5czz49dincpd18j6inb"; + rev = version; + sha256 = "0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y"; }; nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "An open-source collection of C++ code designed to augment the C++ standard library"; - homepage = https://abseil.io/; + homepage = "https://abseil.io/"; license = licenses.asl20; + platforms = platforms.all; maintainers = [ maintainers.andersk ]; }; } diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index bae7b56cb8ee2..b60d8d07385cc 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt library for accessing the online accounts database"; - homepage = https://gitlab.com/accounts-sso; + homepage = "https://gitlab.com/accounts-sso"; license = licenses.lgpl21; platforms = with platforms; linux; }; diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index eb48aca80ee63..85b23de0c1c85 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D-Bus interface for user account query and manipulation"; - homepage = https://www.freedesktop.org/wiki/Software/AccountsService; + homepage = "https://www.freedesktop.org/wiki/Software/AccountsService"; license = licenses.gpl3; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index ea352772b33aa..372cfbeffff3e 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ADAPTIVE Communication Environment"; - homepage = http://www.dre.vanderbilt.edu/~schmidt/ACE.html; + homepage = "http://www.dre.vanderbilt.edu/~schmidt/ACE.html"; license = licenses.doc; platforms = platforms.linux; maintainers = [ maintainers.nico202 ]; diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index c9797b31eaa93..2f468c7f4c1ff 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.chiark.greenend.org.uk/~ian/adns/; + homepage = "http://www.chiark.greenend.org.uk/~ian/adns/"; description = "Asynchronous DNS Resolver Library"; license = stdenv.lib.licenses.lgpl2; diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index f0d87c811330a..7165172626167 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib curl expat fuse openssl python3 ]; meta = { - homepage = http://afflib.sourceforge.net/; + homepage = "http://afflib.sourceforge.net/"; description = "Advanced forensic format library"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsdOriginal; diff --git a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix b/pkgs/development/libraries/agda/Agda-Sheaves/default.nix deleted file mode 100644 index 62856157b4b6d..0000000000000 --- a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, agda, fetchgit }: - -agda.mkDerivation (self: rec { - version = "8a06162a8f0f7df308458db91d720cf8f7345d69"; - name = "Agda-Sheaves-${version}"; - src = fetchgit { - url = "https://github.com/jonsterling/Agda-Sheaves.git"; - rev = version; - sha256 = "1gjffyyi4gk9z380yw2wm0jg0a01zy8dnw7jrcc7222swisk5s2d"; - }; - - everythingFile = "sheaves.agda"; - topSourceDirectories = [ "../$sourceRoot" ]; - sourceDirectories = []; - - meta = { - homepage = https://github.com/jonsterling/Agda-Sheaves; - description = "Sheaves in Agda"; - license = stdenv.lib.licenses.cc-by-40; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; - broken = true; # replaced by constructive-sheaf-semantics - }; -}) diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/contextfile b/pkgs/development/libraries/agda/TotalParserCombinators/contextfile deleted file mode 100644 index 46743cba3b672..0000000000000 --- a/pkgs/development/libraries/agda/TotalParserCombinators/contextfile +++ /dev/null @@ -1,259 +0,0 @@ - -Context: - -[Updated the code in response to changes to Agda. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150319181310 - Ignore-this: 52b9ff613d7f10b0c8f45591a0759d07 -] - -[Rolled back most of "Updated the code in response to changes to Agda". -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150319101420 - Ignore-this: c2ea7bdf79848235fa3ea64ebda116eb - * One of the Agda changes has been reverted. -] - -[Removed an outdated comment. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150217162945 - Ignore-this: 3ff7732335750305fe220e65693f0cbf -] - -[Added the simplification "nonempty (return x) → fail". -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150217161718 - Ignore-this: 56ad6a68c314446d8986a8c1b49655d0 -] - -[Added Nonempty.nonempty-return. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150217161629 - Ignore-this: 68829d3f9a248272c46848daa05ccfe3 -] - -[Updated the copyright year range. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150212154744 - Ignore-this: 3410a12ca1f9de825b00e692b136d500 -] - -[Updated the code in response to changes to Agda. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150212152207 - Ignore-this: 683b5eeca5fa9c8490bceaf68c23a204 -] - -[Updated the copyright year range. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20141128223227 - Ignore-this: 31d3f5e4fdd6fbfad9758d9bfd0d3a3e -] - -[Updated the code in response to changes to Agda and the library. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20141128223205 - Ignore-this: 6392ec67aab2c534a7195abed55be47 -] - -[Updated code to reflect changes to Agda. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20140425121055 - Ignore-this: 54d80fd647cb897eef85f57e9172f7db -] - -[Workaround for (possible) Agda bug. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20140228200347 - Ignore-this: b17884ad17a3bdb7faff678622365a8 -] - -[Updated code to reflect changes to library API. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20130307134644 - Ignore-this: 50d070a22a6796b9acdf19d44ba5de16 -] - -[Updated code to reflect changes to Agda and the library API. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20130228122951 - Ignore-this: 761dc4d85683a59cc3667a8706c88093 -] - -[Turned _◇_ into a constructor. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20120316125431 - Ignore-this: 41b492c3106a575f28f146253f78a5ae -] - -[Updated code to reflect changes to Agda. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20120316125416 - Ignore-this: e77d817d8b391c3b4806119d10848eb3 -] - -[Updated code to reflect changes to Agda. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20120215103344 - Ignore-this: 467716429d5553cd122722108ea82a08 -] - -[Modified a comment. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20120215103319 - Ignore-this: e57d4911f692f8a96a80017d910efc5f -] - -[Updated code to reflect change to library API. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20111006160229 - Ignore-this: 5359da54e7e6e0f92983fa3ecaccebf3 -] - -[Updated code to reflect changes to Agda and the library API. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20111003170117 - Ignore-this: cbdd35172e372779e12642985cf17268 -] - -[Rolled back addition of inversion lemmas. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110930150912 - Ignore-this: 9c9b083f0afcf95aaaa55a01d871274e -] - -[Added inversion lemmas, implemented other lemmas using these lemmas. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110930150842 - Ignore-this: 19b832c3f9e14d1e713b5911c094a130 - + This change was a response to a change to Agda's pattern matching - machinery. Subsequently the machinery was made more liberal again, - making this change unnecessary. -] - -[Updated code to reflect changes to library API. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110517220158 - Ignore-this: ea9771a5014a25cb20afc2118638f8b5 -] - -[Updated code to reflect changes to Agda. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110512124425 - Ignore-this: 97b154661679f574f6ab914583b14580 -] - -[Proved that many constructions preserve various preorders. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110313012617 - Ignore-this: 8008efaff967c228448baa33b82edb81 -] - -[Updated code to reflect changes to library API. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110313002106 - Ignore-this: 94799ba1ae411e59fd8c6c7eac3b8dfb -] - -[Simplified TotalRecognisers.LeftRecursion.MatchingParentheses. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110118102159 - Ignore-this: 1e01a8092b0c0124979ffc5fe17a245c -] - -[Added TotalRecognisers.LeftRecursion.MatchingParentheses. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110118102146 - Ignore-this: 13a3bc91425364e26c3047561655bb25 -] - -[Added a simplifying backend. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101229012716 - Ignore-this: 9ac7ae21cd44c099633678a994fb9a3 -] - -[Fixed another "bug" in the deep simplifier. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101229010854 - Ignore-this: e258adf963436ef715242db23c6808e - + Sometimes the first layer of bind's right-hand argument was not - simplified. -] - -[Made simplify₁ public and changed its type. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228235603 - Ignore-this: d39b8453a15089126261e098080223c6 -] - -[Deep simplification no longer adds casts. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228192850 - Ignore-this: 2ba016825adfa3a1e36922869eabfd39 -] - -[The first constructor in a simplified parser can no longer be a cast. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228175822 - Ignore-this: ce3e38cc0b9a096aa436655c9013ae97 -] - -[Modified the outline. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228173414 - Ignore-this: f8866e69f6d1a344e79fb6f708dfa4c -] - -[Added an example: a right recursive expression grammar. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228173159 - Ignore-this: 9a4d732b451cca08ba19aac5d115c678 -] - -[Rearranged the code. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228172209 - Ignore-this: 50fa29406d0f150669ff3feec4dbe513 -] - -[Renamed same-bag/set to (initial-bag-)cong. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228170706 - Ignore-this: dd3ce43d77dde74cc2428d2568dd2d30 -] - -[Added TotalParserCombinators.Force. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228153638 - Ignore-this: 3b6ff6ea20df0c1293494f06845d17eb -] - -[Proved that uses of subst can be erased. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228153621 - Ignore-this: f503ba495b923ae521718b6957167128 -] - -[The deep simplifier no longer skips layers. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228141138 - Ignore-this: 733a4a4a9aa0f890ad1740ecfc6a599f -] - -[Documented that the deep simplifier misses every second layer. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228121910 - Ignore-this: 8a0baf25b12f63f8748dbc1d16affacf -] - -[The simplifier now applies the token-bind rule more often. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101227165413 - Ignore-this: 40132fa6f19602886bbe29aadd8a683c -] - -[Switched back to deep simplification, now with a proper proof. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101227125434 - Ignore-this: ccc46e82f6f9c6c2a27ddb43d315f7dd -] - -[Simplified the soundness proof. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101227123839 - Ignore-this: fb6826dd9836e34fc3bfdce2928ba13d -] - -[Made some _≈[_]P_ constructors conditionally coinductive. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101227123827 - Ignore-this: f521f70475403697229051b62343a080 - + The structure of the soundness proof was also changed. -] - -[Unified And, AsymmetricChoice and Not. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101225103109 - Ignore-this: 5ae8b80e1505fe6e707bb2307d22688c -] - -[Modified some comments. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101225101051 - Ignore-this: e812d8c3e9720895c368f7a286f8315c -] - -[Modified a comment. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101223202647 - Ignore-this: 16ea5dc01a4cbe0fe38714b2e4b7ff6 -] - -[Updated code to reflect changes to library API. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101107162658 - Ignore-this: 9e38a10a9997c9825ece6ad9f871b673 -] - -[Added an alternative backend for TotalRecognisers.Simple. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101020183743 - Ignore-this: a111a89e0c237e132b649561000f53d6 -] - -[TAG Code corresponding to the paper "Total Parser Combinators" (4). -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20100928013815 - Ignore-this: 45ccc28373ed3974047315613eb14833 -] diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix deleted file mode 100644 index 344da00d04f20..0000000000000 --- a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, agda, fetchdarcs, AgdaStdlib }: - -agda.mkDerivation (self: rec { - version = "2015-03-19"; - name = "TotalParserCombinators-${version}"; - - src = fetchdarcs { - url = "http://www.cse.chalmers.se/~nad/repos/parser-combinators.code/"; - context = ./contextfile; - sha256 = "0jlbz8yni6i7vb2qsd41bdkpchqirvc5pavckaf97z7p4gqi2mlj"; - }; - - buildDepends = [ AgdaStdlib ]; - everythingFile = "TotalParserCombinators.agda"; - sourceDirectories = []; - topSourceDirectories = [ "../$sourceRoot" ]; - - meta = with stdenv.lib; { - homepage = http://www.cse.chalmers.se/~nad/publications/danielsson-parser-combinators.html; - description = "A monadic parser combinator library which guarantees termination of parsing"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with maintainers; [ ]; - broken = true; - }; -}) diff --git a/pkgs/development/libraries/agda/agda-base/default.nix b/pkgs/development/libraries/agda/agda-base/default.nix deleted file mode 100644 index 1bc9d0cb882e5..0000000000000 --- a/pkgs/development/libraries/agda/agda-base/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, agda, fetchurl }: - -agda.mkDerivation (self: rec { - version = "0.1"; - name = "agda-base-${version}"; - - src = fetchurl { - url = "https://github.com/pcapriotti/agda-base/archive/v${version}.tar.gz"; - sha256 = "124h06p7jdiqr2x6r46sfab9r0cgb0fznr2qs5i1psl5yf3z74h8"; - }; - - sourceDirectories = [ "./." ]; - everythingFile = "README.agda"; - - meta = { - homepage = https://github.com/pcapriotti/agda-base; - description = "Base library for HoTT in Agda"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; - broken = true; # largely replaced by HoTT-Agda - }; -}) diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix new file mode 100644 index 0000000000000..9eb68b5a64ac5 --- /dev/null +++ b/pkgs/development/libraries/agda/agda-categories/default.nix @@ -0,0 +1,28 @@ +{ lib, mkDerivation, fetchFromGitHub, standard-library }: + +mkDerivation rec { + version = "0.1"; + pname = "agda-categories"; + + src = fetchFromGitHub { + owner = "agda"; + repo = "agda-categories"; + rev = "release/v${version}"; + sha256 = "0m4pjy92jg6zfziyv0bxv5if03g8k4413ld8c3ii2xa8bzfn04m2"; + }; + + buildInputs = [ standard-library ]; + + meta = with lib; { + inherit (src.meta) homepage; + description = "A new Categories library"; + license = licenses.bsd3; + platforms = platforms.unix; + # agda categories takes a lot of memory to build. + # This can be removed if this is eventually fixed upstream. + hydraPlatforms = []; + # Waiting for release 0.2 for this to work + broken = true; + maintainers = with maintainers; [ alexarice turion ]; + }; +} diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index bcdad18bedecf..2bec10c02dd1c 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -1,23 +1,32 @@ -{ stdenv, agda, fetchgit }: +{ stdenv, mkDerivation, fetchFromGitHub }: -agda.mkDerivation (self: rec { - version = "eacc961c2c312b7443109a7872f99d55557df317"; - name = "agda-prelude-${version}"; +mkDerivation rec { + version = "compat-2.6.0"; + pname = "agda-prelude"; - src = fetchgit { - url = "https://github.com/UlfNorell/agda-prelude.git"; + src = fetchFromGitHub { + owner = "UlfNorell"; + repo = "agda-prelude"; rev = version; - sha256 = "0iql67hb1q0fn8dwkcx07brkdkxqfqrsbwjy71ndir0k7qzw7qv2"; + sha256 = "0brg61qrf8izqav80qpx77dbdxvlnsxyy0v7hmlrmhg68b5lp38y"; }; - topSourceDirectories = [ "src" ]; - everythingFile = "src/Prelude.agda"; + preConfigure = '' + cd test + make everything + mv Everything.agda .. + cd .. + ''; + + everythingFile = "./Everything.agda"; meta = with stdenv.lib; { - homepage = https://github.com/UlfNorell/agda-prelude; + homepage = "https://github.com/UlfNorell/agda-prelude"; description = "Programming library for Agda"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; - maintainers = with maintainers; [ mudri ]; + # broken since Agda 2.6.1 + broken = true; + maintainers = with maintainers; [ mudri alexarice turion ]; }; -}) +} diff --git a/pkgs/development/libraries/agda/bitvector/default.nix b/pkgs/development/libraries/agda/bitvector/default.nix deleted file mode 100644 index c09702c48d78f..0000000000000 --- a/pkgs/development/libraries/agda/bitvector/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, agda, fetchgit, AgdaStdlib }: - -agda.mkDerivation (self: rec { - version = "f1c173313f2a41d95a8dc6053f9365a24690e18d"; - name = "bitvector-${version}"; - - src = fetchgit { - url = "https://github.com/copumpkin/bitvector.git"; - rev = version; - sha256 = "0jb421lxvyxz26sxa81qjmn1gfcxfh0fmbq128f0kslqhiiaqfrh"; - }; - - buildDepends = [ AgdaStdlib ]; - sourceDirectories = [ "Data" ]; - - meta = { - homepage = https://github.com/copumpkin/bitvector; - description = "Sequences of bits and common operations on them"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; - broken = true; - }; -}) diff --git a/pkgs/development/libraries/agda/categories/default.nix b/pkgs/development/libraries/agda/categories/default.nix deleted file mode 100644 index a58afd7e8667e..0000000000000 --- a/pkgs/development/libraries/agda/categories/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, agda, fetchgit, AgdaStdlib }: - -agda.mkDerivation (self: rec { - version = "33409120d071656f5198c658145889ae2e86249c"; - name = "categories-${version}"; - - src = fetchgit { - url = "https://github.com/copumpkin/categories.git"; - rev = version; - sha256 = "15x834f7jn2s816b9vz8nm8p424ppzv6v9nayaawyl43qmaaaa5p"; - }; - - buildDepends = [ AgdaStdlib ]; - sourceDirectories = [ "Categories" "Graphs" ]; - - meta = { - homepage = https://github.com/copumpkin/categories; - description = "Categories parametrized by morphism equality, in Agda"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; - broken = true; # doesn't work due to new agdastdlib, see #9471 - }; -}) diff --git a/pkgs/development/libraries/agda/cubical/default.nix b/pkgs/development/libraries/agda/cubical/default.nix new file mode 100644 index 0000000000000..241caf16d6794 --- /dev/null +++ b/pkgs/development/libraries/agda/cubical/default.nix @@ -0,0 +1,33 @@ +{ lib, mkDerivation, fetchFromGitHub, ghc, glibcLocales }: + +mkDerivation rec { + + # Version 0.2 is meant to be used with the Agda 2.6.1 compiler. + pname = "cubical"; + version = "0.2"; + + src = fetchFromGitHub { + repo = pname; + owner = "agda"; + rev = "v${version}"; + sha256 = "07qlp2f189jvzbn3aqvpqk2zxpkmkxhhkjsn62iq436kxqj3z6c2"; + }; + + LC_ALL = "en_US.UTF-8"; + + # The cubical library has several `Everything.agda` files, which are + # compiled through the make file they provide. + nativeBuildInputs = [ ghc glibcLocales ]; + buildPhase = '' + make + ''; + + meta = with lib; { + description = + "A cubical type theory library for use with the Agda compiler"; + homepage = src.meta.homepage; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ alexarice ryanorendorff ]; + }; +} diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/iowa-stdlib/default.nix index 30a03980e44d6..55cd6a742e54d 100644 --- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/iowa-stdlib/default.nix @@ -1,8 +1,8 @@ -{ stdenv, agda, fetchFromGitHub }: +{ stdenv, mkDerivation, fetchFromGitHub }: -agda.mkDerivation (self: rec { +mkDerivation (rec { version = "1.5.0"; - name = "agda-iowa-stdlib-${version}"; + pname = "iowa-stdlib"; src = fetchFromGitHub { owner = "cedille"; @@ -11,17 +11,21 @@ agda.mkDerivation (self: rec { sha256 = "0dlis6v6nzbscf713cmwlx8h9n2gxghci8y21qak3hp18gkxdp0g"; }; - sourceDirectories = [ "./." ]; + libraryFile = ""; + libraryName = "IAL-1.3"; + buildPhase = '' patchShebangs find-deps.sh make ''; meta = { - homepage = https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib/; + homepage = "https://github.com/cedille/ial"; description = "Agda standard library developed at Iowa"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; + # broken since Agda 2.6.1 + broken = true; + maintainers = with stdenv.lib.maintainers; [ alexarice turion ]; }; }) diff --git a/pkgs/development/libraries/agda/pretty/contextfile b/pkgs/development/libraries/agda/pretty/contextfile deleted file mode 100644 index 2ea20153bbcc6..0000000000000 --- a/pkgs/development/libraries/agda/pretty/contextfile +++ /dev/null @@ -1,43 +0,0 @@ - -Context: - -[Updated the code in response to a change to Agda. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150319181428 - Ignore-this: f83c3dccfe25a2a5b9d0437d1dce0ec0 -] - -[Rolled back most of "Updated the code in response to changes to Agda". -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150319101413 - Ignore-this: 5a26cf9cf83d0d146cca0c15c857d20c - * One of the Agda changes has been reverted. -] - -[Updated the code in response to changes to Agda. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150217101656 - Ignore-this: a12921aebbe0fb575ef391ba5789a391 -] - -[Modified the copyright year range. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150213144338 - Ignore-this: 1d1b22457dd6dadcb47f5d7f3eea062 -] - -[Restored Grammar.Abstract and Grammar.Non-terminal. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20130727225031 - Ignore-this: ddccb15caa7a3c26e973997ffdb4eec1 -] - -[Modified the copyright year range. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20141128164015 - Ignore-this: b9c6dddc965738aa2a7670c4c18da67f -] - -[Updated the code to reflect changes to the library API. -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20141128163950 - Ignore-this: 8094c47f23cef0fcc596ad0c18a92b56 -] - -[TAG Correct-by-Construction Pretty-Printing (2013-07-28) -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20130727224432 - Ignore-this: 6aab9b2e6b638457767c8821f3c27cb4 -] diff --git a/pkgs/development/libraries/agda/pretty/default.nix b/pkgs/development/libraries/agda/pretty/default.nix deleted file mode 100644 index ffae1f6f900ca..0000000000000 --- a/pkgs/development/libraries/agda/pretty/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, agda, fetchdarcs, AgdaStdlib }: - -agda.mkDerivation (self: rec { - version = "2015-03-19"; - name = "pretty-${version}"; - - src = fetchdarcs { - url = "http://www.cse.chalmers.se/~nad/repos/pretty/"; - context = ./contextfile; - sha256 = "0zmwh9kln7ykpmkx1qhqz64qm2arq62b17vs5fswnxk7mqxsmrf0"; - }; - - buildDepends = [ AgdaStdlib ]; - everythingFile = "Pretty.agda"; - sourceDirectories = []; - topSourceDirectories = [ "../$sourceRoot" ]; - - meta = with stdenv.lib; { - homepage = http://www.cse.chalmers.se/~nad/publications/danielsson-correct-pretty.html; - description = "Correct-by-Construction Pretty-Printing"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with maintainers; [ ]; - broken = true; # 2018-04-11 - }; -}) diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index 033ba67f661b7..4bff585ac3a9d 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -1,14 +1,14 @@ -{ stdenv, agda, fetchFromGitHub, ghcWithPackages }: +{ stdenv, mkDerivation, fetchFromGitHub, ghcWithPackages }: -agda.mkDerivation (self: rec { - version = "1.1"; - name = "agda-stdlib-${version}"; +mkDerivation rec { + pname = "standard-library"; + version = "1.3"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "190bxsy92ffmvwpmyyg3lxs91vyss2z25rqz1w79gkj56484cy64"; + sha256 = "18kl20z3bjfgx5m3nvrdj5776qmpi7jl2p12pqybsls2lf86m0d5"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; @@ -16,13 +16,11 @@ agda.mkDerivation (self: rec { runhaskell GenerateEverything.hs ''; - topSourceDirectories = [ "src" ]; - meta = with stdenv.lib; { - homepage = http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary; + homepage = "https://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; description = "A standard library for use with the Agda compiler"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; - maintainers = with maintainers; [ jwiegley mudri ]; + maintainers = with maintainers; [ jwiegley mudri alexarice turion ]; }; -}) +} diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index 69517817b5961..d65ff369064eb 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://www.antigrain.com/; + homepage = "http://www.antigrain.com/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index d2021e23b5330..fd612170910e2 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A game programming library"; - homepage = https://liballeg.org/; + homepage = "https://liballeg.org/"; license = licenses.zlib; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch b/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch deleted file mode 100644 index c49ebb550f3f2..0000000000000 --- a/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/addons/allegrogl/include/alleggl.h -+++ b/addons/allegrogl/include/alleggl.h -@@ -63,9 +63,11 @@ typedef __int64 INT64; - /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ - #define __glext_h_ - #define __glxext_h_ -+#define __glx_glxext_h_ - #include <GL/gl.h> - #undef __glext_h_ - #undef __glxext_h_ -+#undef __glx_glxext_h_ - - #endif /* ALLEGRO_MACOSX */ - ---- a/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h -+++ b/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h -@@ -1,7 +1,9 @@ - /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ - #define __glxext_h_ -+#define __glx_glxext_h_ - #include <GL/glx.h> - #undef __glxext_h_ -+#undef __glx_glxext_h_ - - #ifndef GLX_VERSION_1_3 - #define AGLX_VERSION_1_3 diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 64488b25b094b..6071f63255d9e 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -5,15 +5,14 @@ stdenv.mkDerivation rec { pname = "allegro"; - version="4.4.2"; + version="4.4.3.1"; src = fetchurl { url = "https://github.com/liballeg/allegro5/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"; + sha256 = "1m6lz35nk07dli26kkwz3wa50jsrxs1kb6w1nj14a911l34xn6gc"; }; patches = [ - ./allegro4-mesa-18.2.5.patch ./nix-unstable-sandbox-fix.patch ]; @@ -29,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A game programming library"; - homepage = https://liballeg.org/; + homepage = "https://liballeg.org/"; license = licenses.free; # giftware maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix index a4f3b714e1cbc..59926f52b078b 100644 --- a/pkgs/development/libraries/alure/default.nix +++ b/pkgs/development/libraries/alure/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A utility library to help manage common tasks with OpenAL applications"; - homepage = https://kcat.strangesoft.net/alure.html; + homepage = "https://kcat.strangesoft.net/alure.html"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix index bfb72be24fe86..aaee86c62ef73 100644 --- a/pkgs/development/libraries/amrnb/default.nix +++ b/pkgs/development/libraries/amrnb/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation { name = "amrnb-11.0.0.0"; srcAmr = fetchurl { - url = http://www.3gpp.org/ftp/Specs/latest/Rel-11/26_series/26104-b00.zip; + url = "http://www.3gpp.org/ftp/Specs/latest/Rel-11/26_series/26104-b00.zip"; sha256 = "1wf8ih0hk7w20vdlnw7jb7w73v15hbxgbvmq4wq7h2ghn0j8ppr3"; }; src = fetchurl { - url = http://www.penguin.cz/~utx/ftp/amr/amrnb-11.0.0.0.tar.bz2; + url = "http://www.penguin.cz/~utx/ftp/amr/amrnb-11.0.0.0.tar.bz2"; sha256 = "1qgiw02n2a6r32pimnd97v2jkvnw449xrqmaxiivjy2jcr5h141q"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.penguin.cz/~utx/amr; + homepage = "http://www.penguin.cz/~utx/amr"; description = "AMR Narrow-Band Codec"; # The wrapper code is free, but not the libraries from 3gpp. # It's a source code reference implementation with patents and licenses on diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix index 7525b3baab09e..e6581d549115b 100644 --- a/pkgs/development/libraries/amrwb/default.nix +++ b/pkgs/development/libraries/amrwb/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "11.0.0.0"; srcAmr = fetchurl { - url = http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-b00.zip; + url = "http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-b00.zip"; sha256 = "1v4zhs6f1mf1xkrzhljh05890in0rpr5d5pcak9h4igxhd2c91f8"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.penguin.cz/~utx/amr; + homepage = "http://www.penguin.cz/~utx/amr"; description = "AMR Wide-Band Codec"; # The wrapper code is free, but not the libraries from 3gpp. # It's a source code reference implementation with patents and licenses on diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index bbb7e98f661c1..48b230795967c 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation { passthru.updateScript = gnome3.updateScript { packageName = pname; }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Amtk; + homepage = "https://wiki.gnome.org/Projects/Amtk"; description = "Actions, Menus and Toolbars Kit for GTK applications"; maintainers = [ maintainers.manveru ]; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 9fc11555b697c..7ea38b6472b86 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.14.5"; + version = "5.15.12"; src = fetchurl { - sha256 = "0vm8z7rxb9n10xg5xjahy357704fw3q477hmpb83kd1zrc633g54"; + sha256 = "14v117r9zqvrqr79h66r0dm9lyxq3104rcdizcnvk0syz0zbwps1"; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://activemq.apache.org/; + homepage = "http://activemq.apache.org/"; description = "Messaging and Integration Patterns server written in Java"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 4b803554e662f..5b777dff3ea2c 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -23,7 +23,7 @@ , pngquant }: stdenv.mkDerivation rec { - name = "appstream-glib-0.7.16"; + name = "appstream-glib-0.7.17"; outputs = [ "out" "dev" "man" "installedTests" ]; outputBin = "dev"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "appstream-glib"; rev = stdenv.lib.replaceStrings [ "." "-" ] [ "_" "_" ] name; - sha256 = "05x2pmsq18fcpgfvx0y54qdlryy5c9k3sxk6kgank8frkzhgnm9r"; + sha256 = "06pm8l58y0ladimyckbvlslr5bjj9rwb70rgjmn09l41pdpipy2i"; }; nativeBuildInputs = [ @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Objects and helper methods to read and write AppStream metadata"; - homepage = https://people.freedesktop.org/~hughsient/appstream-glib/; + homepage = "https://people.freedesktop.org/~hughsient/appstream-glib/"; license = licenses.lgpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ lethalman matthewbauer ]; diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 62d72844386f4..bffd281d0de47 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Software metadata handling library"; - homepage = https://www.freedesktop.org/wiki/Distributions/AppStream/; + homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; longDescription = '' AppStream is a cross-distro effort for building Software-Center applications and enhancing metadata provided by software components. It provides diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 87563d6a9cbf1..ba12e2d0385ae 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://apr.apache.org/; + homepage = "http://apr.apache.org/"; description = "A companion library to APR, the Apache Portable Runtime"; maintainers = [ maintainers.eelco ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 2ce4b77927f17..ce33c0534fa42 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://apr.apache.org/; + homepage = "http://apr.apache.org/"; description = "The Apache Portable Runtime library"; platforms = platforms.all; license = licenses.asl20; diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 82d11cdc3a4ab..c206630b57b06 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An interface to banking tasks, file formats and country information"; - homepage = http://www2.aquamaniac.de/sites/download/packages.php?package=03&showall=1; + homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=03&showall=1"; hydraPlatforms = []; license = licenses.gpl2Plus; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index ee1fffdacddf4..4c5192574d864 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OS abstraction functions used by aqbanking and related tools"; - homepage = http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1; + homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1"; license = licenses.lgpl21; maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index f6710d4fc576f..ece38b2cb0382 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: +{ stdenv, fetchurl, cmake, blas, lapack, superlu, hdf5 }: stdenv.mkDerivation rec { pname = "armadillo"; - version = "9.860.1"; + version = "9.880.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1ab5y4ll6js2w4p9dabj2dmzzc3f8dja8dqsvy40azrvny58h0qn"; + sha256 = "17sb9hylrr7wl63whr39ypjg7xps32k9z5zdgchj5dyq6n6kw3wh"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ openblasCompat superlu hdf5 ]; + buildInputs = [ blas lapack superlu hdf5 ]; cmakeFlags = [ - "-DLAPACK_LIBRARY=${openblasCompat}/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DLAPACK_LIBRARY=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" "-DDETECT_HDF5=ON" ]; diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix index 21e93a8cd4922..9dd4b1b93a9d0 100644 --- a/pkgs/development/libraries/arrayfire/default.nix +++ b/pkgs/development/libraries/arrayfire/default.nix @@ -1,14 +1,12 @@ { stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig -, cudatoolkit, opencl-clhpp, ocl-icd, fftw, fftwFloat, mkl -, blas, openblas, boost, mesa, libGLU, libGL +, opencl-clhpp, ocl-icd, fftw, fftwFloat +, blas, lapack, boost, mesa, libGLU, libGL , freeimage, python, clfft, clblas , doxygen, buildDocs ? false +, cudaSupport ? false, cudatoolkit }: -let - strOnLinux = stdenv.lib.optionalString stdenv.isLinux; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "arrayfire"; version = "3.6.4"; @@ -21,8 +19,7 @@ in stdenv.mkDerivation rec { "-DAF_BUILD_OPENCL=OFF" "-DAF_BUILD_EXAMPLES=OFF" "-DBUILD_TESTING=OFF" - (strOnLinux "-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib/stubs") - ]; + ] ++ stdenv.lib.optional cudaSupport "-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib/stubs"; patches = [ ./no-download.patch ]; @@ -35,7 +32,7 @@ in stdenv.mkDerivation rec { cp -R --no-preserve=mode,ownership ${opencl-clhpp}/include/CL/cl2.hpp ./build/include/CL/cl2.hpp ''; - preBuild = strOnLinux '' + preBuild = stdenv.lib.optionalString cudaSupport '' export CUDA_PATH="${cudatoolkit}" ''; @@ -49,13 +46,13 @@ in stdenv.mkDerivation rec { buildInputs = [ opencl-clhpp fftw fftwFloat - mkl - openblas + blas lapack libGLU libGL mesa freeimage boost.out boost.dev - ] ++ (stdenv.lib.optional stdenv.isLinux [ cudatoolkit ocl-icd ]) - ++ (stdenv.lib.optional buildDocs [ doxygen ]); + ] ++ (stdenv.lib.optional stdenv.isLinux ocl-icd) + ++ (stdenv.lib.optional cudaSupport cudatoolkit) + ++ (stdenv.lib.optional buildDocs doxygen); meta = with stdenv.lib; { description = "A general-purpose library for parallel and massively-parallel computations"; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 50de0c88a5bef..b559ef96f4398 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,24 +1,24 @@ { stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames, autoconf, boost , brotli, cmake, flatbuffers, gflags, glog, gtest, lz4, perl -, python, rapidjson, snappy, thrift, which, zlib, zstd +, python3, rapidjson, snappy, thrift, which, zlib, zstd , enableShared ? true }: let parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "46c9e977f58f6c5ef1b81f782f3746b3656e5a8c"; - sha256 = "1z2s6zh58nf484s0yraw7b1aqgx66dn2wzp1bzv9ndq03msklwly"; + rev = "bcd9ebcf9204a346df47204fe21b85c8d0498816"; + sha256 = "0m16pqzbvxiaradq088q5ai6fwnz9srbap996397znwppvva479b"; }; in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "0.16.0"; + version = "0.17.1"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "1xdp1yni9i1cpml326s78qql1g832m800h7zjlqmk89983g94696"; + sha256 = "18lyvbibfdw3w77cy5whbq7c6mshn5fg2bhvgw7v226a7cs1rifb"; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -28,19 +28,18 @@ in stdenv.mkDerivation rec { # ./cpp/cmake_modules/ThirdpartyToolchain.cmake # ./cpp/thirdparty/versions.txt url = - "https://github.com/jemalloc/jemalloc/releases/download/5.2.0/jemalloc-5.2.0.tar.bz2"; - sha256 = "1d73a5c5qdrwck0fa5pxz0myizaf3s9alsvhiqwrjahdlr29zgkl"; + "https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2"; + sha256 = "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl"; }; patches = [ # patch to fix python-test ./darwin.patch - # Adjust CMake target names to make -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON work. - # Remove this when updating to the next version. + + # fix musl build (fetchpatch { - name = "arrow-use-upstream-cmake-target-names.patch"; - url = "https://github.com/apache/arrow/commit/396861b38d2f4e805db7c2ecd2c96fff0ca2678b.patch"; - sha256 = "0ki7nx858374anvwyi4szz5hgnnzv4fghdd05c38bzry9rfljgb1"; + url = "https://github.com/apache/arrow/commit/de4168786dfd8ab932f48801e0a7a6b8a370c19d.diff"; + sha256 = "1nl4y1rwdl0gn67v7l05ibc4lwkn6x7fhwbmslmm08cqmwfjsx3y"; stripLen = 1; }) ] ++ lib.optionals (!enableShared) [ @@ -66,8 +65,9 @@ in stdenv.mkDerivation rec { thrift zlib zstd - python.pkgs.python - python.pkgs.numpy + ] ++ lib.optionals enableShared [ + python3.pkgs.python + python3.pkgs.numpy ]; preConfigure = '' @@ -92,8 +92,6 @@ in stdenv.mkDerivation rec { # Parquet options: "-DARROW_PARQUET=ON" "-DPARQUET_BUILD_EXECUTABLES=ON" - "-DTHRIFT_COMPILER=${thrift}/bin/thrift" - "-DTHRIFT_VERSION=${thrift.version}" ] ++ lib.optionals (!enableShared) [ "-DARROW_BUILD_SHARED=OFF" "-DARROW_BOOST_USE_SHARED=OFF" diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix index b8d166507a90a..f1ea8a084187f 100644 --- a/pkgs/development/libraries/asio/generic.nix +++ b/pkgs/development/libraries/asio/generic.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { buildInputs = [ openssl ]; meta = { - homepage = http://asio.sourceforge.net/; + homepage = "http://asio.sourceforge.net/"; description = "Cross-platform C++ library for network and low-level I/O programming"; license = licenses.boost; broken = stdenv.isDarwin; # test when updating to >=1.12.1 diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index 2dcf80ec30dff..68faef7e78627 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -8,17 +8,18 @@ let # dictionary like Debian does. devaMapsSource = fetchzip { name = "aspell-u-deva"; - url = "ftp://ftp.gnu.org/gnu/aspell/dict/mr/aspell6-mr-0.10-0.tar.bz2"; + url = "https://ftp.gnu.org/gnu/aspell/dict/mr/aspell6-mr-0.10-0.tar.bz2"; sha256 = "1v8cdl8x2j1d4vbvsq1xrqys69bbccd6mi03fywrhkrrljviyri1"; }; in stdenv.mkDerivation rec { - name = "aspell-0.60.8"; + pname = "aspell"; + version = "0.60.8"; src = fetchurl { - url = "mirror://gnu/aspell/${name}.tar.gz"; + url = "mirror://gnu/aspell/aspell-${version}.tar.gz"; sha256 = "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr"; }; @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "Spell checker for many languages"; - homepage = http://aspell.net/; + homepage = "http://aspell.net/"; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 05a1c95c81f07..1d7b7a6f98b5b 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -899,7 +899,7 @@ in rec { fullName = "English Computer Jargon"; src = fetchurl { - url = https://mrsatterly.com/computer.dic; + url = "https://mrsatterly.com/computer.dic"; sha256 = "1vzk7cdvcm9r1c6mgxpabrdcpvghdv9mjmnf6iq5wllcif5nsw2b"; }; @@ -909,7 +909,7 @@ in rec { installPhase = "aspell-install en-computers"; meta = { - homepage = https://mrsatterly.com/spelling.html; + homepage = "https://mrsatterly.com/spelling.html"; }; }; @@ -918,12 +918,12 @@ in rec { fullName = "English Scientific Jargon"; src1 = fetchurl { - url = http://jpetrie.net/wp-content/uploads/custom_scientific_US.txt; + url = "http://jpetrie.net/wp-content/uploads/custom_scientific_US.txt"; sha256 = "1nf4py2mg0mlv9s5a7had2wn29z2v6bcca0fs6rbpdn4nqc4s7dm"; }; src2 = fetchurl { - url = http://jpetrie.net/wp-content/uploads/custom_scientific_UK.txt; + url = "http://jpetrie.net/wp-content/uploads/custom_scientific_UK.txt"; sha256 = "0f88il1ds6qazy1ghxviqcwsywrbf6pzl2lmzf4f3qvhdfb6f1y0"; }; @@ -936,7 +936,7 @@ in rec { installPhase = "aspell-install en_US-science en_GB-science"; meta = { - homepage = http://www.jpetrie.net/scientific-word-list-for-spell-checkersspelling-dictionaries/; + homepage = "http://www.jpetrie.net/scientific-word-list-for-spell-checkersspelling-dictionaries/"; }; }; diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index ca33202698277..a6f27f4476b83 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to import various 3D model formats"; - homepage = http://assimp.sourceforge.net/; + homepage = "http://assimp.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index f16b38e3fd84a..6a1ca6d24d36c 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)"; homepage = "https://gitlab.gnome.org/GNOME/at-spi2-atk"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 93e06e8be701b..32667bf66e0ff 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -57,9 +57,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; - homepage = https://gitlab.gnome.org/GNOME/at-spi2-core; + homepage = "https://gitlab.gnome.org/GNOME/at-spi2-core"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 10009c26d8289..b54ba5313011d 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -4,7 +4,7 @@ let pname = "atk"; - version = "2.35.1"; + version = "2.36.0"; in stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "111qajn7kxwmh40drc8i6jc3hnril2rp63n207q92pl47zx614xy"; + sha256 = "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv"; }; outputs = [ "out" "dev" ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { control running applications. ''; - homepage = http://library.gnome.org/devel/atk/; + homepage = "http://library.gnome.org/devel/atk/"; license = stdenv.lib.licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index 5338aa683a7c3..cc45dc5a8d888 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ wrappers for ATK accessibility toolkit"; license = stdenv.lib.licenses.lgpl21Plus; - homepage = https://gtkmm.org; + homepage = "https://gtkmm.org"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index db5ecf3b01694..bd1d86520c0cf 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for audio labelling"; - homepage = https://aubio.org/; + homepage = "https://aubio.org/"; license = licenses.gpl2; maintainers = with maintainers; [ goibhniu marcweber fpletz ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix index 02409d6ace066..7c9b3ef67c9b4 100644 --- a/pkgs/development/libraries/audio/jamomacore/default.nix +++ b/pkgs/development/libraries/audio/jamomacore/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "A C++ platform for building dynamic and reflexive systems with an emphasis on audio and media"; - homepage = http://www.jamoma.org; + homepage = "http://www.jamoma.org"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 0165e8ea0d3c3..593854bb280dd 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -9,7 +9,7 @@ let allBass = { bass = { h = "bass.h"; - version = "2.4.14"; + version = "2.4.15"; so = { i686_linux = "libbass.so"; x86_64-linux = "x64/libbass.so"; @@ -57,7 +57,7 @@ let meta = with stdenv.lib; { description = "Shareware audio library"; - homepage = https://www.un4seen.com/; + homepage = "https://www.un4seen.com/"; license = licenses.unfreeRedistributable; platforms = builtins.attrNames bass.so; }; diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix index 2fde40327e962..bc98dab4ab629 100644 --- a/pkgs/development/libraries/audio/libbs2b/default.nix +++ b/pkgs/development/libraries/audio/libbs2b/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = http://bs2b.sourceforge.net/; + homepage = "http://bs2b.sourceforge.net/"; description = "Bauer stereophonic-to-binaural DSP library"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index a5cbb07947504..df0eecfd0be90 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Reader for AES SOFA files to get better HRTFs"; - homepage = https://github.com/hoene/libmysofa; + homepage = "https://github.com/hoene/libmysofa"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix index 1c5a5302d71c1..d521b7e76abbe 100644 --- a/pkgs/development/libraries/audio/libsmf/default.nix +++ b/pkgs/development/libraries/audio/libsmf/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C library for reading and writing Standard MIDI Files"; - homepage = https://github.com/stump/libsmf; + homepage = "https://github.com/stump/libsmf"; license = licenses.bsd2; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 233b93d6782b7..831cd8c2054ff 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ lv2 ]; meta = with stdenv.lib; { - homepage = http://drobilla.net/software/lilv; + homepage = "http://drobilla.net/software/lilv"; description = "A C library to make the use of LV2 plugins"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index 0f86cd76e2a74..bb2645beda7f9 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "lv2"; - version = "1.16.0"; + version = "1.18.0"; src = fetchurl { url = "https://lv2plug.in/spec/${pname}-${version}.tar.bz2"; - sha256 = "1ppippbpdpv13ibs06b0bixnazwfhiw0d0ja6hx42jnkgdyp5hyy"; + sha256 = "0gs7401xz23q9vajqr31aa2db8dvssgyh5zrvr4ipa6wig7yb8wh"; }; nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ gtk2 libsndfile python3 ]; meta = with stdenv.lib; { - homepage = http://lv2plug.in; + homepage = "https://lv2plug.in"; description = "A plugin standard for audio systems"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index 826c36db1a630..d4a0f671e8f8e 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set C++ wrappers around the LV2 C API"; - homepage = http://lvtoolkit.org; + homepage = "http://lvtoolkit.org"; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix index c4c931ecadef3..f039e574d547a 100644 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ b/pkgs/development/libraries/audio/ntk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Fork of FLTK 1.3.0 with additional functionality"; version = version; - homepage = http://non.tuxfamily.org/; + homepage = "http://non.tuxfamily.org/"; license = stdenv.lib.licenses.lgpl21; maintainers = with stdenv.lib.maintainers; [ magnetophon nico202 ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/audio/qm-dsp/default.nix b/pkgs/development/libraries/audio/qm-dsp/default.nix new file mode 100644 index 0000000000000..d363a559042b7 --- /dev/null +++ b/pkgs/development/libraries/audio/qm-dsp/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, kissfft +}: + +stdenv.mkDerivation rec { + pname = "qm-dsp"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "c4dm"; + repo = pname; + rev = "v${version}"; + sha256 = "e1PtCIzp7zIz+KKRxEGlAXTNqZ35vPgQ4opJKHIPa+4="; + }; + + patches = [ + # Make installable + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/qm-dsp/raw/6eb385e2f970c4150f9c8eba73b558318475ed15/f/qm-dsp-install.patch"; + sha256 = "7JDg9yOECWG7Ql5lIoC4L++R1gUlKfztvED5Ey4YLxw="; + }) + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/qm-dsp/raw/6eb385e2f970c4150f9c8eba73b558318475ed15/f/qm-dsp-flags.patch"; + sha256 = "2HRSbSFxC8DPXOgcflyBYeJI3NwO/1CFmyRdvYo09og="; + postFetch = '' + sed -i 's~/Makefile~/build/linux/Makefile.linux32~g' "$out" + ''; + }) + ]; + + buildInputs = [ + kissfft + ]; + + makefile = "build/linux/Makefile.linux32"; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "LIBDIR=${placeholder "out"}/lib" + ]; + + NIX_CFLAGS_COMPILE = "-I${kissfft}/include/kissfft"; + + meta = with stdenv.lib; { + description = "A C++ library of functions for DSP and Music Informatics purposes"; + homepage = "https://code.soundsoftware.ac.uk/projects/qm-dsp"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index de78385e0ab36..8acd6d3c6664d 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C++ utility library primarily aimed at audio/musical applications"; - homepage = http://drobilla.net/software/raul; + homepage = "http://drobilla.net/software/raul"; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix index fc14236fe24a8..53efa598079b1 100644 --- a/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/pkgs/development/libraries/audio/rtaudio/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set of C++ classes that provide a cross platform API for realtime audio input/output"; - homepage = http://www.music.mcgill.ca/~gary/rtaudio/; + homepage = "http://www.music.mcgill.ca/~gary/rtaudio/"; license = licenses.mit; maintainers = [ maintainers.magnetophon ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index 16527a763c926..d30b1ce6c64c8 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A set of C++ classes that provide a cross platform API for realtime MIDI input/output"; - homepage = http://www.music.mcgill.ca/~gary/rtmidi/; + homepage = "http://www.music.mcgill.ca/~gary/rtmidi/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index 840b50d788f94..cec50290d09e9 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ lv2 serd sord ]; meta = with stdenv.lib; { - homepage = http://drobilla.net/software/sratom; + homepage = "http://drobilla.net/software/sratom"; description = "A library for serialising LV2 atoms to/from RDF"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 8bd460ce5454a..c2496840b7d4c 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); meta = with stdenv.lib; { - homepage = http://drobilla.net/software/suil; + homepage = "http://drobilla.net/software/suil"; description = "A lightweight C library for loading and wrapping LV2 plugin UIs"; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix index 559642e7485eb..f980d42cd7dc0 100644 --- a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix +++ b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Audio processing plugin system for plugins that extract descriptive information from audio data"; - homepage = https://vamp-plugins.org/; + homepage = "https://vamp-plugins.org/"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu maintainers.marcweber ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix index debe7d56f7b0f..c819f355e0b83 100644 --- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = { description = "The successor of clalsadrv, provides easy access to ALSA PCM devices"; version = version; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix index 93bd18abaaefb..2b7d89b30a173 100644 --- a/pkgs/development/libraries/audio/zita-convolver/default.nix +++ b/pkgs/development/libraries/audio/zita-convolver/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Convolution library by Fons Adriaensen"; version = version; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index b0b0186af88c5..2881e56621803 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Resample library by Fons Adriaensen"; version = version; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 680b585643b74..46c29e2fa1255 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for reading and writing audio files in various formats"; - homepage = http://www.68k.org/~michael/audiofile/; + homepage = "http://www.68k.org/~michael/audiofile/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index babfd6849a849..4c7e5321f555c 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ./no-mkdir-localstatedir.patch (fetchpatch { name ="CVE-2017-6519-CVE-2018-100084.patch"; - url = https://github.com/lathiat/avahi/commit/e111def44a7df4624a4aa3f85fe98054bffb6b4f.patch; + url = "https://github.com/lathiat/avahi/commit/e111def44a7df4624a4aa3f85fe98054bffb6b4f.patch"; sha256 = "06n7b7kz6xcc35c7xjfc1kj3k2llyjgi09nhy0ci32l1bhacjw0q"; }) ]; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "mDNS/DNS-SD implementation"; - homepage = http://avahi.org; + homepage = "http://avahi.org"; license = licenses.lgpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ lovek323 globin ]; diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix index a2fdb66d7e953..3e7bc67d25b39 100644 --- a/pkgs/development/libraries/avro-c++/default.nix +++ b/pkgs/development/libraries/avro-c++/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "A C++ library which implements parts of the Avro Specification"; - homepage = https://avro.apache.org/; + homepage = "https://avro.apache.org/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ rasendubi ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index 5d7dedd0e071e..d96930f37f24b 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A C library which implements parts of the Avro Specification"; - homepage = https://avro.apache.org/; + homepage = "https://avro.apache.org/"; license = licenses.asl20; maintainers = with maintainers; [ lblasc ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index b10797d3d56fb..b028813558f52 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "AWS SDK for C common core"; - homepage = https://github.com/awslabs/aws-c-common; + homepage = "https://github.com/awslabs/aws-c-common"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ orivej eelco ]; diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix index cc26c29c9d1d0..ca3203e3a6ab8 100644 --- a/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C99 implementation of the vnd.amazon.eventstream content-type"; - homepage = https://github.com/awslabs/aws-c-event-stream; + homepage = "https://github.com/awslabs/aws-c-event-stream"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ orivej eelco ]; diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index 886383bf96100..de664af86e4e6 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "HW accelerated CRC32c and CRC32"; - homepage = https://github.com/awslabs/aws-checksums; + homepage = "https://github.com/awslabs/aws-checksums"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ orivej eelco ]; diff --git a/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch b/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch new file mode 100644 index 0000000000000..6e4cad9e73cf6 --- /dev/null +++ b/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch @@ -0,0 +1,75 @@ +diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake +index e87252123e..5457bd5910 100644 +--- a/cmake/AWSSDKConfig.cmake ++++ b/cmake/AWSSDKConfig.cmake +@@ -82,6 +82,7 @@ if (AWSSDK_ROOT_DIR) + ) + else() + find_file(AWSSDK_CORE_HEADER_FILE Aws.h ++ "/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core" + "/usr/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core" + "/usr/local/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core" + "C:/Progra~1/AWSSDK/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core" +@@ -97,14 +98,18 @@ if (NOT AWSSDK_CORE_HEADER_FILE) + message(FATAL_ERROR "AWS SDK for C++ is missing, please install it first") + endif() + +-# based on core header file path, inspects the actual AWSSDK_ROOT_DIR +-get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_CORE_HEADER_FILE}" PATH) +-get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) +-get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) +-get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) +- +-if (NOT AWSSDK_ROOT_DIR) +- message(FATAL_ERROR "AWSSDK_ROOT_DIR is not set or can't be calculated from the path of core header file") ++if (IS_ABSOLUTE ${AWSSDK_INSTALL_LIBDIR}) ++ set(AWSSDK_ROOT_DIR "") ++else() ++ # based on core header file path, inspects the actual AWSSDK_ROOT_DIR ++ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_CORE_HEADER_FILE}" PATH) ++ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) ++ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) ++ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) ++ ++ if (NOT AWSSDK_ROOT_DIR) ++ message(FATAL_ERROR "AWSSDK_ROOT_DIR is not set or can't be calculated from the path of core header file") ++ endif() + endif() + + +diff --git a/cmake/utilities.cmake b/cmake/utilities.cmake +index 283a14a138..646aea1da3 100644 +--- a/cmake/utilities.cmake ++++ b/cmake/utilities.cmake +@@ -43,7 +43,8 @@ macro(setup_install) + EXPORT "${PROJECT_NAME}-targets" + ARCHIVE DESTINATION ${ARCHIVE_DIRECTORY} + LIBRARY DESTINATION ${LIBRARY_DIRECTORY} +- RUNTIME DESTINATION ${BINARY_DIRECTORY} ) ++ RUNTIME DESTINATION ${BINARY_DIRECTORY} ++ INCLUDES DESTINATION ${INCLUDE_DIRECTORY} ) + + if (BUILD_SHARED_LIBS) + install( +@@ -57,7 +58,8 @@ macro(setup_install) + install (TARGETS ${PROJECT_NAME} + ARCHIVE DESTINATION ${ARCHIVE_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME} + LIBRARY DESTINATION ${LIBRARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME} +- RUNTIME DESTINATION ${BINARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME}) ++ RUNTIME DESTINATION ${BINARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME} ++ INCLUDES DESTINATION ${INCLUDE_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME}) + endif() + endif() + endmacro() +diff --git a/toolchains/pkg-config.pc.in b/toolchains/pkg-config.pc.in +index 9b519d2772..a61069225c 100644 +--- a/toolchains/pkg-config.pc.in ++++ b/toolchains/pkg-config.pc.in +@@ -1,5 +1,5 @@ +-includedir=@CMAKE_INSTALL_PREFIX@/@INCLUDE_DIRECTORY@ +-libdir=@CMAKE_INSTALL_PREFIX@/@LIBRARY_DIRECTORY@ ++includedir=@INCLUDE_DIRECTORY@ ++libdir=@LIBRARY_DIRECTORY@ + + Name: @PROJECT_NAME@ + Description: @PROJECT_DESCRIPTION@ diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 8024f31095139..94827743bf3d9 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -50,6 +50,12 @@ stdenv.mkDerivation rec { rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp ''; + postFixupHooks = [ + # This bodge is necessary so that the file that the generated -config.cmake file + # points to an existing directory. + ''mkdir -p $out/include'' + ]; + __darwinAllowLocalNetworking = true; patches = [ @@ -57,11 +63,12 @@ stdenv.mkDerivation rec { url = "https://github.com/aws/aws-sdk-cpp/commit/42991ab549087c81cb630e5d3d2413e8a9cf8a97.patch"; sha256 = "0myq5cm3lvl5r56hg0sc0zyn1clbkd9ys0wr95ghw6bhwpvfv8gr"; }) + ./cmake-dirs.patch ]; meta = with lib; { description = "A C++ interface for Amazon Web Services"; - homepage = https://github.com/awslabs/aws-sdk-cpp; + homepage = "https://github.com/awslabs/aws-sdk-cpp"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ eelco orivej ]; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 5a579a0505b0e..dbf7afd596fbb 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Image pixel format conversion library"; - homepage = http://gegl.org/babl/; + homepage = "http://gegl.org/babl/"; license = licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index 60322f530166c..d80413048560b 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { Removes the headache of applications matching into a simple DBus daemon and c wrapper library. ''; - homepage = https://launchpad.net/bamf; + homepage = "https://launchpad.net/bamf"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers; diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/development/libraries/beecrypt/default.nix index d7d6ef5451639..2433edbfe8f3a 100644 --- a/pkgs/development/libraries/beecrypt/default.nix +++ b/pkgs/development/libraries/beecrypt/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "beecrypt-4.2.1"; src = fetchurl { - url = mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz; + url = "mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz"; sha256 = "0pf5k1c4nsj77jfq5ip0ra1gzx2q47xaa0s008fnn6hd11b1yvr8"; }; buildInputs = [ m4 ]; diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index af0053519e3d1..89ef702f4e509 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://cgit.freedesktop.org/beignet/; + homepage = "https://cgit.freedesktop.org/beignet/"; description = "OpenCL Library for Intel Ivy Bridge and newer GPUs"; longDescription = '' The package provides an open source implementation of the OpenCL specification for Intel GPUs. diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix index 16be4600ec61a..27c6637d9fee6 100644 --- a/pkgs/development/libraries/biblesync/default.nix +++ b/pkgs/development/libraries/biblesync/default.nix @@ -1,30 +1,30 @@ -{ stdenv, fetchurl, pkgconfig, cmake, libuuid }: +{ stdenv, fetchFromGitHub, pkgconfig, cmake, libuuid }: -with stdenv.lib; -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "biblesync"; - version = "1.1.2"; + version = "2.1.0"; - src = fetchurl{ - url = "mirror://sourceforge/project/gnomesword/BibleSync/1.1.2/${pname}-${version}.tar.gz"; - sha256 = "0190q2da0ppif2242lahl8xfz01n9sijy60aq1a0545qcp0ilvl8"; + src = fetchFromGitHub { + owner = "karlkleinpaste"; + repo = "biblesync"; + rev = version; + sha256 = "0prmd12jq2cjdhsph5v89y38j7hhd51dr3r1hivgkhczr3m5hf4s"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake libuuid ]; + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ libuuid ]; - meta = { - homepage = http://www.crosswire.org/wiki/BibleSync; + meta = with stdenv.lib; { + homepage = "https://wiki.crosswire.org/BibleSync"; description = "A multicast protocol to Bible software shared conavigation"; longDescription = '' - BibleSync is a multicast protocol to support Bible software - shared co-navigation. It uses LAN multicast in either a - personal/small team mutual navigation motif or in a classroom - environment where there are Speakers plus the Audience. The - library implementing the protocol is a single C++ class - providing a complete yet minimal public interface to support - mode setting, setup for packet reception, transmit on local + BibleSync is a multicast protocol to support Bible software shared + co-navigation. It uses LAN multicast in either a personal/small team + mutual navigation motif or in a classroom environment where there are + Speakers plus the Audience. The library implementing the protocol is a + single C++ class providing a complete yet minimal public interface to + support mode setting, setup for packet reception, transmit on local navigation, and handling of incoming packets. ''; license = licenses.publicDomain; diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index c7520c89ef546..17f7bbc667c5a 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Brokken's Own Base Classes And Templates"; - homepage = https://fbb-git.github.io/bobcat/; + homepage = "https://fbb-git.github.io/bobcat/"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/pkgs/development/libraries/boehm-gc/7.6.6.nix index 1cbbee469e6b8..31997e5857777 100644 --- a/pkgs/development/libraries/boehm-gc/7.6.6.nix +++ b/pkgs/development/libraries/boehm-gc/7.6.6.nix @@ -63,10 +63,10 @@ stdenv.mkDerivation rec { C or C++ programs, though that is not its primary goal. ''; - homepage = https://hboehm.info/gc/; + homepage = "https://hboehm.info/gc/"; # non-copyleft, X11-style license - license = https://hboehm.info/gc/license.txt; + license = "https://hboehm.info/gc/license.txt"; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index f061626a897d6..1af63a2e42608 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -58,10 +58,10 @@ stdenv.mkDerivation rec { C or C++ programs, though that is not its primary goal. ''; - homepage = https://hboehm.info/gc/; + homepage = "https://hboehm.info/gc/"; # non-copyleft, X11-style license - license = https://hboehm.info/gc/license.txt; + license = "https://hboehm.info/gc/license.txt"; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix index b90006a5e979c..92e02c6ca08f5 100644 --- a/pkgs/development/libraries/boost-process/default.nix +++ b/pkgs/development/libraries/boost-process/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.highscore.de/boost/process0.5/; + homepage = "http://www.highscore.de/boost/process0.5/"; description = "Library to manage system processes"; license = licenses.boost; platforms = platforms.unix; diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix index a2fe9447c1254..31f545ab12be3 100644 --- a/pkgs/development/libraries/boost/1.67.nix +++ b/pkgs/development/libraries/boost/1.67.nix @@ -12,20 +12,20 @@ callPackage ./generic.nix (args // { ] ++ stdenv.lib.optionals stdenv.cc.isClang [ # Fixes https://github.com/boostorg/atomic/issues/15 (fetchpatch { - url = https://github.com/boostorg/atomic/commit/6e14ca24dab50ad4c1fa8c27c7dd6f1cb791b534.patch; + url = "https://github.com/boostorg/atomic/commit/6e14ca24dab50ad4c1fa8c27c7dd6f1cb791b534.patch"; sha256 = "102g35ygvv8cxagp9651284xk4vybk93q2fm577y4mdxf5k46b7a"; stripLen = 1; }) # Needed for the next patch (fetchpatch { - url = https://github.com/boostorg/asio/commit/38cb19719748ad56b14d73ca1fff5828f36e5894.patch; + url = "https://github.com/boostorg/asio/commit/38cb19719748ad56b14d73ca1fff5828f36e5894.patch"; sha256 = "0cj9cxz9rfbsx8p8f5alxx00dq3r7g0vh23j68bbxbs9gq1arq2n"; stripLen = 1; }) # Fixes https://github.com/boostorg/asio/pull/91 (fetchpatch { - url = https://github.com/boostorg/asio/commit/43874d5497414c67655d901e48c939ef01337edb.patch; + url = "https://github.com/boostorg/asio/commit/43874d5497414c67655d901e48c939ef01337edb.patch"; sha256 = "1c2ds164s2ygvpb4785p4ncv8ywbpm08cphirb99xp4mqvb693is"; stripLen = 1; }) diff --git a/pkgs/development/libraries/boost/cmake-paths.patch b/pkgs/development/libraries/boost/cmake-paths.patch new file mode 100644 index 0000000000000..b7f90148f9dca --- /dev/null +++ b/pkgs/development/libraries/boost/cmake-paths.patch @@ -0,0 +1,21 @@ +diff --git a/tools/boost_install/boost-install.jam b/tools/boost_install/boost-install.jam +index ad19f7b55..ec6bf57ff 100644 +--- a/tools/boost_install/boost-install.jam ++++ b/tools/boost_install/boost-install.jam +@@ -587,6 +587,7 @@ rule generate-cmake-config- ( target : sources * : properties * ) + "# Compute the include and library directories relative to this file." + "" + "get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" ABSOLUTE)" ++ "get_filename_component(_BOOST_REAL_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" ABSOLUTE)" + : true ; + + if [ path.is-rooted $(cmakedir) ] +@@ -607,6 +608,8 @@ rule generate-cmake-config- ( target : sources * : properties * ) + " unset(_BOOST_CMAKEDIR_ORIGINAL)" + "endif()" + "" ++ "# Assume that the installer actually did know where the libs were to be installed" ++ "get_filename_component(_BOOST_CMAKEDIR \"$(cmakedir-native)\" REALPATH)" + : true ; + } + diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 82bcd49592d4a..6d1c20f323d31 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -28,6 +28,9 @@ assert enableShared || enableStatic; assert enablePython -> stdenv.hostPlatform == stdenv.buildPlatform; assert enableNumpy -> enablePython; +# Boost <1.69 can't be build with clang >8, because pth was removed +assert with stdenv.lib; ((toolset == "clang" && !(versionOlder stdenv.cc.version "8.0.0")) -> !(versionOlder version "1.69")); + with stdenv.lib; let @@ -109,10 +112,11 @@ stdenv.mkDerivation { ++ optional stdenv.isDarwin ( if version == "1.55.0" then ./darwin-1.55-no-system-python.patch - else ./darwin-no-system-python.patch); + else ./darwin-no-system-python.patch) + ++ optional (versionAtLeast version "1.70") ./cmake-paths.patch; meta = { - homepage = http://boost.org/; + homepage = "http://boost.org/"; description = "Collection of C++ libraries"; license = licenses.boost; platforms = platforms.unix ++ platforms.windows; diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix index 9283f37a8c470..a1924f59a8db0 100644 --- a/pkgs/development/libraries/bootil/default.nix +++ b/pkgs/development/libraries/bootil/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { meta = { description = "Garry Newman's personal utility library"; - homepage = https://github.com/garrynewman/bootil; + homepage = "https://github.com/garrynewman/bootil"; # License unsure - see https://github.com/garrynewman/bootil/issues/21 license = stdenv.lib.licenses.free; maintainers = [ stdenv.lib.maintainers.abigailbuccaneer ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation { }; patches = [ (fetchpatch { - url = https://github.com/garrynewman/bootil/pull/22.patch; + url = "https://github.com/garrynewman/bootil/pull/22.patch"; name = "github-pull-request-22.patch"; sha256 = "1qf8wkv00pb9w1aa0dl89c8gm4rmzkxfl7hidj4gz0wpy7a24qa2"; }) ]; diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index 67e2794c8a293..20524cf179cf8 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -3,24 +3,23 @@ # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md stdenv.mkDerivation { pname = "boringssl"; - version = "2017-02-23"; + version = "2019-12-04"; src = fetchgit { url = "https://boringssl.googlesource.com/boringssl"; - rev = "be2ee342d3781ddb954f91f8a7e660c6f59e87e5"; - sha256 = "022zq7wlkhrg6al7drr3555lam3zw5bb10ylf9mznp83s854f975"; + rev = "243b5cc9e33979ae2afa79eaa4e4c8d59db161d4"; + sha256 = "1ak27dln0zqy2vj4llqsb99g03sk0sg25wlp09b58cymrh3gccvl"; }; - buildInputs = [ cmake perl go ]; + nativeBuildInputs = [ cmake perl go ]; enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-Wno-error"; makeFlags = [ "GOCACHE=$(TMPDIR)/go-cache" ]; installPhase = '' - mkdir -p $out/bin $out/include $out/lib + mkdir -p $bin/bin $out/include $out/lib - mv tool/bssl $out/bin + mv tool/bssl $bin/bin mv ssl/libssl.a $out/lib mv crypto/libcrypto.a $out/lib @@ -29,6 +28,8 @@ stdenv.mkDerivation { mv ../include/openssl $out/include ''; + outputs = [ "out" "bin" ]; + meta = with stdenv.lib; { description = "Free TLS/SSL implementation"; homepage = "https://boringssl.googlesource.com"; diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 64b18f389accc..1672970d5051e 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "2D physics engine"; - homepage = https://box2d.org/; + homepage = "https://box2d.org/"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.zlib; diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/development/libraries/brigand/default.nix index 7710747d8004f..cc5564d4bb7a6 100644 --- a/pkgs/development/libraries/brigand/default.nix +++ b/pkgs/development/libraries/brigand/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { longDescription = '' Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library. Everything you were doing with Boost.MPL can be done with Brigand. And if that's not the case, open an issue!''; - homepage = https://github.com/edouarda/brigand; + homepage = "https://github.com/edouarda/brigand"; license = licenses.boost; maintainers = with maintainers; [ pmiddend ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index 9b722602a65c3..d025b8c28ed05 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = https://sourceforge.net/projects/buddy/; + homepage = "https://sourceforge.net/projects/buddy/"; description = "Binary decision diagram package"; license = "as-is"; diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 5b4e37eff9f60..1c9a10356a444 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { Bullet 3D Game Multiphysics Library provides state of the art collision detection, soft body and rigid body dynamics. ''; - homepage = http://bulletphysics.org; + homepage = "http://bulletphysics.org"; license = licenses.zlib; maintainers = with maintainers; [ aforemny ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix index 34a9ee3b6ee87..abb9d3e2ce3d5 100644 --- a/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { Bullet 3D Game Multiphysics Library provides state of the art collision detection, soft body and rigid body dynamics. ''; - homepage = http://bulletphysics.org; + homepage = "http://bulletphysics.org"; license = licenses.zlib; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 0279dc8f5efae..ff9e6aa038f51 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; - sha256 = "0knlnpmwam74v0qa1h9gg4f32vzzz7ays2wbslflf51ilg7nw6jk"; + sha256 = "0wm6hk3rnqhnn2cyw24drqwbfnysp6jyfi8lc1vih5k704a955lf"; }; dontBuild = true; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ tcl ]; meta = { - homepage = https://sourceforge.net/projects/tcllib; + homepage = "https://sourceforge.net/projects/tcllib"; description = "High-level widget set for Tcl/Tk"; license = stdenv.lib.licenses.tcltk; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 9e38398dfad1f..02f0872cee3f4 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C library for asynchronous DNS requests"; - homepage = https://c-ares.haxx.se; + homepage = "https://c-ares.haxx.se"; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index fcc74625b99a7..85905778e8038 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "c-blosc"; - version = "1.17.1"; + version = "1.18.1"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc"; rev = "v${version}"; - sha256 = "1asp3xmbvdnz1mj1pl1ykzz61cybvkxz3cdn43zh1z0x1qlgwm80"; + sha256 = "1ywq8j70149859vvs19wgjq89d6xsvvmvm2n1dmkzpchxgrvnw70"; }; buildInputs = [ cmake ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A blocking, shuffling and loss-less compression library"; - homepage = https://www.blosc.org; + homepage = "https://www.blosc.org"; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index c1415a2837c40..605df2381016c 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.17.4"; + version = "0.17.5"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - sha256 = "04p3kgk1zadadl6n0prwc77nfxrbdasbwbqpws1y9y6f77lrcxdn"; + sha256 = "1w7sanxhh4sv4ap3ildqzlziazcy7ydx2pbjjrf3k60lcwq0lzn6"; }; nativeBuildInputs = [ cmake ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source implementation of the actor model in C++"; - homepage = http://actor-framework.org/; + homepage = "http://actor-framework.org/"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ bobakker tobim ]; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 80f8f9498d7c5..628046a574118 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { ++ optional glSupport libGL ; # TODO: maybe liblzo but what would it be for here? - configureFlags = if stdenv.isDarwin then [ + configureFlags = (if stdenv.isDarwin then [ "--disable-dependency-tracking" "--enable-quartz" "--enable-quartz-font" @@ -71,7 +71,7 @@ in stdenv.mkDerivation rec { ++ optional xcbSupport "--enable-xcb" ++ optional glSupport "--enable-gl" ++ optional pdfSupport "--enable-pdf" - ); + )) ++ optional (!x11Support) "--disable-xlib"; preConfigure = # On FreeBSD, `-ldl' doesn't exist. @@ -112,7 +112,7 @@ in stdenv.mkDerivation rec { when available (e.g., through the X Render Extension). ''; - homepage = http://cairographics.org/; + homepage = "http://cairographics.org/"; license = with licenses; [ lgpl2Plus mpl10 ]; diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index b8d00984cd648..5140205ebc8a2 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "capstone"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { url = "https://github.com/aquynh/capstone/archive/${version}.tar.gz"; - sha256 = "1isxw2qwy1fi3m3w7igsr5klzczxc5cxndz0a78dfss6ps6ymfvr"; + sha256 = "0sjjbqps48az4map0kmai7j7dak3gy0xcq0sgx8fg09g0acdg0bw"; }; # replace faulty macos detection diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index 92e5c04e03221..36d4960cdccba 100644 --- a/pkgs/development/libraries/catch/default.nix +++ b/pkgs/development/libraries/catch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; - homepage = http://catch-lib.net; + homepage = "http://catch-lib.net"; license = licenses.boost; maintainers = with maintainers; [ edwtjo knedlsepp ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index a2b65c9bbb41d..960c07e29df4e 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "2.11.3"; + version = "2.12.1"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="012j7fnlsdyvg6d7gwdab7yzllkv4wqb164lfg4ixahx9l9schmp"; + sha256="163198lizcr84ify34xjj1955rcgsqhwn87dwifiwyamnggn445f"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index cd9d031788a89..dba16b19e3b67 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of the IETF real-time transport protocol (RTP)"; - homepage = https://www.gnu.org/software/ccrtp/; + homepage = "https://www.gnu.org/software/ccrtp/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix index 5897f84efff0a..848927776f901 100644 --- a/pkgs/development/libraries/cctz/default.nix +++ b/pkgs/development/libraries/cctz/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/google/cctz; + homepage = "https://github.com/google/cctz"; description = "C++ library for translating between absolute and civil times"; license = licenses.asl20; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index d84cda5b75011..76b5390fb6934 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [raskin timokau]; platforms = platforms.unix; - homepage = https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html; + homepage = "https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html"; }; } diff --git a/pkgs/development/libraries/cdo/default.nix b/pkgs/development/libraries/cdo/default.nix index 2a3dbc7a2d13b..f582be81e86e2 100644 --- a/pkgs/development/libraries/cdo/default.nix +++ b/pkgs/development/libraries/cdo/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { Supported data formats are GRIB 1/2, netCDF 3/4, SERVICE, EXTRA and IEG. There are more than 600 operators available. ''; - homepage = https://code.mpimet.mpg.de/projects/cdo/; + homepage = "https://code.mpimet.mpg.de/projects/cdo/"; license = licenses.gpl2; maintainers = [ maintainers.ltavard ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix index eaeb6bf8e43f4..aaa93f19131a2 100644 --- a/pkgs/development/libraries/cegui/default.nix +++ b/pkgs/development/libraries/cegui/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ogre freetype boost expat ]; meta = with stdenv.lib; { - homepage = http://cegui.org.uk/; + homepage = "http://cegui.org.uk/"; description = "C++ Library for creating GUIs"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix index 3b7e870b4fe98..6277c5cd931ca 100644 --- a/pkgs/development/libraries/celt/generic.nix +++ b/pkgs/development/libraries/celt/generic.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Ultra-low delay audio codec"; - homepage = http://www.celt-codec.org/; + homepage = "http://www.celt-codec.org/"; license = licenses.bsd2; maintainers = with maintainers; [ codyopel raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/cereal/default.nix b/pkgs/development/libraries/cereal/default.nix index 03a1f9b31799d..e17b42ea5c1d6 100644 --- a/pkgs/development/libraries/cereal/default.nix +++ b/pkgs/development/libraries/cereal/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A header-only C++11 serialization library"; - homepage = https://uscilab.github.io/cereal/; + homepage = "https://uscilab.github.io/cereal/"; platforms = platforms.all; license = licenses.mit; }; diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 3ce8c4ef080ad..26a943791e905 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ library for modeling and solving large, complicated optimization problems"; license = licenses.bsd3; - homepage = http://ceres-solver.org; + homepage = "http://ceres-solver.org"; maintainers = with maintainers; [ giogadi ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index 4b84f73a2585b..1b7dc58c0d661 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://heasarc.gsfc.nasa.gov/fitsio/; + homepage = "https://heasarc.gsfc.nasa.gov/fitsio/"; description = "Library for reading and writing FITS data files"; longDescription = '' CFITSIO is a library of C and Fortran subroutines for reading and diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 334a4758f2b79..0a51e7e592b17 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "02zkfiyklckmivrfvdsrlzvzphkdsgjrz3igncw05dv5pshhq3xx"; }; - # Test can randomly fail: http://hydra.nixos.org/build/7243912 + # Test can randomly fail: https://hydra.nixos.org/build/7243912 doCheck = false; buildInputs = stdenv.lib.optional stdenv.isDarwin CoreServices; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { can be used within source code editors and IDEs. ''; - homepage = https://libcheck.github.io/check/; + homepage = "https://libcheck.github.io/check/"; license = licenses.lgpl2Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 5dd9917bc52bb..017dc1fd9c26b 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A fast and lightweight 2D game physics library"; - homepage = http://chipmunk2d.net/; + homepage = "http://chipmunk2d.net/"; license = licenses.mit; platforms = platforms.unix; # supports Windows and MacOS as well, but those require more work }; diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix index 4f4af87227f33..9b95fd2644463 100644 --- a/pkgs/development/libraries/chmlib/default.nix +++ b/pkgs/development/libraries/chmlib/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = { - homepage = http://www.jedrea.com/chmlib; + homepage = "http://www.jedrea.com/chmlib"; license = stdenv.lib.licenses.lgpl2; description = "A library for dealing with Microsoft ITSS/CHM format files"; platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"]; diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 6ad6a09ec14bd..4702d67a01f2c 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "chromaprint"; - version = "1.4.3"; + version = "1.5.0"; src = fetchurl { url = "https://github.com/acoustid/chromaprint/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "10kz8lncal4s2rp2rqpgc6xyjp0jzcrihgkx7chf127vfs5n067a"; + sha256 = "0sknmyl5254rc55bvkhfwpl4dfvz45xglk1rq8zq5crmwq058fjp"; }; nativeBuildInputs = [ cmake ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; meta = with stdenv.lib; { - homepage = https://acoustid.org/chromaprint; + homepage = "https://acoustid.org/chromaprint"; description = "AcoustID audio fingerprinting library"; maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 89bbdff3bbcbe..8a67ab09a195e 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "cimg"; - version = "2.8.4"; + version = "2.9.0"; - src = fetchurl { - url = "http://cimg.eu/files/CImg_${version}.zip"; - sha256 = "1y4j2dmk4nnc5rx65c2px7r0nfq5117pmqpvi7klp9wmgcjs29gf"; + src = fetchFromGitHub { + owner = "dtschump"; + repo = "CImg"; + rev = "v.${version}"; + sha256 = "1x43c1w2kzr6h3j7y3kwiwb7nba0iymck6bq9psvp53mh9xxrfd1"; }; - nativeBuildInputs = [ unzip ]; - installPhase = '' install -dm 755 $out/include/CImg/plugins $doc/share/doc/cimg/examples @@ -24,6 +24,12 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small, open source, C++ toolkit for image processing"; + longDescription = '' + CImg stands for Cool Image. It is easy to use, efficient and is intended + to be a very pleasant toolbox to design image processing algorithms in + C++. Due to its generic conception, it can cover a wide range of image + processing applications. + ''; homepage = "http://cimg.eu/"; license = licenses.cecill-c; maintainers = [ maintainers.AndersonTorres ]; diff --git a/pkgs/development/libraries/civetweb/default.nix b/pkgs/development/libraries/civetweb/default.nix index 3f8de005ff810..35f8f5e663ada 100644 --- a/pkgs/development/libraries/civetweb/default.nix +++ b/pkgs/development/libraries/civetweb/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Embedded C/C++ web server"; - homepage = https://github.com/civetweb/civetweb; + homepage = "https://github.com/civetweb/civetweb"; license = [ stdenv.lib.licenses.mit ]; }; } diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index 2c8ac5113b12c..aad14bead6602 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/tonyrog/cl; + homepage = "https://github.com/tonyrog/cl"; description = "OpenCL binding for Erlang"; license = licenses.mit; # https://github.com/tonyrog/cl/issues/39 diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index ff8e1ca6759c3..f2377a59e7b28 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://www.cs.wisc.edu/condor/classad/; + homepage = "http://www.cs.wisc.edu/condor/classad/"; description = "The Classified Advertisements library provides a generic means for matching resources"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix index fd4d8d5ca31b0..8b79619dff4b8 100644 --- a/pkgs/development/libraries/clearsilver/default.nix +++ b/pkgs/development/libraries/clearsilver/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast, powerful, and language-neutral HTML template system"; - homepage = http://www.clearsilver.net/; + homepage = "http://www.clearsilver.net/"; license = licenses.free; }; } diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix index 6627f46c18e76..669ce90287bc0 100644 --- a/pkgs/development/libraries/cln/default.nix +++ b/pkgs/development/libraries/cln/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C/C++ library for numbers, a part of GiNaC"; - homepage = https://www.ginac.de/CLN/; + homepage = "https://www.ginac.de/CLN/"; license = licenses.gpl2; platforms = platforms.unix; # Once had cygwin problems }; diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index 47037339d417c..f7a0bd058e718 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; # CLooG-PPL is actually a port of GLooG from PolyLib to PPL. - homepage = http://www.cloog.org/; + homepage = "http://www.cloog.org/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/libraries/cloog/0.18.0.nix b/pkgs/development/libraries/cloog/0.18.0.nix index fa4e19f716ae8..b0f69d42e8cd6 100644 --- a/pkgs/development/libraries/cloog/0.18.0.nix +++ b/pkgs/development/libraries/cloog/0.18.0.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { effective code. ''; - homepage = http://www.cloog.org/; + homepage = "http://www.cloog.org/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix index 902e0b26687b9..be506cdee173b 100644 --- a/pkgs/development/libraries/cloog/default.nix +++ b/pkgs/development/libraries/cloog/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { effective code. ''; - homepage = http://www.cloog.org/; + homepage = "http://www.cloog.org/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index 91347813a24f5..3776f1eac2195 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { CLucene is a port of the very popular Java Lucene text search engine API. ''; - homepage = http://clucene.sourceforge.net; + homepage = "http://clucene.sourceforge.net"; platforms = platforms.unix; license = with licenses; [ asl20 lgpl2 ]; }; diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix index 8451b08537291..d71d01de9e254 100644 --- a/pkgs/development/libraries/clucene-core/default.nix +++ b/pkgs/development/libraries/clucene-core/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { CLucene is a port of the very popular Java Lucene text search engine API. ''; - homepage = http://clucene.sourceforge.net; + homepage = "http://clucene.sourceforge.net"; platforms = platforms.linux; license = with licenses; [ asl20 lgpl2 ]; }; diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 2db4f6bf1ab8f..1a9644991b61e 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "GStreamer bindings for clutter"; - homepage = http://www.clutter-project.org/; + homepage = "http://www.clutter-project.org/"; license = stdenv.lib.licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index d59bc5161af55..973ae344dc928 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Clutter-GTK"; - homepage = http://www.clutter-project.org/; + homepage = "http://www.clutter-project.org/"; license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ lethalman ]; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 6cb2ac6044367..8a70a872b9ef0 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.lgpl2Plus; - homepage = http://www.clutter-project.org/; + homepage = "http://www.clutter-project.org/"; maintainers = with stdenv.lib.maintainers; [ lethalman ]; platforms = stdenv.lib.platforms.mesaPlatforms; diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index e7c02312b66e5..b132e958f67a1 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CommonMark parsing and rendering library and program in C"; - homepage = https://github.com/jgm/cmark; + homepage = "https://github.com/jgm/cmark"; maintainers = [ maintainers.michelk ]; platforms = platforms.unix; license = licenses.bsd2; diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index cb4f3e39aefa7..3b2d748a8366f 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://devernay.free.fr/hacks/cminpack/cminpack.html; + homepage = "http://devernay.free.fr/hacks/cminpack/cminpack.html"; license = stdenv.lib.licenses.bsd3; description = "Software for solving nonlinear equations and nonlinear least squares problems"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/development/libraries/cmocka/default.nix index ae110846ff06f..18c1843623f8e 100644 --- a/pkgs/development/libraries/cmocka/default.nix +++ b/pkgs/development/libraries/cmocka/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { This is the successor of Google's Cmockery.''; - homepage = https://cmocka.org/; + homepage = "https://cmocka.org/"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/cmrt/default.nix b/pkgs/development/libraries/cmrt/default.nix index 11e719b36df4b..512a289152adf 100644 --- a/pkgs/development/libraries/cmrt/default.nix +++ b/pkgs/development/libraries/cmrt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdrm libva ]; meta = with stdenv.lib; { - homepage = https://01.org/linuxmedia; + homepage = "https://01.org/linuxmedia"; description = "Intel C for Media Runtime"; longDescription = "Media GPU kernel manager for Intel G45 & HD Graphics family"; license = licenses.mit; diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix index 9c31b50c02856..1f387f711e72f 100644 --- a/pkgs/development/libraries/codec2/default.nix +++ b/pkgs/development/libraries/codec2/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Speech codec designed for communications quality speech at low data rates"; - homepage = http://www.rowetel.com/blog/?page_id=452; + homepage = "http://www.rowetel.com/blog/?page_id=452"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ markuskowa ]; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 3557f1cf1a2a5..08b3b96784a9f 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -21,12 +21,12 @@ in stdenv.mkDerivation rec { # could be merged, but dev can not make a new release. (fetchpatch { - url = https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=359589; + url = "https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=359589"; sha256 = "0f0d9iddg8zwy853phh7swikg4yzhxxv71fcag36f8gis0j5p998"; }) (fetchpatch { - url = https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056; + url = "https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056"; sha256 = "09fyrdci4727fg6qm5aaapsbv71sf4wgfaqz8jqlyy61dibgg490"; }) diff --git a/pkgs/development/libraries/comedilib/default.nix b/pkgs/development/libraries/comedilib/default.nix new file mode 100644 index 0000000000000..f011c04d88560 --- /dev/null +++ b/pkgs/development/libraries/comedilib/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, flex +, yacc +, xmlto +, docbook_xsl +, docbook_xml_dtd_44 +, swig +, perl +, python3 +}: + +stdenv.mkDerivation rec { + pname = "comedilib"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "Linux-Comedi"; + repo = "comedilib"; + rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "159sv4jdgmcaqz76vazkyxxb85ni7pg14p1qv7y94hib3kspc195"; + }; + + nativeBuildInputs = [ + autoreconfHook + flex + yacc + swig + xmlto + docbook_xml_dtd_44 + docbook_xsl + python3 + perl + ]; + + preConfigure = '' + patchShebangs --build doc/mkref doc/mkdr perl/Comedi.pm + ''; + + configureFlags = [ + "--with-udev-hotplug=${placeholder "out"}/lib" + "--sysconfdir=${placeholder "out"}/etc" + ]; + + outputs = [ "out" "dev" "man" "doc" ]; + + meta = with stdenv.lib; { + description = "The Linux Control and Measurement Device Interface Library"; + homepage = "https://github.com/Linux-Comedi/comedilib"; + license = licenses.lgpl21; + maintainers = [ maintainers.doronbehar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix index cc42407433c56..a54bc75478224 100644 --- a/pkgs/development/libraries/concurrencykit/default.nix +++ b/pkgs/development/libraries/concurrencykit/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library of safe, high-performance concurrent data structures"; - homepage = http://concurrencykit.org; + homepage = "http://concurrencykit.org"; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.thoughtpolice ]; diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix index dfebccc88e356..3c5921541a760 100644 --- a/pkgs/development/libraries/cpp-ipfs-api/default.nix +++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "IPFS C++ API client library"; - homepage = https://github.com/vasild/cpp-ipfs-api; + homepage = "https://github.com/vasild/cpp-ipfs-api"; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index 31c4c70dd9d00..50c4e05dfa1d2 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Collection of open-source libraries for high level network programming"; - homepage = https://cpp-netlib.org; + homepage = "https://cpp-netlib.org"; license = licenses.boost; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 6453ff2a3e913..4b2520d714bd8 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "1c5rs28pavv8zabprjbd2y1sblgqbbhww07qvairh149rahvxi85"; + sha256 = "18sy1jrz5adzy7c8k42kqlpicc4h0igimjqwaa6m9swwkhwiqqjz"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix index 7bb2bad9689df..0063db95770c2 100644 --- a/pkgs/development/libraries/cppcms/default.nix +++ b/pkgs/development/libraries/cppcms/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://cppcms.com; + homepage = "http://cppcms.com"; description = "High Performance C++ Web Framework"; platforms = platforms.linux ; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix index bb521ba3ec0c9..fc65dd7392095 100644 --- a/pkgs/development/libraries/cppdb/default.nix +++ b/pkgs/development/libraries/cppdb/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; meta = with stdenv.lib; { - homepage = http://cppcms.com/sql/cppdb/; + homepage = "http://cppcms.com/sql/cppdb/"; description = "C++ Connectivity library that supports MySQL, PostgreSQL, Sqlite3 databases and generic ODBC drivers"; platforms = platforms.linux ; license = licenses.boost; diff --git a/pkgs/development/libraries/cpptest/default.nix b/pkgs/development/libraries/cpptest/default.nix index e663c87f799ec..5ed06b99f3351 100644 --- a/pkgs/development/libraries/cpptest/default.nix +++ b/pkgs/development/libraries/cpptest/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://cpptest.sourceforge.net/; + homepage = "http://cpptest.sourceforge.net/"; description = "Simple C++ unit testing framework"; maintainers = with maintainers; [ bosu ]; license = stdenv.lib.licenses.lgpl3; diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index beaa5721a4d85..bf65be7157559 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://freedesktop.org/wiki/Software/cppunit/; + homepage = "https://freedesktop.org/wiki/Software/cppunit/"; description = "C++ unit testing framework"; license = licenses.lgpl21; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/cpputest/default.nix b/pkgs/development/libraries/cpputest/default.nix index 28ab31a08ccdb..52d6ce5214ea2 100644 --- a/pkgs/development/libraries/cpputest/default.nix +++ b/pkgs/development/libraries/cpputest/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://cpputest.github.io/; + homepage = "http://cpputest.github.io/"; description = "Unit testing and mocking framework for C/C++"; platforms = stdenv.lib.platforms.linux ; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 78cefe89e3b88..240710b5a50f9 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/zeromq/cppzmq; + homepage = "https://github.com/zeromq/cppzmq"; license = licenses.bsd2; description = "C++ binding for 0MQ"; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index ea3f5e6476bcc..c10a69d72f942 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -18,10 +18,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.cracklib; buildInputs = [ zlib gettext ]; - postPatch = '' + postPatch = stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' chmod +x util/cracklib-format patchShebangs util + '' + '' ln -vs ${toString wordlists} dicts/ ''; @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { installCheckTarget = "test"; meta = with lib; { - homepage = https://github.com/cracklib/cracklib; + homepage = "https://github.com/cracklib/cracklib"; description = "A library for checking the strength of passwords"; license = licenses.lgpl21; # Different license for the wordlist: http://www.openwall.com/wordlists maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/development/libraries/crc32c/default.nix index a7313c2055367..1da2f210c5cf3 100644 --- a/pkgs/development/libraries/crc32c/default.nix +++ b/pkgs/development/libraries/crc32c/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc"; meta = with stdenv.lib; { - homepage = https://github.com/google/crc32c; + homepage = "https://github.com/google/crc32c"; description = "CRC32C implementation with support for CPU-specific acceleration instructions"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ andir ]; diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix index a4313fa94d367..6f101fb5d4717 100644 --- a/pkgs/development/libraries/cre2/default.nix +++ b/pkgs/development/libraries/cre2/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://marcomaggi.github.io/docs/cre2.html; + homepage = "http://marcomaggi.github.io/docs/cre2.html"; description = "C Wrapper for RE2"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/croaring/default.nix b/pkgs/development/libraries/croaring/default.nix index 6e6ee2479d44a..b9c293edfb815 100644 --- a/pkgs/development/libraries/croaring/default.nix +++ b/pkgs/development/libraries/croaring/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Compressed bitset library for C and C++"; - homepage = http://roaringbitmap.org/; + homepage = "http://roaringbitmap.org/"; license = licenses.asl20; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix index 9bfff5c4aa819..ab63b7a21f256 100644 --- a/pkgs/development/libraries/csfml/default.nix +++ b/pkgs/development/libraries/csfml/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DCMAKE_MODULE_PATH=${sfml}/share/SFML/cmake/Modules/" ]; meta = with stdenv.lib; { - homepage = https://www.sfml-dev.org/; + homepage = "https://www.sfml-dev.org/"; description = "Simple and fast multimedia library"; longDescription = '' SFML is a simple, fast, cross-platform and object-oriented multimedia API. diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix index 5696684e91d25..077ac63748c6f 100644 --- a/pkgs/development/libraries/ctpl/default.nix +++ b/pkgs/development/libraries/ctpl/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; meta = with stdenv.lib; { - homepage = http://ctpl.tuxfamily.org/; + homepage = "http://ctpl.tuxfamily.org/"; description = "Template engine library written in C"; platforms = platforms.linux; maintainers = [ maintainers.lethalman ]; diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index ea2230909a2c6..82bbdfc2fc197 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high performance templating engine"; - homepage = http://ctpp.havoc.ru; + homepage = "http://ctpp.havoc.ru"; maintainers = [ maintainers.robbinch ]; platforms = platforms.linux; license = licenses.bsd2; diff --git a/pkgs/development/libraries/cudd/cudd.patch b/pkgs/development/libraries/cudd/cudd.patch new file mode 100644 index 0000000000000..152fa30997f94 --- /dev/null +++ b/pkgs/development/libraries/cudd/cudd.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile.am b/Makefile.am +index 45f216a..39c3c82 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,6 +3,9 @@ ACLOCAL_AMFLAGS = -I m4 + include_HEADERS = cudd/cudd.h + if DDDMP + include_HEADERS += dddmp/dddmp.h ++include_HEADERS += util/util.h ++include_HEADERS += config.h ++include_HEADERS += mtr/mtr.h + endif + if OBJ + include_HEADERS += cplusplus/cuddObj.hh diff --git a/pkgs/development/libraries/cudd/default.nix b/pkgs/development/libraries/cudd/default.nix new file mode 100644 index 0000000000000..6749d2e94c0f4 --- /dev/null +++ b/pkgs/development/libraries/cudd/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "cudd"; + version = "3.0.0"; + + src = fetchurl { + url = "https://davidkebo.com/source/cudd_versions/cudd-3.0.0.tar.gz"; + sha256 = "0sgbgv7ljfr0lwwwrb9wsnav7mw7jmr3k8mygwza15icass6dsdq"; + }; + + configureFlags = [ + "--enable-dddmp" + "--enable-obj" + ]; + + patches = [ + ./cudd.patch + ]; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + homepage = "https://davidkebo.com/cudd"; + description = "Binary Decision Diagram (BDD) library"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ chessai ]; + }; +} diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index 6f53141424270..274a657cb1af8 100644 --- a/pkgs/development/libraries/curlcpp/default.nix +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake curl ]; meta = with stdenv.lib; { - homepage = https://josephp91.github.io/curlcpp/; + homepage = "https://josephp91.github.io/curlcpp/"; description = "Object oriented C++ wrapper for CURL"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/development/libraries/curlpp/default.nix b/pkgs/development/libraries/curlpp/default.nix index 490f472a06620..810bd3f15daba 100644 --- a/pkgs/development/libraries/curlpp/default.nix +++ b/pkgs/development/libraries/curlpp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://www.curlpp.org/; + homepage = "https://www.curlpp.org/"; description = "C++ wrapper around libcURL"; license = licenses.mit; maintainers = with maintainers; [ CrazedProgrammer ]; diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/development/libraries/cutee/default.nix index 1c14454af5c45..661dc7c816c48 100644 --- a/pkgs/development/libraries/cutee/default.nix +++ b/pkgs/development/libraries/cutee/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ Unit Testing Easy Environment"; - homepage = http://www.codesink.org/cutee_unit_testing.html; + homepage = "http://www.codesink.org/cutee_unit_testing.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index 2cf611eed2752..94d9776b54d27 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "cutelyst"; - version = "2.9.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "cutelyst"; repo = "cutelyst"; rev = "v${version}"; - sha256 = "13h2sj131s31qdzdwa3hx7ildmvlk8mv9s0j99kvx1ijaq49z79f"; + sha256 = "1c4cjzx6jkqlblcfc7pkx66py43576y6rky19j7rjiap724q2yk9"; }; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ Web Framework built on top of Qt"; - homepage = https://cutelyst.org/; + homepage = "https://cutelyst.org/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index d9a17aff9418c..353a5ba90611d 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux Nintendo Wiimote interface"; - homepage = http://cwiid.org; + homepage = "http://cwiid.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ bennofs ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/cxx-prettyprint/default.nix b/pkgs/development/libraries/cxx-prettyprint/default.nix index e668e65347770..34dc30abe614e 100644 --- a/pkgs/development/libraries/cxx-prettyprint/default.nix +++ b/pkgs/development/libraries/cxx-prettyprint/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Header only C++ library for pretty printing standard containers"; - homepage = https://github.com/louisdx/cxx-prettyprint; + homepage = "https://github.com/louisdx/cxx-prettyprint"; license = stdenv.lib.licenses.boost; platforms = platforms.all; diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix index 9b6407715df5d..00629339e0863 100644 --- a/pkgs/development/libraries/cxxtest/default.nix +++ b/pkgs/development/libraries/cxxtest/default.nix @@ -18,7 +18,7 @@ in python2Packages.buildPythonApplication { ''; meta = with stdenv.lib; { - homepage = http://cxxtest.com; + homepage = "http://cxxtest.com"; description = "Unit testing framework for C++"; platforms = platforms.unix ; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix index 4c572cf781a6e..ca3c487173295 100644 --- a/pkgs/development/libraries/cxxtools/default.nix +++ b/pkgs/development/libraries/cxxtools/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.tntnet.org/cxxtools.html; + homepage = "http://www.tntnet.org/cxxtools.html"; description = "Comprehensive C++ class library for Unix and Linux"; platforms = stdenv.lib.platforms.linux ; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 68f6a7c5d8b89..1ffb535999240 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { installFlags = lib.optional stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ]; meta = { - homepage = https://www.cyrusimap.org/sasl; + homepage = "https://www.cyrusimap.org/sasl"; description = "Library for adding authentication support to connection-based protocols"; platforms = platforms.unix; license = licenses.bsdOriginal; diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/default.nix index 05e499c73d0c9..bdf4519f9bc30 100644 --- a/pkgs/development/libraries/czmq/default.nix +++ b/pkgs/development/libraries/czmq/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zeromq ]; meta = with stdenv.lib; { - homepage = http://czmq.zeromq.org/; + homepage = "http://czmq.zeromq.org/"; description = "High-level C Binding for ZeroMQ"; license = licenses.mpl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index 6b238074fcabf..799375ba44d52 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, fetchpatch +{ stdenv, fetchFromGitLab , meson, ninja, nasm, pkgconfig , withTools ? false # "dav1d" binary , withExamples ? false, SDL2 # "dav1dplay" binary @@ -9,23 +9,16 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = version; - sha256 = "1gr859xzbqrsp892v9zzzgrg8smnnzgc1jmb68qzl54a4g6jrxm0"; + sha256 = "0zmn4ald518vgs3cc0ga227aimr38h16mkliq5j8mg6p9dn7nx1w"; }; - patches = [ - (fetchpatch { - url = "https://code.videolan.org/videolan/dav1d/-/commit/e04227c5f6729b460e0b8e5fb52eae2d5acd15ef.patch"; - sha256 = "18mpvwviqx0x9k6av98vgpjqlzcjd89g8496zsbf57bw5dadij3l"; - }) - ]; - nativeBuildInputs = [ meson ninja nasm pkgconfig ]; # TODO: doxygen (currently only HTML and not build by default). buildInputs = stdenv.lib.optional withExamples SDL2 diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index bb501fb9c68d4..f439113efb3a7 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (rec { ''; meta = with stdenv.lib; { - homepage = http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html; + homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html"; description = "Berkeley DB"; license = license; platforms = platforms.unix; diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index 2609f47b27601..1c9f71311726e 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-ecore" "--disable-tests" ]; meta = with stdenv.lib; { - homepage = http://dbus-cplusplus.sourceforge.net; + homepage = "http://dbus-cplusplus.sourceforge.net"; description = "C++ API for D-BUS"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index c623779596083..b0dd8e91960f3 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { passthru = { inherit dbus glib; }; meta = { - homepage = https://dbus.freedesktop.org; + homepage = "https://dbus.freedesktop.org"; license = with stdenv.lib.licenses; [ afl21 gpl2 ]; description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism"; maintainers = [ ]; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 5024ea3ef2494..a3e3c4ebd89a2 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple interprocess messaging system"; - homepage = http://www.freedesktop.org/wiki/Software/dbus/; + homepage = "http://www.freedesktop.org/wiki/Software/dbus/"; license = licenses.gpl2Plus; # most is also under AFL-2.1 maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/development/libraries/dbxml/default.nix index b940315aed831..4913cfe284730 100644 --- a/pkgs/development/libraries/dbxml/default.nix +++ b/pkgs/development/libraries/dbxml/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.oracle.com/database/berkeley-db/xml.html; + homepage = "https://www.oracle.com/database/berkeley-db/xml.html"; description = "Embeddable XML database based on Berkeley DB"; license = licenses.agpl3; maintainers = with maintainers; [ danieldk ]; diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/development/libraries/dclib/default.nix index 5a879e04c7d31..6b42af05c1172 100644 --- a/pkgs/development/libraries/dclib/default.nix +++ b/pkgs/development/libraries/dclib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "dclib-0.3.7"; src = fetchurl { - url = ftp://ftp.debian.nl/pub/freebsd/ports/distfiles/dclib-0.3.7.tar.bz2; + url = "ftp://ftp.debian.nl/pub/freebsd/ports/distfiles/dclib-0.3.7.tar.bz2"; sha256 = "02jdzm5hqzs1dv2rd596vgpcjaapm55pqqapz5m94l30v4q72rfc"; }; diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix index cd78d6d8a6aba..802befff14cc3 100644 --- a/pkgs/development/libraries/dclxvi/default.nix +++ b/pkgs/development/libraries/dclxvi/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/agl/dclxvi; + homepage = "https://github.com/agl/dclxvi"; description = "Naehrig, Niederhagen and Schwabe's pairings code, massaged into a shared library"; platforms = platforms.x86_64; license = licenses.publicDomain; diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index a41642745a519..1612b0986006a 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -1,28 +1,61 @@ -{ stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, bash-completion, dbus, gnome3 -, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42 }: +{ stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, python3 +, vala +, libxslt +, pkg-config +, glib +, bash-completion +, dbus +, gnome3 +, libxml2 +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_42 +}: -let - pname = "dconf"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + pname = "dconf"; version = "0.36.0"; + outputs = [ "out" "lib" "dev" "devdoc" ]; + src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0bfs069pjv6lhp7xrzmrhz3876ay2ryqxzc6mlva1hhz34ibprlz"; }; - postPatch = '' - chmod +x meson_post_install.py tests/test-dconf.py - patchShebangs meson_post_install.py - patchShebangs tests/test-dconf.py - ''; + patches = [ + # Fix bash-completion installation + # https://gitlab.gnome.org/GNOME/dconf/merge_requests/58 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/dconf/commit/b3c9423c6151f3c28e526083ea2f04987a780fdf.patch"; + sha256 = "zrIPKmgEpa1iIGUKv03+z+GNwJwgdf2hDATgP3i8qk0="; + }) + ]; - outputs = [ "out" "lib" "dev" "devdoc" ]; + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + python3 + libxslt + libxml2 + glib + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_42 + ]; - nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 glib gtk-doc docbook_xsl docbook_xml_dtd_42 ]; - buildInputs = [ glib bash-completion dbus ]; + buildInputs = [ + glib + bash-completion + dbus + ]; mesonFlags = [ "--sysconfdir=/etc" @@ -31,6 +64,12 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isAarch32 && !stdenv.isAarch64 && !stdenv.isDarwin; + postPatch = '' + chmod +x meson_post_install.py tests/test-dconf.py + patchShebangs meson_post_install.py + patchShebangs tests/test-dconf.py + ''; + passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -38,9 +77,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/dconf; + homepage = "https://wiki.gnome.org/Projects/dconf"; license = licenses.lgpl21Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = gnome3.maintainers; + platforms = platforms.unix; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index dd26e5eb8baab..65f9982b42c35 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library that uses DBus to provide objects allowing you to create Model-View-Controller type programs across DBus"; - homepage = https://launchpad.net/dee; + homepage = "https://launchpad.net/dee"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar worldofpeace ]; diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index f7545bb03d56c..d333b7866655a 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, pkgconfig, flux, zlib +{ stdenv, lib, fetchFromGitHub, fetchpatch +, autoreconfHook, perl, pkgconfig, flux, zlib , libjpeg, freetype, libpng, giflib , enableX11 ? true, xorg , enableSDL ? true, SDL }: @@ -14,6 +15,16 @@ stdenv.mkDerivation rec { sha256 = "0bs3yzb7hy3mgydrj8ycg7pllrd2b6j0gxj596inyr7ihssr3i0y"; }; + patches = [ + # Fixes build in "davinci" with glibc >= 2.28 + # The "davinci" module is only enabled on 32-bit arm. + # https://github.com/deniskropp/DirectFB/pull/17 + (fetchpatch { + url = "https://github.com/deniskropp/DirectFB/commit/3a236241bbec3f15b012b6f0dbe94353d8094557.patch"; + sha256 = "0rj3gv0zlb225sqjz04p4yagy4xacf3210aa8vra8i1f0fv0w4kw"; + }) + ]; + nativeBuildInputs = [ autoreconfHook perl pkgconfig flux ]; buildInputs = [ zlib libjpeg freetype giflib libpng ] diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix index 643e7d3cc5d71..ff81ab7273283 100644 --- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix +++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A D-Bus API for the dLeyna services"; - homepage = https://01.org/dleyna; + homepage = "https://01.org/dleyna"; maintainers = [ maintainers.jtojnar ]; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix index 9d83812fefb75..1f0a9bc7c5976 100644 --- a/pkgs/development/libraries/dleyna-core/default.nix +++ b/pkgs/development/libraries/dleyna-core/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # fix build with gupnp 1.2 # https://github.com/intel/dleyna-core/pull/52 (fetchpatch { - url = https://github.com/intel/dleyna-core/commit/41b2e56f67b6fc9c8c256b86957d281644b9b846.patch; + url = "https://github.com/intel/dleyna-core/commit/41b2e56f67b6fc9c8c256b86957d281644b9b846.patch"; sha256 = "1h758cp65v7qyfpvyqdri7q0gwx85mhdpkb2y8waq735q5q9ib39"; }) ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library of utility functions that are used by the higher level dLeyna"; - homepage = https://01.org/dleyna; + homepage = "https://01.org/dleyna"; maintainers = [ maintainers.jtojnar ]; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix index 18244d83dee73..6b14bbc611a83 100644 --- a/pkgs/development/libraries/dleyna-renderer/default.nix +++ b/pkgs/development/libraries/dleyna-renderer/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to discover and manipulate Digital Media Renderers"; - homepage = https://01.org/dleyna; + homepage = "https://01.org/dleyna"; maintainers = [ maintainers.jtojnar ]; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix index 4730d45595034..90c4df8e6413d 100644 --- a/pkgs/development/libraries/dleyna-server/default.nix +++ b/pkgs/development/libraries/dleyna-server/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # fix build with gupnp 1.2 # https://github.com/intel/dleyna-server/pull/161 (fetchpatch { - url = https://github.com/intel/dleyna-server/commit/96c01c88363d6e5e9b7519bc4e8b5d86cf783e1f.patch; + url = "https://github.com/intel/dleyna-server/commit/96c01c88363d6e5e9b7519bc4e8b5d86cf783e1f.patch"; sha256 = "0p8fn331x2whvn6skxqvfzilx0m0yx2q5mm2wh2625l396m3fzmm"; }) ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to discover, browse and manipulate Digital Media Servers"; - homepage = https://01.org/dleyna; + homepage = "https://01.org/dleyna"; maintainers = [ maintainers.jtojnar ]; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 6d6bef21f39ee..e7cc12e0db51b 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -3,6 +3,7 @@ # see http://dlib.net/compile.html , avxSupport ? true +, cudaSupport ? true }: stdenv.mkDerivation rec { @@ -20,7 +21,9 @@ stdenv.mkDerivation rec { rm -rf dlib/external ''; - cmakeFlags = [ "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ]; + cmakeFlags = [ + "-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}" + "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ]; enableParallelBuilding = true; nativeBuildInputs = [ cmake pkgconfig ]; @@ -28,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A general purpose cross-platform C++ machine learning library"; - homepage = http://www.dlib.net; + homepage = "http://www.dlib.net"; license = licenses.boost; maintainers = with maintainers; [ christopherpoole ma27 ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/dnnl/bash-to-sh.patch b/pkgs/development/libraries/dnnl/bash-to-sh.patch deleted file mode 100644 index 063d9ef952be8..0000000000000 --- a/pkgs/development/libraries/dnnl/bash-to-sh.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index f6810246..e1d2a1f1 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -72,7 +72,7 @@ if(UNIX OR MINGW) - set(test_c_symbols "${CMAKE_CURRENT_BINARY_DIR}/test_c_symbols.c") - add_custom_command( - OUTPUT ${test_c_symbols} -- COMMAND /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/generate_c_symbols_refs.sh -+ COMMAND @bash@/bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/generate_c_symbols_refs.sh - ${CMAKE_CURRENT_SOURCE_DIR}/.. ${test_c_symbols} ${include_dirs} - ) - register_exe(test_c_symbols-c ${test_c_symbols} "test") diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix index 59578ef796ec6..5c4e71a4f871f 100644 --- a/pkgs/development/libraries/docopt_cpp/default.nix +++ b/pkgs/development/libraries/docopt_cpp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++11 port of docopt"; - homepage = https://github.com/docopt/docopt.cpp; + homepage = "https://github.com/docopt/docopt.cpp"; license = with licenses; [ mit boost ]; platforms = platforms.all; maintainers = with maintainers; [ knedlsepp ]; diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix index ae7eca92712cc..f3ed36db31c99 100644 --- a/pkgs/development/libraries/doctest/default.nix +++ b/pkgs/development/libraries/doctest/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "doctest"; - version = "2.3.7"; + version = "2.3.8"; src = fetchFromGitHub { owner = "onqtam"; repo = "doctest"; rev = version; - sha256 = "134lx7pjnglrl4wdmyr9dz3rjb6d4ir6rvapg00gp52n44dbhnrq"; + sha256 = "16w907750jnp98vdzkn72lzwy1zyryaqvfi80lbdp398pj23rq65"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix index a2b2e08fd6226..f6320a64374c6 100644 --- a/pkgs/development/libraries/dotconf/default.nix +++ b/pkgs/development/libraries/dotconf/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A configuration parser library"; maintainers = with maintainers; [ pSub ]; - homepage = https://github.com/williamh/dotconf; + homepage = "https://github.com/williamh/dotconf"; license = licenses.lgpl21Plus; platforms = with platforms; unix; }; diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 5f84440df45ed..aed7dc59bcbcc 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -5,24 +5,25 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "v${version}"; - sha256 = "19snm6cicxagcw9ys2jmjf6fchzs6pwm7h4jmyr0pn6zks2yjf1i"; + sha256 = "04h3wbfv6bkzzmcwaja33x2qkj3czn0p6fgbdgqd1xli8sx2c2k4"; }; nativeBuildInputs = [ autoreconfHook file pkgconfig ]; - buildInputs = [ libco-canonical.dev libuv raft-canonical.dev - sqlite-replication ]; + buildInputs = [ + libco-canonical.dev + libuv + raft-canonical.dev + sqlite-replication + ]; - preConfigure= '' - substituteInPlace configure --replace /usr/bin/ " " - ''; - - doCheck = true; + # tests hang for ever on x86_64-linux + doCheck = false; outputs = [ "dev" "out" ]; @@ -31,9 +32,9 @@ stdenv.mkDerivation rec { Expose a SQLite database over the network and replicate it across a cluster of peers ''; - homepage = https://github.com/CanonicalLtd/dqlite/; + homepage = "https://github.com/CanonicalLtd/dqlite/"; license = licenses.asl20; maintainers = with maintainers; [ joko wucke13 ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 92c97436d7a8c..0d3e2913ce8e1 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { maintainers = with maintainers; [ solson ]; description = "MIDI libraries for Qt5/C++"; - homepage = http://drumstick.sourceforge.net/; + homepage = "http://drumstick.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix index 83c754e292861..e792fe1e0519d 100644 --- a/pkgs/development/libraries/dyncall/default.nix +++ b/pkgs/development/libraries/dyncall/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "1.1"; src = fetchurl { - url = https://www.dyncall.org/r1.1/dyncall-1.1.tar.gz; + url = "https://www.dyncall.org/r1.1/dyncall-1.1.tar.gz"; # https://www.dyncall.org/r1.1/SHA256 sha256 = "cf97fa3f142db832ff34235caa4d69a7d5f16716573d446b2d95069126e88795"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Highly dynamic multi-platform foreign function call interface library"; - homepage = https://www.dyncall.org; + homepage = "https://www.dyncall.org"; license = licenses.isc; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix index 028cd221614bc..29fdd06895939 100644 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { description = "C++ logging library"; - homepage = https://muflihun.github.io/easyloggingpp/; + homepage = "https://muflihun.github.io/easyloggingpp/"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [acowley]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index a9a77f6a9dafc..e3bed6186302b 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://confluence.ecmwf.int/display/ECC/; + homepage = "https://confluence.ecmwf.int/display/ECC/"; license = licenses.asl20; maintainers = with maintainers; [ knedlsepp ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index 765e13fffb917..b6dfd429d75a8 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; description = ''Elliptic curve tools''; - homepage = https://github.com/JohnCremona/eclib; + homepage = "https://github.com/JohnCremona/eclib"; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin timokau ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index f0c7c7d2064eb..835258d5bf26d 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" ]; meta = with stdenv.lib; { - homepage = http://troglobit.com/editline.html; + homepage = "http://troglobit.com/editline.html"; description = "A readline() replacement for UNIX without termcap (ncurses)"; license = licenses.bsdOriginal; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index fa2c3687ba771..1509db1b80dea 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -71,7 +71,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "The EGLStream-based Wayland external platform"; - homepage = https://github.com/NVIDIA/egl-wayland/; + homepage = "https://github.com/NVIDIA/egl-wayland/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ hedning ]; diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix index 13617d67bf574..1fbe6f8893bf9 100644 --- a/pkgs/development/libraries/elementary-cmake-modules/default.nix +++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with lib; { platforms = platforms.linux ++ platforms.darwin; - homepage = https://github.com/elementary/cmake-modules; + homepage = "https://github.com/elementary/cmake-modules"; license = licenses.gpl3Plus; maintainers = [ maintainers.samdroid-apps ]; }; diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix index e968e09459a07..d8e102a0d40be 100644 --- a/pkgs/development/libraries/embree/2.x.nix +++ b/pkgs/development/libraries/embree/2.x.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig cmake ispc tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ]; meta = with stdenv.lib; { description = "High performance ray tracing kernels from Intel"; - homepage = https://embree.github.io/; + homepage = "https://embree.github.io/"; maintainers = with maintainers; [ hodapp ]; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/development/libraries/enchant/1.x.nix b/pkgs/development/libraries/enchant/1.x.nix index ed91f791149d1..0b7b4c9c8b172 100644 --- a/pkgs/development/libraries/enchant/1.x.nix +++ b/pkgs/development/libraries/enchant/1.x.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Generic spell checking library"; - homepage = https://abiword.github.io/enchant; + homepage = "https://abiword.github.io/enchant"; platforms = platforms.unix; badPlatforms = [ "x86_64-darwin" ]; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix index bf6260ca76645..e1172870ede75 100644 --- a/pkgs/development/libraries/enet/default.nix +++ b/pkgs/development/libraries/enet/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "enet-1.3.14"; + name = "enet-1.3.15"; src = fetchurl { url = "http://enet.bespin.org/download/${name}.tar.gz"; - sha256 = "0w780zc6cy8yq4cskpphx0f91lzh51vh9lwyc5ll8hhamdxgbxlq"; + sha256 = "1yxxf9bkx6dx3j8j70fj17c05likyfibb1419ls74hp58qrzdgas"; }; meta = { - homepage = http://enet.bespin.org/; + homepage = "http://enet.bespin.org/"; description = "Simple and robust network communication layer on top of UDP"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index 1009f7ae708c3..15e634fe4b5b6 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A library for handling OpenGL function pointer management"; - homepage = https://github.com/anholt/libepoxy; + homepage = "https://github.com/anholt/libepoxy"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix index 5db6c3808e183..3522ff231ab18 100644 --- a/pkgs/development/libraries/ethash/default.nix +++ b/pkgs/development/libraries/ethash/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto"; - homepage = https://github.com/ethereum/ethash; + homepage = "https://github.com/ethereum/ethash"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nand0p ]; license = licenses.asl20; diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix index 838693ba12d0f..d80fdb2213d51 100644 --- a/pkgs/development/libraries/eventlog/default.nix +++ b/pkgs/development/libraries/eventlog/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { Where you had a simple non-structrured string in syslog() you have a combination of description and tag/value pairs. ''; - homepage = https://www.balabit.com/support/community/products/; + homepage = "https://www.balabit.com/support/community/products/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 819f94cc44f50..8a6dfd1983ef4 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -79,8 +79,9 @@ stdenv.mkDerivation rec { mkdir ../test/tmp export LD_LIBRARY_PATH="$(realpath ../build/lib)" - # Fix tests on Aarch64 - ${stdenv.lib.optionalString stdenv.isAarch64 '' + ${stdenv.lib.optionalString (stdenv.isAarch64 || stdenv.isAarch32) '' + # Fix tests on arm + # https://github.com/Exiv2/exiv2/issues/933 rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py ''} @@ -110,7 +111,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://www.exiv2.org/; + homepage = "https://www.exiv2.org/"; description = "A library and command-line utility to manage image metadata"; platforms = platforms.all; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index bb86ac57832ad..94aee7749ce5f 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.libexpat.org/; + homepage = "http://www.libexpat.org/"; description = "A stream-oriented XML parser library written in C"; platforms = platforms.all; license = licenses.mit; # expat version diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index 7a5afd8e8018a..0f3cb9b27b90c 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source MPEG-4 and MPEG-2 AAC encoder"; - homepage = https://www.audiocoding.com/faac.html; + homepage = "https://www.audiocoding.com/faac.html"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index 29c0252482eaa..1a6d67ba8052f 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "An open source MPEG-4 and MPEG-2 AAC decoder"; - homepage = https://www.audiocoding.com/faad2.html; + homepage = "https://www.audiocoding.com/faad2.html"; license = licenses.gpl2; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix index 75d9146c33570..f1bd647b06d8a 100644 --- a/pkgs/development/libraries/fastjson/default.nix +++ b/pkgs/development/libraries/fastjson/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A fast json library for C"; - homepage = https://github.com/rsyslog/libfastjson; + homepage = "https://github.com/rsyslog/libfastjson"; license = licenses.mit; maintainers = with maintainers; [ nequissimus ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/fastpbkdf2/default.nix b/pkgs/development/libraries/fastpbkdf2/default.nix index e781e2aab838e..59056a9b9a37b 100644 --- a/pkgs/development/libraries/fastpbkdf2/default.nix +++ b/pkgs/development/libraries/fastpbkdf2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A fast PBKDF2-HMAC-{SHA1,SHA256,SHA512} implementation in C"; - homepage = https://github.com/ctz/fastpbkdf2; + homepage = "https://github.com/ctz/fastpbkdf2"; license = licenses.cc0; maintainers = with maintainers; [ ledif ]; }; diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index f6a7f6c12fbf3..8973eda5d826a 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "20.04"; + version = "20.05"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "0ykc2y1w0wh6s3g9xzk3zqscvdjnf59923zxh2x0whxlcvndab2d"; + sha256 = "14i0s0m1n57wjwzy54v1czq0w38xplcdsfn4nz5v6fryaxzr5z60"; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index 0f580e3cd2b48..bde1682e3fc02 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A language independent, scalable, open extension to CG"; - homepage = http://www.fastcgi.com/; + homepage = "http://www.fastcgi.com/"; license = "FastCGI see LICENSE.TERMS"; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix index 77e26f6b5dc2a..22d3bd889e115 100644 --- a/pkgs/development/libraries/fcppt/default.nix +++ b/pkgs/development/libraries/fcppt/default.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, boost, brigand, catch2 }: - +{ stdenv, fetchFromGitHub, cmake, boost, catch2, metal }: stdenv.mkDerivation rec { pname = "fcppt"; - version = "3.2.2"; + version = "3.5.0"; src = fetchFromGitHub { owner = "freundlich"; repo = "fcppt"; rev = version; - sha256 = "09mah52m3lih2n0swpsh8qb72yzl4nixaq99xp7wxyxxprhf4bpa"; + sha256 = "045cmn4sym6ria96l4fsc1vrs8l4xrl1gzkmja82f4ddj8qkji2f"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost catch2 ]; + buildInputs = [ boost catch2 metal ]; - cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_CATCH=true" "-DENABLE_TEST=true" "-DBrigand_INCLUDE_DIR=${brigand}/include" ]; + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=false" "-DENABLE_BOOST=true" "-DENABLE_EXAMPLES=true" "-DENABLE_CATCH=true" "-DENABLE_TEST=true" ]; enableParallelBuilding = true; @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { programming (which is both efficient and syntactically affordable in C++11). ''; - homepage = https://fcppt.org; + homepage = "https://fcppt.org"; license = licenses.boost; maintainers = with maintainers; [ pmiddend ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index 16560f19c8611..53967381570da 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A high-quality implementation of the AAC codec from Android"; - homepage = https://sourceforge.net/projects/opencore-amr/; + homepage = "https://sourceforge.net/projects/opencore-amr/"; license = licenses.asl20; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index b7d5d79544e12..bc84039a9aa2c 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas +{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas, lapack , gmpxx }: + +assert (!blas.isILP64) && (!lapack.isILP64); + stdenv.mkDerivation rec { pname = "fflas-ffpack"; version = "2.4.3"; @@ -23,11 +26,11 @@ stdenv.mkDerivation rec { pkgconfig ] ++ stdenv.lib.optionals doCheck checkInputs; - buildInputs = [ givaro blas ]; + buildInputs = [ givaro blas lapack ]; configureFlags = [ - "--with-blas-libs=-l${blas.linkName}" - "--with-lapack-libs=-l${blas.linkName}" + "--with-blas-libs=-lcblas" + "--with-lapack-libs=-llapacke" ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) # for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284) @@ -49,6 +52,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ raskin timokau ]; platforms = platforms.unix; - homepage = https://linbox-team.github.io/fflas-ffpack/; + homepage = "https://linbox-team.github.io/fflas-ffpack/"; }; } diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 214da206f5625..089d5c4dcca0c 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm +{ stdenv, addOpenGLRunpath, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm /* * Licensing options (yes some are listed twice, filters and such are not listed) */ @@ -416,7 +416,7 @@ stdenv.mkDerivation rec { "--enable-cross-compile" ]; - nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; + nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ]; buildInputs = [ bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm @@ -444,11 +444,18 @@ stdenv.mkDerivation rec { cp -a tools/qt-faststart $out/bin/ ''; + postFixup = optionalString stdenv.isLinux '' + # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found. + # See the explanation in addOpenGLRunpath. + addOpenGLRunpath $out/lib/libavcodec.so + addOpenGLRunpath $out/lib/libavutil.so + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video"; - homepage = https://www.ffmpeg.org/; + homepage = "https://www.ffmpeg.org/"; longDescription = '' FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix index f5ef8e850ddc7..049ef32b72fbf 100644 --- a/pkgs/development/libraries/ffmpeg-sixel/default.nix +++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video, extended to support console graphics"; - homepage = http://www.ffmpeg.org/; + homepage = "http://www.ffmpeg.org/"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index bc423dbd7cae7..f56447668ea62 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -212,7 +212,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video"; - homepage = http://www.ffmpeg.org/; + homepage = "http://www.ffmpeg.org/"; longDescription = '' FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 6f5b1840c2496..82a30337348ac 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ffmpeg libpng libjpeg ]; meta = with stdenv.lib; { - homepage = https://github.com/dirkvdb/ffmpegthumbnailer; + homepage = "https://github.com/dirkvdb/ffmpegthumbnailer"; description = "A lightweight video thumbnailer"; longDescription = "FFmpegthumbnailer is a lightweight video thumbnailer that can be used by file managers to create thumbnails diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 30fb94aa24835..5a87402e0d922 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/FFMS/ffms2/; + homepage = "https://github.com/FFMS/ffms2/"; description = "Libav/ffmpeg based source library for easy frame accurate access"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index fcbcde7453801..ba7e86747a7f0 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Fastest Fourier Transform in the West library"; - homepage = http://www.fftw.org/; + homepage = "http://www.fftw.org/"; license = licenses.gpl2Plus; maintainers = [ maintainers.spwhitt ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index a25f3ea04e27f..f65d283fd1d2b 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ unzip cmake python ]; meta = { - homepage = http://people.cs.ubc.ca/~mariusm/flann/; + homepage = "http://people.cs.ubc.ca/~mariusm/flann/"; license = stdenv.lib.licenses.bsd3; description = "Fast approximate nearest neighbor searches in high dimensional spaces"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 11e86703616c2..825e052ad873c 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -18,7 +18,9 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ cmake ]; enableParallelBuilding = true; - doCheck = true; + cmakeFlags = [ "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" ]; + + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; checkTarget = "test"; meta = { @@ -32,7 +34,7 @@ stdenv.mkDerivation (rec { maintainers = [ stdenv.lib.maintainers.teh ]; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; - homepage = https://google.github.io/flatbuffers/; + homepage = "https://google.github.io/flatbuffers/"; }; } // stdenv.lib.optionalAttrs stdenv.hostPlatform.isMusl { # Remove when updating to the next version. diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/development/libraries/flatcc/default.nix index d49f6d110de68..6239dba2836df 100644 --- a/pkgs/development/libraries/flatcc/default.nix +++ b/pkgs/development/libraries/flatcc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "FlatBuffers Compiler and Library in C for C "; - homepage = https://github.com/dvidelabs/flatcc; + homepage = "https://github.com/dvidelabs/flatcc"; license = [ stdenv.lib.licenses.asl20 ]; }; } diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 462d186c72df6..3c768fc472c78 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -5,11 +5,11 @@ , mpir , mpfr , ntl -, openblas ? null +, openblas ? null, blas, lapack , withBlas ? true }: -assert withBlas -> openblas != null; +assert withBlas -> openblas != null && blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation rec { pname = "flint"; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; - homepage = http://www.flintlib.org/; + homepage = "http://www.flintlib.org/"; downloadPage = "http://www.flintlib.org/downloads.html"; updateWalker = true; }; diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index 4ac8150274cfc..f9e4720f64303 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "A small, fast run-time speech synthesis engine"; - homepage = http://www.festvox.org/flite/; + homepage = "http://www.festvox.org/flite/"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix index 1fe50b402cb64..c40a75edc0902 100644 --- a/pkgs/development/libraries/fltk/1.4.nix +++ b/pkgs/development/libraries/fltk/1.4.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A C++ cross-platform lightweight GUI library"; - homepage = https://www.fltk.org; + homepage = "https://www.fltk.org"; platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index fe7de504b4f33..ad4736533cf02 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A C++ cross-platform lightweight GUI library"; - homepage = https://www.fltk.org; + homepage = "https://www.fltk.org"; platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 6eb6289d376d5..4741a3d156a5c 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,17 +1,34 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "fmt"; - version = "6.1.2"; + version = "6.2.0"; + + outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "fmtlib"; repo = "fmt"; rev = version; - sha256 = "1ngb2fd7c2jnxi3x5kjgxmpixmyc737f77vibij43dl77ybiaihi"; + sha256 = "1vr08a8q94j66gas7ddbpdbq72b2ikd0mkgd5zd3l63610n8qajs"; }; - outputs = [ "out" "dev" ]; + patches = [ + # Fix BC break breaking Kodi + # https://github.com/xbmc/xbmc/issues/17629 + # https://github.com/fmtlib/fmt/issues/1620 + (fetchpatch { + url = "https://github.com/fmtlib/fmt/commit/7d01859ef16e6b65bc023ad8bebfedecb088bf81.patch"; + sha256 = "vdttRGgdltabeRAs4/z0BNtW2dLOhCxtXQFGVFKpEG0="; + }) + + # Fix paths in pkg-config file + # https://github.com/fmtlib/fmt/pull/1657 + (fetchpatch { + url = "https://github.com/fmtlib/fmt/commit/78f041ab5b40a1145ba686aeb8013e8788b08cd2.patch"; + sha256 = "hjE6Q/ubA4UhvuJXgcsA3wiGoDK031P19njQRL9JF8M="; + }) + ]; nativeBuildInputs = [ cmake ]; @@ -28,8 +45,8 @@ stdenv.mkDerivation rec { fmt (formerly cppformat) is an open-source formatting library. It can be used as a fast and safe alternative to printf and IOStreams. ''; - homepage = http://fmtlib.net/; - downloadPage = https://github.com/fmtlib/fmt/; + homepage = "http://fmtlib.net/"; + downloadPage = "https://github.com/fmtlib/fmt/"; maintainers = [ maintainers.jdehaas ]; license = licenses.bsd2; platforms = platforms.all; diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index d44f279d8dec0..e9df0ef4016b5 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -106,9 +106,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library that aggregates people from multiple sources to create metacontacts"; - homepage = https://wiki.gnome.org/Projects/Folks; + homepage = "https://wiki.gnome.org/Projects/Folks"; license = licenses.lgpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 15f29ce77f59c..be648cf5a8451 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open-source C++ library developed and used at Facebook"; - homepage = https://github.com/facebook/folly; + homepage = "https://github.com/facebook/folly"; license = licenses.asl20; # 32bit is not supported: https://github.com/facebook/folly/issues/103 platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix index 635baff796b73..f4cc29892451b 100644 --- a/pkgs/development/libraries/fontconfig/2.10.nix +++ b/pkgs/development/libraries/fontconfig/2.10.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for font customization and configuration"; - homepage = http://fontconfig.org/; + homepage = "http://fontconfig.org/"; license = licenses.bsd2; # custom but very bsd-like platforms = platforms.all; maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 617e058bd8fc5..0518cb257ab2a 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for font customization and configuration"; - homepage = http://fontconfig.org/; + homepage = "http://fontconfig.org/"; license = licenses.bsd2; # custom but very bsd-like platforms = platforms.all; maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index fa4a8c23e2fb4..5dacf53b259f8 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious. Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. ''; - homepage = http://fox-toolkit.org; + homepage = "http://fox-toolkit.org"; license = licenses.lgpl3; maintainers = []; broken = stdenv.isDarwin; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index bb59a34b1cc79..208780a450ed1 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious. Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. ''; - homepage = http://fox-toolkit.org; + homepage = "http://fox-toolkit.org"; license = stdenv.lib.licenses.lgpl3; maintainers = []; platforms = stdenv.lib.platforms.mesaPlatforms; diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix index feccfd1bfd2b9..f266f07a631c9 100644 --- a/pkgs/development/libraries/frame/default.nix +++ b/pkgs/development/libraries/frame/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional enableX11 "--with-x11"; meta = { - homepage = https://launchpad.net/frame; + homepage = "https://launchpad.net/frame"; description = "Handles the buildup and synchronization of a set of simultaneous touches"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/development/libraries/freealut/default.nix index c6ea5bbd23ba3..2c9a893284be8 100644 --- a/pkgs/development/libraries/freealut/default.nix +++ b/pkgs/development/libraries/freealut/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ; meta = { - homepage = http://openal.org/; + homepage = "http://openal.org/"; description = "Free implementation of OpenAL's ALUT standard"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 16c35347bc5de..d23147095fcfe 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation { intended to be a full replacement for GLUT, and has only a few differences. ''; - homepage = http://freeglut.sourceforge.net/; + homepage = "http://freeglut.sourceforge.net/"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 188543bf7bf78..878299f725a6b 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "freeimage-3.18.0"; src = fetchurl { - url = mirror://sourceforge/freeimage/FreeImage3180.zip; + url = "mirror://sourceforge/freeimage/FreeImage3180.zip"; sha256 = "1z9qwi9mlq69d5jipr3v2jika2g0kszqdzilggm99nls5xl7j4zl"; }; @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = { description = "Open Source library for accessing popular graphics image file formats"; - homepage = http://freeimage.sourceforge.net/; + homepage = "http://freeimage.sourceforge.net/"; license = "GPL"; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; unix; diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index 64c0171854265..9021e78a5b69b 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "freenect"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "OpenKinect"; repo = "libfreenect"; rev = "v${version}"; - sha256 = "1963xndbiwgj01q17zv6xbqlsbhfd236dkbdwkbjw4b0gr8kqzq9"; + sha256 = "0was1va167rqshmpn382h36yyprpfi9cwillb6ylppmnfdrfrhrr"; }; buildInputs = [ libusb1 freeglut libGLU libGL libXi libXmu ] @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS"; inherit version; - homepage = http://openkinect.org; + homepage = "http://openkinect.org"; license = with lib.licenses; [ gpl2 asl20 ]; maintainers = with lib.maintainers; [ bennofs ]; platforms = with lib.platforms; linux ++ darwin ; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 52c3f047c1903..96ec3434b7822 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.1.26"; + version = "1.1.39"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "1nqxcnf6lax7grsxhajq87h92ngm487nzzz87kkmh1nzk33r7dwd"; + sha256 = "1p5ixc1hxh9mmhplndf1j87cw9989bp0fh0nsbx6l3p2wnqz9nyl"; }; buildInputs = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; - homepage = https://www.freetds.org; + homepage = "https://www.freetds.org"; license = licenses.lgpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/freetts/default.nix b/pkgs/development/libraries/freetts/default.nix index 8c6f60b980106..f7a605ea872be 100644 --- a/pkgs/development/libraries/freetts/default.nix +++ b/pkgs/development/libraries/freetts/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "freetts-1.2.2"; src = fetchurl { - url = mirror://sourceforge/freetts/freetts-1.2.2-src.zip; + url = "mirror://sourceforge/freetts/freetts-1.2.2-src.zip"; sha256 = "0mnikqhpf4f4jdr0irmibr8yy0dnffx1i257y22iamxi7a6by2r7"; }; buildInputs = [ apacheAnt unzip sharutils jdk ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation { Can be used in combination with KDE accessibility. ''; license = "GPL"; - homepage = http://freetts.sourceforge.net; + homepage = "http://freetts.sourceforge.net"; maintainers = [ lib.maintainers.sander ]; }; } diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 6eaf1bbcc2f4a..408578d9c9398 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { autofit which can be used instead of hinting instructions included in fonts. ''; - homepage = https://www.freetype.org/; + homepage = "https://www.freetype.org/"; license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) platforms = platforms.all; maintainers = with maintainers; [ ttuegel ]; diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix index 560855c908b16..2dc7275559d49 100644 --- a/pkgs/development/libraries/frei0r/default.nix +++ b/pkgs/development/libraries/frei0r/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://frei0r.dyne.org; + homepage = "https://frei0r.dyne.org"; description = "Minimalist, cross-platform, shared video plugins"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index 3b0b30f573b52..35ae4c8e6ca99 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { checkInputs = [ python3 ]; meta = with stdenv.lib; { - homepage = https://github.com/fribidi/fribidi; + homepage = "https://github.com/fribidi/fribidi"; description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)"; license = licenses.lgpl21; platforms = platforms.unix; diff --git a/pkgs/development/libraries/fstrcmp/cross.patch b/pkgs/development/libraries/fstrcmp/cross.patch new file mode 100644 index 0000000000000..f794e3b91da6f --- /dev/null +++ b/pkgs/development/libraries/fstrcmp/cross.patch @@ -0,0 +1,24 @@ +diff '--color=auto' -ur fstrcmp-0.7-D001-old/configure.ac fstrcmp-0.7.D001/configure.ac +--- fstrcmp-0.7-D001-old/configure.ac 2014-03-04 19:13:45.000000000 -0500 ++++ fstrcmp-0.7.D001/configure.ac 2020-04-02 13:57:52.805154634 -0400 +@@ -32,6 +32,8 @@ + AC_OBJEXT + AC_EXEEXT + ++LT_INIT ++ + dnl @synopsis AC_ADD_CFLAGS + dnl + dnl Add the given option to CFLAGS, if it doesn't break the compiler +diff '--color=auto' -ur fstrcmp-0.7-D001-old/Makefile.in fstrcmp-0.7.D001/Makefile.in +--- fstrcmp-0.7-D001-old/Makefile.in 2014-03-04 19:13:45.000000000 -0500 ++++ fstrcmp-0.7.D001/Makefile.in 2020-04-02 13:57:12.355269595 -0400 +@@ -37,6 +37,8 @@ + srcdir = @srcdir@ + VPATH = @srcdir@ + ++top_builddir = $(srcdir) ++ + # + # the name of the install program to use + # diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/development/libraries/fstrcmp/default.nix index 5e8197d5e81ac..46b579d4abd83 100644 --- a/pkgs/development/libraries/fstrcmp/default.nix +++ b/pkgs/development/libraries/fstrcmp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libtool, ghostscript, groff }: +{ stdenv, fetchzip, libtool, ghostscript, groff, autoreconfHook }: stdenv.mkDerivation rec { pname = "fstrcmp"; @@ -9,9 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0yg3y3k0wz50gmhgigfi2dx725w1gc8snb95ih7vpcnj6kabgz9a"; }; + patches = [ ./cross.patch ]; + outputs = [ "out" "dev" "doc" "man" "devman" ]; - nativeBuildInputs = [ libtool ghostscript groff ]; + nativeBuildInputs = [ libtool ghostscript groff autoreconfHook ]; enableParallelBuilding = true; @@ -22,8 +24,8 @@ stdenv.mkDerivation rec { comparisons of strings and byte arrays, including multi-byte character strings. ''; - homepage = http://fstrcmp.sourceforge.net/; - downloadPage = https://sourceforge.net/projects/fstrcmp/; + homepage = "http://fstrcmp.sourceforge.net/"; + downloadPage = "https://sourceforge.net/projects/fstrcmp/"; license = licenses.gpl3; maintainers = [ maintainers.sephalon ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix index 40ffe6918a4f8..7b1adb3e3f0c3 100644 --- a/pkgs/development/libraries/fstrm/default.nix +++ b/pkgs/development/libraries/fstrm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Frame Streams implementation in C"; - homepage = https://github.com/farsightsec/fstrm; + homepage = "https://github.com/farsightsec/fstrm"; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index a99228efcf4d0..a0ce9db815bc9 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -18,10 +18,12 @@ stdenv.mkDerivation { [ libGL libGLU ]) ; + configureFlags = [ "--with-ft-prefix=${stdenv.lib.getDev freetype}" ]; + enableParallelBuilding = true; meta = { - homepage = https://sourceforge.net/apps/mediawiki/ftgl/; + homepage = "https://sourceforge.net/apps/mediawiki/ftgl/"; description = "Font rendering library for OpenGL applications"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix index 04903cc5e9eee..064dbb39a2f97 100644 --- a/pkgs/development/libraries/funambol/default.nix +++ b/pkgs/development/libraries/funambol/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "funambol-client-cpp-9.0.0"; src = fetchurl { - url = mirror://sourceforge/funambol/funambol-client-sdk-9.0.0.zip; + url = "mirror://sourceforge/funambol/funambol-client-sdk-9.0.0.zip"; sha256 = "1667gahz30i5r8kbv7w415z0hbgm6f6pln1137l5skapi1if6r73"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "SyncML client sdk by Funambol project"; - homepage = http://www.funambol.com; + homepage = "http://www.funambol.com"; license = licenses.agpl3; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix index 21975766e74e6..7167112b6bd19 100644 --- a/pkgs/development/libraries/g2o/default.nix +++ b/pkgs/development/libraries/g2o/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, cmake, eigen, suitesparse, libGLU, qt5 -, libsForQt5, makeWrapper }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, libGLU +, qtbase, libqglviewer, makeWrapper }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "g2o"; - version = "unstable-2019-04-07"; + version = "20200410"; src = fetchFromGitHub { owner = "RainerKuemmerle"; repo = pname; - rev = "9b41a4ea5ade8e1250b9c1b279f3a9c098811b5a"; - sha256 = "1rgrz6zxiinrik3lgwgvsmlww1m2fnpjmvcx1mf62xi1s2ma5w2i"; + rev = "${version}_git"; + sha256 = "11rgj2g9mmwajlr69pjkjvxjyn88afa0r4bchjyvmxswjccizlg2"; }; # Removes a reference to gcc that is only used in a debug message @@ -18,11 +18,14 @@ stdenv.mkDerivation rec { separateDebugInfo = true; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ eigen suitesparse libGLU qt5.qtbase libsForQt5.libqglviewer ]; + buildInputs = [ eigen suitesparse libGLU qtbase libqglviewer ]; + + # Silence noisy warning + CXXFLAGS = "-Wno-deprecated-copy"; cmakeFlags = [ # Detection script is broken - "-DQGLVIEWER_INCLUDE_DIR=${libsForQt5.libqglviewer}/include/QGLViewer" + "-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer" "-DG2O_BUILD_EXAMPLES=OFF" ] ++ lib.optionals stdenv.isx86_64 ([ "-DDO_SSE_AUTODETECT=OFF" ] ++ { default = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ]; @@ -35,16 +38,11 @@ stdenv.mkDerivation rec { skylake-avx512 = [ "-DDISABLE_SSE4_A=ON" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"}); - postInstall = '' - wrapProgram $out/bin/g2o_viewer \ - --prefix QT_PLUGIN_PATH : "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}" - ''; - - meta = { + meta = with lib; { description = "A General Framework for Graph Optimization"; homepage = "https://github.com/RainerKuemmerle/g2o"; - license = with lib.licenses; [ bsd3 lgpl3 gpl3 ]; - maintainers = with lib.maintainers; [ lopsided98 ]; - platforms = lib.platforms.all; + license = with licenses; [ bsd3 lgpl3 gpl3 ]; + maintainers = with maintainers; [ lopsided98 ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 611c9faa851f1..38451571d8b67 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (rec { ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "fix-pthread-mutex.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; + url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz"; }); meta = with stdenv.lib; { - homepage = https://people.gnome.org/~veillard/gamin/; + homepage = "https://people.gnome.org/~veillard/gamin/"; description = "A file and directory monitoring system"; maintainers = with maintainers; [ lovek323 ]; license = licenses.gpl2; diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index a883b2c1d10ca..cf9b04863043b 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An interactive Gtk canvas widget for graph-based interfaces"; - homepage = http://drobilla.net; + homepage = "http://drobilla.net"; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/garmintools/default.nix b/pkgs/development/libraries/garmintools/default.nix index a086648c91245..aa6ebfd33959a 100644 --- a/pkgs/development/libraries/garmintools/default.nix +++ b/pkgs/development/libraries/garmintools/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, libusb }: +{ stdenv, fetchurl, libusb-compat-0_1 }: stdenv.mkDerivation { name = "garmintools-0.10"; src = fetchurl { url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/garmintools/garmintools-0.10.tar.gz"; sha256 = "1vjc8h0z4kx2h52yc3chxn3wh1krn234fg12sggbia9zjrzhpmgz"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; meta = { description = "Provides the ability to communicate with the Garmin Forerunner 305 via the USB interface"; homepage = "https://code.google.com/archive/p/garmintools/"; # community clone at https://github.com/ianmartin/garmintools diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index a990da4b010ee..cafbe116b1ced 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A microbenchmark support library"; - homepage = https://github.com/google/benchmark; + homepage = "https://github.com/google/benchmark"; license = licenses.asl20; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 9946ebc05a548..0034f7ed63333 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { description = "GObject library to create cabinet files"; homepage = "https://gitlab.gnome.org/GNOME/gcab"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix index 2589b6cfa16bc..2a11d835a6b53 100644 --- a/pkgs/development/libraries/gcc/libstdc++/5.nix +++ b/pkgs/development/libraries/gcc/libstdc++/5.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://gcc.gnu.org/; + homepage = "https://gcc.gnu.org/"; license = licenses.lgpl3Plus; description = "GNU Compiler Collection, version ${version} -- C++ standard library"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index f3625a0e35583..55827b1ad0bcc 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; description = "GNOME crypto services (daemon and tools)"; homepage = "https://gitlab.gnome.org/GNOME/gcr"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 6f57d735980d1..4a0d918cabeab 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "gd"; - version = "2.2.5"; + version = "2.3.0"; src = fetchurl { url = "https://github.com/libgd/libgd/releases/download/${pname}-${version}/libgd-${version}.tar.xz"; - sha256 = "0lfy5f241sbv8s3splm2zqiaxv7lxrcshh875xryryk7yk5jqc4c"; + sha256 = "0n5czhxzinvjvmhkf5l9fwjdx5ip69k5k7pj6zwb6zs1k9dibngc"; }; hardeningDisable = [ "format" ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 2 tests meta = with stdenv.lib; { - homepage = https://libgd.github.io/; + homepage = "https://libgd.github.io/"; description = "A dynamic image creation library"; license = licenses.free; # some custom license platforms = platforms.unix; diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/pkgs/development/libraries/gdal/2.4.0.nix index f914a112e106e..201bec30e2220 100644 --- a/pkgs/development/libraries/gdal/2.4.0.nix +++ b/pkgs/development/libraries/gdal/2.4.0.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { meta = { description = "Translator library for raster geospatial data formats"; - homepage = https://www.gdal.org/; + homepage = "https://www.gdal.org/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index 6a086d9c998de..3695407b8f2f2 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = { description = "Translator library for raster geospatial data formats"; - homepage = https://www.gdal.org/; + homepage = "https://www.gdal.org/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix index 58036351a09f5..893fc4f8d27ce 100644 --- a/pkgs/development/libraries/gdata-sharp/default.nix +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://code.google.com/archive/p/google-gdata/; + homepage = "https://code.google.com/archive/p/google-gdata/"; description = "The Google Data APIs"; longDescription = '' diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 830a311db706a..6cee01e799e7d 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { For compatibility with programs using old UNIX dbm function, the package also provides traditional dbm and ndbm interfaces. ''; - homepage = https://www.gnu.org/software/gdbm/; + homepage = "https://www.gnu.org/software/gdbm/"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index a227245f6db01..165fe3a25287c 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Grassroots DICOM (GDCM) is an implementation of the DICOM standard designed to be open source so that researchers may access clinical data directly. GDCM includes a file format definition and a network communications protocol, both of which should be extended to provide a full set of tools for a researcher or small medical imaging vendor to interface with an existing medical database. ''; - homepage = http://gdcm.sourceforge.net/; + homepage = "http://gdcm.sourceforge.net/"; license = with licenses; [ bsd3 asl20 ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 0ecbb35c16705..82fbbc967efc0 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43 - gtk-doc gobject-introspection makeWrapper + gtk-doc gobject-introspection makeWrapper glib ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { + '' moveToOutput "bin" "$dev" moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" - + '' + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ $dev/bin/gdk-pixbuf-query-loaders --update-cache ''; @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for image loading and manipulation"; - homepage = http://library.gnome.org/devel/gdk-pixbuf/; + homepage = "http://library.gnome.org/devel/gdk-pixbuf/"; maintainers = [ maintainers.eelco ]; license = licenses.lgpl21; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh index 06958be321313..bdfd00009dc5d 100644 --- a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh +++ b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh @@ -14,4 +14,4 @@ findGdkPixbufLoaders() { } -addEnvHooks "$hostOffset" findGdkPixbufLoaders +addEnvHooks "$targetOffset" findGdkPixbufLoaders diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix index c4baaa3fae981..32cf4ac2a7b6c 100644 --- a/pkgs/development/libraries/gdl/default.nix +++ b/pkgs/development/libraries/gdl/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gnome docking library"; - homepage = https://developer.gnome.org/gdl/; - maintainers = gnome3.maintainers; + homepage = "https://developer.gnome.org/gdl/"; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/development/libraries/gdome2/default.nix index e8982c4b70a42..e38cb7535b001 100644 --- a/pkgs/development/libraries/gdome2/default.nix +++ b/pkgs/development/libraries/gdome2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { patches = [ ./xml-document.patch ]; meta = with stdenv.lib; { - homepage = http://gdome2.cs.unibo.it/; + homepage = "http://gdome2.cs.unibo.it/"; description = "DOM C library developed for the Gnome project"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ prikhi roconnor ]; diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix index 0d96b9b5a9240..545bdd12982e5 100644 --- a/pkgs/development/libraries/gecode/3.nix +++ b/pkgs/development/libraries/gecode/3.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.mit; - homepage = https://www.gecode.org; + homepage = "https://www.gecode.org"; description = "Toolkit for developing constraint-based systems"; platforms = platforms.all; maintainers = [ maintainers.manveru ]; diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix index 454e811447a17..9d37199bff47e 100644 --- a/pkgs/development/libraries/gecode/default.nix +++ b/pkgs/development/libraries/gecode/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.mit; - homepage = https://www.gecode.org; + homepage = "https://www.gecode.org"; description = "Toolkit for developing constraint-based systems"; platforms = platforms.all; maintainers = [ ]; diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 803cf853be142..4810390ac1b33 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -46,8 +46,13 @@ stdenv.mkDerivation rec { }; patches = [ - # Remove gegl:simple / backend-file test that times out frequently - ./patches/no-simple-backend-file-test.patch + # Prevent deadlock making tests time-out + # https://gitlab.gnome.org/GNOME/gegl/issues/226 + # https://gitlab.gnome.org/GNOME/glib/issues/1941 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gegl/commit/1d530816266b52c8788bbe1504c5b2d6eceba036.patch"; + sha256 = "8PlUcLQkuskjDGCA2obUPDW3jE++A6B5YWVgvn+GFrU="; + }) ]; nativeBuildInputs = [ @@ -116,7 +121,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graph-based image processing framework"; - homepage = http://www.gegl.org; + homepage = "http://www.gegl.org"; license = licenses.gpl3; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index e90cc257e7e87..1b8643172177f 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Graph-based image processing framework"; - homepage = http://www.gegl.org; + homepage = "http://www.gegl.org"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch b/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch deleted file mode 100644 index bf07572182b39..0000000000000 --- a/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/tests/simple/meson.build b/tests/simple/meson.build -index 2c735d80a..ae4d50f2a 100644 ---- a/tests/simple/meson.build -+++ b/tests/simple/meson.build -@@ -1,5 +1,4 @@ - testnames = [ -- 'backend-file', - 'buffer-cast', - 'buffer-changes', - 'buffer-extract', diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 1b3d5ba4b7c06..fd3924fec3ea0 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { description = "A library for input gesture recognition"; - homepage = https://launchpad.net/geis; + homepage = "https://launchpad.net/geis"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index 20e2f6905ce85..684bad14dda51 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "1.3.3"; + version = "2.0.5"; src = fetchFromGitHub { owner = "cminyard"; repo = "${pname}"; rev = "v${version}"; - sha256 = "04yrm3kg8m77kh6z0b9yw4h43fm0d54wnyrd8lp5ddn487kawm5g"; + sha256 = "1j6c6vmnip24pxafk29y312vif1xlryymv7aaxgqp9ca3s91nlrf"; }; configureFlags = [ diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index 89c00308dd742..ec9bf2e5cb991 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A convenience library for the geocoding and reverse geocoding using Nominatim service"; license = licenses.lgpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index b8e056edb4162..4e7ce1d5ac85a 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "geos-3.8.0"; + name = "geos-3.8.1"; src = fetchurl { url = "https://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "1mb2v9fy1gnbjhcgv0xny11ggfb17vkzsajdyibigwsxr4ylq4cr"; + sha256 = "1xqpmr10xi0n9sj47fbwc89qb0yr9imh4ybk0jsxpffy111syn22"; }; enableParallelBuilding = true; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ port of the Java Topology Suite (JTS)"; - homepage = https://trac.osgeo.org/geos; + homepage = "https://trac.osgeo.org/geos"; license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix index 0e0477cd24daa..28bbe61d53d80 100644 --- a/pkgs/development/libraries/getdata/default.nix +++ b/pkgs/development/libraries/getdata/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; platforms = platforms.all; maintainers = [ maintainers.vbgl ]; - homepage = http://getdata.sourceforge.net/; + homepage = "http://getdata.sourceforge.net/"; }; } diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index c28afa174181f..6adc147c6accc 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { GNU packages produce multi-lingual messages. ''; - homepage = https://www.gnu.org/software/gettext/; + homepage = "https://www.gnu.org/software/gettext/"; maintainers = with maintainers; [ zimbatm vrthra ]; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 7203f8531c276..14b19bf5a09b7 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/gexiv2; + homepage = "https://wiki.gnome.org/Projects/gexiv2"; description = "GObject wrapper around the Exiv2 photo metadata library"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix index 4697f28bb9fb6..2409ee314d645 100644 --- a/pkgs/development/libraries/gf2x/default.nix +++ b/pkgs/development/libraries/gf2x/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = ''Routines for fast arithmetic in GF(2)[x]''; - homepage = http://gf2x.gforge.inria.fr; + homepage = "http://gf2x.gforge.inria.fr"; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin timokau ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix index 235cd19507134..9fd26b1dfe8e5 100644 --- a/pkgs/development/libraries/gfbgraph/default.nix +++ b/pkgs/development/libraries/gfbgraph/default.nix @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GFBGraph; + homepage = "https://wiki.gnome.org/Projects/GFBGraph"; description = "GLib/GObject wrapper for the Facebook Graph API"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/gflags/default.nix b/pkgs/development/libraries/gflags/default.nix index b09936f292409..733a572ac61b0 100644 --- a/pkgs/development/libraries/gflags/default.nix +++ b/pkgs/development/libraries/gflags/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { As such it's a replacement for getopt(). It was owned by Google. google-gflags project has been renamed to gflags and maintained by new community. ''; - homepage = https://gflags.github.io/gflags/; + homepage = "https://gflags.github.io/gflags/"; license = licenses.bsd3; maintainers = [ maintainers.linquize ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix index b166a69043e82..2cb7a9dfe545f 100644 --- a/pkgs/development/libraries/giblib/default.nix +++ b/pkgs/development/libraries/giblib/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://linuxbrit.co.uk/giblib/; + homepage = "http://linuxbrit.co.uk/giblib/"; description = "wrapper library for imlib2, and other stuff"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/giflib/4.1.nix b/pkgs/development/libraries/giflib/4.1.nix index 941a7c27feafd..954e508152c28 100644 --- a/pkgs/development/libraries/giflib/4.1.nix +++ b/pkgs/development/libraries/giflib/4.1.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "giflib-4.1.6"; src = fetchurl { - url = mirror://sourceforge/giflib/giflib-4.1.6.tar.bz2; + url = "mirror://sourceforge/giflib/giflib-4.1.6.tar.bz2"; sha256 = "1v9b7ywz7qg8hli0s9vv1b8q9xxb2xvqq2mg1zpr73xwqpcwxhg1"; }; diff --git a/pkgs/development/libraries/giflib/libungif.nix b/pkgs/development/libraries/giflib/libungif.nix index 6336d30aebada..30cfa0db86a6e 100644 --- a/pkgs/development/libraries/giflib/libungif.nix +++ b/pkgs/development/libraries/giflib/libungif.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libungif-4.1.4"; src = fetchurl { - url = mirror://sourceforge/giflib/libungif-4.1.4.tar.gz; + url = "mirror://sourceforge/giflib/libungif-4.1.4.tar.gz"; sha256 = "5e65e1e5deacd0cde489900dbf54c6c2ee2ebc818199e720dbad685d87abda3d"; }; diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix index affd57c06bc16..d7df4ab721279 100644 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GIO API bindings"; - homepage = https://github.com/mono/gio-sharp; + homepage = "https://github.com/mono/gio-sharp"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 8d52f190d0163..3f02799503382 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, python3 -, zlib, libssh2, openssl, http-parser +, zlib, libssh2, openssl, pcre, http-parser , libiconv, Security }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 pkgconfig ]; - buildInputs = [ zlib libssh2 openssl http-parser ] + buildInputs = [ zlib libssh2 openssl pcre http-parser ] ++ stdenv.lib.optional stdenv.isDarwin Security; propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 6011dd03a46cf..fdaf518c6114f 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [autoconf automake libtool gmpxx]; + buildInputs = [autoconf automake libtool]; + propagatedBuildInputs = [ gmpxx ]; configureFlags = [ "--disable-optimization" diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 171016388c18c..ee29c6a97a457 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -28,11 +28,11 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.64.1"; + version = "1.64.2"; src = fetchurl { url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0z4qx4s3174b1w5b0slnn6jwpy2c18s4fvx4xii2kflr7s4q7bsm"; + sha256 = "0ywrsfmkxaw11z83dnmb9yqkn6k3c1mkxw2mv6arbwad6x6q7zqm"; }; outputs = [ "out" "dev" "installedTests" ]; @@ -122,7 +122,7 @@ in stdenv.mkDerivation rec { description = "JavaScript bindings for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Home.md"; license = licenses.lgpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix index 2ed717a49b855..85a9944fcf7bc 100644 --- a/pkgs/development/libraries/gl2ps/default.nix +++ b/pkgs/development/libraries/gl2ps/default.nix @@ -2,12 +2,12 @@ , zlib, libGL, libGLU, libpng, freeglut }: stdenv.mkDerivation rec { - version = "1.4.1"; + version = "1.4.2"; pname = "gl2ps"; src = fetchurl { url = "http://geuz.org/gl2ps/src/${pname}-${version}.tgz"; - sha256 = "0fsx5lh9pz1xswr4yng24j4ngiijnanksbgz05bfzkh07m5h6qkk"; + sha256 = "1sgzv547h7hrskb9qd0x5yp45kmhvibjwj2mfswv95lg070h074d"; }; buildInputs = [ diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix index 6498419bc27d9..9ce5a23f97059 100644 --- a/pkgs/development/libraries/glbinding/default.nix +++ b/pkgs/development/libraries/glbinding/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake libGLU xlibsWrapper ]; meta = with stdenv.lib; { - homepage = https://github.com/cginternals/glbinding/; + homepage = "https://github.com/cginternals/glbinding/"; description = "A C++ binding for the OpenGL API, generated using the gl.xml specification"; license = licenses.mit; maintainers = [ maintainers.mt-caret ]; diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index b265cfcc01686..02737143e0db5 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OpenGL extension loading library for C(++)"; - homepage = http://glew.sourceforge.net/; + homepage = "http://glew.sourceforge.net/"; license = licenses.free; # different files under different licenses #["BSD" "GLX" "SGI-B" "GPL2"] platforms = platforms.mesaPlatforms; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index ec56c544cac33..80a7759c5749b 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "glew-2.1.0"; + name = "glew-2.2.0"; src = fetchurl { url = "mirror://sourceforge/glew/${name}.tgz"; - sha256 = "159wk5dc0ykjbxvag5i1m2mhp23zkk6ra04l26y3jc3nwvkr3ph4"; + sha256 = "1qak8f7g1iswgswrgkzc7idk7jmqgwrs58fhg2ai007v7j4q5z6l"; }; outputs = [ "bin" "out" "dev" "doc" ]; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OpenGL extension loading library for C(++)"; - homepage = http://glew.sourceforge.net/; + homepage = "http://glew.sourceforge.net/"; license = licenses.free; # different files under different licenses #["BSD" "GLX" "SGI-B" "GPL2"] platforms = platforms.mesaPlatforms; diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/development/libraries/glfw/2.x.nix index b1118b473b6f0..e749ca733daaf 100644 --- a/pkgs/development/libraries/glfw/2.x.nix +++ b/pkgs/development/libraries/glfw/2.x.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; - homepage = http://glfw.sourceforge.net/; + homepage = "http://glfw.sourceforge.net/"; license = licenses.zlib; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 0dfe3cbea2e44..1b9fcb9586b3b 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; - homepage = https://www.glfw.org/; + homepage = "https://www.glfw.org/"; license = licenses.zlib; maintainers = with maintainers; [ marcweber twey ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 687852fb1815a..882c9f8c3f540 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.64.0"; + version = "2.64.2"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1fm1462v7z556qivlwflvc3qpz36jwpzqxxvsihh45j7aka2gnjw"; + sha256 = "19wmyv7j355z1wk650fyygadbwwmmhqggr54845rn7smbiqz1pj5"; }; patches = [ @@ -85,9 +85,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Network-related giomodules for glib"; - homepage = https://gitlab.gnome.org/GNOME/glib-networking; + homepage = "https://gitlab.gnome.org/GNOME/glib-networking"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index f4f4cefa5405a..d74bd0c4067a9 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -187,7 +187,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C library of programming buildings blocks"; - homepage = https://www.gtk.org/; + homepage = "https://www.gtk.org/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ lovek323 raskin worldofpeace ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh index 5d9c330b62eb9..8ead5510ec4f0 100644 --- a/pkgs/development/libraries/glib/setup-hook.sh +++ b/pkgs/development/libraries/glib/setup-hook.sh @@ -1,4 +1,3 @@ - make_glib_find_gsettings_schemas() { # For packages that need gschemas of other packages (e.g. empathy) for maybe_dir in "$1"/share/gsettings-schemas/*; do @@ -7,7 +6,7 @@ make_glib_find_gsettings_schemas() { fi done } -addEnvHooks "$hostOffset" make_glib_find_gsettings_schemas +addEnvHooks "$targetOffset" make_glib_find_gsettings_schemas # Install gschemas, if any, in a package-specific directory glibPreInstallPhase() { diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 50ee5097d1b83..0429c7295fb86 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -222,7 +222,7 @@ stdenv.mkDerivation ({ doCheck = false; # fails meta = { - homepage = https://www.gnu.org/software/libc/; + homepage = "https://www.gnu.org/software/libc/"; description = "The GNU C Library"; longDescription = diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 18963e31b6e2c..dff122d38d123 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.62.0"; + version = "2.64.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ziwx6r7k7wbvg4qq1rgrv8zninapgrmhn1hs6926a3krh9ryr9n"; + sha256 = "1v6lp23fr2qh4zshcnm28sn29j3nzgsvcqj2nhmrnvamipjq4lm7"; }; outputs = [ "out" "dev" ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ interface to the GLib library"; - homepage = https://gtkmm.org/; + homepage = "https://gtkmm.org/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index d39d6f0d7a36a..cb0ae47acded0 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { graphics software based on the OpenGL Shading Language (GLSL) specification and released under the MIT license. ''; - homepage = http://glm.g-truc.net/; + homepage = "http://glm.g-truc.net/"; license = licenses.mit; platforms = platforms.unix; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index 9cb5dda507d22..423272fcd455b 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchpatch, fetchFromGitHub, autoreconfHook -, openblas, gfortran, openssh, openmpi +, blas, gfortran, openssh, openmpi } : let - version = "5.7"; + version = "5.7.2"; in stdenv.mkDerivation { pname = "globalarrays"; @@ -13,23 +13,11 @@ in stdenv.mkDerivation { owner = "GlobalArrays"; repo = "ga"; rev = "v${version}"; - sha256 = "07i2idaas7pq3in5mdqq5ndvxln5q87nyfgk3vzw85r72c4fq5jh"; + sha256 = "0c1y9a5jpdw9nafzfmvjcln1xc2gklskaly0r1alm18ng9zng33i"; }; - # upstream patches for openmpi-4 compatibility - patches = [ (fetchpatch { - name = "MPI_Type_struct-was-deprecated-in-MPI-2"; - url = "https://github.com/GlobalArrays/ga/commit/36e6458993b1df745f43b7db86dc17087758e0d2.patch"; - sha256 = "058qi8x0ananqx980p03yxpyn41cnmm0ifwsl50qp6sc0bnbnclh"; - }) - (fetchpatch { - name = "MPI_Errhandler_set-was-deprecated-in-MPI-2"; - url = "https://github.com/GlobalArrays/ga/commit/f1ea5203d2672c1a1d0275a012fb7c2fb3d033d8.patch"; - sha256 = "06n7ds9alk5xa6hd7waw3wrg88yx2azhdkn3cjs2k189iw8a7fqk"; - })]; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ openmpi openblas gfortran openssh ]; + buildInputs = [ openmpi blas gfortran openssh ]; preConfigure = '' configureFlagsArray+=( "--enable-i8" \ @@ -37,18 +25,16 @@ in stdenv.mkDerivation { "--with-mpi3" \ "--enable-eispack" \ "--enable-underscoring" \ - "--with-blas8=${openblas}/lib -lopenblas" ) + "--with-blas8=${blas}/lib -lblas" ) ''; enableParallelBuilding = true; meta = with stdenv.lib; { description = "Global Arrays Programming Models"; - homepage = http://hpc.pnl.gov/globalarrays/; + homepage = "http://hpc.pnl.gov/globalarrays/"; maintainers = [ maintainers.markuskowa ]; license = licenses.bsd3; platforms = platforms.linux; }; } - - diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix index b3cf36107afa4..3ab157598a4e9 100644 --- a/pkgs/development/libraries/globalplatform/default.nix +++ b/pkgs/development/libraries/globalplatform/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib openssl_1_0_2 pcsclite ]; meta = with stdenv.lib; { - homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; + homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/"; description = "Library for interacting with smart card devices"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix index e01deea117529..043be9e91b50a 100644 --- a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix +++ b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ globalplatform openssl_1_0_2 pcsclite ]; meta = with stdenv.lib; { - homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; + homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/"; description = "GlobalPlatform pcsc connection plugin"; license = [ licenses.lgpl3 licenses.gpl3 ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index 3343c78bea1c1..7e5d7e9fa9a35 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "A portable high-level Jabber/XMPP library for C++"; - homepage = http://camaya.net/gloox; + homepage = "http://camaya.net/gloox"; license = licenses.gpl3; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index 84a7aff710764..8c5a50c43d18e 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { programming language and organized in the form of a library. ''; - homepage = https://www.gnu.org/software/glpk/; + homepage = "https://www.gnu.org/software/glpk/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ bjg timokau ]; diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix index 3b4ad1393d0ea..c902aac23a144 100644 --- a/pkgs/development/libraries/gmime/2.nix +++ b/pkgs/development/libraries/gmime/2.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/jstedfast/gmime/; + homepage = "https://github.com/jstedfast/gmime/"; description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 80753823ff134..f2ba29d461e7d 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -2,12 +2,12 @@ , vala }: stdenv.mkDerivation rec { - version = "3.2.6"; + version = "3.2.7"; pname = "gmime"; src = fetchurl { url = "mirror://gnome/sources/gmime/3.2/${pname}-${version}.tar.xz"; - sha256 = "05s7qjrxbj010q016pmdqdq73gz8vl4hv29kwaign0j8gi61kzxb"; + sha256 = "0i3xfc84qn1z99i70q68kbnp9rmgqrnprqb418ba52s6g9j9dsia"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix index 63d9d8c276269..eb23f5c82c236 100644 --- a/pkgs/development/libraries/gmm/default.nix +++ b/pkgs/development/libraries/gmm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Generic C++ template library for sparse, dense and skyline matrices"; - homepage = http://getfem.org/gmm.html; + homepage = "http://getfem.org/gmm.html"; license = licenses.lgpl21Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index a6035a2b7afd5..29310aa9f00ef 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -64,7 +64,7 @@ let self = stdenv.mkDerivation rec { asymptotically faster algorithms. ''; - homepage = https://gmplib.org/; + homepage = "https://gmplib.org/"; license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ ]; diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 494d9acb6bb6c..a027d58de3964 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -25,7 +25,7 @@ let self = stdenv.mkDerivation rec { (stdenv.lib.enableFeature cxx "cxx") # Build a "fat binary", with routines for several sub-architectures # (x86), except on Solaris where some tests crash with "Memory fault". - # See <http://hydra.nixos.org/build/2760931>, for instance. + # See <https://hydra.nixos.org/build/2760931>, for instance. # # no darwin because gmp uses ASM that clang doesn't like (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") @@ -44,7 +44,7 @@ let self = stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://gmplib.org/; + homepage = "https://gmplib.org/"; description = "GNU multiple precision arithmetic library"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index cbc3faa2cb68a..c5fffa09bf0b3 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -27,7 +27,7 @@ let self = stdenv.mkDerivation rec { (stdenv.lib.enableFeature cxx "cxx") # Build a "fat binary", with routines for several sub-architectures # (x86), except on Solaris where some tests crash with "Memory fault". - # See <http://hydra.nixos.org/build/2760931>, for instance. + # See <https://hydra.nixos.org/build/2760931>, for instance. # # no darwin because gmp uses ASM that clang doesn't like (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") @@ -49,7 +49,7 @@ let self = stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://gmplib.org/; + homepage = "https://gmplib.org/"; description = "GNU multiple precision arithmetic library"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/gmtk/default.nix b/pkgs/development/libraries/gmtk/default.nix index 10d584c6ccb0f..f6516815bb927 100644 --- a/pkgs/development/libraries/gmtk/default.nix +++ b/pkgs/development/libraries/gmtk/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Common functions for gnome-mplayer and gecko-mediaplayer"; - homepage = https://sites.google.com/site/kdekorte2/gnomemplayer; + homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer"; license = licenses.gpl2; maintainers = gnome_mplayer.meta.maintainers; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix index 0b2fb9fef6c34..749b021890acc 100644 --- a/pkgs/development/libraries/gnet/default.nix +++ b/pkgs/development/libraries/gnet/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A network library, written in C, object-oriented, and built upon GLib"; - homepage = https://developer.gnome.org/gnet/; + homepage = "https://developer.gnome.org/gnet/"; license = licenses.lgpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 8631cdee8cf3f..7b254b922bcc7 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -100,6 +100,6 @@ stdenv.mkDerivation rec { description = "Single sign-on framework for GNOME"; platforms = platforms.linux; license = licenses.lgpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index fa762c3a02e88..5926f59cc37e9 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - homepage = https://www.mono-project.com/docs/gui/gtksharp/; + homepage = "https://www.mono-project.com/docs/gui/gtksharp/"; description = "A .NET language binding for assorted GNOME libraries"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/development/libraries/gnome-video-effects/default.nix index 03799c1ef7c43..dfbb2c3b1e67c 100644 --- a/pkgs/development/libraries/gnome-video-effects/default.nix +++ b/pkgs/development/libraries/gnome-video-effects/default.nix @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A collection of GStreamer effects to be used in different GNOME Modules"; - homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects; + homepage = "https://wiki.gnome.org/Projects/GnomeVideoEffects"; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index 638d483b60e97..e45ec957eb93f 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Attempt to guess a canonical system name"; - homepage = https://savannah.gnu.org/projects/config; + homepage = "https://savannah.gnu.org/projects/config"; license = licenses.gpl3; # In addition to GPLv3: # As a special exception to the GNU General Public License, if you diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index b5b8add2db52e..402c3585d53fe 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNU EFI development toolchain"; - homepage = https://sourceforge.net/projects/gnu-efi/; + homepage = "https://sourceforge.net/projects/gnu-efi/"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index 6079387fc7207..c6d35b6823606 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -11,7 +11,7 @@ assert guileBindings -> guile != null; let # XXX: Gnulib's `test-select' fails on FreeBSD: - # http://hydra.nixos.org/build/2962084/nixlog/1/raw . + # https://hydra.nixos.org/build/2962084/nixlog/1/raw . doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4"; in stdenv.mkDerivation { @@ -86,7 +86,7 @@ stdenv.mkDerivation { layer. It adds TLS-KDH ciphers: Kerberos + Diffie-Hellman. ''; - homepage = https://github.com/arpa2/gnutls-kdh; + homepage = "https://github.com/arpa2/gnutls-kdh"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ leenaars ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index cde8587acc37b..6d0faa03a8887 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -8,10 +8,10 @@ assert guileBindings -> guile != null; let - version = "3.6.12"; + version = "3.6.13"; # XXX: Gnulib's `test-select' fails on FreeBSD: - # http://hydra.nixos.org/build/2962084/nixlog/1/raw . + # https://hydra.nixos.org/build/2962084/nixlog/1/raw . doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4" && stdenv.buildPlatform == stdenv.hostPlatform; @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; - sha256 = "0jvca1qahn9lrwv6f5kfs95icirc15b2a8x9fzczyj996ipg3b5z"; + sha256 = "0f1gnm0756qms5cpx6yn6xb8d3imc2gkqmygf12n9x6r8zs1s11j"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -48,6 +48,8 @@ stdenv.mkDerivation { sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh + '' + lib.optionalString stdenv.hostPlatform.isMusl '' # See https://gitlab.com/gnutls/gnutls/-/issues/945 + sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool ''; preConfigure = "patchShebangs ."; @@ -57,8 +59,12 @@ stdenv.mkDerivation { "--disable-dependency-tracking" "--enable-fast-install" "--with-unbound-root-key-file=${dns-root-data}/root.key" - ] ++ lib.optional guileBindings - [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ]; + ] ++ lib.optional guileBindings [ + "--enable-guile" + "--with-guile-site-dir=\${out}/share/guile/site" + "--with-guile-site-ccache-dir=\${out}/share/guile/site" + "--with-guile-extension-dir=\${out}/share/guile/site" + ]; enableParallelBuilding = true; @@ -108,7 +114,7 @@ stdenv.mkDerivation { tampering, or message forgery." ''; - homepage = https://www.gnu.org/software/gnutls/; + homepage = "https://www.gnu.org/software/gnutls/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ eelco fpletz ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index f754756f768bd..0d514c3fd7d8d 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gobject-introspection"; - version = "1.64.0"; + version = "1.64.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "10pwykfnk7pw8k9k8iz3p72phxvyrh5q4d7gr3ysv08w15immh7a"; + sha256 = "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0"; }; outputs = [ "out" "dev" "man" ]; @@ -62,10 +62,10 @@ stdenv.mkDerivation rec { # We are using a symlink that we will delete before installation. mkdir -p $out/lib ln -s $PWD/tests/scanner/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} - cleanLibregressSymlink() { - rm $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} - } - preInstallPhases="$preInstallPhases cleanLibregressSymlink" + ''; + + preInstall = '' + rm $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} ''; passthru = { @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A middleware layer between C libraries and language bindings"; - homepage = http://live.gnome.org/GObjectIntrospection; + homepage = "http://live.gnome.org/GObjectIntrospection"; maintainers = with maintainers; [ lovek323 lethalman ]; platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/pkgs/development/libraries/gobject-introspection/setup-hook.sh index a68d544cfbe57..6bee47aeb096d 100644 --- a/pkgs/development/libraries/gobject-introspection/setup-hook.sh +++ b/pkgs/development/libraries/gobject-introspection/setup-hook.sh @@ -18,7 +18,14 @@ giDiscoverSelf() { fi } -preFixupHooks+=(giDiscoverSelf) +# gappsWrapperArgsHook expects GI_TYPELIB_PATH variable to be set by this. +# Until we have dependency mechanism in generic builder, we need to use this ugly hack. +if [[ " ${preFixupPhases:-} " =~ " gappsWrapperArgsHook " ]]; then + preFixupPhases+=" " + preFixupPhases="${preFixupPhases/ gappsWrapperArgsHook / giDiscoverSelf gappsWrapperArgsHook }" +else + preFixupPhases+=" giDiscoverSelf" +fi _multioutMoveGlibGir() { moveToOutput share/gir-1.0 "${!outputDev}" diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index f41fa73a6ef43..308a4db280067 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "goffice"; - version = "0.10.46"; + version = "0.10.47"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "058d6d3a40e1f60525682ec6b857c441d5deb50d0d30a76804f9f36f865a13a9"; + sha256 = "0xmigfdzvmlpa0fw79mf3xwchmxc8rlidryn5syv8bz7msmrb215"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix index 2d5133afab4d2..7d3365f563166 100644 --- a/pkgs/development/libraries/gom/default.nix +++ b/pkgs/development/libraries/gom/default.nix @@ -55,9 +55,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A GObject to SQLite object mapper"; - homepage = https://wiki.gnome.org/Projects/Gom; + homepage = "https://wiki.gnome.org/Projects/Gom"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index 1440d3f6aa04a..a744cf314e291 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; - homepage = https://wiki.gnome.org/Projects/GooCanvas; + homepage = "https://wiki.gnome.org/Projects/GooCanvas"; license = licenses.lgpl2; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix index b7f56837686db..d8a910d4799c5 100644 --- a/pkgs/development/libraries/goocanvasmm/default.nix +++ b/pkgs/development/libraries/goocanvasmm/default.nix @@ -18,12 +18,13 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + attrPath = "goocanvasmm2"; }; }; meta = with stdenv.lib; { description = "C++ bindings for GooCanvas"; - homepage = https://wiki.gnome.org/Projects/GooCanvas; + homepage = "https://wiki.gnome.org/Projects/GooCanvas"; license = licenses.lgpl2; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index be7132dc845b3..7eb69d075cabd 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { license = with licenses; [ asl20 ]; - homepage = https://github.com/googleapis/google-cloud-cpp; + homepage = "https://github.com/googleapis/google-cloud-cpp"; description = "C++ Idiomatic Clients for Google Cloud Platform services"; maintainers = with maintainers; [ andir flokli ]; }; diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 0e98575498500..039231c01423d 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/gperftools/gperftools; + homepage = "https://github.com/gperftools/gperftools"; description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; platforms = with platforms; linux ++ darwin; license = licenses.bsd3; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 9e5ff187ac6a1..39bb8d7571a06 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan +{ stdenv, fetchurl, fetchpatch +, autoreconfHook, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan , file, which, ncurses , texinfo , buildPackages @@ -33,7 +34,14 @@ stdenv.mkDerivation rec { url = "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=c4cf527ea227edb468a84bf9b8ce996807bd6992"; sha256 = "pKL1tvUw7PB2w4FHSt2up4SvpFiprBH6TLdgKxYFC3g="; }) - ]; + # https://lists.gnupg.org/pipermail/gnupg-devel/2020-April/034591.html + (fetchpatch { + name = "0001-Fix-python-tests-on-non-Linux.patch"; + url = "https://lists.gnupg.org/pipermail/gnupg-devel/attachments/20200415/f7be62d1/attachment.obj"; + sha256 = "00d4sxq63601lzdp2ha1i8fvybh7dzih4531jh8bx07fab3sw65g"; + }) + # Disable python tests on Darwin as they use gpg (see configureFlags below) + ] ++ lib.optional stdenv.isDarwin ./disable-python-tests.patch; outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool @@ -42,15 +50,11 @@ stdenv.mkDerivation rec { [ libgpgerror glib libassuan pth ] ++ lib.optional (qtbase != null) qtbase; - nativeBuildInputs = [ file pkgconfig gnupg texinfo ] + nativeBuildInputs = [ pkgconfig gnupg texinfo autoreconfHook ] ++ lib.optionals pythonSupport [ python swig2 which ncurses ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - postPatch ='' - substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file - ''; - configureFlags = [ "--enable-fixed-path=${gnupg}/bin" "--with-libgpg-error-prefix=${libgpgerror.dev}" @@ -74,7 +78,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://gnupg.org/software/gpgme/index.html; + homepage = "https://gnupg.org/software/gpgme/index.html"; description = "Library for making GnuPG easier to use"; longDescription = '' GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG diff --git a/pkgs/development/libraries/gpgme/disable-python-tests.patch b/pkgs/development/libraries/gpgme/disable-python-tests.patch new file mode 100644 index 0000000000000..285af14fcc3ec --- /dev/null +++ b/pkgs/development/libraries/gpgme/disable-python-tests.patch @@ -0,0 +1,12 @@ +diff -Naur --strip-trailing-cr gpgme-1.13.1.org/lang/python/Makefile.am gpgme-1.13.1/lang/python/Makefile.am +--- gpgme-1.13.1.org/lang/python/Makefile.am 2019-06-04 07:27:49.000000000 +0100 ++++ gpgme-1.13.1/lang/python/Makefile.am 2020-04-15 14:27:34.810172944 +0100 +@@ -23,7 +23,7 @@ + gpgme.i \ + helpers.c helpers.h private.h + +-SUBDIRS = . tests examples doc src ++SUBDIRS = . examples doc src + + .PHONY: prepare + prepare: copystamp diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix index 722fb79d5d618..6efc1fca39a8d 100644 --- a/pkgs/development/libraries/grail/default.nix +++ b/pkgs/development/libraries/grail/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional enableX11 "--with-x11"; meta = { - homepage = https://launchpad.net/canonical-multitouch/grail; + homepage = "https://launchpad.net/canonical-multitouch/grail"; description = "Gesture Recognition And Instantiation Library"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 818d3c30de2de..09bf922248585 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -43,7 +43,7 @@ mkDerivation rec { The syntax is intended to follow the syntax of the Django template system, and the design of Django is reused in Grantlee.''; - homepage = http://gitorious.org/grantlee; + homepage = "http://gitorious.org/grantlee"; maintainers = [ maintainers.ttuegel ]; license = licenses.lgpl21; inherit (qtbase.meta) platforms; diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix index 1446e339745ea..a8e692bdd51d7 100644 --- a/pkgs/development/libraries/grantlee/default.nix +++ b/pkgs/development/libraries/grantlee/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { The syntax is intended to follow the syntax of the Django template system, and the design of Django is reused in Grantlee.''; - homepage = http://gitorious.org/grantlee; + homepage = "http://gitorious.org/grantlee"; license = stdenv.lib.licenses.lgpl21; inherit (qt4.meta) platforms; }; diff --git a/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/pkgs/development/libraries/graphene-hardened-malloc/default.nix index be32a74ea45a1..c60b09144929c 100644 --- a/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/pkgs/development/libraries/graphene-hardened-malloc/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/GrapheneOS/hardened_malloc; + homepage = "https://github.com/GrapheneOS/hardened_malloc"; description = "Hardened allocator designed for modern systems"; longDescription = '' This is a security-focused general purpose memory allocator providing the malloc API @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; maintainers = with maintainers; [ ris ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix index 0c9e4bf315639..5a1620db30cdf 100644 --- a/pkgs/development/libraries/grib-api/default.nix +++ b/pkgs/development/libraries/grib-api/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { - homepage = https://software.ecmwf.int/wiki/display/GRIB/Home; + homepage = "https://software.ecmwf.int/wiki/display/GRIB/Home"; license = licenses.asl20; platforms = with platforms; linux ++ darwin; description = "ECMWF Library for the GRIB file format -- DEPRECATED"; diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 65be9d27df11d..3dced2d621166 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -92,9 +92,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Grilo; + homepage = "https://wiki.gnome.org/Projects/Grilo"; description = "A collection of plugins for the Grilo framework"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index b52ddbb0408ec..12f069891e88c 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -36,9 +36,9 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Grilo; + homepage = "https://wiki.gnome.org/Projects/Grilo"; description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 8549eeffde6d9..ab497eadb6d67 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags, abseil-cpp }: stdenv.mkDerivation rec { - version = "1.28.1"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too + version = "1.29.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "17p3xwz5izlqg5ijnim4asl40pr8yhg9wrrmws4g0dk37nkn1x6p"; + sha256 = "1n604grkf2amzrmwcz6am0rpbp3yfb062lpgmhv943hj8wk7xw27"; fetchSubmodules = true; }; patches = [ # Fix build on armv6l (https://github.com/grpc/grpc/pull/21341) (fetchpatch { - url = "https://github.com/grpc/grpc/commit/198d221e775cf73455eeb863672e7a6274d217f1.patch"; - sha256 = "11k35w6ffvl192rgzzj2hzyzjhizdgk7i56zdkx6v60zxnyfn7yq"; + url = "https://github.com/grpc/grpc/commit/2f4cf1d9265c8e10fb834f0794d0e4f3ec5ae10e.patch"; + sha256 = "0ams3jmgh9yzwmxcg4ifb34znamr7pb4qm0609kvil9xqvkqz963"; }) ]; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; + buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ]; cmakeFlags = [ "-DgRPC_ZLIB_PROVIDER=package" @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { "-DgRPC_SSL_PROVIDER=package" "-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_GFLAGS_PROVIDER=package" + "-DgRPC_ABSL_PROVIDER=package" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index c5e1deea6e12e..4e22c38e9c84a 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { (e.g. IMAP, SMTP, etc.) to authenticate peers. ''; - homepage = https://www.gnu.org/software/gsasl/; + homepage = "https://www.gnu.org/software/gsasl/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ shlevy ]; diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index a23027946a491..6a94944e9f18d 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "3.36.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19hfjqzddkmvxg80v23xpbd1my2pzjalx3d56d2k4dk5521vcjkn"; + sha256 = "1nf97vq07gadwdla6kws8z510xlmv0a7wlyqwwnhyagq7kjdnjq0"; }; passthru = { @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python3 meson ninja glib ]; meta = with stdenv.lib; { - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix index 8b118fe94834a..5f09f437f04f9 100644 --- a/pkgs/development/libraries/gsettings-qt/default.nix +++ b/pkgs/development/libraries/gsettings-qt/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { version = "0.1.20170824"; src = fetchbzr { - url = http://bazaar.launchpad.net/~system-settings-touch/gsettings-qt/trunk; + url = "http://bazaar.launchpad.net/~system-settings-touch/gsettings-qt/trunk"; rev = "85"; sha256 = "1kcw0fgdyndx9c0dyha11wkj0gi05spdc1adf1609mrinbb4rnyi"; }; @@ -54,7 +54,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Qt/QML bindings for GSettings"; - homepage = https://launchpad.net/gsettings-qt; + homepage = "https://launchpad.net/gsettings-qt"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix index 88a4ecb362253..b0db776bd6167 100644 --- a/pkgs/development/libraries/gsignond/default.nix +++ b/pkgs/development/libraries/gsignond/default.nix @@ -52,7 +52,7 @@ unwrapped = stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D-Bus service which performs user authentication on behalf of its clients"; - homepage = https://gitlab.com/accounts-sso/gsignond; + homepage = "https://gitlab.com/accounts-sso/gsignond"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix index ebaf694f04e95..b1a383ee59185 100644 --- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Plugin for the Accounts-SSO gSignOn daemon that handles Last.FM credentials"; - homepage = https://gitlab.com/accounts-sso/gsignond-plugin-lastfm; + homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-lastfm"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix index c4d23bd834c9f..4ac6e6a6f9ffd 100644 --- a/pkgs/development/libraries/gsignond/plugins/mail.nix +++ b/pkgs/development/libraries/gsignond/plugins/mail.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Plugin for the Accounts-SSO gSignOn daemon that handles E-Mail credentials"; - homepage = https://gitlab.com/accounts-sso/gsignond-plugin-mail; + homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-mail"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix index a140859b69315..b4b16a57af412 100644 --- a/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols"; - homepage = https://gitlab.com/accounts-sso/gsignond-plugin-oa; + homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-oa"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix index af57950ac653f..1a1f34681cea1 100644 --- a/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol"; - homepage = https://gitlab.com/accounts-sso/gsignond-plugin-sasl; + homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-sasl"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 966d6a8ffd5de..4a9208cff32a4 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Scientific Library, a large numerical library"; - homepage = https://www.gnu.org/software/gsl/; + homepage = "https://www.gnu.org/software/gsl/"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix index ae102ac60307c..9a31563c6cca4 100644 --- a/pkgs/development/libraries/gsl/gsl-1_16.nix +++ b/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Scientific Library, a large numerical library"; - homepage = https://www.gnu.org/software/gsl/; + homepage = "https://www.gnu.org/software/gsl/"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 1405d4782ad3a..30cffa89938d9 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "gsm"; - version = "1.0.18"; + version = "1.0.19"; src = fetchurl { url = "http://www.quut.com/gsm/${pname}-${version}.tar.gz"; - sha256 = "041amvpz8cvxykl3pwqldrzxligmmzcg8ncdnxbg32rlqf3q1xh4"; + sha256 = "1xkha9ss5g5qnfaybi8il0mcvp8knwg9plgh8404vh58d0pna0s9"; }; patchPhase = '' @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lossy speech compression codec"; - homepage = http://www.quut.com/gsm/; + homepage = "http://www.quut.com/gsm/"; license = licenses.bsd2; maintainers = with maintainers; [ codyopel raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix index a1a0da51017bb..fd9e327c1bc96 100644 --- a/pkgs/development/libraries/gsoap/default.nix +++ b/pkgs/development/libraries/gsoap/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C/C++ toolkit for SOAP web services and XML-based applications"; - homepage = http://www.cs.fsu.edu/~engelen/soap.html; + homepage = "http://www.cs.fsu.edu/~engelen/soap.html"; # gsoap is dual/triple licensed (see homepage for details): # 1. gSOAP Public License 1.3 (based on Mozilla Public License 1.1). # Components NOT covered by the gSOAP Public License are: diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix index b1869193a0939..bae1b17e5322e 100644 --- a/pkgs/development/libraries/gsound/default.nix +++ b/pkgs/development/libraries/gsound/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GSound; + homepage = "https://wiki.gnome.org/Projects/GSound"; description = "Small library for playing system sounds"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index 71a427eb2a667..17e98b8e40927 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -27,9 +27,9 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A spell-checking library for GTK applications"; - homepage = https://wiki.gnome.org/Projects/gspell; + homepage = "https://wiki.gnome.org/Projects/gspell"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index a9ee776d441cf..363e7ba7d10f6 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/gss/; + homepage = "https://www.gnu.org/software/gss/"; description = "Generic Security Service"; license = licenses.gpl3Plus; maintainers = with maintainers; [ bjg ]; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index e899ad2c648d6..8ad92eb833a4e 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GObject-based API for handling resource discovery and announcement over SSDP"; - homepage = http://www.gupnp.org/; + homepage = "http://www.gupnp.org/"; license = licenses.lgpl2Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index ae5fd7531325f..903ca661486f3 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -10,7 +10,7 @@ , gst-plugins-base , orc , gobject-introspection -, enableZbar ? true +, enableZbar ? false , faacSupport ? false , faac ? null , faad2 @@ -104,6 +104,8 @@ in stdenv.mkDerivation rec { sha256 = "0l1f6kqcl04q7w12a2b4qibcvjz6gqhs0csdv2wbvfd6zndpjm6p"; }) ./fix_pkgconfig_includedir.patch + # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1235 + ./opencv-4.3.patch ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch b/pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch new file mode 100644 index 0000000000000..55155d5c5e775 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch @@ -0,0 +1,13 @@ +diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build +index f38b55d..05b142e 100644 +--- a/ext/opencv/meson.build ++++ b/ext/opencv/meson.build +@@ -65,7 +65,7 @@ if opencv_found + endif + endforeach + else +- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.2.0'], required : false) ++ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.4.0'], required : false) + opencv_found = opencv_dep.found() + if opencv_found + foreach h : libopencv4_headers diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 67a0aa9f3f890..88bf77a638cc1 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { patches = [ ./fix_pkgconfig_includedir.patch + + # Fix build with bash-completion 2.10 + # https://gitlab.freedesktop.org/gstreamer/gstreamer/merge_requests/436 + (fetchpatch { + url = "https://gitlab.freedesktop.org/gstreamer/gstreamer/commit/dd2ec3681e2d38e13e01477efa36e851650690fb.patch"; + sha256 = "CMYQF2MTsC5A0btMpLVLemkwsMtEbzhDXVE3u49xHB4="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index a7c2bcf838e7b..100d270673fc4 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -29,9 +29,7 @@ , mpg123 , twolame , gtkSupport ? false, gtk3 ? null - # As of writing, jack2 incurs a Qt dependency (big!) via `ffado`. - # In the future we should probably split `ffado`. -, enableJack ? false, jack2 +, enableJack ? true, libjack2 , libXdamage , libXext , libXfixes @@ -104,8 +102,8 @@ stdenv.mkDerivation rec { libavc1394 libiec61883 libgudev - ] ++ optionals (stdenv.isLinux && enableJack) [ - jack2 + ] ++ optionals enableJack [ + libjack2 ]; mesonFlags = [ @@ -113,8 +111,8 @@ stdenv.mkDerivation rec { "-Dqt5=disabled" # not clear as of writing how to correctly pass in the required qt5 deps ] ++ optionals (!gtkSupport) [ "-Dgtk3=disabled" - ] ++ optionals (!stdenv.isLinux || !enableJack) [ - "-Djack=disabled" # unclear whether Jack works on Darwin + ] ++ optionals (!enableJack) [ + "-Djack=disabled" ] ++ optionals (!stdenv.isLinux) [ "-Ddv1394=disabled" # Linux only "-Doss4=disabled" # Linux only diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix index 402074a4e5f48..804d80b8e1d17 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base gstreamer ]; meta = { - homepage = https://gstreamer.freedesktop.org/modules/gnonlin.html; + homepage = "https://gstreamer.freedesktop.org/modules/gnonlin.html"; description = "Gstreamer Non-Linear Multimedia Editing Plugins"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix index 77465645d2376..cd37a513184d4 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "‘Bad’ (potentially low quality) plug-ins for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index eed9d423fdb9e..ad978e903f8f1 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/gtk-doc"; meta = with stdenv.lib; { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "Base plug-ins for GStreamer"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index 2b78d4daaf308..225bcc7e263e0 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "`Good' plug-ins for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix index 2f46016adac81..5321fc379cc97 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "‘Ugly’ (potentially patent-encumbered) plug-ins for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix index c8414a7b681be..4c56039bd0a34 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ gstreamer python ]; meta = { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "Python bindings for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index e69e584b23dca..b78f6148e4873 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "Library for constructing graphs of media-handling components"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix index 27036ad86edf9..24197b04b73f3 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "C++ bindings for the GStreamer streaming multimedia library"; - homepage = https://www.gtkmm.org/; + homepage = "https://www.gtkmm.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ plcplc ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix index d0a2d3691b493..b848af6c318a7 100644 --- a/pkgs/development/libraries/gtdialog/default.nix +++ b/pkgs/development/libraries/gtdialog/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = http://foicica.com/gtdialog; + homepage = "http://foicica.com/gtdialog"; downloadPage = "http://foicica.com/gtdialog/download"; }; } diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index bbc582f581c3e..62234651aa930 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Google's framework for writing C++ tests"; - homepage = https://github.com/google/googletest; + homepage = "https://github.com/google/googletest"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ zoomulator ivan-tkatchev ]; diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix index 2281055c62b7f..5cf62b319a6b1 100644 --- a/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -1,13 +1,15 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobject-introspection }: +{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobject-introspection }: -stdenv.mkDerivation { - name = "gtk-mac-integration-2.0.8"; +stdenv.mkDerivation rec { + pname = "gtk-mac-integration"; + version = "2.1.3"; - src = fetchFromGitHub { + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; owner = "GNOME"; - repo = "gtk-mac-integration"; - rev = "79e708870cdeea24ecdb036c77b4630104ae1776"; - sha256 = "1fbhnvj0rqc3089ypvgnpkp6ad2rr37v5qk38008dgamb9h7f3qs"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "1w0agv4r0daklv5d2f3l0c10krravjq8bj9hsdsrpka48dbnqmap"; }; nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc gobject-introspection ]; @@ -18,14 +20,11 @@ stdenv.mkDerivation { gtkdocize ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Provides integration for GTK applications into the Mac desktop"; - license = licenses.lgpl21; - - homepage = https://wiki.gnome.org/Projects/GTK/OSX/Integration; - - maintainers = [ maintainers.matthewbauer ]; + homepage = "https://wiki.gnome.org/Projects/GTK/OSX/Integration"; + maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.darwin; }; } diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index 615ea66f4d991..ed53105f7581b 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical User Interface Toolkit for mono and .Net"; - homepage = https://www.mono-project.com/docs/gui/gtksharp; + homepage = "https://www.mono-project.com/docs/gui/gtksharp"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 932527eed0929..09cb016dbb6a3 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ./patches/gtk2-theme-paths.patch ] ++ optionals stdenv.isDarwin [ (fetchpatch { - url = https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776; + url = "https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776"; sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r"; }) ./patches/2.0-darwin-x11.patch @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = { description = "A multi-platform toolkit for creating graphical user interfaces"; - homepage = https://www.gtk.org/; + homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 raskin ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index ac5a944334e69..1e618730cd87c 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -48,7 +48,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.14"; + version = "3.24.20"; outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "120yz5gxqbv7sgdbcy4i0b6ixm8jpjzialdrqs0gv15q7bwnjk8w"; + sha256 = "Laxp9xbo0EunqVCRWJ4rquyV3KzpMssVg5Fj20ebHfM="; }; patches = [ @@ -70,17 +70,18 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) - # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1528 + + # Fix path handling in pkg-config + # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1793 (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/3c28751dee115e969a58a733f2f19e71062b9d2d.patch"; - sha256 = "1rqrmymwd22dsiy7agjw13mcyic3by6020rxyaw7zslnmyzfiwc3"; + url = "https://gitlab.gnome.org/GNOME/gtk/commit/6d9db8610eff8c12d594d53b7813d9eea1247801.patch"; + sha256 = "QHseZWgPlZBDEM2dIVixUJkGZMCaYjahkLmSCqCcoWU="; }) - # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002 - ./patches/01-build-Fix-path-handling-in-pkgconfig.patch ] ++ optionals stdenv.isDarwin [ # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33 + # https://gitlab.gnome.org/GNOME/gtk/merge_requests/536 ./patches/3.0-darwin-x11.patch ]; @@ -96,6 +97,11 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; postPatch = '' + # TODO: Remove in 3.24.21 + # https://gitlab.gnome.org/GNOME/gtk/issues/2669 + echo "${stdenv.shell}" > check-version.py + chmod +x check-version.py + files=( build-aux/meson/post-install.py demos/gtk-demo/geninclude.py @@ -203,7 +209,7 @@ stdenv.mkDerivation rec { proprietary software with GTK without any license fees or royalties. ''; - homepage = https://www.gtk.org/; + homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin vcunat lethalman worldofpeace ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch b/pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch deleted file mode 100644 index ec69a12514fec..0000000000000 --- a/pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7b692e618c4183a51af3d3b0037f106c4fec2355 Mon Sep 17 00:00:00 2001 -From: worldofpeace <worldofpeace@protonmail.ch> -Date: Fri, 19 Jul 2019 13:32:57 -0400 -Subject: [PATCH] build: Fix path handling in pkgconfig - ---- - meson.build | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index 36913b3f04..161b378ba5 100644 ---- a/meson.build -+++ b/meson.build -@@ -834,10 +834,10 @@ configure_file(input: 'config.h.meson', - # pkg-config files - bit of a mess all of this - pkgconf = configuration_data() - --pkgconf.set('prefix', get_option('prefix')) -+pkgconf.set('prefix', gtk_prefix) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', gtk_libdir) -+pkgconf.set('includedir', join_paths('${prefix}', gtk_includedir)) - pkgconf.set('GTK_API_VERSION', gtk_api_version) - pkgconf.set('VERSION', meson.project_version()) - pkgconf.set('GTK_BINARY_VERSION', gtk_binary_version) --- -2.22.0 - diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index 2cad4a19a0f3e..a03dc51f00c5c 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -131,7 +131,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D binding and OO wrapper for GTK"; - homepage = https://gtkd.org; + homepage = "https://gtkd.org"; license = licenses.lgpl3Plus; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix index 12b9181a952e9..0c72f8501cc27 100644 --- a/pkgs/development/libraries/gtkmathview/default.nix +++ b/pkgs/development/libraries/gtkmathview/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { patches = [ ./gcc-4.3-build-fixes.patch ./gcc-4.4-build-fixes.patch ]; meta = { - homepage = http://helm.cs.unibo.it/mml-widget/; + homepage = "http://helm.cs.unibo.it/mml-widget/"; description = "C++ rendering engine for MathML documents"; license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 523c5b50d2832..24262d263cbf1 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { tutorial. ''; - homepage = https://gtkmm.org/; + homepage = "https://gtkmm.org/"; license = stdenv.lib.licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index d79e739f80c64..5794b2ddf46f3 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { tutorial. ''; - homepage = https://gtkmm.org/; + homepage = "https://gtkmm.org/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index baef8062224ac..d882d3b1a6c1e 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -50,9 +50,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GtkSourceView; + homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; platforms = with platforms; linux ++ darwin; license = licenses.lgpl21; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 57ba5a26685c2..1a80a1b6fac94 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GtkSourceView; + homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; platforms = with platforms; linux ++ darwin; license = licenses.lgpl21; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/development/libraries/gtksourceviewmm/4.x.nix index d60bb29c47ae7..1607a5819961d 100644 --- a/pkgs/development/libraries/gtksourceviewmm/4.x.nix +++ b/pkgs/development/libraries/gtksourceviewmm/4.x.nix @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - homepage = https://developer.gnome.org/gtksourceviewmm/; + homepage = "https://developer.gnome.org/gtksourceviewmm/"; description = "C++ wrapper for gtksourceview"; license = licenses.lgpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix index 6b81b7981ee9a..7bf510207ab3e 100644 --- a/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - homepage = https://developer.gnome.org/gtksourceviewmm/; + homepage = "https://developer.gnome.org/gtksourceviewmm/"; description = "C++ wrapper for gtksourceview"; license = licenses.lgpl2; maintainers = [ maintainers.juliendehos ]; diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index b68c814ad5430..707acfcd3820c 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://gtkspell.sourceforge.net/; + homepage = "http://gtkspell.sourceforge.net/"; description = "Word-processor-style highlighting GtkTextView widget"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index 14676be0dcb97..b6ee2c6825d66 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gtkspell-2.0.16"; src = fetchurl { - url = mirror://sourceforge/gtkspell/gtkspell-2.0.16.tar.gz; + url = "mirror://sourceforge/gtkspell/gtkspell-2.0.16.tar.gz"; sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Word-processor-style highlighting and replacement of misspelled words"; - homepage = http://gtkspell.sourceforge.net; + homepage = "http://gtkspell.sourceforge.net"; platforms = platforms.unix; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix index 97f1a12c1785c..b3bca9bd7b6df 100644 --- a/pkgs/development/libraries/gtkspellmm/default.nix +++ b/pkgs/development/libraries/gtkspellmm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ binding for the gtkspell library"; - homepage = http://gtkspell.sourceforge.net/; + homepage = "http://gtkspell.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 18640e923e8b2..adf914369cf50 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails with "permission denied" meta = { - homepage = http://gts.sourceforge.net/; + homepage = "http://gts.sourceforge.net/"; license = stdenv.lib.licenses.lgpl2Plus; description = "GNU Triangulated Surface Library"; diff --git a/pkgs/development/libraries/gumbo/default.nix b/pkgs/development/libraries/gumbo/default.nix index 2db8c1e67398e..9acc48ae0b855 100644 --- a/pkgs/development/libraries/gumbo/default.nix +++ b/pkgs/development/libraries/gumbo/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C99 HTML parsing algorithm"; - homepage = https://github.com/google/gumbo-parser; + homepage = "https://github.com/google/gumbo-parser"; maintainers = [ maintainers.nico202 ]; platforms = platforms.linux; license = licenses.asl20; diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index b764ce2c2e21e..80fb9e3affffc 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://gupnp.org/; + homepage = "http://gupnp.org/"; description = "A collection of helpers for building AV (audio/video) applications using GUPnP"; license = licenses.lgpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix index 4dfbaafdc327c..8fc001de3d563 100644 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/pkgs/development/libraries/gupnp-dlna/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GUPnP/; + homepage = "https://wiki.gnome.org/Projects/GUPnP/"; description = "Library to ease DLNA-related bits for applications using GUPnP"; license = licenses.lgpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index 56a274316e894..a8ed1f7cadd09 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { patches = [ # Add gupnp-1.2 compatibility (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gupnp-igd/commit/63531558a16ac2334a59f627b2fca5576dcfbb2e.patch; + url = "https://gitlab.gnome.org/GNOME/gupnp-igd/commit/63531558a16ac2334a59f627b2fca5576dcfbb2e.patch"; sha256 = "0s8lkyy9fnnnnkkqwbk6gxb7795bb1kl1swk5ldjnlrzhfcy1ab2"; }) ]; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to handle UPnP IGD port mapping"; - homepage = http://www.gupnp.org/; + homepage = "http://www.gupnp.org/"; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index a69df33dd6504..153eb681d6331 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -40,12 +40,12 @@ stdenv.mkDerivation rec { # fix deadlock in gupnp-igd tests (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gupnp/commit/d208562657f62b34759896ca9e974bd582d1f963.patch; + url = "https://gitlab.gnome.org/GNOME/gupnp/commit/d208562657f62b34759896ca9e974bd582d1f963.patch"; sha256 = "02kzsb4glxhgb1npf6qqgafiki0ws75sly5h470431mihc6sgp4f"; }) # fix breakage in gupnp-igd tests (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gupnp/commit/0648399acb989473119fe59d0b9f65c923e69483.patch; + url = "https://gitlab.gnome.org/GNOME/gupnp/commit/0648399acb989473119fe59d0b9f65c923e69483.patch"; sha256 = "0ba0rngk3a4n3z4dmq06wzgh0n3q9la1nr25qdxqbwlszmxfxpjf"; }) ]; @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://www.gupnp.org/; + homepage = "http://www.gupnp.org/"; description = "An implementation of the UPnP specification"; license = licenses.lgpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 539a1ffeed98d..204c9d8dd7436 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GLib libusb wrapper"; - homepage = https://github.com/hughsie/libgusb; + homepage = "https://github.com/hughsie/libgusb"; license = licenses.lgpl21; maintainers = [ maintainers.marcweber ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 1caed4cacf7aa..cff6569be50b2 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -126,6 +126,6 @@ stdenv.mkDerivation rec { description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)"; license = licenses.lgpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ] ++ gnome3.maintainers; + maintainers = [ maintainers.lethalman ] ++ teams.gnome.members; }; } diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index 000af7fd74e45..8ef8b55be522f 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb, pkgconfig, +{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkgconfig, boost, libtool, perlPackages }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2 - tcl libusb pkgconfig boost libtool ]; + tcl libusb-compat-0_1 pkgconfig boost libtool ]; configureFlags = [ "--with-perl-binding" "--with-python-binding" "--with-tcl-binding" "--with-rigmatrix" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { command line interface or in a text-oriented interactive interface. ''; license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; - homepage = http://hamlib.sourceforge.net; + homepage = "http://hamlib.sourceforge.net"; maintainers = with stdenv.lib.maintainers; [ relrod ]; platforms = with stdenv.lib.platforms; unix; }; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 42f68eea83f2a..c2a924c7e023f 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An OpenType text shaping engine"; - homepage = http://www.freedesktop.org/wiki/Software/HarfBuzz; + homepage = "http://www.freedesktop.org/wiki/Software/HarfBuzz"; downloadPage = "https://www.freedesktop.org/software/harfbuzz/release/"; maintainers = [ maintainers.eelco ]; license = licenses.mit; diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix index 77c1ca07dc9c6..e9d5d5d973107 100644 --- a/pkgs/development/libraries/hawknl/default.nix +++ b/pkgs/development/libraries/hawknl/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "hawknl-1.68"; src = fetchurl { - url = http://urchlay.naptime.net/~urchlay/src/HawkNL168src.zip; + url = "http://urchlay.naptime.net/~urchlay/src/HawkNL168src.zip"; sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://hawksoft.com/hawknl/; + homepage = "http://hawksoft.com/hawknl/"; description = "Free, open source, game oriented network API"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index ec86db036e98f..d3433246b7806 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://herqq.org; + homepage = "http://herqq.org"; description = "A software library for building UPnP devices and control points"; platforms = platforms.linux; maintainers = [ ]; diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index 28e96244ba5cd..11cdd0ab7e0ca 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, systemd, libusb +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, systemd, libusb1 , darwin }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ ] - ++ stdenv.lib.optionals stdenv.isLinux [ libusb systemd ]; + ++ stdenv.lib.optionals stdenv.isLinux [ libusb1 systemd ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/highfive/default.nix b/pkgs/development/libraries/highfive/default.nix new file mode 100644 index 0000000000000..c514a44f851a6 --- /dev/null +++ b/pkgs/development/libraries/highfive/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, fetchFromGitHub +, cmake +, boost +, eigen +, hdf5 +, mpiSupport ? hdf5.mpiSupport +, mpi ? hdf5.mpi +}: + +assert mpiSupport -> mpi != null; + +stdenv.mkDerivation rec { + pname = "highfive"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "BlueBrain"; + repo = "HighFive"; + rev = "4c70d818ed18231563fe49ff197d1c41054be592"; + sha256 = "02xy3c2ix3nw8109aw75ixj651knzc5rjqwqrxximm4hzwx09frk"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ boost eigen hdf5 ]; + + passthru = { + inherit mpiSupport mpi; + }; + + cmakeFlags = [ + "-DHIGHFIVE_USE_BOOST=ON" + "-DHIGHFIVE_USE_EIGEN=ON" + "-DHIGHFIVE_EXAMPLES=OFF" + "-DHIGHFIVE_UNIT_TESTS=OFF" + "-DHIGHFIVE_USE_INSTALL_DEPS=ON" + ] + ++ (stdenv.lib.optionals mpiSupport [ "-DHIGHFIVE_PARALLEL_HDF5=ON" ]); + + meta = with stdenv.lib; { + inherit version; + description = "Header-only C++ HDF5 interface"; + license = licenses.boost; + homepage = "https://bluebrain.github.io/HighFive/"; + platforms = platforms.unix; + maintainers = with maintainers; [ robertodr ]; + }; +} diff --git a/pkgs/development/libraries/hiredis-vip/default.nix b/pkgs/development/libraries/hiredis-vip/default.nix index 59e168115a863..a4c7575ac0411 100644 --- a/pkgs/development/libraries/hiredis-vip/default.nix +++ b/pkgs/development/libraries/hiredis-vip/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "A C client library for the Redis database"; - homepage = https://github.com/vipshop/hiredis-vip; + homepage = "https://github.com/vipshop/hiredis-vip"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index ca547faa2abb0..113a49138e15a 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Windows registry hive extraction library"; license = licenses.lgpl2; - homepage = https://github.com/libguestfs/hivex; + homepage = "https://github.com/libguestfs/hivex"; maintainers = with maintainers; [offline]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index 8e3327d880f9a..3ced1c121c652 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ standard library for concurrency and parallelism"; - homepage = https://github.com/STEllAR-GROUP/hpx; + homepage = "https://github.com/STEllAR-GROUP/hpx"; license = stdenv.lib.licenses.boost; platforms = [ "x86_64-linux" ]; # stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ bobakker ]; diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix index 32743e6179704..8501bf88b6d47 100644 --- a/pkgs/development/libraries/hspell/default.nix +++ b/pkgs/development/libraries/hspell/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Hebrew spell checker"; - homepage = http://hspell.ivrix.org.il/; + homepage = "http://hspell.ivrix.org.il/"; platforms = platforms.all; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix index f0968c47822ce..ed3171da90f75 100644 --- a/pkgs/development/libraries/htmlcxx/default.nix +++ b/pkgs/development/libraries/htmlcxx/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./ptrdiff.patch ]; meta = with stdenv.lib; { - homepage = http://htmlcxx.sourceforge.net/; + homepage = "http://htmlcxx.sourceforge.net/"; description = "A simple non-validating css1 and html parser for C++"; license = licenses.lgpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index a9b28253171fe..20acc49bb83e4 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = http://hunspell.sourceforge.net; + homepage = "http://hunspell.sourceforge.net"; description = "Spell checker"; longDescription = '' Hunspell is the spell checker of LibreOffice, OpenOffice.org, Mozilla diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 9ec79f5144379..a330691c6a582 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -39,7 +39,7 @@ let }; meta = with stdenv.lib; { description = "Hunspell dictionary for ${shortDescription} from rla"; - homepage = https://github.com/sbosio/rla-es; + homepage = "https://github.com/sbosio/rla-es"; license = with licenses; [ gpl3 lgpl3 mpl11 ]; maintainers = with maintainers; [ renzo ]; platforms = platforms.all; @@ -121,7 +121,7 @@ let meta = with stdenv.lib; { inherit longDescription; description = "Hunspell dictionary for ${shortDescription} from Dicollecte"; - homepage = https://www.dicollecte.org/home.php?prj=fr; + homepage = "https://www.dicollecte.org/home.php?prj=fr"; license = licenses.mpl20; maintainers = with maintainers; [ renzo ]; platforms = platforms.all; @@ -150,7 +150,7 @@ let readmeFile = "README_" + dictFileName + ".txt"; meta = with stdenv.lib; { description = "Hunspell dictionary for ${shortDescription} from Wordlist"; - homepage = http://wordlist.aspell.net/; + homepage = "http://wordlist.aspell.net/"; license = licenses.bsd3; maintainers = with maintainers; [ renzo ]; platforms = platforms.all; @@ -177,7 +177,7 @@ let readmeFile = dictFileName + "_README.txt"; meta = with stdenv.lib; { description = "Hunspell dictionary for ${shortDescription}"; - homepage = https://sourceforge.net/projects/linguistico/; + homepage = "https://sourceforge.net/projects/linguistico/"; license = licenses.gpl3; maintainers = with maintainers; [ renzo ]; platforms = platforms.all; @@ -218,7 +218,7 @@ let ''; meta = with stdenv.lib; { - homepage = http://xuxen.eus/; + homepage = "http://xuxen.eus/"; description = shortDescription; longDescription = longDescription; license = licenses.gpl2; @@ -255,7 +255,7 @@ let ''; meta = with stdenv.lib; { - homepage = https://www.j3e.de/ispell/igerman98/index_en.html; + homepage = "https://www.j3e.de/ispell/igerman98/index_en.html"; description = shortDescription; license = with licenses; [ gpl2 gpl3 ]; maintainers = with maintainers; [ timor ]; @@ -284,7 +284,7 @@ let cp -a ${sourceRoot}/* . ''; meta = with stdenv.lib; { - homepage = https://wiki.documentfoundation.org/Development/Dictionaries; + homepage = "https://wiki.documentfoundation.org/Development/Dictionaries"; description = "Hunspell dictionary for ${shortDescription} from LibreOffice"; license = license; maintainers = with maintainers; [ vlaci ]; @@ -303,7 +303,7 @@ in rec { srcFileName = "en_US"; dictFileName = "en_US"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_US-2018.04.16.zip; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_US-2018.04.16.zip"; sha256 = "18hbncvqnckzqarrmnzk58plymjqyi93k4qj98fac5mr71jbmzaf"; }; }; @@ -315,7 +315,7 @@ in rec { srcFileName = "en_US-large"; dictFileName = "en_US"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_US-large-2018.04.16.zip; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_US-large-2018.04.16.zip"; sha256 = "1xm9jgqbivp5cb78ykjxg47vzq1yqj82l7r4q5cjpivrv99s49qc"; }; }; @@ -327,7 +327,7 @@ in rec { srcFileName = "en_CA"; dictFileName = "en_CA"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_CA-2018.04.16.zip; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_CA-2018.04.16.zip"; sha256 = "06yf3s7y1215jmikbs18cn4j8a13csp4763w3jfgah8zlim6vc47"; }; }; @@ -339,7 +339,7 @@ in rec { srcFileName = "en_CA-large"; dictFileName = "en_CA"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_CA-large-2018.04.16.zip; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_CA-large-2018.04.16.zip"; sha256 = "1200xxyvv6ni8nk52v3059c367817vnrkm0cdh38rhiigb5flfha"; }; }; @@ -351,7 +351,7 @@ in rec { srcFileName = "en_AU"; dictFileName = "en_AU"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_AU-2018.04.16.zip; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_AU-2018.04.16.zip"; sha256 = "1kp06npl1kd05mm9r52cg2iwc13x02zwqgpibdw15b6x43agg6f5"; }; }; @@ -363,7 +363,7 @@ in rec { srcFileName = "en_AU-large"; dictFileName = "en_AU"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_AU-large-2018.04.16.zip; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_AU-large-2018.04.16.zip"; sha256 = "14l1w4dpk0k1js2wwq5ilfil89ni8cigph95n1rh6xi4lzxj7h6g"; }; }; @@ -375,7 +375,7 @@ in rec { srcFileName = "en_GB-ise"; dictFileName = "en_GB"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-ise-2018.04.16.zip; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-ise-2018.04.16.zip"; sha256 = "0ylg1zvfvsawamymcc9ivrqcb9qhlpgpnizm076xc56jz554xc2l"; }; }; @@ -387,7 +387,7 @@ in rec { srcFileName = "en_GB-ize"; dictFileName = "en_GB"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-ize-2018.04.16.zip; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-ize-2018.04.16.zip"; sha256 = "1rmwy6sxmd400cwjf58az6g14sq28p18f5mlq8ybg8y33q9m42ps"; }; }; @@ -399,7 +399,7 @@ in rec { srcFileName = "en_GB-large"; dictFileName = "en_GB"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-large-2018.04.16.zip; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-large-2018.04.16.zip"; sha256 = "1y4d7x5vvi1qh1s3i09m0vvqrpdzzqhsdngr8nsh7hc5bnlm37mi"; }; }; @@ -606,7 +606,7 @@ in rec { dictFileName = "it_IT"; shortDescription = "Hunspell dictionary for 'Italian (Italy)' from Linguistico"; src = fetchurl { - url = mirror://sourceforge/linguistico/italiano_2_4_2007_09_01.zip; + url = "mirror://sourceforge/linguistico/italiano_2_4_2007_09_01.zip"; sha256 = "0m9frz75fx456bczknay5i446gdcp1smm48lc0qfwzhz0j3zcdrd"; }; }; @@ -716,7 +716,7 @@ in rec { meta = with stdenv.lib; { description = "Hunspell dictionary for Ukrainian (Ukraine) from LibreOffice"; - homepage = https://extensions.libreoffice.org/extensions/ukrainian-spelling-dictionary-and-thesaurus/; + homepage = "https://extensions.libreoffice.org/extensions/ukrainian-spelling-dictionary-and-thesaurus/"; license = licenses.mpl20; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/icu/63.nix b/pkgs/development/libraries/icu/63.nix index 719318990c624..07684d8db8183 100644 --- a/pkgs/development/libraries/icu/63.nix +++ b/pkgs/development/libraries/icu/63.nix @@ -6,7 +6,7 @@ import ./base.nix { patches = [ # https://bugzilla.mozilla.org/show_bug.cgi?id=1499398 (fetchpatch { - url = https://github.com/unicode-org/icu/commit/8baff8f03e07d8e02304d0c888d0bb21ad2eeb01.patch; + url = "https://github.com/unicode-org/icu/commit/8baff8f03e07d8e02304d0c888d0bb21ad2eeb01.patch"; sha256 = "1awfa98ljcf95a85cssahw6bvdnpbq5brf1kgspy14w4mlmhd0jb"; }) ]; diff --git a/pkgs/development/libraries/icu/65.nix b/pkgs/development/libraries/icu/65.nix new file mode 100644 index 0000000000000..c5074eea114d8 --- /dev/null +++ b/pkgs/development/libraries/icu/65.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "65.1"; + sha256 = "0j6r6qqnhfr5iqkx53k63ifkm93kv1kkb7h2mlgd1mnnndk79qsk"; +} diff --git a/pkgs/development/libraries/icu/66.nix b/pkgs/development/libraries/icu/66.nix new file mode 100644 index 0000000000000..5dfad945d2912 --- /dev/null +++ b/pkgs/development/libraries/icu/66.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "66.1"; + sha256 = "0bharwzc9nzkbrcf405z2nb3h7q0711z450arz0mjmdrk8hg58sj"; +} diff --git a/pkgs/development/libraries/icu/67.nix b/pkgs/development/libraries/icu/67.nix new file mode 100644 index 0000000000000..23a1069ea14fb --- /dev/null +++ b/pkgs/development/libraries/icu/67.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "67.1"; + sha256 = "1p6mhvxl0xr2n0g6xdps3mwzwlv6mjsz3xlpm793p9aiybb0ra4l"; +} diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index e51224433e8b3..81f75ad526a74 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -9,8 +9,7 @@ let baseAttrs = { src = fetchurl { - url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" - + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; + url = "https://github.com/unicode-org/icu/releases/download/release-${lib.replaceChars [ "." ] [ "-" ] version}/icu4c-${lib.replaceChars [ "." ] [ "_" ] version}-src.tgz"; inherit sha256; }; @@ -44,7 +43,7 @@ let meta = with stdenv.lib; { description = "Unicode and globalization support library"; - homepage = http://site.icu-project.org/; + homepage = "http://site.icu-project.org/"; maintainers = with maintainers; [ raskin ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index ddce76b10f724..6889a9f573ac4 100644 --- a/pkgs/development/libraries/id3lib/default.nix +++ b/pkgs/development/libraries/id3lib/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ zlib ]; src = fetchurl { - url = mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz; + url = "mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz"; sha256 = "0yfhqwk0w8q2hyv1jib1008jvzmwlpsxvc8qjllhna6p1hycqj97"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Library for reading, writing, and manipulating ID3v1 and ID3v2 tags"; - homepage = http://id3lib.sourceforge.net; + homepage = "http://id3lib.sourceforge.net"; platforms = platforms.unix; license = licenses.lgpl2; }; diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix index 3d00d20f17004..da7b9f1f27111 100644 --- a/pkgs/development/libraries/idnkit/default.nix +++ b/pkgs/development/libraries/idnkit/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv ]; meta = with stdenv.lib; { - homepage = https://www.nic.ad.jp/ja/idn/idnkit; + homepage = "https://www.nic.ad.jp/ja/idn/idnkit"; description = "Provides functionalities about i18n domain name processing"; license = "idnkit-2 license"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/ignition-math/default.nix b/pkgs/development/libraries/ignition-math/default.nix index 3a642c8837a3e..df4c3230b9618 100644 --- a/pkgs/development/libraries/ignition-math/default.nix +++ b/pkgs/development/libraries/ignition-math/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://ignitionrobotics.org/libraries/math; + homepage = "https://ignitionrobotics.org/libraries/math"; description = "Math library by Ingition Robotics, created for the Gazebo project"; license = licenses.asl20; maintainers = with maintainers; [ pxc ]; diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix index 0e7603db58564..2573c97aa09fb 100644 --- a/pkgs/development/libraries/ignition-transport/generic.nix +++ b/pkgs/development/libraries/ignition-transport/generic.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://ignitionrobotics.org/libraries/math; + homepage = "https://ignitionrobotics.org/libraries/math"; description = "Math library by Ingition Robotics, created for the Gazebo project"; license = licenses.asl20; maintainers = with maintainers; [ pxc ]; diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index f3206700cb89a..fcb5e7918d961 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "The network analysis package"; - homepage = https://igraph.org/; + homepage = "https://igraph.org/"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.MostAwesomeDude ]; }; diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix index 98a34477e4f13..46ed422b54094 100644 --- a/pkgs/development/libraries/ijs/default.nix +++ b/pkgs/development/libraries/ijs/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { configureFlags = [ "--enable-shared" ]; meta = with stdenv.lib; { - homepage = https://www.openprinting.org/download/ijs/; + homepage = "https://www.openprinting.org/download/ijs/"; description = "Raster printer driver architecture"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix index 6330347cd2758..7f7645edc91fb 100644 --- a/pkgs/development/libraries/iksemel/default.nix +++ b/pkgs/development/libraries/iksemel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "XML parser for jabber"; - homepage = https://github.com/timothytylee/iksemel-1.4; + homepage = "https://github.com/timothytylee/iksemel-1.4"; license = licenses.gpl2; maintainers = with maintainers; [ disassembler ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/development/libraries/ilbc/default.nix index cb83322ebb651..37885c767bd35 100644 --- a/pkgs/development/libraries/ilbc/default.nix +++ b/pkgs/development/libraries/ilbc/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { script = ./extract-cfile.awk; rfc3951 = fetchurl { - url = http://www.ietf.org/rfc/rfc3951.txt; + url = "http://www.ietf.org/rfc/rfc3951.txt"; sha256 = "0zf4mvi3jzx6zjrfl2rbhl2m68pzbzpf1vbdmn7dqbfpcb67jpdy"; }; diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix index bb6e23937c05c..6f789174ec07b 100644 --- a/pkgs/development/libraries/ilixi/default.nix +++ b/pkgs/development/libraries/ilixi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight C++ GUI toolkit for embedded Linux systems"; - homepage = https://github.com/ilixi/ilixi; + homepage = "https://github.com/ilixi/ilixi"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/ilmbase/bootstrap.patch b/pkgs/development/libraries/ilmbase/bootstrap.patch deleted file mode 100644 index db6af6daebd04..0000000000000 --- a/pkgs/development/libraries/ilmbase/bootstrap.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ur openexr-v2.2.0-src-orig/IlmBase/bootstrap openexr-v2.2.0-src/IlmBase/bootstrap ---- IlmBase/bootstrap 2015-03-31 01:02:41.000000000 -0400 -+++ IlmBase/bootstrap 2015-03-31 01:03:35.000000000 -0400 -@@ -47,11 +47,6 @@ - fi - } - --# Check if /usr/local/share/aclocal exists --if [ -d /usr/local/share/aclocal ]; then -- ACLOCAL_INCLUDE="$ACLOCAL_INCLUDE -I /usr/local/share/aclocal" --fi -- - run_cmd aclocal -I m4 $ACLOCAL_INCLUDE - run_cmd $LIBTOOLIZE --automake --copy - run_cmd automake --add-missing --copy diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 00cdda1e57084..9d2479c2e0b36 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -1,38 +1,26 @@ -{ stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which, - fetchpatch }: +{ stdenv +, buildPackages +, cmake +, libtool +, openexr +}: stdenv.mkDerivation rec { pname = "ilmbase"; - version = "2.3.0"; + version = stdenv.lib.getVersion openexr; - src = fetchurl { - url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0qiq5bqq9rxhqjiym2k36sx4vq8adgrz6xf6qwizi9bqm78phsa5"; - }; + # the project no longer provides separate tarballs. We may even want to merge + # the ilmbase package into openexr in the future. + src = openexr.src; - outputs = [ "out" "dev" ]; + sourceRoot = "source/IlmBase"; - preConfigure = '' - patchShebangs ./bootstrap - ./bootstrap - ''; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake libtool ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ automake autoconf libtool which ]; - - NIX_CFLAGS_LINK = "-pthread"; - - patches = [ - ./bootstrap.patch - ./cross.patch - (fetchpatch { - name = "CVE-2018-18443.patch"; - url = "https://github.com/kdt3rd/openexr/commit/5fa930b82cff2db386c64ca512af19e60c14d32a.patch"; - sha256 = "1j6xd0qkx99acc1szycxaj0wwp01yac67jz48hwc4fwwpz8blx4s"; - stripLen = 1; - excludes = [ "CHANGES.md" ]; - }) - ]; + + patches = [ ./cross.patch ]; # fails 1 out of 1 tests with # "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed" @@ -41,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = " A library for 2D/3D vectors and matrices and other mathematical objects, functions and data types for computer graphics"; - homepage = https://www.openexr.com/; + homepage = "https://www.openexr.com/"; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix index 2b85f12115b1d..cf1d9018fd517 100644 --- a/pkgs/development/libraries/iml/default.nix +++ b/pkgs/development/libraries/iml/default.nix @@ -1,4 +1,4 @@ -{stdenv, autoreconfHook, fetchurl, gmp, openblas}: +{stdenv, autoreconfHook, fetchurl, gmp, blas}: stdenv.mkDerivation rec { pname = "iml"; version = "1.0.5"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gmp - openblas + blas ]; nativeBuildInputs = [ autoreconfHook @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gmp-include=${gmp.dev}/include" "--with-gmp-lib=${gmp}/lib" - "--with-cblas=-lopenblas" + "--with-cblas=-lblas" ]; meta = { inherit version; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; - homepage = https://cs.uwaterloo.ca/~astorjoh/iml.html; + homepage = "https://cs.uwaterloo.ca/~astorjoh/iml.html"; updateWalker = true; }; } diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index e476bc22eca21..b94af22c0a76e 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation { name = "imlib-1.9.15"; src = fetchurl { - url = http://tarballs.nixos.org/imlib-1.9.15.tar.gz; + url = "http://tarballs.nixos.org/imlib-1.9.15.tar.gz"; sha256 = "0ggjxyvgp4pxc0b88v40xj9daz90518ydnycw7qax011gxpr12d3"; }; patches = [ (fetchpatch { name = "CVE-2007-3568.patch"; - url = https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-bpp16-CVE-2007-3568.patch; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-bpp16-CVE-2007-3568.patch"; sha256 = "0lxfibi094gki39sq1w4p0hcx25xlk0875agbhjkjngzx862wvbg"; }) ]; diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix index 16a21382d8571..6ac74988dff46 100644 --- a/pkgs/development/libraries/indicator-application/gtk2.nix +++ b/pkgs/development/libraries/indicator-application/gtk2.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { description = "Indicator to take menus from applications and place them in the panel (GTK 2 library for Xfce/LXDE)"; - homepage = https://launchpad.net/indicators-gtk2; + homepage = "https://launchpad.net/indicators-gtk2"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix index 0235729763513..a523019e78c28 100644 --- a/pkgs/development/libraries/indicator-application/gtk3.nix +++ b/pkgs/development/libraries/indicator-application/gtk3.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Indicator to take menus from applications and place them in the panel"; - homepage = https://launchpad.net/indicator-application; + homepage = "https://launchpad.net/indicator-application"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index 6fe4484e6a312..fadd2657b688c 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { name = "indilib-1.1.0"; src = fetchurl { - url = mirror://sourceforge/indi/libindi_1.1.0.tar.gz; + url = "mirror://sourceforge/indi/libindi_1.1.0.tar.gz"; sha256 = "1bs6lkwqd4aashg93mqqkc7nrg7fbx9mdw85qs5263jqa6sr780w"; }; diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 0ca31f551e89b..411cc227b3044 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "19.4.0"; + version = "20.1.1"; src = fetchurl { url = "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${version}.tar.gz"; - sha256 = "1l8wjb933wdl3vyq6r36a9pgf8n6pm9g9vcp3m393hixwzzl16i8"; + sha256 = "1p13b4abslq31pbgqf0bzs2ixns85yfdsm94326h2vcg0q7hqc24"; }; # patchelf is needed for binaries in $out/share/samples diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix index 50ae63f2d0d64..8387aa67161b7 100644 --- a/pkgs/development/libraries/ip2location-c/default.nix +++ b/pkgs/development/libraries/ip2location-c/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { weather, MCC, MNC, mobile brand name, elevation and usage type of any IP address or host name in the IP2Location databases. ''; - homepage = http://www.ip2location.com/developers/c-7; + homepage = "http://www.ip2location.com/developers/c-7"; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index f411ecdeea655..efb4c2022c4e3 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip libGLU libGL libXrandr libX11 libXxf86vm ]; meta = { - homepage = http://irrlicht.sourceforge.net/; + homepage = "http://irrlicht.sourceforge.net/"; license = stdenv.lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix index beead1f9b8570..5f8335efab2be 100644 --- a/pkgs/development/libraries/irrlicht/mac.nix +++ b/pkgs/development/libraries/irrlicht/mac.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip OpenGL Cocoa IOKit ]; meta = { - homepage = http://irrlicht.sourceforge.net/; + homepage = "http://irrlicht.sourceforge.net/"; license = stdenv.lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; platforms = stdenv.lib.platforms.darwin; diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix index 13c71dc8f7047..1cac0d369fed7 100644 --- a/pkgs/development/libraries/isl/0.11.1.nix +++ b/pkgs/development/libraries/isl/0.11.1.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - homepage = https://www.kotnet.org/~skimo/isl/; + homepage = "https://www.kotnet.org/~skimo/isl/"; license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/isl/0.14.1.nix b/pkgs/development/libraries/isl/0.14.1.nix index 1ff4b7ec18a00..a97e05b0431a1 100644 --- a/pkgs/development/libraries/isl/0.14.1.nix +++ b/pkgs/development/libraries/isl/0.14.1.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://www.kotnet.org/~skimo/isl/; + homepage = "https://www.kotnet.org/~skimo/isl/"; license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/isl/0.17.1.nix b/pkgs/development/libraries/isl/0.17.1.nix index 59d4d38ce574d..018f708508814 100644 --- a/pkgs/development/libraries/isl/0.17.1.nix +++ b/pkgs/development/libraries/isl/0.17.1.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://www.kotnet.org/~skimo/isl/; + homepage = "https://www.kotnet.org/~skimo/isl/"; license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/isl/0.20.0.nix b/pkgs/development/libraries/isl/0.20.0.nix index 72ef581725b9a..3775bdc71e023 100644 --- a/pkgs/development/libraries/isl/0.20.0.nix +++ b/pkgs/development/libraries/isl/0.20.0.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://isl.gforge.inria.fr/; + homepage = "http://isl.gforge.inria.fr/"; license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 1766abb2aac92..9ab25b410b4a3 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext python3 ]; meta = with stdenv.lib; { - homepage = https://salsa.debian.org/iso-codes-team/iso-codes; + homepage = "https://salsa.debian.org/iso-codes-team/iso-codes"; description = "Various ISO codes packaged as XML files"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/pkgs/development/libraries/itk/4.x.nix b/pkgs/development/libraries/itk/4.x.nix index 7e24ba901e597..833723d4d2d20 100644 --- a/pkgs/development/libraries/itk/4.x.nix +++ b/pkgs/development/libraries/itk/4.x.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "itk-4.13.2"; src = fetchurl { - url = mirror://sourceforge/itk/InsightToolkit-4.13.2.tar.xz; + url = "mirror://sourceforge/itk/InsightToolkit-4.13.2.tar.xz"; sha256 = "19cgfpd63gqrvc3m27m394gy2d7w79g5y6lvznb5qqr49lihbgns"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Insight Segmentation and Registration Toolkit"; - homepage = http://www.itk.org/; + homepage = "http://www.itk.org/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 3577e7a8196de..6c0298c0f71c5 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, libX11, libuuid, xz, vtk, darwin }: +{ stdenv, fetchFromGitHub, cmake, makeWrapper +, pkgconfig, libX11, libuuid, xz, vtk, Cocoa }: stdenv.mkDerivation rec { pname = "itk"; - version = "5.0.1"; + version = "5.1.0"; src = fetchFromGitHub { owner = "InsightSoftwareConsortium"; repo = "ITK"; rev = "v${version}"; - sha256 = "0dcjsn5frjnrphfgw8alnd2ahrvicpx2a2ngb5ixaa9anaicz9z1"; + sha256 = "0rvkp00xj1js60021jv2ydyl74wvbyb205gm9d7hf8gy2q456hgl"; }; cmakeFlags = [ @@ -23,12 +24,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ cmake xz ]; - buildInputs = [ libX11 libuuid vtk ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + nativeBuildInputs = [ cmake xz makeWrapper ]; + buildInputs = [ libX11 libuuid vtk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + + postInstall = '' + wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkgconfig}/bin" + ''; meta = { description = "Insight Segmentation and Registration Toolkit"; - homepage = http://www.itk.org/; + homepage = "https://www.itk.org/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix index 26ec06fad7bfe..5c7473be647a2 100644 --- a/pkgs/development/libraries/jama/default.nix +++ b/pkgs/development/libraries/jama/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.2.5"; src = fetchurl { - url = https://math.nist.gov/tnt/jama125.zip; + url = "https://math.nist.gov/tnt/jama125.zip"; sha256 = "031ns526fvi2nv7jzzv02i7i5sjcyr0gj884i3an67qhsx8vyckl"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://math.nist.gov/tnt/; + homepage = "https://math.nist.gov/tnt/"; description = "JAMA/C++ Linear Algebra Package: Java-like matrix C++ templates"; platforms = platforms.unix; license = licenses.publicDomain; diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index 25b55f00311bf..c1653ea5d1be3 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://www.digip.org/jansson/; + homepage = "http://www.digip.org/jansson/"; description = "C library for encoding, decoding and manipulating JSON data"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 093fd0c5f28ac..cd7b1cf4fd104 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.ece.uvic.ca/~frodo/jasper/; + homepage = "https://www.ece.uvic.ca/~frodo/jasper/"; description = "JPEG2000 Library"; platforms = platforms.unix; license = licenses.jasper; diff --git a/pkgs/development/libraries/java/commons/bsf/default.nix b/pkgs/development/libraries/java/commons/bsf/default.nix index e3c464482c7ee..46bd3c0fd1552 100644 --- a/pkgs/development/libraries/java/commons/bsf/default.nix +++ b/pkgs/development/libraries/java/commons/bsf/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "commons-bsf-1.2"; src = fetchurl { - url = mirror://apache/commons/bsf/binaries/bsf-bin-2.4.0.tar.gz; + url = "mirror://apache/commons/bsf/binaries/bsf-bin-2.4.0.tar.gz"; sha256 = "1my3hv4y8cvrd1kr315wvbjqsamzlzswnbqcmsa2m4hqcafddfr8"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Interface to scripting languages, including JSR-223"; - homepage = http://commons.apache.org/proper/commons-bsf/; + homepage = "http://commons.apache.org/proper/commons-bsf/"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index d418145e1b5fd..5307c635834cc 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.18"; + version = "1.20"; pname = "commons-compress"; src = fetchurl { url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "0ciwzq134rqh1fp7qba091rajf2pdagfb665rarni7glb2x4lha1"; + sha256 = "0zx1sc0rw3vzjan69vxr2qw82y9b0hqdzp4plcahc3c1y0vkz3fg"; }; installPhase = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://commons.apache.org/proper/commons-compress; + homepage = "http://commons.apache.org/proper/commons-compress"; description = "Allows manipulation of ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE and Z files"; maintainers = with stdenv.lib.maintainers; [ copumpkin ]; license = stdenv.lib.licenses.asl20; diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix index 0aca6bf8baaab..cd439b503971c 100644 --- a/pkgs/development/libraries/java/commons/fileupload/default.nix +++ b/pkgs/development/libraries/java/commons/fileupload/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://commons.apache.org/proper/commons-fileupload; + homepage = "http://commons.apache.org/proper/commons-fileupload"; description = "Makes it easy to add robust, high-performance, file upload capability to your servlets and web applications"; maintainers = with stdenv.lib.maintainers; [ copumpkin ]; license = stdenv.lib.licenses.asl20; diff --git a/pkgs/development/libraries/java/commons/logging/default.nix b/pkgs/development/libraries/java/commons/logging/default.nix index 4e3fa2655020a..7c2192e4952e0 100644 --- a/pkgs/development/libraries/java/commons/logging/default.nix +++ b/pkgs/development/libraries/java/commons/logging/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "commons-logging-1.2"; src = fetchurl { - url = mirror://apache/commons/logging/binaries/commons-logging-1.2-bin.tar.gz; + url = "mirror://apache/commons/logging/binaries/commons-logging-1.2-bin.tar.gz"; sha256 = "1gc70pmcv0x6ibl89jglmr22f8zpr63iaifi49nrq399qw2qhx9z"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Wrapper around a variety of logging API implementations"; - homepage = http://commons.apache.org/proper/commons-logging; + homepage = "http://commons.apache.org/proper/commons-logging"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/java/cup/default.nix b/pkgs/development/libraries/java/cup/default.nix index e485eabe1cbf2..acf8cc9b83d94 100644 --- a/pkgs/development/libraries/java/cup/default.nix +++ b/pkgs/development/libraries/java/cup/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www2.cs.tum.edu/projects/cup/; + homepage = "http://www2.cs.tum.edu/projects/cup/"; description = "LALR parser generator for Java"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix index 5ec10cc7e0dfd..5e5741516508f 100644 --- a/pkgs/development/libraries/java/dbus-java/default.nix +++ b/pkgs/development/libraries/java/dbus-java/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "dbus-java-2.7"; src = fetchurl { - url = https://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz; + url = "https://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz"; sha256 = "0cyaxd8x6sxmi6pklkkx45j311a6w51fxl4jc5j3inc4cailwh5y"; }; JAVA_HOME=jdk; diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index 6af8885464a31..6d4dfbfe61c6d 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "GeoIPJava-1.2.5"; src = fetchurl { - url = https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip; + url = "https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip"; sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd"; }; buildInputs = [ jdk unzip ]; diff --git a/pkgs/development/libraries/java/gwt-dragdrop/default.nix b/pkgs/development/libraries/java/gwt-dragdrop/default.nix index e34699d7740ed..37d7cac0da261 100644 --- a/pkgs/development/libraries/java/gwt-dragdrop/default.nix +++ b/pkgs/development/libraries/java/gwt-dragdrop/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://gwt-dnd.googlecode.com/files/gwt-dnd-2.6.5.jar; + url = "http://gwt-dnd.googlecode.com/files/gwt-dnd-2.6.5.jar"; sha256 = "07zdlr8afs499asnw0dcjmw1cnjc646v91lflx5dv4qj374c97fw"; }; diff --git a/pkgs/development/libraries/java/gwt-widgets/default.nix b/pkgs/development/libraries/java/gwt-widgets/default.nix index ec407076906d0..a968ebc5fd8e6 100644 --- a/pkgs/development/libraries/java/gwt-widgets/default.nix +++ b/pkgs/development/libraries/java/gwt-widgets/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/gwt-widget/gwt-widgets-0.2.0-bin.tar.gz; + url = "mirror://sourceforge/gwt-widget/gwt-widgets-0.2.0-bin.tar.gz"; sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb"; }; diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix index 500c575f73aa9..34af97605d2a8 100644 --- a/pkgs/development/libraries/java/httpunit/default.nix +++ b/pkgs/development/libraries/java/httpunit/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/httpunit/httpunit-1.7.zip; + url = "mirror://sourceforge/httpunit/httpunit-1.7.zip"; sha256 = "09gnayqgizd8cjqayvdpkxrc69ipyxawc96aznfrgdhdiwv8l5zf"; }; inherit unzip; meta = with stdenv.lib; { - homepage = http://httpunit.sourceforge.net; + homepage = "http://httpunit.sourceforge.net"; platforms = platforms.unix; license = licenses.mit; }; diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix index 1f2aeda80cfec..54e85ec558978 100644 --- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "2010.2"; src = fetchgit { - url = https://github.com/NixOS/hydra-ant-logger.git; + url = "https://github.com/NixOS/hydra-ant-logger.git"; rev = "dae3224f4ed42418d3492bdf5bee4f825819006f"; sha256 = "01s7m6007rn9107rw5wcgna7i20x6p6kfzl4f79jrvpkjy6kz176"; }; diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix index 16755471acd76..60558f72cfc84 100644 --- a/pkgs/development/libraries/java/jdom/default.nix +++ b/pkgs/development/libraries/java/jdom/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://www.jdom.org/dist/binary/jdom-1.0.tar.gz; + url = "http://www.jdom.org/dist/binary/jdom-1.0.tar.gz"; sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf"; }; meta = with stdenv.lib; { description = "Java-based solution for accessing, manipulating, and outputting XML data from Java code"; - homepage = http://www.jdom.org; + homepage = "http://www.jdom.org"; platforms = platforms.unix; license = licenses.bsdOriginal; }; diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix index 5eb7ef6c07657..d0258d5896be9 100644 --- a/pkgs/development/libraries/java/jflex/default.nix +++ b/pkgs/development/libraries/java/jflex/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, jre} : stdenv.mkDerivation rec { - name = "jflex-1.8.1"; + name = "jflex-1.8.2"; src = fetchurl { url = "http://jflex.de/release/${name}.tar.gz"; - sha256 = "0hspw4z1i7wc1dnnyh4xx6ka7891nsw4hc66bf45510gjks6779x"; + sha256 = "1ar7g6zb2xjgnws3j4cqcp86jplhc9av8cpcjdmxw08x6igd5q51"; }; sourceRoot = name; diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix index 0879f0a692600..c114ddeac2749 100644 --- a/pkgs/development/libraries/java/junit/default.nix +++ b/pkgs/development/libraries/java/junit/default.nix @@ -20,7 +20,7 @@ in antBuild { ]; meta = { - homepage = http://www.junit.org/; + homepage = "http://www.junit.org/"; description = "A framework for repeatable tests in Java"; license = stdenv.lib.licenses.epl10; broken = true; diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix index bc34957b9c3e6..cb88df276a57b 100644 --- a/pkgs/development/libraries/java/junixsocket/default.nix +++ b/pkgs/development/libraries/java/junixsocket/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "A Java/JNI library for using Unix Domain Sockets from Java"; - homepage = https://github.com/kohlschutter/junixsocket; + homepage = "https://github.com/kohlschutter/junixsocket"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix index e25106e22c6cd..5bc0f15b205d3 100644 --- a/pkgs/development/libraries/java/jzmq/default.nix +++ b/pkgs/development/libraries/java/jzmq/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.zeromq.org; + homepage = "http://www.zeromq.org"; description = "Java bindings for ZeroMQ"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.lgpl3; diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index 98291a7763cab..8b8123dff2b35 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libmatthew-java-0.8"; src = fetchurl { - url = https://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz; + url = "https://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz"; sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85"; }; JAVA_HOME=jdk; diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index 09cec4631416a..f48c4821d9238 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A library that can write a lot of boilerplate for your Java project"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.mit; - homepage = https://projectlombok.org/; + homepage = "https://projectlombok.org/"; maintainers = [ stdenv.lib.maintainers.CrystalGamma ]; }; } diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix index ae93765ff9818..817c861436f80 100644 --- a/pkgs/development/libraries/java/mockobjects/default.nix +++ b/pkgs/development/libraries/java/mockobjects/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/mockobjects/mockobjects-bin-0.09.tar; + url = "mirror://sourceforge/mockobjects/mockobjects-bin-0.09.tar"; sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz"; }; diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 0fdce1bceed0a..d3d10f61b70ff 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { to provide scripting to end users. ''; - homepage = http://www.mozilla.org/rhino/; + homepage = "http://www.mozilla.org/rhino/"; license = with licenses; [ mpl11 /* or */ gpl2Plus ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index 687e1e8a1deb5..ef403be60df46 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -28,7 +28,7 @@ let meta = with stdenv.lib; { inherit description license; - homepage = http://saxon.sourceforge.net/; + homepage = "http://saxon.sourceforge.net/"; maintainers = with maintainers; [ rvl ]; platforms = platforms.all; }; @@ -39,7 +39,7 @@ in { pname = "saxon"; version = "6.5.3"; src = fetchurl { - url = mirror://sourceforge/saxon/saxon6_5_3.zip; + url = "mirror://sourceforge/saxon/saxon6_5_3.zip"; sha256 = "0l5y3y2z4wqgh80f26dwwxwncs8v3nkz3nidv14z024lmk730vs3"; }; description = "XSLT 1.0 processor"; @@ -52,7 +52,7 @@ in { version = "8.8"; jar = "saxon8"; src = fetchurl { - url = mirror://sourceforge/saxon/saxonb8-8j.zip; + url = "mirror://sourceforge/saxon/saxonb8-8j.zip"; sha256 = "15bzrfyd2f1045rsp9dp4znyhmizh1pm97q8ji2bc0b43q23xsb8"; }; description = "Complete and conformant processor of XSLT 2.0, XQuery 1.0, and XPath 2.0"; @@ -63,7 +63,7 @@ in { version = "9.1.0.8"; jar = "saxon9"; src = fetchurl { - url = mirror://sourceforge/saxon/Saxon-B/9.1.0.8/saxonb9-1-0-8j.zip; + url = "mirror://sourceforge/saxon/Saxon-B/9.1.0.8/saxonb9-1-0-8j.zip"; sha256 = "1d39jdnwr3v3pzswm81zry6yikqlqy9dp2l2wmpqdiw00r5drg4j"; }; description = "Complete and conformant processor of XSLT 2.0, XQuery 1.0, and XPath 2.0"; @@ -75,7 +75,7 @@ in { prog = "saxon-he"; jar = "saxon9he"; src = fetchurl { - url = mirror://sourceforge/saxon/Saxon-HE/9.9/SaxonHE9-9-0-1J.zip; + url = "mirror://sourceforge/saxon/Saxon-HE/9.9/SaxonHE9-9-0-1J.zip"; sha256 = "1inxd7ia7rl9fxfrw8dy9sb7rqv76ipblaki5262688wf2dscs60"; }; description = "Processor for XSLT 3.0, XPath 2.0 and 3.1, and XQuery 3.1"; diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix index d5f8ac217f3de..c1d41e7743d55 100644 --- a/pkgs/development/libraries/java/smack/default.nix +++ b/pkgs/development/libraries/java/smack/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_4_1_9.tar.gz; + url = "http://www.igniterealtime.org/downloadServlet?filename=smack/smack_4_1_9.tar.gz"; sha256 = "009x0qcxd4dkvwcjz2nla470pwbabwvg37wc21pslpw42ldi0bzp"; }; diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index b0fdca1121867..b96c91713248b 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.eclipse.org/swt/; + homepage = "http://www.eclipse.org/swt/"; description = "An widget toolkit for Java to access the user-interface facilities of the operating systems on which it is implemented"; license = licenses.epl10; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index 2dff3bafdd304..8cc2ce0087168 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = https://www.jbig2dec.com/; + homepage = "https://www.jbig2dec.com/"; description = "Decoder implementation of the JBIG2 image compression format"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index 2b2f75abfd174..dbf728e7d828b 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.cl.cam.ac.uk/~mgk25/jbigkit/; + homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/"; description = "A software implementation of the JBIG1 data compression standard"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/development/libraries/jcal/default.nix b/pkgs/development/libraries/jcal/default.nix index dfb0003cc98ab..8e7818bf4e50b 100644 --- a/pkgs/development/libraries/jcal/default.nix +++ b/pkgs/development/libraries/jcal/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Jalali calendar is a small and portable free software library to manipulate date and time in Jalali calendar system."; - homepage = http://nongnu.org/jcal/; + homepage = "http://nongnu.org/jcal/"; license = licenses.gpl3; maintainers = [ maintainers.linarcx ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix index 128910e00f21f..fc4f0f2fe6e82 100644 --- a/pkgs/development/libraries/jemalloc/common.nix +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://jemalloc.net; + homepage = "http://jemalloc.net"; description = "General purpose malloc(3) implementation"; longDescription = '' malloc(3)-compatible memory allocator that emphasizes fragmentation diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix index 6492077eee41e..4cafa7434b126 100644 --- a/pkgs/development/libraries/jitterentropy/default.nix +++ b/pkgs/development/libraries/jitterentropy/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Provides a noise source using the CPU execution timing jitter"; - homepage = https://github.com/smuellerDD/jitterentropy-library; + homepage = "https://github.com/smuellerDD/jitterentropy-library"; license = with stdenv.lib.licenses; [ gpl2 bsd3 ]; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ johnazoidberg ]; diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index 27d1b701f0545..81ebc7baeb06d 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A JSON implementation in C"; - homepage = https://github.com/json-c/json-c/wiki; + homepage = "https://github.com/json-c/json-c/wiki"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index f811c0b09f82e..4ae4a71091e44 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format"; - homepage = https://wiki.gnome.org/Projects/JsonGlib; + homepage = "https://wiki.gnome.org/Projects/JsonGlib"; license = licenses.lgpl2; maintainers = with maintainers; [ lethalman ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 7b06cc8ad4e64..155103af3c4ec 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python ]; - # fix inverted sense in isAnyCharRequiredQuoting on aarch64. See: https://github.com/open-source-parsers/jsoncpp/pull/1120 - patches = stdenv.lib.optionals stdenv.isAarch64 [ + # fix inverted sense in isAnyCharRequiredQuoting on arm. See: https://github.com/open-source-parsers/jsoncpp/pull/1120 + patches = stdenv.lib.optionals (stdenv.isAarch64 || stdenv.isAarch32) [ (fetchpatch { url = "https://github.com/open-source-parsers/jsoncpp/commit/9093358efae9e5981aa60013487fc7215f040a59.patch"; sha256 = "1wiqp70sck2md14sfc0zdkblqk9750cl55ykf9d6b9vs1ifzzzq5"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; - homepage = https://github.com/open-source-parsers/jsoncpp; + homepage = "https://github.com/open-source-parsers/jsoncpp"; description = "A C++ library for interacting with JSON."; maintainers = with maintainers; [ ttuegel cpages nand0p ]; license = licenses.mit; diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index b124954672123..b641a54730233 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to communicate using the JSON-RPC 2.0 specification"; - homepage = https://gitlab.gnome.org/GNOME/jsonrpc-glib; + homepage = "https://gitlab.gnome.org/GNOME/jsonrpc-glib"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index 01ba605b506c8..ad422db3d48ee 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "judy-1.0.5"; src = fetchurl { - url = mirror://sourceforge/judy/Judy-1.0.5.tar.gz; + url = "mirror://sourceforge/judy/Judy-1.0.5.tar.gz"; sha256 = "1sv3990vsx8hrza1mvq3bhvv9m6ff08y4yz7swn6znszz24l0w6j"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://judy.sourceforge.net/; + homepage = "http://judy.sourceforge.net/"; license = stdenv.lib.licenses.lgpl21Plus; description = "State-of-the-art C library that implements a sparse dynamic array"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix index bc5be3172ec8e..e119c75ff8dd2 100644 --- a/pkgs/development/libraries/jxrlib/default.nix +++ b/pkgs/development/libraries/jxrlib/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Implementation of the JPEG XR image codec standard"; - homepage = https://jxrlib.codeplex.com; + homepage = "https://jxrlib.codeplex.com"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 7ce3954e286c5..1db37bc787902 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -73,7 +73,7 @@ let setupHook = args.setupHook or defaultSetupHook; meta = { - homepage = http://www.kde.org; + homepage = "http://www.kde.org"; license = with lib.licenses; [ lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 ]; @@ -105,8 +105,10 @@ let kdbusaddons = callPackage ./kdbusaddons.nix {}; kdnssd = callPackage ./kdnssd.nix {}; kguiaddons = callPackage ./kguiaddons.nix {}; + kholidays = callPackage ./kholidays.nix {}; ki18n = callPackage ./ki18n.nix {}; kidletime = callPackage ./kidletime.nix {}; + kirigami2 = callPackage ./kirigami2.nix {}; kitemmodels = callPackage ./kitemmodels.nix {}; kitemviews = callPackage ./kitemviews.nix {}; kplotting = callPackage ./kplotting.nix {}; @@ -117,12 +119,11 @@ let networkmanager-qt = callPackage ./networkmanager-qt.nix {}; oxygen-icons5 = callPackage ./oxygen-icons5.nix {}; prison = callPackage ./prison.nix {}; + qqc2-desktop-style = callPackage ./qqc2-desktop-style.nix {}; solid = callPackage ./solid.nix {}; sonnet = callPackage ./sonnet.nix {}; syntax-highlighting = callPackage ./syntax-highlighting.nix {}; threadweaver = callPackage ./threadweaver.nix {}; - kirigami2 = callPackage ./kirigami2.nix {}; - kholidays = callPackage ./kholidays.nix {}; # TIER 2 kactivities = callPackage ./kactivities.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index 654eb94b51acf..3a3f066ad33b7 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -13,7 +13,7 @@ mkDerivation { meta = with lib; { platforms = platforms.linux ++ platforms.darwin; - homepage = http://www.kde.org; + homepage = "http://www.kde.org"; license = licenses.bsd2; maintainers = [ maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix b/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix new file mode 100644 index 0000000000000..ed372e01aeb26 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix @@ -0,0 +1,15 @@ +{ mkDerivation, lib +, extra-cmake-modules +, qtquickcontrols2 +, qtx11extras +, kconfig +, kiconthemes +, kirigami2 +}: + +mkDerivation { + name = "qqc2-desktop-style"; + meta = { maintainers = with lib.maintainers; [ ttuegel ]; }; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtx11extras qtquickcontrols2 kconfig kiconthemes kirigami2 ]; +} diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 5ff3f313dcfdb..e5a593a7ff459 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { meta = { description = "MIT Kerberos 5"; - homepage = http://web.mit.edu/kerberos/; + homepage = "http://web.mit.edu/kerberos/"; license = licenses.mit; platforms = platforms.unix ++ platforms.windows; }; diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 0a130c017c092..e3084b9733e45 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { * Python bindings, ``python-keybinder`` * An ``examples`` directory with programs in C, Lua, Python and Vala. ''; - homepage = https://github.com/engla/keybinder/; + homepage = "https://github.com/engla/keybinder/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index ed2dd341f45e6..1c8dbfdcd8186 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for registering global key bindings"; - homepage = https://github.com/kupferlauncher/keybinder/; + homepage = "https://github.com/kupferlauncher/keybinder/"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.cstrahan ]; diff --git a/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch b/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch deleted file mode 100644 index 49edbf63a5464..0000000000000 --- a/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch +++ /dev/null @@ -1,224 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8217cba..a6c1d70 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -32,7 +32,7 @@ else(APPLE) - endif(${BUILD_FOR_ARM}) - endif(APPLE) - --set(CMAKE_CXX_FLAGS "--std=c++0x -Wall -Wextra -Werror -Wno-unknown-warning-option -Wno-unused-parameter -Wno-null-dereference -Wno-unused-local-typedefs -DGTEST_USE_OWN_TR1_TUPLE=1 ${BUILD_PIC_COMPILER_FLAGS}") -+set(CMAKE_CXX_FLAGS "--std=c++11 -DGTEST_USE_OWN_TR1_TUPLE=1 ${BUILD_PIC_COMPILER_FLAGS}") - - set(TEST_BINARY "kinetic_client_test") - set(TEST_BINARY_PATH ${kinetic_cpp_client_BINARY_DIR}/${TEST_BINARY}) -@@ -50,103 +50,16 @@ set(GENERATED_SOURCES_PATH ${kinetic_cpp_client_SOURCE_DIR}/src/main/generated) - set(PREFIX "${CMAKE_BINARY_DIR}/vendor") - set(EXTERNAL_PREFIX "${kinetic_cpp_client_BINARY_DIR}/vendor") - --include(ExternalProject) -- --set(KINETIC_PROTO_VERSION "3.0.0") --set(KINETIC_PROTO_MD5 "85ca027b870811a297c1f6d792498934") -- --ExternalProject_add( -- kinetic-proto -- PREFIX ${PREFIX} -- DOWNLOAD_COMMAND curl -L https://github.com/Seagate/kinetic-protocol/archive/${KINETIC_PROTO_VERSION}.tar.gz -o kinetic-proto.tar.gz && openssl md5 kinetic-proto.tar.gz | grep -q ${KINETIC_PROTO_MD5} && rm -rf kinetic-proto && mkdir -p kinetic-proto && tar -xz --strip-components 1 -C kinetic-proto -f kinetic-proto.tar.gz -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND "" -- BUILD_COMMAND "" -- INSTALL_COMMAND "" --) -- --ExternalProject_add( -- gflags -- PREFIX ${EXTERNAL_PREFIX} -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gflags-2.0-no-svn-files.tar.gz" -- URL_MD5 "9084829124e02a7e6be0f0f824523423" -- CONFIGURE_COMMAND ../gflags/configure --prefix=${EXTERNAL_PREFIX} --enable-static ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS} --) -- --ExternalProject_add( -- glog -- PREFIX ${EXTERNAL_PREFIX} -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/glog-0.3.3.tar.gz" -- URL_MD5 "a6fd2c22f8996846e34c763422717c18" -- PATCH_COMMAND sh ${kinetic_cpp_client_SOURCE_DIR}/patches/apply-glog-patches.sh ${kinetic_cpp_client_SOURCE_DIR} -- CONFIGURE_COMMAND ../glog/configure --prefix=${EXTERNAL_PREFIX} --with-gflags=${EXTERNAL_PREFIX} --enable-static ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS} -- DEPENDS gflags --) -- --ExternalProject_add( -- gtest -- PREFIX ${EXTERNAL_PREFIX} -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gtest-1.6.0.zip" -- URL_MD5 "4577b49f2973c90bf9ba69aa8166b786" -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND "" -- BUILD_COMMAND ${CMAKE_CXX_COMPILER} -DGTEST_USE_OWN_TR1_TUPLE=1 -I../gtest -I../gtest/include -c ../gtest/src/gtest-all.cc && ar -rv libgtest.a gtest-all.o && ranlib libgtest.a -- INSTALL_COMMAND "" --) -- --ExternalProject_add( -- gmock -- PREFIX ${EXTERNAL_PREFIX} -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gmock-1.6.0.zip" -- URL_MD5 "f547f47321ca88d3965ca2efdcc2a3c1" -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND "" -- BUILD_COMMAND ${CMAKE_CXX_COMPILER} -DGTEST_USE_OWN_TR1_TUPLE=1 -I../gmock -I../gmock/include -I../gtest -I../gtest/include -c ../gmock/src/gmock-all.cc && ar -rv libgmock.a gmock-all.o && ranlib libgmock.a -- INSTALL_COMMAND "" -- DEPENDS gtest --) -- --ExternalProject_add( -- openssl -- PREFIX ${EXTERNAL_PREFIX} -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/openssl-1.0.1g.tar.gz" -- URL_MD5 "de62b43dfcd858e66a74bee1c834e959" -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND ${OPENSSL_CONFIGURE_COMMAND} --prefix=${EXTERNAL_PREFIX} ${BUILD_PIC_COMPILER_FLAG} -- BUILD_COMMAND touch apps/openssl && touch openssl.pc && make ${CHILD_MAKE_FLAGS} build_libs libssl.pc libcrypto.pc -- INSTALL_COMMAND make install_sw --) -- --# The protobuf build requires the existence of a protoc binary that can be --# executed on the host machine. To handle cross compilation, we always build --# protobuf once for the host so that we have a suitable copy of protoc. --ExternalProject_add( -- protoc -- PREFIX ${EXTERNAL_PREFIX}/host -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/protobuf-2.5.0.tar.bz2" -- URL_MD5 "a72001a9067a4c2c4e0e836d0f92ece4" -- CONFIGURE_COMMAND ../protoc/configure --prefix=${EXTERNAL_PREFIX}/host --enable-static --) -- - # Protobuf code generation rules --set(PROTOC_PATH "${PREFIX}/host/bin/protoc") --set(PROTO_DIR "${CMAKE_BINARY_DIR}/vendor/src/kinetic-proto") -+set(PROTOC_PATH "protoc") -+set(PROTO_DIR "${CMAKE_BINARY_DIR}/kinetic-proto") - set(PROTO_ORIG_PATH "${PROTO_DIR}/kinetic.proto") - set(PROTO_MODIFIED_PATH "${PROTO_DIR}/kinetic_client.proto") --ExternalProject_add( -- protobuf -- PREFIX ${EXTERNAL_PREFIX} -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/protobuf-2.5.0.tar.bz2" -- URL_MD5 "a72001a9067a4c2c4e0e836d0f92ece4" -- CONFIGURE_COMMAND ../protobuf/configure --prefix=${EXTERNAL_PREFIX} --enable-static --with-protoc=${PROTOC_PATH} ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS} -- DEPENDS protoc --) - - add_custom_command( - COMMENT "Compiling protobuf" - OUTPUT ${GENERATED_SOURCES_PATH}/kinetic_client.pb.h ${GENERATED_SOURCES_PATH}/kinetic_client.pb.cc - COMMAND mkdir -p ${GENERATED_SOURCES_PATH} && sed 's/com\\.seagate\\.kinetic\\.proto/com.seagate.kinetic.client.proto/' ${PROTO_ORIG_PATH} > ${PROTO_MODIFIED_PATH} && ${PROTOC_PATH} -I=${PROTO_DIR} --cpp_out=${GENERATED_SOURCES_PATH} ${PROTO_MODIFIED_PATH} -- DEPENDS kinetic-proto protoc protobuf - ) - set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${GENERATED_SOURCES_PATH}) - -@@ -157,21 +70,10 @@ include_directories( - - src/test/mock - src/test -- -- ${EXTERNAL_PREFIX}/include -- ${EXTERNAL_PREFIX}/src/gmock/include -- ${EXTERNAL_PREFIX}/src/gtest/include - ) - - set(LIBRARY_DEPENDENCIES - kinetic_client -- ${CMAKE_BINARY_DIR}/vendor/lib/libglog.a -- ${CMAKE_BINARY_DIR}/vendor/lib/libgflags.a -- ${CMAKE_BINARY_DIR}/vendor/lib/libssl.a -- ${CMAKE_BINARY_DIR}/vendor/lib/libcrypto.a -- ${CMAKE_BINARY_DIR}/vendor/lib/libprotobuf.a -- ${CMAKE_BINARY_DIR}/vendor/src/gtest/libgtest.a -- ${CMAKE_BINARY_DIR}/vendor/src/gmock/libgmock.a - ${CMAKE_THREAD_LIBS_INIT} - dl - ) -@@ -180,12 +82,68 @@ set(LIBRARY_DEPENDENCIES - # Otherwise glog uses the standard glibc unwinder and there is no dependency. - find_library(LIBUNWIND "unwind") - if(LIBUNWIND) -- set(LIBRARY_DEPENDENCIES -- ${LIBRARY_DEPENDENCIES} -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} - ${LIBUNWIND} - ) - endif() - -+find_library(LIBSSL "ssl") -+if(LIBSSL) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBSSL} -+ ) -+endif() -+ -+find_library(LIBCRYPTO "crypto") -+if(LIBCRYPTO) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBCRYPTO} -+ ) -+endif() -+ -+find_library(LIBPROTOBUF "protobuf") -+if(LIBPROTOBUF) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBPROTOBUF} -+ ) -+endif() -+ -+find_library(LIBGLOG "glog") -+if(LIBGLOG) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBGLOG} -+ ) -+endif() -+ -+find_library(LIBGFLAGS "gflags") -+if(LIBGFLAGS) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBGFLAGS} -+ ) -+endif() -+ -+find_library(LIBGMOCK "gmock") -+if(LIBGMOCK) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBGMOCK} -+ ) -+endif() -+ -+find_library(LIBGTEST "gtest") -+if(LIBGTEST) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBGTEST} -+ ) -+endif() -+ - add_library(kinetic_client - src/main/generated/kinetic_client.pb.cc - src/main/hmac_provider.cc -diff --git a/src/test/kinetic_cpp_client_test.cc b/src/test/kinetic_cpp_client_test.cc -index 2079fab..c5004a2 100644 ---- a/src/test/kinetic_cpp_client_test.cc -+++ b/src/test/kinetic_cpp_client_test.cc -@@ -22,6 +22,7 @@ - - #include <iostream> - -+#include "gflags/gflags.h" - #include "gtest/gtest.h" - #include "glog/logging.h" - diff --git a/pkgs/development/libraries/kinetic-cpp-client/default.nix b/pkgs/development/libraries/kinetic-cpp-client/default.nix deleted file mode 100644 index 21e3c4d3424eb..0000000000000 --- a/pkgs/development/libraries/kinetic-cpp-client/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, fetchgit, fetchurl, cmake, protobuf, libunwind, openssl, glog -, gflags, gmock, gtest -}: - -let - protoTar = fetchurl { - url = "https://github.com/Seagate/kinetic-protocol/archive/3.0.0.tar.gz"; - sha256 = "0406pp0sdf0rg6s5g18r2d8si2rin7p6qbzp7c6pma5hyzsygz48"; - }; -in -stdenv.mkDerivation { - name = "kinetic-cpp-client-2015-04-14"; - - src = fetchgit { - url = "git://github.com/Seagate/kinetic-cpp-client.git"; - rev = "015085a5c89db0398f80923053f36b9e0611e107"; - sha256 = "0gm34sl6lyidnxgg1lrhkxkxqj8z1y2cqn7zhzz2f1k50pigi5da"; - }; - - patches = [ ./build-fix.patch ]; - - postPatch = '' - mkdir -p build/kinetic-proto - tar -x --strip-components 1 -C build/kinetic-proto -f ${protoTar} - ''; - - nativeBuildInputs = [ cmake protobuf ]; - buildInputs = [ libunwind glog gflags gmock gtest ]; - - # The headers and library include from these and there is no provided pc file - propagatedBuildInputs = [ protobuf openssl ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=true" - ]; - - preCheck = '' - # The checks cannot find libkinetic_client.so otherwise - export LD_LIBRARY_PATH="$(pwd)" - ''; - - installPhase = '' - # There is no included install script so do our best - mkdir -p $out/lib - cp libkinetic_client.so $out/lib - cp -r ../include $out - cp ../src/main/generated/kinetic_client.pb.h $out/include - ''; - - doCheck = true; - - meta = with stdenv.lib; { - homepage = https://github.com/Seagate/kinetic-cpp-client; - description = "Code for producing C and C++ kinetic clients"; - license = licenses.lgpl21; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/kissfft/default.nix b/pkgs/development/libraries/kissfft/default.nix new file mode 100644 index 0000000000000..614a523700543 --- /dev/null +++ b/pkgs/development/libraries/kissfft/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +}: + +stdenv.mkDerivation rec { + pname = "kissfft"; + version = "131"; + + src = fetchFromGitHub { + owner = "mborgerding"; + repo = pname; + rev = "v${version}"; + sha256 = "4lmRyBzW4H5wXb0EpgAp/hbaE2SslB6rAJyyLLbCtSs="; + }; + + patches = [ + # Allow installation into our prefix + # Fix installation on Darwin + # Create necessary directories + # Make datatype configurable + (fetchpatch { + url = "https://github.com/mborgerding/kissfft/pull/38.patch"; + sha256 = "Rsrob1M+lxwEag6SV5FqaTeyiJaOpspZxVtkeihX4TI="; + }) + # Install headers as well + (fetchpatch { + url = "https://github.com/mborgerding/kissfft/commit/71df949992d2dbbe15ce707cf56c3fa1e43b1080.patch"; + sha256 = "9ap6ZWyioBiut9UQM3v6W1Uv+iP3Kmt27xWhIfWfBI4="; + }) + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "DATATYPE=double" + ]; + + meta = with stdenv.lib; { + description = "A mixed-radix Fast Fourier Transform based up on the KISS principle"; + homepage = "https://github.com/mborgerding/kissfft"; + license = licenses.bsd3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index ac998f3051759..740248a7ae8f0 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "C++11 library, utilities and python bindings for Linux kernel mode setting"; - homepage = https://github.com/tomba/kmsxx; + homepage = "https://github.com/tomba/kmsxx"; license = licenses.mpl20; maintainers = with maintainers; [ gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix index 897f33953afb8..9c360ce0531db 100644 --- a/pkgs/development/libraries/kyotocabinet/default.nix +++ b/pkgs/development/libraries/kyotocabinet/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; meta = with stdenv.lib; { - homepage = http://fallabs.com/kyotocabinet; + homepage = "http://fallabs.com/kyotocabinet"; description = "A library of routines for managing a database"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/development/libraries/l-smash/default.nix b/pkgs/development/libraries/l-smash/default.nix index 374d9c398eff2..34dab6bb3ff4e 100644 --- a/pkgs/development/libraries/l-smash/default.nix +++ b/pkgs/development/libraries/l-smash/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; meta = with stdenv.lib; { - homepage = http://l-smash.github.io/l-smash/; + homepage = "http://l-smash.github.io/l-smash/"; description = "MP4 container utilities"; license = licenses.isc; maintainers = with maintainers; [ tadeokondrak ]; diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index 933d51b9575ca..da3784100ab6d 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = { description = "A high quality MPEG Audio Layer III (MP3) encoder"; - homepage = http://lame.sourceforge.net; + homepage = "http://lame.sourceforge.net"; license = licenses.lgpl2; maintainers = with maintainers; [ codyopel fpletz ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix index dcff8c2757e1f..4829d67de45a5 100644 --- a/pkgs/development/libraries/languagemachines/frog.nix +++ b/pkgs/development/libraries/languagemachines/frog.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch"; - homepage = https://languagemachines.github.io/frog; + homepage = "https://languagemachines.github.io/frog"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ roberth ]; diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix index 2c418c1bc5f57..196a697d8f6f4 100644 --- a/pkgs/development/libraries/languagemachines/frogdata.nix +++ b/pkgs/development/libraries/languagemachines/frogdata.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Data for Frog, a Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch"; - homepage = https://languagemachines.github.io/frog; + homepage = "https://languagemachines.github.io/frog"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ roberth ]; diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix index a00c3be4193ea..852615cbf3b2c 100644 --- a/pkgs/development/libraries/languagemachines/libfolia.nix +++ b/pkgs/development/libraries/languagemachines/libfolia.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A C++ API for FoLiA documents; an XML-based linguistic annotation format."; - homepage = https://proycon.github.io/folia/; + homepage = "https://proycon.github.io/folia/"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ roberth ]; diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix index b99cb4f595a4e..9477abeef3fc2 100644 --- a/pkgs/development/libraries/languagemachines/mbt.nix +++ b/pkgs/development/libraries/languagemachines/mbt.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Memory Based Tagger"; - homepage = https://languagemachines.github.io/mbt/; + homepage = "https://languagemachines.github.io/mbt/"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ roberth ]; diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/development/libraries/languagemachines/ticcutils.nix index 779ec664996a6..8676e08e41749 100644 --- a/pkgs/development/libraries/languagemachines/ticcutils.nix +++ b/pkgs/development/libraries/languagemachines/ticcutils.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "This module contains useful functions for general use in the TiCC software stack and beyond."; - homepage = https://github.com/LanguageMachines/ticcutils; + homepage = "https://github.com/LanguageMachines/ticcutils"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ roberth ]; diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix index c6c216f5abf31..b912ed97bd5a0 100644 --- a/pkgs/development/libraries/languagemachines/timbl.nix +++ b/pkgs/development/libraries/languagemachines/timbl.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "TiMBL implements several memory-based learning algorithms"; - homepage = https://github.com/LanguageMachines/timbl/; + homepage = "https://github.com/LanguageMachines/timbl/"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ roberth ]; diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix index aeadb07595305..e0634103a7eec 100644 --- a/pkgs/development/libraries/languagemachines/timblserver.nix +++ b/pkgs/development/libraries/languagemachines/timblserver.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "This server for TiMBL implements several memory-based learning algorithms"; - homepage = https://github.com/LanguageMachines/timblserver/; + homepage = "https://github.com/LanguageMachines/timblserver/"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ roberth ]; diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix index ab047d0516eb7..d60ff5fa24600 100644 --- a/pkgs/development/libraries/languagemachines/ucto.nix +++ b/pkgs/development/libraries/languagemachines/ucto.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A rule-based tokenizer for natural language"; - homepage = https://languagemachines.github.io/ucto/; + homepage = "https://languagemachines.github.io/ucto/"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ roberth ]; diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix index 01a78b5b4be64..29eaf78b75a85 100644 --- a/pkgs/development/libraries/languagemachines/uctodata.nix +++ b/pkgs/development/libraries/languagemachines/uctodata.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A rule-based tokenizer for natural language"; - homepage = https://languagemachines.github.io/ucto/; + homepage = "https://languagemachines.github.io/ucto/"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ roberth ]; diff --git a/pkgs/development/libraries/lasem/default.nix b/pkgs/development/libraries/lasem/default.nix index 5e00ce1037f2e..b3742514ced6e 100644 --- a/pkgs/development/libraries/lasem/default.nix +++ b/pkgs/development/libraries/lasem/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "SVG and MathML rendering library"; - homepage = https://wiki.gnome.org/Projects/Lasem; + homepage = "https://wiki.gnome.org/Projects/Lasem"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index f401f231de2ec..c79b4a51262af 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "lasso"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { url = "https://dev.entrouvert.org/lasso/lasso-${version}.tar.gz"; - sha256 = "1kqagm63a4mv5sw5qc3y0qlky7r9qg5lccq0c3cnfr0n4mxgysql"; + sha256 = "1pniisy4z9cshf6lvlz28kfa3qnwnhldb2rvkjxzc0l84g7dpa7q"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://lasso.entrouvert.org/; + homepage = "https://lasso.entrouvert.org/"; description = "Liberty Alliance Single Sign-On library"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix index 63c81822ddf87..01ec659a95b65 100644 --- a/pkgs/development/libraries/lcms/default.nix +++ b/pkgs/development/libraries/lcms/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "lcms-1.19"; src = fetchurl { - url = http://www.littlecms.com/lcms-1.19.tar.gz; + url = "http://www.littlecms.com/lcms-1.19.tar.gz"; sha256 = "1abkf8iphwyfs3z305z3qczm3z1i9idc1lz4gvfg92jnkz5k5bl0"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Color management engine"; - homepage = http://www.littlecms.com/; + homepage = "http://www.littlecms.com/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 5d307dcfa7ad5..2de11a3bd406f 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Color management engine"; - homepage = http://www.littlecms.com/; + homepage = "http://www.littlecms.com/"; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/ldacbt/default.nix b/pkgs/development/libraries/ldacbt/default.nix index ae8fc1e22dbcd..36a0c8e1316b0 100644 --- a/pkgs/development/libraries/ldacbt/default.nix +++ b/pkgs/development/libraries/ldacbt/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "AOSP libldac dispatcher"; - homepage = https://github.com/EHfive/ldacBT; + homepage = "https://github.com/EHfive/ldacBT"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ adisbladis ]; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 7ee869b53c352..33a9974211f6c 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "ldb"; - version = "2.1.1"; + version = "2.1.3"; src = fetchurl { url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; - sha256 = "jO+y8l/KkT+hinktDvsDrwf4f1uVGkze0DD1uY8lx7A="; + sha256 = "0xkps414ndb87abla7dlv44ndnfg5r5vwgmkm3ngcq9knbv1x6w7"; }; outputs = [ "out" "dev" ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "--without-ldb-lmdb" ]; - stripDebugList = "bin lib modules"; + stripDebugList = [ "bin" "lib" "modules" ]; meta = with stdenv.lib; { description = "A LDAP-like embedded database"; diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 74ac59fef2835..f64d263901bd4 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library with the aim of simplifying DNS programming in C"; license = licenses.bsd3; - homepage = http://www.nlnetlabs.nl/projects/ldns/; + homepage = "http://www.nlnetlabs.nl/projects/ldns/"; platforms = platforms.unix; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 1fab7ee28a8a1..8a34f05f6cf0e 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { - sha256 = "1kp35gnph9myqxdxzyj1871ay19nfajxglzwai1gvsnh5840xnxy"; + sha256 = "00qigglp67a14ki4dhjxd3j540a80rkmzhysx7hra8v2rgbsqgj8"; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 6137638222eff..830facc567208 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ enzime ]; license = stdenv.lib.licenses.lgpl3; description = "An opensource database of photographic lenses and their characteristics"; - homepage = http://lensfun.sourceforge.net/; + homepage = "http://lensfun.sourceforge.net/"; }; } diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index 6d73b00a6d17b..456a14f72b1d3 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Image processing and analysis library"; - homepage = http://www.leptonica.org/; + homepage = "http://www.leptonica.org/"; license = stdenv.lib.licenses.bsd2; # http://www.leptonica.org/about-the-license.html platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix index b678a0893867c..6e68a9128d0d9 100644 --- a/pkgs/development/libraries/lesstif/default.nix +++ b/pkgs/development/libraries/lesstif/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source clone of the Motif widget set"; - homepage = http://lesstif.sourceforge.net; + homepage = "http://lesstif.sourceforge.net"; platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; }; diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 62abc1bd68cad..b64b426a6403c 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "; meta = with stdenv.lib; { - homepage = https://github.com/google/leveldb; + homepage = "https://github.com/google/leveldb"; description = "Fast and lightweight key/value database library by Google"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix index 9a933b176d342..e8ef17081c9fa 100644 --- a/pkgs/development/libraries/levmar/default.nix +++ b/pkgs/development/libraries/levmar/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++"; - homepage = https://www.ics.forth.gr/~lourakis/levmar/; + homepage = "https://www.ics.forth.gr/~lourakis/levmar/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/lib3ds/default.nix b/pkgs/development/libraries/lib3ds/default.nix index 32fecd3d99c16..406b61e439384 100644 --- a/pkgs/development/libraries/lib3ds/default.nix +++ b/pkgs/development/libraries/lib3ds/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files"; - homepage = http://lib3ds.sourceforge.net/; + homepage = "http://lib3ds.sourceforge.net/"; license = "LGPL"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix index 39f493d821c3c..59afede9cae7d 100644 --- a/pkgs/development/libraries/libHX/default.nix +++ b/pkgs/development/libraries/libHX/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://libhx.sourceforge.net/; + homepage = "http://libhx.sourceforge.net/"; longDescription = '' libHX is a C library (with some C++ bindings available) that provides data structures and functions commonly needed, such as maps, deques, linked lists, string formatting diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 15ef9ee890a6e..818e2ad85b003 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset"; - homepage = https://liblas.org; + homepage = "https://liblas.org"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.michelk ]; diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/development/libraries/libaal/default.nix index 87eeac4b4f5fa..fdfd855470d9e 100644 --- a/pkgs/development/libraries/libaal/default.nix +++ b/pkgs/development/libraries/libaal/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.namesys.com/; + homepage = "http://www.namesys.com/"; description = "Support library for Reiser4"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix index a37d4756cbd8a..91107ad4cb06b 100644 --- a/pkgs/development/libraries/libabw/default.nix +++ b/pkgs/development/libraries/libabw/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost doxygen gperf librevenge libxml2 perl ]; meta = with stdenv.lib; { - homepage = https://wiki.documentfoundation.org/DLP/Libraries/libabw; + homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libabw"; description = "Library parsing abiword documents"; platforms = platforms.unix; license = licenses.mpl20; diff --git a/pkgs/development/libraries/libaec/default.nix b/pkgs/development/libraries/libaec/default.nix new file mode 100644 index 0000000000000..bf6fd029de166 --- /dev/null +++ b/pkgs/development/libraries/libaec/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitLab +, cmake +}: + +stdenv.mkDerivation rec { + pname = "libaec"; + version = "1.0.4"; + + src = fetchFromGitLab { + domain = "gitlab.dkrz.de"; + owner = "k202009"; + repo = "libaec"; + rev = "v${version}"; + sha256 = "1rpma89i35ahbalaqz82y201syxni7jkf9892jlyyrhhrvlnm4l2"; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with stdenv.lib; { + homepage = "https://gitlab.dkrz.de/k202009/libaec"; + description = "Adaptive Entropy Coding library"; + license = licenses.bsd2; + maintainers = with maintainers; [ tbenst ]; + }; +} diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index c0a43efc27eac..616879a979cb1 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Cross-platform GUI toolkit"; - homepage = http://libagar.org/index.html; + homepage = "http://libagar.org/index.html"; license = with licenses; bsd3; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; linux; diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix index 4295971d5a0b1..4de113718d4aa 100644 --- a/pkgs/development/libraries/libagar/libagar_test.nix +++ b/pkgs/development/libraries/libagar/libagar_test.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tests for libagar"; - homepage = http://libagar.org/index.html; + homepage = "http://libagar.org/index.html"; license = with licenses; bsd3; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; linux; diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index bdf081222b6dc..885338793f1e5 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.1.6"; + version = "4.1.7"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "0cw1apj4qxfxpp0gz4my4656d5ijjj6s2y4rjahhj67h10qj4bd2"; + sha256 = "16xgl0yqzqkqfrz7x9rbbv8rj5rg5jlz4a7apj9igqb58q0w362x"; }; buildInputs = [ openssl ]; diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix index 28f0ca2905c2d..4c3d1d2a21329 100644 --- a/pkgs/development/libraries/libantlr3c/default.nix +++ b/pkgs/development/libraries/libantlr3c/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libantlr3c-3.4"; src = fetchurl { - url = https://www.antlr3.org/download/C/libantlr3c-3.4.tar.gz; + url = "https://www.antlr3.org/download/C/libantlr3c-3.4.tar.gz"; sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"; }; @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "C runtime libraries of ANTLR v3"; - homepage = https://www.antlr3.org/; + homepage = "https://www.antlr3.org/"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 2d7edee4041c7..3ecee2599f615 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { programs to output audio using a simple API on a wide variety of platforms. ''; - homepage = https://xiph.org/ao/; + homepage = "https://xiph.org/ao/"; license = licenses.gpl2; maintainers = with maintainers; [ ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 2d9a9f18fa279..04b1c810c0857 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "AV1 Bitstream and Decoding Library"; - homepage = https://aomedia.org/av1-features/get-started/; + homepage = "https://aomedia.org/av1-features/get-started/"; maintainers = with maintainers; [ kiloreux ]; platforms = platforms.all; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/development/libraries/libaosd/default.nix index 6cf395d7e74e3..c33f3a873a683 100644 --- a/pkgs/development/libraries/libaosd/default.nix +++ b/pkgs/development/libraries/libaosd/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { composited rendering via XComposite, as well as support for rendering Cairo and Pango layouts. ''; - homepage = https://github.com/atheme-legacy/libaosd; + homepage = "https://github.com/atheme-legacy/libaosd"; license = licenses.mit; maintainers = with maintainers; [ unode ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index d09684a044386..dc0542c21267c 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = { description = "A library to allow applications to export a menu into the Unity Menu bar"; - homepage = https://launchpad.net/libappindicator; + homepage = "https://launchpad.net/libappindicator"; license = with licenses; [ lgpl21 lgpl3 ]; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 779ddfeb589ac..0f6b196d15074 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { compressions formats including (but not limited to) tar, shar, cpio, zip, and compressed with gzip, bzip2, lzma, xz, ... ''; - homepage = http://libarchive.org; + homepage = "http://libarchive.org"; license = stdenv.lib.licenses.bsd3; platforms = with stdenv.lib.platforms; all; maintainers = with stdenv.lib.maintainers; [ jcumming ]; diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/development/libraries/libasr/default.nix index 40158898f3d34..561e7e1017dab 100644 --- a/pkgs/development/libraries/libasr/default.nix +++ b/pkgs/development/libraries/libasr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libevent openssl ]; meta = with stdenv.lib; { - homepage = https://github.com/OpenSMTPD/libasr; + homepage = "https://github.com/OpenSMTPD/libasr"; description = "Free, simple and portable asynchronous resolver library"; license = licenses.isc; maintainers = [ maintainers.koral ]; diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 41406ce18eae9..508a57b203d23 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -44,10 +44,10 @@ stdenv.mkDerivation rec { meta = { description = "Portable ASS/SSA subtitle renderer"; - homepage = https://github.com/libass/libass; + homepage = "https://github.com/libass/libass"; license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; - repositories.git = git://github.com/libass/libass.git; + repositories.git = "git://github.com/libass/libass.git"; }; } diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index d55c38168686a..e92db2ab87eed 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { GnuPG components. Both, server and client side functions are provided. ''; - homepage = http://gnupg.org; + homepage = "http://gnupg.org"; license = licenses.lgpl2Plus; platforms = platforms.all; maintainers = [ maintainers.erictapen ]; diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix index 348cfa9ed5b46..dfe2dd76ef7dd 100644 --- a/pkgs/development/libraries/libast/default.nix +++ b/pkgs/development/libraries/libast/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library of Assorted Spiffy Things"; - homepage = https://www.eterm.org; + homepage = "https://www.eterm.org"; license = licenses.bsd2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/development/libraries/libasyncns/default.nix index f7805c9f375f5..9a91551c3a43a 100644 --- a/pkgs/development/libraries/libasyncns/default.nix +++ b/pkgs/development/libraries/libasyncns/default.nix @@ -8,8 +8,13 @@ stdenv.mkDerivation rec { sha256 = "0x5b6lcic4cd7q0bx00x93kvpyzl7n2abbgvqbrlzrfb8vknc6jg"; }; + configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; + meta = with stdenv.lib; { - homepage = http://0pointer.de/lennart/projects/libasyncns/; + homepage = "http://0pointer.de/lennart/projects/libasyncns/"; description = "A C library for Linux/Unix for executing name service queries asynchronously"; license = licenses.lgpl21; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix index eebe667badb99..ad33c624b141f 100644 --- a/pkgs/development/libraries/libaudclient/default.nix +++ b/pkgs/development/libraries/libaudclient/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Legacy D-Bus client library for Audacious"; - homepage = https://audacious-media-player.org/; + homepage = "https://audacious-media-player.org/"; license = licenses.bsd2; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 43cfe2ef251c1..15b6a275214d7 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -121,7 +121,7 @@ let passthru = { inherit vdpauSupport; }; meta = with stdenv.lib; { - homepage = https://libav.org/; + homepage = "https://libav.org/"; description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)"; license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not? else if enableGPL then gpl2Plus else lgpl21Plus; diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix index 726e9573d374e..01f39052e930b 100644 --- a/pkgs/development/libraries/libavc1394/default.nix +++ b/pkgs/development/libraries/libavc1394/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set"; - homepage = https://sourceforge.net/projects/libavc1394/; + homepage = "https://sourceforge.net/projects/libavc1394/"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix index d39c12d58d553..dad5d40ea530c 100644 --- a/pkgs/development/libraries/libb2/default.nix +++ b/pkgs/development/libraries/libb2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The BLAKE2 family of cryptographic hash functions"; - homepage = https://blake2.net/; + homepage = "https://blake2.net/"; platforms = platforms.all; maintainers = with maintainers; [ dfoxfranke dotlambda ]; license = licenses.cc0; diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index 9aedde923f0be..09cbafa17bff6 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/binaryanalysisplatform/bap-bindings; + homepage = "https://github.com/binaryanalysisplatform/bap-bindings"; description = "A C library for interacting with BAP"; maintainers = [ maintainers.maurer ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix index 3af98a578f202..c9b7bfa3c0e6e 100644 --- a/pkgs/development/libraries/libbdplus/default.nix +++ b/pkgs/development/libraries/libbdplus/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ]; meta = with stdenv.lib; { - homepage = http://www.videolan.org/developers/libbdplus.html; + homepage = "http://www.videolan.org/developers/libbdplus.html"; description = "Library to access BD+ protected Blu-Ray disks"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index 15561677ad5ab..75db780b7bb69 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { It is associated with GNU Binutils, and elsewhere often distributed with it. ''; - homepage = https://www.gnu.org/software/binutils/; + homepage = "https://www.gnu.org/software/binutils/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ericson2314 ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 043f3500b0c38..b2853011b140b 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation { hardeningDisable = [ "fortify" ]; meta = with lib; { - homepage = https://nuand.com/libbladeRF-doc; + homepage = "https://nuand.com/libbladeRF-doc"; description = "Supporting library of the BladeRF SDR opensource hardware"; license = licenses.lgpl21; maintainers = with maintainers; [ funfunctor ]; diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index e251295a4c79a..7aea38bdb58da 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Common functions found on BSD systems"; - homepage = https://libbsd.freedesktop.org/; + homepage = "https://libbsd.freedesktop.org/"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix index 5bd6b11ac7afa..1d2043b20cd4c 100644 --- a/pkgs/development/libraries/libbson/default.nix +++ b/pkgs/development/libraries/libbson/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C Library for parsing, editing, and creating BSON documents"; - homepage = https://github.com/mongodb/libbson; + homepage = "https://github.com/mongodb/libbson"; license = licenses.asl20; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index b6cadf9df189f..f436f947d0a95 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://libburnia-project.org/; + homepage = "http://libburnia-project.org/"; description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar vrthra ]; diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index 7773fe46c0cea..84df50e117a5f 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://libcaca.zoy.org/; + homepage = "http://libcaca.zoy.org/"; description = "A graphics library that outputs text instead of pixels"; license = stdenv.lib.licenses.wtfpl; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix index 2e134c5bb6391..474e51e8c4655 100644 --- a/pkgs/development/libraries/libcacard/default.nix +++ b/pkgs/development/libraries/libcacard/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Smart card emulation library"; - homepage = https://gitlab.freedesktop.org/spice/libcacard; + homepage = "https://gitlab.freedesktop.org/spice/libcacard"; license = licenses.lgpl21; maintainers = with maintainers; [ yegortimoshenko ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 6d76c94111473..9dea5956d652a 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch"; - url = http://git.0pointer.net/libcanberra.git/patch/?id=c0620e432650e81062c1967cc669829dbd29b310; + url = "http://git.0pointer.net/libcanberra.git/patch/?id=c0620e432650e81062c1967cc669829dbd29b310"; sha256 = "0rc7zwn39yxzxp37qh329g7375r5ywcqcaak8ryd0dgvg8m5hcx9"; }) ]; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { portable. ''; - homepage = http://0pointer.de/lennart/projects/libcanberra/; + homepage = "http://0pointer.de/lennart/projects/libcanberra/"; license = stdenv.lib.licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index 42a49713a0b44..b71b630675dee 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { longDescription = '' libcangjie is a library implementing the Cangjie input method. ''; - homepage = http://cangjians.github.io/projects/libcangjie/; + homepage = "http://cangjians.github.io/projects/libcangjie/"; license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.linquize ]; diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index 4949d657669b2..9b6a54d92f97b 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -16,11 +16,13 @@ stdenv.mkDerivation rec { doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; + NIX_CFLAGS_COMPILE = "-fno-lto"; meta = with stdenv.lib; { description = "CBOR protocol implementation for C and others"; - homepage = https://github.com/PJK/libcbor; + homepage = "https://github.com/PJK/libcbor"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/development/libraries/libcdaudio/default.nix index df7e93de063c8..abc5f84a0e32e 100644 --- a/pkgs/development/libraries/libcdaudio/default.nix +++ b/pkgs/development/libraries/libcdaudio/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libcdaudio-0.99.12p2"; src = fetchurl { - url = mirror://sourceforge/libcdaudio/libcdaudio-0.99.12p2.tar.gz ; + url = "mirror://sourceforge/libcdaudio/libcdaudio-0.99.12p2.tar.gz"; sha256 = "1fsy6dlzxrx177qc877qhajm9l4g28mvh06h2l15rxy4bapzknjz" ; }; diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index 591369df83f1c..2b837ff1ce1ac 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -10,11 +10,16 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; + doCheck = false; # fails 3 of 5 tests with locale errors meta = with stdenv.lib; { description = "C library to access data on a CDDB server (freedb.org)"; - homepage = http://libcddb.sourceforge.net/; + homepage = "http://libcddb.sourceforge.net/"; license = licenses.lgpl2Plus; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix index a539586f067f9..8ad3231dc36b1 100644 --- a/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { access. By doing this, cdparanoia runs on platforms other than GNU/Linux. ''; license = licenses.gpl3; - homepage = https://github.com/rocky/libcdio-paranoia; + homepage = "https://github.com/rocky/libcdio-paranoia"; platforms = platforms.linux ++ platforms.darwin; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 9c3132a3e6375..b0b7b55a19db7 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { patchShebangs . ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libcddb ncurses help2man ] + nativeBuildInputs = [ pkgconfig help2man ]; + buildInputs = [ libcddb ncurses ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ]; doCheck = !stdenv.isDarwin; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ISO-9660 filesystems (libiso9660), as well as utility programs such as an audio CD player and an extractor. ''; - homepage = https://www.gnu.org/software/libcdio/; + homepage = "https://www.gnu.org/software/libcdio/"; license = licenses.gpl2Plus; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index cfd768b5272d3..72996e28996c1 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "A library providing ability to interpret and import Corel Draw drawings into various applications"; - homepage = http://www.freedesktop.org/wiki/Software/libcdr; + homepage = "http://www.freedesktop.org/wiki/Software/libcdr"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.mpl20; }; diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 070cb58149c4d..a1c2967dde738 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform, libraspberrypi ? null }: -let version = "4.0.4"; in +let version = "4.0.5"; in stdenv.mkDerivation { pname = "libcec"; @@ -8,11 +8,11 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; - sha256 = "02j09y06csaic4m0fyb4dr9l3hl15nxbbniwq0i1qlccpxjak0j3"; + sha256 = "0hvp33mq0kg544hw20aq3vy5lxf5zid6gxm3qdga7wxw1r1lkmz4"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake udev libcec_platform ] ++ + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ udev libcec_platform ] ++ stdenv.lib.optional (libraspberrypi != null) libraspberrypi; cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Allows you (with the right hardware) to control your device with your TV remote control using existing HDMI cabling"; - homepage = http://libcec.pulse-eight.com; + homepage = "http://libcec.pulse-eight.com"; repositories.git = "https://github.com/Pulse-Eight/libcec.git"; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix index e43cfb10a3780..2132cf7a065e6 100644 --- a/pkgs/development/libraries/libcec/platform.nix +++ b/pkgs/development/libraries/libcec/platform.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Platform library for libcec and Kodi addons"; - homepage = https://github.com/Pulse-Eight/platform; + homepage = "https://github.com/Pulse-Eight/platform"; repositories.git = "https://github.com/Pulse-Eight/platform.git"; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 03cc3b2beb451..4d08c2ba1fb3d 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple framework for embedding Chromium-based browsers in other applications"; - homepage = http://opensource.spotify.com/cefbuilds/index.html; + homepage = "http://opensource.spotify.com/cefbuilds/index.html"; maintainers = with maintainers; [ puffnfresh ]; license = licenses.bsd3; platforms = with platforms; linux; diff --git a/pkgs/development/libraries/libcello/default.nix b/pkgs/development/libraries/libcello/default.nix index 96c3db6ae43bf..908c9cb15dd27 100644 --- a/pkgs/development/libraries/libcello/default.nix +++ b/pkgs/development/libraries/libcello/default.nix @@ -1,17 +1,21 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libcello-0.9.2"; + pname = "libcello"; + version = "2.1.0"; src = fetchurl { - url = "http://libcello.org/static/${name}.tar.gz"; - sha256 = "cd82639cb9b133119fd89a77a5a505a55ea5fcc8decfc53bee0725358ec8bad0"; + url = "http://libcello.org/static/libCello-${version}.tar.gz"; + sha256 = "0a1b2x5ni07vd9ridnl7zv7h2s32070wsphjy94qr066b99gdb29"; }; + makeFlags = [ "PREFIX=$(out)" ]; + meta = { - homepage = http://libcello.org/; + homepage = "http://libcello.org/"; description = "Higher level programming in C"; license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.MostAwesomeDude ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libcerf/default.nix b/pkgs/development/libraries/libcerf/default.nix index 0ffb208596770..05f9cc82c73d3 100644 --- a/pkgs/development/libraries/libcerf/default.nix +++ b/pkgs/development/libraries/libcerf/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Complex error (erf), Dawson, Faddeeva, and Voigt function library"; - homepage = https://jugit.fz-juelich.de/mlz/libcerf; + homepage = "https://jugit.fz-juelich.de/mlz/libcerf"; license = licenses.mit; maintainers = with maintainers; [ orivej ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 48446d87b8d8b..6a74941a3a0f7 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/libchamplain; + homepage = "https://wiki.gnome.org/Projects/libchamplain"; license = licenses.lgpl2Plus; description = "C library providing a ClutterActor to display maps"; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { OpenCycleMap, OpenAerialMap, and Maps for free. ''; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix index 11617a0107cf3..168217678c0a8 100644 --- a/pkgs/development/libraries/libchardet/default.nix +++ b/pkgs/development/libraries/libchardet/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mozilla's Universal Charset Detector C/C++ API"; - homepage = ftp://ftp.oops.org/pub/oops/libchardet/index.html; + homepage = "ftp://ftp.oops.org/pub/oops/libchardet/index.html"; license = licenses.mpl11; maintainers = [ maintainers.abbradar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/development/libraries/libchewing/default.nix index 3c234d780eff0..09d5d40f8779c 100644 --- a/pkgs/development/libraries/libchewing/default.nix +++ b/pkgs/development/libraries/libchewing/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { description = "Intelligent Chinese phonetic input method"; - homepage = http://chewing.im/; + homepage = "http://chewing.im/"; license = licenses.lgpl21; maintainers = [ maintainers.ericsagnes ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index c802bd68ab08e..190f122ecfa7b 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { line. It is written in C and has Guile (Scheme) bindings. ''; - homepage = https://www.nongnu.org/libchop/; + homepage = "https://www.nongnu.org/libchop/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; platforms = platforms.gnu ++ platforms.linux; diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index e56583e45ba9b..4a83175f66bf0 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -2,24 +2,24 @@ , lib , fetchFromGitHub , cmake -, openblas +, blas # Check Inputs , python2 }: stdenv.mkDerivation rec { pname = "libcint"; - version = "3.0.19"; + version = "3.0.20"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - sha256 = "0x613f2hiqi2vbhp20fcl7rhxb07f2714lplzd0vkvv07phagip9"; + sha256 = "0iqqq568q9sxppr08rvmpyjq0n82pm04x9rxhh3mf20x1ds7ngj5"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ openblas ]; + buildInputs = [ blas ]; cmakeFlags = [ "-DENABLE_TEST=1" "-DQUICK_TEST=1" diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index 9ddf1d4f1576b..0672e7942cbb3 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://libclc.llvm.org/; + homepage = "http://libclc.llvm.org/"; description = "Implementation of the library requirements of the OpenCL C programming language"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix index d896cf637330a..6cabe1343c486 100644 --- a/pkgs/development/libraries/libcli/default.nix +++ b/pkgs/development/libraries/libcli/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Emulate a Cisco-style telnet command-line interface"; - homepage = http://sites.dparrish.com/libcli; + homepage = "http://sites.dparrish.com/libcli"; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/development/libraries/libcloudproviders/default.nix index 2814d6c5c1ead..f48ee9e5df068 100644 --- a/pkgs/development/libraries/libcloudproviders/default.nix +++ b/pkgs/development/libraries/libcloudproviders/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "DBus API that allows cloud storage sync clients to expose their services"; - homepage = https://gitlab.gnome.org/World/libcloudproviders; + homepage = "https://gitlab.gnome.org/World/libcloudproviders"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix index 325afc56ae790..53cff9a19d3d4 100644 --- a/pkgs/development/libraries/libclthreads/default.nix +++ b/pkgs/development/libraries/libclthreads/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Zita thread library"; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; license = licenses.lgpl21; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index d6e2ad398d778..b086dfc08f685 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Zita X11 library"; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; license = licenses.lgpl21; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix index 53474190ce967..8b1093ac21fc9 100644 --- a/pkgs/development/libraries/libcmis/default.nix +++ b/pkgs/development/libraries/libcmis/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ client library for the CMIS interface"; - homepage = https://sourceforge.net/projects/libcmis/; + homepage = "https://sourceforge.net/projects/libcmis/"; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix index 0f1cbeb2f96f3..f945434842eeb 100644 --- a/pkgs/development/libraries/libcollectdclient/default.nix +++ b/pkgs/development/libraries/libcollectdclient/default.nix @@ -14,7 +14,7 @@ collectd.overrideAttrs (oldAttrs: { meta = with stdenv.lib; { description = "C Library for collectd, a daemon which collects system performance statistics periodically"; - homepage = http://collectd.org; + homepage = "http://collectd.org"; license = licenses.gpl2; platforms = platforms.linux; # TODO: collectd may be linux but the C client may be more portable? maintainers = [ maintainers.sheenobu maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index 8eb7ff303de79..3f91c8e579f5e 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A cross-platform IRC framework written with Qt"; - homepage = https://communi.github.io; + homepage = "https://communi.github.io"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ hrdinka ]; diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index cdc225c8bf73f..7d7f95d757cee 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://www.hyperrealm.com/libconfig; + homepage = "http://www.hyperrealm.com/libconfig"; description = "A simple library for processing structured configuration files"; license = licenses.lgpl3; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 53ec231dec961..92b000bc4efe7 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C client library for Couchbase"; - homepage = https://github.com/couchbase/libcouchbase; + homepage = "https://github.com/couchbase/libcouchbase"; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix index ba9a6325b07d0..d91032126eb4f 100644 --- a/pkgs/development/libraries/libcrafter/default.nix +++ b/pkgs/development/libraries/libcrafter/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libpcap ]; meta = { - homepage = https://github.com/pellegre/libcrafter; + homepage = "https://github.com/pellegre/libcrafter"; description = "High level C++ network packet sniffing and crafting library"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.lethalman ]; diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/development/libraries/libcredis/default.nix index bfc7fe1d9498a..1368cd30adbb6 100644 --- a/pkgs/development/libraries/libcredis/default.nix +++ b/pkgs/development/libraries/libcredis/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "C client library for Redis (key-value database)"; - homepage = https://code.google.com/archive/p/credis/; + homepage = "https://code.google.com/archive/p/credis/"; license = licenses.bsd3; # from homepage platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libcrossguid/default.nix b/pkgs/development/libraries/libcrossguid/default.nix index e5c09675c4b04..8e2be72987cfd 100644 --- a/pkgs/development/libraries/libcrossguid/default.nix +++ b/pkgs/development/libraries/libcrossguid/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ]; buildPhase = '' - g++ -c guid.cpp -o guid.o $CXXFLAGS -std=c++11 -DGUID_LIBUUID - ar rvs libcrossguid.a guid.o + $CXX -c guid.cpp -o guid.o $CXXFLAGS -std=c++11 -DGUID_LIBUUID + $AR rvs libcrossguid.a guid.o ''; installPhase = '' mkdir -p $out/{lib,include} @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Lightweight cross platform C++ GUID/UUID library"; license = licenses.mit; maintainers = with maintainers; [ edwtjo ]; - homepage = https://github.com/graeme-hill/crossguid; + homepage = "https://github.com/graeme-hill/crossguid"; platforms = with platforms; linux; }; diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix index fef8e7f510df3..e3db41c73e1ac 100644 --- a/pkgs/development/libraries/libcryptui/default.nix +++ b/pkgs/development/libraries/libcryptui/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Interface components for OpenPGP"; - homepage = https://gitlab.gnome.org/GNOME/libcryptui; + homepage = "https://gitlab.gnome.org/GNOME/libcryptui"; license = licenses.lgpl21Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libcsptr/default.nix b/pkgs/development/libraries/libcsptr/default.nix index 4bf26bde228dd..fcb5aa2bbfee9 100644 --- a/pkgs/development/libraries/libcsptr/default.nix +++ b/pkgs/development/libraries/libcsptr/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Smart pointer constructs for the (GNU) C programming language"; - homepage = https://github.com/Snaipe/libcsptr; + homepage = "https://github.com/Snaipe/libcsptr"; license = licenses.mit; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ maintainers.fragamus ]; diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix index f4e2e621c2864..35707834c086b 100644 --- a/pkgs/development/libraries/libctemplate/default.nix +++ b/pkgs/development/libraries/libctemplate/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { emphasizes separating logic from presentation: it is impossible to embed application logic in this template language. ''; - homepage = https://github.com/OlafvdSpek/ctemplate; + homepage = "https://github.com/OlafvdSpek/ctemplate"; license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index 8ebab123524b3..73a110c07f69b 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { a file pointer. For handling of the parsed data a convenient API is available. ''; - homepage = https://sourceforge.net/projects/libcue/; + homepage = "https://sourceforge.net/projects/libcue/"; license = licenses.gpl2; maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index 5dc153dd5ccc2..d906e119dca66 100644 --- a/pkgs/development/libraries/libdaemon/default.nix +++ b/pkgs/development/libraries/libdaemon/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight C library that eases the writing of UNIX daemons"; - homepage = http://0pointer.de/lennart/projects/libdaemon/; + homepage = "http://0pointer.de/lennart/projects/libdaemon/"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index 4763e5983f952..27084e54a8277 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C++ SDK which contains an implementation of DAP"; - homepage = https://www.opendap.org/software/libdap; + homepage = "https://www.opendap.org/software/libdap"; license = licenses.lgpl2; maintainers = [ maintainers.bzizou ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 19f9a5f889aed..5351b2c9fcbd5 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -43,9 +43,9 @@ stdenv.mkDerivation rec { for those libraries. In other cases, our design isn't quite generic enough to work for everyone. ''; - homepage = https://wiki.gnome.org/Apps/Builder; + homepage = "https://wiki.gnome.org/Apps/Builder"; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 52b8a32fab4a5..d321d7d650a86 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://libdbi-drivers.sourceforge.net/; + homepage = "http://libdbi-drivers.sourceforge.net/"; description = "Database drivers for libdbi"; platforms = platforms.all; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/development/libraries/libdbi/default.nix index b242bd8613ef6..64c511503d090 100644 --- a/pkgs/development/libraries/libdbi/default.nix +++ b/pkgs/development/libraries/libdbi/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://libdbi.sourceforge.net/; + homepage = "http://libdbi.sourceforge.net/"; description = "DB independent interface to DB"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix index 279dcb6bc834b..d7eab29680927 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.9.3+16"; src = fetchgit { - url = https://git.launchpad.net/ubuntu/+source/libdbusmenu-qt; + url = "https://git.launchpad.net/ubuntu/+source/libdbusmenu-qt"; rev = "import/${version}.04.20160218-1"; sha256 = "039yvklhbmfbcynrbqq9n5ywmj8bjfslnkzcnwpzyhnxdzb6yxlx"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_DOC=OFF" ]; meta = with stdenv.lib; { - homepage = https://launchpad.net/libdbusmenu-qt; + homepage = "https://launchpad.net/libdbusmenu-qt"; description = "Provides a Qt implementation of the DBusMenu spec"; maintainers = [ maintainers.ttuegel ]; inherit (qtbase.meta) platforms; diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index 770e95472ea55..5e11864b1f174 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for passing menu structures across DBus"; - homepage = https://launchpad.net/dbusmenu; + homepage = "https://launchpad.net/dbusmenu"; license = with licenses; [ gpl3 lgpl21 lgpl3 ]; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index 0f2ba019d3fe0..8a688ef37c6d4 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin CoreServices; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/libdc1394/; + homepage = "https://sourceforge.net/projects/libdc1394/"; description = "Capture and control API for IIDC compliant cameras"; license = licenses.lgpl21Plus; maintainers = [ maintainers.viric ]; diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix index cc06815bbffc3..25fa4db38f6b0 100644 --- a/pkgs/development/libraries/libdeflate/default.nix +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "libdeflate"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "ebiggers"; repo = "libdeflate"; rev = "v${version}"; - sha256 = "1v0y7998p8a8wpblnpdyk5zzvpj8pbrpzxwxmv0b0axrhaarxrf3"; + sha256 = "1rhichmalqz7p1hiwvn6y0isralpbf0w5nyjp4lg0asawkxy9cww"; }; postPatch = '' - substituteInPlace Makefile --replace /usr $out + substituteInPlace Makefile --replace /usr/local $out ''; configurePhase = '' @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast DEFLATE/zlib/gzip compressor and decompressor"; license = licenses.mit; - homepage = https://github.com/ebiggers/libdeflate; + homepage = "https://github.com/ebiggers/libdeflate"; platforms = platforms.unix; maintainers = with maintainers; [ orivej ]; }; diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index afbff3dc0cff0..132e1d1dbf556 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patches = [ ( fetchurl { - url = http://patch-tracker.debian.org/patch/series/dl/devil/1.7.8-6.1/03_CVE-2009-3994.diff; + url = "http://patch-tracker.debian.org/patch/series/dl/devil/1.7.8-6.1/03_CVE-2009-3994.diff"; sha256 = "0qkx2qfv02igbrmsn6z5a3lbrbwjfh3rb0c2sj54wy0j1f775hbc"; } ) ./ftbfs-libpng15.patch @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://openil.sourceforge.net/; + homepage = "http://openil.sourceforge.net/"; description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats"; license = licenses.lgpl2; platforms = platforms.mesaPlatforms; diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix index 36f6f023a8e09..0acab6023312c 100644 --- a/pkgs/development/libraries/libdigidoc/default.nix +++ b/pkgs/development/libraries/libdigidoc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for creating DigiDoc signature files"; - homepage = http://www.id.ee/; + homepage = "http://www.id.ee/"; license = licenses.lgpl2; platforms = platforms.linux; maintainers = [ maintainers.jagajaga ]; diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index a2280bb4b3ec3..4052f6e45d726 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for creating DigiDoc signature files"; - homepage = http://www.id.ee/; + homepage = "http://www.id.ee/"; license = licenses.lgpl2; platforms = platforms.linux; maintainers = [ maintainers.jagajaga ]; diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index d7d88b3838659..698aac87b8928 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C library for creating MusicBrainz DiscIDs from audio CDs"; - homepage = http://musicbrainz.org/doc/libdiscid; + homepage = "http://musicbrainz.org/doc/libdiscid"; maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix index 5598e6b2fa78d..5f9417bd03c8f 100644 --- a/pkgs/development/libraries/libdivecomputer/default.nix +++ b/pkgs/development/libraries/libdivecomputer/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.libdivecomputer.org; + homepage = "http://www.libdivecomputer.org"; description = "A cross-platform and open source library for communication with dive computers from various manufacturers"; maintainers = [ maintainers.mguentner ]; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/development/libraries/libdivsufsort/default.nix index 01ac56e885d0b..0d82db7cee4e5 100644 --- a/pkgs/development/libraries/libdivsufsort/default.nix +++ b/pkgs/development/libraries/libdivsufsort/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; meta = { - homepage = https://github.com/y-256/libdivsufsort; + homepage = "https://github.com/y-256/libdivsufsort"; license = stdenv.lib.licenses.mit; description = "Library to construct the suffix array and the BW transformed string"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix index f5248dfc79e6a..0bdf3fbe15a0d 100644 --- a/pkgs/development/libraries/libdmtx/default.nix +++ b/pkgs/development/libraries/libdmtx/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "An open source software for reading and writing Data Matrix barcodes"; - homepage = http://libdmtx.org; + homepage = "http://libdmtx.org"; platforms = stdenv.lib.platforms.all; maintainers = [ ]; license = stdenv.lib.licenses.bsd2; diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix index 46e264b59cafa..176e0a22abafc 100644 --- a/pkgs/development/libraries/libdnet/default.nix +++ b/pkgs/development/libraries/libdnet/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Provides a simplified, portable interface to several low-level networking routines"; - homepage = https://github.com/dugsong/libdnet; + homepage = "https://github.com/dugsong/libdnet"; license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 61ca98e2256c5..0d6ff189765fc 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://dri.freedesktop.org/libdrm/; + homepage = "https://dri.freedesktop.org/libdrm/"; description = "Library for accessing the kernel's Direct Rendering Manager"; license = "bsd"; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix index a5058de597ef1..ed1e2cd74a3b5 100644 --- a/pkgs/development/libraries/libdv/default.nix +++ b/pkgs/development/libraries/libdv/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards"; - homepage = https://sourceforge.net/projects/libdv/; + homepage = "https://sourceforge.net/projects/libdv/"; license = licenses.lgpl21Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix index 3a83d01353fd2..327aacb6f37e0 100644 --- a/pkgs/development/libraries/libdvbpsi/default.nix +++ b/pkgs/development/libraries/libdvbpsi/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple library designed for decoding and generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818 and ITU-T H.222.0"; - homepage = http://www.videolan.org/developers/libdvbpsi.html ; + homepage = "http://www.videolan.org/developers/libdvbpsi.html"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.lgpl21; }; diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index fd89077a256ab..f097aad702aeb 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://www.videolan.org/developers/libdvdcss.html; + homepage = "http://www.videolan.org/developers/libdvdcss.html"; description = "A library for decrypting DVDs"; license = licenses.gpl2; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/libdvdnav/4.2.1.nix b/pkgs/development/libraries/libdvdnav/4.2.1.nix index 18e2689002e80..c8ebf180b315a 100644 --- a/pkgs/development/libraries/libdvdnav/4.2.1.nix +++ b/pkgs/development/libraries/libdvdnav/4.2.1.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libdvdnav-4.2.1"; src = fetchurl { - url = http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz; + url = "http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz"; sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://dvdnav.mplayerhq.hu/; + homepage = "http://dvdnav.mplayerhq.hu/"; description = "A library that implements DVD navigation features such as DVD menus"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.wmertens ]; diff --git a/pkgs/development/libraries/libdvdread/4.9.9.nix b/pkgs/development/libraries/libdvdread/4.9.9.nix index fbe56023a91c4..33b04b0f7c033 100644 --- a/pkgs/development/libraries/libdvdread/4.9.9.nix +++ b/pkgs/development/libraries/libdvdread/4.9.9.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libdvdread-4.9.9"; src = fetchurl { - url = http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz; + url = "http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz"; sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://dvdnav.mplayerhq.hu/; + homepage = "http://dvdnav.mplayerhq.hu/"; description = "A library for reading DVDs"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.wmertens ]; diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index c28ca339a65ec..997018a29709f 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libdvdread"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { url = "http://get.videolan.org/libdvdread/${version}/${pname}-${version}.tar.bz2"; - sha256 = "033mnhq3mx0qz3z85vw01rz5wzmx5ynadl7q1wm2spvx3ryvs6sh"; + sha256 = "15hpwbw3nm84y432l0j61w0zmqxplsyymfc52dry6nvwl44p6d9y"; }; buildInputs = [libdvdcss]; diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 352d2b17406b8..ba4ebaec111a3 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -10,7 +10,7 @@ let + "5be7f9ee368f1cc8940cea4ddda01ff99d28bbf1fe58"; }; meta = { - homepage = https://www.prevanders.net/dwarf.html; + homepage = "https://www.prevanders.net/dwarf.html"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl21Plus; }; diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix index 5ee92b463857d..9b1aa3132e93a 100644 --- a/pkgs/development/libraries/libdwg/default.nix +++ b/pkgs/development/libraries/libdwg/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libdwg-0.6"; src = fetchurl { - url = mirror://sourceforge/libdwg/libdwg-0.6.tar.bz2; + url = "mirror://sourceforge/libdwg/libdwg-0.6.tar.bz2"; sha256 = "0l8ks1x70mkna1q7mzy1fxplinz141bd24qhrm1zkdil74mcsryc"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Library reading dwg files"; - homepage = http://libdwg.sourceforge.net/en/; + homepage = "http://libdwg.sourceforge.net/en/"; license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix index c02a6f9a50252..eec982aeeb0fd 100644 --- a/pkgs/development/libraries/libdynd/default.nix +++ b/pkgs/development/libraries/libdynd/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "C++ dynamic ndarray library, with Python exposure."; - homepage = http://libdynd.org; + homepage = "http://libdynd.org"; license = licenses.bsd2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index 29ca85cdeb018..da7a186bea6fc 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -1,23 +1,41 @@ -{ stdenv, fetchurl, makeWrapper }: +{ stdenv, fetchFromGitHub, autoreconfHook, strace, which }: stdenv.mkDerivation rec { - name = "libeatmydata-105"; + pname = "libeatmydata"; + version = "105"; - src = fetchurl { - url = "https://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz"; - sha256 = "1pd8sc73cgc41ldsvq6g8ics1m5k8gdcb91as9yg8z5jnrld1lmx"; + src = fetchFromGitHub { + owner = "stewartsmith"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "0sx803h46i81h67xbpd3c7ky0nhaw4gij214nsx4lqig70223v9r"; }; patches = [ ./find-shell-lib.patch ]; + patchFlags = "-p0"; + postPatch = '' - substituteInPlace eatmydata.in --replace NIX_OUT_DIR $out + substituteInPlace eatmydata.in \ + --replace NIX_OUT_DIR $out + + patchShebangs . ''; - meta = { - homepage = https://www.flamingspork.com/projects/libeatmydata/; - license = stdenv.lib.licenses.gpl3Plus; + nativeBuildInputs = [ + autoreconfHook + ] ++ stdenv.lib.optionals doCheck [ strace which ]; + + # while we can *build* in parallel, the tests also run in parallel which does + # not work with v105. Later versions (unreleased) have a fix for that. The + # problem is that on hydra we cannot use strace, so the tests don't run there. + enableParallelBuilding = true; + doCheck = false; + + meta = with stdenv.lib; { description = "Small LD_PRELOAD library to disable fsync and friends"; - platforms = stdenv.lib.platforms.unix; + homepage = "https://www.flamingspork.com/projects/libeatmydata/"; + license = licenses.gpl3Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 591ad72e4eccf..cbfcf5af042bd 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extensible Binary Meta Language library"; - homepage = https://dl.matroska.org/downloads/libebml/; + homepage = "https://dl.matroska.org/downloads/libebml/"; license = licenses.lgpl21; maintainers = with maintainers; [ spwhitt ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix index 16624a7807978..cb52919229899 100644 --- a/pkgs/development/libraries/libebur128/default.nix +++ b/pkgs/development/libraries/libebur128/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Implementation of the EBU R128 loudness standard"; - homepage = https://github.com/jiixyj/libebur128; + homepage = "https://github.com/jiixyj/libebur128"; license = licenses.mit; maintainers = [ maintainers.andrewrk ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index b83984e23c8e4..09bd41dbed0b6 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.thrysoee.dk/editline/; + homepage = "http://www.thrysoee.dk/editline/"; description = "A port of the NetBSD Editline library (libedit)"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix index 7255b3fece425..36d88f88786dd 100644 --- a/pkgs/development/libraries/libee/default.nix +++ b/pkgs/development/libraries/libee/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libee-0.4.1"; src = fetchurl { - url = http://www.libee.org/download/files/download/libee-0.4.1.tar.gz; + url = "http://www.libee.org/download/files/download/libee-0.4.1.tar.gz"; sha256 = "09xhgzmsq0g3jsyj24vy67bhzk2fv971w5ixdkhfwgar70cw1nn0"; }; @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ libestr]; meta = { - homepage = http://www.libee.org/; + homepage = "http://www.libee.org/"; description = "An Event Expression Library inspired by CEE"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix index 1835b924ec1a4..6350705120736 100644 --- a/pkgs/development/libraries/libelf-freebsd/default.nix +++ b/pkgs/development/libraries/libelf-freebsd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation (rec { pname = "libelf-freebsd"; src = fetchsvn { - url = svn://svn.code.sf.net/p/elftoolchain/code/trunk; + url = "svn://svn.code.sf.net/p/elftoolchain/code/trunk"; rev = (stdenv.lib.strings.toInt version); name = "elftoolchain-${version}"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation (rec { meta = { description = "Essential compilation tools and libraries for building and analyzing ELF based program images"; - homepage = https://sourceforge.net/p/elftoolchain/wiki/Home/; + homepage = "https://sourceforge.net/p/elftoolchain/wiki/Home/"; license = stdenv.lib.licenses.bsd2; diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index b168dd9bb566e..4e4afe96d54e9 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "ELF object file access library"; - homepage = https://github.com/Distrotech/libelf; + homepage = "https://github.com/Distrotech/libelf"; license = stdenv.lib.licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libelfin/default.nix b/pkgs/development/libraries/libelfin/default.nix index 2eb1bd0e4fc42..8a8de854fc901 100644 --- a/pkgs/development/libraries/libelfin/default.nix +++ b/pkgs/development/libraries/libelfin/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { - homepage = https://github.com/aclements/libelfin/; + homepage = "https://github.com/aclements/libelfin/"; license = licenses.mit; description = "C++11 ELF/DWARF parser"; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix index 59780699fd130..b8b28f49d1d53 100644 --- a/pkgs/development/libraries/libepc/default.nix +++ b/pkgs/development/libraries/libepc/default.nix @@ -39,9 +39,9 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Easy Publish and Consume Library"; - homepage = https://wiki.gnome.org/Projects/libepc; + homepage = "https://wiki.gnome.org/Projects/libepc"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix index 9650f540fcfba..e5a7f5609a38c 100644 --- a/pkgs/development/libraries/libesmtp/default.nix +++ b/pkgs/development/libraries/libesmtp/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = http://brianstafford.info/libesmtp/index.html; + homepage = "http://brianstafford.info/libesmtp/index.html"; description = "A Library for Posting Electronic Mail"; license = licenses.lgpl21; }; diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix index b8f62901eed43..add7ea00a980d 100644 --- a/pkgs/development/libraries/libestr/default.nix +++ b/pkgs/development/libraries/libestr/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://libestr.adiscon.com/; + homepage = "https://libestr.adiscon.com/"; description = "Some essentials for string handling"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/development/libraries/libetpan/default.nix index 6756a8dbc5696..9050320773af0 100644 --- a/pkgs/development/libraries/libetpan/default.nix +++ b/pkgs/development/libraries/libetpan/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An efficient, portable library for different kinds of mail access: IMAP, SMTP, POP, and NNTP"; - homepage = http://www.etpan.org/libetpan.html; + homepage = "http://www.etpan.org/libetpan.html"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index a94b6d1dc2a69..eaa2933505c40 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { and then add or remove events dynamically without having to change the event loop. ''; - homepage = http://libevent.org/; + homepage = "http://libevent.org/"; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index fd1e203ed37f5..4ebf0835351e1 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for support of the Expert Witness Compression Format"; - homepage = https://sourceforge.net/projects/libewf/; + homepage = "https://sourceforge.net/projects/libewf/"; license = stdenv.lib.licenses.lgpl3; maintainers = [ stdenv.lib.maintainers.raskin ] ; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix index 4519cc7dd7445..147b213735db1 100644 --- a/pkgs/development/libraries/libexecinfo/default.nix +++ b/pkgs/development/libraries/libexecinfo/default.nix @@ -12,17 +12,17 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "10-execinfo.patch"; - url = https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/10-execinfo.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1; + url = "https://git.alpinelinux.org/aports/plain/main/libexecinfo/10-execinfo.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; sha256 = "0lnphrad4vspyljnvmm62dyxj98vgp3wabj4w3vfzfph7j8piw7g"; }) (fetchpatch { name = "20-define-gnu-source.patch"; - url = https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/20-define-gnu-source.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1; + url = "https://git.alpinelinux.org/aports/plain/main/libexecinfo/20-define-gnu-source.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; sha256 = "1mp8mc639b0h2s69m5z6s2h3q3n1zl298j9j0plzj7f979j76302"; }) (fetchpatch { name = "30-linux-makefile.patch"; - url = https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/30-linux-makefile.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1; + url = "https://git.alpinelinux.org/aports/plain/main/libexecinfo/30-linux-makefile.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; sha256 = "1jwjz22z5cjy5h2bfghn62yl9ar8jiqhdvbwrcfavv17ihbhwcaf"; }) ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Quick-n-dirty BSD licensed clone of the GNU libc backtrace facility"; license = licenses.bsd2; - homepage = https://www.freshports.org/devel/libexecinfo; + homepage = "https://www.freshports.org/devel/libexecinfo"; maintainers = with maintainers; [ dtzWill ]; }; } diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index cd35dc4c1db68..090c6a2fff345 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext ]; meta = { - homepage = https://libexif.github.io/; + homepage = "https://libexif.github.io/"; description = "A library to read and manipulate EXIF data in digital photographs"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index ea155440c8d13..3db0b056c0f0a 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,8 +1,21 @@ -{ fetchurl, stdenv, libtool, gettext, zlib, bzip2, flac, libvorbis +{ fetchurl, stdenv, substituteAll +, libtool, gettext, zlib, bzip2, flac, libvorbis , exiv2, libgsf, rpm, pkgconfig, fetchpatch +, gstreamerSupport ? true, gst_all_1 ? null +# ^ Needed e.g. for proper id3 and FLAC support. +# Set to `false` to decrease package closure size by about 87 MB (53%). +, gstPlugins ? (gst: [ gst.gst-plugins-base gst.gst-plugins-good ]) +# If an application needs additional gstreamer plugins it can also make them +# available by adding them to the environment variable +# GST_PLUGIN_SYSTEM_PATH_1_0, e.g. like this: +# postInstall = '' +# wrapProgram $out/bin/extract --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" +# ''; +# See also <https://nixos.org/nixpkgs/manual/#sec-language-gnome>. , gtkSupport ? true, glib ? null, gtk3 ? null , videoSupport ? true, ffmpeg ? null, libmpeg2 ? null}: +assert gstreamerSupport -> gst_all_1 != null && builtins.isList (gstPlugins gst_all_1); assert gtkSupport -> glib != null && gtk3 != null; assert videoSupport -> ffmpeg != null && libmpeg2 != null; @@ -28,6 +41,15 @@ stdenv.mkDerivation rec { sha256 = "01xhcjbzv6p53wz7y2ii76kb8m9iwvnm4ip9w4a0bpgaxqz4b9fw"; excludes = [ "ChangeLog" ]; }) + ] ++ stdenv.lib.optionals gstreamerSupport [ + + # Libraries cannot be wrapped so we need to hardcode the plug-in paths. + (substituteAll { + src = ./gst-hardcode-plugins.patch; + load_gst_plugins = stdenv.lib.concatMapStrings + (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'') + (gstPlugins gst_all_1); + }) ]; preConfigure = @@ -40,7 +62,9 @@ stdenv.mkDerivation rec { [ libtool gettext zlib bzip2 flac libvorbis exiv2 libgsf rpm pkgconfig - ] ++ stdenv.lib.optionals gtkSupport [ glib gtk3 ] + ] ++ stdenv.lib.optionals gstreamerSupport + ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1) + ++ stdenv.lib.optionals gtkSupport [ glib gtk3 ] ++ stdenv.lib.optionals videoSupport [ ffmpeg libmpeg2 ]; configureFlags = [ diff --git a/pkgs/development/libraries/libextractor/gst-hardcode-plugins.patch b/pkgs/development/libraries/libextractor/gst-hardcode-plugins.patch new file mode 100644 index 0000000000000..73ecf5f252f64 --- /dev/null +++ b/pkgs/development/libraries/libextractor/gst-hardcode-plugins.patch @@ -0,0 +1,11 @@ +--- a/src/plugins/gstreamer_extractor.c ++++ b/src/plugins/gstreamer_extractor.c +@@ -2215,6 +2215,7 @@ void __attribute__ ((constructor)) + gstreamer_init () + { + gst_init (NULL, NULL); ++ @load_gst_plugins@ + g_log_set_default_handler (&log_handler, NULL); + g_log_set_handler (NULL, G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION, + &log_handler, NULL); + diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix index 7b3df42c24c3f..3adb606dd2d5c 100644 --- a/pkgs/development/libraries/libexttextcat/default.nix +++ b/pkgs/development/libraries/libexttextcat/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An N-Gram-Based Text Categorization library primarily intended for language guessing"; - homepage = https://wiki.documentfoundation.org/Libexttextcat; + homepage = "https://wiki.documentfoundation.org/Libexttextcat"; platforms = platforms.all; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index 10a0d179d3e93..66b193d4ea8da 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libf2c-20160102"; src = fetchurl { - url = http://www.netlib.org/f2c/libf2c.zip; + url = "http://www.netlib.org/f2c/libf2c.zip"; sha256 = "1q78y8j8xpl8zdzdxmn5ablss56hi5a7vz3idam9l2nfx5q40h6a"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "F2c converts Fortran 77 source code to C"; - homepage = http://www.netlib.org/f2c/; + homepage = "http://www.netlib.org/f2c/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix index 3c24319154331..f95d150cc250c 100644 --- a/pkgs/development/libraries/libfakekey/default.nix +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "X virtual keyboard library"; - homepage = https://www.yoctoproject.org/tools-resources/projects/matchbox; + homepage = "https://www.yoctoproject.org/tools-resources/projects/matchbox"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libfann/default.nix b/pkgs/development/libraries/libfann/default.nix index 5e1c985fe2c4a..590755c3a0fa1 100644 --- a/pkgs/development/libraries/libfann/default.nix +++ b/pkgs/development/libraries/libfann/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; meta = { - homepage = http://leenissen.dk/fann/wp/; + homepage = "http://leenissen.dk/fann/wp/"; description = "Fast Artificial Neural Network Library"; maintainers = with lib.maintainers; [ fpletz ]; license = lib.licenses.lgpl21; diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix index 8d11cd86c45f0..7fdc04d116ef1 100644 --- a/pkgs/development/libraries/libffcall/default.nix +++ b/pkgs/development/libraries/libffcall/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Foreign function call library"; - homepage = https://www.gnu.org/software/libffcall/; + homepage = "https://www.gnu.org/software/libffcall/"; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 183f30e179e4f..eecffeba23da4 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { interface. A layer must exist above libffi that handles type conversions for values passed between the two languages. ''; - homepage = http://sourceware.org/libffi/; + homepage = "http://sourceware.org/libffi/"; license = licenses.mit; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index d5d2b18e5ed5f..b062b10732e21 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -3,45 +3,36 @@ , fetchpatch , cmake , pkgconfig +, hidapi , libcbor , openssl , udev -, IOKit }: +}: stdenv.mkDerivation rec { pname = "libfido2"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "0hdgxbmjbnm9kjwc07nrl2zy87qclvb3rzvdwr5iw35n2qhf4dds"; + sha256 = "0v1a3n0qljmrp8y9pmnmbsdsy79l3z84qmhyjx50xdsbgnz1z4md"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libcbor openssl ] - ++ stdenv.lib.optionals stdenv.isLinux [ udev ] - ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; + buildInputs = [ hidapi libcbor openssl ] + ++ stdenv.lib.optionals stdenv.isLinux [ udev ]; patches = [ - # fix build on darwin + # make build reproducible (fetchpatch { - url = "https://github.com/Yubico/libfido2/commit/916ebd18a89e4028de203d603726805339be7a5b.patch"; - sha256 = "07f0xpxnq02cccmqcric87b6pms7k7ssvdw722zr970a6qs8p6i7"; - }) - # allow attestation using any supported algorithm - (fetchpatch { - url = "https://github.com/Yubico/libfido2/commit/f7a9471fa0588cb91cbefffb13c1e4d06c2179b7.patch"; - sha256 = "02qbw9bqy3sixvwig6az7v3vimgznxnfikn9p1jczm3d7mn8asw2"; - }) - # fix EdDSA attestation signature verification bug - (fetchpatch { - url = "https://github.com/Yubico/libfido2/commit/95126eea52294419515e6540dfd7220f35664c48.patch"; - sha256 = "076mwpl9xndjhy359jdv2drrwyq7wd3pampkn28mn1rlwxfgf0d0"; + url = "https://github.com/Yubico/libfido2/commit/e79f7d7996e70d6b2ae9826fce81d61659cab4f6.patch"; + sha256 = "0jwg69f95qqf0ym24q1ka50d3d3338cyw4fdfzpw4sab0shiaq9v"; }) ]; cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" + "-DUSE_HIDAPI=1" "-DCMAKE_INSTALL_LIBDIR=lib" ]; @@ -49,7 +40,7 @@ stdenv.mkDerivation rec { description = '' Provides library functionality for FIDO 2.0, including communication with a device over USB. ''; - homepage = https://github.com/Yubico/libfido2; + homepage = "https://github.com/Yubico/libfido2"; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill prusnak ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libfido2/detect_apple_ld.patch b/pkgs/development/libraries/libfido2/detect_apple_ld.patch deleted file mode 100644 index de972e0f35864..0000000000000 --- a/pkgs/development/libraries/libfido2/detect_apple_ld.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt 2020-02-19 17:21:59.000000000 +0000 -+++ b/CMakeLists.txt 2020-02-23 15:57:34.241115306 +0000 -@@ -296,7 +296,7 @@ - endif() - - # export list --if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang") -+if(APPLE AND CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang") - # clang + lld - string(CONCAT CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} - " -exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/src/export.llvm") diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 0fa5c3a7db0e9..10f46a67e896d 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -9,16 +9,19 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.19.3"; + version = "0.21.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0fml6whdbfcwc8nfjhvrnidkscv6q2x988zf3alfjl2mdpw4jgd4"; + sha256 = "1wjvxi3spkp58lay590bs5s2i8fn94lqkc7qvq4q7ns4l9k9z3av"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gettext gnutls nettle ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = "https://lib.filezilla-project.org/"; description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs"; diff --git a/pkgs/development/libraries/libfishsound/default.nix b/pkgs/development/libraries/libfishsound/default.nix index fae96c8d3f7b3..3843f4a97ce4d 100644 --- a/pkgs/development/libraries/libfishsound/default.nix +++ b/pkgs/development/libraries/libfishsound/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { - homepage = https://xiph.org/fishsound/; + homepage = "https://xiph.org/fishsound/"; description = ''libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex and Ogg Vorbis files. libfishsound is a wrapper around the existing codec libraries and provides a consistent, higher-level programming interface. It has been designed for use in a wide variety of applications; it has no direct dependencies on Ogg encapsulation, though it is most commonly used in conjunction with liboggz to decode or encode FLAC, Speex or Vorbis audio tracks in Ogg files, including Ogg Theora and Annodex. diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index e007ab2f95af2..2670f94fbc2f8 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -1,30 +1,41 @@ -{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, eigen, -zlib, libpng, boost, qt5, guile +{ lib +, mkDerivation +, wrapQtAppsHook +, fetchFromGitHub +, cmake +, ninja +, pkgconfig +, eigen +, zlib +, libpng +, boost +, guile }: -stdenv.mkDerivation { - pname = "libfive"; - version = "2018-07-01"; +mkDerivation { + pname = "libfive-unstable"; + version = "2020-02-15"; src = fetchFromGitHub { - owner = "libfive"; - repo = "libfive"; - rev = "0f517dde9521d751310a22f85ee69b2c84690267"; - sha256 = "0bfxysf5f4ripgcv546il8wnw5p0d4s75kdjlwvj32549537hlz0"; + owner = "libfive"; + repo = "libfive"; + rev = "5b7717a25064478cd6bdb190683566eaf4c7afdd"; + sha256 = "102zw2n3vzv84i323is4qrwwqqha8v1cniw54ss8f4bq6dmic0bg"; }; - nativeBuildInputs = [ cmake ninja pkgconfig ]; - buildInputs = [ eigen zlib libpng boost qt5.qtimageformats guile ]; + + nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkgconfig ]; + buildInputs = [ eigen zlib libpng boost guile ]; # Link "Studio" binary to "libfive-studio" to be more obvious: postFixup = '' ln -s "$out/bin/Studio" "$out/bin/libfive-studio" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile"; - homepage = https://libfive.com/; - maintainers = with maintainers; [ hodapp ]; - license = licenses.lgpl2; - platforms = platforms.linux; + homepage = "https://libfive.com/"; + maintainers = with maintainers; [ hodapp kovirobi ]; + license = with licenses; [ mpl20 gpl2Plus ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix index 9c9b6c8034c41..4fdb22f8bd494 100644 --- a/pkgs/development/libraries/libfixposix/default.nix +++ b/pkgs/development/libraries/libfixposix/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; meta = with stdenv.lib; { - homepage = https://github.com/sionescu/libfixposix; + homepage = "https://github.com/sionescu/libfixposix"; description = "Thin wrapper over POSIX syscalls and some replacement functionality"; license = licenses.boost; maintainers = with maintainers; [ orivej raskin ]; diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index a0323481be9af..94476984de009 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -28,10 +28,15 @@ stdenv.mkDerivation rec { "sysconfdir=${placeholder "out"}/etc" ]; + # libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm + postInstall = optional (!extraOnly) '' + rm $out/lib/libfm-extra.so $out/lib/libfm-extra.so.* $out/lib/libfm-extra.la $out/lib/pkgconfig/libfm-extra.pc + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://blog.lxde.org/category/pcmanfm/; + homepage = "https://blog.lxde.org/category/pcmanfm/"; license = licenses.lgpl21Plus; description = "A glib-based library for file management"; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index cecb2b6750be6..e2552ba713e07 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -1,41 +1,31 @@ -{ thinkpad ? false -, stdenv -, fetchFromGitHub -, fetchurl +{ stdenv +, fetchFromGitLab , pkgconfig , meson , ninja -, libusb1 +, gusb , pixman , glib , nss -, gtk3 +, gobject-introspection , coreutils , gtk-doc , docbook_xsl , docbook_xml_dtd_43 -, openssl ? null }: -assert thinkpad -> openssl != null; - stdenv.mkDerivation rec { - pname = "libfprint" + stdenv.lib.optionalString thinkpad "-thinkpad"; - version = "1.0"; - - src = { - libfprint-thinkpad = - fetchFromGitHub { - owner = "3v1n0"; - repo = "libfprint"; - rev = "2e2e3821717e9042e93a995bdbd3d00f2df0be9c"; - sha256 = "1vps1wrp7hskf13f7jrv0dwry2fcid76x2w463wplngp63cj7b3b"; - }; - libfprint = fetchurl { - url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/aff93e9921d1cff53d7c070944952ff9/libfprint-${version}.tar.xz"; - sha256 = "0v84pd12v016m8iimhq39fgzamlarqccsr7d98cvrrwrzrgcixrd"; - }; - }.${pname}; + pname = "libfprint"; + version = "1.90.1"; + outputs = [ "out" "devdoc" ]; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "libfprint"; + repo = pname; + rev = "v${version}"; + sha256 = "0fdaak7qjr9b4482g7fhhqpyfdqpxq5kpmyzkp7f5i7qq2ynb78a"; + }; nativeBuildInputs = [ pkgconfig @@ -44,30 +34,22 @@ stdenv.mkDerivation rec { gtk-doc docbook_xsl docbook_xml_dtd_43 + gobject-introspection ]; buildInputs = [ - libusb1 # drop in 2.0 for gusb + gusb pixman glib nss - gtk3 - ] - ++ stdenv.lib.optional thinkpad openssl - ; + ]; mesonFlags = [ "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d" - "-Dx11-examples=false" ]; - postPatch = '' - substituteInPlace libfprint/meson.build \ - --replace /bin/echo ${coreutils}/bin/echo - ''; - meta = with stdenv.lib; { - homepage = https://fprint.freedesktop.org/; + homepage = "https://fprint.freedesktop.org/"; description = "A library designed to make it easy to add support for consumer fingerprint readers"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 97df5107409a6..52c64ed8629c6 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { '' else null; meta = with stdenv.lib; { - homepage = http://www.imagemagick.org; + homepage = "http://www.imagemagick.org"; description = "A library for manipulating FlashPIX images"; license = "Flashpix"; platforms = platforms.all; diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index 8ddce0aa98c60..4af7d44a2945f 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The libfreefare project aims to provide a convenient API for MIFARE card manipulations"; license = licenses.lgpl3; - homepage = https://github.com/nfc-tools/libfreefare; + homepage = "https://github.com/nfc-tools/libfreefare"; maintainers = with maintainers; [bobvanderlinden]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 26002725d91bc..0e2e24d0f3b48 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to talk to FTDI chips using libusb"; - homepage = https://www.intra2net.com/en/developer/libftdi/; + homepage = "https://www.intra2net.com/en/developer/libftdi/"; license = with licenses; [ lgpl2 gpl2 ]; platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 3dffbd075e93b..88c848397de30 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libusb}: +{stdenv, fetchurl, libusb-compat-0_1}: with stdenv; mkDerivation rec { name = "libftdi-0.20"; @@ -8,9 +8,9 @@ with stdenv; mkDerivation rec { sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; - propagatedBuildInputs = [ libusb ]; + propagatedBuildInputs = [ libusb-compat-0_1 ]; # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; @@ -25,7 +25,7 @@ with stdenv; mkDerivation rec { meta = { description = "A library to talk to FTDI chips using libusb"; - homepage = https://www.intra2net.com/en/developer/libftdi/; + homepage = "https://www.intra2net.com/en/developer/libftdi/"; license = lib.licenses.lgpl21; platforms = lib.platforms.all; }; diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/development/libraries/libgadu/default.nix index b039c84b2fb19..4e9ce765b9638 100644 --- a/pkgs/development/libraries/libgadu/default.nix +++ b/pkgs/development/libraries/libgadu/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "libgadu-1.11.2"; src = fetchurl { - url = http://toxygen.net/libgadu/files/libgadu-1.11.2.tar.gz; + url = "http://toxygen.net/libgadu/files/libgadu-1.11.2.tar.gz"; sha256 = "0kifi9blhbimihqw4kaf6wyqhlx8fpp8nq4s6y280ar9p0il2n3z"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "A library to deal with gadu-gadu protocol (most popular polish IM protocol)"; - homepage = http://toxygen.net/libgadu/; + homepage = "http://toxygen.net/libgadu/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl21; }; diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix index d83b43a782e9c..1b528b98e858f 100644 --- a/pkgs/development/libraries/libgaminggear/default.nix +++ b/pkgs/development/libraries/libgaminggear/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Provides functionality for gaming input devices"; - homepage = https://sourceforge.net/projects/libgaminggear/; + homepage = "https://sourceforge.net/projects/libgaminggear/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix index 80cb6641bfbaf..9de5cf2d2d1bd 100644 --- a/pkgs/development/libraries/libgcrypt/1.5.nix +++ b/pkgs/development/libraries/libgcrypt/1.5.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/libgcrypt/; + homepage = "https://www.gnu.org/software/libgcrypt/"; description = "General-pupose cryptographic library"; license = licenses.lgpl2Plus; platforms = platforms.all; - repositories.git = git://git.gnupg.org/libgcrypt.git; + repositories.git = "git://git.gnupg.org/libgcrypt.git"; }; } diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index e7a9ec60a6d2e..a3d515c50472d 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/libgcrypt/; + homepage = "https://www.gnu.org/software/libgcrypt/"; description = "General-purpose cryptographic library"; license = licenses.lgpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ vrthra ]; - repositories.git = git://git.gnupg.org/libgcrypt.git; + repositories.git = "git://git.gnupg.org/libgcrypt.git"; }; } diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index a1871f6b2e650..a46b2aa741187 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -45,9 +45,9 @@ assert postgresSupport -> postgresql != null; meta = with stdenv.lib; { description = "Database access library"; - homepage = https://www.gnome-db.org/; + homepage = "https://www.gnome-db.org/"; license = [ licenses.lgpl2 licenses.gpl2 ]; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix index f5cc5efa06a1e..be3e2e469ade5 100644 --- a/pkgs/development/libraries/libgdamm/default.nix +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -31,9 +31,9 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ bindings for libgda"; - homepage = https://www.gnome-db.org/; + homepage = "https://www.gnome-db.org/"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index 91bb9869f3c6e..162b5d2339519 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GData API library"; homepage = "https://wiki.gnome.org/Projects/libgdata"; - maintainers = with maintainers; [ raskin lethalman ] ++ gnome3.maintainers; + maintainers = with maintainers; [ raskin lethalman ] ++ teams.gnome.members; platforms = platforms.linux; license = licenses.lgpl21Plus; }; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 54bf091e5ea90..1ff02a8709d4d 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libgdiplus"; - version = "6.0.4"; + version = "6.0.5"; src = fetchFromGitHub { owner = "mono"; repo = "libgdiplus"; rev = version; - sha256 = "1pf3yhwq9qk0w3yv9bb8qlwwqkffg7xb4sgc8yqdnn6pa56i3vmn"; + sha256 = "1387lgph5r17viv3rkf5hbksdn435njzmra7s17q0nzk2mkkm68c"; }; NIX_LDFLAGS = "-lgif"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mono library that provides a GDI+-compatible API on non-Windows operating systems"; - homepage = https://www.mono-project.com/docs/gui/libgdiplus/; + homepage = "https://www.mono-project.com/docs/gui/libgdiplus/"; platforms = platforms.unix; license = licenses.mit; }; diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index 92c9f214ab467..c2d1c197fe960 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; - homepage = https://wiki.gnome.org/Projects/Libgee; + homepage = "https://wiki.gnome.org/Projects/Libgee"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index db75ff1784f5f..1b973fd5eeeb3 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery"; - homepage = https://github.com/OSGeo/libgeotiff; + homepage = "https://github.com/OSGeo/libgeotiff"; license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/libgepub/default.nix b/pkgs/development/libraries/libgepub/default.nix index 70ec222f88fb4..cf62e0cabc9d2 100644 --- a/pkgs/development/libraries/libgepub/default.nix +++ b/pkgs/development/libraries/libgepub/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "GObject based library for handling and rendering epub documents"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index 279392382785d..84d44969a142f 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.linuxsampler.org; + homepage = "http://www.linuxsampler.org"; description = "Gigasampler file access library"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix index f3e07b509176c..9a05a01bee61d 100644 --- a/pkgs/development/libraries/libgit2-glib/default.nix +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "A glib wrapper library around the libgit2 git access library"; homepage = "https://wiki.gnome.org/Projects/Libgit2-glib"; license = licenses.lgpl21; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 24052ea405850..9ead3a97c0481 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { user. It provides X authentication facilities for running programs in an X session. ''; - homepage = https://www.nongnu.org/gksu/; + homepage = "https://www.nongnu.org/gksu/"; license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.romildo ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 55b801b0b0d54..92cde8aef4cf4 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -2,34 +2,18 @@ stdenv.mkDerivation rec { pname = "libglvnd"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "libglvnd"; rev = "v${version}"; - sha256 = "1hyywwjsmvsd7di603f7iznjlccqlc7yvz0j59gax7bljm9wb6ni"; + sha256 = "0mkzdzdxjxjl794rblq4mq33wmb8ikqmfswbqdbr8gw2kw4wlhdl"; }; nativeBuildInputs = [ autoreconfHook pkgconfig python3 addOpenGLRunpath ]; buildInputs = [ libX11 libXext xorgproto ]; - # The following 3 patches should be removed once libglvnd >1.2.0 is released - patches = [ - (fetchpatch { - url = "https://github.com/NVIDIA/libglvnd/commit/6f52473dac08c44b081b792874b4ce73122096da.patch"; - sha256 = "0rd9ihl8n33cm0rya5a7ki0hn31fh52r0gaj5d4w80jrsah2ayij"; - }) - (fetchpatch { - url = "https://github.com/NVIDIA/libglvnd/commit/51233cc52cbcbe25f8461830913c06f5b5bc9508.patch"; - sha256 = "1qx3nw8vq5xcrixmi7xw1vpy4gbf7kmx38rx8wg8x046g4mv8ijj"; - }) - (fetchpatch { - url = "https://github.com/NVIDIA/libglvnd/commit/5dfdc5a6dc60a3bdc63cd4510dabacba388da13a.patch"; - sha256 = "0gmb3619yz3z7n22afjh8p2y13bmsky4r0z0csm14is3wvdi64ya"; - }) - ]; - postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace src/GLX/Makefile.am \ --replace "-Wl,-Bsymbolic " "" @@ -63,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The GL Vendor-Neutral Dispatch library"; - homepage = https://github.com/NVIDIA/libglvnd; + homepage = "https://github.com/NVIDIA/libglvnd"; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index f35f3f87fbeb1..c02fd503eb0d8 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Keyboard management library"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index 339146da2b9ba..25917c44bd025 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgnurl"; - version = "7.67.0"; + version = "7.70.0"; src = fetchurl { url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz"; - sha256 = "0ima9hz5d54iyvvih51s8xn6dsfxd3qyzgnj9l7w9f1smia295rb"; + sha256 = "0px9la8v4bj1dzxb95fx3yxk0rcjqjrxpj733ga27cza45wwzkqa"; }; nativeBuildInputs = [ libtool groff perl pkgconfig python2 ]; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index c02bc7f0ed3e9..e170e4931b83c 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -60,14 +60,14 @@ in stdenv.mkDerivation (rec { # For some reason, /bin/sh on OpenIndiana leads to this at the end of the # `config.status' run: # ./config.status[1401]: shift: (null): bad number - # (See <http://hydra.nixos.org/build/2931046/nixlog/1/raw>.) + # (See <https://hydra.nixos.org/build/2931046/nixlog/1/raw>.) # Thus, re-run it with Bash. "${stdenv.shell} config.status"; doCheck = true; # not cross meta = with stdenv.lib; { - homepage = https://www.gnupg.org/related_software/libgpg-error/index.html; + homepage = "https://www.gnupg.org/related_software/libgpg-error/index.html"; description = "A small library that defines common error values for all GnuPG components"; longDescription = '' diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 6203b8c7b7124..95bb24ecb583e 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.gphoto.org/proj/libgphoto2/; + homepage = "http://www.gphoto.org/proj/libgphoto2/"; description = "A library for accessing digital cameras"; longDescription = '' This is the library backend for gphoto2. It contains the code for PTP, diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index 5c25a4d5abf6c..e30e05d44c15f 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ]; meta = { - homepage = https://gtkpod.sourceforge.net/; + homepage = "https://gtkpod.sourceforge.net/"; description = "Library used by gtkpod to access the contents of an ipod"; license = "LGPL"; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix index 76d7ebcc8cc23..323f5af70973b 100644 --- a/pkgs/development/libraries/libgringotts/default.nix +++ b/pkgs/development/libraries/libgringotts/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small library to encapsulate data in an encrypted structure"; - homepage = http://libgringotts.sourceforge.net/; + homepage = "http://libgringotts.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix index bea3c85260c9e..3fea527c450e6 100644 --- a/pkgs/development/libraries/libgroove/default.nix +++ b/pkgs/development/libraries/libgroove/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Streaming audio processing library"; - homepage = https://github.com/andrewrk/libgroove; + homepage = "https://github.com/andrewrk/libgroove"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ andrewrk ]; diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index 8fc44fb6a8dc9..fdad5369813f5 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -32,9 +32,9 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Glib abstaction to handle feeds in RSS, Atom and other formats"; - homepage = https://wiki.gnome.org/Projects/Libgrss; + homepage = "https://wiki.gnome.org/Projects/Libgrss"; license = licenses.lgpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index a60d3a1653342..34cb1ef3381f0 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgsf"; - version = "1.14.46"; + version = "1.14.47"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0bddmlzg719sjhlbzqlhb7chwk93qc7g68m2r9r8xz112jdradpa"; + sha256 = "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"; }; nativeBuildInputs = [ pkgconfig intltool libintl ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNOME's Structured File Library"; - homepage = https://www.gnome.org/projects/libgsf; + homepage = "https://www.gnome.org/projects/libgsf"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/development/libraries/libgssglue/default.nix index 0177869d3e396..d13c0940205f9 100644 --- a/pkgs/development/libraries/libgssglue/default.nix +++ b/pkgs/development/libraries/libgssglue/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.citi.umich.edu/projects/nfsv4/linux/; + homepage = "http://www.citi.umich.edu/projects/nfsv4/linux/"; description = "Exports a gssapi interface which calls other random gssapi libraries"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index fe7986bf21aa8..65f5e2750e518 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library that reads information about processes and the running system"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index 8023acb75d28d..439dd3827ec33 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library that provides GObject bindings for libudev"; - homepage = https://wiki.gnome.org/Projects/libgudev; - maintainers = [ maintainers.eelco ] ++ gnome3.maintainers; + homepage = "https://wiki.gnome.org/Projects/libgudev"; + maintainers = [ maintainers.eelco ] ++ teams.gnome.members; platforms = platforms.linux; license = licenses.lgpl2Plus; }; diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix index f1483c38c154e..27a10507a58dd 100644 --- a/pkgs/development/libraries/libgumath/default.nix +++ b/pkgs/development/libraries/libgumath/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Library supporting function dispatch on general data containers. C base and Python wrapper"; - homepage = https://xnd.io/; + homepage = "https://xnd.io/"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index f782176108aba..51ee70f070c68 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to access weather information from online services for numerous locations"; - homepage = https://wiki.gnome.org/Projects/LibGWeather; + homepage = "https://wiki.gnome.org/Projects/LibGWeather"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix index 30e5e247ab2be..095b5c8f61cf7 100644 --- a/pkgs/development/libraries/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A GObject based library for handling and rendering XPS documents"; - homepage = https://wiki.gnome.org/Projects/libgxps; + homepage = "https://wiki.gnome.org/Projects/libgxps"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 7c9779cf59bfc..28816ab130704 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala +{ stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkgconfig, gobject-introspection, vala , gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, gtk3, gnome3 +, gtk3, gnome3, glade , dbus, xvfb_run, libxml2 , hicolor-icon-theme }: @@ -20,11 +20,21 @@ stdenv.mkDerivation rec { sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5"; }; + patches = [ + # Fix build with Glade 3.36.0 + # https://source.puri.sm/Librem5/libhandy/merge_requests/451 + (fetchpatch { + url = "https://source.puri.sm/Librem5/libhandy/commit/887beedb467984ab5c7b91830181645fadef7849.patch"; + sha256 = "ZW6qCtHhXMsLsxgcOjVAukgPAhOdvFhxx0iAQEEk8GE="; + excludes = [ "glade/glade-hdy-header-bar.c" ]; + }) + ]; + nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gnome3.gnome-desktop gtk3 gnome3.glade libxml2 ]; + buildInputs = [ gnome3.gnome-desktop gtk3 glade libxml2 ]; checkInputs = [ dbus xvfb_run hicolor-icon-theme ]; mesonFlags = [ @@ -48,7 +58,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library full of GTK widgets for mobile phones"; - homepage = https://source.puri.sm/Librem5/libhandy; + homepage = "https://source.puri.sm/Librem5/libhandy"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libhangul/default.nix b/pkgs/development/libraries/libhangul/default.nix index 9e72d933433b5..eb62337c502e2 100644 --- a/pkgs/development/libraries/libhangul/default.nix +++ b/pkgs/development/libraries/libhangul/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Core algorithm library for Korean input routines"; - homepage = https://github.com/choehwanjin/libhangul; + homepage = "https://github.com/choehwanjin/libhangul"; license = licenses.lgpl21; maintainers = [ maintainers.ianwookim ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix index 0830b45b308b0..68dba64618f52 100644 --- a/pkgs/development/libraries/libharu/default.nix +++ b/pkgs/development/libraries/libharu/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libharu-2.3.0"; src = fetchzip { - url = https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz; + url = "https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz"; sha256 = "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { description = "Cross platform, open source library for generating PDF files"; - homepage = http://libharu.org/; + homepage = "http://libharu.org/"; license = stdenv.lib.licenses.zlib; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix index 5dc1fb9383405..bcab7faa41278 100644 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Implements the libhdhomerun protocol for use with Silicondust HDHomeRun TV tuners"; - homepage = https://github.com/Silicondust/libhdhomerun; + homepage = "https://github.com/Silicondust/libhdhomerun"; repositories.git = "https://github.com/Silicondust/libhdhomerun.git"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index c58812eca58bc..2de7e08fb0258 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -41,9 +41,9 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to use HTTPSEverywhere in desktop applications"; - homepage = https://gitlab.gnome.org/GNOME/libhttpseverywhere; + homepage = "https://gitlab.gnome.org/GNOME/libhttpseverywhere"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ sternenseemann ] ++ gnome3.maintainers; + maintainers = with maintainers; [ sternenseemann ] ++ teams.gnome.members; }; } diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index 08a88bfee459a..ff26c1029ef52 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -3,7 +3,8 @@ let inherit (buildPackages.buildPackages) gcc; in stdenv.mkDerivation { - name = "libiberty-${gcc.cc.version}"; + pname = "libiberty"; + version = "${gcc.cc.version}"; inherit (gcc.cc) src; @@ -19,7 +20,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://gcc.gnu.org/; + homepage = "https://gcc.gnu.org/"; license = licenses.lgpl2; description = "Collection of subroutines used by various GNU programs"; maintainers = with maintainers; [ abbradar ericson2314 ]; diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix index 00bd7e6eeea7e..8c46efa9710a1 100644 --- a/pkgs/development/libraries/libibmad/default.nix +++ b/pkgs/development/libraries/libibmad/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libibumad ]; meta = with stdenv.lib; { - homepage = https://www.openfabrics.org/; + homepage = "https://www.openfabrics.org/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/development/libraries/libibumad/default.nix index 689e9a0be5ddd..4c37f8564b0a2 100644 --- a/pkgs/development/libraries/libibumad/default.nix +++ b/pkgs/development/libraries/libibumad/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.openfabrics.org/; + homepage = "https://www.openfabrics.org/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix index 27ec8b17c0d20..10d68ee3a4e9b 100644 --- a/pkgs/development/libraries/libicns/default.nix +++ b/pkgs/development/libraries/libicns/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for manipulation of the Mac OS icns resource format"; - homepage = https://icns.sourceforge.io; + homepage = "https://icns.sourceforge.io"; license = with licenses; [ gpl2 lgpl2 lgpl21 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 7dc90d9ae3e4a..87969d6b2c7bf 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { applications. ''; - homepage = https://www.gnu.org/software/libiconv/; + homepage = "https://www.gnu.org/software/libiconv/"; license = lib.licenses.lgpl2Plus; maintainers = [ ]; diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index c6d430e10fc09..9847312a34a94 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.15.1b"; src = fetchurl { - url = mirror://sourceforge/mad/libid3tag-0.15.1b.tar.gz; + url = "mirror://sourceforge/mad/libid3tag-0.15.1b.tar.gz"; sha256 = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ID3 tag manipulation library"; - homepage = http://mad.sourceforge.net/; + homepage = "http://mad.sourceforge.net/"; license = licenses.gpl2; maintainers = [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 8291499daf31a..a0df28a66993e 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails meta = { - homepage = https://www.gnu.org/software/libidn/; + homepage = "https://www.gnu.org/software/libidn/"; description = "Library for internationalized domain names"; longDescription = '' @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { included. ''; - repositories.git = git://git.savannah.gnu.org/libidn.git; + repositories.git = "git://git.savannah.gnu.org/libidn.git"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index c1363d7a9284c..1fc0bd9b39954 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { detailed information. ''; - repositories.git = https://gitlab.com/jas/libidn2; + repositories.git = "https://gitlab.com/jas/libidn2"; license = with stdenv.lib.licenses; [ lgpl3Plus gpl2Plus gpl3Plus ]; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ fpletz ]; diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix index 936d165a6cfc2..77b2424bfee79 100644 --- a/pkgs/development/libraries/libiec61883/default.nix +++ b/pkgs/development/libraries/libiec61883/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libraw1394 ]; meta = with stdenv.lib; { - homepage = https://www.linux1394.org; + homepage = "https://www.linux1394.org"; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 461c6f111645f..03a907162b124 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "API for interfacing with the Linux Industrial I/O Subsystem"; - homepage = https://github.com/analogdevicesinc/libiio; + homepage = "https://github.com/analogdevicesinc/libiio"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index 950fe3e371878..47408f8cb6f4f 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/libimobiledevice/libimobiledevice; + homepage = "https://github.com/libimobiledevice/libimobiledevice"; description = "A software library that talks the protocols to support iPhone®, iPod Touch® and iPad® devices on Linux"; longDescription = '' libimobiledevice is a software library that talks the protocols to support diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix index 33691f79a4c8d..8bb90180300c9 100644 --- a/pkgs/development/libraries/libindicator/default.nix +++ b/pkgs/development/libraries/libindicator/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { description = "A set of symbols and convenience functions for Ayatana indicators"; - homepage = https://launchpad.net/libindicator; + homepage = "https://launchpad.net/libindicator"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 9be58ac537adf..e018c1a9f5eac 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -43,7 +43,7 @@ let }; meta = { - homepage = http://gobby.0x539.de/; + homepage = "http://gobby.0x539.de/"; description = "An implementation of the Infinote protocol written in GObject-based C"; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.phreedom ]; diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/development/libraries/libinotify-kqueue/default.nix index 75cd1a0050722..074d2954ef186 100644 --- a/pkgs/development/libraries/libinotify-kqueue/default.nix +++ b/pkgs/development/libraries/libinotify-kqueue/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Inotify shim for macOS and BSD"; - homepage = https://github.com/libinotify-kqueue/libinotify-kqueue; + homepage = "https://github.com/libinotify-kqueue/libinotify-kqueue"; license = licenses.mit; maintainers = with maintainers; [ yegortimoshenko ]; platforms = with platforms; darwin ++ freebsd ++ netbsd ++ openbsd; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 446c33e61e601..f490dfbd23a29 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libinput"; - version = "1.15.3"; + version = "1.15.5"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz"; - sha256 = "0kb9i1xav8hmrl6g0qdq7jii589i9sjjrbh43fsc5284smyl44jv"; + sha256 = "15ww4jl3lcxyi8m8idg8canklbqv729gnwpkz7r98c1w8a7zq3m9"; }; outputs = [ "bin" "out" "dev" ]; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; - homepage = http://www.freedesktop.org/wiki/Software/libinput; + homepage = "http://www.freedesktop.org/wiki/Software/libinput"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; diff --git a/pkgs/development/libraries/libinsane/default.nix b/pkgs/development/libraries/libinsane/default.nix index d37ae94265642..0b0f1b36edce9 100644 --- a/pkgs/development/libraries/libinsane/default.nix +++ b/pkgs/development/libraries/libinsane/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "libinsane"; - version = "1.0.3"; + version = "1.0.4"; outputs = [ "out" "dev" "devdoc" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "1x2pl4ahqjc6ql97v7fnyna0qrnw3bxmqg3lyi5biyajfhg9nvql"; + sha256 = "1qk0s4m87yqa75h27bl7m03g4gamln43wn4159h7dcnwc36hdzw6"; }; nativeBuildInputs = [ meson pkg-config ninja doxygen gtk-doc docbook_xsl gobject-introspection vala ]; diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index ad55c6cb18f37..c80a9bb1f9204 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "iODBC driver manager"; - homepage = http://www.iodbc.org; + homepage = "http://www.iodbc.org"; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix index fccf4b3d50f23..1b8aef201af58 100644 --- a/pkgs/development/libraries/libipfix/default.nix +++ b/pkgs/development/libraries/libipfix/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0h7v0sxjjdc41hl5vq2x0yhyn04bczl11bqm97825mivrvfymhn6"; }; meta = with stdenv.lib; { - homepage = http://libipfix.sourceforge.net/; + homepage = "http://libipfix.sourceforge.net/"; description = "The libipfix C-library implements the IPFIX protocol defined by the IP Flow Information Export working group of the IETF."; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/development/libraries/libipt/default.nix index 792a74da581e0..cb4db488dc428 100644 --- a/pkgs/development/libraries/libipt/default.nix +++ b/pkgs/development/libraries/libipt/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Intel Processor Trace decoder library"; - homepage = https://github.com/intel/libipt; + homepage = "https://github.com/intel/libipt"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/development/libraries/libiptcdata/default.nix index 8e1ca68a69e7f..01b23d9e2d28d 100644 --- a/pkgs/development/libraries/libiptcdata/default.nix +++ b/pkgs/development/libraries/libiptcdata/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for reading and writing the IPTC metadata in images and other files"; - homepage = http://libiptcdata.sourceforge.net/; + homepage = "http://libiptcdata.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix index 561a524827888..4bef2de28c059 100644 --- a/pkgs/development/libraries/libircclient/default.nix +++ b/pkgs/development/libraries/libircclient/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small but extremely powerful library which implements the client IRC protocol"; - homepage = http://www.ulduzsoft.com/libircclient/; + homepage = "http://www.ulduzsoft.com/libircclient/"; license = licenses.lgpl3; maintainers = with maintainers; [ obadz ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix index c6bb790646976..59f09c8d25387 100644 --- a/pkgs/development/libraries/libirecovery/default.nix +++ b/pkgs/development/libraries/libirecovery/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/libimobiledevice/libirecovery; + homepage = "https://github.com/libimobiledevice/libirecovery"; description = "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux"; longDescription = '' libirecovery is a cross-platform library which implements communication to diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix index 633f19cef798b..0b4984fc82a3e 100644 --- a/pkgs/development/libraries/libisoburn/default.nix +++ b/pkgs/development/libraries/libisoburn/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ acl ]; meta = with stdenv.lib; { - homepage = http://libburnia-project.org/; + homepage = "http://libburnia-project.org/"; description = "Enables creation and expansion of ISO-9660 filesystems on CD/DVD/BD "; license = licenses.gpl2Plus; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix index 2c1bb3b3b8e33..0c01389f0b82b 100644 --- a/pkgs/development/libraries/libisofs/default.nix +++ b/pkgs/development/libraries/libisofs/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ acl ]; meta = with stdenv.lib; { - homepage = http://libburnia-project.org/; + homepage = "http://libburnia-project.org/"; description = "A library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar vrthra ]; diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index 17cca74c7d29f..1226d1c489ef3 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ file protobufc ]; meta = with stdenv.lib; { - homepage = http://libivykis.sourceforge.net/; + homepage = "http://libivykis.sourceforge.net/"; description = '' A thin wrapper over various OS'es implementation of I/O readiness notification facilities diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix index 1790f3f68b2ad..e971136b088b3 100644 --- a/pkgs/development/libraries/libixp-hg/default.nix +++ b/pkgs/development/libraries/libixp-hg/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "libixp"; src = fetchurl { - url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/libixp/source-archive.zip; + url = "https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/libixp/source-archive.zip"; sha256 = "0kcdvdcrkw6q39v563ncis6d7ini64xbgn5fd3b4aa95fp9sj3is"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip txt2tags ]; meta = { - homepage = http://repo.cat-v.org/libixp/; # see also https://libs.suckless.org/deprecated/libixp + homepage = "http://repo.cat-v.org/libixp/"; # see also https://libs.suckless.org/deprecated/libixp description = "Portable, simple C-language 9P client and server libary"; maintainers = with stdenv.lib.maintainers; [ kovirobi ]; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix new file mode 100644 index 0000000000000..54ab31e2702b0 --- /dev/null +++ b/pkgs/development/libraries/libjcat/default.nix @@ -0,0 +1,84 @@ +{ stdenv +, fetchFromGitHub +, docbook_xml_dtd_43 +, docbook-xsl-nons +, glib +, json-glib +, gnutls +, gpgme +, gobject-introspection +, vala +, help2man +, gtk-doc +, meson +, ninja +, pkg-config +, python3 +, nixosTests +}: + +stdenv.mkDerivation rec { + pname = "libjcat"; + version = "0.1.2"; + + outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; + + src = fetchFromGitHub { + owner = "hughsie"; + repo = "libjcat"; + rev = version; + sha256 = "zb9zKEvYUOSyo/j6hXTYZlQOSLdMkkT2I+Pe/0wMrWo="; + }; + + patches = [ + # Installed tests are installed to different output + ./installed-tests-path.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + docbook_xml_dtd_43 + docbook-xsl-nons + gobject-introspection + vala + help2man + gtk-doc + (python3.withPackages (pkgs: with pkgs; [ + setuptools + ])) + ]; + + buildInputs = [ + glib + json-glib + gnutls + gpgme + ]; + + mesonFlags = [ + "-Dgtkdoc=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + ]; + + postPatch = '' + patchShebangs contrib/generate-version-script.py + ''; + + doCheck = true; + + passthru = { + tests = { + installed-tests = nixosTests.installed-tests.libjcat; + }; + }; + + meta = with stdenv.lib; { + description = "Library for reading and writing Jcat files"; + homepage = "https://github.com/hughsie/libjcat"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libjcat/installed-tests-path.patch b/pkgs/development/libraries/libjcat/installed-tests-path.patch new file mode 100644 index 0000000000000..d199f91385f5b --- /dev/null +++ b/pkgs/development/libraries/libjcat/installed-tests-path.patch @@ -0,0 +1,24 @@ +diff --git a/meson.build b/meson.build +index f69968d..d1d6c6e 100644 +--- a/meson.build ++++ b/meson.build +@@ -114,8 +114,8 @@ else + datadir = join_paths(prefix, get_option('datadir')) + localstatedir = join_paths(prefix, get_option('localstatedir')) + libexecdir = join_paths(prefix, get_option('libexecdir')) +- installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name()) +- installed_test_datadir = join_paths(datadir, 'installed-tests', meson.project_name()) ++ installed_test_bindir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name()) ++ installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name()) + endif + mandir = join_paths(prefix, get_option('mandir')) + localedir = join_paths(prefix, get_option('localedir')) +diff --git a/meson_options.txt b/meson_options.txt +index 4784300..d382fc1 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,3 +1,4 @@ ++option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') + option('gtkdoc', type : 'boolean', value : false, description : 'enable developer documentation') + option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data') + option('tests', type : 'boolean', value : true, description : 'enable tests') diff --git a/pkgs/development/libraries/libjpeg-drop/default.nix b/pkgs/development/libraries/libjpeg-drop/default.nix index 8ed1c9bf92fec..22cb1b1358979 100644 --- a/pkgs/development/libraries/libjpeg-drop/default.nix +++ b/pkgs/development/libraries/libjpeg-drop/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation { srcs = [ (fetchurl { - url = http://www.ijg.org/files/jpegsrc.v9b.tar.gz; + url = "http://www.ijg.org/files/jpegsrc.v9b.tar.gz"; sha256 = "0lnhpahgdwlrkd41lx6cr90r199f8mc6ydlh7jznj5klvacd63r4"; }) (fetchurl { - url = http://jpegclub.org/droppatch.v9b.tar.gz; + url = "http://jpegclub.org/droppatch.v9b.tar.gz"; sha256 = "022bnvpird7w5pwbfqpq7j7pwja5kp6x9k3sdypcy3g2nwwy2wwk"; }) ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation { outputs = [ "bin" "dev" "out" "man" ]; meta = { - homepage = http://jpegclub.org/jpegtran/; + homepage = "http://jpegclub.org/jpegtran/"; description = "Experimental lossless crop 'n' drop (cut & paste) patches for libjpeg"; license = stdenv.lib.licenses.free; }; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index f05ac6d521bf4..72d8b9677499a 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,16 +1,24 @@ -{ stdenv, fetchurl, cmake, nasm, enableStatic ? false }: +{ stdenv, fetchurl, fetchpatch, cmake, nasm, enableStatic ? false }: stdenv.mkDerivation rec { pname = "libjpeg-turbo"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1ds16bnj17v6hzd43w8pzijz3imd9am4hw75ir0fxm240m8dwij2"; + sha256 = "01ill8bgjyk582wipx7sh7gj2nidylpbzvwhx0wkcm6mxx3qbp9k"; }; patches = + [ + # Fixes race in tests that causes "jpegtran-shared-icc" to fail + # https://github.com/libjpeg-turbo/libjpeg-turbo/pull/425 + (fetchpatch { + url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/a2291b252de1413a13db61b21863ae7aea0946f3.patch"; + sha256 = "0nc5vcch5h52gpi07h08zf8br58q8x81q2hv871hrn0dinb53vym"; + }) + ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") ./mingw-boolean.patch; @@ -26,10 +34,10 @@ stdenv.mkDerivation rec { installCheckTarget = "test"; meta = with stdenv.lib; { - homepage = http://libjpeg-turbo.virtualgl.org/; + homepage = "http://libjpeg-turbo.virtualgl.org/"; description = "A faster (using SIMD) libjpeg implementation"; license = licenses.ijg; # and some parts under other BSD-style licenses - maintainers = [ maintainers.vcunat ]; + maintainers = with maintainers; [ vcunat colemickens ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index abd6c7bbf6c32..05fbb7de701ed 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "libjpeg-9d"; src = fetchurl { - url = http://www.ijg.org/files/jpegsrc.v9d.tar.gz; + url = "http://www.ijg.org/files/jpegsrc.v9d.tar.gz"; sha256 = "0clwys9lcqlxqgcw8s1gwfm5ix2zjlqpklmd3mbvqmj5ibj51jwr"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { outputs = [ "bin" "dev" "out" "man" ]; meta = { - homepage = http://www.ijg.org/; + homepage = "http://www.ijg.org/"; description = "A library that implements the JPEG image file format"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libjreen/default.nix b/pkgs/development/libraries/libjreen/default.nix index 9e81c93240571..141598839b06a 100644 --- a/pkgs/development/libraries/libjreen/default.nix +++ b/pkgs/development/libraries/libjreen/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ Jabber library using Qt framework"; - homepage = https://qutim.org/jreen/; + homepage = "https://qutim.org/jreen/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index a7c9427080d87..03d77c11bec33 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ framework for json-rpc (json remote procedure call)"; - homepage = https://github.com/cinemast/libjson-rpc-cpp; + homepage = "https://github.com/cinemast/libjson-rpc-cpp"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index b62f0f116a099..1d6fb1e72897e 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation { preInstall = "mkdir -p $out/lib"; meta = with stdenv.lib; { - homepage = http://libjson.sourceforge.net/; + homepage = "http://libjson.sourceforge.net/"; description = "A JSON reader and writer"; longDescription = '' A JSON reader and writer which is super-efficient and diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix index 7eff302397aaa..a999f813fbb4f 100644 --- a/pkgs/development/libraries/libkate/default.nix +++ b/pkgs/development/libraries/libkate/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { bitstream format. Kate is a karaoke and text codec meant for encapsulation in an Ogg container. It can carry Unicode text, images, and animate them.''; - homepage = https://code.google.com/archive/p/libkate/; + homepage = "https://code.google.com/archive/p/libkate/"; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index 12205a6a63b3c..b6aa19c442a73 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Musical key detection for digital audio (C++ library)"; - homepage = http://www.ibrahimshaath.co.uk/keyfinder/; + homepage = "http://www.ibrahimshaath.co.uk/keyfinder/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libkml/default.nix b/pkgs/development/libraries/libkml/default.nix index eca412fda6cb5..d619101c2331a 100644 --- a/pkgs/development/libraries/libkml/default.nix +++ b/pkgs/development/libraries/libkml/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Reference implementation of OGC KML 2.2"; - homepage = https://github.com/libkml/libkml; + homepage = "https://github.com/libkml/libkml"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index c83a3e40df27a..2f0da5edf4e13 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.gnupg.org; + homepage = "https://www.gnupg.org"; description = "CMS and X.509 access library"; platforms = platforms.all; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix index f155c0d850655..2701cc5135980 100644 --- a/pkgs/development/libraries/libksi/default.nix +++ b/pkgs/development/libraries/libksi/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/GuardTime/libksi; + homepage = "https://github.com/GuardTime/libksi"; description = "Keyless Signature Infrastructure API library"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index 04dabf14100cc..19c24ec375492 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A BitTorrent library used by KTorrent"; - homepage = https://www.kde.org/applications/internet/ktorrent/; + homepage = "https://www.kde.org/applications/internet/ktorrent/"; maintainers = with maintainers; [ eelco ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index ff1a39fc2049c..62409bb7f6495 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; meta = with stdenv.lib; { - homepage = https://github.com/lastfm/liblastfm; - repositories.git = git://github.com/lastfm/liblastfm.git; + homepage = "https://github.com/lastfm/liblastfm"; + repositories.git = "git://github.com/lastfm/liblastfm.git"; description = "Official LastFM library"; inherit (qt4.meta) platforms; maintainers = [ maintainers.phreedom ]; diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index c51cb9baead6c..46152e792763e 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; meta = { - homepage = http://liblastfm.sourceforge.net; + homepage = "http://liblastfm.sourceforge.net"; description = "Unofficial C lastfm library"; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/development/libraries/liblaxjson/default.nix index f185a44380ab5..b932f9e928b39 100644 --- a/pkgs/development/libraries/liblaxjson/default.nix +++ b/pkgs/development/libraries/liblaxjson/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for parsing JSON config files"; - homepage = https://github.com/andrewrk/liblaxjson; + homepage = "https://github.com/andrewrk/liblaxjson"; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.andrewrk ]; diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix index fe513d378cd85..82ac1b3144ea8 100644 --- a/pkgs/development/libraries/liblcf/default.nix +++ b/pkgs/development/libraries/liblcf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "liblcf"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "EasyRPG"; repo = "liblcf"; rev = version; - sha256 = "18kx9h004bncyi0hbj6vrc7f4k8l1rwp96cwncv3xm0lwspj0vyl"; + sha256 = "0b0bz9ydpc98mxbg78bgf8kil85kxyqgkzxgsjq7awzmyw7f3c1c"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to handle RPG Maker 2000/2003 and EasyRPG projects"; - homepage = https://github.com/EasyRPG/liblcf; + homepage = "https://github.com/EasyRPG/liblcf"; license = licenses.mit; maintainers = with maintainers; [ yegortimoshenko ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index a306eb2ed68f9..af09b1241de60 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for large linear classification"; - homepage = https://www.csie.ntu.edu.tw/~cjlin/liblinear/; + homepage = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/"; license = licenses.bsd3; maintainers = [ maintainers.danieldk ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index c6628e9043cd5..a0ee8fe00539f 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -140,6 +140,15 @@ stdenv.mkDerivation rec { pkgconfig ]; + # Some grammar files needed to be copied too from some dependencies. I suppose + # if one define a dependency in such a way that its share directory is found, + # then this copying would be unnecessary. Instead of actually copying these + # files, create a symlink. + postInstall = '' + mkdir -p $out/share/belr/grammars + ln -s ${belcard}/share/belr/grammars/* $out/share/belr/grammars/ + ''; + meta = with stdenv.lib; { homepage = "https://www.linphone.org/technical-corner/liblinphone"; description = "Library for SIP calls and instant messaging"; diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/development/libraries/liblockfile/default.nix index bfc9036abe32b..6ed995572ef35 100644 --- a/pkgs/development/libraries/liblockfile/default.nix +++ b/pkgs/development/libraries/liblockfile/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Shared library with NFS-safe locking functions"; - homepage = http://packages.debian.org/unstable/libs/liblockfile1; + homepage = "http://packages.debian.org/unstable/libs/liblockfile1"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix index d0aaebadbaad6..b9b787f418294 100644 --- a/pkgs/development/libraries/liblogging/default.nix +++ b/pkgs/development/libraries/liblogging/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.liblogging.org/; + homepage = "http://www.liblogging.org/"; description = "Lightweight signal-safe logging library"; license = licenses.bsd2; platforms = platforms.all; diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix index d77b452e3e925..bef1048dde46c 100644 --- a/pkgs/development/libraries/liblognorm/default.nix +++ b/pkgs/development/libraries/liblognorm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-regexp" ]; meta = with stdenv.lib; { - homepage = https://www.liblognorm.com/; + homepage = "https://www.liblognorm.com/"; description = "Help to make sense out of syslog data, or, actually, any event data that is present in text form"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index aa6922ea3421e..5f37989c20b8e 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib ]; meta = with stdenv.lib; { - homepage = http://liblqr.wikidot.com; + homepage = "http://liblqr.wikidot.com"; description = "Seam-carving C/C++ library called Liquid Rescaling"; platforms = platforms.all; license = with licenses; [ gpl3 lgpl3 ]; diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix index 471f277fb523a..101e11deaa51e 100644 --- a/pkgs/development/libraries/liblscp/default.nix +++ b/pkgs/development/libraries/liblscp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.linuxsampler.org; + homepage = "http://www.linuxsampler.org"; description = "LinuxSampler Control Protocol (LSCP) wrapper library"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/libltc/default.nix b/pkgs/development/libraries/libltc/default.nix index d6918ef304434..4513396d7eaf7 100644 --- a/pkgs/development/libraries/libltc/default.nix +++ b/pkgs/development/libraries/libltc/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation { name = "libltc-1.3.1"; src = fetchurl { - url = https://github.com/x42/libltc/releases/download/v1.3.1/libltc-1.3.1.tar.gz; + url = "https://github.com/x42/libltc/releases/download/v1.3.1/libltc-1.3.1.tar.gz"; sha256 = "173h9dgmain3nyrwk6q2d7yl4fnh4vacag4s2p01n5b7nyrkxrjh"; }; meta = with stdenv.lib; { - homepage = http://x42.github.io/libltc/; + homepage = "http://x42.github.io/libltc/"; description = "POSIX-C Library for handling Linear/Logitudinal Time Code (LTC)"; license = licenses.lgpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 24de4aa2e4a00..84800f309fb4b 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { preConfigure = "autoconf"; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/mad/; + homepage = "https://sourceforge.net/projects/mad/"; description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 93bf193a972b3..67ee59b61071b 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { description = "A simple GObject game controller library"; homepage = "https://gitlab.gnome.org/aplazas/libmanette"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix index 98875e48f57f6..49769359ed328 100644 --- a/pkgs/development/libraries/libmatchbox/default.nix +++ b/pkgs/development/libraries/libmatchbox/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Library of the matchbox X window manager"; - homepage = http://matchbox-project.org/; + homepage = "http://matchbox-project.org/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix index 7f5c8b4c4c259..a24b931c66058 100644 --- a/pkgs/development/libraries/libmatheval/default.nix +++ b/pkgs/development/libraries/libmatheval/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { mathematical functions. In addition to parsing and evaluation, libmatheval can also compute symbolic derivatives and output expressions to strings. ''; - homepage = https://www.gnu.org/software/libmatheval/; + homepage = "https://www.gnu.org/software/libmatheval/"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.bzizou ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index b10a62fd389ab..2d56a6db766e2 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to parse Matroska files"; - homepage = https://matroska.org/; + homepage = "https://matroska.org/"; license = licenses.lgpl21; maintainers = with maintainers; [ spwhitt ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix index 5cf12ea46ba0e..493f1b5ce6147 100644 --- a/pkgs/development/libraries/libmaxminddb/default.nix +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C library for working with MaxMind geolocation DB files"; - homepage = https://github.com/maxmind/libmaxminddb; + homepage = "https://github.com/maxmind/libmaxminddb"; license = licenses.asl20; platforms = platforms.all; maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index a0751e310d430..9e40133170aae 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://www.freedesktop.org/wiki/Software/libmbim/; + homepage = "https://www.freedesktop.org/wiki/Software/libmbim/"; description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix index 4a4074e2f2296..a29fca45a99f5 100644 --- a/pkgs/development/libraries/libmcrypt/default.nix +++ b/pkgs/development/libraries/libmcrypt/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "libmcrypt-2.5.8"; src = fetchurl { - url = mirror://sourceforge/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz; + url = "mirror://sourceforge/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz"; sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Replacement for the old crypt() package and crypt(1) command, with extensions"; - homepage = http://mcrypt.sourceforge.net; + homepage = "http://mcrypt.sourceforge.net"; license = "GPL"; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix index 20a63fd6eb03c..38adebb2a4877 100644 --- a/pkgs/development/libraries/libmediaart/default.nix +++ b/pkgs/development/libraries/libmediaart/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library tasked with managing, extracting and handling media art caches"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index 5655bfe968b9d..8cbb76377fb0c 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libmemcached-1.0.18"; src = fetchurl { - url = https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz; + url = "https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz"; sha256 = "10jzi14j32lpq0if0p9vygcl2c1352hwbywzvr9qzq7x6aq0nb72"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-fpermissive"; meta = with stdenv.lib; { - homepage = https://libmemcached.org; + homepage = "https://libmemcached.org"; description = "Open source C/C++ client library and tools for the memcached server"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix index de09d142d481d..e8fab86f8fc6a 100644 --- a/pkgs/development/libraries/libmesode/default.nix +++ b/pkgs/development/libraries/libmesode/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { Whilst Profanity will run against libstrophe, libmesode provides extra TLS functionality such as manual SSL certificate verification. ''; - homepage = https://github.com/boothj5/libmesode/; + homepage = "https://github.com/boothj5/libmesode/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/development/libraries/libmhash/default.nix b/pkgs/development/libraries/libmhash/default.nix index 598f0b7f78985..2a61c57106693 100644 --- a/pkgs/development/libraries/libmhash/default.nix +++ b/pkgs/development/libraries/libmhash/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { following rfc2104 (HMAC). It also includes some key generation algorithms which are based on hash algorithms. ''; - homepage = http://mhash.sourceforge.net; + homepage = "http://mhash.sourceforge.net"; license = "LGPL"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libmicrodns/default.nix b/pkgs/development/libraries/libmicrodns/default.nix index 41d81f1f17663..0728dddcb4df6 100644 --- a/pkgs/development/libraries/libmicrodns/default.nix +++ b/pkgs/development/libraries/libmicrodns/default.nix @@ -1,28 +1,30 @@ { stdenv , fetchFromGitHub -, autoreconfHook +, meson +, ninja , pkgconfig }: stdenv.mkDerivation rec { - version = "0.1.0"; + version = "0.1.2"; pname = "libmicrodns"; src = fetchFromGitHub { owner = "videolabs"; repo = pname; rev = version; - sha256 = "1pmf461zn35spbpbls1ih68ki7f8g8xjwhzr2csy63nnyq2k9jji"; + sha256 = "1yb0j0acidp494d28wqhzhrfski2qjb2a5mp5bq5qrpcg38zyz6i"; }; nativeBuildInputs = [ - autoreconfHook + meson + ninja pkgconfig ]; meta = with stdenv.lib; { description = "Minimal mDNS resolver library, used by VLC"; - homepage = https://github.com/videolabs/libmicrodns; + homepage = "https://github.com/videolabs/libmicrodns"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = [ maintainers.shazow ]; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index e3bce805d291d..c160b678be74c 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; - homepage = https://www.gnu.org/software/libmicrohttpd/; + homepage = "https://www.gnu.org/software/libmicrohttpd/"; maintainers = with maintainers; [ eelco vrthra fpletz ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index 284d415454deb..59967bcba5a23 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for playing tracker music module files"; - homepage = https://mikmod.shlomifish.org/; + homepage = "https://mikmod.shlomifish.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ astsmtl lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/development/libraries/libmkv/default.nix index 8b659c46792f9..190c573577a52 100644 --- a/pkgs/development/libraries/libmkv/default.nix +++ b/pkgs/development/libraries/libmkv/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6.5.1"; src = fetchgit { - url = https://github.com/saintdev/libmkv.git; + url = "https://github.com/saintdev/libmkv.git"; rev = "refs/tags/${version}"; sha256 = "0pr9q7yprndl8d15ir7i7cznvmf1yqpvnsyivv763n6wryssq6dl"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { Library was meant to be an alternative to the official libmatroska library. It is written in plain C, and intended to be very portable. ''; - homepage = https://github.com/saintdev/libmkv; + homepage = "https://github.com/saintdev/libmkv"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.wmertens ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/development/libraries/libmms/default.nix index 7f73fb09cd16a..3753101ebf984 100644 --- a/pkgs/development/libraries/libmms/default.nix +++ b/pkgs/development/libraries/libmms/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for downloading (streaming) media files using the mmst and mmsh protocols"; - homepage = http://libmms.sourceforge.net; + homepage = "http://libmms.sourceforge.net"; platforms = platforms.all; license = licenses.lgpl21; }; diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index 749a5d60e4674..e13bda5679324 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics"; - homepage = http://www.libmng.com; + homepage = "http://www.libmng.com"; license = licenses.zlib; maintainers = with maintainers; [ marcweber ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix index 7c4b451ae6d1a..3db6ab0da0811 100644 --- a/pkgs/development/libraries/libmnl/default.nix +++ b/pkgs/development/libraries/libmnl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { This library aims to provide simple helpers that allows you to re-use code and to avoid re-inventing the wheel. ''; - homepage = https://netfilter.org/projects/libmnl/index.html; + homepage = "https://netfilter.org/projects/libmnl/index.html"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/development/libraries/libmodbus/default.nix index e18de4127a4a8..14f80e9b2e5a6 100644 --- a/pkgs/development/libraries/libmodbus/default.nix +++ b/pkgs/development/libraries/libmodbus/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to send/receive data according to the Modbus protocol"; - homepage = https://libmodbus.org/; + homepage = "https://libmodbus.org/"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libmodule/default.nix b/pkgs/development/libraries/libmodule/default.nix index 26b81d4d41299..d608a08d2d920 100644 --- a/pkgs/development/libraries/libmodule/default.nix +++ b/pkgs/development/libraries/libmodule/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C simple and elegant implementation of an actor library"; - homepage = https://github.com/FedeDP/libmodule; + homepage = "https://github.com/FedeDP/libmodule"; platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/pkgs/development/libraries/libmongo-client/default.nix index 30cb8c9df2ffa..b3231d1af91ce 100644 --- a/pkgs/development/libraries/libmongo-client/default.nix +++ b/pkgs/development/libraries/libmongo-client/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://algernon.github.io/libmongo-client/; + homepage = "http://algernon.github.io/libmongo-client/"; description = "An alternative C driver for MongoDB"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix index 99f04bc09de7f..ae3a9efef24f5 100644 --- a/pkgs/development/libraries/libmowgli/default.nix +++ b/pkgs/development/libraries/libmowgli/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A development framework for C providing high performance and highly flexible algorithms"; - homepage = https://github.com/atheme/libmowgli-2; + homepage = "https://github.com/atheme/libmowgli-2"; license = licenses.isc; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix index 52072000115ce..237e3f94cfc9f 100644 --- a/pkgs/development/libraries/libmp3splt/default.nix +++ b/pkgs/development/libraries/libmp3splt/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-pcre" ]; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/mp3splt/; + homepage = "https://sourceforge.net/projects/mp3splt/"; description = "Utility to split mp3, ogg vorbis and FLAC files without decoding"; maintainers = with maintainers; [ bosu ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix index e8392f88ac7ad..736474d29a5ff 100644 --- a/pkgs/development/libraries/libmpack/default.nix +++ b/pkgs/development/libraries/libmpack/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "libmpack"; version = "1.0.5"; src = fetchFromGitHub { - owner = "tarruda"; + owner = "libmpack"; repo = "libmpack"; rev = version; sha256 = "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple implementation of msgpack in C"; - homepage = https://github.com/tarruda/libmpack/; + homepage = "https://github.com/tarruda/libmpack/"; license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index 9ffbc95b1fd14..235474c0ca1f7 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { built upon and follows the same principles as GNU MPFR. ''; - homepage = http://mpc.multiprecision.org/; + homepage = "http://mpc.multiprecision.org/"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/pkgs/development/libraries/libmpcdec/default.nix index a5a4d68ad9691..3ee37e6ae9c6b 100644 --- a/pkgs/development/libraries/libmpcdec/default.nix +++ b/pkgs/development/libraries/libmpcdec/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libmpcdec-1.2.6"; src = fetchurl { - url = https://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2; + url = "https://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2"; sha256 = "1a0jdyga1zfi4wgkg3905y6inghy3s4xfs5m4x7pal08m0llkmab"; }; diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix index 2351ce2b5549f..d6fb28c0e88c0 100644 --- a/pkgs/development/libraries/libmpeg2/default.nix +++ b/pkgs/development/libraries/libmpeg2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildFlags = stdenv.lib.optional stdenv.isDarwin "CFLAGS=-std=gnu89"; meta = { - homepage = http://libmpeg2.sourceforge.net/; + homepage = "http://libmpeg2.sourceforge.net/"; description = "A free library for decoding mpeg-2 and mpeg-1 video streams"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix index f1a061e5ab585..aa70e4c4ddff3 100644 --- a/pkgs/development/libraries/libmrss/default.nix +++ b/pkgs/development/libraries/libmrss/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ curl libnxml ]; meta = { - homepage = http://www.autistici.org/bakunin/libmrss/doc; + homepage = "http://www.autistici.org/bakunin/libmrss/doc"; description = "C library for parsing, writing and creating RSS/ATOM files or streams"; license = stdenv.lib.licenses.lgpl2; diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index 2cb4cd3cd9bf8..70fdd7e913ed6 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "A de/compression library for various Microsoft formats"; - homepage = https://www.cabextract.org.uk/libmspack; + homepage = "https://www.cabextract.org.uk/libmspack"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index c8c34eb1c9c5f..21bde84181b42 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-udev=$$bin/lib/udev" ]; meta = with stdenv.lib; { - homepage = http://libmtp.sourceforge.net; + homepage = "http://libmtp.sourceforge.net"; description = "An implementation of Microsoft's Media Transfer Protocol"; longDescription = '' libmtp is an implementation of Microsoft's Media Transfer Protocol (MTP) diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix index 05532df1abd4e..2fdcdc7d86d6b 100644 --- a/pkgs/development/libraries/libmusicbrainz/5.x.nix +++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { dontUseCmakeBuildDir=true; meta = with stdenv.lib; { - homepage = http://musicbrainz.org/doc/libmusicbrainz; + homepage = "http://musicbrainz.org/doc/libmusicbrainz"; description = "MusicBrainz Client Library (5.x version)"; longDescription = '' The libmusicbrainz (also known as mb_client or MusicBrainz Client diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix index 5335b6577f0a6..0db539a23afe7 100644 --- a/pkgs/development/libraries/libmusicbrainz/default.nix +++ b/pkgs/development/libraries/libmusicbrainz/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://musicbrainz.org/doc/libmusicbrainz; + homepage = "http://musicbrainz.org/doc/libmusicbrainz"; description = "MusicBrainz Client Library (3.x version)"; longDescription = '' The libmusicbrainz (also known as mb_client or MusicBrainz Client diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index a7e52376e3f59..fbba02fcd0c50 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libmwaw"; - version="0.3.15"; + version="0.3.16"; name="${baseName}-${version}"; - hash="1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04"; - url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.15/libmwaw-0.3.15.tar.xz"; - sha256="1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04"; + hash="0s0qvrmxzs8wv4304p7zx9mrasglyaszafqrfmaxwyr9lpdrwqqc"; + url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.16/libmwaw-0.3.16.tar.xz"; + sha256="0s0qvrmxzs8wv4304p7zx9mrasglyaszafqrfmaxwyr9lpdrwqqc"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index 483c5ff1ff7fa..623c872fa1ac5 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.clutter-project.org/; + homepage = "http://www.clutter-project.org/"; description = "A Clutter-based toolkit"; longDescription = ''Mx is a widget toolkit using Clutter that provides a set of standard diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix index 409867695fc05..5cb971f5db894 100644 --- a/pkgs/development/libraries/libmypaint/default.nix +++ b/pkgs/development/libraries/libmypaint/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libmypaint"; - version = "1.5.1"; + version = "1.6.0"; outputs = [ "out" "dev" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "mypaint"; repo = "libmypaint"; rev = "v${version}"; - sha256 = "1pxx8fjdabcindxhzgbhg4p7yanl4ihbd8kq71y2nyi9dqsjr2fw"; + sha256 = "1fdyywm915mmilfmzp7lz4rnmm05kkw0adrdqpqi4n8icp4d530g"; }; nativeBuildInputs = [ @@ -43,10 +43,6 @@ stdenv.mkDerivation rec { doCheck = true; - postPatch = '' - sed 's|python2|python|' -i autogen.sh - ''; - preConfigure = "./autogen.sh"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 898c659d0f735..71fbda7b47137 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.0.19"; + version = "8.0.20"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - sha256 = "fDvXTOZKkwDn1IG3aziK2VAXpSSAxpi3VVea7GLUoh4="; + sha256 = "1jrrbfy6sw4pni72c1hgvchx1zzfpnamp34sjnv82mlvsp8ypsjh"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix index 695d46ba38ff5..a2aae1263597c 100644 --- a/pkgs/development/libraries/libnatpmp/default.nix +++ b/pkgs/development/libraries/libnatpmp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLPREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://miniupnp.free.fr/libnatpmp.html; + homepage = "http://miniupnp.free.fr/libnatpmp.html"; description = "NAT-PMP client"; license = licenses.bsd3; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index db4f6f5d46886..8ac2859faeda9 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (rec { buildInputs = [ popt ]; meta = with stdenv.lib; { - homepage = http://natspec.sourceforge.net/ ; + homepage = "http://natspec.sourceforge.net/"; description = "A library intended to smooth national specificities in using of programs"; platforms = platforms.unix; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index 613103db69f26..7a8d1877bc7ed 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libndctl"; - version = "67"; + version = "68"; src = fetchFromGitHub { owner = "pmem"; repo = "ndctl"; rev = "v${version}"; - sha256 = "076jgw1g2aafqgnq705in0wnabysqk46dq5yxdv1qzgjmyhka39n"; + sha256 = "0xmim7z4qp6x2ggndnbwd940c73pa1qlf3hxyn3qh5pyr69nh9y8"; }; outputs = [ "out" "lib" "man" "dev" ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools for managing the Linux Non-Volatile Memory Device sub-system"; - homepage = https://github.com/pmem/ndctl; + homepage = "https://github.com/pmem/ndctl"; license = licenses.lgpl21; maintainers = with maintainers; [ thoughtpolice ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libndp/default.nix b/pkgs/development/libraries/libndp/default.nix index 78304246f12b1..2592b7184f8ea 100644 --- a/pkgs/development/libraries/libndp/default.nix +++ b/pkgs/development/libraries/libndp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://libndp.org/; + homepage = "http://libndp.org/"; description = "Library for Neighbor Discovery Protocol"; platforms = platforms.linux; maintainers = [ maintainers.lethalman ]; diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix index a522c72fc7667..ffb2f56d67e09 100644 --- a/pkgs/development/libraries/libndtypes/default.nix +++ b/pkgs/development/libraries/libndtypes/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Dynamic types for data description and in-memory computations"; - homepage = https://xnd.io/; + homepage = "https://xnd.io/"; license = licenses.bsdOriginal; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix index 75cea00414359..7987fccc06fb0 100644 --- a/pkgs/development/libraries/libnet/default.nix +++ b/pkgs/development/libraries/libnet/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-includes.patch ]; meta = with stdenv.lib; { - homepage = https://github.com/sam-github/libnet; + homepage = "https://github.com/sam-github/libnet"; description = "Portable framework for low-level network packet construction"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/development/libraries/libnetfilter_acct/default.nix index 328688612b633..d33782ad7e583 100644 --- a/pkgs/development/libraries/libnetfilter_acct/default.nix +++ b/pkgs/development/libraries/libnetfilter_acct/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmnl ]; meta = with stdenv.lib; { - homepage = http://www.netfilter.org/projects/libnetfilter_acct/; + homepage = "http://www.netfilter.org/projects/libnetfilter_acct/"; description = "Userspace library providing interface to extended accounting infrastructure."; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index 85fbf458ac206..851357f6404f4 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libnetfilter_conntrack"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${pname}-${version}.tar.bz2"; - sha256 = "1dl9z50yny04xi5pymlykwmy6hcfc9p4nd7m47697zwxw98m6s1k"; + sha256 = "1ky1mqgnplw2h9jf0kn0a69d94jkydhbiipng9l2hdcj13h3pl8c"; }; buildInputs = [ libmnl ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { previously known as libnfnetlink_conntrack and libctnetlink. This library is currently used by conntrack-tools among many other applications ''; - homepage = https://netfilter.org/projects/libnetfilter_conntrack/; + homepage = "https://netfilter.org/projects/libnetfilter_conntrack/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix index 563843cca4695..ca16719898994 100644 --- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix +++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { library, you register, configure, enable and disable user-space helpers. This library is used by conntrack-tools. ''; - homepage = http://www.netfilter.org/projects/libnetfilter_cthelper/; + homepage = "http://www.netfilter.org/projects/libnetfilter_cthelper/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix index 9f706d619c3ad..64bcc08ffb911 100644 --- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix +++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { With this library, you can create, update and delete timeout policies that can be attached to traffic flows. This library is used by conntrack-tools. ''; - homepage = https://netfilter.org/projects/libnetfilter_cttimeout/; + homepage = "https://netfilter.org/projects/libnetfilter_cttimeout/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix index 2b932bc080970..18346814750bc 100644 --- a/pkgs/development/libraries/libnetfilter_log/default.nix +++ b/pkgs/development/libraries/libnetfilter_log/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { system that deprecates the old syslog/dmesg based packet logging. This library has been previously known as libnfnetlink_log. ''; - homepage = https://netfilter.org/projects/libnetfilter_log/; + homepage = "https://netfilter.org/projects/libnetfilter_log/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index 5f84bc03f82f5..556db28f85688 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmnl libnfnetlink ]; meta = with stdenv.lib; { - homepage = http://www.netfilter.org/projects/libnetfilter_queue/; + homepage = "http://www.netfilter.org/projects/libnetfilter_queue/"; description = "Userspace API to packets queued by the kernel packet filter"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix index 3d069d7a168d5..ed7412d661100 100644 --- a/pkgs/development/libraries/libnfc/default.nix +++ b/pkgs/development/libraries/libnfc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb, readline }: +{ stdenv, fetchurl, libusb-compat-0_1, readline }: stdenv.mkDerivation { pname = "libnfc"; @@ -9,12 +9,12 @@ stdenv.mkDerivation { sha256 = "0wj0iwwcpmpalyk61aa7yc6i4p9hgdajkrgnlswgk0vnwbc78pll"; }; - buildInputs = [ libusb readline ]; + buildInputs = [ libusb-compat-0_1 readline ]; meta = with stdenv.lib; { description = "Open source library libnfc for Near Field Communication"; license = licenses.gpl3; - homepage = https://github.com/nfc-tools/libnfc; + homepage = "https://github.com/nfc-tools/libnfc"; maintainers = with maintainers; [offline]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix index fa6461d869195..ecce38ac23e38 100644 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { This library is not meant as a public API for application developers. It is only used by other netfilter.org projects, like the aforementioned ones. ''; - homepage = http://www.netfilter.org/projects/libnfnetlink/index.html; + homepage = "http://www.netfilter.org/projects/libnfnetlink/index.html"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix index d2848d9a1e9bb..03a4dbe02d5f7 100644 --- a/pkgs/development/libraries/libnfs/default.nix +++ b/pkgs/development/libraries/libnfs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "NFS client library"; - homepage = https://github.com/sahlberg/libnfs; + homepage = "https://github.com/sahlberg/libnfs"; license = with licenses; [ lgpl2 bsd2 gpl3 ]; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index a4f98eed4177f..4aac04a4d028f 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem"; - homepage = http://netfilter.org/projects/libnftnl; + homepage = "http://netfilter.org/projects/libnftnl"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index ffecfcb61d09b..3f5ba26d5a4b0 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The Next Generation Spice (Electronic Circuit Simulator)"; - homepage = http://ngspice.sourceforge.net; + homepage = "http://ngspice.sourceforge.net"; license = with licenses; [ bsd3 gpl2Plus lgpl2Plus ]; # See https://sourceforge.net/p/ngspice/ngspice/ci/master/tree/COPYING maintainers = with maintainers; [ bgamari ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 90bdb06bb7f64..d2333ac0ca59e 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # Note: upstream is not willing to merge our fix # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/35#note_98871 (fetchpatch { - url = https://gitlab.freedesktop.org/libnice/libnice/commit/d470c4bf4f2449f7842df26ca1ce1efb63452bc6.patch; + url = "https://gitlab.freedesktop.org/libnice/libnice/commit/d470c4bf4f2449f7842df26ca1ce1efb63452bc6.patch"; sha256 = "0z74vizf92flfw1m83p7yz824vfykmnm0xbnk748bnnyq186i6mg"; }) ]; diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix index 4049a18145c72..0c38a9c17d7c3 100644 --- a/pkgs/development/libraries/libnih/default.nix +++ b/pkgs/development/libraries/libnih/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "A small library for C application development"; - homepage = https://launchpad.net/libnih; + homepage = "https://launchpad.net/libnih"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index aacadc5ea0ad3..01a89f16c2a15 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -51,10 +51,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://developer.gnome.org/notification-spec/; + homepage = "https://developer.gnome.org/notification-spec/"; description = "A library that sends desktop notifications to a notification daemon"; platforms = platforms.unix; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix index cb70d803ac0c6..413e404ce1ddf 100644 --- a/pkgs/development/libraries/libnova/default.nix +++ b/pkgs/development/libraries/libnova/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Celestial Mechanics, Astrometry and Astrodynamics Library"; - homepage = http://libnova.sf.net; + homepage = "http://libnova.sf.net"; platforms = platforms.unix; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/development/libraries/libnsl/default.nix index 790064847432d..1e925eb7b4763 100644 --- a/pkgs/development/libraries/libnsl/default.nix +++ b/pkgs/development/libraries/libnsl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Client interface library for NIS(YP) and NIS+"; - homepage = https://github.com/thkukuk/libnsl; + homepage = "https://github.com/thkukuk/libnsl"; license = licenses.lgpl21; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libnxml/default.nix b/pkgs/development/libraries/libnxml/default.nix index 0a6c58c8a0152..dc5e8dfc55e9a 100644 --- a/pkgs/development/libraries/libnxml/default.nix +++ b/pkgs/development/libraries/libnxml/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ curl ]; meta = { - homepage = https://www.autistici.org/bakunin/libnxml/; + homepage = "https://www.autistici.org/bakunin/libnxml/"; description = "C library for parsing, writing and creating XML 1.0 and 1.1 files or streams"; license = stdenv.lib.licenses.lgpl2; diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index 46e3e65ff80b4..c816bdc90e577 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; description = "C library implementing the OAuth secure authentication protocol"; - homepage = http://liboauth.sourceforge.net/; - repositories.git = https://github.com/x42/liboauth.git; + homepage = "http://liboauth.sourceforge.net/"; + repositories.git = "https://github.com/x42/liboauth.git"; license = licenses.mit; }; diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index 7dc23aa1e8ae4..c24023380340e 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ expat curl fftw ]; meta = with stdenv.lib; { - homepage = https://code.google.com/archive/p/musicip-libofa/; + homepage = "https://code.google.com/archive/p/musicip-libofa/"; description = "Library Open Fingerprint Architecture"; longDescription = '' LibOFA (Library Open Fingerprint Architecture) is an open-source audio diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 76276f0ce0fc8..692bddeab7dd6 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Opensource implementation of the Open Financial eXchange specification"; - homepage = http://libofx.sourceforge.net/; + homepage = "http://libofx.sourceforge.net/"; license = "LGPL"; platforms = stdenv.lib.platforms.unix; maintainers = [ ]; diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index 4f7c5f38123dd..50950a15a8700 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { Ogg is flexible file storage and streaming format that supports plethora of codecs. Open format free for anyone to use. ''; - homepage = https://xiph.org/ogg/; + homepage = "https://xiph.org/ogg/"; license = licenses.bsd3; maintainers = [ maintainers.ehmry ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix index d7c3b747924a8..07613f0564b00 100644 --- a/pkgs/development/libraries/liboggz/default.nix +++ b/pkgs/development/libraries/liboggz/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { - homepage = https://xiph.org/oggz/; + homepage = "https://xiph.org/oggz/"; description = "A C library and tools for manipulating with Ogg files and streams"; longDescription = '' Oggz comprises liboggz and the tool oggz, which provides commands to diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index fb2dad605252c..22adceccecf22 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library of simple functions that are optimized for various CPUs"; - homepage = https://liboil.freedesktop.org; + homepage = "https://liboil.freedesktop.org"; license = licenses.bsd2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 4d45c6872e4c6..5f583d53abfe3 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds"; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/omxil/; + homepage = "https://sourceforge.net/projects/omxil/"; description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/development/libraries/liboop/default.nix b/pkgs/development/libraries/liboop/default.nix index 73d51ec49ffce..6438fd5eb3229 100644 --- a/pkgs/development/libraries/liboop/default.nix +++ b/pkgs/development/libraries/liboop/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { name = "liboop-1.0"; src = fetchurl { - url = http://download.ofb.net/liboop/liboop.tar.gz; + url = "http://download.ofb.net/liboop/liboop.tar.gz"; sha256 = "34d83c6e0f09ee15cb2bc3131e219747c3b612bb57cf7d25318ab90da9a2d97c"; }; meta = { description = "Event loop library"; - homepage = http://liboop.ofb.net/; + homepage = "http://liboop.ofb.net/"; license = "LGPL"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index aa307f68ca00e..8db034683dc7e 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A library from binutils for manipulating machine code"; - homepage = https://www.gnu.org/software/binutils/; + homepage = "https://www.gnu.org/software/binutils/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ericson2314 ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libopenaptx/default.nix b/pkgs/development/libraries/libopenaptx/default.nix index 4ad1e2b773581..d9ccf77ea9285 100644 --- a/pkgs/development/libraries/libopenaptx/default.nix +++ b/pkgs/development/libraries/libopenaptx/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Audio Processing Technology codec (aptX)"; license = licenses.lgpl21Plus; - homepage = https://github.com/pali/libopenaptx; + homepage = "https://github.com/pali/libopenaptx"; platforms = platforms.linux; maintainers = with maintainers; [ orivej ]; }; diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix index b2594d7c1d700..1b2d83b84d0a3 100644 --- a/pkgs/development/libraries/liboping/default.nix +++ b/pkgs/development/libraries/liboping/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { Included is a sample application, called oping, which demonstrates the library's abilities. ''; - homepage = http://noping.cc/; + homepage = "http://noping.cc/"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 01da76749baba..27e9a89fcef4e 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open, royalty-free, highly versatile audio codec"; license = stdenv.lib.licenses.bsd3; - homepage = http://www.opus-codec.org/; + homepage = "http://www.opus-codec.org/"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix index 9b91e32f22852..f26349bd48890 100644 --- a/pkgs/development/libraries/libopusenc/default.nix +++ b/pkgs/development/libraries/libopusenc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Library for encoding .opus audio files and live streams"; license = licenses.bsd3; - homepage = http://www.opus-codec.org/; + homepage = "http://www.opus-codec.org/"; platforms = platforms.unix; maintainers = with maintainers; [ pmiddend ]; }; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 859f39239f361..39a3bf6b2c558 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -68,14 +68,15 @@ stdenv.mkDerivation rec { "-Denable-gtk-doc=true" ]; - # FIXME: fails two new tests added in 1.7.1: - # libosinfo:symbols / check-symfile - # 3/24 libosinfo:symbols / check-symsorting - doCheck = false; + preCheck = '' + patchShebangs ../osinfo/check-symfile.pl ../osinfo/check-symsorting.pl + ''; + + doCheck = true; meta = with stdenv.lib; { description = "GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support"; - homepage = https://libosinfo.org/; + homepage = "https://libosinfo.org/"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index e6abe620aaf01..29edf37d80ef4 100644 --- a/pkgs/development/libraries/libosmium/default.nix +++ b/pkgs/development/libraries/libosmium/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libosmium"; - version = "2.15.4"; + version = "2.15.5"; src = fetchFromGitHub { owner = "osmcode"; repo = "libosmium"; rev = "v${version}"; - sha256 = "0mlcvqrhp40bzj5r5j9nfc5vbis8hmzcq9xi8jylkciyydaynhz4"; + sha256 = "1f21dzzkxzi74hv17fs9kb2w6indqvvm4lkxclz4j4x98k8q3n59"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix index 416101cad0aa6..d1f6ea5c2ea3b 100644 --- a/pkgs/development/libraries/libosmpbf/default.nix +++ b/pkgs/development/libraries/libosmpbf/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { installFlags = [ "PREFIX=$(out)" ]; meta = { - homepage = https://github.com/scrosby/OSM-binary; + homepage = "https://github.com/scrosby/OSM-binary"; description = "C library to read and write OpenStreetMap PBF files"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index 47d9c4215fdf1..15b6da0ac5bcb 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { patches = [ ./shtool.patch ]; meta = with stdenv.lib; { - homepage = http://www.ossp.org/pkg/lib/uuid/; + homepage = "http://www.ossp.org/pkg/lib/uuid/"; description = "OSSP uuid ISO-C and C++ shared library"; longDescription = '' diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index db79bad745f08..10619f9682bf4 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libgcrypt ]; meta = with stdenv.lib; { - homepage = http://www.cypherpunks.ca/otr/; - repositories.git = git://git.code.sf.net/p/otr/libotr; + homepage = "http://www.cypherpunks.ca/otr/"; + repositories.git = "git://git.code.sf.net/p/otr/libotr"; license = licenses.lgpl21; description = "Library for Off-The-Record Messaging"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libow/default.nix b/pkgs/development/libraries/libow/default.nix index b9eedc4cd95d2..1f67e1fc791b7 100644 --- a/pkgs/development/libraries/libow/default.nix +++ b/pkgs/development/libraries/libow/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "1-Wire File System full library"; - homepage = https://owfs.org/; + homepage = "https://owfs.org/"; license = licenses.gpl2; maintainers = with maintainers; [ disserman ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix index 73029c76818b0..5f434a7ae75bb 100644 --- a/pkgs/development/libraries/libowfat/default.nix +++ b/pkgs/development/libraries/libowfat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A GPL reimplementation of libdjb"; - homepage = https://www.fefe.de/libowfat/; + homepage = "https://www.fefe.de/libowfat/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix index 903aa66ce60d1..4bf0b020118d5 100644 --- a/pkgs/development/libraries/libp11/default.nix +++ b/pkgs/development/libraries/libp11/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier"; - homepage = https://github.com/OpenSC/libp11; + homepage = "https://github.com/OpenSC/libp11"; license = licenses.lgpl21Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libpam-wrapper/default.nix b/pkgs/development/libraries/libpam-wrapper/default.nix new file mode 100644 index 0000000000000..f8359cded93a3 --- /dev/null +++ b/pkgs/development/libraries/libpam-wrapper/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, fetchgit +, cmake +, linux-pam +, enablePython ? false +, python ? null +}: + +assert enablePython -> python != null; + +stdenv.mkDerivation rec { + pname = "libpam-wrapper"; + version = "1.1.3"; + + src = fetchgit { + url = "git://git.samba.org/pam_wrapper.git"; + rev = "pam_wrapper-${version}"; + sha256 = "00mqhsashx7njrvxz085d0b88nizhdy7m3x17ip5yhvwsl63km6p"; + }; + + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional enablePython [ python ]; + + # We must use linux-pam, using openpam will result in broken fprintd. + buildInputs = [ linux-pam ]; + + meta = with stdenv.lib; { + description = "Wrapper for testing PAM modules"; + homepage = "https://cwrap.org/pam_wrapper.html"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.elyhaka ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix index 3c37cf8249599..28c6030a0ffba 100644 --- a/pkgs/development/libraries/libpaper/default.nix +++ b/pkgs/development/libraries/libpaper/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for handling paper characteristics"; - homepage = http://packages.debian.org/unstable/source/libpaper; + homepage = "http://packages.debian.org/unstable/source/libpaper"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index bbdce71bad6ae..9447b83af1709 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; meta = { - homepage = http://parchive.sourceforge.net/; + homepage = "http://parchive.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; description = "A library for using Parchives (parity archive volume sets)"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index b704878b16448..123c2f2f0676d 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.tcpdump.org; + homepage = "https://www.tcpdump.org"; description = "Packet Capture Library"; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 96da8a165aea7..6c2276a08ccb8 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A GObject-based plugins engine"; - homepage = https://wiki.gnome.org/Projects/Libpeas; + homepage = "https://wiki.gnome.org/Projects/Libpeas"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/libpgf/default.nix b/pkgs/development/libraries/libpgf/default.nix index b3dae0c60eaa2..7710c20819964 100644 --- a/pkgs/development/libraries/libpgf/default.nix +++ b/pkgs/development/libraries/libpgf/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { # configureFlags = optional static "--enable-static --disable-shared"; meta = { - homepage = http://www.libpgf.org/; + homepage = "https://www.libpgf.org/"; description = "Progressive Graphics Format"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix index eabf2d2a1064b..bf80562a0b190 100644 --- a/pkgs/development/libraries/libpipeline/default.nix +++ b/pkgs/development/libraries/libpipeline/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ]; meta = with stdenv.lib; { - homepage = http://libpipeline.nongnu.org; + homepage = "http://libpipeline.nongnu.org"; description = "C library for manipulating pipelines of subprocesses in a flexible and convenient way"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 63599c4352d07..6608ccd1abc59 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to handle Apple Property List format in binary or XML"; - homepage = https://github.com/libimobiledevice/libplist; + homepage = "https://github.com/libimobiledevice/libplist"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ infinisil ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index 14ae1156087ba..7199695ae74b5 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The official reference implementation for the PNG file format"; - homepage = http://www.libpng.org/pub/png/libpng.html; + homepage = "http://www.libpng.org/pub/png/libpng.html"; license = licenses.libpng; maintainers = [ ]; branch = "1.2"; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 95ef620134640..489007bc417d9 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; - homepage = http://www.libpng.org/pub/png/libpng.html; + homepage = "http://www.libpng.org/pub/png/libpng.html"; license = licenses.libpng2; platforms = platforms.all; maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index f6f2412c818ab..a710e09a454fd 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A C++ library to access PostgreSQL databases"; - homepage = http://pqxx.org/development/libpqxx/; + homepage = "http://pqxx.org/development/libpqxx/"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.eelco ]; diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 8d4febcde2882..61c25e183bd04 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux ++ platforms.darwin; license = licenses.lgpl21; - homepage = http://libproxy.github.io/libproxy/; + homepage = "http://libproxy.github.io/libproxy/"; description = "A library that provides automatic proxy configuration management"; }; } diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix index c04c8d724d0bb..e08feaddc606a 100644 --- a/pkgs/development/libraries/libpseudo/default.nix +++ b/pkgs/development/libraries/libpseudo/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ncurses ]; meta = with stdenv.lib; { - homepage = http://libpseudo.sourceforge.net/; + homepage = "http://libpseudo.sourceforge.net/"; description = "Simple, thread-safe messaging between threads"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix index c3ad33173cdb1..bd45cb529f1ab 100644 --- a/pkgs/development/libraries/libpwquality/default.nix +++ b/pkgs/development/libraries/libpwquality/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Password quality checking and random password generation library"; - homepage = https://github.com/libpwquality/libpwquality; + homepage = "https://github.com/libpwquality/libpwquality"; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index 25b088f99ec83..58eb64b0e48ad 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec{ nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { - homepage = https://github.com/clusterlabs/libqb; + homepage = "https://github.com/clusterlabs/libqb"; description = "A library providing high performance logging, tracing, ipc, and poll"; license = licenses.lgpl21; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix deleted file mode 100644 index 41a2a1b669d8d..0000000000000 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake -, qtbase, qtmultimedia }: - -let - generic = version: sha256: prefix: stdenv.mkDerivation { - pname = "libqmatrixclient"; - inherit version; - - src = fetchFromGitHub { - owner = "QMatrixClient"; - repo = "libqmatrixclient"; - rev = "${prefix}${version}"; - inherit sha256; - }; - - postPatch = '' - sed -i -e '/example/Id' CMakeLists.txt - ''; - - buildInputs = [ qtbase qtmultimedia ]; - - nativeBuildInputs = [ cmake ]; - - meta = with stdenv.lib; { - description= "A Qt5 library to write cross-platfrom clients for Matrix"; - homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html; - license = licenses.lgpl21; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ peterhoeg ]; - }; - }; - -in rec { - libqmatrixclient_0_4 = generic "0.4.2.1" "056hvp2m74wx72yd8vai18siddj9l8bhrvrkc4ia4cwjsqw02kid" "v"; - libqmatrixclient_0_5 = generic "0.5.2" "1bhlqfs7251fss4icx794ka614npr6zyrpp4qwc4q5408ykfm7lr" ""; - - libqmatrixclient = libqmatrixclient_0_4; -} diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 396706b88e637..33b4983b015aa 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.24.6"; + version = "1.24.10"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "1jfq8jdjc9z5c0g7m377svdlniwkr4k9hs7s8fsb5rvdq5xja98k"; + sha256 = "1rzxapr6hb18ccvqh5fizx7zk63l47bs0p3gizycz2ysnm1i44n2"; }; outputs = [ "out" "dev" "devdoc" ]; @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { libmbim ]; + enableParallelBuilding = true; + doCheck = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index dd6318444e78f..8d9cf381ff80d 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -43,7 +43,7 @@ mkDerivation rec { description = "A multimedia playback framework based on Qt + FFmpeg"; #license = licenses.lgpl21; # For the libraries / headers only. license = licenses.gpl3; # With the examples (under bin) and most likely some of the optional dependencies used. - homepage = http://www.qtav.org/; + homepage = "http://www.qtav.org/"; maintainers = [ maintainers.jraygauthier ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix new file mode 100644 index 0000000000000..9ece2c13bd21d --- /dev/null +++ b/pkgs/development/libraries/libquotient/default.nix @@ -0,0 +1,24 @@ +{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, qtmultimedia }: + +mkDerivation rec { + pname = "libquotient"; + version = "0.5.3.2"; + + src = fetchFromGitHub { + owner = "quotient-im"; + repo = "libQuotient"; + rev = version; + sha256 = "0gkwr3yw6k2m0j8cc085b5p2q788rf5nhp1p5hc5d55pc7mci2qs"; + }; + + buildInputs = [ qtbase qtmultimedia ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "A Qt5 library to write cross-platfrom clients for Matrix"; + homepage = "https://matrix.org/docs/projects/sdk/quotient"; + maintainers = with maintainers; [ colemickens ]; + license = licenses.lgpl21; + }; +} diff --git a/pkgs/development/libraries/libr3/default.nix b/pkgs/development/libraries/libr3/default.nix index cf848d02a048b..0584203a581ad 100644 --- a/pkgs/development/libraries/libr3/default.nix +++ b/pkgs/development/libraries/libr3/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A high-performance path dispatching library"; - homepage = https://github.com/c9s/r3; + homepage = "https://github.com/c9s/r3"; license = [ stdenv.lib.licenses.mit ]; }; diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/development/libraries/libraspberrypi/default.nix index ec31a29d05382..1cd1f5e62ac13 100644 --- a/pkgs/development/libraries/libraspberrypi/default.nix +++ b/pkgs/development/libraries/libraspberrypi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "Userland libraries for interfacing with Raspberry Pi hardware"; - homepage = https://github.com/raspberrypi/userland; + homepage = "https://github.com/raspberrypi/userland"; license = licenses.bsd3; platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; maintainers = with maintainers; [ tkerber ]; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 00288e359dfbf..69169c7e9af72 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; - homepage = https://www.libraw.org/; + homepage = "https://www.libraw.org/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix index 14e3e1891baeb..ef194bb0b1ecb 100644 --- a/pkgs/development/libraries/librdf/raptor.nix +++ b/pkgs/development/libraries/librdf/raptor.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "The RDF Parser Toolkit"; - homepage = http://librdf.org/raptor; + homepage = "http://librdf.org/raptor"; license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index 3f43667712357..b4141d4ff0797 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "The RDF Parser Toolkit"; - homepage = http://librdf.org/raptor; + homepage = "http://librdf.org/raptor"; license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; maintainers = with stdenv.lib.maintainers; [ marcweber ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index 124fd01781829..d9b94a668c603 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Library that handles Resource Description Framework (RDF)"; - homepage = http://librdf.org/rasqal; + homepage = "http://librdf.org/rasqal"; license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; maintainers = with stdenv.lib.maintainers; [ marcweber ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 8835490187d1d..a85500d2c6ec3 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C libraries that provide support for the Resource Description Framework (RDF)"; - homepage = http://librdf.org/; + homepage = "http://librdf.org/"; platforms = platforms.unix; license = licenses.asl20; }; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index a8924ca478257..8fd90c60bdad1 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.33.1"; + version = "2.34.0"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "04macplj3k2sdpf1wdjm6gsghak5dzfhi2pmr47qldh2sy2zz0a3"; + sha256 = "0bi7pszrryz18aqna0z73mb1hzz2vqdb0m00pf93hnwc2hba7hwm"; }; buildInputs = [ diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 17f9537e418a8..7d0eb7f67dd86 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "librelp"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "rsyslog"; repo = "librelp"; rev = "v${version}"; - sha256 = "1il8dany6y981ficrwnxjlc13v5lj6gqia5678p5pj6bcbq7l7lb"; + sha256 = "132i1b1m7c7hkbxsnpa7n07cbghxjxmcbb8zhgwziaxg4nzxsa6l"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix index 43f80076328ee..bed92477a3fc2 100644 --- a/pkgs/development/libraries/librep/default.nix +++ b/pkgs/development/libraries/librep/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { machine. It can serve as an application extension language but is also suitable for standalone scripts. ''; - homepage = http://sawfish.wikia.com; + homepage = "http://sawfish.wikia.com"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/development/libraries/libresample/default.nix b/pkgs/development/libraries/libresample/default.nix index 3684fd924f771..85d8d5c586b5c 100644 --- a/pkgs/development/libraries/libresample/default.nix +++ b/pkgs/development/libraries/libresample/default.nix @@ -2,14 +2,14 @@ let patch = fetchurl { - url = mirror://debian/pool/main/libr/libresample/libresample_0.1.3-3.diff.gz; + url = "mirror://debian/pool/main/libr/libresample/libresample_0.1.3-3.diff.gz"; sha256 = "063w8rqxw87fc89gas47vk0ll7xl8cy7d8g70gm1l62bqkkajklx"; }; in stdenv.mkDerivation { name = "libresample-0.1.3"; src = fetchurl { - url = mirror://debian/pool/main/libr/libresample/libresample_0.1.3.orig.tar.gz; + url = "mirror://debian/pool/main/libr/libresample/libresample_0.1.3.orig.tar.gz"; sha256 = "05a8mmh1bw5afqx0kfdqzmph4x2npcs4idx0p0v6q95lwf22l8i0"; }; patches = [ patch ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "A real-time library for sampling rate conversion library"; license = stdenv.lib.licenses.lgpl2Plus; - homepage = https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html; + homepage = "https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html"; maintainers = [ stdenv.lib.maintainers.sander ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix index e70ac9a536268..e1d7b336273db 100644 --- a/pkgs/development/libraries/librest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Helper library for RESTful services"; - homepage = https://wiki.gnome.org/Projects/Librest; + homepage = "https://wiki.gnome.org/Projects/Librest"; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/librevisa/default.nix b/pkgs/development/libraries/librevisa/default.nix index d412e1e8ebb64..b49fb3f7ee77c 100644 --- a/pkgs/development/libraries/librevisa/default.nix +++ b/pkgs/development/libraries/librevisa/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { We currently support targets connected via USB, exposing the USBTMC interface, and VXI-11 devices. ''; - homepage = http://www.librevisa.org/; + homepage = "http://www.librevisa.org/"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 7ef9139108bda..afd1df51e5bec 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -4,14 +4,14 @@ let pname = "librsvg"; - version = "2.48.0"; + version = "2.48.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "19ndf9l99wcrmkwcrk20vd1ggrwgldksfz1kkj786ljcrxv8nd2a"; + sha256 = "0vlmgisf87dz4vcl1ypcw7g211wkyvhydv6ksf1p6mgdbkw3mdi8"; }; outputs = [ "out" "dev" "installedTests" ]; @@ -80,9 +80,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small library to render SVG images to Cairo surfaces"; - homepage = https://wiki.gnome.org/Projects/LibRsvg; + homepage = "https://wiki.gnome.org/Projects/LibRsvg"; license = licenses.lgpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/librsync/0.9.nix b/pkgs/development/libraries/librsync/0.9.nix index 3ca84ed2ce5fe..35ccdcdf07820 100644 --- a/pkgs/development/libraries/librsync/0.9.nix +++ b/pkgs/development/libraries/librsync/0.9.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "librsync-0.9.7"; src = fetchurl { - url = mirror://sourceforge/librsync/librsync-0.9.7.tar.gz; + url = "mirror://sourceforge/librsync/librsync-0.9.7.tar.gz"; sha256 = "1mj1pj99mgf1a59q9f2mxjli2fzxpnf55233pc1klxk2arhf8cv6"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; meta = { - homepage = http://librsync.sourceforge.net/; + homepage = "http://librsync.sourceforge.net/"; license = stdenv.lib.licenses.lgpl2Plus; description = "Implementation of the rsync remote-delta algorithm"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix index dfec4bc489745..3012263cb4149 100644 --- a/pkgs/development/libraries/libs3/default.nix +++ b/pkgs/development/libraries/libs3/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { makeFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/bji/libs3; + homepage = "https://github.com/bji/libs3"; description = "A library for interfacing with amazon s3"; license = licenses.lgpl3Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index b23bff415a254..92958f389f042 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sample Rate Converter for audio"; - homepage = http://www.mega-nerd.com/SRC/index.html; + homepage = "http://www.mega-nerd.com/SRC/index.html"; license = licenses.bsd2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 2092d72c9f8d4..cebfdfe383896 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libsass"; - version = "3.6.1"; + version = "3.6.4"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - sha256 = "1599j2lbsygy3883x9si7rbad1pkjhl6y72aimaapcv90ga5kxkm"; + sha256 = "074kvacdan85h4qrvsk97575ys9xgkc044gplz3m6vn4a8pcl2rn"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C/C++ implementation of a Sass compiler"; - homepage = https://github.com/sass/libsass; + homepage = "https://github.com/sass/libsass"; license = licenses.mit; maintainers = with maintainers; [ codyopel offline ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix index 3083136526bff..7eaa8f855784c 100644 --- a/pkgs/development/libraries/libscrypt/default.nix +++ b/pkgs/development/libraries/libscrypt/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Shared library that implements scrypt() functionality"; - homepage = https://lolware.net/2014/04/29/libscrypt.html; + homepage = "https://lolware.net/2014/04/29/libscrypt.html"; license = licenses.bsd2; maintainers = with maintainers; [ davidak ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index 9bf246f556d35..c9c105d1b18ae 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = with stdenv.lib; { - homepage = https://github.com/haiwen/libsearpc; + homepage = "https://github.com/haiwen/libsearpc"; description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index a756caea8efcb..010a74eab3caf 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libsecret"; - version = "0.20.1"; + version = "0.20.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ir4ynpf8b64xss1azvsi5x6697lik7hkf3z0xxa2qv2xja3xxsp"; + sha256 = "1r4habxdzmn02id324m0m4mg5isf22q1z436bg3vjjmcz1b3rjsg"; }; postPatch = '' @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = { description = "A library for storing and retrieving passwords and other secrets"; - homepage = https://wiki.gnome.org/Projects/Libsecret; + homepage = "https://wiki.gnome.org/Projects/Libsecret"; license = stdenv.lib.licenses.lgpl21Plus; inherit (glib.meta) platforms maintainers; }; diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix index 2c34c1d8b7bfe..c7f34362f39f1 100644 --- a/pkgs/development/libraries/libserialport/default.nix +++ b/pkgs/development/libraries/libserialport/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross-platform shared library for serial port access"; - homepage = https://sigrok.org/; + homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 849c93962f888..23ab4d0b33851 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { bad data from getting to the icecast server. ''; - homepage = http://www.icecast.org; + homepage = "http://www.icecast.org"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ jcumming ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 970c4aff246e2..7acda3c0a8f6c 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to play Commodore 64 music derived from libsidplay2"; - homepage = https://sourceforge.net/projects/sidplay-residfp/; + homepage = "https://sourceforge.net/projects/sidplay-residfp/"; license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/development/libraries/libsieve/default.nix index bc34318d0a918..e1c6f3efe526b 100644 --- a/pkgs/development/libraries/libsieve/default.nix +++ b/pkgs/development/libraries/libsieve/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An interpreter for RFC 3028 Sieve and various extensions"; - homepage = http://sodabrew.com/libsieve/; + homepage = "http://sodabrew.com/libsieve/"; license = licenses.lgpl21; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix index fa27a80e22eda..0fc19d207596b 100644 --- a/pkgs/development/libraries/libsigcxx/1.2.nix +++ b/pkgs/development/libraries/libsigcxx/1.2.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ m4]; meta = with stdenv.lib; { - homepage = https://libsigcplusplus.github.io/libsigcplusplus/; + homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; description = "A typesafe callback system for standard C++"; branch = "1.2"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index 434dbfb9f7257..8f883626d8232 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://libsigcplusplus.github.io/libsigcplusplus/; + homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; description = "A typesafe callback system for standard C++"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/pkgs/development/libraries/libsignal-protocol-c/default.nix b/pkgs/development/libraries/libsignal-protocol-c/default.nix index f3549d52f69e0..6278f6234f0b1 100644 --- a/pkgs/development/libraries/libsignal-protocol-c/default.nix +++ b/pkgs/development/libraries/libsignal-protocol-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libsignal-protocol-c"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal-protocol-c"; rev = "v${version}"; - sha256 = "1qj2w4csy6j9jg1jy66n1qwysx7hgjywk4n35hlqcnh1kpa14k3p"; + sha256 = "0z5p03vk15i6h870azfjgyfgxhv31q2vq6rfhnybrnkxq2wqzwhk"; }; nativeBuildInputs = [ cmake ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Signal Protocol C Library"; - homepage = https://github.com/signalapp/libsignal-protocol-c; + homepage = "https://github.com/signalapp/libsignal-protocol-c"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix index c7f49a6f6dcf1..77a43872d4ea4 100644 --- a/pkgs/development/libraries/libsignon-glib/default.nix +++ b/pkgs/development/libraries/libsignon-glib/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for managing single signon credentials which can be used from GLib applications"; - homepage = https://gitlab.com/accounts-sso/libsignon-glib; + homepage = "https://gitlab.com/accounts-sso/libsignon-glib"; license = licenses.lgpl21; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index b50a7c371a74a..30921ade4cf59 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; # not cross; meta = { - homepage = https://www.gnu.org/software/libsigsegv/; + homepage = "https://www.gnu.org/software/libsigsegv/"; description = "Library to handle page faults in user mode"; longDescription = '' diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index 3c3beb5f1a786..9e151931e6537 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The SIXEL library for console graphics, and converter programs"; - homepage = http://saitoha.github.com/libsixel; + homepage = "http://saitoha.github.com/libsixel"; maintainers = with maintainers; [ vrthra ]; license = licenses.mit; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index d0f822a23f5a5..e5fd031b5fff4 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { as well as various dictionary types including: file dictionary (such as SKK-JISYO.[SML]), user dictionary, skkserv, and CDB format dictionary. ''; - homepage = https://github.com/ueno/libskk; + homepage = "https://github.com/ueno/libskk"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/development/libraries/libslirp/default.nix index 27a4d6ceb64c2..ee31e22628c84 100644 --- a/pkgs/development/libraries/libslirp/default.nix +++ b/pkgs/development/libraries/libslirp/default.nix @@ -8,20 +8,24 @@ stdenv.mkDerivation rec { pname = "libslirp"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "slirp"; repo = pname; rev = "v${version}"; - sha256 = "1qk513fgfh4hwb1ajjmvg9m1bl97m3n731ymxqsh1c3fj468a2am"; + sha256 = "1hajbdwx20a48hp8kv6jqbjvnzjvcdqmbjfsymzy2xa80idqkfab"; }; nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ glib ]; + postPatch = '' + echo ${version} > .tarball-version + ''; + meta = with stdenv.lib; { description = "General purpose TCP-IP emulator"; homepage = "https://gitlab.freedesktop.org/slirp/libslirp"; diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/development/libraries/libsmi/default.nix index 208aa6c9d6161..881af18d5592c 100644 --- a/pkgs/development/libraries/libsmi/default.nix +++ b/pkgs/development/libraries/libsmi/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Library to Access SMI MIB Information"; - homepage = https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html; + homepage = "https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html"; license = licenses.free; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix index 15d8169f10247..227353e0a9f82 100644 --- a/pkgs/development/libraries/libsnark/default.nix +++ b/pkgs/development/libraries/libsnark/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ library for zkSNARKs"; - homepage = https://github.com/scipr-lab/libsnark; + homepage = "https://github.com/scipr-lab/libsnark"; license = licenses.mit; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index b150dd0f59c33..7b20120290d4f 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C library for reading and writing files containing sampled sound"; - homepage = http://www.mega-nerd.com/libsndfile/; + homepage = "http://www.mega-nerd.com/libsndfile/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index a2b6ba6224e2d..c6381e2a14142 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A modern and easy-to-use crypto library"; - homepage = http://doc.libsodium.org/; + homepage = "http://doc.libsodium.org/"; license = licenses.isc; maintainers = with maintainers; [ raskin ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index b4dd8ccbfb550..9443846acf1e9 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.11"; + version = "0.7.13"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "1jq08qgj05cr9zk5paj3qvma7y2ixvkqlvbszcgmfvx0yq4gl1af"; + sha256 = "1hjk7r7047i451xjgw72in62pya1h1436fvx945vxlvswl5s6iw8"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index 62e5601b73c46..a4a81af532ad9 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross platform audio input and output"; - homepage = http://libsound.io/; + homepage = "http://libsound.io/"; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.andrewrk ]; diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index d85c9e94ebdff..4b5f7f4b3f105 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Extensible spatial index library in C++"; - homepage = http://libspatialindex.github.io/; + homepage = "http://libspatialindex.github.io/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index 7bd22248d8769..bdc4504ad5acb 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Extensible spatial index library in C++"; - homepage = https://www.gaia-gis.it/fossil/libspatialite; + homepage = "https://www.gaia-gis.it/fossil/libspatialite"; # They allow any of these license = with licenses; [ gpl2Plus lgpl21Plus mpl11 ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index f1e4169bd48e9..11400a6a3e232 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = http://libspectre.freedesktop.org/; + homepage = "http://libspectre.freedesktop.org/"; description = "PostScript rendering library"; longDescription = '' diff --git a/pkgs/development/libraries/libspectrum/default.nix b/pkgs/development/libraries/libspectrum/default.nix index c09a45abf594e..24b9b9241c218 100644 --- a/pkgs/development/libraries/libspectrum/default.nix +++ b/pkgs/development/libraries/libspectrum/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = http://fuse-emulator.sourceforge.net/libspectrum.php; + homepage = "http://fuse-emulator.sourceforge.net/libspectrum.php"; description = "ZX Spectrum input and output support library"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix index d4b112704284c..42b39179b2047 100644 --- a/pkgs/development/libraries/libspf2/default.nix +++ b/pkgs/development/libraries/libspf2/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Implementation of the Sender Policy Framework for SMTP authorization"; - homepage = https://www.libspf2.org; + homepage = "https://www.libspf2.org"; license = with licenses; [ lgpl21Plus bsd2 ]; maintainers = with maintainers; [ pacien ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix index 67251f9430a8e..a77e209119bb1 100644 --- a/pkgs/development/libraries/libspiro/default.nix +++ b/pkgs/development/libraries/libspiro/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "libspiro"; - version = "20190731"; + version = "20200505"; src = fetchFromGitHub { owner = "fontforge"; repo = pname; rev = version; - sha256 = "sha256:1wc6ikjrvcq05jki0ligmxyplgb4nzx6qb5va277qiin8vad9b1v"; + sha256 = "1b5bw5qxqlral96y1n5f3sh9yxm2yij3zkqjmlgd8r1k4j0d3nqw"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; meta = with stdenv.lib; { description = "A library that simplifies the drawing of beautiful curves"; - homepage = https://github.com/fontforge/libspiro; + homepage = "https://github.com/fontforge/libspiro"; license = licenses.gpl3Plus; maintainers = [ maintainers.erictapen ]; }; diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index 1b0953df4e653..69cd24dfd6e82 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -84,7 +84,7 @@ else stdenv.mkDerivation { meta = with stdenv.lib; { description = "Spotify API library"; - homepage = https://developer.spotify.com/technologies/libspotify; + homepage = "https://developer.spotify.com/technologies/libspotify"; maintainers = with maintainers; [ lovek323 ]; license = licenses.unfree; }; diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/development/libraries/libsrs2/default.nix index f8fc6a446d187..0d186204f92f4 100644 --- a/pkgs/development/libraries/libsrs2/default.nix +++ b/pkgs/development/libraries/libsrs2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "The next generation SRS library from the original designer of SRS"; license = with lib.licenses; [ gpl2 bsd3 ]; - homepage = https://www.libsrs2.org/; + homepage = "https://www.libsrs2.org/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index bf6e0a491f2ff..c6accad9c3c8f 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libssh"; - version = "0.8.8"; + version = "0.8.9"; src = fetchurl { url = "https://www.libssh.org/files/0.8/${pname}-${version}.tar.xz"; - sha256 = "1qk5bm9r6199jbfk54f8w24vkl52051g8s3kmq4z2kdc6vbpy4jb"; + sha256 = "09b8w9m5qiap8wbvz4613nglsynpk8hn0q9b929ny2y4l2fy2nc5"; }; postPatch = '' diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 365c836c9fdb5..5cc0232e17dec 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A client-side C library implementing the SSH2 protocol"; - homepage = https://www.libssh2.org; + homepage = "https://www.libssh2.org"; platforms = platforms.all; license = licenses.bsd3; maintainers = [ ]; diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index e10dffa96c1f7..70a632dd4a79e 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit; meta = with stdenv.lib; { - homepage = https://www.i-scream.org/libstatgrab/; + homepage = "https://www.i-scream.org/libstatgrab/"; description = "A library that provides cross platforms access to statistics about the running system"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix index 400a107c5186f..534ad7afc7167 100644 --- a/pkgs/development/libraries/libstroke/default.nix +++ b/pkgs/development/libraries/libstroke/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libstroke-0.5.1"; src = fetchurl { - url = https://web.archive.org/web/20161204100704/http://etla.net/libstroke/libstroke-0.5.1.tar.gz; + url = "https://web.archive.org/web/20161204100704/http://etla.net/libstroke/libstroke-0.5.1.tar.gz"; sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Libstroke, a library for simple gesture recognition"; - homepage = https://web.archive.org/web/20161204100704/http://etla.net/libstroke/; + homepage = "https://web.archive.org/web/20161204100704/http://etla.net/libstroke/"; license = stdenv.lib.licenses.gpl2; longDescription = diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index 99eccc3436fde..0709f3867e45e 100644 --- a/pkgs/development/libraries/libsvm/default.nix +++ b/pkgs/development/libraries/libsvm/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for support vector machines"; - homepage = https://www.csie.ntu.edu.tw/~cjlin/libsvm/; + homepage = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/"; license = licenses.bsd3; maintainers = [ maintainers.spwhitt ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libsystemtap/default.nix b/pkgs/development/libraries/libsystemtap/default.nix index ecfa3377c9958..b46a848a0416f 100644 --- a/pkgs/development/libraries/libsystemtap/default.nix +++ b/pkgs/development/libraries/libsystemtap/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "3.2"; src = fetchgit { - url = git://sourceware.org/git/systemtap.git; + url = "git://sourceware.org/git/systemtap.git"; rev = "4051c70c9318c837981384cbb23f3e9eb1bd0892"; sha256 = "0sd8n3j3rishks3gyqj2jyqhps7hmlfjyz8i0w8v98cczhhh04rq"; fetchSubmodules = false; diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix index ca0407bd0aa0e..1bb324b55f235 100644 --- a/pkgs/development/libraries/libtap/default.nix +++ b/pkgs/development/libraries/libtap/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ pname = "libtap"; - version = "1.12.0"; + version = "1.14.0"; src = fetchurl { - url = "https://web-cpan.shlomifish.org/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1ms1770cx8c6q3lhn1chkzy12vzmjgvlms7cqhd2d3260j2wwv5s"; + url = "https://web-cpan.shlomifish.org/downloads/${pname}-${version}.tar.xz"; + sha256 = "1ga7rqmppa8ady665736cx443icscqlgflkqmxd4xbkzypmdj9bk"; }; nativeBuildInputs = [ pkgconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec{ C originally created by Nik Clayton. This is a maintenance branch by Shlomi Fish. ''; - homepage = https://www.shlomifish.org/open-source/projects/libtap/; + homepage = "https://www.shlomifish.org/open-source/projects/libtap/"; license = licenses.bsd3; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix index c4614103b3fe5..a31fde0d31d28 100644 --- a/pkgs/development/libraries/libtar/default.nix +++ b/pkgs/development/libraries/libtar/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C library for manipulating POSIX tar files"; - homepage = https://repo.or.cz/libtar; + homepage = "https://repo.or.cz/libtar"; license = licenses.bsd3; platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index d266817c5d770..90dde37a4161a 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { null; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/libtasn1/; + homepage = "https://www.gnu.org/software/libtasn1/"; description = "An ASN.1 library"; longDescription = '' Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index d81f3f8200157..c8c59b15f3ae5 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "API for roguelike games"; - homepage = http://roguecentral.org/doryen/libtcod/; + homepage = "http://roguecentral.org/doryen/libtcod/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.skeidel ]; diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/development/libraries/libtelnet/default.nix index 043acee0cfeb8..df500cd7a4193 100644 --- a/pkgs/development/libraries/libtelnet/default.nix +++ b/pkgs/development/libraries/libtelnet/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Simple RFC-complient TELNET implementation as a C library"; - homepage = https://github.com/seanmiddleditch/libtelnet; + homepage = "https://github.com/seanmiddleditch/libtelnet"; license = stdenv.lib.licenses.publicDomain; maintainers = [ stdenv.lib.maintainers.tomberek ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index 989d26b64e1b0..bb2e1b05bcec1 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Terminal keypress reading library"; - homepage = http://www.leonerd.org.uk/code/libtermkey; + homepage = "http://www.leonerd.org.uk/code/libtermkey"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libtgvoip/default.nix b/pkgs/development/libraries/libtgvoip/default.nix index 80c6e7e204ee7..920315bb1bc24 100644 --- a/pkgs/development/libraries/libtgvoip/default.nix +++ b/pkgs/development/libraries/libtgvoip/default.nix @@ -6,13 +6,13 @@ with lib; stdenv.mkDerivation rec { pname = "libtgvoip"; - version = "unstable-2020-01-21"; + version = "unstable-2020-03-02"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "libtgvoip"; - rev = "ade4434f1c6efabecc3b548ca1f692f8d103d22a"; - sha256 = "1bhnx3sknadx7a4qk9flh356kffb02xx32grj7cj7ik4rarccgp0"; + rev = "e422d2a80546a32ab7166a9b1058bacfc5daeefc"; + sha256 = "0n6f7215k74039j0zmicjzhj6f45mq6fvkrwzyzibcrv87ib17fc"; }; outputs = [ "out" "dev" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "VoIP library for Telegram clients"; license = licenses.unlicense; platforms = platforms.linux; - homepage = https://github.com/telegramdesktop/libtgvoip; + homepage = "https://github.com/telegramdesktop/libtgvoip"; maintainers = with maintainers; [ ilya-fedin ]; }; } diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index 81bd35ff293c3..656204fb0ce8e 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.theora.org/; + homepage = "https://www.theora.org/"; description = "Library for Theora, a free and open video compression format"; license = licenses.bsd3; maintainers = with maintainers; [ spwhitt ]; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 795ed439093b0..6d4109621826b 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library and utilities for working with the TIFF image file format"; - homepage = http://download.osgeo.org/libtiff; + homepage = "http://download.osgeo.org/libtiff"; license = licenses.libtiff; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix index 7a72fa2b7a319..fbc726a451983 100644 --- a/pkgs/development/libraries/libtiger/default.nix +++ b/pkgs/development/libraries/libtiger/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.ApplicationServices; meta = { - homepage = https://code.google.com/archive/p/libtiger/; + homepage = "https://code.google.com/archive/p/libtiger/"; description = "A rendering library for Kate streams using Pango and Cairo"; platforms = lib.platforms.unix; license = lib.licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index 6520ddd0a9e28..d9e9df59324dd 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://www.libtom.net/LibTomCrypt/; + homepage = "https://www.libtom.net/LibTomCrypt/"; description = "A fairly comprehensive, modular and portable cryptographic toolkit"; license = with licenses; [ publicDomain wtfpl ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix index 0fde422b9aabe..9a0a2def4b715 100644 --- a/pkgs/development/libraries/libtommath/default.nix +++ b/pkgs/development/libraries/libtommath/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://www.libtom.net/LibTomMath/; + homepage = "https://www.libtom.net/LibTomMath/"; description = "A library for integer-based number-theoretic applications"; license = with licenses; [ publicDomain wtfpl ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.1/default.nix index f910964a2cacd..b2c958795f3e3 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.1/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, automake, autoconf -, zlib, boost, openssl, libtool, python, libiconv, geoip, ncurses +, zlib, boost, openssl, libtool, python, libiconv, ncurses }: let - version = "1.2.5"; + version = "1.1.11"; formattedVersion = lib.replaceChars ["."] ["_"] version; # Make sure we override python, so the correct version is chosen @@ -17,14 +17,13 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "arvidn"; repo = "libtorrent"; - rev = "libtorrent-${formattedVersion}"; + rev = "libtorrent_${formattedVersion}"; sha256 = "0nwdsv6d2gkdsh7l5a46g6cqx27xwh3msify5paf02l1qzjy4s5l"; }; enableParallelBuilding = true; nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; - buildInputs = [ boostPython openssl zlib python libiconv geoip ncurses ]; - + buildInputs = [ boostPython openssl zlib python libiconv ncurses ]; preConfigure = "./autotool.sh"; postInstall = '' @@ -36,11 +35,9 @@ in stdenv.mkDerivation { configureFlags = [ "--enable-python-binding" - "--with-libgeoip=system" "--with-libiconv=yes" "--with-boost=${boostPython.dev}" "--with-boost-libdir=${boostPython.out}/lib" - "--with-libiconv=yes" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix new file mode 100644 index 0000000000000..91e5a54bab163 --- /dev/null +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix @@ -0,0 +1,50 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, automake, autoconf +, zlib, boost, openssl, libtool, python, libiconv, ncurses +}: + +let + version = "1.2.6"; + formattedVersion = lib.replaceChars ["."] ["_"] version; + + # Make sure we override python, so the correct version is chosen + # for the bindings, if overridden + boostPython = boost.override { enablePython = true; inherit python; }; + +in stdenv.mkDerivation { + pname = "libtorrent-rasterbar"; + inherit version; + + src = fetchFromGitHub { + owner = "arvidn"; + repo = "libtorrent"; + rev = "libtorrent-${formattedVersion}"; + sha256 = "140gc9j6lymy5kr0gviqznpg4hl57rz2q6vpb9sjkkimr19lrvdr"; + }; + + enableParallelBuilding = true; + nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; + buildInputs = [ boostPython openssl zlib python libiconv ncurses ]; + preConfigure = "./autotool.sh"; + + postInstall = '' + moveToOutput "include" "$dev" + moveToOutput "lib/${python.libPrefix}" "$python" + ''; + + outputs = [ "out" "dev" "python" ]; + + configureFlags = [ + "--enable-python-binding" + "--with-libiconv=yes" + "--with-boost=${boostPython.dev}" + "--with-boost-libdir=${boostPython.out}/lib" + ]; + + meta = with stdenv.lib; { + homepage = "https://libtorrent.org/"; + description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; + license = licenses.bsd3; + maintainers = [ maintainers.phreedom ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 76362f8f8835f..996613d5ffc0b 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -41,7 +41,7 @@ let meta = with stdenv.lib; { description = "P2P FOSS instant messaging application aimed to replace Skype"; - homepage = https://tox.chat; + homepage = "https://tox.chat"; license = licenses.gpl3Plus; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index 18ceb5302292a..ebeb927aaa47f 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Terminal-emulator State Machine"; - homepage = http://www.freedesktop.org/wiki/Software/kmscon/libtsm/; + homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/"; license = licenses.mit; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix deleted file mode 100644 index 600b1fb510ad8..0000000000000 --- a/pkgs/development/libraries/libtxc_dxtn/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, autoreconfHook, libGL, libGLU }: - -let version = "1.0.1"; in - -stdenv.mkDerivation rec { - pname = "libtxc_dxtn"; - inherit version; - - src = fetchurl { - url = "https://people.freedesktop.org/~cbrill/libtxc_dxtn/${pname}-${version}.tar.bz2"; - sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libGL libGLU ]; - - meta = with stdenv.lib; { - homepage = http://dri.freedesktop.org/wiki/S3TC; - repositories.git = git://people.freedesktop.org/~mareko/libtxc_dxtn; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix deleted file mode 100644 index f9f44f5a65315..0000000000000 --- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, autoreconfHook, libGL, libGLU }: - -let version = "1.0"; in - -stdenv.mkDerivation { - pname = "libtxc_dxtn_s2tc"; - inherit version; - - src = fetchurl { - url = "https://github.com/divVerent/s2tc/archive/v${version}.tar.gz"; - sha256 = "0ibfdib277fhbqvxzan0bmglwnsl1y1rw2g8skvz82l1sfmmn752"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libGL libGLU ]; - - meta = { - description = "A patent-free S3TC compatible implementation"; - homepage = https://github.com/divVerent/s2tc; - repositories.git = https://github.com/divVerent/s2tc.git; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.cpages ]; - }; -} diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index 61fefc7d4dbbf..3becd075b2554 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://developers.yubico.com/libu2f-host; + homepage = "https://developers.yubico.com/libu2f-host"; description = "A C library and command-line tool that implements the host-side of the U2F protocol"; license = with licenses; [ gpl3Plus lgpl21Plus ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix index 6140c13e493d5..be5658914d175 100644 --- a/pkgs/development/libraries/libu2f-server/default.nix +++ b/pkgs/development/libraries/libu2f-server/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ json_c openssl check file help2man which gengetopt ]; meta = with stdenv.lib; { - homepage = https://developers.yubico.com/libu2f-server/; + homepage = "https://developers.yubico.com/libu2f-server/"; description = "A C library that implements the server-side of the U2F protocol"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index 14704cee01c83..43fa300f1076b 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uchardet"; - version = "0.0.6"; + version = "0.0.7"; outputs = [ "bin" "out" "man" "dev" ]; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "0q9c02b6nmw41yfsiqsnphgc3f0yg3fj31wkccp47cmwvy634lc3"; + sha256 = "1ca51sryhryqz82v4d0graaiqqq5w2f33a9gj83b910xmq499irz"; }; nativeBuildInputs = [ cmake ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mozilla's Universal Charset Detector C/C++ API"; - homepage = https://www.freedesktop.org/wiki/Software/uchardet/; + homepage = "https://www.freedesktop.org/wiki/Software/uchardet/"; license = licenses.mpl11; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libuecc/default.nix b/pkgs/development/libraries/libuecc/default.nix index 7080edcd7380d..ff6801ef18f4a 100644 --- a/pkgs/development/libraries/libuecc/default.nix +++ b/pkgs/development/libraries/libuecc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Very small Elliptic Curve Cryptography library"; - homepage = https://git.universe-factory.net/libuecc; + homepage = "https://git.universe-factory.net/libuecc"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 57385d1b4101c..c009c786672fb 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/andlabs/libui; + homepage = "https://github.com/andlabs/libui"; description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports."; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix index 35ec5dfed7cdc..3bc5f1370918d 100644 --- a/pkgs/development/libraries/libunarr/default.nix +++ b/pkgs/development/libraries/libunarr/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/selmf/unarr; + homepage = "https://github.com/selmf/unarr"; description = "A lightweight decompression library with support for rar, tar and zip archives"; license = licenses.lgpl3; }; diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix index 7e75954fb45e4..5b54917688915 100644 --- a/pkgs/development/libraries/libunibreak/default.nix +++ b/pkgs/development/libraries/libunibreak/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://vimgadgets.sourceforge.net/libunibreak/; + homepage = "http://vimgadgets.sourceforge.net/libunibreak/"; description = "A library implementing a line breaking algorithm as described in Unicode 6.0.0 Standard"; license = licenses.zlib; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/development/libraries/libuninameslist/default.nix index 2e29aafdbdd15..afae04cb6b23a 100644 --- a/pkgs/development/libraries/libuninameslist/default.nix +++ b/pkgs/development/libraries/libuninameslist/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libuninameslist"; - version = "20200313"; + version = "20200413"; src = fetchFromGitHub { owner = "fontforge"; repo = pname; rev = version; - sha256 = "1rs4mrmfcw7864kssnk559ac1sdlpl8yrd10xspxrnfz08ynqxw8"; + sha256 = "0jbg94z00f5vwqyjfrbill6cjvzp1zrki6m3d235jjxyw0hm3wr5"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index b315d0f16b043..e960117125e63 100644 --- a/pkgs/development/libraries/libunique/3.x.nix +++ b/pkgs/development/libraries/libunique/3.x.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ dbus dbus-glib gtk3 gobject-introspection gtk-doc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; meta = { - homepage = https://wiki.gnome.org/Attic/LibUnique; + homepage = "https://wiki.gnome.org/Attic/LibUnique"; description = "A library for writing single instance applications"; license = licenses.lgpl21; maintainers = [ maintainers.AndersonTorres ]; diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 2c9a13788c5bf..f0cc73ba4e95c 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = { - homepage = https://www.gnu.org/software/libunistring/; + homepage = "https://www.gnu.org/software/libunistring/"; description = "Unicode string library"; diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index daaf3de6bcc77..037e84069b421 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A library for instrumenting and integrating with all aspects of the Unity shell"; - homepage = https://launchpad.net/libunity; + homepage = "https://launchpad.net/libunity"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ worldofpeace ]; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index f49bebe9b1a9c..0f0143b9c1f42 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libunwind"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { url = "mirror://savannah/libunwind/${pname}-${version}.tar.gz"; - sha256 = "1y0l08k6ak1mqbfj6accf9s5686kljwgsl4vcqpxzk5n74wpm6a3"; + sha256 = "0dc46flppifrv2z0mrdqi60165ghxm1wk0g47vcbyzjdplqwjnfz"; }; patches = [ ./backtrace-only-with-glibc.patch ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails meta = with stdenv.lib; { - homepage = https://www.nongnu.org/libunwind; + homepage = "https://www.nongnu.org/libunwind"; description = "A portable and efficient API to determine the call-chain of a program"; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 3ed45e788c403..6046bcf8eab32 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "0.11.1"; + version = "0.12.1"; pname = "liburcu"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "0l1kxgzch4m8fxiz2hc8fwg56hrvzzspp7n0svnl7i7iycdrgfcj"; + sha256 = "03nd1gy2c3fdb6xwdrd5lr1jcjxbzffqh3z91mzbjhjn6k8fmymv"; }; checkInputs = [ perl ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Userspace RCU (read-copy-update) library"; - homepage = https://lttng.org/urcu; + homepage = "https://lttng.org/urcu"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index de7d092373b36..519023bb27e10 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "liburing"; - version = "0.4pre514_${builtins.substring 0 8 src.rev}"; + version = "0.6pre600_${builtins.substring 0 8 src.rev}"; src = fetchgit { url = "http://git.kernel.dk/${pname}"; - rev = "2454d6301d83a714d0775662b512fd46dbf82a0d"; - sha256 = "0qdycr0w0rymnizc4p5rh2qcnzr05afris4ggaawdg4zr07jms7k"; + rev = "f2e1f3590f7bed3040bd1691676b50839f7d5c39"; + sha256 = "0wg0pgcbilbb2wg08hsvd18q1m8vdk46b3piz7qb1pvgyq01idj2"; }; separateDebugInfo = true; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Userspace library for the Linux io_uring API"; - homepage = https://git.kernel.dk/cgit/liburing/; + homepage = "https://git.kernel.dk/cgit/liburing/"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb-compat/0.1.nix index 2830ef284587e..2830ef284587e 100644 --- a/pkgs/development/libraries/libusb/default.nix +++ b/pkgs/development/libraries/libusb-compat/0.1.nix diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index debccb9087d65..f4c4dbfcf7103 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A client library to multiplex connections from and to iOS devices"; - homepage = https://github.com/libimobiledevice/libusbmuxd; + homepage = "https://github.com/libimobiledevice/libusbmuxd"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ infinisil ]; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 0250b09ce1eb7..9f6adeb65b0bd 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.35.0"; + version = "1.37.0"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0pd94h10ay38r8fwj0qqgw908rrj83n768n8mbbpnd5w2c7wy9fz"; + sha256 = "0iy25w4wy9f5y7i7aqidhqz93qi00lv7vhx6s521n0kphvaj8ijz"; }; postPatch = let @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A multi-platform support library with a focus on asynchronous I/O"; - homepage = https://github.com/libuv/libuv; + homepage = "https://github.com/libuv/libuv"; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; linux ++ darwin; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix index c604ce71cb724..a4de995ada850 100644 --- a/pkgs/development/libraries/libva-utils/default.nix +++ b/pkgs/development/libraries/libva-utils/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { inherit (libva) version; src = fetchFromGitHub { - owner = "01org"; + owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "1yk9bg1wg4nqva3l01s6bghcvc3hb02gp62p1sy5qk0r9mn5kpik"; + sha256 = "13a0dccphi4cpr2cx45kg4djxsssi3d1fcjrkx27b16xiayp5lx9"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -26,10 +26,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "VAAPI tools: Video Acceleration API"; - homepage = http://www.freedesktop.org/wiki/Software/vaapi; + description = "A collection of utilities and examples for VA-API"; + longDescription = '' + libva-utils is a collection of utilities and examples to exercise VA-API + in accordance with the libva project. + ''; + homepage = "https://github.com/intel/libva-utils"; + changelog = "https://raw.githubusercontent.com/intel/libva-utils/${version}/NEWS"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ primeos ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix index 9b12f83bcb830..1debefed0ad9c 100644 --- a/pkgs/development/libraries/libva/1.0.0.nix +++ b/pkgs/development/libraries/libva/1.0.0.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/vaapi; + homepage = "http://www.freedesktop.org/wiki/Software/vaapi"; license = licenses.mit; description = "VAAPI library: Video Acceleration API"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 0d00c9cb253d6..86c6a88b1ef4b 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -2,23 +2,24 @@ , libXext, libdrm, libXfixes, wayland, libffi, libX11 , libGL, mesa , minimal ? false, libva-minimal +, buildPackages }: stdenv.mkDerivation rec { name = "libva-${lib.optionalString minimal "minimal-"}${version}"; - version = "2.6.1"; + version = "2.7.1"; # Also update the hash for libva-utils! # update libva-utils and vaapiIntel as well src = fetchFromGitHub { - owner = "01org"; + owner = "intel"; repo = "libva"; rev = version; - sha256 = "1x34kf38p5rf52bf54ljr9f7knnbilm7kbszqnfk3lzsqrfc7r2g"; + sha256 = "0ywasac7z3hwggj8szp83sbxi2naa0a3amblx64y7i1hyyrn0csq"; }; outputs = [ "dev" "out" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig wayland ]; buildInputs = [ libdrm ] ++ lib.optionals (!minimal) [ libva-minimal libX11 libXext libXfixes wayland libffi libGL ]; @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { configureFlags = [ # Add FHS paths for non-NixOS applications. "--with-drivers-path=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" + "ac_cv_path_WAYLAND_SCANNER=${buildPackages.wayland}/bin/wayland-scanner" ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ @@ -36,10 +38,17 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "VAAPI library: Video Acceleration API"; - homepage = http://www.freedesktop.org/wiki/Software/vaapi; + description = "An implementation for VA-API (Video Acceleration API)"; + longDescription = '' + VA-API is an open-source library and API specification, which provides + access to graphics hardware acceleration capabilities for video + processing. It consists of a main library (this package) and + driver-specific acceleration backends for each supported hardware vendor. + ''; + homepage = "https://01.org/linuxmedia/vaapi"; + changelog = "https://raw.githubusercontent.com/intel/libva/${version}/NEWS"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ primeos ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index 039e3308f8873..cfc74a8a759cf 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails. needs DRI access meta = with stdenv.lib; { - homepage = https://github.com/i-rinat/libvdpau-va-gl; + homepage = "https://github.com/i-rinat/libvdpau-va-gl"; description = "VDPAU driver with OpenGL/VAAPI backend"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 977081e0ecf65..cbb312e0f0d81 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libvdpau"; - version = "1.3"; + version = "1.4"; src = fetchurl { url = "https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${version}/${pname}-${version}.tar.bz2"; - sha256 = "b5a52eeac9417edbc396f26c40591ba5df0cd18285f68d84614ef8f06196e50e"; + sha256 = "0c1zsfr6ypzwv8g9z50kdahpb7pirarq4z8avqqyyma5b9684n22"; }; patches = [ ./installdir.patch ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lX11"; meta = with stdenv.lib; { - homepage = https://people.freedesktop.org/~aplattner/vdpau/; + homepage = "https://people.freedesktop.org/~aplattner/vdpau/"; description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)"; license = licenses.mit; # expat version platforms = platforms.unix; diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix index 5d1449e3530e0..e1dc591f8b5d7 100644 --- a/pkgs/development/libraries/libversion/default.nix +++ b/pkgs/development/libraries/libversion/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Advanced version string comparison library"; - homepage = https://github.com/repology/libversion; + homepage = "https://github.com/repology/libversion"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ryantm ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix index 6ca3d997e6598..f9c695aedf71f 100644 --- a/pkgs/development/libraries/libviper/default.nix +++ b/pkgs/development/libraries/libviper/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ncurses gpm]; meta = with stdenv.lib; { - homepage = http://libviper.sourceforge.net/; + homepage = "http://libviper.sourceforge.net/"; description = "Simple window creation and management facilities for the console"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 7dd874ebc836b..bf8d0b373f083 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { - libvirt-gconfig - GObjects for manipulating libvirt XML documents - libvirt-gobject - GObjects for managing libvirt objects ''; - homepage = https://libvirt.org/; + homepage = "https://libvirt.org/"; license = licenses.lgpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libvirt/5.9.0.nix b/pkgs/development/libraries/libvirt/5.9.0.nix index 3a57a91a22ae3..514cf24f66eb9 100644 --- a/pkgs/development/libraries/libvirt/5.9.0.nix +++ b/pkgs/development/libraries/libvirt/5.9.0.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { } else fetchgit { - url = git://libvirt.org/libvirt.git; + url = "git://libvirt.org/libvirt.git"; rev = "v${version}"; sha256 = "0smm77ag8bg24xkbhl4akqikjrsq2pd3wk31nj0hk1avqnl00gmk"; fetchSubmodules = true; @@ -123,8 +123,8 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fno-stack-protector"; meta = { - homepage = http://libvirt.org/; - repositories.git = git://libvirt.org/libvirt.git; + homepage = "http://libvirt.org/"; + repositories.git = "git://libvirt.org/libvirt.git"; description = '' A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 89617b864ac3c..3c0cc9751e3b4 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -4,7 +4,7 @@ , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages -, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode +, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus , enableXen ? false, xen ? null , enableIscsi ? false, openiscsi , enableCeph ? false, ceph @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { } else fetchgit { - url = git://libvirt.org/libvirt.git; + url = "git://libvirt.org/libvirt.git"; rev = "v${version}"; sha256 = "1wyihi8bhwsck9b7f3b8yhlz145sjdyyj3ykjiszrqnp0y99xxy2"; fetchSubmodules = true; @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig docutils ] ++ optionals (!buildFromTarball) [ autoreconfHook ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl - libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib + libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib dbus ] ++ optionals stdenv.isLinux [ libpciaccess lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted @@ -74,6 +74,7 @@ in stdenv.mkDerivation rec { "--with-test" "--with-esx" "--with-remote" + "--with-polkit" ] ++ optionals stdenv.isLinux [ "QEMU_BRIDGE_HELPER=/run/wrappers/bin/qemu-bridge-helper" "QEMU_PR_HELPER=/run/libvirt/nix-helpers/qemu-pr-helper" @@ -124,8 +125,8 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fno-stack-protector"; meta = { - homepage = http://libvirt.org/; - repositories.git = git://libvirt.org/libvirt.git; + homepage = "http://libvirt.org/"; + repositories.git = "git://libvirt.org/libvirt.git"; description = '' A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes) diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix index b807691671fda..b84ba92e2bfb4 100644 --- a/pkgs/development/libraries/libvisio/default.nix +++ b/pkgs/development/libraries/libvisio/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library providing ability to interpret and import visio diagrams into various applications"; - homepage = https://wiki.documentfoundation.org/DLP/Libraries/libvisio; + homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libvisio"; license = licenses.mpl20; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix index 6e8e2d95b6b03..8fe53acc24568 100644 --- a/pkgs/development/libraries/libvisual/default.nix +++ b/pkgs/development/libraries/libvisual/default.nix @@ -13,9 +13,14 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; + meta = { description = "An abstraction library for audio visualisations"; - homepage = https://sourceforge.net/projects/libvisual/; + homepage = "https://sourceforge.net/projects/libvisual/"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index 40d21b58b55f1..28c5536d626d6 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://gitlab.xiph.org/xiph/vorbis/uploads/a68cf70fa10c8081a633f77b5c6576b7/0001-CVE-2017-14160-make-sure-we-don-t-overflow.patch"; - sha256 = "0v21p59cb3z77ch1v6q5dcrd733h91f3m8ifnd7kkkr8gzn17d5x"; + url = "https://gitlab.xiph.org/xiph/vorbis/commit/018ca26dece618457dd13585cad52941193c4a25.patch"; + sha256 = "18k4vp0nmrxxpis641ylnw6dgwxrymh5bf74njr6v8dizmmz1bkj"; name = "CVE-2017-14160+CVE-2018-10393.patch"; }) (fetchpatch { - url = "https://gitlab.xiph.org/xiph/vorbis/commit/112d3bd0aaa.diff"; + url = "https://gitlab.xiph.org/xiph/vorbis/commit/112d3bd0aaacad51305e1464d4b381dabad0e88b.diff"; sha256 = "1k77y3q36npy8mkkz40f6cb46l2ldrwyrd191m29s8rnbhnafdf7"; name = "CVE-2018-10392.patch"; }) @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Vorbis audio compression reference implementation"; - homepage = https://xiph.org/vorbis/; + homepage = "https://xiph.org/vorbis/"; license = licenses.bsd3; maintainers = [ maintainers.ehmry ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libvpx/1_8.nix b/pkgs/development/libraries/libvpx/1_8.nix index 14a6719533bb3..c82b7a674accd 100644 --- a/pkgs/development/libraries/libvpx/1_8.nix +++ b/pkgs/development/libraries/libvpx/1_8.nix @@ -175,7 +175,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "WebM VP8/VP9 codec SDK"; - homepage = https://www.webmproject.org/; + homepage = "https://www.webmproject.org/"; license = licenses.bsd3; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index ddde03e287687..007df403ff735 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -135,16 +135,10 @@ stdenv.mkDerivation rec { experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) "experimental") ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - #"--extra-cflags=" - #"--extra-cxxflags=" - #"--prefix=" - #"--libc=" - #"--libdir=" - "--enable-external-build" # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 - "--force-target=${stdenv.hostPlatform.config}${ + "--force-target=${stdenv.hostPlatform.parsed.cpu.name}-${stdenv.hostPlatform.parsed.kernel.name}${ if stdenv.hostPlatform.isDarwin then if stdenv.hostPlatform.osxMinVersion == "10.10" then "14" else if stdenv.hostPlatform.osxMinVersion == "10.9" then "13" @@ -171,7 +165,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "WebM VP8/VP9 codec SDK"; - homepage = https://www.webmproject.org/; + homepage = "https://www.webmproject.org/"; license = licenses.bsd3; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix index 0cd1b64c1b9e6..ca50345f5b210 100644 --- a/pkgs/development/libraries/libvterm-neovim/default.nix +++ b/pkgs/development/libraries/libvterm-neovim/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "VT220/xterm/ECMA-48 terminal emulator library"; - homepage = http://www.leonerd.org.uk/code/libvterm/; + homepage = "http://www.leonerd.org.uk/code/libvterm/"; license = licenses.mit; maintainers = with maintainers; [ rvolosatovs ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix index 472539ea24bb9..40324ec493274 100644 --- a/pkgs/development/libraries/libvterm/default.nix +++ b/pkgs/development/libraries/libvterm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ncurses ]; meta = with stdenv.lib; { - homepage = http://libvterm.sourceforge.net/; + homepage = "http://libvterm.sourceforge.net/"; description = "Terminal emulator library to mimic both vt100 and rxvt"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 7d7dd94eff499..c33317550b5fb 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, meson, ninja, glib, pkgconfig, udev, libgudev }: +{ stdenv, fetchFromGitHub, meson, ninja, glib, pkgconfig, udev, libgudev, doxygen }: stdenv.mkDerivation rec { pname = "libwacom"; - version = "1.1"; + version = "1.3"; outputs = [ "out" "dev" ]; @@ -10,19 +10,20 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "037vnyfg7nim6h3f4m04w6a9pr6hi04df14qpys580kf5xnf87nz"; + sha256 = "12g8jb67wj6sgg9ar2w8kkw1m1431rn9nd0j64qkrd3vy9g4l0hk"; }; - nativeBuildInputs = [ pkgconfig meson ninja ]; + nativeBuildInputs = [ pkgconfig meson ninja doxygen ]; - mesonFlags = [ "-Dtests=false" ]; + mesonFlags = [ "-Dtests=disabled" ]; buildInputs = [ glib udev libgudev ]; meta = with stdenv.lib; { platforms = platforms.linux; - homepage = https://linuxwacom.github.io/; + homepage = "https://linuxwacom.github.io/"; description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux"; + maintainers = teams.freedesktop.members; license = licenses.mit; }; } diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 56c3f638d52de..d2a98c4a8476c 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = { description = "Tools and library for the WebP image format"; - homepage = https://developers.google.com/speed/webp/; + homepage = "https://developers.google.com/speed/webp/"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ codyopel ]; diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix index 736b1a45fa20b..f47208cda4402 100644 --- a/pkgs/development/libraries/libwpd/0.8.nix +++ b/pkgs/development/libraries/libwpd/0.8.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for importing WordPerfect documents"; - homepage = http://libwpd.sourceforge.net; + homepage = "http://libwpd.sourceforge.net"; license = with licenses; [ lgpl21 mpl20 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index 56c598ca7de95..3464c55805dda 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for importing and exporting WordPerfect documents"; - homepage = http://libwpd.sourceforge.net/; + homepage = "http://libwpd.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index e80cefe16e2d4..c844daf51f037 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { - homepage = http://libwpg.sourceforge.net; + homepage = "http://libwpg.sourceforge.net"; description = "C++ library to parse WPG"; license = with licenses; [ lgpl21 mpl20 ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 61b777a524339..5d9b10b096371 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libwps"; - version = "0.4.10"; + version = "0.4.11"; src = fetchurl { url = "mirror://sourceforge/libwps/${pname}-${version}.tar.bz2"; - sha256 = "1adx2wawl0i16p8df80m6k6a137h709ip4zc0zlzr6wal8gpn0i4"; + sha256 = "11dg7q6mhvppfzsbzdlxldnsgapvgw17jlj1mca5jy4afn0zvqj8"; }; nativeBuildInputs = [ pkgconfig ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; meta = with stdenv.lib; { - homepage = http://libwps.sourceforge.net/; + homepage = "http://libwps.sourceforge.net/"; description = "Microsoft Works document format import filter library"; platforms = platforms.unix; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index fede13fcd9b44..3f687ad26c8bd 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Library of exchange-correlation functionals for density-functional theory"; - homepage = https://octopus-code.org/wiki/Libxc; + homepage = "https://octopus-code.org/wiki/Libxc"; license = licenses.lgpl3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ markuskowa ]; diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index fb1f4b29423f9..9ecfa0ffd1adf 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "NX compression library"; - homepage = http://wiki.x2go.org/doku.php/wiki:libs:nx-libs; + homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libxdg-basedir/default.nix b/pkgs/development/libraries/libxdg-basedir/default.nix index f0e63efc0d148..fdf62e38269ef 100644 --- a/pkgs/development/libraries/libxdg-basedir/default.nix +++ b/pkgs/development/libraries/libxdg-basedir/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/devnev/libxdg-basedir; + homepage = "https://github.com/devnev/libxdg-basedir"; description = "Implementation of the XDG Base Directory specification"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index db99107fe3581..6ed331a8a6b9a 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to handle keyboard descriptions"; - homepage = https://xkbcommon.org; + homepage = "https://xkbcommon.org"; license = licenses.mit; maintainers = with maintainers; [ ttuegel ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix index 510955d0af2e4..a73fb7cb870e3 100644 --- a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix +++ b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to handle keyboard descriptions"; - homepage = https://xkbcommon.org; + homepage = "https://xkbcommon.org"; license = licenses.mit; maintainers = with maintainers; [ ttuegel ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index b088ba198b225..febe7f7b38caa 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library providing high-level API for X Keyboard Extension known as XKB"; - homepage = http://freedesktop.org/wiki/Software/LibXklavier; + homepage = "http://freedesktop.org/wiki/Software/LibXklavier"; license = licenses.lgpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index c111a13d29841..2b28499864a7b 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extract Cell Data From Excel xls files"; - homepage = https://sourceforge.net/projects/libxls/; + homepage = "https://sourceforge.net/projects/libxls/"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index aff5f8ac44512..89b96467155cc 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libxmi-1.2"; src = fetchurl { - url = mirror://gnu/libxmi/libxmi-1.2.tar.gz; + url = "mirror://gnu/libxmi/libxmi-1.2.tar.gz"; sha256 = "03d4ikh29l38rl1wavb0icw7m5pp7yilnv7bb2k8qij1dinsymlx"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Library for rasterizing 2-D vector graphics"; - homepage = https://www.gnu.org/software/libxmi/; + homepage = "https://www.gnu.org/software/libxmi/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = [ ]; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 9883503414b99..7c39d80390677 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { passthru = { inherit version; pythonSupport = pythonSupport; }; meta = { - homepage = http://xmlsoft.org/; + homepage = "http://xmlsoft.org/"; description = "An XML parsing library for C"; license = lib.licenses.mit; platforms = lib.platforms.all; diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix index 94c2ca095829b..be5c019e31ee9 100644 --- a/pkgs/development/libraries/libxmlxx/v3.nix +++ b/pkgs/development/libraries/libxmlxx/v3.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://libxmlplusplus.sourceforge.net/; + homepage = "http://libxmlplusplus.sourceforge.net/"; description = "C++ wrapper for the libxml2 XML parser library, version 3"; license = licenses.lgpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix index eb031eb2a9d79..7313b2582bea2 100644 --- a/pkgs/development/libraries/libxnd/default.nix +++ b/pkgs/development/libraries/libxnd/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "C library for managing typed memory blocks and Python container module"; - homepage = https://xnd.io/; + homepage = "https://xnd.io/"; license = lib.licenses.bsdOriginal; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 05da09ec5a468..a03fca12581f0 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://xmlsoft.org/XSLT/; + homepage = "http://xmlsoft.org/XSLT/"; description = "A C library and tools to do XSL transformations"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/libxsmm/default.nix b/pkgs/development/libraries/libxsmm/default.nix new file mode 100644 index 0000000000000..25c85948608a1 --- /dev/null +++ b/pkgs/development/libraries/libxsmm/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, coreutils, gfortran7, gnused +, python27, utillinux, which, bash +}: + +let + version = "1.15"; +in stdenv.mkDerivation { + pname = "libxsmm"; + inherit version; + + src = fetchFromGitHub { + owner = "hfp"; + repo = "libxsmm"; + rev = "refs/tags/${version}"; + sha256 = "1406qk7k2k4qfqy4psqk55iihsrx91w8kjgsa82jxj50nl9nw5nj"; + }; + + buildInputs = [ + coreutils + gfortran7 + gnused + python27 + utillinux + which + ]; + + prePatch = '' + patchShebangs . + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Library targeting Intel Architecture for specialized dense and sparse matrix operations, and deep learning primitives"; + license = licenses.bsd3; + homepage = "https://github.com/hfp/libxsmm"; + platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; [ chessai ]; + inherit version; + }; +} diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 143555137d724..7f723cf2ef8e5 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -5,19 +5,19 @@ stdenv.mkDerivation rec { pname = "libyaml"; - version = "0.2.2"; + version = "0.2.4"; src = fetchFromGitHub { owner = "yaml"; repo = "libyaml"; rev = version; - sha256 = "0839nqcmxjzfgjn39j7740pnlsgmvngpkamiw1lfy1qlcqyc3r4v"; + sha256 = "04z25mvw86jhzyrj0h8mlgisvj9glc5ww9g0cymzjfsd7z33gnmy"; }; nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = https://pyyaml.org/; + homepage = "https://pyyaml.org/"; description = "A YAML 1.1 parser and emitter written in C"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/development/libraries/libykclient/default.nix index e1bf4fca7b553..ea900477f356b 100644 --- a/pkgs/development/libraries/libykclient/default.nix +++ b/pkgs/development/libraries/libykclient/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Yubikey C client library"; - homepage = https://developers.yubico.com/yubico-c-client; + homepage = "https://developers.yubico.com/yubico-c-client"; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix index be493828486cf..cb4f3bec01180 100644 --- a/pkgs/development/libraries/libykneomgr/default.nix +++ b/pkgs/development/libraries/libykneomgr/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://developers.yubico.com/libykneomgr; + homepage = "https://developers.yubico.com/libykneomgr"; description = "A C library to interact with the CCID-part of the Yubikey NEO"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix index 010eecb0fa977..75170d7ff8aac 100644 --- a/pkgs/development/libraries/libyubikey/default.nix +++ b/pkgs/development/libraries/libyubikey/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://opensource.yubico.com/yubico-c/; + homepage = "http://opensource.yubico.com/yubico-c/"; description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix index 215535fb8f132..4341b1e20412f 100644 --- a/pkgs/development/libraries/libzapojit/default.nix +++ b/pkgs/development/libraries/libzapojit/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; - homepage = https://wiki.gnome.org/Projects/Zapojit; + homepage = "https://wiki.gnome.org/Projects/Zapojit"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix index 4e7168a021133..95f8e78cfb26f 100644 --- a/pkgs/development/libraries/libzdb/default.nix +++ b/pkgs/development/libraries/libzdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "3.2.1"; + version = "3.2.2"; pname = "libzdb"; src = fetchurl { url = "https://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz"; - sha256 = "1w9zzpgw3qzirsy5g4aaq1469kdq46gr2nhvrs3xqlwz1adbb9xr"; + sha256 = "1blmy7228649iscwlldrc1ldf31nhps1ps9xfv44ms0yxqhlw7nm"; }; buildInputs = [ sqlite ]; diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix index 85b9308237fe3..d3cbc430efc46 100644 --- a/pkgs/development/libraries/libzmf/default.nix +++ b/pkgs/development/libraries/libzmf/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mpl20; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; - homepage = https://wiki.documentfoundation.org/DLP/Libraries/libzmf; + homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libzmf"; downloadPage = "http://dev-www.libreoffice.org/src/libzmf/"; updateWalker = true; }; diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index 410c60bff9f32..0854987436e65 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip }: fetchzip { - url = https://github.com/lief-project/LIEF/releases/download/0.9.0/LIEF-0.9.0-Linux.tar.gz; + url = "https://github.com/lief-project/LIEF/releases/download/0.9.0/LIEF-0.9.0-Linux.tar.gz"; sha256 = "1c47hwd00bp4mqd4p5b6xjfl89c3wwk9ccyc3a2gk658250g2la6"; meta = with stdenv.lib; { description = "Library to Instrument Executable Formats"; - homepage = https://lief.quarkslab.com/; + homepage = "https://lief.quarkslab.com/"; license = [ licenses.asl20 ]; platforms = platforms.linux; maintainers = [ maintainers.lassulus ]; diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 24d99e691a288..65d0a18cedd09 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = https://www.gnu.org/software/lightning/; + homepage = "https://www.gnu.org/software/lightning/"; description = "Run-time code generation library"; longDescription = '' GNU lightning is a library that generates assembly language code diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 709a237aed9b3..2217996acdbce 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -4,10 +4,14 @@ , givaro , pkgconfig , blas +, lapack , fflas-ffpack , gmpxx , withSage ? false # sage support }: + +assert (!blas.isILP64) && (!lapack.isILP64); + stdenv.mkDerivation rec { pname = "linbox"; version = "1.6.3"; @@ -33,7 +37,7 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--with-blas-libs=-l${blas.linkName}" + "--with-blas-libs=-lblas" "--disable-optimization" ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) @@ -60,6 +64,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.timokau]; platforms = stdenv.lib.platforms.unix; - homepage = https://linalg.org/; + homepage = "https://linalg.org/"; }; } diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix index b105aa64bff9a..0a2dacb48db9d 100644 --- a/pkgs/development/libraries/linenoise-ng/default.nix +++ b/pkgs/development/libraries/linenoise-ng/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = { - homepage = https://github.com/arangodb/linenoise-ng; + homepage = "https://github.com/arangodb/linenoise-ng"; description = "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters"; maintainers = with stdenv.lib.maintainers; [ cstrahan ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix index 0098116563aed..3de9f08bf9714 100644 --- a/pkgs/development/libraries/linenoise/default.nix +++ b/pkgs/development/libraries/linenoise/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/antirez/linenoise; + homepage = "https://github.com/antirez/linenoise"; description = "A minimal, zero-config, BSD licensed, readline replacement"; maintainers = with stdenv.lib.maintainers; [ mpsyco ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index 8c691f7759166..b882e233c0791 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; meta = { - homepage = https://liquidsdr.org/; + homepage = "https://liquidsdr.org/"; description = "Digital signal processing library for software-defined radios"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix index 74952456e6422..1beae81ad16fc 100644 --- a/pkgs/development/libraries/liquidfun/default.nix +++ b/pkgs/development/libraries/liquidfun/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; license = stdenv.lib.licenses.bsd2; - homepage = https://google.github.io/liquidfun/; + homepage = "https://google.github.io/liquidfun/"; }; } diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 13fbe2b55b678..97079be096230 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, help2man, python3, - alsaLib, xlibsWrapper, libxslt, systemd, libusb, libftdi1 }: + alsaLib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }: stdenv.mkDerivation rec { name = "lirc-0.10.1"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig help2man (python3.withPackages (p: with p; [ pyyaml setuptools ])) ]; - buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ]; + buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb-compat-0_1 libftdi1 ]; configureFlags = [ "--sysconfdir=/etc" @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Allows to receive and send infrared signals"; - homepage = http://www.lirc.org/; + homepage = "https://www.lirc.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 25bac68faf6a2..513e842edfa59 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { offering the persistence of standard disk-based databases, and is only limited to the size of the virtual address space. ''; - homepage = http://symas.com/mdb/; + homepage = "http://symas.com/mdb/"; maintainers = with maintainers; [ jb55 vcunat ]; license = licenses.openldap; platforms = platforms.all; diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index 3a4b182dd94b8..097ff0c48c904 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; meta = { - homepage = http://log4cplus.sourceforge.net/; + homepage = "http://log4cplus.sourceforge.net/"; description = "A port the log4j library from Java to C++"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index 04b91e5d80fb4..cec0ec9ab287d 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool ]; meta = { - homepage = https://logging.apache.org/log4cxx/index.html; + homepage = "https://logging.apache.org/log4cxx/index.html"; description = "A logging framework for C++ patterned after Apache log4j"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix index ccf246c044e99..17046d17b78af 100644 --- a/pkgs/development/libraries/log4shib/default.nix +++ b/pkgs/development/libraries/log4shib/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { description = "A forked version of log4cpp that has been created for the Shibboleth project"; maintainers = [ maintainers.jammerful ]; license = licenses.lgpl21; - homepage = http://log4cpp.sf.net; + homepage = "http://log4cpp.sf.net"; }; } diff --git a/pkgs/development/libraries/loki/default.nix b/pkgs/development/libraries/loki/default.nix index 631233f0ecbe6..9c7e36113d868 100644 --- a/pkgs/development/libraries/loki/default.nix +++ b/pkgs/development/libraries/loki/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C++ library of designs, containing flexible implementations of common design patterns and idioms"; - homepage = http://loki-lib.sourceforge.net; + homepage = "http://loki-lib.sourceforge.net"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/development/libraries/lrdf/default.nix b/pkgs/development/libraries/lrdf/default.nix index 264c18b09ee46..80c8702b0b94f 100644 --- a/pkgs/development/libraries/lrdf/default.nix +++ b/pkgs/development/libraries/lrdf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight RDF library with special support for LADSPA plugins"; - homepage = https://sourceforge.net/projects/lrdf/; + homepage = "https://sourceforge.net/projects/lrdf/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index 7ca7456f78979..eded6b6527fea 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { }; meta = { - homepage = https://github.com/luabind/luabind; + homepage = "https://github.com/luabind/luabind"; description = "A library that helps you create bindings between C++ and Lua"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 32eec84e69ef8..3d54cf5e7c135 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ port of the popular Java Lucene search engine"; - homepage = https://github.com/luceneplusplus/LucenePlusPlus; + homepage = "https://github.com/luceneplusplus/LucenePlusPlus"; license = with stdenv.lib.licenses; [ asl20 lgpl3Plus ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/development/libraries/lyra/default.nix index e7227ac63885f..c0220e6e21db3 100644 --- a/pkgs/development/libraries/lyra/default.nix +++ b/pkgs/development/libraries/lyra/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lyra"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "bfgroup"; repo = "lyra"; rev = version; - sha256 = "0rpk1hadfcvjps5k307sddv23q73m2918wclfxfi6mj8l7gwkcn9"; + sha256 = "08g6kqaj079aq7i6c1pwj778lrr3yk188wn1byxdd6zqpwrsv71q"; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index c7667b554f4ee..446f914641459 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { while still decompressing at this very high speed. ''; - homepage = http://www.oberhumer.com/opensource/lzo; + homepage = "http://www.oberhumer.com/opensource/lzo"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/development/libraries/mac/default.nix index 7355248b5c584..a896b9261d524 100644 --- a/pkgs/development/libraries/mac/default.nix +++ b/pkgs/development/libraries/mac/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "APE codec and decompressor"; - homepage = http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php; + homepage = "http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"; license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 04f2208a35dab..75e3439db813e 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple and asynchronous API to work with e-mail protocols IMAP, POP and SMTP"; - homepage = http://libmailcore.com; + homepage = "http://libmailcore.com"; license = licenses.bsd3; maintainers = with maintainers; [ cstrahan ]; }; diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 351b38b3345ea..cf0539fe266fc 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source toolkit for developing mapping applications"; - homepage = https://mapnik.org; + homepage = "https://mapnik.org"; maintainers = with maintainers; [ hrdinka ]; license = licenses.lgpl21; platforms = platforms.all; diff --git a/pkgs/development/libraries/marisa/default.nix b/pkgs/development/libraries/marisa/default.nix index 4b06c58af5f76..9a4d178d3d27d 100644 --- a/pkgs/development/libraries/marisa/default.nix +++ b/pkgs/development/libraries/marisa/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = https://github.com/s-yata/marisa-trie; + homepage = "https://github.com/s-yata/marisa-trie"; description = "Static and space-efficient trie data structure library"; license = licenses.bsd3; maintainers = with maintainers; [ sifmelcara ]; diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix index cec9e5adc296a..4254bfe82ea2e 100644 --- a/pkgs/development/libraries/martyr/default.nix +++ b/pkgs/development/libraries/martyr/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Martyr is a Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state"; - homepage = http://martyr.sourceforge.net/; + homepage = "http://martyr.sourceforge.net/"; license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index 9f8f34e0a806a..e12280a088bd7 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.all; maintainers = [ maintainers.vbgl ]; - homepage = http://matio.sourceforge.net/; + homepage = "http://matio.sourceforge.net/"; }; } diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 603b9be610a1b..f24232ac7aec4 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_SHARED_MBEDTLS_LIBRARY=on" ]; meta = with stdenv.lib; { - homepage = https://tls.mbed.org/; + homepage = "https://tls.mbed.org/"; description = "Portable cryptographic and TLS library, formerly known as PolarSSL"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index cdc3dfa5ca0bf..a65e6b2153d76 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mdds"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "https://kohei.us/files/${pname}/src/${pname}-${version}.tar.bz2"; - sha256 = "03b8i43pw4m767mm0cnbi77x7qhpkzpi9b1f6dpp4cmyszmnsk8l"; + sha256 = "0zg0v9rfs92ff1gpnb06gzbxbnd9nqdar5fk8dnkmy0jpnf5qn7i"; }; postInstall = '' @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; - homepage = https://gitlab.com/mdds/mdds; + homepage = "https://gitlab.com/mdds/mdds"; description = "A collection of multi-dimensional data structure and indexing algorithm"; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix index 04ebfced52e81..7a5688a1b71f3 100644 --- a/pkgs/development/libraries/medfile/default.nix +++ b/pkgs/development/libraries/medfile/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to read and write MED files"; - homepage = http://salome-platform.org/; + homepage = "http://salome-platform.org/"; platforms = platforms.linux; license = licenses.lgpl3Plus; }; diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix index d64b7f123127e..d7b39c28a425d 100644 --- a/pkgs/development/libraries/menu-cache/default.nix +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Library to read freedesktop.org menu files"; - homepage = https://blog.lxde.org/tag/menu-cache/; + homepage = "https://blog.lxde.org/tag/menu-cache/"; license = licenses.gpl2Plus; maintainers = [ maintainers.ttuegel ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index dd2091c8a796a..9679ddb94e8c2 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "9.0.1"; src = fetchurl { - url = "ftp://ftp.freedesktop.org/pub/mesa/${pname}/${pname}-${version}.tar.xz"; + url = "https://mesa.freedesktop.org/archive/${pname}/${pname}-${version}.tar.xz"; sha256 = "1g2m634p73mixkzv1qz1d0flwm390ydi41bwmchiqvdssqnlqnpv"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "OpenGL utility library"; - homepage = https://cgit.freedesktop.org/mesa/glu/; + homepage = "https://cgit.freedesktop.org/mesa/glu/"; license = stdenv.lib.licenses.sgi-b-20; platforms = stdenv.lib.platforms.unix; broken = stdenv.hostPlatform.isAndroid; diff --git a/pkgs/development/libraries/metal/default.nix b/pkgs/development/libraries/metal/default.nix new file mode 100644 index 0000000000000..7e047c28d0a69 --- /dev/null +++ b/pkgs/development/libraries/metal/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake }: +stdenv.mkDerivation rec { + pname = "metal"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "brunocodutra"; + repo = "metal"; + rev = "v${version}"; + sha256 = "07n1aqyaixbd66l24km5ip3pkmidkx9m3saygf7cfp6vvbgmi42l"; + }; + + nativeBuildInputs = [ cmake ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Single-header C++11 library designed to make you love template metaprogramming"; + homepage = "https://github.com/brunocodutra/metal"; + license = licenses.mit; + maintainers = with maintainers; [ pmiddend ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix index 5f4dc5eedde54..06b6653f4e762 100644 --- a/pkgs/development/libraries/mimetic/default.nix +++ b/pkgs/development/libraries/mimetic/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MIME handling library"; - homepage = http://www.codesink.org/mimetic_mime_library.html; + homepage = "http://www.codesink.org/mimetic_mime_library.html"; license = licenses.mit; maintainers = with maintainers; [ leenaars]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/development/libraries/miniball/default.nix index 287241a75c927..d1804b9bf95fc 100644 --- a/pkgs/development/libraries/miniball/default.nix +++ b/pkgs/development/libraries/miniball/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Smallest Enclosing Balls of Points"; - homepage = https://www.inf.ethz.ch/personal/gaertner/miniball.html; + homepage = "https://www.inf.ethz.ch/personal/gaertner/miniball.html"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.erikryb ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix index 73b045aa96479..ec575aa08fd0e 100644 --- a/pkgs/development/libraries/minixml/default.nix +++ b/pkgs/development/libraries/minixml/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small XML library"; - homepage = https://www.msweet.org/mxml/; + homepage = "https://www.msweet.org/mxml/"; license = licenses.asl20; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 07c248fa58aca..5b54e0894e186 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source multimedia framework, designed for television broadcasting"; - homepage = https://www.mltframework.org; + homepage = "https://www.mltframework.org"; license = licenses.gpl3; maintainers = with maintainers; [ tohl peti ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index cb8ee0ce84914..f0b45753df016 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source multimedia framework, designed for television broadcasting"; - homepage = https://www.mltframework.org/; + homepage = "https://www.mltframework.org/"; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix index 9a789a58ccac1..890ab6fca11cb 100644 --- a/pkgs/development/libraries/mm-common/default.nix +++ b/pkgs/development/libraries/mm-common/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gtkmm.org"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 49116c349a86b..d011419cea7f0 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The official C client library for MongoDB"; - homepage = https://github.com/mongodb/mongo-c-driver; + homepage = "https://github.com/mongodb/mongo-c-driver"; license = licenses.asl20; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix index 2bba61975f9d4..d9c1636e59baa 100644 --- a/pkgs/development/libraries/mono-addins/default.nix +++ b/pkgs/development/libraries/mono-addins/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - homepage = https://www.mono-project.com/archived/monoaddins/; + homepage = "https://www.mono-project.com/archived/monoaddins/"; description = "A generic framework for creating extensible applications"; longDescription = '' Mono.Addins is a generic framework for creating extensible applications, diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix index ba61cb8414a10..f03ba81e8686b 100644 --- a/pkgs/development/libraries/motif/default.nix +++ b/pkgs/development/libraries/motif/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://motif.ics.com; + homepage = "https://motif.ics.com"; description = "Unix standard widget-toolkit and window-manager"; platforms = with platforms; linux ++ darwin; license = with licenses; [ lgpl21 ]; diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 8162d3bb911df..901d299728fa5 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High-performance, high-quality video filters for the GPU"; - homepage = https://movit.sesse.net; + homepage = "https://movit.sesse.net"; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index f920f637960f2..8fe1477aa63d2 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { as defined by ISO-IEC:14496-1:2001 MPEG-4 Systems. This container format is derived from Apple's QuickTime format. ''; - homepage = https://code.google.com/archive/p/mp4v2/; + homepage = "https://code.google.com/archive/p/mp4v2/"; maintainers = [ lib.maintainers.Anton-Latukha ]; platforms = lib.platforms.unix; license = lib.licenses.mpl11; diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix index fe46336649e12..88617e9a74091 100644 --- a/pkgs/development/libraries/mpfi/default.nix +++ b/pkgs/development/libraries/mpfi/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''A multiple precision interval arithmetic library based on MPFR''; - homepage = https://gforge.inria.fr/projects/mpfi/; + homepage = "https://gforge.inria.fr/projects/mpfi/"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index a91d220be33e6..ceba71ae06ae2 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://www.mpfr.org/; + homepage = "https://www.mpfr.org/"; description = "Library for multiple-precision floating-point arithmetic"; longDescription = '' diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 21803de5e0621..0c1ea8be1c83c 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -44,9 +44,9 @@ stdenv.mkDerivation rec { the Message Passing Interface (MPI) standard, both version 1 and version 2. ''; - homepage = http://www.mcs.anl.gov/mpi/mpich2/; + homepage = "http://www.mcs.anl.gov/mpi/mpich2/"; license = { - url = http://git.mpich.org/mpich.git/blob/a385d6d0d55e83c3709ae851967ce613e892cd21:/COPYRIGHT; + url = "http://git.mpich.org/mpich.git/blob/a385d6d0d55e83c3709ae851967ce613e892cd21:/COPYRIGHT"; fullName = "MPICH license (permissive)"; }; maintainers = [ maintainers.markuskowa ]; diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index 3b40f02c01c3a..8da59530ea5ae 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; downloadPage = "http://mpir.org/downloads.html"; - homepage = http://mpir.org/; + homepage = "http://mpir.org/"; updateWalker = true; }; } diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix index c8ea3315f8b7a..4cb743a38f8fb 100644 --- a/pkgs/development/libraries/msgpack/generic.nix +++ b/pkgs/development/libraries/msgpack/generic.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "MessagePack implementation for C and C++"; - homepage = https://msgpack.org; + homepage = "https://msgpack.org"; license = licenses.asl20; maintainers = with maintainers; [ redbaron ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix index 0ce4870272c3a..26066f1194f07 100644 --- a/pkgs/development/libraries/msgpuck/default.nix +++ b/pkgs/development/libraries/msgpuck/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''A simple and efficient MsgPack binary serialization library in a self-contained header file''; - homepage = https://github.com/rtsisyk/msgpuck; + homepage = "https://github.com/rtsisyk/msgpuck"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ izorkin ]; diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix index 7974e14040cd5..5c04c6a694288 100644 --- a/pkgs/development/libraries/mtdev/default.nix +++ b/pkgs/development/libraries/mtdev/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://bitmath.org/code/mtdev/; + homepage = "http://bitmath.org/code/mtdev/"; description = "Multitouch Protocol Translation Library"; longDescription = '' The mtdev is a stand-alone library which transforms all variants of diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index da41aceeef527..22b6644230553 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -1,35 +1,60 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig -, boost, openssl, zlib, libsodium, olm, nlohmann_json }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, pkgconfig +, boost17x +, openssl +, zlib +, libsodium +, olm +, spdlog +, nlohmann_json +}: stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "0pycznrvj57ff6gbwfn1xj943d2dr4vadl79hii1z16gn0nzxpmj"; + sha256 = "0vf5xmn6yfi5lvskfgrdmnalvclzrapcrml92bj9qaa8vq8mfsf2"; }; cmakeFlags = [ + # Network requiring tests can't be disabled individually: + # https://github.com/Nheko-Reborn/mtxclient/issues/22 "-DBUILD_LIB_TESTS=OFF" "-DBUILD_LIB_EXAMPLES=OFF" "-Dnlohmann_json_DIR=${nlohmann_json}/lib/cmake/nlohmann_json" + # Can be removed once either https://github.com/NixOS/nixpkgs/pull/85254 or + # https://github.com/NixOS/nixpkgs/pull/73940 are merged + "-DBoost_NO_BOOST_CMAKE=TRUE" ]; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ boost openssl zlib libsodium olm ]; + nativeBuildInputs = [ + cmake + pkgconfig + ]; + buildInputs = [ + spdlog + boost17x + openssl + zlib + libsodium + olm + ]; meta = with stdenv.lib; { description = "Client API library for Matrix, built on top of Boost.Asio"; - homepage = https://github.com/Nheko-Reborn/mtxclient; + homepage = "https://github.com/Nheko-Reborn/mtxclient"; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; - platforms = platforms.unix; - - # As of 2019-06-30, all of the dependencies are available on macOS but the - # package itself does not build. - broken = stdenv.isDarwin; + platforms = platforms.all; + # Should be fixable if a higher clang version is used, see: + # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 + broken = stdenv.targetPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/multipart-parser-c/default.nix b/pkgs/development/libraries/multipart-parser-c/default.nix index 8808ccefeaf1c..e641b404a8672 100644 --- a/pkgs/development/libraries/multipart-parser-c/default.nix +++ b/pkgs/development/libraries/multipart-parser-c/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Http multipart parser implemented in C "; - homepage = https://github.com/iafonov/multipart-parser-c; + homepage = "https://github.com/iafonov/multipart-parser-c"; license = [ stdenv.lib.licenses.mit ]; }; diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix index 4d3fe41dff826..8aac20e19d0fd 100644 --- a/pkgs/development/libraries/muparser/default.nix +++ b/pkgs/development/libraries/muparser/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals stdenv.isDarwin [setfile]; meta = { - homepage = http://muparser.sourceforge.net; + homepage = "http://muparser.sourceforge.net"; description = "An extensible high performance math expression parser library written in C++"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix index 37bfb05c4eef6..ae40ab9f89536 100644 --- a/pkgs/development/libraries/mutest/default.nix +++ b/pkgs/development/libraries/mutest/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { doCheck = true; meta = with stdenv.lib; { - homepage = https://ebassi.github.io/mutest/mutest.md.html; + homepage = "https://ebassi.github.io/mutest/mutest.md.html"; description = "A BDD testing framework for C, inspired by Mocha"; license = licenses.mit; maintainers = with maintainers; [ jtojnar worldofpeace ]; diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index c277b7934b9ba..94c578f6c268b 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DMYGUI_BUILD_TOOLS=OFF" "-DMYGUI_BUILD_DEMOS=OFF" "-DMYGUI_RENDERSYSTEM=${renderSystem}" ]; meta = with stdenv.lib; { - homepage = http://mygui.info/; + homepage = "http://mygui.info/"; description = "Library for creating GUIs for games and 3D applications"; license = licenses.lgpl3Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index 8164f4ec9729a..1e2e3982d55d4 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "mysocketw-031026"; src = fetchurl { - url = http://www.digitalfanatics.org/cal/socketw/files/SocketW031026.tar.gz; + url = "http://www.digitalfanatics.org/cal/socketw/files/SocketW031026.tar.gz"; sha256 = "0crinikhdl7xihzmc3k3k41pgxy16d5ci8m9sza1lbibns7pdwj4"; }; diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix index 01bf863bbbb14..1cd8612c3bb01 100644 --- a/pkgs/development/libraries/mythes/default.nix +++ b/pkgs/development/libraries/mythes/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ncurses pkgconfig perl ]; meta = { - homepage = http://hunspell.sourceforge.net/; + homepage = "http://hunspell.sourceforge.net/"; description = "Thesaurus library from Hunspell project"; license = stdenv.lib.licenses.bsd3; inherit (hunspell.meta) platforms; diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index 94bc8186f30c8..7e96d60840d11 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description= "Socket library that provides several common communication patterns"; - homepage = https://nanomsg.org/; + homepage = "https://nanomsg.org/"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 321e4e0560d90..629c064404ba0 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -1,17 +1,24 @@ -{ stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex }: +{ stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }: stdenv.mkDerivation rec { version = "4.9.2"; pname = "nco"; nativeBuildInputs = [ flex which ]; - buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr curl ]; + buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr curl coreutils ]; src = fetchzip { url = "https://github.com/nco/nco/archive/${version}.tar.gz"; sha256 = "0nip9dmdx3d5nc30bz1d2w9his1dph136l53r160aa3bmb29xwqn"; }; + prePatch = '' + substituteInPlace src/nco/nco_fl_utl.c \ + --replace "/bin/cp" "${coreutils}/bin/cp" + substituteInPlace src/nco/nco_fl_utl.c \ + --replace "/bin/mv" "${coreutils}/bin/mv" + ''; + meta = { description = "NetCDF Operator toolkit"; longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5"; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 8b91246b6fdc6..0e75bfbd5b518 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { ported to OS/2 Warp! ''; - homepage = https://www.gnu.org/software/ncurses/; + homepage = "https://www.gnu.org/software/ncurses/"; license = lib.licenses.mit; platforms = lib.platforms.all; diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/development/libraries/ndi/default.nix index 7a4407a17f0dc..ec39bbd659370 100644 --- a/pkgs/development/libraries/ndi/default.nix +++ b/pkgs/development/libraries/ndi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ndi"; - fullVersion = "4.1.6"; + fullVersion = "4.5.1"; version = builtins.head (builtins.splitVersion fullVersion); src = requireFile rec { name = "InstallNDISDK_v${version}_Linux.tar.gz"; - sha256 = "0hki805j3hlci6w5ca2cajm5q0y9yihgvpsykkn8dzx8chw4pmsk"; + sha256 = "04l57cfc88cdqa9015h5g1csr7xfjxp75x8qz8bsqk1dizp9ir6r"; message = '' In order to use NDI SDK version ${fullVersion}, you need to comply with NewTek's license and download the appropriate Linux tarball from: diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index 7f08d0a753513..d461535ecef0c 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { "--boost-libs=${boost.out}/lib" ]; meta = with stdenv.lib; { - homepage = http://named-data.net/; + homepage = "http://named-data.net/"; description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction"; longDescription = '' ndn-cxx is a C++ library, implementing Named Data Networking (NDN) diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index d813d6c519ca4..c10b396fe0b18 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { longDescription = '' nDPI is a library for deep-packet inspection based on OpenDPI. ''; - homepage = https://www.ntop.org/products/deep-packet-inspection/ndpi/; + homepage = "https://www.ntop.org/products/deep-packet-inspection/ndpi/"; license = with licenses; lgpl3; maintainers = with maintainers; [ takikawa ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index a79c42a1c8f44..6f0dbf032a9ab 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "C APIs to exchange datas with the NFC daemon 'Neard'"; license = licenses.lgpl2; - homepage = https://01.org/linux-nfc; + homepage = "https://01.org/linux-nfc"; maintainers = with maintainers; [ tstrobel ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index fbffb138e969d..c60f5e60fb8f6 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An HTTP and WebDAV client library"; - homepage = http://www.webdav.org/neon/; + homepage = "http://www.webdav.org/neon/"; platforms = platforms.unix; license = licenses.lgpl2; }; diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index 665145a92ac41..526e02e89079d 100644 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ API to manipulate netcdf files"; - homepage = https://www.unidata.ucar.edu/software/netcdf/; + homepage = "https://www.unidata.ucar.edu/software/netcdf/"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index c9c52636a5b74..ab10c6861635d 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fortran API to manipulate netcdf files"; - homepage = https://www.unidata.ucar.edu/software/netcdf/; + homepage = "https://www.unidata.ucar.edu/software/netcdf/"; license = licenses.free; maintainers = [ maintainers.bzizou ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 1436fb0212715..2e16f58d9fb5a 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -10,11 +10,11 @@ let mpi = hdf5.mpi; in stdenv.mkDerivation rec { pname = "netcdf"; - version = "4.7.3"; + version = "4.7.4"; src = fetchurl { url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${pname}-c-${version}.tar.gz"; - sha256 = "12s4w2s96p51hlsa81lw92w56rdx8i3mk21pz2ydwcamw579z34f"; + sha256 = "1a2fpp15a2rl1m50gcvvzd9y6bavl6vjf9zzf63sz5gdmq06yiqf"; }; postPatch = '' @@ -47,9 +47,9 @@ in stdenv.mkDerivation rec { meta = { description = "Libraries for the Unidata network Common Data Format"; platforms = stdenv.lib.platforms.unix; - homepage = https://www.unidata.ucar.edu/software/netcdf/; + homepage = "https://www.unidata.ucar.edu/software/netcdf/"; license = { - url = https://www.unidata.ucar.edu/software/netcdf/docs/copyright.html; + url = "https://www.unidata.ucar.edu/software/netcdf/docs/copyright.html"; }; }; } diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 36c9f0e6ac75b..7c0c6476bd056 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.5.1"; + version = "3.6"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "06clvkdfxhlbagn4afssylmn5vrak59dlmnvy8b2xc31hycs3k3m"; + sha256 = "1wg3sprl0bzy49cmbwwm91vw67hk1x5i3ksdygsciyxz587hsk6j"; }; }) diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix index 9939cbf606793..4c3c6d04ca888 100644 --- a/pkgs/development/libraries/nettle/generic.nix +++ b/pkgs/development/libraries/nettle/generic.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation ({ license = licenses.gpl2Plus; - homepage = http://www.lysator.liu.se/~nisse/nettle/; + homepage = "http://www.lysator.liu.se/~nisse/nettle/"; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index 60dc00a335d9e..0dade017d08f2 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://fedorahosted.org/newt/; + homepage = "https://fedorahosted.org/newt/"; description = "Library for color text mode, widget based user interfaces"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index eae4563cf80e5..939f137ac3e91 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc meta = with stdenv.lib; { - homepage = https://nghttp2.org/; + homepage = "https://nghttp2.org/"; description = "A C implementation of HTTP/2"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/ngt/default.nix b/pkgs/development/libraries/ngt/default.nix index c66eceb5e7f07..114a438ea1ee8 100644 --- a/pkgs/development/libraries/ngt/default.nix +++ b/pkgs/development/libraries/ngt/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/yahoojapan/NGT; + homepage = "https://github.com/yahoojapan/NGT"; description = "Nearest Neighbor Search with Neighborhood Graph and Tree for High-dimensional Data"; platforms = platforms.linux ++ platforms.darwin; license = licenses.asl20; diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 442fcf2e76150..f7a608d5c0a97 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Collection of miscellaneous plugins for the nix expression language"; - homepage = https://github.com/shlevy/nix-plugins; + homepage = "https://github.com/shlevy/nix-plugins"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 43a7cf15c15b1..a4e76506a22d2 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Header only C++ library for the JSON file format"; - homepage = https://github.com/nlohmann/json; + homepage = "https://github.com/nlohmann/json"; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix index 2cbf88633e7bb..c3ef724501e27 100644 --- a/pkgs/development/libraries/npapi-sdk/default.nix +++ b/pkgs/development/libraries/npapi-sdk/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A bundle of NPAPI headers by Mozilla"; - homepage = https://bitbucket.org/mgorny/npapi-sdk; # see also https://github.com/mozilla/npapi-sdk + homepage = "https://bitbucket.org/mgorny/npapi-sdk"; # see also https://github.com/mozilla/npapi-sdk license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix index c02998184fc56..51512a160570b 100644 --- a/pkgs/development/libraries/npth/default.nix +++ b/pkgs/development/libraries/npth/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { compatible to GNU Pth. Experience with a Windows Pth emulation showed that this is a solid way to provide a co-routine based framework. ''; - homepage = http://www.gnupg.org; + homepage = "http://www.gnupg.org"; license = licenses.lgpl3; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 5733fd41d6a48..31a9f7f20d1af 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.mozilla.org/projects/nspr/; + homepage = "http://www.mozilla.org/projects/nspr/"; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; platforms = platforms.all; license = licenses.mpl20; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 3b3f522fdb9ed..d48b5a6ba735c 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -2,10 +2,10 @@ let nssPEM = fetchurl { - url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz; + url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz"; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.51"; + version = "3.52"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "1725d0idf5zzqafdqfdn9vprc7ys2ywhv23sqn328di968xqnd3m"; + sha256 = "0q8m9jf6zgkbhx71myjb7y0gcl5ib3gj6qkl9yvdqpd6vl6fn2ha"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -27,8 +27,12 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; prePatch = '' - # strip the trailing whitespace from the patch line… - xz -d < ${nssPEM} | sed -e '/^-DIRS = builtins $/ s/ $//' | patch -p1 + # strip the trailing whitespace from the patch line and the renamed CKO_NETSCAPE_ enum to CKO_NSS_ + xz -d < ${nssPEM} | sed \ + -e '/^-DIRS = builtins $/ s/ $//' \ + -e 's/CKO_NETSCAPE_/CKO_NSS_/g' \ + -e 's/CKT_NETSCAPE_/CKT_NSS_/g' \ + | patch -p1 ''; patches = @@ -132,7 +136,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://developer.mozilla.org/en-US/docs/NSS; + homepage = "https://developer.mozilla.org/en-US/docs/NSS"; description = "A set of libraries for development of security-enabled client and server applications"; license = licenses.mpl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index a4d1e275a0a81..0d9d39f39581c 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; # Upstream contact: maintainer is victorshoup on GitHub. Alternatively the # email listed on the homepage. - homepage = http://www.shoup.net/ntl/; + homepage = "http://www.shoup.net/ntl/"; # also locally at "${src}/doc/tour-changes.html"; changelog = "https://www.shoup.net/ntl/doc/tour-changes.html"; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 803906b134376..17a294adc4b76 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Network Connectivity Tracking library for Desktop Applications"; - homepage = https://launchpad.net/ntrack; + homepage = "https://launchpad.net/ntrack"; platforms = platforms.linux; license = licenses.lgpl3Plus; }; diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index 0cda3d6ac9a27..57c47c79f8434 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuspell"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "19mwjg5mz645i4ijhx93rqbcim14ca6nczymr20p0z0pn5mx5p18"; + sha256 = "18zz3rdzlb3knzsd98vw8cfyb3iq0ilipnlz7rz10zgb5ail73s2"; }; nativeBuildInputs = [ cmake pkgconfig ronn ]; diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix index 70c48631981fd..f9b745e882f35 100644 --- a/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set of cuda-enabled texture tools and compressors"; - homepage = https://github.com/castano/nvidia-texture-tools; + homepage = "https://github.com/castano/nvidia-texture-tools"; license = licenses.mit; platforms = platforms.unix; broken = stdenv.isAarch64; diff --git a/pkgs/development/libraries/nvidia-video-sdk/default.nix b/pkgs/development/libraries/nvidia-video-sdk/default.nix index b7d46cd5537d5..d08f71855882a 100644 --- a/pkgs/development/libraries/nvidia-video-sdk/default.nix +++ b/pkgs/development/libraries/nvidia-video-sdk/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The NVIDIA Video Codec SDK"; - homepage = https://developer.nvidia.com/nvidia-video-codec-sdk; + homepage = "https://developer.nvidia.com/nvidia-video-codec-sdk"; license = licenses.unfree; }; } diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index 84205253554cc..30a8790b99a42 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OpenCL ICD Loader for ${opencl-headers.name}"; - homepage = https://forge.imag.fr/projects/ocl-icd/; + homepage = "https://forge.imag.fr/projects/ocl-icd/"; license = licenses.bsd2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index a540d89ed3b7d..d6047d1b1921a 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open Dynamics Engine"; - homepage = https://sourceforge.net/projects/opende; + homepage = "https://sourceforge.net/projects/opende"; platforms = platforms.linux; license = with licenses; [ bsd3 lgpl21 lgpl3 zlib ]; }; diff --git a/pkgs/development/libraries/ogre/1.10.x.nix b/pkgs/development/libraries/ogre/1.10.x.nix index b66759524fafb..fe23181cfc676 100644 --- a/pkgs/development/libraries/ogre/1.10.x.nix +++ b/pkgs/development/libraries/ogre/1.10.x.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "A 3D engine"; - homepage = https://www.ogre3d.org/; + homepage = "https://www.ogre3d.org/"; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix index ced0158018599..29c83a2962ee5 100644 --- a/pkgs/development/libraries/ogre/1.9.x.nix +++ b/pkgs/development/libraries/ogre/1.9.x.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "A 3D engine"; - homepage = https://www.ogre3d.org/; + homepage = "https://www.ogre3d.org/"; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 235da872392d8..491ff4edddc68 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "A 3D engine"; - homepage = https://www.ogre3d.org/; + homepage = "https://www.ogre3d.org/"; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index 0844c44c8a8bc..e4dc186f389cf 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Paged Geometry for Ogre3D"; - homepage = https://github.com/RigsOfRods/ogre-paged; + homepage = "https://github.com/RigsOfRods/ogre-paged"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix index c1b065dbf2b40..f750e4a685bb5 100644 --- a/pkgs/development/libraries/ois/default.nix +++ b/pkgs/development/libraries/ois/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { - url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-games/ois/files/ois-1.3-gcc47.patch; + url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-games/ois/files/ois-1.3-gcc47.patch"; sha256 = "026jw06n42bcrmg0sbdhzc4cqxsnf7fw30a2z9cigd9x282zhii8"; name = "gcc47.patch"; }) diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index f63d1d30f5587..c84e66608f2a1 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Implements double cryptographic ratchet and Megolm ratchet"; license = stdenv.lib.licenses.asl20; - homepage = https://matrix.org/git/olm/about; + homepage = "https://matrix.org/git/olm/about"; platforms = with stdenv.lib.platforms; darwin ++ linux; }; } diff --git a/pkgs/development/libraries/dnnl/default.nix b/pkgs/development/libraries/oneDNN/default.nix index 40d9030b9534d..7d9adca074c68 100644 --- a/pkgs/development/libraries/dnnl/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -1,23 +1,19 @@ -{ stdenv, lib, fetchFromGitHub, substituteAll, cmake, bash }: +{ stdenv, lib, fetchFromGitHub, cmake }: +# This was originally called mkl-dnn, then it was renamed to dnnl, and it has +# just recently been renamed again to oneDNN. See here for details: +# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { - pname = "dnnl"; - version = "1.2.2"; + pname = "oneDNN"; + version = "1.4"; src = fetchFromGitHub { - owner = "intel"; - repo = "mkl-dnn"; + owner = "oneapi-src"; + repo = "oneDNN"; rev = "v${version}"; - sha256 = "0ydy7ibm6sh1awrikyj938n26cpg5magnxraz2d0pj76irv4vj5m"; + sha256 = "162fb0c7klahz2irchhyxympi4fq4yp284apc53cadbss41mzld9"; }; - # Generic fix merged upstream in https://github.com/intel/mkl-dnn/pull/631 - # Delete after next release - patches = [ (substituteAll { - src = ./bash-to-sh.patch; - inherit bash; - }) ]; - outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ cmake ]; @@ -36,8 +32,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Deep Neural Network Library (DNNL)"; - homepage = "https://intel.github.io/mkl-dnn/dev_guide_transition_to_dnnl.html"; + description = "oneAPI Deep Neural Network Library (oneDNN)"; + homepage = "https://01.org/dnnl"; + changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}"; license = licenses.asl20; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ alexarice bhipple ]; diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index e4cbfc7f0b4fe..ccbb1e3a6650b 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = https://github.com/kkos/oniguruma; + homepage = "https://github.com/kkos/oniguruma"; description = "Regular expressions library"; license = licenses.bsd2; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/development/libraries/opae/default.nix index 46b03720d16cb..683f2c43bdc88 100644 --- a/pkgs/development/libraries/opae/default.nix +++ b/pkgs/development/libraries/opae/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open Programmable Acceleration Engine SDK"; - homepage = https://01.org/opae; + homepage = "https://01.org/opae"; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index 20528ac9284f8..efc5a18f2b0f6 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "OpenAL alternative"; - homepage = https://kcat.strangesoft.net/openal.html; + homepage = "https://kcat.strangesoft.net/openal.html"; license = licenses.lgpl2; maintainers = with maintainers; [ftrvxmtrx]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index 3838e1103ba3f..d074db7d165c9 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ # ARM / AArch64 fixes. (fetchpatch { - url = https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e168216.patch; + url = "https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e168216.patch"; sha256 = "0wjqjrkr4pfirzzicdvlyr591vppydk572ix28jd2sagnfnf566g"; }) ]; diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix index 4d4505c3e703e..1516e675d7394 100644 --- a/pkgs/development/libraries/openbr/default.nix +++ b/pkgs/development/libraries/openbr/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Open Source Biometric Recognition"; - homepage = http://openbiometrics.org/; + homepage = "http://openbiometrics.org/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [flosse]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix index 50794863defb5..8b7df317b2ba3 100644 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ b/pkgs/development/libraries/opencl-clang/default.nix @@ -86,7 +86,7 @@ let ]; meta = with stdenv.lib; { - homepage = https://github.com/intel/opencl-clang/; + homepage = "https://github.com/intel/opencl-clang/"; description = "A clang wrapper library with an OpenCL-oriented API and the ability to compile OpenCL C kernels to SPIR-V modules"; license = licenses.ncsa; platforms = platforms.all; diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix index cb8d9c788ca91..bf45bc90f197a 100644 --- a/pkgs/development/libraries/opencl-clhpp/default.nix +++ b/pkgs/development/libraries/opencl-clhpp/default.nix @@ -15,9 +15,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ opencl-headers ]; - preConfigure = '' - cmakeFlags="-DCMAKE_INSTALL_PREFIX=$out/include -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF" - ''; + cmakeFlags = [ + "-DBUILD_EXAMPLES=OFF" + "-DBUILD_TESTS=OFF" + ]; meta = with stdenv.lib; { description = "OpenCL Host API C++ bindings"; diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index 9bd25bfb93a83..388c473125b8d 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "A library for handling the COLLADA file format"; - homepage = https://github.com/KhronosGroup/OpenCOLLADA/; + homepage = "https://github.com/KhronosGroup/OpenCOLLADA/"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 06eff9d17f364..a60051dbd5f58 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://opencolorio.org; + homepage = "https://opencolorio.org"; description = "A color management framework for visual effects and animation"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix index e2d34ae5f07bd..4848ef864bf2d 100644 --- a/pkgs/development/libraries/opencore-amr/default.nix +++ b/pkgs/development/libraries/opencore-amr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; meta = { - homepage = https://opencore-amr.sourceforge.io/; + homepage = "https://opencore-amr.sourceforge.io/"; description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. Library of VisualOn implementation of Adaptive Multi Rate Wideband (AMR-WB)"; license = stdenv.lib.licenses.asl20; diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index cf46077a56cd2..00d489508add0 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Constructive Solid Geometry library"; - homepage = http://www.opencsg.org/; + homepage = "http://www.opencsg.org/"; platforms = platforms.unix; maintainers = [ maintainers.raskin ]; license = licenses.gpl2; diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix index 5f1c2b5c6f60a..27a832daf475d 100644 --- a/pkgs/development/libraries/openct/default.nix +++ b/pkgs/development/libraries/openct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcsclite, libusb +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcsclite, libusb-compat-0_1 , doxygen, libxslt }: @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ pcsclite libusb doxygen libxslt ]; + buildInputs = [ pcsclite libusb-compat-0_1 doxygen libxslt ]; preInstall = '' mkdir -p $out/etc ''; meta = with stdenv.lib; { - homepage = https://github.com/OpenSC/openct/; + homepage = "https://github.com/OpenSC/openct/"; license = licenses.lgpl21; description = "Drivers for several smart card readers"; platforms = platforms.all; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 642facf166a6b..6f327ca396a91 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -11,7 +11,7 @@ , enableEXR ? !stdenv.isDarwin, openexr, ilmbase , enableJPEG2K ? false, jasper # disable jasper by default (many CVE) , enableEigen ? true, eigen -, enableOpenblas ? true, openblas +, enableOpenblas ? true, openblas, blas, lapack , enableContrib ? true , enableCuda ? (config.cudaSupport or false) && @@ -35,6 +35,8 @@ , AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2 }: +assert blas.implementation == "openblas" && lapack.implementation == "openblas"; + let version = "3.4.8"; @@ -274,7 +276,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open Computer Vision Library with more than 500 algorithms"; - homepage = https://opencv.org/; + homepage = "https://opencv.org/"; license = with licenses; if enableUnfree then unfree else bsd3; maintainers = with maintainers; [mdaiter basvandijk]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 519d4ecd21556..9dcb9956838bc 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -11,7 +11,7 @@ , enableEXR ? !stdenv.isDarwin, openexr, ilmbase , enableJPEG2K ? false, jasper # disable jasper by default (many CVE) , enableEigen ? true, eigen -, enableOpenblas ? true, openblas +, enableOpenblas ? true, openblas, blas, lapack , enableContrib ? true , enableCuda ? (config.cudaSupport or false) && @@ -35,21 +35,23 @@ , AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2 }: +assert blas.implementation == "openblas" && lapack.implementation == "openblas"; + let - version = "4.1.2"; + version = "4.3.0"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "0c98ziwvfrzdzwn52a36d37n5rac8zmxq2jn479bzfaii1bib8xx"; + sha256 = "1r9bq9p1x99g2y8jvj9428sgqvljz75dm5vrfsma7hh5wjhz9775"; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "10ryyxhggin5dk5glf4ycyrfryqf50f4bs10biv6nxlrrinm2di4"; + sha256 = "068b4f95rlryab3mffxs2w6dnbmbhrnpsdgl007rxk4bwnz29y49"; }; # Contrib must be built in order to enable Tesseract support: @@ -60,8 +62,8 @@ let src = fetchFromGitHub { owner = "opencv"; repo = "opencv_3rdparty"; - rev = "32e315a5b106a7b89dbed51c28f8120a48b368b4"; - sha256 = "19w9f0r16072s59diqxsr5q6nmwyz9gnxjs49nglzhd66p3ddbkp"; + rev = "a56b6ac6f030c312b2dce17430eef13aed9af274"; + sha256 = "1msbkc3zixx61rcg6a04i1bcfhw1phgsrh93glq1n80hgsk3nbjq"; } + "/ippicv"; files = let name = platform : "ippicv_2019_${platform}_general_20180723.tgz"; in if stdenv.hostPlatform.system == "x86_64-linux" then @@ -166,7 +168,9 @@ stdenv.mkDerivation { # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with # what appears to be some stray headers in dnn/misc/tensorflow # in contrib when generating the Python bindings: - patches = lib.optional enableCuda ./cuda_opt_flow.patch; + patches = [ + ./cmake-don-t-use-OpenCVFindOpenEXR.patch + ] ++ lib.optional enableCuda ./cuda_opt_flow.patch; postPatch = '' sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt sed -i -e 's|if len(decls) == 0:|if len(decls) == 0 or "opencv2/" not in hdr:|' ./modules/python/src2/gen2.py @@ -288,7 +292,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open Computer Vision Library with more than 500 algorithms"; - homepage = https://opencv.org/; + homepage = "https://opencv.org/"; license = with licenses; if enableUnfree then unfree else bsd3; maintainers = with maintainers; [mdaiter basvandijk]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch b/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch new file mode 100644 index 0000000000000..dc80b09b6463e --- /dev/null +++ b/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch @@ -0,0 +1,55 @@ +From 6d988c08e852379a163ecd20df8639196d84d014 Mon Sep 17 00:00:00 2001 +From: Bernardo Meurer <meurerbernardo@gmail.com> +Date: Sun, 26 Apr 2020 14:50:25 -0700 +Subject: [PATCH] cmake: don't use OpenCVFindOpenEXR + +Use find_package for this. +--- + CMakeLists.txt | 2 ++ + cmake/OpenCVFindLibsGrfmt.cmake | 15 +++------------ + 2 files changed, 5 insertions(+), 12 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4c0b3880fc..0360469350 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,6 +14,8 @@ FATAL: In-source builds are not allowed. + ") + endif() + ++# the future! ++include(FindPkgConfig) + + include(cmake/OpenCVMinDepVersions.cmake) + +diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake +index 0beaf19317..4c5e46e615 100644 +--- a/cmake/OpenCVFindLibsGrfmt.cmake ++++ b/cmake/OpenCVFindLibsGrfmt.cmake +@@ -227,20 +227,11 @@ endif() + # --- OpenEXR (optional) --- + if(WITH_OPENEXR) + ocv_clear_vars(HAVE_OPENEXR) +- if(NOT BUILD_OPENEXR) +- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake") +- endif() +- ++ pkg_check_modules(OPENEXR OpenEXR) + if(OPENEXR_FOUND) + set(HAVE_OPENEXR YES) +- else() +- ocv_clear_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION) +- +- set(OPENEXR_LIBRARIES IlmImf) +- add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/openexr") +- if(OPENEXR_VERSION) # check via TARGET doesn't work +- set(HAVE_OPENEXR YES) +- endif() ++ set(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_DIRS}) ++ set(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES}) + endif() + endif() + +-- +2.26.1 + diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index ad27742d0b4cd..f637e730179ba 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open Computer Vision Library with more than 500 algorithms"; - homepage = https://opencv.org/; + homepage = "https://opencv.org/"; license = licenses.bsd3; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 2abad0f705fa6..a62138e8ccf4f 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "1q1fwk8wwk9r6bp0indpr60ql668lsk16ykslacyhrh7kg97kvhr"; + sha256 = "10sbiwjljxi0a1q3xakmf6v02x3yf38ljvjpql70q4rqggqj9zhh"; }; nativeBuildInputs = @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C++11 Kademlia distributed hash table implementation"; - homepage = https://github.com/savoirfairelinux/opendht; + homepage = "https://github.com/savoirfairelinux/opendht"; license = licenses.gpl3Plus; maintainers = with maintainers; [ taeer olynch thoughtpolice ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index 66496af12f93f..7cbd85055ef6d 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C library for producing DKIM-aware applications and an open source milter for providing DKIM service"; - homepage = http://www.opendkim.org/; + homepage = "http://www.opendkim.org/"; maintainers = with maintainers; [ abbradar ]; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/openexr/bootstrap.patch b/pkgs/development/libraries/openexr/bootstrap.patch deleted file mode 100644 index af6669c16a45f..0000000000000 --- a/pkgs/development/libraries/openexr/bootstrap.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ur openexr-v2.2.0-src-orig/OpenEXR/bootstrap openexr-v2.2.0-src/OpenEXR/bootstrap ---- OpenEXR/bootstrap 2015-03-31 01:02:41.000000000 -0400 -+++ OpenEXR/bootstrap 2015-03-31 01:03:35.000000000 -0400 -@@ -47,11 +47,6 @@ - fi - } - --# Check if /usr/local/share/aclocal exists --if [ -d /usr/local/share/aclocal ]; then -- ACLOCAL_INCLUDE="$ACLOCAL_INCLUDE -I /usr/local/share/aclocal" --fi -- - run_cmd aclocal -I m4 $ACLOCAL_INCLUDE - run_cmd $LIBTOOLIZE --automake --copy - run_cmd automake --add-missing --copy diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 328bce35357f9..425afc70f37c2 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -1,58 +1,29 @@ -{ lib, stdenv, buildPackages, fetchurl, autoconf, automake, libtool, pkgconfig, - zlib, ilmbase, fetchpatch }: - -let - # Doesn't really do anything when not crosscompiling - emulator = stdenv.hostPlatform.emulator buildPackages; -in - +{ lib +, stdenv +, buildPackages +, fetchFromGitHub +, zlib +, ilmbase +, fetchpatch +, cmake +, libtool +}: stdenv.mkDerivation rec { pname = "openexr"; - version = lib.getVersion ilmbase; + version = "2.4.1"; - src = fetchurl { - url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "19jywbs9qjvsbkvlvzayzi81s976k53wg53vw4xj66lcgylb6v7x"; + src = fetchFromGitHub { + owner = "AcademySoftwareFoundation"; + repo = "openexr"; + rev = "v${version}"; + sha256 = "020gyl8zv83ag6gbcchmqiyx9rh2jca7j8n52zx1gk4rck7kwc01"; }; - patches = [ - ./bootstrap.patch - (fetchpatch { - name = "CVE-2018-18444.patch"; - url = "https://github.com/openexr/openexr/commit/1b0f1e5d7dcf2e9d6cbb4e005e803808b010b1e0.patch"; - sha256 = "0f5m4wdwqqg8wfg7azzsz5yfpdrvws314rd4sqfc74j1g6wrcnqj"; - stripLen = 1; - }) - ]; - outputs = [ "bin" "dev" "out" "doc" ]; - - # Needed because there are some generated sources. Solution: just run them under QEMU. - postPatch = '' - for file in b44ExpLogTable dwaLookups - do - # Ecape for both sh and Automake - emu=${lib.escapeShellArg (lib.replaceStrings ["$"] ["$$"] emulator)} - before="./$file > $file.h" - after="$emu $before" - substituteInPlace IlmImf/Makefile.am \ - --replace "$before" "$after" - done - - # Make sure the patch succeeded - [[ $(grep "$emu" IlmImf/Makefile.am | wc -l) = 2 ]] - ''; - - preConfigure = '' - patchShebangs ./bootstrap - ./bootstrap - ''; - - nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; + nativeBuildInputs = [ cmake libtool ]; propagatedBuildInputs = [ ilmbase zlib ]; enableParallelBuilding = true; - doCheck = false; # fails 1 of 1 tests meta = with stdenv.lib; { description = "A high dynamic-range (HDR) image file format"; diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index 51ed495a99598..a8e65aebc450b 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "openfst"; - version = "1.7.4"; + version = "1.7.6"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz"; - sha256 = "0drhq5348vbaccpa0z3jvd5hyv5bm2i9xrak1wb4yvl2mx77dbmh"; + sha256 = "03hs0196qbjfbviqn6nnb7igvv3cnpxyizlwlzmx88a6fhiq97bm"; }; meta = { description = "Library for working with finite-state transducers"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { FSTs have key applications in speech recognition and synthesis, machine translation, optical character recognition, pattern matching, string processing, machine learning, information extraction and retrieval among others ''; - homepage = http://www.openfst.org/twiki/bin/view/FST/WebHome; + homepage = "http://www.openfst.org/twiki/bin/view/FST/WebHome"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.dfordivam ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index fe46d25421a19..e038bb7f66ded 100644 --- a/pkgs/development/libraries/openh264/default.nix +++ b/pkgs/development/libraries/openh264/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openh264"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "cisco"; repo = pname; rev = "v${version}"; - sha256 = "0sa4n4xshmiiv6h767jjq9qxapxxjwwwm3bpcignkxv5xn5sls5r"; + sha256 = "1wba260n1932vafd5ni2jqv9kzc7lj6a1asm1cqk8jv690m6zvpi"; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index 64ed6cb58f0b9..07d7b19ede4b5 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open-source JPEG 2000 codec written in C language"; - homepage = http://www.openjpeg.org/; + homepage = "http://www.openjpeg.org/"; license = licenses.bsd2; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index cc9e44d990dd4..a4274f064e566 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }: stdenv.mkDerivation rec { - name = "openldap-2.4.49"; + name = "openldap-2.4.50"; src = fetchurl { url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; - sha256 = "0vp524rsngdcykf6ki7vprsyg7gj8z7hszg8xwxz50219fa1gcg3"; + sha256 = "1f46nlfwmys110j36sifm7ah8m8f3s10c3vaiikmmigmifapvdaw"; }; # TODO: separate "out" and "bin" @@ -19,7 +19,11 @@ stdenv.mkDerivation rec { # Disable install stripping as it breaks cross-compiling. # We strip binaries anyway in fixupPhase. - makeFlags= [ "STRIP=" ]; + makeFlags= [ + "STRIP=" + "prefix=$(out)" + "moduledir=$(out)/lib/modules" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; configureFlags = [ "--enable-overlays" @@ -35,9 +39,18 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + postBuild = '' + make $makeFlags -C contrib/slapd-modules/passwd/sha2 + make $makeFlags -C contrib/slapd-modules/passwd/pbkdf2 + ''; + doCheck = false; # needs a running LDAP server - installFlags = [ "sysconfdir=$(out)/etc" "localstatedir=$(out)/var" ]; + installFlags = [ + "sysconfdir=$(out)/etc" + "localstatedir=$(out)/var" + "moduledir=$(out)/lib/modules" + ]; # 1. Fixup broken libtool # 2. Libraries left in the build location confuse `patchelf --shrink-rpath` @@ -51,9 +64,12 @@ stdenv.mkDerivation rec { rm -rf $out/var rm -r libraries/*/.libs + rm -r contrib/slapd-modules/passwd/*/.libs ''; postInstall = '' + make $installFlags install -C contrib/slapd-modules/passwd/sha2 + make $installFlags install -C contrib/slapd-modules/passwd/pbkdf2 chmod +x "$out"/lib/*.{so,dylib} ''; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 30085e950a49f..627ac68d68d79 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, fetchpatch, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc, pkgsTargetTarget, symlinkJoin +, libpsm2, libfabric # Enable CUDA support , cudaSupport ? false, cudatoolkit ? null @@ -9,6 +10,10 @@ # Pass PATH/LD_LIBRARY_PATH to point to current mpirun by default , enablePrefix ? false + +# Enable libfabric support (necessary for Omnipath networks) on x86_64 linux +, fabricSupport ? stdenv.isLinux && stdenv.isx86_64 + }: assert !cudaSupport || cudatoolkit != null; @@ -44,7 +49,8 @@ in stdenv.mkDerivation rec { ++ lib.optionals isLinux [ libnl numactl ] ++ lib.optionals cudaSupport [ cudatoolkit ] ++ [ libevent hwloc ] - ++ lib.optional (isLinux || isFreeBSD) rdma-core; + ++ lib.optional (isLinux || isFreeBSD) rdma-core + ++ lib.optional fabricSupport [ libpsm2 libfabric ]; nativeBuildInputs = [ perl ]; @@ -56,6 +62,7 @@ in stdenv.mkDerivation rec { # https://github.com/openucx/ucx # https://www.open-mpi.org/faq/?category=buildcuda ++ lib.optionals cudaSupport [ "--with-cuda=${cudatoolkit_joined}" "--enable-dlopen" ] + ++ lib.optionals fabricSupport [ "--with-psm2=${libpsm2}" "--with-libfabric=${libfabric}" ] ; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/development/libraries/openpa/default.nix index 6d53d23ae0e78..46729f660b14a 100644 --- a/pkgs/development/libraries/openpa/default.nix +++ b/pkgs/development/libraries/openpa/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Atomic primitives for high performance, concurrent software"; - homepage = https://trac.mpich.org/projects/openpa; + homepage = "https://trac.mpich.org/projects/openpa"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ leenaars ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix index b217527269dde..3d1cff05a0859 100644 --- a/pkgs/development/libraries/openpam/default.nix +++ b/pkgs/development/libraries/openpam/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = https://www.openpam.org; + homepage = "https://www.openpam.org"; description = "An open source PAM library that focuses on simplicity, correctness, and cleanliness"; platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index b12ca67655b98..a209c950d4829 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A 3D graphics toolkit"; - homepage = http://www.openscenegraph.org/; + homepage = "http://www.openscenegraph.org/"; maintainers = with maintainers; [ aanderse raskin ]; platforms = platforms.linux; license = "OpenSceneGraph Public License - free LGPL-based license"; diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix index 537b67c5a3c32..68cb40abf7238 100644 --- a/pkgs/development/libraries/openslp/default.nix +++ b/pkgs/development/libraries/openslp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ]; meta = with stdenv.lib; { - homepage = http://www.openslp.org/; + homepage = "http://www.openslp.org/"; description = "An open-source implementation of the IETF Service Location Protocol"; maintainers = with maintainers; [ ttuegel ]; license = licenses.bsd3; diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index e2f6411471662..b37142082d816 100644 --- a/pkgs/development/libraries/openssl/chacha.nix +++ b/pkgs/development/libraries/openssl/chacha.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.openssl.org/; + homepage = "https://www.openssl.org/"; description = "A cryptographic library that implements the SSL and TLS protocols"; platforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.cstrahan ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index a2a0c68c316ed..43170f25d38b4 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, buildPackages, perl, coreutils , withCryptodev ? false, cryptodev , enableSSL2 ? false +, enableSSL3 ? false , static ? false }: @@ -76,6 +77,7 @@ let "-DHAVE_CRYPTODEV" "-DUSE_CRYPTODEV_DIGESTS" ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2" + ++ stdenv.lib.optional enableSSL3 "enable-ssl3" ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng" # OpenSSL needs a specific `no-shared` configure flag. # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options @@ -129,7 +131,7 @@ let ''; meta = with stdenv.lib; { - homepage = https://www.openssl.org/; + homepage = "https://www.openssl.org/"; description = "A cryptographic library that implements the SSL and TLS protocols"; license = licenses.openssl; platforms = platforms.all; @@ -153,8 +155,8 @@ in { }; openssl_1_1 = common { - version = "1.1.1d"; - sha256 = "1whinyw402z3b9xlb3qaxv4b9sk4w1bgh9k0y8df1z4x3yy92fhy"; + version = "1.1.1g"; + sha256 = "0ikdcc038i7jk8h7asq5xcn8b1xc2rrbc88yfm4hqbz3y5s4gc6x"; patches = [ ./1.1/nix-ssl-cert-file.patch @@ -164,5 +166,4 @@ in { ]; withDocs = true; }; - } diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 81ef6a3bf5d12..35a8358b5148e 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "opensubdiv"; - version = "3.4.0"; + version = "3.4.3"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenSubdiv"; rev = "v${lib.replaceChars ["."] ["_"] version}"; - sha256 = "0cippg6aqc5dlya1cmh3908pwssrg52fwgyylnvz5343yrxmgk12"; + sha256 = "0zpnpg2zzyavv9r3jakv3j2gn603b62rbczrflc6qmg6qvpgz0kr"; }; outputs = [ "out" "dev" ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = { description = "An Open-Source subdivision surface library"; - homepage = http://graphics.pixar.com/opensubdiv; + homepage = "http://graphics.pixar.com/opensubdiv"; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.eelco ]; license = lib.licenses.asl20; diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix index f29972a64bd9d..a31350a5f962b 100644 --- a/pkgs/development/libraries/opentracing-cpp/default.nix +++ b/pkgs/development/libraries/opentracing-cpp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ implementation of the OpenTracing API"; - homepage = https://opentracing.io; + homepage = "https://opentracing.io"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ rob ]; }; diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index 840da0461706a..38e50fb367e13 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "openvdb"; - version = "6.2.1"; + version = "7.0.0"; src = fetchFromGitHub { owner = "dreamworksanimation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "1ypkzdkgsbcczfvrqblnxfzm13w0mdkskgqmgvmbfi66vpaazdrf"; + sha256 = "0hhs50f05hkgj1wni53cwbsx2bhn1aam6z65j133356gbid2carl"; }; outputs = [ "out" ]; diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index 5d81bfad5cba3..17df9eee84e84 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Openwsman server implementation and client API with bindings"; - downloadPage = https://github.com/Openwsman/openwsman/releases; - homepage = https://openwsman.github.io; + downloadPage = "https://github.com/Openwsman/openwsman/releases"; + homepage = "https://openwsman.github.io"; license = licenses.bsd3; maintainers = with maintainers; [ deepfire ]; platforms = platforms.linux; # PAM is not available on Darwin diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 5ba6c38f7c1d5..6ecdb30c1f2b2 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Khronos OpenXR loader"; - homepage = https://www.khronos.org/openxr; + homepage = "https://www.khronos.org/openxr"; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix index a9dbcf9ffb27c..dd7a367652d7e 100644 --- a/pkgs/development/libraries/openzwave/default.nix +++ b/pkgs/development/libraries/openzwave/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "C++ library to control Z-Wave Networks via a USB Z-Wave Controller"; - homepage = http://www.openzwave.net/; + homepage = "http://www.openzwave.net/"; license = licenses.gpl3; maintainers = with maintainers; [ etu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix index a4a2a51402b82..24db4c6609b72 100644 --- a/pkgs/development/libraries/osip/default.nix +++ b/pkgs/development/libraries/osip/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.lgpl21Plus; - homepage = https://www.gnu.org/software/osip/; + homepage = "https://www.gnu.org/software/osip/"; description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index 14483a12f7eda..e34a80e1d4a54 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GTK widget for displaying OpenStreetMap tiles"; - homepage = https://nzjrs.github.io/osm-gps-map; + homepage = "https://nzjrs.github.io/osm-gps-map"; license = licenses.gpl2Plus; maintainers = with maintainers; [ hrdinka ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index d3faa04633e50..204de957f3df6 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -26,14 +26,16 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" - "--without-trust-paths" - ]; # TODO: store trust anchors in a directory common to Nix and NixOS + "--with-trust-paths=/etc/ssl/certs/ca-certificates.crt" + ]; enableParallelBuilding = true; doCheck = !stdenv.isDarwin; - installFlags = [ "exampledir=\${out}/etc/pkcs11" ]; + installFlags = [ + "exampledir=${placeholder "out"}/etc/pkcs11" + ]; meta = with stdenv.lib; { description = "Library for loading and sharing PKCS#11 modules"; @@ -42,7 +44,7 @@ stdenv.mkDerivation rec { Provides a standard configuration setup for installing PKCS#11 modules in such a way that they're discoverable. ''; - homepage = https://p11-glue.github.io/p11-glue/p11-kit.html; + homepage = "https://p11-glue.github.io/p11-glue/p11-kit.html"; platforms = platforms.all; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index 4482a9cd312db..ec2de274ccb2a 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -1,22 +1,46 @@ { buildGoModule , fetchFromGitHub , lib +, stdenv +, symlinkJoin }: -buildGoModule rec { - pname = "packr"; - version = "2.7.1"; +let p2 = buildGoModule rec { + pname = "packr2"; + version = "2.8.0"; src = fetchFromGitHub { owner = "gobuffalo"; - repo = pname; + repo = "packr"; rev = "v${version}"; - sha256 = "0m5kl2fq8gf1v4vllgag2xl8fd382sdgqrcdb8f5alsnrdn08kb9"; + sha256 = "1x78yq2yg0r82h7a67078llni85gk9nbd2ismlbqgppap7fcpyai"; + }+"/v2"; + + subPackages = [ "packr2" ]; + + vendorSha256 = "12yq121b0bn8z12091fyqhhz421kgx4z1nskrkvbxlhyc47bwyrp"; + + meta = with stdenv.lib; { + description = "The simple and easy way to embed static files into Go binaries"; + homepage = "https://github.com/gobuffalo/packr"; + license = licenses.mit; + maintainers = with maintainers; [ mmahut ]; + }; +}; +p1 = buildGoModule rec { + pname = "packr1"; + version = "2.8.0"; + + src = fetchFromGitHub { + owner = "gobuffalo"; + repo = "packr"; + rev = "v${version}"; + sha256 = "1x78yq2yg0r82h7a67078llni85gk9nbd2ismlbqgppap7fcpyai"; }; - subPackages = [ "packr" "v2/packr2" ]; + subPackages = [ "packr" ]; - modSha256 = "0afhkvivma16bi8rz3kwcsz9mhmcn4zm6rrymxkvazx6b844hcdv"; + vendorSha256 = "0m3yj8ww4a16j56p8d8w0sdnyx0g2bkd8zg0l4d8vb72mvg5asga"; meta = with lib; { description = "The simple and easy way to embed static files into Go binaries"; @@ -24,4 +48,9 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ mmahut ]; }; -} +}; +in +symlinkJoin{ + name = "packr"; + paths = [p1 p2]; +} \ No newline at end of file diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix index 67c4e75c1e12a..4723292199da6 100644 --- a/pkgs/development/libraries/pagmo2/default.nix +++ b/pkgs/development/libraries/pagmo2/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://esa.github.io/pagmo2/; + homepage = "https://esa.github.io/pagmo2/"; description = "Scientific library for massively parallel optimization"; license = licenses.gpl3Plus; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index f37a6972c25e4..358ae3df99112 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation rec { Pango forms the core of text and font handling for GTK. ''; - homepage = https://www.pango.org/; + homepage = "https://www.pango.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index d788f1eff346c..e9f55dd6145f6 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { integration, and has a flexible real-time plotter for visualising graphical data. ''; - homepage = https://github.com/stevenlovegrove/Pangolin; + homepage = "https://github.com/stevenlovegrove/Pangolin"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.expipiplus1 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 6cb2c070c94ff..b0488435ded65 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "pangomm"; - version= "2.42.0"; + version= "2.42.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mmzxp3wniaafkxr30sb22mq9x44xckb5d60h1bl99lkzxks0vfa"; + sha256 = "03zli5amizhv9bfklwfq7xyf0b5dagchx1lnz9f0v1rhk69h9gql"; }; outputs = [ "out" "dev" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ interface to the Pango text rendering library"; - homepage = https://www.pango.org/; + homepage = "https://www.pango.org/"; license = with licenses; [ lgpl2 lgpl21 ]; maintainers = with maintainers; [ lovek323 raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix index b69ded6483973..d316250411d7e 100644 --- a/pkgs/development/libraries/pangoxsl/default.nix +++ b/pkgs/development/libraries/pangoxsl/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "pangoxsl-1.6.0.3"; src = fetchurl { - url = mirror://sourceforge/pangopdf/pangoxsl-1.6.0.3.tar.gz; + url = "mirror://sourceforge/pangopdf/pangoxsl-1.6.0.3.tar.gz"; sha256 = "1wcd553nf4nwkrfrh765cyzwj9bsg7zpkndg2hjs8mhwgx04lm8n"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Implements several of the inline properties defined by XSL that are not currently implemented by Pango."; - homepage = https://sourceforge.net/projects/pangopdf; + homepage = "https://sourceforge.net/projects/pangopdf"; platforms = platforms.unix; license = licenses.lgpl2; }; diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index 1831d9692493d..952987447b225 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Provides a C API to different audio devices"; - homepage = https://github.com/rhdunn/pcaudiolib; + homepage = "https://github.com/rhdunn/pcaudiolib"; license = licenses.gpl3; maintainers = with maintainers; [ aske ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix index 58fbb26532e2e..593794c9c4dff 100644 --- a/pkgs/development/libraries/pcg-c/default.nix +++ b/pkgs/development/libraries/pcg-c/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "A family of better random number generators"; - homepage = http://www.pcg-random.org/; + homepage = "https://www.pcg-random.org/"; license = stdenv.lib.licenses.asl20; longDescription = '' PCG is a family of simple fast space-efficient statistically good @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; maintainers = [ maintainers.linus ]; - repositories.git = git://github.com/imneme/pcg-c.git; + repositories.git = "git://github.com/imneme/pcg-c.git"; broken = stdenv.isi686; # https://github.com/imneme/pcg-c/issues/11 }; } diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 81da7332d0f4e..506c78aca8a58 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { - name = "pcl-1.10.1"; + name = "pcl-1.11.0"; src = fetchFromGitHub { owner = "PointCloudLibrary"; repo = "pcl"; rev = name; - sha256 = "1i4zfcikvdl5z1s3lh0n46fgi42s9vbki4hfmy7656hamajfai0v"; + sha256 = "0nr3j71gh1v8x6wjr7a7xyr0438sw7vf621a5kbw4lmsxbj55k8g"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index dc14ab73dcfac..8f19034c924be 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = http://www.pcre.org/; + homepage = "http://www.pcre.org/"; description = "A library for Perl Compatible Regular Expressions"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index b988c4ea02cc2..6c5d526d523be 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Perl Compatible Regular Expressions"; - homepage = http://www.pcre.org/; + homepage = "http://www.pcre.org/"; license = licenses.bsd3; maintainers = with maintainers; [ ttuegel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix index c4cb57f3fa229..08d57cda6c185 100644 --- a/pkgs/development/libraries/pdf2xml/default.nix +++ b/pkgs/development/libraries/pdf2xml/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pdf2xml"; src = fetchurl { - url = http://tarballs.nixos.org/pdf2xml.tar.gz; + url = "http://tarballs.nixos.org/pdf2xml.tar.gz"; sha256 = "04rl7ppxqgnvxvvws669cxp478lnrdmiqj0g3m4p69bawfjc4z3w"; }; sourceRoot = "pdf2xml/pdf2xml"; diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/development/libraries/phash/default.nix index 473fb3bfd4829..16d19f570d1c1 100644 --- a/pkgs/development/libraries/phash/default.nix +++ b/pkgs/development/libraries/phash/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [maintainers.imalsogreg]; platforms = platforms.all; - homepage = http://www.phash.org; + homepage = "http://www.phash.org"; downloadPage = "https://github.com/clearscene/pHash"; updateWalker = true; }; diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index d79078c283692..5c0901596b04e 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "4.10.0"; meta = with stdenv.lib; { - homepage = https://phonon.kde.org/; + homepage = "https://phonon.kde.org/"; description = "GStreamer backend for Phonon"; platforms = platforms.linux; maintainers = with maintainers; [ ttuegel ]; diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 9ed137e4f4508..d152afd453408 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "0.11.1"; meta = with stdenv.lib; { - homepage = https://phonon.kde.org/; + homepage = "https://phonon.kde.org/"; description = "GStreamer backend for Phonon"; platforms = platforms.linux; license = with licenses; [ bsd3 lgpl2Plus ]; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 86e3caaa1486c..bb43604db0c55 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "4.11.1"; meta = { - homepage = https://phonon.kde.org/; + homepage = "https://phonon.kde.org/"; description = "Multimedia API for Qt"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index cf9e201b3f6ad..66f2d433ee3eb 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -29,7 +29,7 @@ let ''; meta = with stdenv.lib; { - homepage = http://icculus.org/physfs/; + homepage = "http://icculus.org/physfs/"; description = "Library to provide abstract access to various archives"; license = licenses.free; platforms = platforms.linux; diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix index 4ebfd6fbfa374..7b201cf9b1645 100644 --- a/pkgs/development/libraries/physics/apfel/default.nix +++ b/pkgs/development/libraries/physics/apfel/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A PDF Evolution Library"; license = licenses.gpl3; - homepage = https://apfel.mi.infn.it/; + homepage = "https://apfel.mi.infn.it/"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix index 2ba87024bc51b..5c63ce7c4b9e6 100644 --- a/pkgs/development/libraries/physics/apfelgrid/default.nix +++ b/pkgs/development/libraries/physics/apfelgrid/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ultra-fast theory predictions for collider observables"; license = licenses.mit; - homepage = http://nhartland.github.io/APFELgrid/; + homepage = "http://nhartland.github.io/APFELgrid/"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix index 3e2a53d81dd8d..6b1bc71c660c7 100644 --- a/pkgs/development/libraries/physics/applgrid/default.nix +++ b/pkgs/development/libraries/physics/applgrid/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The APPLgrid project provides a fast and flexible way to reproduce the results of full NLO calculations with any input parton distribution set in only a few milliseconds rather than the weeks normally required to gain adequate statistics"; license = licenses.gpl3; - homepage = http://applgrid.hepforge.org; + homepage = "http://applgrid.hepforge.org"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix index bd43ae4420432..c6a9835d13b64 100644 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = { - homepage = http://cernlib.web.cern.ch; + homepage = "http://cernlib.web.cern.ch"; description = "Legacy collection of libraries and modules for data analysis in high energy physics"; broken = stdenv.isDarwin; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 96eb13d11cdc3..b854fa88cd67e 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastjet"; - version = "3.3.3"; + version = "3.3.4"; src = fetchurl { url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz"; - sha256 = "0avkgn19plq593p872hirr0yj2vgjvsi88w68ngarbp55hla1c1h"; + sha256 = "00zwvmnp2j79z95n9lgnq67q02bqfgirqla8j9y6jd8k3r052as3"; }; buildInputs = [ python2 ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A software package for jet finding in pp and e+e− collisions"; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://fastjet.fr/; + homepage = "http://fastjet.fr/"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix index 5ef446319a8a8..22251e10a4f13 100644 --- a/pkgs/development/libraries/physics/fastnlo/default.nix +++ b/pkgs/development/libraries/physics/fastnlo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A computer code to create and evaluate fast interpolation tables of pre-computed coefficients in perturbation theory for observables in hadron-induced processes"; license = stdenv.lib.licenses.gpl3; - homepage = http://fastnlo.hepforge.org; + homepage = "http://fastnlo.hepforge.org"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 1897071b12596..8c7ff230e011f 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science. The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278. ''; - homepage = http://www.geant4.org; + homepage = "http://www.geant4.org"; license = licenses.g4sl; maintainers = with maintainers; [ tmplt omnipotententity ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix index 69fb5a99738a5..4937cc0eca936 100644 --- a/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278. ''; - homepage = http://www.geant4.org; + homepage = "http://www.geant4.org"; license = stdenv.lib.licenses.g4sl; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/physics/hepmc2/default.nix b/pkgs/development/libraries/physics/hepmc2/default.nix index 665cd417dc09c..41908e0383bfe 100644 --- a/pkgs/development/libraries/physics/hepmc2/default.nix +++ b/pkgs/development/libraries/physics/hepmc2/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "The HepMC package is an object oriented event record written in C++ for High Energy Physics Monte Carlo Generators"; license = stdenv.lib.licenses.gpl2; - homepage = http://hepmc.web.cern.ch/hepmc/; + homepage = "http://hepmc.web.cern.ch/hepmc/"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index d52f92d963946..c1a803fd314bc 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "herwig"; - version = "7.2.0"; + version = "7.2.1"; src = fetchurl { url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "0r5iyai2j99pk9p36g4rp98bxm55zd1ik9kgm2zf5zgpvxfm8csr"; + sha256 = "11m6xvardnk0i8x8b3dpwg4c4ncq0xmlfg2n5r5qmh6544pz7zyl"; }; nativeBuildInputs = [ autoconf automake libtool ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A multi-purpose particle physics event generator"; - homepage = https://herwig.hepforge.org/; + homepage = "https://herwig.hepforge.org/"; license = licenses.gpl3; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/pkgs/development/libraries/physics/hoppet/default.nix index 9e68fbd3fc4d8..6ac3b950be342 100644 --- a/pkgs/development/libraries/physics/hoppet/default.nix +++ b/pkgs/development/libraries/physics/hoppet/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Higher Order Perturbative Parton Evolution Toolkit"; license = licenses.gpl2; - homepage = https://hoppet.hepforge.org; + homepage = "https://hoppet.hepforge.org"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index dff9fb1c1dd11..8d4e91265f5e1 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A general purpose interpolator, used for evaluating Parton Distribution Functions from discretised data files"; license = stdenv.lib.licenses.gpl2; - homepage = http://lhapdf.hepforge.org; + homepage = "http://lhapdf.hepforge.org"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix index 74b4ba4224e78..27d8197a4362f 100644 --- a/pkgs/development/libraries/physics/mcgrid/default.nix +++ b/pkgs/development/libraries/physics/mcgrid/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A software package that provides access to the APPLgrid and fastNLO interpolation tools for Monte Carlo event generator codes, allowing for fast and flexible variations of scales, coupling parameters and PDFs in cutting edge leading- and next-to-leading-order QCD calculations"; license = stdenv.lib.licenses.gpl3; - homepage = http://mcgrid.hepforge.org; + homepage = "http://mcgrid.hepforge.org"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/mela/default.nix b/pkgs/development/libraries/physics/mela/default.nix index 1518c23718aaa..1e31577026c1e 100644 --- a/pkgs/development/libraries/physics/mela/default.nix +++ b/pkgs/development/libraries/physics/mela/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "a Mellin Evolution LibrAry"; license = licenses.gpl3; - homepage = https://github.com/vbertone/MELA; + homepage = "https://github.com/vbertone/MELA"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index c37d4b9d2f1a4..c10e81b9a0e81 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A program for the generation of high-energy physics events"; license = stdenv.lib.licenses.gpl2; - homepage = http://home.thep.lu.se/~torbjorn/Pythia.html; + homepage = "http://home.thep.lu.se/~torbjorn/Pythia.html"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix index e962303f5f065..c12526223938a 100644 --- a/pkgs/development/libraries/physics/qcdnum/default.nix +++ b/pkgs/development/libraries/physics/qcdnum/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "QCDNUM is a very fast QCD evolution program written in FORTRAN77"; license = stdenv.lib.licenses.gpl3; - homepage = https://www.nikhef.nl/~h24/qcdnum/index.html; + homepage = "https://www.nikhef.nl/~h24/qcdnum/index.html"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 7f7260d52c0ce..9870fadf6ef6b 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { meta = { description = "A framework for comparison of experimental measurements from high-energy particle colliders to theory predictions"; license = stdenv.lib.licenses.gpl2; - homepage = https://rivet.hepforge.org; + homepage = "https://rivet.hepforge.org"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 15c94668581d9..876aeec0fab77 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "thepeg"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; - sha256 = "1y7vwsc4zk629np4rpjh7a8qzvyqc2fixnwq98dgdndp2544gqfk"; + sha256 = "13x5gssv22mpa2w6i0vaalwcr57170vh3b4xrw8mrm3abqhwgav3"; }; buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Toolkit for High Energy Physics Event Generation"; - homepage = https://herwig.hepforge.org/; + homepage = "https://herwig.hepforge.org/"; license = licenses.gpl3; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 8ed0a2c4ae3a6..ad7bc7f52f540 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Provides small set of data analysis (specifically histogramming) classes"; license = stdenv.lib.licenses.gpl3; - homepage = https://yoda.hepforge.org; + homepage = "https://yoda.hepforge.org"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/pipewire/2.nix b/pkgs/development/libraries/pipewire/2.nix index 3efbea97c5e9c..e9656ee23ec53 100644 --- a/pkgs/development/libraries/pipewire/2.nix +++ b/pkgs/development/libraries/pipewire/2.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Server and user space API to deal with multimedia pipelines"; - homepage = https://pipewire.org/; + homepage = "https://pipewire.org/"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ jtojnar ]; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index b37bbd273e2e0..f9cc7b56fff03 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -32,7 +32,7 @@ let in stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.2"; + version = "0.3.5"; outputs = [ "out" "lib" "dev" "doc" ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "U7lqvn2vMIxARNplzNX9H3Ztlfv1IH8LozJsq7JSEKs="; + sha256 = "mgfhfKpUtHycXCUVKFs9A58E1D1pPKHvSoPqjQzWGfQ="; }; nativeBuildInputs = [ @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Server and user space API to deal with multimedia pipelines"; - homepage = https://pipewire.org/; + homepage = "https://pipewire.org/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ jtojnar ]; diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index 1f9996ec21346..d7f5b34e5d752 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { postInstall = glib.flattenInclude; meta = with stdenv.lib; { - homepage = http://pixman.org; + homepage = "http://pixman.org"; description = "A low-level library for pixel manipulation"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 85d300e23769f..8366c37e50547 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/OpenSC/pkcs11-helper; + homepage = "https://github.com/OpenSC/pkcs11-helper"; license = with licenses; [ bsd3 gpl2 ]; description = "Library that simplifies the interaction with PKCS#11 providers"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/pkger/default.nix b/pkgs/development/libraries/pkger/default.nix new file mode 100644 index 0000000000000..4a489127ca562 --- /dev/null +++ b/pkgs/development/libraries/pkger/default.nix @@ -0,0 +1,26 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, stdenv +}: + +buildGoModule rec { + pname = "pkger"; + version = "0.16.0"; + + src = fetchFromGitHub { + owner = "markbates"; + repo = "pkger"; + rev = "v${version}"; + sha256 = "0fpvrgww5h40l2js7raarx6gpysafvj75x26ljx4qz925x8nb6zn"; + }; + + vendorSha256 = "1b9gpym6kb4hpdbrixphfh1qylmqr265jrmcd4vxb87ahvrsrvgp"; + + meta = with stdenv.lib; { + description = "Embed static files in Go binaries (replacement for gobuffalo/packr) "; + homepage = "https://github.com/markbates/pkger"; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index bbc5eb21c2767..2736de0630f66 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; - homepage = http://plib.sourceforge.net/; + homepage = "http://plib.sourceforge.net/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/development/libraries/pmdk/default.nix index 27351522789cc..fe3176f9f76e5 100644 --- a/pkgs/development/libraries/pmdk/default.nix +++ b/pkgs/development/libraries/pmdk/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Persistent Memory Development Kit"; - homepage = https://github.com/pmem/pmdk; + homepage = "https://github.com/pmem/pmdk"; license = licenses.lgpl21; maintainers = with maintainers; [ thoughtpolice ]; platforms = [ "x86_64-linux" ]; # aarch64 is experimental diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix index 8509468f59a24..7ae7406c9896e 100644 --- a/pkgs/development/libraries/png++/default.nix +++ b/pkgs/development/libraries/png++/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://www.nongnu.org/pngpp/; + homepage = "https://www.nongnu.org/pngpp/"; description = "C++ wrapper for libpng library"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/pocketsphinx/default.nix b/pkgs/development/libraries/pocketsphinx/default.nix index f892540ae5c1b..0f9be199d9583 100644 --- a/pkgs/development/libraries/pocketsphinx/default.nix +++ b/pkgs/development/libraries/pocketsphinx/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Voice recognition library written in C"; - homepage = http://cmusphinx.sourceforge.net; + homepage = "http://cmusphinx.sourceforge.net"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 1f43be20cfb6a..72f2952914a3e 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://pocoproject.org/; + homepage = "https://pocoproject.org/"; description = "Cross-platform C++ libraries with a network/internet focus"; license = licenses.boost; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 809159b8c2f10..242645ebfdbcc 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://podofo.sourceforge.net; + homepage = "http://podofo.sourceforge.net"; description = "A library to work with the PDF file format"; platforms = platforms.all; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 17163c2206cdd..43dc2550b12bd 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/polkit; + homepage = "http://www.freedesktop.org/wiki/Software/polkit"; description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix index cb9cf16531c5c..0603f49fad41f 100644 --- a/pkgs/development/libraries/poppler/0.61.nix +++ b/pkgs/development/libraries/poppler/0.61.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = https://poppler.freedesktop.org/; + homepage = "https://poppler.freedesktop.org/"; description = "A PDF rendering library"; longDescription = '' diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index bddb9a32e310d..93b49524dc1d3 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; - version = "0.85.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "0.88.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "0jyr036scdly13hx5dxmsqp2p3jifc29h2by51msw0ih6bmpbj1b"; + sha256 = "1isns9s484irq9ir4hbhpyqf6af2xzswh2pfrvk1k9d5x423hidl"; }; outputs = [ "out" "dev" ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = https://poppler.freedesktop.org/; + homepage = "https://poppler.freedesktop.org/"; description = "A PDF rendering library"; longDescription = '' @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ ttuegel ]; + maintainers = with maintainers; [ ttuegel ] ++ teams.freedesktop.members; }; } diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 68daece490fa9..aa8afb7ac97fa 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "portaudio-190600-20161030"; src = fetchurl { - url = http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz; + url = "http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz"; sha256 = "04qmin6nj144b8qb9kkd9a52xfvm0qdgm8bg8jbl7s3frmyiv8pm"; }; @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Portable cross-platform Audio API"; - homepage = http://www.portaudio.com/; + homepage = "http://www.portaudio.com/"; # Not exactly a bsd license, but alike license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index 37958038601cc..a0001691302e0 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = http://portmedia.sourceforge.net/portmidi/; + homepage = "http://portmedia.sourceforge.net/portmidi/"; description = "Platform independent library for MIDI I/O"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index 7839547ee9283..a51db09db8602 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { version of the simplex algorithm. ''; - homepage = http://bugseng.com/products/ppl/; + homepage = "http://bugseng.com/products/ppl/"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/development/libraries/proj-datumgrid/default.nix b/pkgs/development/libraries/proj-datumgrid/default.nix index f1c13e93aecdc..c7a25f6217142 100644 --- a/pkgs/development/libraries/proj-datumgrid/default.nix +++ b/pkgs/development/libraries/proj-datumgrid/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Repository for proj datum grids"; - homepage = https://proj4.org; + homepage = "https://proj4.org"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/proj/5.2.nix b/pkgs/development/libraries/proj/5.2.nix index 8fb4515e70da7..7a97491d8ea16 100644 --- a/pkgs/development/libraries/proj/5.2.nix +++ b/pkgs/development/libraries/proj/5.2.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "proj-5.2.0"; src = fetchurl { - url = https://download.osgeo.org/proj/proj-5.2.0.tar.gz; + url = "https://download.osgeo.org/proj/proj-5.2.0.tar.gz"; sha256 = "0q3ydh2j8qhwlxmnac72pg69rw2znbi5b6k5wama8qmwzycr94gg"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Cartographic Projections Library"; - homepage = https://proj4.org; + homepage = "https://proj4.org"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index fc0f1cf67a56d..8618d62e834f4 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cartographic Projections Library"; - homepage = https://proj4.org; + homepage = "https://proj4.org"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/development/libraries/prometheus-cpp/default.nix index 2ec2426af4a1d..5377d2b96d005 100644 --- a/pkgs/development/libraries/prometheus-cpp/default.nix +++ b/pkgs/development/libraries/prometheus-cpp/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Prometheus Client Library for Modern C++"; - homepage = https://github.com/jupp0r/prometheus-cpp; + homepage = "https://github.com/jupp0r/prometheus-cpp"; license = [ stdenv.lib.licenses.mit ]; }; diff --git a/pkgs/development/libraries/properties-cpp/default.nix b/pkgs/development/libraries/properties-cpp/default.nix index bd20dc540c06e..ce56c46458860 100644 --- a/pkgs/development/libraries/properties-cpp/default.nix +++ b/pkgs/development/libraries/properties-cpp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://launchpad.net/properties-cpp; + homepage = "https://launchpad.net/properties-cpp"; description = "A very simple convenience library for handling properties and signals in C++11."; license = licenses.lgpl3; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/development/libraries/protobuf/3.11.nix b/pkgs/development/libraries/protobuf/3.11.nix index fa238fdca546b..c5d8b21b1ac4b 100644 --- a/pkgs/development/libraries/protobuf/3.11.nix +++ b/pkgs/development/libraries/protobuf/3.11.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.11.3"; - sha256 = "0cn6h6fg5h64q5h3ncfwr3m7yszf5n9gpvgpv7s1csndp0ffzmin"; + version = "3.11.4"; + sha256 = "00g61f1yd8z5l0z0svmr3hms38ph35lcx2y7hivw6fahslw0l8yw"; } diff --git a/pkgs/development/libraries/protobuf/3.12.nix b/pkgs/development/libraries/protobuf/3.12.nix new file mode 100644 index 0000000000000..00d9ec7f96fc4 --- /dev/null +++ b/pkgs/development/libraries/protobuf/3.12.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.12.0"; + sha256 = "0ac0v7mx2sf4hwf61074bgh2m1q0rs88c7gc6v910sd7cw7gql3a"; +} diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 01f74bc48eb7d..4166aac7246bf 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -50,7 +50,7 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { ''; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; - homepage = https://developers.google.com/protocol-buffers/; + homepage = "https://developers.google.com/protocol-buffers/"; }; passthru.version = version; diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 3c08537db0b6b..32d6f70d1eb69 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { almost all of its internal RPC protocols and file formats. ''; license = "mBSD"; - homepage = https://developers.google.com/protocol-buffers/; + homepage = "https://developers.google.com/protocol-buffers/"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix index 838fa7de82610..4b0d273ac44d5 100644 --- a/pkgs/development/libraries/protobufc/generic.nix +++ b/pkgs/development/libraries/protobufc/generic.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ protobuf zlib ]; meta = with stdenv.lib; { - homepage = https://github.com/protobuf-c/protobuf-c/; + homepage = "https://github.com/protobuf-c/protobuf-c/"; description = "C bindings for Google's Protocol Buffers"; license = licenses.bsd2; platforms = platforms.all; diff --git a/pkgs/development/libraries/protolock/default.nix b/pkgs/development/libraries/protolock/default.nix index f1eb3ae51f32e..2bdaa3ab7b6f7 100644 --- a/pkgs/development/libraries/protolock/default.nix +++ b/pkgs/development/libraries/protolock/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0qg26vcqdhgy91p6wiv16dq73ay0fymran3d8ylca9264zwi2vxw"; }; - modSha256 = "1q755ipqsfpr41s5fxzmx50lwcdqc5a7akwx6mzn789w2z07x8lg"; + vendorSha256 = "0ap1iwcapvvvmwgdc4zbsp8mglrhbswkdgm4dw8baw8qk0nlci6y"; postInstall = '' rm $out/bin/plugin* @@ -23,4 +23,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ groodt ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/libraries/prototypejs/default.nix b/pkgs/development/libraries/prototypejs/default.nix index a56b14384e5bb..3753dfacac3ba 100644 --- a/pkgs/development/libraries/prototypejs/default.nix +++ b/pkgs/development/libraries/prototypejs/default.nix @@ -15,8 +15,8 @@ in fetchurl { and provides elegant APIs around the clumsy interfaces of Ajax and the Document Object Model. ''; - homepage = http://prototypejs.org/; - downloadPage = http://prototypejs.org/download/; + homepage = "http://prototypejs.org/"; + downloadPage = "http://prototypejs.org/download/"; license = licenses.mit; maintainers = with maintainers; [ das_j ]; }; diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix index 2364e0913bc82..fdc35f149a33a 100644 --- a/pkgs/development/libraries/psqlodbc/default.nix +++ b/pkgs/development/libraries/psqlodbc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-iodbc=${libiodbc}" ]; meta = with stdenv.lib; { - homepage = http://psqlodbc.projects.postgresql.org/; + homepage = "http://psqlodbc.projects.postgresql.org/"; description = "ODBC driver for PostgreSQL"; license = licenses.lgpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/pstreams/default.nix b/pkgs/development/libraries/pstreams/default.nix index a734ac1e9fdf8..e3cb9dd67a3bc 100644 --- a/pkgs/development/libraries/pstreams/default.nix +++ b/pkgs/development/libraries/pstreams/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.0.1"; src = fetchgit { - url = https://git.code.sf.net/p/pstreams/code; + url = "https://git.code.sf.net/p/pstreams/code"; rev = let dot2Underscore = stdenv.lib.strings.stringAsChars (c: if c == "." then "_" else c); in "RELEASE_${dot2Underscore version}"; sha256 = "0r8aj0nh5mkf8cvnzl8bdy4nm7i74vs83axxfimcd74kjfn0irys"; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { POSIX.2 functions popen(3) and pclose(3), using C++ iostreams instead of C's stdio library. ''; - homepage = http://pstreams.sourceforge.net/; - downloadPage = http://pstreams.sourceforge.net/download/; + homepage = "http://pstreams.sourceforge.net/"; + downloadPage = "http://pstreams.sourceforge.net/download/"; maintainers = with maintainers; [ arthur ]; license = licenses.boost; platforms = platforms.all; diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index b2173ec21ee12..c64d0b37686b6 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The GNU Portable Threads library"; - homepage = https://www.gnu.org/software/pth; + homepage = "https://www.gnu.org/software/pth"; license = licenses.lgpl21Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index d182517159616..8bd861540688e 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Light-weight, simple and fast XML parser for C++ with XPath support"; - homepage = https://pugixml.org; + homepage = "https://pugixml.org"; license = licenses.mit; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index b616b898a6e00..ef13111852785 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { license = "BSD-style"; - homepage = http://pupnp.sourceforge.net/; + homepage = "http://pupnp.sourceforge.net/"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/pxlib/default.nix b/pkgs/development/libraries/pxlib/default.nix new file mode 100644 index 0000000000000..2624c718d274e --- /dev/null +++ b/pkgs/development/libraries/pxlib/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, intltool }: + +stdenv.mkDerivation rec { + pname = "pxlib"; + version = "0.6.8"; + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1yafwz4z5h30hqvk51wpgbjlmq9f2z2znvfim87ydrfrqfjmi6sz"; + }; + + nativeBuildInputs = [ intltool ]; + + meta = with stdenv.lib; { + description = "Library to read and write Paradox files"; + homepage = "http://pxlib.sourceforge.net/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.winpat ]; + }; +} diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix index 002208dcc0b03..047142c8a5dff 100644 --- a/pkgs/development/libraries/pyotherside/default.nix +++ b/pkgs/development/libraries/pyotherside/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Asynchronous Python 3 Bindings for Qt 5"; - homepage = https://thp.io/2011/pyotherside/; + homepage = "https://thp.io/2011/pyotherside/"; license = licenses.isc; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index 2b630de14b26c..a52b3608eb7ac 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PythonQt is a dynamic Python binding for the Qt framework. It offers an easy way to embed the Python scripting language into your C++ Qt applications."; - homepage = http://pythonqt.sourceforge.net/; + homepage = "http://pythonqt.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.all; maintainers = with maintainers; [ hlolli ]; diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 79b105a2d1c81..77f4e1b9053b9 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt 5 Cryptographic Architecture"; - homepage = http://delta.affinix.com/qca; + homepage = "http://delta.affinix.com/qca"; maintainers = with maintainers; [ ttuegel ]; license = licenses.lgpl21Plus; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 4894bee96092e..bb89d6926815a 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt Cryptographic Architecture"; license = "LGPL"; - homepage = http://delta.affinix.com/qca; + homepage = "http://delta.affinix.com/qca"; maintainers = [ maintainers.sander ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index 93b9b9634de3a..a82d048b32b20 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "qgnomeplatform"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "FedoraQt"; repo = "QGnomePlatform"; rev = version; - sha256 = "0fb1mzs6sx76bl7f0z2xhc0jq6y1c55jrw1v3na8577is6g5ji0a"; + sha256 = "1mwqg2zk0sfjq54vz2jjahbgi5sxw8rb71h6mgg459wp99mhlqi0"; }; patches = [ @@ -59,7 +59,7 @@ mkDerivation rec { meta = with lib; { description = "QPlatformTheme for a better Qt application inclusion in GNOME"; - homepage = https://github.com/FedoraQt/QGnomePlatform; + homepage = "https://github.com/FedoraQt/QGnomePlatform"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index 323171212be60..689a4877541c0 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = http://www.qhull.org/; + homepage = "http://www.qhull.org/"; description = "Compute the convex hull, Delaunay triangulation, Voronoi diagram and more"; license = licenses.qhull; platforms = platforms.unix; diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index 6d84e60912707..ab4a96e65ea6c 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight data-interchange format"; - homepage = http://qjson.sourceforge.net/; + homepage = "http://qjson.sourceforge.net/"; license = licenses.lgpl21; inherit (qt4.meta) platforms; }; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index b156a1cbf992f..ac2584573114d 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "A QML port of qtermwidget"; - homepage = https://github.com/Swordfish90/qmltermwidget; + homepage = "https://github.com/Swordfish90/qmltermwidget"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ skeidel ]; diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index 83e904e53eb2f..85682e2c2a296 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "qoauth-2.0.0"; src = fetchurl { - url = https://github.com/ayoy/qoauth/archive/v2.0.0.tar.gz; + url = "https://github.com/ayoy/qoauth/archive/v2.0.0.tar.gz"; name = "qoauth-2.0.0.tar.gz"; sha256 = "a28005986410d333e03d077679cdf6c504ec5a33342867dc0f9fb0b74285e333"; }; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index c50c62d77947e..b324bfed5aa76 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://qpdf.sourceforge.net/; + homepage = "http://qpdf.sourceforge.net/"; description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files"; license = licenses.asl20; # as of 7.0.0, people may stay at artistic2 maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix index 9e8d9ce239bf0..83d2db6a26b94 100644 --- a/pkgs/development/libraries/qrencode/default.nix +++ b/pkgs/development/libraries/qrencode/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://fukuchi.org/works/qrencode/; + homepage = "https://fukuchi.org/works/qrencode/"; description = "C library for encoding data in a QR Code symbol"; longDescription = '' diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index 3e0dc99f81fca..424502dce0d47 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -1,23 +1,24 @@ { stdenv , fetchurl , gfortran -, openblas +, blas +, lapack }: stdenv.mkDerivation { name = "qrupdate-1.1.2"; src = fetchurl { - url = mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz ; + url = "mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz"; sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2"; }; configurePhase = '' export PREFIX=$out - sed -i -e 's,^BLAS=.*,BLAS=-L${openblas}/lib -lopenblas,' \ - -e 's,^LAPACK=.*,LAPACK=-L${openblas}/lib -lopenblas,' \ + sed -i -e 's,^BLAS=.*,BLAS=-L${blas}/lib -lblas,' \ + -e 's,^LAPACK=.*,LAPACK=-L${lapack}/lib -llapack,' \ Makeconf '' - + stdenv.lib.optionalString openblas.blas64 + + stdenv.lib.optionalString blas.isILP64 '' sed -i Makeconf -e '/^FFLAGS=.*/ s/$/-fdefault-integer-8/' ''; @@ -30,11 +31,11 @@ stdenv.mkDerivation { installTargets = stdenv.lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ]; - buildInputs = [ gfortran openblas ]; + buildInputs = [ gfortran blas lapack ]; meta = with stdenv.lib; { description = "Library for fast updating of qr and cholesky decompositions"; - homepage = https://sourceforge.net/projects/qrupdate/; + homepage = "https://sourceforge.net/projects/qrupdate/"; license = licenses.gpl3; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index a8be20b73b12f..abaeba51b4511 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -5,12 +5,6 @@ }: let - # Fix Xcode 8 compilation problem - xcodePatch = fetchurl { - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a651d71/qscintilla2/xcode-8.patch"; - sha256 = "1a88309fdfd421f4458550b710a562c622d72d6e6fdd697107e4a43161d69bc9"; - }; - pname = "qscintilla-qt${if withQt5 then "5" else "4"}"; version = "2.11.2"; @@ -32,8 +26,7 @@ in stdenv.mkDerivation rec { ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]) ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - patches = (lib.optional (stdenv.isDarwin && withQt5) xcodePatch) ++ - (lib.optional (!withQt5) ./fix-qt4-build.patch ); + patches = lib.optional (!withQt5) ./fix-qt4-build.patch; # Make sure that libqscintilla2.so is available in $out/lib since it is expected # by some packages such as sqlitebrowser @@ -69,7 +62,7 @@ in stdenv.mkDerivation rec { proportional fonts, bold and italics, multiple foreground and background colours and multiple fonts. ''; - homepage = https://www.riverbankcomputing.com/software/qscintilla/intro; + homepage = "https://www.riverbankcomputing.com/software/qscintilla/intro"; license = with licenses; [ gpl2 gpl3 ]; # and commercial maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 98519ae294a4e..f5837717622c5 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; src = fetchurl { - url = http://download.qt.io/archive/qt/3/qt-x11-free-3.3.8.tar.bz2; + url = "http://download.qt.io/archive/qt/3/qt-x11-free-3.3.8.tar.bz2"; sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8"; }; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 379f5b3d80e0b..1c972e5440ce9 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -237,7 +237,7 @@ stdenv.mkDerivation rec { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; meta = { - homepage = http://qt-project.org/; + homepage = "http://qt-project.org/"; description = "A cross-platform application framework for C++"; license = lib.licenses.lgpl21Plus; # or gpl3 maintainers = with lib.maintainers; [ orivej lovek323 phreedom sander ]; diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 78d711e969b5f..afca6c7969b4e 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -139,6 +139,7 @@ let qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; + qtgamepad = callPackage ../modules/qtgamepad.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtimageformats = callPackage ../modules/qtimageformats.nix {}; qtlocation = callPackage ../modules/qtlocation.nix {}; @@ -171,7 +172,7 @@ let env = callPackage ../qt-env.nix {}; full = env "qt-full-${qtbase.version}" ([ - qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects + qtcharts qtconnectivity qtdeclarative qtdoc qtgamepad qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 930c59d347b14..a4c12793abb3b 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -399,7 +399,7 @@ stdenv.mkDerivation { setupHook = ../hooks/qtbase-setup-hook.sh; meta = with lib; { - homepage = http://www.qt.io; + homepage = "http://www.qt.io"; description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; maintainers = with maintainers; [ qknight ttuegel periklis bkchr ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix new file mode 100644 index 0000000000000..281f6e0b8ecd1 --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix @@ -0,0 +1,9 @@ +{ qtModule, qtbase, qtdeclarative, pkgconfig }: + +qtModule { + name = "qtgamepad"; + qtInputs = [ qtbase qtdeclarative ]; + buildInputs = [ ]; + nativeBuildInputs = [ pkgconfig ]; + outputs = [ "out" "dev" "bin" ]; +} diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index 5003205ef37dc..0481f000c6cee 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -50,7 +50,7 @@ mkDerivation (args // { ''; meta = { - homepage = http://www.qt.io; + homepage = "http://www.qt.io"; description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; maintainers = with maintainers; [ qknight ttuegel periklis bkchr ]; diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix index b7857372d1cd8..ba44a217e3d71 100644 --- a/pkgs/development/libraries/qt-mobility/default.nix +++ b/pkgs/development/libraries/qt-mobility/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt Mobility"; - homepage = http://qt.nokia.com/products/qt-addons/mobility; + homepage = "http://qt.nokia.com/products/qt-addons/mobility"; maintainers = [ maintainers.qknight ]; platforms = platforms.linux; license = with licenses; [ bsd3 fdl13 gpl3 lgpl21 ]; diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 5b963255b65f0..ddfdc2f67d30e 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Platform-independent Qt API for storing passwords securely"; - homepage = https://github.com/frankosterfeld/qtkeychain; + homepage = "https://github.com/frankosterfeld/qtkeychain"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix index cc4a3ae84d909..48c0158531a54 100644 --- a/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtpbfimageplugin"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "tumic0"; repo = "QtPBFImagePlugin"; rev = version; - sha256 = "05l28xf7pf9mxm6crrdx5i7d2ri3hlg5iva0fqc8wxnj8pf2m38r"; + sha256 = "1w2d33g13vkjasabmcgvhsmfqv3jmwbxhqxm1jnyc7d4nlk4jwmb"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix index 88591e880deee..a6cffd73c3ff7 100644 --- a/pkgs/development/libraries/qtscriptgenerator/default.nix +++ b/pkgs/development/libraries/qtscriptgenerator/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = { description = "QtScript bindings generator"; - homepage = https://code.qt.io/cgit/qt-labs/qtscriptgenerator.git/; + homepage = "https://code.qt.io/cgit/qt-labs/qtscriptgenerator.git/"; inherit (qt4.meta) platforms; license = stdenv.lib.licenses.lgpl21; }; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 7c2a99804c4d8..f17165b5ed34c 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "0.11.2"; + version = "0.15.2"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "1jcfv96ws6sm3kc2q8zriwqhry24qbq3zbp8gkqw75wssbv82rmc"; + sha256 = "0cv0lxyi2sr0k7f03rsh1j28avdxd0l0480jsa95ca3d2lq392g3"; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix index 50a1e90588cbc..ac5755f7c3d9c 100644 --- a/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/pkgs/development/libraries/qtstyleplugins/default.nix @@ -15,7 +15,7 @@ mkDerivation { meta = with stdenv.lib; { description = "Additional style plugins for Qt5, including BB10, GTK, Cleanlooks, Motif, Plastique"; - homepage = http://blog.qt.io/blog/2012/10/30/cleaning-up-styles-in-qt5-and-adding-fusion/; + homepage = "http://blog.qt.io/blog/2012/10/30/cleaning-up-styles-in-qt5-and-adding-fusion/"; license = licenses.lgpl21; maintainers = [ maintainers.gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix index 46a9785739a6e..d1b921deac024 100644 --- a/pkgs/development/libraries/qtwebkit-plugins/default.nix +++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Spell checking plugin using Hunspell and HTML5 Notifications plugin for QtWebKit"; - homepage = https://github.com/QupZilla/qtwebkit-plugins; + homepage = "https://github.com/QupZilla/qtwebkit-plugins"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index cac861fe22488..13e3f15c8421e 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Provides access to ZIP archives from Qt programs"; license = licenses.lgpl21Plus; - homepage = https://stachenov.github.io/quazip/; # Migrated from http://quazip.sourceforge.net/ + homepage = "https://stachenov.github.io/quazip/"; # Migrated from http://quazip.sourceforge.net/ platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix index fe24d0fcddfd9..6aebb7a6511d8 100644 --- a/pkgs/development/libraries/quesoglc/default.nix +++ b/pkgs/development/libraries/quesoglc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { provides Unicode support and is designed to be easily ported to any platform that supports both FreeType and the OpenGL API. ''; - homepage = http://quesoglc.sourceforge.net/; + homepage = "http://quesoglc.sourceforge.net/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix index 7e006236080aa..e5346b42b9fbd 100644 --- a/pkgs/development/libraries/quickder/default.nix +++ b/pkgs/development/libraries/quickder/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Quick (and Easy) DER, a Library for parsing ASN.1"; - homepage = https://github.com/vanrein/quick-der; + homepage = "https://github.com/vanrein/quick-der"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index 9568a63f691c0..54af3f3084a9e 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt widgets for technical applications"; - homepage = http://qwt.sourceforge.net/; + homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) license = stdenv.lib.licenses.qwt; platforms = platforms.unix; diff --git a/pkgs/development/libraries/qwt/6_qt4.nix b/pkgs/development/libraries/qwt/6_qt4.nix index b6e0acb603d3a..04bc0d7ed22eb 100644 --- a/pkgs/development/libraries/qwt/6_qt4.nix +++ b/pkgs/development/libraries/qwt/6_qt4.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt widgets for technical applications"; - homepage = http://qwt.sourceforge.net/; + homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) license = stdenv.lib.licenses.qwt; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index f900de5e578b4..c206ffdd5db06 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt widgets for technical applications"; - homepage = http://qwt.sourceforge.net/; + homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) license = stdenv.lib.licenses.qwt; platforms = platforms.unix; diff --git a/pkgs/development/libraries/qxt/default.nix b/pkgs/development/libraries/qxt/default.nix index 79d4d6524241f..3104aefb9edb5 100644 --- a/pkgs/development/libraries/qxt/default.nix +++ b/pkgs/development/libraries/qxt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { prefixKey = "-prefix "; meta = { - homepage = http://libqxt.org; + homepage = "http://libqxt.org"; description = "An extension library for Qt"; longDescription = '' An extension library for Qt providing a suite of cross-platform utility diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index 487de0976bd46..d24bce96997d5 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "RabbitMQ C AMQP client library"; - homepage = https://github.com/alanxz/rabbitmq-c; + homepage = "https://github.com/alanxz/rabbitmq-c"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix index ff8db94288a40..e84770ec0f5bd 100644 --- a/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "RabbitMQ Java client library which allows Java code to interface to AMQP servers"; - homepage = https://www.rabbitmq.com/java-client.html; + homepage = "https://www.rabbitmq.com/java-client.html"; license = with licenses; [ mpl11 gpl2 ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix index 201c332dfdd4e..ed3d7ae9e701e 100644 --- a/pkgs/development/libraries/raft-canonical/default.nix +++ b/pkgs/development/libraries/raft-canonical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "raft-canonical"; - version = "0.9.17"; + version = "0.9.18"; src = fetchFromGitHub { owner = "canonical"; repo = "raft"; rev = "v${version}"; - sha256 = "0q444wd6wz85g4zjkdsrf8z7chkjq9rxzq8l6fh37mgf7c23hv09"; + sha256 = "0f613aiyxqskz9d10f7r37ar9ngqsf9qsyk3jjf7s5l14wh6vl5k"; }; nativeBuildInputs = [ autoreconfHook file pkgconfig ]; diff --git a/pkgs/development/libraries/randomx/default.nix b/pkgs/development/libraries/randomx/default.nix index 9e6cdfecb954b..5b0c2b8a65781 100644 --- a/pkgs/development/libraries/randomx/default.nix +++ b/pkgs/development/libraries/randomx/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Proof of work algorithm based on random code execution"; - homepage = https://github.com/tevador/RandomX; + homepage = "https://github.com/tevador/RandomX"; license = licenses.bsd3; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index ca2c7d9b70fb1..024b67721cae9 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Experimental range library for C++11/14/17"; - homepage = https://github.com/ericniebler/range-v3; + homepage = "https://github.com/ericniebler/range-v3"; license = licenses.boost; platforms = platforms.all; maintainers = with maintainers; [ primeos xwvvvvwx ]; diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix index 18ab274bd197b..1e2d954fa942b 100644 --- a/pkgs/development/libraries/rarian/default.nix +++ b/pkgs/development/libraries/rarian/default.nix @@ -23,9 +23,9 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Documentation metadata library based on the proposed Freedesktop.org spec"; - homepage = https://rarian.freedesktop.org/; + homepage = "https://rarian.freedesktop.org/"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index cb1b176ce3537..d8f20d74a0dfe 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "1arwpvva2b1m3yd618s59v38gwsi0nnm07g6yc9dapcgxrkg5n0h"; + sha256 = "0axrzjmih1njjpxpwfb6pwjwkjy1b6s5s1sjf165m2cmd6x3vbap"; }; nativeBuildInputs = [ pkgconfig ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "librdkafka - Apache Kafka C/C++ client library"; - homepage = https://github.com/edenhill/librdkafka; + homepage = "https://github.com/edenhill/librdkafka"; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ boothead ]; diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index 2b60c3cbf546e..bb41af5ad8564 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { installCheckTarget = "testinstall"; meta = { - homepage = https://github.com/google/re2; + homepage = "https://github.com/google/re2"; description = "An efficient, principled regular expression library"; license = stdenv.lib.licenses.bsd3; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/development/libraries/readline/5.x.nix b/pkgs/development/libraries/readline/5.x.nix index 84062408d45c3..5833ca714e41f 100644 --- a/pkgs/development/libraries/readline/5.x.nix +++ b/pkgs/development/libraries/readline/5.x.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "readline-5.2"; src = fetchurl { - url = mirror://gnu/readline/readline-5.2.tar.gz; + url = "mirror://gnu/readline/readline-5.2.tar.gz"; sha256 = "0icz4hqqq8mlkwrpczyaha94kns0am9z0mh3a2913kg2msb8vs0j"; }; diff --git a/pkgs/development/libraries/readline/6.2.nix b/pkgs/development/libraries/readline/6.2.nix index af59e50ec5e22..3f3ca01961df1 100644 --- a/pkgs/development/libraries/readline/6.2.nix +++ b/pkgs/development/libraries/readline/6.2.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (rec { desire its capabilities. ''; - homepage = https://savannah.gnu.org/projects/readline/; + homepage = "https://savannah.gnu.org/projects/readline/"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index 1e5d9a0a664b0..3f3503bb2ba67 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { desire its capabilities. ''; - homepage = https://savannah.gnu.org/projects/readline/; + homepage = "https://savannah.gnu.org/projects/readline/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix index 486c6eaa2241b..c4bcda0110a45 100644 --- a/pkgs/development/libraries/readline/7.0.nix +++ b/pkgs/development/libraries/readline/7.0.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { desire its capabilities. ''; - homepage = https://savannah.gnu.org/projects/readline/; + homepage = "https://savannah.gnu.org/projects/readline/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/readline/8.0.nix b/pkgs/development/libraries/readline/8.0.nix index 9b9f459e4c3bd..23075abd6f2e2 100644 --- a/pkgs/development/libraries/readline/8.0.nix +++ b/pkgs/development/libraries/readline/8.0.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { desire its capabilities. ''; - homepage = https://savannah.gnu.org/projects/readline/; + homepage = "https://savannah.gnu.org/projects/readline/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix index 1c777e849a469..8bf3200e295b3 100644 --- a/pkgs/development/libraries/readosm/default.nix +++ b/pkgs/development/libraries/readosm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "An open source library to extract valid data from within an Open Street Map input file"; - homepage = https://www.gaia-gis.it/fossil/readosm; + homepage = "https://www.gaia-gis.it/fossil/readosm"; license = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix index 7530cc64bf5fe..0f8caecf8083e 100644 --- a/pkgs/development/libraries/rep-gtk/default.nix +++ b/pkgs/development/libraries/rep-gtk/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "GTK bindings for librep"; - homepage = http://sawfish.wikia.com; + homepage = "http://sawfish.wikia.com"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/development/libraries/rlog/default.nix b/pkgs/development/libraries/rlog/default.nix index f9188e1294bcc..cbc564fe23001 100644 --- a/pkgs/development/libraries/rlog/default.nix +++ b/pkgs/development/libraries/rlog/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; meta = { - homepage = https://www.arg0.net/rlog; + homepage = "https://www.arg0.net/rlog"; description = "A C++ logging library used in encfs"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl3; diff --git a/pkgs/development/libraries/rnnoise/default.nix b/pkgs/development/libraries/rnnoise/default.nix index 7a1f69e86c7df..938f64d06ef8a 100644 --- a/pkgs/development/libraries/rnnoise/default.nix +++ b/pkgs/development/libraries/rnnoise/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (rec { ''; meta = with lib; { - homepage = https://people.xiph.org/~jm/demo/rnnoise/; + homepage = "https://people.xiph.org/~jm/demo/rnnoise/"; description = "Recurrent neural network for audio noise reduction"; license = licenses.bsd3; maintainers = [ maintainers.nh2 ]; diff --git a/pkgs/development/libraries/robin-map/default.nix b/pkgs/development/libraries/robin-map/default.nix index 4aba29c58305f..10b7510468ee8 100644 --- a/pkgs/development/libraries/robin-map/default.nix +++ b/pkgs/development/libraries/robin-map/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = https://github.com/Tessil/robin-map; + homepage = "https://github.com/Tessil/robin-map"; description = "C++ implementation of a fast hash map and hash set using robin hood hashing"; license = licenses.mit; maintainers = with maintainers; [ goibhniu jtojnar ]; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 2d3d1e8d722d9..6606f57bc4b1f 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { hardeningDisable = stdenv.lib.optional stdenv.hostPlatform.isWindows "format"; meta = with stdenv.lib; { - homepage = https://rocksdb.org; + homepage = "https://rocksdb.org"; description = "A library that provides an embeddable, persistent key-value store for fast storage"; license = licenses.asl20; maintainers = with maintainers; [ adev magenbluten ]; diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/development/libraries/rote/default.nix index 82a2998be1ef3..5ae66f676d644 100644 --- a/pkgs/development/libraries/rote/default.nix +++ b/pkgs/development/libraries/rote/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ncurses as well so that you may render the virtual screen to the real screen when you need to. ''; - homepage = http://rote.sourceforge.net/; + homepage = "http://rote.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/rttr/default.nix b/pkgs/development/libraries/rttr/default.nix index 74b8e381f931f..b4d9204c226fe 100644 --- a/pkgs/development/libraries/rttr/default.nix +++ b/pkgs/development/libraries/rttr/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ Reflection Library"; - homepage = https://www.rttr.org; + homepage = "https://www.rttr.org"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index 29233a1ad3f51..13dcd57e2da75 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "rubberband-1.8.1"; src = fetchurl { - url = http://code.breakfastquay.com/attachments/download/23/rubberband-1.8.1.tar.bz2; + url = "http://code.breakfastquay.com/attachments/download/23/rubberband-1.8.1.tar.bz2"; sha256 = "0x9bm2nqd6w2f35w2sqcp7h5z34i4w7mdg53m0vzjhffnnq6637z"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "High quality software library for audio time-stretching and pitch-shifting"; - homepage = https://www.breakfastquay.com/rubberband/index.html; + homepage = "https://www.breakfastquay.com/rubberband/index.html"; # commercial license available as well, see homepage. You'll get some more optimized routines license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu maintainers.marcweber ]; diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index ae5ec222c23cb..e4a3e586614d7 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.asl20 ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://research.cs.wisc.edu/mist/safefile/; + homepage = "https://research.cs.wisc.edu/mist/safefile/"; updateWalker = true; }; } diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix index ce8db3ee9ea90..d3710043e6f60 100644 --- a/pkgs/development/libraries/sbc/default.nix +++ b/pkgs/development/libraries/sbc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SubBand Codec Library"; - homepage = http://www.bluez.org/; + homepage = "http://www.bluez.org/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix index 9ffa2efc376cf..91baa8d03b881 100644 --- a/pkgs/development/libraries/sblim-sfcc/default.nix +++ b/pkgs/development/libraries/sblim-sfcc/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small Footprint CIM Client Library"; - homepage = https://sourceforge.net/projects/sblim/; + homepage = "https://sourceforge.net/projects/sblim/"; license = licenses.cpl10; maintainers = with maintainers; [ deepfire ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 1831161979d3d..712138b0edfc7 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "schroedinger-1.0.11"; src = fetchurl { - url = https://download.videolan.org/contrib/schroedinger-1.0.11.tar.gz; + url = "https://download.videolan.org/contrib/schroedinger-1.0.11.tar.gz"; sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy"; }; diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix index 53ae70f5bf8a3..00a6e50aa7f75 100644 --- a/pkgs/development/libraries/science/benchmark/papi/default.nix +++ b/pkgs/development/libraries/science/benchmark/papi/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { checkTarget = "test"; meta = with stdenv.lib; { - homepage = https://icl.utk.edu/papi/; + homepage = "https://icl.utk.edu/papi/"; description = "PAPI provides the tool designer and application engineer with a consistent interface and methodology for use of the performance counter hardware found in most major microprocessors"; license = licenses.bsdOriginal; platforms = platforms.linux; diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index 4cfc07c1cbaab..4d98b12928f5f 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, itk, python }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3 }: stdenv.mkDerivation rec { pname = "elastix"; @@ -10,14 +10,35 @@ stdenv.mkDerivation rec { rev = version; sha256 = "1zrl7rz4lwsx88b2shnl985f3a97lmp4ksbd437h9y0hfjq8l0lj"; }; - nativeBuildInputs = [ cmake python ]; + + patches = [ + (fetchpatch { + name = "itk-5.1-compat.patch"; + url = "https://github.com/SuperElastix/elastix/commit/402e9a26f22f805b8f2db00c00e59f75fa1783ad.patch"; + sha256 = "1il6gc1lgy78i0w6gkkppr61nh6g0yjspbfk19hcz20778m5jhz9"; + }) + (fetchpatch { + name = "fix-osx-build.patch"; + url = "https://github.com/SuperElastix/elastix/commit/52e1dc3928046f9fbb85d4b2ecd0d5175fa9695d.patch"; + sha256 = "1hf7kgx1jv497pf0x5wj79sy1wncxcvhrkix9w086lcr8zwxvn9q"; + }) + ]; + + + nativeBuildInputs = [ cmake python3 ]; buildInputs = [ itk ]; + doCheck = !stdenv.isDarwin; # usual dynamic linker issues + + preCheck = " + export LD_LIBRARY_PATH=$(pwd)/bin + "; + meta = with stdenv.lib; { - homepage = http://elastix.isi.uu.nl/; + homepage = "http://elastix.isi.uu.nl/"; description = "Image registration toolkit based on ITK"; maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.linux; + platforms = platforms.x86_64; # libitkpng linker issues with ITK 5.1 license = licenses.asl20; }; } diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index cdd56731fa0ef..7ee63e9bb4131 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C library for reading/writing high-throughput sequencing data"; license = licenses.mit; - homepage = http://www.htslib.org/; + homepage = "http://www.htslib.org/"; platforms = platforms.unix; maintainers = [ maintainers.mimame ]; }; diff --git a/pkgs/development/libraries/science/biology/nifticlib/default.nix b/pkgs/development/libraries/science/biology/nifticlib/default.nix index 8c7da7968f5cf..37055259e7c88 100644 --- a/pkgs/development/libraries/science/biology/nifticlib/default.nix +++ b/pkgs/development/libraries/science/biology/nifticlib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 7 out of 293 tests meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/niftilib; + homepage = "https://sourceforge.net/projects/niftilib"; description = "Medical imaging format C API"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix index 69ccbfc26b403..b5fa5c8825e07 100644 --- a/pkgs/development/libraries/science/math/QuadProgpp/default.nix +++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ ]; meta = with stdenv.lib; { - homepage = https://github.com/liuq/QuadProgpp; + homepage = "https://github.com/liuq/QuadProgpp"; license = licenses.mit; description = '' A C++ library for Quadratic Programming which implements the diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 89f3aa94247b9..0829557d0f3df 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake -, gfortran, openblas, eigen }: +, gfortran, blas, lapack, eigen }: with stdenv.lib; @@ -18,15 +18,16 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ gfortran openblas eigen ]; + buildInputs = [ gfortran blas lapack eigen ]; doCheck = true; - BLAS_LIBS = "-L${openblas}/lib -lopenblas"; + BLAS_LIBS = "-L${blas}/lib -lblas"; + LAPACK_LIBS = "-L${lapack}/lib -llapack"; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DINTERFACE64=${optionalString openblas.blas64 "1"}" + "-DINTERFACE64=${optionalString blas.isILP64 "1"}" ]; preCheck = if stdenv.isDarwin then '' @@ -45,7 +46,7 @@ stdenv.mkDerivation { meta = { - homepage = https://github.com/opencollab/arpack-ng; + homepage = "https://github.com/opencollab/arpack-ng"; description = '' A collection of Fortran77 subroutines to solve large scale eigenvalue problems. diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index a14ed4e6a30b7..c240a19cca675 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -65,13 +65,7 @@ EOF meta = { description = "Basic Linear Algebra Subprograms"; license = stdenv.lib.licenses.publicDomain; - homepage = http://www.netlib.org/blas/; + homepage = "http://www.netlib.org/blas/"; platforms = stdenv.lib.platforms.unix; }; - - # We use linkName to pass a different name to --with-blas-libs for - # fflas-ffpack and linbox, because we use blas on darwin but openblas - # elsewhere. - # See see https://github.com/NixOS/nixpkgs/pull/45013. - passthru.linkName = "blas"; } diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index a5c373ecde97b..7755efb306585 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://caffe2.ai/; + homepage = "https://caffe2.ai/"; description = "A new lightweight, modular, and scalable deep learning framework"; longDescription = '' Caffe2 aims to provide an easy and straightforward way for you to experiment diff --git a/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/pkgs/development/libraries/science/math/cholmod-extra/default.nix index 52c775c9a0d0d..c381f56277e81 100644 --- a/pkgs/development/libraries/science/math/cholmod-extra/default.nix +++ b/pkgs/development/libraries/science/math/cholmod-extra/default.nix @@ -1,10 +1,5 @@ -{ stdenv, fetchFromGitHub, gfortran, suitesparse, openblas }: -let - suitesparse_ = suitesparse; -in let - # SuiteSparse must use the same openblas - suitesparse = suitesparse_.override { inherit openblas; }; -in stdenv.mkDerivation rec { +{ stdenv, fetchFromGitHub, gfortran, suitesparse, blas, lapack }: +stdenv.mkDerivation rec { pname = "cholmod-extra"; version = "1.2.0"; @@ -15,10 +10,10 @@ in stdenv.mkDerivation rec { sha256 = "0hz1lfp0zaarvl0dv0zgp337hyd8np41kmdpz5rr3fc6yzw7vmkg"; }; - buildInputs = [ suitesparse gfortran openblas ]; + buildInputs = [ suitesparse gfortran blas lapack ]; - buildFlags = [ - "BLAS=-lopenblas" + makeFlags = [ + "BLAS=-lcblas" ]; installFlags = [ @@ -29,7 +24,7 @@ in stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://github.com/jluttine/cholmod-extra; + homepage = "https://github.com/jluttine/cholmod-extra"; description = "A set of additional routines for SuiteSparse CHOLMOD Module"; license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix index 08f821dcb2c97..c473fcedde3a5 100644 --- a/pkgs/development/libraries/science/math/cliquer/default.nix +++ b/pkgs/development/libraries/science/math/cliquer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://users.aalto.fi/~pat/cliquer.html; + homepage = "https://users.aalto.fi/~pat/cliquer.html"; downloadPage = src.meta.homepage; # autocliquer description = "Routines for clique searching"; longDescription = '' diff --git a/pkgs/development/libraries/science/math/clmagma/default.nix b/pkgs/development/libraries/science/math/clmagma/default.nix index b5c59a83277dd..2e798a6b83e7c 100644 --- a/pkgs/development/libraries/science/math/clmagma/default.nix +++ b/pkgs/development/libraries/science/math/clmagma/default.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Matrix Algebra on GPU and Multicore Architectures, OpenCL port"; license = licenses.bsd3; - homepage = http://icl.cs.utk.edu/magma/index.html; + homepage = "http://icl.cs.utk.edu/magma/index.html"; platforms = platforms.linux; maintainers = with maintainers; [ volhovm ]; }; diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix index e70462cd9efc2..4e89aeebe2b7e 100644 --- a/pkgs/development/libraries/science/math/fenics/default.nix +++ b/pkgs/development/libraries/science/math/fenics/default.nix @@ -24,6 +24,8 @@ , suitesparse , swig , zlib +, blas +, lapack }: let version = "2019.1.0"; @@ -47,7 +49,7 @@ let ''; meta = { description = "Distributed just-in-time shared library building"; - homepage = https://fenicsproject.org/; + homepage = "https://fenicsproject.org/"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.lgpl3; }; @@ -77,7 +79,7 @@ let ''; meta = { description = "Automatic generation of finite element basis functions"; - homepage = https://fenicsproject.org/; + homepage = "https://fenicsproject.org/"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.lgpl3; }; @@ -99,7 +101,7 @@ let ''; meta = { description = "A domain-specific language for finite element variational forms"; - homepage = https://fenicsproject.org/; + homepage = "https://fenicsproject.org/"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.lgpl3; }; @@ -136,7 +138,7 @@ let ''; meta = { description = "A compiler for finite element variational forms"; - homepage = https://fenicsproject.org/; + homepage = "https://fenicsproject.org/"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.lgpl3; }; @@ -176,13 +178,14 @@ let hdf5 mpi numpy - (numpy.blas) + blas + lapack ply python scotch six sphinx - (suitesparse.override { openblas = numpy.blas; }) + suitesparse swig sympy ufl @@ -211,7 +214,7 @@ let ''; meta = { description = "The FEniCS Problem Solving Environment in Python and C++"; - homepage = https://fenicsproject.org/; + homepage = "https://fenicsproject.org/"; license = stdenv.lib.licenses.lgpl3; }; }; @@ -250,7 +253,7 @@ let doCheck = false; # Tries to orte_ess_init and call ssh to localhost meta = { description = "Python bindings for the DOLFIN FEM compiler"; - homepage = https://fenicsproject.org/; + homepage = "https://fenicsproject.org/"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.lgpl3; }; diff --git a/pkgs/development/libraries/science/math/flintqs/default.nix b/pkgs/development/libraries/science/math/flintqs/default.nix index 6fd16535459af..327fea3955d26 100644 --- a/pkgs/development/libraries/science/math/flintqs/default.nix +++ b/pkgs/development/libraries/science/math/flintqs/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://github.com/sagemath/FlintQS; + homepage = "https://github.com/sagemath/FlintQS"; description = "Highly optimized multi-polynomial quadratic sieve for integer factorization"; license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 1995fb9c85de4..97374fb0d477e 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, unzip, openblas, gfortran }: +{ stdenv, fetchurl, unzip, blas, lapack, gfortran }: + +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; @@ -12,19 +14,19 @@ stdenv.mkDerivation rec { CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; configureFlags = [ - "--with-blas-lib=-lopenblas" - "--with-lapack-lib=-lopenblas" + "--with-blas-lib=-lblas" + "--with-lapack-lib=-llapack" ]; nativeBuildInputs = [ unzip ]; - buildInputs = [ gfortran openblas ]; + buildInputs = [ gfortran blas lapack ]; enableParallelBuilding = true; meta = with stdenv.lib; { description = "A software package for large-scale nonlinear optimization"; - homepage = https://projects.coin-or.org/Ipopt; + homepage = "https://projects.coin-or.org/Ipopt"; license = licenses.epl10; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index 0f23f08145e9b..3f00547efcecd 100644 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html; + homepage = "http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html"; description = "A program for calculating with L-functions"; license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/pkgs/development/libraries/science/math/libbraiding/default.nix index c8f1138d69ff0..aac66e4fe05b3 100644 --- a/pkgs/development/libraries/science/math/libbraiding/default.nix +++ b/pkgs/development/libraries/science/math/libbraiding/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://github.com/miguelmarco/libbraiding/; + homepage = "https://github.com/miguelmarco/libbraiding/"; description = "C++ library for computations on braid groups"; longDescription = '' A library to compute several properties of braids, including centralizer and conjugacy check. diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/development/libraries/science/math/libhomfly/default.nix index a2c0dd4fa177f..d9b50a0fb2d1c 100644 --- a/pkgs/development/libraries/science/math/libhomfly/default.nix +++ b/pkgs/development/libraries/science/math/libhomfly/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://github.com/miguelmarco/libhomfly/; + homepage = "https://github.com/miguelmarco/libhomfly/"; description = "Library to compute the homfly polynomial of knots and links"; license = licenses.unlicense; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index a7d01e22d9622..045cccbd2ebfa 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -4,7 +4,7 @@ gfortran, cmake, python2, - shared ? false + shared ? true }: let inherit (stdenv.lib) optional; @@ -22,23 +22,23 @@ stdenv.mkDerivation { sha256 = "0sxnc97z67i7phdmcnq8f8lmxgw10wdwvr8ami0w3pb179cgrbpb"; }; - buildInputs = [ gfortran ]; - nativeBuildInputs = [ python2 cmake ]; + nativeBuildInputs = [ gfortran python2 cmake ]; cmakeFlags = [ "-DCMAKE_Fortran_FLAGS=-fPIC" "-DLAPACKE=ON" + "-DCBLAS=ON" ] - ++ (optional shared "-DBUILD_SHARED_LIBS=ON"); + ++ optional shared "-DBUILD_SHARED_LIBS=ON"; - doCheck = ! shared; + doCheck = true; enableParallelBuilding = true; meta = with stdenv.lib; { inherit version; description = "Linear Algebra PACKage"; - homepage = http://www.netlib.org/lapack/; + homepage = "http://www.netlib.org/lapack/"; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/development/libraries/science/math/liblbfgs/default.nix index 33e8baada8346..49108e5e33052 100644 --- a/pkgs/development/libraries/science/math/liblbfgs/default.nix +++ b/pkgs/development/libraries/science/math/liblbfgs/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { configureFlags = [ "--enable-sse2" ]; src = fetchurl { - url = https://github.com/downloads/chokkan/liblbfgs/liblbfgs-1.10.tar.gz; + url = "https://github.com/downloads/chokkan/liblbfgs/liblbfgs-1.10.tar.gz"; sha256 = "1kv8d289rbz38wrpswx5dkhr2yh4fg4h6sszkp3fawxm09sann21"; }; meta = { description = "Library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)"; - homepage = http://www.chokkan.org/software/liblbfgs/; + homepage = "http://www.chokkan.org/software/liblbfgs/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix index e6c5cac77d293..d8b4cbbffb482 100644 --- a/pkgs/development/libraries/science/math/m4ri/default.nix +++ b/pkgs/development/libraries/science/math/m4ri/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://malb.bitbucket.io/m4ri/; + homepage = "https://malb.bitbucket.io/m4ri/"; description = "Library to do fast arithmetic with dense matrices over F_2"; license = licenses.gpl2Plus; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix index 6a7ecdf46fd98..e1f86b346d7f2 100644 --- a/pkgs/development/libraries/science/math/m4rie/default.nix +++ b/pkgs/development/libraries/science/math/m4rie/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://malb.bitbucket.io/m4rie/; + homepage = "https://malb.bitbucket.io/m4rie/"; description = "Library for matrix multiplication, reduction and inversion over GF(2^k) for 2 <= k <= 10"; longDescription = '' M4RIE is a library for fast arithmetic with dense matrices over small finite fields of even characteristic. diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index 6a07ebdb862fc..dbe162c60b34d 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -1,8 +1,4 @@ -{ stdenv, fetchurl, cmake, gfortran, cudatoolkit, libpthreadstubs, liblapack -, mklSupport ? false, mkl ? null -}: - -assert !mklSupport || mkl != null; +{ stdenv, fetchurl, cmake, gfortran, cudatoolkit, libpthreadstubs, lapack, blas }: with stdenv.lib; @@ -17,13 +13,10 @@ in stdenv.mkDerivation { name = "magma-${version}.tar.gz"; }; - buildInputs = [ gfortran cudatoolkit libpthreadstubs cmake ] - ++ (if mklSupport then [ mkl ] else [ liblapack ]); + buildInputs = [ gfortran cudatoolkit libpthreadstubs cmake lapack blas ]; doCheck = false; - MKLROOT = optionalString mklSupport mkl; - preConfigure = '' export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ ''; @@ -51,7 +44,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Matrix Algebra on GPU and Multicore Architectures"; license = licenses.bsd3; - homepage = http://icl.cs.utk.edu/magma/index.html; + homepage = "http://icl.cs.utk.edu/magma/index.html"; platforms = platforms.unix; maintainers = with maintainers; [ tbenst ]; }; diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/pkgs/development/libraries/science/math/metis/default.nix index 3ce94f28ac2ac..8d6381c8d48de 100644 --- a/pkgs/development/libraries/science/math/metis/default.nix +++ b/pkgs/development/libraries/science/math/metis/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Serial graph partitioning and fill-reducing matrix ordering"; - homepage = http://glaros.dtc.umn.edu/gkhome/metis/metis/overview; + homepage = "http://glaros.dtc.umn.edu/gkhome/metis/metis/overview"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 82109b4ba3422..016864abed8cf 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,4 +1,12 @@ -{ stdenvNoCC, fetchurl, rpmextract, undmg, darwin, enableStatic ? false }: +{ stdenvNoCC +, fetchurl +, pkgconfig +, rpmextract +, undmg +, darwin +, enableStatic ? false +}: + /* For details on using mkl as a blas provider for python packages such as numpy, numexpr, scipy, etc., see the Python section of the NixPkgs manual. @@ -11,8 +19,8 @@ let # Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details: # https://github.com/matthewbauer/undmg/issues/4 year = if stdenvNoCC.isDarwin then "2019" else "2020"; - spot = if stdenvNoCC.isDarwin then "3" else "0"; - rel = if stdenvNoCC.isDarwin then "199" else "166"; + spot = if stdenvNoCC.isDarwin then "3" else "1"; + rel = if stdenvNoCC.isDarwin then "199" else "217"; rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}"; @@ -20,6 +28,8 @@ let openmp = if stdenvNoCC.isDarwin then "19.0" else "19.1"; openmp-ver = "${openmp}.${spot}-${rel}-${openmp}.${spot}-${rel}"; + shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary; + in stdenvNoCC.mkDerivation { pname = "mkl"; inherit version; @@ -32,8 +42,8 @@ in stdenvNoCC.mkDerivation { }) else (fetchurl { - url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16318/l_mkl_${version}.tgz"; - sha256 = "1q4ab87qzraksn8mm4117vj7l3sgpdi2qszj7nx122zi7zmjvngn"; + url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16533/l_mkl_${version}.tgz"; + sha256 = "0v86hrqg15mbc78m9qk8dbkaaq3mlwashgbf9n79kxpl1gilnah8"; }); nativeBuildInputs = if stdenvNoCC.isDarwin @@ -42,6 +52,10 @@ in stdenvNoCC.mkDerivation { else [ rpmextract ]; + installCheckInputs = [ pkgconfig ]; + + doInstallCheck = true; + buildPhase = if stdenvNoCC.isDarwin then '' for f in Contents/Resources/pkg/*.tgz; do tar xzvf $f @@ -75,6 +89,7 @@ in stdenvNoCC.mkDerivation { bn=$(basename $f) substituteInPlace $f \ --replace "prefix=<INSTALLDIR>/mkl" "prefix=$out" \ + --replace $\{MKLROOT} "$out" \ --replace "lib/intel64_lin" "lib" done @@ -111,7 +126,19 @@ in stdenvNoCC.mkDerivation { cp -r opt/intel/compilers_and_libraries_${version}/linux/compiler/lib/intel64_lin/*.so* $out/lib/ cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/*.so* $out/lib/ cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/bin/pkgconfig/*dynamic*.pc $out/lib/pkgconfig - ''); + '') + '' + + # Setup symlinks for blas / lapack + ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt} + ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt} + ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt} + ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt} + '' + stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux '' + ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}".3" + ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}".3" + ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}".3" + ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt}".3" + ''; # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the # larger updated load commands do not fit. Use install_name_tool @@ -125,6 +152,11 @@ in stdenvNoCC.mkDerivation { install_name_tool -change @rpath/libtbbmalloc.dylib $out/lib/libtbbmalloc.dylib $out/lib/libtbbmalloc_proxy.dylib ''; + # Validate pkgconfig files, since they break often on updates. + installCheckPhase = '' + pkg-config --validate $out/lib/pkgconfig/*.pc + ''; + # Per license agreement, do not modify the binary dontStrip = true; dontPatchELF = true; diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index c9aeb83c46941..5f38d45fc4d8d 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs"; - homepage = https://developer.nvidia.com/nccl; + homepage = "https://developer.nvidia.com/nccl"; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ mdaiter orivej ]; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index efad842bd357f..318922d7f25d4 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -93,15 +93,18 @@ let if !builtins.isBool val then toString val else if val then "1" else "0"; mkMakeFlagsFromConfig = mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}"); + + shlibExt = stdenv.hostPlatform.extensions.sharedLibrary; + in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.8"; + version = "0.3.9"; src = fetchFromGitHub { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "0s017qqi4n6jzrxl9cyx625wj26smnyn5g8s699s7h8v1srlrw6p"; + sha256 = "0nq51j45shb32n6086xff3x374kx5qhr2cwjzvppx4s2z0ahflal"; }; inherit blas64; @@ -176,19 +179,24 @@ Cflags: -I$out/include Libs: -L$out/lib -lopenblas EOF done + + # Setup symlinks for blas / lapack + ln -s $out/lib/libopenblas${shlibExt} $out/lib/libblas${shlibExt} + ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt} + ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt} + ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt} + '' + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + ln -s $out/lib/libopenblas${shlibExt} $out/lib/libblas${shlibExt}.3 + ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt}.3 + ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt}.3 + ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt}.3 ''; meta = with stdenv.lib; { description = "Basic Linear Algebra Subprograms"; license = licenses.bsd3; - homepage = https://github.com/xianyi/OpenBLAS; + homepage = "https://github.com/xianyi/OpenBLAS"; platforms = platforms.unix; maintainers = with maintainers; [ ttuegel ]; }; - - # We use linkName to pass a different name to --with-blas-libs for - # fflas-ffpack and linbox, because we use blas on darwin but openblas - # elsewhere. - # See see https://github.com/NixOS/nixpkgs/pull/45013. - passthru.linkName = "openblas"; } diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix index e4a3241c1f38b..7517ca9c6cb59 100644 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "High quality system independent, portable, open source libm implementation"; - homepage = https://www.openlibm.org/; + homepage = "https://www.openlibm.org/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.ttuegel ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/development/libraries/science/math/openspecfun/default.nix index 3a4c5a7843857..3689df607074b 100644 --- a/pkgs/development/libraries/science/math/openspecfun/default.nix +++ b/pkgs/development/libraries/science/math/openspecfun/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "A collection of special mathematical functions"; - homepage = https://github.com/JuliaLang/openspecfun; + homepage = "https://github.com/JuliaLang/openspecfun"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.ttuegel ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 688d14256819e..a69ae5af15f39 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "or-tools"; - version = "7.5"; + version = "7.6"; src = fetchFromGitHub { owner = "google"; repo = "or-tools"; rev = "v${version}"; - sha256 = "1p9jwdwzcsaa58ap912hdf2w27vna3xl9g4lh6kjskddwi8l3wac"; + sha256 = "0605q3y7vh7x7m9azrbkx44blq12zrab6v28b9wmpcn1lmykbw1b"; }; # The original build system uses cmake which does things like pull @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "python" ]; meta = with stdenv.lib; { - homepage = https://github.com/google/or-tools; + homepage = "https://github.com/google/or-tools"; license = licenses.asl20; description = '' Google's software suite for combinatorial optimization. diff --git a/pkgs/development/libraries/science/math/parmetis/default.nix b/pkgs/development/libraries/science/math/parmetis/default.nix index 3a9ef7704596f..97023d07c7f38 100644 --- a/pkgs/development/libraries/science/math/parmetis/default.nix +++ b/pkgs/development/libraries/science/math/parmetis/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices"; - homepage = http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview; + homepage = "http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview"; platforms = platforms.all; license = licenses.unfree; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index 911f0a1cf8984..6eeeda9e92841 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -1,15 +1,15 @@ -{ stdenv , fetchurl , blas , gfortran , liblapack , python }: +{ stdenv , fetchurl , blas , gfortran , lapack , python }: stdenv.mkDerivation rec { pname = "petsc"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "0943bydmsq3sjwj3rxhb8hx58b1fm8vymny731557fs10g5zfbyz"; + sha256 = "0pr604b9pnryl9q0q5arlhs0xdx7wslca0sbz0pzs9qylmz775qp"; }; - nativeBuildInputs = [ blas gfortran.cc.lib liblapack python ]; + nativeBuildInputs = [ blas gfortran.cc.lib lapack python ]; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace config/install.py \ @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { "--with-cxx=$CXX" "--with-fc=0" "--with-mpi=0" - "--with-blas-lib=[${blas}/lib/libblas.a,${gfortran.cc.lib}/lib/libgfortran.a]" - "--with-lapack-lib=[${liblapack}/lib/liblapack.a,${gfortran.cc.lib}/lib/libgfortran.a]" + "--with-blas-lib=[${blas}/lib/libblas.so,${gfortran.cc.lib}/lib/libgfortran.a]" + "--with-lapack-lib=[${lapack}/lib/liblapack.so,${gfortran.cc.lib}/lib/libgfortran.a]" ) ''; diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/pkgs/development/libraries/science/math/planarity/default.nix index e7dfaecf1de01..7767e23934cf9 100644 --- a/pkgs/development/libraries/science/math/planarity/default.nix +++ b/pkgs/development/libraries/science/math/planarity/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/graph-algorithms/edge-addition-planarity-suite; + homepage = "https://github.com/graph-algorithms/edge-addition-planarity-suite"; description = "A library for implementing graph algorithms"; license = licenses.bsd3; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix index 3b2ddc6f06c5f..6eeaddba04187 100644 --- a/pkgs/development/libraries/science/math/rubiks/default.nix +++ b/pkgs/development/libraries/science/math/rubiks/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://wiki.sagemath.org/spkg/rubiks; + homepage = "https://wiki.sagemath.org/spkg/rubiks"; description = "Several programs for working with Rubik's cubes"; # The individual websites are no longer available longDescription = '' diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index a226dd2fc63d6..1cf9c2ed8d53d 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, cmake, openssh -, gfortran, mpi, openblasCompat +, gfortran, mpi, blas, lapack } : +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "scalapack"; @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake openssh ]; - buildInputs = [ mpi gfortran openblasCompat ]; + buildInputs = [ mpi gfortran blas lapack ]; enableParallelBuilding = true; @@ -24,8 +25,8 @@ stdenv.mkDerivation rec { preConfigure = '' cmakeFlagsArray+=( -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF - -DLAPACK_LIBRARIES="-lopenblas" - -DBLAS_LIBRARIES="-lopenblas" + -DLAPACK_LIBRARIES="-llapack" + -DBLAS_LIBRARIES="-lblas" ) ''; @@ -44,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.netlib.org/scalapack/; + homepage = "http://www.netlib.org/scalapack/"; description = "Library of high-performance linear algebra routines for parallel distributed memory machines"; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix index db808b093fee8..3820f2b95275f 100644 --- a/pkgs/development/libraries/science/math/scs/default.nix +++ b/pkgs/development/libraries/science/math/scs/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, blas, liblapack, gfortran, fixDarwinDylibNames }: +{ stdenv, fetchFromGitHub, blas, lapack, gfortran, fixDarwinDylibNames }: + +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "scs"; @@ -20,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = [ blas liblapack gfortran.cc.lib ]; + buildInputs = [ blas lapack gfortran.cc.lib ]; doCheck = true; diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 599c1be664614..5a2c28d3c022d 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "3.2.1"; + version = "3.2.2"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "AAwwzrpKFHy40Ldm6hTO6L0FWPYwi3kJj3zrshFwYas="; + sha256 = "04hprrgj0f44ml2f0w4jfwgrvy8l2s6ya0c9xc8gwlbmkc7a4c62"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix index 48de128edc536..b1c1202c57804 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, gfortran, openblas }: +{ stdenv, fetchurl, gfortran, blas, lapack }: let - int_t = if openblas.blas64 then "int64_t" else "int32_t"; + int_t = if blas.isILP64 then "int64_t" else "int32_t"; in stdenv.mkDerivation rec { version = "4.2.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ gfortran ]; - buildInputs = [ openblas ]; + buildInputs = [ blas lapack ]; preConfigure = '' mkdir -p $out/lib @@ -29,12 +29,12 @@ stdenv.mkDerivation rec { "PREFIX=\"$(out)\"" "INSTALL_LIB=$(out)/lib" "INSTALL_INCLUDE=$(out)/include" - "BLAS=-lopenblas" - "LAPACK=" + "BLAS=-lblas" + "LAPACK=-llapack" ]; meta = with stdenv.lib; { - homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html; + homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html"; description = "A suite of sparse matrix algorithms"; license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ ttuegel ]; diff --git a/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/pkgs/development/libraries/science/math/suitesparse/4.4.nix index 1ce56d1e49f7f..81a80c920b539 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.4.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.4.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, gfortran, openblas -, enableCuda ? false, cudatoolkit +{ stdenv, fetchurl, gfortran, blas, lapack +, enableCuda ? false, cudatoolkit }: let version = "4.4.4"; name = "suitesparse-${version}"; - int_t = if openblas.blas64 then "int64_t" else "int32_t"; + int_t = if blas.isILP64 then "int64_t" else "int32_t"; SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary; in stdenv.mkDerivation { @@ -51,8 +51,8 @@ stdenv.mkDerivation { "PREFIX=\"$(out)\"" "INSTALL_LIB=$(out)/lib" "INSTALL_INCLUDE=$(out)/include" - "BLAS=-lopenblas" - "LAPACK=" + "BLAS=-lblas" + "LAPACK=-llapack" ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER"; @@ -64,7 +64,7 @@ stdenv.mkDerivation { for i in "$out"/lib/lib*.a; do ar -x $i done - ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lopenblas ${stdenv.lib.optionalString enableCuda "-lcublas"} + ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lblas ${stdenv.lib.optionalString enableCuda "-lcublas"} ) for i in umfpack cholmod amd camd colamd spqr; do ln -s libsuitesparse${SHLIB_EXT} "$out"/lib/lib$i${SHLIB_EXT} @@ -88,10 +88,10 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ gfortran ]; - buildInputs = [ openblas ]; + buildInputs = [ blas lapack ]; meta = with stdenv.lib; { - homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html; + homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html"; description = "A suite of sparse matrix algorithms"; license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ ttuegel ]; diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index f4adafd0f3876..f0480e1e2381d 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , gfortran -, openblas +, blas, lapack , metis , fixDarwinDylibNames , gnum4 @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "suitesparse"; - version = "5.7.1"; + version = "5.7.2"; outputs = [ "out" "dev" "doc" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "SuiteSparse"; rev = "v${version}"; - sha256 = "SA9SQKRDKUI1GilNMuCXljcvovLUwRKBUi/tiQ4dl5w="; + sha256 = "1imndff7yygjrbbrcscsmirdi8w0lkwj5dbhydxmf7lklwn4j3q6"; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ - openblas + blas lapack metis gfortran.cc.lib ] ++ stdenv.lib.optional enableCuda cudatoolkit; @@ -41,10 +41,10 @@ stdenv.mkDerivation rec { "INSTALL=${placeholder "out"}" "INSTALL_INCLUDE=${placeholder "dev"}/include" "JOBS=$(NIX_BUILD_CORES)" - "BLAS=-lopenblas" + "BLAS=-lblas" + "LAPACK=-llapack" "MY_METIS_LIB=-lmetis" - "LAPACK=" - ] ++ stdenv.lib.optionals openblas.blas64 [ + ] ++ stdenv.lib.optionals blas.isILP64 [ "CFLAGS=-DBLAS64" ] ++ stdenv.lib.optionals enableCuda [ "CUDA_PATH=${cudatoolkit}" @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { "library" ]; - # Likely fixed after 5.7.1 + # Likely fixed after 5.7.2 # https://github.com/DrTimothyAldenDavis/SuiteSparse/commit/f6daae26ee391e475e2295e77c839aa7c1a8b784 postInstall = stdenv.lib.optionalString stdenv.isDarwin '' # The fixDarwinDylibNames in nixpkgs can't seem to fix all the libraries. diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix index 570c981448565..ff59297bd8391 100644 --- a/pkgs/development/libraries/science/math/superlu/default.nix +++ b/pkgs/development/libraries/science/math/superlu/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, cmake, - gfortran, openblasCompat}: + gfortran, blas, lapack}: + +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { version = "5.2.1"; @@ -12,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake gfortran ]; - propagatedBuildInputs = [ openblasCompat ]; + propagatedBuildInputs = [ blas ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=true" @@ -20,7 +22,6 @@ stdenv.mkDerivation rec { ]; patches = [ - ./find-openblas-library.patch ./add-superlu-lib-as-dependency-for-the-unit-tests.patch ]; @@ -28,8 +29,8 @@ stdenv.mkDerivation rec { checkTarget = "test"; meta = { - homepage = http://crd-legacy.lbl.gov/~xiaoye/SuperLU/; - license = http://crd-legacy.lbl.gov/~xiaoye/SuperLU/License.txt; + homepage = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/"; + license = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/License.txt"; description = "A library for the solution of large, sparse, nonsymmetric systems of linear equations"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/science/math/superlu/find-openblas-library.patch b/pkgs/development/libraries/science/math/superlu/find-openblas-library.patch deleted file mode 100644 index ce7bc6974c951..0000000000000 --- a/pkgs/development/libraries/science/math/superlu/find-openblas-library.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -75,6 +75,8 @@ set(CMAKE_C_FLAGS_RELEASE "-O3" CACHE STRING "") - ###################################################################### - # - #--------------------- BLAS --------------------- -+find_package(OpenBLAS) -+set(TPL_BLAS_LIBRARIES ${OpenBLAS_LIBRARIES}) - if(NOT enable_blaslib) - if (TPL_BLAS_LIBRARIES) - set(BLAS_FOUND TRUE) diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index e67f61599b572..ae7a7c778de0e 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - version = "2.023.5"; + version = "2.023.6"; pname = "sympow"; src = fetchFromGitLab { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "forks"; repo = "sympow"; rev = "v${version}"; - sha256 = "1c5a2pizgqsf3pjkf7rfj20022ym4ixhrddp8ivs2nbzxwz6qvv9"; + sha256 = "132l0xv00ld1svvv9wh99wfra4zzjv2885h2sq0dsl98wiyvi5zl"; }; postUnpack = '' diff --git a/pkgs/development/libraries/science/math/tensorflow/bin.nix b/pkgs/development/libraries/science/math/tensorflow/bin.nix index f9f300883a16f..dc0ca5da4cfae 100644 --- a/pkgs/development/libraries/science/math/tensorflow/bin.nix +++ b/pkgs/development/libraries/science/math/tensorflow/bin.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { meta = { description = "C API for TensorFlow"; - homepage = https://www.tensorflow.org/install/lang_c; + homepage = "https://www.tensorflow.org/install/lang_c"; license = licenses.asl20; platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ basvandijk ]; diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index 838fb1f3638f2..a94a52936e8fd 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = http://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/; + homepage = "http://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/"; description = "Polynomial arithmetic over Z/nZ"; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/development/libraries/science/robotics/ispike/default.nix b/pkgs/development/libraries/science/robotics/ispike/default.nix index 640eefbd7336e..39f412e8dd569 100644 --- a/pkgs/development/libraries/science/robotics/ispike/default.nix +++ b/pkgs/development/libraries/science/robotics/ispike/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Spiking neural interface between iCub and a spiking neural simulator"; - homepage = https://sourceforge.net/projects/ispike/; + homepage = "https://sourceforge.net/projects/ispike/"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index ff29ae82c5ce3..0d980d9d1a2b4 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, patchelf, libusb}: +{stdenv, fetchurl, patchelf, libusb-compat-0_1}: assert stdenv ? cc && stdenv.cc.libc != null; @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ patchelf ]; installPhase = '' - RPATH=${libusb.out}/lib:${stdenv.cc.libc.out}/lib + RPATH=${libusb-compat-0_1.out}/lib:${stdenv.cc.libc.out}/lib for a in proprietary/*/Contents/Linux/*.so*; do if ! test -L $a; then @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.scmmicro.com/support/pc-security-support/downloads.html; + homepage = "http://www.scmmicro.com/support/pc-security-support/downloads.html"; description = "PCSC drivers for linux, for the SCM SCR3310 v2.0 card and others"; license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/development/libraries/scriptaculous/default.nix b/pkgs/development/libraries/scriptaculous/default.nix index eb8d17c64573e..f4e5ae378928f 100644 --- a/pkgs/development/libraries/scriptaculous/default.nix +++ b/pkgs/development/libraries/scriptaculous/default.nix @@ -22,8 +22,8 @@ interface JavaScript libraries to make your web sites and web applications fly. ''; - homepage = https://script.aculo.us/; - downloadPage = https://script.aculo.us/dist/; + homepage = "https://script.aculo.us/"; + downloadPage = "https://script.aculo.us/dist/"; license = licenses.mit; maintainers = with maintainers; [ das_j ]; }; diff --git a/pkgs/development/libraries/seasocks/default.nix b/pkgs/development/libraries/seasocks/default.nix index 9825c0c403551..144eb56c955f9 100644 --- a/pkgs/development/libraries/seasocks/default.nix +++ b/pkgs/development/libraries/seasocks/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib python ]; meta = with stdenv.lib; { - homepage = https://github.com/mattgodbolt/seasocks; + homepage = "https://github.com/mattgodbolt/seasocks"; description = "Tiny embeddable C++ HTTP and WebSocket server"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix index 1c74ced309df8..4122686542136 100644 --- a/pkgs/development/libraries/sentencepiece/default.nix +++ b/pkgs/development/libraries/sentencepiece/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentencepiece"; - version = "0.1.85"; + version = "0.1.91"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "1ncvyw9ar0z7nd47cysxg5xrjm01y1shdlhp8l2pdpx059p3yx3w"; + sha256 = "1yg55h240iigjaii0k70mjb4sh3mgg54rp2sz8bx5glnsjwys5s3"; }; nativeBuildInputs = [ cmake ] ++ lib.optional withGPerfTools gperftools; diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 63af0d40781d9..9e83bdae28ed9 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python3 wafHook ]; meta = with stdenv.lib; { - homepage = http://drobilla.net/software/serd; + homepage = "http://drobilla.net/software/serd"; description = "A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 4726221a40d95..7b5e1dcdb2b40 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { "-DSFML_USE_SYSTEM_DEPS=yes" ]; meta = with stdenv.lib; { - homepage = https://www.sfml-dev.org/; + homepage = "https://www.sfml-dev.org/"; description = "Simple and fast multimedia library"; longDescription = '' SFML is a simple, fast, cross-platform and object-oriented multimedia API. diff --git a/pkgs/development/libraries/sfsexp/default.nix b/pkgs/development/libraries/sfsexp/default.nix index 261658b0547ee..40009a8b7c36b 100644 --- a/pkgs/development/libraries/sfsexp/default.nix +++ b/pkgs/development/libraries/sfsexp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small, fast s-expression library"; - homepage = http://sexpr.sourceforge.net/; + homepage = "http://sexpr.sourceforge.net/"; maintainers = with maintainers; [ jb55 ]; license = licenses.gpl3; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index 9da54a3704252..8fd4987ac70cc 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C Library for reading, writing and updating ESRI Shapefiles"; - homepage = http://shapelib.maptools.org/; + homepage = "http://shapelib.maptools.org/"; license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; }; diff --git a/pkgs/development/libraries/shhmsg/default.nix b/pkgs/development/libraries/shhmsg/default.nix index 2790e181ac1bb..04b764afc946a 100644 --- a/pkgs/development/libraries/shhmsg/default.nix +++ b/pkgs/development/libraries/shhmsg/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for displaying messages"; - homepage = https://shh.thathost.com/pub-unix/; + homepage = "https://shh.thathost.com/pub-unix/"; license = licenses.artistic1; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/shhopt/default.nix b/pkgs/development/libraries/shhopt/default.nix index 52ba959b615ee..45ec31ca4dff4 100644 --- a/pkgs/development/libraries/shhopt/default.nix +++ b/pkgs/development/libraries/shhopt/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for parsing command line options"; - homepage = https://shh.thathost.com/pub-unix/; + homepage = "https://shh.thathost.com/pub-unix/"; license = licenses.artistic1; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 6b1c4ca97ba6b..564c32bf10dbe 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, freetype, cmake, python }: stdenv.mkDerivation rec { - version = "1.3.13"; + version = "1.3.14"; pname = "graphite2"; src = fetchurl { url = "https://github.com/silnrsi/graphite/releases/download/" + "${version}/graphite2-${version}.tgz"; - sha256 = "01jzhwnj1c3d68dmw15jdxly0hwkmd8ja4kw755rbkykn1ly2qyx"; + sha256 = "1790ajyhk0ax8xxamnrk176gc9gvhadzy78qia4rd8jzm89ir7gr"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index cbb6a4b64f17b..445a8bc5f21d6 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, git, swig, lua, itk, tcl, tk }: +{ stdenv, fetchFromGitHub, cmake, git, swig, lua, itk4, tcl, tk }: stdenv.mkDerivation rec { pname = "simpleitk"; @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake git swig ]; - buildInputs = [ lua itk ]; + buildInputs = [ lua itk4 ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_CXX_FLAGS='-Wno-attributes'" ]; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.simpleitk.org; + homepage = "http://www.simpleitk.org"; description = "Simplified interface to ITK"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index d7e0f8313850b..1628120ca583c 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.9.2.0"; - sha256 = "1i9d7w031kh338aq6xdsf8vl5amxbwxbny8lnrxlzydqvn8nxhz4"; + version = "2.9.2.1"; + sha256 = "0ff551181vv9d1z5sv7yg6n4b88ajcdircs4p4nif4yl7nsrj2r5"; description = "A set of general-purpose C programming libraries"; diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index d1cafbce11746..9b7905c180a92 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A multi-platform programmer's library designed to allow a developer to create robust software"; - homepage = http://www.jedsoft.org/slang/; + homepage = "http://www.jedsoft.org/slang/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix index 665f025ffcf3c..401564342b598 100644 --- a/pkgs/development/libraries/slib/default.nix +++ b/pkgs/development/libraries/slib/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # Public domain + permissive (non-copyleft) licensing of some files. license = stdenv.lib.licenses.publicDomain; - homepage = http://people.csail.mit.edu/jaffer/SLIB; + homepage = "http://people.csail.mit.edu/jaffer/SLIB"; maintainers = [ ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/smarty3-i18n/default.nix b/pkgs/development/libraries/smarty3-i18n/default.nix index cd1584ac739bb..d93a59efe6e7a 100644 --- a/pkgs/development/libraries/smarty3-i18n/default.nix +++ b/pkgs/development/libraries/smarty3-i18n/default.nix @@ -17,7 +17,7 @@ meta = with stdenv.lib; { description = "gettext for the smarty3 framework"; license = licenses.lgpl21; - homepage = https://github.com/kikimosha/smarty3-i18n; + homepage = "https://github.com/kikimosha/smarty3-i18n"; maintainers = with maintainers; [ das_j ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix index b3214cc01dfc7..d5708cb6b1e87 100644 --- a/pkgs/development/libraries/smarty3/default.nix +++ b/pkgs/development/libraries/smarty3/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { pname = "smarty3"; - version = "3.1.34"; + version = "3.1.36"; src = fetchFromGitHub { owner = "smarty-php"; repo = "smarty"; rev = "v${version}"; - sha256 = "0a44p71aqyifm7qkp892aczb0bn6a9fv4657dsscxszvdm25a92x"; + sha256 = "0jljzw1xl2kjwf9cylp1ddnjhz7wbm499s03r479891max1m2mlf"; }; installPhase = '' @@ -22,7 +22,7 @@ logic. This implies that PHP code is application logic, and is separated from the presentation. ''; - homepage = https://www.smarty.net; + homepage = "https://www.smarty.net"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ das_j ]; }; diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 4d74ee7ca063d..3a34bf54c3cbc 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "390"; src = fetchsvn { - url = svn://svn.icculus.org/smpeg/trunk; + url = "svn://svn.icculus.org/smpeg/trunk"; rev = version; sha256 = "0ynwn7ih5l2b1kpzpibns9bb9wzfjak7mgrb1ji0dkn2q5pv6lr0"; }; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lX11"; meta = { - homepage = http://icculus.org/smpeg/; + homepage = "http://icculus.org/smpeg/"; description = "MPEG decoding library"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/development/libraries/smpeg2/default.nix index 9004378647173..fc42ab989eb06 100644 --- a/pkgs/development/libraries/smpeg2/default.nix +++ b/pkgs/development/libraries/smpeg2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "412"; src = fetchsvn { - url = svn://svn.icculus.org/smpeg/trunk; + url = "svn://svn.icculus.org/smpeg/trunk"; rev = version; sha256 = "1irf2d8f150j8cx8lbb0pz1rijap536crsz0mw871xrh6wd2fd96"; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://icculus.org/smpeg/; + homepage = "http://icculus.org/smpeg/"; description = "SDL2 MPEG Player Library"; license = licenses.lgpl2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index acf10cc497c8d..7aa7cf3d452f3 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "snack-2.2.10"; src = fetchurl { - url = https://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz; + url = "https://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz"; sha256 = "07p89jv9qnjqkszws9sssq93ayvwpdnkcxrvyicbm4mb8x2pdzjb"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { description = "The Snack Sound Toolkit (Tcl)"; - homepage = http://www.speech.kth.se/snack/; + homepage = "http://www.speech.kth.se/snack/"; license = stdenv.lib.licenses.gpl2; broken = true; }; diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index ca2ff666b7a51..6758bf7a459fc 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification"; - homepage = http://sofia-sip.sourceforge.net/; + homepage = "http://sofia-sip.sourceforge.net/"; platforms = platforms.linux; license = licenses.lgpl2; }; diff --git a/pkgs/development/libraries/soil/default.nix b/pkgs/development/libraries/soil/default.nix index d9fcea767d5ea..10a60c36987c7 100644 --- a/pkgs/development/libraries/soil/default.nix +++ b/pkgs/development/libraries/soil/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { SOIL is a tiny C library used primarily for uploading textures into OpenGL. ''; - homepage = https://www.lonesock.net/soil.html; + homepage = "https://www.lonesock.net/soil.html"; license = stdenv.lib.licenses.publicDomain; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix index 3e93302f3d7d2..41b88b7f310ea 100644 --- a/pkgs/development/libraries/sonic/default.nix +++ b/pkgs/development/libraries/sonic/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple library to speed up or slow down speech"; - homepage = https://github.com/waywardgeek/sonic; + homepage = "https://github.com/waywardgeek/sonic"; license = licenses.asl20; maintainers = with maintainers; [ aske ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/development/libraries/sope/default.nix new file mode 100644 index 0000000000000..9d0b3bf76b36d --- /dev/null +++ b/pkgs/development/libraries/sope/default.nix @@ -0,0 +1,46 @@ +{ gnustep, lib, fetchFromGitHub , libxml2, openssl_1_1 +, openldap, mysql, libmysqlclient, postgresql }: with lib; gnustep.stdenv.mkDerivation rec { + pname = "sope"; + version = "4.3.2"; + + src = fetchFromGitHub { + owner = "inverse-inc"; + repo = pname; + rev = "SOPE-${version}"; + sha256 = "0ny1ihx38gd25w8f3dfybyswvyjfljvb2fhfmkajgg6hhjrkfar2"; + }; + + nativeBuildInputs = [ gnustep.make ]; + buildInputs = flatten ([ gnustep.base libxml2 openssl_1_1 ] + ++ optional (openldap != null) openldap + ++ optionals (mysql != null) [ libmysqlclient mysql ] + ++ optional (postgresql != null) postgresql); + + postPatch = '' + # Exclude NIX_ variables + sed -i 's/grep GNUSTEP_/grep ^GNUSTEP_/g' configure + ''; + + preConfigure = '' + export DESTDIR="$out" + ''; + + configureFlags = [ "--prefix=" "--disable-debug" "--enable-xml" "--with-ssl=ssl" ] + ++ optional (openldap != null) "--enable-openldap" + ++ optional (mysql != null) "--enable-mysql" + ++ optional (postgresql != null) "--enable-postgresql"; + + # Yes, this is ugly. + preFixup = '' + cp -rlPa $out/nix/store/*/* $out + rm -rf $out/nix/store + ''; + + meta = { + description = "SOPE is an extensive set of frameworks which form a complete Web application server environment"; + license = licenses.publicDomain; + homepage = "https://github.com/inverse-inc/sope"; + platforms = platforms.linux; + maintainers = with maintainers; [ ajs124 das_j ]; + }; +} diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix index 4739c7363979e..40ec30c6c858d 100644 --- a/pkgs/development/libraries/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; meta = { - homepage = http://soprano.sourceforge.net/; + homepage = "http://soprano.sourceforge.net/"; description = "An object-oriented C++/Qt4 framework for RDF data"; license = "LGPL"; maintainers = with stdenv.lib.maintainers; [ sander ]; diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index 79084ceda1c32..ff7c670ca0dc6 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig ]; meta = { - homepage = https://bitbucket.org/Coin3D/coin/wiki/Home; + homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home"; license = stdenv.lib.licenses.gpl2Plus; description = "Glue between Coin high-level 3D visualization library and Qt"; diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 746054e5939cf..5258f4d408b66 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ serd ]; meta = with stdenv.lib; { - homepage = http://drobilla.net/software/sord; + homepage = "http://drobilla.net/software/sord"; description = "A lightweight C library for storing RDF data in memory"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix index 4afb310d49ace..fe0d93344c0e2 100644 --- a/pkgs/development/libraries/soxt/default.nix +++ b/pkgs/development/libraries/soxt/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ coin3d motif xlibsWrapper libGLU libGL libXmu ]; meta = with stdenv.lib; { - homepage = https://bitbucket.org/Coin3D/coin/wiki/Home; + homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home"; license = licenses.bsd3; description = "A GUI binding for using Open Inventor with Xt/Motif"; maintainers = with maintainers; [ tmplt ]; diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index 95827ba364abb..1f9834c08f473 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [audiofile libtiff]; meta = { description = "A portable and modular SIP User-Agent with audio and video support"; - homepage = http://www.creytiv.com/baresip.html; + homepage = "http://www.creytiv.com/baresip.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/libraries/sparsehash/default.nix b/pkgs/development/libraries/sparsehash/default.nix index f898152d820e7..6845c616e9c1c 100644 --- a/pkgs/development/libraries/sparsehash/default.nix +++ b/pkgs/development/libraries/sparsehash/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/sparsehash/sparsehash; + homepage = "https://github.com/sparsehash/sparsehash"; description = "An extremely memory-efficient hash_map implementation"; platforms = platforms.all; license = licenses.bsd3; diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index 83eef355f2db8..939371e9209f0 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A complete sqlite3-compatible CLI front-end for libspatialite"; - homepage = https://www.gaia-gis.it/fossil/spatialite-tools; + homepage = "https://www.gaia-gis.it/fossil/spatialite-tools"; license = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index 7bf3a5faa7d10..f7c3fc50fd795 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://www.speex.org/; + homepage = "https://www.speex.org/"; description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index 4d74c7e055985..421b3ec08c489 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isAarch64 "--disable-neon"; meta = with stdenv.lib; { - homepage = https://www.speex.org/; + homepage = "https://www.speex.org/"; description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix index 3e4d64c47ada6..008fb608ca089 100644 --- a/pkgs/development/libraries/sphinxbase/default.nix +++ b/pkgs/development/libraries/sphinxbase/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { meta = { description = "Support Library for Pocketsphinx"; - homepage = http://cmusphinx.sourceforge.net; + homepage = "http://cmusphinx.sourceforge.net"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 7ba120d661bf0..22370cee448ec 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,35 +1,36 @@ { stdenv , fetchurl -, pkgconfig -, meson -, ninja -, python3 -, spice-protocol -, gettext -, openssl -, pixman -, gobject-introspection -, libjpeg_turbo -, zlib -, cyrus_sasl -, usbredir -, libsoup -, polkit , acl -, usbutils -, vala -, gtk3 +, cyrus_sasl +, docbook_xsl , epoxy -, libdrm +, gettext +, gobject-introspection , gst_all_1 -, phodav -, libopus , gtk-doc +, gtk3 , json-glib -, lz4 , libcacard +, libdrm +, libjpeg_turbo +, libopus +, libsoup +, libusb1 +, lz4 +, meson +, ninja +, openssl , perl -, docbook_xsl +, phodav +, pixman +, pkgconfig +, polkit +, python3 +, spice-protocol +, usbredir +, usbutils +, vala +, zlib , withPolkit ? true }: @@ -99,9 +100,10 @@ stdenv.mkDerivation rec { libcacard libdrm libjpeg_turbo + libopus + libusb1 lz4 openssl - libopus phodav pixman spice-protocol @@ -125,7 +127,7 @@ stdenv.mkDerivation rec { Python bindings are available too. ''; - homepage = https://www.spice-space.org/; + homepage = "https://www.spice-space.org/"; license = licenses.lgpl21; maintainers = [ maintainers.xeji ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index d2c4ddb8631e3..2e158b98b5839 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { VD-Interfaces. The VD-Interfaces (VDI) enable both ends of the solution to be easily utilized by a third-party component. ''; - homepage = https://www.spice-space.org/; + homepage = "https://www.spice-space.org/"; license = licenses.lgpl21; maintainers = [ maintainers.bluescreen303 ]; diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index d187187246b2a..f40c80391a236 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -1,18 +1,20 @@ -{ stdenv, lib, fetchFromGitHub, openssl, tcl, readline ? null, ncurses ? null }: +{ stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, readline ? null, ncurses ? null }: assert readline != null -> ncurses != null; stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - sha256 = "0s1aiwl61nl3b4ym4v050wlbbx0iypknqsj3ar12dw5hljlzx6f8"; + sha256 = "0mx0n5n3s39r25b31sdkrd4psxjqqgcv6rpm9d57w5rlk75g2fiv"; }; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ readline ncurses openssl tcl ]; configureFlags = [ "--enable-threadsafe" "--disable-tcl" ]; @@ -22,9 +24,13 @@ stdenv.mkDerivation rec { doCheck = false; # fails. requires tcl? + postInstall = '' + installManPage sqlcipher.1 + ''; + meta = with stdenv.lib; { - homepage = http://sqlcipher.net/; - description = "Full Database Encryption for SQLite"; + homepage = "https://www.zetetic.net/sqlcipher/"; + description = "SQLite extension that provides 256 bit AES encryption of database files"; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index 38eb1b158c892..4e37febbe756c 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool that shows statistics about SQLite databases"; - downloadPage = http://sqlite.org/download.html; - homepage = https://www.sqlite.org; + downloadPage = "http://sqlite.org/download.html"; + homepage = "https://www.sqlite.org"; license = licenses.publicDomain; maintainers = with maintainers; [ pesterhazy ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index a59325ba6cafd..245c55e9ea88b 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { meta = { description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; - downloadPage = https://sqlite.org/download.html; + downloadPage = "https://sqlite.org/download.html"; homepage = "https://www.sqlite.org/"; license = licenses.publicDomain; maintainers = with maintainers; [ eelco np ]; diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix index 739dfc3bc5b47..78ac8ba6448a0 100644 --- a/pkgs/development/libraries/sqlite/sqlar.nix +++ b/pkgs/development/libraries/sqlite/sqlar.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://sqlite.org/sqlar; + homepage = "https://sqlite.org/sqlar"; description = "SQLite Archive utilities"; license = licenses.bsd2; platforms = platforms.all; diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix index 953ba9484fadf..32c3135cd4f86 100644 --- a/pkgs/development/libraries/srt/default.nix +++ b/pkgs/development/libraries/srt/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Secure, Reliable, Transport"; - homepage = https://www.srtalliance.org; + homepage = "https://www.srtalliance.org"; license = licenses.mpl20; maintainers = with maintainers; [ nh2 ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index a906939f529b0..e8a3ca9443431 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/cisco/libsrtp; + homepage = "https://github.com/cisco/libsrtp"; description = "Secure RTP (SRTP) Reference Implementation"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index 82cbce8055e86..bf2522ca780b7 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 libxcb xcbutil ]; meta = { - homepage = http://www.freedesktop.org/software/startup-notification; + homepage = "http://www.freedesktop.org/software/startup-notification"; description = "Application startup notification and feedback library"; license = stdenv.lib.licenses.lgpl2; }; diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix index c2353c7b70612..8e57222ded0bd 100644 --- a/pkgs/development/libraries/stb/default.nix +++ b/pkgs/development/libraries/stb/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Single-file public domain libraries for C/C++"; - homepage = https://github.com/nothings/stb; + homepage = "https://github.com/nothings/stb"; license = licenses.publicDomain; platforms = platforms.all; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index 89261b665f509..b0da3dbfa278b 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.clifford.at/stfl/; + homepage = "http://www.clifford.at/stfl/"; description = "A library which implements a curses-based widget set for text terminals"; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; license = stdenv.lib.licenses.lgpl3; diff --git a/pkgs/development/libraries/stlport/default.nix b/pkgs/development/libraries/stlport/default.nix index ff1a7b57f4a51..2d344ab293d89 100644 --- a/pkgs/development/libraries/stlport/default.nix +++ b/pkgs/development/libraries/stlport/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of the C++ Standard Library"; - homepage = https://sourceforge.net/projects/stlport/; + homepage = "https://sourceforge.net/projects/stlport/"; license = stdenv.lib.licenses.free; # seems BSD-like broken = true; # probably glibc-2.20 -related issue }; diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 8121b7a501f7a..33a2ae25b1219 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://strigi.sourceforge.net; + homepage = "http://strigi.sourceforge.net"; description = "A very fast and efficient crawler to index data on your harddrive"; license = "LGPL"; maintainers = with stdenv.lib.maintainers; [ sander ]; diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index 5589a5560eb0d..fead2c8c1a530 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An implementation of the C++ standard template library STL for external memory (out-of-core) computations"; - homepage = https://github.com/stxxl/stxxl; + homepage = "https://github.com/stxxl/stxxl"; license = licenses.boost; maintainers = with maintainers; [ ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/sundials/2.x.nix b/pkgs/development/libraries/sundials/2.x.nix index 12840b7694034..b54e537fb8239 100644 --- a/pkgs/development/libraries/sundials/2.x.nix +++ b/pkgs/development/libraries/sundials/2.x.nix @@ -4,15 +4,13 @@ , python # GNU Octave needs KLU for ODE solvers , suitesparse -, liblapack +, blas, lapack , gfortran , lapackSupport ? true }: -let liblapackShared = liblapack.override { - shared = true; -}; +assert (!blas.isILP64) && (!lapack.isILP64); -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "sundials"; version = "2.7.0"; @@ -44,7 +42,7 @@ in stdenv.mkDerivation rec { "-DKLU_INCLUDE_DIR=${suitesparse}/include" "-DKLU_LIBRARY_DIR=${suitesparse}/lib" "-DLAPACK_ENABLE=ON" - "-DLAPACK_LIBRARIES=${liblapackShared}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary};${liblapackShared}/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DLAPACK_LIBRARIES=${lapack}/lib/lapack${stdenv.hostPlatform.extensions.sharedLibrary};${blas}/lib/blas${stdenv.hostPlatform.extensions.sharedLibrary}" ]; # flaky tests, and patch in https://github.com/LLNL/sundials/pull/21 doesn't apply cleanly for sundials_3 @@ -53,7 +51,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Suite of nonlinear differential/algebraic equation solvers"; - homepage = https://computation.llnl.gov/projects/sundials; + homepage = "https://computation.llnl.gov/projects/sundials"; platforms = platforms.all; maintainers = with maintainers; [ flokli idontgetoutmuch ]; license = licenses.bsd3; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index fb6f773459eba..46cf437d72ca5 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -2,17 +2,18 @@ , cmake , fetchurl , python -, openblas +, blas +, lapack , gfortran , lapackSupport ? true }: -let openblas32 = openblas.override { blas64 = false; }; +assert (!blas.isILP64) && (!lapack.isILP64); -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "sundials"; version = "5.1.0"; - buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran openblas32 ]; + buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran blas lapack ]; nativeBuildInputs = [ cmake ]; src = fetchurl { @@ -33,7 +34,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals (lapackSupport) [ "-DSUNDIALS_INDEX_TYPE=int32_t" "-DLAPACK_ENABLE=ON" - "-DLAPACK_LIBRARIES=${openblas32}/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" ]; doCheck = true; @@ -41,7 +42,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Suite of nonlinear differential/algebraic equation solvers"; - homepage = https://computation.llnl.gov/projects/sundials; + homepage = "https://computation.llnl.gov/projects/sundials"; platforms = platforms.all; maintainers = with maintainers; [ flokli idontgetoutmuch ]; license = licenses.bsd3; diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index 8d49f79814e57..bdac55fe2ec32 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An XMPP library for C++, used by the Swift client"; - homepage = http://swift.im/swiften.html; + homepage = "http://swift.im/swiften.html"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.twey ]; diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index 3d146a5a227b4..7349d7f81eb6c 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "sword"; - version = "1.7.4"; + version = "1.8.1"; src = fetchurl { - url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${pname}-${version}.tar.gz"; - sha256 = "0g91kpfkwccvdikddffdbzd6glnp1gdvkx4vh04iyz10bb7shpcr"; + url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.8/${pname}-${version}.tar.gz"; + sha256 = "14syphc47g6svkbg018nrsgq4z6hid1zydax243g8dx747vsi6nf"; }; nativeBuildInputs = [ pkgconfig ]; @@ -17,13 +17,6 @@ stdenv.mkDerivation rec { patchShebangs .; ''; - patches = [ - (fetchurl { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/sword/files/sword-1.7.4-gcc6.patch"; - sha256 = "0cvnya5swc7dxabir6bz6la2h1qxd32g3xi06m9b5l5ahb6g10y7"; - }) - ]; - configureFlags = [ "--without-conf" "--enable-tests=no" ]; CXXFLAGS = [ "-Wno-unused-but-set-variable" @@ -33,10 +26,19 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A software framework that allows research manipulation of Biblical texts"; - homepage = http://www.crosswire.org/sword/; - platforms = platforms.linux; + homepage = "http://www.crosswire.org/sword/"; + longDescription = '' + The SWORD Project is the CrossWire Bible Society's free Bible software + project. Its purpose is to create cross-platform open-source tools -- + covered by the GNU General Public License -- that allow programmers and + Bible societies to write new Bible software more quickly and easily. We + also create Bible study software for all readers, students, scholars, and + translators of the Bible, and have a growing collection of many hundred + texts in around 100 languages. + ''; license = licenses.gpl2; - maintainers = [ maintainers.piotr maintainers.AndersonTorres ]; + maintainers = with maintainers; [ piotr AndersonTorres ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix index a41b086016b75..524958e51a2c3 100644 --- a/pkgs/development/libraries/symengine/default.nix +++ b/pkgs/development/libraries/symengine/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SymEngine is a fast symbolic manipulation library"; - homepage = https://github.com/symengine/symengine; + homepage = "https://github.com/symengine/symengine"; platforms = platforms.unix ++ platforms.windows; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index f6d4df2eab3e2..2419cf5544214 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "Compression library that can be used with the hdf5 library"; - homepage = https://www.hdfgroup.org/doc_resource/SZIP/; + homepage = "https://www.hdfgroup.org/doc_resource/SZIP/"; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 010838efab5db..7d42abc6ea190 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A type 1 font rasterizer library for UNIX/X11"; - homepage = http://www.t1lib.org/; + homepage = "http://www.t1lib.org/"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index d1d4ee806b805..993cf66312179 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.raskin]; platforms = with stdenv.lib.platforms; linux ++ cygwin ++ darwin; - homepage = http://jedi.ks.uiuc.edu/~johns/tachyon/; + homepage = "http://jedi.ks.uiuc.edu/~johns/tachyon/"; }; } diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix index 28ce5c60481c6..89d676cf3a349 100644 --- a/pkgs/development/libraries/taglib-sharp/default.nix +++ b/pkgs/development/libraries/taglib-sharp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for reading and writing metadata in media files"; - homepage = https://github.com/mono/taglib-sharp; + homepage = "https://github.com/mono/taglib-sharp"; platforms = platforms.linux; license = licenses.lgpl21; }; diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix index 293baa492c561..22fd7b11681c6 100644 --- a/pkgs/development/libraries/tclap/default.nix +++ b/pkgs/development/libraries/tclap/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://tclap.sourceforge.net/; + homepage = "http://tclap.sourceforge.net/"; description = "Templatized C++ Command Line Parser Library"; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix index b1add708902f2..2cb65b9c69817 100644 --- a/pkgs/development/libraries/tcllib/default.nix +++ b/pkgs/development/libraries/tcllib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ tcl ]; meta = { - homepage = https://sourceforge.net/projects/tcllib/; + homepage = "https://sourceforge.net/projects/tcllib/"; description = "Tcl-only library of standard routines for Tcl"; license = stdenv.lib.licenses.tcltk; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix index f1fd6760c61d9..c26394f6cd50d 100644 --- a/pkgs/development/libraries/tcltls/default.nix +++ b/pkgs/development/libraries/tcltls/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://tls.sourceforge.net/; + homepage = "http://tls.sourceforge.net/"; description = "An OpenSSL / RSA-bsafe Tcl extension"; license = stdenv.lib.licenses.tcltk; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/libraries/tclx/default.nix index 1cb0637739980..5d4727a1831e9 100644 --- a/pkgs/development/libraries/tclx/default.nix +++ b/pkgs/development/libraries/tclx/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-tcl=${tcl}/lib" "--exec-prefix=\${prefix}" ]; meta = { - homepage = http://tclx.sourceforge.net/; + homepage = "http://tclx.sourceforge.net/"; description = "Tcl extensions"; license = stdenv.lib.licenses.tcltk; maintainers = with stdenv.lib.maintainers; [ kovirobi ]; diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index e835d1d86fdc8..93cf0670dc735 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://www.astro.caltech.edu/~mcs/tecla/; + homepage = "http://www.astro.caltech.edu/~mcs/tecla/"; description = "Command-line editing library"; license = "as-is"; diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index 1247d9ffa843e..455c761f6ee99 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GObject-based C library that uses Telepathy GLib, Farstream and GStreamer to handle the media streaming part of channels of type Call"; - homepage = https://telepathy.freedesktop.org/wiki/Components/Telepathy-Farstream/; + homepage = "https://telepathy.freedesktop.org/wiki/Components/Telepathy-Farstream/"; platforms = platforms.linux; license = licenses.lgpl21; }; diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 7436da503190d..ee2f34776d66d 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { passthru.python = python2; meta = with stdenv.lib; { - homepage = https://telepathy.freedesktop.org; + homepage = "https://telepathy.freedesktop.org"; platforms = platforms.unix; license = with licenses; [ bsd2 bsd3 lgpl21Plus ]; }; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index d14010c857e4b..b8e438819db36 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { patches = [ # https://github.com/TelepathyIM/telepathy-qt/issues/25 (fetchpatch { - url = https://github.com/TelepathyIM/telepathy-qt/commit/d654dc70dbec7097e96e6d96ca74ab1b5b00ef8c.patch; + url = "https://github.com/TelepathyIM/telepathy-qt/commit/d654dc70dbec7097e96e6d96ca74ab1b5b00ef8c.patch"; sha256 = "1jzd9b9rqh3c8xlq8dr7c0r8aabzf5ywv2gpkk6phh3xwngzrfbh"; }) ]; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Telepathy Qt bindings"; - homepage = https://telepathy.freedesktop.org/components/telepathy-qt/; + homepage = "https://telepathy.freedesktop.org/components/telepathy-qt/"; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index 070953d0bbcfb..385b198a755a3 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A library for template expansion which supports calling into GObject Introspection from templates"; - homepage = https://gitlab.gnome.org/GNOME/template-glib; + homepage = "https://gitlab.gnome.org/GNOME/template-glib"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index b2c47166153d5..008f0f5b424ef 100644 --- a/pkgs/development/libraries/tepl/default.nix +++ b/pkgs/development/libraries/tepl/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation { passthru.updateScript = gnome3.updateScript { packageName = pname; }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Tepl; + homepage = "https://wiki.gnome.org/Projects/Tepl"; description = "Text editor product line"; maintainers = [ maintainers.manveru ]; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/development/libraries/termbox/default.nix index 8ebf0156be8fc..22082f7198f4b 100644 --- a/pkgs/development/libraries/termbox/default.nix +++ b/pkgs/development/libraries/termbox/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # to make the package buildable on Python 3.7 patches = [ (fetchpatch { - url = https://github.com/nsf/termbox/commit/6fe63ac3ad63dc2c3ac45b770541cc8b7a1d2db7.patch; + url = "https://github.com/nsf/termbox/commit/6fe63ac3ad63dc2c3ac45b770541cc8b7a1d2db7.patch"; sha256 = "1s5747v51sdwvpsg6k9y1j60yn9f63qnylkgy8zrsifjzzd5fzl6"; }) ]; diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 43f1e8b83fec4..db434a5e62ed9 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, autoreconfHook, libkrb5 }: stdenv.mkDerivation rec { - name = "libtirpc-1.2.5"; + name = "libtirpc-1.2.6"; src = fetchurl { url = "mirror://sourceforge/libtirpc/${name}.tar.bz2"; - sha256 = "1jl6a5kkw2vrp4gb6pmvf72rqimywvwfb9f7iz2xjg4wgq63bdpk"; + sha256 = "1k6i6wma3xs7gmp54z587nd4yi5wrvg2ycl5g36zjnhx32jyjy22"; }; outputs = [ "out" "dev" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/libtirpc/; + homepage = "https://sourceforge.net/projects/libtirpc/"; description = "The transport-independent Sun RPC implementation (TI-RPC)"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/ticpp/default.nix b/pkgs/development/libraries/ticpp/default.nix index e46bf2418bcf9..01fab29b67430 100644 --- a/pkgs/development/libraries/ticpp/default.nix +++ b/pkgs/development/libraries/ticpp/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "Interface to TinyXML"; license = stdenv.lib.licenses.mit; - homepage = https://github.com/wxFormBuilder/ticpp; + homepage = "https://github.com/wxFormBuilder/ticpp"; }; } diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix index 51dabbd2beb78..f75b8cb01510f 100644 --- a/pkgs/development/libraries/tidyp/default.nix +++ b/pkgs/development/libraries/tidyp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A program that can validate your HTML, as well as modify it to be more clean and standard"; - homepage = http://tidyp.com/; + homepage = "http://tidyp.com/"; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; license = licenses.bsd3; diff --git a/pkgs/development/libraries/tinycdb/default.nix b/pkgs/development/libraries/tinycdb/default.nix index 19b8640f86650..71a105f3fd702 100644 --- a/pkgs/development/libraries/tinycdb/default.nix +++ b/pkgs/development/libraries/tinycdb/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { structure is tuned for fast reading. ''; - homepage = https://www.corpit.ru/mjt/tinycdb.html; + homepage = "https://www.corpit.ru/mjt/tinycdb.html"; license = licenses.publicDomain; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix index 4fc1da1fe0a3a..310b5a447c7a6 100644 --- a/pkgs/development/libraries/tinyxml-2/default.nix +++ b/pkgs/development/libraries/tinyxml-2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple, small, efficient, C++ XML parser"; - homepage = http://www.grinninglizard.com/tinyxml2/index.html; + homepage = "http://www.grinninglizard.com/tinyxml2/index.html"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.zlib; }; diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index 0cc4038b64e72..9c909d5e14d6c 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -23,14 +23,14 @@ in stdenv.mkDerivation { ./2.6.2-cxx.patch ]; - preConfigure = "export LD=${if stdenv.isDarwin then "clang++" else "g++"}"; + preConfigure = "export LD=${stdenv.cc.targetPrefix}c++"; hardeningDisable = [ "format" ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; buildPhase = '' # use STL (xbmc requires it) sed '1i#define TIXML_USE_STL 1' -i tinyxml.h @@ -73,7 +73,7 @@ in stdenv.mkDerivation { meta = { description = "Simple, small, C++ XML parser that can be easily integrating into other programs"; - homepage = http://www.grinninglizard.com/tinyxml/index.html; + homepage = "http://www.grinninglizard.com/tinyxml/index.html"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index 507f2fb275b7c..f0b460b6f3dcb 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A widget library for Tcl/Tk"; - homepage = http://tix.sourceforge.net/; + homepage = "http://tix.sourceforge.net/"; platforms = platforms.all; license = with licenses; [ bsd2 # tix diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index a65c6053f295e..745be0be922fa 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages"; - homepage = https://www.tcl.tk/; + homepage = "https://www.tcl.tk/"; license = licenses.tcltk; platforms = platforms.all; maintainers = with maintainers; [ lovek323 vrthra ]; diff --git a/pkgs/development/libraries/tl-expected/default.nix b/pkgs/development/libraries/tl-expected/default.nix index 9de97229e0b67..e91c42c884cb3 100644 --- a/pkgs/development/libraries/tl-expected/default.nix +++ b/pkgs/development/libraries/tl-expected/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++11/14/17 std::expected with functional-style extensions"; - homepage = https://tl.tartanllama.xyz/en/latest/api/expected.html; + homepage = "https://tl.tartanllama.xyz/en/latest/api/expected.html"; license = licenses.cc0; platforms = platforms.all; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix index 13e8f783915d0..7e8aa2983cfdd 100644 --- a/pkgs/development/libraries/tnt/default.nix +++ b/pkgs/development/libraries/tnt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "3.0.12"; src = fetchurl { - url = https://math.nist.gov/tnt/tnt_3_0_12.zip; + url = "https://math.nist.gov/tnt/tnt_3_0_12.zip"; sha256 = "1bzkfdb598584qlc058n8wqq9vbz714gr5r57401rsa9qaxhk5j7"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://math.nist.gov/tnt/; + homepage = "https://math.nist.gov/tnt/"; description = "Template Numerical Toolkit: C++ headers for array and matrices"; license = stdenv.lib.licenses.publicDomain; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix index 2d6ae3f18cad8..ff14c8c3305e8 100644 --- a/pkgs/development/libraries/tntdb/default.nix +++ b/pkgs/development/libraries/tntdb/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.tntnet.org/tntdb.html; + homepage = "http://www.tntnet.org/tntdb.html"; description = "C++ library which makes accessing SQL databases easy and robust"; platforms = platforms.linux ; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/development/libraries/tntnet/default.nix index 86b0080a82424..332750d7694c1 100644 --- a/pkgs/development/libraries/tntnet/default.nix +++ b/pkgs/development/libraries/tntnet/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.tntnet.org/tntnet.html; + homepage = "http://www.tntnet.org/tntnet.html"; description = "Web server which allows users to develop web applications using C++"; platforms = platforms.linux ; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix index 358da431e1c7c..5b58bf4167246 100644 --- a/pkgs/development/libraries/tokyo-tyrant/default.nix +++ b/pkgs/development/libraries/tokyo-tyrant/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { licensed under the GNU Lesser General Public License. ''; - homepage = https://fallabs.com/tokyotyrant/; + homepage = "https://fallabs.com/tokyotyrant/"; license = stdenv.lib.licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix index dd2e43f9bf0de..266538d43c251 100644 --- a/pkgs/development/libraries/totem-pl-parser/default.nix +++ b/pkgs/development/libraries/totem-pl-parser/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 ]; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Videos; + homepage = "https://wiki.gnome.org/Apps/Videos"; description = "Simple GObject-based library to parse and save a host of playlist formats"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 6195c80e24bf1..b264c3bc6c6e5 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "OSS implementation of the TCG TPM2 Software Stack (TSS2)"; - homepage = https://github.com/tpm2-software/tpm2-tss; + homepage = "https://github.com/tpm2-software/tpm2-tss"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ delroth ]; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index a60f1b1e79f38..0428728232845 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { }) # https://bugzilla.gnome.org/show_bug.cgi?id=795576 (fetchurl { - url = https://bugzilla.gnome.org/attachment.cgi?id=371427; + url = "https://bugzilla.gnome.org/attachment.cgi?id=371427"; sha256 = "187flswvzymjfxwfrrhizb1cvs780zm39aa3i2vwa5fbllr7kcpf"; }) ]; @@ -130,9 +130,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Tracker; + homepage = "https://wiki.gnome.org/Projects/Tracker"; description = "Desktop-neutral user information store, search tool and indexer"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 4638788aee7a4..2224addf02ad0 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -1,8 +1,33 @@ -{ stdenv, fetchurl, gettext, meson, ninja, pkgconfig, gobject-introspection, python3 -, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_43, glibcLocales -, libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer -, gnome3, icu, libuuid, networkmanager, libsoup, json-glib, systemd, dbus -, substituteAll }: +{ stdenv +, fetchurl +, gettext +, meson +, ninja +, pkgconfig +, gobject-introspection +, python3 +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, docbook_xml_dtd_43 +, docbook_xml_dtd_45 +, libxml2 +, glib +, wrapGAppsHook +, vala +, sqlite +, libxslt +, libstemmer +, gnome3 +, icu +, libuuid +, networkmanager +, libsoup +, json-glib +, systemd +, dbus +, substituteAll +}: stdenv.mkDerivation rec { pname = "tracker"; @@ -15,34 +40,80 @@ stdenv.mkDerivation rec { sha256 = "V3lSJEq5d8eLC4ji9jxBl+q6FuTWa/9pK39YmT4GUW0="; }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + gdbus = "${glib.bin}/bin/gdbus"; + }) + ]; + nativeBuildInputs = [ - meson ninja vala pkgconfig gettext libxslt wrapGAppsHook gobject-introspection - gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_43 glibcLocales + meson + ninja + vala + pkgconfig + gettext + libxslt + wrapGAppsHook + gobject-introspection + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + docbook_xml_dtd_43 + docbook_xml_dtd_45 python3 # for data-generators systemd # used for checks to install systemd user service dbus # used for checks and pkgconfig to install dbus service/s ]; buildInputs = [ - glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib libstemmer + glib + libxml2 + sqlite + icu + networkmanager + libsoup + libuuid + json-glib + libstemmer + ]; + + checkInputs = [ + python3.pkgs.pygobject3 ]; mesonFlags = [ # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas - "-Dfunctional_tests=false" + # "-Dfunctional_tests=true" "-Ddocs=true" ]; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - gdbus = "${glib.bin}/bin/gdbus"; - }) - ]; + doCheck = true; postPatch = '' patchShebangs utils/g-ir-merge/g-ir-merge patchShebangs utils/data-generators/cc/generate + patchShebangs tests/functional-tests/test-runner.sh.in + patchShebangs tests/functional-tests/*.py + ''; + + preCheck = '' + # (tracker-store:6194): Tracker-CRITICAL **: 09:34:07.722: Cannot initialize database: Could not open sqlite3 database:'/homeless-shelter/.cache/tracker/meta.db': unable to open database file + export HOME=$(mktemp -d) + + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running functional tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overridden during installation. + mkdir -p $out/lib + ln -s $PWD/src/libtracker-sparql-backend/libtracker-sparql-2.0.so $out/lib/libtracker-sparql-2.0.so.0 + ln -s $PWD/src/libtracker-miner/libtracker-miner-2.0.so $out/lib/libtracker-miner-2.0.so.0 + ln -s $PWD/src/libtracker-data/libtracker-data.so $out/lib/libtracker-data.so + ''; + + postCheck = '' + # Clean up out symlinks + rm -r $out/lib ''; postInstall = '' @@ -57,10 +128,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Tracker; + homepage = "https://wiki.gnome.org/Projects/Tracker"; description = "Desktop-neutral user information store, search tool and indexer"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix index d5ed35694c58b..80806848846f8 100644 --- a/pkgs/development/libraries/tre/default.nix +++ b/pkgs/development/libraries/tre/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://sources.debian.net/data/main/t/tre/0.8.0-6/debian/patches/03-cve-2016-8859; + url = "https://sources.debian.net/data/main/t/tre/0.8.0-6/debian/patches/03-cve-2016-8859"; sha256 = "0navhizym6qxd4gngrsslbij8x9r3s67p1jzzhvsnq6ky49j7w3p"; }) ]; diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index 91b6d2cb16746..c2cb8a836bfab 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "tremor-unstable-2018-03-16"; src = fetchgit { - url = https://git.xiph.org/tremor.git; + url = "https://git.xiph.org/tremor.git"; rev = "562307a4a7082e24553f3d2c55dab397a17c4b4f"; sha256 = "0m07gq4zfgigsiz8b518xyb19v7qqp76qmp7lb262825vkqzl3zq"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://xiph.org/tremor/; + homepage = "https://xiph.org/tremor/"; description = "Fixed-point version of the Ogg Vorbis decoder"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix index d5af39d3f2a1e..f2018286a3eae 100644 --- a/pkgs/development/libraries/tsocks/default.nix +++ b/pkgs/development/libraries/tsocks/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Transparent SOCKS v4 proxying library"; - homepage = http://tsocks.sourceforge.net/; + homepage = "http://tsocks.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ edwtjo phreedom ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/tweeny/default.nix b/pkgs/development/libraries/tweeny/default.nix new file mode 100644 index 0000000000000..d3c30028ba473 --- /dev/null +++ b/pkgs/development/libraries/tweeny/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "tweeny"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "mobius3"; + repo = "tweeny"; + rev = "v${version}"; + sha256 = "0qvby57g9a2m4afd1mgard3k7nm4ynbvali7nzm1qn3ygdmqid7n"; + }; + + nativeBuildInputs = [ + cmake + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "A modern C++ tweening library"; + license = licenses.mit; + homepage = "http://mobius3.github.io/tweeny"; + maintainers = [ maintainers.doronbehar ]; + platforms = with platforms; darwin ++ linux; + }; +} diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix index e1284c39aa3be..7c44731ef1305 100644 --- a/pkgs/development/libraries/twolame/default.nix +++ b/pkgs/development/libraries/twolame/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { tooLAME by Mike Cheng, which in turn is based upon the ISO dist10 code and portions of LAME. ''; - homepage = http://www.twolame.org/; + homepage = "http://www.twolame.org/"; license = with licenses; [ lgpl2Plus ]; platforms = with platforms; unix; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix index 933a3afef35b5..f25a63137526b 100644 --- a/pkgs/development/libraries/ucl/default.nix +++ b/pkgs/development/libraries/ucl/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ucl-1.03"; src = fetchurl { - url = https://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz; + url = "https://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz"; sha256 = "b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348"; }; @@ -11,7 +11,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-std=c90"; meta = { - homepage = http://www.oberhumer.com/opensource/ucl/; + homepage = "http://www.oberhumer.com/opensource/ucl/"; description = "Portable lossless data compression library"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 53e10b468ba62..1c20ce6d9c835 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ library to facilitate using C++ design patterns"; - homepage = https://www.gnu.org/software/commoncpp/; + homepage = "https://www.gnu.org/software/commoncpp/"; license = stdenv.lib.licenses.lgpl3Plus; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index d1e3934d882c6..9ec8ca660cfd5 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Unified Communication X library"; - homepage = http://www.openucx.org; + homepage = "http://www.openucx.org"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.markuskowa ]; diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/development/libraries/udns/default.nix index 18f270e70db59..41fb6e7abff62 100644 --- a/pkgs/development/libraries/udns/default.nix +++ b/pkgs/development/libraries/udns/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { outputDevdoc = "out"; meta = with stdenv.lib; { - homepage = http://www.corpit.ru/mjt/udns.html; + homepage = "http://www.corpit.ru/mjt/udns.html"; description = "Async-capable DNS stub resolver library"; license = licenses.lgpl21Plus; maintainers = [ maintainers.womfoo ]; diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix index faee73fd393a9..65e88f8fd8c14 100644 --- a/pkgs/development/libraries/udunits/default.nix +++ b/pkgs/development/libraries/udunits/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat ]; meta = with stdenv.lib; { - homepage = https://www.unidata.ucar.edu/software/udunits/; + homepage = "https://www.unidata.ucar.edu/software/udunits/"; description = "A C-based package for the programatic handling of units of physical quantities"; license = licenses.bsdOriginal; platforms = platforms.linux; diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index 1b5fbe6c2cae8..085741a66f88f 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Project for mocking web service APIs which use HTTP or HTTPS"; - homepage = https://gitlab.com/groups/uhttpmock/; + homepage = "https://gitlab.com/groups/uhttpmock/"; license = licenses.lgpl21; maintainers = with maintainers; [ ]; platforms = with platforms; linux; diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix index 7fa8fe81c1109..87ca28fee9830 100644 --- a/pkgs/development/libraries/unicap/default.nix +++ b/pkgs/development/libraries/unicap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l-utils }: +{ stdenv, fetchurl, libusb-compat-0_1, libraw1394, dcraw, intltool, perl, v4l-utils }: stdenv.mkDerivation rec { pname = "libunicap"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9"; }; - buildInputs = [ libusb libraw1394 dcraw intltool perl v4l-utils ]; + buildInputs = [ libusb-compat-0_1 libraw1394 dcraw intltool perl v4l-utils ]; patches = [ # Debian has a patch that fixes the build. @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Universal video capture API"; - homepage = http://www.unicap-imaging.org/; + homepage = "http://www.unicap-imaging.org/"; maintainers = [ maintainers.raskin ]; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix index 0e5971945f3d6..7dd8e071567ab 100644 --- a/pkgs/development/libraries/unittest-cpp/default.nix +++ b/pkgs/development/libraries/unittest-cpp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - homepage = https://github.com/unittest-cpp/unittest-cpp; + homepage = "https://github.com/unittest-cpp/unittest-cpp"; description = "Lightweight unit testing framework for C++"; license = licenses.mit; maintainers = []; diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index 3a51e2c986a77..a4fcac2a35807 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ODBC driver manager for Unix"; - homepage = http://www.unixodbc.org/; + homepage = "http://www.unixodbc.org/"; license = licenses.lgpl2; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index da15ece559a6a..6de0aabe70cbc 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -21,7 +21,7 @@ meta = with stdenv.lib; { description = "Official PostgreSQL ODBC Driver"; - homepage = https://odbc.postgresql.org/; + homepage = "https://odbc.postgresql.org/"; license = licenses.lgpl2; platforms = platforms.linux; }; @@ -62,7 +62,7 @@ meta = with stdenv.lib; { description = "MariaDB ODBC database driver"; - homepage = https://downloads.mariadb.org/connector-odbc/; + homepage = "https://downloads.mariadb.org/connector-odbc/"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; }; @@ -90,7 +90,7 @@ meta = with stdenv.lib; { description = "MariaDB ODBC database driver"; - homepage = https://dev.mysql.com/downloads/connector/odbc/; + homepage = "https://dev.mysql.com/downloads/connector/odbc/"; license = licenses.gpl2; platforms = platforms.linux; broken = true; @@ -125,7 +125,7 @@ meta = with stdenv.lib; { description = "ODBC driver for SQLite"; - homepage = http://www.ch-werner.de/sqliteodbc; + homepage = "http://www.ch-werner.de/sqliteodbc"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ vlstill ]; @@ -168,7 +168,7 @@ meta = with stdenv.lib; { description = "ODBC Driver 17 for SQL Server"; - homepage = https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-2017; + homepage = "https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-2017"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ spencerjanssen ]; diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix index 5e5f4c9e8ca61..c96629072f99b 100644 --- a/pkgs/development/libraries/uri/default.nix +++ b/pkgs/development/libraries/uri/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ URI library"; - homepage = https://cpp-netlib.org; + homepage = "https://cpp-netlib.org"; license = stdenv.lib.licenses.boost; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index 9c48488bff8eb..de621b30e247b 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -1,23 +1,34 @@ -{ lib, stdenv, fetchurl, gtest, pkgconfig, doxygen, graphviz }: +{ lib, stdenv, fetchurl, fetchpatch, cmake, gtest }: stdenv.mkDerivation rec { pname = "uriparser"; - version = "0.9.1"; + version = "0.9.3"; # Release tarball differs from source tarball src = fetchurl { url = "https://github.com/uriparser/uriparser/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2"; - sha256 = "1gisi7h8hd6mswbiaaa3s25bnb77xf37pzrmjy63rcdpwcyqy93m"; + sha256 = "13z234jdaqs9jj7i66gcv4q1rgsypjz6cighnlm1j4g80pdlmbr8"; }; - nativeBuildInputs = [ pkgconfig doxygen graphviz ]; - buildInputs = lib.optional doCheck gtest; - configureFlags = lib.optional (!doCheck) "--disable-tests"; + patches = [ + # fixes tests + (fetchpatch { + url = "https://github.com/uriparser/uriparser/commit/f870e6c68696a6018702caa5c8a2feba9b0f99fa.diff"; + sha256 = "1nd6bhys9hwy6ippa42vm95zhw6hldm1s4xbdzmdjswc96as1ff5"; + }) + ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DURIPARSER_BUILD_DOCS=OFF" + ]; + + checkInputs = [ gtest ]; doCheck = stdenv.targetPlatform.system == stdenv.hostPlatform.system; meta = with stdenv.lib; { - homepage = https://uriparser.github.io/; + homepage = "https://uriparser.github.io/"; description = "Strictly RFC 3986 compliant URI parsing library"; longDescription = '' uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 8e43135196c90..2ac7c823e22aa 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb }: +{ stdenv, fetchurl, pkgconfig, libusb1 }: stdenv.mkDerivation rec { pname = "usbredir"; @@ -12,14 +12,13 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb ]; - propagatedBuildInputs = [ libusb ]; + propagatedBuildInputs = [ libusb1 ]; outputs = [ "out" "dev" ]; meta = with stdenv.lib; { description = "USB traffic redirection protocol"; - homepage = http://spice-space.org/page/UsbRedir; + homepage = "https://www.spice-space.org/usbredir.html"; license = licenses.lgpl21; maintainers = [ maintainers.offline ]; diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix index 18eae87e11c6c..b6bb02d56e440 100644 --- a/pkgs/development/libraries/ustr/default.nix +++ b/pkgs/development/libraries/ustr/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.and.org/ustr/; + homepage = "http://www.and.org/ustr/"; description = "Micro String API for C language"; license = licenses.bsd2; maintainers = [ maintainers.phreedom ]; diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix index e6cd082763966..d2c5b6ab11d65 100644 --- a/pkgs/development/libraries/uthash/default.nix +++ b/pkgs/development/libraries/uthash/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A hash table for C structures"; - homepage = http://troydhanson.github.io/uthash; + homepage = "http://troydhanson.github.io/uthash"; license = licenses.bsd2; # it's one-clause, actually, as it's source-only platforms = platforms.all; }; diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix index 678d7dd265c4b..6462bfd5e6244 100644 --- a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix +++ b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ # driver_init: load libva-x11.so for any ABI version (fetchurl { - url = https://github.com/01org/intel-hybrid-driver/pull/26.diff; + url = "https://github.com/01org/intel-hybrid-driver/pull/26.diff"; sha256 = "1ql4mbi5x1d2a5c8mkjvciaq60zj8nhx912992winbhfkyvpb3gx"; }) ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://01.org/linuxmedia; + homepage = "https://01.org/linuxmedia"; description = "Intel driver for the VAAPI library with partial HW acceleration"; license = licenses.mit; maintainers = with maintainers; [ tadfisher ]; diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 1775d5fffc59e..c61429324edde 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://01.org/linuxmedia; + homepage = "https://01.org/linuxmedia"; license = licenses.mit; description = "Intel driver for the VAAPI library"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix index 8a2e3af4791c7..1030aefc1a54c 100644 --- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "vapoursynth-mvtools"; - version = "21"; + version = "23"; src = fetchFromGitHub { owner = "dubhater"; repo = "vapoursynth-mvtools"; rev = "v${version}"; - sha256 = "0vjxpp4jmmjhcp8z81idsbgq6jyx0l4r4i32b8alnp6c9fahjh6p"; + sha256 = "0lngkvxnzn82rz558nvl96rvclrck07ja1pny7wcfixp9b68ppkn"; }; nativeBuildInputs = [ pkgconfig ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set of filters for motion estimation and compensation"; - homepage = https://github.com/dubhater/vapoursynth-mvtools; + homepage = "https://github.com/dubhater/vapoursynth-mvtools"; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; }; diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 0cdbe396a109d..043bfb007a3d6 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, makeWrapper , zimg, libass, python3, libiconv -, ApplicationServices, nasm +, ApplicationServices , ocrSupport ? false, tesseract ? null , imwriSupport? true, imagemagick7 ? null }: @@ -12,16 +12,16 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "R48"; + version = "R49"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "1i6163bidlp0p9zcnxpsphr44ayfzd51fig4ri7vbrbl9lw9jaih"; + sha256 = "1d298mlb24nlc2x7pixfbkd0qbpv4c706c32idsgpi96z1spkhvl"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook nasm makeWrapper ]; + nativeBuildInputs = [ pkgconfig autoreconfHook makeWrapper ]; buildInputs = [ zimg libass (python3.withPackages (ps: with ps; [ sphinx cython ])) @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A video processing framework with the future in mind"; - homepage = http://www.vapoursynth.com/; + homepage = "http://www.vapoursynth.com/"; license = licenses.lgpl21; platforms = platforms.x86_64; maintainers = with maintainers; [ rnhmjoj tadeokondrak ]; diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix index 18b2659cc5df6..46a3a3e52f0f6 100644 --- a/pkgs/development/libraries/vc/0.7.nix +++ b/pkgs/development/libraries/vc/0.7.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for multiprecision complex arithmetic with exact rounding"; - homepage = https://github.com/VcDevel/Vc; + homepage = "https://github.com/VcDevel/Vc"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index 2194c7be38b91..49d3f9af7193e 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for multiprecision complex arithmetic with exact rounding"; - homepage = https://github.com/VcDevel/Vc; + homepage = "https://github.com/VcDevel/Vc"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index 480b8f7bcd7b2..c7f375c207896 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libcdio ]; meta = with lib; { - homepage = https://www.gnu.org/software/vcdimager/; + homepage = "https://www.gnu.org/software/vcdimager/"; description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs"; platforms = platforms.unix; license = licenses.gpl2; diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix index eb37d14b532b8..a8a24750744b9 100644 --- a/pkgs/development/libraries/vcg/default.nix +++ b/pkgs/development/libraries/vcg/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://vcg.isti.cnr.it/vcglib/install.html; + homepage = "http://vcg.isti.cnr.it/vcglib/install.html"; description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/vid-stab/default.nix b/pkgs/development/libraries/vid-stab/default.nix index eb88b36a14227..e22396f8aa39c 100644 --- a/pkgs/development/libraries/vid-stab/default.nix +++ b/pkgs/development/libraries/vid-stab/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Video stabilization library"; - homepage = http://public.hronopik.de/vid.stab/; + homepage = "http://public.hronopik.de/vid.stab/"; license = licenses.gpl2; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 625ec2cee3890..8720a39f301a3 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Novel computer vision C++ library with customizable algorithms and data structures"; - homepage = https://hci.iwr.uni-heidelberg.de/vigra; + homepage = "https://hci.iwr.uni-heidelberg.de/vigra"; license = licenses.mit; maintainers = [ maintainers.viric ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index a68880c2f9526..e0c58096cfa51 100644 --- a/pkgs/development/libraries/vmime/default.nix +++ b/pkgs/development/libraries/vmime/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = https://www.vmime.org/; + homepage = "https://www.vmime.org/"; description = "Free mail library for C++"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index b9eb29422c54d..21c186a673271 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { computations and frustum culling classes, and spatial data structures''; license = licenses.bsd2; - homepage = https://github.com/VMML/vmmlib/; + homepage = "https://github.com/VMML/vmmlib/"; maintainers = [ maintainers.adev ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/development/libraries/vo-amrwbenc/default.nix index 1a900c3135ca4..9f35bf4ad84eb 100644 --- a/pkgs/development/libraries/vo-amrwbenc/default.nix +++ b/pkgs/development/libraries/vo-amrwbenc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; meta = { - homepage = https://sourceforge.net/projects/opencore-amr/; + homepage = "https://sourceforge.net/projects/opencore-amr/"; description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.Esteth ]; diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index 2b0a807bfa75f..7ac5a4370107b 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation { inherit version; src = fetchgit { - url = https://pagure.io/volume_key.git; + url = "https://pagure.io/volume_key.git"; rev = "volume_key-${version}"; sha256 = "1sqdbcih1c39bjiv4mm1m7acc3lfh2i2hf2r9i7rk8adfzq8awma"; }; @@ -40,7 +40,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A library for manipulating storage volume encryption keys and storing them separately from volumes to handle forgotten passphrases, and the associated command-line tool"; - homepage = https://pagure.io/volume_key/; + homepage = "https://pagure.io/volume_key/"; license = licenses.gpl2; maintainers = with maintainers; []; platforms = platforms.linux; diff --git a/pkgs/development/libraries/vrb/default.nix b/pkgs/development/libraries/vrb/default.nix index efd60fe66fb50..a85e27d42b7cf 100644 --- a/pkgs/development/libraries/vrb/default.nix +++ b/pkgs/development/libraries/vrb/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A virtual ring buffer library written in C"; license = licenses.lgpl21; - homepage = http://vrb.sourceforge.net/; + homepage = "http://vrb.sourceforge.net/"; maintainers = [ maintainers.bobvanderlinden ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix index 688dc8d451ee6..b45c83ab1ae82 100644 --- a/pkgs/development/libraries/vrpn/default.nix +++ b/pkgs/development/libraries/vrpn/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { set of physical devices (tracker, etc.) used in a virtual-reality (VR) system. ''; - homepage = https://github.com/vrpn/vrpn; + homepage = "https://github.com/vrpn/vrpn"; license = licenses.boost; # see https://github.com/vrpn/vrpn/wiki/License platforms = platforms.linux; maintainers = with maintainers; [ ludo ]; diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix index fd0e90941b89b..e54a4a40af183 100644 --- a/pkgs/development/libraries/vsqlite/default.nix +++ b/pkgs/development/libraries/vsqlite/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://vsqlite.virtuosic-bytes.com/; + homepage = "http://vsqlite.virtuosic-bytes.com/"; description = "C++ wrapper library for sqlite."; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/vte/2.90.nix b/pkgs/development/libraries/vte/2.90.nix index e091f6a3917b4..59d0acada137e 100644 --- a/pkgs/development/libraries/vte/2.90.nix +++ b/pkgs/development/libraries/vte/2.90.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.gnome.org/; + homepage = "https://www.gnome.org/"; description = "A library implementing a terminal emulator widget for GTK"; longDescription = '' VTE is a library (libvte) implementing a terminal emulator widget for diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 8bd8d2e990b7b..811921df3e7cf 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.60.1"; + version = "0.60.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1i7h1jvsg115l5djn29n06xsqvygpfagczxy0i9f39zq6dr809ay"; + sha256 = "19ccbw0yca78h5qcnm8claj4fg1pj68nj1fsjqqfpzhj7w72i81m"; }; passthru = { @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.gnome.org/; + homepage = "https://www.gnome.org/"; description = "A library implementing a terminal emulator widget for GTK"; longDescription = '' VTE is a library (libvte) implementing a terminal emulator widget for @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { the system's terminfo database. ''; license = licenses.lgpl2; - maintainers = with maintainers; [ astsmtl antono lethalman ] ++ gnome3.maintainers; + maintainers = with maintainers; [ astsmtl antono lethalman ] ++ teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index f79f79a62597a..1cc706f4eb73e 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -52,12 +52,12 @@ stdenv.mkDerivation rec { # At least, we use -fPIC for other packages to be able to use this in shared # objects. cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" ] - ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ] + ++ optional (qtLib != null) [ "-DVTK_Group_Qt:BOOL=ON" ] ++ optional stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] ++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-7.0|' ./Parallel/Core/CMakeLists.txt + sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c ''; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source libraries for 3D computer graphics, image processing and visualization"; - homepage = http://www.vtk.org/; + homepage = "https://www.vtk.org/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index ee6e58fab287a..3392694090401 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Vulkan Header files and API registry"; - homepage = https://www.lunarg.com; + homepage = "https://www.lunarg.com"; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index b1f2663e7f8f8..e650a28c61e59 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "12n4mxc6db89258k8i47ql1zna7k94lkwv7lpxg39nm8ypa1ywrv"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ]; + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ python3 xlibsWrapper libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; preConfigure = '' @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LunarG Vulkan loader"; - homepage = https://www.lunarg.com; + homepage = "https://www.lunarg.com"; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 17d11d4fb7493..58622cb98cb7b 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "C++ Libraries for Computer Vision Research and Implementation"; - homepage = http://vxl.sourceforge.net/; + homepage = "http://vxl.sourceforge.net/"; license = "VXL License"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 808836af1def9..329de97d39e17 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Hybrid audio compression format"; - homepage = http://www.wavpack.com/; + homepage = "http://www.wavpack.com/"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index ef88e690067b7..e3b2941e8eee8 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { and other interactions that must go through the compositor (but not rendering). ''; - homepage = https://wayland.freedesktop.org/; + homepage = "https://wayland.freedesktop.org/"; license = lib.licenses.mit; # Expat version platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ primeos codyopel ]; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 41495b1c2e50d..66d5d50c9d817 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { protocol either in Wayland core, or some other protocol in wayland-protocols. ''; - homepage = https://gitlab.freedesktop.org/wayland/wayland-protocols; + homepage = "https://gitlab.freedesktop.org/wayland/wayland-protocols"; license = lib.licenses.mit; # Expat version platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ primeos ]; diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 4fd94a29f9cd7..5b02ce826addc 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -1,22 +1,44 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, pugixml, wayland, libGL }: +{ stdenv +, fetchFromGitHub +, cmake +, pkgconfig +, pugixml +, wayland +, libGL +, libffi +, buildPackages +, docSupport ? true +, doxygen ? null +}: +assert docSupport -> doxygen != null; + +with stdenv.lib; stdenv.mkDerivation rec { pname = "waylandpp"; - version = "0.2.5"; + version = "0.2.7"; src = fetchFromGitHub { owner = "NilsBrause"; repo = pname; rev = version; - sha256 = "16h57hzd688664qcyznzhjp3hxipdkzgv46x82yhkww24av8b55n"; + sha256 = "1r4m0xhvwpcqxrqvp3hz1bzlkxqj2jiymd5r6hj8xjzz536hyprz"; }; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ pugixml wayland libGL ]; + cmakeFlags = [ + "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++" + ]; + + nativeBuildInputs = [ cmake pkgconfig ] ++ optional docSupport doxygen; + buildInputs = [ pugixml wayland libGL libffi ]; + + outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ]; meta = with stdenv.lib; { description = "Wayland C++ binding"; - homepage = https://github.com/NilsBrause/waylandpp/; + homepage = "https://github.com/NilsBrause/waylandpp/"; license = with licenses; [ bsd2 hpnd ]; maintainers = with maintainers; [ minijackson ]; }; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index ee83adac09870..4d968cc325ece 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -50,7 +50,6 @@ , libseccomp , xdg-dbus-proxy , substituteAll -, gnome3 , glib }: @@ -62,13 +61,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.28.0"; + version = "2.28.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "12qfs9w93c5kiyi14ynm4rf4ad3c213dvzmdrc9c3ab2iwbks7rn"; + sha256 = "udI1Jc/Y0iw3tdlkqf6ajOdYMEKi+NOSLnHmu8aMML0="; }; patches = optionals stdenv.isLinux [ @@ -176,10 +175,9 @@ stdenv.mkDerivation rec { meta = { description = "Web content rendering engine, GTK port"; - homepage = https://webkitgtk.org/; + homepage = "https://webkitgtk.org/"; license = licenses.bsd2; platforms = platforms.linux; - hydraPlatforms = []; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index b22d339617c2f..91d93352da1b1 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing; + homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix index 84fbda503eac0..6a7b091b5367d 100644 --- a/pkgs/development/libraries/websocket++/default.nix +++ b/pkgs/development/libraries/websocket++/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = https://www.zaphoyd.com/websocketpp/; + homepage = "https://www.zaphoyd.com/websocketpp/"; description = "C++/Boost Asio based websocket client/server library"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 3b0a447f7376e..ea63a73fc9253 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { WildMIDI is a simple software midi player which has a core softsynth library that can be use with other applications. ''; - homepage = http://wildmidi.sourceforge.net/; + homepage = "http://wildmidi.sourceforge.net/"; # The library is LGPLv3, the wildmidi executable is GPLv3 license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index 9025abcb3fe9f..9a7cee6623eed 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://wiredtiger.com/; + homepage = "http://wiredtiger.com/"; description = ""; license = licenses.gpl2; platforms = intersectLists platforms.unix platforms.x86_64; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 438b40d914047..2815520f5179e 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "1gd613k4qh9yhl0d8yh0flqn2cvm9qb5pp2p0khk31b1fh1p4vin"; + sha256 = "1bgkxqgxwa5dvi7fkna64wpcs552f3yxvs6fh6d32v7vg88vpfx9"; }; configureFlags = [ "--enable-all" ]; diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index 2791c97f5ae6a..d66a628dac79c 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { libraries = [ xorg.libXpm xorg.libXt xorg.libX11 xorg.libICE xorg.libSM stdenv.cc.cc ]; meta = { - homepage = http://java.sun.com/products/sjwtoolkit/download.html; + homepage = "http://java.sun.com/products/sjwtoolkit/download.html"; description = "Sun Java Wireless Toolkit 2.5.2_01 for CLDC"; license = stdenv.lib.licenses.unfree; }; diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index f5e344863507f..602f3e670dde3 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { wxSVG is C++ library to create, manipulate and render Scalable Vector Graphics (SVG) files with the wxWidgets toolkit. ''; - homepage = http://wxsvg.sourceforge.net/; + homepage = "http://wxsvg.sourceforge.net/"; license = with licenses; gpl2; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; linux; diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index a528166f68a0d..9bea7f5e848bd 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -1,26 +1,29 @@ -{ stdenv, fetchFromGitHub, wxGTK, sqlite -, darwin }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, wxGTK +, sqlite +, darwin +}: stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "3.3.1"; + version = "4.5.1"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - sha1 = "bb8p58g88nkdcsj3h4acx7h925n2cy9g"; + sha256 = "0090f7r3blks18vifkna4l890fwaya58ajh9qblbw9065zj5hrm3"; }; - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' - cp build28/Info.plist.in build28/wxmac.icns build/ - ''; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ wxGTK sqlite ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ]; meta = with stdenv.lib; { - homepage = https://utelle.github.io/wxsqlite3/ ; + homepage = "https://utelle.github.io/wxsqlite3/"; description = "A C++ wrapper around the public domain SQLite 3.x for wxWidgets"; platforms = platforms.unix; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix index 9ca15d4977b91..18ecea4cbe18f 100644 --- a/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/pkgs/development/libraries/wxsqliteplus/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "guanlisheng"; repo = "wxsqliteplus"; rev = "v${version}"; - sha1 = "yr9ysviv4hbrxn900z1wz8j32frimvx1"; + sha256 = "0mgfq813pli56mar7pdxlhwjf5k10j196rs3jd0nc8b6dkzkzlnf"; }; buildInputs = [ wxGTK wxsqlite3 sqlite ]; @@ -24,12 +24,11 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin - cp wxsqliteplus $out/bin/ + install -D wxsqliteplus $out/bin/wxsqliteplus ''; meta = with stdenv.lib; { - homepage = http://guanlisheng.com/; + homepage = "https://github.com/guanlisheng/wxsqliteplus"; description = "A simple SQLite database browser built with wxWidgets"; platforms = platforms.unix; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 73dac47307a97..98cf0d58479b0 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = { platforms = platforms.linux; license = licenses.wxWindows; - homepage = https://www.wxwidgets.org/; + homepage = "https://www.wxwidgets.org/"; description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; }; diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 02367e18a95bd..3812c81a51974 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { meta = { platforms = with platforms; darwin ++ linux; license = licenses.wxWindows; - homepage = https://www.wxwidgets.org/; + homepage = "https://www.wxwidgets.org/"; description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; badPlatforms = [ "x86_64-darwin" ]; diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 3bbfb1392794f..8de7f99fe5fd9 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { meta = { platforms = with platforms; darwin ++ linux; license = licenses.wxWindows; - homepage = https://www.wxwidgets.org/; + homepage = "https://www.wxwidgets.org/"; description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; badPlatforms = [ "x86_64-darwin" ]; diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix index 5236996199d6b..1b4c670245153 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { platforms = platforms.darwin; license = licenses.wxWindows; maintainers = [ maintainers.lnl7 ]; - homepage = https://www.wxwidgets.org/; + homepage = "https://www.wxwidgets.org/"; description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; }; diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix index 0984472e860b2..99f86974cdb44 100644 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { meta = { platforms = with platforms; darwin ++ linux; license = licenses.wxWindows; - homepage = https://www.wxwidgets.org/; + homepage = "https://www.wxwidgets.org/"; description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; badPlatforms = [ "x86_64-darwin" ]; diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 5c4c64d0e1cfe..49797b5dd7592 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for encoding H264/AVC video streams"; - homepage = http://www.videolan.org/developers/x264.html; + homepage = "http://www.videolan.org/developers/x264.html"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ spwhitt tadeokondrak ]; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index dbf1a098f1f72..cfa19e5419f89 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for encoding h.265/HEVC video streams"; - homepage = http://x265.org; + homepage = "http://x265.org"; license = licenses.gpl2; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix index 92a932a01a4aa..30ab7f4496d80 100644 --- a/pkgs/development/libraries/xalanc/default.nix +++ b/pkgs/development/libraries/xalanc/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { buildInputs = [ xercesc getopt ]; meta = { - homepage = http://xalan.apache.org/; + homepage = "http://xalan.apache.org/"; description = "A XSLT processor for transforming XML documents"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index 6c8eda6358b22..a496e3886d83a 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Indexer and CGI search front-end built on Xapian library"; - homepage = https://xapian.org/; + homepage = "https://xapian.org/"; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/development/libraries/xavs/default.nix index a5536f70a902b..18b10376315f6 100644 --- a/pkgs/development/libraries/xavs/default.nix +++ b/pkgs/development/libraries/xavs/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "AVS encoder and decoder"; - homepage = http://xavs.sourceforge.net/; + homepage = "http://xavs.sourceforge.net/"; license = licenses.lgpl2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ codyopel ]; diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix index 3dd2cb5b874cb..ae7ceb18c0ab0 100644 --- a/pkgs/development/libraries/xbase/default.nix +++ b/pkgs/development/libraries/xbase/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "xbase-3.1.2"; src = fetchurl { - url = mirror://sourceforge/xdb/xbase64-3.1.2.tar.gz; + url = "mirror://sourceforge/xdb/xbase64-3.1.2.tar.gz"; sha256 = "17287kz1nmmm64y7zp9nhhl7slzlba09h6cc83w4mvsqwd9w882r"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation { ]; meta = with stdenv.lib; { - homepage = http://linux.techass.com/projects/xdb/; + homepage = "http://linux.techass.com/projects/xdb/"; description = "C++ class library formerly known as XDB"; platforms = platforms.linux; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 4764c1bdb93cd..5457487edcc7b 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation { version = "2017-04-05"; src = fetchgit { - url = http://anongit.freedesktop.org/git/xcb/util-cursor.git; + url = "http://anongit.freedesktop.org/git/xcb/util-cursor.git"; rev = "f03cc278c6cce0cf721adf9c3764d3c5fba63392"; sha256 = "127zfmihd8nqlj8jjaja06xb84xdgl263w0av1xnprx05mkbkcyc"; }; meta = with stdenv.lib; { description = "XCB cursor library (libxcursor port)"; - homepage = https://cgit.freedesktop.org/xcb/util-cursor; + homepage = "https://cgit.freedesktop.org/xcb/util-cursor"; license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix index 704884c23f3e9..3873fe05e6bb0 100644 --- a/pkgs/development/libraries/xercesc/default.nix +++ b/pkgs/development/libraries/xercesc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://xerces.apache.org/xerces-c/; + homepage = "https://xerces.apache.org/xerces-c/"; description = "Validating XML parser written in a portable subset of C++"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index f4687bd46f85b..d9d660062a25c 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; - homepage = https://github.com/dmlc/xgboost; + homepage = "https://github.com/dmlc/xgboost"; license = licenses.asl20; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index adcb2e74b0bbd..aa9600085c016 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.xine-project.org/; + homepage = "http://www.xine-project.org/"; description = "A high-performance, portable and reusable multimedia playback engine"; platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix index 3d1b4ea74db8a..ee3942c360b7c 100644 --- a/pkgs/development/libraries/xlslib/default.nix +++ b/pkgs/development/libraries/xlslib/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++/C library to construct Excel .xls files in code"; - homepage = https://sourceforge.net/projects/xlslib/; + homepage = "https://sourceforge.net/projects/xlslib/"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix index 74846c8306dd7..3a784a2e38b25 100644 --- a/pkgs/development/libraries/xml-security-c/default.nix +++ b/pkgs/development/libraries/xml-security-c/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ xalanc xercesc openssl ]; meta = { - homepage = http://santuario.apache.org/; + homepage = "http://santuario.apache.org/"; description = "C++ Implementation of W3C security standards for XML"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix index 8a0017109bbfa..d9786d26a71f4 100644 --- a/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/pkgs/development/libraries/xmlrpc-c/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A lightweight RPC library based on XML and HTTP"; - homepage = http://xmlrpc-c.sourceforge.net/; + homepage = "http://xmlrpc-c.sourceforge.net/"; # <xmlrpc-c>/doc/COPYING also lists "Expat license", # "ABYSS Web Server License" and "Python 1.5.2 License" license = licenses.bsd3; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index a8c751330b7c5..1a18dfce85d55 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.aleksey.com/xmlsec; - downloadPage = https://www.aleksey.com/xmlsec/download.html; + homepage = "http://www.aleksey.com/xmlsec"; + downloadPage = "https://www.aleksey.com/xmlsec/download.html"; description = "XML Security Library in C based on libxml2"; license = stdenv.lib.licenses.mit; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix index bd87d306b9659..7541ee4270454 100644 --- a/pkgs/development/libraries/xsd/default.nix +++ b/pkgs/development/libraries/xsd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.codesynthesis.com/products/xsd; + homepage = "http://www.codesynthesis.com/products/xsd"; description = "An open-source, cross-platform W3C XML Schema to C++ data binding compiler"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index 5ec96157a79c0..ab68693ea5eff 100644 --- a/pkgs/development/libraries/xvidcore/default.nix +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "MPEG-4 video codec for PC"; - homepage = https://www.xvid.com/; + homepage = "https://www.xvid.com/"; license = licenses.gpl2; maintainers = with maintainers; [ codyopel lovek323 ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/development/libraries/xylib/default.nix index 155e46c8f8c6a..70fee9b9eff33 100644 --- a/pkgs/development/libraries/xylib/default.nix +++ b/pkgs/development/libraries/xylib/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods"; license = licenses.lgpl21; - homepage = http://xylib.sourceforge.net/; + homepage = "http://xylib.sourceforge.net/"; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index 947b08e7bc58c..62fe652724f8b 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "yajl-2.1.0"; src = fetchurl { - url = https://github.com/lloyd/yajl/tarball/2.1.0; + url = "https://github.com/lloyd/yajl/tarball/2.1.0"; name = "${name}.tar.gz"; sha256 = "0f6yrjc05aa26wfi7lqn2gslm19m6rm81b30ksllpkappvh162ji"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { YAJL is a small event-driven (SAX-style) JSON parser written in ANSI C, and a small validating JSON generator. ''; - homepage = http://lloyd.github.com/yajl/; + homepage = "http://lloyd.github.com/yajl/"; license = stdenv.lib.licenses.isc; platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ maggesi ]; diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix index d3df30e03e18a..9e6cc37e661c7 100644 --- a/pkgs/development/libraries/yojimbo/default.nix +++ b/pkgs/development/libraries/yojimbo/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { It's designed around the networking requirements of competitive multiplayer games like first person shooters. As such it provides a time critical networking layer on top of UDP, with a client/server architecture supporting up to 64 players per-dedicated server instance. ''; - homepage = https://github.com/networkprotocol/yojimbo; + homepage = "https://github.com/networkprotocol/yojimbo"; license = licenses.bsd3; platforms = platforms.x86_64; maintainers = with maintainers; [ paddygord ]; diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix index e6a3fa9fbe143..60d3defcb1ffe 100644 --- a/pkgs/development/libraries/yubico-pam/default.nix +++ b/pkgs/development/libraries/yubico-pam/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Yubico PAM module"; - homepage = https://developers.yubico.com/yubico-pam; + homepage = "https://developers.yubico.com/yubico-pam"; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/libraries/zeroc-ice/3.6.nix b/pkgs/development/libraries/zeroc-ice/3.6.nix index dd983a34f883e..7f6c7323fff3e 100644 --- a/pkgs/development/libraries/zeroc-ice/3.6.nix +++ b/pkgs/development/libraries/zeroc-ice/3.6.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.zeroc.com/ice.html; + homepage = "http://www.zeroc.com/ice.html"; description = "The internet communications engine"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 3a5b1690f2d02..9c9c5a6b00112 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.zeroc.com/ice.html; + homepage = "http://www.zeroc.com/ice.html"; description = "The internet communications engine"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/zeromq/3.x.nix b/pkgs/development/libraries/zeromq/3.x.nix index 2fcf8bd91791d..29981f358a57c 100644 --- a/pkgs/development/libraries/zeromq/3.x.nix +++ b/pkgs/development/libraries/zeromq/3.x.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { branch = "3"; - homepage = http://www.zeromq.org; + homepage = "http://www.zeromq.org"; description = "The Intelligent Transport Layer"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 1a8f07a3ae0e9..8302ebbd1e80f 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { branch = "4"; - homepage = http://www.zeromq.org; + homepage = "http://www.zeromq.org"; description = "The Intelligent Transport Layer"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix index 34a03e56a102f..7f5168080fa35 100644 --- a/pkgs/development/libraries/zimlib/default.nix +++ b/pkgs/development/libraries/zimlib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for reading and writing ZIM files"; - homepage = https://www.openzim.org/wiki/Zimlib; + homepage = "https://www.openzim.org/wiki/Zimlib"; license = licenses.gpl2; maintainers = with maintainers; [ robbinch ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 71da686ce48f4..c4a4c497cedfd 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation (rec { }; meta = with stdenv.lib; { - homepage = https://zlib.net; + homepage = "https://zlib.net"; description = "Lossless data-compression library"; license = licenses.zlib; platforms = platforms.all; diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index 5c60157574207..4788613a3dcf3 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description= "Reliable, high-performance, thread safe, flexible, clear-model, pure C logging library"; - homepage = http://hardysimpson.github.com/zlog; + homepage = "http://hardysimpson.github.com/zlog"; license = licenses.lgpl21; platforms = platforms.linux; # cannot test on something else maintainers = [ maintainers.matthiasbeyer ]; diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix index 127ea4f7162bd..b957253eebec3 100644 --- a/pkgs/development/libraries/zookeeper_mt/default.nix +++ b/pkgs/development/libraries/zookeeper_mt/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ zookeeper bash ]; meta = with stdenv.lib; { - homepage = http://zookeeper.apache.org; + homepage = "http://zookeeper.apache.org"; description = "Apache Zookeeper"; license = licenses.asl20; maintainers = [ maintainers.boothead ]; diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix index 78983f0954394..7a524e72318fe 100644 --- a/pkgs/development/libraries/zxcvbn-c/default.nix +++ b/pkgs/development/libraries/zxcvbn-c/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/tsyrogit/zxcvbn-c; + homepage = "https://github.com/tsyrogit/zxcvbn-c"; description = "A C/C++ implementation of the zxcvbn password strength estimation"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 74bfeb09c0d35..8078a3c360c31 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { license = with licenses; [ lgpl2Plus mpl11 ]; - homepage = http://zziplib.sourceforge.net/; + homepage = "http://zziplib.sourceforge.net/"; maintainers = [ ]; platforms = python2.meta.platforms; diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index 67a688342b2d0..96ceb76f6f22d 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -43,7 +43,7 @@ let chmod a+x "$launch_script" echo "#! ${stdenv.shell}" >> "$launch_script" echo "source '$config_script'" >> "$launch_script" - echo "test -n \"\$NIX_LISP_LD_LIBRARY_PATH\" export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script" + echo "test -n \"\$NIX_LISP_LD_LIBRARY_PATH\" && export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script" echo '"${clwrapper}/bin/common-lisp.sh" "$@"' >> "$launch_script" ''; moveAsdFiles = '' diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index edc09421baf75..303689dce4a58 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -15,7 +15,7 @@ alt-getopt = buildLuarocksPackage { version = "0.8.0-1"; src = fetchurl { - url = https://luarocks.org/alt-getopt-0.8.0-1.src.rock; + url = "https://luarocks.org/alt-getopt-0.8.0-1.src.rock"; sha256 = "1mi97dqb97sf47vb6wrk12yf1yxcaz0asr9gbgwyngr5n1adh5i3"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -35,7 +35,7 @@ ansicolors = buildLuarocksPackage { version = "1.0.2-3"; src = fetchurl { - url = https://luarocks.org/ansicolors-1.0.2-3.src.rock; + url = "https://luarocks.org/ansicolors-1.0.2-3.src.rock"; sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz"; }; disabled = (luaOlder "5.1"); @@ -54,7 +54,7 @@ argparse = buildLuarocksPackage { version = "0.6.0-1"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/argparse-0.6.0-1.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/argparse-0.6.0-1.src.rock"; sha256 = "10ic5wppyghd1lmgwgl0lb40pv8z9fi9i87080axxg8wsr19y0p4"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -73,12 +73,12 @@ basexx = buildLuarocksPackage { version = "0.4.1-1"; knownRockspec = (fetchurl { - url = https://luarocks.org/basexx-0.4.1-1.rockspec; + url = "https://luarocks.org/basexx-0.4.1-1.rockspec"; sha256 = "0kmydxm2wywl18cgj303apsx7hnfd68a9hx9yhq10fj7yfcxzv5f"; }).outPath; src = fetchurl { - url = https://github.com/aiq/basexx/archive/v0.4.1.tar.gz; + url = "https://github.com/aiq/basexx/archive/v0.4.1.tar.gz"; sha256 = "1rnz6xixxqwy0q6y2hi14rfid4w47h69gfi0rnlq24fz8q2b0qpz"; }; @@ -98,7 +98,7 @@ binaryheap = buildLuarocksPackage { version = "0.4-1"; src = fetchurl { - url = https://luarocks.org/binaryheap-0.4-1.src.rock; + url = "https://luarocks.org/binaryheap-0.4-1.src.rock"; sha256 = "11rd8r3bpinfla2965jgjdv1hilqdc1q6g1qla5978d7vzg19kpc"; }; disabled = (luaOlder "5.1"); @@ -118,7 +118,7 @@ bit32 = buildLuarocksPackage { version = "5.3.0-1"; src = fetchurl { - url = https://luarocks.org/bit32-5.3.0-1.src.rock; + url = "https://luarocks.org/bit32-5.3.0-1.src.rock"; sha256 = "19i7kc2pfg9hc6qjq4kka43q6qk71bkl2rzvrjaks6283q6wfyzy"; }; disabled = (luaOlder "5.1"); @@ -138,12 +138,12 @@ busted = buildLuarocksPackage { version = "2.0.rc13-0"; knownRockspec = (fetchurl { - url = https://luarocks.org/busted-2.0.rc13-0.rockspec; + url = "https://luarocks.org/busted-2.0.rc13-0.rockspec"; sha256 = "0hrvhg1324q5ra6cpjh1y3by6lrzs0ljah4jl48l8xlgw1z9z1q5"; }).outPath; src = fetchurl { - url = https://github.com/Olivine-Labs/busted/archive/v2.0.rc13-0.tar.gz; + url = "https://github.com/Olivine-Labs/busted/archive/v2.0.rc13-0.tar.gz"; sha256 = "0m72bldn1r6j94ahcfmpaq1mmysrshf9qi9fjas7hpal0jp8ivvl"; }; @@ -163,7 +163,7 @@ cassowary = buildLuarocksPackage { version = "2.2-1"; src = fetchurl { - url = mirror://luarocks/cassowary-2.2-1.src.rock; + url = "mirror://luarocks/cassowary-2.2-1.src.rock"; sha256 = "0laghzk5jbap5rfd8sasnrdrbda649sfciarba8rhygm0qni1azy"; }; propagatedBuildInputs = [ lua penlight ]; @@ -180,7 +180,7 @@ cjson = buildLuarocksPackage { version = "2.1.0.6-1"; src = fetchurl { - url = https://luarocks.org/lua-cjson-2.1.0.6-1.src.rock; + url = "https://luarocks.org/lua-cjson-2.1.0.6-1.src.rock"; sha256 = "0dqqkn0aygc780kiq2lbydb255r8is7raf7md0gxdjcagp8afps5"; }; disabled = (luaOlder "5.1"); @@ -199,7 +199,7 @@ compat53 = buildLuarocksPackage { version = "0.7-1"; src = fetchurl { - url = https://luarocks.org/compat53-0.7-1.src.rock; + url = "https://luarocks.org/compat53-0.7-1.src.rock"; sha256 = "0kpaxbpgrwjn4jjlb17fn29a09w6lw732d21bi0302kqcaixqpyb"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -219,7 +219,7 @@ cosmo = buildLuarocksPackage { version = "16.06.04-1"; src = fetchurl { - url = mirror://luarocks/cosmo-16.06.04-1.src.rock; + url = "mirror://luarocks/cosmo-16.06.04-1.src.rock"; sha256 = "1adrk74j0x1yzhy0xz9k80hphxdjvm09kpwpbx00sk3kic6db0ww"; }; propagatedBuildInputs = [ lpeg ]; @@ -236,7 +236,7 @@ coxpcall = buildLuarocksPackage { version = "1.17.0-1"; src = fetchurl { - url = https://luarocks.org/coxpcall-1.17.0-1.src.rock; + url = "https://luarocks.org/coxpcall-1.17.0-1.src.rock"; sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi"; }; @@ -253,7 +253,7 @@ cqueues = buildLuarocksPackage { version = "20190731.52-0"; src = fetchurl { - url = https://luarocks.org/cqueues-20190731.52-0.src.rock; + url = "https://luarocks.org/cqueues-20190731.52-0.src.rock"; sha256 = "07rs34amsxf2bc5ccqdad0c63c70737r54316cbd9qh1a2wbvz8s"; }; disabled = (lua.luaversion != "5.2"); @@ -273,7 +273,7 @@ cyrussasl = buildLuarocksPackage { version = "1.1.0-1"; knownRockspec = (fetchurl { - url = https://luarocks.org/cyrussasl-1.1.0-1.rockspec; + url = "https://luarocks.org/cyrussasl-1.1.0-1.rockspec"; sha256 = "0zy9l00l7kr3sq8phdm52jqhlqy35vdv6rdmm8mhjihcbx1fsplc"; }).outPath; @@ -303,7 +303,7 @@ digestif = buildLuarocksPackage { version = "0.2-1"; src = fetchurl { - url = mirror://luarocks/digestif-0.2-1.src.rock; + url = "mirror://luarocks/digestif-0.2-1.src.rock"; sha256 = "03blpj5lxlhmxa4hnj21sz7sc84g96igbc7r97yb2smmlbyq8hxd"; }; disabled = (luaOlder "5.3"); @@ -322,7 +322,7 @@ dkjson = buildLuarocksPackage { version = "2.5-2"; src = fetchurl { - url = https://luarocks.org/dkjson-2.5-2.src.rock; + url = "https://luarocks.org/dkjson-2.5-2.src.rock"; sha256 = "1qy9bzqnb9pf9d48hik4iq8h68aw3270kmax7mmpvvpw7kkyp483"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -341,7 +341,7 @@ fifo = buildLuarocksPackage { version = "0.2-0"; src = fetchurl { - url = https://luarocks.org/fifo-0.2-0.src.rock; + url = "https://luarocks.org/fifo-0.2-0.src.rock"; sha256 = "082c5g1m8brnsqj5gnjs65bm7z50l6b05cfwah14lqaqsr5a5pjk"; }; propagatedBuildInputs = [ lua ]; @@ -359,7 +359,7 @@ http = buildLuarocksPackage { version = "0.3-0"; src = fetchurl { - url = https://luarocks.org/http-0.3-0.src.rock; + url = "https://luarocks.org/http-0.3-0.src.rock"; sha256 = "0vvl687bh3cvjjwbyp9cphqqccm3slv4g7y3h03scp3vpq9q4ccq"; }; disabled = (luaOlder "5.1"); @@ -379,7 +379,7 @@ inspect = buildLuarocksPackage { version = "3.1.1-0"; src = fetchurl { - url = https://luarocks.org/inspect-3.1.1-0.src.rock; + url = "https://luarocks.org/inspect-3.1.1-0.src.rock"; sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za"; }; disabled = (luaOlder "5.1"); @@ -398,12 +398,12 @@ ldoc = buildLuarocksPackage { version = "1.4.6-2"; knownRockspec = (fetchurl { - url = https://luarocks.org/ldoc-1.4.6-2.rockspec; + url = "https://luarocks.org/ldoc-1.4.6-2.rockspec"; sha256 = "14yb0qihizby8ja0fa82vx72vk903mv6m7izn39mzfrgb8mha0pm"; }).outPath; src = fetchurl { - url = http://stevedonovan.github.io/files/ldoc-1.4.6.zip; + url = "http://stevedonovan.github.io/files/ldoc-1.4.6.zip"; sha256 = "1fvsmmjwk996ypzizcy565hj82bhj17vdb83ln6ff63mxr3zs1la"; }; @@ -422,7 +422,7 @@ lgi = buildLuarocksPackage { version = "0.9.2-1"; src = fetchurl { - url = https://luarocks.org/lgi-0.9.2-1.src.rock; + url = "https://luarocks.org/lgi-0.9.2-1.src.rock"; sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa"; }; disabled = (luaOlder "5.1"); @@ -441,12 +441,12 @@ linenoise = buildLuarocksPackage { version = "0.9-1"; knownRockspec = (fetchurl { - url = mirror://luarocks/linenoise-0.9-1.rockspec; + url = "mirror://luarocks/linenoise-0.9-1.rockspec"; sha256 = "0wic8g0d066pj9k51farsvcdbnhry2hphvng68w9k4lh0zh45yg4"; }).outPath; src = fetchurl { - url = https://github.com/hoelzro/lua-linenoise/archive/0.9.tar.gz; + url = "https://github.com/hoelzro/lua-linenoise/archive/0.9.tar.gz"; sha256 = "177h6gbq89arwiwxah9943i8hl5gvd9wivnd1nhmdl7d8x0dn76c"; }; @@ -466,7 +466,7 @@ ljsyscall = buildLuarocksPackage { version = "0.12-1"; src = fetchurl { - url = https://luarocks.org/ljsyscall-0.12-1.src.rock; + url = "https://luarocks.org/ljsyscall-0.12-1.src.rock"; sha256 = "12gs81lnzpxi5d409lbrvjfflld5l2xsdkfhkz93xg7v65sfhh2j"; }; disabled = (lua.luaversion != "5.1"); @@ -486,7 +486,7 @@ lpeg = buildLuarocksPackage { version = "1.0.2-1"; src = fetchurl { - url = https://luarocks.org/lpeg-1.0.2-1.src.rock; + url = "https://luarocks.org/lpeg-1.0.2-1.src.rock"; sha256 = "1g5zmfh0x7drc6mg2n0vvlga2hdc08cyp3hnb22mh1kzi63xdl70"; }; disabled = (luaOlder "5.1"); @@ -506,7 +506,7 @@ lpeg_patterns = buildLuarocksPackage { version = "0.5-0"; src = fetchurl { - url = https://luarocks.org/lpeg_patterns-0.5-0.src.rock; + url = "https://luarocks.org/lpeg_patterns-0.5-0.src.rock"; sha256 = "0mlw4nayrsdxrh98i26avz5i4170a9brciybw88kks496ra36v8f"; }; propagatedBuildInputs = [ lua lpeg ]; @@ -524,7 +524,7 @@ lpeglabel = buildLuarocksPackage { version = "1.5.0-1"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpeglabel-1.5.0-1.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpeglabel-1.5.0-1.src.rock"; sha256 = "068mwvwwn5n69pdm04qnk354391w9mk34jsczxql0xi5qgmz6w8j"; }; disabled = (luaOlder "5.1"); @@ -543,7 +543,7 @@ lpty = buildLuarocksPackage { version = "1.2.2-1"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpty-1.2.2-1.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpty-1.2.2-1.src.rock"; sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm"; }; disabled = (luaOlder "5.1"); @@ -562,7 +562,7 @@ lrexlib-gnu = buildLuarocksPackage { version = "2.9.0-1"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-gnu-2.9.0-1.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-gnu-2.9.0-1.src.rock"; sha256 = "036rda4rji1pbnbxk1nzjy5zmigdsiacqbzrbvciwq3lrxa2j5s2"; }; disabled = (luaOlder "5.1"); @@ -581,7 +581,7 @@ lrexlib-pcre = buildLuarocksPackage { version = "2.9.0-1"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-pcre-2.9.0-1.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-pcre-2.9.0-1.src.rock"; sha256 = "1nqai27lbd85mcjf5cb05dbdfg460vmp8cr0lmb8dd63ivk8cbvx"; }; disabled = (luaOlder "5.1"); @@ -601,7 +601,7 @@ lrexlib-posix = buildLuarocksPackage { version = "2.9.0-1"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-posix-2.9.0-1.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-posix-2.9.0-1.src.rock"; sha256 = "0ifpybf4m94g1nk70l0f5m45gph0rbp5wrxrl1hnw8ibv3mc1b1r"; }; disabled = (luaOlder "5.1"); @@ -620,7 +620,7 @@ ltermbox = buildLuarocksPackage { version = "0.2-1"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/ltermbox-0.2-1.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/ltermbox-0.2-1.src.rock"; sha256 = "08jqlmmskbi1ml1i34dlmg6hxcs60nlm32dahpxhcrgjnfihmyn8"; }; disabled = (luaOlder "5.1"); @@ -639,7 +639,7 @@ lua-cmsgpack = buildLuarocksPackage { version = "0.4.0-0"; knownRockspec = (fetchurl { - url = https://luarocks.org/lua-cmsgpack-0.4.0-0.rockspec; + url = "https://luarocks.org/lua-cmsgpack-0.4.0-0.rockspec"; sha256 = "10cvr6knx3qvjcw1q9v05f2qy607mai7lbq321nx682aa0n1fzin"; }).outPath; @@ -668,7 +668,7 @@ lua-iconv = buildLuarocksPackage { version = "7-3"; src = fetchurl { - url = https://luarocks.org/lua-iconv-7-3.src.rock; + url = "https://luarocks.org/lua-iconv-7-3.src.rock"; sha256 = "03xibhcqwihyjhxnzv367q4bfmzmffxl49lmjsq77g0prw8v0q83"; }; disabled = (luaOlder "5.1"); @@ -687,7 +687,7 @@ lua-lsp = buildLuarocksPackage { version = "scm-2"; knownRockspec = (fetchurl { - url = http://luarocks.org/dev/lua-lsp-scm-2.rockspec; + url = "http://luarocks.org/dev/lua-lsp-scm-2.rockspec"; sha256 = "0qk3i6j0km4d1fs61fxhkmnbxmgpq24nygr8wknl6hbj2kya25rb"; }).outPath; @@ -716,7 +716,7 @@ lua-messagepack = buildLuarocksPackage { version = "0.5.1-2"; src = fetchurl { - url = https://luarocks.org/lua-messagepack-0.5.1-2.src.rock; + url = "https://luarocks.org/lua-messagepack-0.5.1-2.src.rock"; sha256 = "0bsdzdd24p9z3j4z1avw7qaqx87baa1pm58v275pw4h6n72z492g"; }; disabled = (luaOlder "5.1"); @@ -735,12 +735,12 @@ lua-term = buildLuarocksPackage { version = "0.7-1"; knownRockspec = (fetchurl { - url = https://luarocks.org/lua-term-0.7-1.rockspec; + url = "https://luarocks.org/lua-term-0.7-1.rockspec"; sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2"; }).outPath; src = fetchurl { - url = https://github.com/hoelzro/lua-term/archive/0.07.tar.gz; + url = "https://github.com/hoelzro/lua-term/archive/0.07.tar.gz"; sha256 = "0c3zc0cl3a5pbdn056vnlan16g0wimv0p9bq52h7w507f72x18f1"; }; @@ -758,7 +758,7 @@ lua-toml = buildLuarocksPackage { version = "2.0-1"; src = fetchurl { - url = https://luarocks.org/lua-toml-2.0-1.src.rock; + url = "https://luarocks.org/lua-toml-2.0-1.src.rock"; sha256 = "0lyqlnydqbplq82brw9ipqy9gijin6hj1wc46plz994pg4i2c74m"; }; disabled = (luaOlder "5.1"); @@ -777,7 +777,7 @@ lua-zlib = buildLuarocksPackage { version = "1.2-0"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-zlib-1.2-0.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-zlib-1.2-0.src.rock"; sha256 = "0qa0vnx45nxdj6fqag6fr627zsnd2bmrr9bdbm8jv6lcnyi6nhs2"; }; disabled = (luaOlder "5.1"); @@ -797,7 +797,7 @@ lua_cliargs = buildLuarocksPackage { version = "3.0-2"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua_cliargs-3.0-2.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua_cliargs-3.0-2.src.rock"; sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w"; }; disabled = (luaOlder "5.1"); @@ -816,7 +816,7 @@ luabitop = buildLuarocksPackage { version = "1.0.2-3"; knownRockspec = (fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luabitop-1.0.2-3.rockspec; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luabitop-1.0.2-3.rockspec"; sha256 = "07y2h11hbxmby7kyhy3mda64w83p4a6p7y7rzrjqgc0r56yjxhcc"; }).outPath; @@ -845,7 +845,7 @@ luacheck = buildLuarocksPackage { version = "0.23.0-1"; src = fetchurl { - url = https://luarocks.org/luacheck-0.23.0-1.src.rock; + url = "https://luarocks.org/luacheck-0.23.0-1.src.rock"; sha256 = "0akj61c7k1na2mggsckvfn9a3ljfp4agnmr9gp3mac4vin99a1cl"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -864,7 +864,7 @@ luacov = buildLuarocksPackage { version = "0.13.0-1"; src = fetchurl { - url = mirror://luarocks/luacov-0.13.0-1.src.rock; + url = "mirror://luarocks/luacov-0.13.0-1.src.rock"; sha256 = "16am0adzr4y64n94f64d4yrz65in8rwa8mmjz1p0k8afm5p5759i"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -883,7 +883,7 @@ luadbi = buildLuarocksPackage { version = "0.7.2-1"; src = fetchurl { - url = https://luarocks.org/luadbi-0.7.2-1.src.rock; + url = "https://luarocks.org/luadbi-0.7.2-1.src.rock"; sha256 = "0mj9ggyb05l03gs38ds508620mqaw4fkrzz9861n4j0zxbsbmfwy"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -902,7 +902,7 @@ luadbi-mysql = buildLuarocksPackage { version = "0.7.2-1"; src = fetchurl { - url = https://luarocks.org/luadbi-mysql-0.7.2-1.src.rock; + url = "https://luarocks.org/luadbi-mysql-0.7.2-1.src.rock"; sha256 = "1f8i5p66halws8qsa7g09110hwzg7pv29yi22mkqd8sjgjv42iq4"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -921,7 +921,7 @@ luadbi-postgresql = buildLuarocksPackage { version = "0.7.2-1"; src = fetchurl { - url = https://luarocks.org/luadbi-postgresql-0.7.2-1.src.rock; + url = "https://luarocks.org/luadbi-postgresql-0.7.2-1.src.rock"; sha256 = "0nmm1hdzl77wk8p6r6al6mpkh2n332a8r3iqsdi6v4nxamykdh28"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -940,7 +940,7 @@ luadbi-sqlite3 = buildLuarocksPackage { version = "0.7.2-1"; src = fetchurl { - url = https://luarocks.org/luadbi-sqlite3-0.7.2-1.src.rock; + url = "https://luarocks.org/luadbi-sqlite3-0.7.2-1.src.rock"; sha256 = "17wd2djzk5x4l4pv2k3c7b8dcvl46s96kqyk8dp3q6ll8gdl7c65"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -959,7 +959,7 @@ luadoc = buildLuarocksPackage { version = "3.0.1-1"; src = fetchurl { - url = mirror://luarocks/luadoc-3.0.1-1.src.rock; + url = "mirror://luarocks/luadoc-3.0.1-1.src.rock"; sha256 = "112zqjbzkrhx3nvavrxx3vhpv2ix85pznzzbpa8fq4piyv5r781i"; }; propagatedBuildInputs = [ lualogging luafilesystem ]; @@ -975,7 +975,7 @@ luaepnf = buildLuarocksPackage { version = "0.3-1"; src = fetchurl { - url = mirror://luarocks/luaepnf-0.3-1.src.rock; + url = "mirror://luarocks/luaepnf-0.3-1.src.rock"; sha256 = "12z7radxk1dkyjqflr85sghywgc82xdg4mzb9mbwbrrqbnjw8mp5"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -992,7 +992,7 @@ luaevent = buildLuarocksPackage { version = "0.4.6-1"; src = fetchurl { - url = https://luarocks.org/luaevent-0.4.6-1.src.rock; + url = "https://luarocks.org/luaevent-0.4.6-1.src.rock"; sha256 = "0chq09nawiz00lxd6pkdqcb8v426gdifjw6js3ql0lx5vqdkb6dz"; }; disabled = (luaOlder "5.1"); @@ -1011,7 +1011,7 @@ luaexpat = buildLuarocksPackage { version = "1.3.0-1"; src = fetchurl { - url = https://luarocks.org/luaexpat-1.3.0-1.src.rock; + url = "https://luarocks.org/luaexpat-1.3.0-1.src.rock"; sha256 = "15jqz5q12i9zvjyagzwz2lrpzya64mih8v1hxwr0wl2gsjh86y5a"; }; disabled = (luaOlder "5.1"); @@ -1031,7 +1031,7 @@ luaffi = buildLuarocksPackage { version = "scm-1"; src = fetchurl { - url = http://luarocks.org/dev/luaffi-scm-1.src.rock; + url = "http://luarocks.org/dev/luaffi-scm-1.src.rock"; sha256 = "0dia66w8sgzw26bwy36gzyb2hyv7kh9n95lh5dl0158rqa6fsf26"; }; disabled = (luaOlder "5.1"); @@ -1050,7 +1050,7 @@ luafilesystem = buildLuarocksPackage { version = "1.7.0-2"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luafilesystem-1.7.0-2.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luafilesystem-1.7.0-2.src.rock"; sha256 = "0xhmd08zklsgpnpjr9rjipah35fbs8jd4v4va36xd8bpwlvx9rk5"; }; disabled = (luaOlder "5.1"); @@ -1070,7 +1070,7 @@ lualogging = buildLuarocksPackage { version = "1.3.0-1"; src = fetchurl { - url = mirror://luarocks/lualogging-1.3.0-1.src.rock; + url = "mirror://luarocks/lualogging-1.3.0-1.src.rock"; sha256 = "13fm1vlig3zmbfkmlq1vk3xfqhlvv5xf24b0p4k4d08395y858vc"; }; propagatedBuildInputs = [ luasocket ]; @@ -1088,7 +1088,7 @@ luaossl = buildLuarocksPackage { version = "20190731-0"; src = fetchurl { - url = https://luarocks.org/luaossl-20190731-0.src.rock; + url = "https://luarocks.org/luaossl-20190731-0.src.rock"; sha256 = "0gardlh547hah5w4kfsdg05jmxzrxr21macqigcmp5hw1l67jn5m"; }; propagatedBuildInputs = [ lua ]; @@ -1107,7 +1107,7 @@ luaposix = buildLuarocksPackage { version = "34.0.4-1"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luaposix-34.0.4-1.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luaposix-34.0.4-1.src.rock"; sha256 = "0yrm5cn2iyd0zjd4liyj27srphvy0gjrjx572swar6zqr4dwjqp2"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -1125,12 +1125,12 @@ luarepl = buildLuarocksPackage { version = "0.9-1"; knownRockspec = (fetchurl { - url = mirror://luarocks/luarepl-0.9-1.rockspec; + url = "mirror://luarocks/luarepl-0.9-1.rockspec"; sha256 = "1409lanxv4s8kq5rrh46dvld77ip33qzfn3vac3i9zpzbmgb5i8z"; }).outPath; src = fetchurl { - url = https://github.com/hoelzro/lua-repl/archive/0.9.tar.gz; + url = "https://github.com/hoelzro/lua-repl/archive/0.9.tar.gz"; sha256 = "04xka7b84d9mrz3gyf8ywhw08xp65v8jrnzs8ry8k9540aqs721w"; }; @@ -1148,7 +1148,7 @@ luasec = buildLuarocksPackage { version = "0.8-1"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luasec-0.8-1.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luasec-0.8-1.src.rock"; sha256 = "063rgz0zdmaizirsm6jbcfijgkpdcrb8a2fvhvg3y2s8ixbaff13"; }; disabled = (luaOlder "5.1"); @@ -1168,7 +1168,7 @@ luasocket = buildLuarocksPackage { version = "3.0rc1-2"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luasocket-3.0rc1-2.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luasocket-3.0rc1-2.src.rock"; sha256 = "1isin9m40ixpqng6ds47skwa4zxrc6w8blza8gmmq566w6hz50iq"; }; disabled = (luaOlder "5.1"); @@ -1187,7 +1187,7 @@ luasql-sqlite3 = buildLuarocksPackage { version = "2.4.0-1"; src = fetchurl { - url = https://luarocks.org/luasql-sqlite3-2.4.0-1.src.rock; + url = "https://luarocks.org/luasql-sqlite3-2.4.0-1.src.rock"; sha256 = "0pdk8c9iw0625imf5wdrhq60484jn475b85rvp0xgh86bsyalbsh"; }; disabled = (luaOlder "5.1"); @@ -1207,12 +1207,12 @@ luassert = buildLuarocksPackage { version = "1.7.11-0"; knownRockspec = (fetchurl { - url = https://luarocks.org/luassert-1.7.11-0.rockspec; + url = "https://luarocks.org/luassert-1.7.11-0.rockspec"; sha256 = "12zgybcv8acjzvjdbxd1764s1vxbksxdv9fkvsymcsdmppxkbd0s"; }).outPath; src = fetchurl { - url = https://github.com/Olivine-Labs/luassert/archive/v1.7.11.tar.gz; + url = "https://github.com/Olivine-Labs/luassert/archive/v1.7.11.tar.gz"; sha256 = "1vwq3wqj9cjyz9lnf1n38yhpcglr2h40v3n9096i8vcpmyvdb3ka"; }; @@ -1232,7 +1232,7 @@ luasystem = buildLuarocksPackage { version = "0.2.1-0"; src = fetchurl { - url = https://luarocks.org/luasystem-0.2.1-0.src.rock; + url = "https://luarocks.org/luasystem-0.2.1-0.src.rock"; sha256 = "091xmp8cijgj0yzfsjrn7vljwznjnjn278ay7z9pjwpwiva0diyi"; }; disabled = (luaOlder "5.1"); @@ -1251,7 +1251,7 @@ luautf8 = buildLuarocksPackage { version = "0.1.1-1"; src = fetchurl { - url = https://luarocks.org/luautf8-0.1.1-1.src.rock; + url = "https://luarocks.org/luautf8-0.1.1-1.src.rock"; sha256 = "1832ilrlddh4h7ayx4l9j7z1p8c2hk5yr96cpxjjrmirkld23aji"; }; disabled = (luaOlder "5.1"); @@ -1271,7 +1271,7 @@ luazip = buildLuarocksPackage { version = "1.2.7-1"; src = fetchurl { - url = https://luarocks.org/luazip-1.2.7-1.src.rock; + url = "https://luarocks.org/luazip-1.2.7-1.src.rock"; sha256 = "1yprlr1ap6bhshhy88qfphmmyg9zp1py2hj2158iw6vsva0fk03l"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -1290,7 +1290,7 @@ lua-yajl = buildLuarocksPackage { version = "2.0-1"; src = fetchurl { - url = https://luarocks.org/lua-yajl-2.0-1.src.rock; + url = "https://luarocks.org/lua-yajl-2.0-1.src.rock"; sha256 = "0bsm519vs53rchcdf8g96ygzdx2bz6pa4vffqlvc7ap49bg5np4f"; }; disabled = (luaOlder "5.1"); @@ -1310,7 +1310,7 @@ luuid = buildLuarocksPackage { version = "20120509-2"; src = fetchurl { - url = https://luarocks.org/luuid-20120509-2.src.rock; + url = "https://luarocks.org/luuid-20120509-2.src.rock"; sha256 = "08q54x0m51w89np3n117h2a153wsgv3qayabd8cz6i55qm544hkg"; }; disabled = (luaOlder "5.2") || (luaAtLeast "5.4"); @@ -1329,7 +1329,7 @@ luv = buildLuarocksPackage { version = "1.30.0-0"; src = fetchurl { - url = https://luarocks.org/luv-1.30.0-0.src.rock; + url = "https://luarocks.org/luv-1.30.0-0.src.rock"; sha256 = "1z5sdq9ld4sm5pws9qxpk9cadv9i7ycwad1zwsa57pj67gly11vi"; }; disabled = (luaOlder "5.1"); @@ -1348,7 +1348,7 @@ markdown = buildLuarocksPackage { version = "0.33-1"; src = fetchurl { - url = https://luarocks.org/markdown-0.33-1.src.rock; + url = "https://luarocks.org/markdown-0.33-1.src.rock"; sha256 = "01xw4b4jvmrv1hz2gya02g3nphsj3hc94hsbc672ycj8pcql5n5y"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -1367,12 +1367,12 @@ mediator_lua = buildLuarocksPackage { version = "1.1.2-0"; knownRockspec = (fetchurl { - url = https://luarocks.org/mediator_lua-1.1.2-0.rockspec; + url = "https://luarocks.org/mediator_lua-1.1.2-0.rockspec"; sha256 = "0frzvf7i256260a1s8xh92crwa2m42972qxfq29zl05aw3pyn7bm"; }).outPath; src = fetchurl { - url = https://github.com/Olivine-Labs/mediator_lua/archive/v1.1.2-0.tar.gz; + url = "https://github.com/Olivine-Labs/mediator_lua/archive/v1.1.2-0.tar.gz"; sha256 = "16zzzhiy3y35v8advmlkzpryzxv5vji7727vwkly86q8sagqbxgs"; }; @@ -1392,12 +1392,12 @@ mpack = buildLuarocksPackage { version = "1.0.7-0"; knownRockspec = (fetchurl { - url = https://luarocks.org/mpack-1.0.7-0.rockspec; + url = "https://luarocks.org/mpack-1.0.7-0.rockspec"; sha256 = "1sdw8qsni3g3fx9jnc5g64nxfw6v3n1rrw1xa3bkwc9wk815lqnz"; }).outPath; src = fetchurl { - url = https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz; + url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz"; sha256 = "1s4712ig3l4ds65pmlyg3r5zids2snn1rv8vsmmk27a4lf258mk8"; }; @@ -1415,7 +1415,7 @@ moonscript = buildLuarocksPackage { version = "0.5.0-1"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/moonscript-0.5.0-1.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/moonscript-0.5.0-1.src.rock"; sha256 = "09vv3ayzg94bjnzv5fw50r683ma0x3lb7sym297145zig9aqb9q9"; }; disabled = (luaOlder "5.1"); @@ -1435,7 +1435,7 @@ nvim-client = buildLuarocksPackage { version = "0.2.2-1"; src = fetchurl { - url = https://luarocks.org/nvim-client-0.2.2-1.src.rock; + url = "https://luarocks.org/nvim-client-0.2.2-1.src.rock"; sha256 = "0bgx94ziiq0004zw9lz2zb349xaqs5pminqd8bwdrfdnfjnbp8x0"; }; disabled = (luaOlder "5.1"); @@ -1454,12 +1454,12 @@ penlight = buildLuarocksPackage { version = "1.5.4-1"; knownRockspec = (fetchurl { - url = https://luarocks.org/penlight-1.5.4-1.rockspec; + url = "https://luarocks.org/penlight-1.5.4-1.rockspec"; sha256 = "07mhsk9kmdxg4i2w4mrnnd2zs34bgggi9gigfplakxin96sa6c0p"; }).outPath; src = fetchurl { - url = http://stevedonovan.github.io/files/penlight-1.5.4.zip; + url = "http://stevedonovan.github.io/files/penlight-1.5.4.zip"; sha256 = "138f921p6kdqkmf4pz115phhj0jsqf28g33avws80d2vq2ixqm8q"; }; @@ -1478,7 +1478,7 @@ rapidjson = buildLuarocksPackage { version = "0.5.2-1"; src = fetchurl { - url = https://luarocks.org/rapidjson-0.5.2-1.src.rock; + url = "https://luarocks.org/rapidjson-0.5.2-1.src.rock"; sha256 = "17lgbzv9kairx49kwa0m8xwyly95mg6fw60jan2dpqwnnkf2m8y6"; }; disabled = (luaOlder "5.1"); @@ -1497,12 +1497,12 @@ say = buildLuarocksPackage { version = "1.3-1"; knownRockspec = (fetchurl { - url = https://luarocks.org/say-1.3-1.rockspec; + url = "https://luarocks.org/say-1.3-1.rockspec"; sha256 = "0bknglb0qwd6r703wp3hcb6z2xxd14kq4md3sg9al3b28fzxbhdv"; }).outPath; src = fetchurl { - url = https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz; + url = "https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz"; sha256 = "1jh76mxq9dcmv7kps2spwcc6895jmj2sf04i4y9idaxlicvwvs13"; }; @@ -1522,7 +1522,7 @@ std__debug = buildLuarocksPackage { version = "1.0.1-1"; src = fetchurl { - url = https://luarocks.org/std._debug-1.0.1-1.src.rock; + url = "https://luarocks.org/std._debug-1.0.1-1.src.rock"; sha256 = "1qkcc5rph3ns9mzrfsa1671pb3hzbzfnaxvyw7zdly2b7ll88svz"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); @@ -1541,7 +1541,7 @@ std_normalize = buildLuarocksPackage { version = "2.0.2-1"; src = fetchurl { - url = https://luarocks.org/std.normalize-2.0.2-1.src.rock; + url = "https://luarocks.org/std.normalize-2.0.2-1.src.rock"; sha256 = "0yn60zqnxflhhlv6xk6w0ifdfxk1qcg8gq1wnrrbwsxwpipsrfjh"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -1560,7 +1560,7 @@ stdlib = buildLuarocksPackage { version = "41.2.2-1"; src = fetchurl { - url = https://luarocks.org/stdlib-41.2.2-1.src.rock; + url = "https://luarocks.org/stdlib-41.2.2-1.src.rock"; sha256 = "1kricll40xy75j72lrbp2jpyxsj9v8b9d7qjf3m3fq1bpg6dmsk7"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); @@ -1578,7 +1578,7 @@ vstruct = buildLuarocksPackage { version = "2.0.2-1"; src = fetchurl { - url = mirror://luarocks/vstruct-2.0.2-1.src.rock; + url = "mirror://luarocks/vstruct-2.0.2-1.src.rock"; sha256 = "05k1685618wh7vg8av92mh1i1rjqg15x12gifbp9kyqzc2nk3kzq"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.3"); diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index cb429e59c9270..84a15e8a674b5 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -294,6 +294,12 @@ with super; }; }); + mpack = super.mpack.override({ + buildInputs = [ pkgs.libmpack ]; + # the rockspec doesn't use the makefile so you may need to export more flags + USE_SYSTEM_LUA = "yes"; + USE_SYSTEM_MPACK = "yes"; + }); rapidjson = super.rapidjson.override({ preBuild = '' diff --git a/pkgs/development/misc/amdadl-sdk/default.nix b/pkgs/development/misc/amdadl-sdk/default.nix deleted file mode 100644 index e93f904b8959f..0000000000000 --- a/pkgs/development/misc/amdadl-sdk/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ requireFile, stdenv, unzip }: - -stdenv.mkDerivation { - version = "6.0"; - pname = "amdadl-sdk"; - - src = requireFile { - name = "ADL_SDK_6.0.zip"; - url = http://developer.amd.com/tools-and-sdks/graphics-development/display-library-adl-sdk/; - sha256 = "429f4fd1edebb030d6366f4e0a877cf105e4383f7dd2ccf54e5aef8f2e4242c9"; - }; - - buildInputs = [ unzip ]; - - doCheck = false; - - unpackPhase = '' - unzip $src - ''; - - patchPhase = '' - sed -i -e '/include/a \#include <wchar.h>' include/adl_structures.h || die - ''; - - buildPhase = '' - #Build adlutil - cd adlutil - gcc main.c -o adlutil -DLINUX -ldl -I ../include/ - cd .. - ''; - - installPhase = '' - #Install SDK - mkdir -p $out/bin - cp -r include "$out/" - cp "adlutil/adlutil" "$out/bin/adlutil" - - #Fix modes - chmod -R 755 "$out/bin/" - ''; - - meta = with stdenv.lib; { - description = "API to access display driver functionality for ATI graphics cards"; - homepage = https://developer.amd.com/tools/graphics-development/display-library-adl-sdk/; - license = licenses.unfree; - maintainers = [ maintainers.offline ]; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/development/misc/amdapp-sdk/01-remove-aparapi-samples.patch b/pkgs/development/misc/amdapp-sdk/01-remove-aparapi-samples.patch deleted file mode 100644 index f474f76f01e4d..0000000000000 --- a/pkgs/development/misc/amdapp-sdk/01-remove-aparapi-samples.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- samples/Makefile 2012-11-29 05:58:48.000000000 +0100 -+++ samples/Makefile 2012-12-30 20:13:30.926576277 +0100 -@@ -3,7 +3,6 @@ - include $(DEPTH)/make/openclsdkdefs.mk - - SUBDIRS = opencl --SUBDIRS += aparapi - ifneq ($(OS), lnx) - SUBDIRS += C++Amp - ifeq ($(BITS), 64) diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix deleted file mode 100644 index a3a4573c0aede..0000000000000 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, perl, libGLU, libGL, xorg, - version? "2.8", # What version - samples? false # Should samples be installed -}: - -let - - bits = if stdenv.hostPlatform.system == "x86_64-linux" then "64" - else "32"; - - arch = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" - else "x86"; - - src_info = { - "2.6" = { - url = "http://download2-developer.amd.com/amd/APPSDK/AMD-APP-SDK-v2.6-lnx${bits}.tgz"; - x86 = "03vyvqp44f96036zsyy8n21ymbzy2bx09hlbd6ci3ikj8g7ic1dm"; - x86_64 = "1fj55358s4blxq9bp77k07gqi22n5nfkzwjkbdc62gmy1zxxlhih"; - }; - - "2.7" = { - url = "http://download2-developer.amd.com/amd/APPSDK/AMD-APP-SDK-v2.7-lnx${bits}.tgz"; - x86 = "1v26n7g1xvlg5ralbfk3qiy34gj8fascpnjzm3120b6sgykfp16b"; - x86_64 = "08bi43bgnsxb47vbirh09qy02w7zxymqlqr8iikk9aavfxjlmch1"; - patches = [ ./gcc-5.patch]; - }; - - "2.8" = { - url = "https://developer.amd.com/wordpress/media/2012/11/AMD-APP-SDK-v2.8-lnx${bits}.tgz"; - x86 = "99610737f21b2f035e0eac4c9e776446cc4378a614c7667de03a82904ab2d356"; - x86_64 = "d9c120367225bb1cd21abbcf77cb0a69cfb4bb6932d0572990104c566aab9681"; - - # TODO: Add support for aparapi, java parallel api - patches = [ ./01-remove-aparapi-samples.patch ./gcc-5.patch]; - }; - }; - -in stdenv.mkDerivation { - pname = "amdapp-sdk"; - inherit version; - - src = fetchurl { - url = stdenv.lib.getAttrFromPath [version "url"] src_info; - sha256 = stdenv.lib.getAttrFromPath [version arch] src_info; - }; - - patches = stdenv.lib.attrByPath [version "patches"] [] src_info; - - patchFlags = [ "-p0" ]; - buildInputs = [ makeWrapper perl libGLU libGL xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ]; - propagatedBuildInputs = [ stdenv.cc ]; - NIX_LDFLAGS = "-lX11 -lXext -lXmu -lXi -lXxf86vm"; - doCheck = false; - - unpackPhase = '' - tar xvzf $src - tar xf AMD-APP-SDK-v${version}-*-lnx${bits}.tgz - cd AMD-APP-SDK-v${version}-*-lnx${bits} - ''; - - buildPhase = if !samples then ''echo "nothing to build"'' else null; - - installPhase = '' - # Install SDK - mkdir -p $out - cp -r {docs,include} "$out/" - mkdir -p "$out/"{bin,lib,samples/opencl/bin} - cp -r "./bin/${arch}/clinfo" "$out/bin/clinfo" - cp -r "./lib/${arch}/"* "$out/lib/" - - # Register ICD - mkdir -p "$out/etc/OpenCL/vendors" - echo "$out/lib/libamdocl${bits}.so" > "$out/etc/OpenCL/vendors/amd.icd" - # The OpenCL ICD specifications: http://www.khronos.org/registry/cl/extensions/khr/cl_khr_icd.txt - - # Install includes - mkdir -p "$out/usr/include/"{CAL,OpenVideo} - install -m644 './include/OpenVideo/'{OVDecode.h,OVDecodeTypes.h} "$out/usr/include/OpenVideo/" - - ${ if samples then '' - # Install samples - find ./samples/opencl/ -mindepth 1 -maxdepth 1 -type d -not -name bin -exec cp -r {} "$out/samples/opencl" \; - cp -r "./samples/opencl/bin/${arch}/"* "$out/samples/opencl/bin" - for f in $(find "$out/samples/opencl/bin/" -type f -not -name "*.*"); - do - wrapProgram "$f" --prefix PATH ":" "${stdenv.cc}/bin" - done'' else "" - } - - # Create wrappers - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/clinfo - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib $out/bin/clinfo - - # Fix modes - find "$out/" -type f -exec chmod 644 {} \; - chmod -R 755 "$out/bin/" - find "$out/samples/opencl/bin/" -type f -name ".*" -exec chmod 755 {} \; - find "$out/samples/opencl/bin/" -type f -not -name "*.*" -exec chmod 755 {} \; - ''; - - meta = with stdenv.lib; { - description = "AMD Accelerated Parallel Processing (APP) SDK, with OpenCL 1.2 support"; - homepage = https://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/; - license = licenses.amd; - maintainers = [ maintainers.offline ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/misc/amdapp-sdk/gcc-5.patch b/pkgs/development/misc/amdapp-sdk/gcc-5.patch deleted file mode 100644 index dc8538db4c1fb..0000000000000 --- a/pkgs/development/misc/amdapp-sdk/gcc-5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- include/CL/cl.hpp -+++ include/CL/cl.hpp -@@ -201,7 +201,7 @@ - #include <functional> - #define __CL_FUNCTION_TYPE typename std::function - #define CL_USE_CPP_FUNCTORS --#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 1 && !defined(STLPORT)) || defined(__APPLE__) || defined(__MACOSX) -+#elif (((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ >= 5)) && !defined(STLPORT)) || defined(__APPLE__) || defined(__MACOSX) - #include <tr1/functional> - #define __CL_FUNCTION_TYPE typename std::tr1::function - #define CL_USE_CPP_FUNCTORS diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index 48ea088a73c92..6682f72c62de6 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation { inherit version; src = fetchurl { - url = https://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2; + url = "https://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2"; sha256 = "15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj"; }; nativeBuildInputs = [ automake autoconf ]; # Make sure we don't strip the libraries in lib/gcc/avr. - stripDebugList = "bin"; + stripDebugList = [ "bin" ]; dontPatchELF = true; passthru = { @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "a C runtime library for AVR microcontrollers"; - homepage = https://savannah.nongnu.org/projects/avr-libc/; + homepage = "https://savannah.nongnu.org/projects/avr-libc/"; license = licenses.bsd3; platforms = [ "avr-none" ]; maintainers = with maintainers; [ mguentner ]; diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index c88b780d164a4..1a92f8fdd9da0 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "avr8-burn-omat-2.1.2"; src = fetchurl { - url = http://avr8-burn-o-mat.aaabbb.de/AVR8_Burn-O-Mat_2_1_2.zip; + url = "http://avr8-burn-o-mat.aaabbb.de/AVR8_Burn-O-Mat_2_1_2.zip"; sha256 = "02k0fd0cd3y1yqip36wr3bkxbywp8913w4y7jdg6qwqxjnii58ln"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "GUI tool for avrdude"; - homepage = http://avr8-burn-o-mat.aaabbb.de/avr8_burn_o_mat_avrdude_gui_en.html; + homepage = "http://avr8-burn-o-mat.aaabbb.de/avr8_burn_o_mat_avrdude_gui_en.html"; license = stdenv.lib.licenses.gpl3; platforms = platforms.all; }; diff --git a/pkgs/development/misc/google-clasp/default.nix b/pkgs/development/misc/google-clasp/default.nix index db6ade1c85a65..1e138aaa8f7e7 100644 --- a/pkgs/development/misc/google-clasp/default.nix +++ b/pkgs/development/misc/google-clasp/default.nix @@ -11,7 +11,7 @@ in ''; meta = { description = "Command Line tool for Google Apps Script Projects"; - homepage = https://developers.google.com/apps-script/guides/clasp; + homepage = "https://developers.google.com/apps-script/guides/clasp"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.michojel ]; priority = 100; diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index ba4ab6bf6150c..d8b65a7c1473c 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -16,7 +16,7 @@ buildRustPackage rec { cargoSha256 = "1fgv1kxiif48q9mm60ygn88r5nkxfyiacmvbgwp0jxiacv8r7779"; meta = with stdenv.lib; { - homepage = https://github.com/cgag/loc; + homepage = "https://github.com/cgag/loc"; description = "Count lines of code quickly"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/development/misc/msp430/gcc-support.nix b/pkgs/development/misc/msp430/gcc-support.nix index 36dbce6bdfdf8..e9ed959c2fd0d 100644 --- a/pkgs/development/misc/msp430/gcc-support.nix +++ b/pkgs/development/misc/msp430/gcc-support.nix @@ -23,7 +23,7 @@ in stdenvNoCC.mkDerivation rec { description = '' Development headers and linker scripts for TI MSP430 microcontrollers ''; - homepage = https://www.ti.com/tool/msp430-gcc-opensource; + homepage = "https://www.ti.com/tool/msp430-gcc-opensource"; license = licenses.bsd3; platforms = [ "msp430-none" ]; maintainers = with maintainers; [ aerialx ]; diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix index b84f358cbee0d..3c7ff00151a4d 100644 --- a/pkgs/development/misc/msp430/mspdebug.nix +++ b/pkgs/development/misc/msp430/mspdebug.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libusb, readline ? null }: +{ stdenv, fetchFromGitHub, libusb-compat-0_1, readline ? null }: let version = "0.25"; @@ -12,13 +12,13 @@ in stdenv.mkDerivation { sha256 = "0prgwb5vx6fd4bj12ss1bbb6axj2kjyriyjxqrzd58s5jyyy8d3c"; }; - buildInputs = [ libusb readline ]; + buildInputs = [ libusb-compat-0_1 readline ]; makeFlags = [ "PREFIX=$(out)" "INSTALL=install" ] ++ (if readline == null then [ "WITHOUT_READLINE=1" ] else []); meta = with stdenv.lib; { description = "A free programmer, debugger, and gdb proxy for MSP430 MCUs"; - homepage = https://dlbeer.co.nz/mspdebug/; + homepage = "https://dlbeer.co.nz/mspdebug/"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ aerialx ]; diff --git a/pkgs/development/misc/rpiboot/unstable.nix b/pkgs/development/misc/rpiboot/unstable.nix index c89d2f11e9541..1591a1efd17a2 100644 --- a/pkgs/development/misc/rpiboot/unstable.nix +++ b/pkgs/development/misc/rpiboot/unstable.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/raspberrypi/usbboot; + homepage = "https://github.com/raspberrypi/usbboot"; description = "Utility to boot a Raspberry Pi CM/CM3/Zero over USB"; maintainers = [ stdenv.lib.maintainers.cartr ]; license = stdenv.lib.licenses.asl20; diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix index ee424d18f159b..dee5f51b290df 100644 --- a/pkgs/development/misc/stm32/betaflight/default.nix +++ b/pkgs/development/misc/stm32/betaflight/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flight controller software (firmware) used to fly multi-rotor craft and fixed wing craft"; - homepage = https://github.com/betaflight/betaflight; + homepage = "https://github.com/betaflight/betaflight"; license = licenses.gpl3; maintainers = with maintainers; [ elitak ]; broken = true; diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix index 27e96b067b4f7..8ff8b45f06d4a 100644 --- a/pkgs/development/misc/stm32/inav/default.nix +++ b/pkgs/development/misc/stm32/inav/default.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Navigation-enabled flight control software"; - homepage = https://inavflight.github.io; + homepage = "https://inavflight.github.io"; license = licenses.gpl3; maintainers = with maintainers; [ elitak ]; broken = true; diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index 75754bec7a11b..7714ef046b7b6 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp/Tools; + homepage = "https://wiki.gnome.org/Apps/Yelp/Tools"; description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation"; maintainers = with maintainers; [ domenkozar ]; license = licenses.gpl2; diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix index eed4b43d6a363..fb74d79e7a714 100644 --- a/pkgs/development/mobile/abootimg/default.nix +++ b/pkgs/development/mobile/abootimg/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/ggrandou/abootimg; + homepage = "https://github.com/ggrandou/abootimg"; description = "Manipulate Android Boot Images"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix index ebba63353dabf..5c0f0c07c2141 100644 --- a/pkgs/development/mobile/adb-sync/default.nix +++ b/pkgs/development/mobile/adb-sync/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A tool to synchronise files between a PC and an Android devices using ADB (Android Debug Bridge)"; - homepage = https://github.com/google/adb-sync; + homepage = "https://github.com/google/adb-sync"; license = licenses.asl20; platforms = platforms.unix; hydraPlatforms = []; diff --git a/pkgs/development/mobile/androidenv/generated/addons.nix b/pkgs/development/mobile/androidenv/generated/addons.nix index a1807b990540d..23a55595cce0b 100644 --- a/pkgs/development/mobile/androidenv/generated/addons.nix +++ b/pkgs/development/mobile/androidenv/generated/addons.nix @@ -12,7 +12,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-10_r02.zip; + url = "https://dl.google.com/android/repository/google_apis-10_r02.zip"; sha1 = "cc0711857c881fa7534f90cf8cc09b8fe985484d"; }; @@ -27,7 +27,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-11_r01.zip; + url = "https://dl.google.com/android/repository/google_apis-11_r01.zip"; sha1 = "5eab5e81addee9f3576d456d205208314b5146a5"; }; @@ -42,7 +42,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-12_r01.zip; + url = "https://dl.google.com/android/repository/google_apis-12_r01.zip"; sha1 = "e9999f4fa978812174dfeceec0721c793a636e5d"; }; @@ -57,7 +57,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-13_r01.zip; + url = "https://dl.google.com/android/repository/google_apis-13_r01.zip"; sha1 = "3b153edd211c27dc736c893c658418a4f9041417"; }; @@ -72,7 +72,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-14_r02.zip; + url = "https://dl.google.com/android/repository/google_apis-14_r02.zip"; sha1 = "f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39"; }; @@ -87,7 +87,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-15_r03.zip; + url = "https://dl.google.com/android/repository/google_apis-15_r03.zip"; sha1 = "d0d2bf26805eb271693570a1aaec33e7dc3f45e9"; }; @@ -102,7 +102,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-16_r04.zip; + url = "https://dl.google.com/android/repository/google_apis-16_r04.zip"; sha1 = "ee6acf1b01020bfa8a8e24725dbc4478bee5e792"; }; @@ -117,7 +117,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-17_r04.zip; + url = "https://dl.google.com/android/repository/google_apis-17_r04.zip"; sha1 = "a076be0677f38df8ca5536b44dfb411a0c808c4f"; }; @@ -132,7 +132,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-18_r04.zip; + url = "https://dl.google.com/android/repository/google_apis-18_r04.zip"; sha1 = "6109603409debdd40854d4d4a92eaf8481462c8b"; }; @@ -147,7 +147,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-19_r20.zip; + url = "https://dl.google.com/android/repository/google_apis-19_r20.zip"; sha1 = "5b933abe830b2f25b4c0f171d45e9e0651e56311"; }; @@ -162,7 +162,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-21_r01.zip; + url = "https://dl.google.com/android/repository/google_apis-21_r01.zip"; sha1 = "66a754efb24e9bb07cc51648426443c7586c9d4a"; }; @@ -177,7 +177,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-22_r01.zip; + url = "https://dl.google.com/android/repository/google_apis-22_r01.zip"; sha1 = "5def0f42160cba8acff51b9c0c7e8be313de84f5"; }; @@ -192,7 +192,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-23_r01.zip; + url = "https://dl.google.com/android/repository/google_apis-23_r01.zip"; sha1 = "04c5cc1a7c88967250ebba9561d81e24104167db"; }; @@ -207,7 +207,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-24_r1.zip; + url = "https://dl.google.com/android/repository/google_apis-24_r1.zip"; sha1 = "31361c2868f27343ee917fbd259c1463821b6145"; }; @@ -222,7 +222,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-3-r03.zip; + url = "https://dl.google.com/android/repository/google_apis-3-r03.zip"; sha1 = "1f92abf3a76be66ae8032257fc7620acbd2b2e3a"; }; @@ -237,7 +237,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-4_r02.zip; + url = "https://dl.google.com/android/repository/google_apis-4_r02.zip"; sha1 = "9b6e86d8568558de4d606a7debc4f6049608dbd0"; }; @@ -252,7 +252,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-5_r01.zip; + url = "https://dl.google.com/android/repository/google_apis-5_r01.zip"; sha1 = "46eaeb56b645ee7ffa24ede8fa17f3df70db0503"; }; @@ -267,7 +267,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-6_r01.zip; + url = "https://dl.google.com/android/repository/google_apis-6_r01.zip"; sha1 = "5ff545d96e031e09580a6cf55713015c7d4936b2"; }; @@ -282,7 +282,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-7_r01.zip; + url = "https://dl.google.com/android/repository/google_apis-7_r01.zip"; sha1 = "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac"; }; @@ -297,7 +297,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-8_r02.zip; + url = "https://dl.google.com/android/repository/google_apis-8_r02.zip"; sha1 = "3079958e7ec87222cac1e6b27bc471b27bf2c352"; }; @@ -312,7 +312,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-9_r02.zip; + url = "https://dl.google.com/android/repository/google_apis-9_r02.zip"; sha1 = "78664645a1e9accea4430814f8694291a7f1ea5d"; }; @@ -327,7 +327,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_tv-12_r02.zip; + url = "https://dl.google.com/android/repository/google_tv-12_r02.zip"; sha1 = "92128a12e7e8b0fb5bac59153d7779b717e7b840"; }; @@ -342,7 +342,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_tv-13_r01.zip; + url = "https://dl.google.com/android/repository/google_tv-13_r01.zip"; sha1 = "b73f7c66011ac8180b44aa4e83b8d78c66ea9a09"; }; @@ -357,7 +357,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-25_r1.zip; + url = "https://dl.google.com/android/repository/google_apis-25_r1.zip"; sha1 = "550e83eea9513ab11c44919ac6da54b36084a9f3"; }; @@ -376,11 +376,11 @@ displayName = "GPU Debugging tools"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/gapid_r01_linux.zip; + url = "https://dl.google.com/android/repository/gapid_r01_linux.zip"; sha1 = "7c9ef7544cf0aea030bcc29bd8e12c04fd53e653"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/gapid_r01_osx.zip; + url = "https://dl.google.com/android/repository/gapid_r01_osx.zip"; sha1 = "597eb271349d890566274861eba2770a84ee4c69"; }; @@ -395,11 +395,11 @@ displayName = "GPU Debugging tools"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/gapid_2994895_linux.zip; + url = "https://dl.google.com/android/repository/gapid_2994895_linux.zip"; sha1 = "e40371ba191f617e4e79bc760d0ab2948ba8cf46"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/gapid_2994895_osx.zip; + url = "https://dl.google.com/android/repository/gapid_2994895_osx.zip"; sha1 = "ad86a2350b7b9908300277bf03d41649659de384"; }; @@ -415,7 +415,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android_m2repository_r47.zip; + url = "https://dl.google.com/android/repository/android_m2repository_r47.zip"; sha1 = "a0d22beacc106a6977321f2b07d692ce4979e96a"; }; @@ -442,7 +442,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/GoogleAdMobAdsSdkAndroid-6.4.1.zip; + url = "https://dl.google.com/android/repository/GoogleAdMobAdsSdkAndroid-6.4.1.zip"; sha1 = "0102859d9575baa0bf4fd5eb422af2ad0fe6cb82"; }; @@ -458,7 +458,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/GoogleAnalyticsAndroid_2.0beta5.zip; + url = "https://dl.google.com/android/repository/GoogleAnalyticsAndroid_2.0beta5.zip"; sha1 = "dc14026bf0ce78315cb5dd00552607de0894de83"; }; @@ -473,11 +473,11 @@ displayName = "Android Auto Desktop Head Unit emulator"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/desktop-head-unit-linux_r01.1.zip; + url = "https://dl.google.com/android/repository/desktop-head-unit-linux_r01.1.zip"; sha1 = "202a6e1b3009a0eb815f8c672d2d5b3717de6169"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/desktop-head-unit-macosx_r01.1.zip; + url = "https://dl.google.com/android/repository/desktop-head-unit-macosx_r01.1.zip"; sha1 = "8179cbb3914493ebc5eb65b731cba061582f2e84"; }; @@ -493,7 +493,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/gcm_r03.zip; + url = "https://dl.google.com/android/repository/gcm_r03.zip"; sha1 = "ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf"; }; @@ -509,7 +509,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_play_services_v16_1_rc09.zip; + url = "https://dl.google.com/android/repository/google_play_services_v16_1_rc09.zip"; sha1 = "f95bf19634e2ab0430923247fe2c50246432d2e9"; }; @@ -525,7 +525,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_play_services_3265130_r12.zip; + url = "https://dl.google.com/android/repository/google_play_services_3265130_r12.zip"; sha1 = "92558dbc380bba3d55d0ec181167fb05ce7c79d9"; }; @@ -541,7 +541,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/iasdk-1.9.0-1566514721.zip; + url = "https://dl.google.com/android/repository/iasdk-1.9.0-1566514721.zip"; sha1 = "c498367dcd7db30154b3e70c4ddbb1b0ea4b8d20"; }; @@ -557,7 +557,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip; + url = "https://dl.google.com/android/repository/google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip"; sha1 = "05086add9e3a0eb1b67111108d7757a4337c3f10"; }; @@ -573,7 +573,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/market_apk_expansion-r03.zip; + url = "https://dl.google.com/android/repository/market_apk_expansion-r03.zip"; sha1 = "5305399dc1a56814e86b8459ce24871916f78b8c"; }; @@ -589,7 +589,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/market_licensing-r02.zip; + url = "https://dl.google.com/android/repository/market_licensing-r02.zip"; sha1 = "355e8dc304a92a5616db235af8ee7bd554356254"; }; @@ -605,7 +605,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/simulator_r01.zip; + url = "https://dl.google.com/android/repository/simulator_r01.zip"; sha1 = "4fb5344e34e8faab4db18af07dace44c50db26a7"; }; @@ -632,7 +632,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/webdriver_r02.zip; + url = "https://dl.google.com/android/repository/webdriver_r02.zip"; sha1 = "13f3a3b2670a5fc04a7342861644be9a01b07e38"; }; @@ -648,7 +648,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0.zip"; sha1 = "b621b9d5adf273bb0725948589863e60e96eeaf1"; }; @@ -664,7 +664,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; }; @@ -680,7 +680,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; }; @@ -696,7 +696,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; }; @@ -712,7 +712,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; }; @@ -728,7 +728,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip"; sha1 = "cd13d16a8f0198c1d6040ec8b1d0d4e5bb7feb6a"; }; @@ -744,7 +744,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip"; sha1 = "cd13d16a8f0198c1d6040ec8b1d0d4e5bb7feb6a"; }; @@ -760,7 +760,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta1.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta1.zip"; sha1 = "042c25575e7650e96f0f5f5d1d3c54ed38eb821a"; }; @@ -776,7 +776,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta2.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta2.zip"; sha1 = "28492fd42b20ae1586591ff906556d459cfdaae8"; }; @@ -792,7 +792,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta3.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta3.zip"; sha1 = "268e763fa64bd217d8d830e59ce76be19aaba631"; }; @@ -808,7 +808,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta4.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta4.zip"; sha1 = "2213bf37e7a2869db2635895b8e90ca6841e79d2"; }; @@ -824,7 +824,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta5.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta5.zip"; sha1 = "3918cfef73e64048d0b3e048068e208b414e7e91"; }; @@ -840,7 +840,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.1.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.1.zip"; sha1 = "76f8823def9a6da8954a54737762a6820bc1d043"; }; @@ -856,7 +856,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.2.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.2.zip"; sha1 = "96d7ff669f0e808e9833b2c2e320702826ccc8be"; }; @@ -872,7 +872,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0.zip"; sha1 = "70acf99689b933bc6735645d5c3d92b91954b6cb"; }; @@ -888,7 +888,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; }; @@ -904,7 +904,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; }; @@ -920,7 +920,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; }; @@ -936,7 +936,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; }; @@ -952,7 +952,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip"; sha1 = "7912ba03b04831f918f523648f118c4ee4da7604"; }; @@ -968,7 +968,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip"; sha1 = "7912ba03b04831f918f523648f118c4ee4da7604"; }; @@ -984,7 +984,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta1.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta1.zip"; sha1 = "11f2f5cec4ff02986bad75435e5be77b704b4c64"; }; @@ -1000,7 +1000,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta2.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta2.zip"; sha1 = "623939865ede2e5c2c975dc55963e0d182bcce95"; }; @@ -1016,7 +1016,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta3.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta3.zip"; sha1 = "d78bb6a8ce92005fb1e4ed55d892a65b4258c60b"; }; @@ -1032,7 +1032,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta4.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta4.zip"; sha1 = "dc60844aab93a09a54a3c107685a77b18d7c1c39"; }; @@ -1048,7 +1048,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta5.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta5.zip"; sha1 = "4660f6c7a576ea1364f0c3225db71c29ca660d9a"; }; @@ -1064,7 +1064,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.1.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.1.zip"; sha1 = "342b0894b8651fff37586f80f383733e97aba9f9"; }; @@ -1080,7 +1080,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.2.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.2.zip"; sha1 = "3d9688a50fe0ed7348275f85d1b02278f616d8a4"; }; @@ -1089,4 +1089,4 @@ }; } - \ No newline at end of file + diff --git a/pkgs/development/mobile/androidenv/generated/packages.nix b/pkgs/development/mobile/androidenv/generated/packages.nix index a63a18c4b51fe..4ac14c419eddb 100644 --- a/pkgs/development/mobile/androidenv/generated/packages.nix +++ b/pkgs/development/mobile/androidenv/generated/packages.nix @@ -11,11 +11,11 @@ displayName = "Android SDK Build-Tools 17"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r17-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r17-linux.zip"; sha1 = "2c2872bc3806aabf16a12e3959c2183ddc866e6d"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r17-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r17-macosx.zip"; sha1 = "602ee709be9dbb8f179b1e4075148a57f9419930"; }; @@ -30,11 +30,11 @@ displayName = "Android SDK Build-Tools 18.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip"; sha1 = "f11618492b0d2270c332325d45d752d3656a9640"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r18.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r18.0.1-macosx.zip"; sha1 = "d84f5692fb44d60fc53e5b2507cebf9f24626902"; }; @@ -49,11 +49,11 @@ displayName = "Android SDK Build-Tools 18.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r18.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r18.1-linux.zip"; sha1 = "f314a0599e51397f0886fe888b50dd98f2f050d8"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r18.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r18.1-macosx.zip"; sha1 = "16ddb299b8b43063e5bb3387ec17147c5053dfd8"; }; @@ -68,11 +68,11 @@ displayName = "Android SDK Build-Tools 18.1.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r18.1.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r18.1.1-linux.zip"; sha1 = "68c9acbfc0cec2d51b19efaed39831a17055d998"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r18.1.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r18.1.1-macosx.zip"; sha1 = "a9d9d37f6ddf859e57abc78802a77aaa166e48d4"; }; @@ -87,11 +87,11 @@ displayName = "Android SDK Build-Tools 19"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r19-linux.zip"; sha1 = "55c1a6cf632e7d346f0002b275ec41fd3137fd83"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r19-macosx.zip"; sha1 = "86ec1c12db1bc446b7bcaefc5cc14eb361044e90"; }; @@ -106,11 +106,11 @@ displayName = "Android SDK Build-Tools 19.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r19.0.1-linux.zip"; sha1 = "18d2312dc4368858914213087f4e61445aca4517"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r19.0.1-macosx.zip"; sha1 = "efaf50fb19a3edb8d03efbff76f89a249ad2920b"; }; @@ -125,11 +125,11 @@ displayName = "Android SDK Build-Tools 19.0.2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.0.2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r19.0.2-linux.zip"; sha1 = "a03a6bdea0091aea32e1b35b90a7294c9f04e3dd"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.0.2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r19.0.2-macosx.zip"; sha1 = "145bc43065d45f756d99d87329d899052b9a9288"; }; @@ -144,11 +144,11 @@ displayName = "Android SDK Build-Tools 19.0.3"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.0.3-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r19.0.3-linux.zip"; sha1 = "c2d6055478e9d2d4fba476ee85f99181ddd1160c"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.0.3-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r19.0.3-macosx.zip"; sha1 = "651cf8754373b2d52e7f6aab2c52eabffe4e9ea4"; }; @@ -163,11 +163,11 @@ displayName = "Android SDK Build-Tools 19.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r19.1-linux.zip"; sha1 = "1ff20ac15fa47a75d00346ec12f180d531b3ca89"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r19.1-macosx.zip"; sha1 = "0d11aae3417de1efb4b9a0e0a7855904a61bcec1"; }; @@ -182,11 +182,11 @@ displayName = "Android SDK Build-Tools 20"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r20-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r20-linux.zip"; sha1 = "b688905526a5584d1327a662d871a635ff502758"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r20-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r20-macosx.zip"; sha1 = "1240f629411c108a714c4ddd756937c7fab93f83"; }; @@ -201,11 +201,11 @@ displayName = "Android SDK Build-Tools 21"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r21-linux.zip"; sha1 = "4933328fdeecbd554a29528f254f4993468e1cf4"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r21-macosx.zip"; sha1 = "9bef7989b51436bd4e5114d8a0330359f077cbfa"; }; @@ -220,11 +220,11 @@ displayName = "Android SDK Build-Tools 21.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r21.0.1-linux.zip"; sha1 = "e573069eea3e5255e7a65bedeb767f4fd0a5f49a"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r21.0.1-macosx.zip"; sha1 = "b60c8f9b810c980abafa04896706f3911be1ade7"; }; @@ -239,11 +239,11 @@ displayName = "Android SDK Build-Tools 21.0.2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.0.2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r21.0.2-linux.zip"; sha1 = "e1236ab8897b62b57414adcf04c132567b2612a5"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.0.2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r21.0.2-macosx.zip"; sha1 = "f17471c154058f3734729ef3cc363399b1cd3de1"; }; @@ -258,11 +258,11 @@ displayName = "Android SDK Build-Tools 21.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r21.1-linux.zip"; sha1 = "b7455e543784d52a8925f960bc880493ed1478cb"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r21.1-macosx.zip"; sha1 = "df619356c2359aa5eacdd48699d15b335d9bd246"; }; @@ -277,11 +277,11 @@ displayName = "Android SDK Build-Tools 21.1.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.1.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r21.1.1-linux.zip"; sha1 = "1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.1.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r21.1.1-macosx.zip"; sha1 = "836a146eab0504aa9387a5132e986fe7c7381571"; }; @@ -296,11 +296,11 @@ displayName = "Android SDK Build-Tools 21.1.2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip"; sha1 = "5e35259843bf2926113a38368b08458735479658"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.1.2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r21.1.2-macosx.zip"; sha1 = "e7c906b4ba0eea93b32ba36c610dbd6b204bff48"; }; @@ -315,11 +315,11 @@ displayName = "Android SDK Build-Tools 22"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r22-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r22-linux.zip"; sha1 = "a8a1619dd090e44fac957bce6842e62abf87965b"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r22-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r22-macosx.zip"; sha1 = "af95429b24088d704bc5db9bd606e34ac1b82c0d"; }; @@ -334,11 +334,11 @@ displayName = "Android SDK Build-Tools 22.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r22.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r22.0.1-linux.zip"; sha1 = "da8b9c5c3ede39298e6cf0283c000c2ee9029646"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r22.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r22.0.1-macosx.zip"; sha1 = "53dad7f608e01d53b17176ba11165acbfccc5bbf"; }; @@ -353,11 +353,11 @@ displayName = "Android SDK Build-Tools 23"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r23-linux.zip"; sha1 = "c1d6209212b01469f80fa804e0c1d39a06bc9060"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r23-macosx.zip"; sha1 = "90ba6e716f7703a236cd44b2e71c5ff430855a03"; }; @@ -372,11 +372,11 @@ displayName = "Android SDK Build-Tools 23.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r23.0.1-linux.zip"; sha1 = "b6ba7c399d5fa487d95289d8832e4ad943aed556"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r23.0.1-macosx.zip"; sha1 = "d96ec1522721e9a179ae2c591c99f75d31d39718"; }; @@ -391,11 +391,11 @@ displayName = "Android SDK Build-Tools 23.0.2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip"; sha1 = "8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23.0.2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r23.0.2-macosx.zip"; sha1 = "482c4cbceef8ff58aefd92d8155a38610158fdaf"; }; @@ -410,11 +410,11 @@ displayName = "Android SDK Build-Tools 23.0.3"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip"; sha1 = "368f2600feac7e9b511b82f53d1f2240ae4a91a3"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23.0.3-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r23.0.3-macosx.zip"; sha1 = "fbc98cd303fd15a31d472de6c03bd707829f00b0"; }; @@ -429,11 +429,11 @@ displayName = "Android SDK Build-Tools 24"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r24-linux.zip"; sha1 = "c6271c4d78a5612ea6c7150688bcd5b7313de8d1"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r24-macosx.zip"; sha1 = "97fc4ed442f23989cc488d02c1d1de9bdde241de"; }; @@ -448,11 +448,11 @@ displayName = "Android SDK Build-Tools 24.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r24.0.1-linux.zip"; sha1 = "84f18c392919a074fcbb9b1d967984e6b2fef8b4"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r24.0.1-macosx.zip"; sha1 = "5c6457fcdfa07724fb086d8ff4e8316fc0742848"; }; @@ -467,11 +467,11 @@ displayName = "Android SDK Build-Tools 24.0.2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24.0.2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r24.0.2-linux.zip"; sha1 = "f199a7a788c3fefbed102eea34d6007737b803cf"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24.0.2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r24.0.2-macosx.zip"; sha1 = "8bb8fc575477491d5957de743089df412de55cda"; }; @@ -486,11 +486,11 @@ displayName = "Android SDK Build-Tools 24.0.3"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24.0.3-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r24.0.3-linux.zip"; sha1 = "9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24.0.3-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r24.0.3-macosx.zip"; sha1 = "a01c15f1b105c34595681075e1895d58b3fff48c"; }; @@ -505,11 +505,11 @@ displayName = "Android SDK Build-Tools 25"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r25-linux.zip"; sha1 = "f2bbda60403e75cabd0f238598c3b4dfca56ea44"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r25-macosx.zip"; sha1 = "273c5c29a65cbed00e44f3aa470bbd7dce556606"; }; @@ -524,11 +524,11 @@ displayName = "Android SDK Build-Tools 25.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r25.0.1-linux.zip"; sha1 = "ff063d252ab750d339f5947d06ff782836f22bac"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r25.0.1-macosx.zip"; sha1 = "7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f"; }; @@ -543,11 +543,11 @@ displayName = "Android SDK Build-Tools 25.0.2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25.0.2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r25.0.2-linux.zip"; sha1 = "ff953c0177e317618fda40516f3e9d95fd43c7ae"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25.0.2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r25.0.2-macosx.zip"; sha1 = "12a5204bb3b6e39437535469fde7ddf42da46b16"; }; @@ -562,11 +562,11 @@ displayName = "Android SDK Build-Tools 25.0.3"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25.0.3-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r25.0.3-linux.zip"; sha1 = "db95f3a0ae376534d4d69f4cdb6fad20649f3509"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25.0.3-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r25.0.3-macosx.zip"; sha1 = "160d2fefb5ce68e443427fc30a793a703b63e26e"; }; @@ -581,11 +581,11 @@ displayName = "Android SDK Build-Tools 26"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r26-linux.zip"; sha1 = "1cbe72929876f8a872ab1f1b1040a9f720261f59"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r26-macosx.zip"; sha1 = "d01a1aeca03747245f1f5936b3cb01759c66d086"; }; @@ -600,11 +600,11 @@ displayName = "Android SDK Build-Tools 26-rc1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26-rc1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r26-rc1-linux.zip"; sha1 = "8cd6388dc96db2d7a49d06159cf990d3bbc78d04"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26-rc1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r26-rc1-macosx.zip"; sha1 = "5c5a1de7d5f4f000d36ae349229fe0be846d6137"; }; @@ -619,11 +619,11 @@ displayName = "Android SDK Build-Tools 26-rc2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26-rc2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r26-rc2-linux.zip"; sha1 = "629bbd8d2e415bf64871fb0b4c0540fd6d0347a0"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26-rc2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r26-rc2-macosx.zip"; sha1 = "cb1eb738a1f7003025af267a9b8cc2d259533c70"; }; @@ -638,11 +638,11 @@ displayName = "Android SDK Build-Tools 26.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip"; sha1 = "5378c2c78091b414d0eac40a6bd37f2faa31a365"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r26.0.1-macosx.zip"; sha1 = "cbde59de198916b390777dd0227921bfa2120832"; }; @@ -657,11 +657,11 @@ displayName = "Android SDK Build-Tools 26.0.2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip"; sha1 = "5b2b7b66c7bf2151f2af183b5b50a17808850592"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26.0.2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r26.0.2-macosx.zip"; sha1 = "d9ed7c7f149ce38be5dc08979aea8acec1459ca0"; }; @@ -676,11 +676,11 @@ displayName = "Android SDK Build-Tools 26.0.3"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26.0.3-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r26.0.3-linux.zip"; sha1 = "8a2e6c1bcd845844523a68aa17e5442f0dce328c"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26.0.3-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r26.0.3-macosx.zip"; sha1 = "5bb90ed935d99e5bc90686f43b852e68c5ad40df"; }; @@ -695,11 +695,11 @@ displayName = "Android SDK Build-Tools 27"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r27-linux.zip"; sha1 = "28542332ba97cf4a08c3eddfcf5edd70e3cf1260"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r27-macosx.zip"; sha1 = "fb4e8d7e6b8d29a77090e34024077a80458d5ae1"; }; @@ -714,11 +714,11 @@ displayName = "Android SDK Build-Tools 27.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip"; sha1 = "7f4eedb1077ef948b848040dcd15de9e8a759f4a"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r27.0.1-macosx.zip"; sha1 = "1edd07bfdbadd95652d093040e16d858f7489594"; }; @@ -733,11 +733,11 @@ displayName = "Android SDK Build-Tools 27.0.2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27.0.2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r27.0.2-linux.zip"; sha1 = "b687ddf6be84f11607871138aad32cf857d0b837"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27.0.2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r27.0.2-macosx.zip"; sha1 = "6d5d9cf2a47877f273f4b742b19e712a051a31be"; }; @@ -752,11 +752,11 @@ displayName = "Android SDK Build-Tools 27.0.3"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27.0.3-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r27.0.3-linux.zip"; sha1 = "d85e7a6320eddffe7eeace3437605079dac938ca"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27.0.3-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r27.0.3-macosx.zip"; sha1 = "61d9fb18790c68d66ff73bf1e7ad56bc1f1eef2d"; }; @@ -771,11 +771,11 @@ displayName = "Android SDK Build-Tools 28"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r28-linux.zip"; sha1 = "d9f8a754d833ccd334f56fcc6089c5925cd82abb"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r28-macosx.zip"; sha1 = "72088d32d1d82cc3c2cf7cf6618b6130c0c84ade"; }; @@ -790,11 +790,11 @@ displayName = "Android SDK Build-Tools 28-rc1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28-rc1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r28-rc1-linux.zip"; sha1 = "1601977fae25fd478bcfaa0481ca5ea3c609d840"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28-rc1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r28-rc1-macosx.zip"; sha1 = "2c77821967a2330b7b227072d0b1c02ef19fe2fc"; }; @@ -809,11 +809,11 @@ displayName = "Android SDK Build-Tools 28-rc2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28-rc2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r28-rc2-linux.zip"; sha1 = "efe9c0dde0646a07544c864276390ca6e96b24dc"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28-rc2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r28-rc2-macosx.zip"; sha1 = "0d0314b353589feb10e528b44c5a685b6658d797"; }; @@ -828,11 +828,11 @@ displayName = "Android SDK Build-Tools 28.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r28.0.1-linux.zip"; sha1 = "ee70dfa1fccb58b37cebc9544830511f36a137a0"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r28.0.1-macosx.zip"; sha1 = "aeef42ad953f1630dd6f5d71eefdc0b825211462"; }; @@ -847,11 +847,11 @@ displayName = "Android SDK Build-Tools 28.0.2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28.0.2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r28.0.2-linux.zip"; sha1 = "b4492209810a3fd48deaa982f9852fef12433d55"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28.0.2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r28.0.2-macosx.zip"; sha1 = "c10dd5a7825578622fb362a8a34f76eb3ba0c0a9"; }; @@ -866,11 +866,11 @@ displayName = "Android SDK Build-Tools 28.0.3"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip"; sha1 = "ea6f2f7103cd9da9ff0bdf6e37fbbba548fa4165"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28.0.3-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r28.0.3-macosx.zip"; sha1 = "f8c333a2991b1ab05a671bc6248b78e00edcd83a"; }; @@ -885,11 +885,11 @@ displayName = "Android SDK Build-Tools 29"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r29-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r29-linux.zip"; sha1 = "ad314caf1802209c4b00a5f3517af5ceb0d48eae"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r29-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r29-macosx.zip"; sha1 = "35dc6bc7a53bd9d206847e72f02cab21cfdaa869"; }; @@ -904,11 +904,11 @@ displayName = "Android SDK Build-Tools 29-rc1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r29-rc1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r29-rc1-linux.zip"; sha1 = "1c897f5885ac5468613e40e1ea598c21c05d345d"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r29-rc1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r29-rc1-macosx.zip"; sha1 = "f066c0d9ea2f0d8a0a9cc7b2ca0a467a570ab034"; }; @@ -923,11 +923,11 @@ displayName = "Android SDK Build-Tools 29-rc2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r29-rc2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r29-rc2-linux.zip"; sha1 = "b4b41d429c35b42db07b6c65d4aa998ba8c4093c"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r29-rc2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r29-rc2-macosx.zip"; sha1 = "7a960367999169ccac5dbc60817e5f1725c4c738"; }; @@ -942,11 +942,11 @@ displayName = "Android SDK Build-Tools 29-rc3"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r29-rc3-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r29-rc3-linux.zip"; sha1 = "8b7177f198e8b92da8f9537aaf859f6edf222b01"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r29-rc3-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r29-rc3-macosx.zip"; sha1 = "643e8d76625f6e2cfcd5494e50bae5e14725ec0c"; }; @@ -961,11 +961,11 @@ displayName = "Android SDK Build-Tools 29.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r29.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r29.0.1-linux.zip"; sha1 = "fc209e5d91ab2daeac24345a5cb17261940547e4"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r29.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r29.0.1-macosx.zip"; sha1 = "46ae9b1d1e2a67241d7da9c2cd8eae42f24cc6cd"; }; @@ -980,11 +980,11 @@ displayName = "Android SDK Build-Tools 29.0.2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r29.0.2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r29.0.2-linux.zip"; sha1 = "c0fc7e5c37ac96bfd0c611802e8ab36d0e71b398"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r29.0.2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r29.0.2-macosx.zip"; sha1 = "f781d9e03d5c2debcf51fed3792ee7a9d066723f"; }; @@ -999,11 +999,11 @@ displayName = "Android SDK Build-Tools 29.0.3"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r29.0.3-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r29.0.3-linux.zip"; sha1 = "64efff52165cda5e31848acafa46a05e3f3b4651"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r29.0.3-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r29.0.3-macosx.zip"; sha1 = "76520eb7712fb0bb4c023b55c6f65588ee268289"; }; @@ -1018,11 +1018,11 @@ displayName = "Android SDK Build-Tools 30-rc1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r30-rc1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r30-rc1-linux.zip"; sha1 = "afcb370bb6956bbf9e90557230088a3e1417e8a8"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r30-rc1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r30-rc1-macosx.zip"; sha1 = "2761a0ea9466685aaaf93e85bf8bd47575bc91b8"; }; @@ -1037,11 +1037,11 @@ displayName = "CMake 3.10.2.4988404"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/cmake-3.10.2-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/cmake-3.10.2-darwin-x86_64.zip"; sha1 = "f227a85cb53dcb927ac52a5a717f647c4a29bf3b"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/cmake-3.10.2-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/cmake-3.10.2-linux-x86_64.zip"; sha1 = "439e8799bf59f724f104bf62784b2985f1bfe561"; }; @@ -1056,11 +1056,11 @@ displayName = "CMake 3.6.4111459"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/cmake-3.6.4111459-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/cmake-3.6.4111459-darwin-x86_64.zip"; sha1 = "c9b02d630079783c6d67cb91488b622cfcd9765c"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/cmake-3.6.4111459-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/cmake-3.6.4111459-linux-x86_64.zip"; sha1 = "71c539b9c33f0943e9ad6251fea0b161c0b70782"; }; @@ -1075,11 +1075,11 @@ displayName = "Android SDK Command-line Tools"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip; + url = "https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip"; sha1 = "6ffc5bd72db2c755f9b374ed829202262a6d8aaf"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/commandlinetools-mac-6200805_latest.zip; + url = "https://dl.google.com/android/repository/commandlinetools-mac-6200805_latest.zip"; sha1 = "23f803c07e392bb769507c88b23c2c7868cc7a6f"; }; @@ -1095,7 +1095,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/docs-24_r01.zip; + url = "https://dl.google.com/android/repository/docs-24_r01.zip"; sha1 = "eef58238949ee9544876cb3e002f2d58e4ee7b5d"; }; @@ -1110,11 +1110,11 @@ displayName = "Android Emulator"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/emulator-darwin-6203977.zip; + url = "https://dl.google.com/android/repository/emulator-darwin-6203977.zip"; sha1 = "3bb965869577be4e62dec053de34c279f5024a12"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/emulator-linux-6203977.zip; + url = "https://dl.google.com/android/repository/emulator-linux-6203977.zip"; sha1 = "356cac370c03460ca82166464de7ecd7da1f4a49"; }; @@ -1140,7 +1140,7 @@ displayName = "Android Emulator"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/emulator-linux-6258612.zip; + url = "https://dl.google.com/android/repository/emulator-linux-6258612.zip"; sha1 = "a891e1532443a55c3ce9986b484effdabd842f8e"; }; @@ -1155,7 +1155,7 @@ displayName = "Android Emulator"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/emulator-darwin-6237347.zip; + url = "https://dl.google.com/android/repository/emulator-darwin-6237347.zip"; sha1 = "702b6a050a230b3b45f667867f6fc99b3f973d9a"; }; @@ -1170,11 +1170,11 @@ displayName = "LLDB 2.0"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/lldb-2.0.2558144-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-2.0.2558144-darwin-x86_64.zip"; sha1 = "d92e2f4c8284413eed4f27986e62b167d947033c"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/lldb-2.0.2558144-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-2.0.2558144-linux-x86_64.zip"; sha1 = "e7060d9b2ba58b28fd7b1a0ea85a151c8371a326"; }; @@ -1189,11 +1189,11 @@ displayName = "LLDB 2.1"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/lldb-2.1.2852477-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-2.1.2852477-darwin-x86_64.zip"; sha1 = "d1e33880a53f1aa8c7e73534adef83a06f091185"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/lldb-2.1.2852477-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-2.1.2852477-linux-x86_64.zip"; sha1 = "eb9b96d320210fdfe82495b0597ad43e77f1c240"; }; @@ -1208,11 +1208,11 @@ displayName = "LLDB 2.2"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/lldb-2.2.3271982-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-2.2.3271982-darwin-x86_64.zip"; sha1 = "62089f4e35775e6cedb82d1fa377fdc1de898005"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/lldb-2.2.3271982-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-2.2.3271982-linux-x86_64.zip"; sha1 = "413649617d97dd9ef163528f64c0500e1b7c4113"; }; @@ -1227,11 +1227,11 @@ displayName = "LLDB 2.3"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/lldb-2.3.3614996-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-2.3.3614996-darwin-x86_64.zip"; sha1 = "6b0df112c7b9fa41654497fde2fcce990c831e52"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/lldb-2.3.3614996-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-2.3.3614996-linux-x86_64.zip"; sha1 = "d7abe655650efe9f6989df31835fa3b3f95c2d13"; }; @@ -1246,11 +1246,11 @@ displayName = "LLDB 3.0"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/lldb-3.0.4213617-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-3.0.4213617-darwin-x86_64.zip"; sha1 = "2492651690a215317b86c755cd4d584ec9838677"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/lldb-3.0.4213617-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-3.0.4213617-linux-x86_64.zip"; sha1 = "61d49b6a58953faa61546d631409af5f60d8d9db"; }; @@ -1265,11 +1265,11 @@ displayName = "LLDB 3.1"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/lldb-3.1.4508709-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-3.1.4508709-darwin-x86_64.zip"; sha1 = "2b37aa55b81a7e5b8a369febf1ac0bad6c7c5d58"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/lldb-3.1.4508709-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-3.1.4508709-linux-x86_64.zip"; sha1 = "462711c9ee94fec9ff8be5fa8180afec04d1af6f"; }; @@ -1284,11 +1284,11 @@ displayName = "NDK"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r21b-beta1-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r21b-beta1-darwin-x86_64.zip"; sha1 = "971609f9a579ebbcb8d121a5d5aa0cba716b2d1f"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r21b-beta1-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r21b-beta1-linux-x86_64.zip"; sha1 = "cf06ed408663c11c8f4824f9370c7a900ec074dd"; }; @@ -1303,11 +1303,11 @@ displayName = "NDK"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip"; sha1 = "0d50636cc0e34ed3ba540d6d5818ea0cf10f16aa"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip"; sha1 = "afc9c0b9faad222898ac8168c78ad4ccac8a1b5c"; }; @@ -1322,11 +1322,11 @@ displayName = "NDK"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r21-beta2-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r21-beta2-darwin-x86_64.zip"; sha1 = "34a46c3867c9d87a80895c0b8a098256052536d2"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r21-beta2-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r21-beta2-linux-x86_64.zip"; sha1 = "335f30302bee700a9a5fdfe3ae533a4963499c44"; }; @@ -1341,11 +1341,11 @@ displayName = "NDK"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r20b-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r20b-darwin-x86_64.zip"; sha1 = "b51290ab69cb89de1f0ba108702277bc333b38be"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip"; sha1 = "d903fdf077039ad9331fb6c3bee78aa46d45527b"; }; @@ -1360,11 +1360,11 @@ displayName = "NDK"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r20-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r20-darwin-x86_64.zip"; sha1 = "96d5f1c50452596912d1982439c514194b5751e6"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip"; sha1 = "8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff"; }; @@ -1379,11 +1379,11 @@ displayName = "NDK"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r20-beta3-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r20-beta3-darwin-x86_64.zip"; sha1 = "665a035cadb0dd03e6502ba25c18643f6e4ede24"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r20-beta3-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r20-beta3-linux-x86_64.zip"; sha1 = "674d8fb0e0df8e8be1c31fa321eb176548a19ba3"; }; @@ -1398,11 +1398,11 @@ displayName = "NDK"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r20-beta2-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r20-beta2-darwin-x86_64.zip"; sha1 = "cd94191ace6b31ec9af1cc370173e16934e1cb8b"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r20-beta2-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r20-beta2-linux-x86_64.zip"; sha1 = "8285ae2e24a7232fd0cbfb55e955c8586ef2ee02"; }; @@ -1417,11 +1417,11 @@ displayName = "NDK"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r19c-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r19c-darwin-x86_64.zip"; sha1 = "f46b8193109bba8a58e0461c1a48f4534051fb25"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip"; sha1 = "fd94d0be6017c6acbd193eb95e09cf4b6f61b834"; }; @@ -1436,11 +1436,11 @@ displayName = "NDK"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip"; sha1 = "86c1a962601b23b8a6d3d535c93b4b0bc4f29249"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r19-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r19-linux-x86_64.zip"; sha1 = "f02ad84cb5b6e1ff3eea9e6168037c823408c8ac"; }; @@ -1455,11 +1455,11 @@ displayName = "NDK"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip"; sha1 = "98cb9909aa8c2dab32db188bbdc3ac6207e09440"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip"; sha1 = "500679655da3a86aecf67007e8ab230ea9b4dd7b"; }; @@ -1474,11 +1474,11 @@ displayName = "NDK"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip"; sha1 = "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip"; sha1 = "12cacc70c3fd2f40574015631c00f41fb8a39048"; }; @@ -1493,11 +1493,11 @@ displayName = "NDK"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip"; sha1 = "e51e615449b98c716cf912057e2682e75d55e2de"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip"; sha1 = "42aa43aae89a50d1c66c3f9fdecd676936da6128"; }; @@ -1512,11 +1512,11 @@ displayName = "NDK (Side by side) 16.1.4479499"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip"; sha1 = "e51e615449b98c716cf912057e2682e75d55e2de"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip"; sha1 = "42aa43aae89a50d1c66c3f9fdecd676936da6128"; }; @@ -1531,11 +1531,11 @@ displayName = "NDK (Side by side) 17.2.4988734"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip"; sha1 = "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip"; sha1 = "12cacc70c3fd2f40574015631c00f41fb8a39048"; }; @@ -1550,11 +1550,11 @@ displayName = "NDK (Side by side) 18.1.5063045"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip"; sha1 = "98cb9909aa8c2dab32db188bbdc3ac6207e09440"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip"; sha1 = "500679655da3a86aecf67007e8ab230ea9b4dd7b"; }; @@ -1569,11 +1569,11 @@ displayName = "NDK (Side by side) 19.0.5232133"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip"; sha1 = "86c1a962601b23b8a6d3d535c93b4b0bc4f29249"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r19-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r19-linux-x86_64.zip"; sha1 = "f02ad84cb5b6e1ff3eea9e6168037c823408c8ac"; }; @@ -1588,11 +1588,11 @@ displayName = "NDK (Side by side) 19.2.5345600"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r19c-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r19c-darwin-x86_64.zip"; sha1 = "f46b8193109bba8a58e0461c1a48f4534051fb25"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip"; sha1 = "fd94d0be6017c6acbd193eb95e09cf4b6f61b834"; }; @@ -1607,11 +1607,11 @@ displayName = "NDK (Side by side) 20.0.5392854"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r20-beta2-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r20-beta2-darwin-x86_64.zip"; sha1 = "cd94191ace6b31ec9af1cc370173e16934e1cb8b"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r20-beta2-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r20-beta2-linux-x86_64.zip"; sha1 = "8285ae2e24a7232fd0cbfb55e955c8586ef2ee02"; }; @@ -1626,11 +1626,11 @@ displayName = "NDK (Side by side) 20.0.5471264"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r20-beta3-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r20-beta3-darwin-x86_64.zip"; sha1 = "665a035cadb0dd03e6502ba25c18643f6e4ede24"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r20-beta3-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r20-beta3-linux-x86_64.zip"; sha1 = "674d8fb0e0df8e8be1c31fa321eb176548a19ba3"; }; @@ -1645,11 +1645,11 @@ displayName = "NDK (Side by side) 20.0.5594570"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r20-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r20-darwin-x86_64.zip"; sha1 = "96d5f1c50452596912d1982439c514194b5751e6"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip"; sha1 = "8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff"; }; @@ -1664,11 +1664,11 @@ displayName = "NDK (Side by side) 20.1.5948944"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r20b-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r20b-darwin-x86_64.zip"; sha1 = "b51290ab69cb89de1f0ba108702277bc333b38be"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip"; sha1 = "d903fdf077039ad9331fb6c3bee78aa46d45527b"; }; @@ -1683,11 +1683,11 @@ displayName = "NDK (Side by side) 21.0.6011959"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r21-beta2-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r21-beta2-darwin-x86_64.zip"; sha1 = "34a46c3867c9d87a80895c0b8a098256052536d2"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r21-beta2-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r21-beta2-linux-x86_64.zip"; sha1 = "335f30302bee700a9a5fdfe3ae533a4963499c44"; }; @@ -1702,11 +1702,11 @@ displayName = "NDK (Side by side) 21.0.6113669"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip"; sha1 = "0d50636cc0e34ed3ba540d6d5818ea0cf10f16aa"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip"; sha1 = "afc9c0b9faad222898ac8168c78ad4ccac8a1b5c"; }; @@ -1721,11 +1721,11 @@ displayName = "NDK (Side by side) 21.1.6210238"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r21b-beta1-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r21b-beta1-darwin-x86_64.zip"; sha1 = "971609f9a579ebbcb8d121a5d5aa0cba716b2d1f"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r21b-beta1-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r21b-beta1-linux-x86_64.zip"; sha1 = "cf06ed408663c11c8f4824f9370c7a900ec074dd"; }; @@ -1741,7 +1741,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/3534162-studio.sdk-patcher.zip; + url = "https://dl.google.com/android/repository/3534162-studio.sdk-patcher.zip"; sha1 = "046699c5e2716ae11d77e0bad814f7f33fab261e"; }; @@ -1756,11 +1756,11 @@ displayName = "Android SDK Platform-Tools"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/platform-tools_r29.0.6-darwin.zip; + url = "https://dl.google.com/android/repository/platform-tools_r29.0.6-darwin.zip"; sha1 = "3232179dce22d8a6332018729026ed39f5d5cd0b"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/platform-tools_r29.0.6-linux.zip; + url = "https://dl.google.com/android/repository/platform-tools_r29.0.6-linux.zip"; sha1 = "e95ed28330406705d47fe96bafb589be6c1f2f23"; }; @@ -1776,7 +1776,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-2.3.3_r02.zip; + url = "https://dl.google.com/android/repository/android-2.3.3_r02.zip"; sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3"; }; @@ -1792,7 +1792,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-3.0_r02.zip; + url = "https://dl.google.com/android/repository/android-3.0_r02.zip"; sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37"; }; @@ -1808,7 +1808,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-3.1_r03.zip; + url = "https://dl.google.com/android/repository/android-3.1_r03.zip"; sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf"; }; @@ -1824,7 +1824,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-3.2_r01.zip; + url = "https://dl.google.com/android/repository/android-3.2_r01.zip"; sha1 = "6189a500a8c44ae73a439604363de93591163cd9"; }; @@ -1840,7 +1840,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-14_r04.zip; + url = "https://dl.google.com/android/repository/android-14_r04.zip"; sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c"; }; @@ -1856,7 +1856,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-15_r05.zip; + url = "https://dl.google.com/android/repository/android-15_r05.zip"; sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3"; }; @@ -1872,7 +1872,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-16_r05.zip; + url = "https://dl.google.com/android/repository/android-16_r05.zip"; sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07"; }; @@ -1888,7 +1888,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-17_r03.zip; + url = "https://dl.google.com/android/repository/android-17_r03.zip"; sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a"; }; @@ -1904,7 +1904,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-18_r03.zip; + url = "https://dl.google.com/android/repository/android-18_r03.zip"; sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb"; }; @@ -1920,7 +1920,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-19_r04.zip; + url = "https://dl.google.com/android/repository/android-19_r04.zip"; sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa"; }; @@ -1935,11 +1935,11 @@ displayName = "Android SDK Platform 2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/android-1.1_r1-linux.zip; + url = "https://dl.google.com/android/repository/android-1.1_r1-linux.zip"; sha1 = "c054d25c9b4c6251fa49c2f9c54336998679d3fe"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/android-1.1_r1-macosx.zip; + url = "https://dl.google.com/android/repository/android-1.1_r1-macosx.zip"; sha1 = "e21dbcff45b7356657449ebb3c7e941be2bb5ebe"; }; @@ -1955,7 +1955,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-20_r02.zip; + url = "https://dl.google.com/android/repository/android-20_r02.zip"; sha1 = "a9251f8a3f313ab05834a07a963000927637e01d"; }; @@ -1971,7 +1971,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-21_r02.zip; + url = "https://dl.google.com/android/repository/android-21_r02.zip"; sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c"; }; @@ -1987,7 +1987,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-22_r02.zip; + url = "https://dl.google.com/android/repository/android-22_r02.zip"; sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc"; }; @@ -2003,7 +2003,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/platform-23_r03.zip; + url = "https://dl.google.com/android/repository/platform-23_r03.zip"; sha1 = "027fede3de6aa1649115bbd0bffff30ccd51c9a0"; }; @@ -2019,7 +2019,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/platform-24_r02.zip; + url = "https://dl.google.com/android/repository/platform-24_r02.zip"; sha1 = "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee"; }; @@ -2035,7 +2035,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/platform-25_r03.zip; + url = "https://dl.google.com/android/repository/platform-25_r03.zip"; sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8"; }; @@ -2051,7 +2051,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/platform-26_r02.zip; + url = "https://dl.google.com/android/repository/platform-26_r02.zip"; sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef"; }; @@ -2067,7 +2067,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/platform-27_r03.zip; + url = "https://dl.google.com/android/repository/platform-27_r03.zip"; sha1 = "35f747e7e70b2d16e0e4246876be28d15ea1c353"; }; @@ -2083,7 +2083,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/platform-28_r06.zip; + url = "https://dl.google.com/android/repository/platform-28_r06.zip"; sha1 = "9a4e52b1d55bd2e24216b150aafae2503d3efba6"; }; @@ -2099,7 +2099,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/platform-29_r04.zip; + url = "https://dl.google.com/android/repository/platform-29_r04.zip"; sha1 = "8d644c39902038e0bd529165d5ba4f5a8607daea"; }; @@ -2114,11 +2114,11 @@ displayName = "Android SDK Platform 3"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/android-1.5_r04-linux.zip; + url = "https://dl.google.com/android/repository/android-1.5_r04-linux.zip"; sha1 = "5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/android-1.5_r04-macosx.zip; + url = "https://dl.google.com/android/repository/android-1.5_r04-macosx.zip"; sha1 = "d3a67c2369afa48b6c3c7624de5031c262018d1e"; }; @@ -2133,11 +2133,11 @@ displayName = "Android SDK Platform 4"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/android-1.6_r03-linux.zip; + url = "https://dl.google.com/android/repository/android-1.6_r03-linux.zip"; sha1 = "483ed088e45bbdf3444baaf9250c8b02e5383cb0"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/android-1.6_r03-macosx.zip; + url = "https://dl.google.com/android/repository/android-1.6_r03-macosx.zip"; sha1 = "bdafad44f5df9f127979bdb21a1fdd87ee3cd625"; }; @@ -2152,11 +2152,11 @@ displayName = "Android SDK Platform 5"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/android-2.0_r01-linux.zip; + url = "https://dl.google.com/android/repository/android-2.0_r01-linux.zip"; sha1 = "be9be6a99ca32875c96ec7f91160ca9fce7e3c7d"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/android-2.0_r01-macosx.zip; + url = "https://dl.google.com/android/repository/android-2.0_r01-macosx.zip"; sha1 = "2a866d0870dbba18e0503cd41e5fae988a21b314"; }; @@ -2171,11 +2171,11 @@ displayName = "Android SDK Platform 6"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/android-2.0.1_r01-linux.zip; + url = "https://dl.google.com/android/repository/android-2.0.1_r01-linux.zip"; sha1 = "ce2c971dce352aa28af06bda92a070116aa5ae1a"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/android-2.0.1_r01-macosx.zip; + url = "https://dl.google.com/android/repository/android-2.0.1_r01-macosx.zip"; sha1 = "c3096f80d75a6fc8cb38ef8a18aec920e53d42c0"; }; @@ -2191,7 +2191,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-2.1_r03.zip; + url = "https://dl.google.com/android/repository/android-2.1_r03.zip"; sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e"; }; @@ -2207,7 +2207,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-2.2_r03.zip; + url = "https://dl.google.com/android/repository/android-2.2_r03.zip"; sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202"; }; @@ -2223,7 +2223,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-2.3.1_r02.zip; + url = "https://dl.google.com/android/repository/android-2.3.1_r02.zip"; sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773"; }; @@ -2239,7 +2239,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/platform-R_r01.zip; + url = "https://dl.google.com/android/repository/platform-R_r01.zip"; sha1 = "f6ce3ef0ec8526550fc3b517bdb29051275bcd1a"; }; @@ -2254,11 +2254,11 @@ displayName = "Skia Parser Server"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/skiaparser-6172737-linux.zip; + url = "https://dl.google.com/android/repository/skiaparser-6172737-linux.zip"; sha1 = "d2eac6deff2c257d47853251bda5528c96a41720"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/skiaparser-6172737-mac.zip; + url = "https://dl.google.com/android/repository/skiaparser-6172737-mac.zip"; sha1 = "1e3b8da7a4f5e9887479b4e4186db3cb22422c82"; }; @@ -2274,7 +2274,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-14_r01.zip; + url = "https://dl.google.com/android/repository/sources-14_r01.zip"; sha1 = "eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555"; }; @@ -2290,7 +2290,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-15_r02.zip; + url = "https://dl.google.com/android/repository/sources-15_r02.zip"; sha1 = "e5992a5747c9590783fbbdd700337bf0c9f6b1fa"; }; @@ -2306,7 +2306,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-16_r02.zip; + url = "https://dl.google.com/android/repository/sources-16_r02.zip"; sha1 = "0f83c14ed333c45d962279ab5d6bc98a0269ef84"; }; @@ -2322,7 +2322,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-17_r01.zip; + url = "https://dl.google.com/android/repository/sources-17_r01.zip"; sha1 = "6f1f18cd2d2b1852d7f6892df9cee3823349d43a"; }; @@ -2338,7 +2338,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-18_r01.zip; + url = "https://dl.google.com/android/repository/sources-18_r01.zip"; sha1 = "8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78"; }; @@ -2354,7 +2354,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-19_r02.zip; + url = "https://dl.google.com/android/repository/sources-19_r02.zip"; sha1 = "433a1d043ef77561571250e94cb7a0ef24a202e7"; }; @@ -2370,7 +2370,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-20_r01.zip; + url = "https://dl.google.com/android/repository/sources-20_r01.zip"; sha1 = "8da3e40f2625f9f7ef38b7e403f49f67226c0d76"; }; @@ -2386,7 +2386,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-21_r01.zip; + url = "https://dl.google.com/android/repository/sources-21_r01.zip"; sha1 = "137a5044915d32bea297a8c1552684802bbc2e25"; }; @@ -2402,7 +2402,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-22_r01.zip; + url = "https://dl.google.com/android/repository/sources-22_r01.zip"; sha1 = "98320e13976d11597a4a730a8d203ac9a03ed5a6"; }; @@ -2418,7 +2418,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-23_r01.zip; + url = "https://dl.google.com/android/repository/sources-23_r01.zip"; sha1 = "b0f15da2762b42f543c5e364c2b15b198cc99cc2"; }; @@ -2434,7 +2434,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-24_r01.zip; + url = "https://dl.google.com/android/repository/sources-24_r01.zip"; sha1 = "6b96115830a83d654479f32ce4b724ca9011148b"; }; @@ -2450,7 +2450,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-25_r01.zip; + url = "https://dl.google.com/android/repository/sources-25_r01.zip"; sha1 = "bbc72efd1a9bad87cc507e308f0d29aad438c52c"; }; @@ -2466,7 +2466,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-26_r01.zip; + url = "https://dl.google.com/android/repository/sources-26_r01.zip"; sha1 = "2af701ee3223d580409288540b1d06932fd8f9b9"; }; @@ -2482,7 +2482,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-27_r01.zip; + url = "https://dl.google.com/android/repository/sources-27_r01.zip"; sha1 = "7b714670561d08f54751af42aca929867b806596"; }; @@ -2498,7 +2498,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-28_r01.zip; + url = "https://dl.google.com/android/repository/sources-28_r01.zip"; sha1 = "5610e0c24235ee3fa343c899ddd551be30315255"; }; @@ -2514,7 +2514,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-29_r01.zip; + url = "https://dl.google.com/android/repository/sources-29_r01.zip"; sha1 = "d0ad249e152b3a8fe3cb7c4a329453a048be29e4"; }; @@ -2529,11 +2529,11 @@ displayName = "Android SDK Tools 25.2.5"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/tools_r25.2.5-linux.zip; + url = "https://dl.google.com/android/repository/tools_r25.2.5-linux.zip"; sha1 = "72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/tools_r25.2.5-macosx.zip; + url = "https://dl.google.com/android/repository/tools_r25.2.5-macosx.zip"; sha1 = "d2168d963ac5b616e3d3ddaf21511d084baf3659"; }; @@ -2548,11 +2548,11 @@ displayName = "Android SDK Tools"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip; + url = "https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip"; sha1 = "ed85ea7b59bc3483ce0af4c198523ba044e083ad"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip; + url = "https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip"; sha1 = "8c7c28554a32318461802c1291d76fccfafde054"; }; @@ -2560,4 +2560,4 @@ }; } - \ No newline at end of file + diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix index d700a546a2463..22da6ee9800cf 100644 --- a/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix +++ b/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix @@ -7,7 +7,7 @@ revision = "21-android-tv-x86"; displayName = "Android TV Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-tv/x86-21_r03.zip; + url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-21_r03.zip"; sha1 = "2f8a1988188d6abfd6c6395baeb4471a034dc1e8"; }; }; @@ -17,7 +17,7 @@ revision = "21-android-tv-armeabi-v7a"; displayName = "Android TV ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-21_r03.zip; + url = "https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-21_r03.zip"; sha1 = "b63e28a47f11b639dd94981a458b7abfa89ac331"; }; }; @@ -27,7 +27,7 @@ revision = "22-android-tv-x86"; displayName = "Android TV Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-tv/x86-22_r03.zip; + url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-22_r03.zip"; sha1 = "c78efd5a155622eb490be9d326f5783993375c35"; }; }; @@ -37,7 +37,7 @@ revision = "23-android-tv-x86"; displayName = "Android TV Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-tv/x86-23_r19.zip; + url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-23_r19.zip"; sha1 = "47e8d6b08a337a0672f0f105bf907d39ed9457ec"; }; }; @@ -47,7 +47,7 @@ revision = "23-android-tv-armeabi-v7a"; displayName = "Android TV ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-23_r12.zip; + url = "https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-23_r12.zip"; sha1 = "bd84678ae8caf71d584f5210e866b2807e7b4b52"; }; }; @@ -57,7 +57,7 @@ revision = "24-android-tv-x86"; displayName = "Android TV Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-tv/x86-24_r20.zip; + url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-24_r20.zip"; sha1 = "0b8cd98dec9ebd04376ce4f6e270193ceae8acea"; }; }; @@ -67,7 +67,7 @@ revision = "25-android-tv-x86"; displayName = "Android TV Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-tv/x86-25_r14.zip; + url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-25_r14.zip"; sha1 = "1c88f11683375c059803c3a7be8e880cc23a6f9a"; }; }; @@ -77,7 +77,7 @@ revision = "26-android-tv-x86"; displayName = "Android TV Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-tv/x86-26_r12.zip; + url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-26_r12.zip"; sha1 = "d8b12e543925a0454403d2a854996a76410ec374"; }; }; @@ -87,7 +87,7 @@ revision = "27-android-tv-x86"; displayName = "Android TV Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-tv/x86-27_r07.zip; + url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-27_r07.zip"; sha1 = "5ed40e568c0d8d023c5b6c76634b22a477ed54aa"; }; }; @@ -97,7 +97,7 @@ revision = "28-android-tv-x86"; displayName = "Android TV Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-tv/x86-28_r08.zip; + url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-28_r08.zip"; sha1 = "f5f8f296dfaca7945434992761c8d47d50257c21"; }; }; @@ -107,8 +107,8 @@ revision = "Q-android-tv-x86"; displayName = "Android TV Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-tv/x86-Q_r01.zip; + url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-Q_r01.zip"; sha1 = "80c66ddce0dbe53fe6fedcade230d518112fffb1"; }; }; -} \ No newline at end of file +} diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix index 52fcc24bf88e1..36ff0b01cd6de 100644 --- a/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix +++ b/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix @@ -7,7 +7,7 @@ revision = "25-android-wear-armeabi-v7a"; displayName = "China version of Android Wear ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-wear-cn/armeabi-v7a-25_r04.zip; + url = "https://dl.google.com/android/repository/sys-img/android-wear-cn/armeabi-v7a-25_r04.zip"; sha1 = "02d7bc86df054d1e89fe5856b3af1d2c142cab41"; }; }; @@ -17,7 +17,7 @@ revision = "25-android-wear-x86"; displayName = "China version of Android Wear Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-25_r04.zip; + url = "https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-25_r04.zip"; sha1 = "73eab14c7cf2f6941e1fee61e0038ead7a2c7f4d"; }; }; @@ -27,7 +27,7 @@ revision = "26-android-wear-x86"; displayName = "China version of Android Wear Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-26_r04.zip; + url = "https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-26_r04.zip"; sha1 = "fdc8a313f889a2d6522de1fbc00ee9e13547d096"; }; }; @@ -37,8 +37,8 @@ revision = "28-android-wear-x86"; displayName = "China version of Wear OS Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-28_r03.zip; + url = "https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-28_r03.zip"; sha1 = "2099d87709c5e064273925dbf2cf1fd081bf0262"; }; }; -} \ No newline at end of file +} diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix index a2a1490d4aea2..e672c75031ff2 100644 --- a/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix +++ b/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix @@ -7,7 +7,7 @@ revision = "23-android-wear-armeabi-v7a"; displayName = "Android Wear ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-23_r06.zip; + url = "https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-23_r06.zip"; sha1 = "0df5d34b1cdaaaa3805a2f06bb889901eabe2e71"; }; }; @@ -17,7 +17,7 @@ revision = "23-android-wear-x86"; displayName = "Android Wear Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-wear/x86-23_r06.zip; + url = "https://dl.google.com/android/repository/sys-img/android-wear/x86-23_r06.zip"; sha1 = "3b15c123f3f71459d5b60c1714d49c5d90a5525e"; }; }; @@ -27,7 +27,7 @@ revision = "25-android-wear-armeabi-v7a"; displayName = "Android Wear ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-25_r03.zip; + url = "https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-25_r03.zip"; sha1 = "76d3568a4e08023047af7d13025a35c9bf1d7e5c"; }; }; @@ -37,7 +37,7 @@ revision = "25-android-wear-x86"; displayName = "Android Wear Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-wear/x86-25_r03.zip; + url = "https://dl.google.com/android/repository/sys-img/android-wear/x86-25_r03.zip"; sha1 = "693fce7b487a65491a4e88e9f740959688c9dbe6"; }; }; @@ -47,7 +47,7 @@ revision = "26-android-wear-x86"; displayName = "Android Wear Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-wear/x86-26_r04.zip; + url = "https://dl.google.com/android/repository/sys-img/android-wear/x86-26_r04.zip"; sha1 = "fbffa91b936ca18fcc1e0bab2b52a8b0835cbb1c"; }; }; @@ -57,8 +57,8 @@ revision = "28-android-wear-x86"; displayName = "Wear OS Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android-wear/x86-28_r03.zip; + url = "https://dl.google.com/android/repository/sys-img/android-wear/x86-28_r03.zip"; sha1 = "b80bd53ab69f19441714bff2e4d55931e6d3f7be"; }; }; -} \ No newline at end of file +} diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android.nix b/pkgs/development/mobile/androidenv/generated/system-images-android.nix index 043529cb23804..f5863cb0d4e84 100644 --- a/pkgs/development/mobile/androidenv/generated/system-images-android.nix +++ b/pkgs/development/mobile/androidenv/generated/system-images-android.nix @@ -7,7 +7,7 @@ revision = "10-default-armeabi-v7a"; displayName = "ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-10_r05.zip; + url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-10_r05.zip"; sha1 = "8537616a7add47cce24c60f18bc2429e3dc90ae3"; }; }; @@ -17,7 +17,7 @@ revision = "14-default-armeabi-v7a"; displayName = "ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip; + url = "https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip"; sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b"; }; }; @@ -27,7 +27,7 @@ revision = "15-default-armeabi-v7a"; displayName = "ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r05.zip; + url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r05.zip"; sha1 = "03d7ed95a9d3b107e3f2e5b166d017ea12529e70"; }; }; @@ -37,7 +37,7 @@ revision = "16-default-armeabi-v7a"; displayName = "ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-16_r06.zip; + url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-16_r06.zip"; sha1 = "69b944b0d5a18c8563fa80d7d229af64890f724e"; }; }; @@ -47,7 +47,7 @@ revision = "17-default-armeabi-v7a"; displayName = "ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r06.zip; + url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r06.zip"; sha1 = "a18a3fd0958ec4ef52507f58e414fc5c7dfd59d6"; }; }; @@ -57,7 +57,7 @@ revision = "18-default-armeabi-v7a"; displayName = "ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r05.zip; + url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r05.zip"; sha1 = "580b583720f7de671040d5917c8c9db0c7aa03fd"; }; }; @@ -67,7 +67,7 @@ revision = "19-default-armeabi-v7a"; displayName = "ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip; + url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip"; sha1 = "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa"; }; }; @@ -77,7 +77,7 @@ revision = "21-default-armeabi-v7a"; displayName = "ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip; + url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip"; sha1 = "8c606f81306564b65e41303d2603e4c42ded0d10"; }; }; @@ -87,7 +87,7 @@ revision = "22-default-armeabi-v7a"; displayName = "ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip; + url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip"; sha1 = "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1"; }; }; @@ -97,7 +97,7 @@ revision = "23-default-armeabi-v7a"; displayName = "ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip; + url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip"; sha1 = "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d"; }; }; @@ -107,7 +107,7 @@ revision = "24-default-armeabi-v7a"; displayName = "ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip; + url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip"; sha1 = "3454546b4eed2d6c3dd06d47757d6da9f4176033"; }; }; @@ -117,7 +117,7 @@ revision = "24-default-arm64-v8a"; displayName = "ARM 64 v8a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r07.zip; + url = "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r07.zip"; sha1 = "e8ab2e49e4efe4b064232b33b5eeaded61437d7f"; }; }; @@ -127,7 +127,7 @@ revision = "16-default-mips"; displayName = "MIPS System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip; + url = "https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip"; sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e"; }; }; @@ -137,7 +137,7 @@ revision = "17-default-mips"; displayName = "MIPS System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip; + url = "https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip"; sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d"; }; }; @@ -147,7 +147,7 @@ revision = "10-default-x86"; displayName = "Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-10_r05.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86-10_r05.zip"; sha1 = "a166d5ccbb165e1dd5464fbfeec30a61f77790d8"; }; }; @@ -157,7 +157,7 @@ revision = "15-default-x86"; displayName = "Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-15_r05.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86-15_r05.zip"; sha1 = "c387e0efed2cdc610e5944eea67b7b692d03760c"; }; }; @@ -167,7 +167,7 @@ revision = "16-default-x86"; displayName = "Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-16_r06.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86-16_r06.zip"; sha1 = "bf1bf8c5591346118d2235da1ad20e7be8a3e9cd"; }; }; @@ -177,7 +177,7 @@ revision = "17-default-x86"; displayName = "Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-17_r04.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86-17_r04.zip"; sha1 = "03c6d022ab2dcbbcf655d78ba5ccb0431cadcaec"; }; }; @@ -187,7 +187,7 @@ revision = "18-default-x86"; displayName = "Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-18_r04.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86-18_r04.zip"; sha1 = "7a4ced4d9b0ab48047825491b4072dc2eb9b610e"; }; }; @@ -197,7 +197,7 @@ revision = "19-default-x86"; displayName = "Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip"; sha1 = "2ac82153aae97f7eae4c5a0761224fe04321d03d"; }; }; @@ -207,7 +207,7 @@ revision = "21-default-x86"; displayName = "Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip"; sha1 = "00f0eb0a1003efe3316347f762e20a85d8749cff"; }; }; @@ -217,7 +217,7 @@ revision = "22-default-x86"; displayName = "Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip"; sha1 = "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e"; }; }; @@ -227,7 +227,7 @@ revision = "23-default-x86"; displayName = "Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip"; sha1 = "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb"; }; }; @@ -237,7 +237,7 @@ revision = "24-default-x86"; displayName = "Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip"; sha1 = "c1cae7634b0216c0b5990f2c144eb8ca948e3511"; }; }; @@ -247,7 +247,7 @@ revision = "25-default-x86"; displayName = "Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-25_r01.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86-25_r01.zip"; sha1 = "78ce7eb1387d598685633b9f7cbb300c3d3aeb5f"; }; }; @@ -257,7 +257,7 @@ revision = "26-default-x86"; displayName = "Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-26_r01.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86-26_r01.zip"; sha1 = "e613d6e0da668e30daf547f3c6627a6352846f90"; }; }; @@ -267,7 +267,7 @@ revision = "27-default-x86"; displayName = "Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-27_r01.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86-27_r01.zip"; sha1 = "4ec990fac7b62958decd12e18a4cd389dfe7c582"; }; }; @@ -277,7 +277,7 @@ revision = "28-default-x86"; displayName = "Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-28_r04.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86-28_r04.zip"; sha1 = "ce03c42d80c0fc6dc47f6455dbee7aa275d02780"; }; }; @@ -287,7 +287,7 @@ revision = "21-default-x86_64"; displayName = "Intel x86 Atom_64 System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip"; sha1 = "9078a095825a69e5e215713f0866c83cef65a342"; }; }; @@ -297,7 +297,7 @@ revision = "22-default-x86_64"; displayName = "Intel x86 Atom_64 System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip"; sha1 = "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4"; }; }; @@ -307,7 +307,7 @@ revision = "23-default-x86_64"; displayName = "Intel x86 Atom_64 System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip"; sha1 = "7cbc291483ca07dc67b71268c5f08a5755f50f51"; }; }; @@ -317,7 +317,7 @@ revision = "24-default-x86_64"; displayName = "Intel x86 Atom_64 System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip"; sha1 = "f6559e1949a5879f31a9662f4f0e50ad60181684"; }; }; @@ -327,7 +327,7 @@ revision = "25-default-x86_64"; displayName = "Intel x86 Atom_64 System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-25_r01.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86_64-25_r01.zip"; sha1 = "7093d7b39216020226ff430a3b7b81c94d31ad37"; }; }; @@ -337,7 +337,7 @@ revision = "26-default-x86_64"; displayName = "Intel x86 Atom_64 System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-26_r01.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86_64-26_r01.zip"; sha1 = "432f149c048bffce7f9de526ec65b336daf7a0a3"; }; }; @@ -347,7 +347,7 @@ revision = "27-default-x86_64"; displayName = "Intel x86 Atom_64 System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-27_r01.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86_64-27_r01.zip"; sha1 = "2878261011a59ca3de29dc5b457a495fdb268d60"; }; }; @@ -357,7 +357,7 @@ revision = "28-default-x86_64"; displayName = "Intel x86 Atom_64 System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-28_r04.zip; + url = "https://dl.google.com/android/repository/sys-img/android/x86_64-28_r04.zip"; sha1 = "d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0"; }; }; diff --git a/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix b/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix index 68af1ea568952..a67ce9cfea403 100644 --- a/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix +++ b/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix @@ -7,7 +7,7 @@ revision = "10-google_apis-armeabi-v7a"; displayName = "Google APIs ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-10_r06.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-10_r06.zip"; sha1 = "970abf3a2a9937a43576afd9bb56e4a8191947f8"; }; }; @@ -17,7 +17,7 @@ revision = "10-google_apis-x86"; displayName = "Google APIs Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86-10_r06.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-10_r06.zip"; sha1 = "070a9552e3d358d8e72e8b2042e539e2b7a1b035"; }; }; @@ -27,7 +27,7 @@ revision = "15-google_apis-x86"; displayName = "Google APIs Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86-15_r06.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-15_r06.zip"; sha1 = "a7deb32c12396b6c4fd60ad14a62e19f8bdcae20"; }; }; @@ -37,7 +37,7 @@ revision = "15-google_apis-armeabi-v7a"; displayName = "Google APIs ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-15_r06.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-15_r06.zip"; sha1 = "6deb76cf34760a6037cb18d89772c9e986d07497"; }; }; @@ -47,7 +47,7 @@ revision = "16-google_apis-armeabi-v7a"; displayName = "Google APIs ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-16_r06.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-16_r06.zip"; sha1 = "5a5ff097680c6dae473c8719296ce6d7b70edb2d"; }; }; @@ -57,7 +57,7 @@ revision = "16-google_apis-x86"; displayName = "Google APIs Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86-16_r06.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-16_r06.zip"; sha1 = "b57adef2f43dd176b8c02c980c16a796021b2071"; }; }; @@ -67,7 +67,7 @@ revision = "17-google_apis-armeabi-v7a"; displayName = "Google APIs ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-17_r06.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-17_r06.zip"; sha1 = "a59f26cb5707da97e869a27d87b83477204ac594"; }; }; @@ -77,7 +77,7 @@ revision = "17-google_apis-x86"; displayName = "Google APIs Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86-17_r06.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-17_r06.zip"; sha1 = "7864c34faf0402b8923d8c6e609a5339f74cc8d6"; }; }; @@ -87,7 +87,7 @@ revision = "18-google_apis-armeabi-v7a"; displayName = "Google APIs ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-18_r06.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-18_r06.zip"; sha1 = "7faaccabbcc5f08e410436d3f63eea42521ea974"; }; }; @@ -97,7 +97,7 @@ revision = "18-google_apis-x86"; displayName = "Google APIs Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86-18_r06.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-18_r06.zip"; sha1 = "dd674d719cad61602702be4b3d98edccfbfea53e"; }; }; @@ -107,7 +107,7 @@ revision = "19-google_apis-x86"; displayName = "Google APIs Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86-19_r38.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-19_r38.zip"; sha1 = "928e4ec82876c61ef53451425d10ccb840cdd0f2"; }; }; @@ -117,7 +117,7 @@ revision = "19-google_apis-armeabi-v7a"; displayName = "Google APIs ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-19_r38.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-19_r38.zip"; sha1 = "434edd2ddc39d1ca083a5fa9721c0db8ab804737"; }; }; @@ -127,7 +127,7 @@ revision = "21-google_apis-x86"; displayName = "Google APIs Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86-21_r30.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-21_r30.zip"; sha1 = "37548caae9e2897fb1d2b15f7fcf624c714cb610"; }; }; @@ -137,7 +137,7 @@ revision = "21-google_apis-x86_64"; displayName = "Google APIs Intel x86 Atom_64 System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86_64-21_r30.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-21_r30.zip"; sha1 = "82d34fdaae2916bd4d48a4f144db51e4e5719aa4"; }; }; @@ -147,7 +147,7 @@ revision = "21-google_apis-armeabi-v7a"; displayName = "Google APIs ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-21_r30.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-21_r30.zip"; sha1 = "bbdbbb3c4387752a8f28718a3190d901c0378058"; }; }; @@ -157,7 +157,7 @@ revision = "22-google_apis-x86"; displayName = "Google APIs Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86-22_r24.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-22_r24.zip"; sha1 = "e4cd95b1c0837fc12d6544742e82d8ef344c8758"; }; }; @@ -167,7 +167,7 @@ revision = "22-google_apis-armeabi-v7a"; displayName = "Google APIs ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-22_r24.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-22_r24.zip"; sha1 = "d2b7ca5f8259c6e4b3cfa5a0d77e4a088899cfb0"; }; }; @@ -177,7 +177,7 @@ revision = "22-google_apis-x86_64"; displayName = "Google APIs Intel x86 Atom_64 System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86_64-22_r24.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-22_r24.zip"; sha1 = "cde738f9353606af69ad7b4e625c957a4d603f27"; }; }; @@ -187,7 +187,7 @@ revision = "23-google_apis-x86"; displayName = "Google APIs Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86-23_r31.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-23_r31.zip"; sha1 = "877cf79f5198fa53351eab08ba9ce162dc84f7ba"; }; }; @@ -197,7 +197,7 @@ revision = "23-google_apis-x86_64"; displayName = "Google APIs Intel x86 Atom_64 System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86_64-23_r31.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-23_r31.zip"; sha1 = "342c39df061804ee0d5bc671147e90dead3d6665"; }; }; @@ -207,7 +207,7 @@ revision = "23-google_apis-armeabi-v7a"; displayName = "Google APIs ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-23_r31.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-23_r31.zip"; sha1 = "da0a07800b4eec53fcdb2e5c3b69a9a5d7a6b8a6"; }; }; @@ -217,7 +217,7 @@ revision = "24-google_apis-x86"; displayName = "Google APIs Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86-24_r25.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-24_r25.zip"; sha1 = "53dba25eed8359aba394a1be1c7ccb741a459ec0"; }; }; @@ -227,7 +227,7 @@ revision = "24-google_apis-x86_64"; displayName = "Google APIs Intel x86 Atom_64 System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86_64-24_r25.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-24_r25.zip"; sha1 = "d757dd13ad9b0ba4dd872660e31b6506f60dcf32"; }; }; @@ -237,7 +237,7 @@ revision = "24-google_apis-armeabi-v7a"; displayName = "Google APIs ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-24_r25.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-24_r25.zip"; sha1 = "9a0ec5e9a239a7a6889364e44e9fa4fcd0052c6b"; }; }; @@ -247,7 +247,7 @@ revision = "24-google_apis-arm64-v8a"; displayName = "Google APIs ARM 64 v8a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-24_r25.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-24_r25.zip"; sha1 = "5ff407d439e3c595ce9221f445a31dcc35df5a86"; }; }; @@ -257,7 +257,7 @@ revision = "25-google_apis-x86"; displayName = "Google APIs Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86-25_r16.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-25_r16.zip"; sha1 = "562e3335c6334b8d1947bb9efb90f8d82f2d3e4d"; }; }; @@ -267,7 +267,7 @@ revision = "25-google_apis-x86_64"; displayName = "Google APIs Intel x86 Atom_64 System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86_64-25_r16.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-25_r16.zip"; sha1 = "e08b94903631d58964467b0b310c93642d85df6c"; }; }; @@ -277,7 +277,7 @@ revision = "25-google_apis-armeabi-v7a"; displayName = "Google APIs ARM EABI v7a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-25_r16.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-25_r16.zip"; sha1 = "4c49e0edb845b0bf1f231cb0e8598b1a9f9aa9c8"; }; }; @@ -287,7 +287,7 @@ revision = "25-google_apis-arm64-v8a"; displayName = "Google APIs ARM 64 v8a System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-25_r16.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-25_r16.zip"; sha1 = "33ffbd335d9a6dc8d9843469d0963091566b3167"; }; }; @@ -297,7 +297,7 @@ revision = "26-google_apis-x86"; displayName = "Google APIs Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86-26_r14.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-26_r14.zip"; sha1 = "935da6794d5f64f7ae20a1f352929cb7e3b20cba"; }; }; @@ -307,7 +307,7 @@ revision = "26-google_apis-x86_64"; displayName = "Google APIs Intel x86 Atom_64 System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86_64-26_r14.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-26_r14.zip"; sha1 = "965631f0554ca9027ac465ba147baa6a6a22fcce"; }; }; @@ -317,7 +317,7 @@ revision = "27-google_apis-x86"; displayName = "Google APIs Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86-27_r09.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-27_r09.zip"; sha1 = "ab009fc1308ded01539af4f8233b252d411145bc"; }; }; @@ -327,7 +327,7 @@ revision = "28-google_apis-x86"; displayName = "Google APIs Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86-28_r09.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-28_r09.zip"; sha1 = "7c84ba5cbc009132ce38df52830c17b9bffc54bb"; }; }; @@ -337,7 +337,7 @@ revision = "28-google_apis-x86_64"; displayName = "Google APIs Intel x86 Atom_64 System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86_64-28_r09.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-28_r09.zip"; sha1 = "eeb066346d29194e5b9387a0c0dd0f9e2a570b70"; }; }; @@ -347,7 +347,7 @@ revision = "29-google_apis-x86"; displayName = "Google APIs Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86-29_r09.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-29_r09.zip"; sha1 = "33d71d17138ea322dec2dea6d8198aebf4767ab3"; }; }; @@ -357,7 +357,7 @@ revision = "29-google_apis-x86_64"; displayName = "Google APIs Intel x86 Atom_64 System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86_64-29_r09.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-29_r09.zip"; sha1 = "0aa76b20a7ad30f2e41bc21b897b848d82533d26"; }; }; @@ -367,7 +367,7 @@ revision = "R-google_apis-x86"; displayName = "Google APIs Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86-R_r01.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-R_r01.zip"; sha1 = "4e260bef94760eecba3224b68c1a4fed0fb89485"; }; }; @@ -377,8 +377,8 @@ revision = "R-google_apis-x86_64"; displayName = "Google APIs Intel x86 Atom_64 System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86_64-R_r01.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-R_r01.zip"; sha1 = "ae12e1c3e1b36043a299359850e9315f47262f81"; }; }; -} \ No newline at end of file +} diff --git a/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix b/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix index edc22ac2d7b6a..554f4b2df99e9 100644 --- a/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix +++ b/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix @@ -7,7 +7,7 @@ revision = "24-google_apis_playstore-x86"; displayName = "Google Play Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-24_r19.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-24_r19.zip"; sha1 = "b52e9593ffdde65c1a0970256a32e8967c89cc22"; }; }; @@ -17,7 +17,7 @@ revision = "25-google_apis_playstore-x86"; displayName = "Google Play Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-25_r09.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-25_r09.zip"; sha1 = "6f6668954f7fd52f896fe7528aa122028c9b026c"; }; }; @@ -27,7 +27,7 @@ revision = "26-google_apis_playstore-x86"; displayName = "Google Play Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-26_r07.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-26_r07.zip"; sha1 = "2c8bee7b97a309f099941532e63c42a7d4a06e19"; }; }; @@ -37,7 +37,7 @@ revision = "27-google_apis_playstore-x86"; displayName = "Google Play Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-27_r03.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-27_r03.zip"; sha1 = "eb5a944ceb691ca0648d0a6f0d93893a47223b5d"; }; }; @@ -47,7 +47,7 @@ revision = "28-google_apis_playstore-x86"; displayName = "Google Play Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-28_r08.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-28_r08.zip"; sha1 = "5381f9d52a3bf1967c9c92a25b20012cd68764c8"; }; }; @@ -57,7 +57,7 @@ revision = "28-google_apis_playstore-x86_64"; displayName = "Google Play Intel x86 Atom_64 System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-28_r08.zip; + url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-28_r08.zip"; sha1 = "a767da996fdea7a1f5632a9206fa5c009d6e580c"; }; }; diff --git a/pkgs/development/mobile/androidenv/tools.nix b/pkgs/development/mobile/androidenv/tools.nix index 92f53e5a7c20c..f535672d35ea5 100644 --- a/pkgs/development/mobile/androidenv/tools.nix +++ b/pkgs/development/mobile/androidenv/tools.nix @@ -8,11 +8,11 @@ if toolsVersion == "26.0.1" then import ./tools/26.nix { revision = "26.0.1"; archives = { linux = requireFile { - url = https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip; + url = "https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip"; sha256 = "185yq7qwxflw24ccm5d6zziwlc9pxmsm3f54pm9p7xm0ik724kj4"; }; macosx = requireFile { - url = https://dl.google.com/android/repository/sdk-tools-darwin-3859397.zip; + url = "https://dl.google.com/android/repository/sdk-tools-darwin-3859397.zip"; sha256 = "1ycx9gzdaqaw6n19yvxjawywacavn1jc6sadlz5qikhgfr57b0aa"; }; }; diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 355608ca02e5d..5ccf07de2f53a 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -2,20 +2,20 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.2) - activesupport (4.2.11.1) + activesupport (4.2.11.3) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - algoliasearch (1.27.1) + algoliasearch (1.27.2) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.9.1) + cocoapods (1.9.2) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.9.1) + cocoapods-core (= 1.9.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -31,7 +31,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.14.0, < 2.0) - cocoapods-core (1.9.1) + cocoapods-core (1.9.2) activesupport (>= 4.0.2, < 6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) @@ -45,10 +45,10 @@ GEM nap cocoapods-search (1.0.0) cocoapods-stats (1.1.0) - cocoapods-trunk (1.4.1) + cocoapods-trunk (1.5.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) - cocoapods-try (1.1.0) + cocoapods-try (1.2.0) colored2 (3.1.2) concurrent-ruby (1.1.6) escape (0.0.4) @@ -62,18 +62,18 @@ GEM i18n (0.9.5) concurrent-ruby (~> 1.0) json (2.3.0) - minitest (5.14.0) + minitest (5.14.1) molinillo (0.6.6) nanaimo (0.2.6) nap (1.1.0) netrc (0.11.0) ruby-macho (1.4.0) thread_safe (0.3.6) - typhoeus (1.3.1) + typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.6) + tzinfo (1.2.7) thread_safe (~> 0.1) - xcodeproj (1.15.0) + xcodeproj (1.16.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -87,4 +87,4 @@ DEPENDENCIES cocoapods (>= 1.7.0.beta.1)! BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index b8db94ca06afc..1c77634cbfb4a 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -2,20 +2,20 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.2) - activesupport (4.2.11.1) + activesupport (4.2.11.3) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - algoliasearch (1.27.1) + algoliasearch (1.27.2) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.9.1) + cocoapods (1.9.2) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.9.1) + cocoapods-core (= 1.9.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -31,7 +31,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.14.0, < 2.0) - cocoapods-core (1.9.1) + cocoapods-core (1.9.2) activesupport (>= 4.0.2, < 6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) @@ -45,10 +45,10 @@ GEM nap cocoapods-search (1.0.0) cocoapods-stats (1.1.0) - cocoapods-trunk (1.4.1) + cocoapods-trunk (1.5.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) - cocoapods-try (1.1.0) + cocoapods-try (1.2.0) colored2 (3.1.2) concurrent-ruby (1.1.6) escape (0.0.4) @@ -62,18 +62,18 @@ GEM i18n (0.9.5) concurrent-ruby (~> 1.0) json (2.3.0) - minitest (5.14.0) + minitest (5.14.1) molinillo (0.6.6) nanaimo (0.2.6) nap (1.1.0) netrc (0.11.0) ruby-macho (1.4.0) thread_safe (0.3.6) - typhoeus (1.3.1) + typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.6) + tzinfo (1.2.7) thread_safe (~> 0.1) - xcodeproj (1.15.0) + xcodeproj (1.16.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/mobile/cocoapods/default.nix b/pkgs/development/mobile/cocoapods/default.nix index c235b9e9a1266..f0d1a3b89d0b7 100644 --- a/pkgs/development/mobile/cocoapods/default.nix +++ b/pkgs/development/mobile/cocoapods/default.nix @@ -14,7 +14,7 @@ bundlerApp { meta = with lib; { description = "CocoaPods manages dependencies for your Xcode projects."; - homepage = https://github.com/CocoaPods/CocoaPods; + homepage = "https://github.com/CocoaPods/CocoaPods"; license = licenses.mit; platforms = platforms.darwin; maintainers = with maintainers; [ diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index 1a5912b89e8eb..5215312926299 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6"; + sha256 = "0wp36wi3r3dscmcr0q6sbz13hr5h911c24ar7zrmmcy7p32ial2i"; type = "gem"; }; - version = "4.2.11.1"; + version = "4.2.11.3"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ayg8j3819ay2d8618jv32ca16fh8qsgjsiq9j32yd016c170nkj"; + sha256 = "1b3xk42ry6dlsqn379p884zdi4iyra67xh45rwl6vcrwmrnbq7f0"; type = "gem"; }; - version = "1.27.1"; + version = "1.27.2"; }; atomos = { groups = ["default"]; @@ -57,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wxr81qy4jsbxl066nlfp8zlqk31i6fsmd7f01xmi9bv04990hrs"; + sha256 = "0zxr5din9m8zf3mynywn4qmk3af9f5anx189i4md19c1iinkbb36"; type = "gem"; }; - version = "1.9.1"; + version = "1.9.2"; }; cocoapods-core = { dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c1679fkyp06dwsh93r0ldzly9vc74g0br4jdngwvdl4g0j4fyzc"; + sha256 = "13qhkglivmmiv0j88l4d8anw66zdy89lg1qqk4vpvavsm7s7ls6p"; type = "gem"; }; - version = "1.9.1"; + version = "1.9.2"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -130,20 +130,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vrwsgaq3nf7v3pwksgqy0mhswrp3ipczrc96vl3ii2pcc9ilwkw"; + sha256 = "12c6028bmdwrbqcb49mr5qj1p3vcijnjqbsbzywfx1isp44j9mv5"; type = "gem"; }; - version = "1.4.1"; + version = "1.5.0"; }; cocoapods-try = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gf2zjmcjhh9psq15yfy82wz5jnlihf5bcw79f8hlv4cnqyspncj"; + sha256 = "1znyp625rql37ivb5rk9fk9564cmax8icxfr041ysivpdrn98nql"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; colored2 = { groups = ["default"]; @@ -262,10 +262,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; + sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; type = "gem"; }; - version = "5.14.0"; + version = "5.14.1"; }; molinillo = { groups = ["default"]; @@ -333,10 +333,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5"; + sha256 = "1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; tzinfo = { dependencies = ["thread_safe"]; @@ -344,10 +344,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; xcodeproj = { dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; @@ -355,9 +355,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ldb1jckfzkk9c74nv500z0q936nn25fn5mywzwrh7sjwgkaxp5z"; + sha256 = "1bkk8y6lzd86w9yx72hd1nil3fkk5f0v3il9vm554gzpl6dhc2bi"; type = "gem"; }; - version = "1.15.0"; + version = "1.16.0"; }; } \ No newline at end of file diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix index 4d4979d56206b..9c0ed2d5fa267 100644 --- a/pkgs/development/mobile/cocoapods/gemset.nix +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6"; + sha256 = "0wp36wi3r3dscmcr0q6sbz13hr5h911c24ar7zrmmcy7p32ial2i"; type = "gem"; }; - version = "4.2.11.1"; + version = "4.2.11.3"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ayg8j3819ay2d8618jv32ca16fh8qsgjsiq9j32yd016c170nkj"; + sha256 = "1b3xk42ry6dlsqn379p884zdi4iyra67xh45rwl6vcrwmrnbq7f0"; type = "gem"; }; - version = "1.27.1"; + version = "1.27.2"; }; atomos = { source = { @@ -55,10 +55,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wxr81qy4jsbxl066nlfp8zlqk31i6fsmd7f01xmi9bv04990hrs"; + sha256 = "0zxr5din9m8zf3mynywn4qmk3af9f5anx189i4md19c1iinkbb36"; type = "gem"; }; - version = "1.9.1"; + version = "1.9.2"; }; cocoapods-core = { dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"]; @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c1679fkyp06dwsh93r0ldzly9vc74g0br4jdngwvdl4g0j4fyzc"; + sha256 = "13qhkglivmmiv0j88l4d8anw66zdy89lg1qqk4vpvavsm7s7ls6p"; type = "gem"; }; - version = "1.9.1"; + version = "1.9.2"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -124,18 +124,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vrwsgaq3nf7v3pwksgqy0mhswrp3ipczrc96vl3ii2pcc9ilwkw"; + sha256 = "12c6028bmdwrbqcb49mr5qj1p3vcijnjqbsbzywfx1isp44j9mv5"; type = "gem"; }; - version = "1.4.1"; + version = "1.5.0"; }; cocoapods-try = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gf2zjmcjhh9psq15yfy82wz5jnlihf5bcw79f8hlv4cnqyspncj"; + sha256 = "1znyp625rql37ivb5rk9fk9564cmax8icxfr041ysivpdrn98nql"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; colored2 = { source = { @@ -244,10 +246,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; + sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; type = "gem"; }; - version = "5.14.0"; + version = "5.14.1"; }; molinillo = { source = { @@ -305,10 +307,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5"; + sha256 = "1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; tzinfo = { dependencies = ["thread_safe"]; @@ -316,10 +318,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; xcodeproj = { dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; @@ -327,9 +329,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ldb1jckfzkk9c74nv500z0q936nn25fn5mywzwrh7sjwgkaxp5z"; + sha256 = "1bkk8y6lzd86w9yx72hd1nil3fkk5f0v3il9vm554gzpl6dhc2bi"; type = "gem"; }; - version = "1.15.0"; + version = "1.16.0"; }; } \ No newline at end of file diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index f78a10d826631..84c42c895ce1c 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.flashtool.net/; + homepage = "http://www.flashtool.net/"; description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra"; license = stdenv.lib.licenses.unfreeRedistributableFirmware; platforms = [ "i686-linux" ]; diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index 0ea74377a5fc9..72a376d39a819 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { pre-configured Android (x86 with OpenGL hardware acceleration) images, suitable for application testing. ''; - homepage = https://www.genymotion.com/; + homepage = "https://www.genymotion.com/"; license = stdenv.lib.licenses.unfree; platforms = ["x86_64-linux"]; maintainers = [ stdenv.lib.maintainers.puffnfresh ]; diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/development/mobile/imgpatchtools/default.nix index 706fa2c65998a..fd14a73e2ce71 100644 --- a/pkgs/development/mobile/imgpatchtools/default.nix +++ b/pkgs/development/mobile/imgpatchtools/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { utility. It also includes other, related, but arguably more advanced tools for OTA manipulation. ''; - homepage = https://github.com/erfanoabdi/imgpatchtools; + homepage = "https://github.com/erfanoabdi/imgpatchtools"; license = licenses.gpl3; maintainers = with maintainers; [ yegortimoshenko ]; platforms = platforms.linux; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix index 5c1cd0a265ab6..f471dc977b3da 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix @@ -4,7 +4,7 @@ let # Gradle is a build system that bootstraps itself. This is what it actually # downloads in the bootstrap phase. gradleAllZip = fetchurl { - url = http://services.gradle.org/distributions/gradle-4.1-all.zip; + url = "http://services.gradle.org/distributions/gradle-4.1-all.zip"; sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw"; }; @@ -55,11 +55,11 @@ in stdenv.mkDerivation { name = "mobilesdk-7.5.1.GA"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = https://builds.appcelerator.com/mobile/7_5_X/mobilesdk-7.5.1.v20190124152315-linux.zip; + url = "https://builds.appcelerator.com/mobile/7_5_X/mobilesdk-7.5.1.v20190124152315-linux.zip"; sha256 = "1ihyh6szl9a2gbdgv13msd3g7i3xi9ifmgsh6v562hqlfi4lixng"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = https://builds.appcelerator.com/mobile/7_5_X/mobilesdk-7.5.1.v20190124152315-osx.zip; + url = "https://builds.appcelerator.com/mobile/7_5_X/mobilesdk-7.5.1.v20190124152315-osx.zip"; sha256 = "1whs1j7fkk2hxr4nxq50d7ic5wj83b1i1jl0p722sqbvkmgxssa2"; } else throw "Platform: ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix index 45523fad90820..2af53a63b58dc 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix @@ -4,7 +4,7 @@ let # Gradle is a build system that bootstraps itself. This is what it actually # downloads in the bootstrap phase. gradleAllZip = fetchurl { - url = http://services.gradle.org/distributions/gradle-4.1-all.zip; + url = "http://services.gradle.org/distributions/gradle-4.1-all.zip"; sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw"; }; @@ -55,11 +55,11 @@ in stdenv.mkDerivation { name = "mobilesdk-8.2.1.GA"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-linux.zip; + url = "https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-linux.zip"; sha256 = "1nvcmm6cby6bmwdiacq46n5y4zjpz9qlipakvglw27j3p4rbmkwl"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-osx.zip; + url = "https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-osx.zip"; sha256 = "1nxwmyw3vqc5wghj38kpksisy0i808x0x3pa8w3p290w709g311l"; } else throw "Platform: ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix index b8e6b5a2271d3..b995a566f5293 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix @@ -4,7 +4,7 @@ let # Gradle is a build system that bootstraps itself. This is what it actually # downloads in the bootstrap phase. gradleAllZip = fetchurl { - url = http://services.gradle.org/distributions/gradle-4.1-all.zip; + url = "http://services.gradle.org/distributions/gradle-4.1-all.zip"; sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw"; }; @@ -55,11 +55,11 @@ in stdenv.mkDerivation { name = "mobilesdk-8.3.2.GA"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-linux.zip; + url = "https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-linux.zip"; sha256 = "04pfw21jrx9w259lphynwykqjk4c9hm0zix4d40s7mf8mmh3xdx9"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-osx.zip; + url = "https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-osx.zip"; sha256 = "1zflq5hc96lrriw71ya623kkskkisi9yayg8qs03zimi0gksizxw"; } else throw "Platform: ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix index 4d62dd305d3a7..932ec0e59d64a 100644 --- a/pkgs/development/mobile/webos/novacomd.nix +++ b/pkgs/development/mobile/webos/novacomd.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, webos, cmake, pkgconfig, -libusb }: +libusb-compat-0_1 }: stdenv.mkDerivation rec { pname = "novacomd"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig webos.cmake-modules ]; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; cmakeFlags = [ "-DWEBOS_TARGET_MACHINE_IMPL=host" ]; diff --git a/pkgs/development/mobile/xpwn/default.nix b/pkgs/development/mobile/xpwn/default.nix index 9ec5977d59472..0c49a29b32227 100644 --- a/pkgs/development/mobile/xpwn/default.nix +++ b/pkgs/development/mobile/xpwn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, libpng, bzip2, libusb, openssl }: +{ stdenv, fetchFromGitHub, cmake, zlib, libpng, bzip2, libusb-compat-0_1, openssl }: stdenv.mkDerivation rec { pname = "xpwn"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib libpng bzip2 libusb openssl ]; + buildInputs = [ zlib libpng bzip2 libusb-compat-0_1 openssl ]; meta = with stdenv.lib; { homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn"; diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix index 5d7e2c7668f29..9e9d8894f0d72 100644 --- a/pkgs/development/node-packages/default-v10.nix +++ b/pkgs/development/node-packages/default-v10.nix @@ -125,5 +125,8 @@ nodePackages // { thelounge = nodePackages.thelounge.override { buildInputs = [ nodePackages.node-pre-gyp ]; + postInstall = '' + echo /var/lib/thelounge > $out/lib/node_modules/thelounge/.thelounge_home + ''; }; } diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 56a15f7ebf653..9ea5b2ec15d9d 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -35,6 +35,7 @@ , "coc-python" , "coc-r-lsp" , "coc-rls" +, "coc-rust-analyzer" , "coc-smartf" , "coc-snippets" , "coc-solargraph" @@ -135,6 +136,7 @@ , "peerflix" , "peerflix-server" , "pnpm" +, "postcss-cli" , "prettier" , "pscid" , "pulp" @@ -142,6 +144,7 @@ , "react-native-cli" , "react-tools" , "reveal.js" +, { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" } , "s3http" , "semver" , "serve" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index d70b133fd405b..3096408963ee1 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -22,67 +22,67 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.900.7" = { + "@angular-devkit/architect-0.901.4" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.900.7"; + version = "0.901.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.7.tgz"; - sha512 = "hfiTVYc72kzbXrzK4tea6jnTDnSKpE1D+vEptBXN2tdXEVNEAQI5Qm5L1zVDtt16UdqoUTUypIgUc9jcNH1mUQ=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.4.tgz"; + sha512 = "w4RMj7eLhUSh70HUy5tW4EXjLQFXk0Lfr9WiSy5gvPGp+zzYxknI+Wn4Xid1wU/WS+4tuMv5nJIaNaH2sABESQ=="; }; }; - "@angular-devkit/core-9.0.7" = { + "@angular-devkit/core-9.1.4" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "9.0.7"; + version = "9.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.7.tgz"; - sha512 = "tMrz36sM1xrwvFf9Qm59GwALscVlMP7rQBjtd0fIR/QbsiOAIX4AQbV+vN6Vtwnzo5NIRZY1IXJUhesWms+h5w=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.4.tgz"; + sha512 = "OPFQDmT4XabLMSRDgmnzedlOrc83DzQIgLcfoh/UhZ7aJKf/2Vq4l09p/DkMNI36vN5BRL0zDZt7TjvKNgyYgA=="; }; }; - "@angular-devkit/schematics-9.0.7" = { + "@angular-devkit/schematics-9.1.4" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "9.0.7"; + version = "9.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.0.7.tgz"; - sha512 = "ryPC+l24f3gX5DFMTLkDM/q2Kp6LPzBn6400k7j4qVdb1cIrZx+JUQd7F4iAksTTkX15EQPanptQXeztUrl9Ng=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.4.tgz"; + sha512 = "RAbdnUEZ3JTLmWSBiXT5trsVx8Fi72fxN9CiRaluM09Cytg6BUc1wC5XCO0YPvhI400+3Ro1nwjPXezjg7LXzQ=="; }; }; - "@antora/asciidoc-loader-2.2.0" = { + "@antora/asciidoc-loader-2.3.1" = { name = "_at_antora_slash_asciidoc-loader"; packageName = "@antora/asciidoc-loader"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.2.0.tgz"; - sha512 = "dwKXao6eqbAh8O7OS1ZUgVHmbfl38z7RzBCM6DbTb1VODk1HGIgp6gxauGmy5rBvjrJTtz7M1Dxs+BzBApeyMw=="; + url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.3.1.tgz"; + sha512 = "YSf5oEExzrR+O7FizQAeIYyP/BAGvhGw9inACFF3Er3fzCR/sOvPadT6a/slW//tVGLF3eul0ARvw7QAvo6yHQ=="; }; }; - "@antora/content-aggregator-2.2.0" = { + "@antora/content-aggregator-2.3.1" = { name = "_at_antora_slash_content-aggregator"; packageName = "@antora/content-aggregator"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.2.0.tgz"; - sha512 = "Dd3jvjIty75G5X04lf6XFK8wKwKo1bfJfafsvwwJuApILASt0Nrv+Z3O+rfc4MhaswgZNqVBrEcSJW9BJxXPtw=="; + url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.3.1.tgz"; + sha512 = "DKrM7FtK5ivWHmQjMkPYkn3S4jQ9Sy6QiNfKYcg/EcIee5k3VPRjYHn40nPY0gS+R4zElRJhru6bHOpnkGJYVA=="; }; }; - "@antora/content-classifier-2.2.0" = { + "@antora/content-classifier-2.3.1" = { name = "_at_antora_slash_content-classifier"; packageName = "@antora/content-classifier"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.2.0.tgz"; - sha512 = "cVoL7aR619FNFN3bKiiFhLinaFktQ06OmMG+QMJW0tNRaeI1ATYtrpUvwG5KVuciwDZFKp+GboRUoud0OGLfJQ=="; + url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.3.1.tgz"; + sha512 = "d9vfhxcJY8DdU43h93cK96/Te2eKcJeA4pCljQrRUFpguZndMVrmWMxp8wzOYYSMIIukwcZVa3AISz86RNvrYA=="; }; }; - "@antora/document-converter-2.2.0" = { + "@antora/document-converter-2.3.1" = { name = "_at_antora_slash_document-converter"; packageName = "@antora/document-converter"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.2.0.tgz"; - sha512 = "Ka3moJL5HRoaHUz6U1s9M36WGJg8vUmlQziUpKsC96GbgWyiNXIvNwvQN9kdAW0AXR1CNpIcZ8sl7ygIaa7pLA=="; + url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.3.1.tgz"; + sha512 = "5vnr3twkunAkv04NaqgLtXQTTlRNsvTo/jpVrUQ6DNQHE3l3Sr0z/6u4GWkueI95L/PFlFQ79WUNsBPLICfLrA=="; }; }; "@antora/expand-path-helper-1.0.0" = { @@ -94,76 +94,76 @@ let sha512 = "hg3y6M3OvRTb7jtLAnwwloYDxafbyKYttcf16kGCXvP7Wqosh7c+Ag+ltaZ7VSebpzpphO/umb/BXdpU7rxapw=="; }; }; - "@antora/navigation-builder-2.2.0" = { + "@antora/navigation-builder-2.3.1" = { name = "_at_antora_slash_navigation-builder"; packageName = "@antora/navigation-builder"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.2.0.tgz"; - sha512 = "r78NVNN/PbbSbXI5+NJ4d5G0RM1cklv++djPI0xIjFPK8R7GsuQagAaEpZS9o8UKcRlIyyGTeaT8dWKnFxZh2w=="; + url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.3.1.tgz"; + sha512 = "kWsi/wn/+IEljBdR6dSE6TFrF+KUfOlDQTnq9YmMzdUCLJRk7Cvz36zsbDFRE8cgqkuunddfsA6oOECgXLQyrw=="; }; }; - "@antora/page-composer-2.2.0" = { + "@antora/page-composer-2.3.1" = { name = "_at_antora_slash_page-composer"; packageName = "@antora/page-composer"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.2.0.tgz"; - sha512 = "JBRqWjJE8pUJG7AU6GMYWo2avBHLzxBisyfFq9FGH7Uf+Shv+0RYImFH0fDX0Et+83sfg2i3y39SfTYXKLsc3g=="; + url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.3.1.tgz"; + sha512 = "HVZR5GgF+aA41Y0FVOmRHkI5Hn+ab4giJ5FvKwMZlqF10zd0u+rne6+0664kC08wYUIr40/OMayCRgIHPqEwuQ=="; }; }; - "@antora/playbook-builder-2.2.0" = { + "@antora/playbook-builder-2.3.1" = { name = "_at_antora_slash_playbook-builder"; packageName = "@antora/playbook-builder"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.2.0.tgz"; - sha512 = "GIbkyCnwdTJVHYwSEG4d6Px2Uh/zBiwLXK7zGsaMY4/DmbYBKzNK4xpt7fHXvIw2IyH9GA1XRQ7+vpBSg8VP8w=="; + url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.3.1.tgz"; + sha512 = "/gl4H/0ey/Uc80GaomZoz10c/f8TX4bQ70SR+BlKrwjwsHCskfffVa+jvMAjnOlP0SGEPwIGkifWPGQbTHdH7A=="; }; }; - "@antora/redirect-producer-2.2.0" = { + "@antora/redirect-producer-2.3.1" = { name = "_at_antora_slash_redirect-producer"; packageName = "@antora/redirect-producer"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.2.0.tgz"; - sha512 = "ZkUe95Wj3TiFrbXA0sRDCv+0yD1HxI84/2pQj6cnMV01vrfj9HKeMdbBG1Sgf5bmaDDJ1nImlT0l2g6t+pBIJg=="; + url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.3.1.tgz"; + sha512 = "2iDYwygpZ5xHrSflnDIn+kzLt+9jXKOTRHXXqCQHYZuHANQVEYLI93yOXivvFZZvX/jaRzZBF7uTI3FGwg2Isw=="; }; }; - "@antora/site-mapper-2.2.0" = { + "@antora/site-mapper-2.3.1" = { name = "_at_antora_slash_site-mapper"; packageName = "@antora/site-mapper"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.2.0.tgz"; - sha512 = "318hg4n6SjisAA5e3uq02IdSeW6hQwCo+2TfQQQlCY/+DlFV0V2ML2bicwSrdfweJ42o5TxgSQAtTuOc1YPjgA=="; + url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.3.1.tgz"; + sha512 = "EkHEEPz0CfLJuE8lx6s9b8+jEC8krFN29zAqK6WaOTi34Tqhv5H/W14mk7IJfy8nWjIjZgP/q/a8gJK9LegYaw=="; }; }; - "@antora/site-publisher-2.2.0" = { + "@antora/site-publisher-2.3.1" = { name = "_at_antora_slash_site-publisher"; packageName = "@antora/site-publisher"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.2.0.tgz"; - sha512 = "3pcGacS72sOKnm7Hnx328AUWGMEDsNHHQla6lwHL7gtWGtn/9tpt0M+MtgkxZnOLmoif8pt/JWPmlnv6td2xSw=="; + url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.3.1.tgz"; + sha512 = "s42S+e3IF5qLgL7N42LpcGc2+UcsJBrY9B10fUP0WQFM51LsNWIwQmU3EheoSEUjo5JvQYi5vlQsHlb7j8TCPA=="; }; }; - "@antora/ui-loader-2.2.0" = { + "@antora/ui-loader-2.3.1" = { name = "_at_antora_slash_ui-loader"; packageName = "@antora/ui-loader"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.2.0.tgz"; - sha512 = "3d6SqtknM3PiLRw2wLtcMVVfmyHtfNuWo8+ZBRmUrZs8HfhGteV8/s4vpiOJZmLYhW4KLFgIgG09lFdD5t78Ow=="; + url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.3.1.tgz"; + sha512 = "0uZDixaamnMnGJvl1M5bqW2ac8+6W2KZcfOTwPBEJJCLTGiZe4GASB+zR7tXNyrUr51zLuCjxPNcEbzGEfRxAQ=="; }; }; - "@apollo/federation-0.13.2" = { + "@apollo/federation-0.14.1" = { name = "_at_apollo_slash_federation"; packageName = "@apollo/federation"; - version = "0.13.2"; + version = "0.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.13.2.tgz"; - sha512 = "62uXIIHxHXG71gSwROFt8yxtYeUZ2BaIgAkxZ1H82GB4+s1gt4xwizcmmCWqQhK3KBy4LbPOfI1YyHW4Wv5ZpQ=="; + url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.14.1.tgz"; + sha512 = "QuX2O3xO6mcTZdqttxHaMKWgq1v0nYRiDLe4k7DwAxVtb9nF8lsJDlup4Zicx3LBYhBCGQvumrYILuF/Amn6WQ=="; }; }; "@apollo/protobufjs-1.0.3" = { @@ -175,13 +175,13 @@ let sha512 = "gqeT810Ect9WIqsrgfUvr+ljSB5m1PyBae9HGdrRyQ3HjHjTcjVvxpsMYXlUk4rUHnrfUqyoGvLSy2yLlRGEOw=="; }; }; - "@apollographql/apollo-tools-0.4.4" = { + "@apollographql/apollo-tools-0.4.7" = { name = "_at_apollographql_slash_apollo-tools"; packageName = "@apollographql/apollo-tools"; - version = "0.4.4"; + version = "0.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.4.tgz"; - sha512 = "kldvB9c+vzimel4yEktlkB08gaJ5DQn9ZuIfFf1kpAw+++5hFwYRWTyKgOhF9LbOWNWGropesYC7WwLja2erhQ=="; + url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.7.tgz"; + sha512 = "6QjZz6aLq6QXHgJ1AmSg4C4cBmhF5z3g7LPsk4g+zJoWKxiFuSIbrTe12ETtn6wgPq//e5p2agbXYydIjqs7gw=="; }; }; "@apollographql/graphql-language-service-interface-2.0.2" = { @@ -256,22 +256,22 @@ let sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; }; }; - "@babel/compat-data-7.9.0" = { + "@babel/compat-data-7.9.6" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.0.tgz"; - sha512 = "zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.6.tgz"; + sha512 = "5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g=="; }; }; - "@babel/core-7.9.0" = { + "@babel/core-7.9.6" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz"; - sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz"; + sha512 = "nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg=="; }; }; "@babel/generator-7.0.0-beta.38" = { @@ -283,22 +283,22 @@ let sha512 = "aOHQPhsEyaB6p2n+AK981+onHoc+Ork9rcAQVSUJR33wUkGiWRpu6/C685knRyIZVsKeSdG5Q4xMiYeFUhuLzA=="; }; }; - "@babel/generator-7.8.6" = { + "@babel/generator-7.9.5" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.8.6"; + version = "7.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.8.6.tgz"; - sha512 = "4bpOR5ZBz+wWcMeVtcf7FbjcFzCp+817z2/gHNncIRcM9MmKzUhtWCYAq27RAfUrAFwb+OCG1s9WEaVxfi6cjg=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz"; + sha512 = "GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ=="; }; }; - "@babel/generator-7.9.4" = { + "@babel/generator-7.9.6" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.9.4"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz"; - sha512 = "rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz"; + sha512 = "+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ=="; }; }; "@babel/helper-annotate-as-pure-7.8.3" = { @@ -328,31 +328,31 @@ let sha512 = "weiIo4gaoGgnhff54GQ3P5wsUQmnSwpkvU0r6ZHq6TzoSzKy4JxHEgnxNytaKbov2a9z/CVNyzliuCOUPEX3Jw=="; }; }; - "@babel/helper-builder-react-jsx-experimental-7.9.0" = { + "@babel/helper-builder-react-jsx-experimental-7.9.5" = { name = "_at_babel_slash_helper-builder-react-jsx-experimental"; packageName = "@babel/helper-builder-react-jsx-experimental"; - version = "7.9.0"; + version = "7.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.0.tgz"; - sha512 = "3xJEiyuYU4Q/Ar9BsHisgdxZsRlsShMe90URZ0e6przL26CCs8NJbDoxH94kKT17PcxlMhsCAwZd90evCo26VQ=="; + url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.5.tgz"; + sha512 = "HAagjAC93tk748jcXpZ7oYRZH485RCq/+yEv9SIWezHRPv9moZArTnkUNciUNzvwHUABmiWKlcxJvMcu59UwTg=="; }; }; - "@babel/helper-compilation-targets-7.8.7" = { + "@babel/helper-compilation-targets-7.9.6" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.8.7"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz"; - sha512 = "4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz"; + sha512 = "x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw=="; }; }; - "@babel/helper-create-class-features-plugin-7.8.6" = { + "@babel/helper-create-class-features-plugin-7.9.6" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.8.6"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.6.tgz"; - sha512 = "klTBDdsr+VFFqaDHm5rR69OpEQtO2Qv8ECxHS1mNhJJvaHArR6a1xTf5K/eZW7eZpJbhCx3NW1Yt/sKsLXLblg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz"; + sha512 = "6N9IeuyHvMBRyjNYOMJHrhwtu4WJMrYf8hVbEHD3pbbbmNOk1kmXSQs7bA4dYDUaIx4ZEzdnvo6NwC3WHd/Qow=="; }; }; "@babel/helper-create-regexp-features-plugin-7.8.8" = { @@ -382,13 +382,13 @@ let sha512 = "N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw=="; }; }; - "@babel/helper-function-name-7.8.3" = { + "@babel/helper-function-name-7.9.5" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.8.3"; + version = "7.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz"; - sha512 = "BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz"; + sha512 = "JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw=="; }; }; "@babel/helper-get-function-arity-7.8.3" = { @@ -472,13 +472,13 @@ let sha512 = "kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA=="; }; }; - "@babel/helper-replace-supers-7.8.6" = { + "@babel/helper-replace-supers-7.9.6" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.8.6"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz"; - sha512 = "PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz"; + sha512 = "qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA=="; }; }; "@babel/helper-simple-access-7.8.3" = { @@ -499,13 +499,13 @@ let sha512 = "3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA=="; }; }; - "@babel/helper-validator-identifier-7.9.0" = { + "@babel/helper-validator-identifier-7.9.5" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.9.0"; + version = "7.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz"; - sha512 = "6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz"; + sha512 = "/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g=="; }; }; "@babel/helper-wrap-function-7.8.3" = { @@ -517,13 +517,13 @@ let sha512 = "LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ=="; }; }; - "@babel/helpers-7.9.2" = { + "@babel/helpers-7.9.6" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.9.2"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz"; - sha512 = "JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz"; + sha512 = "tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw=="; }; }; "@babel/highlight-7.9.0" = { @@ -535,13 +535,13 @@ let sha512 = "lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ=="; }; }; - "@babel/parser-7.9.4" = { + "@babel/parser-7.9.6" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.9.4"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz"; - sha512 = "bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz"; + sha512 = "AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -607,13 +607,13 @@ let sha512 = "jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.9.0" = { + "@babel/plugin-proposal-object-rest-spread-7.9.6" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz"; - sha512 = "UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz"; + sha512 = "Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.8.3" = { @@ -661,6 +661,15 @@ let sha512 = "wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg=="; }; }; + "@babel/plugin-syntax-class-properties-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-class-properties"; + packageName = "@babel/plugin-syntax-class-properties"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.8.3.tgz"; + sha512 = "UcAyQWg2bAN647Q+O811tG9MrJ38Z10jjhQdKNAL8fsyPzE3cCN/uT+f55cFVY4aGO4jqJAvmqsuY3GQDwAoXg=="; + }; + }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { name = "_at_babel_slash_plugin-syntax-dynamic-import"; packageName = "@babel/plugin-syntax-dynamic-import"; @@ -697,6 +706,15 @@ let sha512 = "WxdW9xyLgBdefoo0Ynn3MRSkhe5tFVxxKNVdnZSh318WrG2e2jH+E9wd/++JsqcLJZPfz87njQJ8j2Upjm0M0A=="; }; }; + "@babel/plugin-syntax-logical-assignment-operators-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-logical-assignment-operators"; + packageName = "@babel/plugin-syntax-logical-assignment-operators"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.8.3.tgz"; + sha512 = "Zpg2Sgc++37kuFl6ppq2Q7Awc6E6AIW671x5PY8E/f7MCIyPPGK/EoeZXvvY3P42exZ3Q4/t3YOzP/HiN79jDg=="; + }; + }; "@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" = { name = "_at_babel_slash_plugin-syntax-nullish-coalescing-operator"; packageName = "@babel/plugin-syntax-nullish-coalescing-operator"; @@ -796,13 +814,13 @@ let sha512 = "pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w=="; }; }; - "@babel/plugin-transform-classes-7.9.2" = { + "@babel/plugin-transform-classes-7.9.5" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.9.2"; + version = "7.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz"; - sha512 = "TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz"; + sha512 = "x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg=="; }; }; "@babel/plugin-transform-computed-properties-7.8.3" = { @@ -814,13 +832,13 @@ let sha512 = "O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA=="; }; }; - "@babel/plugin-transform-destructuring-7.8.8" = { + "@babel/plugin-transform-destructuring-7.9.5" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.8.8"; + version = "7.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz"; - sha512 = "eRJu4Vs2rmttFCdhPUM3bV0Yo/xPSdPw6ML9KHs/bjB4bLA5HXlbvYXPOD5yASodGod+krjYx21xm1QmL8dCJQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz"; + sha512 = "j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q=="; }; }; "@babel/plugin-transform-dotall-regex-7.8.3" = { @@ -895,31 +913,31 @@ let sha512 = "3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA=="; }; }; - "@babel/plugin-transform-modules-amd-7.9.0" = { + "@babel/plugin-transform-modules-amd-7.9.6" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz"; - sha512 = "vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz"; + sha512 = "zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.9.0" = { + "@babel/plugin-transform-modules-commonjs-7.9.6" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz"; - sha512 = "qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz"; + sha512 = "7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.9.0" = { + "@babel/plugin-transform-modules-systemjs-7.9.6" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz"; - sha512 = "FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz"; + sha512 = "NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg=="; }; }; "@babel/plugin-transform-modules-umd-7.9.0" = { @@ -958,13 +976,13 @@ let sha512 = "57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ=="; }; }; - "@babel/plugin-transform-parameters-7.9.3" = { + "@babel/plugin-transform-parameters-7.9.5" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.9.3"; + version = "7.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz"; - sha512 = "fzrQFQhp7mIhOzmOtPiKffvCYQSK10NR8t6BBz2yPbeUHb9OLW8RZGtgDRBn8z2hGcwvKDL3vC7ojPTLNxmqEg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz"; + sha512 = "0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA=="; }; }; "@babel/plugin-transform-property-literals-7.8.3" = { @@ -1003,13 +1021,13 @@ let sha512 = "mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A=="; }; }; - "@babel/plugin-transform-runtime-7.9.0" = { + "@babel/plugin-transform-runtime-7.9.6" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz"; - sha512 = "pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz"; + sha512 = "qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w=="; }; }; "@babel/plugin-transform-shorthand-properties-7.8.3" = { @@ -1057,13 +1075,13 @@ let sha512 = "2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg=="; }; }; - "@babel/plugin-transform-typescript-7.9.4" = { + "@babel/plugin-transform-typescript-7.9.6" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.9.4"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz"; - sha512 = "yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.6.tgz"; + sha512 = "8OvsRdvpt3Iesf2qsAn+YdlwAJD7zJ+vhFZmDCa4b8dTp7MmHtKk5FF2mCsGxjZwuwsy/yIIay/nLmxST1ctVQ=="; }; }; "@babel/plugin-transform-unicode-regex-7.8.3" = { @@ -1084,13 +1102,13 @@ let sha512 = "/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ=="; }; }; - "@babel/preset-env-7.9.0" = { + "@babel/preset-env-7.9.6" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.0.tgz"; - sha512 = "712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz"; + sha512 = "0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ=="; }; }; "@babel/preset-flow-7.9.0" = { @@ -1156,13 +1174,22 @@ let sha512 = "NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q=="; }; }; - "@babel/runtime-corejs3-7.9.2" = { + "@babel/runtime-7.9.6" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz"; + sha512 = "64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ=="; + }; + }; + "@babel/runtime-corejs3-7.9.6" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.9.2"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz"; - sha512 = "HHxmgxbIzOfFlZ+tdeRKtaxWOMUoCG5Mu3wKeUmOxjYrwb3AAHgnmtCUbPPK11/raIWLIBK250t8E2BPO0p7jA=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz"; + sha512 = "6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA=="; }; }; "@babel/template-7.8.6" = { @@ -1174,13 +1201,13 @@ let sha512 = "zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg=="; }; }; - "@babel/traverse-7.9.0" = { + "@babel/traverse-7.9.6" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz"; - sha512 = "jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz"; + sha512 = "b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg=="; }; }; "@babel/types-7.0.0-beta.38" = { @@ -1192,22 +1219,22 @@ let sha512 = "SAtyEjmA7KiEoL2eAOAUM6M9arQJGWxJKK0S9x0WyPOosHS420RXoxPhn57u/8orRnK8Kxm0nHQQNTX203cP1Q=="; }; }; - "@babel/types-7.8.6" = { + "@babel/types-7.9.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.8.6"; + version = "7.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz"; - sha512 = "wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz"; + sha512 = "XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg=="; }; }; - "@babel/types-7.9.0" = { + "@babel/types-7.9.6" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz"; - sha512 = "BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz"; + sha512 = "qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA=="; }; }; "@chemzqm/neovim-5.1.9" = { @@ -1435,13 +1462,13 @@ let sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; }; }; - "@iarna/toml-2.2.3" = { + "@iarna/toml-2.2.5" = { name = "_at_iarna_slash_toml"; packageName = "@iarna/toml"; - version = "2.2.3"; + version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.3.tgz"; - sha512 = "FmuxfCuolpLl0AnQ2NHSzoUKWEJDFl63qXjzdoWBVyFCXzMGm1spBzk7LeHNoVCiWCF7mRVms9e6jEV9+MoPbg=="; + url = "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz"; + sha512 = "trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="; }; }; "@ionic/cli-framework-3.0.6" = { @@ -1561,22 +1588,22 @@ let sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw=="; }; }; - "@jest/transform-25.1.0" = { + "@jest/transform-25.5.1" = { name = "_at_jest_slash_transform"; packageName = "@jest/transform"; - version = "25.1.0"; + version = "25.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/transform/-/transform-25.1.0.tgz"; - sha512 = "4ktrQ2TPREVeM+KxB4zskAT84SnmG1vaz4S+51aTefyqn3zocZUnliLLm5Fsl85I3p/kFPN4CRp1RElIfXGegQ=="; + url = "https://registry.npmjs.org/@jest/transform/-/transform-25.5.1.tgz"; + sha512 = "Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg=="; }; }; - "@jest/types-25.1.0" = { + "@jest/types-25.5.0" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "25.1.0"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz"; - sha512 = "VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA=="; + url = "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz"; + sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw=="; }; }; "@kbrandwijk/swagger-to-graphql-2.4.3" = { @@ -2128,67 +2155,67 @@ let sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; }; }; - "@msgpack/msgpack-1.12.0" = { + "@msgpack/msgpack-1.12.1" = { name = "_at_msgpack_slash_msgpack"; packageName = "@msgpack/msgpack"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-1.12.0.tgz"; - sha512 = "7X4+Mt/TAmxhIR+Hryz0ykxnE9YC3sRH+HhcJ//1l7Z0aJD6YFCkD8UpFzXgpWBlAmybG4cnNVdd2GO6Gh8Pbg=="; + url = "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-1.12.1.tgz"; + sha512 = "nGwwmkdm3tuLdEkWMIwLBgFBfMFILILxcZIQY0dfqsdboN2iZdKfOYKUOKoa0wXw1FL1PL3yEYGPCXhwodQDTA=="; }; }; - "@node-red/editor-api-1.0.4" = { + "@node-red/editor-api-1.0.6" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.0.4.tgz"; - sha512 = "Bs37Jz/eLNy2qqQXbAX6ix/zvfvZEyZgvWE19PPCoF0BkVn290fkIK48ccdkALjKwmJRErpGEyzERcTWQks4BA=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.0.6.tgz"; + sha512 = "9LieY6LSDtvj43IbpmCs9MmSGdPjOEmtsi+T13dXxxmil4ngedvJ7uMP1d96eKLW/b6Viuk7kx2olSGtUqgqLg=="; }; }; - "@node-red/editor-client-1.0.4" = { + "@node-red/editor-client-1.0.6" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.0.4.tgz"; - sha512 = "BGjsNvvfEYPJIeoP8/8IwLbZeFqYUeEIWBcJ8PTCKPSb5H6Ettwpl6sgLNgSDbHbWHGg3avm7Y94qBnLFICKJg=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.0.6.tgz"; + sha512 = "V8zsj+wKY6RzOX92ePdgJtJdmOT9Whfz6CTN34/H2pZlzFA/+KE/sippkInRrx+ujTp4uI2ycAGJ7i1Qkt8ztw=="; }; }; - "@node-red/nodes-1.0.4" = { + "@node-red/nodes-1.0.6" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.0.4.tgz"; - sha512 = "l64ZDLDBCgjdJrRVderJ83Sq24F8/rMhhv1Hmo7w4QCDX0Ki7sHWWQVa0BuS5u4n+jewiOLGs93RWWAzHccWRQ=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.0.6.tgz"; + sha512 = "4+wTiwhJlhLL6HV3YBLOGHSIcfygf4YxP/fJDkG+vy09pRyux/NqZ06NiqhYs+d+Ndf13LIc20KTEzN3pLW2Rw=="; }; }; - "@node-red/registry-1.0.4" = { + "@node-red/registry-1.0.6" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.0.4.tgz"; - sha512 = "vPKxglgpm1ZDxQd7385iYmZZ6VRZ+1v69fllGZDkhOZi5CVL/GwZ/G93fWyuO8g51fWHOu2qjGgaf7IfJ0iHhA=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.0.6.tgz"; + sha512 = "jDNfcNyphjpywHmXfNuZhM593ox9qHMYmL6ZQQiyERwiJwSkGp2zzNicNBe10ysk5ENr36xdP46BryWu/j9xIA=="; }; }; - "@node-red/runtime-1.0.4" = { + "@node-red/runtime-1.0.6" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.0.4.tgz"; - sha512 = "cbi5hd+LPERQpo0BuHYf67YPY+Z3hu+tDmRkEFfvDEgTz6qgiXg6FteMcWNx9a1dpt+30HuNhVPFAE8oa+L/Ug=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.0.6.tgz"; + sha512 = "6eat9FZlIcydm0+VoUjlbxf9TyyLu0zTCWWANqGhu5Ab8o366WSOAxyIzJ5QL56FLQ+V6040YWmurBl+bGRGjg=="; }; }; - "@node-red/util-1.0.4" = { + "@node-red/util-1.0.6" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.0.4.tgz"; - sha512 = "/+aj0C71TtoD2NwOU/J69Lw7skNk0mJp7LgpRfiMPoLuPASNuZdGbMZ2NjO7cvMfTtVvOG1APHnqT9dDyR3umg=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.0.6.tgz"; + sha512 = "uncyHShA6strCJr1puqrpxsKcb7We2bmo/8xHk91pAQw4dr3jm4S+v/m9tYqVqtXkkW2cfJ6n3bRHJHbOZNW0Q=="; }; }; "@nodelib/fs.scandir-2.1.3" = { @@ -2236,13 +2263,13 @@ let sha512 = "JtktVH7ASBVIWsQTFlFpeOzhBJskvoBCTfeeRhhZy7ybATcUvwiwotZ8j5rkqUUyB69lIy/AvboiiiGBjYBKBA=="; }; }; - "@npmcli/git-2.0.1" = { + "@npmcli/git-2.0.2" = { name = "_at_npmcli_slash_git"; packageName = "@npmcli/git"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.1.tgz"; - sha512 = "hVatexiBtx71F01Ars38Hr5AFUGmJgHAfQtRlO5fJlnAawRGSXwEFgjB5i3XdUUmElZU/RXy7fefN02dZKxgPw=="; + url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.2.tgz"; + sha512 = "uv9+EuP5YWluNPgkEOL+iyB/+MVt4U5PMBCfl+I8korKluFdiSp7RxjXYzpWM/wU4wXaROAUFiOiCMmBftonjw=="; }; }; "@npmcli/installed-package-contents-1.0.5" = { @@ -2254,13 +2281,22 @@ let sha512 = "aKIwguaaqb6ViwSOFytniGvLPb9SMCUm39TgM3SfUo7n0TxUMbwoXfpwyvQ4blm10lzbAwTsvjr7QZ85LvTi4A=="; }; }; - "@npmcli/promise-spawn-1.1.0" = { + "@npmcli/promise-spawn-1.2.0" = { name = "_at_npmcli_slash_promise-spawn"; packageName = "@npmcli/promise-spawn"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.1.0.tgz"; - sha512 = "FwbuYN9KXBkloLeIR3xRgI8dyOdfK/KzaJlChszNuwmUXD1lHXfLlSeo4n4KrKt2udIK9K9/TzlnyCA3ubM2fA=="; + url = "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.2.0.tgz"; + sha512 = "nFtqjVETliApiRdjbYwKwhlSHx2ZMagyj5b9YbNt0BWeeOVxJd47ZVE2u16vxDHyTOZvk+YLV7INwfAE9a2uow=="; + }; + }; + "@npmcli/run-script-1.3.1" = { + name = "_at_npmcli_slash_run-script"; + packageName = "@npmcli/run-script"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.3.1.tgz"; + sha512 = "9Ea57XJjNLtBFRAaiKqqdoqRrL2QkM0vvCbMjPecljhog5IHupStPtZULbl0CoGN00N3lhLWJ4PaIEC0MGjqJw=="; }; }; "@oclif/color-0.0.0" = { @@ -2281,13 +2317,13 @@ let sha512 = "6+iaCMh/JXJaB2QWikqvGE9//wLEVYYwZd5sud8aLoLKog1Q75naZh2vlGVtg5Mq/NqpqGQvdIjJb3Bm+64AUQ=="; }; }; - "@oclif/config-1.14.0" = { + "@oclif/config-1.15.1" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; - version = "1.14.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.14.0.tgz"; - sha512 = "KsOP/mx9lzTah+EtGqLUXN3PDL0J3zb9/dTneFyiUK2K6T7vFEGhV6OasmqTh4uMZHGYTGrNPV8x/Yw6qZNL6A=="; + url = "https://registry.npmjs.org/@oclif/config/-/config-1.15.1.tgz"; + sha512 = "GdyHpEZuWlfU8GSaZoiywtfVBsPcfYn1KuSLT1JTfvZGpPG6vShcGr24YZ3HG2jXUFlIuAqDcYlTzOrqOdTPNQ=="; }; }; "@oclif/errors-1.2.2" = { @@ -2380,13 +2416,13 @@ let sha512 = "eoOVMjILna7FVQf96iWc3+ZtE/ZT6y8ob8ZzcqKY1ibSQCnu4O/B7pJvzMx5cyZ/RjAff6DAdEb0O0Cjcxidkg=="; }; }; - "@octokit/endpoint-5.5.3" = { + "@octokit/endpoint-6.0.1" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "5.5.3"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.5.3.tgz"; - sha512 = "EzKwkwcxeegYYah5ukEeAI/gYRLv2Y9U5PpIsseGSFDk+G3RbipQGBs8GuYS1TLCtQaqoO66+aQGtITPalxsNQ=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.1.tgz"; + sha512 = "pOPHaSz57SFT/m3R5P8MUu4wLPszokn5pXcB/pzavLTQf2jbU+6iayTvzaY6/BiotuRS0qyEUkx3QglT4U958A=="; }; }; "@octokit/plugin-enterprise-rest-3.6.2" = { @@ -2425,13 +2461,13 @@ let sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; }; }; - "@octokit/request-5.3.2" = { + "@octokit/request-5.4.2" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.3.2"; + version = "5.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.3.2.tgz"; - sha512 = "7NPJpg19wVQy1cs2xqXjjRq/RmtSomja/VSWnptfYwuBxLdbYh2UjhGi0Wx7B1v5Iw5GKhfFDQL7jM7SSp7K2g=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.2.tgz"; + sha512 = "zKdnGuQ2TQ2vFk9VU8awFT4+EYf92Z/v3OlzRaSh4RIP0H6cvW1BFPXq4XYvNez+TPQjqN+0uSkCYnMFFhcFrw=="; }; }; "@octokit/request-error-1.2.1" = { @@ -2443,6 +2479,15 @@ let sha512 = "+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA=="; }; }; + "@octokit/request-error-2.0.0" = { + name = "_at_octokit_slash_request-error"; + packageName = "@octokit/request-error"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.0.tgz"; + sha512 = "rtYicB4Absc60rUv74Rjpzek84UbVHGHJRu4fNVlZ1mCcyUPPuzFfG9Rn6sjHrd95DEsmjSt1Axlc699ZlbDkw=="; + }; + }; "@octokit/rest-16.43.1" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; @@ -2452,13 +2497,13 @@ let sha512 = "gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw=="; }; }; - "@octokit/types-2.5.0" = { + "@octokit/types-2.12.2" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "2.5.0"; + version = "2.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-2.5.0.tgz"; - sha512 = "KEnLwOfdXzxPNL34fj508bhi9Z9cStyN7qY1kOfVahmqtAfrWw6Oq3P4R+dtsg0lYtZdWBpUrS/Ixmd5YILSww=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-2.12.2.tgz"; + sha512 = "1GHLI/Jll3j6F0GbYyZPFTcHZMGjAiRfkTEoRUyaVVk2IWbDdwEiClAJvXzfXCDayuGSNCqAUH8lpjZtqW9GDw=="; }; }; "@parcel/fs-1.11.0" = { @@ -2506,13 +2551,13 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; - "@primer/octicons-9.4.0" = { + "@primer/octicons-9.6.0" = { name = "_at_primer_slash_octicons"; packageName = "@primer/octicons"; - version = "9.4.0"; + version = "9.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@primer/octicons/-/octicons-9.4.0.tgz"; - sha512 = "7tAWOTt3Ay3Vkf9XwietC40TV1pxk5PS2DAODsOPnMfMd9Yzm2tfvHu0Q3dcffxGZxu7n5ZM6MFWbr/+4dqSdA=="; + url = "https://registry.npmjs.org/@primer/octicons/-/octicons-9.6.0.tgz"; + sha512 = "B5Wzk5izRXXz0JqEXJkVUtqhCXSpUKgqYkVwegMkp5sziBW+ksd9LPbONlCWyyLODwf9GsI2sBXekR7m+JJDBw=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -2605,6 +2650,33 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; + "@rollup/plugin-commonjs-11.1.0" = { + name = "_at_rollup_slash_plugin-commonjs"; + packageName = "@rollup/plugin-commonjs"; + version = "11.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-11.1.0.tgz"; + sha512 = "Ycr12N3ZPN96Fw2STurD21jMqzKwL9QuFhms3SD7KKRK7oaXUsBU9Zt0jL/rOPHiPYisI21/rXGO3jr9BnLHUA=="; + }; + }; + "@rollup/plugin-node-resolve-7.1.3" = { + name = "_at_rollup_slash_plugin-node-resolve"; + packageName = "@rollup/plugin-node-resolve"; + version = "7.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz"; + sha512 = "RxtSL3XmdTAE2byxekYLnx+98kEUOrPHF/KRVjLH+DEIHy6kjIw7YINQzn+NXiH/NTrQLAwYs0GWB+csWygA9Q=="; + }; + }; + "@rollup/pluginutils-3.0.10" = { + name = "_at_rollup_slash_pluginutils"; + packageName = "@rollup/pluginutils"; + version = "3.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.10.tgz"; + sha512 = "d44M7t+PjmMrASHbhgpSbVgtL6EFyX7J4mYxwQ/c5eoaE6N2VgCgEcWVzNnwycIloti+/MpwFr8qfw+nRw00sw=="; + }; + }; "@sailshq/lodash-3.10.4" = { name = "_at_sailshq_slash_lodash"; packageName = "@sailshq/lodash"; @@ -2623,22 +2695,22 @@ let sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; }; }; - "@schematics/angular-9.0.7" = { + "@schematics/angular-9.1.4" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "9.0.7"; + version = "9.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.0.7.tgz"; - sha512 = "3UCeexYx/YVo3kboyPZ8KgqBTduMA18AAm3s2yrC0qj41fBFVVZAZLa74uouTf4RYVgy9kR7J3uv6VLxrJPOnQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.4.tgz"; + sha512 = "7nbiYBRgXc+f0sa5iXTcF6/VMy/Xq0wyKKnDFiLCb2aFYR7EXRHWF2GuwDIg2bvFugLuCBDoNnXeddLE1TXGWg=="; }; }; - "@schematics/update-0.900.7" = { + "@schematics/update-0.901.4" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.900.7"; + version = "0.901.4"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.900.7.tgz"; - sha512 = "e9tX2DGNYfj/k9mVICpQt2bWIYyD92dlsip7LzPeZGt+R9zCp5w19uBLa8Z00OgEGzFR1krhRvkQE5OxkkAnVw=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.901.4.tgz"; + sha512 = "jCtZY2Fbj502gKN5gdu1brnRy/ssyzTrWm69Ty73V+t8uL7nLr+/hny/VBJ8CiQnKQvxcgVl1xgvI1cXzpysVA=="; }; }; "@serverless/cli-1.4.0" = { @@ -2659,13 +2731,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-2.22.3" = { + "@serverless/components-2.30.5" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "2.22.3"; + version = "2.30.5"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-2.22.3.tgz"; - sha512 = "RXRKt1RAi+zdvzBkwdrl2viOEo0mjMXOXMk2wayIT6NQ5hNUbptkFIhldXK4Q3n7f4xEHf6ufrax4YGhMHBR3Q=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-2.30.5.tgz"; + sha512 = "c/d60iqzS2NlmRGgIU0S4i6EryjXVwEWcW0bzJ04CwFDQBlvi5kSk8Q59lv0pQ5MwHk+Fw2zMnmMtBQbJxu2vw=="; }; }; "@serverless/core-1.1.2" = { @@ -2677,13 +2749,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-3.6.0" = { + "@serverless/enterprise-plugin-3.6.9" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "3.6.0"; + version = "3.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.6.0.tgz"; - sha512 = "nOefmzh6fz1vY9tfUzDNYVyg1jlsOVdmbp3JVMZMsMhIKQvBpGZYcaAboSyU97pIOFYUlsSBVQsc57IuLsIeiQ=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.6.9.tgz"; + sha512 = "ZiZlRbqGerqMuR/OmrJTjDzuccfpdS6YV+VbKu+DM/9tEA9z87n7VrtjZ320C0V20wC+vFNnHl2EE26lCePyxg=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -2695,13 +2767,31 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-0.24.0" = { + "@serverless/inquirer-1.1.0" = { + name = "_at_serverless_slash_inquirer"; + packageName = "@serverless/inquirer"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/inquirer/-/inquirer-1.1.0.tgz"; + sha512 = "MpNMmV0uADfmGF8jVQ3Vmw+cdh7vAc8Ga/N9LHDhlbWh+EVHkqlpTi6bb3Xv6WsaPlWrx55Wo389IwpbhA0nPQ=="; + }; + }; + "@serverless/platform-client-0.25.7" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "0.24.0"; + version = "0.25.7"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-0.24.0.tgz"; - sha512 = "ppxR5wONzzxNSmt/9agfSzC0F4yrkHZWAR5IPLm4yj+dMxb+768XrbqBU6vnOfCcmjb89OX5Bk0GvyQh+T5gLw=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-0.25.7.tgz"; + sha512 = "ZOKgT49qQPGjv0tDN46INO0gkc5syL2y5t0pau5ljQPtQpJzHrUL87xRlDj3BD+4Y9QFZV1UXXNsOQZsyCBsPw=="; + }; + }; + "@serverless/platform-client-china-1.0.9" = { + name = "_at_serverless_slash_platform-client-china"; + packageName = "@serverless/platform-client-china"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.9.tgz"; + sha512 = "P2OXDa3S9meOOGJm2i4/d/9HlEjg8FwwfWl4Vq7jjJlA12cJaJnXy/mKgx16eA/YSYNtfW7i4NGyeADvIGNzmg=="; }; }; "@serverless/platform-sdk-2.3.0" = { @@ -2722,6 +2812,15 @@ let sha512 = "hcMiX523rkp6kHeKnM1x6/dXEY+d1UFSr901yVKeeCgpFy4u33UI9vlKaPweAZCF6Ahzqywf01IsFTuBVadCrQ=="; }; }; + "@serverless/utils-china-0.1.7" = { + name = "_at_serverless_slash_utils-china"; + packageName = "@serverless/utils-china"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.7.tgz"; + sha512 = "xpsokLjRK7PQtoNuA+1LxZ4whLlmAuJvtv9m9ARYtMaZhJkmlHD8cEh9Y0/uTcvzcA+pWtxRSHQ92TonpXqVow=="; + }; + }; "@sindresorhus/is-0.14.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; @@ -2740,13 +2839,13 @@ let sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="; }; }; - "@sindresorhus/is-2.1.0" = { + "@sindresorhus/is-2.1.1" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.0.tgz"; - sha512 = "lXKXfypKo644k4Da4yXkPCrwcvn6SlUW2X2zFbuflKHNjf0w9htru01bo26uMhleMXsDmnZ12eJLdrAZa9MANg=="; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.1.tgz"; + sha512 = "/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg=="; }; }; "@slack/client-3.16.0" = { @@ -2767,58 +2866,58 @@ let sha512 = "+Qo+IO3YOXWgazlo+CKxOuWFLQQdaNCJ9cSfhFQd687/FuesaIxWdInaAdfpsLScq0c6M1ieZslXgiZELSzxbg=="; }; }; - "@snyk/cli-interface-2.2.0" = { + "@snyk/cli-interface-2.3.0" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.2.0.tgz"; - sha512 = "sA7V2JhgqJB9z5uYotgQc5iNDv//y+Mdm39rANxmFjtZMSYJZHkP80arzPjw1mB5ni/sWec7ieYUUFeySZBfVg=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.0.tgz"; + sha512 = "ecbylK5Ol2ySb/WbfPj0s0GuLQR+KWKFzUgVaoNHaSoN6371qRWwf2uVr+hPUP4gXqCai21Ug/RDArfOhlPwrQ=="; }; }; - "@snyk/cli-interface-2.3.0" = { + "@snyk/cli-interface-2.3.2" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.3.0"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.0.tgz"; - sha512 = "ecbylK5Ol2ySb/WbfPj0s0GuLQR+KWKFzUgVaoNHaSoN6371qRWwf2uVr+hPUP4gXqCai21Ug/RDArfOhlPwrQ=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.2.tgz"; + sha512 = "jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg=="; }; }; - "@snyk/cli-interface-2.3.1" = { + "@snyk/cli-interface-2.5.0" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.3.1"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.1.tgz"; - sha512 = "JZvsmhDXSyjv1dkc12lPI3tNTNYlIaOiIQMYFg2RgqF3QmWjTyBUgRZcF7LoKyufHtS4dIudM6k1aHBpSaDrhw=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.5.0.tgz"; + sha512 = "XMc2SCFH4RBSncZgoPb+BBlNq0NYpEpCzptKi69qyMpBy0VsRqIQqddedaazMCU1xEpXTytq6KMYpzUafZzp5Q=="; }; }; - "@snyk/cli-interface-2.3.2" = { + "@snyk/cli-interface-2.6.0" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.3.2"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.2.tgz"; - sha512 = "jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.6.0.tgz"; + sha512 = "jtk0gf80v4mFyDqaQNokD8GOPMTXpIUL35ewg6jtmuZw41xt56WF9kqCjiiViSRRRYA0RK+RuiVfmJA5pxvMUQ=="; }; }; - "@snyk/cocoapods-lockfile-parser-3.0.0" = { + "@snyk/cocoapods-lockfile-parser-3.2.0" = { name = "_at_snyk_slash_cocoapods-lockfile-parser"; packageName = "@snyk/cocoapods-lockfile-parser"; - version = "3.0.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.0.0.tgz"; - sha512 = "AebCc+v9vtOL9tFkU4/tommgVsXxqdx6t45kCkBW+FC4PaYvfYEg9Eg/9GqlY9+nFrLFo/uTr+E/aR0AF/KqYA=="; + url = "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.2.0.tgz"; + sha512 = "DyFqZudOlGXHBOVneLnQnyQ97xZLq+PTF9PhWOmrEzH/tKcLyXhdW/WmDPVNJVyNvogyRZ4cXIj487xy/EeZEw=="; }; }; - "@snyk/composer-lockfile-parser-1.2.0" = { + "@snyk/composer-lockfile-parser-1.4.0" = { name = "_at_snyk_slash_composer-lockfile-parser"; packageName = "@snyk/composer-lockfile-parser"; - version = "1.2.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.2.0.tgz"; - sha512 = "kZT+HTqgNcQMeoE5NM9M3jj463M8zI7ZxqZXLw9WoyVs5JTt9g0qFWxIG1cNwZdGVI+y7tzZbNWw9BlMD1vCCQ=="; + url = "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.4.0.tgz"; + sha512 = "ga4YTRjJUuP0Ufr+t1IucwVjEFAv66JSBB/zVHP2zy/jmfA3l3ZjlGQSjsRC6Me9P2Z0esQ83AYNZvmIf9pq2w=="; }; }; "@snyk/configstore-3.2.0-rc1" = { @@ -2830,13 +2929,13 @@ let sha512 = "CV3QggFY8BY3u8PdSSlUGLibqbqCG1zJRmGM2DhnhcxQDRRPTGTP//l7vJphOVsUP1Oe23+UQsj7KRWpRUZiqg=="; }; }; - "@snyk/dep-graph-1.16.1" = { + "@snyk/dep-graph-1.18.2" = { name = "_at_snyk_slash_dep-graph"; packageName = "@snyk/dep-graph"; - version = "1.16.1"; + version = "1.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.16.1.tgz"; - sha512 = "2RbstN/z5A3iTmgDQr0vfpWpqsjcJY54PXXP0gVXTf137QLdvgPEsZikjlofF4qoNO1io5t1VGvf69v9E8UrOw=="; + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.18.2.tgz"; + sha512 = "v7tIiCH4LmYOSc0xGHKSxSZ2PEDv8zDlYU7ZKSH+1Hk8Qvj3YYEFvtV1iFBHUEQFUen4kQA6lWxlwF8chsNw+w=="; }; }; "@snyk/gemfile-1.2.0" = { @@ -2848,22 +2947,67 @@ let sha512 = "nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA=="; }; }; - "@snyk/ruby-semver-2.1.0" = { + "@snyk/graphlib-2.1.9-patch" = { + name = "_at_snyk_slash_graphlib"; + packageName = "@snyk/graphlib"; + version = "2.1.9-patch"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/graphlib/-/graphlib-2.1.9-patch.tgz"; + sha512 = "uFO/pNMm3pN15QB+hVMU7uaQXhsBNwEA8lOET/VDcdOzLptODhXzkJqSHqt0tZlpdAz6/6Uaj8jY00UvPFgFMA=="; + }; + }; + "@snyk/inquirer-6.2.2-patch" = { + name = "_at_snyk_slash_inquirer"; + packageName = "@snyk/inquirer"; + version = "6.2.2-patch"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/inquirer/-/inquirer-6.2.2-patch.tgz"; + sha512 = "IUq5bHRL0vtVKtfvd4GOccAIaLYHbcertug2UVZzk5+yY6R/CxfYsnFUTho1h4BdkfNdin2tPjE/5jRF4SKSrw=="; + }; + }; + "@snyk/java-call-graph-builder-1.8.0" = { + name = "_at_snyk_slash_java-call-graph-builder"; + packageName = "@snyk/java-call-graph-builder"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.8.0.tgz"; + sha512 = "dD7hVdEKMMU9CP0jQLm6Q1+l6506rjW0dqQflJ3QOVohNzptYJtTv9pHKzgRu5+q/fgEc35oYi02A0WIQwSvpw=="; + }; + }; + "@snyk/lodash-4.17.15-patch" = { + name = "_at_snyk_slash_lodash"; + packageName = "@snyk/lodash"; + version = "4.17.15-patch"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/lodash/-/lodash-4.17.15-patch.tgz"; + sha512 = "e4+t34bGyjjRnwXwI14hqye9J/nRbG9iwaqTgXWHskm5qC+iK0UrjgYdWXiHJCf3Plbpr+1rpW+4LPzZnCGMhQ=="; + }; + }; + "@snyk/rpm-parser-1.1.0" = { + name = "_at_snyk_slash_rpm-parser"; + packageName = "@snyk/rpm-parser"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-1.1.0.tgz"; + sha512 = "+DyCagvnpyBjwYTxaPMQGLW4rkpKAw1Jrh8YbZCg7Ix172InBxdve/0zud18Lu2H6xWtDDdMvRDdfl82wlTBvA=="; + }; + }; + "@snyk/ruby-semver-2.2.0" = { name = "_at_snyk_slash_ruby-semver"; packageName = "@snyk/ruby-semver"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/ruby-semver/-/ruby-semver-2.1.0.tgz"; - sha512 = "u8ez8kWyqge+N+FxRDx/uPBmcHzY7BMfODvzEVeoTOeoD0CHPymEaVlkEKA8ZHtxzXjUzPIl2I8f2siZEzLjYg=="; + url = "https://registry.npmjs.org/@snyk/ruby-semver/-/ruby-semver-2.2.0.tgz"; + sha512 = "FqUayoVjcyCsQFYPm3DcaCKdFR4xmapUkCGY+bcNBs3jqCUw687PoP9CPQ1Jvtaw5YpfBNl/62jyntsWCeciuA=="; }; }; - "@snyk/snyk-cocoapods-plugin-2.0.1" = { + "@snyk/snyk-cocoapods-plugin-2.2.0" = { name = "_at_snyk_slash_snyk-cocoapods-plugin"; packageName = "@snyk/snyk-cocoapods-plugin"; - version = "2.0.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.0.1.tgz"; - sha512 = "XVkvaMvMzQ3miJi/YZmsRJSAUfDloYhfg6pXPgzAeAugB4p+cNi01Z68pT62ypB8U/Ugh1Xx2pb9aoOFqBbSjA=="; + url = "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.2.0.tgz"; + sha512 = "Ux7hXKawbk30niGBToGkKqHyKzhT3E7sCl0FNkPkHaaGZwPwhFCDyNFxBd4uGgWiQ+kT+RjtH5ahna+bSP69Yg=="; }; }; "@snyk/update-notifier-2.5.1-rc2" = { @@ -2992,6 +3136,15 @@ let sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ=="; }; }; + "@tencent-sdk/capi-0.2.15" = { + name = "_at_tencent-sdk_slash_capi"; + packageName = "@tencent-sdk/capi"; + version = "0.2.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-0.2.15.tgz"; + sha512 = "5t94Mo/+Kdvr60tJR/+pylUCwIM+ipcBIkUi4M7dtV0yCpuykOXV4GYT1aWg/iWMXyIPnfOUk4Pr6OwDoAVehw=="; + }; + }; "@textlint/ast-node-types-4.2.5" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; @@ -3127,13 +3280,13 @@ let sha512 = "XO6INPbZCxdprl+9qa/AAbFFOMzzwqYxpjPgLICrMD6C2FCw6qfJOPcBk6JqqPLSaZ/Qx87qn4rpPmPMwaAK6w=="; }; }; - "@tootallnate/once-1.0.0" = { + "@tootallnate/once-1.1.2" = { name = "_at_tootallnate_slash_once"; packageName = "@tootallnate/once"; - version = "1.0.0"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@tootallnate/once/-/once-1.0.0.tgz"; - sha512 = "KYyTT/T6ALPkIRd2Ge080X/BsXvy9O0hcWTtMWkPvwAwF99+vn6Dv4GzrFT/Nn1LePr+FFDbRXXlqmsy9lw2zA=="; + url = "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz"; + sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; }; }; "@types/accepts-1.3.5" = { @@ -3163,13 +3316,13 @@ let sha512 = "dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ=="; }; }; - "@types/babel__core-7.1.6" = { + "@types/babel__core-7.1.7" = { name = "_at_types_slash_babel__core"; packageName = "@types/babel__core"; - version = "7.1.6"; + version = "7.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.6.tgz"; - sha512 = "tTnhWszAqvXnhW7m5jQU9PomXSiKXk2sFxpahXvI20SZKu9ylPi8WtIxueZ6ehDWikPT0jeFujMj3X4ZHuf3Tg=="; + url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.7.tgz"; + sha512 = "RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw=="; }; }; "@types/babel__generator-7.6.1" = { @@ -3190,13 +3343,13 @@ let sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg=="; }; }; - "@types/babel__traverse-7.0.9" = { + "@types/babel__traverse-7.0.11" = { name = "_at_types_slash_babel__traverse"; packageName = "@types/babel__traverse"; - version = "7.0.9"; + version = "7.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.9.tgz"; - sha512 = "jEFQ8L1tuvPjOI8lnpaf73oCJe+aoxL6ygqSy6c8LcW98zaC+4mzWuQIRCEvKeCOu+lbqdXcg4Uqmm1S8AP1tw=="; + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.11.tgz"; + sha512 = "ddHK5icION5U6q11+tV2f9Mo6CZVuT8GJKld2q9LqHSZbvLbH34Kcu2yFGckZut453+eQU6btIA3RihmnRgI+Q=="; }; }; "@types/babylon-6.16.5" = { @@ -3217,15 +3370,6 @@ let sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; }; }; - "@types/bunyan-1.8.6" = { - name = "_at_types_slash_bunyan"; - packageName = "@types/bunyan"; - version = "1.8.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/bunyan/-/bunyan-1.8.6.tgz"; - sha512 = "YiozPOOsS6bIuz31ilYqR5SlLif4TBWsousN2aCWLi5233nZSX19tFbcQUPdR7xJ8ypPyxkCGNxg0CIV5n9qxQ=="; - }; - }; "@types/cacheable-request-6.0.1" = { name = "_at_types_slash_cacheable-request"; packageName = "@types/cacheable-request"; @@ -3253,6 +3397,15 @@ let sha512 = "2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A=="; }; }; + "@types/content-disposition-0.5.3" = { + name = "_at_types_slash_content-disposition"; + packageName = "@types/content-disposition"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/content-disposition/-/content-disposition-0.5.3.tgz"; + sha512 = "P1bffQfhD3O4LW0ioENXUhZ9OIa0Zn+P7M+pWgkCKaT53wVLSq0mrKksCID/FGHpFhRSxRGhgrQmfhRuzwtKdg=="; + }; + }; "@types/cookiejar-2.1.1" = { name = "_at_types_slash_cookiejar"; packageName = "@types/cookiejar"; @@ -3325,22 +3478,22 @@ let sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; }; }; - "@types/express-4.17.2" = { + "@types/express-4.17.4" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.2"; + version = "4.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.2.tgz"; - sha512 = "5mHFNyavtLoJmnusB8OKJ5bshSzw+qkMIBAobLrIM48HJvunFva9mOa6aBwh64lBFyNwBbs0xiEFuj4eU/NjCA=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.4.tgz"; + sha512 = "DO1L53rGqIDUEvOjJKmbMEQ5Z+BM2cIEPy/eV3En+s166Gz+FeuzRerxcab757u/U4v4XF4RYrZPmqKa+aY/2w=="; }; }; - "@types/express-serve-static-core-4.17.3" = { + "@types/express-serve-static-core-4.17.5" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.3"; + version = "4.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.3.tgz"; - sha512 = "sHEsvEzjqN+zLbqP+8OXTipc10yH1QLR+hnr5uw29gi9AhCAAAdri8ClNV7iMdrJrIzXIQtlkPvq8tJGhj3QJQ=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.5.tgz"; + sha512 = "578YH5Lt88AKoADy0b2jQGwJtrBxezXtVe/MBqWXKZpqx91SnC0pVkVCcxcytz3lWW+cHBYDi3Ysh0WXc+rAYw=="; }; }; "@types/fs-capacitor-2.0.0" = { @@ -3361,6 +3514,15 @@ let sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w=="; }; }; + "@types/graceful-fs-4.1.3" = { + name = "_at_types_slash_graceful-fs"; + packageName = "@types/graceful-fs"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz"; + sha512 = "AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ=="; + }; + }; "@types/graphql-upload-8.0.3" = { name = "_at_types_slash_graphql-upload"; packageName = "@types/graphql-upload"; @@ -3415,22 +3577,22 @@ let sha512 = "UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA=="; }; }; - "@types/jquery-3.3.33" = { + "@types/jquery-3.3.37" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.3.33"; + version = "3.3.37"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.33.tgz"; - sha512 = "U6IdXYGkfUI42SR79vB2Spj+h1Ly3J3UZjpd8mi943lh126TK7CB+HZOxGh2nM3IySor7wqVQdemD/xtydsBKA=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.37.tgz"; + sha512 = "4MNntGYm6xdDiz2+B92xEmWcFN9mOeMXqS854lSe7LDpBhzscUjvXjCAl6JwPBtAkqmPZq+L4I5UyXXNDZyq4Q=="; }; }; - "@types/js-yaml-3.12.2" = { + "@types/js-yaml-3.12.3" = { name = "_at_types_slash_js-yaml"; packageName = "@types/js-yaml"; - version = "3.12.2"; + version = "3.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.2.tgz"; - sha512 = "0CFu/g4mDSNkodVwWijdlr8jH7RoplRWNgovjFLEZeT+QEbbZXjBmCe3HwaWheAlCbHwomTwzZoSedeOycABug=="; + url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.3.tgz"; + sha512 = "otRe77JNNWzoVGLKw8TCspKswRoQToys4tuL6XYVBFxjgeM0RUrx7m3jkaTdxILxeGry3zM8mGYkGXMeQ02guA=="; }; }; "@types/json-schema-7.0.4" = { @@ -3460,13 +3622,13 @@ let sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw=="; }; }; - "@types/koa-2.11.2" = { + "@types/koa-2.11.3" = { name = "_at_types_slash_koa"; packageName = "@types/koa"; - version = "2.11.2"; + version = "2.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.2.tgz"; - sha512 = "2UPelagNNW6bnc1I5kIzluCaheXRA9S+NyOdXEFFj9Az7jc15ek5V03kb8OTbb3tdZ5i2BIJObe86PhHvpMolg=="; + url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.3.tgz"; + sha512 = "ABxVkrNWa4O/Jp24EYI/hRNqEVRlhB9g09p48neQp4m3xL1TJtdWk2NyNQSMCU45ejeELMQZBYyfstyVvO2H3Q=="; }; }; "@types/koa-compose-3.2.5" = { @@ -3478,13 +3640,13 @@ let sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ=="; }; }; - "@types/lodash-4.14.149" = { + "@types/lodash-4.14.150" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.149"; + version = "4.14.150"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.149.tgz"; - sha512 = "ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.150.tgz"; + sha512 = "kMNLM5JBcasgYscD9x/Gvr6lTAv2NVgsKtet/hm93qMyf/D1pt+7jeEZklKJKxMVmXjxbRVQQGfqDSfipYCO6w=="; }; }; "@types/long-4.0.1" = { @@ -3523,40 +3685,58 @@ let sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6"; }; }; - "@types/node-10.17.17" = { + "@types/node-10.17.21" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "10.17.21"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-10.17.21.tgz"; + sha512 = "PQKsydPxYxF1DsAFWmunaxd3sOi3iMt6Zmx/tgaagHYmwJ/9cRH91hQkeJZaUGWbvn0K5HlSVEXkn5U/llWPpQ=="; + }; + }; + "@types/node-12.12.37" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.17"; + version = "12.12.37"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.17.tgz"; - sha512 = "gpNnRnZP3VWzzj5k3qrpRC6Rk3H/uclhAVo1aIvwzK5p5cOrs9yEyQ8H/HBsBY0u5rrWxXEiVPQ0dEB6pkjE8Q=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.12.37.tgz"; + sha512 = "4mXKoDptrXAwZErQHrLzpe0FN/0Wmf5JRniSVIdwUrtDf9wnmEV1teCNLBo/TwuXhkK/bVegoEn/wmb+x0AuPg=="; }; }; - "@types/node-13.9.3" = { + "@types/node-13.13.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.9.3"; + version = "13.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz"; - sha512 = "01s+ac4qerwd6RHD+mVbOEsraDHSgUaefQlEdBbUolnQFjKwCr7luvAlEwW1RFojh67u0z4OUTjPn9LEl4zIkA=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.4.tgz"; + sha512 = "x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA=="; }; }; - "@types/node-6.14.9" = { + "@types/node-6.14.10" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "6.14.9"; + version = "6.14.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-6.14.9.tgz"; - sha512 = "leP/gxHunuazPdZaCvsCefPQxinqUDsCxCR5xaDUrY2MkYxQRFZZwU5e7GojyYsGB7QVtCi7iVEl/hoFXQYc+w=="; + url = "https://registry.npmjs.org/@types/node/-/node-6.14.10.tgz"; + sha512 = "pF4HjZGSog75kGq7B1InK/wt/N08BuPATo+7HRfv7gZUzccebwv/fmWVGs/j6LvSiLWpCuGGhql51M/wcQsNzA=="; }; }; - "@types/node-fetch-2.5.5" = { + "@types/node-fetch-2.5.6" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; - version = "2.5.5"; + version = "2.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.5.tgz"; - sha512 = "IWwjsyYjGw+em3xTvWVQi5MgYKbRs0du57klfTaZkv/B24AEQ/p/IopNeqIYNy3EsfHOpg8ieQSDomPcsYMHpA=="; + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.6.tgz"; + sha512 = "2w0NTwMWF1d3NJMK0Uiq2UNN8htVCyOWOD0jIPjPgC5Ph/YP4dVhs9YxxcMcuLuwAslz0dVEcZQUaqkLs3IzOQ=="; + }; + }; + "@types/node-fetch-2.5.7" = { + name = "_at_types_slash_node-fetch"; + packageName = "@types/node-fetch"; + version = "2.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz"; + sha512 = "o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw=="; }; }; "@types/normalize-package-data-2.4.0" = { @@ -3577,6 +3757,15 @@ let sha512 = "ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw=="; }; }; + "@types/qs-6.9.1" = { + name = "_at_types_slash_qs"; + packageName = "@types/qs"; + version = "6.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.1.tgz"; + sha512 = "lhbQXx9HKZAPgBkISrBcmAcMpZsmpe/Cd/hY7LGZS5OfkySUBItnPZHgQPssWYUET8elF+yCFBbP1Q0RZPTdaw=="; + }; + }; "@types/range-parser-1.2.3" = { name = "_at_types_slash_range-parser"; packageName = "@types/range-parser"; @@ -3604,15 +3793,6 @@ let sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; }; }; - "@types/restify-4.3.6" = { - name = "_at_types_slash_restify"; - packageName = "@types/restify"; - version = "4.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/restify/-/restify-4.3.6.tgz"; - sha512 = "4l4f0EXnleXQttlhRCXtTuJ8UelsKiAKIK2AAEd2epBHu41aEbM0U2z6E5tUrNwlbxz7qaNBISduGMeg+G3PaA=="; - }; - }; "@types/semver-5.5.0" = { name = "_at_types_slash_semver"; packageName = "@types/semver"; @@ -3676,22 +3856,31 @@ let sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw=="; }; }; - "@types/ws-6.0.4" = { + "@types/vscode-1.44.0" = { + name = "_at_types_slash_vscode"; + packageName = "@types/vscode"; + version = "1.44.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.44.0.tgz"; + sha512 = "WJZtZlinE3meRdH+I7wTsIhpz/GLhqEQwmPGeh4s1irWLwMzCeTV8WZ+pgPTwrDXoafVUWwo1LiZ9HJVHFlJSQ=="; + }; + }; + "@types/ws-7.2.4" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "6.0.4"; + version = "7.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz"; - sha512 = "PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-7.2.4.tgz"; + sha512 = "9S6Ask71vujkVyeEXKxjBSUV8ZUB0mjL5la4IncBoheu04bDaYyUKErh1BQcY9+WzOUOiKqz/OnpJHYckbMfNg=="; }; }; - "@types/xml2js-0.4.3" = { + "@types/xml2js-0.4.5" = { name = "_at_types_slash_xml2js"; packageName = "@types/xml2js"; - version = "0.4.3"; + version = "0.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.3.tgz"; - sha512 = "Pv2HGRE4gWLs31In7nsyXEH4uVVsd0HNV9i2dyASvtDIlOtSTr1eczPLDpdEuyv5LWH5LT20GIXwPjkshKWI1g=="; + url = "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.5.tgz"; + sha512 = "yohU3zMn0fkhlape1nxXG2bLEGZRc1FeqF80RoHaYXJN7uibaauXfhzhOJr1Xh36sn+/tx21QAOf07b/xYVk1w=="; }; }; "@types/yargs-15.0.4" = { @@ -3730,6 +3919,15 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; + "@typescript-eslint/eslint-plugin-2.31.0" = { + name = "_at_typescript-eslint_slash_eslint-plugin"; + packageName = "@typescript-eslint/eslint-plugin"; + version = "2.31.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.31.0.tgz"; + sha512 = "iIC0Pb8qDaoit+m80Ln/aaeu9zKQdOLF4SHcGLarSeY1gurW6aU4JsOPMjKQwXlw70MvWKZQc6S2NamA8SJ/gg=="; + }; + }; "@typescript-eslint/experimental-utils-1.13.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; @@ -3739,6 +3937,15 @@ let sha512 = "zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg=="; }; }; + "@typescript-eslint/experimental-utils-2.31.0" = { + name = "_at_typescript-eslint_slash_experimental-utils"; + packageName = "@typescript-eslint/experimental-utils"; + version = "2.31.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.31.0.tgz"; + sha512 = "MI6IWkutLYQYTQgZ48IVnRXmLR/0Q6oAyJgiOror74arUMh7EWjJkADfirZhRsUMHeLJ85U2iySDwHTSnNi9vA=="; + }; + }; "@typescript-eslint/parser-1.13.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; @@ -3748,6 +3955,15 @@ let sha512 = "ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ=="; }; }; + "@typescript-eslint/parser-2.31.0" = { + name = "_at_typescript-eslint_slash_parser"; + packageName = "@typescript-eslint/parser"; + version = "2.31.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.31.0.tgz"; + sha512 = "uph+w6xUOlyV2DLSC6o+fBDzZ5i7+3/TxAsH4h3eC64tlga57oMb96vVlXoMwjR/nN+xyWlsnxtbDkB46M2EPQ=="; + }; + }; "@typescript-eslint/typescript-estree-1.13.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; @@ -3757,49 +3973,49 @@ let sha512 = "b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw=="; }; }; - "@typescript-eslint/typescript-estree-2.25.0" = { + "@typescript-eslint/typescript-estree-2.31.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "2.25.0"; + version = "2.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.25.0.tgz"; - sha512 = "VUksmx5lDxSi6GfmwSK7SSoIKSw9anukWWNitQPqt58LuYrKalzsgeuignbqnB+rK/xxGlSsCy8lYnwFfB6YJg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.31.0.tgz"; + sha512 = "vxW149bXFXXuBrAak0eKHOzbcu9cvi6iNcJDzEtOkRwGHxJG15chiAQAwhLOsk+86p9GTr/TziYvw+H9kMaIgA=="; }; }; - "@vue/cli-shared-utils-4.2.3" = { + "@vue/cli-shared-utils-4.3.1" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "4.2.3"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.2.3.tgz"; - sha512 = "GCoTB6vMZsi9z/Bmn8/C9IlnUw8eeHONOGE+48TJkZyulftVFhlwVWjTFp5GuDAlwpTWarHchW9IoVu3pIIGfA=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.3.1.tgz"; + sha512 = "lcfRalou7Z9jZgIh9PeTIpwDK7RIjr9OxfLGwbdR8czUZYUeUa67zVEMJD0OPYh/CCoREtzNbVfLPb/IYYxWEA=="; }; }; - "@vue/cli-ui-4.2.3" = { + "@vue/cli-ui-4.3.1" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "4.2.3"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.2.3.tgz"; - sha512 = "Jk400/8tujs+gPg/a505R1YaANkzCHJh+zixoxj+BUZB+VDYVQl+ypQLm75KNuakN7BZeMJU51kKRAv7fI6/YQ=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.3.1.tgz"; + sha512 = "fHsVO62rCCmIFnufDzy9JeQXZ6ylyNFpGrjP4UJ8vkWTDLrmKRgS7LHLn5DAIhr1e1/34GsXBntqwIWneJW8mg=="; }; }; - "@vue/cli-ui-addon-webpack-4.2.3" = { + "@vue/cli-ui-addon-webpack-4.3.1" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "4.2.3"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.2.3.tgz"; - sha512 = "K4qJ02W8B4C6tTn4O88SOZS6JTRgXxlygKHFg1Z/bb/X6J7AXfKbafjxF6s6WNiL1yJdTJMlT5Ow23I//Uu9Lg=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.3.1.tgz"; + sha512 = "Mrm4q5xxRmCos+nvRiZOwWvCnq6gWa2vsYVvb3mSA+hZhtRbLMASYsSAdsXTBySiaBQxvbKHLlnu3XV0bLlD3A=="; }; }; - "@vue/cli-ui-addon-widgets-4.2.3" = { + "@vue/cli-ui-addon-widgets-4.3.1" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "4.2.3"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.2.3.tgz"; - sha512 = "HuJ/KEpRObKyKWu1Z89AwwwB06cffOmJs6Y6xutuyDjjnaGk/BdwTk+NaTGC0wMlam6Jm9Yw36ikAnr2XUGITw=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.3.1.tgz"; + sha512 = "0j6rUukhGGSRddSG5Ijol1uhTlDPx1/nU9gYeH1DKqoX9wR4Zfziqxfm2AulLNTbdFWZn4W0K0QaA2WZfkyRzw=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -4144,13 +4360,13 @@ let sha512 = "LrKVLove/zw6h2Md/KZyWxIkFM6AoyKp71OqpH9Hiip1csjPVoD3tPxlbQUNxEnHENks3UGgNpSBCAfq9KWuag=="; }; }; - "@wry/equality-0.1.9" = { + "@wry/equality-0.1.11" = { name = "_at_wry_slash_equality"; packageName = "@wry/equality"; - version = "0.1.9"; + version = "0.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/@wry/equality/-/equality-0.1.9.tgz"; - sha512 = "mB6ceGjpMGz1ZTza8HYnrPGos2mC6So4NhS1PtZ8s4Qt0K7fBiIGhpSxUbQmhwcSWE3no+bYxmI2OL6KuXYmoQ=="; + url = "https://registry.npmjs.org/@wry/equality/-/equality-0.1.11.tgz"; + sha512 = "mwEVBDUVODlsQQ5dfuLUS5/Tf7jqUKyhKYHmVi4fPB6bDMOfWvUPJmKgS1Z7Za/sOI3vzWt4+O7yCiL/70MogA=="; }; }; "@xtuc/ieee754-1.2.0" = { @@ -4324,13 +4540,22 @@ let sha512 = "jzewKKpZbaYUa6HTThnrl+GrJhzjEAeuc7hTVpZdzg7kupXZFoqQDFwyOwLNbmJKJlmzw8yiipMPkDiuKkT06Q=="; }; }; - "abstract-leveldown-6.2.2" = { + "abstract-leveldown-6.2.3" = { name = "abstract-leveldown"; packageName = "abstract-leveldown"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.2.tgz"; - sha512 = "/a+Iwj0rn//CX0EJOasNyZJd2o8xur8Ce9C57Sznti/Ilt/cb6Qd8/k98A4ZOklXgTG+iAYYUs1OTG0s1eH+zQ=="; + url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz"; + sha512 = "BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ=="; + }; + }; + "abstract-leveldown-6.3.0" = { + name = "abstract-leveldown"; + packageName = "abstract-leveldown"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.3.0.tgz"; + sha512 = "TU5nlYgta8YrBMNpc9FwQzRbiXsj49gsALsXadbGHt9CROPzX5fB0rWDR5mtdpOOKa5XqRFpbj1QroPAoPzVjQ=="; }; }; "abstract-logging-1.0.0" = { @@ -4558,13 +4783,13 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-1.20.0" = { + "addons-linter-1.23.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "1.20.0"; + version = "1.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.20.0.tgz"; - sha512 = "EIyJnIkvXhBKgOzVFR873uGa4ny07odIl8i8qWxHAuVJWM/ZQtLouAbndA+cVRDbD66sK6HsO1oWN6WkdCr/uA=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.23.0.tgz"; + sha512 = "4ozo5E+KnsU9h94J496WQs6NYSnofxtw5/Sy63PmeB5FJ3KWERx1S9D8A+ixMAIMgaSiexHpp5alp9yjE0t4gg=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -4684,13 +4909,13 @@ let sha512 = "e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ=="; }; }; - "agentkeepalive-4.1.0" = { + "agentkeepalive-4.1.2" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "4.1.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.0.tgz"; - sha512 = "CW/n1wxF8RpEuuiq6Vbn9S8m0VSYDMnZESqaJ6F2cWN9fY8rei2qaxweIaRgq+ek8TqfoFIsUjaGNKGGEHElSg=="; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.2.tgz"; + sha512 = "waNHE7tQBBn+2qXucI8HY0o2Y0OBPWldWOWsZwY71JcCm4SvrPnWdceFfB5NIXSqE8Ewq6VR/Qt5b1i69P6KCQ=="; }; }; "aggregate-error-3.0.1" = { @@ -4756,22 +4981,22 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; - "ajv-6.10.2" = { + "ajv-6.12.0" = { name = "ajv"; packageName = "ajv"; - version = "6.10.2"; + version = "6.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz"; - sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz"; + sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="; }; }; - "ajv-6.12.0" = { + "ajv-6.12.2" = { name = "ajv"; packageName = "ajv"; - version = "6.12.0"; + version = "6.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz"; - sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz"; + sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ=="; }; }; "ajv-6.5.3" = { @@ -5251,13 +5476,13 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-2.25.0" = { + "apollo-2.27.3" = { name = "apollo"; packageName = "apollo"; - version = "2.25.0"; + version = "2.27.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.25.0.tgz"; - sha512 = "+y/V2HtuSQBjupTJDS30nn/3urml1YE1sAKRK/bkwJLWAkGxNk2M/2vrbSnuASWv40F+K+NaLkveMoNaBL5L3A=="; + url = "https://registry.npmjs.org/apollo/-/apollo-2.27.3.tgz"; + sha512 = "9GWIdwah0o4XiNTGcoc4JIflBYf+3+JflKeqS3YfJ8uOzUPGSaFIt0Z42p43TJ9ALvJqnlcYy/cBCizihne3Xg=="; }; }; "apollo-cache-1.3.4" = { @@ -5269,13 +5494,13 @@ let sha512 = "7X5aGbqaOWYG+SSkCzJNHTz2ZKDcyRwtmvW4mGVLRqdQs+HxfXS4dUS2CcwrAj449se6tZ6NLUMnjko4KMt3KA=="; }; }; - "apollo-cache-control-0.9.0" = { + "apollo-cache-control-0.10.0" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.9.0.tgz"; - sha512 = "iLT6IT4Ul5cMfBcJAvhpk3a7AD6fXqvFxNmJEPVapVJHbSKYIjra4PTis13sOyN5Y3WQS6a+NRFxAW8+hL3q3Q=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.10.0.tgz"; + sha512 = "UIcPlrPdRTOKrF7kc5/WD5i6EVkGEEqgOK/fMj92fnnxR1KnQDiN82lqaxu02eZJvWjFJjik0JVJNXKOJXVrpQ=="; }; }; "apollo-cache-inmemory-1.6.5" = { @@ -5314,13 +5539,13 @@ let sha512 = "sanUIqXWyyDpxY3fYOVU+Hsxwxdj5fmn3Zcy6CcMGnWmh9o7tautQAuod2a63wrDs1jcNQcFq3EKIpeB+2xECw=="; }; }; - "apollo-codegen-core-0.36.4" = { + "apollo-codegen-core-0.36.8" = { name = "apollo-codegen-core"; packageName = "apollo-codegen-core"; - version = "0.36.4"; + version = "0.36.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.36.4.tgz"; - sha512 = "+wgqwuI1TIfK490gFa1I+cqTaXARCiOJ6LDt2XODyW78yhnhhkgwj2ATSG3lggMbi25orM5AuHPytJCvrpYoTA=="; + url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.36.8.tgz"; + sha512 = "T/JhiGIJHpqVw6YAbdxhDXUYqZjm5wqoGL4yc3rgpNH7Wo/TOFpiFu0FDQyncq2uU7za062Pj8lXj1jhC6uNzQ=="; }; }; "apollo-codegen-flow-0.20.0" = { @@ -5332,13 +5557,13 @@ let sha512 = "XgKE19B0Q74PBLVqHP/77NcCFrcvrN9wi3CcotH+FV8BeHTjvpHlilTsQMmd2STPt19cCvY2Qtz0EOeLXTUQ2Q=="; }; }; - "apollo-codegen-flow-0.34.4" = { + "apollo-codegen-flow-0.34.8" = { name = "apollo-codegen-flow"; packageName = "apollo-codegen-flow"; - version = "0.34.4"; + version = "0.34.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.34.4.tgz"; - sha512 = "85LK4hpBv2auzFFPs+5YkI1T1HIr1n1cj9K+5gQGuAOtl+LuNF14saYEWNDMZS7xKs5TyS/wbxA6PdOlF7gKqg=="; + url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.34.8.tgz"; + sha512 = "U81ZM2roWSSKrlZSqpltJfG5TRrDjqyyV+odC5GWzyYZUltYTqDqZjoleGeMguLBupDFOr21QUlM1LtJxeRAfQ=="; }; }; "apollo-codegen-flow-legacy-0.20.0" = { @@ -5359,13 +5584,13 @@ let sha512 = "NbnMOfUXXovlTGRj4mIZGXB9HvidQhwKfAmdYHox5peHPkjjsqEzxGCIuWCSnubWiCF2uHZnQoIkg4sXWf0KLw=="; }; }; - "apollo-codegen-scala-0.35.4" = { + "apollo-codegen-scala-0.35.8" = { name = "apollo-codegen-scala"; packageName = "apollo-codegen-scala"; - version = "0.35.4"; + version = "0.35.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.35.4.tgz"; - sha512 = "rmzUHfCWNpBw8sED8jyCZMesX2XMv9U/KYnOwbbQadK+ez70LIL89WoPLsTIZi+XqagyhqiJDw8bjyqcfE3qgA=="; + url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.35.8.tgz"; + sha512 = "c9g7+2MLzDG217cy4KFMCCXxw+kBTjvUxjXG9+PwzP5cEMchFxlCQdMbOazY+s03Q8Uy4uYh6f+Kw0x0YaPoWw=="; }; }; "apollo-codegen-swift-0.20.0" = { @@ -5377,13 +5602,13 @@ let sha512 = "L9Y4StbXw0t/nuF+miz0ybSt/io6tsLc063Yeh1A8GCvhFFQyXE/yK0Rf3nO1Bl5Z9UZ5o8Aae9kK4GSWYIGNQ=="; }; }; - "apollo-codegen-swift-0.36.4" = { + "apollo-codegen-swift-0.36.8" = { name = "apollo-codegen-swift"; packageName = "apollo-codegen-swift"; - version = "0.36.4"; + version = "0.36.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.36.4.tgz"; - sha512 = "0wCjtCaHMYxieezx3eJS4Csc+289hsEJF+QxUea88oB32PyIcv8H5B/erJMlEiTm4fAVZyBta3XxN9474ii0OQ=="; + url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.36.8.tgz"; + sha512 = "PTZtRGfSFi8UkE8T92W2/zMFZ8GI59KQdotVWqUphaprhFnzHnig3YZf8L05eBgkbQuDPDckjBoRnICporG5Cw=="; }; }; "apollo-codegen-typescript-0.20.0" = { @@ -5395,13 +5620,13 @@ let sha512 = "mzlIJXz+5WPwzeALqRHHR9aPPEf6IlhSrjCawpUHmFU1NK9hgwbguYCEYZv9mKkYBUUgDY+9cGFK1cafJX70AQ=="; }; }; - "apollo-codegen-typescript-0.36.4" = { + "apollo-codegen-typescript-0.36.8" = { name = "apollo-codegen-typescript"; packageName = "apollo-codegen-typescript"; - version = "0.36.4"; + version = "0.36.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.36.4.tgz"; - sha512 = "2+PIx8jkm1klD16bW3+eMcuKm0OWI1/VNdREwMPz5CZ+cecaFeIpl0uuNAf+G9IyOm9AThgXNBqxRDa9XhNw5A=="; + url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.36.8.tgz"; + sha512 = "IL0UaqXuByNUjbn3oxEpBidnCIKwiNmXYpwj+EqKnnQhOVwiV7wyXYRhBFp3LoUQVW5UKZ+qulYujlCvYvaj0w=="; }; }; "apollo-codegen-typescript-legacy-0.20.0" = { @@ -5422,94 +5647,94 @@ let sha512 = "Yja12BgNQhzuFGG/5Nw2MQe0hkuQy2+9er09HxeEyAf2rUDIPnhPrn1MDoZTB8MU7UGfjwITC+1ofzKkkrZobA=="; }; }; - "apollo-engine-reporting-1.7.0" = { + "apollo-engine-reporting-1.8.0" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.7.0.tgz"; - sha512 = "jsjSnoHrRmk4XXK4aFU17YSJILmWsilKRwIeN74QJsSxjn5SCVF4EI/ebf/MNrTHpft8EhShx+wdkAcOD9ivqA=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.8.0.tgz"; + sha512 = "VPVpIGW6lbYXga6sqq/fG8ZaPR70bFuxvCov6X0npuVQPXwgZrzBp50cHx9uIaBVxDDxD3leeznsQbmF37RAww=="; }; }; - "apollo-engine-reporting-protobuf-0.4.4" = { + "apollo-engine-reporting-protobuf-0.5.0" = { name = "apollo-engine-reporting-protobuf"; packageName = "apollo-engine-reporting-protobuf"; - version = "0.4.4"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.4.4.tgz"; - sha512 = "SGrIkUR7Q/VjU8YG98xcvo340C4DaNUhg/TXOtGsMlfiJDzHwVau/Bv6zifAzBafp2lj0XND6Daj5kyT/eSI/w=="; + url = "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.0.tgz"; + sha512 = "OgMwtLcuL+YAaO2xgkPbnRJnISLDSNE5F11p7oq+1ws+ws71CPfHAthDCxSObCPSALdhsLAGD0v3u3soBuNmMg=="; }; }; - "apollo-env-0.6.2" = { + "apollo-env-0.6.4" = { name = "apollo-env"; packageName = "apollo-env"; - version = "0.6.2"; + version = "0.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.2.tgz"; - sha512 = "Vb/doL1ZbzkNDJCQ6kYGOrphRx63rMERYo3MT2pzm2pNEdm6AK60InMgJaeh3RLK3cjGllOXFAgP8IY+m+TaEg=="; + url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.4.tgz"; + sha512 = "8tGDMFv3sZLd76b/ZAo8GbdWU5Qt3VEUWSB+FLN41p/hVShZw0XIo2s/i8pVCTAhaWiEiD0Cr+d/zi0/h5UTxA=="; }; }; - "apollo-graphql-0.4.1" = { + "apollo-graphql-0.4.3" = { name = "apollo-graphql"; packageName = "apollo-graphql"; - version = "0.4.1"; + version = "0.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.4.1.tgz"; - sha512 = "dz2wtGeCqUDAKAj4KXLKLZiFY791aoXduul3KcLo8/6SwqWlsuZiPe0oB8mENHZZc/EchCpTMTJZX2ZENsOt2A=="; + url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.4.3.tgz"; + sha512 = "eAl8w6TeuY0Q3x7TVqBjt4JObA34vUyctuDn2lOmkdIqlu1EKxNAnTlRtXkjQM89qUt0rK0teU8No0a2lMNGuw=="; }; }; - "apollo-language-server-1.20.1" = { + "apollo-language-server-1.21.3" = { name = "apollo-language-server"; packageName = "apollo-language-server"; - version = "1.20.1"; + version = "1.21.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.20.1.tgz"; - sha512 = "UML94ZUe1SISp0alx7as/hl2gbk0qw1j8EBDb6YlB/ggjk4WuBNlROMSeHlLdrSpq3tghnBy2hwSkQKLLQsMpw=="; + url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.21.3.tgz"; + sha512 = "PSPiOwR7Zd0alnZ0zeuUs7kEnWwV3jWIU01bsoy8eaF4Bi2fJD7AHnEyUOiu7V3V7xdJtnsJNTjyZy5MC0+Ohg=="; }; }; - "apollo-link-1.2.13" = { + "apollo-link-1.2.14" = { name = "apollo-link"; packageName = "apollo-link"; - version = "1.2.13"; + version = "1.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.13.tgz"; - sha512 = "+iBMcYeevMm1JpYgwDEIDt/y0BB7VWyvlm/7x+TIPNLHCTCMgcEgDuW5kH86iQZWo0I7mNwQiTOz+/3ShPFmBw=="; + url = "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.14.tgz"; + sha512 = "p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg=="; }; }; - "apollo-link-context-1.0.19" = { + "apollo-link-context-1.0.20" = { name = "apollo-link-context"; packageName = "apollo-link-context"; - version = "1.0.19"; + version = "1.0.20"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.19.tgz"; - sha512 = "TUi5TyufU84hEiGkpt+5gdH5HkB3Gx46npNfoxR4of3DKBCMuItGERt36RCaryGcU/C3u2zsICU3tJ+Z9LjFoQ=="; + url = "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.20.tgz"; + sha512 = "MLLPYvhzNb8AglNsk2NcL9AvhO/Vc9hn2ZZuegbhRHGet3oGr0YH9s30NS9+ieoM0sGT11p7oZ6oAILM/kiRBA=="; }; }; - "apollo-link-error-1.1.12" = { + "apollo-link-error-1.1.13" = { name = "apollo-link-error"; packageName = "apollo-link-error"; - version = "1.1.12"; + version = "1.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-error/-/apollo-link-error-1.1.12.tgz"; - sha512 = "psNmHyuy3valGikt/XHJfe0pKJnRX19tLLs6P6EHRxg+6q6JMXNVLYPaQBkL0FkwdTCB0cbFJAGRYCBviG8TDA=="; + url = "https://registry.npmjs.org/apollo-link-error/-/apollo-link-error-1.1.13.tgz"; + sha512 = "jAZOOahJU6bwSqb2ZyskEK1XdgUY9nkmeclCrW7Gddh1uasHVqmoYc4CKdb0/H0Y1J9lvaXKle2Wsw/Zx1AyUg=="; }; }; - "apollo-link-http-1.5.16" = { + "apollo-link-http-1.5.17" = { name = "apollo-link-http"; packageName = "apollo-link-http"; - version = "1.5.16"; + version = "1.5.17"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-http/-/apollo-link-http-1.5.16.tgz"; - sha512 = "IA3xA/OcrOzINRZEECI6IdhRp/Twom5X5L9jMehfzEo2AXdeRwAMlH5LuvTZHgKD8V1MBnXdM6YXawXkTDSmJw=="; + url = "https://registry.npmjs.org/apollo-link-http/-/apollo-link-http-1.5.17.tgz"; + sha512 = "uWcqAotbwDEU/9+Dm9e1/clO7hTB2kQ/94JYcGouBVLjoKmTeJTUPQKcJGpPwUjZcSqgYicbFqQSoJIW0yrFvg=="; }; }; - "apollo-link-http-common-0.2.15" = { + "apollo-link-http-common-0.2.16" = { name = "apollo-link-http-common"; packageName = "apollo-link-http-common"; - version = "0.2.15"; + version = "0.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.15.tgz"; - sha512 = "+Heey4S2IPsPyTf8Ag3PugUupASJMW894iVps6hXbvwtg1aHSNMXUYO5VG7iRHkPzqpuzT4HMBanCTXPjtGzxg=="; + url = "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.16.tgz"; + sha512 = "2tIhOIrnaF4UbQHf7kjeQA/EmSorB7+HyJIIrUjJOKBgnXwuexi8aMecRlqTIDWcyVXCeqLhUnztMa6bOH/jTg=="; }; }; "apollo-link-persisted-queries-0.2.2" = { @@ -5530,13 +5755,13 @@ let sha512 = "xMPcAfuiPVYXaLwC6oJFIZrKgV3GmdO31Ag2eufRoXpvT0AfJZjdaPB4450Nu9TslHRePN9A3quxNueILlQxlw=="; }; }; - "apollo-link-ws-1.0.19" = { + "apollo-link-ws-1.0.20" = { name = "apollo-link-ws"; packageName = "apollo-link-ws"; - version = "1.0.19"; + version = "1.0.20"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.19.tgz"; - sha512 = "mRXmeUkc55ixOdYRtfq5rq3o9sboKghKABKroDVhJnkdS56zthBEWMAD+phajujOUbqByxjok0te8ABqByBdeQ=="; + url = "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.20.tgz"; + sha512 = "mjSFPlQxmoLArpHBeUb2Xj+2HDYeTaJqFGOqQ+I8NVJxgL9lJe84PDWcPah/yMLv3rB7QgBDSuZ0xoRFBPlySw=="; }; }; "apollo-server-caching-0.5.1" = { @@ -5548,13 +5773,13 @@ let sha512 = "L7LHZ3k9Ao5OSf2WStvQhxdsNVplRQi7kCAPfqf9Z3GBEnQ2uaL0EgO0hSmtVHfXTbk5CTRziMT1Pe87bXrFIw=="; }; }; - "apollo-server-core-2.11.0" = { + "apollo-server-core-2.13.0" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.11.0"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.11.0.tgz"; - sha512 = "jHLOqwTRlyWzqWNRlwr2M/xfrt+lw2pHtKYyxUGRjWFo8EM5TX1gDcTKtbtvx9p5m+ZBDAhcWp/rpq0vSz4tqg=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.13.0.tgz"; + sha512 = "PqfsexbyObaQYb2jODs8v/XzrJcn+5mh0jA8ZfQCg5GENlua/CjeTZbRm2X0p3qpwc2E5jFAXSshrIWvhQAGZQ=="; }; }; "apollo-server-env-2.4.3" = { @@ -5566,49 +5791,49 @@ let sha512 = "23R5Xo9OMYX0iyTu2/qT0EUb+AULCBriA9w8HDfMoChB8M+lFClqUkYtaTTHDfp6eoARLW8kDBhPOBavsvKAjA=="; }; }; - "apollo-server-errors-2.4.0" = { + "apollo-server-errors-2.4.1" = { name = "apollo-server-errors"; packageName = "apollo-server-errors"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.4.0.tgz"; - sha512 = "ZouZfr2sGavvI18rgdRcyY2ausRAlVtWNOax9zca8ZG2io86dM59jXBmUVSNlVZSmBsIh45YxYC0eRvr2vmRdg=="; + url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.4.1.tgz"; + sha512 = "7oEd6pUxqyWYUbQ9TA8tM0NU/3aGtXSEibo6+txUkuHe7QaxfZ2wHRp+pfT1LC1K3RXYjKj61/C2xEO19s3Kdg=="; }; }; - "apollo-server-express-2.11.0" = { + "apollo-server-express-2.13.0" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.11.0"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.11.0.tgz"; - sha512 = "9bbiD+zFAx+xyurc9lxYmNa9y79k/gsA1vEyPFVcv7jxzCFC5wc0tcbV7NPX2qi1Nn7K76fxo2fPNYbPFX/y0g=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.13.0.tgz"; + sha512 = "xDc+kRqWCXs4MeRjls37G45V6PmKYwo7OlpWCXyWDSPGgY9UD4E5A6rUBCyIhoNr7RnVYMkNuySOOqzX1QJ7EA=="; }; }; - "apollo-server-plugin-base-0.7.0" = { + "apollo-server-plugin-base-0.8.0" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.7.0.tgz"; - sha512 = "//xgYrBYLQSr92W0z3mYsFGoVz3wxKNsv3KcOUBhbOCGTbjZgP7vHOE1vhHhRcpZKKXmjXTVONdrnNJ+XVGi6A=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.8.0.tgz"; + sha512 = "H8sJlOVJrF0IhYIFMv7NOgB6BFgqobXSZrj1y9ju6dq13OotsqcZC4fJOYc9oWzb/+/mqg/odtVioE71mj68yg=="; }; }; - "apollo-server-types-0.3.0" = { + "apollo-server-types-0.4.0" = { name = "apollo-server-types"; packageName = "apollo-server-types"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.3.0.tgz"; - sha512 = "FMo7kbTkhph9dfIQ3xDbRLObqmdQH9mwSjxhGsX+JxGMRPPXgd3+GZvCeVKOi/udxh//w1otSeAqItjvbj0tfQ=="; + url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.4.0.tgz"; + sha512 = "U+6qKCdrucVSMEVvLSqSwxIGr3VI6vcfbhpD86sdb8MgHHGH6egjNAcLrPVRk1AyXs8RV0Ysus+vlj8rpouBzA=="; }; }; - "apollo-tracing-0.9.0" = { + "apollo-tracing-0.10.0" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.9.0.tgz"; - sha512 = "oqspTrf4BLGbKkIk1vF+I31C2v7PPJmF36TFpT/+zJxNvJw54ji4ZMhtytgVqbVldQEintJmdHQIidYBGKmu+g=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.10.0.tgz"; + sha512 = "yuqA1KT0FQUfzVK3ZIk0hRIE8eUKx9Oklq83AGQxLtS/oafBj/VOCZAtJNJkyEqMJxXQT9uIBtbfO1789Gczkw=="; }; }; "apollo-upload-client-11.0.0" = { @@ -5989,6 +6214,15 @@ let sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; }; }; + "array-filter-1.0.0" = { + name = "array-filter"; + packageName = "array-filter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz"; + sha1 = "baf79e62e6ef4c2a4c0b831232daffec251f9d83"; + }; + }; "array-find-0.1.1" = { name = "array-find"; packageName = "array-find"; @@ -6421,13 +6655,13 @@ let sha512 = "zXSoVaMrf2R+r+ISid5/9a8SXm1LLdkhHzh6pSRhj9jklzruOOl1hva1YmFT33wAstg/f9ZndJAlq1BSrFLSGA=="; }; }; - "ast-types-0.13.2" = { + "ast-types-0.13.3" = { name = "ast-types"; packageName = "ast-types"; - version = "0.13.2"; + version = "0.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.13.2.tgz"; - sha512 = "uWMHxJxtfj/1oZClOxDEV1sQ1HCDkA4MG8Gr69KKeBjEVH0R84WlejZ0y2DcwyBlpAEMltmVYkVgqfLFb2oyiA=="; + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.13.3.tgz"; + sha512 = "XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA=="; }; }; "ast-types-0.9.6" = { @@ -6556,15 +6790,6 @@ let sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; }; }; - "async-3.1.1" = { - name = "async"; - packageName = "async"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.1.1.tgz"; - sha512 = "X5Dj8hK1pJNC2Wzo2Rcp9FBVdJMGRR/S7V+lH46s8GVFhtbo5O4Le5GECCF/8PISVdkUA6mMPvgz7qTTD1rf1g=="; - }; - }; "async-3.2.0" = { name = "async"; packageName = "async"; @@ -6772,13 +6997,22 @@ let sha512 = "Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ=="; }; }; - "autoprefixer-9.7.5" = { + "autoprefixer-9.7.6" = { name = "autoprefixer"; packageName = "autoprefixer"; - version = "9.7.5"; + version = "9.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.5.tgz"; - sha512 = "URo6Zvt7VYifomeAfJlMFnYDhow1rk2bufwkbamPEAtQFcL11moLk4PnR7n9vlu7M+BkXAZkHFA0mIcY7tjQFg=="; + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.6.tgz"; + sha512 = "F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ=="; + }; + }; + "available-typed-arrays-1.0.2" = { + name = "available-typed-arrays"; + packageName = "available-typed-arrays"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz"; + sha512 = "XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ=="; }; }; "await-semaphore-0.1.3" = { @@ -6808,13 +7042,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.644.0" = { + "aws-sdk-2.669.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.644.0"; + version = "2.669.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.644.0.tgz"; - sha512 = "FkglRU5fvWHwT2Ll0caXS/QzRNzh5ZCS5cs4pF2nP0OjdD7VNJhNtu5lOnSzvMHAtZQJMsG3k0em8PoI8vk1AQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.669.0.tgz"; + sha512 = "kuVcSRpDzvkgmeSmMX6Q32eTOb8UeihhUdavMrvUOP6fzSU19cNWS9HAIkYOi/jrEDK85cCZxXjxqE3JGZIGcw=="; }; }; "aws-sign2-0.6.0" = { @@ -6844,13 +7078,13 @@ let sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="; }; }; - "axios-0.17.1" = { + "axios-0.18.1" = { name = "axios"; packageName = "axios"; - version = "0.17.1"; + version = "0.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.17.1.tgz"; - sha1 = "2d8e3e5d0bdbd7327f91bc814f5c57660f81824d"; + url = "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz"; + sha512 = "0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g=="; }; }; "axios-0.19.2" = { @@ -6862,6 +7096,15 @@ let sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA=="; }; }; + "azure-devops-node-api-7.2.0" = { + name = "azure-devops-node-api"; + packageName = "azure-devops-node-api"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-7.2.0.tgz"; + sha512 = "pMfGJ6gAQ7LRKTHgiRF+8iaUUeGAI0c8puLaqHLc7B8AR7W6GJLozK9RFeUHFjEGybC9/EB3r67WPd7e46zQ8w=="; + }; + }; "babel-code-frame-6.26.0" = { name = "babel-code-frame"; packageName = "babel-code-frame"; @@ -6952,13 +7195,13 @@ let sha512 = "m2CvfDW4+1qfDdsrtf4dwOslQC3yhbgyBFptncp4wvtdrDHqueW7slsYv4gArie056phvQFhT2nRcGS4bnm6mA=="; }; }; - "babel-jest-25.1.0" = { + "babel-jest-25.5.1" = { name = "babel-jest"; packageName = "babel-jest"; - version = "25.1.0"; + version = "25.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-jest/-/babel-jest-25.1.0.tgz"; - sha512 = "tz0VxUhhOE2y+g8R2oFrO/2VtVjA1lkJeavlhExuRBg3LdNJY9gwQ+Vcvqt9+cqy71MCTJhewvTB7Qtnnr9SWg=="; + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-25.5.1.tgz"; + sha512 = "9dA9+GmMjIzgPnYtkhBg73gOo/RHqPmLruP3BaGL4KEX3Dwz6pI8auSN8G8+iuEG90+GSswyKvslN+JYSaacaQ=="; }; }; "babel-loader-8.1.0" = { @@ -6970,13 +7213,13 @@ let sha512 = "7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw=="; }; }; - "babel-plugin-dynamic-import-node-2.3.0" = { + "babel-plugin-dynamic-import-node-2.3.3" = { name = "babel-plugin-dynamic-import-node"; packageName = "babel-plugin-dynamic-import-node"; - version = "2.3.0"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz"; - sha512 = "o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ=="; + url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; + sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; }; }; "babel-plugin-istanbul-6.0.0" = { @@ -6988,13 +7231,13 @@ let sha512 = "AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ=="; }; }; - "babel-plugin-jest-hoist-25.1.0" = { + "babel-plugin-jest-hoist-25.5.0" = { name = "babel-plugin-jest-hoist"; packageName = "babel-plugin-jest-hoist"; - version = "25.1.0"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.1.0.tgz"; - sha512 = "oIsopO41vW4YFZ9yNYoLQATnnN46lp+MZ6H4VvPKFkcc2/fkl3CfE/NZZSmnEIEsJRmJAgkVEK0R7Zbl50CpTw=="; + url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.5.0.tgz"; + sha512 = "u+/W+WAjMlvoocYGTwthAiQSxDcJAyHpQ6oWlHdFZaaN+Rlk8Q7iiwDPg2lN/FyJtAYnKjFxbn7xus4HCFkg5g=="; }; }; "babel-plugin-minify-builtins-0.5.0" = { @@ -7213,22 +7456,22 @@ let sha1 = "be241ca81404030678b748717322b89d0c8fe280"; }; }; - "babel-polyfill-6.26.0" = { - name = "babel-polyfill"; - packageName = "babel-polyfill"; - version = "6.26.0"; + "babel-preset-current-node-syntax-0.1.2" = { + name = "babel-preset-current-node-syntax"; + packageName = "babel-preset-current-node-syntax"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz"; - sha1 = "379937abc67d7895970adc621f284cd966cf2153"; + url = "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz"; + sha512 = "u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw=="; }; }; - "babel-preset-jest-25.1.0" = { + "babel-preset-jest-25.5.0" = { name = "babel-preset-jest"; packageName = "babel-preset-jest"; - version = "25.1.0"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.1.0.tgz"; - sha512 = "eCGn64olaqwUMaugXsTtGAM2I0QTahjEtnRu0ql8Ie+gDWAc1N6wqN0k2NilnyTunM69Pad7gJY7LOtwLimoFQ=="; + url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.5.0.tgz"; + sha512 = "8ZczygctQkBU+63DtSOKGh7tFL0CeCuz+1ieud9lJ1WPQ9O6A1a/r+LGn6Y705PA6whHQ3T1XuB/PmpfNYf8Fw=="; }; }; "babel-preset-minify-0.5.1" = { @@ -7618,13 +7861,13 @@ let sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869"; }; }; - "bezier-js-2.6.0" = { + "bezier-js-2.6.1" = { name = "bezier-js"; packageName = "bezier-js"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/bezier-js/-/bezier-js-2.6.0.tgz"; - sha512 = "BBnddaIUivrZYXUIbyEJrFWkjU0hFkqJyqfIbANPwUQfFr3Ec61qLaFEys7VmNIwsdHL24FJZsS6MKrY7HyudQ=="; + url = "https://registry.npmjs.org/bezier-js/-/bezier-js-2.6.1.tgz"; + sha512 = "jelZM33eNzcZ9snJ/5HqJLw3IzXvA8RFcBjkdOB8SDYyOvW8Y2tTosojAiBTnD1MhbHoWUYNbxUXxBl61TxbRg=="; }; }; "biased-opener-0.2.8" = { @@ -7717,6 +7960,15 @@ let sha512 = "nbE1WxOTTrUWIfsfZ4aHGYu5DOuNkbxGokjV6Z2kxfJK3uaAb8zNK1muzOeipoLHZjInT4Br88BHpzevc681xA=="; }; }; + "binaryextensions-2.2.0" = { + name = "binaryextensions"; + packageName = "binaryextensions"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.2.0.tgz"; + sha512 = "bHhs98rj/7i/RZpCSJ3uk55pLXOItjIrh2sRQZSM6OoktScX+LxJzvlU+FELp9j3TdcddTmmYArLSGptCTwjuw=="; + }; + }; "binaryheap-0.0.3" = { name = "binaryheap"; packageName = "binaryheap"; @@ -7825,13 +8077,13 @@ let sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; }; }; - "bittorrent-tracker-9.14.4" = { + "bittorrent-tracker-9.14.5" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; - version = "9.14.4"; + version = "9.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.14.4.tgz"; - sha512 = "2Y/MNRjYhysD6t4r38z7l1WTT7g23IAqRWZRsj7xnnpciFn4xE4qiKmyFwA4gtbFGAZ14K3DdaqZbiQsC3PEfQ=="; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.14.5.tgz"; + sha512 = "Y1ng5r2qGCgDldjd9eYL8Mv1DjCo6eljqC+T6IMcwmYx0h20KNPKTxJkyNT5gaeJkAhM+p+jmhlV7/ty535Txg=="; }; }; "bl-0.8.2" = { @@ -7897,13 +8149,13 @@ let sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129"; }; }; - "blessed-contrib-4.8.19" = { + "blessed-contrib-4.8.20" = { name = "blessed-contrib"; packageName = "blessed-contrib"; - version = "4.8.19"; + version = "4.8.20"; src = fetchurl { - url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.19.tgz"; - sha512 = "g2EVkuCd8r46XVI+pgGuTYK0MGKOn30slJTUlV4m/1d/THIb4lUbY2S+yAtqiJ1q3IFu5TfwURb9/eAKZtJLNQ=="; + url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.20.tgz"; + sha512 = "jLLXR9pjjm/T2jY0Q8OCCpuDquWiMULkPyT8YNaiLUR0j1MchTQK/Q7SiuD63jn9ekn9BrohwP1Kom/FylmeHQ=="; }; }; "blob-0.0.2" = { @@ -8005,13 +8257,13 @@ let sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; }; - "blueimp-md5-2.12.0" = { + "blueimp-md5-2.13.0" = { name = "blueimp-md5"; packageName = "blueimp-md5"; - version = "2.12.0"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.12.0.tgz"; - sha512 = "zo+HIdIhzojv6F1siQPqPFROyVy7C50KzHv/k/Iz+BtvtVzSHXiMXOpq2wCfNkeBqdCv+V8XOV96tsEt2W/3rQ=="; + url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.13.0.tgz"; + sha512 = "lmp0m647R5e77ORduxLW5mISIDcvgJZa52vMBv5uVI3UmSWTQjkJsZVBfaFqQPw/QFogJwvY6e3Gl9nP+Loe+Q=="; }; }; "bn.js-4.11.8" = { @@ -8356,13 +8608,13 @@ let sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; }; }; - "browserify-16.5.0" = { + "browserify-16.5.1" = { name = "browserify"; packageName = "browserify"; - version = "16.5.0"; + version = "16.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-16.5.0.tgz"; - sha512 = "6bfI3cl76YLAnCZ75AGu/XPOsqUhRyc0F/olGIJeCxtfxF2HvPKEcmjU9M8oAPxl4uBY1U7Nry33Q6koV3f2iw=="; + url = "https://registry.npmjs.org/browserify/-/browserify-16.5.1.tgz"; + sha512 = "EQX0h59Pp+0GtSRb5rL6OTfrttlzv+uyaUVlK6GX3w11SQ0jKPKyjC/54RhPR2ib2KmfcELM06e8FxcI5XNU2A=="; }; }; "browserify-aes-1.2.0" = { @@ -8464,13 +8716,13 @@ let sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA=="; }; }; - "browserslist-4.11.0" = { + "browserslist-4.12.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.11.0"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.11.0.tgz"; - sha512 = "WqEC7Yr5wUH5sg6ruR++v2SGOQYpyUdYYd4tZoAq1F7y+QXoLoYGXVbxhtaIqWmAJjtNTRjVD3HuJc1OXTel2A=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz"; + sha512 = "UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg=="; }; }; "bser-2.1.1" = { @@ -8536,13 +8788,22 @@ let sha512 = "xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg=="; }; }; - "buffer-5.5.0" = { + "buffer-5.2.1" = { name = "buffer"; packageName = "buffer"; - version = "5.5.0"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz"; + sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg=="; + }; + }; + "buffer-5.6.0" = { + name = "buffer"; + packageName = "buffer"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.5.0.tgz"; - sha512 = "9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww=="; + url = "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz"; + sha512 = "/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw=="; }; }; "buffer-alloc-1.2.0" = { @@ -8941,13 +9202,13 @@ let sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="; }; }; - "cacache-15.0.0" = { + "cacache-15.0.3" = { name = "cacache"; packageName = "cacache"; - version = "15.0.0"; + version = "15.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-15.0.0.tgz"; - sha512 = "L0JpXHhplbJSiDGzyJJnJCTL7er7NzbBgxzVqLswEb4bO91Zbv17OUMuUeu/q0ZwKn3V+1HM4wb9tO4eVE/K8g=="; + url = "https://registry.npmjs.org/cacache/-/cacache-15.0.3.tgz"; + sha512 = "bc3jKYjqv7k4pWh7I/ixIjfcjPul4V4jme/WbjvwGS5LzoPL/GzXr4C5EgPNLO/QEZl9Oi61iGitYEdwcrwLCQ=="; }; }; "cache-base-1.0.1" = { @@ -9184,22 +9445,13 @@ let sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; }; }; - "camelcase-keys-6.1.2" = { - name = "camelcase-keys"; - packageName = "camelcase-keys"; - version = "6.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.1.2.tgz"; - sha512 = "QfFrU0CIw2oltVvpndW32kuJ/9YOJwUnmWrjlXt1nnJZHCaS9i6bfOpg9R4Lw8aZjStkJWM+jc0cdXjWBgVJSw=="; - }; - }; - "camelcase-keys-6.2.1" = { + "camelcase-keys-6.2.2" = { name = "camelcase-keys"; packageName = "camelcase-keys"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.1.tgz"; - sha512 = "BPCNVH56RVIxQQIXskp5tLQXUNGQ6sXr7iCv1FHDt81xBOQ/1r6H8SPxf19InVP6DexWar4s87q9thfuk8X9HA=="; + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz"; + sha512 = "YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg=="; }; }; "cancelable-pipeline-1.0.0" = { @@ -9229,13 +9481,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001036" = { + "caniuse-lite-1.0.30001050" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001036"; + version = "1.0.30001050"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001036.tgz"; - sha512 = "jU8CIFIj2oR7r4W+5AKcsvWNVIb6Q6OZE3UsrXrZBHFtreT4YgTeOJtTucp+zSedEpTi3L5wASSP0LYIE3if6w=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001050.tgz"; + sha512 = "OvGZqalCwmapci76ISq5q4kuAskb1ebqF3FEQBv1LE1kWht0pojlDDqzFlmk5jgYkuZN7MNZ1n+ULwe/7MaDNQ=="; }; }; "capture-exit-2.0.0" = { @@ -9436,6 +9688,15 @@ let sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; }; }; + "chalk-4.0.0" = { + name = "chalk"; + packageName = "chalk"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz"; + sha512 = "N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A=="; + }; + }; "chance-1.0.18" = { name = "chance"; packageName = "chance"; @@ -9607,13 +9868,13 @@ let sha512 = "0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA=="; }; }; - "child-process-ext-2.1.0" = { + "child-process-ext-2.1.1" = { name = "child-process-ext"; packageName = "child-process-ext"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/child-process-ext/-/child-process-ext-2.1.0.tgz"; - sha512 = "SGyUp8OVf0KgafShpiCKgCMWQoDL5nkqNc6RKXVyFwA4V1cbgIREi0r/B2xjdbgrIa0G1+2MGtxkndsvIwrBhw=="; + url = "https://registry.npmjs.org/child-process-ext/-/child-process-ext-2.1.1.tgz"; + sha512 = "0UQ55f51JBkOFa+fvR76ywRzxiPwQS3Xe8oe5bZRphpv+dIMeerW5Zn5e4cUy4COJwVtJyU0R79RMnw+aCqmGA=="; }; }; "child-process-promise-2.2.1" = { @@ -9688,13 +9949,13 @@ let sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; }; }; - "chokidar-3.3.1" = { + "chokidar-3.4.0" = { name = "chokidar"; packageName = "chokidar"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz"; - sha512 = "4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz"; + sha512 = "aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ=="; }; }; "chownr-0.0.2" = { @@ -9715,6 +9976,15 @@ let sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; + "chownr-2.0.0" = { + name = "chownr"; + packageName = "chownr"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"; + sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; + }; + }; "chroma-js-2.1.0" = { name = "chroma-js"; packageName = "chroma-js"; @@ -9742,13 +10012,13 @@ let sha512 = "HqsYJgIc8ljJJOqOzLphjAs79EUuWSX3nzZi2LNkzlw3GIzAeZbaSektC8iT/tKvLqZq8yl1GJu5o6doA4TRbg=="; }; }; - "chrome-launcher-0.12.0" = { + "chrome-launcher-0.13.1" = { name = "chrome-launcher"; packageName = "chrome-launcher"; - version = "0.12.0"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.12.0.tgz"; - sha512 = "rBUP4tvWToiileDi3UR0SbWKoUoDCYTRmVND2sdoBL1xANBgVz8V9h1yQluj3MEQaBJg0fRw7hW82uOPrJus7A=="; + url = "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.1.tgz"; + sha512 = "q8UiCNAknw6kCUvCVBTAEw1BwT0vaxabCrSjN3B/NWohp12YBD9+DalymYElSoKRD4KpVSu4CCl0us4v/J81Sg=="; }; }; "chrome-net-3.3.3" = { @@ -10039,6 +10309,15 @@ let sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582"; }; }; + "cli-progress-3.8.2" = { + name = "cli-progress"; + packageName = "cli-progress"; + version = "3.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.8.2.tgz"; + sha512 = "qRwBxLldMSfxB+YGFgNRaj5vyyHe1yMpVeDL79c+7puGujdKJHQHydgqXDcrkvQgJ5U/d3lpf6vffSoVVUftVQ=="; + }; + }; "cli-spinner-0.2.10" = { name = "cli-spinner"; packageName = "cli-spinner"; @@ -10057,13 +10336,13 @@ let sha512 = "1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg=="; }; }; - "cli-spinners-2.2.0" = { + "cli-spinners-2.3.0" = { name = "cli-spinners"; packageName = "cli-spinners"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.2.0.tgz"; - sha512 = "tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ=="; + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.3.0.tgz"; + sha512 = "Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w=="; }; }; "cli-table-0.3.1" = { @@ -10075,13 +10354,13 @@ let sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"; }; }; - "cli-table2-0.2.0" = { - name = "cli-table2"; - packageName = "cli-table2"; - version = "0.2.0"; + "cli-table3-0.5.1" = { + name = "cli-table3"; + packageName = "cli-table3"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli-table2/-/cli-table2-0.2.0.tgz"; - sha1 = "2d1ef7f218a0e786e214540562d4bd177fe32d97"; + url = "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz"; + sha512 = "7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw=="; }; }; "cli-truncate-0.2.1" = { @@ -10120,13 +10399,13 @@ let sha512 = "/1owvF0SZ5Gn54cgrikJ0QskgTzeg30HGjkmjFoaHDJzAqFpuX1DBpFR8aLvsE1J5s9MgeYRENQK4BFwOag5VA=="; }; }; - "cli-ux-5.2.1" = { + "cli-ux-5.4.5" = { name = "cli-ux"; packageName = "cli-ux"; - version = "5.2.1"; + version = "5.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.2.1.tgz"; - sha512 = "zG1012o7U4ZsCuIST1t2yrHPADv16J81RAGYjY9X1yABEFK40oyjRchD5ffVZaG44BjizmLvu677zbVIypRuxw=="; + url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.4.5.tgz"; + sha512 = "5A6FuU0wPUlfCWUjtizUvNIbXElp6jN9QUJsDibs6F9cVX1kTgaMR3m6KT0R3iriEXpMrmPKV6yYS8XICNuQ6Q=="; }; }; "cli-width-1.1.1" = { @@ -10138,13 +10417,13 @@ let sha1 = "a4d293ef67ebb7b88d4a4d42c0ccf00c4d1e366d"; }; }; - "cli-width-2.2.0" = { + "cli-width-2.2.1" = { name = "cli-width"; packageName = "cli-width"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz"; - sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz"; + sha512 = "GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="; }; }; "cliclopts-1.1.1" = { @@ -10516,13 +10795,13 @@ let sha512 = "SPnx+ZHXVJ0qTInRXmnxuyu8PDvSzvop5MXp1BOr/urFQI3yL2n5ewE755skTklF/hKVlWj8cinGxdR2gvLvTA=="; }; }; - "codecs-2.0.0" = { + "codecs-2.1.0" = { name = "codecs"; packageName = "codecs"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/codecs/-/codecs-2.0.0.tgz"; - sha512 = "WXvpJRAgc693oqYvZte9uYEiL5YHtfrxyEq12uVny9oBJ1k37zSva5vVz7trsnt6R9Y15hEgOSC7VFZT2pfYnA=="; + url = "https://registry.npmjs.org/codecs/-/codecs-2.1.0.tgz"; + sha512 = "nSWYToViFEpZXOxhtMQ6IDs76TN9xKIkHOu1KCr/iFiBcgzKuY1AFPZktuXN8r82FbZ/TXP9fwITszLgcp3eQg=="; }; }; "codepage-1.4.0" = { @@ -10804,13 +11083,13 @@ let sha512 = "Qst/zUUNmS/z3WziPxyqjrcz09pm+2Knbs5mAZL4VAE0sSrNY1/w8+/YxeHcoBTsO6iojA6BW7eFf27Eg2MRuw=="; }; }; - "command-exists-1.2.8" = { + "command-exists-1.2.9" = { name = "command-exists"; packageName = "command-exists"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/command-exists/-/command-exists-1.2.8.tgz"; - sha512 = "PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw=="; + url = "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz"; + sha512 = "LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="; }; }; "command-line-usage-4.1.0" = { @@ -10930,15 +11209,6 @@ let sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; - "commander-3.0.2" = { - name = "commander"; - packageName = "commander"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz"; - sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow=="; - }; - }; "commander-4.1.0" = { name = "commander"; packageName = "commander"; @@ -10957,13 +11227,22 @@ let sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; }; }; - "commander-5.0.0" = { + "commander-5.1.0" = { name = "commander"; packageName = "commander"; - version = "5.0.0"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz"; + sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; + }; + }; + "commandpost-1.4.0" = { + name = "commandpost"; + packageName = "commandpost"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-5.0.0.tgz"; - sha512 = "JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ=="; + url = "https://registry.npmjs.org/commandpost/-/commandpost-1.4.0.tgz"; + sha512 = "aE2Y4MTFJ870NuB/+2z1cXBhSBBzRydVVjzhFC4gtenEhpnj15yu0qptWGJsO9YGrcPZ3ezX8AWb1VA391MKpQ=="; }; }; "commist-1.1.0" = { @@ -11173,13 +11452,13 @@ let sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg=="; }; }; - "conf-6.2.1" = { + "conf-6.2.4" = { name = "conf"; packageName = "conf"; - version = "6.2.1"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-6.2.1.tgz"; - sha512 = "GbPshJUwZY8/+WXTLLyJplzCVAljX0vECBdUy1Es8npc8naGIEivexdhZP2zt8x/REzgtB9IONaB+ZNB9Ciz6w=="; + url = "https://registry.npmjs.org/conf/-/conf-6.2.4.tgz"; + sha512 = "GjgyPRLo1qK1LR9RWAdUagqo+DP18f5HWCFk4va7GS+wpxQTOzfuKTwKOvGW2c01/YXNicAyyoyuSddmdkBzZQ=="; }; }; "config-1.31.0" = { @@ -11651,15 +11930,6 @@ let sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; }; }; - "cookie-parser-1.4.4" = { - name = "cookie-parser"; - packageName = "cookie-parser"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.4.tgz"; - sha512 = "lo13tqF3JEtFO7FyA49CqbhaFkskRJ0u/UAiINgrIXeRCY41c88/zxtrECl8AKH3B0hj9q10+h3Kt8I7KlW4tw=="; - }; - }; "cookie-parser-1.4.5" = { name = "cookie-parser"; packageName = "cookie-parser"; @@ -11822,6 +12092,15 @@ let sha512 = "h479g/5a0PXn//yiFuMrD5MDEbB+mtihNkWcE6uD/aCh/6z0FRZ9sWH3NfZbHDB+Bp1yGLYsjbH8LZBL8KOQ0w=="; }; }; + "core-js-2.3.0" = { + name = "core-js"; + packageName = "core-js"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz"; + sha1 = "fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"; + }; + }; "core-js-2.6.11" = { name = "core-js"; packageName = "core-js"; @@ -11840,22 +12119,31 @@ let sha512 = "4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw=="; }; }; - "core-js-compat-3.6.4" = { + "core-js-3.6.5" = { + name = "core-js"; + packageName = "core-js"; + version = "3.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz"; + sha512 = "vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="; + }; + }; + "core-js-compat-3.6.5" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.6.4"; + version = "3.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.4.tgz"; - sha512 = "zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz"; + sha512 = "7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng=="; }; }; - "core-js-pure-3.6.4" = { + "core-js-pure-3.6.5" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.6.4"; + version = "3.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.4.tgz"; - sha512 = "epIhRLkXdgv32xIUFaaAry2wdxZYBi6bgM7cB136dzzXXa+dFyRLTZeLUJxnd8ShrmyVXBub63n2NHo2JAt8Cw=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.5.tgz"; + sha512 = "lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA=="; }; }; "core-util-is-1.0.2" = { @@ -12056,22 +12344,22 @@ let sha512 = "LuoXnCRMKEo3KR3jEbCRpP3Nu2TUhLTlb/axP9+rl+ouhBpxTaHaTTN1bdUS2x2VK3wWyCBl1OZHyHhlRBntWg=="; }; }; - "creato-1.1.1" = { + "creato-1.1.2" = { name = "creato"; packageName = "creato"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/creato/-/creato-1.1.1.tgz"; - sha512 = "FIliDIw0V3V0lWR+pVmGh45rJSemv4EBr46SNvafpxu8UJKUovEaeP5c19jSe/4m2DOEVnBeA5zcEjo1koMolg=="; + url = "https://registry.npmjs.org/creato/-/creato-1.1.2.tgz"; + sha512 = "BSna+qXnoIhNugGcUz9wnC6UtyRRKRm3QMQ/42BDw97/8eW0Y6b5Z5ecyaDbZdWMW6ipvvCbuj7H9NEkd1C0jA=="; }; }; - "cron-1.8.2" = { + "cron-1.7.2" = { name = "cron"; packageName = "cron"; - version = "1.8.2"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz"; - sha512 = "Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg=="; + url = "https://registry.npmjs.org/cron/-/cron-1.7.2.tgz"; + sha512 = "+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ=="; }; }; "cross-env-6.0.3" = { @@ -12137,6 +12425,15 @@ let sha512 = "u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg=="; }; }; + "cross-spawn-7.0.2" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz"; + sha512 = "PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw=="; + }; + }; "cross-spawn-async-2.2.5" = { name = "cross-spawn-async"; packageName = "cross-spawn-async"; @@ -12470,22 +12767,22 @@ let sha512 = "GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA=="; }; }; - "cssstyle-2.2.0" = { + "cssstyle-2.3.0" = { name = "cssstyle"; packageName = "cssstyle"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz"; - sha512 = "sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA=="; + url = "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz"; + sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; }; }; - "csstype-2.6.9" = { + "csstype-2.6.10" = { name = "csstype"; packageName = "csstype"; - version = "2.6.9"; + version = "2.6.10"; src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-2.6.9.tgz"; - sha512 = "xz39Sb4+OaTsULgUERcCk+TJj8ylkL4aSVDQiX/ksxbELSqwkgt4d4RD7fovIdgJGSuNYqwZEiVjYY5l0ask+Q=="; + url = "https://registry.npmjs.org/csstype/-/csstype-2.6.10.tgz"; + sha512 = "D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w=="; }; }; "csurf-1.11.0" = { @@ -12578,13 +12875,13 @@ let sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; }; }; - "cuss-1.18.0" = { + "cuss-1.19.0" = { name = "cuss"; packageName = "cuss"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/cuss/-/cuss-1.18.0.tgz"; - sha512 = "H/DfMnWcJSY3EBkiKJQJidM6kR3WmvC1JqEUcis+CmjPo4DqLC7nhirSA+GWpyAXr/OkKN4n+I2Vh0e9ZLBUnQ=="; + url = "https://registry.npmjs.org/cuss/-/cuss-1.19.0.tgz"; + sha512 = "RGVhyJ5/9wfTOsVApjBtAvI8zV8+DZvJ5K72TLfMt+KqtmwlqsYkOVVdtuZkvvIMpx+Ctv4KsIKlhkXWoT1fiQ=="; }; }; "custom-error-instance-2.1.1" = { @@ -12677,6 +12974,15 @@ let sha1 = "03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"; }; }; + "dargs-6.1.0" = { + name = "dargs"; + packageName = "dargs"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dargs/-/dargs-6.1.0.tgz"; + sha512 = "5dVBvpBLBnPwSsYXqfybFyehMmC/EenKEcf23AhCTgTf48JFBbmJKqoZBsERDnjL0FyiVTYWdFsRfTLHxLyKdQ=="; + }; + }; "dash-ast-1.0.0" = { name = "dash-ast"; packageName = "dash-ast"; @@ -12884,13 +13190,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dayjs-1.8.23" = { + "dayjs-1.8.26" = { name = "dayjs"; packageName = "dayjs"; - version = "1.8.23"; + version = "1.8.26"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.23.tgz"; - sha512 = "NmYHMFONftoZbeOhVz6jfiXI4zSiPN6NoVWJgC0aZQfYVwzy/ZpESPHuCcI0B8BUMpSJQ08zenHDbofOLKq8hQ=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.26.tgz"; + sha512 = "KqtAuIfdNfZR5sJY1Dixr2Is4ZvcCqhb0dZpCOt5dGEFiMzoIbjkTSzUb4QKTCsP+WNpGwUjAFIZrnZvUxxkhw=="; }; }; "de-indent-1.0.2" = { @@ -12902,13 +13208,13 @@ let sha1 = "b2038e846dc33baa5796128d0804b455b8c1e21d"; }; }; - "deasync-0.1.19" = { + "deasync-0.1.20" = { name = "deasync"; packageName = "deasync"; - version = "0.1.19"; + version = "0.1.20"; src = fetchurl { - url = "https://registry.npmjs.org/deasync/-/deasync-0.1.19.tgz"; - sha512 = "oh3MRktfnPlLysCPpBpKZZzb4cUC/p0aA3SyRGp15lN30juJBTo/CiD0d4fR+f1kBtUQoJj1NE9RPNWQ7BQ9Mg=="; + url = "https://registry.npmjs.org/deasync/-/deasync-0.1.20.tgz"; + sha512 = "E1GI7jMI57hL30OX6Ht/hfQU8DO4AuB9m72WFm4c38GNbUD4Q03//XZaOIHZiY+H1xUaomcot5yk2q/qIZQkGQ=="; }; }; "death-1.1.0" = { @@ -13118,13 +13424,13 @@ let sha512 = "sblyUmOJZxiL7oJ2ogJS6jtl/67+CTOW87SrYE/96u3PhDYikYoLCdLzcnceToiQejOLlqNnLCkaxx/+nE/ehg=="; }; }; - "decompress-4.2.0" = { + "decompress-4.2.1" = { name = "decompress"; packageName = "decompress"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz"; - sha1 = "7aedd85427e5a92dacfe55674a7c505e96d01f9d"; + url = "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz"; + sha512 = "e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ=="; }; }; "decompress-response-3.3.0" = { @@ -13235,13 +13541,13 @@ let sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; }; }; - "deep-equal-2.0.1" = { + "deep-equal-2.0.3" = { name = "deep-equal"; packageName = "deep-equal"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.1.tgz"; - sha512 = "7Et6r6XfNW61CPPCIYfm1YPGSmh6+CliYeL4km7GWJcpX5LTAflGF8drLLR+MZX+2P3NZfAfSduutBbSWqER4g=="; + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.3.tgz"; + sha512 = "Spqdl4H+ky45I9ByyJtXteOm9CaIrPmnIPmOhrkKGNYWeDgCvJ8jNYVCTjChxW4FqGuZnLHADc8EKRMX6+CgvA=="; }; }; "deep-extend-0.2.11" = { @@ -13271,15 +13577,6 @@ let sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; }; - "deep-freeze-node-1.1.3" = { - name = "deep-freeze-node"; - packageName = "deep-freeze-node"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-freeze-node/-/deep-freeze-node-1.1.3.tgz"; - sha512 = "CrA+1BVGfs9ZrGFMYtHfFHncWivh9XPb+6g8bLOzYPJmW8FmUs1dXLjALzU1SMqOMdoD5pQJARXtzxfeLqE9HQ=="; - }; - }; "deep-is-0.1.2" = { name = "deep-is"; packageName = "deep-is"; @@ -13577,6 +13874,15 @@ let sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; }; + "denodeify-1.2.1" = { + name = "denodeify"; + packageName = "denodeify"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/denodeify/-/denodeify-1.2.1.tgz"; + sha1 = "3a36287f5034e699e7577901052c2e6c94251631"; + }; + }; "denque-1.4.1" = { name = "denque"; packageName = "denque"; @@ -13622,6 +13928,15 @@ let sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; }; }; + "dependency-graph-0.9.0" = { + name = "dependency-graph"; + packageName = "dependency-graph"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.9.0.tgz"; + sha512 = "9YLIBURXj4DJMFALxXw9K3Y3rwb5Fk0X5/8ipCzaN84+gKxoHK43tVKRNakCQbiEx07E8Uwhuq21BpUagFhZ8w=="; + }; + }; "dependency-tree-7.2.1" = { name = "dependency-tree"; packageName = "dependency-tree"; @@ -14009,6 +14324,15 @@ let sha512 = "BIo2fEAv3U0YmyuM1XTijwZ/OJjmXnlSvsguQy3LOaz5C2R/vrMy8SCRdQn1iz3KhBJYJzy+918xS/PKY/47lw=="; }; }; + "dijkstrajs-1.0.1" = { + name = "dijkstrajs"; + packageName = "dijkstrajs"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.1.tgz"; + sha1 = "d3cd81221e3ea40742cfcde556d4e99e98ddc71b"; + }; + }; "dir-glob-2.0.0" = { name = "dir-glob"; packageName = "dir-glob"; @@ -14063,13 +14387,13 @@ let sha1 = "e38331f0844bba49b9a9cb71c771585aab1bc65a"; }; }; - "discord.js-11.6.3" = { + "discord.js-11.6.4" = { name = "discord.js"; packageName = "discord.js"; - version = "11.6.3"; + version = "11.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/discord.js/-/discord.js-11.6.3.tgz"; - sha512 = "dwIzHB5GPU9O/WiNw42d0yco0JED5bOjCPiHwU9VSSCkEhnyOdx5iqt7Dl2PQZAMNzWPI/t9oyCziOuzFlwm3Q=="; + url = "https://registry.npmjs.org/discord.js/-/discord.js-11.6.4.tgz"; + sha512 = "cK6rH1PuGjSjpmEQbnpuTxq1Yv8B89SotyKUFcr4RhnsiZnfBfDOev7DD7v5vhtEyyj51NuMWFoRJzgy/m08Uw=="; }; }; "discovery-channel-5.5.1" = { @@ -14099,13 +14423,13 @@ let sha1 = "57ddacb47324ae5f58d2cc0da886db4ce9eeb718"; }; }; - "dispensary-0.49.0" = { + "dispensary-0.51.2" = { name = "dispensary"; packageName = "dispensary"; - version = "0.49.0"; + version = "0.51.2"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.49.0.tgz"; - sha512 = "szH0vDORmGWEfwQgIqrhmrMpSGU2yXL3z7oe0NGx4sCbmnJdXXr5SQvRccPNCPrRuRPn2zPIITvwD9Lf+pcOew=="; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.51.2.tgz"; + sha512 = "liUDx/g1xFEBFoOL6308Vr0aYAZlGAyXGcOvuXVa/6qVBZT4QZrv4pVNeb5QOeD5C/Flta+A+qTnLkLnhgs40g=="; }; }; "diveSync-0.3.0" = { @@ -14243,22 +14567,22 @@ let sha512 = "iDRNFeAB2j4rh/Ecc2gh3fjciVifCMsszfCfHlYF5Wv8yybjZLiRDZUBt/pS3xrAz8uWT8fCHLq4pOQMmwCDwA=="; }; }; - "dockerfile-ast-0.0.20" = { + "dockerfile-ast-0.0.25" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; - version = "0.0.20"; + version = "0.0.25"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.20.tgz"; - sha512 = "VGFMBT0Av1Sk4SCjafsv2S/MCVy6+AuhLW+958wS2df86wb90JPl+WJXhTTGHk5DQVwQX0NoQQBzQQP1U7GaWg=="; + url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.25.tgz"; + sha512 = "Yiolk/ktLUjThacBuIEqyoRYzDdGrp8rjKjcdZA/hhtIUHrU5iVrS1MIm3p3PWKpnD7va4Jlp/FV0ywP3AdKrg=="; }; }; - "dockerfile-language-service-0.0.9" = { + "dockerfile-language-service-0.0.12" = { name = "dockerfile-language-service"; packageName = "dockerfile-language-service"; - version = "0.0.9"; + version = "0.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.0.9.tgz"; - sha512 = "g+TFMRG/Vv+yKqYJ2EE5KZlmwbPShWhlGhyG6tFEhUlHUt2Cd3wMr35popmc5Y9ra3OPwR3nY9cQFWIt8OP1Kw=="; + url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.0.12.tgz"; + sha512 = "73ZEQW8LCL/SIWzWekqqLdH41pZ8+N2BYD5K16cBQCQfsZPjFoJC04tv7jlTnEPypJZs3zV0hpBLVTi7zhRFfw=="; }; }; "dockerfile-utils-0.0.11" = { @@ -14270,13 +14594,13 @@ let sha512 = "LNdPIgcl58343dF4KNCHvFzUScUhgLI9BRAR+Vln6D1tVBGvv1k5/qHuxWRCAM2uyFbj73QVkKMScXPhY7TqfQ=="; }; }; - "dockerfile-utils-0.0.14" = { + "dockerfile-utils-0.0.16" = { name = "dockerfile-utils"; packageName = "dockerfile-utils"; - version = "0.0.14"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.14.tgz"; - sha512 = "9S77f18SmnI4hJ1Ndv1h1/gPxm74uV/n9E/2JMp6I9D3cSLrNdBZwq3FpNiXX1TRJQAn+Ufl/5b7YzH63NZ6jA=="; + url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.16.tgz"; + sha512 = "d/XlyVUEs+oGqoffvgYYItbGLNNSz3I2vIwzXxT9Xbx5YHH8WA8dFvTQU21k5j2Z8MoU6OYfyEZpbUqRC9N2fA=="; }; }; "doctrine-2.1.0" = { @@ -14351,13 +14675,13 @@ let sha512 = "g6RpyWXzl0RR6OTElHKBl7nwnK87GUyZMYC7JWsB/IA73vpqK2K6LT39x4VepLxlSsWBFrPVLnsSR5Jyty0+2Q=="; }; }; - "dom-walk-0.1.1" = { + "dom-walk-0.1.2" = { name = "dom-walk"; packageName = "dom-walk"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz"; - sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; + url = "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz"; + sha512 = "6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="; }; }; "domain-browser-1.2.0" = { @@ -14441,13 +14765,13 @@ let sha512 = "eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw=="; }; }; - "domino-2.1.4" = { + "domino-2.1.5" = { name = "domino"; packageName = "domino"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/domino/-/domino-2.1.4.tgz"; - sha512 = "l70mlQ7IjPKC8kT7GljQXJZmt5OqFL+RE91ik5y5WWQtsd9wP8R7gpFnNu96fK5MqAAZRXfLLsnzKtkty5fWGQ=="; + url = "https://registry.npmjs.org/domino/-/domino-2.1.5.tgz"; + sha512 = "vMDo7f6ogUV9PkzmxXLiXzJkJZqU09Le4C40mj+HmAGS/2FPmdetoNOQZXpu2kekn0GJKvtwKMAVoruTj60Xww=="; }; }; "domutils-1.4.3" = { @@ -14522,6 +14846,15 @@ let sha512 = "uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A=="; }; }; + "dot-qs-0.2.0" = { + name = "dot-qs"; + packageName = "dot-qs"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-qs/-/dot-qs-0.2.0.tgz"; + sha1 = "d36517fe24b7cda61fce7a5026a0024afaf5a439"; + }; + }; "dotenv-4.0.0" = { name = "dotenv"; packageName = "dotenv"; @@ -14576,13 +14909,13 @@ let sha512 = "UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw=="; }; }; - "dotnet-deps-parser-4.9.0" = { + "dotnet-deps-parser-4.10.0" = { name = "dotnet-deps-parser"; packageName = "dotnet-deps-parser"; - version = "4.9.0"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-4.9.0.tgz"; - sha512 = "V0O+7pI7Ei+iL5Kgy6nYq1UTwzrpqci5K/zf8cXyP5RWBSQBUl/JOE9I67zLUkKiwOdfPhbMQgcRj/yGA+NL1A=="; + url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-4.10.0.tgz"; + sha512 = "dEO1oTvreaDCtcvhRdOmmAMubyC+MWqVr1c/1Wvasi+NW4NZeB67qGh1taqowUFh+aCXtPw3SP2eExn6aNkhwA=="; }; }; "downgrade-root-1.2.2" = { @@ -14621,6 +14954,15 @@ let sha512 = "yXcCvhkPKmq5M2cQXss6Qbig+LZnzRIT40XCYm/QCRnJaPG867StB1qnsBLxOGrPH1YEIRWW2gJq7LLMyw+NmA=="; }; }; + "download-git-repo-3.0.2" = { + name = "download-git-repo"; + packageName = "download-git-repo"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/download-git-repo/-/download-git-repo-3.0.2.tgz"; + sha512 = "N8hWXD4hXqmEcNoR8TBYFntaOcYvEQ7Bz90mgm3bZRTuteGQqwT32VDMnTyD0KTEvb8BWrMc1tVmzuV9u/WrAg=="; + }; + }; "download-or-build-purescript-0.3.4" = { name = "download-or-build-purescript"; packageName = "download-or-build-purescript"; @@ -14648,6 +14990,15 @@ let sha512 = "RyOSTL7B3qzrhCOfhgzxNrcZD1klFOAJcw2YG345AIB4su1KC4WSk6fzRz3xpg1tp/plr5v8aDlvZy+LDtf6uA=="; }; }; + "download-stats-0.3.4" = { + name = "download-stats"; + packageName = "download-stats"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/download-stats/-/download-stats-0.3.4.tgz"; + sha512 = "ic2BigbyUWx7/CBbsfGjf71zUNZB4edBGC3oRliSzsoNmvyVx3Ycfp1w3vp2Y78Ee0eIIkjIEO5KzW0zThDGaA=="; + }; + }; "draftlog-1.0.12" = { name = "draftlog"; packageName = "draftlog"; @@ -14756,6 +15107,15 @@ let sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; }; }; + "duplexify-4.1.1" = { + name = "duplexify"; + packageName = "duplexify"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz"; + sha512 = "DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA=="; + }; + }; "duration-0.2.2" = { name = "duration"; packageName = "duration"; @@ -14828,13 +15188,13 @@ let sha512 = "fLf9l1hnwrHI2xn9mEDT7KIi22UDqA2jaCwyCbSUJh9a1V+LEUSL/JO/6TIz/QyuBURWUHrFL5Kg2TtO1bkkog=="; }; }; - "ecstatic-4.1.2" = { + "ecstatic-4.1.4" = { name = "ecstatic"; packageName = "ecstatic"; - version = "4.1.2"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/ecstatic/-/ecstatic-4.1.2.tgz"; - sha512 = "lnrAOpU2f7Ra8dm1pW0D1ucyUxQIEk8RjFrvROg1YqCV0ueVu9hzgiSEbSyROqXDDiHREdqC4w3AwOTb23P4UQ=="; + url = "https://registry.npmjs.org/ecstatic/-/ecstatic-4.1.4.tgz"; + sha512 = "8E4ZLK4uRuB9pwywGpy/B9vcz4gCp6IY7u4cMbeCINr/fjb1v+0wf0Ae2XlfSnG8xZYnE4uaJBjFkYI0bqcIdw=="; }; }; "ed2curve-0.1.4" = { @@ -14846,6 +15206,15 @@ let sha1 = "94a44248bb87da35db0eff7af0aa576168117f59"; }; }; + "editions-2.3.0" = { + name = "editions"; + packageName = "editions"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/editions/-/editions-2.3.0.tgz"; + sha512 = "jeXYwHPKbitU1l14dWlsl5Nm+b1Hsm7VX73BsrQ4RVwEcAQQIPFHTZAbVtuIGxZBrpdT2FXd8lbtrNBrzZxIsA=="; + }; + }; "editor-1.0.0" = { name = "editor"; packageName = "editor"; @@ -14909,13 +15278,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.383" = { + "electron-to-chromium-1.3.427" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.383"; + version = "1.3.427"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.383.tgz"; - sha512 = "EHYVJl6Ox1kFy/SzGVbijHu8ksQotJnqHCFFfaVhXiC+erOSplwhCtOTSocu1jRwirlNsSn/aZ9Kf84Z6s5qrg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz"; + sha512 = "/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A=="; }; }; "elegant-spinner-1.0.1" = { @@ -14963,13 +15332,13 @@ let sha512 = "gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ=="; }; }; - "emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" = { + "emitter-https://github.com/component/emitter/archive/1.0.1.tar.gz" = { name = "emitter"; packageName = "emitter"; version = "1.0.1"; src = fetchurl { name = "emitter-1.0.1.tar.gz"; - url = https://codeload.github.com/component/emitter/tar.gz/1.0.1; + url = "https://codeload.github.com/component/emitter/tar.gz/1.0.1"; sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d"; }; }; @@ -15135,6 +15504,15 @@ let sha1 = "e9353258baa9108965efc41cb0ef8ade2f3cfb07"; }; }; + "end-of-stream-1.4.1" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz"; + sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; + }; + }; "end-of-stream-1.4.4" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -15189,13 +15567,13 @@ let sha512 = "+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w=="; }; }; - "engine.io-3.4.0" = { + "engine.io-3.4.1" = { name = "engine.io"; packageName = "engine.io"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-3.4.0.tgz"; - sha512 = "XCyYVWzcHnK5cMz7G4VTu2W7zJS7SM1QkcelghyIk/FmobWBtXE7fwhBusEKvCSqc3bMh8fNFMlUkCKTFRxH2w=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.4.1.tgz"; + sha512 = "8MfIfF1/IIfxuc2gv5K+XlFZczw/BpTvqBdl0E2fBLkYQp4miv4LuDTVtYt4yMyaIFLEr4vtaSgV4mjvll8Crw=="; }; }; "engine.io-client-1.3.1" = { @@ -15216,13 +15594,13 @@ let sha512 = "y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw=="; }; }; - "engine.io-client-3.4.0" = { + "engine.io-client-3.4.1" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.0.tgz"; - sha512 = "a4J5QO2k99CM2a0b12IznnyQndoEvtA4UAldhGzKqnHf42I3Qs2W5SPnDvatZRcMaNZs4IevVicBPayxYt6FwA=="; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.1.tgz"; + sha512 = "RJNmA+A9Js+8Aoq815xpGAsgWH1VoSYM//2VgIiu9lNOaHFfLpTjH4tOzktBpjIs5lvOfiNY1dwf+NuU6D38Mw=="; }; }; "engine.io-parser-1.0.6" = { @@ -15369,6 +15747,15 @@ let sha512 = "jDgnJaF/Btomk+m3PZDTTCb5XIIIX3zYItnCRfF73zVgvinLoRomuhi75Y4su0PtQxWz4v66XnLLckyvyJTOIQ=="; }; }; + "envinfo-7.5.1" = { + name = "envinfo"; + packageName = "envinfo"; + version = "7.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/envinfo/-/envinfo-7.5.1.tgz"; + sha512 = "hQBkDf2iO4Nv0CNHpCuSBeaSrveU6nThVxFGTrq/eDlV716UQk09zChaJae4mZRsos1x4YLY2TaH3LHUae3ZmQ=="; + }; + }; "epidemic-broadcast-trees-7.0.0" = { name = "epidemic-broadcast-trees"; packageName = "epidemic-broadcast-trees"; @@ -15387,6 +15774,15 @@ let sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960"; }; }; + "errlop-2.2.0" = { + name = "errlop"; + packageName = "errlop"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/errlop/-/errlop-2.2.0.tgz"; + sha512 = "e64Qj9+4aZzjzzFpZC7p5kmm/ccCrbLhAJplhsDXQFs87XTsXwOpH4s1Io2s90Tau/8r2j9f4l/thhDevRjzxw=="; + }; + }; "errno-0.1.7" = { name = "errno"; packageName = "errno"; @@ -15405,6 +15801,15 @@ let sha1 = "a5f75fff4d9926126ddac0ea5dc38e689153cb02"; }; }; + "error-7.2.1" = { + name = "error"; + packageName = "error"; + version = "7.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/error/-/error-7.2.1.tgz"; + sha512 = "fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA=="; + }; + }; "error-ex-1.3.2" = { name = "error-ex"; packageName = "error-ex"; @@ -15513,6 +15918,15 @@ let sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc"; }; }; + "es6-promise-3.0.2" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz"; + sha1 = "010d5858423a5f118979665f46486a95c6ee2bb6"; + }; + }; "es6-promise-3.3.1" = { name = "es6-promise"; packageName = "es6-promise"; @@ -15567,6 +15981,15 @@ let sha512 = "jCsk2fpfEFusVv1MDkF4Uf0hAzIKNDMgR6LyOIw6a3jwkN1sCgWzuwgnsHY9YSQ8n8P31HoncvE0LC44cpWTrw=="; }; }; + "es6-promisify-6.1.1" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.1.tgz"; + sha512 = "HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg=="; + }; + }; "es6-set-0.1.5" = { name = "es6-set"; packageName = "es6-set"; @@ -15819,6 +16242,15 @@ let sha512 = "fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q=="; }; }; + "eslint-utils-2.0.0" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz"; + sha512 = "0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA=="; + }; + }; "eslint-visitor-keys-1.1.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; @@ -15873,15 +16305,6 @@ let sha512 = "qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A=="; }; }; - "espree-6.1.2" = { - name = "espree"; - packageName = "espree"; - version = "6.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz"; - sha512 = "2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA=="; - }; - }; "espree-6.2.1" = { name = "espree"; packageName = "espree"; @@ -15936,13 +16359,13 @@ let sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0"; }; }; - "esquery-1.2.0" = { + "esquery-1.3.1" = { name = "esquery"; packageName = "esquery"; - version = "1.2.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.2.0.tgz"; - sha512 = "weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q=="; + url = "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz"; + sha512 = "olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ=="; }; }; "esrecurse-4.2.1" = { @@ -16008,13 +16431,13 @@ let sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; }; - "estraverse-5.0.0" = { + "estraverse-5.1.0" = { name = "estraverse"; packageName = "estraverse"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-5.0.0.tgz"; - sha512 = "j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A=="; + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz"; + sha512 = "FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw=="; }; }; "estree-walker-0.6.1" = { @@ -16026,6 +16449,15 @@ let sha512 = "SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w=="; }; }; + "estree-walker-1.0.1" = { + name = "estree-walker"; + packageName = "estree-walker"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz"; + sha512 = "1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="; + }; + }; "esutils-1.0.0" = { name = "esutils"; packageName = "esutils"; @@ -16557,6 +16989,15 @@ let sha512 = "t4oX2z7uoSqATbMfsxWMbNjAL0T5zpvcJCk3Z9wnPPN7ibddhnmDZXHfEcoBMG2ojKXZoCyPMc5FbtK+G7SoDg=="; }; }; + "express-session-1.17.1" = { + name = "express-session"; + packageName = "express-session"; + version = "1.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express-session/-/express-session-1.17.1.tgz"; + sha512 = "UbHwgqjxQZJiWRTMyhvWGvjBQduGCSBDhhZXYenziMFjxst5rMV+aJZ6hKPHZnPyHGsrqRICxtX8jtEbm/z36Q=="; + }; + }; "express-urlrewrite-1.2.0" = { name = "express-urlrewrite"; packageName = "express-urlrewrite"; @@ -16737,13 +17178,13 @@ let sha1 = "b97acaf9441eea2332529624b732fc5a1c8165fa"; }; }; - "extract-zip-1.6.7" = { + "extract-zip-1.7.0" = { name = "extract-zip"; packageName = "extract-zip"; - version = "1.6.7"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz"; - sha1 = "a840b4b8af6403264c8db57f4f1a74333ef81fe9"; + url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz"; + sha512 = "xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA=="; }; }; "extsprintf-1.0.0" = { @@ -16908,15 +17349,6 @@ let sha512 = "4j5uBaTnsYAV5ebkidvxiLUYOwjQ+JSFljeqfTxCrH9bDmlCQaOJFS84oDJ2rAXZq2yskmk3ORfoP9DCwqFNig=="; }; }; - "fast-json-stable-stringify-2.0.0" = { - name = "fast-json-stable-stringify"; - packageName = "fast-json-stable-stringify"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; - }; - }; "fast-json-stable-stringify-2.1.0" = { name = "fast-json-stable-stringify"; packageName = "fast-json-stable-stringify"; @@ -16971,13 +17403,13 @@ let sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; }; }; - "fast-text-encoding-1.0.1" = { + "fast-text-encoding-1.0.2" = { name = "fast-text-encoding"; packageName = "fast-text-encoding"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.1.tgz"; - sha512 = "x4FEgaz3zNRtJfLFqJmHWxkMDDvXVtaznj2V9jiP8ACUJrUgist4bP9FmDL2Vew2Y9mEQI/tG4GqabaitYp9CQ=="; + url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.2.tgz"; + sha512 = "5rQdinSsycpzvAoHga2EDn+LRX1d5xLFsuNG0Kg61JrAT/tASXcLL0nf/33v+sAxlQcfYmWbTURa1mmAf55jGw=="; }; }; "fast-url-parser-1.1.3" = { @@ -16998,13 +17430,13 @@ let sha512 = "483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="; }; }; - "fastq-1.6.1" = { + "fastq-1.7.0" = { name = "fastq"; packageName = "fastq"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.6.1.tgz"; - sha512 = "mpIH5sKYueh3YyeJwqtVo8sORi0CgtmkVbK6kZStpQlZBYQuTzG2CZ7idSiJuA7bY0SFCWUc5WIs+oYumGCQNw=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.7.0.tgz"; + sha512 = "YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ=="; }; }; "fault-1.0.4" = { @@ -17061,15 +17493,6 @@ let sha1 = "d303ccbfee02a9a56a3493fb08bcb59691aa53b1"; }; }; - "fd-slicer-1.0.1" = { - name = "fd-slicer"; - packageName = "fd-slicer"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"; - sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; - }; - }; "fd-slicer-1.1.0" = { name = "fd-slicer"; packageName = "fd-slicer"; @@ -17259,13 +17682,13 @@ let sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; }; }; - "filelist-0.0.6" = { + "filelist-1.0.1" = { name = "filelist"; packageName = "filelist"; - version = "0.0.6"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/filelist/-/filelist-0.0.6.tgz"; - sha1 = "58a641ad1f57574a27fe87a440ef318834b55719"; + url = "https://registry.npmjs.org/filelist/-/filelist-1.0.1.tgz"; + sha512 = "8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ=="; }; }; "filename-regex-2.0.1" = { @@ -17556,13 +17979,13 @@ let sha512 = "ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng=="; }; }; - "firefox-profile-1.3.0" = { + "firefox-profile-1.3.1" = { name = "firefox-profile"; packageName = "firefox-profile"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.3.0.tgz"; - sha512 = "3d7JPnFC3GrwGW8wonAqy2E4YCI7A8MO7yVDkqS09uQ3tLvMLCY3Ytt4ntvVXvyzjVMRmrLW9W/CubnnzrdLCA=="; + url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.3.1.tgz"; + sha512 = "8q7DnwVIXvuJuBm1shr5ivRh0Ih2ytWwOIMwHInDSlVyrjQVXy7Ik0frItDdWb/P5CIpQFcMk9fPsUwNqi2lyQ=="; }; }; "first-chunk-stream-1.0.0" = { @@ -17601,13 +18024,13 @@ let sha512 = "VoPpKScAzvZ07jtciOY0bJieJwyd/VVCuo4fn3nBLh4iBagzYED7GLQeFBpMpy7HP5edEKTDo8yxaIrYrwb7hg=="; }; }; - "fkill-7.0.0" = { + "fkill-7.0.1" = { name = "fkill"; packageName = "fkill"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fkill/-/fkill-7.0.0.tgz"; - sha512 = "i61SqvPdfCxl1/VQulh9SXrC+4dudCtINzTHbKaEx3Jr0kD9SvxKDeXzej7Saurnj3al/jMJwQnsUc62VrBMHQ=="; + url = "https://registry.npmjs.org/fkill/-/fkill-7.0.1.tgz"; + sha512 = "rziuWzpWErC2aGQUuvGo9dcVBDeHowK9g75u4fnkTCAqPgvUVRMtlDW6KWsWonxY1tjF+p1mIys33yNvLRlAtw=="; }; }; "flagged-respawn-1.0.1" = { @@ -17691,13 +18114,13 @@ let sha512 = "4zPxDyhCyiN2wIAtSLI6gc82/EjqZc1onI4Mz/l0pWrAlsSfYH/2ZIcU+e3oA2wDwbzIWNKwa23F8rh6+DRWkw=="; }; }; - "flatted-2.0.1" = { + "flatted-2.0.2" = { name = "flatted"; packageName = "flatted"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz"; - sha512 = "a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg=="; + url = "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz"; + sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; }; }; "flatten-0.0.1" = { @@ -17727,13 +18150,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.121.0" = { + "flow-parser-0.123.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.121.0"; + version = "0.123.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.121.0.tgz"; - sha512 = "1gIBiWJNR0tKUNv8gZuk7l9rVX06OuLzY9AoGio7y/JT4V1IZErEMEq2TJS+PFcw/y0RshZ1J/27VfK1UQzYVg=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.123.0.tgz"; + sha512 = "scMjcsICxtHm141rFTfWgKnNbz9MUubgc9kNSh+0xvTYIA/L+9AzlPRK0FMcfNiqQTWjn0IMGqiwySLzMZVvtw=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -17853,13 +18276,13 @@ let sha1 = "5214d7537a4d06a4a301c0cc262feb84188002e7"; }; }; - "follow-redirects-1.10.0" = { + "follow-redirects-1.11.0" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.10.0.tgz"; - sha512 = "4eyLK6s6lH32nOvLLwlIOnr9zrL8Sm+OvW4pVTJNoXeGzYIkHVf+pADQi+OJ0E67hiuSLezPVPyBcIZO50TmmQ=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.11.0.tgz"; + sha512 = "KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA=="; }; }; "follow-redirects-1.5.10" = { @@ -18096,13 +18519,13 @@ let sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; - "fp-ts-2.5.3" = { + "fp-ts-2.5.4" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.5.3"; + version = "2.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.5.3.tgz"; - sha512 = "lQd+hahLd8cygNoXbEHDjH/cbF6XVWlEPb8h5GXXlozjCSDxWgclvkpOoTRfBA0P+r69l9VvW1nEsSGIJRQpWw=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.5.4.tgz"; + sha512 = "cZlLeEneRYypc2dOzB9h8+bd9mQhJVyt2g0Dny2gKR7uWNgA4EmLSJyguLYsTU44nJSSG9EjurUalEc0wQqeKw=="; }; }; "fraction.js-4.0.12" = { @@ -18402,13 +18825,13 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fs2-0.3.7" = { + "fs2-0.3.8" = { name = "fs2"; packageName = "fs2"; - version = "0.3.7"; + version = "0.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/fs2/-/fs2-0.3.7.tgz"; - sha512 = "fwfd9MBI/fnXtR/ClVTyeuPXJ+oI5WNyXvBQPmc4btgqLYTKOuBRTRUVjmVpDUri0C88HLwMlc5ESg48fEAGjw=="; + url = "https://registry.npmjs.org/fs2/-/fs2-0.3.8.tgz"; + sha512 = "HxOTRiFS3PqwAOmlp1mTwLA+xhQBdaP82b5aBamc/rHKFVyn4qL8YpngaAleD52PNMzBm6TsGOoU/Hq+bAfBhA=="; }; }; "fsevents-1.2.12" = { @@ -18429,6 +18852,15 @@ let sha512 = "R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA=="; }; }; + "fsevents-2.1.3" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; + sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; + }; + }; "fstream-0.1.31" = { name = "fstream"; packageName = "fstream"; @@ -18870,6 +19302,15 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; + "gh-got-5.0.0" = { + name = "gh-got"; + packageName = "gh-got"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gh-got/-/gh-got-5.0.0.tgz"; + sha1 = "ee95be37106fd8748a96f8d1db4baea89e1bfa8a"; + }; + }; "git-apply-delta-0.0.7" = { name = "git-apply-delta"; packageName = "git-apply-delta"; @@ -18915,13 +19356,13 @@ let sha1 = "c57d1145eec16465ab9bfbdf575262b1691624d6"; }; }; - "git-parse-1.0.3" = { + "git-parse-1.0.4" = { name = "git-parse"; packageName = "git-parse"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/git-parse/-/git-parse-1.0.3.tgz"; - sha512 = "LlGDePBQ9Lr/jsL3ULrnV8SQL8sk3cdScyc+vAk6jVLkHBOxdIj3JosNWemH2o9pNnGtcqukl+ym1Nl6k5jw0Q=="; + url = "https://registry.npmjs.org/git-parse/-/git-parse-1.0.4.tgz"; + sha512 = "NSC71SqG6jN0XYPbib8t/mgguVLddw+xvkkLv2EsCFvHfsZjO+ZqMcGoGHHMqfhZllCDDAkOwZESkZEmICj9ZA=="; }; }; "git-raw-commits-2.0.0" = { @@ -19032,6 +19473,15 @@ let sha512 = "gwJScWVNhFYSRDvURk/8yhcFBee6aFjye2a7Lhb2bUyRulpIoek9p0I9Kt7PT67d/nUlZbFu8L9RLiA0woQN8Q=="; }; }; + "github-username-3.0.0" = { + name = "github-username"; + packageName = "github-username"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/github-username/-/github-username-3.0.0.tgz"; + sha1 = "0a772219b3130743429f2456d0bdd3db55dce7b1"; + }; + }; "gl-matrix-2.8.1" = { name = "gl-matrix"; packageName = "gl-matrix"; @@ -19263,7 +19713,7 @@ let version = "2.0.1"; src = fetchurl { name = "global-2.0.1.tar.gz"; - url = https://codeload.github.com/component/global/tar.gz/v2.0.1; + url = "https://codeload.github.com/component/global/tar.gz/v2.0.1"; sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785"; }; }; @@ -19393,6 +19843,15 @@ let sha512 = "7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg=="; }; }; + "globby-11.0.0" = { + name = "globby"; + packageName = "globby"; + version = "11.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-11.0.0.tgz"; + sha512 = "iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg=="; + }; + }; "globby-4.1.0" = { name = "globby"; packageName = "globby"; @@ -19492,13 +19951,13 @@ let sha1 = "2edeeb958084d0f8ea7988e5d995b1c7dfc14777"; }; }; - "gonzales-pe-4.2.4" = { + "gonzales-pe-4.3.0" = { name = "gonzales-pe"; packageName = "gonzales-pe"; - version = "4.2.4"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.2.4.tgz"; - sha512 = "v0Ts/8IsSbh9n1OJRnSfa7Nlxi4AkXIsWB6vPept8FDbL4bXn3FNuxjYtO/nmBGu7GDkL9MFeGebeSu6l55EPQ=="; + url = "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz"; + sha512 = "otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ=="; }; }; "good-listener-1.2.2" = { @@ -19546,6 +20005,15 @@ let sha512 = "3LIdJNTdCFbbJc+h/EH0V5lpNpbJ6Bfwykk21lcQvQsEcrzdi/ltCyQehFHLzJ/ka0UMH4Slg0hkYvAZN9qUDg=="; }; }; + "got-10.7.0" = { + name = "got"; + packageName = "got"; + version = "10.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-10.7.0.tgz"; + sha512 = "aWTDeNw9g+XqEZNcTjMMZSy7B7yE9toWOFYip7ofFTLleJhvZwUxxTxkTpKvF+p1SAA4VHmuEy7PiHTHyq8tJg=="; + }; + }; "got-6.7.1" = { name = "got"; packageName = "got"; @@ -19618,13 +20086,13 @@ let sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; }; - "graceful-fs-4.2.3" = { + "graceful-fs-4.2.4" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.3"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; }; }; "graceful-readlink-1.0.1" = { @@ -19744,13 +20212,13 @@ let sha512 = "bOufkkog0cSfHJ9gVD3Wy+KHmkSTHWcFfPaV/NVpIvfJx15gU0/CzuC6lcTjioWmn+UGzYdoqmP7OrJAWT57sw=="; }; }; - "graphql-extensions-0.11.0" = { + "graphql-extensions-0.12.0" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.11.0.tgz"; - sha512 = "zd4qfUiJoYBx2MwJusM36SEJ+YmJ1ki8YF8nlm9mgaPDUzsnmFq4lxULxUfhLAXFwZw7MbEN2vV4V6WiNgSJLg=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.0.tgz"; + sha512 = "kBRLtNeknrFl0W/UQQYebj6qnvb1E1RpQ2+C7Y8pwMc6yV8+9pWFx5RP0HzfeEuScCmK93i3H5sdPedoQWwENw=="; }; }; "graphql-import-0.4.5" = { @@ -19834,13 +20302,13 @@ let sha512 = "4FOv3ZKfA4WdOKJeHdz6B3F/vxBLSgmBcGeAFPf4n1F64ltJUvOOerNj0rsJxONQGdhUMynQIvd6LzB+1J5oKA=="; }; }; - "graphql-tools-4.0.7" = { + "graphql-tools-4.0.8" = { name = "graphql-tools"; packageName = "graphql-tools"; - version = "4.0.7"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.7.tgz"; - sha512 = "rApl8sT8t/W1uQRcwzxMYyUBiCl/XicluApiDkNze5TX/GR0BSTQMjM2UcRGdTmkbsb1Eqq6afkyyeG/zMxZYQ=="; + url = "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.8.tgz"; + sha512 = "MW+ioleBrwhRjalKjYaLQbr+920pHBgy9vM/n47sswtns8+96sRn5M/G+J1eu7IMeKWiN/9p6tmwCHU7552VJg=="; }; }; "graphql-type-json-0.3.1" = { @@ -19879,13 +20347,13 @@ let sha512 = "CgXlq3PGpBRj8RMnLSYs46Hvl5q9Up9kwuMAcYlvS4sNgH5j4Ao7hbY+HI62PaYTeIdffiJidLEIeZVCmZCrFA=="; }; }; - "grouped-queue-1.0.0" = { + "grouped-queue-1.1.0" = { name = "grouped-queue"; packageName = "grouped-queue"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-1.0.0.tgz"; - sha512 = "XslfWrAGCYovQjveHODR0hllUrsn3UtvPFTkamHbgVHmkUA6eCIDmw3JDWVLJvuntTvYjwaPGamlyzK4/HAEOA=="; + url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-1.1.0.tgz"; + sha512 = "rZOFKfCqLhsu5VqjBjEWiwrYqJR07KxIkH4mLZlNlGDfntbb4FbMyGFP14TlvRPrU9S3Hnn/sgxbC5ZeN0no3Q=="; }; }; "growl-1.10.5" = { @@ -19996,13 +20464,13 @@ let sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f"; }; }; - "gulp-vinyl-zip-2.1.3" = { + "gulp-vinyl-zip-2.2.0" = { name = "gulp-vinyl-zip"; packageName = "gulp-vinyl-zip"; - version = "2.1.3"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-2.1.3.tgz"; - sha512 = "wOHNPddyZ45il4wNz3Bk9ChpEq5FK/P76SSkqAMCLVZSOVtLBiDIVXDbYWDlfZpoYEjZQl+28I+Uzmmr6pSnBQ=="; + url = "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-2.2.0.tgz"; + sha512 = "7tKXptewHdKnOV0HGIyB/5+dvfmwmHq+hnolAQ64zz/pPomUXJcFPeYCkatRmOztkfZOn+14zoIFS2G39PkzIg=="; }; }; "gulplog-1.0.0" = { @@ -20014,40 +20482,31 @@ let sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; }; }; - "gunzip-maybe-1.4.1" = { + "gunzip-maybe-1.4.2" = { name = "gunzip-maybe"; packageName = "gunzip-maybe"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz"; - sha512 = "qtutIKMthNJJgeHQS7kZ9FqDq59/Wn0G2HYCRNjpup7yKfVI6/eqwpmroyZGFoCYaG+sW6psNVb4zoLADHpp2g=="; + url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz"; + sha512 = "4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw=="; }; }; - "handle-thing-2.0.0" = { + "handle-thing-2.0.1" = { name = "handle-thing"; packageName = "handle-thing"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz"; - sha512 = "d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ=="; - }; - }; - "handlebars-4.5.3" = { - name = "handlebars"; - packageName = "handlebars"; - version = "4.5.3"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz"; - sha512 = "3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA=="; + url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz"; + sha512 = "9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="; }; }; - "handlebars-4.7.3" = { + "handlebars-4.7.6" = { name = "handlebars"; packageName = "handlebars"; - version = "4.7.3"; + version = "4.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.7.3.tgz"; - sha512 = "SRGwSYuNfx8DwHD/6InAPzD6RgeruWLT+B8e8a7gGs8FWgHzlExpTFMEq2IA6QpAfOClpKHy6+8IqTjeBCu6Kg=="; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz"; + sha512 = "1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA=="; }; }; "har-schema-1.0.5" = { @@ -20338,13 +20797,13 @@ let sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; }; }; - "hash-base-3.0.4" = { + "hash-base-3.1.0" = { name = "hash-base"; packageName = "hash-base"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz"; - sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; + url = "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz"; + sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA=="; }; }; "hash-sum-2.0.0" = { @@ -20734,13 +21193,13 @@ let sha512 = "71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw=="; }; }; - "html-entities-1.2.1" = { + "html-entities-1.3.1" = { name = "html-entities"; packageName = "html-entities"; - version = "1.2.1"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz"; - sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; + url = "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz"; + sha512 = "rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA=="; }; }; "html-minifier-3.5.21" = { @@ -21041,13 +21500,13 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; - "http-signature-1.3.2" = { + "http-signature-1.3.4" = { name = "http-signature"; packageName = "http-signature"; - version = "1.3.2"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.2.tgz"; - sha512 = "sjgXeFLIVJ54n1+HWOvazGkIQpaawFGIQ1PYPORaFNWpPHJ28ZuDgWljvMIhAIcOelTtrh9e5wVB3IorxjiZDA=="; + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.4.tgz"; + sha512 = "CbG3io8gUSIxNNSgq+XMjgpTMzAeVRipxVXjuGrDhH5M1a2kZ03w20s8FCLR1NjnnJj10KbvabvckmtQcYNb9g=="; }; }; "http_ece-1.1.0" = { @@ -21149,15 +21608,6 @@ let sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed"; }; }; - "humanize-plus-1.8.2" = { - name = "humanize-plus"; - packageName = "humanize-plus"; - version = "1.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/humanize-plus/-/humanize-plus-1.8.2.tgz"; - sha1 = "a65b34459ad6367adbb3707a82a3c9f916167030"; - }; - }; "humanize-string-1.0.2" = { name = "humanize-string"; packageName = "humanize-string"; @@ -21437,6 +21887,15 @@ let sha512 = "QshP0SFpsy/bHQBjYMgzCcnLoqTj6PHFg8ZkPi2WbTw1qddNy0puuPDaFlXyrsZAdWMT3QziPDMzfj+mzCVMYg=="; }; }; + "import-cwd-2.1.0" = { + name = "import-cwd"; + packageName = "import-cwd"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz"; + sha1 = "aa6cf36e722761285cb371ec6519f53e2435b0a9"; + }; + }; "import-fresh-2.0.0" = { name = "import-fresh"; packageName = "import-fresh"; @@ -21455,6 +21914,15 @@ let sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; }; }; + "import-from-2.1.0" = { + name = "import-from"; + packageName = "import-from"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz"; + sha1 = "335db7f2a7affd53aaa471d4b8021dee36b7f3b1"; + }; + }; "import-global-0.1.0" = { name = "import-global"; packageName = "import-global"; @@ -21797,15 +22265,6 @@ let sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ=="; }; }; - "inquirer-7.0.0" = { - name = "inquirer"; - packageName = "inquirer"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-7.0.0.tgz"; - sha512 = "rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ=="; - }; - }; "inquirer-7.0.4" = { name = "inquirer"; packageName = "inquirer"; @@ -22634,13 +23093,13 @@ let sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; }; - "is-function-1.0.1" = { + "is-function-1.0.2" = { name = "is-function"; packageName = "is-function"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz"; - sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5"; + url = "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz"; + sha512 = "lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ=="; }; }; "is-glob-2.0.1" = { @@ -22715,13 +23174,13 @@ let sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; }; }; - "is-installed-globally-0.3.1" = { + "is-installed-globally-0.3.2" = { name = "is-installed-globally"; packageName = "is-installed-globally"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.1.tgz"; - sha512 = "oiEcGoQbGc+3/iijAijrK2qFpkNoNjsHOm/5V5iaeydyrS/hnwaRCEgH5cpW0P3T1lSjV5piB7S5b5lEugNLhg=="; + url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz"; + sha512 = "wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g=="; }; }; "is-interactive-1.0.0" = { @@ -23030,13 +23489,13 @@ let sha1 = "207bab91638499c07b2adf240a41a87210034575"; }; }; - "is-promise-2.1.0" = { + "is-promise-2.2.2" = { name = "is-promise"; packageName = "is-promise"; - version = "2.1.0"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz"; + sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; }; }; "is-property-1.0.2" = { @@ -23255,6 +23714,15 @@ let sha1 = "4e1aa0fb51bfbcb3e92688001397202c1775b66e"; }; }; + "is-typed-array-1.1.3" = { + name = "is-typed-array"; + packageName = "is-typed-array"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.3.tgz"; + sha512 = "BSYUBOK/HJibQ30wWkWold5txYwMUXQct9YHAQJr8fSwvZoiglcqB0pd7vEN23+Tsi9IUEjztdOSzl4qLVYGTQ=="; + }; + }; "is-typedarray-1.0.0" = { name = "is-typedarray"; packageName = "is-typedarray"; @@ -23408,13 +23876,13 @@ let sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; }; }; - "is-wsl-2.1.1" = { + "is-wsl-2.2.0" = { name = "is-wsl"; packageName = "is-wsl"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz"; - sha512 = "umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog=="; + url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"; + sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; }; }; "is-yarn-global-0.3.0" = { @@ -23471,22 +23939,13 @@ let sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="; }; }; - "isbinaryfile-3.0.3" = { - name = "isbinaryfile"; - packageName = "isbinaryfile"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz"; - sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw=="; - }; - }; - "isbinaryfile-4.0.5" = { + "isbinaryfile-4.0.6" = { name = "isbinaryfile"; packageName = "isbinaryfile"; - version = "4.0.5"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.5.tgz"; - sha512 = "Jvz0gpTh1AILHMCBUyqq7xv1ZOQrxTDwyp1/QUq1xFpOBvp4AH5uEobPePJht8KnBGqQIH7We6OR73mXsjG0cA=="; + url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.6.tgz"; + sha512 = "ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg=="; }; }; "isemail-3.2.0" = { @@ -23561,13 +24020,13 @@ let sha1 = "611ae1acf14f5e81f729507472819fe9733558a9"; }; }; - "isomorphic-git-0.70.4" = { + "isomorphic-git-0.78.5" = { name = "isomorphic-git"; packageName = "isomorphic-git"; - version = "0.70.4"; + version = "0.78.5"; src = fetchurl { - url = "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-0.70.4.tgz"; - sha512 = "Nk/iD4iEL35zY1B4l2PgPOJpVgTQzVH9W0oRkKc3vDbMjcfvs7nle4Y8NRghXIG27Z6KQVSTi/om6lTbzpfl+A=="; + url = "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-0.78.5.tgz"; + sha512 = "LrF5t9x7RdFeg84NsYpZo9qF1MZeb56LpBm6Jv47qMjnWMv0Il/3wPTA8I/lUYywgVbvF/e7xypHauj5auKW3w=="; }; }; "isomorphic-textencoder-1.0.1" = { @@ -23615,6 +24074,15 @@ let sha512 = "imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg=="; }; }; + "istextorbinary-2.6.0" = { + name = "istextorbinary"; + packageName = "istextorbinary"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/istextorbinary/-/istextorbinary-2.6.0.tgz"; + sha512 = "+XRlFseT8B3L9KyjxxLjfXSLMuErKDsd8DBNrsaxoViABMEZlOSCstwmw0qpoFX3+U6yWU1yhLudAe6/lETGGA=="; + }; + }; "isuri-2.0.3" = { name = "isuri"; packageName = "isuri"; @@ -23678,13 +24146,13 @@ let sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31"; }; }; - "jaeger-client-3.17.2" = { + "jaeger-client-3.18.0" = { name = "jaeger-client"; packageName = "jaeger-client"; - version = "3.17.2"; + version = "3.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.17.2.tgz"; - sha512 = "19YloSidmKbrXHgecLWod8eXo7rm2ieUnsfg0ripTFGRCW5v2OWE96Gte4/tOQG/8N+T39VoLU2nMBdjbdMUJg=="; + url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.18.0.tgz"; + sha512 = "xZ9WvZDWLkZFq7SObpLwu1asMCKCgBRNcDxxGSvK+ZQ7OZyJC5xPlU+rJa4+s/P6autPBVwHpqMGbOERFxWuuA=="; }; }; "java-properties-1.0.2" = { @@ -23723,49 +24191,49 @@ let sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4"; }; }; - "jest-haste-map-25.1.0" = { + "jest-haste-map-25.5.1" = { name = "jest-haste-map"; packageName = "jest-haste-map"; - version = "25.1.0"; + version = "25.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.1.0.tgz"; - sha512 = "/2oYINIdnQZAqyWSn1GTku571aAfs8NxzSErGek65Iu5o8JYb+113bZysRMcC/pjE5v9w0Yz+ldbj9NxrFyPyw=="; + url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.5.1.tgz"; + sha512 = "dddgh9UZjV7SCDQUrQ+5t9yy8iEgKc1AKqZR9YDww8xsVOtzPQSMVLDChc21+g29oTRexb9/B0bIlZL+sWmvAQ=="; }; }; - "jest-regex-util-25.1.0" = { + "jest-regex-util-25.2.6" = { name = "jest-regex-util"; packageName = "jest-regex-util"; - version = "25.1.0"; + version = "25.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.1.0.tgz"; - sha512 = "9lShaDmDpqwg+xAd73zHydKrBbbrIi08Kk9YryBEBybQFg/lBWR/2BDjjiSE7KIppM9C5+c03XiDaZ+m4Pgs1w=="; + url = "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz"; + sha512 = "KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw=="; }; }; - "jest-serializer-25.1.0" = { + "jest-serializer-25.5.0" = { name = "jest-serializer"; packageName = "jest-serializer"; - version = "25.1.0"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.1.0.tgz"; - sha512 = "20Wkq5j7o84kssBwvyuJ7Xhn7hdPeTXndnwIblKDR2/sy1SUm6rWWiG9kSCgJPIfkDScJCIsTtOKdlzfIHOfKA=="; + url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.5.0.tgz"; + sha512 = "LxD8fY1lByomEPflwur9o4e2a5twSQ7TaVNLlFUuToIdoJuBt8tzHfCsZ42Ok6LkKXWzFWf3AGmheuLAA7LcCA=="; }; }; - "jest-util-25.1.0" = { + "jest-util-25.5.0" = { name = "jest-util"; packageName = "jest-util"; - version = "25.1.0"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-util/-/jest-util-25.1.0.tgz"; - sha512 = "7did6pLQ++87Qsj26Fs/TIwZMUFBXQ+4XXSodRNy3luch2DnRXsSnmpVtxxQ0Yd6WTipGpbhh2IFP1mq6/fQGw=="; + url = "https://registry.npmjs.org/jest-util/-/jest-util-25.5.0.tgz"; + sha512 = "KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA=="; }; }; - "jest-worker-25.1.0" = { + "jest-worker-25.5.0" = { name = "jest-worker"; packageName = "jest-worker"; - version = "25.1.0"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-25.1.0.tgz"; - sha512 = "ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz"; + sha512 = "/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw=="; }; }; "jetpack-id-1.0.0" = { @@ -23804,13 +24272,13 @@ let sha1 = "06d4912255093419477d425633606e0e90782967"; }; }; - "joplin-turndown-4.0.24" = { + "joplin-turndown-4.0.27" = { name = "joplin-turndown"; packageName = "joplin-turndown"; - version = "4.0.24"; + version = "4.0.27"; src = fetchurl { - url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.24.tgz"; - sha512 = "mKd2rAFzJKnhTVjEpHomG+T01//uz5rXVSAOYRh3/JKXpY7QUhVp8jCmFfO+kaadrLABTz04mvTmyyoOadxdTA=="; + url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.27.tgz"; + sha512 = "qwJEzpbsyXnfjYgCVXWbuf3BdbDAaP7edm5ubeVAaQ3RnaiSEB2xZLg3lubmuFOIxXnkMDMkGJC4G+qAbCW95w=="; }; }; "joplin-turndown-plugin-gfm-1.0.12" = { @@ -23849,6 +24317,15 @@ let sha512 = "36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="; }; }; + "jquery-3.5.0" = { + name = "jquery"; + packageName = "jquery"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jquery/-/jquery-3.5.0.tgz"; + sha512 = "Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ=="; + }; + }; "jquery-ui-bundle-1.12.1" = { name = "jquery-ui-bundle"; packageName = "jquery-ui-bundle"; @@ -23858,13 +24335,13 @@ let sha1 = "d6be2e4c377494e2378b1cae2920a91d1182d8c4"; }; }; - "jquery.terminal-2.15.2" = { + "jquery.terminal-2.15.4" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.15.2"; + version = "2.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.15.2.tgz"; - sha512 = "/G5L/laZLLO0tEQ+a94mLnvDXB5+PbC9IuZB+ikbw4E7W3GQkRpa0I15Z3xA+WbOaVZj+hEtPcKyyQLcKdjULQ=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.15.4.tgz"; + sha512 = "7XSLLjc2Il+1wtJQYQWkir8A5WnTMFEkwb1fGx3mASxQ+lp0Yu4Ua3iQTSKZGdYR3FINor9ToK107lJHEWOeYA=="; }; }; "js-base64-2.5.2" = { @@ -23876,13 +24353,13 @@ let sha512 = "Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ=="; }; }; - "js-beautify-1.10.3" = { + "js-beautify-1.11.0" = { name = "js-beautify"; packageName = "js-beautify"; - version = "1.10.3"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.3.tgz"; - sha512 = "wfk/IAWobz1TfApSdivH5PJ0miIHgDoYb1ugSqHcODPmaYu46rYe5FVuIEkhjg8IQiv6rDNPyhsqbsohI/C2vQ=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.11.0.tgz"; + sha512 = "a26B+Cx7USQGSWnz9YxgJNMmML/QG2nqIaL7VVYPCXbqiKz8PN0waSNvroMtvAK6tY7g/wPdNWGEP+JTNIBr6A=="; }; }; "js-message-1.0.5" = { @@ -23993,13 +24470,13 @@ let sha1 = "b01307cb29b618a1ed26ec79e911f803c4da0040"; }; }; - "jscodeshift-0.7.0" = { + "jscodeshift-0.7.1" = { name = "jscodeshift"; packageName = "jscodeshift"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.7.0.tgz"; - sha512 = "Kt6rpTa1HVhAWagD6J0y6qxxqRmDgkFvczerLgOsDNSGoUZSmq2CO1vFRcda9OV1BaZKSHCIh+VREPts5tB/Ig=="; + url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.7.1.tgz"; + sha512 = "YMkZSyoc8zg5woZL23cmWlnFLPH/mHilonGA7Qbzs7H6M4v4PH0Qsn4jeDyw+CHhVoAnm9UxQyB0Yw1OT+mktA=="; }; }; "jsdom-11.12.0" = { @@ -24317,22 +24794,22 @@ let sha512 = "8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ=="; }; }; - "json5-2.1.2" = { + "json5-2.1.3" = { name = "json5"; packageName = "json5"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz"; - sha512 = "MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ=="; + url = "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz"; + sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; }; }; - "jsonata-1.8.1" = { + "jsonata-1.8.3" = { name = "jsonata"; packageName = "jsonata"; - version = "1.8.1"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/jsonata/-/jsonata-1.8.1.tgz"; - sha512 = "Lw1ApNtYH9i/lWBuRSm1I/xfhPyTvlVslVIaGLW/bxFimxQYzQx2y3+DNRmbx5mmCmRb+bCLdIJasEFyb+aUlQ=="; + url = "https://registry.npmjs.org/jsonata/-/jsonata-1.8.3.tgz"; + sha512 = "r6ztI6ohbpRo77AxBm6vMs3aHZi2L2PaakW7TCPwSkeGcuAZ/SxXGLWH2Npwqq5+YBM/fg/g0EXg/pI9HvXQ8Q=="; }; }; "jsonc-parser-1.0.3" = { @@ -24497,13 +24974,13 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "jssha-2.3.1" = { + "jssha-2.4.2" = { name = "jssha"; packageName = "jssha"; - version = "2.3.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jssha/-/jssha-2.3.1.tgz"; - sha1 = "147b2125369035ca4b2f7d210dc539f009b3de9a"; + url = "https://registry.npmjs.org/jssha/-/jssha-2.4.2.tgz"; + sha512 = "/jsi/9C0S70zfkT/4UlKQa5E1xKurDnXcQizcww9JSR/Fv+uIbWM2btG+bFcL3iNoK9jIGS0ls9HWLr1iw0kFg=="; }; }; "jstransform-10.1.0" = { @@ -24533,23 +25010,22 @@ let sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; }; }; - "jszip-3.2.2" = { + "jszip-3.1.5" = { name = "jszip"; packageName = "jszip"; - version = "3.2.2"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.2.2.tgz"; - sha512 = "NmKajvAFQpbg3taXQXr/ccS2wcucR1AZ+NtyWp2Nq7HHVsXhcJFR8p0Baf32C2yVvBylFWVeKf+WI2AnvlPhpA=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz"; + sha512 = "5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ=="; }; }; - "jszip-git://github.com/anmonteiro/jszip#patch-1" = { + "jszip-3.4.0" = { name = "jszip"; packageName = "jszip"; - version = "2.6.1"; - src = fetchgit { - url = "git://github.com/anmonteiro/jszip"; - rev = "5a92e8c9153a3557daa8d3540b00c50bd8554c49"; - sha256 = "00016993634d04b6f7eea8fae529b804d5a0b7ed2636361c7546a48b866e9c5c"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jszip/-/jszip-3.4.0.tgz"; + sha512 = "gZAOYuPl4EhPTXT0GjhI3o+ZAz3su6EhLrKUoAivcKqyqC7laS5JEv4XWZND9BgcDcF83vI85yGbDmDR6UhrIg=="; }; }; "junk-3.1.0" = { @@ -25048,6 +25524,15 @@ let sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; }; }; + "lazy-cache-2.0.2" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz"; + sha1 = "b9190a4f913354694840859f8a8f7084d8822264"; + }; + }; "lazyness-1.1.1" = { name = "lazyness"; packageName = "lazyness"; @@ -25273,13 +25758,13 @@ let sha512 = "rXM7GYnW8gsl1vedTJIbzOrRv85c/2uCMpiiCzO2fndd06U/kUXEEU9evYn4zFggBOg36IsBW8LzqIpETwwQzg=="; }; }; - "leveldown-5.5.1" = { + "leveldown-5.6.0" = { name = "leveldown"; packageName = "leveldown"; - version = "5.5.1"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/leveldown/-/leveldown-5.5.1.tgz"; - sha512 = "GoC455/ncfg4yLLItr192HuXpA+CcQ2q9GncXJhewvvlpsBBEegChn5tMPP+kGvJt7u2LuXAd8fY2moQxFD+sQ=="; + url = "https://registry.npmjs.org/leveldown/-/leveldown-5.6.0.tgz"; + sha512 = "iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ=="; }; }; "levelup-0.19.1" = { @@ -25291,13 +25776,13 @@ let sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b"; }; }; - "levelup-4.3.2" = { + "levelup-4.4.0" = { name = "levelup"; packageName = "levelup"; - version = "4.3.2"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/levelup/-/levelup-4.3.2.tgz"; - sha512 = "cRTjU4ktWo59wf13PHEiOayHC3n0dOh4i5+FHr4tv4MX9+l7mqETicNq3Aj07HKlLdk0z5muVoDL2RD+ovgiyA=="; + url = "https://registry.npmjs.org/levelup/-/levelup-4.4.0.tgz"; + sha512 = "94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ=="; }; }; "leven-2.1.0" = { @@ -25399,6 +25884,15 @@ let sha1 = "86652b0009a6d84ea79a5320bdca5f00612ee439"; }; }; + "lie-3.1.1" = { + name = "lie"; + packageName = "lie"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz"; + sha1 = "9a436b2cc7746ca59de7a41fa469b3efb76bd87e"; + }; + }; "lie-3.3.0" = { name = "lie"; packageName = "lie"; @@ -25480,13 +25974,13 @@ let sha1 = "bf967ba0dd31faaf09ab5bdb3676ad7f2aa18493"; }; }; - "link-check-4.4.7" = { + "link-check-4.5.0" = { name = "link-check"; packageName = "link-check"; - version = "4.4.7"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/link-check/-/link-check-4.4.7.tgz"; - sha512 = "E5MJf3+4OiHJzqDw9CQpOeJT3yOoKUxLHVaPPzNPXvaYPJ20C5MRzk1lPoojWnf5xwoRZjK+ydzfq2kPTwJr/g=="; + url = "https://registry.npmjs.org/link-check/-/link-check-4.5.0.tgz"; + sha512 = "7PWHakA/+O5uaZ9yD290fiG2PUK9weoHAMgtoH3VPllL8ukYHe1YEbwgK9jjnUSE7Xa3zgT41mg+7TnZAPLxkQ=="; }; }; "linkify-it-2.2.0" = { @@ -26839,13 +27333,13 @@ let sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ=="; }; }; - "loglevel-1.6.7" = { + "loglevel-1.6.8" = { name = "loglevel"; packageName = "loglevel"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz"; - sha512 = "cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz"; + sha512 = "bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA=="; }; }; "loglevel-colored-level-prefix-1.0.0" = { @@ -27235,15 +27729,6 @@ let sha512 = "oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w=="; }; }; - "magic-string-0.25.4" = { - name = "magic-string"; - packageName = "magic-string"; - version = "0.25.4"; - src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.4.tgz"; - sha512 = "oycWO9nEVAP2RVPbIoDoA4Y7LFIJ3xRYov93gAyJhZkET1tNuB0u7uWkZS2LpBWTJUWnmau/To8ECWRC+jKNfw=="; - }; - }; "magic-string-0.25.7" = { name = "magic-string"; packageName = "magic-string"; @@ -27316,13 +27801,13 @@ let sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; }; }; - "make-dir-3.0.2" = { + "make-dir-3.1.0" = { name = "make-dir"; packageName = "make-dir"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz"; - sha512 = "rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w=="; + url = "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"; + sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; }; "make-error-1.3.6" = { @@ -27352,13 +27837,13 @@ let sha512 = "07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag=="; }; }; - "make-fetch-happen-8.0.4" = { + "make-fetch-happen-8.0.6" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "8.0.4"; + version = "8.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.4.tgz"; - sha512 = "hIFoqGq1db0QMiy/Atr/pI1Rs4rDV+ZdGSey2SQyF3KK3u1z4aj9mS5UdNnZkdQpA+H3pGn0J3KlEwsi2x4EqA=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.6.tgz"; + sha512 = "QJ4pB5VBY9H9e+3t/o+fPjsVUlPULpAllxuKertRo/7ii47TfxeEEnneM6NCmhyn4MQPTYL+M+RkiU9bR+hAfg=="; }; }; "make-iterator-1.0.1" = { @@ -27532,13 +28017,13 @@ let sha1 = "d66b5364521cbb3dd8aa59dadfba2fb6865c8fd8"; }; }; - "markdown-it-anchor-5.2.5" = { + "markdown-it-anchor-5.2.7" = { name = "markdown-it-anchor"; packageName = "markdown-it-anchor"; - version = "5.2.5"; + version = "5.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.2.5.tgz"; - sha512 = "xLIjLQmtym3QpoY9llBgApknl7pxAcN3WDRc2d3rwpl+/YvDZHPmKscGs+L6E05xf2KrCXPBvosWt7MZukwSpQ=="; + url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.2.7.tgz"; + sha512 = "REFmIaSS6szaD1bye80DMbp7ePwsPNvLTR5HunsUcZ0SG0rWJQ+Pz24R4UlTKtjKBPhxo0v0tOBDYjZQQknW8Q=="; }; }; "markdown-it-deflist-2.0.3" = { @@ -27649,13 +28134,13 @@ let sha512 = "UhD2Oj6cZV3ycYPoelt4hTkwKIK3zbPP1wjjdpCq7UGtWQOFalDFDv1s2zBYV6aR2gMs/X8kpJcOYsQmUbiXDw=="; }; }; - "markdown-link-extractor-1.2.2" = { + "markdown-link-extractor-1.2.3" = { name = "markdown-link-extractor"; packageName = "markdown-link-extractor"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-extractor/-/markdown-link-extractor-1.2.2.tgz"; - sha512 = "VYDUhlC70hKl0coCY6dXyJ4OCRAX5dTh0/oSTdidhYS7dYIJ9kYAez6KR0vc3HWySMuo564J1rN0NOAPBDI0iA=="; + url = "https://registry.npmjs.org/markdown-link-extractor/-/markdown-link-extractor-1.2.3.tgz"; + sha512 = "BGgBPPNjRpwKzkMxuY5YG2ntPmSL8UMnGiYxRR/9etK3ABLv9SsKHt70PUxv6MaBSC3TnpRsvcIOmnCFWvjcRA=="; }; }; "markdown-serve-0.3.3" = { @@ -27703,13 +28188,22 @@ let sha512 = "c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="; }; }; - "marked-terminal-4.0.0" = { + "marked-0.8.2" = { + name = "marked"; + packageName = "marked"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/marked/-/marked-0.8.2.tgz"; + sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="; + }; + }; + "marked-terminal-4.1.0" = { name = "marked-terminal"; packageName = "marked-terminal"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/marked-terminal/-/marked-terminal-4.0.0.tgz"; - sha512 = "mzU3VD7aVz12FfGoKFAceijehA6Ocjfg3rVimvJbFAB/NOYCsuzRVtq3PSFdPmWI5mhdGeEh3/aMJ5DSxAz94Q=="; + url = "https://registry.npmjs.org/marked-terminal/-/marked-terminal-4.1.0.tgz"; + sha512 = "5KllfAOW02WS6hLRQ7cNvGOxvKW1BKuXELH4EtbWfyWgxQhROoMxEvuQ/3fTgkNjledR0J48F4HbapvYp1zWkQ=="; }; }; "marky-1.2.1" = { @@ -27748,15 +28242,6 @@ let sha1 = "c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e"; }; }; - "matcher-2.0.0" = { - name = "matcher"; - packageName = "matcher"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/matcher/-/matcher-2.0.0.tgz"; - sha512 = "nlmfSlgHBFx36j/Pl/KQPbIaqE8Zf0TqmSMjsuddHDg6PMSVgmyW9HpkLs0o0M1n2GIZ/S2BZBLIww/xjhiGng=="; - }; - }; "matcher-2.1.0" = { name = "matcher"; packageName = "matcher"; @@ -27865,13 +28350,13 @@ let sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8"; }; }; - "mdn-browser-compat-data-1.0.3" = { + "mdn-browser-compat-data-1.0.15" = { name = "mdn-browser-compat-data"; packageName = "mdn-browser-compat-data"; - version = "1.0.3"; + version = "1.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.3.tgz"; - sha512 = "5n7c20IVrUiuOPSuhbkd5xoJPSzEEGsoMrmrdEtPHIw6gRPzonydcsguAmqGfSBd4d2DRoDQg533sijLUpeJLg=="; + url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.15.tgz"; + sha512 = "0jxT4ZqqCzJJfktX9d4NKgfRENy60kFzhVNV0mXNHvlnw8KrMe2cKOlEKs/Bz+odlgO0rRZAxU0OKiptqVhAXg=="; }; }; "mdn-data-2.0.4" = { @@ -28009,13 +28494,13 @@ let sha512 = "qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw=="; }; }; - "mem-6.0.1" = { + "mem-6.1.0" = { name = "mem"; packageName = "mem"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-6.0.1.tgz"; - sha512 = "uIRYASflIsXqvKe+7aXbLrydaRzz4qiK6amqZDQI++eRtW3UoKtnDcGeCAOREgll7YMxO5E4VB9+3B0LFmy96g=="; + url = "https://registry.npmjs.org/mem/-/mem-6.1.0.tgz"; + sha512 = "RlbnLQgRHk5lwqTtpEkBTQ2ll/CG/iB+J4Hy2Wh97PjgZgXgWJWrFF+XXujh3UUVLvR4OOTgZzcWMMwnehlEUg=="; }; }; "mem-fs-1.1.3" = { @@ -28027,6 +28512,15 @@ let sha1 = "b8ae8d2e3fcb6f5d3f9165c12d4551a065d989cc"; }; }; + "mem-fs-editor-6.0.0" = { + name = "mem-fs-editor"; + packageName = "mem-fs-editor"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-6.0.0.tgz"; + sha512 = "e0WfJAMm8Gv1mP5fEq/Blzy6Lt1VbLg7gNnZmZak7nhrBTibs+c6nQ4SKs/ZyJYHS1mFgDJeopsLAv7Ow0FMFg=="; + }; + }; "memoizee-0.4.14" = { name = "memoizee"; packageName = "memoizee"; @@ -28153,13 +28647,13 @@ let sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="; }; }; - "meow-6.1.0" = { + "meow-6.1.1" = { name = "meow"; packageName = "meow"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-6.1.0.tgz"; - sha512 = "iIAoeI01v6pmSfObAAWFoITAA4GgiT45m4SmJgoxtZfvI0fyZwhV4d0lTwiUXvAKIPlma05Feb2Xngl52Mj5Cg=="; + url = "https://registry.npmjs.org/meow/-/meow-6.1.1.tgz"; + sha512 = "3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg=="; }; }; "merge-1.2.1" = { @@ -28234,13 +28728,13 @@ let sha1 = "401fdec7ec21cdb9e03cd3d3021398da21b27085"; }; }; - "metals-languageclient-0.1.20" = { + "metals-languageclient-0.2.1" = { name = "metals-languageclient"; packageName = "metals-languageclient"; - version = "0.1.20"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.1.20.tgz"; - sha512 = "Ok3/i1ckdd7b3K+PM9dsK21kRwXrAlfpZrXV5tgAo8I+QWSQTPa0E5uciNT/wOCKgCaRuC7Zu0vmYgLA4hbOiQ=="; + url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.2.1.tgz"; + sha512 = "8iVF+wKKZVN7r1/9JSv4QCJO2lRyqQvxs6+kmTviKVj/pYsH0qBR8vo7ne+7MkKrvyz8lnZCX29siv6sOWf3Qw=="; }; }; "metalsmith-2.3.0" = { @@ -28414,6 +28908,15 @@ let sha512 = "LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="; }; }; + "mime-2.4.5" = { + name = "mime"; + packageName = "mime"; + version = "2.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz"; + sha512 = "3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w=="; + }; + }; "mime-db-1.12.0" = { name = "mime-db"; packageName = "mime-db"; @@ -28441,6 +28944,15 @@ let sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="; }; }; + "mime-db-1.44.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.44.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"; + sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; + }; + }; "mime-types-2.0.14" = { name = "mime-types"; packageName = "mime-types"; @@ -28468,6 +28980,15 @@ let sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ=="; }; }; + "mime-types-2.1.27" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.27"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz"; + sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; + }; + }; "mimic-fn-1.2.0" = { name = "mimic-fn"; packageName = "mimic-fn"; @@ -28630,15 +29151,6 @@ let sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "minimist-1.1.3" = { - name = "minimist"; - packageName = "minimist"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz"; - sha1 = "3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"; - }; - }; "minimist-1.2.5" = { name = "minimist"; packageName = "minimist"; @@ -28783,13 +29295,13 @@ let sha1 = "f98ee7b5fffd3f4dadc5733827db0aa57f861880"; }; }; - "mirror-folder-3.0.0" = { + "mirror-folder-3.1.0" = { name = "mirror-folder"; packageName = "mirror-folder"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-3.0.0.tgz"; - sha512 = "fh6wDXcSpFoKY7ZPHnEv1+xjLOS7tlkEpTvl4Y6ZsT0HNjIaYg6ktq9ng8MPthFruunS8D/3GnPeaWhoQD3X9g=="; + url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-3.1.0.tgz"; + sha512 = "OI7i/f1OjPWyloZi8kEZFSe50V9gMdMsCOzeS6DZ8OgpJP9bCDXDJRiDWYEfYNF2sCY7TBZBbLfKuEo3vohJhw=="; }; }; "mississippi-3.0.0" = { @@ -28846,31 +29358,40 @@ let sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; - "mkdirp-0.5.3" = { + "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.3"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz"; - sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg=="; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "mkdirp-0.5.4" = { + "mkdirp-1.0.3" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.4"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz"; - sha512 = "iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw=="; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz"; + sha512 = "6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g=="; }; }; - "mkdirp-1.0.3" = { + "mkdirp-1.0.4" = { name = "mkdirp"; packageName = "mkdirp"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz"; - sha512 = "6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g=="; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; + }; + }; + "mkdirp-classic-0.5.3" = { + name = "mkdirp-classic"; + packageName = "mkdirp-classic"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; }; }; "mkdirp-promise-5.0.1" = { @@ -28981,6 +29502,15 @@ let sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; }; }; + "moment-2.25.3" = { + name = "moment"; + packageName = "moment"; + version = "2.25.3"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz"; + sha512 = "PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg=="; + }; + }; "moment-2.7.0" = { name = "moment"; packageName = "moment"; @@ -29053,6 +29583,15 @@ let sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; }; }; + "move-file-2.0.0" = { + name = "move-file"; + packageName = "move-file"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/move-file/-/move-file-2.0.0.tgz"; + sha512 = "cdkdhNCgbP5dvS4tlGxZbD+nloio9GIimP57EjqFhwLcMjnU+XJKAZzlmg/TN/AK1LuNAdTSvm3CPPP4Xkv0iQ=="; + }; + }; "mp4-box-encoding-1.4.1" = { name = "mp4-box-encoding"; packageName = "mp4-box-encoding"; @@ -29233,13 +29772,13 @@ let sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g=="; }; }; - "multicast-dns-7.2.1" = { + "multicast-dns-7.2.2" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "7.2.1"; + version = "7.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.1.tgz"; - sha512 = "qJaNecNV4wV5FqZ+aBHOgUcHaJXpEMZhiERmuu7CM0YrCyIsgevVLZJGXeyxMAiofN+jby8oAGr8BpQk6xmptw=="; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.2.tgz"; + sha512 = "XqSMeO8EWV/nOXOpPV8ztIpNweVfE1dSpz6SQvDPp71HD74lMXjt4m/mWB1YBMG0kHtOodxRWc5WOb/UNN1A5g=="; }; }; "multicast-dns-service-types-1.1.0" = { @@ -29368,13 +29907,13 @@ let sha512 = "KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ=="; }; }; - "mustache-4.0.0" = { + "mustache-4.0.1" = { name = "mustache"; packageName = "mustache"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mustache/-/mustache-4.0.0.tgz"; - sha512 = "FJgjyX/IVkbXBXYUwH+OYwQKqWpFPLaLVESd70yHjSDunwzV2hZOoTBvPf4KLoxesUzzyfTH6F784Uqd7Wm5yA=="; + url = "https://registry.npmjs.org/mustache/-/mustache-4.0.1.tgz"; + sha512 = "yL5VE97+OXn4+Er3THSmTdCFCtx5hHWzrolvH+JObZnUYwuaG7XV+Ch4fR2cIrcYI0tFHxS7iyFYl14bW8y2sA=="; }; }; "mutate.js-0.2.0" = { @@ -29440,13 +29979,13 @@ let sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; }; }; - "mutexify-1.2.0" = { + "mutexify-1.3.0" = { name = "mutexify"; packageName = "mutexify"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mutexify/-/mutexify-1.2.0.tgz"; - sha512 = "oprzxd2zhfrJqEuB98qc1dRMMonClBQ57UPDjnbcrah4orEMTq1jq3+AcdFe5ePzdbJXI7zmdhfftIdMnhYFoQ=="; + url = "https://registry.npmjs.org/mutexify/-/mutexify-1.3.0.tgz"; + sha512 = "WNPlgZ3AHETGSa4jeRP4aW6BPQ/a++MwoMFFIgrDg80+m70mbxuNOrevANfBDmur82zxTFAY3OwvMAvqrkV2sA=="; }; }; "muxrpc-6.5.0" = { @@ -29530,13 +30069,13 @@ let sha512 = "TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="; }; }; - "nan-2.14.0" = { + "nan-2.14.1" = { name = "nan"; packageName = "nan"; - version = "2.14.0"; + version = "2.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; - sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; + url = "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz"; + sha512 = "isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="; }; }; "nan-2.3.5" = { @@ -29840,13 +30379,13 @@ let sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "nearley-2.19.1" = { + "nearley-2.19.3" = { name = "nearley"; packageName = "nearley"; - version = "2.19.1"; + version = "2.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/nearley/-/nearley-2.19.1.tgz"; - sha512 = "xq47GIUGXxU9vQg7g/y1o1xuKnkO7ev4nRWqftmQrLkfnE/FjRqDaGOUakM8XHPn/6pW3bGjU2wgoJyId90rqg=="; + url = "https://registry.npmjs.org/nearley/-/nearley-2.19.3.tgz"; + sha512 = "FpAy1PmTsUpOtgxr23g4jRNvJHYzZEW2PixXeSzksLR/ykPfwKhAodc2+9wQhY+JneWLcvkDw6q7FJIsIdF/aQ=="; }; }; "neat-csv-2.1.0" = { @@ -29858,13 +30397,13 @@ let sha1 = "06f58360c4c3b955bd467ddc85ae4511a3907a4c"; }; }; - "neat-input-1.11.0" = { + "neat-input-1.11.1" = { name = "neat-input"; packageName = "neat-input"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/neat-input/-/neat-input-1.11.0.tgz"; - sha512 = "B7VCdE3tMC8RnKGGHatjwcR0TsHB7SiDHmYXyZ7m9YzQRdOAOF9oSwWO/WP4DLqdCma22EXWuxzEGFD80JjBeA=="; + url = "https://registry.npmjs.org/neat-input/-/neat-input-1.11.1.tgz"; + sha512 = "fWo4KrgeLB2TPQ4d8BF1DexvOJYvYuj0IGtSL4Ri3UuT59lJnYiu90xMCMfciySXLVHdWhXq/10A/I/pBynh0g=="; }; }; "neat-log-2.4.0" = { @@ -29921,13 +30460,13 @@ let sha1 = "f52a5858972121618e002f8e6384cadac22d624f"; }; }; - "needle-2.4.0" = { + "needle-2.4.1" = { name = "needle"; packageName = "needle"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz"; - sha512 = "4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg=="; + url = "https://registry.npmjs.org/needle/-/needle-2.4.1.tgz"; + sha512 = "x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g=="; }; }; "negotiator-0.3.0" = { @@ -30156,13 +30695,13 @@ let sha512 = "iEOqDAOFl6uN5jZGRj39Jdo8qALzf2HPXtpFso8+BMaDylDrUMYMwhFbfYGgxdnMlsRnxYTwv68kaXEpsHIapg=="; }; }; - "node-abi-2.15.0" = { + "node-abi-2.16.0" = { name = "node-abi"; packageName = "node-abi"; - version = "2.15.0"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.15.0.tgz"; - sha512 = "FeLpTS0F39U7hHZU1srAK4Vx+5AHNVOTP+hxBNQknR/54laTHSFIJkDWDqiquY1LeLUgTfPN7sLPhMubx0PLAg=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.16.0.tgz"; + sha512 = "+sa0XNlWDA6T+bDLmkCUYn6W5k5W6BPRL6mqzSCs6H/xUgtl4D5x2fORKDzopKiU6wsyn/+wXlRXwXeSp+mtoA=="; }; }; "node-addon-api-1.7.1" = { @@ -30292,13 +30831,13 @@ let sha512 = "8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="; }; }; - "node-fetch-npm-2.0.3" = { + "node-fetch-npm-2.0.4" = { name = "node-fetch-npm"; packageName = "node-fetch-npm"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.3.tgz"; - sha512 = "DgwoKEsqLnFZtk3ap7GWBHcHwnUhsNmQqEDcdjfQ8GofLEFJ081NAd4Uin3R7RFZBWVJCwHISw1oaEqPgSLloA=="; + url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz"; + sha512 = "iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg=="; }; }; "node-forge-0.2.24" = { @@ -30346,6 +30885,15 @@ let sha512 = "OUTryc5bt/P8zVgNUmC6xdXiDJxLMAW8cF5tLQOT9E5sOQj+UeQxnnPy74K3CLCa/SOjjBlbuzDLR8ANwA+wmw=="; }; }; + "node-gyp-6.1.0" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-6.1.0.tgz"; + sha512 = "h4A2zDlOujeeaaTx06r4Vy+8MZ1679lU+wbCKDS4ZtvY2A37DESo37oejIw0mtmR3+rvNwts5B6Kpt1KrNYdNw=="; + }; + }; "node-gyp-build-3.7.0" = { name = "node-gyp-build"; packageName = "node-gyp-build"; @@ -30373,13 +30921,13 @@ let sha512 = "dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ=="; }; }; - "node-gyp-build-4.2.1" = { + "node-gyp-build-4.2.2" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.1.tgz"; - sha512 = "XyCKXsqZfLqHep1hhsMncoXuUNt/cXCjg1+8CLbu69V1TKuPiOeSGbL9n+k/ByKH8UT0p4rdIX8XkTRZV0i7Sw=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.2.tgz"; + sha512 = "Lqh7mrByWCM8Cf9UPqpeoVBBo5Ugx+RKu885GAzmLBVYjeywScxHXPGLa4JfYNZmcNGwzR0Glu5/9GaQZMFqyA=="; }; }; "node-int64-0.4.0" = { @@ -30499,13 +31047,13 @@ let sha512 = "j1g/VtSCI2tBrBnCD+u8iSo9tH0nvn70k1O1SxkHk3+qx7tHUyOKQc7wNc4rUs9J1PkGngUC3qEDd5cL7Z/klg=="; }; }; - "node-releases-1.1.52" = { + "node-releases-1.1.53" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.52"; + version = "1.1.53"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.52.tgz"; - sha512 = "snSiT1UypkgGt2wxPqS6ImEUICbNCMb31yaxWrOLXjhlt2z2/IBpaOxzONExqSm4y5oLnAqjjRWu+wsDzK5yNQ=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz"; + sha512 = "wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ=="; }; }; "node-request-by-swagger-1.1.4" = { @@ -30697,15 +31245,6 @@ let sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; }; }; - "nopt-4.0.1" = { - name = "nopt"; - packageName = "nopt"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; - sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; - }; - }; "nopt-4.0.3" = { name = "nopt"; packageName = "nopt"; @@ -30832,6 +31371,15 @@ let sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6"; }; }; + "npm-api-1.0.0" = { + name = "npm-api"; + packageName = "npm-api"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-api/-/npm-api-1.0.0.tgz"; + sha512 = "gtJhIhGq07g9H5sIAB9TZzTySW8MYtcYqg+e+J+5q1GmDsDLLVfyvVBL1VklzjtRsElph11GUtLBS191RDOJxQ=="; + }; + }; "npm-bundled-1.1.1" = { name = "npm-bundled"; packageName = "npm-bundled"; @@ -30913,13 +31461,13 @@ let sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67"; }; }; - "npm-lifecycle-3.1.4" = { + "npm-lifecycle-3.1.5" = { name = "npm-lifecycle"; packageName = "npm-lifecycle"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.4.tgz"; - sha512 = "tgs1PaucZwkxECGKhC/stbEgFyc3TGh2TJcg2CDr6jbvQRdteHNhmMeljRzpe4wgFAXQADoy1cSqqi7mtiAa5A=="; + url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.5.tgz"; + sha512 = "lDLVkjfZmvmfvpvBzA4vzee9cn+Me4orq0QF8glbswJVEbIcSNWib7qGOffolysc3teCqbbPZZkzbr3GQZTL1g=="; }; }; "npm-normalize-package-bin-1.0.1" = { @@ -30940,15 +31488,6 @@ let sha512 = "qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg=="; }; }; - "npm-package-arg-7.0.0" = { - name = "npm-package-arg"; - packageName = "npm-package-arg"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-7.0.0.tgz"; - sha512 = "xXxr8y5U0kl8dVkz2oK7yZjPBvqM2fwaO5l3Yg13p03v8+E3qQcD0JNhHzjL1vyGgxcKkD0cco+NLR72iuPk3g=="; - }; - }; "npm-package-arg-8.0.1" = { name = "npm-package-arg"; packageName = "npm-package-arg"; @@ -31012,6 +31551,15 @@ let sha512 = "PdJpXMvjqt4nftNEDpCgjBUF8yI3Q3MyuAmVB9nemnnCg32F4BPL/JFBfdj8DubgHCYUFQhtLWmBPvdsFtjWMg=="; }; }; + "npm-pick-manifest-6.1.0" = { + name = "npm-pick-manifest"; + packageName = "npm-pick-manifest"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.0.tgz"; + sha512 = "ygs4k6f54ZxJXrzT0x34NybRlLeZ4+6nECAIbr2i0foTnijtS1TJiyzpqtuUAJOps/hO0tNDr8fRV5g+BtRlTw=="; + }; + }; "npm-prefix-1.2.0" = { name = "npm-prefix"; packageName = "npm-prefix"; @@ -31039,22 +31587,22 @@ let sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg=="; }; }; - "npm-registry-fetch-4.0.3" = { + "npm-registry-fetch-4.0.4" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.3.tgz"; - sha512 = "WGvUx0lkKFhu9MbiGFuT9nG2NpfQ+4dCJwRwwtK2HK5izJEvwDxMeUyqbuMS7N/OkpVCqDorV6rO5E4V9F8lJw=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.4.tgz"; + sha512 = "6jb34hX/iYNQebqWUHtU8YF6Cjb1H6ouTFPClYsyiW6lpFkljTpdeftm53rRojtja1rKAvKNIIiTS5Sjpw4wsA=="; }; }; - "npm-registry-fetch-8.0.0" = { + "npm-registry-fetch-8.0.2" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "8.0.0"; + version = "8.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.0.0.tgz"; - sha512 = "975WwLvZjX97y9UWWQ8nAyr7bw02s9xKPHqvEm5T900LQsB1HXb8Gb9ebYtCBLSX+K8gSOrO5KS/9yV/naLZmQ=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.0.2.tgz"; + sha512 = "/UteT/LQ+0eegPh96w2sVjpAJk2kuphWASp1SPBFBWtSyuPoUW5gf4utzQm5A5FLrZF3eZJGH59j4X6KBUa40g=="; }; }; "npm-run-4.1.2" = { @@ -31261,7 +31809,7 @@ let version = "0.9.15"; src = fetchurl { name = "oauth-0.9.15.tar.gz"; - url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master; + url = "https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master"; sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947"; }; }; @@ -31382,13 +31930,13 @@ let sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="; }; }; - "object-is-1.0.2" = { + "object-is-1.1.2" = { name = "object-is"; packageName = "object-is"; - version = "1.0.2"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz"; - sha512 = "Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ=="; + url = "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz"; + sha512 = "5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ=="; }; }; "object-keys-0.4.0" = { @@ -31796,15 +32344,6 @@ let sha1 = "707375e59ab9f73025899727679b20328171c9aa"; }; }; - "opentracing-0.13.0" = { - name = "opentracing"; - packageName = "opentracing"; - version = "0.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/opentracing/-/opentracing-0.13.0.tgz"; - sha1 = "6a341442f09d7d866bc11ed03de1e3828e3d6aab"; - }; - }; "opentracing-0.14.4" = { name = "opentracing"; packageName = "opentracing"; @@ -31967,22 +32506,22 @@ let sha512 = "eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg=="; }; }; - "ora-4.0.2" = { + "ora-4.0.3" = { name = "ora"; packageName = "ora"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-4.0.2.tgz"; - sha512 = "YUOZbamht5mfLxPmk4M35CD/5DuOkAacxlEUbStVXpBAt4fyhBf+vZHI/HRkI++QUp3sNoeA2Gw4C+hi4eGSig=="; + url = "https://registry.npmjs.org/ora/-/ora-4.0.3.tgz"; + sha512 = "fnDebVFyz309A73cqCipVL1fBZewq4vwgSHfxh43vVy31mbyoQ8sCH3Oeaog/owYOs/lLlGVPCISQonTneg6Pg=="; }; }; - "ora-4.0.3" = { + "ora-4.0.4" = { name = "ora"; packageName = "ora"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-4.0.3.tgz"; - sha512 = "fnDebVFyz309A73cqCipVL1fBZewq4vwgSHfxh43vVy31mbyoQ8sCH3Oeaog/owYOs/lLlGVPCISQonTneg6Pg=="; + url = "https://registry.npmjs.org/ora/-/ora-4.0.4.tgz"; + sha512 = "77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww=="; }; }; "orchestrator-0.3.8" = { @@ -32021,6 +32560,15 @@ let sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg=="; }; }; + "os-0.1.1" = { + name = "os"; + packageName = "os"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/os/-/os-0.1.1.tgz"; + sha1 = "208845e89e193ad4d971474b93947736a56d13f3"; + }; + }; "os-browserify-0.3.0" = { name = "os-browserify"; packageName = "os-browserify"; @@ -32066,13 +32614,13 @@ let sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q=="; }; }; - "os-locale-4.0.0" = { + "os-locale-5.0.0" = { name = "os-locale"; packageName = "os-locale"; - version = "4.0.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-4.0.0.tgz"; - sha512 = "HsSR1+2l6as4Wp2SGZxqLnuFHxVvh1Ir9pvZxyujsC13egZVe7P0YeBLN0ijQzM/twrO5To3ia3jzBXAvpMTEA=="; + url = "https://registry.npmjs.org/os-locale/-/os-locale-5.0.0.tgz"; + sha512 = "tqZcNEDAIZKBEPnHPlVDvKrp7NzgLi7jRmhKiUoa2NUmhl13FtkAGLUVR+ZsYvApBQdBfYm43A4tXXQ4IrYLBA=="; }; }; "os-name-3.1.0" = { @@ -32273,13 +32821,13 @@ let sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; }; }; - "p-limit-2.2.2" = { + "p-limit-2.3.0" = { name = "p-limit"; packageName = "p-limit"; - version = "2.2.2"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz"; - sha512 = "WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ=="; + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; }; "p-locate-2.0.0" = { @@ -32327,6 +32875,15 @@ let sha512 = "d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ=="; }; }; + "p-map-4.0.0" = { + name = "p-map"; + packageName = "p-map"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"; + sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; + }; + }; "p-map-series-1.0.0" = { name = "p-map-series"; packageName = "p-map-series"; @@ -32354,13 +32911,13 @@ let sha512 = "3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg=="; }; }; - "p-queue-6.3.0" = { + "p-queue-6.4.0" = { name = "p-queue"; packageName = "p-queue"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-6.3.0.tgz"; - sha512 = "fg5dJlFpd5+3CgG3/0ogpVZUeJbjiyXFg0nu53hrOYsybqSiDyxyOpad0Rm6tAiGjgztAwkyvhlYHC53OiAJOA=="; + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.4.0.tgz"; + sha512 = "X7ddxxiQ+bLR/CUt3/BVKrGcJDNxBr0pEEFKHHB6vTPWNUhgDv36GpIH18RmGM3YGPpBT+JWGjDDqsVGuF0ERw=="; }; }; "p-reduce-1.0.0" = { @@ -32516,22 +33073,22 @@ let sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7"; }; }; - "pacote-11.1.4" = { + "pacote-11.1.8" = { name = "pacote"; packageName = "pacote"; - version = "11.1.4"; + version = "11.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.1.4.tgz"; - sha512 = "eUGJvSSpWFZKn3z8gig/HgnBmUl6gIWByIIaHzSyEr3tOWX0w8tFEADXtpu8HGv5E0ShCeTP6enRq8iHKCHSvw=="; + url = "https://registry.npmjs.org/pacote/-/pacote-11.1.8.tgz"; + sha512 = "oBXbdsqA0pnk4lNmWDHMm20uSbZiYCjE0MHeSFG3esxw1mubhSJizVc1rKVI0KMkYTMz4M7OTEqY1h2lx+wbPw=="; }; }; - "pacote-9.5.8" = { + "pacote-9.5.12" = { name = "pacote"; packageName = "pacote"; - version = "9.5.8"; + version = "9.5.12"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-9.5.8.tgz"; - sha512 = "0Tl8Oi/K0Lo4MZmH0/6IsT3gpGf9eEAznLXEQPKgPq7FscnbUOyopnVpwXlnQdIbCUaojWy1Wd7VMyqfVsRrIw=="; + url = "https://registry.npmjs.org/pacote/-/pacote-9.5.12.tgz"; + sha512 = "BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ=="; }; }; "pad-0.0.5" = { @@ -32552,6 +33109,15 @@ let sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; }; }; + "paged-request-2.0.1" = { + name = "paged-request"; + packageName = "paged-request"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/paged-request/-/paged-request-2.0.1.tgz"; + sha512 = "C0bB/PFk9rQskD1YEiz7uuchzqKDQGgdsEHN1ahify0UUWzgmMK4NDG9fhlQg2waogmNFwEvEeHfMRvJySpdVw=="; + }; + }; "pako-0.2.9" = { name = "pako"; packageName = "pako"; @@ -32804,6 +33370,15 @@ let sha512 = "d7yhga0Oc+PwNXDvQ0Jv1BuWkLVPXcAoQ/WREgd6vNNoKYaW52KI+RdOFjI63wjkmps9yUE8VS4veP+AgpQ/hA=="; }; }; + "parse-semver-1.1.1" = { + name = "parse-semver"; + packageName = "parse-semver"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-semver/-/parse-semver-1.1.1.tgz"; + sha1 = "9a4afd6df063dc4826f93fba4a99cf223f666cb8"; + }; + }; "parse-torrent-4.1.0" = { name = "parse-torrent"; packageName = "parse-torrent"; @@ -32822,13 +33397,13 @@ let sha512 = "yy7UTSmliOT/7Yl+P4hwwW2W7PbCTAMcD0lasaVG+k4/2laj42YWzLm468bLFGDoFPIb29g3BuwBcA3gLopKww=="; }; }; - "parse-torrent-7.0.1" = { + "parse-torrent-7.1.2" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "7.0.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-7.0.1.tgz"; - sha512 = "FdF1kBImRLt+ICV4NTz8L+sI2hFlPXAq1tXuw21gKz8EuThyVUFJ/wPfBEyYQrvnBpmGf7cM/LVSOhMRe8MrKw=="; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-7.1.2.tgz"; + sha512 = "1boHRA+aV7aeZBIg0rMBYhtfizAd/BXCXOCh/klYrgVnSpUAuJUIzQrIGkCsb93U1KOVN6C3NZOgpNy8htmqgw=="; }; }; "parse-torrent-file-2.1.4" = { @@ -33065,13 +33640,13 @@ let sha512 = "bpuBhROdrhuN3E7G/koAju0WjVw9/uQOG5Co5mokNj0MiOSBVZS1JTwM4zl55hu0WFmIEFvO9cU9sJQiBIYeIA=="; }; }; - "patch-package-6.2.1" = { + "patch-package-6.2.2" = { name = "patch-package"; packageName = "patch-package"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/patch-package/-/patch-package-6.2.1.tgz"; - sha512 = "dfCtQor63PPij6DDYtCzBRoO5nNAcMSg7Cmh+DLhR+s3t0OLQBdvFxJksZHBe1J2MjsSWDjTF4+oQKFbdkssIg=="; + url = "https://registry.npmjs.org/patch-package/-/patch-package-6.2.2.tgz"; + sha512 = "YqScVYkVcClUY0v8fF0kWOjDYopzIM8e3bj/RU1DPeEF14+dCGm6UeOYm4jvCyxqIEQ5/eJzmbWfDWnUleFNMg=="; }; }; "patel-0.33.1" = { @@ -33587,13 +34162,13 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-5.15.0" = { + "pino-6.0.0" = { name = "pino"; packageName = "pino"; - version = "5.15.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-5.15.0.tgz"; - sha512 = "7+FXMTA3H3sNP5+2miY2K9JKnAAW5GKuhHfNWsukFCsPprGQY3ctqpwbV74wAHW3Nl93cEEQ1G82MgOLM8P7TQ=="; + url = "https://registry.npmjs.org/pino/-/pino-6.0.0.tgz"; + sha512 = "3RfX2L76o7v230FP1fZ3Fo/WX7Su+P1Ld+pvBm2j+MyUjtA/KqDYxMkzBqzcX3R00zbC7Gf/HqIzyuu3tgvi9Q=="; }; }; "pino-std-serializers-2.4.2" = { @@ -33857,13 +34432,13 @@ let sha1 = "11d1e12b9cb64d63e30c143a330f4c1f567da85f"; }; }; - "portfinder-1.0.25" = { + "portfinder-1.0.26" = { name = "portfinder"; packageName = "portfinder"; - version = "1.0.25"; + version = "1.0.26"; src = fetchurl { - url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz"; - sha512 = "6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg=="; + url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz"; + sha512 = "Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ=="; }; }; "posix-character-classes-0.1.1" = { @@ -33912,22 +34487,22 @@ let sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag=="; }; }; - "postcss-7.0.26" = { + "postcss-7.0.27" = { name = "postcss"; packageName = "postcss"; - version = "7.0.26"; + version = "7.0.27"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.26.tgz"; - sha512 = "IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz"; + sha512 = "WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ=="; }; }; - "postcss-7.0.27" = { + "postcss-7.0.29" = { name = "postcss"; packageName = "postcss"; - version = "7.0.27"; + version = "7.0.29"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz"; - sha512 = "WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ=="; + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz"; + sha512 = "ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw=="; }; }; "postcss-calc-7.0.2" = { @@ -34038,6 +34613,15 @@ let sha512 = "7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA=="; }; }; + "postcss-load-config-2.1.0" = { + name = "postcss-load-config"; + packageName = "postcss-load-config"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz"; + sha512 = "4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q=="; + }; + }; "postcss-markdown-0.36.0" = { name = "postcss-markdown"; packageName = "postcss-markdown"; @@ -34389,13 +34973,13 @@ let sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="; }; }; - "postcss-value-parser-4.0.3" = { + "postcss-value-parser-4.1.0" = { name = "postcss-value-parser"; packageName = "postcss-value-parser"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz"; - sha512 = "N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg=="; + url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; + sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="; }; }; "postcss-values-parser-1.5.0" = { @@ -34416,13 +35000,13 @@ let sha512 = "C2hrAPzmRdpuL3iH0TDdQ6XCc9M7Dcc3zEW5BLerY65G4tWWszwv6nG/ksi6ul5i2mx22ubdljgktXCtNkydkw=="; }; }; - "posthtml-0.12.0" = { + "posthtml-0.12.3" = { name = "posthtml"; packageName = "posthtml"; - version = "0.12.0"; + version = "0.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/posthtml/-/posthtml-0.12.0.tgz"; - sha512 = "aNUEP/SfKUXAt+ghG51LC5MmafChBZeslVe/SSdfKIgLGUVRE68mrMF4V8XbH07ZifM91tCSuxY3eHIFLlecQw=="; + url = "https://registry.npmjs.org/posthtml/-/posthtml-0.12.3.tgz"; + sha512 = "Fbpi95+JJyR0tqU7pUy1zTSQFjAsluuwB9pJ1h0jtnGk7n/O2TBtP5nDl9rV0JVACjQ1Lm5wSp4ppChr8u3MhA=="; }; }; "posthtml-parser-0.4.2" = { @@ -34434,13 +35018,13 @@ let sha512 = "BUIorsYJTvS9UhXxPTzupIztOMVNPa/HtAm9KHni9z6qEfiJ1bpOBL5DfUOL9XAc3XkLIEzBzpph+Zbm4AdRAg=="; }; }; - "posthtml-render-1.2.0" = { + "posthtml-render-1.2.2" = { name = "posthtml-render"; packageName = "posthtml-render"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.2.0.tgz"; - sha512 = "dQB+hoAKDtnI94RZm/wxBUH9My8OJcXd0uhWmGh2c7tVtQ85A+OS3yCN3LNbFtPz3bViwBJXAeoi+CBGMXM0DA=="; + url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.2.2.tgz"; + sha512 = "MbIXTWwAfJ9qET6Zl29UNwJcDJEEz9Zkr5oDhiujitJa7YBJwEpbkX2cmuklCDxubTMoRWpid3q8DrSyGnUUzQ=="; }; }; "prebuild-install-5.3.3" = { @@ -34515,6 +35099,15 @@ let sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew=="; }; }; + "prettier-2.0.5" = { + name = "prettier"; + packageName = "prettier"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz"; + sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; + }; + }; "prettier-bytes-1.0.4" = { name = "prettier-bytes"; packageName = "prettier-bytes"; @@ -34560,6 +35153,15 @@ let sha512 = "urhX7U/F+fu8sztEs/Z7CxNS8PdEytEwGKhQaH5fxxCdRmHGT45FoClyDlcZrMk9cK/8JpX/asFmTOHtSGJfLg=="; }; }; + "pretty-bytes-5.3.0" = { + name = "pretty-bytes"; + packageName = "pretty-bytes"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz"; + sha512 = "hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg=="; + }; + }; "pretty-format-23.6.0" = { name = "pretty-format"; packageName = "pretty-format"; @@ -34668,13 +35270,13 @@ let sha512 = "dWBTeQbyWr/4d97ZKjxFPvIHytnNlBsNzgsJC1eew3qoZ9A8vtRIFhsnPiD3kYIf67w56i2QO2O5Infe2FzMww=="; }; }; - "prismjs-1.19.0" = { + "prismjs-1.20.0" = { name = "prismjs"; packageName = "prismjs"; - version = "1.19.0"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/prismjs/-/prismjs-1.19.0.tgz"; - sha512 = "IVFtbW9mCWm9eOIaEkNyo2Vl4NnEifis2GQ7/MLRG5TQe6t+4Sj9J5QWI9i3v+SS43uZBlCAOn+zYTVYQcPXJw=="; + url = "https://registry.npmjs.org/prismjs/-/prismjs-1.20.0.tgz"; + sha512 = "AEDjSrVNkynnw6A+B1DsFkd6AVdTnp+/WoUixFRULlCLZVRZlVQMVWio/16jv7G1FscUxQxOQhWwApgbnxr6kQ=="; }; }; "private-0.1.8" = { @@ -34956,13 +35558,13 @@ let sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd"; }; }; - "property-information-5.4.0" = { + "property-information-5.5.0" = { name = "property-information"; packageName = "property-information"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/property-information/-/property-information-5.4.0.tgz"; - sha512 = "nmMWAm/3vKFGmmOWOcdLjgq/Hlxa+hsuR/px1Lp/UGEyc5A22A6l78Shc2C0E71sPmAqglni+HrS7L7VJ7AUCA=="; + url = "https://registry.npmjs.org/property-information/-/property-information-5.5.0.tgz"; + sha512 = "RgEbCx2HLa1chNgvChcx+rrCWD0ctBmGSE0M7lVm1yyv4UbvbrWoXp/BkVLZefzjrRBGW8/Js6uh/BnlHXFyjA=="; }; }; "proto-list-1.2.4" = { @@ -34983,13 +35585,13 @@ let sha1 = "bc826e34c3af4697e8d0af7a669e4d612aedcd17"; }; }; - "protobufjs-6.8.9" = { + "protobufjs-6.9.0" = { name = "protobufjs"; packageName = "protobufjs"; - version = "6.8.9"; + version = "6.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.9.tgz"; - sha512 = "j2JlRdUeL/f4Z6x4aU4gj9I2LECglC+5qR2TrWb193Tla1qfdaNQTZ8I27Pt7K0Ajmvjjpft7O3KWTGciz4gpw=="; + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-6.9.0.tgz"; + sha512 = "LlGVfEWDXoI/STstRDdZZKb/qusoAWUnmLg9R8OLSO473mBLWHowx8clbX5/+mKDEI+v7GzjoK9tRPZMMcoTrg=="; }; }; "protochain-1.0.5" = { @@ -35145,13 +35747,13 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "psl-1.7.0" = { + "psl-1.8.0" = { name = "psl"; packageName = "psl"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz"; - sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="; + url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; }; }; "pstree.remy-1.1.7" = { @@ -36045,13 +36647,13 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "qs-6.9.2" = { + "qs-6.9.4" = { name = "qs"; packageName = "qs"; - version = "6.9.2"; + version = "6.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.2.tgz"; - sha512 = "2eQ6zajpK7HwqrY1rRtGw5IZvjgtELXzJECaEDuzDFo2jjnIXpJSimzd4qflWZq6bLLi+Zgfj5eDrAzl/lptyg=="; + url = "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz"; + sha512 = "A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="; }; }; "query-string-1.0.1" = { @@ -36126,13 +36728,13 @@ let sha512 = "F9wwNePtXrzZenAB3ax0Y8TSKGvuB7Qw16J30hspEUTbfUM+H827XyN3rlpwhVmtm5wuZtbKIHjOnwDn7MUxWQ=="; }; }; - "quick-format-unescaped-3.0.3" = { + "quick-format-unescaped-4.0.1" = { name = "quick-format-unescaped"; packageName = "quick-format-unescaped"; - version = "3.0.3"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-3.0.3.tgz"; - sha512 = "dy1yjycmn9blucmJLXOfZDx1ikZJUi6E8bBZLnhPG5gBrVhHXx2xVyqqgKBubVNEXmx51dBACMHpoMQK/N/AXQ=="; + url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.1.tgz"; + sha512 = "RyYpQ6Q5/drsJyOhrWHYMWTedvjTIat+FTwv0K4yoUxzvekw2aRHMQJLlnvt8UantkZg2++bEzD9EdxXqkWf4A=="; }; }; "quick-lru-1.1.0" = { @@ -36234,13 +36836,13 @@ let sha512 = "maAX1cnBkzIZ89O4tSQUOF098xjGMC8N+9vuY/WfHwg87THw6odD2Br35donlj5e6KnB1SB0QBHhTQhhDHuTPQ=="; }; }; - "random-access-file-2.1.3" = { + "random-access-file-2.1.4" = { name = "random-access-file"; packageName = "random-access-file"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.1.3.tgz"; - sha512 = "AE0Z1ywR5gIkzACMC1lCsR6LP8g4ynNm7oYWYdKPSSU6Y3H+mGDJxBqfcV9B9KstfHNemhfX3nYmx99ZC9f/yg=="; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.1.4.tgz"; + sha512 = "WAcBP5iLhg1pbjZA40WyMenjK7c5gJUY6Pi5HJ3fLJCeVFNSZv3juf20yFMKxBdvcX5GKbX/HZSfFzlLBdGTdQ=="; }; }; "random-access-memory-3.1.1" = { @@ -36486,6 +37088,15 @@ let sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; }; }; + "read-cache-1.0.0" = { + name = "read-cache"; + packageName = "read-cache"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz"; + sha1 = "e664ef31161166c9751cdbe8dbcf86b5fb58f774"; + }; + }; "read-chunk-2.1.0" = { name = "read-chunk"; packageName = "read-chunk"; @@ -36630,6 +37241,15 @@ let sha512 = "6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA=="; }; }; + "read-pkg-up-5.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-5.0.0.tgz"; + sha512 = "XBQjqOBtTzyol2CpsQOw8LHV0XbDZVG7xMMjmXAJomlVY03WOBRmYgDJETlvcg0H63AJvPRwT7GFi5rvOzUOKg=="; + }; + }; "read-pkg-up-7.0.1" = { name = "read-pkg-up"; packageName = "read-pkg-up"; @@ -36648,6 +37268,15 @@ let sha512 = "TzPdVpK3xEnvsS1yCy94CiOmfzG2/MNuZjpZi64+HJxb9fVZD4nIfFFGZ9T2N/dgwOFumfacw3xCD6rXtgwn2g=="; }; }; + "readable-stream-1.0.2" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.2.tgz"; + sha1 = "213ce36864fc1f0d4e98e03b9eb92c64042299d4"; + }; + }; "readable-stream-1.0.27-1" = { name = "readable-stream"; packageName = "readable-stream"; @@ -36738,13 +37367,13 @@ let sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; }; }; - "readdirp-3.3.0" = { + "readdirp-3.4.0" = { name = "readdirp"; packageName = "readdirp"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz"; - sha512 = "zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ=="; + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz"; + sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ=="; }; }; "readline2-0.1.1" = { @@ -36765,13 +37394,13 @@ let sha1 = "41059608ffc154757b715d9989d199ffbf372e35"; }; }; - "realpath-native-1.1.0" = { + "realpath-native-2.0.0" = { name = "realpath-native"; packageName = "realpath-native"; - version = "1.1.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz"; - sha512 = "wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA=="; + url = "https://registry.npmjs.org/realpath-native/-/realpath-native-2.0.0.tgz"; + sha512 = "v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q=="; }; }; "recast-0.11.23" = { @@ -36783,13 +37412,22 @@ let sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3"; }; }; - "recast-0.18.7" = { + "recast-0.18.10" = { + name = "recast"; + packageName = "recast"; + version = "0.18.10"; + src = fetchurl { + url = "https://registry.npmjs.org/recast/-/recast-0.18.10.tgz"; + sha512 = "XNvYvkfdAN9QewbrxeTOjgINkdY/odTgTS56ZNEWL9Ml0weT4T3sFtvnTuF+Gxyu46ANcRm1ntrF6F5LAJPAaQ=="; + }; + }; + "recast-0.19.1" = { name = "recast"; packageName = "recast"; - version = "0.18.7"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.18.7.tgz"; - sha512 = "qNfoxvMkW4k8jJgNCfmIES7S31MEejXcEQs57eKUcQGiJUuX7cXNOD2h+W9z0rjNun2EkKqf0WvuRtmHw4NPNg=="; + url = "https://registry.npmjs.org/recast/-/recast-0.19.1.tgz"; + sha512 = "8FCjrBxjeEU2O6I+2hyHyBFH1siJbMBLwIRvVr1T3FD2cL754sOaJDsJ/8h3xYltasbJ8jqWRIhMuDGBSiSbjw=="; }; }; "rechoir-0.6.2" = { @@ -36918,15 +37556,6 @@ let sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA=="; }; }; - "regenerator-runtime-0.10.5" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; - sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; - }; - }; "regenerator-runtime-0.11.1" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -36936,15 +37565,6 @@ let sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; }; - "regenerator-runtime-0.13.3" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.13.3"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz"; - sha512 = "naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="; - }; - }; "regenerator-runtime-0.13.5" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -37008,6 +37628,15 @@ let sha512 = "lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="; }; }; + "regexpp-3.1.0" = { + name = "regexpp"; + packageName = "regexpp"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz"; + sha512 = "ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="; + }; + }; "regexpu-core-4.7.0" = { name = "regexpu-core"; packageName = "regexpu-core"; @@ -37116,6 +37745,15 @@ let sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9"; }; }; + "relative-3.0.2" = { + name = "relative"; + packageName = "relative"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/relative/-/relative-3.0.2.tgz"; + sha1 = "0dcd8ec54a5d35a3c15e104503d65375b5a5367f"; + }; + }; "relative-url-1.0.2" = { name = "relative-url"; packageName = "relative-url"; @@ -37368,6 +38006,15 @@ let sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb"; }; }; + "replace-ext-1.0.1" = { + name = "replace-ext"; + packageName = "replace-ext"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz"; + sha512 = "yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw=="; + }; + }; "replace-homedir-1.0.0" = { name = "replace-homedir"; packageName = "replace-homedir"; @@ -37602,6 +38249,15 @@ let sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w=="; }; }; + "resolve-1.17.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"; + sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; + }; + }; "resolve-1.7.1" = { name = "resolve"; packageName = "resolve"; @@ -38034,15 +38690,6 @@ let sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; }; }; - "rimraf-3.0.0" = { - name = "rimraf"; - packageName = "rimraf"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz"; - sha512 = "NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg=="; - }; - }; "rimraf-3.0.2" = { name = "rimraf"; packageName = "rimraf"; @@ -38079,13 +38726,13 @@ let sha1 = "df43e80d9bc82ad4430bcfef03f49c717e8b2e8c"; }; }; - "roarr-2.15.2" = { + "roarr-2.15.3" = { name = "roarr"; packageName = "roarr"; - version = "2.15.2"; + version = "2.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/roarr/-/roarr-2.15.2.tgz"; - sha512 = "jmaDhK9CO4YbQAV8zzCnq9vjAqeO489MS5ehZ+rXmFiPFFE6B+S9KYO6prjmLJ5A0zY3QxVlQdrIya7E/azz/Q=="; + url = "https://registry.npmjs.org/roarr/-/roarr-2.15.3.tgz"; + sha512 = "AEjYvmAhlyxOeB9OqPUzQCo3kuAkNfuDk/HqWbZdFsqDFpapkTjiw+p4svNEoRLvuqNTxqfL+s+gtD4eDgZ+CA=="; }; }; "rollup-1.32.1" = { @@ -38097,6 +38744,15 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; + "rollup-2.7.6" = { + name = "rollup"; + packageName = "rollup"; + version = "2.7.6"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup/-/rollup-2.7.6.tgz"; + sha512 = "AdHosxHBKyBsdtbT1/AqbWNQ87O4SSxS4N9iMwEpoCDAT6e4Du3uJSy83mp3ckgmCxly5VeXGx0WHsm21Djytg=="; + }; + }; "rollup-plugin-babel-4.4.0" = { name = "rollup-plugin-babel"; packageName = "rollup-plugin-babel"; @@ -38232,13 +38888,13 @@ let sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389"; }; }; - "run-async-2.4.0" = { + "run-async-2.4.1" = { name = "run-async"; packageName = "run-async"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz"; - sha512 = "xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg=="; + url = "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"; + sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; }; }; "run-in-dir-0.3.0" = { @@ -38358,22 +39014,22 @@ let sha512 = "xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw=="; }; }; - "rxjs-6.5.3" = { + "rxjs-6.5.4" = { name = "rxjs"; packageName = "rxjs"; - version = "6.5.3"; + version = "6.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz"; - sha512 = "wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz"; + sha512 = "naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q=="; }; }; - "rxjs-6.5.4" = { + "rxjs-6.5.5" = { name = "rxjs"; packageName = "rxjs"; - version = "6.5.4"; + version = "6.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz"; - sha512 = "naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz"; + sha512 = "WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ=="; }; }; "s.color-0.0.13" = { @@ -38511,13 +39167,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-formatter-0.4.4" = { + "sass-formatter-0.4.5" = { name = "sass-formatter"; packageName = "sass-formatter"; - version = "0.4.4"; + version = "0.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.4.tgz"; - sha512 = "pI/2olF5F3AMkAXbn71nJK7yAsWfRYLlyp7Suhiy4hzuNga05XaUzLO74lplCpvS8GVeUdFgef+8lU5+cHr60g=="; + url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.5.tgz"; + sha512 = "hBDkbtTE020JwUaGKo5q+ELNXXji1kyajVMt3YLRYD1PAwUQYR5aAdfAUAcb88AmYgJpQRQrsqZj+YGmUCdgCw=="; }; }; "sass-lookup-3.0.0" = { @@ -38592,13 +39248,13 @@ let sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g=="; }; }; - "schema-utils-2.6.5" = { + "schema-utils-2.6.6" = { name = "schema-utils"; packageName = "schema-utils"; - version = "2.6.5"; + version = "2.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz"; - sha512 = "5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ=="; + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.6.tgz"; + sha512 = "wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA=="; }; }; "scoped-regex-1.0.0" = { @@ -38835,22 +39491,22 @@ let sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; }; - "semver-7.1.1" = { + "semver-7.1.3" = { name = "semver"; packageName = "semver"; - version = "7.1.1"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.1.1.tgz"; - sha512 = "WfuG+fl6eh3eZ2qAf6goB7nhiCd7NPXhmyFxigB/TOkQyeLP8w8GsVehvtGNtnNmyboz4TgeK40B1Kbql/8c5A=="; + url = "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz"; + sha512 = "ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA=="; }; }; - "semver-7.1.3" = { + "semver-7.3.2" = { name = "semver"; packageName = "semver"; - version = "7.1.3"; + version = "7.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz"; - sha512 = "ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz"; + sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="; }; }; "semver-compare-1.0.0" = { @@ -39096,13 +39752,13 @@ let sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; }; }; - "service-runner-2.7.6" = { + "service-runner-2.7.7" = { name = "service-runner"; packageName = "service-runner"; - version = "2.7.6"; + version = "2.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.7.6.tgz"; - sha512 = "EBiEpdTwH/Cbx4Yeeo+a8i93ollOkF1vRQrvt6VuSXuCv9WFZgoK5AOEp8JZF/Bk+9ueVnyKfIiDUn8Nehj0Pg=="; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.7.7.tgz"; + sha512 = "/fxWWDXThY+Jm6UEWY+DNqW41ahjrYYGLsUiMqqY2+lYJ1JtcwC5tzWD19MlwJESlUjCDYH8l7v/g+9MuASXAQ=="; }; }; "set-blocking-1.0.0" = { @@ -39123,6 +39779,15 @@ let sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; }; + "set-getter-0.1.0" = { + name = "set-getter"; + packageName = "set-getter"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz"; + sha1 = "d769c182c9d5a51f409145f2fba82e5e86e80376"; + }; + }; "set-immediate-shim-1.0.1" = { name = "set-immediate-shim"; packageName = "set-immediate-shim"; @@ -39321,6 +39986,15 @@ let sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3"; }; }; + "shelljs-0.8.4" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz"; + sha512 = "7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ=="; + }; + }; "shellsubstitute-1.2.0" = { name = "shellsubstitute"; packageName = "shellsubstitute"; @@ -39384,13 +40058,13 @@ let sha512 = "dVjIWe1VJ2VQCdScREWXWECmJhgjpJMqwPKkW+L78PPx2Jyr/t+//kNHqG1hYrmIsvQN7vGjAjv9s7ix0vw0zA=="; }; }; - "signal-exit-3.0.2" = { + "signal-exit-3.0.3" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; + sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; }; }; "signals-1.0.0" = { @@ -39474,13 +40148,13 @@ let sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; }; }; - "simple-peer-9.6.2" = { + "simple-peer-9.7.0" = { name = "simple-peer"; packageName = "simple-peer"; - version = "9.6.2"; + version = "9.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.6.2.tgz"; - sha512 = "EOKoImCaqtNvXIntxT1CBBK/3pVi7tMAoJ3shdyd9qk3zLm3QPiRLb/sPC1G2xvKJkJc5fkQjCXqRZ0AknwTig=="; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.7.0.tgz"; + sha512 = "lZL/H/Znx7kai1kTrbxntVfbstGTnPF+w+hvnq2euBXoBg8m32mgEOpPmH9hS7ZOx0CMXcpgth/nNjZKp7aeow=="; }; }; "simple-sha1-2.1.2" = { @@ -39807,22 +40481,22 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; - "snyk-config-2.2.3" = { + "snyk-config-3.1.0" = { name = "snyk-config"; packageName = "snyk-config"; - version = "2.2.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.2.3.tgz"; - sha512 = "9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw=="; + url = "https://registry.npmjs.org/snyk-config/-/snyk-config-3.1.0.tgz"; + sha512 = "3UlyogA67/9WOssJ7s4d7gqWQRWyO/LbgdBBNMhhmFDKa7eTUSW+A782CVHgyDSJZ2kNANcMWwMiOL+h3p6zQg=="; }; }; - "snyk-docker-plugin-2.6.1" = { + "snyk-docker-plugin-3.1.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "2.6.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-2.6.1.tgz"; - sha512 = "v3LIPILRL5faZ+qiIhF9on0rAxuFaQku3UwaiGumoTrfXywLkv7x8PJgdMnrsWUxDwB8EZFc1k2qvI6V6rTF5g=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.1.0.tgz"; + sha512 = "ggGTiiCuwLYGdlGW/UBuUXJ7omliH0EnbpLfdlTBoRKvmvgoUo1l4Menk18R1ZVXgcXTwwGK9jmuUpPH+X0VNw=="; }; }; "snyk-go-parser-1.4.0" = { @@ -39834,13 +40508,13 @@ let sha512 = "zcLA8u/WreycCjFKBblYfxszg7Fmnemuu9Ug/CE/jqF0yBXsI5DCWMteUvFkoa8DRntfGTlgf98TRl2aTSc2MQ=="; }; }; - "snyk-go-plugin-1.13.0" = { + "snyk-go-plugin-1.14.0" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.13.0"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.13.0.tgz"; - sha512 = "6lN9S8uO6LE1Y6ZJMZm3EZ8kvvI/vZh8r+JJGAPfVO2C265xymEpFBJ4Nn2or0Q0LlqZ8W8lWi1HUMXXid6k+w=="; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.14.0.tgz"; + sha512 = "9L+76De8F6yXWb+O3DA8QUi7+eDF2mOzCOveEPUJGkqWIDmurIiFcVxHJoj0EStjcxb3dX367KKlDlfFx+HiyA=="; }; }; "snyk-gradle-plugin-3.2.5" = { @@ -39861,49 +40535,49 @@ let sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA=="; }; }; - "snyk-mvn-plugin-2.9.0" = { + "snyk-mvn-plugin-2.15.0" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.9.0"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.9.0.tgz"; - sha512 = "FBl78wCHNm0P/QOlipvOxzN2LrXlS6NBN0zXWYZ09P0hG65rmA3gKTg0QsHUjIBh1Pg9bw5aG4r/AHle6a6g6w=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.15.0.tgz"; + sha512 = "24HWz27Hc5sw+iHtxtQFy0kltjyFZXJ3vfsPA0TTZAL0tOJXInIuZpWD6njC0Y3/sn9CH5kS2KM8GAM7FyKVig=="; }; }; - "snyk-nodejs-lockfile-parser-1.17.0" = { + "snyk-nodejs-lockfile-parser-1.22.0" = { name = "snyk-nodejs-lockfile-parser"; packageName = "snyk-nodejs-lockfile-parser"; - version = "1.17.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.17.0.tgz"; - sha512 = "i4GAYFj9TJLOQ8F+FbIJuJWdGymi8w/XcrEX0FzXk7DpYUCY3mWibyKhw8RasfYBx5vLwUzEvRMaQuc2EwlyfA=="; + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.22.0.tgz"; + sha512 = "l6jLoJxqcIIkQopSdQuAstXdMw5AIgLu+uGc5CYpHyw8fYqOwna8rawwofNeGuwJAAv4nEiNiexeYaR88OCq6Q=="; }; }; - "snyk-nuget-plugin-1.16.0" = { + "snyk-nuget-plugin-1.17.0" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.16.0"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.16.0.tgz"; - sha512 = "OEusK3JKKpR4Yto5KwuqjQGgb9wAhmDqBWSQomWdtKQVFrzn5B6BMzOFikUzmeMTnUGGON7gurQBLXeZZLhRqg=="; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.17.0.tgz"; + sha512 = "t7iZ87LBhCK6P2/mJsQh7Dmk3J9zd+IHL4yoSK95Iyk/gP8r++DZijoRHEXy8BlS+eOtSAj1vgCYvv2eAmG28w=="; }; }; - "snyk-paket-parser-1.5.0" = { + "snyk-paket-parser-1.6.0" = { name = "snyk-paket-parser"; packageName = "snyk-paket-parser"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-paket-parser/-/snyk-paket-parser-1.5.0.tgz"; - sha512 = "1CYMPChJ9D9LBy3NLqHyv8TY7pR/LMISSr08LhfFw/FpfRZ+gTH8W6bbxCmybAYrOFNCqZkRprqOYDqZQFHipA=="; + url = "https://registry.npmjs.org/snyk-paket-parser/-/snyk-paket-parser-1.6.0.tgz"; + sha512 = "6htFynjBe/nakclEHUZ1A3j5Eu32/0pNve5Qm4MFn3YQmJgj7UcAO8hdyK3QfzEY29/kAv/rkJQg+SKshn+N9Q=="; }; }; - "snyk-php-plugin-1.7.0" = { + "snyk-php-plugin-1.9.0" = { name = "snyk-php-plugin"; packageName = "snyk-php-plugin"; - version = "1.7.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.7.0.tgz"; - sha512 = "mDe90xkqSEVrpx1ZC7ItqCOc6fZCySbE+pHVI+dAPUmf1C1LSWZrZVmAVeo/Dw9sJzJfzmcdAFQl+jZP8/uV0A=="; + url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.9.0.tgz"; + sha512 = "uORrEoC47dw0ITZYu5vKqQtmXnbbQs+ZkWeo5bRHGdf10W8e4rNr1S1R4bReiLrSbSisYhVHeFMkdOAiLIPJVQ=="; }; }; "snyk-policy-1.13.5" = { @@ -40086,6 +40760,15 @@ let sha512 = "/G/VOI+3DBp0+DJKW4KesGnQkQPFmUCbA/oO2QGT6CWxU7hLGWqU3tyuzeSK/dqcyeHsQg1vTe9jiZI8GU9SCQ=="; }; }; + "socket.io-stream-0.9.1" = { + name = "socket.io-stream"; + packageName = "socket.io-stream"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-stream/-/socket.io-stream-0.9.1.tgz"; + sha1 = "421258316288b83ac693b0d43efd09d6d43aba97"; + }; + }; "sockjs-0.3.19" = { name = "sockjs"; packageName = "sockjs"; @@ -40221,13 +40904,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sonic-boom-0.7.7" = { + "sonic-boom-1.0.1" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "0.7.7"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.7.7.tgz"; - sha512 = "Ei5YOo5J64GKClHIL/5evJPgASXFVpfVYbJV9PILZQytTK6/LCwHvsZJW2Ig4p9FMC2OrBrMnXKgRN/OEoAWfg=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.0.1.tgz"; + sha512 = "o9tx+bonVEXSaPtptyXQXpP8l6UV9Bi3im2geZskvWw2a/o/hrbWI7EBbbv+rOx6Hubnzun9GgH4WfbgEA3MFQ=="; }; }; "sorcery-0.10.0" = { @@ -40383,22 +41066,22 @@ let sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; }; - "source-map-support-0.4.18" = { + "source-map-support-0.5.16" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.4.18"; + version = "0.5.16"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz"; - sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA=="; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz"; + sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ=="; }; }; - "source-map-support-0.5.16" = { + "source-map-support-0.5.19" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.16"; + version = "0.5.19"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz"; - sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ=="; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"; + sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; }; }; "source-map-url-0.4.0" = { @@ -40509,13 +41192,13 @@ let sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q=="; }; }; - "spdx-exceptions-2.2.0" = { + "spdx-exceptions-2.3.0" = { name = "spdx-exceptions"; packageName = "spdx-exceptions"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; - sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; }; }; "spdx-expression-parse-3.0.0" = { @@ -40545,13 +41228,13 @@ let sha1 = "70eff23cde4e97d52a445f65afddcc5695eb5edb"; }; }; - "spdy-4.0.1" = { + "spdy-4.0.2" = { name = "spdy"; packageName = "spdy"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz"; - sha512 = "HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA=="; + url = "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz"; + sha512 = "r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA=="; }; }; "spdy-transport-3.0.0" = { @@ -40752,6 +41435,15 @@ let sha512 = "CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg=="; }; }; + "sqlite3-4.2.0" = { + name = "sqlite3"; + packageName = "sqlite3"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.2.0.tgz"; + sha512 = "roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg=="; + }; + }; "srt2vtt-1.3.1" = { name = "srt2vtt"; packageName = "srt2vtt"; @@ -41562,13 +42254,13 @@ let sha512 = "3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg=="; }; }; - "streamroller-2.2.3" = { + "streamroller-2.2.4" = { name = "streamroller"; packageName = "streamroller"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/streamroller/-/streamroller-2.2.3.tgz"; - sha512 = "AegmvQsscTRhHVO46PhCDerjIpxi7E+d2GxgUDu+nzw/HuLnUdxHWr6WQ+mVn/4iJgMKKFFdiUwFcFRDvcjCtw=="; + url = "https://registry.npmjs.org/streamroller/-/streamroller-2.2.4.tgz"; + sha512 = "OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ=="; }; }; "streamsearch-0.1.2" = { @@ -41625,13 +42317,13 @@ let sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0"; }; }; - "string-kit-0.11.6" = { + "string-kit-0.11.7" = { name = "string-kit"; packageName = "string-kit"; - version = "0.11.6"; + version = "0.11.7"; src = fetchurl { - url = "https://registry.npmjs.org/string-kit/-/string-kit-0.11.6.tgz"; - sha512 = "rI3KOfSgFg02+BSP/ocUl8E3hoqV8C8OsMHUZhIy2BHfP8V0HV0iGwM67Zzepv+U9XryH01tHO8EAIaIK66Eqg=="; + url = "https://registry.npmjs.org/string-kit/-/string-kit-0.11.7.tgz"; + sha512 = "YELCRaRSTnwupnKqxqsm6xQ9EJjE23dpqg9ca6uBebfA2s601sm2dj42KPH7I50rvGf93Fz+o0mKKw81mK6Lrw=="; }; }; "string-length-2.0.0" = { @@ -41742,22 +42434,40 @@ let sha512 = "MjGFEeqixw47dAMFMtgUro/I0+wNqZB5GKXGt1fFr24u3TzDXCPu7J9Buppzoe3r/LqkSDLDDJzE15RGWDGAVw=="; }; }; - "string.prototype.trimleft-2.1.1" = { + "string.prototype.trimend-1.0.1" = { + name = "string.prototype.trimend"; + packageName = "string.prototype.trimend"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; + sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; + }; + }; + "string.prototype.trimleft-2.1.2" = { name = "string.prototype.trimleft"; packageName = "string.prototype.trimleft"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz"; - sha512 = "iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag=="; + url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz"; + sha512 = "gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw=="; }; }; - "string.prototype.trimright-2.1.1" = { + "string.prototype.trimright-2.1.2" = { name = "string.prototype.trimright"; packageName = "string.prototype.trimright"; - version = "2.1.1"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; + sha512 = "ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg=="; + }; + }; + "string.prototype.trimstart-1.0.1" = { + name = "string.prototype.trimstart"; + packageName = "string.prototype.trimstart"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz"; - sha512 = "qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; + sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; }; }; "string2compact-1.3.0" = { @@ -42084,6 +42794,15 @@ let sha512 = "VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw=="; }; }; + "strip-json-comments-3.1.0" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz"; + sha512 = "e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w=="; + }; + }; "strip-outer-1.0.1" = { name = "strip-outer"; packageName = "strip-outer"; @@ -42282,13 +43001,13 @@ let sha512 = "XiyPqLdiHJ3CMphADCJg/JVQYcj3JfO8NomlLubSdGYgppfzE+g/7Fyusza/Kr7lC919BdwbfIqFxK8VO7+l4w=="; }; }; - "suf-regex-0.0.14" = { + "suf-regex-0.0.17" = { name = "suf-regex"; packageName = "suf-regex"; - version = "0.0.14"; + version = "0.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/suf-regex/-/suf-regex-0.0.14.tgz"; - sha512 = "+WE5PZTfD6lVNCNsyBInJIAbok8LpqgOhvCbSViZeQ/JTxdxq7Lw+tSJXGM+jrIp81jj9GCMYvkl00JAkn2CtA=="; + url = "https://registry.npmjs.org/suf-regex/-/suf-regex-0.0.17.tgz"; + sha512 = "/TIMx0G1iXCGHm5XbqHTV86tkdETO7OUOB8UAWHc04M2mMQnWAIZeO6M9GuSibRVM8ewRcHAV3fOFY2z1XtWaQ=="; }; }; "sugarss-1.0.1" = { @@ -42669,13 +43388,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.23.1" = { + "systeminformation-4.24.1" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.23.1"; + version = "4.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.23.1.tgz"; - sha512 = "gtqfvz5jUIMqWn0kkdkV4G8uiLmJckQ+z6aKy1uyE0OPU/6tStubahtZDiF0ajSRVJht+Vd4pX5DDwQLhAapww=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.24.1.tgz"; + sha512 = "LRksOe2mBvtbD0Y1hZMsaICHpIglhjz758K5XKUiHKcTBc6BV4O7ozbExZc+5BcCYrniMI9ka7piXFeCaymRRQ=="; }; }; "syswide-cas-5.3.0" = { @@ -42868,22 +43587,22 @@ let sha512 = "MNIgJddrV2TkuwChwcSNds/5E9VijOiw7kAc1y5hTNJoLDSuIyid2QtLYiCYNnICebpuvjhPQZsXwUL0O3l7OQ=="; }; }; - "tar-6.0.1" = { + "tar-6.0.2" = { name = "tar"; packageName = "tar"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.0.1.tgz"; - sha512 = "bKhKrrz2FJJj5s7wynxy/fyxpE0CmCjmOQ1KV4KkgXFWOgoIT/NbTMnB1n+LFNrNk0SSBVGGxcK5AGsyC+pW5Q=="; + url = "https://registry.npmjs.org/tar/-/tar-6.0.2.tgz"; + sha512 = "Glo3jkRtPcvpDlAs/0+hozav78yoXKFr+c4wgw62NNMO3oo4AaJdCo21Uu7lcwr55h39W2XD1LMERc64wtbItg=="; }; }; - "tar-fs-2.0.0" = { + "tar-fs-2.0.1" = { name = "tar-fs"; packageName = "tar-fs"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz"; - sha512 = "vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA=="; + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz"; + sha512 = "6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA=="; }; }; "tar-pack-3.4.1" = { @@ -42940,13 +43659,13 @@ let sha1 = "9450e8768c83b416fd4d1a6a9449eeccbf496c29"; }; }; - "telegraf-3.36.0" = { + "telegraf-3.38.0" = { name = "telegraf"; packageName = "telegraf"; - version = "3.36.0"; + version = "3.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/telegraf/-/telegraf-3.36.0.tgz"; - sha512 = "9o6AJKRiTm5vMWYI6WpTfBHzu4FMpWBNKxvnMxRds/cbMY9RnsVVjdi8i4bFFlfd+xbi73EbrnI3dybayryICA=="; + url = "https://registry.npmjs.org/telegraf/-/telegraf-3.38.0.tgz"; + sha512 = "va4VlrKWp64JrowFoZX/NPzzA6q38kvaIukVXOWFO1V+jR1G8+hCfgJy4TX8Z3rwLJzwaBEet1QhikHDRZWl3A=="; }; }; "telegram-typings-3.6.1" = { @@ -43012,6 +43731,15 @@ let sha1 = "0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"; }; }; + "temp-dir-2.0.0" = { + name = "temp-dir"; + packageName = "temp-dir"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz"; + sha512 = "aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg=="; + }; + }; "temp-write-3.4.0" = { name = "temp-write"; packageName = "temp-write"; @@ -43084,13 +43812,13 @@ let sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ=="; }; }; - "terser-4.6.7" = { + "terser-4.6.13" = { name = "terser"; packageName = "terser"; - version = "4.6.7"; + version = "4.6.13"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-4.6.7.tgz"; - sha512 = "fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g=="; + url = "https://registry.npmjs.org/terser/-/terser-4.6.13.tgz"; + sha512 = "wMvqukYgVpQlymbnNbabVZbtM6PN63AzqexpwJL8tbh/mRT9LE5o+ruVduAGL7D6Fpjl+Q+06U5I9Ul82odAhw=="; }; }; "terser-webpack-plugin-1.4.3" = { @@ -43138,6 +43866,15 @@ let sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; }; }; + "textextensions-2.6.0" = { + name = "textextensions"; + packageName = "textextensions"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/textextensions/-/textextensions-2.6.0.tgz"; + sha512 = "49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ=="; + }; + }; "textlint-rule-helper-1.2.0" = { name = "textlint-rule-helper"; packageName = "textlint-rule-helper"; @@ -43552,6 +44289,15 @@ let sha512 = "J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw=="; }; }; + "tmp-0.2.1" = { + name = "tmp"; + packageName = "tmp"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz"; + sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ=="; + }; + }; "tmp-graphql-config-extension-openapi-1.0.7" = { name = "tmp-graphql-config-extension-openapi"; packageName = "tmp-graphql-config-extension-openapi"; @@ -44200,13 +44946,13 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; - "ts-node-8.8.1" = { + "ts-node-8.10.1" = { name = "ts-node"; packageName = "ts-node"; - version = "8.8.1"; + version = "8.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.8.1.tgz"; - sha512 = "10DE9ONho06QORKAaCBpPiFCdW+tZJuY/84tyypGtl6r+/C7Asq0dhqbRZURuUlLQtZxxDvT8eoj8cGW0ha6Bg=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-8.10.1.tgz"; + sha512 = "bdNz1L4ekHiJul6SHtZWs1ujEKERJnHs4HxN7rjTyyVOFf3HaJ6sLqe6aPG62XTzAB/63pKRh5jTSWL0D7bsvw=="; }; }; "ts-process-promises-1.0.2" = { @@ -44344,6 +45090,15 @@ let sha512 = "k3DeWv+GnKYcFaFLK87Ecum4AWxySB0lfzQaonlHKaoum7A2DlTkWw8mfgWtz4o8Hoa4Ab/ZdDitR74LhbOK8A=="; }; }; + "tunnel-0.0.4" = { + name = "tunnel"; + packageName = "tunnel"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz"; + sha1 = "2d3785a158c174c9a16dc2c046ec5fc5f1742213"; + }; + }; "tunnel-0.0.6" = { name = "tunnel"; packageName = "tunnel"; @@ -44407,13 +45162,13 @@ let sha1 = "b75bc2df15649bb84e8b9aa3c0669c6c4bce0d25"; }; }; - "twig-1.15.0" = { + "twig-1.15.1" = { name = "twig"; packageName = "twig"; - version = "1.15.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/twig/-/twig-1.15.0.tgz"; - sha512 = "kJkEbF4sTyZcaMAXffCjaUt6ZSD3v6qZQZd9b6mySvfuUIseTCJCvikphAJvrNJTDw7nZDfGorvTtUkzge1HPg=="; + url = "https://registry.npmjs.org/twig/-/twig-1.15.1.tgz"; + sha512 = "SPGkUM0p7hjgo+y5Dlm/XCSuZe0G3kfcgRPrxkMFln5e8bvQbxDOsia8QEo8xqXfjLR1Emp9FGkVYHya2b8qdA=="; }; }; "txt-to-ast-3.0.3" = { @@ -44479,6 +45234,15 @@ let sha512 = "OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="; }; }; + "type-fest-0.13.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz"; + sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; + }; + }; "type-fest-0.3.1" = { name = "type-fest"; packageName = "type-fest"; @@ -44533,6 +45297,15 @@ let sha512 = "TuQzwiT4DDg19beHam3E66oRXhyqlyfgjHB/5fcvsRXbfmWPJfto9B4a0TBdTrQAPGlGmXh/k7iUI+WsObgORA=="; }; }; + "typed-rest-client-1.2.0" = { + name = "typed-rest-client"; + packageName = "typed-rest-client"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.2.0.tgz"; + sha512 = "FrUshzZ1yxH8YwGR29PWWnfksLEILbWJydU7zfIRkyH7kAEzB62uMAl2WY6EyolWpLpVHeJGgQm45/MaruaHpw=="; + }; + }; "typedarray-0.0.6" = { name = "typedarray"; packageName = "typedarray"; @@ -44569,15 +45342,6 @@ let sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg=="; }; }; - "typescript-3.7.5" = { - name = "typescript"; - packageName = "typescript"; - version = "3.7.5"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.7.5.tgz"; - sha512 = "/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw=="; - }; - }; "typescript-3.8.3" = { name = "typescript"; packageName = "typescript"; @@ -44596,6 +45360,15 @@ let sha512 = "IKawLTu4A2xN3aN/cPLxvZ0bhxZHILGDKTZWvWNJ3sLNhJ3PjfMEDQmR2VMpdRPrmWOadgWXRwjLBzSA8AGsaQ=="; }; }; + "typescript-formatter-7.2.2" = { + name = "typescript-formatter"; + packageName = "typescript-formatter"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript-formatter/-/typescript-formatter-7.2.2.tgz"; + sha512 = "V7vfI9XArVhriOTYHPzMU2WUnm5IMdu9X/CPxs8mIMGxmTBFpDABlbkBka64PZJ9/xgQeRpK8KzzAG4MPzxBDQ=="; + }; + }; "typescript-tslint-plugin-0.5.4" = { name = "typescript-tslint-plugin"; packageName = "typescript-tslint-plugin"; @@ -44686,13 +45459,22 @@ let sha512 = "Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw=="; }; }; - "uglify-js-3.8.0" = { + "uglify-js-3.8.1" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.8.0"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz"; - sha512 = "ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.1.tgz"; + sha512 = "W7KxyzeaQmZvUFbGj4+YFshhVrMBGSg2IbcYAjGWGvx8DHvJMclbTDMpffdxFUGPBHjIytk7KJUR/KUXstUGDw=="; + }; + }; + "uglify-js-3.9.2" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.2.tgz"; + sha512 = "zGVwKslUAD/EeqOrD1nQaBmXIHl1Vw371we8cvS8I6mYK9rmgX5tv8AAeJdfsQ3Kk5mGax2SVV/AizxdNGhl7Q=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -44803,13 +45585,13 @@ let sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow=="; }; }; - "unbzip2-stream-1.3.3" = { + "unbzip2-stream-1.4.2" = { name = "unbzip2-stream"; packageName = "unbzip2-stream"; - version = "1.3.3"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz"; - sha512 = "fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg=="; + url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.2.tgz"; + sha512 = "pZMVAofMrrHX6Ik39hCk470kulCbmZ2SWfQLPmTWqfJV/oUm0gn1CblvHdUu4+54Je6Jq34x8kY6XjTy6dMkOg=="; }; }; "unc-path-regex-0.1.2" = { @@ -44848,6 +45630,15 @@ let sha512 = "nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A=="; }; }; + "underscore-1.10.2" = { + name = "underscore"; + packageName = "underscore"; + version = "1.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.10.2.tgz"; + sha512 = "N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg=="; + }; + }; "underscore-1.2.1" = { name = "underscore"; packageName = "underscore"; @@ -44875,22 +45666,22 @@ let sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; }; }; - "underscore-1.9.1" = { + "underscore-1.8.3" = { name = "underscore"; packageName = "underscore"; - version = "1.9.1"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz"; - sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="; + url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; + sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; }; }; - "underscore-1.9.2" = { + "underscore-1.9.1" = { name = "underscore"; packageName = "underscore"; - version = "1.9.2"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz"; - sha512 = "D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ=="; + url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz"; + sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="; }; }; "underscore.string-2.3.3" = { @@ -45721,6 +46512,15 @@ let sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; }; }; + "urlencode-1.1.0" = { + name = "urlencode"; + packageName = "urlencode"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/urlencode/-/urlencode-1.1.0.tgz"; + sha1 = "1f2ba26f013c85f0133f7a3ad6ff2730adf7cbb7"; + }; + }; "urlsafe-base64-1.0.0" = { name = "urlsafe-base64"; packageName = "urlsafe-base64"; @@ -45757,15 +46557,6 @@ let sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; }; }; - "useragent-2.3.0" = { - name = "useragent"; - packageName = "useragent"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz"; - sha512 = "4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw=="; - }; - }; "uslug-1.0.4" = { name = "uslug"; packageName = "uslug"; @@ -45901,15 +46692,6 @@ let sha1 = "3c2236476c4d32c5ff3c47002add7c13b9a82a53"; }; }; - "util.promisify-1.0.0" = { - name = "util.promisify"; - packageName = "util.promisify"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"; - sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA=="; - }; - }; "util.promisify-1.0.1" = { name = "util.promisify"; packageName = "util.promisify"; @@ -45937,24 +46719,6 @@ let sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a"; }; }; - "utilities-0.0.37" = { - name = "utilities"; - packageName = "utilities"; - version = "0.0.37"; - src = fetchurl { - url = "https://registry.npmjs.org/utilities/-/utilities-0.0.37.tgz"; - sha1 = "a3470d0a7f688142d9e8a57cee1128f12e19e196"; - }; - }; - "utilities-1.0.5" = { - name = "utilities"; - packageName = "utilities"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/utilities/-/utilities-1.0.5.tgz"; - sha1 = "f2b77a88f3510733fc7215b5c486a504a75ab245"; - }; - }; "utils-merge-1.0.0" = { name = "utils-merge"; packageName = "utils-merge"; @@ -45991,13 +46755,13 @@ let sha512 = "vRAKaS8WcYNgzbxyH2LdheqgL4sQLis8LXl7r/mN+O4mpWlUpoCsTtietxepLrft2q0TFA2gaIvSWN1iRkzW/w=="; }; }; - "utp-native-2.1.7" = { + "utp-native-2.1.10" = { name = "utp-native"; packageName = "utp-native"; - version = "2.1.7"; + version = "2.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-2.1.7.tgz"; - sha512 = "PQmXCdZOkmADtIqmhoiFEIdNlvkPouO8ktXqThFDBAt850B752bjQMF5KAJeMBJ5gzuI70ZiP9Qsr9mwCwzSyg=="; + url = "https://registry.npmjs.org/utp-native/-/utp-native-2.1.10.tgz"; + sha512 = "VTjBvb/uE9gYqx2NGVPtAWhqv9itieW+wJceJg5G6Cl/2kBCnHDaFafw3fNgCvii7meTpC4AoZfy6OG0pnuQ/Q=="; }; }; "uuid-2.0.3" = { @@ -46054,6 +46818,15 @@ let sha512 = "yqjRXZzSJm9Dbl84H2VDHpM3zMjzSJQ+hn6C4zqd5ilW+7P4ZmLEEqwho9LjP+tGuZlF4xrHQXT0h9QZUS/pWA=="; }; }; + "uuid-7.0.2" = { + name = "uuid"; + packageName = "uuid"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-7.0.2.tgz"; + sha512 = "vy9V/+pKG+5ZTYKf+VcphF5Oc6EFiu3W8Nv3P3zIh0EqVI80ZxOzuPfe9EHjkFNvf8+xuTHVeei4Drydlx4zjw=="; + }; + }; "v8-compile-cache-2.0.3" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; @@ -46297,13 +47070,13 @@ let sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; }; }; - "verda-1.0.0" = { + "verda-1.0.1" = { name = "verda"; packageName = "verda"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/verda/-/verda-1.0.0.tgz"; - sha512 = "kr/M1CkBepFQP/jIWh9QB8x/2Ly7qzsZMJwbjUurJAhbn+FQkGxiDMcCGRGYpMGl0oL8kLmEQDVNyzFzE9AUVw=="; + url = "https://registry.npmjs.org/verda/-/verda-1.0.1.tgz"; + sha512 = "nScasxF9diGZS3udb/KkHMPqn+8lENPk1cK7GNWsxmhHqH0Bm4Pd7KnjoBWL68j1G0niaI13wWJluqQIex6fmA=="; }; }; "verror-1.1.0" = { @@ -46387,13 +47160,13 @@ let sha512 = "y7Y3gH9BsUSdD4KzHsuMaCzRjglXN0W2EcMf0gpvu6+SbsGhMje7xDc8AEoeXy6mIwCKMI6BkjMsRjzQbhMEjQ=="; }; }; - "vfile-4.0.3" = { + "vfile-4.1.0" = { name = "vfile"; packageName = "vfile"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vfile/-/vfile-4.0.3.tgz"; - sha512 = "lREgT5sF05TQk68LO6APy0In+TkFGnFEgKChK2+PHIaTrFQ9oHCKXznZ7VILwgYVBcl0gv4lGATFZBLhi2kVQg=="; + url = "https://registry.npmjs.org/vfile/-/vfile-4.1.0.tgz"; + sha512 = "BaTPalregj++64xbGK6uIlsurN3BCRNM/P2Pg8HezlGzKd1O9PrwIac6bd9Pdx2uTb0QHoioZ+rXKolbVXEgJg=="; }; }; "vfile-find-down-1.0.0" = { @@ -46441,13 +47214,13 @@ let sha512 = "1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA=="; }; }; - "vfile-message-2.0.3" = { + "vfile-message-2.0.4" = { name = "vfile-message"; packageName = "vfile-message"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.3.tgz"; - sha512 = "qQg/2z8qnnBHL0psXyF72kCjb9YioIynvyltuNKFaUhRtqTIcIMP3xnBaPzirVZNuBrUe1qwFciSx2yApa4byw=="; + url = "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz"; + sha512 = "DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ=="; }; }; "vfile-reporter-1.5.0" = { @@ -46657,6 +47430,15 @@ let sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; }; }; + "vsce-1.75.0" = { + name = "vsce"; + packageName = "vsce"; + version = "1.75.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vsce/-/vsce-1.75.0.tgz"; + sha512 = "qyAQTmolxKWc9bV1z0yBTSH4WEIWhDueBJMKB0GUFD6lM4MiaU1zJ9BtzekUORZu094YeNSKz0RmVVuxfqPq0g=="; + }; + }; "vscode-css-languageservice-3.0.13" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; @@ -46666,13 +47448,13 @@ let sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg=="; }; }; - "vscode-css-languageservice-4.1.1" = { + "vscode-css-languageservice-4.1.2" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.1.1.tgz"; - sha512 = "2r2bYbhscivRu1zqh5kNe8aYpFnfksMYC7wTpKX2HqFsSzSJYXk0sCqPaWsP5ptqz0OFBTXnzx2JlE+Nb5Edgw=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.1.2.tgz"; + sha512 = "clIjSS940NPBvtfubZokKT/YDNfE5ST9VDwsuwdCbQSkJAVZPAbmIgfmgrz/f/o8PawYQU/ooUBEuRIvIYq3ag=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -46693,13 +47475,13 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-json-languageservice-3.5.1" = { + "vscode-json-languageservice-3.6.0" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "3.5.1"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.5.1.tgz"; - sha512 = "F8jPqcAC1mbQOMKvGYS4dGEw9JCZxVEi7tc5ASZLfcfwKq2URZKB4fOtdy1GEsTLsrW11tVrBjEPntpXzqp/NA=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.6.0.tgz"; + sha512 = "dXzFywypUZ9T0tjr4fREZiknXDz6vAGx1zsxbQY1+9DOpjMfbz0VLP873KmcbuvL4K3nseKTxc4TKHu8kLXRMw=="; }; }; "vscode-jsonrpc-3.6.0" = { @@ -46720,22 +47502,22 @@ let sha512 = "perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg=="; }; }; - "vscode-jsonrpc-4.1.0-next.3" = { + "vscode-jsonrpc-5.0.1" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "4.1.0-next.3"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.1.0-next.3.tgz"; - sha512 = "Z6oxBiMks2+UADV1QHXVooSakjyhI+eHTnXzDyVvVMmegvSfkXk2w6mPEdSkaNHFBdtWW7n20H1yw2nA3A17mg=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz"; + sha512 = "JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="; }; }; - "vscode-jsonrpc-5.0.1" = { + "vscode-jsonrpc-5.1.0-next.1" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "5.0.1"; + version = "5.1.0-next.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz"; - sha512 = "JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.1.0-next.1.tgz"; + sha512 = "mwLDojZkbmpizSJSmp690oa9FB9jig18SIDGZeBCvFc2/LYSRvMm/WwWtMBJuJ1MfFh7rZXfQige4Uje5Z9NzA=="; }; }; "vscode-languageclient-4.0.1" = { @@ -46747,6 +47529,15 @@ let sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA=="; }; }; + "vscode-languageclient-7.0.0-next.1" = { + name = "vscode-languageclient"; + packageName = "vscode-languageclient"; + version = "7.0.0-next.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.1.tgz"; + sha512 = "JrjCUhLpQZxQ5VpWpilOHDMhVsn0fdN5jBh1uFNhSr5c2loJvRdr9Km2EuSQOFfOQsBKx0+xvY8PbsypNEcJ6w=="; + }; + }; "vscode-languageserver-4.0.0" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; @@ -46801,22 +47592,22 @@ let sha512 = "IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g=="; }; }; - "vscode-languageserver-protocol-3.15.0-next.6" = { + "vscode-languageserver-protocol-3.15.3" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.15.0-next.6"; + version = "3.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.6.tgz"; - sha512 = "/yDpYlWyNs26mM23mT73xmOFsh1iRfgZfBdHmfAxwDKwpQKLoOSqVidtYfxlK/pD3IEKGcAVnT4WXTsguxxAMQ=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz"; + sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw=="; }; }; - "vscode-languageserver-protocol-3.15.3" = { + "vscode-languageserver-protocol-3.16.0-next.2" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.15.3"; + version = "3.16.0-next.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz"; - sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.2.tgz"; + sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA=="; }; }; "vscode-languageserver-protocol-3.6.0" = { @@ -46864,6 +47655,15 @@ let sha512 = "+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="; }; }; + "vscode-languageserver-types-3.16.0-next.1" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.16.0-next.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.1.tgz"; + sha512 = "tZFUSbyjUcrh+qQf13ALX4QDdOfDX0cVaBFgy7ktJ0VwS7AW/yRKgGPSxVqqP9OCMNPdqP57O5q47w2pEwfaUg=="; + }; + }; "vscode-languageserver-types-3.6.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -47107,13 +47907,22 @@ let sha1 = "340a717bde765726fa0aa07d721e0147a551df0c"; }; }; - "watchpack-1.6.0" = { + "watchpack-1.6.1" = { name = "watchpack"; packageName = "watchpack"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz"; - sha512 = "i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA=="; + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz"; + sha512 = "+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA=="; + }; + }; + "watershed-0.3.4" = { + name = "watershed"; + packageName = "watershed"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/watershed/-/watershed-0.3.4.tgz"; + sha1 = "79331f666366b3b1c6ab02ceb04bad8dd2eebb0c"; }; }; "wbuf-1.7.3" = { @@ -47197,13 +48006,13 @@ let sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="; }; }; - "webpack-4.42.1" = { + "webpack-4.43.0" = { name = "webpack"; packageName = "webpack"; - version = "4.42.1"; + version = "4.43.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz"; - sha512 = "SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz"; + sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; }; }; "webpack-cli-3.3.11" = { @@ -47278,13 +48087,13 @@ let sha512 = "8z49MKIHbGk3C4HtuHWDtYX8mYej1wWabjthC/RupM9ngeukU4IWoM46dgth1UOS/T4/IqgEdCDJuMe2039OQQ=="; }; }; - "webtorrent-0.107.17" = { + "webtorrent-0.108.1" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.107.17"; + version = "0.108.1"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.107.17.tgz"; - sha512 = "Oe7d3+jpmPRDAc645PccIJPYa2w3n3BEiMU7J/Q76QSPF3SDUK8jO7keUCC2qk4ckcbdkb98bYK6/uK7M8vsRA=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.108.1.tgz"; + sha512 = "+w6JaqGKZBZHVrYLmG2VDuRLZlUhQrkLXw0/nw3VKV4aloICWGwBKzjLclXmexUhnqeVzZjCRIQgSZ8+YmgJUQ=="; }; }; "whatwg-encoding-1.0.5" = { @@ -47458,6 +48267,15 @@ let sha1 = "20b721df05b35b706176ffa10b0909aba4603035"; }; }; + "which-typed-array-1.1.2" = { + name = "which-typed-array"; + packageName = "which-typed-array"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.2.tgz"; + sha512 = "KT6okrd1tE6JdZAy3o2VhMoYPh3+J6EMZLyrxBQsZflI1QCZIxMrIYLkosd8Twf+YfknVIHmYQPgJt238p8dnQ=="; + }; + }; "wide-align-1.1.3" = { name = "wide-align"; packageName = "wide-align"; @@ -47566,13 +48384,13 @@ let sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb"; }; }; - "windows-release-3.2.0" = { + "windows-release-3.3.0" = { name = "windows-release"; packageName = "windows-release"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/windows-release/-/windows-release-3.2.0.tgz"; - sha512 = "QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA=="; + url = "https://registry.npmjs.org/windows-release/-/windows-release-3.3.0.tgz"; + sha512 = "2HetyTg1Y+R+rUgrKeUEhAG/ZuOmTrI1NBb3ZyAGQMYmOJjBBPe4MTodghRkmLJZHwkuPi02anbeGP+Zf401LQ=="; }; }; "winreg-0.0.12" = { @@ -47935,22 +48753,22 @@ let sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; }; }; - "ws-7.2.1" = { + "ws-7.2.3" = { name = "ws"; packageName = "ws"; - version = "7.2.1"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.2.1.tgz"; - sha512 = "sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A=="; + url = "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz"; + sha512 = "HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ=="; }; }; - "ws-7.2.3" = { + "ws-7.2.5" = { name = "ws"; packageName = "ws"; - version = "7.2.3"; + version = "7.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz"; - sha512 = "HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ=="; + url = "https://registry.npmjs.org/ws/-/ws-7.2.5.tgz"; + sha512 = "C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA=="; }; }; "x-default-browser-0.3.1" = { @@ -48247,7 +49065,7 @@ let version = "1.5.0"; src = fetchurl { name = "xmlhttprequest-1.5.0.tar.gz"; - url = https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433; + url = "https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433"; sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f"; }; }; @@ -48665,13 +49483,13 @@ let sha512 = "H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg=="; }; }; - "yargs-parser-18.1.1" = { + "yargs-parser-18.1.3" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "18.1.1"; + version = "18.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.1.tgz"; - sha512 = "KRHEsOM16IX7XuLnMOqImcPNbLVXMNHYAoFc3BKR8Ortl5gzDbtXvvEoGx9imk5E+X1VeNKNlcHr8B8vi+7ipA=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"; + sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; }; "yargs-parser-2.4.1" = { @@ -48764,15 +49582,6 @@ let sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; }; }; - "yauzl-2.4.1" = { - name = "yauzl"; - packageName = "yauzl"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz"; - sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; - }; - }; "yazl-2.5.1" = { name = "yazl"; packageName = "yazl"; @@ -48809,13 +49618,22 @@ let sha512 = "CP0fwGk5Y+jel+A0AQbyqnIFZRRpkKOeYUibiTSmlgV9PcgNFFVwn86VcUIpDLOqVjF+9v+O9FWQMo+IUcV2mA=="; }; }; - "yeoman-environment-2.8.1" = { + "yeoman-environment-2.10.0" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "2.8.1"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.8.1.tgz"; - sha512 = "MV6yeJfnSsZBv/VuWvw82bN6hF6KIXRUwhEPaO+RHJAWeNCQAF+iYfBNsJOo4tx5Puch300h+DF9QZceKkbzQg=="; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.10.0.tgz"; + sha512 = "dn754zZm1kTWS94V5riNLNjs9Wn6Zjl+9jgbQ37EmHEhcRR30fY1sgBnhYZyTpa+zK7ipFI6dMH9Sg0SAMW3hw=="; + }; + }; + "yeoman-generator-4.10.0" = { + name = "yeoman-generator"; + packageName = "yeoman-generator"; + version = "4.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.10.0.tgz"; + sha512 = "NuY9bt7r6kvjvWjAVcujZwHux5xXy4Vdmz3uabyjioh679ry97+dl+MgtlAkgdSQ7kGI0Iz1GC92tZ33XdxaDw=="; }; }; "yn-3.1.1" = { @@ -48872,13 +49690,13 @@ let sha512 = "PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ=="; }; }; - "zen-observable-ts-0.8.20" = { + "zen-observable-ts-0.8.21" = { name = "zen-observable-ts"; packageName = "zen-observable-ts"; - version = "0.8.20"; + version = "0.8.21"; src = fetchurl { - url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.20.tgz"; - sha512 = "2rkjiPALhOtRaDX6pWyNqK1fnP5KkJJybYebopNSn6wDG1lxBoFs2+nwwXKoA6glHIrtwrfBBy6da0stkKtTAA=="; + url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.21.tgz"; + sha512 = "Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg=="; }; }; "zerr-1.0.4" = { @@ -48941,34 +49759,27 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "9.0.7"; + version = "9.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-9.0.7.tgz"; - sha512 = "/9CUNSSVyTtTNUADZ/VXJDEdhineMN/rfd35w6VsHiob49tKkeOTggaoiSne3RY4VCTqlo7GGf4KhhVXEMGnDQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-9.1.4.tgz"; + sha512 = "H9MqoT4zyIv+Yo3cvRVkzafWGHsqt7jUvtvGwMHIDMTfEX+Q8yiYlDLL6WM3Eb6/hDmLcRGC/GI495sKS1z5qA=="; }; dependencies = [ - sources."@angular-devkit/architect-0.900.7" - sources."@angular-devkit/core-9.0.7" - sources."@angular-devkit/schematics-9.0.7" - sources."@schematics/angular-9.0.7" - (sources."@schematics/update-0.900.7" // { - dependencies = [ - (sources."npm-package-arg-7.0.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - ]; - }) + sources."@angular-devkit/architect-0.901.4" + sources."@angular-devkit/core-9.1.4" + sources."@angular-devkit/schematics-9.1.4" + sources."@schematics/angular-9.1.4" + sources."@schematics/update-0.901.4" + sources."@types/color-name-1.1.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" - sources."ajv-6.10.2" + sources."ajv-6.12.0" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.1" - sources."ansi-regex-4.1.0" - sources."ansi-styles-3.2.1" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" sources."aproba-1.2.0" sources."asap-2.0.6" sources."asn1-0.2.4" @@ -48988,15 +49799,15 @@ in ]; }) sources."caseless-0.12.0" - sources."chalk-2.4.2" + sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chownr-1.1.4" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.2.0" - sources."cli-width-2.2.0" + sources."cli-spinners-2.3.0" + sources."cli-width-2.2.1" sources."clone-1.0.4" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -49028,8 +49839,8 @@ in sources."extend-3.0.2" sources."external-editor-3.1.0" sources."extsprintf-1.3.0" - sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-deep-equal-3.1.1" + sources."fast-json-stable-stringify-2.1.0" sources."figgy-pudding-3.5.2" sources."figures-3.2.0" sources."flush-write-stream-1.1.1" @@ -49044,11 +49855,11 @@ in sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-1.0.3" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."has-symbols-1.0.1" sources."hosted-git-info-3.0.4" sources."http-cache-semantics-3.8.1" @@ -49073,17 +49884,17 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."inquirer-7.0.0" + sources."inquirer-7.1.0" sources."ip-1.1.5" sources."is-callable-1.1.5" sources."is-date-object-1.0.2" + sources."is-docker-2.0.0" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" - sources."is-promise-2.1.0" sources."is-regex-1.0.5" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" @@ -49095,19 +49906,28 @@ in sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."lodash-4.17.15" - sources."log-symbols-3.0.0" + (sources."log-symbols-3.0.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) sources."lru-cache-5.1.1" - sources."magic-string-0.25.4" + sources."magic-string-0.25.7" sources."make-fetch-happen-5.0.2" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mississippi-3.0.0" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" (sources."move-concurrently-1.0.1" // { dependencies = [ sources."rimraf-2.7.1" @@ -49115,7 +49935,7 @@ in }) sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."node-fetch-npm-2.0.3" + sources."node-fetch-npm-2.0.4" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."hosted-git-info-2.8.8" @@ -49123,20 +49943,18 @@ in ]; }) sources."npm-bundled-1.1.1" + sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" - (sources."npm-package-arg-6.1.1" // { - dependencies = [ - sources."hosted-git-info-2.8.8" - sources."semver-5.7.1" - ]; - }) + sources."npm-package-arg-8.0.1" sources."npm-packlist-1.4.8" - (sources."npm-pick-manifest-3.0.2" // { + sources."npm-pick-manifest-6.0.0" + (sources."npm-registry-fetch-4.0.4" // { dependencies = [ + sources."hosted-git-info-2.8.8" + sources."npm-package-arg-6.1.1" sources."semver-5.7.1" ]; }) - sources."npm-registry-fetch-4.0.3" sources."oauth-sign-0.9.0" sources."object-inspect-1.7.0" sources."object-keys-1.1.1" @@ -49144,13 +49962,16 @@ in sources."object.getownpropertydescriptors-2.1.0" sources."once-1.4.0" sources."onetime-5.1.0" - sources."open-7.0.0" - sources."ora-4.0.2" + sources."open-7.0.3" + sources."ora-4.0.3" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - (sources."pacote-9.5.8" // { + (sources."pacote-9.5.12" // { dependencies = [ + sources."hosted-git-info-2.8.8" + sources."npm-package-arg-6.1.1" + sources."npm-pick-manifest-3.0.2" sources."rimraf-2.7.1" sources."semver-5.7.1" ]; @@ -49163,7 +49984,7 @@ in sources."promise-inflight-1.0.1" sources."promise-retry-1.1.1" sources."protoduck-5.0.1" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -49180,23 +50001,27 @@ in ]; }) sources."readdir-scoped-modules-1.1.0" - sources."request-2.88.2" - sources."resolve-1.15.1" + (sources."request-2.88.2" // { + dependencies = [ + sources."uuid-3.4.0" + ]; + }) + sources."resolve-1.17.0" sources."restore-cursor-3.1.0" sources."retry-0.10.1" - sources."rimraf-3.0.0" - sources."run-async-2.4.0" + sources."rimraf-3.0.2" + sources."run-async-2.4.1" sources."run-queue-1.0.3" - sources."rxjs-6.5.3" + sources."rxjs-6.5.4" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" - sources."semver-6.3.0" + sources."semver-7.1.3" (sources."semver-intersect-1.4.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."smart-buffer-4.1.0" sources."socks-2.3.3" (sources."socks-proxy-agent-4.0.2" // { @@ -49207,28 +50032,25 @@ in sources."source-map-0.7.3" sources."sourcemap-codec-1.4.8" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."sshpk-1.16.1" sources."ssri-6.0.1" sources."stream-each-1.2.3" sources."stream-shift-1.0.1" - (sources."string-width-4.2.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."strip-ansi-6.0.0" - ]; - }) - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string-width-4.2.0" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) - sources."strip-ansi-5.2.0" - sources."supports-color-5.5.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.1.0" sources."symbol-observable-1.2.0" sources."tar-4.4.13" sources."through-2.3.8" @@ -49245,12 +50067,13 @@ in (sources."universal-analytics-0.4.20" // { dependencies = [ sources."debug-3.2.6" + sources."uuid-3.4.0" ]; }) sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."util-promisify-2.1.0" - sources."uuid-3.4.0" + sources."uuid-7.0.2" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" @@ -49264,7 +50087,7 @@ in buildInputs = globalBuildInputs; meta = { description = "CLI tool for Angular"; - homepage = https://github.com/angular/angular-cli; + homepage = "https://github.com/angular/angular-cli"; license = "MIT"; }; production = true; @@ -49274,28 +50097,27 @@ in "@antora/cli" = nodeEnv.buildNodePackage { name = "_at_antora_slash_cli"; packageName = "@antora/cli"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/cli/-/cli-2.2.0.tgz"; - sha512 = "/fQDYEMypZbC8LxpZak/3nsP8Rr3voXXvxSan/718uDJUHFwq1rHl9Y/pOoE/tRs0Qv1jtDvk2eZgFDlsMMmlQ=="; + url = "https://registry.npmjs.org/@antora/cli/-/cli-2.3.1.tgz"; + sha512 = "AtqlCYdlvwfRUtqaSzjR3Ji4WpCHq/AyD+rcagD3lg/WGiZdwgppiy4Oj36s7rUfR0SDl5GIIWmA5zdDSBRNvw=="; }; dependencies = [ - sources."@antora/playbook-builder-2.2.0" - sources."@iarna/toml-2.2.3" + sources."@antora/playbook-builder-2.3.1" + sources."@iarna/toml-2.2.5" sources."argparse-1.0.10" sources."camelcase-5.3.1" - sources."camelcase-keys-6.1.2" - sources."commander-3.0.2" + sources."camelcase-keys-6.2.2" + sources."commander-5.1.0" (sources."convict-5.2.0" // { dependencies = [ sources."json5-2.1.0" ]; }) sources."decamelize-1.2.0" - sources."deep-freeze-node-1.1.3" sources."esprima-4.0.1" sources."js-yaml-3.13.1" - sources."json5-2.1.2" + sources."json5-2.1.3" sources."lodash.clonedeep-4.5.0" sources."map-obj-4.1.0" sources."minimist-1.2.5" @@ -49308,7 +50130,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The command line interface for Antora."; - homepage = https://antora.org/; + homepage = "https://antora.org/"; license = "MPL-2.0"; }; production = true; @@ -49318,25 +50140,25 @@ in "@antora/site-generator-default" = nodeEnv.buildNodePackage { name = "_at_antora_slash_site-generator-default"; packageName = "@antora/site-generator-default"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.2.0.tgz"; - sha512 = "fy2tG1I3/FK1s/y/GhGMkFICtXkkSOpxVy5OjBXXfkBNHQIHYSLDv460Gz8NvSiVe99LWWa+FOpr5G13Bb0bvw=="; + url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.3.1.tgz"; + sha512 = "uAt6pCfMfTs2m+IUZjcivN4fDmt2D3C2lI9dfWAkAe2P9vIY7oZuVqCuBQfAwnkJg8mOTk0J2gLEyspbRDsK7w=="; }; dependencies = [ - sources."@antora/asciidoc-loader-2.2.0" - sources."@antora/content-aggregator-2.2.0" - sources."@antora/content-classifier-2.2.0" - sources."@antora/document-converter-2.2.0" + sources."@antora/asciidoc-loader-2.3.1" + sources."@antora/content-aggregator-2.3.1" + sources."@antora/content-classifier-2.3.1" + sources."@antora/document-converter-2.3.1" sources."@antora/expand-path-helper-1.0.0" - sources."@antora/navigation-builder-2.2.0" - sources."@antora/page-composer-2.2.0" - sources."@antora/playbook-builder-2.2.0" - sources."@antora/redirect-producer-2.2.0" - sources."@antora/site-mapper-2.2.0" - sources."@antora/site-publisher-2.2.0" - sources."@antora/ui-loader-2.2.0" - sources."@iarna/toml-2.2.3" + sources."@antora/navigation-builder-2.3.1" + sources."@antora/page-composer-2.3.1" + sources."@antora/playbook-builder-2.3.1" + sources."@antora/redirect-producer-2.3.1" + sources."@antora/site-mapper-2.3.1" + sources."@antora/site-publisher-2.3.1" + sources."@antora/ui-loader-2.3.1" + sources."@iarna/toml-2.2.5" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."append-buffer-1.0.2" @@ -49348,7 +50170,8 @@ in sources."bl-4.0.2" sources."bops-0.0.7" sources."brace-expansion-1.1.11" - (sources."buffer-5.5.0" // { + sources."braces-3.0.2" + (sources."buffer-5.6.0" // { dependencies = [ sources."base64-js-1.3.1" ]; @@ -49364,7 +50187,7 @@ in ]; }) sources."camelcase-5.3.1" - sources."camelcase-keys-6.1.2" + sources."camelcase-keys-6.2.2" sources."clean-git-ref-2.0.1" sources."clone-2.1.2" sources."clone-buffer-1.0.0" @@ -49397,11 +50220,9 @@ in sources."crc-32-1.2.0" sources."decamelize-1.2.0" sources."decompress-response-4.2.1" - sources."deep-freeze-node-1.1.3" sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" sources."diff3-0.0.3" - sources."duplexer-0.1.1" sources."duplexer3-0.1.4" (sources."duplexify-3.7.1" // { dependencies = [ @@ -49413,10 +50234,10 @@ in sources."end-of-stream-1.4.4" sources."escape-string-regexp-2.0.0" sources."esprima-4.0.1" - sources."event-stream-3.3.4" sources."exit-on-epipe-1.0.1" sources."extend-3.0.2" sources."fd-slicer-1.1.0" + sources."fill-range-7.0.1" (sources."flush-write-stream-1.1.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -49424,7 +50245,6 @@ in sources."string_decoder-1.1.1" ]; }) - sources."from-0.1.7" sources."fs-extra-8.1.0" (sources."fs-mkdirp-stream-1.0.0" // { dependencies = [ @@ -49460,8 +50280,8 @@ in sources."mimic-response-1.0.1" ]; }) - sources."graceful-fs-4.2.3" - (sources."gulp-vinyl-zip-2.1.3" // { + sources."graceful-fs-4.2.4" + (sources."gulp-vinyl-zip-2.2.0" // { dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -49469,7 +50289,7 @@ in sources."through2-2.0.5" ]; }) - sources."handlebars-4.5.3" + sources."handlebars-4.7.6" sources."has-symbols-1.0.1" sources."http-cache-semantics-4.1.0" sources."ieee754-1.1.13" @@ -49481,17 +50301,18 @@ in sources."is-extglob-2.1.1" sources."is-glob-3.1.0" sources."is-negated-glob-1.0.0" + sources."is-number-7.0.0" sources."is-relative-1.0.0" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-valid-glob-1.0.0" sources."is-windows-1.0.2" sources."isarray-1.0.0" - sources."isomorphic-git-0.70.4" + sources."isomorphic-git-0.78.5" sources."js-yaml-3.13.1" sources."json-buffer-3.0.0" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.1.2" + sources."json5-2.1.3" sources."jsonfile-4.0.0" sources."keyv-3.1.0" (sources."lazystream-1.0.0" // { @@ -49502,15 +50323,13 @@ in ]; }) sources."lead-1.0.0" - sources."lodash-4.17.15" sources."lodash.clonedeep-4.5.0" sources."lowercase-keys-1.0.1" sources."map-obj-4.1.0" - sources."map-stream-0.1.0" sources."marky-1.2.1" - sources."matcher-2.0.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."matcher-2.1.0" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimatch-all-1.1.0" @@ -49526,11 +50345,6 @@ in sources."object.assign-4.1.0" sources."once-1.4.0" sources."opal-runtime-1.0.11" - (sources."optimist-0.6.1" // { - dependencies = [ - sources."minimist-0.0.10" - ]; - }) (sources."ordered-read-streams-1.0.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -49542,8 +50356,8 @@ in sources."pako-1.0.11" sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" - sources."pause-stream-0.0.11" sources."pend-1.2.0" + sources."picomatch-2.2.2" sources."pify-4.0.1" sources."prepend-http-2.0.0" sources."printj-1.1.2" @@ -49571,7 +50385,7 @@ in ]; }) sources."remove-trailing-separator-1.1.0" - sources."replace-ext-1.0.0" + sources."replace-ext-1.0.1" sources."require-from-string-2.0.2" sources."resolve-options-1.1.0" sources."responselike-1.0.2" @@ -49580,9 +50394,7 @@ in sources."simple-concat-1.0.0" sources."simple-get-3.1.0" sources."source-map-0.6.1" - sources."split-0.3.3" sources."sprintf-js-1.0.3" - sources."stream-combiner-0.0.4" sources."stream-shift-1.0.1" sources."string_decoder-1.3.0" sources."through-2.3.8" @@ -49597,6 +50409,7 @@ in }) sources."to-absolute-glob-2.0.2" sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" (sources."to-through-2.0.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -49606,7 +50419,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.8.0" + sources."uglify-js-3.9.2" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -49625,7 +50438,7 @@ in ]; }) sources."vinyl-sourcemap-1.1.0" - sources."wordwrap-0.0.3" + sources."wordwrap-1.0.0" sources."wrappy-1.0.2" sources."xdg-basedir-3.0.0" sources."xmlhttprequest-1.8.0" @@ -49637,7 +50450,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The default site generator pipeline for producing and publishing static documentation sites with Antora."; - homepage = https://antora.org/; + homepage = "https://antora.org/"; license = "MPL-2.0"; }; production = true; @@ -49658,7 +50471,7 @@ in sources."acorn-globals-4.3.4" sources."acorn-walk-6.2.0" sources."agent-base-5.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -49676,7 +50489,7 @@ in sources."chalk-2.4.1" sources."chardet-0.7.0" sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.6" @@ -49706,7 +50519,7 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.2" sources."getpass-0.1.7" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" @@ -49716,7 +50529,7 @@ in sources."iconv-lite-0.4.24" sources."inquirer-6.2.0" sources."is-fullwidth-code-point-2.0.0" - sources."is-promise-2.1.0" + sources."is-promise-2.2.2" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" @@ -49730,8 +50543,8 @@ in sources."lodash.sortby-4.7.0" sources."lowdb-1.0.0" sources."lunr-2.3.3" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."ms-2.1.2" sources."mute-stream-0.0.7" @@ -49748,19 +50561,19 @@ in sources."pify-3.0.0" sources."pn-1.1.0" sources."prelude-ls-1.1.2" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."request-2.88.2" sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" sources."restore-cursor-2.0.0" - sources."run-async-2.4.0" - sources."rxjs-6.5.4" + sources."run-async-2.4.1" + sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."saxes-3.1.11" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."source-map-0.6.1" sources."sshpk-1.16.1" sources."stealthy-require-1.1.1" @@ -49800,7 +50613,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A secure and free password manager for all of your devices."; - homepage = https://bitwarden.com/; + homepage = "https://bitwarden.com/"; license = "GPL-3.0"; }; production = true; @@ -49810,83 +50623,83 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "4.2.3"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-4.2.3.tgz"; - sha512 = "kZcbYECSlTIAyrQ1v5zYz3NXmMe+poxUOf5PW8wj7Gp1265rrOeEh6z1FsB1gbJ/AVGvCtVuat7PF1odgE2FZQ=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-4.3.1.tgz"; + sha512 = "K4oxL3/RLKrS53r9hr7mvtDDURCnuiMIaoOPa65TU8kVmEXohdebMAKUmHebk/yENPtBIdpQ9YankV/TWjRMhQ=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" - sources."@apollo/federation-0.13.2" + sources."@apollo/federation-0.14.1" (sources."@apollo/protobufjs-1.0.3" // { dependencies = [ - sources."@types/node-10.17.17" + sources."@types/node-10.17.21" ]; }) - sources."@apollographql/apollo-tools-0.4.4" + sources."@apollographql/apollo-tools-0.4.7" sources."@apollographql/graphql-language-service-interface-2.0.2" sources."@apollographql/graphql-language-service-parser-2.0.2" sources."@apollographql/graphql-language-service-types-2.0.2" sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.24" sources."@babel/code-frame-7.8.3" - (sources."@babel/compat-data-7.9.0" // { + (sources."@babel/compat-data-7.9.6" // { dependencies = [ sources."semver-5.7.1" ]; }) - (sources."@babel/core-7.9.0" // { + (sources."@babel/core-7.9.6" // { dependencies = [ - sources."@babel/generator-7.9.4" - sources."@babel/types-7.9.0" + sources."@babel/generator-7.9.6" + sources."@babel/types-7.9.6" sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.8.6" + sources."@babel/generator-7.9.5" sources."@babel/helper-annotate-as-pure-7.8.3" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" - (sources."@babel/helper-compilation-targets-7.8.7" // { + (sources."@babel/helper-compilation-targets-7.9.6" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.8.6" + sources."@babel/helper-create-class-features-plugin-7.9.6" sources."@babel/helper-create-regexp-features-plugin-7.8.8" sources."@babel/helper-define-map-7.8.3" sources."@babel/helper-explode-assignable-expression-7.8.3" - sources."@babel/helper-function-name-7.8.3" + sources."@babel/helper-function-name-7.9.5" sources."@babel/helper-get-function-arity-7.8.3" sources."@babel/helper-hoist-variables-7.8.3" sources."@babel/helper-member-expression-to-functions-7.8.3" sources."@babel/helper-module-imports-7.8.3" - (sources."@babel/helper-module-transforms-7.9.0" // { - dependencies = [ - sources."@babel/types-7.9.0" - ]; - }) + sources."@babel/helper-module-transforms-7.9.0" sources."@babel/helper-optimise-call-expression-7.8.3" sources."@babel/helper-plugin-utils-7.8.3" sources."@babel/helper-regex-7.8.3" sources."@babel/helper-remap-async-to-generator-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" + (sources."@babel/helper-replace-supers-7.9.6" // { + dependencies = [ + sources."@babel/types-7.9.6" + ]; + }) sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" - sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/helper-wrap-function-7.8.3" - (sources."@babel/helpers-7.9.2" // { + (sources."@babel/helpers-7.9.6" // { dependencies = [ - sources."@babel/types-7.9.0" + sources."@babel/types-7.9.6" ]; }) sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@babel/plugin-proposal-async-generator-functions-7.8.3" sources."@babel/plugin-proposal-class-properties-7.8.3" sources."@babel/plugin-proposal-dynamic-import-7.8.3" sources."@babel/plugin-proposal-json-strings-7.8.3" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-proposal-numeric-separator-7.8.3" - sources."@babel/plugin-proposal-object-rest-spread-7.9.0" + sources."@babel/plugin-proposal-object-rest-spread-7.9.6" sources."@babel/plugin-proposal-optional-catch-binding-7.8.3" sources."@babel/plugin-proposal-optional-chaining-7.9.0" sources."@babel/plugin-proposal-unicode-property-regex-7.8.8" @@ -49905,9 +50718,9 @@ in sources."@babel/plugin-transform-async-to-generator-7.8.3" sources."@babel/plugin-transform-block-scoped-functions-7.8.3" sources."@babel/plugin-transform-block-scoping-7.8.3" - sources."@babel/plugin-transform-classes-7.9.2" + sources."@babel/plugin-transform-classes-7.9.5" sources."@babel/plugin-transform-computed-properties-7.8.3" - sources."@babel/plugin-transform-destructuring-7.8.8" + sources."@babel/plugin-transform-destructuring-7.9.5" sources."@babel/plugin-transform-dotall-regex-7.8.3" sources."@babel/plugin-transform-duplicate-keys-7.8.3" sources."@babel/plugin-transform-exponentiation-operator-7.8.3" @@ -49916,14 +50729,14 @@ in sources."@babel/plugin-transform-function-name-7.8.3" sources."@babel/plugin-transform-literals-7.8.3" sources."@babel/plugin-transform-member-expression-literals-7.8.3" - sources."@babel/plugin-transform-modules-amd-7.9.0" - sources."@babel/plugin-transform-modules-commonjs-7.9.0" - sources."@babel/plugin-transform-modules-systemjs-7.9.0" + sources."@babel/plugin-transform-modules-amd-7.9.6" + sources."@babel/plugin-transform-modules-commonjs-7.9.6" + sources."@babel/plugin-transform-modules-systemjs-7.9.6" sources."@babel/plugin-transform-modules-umd-7.9.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" sources."@babel/plugin-transform-new-target-7.8.3" sources."@babel/plugin-transform-object-super-7.8.3" - sources."@babel/plugin-transform-parameters-7.9.3" + sources."@babel/plugin-transform-parameters-7.9.5" sources."@babel/plugin-transform-property-literals-7.8.3" sources."@babel/plugin-transform-regenerator-7.8.7" sources."@babel/plugin-transform-reserved-words-7.8.3" @@ -49932,11 +50745,11 @@ in sources."@babel/plugin-transform-sticky-regex-7.8.3" sources."@babel/plugin-transform-template-literals-7.8.3" sources."@babel/plugin-transform-typeof-symbol-7.8.4" - sources."@babel/plugin-transform-typescript-7.9.4" + sources."@babel/plugin-transform-typescript-7.9.6" sources."@babel/plugin-transform-unicode-regex-7.8.3" - (sources."@babel/preset-env-7.9.0" // { + (sources."@babel/preset-env-7.9.6" // { dependencies = [ - sources."@babel/types-7.9.0" + sources."@babel/types-7.9.6" sources."semver-5.7.1" ]; }) @@ -49950,19 +50763,15 @@ in sources."semver-5.7.1" ]; }) - (sources."@babel/runtime-7.9.2" // { - dependencies = [ - sources."regenerator-runtime-0.13.5" - ]; - }) + sources."@babel/runtime-7.9.6" sources."@babel/template-7.8.6" - (sources."@babel/traverse-7.9.0" // { + (sources."@babel/traverse-7.9.6" // { dependencies = [ - sources."@babel/generator-7.9.4" - sources."@babel/types-7.9.0" + sources."@babel/generator-7.9.6" + sources."@babel/types-7.9.6" ]; }) - sources."@babel/types-7.8.6" + sources."@babel/types-7.9.5" sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.1" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" @@ -49977,7 +50786,7 @@ in sources."semver-5.7.1" ]; }) - sources."@oclif/config-1.14.0" + sources."@oclif/config-1.15.1" (sources."@oclif/errors-1.2.2" // { dependencies = [ sources."clean-stack-1.3.0" @@ -50040,50 +50849,53 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@samverschueren/stream-to-observable-0.3.0" + sources."@sindresorhus/is-0.7.0" sources."@types/accepts-1.3.5" sources."@types/body-parser-1.19.0" sources."@types/color-name-1.1.1" sources."@types/connect-3.4.33" + sources."@types/content-disposition-0.5.3" sources."@types/cookies-0.7.4" sources."@types/cors-2.8.6" sources."@types/events-3.0.0" - sources."@types/express-4.17.2" - sources."@types/express-serve-static-core-4.17.3" + sources."@types/express-4.17.4" + sources."@types/express-serve-static-core-4.17.5" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.1" sources."@types/graphql-upload-8.0.3" sources."@types/http-assert-1.5.1" sources."@types/keygrip-1.0.2" - sources."@types/koa-2.11.2" + sources."@types/koa-2.11.3" sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.1" sources."@types/mime-2.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.3" - (sources."@types/node-fetch-2.5.5" // { + sources."@types/node-13.13.4" + (sources."@types/node-fetch-2.5.6" // { dependencies = [ sources."form-data-3.0.0" ]; }) sources."@types/normalize-package-data-2.4.0" + sources."@types/qs-6.9.1" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.3" - sources."@types/ws-6.0.4" + sources."@types/ws-7.2.4" sources."@types/zen-observable-0.8.0" - sources."@vue/cli-shared-utils-4.2.3" - (sources."@vue/cli-ui-4.2.3" // { + sources."@vue/cli-shared-utils-4.3.1" + (sources."@vue/cli-ui-4.3.1" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-4.2.3" - sources."@vue/cli-ui-addon-widgets-4.2.3" + sources."@vue/cli-ui-addon-webpack-4.3.1" + sources."@vue/cli-ui-addon-widgets-4.3.1" sources."@wry/context-0.4.4" - sources."@wry/equality-0.1.9" + sources."@wry/equality-0.1.11" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."aggregate-error-3.0.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" @@ -50095,45 +50907,54 @@ in sources."normalize-path-2.1.1" ]; }) - (sources."apollo-2.25.0" // { + (sources."apollo-2.27.3" // { dependencies = [ - sources."mkdirp-1.0.3" sources."strip-ansi-5.2.0" ]; }) sources."apollo-cache-1.3.4" - sources."apollo-cache-control-0.9.0" + sources."apollo-cache-control-0.10.0" sources."apollo-cache-inmemory-1.6.5" sources."apollo-client-2.6.8" - sources."apollo-codegen-core-0.36.4" - sources."apollo-codegen-flow-0.34.4" - sources."apollo-codegen-scala-0.35.4" - sources."apollo-codegen-swift-0.36.4" - sources."apollo-codegen-typescript-0.36.4" + (sources."apollo-codegen-core-0.36.8" // { + dependencies = [ + sources."recast-0.19.1" + sources."source-map-0.6.1" + ]; + }) + sources."apollo-codegen-flow-0.34.8" + sources."apollo-codegen-scala-0.35.8" + sources."apollo-codegen-swift-0.36.8" + sources."apollo-codegen-typescript-0.36.8" sources."apollo-datasource-0.7.0" - sources."apollo-engine-reporting-1.7.0" - sources."apollo-engine-reporting-protobuf-0.4.4" - sources."apollo-env-0.6.2" - sources."apollo-graphql-0.4.1" - sources."apollo-language-server-1.20.1" - sources."apollo-link-1.2.13" - sources."apollo-link-context-1.0.19" - sources."apollo-link-error-1.1.12" - sources."apollo-link-http-1.5.16" - sources."apollo-link-http-common-0.2.15" + sources."apollo-engine-reporting-1.8.0" + sources."apollo-engine-reporting-protobuf-0.5.0" + sources."apollo-env-0.6.4" + sources."apollo-graphql-0.4.3" + sources."apollo-language-server-1.21.3" + sources."apollo-link-1.2.14" + sources."apollo-link-context-1.0.20" + sources."apollo-link-error-1.1.13" + sources."apollo-link-http-1.5.17" + sources."apollo-link-http-common-0.2.16" sources."apollo-link-persisted-queries-0.2.2" sources."apollo-link-state-0.4.2" - sources."apollo-link-ws-1.0.19" + sources."apollo-link-ws-1.0.20" sources."apollo-server-caching-0.5.1" - sources."apollo-server-core-2.11.0" + sources."apollo-server-core-2.13.0" sources."apollo-server-env-2.4.3" - sources."apollo-server-errors-2.4.0" - sources."apollo-server-express-2.11.0" - sources."apollo-server-plugin-base-0.7.0" - sources."apollo-server-types-0.3.0" - sources."apollo-tracing-0.9.0" + sources."apollo-server-errors-2.4.1" + sources."apollo-server-express-2.13.0" + sources."apollo-server-plugin-base-0.8.0" + sources."apollo-server-types-0.4.0" + sources."apollo-tracing-0.10.0" sources."apollo-upload-client-11.0.0" sources."apollo-utilities-1.3.3" + (sources."archive-type-4.0.0" // { + dependencies = [ + sources."file-type-4.4.0" + ]; + }) sources."arg-4.1.3" sources."argparse-1.0.10" sources."arr-diff-4.0.0" @@ -50147,7 +50968,7 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."ast-types-0.13.2" + sources."ast-types-0.13.3" sources."astral-regex-1.0.0" sources."async-2.6.3" sources."async-each-1.0.3" @@ -50159,18 +50980,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.9.1" sources."babel-core-7.0.0-bridge.0" - sources."babel-plugin-dynamic-import-node-2.3.0" - (sources."babel-polyfill-6.26.0" // { - dependencies = [ - sources."core-js-2.6.11" - ]; - }) - (sources."babel-runtime-6.26.0" // { - dependencies = [ - sources."core-js-2.6.11" - sources."regenerator-runtime-0.11.1" - ]; - }) + sources."babel-plugin-dynamic-import-node-2.3.3" sources."backo2-1.0.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { @@ -50223,8 +51033,8 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.11.0" - sources."buffer-5.5.0" + sources."browserslist-4.12.0" + sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -50235,13 +51045,19 @@ in sources."byline-5.0.0" sources."bytes-3.1.0" sources."cache-base-1.0.1" + (sources."cacheable-request-2.1.4" // { + dependencies = [ + sources."get-stream-3.0.0" + sources."lowercase-keys-1.0.0" + ]; + }) sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001036" + sources."caniuse-lite-1.0.30001050" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" sources."caseless-0.12.0" @@ -50272,7 +51088,14 @@ in sources."clean-stack-2.2.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" - sources."cli-spinners-2.2.0" + (sources."cli-progress-3.8.2" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + ]; + }) + sources."cli-spinners-2.3.0" (sources."cli-truncate-0.2.1" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -50281,17 +51104,17 @@ in sources."strip-ansi-3.0.1" ]; }) - (sources."cli-ux-5.2.1" // { + (sources."cli-ux-5.4.5" // { dependencies = [ - sources."indent-string-3.2.0" sources."semver-5.7.1" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; }) - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."clipboard-2.0.6" sources."clone-1.0.4" + sources."clone-response-1.0.2" sources."cmd-shim-3.0.3" sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" @@ -50321,8 +51144,8 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.6.4" - (sources."core-js-compat-3.6.4" // { + sources."core-js-3.6.5" + (sources."core-js-compat-3.6.5" // { dependencies = [ sources."semver-7.0.0" ]; @@ -50353,18 +51176,27 @@ in ]; }) sources."decode-uri-component-0.2.0" - (sources."decompress-4.2.0" // { + (sources."decompress-4.2.1" // { dependencies = [ sources."pify-2.3.0" ]; }) - sources."decompress-tar-4.1.1" + sources."decompress-response-3.3.0" + (sources."decompress-tar-4.1.1" // { + dependencies = [ + sources."file-type-5.2.0" + ]; + }) (sources."decompress-tarbz2-4.1.1" // { dependencies = [ sources."file-type-6.2.0" ]; }) - sources."decompress-targz-4.1.1" + (sources."decompress-targz-4.1.1" // { + dependencies = [ + sources."file-type-5.2.0" + ]; + }) (sources."decompress-unzip-4.0.1" // { dependencies = [ sources."file-type-3.9.0" @@ -50393,26 +51225,29 @@ in sources."dot-case-2.1.1" sources."dot-prop-4.2.0" sources."dotenv-8.2.0" - (sources."download-5.0.3" // { + (sources."download-7.1.0" // { dependencies = [ sources."get-stream-3.0.0" - sources."pify-2.3.0" + sources."got-8.3.2" + sources."into-stream-3.1.0" + sources."prepend-http-2.0.0" + sources."url-parse-lax-3.0.0" ]; }) - sources."download-git-repo-1.1.0" + sources."download-git-repo-3.0.2" sources."duplexer3-0.1.4" sources."easy-stack-1.0.0" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.383" + sources."electron-to-chromium-1.3.427" sources."elegant-spinner-1.0.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-1.1.2" sources."env-ci-3.2.2" - sources."envinfo-7.5.0" + sources."envinfo-7.5.1" sources."error-ex-1.3.2" sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" @@ -50453,6 +51288,8 @@ in ]; }) sources."express-history-api-fallback-2.2.1" + sources."ext-list-2.2.2" + sources."ext-name-5.0.0" sources."extend-3.0.2" sources."extend-shallow-2.0.1" sources."external-editor-3.1.0" @@ -50470,7 +51307,7 @@ in sources."fast-levenshtein-2.0.6" sources."fd-slicer-1.1.0" sources."figures-1.7.0" - sources."file-type-5.2.0" + sources."file-type-8.1.0" sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" @@ -50487,9 +51324,9 @@ in sources."semver-5.7.1" ]; }) - sources."find-up-3.0.0" + sources."find-up-2.1.0" sources."fkill-6.2.0" - sources."flow-parser-0.121.0" + sources."flow-parser-0.123.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -50515,11 +51352,7 @@ in sources."getpass-0.1.7" sources."git-clone-0.1.0" sources."git-config-path-1.0.1" - (sources."git-parse-1.0.3" // { - dependencies = [ - sources."util.promisify-1.0.0" - ]; - }) + sources."git-parse-1.0.4" (sources."git-rev-sync-2.0.0" // { dependencies = [ sources."graceful-fs-4.1.15" @@ -50547,7 +51380,7 @@ in sources."get-stream-3.0.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."graceful-readlink-1.0.1" sources."graphql-14.6.0" (sources."graphql-anywhere-4.2.6" // { @@ -50555,10 +51388,10 @@ in sources."ts-invariant-0.3.3" ]; }) - sources."graphql-extensions-0.11.0" + sources."graphql-extensions-0.12.0" sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.10.3" - sources."graphql-tools-4.0.7" + sources."graphql-tools-4.0.8" sources."graphql-type-json-0.3.1" sources."graphql-upload-8.1.0" sources."growly-1.3.0" @@ -50590,6 +51423,7 @@ in sources."readable-stream-3.6.0" ]; }) + sources."http-cache-semantics-3.8.1" (sources."http-call-5.3.0" // { dependencies = [ sources."is-stream-2.0.0" @@ -50613,10 +51447,24 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-6.5.2" // { + (sources."inquirer-7.1.0" // { dependencies = [ - sources."figures-2.0.0" - sources."strip-ansi-5.2.0" + sources."ansi-escapes-4.3.1" + sources."ansi-styles-4.2.1" + sources."chalk-3.0.0" + sources."cli-cursor-3.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."emoji-regex-8.0.0" + sources."figures-3.2.0" + sources."has-flag-4.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."mimic-fn-2.1.0" + sources."onetime-5.1.0" + sources."restore-cursor-3.1.0" + sources."string-width-4.2.0" + sources."supports-color-7.1.0" + sources."type-fest-0.11.0" ]; }) sources."interpret-1.2.0" @@ -50633,6 +51481,7 @@ in sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" sources."is-directory-0.3.1" + sources."is-docker-2.0.0" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -50650,8 +51499,9 @@ in sources."is-object-1.0.1" sources."is-observable-1.1.0" sources."is-path-inside-1.0.1" + sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" + sources."is-promise-2.2.2" sources."is-property-1.0.2" sources."is-redirect-1.0.0" sources."is-regex-1.0.5" @@ -50663,7 +51513,7 @@ in sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-1.0.0" - sources."isbinaryfile-4.0.5" + sources."isbinaryfile-4.0.6" sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" @@ -50676,15 +51526,17 @@ in sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" sources."jsbn-0.1.1" - sources."jscodeshift-0.7.0" + sources."jscodeshift-0.7.1" sources."jsesc-2.5.2" + sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."json5-2.1.2" + sources."json5-2.1.3" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" + sources."keyv-3.0.0" sources."kind-of-6.0.3" sources."latest-version-3.1.0" sources."launch-editor-2.2.1" @@ -50716,7 +51568,7 @@ in sources."type-fest-0.3.1" ]; }) - sources."locate-path-3.0.0" + sources."locate-path-2.0.0" sources."lodash-4.17.15" sources."lodash._reinterpolate-3.0.0" sources."lodash.clonedeep-4.5.0" @@ -50737,6 +51589,7 @@ in sources."wrap-ansi-3.0.1" ]; }) + sources."loglevel-1.6.8" sources."long-4.0.0" sources."loose-envify-1.4.0" sources."lowdb-1.0.0" @@ -50765,9 +51618,10 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" + sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -50776,11 +51630,11 @@ in sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."moment-2.24.0" sources."ms-2.0.0" - sources."mute-stream-0.0.7" - sources."nan-2.14.0" + sources."mute-stream-0.0.8" + sources."nan-2.14.1" sources."nanoid-2.1.11" (sources."nanomatch-1.2.13" // { dependencies = [ @@ -50805,10 +51659,10 @@ in sources."node-modules-regexp-1.0.0" (sources."node-notifier-6.0.0" // { dependencies = [ - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" ]; }) - sources."node-releases-1.1.52" + sources."node-releases-1.1.53" (sources."nodemon-1.19.4" // { dependencies = [ sources."debug-3.2.6" @@ -50823,6 +51677,12 @@ in ]; }) sources."normalize-path-3.0.0" + (sources."normalize-url-2.0.1" // { + dependencies = [ + sources."prepend-http-2.0.0" + sources."sort-keys-2.0.0" + ]; + }) sources."npm-conf-1.1.3" sources."npm-run-path-2.0.2" sources."nth-check-1.0.2" @@ -50860,11 +51720,15 @@ in ]; }) sources."os-tmpdir-1.0.2" + sources."p-cancelable-0.4.1" + sources."p-event-2.3.1" sources."p-finally-1.0.0" - sources."p-limit-2.2.2" - sources."p-locate-3.0.0" + sources."p-is-promise-1.1.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" sources."p-map-2.1.0" - sources."p-try-2.2.0" + sources."p-timeout-2.0.1" + sources."p-try-1.0.0" (sources."package-json-4.0.1" // { dependencies = [ sources."semver-5.7.1" @@ -50902,9 +51766,17 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pirates-4.0.1" - sources."pkg-dir-3.0.0" - sources."pkg-up-3.1.0" - (sources."portfinder-1.0.25" // { + (sources."pkg-dir-3.0.0" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + ]; + }) + sources."pkg-up-2.0.0" + (sources."portfinder-1.0.26" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -50912,7 +51784,7 @@ in }) sources."posix-character-classes-0.1.1" sources."prepend-http-1.0.4" - sources."prismjs-1.19.0" + sources."prismjs-1.20.0" sources."private-0.1.8" sources."process-exists-3.1.0" sources."process-nextick-args-2.0.1" @@ -50920,11 +51792,12 @@ in sources."proxy-addr-2.0.6" sources."ps-list-4.1.0" sources."pseudomap-1.0.2" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."pstree.remy-1.1.7" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" + sources."query-string-5.1.1" sources."range-parser-1.2.1" (sources."raw-body-2.4.0" // { dependencies = [ @@ -50940,7 +51813,7 @@ in ]; }) sources."readdirp-2.2.1" - (sources."recast-0.18.7" // { + (sources."recast-0.18.10" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -50949,7 +51822,7 @@ in sources."redeyed-2.1.1" sources."regenerate-1.4.0" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.10.5" + sources."regenerator-runtime-0.13.5" sources."regenerator-transform-0.14.4" (sources."regex-not-1.0.2" // { dependencies = [ @@ -50972,16 +51845,17 @@ in sources."request-2.88.2" sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" + sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."retry-0.12.0" - sources."rimraf-2.7.1" + sources."rimraf-3.0.2" sources."rss-parser-3.7.6" - sources."run-async-2.4.0" - sources."rxjs-6.5.4" + sources."run-async-2.4.1" + sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -51020,7 +51894,7 @@ in sources."shelljs-0.7.7" sources."shellwords-0.1.1" sources."shortid-2.2.15" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."slash-3.0.0" sources."slice-ansi-0.0.4" sources."snake-case-2.1.0" @@ -51052,16 +51926,18 @@ in sources."kind-of-3.2.2" ]; }) + sources."sort-keys-1.1.2" + sources."sort-keys-length-1.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.16" // { + (sources."source-map-support-0.5.19" // { dependencies = [ sources."source-map-0.6.1" ]; }) sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" (sources."split-string-3.1.0" // { @@ -51094,14 +51970,17 @@ in sources."stealthy-require-1.1.1" sources."steno-0.4.4" sources."streamsearch-0.1.2" + sources."strict-uri-encode-1.1.0" (sources."string-width-2.1.1" // { dependencies = [ sources."ansi-regex-3.0.0" sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -51141,7 +52020,7 @@ in sources."tar-stream-1.6.2" (sources."taskkill-3.1.0" // { dependencies = [ - sources."cross-spawn-7.0.1" + sources."cross-spawn-7.0.2" sources."execa-3.4.0" sources."get-stream-5.1.0" sources."is-stream-2.0.0" @@ -51199,15 +52078,15 @@ in sources."treeify-1.1.0" sources."trim-repeated-1.0.0" sources."ts-invariant-0.4.4" - sources."ts-node-8.8.1" + sources."ts-node-8.10.1" sources."tslib-1.11.1" sources."tty-1.0.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-fest-0.6.0" sources."type-is-1.6.18" - sources."typescript-3.7.5" - sources."unbzip2-stream-1.3.3" + sources."typescript-3.8.3" + sources."unbzip2-stream-1.4.2" (sources."undefsafe-2.0.3" // { dependencies = [ sources."debug-2.6.9" @@ -51261,7 +52140,7 @@ in sources."vue-2.6.11" (sources."vue-cli-plugin-apollo-0.21.3" // { dependencies = [ - sources."cross-spawn-7.0.1" + sources."cross-spawn-7.0.2" sources."execa-3.4.0" sources."fs-extra-8.1.0" sources."get-stream-5.1.0" @@ -51310,12 +52189,12 @@ in sources."yauzl-2.10.0" sources."yn-3.1.1" sources."zen-observable-0.8.15" - sources."zen-observable-ts-0.8.20" + sources."zen-observable-ts-0.8.21" ]; buildInputs = globalBuildInputs; meta = { description = "Command line interface for rapid Vue.js development"; - homepage = https://cli.vuejs.org/; + homepage = "https://cli.vuejs.org/"; license = "MIT"; }; production = true; @@ -51447,12 +52326,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/generator-7.9.4" - sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/generator-7.9.6" + sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@babel/template-7.8.6" - sources."@babel/types-7.9.0" + sources."@babel/types-7.9.6" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -51532,32 +52411,32 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - (sources."@babel/core-7.9.0" // { + (sources."@babel/core-7.9.6" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.9.4" // { + (sources."@babel/generator-7.9.6" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-function-name-7.8.3" + sources."@babel/helper-function-name-7.9.5" sources."@babel/helper-get-function-arity-7.8.3" sources."@babel/helper-member-expression-to-functions-7.8.3" sources."@babel/helper-module-imports-7.8.3" sources."@babel/helper-module-transforms-7.9.0" sources."@babel/helper-optimise-call-expression-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-replace-supers-7.9.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" - sources."@babel/helper-validator-identifier-7.9.0" - sources."@babel/helpers-7.9.2" + sources."@babel/helper-validator-identifier-7.9.5" + sources."@babel/helpers-7.9.6" sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.9.0" - sources."@babel/types-7.9.0" + sources."@babel/traverse-7.9.6" + sources."@babel/types-7.9.6" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -51591,7 +52470,7 @@ in ]; }) sources."globals-11.12.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-color-0.1.7" sources."has-flag-3.0.0" @@ -51602,7 +52481,7 @@ in sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - sources."json5-2.1.2" + sources."json5-2.1.3" sources."jsonfile-4.0.0" sources."jsonlint-1.6.2" sources."lodash-4.17.15" @@ -51621,7 +52500,7 @@ in sources."parse-passwd-1.0.0" sources."path-parse-1.0.6" sources."pkginfo-0.4.1" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."safe-buffer-5.1.2" sources."sax-0.5.8" sources."semver-5.7.1" @@ -51650,20 +52529,20 @@ in asar = nodeEnv.buildNodePackage { name = "asar"; packageName = "asar"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-3.0.2.tgz"; - sha512 = "nFtY0kToUcMEAY8f6qmeyqn+HZzovwlKsbzf5yjEnzOksFzJLTxWvP2jbzItFT04BdaL3CZKRApTr5iRofVq6g=="; + url = "https://registry.npmjs.org/asar/-/asar-3.0.3.tgz"; + sha512 = "k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw=="; }; dependencies = [ sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.3" + sources."@types/node-13.13.4" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" - sources."commander-5.0.0" + sources."commander-5.1.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" sources."glob-7.1.6" @@ -51677,7 +52556,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Creating Electron app packages"; - homepage = https://github.com/electron/asar; + homepage = "https://github.com/electron/asar"; license = "MIT"; }; production = true; @@ -51687,10 +52566,10 @@ in bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; packageName = "bash-language-server"; - version = "1.11.1"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-1.11.1.tgz"; - sha512 = "1fF8RVa/y3yKvMAeorLbapFtRQx85c51V2P+P25U6Cl6HyDzh1IezgmdW6Rau4jg2hDWVN1hCpce36UGjCGE2g=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-1.13.1.tgz"; + sha512 = "9JbJ5i+wD6stYi2U2QF9xPrd1c+g5V2puLRet1y5UXOsqYhvYQt4E/JohRCYuHltbMX48dz8lx5RUcurkffZ7g=="; }; dependencies = [ sources."abab-2.0.3" @@ -51701,7 +52580,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."array-equal-1.0.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -51763,8 +52642,8 @@ in sources."levn-0.3.0" sources."lodash-4.17.15" sources."lodash.sortby-4.7.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" @@ -51775,7 +52654,7 @@ in sources."performance-now-2.1.0" sources."pn-1.1.0" sources."prelude-ls-1.1.2" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."request-2.88.2" @@ -51798,11 +52677,11 @@ in sources."urijs-1.19.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."vscode-jsonrpc-4.0.0" - sources."vscode-languageserver-5.2.1" - sources."vscode-languageserver-protocol-3.14.1" - sources."vscode-languageserver-types-3.14.0" - sources."vscode-uri-1.0.8" + sources."vscode-jsonrpc-5.0.1" + sources."vscode-languageserver-6.1.1" + sources."vscode-languageserver-protocol-3.15.3" + sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-types-3.15.1" sources."w3c-hr-time-1.0.2" sources."web-tree-sitter-0.16.2" sources."webidl-conversions-4.0.2" @@ -51835,7 +52714,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The browser package manager"; - homepage = http://bower.io/; + homepage = "https://bower.io/"; license = "MIT"; }; production = true; @@ -51873,7 +52752,7 @@ in sources."find-up-1.1.2" (sources."fs-extra-0.26.7" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" ]; }) sources."fs.realpath-1.0.0" @@ -51891,27 +52770,27 @@ in sources."is-utf8-0.2.1" (sources."jsonfile-2.4.0" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" ]; }) (sources."klaw-1.3.1" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" ]; }) (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" ]; }) sources."lodash-4.2.1" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.43.0" + sources."mime-db-1.44.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."natives-1.1.6" sources."normalize-package-data-2.5.0" @@ -51924,7 +52803,7 @@ in sources."path-parse-1.0.6" (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" ]; }) sources."pify-2.3.0" @@ -51936,18 +52815,18 @@ in sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."resolve-1.15.1" + sources."resolve-1.17.0" (sources."rimraf-2.7.1" // { dependencies = [ sources."glob-7.1.6" ]; }) sources."semver-5.7.1" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."sprintf-js-1.0.3" @@ -51965,7 +52844,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to fetch bower dependencies"; - homepage = https://github.com/rvl/bower2nix; + homepage = "https://github.com/rvl/bower2nix"; license = "GPL-3.0"; }; production = true; @@ -51975,10 +52854,10 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "16.5.0"; + version = "16.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-16.5.0.tgz"; - sha512 = "6bfI3cl76YLAnCZ75AGu/XPOsqUhRyc0F/olGIJeCxtfxF2HvPKEcmjU9M8oAPxl4uBY1U7Nry33Q6koV3f2iw=="; + url = "https://registry.npmjs.org/browserify/-/browserify-16.5.1.tgz"; + sha512 = "EQX0h59Pp+0GtSRb5rL6OTfrttlzv+uyaUVlK6GX3w11SQ0jKPKyjC/54RhPR2ib2KmfcELM06e8FxcI5XNU2A=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -52009,7 +52888,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."buffer-5.5.0" + sources."buffer-5.2.1" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" @@ -52043,7 +52922,11 @@ in sources."get-assigned-identifiers-1.2.0" sources."glob-7.1.6" sources."has-1.0.3" - sources."hash-base-3.0.4" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" @@ -52066,7 +52949,7 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.4" + sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.2" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -52094,7 +52977,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.0" sources."sha.js-2.4.11" @@ -52166,10 +53049,10 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-10.17.17" + sources."@types/node-13.13.4" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-1.1.1" sources."ansi-styles-2.2.1" sources."append-0.1.1" @@ -52227,7 +53110,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-5.0.0" + sources."commander-5.1.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -52277,7 +53160,7 @@ in sources."form-data-2.3.3" (sources."fs-chunk-store-1.7.0" // { dependencies = [ - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."thunky-1.1.0" ]; }) @@ -52287,7 +53170,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."got-1.2.2" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-ansi-1.0.3" @@ -52343,12 +53226,13 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.3.5" + sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."multicast-dns-4.0.1" sources."mutate.js-0.2.0" @@ -52406,8 +53290,8 @@ in sources."plist-3.0.1" sources."process-nextick-args-2.0.1" sources."promiscuous-0.6.0" - sources."protobufjs-6.8.9" - sources."psl-1.7.0" + sources."protobufjs-6.9.0" + sources."psl-1.8.0" (sources."pump-0.3.5" // { dependencies = [ sources."once-1.2.0" @@ -52417,11 +53301,7 @@ in sources."qap-3.3.1" sources."qs-6.5.2" sources."query-string-1.0.1" - (sources."random-access-file-2.1.3" // { - dependencies = [ - sources."mkdirp-0.5.4" - ]; - }) + sources."random-access-file-2.1.4" sources."random-access-storage-1.4.1" sources."random-iterate-1.0.1" sources."randombytes-2.1.0" @@ -52450,7 +53330,7 @@ in sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.88.2" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."rimraf-2.7.1" sources."router-0.6.2" sources."run-parallel-1.1.9" @@ -52461,7 +53341,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-5.7.1" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" (sources."simple-peer-6.4.4" // { @@ -52488,7 +53368,7 @@ in }) sources."single-line-log-0.4.1" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."speedometer-0.1.4" @@ -52577,7 +53457,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A well-tested CSS minifier"; - homepage = https://github.com/jakubpawlowicz/clean-css; + homepage = "https://github.com/jakubpawlowicz/clean-css"; license = "MIT"; }; production = true; @@ -52587,10 +53467,10 @@ in coc-css = nodeEnv.buildNodePackage { name = "coc-css"; packageName = "coc-css"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-css/-/coc-css-1.2.2.tgz"; - sha512 = "JvZnKZZJZemS70o972OEjfnMGGO2sLpJA3iX1OT3CXmaymPb8CmufboyCVnzGMDMbFL/qHgfjbdw9kOg5ZtzzQ=="; + url = "https://registry.npmjs.org/coc-css/-/coc-css-1.2.3.tgz"; + sha512 = "6/JhWv31agvUvcUVKewpJ0z+A8ZMrRXPNNy+YohNausiw7nqKnBSnLIO0II0hXgjdAryoSGnBC/NjH7Q5P0IDw=="; }; buildInputs = globalBuildInputs; meta = { @@ -52644,10 +53524,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "1.7.7"; + version = "1.7.11"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-1.7.7.tgz"; - sha512 = "7/lIG6RoAp9KCdmcySD/Oa06UO6Nvah0Ra/4j7I1I/S79XVxZDbRry3nhHjD1F5/zfV4zk9UpB2gGRIveF8FEA=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-1.7.11.tgz"; + sha512 = "4fifGZfy4vLhoKV1riYb3FhOuOUyd98KNCeUg2vG6f9qjbL+VXE8rJgigHMuGWBIJMbJf6NTLbPFRjuUewu0LQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -52701,10 +53581,10 @@ in coc-html = nodeEnv.buildNodePackage { name = "coc-html"; packageName = "coc-html"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-html/-/coc-html-1.2.3.tgz"; - sha512 = "8VAdVGQ6eiXOIvh+RBNep1fREpv9JzmjkF3DTls2s9sqQ9B62d3ixe5RM2DLjPawva3v1ttHpBB8RN1QBEwsKQ=="; + url = "https://registry.npmjs.org/coc-html/-/coc-html-1.2.4.tgz"; + sha512 = "gr0GBKeew88n8hcn4fkzIcBruhih7YAqBd7ldsYjoG2qZhjPEj/arYESFOYgooX1jYuxCpQYH526EXXzs4BGRQ=="; }; dependencies = [ sources."typescript-3.8.3" @@ -52739,10 +53619,10 @@ in coc-java = nodeEnv.buildNodePackage { name = "coc-java"; packageName = "coc-java"; - version = "1.4.8"; + version = "1.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/coc-java/-/coc-java-1.4.8.tgz"; - sha512 = "q/GKl4gKhn10+F5pwWm6IiLuf5SnGL5Yps2Nz8Ztprbs7Q0EFvzFW4rJx+L0itKgo3H3p/84mUTYZLdRf5NPBw=="; + url = "https://registry.npmjs.org/coc-java/-/coc-java-1.4.10.tgz"; + sha512 = "WgJuqBpxWM0c1DHDl+UZyDzdD1vdcGInWOMs4bB+dVfCbXktTUEweFty2HViue6G9Clql5hu2+6VB2K3Jx+0Yg=="; }; buildInputs = globalBuildInputs; meta = { @@ -52792,10 +53672,10 @@ in coc-lists = nodeEnv.buildNodePackage { name = "coc-lists"; packageName = "coc-lists"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.7.tgz"; - sha512 = "b+BTZviGOZc7S5cyp9FHn7C/RD65YayWbIA6Oxws/uNwIi6U+T2jrHM4iNS+0g473wmNBdInGyVu1Bz6B1zYbg=="; + url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.8.tgz"; + sha512 = "fQUlrvZ06EacKHDQDNEgO6wW/5u6oY/0dm3JsdqRVfBcK3+hyGf9rfsDom1qxpjBt4CgPiLTRwbDqmvpwaI0Zg=="; }; buildInputs = globalBuildInputs; meta = { @@ -52810,13 +53690,13 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "0.7.4"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.7.4.tgz"; - sha512 = "5gE7m9/Cm/HYFfW4QcpGdVK9waWTQT0pyxSSrvhIjbRjAYv+uspsCUrg6ODxruIakHaRpvqrdhodRt2cnF0NJg=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.8.1.tgz"; + sha512 = "69jOo9oD2JJUo5bMeoV5lcgaAJzMWO7KzWllckc+ZOGB46dE2Qev4MogRnwE/94GI6qc8Cx4RiMoRRLXYIWhyg=="; }; dependencies = [ - sources."@babel/runtime-7.9.2" + sources."@babel/runtime-7.9.6" sources."@chemzqm/neovim-5.1.9" sources."async-2.6.3" sources."await-semaphore-0.1.3" @@ -52833,14 +53713,14 @@ in sources."event-lite-0.1.2" sources."fast-diff-1.2.0" sources."fb-watchman-2.0.1" - sources."flatted-2.0.1" - sources."follow-redirects-1.10.0" - sources."fp-ts-2.5.3" + sources."flatted-2.0.2" + sources."follow-redirects-1.11.0" + sources."fp-ts-2.5.4" sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."ieee754-1.1.13" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -52862,18 +53742,17 @@ in sources."debug-4.1.1" ]; }) - (sources."metals-languageclient-0.1.20" // { + (sources."metals-languageclient-0.2.1" // { dependencies = [ - sources."mkdirp-1.0.3" - sources."semver-7.1.3" - sources."vscode-languageserver-protocol-3.15.0-next.6" + sources."mkdirp-1.0.4" + sources."semver-7.3.2" ]; }) sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."msgpack-lite-0.1.26" (sources."mv-2.1.1" // { @@ -52896,7 +53775,7 @@ in sources."safe-buffer-5.2.0" sources."semver-6.3.0" sources."shell-quote-1.7.2" - (sources."streamroller-2.2.3" // { + (sources."streamroller-2.2.4" // { dependencies = [ sources."debug-4.1.1" ]; @@ -52907,12 +53786,8 @@ in sources."tunnel-0.0.6" sources."universalify-0.1.2" sources."uuid-3.4.0" - sources."vscode-jsonrpc-4.1.0-next.3" - (sources."vscode-languageserver-protocol-3.15.3" // { - dependencies = [ - sources."vscode-jsonrpc-5.0.1" - ]; - }) + sources."vscode-jsonrpc-5.0.1" + sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-types-3.15.1" sources."vscode-uri-2.1.1" sources."which-1.3.1" @@ -52949,14 +53824,14 @@ in coc-prettier = nodeEnv.buildNodePackage { name = "coc-prettier"; packageName = "coc-prettier"; - version = "1.1.11"; + version = "1.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.11.tgz"; - sha512 = "fMo21nZXORQuA1bwXp5k5QzsGRKI8ioebp4JoZaxX6E1Y6O7IexQJ27hNfNeL+CAkIlmAZunMUH1bK9eLe8WPg=="; + url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.12.tgz"; + sha512 = "NHEbnnWjVoWCi9B6o6pzOLiXyntqG0ywvfSWuaBiJZP8eNPl/MP+LlwhGEcfR0f7PVCLjZzb/2a/3giYBXYpEQ=="; }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/highlight-7.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -52967,7 +53842,7 @@ in sources."@typescript-eslint/typescript-estree-1.13.0" sources."acorn-6.4.1" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ajv-keywords-3.4.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -53012,7 +53887,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001036" + sources."caniuse-lite-1.0.30001050" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -53043,7 +53918,7 @@ in }) sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."cliui-4.1.0" sources."clone-regexp-1.0.1" sources."code-point-at-1.1.0" @@ -53062,7 +53937,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.6.4" + sources."core-js-3.6.5" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -53098,7 +53973,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.383" + sources."electron-to-chromium-1.3.427" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -53114,9 +53989,9 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-5.0.1" sources."esprima-4.0.1" - (sources."esquery-1.2.0" // { + (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.0.0" + sources."estraverse-5.1.0" ]; }) sources."esrecurse-4.2.1" @@ -53207,7 +54082,7 @@ in sources."fill-range-2.2.4" sources."find-up-2.1.0" sources."flat-cache-2.0.1" - sources."flatted-2.0.1" + sources."flatted-2.0.2" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."fragment-cache-0.2.1" @@ -53229,13 +54104,9 @@ in ]; }) sources."globjoin-0.1.4" - (sources."gonzales-pe-4.2.4" // { - dependencies = [ - sources."minimist-1.1.3" - ]; - }) + sources."gonzales-pe-4.3.0" sources."got-6.7.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" (sources."has-ansi-2.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -53321,7 +54192,6 @@ in }) sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-regexp-1.0.0" sources."is-retry-allowed-1.2.0" @@ -53356,7 +54226,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.unescape-4.0.1" sources."log-symbols-2.2.0" - sources."loglevel-1.6.7" + sources."loglevel-1.6.8" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -53397,7 +54267,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."mute-stream-0.0.7" (sources."nanomatch-1.2.13" // { @@ -53507,12 +54377,17 @@ in sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" sources."preserve-0.2.0" - sources."prettier-1.19.1" - sources."prettier-eslint-9.0.1" + sources."prettier-2.0.5" + (sources."prettier-eslint-9.0.1" // { + dependencies = [ + sources."prettier-1.19.1" + ]; + }) (sources."prettier-stylelint-0.4.2" // { dependencies = [ sources."debug-3.2.6" sources."ignore-3.3.10" + sources."prettier-1.19.1" ]; }) (sources."prettier-tslint-0.4.2" // { @@ -53570,7 +54445,7 @@ in sources."require-from-string-2.0.2" sources."require-main-filename-1.0.1" sources."require-relative-0.8.7" - sources."resolve-1.15.1" + sources."resolve-1.17.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -53581,8 +54456,8 @@ in sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."rimraf-2.6.3" - sources."run-async-2.4.0" - sources."rxjs-6.5.4" + sources."run-async-2.4.1" + sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -53596,7 +54471,7 @@ in }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."slash-1.0.0" sources."slice-ansi-2.1.0" (sources."snapdragon-0.8.2" // { @@ -53631,7 +54506,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."specificity-0.3.2" @@ -53817,10 +54692,10 @@ in coc-python = nodeEnv.buildNodePackage { name = "coc-python"; packageName = "coc-python"; - version = "1.2.9"; + version = "1.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/coc-python/-/coc-python-1.2.9.tgz"; - sha512 = "ouwZI3MZnCsO/sa5O1rQYzBgPjZ8h3OkJbBYm3DzaX+x49Gp3ARHpvSF4BMphOE16HUD/bHt+RnE+HSSweGFlg=="; + url = "https://registry.npmjs.org/coc-python/-/coc-python-1.2.12.tgz"; + sha512 = "cwZ/uIJT5id6zwBE6RWC/HcGy7uw2hLjC0OyvcjFzidazH73e3fQBBoEMJNtLKgPuAJfNjo4BPu+cDsCSAkCAw=="; }; buildInputs = globalBuildInputs; meta = { @@ -53852,10 +54727,10 @@ in coc-rls = nodeEnv.buildNodePackage { name = "coc-rls"; packageName = "coc-rls"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rls/-/coc-rls-1.1.4.tgz"; - sha512 = "UcQCBSp/Mzt5SR2mS4Qukvn7mBoh86cB1Fb1/oD88+sn1RHRl67eTrdlbswzdrXyd6WotQi62okCuIhyVoqAig=="; + url = "https://registry.npmjs.org/coc-rls/-/coc-rls-1.1.5.tgz"; + sha512 = "JXM7iLC1rlu7IsnGp7Rwt4sCtnaAQdQQ+brC/HhAWApOZjazPclSs+/IwPqot9fwcitjE0me7BiEyErx07qyFw=="; }; buildInputs = globalBuildInputs; meta = { @@ -53867,6 +54742,24 @@ in bypassCache = true; reconstructLock = true; }; + coc-rust-analyzer = nodeEnv.buildNodePackage { + name = "coc-rust-analyzer"; + packageName = "coc-rust-analyzer"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.6.1.tgz"; + sha512 = "zyD0N3RBjBCx3KiBMaT3wwo3p+9VpANIXxhnSy/iByxN8UkgHlH6vawaL3hQu3sEGnhNrlql+A7qZx1qM3fjsg=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "rust-analyzer for Vim/Neovim, works as an extension with coc.nvim"; + homepage = "https://github.com/fannheyward/coc-rust-analyzer#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; coc-smartf = nodeEnv.buildNodePackage { name = "coc-smartf"; packageName = "coc-smartf"; @@ -53888,10 +54781,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.1.22"; + version = "2.1.26"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.1.22.tgz"; - sha512 = "4YXCzFFVc92yr31+cq8CrHEdR63rvaPgGzeFtXH0fU0TpbcZa6sh/hY5HU9Pd0RgNingsJDIg5fE3+cUav88PA=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.1.26.tgz"; + sha512 = "4/XHrxJV5kN0aCrW/Kkw6s19ORs/V26zzZzQ/jFP8BT+HWZegbqPZIP9c+xB9nwknCwa9Tovx3mzcUMq0w0KMw=="; }; buildInputs = globalBuildInputs; meta = { @@ -53929,38 +54822,34 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - (sources."@babel/core-7.9.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."@babel/generator-7.9.4" - sources."@babel/helper-function-name-7.8.3" + sources."@babel/core-7.9.6" + sources."@babel/generator-7.9.6" + sources."@babel/helper-function-name-7.9.5" sources."@babel/helper-get-function-arity-7.8.3" sources."@babel/helper-member-expression-to-functions-7.8.3" sources."@babel/helper-module-imports-7.8.3" sources."@babel/helper-module-transforms-7.9.0" sources."@babel/helper-optimise-call-expression-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-replace-supers-7.9.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" - sources."@babel/helper-validator-identifier-7.9.0" - sources."@babel/helpers-7.9.2" + sources."@babel/helper-validator-identifier-7.9.5" + sources."@babel/helpers-7.9.6" sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.9.0" - sources."@babel/types-7.9.0" + sources."@babel/traverse-7.9.6" + sources."@babel/types-7.9.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.3" + sources."@types/node-13.13.4" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -53981,9 +54870,9 @@ in sources."assign-symbols-1.0.0" sources."astral-regex-1.0.0" sources."atob-2.1.2" - (sources."autoprefixer-9.7.5" // { + (sources."autoprefixer-9.7.6" // { dependencies = [ - sources."postcss-value-parser-4.0.3" + sources."postcss-value-parser-4.1.0" ]; }) sources."bail-1.0.5" @@ -53999,7 +54888,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.11.0" + sources."browserslist-4.12.0" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" @@ -54007,7 +54896,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001036" + sources."caniuse-lite-1.0.30001050" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -54066,7 +54955,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.383" + sources."electron-to-chromium-1.3.427" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -54118,9 +55007,9 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."find-up-3.0.0" + sources."find-up-2.1.0" sources."flat-cache-2.0.1" - sources."flatted-2.0.1" + sources."flatted-2.0.2" sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" @@ -54144,12 +55033,8 @@ in ]; }) sources."globjoin-0.1.4" - (sources."gonzales-pe-4.2.4" // { - dependencies = [ - sources."minimist-1.1.3" - ]; - }) - sources."graceful-fs-4.2.3" + sources."gonzales-pe-4.3.0" + sources."graceful-fs-4.2.4" sources."has-flag-3.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -54209,7 +55094,7 @@ in sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" - sources."json5-2.1.2" + sources."json5-2.1.3" sources."kind-of-6.0.3" sources."known-css-properties-0.14.0" sources."leven-3.1.0" @@ -54218,7 +55103,7 @@ in sources."pify-3.0.0" ]; }) - sources."locate-path-3.0.0" + sources."locate-path-2.0.0" sources."lodash-4.17.15" sources."log-symbols-3.0.0" sources."longest-streak-2.0.4" @@ -54248,15 +55133,11 @@ in sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."nanomatch-1.2.13" - sources."node-releases-1.1.52" - (sources."normalize-package-data-2.5.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."node-releases-1.1.53" + sources."normalize-package-data-2.5.0" sources."normalize-range-0.1.2" sources."normalize-selector-0.2.0" sources."num2fraction-1.2.2" @@ -54276,9 +55157,9 @@ in sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."p-limit-2.2.2" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" sources."parse-entities-1.2.2" sources."parse-json-4.0.0" sources."pascalcase-0.1.1" @@ -54293,9 +55174,9 @@ in }) sources."picomatch-2.2.2" sources."pify-4.0.1" - sources."pkg-up-3.1.0" + sources."pkg-up-2.0.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.27" // { + (sources."postcss-7.0.29" // { dependencies = [ sources."source-map-0.6.1" sources."supports-color-6.1.0" @@ -54321,15 +55202,7 @@ in sources."punycode-2.1.1" sources."quick-lru-1.1.0" sources."read-pkg-3.0.0" - (sources."read-pkg-up-3.0.0" // { - dependencies = [ - sources."find-up-2.1.0" - sources."locate-path-2.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - ]; - }) + sources."read-pkg-up-3.0.0" sources."readable-stream-3.6.0" sources."redent-2.0.0" sources."regex-not-1.0.2" @@ -54339,20 +55212,20 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."rimraf-2.6.3" sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" - sources."semver-6.3.0" + sources."semver-5.7.1" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" ]; }) - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."slash-3.0.0" (sources."slice-ansi-2.1.0" // { dependencies = [ @@ -54393,7 +55266,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."specificity-0.4.1" @@ -54490,7 +55363,7 @@ in ]; }) sources."vfile-location-2.0.6" - sources."vfile-message-2.0.3" + sources."vfile-message-2.0.4" sources."vscode-jsonrpc-4.0.0" sources."vscode-languageserver-5.2.1" (sources."vscode-languageserver-protocol-3.14.1" // { @@ -54543,7 +55416,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/highlight-7.9.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -54567,11 +55440,11 @@ in sources."js-yaml-3.13.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."semver-5.7.1" sources."sprintf-js-1.0.3" sources."supports-color-5.5.0" @@ -54627,10 +55500,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.4.12"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.4.12.tgz"; - sha512 = "JMlIDCgTBXAWh6jsY1c6aMXw50jGRMZoiAYKhX0sYVKrDZznS2ocjKw4m/9yoNPWHIH6gk89BGXXT+7XhtsGWw=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.5.1.tgz"; + sha512 = "33mkWOHgvB7hS/mfhCt4PfHAepnLQaTMvvsCWN3daks7yYnOdeMFplD5UORRRvvcJoOEdQBtXXu960I/Xe4MCg=="; }; dependencies = [ sources."typescript-3.8.3" @@ -54648,14 +55521,14 @@ in coc-vetur = nodeEnv.buildNodePackage { name = "coc-vetur"; packageName = "coc-vetur"; - version = "1.1.9"; + version = "1.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.1.9.tgz"; - sha512 = "lF5s1hBM/92ZKW9JEjkYrbYYuvjcYirBy+8YgDH0s50iV0pVxd8vBGS/x3z50VNRLx2yp6Elu6bDXAQclp/X5g=="; + url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.1.10.tgz"; + sha512 = "dMTBF4NbJ2Rqnh2Lj2Jafi9Fl6gJjHH20fNyztA6DvJ9qEOZgpiXIE2yGznszAHBvJyvoVDE4+qE6Qz5sm3FpA=="; }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/highlight-7.9.0" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -54685,7 +55558,7 @@ in sources."@types/glob-7.1.1" sources."@types/json-schema-7.0.4" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.3" + sources."@types/node-13.13.4" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" @@ -54709,7 +55582,7 @@ in sources."indent-string-4.0.0" ]; }) - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -54827,7 +55700,7 @@ in sources."clean-stack-2.2.0" sources."cli-boxes-2.2.0" sources."cli-cursor-3.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."cliui-4.1.0" sources."clone-1.0.4" sources."clone-response-1.0.2" @@ -54851,7 +55724,7 @@ in sources."config-chain-1.1.12" sources."configstore-4.0.0" sources."copy-descriptor-0.1.1" - sources."core-js-3.6.4" + sources."core-js-3.6.5" sources."core-util-is-1.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" @@ -54861,9 +55734,9 @@ in ]; }) sources."css-parse-2.0.0" - sources."csstype-2.6.9" + sources."csstype-2.6.10" sources."currently-unhandled-0.4.1" - sources."debug-3.2.6" + sources."debug-4.1.1" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -54917,11 +55790,10 @@ in sources."semver-5.7.1" ]; }) - sources."debug-4.1.1" sources."ignore-4.0.6" sources."semver-6.3.0" sources."strip-ansi-5.2.0" - sources."strip-json-comments-3.0.1" + sources."strip-json-comments-3.1.0" ]; }) sources."eslint-plugin-vue-6.2.2" @@ -54930,9 +55802,9 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-6.2.1" sources."esprima-4.0.1" - (sources."esquery-1.2.0" // { + (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.0.0" + sources."estraverse-5.1.0" ]; }) sources."esrecurse-4.2.1" @@ -54994,7 +55866,7 @@ in }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.6.1" + sources."fastq-1.7.0" sources."fault-1.0.4" sources."figures-3.2.0" sources."file-entry-cache-5.0.1" @@ -55007,7 +55879,7 @@ in }) sources."find-up-2.1.0" sources."flat-cache-2.0.1" - sources."flatted-2.0.1" + sources."flatted-2.0.2" sources."fn-name-2.0.1" sources."for-in-1.0.2" sources."for-own-0.1.5" @@ -55042,7 +55914,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."gridsome-helper-json-1.0.3" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { @@ -55134,7 +56006,6 @@ in sources."is-plain-object-2.0.4" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-promise-2.1.0" sources."is-stream-1.1.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" @@ -55142,14 +56013,18 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."js-beautify-1.10.3" + (sources."js-beautify-1.11.0" // { + dependencies = [ + sources."mkdirp-1.0.4" + ]; + }) sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.1.2" + sources."json5-2.1.3" sources."jsonc-parser-1.0.3" sources."keyv-3.1.0" sources."kind-of-6.0.3" @@ -55168,7 +56043,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.rest-4.0.5" sources."lodash.unescape-4.0.1" - sources."loglevel-1.6.7" + sources."loglevel-1.6.8" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -55207,11 +56082,11 @@ in sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."mout-0.5.0" sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."nice-try-1.0.5" @@ -55317,7 +56192,7 @@ in sources."ansi-regex-4.1.0" sources."cli-cursor-2.1.0" sources."cross-spawn-6.0.5" - sources."debug-4.1.1" + sources."debug-3.2.6" sources."eslint-5.16.0" sources."eslint-scope-4.0.3" sources."espree-5.0.1" @@ -55334,7 +56209,6 @@ in (sources."vue-eslint-parser-2.0.3" // { dependencies = [ sources."acorn-5.7.4" - sources."debug-3.2.6" sources."eslint-scope-3.7.3" sources."espree-3.5.4" ]; @@ -55345,7 +56219,7 @@ in sources."pretty-format-23.6.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" - sources."property-information-5.4.0" + sources."property-information-5.5.0" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."pump-3.0.0" @@ -55362,7 +56236,7 @@ in dependencies = [ sources."find-up-4.1.0" sources."locate-path-5.0.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."parse-json-5.0.0" @@ -55403,7 +56277,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."require-relative-0.8.7" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -55411,14 +56285,14 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-2.6.3" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."run-parallel-1.1.9" - sources."rxjs-6.5.4" + sources."rxjs-6.5.5" sources."s.color-0.0.13" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-formatter-0.4.4" + sources."sass-formatter-0.4.5" sources."sax-1.2.4" sources."semver-5.7.1" sources."semver-diff-2.1.0" @@ -55432,7 +56306,7 @@ in sources."shebang-regex-1.0.0" sources."shellsubstitute-1.2.0" sources."sigmund-1.0.1" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."slash-1.0.0" sources."slice-ansi-2.1.0" (sources."snapdragon-0.8.2" // { @@ -55472,7 +56346,7 @@ in sources."source-map-url-0.4.0" sources."space-separated-tokens-1.1.5" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -55545,7 +56419,7 @@ in sources."stylus-supremacy-2.14.0" sources."suf-cli-0.1.1" sources."suf-node-1.1.1" - sources."suf-regex-0.0.14" + sources."suf-regex-0.0.17" sources."supports-color-5.5.0" sources."symbol-0.2.3" (sources."table-5.4.6" // { @@ -55590,6 +56464,7 @@ in }) (sources."unified-engine-6.0.1" // { dependencies = [ + sources."debug-3.2.6" sources."to-vfile-4.0.0" sources."unist-util-stringify-position-1.1.2" sources."vfile-3.0.1" @@ -55635,9 +56510,9 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.1.0" sources."validate-npm-package-license-3.0.4" - sources."vfile-4.0.3" + sources."vfile-4.1.0" sources."vfile-location-2.0.6" - sources."vfile-message-2.0.3" + sources."vfile-message-2.0.4" (sources."vfile-reporter-6.0.1" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -55651,7 +56526,7 @@ in sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" sources."vls-0.2.0" - (sources."vscode-css-languageservice-4.1.1" // { + (sources."vscode-css-languageservice-4.1.2" // { dependencies = [ sources."vscode-uri-2.1.1" ]; @@ -55665,11 +56540,7 @@ in sources."vscode-nls-4.1.2" sources."vscode-uri-1.0.8" sources."vscode-web-custom-data-0.1.3" - (sources."vue-eslint-parser-7.0.0" // { - dependencies = [ - sources."debug-4.1.1" - ]; - }) + sources."vue-eslint-parser-7.0.0" sources."vue-onsenui-helper-json-1.0.2" sources."wcwidth-1.0.1" sources."which-1.3.1" @@ -55713,10 +56584,10 @@ in coc-vimtex = nodeEnv.buildNodePackage { name = "coc-vimtex"; packageName = "coc-vimtex"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vimtex/-/coc-vimtex-1.0.2.tgz"; - sha512 = "C1wz2WSEFEfKWdqxrGVup4hDcinswVuPY+3a47tZZ3RYO8cepRs8wzc2rDX9FYITMckAEWWS581WsRS54jTCWw=="; + url = "https://registry.npmjs.org/coc-vimtex/-/coc-vimtex-1.0.3.tgz"; + sha512 = "zDliD5/CMHMdKm2aOu5lMW2z7Anbkl8cb7JnyQoeG5y6x4huZ1WtNVdkWVJkeyctOot/Js5YGt3imud0e5hLZQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -55768,7 +56639,7 @@ in sources."prettier-1.19.1" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.5.1" + sources."vscode-json-languageservice-3.6.0" sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -55825,7 +56696,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Unfancy JavaScript"; - homepage = http://coffeescript.org/; + homepage = "https://coffeescript.org/"; license = "MIT"; }; production = true; @@ -55835,42 +56706,38 @@ in coinmon = nodeEnv.buildNodePackage { name = "coinmon"; packageName = "coinmon"; - version = "0.0.22"; + version = "0.0.24"; src = fetchurl { - url = "https://registry.npmjs.org/coinmon/-/coinmon-0.0.22.tgz"; - sha512 = "IiL5bbisnZ4U3IVNn3l5Z8d1RnQ9yvzWuhAJU5VtSGoeYfdCn7jUlliwH02vaFOSggDkMoKdh8eh6OlgqmMu6g=="; + url = "https://registry.npmjs.org/coinmon/-/coinmon-0.0.24.tgz"; + sha512 = "pb/zklwkyZrdxQB1zm6n46h+NrHPW+L0H8Q9ikp8v31AELgaZlU7c/0ArwF6sACdMDmurfGP2lOKsENnv7xN3g=="; }; dependencies = [ - sources."ansi-regex-2.1.1" + sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."axios-0.17.1" + sources."axios-0.19.2" sources."chalk-2.4.2" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" - sources."cli-table2-0.2.0" - sources."code-point-at-1.1.0" + sources."cli-table3-0.5.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.4.0" sources."commander-2.20.3" - sources."debug-3.2.6" + sources."debug-3.1.0" sources."escape-string-regexp-1.0.5" - sources."follow-redirects-1.10.0" + sources."follow-redirects-1.5.10" sources."has-flag-3.0.0" - sources."humanize-plus-1.8.2" - sources."is-buffer-1.1.6" - sources."is-fullwidth-code-point-1.0.0" - sources."lodash-3.10.1" + sources."is-fullwidth-code-point-2.0.0" sources."log-symbols-2.2.0" sources."mimic-fn-1.2.0" - sources."ms-2.1.2" - sources."number-is-nan-1.0.1" + sources."ms-2.0.0" + sources."object-assign-4.1.1" sources."onetime-2.0.1" sources."ora-1.4.0" sources."restore-cursor-2.0.0" - sources."signal-exit-3.0.2" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" + sources."signal-exit-3.0.3" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" sources."supports-color-5.5.0" ]; buildInputs = globalBuildInputs; @@ -55909,7 +56776,7 @@ in sources."eventemitter3-4.0.0" sources."fast-safe-stringify-2.0.7" sources."fecha-2.3.3" - sources."follow-redirects-1.10.0" + sources."follow-redirects-1.11.0" sources."http-proxy-1.18.0" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" @@ -55967,10 +56834,10 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.3" + sources."@types/node-13.13.4" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -56044,7 +56911,7 @@ in }) sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -56188,7 +57055,7 @@ in sources."get-stream-3.0.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" @@ -56242,7 +57109,6 @@ in sources."is-obj-1.0.1" sources."is-path-inside-1.0.1" sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" @@ -56280,8 +57146,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -56355,7 +57221,7 @@ in sources."promzard-0.3.0" sources."proxy-addr-2.0.6" sources."pseudomap-1.0.2" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."q-1.5.1" @@ -56385,13 +57251,13 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" sources."ret-0.1.15" - sources."run-async-2.4.0" - sources."rxjs-6.5.4" + sources."run-async-2.4.1" + sources."rxjs-6.5.5" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -56412,7 +57278,7 @@ in sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."slash-2.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -56446,7 +57312,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -56506,7 +57372,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."underscore-1.9.2" + sources."underscore-1.10.2" sources."union-value-1.0.1" sources."unique-string-1.0.0" sources."universalify-0.1.2" @@ -56540,7 +57406,7 @@ in sources."verror-1.10.0" sources."which-1.3.1" sources."widest-line-2.0.1" - sources."windows-release-3.2.0" + sources."windows-release-3.3.0" (sources."with-open-file-0.1.7" // { dependencies = [ sources."pify-4.0.1" @@ -56566,23 +57432,28 @@ in cpy-cli = nodeEnv.buildNodePackage { name = "cpy-cli"; packageName = "cpy-cli"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.1.0.tgz"; - sha512 = "LJhHvFragWvIsJH1kjhzZwGSagukewJZ5nV5yjMc5TILs+Z/CbZSvX0W9t9XC26Mw32j56UHjR3co5kAXaeTwg=="; + url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.1.1.tgz"; + sha512 = "HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg=="; }; dependencies = [ + sources."@babel/code-frame-7.8.3" + sources."@babel/helper-validator-identifier-7.9.5" + sources."@babel/highlight-7.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.3" + sources."@types/minimist-1.2.0" + sources."@types/node-13.13.4" + sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.0.1" + sources."ansi-styles-3.2.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-find-index-1.0.2" sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."array-unique-0.3.2" @@ -56603,8 +57474,9 @@ in }) sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" - sources."camelcase-4.1.0" - sources."camelcase-keys-4.2.0" + sources."camelcase-5.3.1" + sources."camelcase-keys-6.2.2" + sources."chalk-2.4.2" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -56624,12 +57496,13 @@ in }) sources."clean-stack-2.2.0" sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."copy-descriptor-0.1.1" sources."cp-file-7.0.0" sources."cpy-8.1.0" - sources."currently-unhandled-0.4.1" sources."debug-2.6.9" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { @@ -56641,6 +57514,7 @@ in sources."define-property-2.0.2" sources."dir-glob-2.2.2" sources."error-ex-1.3.2" + sources."escape-string-regexp-1.0.5" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -56676,7 +57550,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."find-up-2.1.0" + sources."find-up-4.1.0" sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" @@ -56689,7 +57563,9 @@ in }) sources."glob-to-regexp-0.3.0" sources."globby-9.2.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" + sources."hard-rejection-2.1.0" + sources."has-flag-3.0.0" (sources."has-glob-1.0.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -56724,25 +57600,22 @@ in sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isobject-3.0.1" + sources."js-tokens-4.0.0" sources."json-parse-better-errors-1.0.2" sources."junk-3.1.0" sources."kind-of-6.0.3" - (sources."load-json-file-4.0.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."locate-path-2.0.0" - sources."loud-rejection-1.6.0" - sources."make-dir-3.0.2" + sources."lines-and-columns-1.1.6" + sources."locate-path-5.0.0" + sources."make-dir-3.1.0" sources."map-cache-0.2.2" - sources."map-obj-2.0.0" + sources."map-obj-4.1.0" sources."map-visit-1.0.0" - sources."meow-5.0.0" + sources."meow-6.1.1" sources."merge2-1.3.0" sources."micromatch-3.1.10" + sources."min-indent-1.0.0" sources."minimatch-3.0.4" - (sources."minimist-options-3.0.2" // { + (sources."minimist-options-4.0.2" // { dependencies = [ sources."arrify-1.0.1" ]; @@ -56788,15 +57661,15 @@ in ]; }) sources."p-finally-1.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" sources."p-map-3.0.0" sources."p-timeout-2.0.1" - sources."p-try-1.0.0" - sources."parse-json-4.0.0" + sources."p-try-2.2.0" + sources."parse-json-5.0.0" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" (sources."path-type-3.0.0" // { @@ -56806,18 +57679,22 @@ in }) sources."pify-4.0.1" sources."posix-character-classes-0.1.1" - sources."quick-lru-1.1.0" - sources."read-pkg-3.0.0" - sources."read-pkg-up-3.0.0" - (sources."redent-2.0.0" // { + sources."quick-lru-4.0.1" + (sources."read-pkg-5.2.0" // { dependencies = [ - sources."indent-string-3.2.0" + sources."type-fest-0.6.0" ]; }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) + sources."redent-3.0.0" sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."safe-regex-1.1.0" @@ -56827,7 +57704,6 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."signal-exit-3.0.2" sources."slash-2.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -56861,7 +57737,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -56882,8 +57758,8 @@ in sources."kind-of-5.1.0" ]; }) - sources."strip-bom-3.0.0" - sources."strip-indent-2.0.0" + sources."strip-indent-3.0.0" + sources."supports-color-5.5.0" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -56891,7 +57767,8 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - sources."trim-newlines-2.0.0" + sources."trim-newlines-3.0.0" + sources."type-fest-0.13.1" sources."union-value-1.0.1" (sources."unset-value-1.0.0" // { dependencies = [ @@ -56907,7 +57784,7 @@ in sources."use-3.1.1" sources."validate-npm-package-license-3.0.4" sources."wrappy-1.0.2" - sources."yargs-parser-10.1.0" + sources."yargs-parser-18.1.3" ]; buildInputs = globalBuildInputs; meta = { @@ -56938,7 +57815,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-13.9.3" + sources."@types/node-13.13.4" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -56952,7 +57829,7 @@ in }) sources."chardet-0.4.2" sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combine-errors-3.0.3" @@ -56999,7 +57876,6 @@ in ]; }) sources."is-fullwidth-code-point-2.0.0" - sources."is-promise-2.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."lodash-4.17.15" @@ -57013,8 +57889,8 @@ in sources."lru-cache-4.1.5" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimist-1.2.5" sources."ms-2.1.2" @@ -57026,12 +57902,12 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."qs-6.9.2" + sources."qs-6.9.4" sources."quicktask-1.1.0" sources."raf-3.3.2" sources."readable-stream-2.3.7" sources."restore-cursor-2.0.0" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.2" @@ -57039,7 +57915,7 @@ in sources."setimmediate-1.0.5" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."snabbdom-0.7.0" sources."snabbdom-selector-1.2.1" sources."sorted-immutable-list-1.1.0" @@ -57098,7 +57974,7 @@ in sources."chalk-3.0.0" sources."chardet-0.7.0" sources."cli-cursor-3.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-4.1.0" @@ -57121,7 +57997,7 @@ in sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-flag-4.0.0" sources."hyperquest-2.1.3" sources."iconv-lite-0.4.24" @@ -57138,7 +58014,6 @@ in ]; }) sources."is-fullwidth-code-point-3.0.0" - sources."is-promise-2.1.0" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."jsonfile-4.0.0" @@ -57146,7 +58021,7 @@ in sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."once-1.4.0" @@ -57158,14 +58033,14 @@ in sources."readable-stream-1.1.14" sources."restore-cursor-3.1.0" sources."rimraf-2.7.1" - sources."run-async-2.4.0" - sources."rxjs-6.5.4" + sources."run-async-2.4.1" + sources."rxjs-6.5.5" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-6.3.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" (sources."string-width-4.2.0" // { dependencies = [ sources."strip-ansi-6.0.0" @@ -57216,44 +58091,15 @@ in create-react-native-app = nodeEnv.buildNodePackage { name = "create-react-native-app"; packageName = "create-react-native-app"; - version = "2.0.2"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-2.0.2.tgz"; - sha512 = "xsPgOifP3TJtd+UvqhB4X9amYJq548m8vupcqBukWll2gi3UBu2KigWNtASwVUd6UTYlrJHw3g5Bow9c+/UBmQ=="; + url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.1.1.tgz"; + sha512 = "l4f3E7chtJp4QxiPBxEAE6gFSSF/gm+RxTfyQzxsl3nTGe1wHUU9AYUQgXQ86zfyq7n8gGmRd3MS5wYLodKo8g=="; }; - dependencies = [ - sources."ansi-styles-3.2.1" - sources."babel-runtime-6.26.0" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."core-js-2.6.11" - sources."cross-spawn-5.1.0" - sources."escape-string-regexp-1.0.5" - sources."fs-extra-4.0.3" - sources."graceful-fs-4.2.3" - sources."has-flag-3.0.0" - sources."isexe-2.0.0" - sources."jsonfile-4.0.0" - sources."lru-cache-4.1.5" - sources."minimist-1.2.5" - sources."path-exists-3.0.0" - sources."pseudomap-1.0.2" - sources."regenerator-runtime-0.11.1" - sources."semver-5.7.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."source-map-0.5.7" - sources."source-map-support-0.4.18" - sources."supports-color-5.5.0" - sources."universalify-0.1.2" - sources."which-1.3.1" - sources."yallist-2.1.2" - ]; buildInputs = globalBuildInputs; meta = { description = "Create React Native apps with no build configuration."; - homepage = https://github.com/react-community/create-react-native-app; + homepage = "https://github.com/expo/create-react-native-app"; license = "BSD-3-Clause"; }; production = true; @@ -57275,7 +58121,7 @@ in buildInputs = globalBuildInputs; meta = { description = "CSSLint"; - homepage = http://csslint.net/; + homepage = "http://csslint.net/"; # https is broken license = "MIT"; }; production = true; @@ -57292,7 +58138,7 @@ in }; dependencies = [ sources."abstract-random-access-1.1.2" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-align-2.0.0" sources."ansi-diff-1.1.1" sources."ansi-regex-3.0.0" @@ -57454,7 +58300,7 @@ in }) sources."dns-packet-4.2.0" sources."dns-socket-3.0.0" - sources."dom-walk-0.1.1" + sources."dom-walk-0.1.2" sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" sources."duplexify-3.7.1" @@ -57525,7 +58371,7 @@ in sources."global-4.3.2" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" @@ -57539,7 +58385,7 @@ in sources."http-signature-1.2.0" (sources."hypercore-7.7.1" // { dependencies = [ - sources."codecs-2.0.0" + sources."codecs-2.1.0" sources."unordered-set-2.0.1" ]; }) @@ -57571,7 +58417,7 @@ in sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" sources."is-fullwidth-code-point-2.0.0" - sources."is-function-1.0.1" + sources."is-function-1.0.2" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" (sources."is-number-3.0.0" // { @@ -57626,27 +58472,28 @@ in sources."menu-string-1.3.0" sources."merkle-tree-stream-3.0.3" sources."micromatch-3.1.10" - sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-2.4.5" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-2.1.0" sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mirror-folder-3.0.0" + sources."mirror-folder-3.1.0" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" + sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."multi-random-access-2.1.1" - sources."multicast-dns-7.2.1" + sources."multicast-dns-7.2.2" sources."multistream-2.1.1" sources."mute-stream-0.0.8" - sources."mutexify-1.2.0" - sources."nan-2.14.0" + sources."mutexify-1.3.0" + sources."nan-2.14.1" sources."nanoassert-1.1.0" sources."nanobus-4.4.0" sources."nanoguard-1.3.0" @@ -57655,7 +58502,7 @@ in sources."nanotiming-7.3.1" sources."napi-macros-2.0.0" sources."ncp-1.0.1" - sources."neat-input-1.11.0" + sources."neat-input-1.11.1" sources."neat-log-3.1.0" sources."neat-spinner-1.0.0" sources."neat-tasks-1.1.1" @@ -57706,11 +58553,11 @@ in ]; }) sources."pseudomap-1.0.2" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."random-access-file-2.1.3" + sources."random-access-file-2.1.4" sources."random-access-memory-3.1.1" sources."random-access-storage-1.4.1" sources."randombytes-2.1.0" @@ -57749,7 +58596,7 @@ in }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" (sources."signed-varint-2.0.1" // { dependencies = [ sources."varint-5.0.0" @@ -57793,7 +58640,7 @@ in sources."sodium-javascript-0.5.6" (sources."sodium-native-2.4.9" // { dependencies = [ - sources."node-gyp-build-4.2.1" + sources."node-gyp-build-4.2.2" ]; }) sources."sodium-universal-2.0.0" @@ -57899,9 +58746,9 @@ in sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - (sources."utp-native-2.1.7" // { + (sources."utp-native-2.1.10" // { dependencies = [ - sources."node-gyp-build-4.2.1" + sources."node-gyp-build-4.2.2" sources."readable-stream-3.6.0" sources."unordered-set-2.0.1" ]; @@ -57929,7 +58776,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Dat is the package manager for data. Easily share and version control data."; - homepage = https://datproject.org/; + homepage = "https://datproject.org/"; license = "BSD-3-Clause"; }; production = true; @@ -57950,7 +58797,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A DHCP server written in JavaScript"; - homepage = https://github.com/infusion/node-dhcp; + homepage = "https://github.com/infusion/node-dhcp"; license = "MIT OR GPL-2.0"; }; production = true; @@ -58028,11 +58875,11 @@ in sources."merge-descriptors-0.0.2" sources."methods-1.1.2" sources."mime-1.2.11" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-0.0.10" sources."ms-0.7.0" - sources."nan-2.14.0" + sources."nan-2.14.1" (sources."native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" // { dependencies = [ sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" @@ -58095,7 +58942,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A blockchain-based DNS + HTTPS server that fixes HTTPS security, and more!"; - homepage = https://github.com/okTurtles/dnschain; + homepage = "https://github.com/okTurtles/dnschain"; license = "MPL-2.0"; }; production = true; @@ -58105,16 +58952,16 @@ in dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { name = "dockerfile-language-server-nodejs"; packageName = "dockerfile-language-server-nodejs"; - version = "0.0.22"; + version = "0.0.24"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.22.tgz"; - sha512 = "Vf/Zieb/BBs/VQnaxntshlTExR3FyE6FO1NxS+yO3SVqzcEVHYkHMC8f/+XRRROVHFh41YfzVfPhSxdCxfbviQ=="; + url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.24.tgz"; + sha512 = "tG0cE6yIyj80eKHMbDBMNPHc1l40GW8v7b8jeDRs0Jv42boG0s6DEsM/eDFQw92mwAtBry07mB1tM+jSwqGzJw=="; }; dependencies = [ - sources."dockerfile-ast-0.0.20" - (sources."dockerfile-language-service-0.0.9" // { + sources."dockerfile-ast-0.0.25" + (sources."dockerfile-language-service-0.0.12" // { dependencies = [ - (sources."dockerfile-utils-0.0.14" // { + (sources."dockerfile-utils-0.0.16" // { dependencies = [ sources."vscode-languageserver-types-3.6.0" ]; @@ -58145,19 +58992,19 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.23.0"; + version = "6.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.23.0.tgz"; - sha512 = "Nj/zXibNz0WzPexc8rx9QU7Y28pQSSAadmD2bZbSY+N4axvb8IYyCq6pN+2R+QhxdejKZ408EuLRr+37DmEnjw=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.28.0.tgz"; + sha512 = "JVT1VyJqRdSqg9xFy7FQtdcHlWfBLiW08DUtJZaRRsU/4mEvLtUXU1y+h6n3nRtoe5HplVMsP/Dlwj0jUMSPug=="; }; dependencies = [ sources."JSONStream-1.3.5" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.644.0" + sources."aws-sdk-2.669.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" sources."base64-js-1.3.1" @@ -58206,18 +59053,17 @@ in sources."jsprim-1.4.1" sources."lodash-4.17.15" sources."lossless-json-1.0.3" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" - sources."minimist-0.0.10" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" + sources."minimist-1.2.5" sources."oauth-sign-0.9.0" sources."once-1.4.0" - sources."optimist-0.6.1" sources."p-finally-1.0.0" - sources."p-queue-6.3.0" + sources."p-queue-6.4.0" sources."p-timeout-3.2.0" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-1.3.2" sources."qs-6.5.2" @@ -58231,11 +59077,7 @@ in sources."requestretry-4.1.0" sources."s3-stream-upload-2.0.2" sources."s3signed-0.1.0" - (sources."s3urls-1.5.2" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."s3urls-1.5.2" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sax-1.2.1" @@ -58267,7 +59109,6 @@ in sources."uuid-3.3.2" sources."verror-1.10.0" sources."when-3.7.8" - sources."wordwrap-0.0.3" sources."wrappy-1.0.2" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" @@ -58310,45 +59151,46 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/core-7.9.0" - sources."@babel/generator-7.9.4" + sources."@babel/core-7.9.6" + sources."@babel/generator-7.9.6" sources."@babel/helper-annotate-as-pure-7.8.3" sources."@babel/helper-builder-react-jsx-7.9.0" - sources."@babel/helper-builder-react-jsx-experimental-7.9.0" - sources."@babel/helper-function-name-7.8.3" + sources."@babel/helper-builder-react-jsx-experimental-7.9.5" + sources."@babel/helper-function-name-7.9.5" sources."@babel/helper-get-function-arity-7.8.3" sources."@babel/helper-member-expression-to-functions-7.8.3" sources."@babel/helper-module-imports-7.8.3" sources."@babel/helper-module-transforms-7.9.0" sources."@babel/helper-optimise-call-expression-7.8.3" sources."@babel/helper-plugin-utils-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-replace-supers-7.9.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" - sources."@babel/helper-validator-identifier-7.9.0" - sources."@babel/helpers-7.9.2" + sources."@babel/helper-validator-identifier-7.9.5" + sources."@babel/helpers-7.9.6" sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" - sources."@babel/plugin-proposal-object-rest-spread-7.9.0" + sources."@babel/parser-7.9.6" + sources."@babel/plugin-proposal-object-rest-spread-7.9.6" sources."@babel/plugin-syntax-jsx-7.8.3" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.8.8" + sources."@babel/plugin-transform-destructuring-7.9.5" + sources."@babel/plugin-transform-parameters-7.9.5" sources."@babel/plugin-transform-react-jsx-7.9.4" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.9.0" - sources."@babel/types-7.9.0" - sources."@sindresorhus/is-2.1.0" + sources."@babel/traverse-7.9.6" + sources."@babel/types-7.9.6" + sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/color-name-1.1.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-13.9.3" + sources."@types/node-13.13.4" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -58370,7 +59212,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.1" + sources."camelcase-keys-6.2.2" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-cursor-3.1.0" @@ -58383,7 +59225,7 @@ in }) sources."color-convert-1.9.3" sources."color-name-1.1.3" - (sources."conf-6.2.1" // { + (sources."conf-6.2.4" // { dependencies = [ sources."semver-6.3.0" ]; @@ -58415,7 +59257,7 @@ in sources."gensync-1.0.0-beta.1" sources."get-stream-4.1.0" sources."globals-11.12.0" - (sources."got-10.6.0" // { + (sources."got-10.7.0" // { dependencies = [ sources."get-stream-5.1.0" ]; @@ -58449,12 +59291,13 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" + sources."is-docker-2.0.0" sources."is-fullwidth-code-point-3.0.0" sources."is-obj-2.0.0" sources."is-plain-obj-1.1.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" @@ -58462,7 +59305,7 @@ in sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."json-schema-typed-7.0.3" - sources."json5-2.1.2" + sources."json5-2.1.3" sources."keyv-4.0.0" sources."lines-and-columns-1.1.6" sources."locate-path-3.0.0" @@ -58486,21 +59329,21 @@ in }) sources."loose-envify-1.4.0" sources."lowercase-keys-2.0.0" - (sources."make-dir-3.0.2" // { + (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."map-age-cleaner-0.1.3" sources."map-obj-4.1.0" - (sources."mem-6.0.1" // { + (sources."mem-6.1.0" // { dependencies = [ sources."mimic-fn-3.0.0" ]; }) - (sources."meow-6.1.0" // { + (sources."meow-6.1.1" // { dependencies = [ - sources."type-fest-0.8.1" + sources."type-fest-0.13.1" ]; }) sources."mimic-fn-2.1.0" @@ -58524,7 +59367,7 @@ in sources."p-defer-1.0.0" sources."p-event-4.1.0" sources."p-finally-1.0.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-timeout-2.0.1" sources."p-try-2.2.0" @@ -58555,7 +59398,7 @@ in ]; }) sources."redent-3.0.0" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-from-3.0.0" sources."responselike-2.0.0" sources."restore-cursor-3.1.0" @@ -58564,7 +59407,7 @@ in sources."semver-5.7.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."skin-tone-1.0.0" (sources."slice-ansi-3.0.0" // { dependencies = [ @@ -58575,7 +59418,7 @@ in }) sources."source-map-0.5.7" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" (sources."string-length-3.1.0" // { @@ -58609,7 +59452,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."yargs-parser-18.1.1" + sources."yargs-parser-18.1.3" sources."yoga-layout-prebuilt-1.9.5" ]; buildInputs = globalBuildInputs; @@ -58633,7 +59476,7 @@ in buildInputs = globalBuildInputs; meta = { description = "EmojiOne is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG formats provided for the emoji images."; - homepage = https://www.emojione.com/; + homepage = "https://www.emojione.com/"; }; production = true; bypassCache = true; @@ -58649,12 +59492,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/highlight-7.9.0" sources."@types/color-name-1.1.1" sources."acorn-7.1.1" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -58670,7 +59513,7 @@ in sources."chalk-2.4.2" sources."chardet-0.7.0" sources."cli-cursor-3.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."concat-map-0.0.1" @@ -58689,9 +59532,9 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-6.2.1" sources."esprima-4.0.1" - (sources."esquery-1.2.0" // { + (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.0.0" + sources."estraverse-5.1.0" ]; }) sources."esrecurse-4.2.1" @@ -58704,7 +59547,7 @@ in sources."figures-3.2.0" sources."file-entry-cache-5.0.1" sources."flat-cache-2.0.1" - sources."flatted-2.0.1" + sources."flatted-2.0.2" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" @@ -58731,7 +59574,6 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" - sources."is-promise-2.1.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" @@ -58742,7 +59584,7 @@ in sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."natural-compare-1.4.0" @@ -58761,13 +59603,13 @@ in sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."run-async-2.4.0" - sources."rxjs-6.5.4" + sources."run-async-2.4.1" + sources."rxjs-6.5.5" sources."safer-buffer-2.1.2" sources."semver-6.3.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" (sources."slice-ansi-2.1.0" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -58784,7 +59626,7 @@ in sources."ansi-regex-4.1.0" ]; }) - sources."strip-json-comments-3.0.1" + sources."strip-json-comments-3.1.0" sources."supports-color-5.5.0" (sources."table-5.4.6" // { dependencies = [ @@ -58809,7 +59651,7 @@ in buildInputs = globalBuildInputs; meta = { description = "An AST-based pattern checker for JavaScript."; - homepage = https://eslint.org/; + homepage = "https://eslint.org/"; license = "MIT"; }; production = true; @@ -58826,12 +59668,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/highlight-7.9.0" sources."@types/color-name-1.1.1" sources."acorn-7.1.1" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -58847,7 +59689,7 @@ in sources."chalk-2.4.2" sources."chardet-0.7.0" sources."cli-cursor-3.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."concat-map-0.0.1" @@ -58868,9 +59710,9 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-6.2.1" sources."esprima-4.0.1" - (sources."esquery-1.2.0" // { + (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.0.0" + sources."estraverse-5.1.0" ]; }) sources."esrecurse-4.2.1" @@ -58883,7 +59725,7 @@ in sources."figures-3.2.0" sources."file-entry-cache-5.0.1" sources."flat-cache-2.0.1" - sources."flatted-2.0.1" + sources."flatted-2.0.2" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" @@ -58910,7 +59752,6 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" - sources."is-promise-2.1.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" @@ -58921,7 +59762,7 @@ in sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."nanolru-1.0.0" @@ -58939,17 +59780,17 @@ in sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-2.0.1" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."run-async-2.4.0" - sources."rxjs-6.5.4" + sources."run-async-2.4.1" + sources."rxjs-6.5.5" sources."safer-buffer-2.1.2" sources."semver-6.3.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" (sources."slice-ansi-2.1.0" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -58966,7 +59807,7 @@ in sources."ansi-regex-4.1.0" ]; }) - sources."strip-json-comments-3.0.1" + sources."strip-json-comments-3.1.0" sources."supports-color-5.5.0" (sources."table-5.4.6" // { dependencies = [ @@ -58991,7 +59832,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Makes eslint the fastest linter on the planet"; - homepage = https://github.com/mantoni/eslint_d.js; + homepage = "https://github.com/mantoni/eslint_d.js"; license = "MIT"; }; production = true; @@ -59007,7 +59848,7 @@ in sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; }; dependencies = [ - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -59018,6 +59859,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.9.1" sources."bcrypt-pbkdf-1.0.2" + sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.1" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" @@ -59042,18 +59884,18 @@ in sources."escape-string-regexp-1.0.5" sources."exit-hook-1.1.1" sources."extend-3.0.2" - sources."extract-zip-1.6.7" + sources."extract-zip-1.7.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" - sources."fd-slicer-1.0.1" + sources."fd-slicer-1.1.0" sources."find-up-1.1.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs-extra-1.0.0" sources."get-stdin-4.0.1" sources."getpass-0.1.7" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-ansi-2.0.0" @@ -59091,15 +59933,11 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimist-1.2.5" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.5" sources."mkpath-1.0.0" sources."ms-2.0.0" sources."node-phantom-simple-2.2.4" @@ -59131,7 +59969,7 @@ in sources."process-nextick-args-2.0.1" sources."progress-1.1.8" sources."promise-phantom-3.1.6" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."read-pkg-1.1.0" @@ -59141,14 +59979,14 @@ in sources."repeating-2.0.1" sources."request-2.88.2" sources."request-progress-2.0.1" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."restore-cursor-1.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.7.1" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."sshpk-1.16.1" @@ -59170,7 +60008,7 @@ in sources."validate-npm-package-license-3.0.4" sources."verror-1.10.0" sources."which-1.3.1" - sources."yauzl-2.4.1" + sources."yauzl-2.10.0" sources."zen-observable-0.5.2" ]; buildInputs = globalBuildInputs; @@ -59193,7 +60031,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/helper-validator-identifier-7.9.5" (sources."@babel/highlight-7.9.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -59214,16 +60052,16 @@ in sources."arrify-2.0.1" sources."astral-regex-2.0.0" sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.1" + sources."camelcase-keys-6.2.2" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" sources."cli-truncate-2.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."cross-spawn-7.0.1" + sources."cross-spawn-7.0.2" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -59239,7 +60077,7 @@ in sources."external-editor-3.1.0" sources."figures-3.2.0" sources."find-up-4.1.0" - (sources."fkill-7.0.0" // { + (sources."fkill-7.0.1" // { dependencies = [ sources."ps-list-7.0.0" ]; @@ -59267,7 +60105,6 @@ in sources."is-arrayish-0.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" - sources."is-promise-2.1.0" sources."is-stream-2.0.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" @@ -59277,9 +60114,9 @@ in sources."lodash-4.17.15" sources."lru-cache-4.1.5" sources."map-obj-4.1.0" - (sources."meow-6.1.0" // { + (sources."meow-6.1.1" // { dependencies = [ - sources."type-fest-0.8.1" + sources."type-fest-0.13.1" ]; }) sources."merge-stream-2.0.0" @@ -59298,7 +60135,7 @@ in sources."onetime-5.1.0" sources."os-tmpdir-1.0.2" sources."p-finally-2.0.1" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."parse-json-5.0.0" @@ -59335,18 +60172,18 @@ in ]; }) sources."redent-3.0.0" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."restore-cursor-3.1.0" - sources."run-async-2.4.0" - sources."rxjs-6.5.4" + sources."run-async-2.4.1" + sources."rxjs-6.5.5" sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."slice-ansi-3.0.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."string-width-4.2.0" @@ -59369,7 +60206,7 @@ in sources."which-2.0.2" sources."wrappy-1.0.2" sources."yallist-2.1.2" - sources."yargs-parser-18.1.1" + sources."yargs-parser-18.1.3" ]; buildInputs = globalBuildInputs; meta = { @@ -59399,11 +60236,13 @@ in sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" + sources."array-filter-1.0.0" sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" sources."async-1.5.2" sources."async-each-1.0.3" sources."atob-2.1.2" + sources."available-typed-arrays-1.0.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -59472,7 +60311,7 @@ in sources."debug-2.6.9" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - sources."deep-equal-2.0.1" + sources."deep-equal-2.0.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."defined-0.0.0" @@ -59527,6 +60366,7 @@ in ]; }) sources."for-in-1.0.2" + sources."foreach-2.0.5" sources."forever-monitor-2.0.0" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" @@ -59543,7 +60383,7 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."has-value-1.0.0" @@ -59583,6 +60423,7 @@ in sources."is-set-2.0.1" sources."is-string-1.0.5" sources."is-symbol-1.0.3" + sources."is-typed-array-1.1.3" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."is-windows-1.0.2" @@ -59599,14 +60440,14 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.10" sources."mixin-deep-1.3.2" - (sources."mkdirp-0.5.4" // { + (sources."mkdirp-0.5.5" // { dependencies = [ sources."minimist-1.2.5" ]; }) sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."nconf-0.10.0" sources."ncp-0.4.2" @@ -59628,7 +60469,7 @@ in ]; }) sources."object-inspect-1.7.0" - sources."object-is-1.0.2" + sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.0" @@ -59735,8 +60576,10 @@ in ]; }) sources."string-width-1.0.2" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-0.1.3" @@ -59782,6 +60625,7 @@ in }) sources."which-boxed-primitive-1.0.1" sources."which-collection-1.0.1" + sources."which-typed-array-1.1.2" sources."window-size-0.1.4" (sources."winston-0.8.3" // { dependencies = [ @@ -59879,11 +60723,11 @@ in sources."lodash.get-4.4.2" sources."looper-4.0.0" sources."lrucache-1.0.3" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-1.2.5" - sources."mkdirp-0.5.4" - sources."moment-2.24.0" + sources."mkdirp-0.5.5" + sources."moment-2.25.3" sources."moo-0.5.1" sources."ms-2.1.2" sources."multicb-1.2.2" @@ -59891,9 +60735,9 @@ in sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.5.0" - sources."nan-2.14.0" - sources."nearley-2.19.1" - sources."node-gyp-build-4.2.1" + sources."nan-2.14.1" + sources."nearley-2.19.3" + sources."node-gyp-build-4.2.2" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" sources."options-0.0.6" @@ -60012,7 +60856,7 @@ in buildInputs = globalBuildInputs; meta = { description = "git hosting on secure-scuttlebutt (ssb)"; - homepage = https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256; + homepage = "https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256"; license = "Fair"; }; production = true; @@ -60040,14 +60884,14 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "3.2.3"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.3.tgz"; - sha512 = "xUNP+b2CUzMIURcnEVXNgQo51ShKjjjfAO1U4a0A9KzathisjtGrsrrDUnXJlqojGOBYm/z2sAq/h0GfO6DX8A=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.4.tgz"; + sha512 = "rf0NbwZobW2Kwwomf41Ooas7rm7yg1z68fyKgrKaUs/VaaNtwIYMp/J11iQxcFu5p6i73huCytzmmo/8v4usDA=="; }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/helper-validator-identifier-7.9.5" (sources."@babel/highlight-7.9.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -60063,7 +60907,7 @@ in sources."@types/color-name-1.1.1" sources."@types/minimist-1.2.0" sources."@types/normalize-package-data-2.4.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -60088,21 +60932,21 @@ in ]; }) sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.1" + sources."camelcase-keys-6.2.2" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."ci-info-2.0.0" sources."cli-boxes-2.2.0" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.2.0" - sources."cli-width-2.2.0" + sources."cli-spinners-2.3.0" + sources."cli-width-2.2.1" sources."clone-1.0.4" sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."conf-6.2.1" + sources."conf-6.2.4" sources."configstore-5.0.1" - sources."cross-spawn-7.0.1" + sources."cross-spawn-7.0.2" sources."crypto-random-string-2.0.0" sources."debounce-fn-3.0.1" sources."decamelize-1.2.0" @@ -60137,7 +60981,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."hard-rejection-2.1.0" sources."has-flag-4.0.0" sources."has-yarn-2.1.0" @@ -60165,13 +61009,12 @@ in sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."is-installed-globally-0.3.1" + sources."is-installed-globally-0.3.2" sources."is-interactive-1.0.0" sources."is-npm-4.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" sources."is-plain-obj-1.1.0" - sources."is-promise-2.1.0" sources."is-stream-2.0.0" sources."is-typedarray-1.0.0" sources."is-yarn-global-0.3.0" @@ -60197,11 +61040,11 @@ in ]; }) sources."lowercase-keys-1.0.1" - sources."make-dir-3.0.2" + sources."make-dir-3.1.0" sources."map-obj-4.1.0" - (sources."meow-6.1.0" // { + (sources."meow-6.1.1" // { dependencies = [ - sources."type-fest-0.8.1" + sources."type-fest-0.13.1" ]; }) sources."merge-stream-2.0.0" @@ -60221,10 +61064,10 @@ in sources."npm-run-path-4.0.1" sources."once-1.4.0" sources."onetime-5.1.0" - sources."ora-4.0.3" + sources."ora-4.0.4" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."package-json-6.5.0" @@ -60256,19 +61099,19 @@ in sources."redent-3.0.0" sources."registry-auth-token-4.1.1" sources."registry-url-5.1.0" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" - sources."run-async-2.4.0" - sources."rxjs-6.5.4" + sources."run-async-2.4.1" + sources."rxjs-6.5.5" sources."safer-buffer-2.1.2" sources."semver-6.3.0" sources."semver-diff-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."string-width-4.2.0" @@ -60296,7 +61139,7 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" - sources."yargs-parser-18.1.1" + sources."yargs-parser-18.1.3" ]; buildInputs = globalBuildInputs; meta = { @@ -60334,7 +61177,7 @@ in sources."@types/color-name-1.1.1" sources."accepts-1.3.7" sources."agent-base-4.3.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -60410,12 +61253,12 @@ in sources."chalk-2.4.2" sources."change-case-3.1.0" sources."chardet-0.7.0" - sources."chownr-1.1.4" + sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."cli-boxes-2.2.0" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.2.0" - sources."cli-width-2.2.0" + sources."cli-spinners-2.3.0" + sources."cli-width-2.2.1" sources."cliui-4.1.0" sources."clone-1.0.4" sources."clone-response-1.0.2" @@ -60430,7 +61273,7 @@ in ]; }) sources."combined-stream-1.0.8" - sources."command-exists-1.2.8" + sources."command-exists-1.2.9" sources."commander-2.20.3" sources."common-tags-1.8.0" sources."concat-map-0.0.1" @@ -60448,7 +61291,7 @@ in sources."core-util-is-1.0.2" sources."cosmiconfig-5.2.1" sources."create-error-class-3.0.2" - (sources."creato-1.1.1" // { + (sources."creato-1.1.2" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" @@ -60461,7 +61304,7 @@ in ]; }) sources."is-fullwidth-code-point-3.0.0" - (sources."ora-4.0.3" // { + (sources."ora-4.0.4" // { dependencies = [ sources."chalk-3.0.0" ]; @@ -60577,7 +61420,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."graphcool-json-schema-1.2.1" (sources."graphcool-yml-0.4.15" // { dependencies = [ @@ -60670,7 +61513,6 @@ in sources."is-npm-3.0.0" sources."is-obj-1.0.1" sources."is-path-inside-1.0.1" - sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" @@ -60748,8 +61590,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -60764,7 +61606,7 @@ in sources."yallist-4.0.0" ]; }) - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."negotiator-0.6.2" @@ -60857,7 +61699,7 @@ in sources."proxy-addr-2.0.6" sources."prr-1.0.1" sources."pseudomap-1.0.2" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -60881,14 +61723,14 @@ in sources."request-promise-core-1.1.3" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-dir-1.0.1" sources."resolve-from-4.0.0" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."rimraf-2.7.1" - sources."run-async-2.4.0" - sources."rxjs-6.5.4" + sources."run-async-2.4.1" + sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."scuid-1.1.0" @@ -60910,17 +61752,17 @@ in sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."simple-errors-1.0.1" sources."snake-case-2.1.0" sources."source-map-0.5.7" - (sources."source-map-support-0.5.16" // { + (sources."source-map-support-0.5.19" // { dependencies = [ sources."source-map-0.6.1" ]; }) sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."sprintf-js-1.0.3" @@ -60944,9 +61786,9 @@ in sources."supports-color-5.5.0" sources."swap-case-1.1.2" sources."sync-exec-0.6.2" - (sources."tar-6.0.1" // { + (sources."tar-6.0.2" // { dependencies = [ - sources."mkdirp-1.0.3" + sources."mkdirp-1.0.4" sources."yallist-4.0.0" ]; }) @@ -60955,7 +61797,11 @@ in sources."through2-2.0.5" sources."timed-out-4.0.1" sources."title-case-2.1.1" - sources."tmp-0.1.0" + (sources."tmp-0.2.1" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) sources."tmp-graphql-config-extension-openapi-1.0.7" sources."to-fast-properties-2.0.0" sources."to-readable-stream-1.0.0" @@ -61035,7 +61881,7 @@ in sources."mem-4.3.0" sources."mimic-fn-2.1.0" sources."os-locale-3.1.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."yargs-parser-11.1.1" @@ -61227,7 +62073,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -61337,7 +62183,7 @@ in sources."ansi-term-0.0.2" sources."ansicolors-0.3.2" sources."blessed-0.1.81" - sources."blessed-contrib-4.8.19" + sources."blessed-contrib-4.8.20" sources."bresenham-0.0.3" sources."buffers-0.1.1" sources."cardinal-2.1.1" @@ -61367,10 +62213,10 @@ in sources."lodash.toarray-4.4.0" sources."map-canvas-0.1.5" sources."marked-0.7.0" - (sources."marked-terminal-4.0.0" // { + (sources."marked-terminal-4.1.0" // { dependencies = [ sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."chalk-4.0.0" sources."supports-color-7.1.0" ]; }) @@ -61393,7 +62239,7 @@ in sources."supports-color-7.1.0" ]; }) - sources."systeminformation-4.23.1" + sources."systeminformation-4.24.1" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -61601,7 +62447,7 @@ in sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."glogg-1.0.2" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."gulp-cli-2.2.0" sources."gulplog-1.0.0" sources."has-symbols-1.0.1" @@ -61671,7 +62517,7 @@ in }) sources."ms-2.0.0" sources."mute-stdout-1.0.1" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."next-tick-1.0.0" sources."normalize-package-data-2.5.0" @@ -61732,11 +62578,11 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."replace-ext-1.0.0" + sources."replace-ext-1.0.1" sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -61784,7 +62630,7 @@ in sources."source-map-url-0.4.0" sources."sparkles-1.0.1" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -61864,7 +62710,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The streaming build system."; - homepage = https://gulpjs.com/; + homepage = "https://gulpjs.com/"; license = "MIT"; }; production = true; @@ -61983,7 +62829,7 @@ in sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."glogg-1.0.2" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."gulplog-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -62114,7 +62960,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -62153,7 +62999,7 @@ in sources."source-map-url-0.4.0" sources."sparkles-1.0.1" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -62209,7 +63055,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Command line interface for gulp"; - homepage = http://gulpjs.com/; + homepage = "https://gulpjs.com/"; license = "MIT"; }; production = true; @@ -62234,13 +63080,13 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.8.0" + sources."uglify-js-3.9.2" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; meta = { description = "Highly configurable, well-tested, JavaScript-based HTML minifier."; - homepage = https://kangax.github.io/html-minifier/; + homepage = "https://kangax.github.io/html-minifier/"; license = "MIT"; }; production = true; @@ -62256,7 +63102,7 @@ in sha512 = "uXuRyVhQa0HlNmZg5LJ1BRJvRq5f7IJL/34tItHhZr9re15pwaqAuLUAIcqtwd1bLUCE++7HVPtR+NSReFW0iA=="; }; dependencies = [ - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.1" @@ -62325,8 +63171,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."lodash-4.17.15" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."oauth-sign-0.9.0" sources."once-1.4.0" @@ -62335,7 +63181,7 @@ in sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."performance-now-2.1.0" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-1.1.14" @@ -62372,10 +63218,10 @@ in http-server = nodeEnv.buildNodePackage { name = "http-server"; packageName = "http-server"; - version = "0.12.1"; + version = "0.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/http-server/-/http-server-0.12.1.tgz"; - sha512 = "T0jB+7J7GJ2Vo+a4/T7P7SbQ3x2GPDnqRqQXdfEuPuUOmES/9NBxPnDm7dh1HGEeUWqUmLUNtGV63ZC5Uy3tGA=="; + url = "https://registry.npmjs.org/http-server/-/http-server-0.12.3.tgz"; + sha512 = "be0dKG6pni92bRjq0kvExtj/NrrAd28/8fCXkaI/4piTwQMSDSLMhWyW0NI1V+DBI3aa1HMlQu46/HjVLfmugA=="; }; dependencies = [ sources."async-2.6.3" @@ -62385,27 +63231,21 @@ in sources."debug-3.2.6" sources."ecstatic-3.3.2" sources."eventemitter3-4.0.0" - sources."follow-redirects-1.10.0" + sources."follow-redirects-1.11.0" sources."he-1.2.0" sources."http-proxy-1.18.0" sources."lodash-4.17.15" sources."mime-1.6.0" sources."minimist-1.2.5" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."opener-1.5.1" - (sources."optimist-0.6.1" // { - dependencies = [ - sources."minimist-0.0.10" - ]; - }) - sources."portfinder-1.0.25" - sources."qs-6.9.2" + sources."portfinder-1.0.26" + sources."qs-6.9.4" sources."requires-port-1.0.0" sources."secure-compare-3.0.1" sources."union-0.5.0" sources."url-join-2.0.5" - sources."wordwrap-0.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -62500,14 +63340,14 @@ in sources."isstream-0.1.2" sources."minimatch-3.0.4" sources."minimist-0.0.10" - (sources."mkdirp-0.5.4" // { + (sources."mkdirp-0.5.5" // { dependencies = [ sources."minimist-1.2.5" ]; }) - sources."moment-2.24.0" + sources."moment-2.25.3" sources."mv-2.1.1" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."ncp-2.0.0" sources."once-1.4.0" sources."optimist-0.6.1" @@ -62572,7 +63412,7 @@ in sha512 = "l4g7U75E+WgrgNGH774djfTyp5Aw+2jJokYe9iCunSAbi/w+nRGHqTJfwbODLwiJQTnbXkM42FxgPRA29Ce7Bg=="; }; dependencies = [ - sources."@types/jquery-3.3.33" + sources."@types/jquery-3.3.37" sources."@types/sizzle-2.3.2" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" @@ -62586,12 +63426,12 @@ in sources."fs.realpath-1.0.0" sources."glob-7.1.6" sources."good-listener-1.2.2" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."historic-readline-1.0.8" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."jquery-3.4.1" - sources."jquery.terminal-2.15.2" + sources."jquery-3.5.0" + sources."jquery.terminal-2.15.4" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -62599,7 +63439,7 @@ in sources."once-1.4.0" sources."os-homedir-1.0.2" sources."path-is-absolute-1.0.1" - sources."prismjs-1.19.0" + sources."prismjs-1.20.0" sources."rimraf-2.7.1" sources."select-1.1.2" sources."tiny-emitter-2.1.0" @@ -62610,7 +63450,7 @@ in buildInputs = globalBuildInputs; meta = { description = "High precision scientific calculator with support for physical units"; - homepage = https://github.com/sharkdp/insect; + homepage = "https://github.com/sharkdp/insect"; license = "MIT"; }; production = true; @@ -62642,7 +63482,7 @@ in sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" - sources."ast-types-0.13.2" + sources."ast-types-0.13.3" sources."astral-regex-2.0.0" sources."asynckit-0.4.0" sources."balanced-match-1.0.0" @@ -62658,7 +63498,7 @@ in sources."chardet-0.7.0" sources."chownr-1.1.4" sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."co-4.6.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -62667,7 +63507,7 @@ in sources."concat-map-0.0.1" sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" - sources."cross-spawn-7.0.1" + sources."cross-spawn-7.0.2" sources."data-uri-to-buffer-1.2.0" sources."debug-4.1.1" sources."deep-is-0.1.3" @@ -62734,7 +63574,7 @@ in ]; }) sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-flag-4.0.0" sources."http-errors-1.7.3" (sources."http-proxy-agent-2.1.0" // { @@ -62764,10 +63604,9 @@ in sources."ip-1.1.5" sources."is-docker-2.0.0" sources."is-fullwidth-code-point-2.0.0" - sources."is-promise-2.1.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."jsonfile-4.0.0" @@ -62800,15 +63639,15 @@ in sources."lru-cache-5.1.1" sources."macos-release-2.3.0" sources."methods-1.1.2" - sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-2.4.5" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.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.4" + sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."netmask-1.0.6" @@ -62834,14 +63673,14 @@ in sources."proxy-agent-3.1.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."qs-6.9.2" + sources."qs-6.9.4" sources."raw-body-2.4.1" sources."readable-stream-3.6.0" sources."restore-cursor-2.0.0" sources."rimraf-3.0.2" sources."rsvp-3.6.2" - sources."run-async-2.4.0" - sources."rxjs-6.5.4" + sources."run-async-2.4.1" + sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sax-1.1.4" @@ -62849,7 +63688,7 @@ in sources."setprototypeof-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" (sources."slice-ansi-3.0.0" // { dependencies = [ sources."ansi-styles-4.2.1" @@ -62913,7 +63752,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."which-2.0.2" - sources."windows-release-3.2.0" + sources."windows-release-3.3.0" sources."word-wrap-1.2.3" (sources."wrap-ansi-6.2.0" // { dependencies = [ @@ -62924,14 +63763,14 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xregexp-2.0.0" sources."yallist-3.1.1" ]; buildInputs = globalBuildInputs; meta = { description = "A tool for creating and developing Ionic Framework mobile apps."; - homepage = https://ionicframework.com/; + homepage = "https://ionicframework.com/"; license = "MIT"; }; production = true; @@ -62965,7 +63804,7 @@ in sources."@types/color-name-1.1.1" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" sources."ansi-styles-4.2.1" @@ -62981,7 +63820,7 @@ in sources."aws4-1.9.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."bezier-js-2.6.0" + sources."bezier-js-2.6.1" sources."bindings-1.5.0" sources."block-stream-0.0.9" sources."bluebird-3.7.2" @@ -63079,7 +63918,7 @@ in sources."get-stream-3.0.0" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-4.0.0" @@ -63115,14 +63954,14 @@ in sources."megaminx-0.9.0" sources."mem-1.1.0" sources."microbuffer-1.0.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ms-2.0.0" - sources."nan-2.14.0" + sources."nan-2.14.1" (sources."node-gyp-3.8.0" // { dependencies = [ sources."semver-5.3.0" @@ -63199,7 +64038,7 @@ in sources."process-nextick-args-2.0.1" sources."promise-polyfill-6.1.0" sources."pseudomap-1.0.2" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."read-pkg-2.0.0" @@ -63208,7 +64047,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-url-0.2.1" sources."restore-cursor-3.1.0" sources."resumer-0.0.0" @@ -63222,12 +64061,12 @@ in sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-1.0.1" @@ -63277,7 +64116,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" - (sources."verda-1.0.0" // { + (sources."verda-1.0.1" // { dependencies = [ sources."ansi-regex-5.0.0" sources."camelcase-5.3.1" @@ -63288,7 +64127,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."jsonfile-6.0.1" sources."locate-path-5.0.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."path-exists-4.0.0" @@ -63301,7 +64140,7 @@ in sources."wrap-ansi-6.2.0" sources."y18n-4.0.0" sources."yargs-15.3.1" - sources."yargs-parser-18.1.1" + sources."yargs-parser-18.1.3" ]; }) sources."verror-1.10.0" @@ -63331,7 +64170,7 @@ in sources."get-caller-file-2.0.5" sources."is-fullwidth-code-point-2.0.0" sources."locate-path-3.0.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."require-main-filename-2.0.0" @@ -63354,10 +64193,10 @@ in jake = nodeEnv.buildNodePackage { name = "jake"; packageName = "jake"; - version = "10.4.6"; + version = "10.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jake/-/jake-10.4.6.tgz"; - sha512 = "bfxWbCowItajx7PV0xyoRfLC1DCND7z308JD5OvMhmsjO9232onI0jbbFZFWnvLSMzniRBhOee9EggsWBQ1+Ew=="; + url = "https://registry.npmjs.org/jake/-/jake-10.6.1.tgz"; + sha512 = "pHUK3+V0BjOb1XSi95rbBksrMdIqLVC9bJqDnshVyleYsET3H0XAq+3VB2E3notcYvv4wRdRHn13p7vobG+wfQ=="; }; dependencies = [ sources."ansi-styles-3.2.1" @@ -63369,15 +64208,10 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."escape-string-regexp-1.0.5" - (sources."filelist-0.0.6" // { - dependencies = [ - sources."utilities-0.0.37" - ]; - }) + sources."filelist-1.0.1" sources."has-flag-3.0.0" sources."minimatch-3.0.4" sources."supports-color-5.5.0" - sources."utilities-1.0.5" ]; buildInputs = globalBuildInputs; meta = { @@ -63426,11 +64260,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."iterare-1.2.0" - (sources."jaeger-client-3.17.2" // { - dependencies = [ - sources."opentracing-0.13.0" - ]; - }) + sources."jaeger-client-3.18.0" sources."lodash-4.17.15" sources."long-2.4.0" sources."minimatch-3.0.4" @@ -63472,7 +64302,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Implementation of the Language Server Protocol for JavaScript and TypeScript"; - homepage = https://github.com/sourcegraph/javascript-typescript-langserver; + homepage = "https://github.com/sourcegraph/javascript-typescript-langserver"; license = "Apache-2.0"; }; production = true; @@ -63482,10 +64312,10 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.0.161"; + version = "1.0.163"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.0.161.tgz"; - sha512 = "QjiWOqh8s9nkR2Gsf05mTl6eiQx74JtQF/4mcJnX9eUbMgJT5wof6vLP6AjFE6D67YN3iZl2zoQRhx96aP8VRg=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.0.163.tgz"; + sha512 = "0ZlG4SZgjMCoRBEyuJrQUFWWYgqE51XZlILA6Ex3rD4QXJOlZv/+8GqM1fUO+Ytu2NI6xPKmuHmfmP9+qPiRbQ=="; }; dependencies = [ sources."@cronvel/get-pixels-3.3.1" @@ -63499,7 +64329,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-escape-sequences-4.1.0" // { dependencies = [ sources."array-back-3.1.0" @@ -63554,7 +64384,7 @@ in ]; }) sources."browser-process-hrtime-1.0.0" - sources."buffer-5.5.0" + sources."buffer-5.6.0" sources."cache-base-1.0.1" sources."camel-case-3.0.0" sources."camelcase-4.1.0" @@ -63605,7 +64435,7 @@ in sources."core-util-is-1.0.2" (sources."cross-env-6.0.3" // { dependencies = [ - sources."cross-spawn-7.0.1" + sources."cross-spawn-7.0.2" sources."path-key-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -63616,7 +64446,7 @@ in sources."crypt-0.0.2" sources."css-2.2.4" sources."cssom-0.4.4" - (sources."cssstyle-2.2.0" // { + (sources."cssstyle-2.3.0" // { dependencies = [ sources."cssom-0.3.8" ]; @@ -63718,7 +64548,7 @@ in sources."fs-extra-4.0.3" ]; }) - sources."follow-redirects-1.10.0" + sources."follow-redirects-1.11.0" sources."font-awesome-filetypes-2.1.0" sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" @@ -63742,7 +64572,7 @@ in sources."getpass-0.1.7" sources."github-from-package-0.0.0" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-ansi-2.0.0" @@ -63757,7 +64587,7 @@ in sources."he-1.2.0" sources."highlight.js-9.18.1" sources."html-encoding-sniffer-1.0.2" - sources."html-entities-1.2.1" + sources."html-entities-1.3.1" sources."html-minifier-3.5.21" (sources."htmlparser2-4.1.0" // { dependencies = [ @@ -63839,7 +64669,7 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."joplin-turndown-4.0.24" + sources."joplin-turndown-4.0.27" sources."joplin-turndown-plugin-gfm-1.0.12" sources."jpeg-js-0.1.2" sources."js-tokens-4.0.0" @@ -63850,7 +64680,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" - sources."jssha-2.3.1" + sources."jssha-2.4.2" (sources."katex-0.11.1" // { dependencies = [ sources."commander-2.20.3" @@ -63886,7 +64716,7 @@ in ]; }) sources."markdown-it-abbr-1.0.4" - sources."markdown-it-anchor-5.2.5" + sources."markdown-it-anchor-5.2.7" sources."markdown-it-deflist-2.0.3" sources."markdown-it-emoji-1.4.0" sources."markdown-it-expand-tabs-1.0.13" @@ -63906,9 +64736,9 @@ in sources."mdurl-1.0.1" sources."memory-cache-0.2.0" sources."micromatch-3.1.10" - sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-2.4.5" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -63919,15 +64749,16 @@ in sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.4" - sources."moment-2.24.0" + sources."mkdirp-0.5.5" + sources."mkdirp-classic-0.5.3" + sources."moment-2.25.3" sources."ms-2.1.2" (sources."multiparty-4.2.1" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) - sources."nan-2.14.0" + sources."nan-2.14.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."is-windows-1.0.2" @@ -63936,11 +64767,11 @@ in sources."napi-build-utils-1.0.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" - sources."needle-2.4.0" + sources."needle-2.4.1" sources."nextgen-events-1.3.0" sources."nice-try-1.0.5" sources."no-case-2.3.2" - sources."node-abi-2.15.0" + sources."node-abi-2.16.0" sources."node-bitmap-0.0.1" sources."node-emoji-1.10.0" sources."node-fetch-1.7.3" @@ -63989,7 +64820,7 @@ in sources."param-case-2.1.1" sources."parse5-5.1.0" sources."pascalcase-0.1.1" - (sources."patch-package-6.2.1" // { + (sources."patch-package-6.2.2" // { dependencies = [ sources."fs-extra-7.0.1" ]; @@ -64009,7 +64840,7 @@ in sources."process-nextick-args-2.0.1" sources."promise-7.3.1" sources."proper-lockfile-2.0.1" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."q-1.1.2" @@ -64024,6 +64855,11 @@ in sources."redux-3.7.2" sources."regex-not-1.0.2" sources."relateurl-0.2.7" + (sources."relative-3.0.2" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" (sources."request-2.88.2" // { @@ -64067,7 +64903,7 @@ in }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."simple-concat-1.0.0" sources."simple-get-3.1.0" sources."simple-swizzle-0.2.2" @@ -64114,7 +64950,7 @@ in sources."split-skip-0.0.2" sources."split-string-3.1.0" sources."sprintf-js-1.1.2" - sources."sqlite3-4.1.1" + sources."sqlite3-4.2.0" sources."sshpk-1.16.1" (sources."static-extend-0.1.2" // { dependencies = [ @@ -64136,7 +64972,7 @@ in sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."strict-uri-encode-1.1.0" - sources."string-kit-0.11.6" + sources."string-kit-0.11.7" sources."string-padding-1.0.2" (sources."string-to-stream-1.1.1" // { dependencies = [ @@ -64175,7 +65011,7 @@ in sources."yallist-3.1.1" ]; }) - sources."tar-fs-2.0.0" + sources."tar-fs-2.0.1" sources."tar-stream-2.1.2" (sources."tcp-port-used-0.1.2" // { dependencies = [ @@ -64258,7 +65094,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -64279,10 +65115,10 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.10.3"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.3.tgz"; - sha512 = "wfk/IAWobz1TfApSdivH5PJ0miIHgDoYb1ugSqHcODPmaYu46rYe5FVuIEkhjg8IQiv6rDNPyhsqbsohI/C2vQ=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.11.0.tgz"; + sha512 = "a26B+Cx7USQGSWnz9YxgJNMmML/QG2nqIaL7VVYPCXbqiKz8PN0waSNvroMtvAK6tY7g/wPdNWGEP+JTNIBr6A=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -64299,8 +65135,7 @@ in sources."ini-1.3.5" sources."lru-cache-4.1.5" sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.4" + sources."mkdirp-1.0.4" sources."nopt-4.0.3" sources."once-1.4.0" sources."os-homedir-1.0.2" @@ -64317,7 +65152,7 @@ in buildInputs = globalBuildInputs; meta = { description = "beautifier.io for node"; - homepage = https://beautifier.io/; + homepage = "https://beautifier.io/"; license = "MIT"; }; production = true; @@ -64340,7 +65175,7 @@ in buildInputs = globalBuildInputs; meta = { description = "YAML 1.2 parser and serializer"; - homepage = https://github.com/nodeca/js-yaml; + homepage = "https://github.com/nodeca/js-yaml"; license = "MIT"; }; production = true; @@ -64350,35 +65185,34 @@ in jsdoc = nodeEnv.buildNodePackage { name = "jsdoc"; packageName = "jsdoc"; - version = "3.6.3"; + version = "3.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.3.tgz"; - sha512 = "Yf1ZKA3r9nvtMWHO1kEuMZTlHOF8uoQ0vyo5eH7SQy5YeIiHM+B0DgKnn+X6y6KDYZcF7G2SPkKF+JORCXWE/A=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.4.tgz"; + sha512 = "3G9d37VHv7MFdheviDCjUfQoIjdv4TC5zTTf5G9VODLtOnVS6La1eoYBDlbWfsRT3/Xo+j2MIqki2EV12BZfwA=="; }; dependencies = [ - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" - sources."entities-1.1.2" + sources."entities-2.0.0" sources."escape-string-regexp-2.0.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."js2xmlparser-4.0.1" sources."klaw-3.0.0" sources."linkify-it-2.2.0" sources."lodash-4.17.15" - sources."markdown-it-8.4.2" - sources."markdown-it-anchor-5.2.5" - sources."marked-0.7.0" + sources."markdown-it-10.0.0" + sources."markdown-it-anchor-5.2.7" + sources."marked-0.8.2" sources."mdurl-1.0.1" - sources."minimist-1.2.5" - sources."mkdirp-0.5.4" + sources."mkdirp-1.0.4" sources."requizzle-0.2.3" sources."sprintf-js-1.0.3" - sources."strip-json-comments-3.0.1" + sources."strip-json-comments-3.1.0" sources."taffydb-2.6.2" sources."uc.micro-1.0.6" - sources."underscore-1.9.2" + sources."underscore-1.10.2" sources."xmlcreate-2.0.3" ]; buildInputs = globalBuildInputs; @@ -64437,7 +65271,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; - homepage = http://jshint.com/; + homepage = "https://jshint.com/"; license = "(MIT AND JSON)"; }; production = true; @@ -64480,7 +65314,7 @@ in buildInputs = globalBuildInputs; meta = { description = "JSON diff"; - homepage = https://github.com/andreyvit/json-diff; + homepage = "https://github.com/andreyvit/json-diff"; }; production = true; bypassCache = true; @@ -64515,14 +65349,14 @@ in sources."lodash-4.17.15" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."ms-2.1.2" sources."native-promise-only-0.8.1" sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.9.2" + sources."qs-6.9.4" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."slash-3.0.0" @@ -64534,8 +65368,8 @@ in ]; buildInputs = globalBuildInputs; meta = { - description = "Various utilities for JSON References (http://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03)."; - homepage = https://github.com/whitlockjc/json-refs; + description = "Various utilities for JSON References (https://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03)."; + homepage = "https://github.com/whitlockjc/json-refs"; license = "MIT"; }; production = true; @@ -64555,7 +65389,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-align-3.0.0" // { dependencies = [ sources."string-width-3.1.0" @@ -64651,7 +65485,7 @@ in sources."getpass-0.1.7" sources."global-dirs-2.0.1" sources."got-9.6.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-4.0.0" @@ -64667,11 +65501,11 @@ in sources."ipaddr.js-1.9.1" sources."is-ci-2.0.0" sources."is-fullwidth-code-point-2.0.0" - sources."is-installed-globally-0.3.1" + sources."is-installed-globally-0.3.2" sources."is-npm-4.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" - sources."is-promise-2.1.0" + sources."is-promise-2.2.2" sources."is-typedarray-1.0.0" sources."is-yarn-global-0.3.0" sources."isarray-0.0.1" @@ -64691,7 +65525,7 @@ in sources."lodash-id-0.14.0" sources."lowdb-1.0.0" sources."lowercase-keys-1.0.1" - sources."make-dir-3.0.2" + sources."make-dir-3.1.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" (sources."method-override-3.0.0" // { @@ -64701,8 +65535,8 @@ in }) sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-1.0.1" sources."minimist-1.2.5" (sources."morgan-1.10.0" // { @@ -64720,7 +65554,7 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."p-cancelable-1.1.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."package-json-6.5.0" @@ -64733,7 +65567,7 @@ in sources."pluralize-8.0.0" sources."prepend-http-2.0.0" sources."proxy-addr-2.0.6" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."pupa-2.0.1" @@ -64765,7 +65599,7 @@ in sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."sshpk-1.16.1" sources."statuses-1.5.0" sources."steno-0.4.4" @@ -64811,12 +65645,12 @@ in sources."xdg-basedir-4.0.0" sources."y18n-4.0.0" sources."yargs-15.3.1" - sources."yargs-parser-18.1.1" + sources."yargs-parser-18.1.3" ]; buildInputs = globalBuildInputs; meta = { description = "Get a full fake REST API with zero coding in less than 30 seconds"; - homepage = https://github.com/typicode/json-server; + homepage = "https://github.com/typicode/json-server"; license = "MIT"; }; production = true; @@ -64843,7 +65677,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Validate JSON"; - homepage = http://zaach.github.com/jsonlint/; + homepage = "https://zaa.ch/jsonlint/"; }; production = true; bypassCache = true; @@ -64852,14 +65686,17 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "4.4.1"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-4.4.1.tgz"; - sha512 = "L5SIaXEYqzrh6b1wqYC42tNsFMx2PWuxky84pK9coK09MvmL7mxii3G3bZBh/0rvD27lqDd0le9jyhzvwif73A=="; + url = "https://registry.npmjs.org/karma/-/karma-5.0.4.tgz"; + sha512 = "UGqTe2LBiGQBXRN+Fygeiq63tbfOX45639SKSbPkLpARwnxROWJZg+froGkpHxr84FXCe8UGCf+1PITM6frT5w=="; }; dependencies = [ + sources."@types/color-name-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" sources."anymatch-3.1.1" sources."arraybuffer.slice-0.0.7" sources."async-2.6.3" @@ -64871,16 +65708,16 @@ in sources."better-assert-1.0.2" sources."binary-extensions-2.0.0" sources."blob-0.0.5" - sources."bluebird-3.7.2" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-fill-1.0.0" sources."bytes-3.1.0" sources."callsite-1.0.0" - sources."chokidar-3.3.1" + sources."camelcase-5.3.1" + sources."chokidar-3.4.0" + sources."cliui-6.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."colors-1.4.0" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" @@ -64892,10 +65729,12 @@ in sources."custom-event-1.0.1" sources."date-format-2.1.0" sources."debug-2.6.9" + sources."decamelize-1.2.0" sources."depd-1.1.2" sources."di-0.0.1" sources."dom-serialize-2.2.1" sources."ee-first-1.1.1" + sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" (sources."engine.io-3.2.1" // { dependencies = [ @@ -64914,8 +65753,9 @@ in sources."extend-3.0.2" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."flatted-2.0.1" - (sources."follow-redirects-1.10.0" // { + sources."find-up-4.1.0" + sources."flatted-2.0.2" + (sources."follow-redirects-1.11.0" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -64923,10 +65763,11 @@ in }) sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" + sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."http-errors-1.7.2" @@ -64937,11 +65778,13 @@ in sources."inherits-2.0.3" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-number-7.0.0" sources."isarray-2.0.1" - sources."isbinaryfile-3.0.3" + sources."isbinaryfile-4.0.6" sources."jsonfile-4.0.0" + sources."locate-path-5.0.0" sources."lodash-4.17.15" (sources."log4js-4.5.1" // { dependencies = [ @@ -64949,37 +65792,40 @@ in sources."ms-2.1.2" ]; }) - sources."lru-cache-4.1.5" sources."media-typer-0.3.0" - sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-2.4.5" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" - sources."minimist-0.0.10" sources."ms-2.0.0" sources."negotiator-0.6.2" sources."normalize-path-3.0.0" sources."object-component-0.0.3" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."optimist-0.6.1" sources."os-tmpdir-1.0.2" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" sources."parseqs-0.0.5" sources."parseuri-0.0.5" sources."parseurl-1.3.3" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."picomatch-2.2.2" - sources."pseudomap-1.0.2" sources."qjobs-1.2.0" sources."qs-6.7.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" - sources."readdirp-3.3.0" + sources."readdirp-3.4.0" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" sources."requires-port-1.0.0" sources."rfdc-1.1.4" sources."rimraf-2.7.1" - sources."safe-buffer-5.2.0" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" + sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" (sources."socket.io-2.1.1" // { dependencies = [ @@ -65005,32 +65851,33 @@ in sources."ms-2.1.2" ]; }) + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" sources."tmp-0.0.33" sources."to-array-0.1.4" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."type-is-1.6.18" + sources."ua-parser-js-0.7.21" sources."ultron-1.1.1" sources."universalify-0.1.2" sources."unpipe-1.0.0" - sources."useragent-2.3.0" sources."utils-merge-1.0.1" sources."void-elements-2.0.1" - sources."wordwrap-0.0.3" + sources."which-module-2.0.0" + sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - (sources."ws-3.3.3" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."ws-3.3.3" sources."xmlhttprequest-ssl-1.5.5" - sources."yallist-2.1.2" + sources."y18n-4.0.0" + sources."yargs-15.3.1" + sources."yargs-parser-18.1.3" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; meta = { description = "Spectacular Test Runner for JavaScript."; - homepage = http://karma-runner.github.io/; + homepage = "https://karma-runner.github.io/"; license = "MIT"; }; production = true; @@ -65068,7 +65915,7 @@ in sources."glob-7.1.6" sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-symbols-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -65102,7 +65949,7 @@ in sources."remove-bom-buffer-3.0.0" sources."remove-bom-stream-1.2.0" sources."remove-trailing-separator-1.1.0" - sources."replace-ext-1.0.0" + sources."replace-ext-1.0.1" sources."resolve-options-1.1.0" sources."safe-buffer-5.1.2" sources."stream-shift-1.0.1" @@ -65124,7 +65971,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Merges multiple lcov results into one"; - homepage = https://github.com/mweibel/lcov-result-merger; + homepage = "https://github.com/mweibel/lcov-result-merger"; license = "MIT"; }; production = true; @@ -65143,7 +65990,7 @@ in sources."abab-1.0.4" sources."acorn-2.7.0" sources."acorn-globals-1.0.9" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."asn1-0.2.4" @@ -65248,13 +66095,13 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."mute-stream-0.0.8" (sources."nconf-0.10.0" // { dependencies = [ @@ -65281,7 +66128,7 @@ in sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."parse5-1.5.1" @@ -65292,7 +66139,7 @@ in sources."pkginfo-0.4.1" sources."prelude-ls-1.1.2" sources."prompt-1.0.0" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -65317,7 +66164,7 @@ in sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."source-map-0.6.1" sources."sshpk-1.16.1" sources."stack-trace-0.0.10" @@ -65492,7 +66339,7 @@ in sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@octokit/auth-token-2.4.0" - (sources."@octokit/endpoint-5.5.3" // { + (sources."@octokit/endpoint-6.0.1" // { dependencies = [ sources."is-plain-object-3.0.0" sources."isobject-4.0.0" @@ -65503,8 +66350,9 @@ in sources."@octokit/plugin-paginate-rest-1.1.2" sources."@octokit/plugin-request-log-1.0.0" sources."@octokit/plugin-rest-endpoint-methods-2.4.0" - (sources."@octokit/request-5.3.2" // { + (sources."@octokit/request-5.4.2" // { dependencies = [ + sources."@octokit/request-error-2.0.0" sources."is-plain-object-3.0.0" sources."isobject-4.0.0" sources."universal-user-agent-5.0.0" @@ -65512,17 +66360,17 @@ in }) sources."@octokit/request-error-1.2.1" sources."@octokit/rest-16.43.1" - sources."@octokit/types-2.5.0" + sources."@octokit/types-2.12.2" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.3" + sources."@types/node-13.13.4" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" @@ -65604,7 +66452,7 @@ in ]; }) sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" (sources."cliui-5.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -65701,7 +66549,7 @@ in sources."encoding-0.1.12" sources."end-of-stream-1.4.4" sources."env-paths-2.2.0" - sources."envinfo-7.5.0" + sources."envinfo-7.5.1" sources."err-code-1.1.2" sources."error-ex-1.3.2" sources."es-abstract-1.17.5" @@ -65836,8 +66684,8 @@ in sources."pify-4.0.1" ]; }) - sources."graceful-fs-4.2.3" - (sources."handlebars-4.7.3" // { + sources."graceful-fs-4.2.4" + (sources."handlebars-4.7.6" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -65910,7 +66758,6 @@ in sources."is-obj-1.0.1" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" sources."is-regex-1.0.5" sources."is-ssh-1.3.1" sources."is-stream-1.1.0" @@ -65965,8 +66812,8 @@ in }) sources."merge2-1.3.0" sources."micromatch-3.1.10" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -65979,7 +66826,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."mkdirp-promise-5.0.1" sources."modify-values-1.0.1" sources."move-concurrently-1.0.1" @@ -65991,7 +66838,7 @@ in sources."neo-async-2.6.1" sources."nice-try-1.0.5" sources."node-fetch-2.6.0" - sources."node-fetch-npm-2.0.3" + sources."node-fetch-npm-2.0.4" (sources."node-gyp-5.1.0" // { dependencies = [ sources."semver-5.7.1" @@ -66005,7 +66852,7 @@ in }) sources."normalize-url-3.3.0" sources."npm-bundled-1.1.1" - sources."npm-lifecycle-3.1.4" + sources."npm-lifecycle-3.1.5" sources."npm-normalize-package-bin-1.0.1" (sources."npm-package-arg-6.1.1" // { dependencies = [ @@ -66045,17 +66892,12 @@ in sources."octokit-pagination-methods-1.1.0" sources."once-1.4.0" sources."onetime-2.0.1" - (sources."optimist-0.6.1" // { - dependencies = [ - sources."minimist-0.0.10" - ]; - }) sources."os-homedir-1.0.2" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-finally-1.0.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-map-2.1.0" sources."p-map-series-1.0.0" @@ -66089,7 +66931,7 @@ in sources."proto-list-1.2.4" sources."protocols-1.4.7" sources."protoduck-5.0.1" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -66132,7 +66974,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.15.1" + sources."resolve-1.17.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -66144,9 +66986,9 @@ in sources."ret-0.1.15" sources."retry-0.10.1" sources."rimraf-2.7.1" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."run-queue-1.0.3" - sources."rxjs-6.5.4" + sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -66160,7 +67002,7 @@ in sources."shallow-clone-3.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."slash-2.0.0" sources."slide-1.1.6" sources."smart-buffer-4.1.0" @@ -66205,7 +67047,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-1.0.1" @@ -66239,8 +67081,10 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -66277,11 +67121,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - (sources."uglify-js-3.8.0" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."uglify-js-3.9.2" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -66315,8 +67155,8 @@ in sources."which-1.3.1" sources."which-module-2.0.0" sources."wide-align-1.1.3" - sources."windows-release-3.2.0" - sources."wordwrap-0.0.3" + sources."windows-release-3.3.0" + sources."wordwrap-1.0.0" (sources."wrap-ansi-5.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -66369,7 +67209,7 @@ in sha512 = "tlWX341RECuTOvoDIvtFqXsKj072hm3+9ymRBe76/mD6O5ZZecnlAOVDlWAleF2+aohFrxNidXhv2773f6kY7g=="; }; dependencies = [ - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -66392,7 +67232,7 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."getpass-0.1.7" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-signature-1.2.0" @@ -66405,15 +67245,15 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-1.2.5" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" sources."promise-7.3.1" sources."prr-1.0.1" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."request-2.88.2" @@ -66432,7 +67272,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Leaner CSS"; - homepage = http://lesscss.org/; + homepage = "http://lesscss.org/"; # https is broken license = "Apache-2.0"; }; production = true; @@ -66457,7 +67297,7 @@ in buildInputs = globalBuildInputs; meta = { description = "clean-css plugin for less.js"; - homepage = http://lesscss.org/; + homepage = "http://lesscss.org/"; # https is broken }; production = true; bypassCache = true; @@ -66587,7 +67427,7 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -66626,12 +67466,12 @@ in sources."map-visit-1.0.0" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mixin-deep-1.3.2" sources."morgan-1.10.0" sources."ms-2.0.0" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."normalize-path-3.0.0" @@ -66805,7 +67645,7 @@ in dependencies = [ sources."accepts-1.3.7" sources."after-0.8.2" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."anymatch-1.3.2" sources."argparse-1.0.10" sources."arr-diff-2.0.0" @@ -66892,14 +67732,14 @@ in sources."ee-first-1.1.1" sources."emoji-regex-6.1.1" sources."encodeurl-1.0.2" - (sources."engine.io-3.4.0" // { + (sources."engine.io-3.4.1" // { dependencies = [ sources."cookie-0.3.1" sources."debug-4.1.1" sources."ms-2.1.2" ]; }) - (sources."engine.io-client-3.4.0" // { + (sources."engine.io-client-3.4.1" // { dependencies = [ sources."component-emitter-1.2.1" sources."debug-4.1.1" @@ -66941,7 +67781,7 @@ in sources."github-slugger-1.3.0" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-binary2-1.0.3" // { @@ -66965,7 +67805,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."html-entities-1.2.1" + sources."html-entities-1.3.1" sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" @@ -67029,8 +67869,8 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -67038,7 +67878,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.14.0" + sources."nan-2.14.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -67087,7 +67927,7 @@ in sources."preserve-0.2.0" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.6" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.7.0" (sources."randomatic-3.1.1" // { @@ -67291,14 +68131,14 @@ in sources."uuid-3.4.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; meta = { description = "Live Markdown previews for your favourite editor."; - homepage = https://github.com/shime/livedown; + homepage = "https://github.com/shime/livedown"; license = "MIT"; }; production = true; @@ -67312,17 +68152,17 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/compat-data-7.9.0" - sources."@babel/core-7.9.0" - sources."@babel/generator-7.9.4" + sources."@babel/compat-data-7.9.6" + sources."@babel/core-7.9.6" + sources."@babel/generator-7.9.6" sources."@babel/helper-annotate-as-pure-7.8.3" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" - sources."@babel/helper-compilation-targets-7.8.7" - sources."@babel/helper-create-class-features-plugin-7.8.6" + sources."@babel/helper-compilation-targets-7.9.6" + sources."@babel/helper-create-class-features-plugin-7.9.6" sources."@babel/helper-create-regexp-features-plugin-7.8.8" sources."@babel/helper-define-map-7.8.3" sources."@babel/helper-explode-assignable-expression-7.8.3" - sources."@babel/helper-function-name-7.8.3" + sources."@babel/helper-function-name-7.9.5" sources."@babel/helper-get-function-arity-7.8.3" sources."@babel/helper-hoist-variables-7.8.3" sources."@babel/helper-member-expression-to-functions-7.8.3" @@ -67332,18 +68172,18 @@ in sources."@babel/helper-plugin-utils-7.8.3" sources."@babel/helper-regex-7.8.3" sources."@babel/helper-remap-async-to-generator-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-replace-supers-7.9.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" - sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/helper-wrap-function-7.8.3" - sources."@babel/helpers-7.9.2" + sources."@babel/helpers-7.9.6" (sources."@babel/highlight-7.9.0" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.8.3" sources."@babel/plugin-proposal-class-properties-7.8.3" @@ -67351,14 +68191,16 @@ in sources."@babel/plugin-proposal-json-strings-7.8.3" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-proposal-numeric-separator-7.8.3" - sources."@babel/plugin-proposal-object-rest-spread-7.9.0" + sources."@babel/plugin-proposal-object-rest-spread-7.9.6" sources."@babel/plugin-proposal-optional-catch-binding-7.8.3" sources."@babel/plugin-proposal-optional-chaining-7.9.0" sources."@babel/plugin-proposal-unicode-property-regex-7.8.8" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" + sources."@babel/plugin-syntax-class-properties-7.8.3" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" + sources."@babel/plugin-syntax-logical-assignment-operators-7.8.3" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.8.3" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -67369,9 +68211,9 @@ in sources."@babel/plugin-transform-async-to-generator-7.8.3" sources."@babel/plugin-transform-block-scoped-functions-7.8.3" sources."@babel/plugin-transform-block-scoping-7.8.3" - sources."@babel/plugin-transform-classes-7.9.2" + sources."@babel/plugin-transform-classes-7.9.5" sources."@babel/plugin-transform-computed-properties-7.8.3" - sources."@babel/plugin-transform-destructuring-7.8.8" + sources."@babel/plugin-transform-destructuring-7.9.5" sources."@babel/plugin-transform-dotall-regex-7.8.3" sources."@babel/plugin-transform-duplicate-keys-7.8.3" sources."@babel/plugin-transform-exponentiation-operator-7.8.3" @@ -67379,58 +68221,61 @@ in sources."@babel/plugin-transform-function-name-7.8.3" sources."@babel/plugin-transform-literals-7.8.3" sources."@babel/plugin-transform-member-expression-literals-7.8.3" - sources."@babel/plugin-transform-modules-amd-7.9.0" - sources."@babel/plugin-transform-modules-commonjs-7.9.0" - sources."@babel/plugin-transform-modules-systemjs-7.9.0" + sources."@babel/plugin-transform-modules-amd-7.9.6" + sources."@babel/plugin-transform-modules-commonjs-7.9.6" + sources."@babel/plugin-transform-modules-systemjs-7.9.6" sources."@babel/plugin-transform-modules-umd-7.9.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" sources."@babel/plugin-transform-new-target-7.8.3" sources."@babel/plugin-transform-object-super-7.8.3" - sources."@babel/plugin-transform-parameters-7.9.3" + sources."@babel/plugin-transform-parameters-7.9.5" sources."@babel/plugin-transform-property-literals-7.8.3" sources."@babel/plugin-transform-regenerator-7.8.7" sources."@babel/plugin-transform-reserved-words-7.8.3" - sources."@babel/plugin-transform-runtime-7.9.0" + sources."@babel/plugin-transform-runtime-7.9.6" sources."@babel/plugin-transform-shorthand-properties-7.8.3" sources."@babel/plugin-transform-spread-7.8.3" sources."@babel/plugin-transform-sticky-regex-7.8.3" sources."@babel/plugin-transform-template-literals-7.8.3" sources."@babel/plugin-transform-typeof-symbol-7.8.4" sources."@babel/plugin-transform-unicode-regex-7.8.3" - sources."@babel/preset-env-7.9.0" + sources."@babel/preset-env-7.9.6" sources."@babel/preset-modules-0.1.3" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.9.2" + sources."@babel/runtime-7.9.6" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.9.0" - sources."@babel/types-7.9.0" + sources."@babel/traverse-7.9.6" + sources."@babel/types-7.9.6" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" (sources."@istanbuljs/load-nyc-config-1.0.0" // { dependencies = [ sources."find-up-4.1.0" sources."locate-path-5.0.0" + sources."p-limit-2.3.0" sources."p-locate-4.1.0" + sources."p-try-2.2.0" sources."path-exists-4.0.0" ]; }) sources."@istanbuljs/schema-0.1.2" - (sources."@jest/transform-25.1.0" // { + (sources."@jest/transform-25.5.1" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@jest/types-25.1.0" - sources."@types/babel__core-7.1.6" + sources."@jest/types-25.5.0" + sources."@types/babel__core-7.1.7" sources."@types/babel__generator-7.6.1" sources."@types/babel__template-7.0.2" - sources."@types/babel__traverse-7.0.9" + sources."@types/babel__traverse-7.0.11" sources."@types/color-name-1.1.1" sources."@types/estree-0.0.44" + sources."@types/graceful-fs-4.1.3" sources."@types/istanbul-lib-coverage-2.0.1" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.1" - sources."@types/node-13.9.3" + sources."@types/node-13.13.4" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.4" @@ -67460,7 +68305,7 @@ in sources."acorn-7.1.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" sources."amdefine-1.0.1" @@ -67499,15 +68344,15 @@ in sources."babel-helper-mark-eval-scopes-0.4.3" sources."babel-helper-remove-or-void-0.4.3" sources."babel-helper-to-multiple-sequence-expressions-0.5.0" - sources."babel-jest-25.1.0" + sources."babel-jest-25.5.1" (sources."babel-loader-8.1.0" // { dependencies = [ - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" ]; }) - sources."babel-plugin-dynamic-import-node-2.3.0" + sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.0.0" - sources."babel-plugin-jest-hoist-25.1.0" + sources."babel-plugin-jest-hoist-25.5.0" sources."babel-plugin-minify-builtins-0.5.0" sources."babel-plugin-minify-constant-folding-0.5.0" sources."babel-plugin-minify-dead-code-elimination-0.5.1" @@ -67532,7 +68377,8 @@ in sources."babel-plugin-transform-remove-undefined-0.5.0" sources."babel-plugin-transform-simplify-comparison-operators-6.9.4" sources."babel-plugin-transform-undefined-to-void-6.9.4" - sources."babel-preset-jest-25.1.0" + sources."babel-preset-current-node-syntax-0.1.2" + sources."babel-preset-jest-25.5.0" sources."babel-preset-minify-0.5.1" (sources."babel-runtime-6.26.0" // { dependencies = [ @@ -67552,6 +68398,7 @@ in sources."bindings-1.5.0" (sources."bl-4.0.2" // { dependencies = [ + sources."buffer-5.6.0" sources."readable-stream-3.6.0" ]; }) @@ -67570,9 +68417,8 @@ in sources."resolve-1.1.7" ]; }) - (sources."browserify-16.5.0" // { + (sources."browserify-16.5.1" // { dependencies = [ - sources."mkdirp-0.5.4" sources."punycode-1.4.1" ]; }) @@ -67582,22 +68428,22 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."browserslist-4.11.0" + sources."browserslist-4.12.0" sources."bser-2.1.1" - sources."buffer-5.5.0" + sources."buffer-5.2.1" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-modules-3.1.0" sources."builtin-status-codes-3.0.0" (sources."cacache-12.0.4" // { dependencies = [ - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" ]; }) sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001036" + sources."caniuse-lite-1.0.30001050" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -67666,12 +68512,12 @@ in sources."convert-source-map-1.7.0" (sources."copy-concurrently-1.0.5" // { dependencies = [ - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" ]; }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.11" - (sources."core-js-compat-3.6.4" // { + (sources."core-js-compat-3.6.5" // { dependencies = [ sources."semver-7.0.0" ]; @@ -67682,14 +68528,17 @@ in sources."create-hmac-1.1.7" (sources."cross-env-7.0.0" // { dependencies = [ - sources."cross-spawn-7.0.1" + sources."cross-spawn-7.0.2" sources."path-key-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."which-2.0.2" ]; }) - sources."cross-spawn-6.0.5" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."which-1.3.1" + ]; + }) sources."crypto-browserify-3.12.0" sources."cyclist-1.0.1" sources."dash-ast-1.0.0" @@ -67711,7 +68560,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.383" + sources."electron-to-chromium-1.3.427" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."emojis-list-3.0.0" @@ -67723,8 +68572,6 @@ in }) sources."errno-0.1.7" sources."error-ex-1.3.2" - sources."es-abstract-1.17.5" - sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."eslint-scope-4.0.3" sources."eslint-visitor-keys-1.1.0" @@ -67782,8 +68629,12 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."find-cache-dir-2.1.0" - sources."find-up-3.0.0" + (sources."find-cache-dir-2.1.0" // { + dependencies = [ + sources."make-dir-2.1.0" + ]; + }) + sources."find-up-2.1.0" (sources."findup-sync-3.0.0" // { dependencies = [ sources."micromatch-3.1.10" @@ -67799,7 +68650,7 @@ in sources."fs-constants-1.0.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.1" sources."get-assigned-identifiers-1.2.0" @@ -67816,13 +68667,18 @@ in (sources."global-modules-2.0.0" // { dependencies = [ sources."global-prefix-3.0.0" + sources."which-1.3.1" + ]; + }) + (sources."global-prefix-1.0.2" // { + dependencies = [ + sources."which-1.3.1" ]; }) - sources."global-prefix-1.0.2" sources."globals-11.12.0" sources."google-closure-compiler-js-20170910.0.1" - sources."graceful-fs-4.2.3" - (sources."gunzip-maybe-1.4.1" // { + sources."graceful-fs-4.2.4" + (sources."gunzip-maybe-1.4.2" // { dependencies = [ sources."browserify-zlib-0.1.4" sources."pako-0.2.9" @@ -67839,7 +68695,12 @@ in sources."kind-of-4.0.0" ]; }) - sources."hash-base-3.0.4" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.0" + ]; + }) sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."homedir-polyfill-1.0.3" @@ -67864,10 +68725,8 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.1.5" sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.2" sources."is-deflate-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -67887,9 +68746,7 @@ in sources."@types/estree-0.0.39" ]; }) - sources."is-regex-1.0.5" sources."is-stream-1.1.0" - sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" @@ -67903,15 +68760,11 @@ in sources."semver-6.3.0" ]; }) - sources."jest-haste-map-25.1.0" - sources."jest-regex-util-25.1.0" - sources."jest-serializer-25.1.0" - (sources."jest-util-25.1.0" // { - dependencies = [ - sources."mkdirp-0.5.4" - ]; - }) - (sources."jest-worker-25.1.0" // { + sources."jest-haste-map-25.5.1" + sources."jest-regex-util-25.2.6" + sources."jest-serializer-25.5.0" + sources."jest-util-25.5.0" + (sources."jest-worker-25.5.0" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.1.0" @@ -67926,11 +68779,11 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-0.0.1" sources."json-stringify-safe-5.0.1" - sources."json5-2.1.2" + sources."json5-2.1.3" sources."jsonify-0.0.0" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."jszip-git://github.com/anmonteiro/jszip#patch-1" + sources."jszip-2.6.1" sources."kind-of-6.0.3" sources."labeled-stream-splicer-2.0.2" sources."lcid-2.0.0" @@ -67943,13 +68796,17 @@ in sources."json5-1.0.1" ]; }) - sources."locate-path-3.0.0" + sources."locate-path-2.0.0" sources."lodash-4.17.15" sources."lodash.memoize-3.0.4" sources."loose-envify-1.4.0" sources."lru-cache-5.1.1" sources."magic-string-0.25.7" - sources."make-dir-2.1.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."makeerror-1.0.11" sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" @@ -67967,8 +68824,8 @@ in ]; }) sources."miller-rabin-4.0.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -67980,15 +68837,16 @@ in sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-1.0.3" + sources."mkdirp-1.0.4" + sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.2" (sources."move-concurrently-1.0.1" // { dependencies = [ - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" ]; }) sources."ms-2.1.2" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."ncp-2.0.0" sources."neo-async-2.6.1" @@ -68008,11 +68866,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - (sources."node-releases-1.1.52" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) + sources."node-releases-1.1.53" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" @@ -68031,11 +68885,9 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.0" - sources."object.getownpropertydescriptors-2.1.0" sources."object.pick-1.3.0" sources."once-1.4.0" sources."os-browserify-0.3.0" @@ -68043,9 +68895,9 @@ in sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" - sources."p-limit-2.2.2" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" sources."pako-1.0.11" sources."parallel-transform-1.2.0" sources."paredit.js-0.3.6" @@ -68069,8 +68921,16 @@ in sources."pinkie-1.0.0" sources."pinkie-promise-1.0.0" sources."pirates-4.0.1" - sources."pkg-dir-3.0.0" - sources."pkg-up-3.1.0" + (sources."pkg-dir-3.0.0" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + ]; + }) + sources."pkg-up-2.0.0" sources."posix-character-classes-0.1.1" sources."posix-getopt-git://github.com/anmonteiro/node-getopt#master" sources."prettier-1.19.1" @@ -68080,7 +68940,7 @@ in sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."prr-1.0.1" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."public-encrypt-4.0.3" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { @@ -68106,7 +68966,7 @@ in sources."micromatch-3.1.10" ]; }) - sources."realpath-native-1.1.0" + sources."realpath-native-2.0.0" sources."regenerate-1.4.0" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.5" @@ -68122,11 +68982,11 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."replace-ext-1.0.0" + sources."replace-ext-1.0.1" sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.15.1" + sources."resolve-1.17.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -68162,7 +69022,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."schema-utils-2.6.5" + sources."schema-utils-2.6.6" sources."semver-5.7.1" sources."serialize-javascript-2.1.2" sources."set-blocking-2.0.0" @@ -68178,7 +69038,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.7.2" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."simple-concat-1.0.0" sources."slash-3.0.0" (sources."snapdragon-0.8.2" // { @@ -68214,7 +69074,7 @@ in sources."source-list-map-0.1.8" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.16" // { + (sources."source-map-support-0.5.19" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -68222,7 +69082,7 @@ in sources."source-map-url-0.4.0" sources."sourcemap-codec-1.4.8" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -68257,8 +69117,6 @@ in sources."stream-shift-1.0.1" sources."stream-splicer-2.0.1" sources."string-width-3.1.0" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.0" @@ -68275,7 +69133,7 @@ in sources."readable-stream-3.6.0" ]; }) - (sources."terser-4.6.7" // { + (sources."terser-4.6.13" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -68342,7 +69200,6 @@ in ]; }) sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.1" sources."uuid-3.4.0" sources."v8-compile-cache-2.0.3" sources."validate-npm-package-license-3.0.4" @@ -68350,12 +69207,12 @@ in sources."vinyl-2.2.0" sources."vm-browserify-1.1.2" sources."walker-1.0.7" - sources."watchpack-1.6.0" - (sources."webpack-4.42.1" // { + sources."watchpack-1.6.1" + (sources."webpack-4.43.0" // { dependencies = [ sources."acorn-6.4.1" sources."micromatch-3.1.10" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."schema-utils-1.0.0" ]; }) @@ -68384,11 +69241,12 @@ in sources."source-map-0.6.1" ]; }) - sources."which-1.3.1" + sources."which-2.0.2" sources."which-module-2.0.0" (sources."which-promise-1.0.0" // { dependencies = [ sources."pify-2.3.0" + sources."which-1.3.1" ]; }) sources."worker-farm-1.7.0" @@ -68398,7 +69256,15 @@ in sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yallist-3.1.1" - sources."yargs-13.2.4" + (sources."yargs-13.2.4" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + ]; + }) sources."yargs-parser-13.1.2" ]; buildInputs = globalBuildInputs; @@ -68436,7 +69302,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Madoko is a fast scholarly Markdown processor written in Koka"; - homepage = http://madoko.codeplex.com/; + homepage = "https://madoko.codeplex.com/"; }; production = true; bypassCache = true; @@ -68445,14 +69311,15 @@ in markdown-link-check = nodeEnv.buildNodePackage { name = "markdown-link-check"; packageName = "markdown-link-check"; - version = "3.8.0"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.8.0.tgz"; - sha512 = "tpBlUsnJfJ5xMHAjBC/10s8Un/WT/FmF+xXaZjeaegESmjcPlEcxZ+UuCtxArETovLS5gZ8lZXzdhgslHziLsg=="; + url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.8.1.tgz"; + sha512 = "R6k8ytdJZePDAdb8NT0NvrNvu6n25IwLPIoJ4guHWC5yqyTlnUpRT7j3XE4ioBXwqOhG/LlUcuckD621kZkl4w=="; }; dependencies = [ - sources."ajv-6.12.0" - sources."ansi-styles-3.2.1" + sources."@types/color-name-1.1.1" + sources."ajv-6.12.2" + sources."ansi-styles-4.2.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-3.2.0" @@ -68461,16 +69328,15 @@ in sources."aws4-1.9.1" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."chalk-4.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."combined-stream-1.0.8" - sources."commander-3.0.2" + sources."commander-5.1.0" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" - sources."escape-string-regexp-1.0.5" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.1" @@ -68480,7 +69346,7 @@ in sources."getpass-0.1.7" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."http-signature-1.2.0" sources."is-absolute-url-3.0.3" sources."is-relative-url-3.0.0" @@ -68492,24 +69358,24 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."link-check-4.4.7" + sources."link-check-4.5.0" sources."lodash-4.17.15" - sources."markdown-link-extractor-1.2.2" - sources."marked-0.7.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."markdown-link-extractor-1.2.3" + sources."marked-0.8.2" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."ms-2.1.2" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" sources."progress-2.0.3" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."request-2.88.2" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sshpk-1.16.1" - sources."supports-color-5.5.0" + sources."supports-color-7.1.0" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -68530,10 +69396,10 @@ in mathjax = nodeEnv.buildNodePackage { name = "mathjax"; packageName = "mathjax"; - version = "3.0.1"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/mathjax/-/mathjax-3.0.1.tgz"; - sha512 = "hrwOeKm3b1X4zpvLRSX89y3MZLRJTq0bSGIbo5M6BANOeGlL2z8Y8mZaKRFJ/WY4qcIrHp3f+Q9RWIaldOCUVg=="; + url = "https://registry.npmjs.org/mathjax/-/mathjax-3.0.5.tgz"; + sha512 = "9M7VulhltkD8sIebWutK/VfAD+m+6BIFqfpjDh9Pz/etoKUtjO6UMnOhUcDmNl6iApE8C9xrUmaMyNZkZAlrMw=="; }; buildInputs = globalBuildInputs; meta = { @@ -68576,7 +69442,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined."; - homepage = https://bitbucket.org/aahmed/meat; + homepage = "https://bitbucket.org/aahmed/meat"; }; production = true; bypassCache = true; @@ -68827,7 +69693,7 @@ in sources."fragment-cache-0.2.1" (sources."fs-mkdirp-stream-1.0.0" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."readable-stream-2.3.7" sources."string_decoder-1.1.1" sources."through2-2.0.5" @@ -68882,7 +69748,7 @@ in }) (sources."gulp-sourcemaps-2.6.5" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."readable-stream-2.3.7" sources."source-map-0.6.1" sources."string_decoder-1.1.1" @@ -68899,7 +69765,7 @@ in sources."extend-shallow-1.1.4" sources."glob-7.1.6" sources."glob-stream-6.1.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."kind-of-1.1.0" sources."minimatch-3.0.4" sources."ordered-read-streams-1.0.1" @@ -68967,7 +69833,7 @@ in ]; }) sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" + sources."is-promise-2.2.2" sources."is-relative-1.0.0" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" @@ -69000,7 +69866,7 @@ in sources."lead-1.0.0" (sources."less-2.7.3" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" ]; }) sources."liftoff-2.5.0" @@ -69039,8 +69905,8 @@ in sources."memoizee-0.4.14" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-2.0.10" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { @@ -69048,7 +69914,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."multipipe-0.1.2" sources."nanomatch-1.2.13" @@ -69127,9 +69993,9 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."replace-ext-1.0.0" + sources."replace-ext-1.0.1" sources."request-2.81.0" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -69241,11 +70107,7 @@ in sources."tweetnacl-0.14.5" sources."type-1.2.0" sources."typescript-3.8.3" - (sources."uglify-js-3.8.0" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."uglify-js-3.9.2" sources."uglify-to-browserify-1.0.2" sources."unc-path-regex-0.1.2" sources."union-value-1.0.1" @@ -69282,7 +70144,7 @@ in dependencies = [ sources."clone-2.1.2" sources."clone-stats-1.0.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."vinyl-2.2.0" ]; }) @@ -69308,10 +70170,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-7.1.1.tgz"; - sha512 = "3qQsu3ijNS3GkWcccT5Zw0hf/rWvu1fTN9sPvEd81hlwsr30GX2GcDSSoBxo24IR8FelmrAydGC6/1J5QQP4WA=="; + url = "https://registry.npmjs.org/mocha/-/mocha-7.1.2.tgz"; + sha512 = "o96kdRKMKI3E8U0bjnfqW4QMk12MwZ4mhdBTf+B5a1q9+aq2HRnj+3ZdJu0B/ZhJeK78MgYuv6L8d/rA5AeBJA=="; }; dependencies = [ sources."ansi-colors-3.2.3" @@ -69354,7 +70216,7 @@ in sources."find-up-3.0.0" sources."flat-4.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."glob-7.1.3" @@ -69383,7 +70245,7 @@ in sources."log-symbols-3.0.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.3" + sources."mkdirp-0.5.5" sources."ms-2.1.1" sources."node-environment-flags-1.0.6" sources."normalize-path-3.0.0" @@ -69392,7 +70254,7 @@ in sources."object.assign-4.1.0" sources."object.getownpropertydescriptors-2.1.0" sources."once-1.4.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."path-exists-3.0.0" @@ -69405,8 +70267,10 @@ in sources."set-blocking-2.0.0" sources."sprintf-js-1.0.3" sources."string-width-2.1.1" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" sources."strip-ansi-4.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-6.0.0" @@ -69436,7 +70300,7 @@ in buildInputs = globalBuildInputs; meta = { description = "simple, flexible, fun test framework"; - homepage = https://mochajs.org/; + homepage = "https://mochajs.org/"; license = "MIT"; }; production = true; @@ -69477,14 +70341,14 @@ in sources."lodash-4.17.15" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."ms-2.1.2" sources."native-promise-only-0.8.1" sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.9.2" + sources."qs-6.9.4" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."slash-3.0.0" @@ -69512,7 +70376,7 @@ in sha512 = "gGiVq/r9iIrp2XCdDXb3fBEW4e3H6zMLxgTGuG5e6MaxiLzLnUZj2ersr4r+Ij8qnbRFxCqCrOw5d7lyrGPcWg=="; }; dependencies = [ - sources."@msgpack/msgpack-1.12.0" + sources."@msgpack/msgpack-1.12.1" sources."async-2.6.3" sources."color-3.0.0" sources."color-convert-1.9.3" @@ -69541,7 +70405,7 @@ in sources."process-nextick-args-2.0.1" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.0" - sources."semver-7.1.3" + sources."semver-7.3.2" sources."simple-swizzle-0.2.2" sources."stack-trace-0.0.10" sources."string_decoder-1.3.0" @@ -69560,7 +70424,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Neovim client API and neovim remote plugin provider"; - homepage = https://github.com/neovim/node-client; + homepage = "https://github.com/neovim/node-client"; license = "MIT"; }; production = true; @@ -69599,7 +70463,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -69634,7 +70498,7 @@ in sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" @@ -69651,13 +70515,13 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."nopt-4.0.3" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -69670,7 +70534,7 @@ in sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.7" @@ -69680,7 +70544,7 @@ in sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."sshpk-1.16.1" sources."string-width-1.0.2" sources."string_decoder-1.1.1" @@ -69711,15 +70575,15 @@ in node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.1.tgz"; - sha512 = "XyCKXsqZfLqHep1hhsMncoXuUNt/cXCjg1+8CLbu69V1TKuPiOeSGbL9n+k/ByKH8UT0p4rdIX8XkTRZV0i7Sw=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.2.tgz"; + sha512 = "Lqh7mrByWCM8Cf9UPqpeoVBBo5Ugx+RKu885GAzmLBVYjeywScxHXPGLa4JfYNZmcNGwzR0Glu5/9GaQZMFqyA=="; }; buildInputs = globalBuildInputs; meta = { description = "Build tool and bindings loader for node-gyp that supports prebuilds"; - homepage = https://github.com/prebuild/node-gyp-build; + homepage = "https://github.com/prebuild/node-gyp-build"; license = "MIT"; }; production = true; @@ -69818,7 +70682,7 @@ in ]; }) sources."glob-5.0.15" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-1.0.5" sources."har-validator-4.2.1" sources."has-unicode-2.0.1" @@ -69863,13 +70727,13 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ms-2.0.0" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."negotiator-0.6.2" (sources."node-pre-gyp-0.6.39" // { dependencies = [ @@ -69920,7 +70784,7 @@ in sources."qs-6.4.0" ]; }) - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."rimraf-2.2.8" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -69939,10 +70803,10 @@ in sources."serve-static-1.14.1" sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."sntp-1.0.9" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" (sources."sshpk-1.16.1" // { @@ -70015,7 +70879,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Web Inspector based nodeJS debugger"; - homepage = http://github.com/node-inspector/node-inspector; + homepage = "https://github.com/node-inspector/node-inspector"; }; production = true; bypassCache = true; @@ -70061,9 +70925,9 @@ in sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."needle-2.4.0" + sources."needle-2.4.1" sources."nopt-4.0.3" sources."npm-bundled-1.1.1" sources."npm-normalize-package-bin-1.0.1" @@ -70085,7 +70949,7 @@ in sources."sax-1.2.4" sources."semver-5.7.1" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -70109,16 +70973,16 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.0.4.tgz"; - sha512 = "7cRGr69ibl7vnEMWEO2qHhO4L6ft2XsySoE+mMSW7h2tODNTNECelCQtTA+kYfX1wlFS3axu52Y2Br0AV5D+ww=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.0.6.tgz"; + sha512 = "5K7LKdy232xLSHMo3ZprAEHbLilszSD/qQkt+9PxByJnEMACeHJ7SH4Gpt/1FX+K75gHHNtlnHsWwpQ53lggEA=="; }; dependencies = [ - sources."@babel/runtime-7.9.2" - sources."@node-red/editor-api-1.0.4" - sources."@node-red/editor-client-1.0.4" - (sources."@node-red/nodes-1.0.4" // { + sources."@babel/runtime-7.9.6" + sources."@node-red/editor-api-1.0.6" + sources."@node-red/editor-client-1.0.6" + (sources."@node-red/nodes-1.0.6" // { dependencies = [ sources."http-errors-1.7.3" sources."iconv-lite-0.5.1" @@ -70131,9 +70995,9 @@ in }) ]; }) - sources."@node-red/registry-1.0.4" - sources."@node-red/runtime-1.0.4" - sources."@node-red/util-1.0.4" + sources."@node-red/registry-1.0.6" + sources."@node-red/runtime-1.0.6" + sources."@node-red/util-1.0.6" sources."abbrev-1.1.1" sources."accepts-1.3.7" (sources."agent-base-6.0.0" // { @@ -70228,15 +71092,11 @@ in }) sources."content-type-1.0.4" sources."cookie-0.4.0" - (sources."cookie-parser-1.4.4" // { - dependencies = [ - sources."cookie-0.3.1" - ]; - }) + sources."cookie-parser-1.4.5" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" sources."cors-2.8.5" - sources."cron-1.8.2" + sources."cron-1.7.2" sources."css-select-1.2.0" sources."css-what-2.1.3" sources."d-1.0.1" @@ -70324,7 +71184,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" @@ -70364,7 +71224,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" - sources."jsonata-1.8.1" + sources."jsonata-1.8.3" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."leven-2.1.0" @@ -70390,8 +71250,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" (sources."minipass-2.9.0" // { @@ -70400,8 +71260,8 @@ in ]; }) sources."minizlib-1.3.3" - sources."mkdirp-0.5.4" - sources."moment-2.24.0" + sources."mkdirp-0.5.5" + sources."moment-2.25.3" sources."moment-timezone-0.5.28" (sources."mqtt-2.18.8" // { dependencies = [ @@ -70413,9 +71273,9 @@ in sources."mqtt-packet-5.6.1" sources."ms-2.0.0" sources."multer-1.4.2" - sources."mustache-4.0.0" + sources."mustache-4.0.1" sources."nan-2.13.2" - (sources."needle-2.4.0" // { + (sources."needle-2.4.1" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -70430,7 +71290,7 @@ in }) sources."node-red-node-rbe-0.2.8" sources."node-red-node-tail-0.1.1" - sources."nopt-4.0.1" + 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" @@ -70466,7 +71326,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.6" sources."pseudomap-1.0.2" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -70503,7 +71363,7 @@ in sources."serve-static-1.14.1" sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."source-map-0.6.1" sources."split2-2.2.0" sources."sprintf-js-1.0.3" @@ -70541,7 +71401,7 @@ in sources."type-1.2.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.8.0" + sources."uglify-js-3.8.1" sources."uid-safe-2.1.5" sources."uid2-0.0.3" sources."ultron-1.1.1" @@ -70586,7 +71446,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Low-code programming for event-driven applications"; - homepage = http://nodered.org/; + homepage = "https://nodered.org/"; license = "Apache-2.0"; }; production = true; @@ -70603,7 +71463,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -70619,7 +71479,7 @@ in sources."buffer-from-1.1.1" sources."builtins-1.0.3" sources."caseless-0.12.0" - sources."chownr-1.1.4" + sources."chownr-2.0.0" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" @@ -70655,7 +71515,7 @@ in sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" @@ -70674,13 +71534,13 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-3.1.1" sources."minizlib-2.1.0" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ncp-0.4.2" sources."nijs-0.0.25" sources."nopt-3.0.6" @@ -70719,7 +71579,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" (sources."readable-stream-2.3.7" // { @@ -70728,18 +71588,18 @@ in ]; }) sources."request-2.88.2" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."semver-7.1.3" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."slasp-0.0.4" sources."slide-1.1.6" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."sshpk-1.16.1" @@ -70751,9 +71611,9 @@ in ]; }) sources."strip-ansi-3.0.1" - (sources."tar-6.0.1" // { + (sources."tar-6.0.2" // { dependencies = [ - sources."mkdirp-1.0.3" + sources."mkdirp-1.0.4" ]; }) sources."temp-0.9.1" @@ -70776,7 +71636,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; - homepage = https://github.com/svanderburg/node2nix; + homepage = "https://github.com/svanderburg/node2nix"; license = "MIT"; }; production = true; @@ -70786,125 +71646,161 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.2.tgz"; - sha512 = "GWhYPMfde2+M0FsHnggIHXTqPDHXia32HRhh6H0d75Mt9FKUoCBvumNHr7LdrpPBTKxsWmIEOjoN+P4IU6Hcaw=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.3.tgz"; + sha512 = "lLQLPS90Lqwc99IHe0U94rDgvjo+G9I4uEIxRG3evSLROcqQ9hwc0AxlSHKS4T1JW/IMj/7N5mthiN58NL/5kw=="; }; dependencies = [ + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."@types/color-name-1.1.1" sources."abbrev-1.1.1" - sources."ansi-align-2.0.0" - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" + (sources."ansi-align-3.0.0" // { + dependencies = [ + sources."string-width-3.1.0" + ]; + }) + sources."ansi-regex-4.1.0" + sources."ansi-styles-4.2.1" sources."anymatch-3.1.1" sources."balanced-match-1.0.0" sources."binary-extensions-2.0.0" - sources."boxen-1.3.0" + sources."boxen-4.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.1" - sources."chalk-2.4.2" - sources."chokidar-3.3.1" - sources."ci-info-1.6.0" - sources."cli-boxes-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.1.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."camelcase-5.3.1" + (sources."chalk-3.0.0" // { + dependencies = [ + sources."has-flag-4.0.0" + sources."supports-color-7.1.0" + ]; + }) + sources."chokidar-3.4.0" + sources."ci-info-2.0.0" + sources."cli-boxes-2.2.0" + sources."clone-response-1.0.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."concat-map-0.0.1" - sources."configstore-3.1.2" - sources."create-error-class-3.0.2" - sources."cross-spawn-5.1.0" - sources."crypto-random-string-1.0.0" + sources."configstore-5.0.1" + sources."crypto-random-string-2.0.0" sources."debug-3.2.6" + sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" - sources."dot-prop-4.2.0" + sources."defer-to-connect-1.1.3" + sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."escape-string-regexp-1.0.5" - sources."execa-0.7.0" + sources."emoji-regex-7.0.3" + sources."end-of-stream-1.4.4" + sources."escape-goat-2.1.1" sources."fill-range-7.0.1" - sources."fsevents-2.1.2" - sources."get-stream-3.0.0" + sources."fsevents-2.1.3" + sources."get-stream-4.1.0" sources."glob-parent-5.1.1" - sources."global-dirs-0.1.1" - sources."got-6.7.1" - sources."graceful-fs-4.2.3" + sources."global-dirs-2.0.1" + sources."got-9.6.0" + sources."graceful-fs-4.2.4" sources."has-flag-3.0.0" + sources."has-yarn-2.1.0" + sources."http-cache-semantics-4.1.0" sources."ignore-by-default-1.0.1" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."ini-1.3.5" sources."is-binary-path-2.1.0" - sources."is-ci-1.2.1" + sources."is-ci-2.0.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" - sources."is-installed-globally-0.1.0" - sources."is-npm-1.0.0" + sources."is-installed-globally-0.3.2" + sources."is-npm-4.0.0" sources."is-number-7.0.0" - sources."is-obj-1.0.1" - sources."is-path-inside-1.0.1" - sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.2.0" - sources."is-stream-1.1.0" - sources."isexe-2.0.0" - sources."latest-version-3.1.0" + sources."is-obj-2.0.0" + sources."is-path-inside-3.0.2" + sources."is-typedarray-1.0.0" + sources."is-yarn-global-0.3.0" + sources."json-buffer-3.0.0" + sources."keyv-3.1.0" + sources."latest-version-5.1.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-4.1.5" - sources."make-dir-1.3.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."ms-2.1.2" sources."nopt-1.0.10" sources."normalize-path-3.0.0" - sources."npm-run-path-2.0.2" - sources."p-finally-1.0.0" - sources."package-json-4.0.1" - sources."path-is-inside-1.0.2" - sources."path-key-2.0.1" + sources."normalize-url-4.5.0" + sources."once-1.4.0" + sources."p-cancelable-1.1.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."picomatch-2.2.2" - sources."pify-3.0.0" - sources."prepend-http-1.0.4" - sources."pseudomap-1.0.2" + sources."prepend-http-2.0.0" sources."pstree.remy-1.1.7" + sources."pump-3.0.0" + sources."pupa-2.0.1" sources."rc-1.2.8" - sources."readdirp-3.3.0" - sources."registry-auth-token-3.4.0" - sources."registry-url-3.1.0" - sources."safe-buffer-5.2.0" + sources."readdirp-3.4.0" + sources."registry-auth-token-4.1.1" + sources."registry-url-5.1.0" + sources."responselike-1.0.2" sources."semver-5.7.1" - sources."semver-diff-2.1.0" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - sources."strip-eof-1.0.0" + (sources."semver-diff-3.1.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."signal-exit-3.0.3" + (sources."string-width-4.2.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."strip-ansi-6.0.0" + ]; + }) + sources."strip-ansi-5.2.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."term-size-1.2.0" - sources."timed-out-4.0.1" + sources."term-size-2.2.0" + sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."touch-3.1.0" + sources."type-fest-0.8.1" + sources."typedarray-to-buffer-3.1.5" (sources."undefsafe-2.0.3" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" ]; }) - sources."unique-string-1.0.0" - sources."unzip-response-2.0.1" - sources."update-notifier-2.5.0" - sources."url-parse-lax-1.0.0" - sources."which-1.3.1" - sources."widest-line-2.0.1" - sources."write-file-atomic-2.4.3" - sources."xdg-basedir-3.0.0" - sources."yallist-2.1.2" + sources."unique-string-2.0.0" + sources."update-notifier-4.1.0" + sources."url-parse-lax-3.0.0" + sources."widest-line-3.1.0" + sources."wrappy-1.0.2" + sources."write-file-atomic-3.0.3" + sources."xdg-basedir-4.0.0" ]; buildInputs = globalBuildInputs; meta = { description = "Simple monitor script for use during development of a node.js app."; - homepage = http://nodemon.io/; + homepage = "https://nodemon.io/"; license = "MIT"; }; production = true; @@ -70914,15 +71810,15 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.14.3"; + version = "6.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.14.3.tgz"; - sha512 = "3tQYVEEdSGQGYoXhZvNqW8faqCidfMMaL387RdDo4Uu5kQy4IgvJ13NIsWVMQ6e3QWlbicNMSpFiyzYfMUuPDw=="; + url = "https://registry.npmjs.org/npm/-/npm-6.14.5.tgz"; + sha512 = "CDwa3FJd0XJpKDbWCST484H+mCNjF26dPrU+xnREW+upR0UODjMEfXPl3bxWuAwZIX6c2ASg1plLO7jP8ehWeA=="; }; buildInputs = globalBuildInputs; meta = { description = "a package manager for JavaScript"; - homepage = https://docs.npmjs.com/; + homepage = "https://docs.npmjs.com/"; license = "Artistic-2.0"; }; production = true; @@ -70932,26 +71828,30 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "4.0.5"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-4.0.5.tgz"; - sha512 = "dO2jeEmD1DAa/8NKxQAuhVsICDYWKTL1kZkvUFyRNphK4NiLk1HA7Jk5mCfl2L2xU5FxiGhNq5vgYlivu+2kjw=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-4.1.2.tgz"; + sha512 = "CRO20Z12fygKL/ow4j4pnpyxevda/PuFbWpsF5E9sFW0B+M3d32A1dD+fTHLDjgderhKXr64W8qQ6M/Gq8OLiw=="; }; dependencies = [ sources."@npmcli/ci-detect-1.2.0" - sources."@npmcli/git-2.0.1" + sources."@npmcli/git-2.0.2" sources."@npmcli/installed-package-contents-1.0.5" - sources."@npmcli/promise-spawn-1.1.0" + sources."@npmcli/promise-spawn-1.2.0" + sources."@npmcli/run-script-1.3.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@tootallnate/once-1.0.0" + sources."@tootallnate/once-1.1.2" sources."@types/color-name-1.1.1" + sources."abbrev-1.1.1" sources."agent-base-6.0.0" - sources."agentkeepalive-4.1.0" + sources."agentkeepalive-4.1.2" sources."aggregate-error-3.0.1" + sources."ajv-6.12.2" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -70959,13 +71859,28 @@ in 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."argparse-1.0.10" sources."asap-2.0.6" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.9.1" sources."balanced-match-1.0.0" - sources."boxen-4.2.0" + sources."bcrypt-pbkdf-1.0.2" + (sources."boxen-4.2.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) sources."brace-expansion-1.1.11" sources."builtins-1.0.3" - sources."cacache-15.0.0" + sources."cacache-15.0.3" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.1.0" @@ -70973,65 +71888,79 @@ in ]; }) sources."camelcase-5.3.1" + sources."caseless-0.12.0" sources."chalk-3.0.0" - sources."chownr-1.1.4" + sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."cint-8.2.1" sources."clean-stack-2.2.0" sources."cli-boxes-2.2.0" sources."cli-table-0.3.1" sources."clone-response-1.0.2" + sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."colors-1.0.3" - sources."commander-5.0.0" + sources."combined-stream-1.0.8" + sources."commander-5.1.0" sources."concat-map-0.0.1" sources."configstore-5.0.1" - (sources."copy-concurrently-1.0.5" // { - dependencies = [ - sources."mkdirp-0.5.4" - ]; - }) + sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."crypto-random-string-2.0.0" + sources."dashdash-1.14.1" sources."debug-4.1.1" sources."debuglog-1.0.1" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" sources."depd-1.1.2" sources."dezalgo-1.0.3" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.2" sources."emoji-regex-7.0.3" sources."encoding-0.1.12" sources."end-of-stream-1.4.4" + sources."env-paths-2.2.0" sources."err-code-1.1.2" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.1" sources."fast-diff-1.2.0" + sources."fast-json-stable-stringify-2.1.0" sources."figgy-pudding-3.5.2" sources."find-up-4.1.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" sources."fs-minipass-2.1.0" - sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" sources."get-stdin-7.0.0" sources."get-stream-4.1.0" + sources."getpass-0.1.7" sources."glob-7.1.6" sources."global-dirs-2.0.1" sources."got-9.6.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" sources."has-ansi-2.0.0" sources."has-flag-4.0.0" + sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" sources."hosted-git-info-3.0.4" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-4.0.1" + sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" - sources."iferr-0.1.5" sources."ignore-walk-3.0.3" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -71042,8 +71971,8 @@ in sources."ini-1.3.5" sources."ip-1.1.5" sources."is-ci-2.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."is-installed-globally-0.3.1" + sources."is-fullwidth-code-point-1.0.0" + sources."is-installed-globally-0.3.2" sources."is-lambda-1.0.1" sources."is-npm-4.0.0" sources."is-obj-2.0.0" @@ -71052,13 +71981,19 @@ in sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" sources."isexe-2.0.0" + sources."isstream-0.1.2" sources."jju-1.4.0" sources."js-yaml-3.13.1" + sources."jsbn-0.1.1" sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.2.0" sources."json-parse-helpfulerror-1.0.3" - sources."json5-2.1.2" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."json5-2.1.3" sources."jsonparse-1.3.1" + sources."jsprim-1.4.1" sources."keyv-3.1.0" sources."kleur-3.0.3" sources."latest-version-5.1.0" @@ -71074,12 +72009,14 @@ in sources."lodash-4.17.15" sources."lowercase-keys-1.0.1" sources."lru-cache-5.1.1" - (sources."make-dir-3.0.2" // { + (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-8.0.4" + sources."make-fetch-happen-8.0.6" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -71089,22 +72026,23 @@ in ]; }) sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.2.1" - sources."minipass-flush-1.0.5" - sources."minipass-json-stream-1.0.1" - sources."minipass-pipeline-1.2.2" - sources."minipass-sized-1.0.3" - (sources."minizlib-2.1.0" // { + (sources."minipass-fetch-1.2.1" // { dependencies = [ + sources."minizlib-2.1.0" sources."yallist-4.0.0" ]; }) - sources."mkdirp-1.0.3" - (sources."move-concurrently-1.0.1" // { + sources."minipass-flush-1.0.5" + sources."minipass-json-stream-1.0.1" + sources."minipass-pipeline-1.2.2" + sources."minipass-sized-1.0.3" + (sources."minizlib-1.3.3" // { dependencies = [ - sources."mkdirp-0.5.4" + sources."minipass-2.9.0" ]; }) + sources."mkdirp-1.0.4" + sources."move-file-2.0.0" sources."ms-2.1.2" sources."nested-error-stacks-2.0.1" (sources."node-alias-1.0.4" // { @@ -71114,37 +72052,66 @@ in sources."supports-color-2.0.0" ]; }) + (sources."node-gyp-6.1.0" // { + dependencies = [ + sources."chownr-1.1.4" + sources."fs-minipass-1.2.7" + sources."minipass-2.9.0" + sources."mkdirp-0.5.5" + sources."rimraf-2.7.1" + sources."semver-5.7.1" + sources."tar-4.4.13" + sources."which-1.3.1" + ]; + }) + sources."nopt-4.0.3" sources."normalize-url-4.5.0" sources."npm-bundled-1.1.1" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" sources."npm-package-arg-8.0.1" sources."npm-packlist-2.1.1" - sources."npm-pick-manifest-6.0.0" - sources."npm-registry-fetch-8.0.0" + sources."npm-pick-manifest-6.1.0" + (sources."npm-registry-fetch-8.0.2" // { + dependencies = [ + sources."minizlib-2.1.0" + sources."yallist-4.0.0" + ]; + }) + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + 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-cancelable-1.1.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-4.1.0" - sources."p-map-3.0.0" + sources."p-map-4.0.0" sources."p-try-2.2.0" (sources."package-json-6.5.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."pacote-11.1.4" + sources."pacote-11.1.8" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" + sources."performance-now-2.1.0" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."promise-retry-1.1.1" sources."prompts-2.3.2" + sources."psl-1.8.0" sources."pump-3.0.0" + sources."punycode-2.1.1" sources."pupa-2.0.1" + sources."qs-6.5.2" sources."rc-1.2.8" sources."rc-config-loader-3.0.0" sources."read-package-json-fast-1.1.3" @@ -71152,60 +72119,71 @@ in sources."readdir-scoped-modules-1.1.0" sources."registry-auth-token-4.1.1" sources."registry-url-5.1.0" + sources."request-2.88.2" sources."require-from-string-2.0.2" sources."requireg-0.2.2" sources."resolve-1.7.1" sources."responselike-1.0.2" sources."retry-0.10.1" - sources."rimraf-2.7.1" - sources."run-queue-1.0.3" + sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-7.1.3" + sources."semver-7.3.2" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."semver-utils-1.1.4" - sources."signal-exit-3.0.2" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.3" sources."sisteransi-1.0.5" sources."smart-buffer-4.1.0" sources."socks-2.3.3" sources."socks-proxy-agent-5.0.0" sources."spawn-please-0.3.0" sources."sprintf-js-1.0.3" + sources."sshpk-1.16.1" sources."ssri-8.0.0" - (sources."string-width-4.2.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."strip-ansi-6.0.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."supports-color-7.1.0" - (sources."tar-6.0.1" // { + (sources."tar-6.0.2" // { dependencies = [ + sources."minizlib-2.1.0" sources."yallist-4.0.0" ]; }) sources."term-size-2.2.0" sources."to-readable-stream-1.0.0" + sources."tough-cookie-2.5.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" sources."type-fest-0.8.1" sources."typedarray-to-buffer-3.1.5" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-2.0.0" sources."update-notifier-4.1.0" + sources."uri-js-4.2.2" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" + sources."uuid-3.4.0" sources."validate-npm-package-name-3.0.0" + sources."verror-1.10.0" sources."which-2.0.2" - sources."widest-line-3.1.0" + sources."wide-align-1.1.3" + (sources."widest-line-3.1.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.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."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" @@ -71214,7 +72192,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Find newer versions of dependencies than what your package.json or bower.json allows"; - homepage = https://github.com/tjunnone/npm-check-updates; + homepage = "https://github.com/tjunnone/npm-check-updates"; license = "Apache-2.0"; }; production = true; @@ -71232,7 +72210,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -71282,7 +72260,7 @@ in (sources."fstream-0.1.31" // { dependencies = [ sources."graceful-fs-3.0.12" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" ]; }) sources."gauge-2.7.4" @@ -71306,8 +72284,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.3.5" @@ -71336,7 +72314,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" (sources."readable-stream-2.3.7" // { @@ -71351,7 +72329,7 @@ in sources."safer-buffer-2.1.2" sources."semver-4.3.6" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."slide-1.1.6" sources."sshpk-1.16.1" sources."string-width-1.0.2" @@ -71388,7 +72366,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to build npm packages"; - homepage = https://github.com/NixOS/npm2nix; + homepage = "https://github.com/NixOS/npm2nix"; }; production = true; bypassCache = true; @@ -71429,7 +72407,7 @@ in buildInputs = globalBuildInputs; meta = { description = "OCaml language server"; - homepage = https://github.com/freebroccolo/ocaml-language-server; + homepage = "https://github.com/freebroccolo/ocaml-language-server"; license = "Apache-2.0"; }; production = true; @@ -71446,14 +72424,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/compat-data-7.9.0" - (sources."@babel/core-7.9.0" // { + sources."@babel/compat-data-7.9.6" + (sources."@babel/core-7.9.6" // { dependencies = [ - sources."json5-2.1.2" + sources."json5-2.1.3" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.9.4" // { + (sources."@babel/generator-7.9.6" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -71461,12 +72439,12 @@ in sources."@babel/helper-annotate-as-pure-7.8.3" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" sources."@babel/helper-builder-react-jsx-7.9.0" - sources."@babel/helper-builder-react-jsx-experimental-7.9.0" - sources."@babel/helper-compilation-targets-7.8.7" + sources."@babel/helper-builder-react-jsx-experimental-7.9.5" + sources."@babel/helper-compilation-targets-7.9.6" sources."@babel/helper-create-regexp-features-plugin-7.8.8" sources."@babel/helper-define-map-7.8.3" sources."@babel/helper-explode-assignable-expression-7.8.3" - sources."@babel/helper-function-name-7.8.3" + sources."@babel/helper-function-name-7.9.5" sources."@babel/helper-get-function-arity-7.8.3" sources."@babel/helper-hoist-variables-7.8.3" sources."@babel/helper-member-expression-to-functions-7.8.3" @@ -71476,20 +72454,20 @@ in sources."@babel/helper-plugin-utils-7.8.3" sources."@babel/helper-regex-7.8.3" sources."@babel/helper-remap-async-to-generator-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-replace-supers-7.9.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" - sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/helper-wrap-function-7.8.3" - sources."@babel/helpers-7.9.2" + sources."@babel/helpers-7.9.6" sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@babel/plugin-proposal-async-generator-functions-7.8.3" sources."@babel/plugin-proposal-dynamic-import-7.8.3" sources."@babel/plugin-proposal-json-strings-7.8.3" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-proposal-numeric-separator-7.8.3" - sources."@babel/plugin-proposal-object-rest-spread-7.9.0" + sources."@babel/plugin-proposal-object-rest-spread-7.9.6" sources."@babel/plugin-proposal-optional-catch-binding-7.8.3" sources."@babel/plugin-proposal-optional-chaining-7.9.0" sources."@babel/plugin-proposal-unicode-property-regex-7.8.8" @@ -71508,9 +72486,9 @@ in sources."@babel/plugin-transform-async-to-generator-7.8.3" sources."@babel/plugin-transform-block-scoped-functions-7.8.3" sources."@babel/plugin-transform-block-scoping-7.8.3" - sources."@babel/plugin-transform-classes-7.9.2" + sources."@babel/plugin-transform-classes-7.9.5" sources."@babel/plugin-transform-computed-properties-7.8.3" - sources."@babel/plugin-transform-destructuring-7.8.8" + sources."@babel/plugin-transform-destructuring-7.9.5" sources."@babel/plugin-transform-dotall-regex-7.8.3" sources."@babel/plugin-transform-duplicate-keys-7.8.3" sources."@babel/plugin-transform-exponentiation-operator-7.8.3" @@ -71519,14 +72497,14 @@ in sources."@babel/plugin-transform-function-name-7.8.3" sources."@babel/plugin-transform-literals-7.8.3" sources."@babel/plugin-transform-member-expression-literals-7.8.3" - sources."@babel/plugin-transform-modules-amd-7.9.0" - sources."@babel/plugin-transform-modules-commonjs-7.9.0" - sources."@babel/plugin-transform-modules-systemjs-7.9.0" + sources."@babel/plugin-transform-modules-amd-7.9.6" + sources."@babel/plugin-transform-modules-commonjs-7.9.6" + sources."@babel/plugin-transform-modules-systemjs-7.9.6" sources."@babel/plugin-transform-modules-umd-7.9.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" sources."@babel/plugin-transform-new-target-7.8.3" sources."@babel/plugin-transform-object-super-7.8.3" - sources."@babel/plugin-transform-parameters-7.9.3" + sources."@babel/plugin-transform-parameters-7.9.5" sources."@babel/plugin-transform-property-literals-7.8.3" sources."@babel/plugin-transform-react-jsx-7.9.4" sources."@babel/plugin-transform-regenerator-7.8.7" @@ -71537,13 +72515,13 @@ in sources."@babel/plugin-transform-template-literals-7.8.3" sources."@babel/plugin-transform-typeof-symbol-7.8.4" sources."@babel/plugin-transform-unicode-regex-7.8.3" - sources."@babel/preset-env-7.9.0" + sources."@babel/preset-env-7.9.6" sources."@babel/preset-modules-0.1.3" - sources."@babel/runtime-7.9.2" + sources."@babel/runtime-7.9.6" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.9.0" - sources."@babel/types-7.9.0" - sources."@iarna/toml-2.2.3" + sources."@babel/traverse-7.9.6" + sources."@babel/types-7.9.6" + sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@parcel/fs-1.11.0" @@ -71560,7 +72538,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."alphanum-sort-1.0.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -71592,7 +72570,7 @@ in sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" - sources."babel-plugin-dynamic-import-node-2.3.0" + sources."babel-plugin-dynamic-import-node-2.3.3" (sources."babel-runtime-6.26.0" // { dependencies = [ sources."regenerator-runtime-0.11.1" @@ -71631,7 +72609,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.11.0" + sources."browserslist-4.12.0" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -71648,7 +72626,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001036" + sources."caniuse-lite-1.0.30001050" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -71670,7 +72648,7 @@ in sources."color-name-1.1.3" sources."color-string-1.5.3" sources."combined-stream-1.0.8" - sources."command-exists-1.2.8" + sources."command-exists-1.2.9" sources."commander-2.20.3" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" @@ -71680,7 +72658,7 @@ in sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.11" - (sources."core-js-compat-3.6.4" // { + (sources."core-js-compat-3.6.5" // { dependencies = [ sources."semver-7.0.0" ]; @@ -71732,7 +72710,7 @@ in sources."cssstyle-1.4.0" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."deasync-0.1.19" + sources."deasync-0.1.20" sources."debug-4.1.1" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -71781,12 +72759,12 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.383" + sources."electron-to-chromium-1.3.427" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."entities-1.1.2" - sources."envinfo-7.5.0" + sources."envinfo-7.5.1" sources."error-ex-1.3.2" (sources."es-abstract-1.17.5" // { dependencies = [ @@ -71826,7 +72804,7 @@ in sources."file-uri-to-path-1.0.0" sources."filesize-3.6.1" sources."fill-range-4.0.0" - sources."find-up-3.0.0" + sources."find-up-2.1.0" sources."for-in-1.0.2" sources."foreach-2.0.5" sources."forever-agent-0.6.1" @@ -71849,7 +72827,7 @@ in }) sources."glob-to-regexp-0.3.0" sources."globals-11.12.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."grapheme-breaker-0.3.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -71867,7 +72845,12 @@ in sources."kind-of-4.0.0" ]; }) - sources."hash-base-3.0.4" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.0" + ]; + }) sources."hash.js-1.1.7" sources."hex-color-regex-1.1.0" sources."hmac-drbg-1.0.1" @@ -71878,8 +72861,8 @@ in sources."html-tags-1.2.0" (sources."htmlnano-0.2.5" // { dependencies = [ - sources."posthtml-0.12.0" - sources."terser-4.6.7" + sources."posthtml-0.12.3" + sources."terser-4.6.13" ]; }) (sources."htmlparser2-3.10.1" // { @@ -71967,7 +72950,7 @@ in sources."leven-3.1.0" sources."levenary-1.1.1" sources."levn-0.3.0" - sources."locate-path-3.0.0" + sources."locate-path-2.0.0" sources."lodash-4.17.15" sources."lodash.clone-4.5.0" sources."lodash.memoize-4.1.2" @@ -71996,8 +72979,8 @@ in }) sources."miller-rabin-4.0.1" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -72008,9 +72991,9 @@ in sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."nan-2.14.0" + sources."nan-2.14.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."define-property-2.0.2" @@ -72027,11 +73010,7 @@ in sources."punycode-1.4.1" ]; }) - (sources."node-releases-1.1.52" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) + sources."node-releases-1.1.53" sources."normalize-html-whitespace-1.0.0" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" @@ -72054,9 +73033,9 @@ in sources."optionator-0.8.3" sources."ora-2.1.0" sources."os-browserify-0.3.0" - sources."p-limit-2.2.2" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" sources."pako-0.2.9" sources."parse-asn1-5.1.5" sources."parse-json-4.0.0" @@ -72072,17 +73051,17 @@ in sources."pbkdf2-3.0.17" sources."performance-now-2.1.0" sources."physical-cpu-count-2.0.0" - sources."pkg-up-3.1.0" + sources."pkg-up-2.0.0" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.27" // { + (sources."postcss-7.0.29" // { dependencies = [ sources."supports-color-6.1.0" ]; }) (sources."postcss-calc-7.0.2" // { dependencies = [ - sources."postcss-value-parser-4.0.3" + sources."postcss-value-parser-4.1.0" ]; }) sources."postcss-colormin-4.0.3" @@ -72143,12 +73122,12 @@ in sources."postcss-value-parser-3.3.1" sources."posthtml-0.11.6" sources."posthtml-parser-0.4.2" - sources."posthtml-render-1.2.0" + sources."posthtml-render-1.2.2" sources."prelude-ls-1.1.2" sources."private-0.1.8" sources."process-0.11.10" sources."process-nextick-args-2.0.1" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."public-encrypt-4.0.3" sources."punycode-2.1.1" sources."purgecss-1.4.2" @@ -72191,7 +73170,7 @@ in sources."request-promise-native-1.0.8" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -72226,7 +73205,7 @@ in sources."shallow-copy-0.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" (sources."simple-swizzle-0.2.2" // { dependencies = [ sources."is-arrayish-0.3.2" @@ -72247,7 +73226,7 @@ in sources."snapdragon-util-3.0.1" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.16" + sources."source-map-support-0.5.19" sources."source-map-url-0.4.0" (sources."split-string-3.1.0" // { dependencies = [ @@ -72276,8 +73255,10 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" (sources."stylehacks-4.0.3" // { @@ -72381,7 +73362,15 @@ in sources."xmlchars-2.2.0" sources."xtend-4.0.2" sources."y18n-4.0.0" - sources."yargs-14.2.3" + (sources."yargs-14.2.3" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + ]; + }) sources."yargs-parser-15.0.1" ]; buildInputs = globalBuildInputs; @@ -72408,7 +73397,7 @@ in sources."negotiator-0.6.2" ]; }) - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -72466,7 +73455,7 @@ in sources."dicer-0.3.0" sources."dnscache-1.0.2" sources."dom-storage-2.1.0" - sources."domino-2.1.4" + sources."domino-2.1.5" sources."dtrace-provider-0.8.8" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" @@ -72502,8 +73491,8 @@ in sources."get-caller-file-2.0.5" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" - sources."handlebars-4.7.3" + sources."graceful-fs-4.2.4" + sources."handlebars-4.7.6" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-symbols-1.0.1" @@ -72545,20 +73534,16 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" - sources."minimist-0.0.10" - (sources."mkdirp-0.5.4" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) - sources."moment-2.24.0" + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" + sources."moment-2.25.3" sources."ms-2.0.0" sources."msgpack5-3.6.0" sources."mv-2.1.1" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."ncp-2.0.0" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."neo-async-2.6.1" @@ -72568,8 +73553,7 @@ in sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."optimist-0.6.1" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."parseurl-1.3.3" @@ -72583,7 +73567,7 @@ in sources."promise-8.1.0" sources."proxy-addr-2.0.6" sources."prr-1.0.1" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.7.0" sources."range-parser-1.2.1" @@ -72621,9 +73605,9 @@ in ]; }) sources."serve-static-1.14.1" - (sources."service-runner-2.7.6" // { + (sources."service-runner-2.7.7" // { dependencies = [ - sources."semver-7.1.3" + sources."semver-7.3.2" sources."yargs-14.2.3" ]; }) @@ -72643,7 +73627,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.8.0" + sources."uglify-js-3.9.2" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.2.2" @@ -72655,7 +73639,7 @@ in sources."which-module-2.0.0" sources."wikimedia-langconv-0.1.0" sources."wikipeg-2.0.3" - sources."wordwrap-0.0.3" + sources."wordwrap-1.0.0" sources."worker-farm-1.7.0" sources."wrap-ansi-5.1.0" sources."wrappy-1.0.2" @@ -72736,7 +73720,7 @@ in sources."chrome-dns-1.0.1" sources."chrome-net-3.3.3" sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."clivas-0.2.0" sources."code-point-at-1.1.0" sources."color-convert-1.9.3" @@ -72770,7 +73754,7 @@ in sources."flatten-0.0.1" (sources."fs-chunk-store-1.7.0" // { dependencies = [ - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" ]; }) sources."fs.realpath-1.0.0" @@ -72778,7 +73762,7 @@ in sources."get-browser-rtc-1.0.2" sources."get-stdin-4.0.1" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" @@ -72814,7 +73798,6 @@ in sources."is-date-object-1.0.2" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" - sources."is-promise-2.1.0" sources."is-regex-1.0.5" sources."is-symbol-1.0.3" sources."is-utf8-0.2.1" @@ -72834,12 +73817,13 @@ in sources."magnet-uri-5.2.4" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-2.4.4" + sources."mime-2.4.5" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.3.5" + sources."mkdirp-classic-0.5.3" sources."ms-2.0.0" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" @@ -72851,7 +73835,7 @@ in sources."numeral-2.0.6" sources."object-assign-4.1.1" sources."object-inspect-1.7.0" - sources."object-is-1.0.2" + sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."once-1.4.0" @@ -72894,11 +73878,7 @@ in sources."plist-1.2.0" sources."process-nextick-args-2.0.1" sources."pump-2.0.1" - (sources."random-access-file-2.1.3" // { - dependencies = [ - sources."mkdirp-0.5.4" - ]; - }) + sources."random-access-file-2.1.4" sources."random-access-storage-1.4.1" sources."random-iterate-1.0.1" sources."randombytes-2.1.0" @@ -72911,11 +73891,11 @@ in sources."redent-1.0.0" sources."regexp.prototype.flags-1.3.0" sources."repeating-2.0.1" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."restore-cursor-2.0.0" sources."reverse-http-1.3.0" sources."rimraf-2.7.1" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."run-parallel-1.1.9" sources."run-series-1.1.8" sources."rusha-0.8.13" @@ -72924,7 +73904,7 @@ in sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."server-destroy-1.0.1" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" sources."simple-peer-6.4.4" @@ -72937,14 +73917,16 @@ in }) sources."single-line-log-1.1.2" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" sources."string2compact-1.3.0" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -72990,7 +73972,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Streaming torrent client for Node.js"; - homepage = https://github.com/mafintosh/peerflix; + homepage = "https://github.com/mafintosh/peerflix"; license = "MIT"; }; production = true; @@ -73009,7 +73991,7 @@ in sources."accepts-1.3.7" sources."addr-to-ip-port-1.5.1" sources."after-0.8.2" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."archiver-3.1.1" (sources."archiver-utils-2.1.0" // { dependencies = [ @@ -73049,7 +74031,7 @@ in sources."bncode-0.5.3" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" - sources."buffer-5.5.0" + sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -73097,14 +74079,14 @@ in sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.4.0" // { + (sources."engine.io-3.4.1" // { dependencies = [ sources."cookie-0.3.1" sources."debug-4.1.1" sources."ms-2.1.2" ]; }) - (sources."engine.io-client-3.4.0" // { + (sources."engine.io-client-3.4.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -73134,7 +74116,7 @@ in sources."get-browser-rtc-1.0.2" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-binary2-1.0.3" // { @@ -73196,12 +74178,13 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" + sources."mkdirp-classic-0.5.3" (sources."morgan-1.10.0" // { dependencies = [ sources."depd-2.0.0" @@ -73241,11 +74224,11 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.6" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" - sources."random-access-file-2.1.3" + sources."random-access-file-2.1.4" sources."random-access-storage-1.4.1" sources."random-bytes-1.0.0" sources."random-iterate-1.0.1" @@ -73351,7 +74334,7 @@ in sources."verror-1.10.0" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."yeast-0.1.2" @@ -73370,15 +74353,160 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "4.12.0"; + version = "4.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-4.12.0.tgz"; - sha512 = "Sjvf66dfk2d7kRssvHX6x+d0j9NgIE9262vCKviJC+kTPcpZEwxsF/RjQ/CX07UmlDYAX2TWqNZz7jeiksMKSA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-4.14.2.tgz"; + sha512 = "srFTvu4mm2tzo+bt1QkahH3JJnBDXPbjboYOPSZRwocoyGcTxYgGr0aUHg6non0i8eFzbhUFqQiqG+iCJ5spbA=="; }; buildInputs = globalBuildInputs; meta = { description = "Fast, disk space efficient package manager"; - homepage = https://pnpm.js.org/; + homepage = "https://pnpm.js.org/"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + postcss-cli = nodeEnv.buildNodePackage { + name = "postcss-cli"; + packageName = "postcss-cli"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-7.1.1.tgz"; + sha512 = "bYQy5ydAQJKCMSpvaMg0ThPBeGYqhQXumjbFOmWnL4u65CYXQ16RfS6afGQpit0dGv/fNzxbdDtx8dkqOhhIbg=="; + }; + dependencies = [ + sources."@nodelib/fs.scandir-2.1.3" + sources."@nodelib/fs.stat-2.0.3" + sources."@nodelib/fs.walk-1.2.4" + sources."@types/color-name-1.1.1" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" + sources."anymatch-3.1.1" + sources."argparse-1.0.10" + sources."array-union-2.1.0" + sources."at-least-node-1.0.0" + sources."binary-extensions-2.0.0" + sources."braces-3.0.2" + sources."caller-callsite-2.0.0" + sources."caller-path-2.0.0" + sources."callsites-2.0.0" + sources."camelcase-5.3.1" + sources."chalk-4.0.0" + sources."chokidar-3.4.0" + sources."cliui-6.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."cosmiconfig-5.2.1" + sources."decamelize-1.2.0" + sources."dependency-graph-0.9.0" + sources."dir-glob-3.0.1" + sources."emoji-regex-8.0.0" + sources."error-ex-1.3.2" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + sources."fast-glob-3.2.2" + sources."fastq-1.7.0" + sources."fill-range-7.0.1" + sources."find-up-4.1.0" + sources."fs-extra-9.0.0" + sources."fsevents-2.1.3" + sources."get-caller-file-2.0.5" + sources."get-stdin-7.0.0" + sources."glob-parent-5.1.1" + sources."globby-11.0.0" + sources."graceful-fs-4.2.4" + sources."has-flag-4.0.0" + sources."ignore-5.1.4" + sources."import-cwd-2.1.0" + sources."import-fresh-2.0.0" + sources."import-from-2.1.0" + sources."is-arrayish-0.2.1" + sources."is-binary-path-2.1.0" + sources."is-directory-0.3.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."js-yaml-3.13.1" + sources."json-parse-better-errors-1.0.2" + sources."jsonfile-6.0.1" + sources."locate-path-5.0.0" + sources."lodash-4.17.15" + (sources."log-symbols-2.2.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) + sources."merge2-1.3.0" + sources."micromatch-4.0.2" + sources."normalize-path-3.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."parse-json-4.0.0" + sources."path-exists-4.0.0" + sources."path-type-4.0.0" + sources."picomatch-2.2.2" + sources."pify-2.3.0" + (sources."postcss-7.0.29" // { + dependencies = [ + sources."ansi-styles-3.2.1" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-6.1.0" + ]; + }) + sources."postcss-load-config-2.1.0" + (sources."postcss-reporter-6.0.1" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) + sources."pretty-hrtime-1.0.3" + sources."read-cache-1.0.0" + sources."readdirp-3.4.0" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."resolve-from-3.0.0" + sources."reusify-1.0.4" + sources."run-parallel-1.1.9" + sources."set-blocking-2.0.0" + sources."slash-3.0.0" + sources."source-map-0.6.1" + sources."sprintf-js-1.0.3" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.1.0" + sources."to-regex-range-5.0.1" + sources."universalify-1.0.0" + sources."which-module-2.0.0" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.0" + sources."yargs-15.3.1" + sources."yargs-parser-18.1.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "CLI for PostCSS"; + homepage = "https://github.com/postcss/postcss-cli#readme"; license = "MIT"; }; production = true; @@ -73388,15 +74516,15 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "2.0.2"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.0.2.tgz"; - sha512 = "5xJQIPT8BraI7ZnaDwSbu5zLrB6vvi8hVV58yHQ+QK64qrY40dULy0HSRlQ2/2IdzeBpjhDkqdcFBnFeDEMVdg=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz"; + sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; }; buildInputs = globalBuildInputs; meta = { description = "Prettier is an opinionated code formatter"; - homepage = https://prettier.io/; + homepage = "https://prettier.io/"; license = "MIT"; }; production = true; @@ -73478,7 +74606,7 @@ in sources."resolve-1.1.7" ]; }) - (sources."browserify-16.5.0" // { + (sources."browserify-16.5.1" // { dependencies = [ sources."concat-stream-1.6.2" ]; @@ -73496,7 +74624,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."buffer-5.5.0" + sources."buffer-5.2.1" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" @@ -73565,10 +74693,14 @@ in sources."get-stream-4.1.0" sources."glob-7.1.6" sources."globule-1.3.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."hash-base-3.0.4" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" @@ -73613,7 +74745,8 @@ in sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" + sources."mkdirp-classic-0.5.3" (sources."module-deps-6.2.2" // { dependencies = [ sources."concat-stream-1.6.2" @@ -73681,7 +74814,7 @@ in ]; }) sources."reject-unsatisfied-npm-version-1.0.0" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-from-npm-3.1.0" sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" @@ -73696,13 +74829,13 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.7.2" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."simple-concat-1.0.0" sources."size-rate-0.3.1" sources."slice-ansi-2.1.0" sources."sorcery-0.10.0" sources."source-map-0.5.7" - (sources."source-map-support-0.5.16" // { + (sources."source-map-support-0.5.19" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -73730,7 +74863,7 @@ in sources."rimraf-2.6.3" ]; }) - (sources."terser-4.6.7" // { + (sources."terser-4.6.13" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -73782,7 +74915,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A build system for PureScript projects"; - homepage = https://github.com/purescript-contrib/pulp; + homepage = "https://github.com/purescript-contrib/pulp"; license = "LGPL-3.0+"; }; production = true; @@ -73818,20 +74951,23 @@ in dependencies = [ sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" + sources."array-filter-1.0.0" sources."async-0.2.10" + sources."available-typed-arrays-1.0.2" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chalk-1.1.3" sources."colors-0.6.2" sources."concat-map-0.0.1" sources."cycle-1.0.3" - sources."deep-equal-2.0.1" + sources."deep-equal-2.0.3" sources."define-properties-1.1.3" sources."es-abstract-1.17.5" sources."es-get-iterator-1.1.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."eyes-0.1.8" + sources."foreach-2.0.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."glob-7.1.6" @@ -73852,17 +74988,18 @@ in sources."is-set-2.0.1" sources."is-string-1.0.5" sources."is-symbol-1.0.3" + sources."is-typed-array-1.1.3" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" sources."isstream-0.1.2" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."mute-stream-0.0.8" sources."ncp-0.4.2" sources."object-inspect-1.7.0" - sources."object-is-1.0.2" + sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."once-1.4.0" @@ -73876,13 +75013,16 @@ in sources."semver-5.7.1" sources."side-channel-1.0.2" sources."stack-trace-0.0.10" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."utile-0.2.1" sources."which-boxed-primitive-1.0.1" sources."which-collection-1.0.1" + sources."which-typed-array-1.1.2" (sources."winston-0.8.3" // { dependencies = [ sources."pkginfo-0.3.1" @@ -73923,7 +75063,7 @@ in sources."esprima-3.1.3" sources."esprima-fb-13001.1001.0-dev-harmony-fb" sources."glob-5.0.15" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -73934,7 +75074,7 @@ in }) sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."private-0.1.8" @@ -73947,7 +75087,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A set of complementary tools to React, including the JSX transformer."; - homepage = https://facebook.github.io/react; + homepage = "https://facebook.github.io/react"; license = "BSD-3-Clause"; }; production = true; @@ -73965,13 +75105,293 @@ in buildInputs = globalBuildInputs; meta = { description = "The HTML Presentation Framework"; - homepage = http://revealjs.com/; + homepage = "https://revealjs.com/"; license = "MIT"; }; production = true; bypassCache = true; reconstructLock = true; }; + "rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps" = nodeEnv.buildNodePackage { + name = "rust-analyzer"; + packageName = "rust-analyzer"; + version = "0.4.0-dev"; + src = ../../misc/vscode-extensions/rust-analyzer/build-deps; + dependencies = [ + sources."@babel/code-frame-7.8.3" + sources."@babel/helper-validator-identifier-7.9.5" + sources."@babel/highlight-7.9.0" + sources."@rollup/plugin-commonjs-11.1.0" + sources."@rollup/plugin-node-resolve-7.1.3" + sources."@rollup/pluginutils-3.0.10" + sources."@types/color-name-1.1.1" + sources."@types/eslint-visitor-keys-1.0.0" + sources."@types/estree-0.0.39" + sources."@types/json-schema-7.0.4" + sources."@types/node-12.12.37" + sources."@types/node-fetch-2.5.7" + sources."@types/resolve-0.0.8" + sources."@types/vscode-1.44.0" + sources."@typescript-eslint/eslint-plugin-2.31.0" + sources."@typescript-eslint/experimental-utils-2.31.0" + sources."@typescript-eslint/parser-2.31.0" + sources."@typescript-eslint/typescript-estree-2.31.0" + sources."acorn-7.1.1" + sources."acorn-jsx-5.2.0" + sources."ajv-6.12.2" + (sources."ansi-escapes-4.3.1" // { + dependencies = [ + sources."type-fest-0.11.0" + ]; + }) + sources."ansi-regex-5.0.0" + sources."ansi-styles-3.2.1" + sources."argparse-1.0.10" + sources."astral-regex-1.0.0" + sources."asynckit-0.4.0" + sources."azure-devops-node-api-7.2.0" + sources."balanced-match-1.0.0" + sources."boolbase-1.0.0" + sources."brace-expansion-1.1.11" + sources."buffer-crc32-0.2.13" + sources."builtin-modules-3.1.0" + sources."callsites-3.1.0" + sources."chalk-2.4.2" + sources."chardet-0.7.0" + sources."cheerio-1.0.0-rc.3" + sources."cli-cursor-3.1.0" + sources."cli-width-2.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."combined-stream-1.0.8" + sources."commander-2.20.3" + sources."commandpost-1.4.0" + sources."commondir-1.0.1" + sources."concat-map-0.0.1" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."css-select-1.2.0" + sources."css-what-2.1.3" + sources."debug-4.1.1" + sources."deep-is-0.1.3" + sources."delayed-stream-1.0.0" + sources."denodeify-1.2.1" + sources."doctrine-3.0.0" + sources."dom-serializer-0.1.1" + sources."domelementtype-1.3.1" + sources."domhandler-2.4.2" + sources."domutils-1.5.1" + (sources."editorconfig-0.15.3" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."emoji-regex-8.0.0" + sources."entities-1.1.2" + sources."escape-string-regexp-1.0.5" + (sources."eslint-6.8.0" // { + dependencies = [ + sources."eslint-utils-1.4.3" + sources."regexpp-2.0.1" + ]; + }) + sources."eslint-scope-5.0.0" + sources."eslint-utils-2.0.0" + sources."eslint-visitor-keys-1.1.0" + sources."espree-6.2.1" + sources."esprima-4.0.1" + (sources."esquery-1.3.1" // { + dependencies = [ + sources."estraverse-5.1.0" + ]; + }) + sources."esrecurse-4.2.1" + sources."estraverse-4.3.0" + sources."estree-walker-1.0.1" + sources."esutils-2.0.3" + sources."external-editor-3.1.0" + sources."fast-deep-equal-3.1.1" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."fd-slicer-1.1.0" + sources."figures-3.2.0" + sources."file-entry-cache-5.0.1" + sources."flat-cache-2.0.1" + sources."flatted-2.0.2" + sources."form-data-3.0.0" + sources."fs.realpath-1.0.0" + sources."fsevents-2.1.3" + sources."functional-red-black-tree-1.0.1" + sources."glob-7.1.6" + sources."glob-parent-5.1.1" + sources."globals-12.4.0" + sources."has-flag-3.0.0" + sources."htmlparser2-3.10.1" + sources."iconv-lite-0.4.24" + sources."ignore-4.0.6" + sources."import-fresh-3.2.1" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + (sources."inquirer-7.1.0" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.1.0" + ]; + }) + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-module-1.0.0" + sources."is-reference-1.1.4" + sources."isexe-2.0.0" + sources."js-tokens-4.0.0" + sources."js-yaml-3.13.1" + sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."jsonc-parser-2.2.1" + sources."leven-3.1.0" + sources."levn-0.3.0" + sources."linkify-it-2.2.0" + sources."lodash-4.17.15" + sources."lru-cache-4.1.5" + sources."magic-string-0.25.7" + (sources."markdown-it-10.0.0" // { + dependencies = [ + sources."entities-2.0.0" + ]; + }) + sources."mdurl-1.0.1" + sources."mime-1.6.0" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" + sources."mimic-fn-2.1.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" + sources."ms-2.1.2" + sources."mute-stream-0.0.8" + sources."natural-compare-1.4.0" + sources."nice-try-1.0.5" + sources."node-fetch-2.6.0" + sources."nth-check-1.0.2" + sources."once-1.4.0" + sources."onetime-5.1.0" + sources."optionator-0.8.3" + sources."os-0.1.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."parent-module-1.0.1" + (sources."parse-semver-1.1.1" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."parse5-3.0.3" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."path-parse-1.0.6" + sources."pend-1.2.0" + sources."picomatch-2.2.2" + sources."prelude-ls-1.1.2" + sources."progress-2.0.3" + sources."pseudomap-1.0.2" + sources."punycode-2.1.1" + sources."read-1.0.7" + sources."readable-stream-3.6.0" + sources."regexpp-3.1.0" + sources."resolve-1.17.0" + sources."resolve-from-4.0.0" + sources."restore-cursor-3.1.0" + sources."rimraf-2.6.3" + sources."rollup-2.7.6" + sources."run-async-2.4.1" + sources."rxjs-6.5.5" + sources."safe-buffer-5.2.0" + sources."safer-buffer-2.1.2" + sources."semver-6.3.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."sigmund-1.0.1" + sources."signal-exit-3.0.3" + (sources."slice-ansi-2.1.0" // { + dependencies = [ + sources."is-fullwidth-code-point-2.0.0" + ]; + }) + sources."sourcemap-codec-1.4.8" + sources."sprintf-js-1.0.3" + (sources."string-width-4.2.0" // { + dependencies = [ + sources."strip-ansi-6.0.0" + ]; + }) + sources."string_decoder-1.3.0" + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) + sources."strip-json-comments-3.1.0" + sources."supports-color-5.5.0" + (sources."table-5.4.6" // { + dependencies = [ + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + ]; + }) + sources."text-table-0.2.0" + sources."through-2.3.8" + sources."tmp-0.0.33" + sources."tslib-1.11.1" + sources."tsutils-3.17.1" + sources."tunnel-0.0.4" + sources."type-check-0.3.2" + sources."type-fest-0.8.1" + sources."typed-rest-client-1.2.0" + sources."typescript-3.8.3" + sources."typescript-formatter-7.2.2" + sources."uc.micro-1.0.6" + sources."underscore-1.8.3" + sources."uri-js-4.2.2" + sources."url-join-1.1.0" + sources."util-deprecate-1.0.2" + sources."v8-compile-cache-2.1.0" + (sources."vsce-1.75.0" // { + dependencies = [ + sources."semver-5.7.1" + sources."tmp-0.0.29" + ]; + }) + sources."vscode-jsonrpc-5.1.0-next.1" + sources."vscode-languageclient-7.0.0-next.1" + sources."vscode-languageserver-protocol-3.16.0-next.2" + sources."vscode-languageserver-types-3.16.0-next.1" + sources."which-1.3.1" + sources."word-wrap-1.2.3" + sources."wrappy-1.0.2" + sources."write-1.0.3" + sources."yallist-2.1.2" + sources."yauzl-2.10.0" + sources."yazl-2.5.1" + ]; + buildInputs = globalBuildInputs; + meta = { + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; s3http = nodeEnv.buildNodePackage { name = "s3http"; packageName = "s3http"; @@ -73981,7 +75401,7 @@ in sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; }; dependencies = [ - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -74052,8 +75472,8 @@ in sources."keypress-0.1.0" sources."methods-0.1.0" sources."mime-1.2.11" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mkdirp-0.3.5" sources."ms-2.1.2" sources."multiparty-2.2.0" @@ -74071,7 +75491,7 @@ in }) sources."pause-0.0.1" sources."performance-now-2.1.0" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-0.6.5" sources."range-parser-0.0.4" @@ -74107,10 +75527,10 @@ in semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; - version = "7.1.3"; + version = "7.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz"; - sha512 = "ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz"; + sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -74177,8 +75597,8 @@ in sources."isexe-2.0.0" sources."json-schema-traverse-0.4.1" sources."lru-cache-4.1.5" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."ms-2.0.0" @@ -74204,7 +75624,7 @@ in }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" @@ -74231,14 +75651,14 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.67.0"; + version = "1.69.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.67.0.tgz"; - sha512 = "ocnzEW2op4KrdjnZ7aeadnX1/E6PdlsW8vv67/3sGlni1ep8JiKSRU0aPQqUmood98kEIo/sKvUlHrJcAm3eXg=="; + url = "https://registry.npmjs.org/serverless/-/serverless-1.69.0.tgz"; + sha512 = "af4gBZeto9JCkObSErzSXI+UcxoGNxUP4oQq7b/+QoCFa0NYjO4lCtW66MD6ONYg0YxDEukTQwzgkbD9VmunWg=="; }; dependencies = [ sources."2-thenable-1.0.0" - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -74248,7 +75668,7 @@ in sources."node-fetch-2.6.0" ]; }) - (sources."@serverless/components-2.22.3" // { + (sources."@serverless/components-2.30.5" // { dependencies = [ sources."fs-extra-8.1.0" sources."globby-10.0.2" @@ -74261,7 +75681,7 @@ in sources."semver-6.3.0" ]; }) - (sources."@serverless/enterprise-plugin-3.6.0" // { + (sources."@serverless/enterprise-plugin-3.6.9" // { dependencies = [ sources."fs-extra-8.1.0" sources."node-fetch-2.6.0" @@ -74270,7 +75690,20 @@ in ]; }) sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-0.24.0" // { + (sources."@serverless/inquirer-1.1.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."chalk-3.0.0" + sources."inquirer-7.1.0" + sources."strip-ansi-6.0.0" + ]; + }) + (sources."@serverless/platform-client-0.25.7" // { + dependencies = [ + sources."https-proxy-agent-5.0.0" + ]; + }) + (sources."@serverless/platform-client-china-1.0.9" // { dependencies = [ sources."https-proxy-agent-5.0.0" ]; @@ -74283,24 +75716,39 @@ in ]; }) sources."@serverless/template-1.1.3" + (sources."@serverless/utils-china-0.1.7" // { + dependencies = [ + sources."https-proxy-agent-5.0.0" + ]; + }) sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" + sources."@tencent-sdk/capi-0.2.15" + sources."@types/color-name-1.1.1" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" - sources."@types/lodash-4.14.149" + sources."@types/lodash-4.14.150" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.3" - (sources."@typescript-eslint/typescript-estree-2.25.0" // { + sources."@types/node-13.13.4" + (sources."@typescript-eslint/typescript-estree-2.31.0" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."adm-zip-0.4.14" + sources."after-0.8.2" sources."agent-base-6.0.0" - sources."ansi-align-3.0.0" + sources."ajv-6.12.2" + (sources."ansi-align-3.0.0" // { + dependencies = [ + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + ]; + }) sources."ansi-escapes-4.3.1" sources."ansi-regex-4.1.0" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.2.1" sources."anymatch-3.1.1" sources."app-module-path-2.2.0" (sources."archive-type-4.0.0" // { @@ -74311,50 +75759,91 @@ in (sources."archiver-1.3.0" // { dependencies = [ sources."async-2.6.3" + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" ]; }) (sources."archiver-utils-1.3.0" // { dependencies = [ + sources."isarray-1.0.0" sources."normalize-path-2.1.1" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + (sources."argparse-1.0.10" // { + dependencies = [ + sources."sprintf-js-1.0.3" ]; }) - sources."argparse-1.0.10" sources."arr-diff-4.0.0" sources."arr-union-3.1.0" sources."array-union-2.1.0" sources."array-uniq-1.0.3" sources."array-unique-0.3.2" + sources."arraybuffer.slice-0.0.7" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" sources."ast-module-types-2.6.0" sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.644.0" // { + (sources."aws-sdk-2.669.0" // { dependencies = [ sources."buffer-4.9.1" + sources."isarray-1.0.0" sources."uuid-3.3.2" ]; }) + sources."aws-sign2-0.7.0" + sources."aws4-1.9.1" sources."axios-0.19.2" + sources."backo2-1.0.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" ]; }) + sources."base64-arraybuffer-0.1.5" sources."base64-js-1.3.1" + sources."bcrypt-pbkdf-1.0.2" + sources."better-assert-1.0.2" sources."binary-extensions-2.0.0" - sources."bl-1.2.2" + (sources."bl-1.2.2" // { + dependencies = [ + sources."isarray-1.0.0" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + ]; + }) + sources."blob-0.0.5" sources."bluebird-3.7.2" + sources."boolean-3.0.1" (sources."boxen-3.2.0" // { dependencies = [ + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" sources."type-fest-0.3.1" ]; }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-5.5.0" + sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -74369,21 +75858,27 @@ in ]; }) sources."cachedir-2.3.0" + sources."callsite-1.0.0" sources."camelcase-5.3.1" sources."capture-stack-trace-1.0.1" + sources."caseless-0.12.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { dependencies = [ + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" sources."supports-color-5.5.0" ]; }) sources."chardet-0.7.0" - (sources."child-process-ext-2.1.0" // { + (sources."child-process-ext-2.1.1" // { dependencies = [ sources."cross-spawn-6.0.5" ]; }) - sources."chokidar-3.3.1" + sources."chokidar-3.4.0" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -74409,19 +75904,34 @@ in sources."ansi-regex-2.1.1" ]; }) - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" + sources."cli-cursor-3.1.0" + sources."cli-width-2.2.1" sources."clone-response-1.0.2" sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + (sources."color-3.0.0" // { + dependencies = [ + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + ]; + }) + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."color-string-1.5.3" + sources."colornames-1.1.1" sources."colors-1.3.3" + sources."colorspace-1.1.2" sources."combined-stream-1.0.8" sources."commander-2.19.0" - sources."component-emitter-1.3.0" + sources."component-bind-1.0.0" + sources."component-emitter-1.2.1" + sources."component-inherit-0.0.3" (sources."compress-commons-1.2.2" // { dependencies = [ + sources."isarray-1.0.0" sources."normalize-path-2.1.1" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" ]; }) sources."concat-map-0.0.1" @@ -74432,13 +75942,25 @@ in sources."pify-3.0.0" ]; }) - sources."content-disposition-0.5.3" + (sources."content-disposition-0.5.3" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."cookie-0.3.1" sources."cookiejar-2.1.2" sources."copy-descriptor-0.1.1" + sources."core-js-3.6.5" sources."core-util-is-1.0.2" sources."crc-3.8.0" - sources."crc32-stream-2.0.0" + (sources."crc32-stream-2.0.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" @@ -74447,12 +75969,13 @@ in sources."type-1.2.0" ]; }) - sources."dayjs-1.8.23" + sources."dashdash-1.14.1" + sources."dayjs-1.8.26" sources."debug-4.1.1" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."decomment-0.9.2" - (sources."decompress-4.2.0" // { + (sources."decompress-4.2.1" // { dependencies = [ (sources."make-dir-1.3.0" // { dependencies = [ @@ -74481,9 +76004,11 @@ in sources."deep-is-0.1.3" sources."defer-to-connect-1.1.3" sources."deferred-0.7.11" + sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."dependency-tree-7.2.1" + sources."detect-node-2.0.4" sources."detective-amd-3.0.0" sources."detective-cjs-3.1.1" sources."detective-es6-2.1.0" @@ -74493,8 +76018,11 @@ in sources."detective-scss-2.0.1" sources."detective-stylus-1.0.0" sources."detective-typescript-5.7.0" + sources."diagnostics-1.1.1" + sources."dijkstrajs-1.0.1" sources."dir-glob-3.0.1" sources."dot-prop-4.2.0" + sources."dot-qs-0.2.0" sources."dotenv-8.2.0" (sources."download-7.1.0" // { dependencies = [ @@ -74514,15 +76042,26 @@ in ]; }) sources."duplexer3-0.1.4" + sources."duplexify-4.1.1" sources."duration-0.2.2" - sources."emoji-regex-7.0.3" + sources."ecc-jsbn-0.1.2" + sources."emoji-regex-8.0.0" + sources."enabled-1.0.2" sources."encoding-0.1.12" sources."end-of-stream-1.4.4" + (sources."engine.io-client-3.4.1" // { + dependencies = [ + sources."ws-6.1.4" + ]; + }) + sources."engine.io-parser-2.2.0" sources."enhanced-resolve-4.1.1" + sources."env-variable-0.0.6" sources."errno-0.1.7" sources."es5-ext-0.10.53" + sources."es6-error-4.1.1" sources."es6-iterator-2.0.3" - sources."es6-promisify-6.1.0" + sources."es6-promisify-6.1.1" (sources."es6-set-0.1.5" // { dependencies = [ sources."es6-symbol-3.1.1" @@ -74551,10 +76090,15 @@ in sources."extend-3.0.2" sources."extend-shallow-3.0.2" sources."external-editor-3.1.0" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.1" sources."fast-glob-3.2.2" + sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.6.1" + sources."fast-safe-stringify-2.0.7" + sources."fastq-1.7.0" sources."fd-slicer-1.1.0" + sources."fecha-2.3.3" sources."figures-3.2.0" sources."file-exists-dazinatorfork-1.0.2" sources."file-type-5.2.0" @@ -74580,10 +76124,18 @@ in ]; }) sources."for-in-1.0.2" - sources."form-data-2.5.1" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" sources."formidable-1.2.2" sources."fragment-cache-0.2.1" - sources."from2-2.3.0" + (sources."from2-2.3.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."fs-constants-1.0.0" (sources."fs-extra-0.30.0" // { dependencies = [ @@ -74591,37 +76143,40 @@ in ]; }) sources."fs.realpath-1.0.0" - (sources."fs2-0.3.7" // { - dependencies = [ - sources."type-1.2.0" - ]; - }) - sources."fsevents-2.1.2" + sources."fs2-0.3.8" + sources."fsevents-2.1.3" sources."get-amd-module-type-3.0.0" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-proxy-2.1.0" sources."get-stdin-5.0.1" sources."get-stream-4.1.0" sources."get-value-2.0.6" + sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.1" + (sources."global-agent-2.1.8" // { + dependencies = [ + sources."semver-7.3.2" + ]; + }) sources."global-dirs-0.1.1" + sources."globalthis-1.0.1" (sources."globby-6.1.0" // { dependencies = [ sources."array-union-1.0.2" sources."pify-2.3.0" ]; }) - (sources."gonzales-pe-4.2.4" // { - dependencies = [ - sources."minimist-1.1.3" - ]; - }) + sources."gonzales-pe-4.3.0" sources."got-9.6.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."graceful-readlink-1.0.1" sources."graphlib-2.1.8" - sources."has-flag-3.0.0" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."has-binary2-1.0.3" + sources."has-cors-1.1.0" + sources."has-flag-4.0.0" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."has-value-1.0.0" @@ -74637,6 +76192,7 @@ in ]; }) sources."http-cache-semantics-4.1.0" + sources."http-signature-1.2.0" (sources."https-proxy-agent-4.0.0" // { dependencies = [ sources."agent-base-5.1.1" @@ -74649,6 +76205,7 @@ in sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indexes-of-1.0.1" + sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -74656,7 +76213,13 @@ in dependencies = [ sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" + sources."cli-cursor-2.1.0" sources."figures-2.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."mimic-fn-1.2.0" + sources."mute-stream-0.0.7" + sources."onetime-2.0.1" + sources."restore-cursor-2.0.0" (sources."string-width-2.1.1" // { dependencies = [ sources."strip-ansi-4.0.0" @@ -74666,6 +76229,7 @@ in }) sources."into-stream-3.1.0" sources."is-accessor-descriptor-1.0.0" + sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" sources."is-ci-1.2.1" @@ -74674,7 +76238,7 @@ in sources."is-docker-1.1.0" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.1.0" sources."is-natural-number-4.0.1" @@ -74685,39 +76249,58 @@ in sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" + sources."is-promise-2.2.2" sources."is-redirect-1.0.0" sources."is-regexp-1.0.0" sources."is-relative-path-1.0.2" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" sources."is-url-1.2.4" sources."is-windows-1.0.2" - sources."is-wsl-2.1.1" - sources."isarray-1.0.0" + (sources."is-wsl-2.2.0" // { + dependencies = [ + sources."is-docker-2.0.0" + ]; + }) + sources."isarray-2.0.1" sources."isexe-2.0.0" sources."iso8601-duration-1.2.0" sources."isobject-3.0.1" sources."isomorphic-fetch-2.2.1" sources."isomorphic-ws-4.0.1" + sources."isstream-0.1.2" sources."isurl-1.0.0" sources."jmespath-0.15.0" sources."js-yaml-3.13.1" + sources."jsbn-0.1.1" sources."json-buffer-3.0.0" sources."json-cycle-1.3.0" (sources."json-refs-2.1.7" // { dependencies = [ sources."slash-1.0.0" + sources."uri-js-3.0.2" ]; }) + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonata-1.8.1" + sources."jsonata-1.8.3" sources."jsonfile-4.0.0" - sources."jszip-3.2.2" + sources."jsprim-1.4.1" + (sources."jszip-3.4.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."jwt-decode-2.2.0" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."klaw-1.3.1" + sources."kuler-1.0.1" (sources."latest-version-3.1.0" // { dependencies = [ sources."get-stream-3.0.0" @@ -74729,7 +76312,14 @@ in sources."url-parse-lax-1.0.0" ]; }) - sources."lazystream-1.0.0" + (sources."lazystream-1.0.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."levn-0.3.0" sources."lie-3.3.0" sources."lodash-4.17.15" @@ -74738,6 +76328,7 @@ in sources."type-1.2.0" ]; }) + sources."logform-2.1.2" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" sources."lru-queue-0.1.0" @@ -74745,25 +76336,37 @@ in sources."make-dir-2.1.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" + (sources."matcher-2.1.0" // { + dependencies = [ + sources."escape-string-regexp-2.0.0" + ]; + }) sources."memoizee-0.4.14" - sources."memory-fs-0.5.0" + (sources."memory-fs-0.5.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."merge2-1.3.0" sources."methods-1.1.2" sources."micromatch-4.0.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" - sources."mimic-fn-1.2.0" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" + sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mixin-deep-1.3.2" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."module-definition-3.3.0" sources."module-lookup-amd-6.2.0" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."ms-2.1.2" - sources."mute-stream-0.0.7" + sources."mute-stream-0.0.8" sources."nanoid-2.1.11" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" @@ -74781,7 +76384,9 @@ in ]; }) sources."npm-run-path-2.0.2" + sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" + sources."object-component-0.0.3" (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" @@ -74797,10 +76402,17 @@ in ]; }) sources."object-hash-2.0.3" + sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-2.0.1" + sources."one-time-0.0.4" + sources."onetime-5.1.0" + (sources."open-7.0.3" // { + dependencies = [ + sources."is-docker-2.0.0" + ]; + }) (sources."opn-5.5.0" // { dependencies = [ sources."is-wsl-1.1.0" @@ -74812,7 +76424,7 @@ in sources."p-event-2.3.1" sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-timeout-2.0.1" sources."p-try-2.2.0" (sources."package-json-6.5.0" // { @@ -74821,6 +76433,8 @@ in ]; }) sources."pako-1.0.11" + sources."parseqs-0.0.5" + sources."parseuri-0.0.5" sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" @@ -74829,11 +76443,17 @@ in sources."path-parse-1.0.6" sources."path-type-4.0.0" sources."pend-1.2.0" + sources."performance-now-2.1.0" sources."picomatch-2.2.2" sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."postcss-7.0.27" + (sources."postcss-7.0.29" // { + dependencies = [ + sources."has-flag-3.0.0" + sources."supports-color-6.1.0" + ]; + }) sources."postcss-values-parser-1.5.0" sources."precinct-6.2.0" sources."prelude-ls-1.1.2" @@ -74844,40 +76464,50 @@ in sources."proto-list-1.2.4" sources."prr-1.0.1" sources."pseudomap-1.0.2" + sources."psl-1.8.0" sources."pump-3.0.0" - sources."punycode-1.3.2" - sources."qs-6.9.2" + sources."punycode-2.1.1" + sources."qs-6.5.2" sources."query-string-5.1.1" sources."querystring-0.2.0" sources."ramda-0.26.1" (sources."raven-1.2.1" // { dependencies = [ + sources."stack-trace-0.0.9" sources."uuid-3.0.0" ]; }) sources."rc-1.2.8" - sources."readable-stream-2.3.7" - sources."readdirp-3.3.0" + sources."readable-stream-3.6.0" + sources."readdirp-3.4.0" sources."regenerator-runtime-0.13.5" sources."regex-not-1.0.2" sources."registry-auth-token-4.1.1" sources."registry-url-5.1.0" sources."remove-trailing-separator-1.1.0" sources."replaceall-0.1.6" + (sources."request-2.88.2" // { + dependencies = [ + sources."uuid-3.4.0" + ]; + }) + sources."request-promise-core-1.1.3" + sources."request-promise-native-1.0.8" sources."requirejs-2.3.6" sources."requirejs-config-file-3.1.2" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-dependency-path-2.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" - sources."restore-cursor-2.0.0" + sources."restore-cursor-3.1.0" sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-2.7.1" - sources."run-async-2.4.0" + sources."roarr-2.15.3" + sources."run-async-2.4.1" sources."run-parallel-1.1.9" - sources."rxjs-6.5.4" - sources."safe-buffer-5.1.2" + sources."rxjs-6.5.5" + sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sass-lookup-3.0.0" @@ -74888,8 +76518,14 @@ in ]; }) sources."semver-5.7.1" + sources."semver-compare-1.0.0" sources."semver-diff-2.1.0" sources."semver-regex-1.0.0" + (sources."serialize-error-5.0.0" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) sources."set-immediate-shim-1.0.1" (sources."set-value-2.0.1" // { dependencies = [ @@ -74900,8 +76536,9 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shortid-2.2.15" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."simple-git-1.132.0" + sources."simple-swizzle-0.2.2" sources."slash-3.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -74926,21 +76563,31 @@ in sources."source-map-0.5.7" ]; }) + sources."socket.io-client-2.3.0" + (sources."socket.io-parser-3.3.0" // { + dependencies = [ + sources."debug-3.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."socket.io-stream-0.9.1" // { + dependencies = [ + sources."debug-2.2.0" + sources."ms-0.7.1" + ]; + }) sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.16" + sources."source-map-support-0.5.19" sources."source-map-url-0.4.0" sources."split-string-3.1.0" - (sources."split2-3.1.1" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) - sources."sprintf-js-1.0.3" + sources."split2-3.1.1" + sources."sprintf-js-1.1.2" sources."sprintf-kit-2.0.0" - sources."stack-trace-0.0.9" + sources."sshpk-1.16.1" + sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -74959,10 +76606,17 @@ in sources."kind-of-5.1.0" ]; }) + sources."stealthy-require-1.1.1" sources."stream-promise-3.2.0" + sources."stream-shift-1.0.1" sources."strict-uri-encode-1.1.0" - sources."string-width-3.1.0" - sources."string_decoder-1.1.1" + (sources."string-width-4.2.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."strip-ansi-6.0.0" + ]; + }) + sources."string_decoder-1.3.0" sources."stringify-object-3.3.0" sources."strip-ansi-5.2.0" sources."strip-dirs-2.1.0" @@ -74973,17 +76627,30 @@ in (sources."superagent-3.8.3" // { dependencies = [ sources."debug-3.2.6" + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" ]; }) - sources."supports-color-6.1.0" + sources."supports-color-7.1.0" sources."tabtab-3.0.2" sources."tapable-1.1.3" - sources."tar-stream-1.6.2" + (sources."tar-stream-1.6.2" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."term-size-1.2.0" + sources."text-hex-1.0.0" sources."through-2.3.8" sources."timed-out-4.0.1" sources."timers-ext-0.1.7" sources."tmp-0.0.33" + sources."to-array-0.1.4" sources."to-buffer-1.1.1" (sources."to-object-path-0.3.0" // { dependencies = [ @@ -74994,17 +76661,20 @@ in sources."to-readable-stream-1.0.0" sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" + sources."tough-cookie-2.5.0" sources."traverse-0.6.6" sources."traverse-chain-0.1.0" sources."trim-repeated-1.0.0" + sources."triple-beam-1.3.0" sources."tslib-1.11.1" sources."tsutils-3.17.1" sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" sources."type-2.0.0" sources."type-check-0.3.2" sources."type-fest-0.11.0" sources."typescript-3.8.3" - sources."unbzip2-stream-1.3.3" + sources."unbzip2-stream-1.4.2" (sources."union-value-1.0.1" // { dependencies = [ sources."is-extendable-0.1.1" @@ -75021,6 +76691,7 @@ in ]; }) sources."has-values-0.1.4" + sources."isarray-1.0.0" ]; }) sources."untildify-3.0.3" @@ -75032,51 +76703,77 @@ in sources."boxen-1.3.0" sources."camelcase-4.1.0" sources."cli-boxes-1.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" ]; }) - (sources."uri-js-3.0.2" // { + sources."uri-js-4.2.2" + sources."urix-0.1.0" + (sources."url-0.10.3" // { dependencies = [ - sources."punycode-2.1.1" + sources."punycode-1.3.2" ]; }) - sources."urix-0.1.0" - sources."url-0.10.3" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" + sources."urlencode-1.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."uuid-2.0.3" + sources."verror-1.10.0" sources."walkdir-0.0.11" sources."whatwg-fetch-3.0.0" sources."which-1.3.1" (sources."widest-line-2.0.1" // { dependencies = [ sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" ]; }) + (sources."winston-3.2.1" // { + dependencies = [ + sources."async-2.6.3" + ]; + }) + (sources."winston-transport-4.3.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" + sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."yallist-2.1.2" sources."yaml-ast-parser-0.0.43" sources."yamljs-0.3.0" sources."yargs-parser-16.1.0" sources."yauzl-2.10.0" - sources."zip-stream-1.2.0" + sources."yeast-0.1.2" + (sources."zip-stream-1.2.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) ]; buildInputs = globalBuildInputs; meta = { description = "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more"; - homepage = https://serverless.com/framework/docs/; + homepage = "https://serverless.com/framework/docs/"; license = "MIT"; }; production = true; @@ -75096,7 +76793,7 @@ in sources."CSSwhat-0.4.7" sources."accepts-1.3.7" sources."after-0.8.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.6" sources."asn1-0.2.4" @@ -75141,7 +76838,7 @@ in sources."duplexer-0.1.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" + sources."emitter-https://github.com/component/emitter/archive/1.0.1.tar.gz" sources."encodeurl-1.0.2" (sources."engine.io-1.3.1" // { dependencies = [ @@ -75208,10 +76905,10 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-1.2.5" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."moment-2.7.0" sources."ms-2.0.0" sources."mute-stream-0.0.8" @@ -75229,7 +76926,7 @@ in sources."pause-stream-0.0.11" sources."performance-now-2.1.0" sources."proxy-addr-2.0.6" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.7.0" sources."range-parser-1.2.1" @@ -75264,7 +76961,7 @@ in (sources."socket.io-adapter-0.2.0" // { dependencies = [ sources."debug-0.7.4" - sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" + sources."emitter-https://github.com/component/emitter/archive/1.0.1.tar.gz" sources."socket.io-parser-2.1.2" ]; }) @@ -75406,7 +77103,7 @@ in sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."get-value-2.0.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."graceful-readlink-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -75611,9 +77308,9 @@ in sources."mime-1.6.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."mv-2.1.1" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."ncp-2.0.0" sources."negotiator-0.5.3" sources."node-uuid-1.4.8" @@ -75646,7 +77343,7 @@ in sources."clone-0.1.5" sources."dashdash-1.10.1" sources."extsprintf-1.0.0" - (sources."http-signature-1.3.2" // { + (sources."http-signature-1.3.4" // { dependencies = [ sources."assert-plus-1.0.0" sources."dashdash-1.14.1" @@ -75710,34 +77407,42 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.304.0"; + version = "1.317.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.304.0.tgz"; - sha512 = "1wAkvgvzOyUbbKEMXGgY2UULcfvAYPywlC7Whm3DCffAdx8i1ZMT9hWaOZxhj5K94h3doY3LRb6Xq6lbfb0jDw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.317.0.tgz"; + sha512 = "zNUvvT50Ii5TpHEo9YmDo+j5tqO1b8jXQK9XygfgiuXPRUwxf6PMSqDM5hKkfzuBhaBYZ4IbZWQFQPbMkprj0w=="; }; dependencies = [ - sources."@snyk/cli-interface-2.3.2" - sources."@snyk/cocoapods-lockfile-parser-3.0.0" - sources."@snyk/composer-lockfile-parser-1.2.0" + sources."@snyk/cli-interface-2.6.0" + sources."@snyk/cocoapods-lockfile-parser-3.2.0" + sources."@snyk/composer-lockfile-parser-1.4.0" sources."@snyk/configstore-3.2.0-rc1" - sources."@snyk/dep-graph-1.16.1" + sources."@snyk/dep-graph-1.18.2" sources."@snyk/gemfile-1.2.0" - sources."@snyk/ruby-semver-2.1.0" - (sources."@snyk/snyk-cocoapods-plugin-2.0.1" // { + sources."@snyk/graphlib-2.1.9-patch" + sources."@snyk/inquirer-6.2.2-patch" + (sources."@snyk/java-call-graph-builder-1.8.0" // { + dependencies = [ + sources."ci-info-2.0.0" + sources."debug-4.1.1" + ]; + }) + sources."@snyk/lodash-4.17.15-patch" + sources."@snyk/rpm-parser-1.1.0" + sources."@snyk/ruby-semver-2.2.0" + (sources."@snyk/snyk-cocoapods-plugin-2.2.0" // { dependencies = [ sources."@snyk/cli-interface-1.5.0" ]; }) sources."@snyk/update-notifier-2.5.1-rc2" sources."@types/agent-base-4.2.0" - sources."@types/bunyan-1.8.6" sources."@types/debug-4.1.5" sources."@types/events-3.0.0" - sources."@types/js-yaml-3.12.2" - sources."@types/node-13.9.3" - sources."@types/restify-4.3.6" + sources."@types/js-yaml-3.12.3" + sources."@types/node-13.13.4" sources."@types/semver-5.5.0" - sources."@types/xml2js-0.4.3" + sources."@types/xml2js-0.4.5" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-4.3.0" @@ -75749,7 +77454,7 @@ in sources."archy-1.0.0" sources."argparse-1.0.10" sources."asap-2.0.6" - sources."ast-types-0.13.2" + sources."ast-types-0.13.3" sources."async-1.5.2" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" @@ -75761,7 +77466,7 @@ in }) sources."boxen-1.3.0" sources."brace-expansion-1.1.11" - sources."buffer-5.5.0" + sources."buffer-5.6.0" sources."buffer-from-1.1.1" sources."bytes-3.1.0" sources."camelcase-4.1.0" @@ -75772,7 +77477,7 @@ in sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-spinner-0.2.10" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" (sources."cliui-3.2.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -75787,7 +77492,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."concat-map-0.0.1" - sources."core-js-3.6.4" + sources."core-js-3.6.5" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" @@ -75806,11 +77511,7 @@ in sources."diff-4.0.2" sources."dockerfile-ast-0.0.19" sources."dot-prop-5.2.0" - (sources."dotnet-deps-parser-4.9.0" // { - dependencies = [ - sources."xml2js-0.4.19" - ]; - }) + sources."dotnet-deps-parser-4.10.0" sources."duplexer3-0.1.4" sources."email-validator-2.0.4" sources."emoji-regex-7.0.3" @@ -75848,8 +77549,7 @@ in sources."glob-7.1.6" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.3" - sources."graphlib-2.1.8" + sources."graceful-fs-4.2.4" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" sources."http-errors-1.7.3" @@ -75868,30 +77568,28 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."inquirer-6.5.2" sources."invert-kv-1.0.0" sources."ip-1.1.5" sources."is-ci-1.2.1" + sources."is-docker-2.0.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" sources."is-obj-2.0.0" sources."is-path-inside-1.0.1" - sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.2.0" sources."is-ssh-1.3.1" sources."is-stream-1.1.0" - sources."is-wsl-1.1.0" + sources."is-wsl-2.2.0" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."js-yaml-3.13.1" - sources."jszip-3.2.2" + sources."jszip-3.4.0" sources."latest-version-3.1.0" sources."lcid-1.0.0" sources."levn-0.3.0" sources."lie-3.3.0" - sources."lodash-4.17.15" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" sources."lodash.clone-4.5.0" @@ -75909,7 +77607,7 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.7" sources."nconf-0.10.0" - sources."needle-2.4.0" + sources."needle-2.4.1" sources."netmask-1.0.6" sources."nice-try-1.0.5" sources."normalize-url-3.3.0" @@ -75918,7 +77616,7 @@ in sources."object-hash-1.3.1" sources."once-1.4.0" sources."onetime-2.0.1" - sources."opn-5.5.0" + sources."open-7.0.3" sources."optionator-0.8.3" sources."os-locale-1.4.0" sources."os-name-3.1.0" @@ -75945,7 +77643,9 @@ in sources."pify-3.0.0" sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" + sources."prettier-1.19.1" sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" sources."promise-7.3.1" sources."protocols-1.4.7" (sources."proxy-agent-3.1.1" // { @@ -75971,8 +77671,8 @@ in sources."registry-url-3.1.0" sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" - sources."run-async-2.4.0" - sources."rxjs-6.5.4" + sources."run-async-2.4.1" + sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" @@ -75987,16 +77687,20 @@ in sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."smart-buffer-4.1.0" - sources."snyk-config-2.2.3" - (sources."snyk-docker-plugin-2.6.1" // { + (sources."snyk-config-3.1.0" // { + dependencies = [ + sources."debug-4.1.1" + ]; + }) + (sources."snyk-docker-plugin-3.1.0" // { dependencies = [ sources."debug-4.1.1" ]; }) sources."snyk-go-parser-1.4.0" - (sources."snyk-go-plugin-1.13.0" // { + (sources."snyk-go-plugin-1.14.0" // { dependencies = [ sources."debug-4.1.1" sources."tmp-0.1.0" @@ -76009,21 +77713,29 @@ in ]; }) sources."snyk-module-1.9.1" - (sources."snyk-mvn-plugin-2.9.0" // { + (sources."snyk-mvn-plugin-2.15.0" // { dependencies = [ - sources."@snyk/cli-interface-2.3.1" + sources."@snyk/cli-interface-2.5.0" sources."debug-4.1.1" sources."tmp-0.1.0" - sources."tslib-1.9.3" ]; }) - sources."snyk-nodejs-lockfile-parser-1.17.0" - sources."snyk-nuget-plugin-1.16.0" - sources."snyk-paket-parser-1.5.0" - (sources."snyk-php-plugin-1.7.0" // { + sources."snyk-nodejs-lockfile-parser-1.22.0" + (sources."snyk-nuget-plugin-1.17.0" // { dependencies = [ - sources."@snyk/cli-interface-2.2.0" - sources."tslib-1.9.3" + sources."core-js-2.3.0" + sources."es6-promise-3.0.2" + sources."isarray-1.0.0" + sources."jszip-3.1.5" + sources."lie-3.1.1" + sources."process-nextick-args-1.0.7" + sources."readable-stream-2.0.6" + ]; + }) + sources."snyk-paket-parser-1.6.0" + (sources."snyk-php-plugin-1.9.0" // { + dependencies = [ + sources."@snyk/cli-interface-2.3.2" ]; }) sources."snyk-policy-1.13.5" @@ -76031,7 +77743,7 @@ in sources."snyk-resolve-1.0.1" (sources."snyk-resolve-deps-4.4.0" // { dependencies = [ - sources."@types/node-6.14.9" + sources."@types/node-6.14.10" sources."semver-5.7.1" ]; }) @@ -76050,7 +77762,7 @@ in ]; }) sources."source-map-0.6.1" - sources."source-map-support-0.5.16" + sources."source-map-support-0.5.19" sources."sprintf-js-1.0.3" sources."statuses-1.5.0" (sources."string-width-2.1.1" // { @@ -76073,8 +77785,12 @@ in sources."string_decoder-1.3.0" ]; }) - sources."temp-dir-1.0.0" - sources."tempfile-2.0.0" + sources."temp-dir-2.0.0" + (sources."tempfile-2.0.0" // { + dependencies = [ + sources."temp-dir-1.0.0" + ]; + }) sources."term-size-1.2.0" sources."then-fs-2.0.0" sources."through-2.3.8" @@ -76086,6 +77802,7 @@ in sources."tree-kill-1.2.2" sources."tslib-1.11.1" sources."type-check-0.3.2" + sources."typescript-3.8.3" sources."unique-string-1.0.0" sources."unpipe-1.0.0" sources."unzip-response-2.0.1" @@ -76096,7 +77813,7 @@ in sources."which-1.3.1" sources."widest-line-2.0.1" sources."window-size-0.1.4" - (sources."windows-release-3.2.0" // { + (sources."windows-release-3.3.0" // { dependencies = [ sources."cross-spawn-6.0.5" sources."execa-1.0.0" @@ -76113,12 +77830,8 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" - (sources."xml2js-0.4.23" // { - dependencies = [ - sources."xmlbuilder-11.0.1" - ]; - }) - sources."xmlbuilder-9.0.7" + sources."xml2js-0.4.23" + sources."xmlbuilder-11.0.1" sources."xregexp-2.0.0" sources."y18n-3.2.1" sources."yallist-2.1.2" @@ -76166,8 +77879,8 @@ in sources."component-inherit-0.0.3" sources."cookie-0.3.1" sources."debug-4.1.1" - sources."engine.io-3.4.0" - (sources."engine.io-client-3.4.0" // { + sources."engine.io-3.4.1" + (sources."engine.io-client-3.4.1" // { dependencies = [ sources."ws-6.1.4" ]; @@ -76177,8 +77890,8 @@ in sources."has-cors-1.1.0" sources."indexof-0.0.1" sources."isarray-2.0.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."ms-2.1.2" sources."negotiator-0.6.2" sources."object-component-0.0.3" @@ -76197,7 +77910,7 @@ in }) sources."socket.io-parser-3.4.0" sources."to-array-0.1.4" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; @@ -76235,7 +77948,7 @@ in sources."ci-info-1.6.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" - sources."cli-spinners-2.2.0" + sources."cli-spinners-2.3.0" sources."clone-1.0.4" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -76265,7 +77978,7 @@ in sources."get-stream-3.0.0" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" sources."http-proxy-agent-2.1.0" @@ -76332,7 +78045,7 @@ in sources."redent-2.0.0" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."restore-cursor-2.0.0" sources."round-to-3.0.0" sources."safe-buffer-5.2.0" @@ -76341,9 +78054,9 @@ in sources."semver-diff-2.1.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."speedtest-net-1.6.2" @@ -76421,6 +78134,7 @@ in sources."isobject-3.0.1" ]; }) + sources."base64-js-1.3.1" sources."base64-url-2.3.3" sources."bash-color-0.0.4" sources."binary-extensions-1.13.1" @@ -76437,6 +78151,7 @@ in sources."brace-expansion-1.1.11" sources."braces-1.8.5" sources."broadcast-stream-0.2.2" + sources."buffer-5.6.0" sources."buffer-from-1.1.1" sources."bytewise-1.1.0" sources."bytewise-core-1.2.3" @@ -76507,7 +78222,7 @@ in sources."deep-extend-0.6.0" (sources."deferred-leveldown-5.3.0" // { dependencies = [ - sources."abstract-leveldown-6.2.2" + sources."abstract-leveldown-6.2.3" ]; }) sources."define-properties-1.1.3" @@ -76527,7 +78242,7 @@ in sources."emoji-server-1.0.0" (sources."encoding-down-6.3.0" // { dependencies = [ - sources."abstract-leveldown-6.2.2" + sources."abstract-leveldown-6.3.0" ]; }) sources."epidemic-broadcast-trees-7.0.0" @@ -76587,7 +78302,7 @@ in sources."glob-parent-2.0.0" sources."globby-4.1.0" sources."gossip-query-2.0.2" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-network-0.0.1" @@ -76612,6 +78327,7 @@ in sources."heap-0.2.6" sources."hoox-0.0.1" sources."idb-kv-store-4.4.0" + sources."ieee754-1.1.13" sources."immediate-3.2.3" sources."increment-buffer-1.0.1" sources."inflight-1.0.6" @@ -76705,13 +78421,13 @@ in ]; }) sources."level-supports-1.0.1" - (sources."leveldown-5.5.1" // { + (sources."leveldown-5.6.0" // { dependencies = [ - sources."abstract-leveldown-6.2.2" + sources."abstract-leveldown-6.2.3" sources."node-gyp-build-4.1.1" ]; }) - sources."levelup-4.3.2" + sources."levelup-4.4.0" sources."libnested-1.5.0" sources."libsodium-0.7.6" sources."libsodium-wrappers-0.7.6" @@ -76737,7 +78453,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."monotonic-timestamp-0.0.9" sources."moo-0.5.1" sources."ms-2.1.2" @@ -76756,7 +78472,7 @@ in sources."rimraf-2.4.5" ]; }) - sources."nan-2.14.0" + sources."nan-2.14.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -76766,9 +78482,9 @@ in }) sources."napi-macros-2.0.0" sources."ncp-2.0.0" - sources."nearley-2.19.1" + sources."nearley-2.19.3" sources."nice-try-1.0.5" - sources."node-gyp-build-4.2.1" + sources."node-gyp-build-4.2.2" sources."non-private-ip-1.4.4" sources."normalize-path-2.1.1" sources."normalize-uri-1.1.3" @@ -76788,7 +78504,7 @@ in ]; }) sources."object-inspect-1.7.0" - sources."object-is-1.0.2" + sources."object-is-1.1.2" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { dependencies = [ @@ -77097,8 +78813,10 @@ in }) sources."string-width-1.0.2" sources."string.prototype.trim-1.2.1" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.1.1" sources."stringify-entities-1.3.2" sources."strip-ansi-3.0.1" @@ -77173,7 +78891,7 @@ in buildInputs = globalBuildInputs; meta = { description = "network protocol layer for secure-scuttlebutt"; - homepage = https://github.com/ssbc/ssb-server; + homepage = "https://github.com/ssbc/ssb-server"; license = "MIT"; }; production = true; @@ -77191,7 +78909,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Send metric data from statsd to Stackdriver"; - homepage = https://www.stackdriver.com/; + homepage = "https://www.stackdriver.com/"; license = "MIT"; }; production = true; @@ -77249,7 +78967,7 @@ in sources."semver-5.0.3" ]; }) - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."align-text-0.1.4" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -77266,7 +78984,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.644.0" // { + (sources."aws-sdk-2.669.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -77393,7 +79111,7 @@ in sources."drange-1.1.1" (sources."dtrace-provider-0.8.8" // { dependencies = [ - sources."nan-2.14.0" + sources."nan-2.14.1" ]; }) sources."ecc-jsbn-0.1.2" @@ -77402,14 +79120,14 @@ in sources."ejs-0.8.8" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.4.0" // { + (sources."engine.io-3.4.1" // { dependencies = [ sources."cookie-0.3.1" sources."debug-4.1.1" - sources."ws-7.2.3" + sources."ws-7.2.5" ]; }) - (sources."engine.io-client-3.4.0" // { + (sources."engine.io-client-3.4.1" // { dependencies = [ sources."debug-4.1.1" sources."ws-6.1.4" @@ -77450,7 +79168,7 @@ in sources."fd-slicer-1.1.0" sources."finalhandler-1.1.2" sources."find-up-3.0.0" - (sources."follow-redirects-1.10.0" // { + (sources."follow-redirects-1.11.0" // { dependencies = [ sources."debug-3.2.6" ]; @@ -77477,7 +79195,7 @@ in sources."debug-3.2.6" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."graphlib-2.1.8" sources."har-schema-2.0.0" sources."har-validator-2.0.6" @@ -77528,7 +79246,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.0" - sources."is-promise-2.1.0" + sources."is-promise-2.2.2" sources."is-property-1.0.2" sources."is-regex-1.0.5" sources."is-stream-1.1.0" @@ -77623,15 +79341,15 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."minicap-prebuilt-2.3.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minitouch-prebuilt-1.2.0" - sources."mkdirp-0.5.4" - sources."moment-2.24.0" + sources."mkdirp-0.5.5" + sources."moment-2.25.3" sources."ms-2.1.2" sources."multer-1.4.2" sources."mustache-2.3.2" @@ -77663,7 +79381,7 @@ in sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."parse-json-2.2.0" @@ -77705,7 +79423,7 @@ in ]; }) sources."pseudomap-1.0.2" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."pug-2.0.4" sources."pug-attrs-2.0.4" sources."pug-code-gen-2.0.2" @@ -77760,7 +79478,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."ret-0.2.2" sources."rethinkdb-2.4.2" sources."retry-0.9.0" @@ -77793,7 +79511,7 @@ in sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."slash-1.0.0" sources."sntp-1.0.9" (sources."socket.io-2.3.0" // { @@ -77822,7 +79540,7 @@ in }) sources."source-map-0.6.1" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-1.0.1" @@ -77861,7 +79579,7 @@ in dependencies = [ sources."debug-3.2.6" sources."form-data-2.5.1" - sources."qs-6.9.2" + sources."qs-6.9.4" sources."readable-stream-2.3.7" sources."string_decoder-1.1.1" ]; @@ -77874,7 +79592,7 @@ in sources."esprima-4.0.1" sources."js-yaml-3.13.1" sources."lodash-3.10.1" - sources."qs-6.9.2" + sources."qs-6.9.4" ]; }) sources."swagger-schema-official-2.0.0-bab6bed" @@ -78087,7 +79805,7 @@ in sources."js-yaml-3.13.1" sources."mdn-data-2.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."nth-check-1.0.2" sources."object-inspect-1.7.0" sources."object-keys-1.1.1" @@ -78099,8 +79817,10 @@ in sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."stable-0.1.8" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" sources."supports-color-5.5.0" sources."unquote-1.1.1" sources."util.promisify-1.0.1" @@ -78108,7 +79828,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Nodejs-based tool for optimizing SVG vector graphics files"; - homepage = https://github.com/svg/svgo; + homepage = "https://github.com/svg/svgo"; license = "MIT"; }; production = true; @@ -78320,15 +80040,16 @@ in }) sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" (sources."graphlib-2.1.8" // { dependencies = [ sources."lodash-4.17.15" ]; }) sources."growl-1.9.2" - (sources."handlebars-4.7.3" // { + (sources."handlebars-4.7.6" // { dependencies = [ + sources."minimist-1.2.5" sources."source-map-0.6.1" ]; }) @@ -78442,8 +80163,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mixin-deep-1.3.2" @@ -78463,7 +80184,7 @@ in sources."ms-2.0.0" sources."multer-1.4.2" sources."mute-stream-0.0.5" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" sources."neo-async-2.6.1" @@ -78497,7 +80218,6 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-1.1.0" - sources."optimist-0.6.1" sources."p-finally-1.0.0" sources."package-json-4.0.1" sources."parseurl-1.3.3" @@ -78510,7 +80230,7 @@ in dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" - sources."qs-6.9.2" + sources."qs-6.9.4" sources."superagent-3.8.3" ]; }) @@ -78575,7 +80295,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."sigmund-1.0.1" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."slash-1.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -78687,11 +80407,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - (sources."uglify-js-3.8.0" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."uglify-js-3.9.2" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -78730,7 +80446,7 @@ in sources."validator-10.11.0" sources."which-1.3.1" sources."widest-line-2.0.1" - sources."wordwrap-0.0.3" + sources."wordwrap-1.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" @@ -78758,8 +80474,7 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."@types/node-13.9.3" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -78785,7 +80500,7 @@ in sources."debug-4.1.1" sources."decamelize-1.2.0" sources."delayed-stream-1.0.0" - sources."discord.js-11.6.3" + sources."discord.js-11.6.4" sources."ecc-jsbn-0.1.2" sources."emoji-regex-7.0.3" sources."esprima-4.0.1" @@ -78812,22 +80527,22 @@ in sources."jsprim-1.4.1" sources."locate-path-3.0.0" sources."long-4.0.0" - sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-2.4.5" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."module-alias-2.2.2" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."ms-2.1.2" sources."node-fetch-2.6.0" sources."oauth-sign-0.9.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."path-exists-3.0.0" sources."performance-now-2.1.0" sources."prism-media-0.0.4" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."ramda-0.25.0" @@ -78848,7 +80563,7 @@ in }) sources."string-width-3.1.0" sources."strip-ansi-5.2.0" - sources."telegraf-3.36.0" + sources."telegraf-3.38.0" sources."telegram-typings-3.6.1" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" @@ -78892,7 +80607,7 @@ in sources."errno-0.1.7" sources."fs.realpath-1.0.0" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isarray-1.0.0" @@ -78988,13 +80703,13 @@ in sources."file-entry-cache-5.0.1" sources."find-up-2.1.0" sources."flat-cache-2.0.1" - sources."flatted-2.0.1" + sources."flatted-2.0.2" sources."format-0.2.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-stdin-5.0.1" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-symbols-1.0.1" @@ -79022,7 +80737,7 @@ in sources."js-yaml-3.13.1" sources."json-parse-better-errors-1.0.2" sources."json-stable-stringify-1.0.1" - sources."json5-2.1.2" + sources."json5-2.1.3" sources."jsonify-0.0.0" sources."levn-0.3.0" sources."load-json-file-1.1.0" @@ -79034,12 +80749,12 @@ in sources."md5-2.2.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" sources."object-inspect-1.7.0" - sources."object-is-1.0.2" + sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."once-1.4.0" @@ -79079,13 +80794,13 @@ in sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."require-from-string-2.0.2" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."semver-5.7.1" sources."slice-ansi-0.0.4" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."sprintf-js-1.0.3" @@ -79096,8 +80811,10 @@ in ]; }) sources."string.prototype.padstart-3.1.0" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.1.1" (sources."strip-ansi-6.0.0" // { dependencies = [ @@ -79146,7 +80863,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The pluggable linting tool for text and markdown."; - homepage = https://github.com/textlint/textlint/; + homepage = "https://github.com/textlint/textlint/"; license = "MIT"; }; production = true; @@ -79168,7 +80885,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Latex plugin for [textlint](https://github.com/textlint/textlint "textlint")."; - homepage = https://github.com/elzup/textlint-plugin-latex; + homepage = "https://github.com/elzup/textlint-plugin-latex"; license = "MIT"; }; production = true; @@ -79199,13 +80916,15 @@ in sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."regexp.prototype.flags-1.3.0" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" ]; buildInputs = globalBuildInputs; meta = { description = "textlint rule check that abbreviations within parentheses."; - homepage = https://github.com/azu/textlint-rule-abbr-within-parentheses; + homepage = "https://github.com/azu/textlint-rule-abbr-within-parentheses"; license = "MIT"; }; production = true; @@ -79269,7 +80988,7 @@ in sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" - sources."cuss-1.18.0" + sources."cuss-1.19.0" sources."debug-4.1.1" sources."decamelize-1.2.0" sources."deep-extend-0.6.0" @@ -79296,7 +81015,7 @@ in sources."glob-7.1.6" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" sources."ignore-3.3.10" @@ -79404,7 +81123,7 @@ in sources."repeat-string-1.6.1" sources."repeating-2.0.1" sources."replace-ext-1.0.0" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-from-5.0.0" sources."retext-english-3.0.4" sources."retext-equality-3.2.0" @@ -79415,7 +81134,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shellsubstitute-1.2.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."sliced-1.0.1" (sources."spawn-to-readstream-0.1.3" // { dependencies = [ @@ -79425,7 +81144,7 @@ in ]; }) sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-0.2.10" @@ -79519,7 +81238,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule for alex"; - homepage = https://github.com/textlint-rule/textlint-rule-alex; + homepage = "https://github.com/textlint-rule/textlint-rule-alex"; license = "MIT"; }; production = true; @@ -79544,7 +81263,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule to check common misspellings"; - homepage = https://github.com/io-monad/textlint-rule-common-misspellings; + homepage = "https://github.com/io-monad/textlint-rule-common-misspellings"; license = "GPL-3.0"; }; production = true; @@ -79561,12 +81280,12 @@ in }; dependencies = [ sources."match-casing-1.0.3" - sources."strip-json-comments-3.0.1" + sources."strip-json-comments-3.1.0" ]; buildInputs = globalBuildInputs; meta = { description = "Textlint rule to check correct usage of diacritics"; - homepage = https://github.com/sapegin/textlint-rule-diacritics; + homepage = "https://github.com/sapegin/textlint-rule-diacritics"; license = "MIT"; }; production = true; @@ -79603,7 +81322,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that specify the maximum word count of a sentence."; - homepage = https://github.com/azu/textlint-rule-en-max-word-count; + homepage = "https://github.com/azu/textlint-rule-en-max-word-count"; license = "MIT"; }; production = true; @@ -79680,8 +81399,10 @@ in sources."readable-stream-3.6.0" sources."safe-buffer-5.2.0" sources."sentence-splitter-3.2.0" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.3.0" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" @@ -79694,7 +81415,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check no start with duplicated conjunction."; - homepage = https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction; + homepage = "https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction"; license = "MIT"; }; production = true; @@ -79727,13 +81448,15 @@ in sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" ]; buildInputs = globalBuildInputs; meta = { description = "textlint rule that check with or without period in list item."; - homepage = https://github.com/textlint-rule/textlint-rule-period-in-list-item; + homepage = "https://github.com/textlint-rule/textlint-rule-period-in-list-item"; license = "MIT"; }; production = true; @@ -79763,7 +81486,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Textlint rule to find filler words, buzzwords and chiches"; - homepage = https://github.com/sapegin/textlint-rule-stop-words; + homepage = "https://github.com/sapegin/textlint-rule-stop-words"; license = "MIT"; }; production = true; @@ -79773,17 +81496,17 @@ in textlint-rule-terminology = nodeEnv.buildNodePackage { name = "textlint-rule-terminology"; packageName = "textlint-rule-terminology"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-2.1.3.tgz"; - sha512 = "RpbATk2+M35bAXnDQZGL54ILNPXHy8e8GIl3AJLiywG251L2bQYqvAhLaA7ad9qsrDOXQiGFIkd562KnP5CPkw=="; + url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-2.1.4.tgz"; + sha512 = "kLw4qL8RwY2lCNqgKveHc5sjCDlS5Tdw2TXWOrHvSvQxqaVOwsv3+51oMIQLGfJzQrhFSMlSlw5MvfaOerBvPQ=="; }; dependencies = [ sources."@textlint/ast-node-types-4.2.5" sources."@textlint/types-1.3.1" sources."boundary-1.0.1" sources."lodash-4.17.15" - sources."strip-json-comments-3.0.1" + sources."strip-json-comments-3.1.0" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" sources."unist-util-is-3.0.0" @@ -79793,7 +81516,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TextLint rule to check correct terms spelling"; - homepage = https://github.com/sapegin/textlint-rule-terminology; + homepage = "https://github.com/sapegin/textlint-rule-terminology"; license = "MIT"; }; production = true; @@ -79803,10 +81526,10 @@ in textlint-rule-unexpanded-acronym = nodeEnv.buildNodePackage { name = "textlint-rule-unexpanded-acronym"; packageName = "textlint-rule-unexpanded-acronym"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-unexpanded-acronym/-/textlint-rule-unexpanded-acronym-1.2.3.tgz"; - sha512 = "kkbsbUlI3Gw4VTr79E825+2wuxPG8dM8T4VjEH25zlNhh3j8vpsVDjpbXRkVFl+EvDBCtDZEDaFPwhXy85toVQ=="; + url = "https://registry.npmjs.org/textlint-rule-unexpanded-acronym/-/textlint-rule-unexpanded-acronym-1.2.4.tgz"; + sha512 = "F1kV06CdonOM2awtXjCSRYUsRJfDfZIujQQo4zEMqNqD6UwpkapxpZOiwcwbeaQz00+17ljbJEoGqIe2XeiU+w=="; }; dependencies = [ sources."array-includes-3.1.1" @@ -79825,13 +81548,15 @@ in sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" ]; buildInputs = globalBuildInputs; meta = { description = "textlint rule that check unexpanded acronym word."; - homepage = https://github.com/textlint-rule/textlint-rule-unexpanded-acronym; + homepage = "https://github.com/textlint-rule/textlint-rule-unexpanded-acronym"; license = "MIT"; }; production = true; @@ -79871,7 +81596,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule to check your English style with write good"; - homepage = https://github.com/textlint-rule/textlint-rule-write-good; + homepage = "https://github.com/textlint-rule/textlint-rule-write-good"; license = "MIT"; }; production = true; @@ -79887,7 +81612,7 @@ in sha512 = "ozjuU9/DaxT5r7ivckvdrzTLRoMCOiUlNbEAxldoHD3jzbbCEm561rHkEw0Caek31tOL4y0yqHiFuRBRoGbmiQ=="; }; dependencies = [ - sources."@sindresorhus/is-2.1.0" + sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.5" sources."@tokenizer/token-0.1.1" sources."@types/cacheable-request-6.0.1" @@ -79895,14 +81620,14 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-13.9.3" + sources."@types/node-13.13.4" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-1.0.0" sources."accepts-1.3.7" sources."after-0.8.2" sources."agent-base-4.3.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-2.1.1" sources."ansi-styles-4.2.1" sources."aproba-1.2.0" @@ -79969,7 +81694,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.6.4" + sources."core-js-3.6.5" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -79994,14 +81719,14 @@ in sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.4.0" // { + (sources."engine.io-3.4.1" // { dependencies = [ sources."cookie-0.3.1" sources."debug-4.1.1" sources."ms-2.1.2" ]; }) - (sources."engine.io-client-3.4.0" // { + (sources."engine.io-client-3.4.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -80025,7 +81750,7 @@ in sources."extsprintf-1.4.0" sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" - sources."fast-text-encoding-1.0.1" + sources."fast-text-encoding-1.0.2" sources."file-type-14.1.3" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.1.0" @@ -80042,7 +81767,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."got-10.6.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."grapheme-splitter-1.0.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -80112,11 +81837,11 @@ in sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.14.0" - (sources."needle-2.4.0" // { + sources."nan-2.14.1" + (sources."needle-2.4.1" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -80186,7 +81911,7 @@ in sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.6" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" @@ -80220,7 +81945,7 @@ in sources."serve-static-1.14.1" sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" (sources."socket.io-2.3.0" // { dependencies = [ sources."debug-4.1.1" @@ -80297,7 +82022,7 @@ in sources."wide-align-1.1.3" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.0" @@ -80306,7 +82031,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The self-hosted Web IRC client"; - homepage = https://thelounge.chat/; + homepage = "https://thelounge.chat/"; license = "MIT"; }; production = true; @@ -80316,15 +82041,15 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.114.0"; + version = "0.116.1"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.114.0.tgz"; - sha512 = "3av45FxJeqYm7Rl02dfGBoqTaf2a934oUB4zMNrN8xjmASoSGeeykYoAr35+UntTdJDY/STw6CY3KuXFBWETig=="; + url = "https://registry.npmjs.org/three/-/three-0.116.1.tgz"; + sha512 = "l2JCMiA/lVZAuSrLWRYMalvpR+0j8hbIhCpfs4V6JFnw2+JQEQJ5HltNpfFr+9TDpQts1BhtcISehWf/xBGPvQ=="; }; buildInputs = globalBuildInputs; meta = { description = "JavaScript 3D library"; - homepage = https://threejs.org/; + homepage = "https://threejs.org/"; license = "MIT"; }; production = true; @@ -80334,10 +82059,10 @@ in tiddlywiki = nodeEnv.buildNodePackage { name = "tiddlywiki"; packageName = "tiddlywiki"; - version = "5.1.21"; + version = "5.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.1.21.tgz"; - sha512 = "VuBK9N2u9ttPcaHCh4NmRX3YYB2tMPoIKCHhfNaJ62VGQj8ozmVD+PkvP/w7R50g6HaZtaSsqUJj26gRTIBa6w=="; + url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.1.22.tgz"; + sha512 = "Iav0iC9SnwN6HTYGRfEI7kYDoq+hlKr9fw9o8aTs0wxMp0UzqlvthGwlK1JwrdVIRL92no1lpVGhQQj16ncSQQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -80359,7 +82084,7 @@ in }; dependencies = [ sources."adm-zip-0.4.13" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" @@ -80396,7 +82121,7 @@ in sources."fs.realpath-1.0.0" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-signature-1.2.0" @@ -80413,11 +82138,11 @@ in sources."jsprim-1.4.1" sources."keypress-0.2.1" sources."lodash-4.17.15" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-0.0.10" - sources."moment-2.24.0" + sources."moment-2.25.3" (sources."node-appc-0.2.49" // { dependencies = [ sources."temp-0.8.4" @@ -80429,7 +82154,7 @@ in sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."pkginfo-0.3.1" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."request-2.88.0" @@ -80477,10 +82202,10 @@ in triton = nodeEnv.buildNodePackage { name = "triton"; packageName = "triton"; - version = "7.7.1"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/triton/-/triton-7.7.1.tgz"; - sha512 = "ex2eL9Mw6XInMlG4CJAFUyxyQ/+8Qa6CzdFuGg5t3tlL5YauP3riInRf7NIOxcHJq02f41iBzRqwhXGvIhl6Fg=="; + url = "https://registry.npmjs.org/triton/-/triton-7.9.0.tgz"; + sha512 = "PCZVVbdI90e07avgNyBJiw32Q0YIFwqgIW/HFbU5g3Hh/+P5VBJP8TBlkXM27VCM7L3hyCC3z9K8uq9mI8aIVQ=="; }; dependencies = [ sources."asn1-0.2.4" @@ -80516,7 +82241,7 @@ in ]; }) sources."glob-5.0.15" - (sources."http-signature-1.3.2" // { + (sources."http-signature-1.3.4" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -80549,11 +82274,11 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."mooremachine-2.3.0" sources."mute-stream-0.0.8" sources."mv-2.1.1" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."ncp-2.0.0" sources."once-1.3.2" sources."path-is-absolute-1.0.1" @@ -80652,6 +82377,11 @@ in sources."extsprintf-1.2.0" ]; }) + (sources."watershed-0.3.4" // { + dependencies = [ + sources."readable-stream-1.0.2" + ]; + }) sources."which-1.2.4" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" @@ -80660,7 +82390,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Joyent Triton CLI and client (https://www.joyent.com/triton)"; - homepage = https://github.com/joyent/node-triton; + homepage = "https://github.com/joyent/node-triton"; license = "MPL-2.0"; }; production = true; @@ -80676,7 +82406,7 @@ in sha512 = "N8E1X543CWEjg0/A70ZnA/kfAfAY/uogILsIuWBhHGxzv9kaJaj7/JCSwDiBH86CPEy37chSgW86KxVeYKsswQ=="; }; dependencies = [ - sources."@types/node-6.14.9" + sources."@types/node-6.14.10" sources."ansi-0.3.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -80709,7 +82439,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TSUN: a repl for TypeScript Upgraded Node"; - homepage = https://github.com/HerringtonDarkholme/typescript-repl; + homepage = "https://github.com/HerringtonDarkholme/typescript-repl"; license = "MIT"; }; production = true; @@ -80750,7 +82480,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TypeScript is a language for application scale JavaScript development"; - homepage = https://www.typescriptlang.org/; + homepage = "https://www.typescriptlang.org/"; license = "Apache-2.0"; }; production = true; @@ -80770,7 +82500,7 @@ in sources."commander-2.20.3" sources."crypto-random-string-1.0.0" sources."fs-extra-7.0.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."jsonfile-4.0.0" sources."p-debounce-1.0.0" sources."temp-dir-1.0.0" @@ -80796,14 +82526,13 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.8.0"; + version = "3.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz"; - sha512 = "ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.2.tgz"; + sha512 = "zGVwKslUAD/EeqOrD1nQaBmXIHl1Vw371we8cvS8I6mYK9rmgX5tv8AAeJdfsQ3Kk5mGax2SVV/AizxdNGhl7Q=="; }; dependencies = [ sources."commander-2.20.3" - sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; meta = { @@ -80818,17 +82547,17 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.5.5"; + version = "1.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.5.5.tgz"; - sha512 = "2oP133ynKIZp+w9dqI9lQAq8W8UPWSF3zLlwPCtRETxe3Mz8jHw/PCczsxwjP+roMU/Of8o9GQF4ckkznASiyQ=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.5.6.tgz"; + sha512 = "cOXsZn+vjtqT8UU74DeKseLgMBl3i8I0/pYAP6kCCqZOcoi8qtxiCwkzbkWV4bMAR2VQx3N1AkemPxbQIqRteg=="; }; dependencies = [ - sources."@primer/octicons-9.4.0" + sources."@primer/octicons-9.6.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-13.9.3" + sources."@types/node-13.13.4" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -80851,7 +82580,7 @@ in sources."better-assert-1.0.2" sources."blob-0.0.5" sources."bluebird-3.7.2" - sources."blueimp-md5-2.12.0" + sources."blueimp-md5-2.13.0" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."bytes-3.1.0" @@ -80909,14 +82638,14 @@ in sources."enabled-1.0.2" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.4.0" // { + (sources."engine.io-3.4.1" // { dependencies = [ sources."cookie-0.3.1" sources."debug-4.1.1" sources."ms-2.1.2" ]; }) - (sources."engine.io-client-3.4.0" // { + (sources."engine.io-client-3.4.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -80929,7 +82658,7 @@ in sources."etag-1.8.1" sources."eve-0.5.4" sources."express-4.17.1" - (sources."express-session-1.17.0" // { + (sources."express-session-1.17.1" // { dependencies = [ sources."depd-2.0.0" sources."safe-buffer-5.2.0" @@ -80970,7 +82699,7 @@ in sources."is-docker-2.0.0" sources."is-fullwidth-code-point-3.0.0" sources."is-stream-1.1.0" - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" sources."isarray-2.0.1" sources."jquery-3.4.1" sources."jquery-ui-bundle-1.12.1" @@ -80999,12 +82728,12 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-1.0.3" + sources."mkdirp-1.0.4" sources."moment-2.24.0" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -81020,7 +82749,7 @@ in sources."one-time-0.0.4" sources."open-7.0.3" sources."p-cancelable-1.1.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" (sources."package-json-6.5.0" // { @@ -81109,9 +82838,9 @@ in dependencies = [ sources."component-emitter-1.3.0" sources."debug-4.1.1" - sources."mime-2.4.4" + sources."mime-2.4.5" sources."ms-2.1.2" - sources."qs-6.9.2" + sources."qs-6.9.4" sources."semver-6.3.0" ]; }) @@ -81143,12 +82872,12 @@ in }) sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xmlhttprequest-ssl-1.5.5" sources."y18n-4.0.0" sources."yallist-2.1.2" - sources."yargs-15.1.0" - sources."yargs-parser-16.1.0" + sources."yargs-15.3.1" + sources."yargs-parser-18.1.3" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -81237,7 +82966,7 @@ in }; dependencies = [ sources."absolute-0.0.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-escapes-3.2.0" sources."ansi-red-0.1.1" sources."ansi-regex-3.0.0" @@ -81260,7 +82989,7 @@ in sources."bl-1.2.2" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" - sources."buffer-5.5.0" + sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -81273,7 +83002,7 @@ in sources."chardet-0.7.0" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."clone-1.0.4" sources."co-3.1.0" sources."co-from-stream-0.0.0" @@ -81290,7 +83019,7 @@ in sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."dashdash-1.14.1" - sources."decompress-4.2.0" + sources."decompress-4.2.1" sources."decompress-tar-4.1.1" (sources."decompress-tarbz2-4.1.1" // { dependencies = [ @@ -81335,10 +83064,10 @@ in sources."git-clone-0.1.0" sources."glob-7.1.6" sources."got-6.7.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."graceful-readlink-1.0.1" sources."gray-matter-2.1.1" - sources."handlebars-4.7.3" + sources."handlebars-4.7.6" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-ansi-2.0.0" // { @@ -81362,7 +83091,6 @@ in sources."is-fullwidth-code-point-2.0.0" sources."is-natural-number-4.0.1" sources."is-object-1.0.1" - sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" @@ -81396,12 +83124,12 @@ in sources."supports-color-2.0.0" ]; }) - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."multimatch-2.1.0" sources."mute-stream-0.0.7" sources."neo-async-2.6.1" @@ -81414,11 +83142,6 @@ in sources."object-assign-4.1.1" sources."once-1.4.0" sources."onetime-2.0.1" - (sources."optimist-0.6.1" // { - dependencies = [ - sources."minimist-0.0.10" - ]; - }) sources."ora-1.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -81431,7 +83154,7 @@ in sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."read-metadata-1.0.0" @@ -81444,8 +83167,8 @@ in sources."request-2.88.2" sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" - sources."run-async-2.4.0" - sources."rxjs-6.5.4" + sources."run-async-2.4.1" + sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" (sources."seek-bzip-1.0.5" // { @@ -81454,7 +83177,7 @@ in ]; }) sources."semver-5.7.1" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -81491,9 +83214,9 @@ in sources."tslib-1.11.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.8.0" + sources."uglify-js-3.9.2" sources."uid-0.0.2" - sources."unbzip2-stream-1.3.3" + sources."unbzip2-stream-1.4.2" sources."unyield-0.0.1" sources."unzip-response-2.0.1" sources."uri-js-4.2.2" @@ -81506,7 +83229,7 @@ in sources."verror-1.10.0" sources."ware-1.3.0" sources."win-fork-1.1.1" - sources."wordwrap-0.0.3" + sources."wordwrap-1.0.0" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" sources."xtend-4.0.2" @@ -81533,7 +83256,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/highlight-7.9.0" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -81550,14 +83273,14 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-13.9.3" + sources."@types/node-13.13.4" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" sources."abbrev-1.1.1" sources."acorn-6.4.1" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ajv-keywords-2.1.1" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -81688,7 +83411,7 @@ in }) sources."cli-boxes-2.2.0" sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."cliui-4.1.0" sources."clone-1.0.4" sources."clone-response-1.0.2" @@ -81771,9 +83494,9 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-5.0.1" sources."esprima-4.0.1" - (sources."esquery-1.2.0" // { + (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.0.0" + sources."estraverse-5.1.0" ]; }) sources."esrecurse-4.2.1" @@ -81839,7 +83562,7 @@ in }) sources."find-up-2.1.0" sources."flat-cache-2.0.1" - sources."flatted-2.0.1" + sources."flatted-2.0.2" sources."fn-name-2.0.1" sources."for-in-1.0.2" sources."for-own-0.1.5" @@ -81874,7 +83597,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."gridsome-helper-json-1.0.3" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { @@ -81956,7 +83679,6 @@ in sources."is-plain-object-2.0.4" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-promise-2.1.0" sources."is-resolvable-1.1.0" sources."is-stream-1.1.0" sources."is-utf8-0.2.1" @@ -81965,14 +83687,18 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."js-beautify-1.10.3" + (sources."js-beautify-1.11.0" // { + dependencies = [ + sources."mkdirp-1.0.4" + ]; + }) sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.1.2" + sources."json5-2.1.3" sources."jsonc-parser-1.0.3" sources."keyv-3.1.0" sources."kind-of-6.0.3" @@ -81990,7 +83716,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.rest-4.0.5" sources."lodash.unescape-4.0.1" - sources."loglevel-1.6.7" + sources."loglevel-1.6.8" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -82033,11 +83759,11 @@ in sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."mout-0.5.0" sources."ms-2.1.2" sources."mute-stream-0.0.7" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."nice-try-1.0.5" @@ -82161,7 +83887,7 @@ in sources."pretty-format-23.6.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" - sources."property-information-5.4.0" + sources."property-information-5.5.0" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."pump-3.0.0" @@ -82178,7 +83904,7 @@ in dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" ]; @@ -82217,17 +83943,17 @@ in sources."resolve-from-1.0.1" ]; }) - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."rimraf-2.6.3" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."rxjs-6.5.4" + sources."rxjs-6.5.5" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -82244,7 +83970,7 @@ in sources."shebang-regex-1.0.0" sources."shellsubstitute-1.2.0" sources."sigmund-1.0.1" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."slash-1.0.0" sources."slice-ansi-2.1.0" (sources."snapdragon-0.8.2" // { @@ -82284,7 +84010,7 @@ in sources."source-map-url-0.4.0" sources."space-separated-tokens-1.1.5" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -82448,9 +84174,9 @@ in sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" - sources."vfile-4.0.3" + sources."vfile-4.1.0" sources."vfile-location-2.0.6" - sources."vfile-message-2.0.3" + sources."vfile-message-2.0.4" (sources."vfile-reporter-6.0.1" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -82463,7 +84189,7 @@ in }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" - (sources."vscode-css-languageservice-4.1.1" // { + (sources."vscode-css-languageservice-4.1.2" // { dependencies = [ sources."vscode-uri-2.1.1" ]; @@ -82516,7 +84242,7 @@ in buildInputs = globalBuildInputs; meta = { description = "vue-language-server"; - homepage = https://github.com/vuejs/vetur/tree/master/server; + homepage = "https://github.com/vuejs/vetur/tree/master/server"; license = "MIT"; }; production = true; @@ -82526,14 +84252,14 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-4.1.0.tgz"; - sha512 = "nhAeZ3BHI4rCT/J+s7JHg0U3G6qUMV8Bi44ohWm8X6GjlQV8tGcD6rkvN4Zk2zzMGaF9sHUOcRjyN79Ih8P/PQ=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-4.2.0.tgz"; + sha512 = "WM03BEeC7CVw4PV8lwXKO6ag00MYdwMMe1SAJJfxz0uNMbTu7cYoH6Ia+e2DnAzpeOJLKCeL1IXvgxZSwVp4/Q=="; }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/helper-validator-identifier-7.9.5" (sources."@babel/highlight-7.9.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -82546,32 +84272,36 @@ in }) sources."@babel/polyfill-7.7.0" sources."@babel/runtime-7.7.7" - sources."@babel/runtime-corejs3-7.9.2" + sources."@babel/runtime-corejs3-7.9.6" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.3" + sources."@types/node-13.13.4" sources."JSONSelect-0.2.1" sources."acorn-6.4.1" sources."acorn-jsx-5.2.0" sources."adbkit-2.11.1" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - (sources."addons-linter-1.20.0" // { + (sources."addons-linter-1.23.0" // { dependencies = [ - sources."regenerator-runtime-0.13.3" + sources."@babel/runtime-7.9.2" + sources."decamelize-1.2.0" + sources."yargs-15.3.1" ]; }) sources."adm-zip-0.4.14" - sources."ajv-6.10.2" + sources."ajv-6.12.0" sources."ajv-keywords-1.5.1" sources."ajv-merge-patch-4.1.0" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -82652,15 +84382,7 @@ in }) sources."bluebird-2.9.34" sources."boolbase-1.0.0" - (sources."boxen-4.2.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" - ]; - }) + sources."boxen-4.2.0" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -82668,7 +84390,7 @@ in sources."is-extendable-0.1.1" ]; }) - sources."buffer-5.5.0" + sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -82679,7 +84401,6 @@ in sources."cache-base-1.0.1" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" sources."lowercase-keys-2.0.0" ]; }) @@ -82696,7 +84417,12 @@ in sources."normalize-path-3.0.0" ]; }) - sources."chrome-launcher-0.12.0" + (sources."chrome-launcher-0.13.1" // { + dependencies = [ + sources."mkdirp-0.5.5" + sources."rimraf-3.0.2" + ]; + }) sources."ci-info-2.0.0" sources."circular-json-0.3.3" (sources."class-utils-0.3.6" // { @@ -82718,13 +84444,10 @@ in }) sources."cli-boxes-2.2.0" sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" (sources."cliui-6.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" sources."strip-ansi-6.0.0" ]; }) @@ -82759,7 +84482,7 @@ in sources."configstore-5.0.1" sources."copy-descriptor-0.1.1" sources."core-js-2.6.11" - sources."core-js-pure-3.6.4" + sources."core-js-pure-3.6.5" sources."core-util-is-1.0.2" sources."crc-3.8.0" (sources."crc32-stream-2.0.0" // { @@ -82794,9 +84517,11 @@ in sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" - (sources."dispensary-0.49.0" // { + (sources."dispensary-0.51.2" // { dependencies = [ - sources."async-3.1.1" + sources."async-3.2.0" + sources."decamelize-1.2.0" + sources."yargs-15.3.1" ]; }) sources."doctrine-3.0.0" @@ -82809,7 +84534,7 @@ in sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" - sources."emoji-regex-7.0.3" + sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -82820,7 +84545,7 @@ in sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-promise-2.3.0" - sources."es6-promisify-6.0.2" + sources."es6-promisify-6.1.0" (sources."es6-set-0.1.5" // { dependencies = [ sources."es6-symbol-3.1.1" @@ -82840,6 +84565,7 @@ in sources."debug-4.1.1" sources."espree-5.0.1" sources."has-flag-3.0.0" + sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."semver-5.7.1" sources."strip-ansi-4.0.0" @@ -82871,6 +84597,7 @@ in sources."ignore-3.3.10" sources."inquirer-0.12.0" sources."is-fullwidth-code-point-1.0.0" + sources."mkdirp-0.5.5" sources."onetime-1.1.0" sources."progress-1.1.8" sources."restore-cursor-1.0.1" @@ -82893,15 +84620,15 @@ in sources."eslint-scope-4.0.3" sources."eslint-utils-1.4.3" sources."eslint-visitor-keys-1.1.0" - (sources."espree-6.1.2" // { + (sources."espree-6.2.1" // { dependencies = [ sources."acorn-7.1.1" ]; }) sources."esprima-4.0.1" - (sources."esquery-1.2.0" // { + (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.0.0" + sources."estraverse-5.1.0" ]; }) sources."esrecurse-4.2.1" @@ -82909,7 +84636,17 @@ in sources."esutils-2.0.3" sources."event-emitter-0.3.5" sources."event-to-promise-0.8.0" - sources."execa-1.0.0" + (sources."execa-4.0.0" // { + dependencies = [ + sources."cross-spawn-7.0.2" + sources."mimic-fn-2.1.0" + sources."onetime-5.1.0" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) sources."exit-hook-1.1.1" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -82950,8 +84687,12 @@ in ]; }) sources."extsprintf-1.3.0" - sources."fast-deep-equal-2.0.1" - sources."fast-json-patch-2.2.1" + sources."fast-deep-equal-3.1.1" + (sources."fast-json-patch-2.2.1" // { + dependencies = [ + sources."fast-deep-equal-2.0.1" + ]; + }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fast-redact-2.0.0" @@ -82967,7 +84708,7 @@ in ]; }) sources."find-up-4.1.0" - (sources."firefox-profile-1.3.0" // { + (sources."firefox-profile-1.3.1" // { dependencies = [ sources."async-2.5.0" ]; @@ -82975,7 +84716,7 @@ in sources."first-chunk-stream-3.0.0" sources."flat-cache-2.0.1" sources."flatstr-1.0.12" - sources."flatted-2.0.1" + sources."flatted-2.0.2" sources."fluent-syntax-0.13.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -82997,7 +84738,7 @@ in sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-2.0.5" - sources."get-stream-4.1.0" + sources."get-stream-5.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" (sources."git-rev-sync-2.0.0" // { @@ -83014,8 +84755,12 @@ in }) sources."global-dirs-2.0.1" sources."globals-11.12.0" - sources."got-9.6.0" - sources."graceful-fs-4.2.3" + (sources."got-9.6.0" // { + dependencies = [ + sources."get-stream-4.1.0" + ]; + }) + sources."graceful-fs-4.2.4" sources."graceful-readlink-1.0.1" sources."growly-1.3.0" sources."har-schema-2.0.0" @@ -83034,6 +84779,7 @@ in sources."htmlparser2-3.10.1" sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" + sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" sources."ignore-4.0.6" @@ -83049,13 +84795,23 @@ in sources."ini-1.3.5" (sources."inquirer-6.5.2" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."has-flag-3.0.0" - sources."strip-ansi-5.2.0" + sources."is-fullwidth-code-point-2.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) sources."supports-color-5.5.0" ]; }) @@ -83072,11 +84828,12 @@ in sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" + sources."is-docker-2.0.0" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" - sources."is-installed-globally-0.3.1" + sources."is-installed-globally-0.3.2" sources."is-mergeable-object-1.1.1" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.0" @@ -83089,17 +84846,16 @@ in sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" sources."is-property-1.0.2" sources."is-regex-1.0.5" sources."is-relative-0.1.3" sources."is-resolvable-1.1.0" - sources."is-stream-1.1.0" + sources."is-stream-2.0.0" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" sources."isexe-2.0.0" @@ -83157,7 +84913,7 @@ in sources."lodash.once-4.1.1" sources."lodash.sortby-4.7.0" sources."lowercase-keys-1.0.1" - (sources."make-dir-3.0.2" // { + (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -83166,37 +84922,35 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."marky-1.2.1" - sources."mdn-browser-compat-data-1.0.3" + sources."mdn-browser-compat-data-1.0.15" (sources."mem-5.1.1" // { dependencies = [ sources."mimic-fn-2.1.0" ]; }) + sources."merge-stream-2.0.0" sources."micromatch-3.1.10" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mixin-deep-1.3.2" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - sources."moment-2.24.0" + sources."mkdirp-1.0.3" + sources."moment-2.25.3" sources."ms-2.0.0" sources."multimatch-4.0.0" sources."mute-stream-0.0.7" (sources."mv-2.1.1" // { dependencies = [ sources."glob-6.0.4" + sources."mkdirp-0.5.5" sources."rimraf-2.4.5" ]; }) sources."mz-2.7.0" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" @@ -83212,7 +84966,11 @@ in }) sources."normalize-path-2.1.1" sources."normalize-url-4.5.0" - sources."npm-run-path-2.0.2" + (sources."npm-run-path-4.0.1" // { + dependencies = [ + sources."path-key-3.1.1" + ]; + }) sources."nth-check-1.0.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" @@ -83231,7 +84989,7 @@ in ]; }) sources."object-inspect-1.7.0" - sources."object-is-1.0.2" + sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.0" @@ -83241,14 +84999,13 @@ in sources."open-7.0.0" sources."optionator-0.8.3" sources."os-homedir-1.0.2" - sources."os-locale-4.0.0" + sources."os-locale-5.0.0" sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-defer-1.0.0" - sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" (sources."package-json-6.5.0" // { @@ -83273,11 +85030,11 @@ in sources."path-parse-1.0.6" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."pino-5.15.0" + sources."pino-6.0.0" sources."pino-std-serializers-2.4.2" sources."pluralize-1.2.1" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.26" // { + (sources."postcss-7.0.27" // { dependencies = [ sources."ansi-styles-3.2.1" (sources."chalk-2.4.2" // { @@ -83296,11 +85053,11 @@ in sources."probe-image-size-5.0.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."quick-format-unescaped-3.0.3" + sources."quick-format-unescaped-4.0.1" (sources."rc-1.2.8" // { dependencies = [ sources."strip-json-comments-2.0.1" @@ -83344,22 +85101,22 @@ in sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."require-uncached-1.0.3" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-from-1.0.1" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."rimraf-2.6.3" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rx-lite-3.1.2" - sources."rxjs-6.5.4" + sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-7.1.1" + sources."semver-7.1.3" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -83381,17 +85138,19 @@ in (sources."sign-addon-2.0.5" // { dependencies = [ sources."core-js-3.6.4" + sources."es6-promisify-6.0.2" sources."punycode-1.4.1" sources."request-2.88.0" sources."tough-cookie-2.4.3" ]; }) - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" (sources."slice-ansi-2.1.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."is-fullwidth-code-point-2.0.0" ]; }) (sources."snapdragon-0.8.2" // { @@ -83424,7 +85183,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."sonic-boom-0.7.7" + sources."sonic-boom-1.0.1" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" sources."source-map-support-0.5.16" @@ -83459,25 +85218,29 @@ in sources."once-1.3.3" ]; }) - (sources."string-width-2.1.1" // { + (sources."string-width-4.2.0" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" + sources."ansi-regex-5.0.0" + sources."strip-ansi-6.0.0" ]; }) - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.3.0" sources."strip-ansi-3.0.1" sources."strip-bom-4.0.0" sources."strip-bom-buf-2.0.0" sources."strip-bom-stream-4.0.0" - sources."strip-eof-1.0.0" + sources."strip-final-newline-2.0.0" sources."strip-json-comments-3.0.1" sources."supports-color-7.1.0" (sources."table-5.4.6" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -83544,37 +85307,30 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."watchpack-1.6.0" + sources."watchpack-1.6.1" sources."wcwidth-1.0.1" sources."webidl-conversions-5.0.0" sources."whatwg-url-8.0.0" sources."when-3.7.7" sources."which-1.3.1" sources."which-module-2.0.0" - (sources."widest-line-3.1.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" - ]; - }) + sources."widest-line-3.1.0" sources."winreg-0.0.12" sources."word-wrap-1.2.3" (sources."wrap-ansi-6.2.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."emoji-regex-8.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."write-1.0.3" + (sources."write-1.0.3" // { + dependencies = [ + sources."mkdirp-0.5.5" + ]; + }) sources."write-file-atomic-3.0.3" - sources."ws-7.2.1" + sources."ws-7.2.3" sources."xdg-basedir-4.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -83583,15 +85339,11 @@ in sources."y18n-4.0.0" (sources."yargs-15.1.0" // { dependencies = [ - sources."ansi-regex-5.0.0" sources."decamelize-1.2.0" - sources."emoji-regex-8.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-16.1.0" ]; }) - (sources."yargs-parser-16.1.0" // { + (sources."yargs-parser-18.1.3" // { dependencies = [ sources."decamelize-1.2.0" ]; @@ -83613,7 +85365,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A command line tool to help build, run, and test web extensions"; - homepage = https://github.com/mozilla/web-ext; + homepage = "https://github.com/mozilla/web-ext"; license = "MPL-2.0"; }; production = true; @@ -83623,10 +85375,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.42.1"; + version = "4.43.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz"; - sha512 = "SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz"; + sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; }; dependencies = [ sources."@webassemblyjs/ast-1.9.0" @@ -83650,7 +85402,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-6.4.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" (sources."anymatch-2.0.0" // { @@ -83816,14 +85568,19 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ sources."kind-of-4.0.0" ]; }) - sources."hash-base-3.0.4" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.0" + ]; + }) sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."https-browserify-1.0.0" @@ -83876,10 +85633,10 @@ in sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."move-concurrently-1.0.1" sources."ms-2.0.0" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."neo-async-2.6.1" (sources."node-libs-browser-2.2.1" // { @@ -83906,7 +85663,7 @@ in sources."object.pick-1.3.0" sources."once-1.4.0" sources."os-browserify-0.3.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."pako-1.0.11" @@ -83991,7 +85748,7 @@ in sources."source-list-map-2.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.16" // { + (sources."source-map-support-0.5.19" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -84022,7 +85779,7 @@ in sources."stream-shift-1.0.1" sources."string_decoder-1.1.1" sources."tapable-1.1.3" - (sources."terser-4.6.7" // { + (sources."terser-4.6.13" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -84074,7 +85831,7 @@ in }) sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" - sources."watchpack-1.6.0" + sources."watchpack-1.6.1" (sources."webpack-sources-1.4.3" // { dependencies = [ sources."source-map-0.6.1" @@ -84089,7 +85846,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff."; - homepage = https://github.com/webpack/webpack; + homepage = "https://github.com/webpack/webpack"; license = "MIT"; }; production = true; @@ -84216,7 +85973,7 @@ in ]; }) sources."global-prefix-1.0.2" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-flag-3.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -84291,7 +86048,7 @@ in sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."parse-passwd-1.0.0" @@ -84329,7 +86086,7 @@ in }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -84437,9 +86194,9 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.3" + sources."@types/node-13.13.4" sources."accepts-1.3.7" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" sources."ansi-colors-3.2.4" @@ -84620,7 +86377,7 @@ in ]; }) sources."find-up-3.0.0" - (sources."follow-redirects-1.10.0" // { + (sources."follow-redirects-1.11.0" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -84647,8 +86404,8 @@ in sources."pify-2.3.0" ]; }) - sources."graceful-fs-4.2.3" - sources."handle-thing-2.0.0" + sources."graceful-fs-4.2.4" + sources."handle-thing-2.0.1" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.1" @@ -84659,7 +86416,7 @@ in ]; }) sources."hpack.js-2.1.6" - sources."html-entities-1.2.1" + sources."html-entities-1.3.1" sources."http-deceiver-1.2.7" (sources."http-errors-1.7.2" // { dependencies = [ @@ -84715,7 +86472,7 @@ in sources."lcid-2.0.0" sources."locate-path-3.0.0" sources."lodash-4.17.15" - sources."loglevel-1.6.7" + sources."loglevel-1.6.8" sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -84726,18 +86483,18 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mixin-deep-1.3.2" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."nice-try-1.0.5" @@ -84760,7 +86517,7 @@ in ]; }) sources."object-inspect-1.7.0" - sources."object-is-1.0.2" + sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.0" @@ -84775,7 +86532,7 @@ in sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-map-2.1.0" sources."p-retry-3.0.1" @@ -84792,7 +86549,7 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pkg-dir-3.0.0" - (sources."portfinder-1.0.25" // { + (sources."portfinder-1.0.26" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -84869,7 +86626,7 @@ in sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" (sources."snapdragon-0.8.2" // { dependencies = [ sources."debug-2.6.9" @@ -84911,7 +86668,7 @@ in sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" - sources."spdy-4.0.1" + sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -84943,8 +86700,10 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -84996,7 +86755,7 @@ in sources."wbuf-1.7.3" (sources."webpack-dev-middleware-3.7.2" // { dependencies = [ - sources."mime-2.4.4" + sources."mime-2.4.5" ]; }) sources."webpack-log-2.0.0" @@ -85034,7 +86793,7 @@ in sha512 = "P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg=="; }; dependencies = [ - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" sources."ansi-colors-3.2.4" @@ -85078,7 +86837,7 @@ in sources."pify-3.0.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."iferr-0.1.5" sources."ignore-3.3.10" sources."imurmurhash-0.1.4" @@ -85097,11 +86856,11 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mississippi-3.0.0" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."move-concurrently-1.0.1" sources."normalize-path-3.0.0" sources."once-1.4.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."parallel-transform-1.2.0" @@ -85152,7 +86911,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Copy files && directories with webpack"; - homepage = https://github.com/webpack-contrib/copy-webpack-plugin; + homepage = "https://github.com/webpack-contrib/copy-webpack-plugin"; license = "MIT"; }; production = true; @@ -85179,7 +86938,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-10.17.17" + sources."@types/node-13.13.4" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -85199,7 +86958,7 @@ in sources."ms-2.1.2" ]; }) - (sources."bittorrent-tracker-9.14.4" // { + (sources."bittorrent-tracker-9.14.5" // { dependencies = [ sources."debug-4.1.1" sources."decompress-response-4.2.1" @@ -85258,10 +87017,10 @@ in }) sources."dns-packet-1.3.1" sources."dns-txt-2.0.2" - sources."ecstatic-4.1.2" + sources."ecstatic-4.1.4" sources."ee-first-1.1.1" sources."elementtree-0.1.7" - sources."end-of-stream-1.4.4" + sources."end-of-stream-1.4.1" sources."escape-html-1.0.3" sources."executable-4.1.1" sources."filestream-5.0.0" @@ -85288,7 +87047,7 @@ in sources."is-docker-2.0.0" sources."is-file-1.0.0" sources."is-typedarray-1.0.0" - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."junk-3.1.0" sources."k-bucket-5.0.0" @@ -85309,12 +87068,12 @@ in sources."mdns-js-packet-0.2.0" sources."mediasource-2.3.0" sources."memory-chunk-store-1.3.0" - sources."mime-2.4.4" + sources."mime-2.4.5" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.4" - sources."moment-2.24.0" + sources."mkdirp-classic-0.5.3" + sources."moment-2.25.3" sources."mp4-box-encoding-1.4.1" sources."mp4-stream-3.1.0" sources."ms-2.0.0" @@ -85335,7 +87094,7 @@ in sources."open-7.0.3" sources."package-json-versionify-1.0.4" sources."parse-numeric-range-0.0.2" - (sources."parse-torrent-7.0.1" // { + (sources."parse-torrent-7.1.2" // { dependencies = [ sources."decompress-response-4.2.1" sources."mimic-response-2.1.0" @@ -85352,11 +87111,11 @@ in }) sources."prettier-bytes-1.0.4" sources."process-nextick-args-2.0.1" - sources."protobufjs-6.8.9" + sources."protobufjs-6.9.0" sources."pump-3.0.0" sources."qap-3.3.1" sources."queue-microtask-1.1.2" - sources."random-access-file-2.1.3" + sources."random-access-file-2.1.4" sources."random-access-storage-1.4.1" sources."random-iterate-1.0.1" sources."randombytes-2.1.0" @@ -85380,7 +87139,7 @@ in sources."semver-5.1.1" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" - (sources."simple-peer-9.6.2" // { + (sources."simple-peer-9.7.0" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -85430,7 +87189,7 @@ in sources."util-deprecate-1.0.2" sources."videostream-3.2.1" sources."vlc-command-1.2.0" - (sources."webtorrent-0.107.17" // { + (sources."webtorrent-0.108.1" // { dependencies = [ sources."debug-4.1.1" sources."decompress-response-4.2.1" @@ -85441,7 +87200,7 @@ in }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" @@ -85449,7 +87208,7 @@ in buildInputs = globalBuildInputs; meta = { description = "WebTorrent, the streaming torrent client. For the command line."; - homepage = https://webtorrent.io/; + homepage = "https://webtorrent.io/"; license = "MIT"; }; production = true; @@ -85524,7 +87283,7 @@ in sources."prettier-1.19.1" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.5.1" + sources."vscode-json-languageservice-3.6.0" sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -85579,12 +87338,22 @@ in sha512 = "GFg4QC1xi3gkbHGGUFme8/8XPg3kDISu/qJfx56X207yuv1FSevGY/eKuym7kh0bniCB4n3rseWW+QZXPH8LIw=="; }; dependencies = [ - sources."@babel/runtime-7.9.2" + sources."@babel/code-frame-7.8.3" + sources."@babel/helper-validator-identifier-7.9.5" + sources."@babel/highlight-7.9.0" + sources."@babel/runtime-7.9.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" + sources."@types/color-name-1.1.1" + sources."@types/events-3.0.0" + sources."@types/glob-7.1.1" + sources."@types/minimatch-3.0.3" + sources."@types/node-13.13.4" + sources."@types/normalize-package-data-2.4.0" + sources."JSONStream-1.3.5" sources."aggregate-error-3.0.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -85594,6 +87363,7 @@ in sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" + sources."array-differ-3.0.0" sources."array-find-index-1.0.2" sources."array-union-1.0.2" sources."array-uniq-1.0.3" @@ -85608,6 +87378,11 @@ in sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" + (sources."axios-0.18.1" // { + dependencies = [ + sources."is-buffer-2.0.4" + ]; + }) sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -85621,6 +87396,7 @@ in ]; }) sources."bin-version-check-3.0.0" + sources."binaryextensions-2.2.0" sources."boolean-3.0.1" (sources."boxen-1.3.0" // { dependencies = [ @@ -85670,16 +87446,22 @@ in sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-list-0.2.0" - sources."cli-width-2.2.0" + sources."cli-table-0.3.1" + sources."cli-width-2.2.1" sources."clone-1.0.4" + sources."clone-buffer-1.0.0" + sources."clone-deep-4.0.1" sources."clone-regexp-1.0.1" sources."clone-response-1.0.2" sources."clone-stats-0.0.1" + sources."cloneable-readable-1.1.3" sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."colors-1.0.3" sources."combined-stream-1.0.8" + sources."commondir-1.0.1" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -85687,14 +87469,16 @@ in sources."config-chain-1.1.12" sources."configstore-3.1.2" sources."copy-descriptor-0.1.1" - sources."core-js-3.6.4" + sources."core-js-3.6.5" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" sources."cross-spawn-async-2.2.5" sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" + sources."dargs-6.1.0" sources."dashdash-1.14.1" + sources."dateformat-3.0.3" sources."debug-2.6.9" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -85714,11 +87498,21 @@ in }) sources."dot-prop-4.2.0" sources."downgrade-root-1.2.2" + sources."download-stats-0.3.4" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" + (sources."editions-2.3.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."ejs-2.7.4" + sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."env-paths-1.0.0" + sources."errlop-2.2.0" + sources."error-7.2.1" sources."error-ex-1.3.2" sources."es6-error-4.1.1" sources."es6-promise-4.2.8" @@ -85771,6 +87565,11 @@ in sources."find-up-2.1.0" sources."find-versions-2.0.0" sources."first-chunk-stream-2.0.0" + (sources."follow-redirects-1.5.10" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."for-in-1.0.2" sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" @@ -85784,6 +87583,15 @@ in sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" + (sources."gh-got-5.0.0" // { + dependencies = [ + sources."get-stream-3.0.0" + sources."got-6.7.1" + sources."prepend-http-1.0.4" + sources."url-parse-lax-1.0.0" + ]; + }) + sources."github-username-3.0.0" sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { dependencies = [ @@ -85793,7 +87601,7 @@ in sources."glob-to-regexp-0.3.0" (sources."global-agent-2.1.8" // { dependencies = [ - sources."semver-7.1.3" + sources."semver-7.3.2" ]; }) sources."global-dirs-0.1.1" @@ -85806,8 +87614,8 @@ in sources."p-cancelable-0.4.1" ]; }) - sources."graceful-fs-4.2.3" - sources."grouped-queue-1.0.0" + sources."graceful-fs-4.2.4" + sources."grouped-queue-1.1.0" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-ansi-2.0.0" // { @@ -85828,6 +87636,7 @@ in sources."hosted-git-info-2.8.8" sources."http-cache-semantics-3.8.1" sources."http-signature-1.2.0" + sources."human-signals-1.1.1" sources."humanize-string-1.0.2" sources."iconv-lite-0.4.24" sources."ignore-3.3.10" @@ -85839,6 +87648,7 @@ in sources."ini-1.3.5" sources."inquirer-6.5.2" sources."insight-0.10.3" + sources."interpret-1.2.0" (sources."into-stream-3.1.0" // { dependencies = [ sources."p-is-promise-1.1.0" @@ -85869,7 +87679,6 @@ in sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-regexp-1.0.0" sources."is-retry-allowed-1.2.0" @@ -85882,16 +87691,20 @@ in sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-1.0.0" + sources."isbinaryfile-4.0.6" sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" + sources."istextorbinary-2.6.0" sources."isurl-1.0.0" + sources."js-tokens-4.0.0" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" + sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."keyv-3.0.0" sources."kind-of-6.0.3" @@ -85904,6 +87717,8 @@ in sources."url-parse-lax-1.0.0" ]; }) + sources."lazy-cache-2.0.2" + sources."lines-and-columns-1.1.6" (sources."load-json-file-1.1.0" // { dependencies = [ sources."pify-2.3.0" @@ -85933,6 +87748,25 @@ in }) sources."mem-5.1.1" sources."mem-fs-1.1.3" + (sources."mem-fs-editor-6.0.0" // { + dependencies = [ + sources."clone-2.1.2" + sources."clone-stats-1.0.0" + sources."dir-glob-2.2.2" + sources."globby-9.2.0" + sources."ignore-4.0.6" + (sources."path-type-3.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."pify-4.0.1" + sources."replace-ext-1.0.1" + sources."slash-2.0.0" + sources."through2-3.0.1" + sources."vinyl-2.2.0" + ]; + }) (sources."meow-3.7.0" // { dependencies = [ sources."find-up-1.1.2" @@ -85940,10 +87774,11 @@ in sources."read-pkg-up-1.0.1" ]; }) + sources."merge-stream-2.0.0" sources."merge2-1.3.0" sources."micromatch-3.1.10" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -85953,13 +87788,21 @@ in sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" + sources."moment-2.25.3" sources."ms-2.0.0" + (sources."multimatch-4.0.0" // { + dependencies = [ + sources."array-union-2.1.0" + sources."arrify-2.0.1" + ]; + }) sources."mute-stream-0.0.7" sources."nanomatch-1.2.13" sources."nice-try-1.0.5" sources."normalize-package-data-2.5.0" sources."normalize-url-2.0.1" + sources."npm-api-1.0.0" sources."npm-conf-1.1.3" (sources."npm-keyword-5.0.0" // { dependencies = [ @@ -86015,6 +87858,7 @@ in sources."p-try-1.0.0" sources."package-json-5.0.0" sources."pad-component-0.0.1" + sources."paged-request-2.0.1" sources."parse-help-1.0.0" sources."parse-json-2.2.0" sources."pascalcase-0.1.1" @@ -86037,22 +87881,28 @@ in sources."pkg-up-2.0.0" sources."posix-character-classes-0.1.1" sources."prepend-http-2.0.0" + sources."pretty-bytes-5.3.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."query-string-5.1.1" sources."rc-1.2.8" + (sources."read-chunk-3.2.0" // { + dependencies = [ + sources."pify-4.0.1" + ]; + }) sources."read-pkg-1.1.0" (sources."read-pkg-up-4.0.0" // { dependencies = [ sources."find-up-3.0.0" sources."load-json-file-4.0.0" sources."locate-path-3.0.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."parse-json-4.0.0" @@ -86066,6 +87916,7 @@ in sources."safe-buffer-5.1.2" ]; }) + sources."rechoir-0.6.2" (sources."redent-1.0.0" // { dependencies = [ sources."indent-string-2.1.0" @@ -86075,6 +87926,7 @@ in sources."regex-not-1.0.2" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" + sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."repeating-2.0.1" @@ -86084,16 +87936,17 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."ret-0.1.15" - sources."roarr-2.15.2" + sources."rimraf-2.7.1" + sources."roarr-2.15.3" sources."root-check-1.0.0" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rx-4.1.0" - sources."rxjs-6.5.4" + sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -86108,14 +87961,17 @@ in sources."type-fest-0.8.1" ]; }) + sources."set-getter-0.1.0" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" ]; }) + sources."shallow-clone-3.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."shelljs-0.8.4" + sources."signal-exit-3.0.3" sources."slash-1.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -86152,7 +88008,7 @@ in sources."source-map-url-0.4.0" sources."spawn-sync-1.0.15" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -86181,6 +88037,7 @@ in sources."strip-ansi-4.0.0" ]; }) + sources."string-template-0.2.1" (sources."string-width-2.1.1" // { dependencies = [ sources."strip-ansi-4.0.0" @@ -86199,6 +88056,7 @@ in sources."strip-bom-2.0.0" sources."strip-bom-stream-2.0.0" sources."strip-eof-1.0.0" + sources."strip-final-newline-2.0.0" sources."strip-indent-1.0.1" sources."strip-json-comments-2.0.1" (sources."sudo-block-1.2.0" // { @@ -86240,6 +88098,7 @@ in ]; }) sources."text-table-0.2.0" + sources."textextensions-2.6.0" sources."through-2.3.8" sources."through2-2.0.5" sources."timed-out-4.0.1" @@ -86258,7 +88117,7 @@ in sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."twig-1.15.0" + sources."twig-1.15.1" sources."type-fest-0.3.1" sources."typedarray-0.0.6" sources."union-value-1.0.1" @@ -86295,7 +88154,13 @@ in sources."walk-2.3.14" sources."which-1.3.1" sources."widest-line-2.0.1" - sources."windows-release-3.2.0" + sources."windows-release-3.3.0" + (sources."with-open-file-0.1.7" // { + dependencies = [ + sources."p-try-2.2.0" + sources."pify-4.0.1" + ]; + }) (sources."wrap-ansi-2.1.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -86316,11 +88181,73 @@ in ]; }) sources."yeoman-doctor-4.0.0" - (sources."yeoman-environment-2.8.1" // { + (sources."yeoman-environment-2.10.0" // { dependencies = [ + sources."ansi-escapes-4.3.1" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" + sources."cli-cursor-3.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."cross-spawn-7.0.2" sources."debug-3.2.6" + sources."execa-4.0.0" + sources."figures-3.2.0" + sources."get-stream-5.1.0" + sources."has-flag-4.0.0" + (sources."inquirer-7.1.0" // { + dependencies = [ + sources."chalk-3.0.0" + sources."strip-ansi-6.0.0" + ]; + }) + sources."is-fullwidth-code-point-3.0.0" + sources."is-stream-2.0.0" sources."ms-2.1.2" - sources."strip-ansi-4.0.0" + sources."mute-stream-0.0.8" + sources."npm-run-path-4.0.1" + sources."onetime-5.1.0" + sources."path-key-3.1.1" + sources."restore-cursor-3.1.0" + sources."semver-7.3.2" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + (sources."string-width-4.2.0" // { + dependencies = [ + sources."strip-ansi-6.0.0" + ]; + }) + (sources."strip-ansi-4.0.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + ]; + }) + sources."supports-color-7.1.0" + sources."type-fest-0.11.0" + sources."which-2.0.2" + ]; + }) + (sources."yeoman-generator-4.10.0" // { + dependencies = [ + sources."debug-4.1.1" + sources."diff-4.0.2" + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."ms-2.1.2" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."parse-json-5.0.0" + sources."read-pkg-5.2.0" + sources."read-pkg-up-5.0.0" + sources."semver-7.3.2" + sources."through2-3.0.1" + sources."type-fest-0.6.0" ]; }) (sources."yosay-2.0.2" // { @@ -86339,7 +88266,7 @@ in buildInputs = globalBuildInputs; meta = { description = "CLI tool for running Yeoman generators"; - homepage = http://yeoman.io/; + homepage = "https://yeoman.io/"; license = "BSD-2-Clause"; }; production = true; diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix index f2e633300c7e9..52465b099a5b6 100644 --- a/pkgs/development/node-packages/node-packages-v12.nix +++ b/pkgs/development/node-packages/node-packages-v12.nix @@ -1372,22 +1372,22 @@ let sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; }; }; - "mkdirp-0.5.4" = { + "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.4"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz"; - sha512 = "iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw=="; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "mkdirp-1.0.3" = { + "mkdirp-1.0.4" = { name = "mkdirp"; packageName = "mkdirp"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz"; - sha512 = "6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g=="; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; "ms-2.0.0" = { @@ -1426,13 +1426,13 @@ let sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; }; }; - "needle-2.4.0" = { + "needle-2.4.1" = { name = "needle"; packageName = "needle"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz"; - sha512 = "4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg=="; + url = "https://registry.npmjs.org/needle/-/needle-2.4.1.tgz"; + sha512 = "x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g=="; }; }; "nijs-0.0.25" = { @@ -1759,13 +1759,13 @@ let sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; - "psl-1.7.0" = { + "psl-1.8.0" = { name = "psl"; packageName = "psl"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz"; - sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="; + url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; }; }; "punycode-2.1.1" = { @@ -1849,13 +1849,13 @@ let sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; }; - "resolve-1.15.1" = { + "resolve-1.16.0" = { name = "resolve"; packageName = "resolve"; - version = "1.15.1"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz"; - sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.16.0.tgz"; + sha512 = "LarL/PIKJvc09k1jaeT4kQb/8/7P+qV4qSnN2K80AES+OHdfZELAKVOBjxsvtToT/uLOfFbvYvKfZmV8cee7nA=="; }; }; "resolve-dir-1.0.1" = { @@ -2011,13 +2011,13 @@ let sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="; }; }; - "signal-exit-3.0.2" = { + "signal-exit-3.0.3" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; + sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; }; }; "slasp-0.0.4" = { @@ -2475,7 +2475,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Unfancy JavaScript"; - homepage = http://coffeescript.org/; + homepage = "http://coffeescript.org/"; license = "MIT"; }; production = true; @@ -2655,7 +2655,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -2857,7 +2857,7 @@ in sources."minimist-1.2.5" sources."minipass-3.1.1" sources."minizlib-2.1.0" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ncp-0.4.2" sources."nijs-0.0.25" sources."nopt-3.0.6" @@ -2896,7 +2896,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" (sources."readable-stream-2.3.7" // { @@ -2905,14 +2905,14 @@ in ]; }) sources."request-2.88.2" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."semver-7.1.3" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."slasp-0.0.4" sources."slide-1.1.6" sources."spdx-correct-3.1.0" @@ -2930,7 +2930,7 @@ in sources."strip-ansi-3.0.1" (sources."tar-6.0.1" // { dependencies = [ - sources."mkdirp-1.0.3" + sources."mkdirp-1.0.4" ]; }) sources."temp-0.9.1" @@ -2953,7 +2953,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; - homepage = https://github.com/svanderburg/node2nix; + homepage = "https://github.com/svanderburg/node2nix"; license = "MIT"; }; production = true; @@ -3028,7 +3028,7 @@ in sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."nopt-4.0.3" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -3041,7 +3041,7 @@ in sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.7" @@ -3051,7 +3051,7 @@ in sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."sshpk-1.16.1" sources."string-width-1.0.2" sources."string_decoder-1.1.1" @@ -3090,7 +3090,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Build tool and bindings loader for node-gyp that supports prebuilds"; - homepage = https://github.com/prebuild/node-gyp-build; + homepage = "https://github.com/prebuild/node-gyp-build"; license = "MIT"; }; production = true; @@ -3137,9 +3137,9 @@ in sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."needle-2.4.0" + sources."needle-2.4.1" sources."nopt-4.0.3" sources."npm-bundled-1.1.1" sources."npm-normalize-package-bin-1.0.1" @@ -3161,7 +3161,7 @@ in sources."sax-1.2.4" sources."semver-5.7.1" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -3182,4 +3182,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/node-packages/node-packages-v13.nix b/pkgs/development/node-packages/node-packages-v13.nix index f87526382b932..77517655c50ed 100644 --- a/pkgs/development/node-packages/node-packages-v13.nix +++ b/pkgs/development/node-packages/node-packages-v13.nix @@ -634,22 +634,22 @@ let sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; }; }; - "mkdirp-0.5.4" = { + "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.4"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz"; - sha512 = "iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw=="; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "mkdirp-1.0.3" = { + "mkdirp-1.0.4" = { name = "mkdirp"; packageName = "mkdirp"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz"; - sha512 = "6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g=="; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; "ncp-0.4.2" = { @@ -850,13 +850,13 @@ let sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; - "psl-1.7.0" = { + "psl-1.8.0" = { name = "psl"; packageName = "psl"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz"; - sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="; + url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; }; }; "punycode-2.1.1" = { @@ -895,13 +895,13 @@ let sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; }; - "resolve-1.15.1" = { + "resolve-1.16.0" = { name = "resolve"; packageName = "resolve"; - version = "1.15.1"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz"; - sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.16.0.tgz"; + sha512 = "LarL/PIKJvc09k1jaeT4kQb/8/7P+qV4qSnN2K80AES+OHdfZELAKVOBjxsvtToT/uLOfFbvYvKfZmV8cee7nA=="; }; }; "retry-0.10.1" = { @@ -994,13 +994,13 @@ let sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; }; - "signal-exit-3.0.2" = { + "signal-exit-3.0.3" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; + sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; }; }; "slasp-0.0.4" = { @@ -1345,7 +1345,7 @@ in sources."minimist-1.2.5" sources."minipass-3.1.1" sources."minizlib-2.1.0" - sources."mkdirp-0.5.4" + sources."mkdirp-0.5.5" sources."ncp-0.4.2" sources."nijs-0.0.25" sources."nopt-3.0.6" @@ -1384,7 +1384,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" (sources."readable-stream-2.3.7" // { @@ -1393,14 +1393,14 @@ in ]; }) sources."request-2.88.2" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."semver-7.1.3" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."slasp-0.0.4" sources."slide-1.1.6" sources."spdx-correct-3.1.0" @@ -1418,7 +1418,7 @@ in sources."strip-ansi-3.0.1" (sources."tar-6.0.1" // { dependencies = [ - sources."mkdirp-1.0.3" + sources."mkdirp-1.0.4" ]; }) sources."temp-0.9.1" @@ -1441,11 +1441,11 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; - homepage = https://github.com/svanderburg/node2nix; + homepage = "https://github.com/svanderburg/node2nix"; license = "MIT"; }; production = true; bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/ocaml-modules/afl-persistent/default.nix b/pkgs/development/ocaml-modules/afl-persistent/default.nix new file mode 100644 index 0000000000000..5ac352e0762c1 --- /dev/null +++ b/pkgs/development/ocaml-modules/afl-persistent/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, opaline }: + +stdenv.mkDerivation rec { + pname = "afl-persistent"; + version = "1.3"; + name = "ocaml${ocaml.version}-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "stedolan"; + repo = "ocaml-${pname}"; + rev = "v${version}"; + sha256 = "06yyds2vcwlfr2nd3gvyrazlijjcrd1abnvkfpkaadgwdw3qam1i"; + }; + + buildInputs = [ ocaml findlib ]; + + # don't run tests in buildPhase + # don't overwrite test binary + postPatch = '' + sed -i 's/ && \.\/test$//' build.sh + sed -i '/^ocamlopt.*test.ml -o test$/ s/$/2/' build.sh + patchShebangs build.sh + ''; + + buildPhase = "./build.sh"; + installPhase = '' + ${opaline}/bin/opaline -prefix $out -libdir $out/lib/ocaml/${ocaml.version}/site-lib/ ${pname}.install + ''; + + doCheck = true; + checkPhase = "./_build/test && ./_build/test2"; + + meta = with stdenv.lib; { + homepage = "https://github.com/stedolan/ocaml-afl-persistent"; + description = "persistent-mode afl-fuzz for ocaml"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index 8415dc751d563..3ebf0f3ed6bd3 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -1,45 +1,22 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, dune -, cmdliner, astring, fmt, result, uuidm +{ lib, buildDunePackage, fetchurl +, astring, cmdliner, fmt, uuidm, re, stdlib-shims }: -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "0.8.5"; - sha256 = "1mhckvdcxkikbzgvy24kjz4265l15b86a6swz7m3ynbgvqdcfzqn"; - nativeBuildInputs = [ dune ]; - propagatedBuildInputs = [ uuidm ]; - buildPhase = "dune build -p alcotest"; - inherit (dune) installPhase; - } else { - version = "0.7.2"; - sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md"; - buildInputs = [ topkg ]; - nativeBuildInputs = [ ocamlbuild ]; - inherit (topkg) buildPhase installPhase; - }; -in - -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-alcotest-${version}"; - inherit (param) version buildPhase installPhase; +buildDunePackage rec { + pname = "alcotest"; + version = "1.0.1"; - src = fetchzip { - url = "https://github.com/mirage/alcotest/archive/${version}.tar.gz"; - inherit (param) sha256; + src = fetchurl { + url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-${version}.tbz"; + sha256 = "1xlklxb83gamqbg8j5dzm5jk4mvcwkspxajh93p6vpw9ia1li1qc"; }; - nativeBuildInputs = [ ocaml findlib ] ++ (param.nativeBuildInputs or []); - buildInputs = [ findlib ] ++ (param.buildInputs or []); - - propagatedBuildInputs = [ cmdliner astring fmt result ] - ++ (param.propagatedBuildInputs or []); - - createFindlibDestdir = true; + propagatedBuildInputs = [ astring cmdliner fmt uuidm re stdlib-shims ]; - meta = with stdenv.lib; { - homepage = https://github.com/mirage/alcotest; + meta = with lib; { + homepage = "https://github.com/mirage/alcotest"; description = "A lightweight and colourful test framework"; - license = stdenv.lib.licenses.isc; + license = licenses.isc; maintainers = [ maintainers.ericbmerritt ]; }; } diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index af12ea544cc81..b05190ed4911a 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, alcotest, result, bigstringaf }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, result, bigstringaf }: buildDunePackage rec { pname = "angstrom"; - version = "0.12.1"; + version = "0.13.0"; - minimumOCamlVersion = "4.03"; + minimumOCamlVersion = "4.04"; src = fetchFromGitHub { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "0w0wavqzdy2hrh7cjyl9w72ad4vndhwhknwvyacvkwkja5wys5b2"; + sha256 = "0vzbwd8j34iv7n6gwqq2mf25q7rqpnpxnifb9ssxhq55p5dd1kp4"; }; - buildInputs = [ alcotest ]; + checkInputs = [ alcotest ]; propagatedBuildInputs = [ bigstringaf result ]; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.05"; meta = { - homepage = https://github.com/inhabitedtype/angstrom; + homepage = "https://github.com/inhabitedtype/angstrom"; description = "OCaml parser combinators built for speed and memory efficiency"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; }; } diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix index b462e10979aa9..7dc87194d6a5b 100644 --- a/pkgs/development/ocaml-modules/apron/default.nix +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.lgpl21; - homepage = http://apron.cri.ensmp.fr/library/; + homepage = "http://apron.cri.ensmp.fr/library/"; maintainers = [ stdenv.lib.maintainers.vbgl ]; description = "Numerical abstract domain library"; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 49fcdbd261a33..16b4413291a5e 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -1,45 +1,27 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild -, cstruct, zarith, ounit, result, topkg, ptime +{ lib, buildDunePackage, fetchurl +, cstruct, zarith, bigarray-compat, stdlib-shims, ptime, alcotest }: -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "0.2.0"; - sha256 = "0yfq4hnyzx6hy05m60007cfpq88wxwa8wqzib19lnk2qrgy772mx"; - propagatedBuildInputs = [ ptime ]; - } else { - version = "0.1.3"; - sha256 = "0hpn049i46sdnv2i6m7r6m6ch0jz8argybh71wykbvcqdby08zxj"; - propagatedBuildInputs = [ ]; - }; -in +buildDunePackage rec { + minimumOCamlVersion = "4.05"; -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-asn1-combinators-${version}"; - inherit (param) version; + pname = "asn1-combinators"; + version = "0.2.2"; - src = fetchFromGitHub { - owner = "mirleft"; - repo = "ocaml-asn1-combinators"; - rev = "v${version}"; - inherit (param) sha256; + src = fetchurl { + url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-v${version}.tbz"; + sha256 = "0c9n3nki3drjwn7yv2pg7nzyzsi409laq70830wh147hvvwxbsy9"; }; - buildInputs = [ findlib ounit topkg ]; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ result cstruct zarith ] ++ param.propagatedBuildInputs; - - buildPhase = "${topkg.run} build --tests true"; - - inherit (topkg) installPhase; + propagatedBuildInputs = [ cstruct zarith bigarray-compat stdlib-shims ptime ]; doCheck = true; - checkPhase = "${topkg.run} test"; + checkInputs = [ alcotest ]; - meta = { - homepage = https://github.com/mirleft/ocaml-asn1-combinators; + meta = with lib; { + homepage = "https://github.com/mirleft/ocaml-asn1-combinators"; description = "Combinators for expressing ASN.1 grammars in OCaml"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = licenses.isc; + maintainers = with maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix index 7410c19b2473b..b636016089197 100644 --- a/pkgs/development/ocaml-modules/astring/default.nix +++ b/pkgs/development/ocaml-modules/astring/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; meta = { - homepage = https://erratique.ch/software/astring; + homepage = "https://erratique.ch/software/astring"; description = "Alternative String module for OCaml"; longDescription = '' Astring exposes an alternative String module for OCaml. This module tries diff --git a/pkgs/development/ocaml-modules/async/default.nix b/pkgs/development/ocaml-modules/async/default.nix deleted file mode 100644 index 498315f9cbfdb..0000000000000 --- a/pkgs/development/ocaml-modules/async/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{stdenv, buildOcaml, fetchurl, async_kernel_p4, - async_unix_p4, async_extra_p4, pa_ounit}: - -buildOcaml rec { - name = "async"; - version = "112.24.00"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/async/archive/${version}.tar.gz"; - sha256 = "ecc4ca939ab098e689332921b110dbaacd06d9f8d8bf697023dfff3ca37dc1e9"; - }; - - propagatedBuildInputs = [ async_kernel_p4 async_unix_p4 async_extra_p4 pa_ounit ]; - - meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async; - description = "Jane Street Capital's asynchronous execution library"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/async_extra/default.nix b/pkgs/development/ocaml-modules/async_extra/default.nix deleted file mode 100644 index 80addcfc3bb4a..0000000000000 --- a/pkgs/development/ocaml-modules/async_extra/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{stdenv, buildOcaml, fetchurl, async_kernel_p4, async_unix_p4, - bin_prot_p4, core_p4, custom_printf, fieldslib_p4, herelib, pa_ounit, - pipebang, pa_test, sexplib_p4}: - -buildOcaml rec { - name = "async_extra"; - version = "112.24.00"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/async_extra/archive/${version}.tar.gz"; - sha256 = "51f6f67a9ad56fe5dcf09faeeca6ec2fea53a7a975a72bc80504b90841212e28"; - }; - - buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ async_kernel_p4 async_unix_p4 core_p4 bin_prot_p4 custom_printf - fieldslib_p4 herelib pipebang sexplib_p4 ]; - - meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_extra; - description = "Jane Street Capital's asynchronous execution library (extra)"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/async_find/default.nix b/pkgs/development/ocaml-modules/async_find/default.nix deleted file mode 100644 index d0e89940433c2..0000000000000 --- a/pkgs/development/ocaml-modules/async_find/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, buildOcaml, fetchurl, async_p4, core_p4, sexplib_p4}: - -buildOcaml rec { - name = "async_find"; - version = "111.28.00"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/async_find/archive/${version}.tar.gz"; - sha256 = "4e3fda72f50174f05d96a5a09323f236c041b1a685890c155822956f3deb8803"; - }; - - propagatedBuildInputs = [ async_p4 core_p4 sexplib_p4 ]; - - meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_find; - description = "Directory traversal with Async"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/async_kernel/default.nix b/pkgs/development/ocaml-modules/async_kernel/default.nix index 43fde1631ac73..19b4d6213e49c 100644 --- a/pkgs/development/ocaml-modules/async_kernel/default.nix +++ b/pkgs/development/ocaml-modules/async_kernel/default.nix @@ -17,7 +17,7 @@ buildOcaml rec { propagatedBuildInputs = [ core_kernel_p4 bin_prot_p4 fieldslib_p4 herelib sexplib_p4 ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_kernel; + homepage = "https://github.com/janestreet/async_kernel"; description = "Jane Street Capital's asynchronous execution library (core) "; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/async_shell/default.nix b/pkgs/development/ocaml-modules/async_shell/default.nix deleted file mode 100644 index 6b1e772bc7d15..0000000000000 --- a/pkgs/development/ocaml-modules/async_shell/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, buildOcaml, fetchurl, async_p4, core_p4, core_extended_p4}: - -buildOcaml rec { - name = "async_shell"; - version = "109.28.03"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/async_shell/archive/${version}.tar.gz"; - sha256 = "0b4497bea9124c5a665ee58fb0a73c5cbf2f757479df902e6870627196e6c105"; - }; - - propagatedBuildInputs = [ async_p4 core_p4 core_extended_p4 ]; - - meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_shell; - description = "Shell helpers for Async"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/async_unix/default.nix b/pkgs/development/ocaml-modules/async_unix/default.nix deleted file mode 100644 index 6119bcac876a6..0000000000000 --- a/pkgs/development/ocaml-modules/async_unix/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{stdenv, buildOcaml, fetchurl, async_kernel_p4, - bin_prot_p4, comparelib, core_p4, fieldslib_p4, herelib, pa_ounit, - pipebang, pa_test, sexplib_p4}: - -buildOcaml rec { - name = "async_unix"; - version = "112.24.00"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/async_unix/archive/${version}.tar.gz"; - sha256 = "d490b1dc42f0987a131fa9695b55f215ad90cdaffbfac35b7f9f88f3834337ab"; - }; - - hasSharedObjects = true; - buildInputs = [ pa_ounit ]; - propagatedBuildInputs = [ async_kernel_p4 core_p4 bin_prot_p4 comparelib - fieldslib_p4 herelib pipebang pa_test sexplib_p4 ]; - - meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_unix; - description = "Jane Street Capital's asynchronous execution library (unix)"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix index c6047f4ea1b7a..84b137ada7c36 100644 --- a/pkgs/development/ocaml-modules/atd/default.nix +++ b/pkgs/development/ocaml-modules/atd/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { propagatedBuildInputs = [ easy-format biniou yojson ]; meta = with stdenv.lib; { - homepage = https://github.com/mjambon/atd; + homepage = "https://github.com/mjambon/atd"; description = "Syntax for cross-language type definitions"; license = licenses.bsd3; maintainers = with maintainers; [ aij jwilberding ]; diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index a988582ce6ce2..46fd75f98871a 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages."; - homepage = https://github.com/BinaryAnalysisPlatform/bap/; + homepage = "https://github.com/BinaryAnalysisPlatform/bap/"; maintainers = [ maintainers.maurer ]; license = licenses.mit; }; diff --git a/pkgs/development/ocaml-modules/base64/2.0.nix b/pkgs/development/ocaml-modules/base64/2.0.nix index 4606ebd517218..a49e0e8a778e7 100644 --- a/pkgs/development/ocaml-modules/base64/2.0.nix +++ b/pkgs/development/ocaml-modules/base64/2.0.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://github.com/mirage/ocaml-base64; + homepage = "https://github.com/mirage/ocaml-base64"; platforms = ocaml.meta.platforms or []; description = "Base64 encoding and decoding in OCaml"; license = stdenv.lib.licenses.isc; diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/pkgs/development/ocaml-modules/base64/default.nix index 2633d43c1045c..b2e3e0c5e74d3 100644 --- a/pkgs/development/ocaml-modules/base64/default.nix +++ b/pkgs/development/ocaml-modules/base64/default.nix @@ -1,8 +1,8 @@ -{ lib, fetchzip, buildDunePackage, alcotest, bos }: +{ lib, fetchpatch, fetchzip, buildDunePackage, alcotest, bos }: let version = "3.2.0"; in -buildDunePackage { +buildDunePackage rec { pname = "base64"; inherit version; @@ -13,12 +13,19 @@ buildDunePackage { minimumOCamlVersion = "4.03"; - buildInputs = [ alcotest bos ]; + buildInputs = [ bos ]; + + # Fix test-suite for alcotest ≥ 1.0 + patches = [(fetchpatch { + url = "https://github.com/mirage/ocaml-base64/commit/8d334d02aa52875158fae3e2fb8fe0a5596598d0.patch"; + sha256 = "0lvqdp98qavpzis1wgwh3ijajq79hq47898gsrk37fpyjbrdzf5q"; + })]; doCheck = true; + checkInputs = [ alcotest ]; meta = { - homepage = https://github.com/mirage/ocaml-base64; + homepage = "https://github.com/mirage/ocaml-base64"; description = "Base64 encoding and decoding in OCaml"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 263da89d1dfee..3032df7b8fd55 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }: +{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, qtest, num }: let version = "3.0.0"; in @@ -10,6 +10,12 @@ stdenv.mkDerivation { sha256 = "0d833amm4p0pczgl7wriv99f3r5r6345p5gi9d97sm0hqx27vzwi"; }; + # Fixes tests with OCaml 4.10 + patches = [(fetchpatch { + url = "https://github.com/ocaml-batteries-team/batteries-included/commit/6d8d67f9fb48181be3d527b32df15899b00cd5dd.patch"; + sha256 = "0msk8c5bjm6gm011i75b1rza332i1r4adj58qzli6gyjlvfj1hx4"; + })]; + buildInputs = [ ocaml findlib ocamlbuild qtest ]; propagatedBuildInputs = [ num ]; @@ -19,7 +25,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://batteries.forge.ocamlcore.org/; + homepage = "http://batteries.forge.ocamlcore.org/"; description = "OCaml Batteries Included"; longDescription = '' A community-driven effort to standardize on an consistent, documented, diff --git a/pkgs/development/ocaml-modules/benchmark/default.nix b/pkgs/development/ocaml-modules/benchmark/default.nix index de2010275ef98..518a8756158b5 100644 --- a/pkgs/development/ocaml-modules/benchmark/default.nix +++ b/pkgs/development/ocaml-modules/benchmark/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://ocaml-benchmark.forge.ocamlcore.org/; + homepage = "http://ocaml-benchmark.forge.ocamlcore.org/"; platforms = ocaml.meta.platforms or []; description = "Benchmark running times of code"; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/development/ocaml-modules/bigstring/default.nix b/pkgs/development/ocaml-modules/bigstring/default.nix new file mode 100644 index 0000000000000..98687262c33b3 --- /dev/null +++ b/pkgs/development/ocaml-modules/bigstring/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildDunePackage }: + +buildDunePackage rec { + pname = "bigstring"; + version = "0.2"; + + minimumOCamlVersion = "4.03"; + + src = fetchFromGitHub { + owner = "c-cube"; + repo = "ocaml-bigstring"; + rev = version; + sha256 = "0ypdf29cmwmjm3djr5ygz8ls81dl41a4iz1xx5gbcdpbrdiapb77"; + }; + + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/c-cube/ocaml-bigstring"; + description = "Bigstring built on top of bigarrays, and convenient functions"; + license = licenses.bsd2; + maintainers = [ maintainers.alexfmpe ]; + }; +} diff --git a/pkgs/development/ocaml-modules/bigstringaf/default.nix b/pkgs/development/ocaml-modules/bigstringaf/default.nix index 0544ebbe6856d..9f6810379aef4 100644 --- a/pkgs/development/ocaml-modules/bigstringaf/default.nix +++ b/pkgs/development/ocaml-modules/bigstringaf/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, alcotest, bigarray-compat }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, bigarray-compat }: buildDunePackage rec { pname = "bigstringaf"; @@ -13,9 +13,9 @@ buildDunePackage rec { sha256 = "04b088vrqzmxsyan9f9nr8721bxip4b930cgvb5zkbbmrw3ylmwc"; }; - buildInputs = [ alcotest ]; + checkInputs = [ alcotest ]; propagatedBuildInputs = [ bigarray-compat ]; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.05"; meta = { description = "Bigstring intrinsics and fast blits based on memcpy/memmove"; diff --git a/pkgs/development/ocaml-modules/bin_prot/default.nix b/pkgs/development/ocaml-modules/bin_prot/default.nix index bc075295cf33b..0dddb653e09e1 100644 --- a/pkgs/development/ocaml-modules/bin_prot/default.nix +++ b/pkgs/development/ocaml-modules/bin_prot/default.nix @@ -20,7 +20,7 @@ buildOcaml rec { hasSharedObjects = true; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/bin_prot; + homepage = "https://github.com/janestreet/bin_prot"; description = "Binary protocol generator "; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix index 9999cd06fcae0..ce52c427cd07b 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix @@ -19,6 +19,6 @@ buildDunePackage rec { meta = { description = "Code coverage for OCaml"; license = stdenv.lib.licenses.mpl20; - homepage = https://github.com/aantron/bisect_ppx; + homepage = "https://github.com/aantron/bisect_ppx"; }; } diff --git a/pkgs/development/ocaml-modules/bistro/default.nix b/pkgs/development/ocaml-modules/bistro/default.nix index b141244f8c5b9..9603f283ee4fa 100644 --- a/pkgs/development/ocaml-modules/bistro/default.nix +++ b/pkgs/development/ocaml-modules/bistro/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage +{ lib, fetchFromGitHub, fetchpatch, buildDunePackage , base64, bos, core, lwt_react, ocamlgraph, rresult, tyxml }: @@ -12,6 +12,12 @@ buildDunePackage rec { sha256 = "114gq48cpj2mvycypa9lfyqqb26wa2gkdfwkcqhnx7m6sdwv9a38"; }; + # The following patch adds support for core.v0.13 + patches = [(fetchpatch { + url = "https://github.com/pveber/bistro/commit/0931db43a146ad7829dff5120161a775f732a878.patch"; + sha256 = "06y0sxbbab1mssc1xfjjv12lpv4rny5iqv9qkdqyzrvzpl1bdvnd"; + })]; + propagatedBuildInputs = [ base64 bos core lwt_react ocamlgraph rresult tyxml ]; minimumOCamlVersion = "4.07"; diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix index 3d1a554b3307a..2f413d37352c4 100644 --- a/pkgs/development/ocaml-modules/bitstring/default.nix +++ b/pkgs/development/ocaml-modules/bitstring/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { meta = with stdenv.lib; { description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml"; - homepage = https://github.com/xguerin/bitstring; + homepage = "https://github.com/xguerin/bitstring"; license = licenses.lgpl21Plus; maintainers = [ maintainers.maurer ]; }; diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix index 7b8103efac857..f5dc099b1403f 100644 --- a/pkgs/development/ocaml-modules/bolt/default.nix +++ b/pkgs/development/ocaml-modules/bolt/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild which camlp4 ]; patches = [ (fetchpatch { - url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/bolt/bolt.1.4/files/opam.patch; + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/bolt/bolt.1.4/files/opam.patch"; sha256 = "08cl39r98w312sw23cskd5wian6zg20isn9ki41hnbcgkazhi7pb"; }) ]; @@ -51,7 +51,7 @@ EOF checkTarget = "tests"; meta = with stdenv.lib; { - homepage = http://bolt.x9c.fr; + homepage = "http://bolt.x9c.fr"; description = "A logging tool for the OCaml language"; longDescription = '' Bolt is a logging tool for the OCaml language. It is inspired by and diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix index 6b37cf1aed3a8..ca6c362b6fa54 100644 --- a/pkgs/development/ocaml-modules/bos/default.nix +++ b/pkgs/development/ocaml-modules/bos/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Basic OS interaction for OCaml"; - homepage = https://erratique.ch/software/bos; + homepage = "https://erratique.ch/software/bos"; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix index 22d000a5fd334..bf129c7bc442c 100644 --- a/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildDunePackage +{ stdenv, lib, fetchurl, buildDunePackage, ocaml , pkgconfig, cairo }: @@ -14,7 +14,9 @@ buildDunePackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cairo ]; - doCheck = !stdenv.isDarwin; + doCheck = !(stdenv.isDarwin + # https://github.com/Chris00/ocaml-cairo/issues/19 + || lib.versionAtLeast ocaml.version "4.10"); meta = { homepage = "https://github.com/Chris00/ocaml-cairo"; diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix index c33deec9c784d..f23081a5f195a 100644 --- a/pkgs/development/ocaml-modules/calendar/default.nix +++ b/pkgs/development/ocaml-modules/calendar/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ocaml-calendar-2.5"; src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/915/calendar-2.5.tar.bz2; + url = "https://forge.ocamlcore.org/frs/download.php/915/calendar-2.5.tar.bz2"; sha256 = "04pvhwb664g3s644c7v7419a3kvf5s3pynkhmk5j59dvlfm1yf0f"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://forge.ocamlcore.org/projects/calendar/; + homepage = "https://forge.ocamlcore.org/projects/calendar/"; description = "An Objective Caml library managing dates and times"; license = "LGPL"; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/camlimages/4.0.nix b/pkgs/development/ocaml-modules/camlimages/4.0.nix index 0ec3a26d0511e..e62acc3cd63f0 100644 --- a/pkgs/development/ocaml-modules/camlimages/4.0.nix +++ b/pkgs/development/ocaml-modules/camlimages/4.0.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { branch = "4.0"; - homepage = https://bitbucket.org/camlspotter/camlimages; + homepage = "https://bitbucket.org/camlspotter/camlimages"; description = "OCaml image processing library"; license = licenses.lgpl2; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/camlimages/4.1.nix b/pkgs/development/ocaml-modules/camlimages/4.1.nix index 31b4047efc81e..d2d626acbfe01 100644 --- a/pkgs/development/ocaml-modules/camlimages/4.1.nix +++ b/pkgs/development/ocaml-modules/camlimages/4.1.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://bitbucket.org/camlspotter/camlimages; + homepage = "https://bitbucket.org/camlspotter/camlimages"; description = "OCaml image processing library"; license = licenses.lgpl2; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index 8b0b70cae60e9..1ea3e78a06be6 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { meta = with lib; { branch = "5.0"; - homepage = https://bitbucket.org/camlspotter/camlimages; + homepage = "https://bitbucket.org/camlspotter/camlimages"; description = "OCaml image processing library"; license = licenses.gpl2; maintainers = [ maintainers.vbgl maintainers.mt-caret ]; diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index e1e213eca788e..fa5ffabedade7 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OCaml library for reading, writing and modifying PDF files"; - homepage = https://github.com/johnwhitington/camlpdf; + homepage = "https://github.com/johnwhitington/camlpdf"; license = licenses.lgpl21Plus; maintainers = with maintainers; [vbgl]; }; diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix index d206cbf942105..6b18220dc8a92 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = { - homepage = http://camomile.sourceforge.net/; + homepage = "http://camomile.sourceforge.net/"; description = "A comprehensive Unicode library for OCaml"; license = stdenv.lib.licenses.lgpl21; branch = "0.8.2"; diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/pkgs/development/ocaml-modules/camomile/0.8.5.nix index dc2049769f3a5..b975482ecf3eb 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.5.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.5.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation { version = "0.8.5"; src = fetchurl { - url = https://github.com/yoriyuki/Camomile/releases/download/rel-0.8.5/camomile-0.8.5.tar.bz2; + url = "https://github.com/yoriyuki/Camomile/releases/download/rel-0.8.5/camomile-0.8.5.tar.bz2"; sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045"; }; patches = [ (fetchpatch { - url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/camomile/camomile.0.8.5/files/4.05-typing-fix.patch; + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/camomile/camomile.0.8.5/files/4.05-typing-fix.patch"; sha256 = "167279lia6qx62mdcyc5rjsi4gf4yi52wn9mhgd9y1v3754z7fwb"; })]; @@ -19,7 +19,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://github.com/yoriyuki/Camomile/tree/master/Camomile; + homepage = "https://github.com/yoriyuki/Camomile/tree/master/Camomile"; description = "A comprehensive Unicode library for OCaml"; license = stdenv.lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/pkgs/development/ocaml-modules/cil/default.nix index 5fbb141b6ccea..9903c237e6323 100644 --- a/pkgs/development/ocaml-modules/cil/default.nix +++ b/pkgs/development/ocaml-modules/cil/default.nix @@ -7,7 +7,7 @@ else stdenv.mkDerivation { name = "ocaml-cil-1.7.3"; src = fetchurl { - url = mirror://sourceforge/cil/cil-1.7.3.tar.gz; + url = "mirror://sourceforge/cil/cil-1.7.3.tar.gz"; sha256 = "05739da0b0msx6kmdavr3y2bwi92jbh3szc35d7d8pdisa8g5dv9"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { prefixKey = "-prefix="; meta = with stdenv.lib; { - homepage = http://kerneis.github.io/cil/; + homepage = "http://kerneis.github.io/cil/"; description = "A front-end for the C programming language that facilitates program analysis and transformation"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index 34d57b403b014..7c94dcf54356c 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { - homepage = https://erratique.ch/software/cmdliner; + homepage = "https://erratique.ch/software/cmdliner"; description = "An OCaml module for the declarative definition of command line interfaces"; license = licenses.bsd3; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/comparelib/default.nix b/pkgs/development/ocaml-modules/comparelib/default.nix index 8192fced97be7..55787e123923f 100644 --- a/pkgs/development/ocaml-modules/comparelib/default.nix +++ b/pkgs/development/ocaml-modules/comparelib/default.nix @@ -14,7 +14,7 @@ buildOcaml rec { propagatedBuildInputs = [ type_conv ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/comparelib; + homepage = "https://github.com/janestreet/comparelib"; description = "Syntax extension for deriving \"compare\" functions automatically"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/config-file/default.nix b/pkgs/development/ocaml-modules/config-file/default.nix index 4ca9d4a30e0d2..724c5b1e2d6ac 100644 --- a/pkgs/development/ocaml-modules/config-file/default.nix +++ b/pkgs/development/ocaml-modules/config-file/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ocaml-config-file-1.2"; src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1387/config-file-1.2.tar.gz; + url = "https://forge.ocamlcore.org/frs/download.php/1387/config-file-1.2.tar.gz"; sha256 = "1b02yxcnsjhr05ssh2br2ka4hxsjpdw34ldl3nk33wfnkwk7g67q"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://config-file.forge.ocamlcore.org/; + homepage = "http://config-file.forge.ocamlcore.org/"; platforms = ocaml.meta.platforms or []; description = "An OCaml library used to manage the configuration file(s) of an application"; license = stdenv.lib.licenses.lgpl2Plus; diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index b12b6e8c26579..16bad5a5ec405 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { doCheck = true; meta = { - homepage = https://github.com/c-cube/ocaml-containers; + homepage = "https://github.com/c-cube/ocaml-containers"; description = "A modular standard library focused on data structures"; longDescription = '' Containers is a standard library (BSD license) focused on data structures, diff --git a/pkgs/development/ocaml-modules/core/default.nix b/pkgs/development/ocaml-modules/core/default.nix index 4da4d16df7dd2..a808975d250ee 100644 --- a/pkgs/development/ocaml-modules/core/default.nix +++ b/pkgs/development/ocaml-modules/core/default.nix @@ -22,7 +22,7 @@ buildOcaml rec { pipebang sexplib_p4 typerep_p4 variantslib_p4 ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/core; + homepage = "https://github.com/janestreet/core"; description = "Jane Street Capital's standard library overlay"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/core_extended/default.nix b/pkgs/development/ocaml-modules/core_extended/default.nix deleted file mode 100644 index fe4fc5d87ab71..0000000000000 --- a/pkgs/development/ocaml-modules/core_extended/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, buildOcaml, fetchurl, bin_prot_p4, comparelib, core_p4, custom_printf, - fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils_p4, re2_p4, sexplib_p4}: - -buildOcaml rec { - name = "core_extended"; - version = "112.24.00"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/core_extended/archive/${version}.tar.gz"; - sha256 = "f87b0661b6c2cfb545ec61d1cb2ab1b9c4967b6ac14e651de41d3a6fb7f0f1e3"; - }; - - preConfigure = stdenv.lib.optionalString stdenv.isLinux '' - patch lib/extended_unix_stubs.c <<EOF - 0a1 - > #define _LINUX_QUOTA_VERSION 2 - EOF - ''; - - hasSharedObjects = true; - buildInputs = [ pa_bench pa_test pa_ounit ]; - propagatedBuildInputs = [bin_prot_p4 comparelib core_p4 custom_printf fieldslib_p4 - pipebang textutils_p4 re2_p4 sexplib_p4 ]; - - meta = with stdenv.lib; { - homepage = https://github.com/janestreet/core_extended; - description = "Jane Street Capital's standard library overlay"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/core_kernel/default.nix b/pkgs/development/ocaml-modules/core_kernel/default.nix index 75b248a6a5e65..f51f60f25f18b 100644 --- a/pkgs/development/ocaml-modules/core_kernel/default.nix +++ b/pkgs/development/ocaml-modules/core_kernel/default.nix @@ -22,7 +22,7 @@ buildOcaml rec { typerep_p4 variantslib_p4 ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/core_kernel; + homepage = "https://github.com/janestreet/core_kernel"; description = "Jane Street Capital's standard library overlay (kernel)"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/pkgs/development/ocaml-modules/cow/default.nix index 2a4d7004faa0c..787854f8e4165 100644 --- a/pkgs/development/ocaml-modules/cow/default.nix +++ b/pkgs/development/ocaml-modules/cow/default.nix @@ -1,30 +1,29 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib -, ocamlbuild, topkg +{ lib, fetchurl, buildDunePackage, alcotest , uri, xmlm, omd, ezjsonm }: -stdenv.mkDerivation rec { - version = "2.2.0"; - pname = "ocaml-cow"; +buildDunePackage rec { + minimumOCamlVersion = "4.02.3"; - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-cow"; - rev = "v${version}"; - sha256 = "0snhabg7rfrrcq2ksr3qghiawd61cw3y4kp6rl7vs87j4cnk3kr2"; + version = "2.4.0"; + pname = "cow"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-cow/releases/download/v${version}/cow-v${version}.tbz"; + sha256 = "1x77lwpskda4zyikwxh500xjn90pgdwz6jm7ca7f36pyav4vl6zx"; }; - buildInputs = [ ocaml ocamlbuild findlib topkg ]; propagatedBuildInputs = [ xmlm uri ezjsonm omd ]; + checkInputs = [ alcotest ]; + doCheck = true; - inherit (topkg) buildPhase installPhase; - - meta = with stdenv.lib; { + meta = with lib; { description = "Caml on the Web"; longDescription = '' - Caml on the Web (COW) is a set of parsers and syntax extensions to let you manipulate HTML, CSS, XML, JSON and Markdown directly from OCaml code. + Writing web-applications requires a lot of skills: HTML, XML, JSON and + Markdown, to name but a few! This library provides OCaml combinators + for these web formats. ''; license = licenses.isc; maintainers = [ maintainers.sternenseemann ]; - inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index 5df15316e320a..3b68acaee7165 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.coherentpdf.com/; + homepage = "https://www.coherentpdf.com/"; platforms = ocaml.meta.platforms or []; description = "PDF Command Line Tools"; license = licenses.unfree; diff --git a/pkgs/development/ocaml-modules/cpuid/default.nix b/pkgs/development/ocaml-modules/cpuid/default.nix index 6c7ecaa4b7a6f..8adca8b956f64 100644 --- a/pkgs/development/ocaml-modules/cpuid/default.nix +++ b/pkgs/development/ocaml-modules/cpuid/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { }; meta = { - homepage = https://github.com/pqwy/cpuid; + homepage = "https://github.com/pqwy/cpuid"; description = "Detect CPU features from OCaml"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index f6d22100873bd..2d9ac2a7b1933 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://projects.camlcity.org/projects/cryptgps.html; + homepage = "http://projects.camlcity.org/projects/cryptgps.html"; description = "Cryptographic functions for OCaml"; longDescription = '' This library implements the symmetric cryptographic algorithms diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 1c7a0ccb0faa4..69f8445e21735 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -6,12 +6,12 @@ let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { version = "1.14"; - url = https://github.com/xavierleroy/cryptokit/archive/release114.tar.gz; + url = "https://github.com/xavierleroy/cryptokit/archive/release114.tar.gz"; sha256 = "0wkh72idkb7dahiwyl94hhbq27cc7x9fnmxkpnbqli6wi8wd7d05"; inherit zarith; } else { version = "1.10"; - url = http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz; + url = "http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz"; sha256 = "1k2f2ixm7jcsgrzn9lz1hm9qqgq71lk9lxy3v3cwsd8xdrj3jrnv"; zarith = null; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation { preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs"; meta = { - homepage = http://pauillac.inria.fr/~xleroy/software.html; + homepage = "http://pauillac.inria.fr/~xleroy/software.html"; description = "A library of cryptographic primitives for OCaml"; platforms = ocaml.meta.platforms or []; maintainers = [ diff --git a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix index 0122ec9ff61da..1cea58abee20c 100644 --- a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix +++ b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { dontStrip = true; meta = with stdenv.lib; { - homepage = https://github.com/mirage/ocaml-cstruct; + homepage = "https://github.com/mirage/ocaml-cstruct"; description = "Map OCaml arrays onto C-like structs"; license = stdenv.lib.licenses.isc; maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix index b5c39533e733d..22fe4ac47cf33 100644 --- a/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -10,6 +10,5 @@ buildDunePackage { minimumOCamlVersion = "4.03"; - buildInputs = [ sexplib ppx_tools_versioned ]; - propagatedBuildInputs = [ cstruct ]; + propagatedBuildInputs = [ cstruct ppx_tools_versioned sexplib ]; } diff --git a/pkgs/development/ocaml-modules/cstruct/sexp.nix b/pkgs/development/ocaml-modules/cstruct/sexp.nix index 9a1ef0dd301f9..d0df442013ff0 100644 --- a/pkgs/development/ocaml-modules/cstruct/sexp.nix +++ b/pkgs/development/ocaml-modules/cstruct/sexp.nix @@ -1,15 +1,15 @@ -{ lib, buildDunePackage, alcotest, cstruct, sexplib }: +{ lib, buildDunePackage, ocaml, alcotest, cstruct, sexplib }: if !lib.versionAtLeast (cstruct.version or "1") "3" then cstruct else -buildDunePackage { +buildDunePackage rec { pname = "cstruct-sexp"; inherit (cstruct) version src meta; - doCheck = true; - buildInputs = [ alcotest ]; + doCheck = lib.versionAtLeast ocaml.version "4.03"; + checkInputs = lib.optional doCheck alcotest; propagatedBuildInputs = [ cstruct sexplib ]; } diff --git a/pkgs/development/ocaml-modules/csv/1.5.nix b/pkgs/development/ocaml-modules/csv/1.5.nix index a7505f6f51cda..9b61526926317 100644 --- a/pkgs/development/ocaml-modules/csv/1.5.nix +++ b/pkgs/development/ocaml-modules/csv/1.5.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A pure OCaml library to read and write CSV files"; - homepage = https://github.com/Chris00/ocaml-csv; + homepage = "https://github.com/Chris00/ocaml-csv"; license = licenses.lgpl21; maintainers = [ maintainers.vbgl ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix index 05a1861280403..2d017b9a916bc 100644 --- a/pkgs/development/ocaml-modules/csv/default.nix +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -13,6 +13,6 @@ buildDunePackage rec { description = "A pure OCaml library to read and write CSV files"; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.vbgl ]; - homepage = https://github.com/Chris00/ocaml-csv; + homepage = "https://github.com/Chris00/ocaml-csv"; }; } diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index 8a16dcec343bf..e541f0741a6ec 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ctypes-${version}"; - version = "0.17.1"; + version = "0.16.0"; src = fetchzip { url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; - sha256 = "16brmdnz7wi2z25qqhd5s5blyq4app6jbv6g9pa4vyg6h0nzbcys"; + sha256 = "0qh2gfx5682wkk2nm1ybspzz9c2xvlnnf6iv08a89kbwa1hvdqrg"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix index 9bcf4fc411ffc..2c989caa3e8d1 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OCaml Bindings to curses/ncurses"; - homepage = https://opam.ocaml.org/packages/curses/curses.1.0.4/; + homepage = "https://opam.ocaml.org/packages/curses/curses.1.0.4/"; license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/custom_printf/default.nix b/pkgs/development/ocaml-modules/custom_printf/default.nix index 16c31fc3861ac..8f8a0a5c8865b 100644 --- a/pkgs/development/ocaml-modules/custom_printf/default.nix +++ b/pkgs/development/ocaml-modules/custom_printf/default.nix @@ -15,7 +15,7 @@ buildOcaml rec { propagatedBuildInputs = [ type_conv sexplib_p4 ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/custom_printf; + homepage = "https://github.com/janestreet/custom_printf"; description = "Syntax extension for printf format strings"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix index f0a98249d6da8..d02104decba3a 100644 --- a/pkgs/development/ocaml-modules/digestif/default.nix +++ b/pkgs/development/ocaml-modules/digestif/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage +{ lib, fetchurl, fetchpatch, buildDunePackage , bigarray-compat, eqaf, stdlib-shims , alcotest }: @@ -12,6 +12,12 @@ buildDunePackage rec { sha256 = "09g4zngqiw97cljv8ds4m063wcxz3y7c7vzaprsbpjzi0ja5jdcy"; }; + # Fix tests with alcotest ≥ 1 + patches = [ (fetchpatch { + url = "https://github.com/mirage/digestif/commit/b65d996c692d75da0a81323253429e07d14b72b6.patch"; + sha256 = "0sf7qglcp19dhs65pwrrc7d9v57icf18jsrhpmvwskx8b4dchfiv"; + })]; + buildInputs = lib.optional doCheck alcotest; propagatedBuildInputs = [ bigarray-compat eqaf stdlib-shims ]; diff --git a/pkgs/development/ocaml-modules/dns/client.nix b/pkgs/development/ocaml-modules/dns/client.nix new file mode 100644 index 0000000000000..0dd0541138c84 --- /dev/null +++ b/pkgs/development/ocaml-modules/dns/client.nix @@ -0,0 +1,16 @@ +{ lib, buildDunePackage, dns, ocaml_lwt, mirage-clock, mirage-time +, mirage-random, mirage-stack, mirage-crypto-rng, mtime, randomconv }: + +buildDunePackage { + pname = "dns-client"; + inherit (dns) src version; + + useDune2 = true; + + propagatedBuildInputs = [ dns mtime ocaml_lwt randomconv mirage-clock mirage-time + mirage-random mirage-stack mirage-crypto-rng ]; + + meta = dns.meta // { + description = "Pure DNS resolver API"; + }; +} diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix new file mode 100644 index 0000000000000..01bbffd40b941 --- /dev/null +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -0,0 +1,28 @@ +{ lib, buildDunePackage, fetchurl, alcotest +, cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, rresult +}: + +buildDunePackage rec { + pname = "dns"; + version = "4.5.0"; + + minimumOCamlVersion = "4.07"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz"; + sha256 = "10jrnnxvp06rvzk285wibyi9hn15qhjnqjy9xsfbwl8yhmzzqnq0"; + }; + + propagatedBuildInputs = [ cstruct domain-name duration gmap ipaddr logs lru metrics ptime rresult ]; + + doCheck = true; + checkInputs = lib.optional doCheck alcotest; + + meta = { + description = "An Domain Name System (DNS) library"; + homepage = "https://github.com/mirage/ocaml-dns"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix index 9239d2543ee3b..f9eef4774f5f2 100644 --- a/pkgs/development/ocaml-modules/dolog/default.nix +++ b/pkgs/development/ocaml-modules/dolog/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { checkTarget = "test"; meta = { - homepage = https://github.com/UnixJunkie/dolog; + homepage = "https://github.com/UnixJunkie/dolog"; description = "Minimalistic lazy logger in OCaml"; platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix index 16a9f96798cd7..b26cbec25edb3 100644 --- a/pkgs/development/ocaml-modules/dtoa/default.nix +++ b/pkgs/development/ocaml-modules/dtoa/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; meta = with stdenv.lib; { - homepage = https://github.com/flowtype/ocaml-dtoa; + homepage = "https://github.com/flowtype/ocaml-dtoa"; description = "Converts OCaml floats into strings (doubles to ascii, \"d to a\"), using the efficient Grisu3 algorithm."; license = licenses.mit; maintainers = [ maintainers.eqyiel ]; diff --git a/pkgs/development/ocaml-modules/dum/default.nix b/pkgs/development/ocaml-modules/dum/default.nix index 5e5199c26905d..844d06e30389a 100644 --- a/pkgs/development/ocaml-modules/dum/default.nix +++ b/pkgs/development/ocaml-modules/dum/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://github.com/mjambon/dum; + homepage = "https://github.com/mjambon/dum"; description = "Inspect the runtime representation of arbitrary OCaml values"; license = licenses.lgpl21Plus; maintainers = [ maintainers.alexfmpe ]; diff --git a/pkgs/development/ocaml-modules/dune-build-info/default.nix b/pkgs/development/ocaml-modules/dune-build-info/default.nix new file mode 100644 index 0000000000000..3c828ebdcdb94 --- /dev/null +++ b/pkgs/development/ocaml-modules/dune-build-info/default.nix @@ -0,0 +1,17 @@ +{ lib, buildDunePackage, dune_2 }: + +buildDunePackage rec { + pname = "dune-build-info"; + inherit (dune_2) src version; + + useDune2 = true; + + dontAddPrefix = true; + + meta = with lib; { + inherit (dune_2.meta) homepage; + description = "Embed build information inside executables"; + maintainers = [ maintainers.bcdarwin ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/ocaml-modules/dune-private-libs/default.nix b/pkgs/development/ocaml-modules/dune-private-libs/default.nix index 14059070c9a00..6161bd1fe8e81 100644 --- a/pkgs/development/ocaml-modules/dune-private-libs/default.nix +++ b/pkgs/development/ocaml-modules/dune-private-libs/default.nix @@ -7,6 +7,8 @@ buildDunePackage rec { inherit (dune_2) src version; + minimumOCamlVersion = "4.07"; + dontAddPrefix = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/duration/default.nix b/pkgs/development/ocaml-modules/duration/default.nix new file mode 100644 index 0000000000000..7b3c1c65fc80b --- /dev/null +++ b/pkgs/development/ocaml-modules/duration/default.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage, fetchurl, alcotest }: + +buildDunePackage rec { + pname = "duration"; + version = "0.1.3"; + + src = fetchurl { + url = "https://github.com/hannesm/duration/releases/download/${version}/duration-${version}.tbz"; + sha256 = "0m9r0ayhpl98g9vdxrbjdcllns274jilic5v8xj1x7dphw21p95h"; + }; + + doCheck = true; + checkInputs = lib.optional doCheck alcotest; + + meta = { + homepage = "https://github.com/hannesm/duration"; + description = "Conversions to various time units"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix index 62e635925664c..ead672fa15ca5 100644 --- a/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { makeFlags = [ "BINDIR=$(out)/bin" "MANDIR=$(out)/usr/share/man/man1" "DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; meta = { - homepage = http://dypgen.free.fr; + homepage = "http://dypgen.free.fr"; description = "Dypgen GLR self extensible parser generator"; license = stdenv.lib.licenses.cecill-b; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 7ffb7a8880b8d..4ce502af19f12 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -14,11 +14,11 @@ else stdenv.mkDerivation rec { pname = "eliom"; - version = "6.10.1"; + version = "6.12.0"; src = fetchzip { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "006722wcmhsfhyzv3qbgrrn53fbv9v4i31z52a0pznb6cll45nkm"; + sha256 = "015jh72v6ch9h9czd8sn5kjz3pv6lsnvvnhdjgrplwj443dn1xp8"; }; buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline @@ -39,7 +39,7 @@ stdenv.mkDerivation rec setupHook = [ ./setup-hook.sh ]; meta = { - homepage = http://ocsigen.org/eliom/; + homepage = "http://ocsigen.org/eliom/"; description = "OCaml Framework for programming Web sites and client/server Web applications"; longDescription =''Eliom is a framework for programming Web sites diff --git a/pkgs/development/ocaml-modules/enumerate/default.nix b/pkgs/development/ocaml-modules/enumerate/default.nix index 4f0c182726de9..22a6d12792c72 100644 --- a/pkgs/development/ocaml-modules/enumerate/default.nix +++ b/pkgs/development/ocaml-modules/enumerate/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "ocaml-enumerate-111.08.00"; src = fetchurl { - url = https://ocaml.janestreet.com/ocaml-core/111.08.00/individual/enumerate-111.08.00.tar.gz; + url = "https://ocaml.janestreet.com/ocaml-core/111.08.00/individual/enumerate-111.08.00.tar.gz"; sha256 = "0b6mx5p01lcpimvak4wx6aj2119707wsfzd83rwgb91bhpgzh156"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://ocaml.janestreet.com/; + homepage = "https://ocaml.janestreet.com/"; description = "Quotation expanders for enumerating finite types"; license = stdenv.lib.licenses.asl20; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/eqaf/default.nix b/pkgs/development/ocaml-modules/eqaf/default.nix index 966fe30197d07..d86dc01dcb713 100644 --- a/pkgs/development/ocaml-modules/eqaf/default.nix +++ b/pkgs/development/ocaml-modules/eqaf/default.nix @@ -1,15 +1,17 @@ -{ lib, fetchurl, buildDunePackage }: +{ lib, fetchurl, buildDunePackage, cstruct, bigarray-compat }: buildDunePackage rec { minimumOCamlVersion = "4.03"; pname = "eqaf"; - version = "0.5"; + version = "0.7"; src = fetchurl { url = "https://github.com/mirage/eqaf/releases/download/v${version}/eqaf-v${version}.tbz"; - sha256 = "1wkkmw8q2ml7ifpg0g06y0sclq0zvjf6dpsi36dnci7f230q3vsq"; + sha256 = "1q09pwhs121vpficl2af1yzs4y7dd9bc1lcxbqyfc4x4m6p6drhh"; }; + propagatedBuildInputs = [ cstruct bigarray-compat ]; + meta = { description = "Constant time equal function to avoid timing attacks in OCaml"; homepage = "https://github.com/mirage/eqaf"; diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix index 35b5c73b578bf..ebfcbc90a5042 100644 --- a/pkgs/development/ocaml-modules/erm_xml/default.nix +++ b/pkgs/development/ocaml-modules/erm_xml/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://github.com/hannesm/xml; + homepage = "https://github.com/hannesm/xml"; description = "XML Parser for discrete data"; platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix index a6bb75e61c240..c3534d146f8aa 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, ocaml, findlib, camlp4, ocamlbuild -, erm_xml, nocrypto +, erm_xml, mirage-crypto, mirage-crypto-rng, base64 }: stdenv.mkDerivation rec { - version = "0.3+20180112"; + version = "0.3+20200317"; name = "ocaml${ocaml.version}-erm_xmpp-${version}"; src = fetchFromGitHub { owner = "hannesm"; repo = "xmpp"; - rev = "184dc70fab7d46d09b9148ca4448f07f1e0a2df2"; - sha256 = "1dsqsfacvd9xqsqjzh6xwbnf2mv1dvhy210riyvjd260q085ch6n"; + rev = "7fa5bea252671fd88625c6af109998b879ca564f"; + sha256 = "0spzyd9kbyizzwl8y3mq8z19zlkzxnkh2fppry4lyc7vaw7bqrwq"; }; buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; - propagatedBuildInputs = [ erm_xml nocrypto ]; + propagatedBuildInputs = [ erm_xml mirage-crypto mirage-crypto-rng base64 ]; configurePhase = "ocaml setup.ml -configure --prefix $out"; buildPhase = "ocaml setup.ml -build"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = { - homepage = https://github.com/hannesm/xmpp; + homepage = "https://github.com/hannesm/xmpp"; description = "OCaml based XMPP implementation (fork)"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; diff --git a/pkgs/development/ocaml-modules/estring/default.nix b/pkgs/development/ocaml-modules/estring/default.nix index 9f04dac343c44..4cd27f272b3c8 100644 --- a/pkgs/development/ocaml-modules/estring/default.nix +++ b/pkgs/development/ocaml-modules/estring/default.nix @@ -14,7 +14,7 @@ buildOcaml rec { }; meta = with stdenv.lib; { - homepage = http://estring.forge.ocamlcore.org/; + homepage = "http://estring.forge.ocamlcore.org/"; description = "Extension for string literals"; license = licenses.bsd3; }; diff --git a/pkgs/development/ocaml-modules/expat/0.9.nix b/pkgs/development/ocaml-modules/expat/0.9.nix index 98ab04beb57cb..886f346012c11 100644 --- a/pkgs/development/ocaml-modules/expat/0.9.nix +++ b/pkgs/development/ocaml-modules/expat/0.9.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { checkTarget = "testall"; meta = { - homepage = http://www.xs4all.nl/~mmzeeman/ocaml/; + homepage = "http://www.xs4all.nl/~mmzeeman/ocaml/"; description = "An ocaml wrapper for the Expat XML parsing library"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index df0bd9133d3ce..546fc904ffce5 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "ocaml${ocaml.version}-extlib-1.7.6"; src = fetchurl { - url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.6.tar.gz; + url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.6.tar.gz"; sha256 = "0wfs20v1yj5apdbj7214wdsr17ayh0qqq7ihidndvc8nmmwfa1dz"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { installPhase = "make ${if minimal then "minimal=1" else ""} install"; meta = { - homepage = https://github.com/ygrek/ocaml-extlib; + homepage = "https://github.com/ygrek/ocaml-extlib"; description = "Enhancements to the OCaml Standard Library modules"; license = stdenv.lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix index fc1936c2b4738..781af8a4c98b1 100644 --- a/pkgs/development/ocaml-modules/ezjsonm/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { meta = { description = "An easy interface on top of the Jsonm library"; - homepage = https://github.com/mirage/ezjsonm; + homepage = "https://github.com/mirage/ezjsonm"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/faillib/default.nix b/pkgs/development/ocaml-modules/faillib/default.nix index 9b80433b6d19f..2a4d03e87aea1 100644 --- a/pkgs/development/ocaml-modules/faillib/default.nix +++ b/pkgs/development/ocaml-modules/faillib/default.nix @@ -20,7 +20,7 @@ buildOcaml rec { checkPhase = "make test"; meta = with stdenv.lib; { - homepage = https://ocaml.janestreet.com/; + homepage = "https://ocaml.janestreet.com/"; description = "Library for dealing with failure in OCaml"; license = licenses.asl20; maintainers = [ maintainers.maurer ]; diff --git a/pkgs/development/ocaml-modules/fiat-p256/default.nix b/pkgs/development/ocaml-modules/fiat-p256/default.nix new file mode 100644 index 0000000000000..ac7e6640eeaba --- /dev/null +++ b/pkgs/development/ocaml-modules/fiat-p256/default.nix @@ -0,0 +1,26 @@ +{ lib, buildDunePackage, fetchurl, alcotest, asn1-combinators, benchmark +, bigarray-compat, cstruct, eqaf, hex, ppx_deriving_yojson, rresult +, stdlib-shims, yojson, dune-configurator }: + +buildDunePackage rec { + pname = "fiat-p256"; + version = "0.2.1"; + + src = fetchurl { + url = "https://github.com/mirage/fiat/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "0086h9qkvnqfm8acrxqbki54z619nj73x7f0d01v5vg2naznx7w9"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ bigarray-compat cstruct eqaf hex ]; + checkInputs = [ alcotest asn1-combinators benchmark + ppx_deriving_yojson rresult stdlib-shims yojson ]; + doCheck = true; + + meta = with lib; { + description = "Primitives for Elliptic Curve Cryptography taken from Fiat"; + homepage = "https://github.com/mirage/fiat"; + license = licenses.mit; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/pkgs/development/ocaml-modules/fieldslib/default.nix index 36c1342e61fa2..90b75faa54c2b 100644 --- a/pkgs/development/ocaml-modules/fieldslib/default.nix +++ b/pkgs/development/ocaml-modules/fieldslib/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "ocaml-fieldslib-109.20.03"; src = fetchurl { - url = https://ocaml.janestreet.com/ocaml-core/109.20.00/individual/fieldslib-109.20.03.tar.gz; + url = "https://ocaml.janestreet.com/ocaml-core/109.20.00/individual/fieldslib-109.20.03.tar.gz"; sha256 = "1dkzk0wf26rhvji80dz1r56dp6x9zqrnp87wldd4pj56jli94vir"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://ocaml.janestreet.com/; + homepage = "https://ocaml.janestreet.com/"; description = "OCaml syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; license = licenses.asl20; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index 8c9aa46d9a00e..031680b1e3377 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ocaml${ocaml.version}-fileutils-0.5.3"; src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1728/ocaml-fileutils-0.5.3.tar.gz; + url = "https://forge.ocamlcore.org/frs/download.php/1728/ocaml-fileutils-0.5.3.tar.gz"; sha256 = "1rc4cqlvdhbs55i85zfbfhz938fsy4fj6kwlkfm3ra7bpwn8bmpd"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { preInstall = "make doc"; meta = { - homepage = https://forge.ocamlcore.org/projects/ocaml-fileutils/; + homepage = "https://forge.ocamlcore.org/projects/ocaml-fileutils/"; platforms = ocaml.meta.platforms or []; description = "Library to provide pure OCaml functions to manipulate real file (POSIX like) and filename"; license = stdenv.lib.licenses.lgpl21Plus; diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/pkgs/development/ocaml-modules/fix/default.nix index 76cb6d0884404..d1a2b93cee160 100644 --- a/pkgs/development/ocaml-modules/fix/default.nix +++ b/pkgs/development/ocaml-modules/fix/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "ocaml-fix-20130611"; src = fetchurl { - url = http://gallium.inria.fr/~fpottier/fix/fix-20130611.tar.gz; + url = "http://gallium.inria.fr/~fpottier/fix/fix-20130611.tar.gz"; sha256 = "1phlqcs1nb93x9cf0w0hnq2ck4dmn71zm4mxf60w96vb9yb9qzp0"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = http://gallium.inria.fr/~fpottier/fix/; + homepage = "http://gallium.inria.fr/~fpottier/fix/"; description = "A simple OCaml module for computing the least solution of a system of monotone equations"; license = licenses.cecill-c; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix index d136ec092c2bc..d9b5afa9d3a3c 100644 --- a/pkgs/development/ocaml-modules/fmt/default.nix +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -1,21 +1,26 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner, result, uchar }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner, seq, stdlib-shims }: -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-fmt-0.8.5"; +if !stdenv.lib.versionAtLeast ocaml.version "4.05" +then throw "fmt is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + version = "0.8.8"; + pname = "ocaml${ocaml.version}-fmt"; src = fetchurl { - url = https://erratique.ch/software/fmt/releases/fmt-0.8.5.tbz; - sha256 = "1zj9azcxcn6skmb69ykgmi9z8c50yskwg03wqgh87lypgjdcz060"; + url = "https://erratique.ch/software/fmt/releases/fmt-${version}.tbz"; + sha256 = "1iy0rwknd302mr15328g805k210xyigxbija6fzqqfzyb43azvk4"; }; nativeBuildInputs = [ ocaml findlib ocamlbuild ]; buildInputs = [ findlib topkg cmdliner ]; - propagatedBuildInputs = [ result uchar ]; + propagatedBuildInputs = [ seq stdlib-shims ]; inherit (topkg) buildPhase installPhase; meta = { - homepage = https://erratique.ch/software/fmt; + homepage = "https://erratique.ch/software/fmt"; license = stdenv.lib.licenses.isc; description = "OCaml Format pretty-printer combinators"; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/fpath/default.nix b/pkgs/development/ocaml-modules/fpath/default.nix index bcd877f2be231..02b125642cc3c 100644 --- a/pkgs/development/ocaml-modules/fpath/default.nix +++ b/pkgs/development/ocaml-modules/fpath/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ocaml${ocaml.version}-fpath-0.7.2"; src = fetchurl { - url = https://erratique.ch/software/fpath/releases/fpath-0.7.2.tbz; + url = "https://erratique.ch/software/fpath/releases/fpath-0.7.2.tbz"; sha256 = "1hr05d8bpqmqcfdavn4rjk9rxr7v2zl84866f5knjifrm60sxqic"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "An OCaml module for handling file system paths with POSIX and Windows conventions"; - homepage = https://erratique.ch/software/fpath; + homepage = "https://erratique.ch/software/fpath"; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/frontc/default.nix b/pkgs/development/ocaml-modules/frontc/default.nix index 979c364e496b6..e68f6a28cb472 100644 --- a/pkgs/development/ocaml-modules/frontc/default.nix +++ b/pkgs/development/ocaml-modules/frontc/default.nix @@ -2,7 +2,7 @@ let meta_file = fetchurl { - url = https://raw.githubusercontent.com/ocaml/opam-repository/3c191ae9356ca7b3b628f2707cfcb863db42480f/packages/FrontC/FrontC.3.4.1/files/META; + url = "https://raw.githubusercontent.com/ocaml/opam-repository/3c191ae9356ca7b3b628f2707cfcb863db42480f/packages/FrontC/FrontC.3.4.1/files/META"; sha256 = "0s2wsinycldk8y5p09xd0hsgbhckhy7bkghzl63bph6mwv64kq2d"; }; in @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; patches = [ (fetchpatch { - url = https://raw.githubusercontent.com/ocaml/opam-repository/3c191ae9356ca7b3b628f2707cfcb863db42480f/packages/FrontC/FrontC.3.4.1/files/opam.patch; + url = "https://raw.githubusercontent.com/ocaml/opam-repository/3c191ae9356ca7b3b628f2707cfcb863db42480f/packages/FrontC/FrontC.3.4.1/files/opam.patch"; sha256 = "0v4f6740jbj1kxg1y03dzfa3x3gsrhv06wpzdj30gl4ki5fvj4hs"; }) ]; diff --git a/pkgs/development/ocaml-modules/functoria/default.nix b/pkgs/development/ocaml-modules/functoria/default.nix index cc99b726e6e0b..330ab26e8e649 100644 --- a/pkgs/development/ocaml-modules/functoria/default.nix +++ b/pkgs/development/ocaml-modules/functoria/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "functoria"; - version = "3.0.3"; + version = "3.1.0"; minimumOCamlVersion = "4.04"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "08wv2890gz7ci1fa2b3z4cvqf98nqb09f89y08kcmnsirlbbzlfh"; + sha256 = "15jdqdj1vfi0x9gjydrrnbwzwbzw34w1iir032jrji820xlblky2"; }; propagatedBuildInputs = [ cmdliner rresult astring fmt ocamlgraph logs bos fpath ptime ]; @@ -20,7 +20,7 @@ buildDunePackage rec { meta = with stdenv.lib; { description = "A DSL to organize functor applications"; - homepage = https://github.com/mirage/functoria; + homepage = "https://github.com/mirage/functoria"; license = licenses.isc; maintainers = [ maintainers.vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/functoria/runtime.nix b/pkgs/development/ocaml-modules/functoria/runtime.nix new file mode 100644 index 0000000000000..806ae82b6ef43 --- /dev/null +++ b/pkgs/development/ocaml-modules/functoria/runtime.nix @@ -0,0 +1,17 @@ +{ lib, buildDunePackage, functoria, cmdliner, fmt, alcotest }: + +buildDunePackage { + pname = "functoria-runtime"; + + inherit (functoria) version src; + + propagatedBuildInputs = [ cmdliner fmt ]; + checkInputs = [ alcotest functoria]; + doCheck = true; + + meta = with lib; { + inherit (functoria.meta) homepage license; + description = "Runtime support library for functoria-generated code"; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix index 18b5fb39776be..934a88254e27f 100644 --- a/pkgs/development/ocaml-modules/functory/default.nix +++ b/pkgs/development/ocaml-modules/functory/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://www.lri.fr/~filliatr/functory/; + homepage = "https://www.lri.fr/~filliatr/functory/"; description = "A distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion"; license = licenses.lgpl21; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index 25f5e35492b2e..b01d4b4a04c24 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: +{ stdenv, fetchFromGitHub, buildDunePackage +, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm +}: buildDunePackage rec { pname = "gapi-ocaml"; - version = "0.3.6"; + version = "0.3.19"; minimumOCamlVersion = "4.02"; @@ -10,14 +12,15 @@ buildDunePackage rec { owner = "astrada"; repo = pname; rev = "v${version}"; - sha256 = "0qgsy51bhkpfgl5rdnjw4bqs5fbh2w4vwrfbl8y3lh1wrqmnwci4"; + sha256 = "04arif1p1vj5yr24cwicj70b7yx17hrgf4pl47vqg8ngcrdh71v9"; }; - propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ]; + propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib ocamlnet yojson ]; + buildInputs = [ xmlm ]; meta = { description = "OCaml client for google services"; - homepage = http://gapi-ocaml.forge.ocamlcore.org; + homepage = "http://gapi-ocaml.forge.ocamlcore.org"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ bennofs ]; }; diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index 626e6321acf8a..9e37d9b9a2d45 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://github.com/c-cube/gen; + homepage = "https://github.com/c-cube/gen"; description = "Simple, efficient iterators for OCaml"; license = stdenv.lib.licenses.bsd3; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index 1d5aabf300464..d47ad8ce8590a 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [gdome2]; meta = { - homepage = http://gmetadom.sourceforge.net/; + homepage = "http://gmetadom.sourceforge.net/"; description = "A collection of librares, each library providing a DOM implementation"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; diff --git a/pkgs/development/ocaml-modules/gtktop/default.nix b/pkgs/development/ocaml-modules/gtktop/default.nix index 07420693005d2..b0e17a28e51e2 100644 --- a/pkgs/development/ocaml-modules/gtktop/default.nix +++ b/pkgs/development/ocaml-modules/gtktop/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://zoggy.github.io/gtktop/; + homepage = "http://zoggy.github.io/gtktop/"; description = "A small OCaml library to ease the creation of graphical toplevels"; license = stdenv.lib.licenses.lgpl3; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/hacl_x25519/default.nix b/pkgs/development/ocaml-modules/hacl_x25519/default.nix new file mode 100644 index 0000000000000..a741f5b668193 --- /dev/null +++ b/pkgs/development/ocaml-modules/hacl_x25519/default.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, fetchurl, benchmark, cstruct +, eqaf, hex, ppx_blob, ppx_deriving_yojson, stdlib-shims, yojson }: + +buildDunePackage rec { + pname = "hacl_x25519"; + version = "0.1.1"; + + src = fetchurl { + url = "https://github.com/mirage/hacl/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "187khbx1myh942c2v5f7wbms2hmhmgn57ik25djhnryln32c0874"; + }; + + propagatedBuildInputs = [ eqaf cstruct ]; + checkInputs = [ benchmark hex ppx_blob ppx_deriving_yojson stdlib-shims yojson ]; + doCheck = true; + + meta = with lib; { + description = "Primitives for Elliptic Curve Cryptography taken from Project Everest"; + homepage = "https://github.com/mirage/hacl"; + license = licenses.mit; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/herelib/default.nix b/pkgs/development/ocaml-modules/herelib/default.nix index c9a40b61437af..a99b6cb711e47 100644 --- a/pkgs/development/ocaml-modules/herelib/default.nix +++ b/pkgs/development/ocaml-modules/herelib/default.nix @@ -12,7 +12,7 @@ buildOcaml rec { }; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/herelib; + homepage = "https://github.com/janestreet/herelib"; description = "Syntax extension for inserting the current location"; license = stdenv.lib.licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix index 11e1b5dc67041..8e9dd2db25008 100644 --- a/pkgs/development/ocaml-modules/hex/default.nix +++ b/pkgs/development/ocaml-modules/hex/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { meta = { description = "Mininal OCaml library providing hexadecimal converters"; - homepage = https://github.com/mirage/ocaml-hex; + homepage = "https://github.com/mirage/ocaml-hex"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix index 93e2b3b842958..ecda6338beed1 100644 --- a/pkgs/development/ocaml-modules/higlo/default.nix +++ b/pkgs/development/ocaml-modules/higlo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OCaml library for syntax highlighting"; - homepage = https://zoggy.github.io/higlo/; + homepage = "https://zoggy.github.io/higlo/"; license = licenses.lgpl3; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ regnat ]; diff --git a/pkgs/development/ocaml-modules/hkdf/default.nix b/pkgs/development/ocaml-modules/hkdf/default.nix new file mode 100644 index 0000000000000..9832a5f4c41bb --- /dev/null +++ b/pkgs/development/ocaml-modules/hkdf/default.nix @@ -0,0 +1,26 @@ +{ lib, buildDunePackage, fetchurl, cstruct, mirage-crypto, alcotest }: + +buildDunePackage rec { + pname = "hkdf"; + version = "1.0.4"; + + minimumOCamlVersion = "4.07"; + + src = fetchurl { + url = "https://github.com/hannesm/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "0nzx6vzbc1hh6vx1ly8df4b16lgps6zjpp9mjycsnnn49bddc9mr"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ cstruct mirage-crypto ]; + checkInputs = [ alcotest ]; + doCheck = true; + + meta = with lib; { + description = "HMAC-based Extract-and-Expand Key Derivation Function (RFC 5869)"; + homepage = "https://github.com/hannesm/ocaml-hkdf"; + license = licenses.mit; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index 4a8b390633612..3936eb13c2fb0 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "ocaml-http-0.1.5"; src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/545/ocaml-http-0.1.5.tar.gz; + url = "https://forge.ocamlcore.org/frs/download.php/545/ocaml-http-0.1.5.tar.gz"; sha256 = "09q12b0j01iymflssxigsqggbsp8dqh9pfvkm76dv860544mygws"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://ocaml-http.forge.ocamlcore.org/; + homepage = "http://ocaml-http.forge.ocamlcore.org/"; platforms = ocaml.meta.platforms or []; description = "Do it yourself (OCaml) HTTP daemon"; license = licenses.lgpl2; diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix index b1141f814a896..d0857f7ef0a18 100644 --- a/pkgs/development/ocaml-modules/index/default.nix +++ b/pkgs/development/ocaml-modules/index/default.nix @@ -1,16 +1,17 @@ -{ lib, fetchurl, buildDunePackage, fmt, logs }: +{ lib, fetchurl, buildDunePackage, fmt, logs, stdlib-shims }: buildDunePackage rec { pname = "index"; - version = "1.0.1"; + version = "1.2.0"; minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; - sha256 = "1006wr3g21s4j2vsd73gphhkrh1fy4swh6gqvlsa9c6q7vz9wbvz"; + sha256 = "0d44s1d2mpxvpg0zh57c928wf1w1wd33l1fw5r62al5zmi710ff6"; }; + buildInputs = [ stdlib-shims ]; propagatedBuildInputs = [ fmt logs ]; meta = { diff --git a/pkgs/development/ocaml-modules/inifiles/default.nix b/pkgs/development/ocaml-modules/inifiles/default.nix index 1860e585b59fd..eeeaab8092fc6 100644 --- a/pkgs/development/ocaml-modules/inifiles/default.nix +++ b/pkgs/development/ocaml-modules/inifiles/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation { name = "ocaml${ocaml.version}-inifiles-1.2"; src = fetchurl { - url = http://archive.ubuntu.com/ubuntu/pool/universe/o/ocaml-inifiles/ocaml-inifiles_1.2.orig.tar.gz; + url = "http://archive.ubuntu.com/ubuntu/pool/universe/o/ocaml-inifiles/ocaml-inifiles_1.2.orig.tar.gz"; sha256 = "0jhzgiypmh6hwsv1zpiq77fi0cvcmwbiy5x0yg7mz6p3dh1dmkns"; }; patches = [ (fetchpatch { - url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocaml-inifiles/ocaml-inifiles.1.2/files/ocaml-inifiles.diff; + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocaml-inifiles/ocaml-inifiles.1.2/files/ocaml-inifiles.diff"; sha256 = "037kk3172s187w8vwsykdxlpklxzc7m7np57sapk499d8adzdgwn"; })]; diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix index 14d6506ad13f7..a949b339c729a 100644 --- a/pkgs/development/ocaml-modules/integers/default.nix +++ b/pkgs/development/ocaml-modules/integers/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { meta = { description = "Various signed and unsigned integer types for OCaml"; license = lib.licenses.mit; - homepage = https://github.com/ocamllabs/ocaml-integers; + homepage = "https://github.com/ocamllabs/ocaml-integers"; maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix index e0f0245696261..06bd01fefac01 100644 --- a/pkgs/development/ocaml-modules/io-page/default.nix +++ b/pkgs/development/ocaml-modules/io-page/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchzip, buildDunePackage, configurator, cstruct }: +{ stdenv, fetchurl, buildDunePackage, configurator, cstruct, bigarray-compat, ounit }: buildDunePackage rec { pname = "io-page"; - version = "2.0.1"; + version = "2.3.0"; - src = fetchzip { - url = "https://github.com/mirage/${pname}/archive/${version}.tar.gz"; - sha256 = "1rw04dwrlx5hah5dkjf7d63iff82j9cifr8ifjis5pdwhgwcff8i"; + minimumOCamlVersion = "4.02.3"; + + src = fetchurl { + url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "1hx27pwf419hrhwaw9cphbnl8akz8yy73hqj49l15g2k7shah1cn"; }; - buildInputs = [ configurator ]; - propagatedBuildInputs = [ cstruct ]; + propagatedBuildInputs = [ cstruct bigarray-compat ]; + checkInputs = [ ounit ]; + doCheck = true; meta = { - homepage = https://github.com/mirage/io-page; + homepage = "https://github.com/mirage/io-page"; license = stdenv.lib.licenses.isc; description = "IO memory page library for Mirage backends"; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/io-page/unix.nix b/pkgs/development/ocaml-modules/io-page/unix.nix new file mode 100644 index 0000000000000..b3f7f878b2769 --- /dev/null +++ b/pkgs/development/ocaml-modules/io-page/unix.nix @@ -0,0 +1,17 @@ +{ lib, buildDunePackage, io-page, cstruct, ounit }: + +buildDunePackage { + pname = "io-page-unix"; + + inherit (io-page) version src minimumOCamlVersion; + + propagatedBuildInputs = [ cstruct io-page ]; + checkInputs = [ ounit ]; + doCheck = true; + + meta = with lib; { + inherit (io-page.meta) homepage license; + description = "Support for efficient handling of I/O memory pages on Unix"; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix b/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix deleted file mode 100644 index cdc273d6ecfdc..0000000000000 --- a/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, buildOcaml, fetchurl, sexplib_p4}: - -buildOcaml rec { - name = "ipaddr"; - version = "2.6.1"; - - src = fetchurl { - url = "https://github.com/mirage/ocaml-ipaddr/archive/${version}.tar.gz"; - sha256 = "7051013d8f58abff433187d70cd7ddd7a6b49a6fbe6cad1893f571f65b8ed3d0"; - }; - - propagatedBuildInputs = [ sexplib_p4 ]; - - configurePhase = '' - ocaml setup.ml -configure --prefix $out - ''; - - buildPhase = '' - make build - ''; - - installPhase = '' - make install - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/mirage/ocaml-ipaddr; - description = "A library for manipulation of IP (and MAC) address representations "; - license = licenses.mit; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index be76e413c36a4..d7009fdf553cd 100644 --- a/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { doCheck = true; meta = with lib; { - homepage = https://github.com/mirage/ocaml-ipaddr; + homepage = "https://github.com/mirage/ocaml-ipaddr"; description = "A library for manipulation of IP (and MAC) address representations "; license = licenses.isc; maintainers = with maintainers; [ alexfmpe ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/irmin/1.4.nix b/pkgs/development/ocaml-modules/irmin/1.4.nix index 878160f4b0aab..c1d170f78eebf 100644 --- a/pkgs/development/ocaml-modules/irmin/1.4.nix +++ b/pkgs/development/ocaml-modules/irmin/1.4.nix @@ -18,7 +18,7 @@ buildDunePackage rec { doCheck = true; meta = with lib; { - homepage = https://github.com/mirage/irmin; + homepage = "https://github.com/mirage/irmin"; description = "Irmin, a distributed database that follows the same design principles as Git"; license = licenses.isc; maintainers = [ maintainers.alexfmpe ]; diff --git a/pkgs/development/ocaml-modules/irmin/default.nix b/pkgs/development/ocaml-modules/irmin/default.nix index 2db57671177f6..cba6775916760 100644 --- a/pkgs/development/ocaml-modules/irmin/default.nix +++ b/pkgs/development/ocaml-modules/irmin/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { pname = "irmin"; - version = "2.0.0"; + version = "2.1.0"; - minimumOCamlVersion = "4.06"; + minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - sha256 = "09qffvgi5yrm3ghiywlbdhjly8xb5x5njnan213q8j033fzmf2dr"; + sha256 = "1ji8r7zbdmhbk8r8w2hskd9z7pnvirzbhincfxndxgdaxbfkff5g"; }; propagatedBuildInputs = [ astring base64 digestif fmt jsonm logs ocaml_lwt ocamlgraph uri ]; diff --git a/pkgs/development/ocaml-modules/irmin/pack.nix b/pkgs/development/ocaml-modules/irmin/pack.nix index 4eacc719cec0b..c374b1a227501 100644 --- a/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/pkgs/development/ocaml-modules/irmin/pack.nix @@ -1,12 +1,13 @@ -{ lib, buildDunePackage, alcotest-lwt, index, irmin, irmin-test }: +{ lib, buildDunePackage, alcotest-lwt, index, irmin, irmin-test, ocaml_lwt }: buildDunePackage rec { + minimumOCamlVersion = "4.02.3"; pname = "irmin-pack"; inherit (irmin) version src; - propagatedBuildInputs = [ index irmin ]; + propagatedBuildInputs = [ index irmin ocaml_lwt ]; checkInputs = lib.optionals doCheck [ alcotest-lwt irmin-test ]; diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix new file mode 100644 index 0000000000000..c28532b49a9ef --- /dev/null +++ b/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -0,0 +1,14 @@ +{ lib, buildDunePackage, ppxlib, ocaml-syntax-shims, irmin }: + +buildDunePackage { + pname = "ppx_irmin"; + + inherit (irmin) version src minimumOCamlVersion; + + buildInputs = [ ocaml-syntax-shims ]; + propagatedBuildInputs = [ ppxlib ]; + + meta = irmin.meta // { + description = "PPX deriver for Irmin generics"; + }; +} diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix index 96f0205aa7929..2a2953673f93a 100644 --- a/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/pkgs/development/ocaml-modules/iso8601/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://ocaml-community.github.io/ISO8601.ml/; + homepage = "https://ocaml-community.github.io/ISO8601.ml/"; description = "ISO 8601 and RFC 3999 date parsing for OCaml"; license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/iter/default.nix b/pkgs/development/ocaml-modules/iter/default.nix index 964a7c6f5a324..45cfa07e436d1 100644 --- a/pkgs/development/ocaml-modules/iter/default.nix +++ b/pkgs/development/ocaml-modules/iter/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { doCheck = lib.versionAtLeast ocaml.version "4.04"; meta = { - homepage = https://github.com/c-cube/sequence; + homepage = "https://github.com/c-cube/sequence"; description = "Simple sequence (iterator) datatype and combinators"; longDescription = '' Simple sequence datatype, intended to transfer a finite number of diff --git a/pkgs/development/ocaml-modules/janestreet/0.13.nix b/pkgs/development/ocaml-modules/janestreet/0.13.nix new file mode 100644 index 0000000000000..4682a744d6f5d --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/0.13.nix @@ -0,0 +1,503 @@ +{ janePackage +, ctypes +, num +, octavius +, ppxlib +, re +, openssl +}: + +rec { + + ocaml-compiler-libs = janePackage { + pname = "ocaml-compiler-libs"; + version = "0.12.1"; + hash = "0hpk54fcsfcjp536fgwr80mjjf88hjk58q7jwnyrhk2ljd8xzgiv"; + meta.description = "OCaml compiler libraries repackaged"; + }; + + sexplib0 = janePackage { + pname = "sexplib0"; + hash = "1b1bk0xs1hqa12qs5y4h1yl3mq6xml4ya2570dyhdn1j0fbw4g3y"; + meta.description = "Library containing the definition of S-expressions and some base converters"; + }; + + base = janePackage { + pname = "base"; + version = "0.13.1"; + hash = "08a5aymcgr5svvm8v0v20msd5cad64m6maakfbhz4172g7kd9jzw"; + meta.description = "Full standard library replacement for OCaml"; + propagatedBuildInputs = [ sexplib0 ]; + }; + + stdio = janePackage { + pname = "stdio"; + hash = "1hkj9vh8n8p3n5pvx7053xis1pfmqd8p7shjyp1n555xzimfxzgh"; + meta.description = "Standard IO library for OCaml"; + propagatedBuildInputs = [ base ]; + }; + + ppx_sexp_conv = janePackage { + pname = "ppx_sexp_conv"; + hash = "0jkhwmkrfq3ss6bv6i3m871alcr4xpngs6ci6bmzv3yfl7s8bwdf"; + meta.description = "[@@deriving] plugin to generate S-expression conversion functions"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_here = janePackage { + pname = "ppx_here"; + hash = "1ahidrrjsyi0al06bhv5h6aqmdk7ryz8dybfhqjsn1zp9q056q35"; + meta.description = "Expands [%here] into its location"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_compare = janePackage { + pname = "ppx_compare"; + hash = "14pnqa47gsvq93z1b8wb5pyq8zw90aaw71j4pwlyid4s86px454j"; + meta.description = "Generation of comparison functions from types"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_cold = janePackage { + pname = "ppx_cold"; + hash = "0wnfwsgbzk4i5aqjlcaqp6lkvrq5345vazryvx2klbbrd4759h9f"; + meta.description = "Expands [@cold] into [@inline never][@specialise never][@local never]"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_assert = janePackage { + pname = "ppx_assert"; + hash = "08dada2xcp3w5mir90z56qrdyd317lygml4qlfssj897534bwiqr"; + meta.description = "Assert-like extension nodes that raise useful errors on failure"; + propagatedBuildInputs = [ ppx_cold ppx_compare ppx_here ppx_sexp_conv ]; + }; + + ppx_inline_test = janePackage { + pname = "ppx_inline_test"; + hash = "135qzbhqy33lmigbq1rakr9i3y59y3pczh4laanqjyss9b9kfs60"; + meta.description = "Syntax extension for writing in-line tests in ocaml code"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_custom_printf = janePackage { + pname = "ppx_custom_printf"; + hash = "0kvfkdk4wg2z8x705bajvl1f8wiyy3aya203wdzc9425h73nqm5p"; + meta.description = "Printf-style format-strings for user-defined string conversion"; + propagatedBuildInputs = [ ppx_sexp_conv ]; + }; + + fieldslib = janePackage { + pname = "fieldslib"; + hash = "0nsl0i9vjk73pr70ksxqa65rd5v84jzdaazryfdy6i4a5sfg7bxa"; + meta.description = "Syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; + propagatedBuildInputs = [ base ]; + }; + + ppx_fields_conv = janePackage { + pname = "ppx_fields_conv"; + hash = "0biw0fgphj522bj9wgjk263i2w92vnpaabzr5zn0grihp4yqy8w4"; + meta.description = "Generation of accessor and iteration functions for ocaml records"; + propagatedBuildInputs = [ fieldslib ppxlib ]; + }; + + variantslib = janePackage { + pname = "variantslib"; + hash = "04nps65v1n0nv9n1c1kj5k9jyqsfsxb6h2w3vf6cibhjr5m7z8xc"; + meta.description = "Part of Jane Street's Core library"; + propagatedBuildInputs = [ base ]; + }; + + ppx_variants_conv = janePackage { + pname = "ppx_variants_conv"; + hash = "1ssinizz11bws06qzjky486cj1zrflij1f7hi16d02j40qmyjz7b"; + meta.description = "Generation of accessor and iteration functions for ocaml variant types"; + propagatedBuildInputs = [ variantslib ppxlib ]; + }; + + ppx_expect = janePackage { + pname = "ppx_expect"; + hash = "1hhcga960wjvhcx5pk7rcywl1p9n2ycvqa294n24m8dhzqia6i47"; + meta.description = "Cram like framework for OCaml"; + propagatedBuildInputs = [ ppx_assert ppx_custom_printf ppx_fields_conv ppx_inline_test ppx_variants_conv re ]; + }; + + ppx_enumerate = janePackage { + pname = "ppx_enumerate"; + hash = "0hsg6f2nra1mb35jdgym5rf7spm642bs6qqifbikm9hg8f7z3ql4"; + meta.description = "Generate a list containing all values of a finite type"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_hash = janePackage { + pname = "ppx_hash"; + hash = "1f7mfyx4wgk67hchi57w3142m61ka3vgy1969cbkwr3akv6ifly2"; + meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions"; + propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ]; + }; + + ppx_js_style = janePackage { + pname = "ppx_js_style"; + hash = "1zlhcn0an5k9xjymk5z5m2vqi8zajy6nvcbl5sdn19pjl3zv645x"; + meta.description = "Code style checker for Jane Street Packages"; + propagatedBuildInputs = [ octavius ppxlib ]; + }; + + ppx_base = janePackage { + pname = "ppx_base"; + hash = "0dkqc85x7bgbb6lgx9rghvj1q4dpdgy9qgjl88ywi4c8l9rgnnkz"; + meta.description = "Base set of ppx rewriters"; + propagatedBuildInputs = [ ppx_cold ppx_enumerate ppx_hash ppx_js_style ]; + }; + + ppx_bench = janePackage { + pname = "ppx_bench"; + hash = "0snmy05d3jgihmppixx3dzamkykijqa2v43vpd7q4z8dpnip620g"; + meta.description = "Syntax extension for writing in-line benchmarks in ocaml code"; + propagatedBuildInputs = [ ppx_inline_test ]; + }; + + ppx_sexp_message = janePackage { + pname = "ppx_sexp_message"; + hash = "03jhx3ajcv22iwxkg1jf1jjvd14gyrwi1yc6c5ryqi5ha0fywfw6"; + meta.description = "A ppx rewriter for easy construction of s-expressions"; + propagatedBuildInputs = [ ppx_here ppx_sexp_conv ]; + }; + + splittable_random = janePackage { + pname = "splittable_random"; + hash = "1kgcd6k31vsd7638g8ip77bp1b7vzgkbvgvij4jm2igl09132r85"; + meta.description = "PRNG that can be split into independent streams"; + propagatedBuildInputs = [ base ppx_assert ppx_bench ppx_sexp_message ]; + }; + + ppx_let = janePackage { + pname = "ppx_let"; + hash = "0qplsvbv10h7kwf6dhhgvi001gfphv1v66s83zjr5zbypyaarg5y"; + meta.description = "Monadic let-bindings"; + propagatedBuildInputs = [ ppxlib ]; + }; + + base_quickcheck = janePackage { + pname = "base_quickcheck"; + hash = "0ik8llm01m2xap4gia0vpsh7yq311hph7a2kf5109ag4988s8p0w"; + meta.description = "Randomized testing framework, designed for compatibility with Base"; + propagatedBuildInputs = [ ppx_base ppx_fields_conv ppx_let splittable_random ]; + }; + + ppx_stable = janePackage { + pname = "ppx_stable"; + hash = "0h7ls1bs0bsd8c4na4aj0nawwhvfy50ybm7sza7yz3qli9jammjk"; + meta.description = "Stable types conversions generator"; + propagatedBuildInputs = [ ppxlib ]; + }; + + bin_prot = janePackage { + pname = "bin_prot"; + hash = "1nnr21rljlfglmhiji27d7c1d6gg5fk4cc5rl3750m98w28mfdjw"; + meta.description = "A binary protocol generator"; + propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ]; + }; + + ppx_bin_prot = janePackage { + pname = "ppx_bin_prot"; + hash = "14nfjgqisdqqg8wg4qzvc859zil82y0qpr8fm4nhq05mgxp37iyc"; + meta.description = "Generation of bin_prot readers and writers from types"; + propagatedBuildInputs = [ bin_prot ppx_here ]; + }; + + ppx_fail = janePackage { + pname = "ppx_fail"; + hash = "165mikjg4a1lahq3n9q9y2h36jbln5g3l2hapx17irvf0l0c3vn5"; + meta.description = "Add location to calls to failwiths"; + propagatedBuildInputs = [ ppx_here ]; + }; + + jst-config = janePackage { + pname = "jst-config"; + hash = "15lj6f83hz555xhjy9aayl3adqwgl1blcjnja693a1ybi3ca8w0y"; + meta.description = "Compile-time configuration for Jane Street libraries"; + buildInputs = [ ppx_assert ]; + }; + + ppx_optcomp = janePackage { + pname = "ppx_optcomp"; + hash = "13db395swqf7v87pgl9qiyj4igmvj57hpl8blx3kkrzj6ddh38a8"; + meta.description = "Optional compilation for OCaml"; + propagatedBuildInputs = [ ppxlib ]; + }; + + jane-street-headers = janePackage { + pname = "jane-street-headers"; + hash = "1qjg2ari0xn40dlbk0h9xkwr37k97ldkxpkv792fbl6wc2jlv3x5"; + meta.description = "Jane Street C header files"; + }; + + time_now = janePackage { + pname = "time_now"; + hash = "1if234kz1ssmv22c0vh1cwhbivab6yy3xvy37ny1q4k5ibjc3v0n"; + meta.description = "Reports the current time"; + buildInputs = [ jst-config ppx_optcomp ]; + propagatedBuildInputs = [ jane-street-headers base ppx_base ]; + }; + + ppx_module_timer = janePackage { + pname = "ppx_module_timer"; + hash = "13kv5fzwf41wsaksj41hnvcpx8pnbmzcainlq6f5shj9671hpnhb"; + meta.description = "Ppx rewriter that records top-level module startup times"; + propagatedBuildInputs = [ time_now ]; + }; + + ppx_optional = janePackage { + pname = "ppx_optional"; + hash = "1nwb9jvmszxddj9wxgv9g02qhr10yymm2q1w1gjfqd97m2m1mx4n"; + meta.description = "Pattern matching on flat options"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_pipebang = janePackage { + pname = "ppx_pipebang"; + hash = "0ybj0flsi95pf13ayzz1lcrqhqvkv1lm2dz6y8w49f12583496mc"; + meta.description = "A ppx rewriter that inlines reverse application operators `|>` and `|!`"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_sexp_value = janePackage { + pname = "ppx_sexp_value"; + hash = "18k5015awv9yjl44cvdmp3pn894cgsxmn5s7picxapm9675xqcg9"; + meta.description = "A ppx rewriter that simplifies building s-expressions from ocaml values"; + propagatedBuildInputs = [ ppx_here ppx_sexp_conv ]; + }; + + typerep = janePackage { + pname = "typerep"; + hash = "116hlifww2cqq1i9vwpl7ziwkc1na7p9icqi9srpdxnvn8ibcsas"; + meta.description = "Typerep is a library for runtime types"; + propagatedBuildInputs = [ base ]; + }; + + ppx_typerep_conv = janePackage { + pname = "ppx_typerep_conv"; + hash = "1jlmga9i79inr412l19n4vvmgafzp1bznqxwhy42x309wblbhxx9"; + meta.description = "Generation of runtime types from type declarations"; + propagatedBuildInputs = [ ppxlib typerep ]; + }; + + ppx_jane = janePackage { + pname = "ppx_jane"; + hash = "1a86rvnry8lvjhsg2k73f5bgz7l2962k5i49yzmzn8w66kj0yz60"; + meta.description = "Standard Jane Street ppx rewriters"; + propagatedBuildInputs = [ base_quickcheck ppx_bench ppx_bin_prot ppx_expect ppx_fail ppx_module_timer ppx_optcomp ppx_optional ppx_pipebang ppx_sexp_value ppx_stable ppx_typerep_conv ]; + }; + + base_bigstring = janePackage { + pname = "base_bigstring"; + hash = "1i3zr8bn71l442vl5rrvjpwphx20frp2vaw1qc05d348j76sxfp7"; + meta.description = "String type based on [Bigarray], for use in I/O and C-bindings"; + propagatedBuildInputs = [ ppx_jane ]; + }; + + parsexp = janePackage { + pname = "parsexp"; + hash = "0fsxy5lpsvfadj8m2337j8iprs294dfikqxjcas7si74nskx6l38"; + meta.description = "S-expression parsing library"; + propagatedBuildInputs = [ base sexplib0 ]; + }; + + sexplib = janePackage { + pname = "sexplib"; + hash = "059ypcyirw00x6dqa33x49930pwxcr3i72qz5pf220js2ai2nzhn"; + meta.description = "Library for serializing OCaml values to and from S-expressions"; + propagatedBuildInputs = [ num parsexp ]; + }; + + core_kernel = janePackage { + version = "0.13.1"; + pname = "core_kernel"; + hash = "1ynyz6jkf23q0cwbn6kv06mgyjd644qxb0qkrydq0cglcaa4kjhp"; + meta.description = "System-independent part of Core"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ base_bigstring sexplib ]; + }; + + spawn = janePackage { + pname = "spawn"; + hash = "1w003k1kw1lmyiqlk58gkxx8rac7dchiqlz6ah7aj7bh49b36ppf"; + meta.description = "Spawning sub-processes"; + buildInputs = [ ppx_expect ]; + }; + + core = janePackage { + pname = "core"; + hash = "1i5z9myl6i7axd8dz4b71gdsz9la6k07ib9njr4bn12yn0y76b1m"; + meta.description = "System-independent part of Core"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ core_kernel spawn ]; + }; + + async_kernel = janePackage { + pname = "async_kernel"; + hash = "1rrbyy3pyh31qwv0jiarhpgdyq2z2gx6axmaplgpxshk4qx6gsld"; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ core_kernel ]; + }; + + protocol_version_header = janePackage { + pname = "protocol_version_header"; + hash = "19wscd81jlj355f9din1sg21m3af456a0id2a37bx38r390wrghc"; + meta.description = "Protocol versioning"; + propagatedBuildInputs = [ core_kernel ]; + }; + + async_rpc_kernel = janePackage { + pname = "async_rpc_kernel"; + hash = "1k3f2psyd1xcf7nkk0q1fq57yyhfqbzyynsz821n7mrnm37simac"; + meta.description = "Platform-independent core of Async RPC library"; + propagatedBuildInputs = [ async_kernel protocol_version_header ]; + }; + + async_unix = janePackage { + pname = "async_unix"; + hash = "0n3jz3qjlphyhkqgnbjbwf2fqxaksws82dx1mk4m4wnw3275gdi5"; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_kernel core ]; + }; + + async_extra = janePackage { + pname = "async_extra"; + hash = "06q1farx7dwi4h490xi1azq7ym57ih2d23sq17g2jfvw889kf4n1"; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_rpc_kernel async_unix ]; + }; + + textutils = janePackage { + pname = "textutils"; + hash = "1wnyqj9dzfgl0kddmdl4n9rkl16hwy432dd2i4ksvk2z5g9kkb0d"; + meta.description = "Text output utilities"; + propagatedBuildInputs = [ core ]; + }; + + async = janePackage { + pname = "async"; + hash = "002j9yxpw0ghi12a84163vaqa3n9h8j35f4i72nbxnilxwvy95sr"; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_rpc_kernel async_unix textutils ]; + }; + + async_find = janePackage { + pname = "async_find"; + hash = "0l8cfhyrx2rb2avdcfx5m70aj6rx2d57qxqvfycad5afqz4xx2n9"; + meta.description = "Directory traversal with Async"; + propagatedBuildInputs = [ async ]; + }; + + re2 = janePackage { + pname = "re2"; + hash = "0hmizznlzilynn5kh6149bbpkfw2l0xi7zi1y1fxfww2ma3wpim0"; + meta.description = "OCaml bindings for RE2, Google's regular expression library"; + propagatedBuildInputs = [ core_kernel ]; + prePatch = '' + substituteInPlace src/re2_c/dune --replace 'CXX=g++' 'CXX=c++' + substituteInPlace src/dune --replace '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2))' '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2) (-x c++))' + ''; + }; + + shell = janePackage { + pname = "shell"; + hash = "190ymhm0z9b7hngbcpg88wwrfxwfcdh339d7rd2xhmrhi4z99r18"; + meta.description = "Yet another implementation of fork&exec and related functionality"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ re2 textutils ]; + }; + + async_shell = janePackage { + pname = "async_shell"; + hash = "0bfxyvdmyv23zfr49pb4c3bgfkjr4s3nb3z07xrw6szia3j1kp4j"; + meta.description = "Shell helpers for Async"; + propagatedBuildInputs = [ async shell ]; + }; + + core_bench = janePackage { + pname = "core_bench"; + hash = "1nk0i3z8rqrljbf4bc7ljp71g0a4361nh85s2ang0lgxri74zacm"; + meta.description = "Benchmarking library"; + propagatedBuildInputs = [ textutils ]; + }; + + core_extended = janePackage { + pname = "core_extended"; + hash = "0zh1wwkg5cxkz633dl9zbbl65aksvzb5mss1q8f7w6i1sv3n0135"; + meta.description = "Extra components that are not as closely vetted or as stable as Core"; + propagatedBuildInputs = [ core ]; + }; + + sexp_pretty = janePackage { + pname = "sexp_pretty"; + hash = "1a59xc9frmvi7n0i32dzs8gpf5ral80xkwv97a13zv5cyg8l6216"; + meta.description = "S-expression pretty-printer"; + propagatedBuildInputs = [ ppx_base re sexplib ]; + }; + + expect_test_helpers_kernel = janePackage { + pname = "expect_test_helpers_kernel"; + hash = "11m0i7mj6b1cmqnwhmsrqdc814s0lk3sip8rh97k75grngazmjvn"; + meta.description = "Helpers for writing expectation tests"; + buildInputs = [ ppx_jane ]; + propagatedBuildInputs = [ core_kernel sexp_pretty ]; + }; + + expect_test_helpers = janePackage { + pname = "expect_test_helpers"; + hash = "0sw9yam8d9hdam8p194q0hgc4i26vvwj5qi2cba1jxfhdzhy8jdd"; + meta.description = "Async helpers for writing expectation tests"; + propagatedBuildInputs = [ async expect_test_helpers_kernel ]; + }; + + patience_diff = janePackage { + pname = "patience_diff"; + hash = "012rlbnw21yq2lsbfk3f7l4m4qq3jdx238146z36v54vnhhs6r2r"; + meta.description = "Diff library using Bram Cohen's patience diff algorithm"; + propagatedBuildInputs = [ core_kernel ]; + }; + + ecaml = janePackage { + pname = "ecaml"; + hash = "0jmmsi1m7d4cl5mnw6v9h4ng29anwxy73a6qfi28lgpzafn452bc"; + meta.description = "Library for writing Emacs plugin in OCaml"; + propagatedBuildInputs = [ async expect_test_helpers_kernel ]; + }; + + ### Packages at version 0.11, with dependencies at version 0.12 + + configurator = janePackage { + pname = "configurator"; + version = "0.11.0"; + hash = "0h686630cscav7pil8c3w0gbh6rj4b41dvbnwmicmlkc746q5bfk"; + propagatedBuildInputs = [ stdio ]; + meta.description = "Helper library for gathering system configuration"; + }; + + ppx_core = janePackage { + pname = "ppx_core"; + version = "0.11.0"; + hash = "11hgm9mxig4cm3c827f6dns9mjv3pf8g6skf10x0gw9xnp1dmzmx"; + propagatedBuildInputs = [ ppxlib ]; + meta.description = "Deprecated (see ppxlib)"; + }; + + ppx_driver = janePackage { + pname = "ppx_driver"; + version = "0.11.0"; + hash = "00kfx6js2kxk57k4v7hiqvwk7h35whgjihnxf75m82rnaf4yzvfi"; + propagatedBuildInputs = [ ppxlib ]; + meta.description = "Deprecated (see ppxlib)"; + }; + + ppx_type_conv = janePackage { + pname = "ppx_type_conv"; + version = "0.11.0"; + hash = "04dbrglqqhkas25cpjz8xhjcbpk141c35qggzw66bn69izczfmaf"; + propagatedBuildInputs = [ ppxlib ]; + meta.description = "Deprecated (see ppxlib)"; + }; + +} diff --git a/pkgs/development/ocaml-modules/janestreet/async-extra.nix b/pkgs/development/ocaml-modules/janestreet/async-extra.nix deleted file mode 100644 index ff923bbd467ef..0000000000000 --- a/pkgs/development/ocaml-modules/janestreet/async-extra.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, buildOcamlJane, async_kernel, async_unix, - bin_prot, core, ppx_custom_printf, fieldslib, herelib, - pipebang, sexplib, async_rpc_kernel}: - -buildOcamlJane { - name = "async_extra"; - hash = "1xdwab19fycr4cdm3dh9vmx42f8lvf9s4f9pjgdydxfrm7yzyrfh"; - propagatedBuildInputs = [ async_kernel async_unix core bin_prot ppx_custom_printf - fieldslib herelib pipebang sexplib async_rpc_kernel ]; - - meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_extra; - description = "Jane Street Capital's asynchronous execution library (extra)"; - license = licenses.asl20; - maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix index 49f38136c4f59..6e8a5cae6354a 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix @@ -8,7 +8,7 @@ buildOcamlJane { propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_kernel; + homepage = "https://github.com/janestreet/async_kernel"; description = "Jane Street Capital's asynchronous execution library (core) "; license = licenses.asl20; maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix index 83a7e13a5d01c..70780ee385fa6 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix @@ -10,7 +10,7 @@ buildOcamlJane { sexplib typerep variantslib ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_rpc_kernel; + homepage = "https://github.com/janestreet/async_rpc_kernel"; description = "Platform-independent core of Async RPC library"; license = licenses.asl20; maintainers = [ maintainers.maurer ]; diff --git a/pkgs/development/ocaml-modules/janestreet/async-unix.nix b/pkgs/development/ocaml-modules/janestreet/async-unix.nix deleted file mode 100644 index 0d0f26134f2ff..0000000000000 --- a/pkgs/development/ocaml-modules/janestreet/async-unix.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, buildOcamlJane, async_kernel, - bin_prot, comparelib, core, fieldslib, herelib, - pipebang, sexplib}: - -buildOcamlJane { - name = "async_unix"; - hash = "03ng7f0s22wwzspakiqj442vs1a7yf834109jcj9r3g1awwfhcy7"; - propagatedBuildInputs = [ async_kernel core bin_prot comparelib - fieldslib herelib pipebang sexplib ]; - - meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_unix; - description = "Jane Street Capital's asynchronous execution library (unix)"; - license = licenses.asl20; - maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/async.nix b/pkgs/development/ocaml-modules/janestreet/async.nix deleted file mode 100644 index fe01e47426da4..0000000000000 --- a/pkgs/development/ocaml-modules/janestreet/async.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, buildOcamlJane, async_kernel, - async_unix, async_extra}: - -buildOcamlJane { - name = "async"; - version = "113.33.03"; - hash = "0wyspkp8k833fh03r3h016nbfn6kjfhvb2bg42cly6agcak59fmr"; - propagatedBuildInputs = [ async_kernel async_unix async_extra ]; - - meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async; - description = "Jane Street Capital's asynchronous execution library"; - license = licenses.asl20; - maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix deleted file mode 100644 index e8f42ef71d1e4..0000000000000 --- a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, buildOcamlJane, async, comparelib, core, ctypes -, openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis -}: - -buildOcamlJane { - name = "async_ssl"; - version = "113.33.07"; - hash = "0bhzpnmlx6dy4fli3i7ipjwqbsdi7fq171jrila5dr3ciy3841xs"; - propagatedBuildInputs = [ ctypes async comparelib core fieldslib - herelib pipebang sexplib openssl ocaml_oasis ]; - meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_ssl; - description = "Async wrappers for ssl"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix index c47fcd2fea6b2..1eb6b6a95f86f 100644 --- a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix +++ b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix @@ -9,7 +9,7 @@ buildOcamlJane { propagatedBuildInputs = [ type_conv ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/bin_prot; + homepage = "https://github.com/janestreet/bin_prot"; description = "Binary protocol generator "; license = licenses.asl20; maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/pkgs/development/ocaml-modules/janestreet/core-extended.nix deleted file mode 100644 index c7c69beedb7bf..0000000000000 --- a/pkgs/development/ocaml-modules/janestreet/core-extended.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, buildOcamlJane, - core, - bin_prot, fieldslib, sexplib, typerep, variantslib, - ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, - re2, textutils}: - -buildOcamlJane { - name = "core_extended"; - hash = "1j4ipcn741j8w3h4gpv5sygjzg6b5g6gc2jcrr4n0jyn5dq8b0p5"; - propagatedBuildInputs = - [ core bin_prot fieldslib sexplib typerep variantslib - ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane - re2 textutils ]; - - patchPhase = stdenv.lib.optionalString stdenv.isLinux '' - patch src/extended_unix_stubs.c <<EOF -0a1 -> #define _LINUX_QUOTA_VERSION 2 -EOF - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/janestreet/core_extended; - description = "Jane Street Capital's standard library overlay"; - license = licenses.asl20; - maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/core.nix b/pkgs/development/ocaml-modules/janestreet/core.nix index f6a7ba5b0db06..ac62bc51b0705 100644 --- a/pkgs/development/ocaml-modules/janestreet/core.nix +++ b/pkgs/development/ocaml-modules/janestreet/core.nix @@ -11,7 +11,7 @@ buildOcamlJane { ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/core; + homepage = "https://github.com/janestreet/core"; description = "Jane Street Capital's standard library overlay"; license = licenses.asl20; maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/janestreet/core_bench.nix b/pkgs/development/ocaml-modules/janestreet/core_bench.nix index b279318dd935e..1956a7f3b7057 100644 --- a/pkgs/development/ocaml-modules/janestreet/core_bench.nix +++ b/pkgs/development/ocaml-modules/janestreet/core_bench.nix @@ -12,7 +12,7 @@ buildOcamlJane { [ core core_extended textutils ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/core_bench; + homepage = "https://github.com/janestreet/core_bench"; description = "Micro-benchmarking library for OCaml"; license = licenses.asl20; maintainers = [ maintainers.pmahoney ]; diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix index 53e92a95c2365..b2f0661e7683a 100644 --- a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix @@ -10,7 +10,7 @@ buildOcamlJane { ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/core_kernel; + homepage = "https://github.com/janestreet/core_kernel"; description = "Jane Street Capital's standard library overlay (kernel)"; license = licenses.asl20; maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix index 8ce1ca6c505a3..39aeb7047177e 100644 --- a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix +++ b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix @@ -11,7 +11,7 @@ buildOcamlJane { propagatedBuildInputs = [ type_conv ]; meta = with stdenv.lib; { - homepage = https://ocaml.janestreet.com/; + homepage = "https://ocaml.janestreet.com/"; description = "OCaml syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; license = licenses.asl20; maintainers = [ maintainers.maurer maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_13.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_13.nix new file mode 100644 index 0000000000000..b92bcead95c3e --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_13.nix @@ -0,0 +1,19 @@ +{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.13.0" }: + +{ pname, version ? defaultVersion, hash, ...}@args: + +buildDunePackage (args // { + inherit version; + + minimumOCamlVersion = "4.08"; + + src = fetchFromGitHub { + owner = "janestreet"; + repo = pname; + rev = "v${version}"; + sha256 = hash; + }; + + meta.license = lib.licenses.mit; + meta.homepage = "https://github.com/janestreet/${pname}"; +}) diff --git a/pkgs/development/ocaml-modules/janestreet/re2.nix b/pkgs/development/ocaml-modules/janestreet/re2.nix deleted file mode 100644 index 9153d336b22a3..0000000000000 --- a/pkgs/development/ocaml-modules/janestreet/re2.nix +++ /dev/null @@ -1,20 +0,0 @@ -{stdenv, buildOcamlJane, - bin_prot, core_kernel, fieldslib, sexplib, typerep, variantslib, - ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, - rsync}: - -buildOcamlJane { - name = "re2"; - hash = "0fw5jscb1i17aw8v4l965zw20kyimhfnmf4w83wqaaxkqy3l6fqw"; - buildInputs = [ rsync ]; - propagatedBuildInputs = - [ bin_prot core_kernel fieldslib sexplib typerep variantslib - ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; - - meta = with stdenv.lib; { - homepage = https://github.com/janestreet/re2; - description = "OCaml bindings for RE2"; - maintainers = [ maintainers.maurer ]; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib.nix b/pkgs/development/ocaml-modules/janestreet/sexplib.nix index f4a86f80b04d5..1bb9d489b1484 100644 --- a/pkgs/development/ocaml-modules/janestreet/sexplib.nix +++ b/pkgs/development/ocaml-modules/janestreet/sexplib.nix @@ -10,7 +10,7 @@ buildOcamlJane { propagatedBuildInputs = [ type_conv ]; meta = with stdenv.lib; { - homepage = https://ocaml.janestreet.com/; + homepage = "https://ocaml.janestreet.com/"; description = "Library for serializing OCaml values to and from S-expressions"; license = licenses.asl20; maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/janestreet/textutils.nix b/pkgs/development/ocaml-modules/janestreet/textutils.nix deleted file mode 100644 index 6b3dba5aac8e5..0000000000000 --- a/pkgs/development/ocaml-modules/janestreet/textutils.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, buildOcamlJane, - bin_prot, core, fieldslib, sexplib, typerep, variantslib, - ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: - -buildOcamlJane { - name = "textutils"; - hash = "0mkjm9b3k7db7zzrq4403v8qbkgqgkjlz120vcbqh6z7d7ql65vb"; - propagatedBuildInputs = - [ bin_prot core fieldslib sexplib typerep variantslib - ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; - - meta = with stdenv.lib; { - homepage = https://github.com/janestreet/textutils; - description = "Text output utilities"; - maintainers = [ maintainers.maurer ]; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/typerep.nix b/pkgs/development/ocaml-modules/janestreet/typerep.nix index 2e8fcde1d0da3..9ed037e52110e 100644 --- a/pkgs/development/ocaml-modules/janestreet/typerep.nix +++ b/pkgs/development/ocaml-modules/janestreet/typerep.nix @@ -11,7 +11,7 @@ buildOcamlJane { propagatedBuildInputs = [ type_conv ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/typerep; + homepage = "https://github.com/janestreet/typerep"; description = "Runtime types for OCaml (beta version)"; license = licenses.asl20; maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/janestreet/variantslib.nix b/pkgs/development/ocaml-modules/janestreet/variantslib.nix index 7b3af8a080e98..02e63291add29 100644 --- a/pkgs/development/ocaml-modules/janestreet/variantslib.nix +++ b/pkgs/development/ocaml-modules/janestreet/variantslib.nix @@ -11,7 +11,7 @@ buildOcamlJane { propagatedBuildInputs = [ type_conv ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/variantslib; + homepage = "https://github.com/janestreet/variantslib"; description = "OCaml variants as first class values"; license = licenses.asl20; maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index 91ccbc9ca9eaf..f7978cf4805e4 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library that parses Java .class files into OCaml data structures"; - homepage = https://javalib-team.github.io/javalib/; + homepage = "https://javalib-team.github.io/javalib/"; license = licenses.lgpl3; maintainers = [ maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/jingoo/default.nix b/pkgs/development/ocaml-modules/jingoo/default.nix index 30aea547cbd14..7e693c4bf02ee 100644 --- a/pkgs/development/ocaml-modules/jingoo/default.nix +++ b/pkgs/development/ocaml-modules/jingoo/default.nix @@ -1,27 +1,27 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, pcre, uutf }: +{ lib, buildDunePackage, fetchFromGitHub +, menhir, ppx_deriving, re, uutf, uucp, ounit2 }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" -then throw "jingoo is not available for OCaml ${ocaml.version}" -else +buildDunePackage rec { + pname = "jingoo"; + version = "1.3.4"; -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-jingoo-${version}"; - version = "1.2.18"; + minimumOCamlVersion = "4.04"; src = fetchFromGitHub { owner = "tategakibunko"; repo = "jingoo"; rev = "v${version}"; - sha256 = "0gciiysrjy5r4yiisc41k4h0p530yawzqnr364xg8fdkk444fgkn"; + sha256 = "0fsmm6wxa3axwbcgwdidik3drg754wyh2vxri2w12d662221m98s"; }; - buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ pcre uutf ]; + buildInputs = [ menhir ]; + propagatedBuildInputs = [ ppx_deriving re uutf uucp ]; + checkInputs = [ ounit2 ]; + doCheck = true; - createFindlibDestdir = true; - meta = with stdenv.lib; { - homepage = https://github.com/tategakibunko/jingoo; + meta = with lib; { + homepage = "https://github.com/tategakibunko/jingoo"; description = "OCaml template engine almost compatible with jinja2"; license = licenses.mit; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index d1f5cabb32d29..e1f09f5a4a243 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "An OCaml non-blocking streaming codec to decode and encode the JSON data format"; - homepage = https://erratique.ch/software/jsonm; + homepage = "https://erratique.ch/software/jsonm"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ vbgl ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/kafka/default.nix b/pkgs/development/ocaml-modules/kafka/default.nix index 4eeb8d975fd82..0176daeaf6c56 100644 --- a/pkgs/development/ocaml-modules/kafka/default.nix +++ b/pkgs/development/ocaml-modules/kafka/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ rdkafka zlib ]; meta = with stdenv.lib; { - homepage = https://github.com/didier-wenzek/ocaml-kafka; + homepage = "https://github.com/didier-wenzek/ocaml-kafka"; description = "OCaml bindings for Kafka"; license = licenses.mit; maintainers = [ maintainers.rixed ]; diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 847322b1a109d..2172135e8d4c7 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html; + homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html"; description = "OpenGL bindings for ocaml"; license = licenses.gpl2; maintainers = with maintainers; [ pSub vbgl ]; diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix b/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix index dae81f1df1662..1dfc4305022c5 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ocaml-lablgtk-extras-1.4"; src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/1282/lablgtkextras-1.4.tar.gz; + url = "http://forge.ocamlcore.org/frs/download.php/1282/lablgtkextras-1.4.tar.gz"; sha256 = "09fqxwdib7r9yxynknc9gv3jw2hnhj5cak7q5jngk6m8rzvmhfcc"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; - homepage = http://gtk-extras.forge.ocamlcore.org/; + homepage = "http://gtk-extras.forge.ocamlcore.org/"; description = "A collection of libraries and modules useful when developing OCaml/LablGtk2 applications"; license = stdenv.lib.licenses.lgpl2Plus; branch = "1.4"; diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix index 9e6013b9083fa..de1c1e6ea9448 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; - homepage = http://gtk-extras.forge.ocamlcore.org/; + homepage = "http://gtk-extras.forge.ocamlcore.org/"; description = "A collection of libraries and modules useful when developing OCaml/LablGtk2 applications"; license = stdenv.lib.licenses.lgpl2Plus; }; diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index e2ebb76397c8f..eae356462b32b 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (rec { stdenv.lib.maintainers.maggesi stdenv.lib.maintainers.roconnor ]; - homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html; + homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html"; description = "LablGTK is is an Objective Caml interface to GTK"; license = stdenv.lib.licenses.lgpl21Plus; }; diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 46b76abd268f8..2b6c3028fd6c3 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }: +{ stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }: let param = let check = stdenv.lib.versionAtLeast ocaml.version; in - if check "4.06" then { - version = "2.18.8"; - url = "https://github.com/garrigue/lablgtk/releases/download/lablgtk2188/lablgtk-2.18.8.tar.gz"; - sha256 = "1qsd9nv96fxddc8zayqiqxw9hcyf29axckqg100fm2brs2prpxci"; + if check "4.06" then rec { + version = "2.18.10"; + src = fetchFromGitHub { + owner = "garrigue"; + repo = "lablgtk"; + rev = version; + sha256 = "0w8cdfcv2wc19sd3qzj3qq77qc6rbnbynsz02gzbl15kgrvgrfxi"; + }; } else if check "3.12" then { version = "2.18.5"; - url = https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz; - sha256 = "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib"; + src = fetchurl { + url = "https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz"; + sha256 = "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib"; + }; } else throw "lablgtk is not available for OCaml ${ocaml.version}"; in stdenv.mkDerivation { pname = "lablgtk"; - inherit (param) version; - - src = fetchurl { - inherit (param) url sha256; - }; + inherit (param) version src; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview ]; @@ -39,7 +41,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ maggesi roconnor vbgl ]; - homepage = http://lablgtk.forge.ocamlcore.org/; + homepage = "http://lablgtk.forge.ocamlcore.org/"; description = "An OCaml interface to GTK"; license = licenses.lgpl21Plus; }; diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index d49208ede6023..641f16f69b027 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -1,14 +1,14 @@ { lib, fetchurl, pkgconfig, buildDunePackage, gtk3, cairo2 }: buildDunePackage rec { - version = "3.0.beta6"; + version = "3.1.0"; pname = "lablgtk3"; minimumOCamlVersion = "4.05"; src = fetchurl { url = "https://github.com/garrigue/lablgtk/releases/download/${version}/lablgtk3-${version}.tbz"; - sha256 = "1jni5cbp54qs7y0dc5zkm28v2brpfwy5miighv7cy0nmmxrsq520"; + sha256 = "1fn04qwgkwc86jndlrnv4vxcmasjsp1mmcgfznahj1ccc7bv47sv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix deleted file mode 100644 index b5bcb0de1ee61..0000000000000 --- a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{stdenv, fetchurl, pkgconfig, ocaml, findlib, gmetadom, gtkmathview, lablgtk }: - -let - pname = "lablgtkmathview"; -in - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "0.7.2"; - - src = fetchurl { - url = "http://helm.cs.unibo.it/mml-widget/sources/${pname}-${version}.tar.gz"; - sha256 = "0rgrpgwrgphw106l1xawxir002b7rmzc23rcxhv8ib6rymp1divx"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib gmetadom gtkmathview lablgtk]; - - createFindlibDestdir = true; - - propagatedBuildInputs = [gtkmathview]; - - prePatch = '' - substituteInPlace Makefile.in --replace "PROPCC = @OCAML_LIB_DIR@" "PROPCC = ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib" - ''; - - buildPhase = '' - mkdir -p .test - make - make opt - ''; - - meta = { - homepage = http://helm.cs.unibo.it/mml-widget/; - description = "OCaml bindings for gtkmathview"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.roconnor ]; - broken = true; - }; -} diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index 0677202fab989..e7b68b9071371 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -7,13 +7,13 @@ then throw "labltk is not available for OCaml ${ocaml.version}" else let param = -if OCamlVersionAtLeast "4.08" then rec { - version = "8.06.7"; - src = fetchzip { - url = "https://github.com/garrigue/labltk/archive/${version}.tar.gz"; - sha256 = "1cqnxjv2dvw9csiz4iqqyx6rck04jgylpglk8f69kgybf7k7xk2h"; - }; -} else + let mkNewParam = { version, sha256 }: { + inherit version; + src = fetchzip { + url = "https://github.com/garrigue/labltk/archive/${version}.tar.gz"; + inherit sha256; + }; + }; in let mkOldParam = { version, key, sha256 }: { src = fetchurl { url = "https://forge.ocamlcore.org/frs/download.php/${key}/labltk-${version}.tar.gz"; @@ -21,7 +21,7 @@ if OCamlVersionAtLeast "4.08" then rec { }; inherit version; }; in - { + rec { "4.04" = mkOldParam { version = "8.06.2"; key = "1628"; @@ -42,6 +42,16 @@ if OCamlVersionAtLeast "4.08" then rec { key = "1764"; sha256 = "0wgx65y1wkgf22ihpqmspqfp95fqbj3pldhp1p3b1mi8rmc37zwj"; }; + _8_06_7 = mkNewParam { + version = "8.06.7"; + sha256 = "1cqnxjv2dvw9csiz4iqqyx6rck04jgylpglk8f69kgybf7k7xk2h"; + }; + "4.08" = _8_06_7; + "4.09" = _8_06_7; + "4.10" = mkNewParam { + version = "8.06.8"; + sha256 = "0lfjc7lscq81ibqb3fcybdzs2r1i2xl7rsgi7linq46a0pcpkinw"; + }; }.${builtins.substring 0 4 ocaml.version}; in diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix index e576fa998c2e0..23b38e469b4ba 100644 --- a/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/pkgs/development/ocaml-modules/lacaml/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchFromGitHub, darwin, ocaml, findlib, dune, base, stdio, liblapack, blas }: +{ stdenv, fetchFromGitHub, darwin, ocaml, findlib, dune, base, stdio, lapack, blas }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.05.0"; +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-lacaml"; @@ -14,14 +15,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ ocaml findlib dune base stdio ]; - propagatedBuildInputs = [ liblapack blas ] ++ + propagatedBuildInputs = [ lapack blas ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; inherit (dune) installPhase; meta = with stdenv.lib; { - homepage = http://mmottl.github.io/lacaml; + homepage = "http://mmottl.github.io/lacaml"; description = "OCaml bindings for BLAS and LAPACK"; license = licenses.lgpl21Plus; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index 89009c6d4bc91..f02ff4d29962b 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -28,7 +28,7 @@ buildDunePackage rec { console applications. ''; - homepage = https://github.com/diml/lambda-term; + homepage = "https://github.com/diml/lambda-term"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.gal_bolle diff --git a/pkgs/development/ocaml-modules/lens/default.nix b/pkgs/development/ocaml-modules/lens/default.nix index 27a753ae81a53..4a9706b4ba83c 100644 --- a/pkgs/development/ocaml-modules/lens/default.nix +++ b/pkgs/development/ocaml-modules/lens/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { buildInputs = [ ppx_deriving ppxfind ]; meta = with lib; { - homepage = https://github.com/pdonadeo/ocaml-lens; + homepage = "https://github.com/pdonadeo/ocaml-lens"; description = "Functional lenses"; license = licenses.bsd3; maintainers = with maintainers; [ diff --git a/pkgs/development/ocaml-modules/linenoise/default.nix b/pkgs/development/ocaml-modules/linenoise/default.nix index b6b9b4163ff94..0ad277f4a07f6 100644 --- a/pkgs/development/ocaml-modules/linenoise/default.nix +++ b/pkgs/development/ocaml-modules/linenoise/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "linenoise"; - version = "1.1.0"; + version = "1.3.0"; minimumOCamlVersion = "4.02"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "fxfactorial"; repo = "ocaml-${pname}"; rev = "v${version}"; - sha256 = "1h6rqfgmhmd7p5z8yhk6zkbrk4yzw1v2fgwas2b7g3hqs6y0xj0q"; + sha256 = "0m9mm1arsawi5w5aqm57z41sy1wfxvhfgbdiw7hzy631i391144g"; }; propagatedBuildInputs = [ result ]; diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index b74501fdd680e..24fde437d5c38 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ llvm ]; patches = [ (fetchpatch { - url = https://raw.githubusercontent.com/ocaml/opam-repository/2bdc193f5a9305ea93bf0f0dfc1fbc327c8b9306/packages/llvm/llvm.7.0.0/files/fix-shared.patch; + url = "https://raw.githubusercontent.com/ocaml/opam-repository/2bdc193f5a9305ea93bf0f0dfc1fbc327c8b9306/packages/llvm/llvm.7.0.0/files/fix-shared.patch"; sha256 = "1p98j3b1vrryfn1xa7i50m6mmm4dyw5ldafq6kyh9sfmdihz4zsx"; })]; diff --git a/pkgs/development/ocaml-modules/lwt/legacy.nix b/pkgs/development/ocaml-modules/lwt/legacy.nix index c540124d1049d..795baa0467e2a 100644 --- a/pkgs/development/ocaml-modules/lwt/legacy.nix +++ b/pkgs/development/ocaml-modules/lwt/legacy.nix @@ -47,7 +47,7 @@ buildOcaml { hasSharedObjects = true; meta = with stdenv.lib; { - homepage = http://ocsigen.org/lwt; + homepage = "http://ocsigen.org/lwt"; description = "Lightweight thread library for Objective Caml"; license = licenses.lgpl21; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/lwt_react/default.nix b/pkgs/development/ocaml-modules/lwt_react/default.nix index 41276668ecc95..4d82db043e8d1 100644 --- a/pkgs/development/ocaml-modules/lwt_react/default.nix +++ b/pkgs/development/ocaml-modules/lwt_react/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.0.1"; name = "ocaml${ocaml.version}-lwt_react-${version}"; src = fetchzip { - url = https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz; + url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz"; sha256 = "1bbz7brvdskf4angzn3q2s2s6qdnx7x8m8syayysh23gwv4c7v31"; }; diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix index 7061fdf5d5b83..1332c541354d4 100644 --- a/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/pkgs/development/ocaml-modules/macaddr/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { doCheck = false; # ipaddr and macaddr tests are together, which requires mutual dependency meta = with lib; { - homepage = https://github.com/mirage/ocaml-ipaddr; + homepage = "https://github.com/mirage/ocaml-ipaddr"; description = "A library for manipulation of MAC address representations"; license = licenses.isc; maintainers = [ maintainers.alexfmpe ]; diff --git a/pkgs/development/ocaml-modules/macaque/default.nix b/pkgs/development/ocaml-modules/macaque/default.nix index 3d015e26275bf..32acccd54f280 100644 --- a/pkgs/development/ocaml-modules/macaque/default.nix +++ b/pkgs/development/ocaml-modules/macaque/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ocaml-macaque-0.7.2"; src = fetchzip { - url = https://github.com/ocsigen/macaque/archive/0.7.2.tar.gz; + url = "https://github.com/ocsigen/macaque/archive/0.7.2.tar.gz"; sha256 = "14i0a8cndzndjmlkyhf31r451q99cnkndgxcj0id4qjqhdl4bmjv"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Macros for Caml Queries"; - homepage = https://github.com/ocsigen/macaque; + homepage = "https://github.com/ocsigen/macaque"; license = licenses.lgpl2; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix index 16e37addd45f7..4f3d21be71ae5 100644 --- a/pkgs/development/ocaml-modules/magic-mime/default.nix +++ b/pkgs/development/ocaml-modules/magic-mime/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://github.com/mirage/ocaml-magic-mime; + homepage = "https://github.com/mirage/ocaml-magic-mime"; description = "Convert file extensions to MIME types"; platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.isc; diff --git a/pkgs/development/ocaml-modules/magick/default.nix b/pkgs/development/ocaml-modules/magick/default.nix index ca6ab458fff24..349cbea560716 100644 --- a/pkgs/development/ocaml-modules/magick/default.nix +++ b/pkgs/development/ocaml-modules/magick/default.nix @@ -7,7 +7,7 @@ else stdenv.mkDerivation { name = "ocaml-magick-0.34"; src = fetchurl { - url = http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/ImageMagick/OCaml-ImageMagick-0.34.tgz; + url = "http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/ImageMagick/OCaml-ImageMagick-0.34.tgz"; sha256 = "0gn9l2qdr8gby2x8c2mb59x1kipb2plr45rbq6ymcxyi0wmzfh3q"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { installTargets = [ "find_install" ]; meta = { - homepage = http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/; + homepage = "http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/"; description = "ImageMagick Binding for OCaml"; license = stdenv.lib.licenses.mit; platforms = imagemagick.meta.platforms; diff --git a/pkgs/development/ocaml-modules/markup/default.nix b/pkgs/development/ocaml-modules/markup/default.nix index 2c5c674425b48..92daea1a4b64d 100644 --- a/pkgs/development/ocaml-modules/markup/default.nix +++ b/pkgs/development/ocaml-modules/markup/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://github.com/aantron/markup.ml/; + homepage = "https://github.com/aantron/markup.ml/"; description = "A pair of best-effort parsers implementing the HTML5 and XML specifications"; license = licenses.bsd2; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index 43c6c8e41fa73..1331c10d426b9 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -1,19 +1,20 @@ { lib, fetchurl, buildDunePackage, opaline, ocaml +, alcotest , astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml-version, ocaml_lwt, pandoc, re }: buildDunePackage rec { pname = "mdx"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://github.com/realworldocaml/mdx/releases/download/1.5.0/mdx-1.5.0.tbz"; - sha256 = "0g45plf4z7d178gp0bx7842fwbd3m19679yfph3s95da6mrfm3xn"; + url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; + sha256 = "18m4ay226dwbgnwp3ia6bfcm033dvp9yby0lbddqn8ak374m2k3b"; }; nativeBuildInputs = [ cppo ]; buildInputs = [ cmdliner ]; propagatedBuildInputs = [ astring fmt logs ocaml-migrate-parsetree ocaml-version re ]; - checkInputs = lib.optionals doCheck [ ocaml_lwt pandoc ]; + checkInputs = [ alcotest ocaml_lwt pandoc ]; doCheck = true; @@ -26,7 +27,7 @@ buildDunePackage rec { ''; meta = { - homepage = https://github.com/realworldocaml/mdx; + homepage = "https://github.com/realworldocaml/mdx"; description = "Executable OCaml code blocks inside markdown files"; license = lib.licenses.isc; maintainers = [ lib.maintainers.romildo ]; diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix index fad11ccedaaac..71561e96cd472 100644 --- a/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/pkgs/development/ocaml-modules/menhir/generic.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://pauillac.inria.fr/~fpottier/menhir/; + homepage = "http://pauillac.inria.fr/~fpottier/menhir/"; description = "A LR(1) parser generator for OCaml"; longDescription = '' Menhir is a LR(1) parser generator for the Objective Caml programming diff --git a/pkgs/development/ocaml-modules/minisat/default.nix b/pkgs/development/ocaml-modules/minisat/default.nix index 79820b16e6ca0..9a02f57cc3851 100644 --- a/pkgs/development/ocaml-modules/minisat/default.nix +++ b/pkgs/development/ocaml-modules/minisat/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { }; meta = { - homepage = https://c-cube.github.io/ocaml-minisat/; + homepage = "https://c-cube.github.io/ocaml-minisat/"; description = "Simple bindings to Minisat-C"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ mgttlinger ]; diff --git a/pkgs/development/ocaml-modules/mirage-clock/default.nix b/pkgs/development/ocaml-modules/mirage-clock/default.nix new file mode 100644 index 0000000000000..c5f0b1fc93c16 --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-clock/default.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, fetchurl }: + +buildDunePackage rec { + pname = "mirage-clock"; + version = "3.0.1"; + + src = fetchurl { + url = "https://github.com/mirage/mirage-clock/releases/download/v${version}/mirage-clock-v${version}.tbz"; + sha256 = "12m2dph69r843clrbcgfjj2gcxmq2kdb7g5d91kfj16g13b0vsa3"; + }; + + meta = { + description = "Libraries and module types for portable clocks"; + homepage = "https://github.com/mirage/mirage-clock"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} + + diff --git a/pkgs/development/ocaml-modules/mirage-clock/unix.nix b/pkgs/development/ocaml-modules/mirage-clock/unix.nix new file mode 100644 index 0000000000000..5918d89221f28 --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-clock/unix.nix @@ -0,0 +1,13 @@ +{ buildDunePackage, mirage-clock }: + +buildDunePackage { + pname = "mirage-clock-unix"; + + inherit (mirage-clock) version src; + + propagatedBuildInputs = [ mirage-clock ]; + + meta = mirage-clock.meta // { + description = "Unix-based implementation for the MirageOS Clock interface"; + }; +} diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix new file mode 100644 index 0000000000000..f78ed2ef77f3e --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, pkg-config }: + +buildDunePackage rec { + minimumOCamlVersion = "4.08"; + + pname = "mirage-crypto"; + version = "0.7.0"; + + src = fetchurl { + url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; + sha256 = "0k7kllv3bh192yj6p9dk2z81r56w7x2kyr46pxygb5gnhqqxcncf"; + }; + + useDune2 = true; + + doCheck = true; + checkInputs = [ ounit ]; + + nativeBuildInputs = [ dune-configurator pkg-config ]; + propagatedBuildInputs = [ cstruct ]; + + meta = with lib; { + homepage = "https://github.com/mirage/mirage-crypto"; + description = "Simple symmetric cryptography for the modern age"; + license = licenses.isc; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix new file mode 100644 index 0000000000000..d6c4d494510da --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix @@ -0,0 +1,19 @@ +{ buildDunePackage, ounit, randomconv, mirage-crypto, mirage-crypto-rng +, cstruct, sexplib, ppx_sexp_conv, zarith, eqaf, rresult, gmp }: + +buildDunePackage { + pname = "mirage-crypto-pk"; + + inherit (mirage-crypto) version src useDune2 minimumOCamlVersion; + + buildInputs = [ gmp ]; + propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng + zarith eqaf rresult sexplib ppx_sexp_conv ]; + + doCheck = true; + checkInputs = [ ounit randomconv ]; + + meta = mirage-crypto.meta // { + description = "Simple public-key cryptography for the modern age"; + }; +} diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix new file mode 100644 index 0000000000000..3a12580f89f2c --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix @@ -0,0 +1,21 @@ +{ buildDunePackage, mirage-crypto, ounit, randomconv, dune-configurator +, cstruct, duration, logs, mtime, ocaml_lwt, mirage-runtime, mirage-time +, mirage-clock, mirage-time-unix, mirage-clock-unix, mirage-unix }: + +buildDunePackage { + pname = "mirage-crypto-rng"; + + inherit (mirage-crypto) version src useDune2 minimumOCamlVersion; + + doCheck = true; + checkInputs = [ ounit randomconv ]; + + nativeBuildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt + mirage-runtime mirage-time mirage-clock mirage-time-unix + mirage-clock-unix mirage-unix ]; + + meta = mirage-crypto.meta // { + description = "A cryptographically secure PRNG"; + }; +} diff --git a/pkgs/development/ocaml-modules/mirage-device/default.nix b/pkgs/development/ocaml-modules/mirage-device/default.nix new file mode 100644 index 0000000000000..d86d133dedb66 --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-device/default.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage, fetchurl, fmt, ocaml_lwt }: + +buildDunePackage rec { + pname = "mirage-device"; + version = "2.0.0"; + + src = fetchurl { + url = "https://github.com/mirage/mirage-device/releases/download/v${version}/mirage-device-v${version}.tbz"; + sha256 = "18alxyi6wlxqvb4lajjlbdfkgcajsmklxi9xqmpcz07j51knqa04"; + }; + + propagatedBuildInputs = [ fmt ocaml_lwt ]; + + meta = { + description = "Abstract devices for MirageOS"; + homepage = "https://github.com/mirage/mirage-device"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} + + diff --git a/pkgs/development/ocaml-modules/mirage-flow/combinators.nix b/pkgs/development/ocaml-modules/mirage-flow/combinators.nix new file mode 100644 index 0000000000000..2ad6e5b0b974c --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-flow/combinators.nix @@ -0,0 +1,13 @@ +{ buildDunePackage, mirage-flow, fmt, ocaml_lwt, logs, cstruct, mirage-clock }: + +buildDunePackage { + pname = "mirage-flow-combinators"; + + inherit (mirage-flow) version src; + + propagatedBuildInputs = [ ocaml_lwt logs cstruct mirage-clock mirage-flow ]; + + meta = mirage-flow.meta // { + description = "Flow implementations and combinators for MirageOS specialized to lwt"; + }; +} diff --git a/pkgs/development/ocaml-modules/mirage-flow/default.nix b/pkgs/development/ocaml-modules/mirage-flow/default.nix new file mode 100644 index 0000000000000..25bb5e0f32d40 --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-flow/default.nix @@ -0,0 +1,24 @@ +{ lib, buildDunePackage, fetchurl, cstruct, fmt, ocaml_lwt }: + +buildDunePackage rec { + pname = "mirage-flow"; + version = "2.0.1"; + + minimumOCamlVersion = "4.05"; + + src = fetchurl { + url = "https://github.com/mirage/mirage-flow/releases/download/v${version}/mirage-flow-v${version}.tbz"; + sha256 = "13v05x34six0z6bc2is8qhvbxk4knxh80ardi5x4rl738vlq3mn9"; + }; + + propagatedBuildInputs = [ cstruct fmt ocaml_lwt ]; + + meta = { + description = "Flow implementations and combinators for MirageOS"; + homepage = "https://github.com/mirage/mirage-flow"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} + + diff --git a/pkgs/development/ocaml-modules/mirage-flow/unix.nix b/pkgs/development/ocaml-modules/mirage-flow/unix.nix new file mode 100644 index 0000000000000..7a20ca87f8f35 --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-flow/unix.nix @@ -0,0 +1,17 @@ +{ buildDunePackage, fmt, logs, mirage-flow, ocaml_lwt, cstruct +, alcotest, mirage-flow-combinators }: + +buildDunePackage { + pname = "mirage-flow-unix"; + + inherit (mirage-flow) version src; + + propagatedBuildInputs = [ fmt logs mirage-flow ocaml_lwt cstruct ]; + + doCheck = true; + checkInputs = [ alcotest mirage-flow-combinators ]; + + meta = mirage-flow.meta // { + description = "Flow implementations and combinators for MirageOS on Unix"; + }; +} diff --git a/pkgs/development/ocaml-modules/mirage-protocols/default.nix b/pkgs/development/ocaml-modules/mirage-protocols/default.nix new file mode 100644 index 0000000000000..47a534c216994 --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-protocols/default.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage, fetchurl, duration, ipaddr, mirage-device, mirage-flow }: + +buildDunePackage rec { + pname = "mirage-protocols"; + version = "4.0.1"; + + src = fetchurl { + url = "https://github.com/mirage/mirage-protocols/releases/download/v${version}/mirage-protocols-v${version}.tbz"; + sha256 = "188m8x6xdw1bllwrpa8f8bqbdqy20kjfk7q8p8jf8j0daf7kl3mi"; + }; + + propagatedBuildInputs = [ duration ipaddr mirage-device mirage-flow ]; + + meta = { + description = "MirageOS signatures for network protocols"; + homepage = "https://github.com/mirage/mirage-protocols"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} + + diff --git a/pkgs/development/ocaml-modules/mirage-random/default.nix b/pkgs/development/ocaml-modules/mirage-random/default.nix new file mode 100644 index 0000000000000..535c9286948e9 --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-random/default.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, fetchurl, cstruct }: + +buildDunePackage rec { + pname = "mirage-random"; + version = "2.0.0"; + + src = fetchurl { + url = "https://github.com/mirage/mirage-random/releases/download/v${version}/mirage-random-v${version}.tbz"; + sha256 = "0qj41d5smkkkbjwsnz71bhhj94d2cwv53rf3j4rhky0pqbkidnv1"; + }; + + propagatedBuildInputs = [ cstruct ]; + + meta = { + description = "Random signatures for MirageOS"; + homepage = "https://github.com/mirage/mirage-random"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/mirage-stack/default.nix b/pkgs/development/ocaml-modules/mirage-stack/default.nix new file mode 100644 index 0000000000000..64168716399d8 --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-stack/default.nix @@ -0,0 +1,21 @@ +{ lib, buildDunePackage, fetchurl, mirage-protocols }: + +buildDunePackage rec { + pname = "mirage-stack"; + version = "2.0.1"; + + src = fetchurl { + url = "https://github.com/mirage/mirage-stack/releases/download/v${version}/mirage-stack-v${version}.tbz"; + sha256 = "1xdy59bxnki1r0jwm3s8fwarhhbxr0lsqqiag5b1j41hciiqp9jq"; + }; + + propagatedBuildInputs = [ mirage-protocols ]; + + meta = { + description = "MirageOS signatures for network stacks"; + homepage = "https://github.com/mirage/mirage-stack"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} + diff --git a/pkgs/development/ocaml-modules/mirage-time/default.nix b/pkgs/development/ocaml-modules/mirage-time/default.nix new file mode 100644 index 0000000000000..b98fd3b6279c7 --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-time/default.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage, fetchurl, ocaml_lwt }: + +buildDunePackage rec { + minimumOCamlVersion = "4.06"; + + pname = "mirage-time"; + version = "2.0.1"; + + src = fetchurl { + url = "https://github.com/mirage/mirage-time/releases/download/v${version}/mirage-time-v${version}.tbz"; + sha256 = "1w6mm4g7fc19cs0ncs0s9fsnb1k1s04qqzs9bsqvq8ngsb90cbh0"; + }; + + propagatedBuildInputs = [ ocaml_lwt ]; + + meta = with lib; { + homepage = "https://github.com/mirage/mirage-time"; + description = "Time operations for MirageOS"; + license = licenses.isc; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/mirage-time/unix.nix b/pkgs/development/ocaml-modules/mirage-time/unix.nix new file mode 100644 index 0000000000000..da5326bc0751f --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-time/unix.nix @@ -0,0 +1,13 @@ +{ buildDunePackage, fetchurl, mirage-time, ocaml_lwt, duration }: + +buildDunePackage { + pname = "mirage-time-unix"; + + inherit (mirage-time) src version minimumOCamlVersion; + + propagatedBuildInputs = [ mirage-time ocaml_lwt duration ]; + + meta = mirage-time.meta // { + description = "Time operations for MirageOS on Unix"; + }; +} diff --git a/pkgs/development/ocaml-modules/mirage-unix/default.nix b/pkgs/development/ocaml-modules/mirage-unix/default.nix new file mode 100644 index 0000000000000..696181f7f602b --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-unix/default.nix @@ -0,0 +1,21 @@ +{ lib, buildDunePackage, fetchurl, ocaml_lwt, duration, mirage-runtime, io-page-unix }: + +buildDunePackage rec { + pname = "mirage-unix"; + version = "4.0.0"; + + src = fetchurl { + url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "0kyd83bkpjhn382b4mw3a4325xr8vms78znxqvifpcyfvfnlx7hj"; + }; + + propagatedBuildInputs = [ ocaml_lwt duration mirage-runtime io-page-unix ]; + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/mirage/mirage-unix"; + description = "Unix core platform libraries for MirageOS"; + license = licenses.isc; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix new file mode 100644 index 0000000000000..c7d7cf35e2d8d --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchurl, ipaddr, functoria-runtime +, fmt, logs, ocaml_lwt, alcotest }: + +buildDunePackage rec { + pname = "mirage-runtime"; + version = "3.7.7"; + + minimumOCamlVersion = "4.06"; + + src = fetchurl { + url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-v${version}.tbz"; + sha256 = "1ds5zfwb0g340kbdlsjayyw4n25nj7skdl1mwyvpzmkv4qcsmdiv"; + }; + + propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs ocaml_lwt ]; + checkInputs = [ alcotest ]; + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/mirage/mirage"; + description = "The base MirageOS runtime library, part of every MirageOS unikernel"; + license = licenses.isc; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/mlgmp/default.nix b/pkgs/development/ocaml-modules/mlgmp/default.nix index 20455cc601672..c37c5bd78114d 100644 --- a/pkgs/development/ocaml-modules/mlgmp/default.nix +++ b/pkgs/development/ocaml-modules/mlgmp/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://opam.ocamlpro.com/pkg/mlgmp.20120224.html; + homepage = "http://opam.ocamlpro.com/pkg/mlgmp.20120224.html"; description = "OCaml bindings to GNU MP library"; license = "Free software ?"; }; diff --git a/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/pkgs/development/ocaml-modules/mlgmpidl/default.nix index 674d9ec64120a..66672f8ea1a6e 100644 --- a/pkgs/development/ocaml-modules/mlgmpidl/default.nix +++ b/pkgs/development/ocaml-modules/mlgmpidl/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "OCaml interface to the GMP library"; - homepage = https://www.inrialpes.fr/pop-art/people/bjeannet/mlxxxidl-forge/mlgmpidl/; + homepage = "https://www.inrialpes.fr/pop-art/people/bjeannet/mlxxxidl-forge/mlgmpidl/"; license = stdenv.lib.licenses.lgpl21; inherit (ocaml.meta) platforms; maintainers = [ stdenv.lib.maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/mparser/default.nix b/pkgs/development/ocaml-modules/mparser/default.nix index 0e4d593482bb2..786cc1e27ac8b 100644 --- a/pkgs/development/ocaml-modules/mparser/default.nix +++ b/pkgs/development/ocaml-modules/mparser/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ocaml${ocaml.version}-mparser-1.2.3"; src = fetchzip { - url = https://github.com/cakeplus/mparser/archive/1.2.3.tar.gz; + url = "https://github.com/cakeplus/mparser/archive/1.2.3.tar.gz"; sha256 = "1f8vpagmv0jdm50pxs2xwh2xcmvgaprx4kw871hlml9ahsflxgnw"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "A simple monadic parser combinator OCaml library"; license = stdenv.lib.licenses.lgpl21Plus; - homepage = https://github.com/cakeplus/mparser; + homepage = "https://github.com/cakeplus/mparser"; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index 02d6380715b37..2f8545988d8be 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { description = "Monotonic wall-clock time for OCaml"; - homepage = https://erratique.ch/software/mtime; + homepage = "https://erratique.ch/software/mtime"; inherit (ocaml.meta) platforms; maintainers = [ maintainers.vbgl ]; license = licenses.bsd3; diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 9be5ebf8a7bc9..f9ebb36f40e89 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://ocaml-mysql.forge.ocamlcore.org; + homepage = "http://ocaml-mysql.forge.ocamlcore.org"; description = "Bindings for interacting with MySQL databases from ocaml"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index be4befe9c1cd9..263fdc0bbda55 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { inherit (topkg) installPhase; meta = { - homepage = https://github.com/mirleft/ocaml-nocrypto; + homepage = "https://github.com/mirleft/ocaml-nocrypto"; description = "Simplest possible crypto to support TLS"; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix index f273f28a71eba..420e632b99e5d 100644 --- a/pkgs/development/ocaml-modules/notty/default.nix +++ b/pkgs/development/ocaml-modules/notty/default.nix @@ -4,19 +4,19 @@ with stdenv.lib; -if !versionAtLeast ocaml.version "4.03" +if !versionAtLeast ocaml.version "4.05" then throw "notty is not available for OCaml ${ocaml.version}" else let withLwt = lwt != null; in stdenv.mkDerivation rec { - version = "0.2.1"; + version = "0.2.2"; name = "ocaml${ocaml.version}-notty-${version}"; src = fetchurl { url = "https://github.com/pqwy/notty/releases/download/v${version}/notty-${version}.tbz"; - sha256 = "0wdfmgx1mz77s7m451vy8r9i4iqwn7s7b39kpbpckf3w9417riq0"; + sha256 = "1y3hx8zjri3x50nyiqal5gak1sw54gw3xssrqbj7srinvkdmrz1q"; }; buildInputs = [ ocaml findlib ocamlbuild topkg ocb-stubblr ]; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index da68c811df181..fdb225ba8e8d7 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/cairo" ]; meta = { - homepage = http://cairographics.org/cairo-ocaml; + homepage = "http://cairographics.org/cairo-ocaml"; description = "ocaml bindings for cairo library"; license = stdenv.lib.licenses.gpl2; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index 6a9e4e1d8c5c9..026aeb220e56a 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OCaml bindings for libvirt"; - homepage = https://libvirt.org/ocaml/; + homepage = "https://libvirt.org/ocaml/"; license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix index f633d17252cd0..bcd0a519899cf 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "ocaml-migrate-parsetree"; - version = "1.5.0"; + version = "1.7.3"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = "v${version}"; - sha256 = "0ms7nx7x16nkbm9rln3sycbzg6ad8swz8jw6bjndrill8bg3fipv"; + sha256 = "0336vz0galjnsazbmkxjwdv1qvdqsx2rgrvp778xgq2fzasz45cx"; }; propagatedBuildInputs = [ ppx_derivers result ]; diff --git a/pkgs/development/ocaml-modules/ocaml-result/default.nix b/pkgs/development/ocaml-modules/ocaml-result/default.nix index f6dee5ce3ce80..df442009922ad 100644 --- a/pkgs/development/ocaml-modules/ocaml-result/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-result/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://github.com/janestreet/result; + homepage = "https://github.com/janestreet/result"; description = "Compatibility Result module"; longDescription = '' Projects that want to use the new result type defined in OCaml >= 4.03 diff --git a/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix b/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix index 12f1440118afe..c7779b098e73d 100644 --- a/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix @@ -16,7 +16,7 @@ buildOasisPackage rec { propagatedBuildInputs = [ minisat ]; meta = { - homepage = https://github.com/tcsprojects/ocaml-sat-solvers; + homepage = "https://github.com/tcsprojects/ocaml-sat-solvers"; description = "SAT Solvers For OCaml"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ mgttlinger ]; diff --git a/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix b/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix new file mode 100644 index 0000000000000..706dc913e1e65 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildDunePackage, fetchurl }: + +buildDunePackage rec { + minimumOCamlVersion = "4.02.3"; + + pname = "ocaml-syntax-shims"; + version = "1.0.0"; + + src = fetchurl { + url = "https://github.com/ocaml-ppx/${pname}/releases/download/${version}/${pname}-${version}.tbz"; + sha256 = "1j7848khli4p7j8i2kmnvhdnhcwhy3zgdpf5ds5ic30ax69y3cl9"; + }; + + useDune2 = true; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/ocaml-ppx/ocaml-syntax-shims"; + description = "Backport new syntax to older OCaml versions"; + license = licenses.mit; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix index e210ffa11523e..1dc98c9fdd243 100644 --- a/pkgs/development/ocaml-modules/ocaml-text/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { - homepage = http://ocaml-text.forge.ocamlcore.org/; + homepage = "http://ocaml-text.forge.ocamlcore.org/"; description = "A library for convenient text manipulation"; license = stdenv.lib.licenses.bsd3; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index 27442075064c2..dabe7ae52a3e0 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -1,25 +1,20 @@ -{ stdenv, fetchFromGitHub, ocaml, camlidl, fuse, findlib }: +{ stdenv, buildDunePackage, fetchFromGitHub, camlidl, fuse }: -stdenv.mkDerivation rec { +buildDunePackage { pname = "ocamlfuse"; - version = "2.7.1_cvs5"; + version = "2.7.1_cvs6_e35e76b"; src = fetchFromGitHub { owner = "astrada"; repo = "ocamlfuse"; - rev = "v${version}"; - sha256 = "01ayw2hzpxan95kncbxh9isj9g149cs8scq3xim1vy8bz085wb0m"; + rev = "e35e76bee3b06806256b5bfca108b7697267cd5c"; + sha256 = "1v9g0wh7rnjkrjrnw50145g6ry38plyjs8fq8w0nlzwizhf3qhff"; }; - buildInputs = [ocaml findlib]; - propagatedBuildInputs = [camlidl fuse]; - configurePhase = '' ocaml setup.ml -configure --prefix $out ''; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; - createFindlibDestdir = true; + propagatedBuildInputs = [ camlidl fuse ]; meta = { - homepage = https://sourceforge.net/projects/ocamlfuse; + homepage = "https://sourceforge.net/projects/ocamlfuse"; description = "OCaml bindings for FUSE"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index a39e72d3880f2..d2a94112eb3a9 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://ocamlgraph.lri.fr/; + homepage = "http://ocamlgraph.lri.fr/"; description = "Graph library for Objective Caml"; license = stdenv.lib.licenses.gpl2Oss; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix index 8063f284728b2..b4ee828fcc422 100644 --- a/pkgs/development/ocaml-modules/ocamlmake/default.nix +++ b/pkgs/development/ocaml-modules/ocamlmake/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { setupHook = ./setup-hook.sh; meta = { - homepage = http://www.ocaml.info/home/ocaml_sources.html; + homepage = "http://www.ocaml.info/home/ocaml_sources.html"; description = "Generic OCaml Makefile for GNU Make"; license = "LGPL"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix index d6281e00fdec3..e98dc62478e0b 100644 --- a/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "OCaml native toplevel"; - homepage = http://benediktmeurer.de/ocamlnat/; + homepage = "http://benediktmeurer.de/ocamlnat/"; license = stdenv.lib.licenses.qpl; longDescription = '' The ocamlnat project provides a new native code OCaml toplevel diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix index 8cfe43a5d322d..693c4d59fef9b 100644 --- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = { - homepage = http://ocamlsdl.sourceforge.net/; + homepage = "http://ocamlsdl.sourceforge.net/"; description = "OCaml bindings for SDL 1.2"; license = stdenv.lib.licenses.lgpl21; }; diff --git a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix index 29fa20d460d66..3f551903efac0 100644 --- a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix +++ b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ocaml${ocaml.version}-ocb-stubblr-0.1.0"; src = fetchzip { - url = https://github.com/pqwy/ocb-stubblr/releases/download/v0.1.0/ocb-stubblr-0.1.0.tbz; + url = "https://github.com/pqwy/ocb-stubblr/releases/download/v0.1.0/ocb-stubblr-0.1.0.tbz"; name = "src.tar.bz"; sha256 = "0hpds1lkq4j8wgslv7hnirgfrjmqi36h5rarpw9mwf24gfp5ays2"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "OCamlbuild plugin for C stubs"; - homepage = https://github.com/pqwy/ocb-stubblr; + homepage = "https://github.com/pqwy/ocb-stubblr"; license = stdenv.lib.licenses.isc; inherit (ocaml.meta) platforms; maintainers = [ stdenv.lib.maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix index e90d13de3b394..7cff7b625b581 100644 --- a/pkgs/development/ocaml-modules/ocf/default.nix +++ b/pkgs/development/ocaml-modules/ocf/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OCaml library to read and write configuration options in JSON syntax"; - homepage = https://zoggy.github.io/ocf/; + homepage = "https://zoggy.github.io/ocf/"; license = licenses.lgpl3; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ regnat ]; diff --git a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix index 6410eb296283b..07b6f72e38dec 100644 --- a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix +++ b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple tool and library to embed files and directories inside OCaml executables"; license = stdenv.lib.licenses.lgpl3Plus; - homepage = https://www.typerex.org/ocp-ocamlres.html; + homepage = "https://www.typerex.org/ocp-ocamlres.html"; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix index 084d70a8e790d..719252dbea894 100644 --- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Optimised functions to read and write int16/32/64"; - homepage = https://github.com/OCamlPro/ocplib-endian; + homepage = "https://github.com/OCamlPro/ocplib-endian"; license = stdenv.lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix index 50c63ef718ad9..2cf4b6ddffb99 100644 --- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "An OCaml library implementing a simplex algorithm, in a functional style, for solving systems of linear inequalities"; - homepage = https://github.com/OCamlPro-Iguernlala/ocplib-simplex; + homepage = "https://github.com/OCamlPro-Iguernlala/ocplib-simplex"; inherit (ocaml.meta) platforms; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index 0263d3284ffac..84bc3ce678b19 100644 --- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://github.com/ocsigen/deriving; + homepage = "https://github.com/ocsigen/deriving"; description = "Extension to OCaml for deriving functions from type declarations"; license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 9b0b8c433c2cc..0d56f2c783fb4 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; meta = { - homepage = http://ocsigen.org/ocsigenserver/; + homepage = "http://ocsigen.org/ocsigenserver/"; description = "A full featured Web server"; longDescription ='' A full featured Web server. It implements most features of the HTTP protocol, and has a very powerful extension mechanism that make very easy to plug your own OCaml modules for generating pages. diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 6d8beb8b07b18..cc6650df1578b 100644 --- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://ocsigen.org/ocsigen-start; + homepage = "http://ocsigen.org/ocsigen-start"; description = "Eliom application skeleton"; longDescription ='' An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc. diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 2ac54eb4e3c13..4dfca784dfa31 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = { - homepage = http://ocsigen.org/ocsigen-toolkit/; + homepage = "http://ocsigen.org/ocsigen-toolkit/"; description = " User interface widgets for Ocsigen applications"; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/pkgs/development/ocaml-modules/octavius/default.nix index 72e22e5722d8e..e0189c90181e4 100644 --- a/pkgs/development/ocaml-modules/octavius/default.nix +++ b/pkgs/development/ocaml-modules/octavius/default.nix @@ -6,7 +6,7 @@ then throw "octavius is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation { name = "ocaml${ocaml.version}-octavius-0.2.0"; src = fetchurl { - url = https://github.com/ocaml-doc/octavius/releases/download/v0.2.0/octavius-0.2.0.tbz; + url = "https://github.com/ocaml-doc/octavius/releases/download/v0.2.0/octavius-0.2.0.tbz"; sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Ocamldoc comment syntax parser"; - homepage = https://github.com/ocaml-doc/octavius; + homepage = "https://github.com/ocaml-doc/octavius"; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index a1e524a864244..4c2e4ee6a301f 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -5,10 +5,10 @@ then throw "ocurl is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocurl-0.9.0"; + name = "ocurl-0.9.1"; src = fetchurl { url = "http://ygrek.org.ua/p/release/ocurl/${name}.tar.gz"; - sha256 = "0v5qzfazaynjv1xy3ds2z5iz0np5mz8g831l91l1mrqz6fr1ah0f"; + sha256 = "0n621cxb9012pj280c7821qqsdhypj8qy9qgrah79dkh6a8h2py6"; }; buildInputs = [ pkgconfig ocaml findlib ncurses ]; diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix index 62644c1e9715c..c9e5308f8af4e 100644 --- a/pkgs/development/ocaml-modules/odn/default.nix +++ b/pkgs/development/ocaml-modules/odn/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "ocaml-data-notation-0.0.11"; src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1310/ocaml-data-notation-0.0.11.tar.gz; + url = "https://forge.ocamlcore.org/frs/download.php/1310/ocaml-data-notation-0.0.11.tar.gz"; sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Store data using OCaml notation"; - homepage = https://forge.ocamlcore.org/projects/odn/; + homepage = "https://forge.ocamlcore.org/projects/odn/"; license = licenses.lgpl21; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ diff --git a/pkgs/development/ocaml-modules/omd/default.nix b/pkgs/development/ocaml-modules/omd/default.nix index 874893d629761..cf4abeb7ea6d3 100644 --- a/pkgs/development/ocaml-modules/omd/default.nix +++ b/pkgs/development/ocaml-modules/omd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Extensible Markdown library and tool in OCaml"; - homepage = https://github.com/ocaml/omd; + homepage = "https://github.com/ocaml/omd"; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix index 5b56613774713..c177ef52e1519 100644 --- a/pkgs/development/ocaml-modules/optcomp/default.nix +++ b/pkgs/development/ocaml-modules/optcomp/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ocaml-optcomp-1.6"; src = fetchurl { - url = https://github.com/diml/optcomp/archive/1.6.tar.gz; + url = "https://github.com/diml/optcomp/archive/1.6.tar.gz"; sha256 = "0hhhb2gisah1h22zlg5iszbgqxdd7x85cwd57bd4mfkx9l7dh8jh"; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/diml/optcomp; + homepage = "https://github.com/diml/optcomp"; description = "Optional compilation for OCaml with cpp-like directives"; license = stdenv.lib.licenses.bsd3; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/opti/default.nix b/pkgs/development/ocaml-modules/opti/default.nix index f6552d57683f1..82e2378869f64 100644 --- a/pkgs/development/ocaml-modules/opti/default.nix +++ b/pkgs/development/ocaml-modules/opti/default.nix @@ -15,6 +15,6 @@ buildDunePackage rec { description = "DSL to generate fast incremental C code from declarative specifications"; license = licenses.bsd3; maintainers = [ maintainers.jmagnusj ]; - homepage = https://github.com/magnusjonsson/opti; + homepage = "https://github.com/magnusjonsson/opti"; }; } diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix index ba192b3c24b20..cec5d2ee0d075 100644 --- a/pkgs/development/ocaml-modules/otr/default.nix +++ b/pkgs/development/ocaml-modules/otr/default.nix @@ -1,23 +1,27 @@ -{ lib, fetchFromGitHub, buildDunePackage -, cstruct, sexplib0, rresult, nocrypto, astring +{ lib, fetchurl, buildDunePackage +, cstruct, sexplib0, rresult, mirage-crypto, mirage-crypto-pk, astring, base64 +, mirage-crypto-rng }: buildDunePackage rec { pname = "otr"; - version = "0.3.6"; + version = "0.3.8"; - src = fetchFromGitHub { - owner = "hannesm"; - repo = "ocaml-otr"; - rev = version; - sha256 = "0iz6p85a0jxng9aq9blqsky173zaqfr6wlc5j48ad55lgwzlbih5"; + src = fetchurl { + url = "https://github.com/hannesm/ocaml-otr/releases/download/v${version}/otr-v${version}.tbz"; + sha256 = "18hn9l8wznqnlh2jf1hpnp36f1cx80ncwiiivsbj34llhgp3893d"; }; - propagatedBuildInputs = [ cstruct sexplib0 rresult nocrypto astring ]; + useDune2 = true; + + propagatedBuildInputs = [ cstruct sexplib0 mirage-crypto mirage-crypto-pk + astring rresult base64 ]; doCheck = true; + checkInputs = [ mirage-crypto-rng ]; + meta = with lib; { - homepage = https://github.com/hannesm/ocaml-otr; + homepage = "https://github.com/hannesm/ocaml-otr"; description = "Off-the-record messaging protocol, purely in OCaml"; license = licenses.bsd2; maintainers = with maintainers; [ sternenseemann ]; diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index 6f4536f2e8bdf..2f4a4f0437a2a 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -1,38 +1,16 @@ -{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild }: +{ stdenv, ocaml, findlib, ounit2 }: stdenv.mkDerivation { - name = "ounit-2.0.0"; + pname = "ocaml${ocaml.version}-ounit"; + inherit (ounit2) version src meta; - src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1258/ounit-2.0.0.tar.gz; - sha256 = "118xsadrx84pif9vaq13hv4yh22w9kmr0ypvhrs0viir1jr0ajjd"; - }; - - patches = with stdenv.lib; - optional (versionAtLeast ocaml.version "4.02") (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ounit/ounit.2.0.0/files/safe-string.patch"; - sha256 = "0hbd2sqdz75lv5ax82yhsfdk1dlcvq12xpys6n85ysmrl0c3d3lk"; - }); - - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; buildInputs = [ findlib ]; - configurePlatforms = []; - - dontAddPrefix = true; + propagatedBuildInputs = [ ounit2 ]; - doCheck = true; - - checkTarget = "test"; + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; createFindlibDestdir = true; - meta = { - homepage = http://ounit.forge.ocamlcore.org/; - description = "Unit test framework for OCaml"; - license = stdenv.lib.licenses.mit; - platforms = ocaml.meta.platforms or []; - maintainers = [ - stdenv.lib.maintainers.maggesi - ]; - }; + installTargets = "install-ounit version='${ounit2.version}'"; + } diff --git a/pkgs/development/ocaml-modules/ounit2/default.nix b/pkgs/development/ocaml-modules/ounit2/default.nix new file mode 100644 index 0000000000000..aea386061937f --- /dev/null +++ b/pkgs/development/ocaml-modules/ounit2/default.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage, fetchurl, stdlib-shims }: + +buildDunePackage rec { + minimumOCamlVersion = "4.02.3"; + + pname = "ounit2"; + version = "2.2.2"; + + src = fetchurl { + url = "https://github.com/gildor478/ounit/releases/download/v${version}/ounit-v${version}.tbz"; + sha256 = "1h4xdcyzwyhxg263w9b16x9n6cb11fzazmwnsnpich4djpl9lhsk"; + }; + + propagatedBuildInputs = [ stdlib-shims ]; + + meta = with lib; { + homepage = "https://github.com/gildor478/ounit"; + description = "A unit test framework for OCaml"; + license = licenses.mit; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix index 7fa912d808db1..7dd1d525a462b 100644 --- a/pkgs/development/ocaml-modules/owl/default.nix +++ b/pkgs/development/ocaml-modules/owl/default.nix @@ -11,6 +11,7 @@ , npy }: + buildDunePackage rec { pname = "owl"; diff --git a/pkgs/development/ocaml-modules/pa_bench/default.nix b/pkgs/development/ocaml-modules/pa_bench/default.nix index 2b821cd6dd6f9..1027d0fc21abd 100644 --- a/pkgs/development/ocaml-modules/pa_bench/default.nix +++ b/pkgs/development/ocaml-modules/pa_bench/default.nix @@ -15,7 +15,7 @@ buildOcaml rec { propagatedBuildInputs = [ type_conv ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/pa_bench; + homepage = "https://github.com/janestreet/pa_bench"; description = "Syntax extension for inline benchmarks"; license = stdenv.lib.licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/pa_ounit/default.nix b/pkgs/development/ocaml-modules/pa_ounit/default.nix index 2471c855cf54e..3bd8baac4b764 100644 --- a/pkgs/development/ocaml-modules/pa_ounit/default.nix +++ b/pkgs/development/ocaml-modules/pa_ounit/default.nix @@ -16,7 +16,7 @@ buildOcaml rec { propagatedBuildInputs = [ ounit ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/pa_ounit; + homepage = "https://github.com/janestreet/pa_ounit"; description = "OCaml inline testing"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/pa_test/default.nix b/pkgs/development/ocaml-modules/pa_test/default.nix index 5acf931b2eac8..6a90561c68265 100644 --- a/pkgs/development/ocaml-modules/pa_test/default.nix +++ b/pkgs/development/ocaml-modules/pa_test/default.nix @@ -15,7 +15,7 @@ buildOcaml rec { propagatedBuildInputs = [ type_conv sexplib_p4 herelib ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/pa_test; + homepage = "https://github.com/janestreet/pa_test"; description = "Syntax to reduce boiler plate in testing"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index 7559fc35d8e2a..94af6fce26027 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { dontConfigure = true; # Skip configure phase meta = with stdenv.lib; { - homepage = https://bitbucket.org/mmottl/pcre-ocaml; + homepage = "https://bitbucket.org/mmottl/pcre-ocaml"; description = "An efficient C-library for pattern matching with Perl-style regular expressions in OCaml"; license = licenses.lgpl21; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/pgsolver/default.nix b/pkgs/development/ocaml-modules/pgsolver/default.nix index 5045cb6a0eeb7..a1d6fe6486ac1 100644 --- a/pkgs/development/ocaml-modules/pgsolver/default.nix +++ b/pkgs/development/ocaml-modules/pgsolver/default.nix @@ -15,7 +15,7 @@ buildOasisPackage rec { propagatedBuildInputs = [ tcslib ocaml-sat-solvers ]; meta = { - homepage = https://github.com/tcsprojects/pgsolver; + homepage = "https://github.com/tcsprojects/pgsolver"; description = "A collection of tools for generating, manipulating and - most of all - solving parity games"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ mgttlinger ]; diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index 916be9b3d3863..1873a4e0c583b 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -3,15 +3,15 @@ buildDunePackage rec { pname = "phylogenetics"; - version = "unstable-2020-01-05"; + version = "unstable-2020-01-25"; useDune2 = true; src = fetchFromGitHub { owner = "biocaml"; repo = pname; - rev = "b55ef7d7322bd822be26d21339945d45487fb547"; - sha256 = "0hzfjhs5w3a7hlzxs739k5ik3k1xn3dzyzziid765s74f638n4hj"; + rev = "752a7d0324709ba919ef43630a270afd45d6b734"; + sha256 = "1zsxpl1yjbw6y6n1q7qk3h0l7c0lxhh8yp8bkxlwnpzlkqq28ycg"; }; minimumOCamlVersion = "4.08"; # e.g., uses Float.min diff --git a/pkgs/development/ocaml-modules/pipebang/default.nix b/pkgs/development/ocaml-modules/pipebang/default.nix index 1ab1c5fa7bc51..f62978c0a9cd3 100644 --- a/pkgs/development/ocaml-modules/pipebang/default.nix +++ b/pkgs/development/ocaml-modules/pipebang/default.nix @@ -12,7 +12,7 @@ buildOcaml rec { }; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/pipebang; + homepage = "https://github.com/janestreet/pipebang"; description = "Syntax extension to transform x |! f into f x"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 83d47fbb3af89..731a5303ff513 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; patches = [ (fetchpatch { - url = https://github.com/alavrik/piqi-ocaml/commit/336e8fdb84e77f4105e9bbb5ab545b8729101308.patch; + url = "https://github.com/alavrik/piqi-ocaml/commit/336e8fdb84e77f4105e9bbb5ab545b8729101308.patch"; sha256 = "071s4xjyr6xx95v6az2lbl2igc87n7z5jqnnbhfq2pidrxakd0la"; })]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = "DESTDIR=$out make install"; meta = with stdenv.lib; { - homepage = http://piqi.org; + homepage = "http://piqi.org"; description = "Universal schema language and a collection of tools built around it. These are the ocaml bindings"; license = licenses.asl20; maintainers = [ maintainers.maurer ]; diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix index fb06820f19611..c492035f4f95e 100644 --- a/pkgs/development/ocaml-modules/piqi/default.nix +++ b/pkgs/development/ocaml-modules/piqi/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://piqi.org; + homepage = "http://piqi.org"; description = "Universal schema language and a collection of tools built around it"; license = licenses.asl20; maintainers = [ maintainers.maurer ]; diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix index d618f90e54158..0e4f9fea7d928 100644 --- a/pkgs/development/ocaml-modules/pprint/default.nix +++ b/pkgs/development/ocaml-modules/pprint/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { installFlags = [ "-C" "src" ]; meta = with stdenv.lib; { - homepage = http://gallium.inria.fr/~fpottier/pprint/; + homepage = "http://gallium.inria.fr/~fpottier/pprint/"; description = "An OCaml adaptation of Wadler’s and Leijen’s prettier printer"; license = licenses.cecill-c; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix index 3b72853e7828f..d7d662e74a5e5 100644 --- a/pkgs/development/ocaml-modules/ppx_blob/default.nix +++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage, alcotest, ocaml-migrate-parsetree }: +{ lib, fetchurl, buildDunePackage, ocaml, alcotest, ocaml-migrate-parsetree }: buildDunePackage rec { pname = "ppx_blob"; @@ -9,11 +9,12 @@ buildDunePackage rec { sha256 = "1xmslk1mwdzhy1bydgsjlcb7h544c39hvxa8lywp8w72gaggjl16"; }; - buildInputs = [ alcotest ocaml-migrate-parsetree ]; - doCheck = true; + checkInputs = lib.optional doCheck alcotest; + buildInputs = [ ocaml-migrate-parsetree ]; + doCheck = lib.versionAtLeast ocaml.version "4.03"; - meta = with stdenv.lib; { - homepage = https://github.com/johnwhitington/ppx_blob; + meta = with lib; { + homepage = "https://github.com/johnwhitington/ppx_blob"; description = "OCaml ppx to include binary data from a file as a string"; license = licenses.unlicense; }; diff --git a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix index b09ff9c7f2232..32865bed63163 100644 --- a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix +++ b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { buildInputs = [ ocaml-migrate-parsetree ]; meta = with stdenv.lib; { - homepage = https://github.com/flowtype/ocaml-ppx_gen_rec; + homepage = "https://github.com/flowtype/ocaml-ppx_gen_rec"; description = "ocaml preprocessor that generates a recursive module"; license = licenses.mit; maintainers = [ maintainers.frontsideair ]; diff --git a/pkgs/development/ocaml-modules/ppxfind/default.nix b/pkgs/development/ocaml-modules/ppxfind/default.nix index 75d1e57765e92..1008dfe62a9a7 100644 --- a/pkgs/development/ocaml-modules/ppxfind/default.nix +++ b/pkgs/development/ocaml-modules/ppxfind/default.nix @@ -2,13 +2,14 @@ buildDunePackage (rec { pname = "ppxfind"; - version = "1.3"; + version = "1.4"; src = fetchurl { url = "https://github.com/diml/ppxfind/releases/download/${version}/ppxfind-${version}.tbz"; - sha256 = "1r4jp0516378js62ss50a9s8ql2pm8lfdd3mnk214hp7s0kb17fl"; + sha256 = "0wa9vcrc26kirc2cqqs6kmarbi8gqy3dgdfiv9y7nzsgy1liqacq"; }; minimumOCamlVersion = "4.03"; + useDune2 = true; buildInputs = [ ocaml-migrate-parsetree ]; diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index bbaf9e27cf4de..8821e56212958 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -1,23 +1,30 @@ -{ stdenv, fetchFromGitHub, buildDunePackage -, version ? "0.8.1" +{ lib, fetchFromGitHub, buildDunePackage, ocaml +, legacy ? false , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio }: -let sha256 = - { "0.8.1" = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6"; - "0.12.0" = "1cg0is23c05k1rc94zcdz452p9zn11dpqxm1pnifwx5iygz3w0a1"; - }."${version}" -; in +let param = + if legacy then { + version = "0.8.1"; + sha256 = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6"; + } else { + version = "0.12.0"; + sha256 = "1cg0is23c05k1rc94zcdz452p9zn11dpqxm1pnifwx5iygz3w0a1"; + }; in + +if lib.versionAtLeast ocaml.version "4.10" && legacy +then throw "ppxlib-${param.version} is not available for OCaml ${ocaml.version}" +else buildDunePackage rec { pname = "ppxlib"; - inherit version; + inherit (param) version; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = version; - inherit sha256; + inherit (param) sha256; }; propagatedBuildInputs = [ @@ -26,8 +33,8 @@ buildDunePackage rec { meta = { description = "Comprehensive ppx tool set"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; }; } diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index de3d940b3bb90..e60a8d5a86d85 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { inherit (topkg) installPhase; meta = { - homepage = https://erratique.ch/software/ptime; + homepage = "https://erratique.ch/software/ptime"; description = "POSIX time for OCaml"; longDescription = '' Ptime has platform independent POSIX time support in pure OCaml. diff --git a/pkgs/development/ocaml-modules/ptmap/default.nix b/pkgs/development/ocaml-modules/ptmap/default.nix index d6637d23052ce..f635fadd6d01d 100644 --- a/pkgs/development/ocaml-modules/ptmap/default.nix +++ b/pkgs/development/ocaml-modules/ptmap/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.lri.fr/~filliatr/software.en.html; + homepage = "https://www.lri.fr/~filliatr/software.en.html"; platforms = ocaml.meta.platforms or []; description = "Maps over integers implemented as Patricia trees"; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix index 46453f30d3bf3..1aa2590f2ae5f 100644 --- a/pkgs/development/ocaml-modules/pycaml/default.nix +++ b/pkgs/development/ocaml-modules/pycaml/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/chemoelectric/pycaml; + homepage = "https://github.com/chemoelectric/pycaml"; description = "Bindings for python and ocaml"; license = "LGPL"; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/qcheck/default.nix b/pkgs/development/ocaml-modules/qcheck/default.nix index dfe7ec84d6368..be625f4d8d72b 100644 --- a/pkgs/development/ocaml-modules/qcheck/default.nix +++ b/pkgs/development/ocaml-modules/qcheck/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "ocaml${ocaml.version}-qcheck-0.7"; src = fetchzip { - url = https://github.com/c-cube/qcheck/archive/0.7.tar.gz; + url = "https://github.com/c-cube/qcheck/archive/0.7.tar.gz"; sha256 = "1afy7li74r3ivpvq670gvsj1rmglh5rnvb17p6w8gy5rh30aljah"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "QuickCheck inspired property-based testing for OCaml"; - homepage = https://github.com/c-cube/qcheck/; + homepage = "https://github.com/c-cube/qcheck/"; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index ecc1a89a80408..51a8e08983c73 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Inline (Unit) Tests for OCaml (formerly “qtest”)"; - homepage = https://github.com/vincent-hugot/iTeML; + homepage = "https://github.com/vincent-hugot/iTeML"; platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/randomconv/default.nix b/pkgs/development/ocaml-modules/randomconv/default.nix new file mode 100644 index 0000000000000..7abb153b9be3c --- /dev/null +++ b/pkgs/development/ocaml-modules/randomconv/default.nix @@ -0,0 +1,21 @@ +{ lib, buildDunePackage, fetchurl, cstruct }: + +buildDunePackage rec { + pname = "randomconv"; + version = "0.1.3"; + + src = fetchurl { + url = "https://github.com/hannesm/randomconv/releases/download/v${version}/randomconv-v${version}.tbz"; + sha256 = "1iv3r0s5kqxs893b0d55f0r62k777haiahfkkvvfbqwgqsm6la4v"; + }; + + propagatedBuildInputs = [ cstruct ]; + + meta = { + homepage = "https://github.com/hannesm/randomconv"; + description = "Convert from random bytes to random native numbers"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 29fb4fd09b2a0..2031c469b29ce 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { doCheck = true; meta = { - homepage = https://github.com/ocaml/ocaml-re; + homepage = "https://github.com/ocaml/ocaml-re"; description = "Pure OCaml regular expressions, with support for Perl and POSIX-style strings"; license = stdenv.lib.licenses.lgpl2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/re2/Makefile.patch b/pkgs/development/ocaml-modules/re2/Makefile.patch deleted file mode 100644 index fcb6eefe62b2b..0000000000000 --- a/pkgs/development/ocaml-modules/re2/Makefile.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ./lib/Makefile 2014-11-18 08:16:19.000000000 -0800 -+++ ./lib/Makefile 2015-05-23 14:48:31.000000000 -0700 -@@ -6,12 +6,12 @@ - all: libre2_stubs.a dllre2_stubs.so - - dllre2_stubs.so libre2_stubs.a: stubs.o $(LIBRE2) -- ocamlmklib -oc re2_stubs stubs.o $(LIBRE2) -lstdc++ -+ ocamlmklib -oc re2_stubs stubs.o $(LIBRE2) -lc++ - rm libre2_stubs.a # ocamlmklib just includes $(LIBRE2) inside the stubs archive - cp $(LIBRE2) libre2_stubs.a && ar r libre2_stubs.a stubs.o - - stubs.o: stubs.cpp stubs.h util.h enum_x_macro.h -- g++ -O2 -DPIC -fPIC -g -pipe -DCAML_NAME_SPACE -Wall -I. -I../../../include \ -+ $(CXX) -O2 -DPIC -fPIC -g -pipe -DCAML_NAME_SPACE -Wall -I. -I../../../include \ - -I$(RE2_HOME) -I$(ocaml-version-selected-include-path) -c stubs.cpp - - #stubs.o: %.o: %.cpp %.h diff --git a/pkgs/development/ocaml-modules/re2/default.nix b/pkgs/development/ocaml-modules/re2/default.nix deleted file mode 100644 index 2b7d9855665f7..0000000000000 --- a/pkgs/development/ocaml-modules/re2/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{stdenv, buildOcaml, fetchurl, core_p4, pa_ounit, pa_test, - bin_prot_p4, comparelib, sexplib_p4, rsync}: - -buildOcaml rec { - name = "re2"; - version = "112.06.00"; - - minimumSupportedOcamlVersion = "4.00"; - - src = fetchurl { - url = "https://github.com/janestreet/re2/archive/${version}.tar.gz"; - sha256 = "a538765872363fcb67f12b95c07455a0afd68f5ae9008b59bb85a996d97cc752"; - }; - patches = if stdenv.isDarwin - then [./Makefile.patch ./myocamlbuild.patch] - else null; - - buildInputs = [ pa_ounit pa_test rsync ]; - propagatedBuildInputs = [ core_p4 bin_prot_p4 comparelib sexplib_p4 ]; - - hasSharedObjects = true; - - meta = with stdenv.lib; { - homepage = https://github.com/janestreet/re2; - description = "OCaml bindings for RE2"; - license = stdenv.lib.licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/re2/myocamlbuild.patch b/pkgs/development/ocaml-modules/re2/myocamlbuild.patch deleted file mode 100644 index 46ad6fa801b83..0000000000000 --- a/pkgs/development/ocaml-modules/re2/myocamlbuild.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- ./myocamlbuild.ml 2015-05-23 14:35:18.000000000 -0700 -+++ ./myocamlbuild.ml 2015-05-23 15:05:24.000000000 -0700 -@@ -626,16 +626,18 @@ - rule "Generate lib/options.ml" - ~prod:"lib/options.ml" - ~deps:["lib/options.mlp"; "lib/enum_x_macro.h"] -- (fun _ _ -> Cmd (S[A"gcc"; A"-E"; A"-P"; A"-x"; A"c"; -+ (fun _ _ -> Cmd (S[A"cc"; A"-E"; A"-P"; A"-x"; A"c"; - P"lib/options.mlp"; A"-o"; P"lib/options.ml"])); - - flag ["ocaml"; "link"; "library"; "native"] (S[A"-cclib"; A"-Llib"; - A"-cclib"; A"-lre2_stubs"; -- A"-cclib"; A"-lstdc++"]); -+ A"-ccopt"; A"--stdlib=libc++"; -+ A"-cclib"; A"-lc++"]); - flag ["ocaml"; "link"; "library"; "byte"] (S[A"-dllib"; A"dllre2_stubs.so"; - A"-cclib"; A"-Llib"; - A"-cclib"; A"-lre2_stubs"; -- A"-cclib"; A"-lstdc++"]); -+ A"-ccopt"; A"--stdlib=libc++"; -+ A"-cclib"; A"-lc++"]); - | _ -> - () - diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix index 7baf8b743be26..02bba95405d55 100644 --- a/pkgs/development/ocaml-modules/react/default.nix +++ b/pkgs/development/ocaml-modules/react/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ocaml-react-1.2.1"; src = fetchurl { - url = https://erratique.ch/software/react/releases/react-1.2.1.tbz; + url = "https://erratique.ch/software/react/releases/react-1.2.1.tbz"; sha256 = "1aj8w79gdd9xnrbz7s5p8glcb4pmimi8jp9f439dqnf6ih3mqb3v"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { - homepage = https://erratique.ch/software/react; + homepage = "https://erratique.ch/software/react"; description = "Applicative events and signals for OCaml"; license = licenses.bsd3; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix index 05bfe2c093478..667c97276045e 100644 --- a/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -7,7 +7,7 @@ else stdenv.mkDerivation { name = "ocaml${ocaml.version}-reactiveData-0.2.2"; src = fetchurl { - url = https://github.com/ocsigen/reactiveData/archive/0.2.2.tar.gz; + url = "https://github.com/ocsigen/reactiveData/archive/0.2.2.tar.gz"; sha256 = "0jzagyp4zla28wykvcgqwd8df71ir0vb4s8akp02cfacd5v86sng"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An OCaml module for functional reactive programming (FRP) based on React"; - homepage = https://github.com/ocsigen/reactiveData; + homepage = "https://github.com/ocsigen/reactiveData"; license = licenses.lgpl21; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/rope/default.nix b/pkgs/development/ocaml-modules/rope/default.nix index 0223d4f59ff14..41d2d258b97a6 100644 --- a/pkgs/development/ocaml-modules/rope/default.nix +++ b/pkgs/development/ocaml-modules/rope/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation ({ buildInputs = [ ocaml findlib benchmark ] ++ param.buildInputs; meta = { - homepage = http://rope.forge.ocamlcore.org/; + homepage = "http://rope.forge.ocamlcore.org/"; platforms = ocaml.meta.platforms or []; description = ''Ropes ("heavyweight strings") in OCaml''; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/development/ocaml-modules/rpclib/default.nix b/pkgs/development/ocaml-modules/rpclib/default.nix index a4134f592b36f..9216a489248b9 100644 --- a/pkgs/development/ocaml-modules/rpclib/default.nix +++ b/pkgs/development/ocaml-modules/rpclib/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "rpclib"; - version = "6.0.0"; + version = "7.0.0"; minimumOCamlVersion = "4.04"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "mirage"; repo = "ocaml-rpc"; rev = "v${version}"; - sha256 = "0bmr20sj7kybjjlwd42irj0f5zlnxcw7mxa1mdgxkki9bmhsqr51"; + sha256 = "0d8nb272mjxkq5ddn65cy9gjpa8yvd0v3jv3wp5xfh9gj29wd2jj"; }; buildInputs = [ alcotest cmdliner yojson ]; diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix index 579d3da81e362..cdaa7857398fd 100644 --- a/pkgs/development/ocaml-modules/rresult/default.nix +++ b/pkgs/development/ocaml-modules/rresult/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.isc; - homepage = https://erratique.ch/software/rresult; + homepage = "https://erratique.ch/software/rresult"; description = "Result value combinators for OCaml"; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/safepass/default.nix b/pkgs/development/ocaml-modules/safepass/default.nix index 214789e52b4e8..884bcdebba4fd 100644 --- a/pkgs/development/ocaml-modules/safepass/default.nix +++ b/pkgs/development/ocaml-modules/safepass/default.nix @@ -4,11 +4,11 @@ let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { version = "2.0"; - url = http://forge.ocamlcore.org/frs/download.php/1615/ocaml-safepass-2.0.tgz; + url = "http://forge.ocamlcore.org/frs/download.php/1615/ocaml-safepass-2.0.tgz"; sha256 = "1zxx3wcyzhxxvm5w9c21y7hpa11h67paaaz9mfsyiqk6fs6hcvmw"; } else { version = "1.3"; - url = http://forge.ocamlcore.org/frs/download.php/1432/ocaml-safepass-1.3.tgz; + url = "http://forge.ocamlcore.org/frs/download.php/1432/ocaml-safepass-1.3.tgz"; sha256 = "0lb8xbpyc5d1zml7s7mmcr6y2ipwdp7qz73lkv9asy7dyi6cj15g"; }; in @@ -24,7 +24,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://ocaml-safepass.forge.ocamlcore.org/; + homepage = "http://ocaml-safepass.forge.ocamlcore.org/"; description = "An OCaml library offering facilities for the safe storage of user passwords"; license = stdenv.lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/secp256k1/default.nix b/pkgs/development/ocaml-modules/secp256k1/default.nix index 64f05b26dd810..ed60cb962730c 100644 --- a/pkgs/development/ocaml-modules/secp256k1/default.nix +++ b/pkgs/development/ocaml-modules/secp256k1/default.nix @@ -14,7 +14,7 @@ buildDunePackage { buildInputs = [ base stdio configurator secp256k1 ]; meta = with stdenv.lib; { - homepage = https://github.com/dakk/secp256k1-ml; + homepage = "https://github.com/dakk/secp256k1-ml"; description = "Elliptic curve library secp256k1 wrapper for Ocaml"; license = licenses.mit; maintainers = [ maintainers.vyorkin ]; diff --git a/pkgs/development/ocaml-modules/sedlex/2.nix b/pkgs/development/ocaml-modules/sedlex/2.nix index 26c35b9833927..b1a892d5b804a 100644 --- a/pkgs/development/ocaml-modules/sedlex/2.nix +++ b/pkgs/development/ocaml-modules/sedlex/2.nix @@ -38,9 +38,9 @@ buildDunePackage rec { sha256 = "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26"; }; - buildInputs = [ ppx_tools_versioned ocaml-migrate-parsetree ]; - - propagatedBuildInputs = [ gen uchar ]; + propagatedBuildInputs = [ + gen uchar ocaml-migrate-parsetree ppx_tools_versioned + ]; preBuild = '' ln -s ${DerivedCoreProperties} src/generator/data/DerivedCoreProperties.txt @@ -53,7 +53,7 @@ buildDunePackage rec { dontStrip = true; meta = { - homepage = https://github.com/ocaml-community/sedlex; + homepage = "https://github.com/ocaml-community/sedlex"; description = "An OCaml lexer generator for Unicode"; license = lib.licenses.mit; maintainers = [ lib.maintainers.marsam ]; diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index e9b3721bc6827..d34b18bf059e7 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = { - homepage = https://github.com/ocaml-community/sedlex; + homepage = "https://github.com/ocaml-community/sedlex"; description = "An OCaml lexer generator for Unicode"; license = stdenv.lib.licenses.mit; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix index 685f2afb0b469..349dffcf47b36 100644 --- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "ocaml-sexplib-108.08.00"; src = fetchurl { - url = https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/sexplib-108.08.00.tar.gz; + url = "https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/sexplib-108.08.00.tar.gz"; sha256 = "11z1k1d7dbb5m957klgalimpr0r602xp5zkkbgbffib1bphasarg"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { branch = "108"; - homepage = https://ocaml.janestreet.com/; + homepage = "https://ocaml.janestreet.com/"; description = "Library for serializing OCaml values to and from S-expressions"; license = licenses.asl20; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix index e98a2ecdb30e6..adf878bca030b 100644 --- a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "ocaml-sexplib-111.25.00"; src = fetchurl { - url = https://ocaml.janestreet.com/ocaml-core/111.25.00/individual/sexplib-111.25.00.tar.gz; + url = "https://ocaml.janestreet.com/ocaml-core/111.25.00/individual/sexplib-111.25.00.tar.gz"; sha256 = "0qh0zqp5nakqpmmhh4x7cg03vqj3j2bj4zj0nqdlksai188p9ila"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://ocaml.janestreet.com/; + homepage = "https://ocaml.janestreet.com/"; description = "Library for serializing OCaml values to and from S-expressions"; license = licenses.asl20; maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix index 24cdb497189e6..fe7b9020dae26 100644 --- a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix +++ b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix @@ -17,7 +17,7 @@ buildOcaml rec { propagatedBuildInputs = [ type_conv camlp4 ]; meta = with stdenv.lib; { - homepage = https://ocaml.janestreet.com/; + homepage = "https://ocaml.janestreet.com/"; description = "Library for serializing OCaml values to and from S-expressions"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/sodium/default.nix b/pkgs/development/ocaml-modules/sodium/default.nix index 8c8895d45207f..ee9b90d4603f4 100644 --- a/pkgs/development/ocaml-modules/sodium/default.nix +++ b/pkgs/development/ocaml-modules/sodium/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; meta = with stdenv.lib; { - homepage = https://github.com/dsheets/ocaml-sodium; + homepage = "https://github.com/dsheets/ocaml-sodium"; description = "Binding to libsodium 1.0.9+"; platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.rixed ]; diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index f47d7d37631fd..2cc02abbb44d9 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { buildInputs = [ sqlite ]; meta = with lib; { - homepage = http://mmottl.github.io/sqlite3-ocaml/; + homepage = "http://mmottl.github.io/sqlite3-ocaml/"; description = "OCaml bindings to the SQLite 3 database access library"; license = licenses.mit; maintainers = with maintainers; [ diff --git a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix index e8f248ee4a1c9..a3e26a31a8f92 100644 --- a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "ocaml-sqlite3EZ-0.1.0"; src = fetchurl { - url = https://github.com/mlin/ocaml-sqlite3EZ/archive/v0.1.0.tar.gz; + url = "https://github.com/mlin/ocaml-sqlite3EZ/archive/v0.1.0.tar.gz"; sha256 = "8ed2c5d5914a65cbd95589ef11bfb8b38a020eb850cdd49b8adce7ee3a563748"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://github.com/mlin/ocaml-sqlite3EZ; + homepage = "https://github.com/mlin/ocaml-sqlite3EZ"; description = "A thin wrapper for sqlite3-ocaml with a simplified interface"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 3086558e3eb6c..9a574a0457a54 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { propagatedBuildInputs = [openssl]; meta = { - homepage = http://savonet.rastageeks.org/; + homepage = "http://savonet.rastageeks.org/"; description = "OCaml bindings for libssl "; license = "LGPL+link exception"; maintainers = [ diff --git a/pkgs/development/ocaml-modules/stringext/default.nix b/pkgs/development/ocaml-modules/stringext/default.nix index c932bc3a46ac3..bd0187dc5f4fa 100644 --- a/pkgs/development/ocaml-modules/stringext/default.nix +++ b/pkgs/development/ocaml-modules/stringext/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://github.com/rgrinberg/stringext; + homepage = "https://github.com/rgrinberg/stringext"; platforms = ocaml.meta.platforms or []; description = "Extra string functions for OCaml"; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/ocaml-modules/syslog/default.nix b/pkgs/development/ocaml-modules/syslog/default.nix index 117277fe1b6e5..2fa032225e7e3 100644 --- a/pkgs/development/ocaml-modules/syslog/default.nix +++ b/pkgs/development/ocaml-modules/syslog/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://github.com/rixed/ocaml-syslog; + homepage = "https://github.com/rixed/ocaml-syslog"; description = "Simple wrapper to access the system logger from OCaml"; license = licenses.lgpl21Plus; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/tcslib/default.nix b/pkgs/development/ocaml-modules/tcslib/default.nix index 9d1d5a8096cc5..a8ddea79b77f2 100644 --- a/pkgs/development/ocaml-modules/tcslib/default.nix +++ b/pkgs/development/ocaml-modules/tcslib/default.nix @@ -17,7 +17,7 @@ buildOasisPackage rec { propagatedBuildInputs = [ ocaml_extlib num ]; meta = { - homepage = https://github.com/tcsprojects/tcslib; + homepage = "https://github.com/tcsprojects/tcslib"; description = "A multi-purpose library for OCaml"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ mgttlinger ]; diff --git a/pkgs/development/ocaml-modules/textutils/default.nix b/pkgs/development/ocaml-modules/textutils/default.nix deleted file mode 100644 index 6f35b9702280d..0000000000000 --- a/pkgs/development/ocaml-modules/textutils/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{stdenv, buildOcaml, fetchurl, core_p4, pa_ounit, pa_test, sexplib_p4}: - -buildOcaml rec { - name = "textutils"; - version = "112.17.00"; - - minimalSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/textutils/archive/${version}.tar.gz"; - sha256 = "605d9fde66dc2d777721c936aa521e17169c143efaf9ff29619a7f273a7d0052"; - }; - - buildInputs = [ pa_test ]; - propagatedBuildInputs = [ core_p4 pa_ounit sexplib_p4 ]; - - meta = with stdenv.lib; { - homepage = https://github.com/janestreet/textutils; - description = ""; - license = stdenv.lib.licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 80d9933f8b681..dea03f2b38a76 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -1,41 +1,31 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg -, ppx_sexp_conv, result, x509, nocrypto, cstruct-sexp, ppx_cstruct, cstruct-unix, ounit -, lwt ? null}: +{ lib, fetchurl, buildDunePackage, ppx_sexp_conv, ppx_cstruct, cstruct +, cstruct-sexp, sexplib, mirage-crypto, mirage-crypto-pk, mirage-crypto-rng +, x509, domain-name, fmt, cstruct-unix, ounit2, ocaml_lwt, ptime +, hacl_x25519, fiat-p256, hkdf, logs, alcotest }: -with stdenv.lib; +buildDunePackage rec { + minimumOCamlVersion = "4.07"; -let withLwt = lwt != null; in + version = "0.12.0"; + pname = "tls"; -if !versionAtLeast ocaml.version "4.04" -then throw "tls is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - version = "0.10.4"; - name = "ocaml${ocaml.version}-tls-${version}"; - - src = fetchFromGitHub { - owner = "mirleft"; - repo = "ocaml-tls"; - rev = version; - sha256 = "02wv4lia583imn3sfci4nqv6ac5nzig5j3yfdnlqa0q8bp9rfc6g"; + src = fetchurl { + url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz"; + sha256 = "0fy38qmy7rcld1b4qzz4ycl1fr0v1wa7qd24125lpd6hly86fn57"; }; - nativeBuildInputs = [ ocaml ocamlbuild findlib ]; - buildInputs = [ findlib topkg ppx_sexp_conv ppx_cstruct ] - ++ optionals doCheck [ ounit cstruct-unix ]; - propagatedBuildInputs = [ cstruct-sexp nocrypto result x509 ] ++ - optional withLwt lwt; - - buildPhase = "${topkg.run} build --tests ${boolToString doCheck} --with-mirage false --with-lwt ${boolToString withLwt}"; + useDune2 = true; - doCheck = versionAtLeast ocaml.version "4.06"; - checkPhase = "${topkg.run} test"; + doCheck = true; + checkInputs = [ cstruct-unix ounit2 alcotest ]; - inherit (topkg) installPhase; + propagatedBuildInputs = [ ppx_sexp_conv ppx_cstruct cstruct cstruct-sexp + sexplib mirage-crypto mirage-crypto-pk mirage-crypto-rng + x509 domain-name fmt ocaml_lwt ptime hacl_x25519 fiat-p256 + hkdf logs ]; - meta = with stdenv.lib; { - homepage = https://github.com/mirleft/ocaml-tls; + meta = with lib; { + homepage = "https://github.com/mirleft/ocaml-tls"; description = "TLS in pure OCaml"; license = licenses.bsd2; maintainers = with maintainers; [ sternenseemann ]; diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index edbbec3dcb3a6..d2327b93a4f98 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { passthru = { inherit run; }; meta = { - homepage = https://erratique.ch/software/topkg; + homepage = "https://erratique.ch/software/topkg"; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.vbgl ]; description = "A packager for distributing OCaml software"; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 1bac71d301ff0..f614c476140eb 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, ocb-stubblr }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !stdenv.lib.versionAtLeast ocaml.version "4.03" then throw "tsdl is not available for OCaml ${ocaml.version}" else let pname = "tsdl"; - version = "0.9.4"; + version = "0.9.7"; webpage = "https://erratique.ch/software/${pname}"; in @@ -15,11 +15,11 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "13af37w2wybx8yzgjr5zz5l50402ldl614qiwphl1q69hig5mag2"; + sha256 = "1zwv0ixkigh1gzk5n49rwvz2f2m62jdkkqg40j7dclg4gri7691f"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib ocamlbuild topkg result ocb-stubblr ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ SDL2 ctypes ]; preConfigure = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = webpage; description = "Thin bindings to the cross-platform SDL library"; - license = licenses.bsd3; + license = licenses.isc; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/tuntap/default.nix b/pkgs/development/ocaml-modules/tuntap/default.nix index 3a3e90c9d0fa8..8e8eaf5fd5e20 100644 --- a/pkgs/development/ocaml-modules/tuntap/default.nix +++ b/pkgs/development/ocaml-modules/tuntap/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "ocaml-tuntap-1.3.0"; src = fetchzip { - url = https://github.com/mirage/ocaml-tuntap/archive/v1.3.0.tar.gz; + url = "https://github.com/mirage/ocaml-tuntap/archive/v1.3.0.tar.gz"; sha256 = "1cmd4kky875ks02gm2nb8yr80hmlfcnjdfyc63hvkh49acssy3d5"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Bindings to the UNIX tuntap facility"; license = stdenv.lib.licenses.isc; - homepage = https://github.com/mirage/ocaml-tuntap; + homepage = "https://github.com/mirage/ocaml-tuntap"; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix index 940f6cf5107da..235d04ba99bdf 100644 --- a/pkgs/development/ocaml-modules/twt/default.nix +++ b/pkgs/development/ocaml-modules/twt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ocaml${ocaml.version}-twt-0.94.0"; src = fetchzip { - url = https://github.com/mlin/twt/archive/v0.94.0.tar.gz; + url = "https://github.com/mlin/twt/archive/v0.94.0.tar.gz"; sha256 = "0298gdgzl4cifxnc1d8sbrvz1lkiq5r5ifkq1fparm6gvqywpf65"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { dontStrip = true; meta = with stdenv.lib; { - homepage = http://people.csail.mit.edu/mikelin/ocaml+twt/; + homepage = "http://people.csail.mit.edu/mikelin/ocaml+twt/"; description = "“The Whitespace Thing” for OCaml"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix index f2e272ed3956b..69439c1c265f0 100644 --- a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix +++ b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "ocaml-type_conv-108.08.00"; src = fetchurl { - url = https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/type_conv-108.08.00.tar.gz; + url = "https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/type_conv-108.08.00.tar.gz"; sha256 = "08ysikwwp69zvc147lzzg79nwlrzrk738rj0ggcfadi8h5il42sl"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://ocaml.janestreet.com/; + homepage = "https://ocaml.janestreet.com/"; description = "Support library for OCaml preprocessor type conversions"; license = licenses.asl20; branch = "108"; diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix index 706554bc0277d..a970091df51d9 100644 --- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "ocaml-type_conv-109.60.01"; src = fetchurl { - url = https://github.com/janestreet/type_conv/archive/109.60.01.tar.gz; + url = "https://github.com/janestreet/type_conv/archive/109.60.01.tar.gz"; sha256 = "0lpxri68glgq1z2pp02rp45cb909xywbff8d4idljrf6fzzil2zx"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://forge.ocamlcore.org/projects/type-conv/; + homepage = "http://forge.ocamlcore.org/projects/type-conv/"; description = "Support library for OCaml preprocessor type conversions"; license = stdenv.lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix index f6c1ec9ad0638..ee0ce0ae0be1d 100644 --- a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix @@ -12,7 +12,7 @@ buildOcaml rec { }; meta = { - homepage = https://github.com/janestreet/type_conv/; + homepage = "https://github.com/janestreet/type_conv/"; description = "Support library for preprocessor type conversions"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ maggesi ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/typerep/default.nix b/pkgs/development/ocaml-modules/typerep/default.nix index 9500579e2458d..859bd21b0a7cc 100644 --- a/pkgs/development/ocaml-modules/typerep/default.nix +++ b/pkgs/development/ocaml-modules/typerep/default.nix @@ -14,7 +14,7 @@ buildOcaml rec { propagatedBuildInputs = [ type_conv ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/typerep; + homepage = "https://github.com/janestreet/typerep"; description = "Runtime types for OCaml (beta version)"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index 94bcdb45f3281..5d5e7dedd2332 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -2,17 +2,17 @@ buildDunePackage rec { pname = "tyxml"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { url = "https://github.com/ocsigen/tyxml/releases/download/${version}/tyxml-${version}.tbz"; - sha256 = "1hxzppfvsdls2y8qiwvz31hmffzh2hgglf01am1vzf2f31mxf6vf"; + sha256 = "0c150h2f4c4id73ickkdqkir3jya66m6c7f5jxlp4caw9bfr8qsi"; }; propagatedBuildInputs = [ uutf re ]; meta = with lib; { - homepage = http://ocsigen.org/tyxml/; + homepage = "http://ocsigen.org/tyxml/"; description = "A library that makes it almost impossible for your OCaml programs to generate wrong XML output, using static typing"; license = licenses.lgpl21; maintainers = with maintainers; [ diff --git a/pkgs/development/ocaml-modules/uchar/default.nix b/pkgs/development/ocaml-modules/uchar/default.nix index b5b2170e56abb..819d8527b2a50 100644 --- a/pkgs/development/ocaml-modules/uchar/default.nix +++ b/pkgs/development/ocaml-modules/uchar/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ocaml${ocaml.version}-uchar-0.0.2"; src = fetchurl { - url = https://github.com/ocaml/uchar/releases/download/v0.0.2/uchar-0.0.2.tbz; + url = "https://github.com/ocaml/uchar/releases/download/v0.0.2/uchar-0.0.2.tbz"; sha256 = "1w2saw7zanf9m9ffvz2lvcxvlm118pws2x1wym526xmydhqpyfa7"; }; diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index cfbcc27ba9cce..6a7c03b9bb6be 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -3,6 +3,7 @@ }: buildDunePackage rec { + minimumOCamlVersion = "4.03"; pname = "uri"; version = "3.1.0"; diff --git a/pkgs/development/ocaml-modules/uri/legacy.nix b/pkgs/development/ocaml-modules/uri/legacy.nix deleted file mode 100644 index f08ee7fc2fc1a..0000000000000 --- a/pkgs/development/ocaml-modules/uri/legacy.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, re, stringext, ounit -, sexplib, ppx_sexp_conv -, legacyVersion ? false -, sexplib_p4 -}: - -if !stdenv.lib.versionAtLeast ocaml.version "4" -|| legacyVersion && stdenv.lib.versionAtLeast ocaml.version "4.03" -then throw "uri${stdenv.lib.optionalString legacyVersion "_p4"} is not available for OCaml ${ocaml.version}" else - -with - if legacyVersion - then { - version = "1.9.1"; - sha256 = "0v3jxqgyi4kj92r3x83rszfpnvvzy9lyb913basch4q64yka3w85"; - } else { - version = "1.9.2"; - sha256 = "137pg8j654x7r0d1664iy2zp3l82nki1kkh921lwdrwc5qqdl6jx"; - }; - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-uri-${version}"; - - src = fetchzip { - url = "https://github.com/mirage/ocaml-uri/archive/v${version}.tar.gz"; - inherit sha256; - }; - - buildInputs = [ ocaml findlib ocamlbuild ounit ] - ++ stdenv.lib.optional (!legacyVersion) ppx_sexp_conv; - propagatedBuildInputs = [ re (if legacyVersion then sexplib_p4 else sexplib) stringext ]; - - configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; - buildPhase = '' - ocaml setup.ml -build - ocaml setup.ml -doc - ''; - doCheck = true; - checkPhase = "ocaml setup.ml -test"; - installPhase = "ocaml setup.ml -install"; - - createFindlibDestdir = true; - - meta = { - homepage = https://github.com/mirage/ocaml-uri; - platforms = ocaml.meta.platforms or []; - description = "RFC3986 URI parsing library for OCaml"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; - }; -} diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 497b2df88b195..399f147bd0d1a 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122"; - homepage = https://erratique.ch/software/uuidm; + homepage = "https://erratique.ch/software/uuidm"; license = licenses.bsd3; platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.maurer ]; diff --git a/pkgs/development/ocaml-modules/variantslib/default.nix b/pkgs/development/ocaml-modules/variantslib/default.nix index 425383a648540..ebb0857e9186d 100644 --- a/pkgs/development/ocaml-modules/variantslib/default.nix +++ b/pkgs/development/ocaml-modules/variantslib/default.nix @@ -18,7 +18,7 @@ buildOcaml rec { propagatedBuildInputs = [ type_conv ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/variantslib; + homepage = "https://github.com/janestreet/variantslib"; description = "OCaml variants as first class values"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/visitors/default.nix b/pkgs/development/ocaml-modules/visitors/default.nix index 36205c7c1ff45..35cdfc3a9af4a 100644 --- a/pkgs/development/ocaml-modules/visitors/default.nix +++ b/pkgs/development/ocaml-modules/visitors/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ocaml${ocaml.version}-visitors-20190711"; src = fetchurl { - url = http://gallium.inria.fr/~fpottier/visitors/visitors-20190711.tar.gz; + url = "http://gallium.inria.fr/~fpottier/visitors/visitors-20190711.tar.gz"; sha256 = "1h794xczfczf573mpwzm4ah9ir1rbbrkqipbh3aflfpdq2mgsbvg"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://gitlab.inria.fr/fpottier/visitors; + homepage = "https://gitlab.inria.fr/fpottier/visitors"; license = licenses.lgpl21; description = "An OCaml syntax extension (technically, a ppx_deriving plugin) which generates object-oriented visitors for traversing and transforming data structures"; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix index fe3d4ea0e863e..06c84531482e1 100644 --- a/pkgs/development/ocaml-modules/wasm/default.nix +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -1,19 +1,18 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" - || stdenv.lib.versionAtLeast ocaml.version "4.08" then throw "wasm is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-wasm-${version}"; - version = "1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "spec"; - rev = "v${version}"; - sha256 = "0r0wj31s2yg4vn4hyw2afc8wp8b0k3q130yiypwq3dlvfxrr70m6"; + rev = "opam-${version}"; + sha256 = "1kp72yv4k176i94np0m09g10cviqp2pnpm7jmiq6ik7fmmbknk7c"; }; buildInputs = [ ocaml findlib ocamlbuild ]; @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { description = "An executable and OCaml library to run, read and write Web Assembly (wasm) files and manipulate their AST"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.vbgl ]; - homepage = https://github.com/WebAssembly/spec/tree/master/interpreter; + homepage = "https://github.com/WebAssembly/spec/tree/master/interpreter"; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/wtf8/default.nix b/pkgs/development/ocaml-modules/wtf8/default.nix index 420cb30bb9461..ea09b326d3933 100644 --- a/pkgs/development/ocaml-modules/wtf8/default.nix +++ b/pkgs/development/ocaml-modules/wtf8/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/flowtype/ocaml-wtf8; + homepage = "https://github.com/flowtype/ocaml-wtf8"; description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates."; license = licenses.mit; maintainers = [ maintainers.eqyiel ]; diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index 63ddc6e67bdcf..289a3891c7831 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -1,24 +1,29 @@ -{ lib, fetchurl, buildDunePackage, ocaml +{ lib, fetchurl, buildDunePackage , alcotest, cstruct-unix -, asn1-combinators, domain-name, fmt, gmap, nocrypto, rresult +, asn1-combinators, domain-name, fmt, gmap, rresult, mirage-crypto, mirage-crypto-pk +, logs, base64 }: buildDunePackage rec { + minimumOCamlVersion = "4.07"; + pname = "x509"; - version = "0.7.1"; + version = "0.11.2"; src = fetchurl { url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz"; - sha256 = "0hnklgdm1fwwqi0nfvpdbp7ddqvrh9h8697mr99bxqdfhg6sxh1w"; + sha256 = "1b4lcphmlyjhdgqi0brakgjp3diwmrj1y9hx87svi5xklw3zik22"; }; - buildInputs = lib.optionals doCheck [ alcotest cstruct-unix ]; - propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap nocrypto rresult ]; + useDune2 = true; + + buildInputs = [ alcotest cstruct-unix ]; + propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk rresult logs base64 ]; - doCheck = lib.versionAtLeast ocaml.version "4.06"; + doCheck = true; meta = with lib; { - homepage = https://github.com/mirleft/ocaml-x509; + homepage = "https://github.com/mirleft/ocaml-x509"; description = "X509 (RFC5280) handling in OCaml"; license = licenses.bsd2; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/xml-light/default.nix b/pkgs/development/ocaml-modules/xml-light/default.nix index 83e4451e668a3..82f635afb684b 100644 --- a/pkgs/development/ocaml-modules/xml-light/default.nix +++ b/pkgs/development/ocaml-modules/xml-light/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { entirely written in OCaml, hence it does not require additional C library. ''; - homepage = http://tech.motion-twin.com/xmllight.html; + homepage = "http://tech.motion-twin.com/xmllight.html"; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.romildo ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index f0cb5a5948585..1123cc0d2b4e9 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -7,11 +7,11 @@ 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; + url = "https://github.com/ocaml/Zarith/archive/release-1.9.tar.gz"; sha256 = "1xrqcaj5gp52xp4ybpnblw8ciwlgrr0zi7rg7hnk8x83isjkpmwx"; } else { version = "1.3"; - url = http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz; + url = "http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz"; sha256 = "1mx3nxcn5h33qhx4gbg0hgvvydwlwdvdhqcnvfwnmf9jy3b8frll"; }; in diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index 9fa42e68c56d3..66054b334076c 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (rec { To support efficient text edition capabilities, Zed provides macro recording and cursor management facilities. ''; - homepage = https://github.com/diml/zed; + homepage = "https://github.com/diml/zed"; license = stdenv.lib.licenses.bsd3; platforms = ocaml.meta.platforms or []; maintainers = [ diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix index 3b19b64367d61..58ccd2bc8be2a 100644 --- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix +++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix @@ -13,7 +13,7 @@ buildPerlPackage { buildInputs = [ DBDmysql DBI IOSocketSSL TermReadKey ]; meta = { description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.''; - homepage = http://www.percona.com/software/percona-toolkit; + homepage = "http://www.percona.com/software/percona-toolkit"; license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ izorkin ]; }; diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix index ea05ecd299dad..dc48c9931a8d0 100644 --- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix +++ b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix @@ -24,7 +24,7 @@ buildPerlPackage rec { meta = { description = "A lightweight application for searching and streaming videos from YouTube"; - homepage = https://github.com/trizen/youtube-viewer; + homepage = "https://github.com/trizen/youtube-viewer"; maintainers = with stdenv.lib.maintainers; [ woffs ]; license = with stdenv.lib.licenses; [ artistic2 ]; }; diff --git a/pkgs/development/perl-modules/ham/default.nix b/pkgs/development/perl-modules/ham/default.nix index 637e6ac22dd84..d1b0d1f18e513 100644 --- a/pkgs/development/perl-modules/ham/default.nix +++ b/pkgs/development/perl-modules/ham/default.nix @@ -34,7 +34,7 @@ buildPerlPackage { meta = { description = "A tool to manage big projects consisting of multiple loosely-coupled git repositories"; - homepage = https://github.com/kernkonzept/ham; + homepage = "https://github.com/kernkonzept/ham"; license = "unknown"; # should be gpl2, but not quite sure maintainers = with lib.maintainers; [ aw ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/perl-modules/maatkit/default.nix b/pkgs/development/perl-modules/maatkit/default.nix index b23b7afa7a308..e0a1a45cd442f 100644 --- a/pkgs/development/perl-modules/maatkit/default.nix +++ b/pkgs/development/perl-modules/maatkit/default.nix @@ -5,7 +5,7 @@ buildPerlPackage { version = "7540"; src = fetchurl { - url = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/maatkit/maatkit-7540.tar.gz; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/maatkit/maatkit-7540.tar.gz"; sha256 = "1a7rxrddkrsfxb2wj01ha91ld0vapfkqcy8j9p08l76zz2l8p2v1"; }; @@ -38,6 +38,6 @@ buildPerlPackage { growing variety of other databases and technologies. ''; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://www.maatkit.org/; + homepage = "http://www.maatkit.org/"; }; } diff --git a/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch b/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch new file mode 100644 index 0000000000000..add6d9df3b7f4 --- /dev/null +++ b/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch @@ -0,0 +1,45 @@ +From e996904128653c67b04ddbdb1e10cef158098957 Mon Sep 17 00:00:00 2001 +From: Samuel Dionne-Riel <samuel@dionne-riel.com> +Date: Fri, 6 Dec 2019 23:00:51 -0500 +Subject: [PATCH] [HACK]: Assumes Expat paths are good. + +The `check_lib` check fails with the cross-compilation build platform's +Perl, since apparently `mktemp` is missing... + +Even then, side-stepping the issue, it seems it is not actually enough +to work, as the compilation fails. +--- + Makefile.PL | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +diff --git a/Makefile.PL b/Makefile.PL +index 505d1df..fc38b76 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -29,12 +29,17 @@ foreach (@ARGV) { + @ARGV = @replacement_args; + + unless ( +- check_lib( # fill in what you prompted the user for here +- lib => [qw(expat)], +- header => ['expat.h'], +- incpath => $expat_incpath, +- ( $expat_libpath ? ( libpath => $expat_libpath ) : () ), +- ) ++ #check_lib( # fill in what you prompted the user for here ++ # lib => [qw(expat)], ++ # header => ['expat.h'], ++ # incpath => $expat_incpath, ++ # ( $expat_libpath ? ( libpath => $expat_libpath ) : () ), ++ #) ++ # The check_lib implementation fails horribly with cross-compilation. ++ # We are giving known good paths to expat. ++ # And in all cases, the previous behaviour of not actually failing ++ # seemed to work just fine :/. ++ false + ) { + warn <<'Expat_Not_Installed;'; + +-- +2.23.0 + diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 5bccd0946c368..5f6deca863c36 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { access it very rapidly from your OS application launcher. As a result, launching any image is never more than 3 clicks away. ''; - homepage = http://pharo.org; + homepage = "http://pharo.org"; license = stdenv.lib.licenses.mit; maintainers = [ ]; platforms = pharo.meta.platforms; diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix index e76b1802c23f9..fd6312c7b273e 100644 --- a/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { Please fill bug reports on http://bugs.pharo.org under the 'Ubuntu packaging (ppa:pharo/stable)' project. ''; - homepage = http://pharo.org; + homepage = "http://pharo.org"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.lukego ]; # Pharo VM sources are packaged separately for darwin (OS X) diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 38516cc191452..4bc60dde410f5 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { Please fill bug reports on http://bugs.pharo.org under the 'Ubuntu packaging (ppa:pharo/stable)' project. ''; - homepage = http://pharo.org; + homepage = "http://pharo.org"; license = licenses.mit; maintainers = [ maintainers.lukego ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix index ec4168508a7be..ee7a0494ede60 100644 --- a/pkgs/development/pharo/vm/share.nix +++ b/pkgs/development/pharo/vm/share.nix @@ -7,32 +7,32 @@ stdenv.mkDerivation rec { dontUnpack = true; sources10Zip = fetchurl { - url = http://files.pharo.org/sources/PharoV10.sources.zip; + url = "http://files.pharo.org/sources/PharoV10.sources.zip"; sha256 = "0aijhr3w5w3jzmnpl61g6xkwyi2l1mxy0qbvr9k3whz8zlrsijh2"; }; sources20Zip = fetchurl { - url = http://files.pharo.org/sources/PharoV20.sources.zip; + url = "http://files.pharo.org/sources/PharoV20.sources.zip"; sha256 = "1xsc0p361pp8iha5zckppw29sbapd706wbvzvgjnkv2n6n1q5gj7"; }; sources30Zip = fetchurl { - url = http://files.pharo.org/sources/PharoV30.sources.zip; + url = "http://files.pharo.org/sources/PharoV30.sources.zip"; sha256 = "08d9a7gggwpwgrfbp7iv5896jgqz3vgjfrq19y3jw8k10pva98ak"; }; sources40Zip = fetchurl { - url = http://files.pharo.org/sources/PharoV40.sources.zip; + url = "http://files.pharo.org/sources/PharoV40.sources.zip"; sha256 = "1xq1721ql19hpgr8ir372h92q7g8zwd6k921b21dap4wf8djqnpd"; }; sources50Zip = fetchurl { - url = http://files.pharo.org/sources/PharoV50.sources.zip; + url = "http://files.pharo.org/sources/PharoV50.sources.zip"; sha256 = "1vmcah03zacvj1r2x27vdp63g6rcbz3prjd5sjy1z0a9xsjmqp25"; }; sources60Zip = fetchurl { - url = http://files.pharo.org/sources/PharoV60.sources.zip; + url = "http://files.pharo.org/sources/PharoV60.sources.zip"; sha256 = "0xbdi679ryb2zg412xy6zkh22l20pmbl92m3qhfgzjvgybna8z2a"; }; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { description = "Shared files for Pharo"; - homepage = http://pharo.org; + homepage = "http://pharo.org"; license = stdenv.lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix index 080da830af698..7b96b5a913985 100644 --- a/pkgs/development/pharo/vm/vms.nix +++ b/pkgs/development/pharo/vm/vms.nix @@ -55,7 +55,7 @@ let suffix = if stdenv.is64bit then "64" else "32"; in cog = pharo-vm-build-legacy rec { version = "2016.02.18"; name = "pharo-cog${suffix}"; - base-url = http://files.pharo.org/vm/src/vm-unix-sources/blessed; + base-url = "http://files.pharo.org/vm/src/vm-unix-sources/blessed"; src = fetchurl { url = "${base-url}/pharo-vm-${version}.tar.bz2"; sha256 = "16n2zg7v2s1ml0vvpbhkw6khmgn637sr0d7n2b28qm5yc8pfhcj4"; diff --git a/pkgs/development/pharo/wrapper/default.nix b/pkgs/development/pharo/wrapper/default.nix index 084c46cd5b51b..b9b147bf41833 100644 --- a/pkgs/development/pharo/wrapper/default.nix +++ b/pkgs/development/pharo/wrapper/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { http://www.mirandabanda.org/cogblog/about-cog/ ''; - homepage = http://pharo.org; + homepage = "http://pharo.org"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.lukego ]; # Pharo VM sources are packaged separately for darwin (OS X) diff --git a/pkgs/development/pure-modules/audio/default.nix b/pkgs/development/pure-modules/audio/default.nix index cd1435d659961..e99c87ec70659 100644 --- a/pkgs/development/pure-modules/audio/default.nix +++ b/pkgs/development/pure-modules/audio/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A digital audio interface for the Pure programming language"; - homepage = http://puredocs.bitbucket.org/pure-audio.html; + homepage = "http://puredocs.bitbucket.org/pure-audio.html"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/avahi/default.nix b/pkgs/development/pure-modules/avahi/default.nix index 8ce33e67efe8e..4745593cb7f8e 100644 --- a/pkgs/development/pure-modules/avahi/default.nix +++ b/pkgs/development/pure-modules/avahi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A digital audio interface for the Pure programming language"; - homepage = http://puredocs.bitbucket.org/pure-avahi.html; + homepage = "http://puredocs.bitbucket.org/pure-avahi.html"; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/csv/default.nix b/pkgs/development/pure-modules/csv/default.nix index 7524823a5dccf..501271df8c099 100644 --- a/pkgs/development/pure-modules/csv/default.nix +++ b/pkgs/development/pure-modules/csv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Comma Separated Value Interface for the Pure Programming Language"; - homepage = http://puredocs.bitbucket.org/pure-csv.html; + homepage = "http://puredocs.bitbucket.org/pure-csv.html"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/doc/default.nix b/pkgs/development/pure-modules/doc/default.nix index 1a006c9eb8f94..c009b23f4eef2 100644 --- a/pkgs/development/pure-modules/doc/default.nix +++ b/pkgs/development/pure-modules/doc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple utility for literate programming and documenting source code written in the Pure programming language"; - homepage = http://puredocs.bitbucket.org/pure-doc.html; + homepage = "http://puredocs.bitbucket.org/pure-doc.html"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/fastcgi/default.nix b/pkgs/development/pure-modules/fastcgi/default.nix index e41110386d79a..622ea140f66c6 100644 --- a/pkgs/development/pure-modules/fastcgi/default.nix +++ b/pkgs/development/pure-modules/fastcgi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Lets you write FastCGI scripts with Pure, to be run by web servers like Apache"; - homepage = http://puredocs.bitbucket.org/pure-fastcgi.html; + homepage = "http://puredocs.bitbucket.org/pure-fastcgi.html"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/faust/default.nix b/pkgs/development/pure-modules/faust/default.nix index e1c1b4d2d4b05..1f5b443fe3888 100644 --- a/pkgs/development/pure-modules/faust/default.nix +++ b/pkgs/development/pure-modules/faust/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Lets you load and run Faust-generated signal processing modules in Pure"; - homepage = http://puredocs.bitbucket.org/pure-faust.html; + homepage = "http://puredocs.bitbucket.org/pure-faust.html"; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/ffi/default.nix b/pkgs/development/pure-modules/ffi/default.nix index 4d019b5b69997..8518c2cb01f39 100644 --- a/pkgs/development/pure-modules/ffi/default.nix +++ b/pkgs/development/pure-modules/ffi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Provides an interface to libffi which enables you to call C functions from Pure and vice versa"; - homepage = http://puredocs.bitbucket.org/pure-ffi.html; + homepage = "http://puredocs.bitbucket.org/pure-ffi.html"; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix index 54ac78fd6c4da..9956c142dafa5 100644 --- a/pkgs/development/pure-modules/gen/default.nix +++ b/pkgs/development/pure-modules/gen/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Pure interface generator"; - homepage = http://puredocs.bitbucket.org/pure-gen.html; + homepage = "http://puredocs.bitbucket.org/pure-gen.html"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix index 34c13f99f92fc..77173870bca63 100644 --- a/pkgs/development/pure-modules/gl/default.nix +++ b/pkgs/development/pure-modules/gl/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Fairly complete Pure bindings for the OpenGL graphics library, which allow you to do 2D and 3D graphics programming with Pure"; - homepage = http://puredocs.bitbucket.org/pure-gl.html; + homepage = "http://puredocs.bitbucket.org/pure-gl.html"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index 838e81b20ba18..a70dbbd047a28 100644 --- a/pkgs/development/pure-modules/glpk/default.nix +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "GLPK interface for the Pure Programming Language"; - homepage = http://puredocs.bitbucket.org/pure-glpk.html; + homepage = "http://puredocs.bitbucket.org/pure-glpk.html"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/gplot/default.nix b/pkgs/development/pure-modules/gplot/default.nix index c45f51509b71d..998c8f1972ac7 100644 --- a/pkgs/development/pure-modules/gplot/default.nix +++ b/pkgs/development/pure-modules/gplot/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A pure binding to gnuplot"; - homepage = http://puredocs.bitbucket.org/pure-gplot.html; + homepage = "http://puredocs.bitbucket.org/pure-gplot.html"; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/gsl/default.nix b/pkgs/development/pure-modules/gsl/default.nix index 847fe7538e902..6c6a381f285b3 100644 --- a/pkgs/development/pure-modules/gsl/default.nix +++ b/pkgs/development/pure-modules/gsl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU Scientific Library interface for Pure"; - homepage = http://puredocs.bitbucket.org/pure-gsl.html; + homepage = "http://puredocs.bitbucket.org/pure-gsl.html"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/gtk/default.nix b/pkgs/development/pure-modules/gtk/default.nix index 1e7957ae38206..ff619226a81f0 100644 --- a/pkgs/development/pure-modules/gtk/default.nix +++ b/pkgs/development/pure-modules/gtk/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A collection of bindings to use the GTK GUI toolkit version 2.x with Pure"; - homepage = http://puredocs.bitbucket.org/pure-gtk.html; + homepage = "http://puredocs.bitbucket.org/pure-gtk.html"; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/liblo/default.nix b/pkgs/development/pure-modules/liblo/default.nix index 94ceef78908c6..a633ad7c1d77e 100644 --- a/pkgs/development/pure-modules/liblo/default.nix +++ b/pkgs/development/pure-modules/liblo/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A quick and dirty Pure wrapper for the liblo library, which implements Berkeley’s Open Sound Control (OSC) protocol"; - homepage = http://puredocs.bitbucket.org/pure-liblo.html; + homepage = "http://puredocs.bitbucket.org/pure-liblo.html"; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/lilv/default.nix b/pkgs/development/pure-modules/lilv/default.nix index c0f5081294616..85a504c90823b 100644 --- a/pkgs/development/pure-modules/lilv/default.nix +++ b/pkgs/development/pure-modules/lilv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A Pure module for David Robillard’s Lilv, a library for LV2 plugin host writers"; - homepage = http://puredocs.bitbucket.org/pure-lilv.html; + homepage = "http://puredocs.bitbucket.org/pure-lilv.html"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/lv2/default.nix b/pkgs/development/pure-modules/lv2/default.nix index b4a63eb7020f5..6e8f38cf2a9c8 100644 --- a/pkgs/development/pure-modules/lv2/default.nix +++ b/pkgs/development/pure-modules/lv2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A generic LV2 plugin wrapper for Pure which can be linked with batch-compiled Pure scripts to obtain LV2 plugin modules"; - homepage = http://puredocs.bitbucket.org/pure-lv2.html; + homepage = "http://puredocs.bitbucket.org/pure-lv2.html"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/midi/default.nix b/pkgs/development/pure-modules/midi/default.nix index e55d49944555e..3e2a3993fc1a7 100644 --- a/pkgs/development/pure-modules/midi/default.nix +++ b/pkgs/development/pure-modules/midi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A MIDI interface for the Pure programming language"; - homepage = http://puredocs.bitbucket.org/pure-midi.html; + homepage = "http://puredocs.bitbucket.org/pure-midi.html"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/mpfr/default.nix b/pkgs/development/pure-modules/mpfr/default.nix index 59617beb461e2..13c9eee1bd9fc 100644 --- a/pkgs/development/pure-modules/mpfr/default.nix +++ b/pkgs/development/pure-modules/mpfr/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "This module makes the MPFR multiprecision floats available in Pure"; - homepage = http://puredocs.bitbucket.org/pure-mpfr.html; + homepage = "http://puredocs.bitbucket.org/pure-mpfr.html"; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix index e117d04a4cce5..d064eeb0d41f1 100644 --- a/pkgs/development/pure-modules/octave/default.nix +++ b/pkgs/development/pure-modules/octave/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "An Octave module for the Pure programming language"; - homepage = http://puredocs.bitbucket.org/pure-octave.html; + homepage = "http://puredocs.bitbucket.org/pure-octave.html"; license = stdenv.lib.licenses.gpl3Plus; # This is set to none for now because it does not work with the # current stable version of Octave. diff --git a/pkgs/development/pure-modules/odbc/default.nix b/pkgs/development/pure-modules/odbc/default.nix index 69808d1aaf017..e95e1c3d1c198 100644 --- a/pkgs/development/pure-modules/odbc/default.nix +++ b/pkgs/development/pure-modules/odbc/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple ODBC interface for the Pure programming language"; - homepage = http://puredocs.bitbucket.org/pure-odbc.html; + homepage = "http://puredocs.bitbucket.org/pure-odbc.html"; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/pandoc/default.nix b/pkgs/development/pure-modules/pandoc/default.nix index 17a16229b573d..fc615690df1c8 100644 --- a/pkgs/development/pure-modules/pandoc/default.nix +++ b/pkgs/development/pure-modules/pandoc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Converts Sphinx-formatted Pure documentation files to Markdown and other formats using Pandoc"; - homepage = http://puredocs.bitbucket.org/pure-pandoc.html; + homepage = "http://puredocs.bitbucket.org/pure-pandoc.html"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/rational/default.nix b/pkgs/development/pure-modules/rational/default.nix index 547610fdf0165..be230141a4a5c 100644 --- a/pkgs/development/pure-modules/rational/default.nix +++ b/pkgs/development/pure-modules/rational/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A collection of utility functions for rational numbers, and a module for doing interval arithmetic in Pure"; - homepage = http://puredocs.bitbucket.org/pure-rational.html; + homepage = "http://puredocs.bitbucket.org/pure-rational.html"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/readline/default.nix b/pkgs/development/pure-modules/readline/default.nix index d145788c552ba..24f64d944704c 100644 --- a/pkgs/development/pure-modules/readline/default.nix +++ b/pkgs/development/pure-modules/readline/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A trivial wrapper around GNU readline, which gives Pure scripts access to the most important facilities of the readline interface"; - homepage = http://puredocs.bitbucket.org/pure-readline.html; + homepage = "http://puredocs.bitbucket.org/pure-readline.html"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/sockets/default.nix b/pkgs/development/pure-modules/sockets/default.nix index aa8245bb12dd5..e80d66f3ab841 100644 --- a/pkgs/development/pure-modules/sockets/default.nix +++ b/pkgs/development/pure-modules/sockets/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A Pure interface to the Berkeley socket functions"; - homepage = http://puredocs.bitbucket.org/pure-sockets.html; + homepage = "http://puredocs.bitbucket.org/pure-sockets.html"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/sql3/default.nix b/pkgs/development/pure-modules/sql3/default.nix index aa3b2544af07b..c658ee0c55624 100644 --- a/pkgs/development/pure-modules/sql3/default.nix +++ b/pkgs/development/pure-modules/sql3/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A SQLite module for the Pure programming language"; - homepage = http://puredocs.bitbucket.org/pure-sql3.html; + homepage = "http://puredocs.bitbucket.org/pure-sql3.html"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/stldict/default.nix b/pkgs/development/pure-modules/stldict/default.nix index b248a0084ff1b..ae28055a2f92e 100644 --- a/pkgs/development/pure-modules/stldict/default.nix +++ b/pkgs/development/pure-modules/stldict/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A Pure interface to the C++ dictionary containers map and unordered_map"; - homepage = http://puredocs.bitbucket.org/pure-stldict.html; + homepage = "http://puredocs.bitbucket.org/pure-stldict.html"; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/stllib/default.nix b/pkgs/development/pure-modules/stllib/default.nix index d29719891d2af..9d35794b1900b 100644 --- a/pkgs/development/pure-modules/stllib/default.nix +++ b/pkgs/development/pure-modules/stllib/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "An “umbrella” package that contains a pair of Pure addons, pure-stlvec and pure-stlmap"; - homepage = http://puredocs.bitbucket.org/pure-stllib.html; + homepage = "http://puredocs.bitbucket.org/pure-stllib.html"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/tk/default.nix b/pkgs/development/pure-modules/tk/default.nix index d939a3b3ad48a..496da2a20ea69 100644 --- a/pkgs/development/pure-modules/tk/default.nix +++ b/pkgs/development/pure-modules/tk/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A basic interface between Pure and Tcl/Tk"; - homepage = http://puredocs.bitbucket.org/pure-tk.html; + homepage = "http://puredocs.bitbucket.org/pure-tk.html"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/xml/default.nix b/pkgs/development/pure-modules/xml/default.nix index 73753a5d34f59..ac4f1f0e6b072 100644 --- a/pkgs/development/pure-modules/xml/default.nix +++ b/pkgs/development/pure-modules/xml/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A simplified interface to the Gnome libxml2 and libxslt libraries for Pure"; - homepage = http://puredocs.bitbucket.org/pure-xml.html; + homepage = "http://puredocs.bitbucket.org/pure-xml.html"; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/python-modules/3to2/default.nix b/pkgs/development/python-modules/3to2/default.nix index 123cf3f4741ac..ff64a6d1a4730 100644 --- a/pkgs/development/python-modules/3to2/default.nix +++ b/pkgs/development/python-modules/3to2/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://bitbucket.org/amentajo/lib3to2; + homepage = "https://bitbucket.org/amentajo/lib3to2"; description = "Refactors valid 3.x syntax into valid 2.x syntax, if a syntactical conversion is possible"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ mt-caret ]; diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index 1f2a89c5e0c68..21b8d509646da 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library that lets you schedule your Python code to be executed"; - homepage = https://pypi.python.org/pypi/APScheduler/; + homepage = "https://pypi.python.org/pypi/APScheduler/"; license = licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/Babel/default.nix b/pkgs/development/python-modules/Babel/default.nix index d700a07b275fa..1074d2eef48c8 100644 --- a/pkgs/development/python-modules/Babel/default.nix +++ b/pkgs/development/python-modules/Babel/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; meta = with lib; { - homepage = http://babel.edgewall.org; + homepage = "http://babel.edgewall.org"; description = "A collection of tools for internationalizing Python applications"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index aff4e0b62b3cc..2d987abb3e484 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -68,7 +68,7 @@ in buildPythonPackage rec { meta = { description = "An optimising static compiler for both the Python programming language and the extended Cython programming language"; - homepage = https://cython.org; + homepage = "https://cython.org"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/Fabric/default.nix b/pkgs/development/python-modules/Fabric/default.nix index b0c81a62e337b..c6fb898e07050 100644 --- a/pkgs/development/python-modules/Fabric/default.nix +++ b/pkgs/development/python-modules/Fabric/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pythonic remote execution"; - homepage = https://www.fabfile.org/; + homepage = "https://www.fabfile.org/"; license = licenses.bsd2; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/FormEncode/default.nix index 72086a3487f34..f79e76b52c412 100644 --- a/pkgs/development/python-modules/FormEncode/default.nix +++ b/pkgs/development/python-modules/FormEncode/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "FormEncode validates and converts nested structures"; - homepage = http://formencode.org; + homepage = "http://formencode.org"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/GeoIP/default.nix b/pkgs/development/python-modules/GeoIP/default.nix index 550fa1da3edf7..0e4b66fe962f9 100644 --- a/pkgs/development/python-modules/GeoIP/default.nix +++ b/pkgs/development/python-modules/GeoIP/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "MaxMind GeoIP Legacy Database - Python API"; - homepage = https://www.maxmind.com/; + homepage = "https://www.maxmind.com/"; maintainers = with lib.maintainers; [ jluttine ]; license = lib.licenses.lgpl21Plus; }; diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index 0487b20458117..b15b5ebf3441c 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Python Git Library"; maintainers = [ ]; - homepage = https://github.com/gitpython-developers/GitPython; + homepage = "https://github.com/gitpython-developers/GitPython"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/HAP-python/default.nix b/pkgs/development/python-modules/HAP-python/default.nix new file mode 100644 index 0000000000000..4986c99c5a68b --- /dev/null +++ b/pkgs/development/python-modules/HAP-python/default.nix @@ -0,0 +1,46 @@ +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, curve25519-donna, ed25519 +, cryptography, ecdsa, zeroconf, pytest }: + +buildPythonPackage rec { + pname = "HAP-python"; + version = "2.8.1"; + + # pypi package does not include tests + src = fetchFromGitHub { + owner = "ikalchev"; + repo = pname; + rev = "v${version}"; + sha256 = "182s3dk7y29wql9bazlnw840xqgsbr44ad72m668qgxd82jl6y9c"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ + curve25519-donna + ed25519 + cryptography + ecdsa + zeroconf + ]; + + checkInputs = [ pytest ]; + + #disable tests needing network + checkPhase = '' + pytest -k 'not test_persist \ + and not test_setup_endpoints \ + and not test_auto_add_aid_mac \ + and not test_service_callbacks \ + and not test_send_events \ + and not test_not_standalone_aid \ + and not test_start_stop_async_acc \ + and not test_start_stop_sync_acc' + ''; + + meta = with lib; { + homepage = "https://github.com/ikalchev/HAP-python"; + description = "HomeKit Accessory Protocol implementation in python"; + license = licenses.asl20; + maintainers = with maintainers; [ oro ]; + }; +} diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index 22093f0258a99..ef034b0f627bc 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/originell/jpype/; + homepage = "https://github.com/originell/jpype/"; license = licenses.asl20; description = "A Python to Java bridge"; }; diff --git a/pkgs/development/python-modules/JayDeBeApi/default.nix b/pkgs/development/python-modules/JayDeBeApi/default.nix index dd1cc819ad661..738419e8c5c84 100644 --- a/pkgs/development/python-modules/JayDeBeApi/default.nix +++ b/pkgs/development/python-modules/JayDeBeApi/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/baztian/jaydebeapi; + homepage = "https://github.com/baztian/jaydebeapi"; license = licenses.lgpl2; description = "Use JDBC database drivers from Python 2/3 or Jython with a DB-API"; }; diff --git a/pkgs/development/python-modules/Logbook/default.nix b/pkgs/development/python-modules/Logbook/default.nix index 97befe7190ac0..fa05a7a6dffac 100644 --- a/pkgs/development/python-modules/Logbook/default.nix +++ b/pkgs/development/python-modules/Logbook/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = { - homepage = https://pythonhosted.org/Logbook/; + homepage = "https://pythonhosted.org/Logbook/"; description = "A logging replacement for Python"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index c712030820495..8d22094526da8 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = { description = "Super-fast templating language"; - homepage = http://www.makotemplates.org; + homepage = "http://www.makotemplates.org"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/Markups/default.nix b/pkgs/development/python-modules/Markups/default.nix index 6fe41e404192e..eb802989a5c23 100644 --- a/pkgs/development/python-modules/Markups/default.nix +++ b/pkgs/development/python-modules/Markups/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "A wrapper around various text markup languages."; - homepage = https://github.com/retext-project/pymarkups; + homepage = "https://github.com/retext-project/pymarkups"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ klntsky ]; }; diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix index 7882685df4c0f..07330ebbca9d4 100644 --- a/pkgs/development/python-modules/MechanicalSoup/default.nix +++ b/pkgs/development/python-modules/MechanicalSoup/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library for automating interaction with websites"; - homepage = https://github.com/hickford/MechanicalSoup; + homepage = "https://github.com/hickford/MechanicalSoup"; license = licenses.mit; maintainers = [ maintainers.jgillich ]; }; diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index d36a47c331cd1..d3b6fa58750e7 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://getnikola.com/; + homepage = "https://getnikola.com/"; description = "A modular, fast, simple, static website and blog generator"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jluttine ]; diff --git a/pkgs/development/python-modules/Pmw/default.nix b/pkgs/development/python-modules/Pmw/default.nix index a666cad1fc6db..9dfb8de3b2c67 100644 --- a/pkgs/development/python-modules/Pmw/default.nix +++ b/pkgs/development/python-modules/Pmw/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = { description = "A toolkit for building high-level compound widgets in Python using the Tkinter module"; - homepage = http://pmw.sourceforge.net/; + homepage = "http://pmw.sourceforge.net/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ mounium ]; }; diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix index df8738ce24704..1c7bc2ff93fb6 100644 --- a/pkgs/development/python-modules/PyLD/default.nix +++ b/pkgs/development/python-modules/PyLD/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python implementation of the JSON-LD API"; - homepage = https://github.com/digitalbazaar/pyld; + homepage = "https://github.com/digitalbazaar/pyld"; license = licenses.bsd3; maintainers = with maintainers; [ apeschar ]; }; diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index ca9181fc068e1..a0c40550c9a90 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://pygments.org/; + homepage = "https://pygments.org/"; description = "A generic syntax highlighter"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix index dc3ff1dbf4d44..c3c67194ebb74 100644 --- a/pkgs/development/python-modules/ROPGadget/default.nix +++ b/pkgs/development/python-modules/ROPGadget/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "ROPGadget"; - version = "6.2"; + version = "6.3"; src = fetchPypi { inherit pname version; - sha256 = "0idiicgpijar9l9kqmfdh865c2mkfgxg0q7lpz77jc09l6q0afjh"; + sha256 = "0v34w88if3p4vn46aby24msfnxj6znmkf4848n4d24jnykxcsqk9"; }; propagatedBuildInputs = [ capstone ]; diff --git a/pkgs/development/python-modules/Rtree/default.nix b/pkgs/development/python-modules/Rtree/default.nix index 22f54d08e5c5c..9adfbb67e62dc 100644 --- a/pkgs/development/python-modules/Rtree/default.nix +++ b/pkgs/development/python-modules/Rtree/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "R-Tree spatial index for Python GIS"; - homepage = https://toblerity.org/rtree/; + homepage = "https://toblerity.org/rtree/"; license = licenses.lgpl21; maintainers = with maintainers; [ bgamari ]; }; diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index 67600a6e5fd87..88aee76fe5bc2 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -82,7 +82,7 @@ in buildPythonPackage rec { propagatedBuildInputs = [ numpy numpy.blas scipy six libgpuarray_ ]; meta = with stdenv.lib; { - homepage = http://deeplearning.net/software/theano/; + homepage = "http://deeplearning.net/software/theano/"; description = "A Python library for large-scale array computation"; license = licenses.bsd3; maintainers = with maintainers; [ maintainers.bcdarwin ]; diff --git a/pkgs/development/python-modules/TurboCheetah/default.nix b/pkgs/development/python-modules/TurboCheetah/default.nix index 45c42a7b43f94..717b2b5f27801 100644 --- a/pkgs/development/python-modules/TurboCheetah/default.nix +++ b/pkgs/development/python-modules/TurboCheetah/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "TurboGears plugin to support use of Cheetah templates"; - homepage = http://docs.turbogears.org/TurboCheetah; + homepage = "http://docs.turbogears.org/TurboCheetah"; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix index adad205129277..ac04861b41d7f 100644 --- a/pkgs/development/python-modules/WSME/default.nix +++ b/pkgs/development/python-modules/WSME/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simplify the writing of REST APIs, and extend them with additional protocols"; - homepage = http://git.openstack.org/cgit/openstack/wsme; + homepage = "http://git.openstack.org/cgit/openstack/wsme"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index 7c8387e48fcd5..e71d072428764 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.5.9"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "0a4v5cwnwsjxril7514ssvdqxsad227v5w7hcfqjkqzvaf7agb3f"; + sha256 = "1wg7dlz6mhjp7mkqm5f8a2ak87p1zn46b6i754ys8f29nnqq01yz"; }; postPatch = '' @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Ctypes-based simple MagickWand API binding for Python"; - homepage = http://wand-py.org/; + homepage = "http://wand-py.org/"; license = [ licenses.mit ]; maintainers = with maintainers; [ infinisil ]; }; diff --git a/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/pkgs/development/python-modules/WazeRouteCalculator/default.nix index 34757f0e29cbd..02519e9dc66b4 100644 --- a/pkgs/development/python-modules/WazeRouteCalculator/default.nix +++ b/pkgs/development/python-modules/WazeRouteCalculator/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Calculate actual route time and distance with Waze API"; - homepage = https://github.com/kovacsbalu/WazeRouteCalculator; + homepage = "https://github.com/kovacsbalu/WazeRouteCalculator"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index d5c24c018b638..e2828b1860dec 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = { description = "A Python module for creating Excel XLSX files"; - homepage = https://xlsxwriter.readthedocs.io/; + homepage = "https://xlsxwriter.readthedocs.io/"; maintainers = with lib.maintainers; [ jluttine ]; license = lib.licenses.bsd2; }; diff --git a/pkgs/development/python-modules/aafigure/default.nix b/pkgs/development/python-modules/aafigure/default.nix index d75511f8d4cf2..ed07a60e0a892 100644 --- a/pkgs/development/python-modules/aafigure/default.nix +++ b/pkgs/development/python-modules/aafigure/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "ASCII art to image converter"; - homepage = https://launchpad.net/aafigure/; + homepage = "https://launchpad.net/aafigure/"; license = licenses.bsd2; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix index 07c2bcfeb5e8a..07805c470c363 100644 --- a/pkgs/development/python-modules/accupy/default.nix +++ b/pkgs/development/python-modules/accupy/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Accurate sums and dot products for Python"; - homepage = https://github.com/nschloe/accupy; + homepage = "https://github.com/nschloe/accupy"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index 51b4b15cd1837..b9bc11a34c721 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A tiny script to issue and renew TLS certs from Let's Encrypt"; - homepage = https://github.com/diafygi/acme-tiny; + homepage = "https://github.com/diafygi/acme-tiny"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index 34d4c2a37a70c..00a08b3e7a82f 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { patches = fetchpatch { name = "drop_test_pep8.py.patch"; - url = https://bitbucket.org/blockdiag/actdiag/commits/c1f2ed5947a1e93291f5860e4e30cee098bd635d/raw; + url = "https://bitbucket.org/blockdiag/actdiag/commits/c1f2ed5947a1e93291f5860e4e30cee098bd635d/raw"; sha256 = "1zxzwb0fvwlc8xgs45fx65341sjhb3h6l2p6rdj6i127vg1hsxb4"; }; @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Generate activity-diagram image from spec-text file (similar to Graphviz)"; - homepage = http://blockdiag.com/; + homepage = "http://blockdiag.com/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index a2e4d015b2a0c..4b8bd8149344e 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources"; - homepage = https://github.com/AzureAD/azure-activedirectory-library-for-python; + homepage = "https://github.com/AzureAD/azure-activedirectory-library-for-python"; license = licenses.mit; maintainers = with maintainers; [ phreedom ]; }; diff --git a/pkgs/development/python-modules/adb-homeassistant/default.nix b/pkgs/development/python-modules/adb-homeassistant/default.nix index 4e37d18a9f3ae..ff49aec1fbbc3 100644 --- a/pkgs/development/python-modules/adb-homeassistant/default.nix +++ b/pkgs/development/python-modules/adb-homeassistant/default.nix @@ -33,7 +33,7 @@ buildPythonPackage { meta = with lib; { description = "A pure python implementation of the Android ADB and Fastboot protocols"; - homepage = https://github.com/JeffLIrion/python-adb/tree/adb-homeassistant; + homepage = "https://github.com/JeffLIrion/python-adb/tree/adb-homeassistant"; license = licenses.asl20; maintainers = [ maintainers.makefu ]; }; diff --git a/pkgs/development/python-modules/addic7ed-cli/default.nix b/pkgs/development/python-modules/addic7ed-cli/default.nix index b87a084fd8c2a..bdf6aab3dbfc5 100644 --- a/pkgs/development/python-modules/addic7ed-cli/default.nix +++ b/pkgs/development/python-modules/addic7ed-cli/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "A commandline access to addic7ed subtitles"; - homepage = https://github.com/BenoitZugmeyer/addic7ed-cli; + homepage = "https://github.com/BenoitZugmeyer/addic7ed-cli"; license = licenses.mit; maintainers = with maintainers; [ aethelz ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index d64bd672ca06e..f688c39485338 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants"; maintainers = with stdenv.lib.maintainers; [ vrthra ]; license = with stdenv.lib.licenses; [ bsd3 ]; - homepage = https://bitbucket.org/stoneleaf/aenum; + homepage = "https://bitbucket.org/stoneleaf/aenum"; }; } diff --git a/pkgs/development/python-modules/affine/default.nix b/pkgs/development/python-modules/affine/default.nix index ba137ed5178b0..89062cde4d977 100644 --- a/pkgs/development/python-modules/affine/default.nix +++ b/pkgs/development/python-modules/affine/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Matrices describing affine transformation of the plane"; license = licenses.bsd3; - homepage = https://github.com/sgillies/affine; + homepage = "https://github.com/sgillies/affine"; maintainers = with maintainers; [ mredaelli ]; }; diff --git a/pkgs/development/python-modules/affinity/default.nix b/pkgs/development/python-modules/affinity/default.nix index 4eaaf56b441f5..c6eb9543024bc 100644 --- a/pkgs/development/python-modules/affinity/default.nix +++ b/pkgs/development/python-modules/affinity/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = { description = "control processor affinity on windows and linux"; - homepage = http://cheeseshop.python.org/pypi/affinity; + homepage = "http://cheeseshop.python.org/pypi/affinity"; license = with lib.licenses; [ psfl ]; }; } diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix index f070dcb258e8e..bfb5300a82b1c 100644 --- a/pkgs/development/python-modules/agate-dbf/default.nix +++ b/pkgs/development/python-modules/agate-dbf/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Adds read support for dbf files to agate"; - homepage = https://github.com/wireservice/agate-dbf; + homepage = "https://github.com/wireservice/agate-dbf"; license = with licenses; [ mit ]; maintainers = with maintainers; [ vrthra ]; }; diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index ced0ff28090d1..af98bbded8c4d 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Adds read support for excel files to agate"; - homepage = https://github.com/wireservice/agate-excel; + homepage = "https://github.com/wireservice/agate-excel"; license = licenses.mit; maintainers = with maintainers; [ vrthra ]; }; diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 82da607b3ef03..a458f78f2624f 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Adds SQL read/write support to agate."; - homepage = https://github.com/wireservice/agate-sql; + homepage = "https://github.com/wireservice/agate-sql"; license = with licenses; [ mit ]; maintainers = with maintainers; [ vrthra ]; }; diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index b0992141faa06..a2b622dd21166 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/pkgs/development/python-modules/agate/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python data analysis library that is optimized for humans instead of machines"; - homepage = https://github.com/wireservice/agate; + homepage = "https://github.com/wireservice/agate"; license = with licenses; [ mit ]; maintainers = with maintainers; [ vrthra ]; }; diff --git a/pkgs/development/python-modules/aioamqp/default.nix b/pkgs/development/python-modules/aioamqp/default.nix index 8db4722054349..5be5b6a1dd08b 100644 --- a/pkgs/development/python-modules/aioamqp/default.nix +++ b/pkgs/development/python-modules/aioamqp/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/polyconseil/aioamqp; + homepage = "https://github.com/polyconseil/aioamqp"; description = "AMQP implementation using asyncio"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/aiocontextvars/default.nix b/pkgs/development/python-modules/aiocontextvars/default.nix index 38fdf14164eb9..728f2b5fa61ad 100644 --- a/pkgs/development/python-modules/aiocontextvars/default.nix +++ b/pkgs/development/python-modules/aiocontextvars/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asyncio support for PEP-567 contextvars backport"; - homepage = https://github.com/fantix/aiocontextvars; + homepage = "https://github.com/fantix/aiocontextvars"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index a8287df10f62e..694f92577cbb4 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/saghul/aiodns; + homepage = "https://github.com/saghul/aiodns"; license = licenses.mit; description = "Simple DNS resolver for asyncio"; }; diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index 4728d819f05ad..917e3914c10d4 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "File support for asyncio"; - homepage = https://github.com/Tinche/aiofiles; + homepage = "https://github.com/Tinche/aiofiles"; license = with lib.licenses; [ asl20 ]; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index 1d2b32a73b9e0..91dbdc05a9e46 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Ftp client/server for asyncio"; - homepage = https://github.com/aio-libs/aioftp; + homepage = "https://github.com/aio-libs/aioftp"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/aioh2/default.nix b/pkgs/development/python-modules/aioh2/default.nix index fdeb5fb0082e3..6af4c4230b0e2 100644 --- a/pkgs/development/python-modules/aioh2/default.nix +++ b/pkgs/development/python-modules/aioh2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; # https://github.com/decentfox/aioh2/issues/17 meta = with lib; { - homepage = https://github.com/decentfox/aioh2; + homepage = "https://github.com/decentfox/aioh2"; description = "HTTP/2 implementation with hyper-h2 on Python 3 asyncio"; license = licenses.bsd3; maintainers = [ maintainers.qyliss ]; diff --git a/pkgs/development/python-modules/aioharmony/default.nix b/pkgs/development/python-modules/aioharmony/default.nix new file mode 100644 index 0000000000000..13769bbeaed31 --- /dev/null +++ b/pkgs/development/python-modules/aioharmony/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, slixmpp, async-timeout, aiohttp }: + +buildPythonPackage rec { + pname = "aioharmony"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "8c8f6e3b776e4e7eba5a1d2ae739aac6a1dd558a7f15951c34ffe0ee28f7f538"; + }; + + disabled = !isPy3k; + + #aioharmony does not seem to include tests + doCheck = false; + + pythonImportsCheck = [ "aioharmony.harmonyapi" "aioharmony.harmonyclient" ]; + + propagatedBuildInputs = [ slixmpp async-timeout aiohttp ]; + + meta = with lib; { + homepage = "https://github.com/ehendrix23/aioharmony"; + description = + "Asyncio Python library for connecting to and controlling the Logitech Harmony"; + license = licenses.asl20; + maintainers = with maintainers; [ oro ]; + }; +} diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 58f62b9b0f3f2..24804464faeb9 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Jinja2 support for aiohttp"; - homepage = https://github.com/aio-libs/aiohttp_jinja2; + homepage = "https://github.com/aio-libs/aiohttp_jinja2"; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index 51120d07121c0..861dbb9bf0712 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { patches = [ (fetchpatch { - url = https://github.com/aio-libs/aiohttp-remotes/commit/188772abcea038c31dae7d607e487eeed44391bc.patch; + url = "https://github.com/aio-libs/aiohttp-remotes/commit/188772abcea038c31dae7d607e487eeed44391bc.patch"; sha256 = "0pb1y4jb8ar1szhnjiyj2sdmdk6z9h6c3wrxw59nv9kr3if5igvs"; }) ]; @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/wikibusiness/aiohttp-remotes; + homepage = "https://github.com/wikibusiness/aiohttp-remotes"; description = "A set of useful tools for aiohttp.web server"; license = licenses.mit; maintainers = [ maintainers.qyliss ]; diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index 392c77036ca32..7b0bfe80684a1 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.3.7"; + version = "0.3.9"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - sha256 = "00zqlkhfrp1jczgjppaksriidyfshnj0jvrcryn1x77dmy73m023"; + sha256 = "1mn2ng66951mri49f99zh3660j83kvqhr6dpx90s9fkjwk83hmjy"; }; propagatedBuildInputs = [ aiohttp attrs ]; diff --git a/pkgs/development/python-modules/aiohttp-swagger/default.nix b/pkgs/development/python-modules/aiohttp-swagger/default.nix index e01e3ce30bc1c..36b1c23534595 100644 --- a/pkgs/development/python-modules/aiohttp-swagger/default.nix +++ b/pkgs/development/python-modules/aiohttp-swagger/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Swagger API Documentation builder for aiohttp"; - homepage = https://github.com/cr0hn/aiohttp-swagger; + homepage = "https://github.com/cr0hn/aiohttp-swagger"; license = licenses.mit; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 304a2a362e973..7d164cf5e4f0c 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asynchronous HTTP Client/Server for Python and asyncio"; license = licenses.asl20; - homepage = https://github.com/aio-libs/aiohttp; + homepage = "https://github.com/aio-libs/aiohttp"; maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index ede51da9ef1b7..91c059497fca2 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "asyncio package to talk to Philips Hue"; - homepage = https://github.com/balloob/aiohue; + homepage = "https://github.com/balloob/aiohue"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/aioimaplib/default.nix b/pkgs/development/python-modules/aioimaplib/default.nix index 9003618a0fdc1..e3f046e10fc89 100644 --- a/pkgs/development/python-modules/aioimaplib/default.nix +++ b/pkgs/development/python-modules/aioimaplib/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python asyncio IMAP4rev1 client library"; - homepage = https://github.com/bamthomas/aioimaplib; + homepage = "https://github.com/bamthomas/aioimaplib"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/pkgs/development/python-modules/aiokafka/default.nix index b31f83dc136dc..b83da06c4815b 100644 --- a/pkgs/development/python-modules/aiokafka/default.nix +++ b/pkgs/development/python-modules/aiokafka/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Kafka integration with asyncio"; - homepage = https://aiokafka.readthedocs.org; + homepage = "https://aiokafka.readthedocs.org"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/aiolifx-effects/default.nix b/pkgs/development/python-modules/aiolifx-effects/default.nix index bbe2b538ac5e2..0a06144c65c3c 100644 --- a/pkgs/development/python-modules/aiolifx-effects/default.nix +++ b/pkgs/development/python-modules/aiolifx-effects/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiolifx ]; meta = with lib; { - homepage = https://github.com/amelchio/aiolifx_effects; + homepage = "https://github.com/amelchio/aiolifx_effects"; license = licenses.mit; description = "Light effects (pulse, colorloop ...) for LIFX lights running on aiolifx"; maintainers = with maintainers; [ netixx ]; diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 0afaa65e40c54..c40f8d3b4471b 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ bitstring ifaddr ]; meta = with lib; { - homepage = https://github.com/frawau/aiolifx; + homepage = "https://github.com/frawau/aiolifx"; license = licenses.mit; description = "API for local communication with LIFX devices over a LAN with asyncio"; maintainers = with maintainers; [ netixx ]; diff --git a/pkgs/development/python-modules/aiomysql/default.nix b/pkgs/development/python-modules/aiomysql/default.nix index 891e9f216ce82..acaeb0ba783e8 100644 --- a/pkgs/development/python-modules/aiomysql/default.nix +++ b/pkgs/development/python-modules/aiomysql/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "MySQL driver for asyncio"; - homepage = https://github.com/aio-libs/aiomysql; + homepage = "https://github.com/aio-libs/aiomysql"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/aioprocessing/default.nix b/pkgs/development/python-modules/aioprocessing/default.nix index f2f9591126887..938ef94db42c4 100644 --- a/pkgs/development/python-modules/aioprocessing/default.nix +++ b/pkgs/development/python-modules/aioprocessing/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { description = "A library that integrates the multiprocessing module with asyncio"; - homepage = https://github.com/dano/aioprocessing; + homepage = "https://github.com/dano/aioprocessing"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ uskudnik ]; }; diff --git a/pkgs/development/python-modules/aioredis/default.nix b/pkgs/development/python-modules/aioredis/default.nix index 7769f5437549e..a199878fc216c 100644 --- a/pkgs/development/python-modules/aioredis/default.nix +++ b/pkgs/development/python-modules/aioredis/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Asyncio (PEP 3156) Redis client library"; - homepage = https://github.com/aio-libs/aioredis; + homepage = "https://github.com/aio-libs/aioredis"; license = licenses.mit; maintainers = with maintainers; [ mmai ]; }; diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index 01c37275fc31c..bbeca1c31507a 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = { description = "A helper to mock/fake web requests in python aiohttp package"; - homepage = https://github.com/pnuckowski/aioresponses; + homepage = "https://github.com/pnuckowski/aioresponses"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ rvl ]; }; diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/pkgs/development/python-modules/aiorpcx/default.nix index eba64f465591f..5b270319661a2 100644 --- a/pkgs/development/python-modules/aiorpcx/default.nix +++ b/pkgs/development/python-modules/aiorpcx/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { meta = { description = "Transport, protocol and framing-independent async RPC client and server implementation"; license = lib.licenses.mit; - homepage = https://github.com/kyuupichan/aiorpcX; + homepage = "https://github.com/kyuupichan/aiorpcX"; }; } diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix index 16a8a167fbbaa..8eda59a9abf0e 100644 --- a/pkgs/development/python-modules/aiorun/default.nix +++ b/pkgs/development/python-modules/aiorun/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Boilerplate for asyncio applications"; - homepage = https://github.com/cjrh/aiorun; + homepage = "https://github.com/cjrh/aiorun"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix index 77d7cf653d196..7bdddb42d4e3c 100644 --- a/pkgs/development/python-modules/aiosmtpd/default.nix +++ b/pkgs/development/python-modules/aiosmtpd/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://aiosmtpd.readthedocs.io/en/latest/; + homepage = "https://aiosmtpd.readthedocs.io/en/latest/"; description = "Asyncio based SMTP server"; longDescription = '' This is a server for SMTP and related protocols, similar in utility to the diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/pkgs/development/python-modules/aiosqlite/default.nix index 1032485e98019..e616a5363477d 100644 --- a/pkgs/development/python-modules/aiosqlite/default.nix +++ b/pkgs/development/python-modules/aiosqlite/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aiosqlite"; - version = "0.11.0"; + version = "0.12.0"; disabled = isPy27; src = fetchFromGitHub { owner = "jreese"; repo = pname; rev = "v${version}"; - sha256 = "0pmkp4iy738yv2sl08kvhd0ma6wjqbmfnwid72gvg4zqsr1hnn0z"; + sha256 = "090vdv210zfry0bms5b3lmm06yhiyjb8ga96996cqs611l7c2a2j"; }; buildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asyncio bridge to the standard sqlite3 module"; - homepage = https://github.com/jreese/aiosqlite; + homepage = "https://github.com/jreese/aiosqlite"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index e86fc222eea4b..e6a9afcc2c995 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "An asynchronous Python library for communicating with Unifi Controller API"; - homepage = https://pypi.python.org/pypi/aiounifi/; + homepage = "https://pypi.python.org/pypi/aiounifi/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/aiounittest/default.nix b/pkgs/development/python-modules/aiounittest/default.nix index 743600a0d3b09..eeb0ea0af577f 100644 --- a/pkgs/development/python-modules/aiounittest/default.nix +++ b/pkgs/development/python-modules/aiounittest/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Test asyncio code more easily"; - homepage = https://github.com/kwarunek/aiounittest; + homepage = "https://github.com/kwarunek/aiounittest"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/aiozeroconf/default.nix b/pkgs/development/python-modules/aiozeroconf/default.nix index 78b1c215c2bd4..b89ba73b0d645 100644 --- a/pkgs/development/python-modules/aiozeroconf/default.nix +++ b/pkgs/development/python-modules/aiozeroconf/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pure python implementation of multicast DNS service discovery"; - homepage = https://github.com/jstasiak/python-zeroconf; + homepage = "https://github.com/jstasiak/python-zeroconf"; license = licenses.lgpl21; maintainers = with maintainers; [ obadz ]; }; diff --git a/pkgs/development/python-modules/ajpy/default.nix b/pkgs/development/python-modules/ajpy/default.nix index 373c35440620d..5f42646dd9982 100644 --- a/pkgs/development/python-modules/ajpy/default.nix +++ b/pkgs/development/python-modules/ajpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ajpy"; - version = "0.0.4"; + version = "0.0.5"; src = fetchPypi { inherit pname version; - sha256 = "0a5f62b765f59ffc37e759d3f343de16cd782cc4e9e8be09c73b71dfbe383d9b"; + sha256 = "173wm207zyi86m2ms7vscakdi4mmjqfxqsdx1gn0j9nn0gsf241h"; }; # ajpy doesn't have tests diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix index e5aaa9a6c7695..d54741b63ea2c 100644 --- a/pkgs/development/python-modules/alabaster/default.nix +++ b/pkgs/development/python-modules/alabaster/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/bitprophet/alabaster; + homepage = "https://github.com/bitprophet/alabaster"; description = "A Sphinx theme"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 72e7ae6417aa8..0a22f7aa2890f 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://bitbucket.org/zzzeek/alembic; + homepage = "https://bitbucket.org/zzzeek/alembic"; description = "A database migration tool for SQLAlchemy"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix index 55674b660c046..55d6a5c6bdf71 100644 --- a/pkgs/development/python-modules/alerta-server/default.nix +++ b/pkgs/development/python-modules/alerta-server/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; meta = with stdenv.lib; { - homepage = https://alerta.io; + homepage = "https://alerta.io"; description = "Alerta Monitoring System server"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix index fe44b88bc8a1b..c75ad2d14f94a 100644 --- a/pkgs/development/python-modules/alerta/default.nix +++ b/pkgs/development/python-modules/alerta/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; meta = with stdenv.lib; { - homepage = https://alerta.io; + homepage = "https://alerta.io"; description = "Alerta Monitoring System command-line interface"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/algebraic-data-types/default.nix b/pkgs/development/python-modules/algebraic-data-types/default.nix index 4b4986795ce12..8a46d405799bb 100644 --- a/pkgs/development/python-modules/algebraic-data-types/default.nix +++ b/pkgs/development/python-modules/algebraic-data-types/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Algebraic data types for Python"; - homepage = https://github.com/jspahrsummers/adt; + homepage = "https://github.com/jspahrsummers/adt"; license = licenses.mit; maintainers = with maintainers; [ uri-canva ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix index 0ab69aef71e74..9e1aac84f307b 100644 --- a/pkgs/development/python-modules/allpairspy/default.nix +++ b/pkgs/development/python-modules/allpairspy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pairwise test combinations generator"; - homepage = https://github.com/thombashi/allpairspy; + homepage = "https://github.com/thombashi/allpairspy"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index 0b869e4228b0c..a2012132024be 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "alot"; - version = "0.9"; + version = "0.9.1"; outputs = [ "out" ] ++ lib.optional withManpage "man"; disabled = !isPy3k; @@ -16,18 +16,9 @@ buildPythonPackage rec { owner = "pazz"; repo = "alot"; rev = version; - sha256 = "sha256-WUwOJcq8JE7YO8sFeZwYikCRhpufO0pL6MKu54ZYsHI="; + sha256 = "0s94m17yph1gq9f2svipb3bbwbw1s4j3zf2xkg5h91006v8286r6"; }; - patches = [ - # can't compose email if signature is set: https://github.com/pazz/alot/issues/1468 - (fetchpatch { - name = "envelope-body.patch"; - url = "https://github.com/pazz/alot/commit/28a4296c7f556c251d71d9502681980d46d9fa55.patch"; - sha256 = "1iwvmjyz4mh1g08vr85ywhah2xarcqg8dazagygk19icgsn45w06"; - }) - ]; - nativeBuildInputs = lib.optional withManpage sphinx; propagatedBuildInputs = [ @@ -66,10 +57,10 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pazz/alot; + homepage = "https://github.com/pazz/alot"; description = "Terminal MUA using notmuch mail"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ aepsil0n ]; }; } diff --git a/pkgs/development/python-modules/amazon_kclpy/default.nix b/pkgs/development/python-modules/amazon_kclpy/default.nix index a405b575b2538..f18b5e59e34f8 100644 --- a/pkgs/development/python-modules/amazon_kclpy/default.nix +++ b/pkgs/development/python-modules/amazon_kclpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Amazon Kinesis Client Library for Python"; - homepage = https://github.com/awslabs/amazon-kinesis-client-python; + homepage = "https://github.com/awslabs/amazon-kinesis-client-python"; license = licenses.amazonsl; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index 8dad26bbb2baf..bfd3cd7055e30 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/celery/py-amqp; + homepage = "https://github.com/celery/py-amqp"; description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; license = licenses.lgpl21; }; diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix index 682dee0001443..a3e11271ade25 100644 --- a/pkgs/development/python-modules/amqplib/default.nix +++ b/pkgs/development/python-modules/amqplib/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/barryp/py-amqplib; + homepage = "https://github.com/barryp/py-amqplib"; description = "Python client for the Advanced Message Queuing Procotol (AMQP)"; license = licenses.lgpl21; }; diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index 7525df60575ba..c71227811111a 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = { description = "Tool and python library to interact with Android Files"; - homepage = https://github.com/androguard/androguard; + homepage = "https://github.com/androguard/androguard"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.pmiddend ]; }; diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix index f07f05b98843a..bddae5155d7b8 100644 --- a/pkgs/development/python-modules/annexremote/default.nix +++ b/pkgs/development/python-modules/annexremote/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Helper module to easily develop git-annex remotes"; - homepage = https://github.com/Lykos153/AnnexRemote; + homepage = "https://github.com/Lykos153/AnnexRemote"; license = licenses.gpl3; maintainers = with maintainers; [ montag451 ]; }; diff --git a/pkgs/development/python-modules/annoy/default.nix b/pkgs/development/python-modules/annoy/default.nix index 5041ee54e4f9e..51fd57582f2fd 100644 --- a/pkgs/development/python-modules/annoy/default.nix +++ b/pkgs/development/python-modules/annoy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Approximate Nearest Neighbors in C++/Python optimized for memory usage and loading/saving to disk"; - homepage = https://github.com/spotify/annoy; + homepage = "https://github.com/spotify/annoy"; license = licenses.asl20; maintainers = with maintainers; [ timokau ]; }; diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix index 18a2b0dde7f68..eda67e260454a 100644 --- a/pkgs/development/python-modules/ansi2html/default.nix +++ b/pkgs/development/python-modules/ansi2html/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convert text with ANSI color codes to HTML"; - homepage = https://github.com/ralphbean/ansi2html; + homepage = "https://github.com/ralphbean/ansi2html"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ davidtwco ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/ansible-kernel/default.nix b/pkgs/development/python-modules/ansible-kernel/default.nix index 42438b31c2102..670b6330eaa5f 100644 --- a/pkgs/development/python-modules/ansible-kernel/default.nix +++ b/pkgs/development/python-modules/ansible-kernel/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "An Ansible kernel for Jupyter"; - homepage = https://github.com/ansible/ansible-jupyter-kernel; + homepage = "https://github.com/ansible/ansible-jupyter-kernel"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 6a71ae9e1d3ef..27188246b53c7 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Helps when interfacing with Ansible"; - homepage = https://github.com/ansible/ansible-runner; + homepage = "https://github.com/ansible/ansible-runner"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index df9c5e82cd135..07ae08ada78c0 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.2"; + version = "2.9.9"; src = fetchFromGitHub { owner = "ansible"; repo = "ansible"; rev = "v${version}"; - sha256 = "06vxvn5q13rxzndwzq3g6yxiqm361ma9zcvwbrfn630xkmsg4pd8"; + sha256 = "06a9iq7w2cm0hsxaw5irsja8w44gffiw09ly27jxklpa8gv57rml"; }; prePatch = '' @@ -48,10 +48,10 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = http://www.ansible.com; + homepage = "http://www.ansible.com"; description = "Radically simple IT automation"; license = [ licenses.gpl3 ] ; - maintainers = with maintainers; [ joamaki costrouc ]; + maintainers = with maintainers; [ joamaki costrouc hexa ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix index 5960e7b41334c..f9d589e43696f 100644 --- a/pkgs/development/python-modules/ansicolor/default.nix +++ b/pkgs/development/python-modules/ansicolor/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/numerodix/ansicolor/; + homepage = "https://github.com/numerodix/ansicolor/"; description = "A library to produce ansi color output and colored highlighting and diffing"; license = licenses.asl20; maintainers = with maintainers; [ andsild ]; diff --git a/pkgs/development/python-modules/ansicolors/default.nix b/pkgs/development/python-modules/ansicolors/default.nix index a737cb06ea226..3ea77384c7970 100644 --- a/pkgs/development/python-modules/ansicolors/default.nix +++ b/pkgs/development/python-modules/ansicolors/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/verigak/colors/; + homepage = "https://github.com/verigak/colors/"; description = "ANSI colors for Python"; license = licenses.isc; maintainers = with maintainers; [ copumpkin ]; diff --git a/pkgs/development/python-modules/ansiconv/default.nix b/pkgs/development/python-modules/ansiconv/default.nix index 08f93134b325b..7ad683b8c36e3 100644 --- a/pkgs/development/python-modules/ansiconv/default.nix +++ b/pkgs/development/python-modules/ansiconv/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A module for converting ANSI coded text and converts it to either plain text or HTML"; - homepage = https://github.com/ansible/ansiconv; + homepage = "https://github.com/ansible/ansiconv"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/ansiwrap/default.nix b/pkgs/development/python-modules/ansiwrap/default.nix index 517083a06210a..1af39e970bcd6 100644 --- a/pkgs/development/python-modules/ansiwrap/default.nix +++ b/pkgs/development/python-modules/ansiwrap/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Textwrap, but savvy to ANSI colors and styles"; - homepage = https://github.com/jonathaneunice/ansiwrap; + homepage = "https://github.com/jonathaneunice/ansiwrap"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/anyjson/default.nix b/pkgs/development/python-modules/anyjson/default.nix index 65476b47f8fd3..1d0d02988f831 100644 --- a/pkgs/development/python-modules/anyjson/default.nix +++ b/pkgs/development/python-modules/anyjson/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; meta = with lib; { - homepage = https://bitbucket.org/runeh/anyjson/; + homepage = "https://bitbucket.org/runeh/anyjson/"; description = "Wrapper that selects the best available JSON implementation"; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index 712944568f204..b07b585573de9 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Powerful and Lightweight Python Tree Data Structure"; - homepage = https://github.com/c0fec0de/anytree; + homepage = "https://github.com/c0fec0de/anytree"; license = licenses.asl20; maintainers = [ maintainers.worldofpeace ]; }; diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index f23d16c269553..706648f56a318 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -71,13 +71,13 @@ buildPythonPackage rec { # Not yet accepted: https://github.com/apache/airflow/pull/6562 (fetchpatch { name = "avoid-warning-from-abc.collections"; - url = https://patch-diff.githubusercontent.com/raw/apache/airflow/pull/6562.patch; + url = "https://patch-diff.githubusercontent.com/raw/apache/airflow/pull/6562.patch"; sha256 = "0swpay1qlb7f9kgc56631s1qd9k82w4nw2ggvkm7jvxwf056k61z"; }) # Not yet accepted: https://github.com/apache/airflow/pull/6561 (fetchpatch { name = "pendulum2-compatibility"; - url = https://patch-diff.githubusercontent.com/raw/apache/airflow/pull/6561.patch; + url = "https://patch-diff.githubusercontent.com/raw/apache/airflow/pull/6561.patch"; sha256 = "17hw8qyd4zxvib9zwpbn32p99vmrdz294r31gnsbkkcl2y6h9knk"; }) ]; @@ -167,6 +167,9 @@ buildPythonPackage rec { --replace "/bin/bash" "${stdenv.shell}" ''; + # allow for gunicorn processes to have access to python packages + makeWrapperArgs = [ "--prefix PYTHONPATH : $PYTHONPATH" ]; + checkPhase = '' export HOME=$(mktemp -d) export AIRFLOW_HOME=$HOME diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 1ed984fc7182e..fa8b14853aa32 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "A pluggable API specification generator. Currently supports the OpenAPI Specification (f.k.a. the Swagger specification"; - homepage = https://github.com/marshmallow-code/apispec; + homepage = "https://github.com/marshmallow-code/apispec"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/aplpy/default.nix b/pkgs/development/python-modules/aplpy/default.nix index 9710dc9f9a65e..a6eedb3b7a4ba 100644 --- a/pkgs/development/python-modules/aplpy/default.nix +++ b/pkgs/development/python-modules/aplpy/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "The Astronomical Plotting Library in Python"; - homepage = http://aplpy.github.io; + homepage = "http://aplpy.github.io"; license = licenses.mit; maintainers = [ maintainers.smaret ]; }; diff --git a/pkgs/development/python-modules/appdirs/default.nix b/pkgs/development/python-modules/appdirs/default.nix index 8716f007b87a1..2f7f2ae0281b1 100644 --- a/pkgs/development/python-modules/appdirs/default.nix +++ b/pkgs/development/python-modules/appdirs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = { description = "A python module for determining appropriate platform-specific dirs"; - homepage = https://github.com/ActiveState/appdirs; + homepage = "https://github.com/ActiveState/appdirs"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/applicationinsights/default.nix b/pkgs/development/python-modules/applicationinsights/default.nix index 10f66b24d14f3..9f77d4352647d 100644 --- a/pkgs/development/python-modules/applicationinsights/default.nix +++ b/pkgs/development/python-modules/applicationinsights/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "This project extends the Application Insights API surface to support Python"; - homepage = https://github.com/Microsoft/ApplicationInsights-Python; + homepage = "https://github.com/Microsoft/ApplicationInsights-Python"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/appnope/default.nix b/pkgs/development/python-modules/appnope/default.nix index 08f6fa529ca7b..2380fb7d8adfd 100644 --- a/pkgs/development/python-modules/appnope/default.nix +++ b/pkgs/development/python-modules/appnope/default.nix @@ -14,8 +14,8 @@ buildPythonPackage rec { meta = { description = "Disable App Nap on macOS"; - homepage = https://pypi.python.org/pypi/appnope; + homepage = "https://pypi.python.org/pypi/appnope"; platforms = lib.platforms.darwin; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index 2cf9bf1f1777d..a7b0b51d8f1ce 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Assertion/verification library to aid testing"; - homepage = https://github.com/approvals/ApprovalTests.Python; + homepage = "https://github.com/approvals/ApprovalTests.Python"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix index 9e06abd9a71ec..47144fc07aa06 100644 --- a/pkgs/development/python-modules/apptools/default.nix +++ b/pkgs/development/python-modules/apptools/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage, fetchpatch , configobj, six, traitsui , nose, tables, pandas }: @@ -12,6 +12,13 @@ buildPythonPackage rec { sha256 = "10h52ibhr2aw076pivqxiajr9rpcr1mancg6xlpxzckcm3if02i6"; }; + # PyTables issue; should be merged in next post-4.5.0 release (#117) + patches = [ (fetchpatch { + url = "https://github.com/enthought/apptools/commit/3734289d1a0ebd8513fa67f75288add31ed0113c.patch"; + sha256 = "001012q1ib5cbib3nq1alh9ckzj588bfrywr8brkd1f6y1pgvngk"; + }) + ]; + propagatedBuildInputs = [ configobj six traitsui ]; checkInputs = [ diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 48e3b20c7c1c0..cd6e40c119c0b 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python wrapper for the SQLite embedded relational database engine"; - homepage = https://github.com/rogerbinns/apsw; + homepage = "https://github.com/rogerbinns/apsw"; license = licenses.zlib; }; } diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix index 85033a1846f23..a5a78c332ab22 100644 --- a/pkgs/development/python-modules/arelle/default.nix +++ b/pkgs/development/python-modules/arelle/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { An open source facility for XBRL, the eXtensible Business Reporting Language supporting various standards, exposed through a Python or REST API'' + lib.optionalString gui " and a graphical user interface"; - homepage = http://arelle.org/; + homepage = "http://arelle.org/"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ roberth ]; diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix index 8c6afb099f915..544a66c058214 100644 --- a/pkgs/development/python-modules/argh/default.nix +++ b/pkgs/development/python-modules/argh/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/neithere/argh/; + homepage = "https://github.com/neithere/argh/"; description = "An unobtrusive argparse wrapper with natural syntax"; license = licenses.lgpl2; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix index 130a2c1891707..85c6c4b638a58 100644 --- a/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Secure Password Hashes for Python"; - homepage = https://argon2-cffi.readthedocs.io/; + homepage = "https://argon2-cffi.readthedocs.io/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/args/default.nix b/pkgs/development/python-modules/args/default.nix index 943f129031e9e..ae66713361c2b 100644 --- a/pkgs/development/python-modules/args/default.nix +++ b/pkgs/development/python-modules/args/default.nix @@ -11,6 +11,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Command Arguments for Humans"; - homepage = https://github.com/kennethreitz/args; + homepage = "https://github.com/kennethreitz/args"; }; } diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index 04295dce261f7..141ce20fdcbce 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for date manipulation"; - license = "apache"; + license = licenses.asl20; maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index 2bc3ed7609348..e30bd77f4ad0b 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "arviz"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "arviz-devs"; repo = "arviz"; rev = version; - sha256 = "1qc4piz18hfik32gj4v65ckwv516mppq2ac0jyqs21lhqfwbgv9w"; + sha256 = "03hj7bkkj6kfqdk6ri2mp53wk4k7xpafxk01vgs6k9zg3rlnq7ny"; }; propagatedBuildInputs = [ @@ -69,8 +69,18 @@ buildPythonPackage rec { # data_numpyro, data_pyro, data_pystan, and plots. checkPhase = '' cd arviz/tests/ - HOME=$TMPDIR pytest test_{data_cmdstan,data_emcee,data,data_tfp,\ - diagnostics,plot_utils,rcparams,stats,stats_utils,utils}.py + export HOME=$TMPDIR + pytest \ + base_tests/test_data.py \ + base_tests/test_diagnostics.py \ + base_tests/test_plot_utils.py \ + base_tests/test_rcparams.py \ + base_tests/test_stats.py \ + base_tests/test_stats_utils.py \ + base_tests/test_utils.py \ + external_tests/test_data_cmdstan.py \ + external_tests/test_data_emcee.py \ + external_tests/test_data_tfp.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/arxiv2bib/default.nix b/pkgs/development/python-modules/arxiv2bib/default.nix index 99725bcfa61d5..4dec50bbc67e3 100644 --- a/pkgs/development/python-modules/arxiv2bib/default.nix +++ b/pkgs/development/python-modules/arxiv2bib/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Get a BibTeX entry from an arXiv id number, using the arxiv.org API"; - homepage = http://nathangrigg.github.io/arxiv2bib/; + homepage = "http://nathangrigg.github.io/arxiv2bib/"; license = licenses.bsd3; maintainers = [ maintainers.nico202 ]; }; diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 26a667bea4d1a..7c08cf1acbbc5 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python client library for Asana"; - homepage = https://github.com/asana/python-asana; + homepage = "https://github.com/asana/python-asana"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/asciimatics/default.nix b/pkgs/development/python-modules/asciimatics/default.nix index d71f0b640f9d5..09bf4e6a3da2a 100644 --- a/pkgs/development/python-modules/asciimatics/default.nix +++ b/pkgs/development/python-modules/asciimatics/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Helps to create full-screen text UIs (from interactive forms to ASCII animations) on any platform"; - homepage = https://github.com/peterbrittain/asciimatics; + homepage = "https://github.com/peterbrittain/asciimatics"; license = licenses.asl20; maintainers = with maintainers; [ cmcdragonkai ]; }; diff --git a/pkgs/development/python-modules/asciitree/default.nix b/pkgs/development/python-modules/asciitree/default.nix index 74b78d4a1664e..814cf1a3d410b 100644 --- a/pkgs/development/python-modules/asciitree/default.nix +++ b/pkgs/development/python-modules/asciitree/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Draws ASCII trees"; - homepage = https://github.com/mbr/asciitree; + homepage = "https://github.com/mbr/asciitree"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index dd845b1d34968..f3c3615d9262e 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "asdf"; - version = "2.5.2"; + version = "2.6.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0ai5l62ldaq1cqfmq3hvnzp8gp0hjjmjnck9d3cnx5r8la5ig18y"; + sha256 = "1ym9mmxjpnnlinly1rxfqj9rlyl2fv7dxc81f30n1b8n9pwc6jb5"; }; postPatch = '' diff --git a/pkgs/development/python-modules/ase/3.17.nix b/pkgs/development/python-modules/ase/3.17.nix index 3a466170c77c1..40b9b405aab13 100644 --- a/pkgs/development/python-modules/ase/3.17.nix +++ b/pkgs/development/python-modules/ase/3.17.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Atomic Simulation Environment"; - homepage = https://wiki.fysik.dtu.dk/ase/; + homepage = "https://wiki.fysik.dtu.dk/ase/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix index dc6df10803f4d..156f77b4c97e0 100644 --- a/pkgs/development/python-modules/asn1crypto/default.nix +++ b/pkgs/development/python-modules/asn1crypto/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { meta = { description = "Fast ASN.1 parser and serializer with definitions for private keys, public keys, certificates, CRL, OCSP, CMS, PKCS#3, PKCS#7, PKCS#8, PKCS#12, PKCS#5, X.509 and TSP"; license = lib.licenses.mit; - homepage = https://github.com/wbond/asn1crypto; + homepage = "https://github.com/wbond/asn1crypto"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/aspy.yaml/default.nix b/pkgs/development/python-modules/aspy.yaml/default.nix index 1a91033823274..5abe60742747b 100644 --- a/pkgs/development/python-modules/aspy.yaml/default.nix +++ b/pkgs/development/python-modules/aspy.yaml/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "A few extensions to pyyaml"; - homepage = https://github.com/asottile/aspy.yaml; + homepage = "https://github.com/asottile/aspy.yaml"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix index e8ea8c37cd97f..02610d042ceff 100644 --- a/pkgs/development/python-modules/astor/default.nix +++ b/pkgs/development/python-modules/astor/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for reading, writing and rewriting python AST"; - homepage = https://github.com/berkerpeksag/astor; + homepage = "https://github.com/berkerpeksag/astor"; license = licenses.bsd3; maintainers = with maintainers; [ nixy ]; }; diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index 5338b67b50da8..84ce4d1d5b7b7 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Calculations for the position of the sun and the moon"; - homepage = https://github.com/sffjunkie/astral/; + homepage = "https://github.com/sffjunkie/astral/"; license = licenses.asl20; maintainers = with maintainers; [ flokli ]; }; diff --git a/pkgs/development/python-modules/astroid/1.6.nix b/pkgs/development/python-modules/astroid/1.6.nix index cdbbe547aec74..2c763e214e87c 100644 --- a/pkgs/development/python-modules/astroid/1.6.nix +++ b/pkgs/development/python-modules/astroid/1.6.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "An abstract syntax tree for Python with inference support"; - homepage = https://github.com/PyCQA/astroid; + homepage = "https://github.com/PyCQA/astroid"; license = licenses.lgpl2; platforms = platforms.all; maintainers = with maintainers; [ nand0p ]; diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 5d24a05aa54d5..2084065c8d5ce 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "An abstract syntax tree for Python with inference support"; - homepage = https://github.com/PyCQA/astroid; + homepage = "https://github.com/PyCQA/astroid"; license = licenses.lgpl2; platforms = platforms.all; maintainers = with maintainers; [ nand0p ]; diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix index 4300165470cd1..61f49322d3bb4 100644 --- a/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/pkgs/development/python-modules/astropy-healpix/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "BSD-licensed HEALPix for Astropy"; - homepage = https://github.com/astropy/astropy-healpix; + homepage = "https://github.com/astropy/astropy-healpix"; license = licenses.bsd3; maintainers = [ maintainers.smaret ]; }; diff --git a/pkgs/development/python-modules/astropy-helpers/default.nix b/pkgs/development/python-modules/astropy-helpers/default.nix index 93b2784902f1d..dd8897ab13907 100644 --- a/pkgs/development/python-modules/astropy-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-helpers/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utilities for building and installing Astropy, Astropy affiliated packages, and their respective documentation"; - homepage = https://github.com/astropy/astropy-helpers; + homepage = "https://github.com/astropy/astropy-helpers"; license = licenses.bsd3; maintainers = [ maintainers.smaret ]; }; diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index c23c15e1d4d4d..147a4d65de5eb 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "astropy"; - version = "4.0"; + version = "4.0.1.post1"; disabled = !isPy3k; # according to setup.py src = fetchPypi { inherit pname version; - sha256 = "404200e0baa84de09ac563ad9ccab3817e9b9669d0025cee74a8752f4bc2771b"; + sha256 = "1da4xj793ldck29aajyb514wpz330cml26f3gdp45jj531n4lc2w"; }; nativeBuildInputs = [ astropy-helpers ]; @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = { description = "Astronomy/Astrophysics library for Python"; - homepage = https://www.astropy.org; + homepage = "https://www.astropy.org"; license = lib.licenses.bsd3; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ kentjames ]; diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index 8c8a1b76b1a0b..0f090d14abada 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -1,30 +1,22 @@ -{ lib, fetchPypi, buildPythonPackage, fetchpatch, astroid, six, coverage -, lazy-object-proxy, nose, wrapt +{ lib, fetchPypi, buildPythonPackage, + setuptools_scm, toml, six, astroid, pytest }: buildPythonPackage rec { pname = "asttokens"; - version = "1.1.13"; + version = "2.0.4"; src = fetchPypi { inherit pname version; - sha256 = "1vd4djlxmgznz84gzakkv45avnrcpgl1kir92l1pxyp0z5c0dh2m"; + sha256 = "0a2ixiz04aw4p0aivxh47k3fa9ql804l3y5iv5gcih9aizi5fbm4"; }; - patches = [ - # Fix tests for astroid 2.2 in python 3. Remove with the next release - (fetchpatch { - url = "https://github.com/gristlabs/asttokens/commit/21caaaa74105c410b3d84c3d8ff0dc2f612aac9a.patch"; - sha256 = "182xfr0cx4pxx0dv1l50a1c281h8ywir8vvd1zh5iicflivim1nv"; - }) - ]; + propagatedBuildInputs = [ setuptools_scm toml six astroid ]; - propagatedBuildInputs = [ lazy-object-proxy six wrapt astroid ]; - - checkInputs = [ coverage nose ]; + checkInputs = [ pytest ]; meta = with lib; { - homepage = https://github.com/gristlabs/asttokens; + homepage = "https://github.com/gristlabs/asttokens"; description = "Annotate Python AST trees with source text and token information"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix index 56570295dee73..0947b3877b5ed 100644 --- a/pkgs/development/python-modules/astunparse/default.nix +++ b/pkgs/development/python-modules/astunparse/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "This is a factored out version of unparse found in the Python source distribution"; - homepage = https://github.com/simonpercivall/astunparse; + homepage = "https://github.com/simonpercivall/astunparse"; license = licenses.bsd3; maintainers = with maintainers; [ jyp ]; }; diff --git a/pkgs/development/python-modules/async_generator/default.nix b/pkgs/development/python-modules/async_generator/default.nix index b8ec2f5447626..dfbd0dbb9968e 100644 --- a/pkgs/development/python-modules/async_generator/default.nix +++ b/pkgs/development/python-modules/async_generator/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Async generators and context managers for Python 3.5+"; - homepage = https://github.com/python-trio/async_generator; + homepage = "https://github.com/python-trio/async_generator"; license = with licenses; [ mit asl20 ]; }; } diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix index aabf30183d565..a1dbb521ce3d9 100644 --- a/pkgs/development/python-modules/async_timeout/default.nix +++ b/pkgs/development/python-modules/async_timeout/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Timeout context manager for asyncio programs"; - homepage = https://github.com/aio-libs/async_timeout/; + homepage = "https://github.com/aio-libs/async_timeout/"; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix index 14e5b56cb0cf6..439702e802716 100644 --- a/pkgs/development/python-modules/asyncpg/default.nix +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/MagicStack/asyncpg; + homepage = "https://github.com/MagicStack/asyncpg"; description = "An asyncio PosgtreSQL driver"; longDescription = '' Asyncpg is a database interface library designed specifically for diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 3d22507944102..ab647935364fc 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Provides an asynchronous client and server implementation of the SSHv2 protocol on top of the Python asyncio framework"; - homepage = https://asyncssh.readthedocs.io/en/latest; + homepage = "https://asyncssh.readthedocs.io/en/latest"; license = licenses.epl20; maintainers = with maintainers; [ worldofpeace ]; }; diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix index a9c012ba83146..d08f4137ba457 100644 --- a/pkgs/development/python-modules/asynctest/default.nix +++ b/pkgs/development/python-modules/asynctest/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Enhance the standard unittest package with features for testing asyncio libraries"; - homepage = https://github.com/Martiusweb/asynctest; + homepage = "https://github.com/Martiusweb/asynctest"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index fdaebda089ff0..465681a71f3f2 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Memory efficient Python objects"; maintainers = [ maintainers.bhipple ]; - homepage = https://github.com/nucleic/atom; + homepage = "https://github.com/nucleic/atom"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/atomiclong/default.nix b/pkgs/development/python-modules/atomiclong/default.nix index 8f3aae7b19dd6..670361b9a9efb 100644 --- a/pkgs/development/python-modules/atomiclong/default.nix +++ b/pkgs/development/python-modules/atomiclong/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Long data type with atomic operations using CFFI"; - homepage = https://github.com/dreid/atomiclong; + homepage = "https://github.com/dreid/atomiclong"; license = licenses.mit; maintainers = with maintainers; [ robbinch ]; }; diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix index eed9591d7bdf6..019dcbe9bed79 100644 --- a/pkgs/development/python-modules/atomicwrites/default.nix +++ b/pkgs/development/python-modules/atomicwrites/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Atomic file writes on POSIX"; - homepage = https://pypi.python.org/pypi/atomicwrites; + homepage = "https://pypi.python.org/pypi/atomicwrites"; maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index d873700f32a63..9e5eb34da3b1f 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/usnistgov/atomman/; + homepage = "https://github.com/usnistgov/atomman/"; description = "Atomistic Manipulation Toolkit"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index 6657b41cc7846..e2c3e8af6b0f3 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://public.readthedocs.io/en/latest/; + homepage = "https://public.readthedocs.io/en/latest/"; description = "A decorator and function which populates a module's __all__ and globals"; longDescription = '' This is a very simple decorator and function which populates a module's diff --git a/pkgs/development/python-modules/atsim_potentials/default.nix b/pkgs/development/python-modules/atsim_potentials/default.nix index 5d664e77d2953..3bc221d7adc93 100644 --- a/pkgs/development/python-modules/atsim_potentials/default.nix +++ b/pkgs/development/python-modules/atsim_potentials/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://bitbucket.org/mjdr/atsim_potentials; + homepage = "https://bitbucket.org/mjdr/atsim_potentials"; description = "Provides tools for working with pair and embedded atom method potential models including tabulation routines for DL_POLY and LAMMPS"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/attrdict/default.nix b/pkgs/development/python-modules/attrdict/default.nix index 29e3ca09cc51a..1dfbf32c995b2 100644 --- a/pkgs/development/python-modules/attrdict/default.nix +++ b/pkgs/development/python-modules/attrdict/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A dict with attribute-style access"; - homepage = https://github.com/bcj/AttrDict; + homepage = "https://github.com/bcj/AttrDict"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index e3691a5dc3281..0e0606a3ead58 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python attributes without boilerplate"; - homepage = https://github.com/hynek/attrs; + homepage = "https://github.com/hynek/attrs"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index 3e08d4a9882a0..d4f97dd4ce508 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; meta = with lib; { - homepage = https://github.com/thebigmunch/audio-metadata; + homepage = "https://github.com/thebigmunch/audio-metadata"; description = "A library for reading and, in the future, writing metadata from audio files"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix index 45a05ac85e74b..cf1d4544e4adc 100644 --- a/pkgs/development/python-modules/augeas/default.nix +++ b/pkgs/development/python-modules/augeas/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure python bindings for augeas"; - homepage = https://github.com/hercules-team/python-augeas; + homepage = "https://github.com/hercules-team/python-augeas"; license = licenses.lgpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix new file mode 100644 index 0000000000000..7e2b09cca6842 --- /dev/null +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, mock +}: + +buildPythonPackage rec { + pname = "auth0-python"; + version = "3.9.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "c2fdc3ff230638a2776d2b3761e787ca93dc33a26f841504fc260f947256f453"; + }; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + mock + ]; + + meta = with lib; { + description = "Auth0 Python SDK"; + homepage = "https://github.com/auth0/auth0-python"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix index fdb478bc143bc..a2f2742ee883f 100644 --- a/pkgs/development/python-modules/authheaders/default.nix +++ b/pkgs/development/python-modules/authheaders/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = { description = "Python library for the generation of email authentication headers"; - homepage = https://github.com/ValiMail/authentication-headers; + homepage = "https://github.com/ValiMail/authentication-headers"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix index cbbf64524f570..bf82d106598e3 100644 --- a/pkgs/development/python-modules/authlib/default.nix +++ b/pkgs/development/python-modules/authlib/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { - version = "0.14.1"; + version = "0.14.3"; pname = "authlib"; src = fetchFromGitHub { owner = "lepture"; repo = "authlib"; rev = "v${version}"; - sha256 = "0z56r5s8z8pfp0p8zrf1chgzan4q25zg0awgc7bgkvkwgxbhzx4m"; + sha256 = "0ph97j94i40jj7nc5ya8pfq0ccx023zbqpcs5hrxmib53g64k5xy"; }; propagatedBuildInputs = [ cryptography requests ]; diff --git a/pkgs/development/python-modules/authres/default.nix b/pkgs/development/python-modules/authres/default.nix index d2a72461b1779..372fb03a9472e 100644 --- a/pkgs/development/python-modules/authres/default.nix +++ b/pkgs/development/python-modules/authres/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { Authentication-Results Headers generation and parsing for Python/Python3. ''; - homepage = https://launchpad.net/authentication-results-python; + homepage = "https://launchpad.net/authentication-results-python"; license = licenses.bsd3; maintainers = with maintainers; [ leenaars ]; }; diff --git a/pkgs/development/python-modules/autograd/default.nix b/pkgs/development/python-modules/autograd/default.nix index 68dc9339ce4cf..6d56775d90c39 100644 --- a/pkgs/development/python-modules/autograd/default.nix +++ b/pkgs/development/python-modules/autograd/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/HIPS/autograd; + homepage = "https://github.com/HIPS/autograd"; description = "Compute derivatives of NumPy code efficiently"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/python-modules/autologging/default.nix b/pkgs/development/python-modules/autologging/default.nix index 1d028eeb18707..7a3b36c351417 100644 --- a/pkgs/development/python-modules/autologging/default.nix +++ b/pkgs/development/python-modules/autologging/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = http://ninthtest.info/python-autologging/; + homepage = "http://ninthtest.info/python-autologging/"; description = "Easier logging and tracing for Python classes"; license = licenses.mit; maintainers = with maintainers; [ twey ]; diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index fb6ac1daa1fa9..8a9f85b54fdd7 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/glyph/Automat; + homepage = "https://github.com/glyph/Automat"; description = "Self-service finite-state machines for the programmer on the go"; license = licenses.mit; maintainers = [ ]; diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 55b416a0b5842..715e4da8f44e1 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.5"; + version = "1.5.2"; src = fetchPypi { inherit pname version; - sha256 = "0f592a0447acea0c2b0a9602be1e4e3d86db52badd2e3c84f0193bfd89fd3a43"; + sha256 = "0m29ndgrcgrzi3y1fsxmdl421x6n4gn02l70hsz8486h8zzdhbqm"; }; propagatedBuildInputs = [ pycodestyle ]; @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A tool that automatically formats Python code to conform to the PEP 8 style guide"; - homepage = https://pypi.python.org/pypi/autopep8/; + homepage = "https://pypi.python.org/pypi/autopep8/"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 38f658cf98264..7ccc569a87e5f 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "Pythonic bindings for FFmpeg/Libav"; - homepage = https://github.com/mikeboers/PyAV/; + homepage = "https://github.com/mikeboers/PyAV/"; license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/avro-python3/default.nix b/pkgs/development/python-modules/avro-python3/default.nix index 46272a5418d13..3efb1dd006942 100644 --- a/pkgs/development/python-modules/avro-python3/default.nix +++ b/pkgs/development/python-modules/avro-python3/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "A serialization and RPC framework"; - homepage = https://pypi.python.org/pypi/avro-python3/; + homepage = "https://pypi.python.org/pypi/avro-python3/"; license = licenses.asl20; maintainers = [ maintainers.shlevy maintainers.timma ]; diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index 839c7fa45bebf..d4d14ce974437 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -12,6 +12,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A serialization and RPC framework"; - homepage = https://pypi.python.org/pypi/avro/; + homepage = "https://pypi.python.org/pypi/avro/"; }; } diff --git a/pkgs/development/python-modules/avro3k/default.nix b/pkgs/development/python-modules/avro3k/default.nix index 3a5b34ebb85d5..59d09b3f25f0d 100644 --- a/pkgs/development/python-modules/avro3k/default.nix +++ b/pkgs/development/python-modules/avro3k/default.nix @@ -14,6 +14,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A serialization and RPC framework"; - homepage = https://pypi.python.org/pypi/avro3k/; + homepage = "https://pypi.python.org/pypi/avro3k/"; }; } diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 350a82d13fdef..79406eaa0d5ec 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -3,7 +3,6 @@ , fetchPypi , numpy , pandas -, pyarrow , pytestrunner , pytest , h5py @@ -19,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pytestrunner ]; - checkInputs = [ pandas pyarrow pytest h5py ]; + checkInputs = [ pandas pytest h5py ]; propagatedBuildInputs = [ numpy ]; checkPhase = '' @@ -28,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy"; - homepage = https://github.com/scikit-hep/awkward-array; + homepage = "https://github.com/scikit-hep/awkward-array"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/awkward1/default.nix b/pkgs/development/python-modules/awkward1/default.nix index a35a97c5e024c..ce0d5e747c03d 100644 --- a/pkgs/development/python-modules/awkward1/default.nix +++ b/pkgs/development/python-modules/awkward1/default.nix @@ -4,17 +4,17 @@ , cmake , numba , numpy -, pytest +, pytestCheckHook , rapidjson }: buildPythonPackage rec { pname = "awkward1"; - version = "0.1.38"; + version = "0.2.12"; src = fetchPypi { inherit pname version; - sha256 = "1c87defa8c1661ffe36f8a785fa9a60ae3b70484984a935e710cd8cb1f763fd7"; + sha256 = "a87d89c218151d840c032be4cba6801801683ea00e91dc17fd7bc527ad8eb09b"; }; nativeBuildInputs = [ cmake ]; @@ -23,13 +23,11 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - checkInputs = [ pytest numba ]; - checkPhase = '' - py.test - ''; + checkInputs = [ pytestCheckHook numba ]; + dontUseSetuptoolsCheck = true; meta = with lib; { - description = "Development of awkward 1.0, to replace scikit-hep/awkward-array in 2020"; + description = "Manipulate JSON-like data with NumPy-like idioms"; homepage = "https://github.com/scikit-hep/awkward-1.0"; license = licenses.bsd3; maintainers = with maintainers; [ veprbl ]; diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index b10bd6d7c1a12..9979ccdd3c074 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/awslabs/aws-lambda-builders; + homepage = "https://github.com/awslabs/aws-lambda-builders"; description = "A tool to compile, build and package AWS Lambda functions"; longDescription = '' Lambda Builders is a Python library to compile, build and package diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 1fdfc4d4358c8..13bc3cdbbbb6f 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ] ++ lib.optionals (pythonOlder "3.4") [ enum34 ]; meta = { - homepage = https://github.com/awslabs/serverless-application-model; + homepage = "https://github.com/awslabs/serverless-application-model"; description = "Python library to transform SAM templates into AWS CloudFormation templates"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.andreabedini ]; diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index c0ca690858623..6e12a1bcb31a1 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -24,8 +24,8 @@ buildPythonPackage rec { meta = { description = "AWS X-Ray SDK for the Python programming language"; license = lib.licenses.asl20; - homepage = https://github.com/aws/aws-xray-sdk-python; + homepage = "https://github.com/aws/aws-xray-sdk-python"; }; doCheck = false; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 2e87db4fb6ce6..dc31669f71821 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -12,14 +12,14 @@ }: buildPythonPackage rec { - version = "1.3.0"; + version = "1.5.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "98d03a35845fe5b6abaa32f5961214da3e16c4c82b8c601926fc5e7f3a39549e"; + sha256 = "181iyigm11y56lf1kwv7pcdyppavpwjb1b6k3qp3jnbqaypad9mg"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index 78fd740209807..d1baeb380327f 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.3.0"; + version = "1.3.1"; disabled = isPy38; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "17fa904e0447fd2a2dc19909379edb769b05656dbaf4863b8c4fdfb2bb54350c"; + sha256 = "5a59c36b4b05bdaec455c390feda71b6495fc828246593404351b9a41c2e877a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix new file mode 100644 index 0000000000000..1e4b8f09c55a7 --- /dev/null +++ b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, isPy3k +, azure-core +, msrest +, msrestazure +}: + +buildPythonPackage rec { + pname = "azure-keyvault-certificates"; + version = "4.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "069l6m80rq4smyqbrmjb2w18wxxg49xi2yrf1wsxpq8r0r45cksl"; + }; + + propagatedBuildInputs = [ + azure-core + msrest + msrestazure + ]; + + pythonNamespaces = [ "azure.keyvault" ]; + + # has no tests + doCheck = false; + pythonImportsCheck = [ "azure.keyvault.certificates" ]; + + meta = with lib; { + description = "Microsoft Azure Key Vault Certificates Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/pkgs/development/python-modules/azure-keyvault/default.nix index 035871ab93774..f5b83df266403 100644 --- a/pkgs/development/python-modules/azure-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-keyvault/default.nix @@ -1,20 +1,22 @@ { lib, buildPythonPackage, isPy27, fetchPypi +, azure-keyvault-certificates , azure-keyvault-keys , azure-keyvault-secrets }: buildPythonPackage rec { pname = "azure-keyvault"; - version = "4.0.0"; + version = "4.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e85f5bd6cb4f10b3248b99bbf02e3acc6371d366846897027d4153f18025a2d7"; + sha256 = "69002a546921a8290eb54d9a3805cfc515c321bc1d4c0bfcfb463620245eca40"; }; propagatedBuildInputs = [ + azure-keyvault-certificates azure-keyvault-keys azure-keyvault-secrets ]; diff --git a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix index 83ca8809fc2a5..f801d2a059322 100644 --- a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-advisor"; - version = "3.0.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c52a4cf91d736c0ecdcb4d555e3b7713ff892343f610e7d65c63549edb98c221"; + sha256 = "1ecea7a9dc48c099c06aab68aace7fdbded91a5522932882b1707c29fa055054"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix index 9f5c04adb265a..759467aa90244 100644 --- a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.1.0"; + version = "0.2.0"; pname = "azure-mgmt-apimanagement"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "06bqqkn5mx127x1z7ycm6rl8ajxlrmrm2kcdpgkbl4baii1x6iax"; + sha256 = "790f01c0b32583706b8b8c59667c0f5a51cd70444eee76474e23a598911e1d72"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index 76a0d71b1517a..0208d082284df 100644 --- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-applicationinsights"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1hm6s7vym1y072jqypjgbhps8lza1d5kb8qcpyxnw4zsmsvshdp5"; + sha256 = "3c788a54db4fbca1a8850151462ec1471ff59c86b3a10d6082952bbdaa7e6651"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix index 91936af014f5b..19be6d28e1707 100644 --- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "7.0.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "18dwgbwk1kc0pdqa85hbsm9312l50rf8ymb60fia1c9rni9bdi8n"; + sha256 = "228ea058361763a5a31273df7d813b9134d0ecff4567c533eb7e1afaf772fbc7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index 2dadb1d2cb816..c168147609855 100644 --- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "6.0.0"; + version = "6.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d03641336f4b2ec561112655c93ee80bc28d8e8daa45a57abc36169bd19c07a0"; + sha256 = "e0c4bbe656ababb942d708ee04f3f3305a2023e322a8b3fb1d8503aa682f59c4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 109c3b7774807..e78d93fb7bc19 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "11.1.0"; + version = "12.0.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "00ygppmlx21dxvb0swfdyhqf5xhi0zxy26abcgql02w0lklw91nj"; + sha256 = "0vzq93g2fpnij4rykkk3391xq2knhlbz87vhim4zvj8s45sx6z8q"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 20861a9efe3a6..d77d28479a1ac 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "9.0.0"; + version = "9.0.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "6f05948bbd19ceb894f46f037b77c54116183364a671e180c007b5737c8d4590"; + sha256 = "7e4459679bdba4aa67a4b5848e63d94e965a304a7418ef7607eb7a9ce295d886"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix new file mode 100644 index 0000000000000..b2737826ae32a --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -0,0 +1,36 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, azure-core +, isPy3k +}: + +buildPythonPackage rec { + version = "1.1.0"; + pname = "azure-mgmt-core"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "049dfb0bcc7961d0d988fee493d1ec4f4480e109e4661e360bad054cc297d43c"; + }; + + propagatedBuildInputs = [ + azure-core + ]; + + pythonNamespaces = "azure.mgmt"; + + # not included + doCheck = false; + + pythonImportsCheck = [ "azure.mgmt.core" "azure.core" ]; + + meta = with pkgs.lib; { + description = "Microsoft Azure Management Core Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index d3605e3929e71..61bc17df01480 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "0.12.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "07c0hr7nha9789x1wz0ndca0sr0zscq63m9vd8pm1c6y0ss4iyn5"; + sha256 = "692544dd2fa6276a7a4b4e094e2a5e0915d29b7829e266c6ade2b17a5fdcc2a9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix index c780d07c7ce14..1057322a8e6a5 100644 --- a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-eventhub"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "05c6isg13dslds94kv28v6navxj4bp4c5lsd9df0g3ndsxvpdrxp"; + sha256 = "c823a0ed879230a3ec9f15c32c9788610af1db56e6aeae6b2725476ddbe0d138"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix index 57ec64f3d5628..1e13919f340a2 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iothub"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f6fbb87d9bf29ce325543c9a3a125fbe45f4797f3a7f260c6c21ca60dc3f0885"; + sha256 = "da20ee2b9b9a2c2f89be9037c3ee5421152e7f6d718eafbf50a91dbf0a07ffa0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index c149d5ef6fa1e..eb4772ce54390 100644 --- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-loganalytics"; - version = "0.2.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c7315ff0ee4d618fb38dca68548ef4023a7a20ce00efe27eb2105a5426237d86"; + sha256 = "16f4c4f676ea718b7e1c59bd9a516fcfc796f1aff844b183a7ce9afe69fb214d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index fb3bd445b78ee..36124ff6baaf4 100644 --- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "09bhk6kpf1j1kgsyfdrfmfixrdj0iikx25dr1mh9dc6lci07i1cx"; + sha256 = "170jyr1qzwhv5ihyrsg5d8qzjylqmg31dscd31jzi4i7bwqf3sb8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 6bf207c6e4c50..42ebac80e677a 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.8.0"; + version = "0.10.0"; pname = "azure-mgmt-netapp"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0vbg5mpahrnnnbj80flgzxxiffic94wsc9srm4ir85y2j5rprpv7"; + sha256 = "380b2153c52a861ae9069fcd601cbaeb9a6f91c49cba823443a9b5fe461c3998"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 00480ac38bc21..24f7165281d43 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "10.0.0"; + version = "10.2.0"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3978da4641b3396d4a00c7ddd53d87ece7e7d45b5bc41a157639bdd2f2c5b9b3"; + sha256 = "d50c74cdc1c9be6861ddef9adffd3b05afc5a5092baf0209eea30f4439cba2d9"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix index 858bde7644029..7bee1f5856a78 100644 --- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-rdbms"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7826601507878e77f5d5cd805c6ad1d6483c375b545d5e9e1694b5a6c5e12fe3"; + sha256 = "1iz1pf28ajrzbq8nab1jbjbgfbv0g6ni036xayy6xylvga4l8czr"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index 5747881fd4eef..224f7971b3529 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservices"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e1e794760232239f8a9328d5de1740565ff70d1612a2921c9609746ba5671e6c"; + sha256 = "3c90e6b2e358dbe6d5c6d7204955bdf52c3e977c6f8b727cbbb8811427d7fd52"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix b/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix new file mode 100644 index 0000000000000..323aa26472ca5 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, msrest +, msrestazure +, azure-common +, isPy27 +}: + +buildPythonPackage rec { + version = "0.1.0"; + pname = "azure-mgmt-redhatopenshift"; + disabled = isPy27; # don't feel like fixing namespace issues on python2 + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ]; + + pythonNamespaces = "azure.mgmt"; + + # no included + doCheck = false; + + pythonImportsCheck = [ "azure.mgmt.redhatopenshift" ]; + + meta = with lib; { + description = "Microsoft Azure Red Hat Openshift Management Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index c418dca1ec712..81f8e15953dcd 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { - version = "8.0.1"; + version = "9.0.0"; pname = "azure-mgmt-resource"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0gngm7w17r5922ji11pnpa6gp5vh5z6la025v9cda6smsnx0fxx7"; + sha256 = "00bmdbr7hdwb3ibr9sfbgbmmr6626qlz19cdi84d87rcisczf4nw"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index e786731dcd0bc..e3ac0961542b3 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "9.0.0"; + version = "10.0.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "198r51av2rd1mr3q9j8jibhd14w0v8k59ipc3czsm4g1n44adgkl"; + sha256 = "d1edead1ad36e957c9f9b605f547ad1ff7152f8f785fa03d3c7891bb428a68ef"; }; propagatedBuildInputs = [ azure-mgmt-common ]; diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index 3b25c93a1bd1a..48f7296d99942 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "0.45.0"; + version = "0.46.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "04wdb7vksjhcvv0gkjjr37lmb5ads5pr00cjac8r3szimr64zspr"; + sha256 = "e1988aa2b91e6b5aa84e48ac02d5546945bdc2d8331744869e923ba15066c4a6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index 677b8bbeb124f..d10045b41d781 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -1,20 +1,28 @@ { lib, python, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-core , msrest , msrestazure +, requests }: buildPythonPackage rec { - version = "0.2.4"; + version = "0.3.2"; pname = "azure-multiapi-storage"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0zqapc4dx6qd9bcim5fjykk3n1j84p85nwqyb876nb7qmqx9spig"; + sha256 = "c403a47e40e4a80d9c42c854993f5c07f12c2a75bd9a85ba8225985493a9b792"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-core + msrest + msrestazure + requests + ]; # fix namespace pythonNamespaces = [ "azure.multiapi" ]; diff --git a/pkgs/development/python-modules/azure-servicefabric/default.nix b/pkgs/development/python-modules/azure-servicefabric/default.nix index 19420b0526d91..ad89f23c3c292 100644 --- a/pkgs/development/python-modules/azure-servicefabric/default.nix +++ b/pkgs/development/python-modules/azure-servicefabric/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-servicefabric"; - version = "7.0.0.0"; + version = "7.1.0.45"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "27712658fed7f5db6965d1035bbc0f3b16964fc88d6f3ad3e86cf4fae2b01bb9"; + sha256 = "8dd0eb419ca62f2436c31982f6d236868f15f65bb062c4e5a98e50b16298dcda"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure/default.nix b/pkgs/development/python-modules/azure/default.nix deleted file mode 100644 index 0a2e733ea1ad4..0000000000000 --- a/pkgs/development/python-modules/azure/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ pkgs -, buildPythonPackage -, fetchPypi -, dateutil -, futures -, pyopenssl -, requests -, isPy3k -}: - -buildPythonPackage rec { - version = "4.0.0"; - pname = "azure"; - - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "7d6afa332fccffe1a9390bcfac5122317eec657c6029f144d794603a81cd0e50"; - }; - - propagatedBuildInputs = [ dateutil pyopenssl requests ] - ++ pkgs.lib.optionals (!isPy3k) [ futures ]; - - # depends on futures for python 3 (not necissary) - patchPhase = if (!isPy3k) then "" else '' - sed -i -e "s/'futures'//" setup.py - ''; - - # tests are not packaged in pypi release - doCheck = false; - - meta = with pkgs.lib; { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; - broken = true; # this should propagate over 70 azure packages, many of which are not added yet - }; -} diff --git a/pkgs/development/python-modules/babelfish/default.nix b/pkgs/development/python-modules/babelfish/default.nix index c8245a15c7f03..87769aa3ea913 100644 --- a/pkgs/development/python-modules/babelfish/default.nix +++ b/pkgs/development/python-modules/babelfish/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/babelfish; + homepage = "https://pypi.python.org/pypi/babelfish"; description = "A module to work with countries and languages"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/backcall/default.nix b/pkgs/development/python-modules/backcall/default.nix index 2eb44cb36245b..f1951a13d78df 100644 --- a/pkgs/development/python-modules/backcall/default.nix +++ b/pkgs/development/python-modules/backcall/default.nix @@ -21,8 +21,8 @@ buildPythonPackage rec { meta = { description = "Specifications for callback functions passed in to an API"; - homepage = https://github.com/takluyver/backcall; + homepage = "https://github.com/takluyver/backcall"; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/backports-shutil-which/default.nix b/pkgs/development/python-modules/backports-shutil-which/default.nix index 1b8b8f2ba47e1..656842f4434d2 100644 --- a/pkgs/development/python-modules/backports-shutil-which/default.nix +++ b/pkgs/development/python-modules/backports-shutil-which/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Backport of shutil.which from Python 3.3"; - homepage = https://github.com/minrk/backports.shutil_which; + homepage = "https://github.com/minrk/backports.shutil_which"; license = licenses.psfl; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/backports_abc/default.nix b/pkgs/development/python-modules/backports_abc/default.nix index ab34d376de081..d67117613d7fa 100644 --- a/pkgs/development/python-modules/backports_abc/default.nix +++ b/pkgs/development/python-modules/backports_abc/default.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/cython/backports_abc; + homepage = "https://github.com/cython/backports_abc"; license = lib.licenses.psfl; description = "A backport of recent additions to the 'collections.abc' module"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/backports_csv/default.nix b/pkgs/development/python-modules/backports_csv/default.nix index ce5d15c212a10..e2fae4897f62d 100644 --- a/pkgs/development/python-modules/backports_csv/default.nix +++ b/pkgs/development/python-modules/backports_csv/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Backport of Python 3 csv module"; - homepage = https://github.com/ryanhiebert; + homepage = "https://github.com/ryanhiebert"; license = licenses.psfl; }; } diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index 8cb84c02b3792..79e11ecae4f74 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "Backport of functools.lru_cache"; - homepage = https://github.com/jaraco/backports.functools_lru_cache; + homepage = "https://github.com/jaraco/backports.functools_lru_cache"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/backports_lzma/default.nix b/pkgs/development/python-modules/backports_lzma/default.nix index 997e4930ac7c7..1ebae86dec991 100644 --- a/pkgs/development/python-modules/backports_lzma/default.nix +++ b/pkgs/development/python-modules/backports_lzma/default.nix @@ -29,7 +29,7 @@ if !(pythonOlder "3.3") then null else buildPythonPackage rec { meta = { description = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files"; - homepage = https://github.com/peterjc/backports.lzma; + homepage = "https://github.com/peterjc/backports.lzma"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/backports_os/default.nix b/pkgs/development/python-modules/backports_os/default.nix index 9d0ddc2cad9a5..dc969cbb4b943 100644 --- a/pkgs/development/python-modules/backports_os/default.nix +++ b/pkgs/development/python-modules/backports_os/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pjdelport/backports.os; + homepage = "https://github.com/pjdelport/backports.os"; description = "Backport of new features in Python's os module"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix index 1436574797108..34a7ddefa47f2 100644 --- a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix +++ b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix @@ -28,7 +28,7 @@ if !(pythonOlder "3.3") then null else buildPythonPackage { meta = with lib; { description = "A backport of the get_terminal_size function from Python 3.3’s shutil."; - homepage = https://github.com/chrippa/backports.shutil_get_terminal_size; + homepage = "https://github.com/chrippa/backports.shutil_get_terminal_size"; license = with licenses; [ mit ]; maintainers = with maintainers; [ timokau ]; }; diff --git a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix b/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix index 013fe9f446ff6..d6fecfbdfb91f 100644 --- a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix +++ b/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with lib; { description = "The Secure Sockets layer is only actually *secure*"; - homepage = https://bitbucket.org/brandon/backports.ssl_match_hostname; + homepage = "https://bitbucket.org/brandon/backports.ssl_match_hostname"; license = licenses.psfl; }; } diff --git a/pkgs/development/python-modules/backports_tempfile/default.nix b/pkgs/development/python-modules/backports_tempfile/default.nix index c2dbb0e6fa808..cc51e23260b83 100644 --- a/pkgs/development/python-modules/backports_tempfile/default.nix +++ b/pkgs/development/python-modules/backports_tempfile/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { meta = { description = "Backport of new features in Python's tempfile module"; license = lib.licenses.psfl; - homepage = https://github.com/pjdelport/backports.tempfile; + homepage = "https://github.com/pjdelport/backports.tempfile"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/backports_unittest-mock/default.nix b/pkgs/development/python-modules/backports_unittest-mock/default.nix index 57d2cad281ec6..a55eeff511fe9 100644 --- a/pkgs/development/python-modules/backports_unittest-mock/default.nix +++ b/pkgs/development/python-modules/backports_unittest-mock/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Provides a function install() which makes the mock module"; - homepage = https://github.com/jaraco/backports.unittest_mock; + homepage = "https://github.com/jaraco/backports.unittest_mock"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix index e0492a7d1c440..fd63294302c3c 100644 --- a/pkgs/development/python-modules/bap/default.nix +++ b/pkgs/development/python-modules/bap/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages."; - homepage = https://github.com/BinaryAnalysisPlatform/bap/; + homepage = "https://github.com/BinaryAnalysisPlatform/bap/"; maintainers = [ maintainers.maurer ]; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/base58/default.nix b/pkgs/development/python-modules/base58/default.nix index aafd73b8d8d5b..8f26a3340a7a2 100644 --- a/pkgs/development/python-modules/base58/default.nix +++ b/pkgs/development/python-modules/base58/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Base58 and Base58Check implementation"; - homepage = https://github.com/keis/base58; + homepage = "https://github.com/keis/base58"; license = licenses.mit; maintainers = with maintainers; [ nyanloutre ]; }; diff --git a/pkgs/development/python-modules/baselines/default.nix b/pkgs/development/python-modules/baselines/default.nix index 56a60de59793e..66972dc8b2392 100644 --- a/pkgs/development/python-modules/baselines/default.nix +++ b/pkgs/development/python-modules/baselines/default.nix @@ -57,7 +57,7 @@ buildPythonPackage { meta = with lib; { description = "High-quality implementations of reinforcement learning algorithms"; - homepage = https://github.com/openai/baselines; + homepage = "https://github.com/openai/baselines"; license = licenses.mit; maintainers = with maintainers; [ timokau ]; }; diff --git a/pkgs/development/python-modules/bashlex/default.nix b/pkgs/development/python-modules/bashlex/default.nix index c575dc516ffee..8e29eed2acfd0 100644 --- a/pkgs/development/python-modules/bashlex/default.nix +++ b/pkgs/development/python-modules/bashlex/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python parser for bash"; license = licenses.gpl3; - homepage = https://github.com/idank/bashlex; + homepage = "https://github.com/idank/bashlex"; maintainers = with maintainers; [ multun ]; }; } diff --git a/pkgs/development/python-modules/basiciw/default.nix b/pkgs/development/python-modules/basiciw/default.nix index 0d25d7cdbe98c..8ae4a59cfb471 100644 --- a/pkgs/development/python-modules/basiciw/default.nix +++ b/pkgs/development/python-modules/basiciw/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "Get info about wireless interfaces using libiw"; - homepage = https://github.com/enkore/basiciw; + homepage = "https://github.com/enkore/basiciw"; platforms = lib.platforms.linux; license = lib.licenses.gpl2; }; diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix index 001c3cc19a5ef..63aa7883e3a90 100644 --- a/pkgs/development/python-modules/batchgenerators/default.nix +++ b/pkgs/development/python-modules/batchgenerators/default.nix @@ -1,30 +1,36 @@ { lib , buildPythonPackage , isPy27 -, fetchPypi +, fetchFromGitHub , pytest , unittest2 , future , numpy +, pillow , scipy , scikitlearn , scikitimage , threadpoolctl }: - buildPythonPackage rec { pname = "batchgenerators"; - version = "0.19.7"; + version = "0.20.0"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "0qqzwqf5r0q6jh8avz4f9kf8x96crvdnkznhf24pbm0faf8yk67q"; + src = fetchFromGitHub { + owner = "MIC-DKFZ"; + repo = pname; + rev = "v${version}"; + sha256 = "0cc3i4wznqb7lk8n6jkprvkpsby6r7khkxqwn75k8f01mxgjfpvf"; + }; - propagatedBuildInputs = [ future numpy scipy scikitlearn scikitimage threadpoolctl ]; + propagatedBuildInputs = [ + future numpy pillow scipy scikitlearn scikitimage threadpoolctl + ]; + checkInputs = [ pytest unittest2 ]; checkPhase = "pytest tests"; diff --git a/pkgs/development/python-modules/batinfo/default.nix b/pkgs/development/python-modules/batinfo/default.nix index 3e21fae1de66a..57dfd5062c161 100644 --- a/pkgs/development/python-modules/batinfo/default.nix +++ b/pkgs/development/python-modules/batinfo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/nicolargo/batinfo; + homepage = "https://github.com/nicolargo/batinfo"; description = "A simple Python lib to retrieve battery information"; license = licenses.lgpl3; platforms = platforms.all; diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index b1cf349593427..0532e0e022ef5 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://www.bayespy.org; + homepage = "http://www.bayespy.org"; description = "Variational Bayesian inference tools for Python"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index c32fefbbdfecb..2468eaccecdbf 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { maintainers = with maintainers; [ domenkozar ]; description = "Modern password hashing for your software and your servers"; license = licenses.asl20; - homepage = https://github.com/pyca/bcrypt/; + homepage = "https://github.com/pyca/bcrypt/"; }; } diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 9405e3489d4f7..045dd14da0d83 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; meta = { - homepage = http://furius.ca/beancount/; + homepage = "http://furius.ca/beancount/"; description = "Double-entry bookkeeping computer language"; longDescription = '' A double-entry bookkeeping computer language that lets you define diff --git a/pkgs/development/python-modules/beanstalkc/default.nix b/pkgs/development/python-modules/beanstalkc/default.nix index e83a9f67789ca..c24e9a03d158a 100644 --- a/pkgs/development/python-modules/beanstalkc/default.nix +++ b/pkgs/development/python-modules/beanstalkc/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { description = "A simple beanstalkd client library for Python"; maintainers = with stdenv.lib.maintainers; [ aanderse ]; license = with stdenv.lib.licenses; [ asl20 ]; - homepage = https://github.com/earl/beanstalkc; + homepage = "https://github.com/earl/beanstalkc"; }; } diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index 1720738b169b2..fc07c4ae96e9b 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ soupsieve ]; meta = with stdenv.lib; { - homepage = http://crummy.com/software/BeautifulSoup/bs4/; + homepage = "http://crummy.com/software/BeautifulSoup/bs4/"; description = "HTML and XML parser"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/bedup/default.nix b/pkgs/development/python-modules/bedup/default.nix index 13aa48f7f8f34..6c0c3c44d2d4e 100644 --- a/pkgs/development/python-modules/bedup/default.nix +++ b/pkgs/development/python-modules/bedup/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { on disk. It integrates deeply with btrfs so that scans are incremental and low-impact. ''; - homepage = https://github.com/g2p/bedup; + homepage = "https://github.com/g2p/bedup"; license = licenses.gpl2; maintainers = with maintainers; [ bluescreen303 ]; }; diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 6d0364676f9a9..fbe108e2a02ec 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { patches = [ # Fix tests on Python 2.7 (fetchpatch { - url = https://github.com/behave/behave/commit/0a9430a94881cd18437deb03d2ae23afea0f009c.patch; + url = "https://github.com/behave/behave/commit/0a9430a94881cd18437deb03d2ae23afea0f009c.patch"; sha256 = "1nrh9ii6ik6gw2kjh8a6jk4mg5yqw3jfjfllbyxardclsab62ydy"; }) ]; @@ -44,7 +44,7 @@ buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/behave/behave; + homepage = "https://github.com/behave/behave"; description = "behaviour-driven development, Python style"; license = licenses.bsd2; maintainers = with maintainers; [ alunduil ]; diff --git a/pkgs/development/python-modules/betamax-matchers/default.nix b/pkgs/development/python-modules/betamax-matchers/default.nix index 762154ac45d26..e95a34d154242 100644 --- a/pkgs/development/python-modules/betamax-matchers/default.nix +++ b/pkgs/development/python-modules/betamax-matchers/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ betamax requests_toolbelt ]; meta = with stdenv.lib; { - homepage = https://github.com/sigmavirus24/betamax_matchers; + homepage = "https://github.com/sigmavirus24/betamax_matchers"; description = "A group of experimental matchers for Betamax"; license = licenses.asl20; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/python-modules/betamax-serializers/default.nix b/pkgs/development/python-modules/betamax-serializers/default.nix index 41341c24481b8..60a79a51d4999 100644 --- a/pkgs/development/python-modules/betamax-serializers/default.nix +++ b/pkgs/development/python-modules/betamax-serializers/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ betamax pyyaml ]; meta = with stdenv.lib; { - homepage = https://gitlab.com/betamax/serializers; + homepage = "https://gitlab.com/betamax/serializers"; description = "A set of third-party serializers for Betamax"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/betamax/default.nix b/pkgs/development/python-modules/betamax/default.nix index 8051ed0beff5e..7339fcbf6485b 100644 --- a/pkgs/development/python-modules/betamax/default.nix +++ b/pkgs/development/python-modules/betamax/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://betamax.readthedocs.org/en/latest/; + homepage = "https://betamax.readthedocs.org/en/latest/"; description = "A VCR imitation for requests"; license = licenses.asl20; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/python-modules/bibtexparser/default.nix b/pkgs/development/python-modules/bibtexparser/default.nix index 849b6e8b240a4..d69b2d6ce4ca0 100644 --- a/pkgs/development/python-modules/bibtexparser/default.nix +++ b/pkgs/development/python-modules/bibtexparser/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Bibtex parser for python 2.7 and 3.3 and newer"; - homepage = https://github.com/sciunto-org/python-bibtexparser; + homepage = "https://github.com/sciunto-org/python-bibtexparser"; license = with lib.licenses; [ gpl3 bsd3 ]; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index e96e59dd7cf96..e29263a6b4f95 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "bidict"; - version = "0.18.3"; + version = "0.19.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1742a25a9ef1b1ac4000683406879a3e1a6577faa02f31e482e6c84e2e3bf628"; + sha256 = "11wiis62kcw6g3n4gdj39fx1yrlq5vz3zx3kmb6g79mliyhn2x7g"; }; nativeBuildInputs = [ setuptools_scm ]; @@ -36,7 +36,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/jab/bidict; + homepage = "https://github.com/jab/bidict"; description = "Efficient, Pythonic bidirectional map data structures and related functionality"; license = licenses.mpl20; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 6b7bad58bc4c6..56a941e60e099 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.3.12"; + version = "1.5.1"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "7a244b09adfd083292ed1f7ff335676a1e2effbbffe62b02a4abaf377d33ef86"; + sha256 = "1fy8w56m0x546zjk3is1xp83jm19fkn4y15g5jgmq29sfzc8n3y3"; }; propagatedBuildInputs = [ ]; diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 91624210bb566..5bccf79245257 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/celery/billiard; + homepage = "https://github.com/celery/billiard"; description = "Python multiprocessing fork with improvements and bugfixes"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/binaryornot/default.nix b/pkgs/development/python-modules/binaryornot/default.nix index 77f1ff7cbd09a..103bd79294e65 100644 --- a/pkgs/development/python-modules/binaryornot/default.nix +++ b/pkgs/development/python-modules/binaryornot/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis ]; meta = with lib; { - homepage = https://github.com/audreyr/binaryornot; + homepage = "https://github.com/audreyr/binaryornot"; description = "Ultra-lightweight pure Python package to check if a file is binary or text"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index 97c6b957a437c..e8a20b6df47d7 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -7,7 +7,6 @@ , gzip , bzip2 , gnutar -, p7zip , cabextract , lzma , nose @@ -29,7 +28,7 @@ buildPythonPackage { sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; }; - propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma pycrypto ] + propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar cabextract lzma pycrypto ] ++ stdenv.lib.optional visualizationSupport pyqtgraph; # setup.py only installs version.py during install, not test diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index 727687c5e7090..76de4c3905460 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { applications which address the needs of current and future work in bioinformatics. ''; - homepage = https://biopython.org/wiki/Documentation; + homepage = "https://biopython.org/wiki/Documentation"; maintainers = with lib.maintainers; [ luispedro ]; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index d89ab9c3107ce..2036d4dba4bd5 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -1,17 +1,18 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.2.1"; pname = "bitarray"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "1kxrlxfj9nrx512sfwifwl9z4v6ky3qschl0zmk3s3dvc3s7bmif"; + sha256 = "0m29k3lq37v53pczyr2d5mr3xdh2kv31g2yfnfx8m1ivxvy9z9i7"; }; meta = with lib; { description = "Efficient arrays of booleans"; - homepage = https://github.com/ilanschnell/bitarray; + homepage = "https://github.com/ilanschnell/bitarray"; + changelog = "https://github.com/ilanschnell/bitarray/blob/master/CHANGE_LOG"; license = licenses.psfl; maintainers = [ maintainers.bhipple ]; }; diff --git a/pkgs/development/python-modules/bitbucket-api/default.nix b/pkgs/development/python-modules/bitbucket-api/default.nix index 0d1ac109179b3..82b49a2675740 100644 --- a/pkgs/development/python-modules/bitbucket-api/default.nix +++ b/pkgs/development/python-modules/bitbucket-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/Sheeprider/BitBucket-api; + homepage = "https://github.com/Sheeprider/BitBucket-api"; description = "Python library to interact with BitBucket REST API"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/bitbucket-cli/default.nix b/pkgs/development/python-modules/bitbucket-cli/default.nix index 0a54c0ed17c38..5e5d5662ba320 100644 --- a/pkgs/development/python-modules/bitbucket-cli/default.nix +++ b/pkgs/development/python-modules/bitbucket-cli/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Bitbucket command line interface"; - homepage = https://bitbucket.org/zhemao/bitbucket-cli; + homepage = "https://bitbucket.org/zhemao/bitbucket-cli"; maintainers = with maintainers; [ refnil ]; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/bitcoin-price-api/default.nix b/pkgs/development/python-modules/bitcoin-price-api/default.nix index d9ddc84264263..3e74c17f3be86 100644 --- a/pkgs/development/python-modules/bitcoin-price-api/default.nix +++ b/pkgs/development/python-modules/bitcoin-price-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/dursk/bitcoin-price-api; + homepage = "https://github.com/dursk/bitcoin-price-api"; description = "Price APIs for bitcoin exchanges"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ bhipple ]; diff --git a/pkgs/development/python-modules/bitmath/default.nix b/pkgs/development/python-modules/bitmath/default.nix index 092ad6c100354..55194b02db3a0 100644 --- a/pkgs/development/python-modules/bitmath/default.nix +++ b/pkgs/development/python-modules/bitmath/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Module for representing and manipulating file sizes with different prefix"; - homepage = https://github.com/tbielawa/bitmath; + homepage = "https://github.com/tbielawa/bitmath"; license = licenses.mit; maintainers = with maintainers; [ twey ]; }; diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix index 3e546d3869781..aff3f70cb88ae 100644 --- a/pkgs/development/python-modules/bitstruct/default.nix +++ b/pkgs/development/python-modules/bitstruct/default.nix @@ -2,15 +2,15 @@ buildPythonPackage rec { pname = "bitstruct"; - version = "8.8.1"; + version = "8.10.0"; src = fetchPypi { inherit pname version; - sha256 = "84893f90eb78f8179af24a87622ef964ede5c7e785562022917033987d6ce198"; + sha256 = "0dncll29a0lx8hn1xlhr32abkvj1rh8xa6gc0aas8wnqzh7bvqqm"; }; meta = with lib; { - homepage = https://github.com/eerimoq/bitstruct; + homepage = "https://github.com/eerimoq/bitstruct"; description = "Python bit pack/unpack package"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix index 08caabef3bdfc..c2f60fce9dc5f 100644 --- a/pkgs/development/python-modules/bjoern/default.nix +++ b/pkgs/development/python-modules/bjoern/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/jonashaag/bjoern; + homepage = "https://github.com/jonashaag/bjoern"; description = "A screamingly fast Python 2/3 WSGI server written in C"; license = licenses.bsd2; maintainers = with maintainers; [ cmcdragonkai ]; diff --git a/pkgs/development/python-modules/bkcharts/default.nix b/pkgs/development/python-modules/bkcharts/default.nix index 270015a423ba3..9e105c09d57bc 100644 --- a/pkgs/development/python-modules/bkcharts/default.nix +++ b/pkgs/development/python-modules/bkcharts/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "High level chart types built on top of Bokeh"; - homepage = https://github.com/bokeh/bkcharts; + homepage = "https://github.com/bokeh/bkcharts"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 315e891030ed8..997f20e137db0 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "The uncompromising Python code formatter"; - homepage = https://github.com/ambv/black; + homepage = "https://github.com/psf/black"; license = licenses.mit; maintainers = with maintainers; [ sveitser ]; }; diff --git a/pkgs/development/python-modules/blaze/default.nix b/pkgs/development/python-modules/blaze/default.nix index b3c56a618e8e0..0707c431f1b4f 100644 --- a/pkgs/development/python-modules/blaze/default.nix +++ b/pkgs/development/python-modules/blaze/default.nix @@ -63,9 +63,9 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/ContinuumIO/blaze; + homepage = "https://github.com/ContinuumIO/blaze"; description = "Allows Python users a familiar interface to query data living in other data storage systems"; license = lib.licenses.bsdOriginal; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 1033f9def76c2..d8760d2e12833 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -42,8 +42,8 @@ buildPythonPackage rec { to do lots of things, you're probably outside the use cases. Either trust those users, or don't. ''; - homepage = https://github.com/mozilla/bleach; - downloadPage = https://github.com/mozilla/bleach/releases; + homepage = "https://github.com/mozilla/bleach"; + downloadPage = "https://github.com/mozilla/bleach/releases"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ prikhi ]; }; diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix new file mode 100644 index 0000000000000..559fd33e8eb06 --- /dev/null +++ b/pkgs/development/python-modules/bleak/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchPypi, bluez, txdbus, pytest, pytestcov }: + +buildPythonPackage rec { + pname = "bleak"; + version = "0.6.2"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1kmq2z3dhq6dd20i5w71gshjrfvyw0pkpnld8iib9ai2rz6a8aj0"; + }; + + postPatch = '' + # bleak checks BlueZ's version with a call to `bluetoothctl -v` twice + substituteInPlace bleak/__init__.py \ + --replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\" + substituteInPlace bleak/backends/bluezdbus/client.py \ + --replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\" + ''; + + propagatedBuildInputs = [ txdbus ]; + checkInputs = [ pytest pytestcov ]; + + checkPhase = "AGENT_OS=linux py.test"; + + meta = with stdenv.lib; { + description = "Bluetooth Low Energy platform Agnostic Klient for Python"; + homepage = "https://github.com/hbldh/bleak"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ geistesk ]; + }; +} diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index 164848aeac93e..76394c5f85aff 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -5,12 +5,12 @@ let fixTestSuiteFailure_1 = fetchpatch { - url = https://github.com/jquast/blessed/pull/108/commits/76a54d39b0f58bfc71af04ee143459eefb0e1e7b.patch; + url = "https://github.com/jquast/blessed/pull/108/commits/76a54d39b0f58bfc71af04ee143459eefb0e1e7b.patch"; sha256 = "1higmv4c03ly7ywac1d7s71f3hrl531vj16nsfl9xh6zh9c47qcg"; }; fixTestSuiteFailure_2 = fetchpatch { - url = https://github.com/jquast/blessed/pull/108/commits/aa94e01aed745715e667601fb674844b257cfcc9.patch; + url = "https://github.com/jquast/blessed/pull/108/commits/aa94e01aed745715e667601fb674844b257cfcc9.patch"; sha256 = "1frygr6sc1vakdfx1hf6jj0dbwibiqz8hw9maf1b605cbslc9nay"; }; @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ wcwidth six ]; meta = with stdenv.lib; { - homepage = https://github.com/jquast/blessed; + homepage = "https://github.com/jquast/blessed"; description = "A thin, practical wrapper around terminal capabilities in Python."; maintainers = with maintainers; [ eqyiel ]; license = licenses.mit; diff --git a/pkgs/development/python-modules/blessings/default.nix b/pkgs/development/python-modules/blessings/default.nix index 23e9067ea33ca..c285b3a7d0038 100644 --- a/pkgs/development/python-modules/blessings/default.nix +++ b/pkgs/development/python-modules/blessings/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/erikrose/blessings; + homepage = "https://github.com/erikrose/blessings"; description = "A thin, practical wrapper around terminal coloring, styling, and positioning"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix index 441d1250e0a81..5c76efb029fd0 100644 --- a/pkgs/development/python-modules/blinker/default.nix +++ b/pkgs/development/python-modules/blinker/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://pythonhosted.org/blinker/; + homepage = "https://pythonhosted.org/blinker/"; description = "Fast, simple object-to-object and broadcast signaling"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/blinkstick/default.nix b/pkgs/development/python-modules/blinkstick/default.nix index 96f7bfebdeb83..5e7cd42362dc7 100644 --- a/pkgs/development/python-modules/blinkstick/default.nix +++ b/pkgs/development/python-modules/blinkstick/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { patches = [ (fetchpatch { - url = https://github.com/arvydas/blinkstick-python/commit/a9227d0.patch; + url = "https://github.com/arvydas/blinkstick-python/commit/a9227d0.patch"; sha256 = "1mcmxlnkbfxwp84qz32l5rlc7r9anh9yhnqaj1y8rny5s13jb01f"; }) (fetchpatch { - url = https://github.com/arvydas/blinkstick-python/pull/54.patch; + url = "https://github.com/arvydas/blinkstick-python/pull/54.patch"; sha256 = "1gjq6xbai794bbdyrv82i96l1a7qkwvlhzd6sa937dy5ivv6s6hl"; }) ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to control BlinkStick USB devices"; - homepage = https://pypi.python.org/pypi/BlinkStick/; + homepage = "https://pypi.python.org/pypi/BlinkStick/"; license = licenses.bsd3; maintainers = with maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index ca6d5d62442f0..596545093a982 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "BLAS-like linear algebra library"; - homepage = https://github.com/explosion/cython-blis; + homepage = "https://github.com/explosion/cython-blis"; license = licenses.bsd3; maintainers = with maintainers; [ danieldk ]; }; diff --git a/pkgs/development/python-modules/blist/default.nix b/pkgs/development/python-modules/blist/default.nix index 90a4b99cda33f..52687bf2506de 100644 --- a/pkgs/development/python-modules/blist/default.nix +++ b/pkgs/development/python-modules/blist/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = http://stutzbachenterprises.com/blist/; + homepage = "http://stutzbachenterprises.com/blist/"; description = "A list-like type with better asymptotic performance and similar performance on small lists"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 4b96e86193d81..f3efba1f378fa 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -37,7 +37,7 @@ in buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://fedoraproject.org/wiki/Blivet; + homepage = "https://fedoraproject.org/wiki/Blivet"; description = "Module for management of a system's storage configuration"; license = with licenses; [ gpl2Plus lgpl21Plus ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index f6bd3178bba53..f80c8a8c145f0 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Integrate Bitcoin, Dogecoin and Litecoin in your Python applications using block.io"; - homepage = https://github.com/BlockIo/block_io-python; + homepage = "https://github.com/BlockIo/block_io-python"; license = licenses.mit; maintainers = with maintainers; [ nyanloutre ]; }; diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix index 7b67997fa08a1..ceaa31874ecbc 100644 --- a/pkgs/development/python-modules/blockdiag/default.nix +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Generate block-diagram image from spec-text file (similar to Graphviz)"; - homepage = http://blockdiag.com/; + homepage = "http://blockdiag.com/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/bluepy/default.nix b/pkgs/development/python-modules/bluepy/default.nix new file mode 100644 index 0000000000000..8d247b41d277f --- /dev/null +++ b/pkgs/development/python-modules/bluepy/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pkg-config +, glib +}: + +buildPythonPackage rec { + pname = "bluepy"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1v0wjy1rz0rbwghr1z3xhdm06lqn9iig6vr5j2wmymh3w6pysw9a"; + }; + + buildInputs = [ glib ]; + nativeBuildInputs = [ pkg-config ]; + + # tests try to access hardware + checkPhase = '' + $out/bin/blescan --help > /dev/null + $out/bin/sensortag --help > /dev/null + $out/bin/thingy52 --help > /dev/null + ''; + pythonImportsCheck = [ "bluepy" ]; + + meta = with stdenv.lib; { + description = "Python interface to Bluetooth LE on Linux"; + homepage = "https://github.com/IanHarvey/bluepy"; + maintainers = with maintainers; [ georgewhewell ]; + license = licenses.gpl2; + }; + +} diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 18f59b0528873..7157cf1409675 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { meta = { description = "Statistical and novel interactive HTML plots for Python"; - homepage = https://github.com/bokeh/bokeh; + homepage = "https://github.com/bokeh/bokeh"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ orivej ]; }; diff --git a/pkgs/development/python-modules/boto/default.nix b/pkgs/development/python-modules/boto/default.nix index 8452e05beccf2..85ebae5b612fa 100644 --- a/pkgs/development/python-modules/boto/default.nix +++ b/pkgs/development/python-modules/boto/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests httpretty ]; meta = with pkgs.lib; { - homepage = https://github.com/boto/boto; + homepage = "https://github.com/boto/boto"; license = licenses.mit; description = "Python interface to Amazon Web Services"; longDescription = '' diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 58af27fe4395b..4bbb98d6a2991 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/boto/boto3; + homepage = "https://github.com/boto/boto3"; license = lib.licenses.asl20; description = "AWS SDK for Python"; longDescription = '' diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 8bf6b4eff7e2a..b7061eb0a1de5 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/boto/botocore; + homepage = "https://github.com/boto/botocore"; license = "bsd"; description = "A low-level interface to a growing number of Amazon Web Services"; }; diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index c0de6eecae9f0..5fda85dc972b7 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; meta = with stdenv.lib; { - homepage = http://bottlepy.org; + homepage = "http://bottlepy.org"; description = "A fast and simple micro-framework for small web-applications"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/python-modules/box2d/default.nix b/pkgs/development/python-modules/box2d/default.nix index 5870bdcdb7327..1b372f90a90f2 100644 --- a/pkgs/development/python-modules/box2d/default.nix +++ b/pkgs/development/python-modules/box2d/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/pybox2d/pybox2d; + homepage = "https://github.com/pybox2d/pybox2d"; description = '' A 2D game physics library for Python under the very liberal zlib license diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index f4d09ca5e5ed6..8e8c89e7f59e5 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "4.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1m8z0ig40xmgcnmf508nflyy1w4qmff4kqxarrpg7rvsfj4pjsmh"; + sha256 = "1fqh1bdkk3g222vbrmw3ab4r4mmd1k4x2jayshnqpbspszcqzcdq"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index 447a5230c7f3f..95ba6d537c37b 100644 --- a/pkgs/development/python-modules/branca/default.nix +++ b/pkgs/development/python-modules/branca/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "Generate complex HTML+JS pages with Python"; - homepage = https://github.com/python-visualization/branca; + homepage = "https://github.com/python-visualization/branca"; license = with lib.licenses; [ mit ]; }; } diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index c088199fda7b0..842c8289f777c 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: buildPythonPackage rec { - version = "4.14.1"; + version = "4.14.2"; pname = "breathe"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1ia9iq3kk0g8cqcsf03di3cnq295gfixriqfpp9wd38zf2wgq0l1"; + sha256 = "1vj2yylff07hh4l3sh3srhpnrk1q6pxznvwqzgmbplhn8gf5rimb"; }; propagatedBuildInputs = [ docutils six sphinx ]; @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = !isPy3k; meta = { - homepage = https://github.com/michaeljones/breathe; + homepage = "https://github.com/michaeljones/breathe"; license = lib.licenses.bsd3; description = "Sphinx Doxygen renderer"; inherit (sphinx.meta) platforms; diff --git a/pkgs/development/python-modules/broadlink/default.nix b/pkgs/development/python-modules/broadlink/default.nix index 99d7641c07ebb..971b56d8b8856 100644 --- a/pkgs/development/python-modules/broadlink/default.nix +++ b/pkgs/development/python-modules/broadlink/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for controlling Broadlink IR controllers"; - homepage = https://github.com/mjg59/python-broadlink; + homepage = "https://github.com/mjg59/python-broadlink"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index bec205676bae3..0da53ab5ca221 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/google/brotli; + homepage = "https://github.com/google/brotli"; description = "Generic-purpose lossless compression algorithm"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index 13eea3e21fd4e..909641a9ffdff 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Loads cookies from your browser into a cookiejar object"; maintainers = with maintainers; [ borisbabic ]; - homepage = https://github.com/borisbabic/browser_cookie3; + homepage = "https://github.com/borisbabic/browser_cookie3"; license = licenses.gpl3; }; } diff --git a/pkgs/development/python-modules/browsermob-proxy/default.nix b/pkgs/development/python-modules/browsermob-proxy/default.nix index b5da73a32d21e..68668fce0794e 100644 --- a/pkgs/development/python-modules/browsermob-proxy/default.nix +++ b/pkgs/development/python-modules/browsermob-proxy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "A library for interacting with Browsermob Proxy"; - homepage = http://oss.theautomatedtester.co.uk/browsermob-proxy-py; + homepage = "http://oss.theautomatedtester.co.uk/browsermob-proxy-py"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix index 7a541a479527c..39ffaae653849 100644 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ b/pkgs/development/python-modules/bsddb3/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for Oracle Berkeley DB"; - homepage = https://www.jcea.es/programacion/pybsddb.htm; + homepage = "https://www.jcea.es/programacion/pybsddb.htm"; license = with licenses; [ agpl3 ]; # License changed from bsd3 to agpl3 since 6.x maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/bt-proximity/default.nix b/pkgs/development/python-modules/bt-proximity/default.nix index f998ebca06d9c..17f384062482e 100644 --- a/pkgs/development/python-modules/bt-proximity/default.nix +++ b/pkgs/development/python-modules/bt-proximity/default.nix @@ -20,7 +20,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Bluetooth Proximity Detection using Python"; - homepage = https://github.com/FrederikBolding/bluetooth-proximity; + homepage = "https://github.com/FrederikBolding/bluetooth-proximity"; maintainers = with maintainers; [ peterhoeg ]; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 4b17b5046aa41..e51d0e75a0bbe 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Scalable persistent components"; - homepage = http://packages.python.org/BTrees; + homepage = "http://packages.python.org/BTrees"; license = licenses.zpl21; }; } diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix index 190598942c721..37c91127a2c8a 100644 --- a/pkgs/development/python-modules/bugwarrior/default.nix +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/ralphbean/bugwarrior; + homepage = "https://github.com/ralphbean/bugwarrior"; description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix index a342ac9994338..f40488511093d 100644 --- a/pkgs/development/python-modules/bugzilla/default.nix +++ b/pkgs/development/python-modules/bugzilla/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/python-bugzilla/python-bugzilla; + homepage = "https://github.com/python-bugzilla/python-bugzilla"; description = "Bugzilla XMLRPC access module"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index c1e19eb856008..c22b03f4fa160 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = http://www.reflectometry.org/danse/software.html; + homepage = "http://www.reflectometry.org/danse/software.html"; description = "Data fitting with bayesian uncertainty analysis"; maintainers = with maintainers; [ rprospero ]; license = licenses.publicDomain; diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index 693646c80a4db..e5a7584234caa 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ionrock/cachecontrol; + homepage = "https://github.com/ionrock/cachecontrol"; description = "Httplib2 caching for requests"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix index 3a3e6d1e6dd96..d25e2e963dc31 100644 --- a/pkgs/development/python-modules/cached-property/default.nix +++ b/pkgs/development/python-modules/cached-property/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "A decorator for caching properties in classes"; - homepage = https://github.com/pydanny/cached-property; + homepage = "https://github.com/pydanny/cached-property"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ ericsagnes ]; diff --git a/pkgs/development/python-modules/cachy/default.nix b/pkgs/development/python-modules/cachy/default.nix index e66bef51d03c9..278dd5a8ae60e 100644 --- a/pkgs/development/python-modules/cachy/default.nix +++ b/pkgs/development/python-modules/cachy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/sdispater/cachy; + homepage = "https://github.com/sdispater/cachy"; description = "Cachy provides a simple yet effective caching library"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/cadquery/default.nix b/pkgs/development/python-modules/cadquery/default.nix index 6f3632f743bea..886224d16918d 100644 --- a/pkgs/development/python-modules/cadquery/default.nix +++ b/pkgs/development/python-modules/cadquery/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy3k , pythonOlder + , pythonAtLeast , fetchFromGitHub , pyparsing , opencascade @@ -16,9 +17,12 @@ , libGLU , libX11 , six + , pytest + , makeFontsConf + , freefont_ttf }: -let +let pythonocc-core-cadquery = stdenv.mkDerivation { pname = "pythonocc-core-cadquery"; version = "0.18.2"; @@ -31,7 +35,7 @@ let sha256 = "07zmiiw74dyj4v0ar5vqkvk30wzcpjjzbi04nsdk5mnlzslmyi6c"; }; - nativeBuildInputs = [ + nativeBuildInputs = [ cmake swig ninja @@ -63,27 +67,34 @@ let in buildPythonPackage rec { pname = "cadquery"; - version = "2.0RC0"; - + version = "2.0"; + src = fetchFromGitHub { owner = "CadQuery"; repo = pname; rev = version; - sha256 = "1xgd00rih0gjcnlrf9s6r5a7ypjkzgf2xij2b6436i76h89wmir3"; + sha256 = "1n63b6cjjrdwdfmwq0zx1xabjnhndk9mgfkm4w7z9ardcfpvg84l"; }; - + buildInputs = [ opencascade ]; - + propagatedBuildInputs = [ pyparsing pythonocc-core-cadquery ]; - - # Build errors on 2.7 and >=3.8 (officially only supports 3.6 and 3.7). - disabled = !(isPy3k && (pythonOlder "3.8")); - + + FONTCONFIG_FILE = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; + + checkInputs = [ + pytest + ]; + + disabled = pythonOlder "3.6" || pythonAtLeast "3.8"; + meta = with lib; { description = "Parametric scripting language for creating and traversing CAD models"; homepage = "https://github.com/CadQuery/cadquery"; diff --git a/pkgs/development/python-modules/cairocffi/generic.nix b/pkgs/development/python-modules/cairocffi/generic.nix index cf1618a865b4a..ee795d80dcef9 100644 --- a/pkgs/development/python-modules/cairocffi/generic.nix +++ b/pkgs/development/python-modules/cairocffi/generic.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/SimonSapin/cairocffi; + homepage = "https://github.com/SimonSapin/cairocffi"; license = licenses.bsd3; maintainers = with maintainers; []; description = "cffi-based cairo bindings for Python"; diff --git a/pkgs/development/python-modules/cairosvg/1_x.nix b/pkgs/development/python-modules/cairosvg/1_x.nix index b6d40a5fdb708..b98fbbf91e860 100644 --- a/pkgs/development/python-modules/cairosvg/1_x.nix +++ b/pkgs/development/python-modules/cairosvg/1_x.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { # ''; meta = with stdenv.lib; { - homepage = https://cairosvg.org; + homepage = "https://cairosvg.org"; license = licenses.lgpl3; description = "SVG converter based on Cairo"; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index 77c5c21befeee..31f7d7bc5d67c 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; meta = with stdenv.lib; { - homepage = https://cairosvg.org; + homepage = "https://cairosvg.org"; license = licenses.lgpl3; description = "SVG converter based on Cairo"; }; diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index 895775eb87f55..7a7a175362ac2 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -1,5 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi -, tzlocal, requests, vobject, lxml, nose }: +{ lib +, buildPythonPackage +, fetchPypi +, tzlocal +, requests +, vobject +, lxml +, nose +}: buildPythonPackage rec { pname = "caldav"; @@ -12,11 +19,16 @@ buildPythonPackage rec { sha256 = "80c33b143539da3a471148ac89512f67d9df3a5286fae5a023e2ad3923246c0d"; }; + # xandikos is only a optional test dependency, not available for python3 + postPatch = '' + substituteInPlace setup.py \ + --replace ", 'xandikos'" "" + ''; + meta = with lib; { description = "This project is a CalDAV (RFC4791) client library for Python."; homepage = "https://pythonhosted.org/caldav/"; license = licenses.asl20; maintainers = with maintainers; [ marenz ]; - broken = true; # missing xandikos package }; } diff --git a/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix b/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix index a12a12547e968..2d882967493c2 100644 --- a/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix +++ b/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix @@ -27,7 +27,7 @@ buildPythonPackage { that package. ''; - homepage = https://github.com/skarra/CalDAVClientLibrary/tree/asynkdev/; + homepage = "https://github.com/skarra/CalDAVClientLibrary/tree/asynkdev/"; maintainers = with maintainers; [ pjones ]; broken = true; # 2018-04-11 }; diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index 8aa80a750678e..3629e0097eda0 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/hardbyte/python-can; + homepage = "https://github.com/hardbyte/python-can"; description = "CAN support for Python"; license = licenses.lgpl3; maintainers = with maintainers; [ sorki ]; diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix index 004669d605b5e..b9a61af8b4898 100644 --- a/pkgs/development/python-modules/canmatrix/default.nix +++ b/pkgs/development/python-modules/canmatrix/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/ebroecker/canmatrix; + homepage = "https://github.com/ebroecker/canmatrix"; description = "Support and convert several CAN (Controller Area Network) database formats .arxml .dbc .dbf .kcd .sym fibex xls(x)"; license = licenses.bsd2; maintainers = with maintainers; [ sorki ]; diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index 7457002929aa3..24cccc3aa770a 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/matrix-org/python-canonicaljson; + homepage = "https://github.com/matrix-org/python-canonicaljson"; description = "Encodes objects and arrays as RFC 7159 JSON."; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix index a76e05332f190..83dd1f006fc69 100644 --- a/pkgs/development/python-modules/canopen/default.nix +++ b/pkgs/development/python-modules/canopen/default.nix @@ -36,7 +36,7 @@ buildPythonPackage { checkInputs = [ nose ]; meta = with lib; { - homepage = https://github.com/christiansandberg/canopen/; + homepage = "https://github.com/christiansandberg/canopen/"; description = "CANopen stack implementation"; license = licenses.lgpl3; maintainers = with maintainers; [ sorki ]; diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix index 86062d28a8563..2dcd075ec0e16 100644 --- a/pkgs/development/python-modules/capturer/default.nix +++ b/pkgs/development/python-modules/capturer/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Easily capture stdout/stderr of the current process and subprocesses"; - homepage = https://github.com/xolox/python-capturer; + homepage = "https://github.com/xolox/python-capturer"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; }; diff --git a/pkgs/development/python-modules/carrot/default.nix b/pkgs/development/python-modules/carrot/default.nix index 3b976fb7ad9a2..9a5ffe578565f 100644 --- a/pkgs/development/python-modules/carrot/default.nix +++ b/pkgs/development/python-modules/carrot/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; # depends on the network meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/carrot; + homepage = "https://pypi.python.org/pypi/carrot"; description = "AMQP Messaging Framework for Python"; }; } diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index a3f90b3282ae9..c01f27608fdfa 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Process geospatial data to create maps and perform analyses"; license = licenses.lgpl3; - homepage = https://scitools.org.uk/cartopy/docs/latest/; + homepage = "https://scitools.org.uk/cartopy/docs/latest/"; maintainers = with maintainers; [ mredaelli ]; }; diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 114625c397ceb..2fb670e418a30 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "An authorization library that supports access control models like ACL, RBAC, ABAC in Python"; - homepage = https://github.com/casbin/pycasbin; + homepage = "https://github.com/casbin/pycasbin"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/case/default.nix b/pkgs/development/python-modules/case/default.nix index 0f1bba36def63..771a349be1f77 100644 --- a/pkgs/development/python-modules/case/default.nix +++ b/pkgs/development/python-modules/case/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six nose unittest2 mock ]; meta = with stdenv.lib; { - homepage = https://github.com/celery/case; + homepage = "https://github.com/celery/case"; description = "unittests utilities"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/casttube/default.nix b/pkgs/development/python-modules/casttube/default.nix index 5d3b80aeb1687..ff8e5614ceb66 100644 --- a/pkgs/development/python-modules/casttube/default.nix +++ b/pkgs/development/python-modules/casttube/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "casttube"; - version = "0.2.0"; + version = "0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0g7mksfl341vfsxqvw8h15ci2qwd1rczg41n4fb2hw7y9rikqnzj"; + sha256 = "10pw2sjy648pvp42lbbdmkkx79bqlkq1xcbzp1frraj9g66azljl"; }; propagatedBuildInputs = [ requests ]; @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Interact with the Youtube Chromecast api"; - homepage = https://github.com/ur1katz/casttube; + homepage = "https://github.com/ur1katz/casttube"; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/development/python-modules/cbor/default.nix b/pkgs/development/python-modules/cbor/default.nix index 360872c0f896e..c6df7358ad7de 100644 --- a/pkgs/development/python-modules/cbor/default.nix +++ b/pkgs/development/python-modules/cbor/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://bitbucket.org/bodhisnarkva/cbor; + homepage = "https://bitbucket.org/bodhisnarkva/cbor"; description = "Concise Binary Object Representation (CBOR) library"; license = licenses.asl20; maintainers = with maintainers; [ geistesk ]; diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/pkgs/development/python-modules/cccolutils/default.nix index 9751dcd2f3ed5..5f5e396a02e2b 100644 --- a/pkgs/development/python-modules/cccolutils/default.nix +++ b/pkgs/development/python-modules/cccolutils/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Kerberos 5 Credential Cache Collection Utilities"; - homepage = https://pagure.io/cccolutils; + homepage = "https://pagure.io/cccolutils"; license = licenses.gpl2; maintainers = with maintainers; [ disassembler ]; }; diff --git a/pkgs/development/python-modules/cddb/default.nix b/pkgs/development/python-modules/cddb/default.nix index 86c6e8b0d80a2..5c27b48d62f34 100644 --- a/pkgs/development/python-modules/cddb/default.nix +++ b/pkgs/development/python-modules/cddb/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = http://cddb-py.sourceforge.net/; + homepage = "http://cddb-py.sourceforge.net/"; description = "CDDB and FreeDB audio CD track info access"; license = licenses.gpl2Plus; }; diff --git a/pkgs/development/python-modules/cdecimal/default.nix b/pkgs/development/python-modules/cdecimal/default.nix index 0c636e1208847..3508b392203d4 100644 --- a/pkgs/development/python-modules/cdecimal/default.nix +++ b/pkgs/development/python-modules/cdecimal/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fast drop-in replacement for decimal.py"; - homepage = http://www.bytereef.org/mpdecimal/; + homepage = "http://www.bytereef.org/mpdecimal/"; license = licenses.bsd2; maintainers = [ maintainers.udono ]; }; diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 68c6c282c9b91..d0d4f2e69fb8f 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ]; meta = with lib; { - homepage = https://github.com/celery/celery/; + homepage = "https://github.com/celery/celery/"; description = "Distributed task queue"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index edcb4086cf21e..9117908f399ab 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = !isPy3k; meta = with stdenv.lib; { - homepage = https://builtoncement.com/; + homepage = "https://builtoncement.com/"; description = "A CLI Application Framework for Python."; maintainers = with maintainers; [ eqyiel ]; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix index 5218a55078db9..b0c35204d6e76 100644 --- a/pkgs/development/python-modules/cerberus/default.nix +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://python-cerberus.org/; + homepage = "http://python-cerberus.org/"; description = "Lightweight, extensible schema and data validation tool for Python dictionaries"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 7ffc50ea52061..94619956cff49 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -5,15 +5,19 @@ buildPythonPackage rec { pname = "certifi"; - version = "2019.11.28"; + version = "2020.4.5.1"; src = fetchPypi { inherit pname version; - sha256 = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f"; + sha256 = "06b5gfs7wmmipln8f3z928d2mmx2j4b3x7pnqmj6cvmyfh8v7z2i"; }; + pythonImportsCheck = [ "certifi" ]; + + dontUseSetuptoolsCheck = true; + meta = { - homepage = http://certifi.io/; + homepage = "https://certifi.io/"; description = "Python package for providing Mozilla's CA Bundle"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ koral ]; diff --git a/pkgs/development/python-modules/certipy/default.nix b/pkgs/development/python-modules/certipy/default.nix index ce96bce5bc7e3..12706ab3d8a4e 100644 --- a/pkgs/development/python-modules/certipy/default.nix +++ b/pkgs/development/python-modules/certipy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; #no tests were included meta = with stdenv.lib; { - homepage = https://github.com/LLNL/certipy; + homepage = "https://github.com/LLNL/certipy"; description = "wrapper for pyOpenSSL"; license = licenses.bsd3; maintainers = with maintainers; [ isgy ]; diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 6f1e362f8bfaf..85dcd72a93483 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -39,7 +39,7 @@ if isPyPy then null else buildPythonPackage rec { meta = with stdenv.lib; { maintainers = with maintainers; [ domenkozar lnl7 ]; - homepage = https://cffi.readthedocs.org/; + homepage = "https://cffi.readthedocs.org/"; license = with licenses; [ mit ]; description = "Foreign Function Interface for Python calling C code"; }; diff --git a/pkgs/development/python-modules/cfgv/default.nix b/pkgs/development/python-modules/cfgv/default.nix index 2487caea608e7..a58669e58a8b4 100644 --- a/pkgs/development/python-modules/cfgv/default.nix +++ b/pkgs/development/python-modules/cfgv/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Validate configuration and produce human readable error messages"; - homepage = https://github.com/asottile/cfgv; + homepage = "https://github.com/asottile/cfgv"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 7b1ef63767d98..c632bb6a68c84 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Checks cloudformation for practices and behaviour that could potentially be improved"; - homepage = https://github.com/aws-cloudformation/cfn-python-lint; + homepage = "https://github.com/aws-cloudformation/cfn-python-lint"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index 5046017a94d3e..60946d23a1edc 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cftime"; - version = "1.0.4.2"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "1ac64f8f9066ea756ea27d67cedaf064e7c866275218fa7c84684066a5890f70"; + sha256 = "17w9myl8mg4isv4lb1nv64zim53ishi32f6m5m0s00q9a6v5qfb0"; }; checkInputs = [ pytest coveralls pytestcov ]; diff --git a/pkgs/development/python-modules/cgen/default.nix b/pkgs/development/python-modules/cgen/default.nix index f6cf985349b9b..30ecb8d1b33be 100644 --- a/pkgs/development/python-modules/cgen/default.nix +++ b/pkgs/development/python-modules/cgen/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "C/C++ source generation from an AST"; - homepage = https://github.com/inducer/cgen; + homepage = "https://github.com/inducer/cgen"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index 9585004a89a90..0c3b7a946fcd0 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "A flexible framework of neural networks for deep learning"; - homepage = https://chainer.org/; + homepage = "https://chainer.org/"; license = licenses.mit; maintainers = with maintainers; [ hyphon81 ]; }; diff --git a/pkgs/development/python-modules/chainmap/default.nix b/pkgs/development/python-modules/chainmap/default.nix index eb769ed462391..17a51f17763aa 100644 --- a/pkgs/development/python-modules/chainmap/default.nix +++ b/pkgs/development/python-modules/chainmap/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Backport/clone of ChainMap"; - homepage = https://bitbucket.org/jeunice/chainmap; + homepage = "https://bitbucket.org/jeunice/chainmap"; license = licenses.psfl; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix index a7e51a6513f68..c2a3db6820d60 100644 --- a/pkgs/development/python-modules/chameleon/default.nix +++ b/pkgs/development/python-modules/chameleon/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://chameleon.readthedocs.io/; + homepage = "https://chameleon.readthedocs.io/"; description = "Fast HTML/XML Template Compiler"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/channels-redis/default.nix b/pkgs/development/python-modules/channels-redis/default.nix index 8812e4097ab8a..b8a95387571a9 100644 --- a/pkgs/development/python-modules/channels-redis/default.nix +++ b/pkgs/development/python-modules/channels-redis/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/django/channels_redis/; + homepage = "https://github.com/django/channels_redis/"; description = "Redis-backed ASGI channel layer implementation"; license = licenses.bsd3; maintainers = with maintainers; [ mmai ]; diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index b7c83b3b3ffe3..94d1705637d2b 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Brings event-driven capabilities to Django with a channel system"; license = licenses.bsd3; - homepage = https://github.com/django/channels; + homepage = "https://github.com/django/channels"; }; } diff --git a/pkgs/development/python-modules/characteristic/default.nix b/pkgs/development/python-modules/characteristic/default.nix index f082510713ade..2e12077bd5627 100644 --- a/pkgs/development/python-modules/characteristic/default.nix +++ b/pkgs/development/python-modules/characteristic/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { meta = { description = "Python attributes without boilerplate"; - homepage = https://characteristic.readthedocs.org; + homepage = "https://characteristic.readthedocs.org"; }; } diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index 829ae0b0f14a8..1a8b1f36e998c 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner hypothesis ]; meta = with stdenv.lib; { - homepage = https://github.com/chardet/chardet; + homepage = "https://github.com/chardet/chardet"; description = "Universal encoding detector"; license = licenses.lgpl2; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index eaae8f3d0998d..3de542a8bb0cd 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/mgedmin/check-manifest; + homepage = "https://github.com/mgedmin/check-manifest"; description = "Check MANIFEST.in in a Python source package for completeness"; license = licenses.mit; maintainers = with maintainers; [ lewo ]; diff --git a/pkgs/development/python-modules/cheetah/default.nix b/pkgs/development/python-modules/cheetah/default.nix index 98af2f10a0bbf..1cee46fa7252c 100644 --- a/pkgs/development/python-modules/cheetah/default.nix +++ b/pkgs/development/python-modules/cheetah/default.nix @@ -26,8 +26,8 @@ buildPythonPackage rec { ]; meta = { - homepage = http://www.cheetahtemplate.org/; + homepage = "http://www.cheetahtemplate.org/"; description = "A template engine and code generation tool"; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 971d8848b37f1..54c502b815cb0 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "High-performance, pure-Python HTTP"; - homepage = https://github.com/cherrypy/cheroot; + homepage = "https://github.com/cherrypy/cheroot"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/pkgs/development/python-modules/cherrypy/17.nix index d9b9166e0f0d5..5e5541b26e277 100644 --- a/pkgs/development/python-modules/cherrypy/17.nix +++ b/pkgs/development/python-modules/cherrypy/17.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://www.cherrypy.org; + homepage = "https://www.cherrypy.org"; description = "A pythonic, object-oriented HTTP framework"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 17531f1406d1f..778f57e0f9b07 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -44,11 +44,15 @@ buildPythonPackage rec { # Disable doctest plugin because times out checkPhase = '' substituteInPlace pytest.ini --replace "--doctest-modules" "" - pytest --deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes ${stdenv.lib.optionalString stdenv.isDarwin "--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block"} + pytest \ + --deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes \ + --deselect=cherrypy/test/test_tools.py::ToolTests::testCombinedTools \ + ${stdenv.lib.optionalString stdenv.isDarwin + "--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block"} ''; meta = with stdenv.lib; { - homepage = https://www.cherrypy.org; + homepage = "https://www.cherrypy.org"; description = "A pythonic, object-oriented HTTP framework"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/chevron/default.nix b/pkgs/development/python-modules/chevron/default.nix index 7fa3a2b471de6..5f8cc32175085 100644 --- a/pkgs/development/python-modules/chevron/default.nix +++ b/pkgs/development/python-modules/chevron/default.nix @@ -21,7 +21,7 @@ buildPythonPackage { ''; meta = with lib; { - homepage = https://github.com/noahmorrison/chevron; + homepage = "https://github.com/noahmorrison/chevron"; description = "A python implementation of the mustache templating language"; license = licenses.mit; maintainers = with maintainers; [ dhkl ]; diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index a671f0e68e83e..98fc3b9ff058f 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -1,8 +1,11 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , pythonOlder , fetchFromGitHub -, google_api_python_client +, fetchpatch +, freezegun +, google_api_core , matplotlib , networkx , numpy @@ -15,6 +18,7 @@ , typing-extensions # test inputs , pytestCheckHook +, pytest-asyncio , pytest-benchmark , ply , pydot @@ -24,7 +28,7 @@ buildPythonPackage rec { pname = "cirq"; - version = "0.6.1"; + version = "0.8.0"; disabled = pythonOlder "3.5"; @@ -32,22 +36,29 @@ buildPythonPackage rec { owner = "quantumlib"; repo = "cirq"; rev = "v${version}"; - sha256 = "0lhr2dka7vpz9xd6akxphrcv2b3ni2cgjywpc1r7qpqa5mrq1q7f"; + sha256 = "01nnv7r595sp60wvp7750lfdjwdsi4q0r4lmaj6li09zsdw0r4b3"; }; - # Cirq 0.6 requires networkx==2.3 only for optional qiskit dependency/test, disable this to avoid networkx version conflicts. https://github.com/quantumlib/Cirq/issues/2368 - # Cirq locks protobuf==3.8.0, but tested working with default pythonPackages.protobuf (3.7). This avoids overrides/pythonPackages.protobuf conflicts - prePatch = '' - substituteInPlace requirements.txt --replace "networkx==2.3" "networkx" \ - --replace "protobuf==3.8.0" "protobuf" + patches = [ + (fetchpatch { + # Fixes serialization issues on certain versions of protobuf & numpy. + name = "cirq-pr-2986-protobuf-bools.patch"; + url = "https://github.com/quantumlib/Cirq/commit/78ddfb574c0f3936f713613bf4ba102163efb7b3.patch"; + sha256 = "0hmad9ndsqf5ci7shvd924d2rv4k9pzx2r2cl1bm5w91arzz9m18"; + }) + ]; - # Fix sympy 1.5 test failures. Should be fixed in v0.7 - substituteInPlace cirq/optimizers/eject_phased_paulis_test.py --replace "phase_exponent=0.125 + x / 8" "phase_exponent=0.125 + x * 0.125" - substituteInPlace cirq/contrib/quirk/cells/parse_test.py --replace "parse_formula('5t') == 5 * t" "parse_formula('5t') == 5.0 * t" + # Cirq locks protobuf==3.8.0, but tested working with default pythonPackages.protobuf (3.7). This avoids overrides/pythonPackages.protobuf conflicts + postPatch = '' + substituteInPlace requirements.txt \ + --replace "networkx~=2.4" "networkx" \ + --replace "protobuf==3.8.0" "protobuf" \ + --replace "freezegun~=0.3.15" "freezegun" ''; propagatedBuildInputs = [ - google_api_python_client + freezegun + google_api_core numpy matplotlib networkx @@ -65,16 +76,30 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; checkInputs = [ pytestCheckHook + pytest-asyncio pytest-benchmark ply pydot pyyaml pygraphviz ]; - # TODO: enable op_serializer_test. Error is type checking, for some reason wants bool instead of numpy.bool_. Not sure if protobuf or internal issue + pytestFlagsArray = [ "--ignore=dev_tools" # Only needed when developing new code, which is out-of-scope - "--ignore=cirq/google/op_serializer_test.py" # investigating in https://github.com/quantumlib/Cirq/issues/2727 + ]; + disabledTests = [ + "test_serialize_sympy_constants" # fails due to small error in pi (~10e-7) + "test_convert_to_ion_gates" # fails due to rounding error, 0.75 != 0.750...2 + + # Newly disabled tests on cirq 0.8 + # TODO: test & figure out why failing + "engine_job_test" + "test_health" + "test_run_delegation" + ] ++ lib.optionals stdenv.isAarch64 [ + # Seem to fail due to math issues on aarch64? + "expectation_from_wavefunction" + "test_single_qubit_op_to_framed_phase_form_output_on_example_case" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/cjson/default.nix b/pkgs/development/python-modules/cjson/default.nix index c9b5be5e60489..5ceb26bfeb6da 100644 --- a/pkgs/development/python-modules/cjson/default.nix +++ b/pkgs/development/python-modules/cjson/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A very fast JSON encoder/decoder for Python"; - homepage = https://ag-projects.com/; + homepage = "https://ag-projects.com/"; license = licenses.lgpl2; }; } diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix index 13a91837a6c74..2809fb33e92ba 100644 --- a/pkgs/development/python-modules/cleo/default.nix +++ b/pkgs/development/python-modules/cleo/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/sdispater/cleo; + homepage = "https://github.com/sdispater/cleo"; description = "Allows you to create beautiful and testable command-line interfaces"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/clf/default.nix b/pkgs/development/python-modules/clf/default.nix index 9303f90141daa..d3741ef38a936 100644 --- a/pkgs/development/python-modules/clf/default.nix +++ b/pkgs/development/python-modules/clf/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/ncrocfer/clf; + homepage = "https://github.com/ncrocfer/clf"; description = "Command line tool to search snippets on Commandlinefu.com"; license = licenses.mit; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index 2ebc6f44b44d3..ba7ca3d5b209e 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { Read the documentation at http://cli-helpers.rtfd.io ''; - homepage = https://cli-helpers.readthedocs.io/en/stable/; + homepage = "https://cli-helpers.readthedocs.io/en/stable/"; license = licenses.bsd3 ; maintainers = [ maintainers.kalbasit ]; }; diff --git a/pkgs/development/python-modules/cliapp/default.nix b/pkgs/development/python-modules/cliapp/default.nix index c3e6a120ae787..233028235b19c 100644 --- a/pkgs/development/python-modules/cliapp/default.nix +++ b/pkgs/development/python-modules/cliapp/default.nix @@ -22,7 +22,7 @@ buildPythonPackage { doCheck = false; meta = with stdenv.lib; { - homepage = http://liw.fi/cliapp/; + homepage = "http://liw.fi/cliapp/"; description = "Python framework for Unix command line programs"; license = licenses.gpl2; maintainers = []; diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix index 79d85a81c3791..3fd41f54f66ce 100644 --- a/pkgs/development/python-modules/click-completion/default.nix +++ b/pkgs/development/python-modules/click-completion/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Add or enhance bash, fish, zsh and powershell completion in Click"; - homepage = https://github.com/click-contrib/click-completion; + homepage = "https://github.com/click-contrib/click-completion"; license = licenses.mit; maintainers = with maintainers; [ mbode ]; }; diff --git a/pkgs/development/python-modules/click-default-group/default.nix b/pkgs/development/python-modules/click-default-group/default.nix index 6bc092dcd4e0c..58da038faae37 100644 --- a/pkgs/development/python-modules/click-default-group/default.nix +++ b/pkgs/development/python-modules/click-default-group/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; meta = with lib; { - homepage = https://github.com/click-contrib/click-default-group; + homepage = "https://github.com/click-contrib/click-default-group"; description = "Group to invoke a command without explicit subcommand name"; license = licenses.bsd3; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/click-didyoumean/default.nix b/pkgs/development/python-modules/click-didyoumean/default.nix index 4cd2ea15029bd..58d7da4fd391d 100644 --- a/pkgs/development/python-modules/click-didyoumean/default.nix +++ b/pkgs/development/python-modules/click-didyoumean/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Enable git-like did-you-mean feature in click"; - homepage = https://github.com/click-contrib/click-didyoumean; + homepage = "https://github.com/click-contrib/click-didyoumean"; license = licenses.mit; maintainers = with maintainers; [ mbode ]; }; diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix index f5626859d0664..dd2b4b158ed5f 100644 --- a/pkgs/development/python-modules/click-log/default.nix +++ b/pkgs/development/python-modules/click-log/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; meta = with stdenv.lib; { - homepage = https://github.com/click-contrib/click-log/; + homepage = "https://github.com/click-contrib/click-log/"; description = "Logging integration for Click"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/click-plugins/default.nix b/pkgs/development/python-modules/click-plugins/default.nix index 8039d0cb4c7bc..a8c1d7a489ff0 100644 --- a/pkgs/development/python-modules/click-plugins/default.nix +++ b/pkgs/development/python-modules/click-plugins/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An extension module for click to enable registering CLI commands"; - homepage = https://github.com/click-contrib/click-plugins; + homepage = "https://github.com/click-contrib/click-plugins"; license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp ]; }; diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix index 8a487ab241022..03c9520014c41 100644 --- a/pkgs/development/python-modules/click-repl/default.nix +++ b/pkgs/development/python-modules/click-repl/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click prompt_toolkit ]; meta = with stdenv.lib; { - homepage = https://github.com/click-contrib/click-repl; + homepage = "https://github.com/click-contrib/click-repl"; description = "Subcommand REPL for click apps"; license = licenses.mit; maintainers = with maintainers; [ twey ]; diff --git a/pkgs/development/python-modules/click-threading/default.nix b/pkgs/development/python-modules/click-threading/default.nix index 3fe2af19fef91..6943a3dcfd156 100644 --- a/pkgs/development/python-modules/click-threading/default.nix +++ b/pkgs/development/python-modules/click-threading/default.nix @@ -27,8 +27,8 @@ buildPythonPackage rec { doCheck = !isPy3k; meta = { - homepage = https://github.com/click-contrib/click-threading/; + homepage = "https://github.com/click-contrib/click-threading/"; description = "Multithreaded Click apps made easy"; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 9951b1711b39b..ac96ef32618c9 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -1,31 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi, locale, pytest }: +{ lib, buildPythonPackage, fetchPypi, locale, pytestCheckHook }: buildPythonPackage rec { pname = "click"; - version = "7.0"; + version = "7.1.1"; src = fetchPypi { - pname = "Click"; - inherit version; - sha256 = "5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7"; + inherit pname version; + sha256 = "1k60i2fvxf8rxazlv04mnsmlsjrj5i5sda3x1ifhr0nqi7mb864a"; }; postPatch = '' - substituteInPlace click/_unicodefun.py \ + substituteInPlace src/click/_unicodefun.py \ --replace "'locale'" "'${locale}/bin/locale'" ''; - buildInputs = [ pytest ]; - - checkPhase = '' - py.test tests - ''; - - # https://github.com/pallets/click/issues/823 - doCheck = false; + checkInputs = [ pytestCheckHook ]; meta = with lib; { - homepage = http://click.pocoo.org/; + homepage = "https://click.palletsprojects.com/"; description = "Create beautiful command line interfaces in Python"; longDescription = '' A Python package for creating beautiful command line interfaces in a diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index 93cd5c7a1d7d5..d35c356c8220e 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Click command line utilities"; - homepage = https://github.com/hjacobs/python-clickclick/; + homepage = "https://github.com/hjacobs/python-clickclick/"; license = licenses.asl20; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix index 961f6b5bc1de8..71b9c4899abae 100644 --- a/pkgs/development/python-modules/clifford/default.nix +++ b/pkgs/development/python-modules/clifford/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Numerical Geometric Algebra Module"; - homepage = https://clifford.readthedocs.io; + homepage = "https://clifford.readthedocs.io"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix index 0ec82efed8b2d..91124cd21f4b9 100644 --- a/pkgs/development/python-modules/cligj/default.nix +++ b/pkgs/development/python-modules/cligj/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Click params for commmand line interfaces to GeoJSON"; - homepage = https://github.com/mapbox/cligj; + homepage = "https://github.com/mapbox/cligj"; license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp ]; }; diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix index 054b6edee6da3..98533f95f922e 100644 --- a/pkgs/development/python-modules/clikit/default.nix +++ b/pkgs/development/python-modules/clikit/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, isPy27, isPy34 +, isPy27 , pylev, pastel, typing, enum34 }: buildPythonPackage rec { @@ -13,8 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pylev pastel - ] ++ lib.optional (isPy27 || isPy34) typing - ++ lib.optional isPy27 enum34; + ] ++ lib.optionals isPy27 [ typing enum34 ]; # The Pypi tarball doesn't include tests, and the GitHub source isn't # buildable until we bootstrap poetry, see @@ -22,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/sdispater/clikit; + homepage = "https://github.com/sdispater/clikit"; description = "A group of utilities to build beautiful and testable command line interfaces"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/clint/default.nix b/pkgs/development/python-modules/clint/default.nix index 602ab00b0849c..329cf4f07ccf6 100644 --- a/pkgs/development/python-modules/clint/default.nix +++ b/pkgs/development/python-modules/clint/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow blessings args ]; meta = with stdenv.lib; { - homepage = https://github.com/kennethreitz/clint; + homepage = "https://github.com/kennethreitz/clint"; description = "Python Command Line Interface Tools"; license = licenses.isc; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix new file mode 100644 index 0000000000000..802235d674b9e --- /dev/null +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, future +, pyyaml +, jsonlines +}: + +buildPythonPackage rec { + pname = "cloudflare"; + version = "2.7.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0w8ihj9gram2d4wkbki8f6gr8hsd950b3wzfi1qqqm17lqfk8k7h"; + }; + + propagatedBuildInputs = [ + requests + future + pyyaml + jsonlines + ]; + + # no tests associated with package + doCheck = false; + pythonImportsCheck = [ "CloudFlare" ]; + + meta = with lib; { + description = "Python wrapper for the Cloudflare v4 API"; + homepage = "https://github.com/cloudflare/python-cloudflare"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index a24fc07440896..279571c157c92 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Extended pickling support for Python objects"; - homepage = https://github.com/cloudpipe/cloudpickle; + homepage = "https://github.com/cloudpipe/cloudpickle"; license = with licenses; [ bsd3 ]; }; } diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index 75a77d4c63cbf..86d44aed532cb 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -82,7 +82,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Scalable Python framework for cluster administration"; - homepage = https://cea-hpc.github.io/clustershell; + homepage = "https://cea-hpc.github.io/clustershell"; license = licenses.lgpl21; maintainers = [ maintainers.alexvorobiev ]; }; diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix index 1743e23942fe1..3d39392da6b8c 100644 --- a/pkgs/development/python-modules/cma/default.nix +++ b/pkgs/development/python-modules/cma/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "CMA-ES, Covariance Matrix Adaptation Evolution Strategy for non-linear numerical optimization in Python"; - homepage = https://github.com/CMA-ES/pycma; + homepage = "https://github.com/CMA-ES/pycma"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix index b2f58887ffb58..2337964017a2a 100644 --- a/pkgs/development/python-modules/cmarkgfm/default.nix +++ b/pkgs/development/python-modules/cmarkgfm/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Minimal bindings to GitHub's fork of cmark"; - homepage = https://github.com/jonparrott/cmarkgfm; + homepage = "https://github.com/jonparrott/cmarkgfm"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 13f68d6a3927a..9d58c130582e0 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "0fjwc095y97n3a7jxl9pk4h1i5hghas7y6zhgprl5lv5ixnicffk"; + sha256 = "1f18plbc9yyvhn0js3d2bii9yld8zfl775gxsaw9jza5pmlg9ss2"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/cmdline/default.nix b/pkgs/development/python-modules/cmdline/default.nix index cf0cff1f15512..39f1f9de0c675 100644 --- a/pkgs/development/python-modules/cmdline/default.nix +++ b/pkgs/development/python-modules/cmdline/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Utilities for consistent command line tools"; - homepage = https://github.com/rca/cmdline; + homepage = "https://github.com/rca/cmdline"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/cmdtest/default.nix b/pkgs/development/python-modules/cmdtest/default.nix index 0d0bc36829513..ca2402cff6cd3 100644 --- a/pkgs/development/python-modules/cmdtest/default.nix +++ b/pkgs/development/python-modules/cmdtest/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://liw.fi/cmdtest/; + homepage = "http://liw.fi/cmdtest/"; description = "Black box tests Unix command line tools"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix index 6b2063f49922b..6ebdefedeaf6b 100644 --- a/pkgs/development/python-modules/codecov/default.nix +++ b/pkgs/development/python-modules/codecov/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Python report uploader for Codecov"; - homepage = https://codecov.io/; + homepage = "https://codecov.io/"; license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/codespell/default.nix b/pkgs/development/python-modules/codespell/default.nix index dc531c77fb5d3..70c6347376358 100644 --- a/pkgs/development/python-modules/codespell/default.nix +++ b/pkgs/development/python-modules/codespell/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonApplication, fetchPypi, pytest, chardet }: buildPythonApplication rec { pname = "codespell"; - version = "1.16.0"; + version = "1.17.1"; src = fetchPypi { inherit pname version; - sha256 = "1s9dl07ib77gq0iq26mrdpl1c46nkfm7nlhqwxpx5vvs6a1pqfxz"; + sha256 = "08ydpw8pim7rhg1x2n711hxf2y6553nx0c0aqhfi3p4wdgcfr8i5"; }; checkInputs = [ pytest chardet ]; diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index f894380fa49d4..2962e65a7fb69 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A code generator for executing Python snippets in source files"; - homepage = http://nedbatchelder.com/code/cog; + homepage = "http://nedbatchelder.com/code/cog"; license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; }; diff --git a/pkgs/development/python-modules/coinmarketcap/default.nix b/pkgs/development/python-modules/coinmarketcap/default.nix index bcf3271479657..168f75b7f49b2 100644 --- a/pkgs/development/python-modules/coinmarketcap/default.nix +++ b/pkgs/development/python-modules/coinmarketcap/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python wrapper around the https://coinmarketcap.com API."; - homepage = https://github.com/barnumbirr/coinmarketcap; + homepage = "https://github.com/barnumbirr/coinmarketcap"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix index a3e613652db28..944a7818452c3 100644 --- a/pkgs/development/python-modules/colander/default.nix +++ b/pkgs/development/python-modules/colander/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "A simple schema-based serialization and deserialization library"; - homepage = https://docs.pylonsproject.org/projects/colander/en/latest/; + homepage = "https://docs.pylonsproject.org/projects/colander/en/latest/"; license = licenses.free; # http://repoze.org/LICENSE.txt maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/colanderalchemy/default.nix b/pkgs/development/python-modules/colanderalchemy/default.nix index 686608445abc8..34e58e0927cd2 100644 --- a/pkgs/development/python-modules/colanderalchemy/default.nix +++ b/pkgs/development/python-modules/colanderalchemy/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Autogenerate Colander schemas based on SQLAlchemy models"; - homepage = https://github.com/stefanofontanelli/ColanderAlchemy; + homepage = "https://github.com/stefanofontanelli/ColanderAlchemy"; license = licenses.mit; # ColanderAlchemy's tests currently fail with colander >1.6.0 # (see https://github.com/stefanofontanelli/ColanderAlchemy/issues/107) diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix index d6f84ca874810..d22f93d47f17a 100644 --- a/pkgs/development/python-modules/colorama/default.nix +++ b/pkgs/development/python-modules/colorama/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/tartley/colorama; + homepage = "https://github.com/tartley/colorama"; license = licenses.bsd3; description = "Cross-platform colored terminal text"; }; diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index e4288745d960f..a80895de3d154 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Collection of perceptually uniform colormaps"; - homepage = https://colorcet.pyviz.org; + homepage = "https://colorcet.pyviz.org"; license = licenses.cc-by-40; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/colorclass/default.nix b/pkgs/development/python-modules/colorclass/default.nix index b035bb9b57c97..4a627cab5451a 100644 --- a/pkgs/development/python-modules/colorclass/default.nix +++ b/pkgs/development/python-modules/colorclass/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/Robpol86/colorclass; + homepage = "https://github.com/Robpol86/colorclass"; license = licenses.mit; description = "Automatic support for console colors"; }; diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix index b62d80600c7de..2d2cac3da1b93 100644 --- a/pkgs/development/python-modules/colored/default.nix +++ b/pkgs/development/python-modules/colored/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://gitlab.com/dslackw/colored; + homepage = "https://gitlab.com/dslackw/colored"; description = "Simple library for color and formatting to terminal"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix index f27cf5abe751a..219e48ad66456 100644 --- a/pkgs/development/python-modules/coloredlogs/default.nix +++ b/pkgs/development/python-modules/coloredlogs/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Colored stream handler for Python's logging module"; - homepage = https://github.com/xolox/python-coloredlogs; + homepage = "https://github.com/xolox/python-coloredlogs"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; }; diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix index 2e57ea538c94a..6aea26e89366f 100644 --- a/pkgs/development/python-modules/colorlover/default.nix +++ b/pkgs/development/python-modules/colorlover/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/jackparmer/colorlover; + homepage = "https://github.com/jackparmer/colorlover"; description = "Color scales in Python for humans"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ globin ]; diff --git a/pkgs/development/python-modules/colour/default.nix b/pkgs/development/python-modules/colour/default.nix index a162b21b083da..d0f802072a38f 100644 --- a/pkgs/development/python-modules/colour/default.nix +++ b/pkgs/development/python-modules/colour/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Converts and manipulates common color representation (RGB, HSV, web, ...)"; - homepage = https://github.com/vaab/colour; + homepage = "https://github.com/vaab/colour"; license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/commonmark/default.nix b/pkgs/development/python-modules/commonmark/default.nix index 0f381d502610a..56ddf76630782 100644 --- a/pkgs/development/python-modules/commonmark/default.nix +++ b/pkgs/development/python-modules/commonmark/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python parser for the CommonMark Markdown spec"; - homepage = https://github.com/rolandshoemaker/CommonMark-py; + homepage = "https://github.com/rolandshoemaker/CommonMark-py"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/compiledb/default.nix b/pkgs/development/python-modules/compiledb/default.nix index f2741c615b8f7..1892337dc2d94 100644 --- a/pkgs/development/python-modules/compiledb/default.nix +++ b/pkgs/development/python-modules/compiledb/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool for generating Clang's JSON Compilation Database files"; license = licenses.gpl3; - homepage = https://github.com/nickdiego/compiledb; + homepage = "https://github.com/nickdiego/compiledb"; maintainers = with maintainers; [ multun ]; }; } diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix index a240ea21e3e46..b097805292e9f 100644 --- a/pkgs/development/python-modules/conda/default.nix +++ b/pkgs/development/python-modules/conda/default.nix @@ -27,8 +27,8 @@ buildPythonPackage rec { meta = { description = "OS-agnostic, system-level binary package manager"; - homepage = https://github.com/conda/conda; + homepage = "https://github.com/conda/conda"; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index e2532f23709c8..d1dcce9699b3e 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ConfigArgParse"; - version = "1.0"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "0cvinm7bb03qfjpq2zhfacm0qs4ip4378nvya8x41p4wpi2q4dxz"; + sha256 = "1p1pzpf5qpf80bfxsx1mbw9blyhhypjvhl3i60pbmhfmhvlpplgd"; }; # no tests in tarball @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "A drop-in replacement for argparse"; - homepage = https://github.com/zorro3/ConfigArgParse; + homepage = "https://github.com/zorro3/ConfigArgParse"; license = licenses.mit; maintainers = [ maintainers.willibutz ]; }; diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix index 029f35ac87a87..82ca70c46795e 100644 --- a/pkgs/development/python-modules/configobj/default.nix +++ b/pkgs/development/python-modules/configobj/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Config file reading, writing and validation"; - homepage = https://pypi.python.org/pypi/configobj; + homepage = "https://pypi.python.org/pypi/configobj"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 4c05ec29359ac..9c6c631d9c277 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Updated configparser from Python 3.7 for Python 2.6+."; license = licenses.mit; - homepage = https://github.com/jaraco/configparser; + homepage = "https://github.com/jaraco/configparser"; }; } diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell/default.nix index fed5a71fd178b..6a21c1074ea7f 100644 --- a/pkgs/development/python-modules/configshell/default.nix +++ b/pkgs/development/python-modules/configshell/default.nix @@ -2,20 +2,20 @@ buildPythonPackage rec { pname = "configshell"; - version = "1.1.27"; + version = "1.1.28"; src = fetchFromGitHub { owner = "open-iscsi"; - repo ="${pname}-fb"; + repo = "${pname}-fb"; rev = "v${version}"; - sha256 = "1nldzq3097xqgzd8qxv36ydvx6vj2crwanihz53k46is0myrwcnn"; + sha256 = "1ym2hkvmmacgy21wnjwzyrcxyl3sx4bcx4hc51vf4lzcnj589l68"; }; propagatedBuildInputs = [ pyparsing six urwid ]; meta = with stdenv.lib; { description = "A Python library for building configuration shells"; - homepage = https://github.com/open-iscsi/configshell-fb; + homepage = "https://github.com/open-iscsi/configshell-fb"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index f32a6bfd1acd5..029171fea2f60 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Confluent's Apache Kafka client for Python"; - homepage = https://github.com/confluentinc/confluent-kafka-python; + homepage = "https://github.com/confluentinc/confluent-kafka-python"; license = licenses.asl20; maintainers = with maintainers; [ mlieberman85 ]; }; diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 4f2af55f20847..6b212be3bb7bf 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -87,7 +87,7 @@ buildPythonPackage rec { meta = with lib; { description = "Swagger/OpenAPI First framework on top of Flask"; - homepage = https://github.com/zalando/connexion/; + homepage = "https://github.com/zalando/connexion/"; license = licenses.asl20; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix index 4766a1285acda..9b7222b7bbc61 100644 --- a/pkgs/development/python-modules/constantly/default.nix +++ b/pkgs/development/python-modules/constantly/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/twisted/constantly; + homepage = "https://github.com/twisted/constantly"; description = "symbolic constant support"; license = licenses.mit; maintainers = [ ]; diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index 1009727c29ca9..59b3eb38afd00 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Powerful declarative parser (and builder) for binary data"; - homepage = https://construct.readthedocs.org/; + homepage = "https://construct.readthedocs.org/"; license = licenses.mit; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/pkgs/development/python-modules/consul/default.nix b/pkgs/development/python-modules/consul/default.nix index 5c9e83b8d2062..589076481c902 100644 --- a/pkgs/development/python-modules/consul/default.nix +++ b/pkgs/development/python-modules/consul/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python client for Consul (https://www.consul.io/)"; - homepage = https://github.com/cablehead/python-consul; + homepage = "https://github.com/cablehead/python-consul"; license = licenses.mit; maintainers = with maintainers; [ desiderius ]; }; diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix index e23964f1a2b08..38d9fb696e281 100644 --- a/pkgs/development/python-modules/contextlib2/default.nix +++ b/pkgs/development/python-modules/contextlib2/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Backports and enhancements for the contextlib module"; - homepage = https://contextlib2.readthedocs.org/; + homepage = "https://contextlib2.readthedocs.org/"; license = lib.licenses.psfl; }; } diff --git a/pkgs/development/python-modules/contextvars/default.nix b/pkgs/development/python-modules/contextvars/default.nix index b378c901fad81..1eda85a6ffe28 100644 --- a/pkgs/development/python-modules/contextvars/default.nix +++ b/pkgs/development/python-modules/contextvars/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = { description = "A backport of the Python 3.7 contextvars module for Python 3.6"; - homepage = https://github.com/MagicStack/contextvars; + homepage = "https://github.com/MagicStack/contextvars"; license = with lib.licenses; [ asl20 ]; maintainers = with lib.maintainers; [ catern ]; }; diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix index 4010eb5ec5aaf..c11ee6798a37c 100644 --- a/pkgs/development/python-modules/cookiecutter/default.nix +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/audreyr/cookiecutter; + homepage = "https://github.com/audreyr/cookiecutter"; description = "A command-line utility that creates projects from project templates"; license = licenses.bsd3; maintainers = with maintainers; [ kragniz ]; diff --git a/pkgs/development/python-modules/cookies/default.nix b/pkgs/development/python-modules/cookies/default.nix index 1b8e5b6061d76..7ae110fef3c2c 100644 --- a/pkgs/development/python-modules/cookies/default.nix +++ b/pkgs/development/python-modules/cookies/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Friendlier RFC 6265-compliant cookie parser/renderer"; - homepage = https://github.com/sashahart/cookies; + homepage = "https://github.com/sashahart/cookies"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/coordinates/default.nix b/pkgs/development/python-modules/coordinates/default.nix index 8c08021a823d6..44a41b92c4e57 100644 --- a/pkgs/development/python-modules/coordinates/default.nix +++ b/pkgs/development/python-modules/coordinates/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convenience class for doing maths with explicit coordinates"; - homepage = https://github.com/clbarnes/coordinates; + homepage = "https://github.com/clbarnes/coordinates"; license = licenses.mit; maintainers = [ maintainers.mildlyincompetent ]; }; diff --git a/pkgs/development/python-modules/coreapi/default.nix b/pkgs/development/python-modules/coreapi/default.nix index 216d1ee698504..521b06755cec8 100644 --- a/pkgs/development/python-modules/coreapi/default.nix +++ b/pkgs/development/python-modules/coreapi/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python client library for Core API"; - homepage = https://github.com/core-api/python-client; + homepage = "https://github.com/core-api/python-client"; license = licenses.bsd3; maintainers = with maintainers; [ ivegotasthma ]; }; diff --git a/pkgs/development/python-modules/coreschema/default.nix b/pkgs/development/python-modules/coreschema/default.nix index 949fa31df9581..5b5ca3f5044eb 100644 --- a/pkgs/development/python-modules/coreschema/default.nix +++ b/pkgs/development/python-modules/coreschema/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python client library for Core Schema"; - homepage = https://github.com/ivegotasthma/python-coreschema; + homepage = "https://github.com/ivegotasthma/python-coreschema"; license = licenses.bsd3; maintainers = with maintainers; [ ivegotasthma ]; }; diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix index 598c3bd1c089b..4307b3f6f4ff4 100644 --- a/pkgs/development/python-modules/cornice/default.nix +++ b/pkgs/development/python-modules/cornice/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/mozilla-services/cornice; + homepage = "https://github.com/mozilla-services/cornice"; description = "Build Web Services with Pyramid"; license = licenses.mpl20; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index dfe86b3606517..04c469204d78c 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { description = "Code coverage measurement for python"; - homepage = http://nedbatchelder.com/code/coverage/; + homepage = "http://nedbatchelder.com/code/coverage/"; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index dbf6616c22d38..96f3782ab8d06 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = { description = "Show coverage stats online via coveralls.io"; - homepage = https://github.com/coveralls-clients/coveralls-python; + homepage = "https://github.com/coveralls-clients/coveralls-python"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/cozy/default.nix b/pkgs/development/python-modules/cozy/default.nix index 7515891456e93..c55c85c3dfd7c 100644 --- a/pkgs/development/python-modules/cozy/default.nix +++ b/pkgs/development/python-modules/cozy/default.nix @@ -33,7 +33,7 @@ buildPythonPackage { meta = { description = "The collection synthesizer"; - homepage = https://cozy.uwplse.org/; + homepage = "https://cozy.uwplse.org/"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.MostAwesomeDude ]; }; diff --git a/pkgs/development/python-modules/cram/default.nix b/pkgs/development/python-modules/cram/default.nix index f27cfc44e57bd..ff156187a303b 100644 --- a/pkgs/development/python-modules/cram/default.nix +++ b/pkgs/development/python-modules/cram/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "A simple testing framework for command line applications"; - homepage = https://bitheap.org/cram/; + homepage = "https://bitheap.org/cram/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ jluttine ]; # Tests fail on i686: https://hydra.nixos.org/build/52896671/nixlog/4 diff --git a/pkgs/development/python-modules/crayons/default.nix b/pkgs/development/python-modules/crayons/default.nix index 97c33821547e5..1810f79071971 100644 --- a/pkgs/development/python-modules/crayons/default.nix +++ b/pkgs/development/python-modules/crayons/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "TextUI colors for Python"; - homepage = https://github.com/kennethreitz/crayons; + homepage = "https://github.com/kennethreitz/crayons"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/crcmod/default.nix b/pkgs/development/python-modules/crcmod/default.nix index f85e045d525e0..47e1b4097d3d0 100644 --- a/pkgs/development/python-modules/crcmod/default.nix +++ b/pkgs/development/python-modules/crcmod/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python module for generating objects that compute the Cyclic Redundancy Check (CRC)"; - homepage = http://crcmod.sourceforge.net/; + homepage = "http://crcmod.sourceforge.net/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index 585bc01060671..75ab8b739d8d8 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A utility for managing secrets in the cloud using AWS KMS and DynamoDB"; - homepage = https://github.com/LuminalOSS/credstash; + homepage = "https://github.com/LuminalOSS/credstash"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index a538721c9b981..90334fd422504 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "croniter provides iteration for datetime object with cron like format"; - homepage = https://github.com/kiorky/croniter; + homepage = "https://github.com/kiorky/croniter"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 82d0b43bc350a..ba807cc99fd5f 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -2,14 +2,14 @@ , buildPythonPackage , fetchPypi , fetchpatch +, isPy27 +, ipaddress , openssl , cryptography_vectors , darwin , packaging , six , pythonOlder -, enum34 -, ipaddress , isPyPy , cffi , pytest @@ -17,15 +17,16 @@ , iso8601 , pytz , hypothesis +, enum34 }: buildPythonPackage rec { pname = "cryptography"; - version = "2.8"; # Also update the hash in vectors.nix + version = "2.9.1"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "0l8nhw14npknncxdnp7n4hpmjyscly6g7fbivyxkjwvlv071zniw"; + sha256 = "13inbbc3vqv0vpfww65f8pj3isghbcrd3m63xfyd8swl9f5xc2yf"; }; outputs = [ "out" "dev" ]; @@ -35,9 +36,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging six - ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34 - ++ stdenv.lib.optional (pythonOlder "3.3") ipaddress - ++ stdenv.lib.optional (!isPyPy) cffi; + ] ++ stdenv.lib.optional (!isPyPy) cffi + ++ stdenv.lib.optionals isPy27 [ ipaddress enum34 ]; checkInputs = [ cryptography_vectors @@ -48,9 +48,8 @@ buildPythonPackage rec { pytz ]; - # remove when https://github.com/pyca/cryptography/issues/4998 is fixed checkPhase = '' - py.test --disable-pytest-warnings tests -k 'not load_ecdsa_no_named_curve' + py.test --disable-pytest-warnings tests ''; # IOKit's dependencies are inconsistent between OSX versions, so this is the best we @@ -64,9 +63,11 @@ buildPythonPackage rec { common cryptographic algorithms such as symmetric ciphers, message digests, and key derivation functions. Our goal is for it to be your "cryptographic standard library". It - supports Python 2.7, Python 3.4+, and PyPy 5.3+. + supports Python 2.7, Python 3.5+, and PyPy 5.4+. ''; - homepage = https://github.com/pyca/cryptography; + homepage = "https://github.com/pyca/cryptography"; + changelog = "https://cryptography.io/en/latest/changelog/#v" + + replaceStrings [ "." ] [ "-" ] version; license = with licenses; [ asl20 bsd3 psfl ]; maintainers = with maintainers; [ primeos ]; }; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 86cc195b05b33..520e44cccc787 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "05pi3shqz0fgvy0d5yazza67bbnam8fkrx2ayrrclgkaqms23lvc"; + sha256 = "1ydkrj67jf26ys8v5qflqsnlj3hd4494ym44120dpvk7b7v037ci"; }; # No tests included @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Test vectors for the cryptography package"; - homepage = https://cryptography.io/en/latest/development/test-vectors/; + homepage = "https://cryptography.io/en/latest/development/test-vectors/"; # Source: https://github.com/pyca/cryptography/tree/master/vectors; license = with licenses; [ asl20 bsd3 ]; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/development/python-modules/css-parser/default.nix b/pkgs/development/python-modules/css-parser/default.nix index 8b2fe0929c7bf..cba0c87870107 100644 --- a/pkgs/development/python-modules/css-parser/default.nix +++ b/pkgs/development/python-modules/css-parser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "A CSS Cascading Style Sheets library for Python"; - homepage = https://github.com/ebook-utils/css-parser; + homepage = "https://github.com/ebook-utils/css-parser"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ jethro ]; }; diff --git a/pkgs/development/python-modules/csscompressor/default.nix b/pkgs/development/python-modules/csscompressor/default.nix index a6c294456fa36..50f20164f6469 100644 --- a/pkgs/development/python-modules/csscompressor/default.nix +++ b/pkgs/development/python-modules/csscompressor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = { description = "A python port of YUI CSS Compressor"; - homepage = https://pypi.python.org/pypi/csscompressor; + homepage = "https://pypi.python.org/pypi/csscompressor"; license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.ahmedtd]; }; diff --git a/pkgs/development/python-modules/cssmin/default.nix b/pkgs/development/python-modules/cssmin/default.nix index 2d1ffaccd6f8d..deace3233b247 100644 --- a/pkgs/development/python-modules/cssmin/default.nix +++ b/pkgs/development/python-modules/cssmin/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python port of the YUI CSS compression algorithm"; - homepage = https://github.com/zacharyvoase/cssmin; + homepage = "https://github.com/zacharyvoase/cssmin"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index ff56e2a2f4720..dfa08dfe0b0cd 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "CSS selectors for Python ElementTree"; - homepage = https://github.com/Kozea/cssselect2; + homepage = "https://github.com/Kozea/cssselect2"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/csvs-to-sqlite/default.nix b/pkgs/development/python-modules/csvs-to-sqlite/default.nix index 15f43eb994e6a..3c4bfa0bff73a 100644 --- a/pkgs/development/python-modules/csvs-to-sqlite/default.nix +++ b/pkgs/development/python-modules/csvs-to-sqlite/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convert CSV files into a SQLite database"; - homepage = https://github.com/simonw/csvs-to-sqlite; + homepage = "https://github.com/simonw/csvs-to-sqlite"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 443d96b097a11..d2db8dcd9eeb9 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A NumPy-compatible matrix library accelerated by CUDA"; - homepage = https://cupy.chainer.org/; + homepage = "https://cupy.chainer.org/"; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ hyphon81 ]; diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index b0e9fee93d4c0..9f45c2fd2ba61 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { patches = [ # Fix dependency on typing. Remove with the next release (fetchpatch { - url = https://github.com/bpython/curtsies/commit/217b4f83e954837f8adc4c549c1f2f9f2bb272a7.patch; + url = "https://github.com/bpython/curtsies/commit/217b4f83e954837f8adc4c549c1f2f9f2bb272a7.patch"; sha256 = "1d3zwx9c7i0drb4nvydalm9mr83jrvdm75ffgisri89h337hiffs"; }) ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Curses-like terminal wrapper, with colored strings!"; - homepage = https://github.com/bpython/curtsies; + homepage = "https://github.com/bpython/curtsies"; license = licenses.mit; maintainers = with maintainers; [ flokli ]; }; diff --git a/pkgs/development/python-modules/curve25519-donna/default.nix b/pkgs/development/python-modules/curve25519-donna/default.nix index 789fc7488fa4f..1672557f1b95c 100644 --- a/pkgs/development/python-modules/curve25519-donna/default.nix +++ b/pkgs/development/python-modules/curve25519-donna/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python wrapper for the portable curve25519-donna implementation"; - homepage = http://code.google.com/p/curve25519-donna/; + homepage = "http://code.google.com/p/curve25519-donna/"; license = licenses.bsd3; maintainers = with maintainers; [ elseym ]; }; diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index fd44f49b53c92..bafa75072f7ab 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -4,7 +4,7 @@ , fetchPypi , isPyPy , python -, openblasCompat # build segfaults with regular openblas +, blas, lapack # build segfaults with 64-bit blas , suitesparse , glpk ? null , gsl ? null @@ -14,23 +14,26 @@ , withFftw ? true }: +assert (!blas.isILP64) && (!lapack.isILP64); + buildPythonPackage rec { pname = "cvxopt"; - version = "1.2.4"; + version = "1.2.5"; disabled = isPyPy; # hangs at [translation:info] src = fetchPypi { inherit pname version; - sha256 = "1h9g79gxpgpy6xciqyypihw5q4ngp322lpkka1nkwk0ysybfsp7s"; + sha256 = "0widrfxr0x0cyg72ibkv7fdzkvmf5mllchq1x4fs2a36plv8rv4l"; }; + buildInputs = [ blas lapack ]; + # similar to Gsl, glpk, fftw there is also a dsdp interface # but dsdp is not yet packaged in nixpkgs preConfigure = '' - export CVXOPT_BLAS_LIB_DIR=${openblasCompat}/lib - export CVXOPT_BLAS_LIB=openblas - export CVXOPT_LAPACK_LIB=openblas + export CVXOPT_BLAS_LIB=blas + export CVXOPT_LAPACK_LIB=lapack export CVXOPT_SUITESPARSE_LIB_DIR=${lib.getLib suitesparse}/lib export CVXOPT_SUITESPARSE_INC_DIR=${lib.getDev suitesparse}/include '' + lib.optionalString withGsl '' @@ -52,7 +55,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = http://cvxopt.org/; + homepage = "http://cvxopt.org/"; description = "Python Software for Convex Optimization"; longDescription = '' CVXOPT is a free software package for convex optimization based on the diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index ccb51b059d6ae..b0bab9c7ee03d 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.0.25"; + version = "1.0.31"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "04zalvc8lckjfzm3i2ir32ib5pd6v7hxqqcnsnq6fw40vffm4dc5"; + sha256 = "17g6xcy99icrdcmb4pa793kqvzchbzl5lsw00xms9slwkr7pb65k"; }; propagatedBuildInputs = [ @@ -38,13 +38,13 @@ buildPythonPackage rec { checkInputs = [ nose ]; checkPhase = '' - nosetests + nosetests cvxpy ''; meta = with lib; { description = "A domain-specific language for modeling convex optimization problems in Python."; homepage = "https://www.cvxpy.org/"; - downloadPage = "https://github.com/cvxgrp/cvxpy/"; + downloadPage = "https://github.com/cvxgrp/cvxpy/releases"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/pkgs/development/python-modules/cycler/default.nix b/pkgs/development/python-modules/cycler/default.nix index 3d22053540445..643a57e259ff5 100644 --- a/pkgs/development/python-modules/cycler/default.nix +++ b/pkgs/development/python-modules/cycler/default.nix @@ -29,8 +29,8 @@ buildPythonPackage rec { meta = { description = "Composable style cycles"; - homepage = https://github.com/matplotlib/cycler; + homepage = "https://github.com/matplotlib/cycler"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index 1ca86f3d9d057..e563e6615fe81 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cython memory pool for RAII-style memory management"; - homepage = https://github.com/explosion/cymem; + homepage = "https://github.com/explosion/cymem"; license = licenses.mit; maintainers = with maintainers; [ sdll ]; }; diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index 6c3e20b3f70d0..9308a13fb5031 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Cython bindings for PARI"; license = licenses.gpl2; maintainers = with maintainers; [ timokau ]; - homepage = https://github.com/defeo/cypari2; + homepage = "https://github.com/defeo/cypari2"; }; } diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix index e69fbce21587b..137451b6b5cfe 100644 --- a/pkgs/development/python-modules/cysignals/default.nix +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = { description = "Interrupt and signal handling for Cython"; - homepage = https://github.com/sagemath/cysignals/; + homepage = "https://github.com/sagemath/cysignals/"; maintainers = with lib.maintainers; [ timokau ]; license = lib.licenses.lgpl3Plus; }; diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index 1a142cae0f0fc..512e26023c0ac 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/pytoolz/cytoolz/; + homepage = "https://github.com/pytoolz/cytoolz/"; description = "Cython implementation of Toolz: High performance functional utilities"; license = "licenses.bsd3"; maintainers = with lib.maintainers; [ fridh ]; diff --git a/pkgs/development/python-modules/d2to1/default.nix b/pkgs/development/python-modules/d2to1/default.nix index 70b0da89d5bae..8a48ddcb13af6 100644 --- a/pkgs/development/python-modules/d2to1/default.nix +++ b/pkgs/development/python-modules/d2to1/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib;{ description = "Support for distutils2-like setup.cfg files as package metadata"; - homepage = https://github.com/embray/d2to1; + homepage = "https://github.com/embray/d2to1"; license = licenses.bsd2; maintainers = with maintainers; [ makefu ]; }; diff --git a/pkgs/development/python-modules/daemonize/default.nix b/pkgs/development/python-modules/daemonize/default.nix index 2f7992e860ffb..9db823806843d 100644 --- a/pkgs/development/python-modules/daemonize/default.nix +++ b/pkgs/development/python-modules/daemonize/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library to enable your code run as a daemon process on Unix-like systems"; - homepage = https://github.com/thesharp/daemonize; + homepage = "https://github.com/thesharp/daemonize"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index e577617c47807..49e6c3b3c475f 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Django ASGI (HTTP/WebSocket) server"; license = licenses.bsd3; - homepage = https://github.com/django/daphne; + homepage = "https://github.com/django/daphne"; }; } diff --git a/pkgs/development/python-modules/darcsver/default.nix b/pkgs/development/python-modules/darcsver/default.nix index 753b592a4c595..33c7eb2d11687 100644 --- a/pkgs/development/python-modules/darcsver/default.nix +++ b/pkgs/development/python-modules/darcsver/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Darcsver, generate a version number from Darcs history"; - homepage = https://pypi.python.org/pypi/darcsver; + homepage = "https://pypi.python.org/pypi/darcsver"; license = "BSD-style"; }; } diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/pkgs/development/python-modules/dash-core-components/default.nix index 1a1e3db46ffaa..e88591aba9af4 100644 --- a/pkgs/development/python-modules/dash-core-components/default.nix +++ b/pkgs/development/python-modules/dash-core-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_core_components"; - version = "1.9.0"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1wr6989hq7q9vyh1qqdpbp8igk9rfca4phfpaim3nnk4swvm5m75"; + sha256 = "1bqvxm7h3b0wah32jrsn919hp4xr1zlkxclbs261mvd57ps0rf9h"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash-html-components/default.nix b/pkgs/development/python-modules/dash-html-components/default.nix index 3a07d2f9ef0a4..901a67024923b 100644 --- a/pkgs/development/python-modules/dash-html-components/default.nix +++ b/pkgs/development/python-modules/dash-html-components/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "HTML components for Dash"; - homepage = https://dash.plot.ly/dash-html-components; + homepage = "https://dash.plot.ly/dash-html-components"; license = licenses.mit; maintainers = [ maintainers.antoinerg ]; }; diff --git a/pkgs/development/python-modules/dash-renderer/default.nix b/pkgs/development/python-modules/dash-renderer/default.nix index 348deba7123b9..a92f6617abec0 100644 --- a/pkgs/development/python-modules/dash-renderer/default.nix +++ b/pkgs/development/python-modules/dash-renderer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_renderer"; - version = "1.3.0"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "07nyajjc3209ha2nbvk43sh5bnslwb2hs9wn8q5dpfngsc96wr9g"; + sha256 = "11fl7756zshlrfiqcr6rcg1m0c4434vdg1bkrcjl54hl02k3pcmv"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash-table/default.nix b/pkgs/development/python-modules/dash-table/default.nix index 3ea04666249d0..9c323c6fa33fe 100644 --- a/pkgs/development/python-modules/dash-table/default.nix +++ b/pkgs/development/python-modules/dash-table/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_table"; - version = "4.6.2"; + version = "4.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1hn1yjz5ig2kzkk0wkr75q3l4lrfbnsh0kxzlld9sfn69d1vvsjw"; + sha256 = "0md7qqjpsarc8ymfccvsqgj6mgq8gxl09im5v5yxhv8hv24yy4jm"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 83632ff6db68c..4a9a9a60af872 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "dash"; - version = "1.10.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "18rrysfhmjfzb5b3n8fjbwk755p4slbb8fh9myq4qp76v00lfpnh"; + sha256 = "0nr5ppjbfmay0d3bah26i4k8xj6xyp24gq0cqlv9lzdrbdd3j9wy"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index 73705d9982aaf..0a88323fafd8c 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/dask/dask-glm/; + homepage = "https://github.com/dask/dask-glm/"; description = "Generalized Linear Models with Dask"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index 7b12d1fcc220a..48a6a73af6766 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ dask numpy toolz scipy pims ]; meta = with stdenv.lib; { - homepage = https://github.com/dask/dask-image; + homepage = "https://github.com/dask/dask-image"; description = "Distributed image processing"; license = licenses.bsdOriginal; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index f9af247bc8022..b651dca7265df 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/dask/dask-jobqueue; + homepage = "https://github.com/dask/dask-jobqueue"; description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index c5fafa495aa6d..f47515d5543a2 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/dask/dask-ml; + homepage = "https://github.com/dask/dask-ml"; description = "Scalable Machine Learn with Dask"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix index cd538afa15a26..741e39423a9b1 100644 --- a/pkgs/development/python-modules/dask-mpi/default.nix +++ b/pkgs/development/python-modules/dask-mpi/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/dask/dask-mpi; + homepage = "https://github.com/dask/dask-mpi"; description = "Deploy Dask using mpi4py"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/dask-xgboost/default.nix b/pkgs/development/python-modules/dask-xgboost/default.nix index d5f4de4efaa15..e5a94b491da0d 100644 --- a/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/pkgs/development/python-modules/dask-xgboost/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/dask/dask-xgboost; + homepage = "https://github.com/dask/dask-xgboost"; description = "Interactions between Dask and XGBoost"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index ef47f419a6e74..1b3a08aa99752 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , fsspec -, pytest +, pytestCheckHook , pythonOlder , cloudpickle , numpy @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2.10.1"; + version = "2.14.0"; disabled = pythonOlder "3.5"; @@ -23,13 +23,15 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - sha256 = "035mr7385yf5ng5wf60qxr80529h8dsla5hymkyg68dxhkd0jvbr"; + sha256 = "0kj46pwzvdw8ii1h45y48wxvjid89yp4cfak2h4b8z8xic73fqgj"; }; checkInputs = [ - pytest + pytestCheckHook ]; + dontUseSetuptoolsCheck = true; + propagatedBuildInputs = [ bokeh cloudpickle @@ -50,13 +52,14 @@ buildPythonPackage rec { --replace "cmdclass=versioneer.get_cmdclass()," "" ''; - checkPhase = '' - pytest - ''; + disabledTests = [ + "test_argwhere_str" + "test_count_nonzero_str" + ]; meta = { description = "Minimal task scheduling abstraction"; - homepage = https://github.com/ContinuumIO/dask/; + homepage = "https://github.com/ContinuumIO/dask/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index e4129ed9bbf39..f5a7c52ef8e50 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Async database support for Python"; - homepage = https://github.com/encode/databases; + homepage = "https://github.com/encode/databases"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix index 9dd061065437c..3ed52a28287dc 100644 --- a/pkgs/development/python-modules/databricks-cli/default.nix +++ b/pkgs/development/python-modules/databricks-cli/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "databricks-cli"; - version = "0.9.1"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1ebf123b5567c06b7583688077120ead075ca06938b9995d4acafa97863ed8ff"; + sha256 = "1w0my86r9fl0xqlczaqyp7v9rg7mpc42kp9swhids4qk4r5ncr2i"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/datadiff/default.nix b/pkgs/development/python-modules/datadiff/default.nix index 72964e3d1f644..0c30f2f84689f 100644 --- a/pkgs/development/python-modules/datadiff/default.nix +++ b/pkgs/development/python-modules/datadiff/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "DataDiff"; - homepage = https://sourceforge.net/projects/datadiff/; + homepage = "https://sourceforge.net/projects/datadiff/"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/datamodeldict/default.nix b/pkgs/development/python-modules/datamodeldict/default.nix index d23ecec169afb..1a77c22104cf0 100644 --- a/pkgs/development/python-modules/datamodeldict/default.nix +++ b/pkgs/development/python-modules/datamodeldict/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/usnistgov/DataModelDict/; + homepage = "https://github.com/usnistgov/DataModelDict/"; description = "Class allowing for data models equivalently represented as Python dictionaries, JSON, and XML"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 13d105cae6bbb..06e611c8cbffc 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -85,7 +85,7 @@ buildPythonPackage rec { meta = with lib; { description = "An instant JSON API for your SQLite databases"; - homepage = https://github.com/simonw/datasette; + homepage = "https://github.com/simonw/datasette"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 789e488e46150..6f7925a499824 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { meta = with lib; { description = "Data visualization toolchain based on aggregating into a grid"; - homepage = https://datashader.org; + homepage = "https://datashader.org"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index 27665c689c415..6f11ae62c3e9a 100644 --- a/pkgs/development/python-modules/datashape/default.nix +++ b/pkgs/development/python-modules/datashape/default.nix @@ -42,7 +42,7 @@ in buildPythonPackage rec { PYTEST_ADDOPTS = "-k 'not test_record and not test_tuple'"; meta = { - homepage = https://github.com/ContinuumIO/datashape; + homepage = "https://github.com/ContinuumIO/datashape"; description = "A data description language"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fridh ]; diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 9c406671f7804..f8810c9546410 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Date parsing library designed to parse dates from HTML pages"; - homepage = https://github.com/scrapinghub/dateparser; + homepage = "https://github.com/scrapinghub/dateparser"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix index 9c5f6145d8fd5..88024265d9482 100644 --- a/pkgs/development/python-modules/dateutil/default.nix +++ b/pkgs/development/python-modules/dateutil/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Powerful extensions to the standard datetime module"; - homepage = https://pypi.python.org/pypi/python-dateutil; + homepage = "https://pypi.python.org/pypi/python-dateutil"; license = "BSD-style"; }; } diff --git a/pkgs/development/python-modules/dbfread/default.nix b/pkgs/development/python-modules/dbfread/default.nix index 6c50313a51831..9dda98e03acf4 100644 --- a/pkgs/development/python-modules/dbfread/default.nix +++ b/pkgs/development/python-modules/dbfread/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Read DBF Files with Python"; - homepage = https://dbfread.readthedocs.org/; + homepage = "https://dbfread.readthedocs.org/"; license = with licenses; [ mit ]; maintainers = with maintainers; [ vrthra ]; }; diff --git a/pkgs/development/python-modules/ddt/default.nix b/pkgs/development/python-modules/ddt/default.nix index dac72fb72b78f..a660aaafca8a9 100644 --- a/pkgs/development/python-modules/ddt/default.nix +++ b/pkgs/development/python-modules/ddt/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Data-Driven/Decorated Tests, a library to multiply test cases"; - homepage = https://github.com/txels/ddt; + homepage = "https://github.com/txels/ddt"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index efdd5023a2467..b9e8e25ac437f 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { patches = [ (fetchpatch { - url = https://github.com/micheles/decorator/commit/3265f2755d16c0a3dfc9f1feee39722ddc11ee80.patch; + url = "https://github.com/micheles/decorator/commit/3265f2755d16c0a3dfc9f1feee39722ddc11ee80.patch"; sha256 = "1q5nmff30vccqq5swf2ivm8cn7x3lhz8c9qpj0zddgs2y7fw8syz"; }) ]; meta = with lib; { - homepage = https://pypi.python.org/pypi/decorator; + homepage = "https://pypi.python.org/pypi/decorator"; description = "Better living through Python with decorators"; license = lib.licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix index 8ebd3ef47bde3..8ede226d38b27 100644 --- a/pkgs/development/python-modules/deform/default.nix +++ b/pkgs/development/python-modules/deform/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Form library with advanced features like nested forms"; - homepage = https://docs.pylonsproject.org/projects/deform/en/latest/; + homepage = "https://docs.pylonsproject.org/projects/deform/en/latest/"; license = licenses.free; # http://www.repoze.org/LICENSE.txt maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix index a2a986828b5cb..127fe07f37360 100644 --- a/pkgs/development/python-modules/deluge-client/default.nix +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Lightweight pure-python rpc client for deluge"; - homepage = https://github.com/JohnDoee/deluge-client; + homepage = "https://github.com/JohnDoee/deluge-client"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix index c0055580c403a..05737ecf9a86b 100644 --- a/pkgs/development/python-modules/dendropy/default.nix +++ b/pkgs/development/python-modules/dendropy/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://dendropy.org/; + homepage = "https://dendropy.org/"; description = "A Python library for phylogenetic computing"; maintainers = with lib.maintainers; [ unode ]; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index b5a3a869b6972..121175c50857f 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Dependency injection microframework for Python"; - homepage = https://github.com/ets-labs/python-dependency-injector; + homepage = "https://github.com/ets-labs/python-dependency-injector"; license = licenses.bsd3; maintainers = with maintainers; [ gerschtli ]; }; diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index 6c338ce6dc28f..3411247599e3f 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "Deprecated"; - version = "1.2.8"; + version = "1.2.9"; src = fetchPypi { inherit pname version; - sha256 = "029mr75wgah0z1ilsf3vf3dmjn65y4fy1jgq5qny2qsb9hvwbblw"; + sha256 = "1k7c5kkh8jxxqdm0cbcvmhn3mwj0rcjwapwbzmm5r04n78lpvwqc"; }; propagatedBuildInputs = [ wrapt ]; diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix index e01433d90c5c5..fb5698062f77b 100644 --- a/pkgs/development/python-modules/deprecation/default.nix +++ b/pkgs/development/python-modules/deprecation/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deprecation"; - version = "2.0.7"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1vcjy6flqbzgjh4zhcs0sl83b946wxrlsx5miliz0ik1d9kjyff0"; + sha256 = "1zqqjlgmhgkpzg9ss5ki8wamxl83xn51fs6gn2a8cxsx9vkbvcvj"; }; propagatedBuildInputs = [ packaging ]; @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library to handle automated deprecations"; - homepage = https://deprecation.readthedocs.io/; + homepage = "https://deprecation.readthedocs.io/"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/derpconf/default.nix b/pkgs/development/python-modules/derpconf/default.nix index 84f30b7edf6ee..9138ef28530a7 100644 --- a/pkgs/development/python-modules/derpconf/default.nix +++ b/pkgs/development/python-modules/derpconf/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "derpconf abstracts loading configuration files for your app"; - homepage = https://github.com/globocom/derpconf; + homepage = "https://github.com/globocom/derpconf"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/descartes/default.nix b/pkgs/development/python-modules/descartes/default.nix index 996cd22e2633e..c726492f69d4d 100644 --- a/pkgs/development/python-modules/descartes/default.nix +++ b/pkgs/development/python-modules/descartes/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library to use Shapely or GeoJSON objects as matplotlib paths"; - homepage = https://bitbucket.org/sgillies/descartes/; + homepage = "https://bitbucket.org/sgillies/descartes/"; license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp ]; }; diff --git a/pkgs/development/python-modules/deskcon/default.nix b/pkgs/development/python-modules/deskcon/default.nix index 218f843e11a86..7beaa838a8254 100644 --- a/pkgs/development/python-modules/deskcon/default.nix +++ b/pkgs/development/python-modules/deskcon/default.nix @@ -35,7 +35,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Integrates an Android device into a desktop"; - homepage = https://github.com/screenfreeze/deskcon-desktop; + homepage = "https://github.com/screenfreeze/deskcon-desktop"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/detox/default.nix b/pkgs/development/python-modules/detox/default.nix index 9fbeef2488cae..5353d4361e350 100644 --- a/pkgs/development/python-modules/detox/default.nix +++ b/pkgs/development/python-modules/detox/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "What is detox?"; - homepage = https://bitbucket.org/hpk42/detox; + homepage = "https://bitbucket.org/hpk42/detox"; license = licenses.mit; # detox is unmaintained and incompatible with tox > 3.6 broken = true; diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 72db5d1b0ec8a..25d9353e155ee 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/devpi/devpi; + homepage = "https://github.com/devpi/devpi"; description = "Utilities jointly used by devpi-server and devpi-client"; license = licenses.mit; maintainers = with maintainers; [ lewo makefu ]; diff --git a/pkgs/development/python-modules/dftfit/default.nix b/pkgs/development/python-modules/dftfit/default.nix index 9095eb962fec0..0f0563e3baf54 100644 --- a/pkgs/development/python-modules/dftfit/default.nix +++ b/pkgs/development/python-modules/dftfit/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = { description = "Ab-Initio Molecular Dynamics Potential Development"; - homepage = https://gitlab.com/costrouc/dftfit; + homepage = "https://gitlab.com/costrouc/dftfit"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix new file mode 100644 index 0000000000000..abc07346efd32 --- /dev/null +++ b/pkgs/development/python-modules/dicom2nifti/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, gdcm +, nose +, nibabel +, numpy +, pydicom +, scipy +}: + +buildPythonPackage rec { + pname = "dicom2nifti"; + version = "2.2.8"; + disabled = isPy27; + + # no tests in PyPI dist + src = fetchFromGitHub { + owner = "icometrix"; + repo = pname; + rev = version; + sha256 = "1qi2map6f4pa1l8wsif7ff7rhja6ynrjlm7w306dzvi9l25mia34"; + }; + + propagatedBuildInputs = [ gdcm nibabel numpy pydicom scipy ]; + + checkInputs = [ nose gdcm ]; + checkPhase = "nosetests tests"; + + meta = with lib; { + homepage = "https://github.com/icometrix/dicom2nifti"; + description = "Library for converting dicom files to nifti"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix index 88cbee2649da9..457e9d3e530bd 100644 --- a/pkgs/development/python-modules/dict2xml/default.nix +++ b/pkgs/development/python-modules/dict2xml/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dict2xml"; - version = "1.6.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "17wsybqq0916i1yh7bpf2cmicldn7d0y2b9mzlgs503fkcpxda5w"; + sha256 = "0bfn8n8sb3slwx7ra8m8fbfy65k20h2qxcqfq99hwqrrkgcffihl"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/dicttoxml/default.nix b/pkgs/development/python-modules/dicttoxml/default.nix index 7d30aad69c456..9e24784731cfd 100644 --- a/pkgs/development/python-modules/dicttoxml/default.nix +++ b/pkgs/development/python-modules/dicttoxml/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Converts a Python dictionary or other native data type into a valid XML string"; - homepage = https://github.com/quandyfactory/dicttoxml; + homepage = "https://github.com/quandyfactory/dicttoxml"; license = lib.licenses.gpl2; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index 585f96341eef6..3058f3e400914 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "diff_cover"; - version = "2.6.0"; + version = "2.6.1"; preCheck = '' export LC_ALL=en_US.UTF-8; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1bsxc9x3yx5dy2r3b3lzi97wz0ma3ncd14jr27n6lbqvl20w92mm"; + sha256 = "0a6ylkfqr95awp6za0var0nysmnbgwn46np8cmi1bkldil2407lz"; }; propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Automatically find diff lines that need test coverage"; - homepage = https://github.com/Bachmann1234/diff-cover; + homepage = "https://github.com/Bachmann1234/diff-cover"; license = licenses.asl20; maintainers = with maintainers; [ dzabraev ]; }; diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index 971b811a221ff..47419ec559e06 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "discord.py"; - version = "1.2.5"; + version = "1.3.3"; disabled = pythonOlder "3.5.3"; # only distributes wheels on pypi now @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "Rapptz"; repo = pname; rev = "v${version}"; - sha256 = "17l6mlfi9ikqndpmi4pwlvb53g132cycyfm9nzdyiqr96k8ly4ig"; + sha256 = "0ld92vh7kjk3f02nbqyib68844yi4p2kmkyir6v9wi00y1l287l3"; }; propagatedBuildInputs = [ aiohttp websockets ]; patchPhase = '' substituteInPlace "requirements.txt" \ - --replace "aiohttp>=3.3.0,<3.6.0" "aiohttp~=3.3" \ - --replace "websockets>=6.0,<7.0" "websockets>=6" + --replace "aiohttp>=3.6.0,<3.7.0" "aiohttp~=3.6.0" \ + --replace "websockets>=6.0,!=7.0,!=8.0,!=8.0.1,<9.0" "websockets>=6" '' + lib.optionalString withVoice '' substituteInPlace "discord/opus.py" \ --replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'" diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index 81575058b1571..b9a92fb2cdbe3 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Low-level components of distutils2/packaging"; - homepage = https://distlib.readthedocs.io; + homepage = "https://distlib.readthedocs.io"; license = licenses.psfl; maintainers = with maintainers; [ lnl7 ]; }; diff --git a/pkgs/development/python-modules/distorm3/default.nix b/pkgs/development/python-modules/distorm3/default.nix index e21e6270b91a0..29524240a8a78 100644 --- a/pkgs/development/python-modules/distorm3/default.nix +++ b/pkgs/development/python-modules/distorm3/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Powerful Disassembler Library For x86/AMD64"; - homepage = https://github.com/gdabah/distorm; + homepage = "https://github.com/gdabah/distorm"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index ad8da4255d69c..8880ec7235dc7 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/nir0s/distro; + homepage = "https://github.com/nir0s/distro"; description = "Linux Distribution - a Linux OS platform information API."; license = licenses.asl20; maintainers = with maintainers; [ nand0p ]; diff --git a/pkgs/development/python-modules/distutils_extra/default.nix b/pkgs/development/python-modules/distutils_extra/default.nix index 42e7fe6e9f4c9..1e66f04374be7 100644 --- a/pkgs/development/python-modules/distutils_extra/default.nix +++ b/pkgs/development/python-modules/distutils_extra/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://launchpad.net/python-distutils-extra; + homepage = "https://launchpad.net/python-distutils-extra"; description = "Enhancements to Python's distutils"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix index f334b7efeac66..698e2a0c30524 100644 --- a/pkgs/development/python-modules/dj-database-url/default.nix +++ b/pkgs/development/python-modules/dj-database-url/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "Use Database URLs in your Django Application"; - homepage = https://github.com/kennethreitz/dj-database-url; + homepage = "https://github.com/kennethreitz/dj-database-url"; license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix index de052b67ecf16..cd01ddf1e8234 100644 --- a/pkgs/development/python-modules/dj-email-url/default.nix +++ b/pkgs/development/python-modules/dj-email-url/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/migonzalvar/dj-email-url; + homepage = "https://github.com/migonzalvar/dj-email-url"; description = "Use an URL to configure email backend settings in your Django Application"; license = licenses.bsd0; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/dj-search-url/default.nix b/pkgs/development/python-modules/dj-search-url/default.nix index 68fe4c913d694..f86f08ae60b92 100644 --- a/pkgs/development/python-modules/dj-search-url/default.nix +++ b/pkgs/development/python-modules/dj-search-url/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/dstufft/dj-search-url; + homepage = "https://github.com/dstufft/dj-search-url"; description = "Use Search URLs in your Django Haystack Application"; license = licenses.bsd0; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index 10fe8cde82670..a91bd6cadc3e5 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account authentication"; - homepage = https://www.intenct.nl/projects/django-allauth; + homepage = "https://www.intenct.nl/projects/django-allauth"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index d05b5b0b92bfe..8c3e19630d411 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { # sparkpost is missing because it's not packaged yet meta = with stdenv.lib; { description = "Django email backends and webhooks for Mailgun"; - homepage = https://github.com/anymail/django-anymail; + homepage = "https://github.com/anymail/django-anymail"; license = licenses.bsd3; maintainers = with maintainers; [ ivegotasthma ]; }; diff --git a/pkgs/development/python-modules/django-cache-url/default.nix b/pkgs/development/python-modules/django-cache-url/default.nix index 6b8aac33139c2..6c5ac10391257 100644 --- a/pkgs/development/python-modules/django-cache-url/default.nix +++ b/pkgs/development/python-modules/django-cache-url/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/ghickman/django-cache-url; + homepage = "https://github.com/ghickman/django-cache-url"; description = "Use Cache URLs in your Django application"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/django-cleanup/default.nix b/pkgs/development/python-modules/django-cleanup/default.nix index 6484fb8c5551c..37b0959b6b756 100644 --- a/pkgs/development/python-modules/django-cleanup/default.nix +++ b/pkgs/development/python-modules/django-cleanup/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Automatically deletes old file for FileField and ImageField. It also deletes files on models instance deletion"; - homepage = https://github.com/un1t/django-cleanup; + homepage = "https://github.com/un1t/django-cleanup"; license = licenses.mit; maintainers = with maintainers; [ mmai ]; }; diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix index 9caa1cb730ba8..57426181b7358 100644 --- a/pkgs/development/python-modules/django-compat/default.nix +++ b/pkgs/development/python-modules/django-compat/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Forward and backwards compatibility layer for Django 1.4, 1.7, 1.8, 1.9, 1.10 and 1.11"; - homepage = https://github.com/arteria/django-compat; + homepage = "https://github.com/arteria/django-compat"; license = licenses.mit; maintainers = with maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index 37646e9050675..5b813977493e2 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://django-configurations.readthedocs.io/; + homepage = "https://django-configurations.readthedocs.io/"; description = "A helper for organizing Django settings"; license = licenses.bsd0; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index 005dc65a4993c..6e699391705a4 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Django app for handling server Cross-Origin Resource Sharing (CORS) headers"; - homepage = https://github.com/OttoYiu/django-cors-headers; + homepage = "https://github.com/OttoYiu/django-cors-headers"; license = licenses.mit; maintainers = [ maintainers.ivegotasthma ]; }; diff --git a/pkgs/development/python-modules/django-discover-runner/default.nix b/pkgs/development/python-modules/django-discover-runner/default.nix index 82895f76473b7..43ae9a7c83a5b 100644 --- a/pkgs/development/python-modules/django-discover-runner/default.nix +++ b/pkgs/development/python-modules/django-discover-runner/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/jezdez/django-discover-runner; + homepage = "https://github.com/jezdez/django-discover-runner"; description = "A Django test runner based on unittest2's test discovery"; license = licenses.bsd0; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix index cea5a7976bb40..5d50c628920c2 100644 --- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/EliotBerriot/django-dynamic-preferences; + homepage = "https://github.com/EliotBerriot/django-dynamic-preferences"; description = "Dynamic global and instance settings for your django project"; license = licenses.bsd3; maintainers = with maintainers; [ mmai ]; diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/pkgs/development/python-modules/django-hijack-admin/default.nix index 005d61acab9ba..e30fc88079caa 100644 --- a/pkgs/development/python-modules/django-hijack-admin/default.nix +++ b/pkgs/development/python-modules/django-hijack-admin/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Admin integration for django-hijack"; - homepage = https://github.com/arteria/django-hijack-admin; + homepage = "https://github.com/arteria/django-hijack-admin"; license = licenses.mit; maintainers = with maintainers; [ lsix ]; }; diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index f41e7d146c97e..d736e69ae6ef2 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Allows superusers to hijack (=login as) and work on behalf of another user"; - homepage = https://github.com/arteria/django-hijack; + homepage = "https://github.com/arteria/django-hijack"; license = licenses.mit; maintainers = with maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix index 89147db63a88b..4049f8722fcb4 100644 --- a/pkgs/development/python-modules/django-ipware/default.nix +++ b/pkgs/development/python-modules/django-ipware/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { meta = { description = "A Django application to retrieve user's IP address"; - homepage = https://github.com/un33k/django-ipware; + homepage = "https://github.com/un33k/django-ipware"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja2/default.nix index 338af16b2e961..7b49ddb539999 100644 --- a/pkgs/development/python-modules/django-jinja2/default.nix +++ b/pkgs/development/python-modules/django-jinja2/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { meta = { description = "Simple and nonobstructive jinja2 integration with Django"; - homepage = https://github.com/niwinz/django-jinja; + homepage = "https://github.com/niwinz/django-jinja"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index 1927e4e9954c1..700fc3ae4e870 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "OAuth2 goodies for the Djangonauts"; - homepage = https://github.com/jazzband/django-oauth-toolkit; + homepage = "https://github.com/jazzband/django-oauth-toolkit"; license = licenses.bsd2; maintainers = with maintainers; [ mmai ]; }; diff --git a/pkgs/development/python-modules/django-paintstore/default.nix b/pkgs/development/python-modules/django-paintstore/default.nix index 096215a70abf6..b2c755907c154 100644 --- a/pkgs/development/python-modules/django-paintstore/default.nix +++ b/pkgs/development/python-modules/django-paintstore/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Django app that integrates jQuery ColorPicker with the Django admin"; - homepage = https://github.com/gsiegman/django-paintstore; + homepage = "https://github.com/gsiegman/django-paintstore"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/django-pglocks/default.nix b/pkgs/development/python-modules/django-pglocks/default.nix index 5963b24c83014..a84850a1fda97 100644 --- a/pkgs/development/python-modules/django-pglocks/default.nix +++ b/pkgs/development/python-modules/django-pglocks/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { meta = { description = "PostgreSQL locking context managers and functions for Django."; - homepage = https://github.com/Xof/django-pglocks; + homepage = "https://github.com/Xof/django-pglocks"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index 9ba4e14c31a69..90772b503af51 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = { description = "A pickled object field for Django"; - homepage = https://github.com/gintas/django-picklefield; + homepage = "https://github.com/gintas/django-picklefield"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/django-pipeline/default.nix b/pkgs/development/python-modules/django-pipeline/default.nix index acb5587186dbc..3276f7a065c76 100644 --- a/pkgs/development/python-modules/django-pipeline/default.nix +++ b/pkgs/development/python-modules/django-pipeline/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pipeline is an asset packaging library for Django"; - homepage = https://github.com/cyberdelia/django-pipeline; + homepage = "https://github.com/cyberdelia/django-pipeline"; license = licenses.mit; broken = true; }; diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index 443f793f37b41..c08facd3650eb 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/django-polymorphic/django-polymorphic; + homepage = "https://github.com/django-polymorphic/django-polymorphic"; description = "Improved Django model inheritance with automatic downcasting"; license = stdenv.lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix index 35be6f76147c8..993647c3f2328 100644 --- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix +++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Django PostgreSQL netfields implementation"; - homepage = https://github.com/jimfunk/django-postgresql-netfields; + homepage = "https://github.com/jimfunk/django-postgresql-netfields"; license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix index 7ceee27e6f4ed..89a8834824406 100644 --- a/pkgs/development/python-modules/django-q/default.nix +++ b/pkgs/development/python-modules/django-q/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A multiprocessing distributed task queue for Django"; - homepage = https://django-q.readthedocs.org; + homepage = "https://django-q.readthedocs.org"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index e549fc8e1d727..03310afa0279f 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Basic raster data integration for Django"; - homepage = https://github.com/geodesign/django-raster; + homepage = "https://github.com/geodesign/django-raster"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/django-rest-auth/default.nix b/pkgs/development/python-modules/django-rest-auth/default.nix index a6edc98b0cb8a..9e11c2b6a03e0 100644 --- a/pkgs/development/python-modules/django-rest-auth/default.nix +++ b/pkgs/development/python-modules/django-rest-auth/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Django app that makes registration and authentication easy"; - homepage = https://github.com/Tivix/django-rest-auth; + homepage = "https://github.com/Tivix/django-rest-auth"; license = licenses.mit; maintainers = [ maintainers.ivegotasthma ]; }; diff --git a/pkgs/development/python-modules/django-sampledatahelper/default.nix b/pkgs/development/python-modules/django-sampledatahelper/default.nix index e08c296e80766..edeb914946e3e 100644 --- a/pkgs/development/python-modules/django-sampledatahelper/default.nix +++ b/pkgs/development/python-modules/django-sampledatahelper/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { meta = { description = "Helper class for generate sample data for django apps development"; - homepage = https://github.com/kaleidos/django-sampledatahelper; + homepage = "https://github.com/kaleidos/django-sampledatahelper"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/django-sesame/default.nix b/pkgs/development/python-modules/django-sesame/default.nix index cdf737061ba91..e24fff1efe775 100644 --- a/pkgs/development/python-modules/django-sesame/default.nix +++ b/pkgs/development/python-modules/django-sesame/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "URLs with authentication tokens for automatic login"; - homepage = https://github.com/aaugustin/django-sesame; + homepage = "https://github.com/aaugustin/django-sesame"; license = licenses.bsd3; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/development/python-modules/django-sites/default.nix b/pkgs/development/python-modules/django-sites/default.nix index 2882e1dc2b93a..468f7e738038b 100644 --- a/pkgs/development/python-modules/django-sites/default.nix +++ b/pkgs/development/python-modules/django-sites/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { Alternative implementation of django "sites" framework based on settings instead of models. ''; - homepage = https://github.com/niwinz/django-sites; + homepage = "https://github.com/niwinz/django-sites"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/django-sr/default.nix b/pkgs/development/python-modules/django-sr/default.nix index b8924b37bfd02..39b3832185d3f 100644 --- a/pkgs/development/python-modules/django-sr/default.nix +++ b/pkgs/development/python-modules/django-sr/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { meta = { description = "Django settings resolver"; - homepage = https://github.com/jespino/django-sr; + homepage = "https://github.com/jespino/django-sr"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index dbf4e64db5a55..cae83135a6fa0 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Collection of custom storage backends for Django"; - homepage = https://django-storages.readthedocs.io; + homepage = "https://django-storages.readthedocs.io"; license = licenses.bsd3; maintainers = with maintainers; [ mmai ]; }; diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index af3404b2f880b..e3e094ab706a2 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "django-webpack-loader"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "087mspmx74qbcknpbksl66rsyin0dc5aglhjmmpk999pl2wvdfk0"; + sha256 = "0izl6bibhz3v538ad5hl13lfr6kvprf62rcl77wq2i5538h8hg3s"; }; # django.core.exceptions.ImproperlyConfigured (path issue with DJANGO_SETTINGS_MODULE?) @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "Use webpack to generate your static bundles"; - homepage = https://github.com/owais/django-webpack-loader; + homepage = "https://github.com/owais/django-webpack-loader"; maintainers = with maintainers; [ peterromfeldhk ]; license = with licenses; [ mit ]; }; diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index 4c4997595c44e..b38962f4efaf4 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; + homepage = "https://www.djangoproject.com/"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2_2.nix index 63a0f33d8f934..70cba819e92d2 100644 --- a/pkgs/development/python-modules/django/2_2.nix +++ b/pkgs/development/python-modules/django/2_2.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; + homepage = "https://www.djangoproject.com/"; license = licenses.bsd3; maintainers = with maintainers; [ georgewhewell lsix ]; }; diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django_appconf/default.nix index 0d077b4f268d7..45116ddd55486 100644 --- a/pkgs/development/python-modules/django_appconf/default.nix +++ b/pkgs/development/python-modules/django_appconf/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A helper class for handling configuration defaults of packaged apps gracefully"; - homepage = https://django-appconf.readthedocs.org/; + homepage = "https://django-appconf.readthedocs.org/"; license = licenses.bsd2; maintainers = with maintainers; [ desiderius ]; }; diff --git a/pkgs/development/python-modules/django_colorful/default.nix b/pkgs/development/python-modules/django_colorful/default.nix index 84dca56b22b12..10068f87b0798 100644 --- a/pkgs/development/python-modules/django_colorful/default.nix +++ b/pkgs/development/python-modules/django_colorful/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Django extension that provides database and form color fields"; - homepage = https://github.com/charettes/django-colorful; + homepage = "https://github.com/charettes/django-colorful"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix index cc860a9d35463..1408032d0c275 100644 --- a/pkgs/development/python-modules/django_compressor/default.nix +++ b/pkgs/development/python-modules/django_compressor/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Compresses linked and inline JavaScript or CSS into single cached files"; - homepage = https://django-compressor.readthedocs.org/en/latest/; + homepage = "https://django-compressor.readthedocs.org/en/latest/"; license = licenses.mit; maintainers = with maintainers; [ desiderius ]; }; diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django_contrib_comments/default.nix index 12d8c220affd3..303d6d95a460e 100644 --- a/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/pkgs/development/python-modules/django_contrib_comments/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django six ]; meta = with stdenv.lib; { - homepage = https://github.com/django/django-contrib-comments; + homepage = "https://github.com/django/django-contrib-comments"; description = "The code formerly known as django.contrib.comments"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/django_environ/default.nix b/pkgs/development/python-modules/django_environ/default.nix index f95babfe2338c..e4ec7505c831a 100644 --- a/pkgs/development/python-modules/django_environ/default.nix +++ b/pkgs/development/python-modules/django_environ/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Utilize environment variables to configure your Django application"; - homepage = https://github.com/joke2k/django-environ/; + homepage = "https://github.com/joke2k/django-environ/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index db11817186e0e..e276c6b656bb3 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Per object permissions for Django"; - homepage = https://github.com/django-guardian/django-guardian; + homepage = "https://github.com/django-guardian/django-guardian"; license = [ licenses.mit licenses.bsd2 ]; }; } diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index 943f949149855..27060e18ae27d 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Django extension to allow working with 'clusters' of models as a single unit, independently of the database"; - homepage = https://github.com/torchbox/django-modelcluster/; + homepage = "https://github.com/torchbox/django-modelcluster/"; license = licenses.bsd2; maintainers = with maintainers; [ desiderius ]; }; diff --git a/pkgs/development/python-modules/django_nose/default.nix b/pkgs/development/python-modules/django_nose/default.nix index cf9516ce23a51..5d3522c5b47f1 100644 --- a/pkgs/development/python-modules/django_nose/default.nix +++ b/pkgs/development/python-modules/django_nose/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Provides all the goodness of nose in your Django tests"; - homepage = https://github.com/django-nose/django-nose; + homepage = "https://github.com/django-nose/django-nose"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix index c19ca25531941..26fb504e0e995 100644 --- a/pkgs/development/python-modules/django_redis/default.nix +++ b/pkgs/development/python-modules/django_redis/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Full featured redis cache backend for Django"; - homepage = https://github.com/niwibe/django-redis; + homepage = "https://github.com/niwibe/django-redis"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix index 5a4faf5f24e3b..8b536a40ebc49 100644 --- a/pkgs/development/python-modules/django_reversion/default.nix +++ b/pkgs/development/python-modules/django_reversion/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An extension to the Django web framework that provides comprehensive version control facilities"; - homepage = https://github.com/etianen/django-reversion; + homepage = "https://github.com/etianen/django-reversion"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix index 85e5f8f02f057..95a991f341782 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/pkgs/development/python-modules/django_silk/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Silky smooth profiling for the Django Framework"; - homepage = https://github.com/mtford90/silk; + homepage = "https://github.com/mtford90/silk"; license = licenses.mit; maintainers = with maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/django_tagging/default.nix b/pkgs/development/python-modules/django_tagging/default.nix index fa06117a64495..b54186b4fa297 100644 --- a/pkgs/development/python-modules/django_tagging/default.nix +++ b/pkgs/development/python-modules/django_tagging/default.nix @@ -16,6 +16,6 @@ buildPythonPackage rec { meta = { description = "A generic tagging application for Django projects"; - homepage = https://github.com/Fantomas42/django-tagging; + homepage = "https://github.com/Fantomas42/django-tagging"; }; } diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix index 2851894b6b6f2..d73596269140d 100644 --- a/pkgs/development/python-modules/django_taggit/default.nix +++ b/pkgs/development/python-modules/django_taggit/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "django-taggit is a reusable Django application for simple tagging"; - homepage = https://github.com/alex/django-taggit/tree/master/; + homepage = "https://github.com/alex/django-taggit/tree/master/"; license = licenses.bsd2; maintainers = with maintainers; [ desiderius ]; }; diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django_treebeard/default.nix index d4b3464b6aebd..060867d837f92 100644 --- a/pkgs/development/python-modules/django_treebeard/default.nix +++ b/pkgs/development/python-modules/django_treebeard/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Efficient tree implementations for Django 1.6+"; - homepage = https://tabo.pe/projects/django-treebeard/; + homepage = "https://tabo.pe/projects/django-treebeard/"; maintainers = with maintainers; [ desiderius ]; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/djangoql/default.nix b/pkgs/development/python-modules/djangoql/default.nix index df8d62e9bdc9e..28aa28c3b9997 100644 --- a/pkgs/development/python-modules/djangoql/default.nix +++ b/pkgs/development/python-modules/djangoql/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Advanced search language for Django"; - homepage = https://github.com/ivelum/djangoql; + homepage = "https://github.com/ivelum/djangoql"; license = licenses.mit; maintainers = with maintainers; [ earvstedt ]; }; diff --git a/pkgs/development/python-modules/djangorestframework-jwt/default.nix b/pkgs/development/python-modules/djangorestframework-jwt/default.nix index f50fd3ff9b619..643218242d798 100644 --- a/pkgs/development/python-modules/djangorestframework-jwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-jwt/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "JSON Web Token Authentication support for Django REST Framework"; - homepage = https://github.com/GetBlimp/django-rest-framework-jwt; + homepage = "https://github.com/GetBlimp/django-rest-framework-jwt"; license = licenses.mit; maintainers = [ maintainers.ivegotasthma ]; }; diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 60e5760b52447..ee67db3eab013 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Web APIs for Django, made easy"; - homepage = https://www.django-rest-framework.org/; + homepage = "https://www.django-rest-framework.org/"; maintainers = with maintainers; [ desiderius ]; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/djmail/default.nix b/pkgs/development/python-modules/djmail/default.nix index 1659d46abbc52..516a2163f44ef 100644 --- a/pkgs/development/python-modules/djmail/default.nix +++ b/pkgs/development/python-modules/djmail/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { meta = { description = "Simple, powerfull and nonobstructive django email middleware"; - homepage = https://github.com/bameda/djmail; + homepage = "https://github.com/bameda/djmail"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index c65fdfec95334..5d045e5108a85 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dkimpy"; - version = "1.0.2"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "19rz48pzz1i5cc896khaqx2hkhcj5hwsklnyynrdgdr5818qjyff"; + sha256 = "14idcs0wiyc0iyi5bz3xqimxf3x6dizcjfn92s2ka5zxp95xdyvd"; }; checkInputs = [ pytest ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { records. This version also supports the experimental Authenticated Received Chain (ARC) protocol. ''; - homepage = https://launchpad.net/dkimpy; + homepage = "https://launchpad.net/dkimpy"; license = licenses.bsd3; maintainers = with maintainers; [ leenaars ]; }; diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index 603d900b8106c..4205d32d4958f 100644 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -36,7 +36,7 @@ let bazelTarget = ":install"; fetchAttrs = { - sha256 = "0wb2gh9ji8bgq4s9ci9x017dybxqzjhncpw33b1wjksm2yhbkvlz"; + sha256 = "0jlgmwcanfkhkwvh4vxibpi0zyyl6xkjzcz2xqn7raympqscq81a"; }; bazelFlags = [ @@ -84,7 +84,7 @@ in buildPythonPackage { meta = with lib; { description = "TensorFlow-based neural network library"; - homepage = https://sonnet.dev; + homepage = "https://sonnet.dev"; license = licenses.asl20; maintainers = with maintainers; [ timokau ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/dmenu/default.nix b/pkgs/development/python-modules/dmenu/default.nix index 7897138d59f8c..130110173eedc 100644 --- a/pkgs/development/python-modules/dmenu/default.nix +++ b/pkgs/development/python-modules/dmenu/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "A Python wrapper for dmenu"; - homepage = https://dmenu.readthedocs.io; + homepage = "https://dmenu.readthedocs.io"; license = lib.licenses.mit; maintainers = [ lib.maintainers.nico202 ]; }; diff --git a/pkgs/development/python-modules/dnslib/default.nix b/pkgs/development/python-modules/dnslib/default.nix index e6ec04bb79e21..fafa4c5cbf575 100644 --- a/pkgs/development/python-modules/dnslib/default.nix +++ b/pkgs/development/python-modules/dnslib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple library to encode/decode DNS wire-format packets"; license = licenses.bsd2; - homepage = https://bitbucket.org/paulc/dnslib/; + homepage = "https://bitbucket.org/paulc/dnslib/"; maintainers = with maintainers; [ delroth ]; }; } diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index 74b49d1fa5a3c..6a65dba767c95 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = { description = "A DNS toolkit for Python 3.x"; - homepage = http://www.dnspython.org; + homepage = "http://www.dnspython.org"; # BSD-like, check http://www.dnspython.org/LICENSE for details license = lib.licenses.free; }; diff --git a/pkgs/development/python-modules/docker-py/default.nix b/pkgs/development/python-modules/docker-py/default.nix index 84dba75e404a3..f7982c4a11912 100644 --- a/pkgs/development/python-modules/docker-py/default.nix +++ b/pkgs/development/python-modules/docker-py/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "Python library for the Docker Remote API"; - homepage = https://github.com/docker/docker-py/; + homepage = "https://github.com/docker/docker-py/"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.pmiddend ]; }; diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix index e47196df07a1b..a75278d45d433 100644 --- a/pkgs/development/python-modules/docker-pycreds/default.nix +++ b/pkgs/development/python-modules/docker-pycreds/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for the docker credentials store API."; - homepage = https://github.com/shin-/dockerpy-creds; + homepage = "https://github.com/shin-/dockerpy-creds"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/dockerfile-parse/default.nix b/pkgs/development/python-modules/dockerfile-parse/default.nix index 2f9e32f088ea5..5c3e517a4947c 100644 --- a/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for parsing Dockerfile files"; - homepage = https://github.com/DBuildService/dockerfile-parse; + homepage = "https://github.com/DBuildService/dockerfile-parse"; license = licenses.bsd3; maintainers = with maintainers; [ leenaars ]; }; diff --git a/pkgs/development/python-modules/dockerpty/default.nix b/pkgs/development/python-modules/dockerpty/default.nix index f7a64481c663b..fd9d7b4b88da4 100644 --- a/pkgs/development/python-modules/dockerpty/default.nix +++ b/pkgs/development/python-modules/dockerpty/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Functionality needed to operate the pseudo-tty (PTY) allocated to a docker container"; - homepage = https://github.com/d11wtq/dockerpty; + homepage = "https://github.com/d11wtq/dockerpty"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/docopt/default.nix b/pkgs/development/python-modules/docopt/default.nix index 61c71d87c5333..135bedfc43e84 100644 --- a/pkgs/development/python-modules/docopt/default.nix +++ b/pkgs/development/python-modules/docopt/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pythonic argument parser, that will make you smile"; - homepage = http://docopt.org/; + homepage = "http://docopt.org/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/docrep/default.nix b/pkgs/development/python-modules/docrep/default.nix index 8e6b00d808cb7..b467802b62f77 100644 --- a/pkgs/development/python-modules/docrep/default.nix +++ b/pkgs/development/python-modules/docrep/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Python package for docstring repetition"; - homepage = https://github.com/Chilipp/docrep; + homepage = "https://github.com/Chilipp/docrep"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix index f3be88987606c..0241fd15ad48f 100644 --- a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix +++ b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix @@ -14,6 +14,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Add flag to ignore unicode literal prefixes in doctests"; license = with licenses; [ asl20 ]; - homepage = https://github.com/gnublade/doctest-ignore-unicode; + homepage = "https://github.com/gnublade/doctest-ignore-unicode"; }; } diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index e81a502742c73..8c1fb3720ca12 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { description = "Docutils -- Python Documentation Utilities"; - homepage = http://docutils.sourceforge.net/; + homepage = "http://docutils.sourceforge.net/"; maintainers = with lib.maintainers; [ AndersonTorres ]; }; } diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 414e9b065c730..af811903505a8 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A caching front-end based on the Dogpile lock"; - homepage = https://bitbucket.org/zzzeek/dogpile.cache; + homepage = "https://bitbucket.org/zzzeek/dogpile.cache"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/dogpile.core/default.nix b/pkgs/development/python-modules/dogpile.core/default.nix index 622954f614490..41340cda26ee0 100644 --- a/pkgs/development/python-modules/dogpile.core/default.nix +++ b/pkgs/development/python-modules/dogpile.core/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A 'dogpile' lock, typically used as a component of a larger caching solution"; - homepage = https://bitbucket.org/zzzeek/dogpile.core; + homepage = "https://bitbucket.org/zzzeek/dogpile.core"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix index a12a63c46f143..44142ca9441ea 100644 --- a/pkgs/development/python-modules/dogtail/default.nix +++ b/pkgs/development/python-modules/dogtail/default.nix @@ -25,7 +25,7 @@ buildPythonPackage { # sha256 = "0p5wfssvzr9w0bvhllzbbd8fnp4cca2qxcpcsc33dchrmh5n552x"; # }; src = fetchurl { - url = https://gitlab.com/dogtail/dogtail/raw/released/dogtail-0.9.10.tar.gz; + url = "https://gitlab.com/dogtail/dogtail/raw/released/dogtail-0.9.10.tar.gz"; sha256 = "14sycidl8ahj3fwlhpwlpnyd43c302yqr7nqg2hj39pyj7kgk15b"; }; @@ -53,7 +53,7 @@ buildPythonPackage { meta = { description = "GUI test tool and automation framework that uses Accessibility technologies to communicate with desktop applications"; - homepage = https://gitlab.com/dogtail/dogtail; + homepage = "https://gitlab.com/dogtail/dogtail"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ jtojnar ]; }; diff --git a/pkgs/development/python-modules/dotnetcore2/default.nix b/pkgs/development/python-modules/dotnetcore2/default.nix index 4d3edf0906a08..7cc069707aadf 100644 --- a/pkgs/development/python-modules/dotnetcore2/default.nix +++ b/pkgs/development/python-modules/dotnetcore2/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "dotnetcore2"; - version = "2.1.11"; + version = "2.1.14"; format = "wheel"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { inherit pname version format; python = "py3"; platform = "manylinux1_x86_64"; - sha256 = "0qhp94bjz4icz2f0fnhgck875chiqzy4lvsp6lwhj5jd0zsv2bb3"; + sha256 = "0dxp9a73ncjylc09bjwq81fgj5ysk1yi27l8ka5f98121k1kmn6q"; }; nativeBuildInputs = [ unzip ]; @@ -35,18 +35,18 @@ buildPythonPackage rec { ) ]; - # unfortunately the noraml pip install fails because the manylinux1 format check fails with NixOS + # remove bin, which has a broken dotnetcore installation installPhase = '' - mkdir -p $out/${python.sitePackages}/${pname} - # copy metadata - cp -r dotnetcore2-2* $out/${python.sitePackages} - # copy non-dotnetcore related files - cp -r dotnetcore2/{__init__.py,runtime.py} $out/${python.sitePackages}/${pname} + rm -rf dotnetcore2/bin + mkdir -p $out/${python.sitePackages}/ + cp -r dotnetcore2 $out/${python.sitePackages}/ ''; # no tests, ensure it's one useful function works checkPhase = '' - ${python.interpreter} -c 'from dotnetcore2 import runtime; print(runtime.get_runtime_path())' + rm -r dotnetcore2 # avoid importing local directory + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + ${python.interpreter} -c 'from dotnetcore2 import runtime; print(runtime.get_runtime_path()); runtime.ensure_dependencies()' ''; meta = with lib; { diff --git a/pkgs/development/python-modules/dparse/default.nix b/pkgs/development/python-modules/dparse/default.nix new file mode 100644 index 0000000000000..6433e0d17a727 --- /dev/null +++ b/pkgs/development/python-modules/dparse/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27, pytest, toml, pyyaml }: + +buildPythonPackage rec { + pname = "dparse"; + version = "0.5.1"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "a1b5f169102e1c894f9a7d5ccf6f9402a836a5d24be80a986c7ce9eaed78f367"; + }; + + propagatedBuildInputs = [ toml pyyaml ]; + + checkInputs = [ pytest ]; + + meta = with lib; { + description = "A parser for Python dependency files"; + homepage = "https://github.com/pyupio/safety"; + license = licenses.mit; + maintainers = with maintainers; [ thomasdesr ]; + }; +} diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix index 3b878f7d5e4c4..c526d9aedc6c9 100644 --- a/pkgs/development/python-modules/dpath/default.nix +++ b/pkgs/development/python-modules/dpath/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/akesterson/dpath-python; + homepage = "https://github.com/akesterson/dpath-python"; license = [ licenses.mit ]; description = "A python library for accessing and searching dictionaries via /slashed/paths ala xpath"; maintainers = [ maintainers.mmlb ]; diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix index 707b1e5bc6e25..d1a349d79a2d5 100644 --- a/pkgs/development/python-modules/drf-yasg/default.nix +++ b/pkgs/development/python-modules/drf-yasg/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Generation of Swagger/OpenAPI schemas for Django REST Framework"; - homepage = https://github.com/axnsan12/drf-yasg; + homepage = "https://github.com/axnsan12/drf-yasg"; maintainers = with maintainers; [ ivegotasthma ]; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix index 975ec8400b2b1..bc01b46eadaf7 100644 --- a/pkgs/development/python-modules/drms/default.nix +++ b/pkgs/development/python-modules/drms/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Access HMI, AIA and MDI data with Python"; - homepage = https://github.com/sunpy/drms; + homepage = "https://github.com/sunpy/drms"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/ds4drv/default.nix b/pkgs/development/python-modules/ds4drv/default.nix index ccc5c574689c1..05f54c2f90641 100644 --- a/pkgs/development/python-modules/ds4drv/default.nix +++ b/pkgs/development/python-modules/ds4drv/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "Userspace driver for the DualShock 4 controller"; - homepage = https://github.com/chrippa/ds4drv; + homepage = "https://github.com/chrippa/ds4drv"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/dtopt/default.nix b/pkgs/development/python-modules/dtopt/default.nix index 601ebf6d9a995..4b649cad9668d 100644 --- a/pkgs/development/python-modules/dtopt/default.nix +++ b/pkgs/development/python-modules/dtopt/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Add options to doctest examples while they are running"; - homepage = https://pypi.python.org/pypi/dtopt; + homepage = "https://pypi.python.org/pypi/dtopt"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 785f37144bec0..01ad71883cec7 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple Python implementation of the Git file formats and protocols"; - homepage = https://samba.org/~jelmer/dulwich/; + homepage = "https://samba.org/~jelmer/dulwich/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ koral ]; }; diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix index f3e4e0a8b7327..9150a6746a2bf 100644 --- a/pkgs/development/python-modules/dynd/default.nix +++ b/pkgs/development/python-modules/dynd/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy pkgs.libdynd ]; meta = with stdenv.lib; { - homepage = http://libdynd.org; + homepage = "http://libdynd.org"; license = licenses.bsd2; description = "Python exposure of dynd"; maintainers = with maintainers; [ teh ]; diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 894363237f50b..cd20014932067 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { meta = { description = "Easy thumbnails for Django"; - homepage = https://github.com/SmileyChris/easy-thumbnails; + homepage = "https://github.com/SmileyChris/easy-thumbnails"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/easydict/default.nix b/pkgs/development/python-modules/easydict/default.nix index 4179306b8d9ee..d8dbb045ddcac 100644 --- a/pkgs/development/python-modules/easydict/default.nix +++ b/pkgs/development/python-modules/easydict/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { docheck = false; # No tests in archive meta = { - homepage = https://github.com/makinacorpus/easydict; + homepage = "https://github.com/makinacorpus/easydict"; license = with stdenv.lib; licenses.lgpl3; description = "Access dict values as attributes (works recursively)"; }; diff --git a/pkgs/development/python-modules/easygui/default.nix b/pkgs/development/python-modules/easygui/default.nix index 3a7046c50b30a..30c03ae6e2c55 100644 --- a/pkgs/development/python-modules/easygui/default.nix +++ b/pkgs/development/python-modules/easygui/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Very simple, very easy GUI programming in Python"; - homepage = https://github.com/robertlugg/easygui; + homepage = "https://github.com/robertlugg/easygui"; license = licenses.bsd3; maintainers = with maintainers; [ jfrankenau ]; }; diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix index 32acb1213a889..3dda2c914556b 100644 --- a/pkgs/development/python-modules/easyprocess/default.nix +++ b/pkgs/development/python-modules/easyprocess/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "EasyProcess"; - version = "0.2.8"; + version = "0.3"; src = fetchPypi { inherit pname version; - sha256 = "da7f67a006e2eb63d86a8f3f4baa9d6752dab9676009a67193a4e433f2f41c2a"; + sha256 = "115rzzr0hx4af4m6krf7dxn8851n4l8jfxahjzjc2r0zq2m8v57v"; }; # No tests @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Easy to use python subprocess interface"; - homepage = https://github.com/ponty/EasyProcess; + homepage = "https://github.com/ponty/EasyProcess"; license = licenses.bsdOriginal; maintainers = with maintainers; [ layus ]; }; diff --git a/pkgs/development/python-modules/easysnmp/default.nix b/pkgs/development/python-modules/easysnmp/default.nix index 2602fba77139f..d5c69d4c7e9d9 100644 --- a/pkgs/development/python-modules/easysnmp/default.nix +++ b/pkgs/development/python-modules/easysnmp/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "A blazingly fast and Pythonic SNMP library based on the official Net-SNMP bindings"; - homepage = https://easysnmp.readthedocs.io/en/latest/; + homepage = "https://easysnmp.readthedocs.io/en/latest/"; license = licenses.bsd3; maintainers = with maintainers; [ WhittlesJr ]; }; diff --git a/pkgs/development/python-modules/easywatch/default.nix b/pkgs/development/python-modules/easywatch/default.nix index 96301996fe8dc..a56ffb9528195 100644 --- a/pkgs/development/python-modules/easywatch/default.nix +++ b/pkgs/development/python-modules/easywatch/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dead-simple way to watch a directory"; - homepage = https://github.com/Ceasar/easywatch; + homepage = "https://github.com/Ceasar/easywatch"; license = licenses.mit; maintainers = with maintainers; [ fgaz ]; }; diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix index 62111721ad116..c6109d5c084dc 100644 --- a/pkgs/development/python-modules/ecpy/default.nix +++ b/pkgs/development/python-modules/ecpy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure Pyhton Elliptic Curve Library"; - homepage = https://github.com/ubinity/ECPy; + homepage = "https://github.com/ubinity/ECPy"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix index cd3c98e9cce08..27ebc6a0ff27c 100644 --- a/pkgs/development/python-modules/ed25519/default.nix +++ b/pkgs/development/python-modules/ed25519/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Ed25519 public-key signatures"; - homepage = https://github.com/warner/python-ed25519; + homepage = "https://github.com/warner/python-ed25519"; license = licenses.mit; maintainers = with maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index 28eff473199c6..ac3845bb66715 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://editorconfig.org; + homepage = "https://editorconfig.org"; description = "EditorConfig File Locator and Interpreter for Python"; license = licenses.psfl; }; diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix index 1ad5ea1ab3b3b..0f42ddcc799bb 100644 --- a/pkgs/development/python-modules/edward/default.nix +++ b/pkgs/development/python-modules/edward/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Probabilistic programming language using Tensorflow"; - homepage = https://github.com/blei-lab/edward; + homepage = "https://github.com/blei-lab/edward"; license = licenses.asl20; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/pkgs/development/python-modules/eggdeps/default.nix index c837e46066feb..8c7d7679005e9 100644 --- a/pkgs/development/python-modules/eggdeps/default.nix +++ b/pkgs/development/python-modules/eggdeps/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_interface zope_testing ]; - # tests fail, see http://hydra.nixos.org/build/4316603/log/raw + # tests fail, see https://hydra.nixos.org/build/4316603/log/raw doCheck = false; meta = with stdenv.lib; { description = "A tool which computes a dependency graph between active Python eggs"; - homepage = http://thomas-lotze.de/en/software/eggdeps/; + homepage = "http://thomas-lotze.de/en/software/eggdeps/"; license = licenses.zpl20; }; diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 382a9965293b0..deef21985c6e7 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { writing and running queries against Elasticsearch. It is built on top of the official low-level client (elasticsearch-py). ''; - homepage = https://github.com/elasticsearch/elasticsearch-dsl-py; + homepage = "https://github.com/elasticsearch/elasticsearch-dsl-py"; license = licenses.asl20; maintainers = with maintainers; [ desiderius ]; }; diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index ccef465eca19e..8c6d0bb543a6f 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.1.0"; + version = "7.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0140787216646e1eb7eb001f8146aff7071d7ca438854249787b6cc221ddd266"; + sha256 = "1j499w9hbpyx0v83xnn1vrm45amx5lbnhlik65v5z1n0gb9v4a6j"; }; # Check is disabled because running them destroy the content of the local cluster! @@ -22,7 +22,7 @@ buildPythonPackage (rec { meta = with stdenv.lib; { description = "Official low-level client for Elasticsearch"; - homepage = https://github.com/elasticsearch/elasticsearch-py; + homepage = "https://github.com/elasticsearch/elasticsearch-py"; license = licenses.asl20; maintainers = with maintainers; [ desiderius ]; }; diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index c8b1a376f263c..09d4cc6024e45 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 }: buildPythonPackage rec { - version = "1.4.3"; + version = "1.4.4"; pname = "elementpath"; disabled = isPy27; # uses incompatible class syntax @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "18gqqdsrdlgwn93xnxy6ifxrk7ppaimijinflphxia2qcm8czkgf"; + sha256 = "1z7403ykfdb2zy6g4qcbjm87ibpi0k59dgmz1px7z7wy5p2vknxw"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index 99859ac151754..3ad0c34685baa 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "A robust email syntax and deliverability validation library for Python 2.x/3.x."; - homepage = https://github.com/JoshData/python-email-validator; + homepage = "https://github.com/JoshData/python-email-validator"; license = licenses.cc0; maintainers = with maintainers; [ siddharthist ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/emailthreads/default.nix b/pkgs/development/python-modules/emailthreads/default.nix index 0e5db1de3e92b..36553daff55f4 100644 --- a/pkgs/development/python-modules/emailthreads/default.nix +++ b/pkgs/development/python-modules/emailthreads/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/emersion/python-emailthreads; + homepage = "https://github.com/emersion/python-emailthreads"; description = "Python library to parse and format email threads"; license = licenses.mit; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 5f3d14e73c716..7e9dae53bbcfc 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Emoji for Python"; - homepage = https://pypi.python.org/pypi/emoji/; + homepage = "https://pypi.python.org/pypi/emoji/"; license = licenses.bsd3; maintainers = with maintainers; [ joachifm ]; }; diff --git a/pkgs/development/python-modules/entrance/default.nix b/pkgs/development/python-modules/entrance/default.nix index 67005d577cd12..8dc28f823e107 100644 --- a/pkgs/development/python-modules/entrance/default.nix +++ b/pkgs/development/python-modules/entrance/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "A server framework for web apps with an Elm frontend"; - homepage = https://github.com/ensoft/entrance; + homepage = "https://github.com/ensoft/entrance"; license = licenses.mit; maintainers = with maintainers; [ simonchatts ]; }; diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix index 77d20876fe15c..a26d6ede8904f 100644 --- a/pkgs/development/python-modules/entrypoints/default.nix +++ b/pkgs/development/python-modules/entrypoints/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "Discover and load entry points from installed packages"; - homepage = https://github.com/takluyver/entrypoints; + homepage = "https://github.com/takluyver/entrypoints"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/enum-compat/default.nix b/pkgs/development/python-modules/enum-compat/default.nix index e95eb089bc477..42a4b63479ca6 100644 --- a/pkgs/development/python-modules/enum-compat/default.nix +++ b/pkgs/development/python-modules/enum-compat/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ enum34 ]; meta = with lib; { - homepage = https://github.com/jstasiak/enum-compat; + homepage = "https://github.com/jstasiak/enum-compat"; description = "enum/enum34 compatibility package"; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/enum/default.nix b/pkgs/development/python-modules/enum/default.nix index 8aec63689d90e..92d3faa598917 100644 --- a/pkgs/development/python-modules/enum/default.nix +++ b/pkgs/development/python-modules/enum/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = !isPyPy; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/enum/; + homepage = "https://pypi.python.org/pypi/enum/"; description = "Robust enumerated type support in Python"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/enum34/default.nix b/pkgs/development/python-modules/enum34/default.nix index a5175eba49d87..9d9af3c644750 100644 --- a/pkgs/development/python-modules/enum34/default.nix +++ b/pkgs/development/python-modules/enum34/default.nix @@ -19,7 +19,7 @@ if pythonAtLeast "3.4" then null else buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/enum34; + homepage = "https://pypi.python.org/pypi/enum34"; description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix index 54dcfe9e4b541..397e573a252f5 100644 --- a/pkgs/development/python-modules/envisage/default.nix +++ b/pkgs/development/python-modules/envisage/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, fetchpatch, isPy27 +, buildPythonPackage , traits, apptools -, ipykernel +, python, ipykernel, ipython }: buildPythonPackage rec { pname = "envisage"; - version = "4.7.2"; + version = "4.9.2"; + + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0jb5nw0w9x97jij0hd3d7kfzcj58r1cqmplmdy56bj11dyc4wyc9"; + sha256 = "1srjmkhnz84nz5jd72vdsnc4fn7dd9jr8nyf3hzk6yx1dsn815gd"; }; propagatedBuildInputs = [ traits apptools ]; @@ -18,16 +21,26 @@ buildPythonPackage rec { export HOME=$PWD/HOME ''; + # fix a test failure; should be merged in next release + patches = [ (fetchpatch { + url = "https://github.com/enthought/envisage/pull/248/commits/7b6d2dd615d5cb7455b200eb8f37e030bbf4df9e.patch"; + sha256 = "0a3dmbpxwsn1bkjcjv9v7b751rcmppj6hc9wcgiayg4l9r2nrvyh"; + }) ]; + checkInputs = [ - ipykernel + ipykernel ipython ]; - doCheck = true; + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest + runHook postCheck + ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Framework for building applications whose functionalities can be extended by adding 'plug-ins'"; - homepage = https://github.com/enthought/envisage; - maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; + homepage = "https://github.com/enthought/envisage"; + maintainers = with lib.maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; }; } diff --git a/pkgs/development/python-modules/envs/default.nix b/pkgs/development/python-modules/envs/default.nix index 600cb3b0320ef..133e99912cbd5 100644 --- a/pkgs/development/python-modules/envs/default.nix +++ b/pkgs/development/python-modules/envs/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Easy access to environment variables from Python"; - homepage = https://github.com/capless/envs; + homepage = "https://github.com/capless/envs"; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/enzyme/default.nix b/pkgs/development/python-modules/enzyme/default.nix index d776bfd62aaca..110575464cb67 100644 --- a/pkgs/development/python-modules/enzyme/default.nix +++ b/pkgs/development/python-modules/enzyme/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = { - homepage = https://github.com/Diaoul/enzyme; + homepage = "https://github.com/Diaoul/enzyme"; license = with stdenv.lib; licenses.asl20; description = "Python video metadata parser"; }; diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index 2b7815c697872..87d719a7af39d 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Compute positions of the planets and stars"; - homepage = https://pypi.python.org/pypi/ephem/; + homepage = "https://pypi.python.org/pypi/ephem/"; license = licenses.lgpl3; maintainers = with maintainers; [ chrisrosset ]; }; diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix index 6b3909a5b4587..18a7a9ab27f1c 100644 --- a/pkgs/development/python-modules/eradicate/default.nix +++ b/pkgs/development/python-modules/eradicate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with lib; { description = "eradicate removes commented-out code from Python files."; - homepage = https://github.com/myint/eradicate; + homepage = "https://github.com/myint/eradicate"; license = [ licenses.mit ]; maintainers = [ maintainers.mmlb ]; diff --git a/pkgs/development/python-modules/etcd/default.nix b/pkgs/development/python-modules/etcd/default.nix index 1e6e1e70944d6..7a122f1b616e7 100644 --- a/pkgs/development/python-modules/etcd/default.nix +++ b/pkgs/development/python-modules/etcd/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python etcd client that just works"; - homepage = https://github.com/dsoprea/PythonEtcdClient; + homepage = "https://github.com/dsoprea/PythonEtcdClient"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index ce5fce1b1cba7..ad58ee3ae2fe0 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = { description = "The Ethereum hashing function keccak256"; - homepage = https://github.com/ethereum/eth-hash; + homepage = "https://github.com/ethereum/eth-hash"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index 437d2d9ce167e..87aa914b59f75 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = { description = "Common type annotations for Ethereum Python packages"; - homepage = https://github.com/ethereum/eth-typing; + homepage = "https://github.com/ethereum/eth-typing"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index 1c373c64e8959..25f2ebd554124 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = { description = "Common utility functions for codebases which interact with ethereum"; - homepage = https://github.com/ethereum/eth-utils; + homepage = "https://github.com/ethereum/eth-utils"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 1711131be2d93..305ada89552c5 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -1,12 +1,12 @@ -{ lib, buildPythonPackage, isPy34, fetchPypi, linuxHeaders }: +{ lib, buildPythonPackage, fetchPypi, linuxHeaders }: buildPythonPackage rec { pname = "evdev"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b03f5e1be5b4a5327494a981b831d251a142b09e8778eda1a8b53eba91100166"; + sha256 = "0kb3636yaw9l8xi8s184w0r0n9ic5dw3b8hx048jf9fpzss4kimi"; }; buildInputs = [ linuxHeaders ]; @@ -17,11 +17,9 @@ buildPythonPackage rec { doCheck = false; - disabled = isPy34; # see http://bugs.python.org/issue21121 - meta = with lib; { description = "Provides bindings to the generic input event interface in Linux"; - homepage = https://pythonhosted.org/evdev; + homepage = "https://pythonhosted.org/evdev"; license = licenses.bsd3; maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index a8ac610855d51..7a74de03d522c 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -1,13 +1,21 @@ -{ stdenv, buildPythonPackage, fetchPypi, flask, events -, pymongo, simplejson, cerberus, werkzeug }: +{ stdenv +, buildPythonPackage +, fetchPypi +, flask +, events +, pymongo +, simplejson +, cerberus +, setuptools +}: buildPythonPackage rec { pname = "Eve"; - version = "1.0"; + version = "1.1"; src = fetchPypi { inherit pname version; - sha256 = "ebde455e631b8eb9d38783eedfbd7e416b4477cce3d9988880eb3e477256a11e"; + sha256 = "1a7i7x77p5wjqfzmgn30m9sz2mcz06k4qf5af6a45109lafcq0bv"; }; propagatedBuildInputs = [ @@ -16,13 +24,10 @@ buildPythonPackage rec { flask pymongo simplejson - werkzeug + setuptools ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "werkzeug==0.15.4" "werkzeug" - ''; + pythonImportsCheck = [ "eve" ]; # tests call a running mongodb instance doCheck = false; diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 0436f3cbdb15d..9a006c08772f7 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ dnspython greenlet monotonic six ] ++ lib.optional (pythonOlder "3.4") enum34; meta = with lib; { - homepage = https://pypi.python.org/pypi/eventlet/; + homepage = "https://pypi.python.org/pypi/eventlet/"; description = "A concurrent networking library for Python"; }; diff --git a/pkgs/development/python-modules/events/default.nix b/pkgs/development/python-modules/events/default.nix index 93c2165ce0140..21c459d62b952 100644 --- a/pkgs/development/python-modules/events/default.nix +++ b/pkgs/development/python-modules/events/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = https://events.readthedocs.org; + homepage = "https://events.readthedocs.org"; description = "Bringing the elegance of C# EventHanlder to Python"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/evernote/default.nix b/pkgs/development/python-modules/evernote/default.nix index 189f282b02d2d..b245ff117474b 100644 --- a/pkgs/development/python-modules/evernote/default.nix +++ b/pkgs/development/python-modules/evernote/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Evernote SDK for Python"; - homepage = http://dev.evernote.com; + homepage = "https://dev.evernote.com"; license = licenses.asl20; maintainers = with maintainers; [ hbunke ]; }; diff --git a/pkgs/development/python-modules/ewmh/default.nix b/pkgs/development/python-modules/ewmh/default.nix index a24d049fc2294..c9ac68ae74d81 100644 --- a/pkgs/development/python-modules/ewmh/default.nix +++ b/pkgs/development/python-modules/ewmh/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/parkouss/pyewmh; + homepage = "https://github.com/parkouss/pyewmh"; description = "An implementation of EWMH (Extended Window Manager Hints), based on Xlib"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ bandresen ]; diff --git a/pkgs/development/python-modules/executor/default.nix b/pkgs/development/python-modules/executor/default.nix index 8c71d63ef5ca9..8d9b379187b8c 100644 --- a/pkgs/development/python-modules/executor/default.nix +++ b/pkgs/development/python-modules/executor/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Programmer friendly subprocess wrapper"; - homepage = https://github.com/xolox/python-executor; + homepage = "https://github.com/xolox/python-executor"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; }; diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 47602afa07d78..ee0c426bdeddc 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python module and command line program for processing ID3 tags"; - homepage = https://eyed3.nicfit.net/; + homepage = "https://eyed3.nicfit.net/"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix index 0184ae9ffd771..a745566a64518 100644 --- a/pkgs/development/python-modules/ezdxf/default.nix +++ b/pkgs/development/python-modules/ezdxf/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }: buildPythonPackage rec { - version = "0.11"; + version = "0.12"; pname = "ezdxf"; disabled = pythonOlder "3.5"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "mozman"; repo = "ezdxf"; rev = "v${version}"; - sha256 = "167iw1j1c6195bwv6i8z1m7s0i27r0y0acxd2w76hvnq3a72jbsd"; + sha256 = "1flcq96ljk5wqrmgsb4acflqzkg7rhlaxz0j5jxky9za0mj1x6dq"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/face/default.nix b/pkgs/development/python-modules/face/default.nix index 948236b3f0130..34d91ceda9888 100644 --- a/pkgs/development/python-modules/face/default.nix +++ b/pkgs/development/python-modules/face/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/mahmoud/face; + homepage = "https://github.com/mahmoud/face"; description = "A command-line interface parser and framework"; longDescription = '' A command-line interface parser and framework, friendly for diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix index 93502a296dc7a..2b26fa735e6d1 100644 --- a/pkgs/development/python-modules/face_recognition/default.nix +++ b/pkgs/development/python-modules/face_recognition/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { license = licenses.mit; - homepage = https://github.com/ageitgey/face_recognition; + homepage = "https://github.com/ageitgey/face_recognition"; maintainers = with maintainers; [ ma27 ]; description = "The world's simplest facial recognition api for Python and the command line"; }; diff --git a/pkgs/development/python-modules/face_recognition_models/default.nix b/pkgs/development/python-modules/face_recognition_models/default.nix index 12587e6792df9..427ad364dde6a 100644 --- a/pkgs/development/python-modules/face_recognition_models/default.nix +++ b/pkgs/development/python-modules/face_recognition_models/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; meta = with stdenv.lib; { - homepage = https://github.com/ageitgey/face_recognition_models; + homepage = "https://github.com/ageitgey/face_recognition_models"; license = licenses.cc0; maintainers = with maintainers; [ ma27 ]; description = "Trained models for the face_recognition python library"; diff --git a/pkgs/development/python-modules/facebook-sdk/default.nix b/pkgs/development/python-modules/facebook-sdk/default.nix index d74c6e574705f..e9300edab09d2 100644 --- a/pkgs/development/python-modules/facebook-sdk/default.nix +++ b/pkgs/development/python-modules/facebook-sdk/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with pkgs.lib; { description = "Client library that supports the Facebook Graph API and the official Facebook JavaScript SDK"; - homepage = https://github.com/pythonforfacebook/facebook-sdk; + homepage = "https://github.com/pythonforfacebook/facebook-sdk"; license = licenses.asl20 ; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/facedancer/default.nix b/pkgs/development/python-modules/facedancer/default.nix index 47147bdb01ba0..0aabe704f040f 100644 --- a/pkgs/development/python-modules/facedancer/default.nix +++ b/pkgs/development/python-modules/facedancer/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "library for emulating usb devices"; - homepage = https://greatscottgadgets.com/greatfet/; + homepage = "https://greatscottgadgets.com/greatfet/"; license = licenses.bsd3; maintainers = with maintainers; [ mog ]; }; diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix index becf1cc19726b..92e889564afd8 100644 --- a/pkgs/development/python-modules/factory_boy/default.nix +++ b/pkgs/development/python-modules/factory_boy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python package to create factories for complex objects"; - homepage = https://github.com/rbarrois/factory_boy; + homepage = "https://github.com/rbarrois/factory_boy"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/fake_factory/default.nix b/pkgs/development/python-modules/fake_factory/default.nix index f17af02ee0fb6..ab947756fa98a 100644 --- a/pkgs/development/python-modules/fake_factory/default.nix +++ b/pkgs/development/python-modules/fake_factory/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python package that generates fake data for you"; - homepage = https://pypi.python.org/pypi/fake-factory; + homepage = "https://pypi.python.org/pypi/fake-factory"; license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 0d8c77f557f00..89415237714e0 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library for generating fake user data"; - homepage = http://faker.rtfd.org; + homepage = "http://faker.rtfd.org"; license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 0ed9d42c3b0d2..3513f57cdbe57 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.54.0"; + version = "0.54.1"; format = "flit"; disabled = !isPy3k; @@ -24,9 +24,14 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "fastapi"; rev = version; - sha256 = "17bicrpr801z71wrn9iimvh7qk6iwyxvr89ialf0s2rxxa2s0yb5"; + sha256 = "0k0lss8x6lzf0szcli48v28r269fsx1jdkr9q78liz47dz5x03d8"; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "starlette ==0.13.2" "starlette" + ''; + propagatedBuildInputs = [ uvicorn starlette diff --git a/pkgs/development/python-modules/fastcache/default.nix b/pkgs/development/python-modules/fastcache/default.nix index f50eb8f53bb11..100af5244b574 100644 --- a/pkgs/development/python-modules/fastcache/default.nix +++ b/pkgs/development/python-modules/fastcache/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "C implementation of Python3 lru_cache for Python 2 and 3"; - homepage = https://github.com/pbrady/fastcache; + homepage = "https://github.com/pbrady/fastcache"; license = licenses.mit; maintainers = [ maintainers.bhipple ]; }; diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 50a6dbf40df6a..75719a78fb21b 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python package that provides useful locks"; - homepage = https://github.com/harlowja/fasteners; + homepage = "https://github.com/harlowja/fasteners"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/fastentrypoints/default.nix b/pkgs/development/python-modules/fastentrypoints/default.nix index e2e0a4d4d92e6..08e2e384ff922 100644 --- a/pkgs/development/python-modules/fastentrypoints/default.nix +++ b/pkgs/development/python-modules/fastentrypoints/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Makes entry_points specified in setup.py load more quickly"; - homepage = https://github.com/ninjaaron/fast-entry_points; + homepage = "https://github.com/ninjaaron/fast-entry_points"; license = licenses.bsd2; maintainers = with maintainers; [ nixy ]; }; diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix index 02c1ea60e6114..c1fab50c06e12 100644 --- a/pkgs/development/python-modules/fastimport/default.nix +++ b/pkgs/development/python-modules/fastimport/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://launchpad.net/python-fastimport; + homepage = "https://launchpad.net/python-fastimport"; description = "VCS fastimport/fastexport parser"; maintainers = with maintainers; [ koral ]; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix new file mode 100644 index 0000000000000..b49f31e402215 --- /dev/null +++ b/pkgs/development/python-modules/fastjsonschema/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub + # Check inputs +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "fastjsonschema"; + version = "2.14.4"; + + disabled = pythonOlder "3.3"; + + src = fetchFromGitHub { + owner = "horejsek"; + repo = "python-fastjsonschema"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "0c3q31lqzrc52gacnqc271k5952qbyl0z4kagsqvl7fiwk84hqlz"; + }; + + checkInputs = [ pytestCheckHook ]; + dontUseSetuptoolsCheck = true; + disabledTests = [ + "benchmark" + + # these tests require network access + "remote ref" + "definitions" + ]; + + meta = with lib; { + description = "Fast JSON schema validator for Python."; + homepage = "https://horejsek.github.io/python-fastjsonschema/"; + license = licenses.bsd3; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/fastpair/default.nix b/pkgs/development/python-modules/fastpair/default.nix index e9e6316bb61e8..edb45eb068770 100644 --- a/pkgs/development/python-modules/fastpair/default.nix +++ b/pkgs/development/python-modules/fastpair/default.nix @@ -27,7 +27,7 @@ buildPythonPackage { ''; meta = with stdenv.lib; { - homepage = https://github.com/carsonfarmer/fastpair; + homepage = "https://github.com/carsonfarmer/fastpair"; description = "Data-structure for the dynamic closest-pair problem"; license = licenses.mit; maintainers = with maintainers; [ cmcdragonkai ]; diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 1cf62428a0ff4..e8ad6e1364489 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python implementation of the parquet format"; - homepage = https://github.com/dask/fastparquet; + homepage = "https://github.com/dask/fastparquet"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/fastpbkdf2/default.nix b/pkgs/development/python-modules/fastpbkdf2/default.nix index 63a7565cf55ad..568d894805fda 100644 --- a/pkgs/development/python-modules/fastpbkdf2/default.nix +++ b/pkgs/development/python-modules/fastpbkdf2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi six ]; meta = with stdenv.lib; { - homepage = https://github.com/Ayrx/python-fastpbkdf2; + homepage = "https://github.com/Ayrx/python-fastpbkdf2"; description = "Python bindings for fastpbkdf2"; license = licenses.bsd3; maintainers = with maintainers; [ jqueiroz ]; diff --git a/pkgs/development/python-modules/fastrlock/default.nix b/pkgs/development/python-modules/fastrlock/default.nix index 9b553e65db64a..8271bec090b21 100644 --- a/pkgs/development/python-modules/fastrlock/default.nix +++ b/pkgs/development/python-modules/fastrlock/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/scoder/fastrlock; + homepage = "https://github.com/scoder/fastrlock"; description = "A fast RLock implementation for CPython"; license = licenses.mit; maintainers = with maintainers; [ hyphon81 ]; diff --git a/pkgs/development/python-modules/fasttext/default.nix b/pkgs/development/python-modules/fasttext/default.nix index 9f1a8b18d7be6..42e6446e86435 100644 --- a/pkgs/development/python-modules/fasttext/default.nix +++ b/pkgs/development/python-modules/fasttext/default.nix @@ -1,18 +1,12 @@ -{stdenv, buildPythonPackage, fetchFromGitHub, numpy, pybind11}: +{stdenv, buildPythonPackage, fetchFromGitHub, numpy, pkgs, pybind11 }: buildPythonPackage rec { - pname = "fasttext"; - version = "0.9.1"; - - src = fetchFromGitHub { - owner = "facebookresearch"; - repo = "fastText"; - rev = "v${version}"; - sha256 = "1cbzz98qn8aypp4r5kwwwc9wiq5bwzv51kcsb15xjfs9lz8h3rii"; - }; + inherit (pkgs.fasttext) pname version src; buildInputs = [ pybind11 ]; + pythonImportsCheck = [ "fasttext" ]; + propagatedBuildInputs = [ numpy ]; preBuild = '' @@ -21,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python module for text classification and representation learning"; - homepage = https://fasttext.cc/; + homepage = "https://fasttext.cc/"; license = licenses.mit; maintainers = with maintainers; [ danieldk ]; }; diff --git a/pkgs/development/python-modules/favicon/default.nix b/pkgs/development/python-modules/favicon/default.nix index 16eac939e1eee..5af3be420b024 100644 --- a/pkgs/development/python-modules/favicon/default.nix +++ b/pkgs/development/python-modules/favicon/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Find a website's favicon"; - homepage = https://github.com/scottwernervt/favicon; + homepage = "https://github.com/scottwernervt/favicon"; license = licenses.mit; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/development/python-modules/fb-re2/default.nix b/pkgs/development/python-modules/fb-re2/default.nix index 25aae4591eb55..32a6a1d60ca10 100644 --- a/pkgs/development/python-modules/fb-re2/default.nix +++ b/pkgs/development/python-modules/fb-re2/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Python wrapper for Google's RE2"; - homepage = https://github.com/facebook/pyre2; + homepage = "https://github.com/facebook/pyre2"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ivan ]; }; diff --git a/pkgs/development/python-modules/fdint/default.nix b/pkgs/development/python-modules/fdint/default.nix index 869e26d675a3a..68c3b039a47fd 100644 --- a/pkgs/development/python-modules/fdint/default.nix +++ b/pkgs/development/python-modules/fdint/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/scott-maddox/fdint; + homepage = "https://github.com/scott-maddox/fdint"; description = "A free, open-source python package for quickly and precisely approximating Fermi-Dirac integrals"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index 4c1eb10c6b127..dbc303f430262 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -16,8 +16,8 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python module to generate ATOM feeds, RSS feeds and Podcasts."; - downloadPage = https://github.com/lkiesow/python-feedgen/releases; - homepage = https://github.com/lkiesow/python-feedgen; + downloadPage = "https://github.com/lkiesow/python-feedgen/releases"; + homepage = "https://github.com/lkiesow/python-feedgen"; license = with licenses; [ bsd2 lgpl3 ]; maintainers = with maintainers; [ casey ]; }; diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index c8ea6df7ae0c9..c0ccb7d345a97 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "feedgenerator"; - version = "1.9"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "01mirwkm7xfx539hmvj7g9da1j51gw5lsx74dr0glizskjm5vq2s"; + sha256 = "0m6fjnrx3sd0bm6pnbhxxx5ywlwqh8bx0lka386kj28mg3fmm2m2"; }; buildInputs = [ glibcLocales ]; @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Standalone version of django.utils.feedgenerator, compatible with Py3k"; - homepage = https://github.com/dmdm/feedgenerator-py3k.git; + homepage = "https://github.com/dmdm/feedgenerator-py3k.git"; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/filebrowser_safe/default.nix b/pkgs/development/python-modules/filebrowser_safe/default.nix index d0d324fb97749..014e3b9810a99 100644 --- a/pkgs/development/python-modules/filebrowser_safe/default.nix +++ b/pkgs/development/python-modules/filebrowser_safe/default.nix @@ -30,8 +30,8 @@ buildPythonPackage rec { with Django 1.1 - filebrowser_safe was therefore created to address these specific issues. ''; - homepage = https://github.com/stephenmcd/filebrowser-safe; - downloadPage = https://pypi.python.org/pypi/filebrowser_safe/; + homepage = "https://github.com/stephenmcd/filebrowser-safe"; + downloadPage = "https://pypi.python.org/pypi/filebrowser_safe/"; license = licenses.free; maintainers = with maintainers; [ prikhi ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 3592a1f28c718..9729c1543cb49 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/benediktschmitt/py-filelock; + homepage = "https://github.com/benediktschmitt/py-filelock"; description = "A platform independent file lock for Python"; license = licenses.unlicense; maintainers = with maintainers; [ hyphon81 ]; diff --git a/pkgs/development/python-modules/filemagic/default.nix b/pkgs/development/python-modules/filemagic/default.nix index cbb5ca56fed5d..2feda678f7440 100644 --- a/pkgs/development/python-modules/filemagic/default.nix +++ b/pkgs/development/python-modules/filemagic/default.nix @@ -22,7 +22,7 @@ buildPythonPackage { meta = with lib; { description = "File type identification using libmagic"; - homepage = https://github.com/aliles/filemagic; + homepage = "https://github.com/aliles/filemagic"; license = licenses.asl20; maintainers = with maintainers; [ earvstedt ]; }; diff --git a/pkgs/development/python-modules/filetype/default.nix b/pkgs/development/python-modules/filetype/default.nix index 40bbc688e205c..4bbb6c41f5437 100644 --- a/pkgs/development/python-modules/filetype/default.nix +++ b/pkgs/development/python-modules/filetype/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "filetype"; - version = "1.0.6"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "10985zfx90m527binx3fxvm4nsqmlwf0jj8j8mpbxb8wj8ivkllr"; + sha256 = "19vav4w8vvcnrps1mirjkrv4pr1khwn5ma6m5pgpxd4qip73wffs"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/filterpy/default.nix b/pkgs/development/python-modules/filterpy/default.nix index 076a3a72b89f4..bae362d3a4a44 100644 --- a/pkgs/development/python-modules/filterpy/default.nix +++ b/pkgs/development/python-modules/filterpy/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/rlabbe/filterpy; + homepage = "https://github.com/rlabbe/filterpy"; description = "Kalman filtering and optimal estimation library"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index d3f796ab9501c..10915e766ac25 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/raphaelm/python-fints/; + homepage = "https://github.com/raphaelm/python-fints/"; description = "Pure-python FinTS (formerly known as HBCI) implementation"; license = licenses.lgpl3; maintainers = with maintainers; [ elohmeier ]; diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix index 76fda47c6a947..d54379d0683ec 100644 --- a/pkgs/development/python-modules/fipy/default.nix +++ b/pkgs/development/python-modules/fipy/default.nix @@ -50,7 +50,7 @@ in ''; meta = with lib; { - homepage = https://www.ctcms.nist.gov/fipy/; + homepage = "https://www.ctcms.nist.gov/fipy/"; description = "A Finite Volume PDE Solver Using Python"; license = licenses.free; maintainers = with maintainers; [ costrouc wd15 ]; diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix index 0f0f0fd69ee74..6c81a708d57d6 100644 --- a/pkgs/development/python-modules/fire/default.nix +++ b/pkgs/development/python-modules/fire/default.nix @@ -3,21 +3,23 @@ buildPythonPackage rec { pname = "fire"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "google"; repo = "python-fire"; rev = "v${version}"; - sha256 = "1jwf1qv9xmr1c8nyvwqn02329vzyh9py4slx13n55ms8h1n998nr"; + sha256 = "0s5r6l39ck2scks54hmwwdf4lcihqqnqzjfx9lz2b67vxkajpwmc"; }; propagatedBuildInputs = [ six termcolor ] ++ stdenv.lib.optional isPy27 enum34; checkInputs = [ hypothesis mock python-Levenshtein pytest ]; + # ignore test which asserts exact usage statement, default behavior + # changed in python3.8. This can likely be remove >=0.3.1 checkPhase = '' - py.test + py.test -k 'not testInitRequiresFlag' ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/firetv/default.nix b/pkgs/development/python-modules/firetv/default.nix index 21e44bb458159..8cbcc354c8347 100644 --- a/pkgs/development/python-modules/firetv/default.nix +++ b/pkgs/development/python-modules/firetv/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Communicate with an Amazon Fire TV device via ADB over a network"; - homepage = https://github.com/happyleavesaoc/python-firetv/; + homepage = "https://github.com/happyleavesaoc/python-firetv/"; license = licenses.mit; maintainers = [ maintainers.makefu ]; }; diff --git a/pkgs/development/python-modules/first/default.nix b/pkgs/development/python-modules/first/default.nix index de7342d67ca07..6956addb29f36 100644 --- a/pkgs/development/python-modules/first/default.nix +++ b/pkgs/development/python-modules/first/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "The function you always missed in Python"; - homepage = https://github.com/hynek/first/; + homepage = "https://github.com/hynek/first/"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/development/python-modules/fitbit/default.nix b/pkgs/development/python-modules/fitbit/default.nix index ef4859a749a09..46c6ac78a6c44 100644 --- a/pkgs/development/python-modules/fitbit/default.nix +++ b/pkgs/development/python-modules/fitbit/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fitbit API Python Client Implementation"; license = licenses.asl20; - homepage = https://github.com/orcasgit/python-fitbit; + homepage = "https://github.com/orcasgit/python-fitbit"; maintainers = with maintainers; [ delroth ]; }; } diff --git a/pkgs/development/python-modules/flake8-blind-except/default.nix b/pkgs/development/python-modules/flake8-blind-except/default.nix index f999bab89324c..1c2dbe5f52c23 100644 --- a/pkgs/development/python-modules/flake8-blind-except/default.nix +++ b/pkgs/development/python-modules/flake8-blind-except/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "16g58mkr3fcn2vlfhp3rlahj93qswc7jd5qrqp748mc26dk3b8xc"; }; meta = { - homepage = https://github.com/elijahandrews/flake8-blind-except; + homepage = "https://github.com/elijahandrews/flake8-blind-except"; description = "A flake8 extension that checks for blind except: statements"; maintainers = with lib.maintainers; [ johbo ]; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix index e6ac743396a0f..1f41c0a6849a1 100644 --- a/pkgs/development/python-modules/flake8-debugger/default.nix +++ b/pkgs/development/python-modules/flake8-debugger/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/jbkahn/flake8-debugger; + homepage = "https://github.com/jbkahn/flake8-debugger"; description = "ipdb/pdb statement checker plugin for flake8"; maintainers = with lib.maintainers; [ johbo ]; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix index 8099f3318e86b..25aa995f91222 100644 --- a/pkgs/development/python-modules/flake8-import-order/default.nix +++ b/pkgs/development/python-modules/flake8-import-order/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Flake8 and pylama plugin that checks the ordering of import statements"; - homepage = https://github.com/PyCQA/flake8-import-order; + homepage = "https://github.com/PyCQA/flake8-import-order"; license = with licenses; [ lgpl3 mit ]; }; } diff --git a/pkgs/development/python-modules/flake8-polyfill/default.nix b/pkgs/development/python-modules/flake8-polyfill/default.nix index 070e69970106e..050a6d4f9c8a5 100644 --- a/pkgs/development/python-modules/flake8-polyfill/default.nix +++ b/pkgs/development/python-modules/flake8-polyfill/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://gitlab.com/pycqa/flake8-polyfill; + homepage = "https://gitlab.com/pycqa/flake8-polyfill"; description = "Polyfill package for Flake8 plugins"; license = licenses.mit; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index e76b7cdf26906..c6cf1bf2ab1fc 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Code checking using pep8 and pyflakes"; - homepage = https://pypi.python.org/pypi/flake8; + homepage = "https://pypi.python.org/pypi/flake8"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/flaky/default.nix b/pkgs/development/python-modules/flaky/default.nix index c4e803245d5eb..4fe798647912d 100644 --- a/pkgs/development/python-modules/flaky/default.nix +++ b/pkgs/development/python-modules/flaky/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/box/flaky; + homepage = "https://github.com/box/flaky"; description = "Plugin for nose or py.test that automatically reruns flaky tests"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index 3a2c1fe5e9b63..5803d8ea2c7d1 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple and extensible admin interface framework for Flask"; - homepage = https://github.com/flask-admin/flask-admin/; + homepage = "https://github.com/flask-admin/flask-admin/"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/flask-api/default.nix b/pkgs/development/python-modules/flask-api/default.nix index 8bb6a472c9fd2..bbac045675fa1 100644 --- a/pkgs/development/python-modules/flask-api/default.nix +++ b/pkgs/development/python-modules/flask-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask markdown ]; meta = with lib; { - homepage = https://github.com/miracle2k/flask-assets; + homepage = "https://github.com/miracle2k/flask-assets"; description = "Browsable web APIs for Flask"; license = licenses.bsd2; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix index a8e454f4a2cc8..2fbfb17def4f7 100644 --- a/pkgs/development/python-modules/flask-assets/default.nix +++ b/pkgs/development/python-modules/flask-assets/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask webassets flask_script nose ]; meta = with lib; { - homepage = https://github.com/miracle2k/flask-assets; + homepage = "https://github.com/miracle2k/flask-assets"; description = "Asset management for Flask, to compress and merge CSS and Javascript files"; license = licenses.bsd2; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix index afd3db60ffcf4..ae1be1ae54c23 100644 --- a/pkgs/development/python-modules/flask-autoindex/default.nix +++ b/pkgs/development/python-modules/flask-autoindex/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { ''; license = licenses.bsd2; maintainers = with maintainers; [ timokau ]; - homepage = https://pythonhosted.org/Flask-AutoIndex/; + homepage = "https://pythonhosted.org/Flask-AutoIndex/"; }; } diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index 307b670fa7f16..2d542411fa23c 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { ''; license = licenses.bsd2; maintainers = with maintainers; [ timokau ]; - homepage = https://github.com/python-babel/flask-babel; + homepage = "https://github.com/python-babel/flask-babel"; }; } diff --git a/pkgs/development/python-modules/flask-bcrypt/default.nix b/pkgs/development/python-modules/flask-bcrypt/default.nix index dfcdad18f9c6b..fd0e63d26f301 100644 --- a/pkgs/development/python-modules/flask-bcrypt/default.nix +++ b/pkgs/development/python-modules/flask-bcrypt/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Brcrypt hashing for Flask"; - homepage = https://github.com/maxcountryman/flask-bcrypt; + homepage = "https://github.com/maxcountryman/flask-bcrypt"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/flask-bootstrap/default.nix b/pkgs/development/python-modules/flask-bootstrap/default.nix index 7c12b79bb2f32..797be78bc5635 100644 --- a/pkgs/development/python-modules/flask-bootstrap/default.nix +++ b/pkgs/development/python-modules/flask-bootstrap/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask visitor dominate ]; meta = with lib; { - homepage = https://github.com/mbr/flask-bootstrap; + homepage = "https://github.com/mbr/flask-bootstrap"; description = "Ready-to-use Twitter-bootstrap for use in Flask."; license = licenses.asl20; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/flask-common/default.nix b/pkgs/development/python-modules/flask-common/default.nix index 05385e08d05e2..40c7903aee3d5 100644 --- a/pkgs/development/python-modules/flask-common/default.nix +++ b/pkgs/development/python-modules/flask-common/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Flask extension with lots of common time-savers"; - homepage = https://github.com/kennethreitz/flask-common; + homepage = "https://github.com/kennethreitz/flask-common"; license = licenses.asl20; # XXX: setup.py lists BSD but git repo has Apache 2.0 LICENSE }; } diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index c532802a7f4d4..e20d213029c0f 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Flask extension adding a decorator for CORS support"; - homepage = https://github.com/corydolphin/flask-cors; + homepage = "https://github.com/corydolphin/flask-cors"; license = with licenses; [ mit ]; }; } diff --git a/pkgs/development/python-modules/flask-httpauth/default.nix b/pkgs/development/python-modules/flask-httpauth/default.nix index 051b83d1c3d03..d2e6cf3e47bf5 100644 --- a/pkgs/development/python-modules/flask-httpauth/default.nix +++ b/pkgs/development/python-modules/flask-httpauth/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-HTTPAuth"; - version = "3.3.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1fb1kr1iw6inkwfv160rpjx54vv1q9b90psdyyghyy1f6dhvgy3f"; + sha256 = "1z3ad8sm24xl2lazdia92br1a2nigqwaf1lfsa77j5pz6gf2xmj7"; }; propagatedBuildInputs = [ flask ]; diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index 1fcb7e3cd8753..bc1e2778e1933 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "JWT extension for Flask"; - homepage = https://flask-jwt-extended.readthedocs.io/; + homepage = "https://flask-jwt-extended.readthedocs.io/"; license = licenses.mit; maintainers = with maintainers; [ gerschtli ]; }; diff --git a/pkgs/development/python-modules/flask-ldap-login/default.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix index 99b57dac816f2..2573f54974085 100644 --- a/pkgs/development/python-modules/flask-ldap-login/default.nix +++ b/pkgs/development/python-modules/flask-ldap-login/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { patches = [ # Fix flask_wtf>=0.9.0 incompatibility. See https://github.com/ContinuumIO/flask-ldap-login/issues/41 (fetchpatch { - url = https://github.com/ContinuumIO/flask-ldap-login/commit/ed08c03c818dc63b97b01e2e7c56862eaa6daa43.patch; + url = "https://github.com/ContinuumIO/flask-ldap-login/commit/ed08c03c818dc63b97b01e2e7c56862eaa6daa43.patch"; sha256 = "19pkhbldk8jq6m10kdylvjf1c8m84fvvj04v5qda4cjyks15aq48"; }) ]; @@ -28,7 +28,7 @@ buildPythonPackage rec { checkPhase = "nosetests -d"; meta = with stdenv.lib; { - homepage = https://github.com/ContinuumIO/flask-ldap-login; + homepage = "https://github.com/ContinuumIO/flask-ldap-login"; description = "User session management for Flask"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index 01b340a2847c3..041935e28e308 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Rate limiting for flask applications"; - homepage = https://flask-limiter.readthedocs.org/; + homepage = "https://flask-limiter.readthedocs.org/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index d466a78a6811f..8a48bbdd7da63 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = pythonAtLeast "3.3"; meta = with stdenv.lib; { - homepage = https://github.com/maxcountryman/flask-login; + homepage = "https://github.com/maxcountryman/flask-login"; description = "User session management for Flask"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index d7fbec5715dec..ef2b3a40705be 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { meta = { description = "SQLAlchemy database migrations for Flask applications using Alembic"; license = licenses.mit; - homepage = https://github.com/miguelgrinberg/Flask-Migrate; + homepage = "https://github.com/miguelgrinberg/Flask-Migrate"; }; } diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index 5e61a2415b7c1..ad43533123690 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Flask-MongoEngine is a Flask extension that provides integration with MongoEngine and WTF model forms"; - homepage = https://github.com/mongoengine/flask-mongoengine; + homepage = "https://github.com/mongoengine/flask-mongoengine"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/flask-openid/default.nix b/pkgs/development/python-modules/flask-openid/default.nix index c1f9a51a22505..a9a5ec9acc8b7 100644 --- a/pkgs/development/python-modules/flask-openid/default.nix +++ b/pkgs/development/python-modules/flask-openid/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "OpenID support for Flask"; - homepage = https://pythonhosted.org/Flask-OpenID/; + homepage = "https://pythonhosted.org/Flask-OpenID/"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix index ba1c0b10d15ac..f0cf96d13679c 100644 --- a/pkgs/development/python-modules/flask-paginate/default.nix +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask ]; meta = with lib; { - homepage = https://github.com/lixxu/flask-paginate; + homepage = "https://github.com/lixxu/flask-paginate"; description = "Pagination support for Flask"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/flask-principal/default.nix b/pkgs/development/python-modules/flask-principal/default.nix index cbdbd9892115e..f3164aa1f08ee 100644 --- a/pkgs/development/python-modules/flask-principal/default.nix +++ b/pkgs/development/python-modules/flask-principal/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; meta = with lib; { - homepage = http://packages.python.org/Flask-Principal/; + homepage = "http://packages.python.org/Flask-Principal/"; description = "Identity management for flask"; license = licenses.bsd2; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index 89cc47cbcfbc0..17c63f326ea45 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { patches = [ (fetchpatch { - url = https://github.com/flask-restful/flask-restful/commit/54979f0a49b2217babc53c5b65b5df10b6de8e05.patch; + url = "https://github.com/flask-restful/flask-restful/commit/54979f0a49b2217babc53c5b65b5df10b6de8e05.patch"; sha256 = "11s6ag6l42g61ccg5jw9j1f26hwgjfa3sp890cbl5r4hy5ycpyr5"; }) (fetchpatch { - url = https://github.com/flask-restful/flask-restful/commit/f45e81a45ed03922fd225afe27006315811077e6.patch; + url = "https://github.com/flask-restful/flask-restful/commit/f45e81a45ed03922fd225afe27006315811077e6.patch"; sha256 = "16avd369j5r08d1l23mwbba26zjwnmfqvfvnfz02am3gr5l6p3gl"; }) ]; diff --git a/pkgs/development/python-modules/flask-restplus/default.nix b/pkgs/development/python-modules/flask-restplus/default.nix index 2fc0fa8569ba0..3de74531c2886 100644 --- a/pkgs/development/python-modules/flask-restplus/default.nix +++ b/pkgs/development/python-modules/flask-restplus/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/noirbizarre/flask-restplus; + homepage = "https://github.com/noirbizarre/flask-restplus"; description = "Fast, easy and documented API development with Flask"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/flask-script/default.nix b/pkgs/development/python-modules/flask-script/default.nix index 51ba7ce4d7cd0..9acc55166a868 100644 --- a/pkgs/development/python-modules/flask-script/default.nix +++ b/pkgs/development/python-modules/flask-script/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/smurfix/flask-script; + homepage = "https://github.com/smurfix/flask-script"; description = "Scripting support for Flask"; license = licenses.bsd3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/flask-silk/default.nix b/pkgs/development/python-modules/flask-silk/default.nix index 653e39b17401e..831eb03a09b0d 100644 --- a/pkgs/development/python-modules/flask-silk/default.nix +++ b/pkgs/development/python-modules/flask-silk/default.nix @@ -25,6 +25,6 @@ buildPythonPackage { description = "Adds silk icons to your Flask application or module, or extension"; license = licenses.bsd3; maintainers = with maintainers; [ timokau ]; - homepage = https://github.com/sublee/flask-silk; + homepage = "https://github.com/sublee/flask-silk"; }; } diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index 5ec462a45e0cc..e0e56aa6e92a2 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Socket.IO integration for Flask applications"; - homepage = https://github.com/miguelgrinberg/Flask-SocketIO/; + homepage = "https://github.com/miguelgrinberg/Flask-SocketIO/"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index 02d8d25bafee6..2453bb50766d4 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "SQLAlchemy extension for Flask"; - homepage = http://flask-sqlalchemy.pocoo.org/; + homepage = "http://flask-sqlalchemy.pocoo.org/"; license = licenses.bsd3; maintainers = with maintainers; [ gerschtli ]; }; diff --git a/pkgs/development/python-modules/flask-versioned/default.nix b/pkgs/development/python-modules/flask-versioned/default.nix new file mode 100644 index 0000000000000..3bd5ef98b322e --- /dev/null +++ b/pkgs/development/python-modules/flask-versioned/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, flask }: + +buildPythonPackage rec { + pname = "Flask-Versioned"; + version = "0.9.4-20101221"; + + src = fetchFromGitHub { + owner = "pilt"; + repo = "flask-versioned"; + rev = "38046fb53a09060de437c90a5f7370a6b94ffc31"; # no tags + sha256 = "1wim9hvx7lxzfg35c0nc7p34j4vw9mzisgijlz4ibgykah4g1y37"; + }; + + propagatedBuildInputs = [ flask ]; + + meta = with stdenv.lib; { + description = "Flask plugin to rewrite file paths to add version info"; + homepage = "https://github.com/pilt/flask-versioned"; + license = licenses.bsd3; + maintainers = with maintainers; [ globin ]; + }; +} + diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index 96828dcdce25d..060f592b2cff6 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-WTF"; - version = "0.14.2"; + version = "0.14.3"; src = fetchPypi { inherit pname version; - sha256 = "0dncc5as2k61b28k8kal5yh3prmv7zya1jz7kvci7ximzmfda52x"; + sha256 = "086pvg2x69n0nczcq7frknfjd8am1zdy8qqpva1sanwb02hf65yl"; }; propagatedBuildInputs = [ flask wtforms nose ]; @@ -17,6 +17,6 @@ buildPythonPackage rec { description = "Simple integration of Flask and WTForms."; license = licenses.bsd3; maintainers = [ maintainers.mic92 ]; - homepage = https://github.com/lepture/flask-wtf/; + homepage = "https://github.com/lepture/flask-wtf/"; }; } diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index a330b9dd8a625..ffbebf96ee9fd 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://flask.pocoo.org/; + homepage = "http://flask.pocoo.org/"; description = "A microframework based on Werkzeug, Jinja 2, and good intentions"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/flexmock/default.nix b/pkgs/development/python-modules/flexmock/default.nix index e4da4ce792600..74c3418b54b02 100644 --- a/pkgs/development/python-modules/flexmock/default.nix +++ b/pkgs/development/python-modules/flexmock/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "flexmock is a testing library for Python that makes it easy to create mocks,stubs and fakes."; - homepage = https://flexmock.readthedocs.org; + homepage = "https://flexmock.readthedocs.org"; license = licenses.bsdOriginal; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/pkgs/development/python-modules/flickrapi/default.nix index 88dfff3aa8f93..cfcc4d362997c 100644 --- a/pkgs/development/python-modules/flickrapi/default.nix +++ b/pkgs/development/python-modules/flickrapi/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = { description = "A Python interface to the Flickr API"; - homepage = https://stuvel.eu/flickrapi; + homepage = "https://stuvel.eu/flickrapi"; license = lib.licenses.psfl; maintainers = with lib.maintainers; [ obadz ]; }; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 22bba39ff010e..72957a94afa5d 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "A simple packaging tool for simple packages"; - homepage = https://github.com/takluyver/flit; + homepage = "https://github.com/takluyver/flit"; license = licenses.bsd3; maintainers = [ maintainers.fridh ]; }; diff --git a/pkgs/development/python-modules/fluent-logger/default.nix b/pkgs/development/python-modules/fluent-logger/default.nix index dab4ce30f6f93..a1202b5586d41 100644 --- a/pkgs/development/python-modules/fluent-logger/default.nix +++ b/pkgs/development/python-modules/fluent-logger/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "A structured logger for Fluentd (Python)"; - homepage = https://github.com/fluent/fluent-logger-python; + homepage = "https://github.com/fluent/fluent-logger-python"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/fluidasserts/default.nix b/pkgs/development/python-modules/fluidasserts/default.nix deleted file mode 100644 index 7275199fca4d7..0000000000000 --- a/pkgs/development/python-modules/fluidasserts/default.nix +++ /dev/null @@ -1,209 +0,0 @@ -{ buildPythonPackage -, fetchPypi -, isPy37 -, lib - -# pythonPackages -, aiohttp -, androguard -, azure-identity -, azure-keyvault -, azure-mgmt-compute -, azure-mgmt-keyvault -, azure-mgmt-network -, azure-mgmt-resource -, azure-mgmt-security -, azure-mgmt-storage -, azure-mgmt-sql -, azure-mgmt-web -, azure-storage -, bandit -, bcrypt -, beautifulsoup4 -, boto3 -, cfn-flip -, cython -, dnspython -, colorama -, configobj -, defusedxml -, GitPython -, google_api_python_client -, kubernetes -, ldap3 -, mixpanel -, mysql-connector -, names -, ntplib -, oyaml -, paramiko -, pillow -, psycopg2 -, pycrypto -, pygments -, pyhcl -, pyjks -, pynacl -, pyodbc -, pyopenssl -, pypdf2 -, pysmb -, pytesseract -, python_magic -, pytz -, pywinrm -, requirements-detector -, selenium -, tlslite-ng -, viewstate - -# pythonPackages to test the derivation -, pytest -, flask -, flask-httpauth -, docker -}: - -buildPythonPackage rec { - pname = "fluidasserts"; - version = "20.2.30165"; - disabled = !isPy37; - - src = fetchPypi { - inherit pname version; - sha256 = "0wcplzfx89d3c6hvdgag860sl3infqmymy6ly6y6ah77pkc98x15"; - }; - - patchPhase = '' - # Release packages from their hard pinned versions - sed -i -E "s/(.*)==.*/\1/g" requirements.txt - - # Functionality that will be not present for the momment - # but that we'll work to add in the future - # Just a minimal portion of fluidasserts use this - substituteInPlace ./requirements.txt \ - --replace "mitmproxy" "" \ - - ''; - - propagatedBuildInputs = [ - # pythonPackages - aiohttp - androguard - azure-identity - azure-keyvault - azure-mgmt-compute - azure-mgmt-keyvault - azure-mgmt-network - azure-mgmt-resource - azure-mgmt-security - azure-mgmt-storage - azure-mgmt-sql - azure-mgmt-web - azure-storage - bandit - bcrypt - beautifulsoup4 - boto3 - cfn-flip - cython - dnspython - colorama - configobj - defusedxml - GitPython - google_api_python_client - kubernetes - ldap3 - mixpanel - mysql-connector - names - ntplib - oyaml - paramiko - pillow - psycopg2 - pycrypto - pygments - pyhcl - pyjks - pynacl - pyodbc - pyopenssl - pypdf2 - pysmb - pytesseract - python_magic - pytz - pywinrm - requirements-detector - selenium - tlslite-ng - viewstate - ]; - - configurePhase = '' - mkdir -p build/config - touch build/config/README.rst - ''; - - checkInputs = [ - docker - flask - flask-httpauth - pytest - ]; - - checkPhase = '' - # This tests require BWAPP Docker Container - sed -ie 's/test_a[0-9]//g' ./test/test_proto_http_open.py - sed -ie 's/test_a[0-9]//g' ./test/test_proto_http_close.py - - # This tests require network connectivity - sed -ie 's/test_is_date_unsyncd//g' ./test/test_proto_http_open.py - sed -ie 's/test_is_date_unsyncd//g' ./test/test_proto_http_close.py - - # Remove impurities - substituteInPlace ./test/conftest.py \ - --replace "import wait" "" \ - --replace "if not os.path.exists(name):" "if os.path.exists(name):" \ - --replace "from test.mock import graphql_server" "" \ - --replace "(graphql_server.start, 'MockGraphQLServer', ['proto_graphql'])," "" \ - - pytest --asserts-module 'iot' \ - test/test_iot_phone.py - - pytest --asserts-module 'ot' \ - test/test_ot_powerlogic.py - - pytest --asserts-module 'proto_http' \ - test/test_proto_{http_close,http_open}.py - - pytest --asserts-module 'proto_rest' \ - test/test_proto_rest.py - - # This file launches mock docker containers and servers - # let's remove it to create a custom test environment - rm test/conftest.py - - pytest \ - test/test_cloud_aws_terraform_{cloudfront,dynamodb,ebs,ec2,elb}.py \ - test/test_cloud_aws_terraform_{fsx,iam,kms,rds,s3}.py \ - test/test_cloud_aws_cloudformation_{cloudfront,dynamodb,ec2,elb,elb2}.py \ - test/test_cloud_aws_cloudformation_{fsx,iam,kms,rds,s3,secretsmanager}.py \ - test/test_format_{apk,jks,jwt,pdf,pkcs12,string}.py \ - test/test_helper_{asynchronous,crypto}.py \ - test/test_lang_{javascript,java}.py \ - test/test_lang_{core,csharp,docker,dotnetconfig,html,php,python,rpgle}.py \ - test/test_utils_generic.py - ''; - - meta = with lib; { - description = "Assertion Library for Security Assumptions"; - homepage = "https://gitlab.com/fluidattacks/asserts"; - license = licenses.mpl20; - maintainers = with maintainers; [ - kamadorueda - ]; - }; -} diff --git a/pkgs/development/python-modules/fn/default.nix b/pkgs/development/python-modules/fn/default.nix index 550c4a7110130..f64d1a3d122d7 100644 --- a/pkgs/development/python-modules/fn/default.nix +++ b/pkgs/development/python-modules/fn/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { Functional programming in Python: implementation of missing features to enjoy FP ''; - homepage = https://github.com/kachayev/fn.py; + homepage = "https://github.com/kachayev/fn.py"; license = lib.licenses.asl20; }; diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 967e7cf09c108..9a89c9a8e0094 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = { description = "Make beautiful maps with Leaflet.js & Python"; - homepage = https://github.com/python-visualization/folium; + homepage = "https://github.com/python-visualization/folium"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index f85afa7702101..45d3941013714 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/fonttools/fonttools; + homepage = "https://github.com/fonttools/fonttools"; description = "A library to manipulate font files from Python"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index a9ab0db1ed927..0c5a0fff79d2c 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "foolscap"; - version = "0.13.2"; + version = "20.4.0"; src = fetchPypi { inherit pname version; - sha256 = "8498c7e9eaecb5b19be74b18d55c2086440be08de29f2bb507f9b505757467ff"; + sha256 = "0rbw9makjmawkcxnkkngybj3n14s0dnzn9gkqqq2krcm514kmlb9"; }; propagatedBuildInputs = [ mock twisted pyopenssl service-identity ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://foolscap.lothar.com/; + homepage = "http://foolscap.lothar.com/"; description = "Foolscap, an RPC protocol for Python that follows the distributed object-capability model"; longDescription = '' "Foolscap" is the name for the next-generation RPC protocol, diff --git a/pkgs/development/python-modules/forbiddenfruit/default.nix b/pkgs/development/python-modules/forbiddenfruit/default.nix index 534f2cd7bb74d..75b4fdef33781 100644 --- a/pkgs/development/python-modules/forbiddenfruit/default.nix +++ b/pkgs/development/python-modules/forbiddenfruit/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Patch python built-in objects"; - homepage = https://pypi.python.org/pypi/forbiddenfruit; + homepage = "https://pypi.python.org/pypi/forbiddenfruit"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix index e99c944c549c5..dc59fb6db3e24 100644 --- a/pkgs/development/python-modules/foxdot/default.nix +++ b/pkgs/development/python-modules/foxdot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "FoxDot"; - version = "0.8.5"; + version = "0.8.7"; src = fetchPypi { inherit pname version; - sha256 = "1k32fjlmzhhh6hvda71xqis13c3bdn7y3f5z9qqd1q410nfpzf59"; + sha256 = "0c5iqdn17ip6lkf26xb1cwjvcly0448gvqmkbkvhnqy4birc8cf5"; }; propagatedBuildInputs = [ tkinter supercollider ]; @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Live coding music with SuperCollider"; - homepage = https://foxdot.org/; + homepage = "https://foxdot.org/"; license = licenses.cc-by-sa-40; maintainers = with maintainers; [ mrmebelman ]; }; diff --git a/pkgs/development/python-modules/fpdf/default.nix b/pkgs/development/python-modules/fpdf/default.nix index a528244cb0f9b..e8e34f89c4355 100644 --- a/pkgs/development/python-modules/fpdf/default.nix +++ b/pkgs/development/python-modules/fpdf/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/reingart/pyfpdf; + homepage = "https://github.com/reingart/pyfpdf"; description = "Simple PDF generation for Python"; license = lib.licenses.lgpl3; maintainers = with lib.maintainers; [ geistesk ]; diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index e23351d3da6de..5587657972370 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { meta = { description = "A Python interface for fplll"; changelog = "https://github.com/fplll/fpylll/releases/tag/${version}"; - homepage = https://github.com/fplll/fpylll; + homepage = "https://github.com/fplll/fpylll"; maintainers = with lib.maintainers; [ timokau ]; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index 94d42206d63dd..583dad1b014d5 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/slezica/python-frozendict; + homepage = "https://github.com/slezica/python-frozendict"; description = "An immutable dictionary"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/fs-s3fs/default.nix b/pkgs/development/python-modules/fs-s3fs/default.nix index cb9723742dc01..18434f530cbf6 100644 --- a/pkgs/development/python-modules/fs-s3fs/default.nix +++ b/pkgs/development/python-modules/fs-s3fs/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://pypi.org/project/fs-s3fs/; + homepage = "https://pypi.org/project/fs-s3fs/"; license = licenses.mit; description = "Amazon S3 filesystem for PyFilesystem2"; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index fee20021e1a43..ff6ce57aefa80 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Filesystem abstraction"; - homepage = https://github.com/PyFilesystem/pyfilesystem2; + homepage = "https://github.com/PyFilesystem/pyfilesystem2"; license = licenses.bsd3; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 7e0ed8b9712d1..8f2c11f4265be 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "A specification that python filesystems should adhere to"; - homepage = https://github.com/intake/filesystem_spec; + homepage = "https://github.com/intake/filesystem_spec"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 7b633680b4ce6..bb421d746d4f1 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Given Unicode text, make its representation consistent and possibly less broken"; - homepage = https://github.com/LuminosoInsight/python-ftfy; + homepage = "https://github.com/LuminosoInsight/python-ftfy"; license = licenses.mit; maintainers = with maintainers; [ sdll aborsu ]; }; diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix index 5e367644a1c8d..941b5792f3046 100644 --- a/pkgs/development/python-modules/ftputil/default.nix +++ b/pkgs/development/python-modules/ftputil/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "High-level FTP client library (virtual file system and more)"; - homepage = http://ftputil.sschwarzer.net/; + homepage = "http://ftputil.sschwarzer.net/"; license = licenses.bsd2; # "Modified BSD license, says pypi" }; } diff --git a/pkgs/development/python-modules/fudge/default.nix b/pkgs/development/python-modules/fudge/default.nix index de45a1404f573..16656fb19a747 100644 --- a/pkgs/development/python-modules/fudge/default.nix +++ b/pkgs/development/python-modules/fudge/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/fudge-py/fudge; + homepage = "https://github.com/fudge-py/fudge"; description = "Replace real objects with fakes (mocks, stubs, etc) while testing"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix index 5a4701df9c311..1febf9d356eb2 100644 --- a/pkgs/development/python-modules/funcsigs/default.nix +++ b/pkgs/development/python-modules/funcsigs/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"; - homepage = https://github.com/aliles/funcsigs; + homepage = "https://github.com/aliles/funcsigs"; maintainers = with maintainers; [ ]; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix index 0ac33be3899d6..8c69ead0ae009 100644 --- a/pkgs/development/python-modules/fuse-python/default.nix +++ b/pkgs/development/python-modules/fuse-python/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for FUSE"; - homepage = https://github.com/libfuse/python-fuse; + homepage = "https://github.com/libfuse/python-fuse"; license = licenses.lgpl21; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/fusepy/default.nix b/pkgs/development/python-modules/fusepy/default.nix index 80ca5099f3441..57355126dde21 100644 --- a/pkgs/development/python-modules/fusepy/default.nix +++ b/pkgs/development/python-modules/fusepy/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { Python module that provides a simple interface to FUSE and MacFUSE. It's just one file and is implemented using ctypes. ''; - homepage = https://github.com/terencehonles/fusepy; + homepage = "https://github.com/terencehonles/fusepy"; license = licenses.isc; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/future-fstrings/default.nix b/pkgs/development/python-modules/future-fstrings/default.nix index c9b49fee4cb6c..ffb798e6487fb 100644 --- a/pkgs/development/python-modules/future-fstrings/default.nix +++ b/pkgs/development/python-modules/future-fstrings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/asottile/future-fstrings; + homepage = "https://github.com/asottile/future-fstrings"; description = "A backport of fstrings to python<3.6"; license = licenses.mit; maintainers = with maintainers; [ nyanloutre ]; diff --git a/pkgs/development/python-modules/future/default.nix b/pkgs/development/python-modules/future/default.nix index dad0372a8c1f7..a24ea8ab97239 100644 --- a/pkgs/development/python-modules/future/default.nix +++ b/pkgs/development/python-modules/future/default.nix @@ -27,8 +27,8 @@ buildPythonPackage rec { either Py2 or Py3 code easily to support both Python 2 and 3 in a single clean Py3-style codebase, module by module. ''; - homepage = https://python-future.org; - downloadPage = https://github.com/PythonCharmers/python-future/releases; + homepage = "https://python-future.org"; + downloadPage = "https://github.com/PythonCharmers/python-future/releases"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ prikhi ]; }; diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index 551f5f4c3dde5..8baec8c1089a2 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fuzzy string matching for Python"; - homepage = https://github.com/seatgeek/fuzzywuzzy; + homepage = "https://github.com/seatgeek/fuzzywuzzy"; license = licenses.gpl2; maintainers = with maintainers; [ earvstedt ]; }; diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index 93eedc73a6f03..acbaf93a4ead7 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -38,7 +38,7 @@ buildPythonPackage { meta = with lib; { description = "Chip support package for Cypress EZ-USB FX2 series microcontrollers"; - homepage = https://github.com/whitequark/libfx2; + homepage = "https://github.com/whitequark/libfx2"; license = licenses.bsd0; maintainers = with maintainers; [ emily ]; }; diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index 278bd381ca6a5..774b2087d8fdf 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python script for summarizing gcov data"; license = licenses.bsd0; - homepage = https://www.gcovr.com/; + homepage = "https://www.gcovr.com/"; }; } diff --git a/pkgs/development/python-modules/gdrivefs/default.nix b/pkgs/development/python-modules/gdrivefs/default.nix index 0b2d0fbc91d13..24b788f2c6d77 100644 --- a/pkgs/development/python-modules/gdrivefs/default.nix +++ b/pkgs/development/python-modules/gdrivefs/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { (Google Doc files do not have a particular format). - Allow for the same file at multiple paths. ''; - homepage = https://github.com/dsoprea/GDriveFS; + homepage = "https://github.com/dsoprea/GDriveFS"; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/geeknote/default.nix b/pkgs/development/python-modules/geeknote/default.nix index c8ff60b318b73..cacc832486e26 100644 --- a/pkgs/development/python-modules/geeknote/default.nix +++ b/pkgs/development/python-modules/geeknote/default.nix @@ -30,7 +30,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Work with Evernote from command line"; - homepage = http://www.geeknote.me; + homepage = "http://www.geeknote.me"; license = licenses.gpl1; maintainers = with maintainers; [ hbunke ]; }; diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix index bab5b26635d1f..b9209ba78c228 100644 --- a/pkgs/development/python-modules/genanki/default.nix +++ b/pkgs/development/python-modules/genanki/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/kerrickstaley/genanki; + homepage = "https://github.com/kerrickstaley/genanki"; description = "Generate Anki decks programmatically"; license = licenses.mit; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/python-modules/genpy/default.nix b/pkgs/development/python-modules/genpy/default.nix index c8bbeefd6acdb..64e253b32019f 100644 --- a/pkgs/development/python-modules/genpy/default.nix +++ b/pkgs/development/python-modules/genpy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "C/C++ source generation from an AST"; - homepage = https://github.com/inducer/genpy; + homepage = "https://github.com/inducer/genpy"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/genshi/default.nix b/pkgs/development/python-modules/genshi/default.nix index c86fae5d0e9d4..5554e4b330e27 100644 --- a/pkgs/development/python-modules/genshi/default.nix +++ b/pkgs/development/python-modules/genshi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { parsing, generating, and processing HTML, XML or other textual content for output generation on the web. ''; - homepage = https://genshi.edgewall.org/; + homepage = "https://genshi.edgewall.org/"; license = licenses.bsd0; }; } diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 592db824f3f1d..be6321f86ca71 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "gensim"; - version = "3.8.1"; + version = "3.8.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "33277fc0a8d7b0c7ce70fcc74bb82ad39f944c009b334856c6e86bf552b1dfdc"; + sha256 = "0rx37vnjspjl45v7bj123xwsjfgbwv91v8zpqpli8lgpf42xnskq"; }; propagatedBuildInputs = [ smart_open numpy six scipy ]; @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = { description = "Topic-modelling library"; - homepage = https://radimrehurek.com/gensim/; + homepage = "https://radimrehurek.com/gensim/"; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ jyp ]; }; diff --git a/pkgs/development/python-modules/gentools/default.nix b/pkgs/development/python-modules/gentools/default.nix index 57105f87a7c06..129eaae340a14 100644 --- a/pkgs/development/python-modules/gentools/default.nix +++ b/pkgs/development/python-modules/gentools/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tools for generators, generator functions, and generator-based coroutines"; license = licenses.mit; - homepage = https://gentools.readthedocs.io/; + homepage = "https://gentools.readthedocs.io/"; maintainers = with maintainers; [ mredaelli ]; }; diff --git a/pkgs/development/python-modules/genzshcomp/default.nix b/pkgs/development/python-modules/genzshcomp/default.nix index d7b73071b0c96..99d89e79d1256 100644 --- a/pkgs/development/python-modules/genzshcomp/default.nix +++ b/pkgs/development/python-modules/genzshcomp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Automatically generated zsh completion function for Python's option parser modules"; - homepage = https://bitbucket.org/hhatto/genzshcomp/; + homepage = "https://bitbucket.org/hhatto/genzshcomp/"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 02d00461e26fe..ae2df2ce60701 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sqlalchemy shapely ]; meta = with stdenv.lib; { - homepage = http://geoalchemy.org/; + homepage = "http://geoalchemy.org/"; license = licenses.mit; description = "Toolkit for working with spatial databases"; }; diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix index a41cdada4be76..5d0fa90241693 100644 --- a/pkgs/development/python-modules/geojson/default.nix +++ b/pkgs/development/python-modules/geojson/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { checkInputs = [ glibcLocales ]; meta = { - homepage = https://github.com/frewsxcv/python-geojson; + homepage = "https://github.com/frewsxcv/python-geojson"; description = "Python bindings and utilities for GeoJSON"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ geistesk ]; diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index 6b1b74cae8a83..9a86acf83b50e 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python geospatial data analysis framework"; - homepage = "http://geopandas.org"; + homepage = "https://geopandas.org"; license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp ]; }; diff --git a/pkgs/development/python-modules/geopy/2.nix b/pkgs/development/python-modules/geopy/2.nix index 484c049da358b..2863d30f4684d 100644 --- a/pkgs/development/python-modules/geopy/2.nix +++ b/pkgs/development/python-modules/geopy/2.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "geopy"; - version = "1.21.0"; + version = "1.22.0"; disabled = !isPy27; # only Python 2.7 doCheck = false; # Needs network access @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1p1sgy2p59j0297bp7c82b45bx4d3i1p4kvbgf89c9i0llyb80nw"; + sha256 = "0jypkaqlbyr8icqypwm23lzsvq7flakp3a3nqr8ib5fmd0fzsq7q"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/gevent-socketio/default.nix b/pkgs/development/python-modules/gevent-socketio/default.nix index e95519a346c59..2b847275bed00 100644 --- a/pkgs/development/python-modules/gevent-socketio/default.nix +++ b/pkgs/development/python-modules/gevent-socketio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ gevent ]; meta = with stdenv.lib; { - homepage = https://github.com/abourget/gevent-socketio; + homepage = "https://github.com/abourget/gevent-socketio"; description = "SocketIO server based on the Gevent pywsgi server, a Python network library"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/pkgs/development/python-modules/gevent-websocket/default.nix index 6c9df6b571b0c..adc13738d5ea6 100644 --- a/pkgs/development/python-modules/gevent-websocket/default.nix +++ b/pkgs/development/python-modules/gevent-websocket/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ gevent gunicorn ]; meta = with stdenv.lib; { - homepage = https://www.gitlab.com/noppo/gevent-websocket; + homepage = "https://www.gitlab.com/noppo/gevent-websocket"; description = "Websocket handler for the gevent pywsgi server, a Python network library"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index a8caf65001625..56467523a17de 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Coroutine-based networking library"; - homepage = http://www.gevent.org/; + homepage = "http://www.gevent.org/"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index 6a78d60544dbd..59b11e0f6ac41 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/gwik/geventhttpclient; + homepage = "https://github.com/gwik/geventhttpclient"; description = "HTTP client library for gevent"; license = licenses.mit; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/development/python-modules/gflags/default.nix b/pkgs/development/python-modules/gflags/default.nix index 9eb8e3b2d6ce5..9b3b92784d791 100644 --- a/pkgs/development/python-modules/gflags/default.nix +++ b/pkgs/development/python-modules/gflags/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/google/python-gflags; + homepage = "https://github.com/google/python-gflags"; description = "A module for command line handling, similar to Google's gflags for C++"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/ghdiff/default.nix b/pkgs/development/python-modules/ghdiff/default.nix index 3a5fbe8433cef..c58d63a083752 100644 --- a/pkgs/development/python-modules/ghdiff/default.nix +++ b/pkgs/development/python-modules/ghdiff/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six chardet ]; meta = with stdenv.lib; { - homepage = https://github.com/kilink/ghdiff; + homepage = "https://github.com/kilink/ghdiff"; license = licenses.mit; description = "Generate Github-style HTML for unified diffs."; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 341d08d95ed48..634d7c2ddc04c 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "An async GitHub API library"; - homepage = https://github.com/brettcannon/gidgethub; + homepage = "https://github.com/brettcannon/gidgethub"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/gin-config/default.nix b/pkgs/development/python-modules/gin-config/default.nix index 5e8343a4b0c3b..39a64781c8f97 100644 --- a/pkgs/development/python-modules/gin-config/default.nix +++ b/pkgs/development/python-modules/gin-config/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck= false; meta = with lib; { - homepage = https://github.com/google/gin-config; + homepage = "https://github.com/google/gin-config"; description = "Gin provides a lightweight configuration framework for Python, based on dependency injection."; license = licenses.asl20; maintainers = with maintainers; [ jethro ]; diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index 8255668de1cf4..df1bd590d3744 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { multiprocessing. Process-based child processes can safely be created anywhere within your gevent-powered application. ''; - homepage = http://gehrcke.de/gipc; + homepage = "http://gehrcke.de/gipc"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index a7bac0fd7626d..ba3ff3bfd6c30 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/alpernebbi/git-annex-adapter; + homepage = "https://github.com/alpernebbi/git-annex-adapter"; description = "Call git-annex commands from Python"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix index dfc0b4afb8a19..b4de60775295d 100644 --- a/pkgs/development/python-modules/git-revise/default.nix +++ b/pkgs/development/python-modules/git-revise/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Efficiently update, split, and rearrange git commits"; - homepage = https://github.com/mystor/git-revise; + homepage = "https://github.com/mystor/git-revise"; changelog = "https://github.com/mystor/git-revise/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ emily ]; diff --git a/pkgs/development/python-modules/git-sweep/default.nix b/pkgs/development/python-modules/git-sweep/default.nix index e2182892e8510..aa2a223c77745 100644 --- a/pkgs/development/python-modules/git-sweep/default.nix +++ b/pkgs/development/python-modules/git-sweep/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A command-line tool that helps you clean up Git branches"; - homepage = https://github.com/arc90/git-sweep; + homepage = "https://github.com/arc90/git-sweep"; license = licenses.mit; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix index 880fc543fb689..b76ee4394c6e1 100644 --- a/pkgs/development/python-modules/gitdb/default.nix +++ b/pkgs/development/python-modules/gitdb/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "Git Object Database"; maintainers = [ ]; - homepage = https://github.com/gitpython-developers/gitdb; + homepage = "https://github.com/gitpython-developers/gitdb"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix index d0d82adf49117..6b1ea305d4a60 100644 --- a/pkgs/development/python-modules/github3_py/default.nix +++ b/pkgs/development/python-modules/github3_py/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github3py.readthedocs.org/en/master/; + homepage = "https://github3py.readthedocs.org/en/master/"; description = "A wrapper for the GitHub API written in python"; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/python-modules/glasgow/default.nix b/pkgs/development/python-modules/glasgow/default.nix index 94ae2a1258ea2..6a32364fdf319 100644 --- a/pkgs/development/python-modules/glasgow/default.nix +++ b/pkgs/development/python-modules/glasgow/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Software for Glasgow, a digital interface multitool"; - homepage = https://github.com/GlasgowEmbedded/Glasgow; + homepage = "https://github.com/GlasgowEmbedded/Glasgow"; license = licenses.bsd0; maintainers = with maintainers; [ emily ]; }; diff --git a/pkgs/development/python-modules/glob2/default.nix b/pkgs/development/python-modules/glob2/default.nix index bce69bffff2f0..29028e6d32d89 100644 --- a/pkgs/development/python-modules/glob2/default.nix +++ b/pkgs/development/python-modules/glob2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Version of the glob module that can capture patterns and supports recursive wildcards"; - homepage = https://github.com/miracle2k/python-glob2/; + homepage = "https://github.com/miracle2k/python-glob2/"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 348c32174a257..f7a8973246713 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "A convenient Pythonic interface to Globus REST APIs, including the Transfer API and the Globus Auth API."; - homepage = https://github.com/globus/globus-sdk-python; + homepage = "https://github.com/globus/globus-sdk-python"; license = licenses.asl20; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index 739ef7d95e462..cc73b26d79721 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { doCheck = !isPy37; # https://github.com/mahmoud/glom/issues/72 meta = with stdenv.lib; { - homepage = https://github.com/mahmoud/glom; + homepage = "https://github.com/mahmoud/glom"; description = "Restructuring data, the Python way"; longDescription = '' glom helps pull together objects from other objects in a diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix index 3da367c445fb5..d2721951ad788 100644 --- a/pkgs/development/python-modules/glymur/default.nix +++ b/pkgs/development/python-modules/glymur/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tools for accessing JPEG2000 files"; - homepage = https://github.com/quintusdias/glymur; + homepage = "https://github.com/quintusdias/glymur"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/gmpy/default.nix b/pkgs/development/python-modules/gmpy/default.nix index 73f1175e0bd64..c0522587724a0 100644 --- a/pkgs/development/python-modules/gmpy/default.nix +++ b/pkgs/development/python-modules/gmpy/default.nix @@ -19,6 +19,6 @@ buildPythonPackage { meta = { description = "GMP or MPIR interface to Python 2.4+ and 3.x"; - homepage = https://github.com/aleaxit/gmpy/; + homepage = "https://github.com/aleaxit/gmpy/"; }; } diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix index fc55490640981..1f7975abe5c14 100644 --- a/pkgs/development/python-modules/gmpy2/default.nix +++ b/pkgs/development/python-modules/gmpy2/default.nix @@ -40,7 +40,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x"; - homepage = https://github.com/aleaxit/gmpy/; + homepage = "https://github.com/aleaxit/gmpy/"; license = licenses.gpl3Plus; }; } diff --git a/pkgs/development/python-modules/gmusicapi/default.nix b/pkgs/development/python-modules/gmusicapi/default.nix index 2b57ce37a7fcc..deae0037bb2de 100644 --- a/pkgs/development/python-modules/gmusicapi/default.nix +++ b/pkgs/development/python-modules/gmusicapi/default.nix @@ -20,18 +20,18 @@ buildPythonPackage rec { pname = "gmusicapi"; - version = "12.1.1"; + version = "13.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1cgjxqi4a18zp5dx7v71h6wiy3cvggyydkrs008dsfgyhg8s89d8"; + sha256 = "14dqs64nhy84dykyyrdjmsirc7m169zsvwa8abh4v0xcm658lm5k"; }; propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ]; meta = with stdenv.lib; { description = "An unofficial API for Google Play Music"; - homepage = https://pypi.python.org/pypi/gmusicapi/; + homepage = "https://pypi.python.org/pypi/gmusicapi/"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/pkgs/development/python-modules/gnureadline/default.nix index 2e802e05c070a..3b9263258584d 100644 --- a/pkgs/development/python-modules/gnureadline/default.nix +++ b/pkgs/development/python-modules/gnureadline/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "The standard Python readline extension statically linked against the GNU readline library"; - homepage = https://github.com/ludwigschwardt/python-gnureadline; + homepage = "https://github.com/ludwigschwardt/python-gnureadline"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/gnutls/default.nix b/pkgs/development/python-modules/gnutls/default.nix index 61c799589a98f..9b5cb905666b9 100644 --- a/pkgs/development/python-modules/gnutls/default.nix +++ b/pkgs/development/python-modules/gnutls/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python wrapper for the GnuTLS library"; - homepage = https://github.com/AGProjects/python-gnutls; + homepage = "https://github.com/AGProjects/python-gnutls"; license = licenses.lgpl2; }; diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix index a04bf6250e9e9..ac658b1940f44 100644 --- a/pkgs/development/python-modules/goobook/default.nix +++ b/pkgs/development/python-modules/goobook/default.nix @@ -12,13 +12,16 @@ buildPythonPackage rec { sha256 = "089a95s6g9izsy1fzpz48p6pz0wpngcbbrvsillm1n53492gfhjg"; }; + # Required for a breaking change in google-api-python-client 1.8.1: + patches = [ ./fix-build.patch ]; + propagatedBuildInputs = [ google_api_python_client simplejson oauth2client setuptools ]; meta = with stdenv.lib; { description = "Search your google contacts from the command-line or mutt"; - homepage = https://pypi.python.org/pypi/goobook; + homepage = "https://pypi.python.org/pypi/goobook"; license = licenses.gpl3; maintainers = with maintainers; [ primeos ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/goobook/fix-build.patch b/pkgs/development/python-modules/goobook/fix-build.patch new file mode 100644 index 0000000000000..1121dbfdcb32d --- /dev/null +++ b/pkgs/development/python-modules/goobook/fix-build.patch @@ -0,0 +1,32 @@ +From 8de09b82c5ac900317043e1c1025f431516b6788 Mon Sep 17 00:00:00 2001 +From: Michael Weiss <dev.primeos@gmail.com> +Date: Tue, 21 Apr 2020 21:41:04 +0200 +Subject: [PATCH] Switch from the alias apiclient to googleapiclient + +This fixes the package after a breaking change / bug in +google-api-python-client 1.8.1 (see [0] and a lot of duplicate issues). + +The module apiclient is just an alias for googleapiclient [1]. + +[0]: https://github.com/googleapis/google-api-python-client/issues/870 +[1]: https://github.com/googleapis/google-api-python-client/blob/v1.8.1/apiclient/__init__.py +--- + goobook/goobook.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/goobook/goobook.py b/goobook/goobook.py +index 5bcb0b3..a2e25e9 100755 +--- a/goobook/goobook.py ++++ b/goobook/goobook.py +@@ -31,7 +31,7 @@ import sys + import time + + import httplib2 +-from apiclient.discovery import build ++from googleapiclient.discovery import build + + from goobook.storage import Storage, storageify, unstorageify + +-- +2.26.1 + diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index e9b33f3308134..441fdc85bac20 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -14,13 +14,13 @@ with stdenv.lib; buildPythonPackage rec { pname = "GooCalendar"; - version = "0.7.0"; + version = "0.7.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "14m05pi1vwl7i8iv1wvc0r3450dlivsh85f4cyny08l869cr9lf1"; + sha256 = "1ccvw1w7xinl574h16hqs6dh3fkpm5n1jrqwjqz3ignxvli5sr38"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 2d7ae43f7f1e4..b787e08dbbf5c 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.8.0"; + version = "1.8.3"; src = fetchPypi { inherit pname version; - sha256 = "003rgr15r9j080f3n5y2x6ymxsfv652m3r7j83p7sbrd9shl4nqg"; + sha256 = "10alijbbv3nsj7dfnv3fpx0gf1s9d4c7yjq0mv51szcx777qskmy"; }; # No tests included in archive diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/pkgs/development/python-modules/google-auth-httplib2/default.nix index 99c9945ea66c3..2d6a9a3e4053c 100644 --- a/pkgs/development/python-modules/google-auth-httplib2/default.nix +++ b/pkgs/development/python-modules/google-auth-httplib2/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = { description = "Google Authentication Library: httplib2 transport"; - homepage = https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2; + homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"; license = lib.licenses.asl20; }; diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index cf83bd4d0ed62..ed7e57963ba64 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Authentication Library: oauthlib integration"; - homepage = https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib; + homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib"; license = licenses.asl20; maintainers = with maintainers; [ terlar ]; }; diff --git a/pkgs/development/python-modules/google-i18n-address/default.nix b/pkgs/development/python-modules/google-i18n-address/default.nix index d7bf6d082f8a2..f0cda83d3b2a5 100644 --- a/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/pkgs/development/python-modules/google-i18n-address/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google's i18n address data packaged for Python"; - homepage = https://pypi.org/project/google-i18n-address/; + homepage = "https://pypi.org/project/google-i18n-address/"; maintainers = with maintainers; [ ]; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/google-music-utils/default.nix b/pkgs/development/python-modules/google-music-utils/default.nix index 84f677d4d4e40..b7fd2738e0488 100644 --- a/pkgs/development/python-modules/google-music-utils/default.nix +++ b/pkgs/development/python-modules/google-music-utils/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; meta = with lib; { - homepage = https://github.com/thebigmunch/google-music-utils; + homepage = "https://github.com/thebigmunch/google-music-utils"; description = "A set of utility functionality for google-music and related projects"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix index f9ff76cf94ca2..f6b53aeebea3e 100644 --- a/pkgs/development/python-modules/google-music/default.nix +++ b/pkgs/development/python-modules/google-music/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; meta = with lib; { - homepage = https://github.com/thebigmunch/google-music; + homepage = "https://github.com/thebigmunch/google-music"; description = "A Google Music API wrapper"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/google-pasta/default.nix b/pkgs/development/python-modules/google-pasta/default.nix index fc4fb5a46d868..608ab9ccd1bc6 100644 --- a/pkgs/development/python-modules/google-pasta/default.nix +++ b/pkgs/development/python-modules/google-pasta/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "google-pasta"; - version = "0.1.8"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "713813a9f7d6589e5defdaf21e80e4392eb124662f8bd829acd51a4f8735c0cb"; + sha256 = "0vm1r1jlaiagj0l9yf7j6zn9w3733dr2169911c0svgrr3gwiwn9"; }; propagatedBuildInputs = [ @@ -19,7 +19,9 @@ buildPythonPackage rec { meta = { description = "An AST-based Python refactoring library"; - homepage = https://github.com/google/pasta; + homepage = "https://github.com/google/pasta"; + # Usually the tag message contains a one-line summary of the changes. + changelog = "https://github.com/google/pasta/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ timokau ]; }; diff --git a/pkgs/development/python-modules/google_cloud_asset/default.nix b/pkgs/development/python-modules/google_cloud_asset/default.nix index 934af49462b31..6c565d0f82062 100644 --- a/pkgs/development/python-modules/google_cloud_asset/default.nix +++ b/pkgs/development/python-modules/google_cloud_asset/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cloud Asset API API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_automl/default.nix b/pkgs/development/python-modules/google_cloud_automl/default.nix index e081d4e3c317f..6900b4f212f1a 100644 --- a/pkgs/development/python-modules/google_cloud_automl/default.nix +++ b/pkgs/development/python-modules/google_cloud_automl/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cloud AutoML API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix b/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix index 3da3fbfdf855d..ef76c1e0aae1f 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "BigQuery Data Transfer API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/pkgs/development/python-modules/google_cloud_dataproc/default.nix index becc2678dc169..b4eed7e549342 100644 --- a/pkgs/development/python-modules/google_cloud_dataproc/default.nix +++ b/pkgs/development/python-modules/google_cloud_dataproc/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Cloud Dataproc API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_dlp/default.nix b/pkgs/development/python-modules/google_cloud_dlp/default.nix index 3099093843512..5c285ca0b1b8c 100644 --- a/pkgs/development/python-modules/google_cloud_dlp/default.nix +++ b/pkgs/development/python-modules/google_cloud_dlp/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cloud Data Loss Prevention (DLP) API API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_firestore/default.nix b/pkgs/development/python-modules/google_cloud_firestore/default.nix index e6211d844fa74..5d8f4b535393e 100644 --- a/pkgs/development/python-modules/google_cloud_firestore/default.nix +++ b/pkgs/development/python-modules/google_cloud_firestore/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Cloud Firestore API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_iot/default.nix b/pkgs/development/python-modules/google_cloud_iot/default.nix index 6f6cd3262f897..fb2d2bf4a68cf 100644 --- a/pkgs/development/python-modules/google_cloud_iot/default.nix +++ b/pkgs/development/python-modules/google_cloud_iot/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cloud IoT API API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; # maintainers = [ maintainers. ]; }; diff --git a/pkgs/development/python-modules/google_cloud_kms/default.nix b/pkgs/development/python-modules/google_cloud_kms/default.nix index e3e9ed58eba6b..e9f8275deb94a 100644 --- a/pkgs/development/python-modules/google_cloud_kms/default.nix +++ b/pkgs/development/python-modules/google_cloud_kms/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cloud Key Management Service (KMS) API API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_language/default.nix b/pkgs/development/python-modules/google_cloud_language/default.nix index 44a3456607dba..4479231aba4d2 100644 --- a/pkgs/development/python-modules/google_cloud_language/default.nix +++ b/pkgs/development/python-modules/google_cloud_language/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Cloud Natural Language API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_logging/default.nix b/pkgs/development/python-modules/google_cloud_logging/default.nix index 7ea418977dfbe..fa4590ff0b2e7 100644 --- a/pkgs/development/python-modules/google_cloud_logging/default.nix +++ b/pkgs/development/python-modules/google_cloud_logging/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Stackdriver Logging API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_monitoring/default.nix b/pkgs/development/python-modules/google_cloud_monitoring/default.nix index a556fb955688e..c29b31eb50da0 100644 --- a/pkgs/development/python-modules/google_cloud_monitoring/default.nix +++ b/pkgs/development/python-modules/google_cloud_monitoring/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Stackdriver Monitoring API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/pkgs/development/python-modules/google_cloud_pubsub/default.nix index 9972345086644..683f5807a0ce3 100644 --- a/pkgs/development/python-modules/google_cloud_pubsub/default.nix +++ b/pkgs/development/python-modules/google_cloud_pubsub/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Cloud Pub/Sub API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_redis/default.nix b/pkgs/development/python-modules/google_cloud_redis/default.nix index 1eb2b9e08e979..d3c12d29f2b39 100644 --- a/pkgs/development/python-modules/google_cloud_redis/default.nix +++ b/pkgs/development/python-modules/google_cloud_redis/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Cloud Memorystore for Redis API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix b/pkgs/development/python-modules/google_cloud_securitycenter/default.nix index 5ace3fad0113e..42dccd6080528 100644 --- a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix +++ b/pkgs/development/python-modules/google_cloud_securitycenter/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cloud Security Command Center API API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix index 856de74dd9385..b253a4c71ed75 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Cloud Storage API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_tasks/default.nix b/pkgs/development/python-modules/google_cloud_tasks/default.nix index 95bcb0d4d5778..b4dc1e83ca833 100644 --- a/pkgs/development/python-modules/google_cloud_tasks/default.nix +++ b/pkgs/development/python-modules/google_cloud_tasks/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cloud Tasks API API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_testutils/default.nix b/pkgs/development/python-modules/google_cloud_testutils/default.nix index 311815ef3313f..90e4683f7b062 100644 --- a/pkgs/development/python-modules/google_cloud_testutils/default.nix +++ b/pkgs/development/python-modules/google_cloud_testutils/default.nix @@ -28,7 +28,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "System test utilities for google-cloud-python"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix index e8ed28ab26746..0f448440ca4a5 100644 --- a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix +++ b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Cloud Text-to-Speech API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_trace/default.nix b/pkgs/development/python-modules/google_cloud_trace/default.nix index 8e79759dfff93..4c49b0e70ebf5 100644 --- a/pkgs/development/python-modules/google_cloud_trace/default.nix +++ b/pkgs/development/python-modules/google_cloud_trace/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Stackdriver Trace API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix index 57e106fcfbedb..38ecb8bcc21e9 100644 --- a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix +++ b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Cloud Video Intelligence API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_vision/default.nix b/pkgs/development/python-modules/google_cloud_vision/default.nix index 39dfc123650e3..c2bdc652c7c13 100644 --- a/pkgs/development/python-modules/google_cloud_vision/default.nix +++ b/pkgs/development/python-modules/google_cloud_vision/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cloud Vision API API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix index 3318ab0323874..a68bd9df570e0 100644 --- a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Cloud Web Security Scanner API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_resumable_media/default.nix b/pkgs/development/python-modules/google_resumable_media/default.nix index 8486eba68c139..e9c7eecbc3a73 100644 --- a/pkgs/development/python-modules/google_resumable_media/default.nix +++ b/pkgs/development/python-modules/google_resumable_media/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Utilities for Google Media Downloads and Resumable Uploads"; - homepage = https://github.com/GoogleCloudPlatform/google-resumable-media-python; + homepage = "https://github.com/GoogleCloudPlatform/google-resumable-media-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix index c6afce2f9ba85..1181c59c1fc44 100644 --- a/pkgs/development/python-modules/gpapi/default.nix +++ b/pkgs/development/python-modules/gpapi/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests protobuf pycryptodome ]; meta = with stdenv.lib; { - homepage = https://github.com/NoMore201/googleplay-api; + homepage = "https://github.com/NoMore201/googleplay-api"; license = licenses.gpl3; description = "Google Play Unofficial Python API"; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index 1040a4be3f12e..c1008a4c8af26 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "gphoto2"; - version = "2.2.1"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "118zm25c8mlajfl0pzssnwz4b8lamj9dgymla9rn4nla7l244a0r"; + sha256 = "0sd3w0gpnb58hg8mv20nfqf4g1plr9rkn51h088xdsd6i97r9x99"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix index 074d41aab9493..7e74032390108 100644 --- a/pkgs/development/python-modules/gplaycli/default.nix +++ b/pkgs/development/python-modules/gplaycli/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ libffi pyasn1 clint ndg-httpsclient protobuf requests args gpapi pyaxmlparser ]; meta = with stdenv.lib; { - homepage = https://github.com/matlink/gplaycli; + homepage = "https://github.com/matlink/gplaycli"; description = "Google Play Downloader via Command line"; license = licenses.agpl3Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index a639026120474..dbc5791ac335c 100644 --- a/pkgs/development/python-modules/gpy/default.nix +++ b/pkgs/development/python-modules/gpy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Gaussian process framework in Python"; - homepage = https://sheffieldml.github.io/GPy; + homepage = "https://sheffieldml.github.io/GPy"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/gpyopt/default.nix b/pkgs/development/python-modules/gpyopt/default.nix index 3ad5cb7d89b5d..67f934ccf053f 100644 --- a/pkgs/development/python-modules/gpyopt/default.nix +++ b/pkgs/development/python-modules/gpyopt/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Bayesian optimization toolbox in Python"; - homepage = https://sheffieldml.github.io/GPyOpt; + homepage = "https://sheffieldml.github.io/GPyOpt"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/grammalecte/default.nix b/pkgs/development/python-modules/grammalecte/default.nix index 01c052bfdce8a..c6fcca9434d2b 100644 --- a/pkgs/development/python-modules/grammalecte/default.nix +++ b/pkgs/development/python-modules/grammalecte/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Grammalecte is an open source grammar checker for the French language"; - homepage = https://grammalecte.net; + homepage = "https://grammalecte.net"; license = with lib.licenses; [ gpl3 ]; maintainers = with lib.maintainers; [ apeyroux ]; }; diff --git a/pkgs/development/python-modules/grandalf/default.nix b/pkgs/development/python-modules/grandalf/default.nix index 79413b26544f7..2d2658e00f848 100644 --- a/pkgs/development/python-modules/grandalf/default.nix +++ b/pkgs/development/python-modules/grandalf/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python package made for experimentations with graphs and drawing algorithms"; - homepage = https://github.com/bdcht/grandalf; + homepage = "https://github.com/bdcht/grandalf"; license = licenses.gpl2; maintainers = with maintainers; [ cmcdragonkai ]; }; diff --git a/pkgs/development/python-modules/graph_nets/default.nix b/pkgs/development/python-modules/graph_nets/default.nix index 6b2536d37b393..4e83be64d03a4 100644 --- a/pkgs/development/python-modules/graph_nets/default.nix +++ b/pkgs/development/python-modules/graph_nets/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Build Graph Nets in Tensorflow"; - homepage = https://github.com/deepmind/graph_nets; + homepage = "https://github.com/deepmind/graph_nets"; license = licenses.asl20; maintainers = with maintainers; [ timokau ]; }; diff --git a/pkgs/development/python-modules/graphite-api/default.nix b/pkgs/development/python-modules/graphite-api/default.nix index 7f1726a2c4b9e..51300847bbbce 100644 --- a/pkgs/development/python-modules/graphite-api/default.nix +++ b/pkgs/development/python-modules/graphite-api/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Graphite-web, without the interface. Just the rendering HTTP API"; - homepage = https://github.com/brutasse/graphite-api; + homepage = "https://github.com/brutasse/graphite-api"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/graphite_beacon/default.nix b/pkgs/development/python-modules/graphite_beacon/default.nix index b94a92bc02fc1..159b09d10b912 100644 --- a/pkgs/development/python-modules/graphite_beacon/default.nix +++ b/pkgs/development/python-modules/graphite_beacon/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A simple alerting application for Graphite metrics"; - homepage = https://github.com/klen/graphite-beacon; + homepage = "https://github.com/klen/graphite-beacon"; maintainers = [ maintainers.offline ]; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index 572fdcaee51ab..fcb2867050d8b 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple Python interface for Graphviz"; - homepage = https://github.com/xflr6/graphviz; + homepage = "https://github.com/xflr6/graphviz"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/grappelli_safe/default.nix b/pkgs/development/python-modules/grappelli_safe/default.nix index 5a845f733f51a..299ce04f6fa23 100644 --- a/pkgs/development/python-modules/grappelli_safe/default.nix +++ b/pkgs/development/python-modules/grappelli_safe/default.nix @@ -24,8 +24,8 @@ buildPythonPackage rec { with Django 1.1 - grappelli_safe was therefore created to address these specific issues. ''; - homepage = https://github.com/stephenmcd/grappelli-safe; - downloadPage = http://pypi.python.org/pypi/grappelli_safe/; + homepage = "https://github.com/stephenmcd/grappelli-safe"; + downloadPage = "http://pypi.python.org/pypi/grappelli_safe/"; license = licenses.free; maintainers = with maintainers; [ prikhi ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix index c6fddd1554c28..b4048c922daee 100644 --- a/pkgs/development/python-modules/greatfet/default.nix +++ b/pkgs/development/python-modules/greatfet/default.nix @@ -24,7 +24,7 @@ buildPythonPackage { meta = { description = "Hardware hacking with the greatfet"; - homepage = https://greatscottgadgets.com/greatfet; + homepage = "https://greatscottgadgets.com/greatfet"; license = lib.licenses.bsd3; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ mog ]; diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix index a1167f24035db..1bf59a24dd419 100644 --- a/pkgs/development/python-modules/green/default.nix +++ b/pkgs/development/python-modules/green/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python test runner"; - homepage = https://github.com/CleanCut/green; + homepage = "https://github.com/CleanCut/green"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 3754f08c28be5..f6cff7411d214 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -24,8 +24,8 @@ buildPythonPackage rec { ''; meta = { - homepage = https://pypi.python.org/pypi/greenlet; + homepage = "https://pypi.python.org/pypi/greenlet"; description = "Module for lightweight in-process concurrent programming"; license = lib.licenses.lgpl2; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/grequests/default.nix b/pkgs/development/python-modules/grequests/default.nix index 0557fe787e8da..34e8c7ff16ff5 100644 --- a/pkgs/development/python-modules/grequests/default.nix +++ b/pkgs/development/python-modules/grequests/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "grequests"; - version = "0.4.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "8aeccc15e60ec65c7e67ee32e9c596ab2196979815497f85cf863465a1626490"; + sha256 = "0rpnim3ppxjdsaa869h1jdimcyc66mamcs593rd7brk8cq68kv3x"; }; # No tests in archive @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Asynchronous HTTP requests"; - homepage = https://github.com/kennethreitz/grequests; + homepage = "https://github.com/kennethreitz/grequests"; license = with licenses; [ bsd2 ]; maintainers = with maintainers; [ matejc ]; }; diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix index d812d58b74ca3..cf29b11b268ee 100644 --- a/pkgs/development/python-modules/grip/default.nix +++ b/pkgs/development/python-modules/grip/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { patches = [ # Render "front matter", used in our RFC template and elsewhere (fetchpatch { - url = https://github.com/joeyespo/grip/pull/249.patch; + url = "https://github.com/joeyespo/grip/pull/249.patch"; sha256 = "07za5iymfv647dfrvi6hhj54a96hgjyarys51zbi08c51shqyzpg"; }) ]; @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Preview GitHub Markdown files like Readme locally before committing them"; - homepage = https://github.com/joeyespo/grip; + homepage = "https://github.com/joeyespo/grip"; license = licenses.mit; maintainers = with maintainers; [ koral ]; }; diff --git a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix b/pkgs/development/python-modules/grpc_google_iam_v1/default.nix index 843c1b32f4906..caa3b8cafb4cc 100644 --- a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix +++ b/pkgs/development/python-modules/grpc_google_iam_v1/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "GRPC library for the google-iam-v1 service"; - homepage = https://github.com/googleapis/googleapis; + homepage = "https://github.com/googleapis/googleapis"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/grpcio-gcp/default.nix b/pkgs/development/python-modules/grpcio-gcp/default.nix index 067b27c8ffd16..6af70be2f6cb7 100644 --- a/pkgs/development/python-modules/grpcio-gcp/default.nix +++ b/pkgs/development/python-modules/grpcio-gcp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "gRPC extensions for Google Cloud Platform"; - homepage = https://grpc.io; + homepage = "https://grpc.io"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index f3eb93cd0605b..4b28e07a6cee1 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.28.1"; + version = "1.29.0"; src = fetchPypi { inherit pname version; - sha256 = "adf089aaf6e21358b12e39d9fa7c28611340d8399a918c0b72ff122ce9b7e0af"; + sha256 = "0f681c1ebd5472b804baa391b16dc59d92b065903999566f4776bfbd010bcec9"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index cdb252f7434d0..ecb15cc024db5 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, darwin, grpc , six, protobuf, enum34, futures, isPy27, pkgconfig -, cython}: +, cython, c-ares, openssl, zlib }: buildPythonPackage rec { inherit (grpc) src version; @@ -9,11 +9,16 @@ buildPythonPackage rec { nativeBuildInputs = [ cython pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; + buildInputs = [ c-ares openssl zlib ]; propagatedBuildInputs = [ six protobuf ] ++ stdenv.lib.optionals (isPy27) [ enum34 futures ]; preBuild = stdenv.lib.optionalString stdenv.isDarwin "unset AR"; + GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = 1; + GRPC_PYTHON_BUILD_SYSTEM_ZLIB = 1; + GRPC_PYTHON_BUILD_SYSTEM_CARES = 1; + meta = with stdenv.lib; { description = "HTTP/2-based RPC framework"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/gsd/1.7.nix b/pkgs/development/python-modules/gsd/1.7.nix index 311c4aba732ec..c9b3078cd46e6 100644 --- a/pkgs/development/python-modules/gsd/1.7.nix +++ b/pkgs/development/python-modules/gsd/1.7.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://bitbucket.org/glotzer/gsd; + homepage = "https://bitbucket.org/glotzer/gsd"; description = "General simulation data file format"; license = licenses.bsd2; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index cebb48f439431..5a25d81d01730 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "3.3.0"; + version = "3.3.1"; pname = "gspread"; src = fetchPypi { inherit pname version; - sha256 = "1nlmg7lnj162nql1acw9z7n1043sk49j11arlfn766i9ykvq6hng"; + sha256 = "0mpvhndr38hb5x95xk2mqqasvcy6pa7ck8801bvpg5y3lwn5nka0"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 405dd7374fcc6..11080d3fbc84d 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -9,6 +9,7 @@ , gobject-introspection , gst-plugins-base , isPy3k +, fetchpatch }: buildPythonPackage rec { @@ -38,6 +39,14 @@ buildPythonPackage rec { pygobject3 ]; + patches = stdenv.lib.optionals stdenv.isDarwin [ + # Fix configure python lib detection in macOS. Remove with the next release + (fetchpatch { + url = "https://github.com/GStreamer/gst-python/commit/f98c206bdf01529f8ea395a719b10baf2bdf717f.patch"; + sha256 = "04n4zrnfivgr7iaqw4sjlbd882s8halc2bbbhfxqf0sg2lqwmrxg"; + }) + ]; + mesonFlags = [ "-Dpython=python${if isPy3k then "3" else "2"}" "-Dpygi-overrides-dir=${placeholder "out"}/${python.sitePackages}/gi/overrides" diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix index 17dc8dea4f83c..b6fe06610b350 100644 --- a/pkgs/development/python-modules/gtimelog/default.nix +++ b/pkgs/development/python-modules/gtimelog/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A small GTK app for keeping track of your time. It's main goal is to be as unintrusive as possible"; - homepage = https://mg.pov.lt/gtimelog/; + homepage = "https://mg.pov.lt/gtimelog/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ocharles ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/gtts-token/default.nix b/pkgs/development/python-modules/gtts-token/default.nix index 62d709aa9217d..d3443ef0c97e1 100644 --- a/pkgs/development/python-modules/gtts-token/default.nix +++ b/pkgs/development/python-modules/gtts-token/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Calculates a token to run the Google Translate text to speech"; - homepage = https://github.com/boudewijn26/gTTS-token; + homepage = "https://github.com/boudewijn26/gTTS-token"; license = licenses.mit; maintainers = [ maintainers.makefu ]; }; diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index 509488ebfa41e..d0c1e74ee290d 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "guessit"; - version = "3.1.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "2dcd3f2acaf6c1a864f903f084ddd6a6b753f3107ae864355d7c8c1e9cb205b2"; + sha256 = "1c530pb0h34z0ziym256qps21b8mh533ia1lcnx9wqwx9rnqriki"; }; # Tests require more packages. @@ -24,8 +24,8 @@ buildPythonPackage rec { ]; meta = { - homepage = https://pypi.python.org/pypi/guessit; + homepage = "https://pypi.python.org/pypi/guessit"; license = lib.licenses.lgpl3; description = "A library for guessing information from video files"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix index 08b42b807999b..7b4498afb2c50 100644 --- a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix +++ b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Sphinx theme used by Guzzle: http://guzzlephp.org"; - homepage = https://github.com/guzzle/guzzle_sphinx_theme/; + homepage = "https://github.com/guzzle/guzzle_sphinx_theme/"; license = licenses.mit; maintainers = with maintainers; [ flokli ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/gyp/default.nix b/pkgs/development/python-modules/gyp/default.nix index db828eb222dd3..b9ad6ccec24ac 100644 --- a/pkgs/development/python-modules/gyp/default.nix +++ b/pkgs/development/python-modules/gyp/default.nix @@ -26,7 +26,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "A tool to generate native build files"; - homepage = https://chromium.googlesource.com/external/gyp/+/master/README.md; + homepage = "https://chromium.googlesource.com/external/gyp/+/master/README.md"; license = licenses.bsd3; maintainers = with maintainers; [ codyopel ]; }; diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix index 361ac0c59d131..28461311021fd 100644 --- a/pkgs/development/python-modules/h11/default.nix +++ b/pkgs/development/python-modules/h11/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { patches = [ # pytest5 compatability (fetchpatch { - url = https://github.com/python-hyper/h11/commit/241e220493a511a5f5a5d472cb88d72661a92ab1.patch; + url = "https://github.com/python-hyper/h11/commit/241e220493a511a5f5a5d472cb88d72661a92ab1.patch"; sha256 = "1s3ipf9s41m1lksws3xv3j133q7jnjdqvmgk4sfnm8q7li2dww39"; }) ]; diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index c267b6d472671..6d432fed0e4ee 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "h2"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1d1svhixk3hr78ph3nx8wi7sagx1xrvm712mmk028i2rhb92p8xq"; + sha256 = "051gg30aca26rdxsmr9svwqm06pdz9bv21ch4n0lgi7jsvml2pw7"; }; propagatedBuildInputs = [ enum34 hpack hyperframe ]; diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 23e659ea7ae6c..2ee4a858f6153 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { meta = { description = "Pythonic interface to the HDF5 binary data format"; - homepage = http://www.h5py.org/; + homepage = "http://www.h5py.org/"; license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index 717c8a954538f..d6438c6a5b8b8 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/pvizeli/ha-ffmpeg; + homepage = "https://github.com/pvizeli/ha-ffmpeg"; description = "Library for home-assistant to handle ffmpeg"; license = licenses.bsd3; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix index b58d4a3002011..a7ec358ffd7b5 100644 --- a/pkgs/development/python-modules/habanero/default.nix +++ b/pkgs/development/python-modules/habanero/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Python interface to Library Genesis"; - homepage = https://habanero.readthedocs.io/en/latest/; + homepage = "https://habanero.readthedocs.io/en/latest/"; license = lib.licenses.mit; maintainers = [ lib.maintainers.nico202 ]; }; diff --git a/pkgs/development/python-modules/hawkauthlib/default.nix b/pkgs/development/python-modules/hawkauthlib/default.nix index 46e49ba6b88b3..a819bca362dbe 100644 --- a/pkgs/development/python-modules/hawkauthlib/default.nix +++ b/pkgs/development/python-modules/hawkauthlib/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = "0.1.1"; src = fetchgit { - url = https://github.com/mozilla-services/hawkauthlib.git; + url = "https://github.com/mozilla-services/hawkauthlib.git"; rev = "refs/tags/v${version}"; sha256 = "0mr1mpx4j9q7sch9arwfvpysnpf2p7ijy7072wilxm8pnj0bwvsi"; }; @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests webob ]; meta = with stdenv.lib; { - homepage = https://github.com/mozilla-services/hawkauthlib; + homepage = "https://github.com/mozilla-services/hawkauthlib"; description = "Hawk Access Authentication protocol"; license = licenses.mpl20; }; diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix index d94806c6219cb..b00e3a88d3e9a 100644 --- a/pkgs/development/python-modules/hbmqtt/default.nix +++ b/pkgs/development/python-modules/hbmqtt/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/beerfactory/hbmqtt; + homepage = "https://github.com/beerfactory/hbmqtt"; description = "MQTT client/broker using Python asynchronous I/O"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/hcs_utils/default.nix b/pkgs/development/python-modules/hcs_utils/default.nix index 51d42e5c8b736..445c2fe1f8273 100644 --- a/pkgs/development/python-modules/hcs_utils/default.nix +++ b/pkgs/development/python-modules/hcs_utils/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library collecting some useful snippets"; - homepage = https://pypi.python.org/pypi/hcs_utils/1.3; + homepage = "https://pypi.python.org/pypi/hcs_utils/1.3"; license = licenses.isc; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index f95f6e9443f2a..6ee76e5271a7d 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.25"; + version = "0.8.26"; src = fetchPypi { inherit pname version; - sha256 = "17mi4nlifaygfw3n5ark5mfzx71pjxz3h6l455sh0i5mzh6czk4j"; + sha256 = "0zlj2y42f0hrklviv21j9m895259ad8273dxgh7b44702781r9l1"; }; checkInputs = [ nose ]; @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; - homepage = https://github.com/scikit-learn-contrib/hdbscan; + homepage = "https://github.com/scikit-learn-contrib/hdbscan"; license = licenses.bsd3; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/hdmedians/default.nix b/pkgs/development/python-modules/hdmedians/default.nix index 3a573f69c7000..691e17a5a413a 100644 --- a/pkgs/development/python-modules/hdmedians/default.nix +++ b/pkgs/development/python-modules/hdmedians/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/daleroberts/hdmedians; + homepage = "https://github.com/daleroberts/hdmedians"; description = "High-dimensional medians"; license = licenses.gpl3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/heapdict/default.nix b/pkgs/development/python-modules/heapdict/default.nix index 841c3a452595b..159e0a7d74e96 100644 --- a/pkgs/development/python-modules/heapdict/default.nix +++ b/pkgs/development/python-modules/heapdict/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "a heap with decrease-key and increase-key operations."; - homepage = http://stutzbachenterprises.com; + homepage = "http://stutzbachenterprises.com"; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/helper/default.nix b/pkgs/development/python-modules/helper/default.nix index 8aa6e1e921fbf..00e4ddce8b4bd 100644 --- a/pkgs/development/python-modules/helper/default.nix +++ b/pkgs/development/python-modules/helper/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Development library for quickly writing configurable applications and daemons"; - homepage = https://helper.readthedocs.org/; + homepage = "https://helper.readthedocs.org/"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix new file mode 100644 index 0000000000000..29a29a3b65228 --- /dev/null +++ b/pkgs/development/python-modules/heudiconv/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy27 +, pytest +, mock +, dcm2niix +, nibabel +, pydicom +, nipype +, dcmstack +, etelemetry +, filelock +}: + +buildPythonPackage rec { + version = "0.8.0"; + pname = "heudiconv"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + #sha256 = "0gzqqa4pzhywdbvks2qjniwhr89sgipl5k7h9hcjs7cagmy9gb05"; + sha256 = "1r6y93125mc84c09970ifps5xysp8ffp62rwlzili3q2k1m3fh4v"; + }; + + postPatch = '' + # doesn't exist as a separate package with Python 3: + substituteInPlace heudiconv/info.py --replace "'pathlib'," "" + ''; + + propagatedBuildInputs = [ + dcm2niix nibabel pydicom nipype dcmstack etelemetry filelock + ]; + + checkInputs = [ dcm2niix pytest mock ]; + + # test_monitor and test_dlad require 'inotify' and 'datalad' respectively, + # and these aren't in Nixpkgs + checkPhase = "pytest -k 'not test_dlad and not test_monitor' heudiconv/tests"; + + meta = with stdenv.lib; { + homepage = "https://heudiconv.readthedocs.io"; + description = "Flexible DICOM converter for organizing imaging data"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 5aabc20ebd963..6ec62f25a59ac 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "9.3.0"; + version = "9.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1jqlckibf7wwrg7syx6mzqz6zsipmsl474rfpmin6j6axh4cdpn7"; + sha256 = "0d3gd8k0p6n2flcf7kny1zjvrbbrwbbq4lq82ah6gvnbvllxm4hj"; }; doCheck = false; diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix index 452b946a04222..c82352f9bfef4 100644 --- a/pkgs/development/python-modules/hg-git/default.nix +++ b/pkgs/development/python-modules/hg-git/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Push and pull from a Git server using Mercurial"; - homepage = http://hg-git.github.com/; + homepage = "http://hg-git.github.com/"; maintainers = with maintainers; [ koral ]; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/development/python-modules/hgsvn/default.nix b/pkgs/development/python-modules/hgsvn/default.nix index 056415df4f6ef..ccf8635b8b111 100644 --- a/pkgs/development/python-modules/hgsvn/default.nix +++ b/pkgs/development/python-modules/hgsvn/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = false; # too many assumptions meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/hgsvn; + homepage = "https://pypi.python.org/pypi/hgsvn"; description = "A set of scripts to work locally on Subversion checkouts using Mercurial"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index 2d78a45da8c06..cd70a7ba2ff5b 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi"; - homepage = https://github.com/trezor/cython-hidapi; + homepage = "https://github.com/trezor/cython-hidapi"; # license can actually be either bsd3 or gpl3 # see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt license = licenses.bsd3; diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix index 9fa28126452a3..ab6203581cd97 100644 --- a/pkgs/development/python-modules/hieroglyph/default.nix +++ b/pkgs/development/python-modules/hieroglyph/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Generate HTML presentations from plain text sources"; - homepage = https://github.com/nyergler/hieroglyph/; + homepage = "https://github.com/nyergler/hieroglyph/"; license = licenses.bsd3; maintainers = with maintainers; [ juliendehos ]; }; diff --git a/pkgs/development/python-modules/hiro/default.nix b/pkgs/development/python-modules/hiro/default.nix index ea6cb6d34e364..f8ef8ba028d05 100644 --- a/pkgs/development/python-modules/hiro/default.nix +++ b/pkgs/development/python-modules/hiro/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Time manipulation utilities for Python"; - homepage = https://hiro.readthedocs.io/en/latest/; + homepage = "https://hiro.readthedocs.io/en/latest/"; license = licenses.mit; maintainers = with maintainers; [ nyarly ]; }; diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index e29c31e6fa7be..c92c707d9072e 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Hidden Markov Models in Python with scikit-learn like API"; - homepage = https://github.com/hmmlearn/hmmlearn; + homepage = "https://github.com/hmmlearn/hmmlearn"; license = licenses.bsd3; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/hocr-tools/default.nix b/pkgs/development/python-modules/hocr-tools/default.nix index 810d9ee6148e1..fdc578c76dffc 100644 --- a/pkgs/development/python-modules/hocr-tools/default.nix +++ b/pkgs/development/python-modules/hocr-tools/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = " Tools for manipulating and evaluating the hOCR format for representing multi-lingual OCR results by embedding them into HTML"; - homepage = https://github.com/tmbdev/hocr-tools; + homepage = "https://github.com/tmbdev/hocr-tools"; license = licenses.asl20; maintainers = [ maintainers.kiwi ]; }; diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index b12ef64c60244..7b54d8cd5f1bb 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.12.7"; + version = "1.13.2"; src = fetchPypi { inherit pname version; - sha256 = "c63f76d1ce2261eb0cd147a24be25daff399e7df2c3d6ade3e813d2e9cb7d42f"; + sha256 = "00i8732qib86xqa3652vkr178ib3682cls4jcv5g52y0rlkd8bfg"; }; propagatedBuildInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python data analysis and visualization seamless and simple"; - homepage = http://www.holoviews.org/; + homepage = "http://www.holoviews.org/"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/homeassistant-pyozw/default.nix b/pkgs/development/python-modules/homeassistant-pyozw/default.nix index 5674db53e5a57..e8aec6781fa3b 100644 --- a/pkgs/development/python-modules/homeassistant-pyozw/default.nix +++ b/pkgs/development/python-modules/homeassistant-pyozw/default.nix @@ -11,5 +11,5 @@ python_openzwave.overridePythonAttrs (oldAttrs: rec { }; patches = []; - meta.homepage = https://github.com/home-assistant/python-openzwave; + meta.homepage = "https://github.com/home-assistant/python-openzwave"; }) diff --git a/pkgs/development/python-modules/hoomd-blue/default.nix b/pkgs/development/python-modules/hoomd-blue/default.nix index 59528723d80d6..7d6ceb0cc5a61 100644 --- a/pkgs/development/python-modules/hoomd-blue/default.nix +++ b/pkgs/development/python-modules/hoomd-blue/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; meta = with stdenv.lib; { - homepage = http://glotzerlab.engin.umich.edu/hoomd-blue/; + homepage = "http://glotzerlab.engin.umich.edu/hoomd-blue/"; description = "HOOMD-blue is a general-purpose particle simulation toolkit"; license = licenses.bsdOriginal; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/python-modules/hopcroftkarp/default.nix b/pkgs/development/python-modules/hopcroftkarp/default.nix index e6033aa347e9a..995f10073c676 100644 --- a/pkgs/development/python-modules/hopcroftkarp/default.nix +++ b/pkgs/development/python-modules/hopcroftkarp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of HopcroftKarp's algorithm"; - homepage = https://github.com/sofiat-olaosebikan/hopcroftkarp; + homepage = "https://github.com/sofiat-olaosebikan/hopcroftkarp"; license = licenses.gpl1; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index 293ad51e302d5..c98192e9b0ab1 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -5,6 +5,8 @@ , requests-cache , pygments , pyquery +, cachelib +, appdirs }: buildPythonPackage rec { @@ -16,7 +18,7 @@ buildPythonPackage rec { sha256 = "3b322668606d29d8a841c3b28c0574851f512b55c33a7ceb982b6a98d82fa3e3"; }; - propagatedBuildInputs = [ six requests-cache pygments pyquery ]; + propagatedBuildInputs = [ six requests-cache pygments pyquery cachelib appdirs ]; preCheck = '' export HOME=$(mktemp -d) @@ -24,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Instant coding answers via the command line"; - homepage = https://pypi.python.org/pypi/howdoi; + homepage = "https://pypi.python.org/pypi/howdoi"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/hsaudiotag/default.nix b/pkgs/development/python-modules/hsaudiotag/default.nix index d08d9e06b719a..2da6e4a150c96 100644 --- a/pkgs/development/python-modules/hsaudiotag/default.nix +++ b/pkgs/development/python-modules/hsaudiotag/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pure Python library that lets one to read metadata from media files"; - homepage = http://hg.hardcoded.net/hsaudiotag/; + homepage = "http://hg.hardcoded.net/hsaudiotag/"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/hsaudiotag3k/default.nix b/pkgs/development/python-modules/hsaudiotag3k/default.nix index 06f89f733331d..28fa42b70f049 100644 --- a/pkgs/development/python-modules/hsaudiotag3k/default.nix +++ b/pkgs/development/python-modules/hsaudiotag3k/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pure Python library that lets one to read metadata from media files"; - homepage = http://hg.hardcoded.net/hsaudiotag/; + homepage = "http://hg.hardcoded.net/hsaudiotag/"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 6f2bf5d511d54..e75894611a1f8 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2020.3.31"; + version = "2020.5.5"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "12hncxzawvdsrssl350xxn1byfm1firgd3ziqfll4xhhw403jaa9"; + sha256 = "0n3wp2ihjaxlq002rv141766cx4wgk0amg1cb6v30zp0m4054w7d"; }; # tests require network connection diff --git a/pkgs/development/python-modules/html2text/2018.nix b/pkgs/development/python-modules/html2text/2018.nix index cac88c5579463..e0a60e1ef0ac1 100644 --- a/pkgs/development/python-modules/html2text/2018.nix +++ b/pkgs/development/python-modules/html2text/2018.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Turn HTML into equivalent Markdown-structured text"; - homepage = https://github.com/Alir3z4/html2text/; + homepage = "https://github.com/Alir3z4/html2text/"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/html2text/default.nix b/pkgs/development/python-modules/html2text/default.nix index a0462795d232d..dd23ad6c619dd 100644 --- a/pkgs/development/python-modules/html2text/default.nix +++ b/pkgs/development/python-modules/html2text/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Turn HTML into equivalent Markdown-structured text"; - homepage = https://github.com/Alir3z4/html2text/; + homepage = "https://github.com/Alir3z4/html2text/"; license = licenses.gpl3; }; } diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index db59bb49cf239..4962e89526d82 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fast C based HTML 5 parsing for python"; - homepage = https://html5-parser.readthedocs.io; + homepage = "https://html5-parser.readthedocs.io"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix index 82b4818070990..81042ac340983 100644 --- a/pkgs/development/python-modules/html5lib/default.nix +++ b/pkgs/development/python-modules/html5lib/default.nix @@ -31,8 +31,8 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/html5lib/html5lib-python; - downloadPage = https://github.com/html5lib/html5lib-python/releases; + homepage = "https://github.com/html5lib/html5lib-python"; + downloadPage = "https://github.com/html5lib/html5lib-python/releases"; description = "HTML parser based on WHAT-WG HTML5 specification"; longDescription = '' html5lib is a pure-python library for parsing HTML. It is designed to diff --git a/pkgs/development/python-modules/htmllaundry/default.nix b/pkgs/development/python-modules/htmllaundry/default.nix index 787163d477e3c..df3bdb216a4fa 100644 --- a/pkgs/development/python-modules/htmllaundry/default.nix +++ b/pkgs/development/python-modules/htmllaundry/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple HTML cleanup utilities"; license = licenses.bsd3; - homepage = https://pypi.org/project/htmllaundry/; + homepage = "https://pypi.org/project/htmllaundry/"; }; } diff --git a/pkgs/development/python-modules/htmlmin/default.nix b/pkgs/development/python-modules/htmlmin/default.nix index 538b75c3dd02c..ee8a83a098c90 100644 --- a/pkgs/development/python-modules/htmlmin/default.nix +++ b/pkgs/development/python-modules/htmlmin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = { description = "A configurable HTML Minifier with safety features"; - homepage = https://pypi.python.org/pypi/htmlmin; + homepage = "https://pypi.python.org/pypi/htmlmin"; license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.ahmedtd]; }; diff --git a/pkgs/development/python-modules/htmltreediff/default.nix b/pkgs/development/python-modules/htmltreediff/default.nix index c2c7f4e12f42a..cd742606f8b96 100644 --- a/pkgs/development/python-modules/htmltreediff/default.nix +++ b/pkgs/development/python-modules/htmltreediff/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = " Structure-aware diff for html and xml documents"; - homepage = https://github.com/christian-oudard/htmltreediff; + homepage = "https://github.com/christian-oudard/htmltreediff"; license = licenses.bsdOriginal; maintainers = with maintainers; [ ma27 ]; }; diff --git a/pkgs/development/python-modules/httmock/default.nix b/pkgs/development/python-modules/httmock/default.nix index 53447544ca920..5913ceca777ba 100644 --- a/pkgs/development/python-modules/httmock/default.nix +++ b/pkgs/development/python-modules/httmock/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A mocking library for requests"; - homepage = https://github.com/patrys/httmock; + homepage = "https://github.com/patrys/httmock"; license = licenses.asl20; maintainers = with maintainers; [ nyanloutre ]; }; diff --git a/pkgs/development/python-modules/http-ece/default.nix b/pkgs/development/python-modules/http-ece/default.nix index 1f50608d3d1b4..eafa429b439ef 100644 --- a/pkgs/development/python-modules/http-ece/default.nix +++ b/pkgs/development/python-modules/http-ece/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Encipher HTTP Messages"; - homepage = https://github.com/martinthomson/encrypted-content-encoding; + homepage = "https://github.com/martinthomson/encrypted-content-encoding"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/http_signature/default.nix b/pkgs/development/python-modules/http_signature/default.nix index 48f06db1ba5d7..d86861a92517b 100644 --- a/pkgs/development/python-modules/http_signature/default.nix +++ b/pkgs/development/python-modules/http_signature/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pycrypto ]; meta = with stdenv.lib; { - homepage = https://github.com/atl/py-http-signature; + homepage = "https://github.com/atl/py-http-signature"; description = "Simple secure signing for HTTP requests using http-signature"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/httpauth/default.nix b/pkgs/development/python-modules/httpauth/default.nix index f1afd41ebed52..bab2193f6a2d6 100644 --- a/pkgs/development/python-modules/httpauth/default.nix +++ b/pkgs/development/python-modules/httpauth/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "WSGI HTTP Digest Authentication middleware"; - homepage = https://github.com/jonashaag/httpauth; + homepage = "https://github.com/jonashaag/httpauth"; license = licenses.bsd2; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index 77dc27f1096e5..cf937b6bae3f6 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/kennethreitz/httpbin; + homepage = "https://github.com/kennethreitz/httpbin"; description = "HTTP Request & Response Service"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/httpserver/default.nix b/pkgs/development/python-modules/httpserver/default.nix index 3bd61ec8afae3..830e0c9b1bf2d 100644 --- a/pkgs/development/python-modules/httpserver/default.nix +++ b/pkgs/development/python-modules/httpserver/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Asyncio implementation of an HTTP server"; - homepage = https://github.com/thomwiggers/httpserver; + homepage = "https://github.com/thomwiggers/httpserver"; license = with lib.licenses; [ bsd3 ]; }; } diff --git a/pkgs/development/python-modules/httpsig/default.nix b/pkgs/development/python-modules/httpsig/default.nix index 24ba9be138225..30c918d86feb6 100644 --- a/pkgs/development/python-modules/httpsig/default.nix +++ b/pkgs/development/python-modules/httpsig/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Sign HTTP requests with secure signatures"; license = licenses.mit; maintainers = with maintainers; [ srhb ]; - homepage = https://github.com/ahknight/httpsig; + homepage = "https://github.com/ahknight/httpsig"; }; } diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix index fc83675fd6578..b5d7f8cdb1023 100644 --- a/pkgs/development/python-modules/httptools/default.nix +++ b/pkgs/development/python-modules/httptools/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "A collection of framework independent HTTP protocol utils"; - homepage = https://github.com/MagicStack/httptools; + homepage = "https://github.com/MagicStack/httptools"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 56f5e144794ff..0b29c80fc39e7 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "The next generation HTTP client"; - homepage = https://github.com/encode/httpx; + homepage = "https://github.com/encode/httpx"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix new file mode 100644 index 0000000000000..28a801de71a66 --- /dev/null +++ b/pkgs/development/python-modules/huey/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub, redis }: + +buildPythonPackage rec { + pname = "huey"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "coleifer"; + repo = pname; + rev = version; + sha256 = "1hgic7qrmb1kxvfgf2qqiw39nqyknf17pjvli8jfzvd9mv7cb7hh"; + }; + + propagatedBuildInputs = [ redis ]; + + # connects to redis + doCheck = false; + + meta = with lib; { + description = "A little task queue for python"; + homepage = "https://github.com/coleifer/huey"; + license = licenses.mit; + maintainers = [ maintainers.globin ]; + }; +} diff --git a/pkgs/development/python-modules/hug/default.nix b/pkgs/development/python-modules/hug/default.nix index bb38c7387607b..6769b5371b887 100644 --- a/pkgs/development/python-modules/hug/default.nix +++ b/pkgs/development/python-modules/hug/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python framework that makes developing APIs as simple as possible, but no simpler"; - homepage = https://github.com/timothycrosley/hug; + homepage = "https://github.com/timothycrosley/hug"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/humanfriendly/default.nix b/pkgs/development/python-modules/humanfriendly/default.nix index bef32f947c37c..8674231bc3086 100644 --- a/pkgs/development/python-modules/humanfriendly/default.nix +++ b/pkgs/development/python-modules/humanfriendly/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Human friendly output for text interfaces using Python"; - homepage = https://humanfriendly.readthedocs.io/; + homepage = "https://humanfriendly.readthedocs.io/"; license = licenses.mit; maintainers = with maintainers; [ montag451 ]; }; diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index f1fac28dd9398..d54c932ae32cd 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python humanize utilities"; - homepage = https://github.com/jmoiron/humanize; + homepage = "https://github.com/jmoiron/humanize"; license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 08867aa67086e..a783246ee5c3b 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.10.0"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "0s0705lk3i1srsjxqhqv9sc2m54fj8lbflxz9gyxf4igxaa6vj1f"; + sha256 = "1fcd2psvkfsqy45iygm59rzhb7qkbgv3c1dk3x3jvhy6a1ls4kkq"; }; propagatedBuildInputs = [ requests six ]; diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index 2079f849769dc..0bf09419c0cbd 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "A high-level plotting API for the PyData ecosystem built on HoloViews"; - homepage = https://hvplot.pyviz.org; + homepage = "https://hvplot.pyviz.org"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/hydra-check/default.nix b/pkgs/development/python-modules/hydra-check/default.nix new file mode 100644 index 0000000000000..7316a6fc971d9 --- /dev/null +++ b/pkgs/development/python-modules/hydra-check/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, docopt +, requests +, beautifulsoup4 +, black +, mypy +, flake8 +}: + +buildPythonPackage rec { + pname = "hydra-check"; + version = "1.1.1"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "hydra-check"; + rev = version; + sha256 = "1dmsscsib8ckp496gsfqxmq8d35zs71n99xmziq9iprvy7n5clq2"; + }; + + propagatedBuildInputs = [ + docopt + requests + beautifulsoup4 + ]; + + checkInputs = [ mypy ]; + + checkPhase = '' + echo -e "\x1b[32m## run mypy\x1b[0m" + mypy hydracheck + ''; + + meta = with lib;{ + description = "check hydra for the build status of a package"; + homepage = "https://github.com/nix-community/hydra-check"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; +} + diff --git a/pkgs/development/python-modules/hydra/default.nix b/pkgs/development/python-modules/hydra/default.nix index 9087be43f95d1..42f2812a6e1df 100644 --- a/pkgs/development/python-modules/hydra/default.nix +++ b/pkgs/development/python-modules/hydra/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "A framework for configuring complex applications"; - homepage = https://hydra.cc; + homepage = "https://hydra.cc"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 9e3b0cdc894c6..834f1039fd74e 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library for property based testing"; - homepage = https://github.com/HypothesisWorks/hypothesis; + homepage = "https://github.com/HypothesisWorks/hypothesis"; license = licenses.mpl20; }; } diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index 707a58ff85efc..f5a8fc1e46c38 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An improved Python library to control i3wm and sway"; - homepage = https://github.com/acrisci/i3ipc-python; + homepage = "https://github.com/acrisci/i3ipc-python"; license = licenses.bsd3; maintainers = with maintainers; [ vanzef ]; }; diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 56aaf6ec71a5d..2381f52614e1a 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -1,29 +1,26 @@ -{ lib -, buildPythonPackage -, fetchPypi +{ lib, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast +, graphviz , multipledispatch , numpy , pandas +, pyarrow +, pytest , pytz , regex -, toolz -, isPy27 -, pytest -, sqlalchemy , requests +, sqlalchemy , tables -, pyarrow -, graphviz +, toolz }: buildPythonPackage rec { pname = "ibis-framework"; - version = "1.2.0"; - disabled = isPy27; + version = "1.3.0"; + disabled = isPy27 || pythonAtLeast "3.8"; src = fetchPypi { inherit pname version; - sha256 = "3a0b79dae6924be0a79669c881a9a1d4817997ad2f81a0f3b1cd03d70aebb071"; + sha256 = "1my94a11jzg1hv6ln8wxklbqrg6z5l2l77vr89aq0829yyxacmv7"; }; propagatedBuildInputs = [ @@ -44,13 +41,16 @@ buildPythonPackage rec { pytest ]; + # ignore tests which require test dataset, or frameworks not available checkPhase = '' - pytest ibis + pytest ibis \ + --ignore=ibis/tests/all \ + --ignore=ibis/{sql,spark} ''; meta = with lib; { description = "Productivity-centric Python Big Data Framework"; - homepage = https://github.com/ibis-project/ibis; + homepage = "https://github.com/ibis-project/ibis"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/ibis/default.nix b/pkgs/development/python-modules/ibis/default.nix index 6b405366c7ebe..2d4a19107ce69 100644 --- a/pkgs/development/python-modules/ibis/default.nix +++ b/pkgs/development/python-modules/ibis/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "A lightweight template engine"; - homepage = https://github.com/dmulholland/ibis; + homepage = "https://github.com/dmulholland/ibis"; license = licenses.publicDomain; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 1418c925ebf8f..81c97a0ee48e8 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "4.0.5"; + version = "4.0.6"; pname = "icalendar"; src = fetchPypi { inherit pname version; - sha256 = "14ynjj65kfmlcvpb7k097w789wvxncd3cr3xz5m1jz9yl9v6vv5q"; + sha256 = "17wpvngxv9q333ng3hm4k1qhiafmzipr7l2liwny7ar24qiyfvvy"; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index c0858605bd727..e66509fbae5a7 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.4.13"; + version = "1.4.15"; src = fetchPypi { inherit pname version; - sha256 = "12adarxndb9f5kgbfch9644h86jhbf6vc1d5c5iiqnjqws9n495b"; + sha256 = "1w6vy3nk28xhnamnmh7ddawprmb1ri2yw5s9lphmpq2hpfbqvh93"; }; # Tests not included in PyPI tarball diff --git a/pkgs/development/python-modules/idna-ssl/default.nix b/pkgs/development/python-modules/idna-ssl/default.nix index a8a040d39e29d..ba11a39f5d9c3 100644 --- a/pkgs/development/python-modules/idna-ssl/default.nix +++ b/pkgs/development/python-modules/idna-ssl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Patch ssl.match_hostname for Unicode(idna) domains support"; - homepage = https://github.com/aio-libs/idna-ssl; + homepage = "https://github.com/aio-libs/idna-ssl"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/pkgs/development/python-modules/ifaddr/default.nix index e5087a1053601..e9f5fed49a34e 100644 --- a/pkgs/development/python-modules/ifaddr/default.nix +++ b/pkgs/development/python-modules/ifaddr/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pydron/ifaddr; + homepage = "https://github.com/pydron/ifaddr"; description = "Enumerates all IP addresses on all network adapters of the system"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index 1ded86af3fb2f..785ec5814918c 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytest +, matplotlib , mock , pytorch , pynvml @@ -11,27 +12,27 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "v${version}"; - sha256 = "15k6dd11yxn4923llcpmw4srl1by5ljhh7aw5pnkn4n4qpywh6cm"; + sha256 = "0i863kxi1r1hspj19lhn6r8256vdazjcyvis0s33fgzrf7kxi08x"; }; - checkInputs = [ pytest mock ]; + checkInputs = [ pytest matplotlib mock ]; + propagatedBuildInputs = [ pytorch scikitlearn tqdm pynvml ]; + # Some packages are not in NixPkgs; other tests try to build distributed + # models, which doesn't work in the sandbox. checkPhase = '' - pytest -k 'not visdom and not tensorboard and not mlflow and not polyaxon' tests/ + pytest -k 'not visdom and not tensorboard and not mlflow and not polyaxon and not conftest and not engines and not distrib_' tests/ ''; - # these packages are not currently in nixpkgs - - propagatedBuildInputs = [ pytorch scikitlearn tqdm pynvml ]; meta = with lib; { description = "High-level training library for PyTorch"; - homepage = https://pytorch.org/ignite; + homepage = "https://pytorch.org/ignite"; license = licenses.bsd3; maintainers = [ maintainers.bcdarwin ]; }; diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix index 49d1062abc319..6bb45f83790fa 100644 --- a/pkgs/development/python-modules/image-match/default.nix +++ b/pkgs/development/python-modules/image-match/default.nix @@ -26,7 +26,7 @@ buildPythonPackage { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/ascribe/image-match; + homepage = "https://github.com/ascribe/image-match"; description = "Quickly search over billions of images"; license = licenses.asl20; maintainers = with maintainers; [ cmcdragonkai ]; diff --git a/pkgs/development/python-modules/imagecorruptions/default.nix b/pkgs/development/python-modules/imagecorruptions/default.nix index 406417d6cc5c8..f77e2dcab0d60 100644 --- a/pkgs/development/python-modules/imagecorruptions/default.nix +++ b/pkgs/development/python-modules/imagecorruptions/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/bethgelab/imagecorruptions; + homepage = "https://github.com/bethgelab/imagecorruptions"; description = "This package provides a set of image corruptions"; license = licenses.asl20; maintainers = with maintainers; [ rakesh4g ]; diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index 5d07024656ec8..e3a6e3bfd8db8 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "FFMPEG wrapper for Python"; - homepage = https://github.com/imageio/imageio-ffmpeg; + homepage = "https://github.com/imageio/imageio-ffmpeg"; license = licenses.bsd2; maintainers = [ maintainers.pmiddend ]; }; diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 0e5134eeb26bb..5433e1ea9e410 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats"; - homepage = http://imageio.github.io/; + homepage = "http://imageio.github.io/"; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/imagesize/default.nix b/pkgs/development/python-modules/imagesize/default.nix index 6be9f76d380f1..aa7f1ea472491 100644 --- a/pkgs/development/python-modules/imagesize/default.nix +++ b/pkgs/development/python-modules/imagesize/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Getting image size from png/jpeg/jpeg2000/gif file"; - homepage = https://github.com/shibukawa/imagesize_py; + homepage = "https://github.com/shibukawa/imagesize_py"; license = with licenses; [ mit ]; }; diff --git a/pkgs/development/python-modules/imaplib2/default.nix b/pkgs/development/python-modules/imaplib2/default.nix index 0ceff353f9a69..1825e1a40d8d2 100644 --- a/pkgs/development/python-modules/imaplib2/default.nix +++ b/pkgs/development/python-modules/imaplib2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "A threaded Python IMAP4 client"; - homepage = https://github.com/bcoe/imaplib2; + homepage = "https://github.com/bcoe/imaplib2"; # See https://github.com/bcoe/imaplib2/issues/25 license = licenses.psfl; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/imbalanced-learn/0.4.nix b/pkgs/development/python-modules/imbalanced-learn/0.4.nix index e7d2c2f37148f..1ec139d5b3ad3 100644 --- a/pkgs/development/python-modules/imbalanced-learn/0.4.nix +++ b/pkgs/development/python-modules/imbalanced-learn/0.4.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance"; - homepage = https://github.com/scikit-learn-contrib/imbalanced-learn; + homepage = "https://github.com/scikit-learn-contrib/imbalanced-learn"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index 568fc825ab6bf..b2d15d5faa589 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance"; - homepage = https://github.com/scikit-learn-contrib/imbalanced-learn; + homepage = "https://github.com/scikit-learn-contrib/imbalanced-learn"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index 603e25fce7218..82f10c1bb74c6 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { checkInputs = [ opencv3 pytest ]; meta = with stdenv.lib; { - homepage = https://github.com/aleju/imgaug; + homepage = "https://github.com/aleju/imgaug"; description = "Image augmentation for machine learning experiments"; license = licenses.mit; maintainers = with maintainers; [ cmcdragonkai rakesh4g ]; diff --git a/pkgs/development/python-modules/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix index 8ca0fe6df9fb9..7de40cdfe5b70 100644 --- a/pkgs/development/python-modules/immutables/default.nix +++ b/pkgs/development/python-modules/immutables/default.nix @@ -2,17 +2,17 @@ buildPythonPackage rec { pname = "immutables"; - version = "0.11"; + version = "0.12"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "d6850578a0dc6530ac19113cfe4ddc13903df635212d498f176fe601a8a5a4a3"; + sha256 = "12i8r5z0y6ya850fwl2r4hig5hyli8skvjmgylapxa4zbr13fqmc"; }; meta = { description = "An immutable mapping type for Python"; - homepage = https://github.com/MagicStack/immutables; + homepage = "https://github.com/MagicStack/immutables"; license = with lib.licenses; [ asl20 ]; maintainers = with lib.maintainers; [ catern ]; }; diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index f22354e41b5c1..76545edcbebab 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Read metadata from Python packages"; - homepage = https://importlib-metadata.readthedocs.io/; + homepage = "https://importlib-metadata.readthedocs.io/"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index f5769bf0b2d9d..6fba0a703e166 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Read resources from Python packages"; - homepage = https://importlib-resources.readthedocs.io/; + homepage = "https://importlib-resources.readthedocs.io/"; license = licenses.asl20; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/importmagic/default.nix b/pkgs/development/python-modules/importmagic/default.nix index 0aa4a295f5dfb..5217474ac2325 100644 --- a/pkgs/development/python-modules/importmagic/default.nix +++ b/pkgs/development/python-modules/importmagic/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Import Magic - automagically add, remove and manage imports"; - homepage = https://github.com/alecthomas/importmagic; + homepage = "https://github.com/alecthomas/importmagic"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 0711283a1b837..1e4ccde4b3106 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python package to load images as numpy arrays"; - homepage = https://imread.readthedocs.io/en/latest/; + homepage = "https://imread.readthedocs.io/en/latest/"; maintainers = with maintainers; [ luispedro ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/imutils/default.nix b/pkgs/development/python-modules/imutils/default.nix index 45e795cd616c5..9a0797f095f64 100644 --- a/pkgs/development/python-modules/imutils/default.nix +++ b/pkgs/development/python-modules/imutils/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/jrosebr1/imutils; + homepage = "https://github.com/jrosebr1/imutils"; description = "A series of convenience functions to make basic image processing functions"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix index a97a98b207a5b..6241bc869c1c9 100644 --- a/pkgs/development/python-modules/incremental/default.nix +++ b/pkgs/development/python-modules/incremental/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = https://github.com/twisted/treq; + homepage = "https://github.com/twisted/treq"; description = "Incremental is a small library that versions your Python projects"; license = licenses.mit; maintainers = with maintainers; [ nand0p ]; diff --git a/pkgs/development/python-modules/inflection/default.nix b/pkgs/development/python-modules/inflection/default.nix index bccf49c56adfe..bc2a24abe5936 100644 --- a/pkgs/development/python-modules/inflection/default.nix +++ b/pkgs/development/python-modules/inflection/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { checkPhase = ''pytest >/dev/null || pytest''; meta = { - homepage = https://github.com/jpvanhal/inflection; + homepage = "https://github.com/jpvanhal/inflection"; description = "A port of Ruby on Rails inflector to Python"; maintainers = with lib.maintainers; [ NikolaMandic ilya-kolpakov ]; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index d624ebd60e56d..cb86e18eb6e70 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python client for InfluxDB"; - homepage = https://github.com/influxdb/influxdb-python; + homepage = "https://github.com/influxdb/influxdb-python"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/influxgraph/default.nix b/pkgs/development/python-modules/influxgraph/default.nix index eeb27b14080a0..c4597650fe718 100644 --- a/pkgs/development/python-modules/influxgraph/default.nix +++ b/pkgs/development/python-modules/influxgraph/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "InfluxDB storage plugin for Graphite-API"; - homepage = https://github.com/InfluxGraph/influxgraph; + homepage = "https://github.com/InfluxGraph/influxgraph"; license = licenses.asl20; maintainers = with maintainers; [ basvandijk ]; }; diff --git a/pkgs/development/python-modules/inotify-simple/default.nix b/pkgs/development/python-modules/inotify-simple/default.nix index 10c64fa6b3f46..898737ca7b49b 100644 --- a/pkgs/development/python-modules/inotify-simple/default.nix +++ b/pkgs/development/python-modules/inotify-simple/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "A simple Python wrapper around inotify"; - homepage = https://github.com/chrisjbillington/inotify_simple; + homepage = "https://github.com/chrisjbillington/inotify_simple"; license = licenses.bsd2; maintainers = with maintainers; [ earvstedt ]; }; diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 487ffc35b1a80..ca22dc4a9f973 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -11,6 +11,7 @@ , numpy , pandas , panel +, pyarrow , python-snappy , requests , ruamel_yaml @@ -22,16 +23,16 @@ buildPythonPackage rec { pname = "intake"; - version = "0.5.4"; + version = "0.5.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "81c3bdadbb81ec10c923b89e118c229d977a584ccbe27466f8fde41c0c274c3f"; + sha256 = "0ypgf0046hln27gjcy7gjh4diblgmivkf7kxbcy1mjvwka55bdmw"; }; - checkInputs = [ pytest ]; + checkInputs = [ pyarrow pytest ]; propagatedBuildInputs = [ appdirs dask @@ -63,7 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Data load and catalog system"; - homepage = https://github.com/ContinuumIO/intake; + homepage = "https://github.com/ContinuumIO/intake"; license = licenses.bsd2; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/intelhex/default.nix b/pkgs/development/python-modules/intelhex/default.nix index 20098485ad481..0634e91902422 100644 --- a/pkgs/development/python-modules/intelhex/default.nix +++ b/pkgs/development/python-modules/intelhex/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ]; meta = { - homepage = https://github.com/bialix/intelhex; + homepage = "https://github.com/bialix/intelhex"; description = "Python library for Intel HEX files manipulations"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ pjones ]; diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 6b393aea1e794..d862e3d2abbc1 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -1,22 +1,37 @@ -{ buildPythonPackage, fetchFromGitHub, pytest, six, clint, pyyaml, docopt -, requests, jsonpatch, args, schema, responses, backports_csv, isPy3k -, lib, glibcLocales, setuptools }: +{ buildPythonPackage +, fetchFromGitHub +, pytest +, six +, tqdm +, pyyaml +, docopt +, requests +, jsonpatch +, args +, schema +, responses +, backports_csv +, isPy3k +, lib +, glibcLocales +, setuptools +}: buildPythonPackage rec { pname = "internetarchive"; - version = "1.9.0"; + version = "1.9.3"; # Can't use pypi, data files for tests missing src = fetchFromGitHub { owner = "jjjake"; repo = "internetarchive"; rev = "v${version}"; - sha256 = "1h344c04ipzld4s7xk8d84f80samjjlgzvv3y8zsv0n1c895gymb"; + sha256 = "19av6cpps2qldfl3wb9mcirs1a48a4466m1v9k9yhdznqi4zb0ji"; }; propagatedBuildInputs = [ six - clint + tqdm pyyaml docopt requests @@ -24,8 +39,7 @@ buildPythonPackage rec { args schema setuptools - backports_csv - ]; + ] ++ lib.optionals (!isPy3k) [ backports_csv ]; checkInputs = [ pytest responses glibcLocales ]; @@ -37,8 +51,9 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "A python wrapper for the various Internet Archive APIs"; - homepage = https://github.com/jjjake/internetarchive; + description = "A Python and Command-Line Interface to Archive.org"; + homepage = "https://github.com/jjjake/internetarchive"; license = licenses.agpl3; + maintainers = [ maintainers.marsam ]; }; } diff --git a/pkgs/development/python-modules/interruptingcow/default.nix b/pkgs/development/python-modules/interruptingcow/default.nix index ee81c40febc8c..279fb1c9685b9 100644 --- a/pkgs/development/python-modules/interruptingcow/default.nix +++ b/pkgs/development/python-modules/interruptingcow/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A watchdog that interrupts long running code"; - homepage = https://bitbucket.org/evzijst/interruptingcow; + homepage = "https://bitbucket.org/evzijst/interruptingcow"; license = licenses.mit; maintainers = with maintainers; [ benley ]; }; diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix index b60eb0c732741..209920db2b6b3 100644 --- a/pkgs/development/python-modules/intervaltree/default.nix +++ b/pkgs/development/python-modules/intervaltree/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Editable interval tree data structure for Python 2 and 3"; - homepage = https://github.com/chaimleib/intervaltree; + homepage = "https://github.com/chaimleib/intervaltree"; license = [ licenses.asl20 ]; maintainers = [ maintainers.bennofs ]; }; diff --git a/pkgs/development/python-modules/intreehooks/default.nix b/pkgs/development/python-modules/intreehooks/default.nix index be8d3927c9ffe..e76a6997cb67e 100644 --- a/pkgs/development/python-modules/intreehooks/default.nix +++ b/pkgs/development/python-modules/intreehooks/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Load a PEP 517 backend from inside the source tree"; license = lib.licenses.mit; maintainers = [ lib.maintainers.fridh ]; - homepage = https://github.com/takluyver/intreehooks; + homepage = "https://github.com/takluyver/intreehooks"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/iocapture/default.nix b/pkgs/development/python-modules/iocapture/default.nix index 1e333d923a02d..0f0466c8b3eb5 100644 --- a/pkgs/development/python-modules/iocapture/default.nix +++ b/pkgs/development/python-modules/iocapture/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Capture stdout, stderr easily."; - homepage = https://github.com/oinume/iocapture; + homepage = "https://github.com/oinume/iocapture"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/iowait/default.nix b/pkgs/development/python-modules/iowait/default.nix index c67d56b153e04..dc8a1265f7a58 100644 --- a/pkgs/development/python-modules/iowait/default.nix +++ b/pkgs/development/python-modules/iowait/default.nix @@ -11,6 +11,6 @@ buildPythonPackage rec { meta = { description = "Platform-independent module for I/O completion events"; - homepage = https://launchpad.net/python-iowait; + homepage = "https://launchpad.net/python-iowait"; }; } diff --git a/pkgs/development/python-modules/ipaddress/default.nix b/pkgs/development/python-modules/ipaddress/default.nix index d5611959275e5..0074ad2420d87 100644 --- a/pkgs/development/python-modules/ipaddress/default.nix +++ b/pkgs/development/python-modules/ipaddress/default.nix @@ -20,7 +20,7 @@ if (pythonAtLeast "3.3") then null else buildPythonPackage rec { meta = with stdenv.lib; { description = "Port of the 3.3+ ipaddress module to 2.6, 2.7, and 3.2"; - homepage = https://github.com/phihag/ipaddress; + homepage = "https://github.com/phihag/ipaddress"; license = licenses.psfl; }; diff --git a/pkgs/development/python-modules/ipdbplugin/default.nix b/pkgs/development/python-modules/ipdbplugin/default.nix index b092a9fa2aece..7c9ee263b2b46 100644 --- a/pkgs/development/python-modules/ipdbplugin/default.nix +++ b/pkgs/development/python-modules/ipdbplugin/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ nose ipython ]; meta = with stdenv.lib; { - homepage = https://github.com/flavioamieiro/nose-ipdb/tree/master; + homepage = "https://github.com/flavioamieiro/nose-ipdb/tree/master"; description = "Nose plugin to use iPdb instead of Pdb when tests fail"; license = licenses.lgpl2; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/iptools/default.nix b/pkgs/development/python-modules/iptools/default.nix index 6b33edfca3c71..9498ee2762a3a 100644 --- a/pkgs/development/python-modules/iptools/default.nix +++ b/pkgs/development/python-modules/iptools/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Utilities for manipulating IP addresses including a class that can be used to include CIDR network blocks in Django's INTERNAL_IPS setting"; - homepage = https://pypi.python.org/pypi/iptools; + homepage = "https://pypi.python.org/pypi/iptools"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix new file mode 100644 index 0000000000000..5134ffb2d6d21 --- /dev/null +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, pytest +, pytestcov +, nbval +, ipywidgets +, numpy +, six +, traittypes +}: + +buildPythonPackage rec { + pname = "ipydatawidgets"; + version = "4.0.1"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1h7cppy959q6x5rvkdjhzxhqh57s37i2xsish5rfavcqbp2xgk4g"; + }; + + propagatedBuildInputs = [ + ipywidgets + numpy + six + traittypes + ]; + + checkInputs = [ pytest pytestcov nbval ]; + + checkPhase = "pytest ipydatawidgets/tests"; + + meta = { + description = "Widgets to help facilitate reuse of large datasets across different widgets"; + homepage = "https://github.com/vidartf/ipydatawidgets"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/ipykernel/4.nix b/pkgs/development/python-modules/ipykernel/4.nix index 9ef4a96366d5c..d408c1185dc70 100644 --- a/pkgs/development/python-modules/ipykernel/4.nix +++ b/pkgs/development/python-modules/ipykernel/4.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = { description = "IPython Kernel for Jupyter"; - homepage = http://ipython.org/; + homepage = "http://ipython.org/"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 9c0ab175004eb..edf9d0863a19e 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "5.1.4"; + version = "5.2.1"; src = fetchPypi { inherit pname version; - sha256 = "7f1f01df22f1229c8879501057877ccaf92a3b01c1d00db708aad5003e5f9238"; + sha256 = "1a3hr7wx3ywwskr99hgp120dw9ab1vmcaxdixlsbd9bg6ly3fdr9"; }; propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ]; @@ -42,6 +42,9 @@ buildPythonPackage rec { "test_subprocess_print" "test_subprocess_error" "test_ipython_start_kernel_no_userns" + + # https://github.com/ipython/ipykernel/issues/506 + "test_unc_paths" ] ++ lib.optionals (pythonOlder "3.8") [ # flaky test https://github.com/ipython/ipykernel/issues/485 "test_shutdown" @@ -60,7 +63,7 @@ buildPythonPackage rec { meta = { description = "IPython Kernel for Jupyter"; - homepage = http://ipython.org/; + homepage = "http://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 3fa1acb875ab8..578dfd306b1f7 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -33,8 +33,8 @@ buildPythonPackage rec { meta = { description = "Interactive Parallel Computing with IPython"; - homepage = http://ipython.org/; + homepage = "http://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index dd0c97fc3c567..598e890bb1c50 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { meta = { description = "IPython: Productive Interactive Computing"; - homepage = http://ipython.org/; + homepage = "http://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ bjornfor orivej lnl7 ]; }; diff --git a/pkgs/development/python-modules/ipython/7.9.nix b/pkgs/development/python-modules/ipython/7.9.nix index c097bdbe9e1d7..4c8086def330c 100644 --- a/pkgs/development/python-modules/ipython/7.9.nix +++ b/pkgs/development/python-modules/ipython/7.9.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "IPython: Productive Interactive Computing"; - homepage = http://ipython.org/; + homepage = "http://ipython.org/"; license = licenses.bsd3; maintainers = with maintainers; [ bjornfor fridh ]; }; diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 23dc52e833423..9d6624a7df4f7 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.12.0"; + version = "7.13.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d9459e7237e2e5858738ff9c3e26504b79899b58a6d49e574d352493d80684c6"; + sha256 = "ca478e52ae1f88da0102360e57e528b92f3ae4316aabac80a2cd7f7ab2efb48a"; }; prePatch = lib.optionalString stdenv.isDarwin '' @@ -63,7 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "IPython: Productive Interactive Computing"; - homepage = http://ipython.org/; + homepage = "http://ipython.org/"; license = licenses.bsd3; maintainers = with maintainers; [ bjornfor fridh ]; }; diff --git a/pkgs/development/python-modules/ipython_genutils/default.nix b/pkgs/development/python-modules/ipython_genutils/default.nix index 0f3504780c2b6..51cf6986349cc 100644 --- a/pkgs/development/python-modules/ipython_genutils/default.nix +++ b/pkgs/development/python-modules/ipython_genutils/default.nix @@ -22,8 +22,8 @@ buildPythonPackage rec { meta = { description = "Vestigial utilities from IPython"; - homepage = http://ipython.org/; + homepage = "http://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index 20f91f5e806fb..5f2b3299a0241 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -39,8 +39,8 @@ buildPythonPackage rec { meta = { description = "IPython HTML widgets for Jupyter"; - homepage = http://ipython.org/; + homepage = "http://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 6b238163cb558..11ae3157615a8 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.10.0"; + version = "3.10.1"; src = fetchPypi { inherit pname version; - sha256 = "1p7iaa6ykvhalpv09svxs50hnp25j5nv1zzp42n5r7a7rw70wlf8"; + sha256 = "1ky5ynb8p580y2x3vpib6yrvdjgjb0wpqmdfnq5pqi3qzjyzsqra"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index 6edf9a7718675..22426d331c29d 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper around isl, an integer set library"; - homepage = https://github.com/inducer/islpy; + homepage = "https://github.com/inducer/islpy"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/iso-639/default.nix b/pkgs/development/python-modules/iso-639/default.nix index 59d0d27b8b60e..7a510598dca31 100644 --- a/pkgs/development/python-modules/iso-639/default.nix +++ b/pkgs/development/python-modules/iso-639/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; meta = with lib; { - homepage = https://github.com/noumar/iso639; + homepage = "https://github.com/noumar/iso639"; description = "ISO 639 library for Python"; license = licenses.agpl3; maintainers = with maintainers; [ zraexy ]; diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix index 54d9aff280f6a..f6a4a00283c5c 100644 --- a/pkgs/development/python-modules/iso3166/default.nix +++ b/pkgs/development/python-modules/iso3166/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { ''; meta = with stdenv.lib; { - homepage = https://github.com/deactivated/python-iso3166; + homepage = "https://github.com/deactivated/python-iso3166"; description = "Self-contained ISO 3166-1 country definitions"; license = licenses.mit; maintainers = with maintainers; [ zraexy ]; diff --git a/pkgs/development/python-modules/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix index 4f9ff70556b44..28f8db12895a8 100644 --- a/pkgs/development/python-modules/iso8601/default.nix +++ b/pkgs/development/python-modules/iso8601/default.nix @@ -20,8 +20,8 @@ buildPythonPackage rec { ''; meta = { - homepage = https://bitbucket.org/micktwomey/pyiso8601/; + homepage = "https://bitbucket.org/micktwomey/pyiso8601/"; description = "Simple module to parse ISO 8601 dates"; maintainers = with lib.maintainers; [ phreedom ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/isodate/default.nix b/pkgs/development/python-modules/isodate/default.nix index 425a295e5a533..d46fb7ed74ca0 100644 --- a/pkgs/development/python-modules/isodate/default.nix +++ b/pkgs/development/python-modules/isodate/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "ISO 8601 date/time parser"; - homepage = http://cheeseshop.python.org/pypi/isodate; + homepage = "http://cheeseshop.python.org/pypi/isodate"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index 8e292ba7cd5c0..b2ef4e66f3611 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -36,7 +36,7 @@ in buildPythonPackage rec { meta = with lib; { description = "A Python utility / library to sort Python imports"; - homepage = https://github.com/timothycrosley/isort; + homepage = "https://github.com/timothycrosley/isort"; license = licenses.mit; maintainers = with maintainers; [ couchemar nand0p ]; }; diff --git a/pkgs/development/python-modules/itypes/default.nix b/pkgs/development/python-modules/itypes/default.nix index 1386ba39a2689..17ba3a2183a35 100644 --- a/pkgs/development/python-modules/itypes/default.nix +++ b/pkgs/development/python-modules/itypes/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "itypes"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { repo = pname; owner = "tomchristie"; rev = version; - sha256 = "0zkhn16wpslkxkq77dqw5rxa28nrchcb6nd3vgnxv91p4skyfm62"; + sha256 = "1ljhjp9pacbrv2phs58vppz1dlxix01p98kfhyclvbml6dgjcr52"; }; checkInputs = [ pytest ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple immutable types for python"; - homepage = https://github.com/tomchristie/itypes; + homepage = "https://github.com/tomchristie/itypes"; license = licenses.bsd3; maintainers = with maintainers; [ ivegotasthma ]; }; diff --git a/pkgs/development/python-modules/jabberbot/default.nix b/pkgs/development/python-modules/jabberbot/default.nix index 6c04e6945de1c..4e550bcca20c2 100644 --- a/pkgs/development/python-modules/jabberbot/default.nix +++ b/pkgs/development/python-modules/jabberbot/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A framework for writing Jabber/XMPP bots and services"; - homepage = http://thp.io/2007/python-jabberbot/; + homepage = "http://thp.io/2007/python-jabberbot/"; license = licenses.gpl3; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index 7fc90d63f695f..ac6eb936e6288 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Additional functools in the spirit of stdlib's functools"; - homepage = https://github.com/jaraco/jaraco.functools; + homepage = "https://github.com/jaraco/jaraco.functools"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 59d8538bb1e5a..446a3874c48e8 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tools for working with iterables"; - homepage = https://github.com/jaraco/jaraco.itertools; + homepage = "https://github.com/jaraco/jaraco.itertools"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/jaraco_logging/default.nix b/pkgs/development/python-modules/jaraco_logging/default.nix index ae05a76da1d54..1ac7b48c0fab4 100644 --- a/pkgs/development/python-modules/jaraco_logging/default.nix +++ b/pkgs/development/python-modules/jaraco_logging/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Support for Python logging facility"; - homepage = https://github.com/jaraco/jaraco.logging; + homepage = "https://github.com/jaraco/jaraco.logging"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/pkgs/development/python-modules/javaproperties/default.nix index a03aa9ec18bb0..a9acf380da102 100644 --- a/pkgs/development/python-modules/javaproperties/default.nix +++ b/pkgs/development/python-modules/javaproperties/default.nix @@ -5,14 +5,14 @@ }: buildPythonPackage rec { - version = "0.5.2"; + version = "0.7.0"; pname = "javaproperties"; src = fetchFromGitHub { owner = "jwodder"; repo = pname; rev = "v${version}"; - sha256 = "14hrp94cjj44yldf3k71wbq88cmlf01dfadi53gcirnsa56ddz5d"; + sha256 = "14dlzwr4gxlbgjy012i4pqs2rn2rmp21w8n1k1wwjkf26mcvrq5s"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index 9ade29bece1b3..1abb5b54d5077 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -1,23 +1,25 @@ { stdenv , buildPythonPackage -, fetchPypi, - ruamel_yaml -, ifconfig-parser +, fetchFromGitHub +, ruamel_yaml , xmltodict +, pygments , isPy27 }: buildPythonPackage rec { pname = "jc"; - version = "1.9.3"; + version = "1.10.12"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "1hg6h3ag4pbilpmqylnj7dflz7avk3w8ngmk6psfqrizizwx0hnj"; + src = fetchFromGitHub { + owner = "kellyjonbrazil"; + repo = "jc"; + rev = "v${version}"; + sha256 = "04gggx47acckyd96cginrw7ldw7fqgkiggk9fxdij2hwi03mk4n4"; }; - propagatedBuildInputs = [ ruamel_yaml ifconfig-parser xmltodict ]; + propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; meta = with stdenv.lib; { description = "This tool serializes the output of popular command line tools and filetypes to structured JSON output."; diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index 1fbdd510e714c..d51d54287e76e 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Jalali datetime binding for python"; - homepage = https://pypi.python.org/pypi/jdatetime; + homepage = "https://pypi.python.org/pypi/jdatetime"; license = licenses.psfl; }; } diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index eb3cdfaadd875..3a8da882d125a 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/davidhalter/jedi; + homepage = "https://github.com/davidhalter/jedi"; description = "An autocompletion tool for Python that can be used for text editors"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix index 04e47ff6b5814..f937b2b125271 100644 --- a/pkgs/development/python-modules/jeepney/default.nix +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://gitlab.com/takluyver/jeepney; + homepage = "https://gitlab.com/takluyver/jeepney"; description = "Pure Python DBus interface"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index fa8ce7b629861..45f427017fc8b 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ pytest unicodecsv ]; meta = { - homepage = https://github.com/sunlightlabs/jellyfish; + homepage = "https://github.com/sunlightlabs/jellyfish"; description = "Approximate and phonetic matching of strings"; maintainers = with lib.maintainers; [ koral ]; }; diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/pkgs/development/python-modules/jenkinsapi/default.nix index bf5877c9f08cf..7fe7f2baa4a4e 100644 --- a/pkgs/development/python-modules/jenkinsapi/default.nix +++ b/pkgs/development/python-modules/jenkinsapi/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python API for accessing resources on a Jenkins continuous-integration server"; - homepage = https://github.com/salimfadhley/jenkinsapi; + homepage = "https://github.com/salimfadhley/jenkinsapi"; maintainers = with maintainers; [ drets ]; license = licenses.mit; broken = true; diff --git a/pkgs/development/python-modules/jieba/default.nix b/pkgs/development/python-modules/jieba/default.nix index 2e64360c5c280..b515cd92b23bd 100644 --- a/pkgs/development/python-modules/jieba/default.nix +++ b/pkgs/development/python-modules/jieba/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Chinese Words Segementation Utilities"; - homepage = https://github.com/fxsjy/jieba; + homepage = "https://github.com/fxsjy/jieba"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 90dfc6fa7daf4..87c44d11a8c8d 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://jinja.pocoo.org/; + homepage = "http://jinja.pocoo.org/"; description = "Stand-alone template engine"; license = licenses.bsd3; longDescription = '' diff --git a/pkgs/development/python-modules/jinja2_pluralize/default.nix b/pkgs/development/python-modules/jinja2_pluralize/default.nix index 5f80f4e4b2025..4a62fa4c25b7a 100644 --- a/pkgs/development/python-modules/jinja2_pluralize/default.nix +++ b/pkgs/development/python-modules/jinja2_pluralize/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Jinja2 pluralize filters"; - homepage = https://github.com/audreyr/jinja2_pluralize; + homepage = "https://github.com/audreyr/jinja2_pluralize"; license = licenses.bsd3; maintainers = with maintainers; [ dzabraev ]; }; diff --git a/pkgs/development/python-modules/jinja2_time/default.nix b/pkgs/development/python-modules/jinja2_time/default.nix index 69fbffa92b2f2..d84c16f1abae1 100644 --- a/pkgs/development/python-modules/jinja2_time/default.nix +++ b/pkgs/development/python-modules/jinja2_time/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ arrow jinja2 ]; meta = with stdenv.lib; { - homepage = https://github.com/hackebrot/jinja2-time; + homepage = "https://github.com/hackebrot/jinja2-time"; description = "Jinja2 Extension for Dates and Times"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/jmespath/default.nix b/pkgs/development/python-modules/jmespath/default.nix index 848437b453d82..ebea3546d9ecc 100644 --- a/pkgs/development/python-modules/jmespath/default.nix +++ b/pkgs/development/python-modules/jmespath/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ply ]; meta = with stdenv.lib; { - homepage = https://github.com/boto/jmespath; + homepage = "https://github.com/boto/jmespath"; description = "JMESPath allows you to declaratively specify how to extract elements from a JSON document"; license = "BSD"; }; diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index 87b5a4d8bbaeb..d34fc8cb5704f 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "JOSE protocol implementation in Python"; - homepage = https://github.com/jezdez/josepy; + homepage = "https://github.com/jezdez/josepy"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/json-merge-patch/default.nix b/pkgs/development/python-modules/json-merge-patch/default.nix index b0bc2a835c412..1846bfc596da4 100644 --- a/pkgs/development/python-modules/json-merge-patch/default.nix +++ b/pkgs/development/python-modules/json-merge-patch/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { # https://github.com/OpenDataServices/json-merge-patch/pull/1 (fetchpatch { name = "fully-qualified-json-merge-patch-import-on-tests"; - url = https://patch-diff.githubusercontent.com/raw/OpenDataServices/json-merge-patch/pull/1.patch; + url = "https://patch-diff.githubusercontent.com/raw/OpenDataServices/json-merge-patch/pull/1.patch"; sha256 = "1k6xsrxsmz03nwcqsf4gf0zsfnl2r20n83npic8z6bqlpl4lidl4"; }) ]; meta = with lib; { description = "JSON Merge Patch library"; - homepage = https://github.com/open-contracting/json-merge-patch; + homepage = "https://github.com/open-contracting/json-merge-patch"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix index 6b254a7221af5..2a622d913a816 100644 --- a/pkgs/development/python-modules/jsondiff/default.nix +++ b/pkgs/development/python-modules/jsondiff/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "Diff JSON and JSON-like structures in Python"; - homepage = https://github.com/ZoomerAnalytics/jsondiff; + homepage = "https://github.com/ZoomerAnalytics/jsondiff"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix index eec4c6b384692..cde440380b48d 100644 --- a/pkgs/development/python-modules/jsonlines/default.nix +++ b/pkgs/development/python-modules/jsonlines/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to simplify working with jsonlines and ndjson data"; - homepage = https://github.com/wbolster/jsonlines; + homepage = "https://github.com/wbolster/jsonlines"; maintainers = with maintainers; [ sondr3 ]; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/pkgs/development/python-modules/jsonmerge/default.nix index 9379abcc604f5..4fc558fd394e3 100644 --- a/pkgs/development/python-modules/jsonmerge/default.nix +++ b/pkgs/development/python-modules/jsonmerge/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Merge a series of JSON documents"; - homepage = https://github.com/avian2/jsonmerge; + homepage = "https://github.com/avian2/jsonmerge"; changelog = "https://github.com/avian2/jsonmerge/blob/jsonmerge-${version}/ChangeLog"; license = licenses.mit; maintainers = with maintainers; [ emily ]; diff --git a/pkgs/development/python-modules/jsonpath_rw/default.nix b/pkgs/development/python-modules/jsonpath_rw/default.nix index a109404c06f51..4b842a02af83b 100644 --- a/pkgs/development/python-modules/jsonpath_rw/default.nix +++ b/pkgs/development/python-modules/jsonpath_rw/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/kennknowles/python-jsonpath-rw; + homepage = "https://github.com/kennknowles/python-jsonpath-rw"; description = "A robust and significantly extended implementation of JSONPath for Python, with a clear AST for metaprogramming"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index d21864d268218..528287028a22b 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { description = "Python library for serializing any arbitrary object graph into JSON"; - homepage = http://jsonpickle.github.io/; + homepage = "http://jsonpickle.github.io/"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index e18f3bc9b3dab..c410b9407ea6e 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A JSON-RPC client library for asyncio"; - homepage = https://github.com/armills/jsonrpc-async; + homepage = "https://github.com/armills/jsonrpc-async"; license = licenses.bsd3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix index a26a040eedd26..3505a13bbd1f4 100644 --- a/pkgs/development/python-modules/jsonrpc-base/default.nix +++ b/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A JSON-RPC client library base interface"; - homepage = https://github.com/armills/jsonrpc-base; + homepage = "https://github.com/armills/jsonrpc-base"; license = licenses.bsd3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix index 2d017ca110154..a53c7abee72ff 100644 --- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix +++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix @@ -5,18 +5,18 @@ buildPythonPackage rec { pname = "jsonrpclib-pelix"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1pimyq95w99ik5av96j0n9i6n12mr9kk0y28jnrq0555d7hmii8r"; + sha256 = "006yvxw6xv6qzcqpxm8jcf21gmdn0z4vp8njdbvk023mmq05k3h4"; }; doCheck = false; # test_suite="tests" in setup.py but no tests in pypi. meta = with lib; { description = "JSON RPC client library - Pelix compatible fork"; - homepage = https://pypi.python.org/pypi/jsonrpclib-pelix/; + homepage = "https://pypi.python.org/pypi/jsonrpclib-pelix/"; license = lib.licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/jsonrpclib/default.nix b/pkgs/development/python-modules/jsonrpclib/default.nix index 81dcdc074739d..d37b4ce3ccb20 100644 --- a/pkgs/development/python-modules/jsonrpclib/default.nix +++ b/pkgs/development/python-modules/jsonrpclib/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "JSON RPC client library"; - homepage = https://pypi.python.org/pypi/jsonrpclib/; + homepage = "https://pypi.python.org/pypi/jsonrpclib/"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.joachifm ]; }; diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index 9ff267b6fce30..d90040c4269f5 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/Julian/jsonschema; + homepage = "https://github.com/Julian/jsonschema"; description = "An implementation of JSON Schema validation for Python"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/junit-xml/default.nix b/pkgs/development/python-modules/junit-xml/default.nix index dcd26fabee7be..7c5ffc9fad5af 100644 --- a/pkgs/development/python-modules/junit-xml/default.nix +++ b/pkgs/development/python-modules/junit-xml/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Creates JUnit XML test result documents that can be read by tools such as Jenkins"; - homepage = https://github.com/kyrus/python-junit-xml; + homepage = "https://github.com/kyrus/python-junit-xml"; maintainers = with maintainers; [ multun ]; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/junitparser/default.nix b/pkgs/development/python-modules/junitparser/default.nix index 11bd1d60ab00f..3a712251fc5d2 100644 --- a/pkgs/development/python-modules/junitparser/default.nix +++ b/pkgs/development/python-modules/junitparser/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "A JUnit/xUnit Result XML Parser"; license = licenses.asl20; - homepage = https://github.com/gastlygem/junitparser; + homepage = "https://github.com/gastlygem/junitparser"; maintainers = with maintainers; [ multun ]; }; } diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index 77b56e01b0c75..9c98895a8b2e6 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://www.github.com/Juniper/py-junos-eznc; + homepage = "http://www.github.com/Juniper/py-junos-eznc"; description = "Junos 'EZ' automation for non-programmers"; license = licenses.asl20; maintainers = with maintainers; [ xnaveira ]; diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 44c0a3514f574..2a5e1a988da31 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = https://repo2docker.readthedocs.io/en/latest/; + homepage = "https://repo2docker.readthedocs.io/en/latest/"; description = "Repo2docker: Turn code repositories into Jupyter enabled Docker Images"; license = licenses.bsdOriginal; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/jupyter_client/5.nix b/pkgs/development/python-modules/jupyter_client/5.nix new file mode 100644 index 0000000000000..4855663ebc7d3 --- /dev/null +++ b/pkgs/development/python-modules/jupyter_client/5.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, traitlets +, jupyter_core +, pyzmq +, dateutil +, isPyPy +, py +, tornado +}: + +buildPythonPackage rec { + pname = "jupyter_client"; + version = "5.3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "60e6faec1031d63df57f1cc671ed673dced0ed420f4377ea33db37b1c188b910"; + }; + + propagatedBuildInputs = [ + traitlets + jupyter_core + pyzmq + dateutil + tornado + ] ++ lib.optional isPyPy py; + + # Circular dependency with ipykernel + doCheck = false; + + meta = { + description = "Jupyter protocol implementation and client libraries"; + homepage = "https://jupyter.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index e5dec4c98e2a8..008a74dfb3edc 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "5.3.4"; + version = "6.1.3"; src = fetchPypi { inherit pname version; - sha256 = "60e6faec1031d63df57f1cc671ed673dced0ed420f4377ea33db37b1c188b910"; + sha256 = "3a32fa4d0b16d1c626b30c3002a62dfd86d6863ed39eaba3f537fade197bb756"; }; propagatedBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "Jupyter protocol implementation and client libraries"; - homepage = https://jupyter.org/; + homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index 535afa31ee19f..fe40a3f09c482 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "jupyter_core"; - version = "4.6.1"; + version = "4.6.3"; src = fetchPypi { inherit pname version; - sha256 = "a183e0ec2e8f6adddf62b0a3fc6a2237e3e0056d381e536d3e7c7ecc3067e244"; + sha256 = "394fd5dd787e7c8861741880bdf8a00ce39f95de5d18e579c74b882522219e7e"; }; checkInputs = [ pytest mock glibcLocales nose ]; @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Jupyter core package. A base package on which Jupyter projects rely"; - homepage = https://jupyter.org/; + homepage = "https://jupyter.org/"; license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix index 8a228bebb0b07..d6c505c4a173a 100644 --- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix +++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple LDAP Authenticator Plugin for JupyterHub"; - homepage = https://github.com/jupyterhub/ldapauthenticator; + homepage = "https://github.com/jupyterhub/ldapauthenticator"; license = licenses.bsd3; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 952e5b781a1c0..fa63af115f290 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -118,7 +118,7 @@ buildPythonPackage rec { meta = with lib; { description = "Serves multiple Jupyter notebook instances"; - homepage = https://jupyter.org/; + homepage = "https://jupyter.org/"; license = licenses.bsd3; maintainers = with maintainers; [ ixxie cstrahan ]; }; diff --git a/pkgs/development/python-modules/jwcrypto/default.nix b/pkgs/development/python-modules/jwcrypto/default.nix index 9b219127069e4..997e3aedf5311 100644 --- a/pkgs/development/python-modules/jwcrypto/default.nix +++ b/pkgs/development/python-modules/jwcrypto/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jwcrypto"; - version = "0.6.0"; + version = "0.7"; src = fetchPypi { inherit pname version; - sha256 = "a87ac0922d09d9a65011f76d99849f1fbad3d95439c7452cebf4ab0871c2b665"; + sha256 = "002i60yidafpr642qcxrd74d8frbc4ci8vfysm05vqydcri1zgmd"; }; propagatedBuildInputs = [ @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of JOSE Web standards"; - homepage = https://github.com/latchset/jwcrypto; + homepage = "https://github.com/latchset/jwcrypto"; license = licenses.lgpl3Plus; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index d3937300a5e9e..80b62f1e44831 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for setting up self-contained Kerberos 5 environment"; - homepage = https://github.com/pythongssapi/k5test; + homepage = "https://github.com/pythongssapi/k5test"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/kaa-base/default.nix b/pkgs/development/python-modules/kaa-base/default.nix index f0994cebe1115..a0b8cd97ced6c 100644 --- a/pkgs/development/python-modules/kaa-base/default.nix +++ b/pkgs/development/python-modules/kaa-base/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Generic application framework, providing the foundation for other modules"; - homepage = https://github.com/freevo/kaa-base; + homepage = "https://github.com/freevo/kaa-base"; license = licenses.lgpl21; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/kaa-metadata/default.nix b/pkgs/development/python-modules/kaa-metadata/default.nix index d78adf7fd39d1..31f87965a0382 100644 --- a/pkgs/development/python-modules/kaa-metadata/default.nix +++ b/pkgs/development/python-modules/kaa-metadata/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for parsing media metadata, which can extract metadata (e.g., such as id3 tags) from a wide range of media files"; - homepage = https://github.com/freevo/kaa-metadata; + homepage = "https://github.com/freevo/kaa-metadata"; license = licenses.gpl2; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index 52c6e64aa10a2..1c85fbd29af44 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: buildPythonPackage rec { - version = "1.4.7"; + version = "2.0.1"; pname = "kafka-python"; src = fetchPypi { inherit pname version; - sha256 = "2f29baad4b3efe05a2bb81ac268855aa01cbc68397f15bac77b494ffd7e2cada"; + sha256 = "1y7ny81rihnhc8lj921d76ir4kf4aj5iy35szgim8zccxhnx96p5"; }; checkInputs = [ pytest six mock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pure Python client for Apache Kafka"; - homepage = https://github.com/dpkp/kafka-python; + homepage = "https://github.com/dpkp/kafka-python"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/kaptan/default.nix b/pkgs/development/python-modules/kaptan/default.nix index 5a6cf80a8352f..78a33a8e3022c 100644 --- a/pkgs/development/python-modules/kaptan/default.nix +++ b/pkgs/development/python-modules/kaptan/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Configuration manager for python applications"; - homepage = https://kaptan.readthedocs.io/; + homepage = "https://kaptan.readthedocs.io/"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/kconfiglib/default.nix b/pkgs/development/python-modules/kconfiglib/default.nix index 8685fb8a3fa93..ba8fecc470b74 100644 --- a/pkgs/development/python-modules/kconfiglib/default.nix +++ b/pkgs/development/python-modules/kconfiglib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "A flexible Python 2/3 Kconfig implementation and library"; - homepage = https://github.com/ulfalizer/Kconfiglib; + homepage = "https://github.com/ulfalizer/Kconfiglib"; license = licenses.isc; maintainers = with maintainers; [ teto ]; }; diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index bbe72befb6d22..f43c7618b13c3 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "KeepKey Python client"; - homepage = https://github.com/keepkey/python-keepkey; + homepage = "https://github.com/keepkey/python-keepkey"; license = licenses.gpl3; maintainers = with maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/keepkey_agent/default.nix b/pkgs/development/python-modules/keepkey_agent/default.nix index c2361043e4197..fec2d198fdd94 100644 --- a/pkgs/development/python-modules/keepkey_agent/default.nix +++ b/pkgs/development/python-modules/keepkey_agent/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Using KeepKey as hardware-based SSH/PGP agent"; - homepage = https://github.com/romanz/trezor-agent; + homepage = "https://github.com/romanz/trezor-agent"; license = licenses.gpl3; maintainers = with maintainers; [ hkjn np mmahut ]; }; diff --git a/pkgs/development/python-modules/keras-applications/default.nix b/pkgs/development/python-modules/keras-applications/default.nix index 54509f04e71cb..82ee6803d4bf3 100644 --- a/pkgs/development/python-modules/keras-applications/default.nix +++ b/pkgs/development/python-modules/keras-applications/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Reference implementations of popular deep learning models"; - homepage = https://github.com/keras-team/keras-applications; + homepage = "https://github.com/keras-team/keras-applications"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/keras-preprocessing/default.nix b/pkgs/development/python-modules/keras-preprocessing/default.nix index 01a0cf0dfb747..cb4b6d249b607 100644 --- a/pkgs/development/python-modules/keras-preprocessing/default.nix +++ b/pkgs/development/python-modules/keras-preprocessing/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Easy data preprocessing and data augmentation for deep learning models"; - homepage = https://github.com/keras-team/keras-preprocessing; + homepage = "https://github.com/keras-team/keras-preprocessing"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 0c1f6f35d5497..e255789aaf7d6 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Deep Learning library for Theano and TensorFlow"; - homepage = https://keras.io; + homepage = "https://keras.io"; license = licenses.mit; maintainers = with maintainers; [ NikolaMandic ]; }; diff --git a/pkgs/development/python-modules/kerberos/default.nix b/pkgs/development/python-modules/kerberos/default.nix index 3d581d763a54c..7f5341a6a2537 100644 --- a/pkgs/development/python-modules/kerberos/default.nix +++ b/pkgs/development/python-modules/kerberos/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Kerberos high-level interface"; - homepage = https://pypi.python.org/pypi/kerberos; + homepage = "https://pypi.python.org/pypi/kerberos"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index aa873b63ab918..dcc16ded122d4 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { license = licenses.mit; description = "Alternate keyring implementations"; - homepage = https://github.com/jaraco/keyrings.alt; + homepage = "https://github.com/jaraco/keyrings.alt"; maintainers = with maintainers; [ nyarly ]; }; } diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix index a109659ebddeb..4134c47084a27 100644 --- a/pkgs/development/python-modules/keyutils/default.nix +++ b/pkgs/development/python-modules/keyutils/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "A set of python bindings for keyutils"; - homepage = https://github.com/sassoftware/python-keyutils; + homepage = "https://github.com/sassoftware/python-keyutils"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ primeos ]; }; diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index e41c4bbeee055..c54cad1987aa8 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "A fast implementation of the Cassowary constraint solver"; - homepage = https://github.com/nucleic/kiwi; + homepage = "https://github.com/nucleic/kiwi"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix index a2d171fbb9a5d..dd57c83573867 100644 --- a/pkgs/development/python-modules/klaus/default.nix +++ b/pkgs/development/python-modules/klaus/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "The first Git web viewer that Just Works"; - homepage = https://github.com/jonashaag/klaus; + homepage = "https://github.com/jonashaag/klaus"; license = licenses.isc; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/development/python-modules/klein/default.nix b/pkgs/development/python-modules/klein/default.nix index 9b96ae038ca59..f4c26edd0e4a0 100644 --- a/pkgs/development/python-modules/klein/default.nix +++ b/pkgs/development/python-modules/klein/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { patches = [ (fetchpatch { name = "tests-expect-werkzeug-308.patch"; - url = https://github.com/twisted/klein/commit/e2a5835b83e37a2bc5faefbfe1890c529b18b9c6.patch; + url = "https://github.com/twisted/klein/commit/e2a5835b83e37a2bc5faefbfe1890c529b18b9c6.patch"; sha256 = "03j0bj3l3hnf7f96rb27i4bzy1iih79ll5bcah7gybdi1wpznh8w"; }) ]; diff --git a/pkgs/development/python-modules/kmapper/default.nix b/pkgs/development/python-modules/kmapper/default.nix index 67b9343ecca56..f985a7e696523 100644 --- a/pkgs/development/python-modules/kmapper/default.nix +++ b/pkgs/development/python-modules/kmapper/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of Mapper algorithm for Topological Data Analysis"; - homepage = https://kepler-mapper.scikit-tda.org/; + homepage = "https://kepler-mapper.scikit-tda.org/"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index c3025311e1052..fc65361b35c73 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/microsoft/knack; + homepage = "https://github.com/microsoft/knack"; description = "A Command-Line Interface framework"; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix index aec1916c1ffe8..eac2ab5964337 100644 --- a/pkgs/development/python-modules/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "An RPM-based build system"; - homepage = https://pagure.io/koji; + homepage = "https://pagure.io/koji"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index e0ac9e0fc18df..437f03276708a 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -5,6 +5,8 @@ , pytest , pytz , sqlalchemy +, importlib-metadata +, pythonOlder }: buildPythonPackage rec { @@ -23,7 +25,11 @@ buildPythonPackage rec { --replace "amqp==2.5.1" "amqp~=2.5" ''; - propagatedBuildInputs = [ amqp ]; + propagatedBuildInputs = [ + amqp + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; checkInputs = [ pytest case pytz Pyro4 sqlalchemy ]; # test_redis requires fakeredis, which isn't trivial to package @@ -33,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Messaging library for Python"; - homepage = https://github.com/celery/kombu; + homepage = "https://github.com/celery/kombu"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 6827480b9df46..62b7451697184 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Kubernetes python client"; - homepage = https://github.com/kubernetes-client/python; + homepage = "https://github.com/kubernetes-client/python"; license = licenses.asl20; maintainers = with maintainers; [ lsix ]; }; diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index c8279835c92fa..783faa7b5f615 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/Labelbox/Labelbox; + homepage = "https://github.com/Labelbox/Labelbox"; description = "Platform API for LabelBox"; license = licenses.asl20; maintainers = with maintainers; [ rakesh4g ]; diff --git a/pkgs/development/python-modules/lammps-cython/default.nix b/pkgs/development/python-modules/lammps-cython/default.nix index df2a122d06817..4c16010f4af8b 100644 --- a/pkgs/development/python-modules/lammps-cython/default.nix +++ b/pkgs/development/python-modules/lammps-cython/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = { description = "Pythonic Wrapper to LAMMPS using cython"; - homepage = https://gitlab.com/costrouc/lammps-cython; + homepage = "https://gitlab.com/costrouc/lammps-cython"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index d73940e56a6d4..f5686c1afb403 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -8,17 +8,16 @@ buildPythonPackage rec { pname = "langcodes"; - version = "1.4.1"; + version = "2.0.0"; + disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; - sha256 = "1axdiva2qglsjmnx2ak7i6hm0yhp6kbc4lcsgn8ckwy0nq1z3kr2"; + sha256 = "0xszgmydymzhb0dhx5qvdn3x5z477ld0paw17lwwhlrxffkq5jxz"; }; propagatedBuildInputs = [ marisa-trie ]; - disabled = pythonOlder "3.3"; - checkInputs = [ nose ]; checkPhase = '' @@ -27,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "A toolkit for working with and comparing the standardized codes for languages, such as ‘en’ for English or ‘es’ for Spanish"; - homepage = https://github.com/LuminosoInsight/langcodes; + homepage = "https://github.com/LuminosoInsight/langcodes"; license = licenses.mit; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/langdetect/default.nix b/pkgs/development/python-modules/langdetect/default.nix index dcd90dd89bdde..57fee2664cdfb 100644 --- a/pkgs/development/python-modules/langdetect/default.nix +++ b/pkgs/development/python-modules/langdetect/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python port of Google's language-detection library"; - homepage = https://github.com/Mimino666/langdetect; + homepage = "https://github.com/Mimino666/langdetect"; license = licenses.asl20; maintainers = with maintainers; [ earvstedt ]; }; diff --git a/pkgs/development/python-modules/larch/default.nix b/pkgs/development/python-modules/larch/default.nix index 9942168607e6d..a94b076ded3d5 100644 --- a/pkgs/development/python-modules/larch/default.nix +++ b/pkgs/development/python-modules/larch/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://liw.fi/larch/; + homepage = "http://liw.fi/larch/"; description = "Python B-tree library"; license = licenses.gpl3; maintainers = []; diff --git a/pkgs/development/python-modules/latexcodec/default.nix b/pkgs/development/python-modules/latexcodec/default.nix index 2873c8f962204..3514d5da9a23a 100644 --- a/pkgs/development/python-modules/latexcodec/default.nix +++ b/pkgs/development/python-modules/latexcodec/default.nix @@ -1,16 +1,22 @@ -{ stdenv, buildPythonPackage, fetchPypi, six }: +{ stdenv, buildPythonPackage, fetchPypi, six, pytest }: buildPythonPackage rec { pname = "latexcodec"; - version = "1.0.7"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0wnp3yqcgx0rpy8dz51vh75lbp2qif67da19zi7m3ca98n887hgb"; + sha256 = "0pyzhidpnc3q3rh9d5hxhzv99rl5limyyrll7xcyssci92fn8gyd"; }; propagatedBuildInputs = [ six ]; + checkInputs = [ pytest ]; + + checkPhase = '' + pytest + ''; + meta = { homepage = "https://github.com/mcmtroffaes/latexcodec"; description = "Lexer and codec to work with LaTeX code in Python"; diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index f174aa1066ca5..043e3e1123e01 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A fast and thorough lazy object proxy"; - homepage = https://github.com/ionelmc/python-lazy-object-proxy; + homepage = "https://github.com/ionelmc/python-lazy-object-proxy"; license = with licenses; [ bsd2 ]; }; diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix index 8f5cd7e7e881a..70b4ba2bf1fc1 100644 --- a/pkgs/development/python-modules/ldap/default.nix +++ b/pkgs/development/python-modules/ldap/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python modules for implementing LDAP clients"; - homepage = https://www.python-ldap.org/; + homepage = "https://www.python-ldap.org/"; license = licenses.psfl; }; } diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index 58acc263eff58..eb2d09d8d264a 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ldap3"; - version = "2.6.1"; + version = "2.7"; src = fetchPypi { inherit pname version; - sha256 = "0ag5xqlki6pjk3f50b8ar8vynx2fmkna7rfampv3kdgwg8z6gjr7"; + sha256 = "1h1q8g1c2nkhx8p5n91bzkvjx5js5didi9xqbnmfrxqbnyc45w0p"; }; propagatedBuildInputs = [ pyasn1 ]; @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; # requires network meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/ldap3; + homepage = "https://pypi.python.org/pypi/ldap3"; description = "A strictly RFC 4510 conforming LDAP V3 pure Python client library"; license = licenses.lgpl3; }; diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index e22ab22d5a76c..d1b9da15cc5f2 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "A simple connector pool for python-ldap"; - homepage = https://git.openstack.org/cgit/openstack/ldappool; + homepage = "https://git.openstack.org/cgit/openstack/ldappool"; license = licenses.mpl20; }; } diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix index 614fe60ada9d5..817fe79c3c97c 100644 --- a/pkgs/development/python-modules/ldaptor/default.nix +++ b/pkgs/development/python-modules/ldaptor/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { description = "A Pure-Python Twisted library for LDAP"; - homepage = https://github.com/twisted/ldaptor; + homepage = "https://github.com/twisted/ldaptor"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/le/default.nix b/pkgs/development/python-modules/le/default.nix index cb0a8bc634810..927b3f44bcf34 100644 --- a/pkgs/development/python-modules/le/default.nix +++ b/pkgs/development/python-modules/le/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ simplejson psutil ]; meta = with stdenv.lib; { - homepage = https://github.com/rapid7/le; + homepage = "https://github.com/rapid7/le"; description = "Logentries agent"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix index 98cc3a42074cc..30a76747723aa 100644 --- a/pkgs/development/python-modules/leather/default.nix +++ b/pkgs/development/python-modules/leather/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; meta = with stdenv.lib; { - homepage = http://leather.rtfd.io; + homepage = "http://leather.rtfd.io"; description = "Python charting library"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/python-modules/ledger_agent/default.nix b/pkgs/development/python-modules/ledger_agent/default.nix index 4aaecf6bc76c6..605fbed98a19f 100644 --- a/pkgs/development/python-modules/ledger_agent/default.nix +++ b/pkgs/development/python-modules/ledger_agent/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Using Ledger as hardware-based SSH/PGP agent"; - homepage = https://github.com/romanz/trezor-agent; + homepage = "https://github.com/romanz/trezor-agent"; license = licenses.gpl3; maintainers = with maintainers; [ hkjn np mmahut ]; }; diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 8d50f9846cc76..87fece0f026b1 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library to communicate with Ledger Blue/Nano S"; - homepage = https://github.com/LedgerHQ/blue-loader-python; + homepage = "https://github.com/LedgerHQ/blue-loader-python"; license = licenses.asl20; maintainers = with maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix index 0fe3a11ae2612..844e28aa07884 100644 --- a/pkgs/development/python-modules/lektor/default.nix +++ b/pkgs/development/python-modules/lektor/default.nix @@ -19,6 +19,7 @@ , pytest-click , isPy27 , functools32 +, setuptools }: buildPythonPackage rec { @@ -34,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click watchdog exifread requests mistune inifile Babel jinja2 - flask pyopenssl ndg-httpsclient + flask pyopenssl ndg-httpsclient setuptools ] ++ lib.optionals isPy27 [ functools32 ]; checkInputs = [ diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index e55887a49f569..7fb3d873e742e 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Using hardware wallets as SSH/GPG agent"; - homepage = https://github.com/romanz/trezor-agent; + homepage = "https://github.com/romanz/trezor-agent"; license = licenses.gpl3; maintainers = with maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 2fbe7207f4f7c..3d7408e87126f 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; meta = with stdenv.lib; { - homepage = https://github.com/schwehr/libais; + homepage = "https://github.com/schwehr/libais"; description = "Library for decoding maritime Automatic Identification System messages"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index 8488343362de3..6bcb7f80484c4 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/Changaco/python-libarchive-c; + homepage = "https://github.com/Changaco/python-libarchive-c"; description = "Python interface to libarchive"; license = licenses.cc0; }; diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index fdb6ebb3fe32e..cd5f0aef648c7 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "libarcus"; - version = "4.5.0"; + version = "4.6.1"; format = "other"; src = fetchFromGitHub { @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Communication library between internal components for Ultimaker software"; - homepage = https://github.com/Ultimaker/libArcus; + homepage = "https://github.com/Ultimaker/libArcus"; license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar gebner ]; diff --git a/pkgs/development/python-modules/libasyncns/default.nix b/pkgs/development/python-modules/libasyncns/default.nix index aed76728d7e41..fa7320bdf4ece 100644 --- a/pkgs/development/python-modules/libasyncns/default.nix +++ b/pkgs/development/python-modules/libasyncns/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { description = "libasyncns-python is a python binding for the asynchronous name service query library"; license = licenses.lgpl21; maintainers = [ maintainers.mic92 ]; - homepage = https://launchpad.net/libasyncns-python; + homepage = "https://launchpad.net/libasyncns-python"; }; } diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 3d505166e4acc..f78501b8ced45 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "A unified interface to many cloud providers"; - homepage = http://incubator.apache.org/libcloud/; + homepage = "http://incubator.apache.org/libcloud/"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/libkeepass/default.nix b/pkgs/development/python-modules/libkeepass/default.nix index 09177f16bc6aa..0969e62c79e82 100644 --- a/pkgs/development/python-modules/libkeepass/default.nix +++ b/pkgs/development/python-modules/libkeepass/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/libkeepass/libkeepass; + homepage = "https://github.com/libkeepass/libkeepass"; description = "A library to access KeePass 1.x/KeePassX (v3) and KeePass 2.x (v4) files"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jqueiroz ]; diff --git a/pkgs/development/python-modules/libmr/default.nix b/pkgs/development/python-modules/libmr/default.nix index c258b8dd865ca..7b1bbf6020d24 100644 --- a/pkgs/development/python-modules/libmr/default.nix +++ b/pkgs/development/python-modules/libmr/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "libMR provides core MetaRecognition and Weibull fitting functionality"; - homepage = https://github.com/Vastlab/libMR; + homepage = "https://github.com/Vastlab/libMR"; license = licenses.bsd3; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix index 893789d961d9f..9e19fe5e8e17d 100644 --- a/pkgs/development/python-modules/libnacl/default.nix +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { maintainers = with maintainers; [ xvapx ]; description = "Python bindings for libsodium based on ctypes"; - homepage = https://pypi.python.org/pypi/libnacl; + homepage = "https://pypi.python.org/pypi/libnacl"; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 8920fecf3da7e..6bd917a69e376 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python module for audio and music processing"; - homepage = http://librosa.github.io/; + homepage = "http://librosa.github.io/"; license = licenses.isc; }; diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index abde16d8700b6..32717e127fb8c 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "libsavitar"; - version = "4.5.0"; + version = "4.6.1"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libSavitar"; rev = version; - sha256 = "1l3l8cgaxzqdk93880p2ijrabshdj5sq05cwj1i6jpmhlqc5b9rx"; + sha256 = "0nk8zl5b0b36wrrkj271ck4phzxsigkjsazndscjslc9nkldmnpq"; }; postPatch = '' @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "C++ implementation of 3mf loading with SIP python bindings"; - homepage = https://github.com/Ultimaker/libSavitar; + homepage = "https://github.com/Ultimaker/libSavitar"; license = licenses.lgpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ abbradar orivej gebner ]; diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix index e89b606879bb9..119cb6cbefa74 100644 --- a/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/pkgs/development/python-modules/libsoundtouch/default.nix @@ -28,7 +28,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Bose Soundtouch Python library"; - homepage = https://github.com/CharlesBlonde/libsoundtouch; + homepage = "https://github.com/CharlesBlonde/libsoundtouch"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/libthumbor/default.nix b/pkgs/development/python-modules/libthumbor/default.nix index 6c9987a5b8e86..c8fab07971528 100644 --- a/pkgs/development/python-modules/libthumbor/default.nix +++ b/pkgs/development/python-modules/libthumbor/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "libthumbor is the python extension to thumbor"; - homepage = https://github.com/heynemann/libthumbor; + homepage = "https://github.com/heynemann/libthumbor"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index d1220a6abbf3a..65accea559a18 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Scripting library for tmux"; - homepage = https://libtmux.readthedocs.io/; + homepage = "https://libtmux.readthedocs.io/"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index b63704bf8e08a..2d94383745951 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/vpelletier/python-libusb1; + homepage = "https://github.com/vpelletier/python-libusb1"; description = "Python ctype-based wrapper around libusb1"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix index 775d1a9ef8538..21aa46348b122 100644 --- a/pkgs/development/python-modules/libversion/default.nix +++ b/pkgs/development/python-modules/libversion/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; meta = with stdenv.lib; { - homepage = https://github.com/repology/py-libversion; + homepage = "https://github.com/repology/py-libversion"; description = "Python bindings for libversion, which provides fast, powerful and correct generic version string comparison algorithm"; license = licenses.mit; maintainers = [ maintainers.ryantm ]; diff --git a/pkgs/development/python-modules/libvirt/5.9.0.nix b/pkgs/development/python-modules/libvirt/5.9.0.nix index ef5da737e08ce..7b0b7c438d9a0 100644 --- a/pkgs/development/python-modules/libvirt/5.9.0.nix +++ b/pkgs/development/python-modules/libvirt/5.9.0.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { version = "5.9.0"; src = fetchgit { - url = git://libvirt.org/libvirt-python.git; + url = "git://libvirt.org/libvirt-python.git"; rev = "v${version}"; sha256 = "0qvr0s7yasswy1s5cvkm91iifk33pb8s7nbb38zznc46706b358r"; }; @@ -19,7 +19,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://www.libvirt.org/; + homepage = "http://www.libvirt.org/"; description = "libvirt Python bindings"; license = licenses.lgpl2; maintainers = [ maintainers.fpletz ]; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index a7c620d8d87c7..43962c7d4d639 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { version = "6.2.0"; src = assert version == libvirt.version; fetchgit { - url = git://libvirt.org/libvirt-python.git; + url = "git://libvirt.org/libvirt-python.git"; rev = "v${version}"; sha256 = "0a8crk29rmnw1kcgi72crb7syacdk03lkl05yand5cxs0l65jwdl"; }; @@ -19,7 +19,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://www.libvirt.org/; + homepage = "http://www.libvirt.org/"; description = "libvirt Python bindings"; license = licenses.lgpl2; maintainers = [ maintainers.fpletz ]; diff --git a/pkgs/development/python-modules/lightblue/default.nix b/pkgs/development/python-modules/lightblue/default.nix index f826bbecb0a30..99db9e5c2f73c 100644 --- a/pkgs/development/python-modules/lightblue/default.nix +++ b/pkgs/development/python-modules/lightblue/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ pkgs.bluez pkgs.openobex ]; meta = with stdenv.lib; { - homepage = http://lightblue.sourceforge.net; + homepage = "http://lightblue.sourceforge.net"; description = "Cross-platform Bluetooth API for Python"; maintainers = with maintainers; [ leenaars ]; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 0a711b31d1a6c..95dac53c97ccd 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A fast, distributed, high performance gradient boosting (GBDT, GBRT, GBM or MART) framework"; - homepage = https://github.com/Microsoft/LightGBM; + homepage = "https://github.com/Microsoft/LightGBM"; license = licenses.mit; maintainers = with maintainers; [ teh costrouc ]; }; diff --git a/pkgs/development/python-modules/lightning/default.nix b/pkgs/development/python-modules/lightning/default.nix index d0e1a10ae008b..8b128e7cb8926 100644 --- a/pkgs/development/python-modules/lightning/default.nix +++ b/pkgs/development/python-modules/lightning/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python client library for the Lightning data visualization server"; - homepage = http://lightning-viz.org; + homepage = "http://lightning-viz.org"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/limitlessled/default.nix b/pkgs/development/python-modules/limitlessled/default.nix index c2029aa6d6bdd..6d12f6d51496d 100644 --- a/pkgs/development/python-modules/limitlessled/default.nix +++ b/pkgs/development/python-modules/limitlessled/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with lib; { description = "Control LimitlessLED products"; - homepage = https://github.com/happyleavesaoc/python-limitlessled/; + homepage = "https://github.com/happyleavesaoc/python-limitlessled/"; license = licenses.mit; maintainers = with maintainers; [ sephalon ]; }; diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 614945d136448..5d0b1aacb5555 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -16,6 +16,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Rate limiting utilities"; license = licenses.mit; - homepage = https://limits.readthedocs.org/; + homepage = "https://limits.readthedocs.org/"; }; } diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix index 00ea8dba663e6..027e6b0d1341e 100644 --- a/pkgs/development/python-modules/line_profiler/default.nix +++ b/pkgs/development/python-modules/line_profiler/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "line_profiler"; - version = "2.1.2"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "efa66e9e3045aa7cb1dd4bf0106e07dec9f80bc781a993fbaf8162a36c20af5c"; + sha256 = "7218ad6bd81f8649b211974bf108933910f016d66b49651effe7bbf63667d141"; }; patches = [ ./python37.patch ]; @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = { description = "Line-by-line profiler"; - homepage = https://github.com/rkern/line_profiler; + homepage = "https://github.com/rkern/line_profiler"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/linuxfd/default.nix b/pkgs/development/python-modules/linuxfd/default.nix index e5b8fe6f34c43..ecccba3938a0d 100644 --- a/pkgs/development/python-modules/linuxfd/default.nix +++ b/pkgs/development/python-modules/linuxfd/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = { description = "Python bindings for the Linux eventfd/signalfd/timerfd/inotify syscalls"; - homepage = https://github.com/FrankAbelbeck/linuxfd; + homepage = "https://github.com/FrankAbelbeck/linuxfd"; license = with lib.licenses; [ lgpl3 ]; }; } diff --git a/pkgs/development/python-modules/livestreamer-curses/default.nix b/pkgs/development/python-modules/livestreamer-curses/default.nix index bf3b2cc1164c9..846f7633924b6 100644 --- a/pkgs/development/python-modules/livestreamer-curses/default.nix +++ b/pkgs/development/python-modules/livestreamer-curses/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ livestreamer ]; meta = with stdenv.lib; { - homepage = https://github.com/gapato/livestreamer-curses; + homepage = "https://github.com/gapato/livestreamer-curses"; description = "Curses frontend for livestreamer"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix index fb8f74d72199f..83bd4bcfb72c3 100644 --- a/pkgs/development/python-modules/livestreamer/default.nix +++ b/pkgs/development/python-modules/livestreamer/default.nix @@ -7,7 +7,6 @@ , singledispatch , futures , isPy27 -, isPy33 }: buildPythonPackage rec { @@ -23,15 +22,14 @@ buildPythonPackage rec { buildInputs = [ pkgs.makeWrapper ]; propagatedBuildInputs = [ pkgs.rtmpdump pycrypto requests ] - ++ stdenv.lib.optionals isPy27 [ singledispatch futures ] - ++ stdenv.lib.optionals isPy33 [ singledispatch ]; + ++ stdenv.lib.optionals isPy27 [ singledispatch futures ]; postInstall = '' wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin ''; meta = with stdenv.lib; { - homepage = http://livestreamer.tanuki.se; + homepage = "http://livestreamer.tanuki.se"; description = '' Livestreamer is CLI program that extracts streams from various services and pipes them into a video player of choice. diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 02adb5a8d1613..1fa97d2949c94 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for the low-level FUSE API"; - homepage = https://github.com/python-llfuse/python-llfuse; + homepage = "https://github.com/python-llfuse/python-llfuse"; license = licenses.lgpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 8032588201b45..0878424abb638 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = { description = "A lightweight LLVM python binding for writing JIT compilers"; - homepage = http://llvmlite.pydata.org/; + homepage = "http://llvmlite.pydata.org/"; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix index d05acd21c107b..0078c91756774 100644 --- a/pkgs/development/python-modules/lmtpd/default.nix +++ b/pkgs/development/python-modules/lmtpd/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/moggers87/lmtpd; + homepage = "https://github.com/moggers87/lmtpd"; description = "LMTP counterpart to smtpd in the Python standard library"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/python-modules/locket/default.nix b/pkgs/development/python-modules/locket/default.nix index a4d7a8ce70627..d98ab63797446 100644 --- a/pkgs/development/python-modules/locket/default.nix +++ b/pkgs/development/python-modules/locket/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Locket implements a lock that can be used by multiple processes provided they use the same path."; - homepage = https://github.com/mwilliamson/locket.py; + homepage = "https://github.com/mwilliamson/locket.py"; license = licenses.bsd2; maintainers = with maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/lockfile/default.nix b/pkgs/development/python-modules/lockfile/default.nix index 15cfee67f84a7..295c8eaf9790f 100644 --- a/pkgs/development/python-modules/lockfile/default.nix +++ b/pkgs/development/python-modules/lockfile/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://launchpad.net/pylockfile; + homepage = "https://launchpad.net/pylockfile"; description = "Platform-independent advisory file locking capability for Python applications"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index 8a23b69cf6713..9c4b6dbd7919c 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python packages and modules used by Logilab "; - homepage = https://www.logilab.org/project/logilab-common; + homepage = "https://www.logilab.org/project/logilab-common"; license = licenses.lgpl21; }; } diff --git a/pkgs/development/python-modules/logilab_astng/default.nix b/pkgs/development/python-modules/logilab_astng/default.nix index 53284d1222878..81879b2218de3 100644 --- a/pkgs/development/python-modules/logilab_astng/default.nix +++ b/pkgs/development/python-modules/logilab_astng/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ logilab_common ]; meta = with stdenv.lib; { - homepage = https://www.logilab.org/project/logilab-astng; + homepage = "https://www.logilab.org/project/logilab-astng"; description = "Python Abstract Syntax Tree New Generation"; license = licenses.lgpl2; }; diff --git a/pkgs/development/python-modules/logster/default.nix b/pkgs/development/python-modules/logster/default.nix index e4b57e4ce40cd..7f3a4eeb83b84 100644 --- a/pkgs/development/python-modules/logster/default.nix +++ b/pkgs/development/python-modules/logster/default.nix @@ -16,6 +16,6 @@ buildPythonPackage rec { meta = with lib; { description = "Parses log files, generates metrics for Graphite and Ganglia"; license = licenses.gpl3Plus; - homepage = https://github.com/etsy/logster; + homepage = "https://github.com/etsy/logster"; }; } diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index c12084f008ec4..410ca27c8aa0e 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { ++ stdenv.lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" "test_await_complete_inheritance" ]; meta = with stdenv.lib; { - homepage = https://github.com/Delgan/loguru; + homepage = "https://github.com/Delgan/loguru"; description = "Python logging made (stupidly) simple"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/logzero/default.nix b/pkgs/development/python-modules/logzero/default.nix index 098d9f3e06d86..d5c7685832cf1 100644 --- a/pkgs/development/python-modules/logzero/default.nix +++ b/pkgs/development/python-modules/logzero/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/metachris/logzero; + homepage = "https://github.com/metachris/logzero"; description = "Robust and effective logging for Python 2 and 3"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/loo-py/default.nix b/pkgs/development/python-modules/loo-py/default.nix index fe765f5ff0a87..16060c1c030e8 100644 --- a/pkgs/development/python-modules/loo-py/default.nix +++ b/pkgs/development/python-modules/loo-py/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "A code generator for array-based code on CPUs and GPUs"; - homepage = https://mathema.tician.de/software/loopy; + homepage = "https://mathema.tician.de/software/loopy"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/lpod/default.nix b/pkgs/development/python-modules/lpod/default.nix index 9b262007706f0..effdc3f432a67 100644 --- a/pkgs/development/python-modules/lpod/default.nix +++ b/pkgs/development/python-modules/lpod/default.nix @@ -23,7 +23,7 @@ buildPythonPackage { }; meta = with stdenv.lib; { - homepage = https://github.com/lpod/lpod-python/; + homepage = "https://github.com/lpod/lpod-python/"; description = "Library implementing the ISO/IEC 26300 OpenDocument Format standard (ODF) "; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/lsi/default.nix b/pkgs/development/python-modules/lsi/default.nix index 2277a2be92fb3..5f193f52e9a57 100644 --- a/pkgs/development/python-modules/lsi/default.nix +++ b/pkgs/development/python-modules/lsi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "CLI for querying and SSHing onto AWS EC2 instances"; - homepage = https://github.com/NarrativeScience/lsi; + homepage = "https://github.com/NarrativeScience/lsi"; maintainers = [maintainers.adnelson]; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/ludios_wpull/default.nix b/pkgs/development/python-modules/ludios_wpull/default.nix index f0b3aa60f179b..7bea2b04bbd42 100644 --- a/pkgs/development/python-modules/ludios_wpull/default.nix +++ b/pkgs/development/python-modules/ludios_wpull/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "Web crawler; fork of wpull used by grab-site"; - homepage = https://github.com/ludios/wpull; + homepage = "https://github.com/ludios/wpull"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ ivan ]; }; diff --git a/pkgs/development/python-modules/lxc/default.nix b/pkgs/development/python-modules/lxc/default.nix index 26be7020c6665..2798cb8007577 100644 --- a/pkgs/development/python-modules/lxc/default.nix +++ b/pkgs/development/python-modules/lxc/default.nix @@ -21,7 +21,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Out of tree python 2.7 binding for liblxc"; - homepage = https://github.com/lxc/python2-lxc; + homepage = "https://github.com/lxc/python2-lxc"; license = licenses.lgpl2; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index 67c338b58c724..f39e71ed6901c 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pythonic binding for the libxml2 and libxslt libraries"; - homepage = https://lxml.de; + homepage = "https://lxml.de"; license = licenses.bsd3; maintainers = with maintainers; [ jonringer sjourdois ]; }; diff --git a/pkgs/development/python-modules/lzstring/default.nix b/pkgs/development/python-modules/lzstring/default.nix index cfd30082c1c80..499c720d53fb6 100644 --- a/pkgs/development/python-modules/lzstring/default.nix +++ b/pkgs/development/python-modules/lzstring/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "lz-string for python"; - homepage = https://github.com/gkovacs/lz-string-python; + homepage = "https://github.com/gkovacs/lz-string-python"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ obadz ]; }; diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index 0ccf55e5bc4eb..0e079dd832c4f 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python crypto and SSL toolkit"; - homepage = https://gitlab.com/m2crypto/m2crypto; + homepage = "https://gitlab.com/m2crypto/m2crypto"; license = licenses.mit; maintainers = with maintainers; [ andrew-d ]; }; diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 612e2fd76b2c6..3de9ec079d49f 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/miyakogi/m2r; + homepage = "https://github.com/miyakogi/m2r"; description = "converts a markdown file including reST markups to a valid reST format"; license = licenses.mit; maintainers = [ ]; diff --git a/pkgs/development/python-modules/m3u8/default.nix b/pkgs/development/python-modules/m3u8/default.nix index 5763f3beb65d0..01ff1458c0faa 100644 --- a/pkgs/development/python-modules/m3u8/default.nix +++ b/pkgs/development/python-modules/m3u8/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "m3u8"; - version = "0.5.4"; + version = "0.6.0"; src = fetchFromGitHub { owner = "globocom"; repo = pname; rev = version; - sha256 = "1a2c7vqcysxkaffk40zg8d60l9hpjk0dw221fy9cg72i8jxq1gmm"; + sha256 = "0cmg993icpsa1b19kljxvjwhs167bsqrs0ad4wnwsi8qq6na5d4p"; }; checkInputs = [ bottle pytest pytestcov ]; diff --git a/pkgs/development/python-modules/macfsevents/default.nix b/pkgs/development/python-modules/macfsevents/default.nix index 8dfa0038cdde3..0ba4d08ff0d27 100644 --- a/pkgs/development/python-modules/macfsevents/default.nix +++ b/pkgs/development/python-modules/macfsevents/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/malthe/macfsevents; + homepage = "https://github.com/malthe/macfsevents"; description = "Thread-based interface to file system observation primitives"; license = licenses.bsd2; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/python-modules/macropy/default.nix b/pkgs/development/python-modules/macropy/default.nix index 952740d783765..9048166773ec3 100644 --- a/pkgs/development/python-modules/macropy/default.nix +++ b/pkgs/development/python-modules/macropy/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/lihaoyi/macropy; + homepage = "https://github.com/lihaoyi/macropy"; description = "Macros in Python: quasiquotes, case classes, LINQ and more"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index 28d09672584cd..571a92900c905 100644 --- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Securely transfer data between computers"; - homepage = https://github.com/warner/magic-wormhole-mailbox-server; + homepage = "https://github.com/warner/magic-wormhole-mailbox-server"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix index d6e3ac2b15311..2d6a8d969d8b4 100644 --- a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Transit Relay server for Magic-Wormhole"; - homepage = https://github.com/warner/magic-wormhole-transit-relay; + homepage = "https://github.com/warner/magic-wormhole-transit-relay"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/magic/default.nix b/pkgs/development/python-modules/magic/default.nix index ee2c38fed535c..98e6731a1b86e 100644 --- a/pkgs/development/python-modules/magic/default.nix +++ b/pkgs/development/python-modules/magic/default.nix @@ -21,7 +21,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "A Python wrapper around libmagic"; - homepage = http://www.darwinsys.com/file/; + homepage = "http://www.darwinsys.com/file/"; license = licenses.lgpl2; }; diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index 94bf0a0cb1ece..f48c36bdb03ed 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Computer vision package based on numpy"; - homepage = https://mahotas.readthedocs.io/; + homepage = "https://mahotas.readthedocs.io/"; maintainers = with maintainers; [ luispedro ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index 1f06f7f250a99..94b575f3f4681 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -2,20 +2,24 @@ buildPythonPackage rec { pname = "mail-parser"; - version = "3.9.3"; + version = "3.12.0"; # no tests in PyPI tarball src = fetchFromGitHub { owner = "SpamScope"; repo = pname; rev = "v${version}"; - sha256 = "0v6hgsz6yvp6csgx4y440ksqj24rdsd06vyfqcihiy3dfvp9229y"; + sha256 = "0p851jlly6bzcs70kd1lcjwmg4scwh1icymfc0f2y6rkh4kfsdhk"; }; LC_ALL = "en_US.utf-8"; + # remove version bounds + prePatch = '' + sed -i -e 's/==.*//g' requirements.txt + '' # ipaddress is part of the standard library of Python 3.3+ - prePatch = lib.optionalString (!pythonOlder "3.3") '' + + lib.optionalString (!pythonOlder "3.3") '' substituteInPlace requirements.txt \ --replace "ipaddress" "" ''; @@ -34,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "A mail parser for python 2 and 3"; - homepage = https://github.com/SpamScope/mail-parser; + homepage = "https://github.com/SpamScope/mail-parser"; license = licenses.asl20; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/pkgs/development/python-modules/mailman-hyperkitty/default.nix index fd89260ab94b7..6abe5f5c6bc4b 100644 --- a/pkgs/development/python-modules/mailman-hyperkitty/default.nix +++ b/pkgs/development/python-modules/mailman-hyperkitty/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Mailman archiver plugin for HyperKitty"; - homepage = https://gitlab.com/mailman/mailman-hyperkitty; + homepage = "https://gitlab.com/mailman/mailman-hyperkitty"; license = licenses.gpl3; maintainers = with maintainers; [ globin peti ]; }; diff --git a/pkgs/development/python-modules/mailman-rss/default.nix b/pkgs/development/python-modules/mailman-rss/default.nix index afce4521d5b43..d0d103bfbec56 100644 --- a/pkgs/development/python-modules/mailman-rss/default.nix +++ b/pkgs/development/python-modules/mailman-rss/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Mailman archive -> rss converter"; - homepage = https://github.com/kyamagu/mailman-rss; + homepage = "https://github.com/kyamagu/mailman-rss"; license = licenses.mit; maintainers = with maintainers; [ samueldr ]; }; diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix index c8b77e9668f2d..13b887f6ee4d2 100644 --- a/pkgs/development/python-modules/manhole/default.nix +++ b/pkgs/development/python-modules/manhole/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ionelmc/python-manhole; + homepage = "https://github.com/ionelmc/python-manhole"; description = "Debugging manhole for Python applications"; license = licenses.bsd2; maintainers = with maintainers; [ ivan ]; diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix index e08c61140d6c6..1f2c09d43709d 100644 --- a/pkgs/development/python-modules/manuel/default.nix +++ b/pkgs/development/python-modules/manuel/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A documentation builder"; - homepage = https://pypi.python.org/pypi/manuel; + homepage = "https://pypi.python.org/pypi/manuel"; license = licenses.zpl20; }; diff --git a/pkgs/development/python-modules/mapbox/default.nix b/pkgs/development/python-modules/mapbox/default.nix index 1eec58919d5c9..f721228ddca4c 100644 --- a/pkgs/development/python-modules/mapbox/default.nix +++ b/pkgs/development/python-modules/mapbox/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook responses ]; meta = with lib; { - homepage = https://github.com/mapbox/mapbox-sdk-py; + homepage = "https://github.com/mapbox/mapbox-sdk-py"; license = licenses.mit; description = "Mapbox SDK for Python"; longDescription = "Low-level client API for Mapbox web services."; diff --git a/pkgs/development/python-modules/mapsplotlib/default.nix b/pkgs/development/python-modules/mapsplotlib/default.nix index eb02941c1a1b3..a5dd00971d0aa 100644 --- a/pkgs/development/python-modules/mapsplotlib/default.nix +++ b/pkgs/development/python-modules/mapsplotlib/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Custom Python plots on a Google Maps background"; - homepage = https://github.com/tcassou/mapsplotlib; + homepage = "https://github.com/tcassou/mapsplotlib"; license = licenses.mit; maintainers = [ maintainers.rob ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix index 4a9e0113c6807..29d38a1f2f075 100644 --- a/pkgs/development/python-modules/marionette-harness/default.nix +++ b/pkgs/development/python-modules/marionette-harness/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Mozilla Marionette protocol test automation harness"; - homepage = https://developer.mozilla.org/en-US/docs/Mozilla/QA/Marionette; + homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/QA/Marionette"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/manifestparser.nix b/pkgs/development/python-modules/marionette-harness/manifestparser.nix index 7316526aa2804..45e24ec2e1a9e 100644 --- a/pkgs/development/python-modules/marionette-harness/manifestparser.nix +++ b/pkgs/development/python-modules/marionette-harness/manifestparser.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { description = "Mozilla test manifest handling"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix index 4567d34932b37..60e9e0460e760 100644 --- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix +++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Mozilla Marionette driver"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Marionette; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Marionette"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozcrash.nix b/pkgs/development/python-modules/marionette-harness/mozcrash.nix index c5d91fbfef797..18b39307a17ed 100644 --- a/pkgs/development/python-modules/marionette-harness/mozcrash.nix +++ b/pkgs/development/python-modules/marionette-harness/mozcrash.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = { description = "Minidump stack trace extractor"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix index 9f1a682c2ce37..03187c00bef9f 100644 --- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix +++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "Mozilla-authored device management"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozfile.nix b/pkgs/development/python-modules/marionette-harness/mozfile.nix index 9ca8ea0b7891c..829e909535a71 100644 --- a/pkgs/development/python-modules/marionette-harness/mozfile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozfile.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "File utilities for Mozilla testing"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix index 6862967e420f3..3520d23081b21 100644 --- a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix +++ b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Webserver for Mozilla testing"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix index 080be7e04efec..1aca4cb58468e 100644 --- a/pkgs/development/python-modules/marionette-harness/mozinfo.nix +++ b/pkgs/development/python-modules/marionette-harness/mozinfo.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "System information utilities for Mozilla testing"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = licenses.mpl20; maintainers = with maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix index 834bf48adbd85..ee1aed055e742 100644 --- a/pkgs/development/python-modules/marionette-harness/mozlog.nix +++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "Mozilla logging library"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/moznetwork.nix b/pkgs/development/python-modules/marionette-harness/moznetwork.nix index 106a94b50e283..3029f7ed546c5 100644 --- a/pkgs/development/python-modules/marionette-harness/moznetwork.nix +++ b/pkgs/development/python-modules/marionette-harness/moznetwork.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = { description = "Network utilities for Mozilla testing"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozprocess.nix b/pkgs/development/python-modules/marionette-harness/mozprocess.nix index cfa0f76662012..91ed225ecb80c 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprocess.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprocess.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Mozilla-authored process handling"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix index dda9e07d5e5c4..7075a37263b32 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Mozilla application profile handling library"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix index 8cabe18e3c66a..fc1d8a7bc7c83 100644 --- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix +++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "Mozilla application start/stop helpers"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/moztest.nix b/pkgs/development/python-modules/marionette-harness/moztest.nix index 2ff50e1fa92ea..1c9f9259d995f 100644 --- a/pkgs/development/python-modules/marionette-harness/moztest.nix +++ b/pkgs/development/python-modules/marionette-harness/moztest.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Mozilla test result storage and output"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/pkgs/development/python-modules/marionette-harness/mozversion.nix index 12925f3575ae3..9717a847d3596 100644 --- a/pkgs/development/python-modules/marionette-harness/mozversion.nix +++ b/pkgs/development/python-modules/marionette-harness/mozversion.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = { description = "Application version information library"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix index 71be4f5726d15..031f7b04021bb 100644 --- a/pkgs/development/python-modules/marisa-trie/default.nix +++ b/pkgs/development/python-modules/marisa-trie/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Static memory-efficient Trie-like structures for Python (2.x and 3.x) based on marisa-trie C++ library"; longDescription = "There are official SWIG-based Python bindings included in C++ library distribution; this package provides alternative Cython-based pip-installable Python bindings."; - homepage = https://github.com/kmike/marisa-trie; + homepage = "https://github.com/kmike/marisa-trie"; license = licenses.mit; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/marisa/default.nix b/pkgs/development/python-modules/marisa/default.nix index 006e3a9051be6..0fa5a98f7522e 100644 --- a/pkgs/development/python-modules/marisa/default.nix +++ b/pkgs/development/python-modules/marisa/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python binding for marisa package (do not confuse with marisa-trie python bindings)"; - homepage = https://github.com/s-yata/marisa-trie; + homepage = "https://github.com/s-yata/marisa-trie"; license = with licenses; [ bsd2 lgpl2 ]; maintainers = with maintainers; [ vanzef ]; }; diff --git a/pkgs/development/python-modules/markdown-macros/default.nix b/pkgs/development/python-modules/markdown-macros/default.nix index 98dce9130464d..41a634f4b9a50 100644 --- a/pkgs/development/python-modules/markdown-macros/default.nix +++ b/pkgs/development/python-modules/markdown-macros/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An extension for python-markdown that makes writing trac-like macros easy"; - homepage = https://github.com/wnielson/markdown-macros; + homepage = "https://github.com/wnielson/markdown-macros"; license = licenses.mit; maintainers = [ maintainers.abigailbuccaneer ]; }; diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix index a07e0b14fdce5..8add8f15298f8 100644 --- a/pkgs/development/python-modules/markdown2/default.nix +++ b/pkgs/development/python-modules/markdown2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A fast and complete Python implementation of Markdown"; - homepage = https://github.com/trentm/python-markdown2; + homepage = "https://github.com/trentm/python-markdown2"; license = licenses.mit; maintainers = with maintainers; [ hbunke ]; }; diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix index 1212651aec816..5bbf47278ce73 100644 --- a/pkgs/development/python-modules/markdownsuperscript/default.nix +++ b/pkgs/development/python-modules/markdownsuperscript/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "An extension to the Python Markdown package enabling superscript text"; - homepage = https://github.com/jambonrose/markdown_superscript_extension; + homepage = "https://github.com/jambonrose/markdown_superscript_extension"; license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/markerlib/default.nix b/pkgs/development/python-modules/markerlib/default.nix index 640b11a6f2809..256f395a8f8f3 100644 --- a/pkgs/development/python-modules/markerlib/default.nix +++ b/pkgs/development/python-modules/markerlib/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://bitbucket.org/dholth/markerlib/; + homepage = "https://bitbucket.org/dholth/markerlib/"; description = "A compiler for PEP 345 environment markers"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index d15aa82c3a90a..864e30214efa9 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Implements a XML/HTML/XHTML Markup safe string"; - homepage = http://dev.pocoo.org; + homepage = "http://dev.pocoo.org"; license = licenses.bsd3; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/marshmallow-enum/default.nix b/pkgs/development/python-modules/marshmallow-enum/default.nix index 9d68e66c91ab4..16af840b036bf 100644 --- a/pkgs/development/python-modules/marshmallow-enum/default.nix +++ b/pkgs/development/python-modules/marshmallow-enum/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Enum field for Marshmallow"; - homepage = https://github.com/justanr/marshmallow_enum; + homepage = "https://github.com/justanr/marshmallow_enum"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index 2a0544cf6d8f4..132be56f19b30 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library for pattern matching on symbolic expressions"; - homepage = https://github.com/HPAC/matchpy; + homepage = "https://github.com/HPAC/matchpy"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/mathics/default.nix b/pkgs/development/python-modules/mathics/default.nix index b20cc0709092b..0bd81f0084852 100644 --- a/pkgs/development/python-modules/mathics/default.nix +++ b/pkgs/development/python-modules/mathics/default.nix @@ -42,7 +42,7 @@ if (stdenv.lib.versionOlder django.version "1.8") || meta = with stdenv.lib; { description = "A general-purpose computer algebra system"; - homepage = http://www.mathics.org; + homepage = "http://www.mathics.org"; license = licenses.gpl3; maintainers = [ maintainers.benley ]; }; diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix index 8ea530489e249..dd25860795baf 100644 --- a/pkgs/development/python-modules/matplotlib/2.nix +++ b/pkgs/development/python-modules/matplotlib/2.nix @@ -7,7 +7,6 @@ # darwin has its own "MacOSX" backend , enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null , enableQt ? false, pyqt4 -, libcxx , Cocoa , pythonOlder }: @@ -29,13 +28,20 @@ buildPythonPackage rec { sha256 = "7355bf757ecacd5f0ac9dd9523c8e1a1103faadf8d33c22664178e17533f8ce5"; }; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + patches = [ + # https://github.com/matplotlib/matplotlib/pull/12478 + (fetchpatch { + name = "numpy-1.16-compat.patch"; + url = "https://github.com/matplotlib/matplotlib/commit/2980184d092382a40ab21f95b79582ffae6e19d6.patch"; + sha256 = "1c0wj28zy8s5h6qiavx9zzbhlmhjwpzbc3fyyw9039mbnqk0spg2"; + }) + ]; XDG_RUNTIME_DIR = "/tmp"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python which sphinx stdenv ] + buildInputs = [ which sphinx ] ++ stdenv.lib.optional enableGhostscript ghostscript ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; @@ -48,16 +54,10 @@ buildPythonPackage rec { ++ stdenv.lib.optionals enableQt [ pyqt4 ] ++ stdenv.lib.optionals python.isPy2 [ functools32 subprocess32 ]; - patches = [ - ./basedirlist.patch - - # https://github.com/matplotlib/matplotlib/pull/12478 - (fetchpatch { - name = "numpy-1.16-compat.patch"; - url = "https://github.com/matplotlib/matplotlib/commit/2980184d092382a40ab21f95b79582ffae6e19d6.patch"; - sha256 = "1c0wj28zy8s5h6qiavx9zzbhlmhjwpzbc3fyyw9039mbnqk0spg2"; - }) - ]; + setup_cfg = ./setup.cfg; + preBuild = '' + cp "$setup_cfg" ./setup.cfg + ''; # Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the # corresponding interpreter object for its library paths. This fails if @@ -73,27 +73,14 @@ buildPythonPackage rec { stdenv.lib.optionalString enableTk "sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py"; - checkPhase = '' - ${python.interpreter} tests.py - ''; - - # Test data is not included in the distribution (the `tests` folder - # is missing) + # Matplotlib needs to be built against a specific version of freetype in + # order for all of the tests to pass. doCheck = false; - prePatch = '' - # Failing test: ERROR: matplotlib.tests.test_style.test_use_url - sed -i 's/test_use_url/fails/' lib/matplotlib/tests/test_style.py - # Failing test: ERROR: test suite for <class 'matplotlib.sphinxext.tests.test_tinypages.TestTinyPages'> - sed -i 's/TestTinyPages/fails/' lib/matplotlib/sphinxext/tests/test_tinypages.py - # Transient errors - sed -i 's/test_invisible_Line_rendering/noop/' lib/matplotlib/tests/test_lines.py - ''; - meta = with stdenv.lib; { description = "Python plotting library, making publication quality plots"; homepage = "https://matplotlib.org/"; - maintainers = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ lovek323 veprbl ]; }; } diff --git a/pkgs/development/python-modules/matplotlib/basedirlist.patch b/pkgs/development/python-modules/matplotlib/basedirlist.patch deleted file mode 100644 index 0a84a05bbaeae..0000000000000 --- a/pkgs/development/python-modules/matplotlib/basedirlist.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff --git a/setup.cfg b/setup.cfg -new file mode 100644 -index 0000000..6f81985 ---- /dev/null -+++ b/setup.cfg -@@ -0,0 +1,2 @@ -+[directories] -+basedirlist = . diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 658388eabae4a..03afcfe75ae3b 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -6,7 +6,6 @@ # darwin has its own "MacOSX" backend , enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null , enableQt ? false, pyqt5 ? null -, libcxx , Cocoa , pythonOlder }: @@ -20,36 +19,35 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt5 != null; buildPythonPackage rec { - version = "3.1.3"; + version = "3.2.1"; pname = "matplotlib"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "db3121f12fb9b99f105d1413aebaeb3d943f269f3d262b45586d12765866f0c6"; + sha256 = "ffe2f9cdcea1086fc414e82f42271ecf1976700b8edd16ca9d376189c6d93aee"; }; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; - XDG_RUNTIME_DIR = "/tmp"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python which sphinx stdenv ] + buildInputs = [ which sphinx ] ++ stdenv.lib.optional enableGhostscript ghostscript ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = [ cycler dateutil numpy pyparsing tornado freetype kiwisolver libpng mock pytz ] - ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] ++ stdenv.lib.optionals enableQt [ pyqt5 ]; - patches = - [ ./basedirlist.patch ]; + setup_cfg = ./setup.cfg; + preBuild = '' + cp "$setup_cfg" ./setup.cfg + ''; # Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the # corresponding interpreter object for its library paths. This fails if @@ -65,27 +63,14 @@ buildPythonPackage rec { stdenv.lib.optionalString enableTk "sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py"; - checkPhase = '' - ${python.interpreter} tests.py - ''; - - # Test data is not included in the distribution (the `tests` folder - # is missing) + # Matplotlib needs to be built against a specific version of freetype in + # order for all of the tests to pass. doCheck = false; - prePatch = '' - # Failing test: ERROR: matplotlib.tests.test_style.test_use_url - sed -i 's/test_use_url/fails/' lib/matplotlib/tests/test_style.py - # Failing test: ERROR: test suite for <class 'matplotlib.sphinxext.tests.test_tinypages.TestTinyPages'> - sed -i 's/TestTinyPages/fails/' lib/matplotlib/sphinxext/tests/test_tinypages.py - # Transient errors - sed -i 's/test_invisible_Line_rendering/noop/' lib/matplotlib/tests/test_lines.py - ''; - meta = with stdenv.lib; { description = "Python plotting library, making publication quality plots"; homepage = "https://matplotlib.org/"; - maintainers = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ lovek323 veprbl ]; }; } diff --git a/pkgs/development/python-modules/matplotlib/setup.cfg b/pkgs/development/python-modules/matplotlib/setup.cfg new file mode 100644 index 0000000000000..6f81985efa446 --- /dev/null +++ b/pkgs/development/python-modules/matplotlib/setup.cfg @@ -0,0 +1,2 @@ +[directories] +basedirlist = . diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix index 19c4baca8b290..71092583d7fd4 100644 --- a/pkgs/development/python-modules/matrix-client/default.nix +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Matrix Client-Server SDK"; - homepage = https://github.com/matrix-org/matrix-python-sdk; + homepage = "https://github.com/matrix-org/matrix-python-sdk"; license = licenses.asl20; maintainers = with maintainers; [ olejorgenb ]; }; diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 9320efc91a237..ff4f6198aa5e2 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "nio"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "0gqhk9d06w1in6dj7aqy45skzyg8018nmclqd5r0m5nnw8yns6gz"; + sha256 = "04ryf9lrm0820hqij46hav6mgplabnyl9dfj46iwvxasn06fh2j8"; }; nativeBuildInputs = [ @@ -56,6 +56,6 @@ buildPythonPackage rec { description = "A Python Matrix client library, designed according to sans I/O principles"; homepage = "https://github.com/poljar/matrix-nio"; license = licenses.isc; - maintainers = with maintainers; [ tilpner emily ]; + maintainers = with maintainers; [ tilpner emily symphorien ]; }; } diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index ea5f5ee4851b1..a9310af1432f4 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/tulir/mautrix-python; + homepage = "https://github.com/tulir/mautrix-python"; description = "A Python 3 asyncio Matrix framework."; license = licenses.mpl20; maintainers = with maintainers; [ nyanloutre ma27 ]; diff --git a/pkgs/development/python-modules/maya/default.nix b/pkgs/development/python-modules/maya/default.nix index 9c6cb241fea51..6df4091664b3e 100644 --- a/pkgs/development/python-modules/maya/default.nix +++ b/pkgs/development/python-modules/maya/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Datetimes for Humans"; - homepage = https://github.com/kennethreitz/maya; + homepage = "https://github.com/kennethreitz/maya"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index ffdf974758370..2fd536609076a 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -1,37 +1,45 @@ -{ stdenv, fetchPypi, buildPythonPackage -, wxPython, pygments, numpy, vtk, traitsui, envisage, apptools -, nose, mock -, isPy3k +{ lib, buildPythonPackage, isPy27, fetchPypi, wrapQtAppsHook +, pyface, pygments, numpy, vtk, traitsui, envisage, apptools, pyqt5 }: buildPythonPackage rec { pname = "mayavi"; version = "4.7.1"; + disabled = isPy27; + src = fetchPypi { inherit pname version; extension = "tar.bz2"; sha256 = "095p7mds6kqqrp7xqv24iygr3mw85rm7x41wb5y4yc3gi1pznldy"; }; - # Discovery of 'vtk' in setuptools is not working properly, due to a missing - # .egg-info in the vtk package. It does however import and run just fine. postPatch = '' + # Discovery of 'vtk' in setuptools is not working properly, due to a missing + # .egg-info in the vtk package. It does however import and run just fine. substituteInPlace mayavi/__init__.py --replace "'vtk'" "" - ''; - propagatedBuildInputs = [ wxPython pygments numpy vtk traitsui envisage apptools ]; + # building the docs fails with the usual Qt xcb error, so skip: + substituteInPlace setup.py \ + --replace "build.build.run(self)" "build.build.run(self); return" + ''; - checkInputs = [ nose mock ]; + nativeBuildInputs = [ wrapQtAppsHook ]; - disabled = isPy3k; # TODO: This would need pyqt5 instead of wxPython + propagatedBuildInputs = [ + pyface pygments numpy vtk traitsui envisage apptools pyqt5 + ]; doCheck = false; # Needs X server - meta = with stdenv.lib; { + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + + meta = with lib; { description = "3D visualization of scientific data in Python"; homepage = "https://github.com/enthought/mayavi"; - maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; + maintainers = with maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; }; } diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix index 520e872c91e9a..7a4605e68cede 100644 --- a/pkgs/development/python-modules/mccabe/default.nix +++ b/pkgs/development/python-modules/mccabe/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "McCabe checker, plugin for flake8"; - homepage = https://github.com/flintwork/mccabe; + homepage = "https://github.com/flintwork/mccabe"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix index 9fbaced9b6572..854622f206480 100644 --- a/pkgs/development/python-modules/mdp/default.nix +++ b/pkgs/development/python-modules/mdp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library for building complex data processing software by combining widely used machine learning algorithms"; - homepage = http://mdp-toolkit.sourceforge.net; + homepage = "http://mdp-toolkit.sourceforge.net"; license = licenses.bsd3; maintainers = with maintainers; [ nico202 ]; }; diff --git a/pkgs/development/python-modules/measurement/default.nix b/pkgs/development/python-modules/measurement/default.nix index b3a0430a93b91..6b7a02a76eb51 100644 --- a/pkgs/development/python-modules/measurement/default.nix +++ b/pkgs/development/python-modules/measurement/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Use and manipulate unit-aware measurement objects in Python"; - homepage = https://github.com/coddingtonbear/python-measurement; + homepage = "https://github.com/coddingtonbear/python-measurement"; license = licenses.mit; maintainers = with maintainers; [ bhipple ]; }; diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index 263a71254ed61..893dfb0251d23 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python wrapper for mecab: Morphological Analysis engine"; - homepage = https://github.com/SamuraiT/mecab-python3; + homepage = "https://github.com/SamuraiT/mecab-python3"; license = with licenses; [ gpl2 lgpl21 bsd3 ]; # any of the three maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/meinheld/default.nix b/pkgs/development/python-modules/meinheld/default.nix index f1291a14f3f4b..247523a9a8301 100644 --- a/pkgs/development/python-modules/meinheld/default.nix +++ b/pkgs/development/python-modules/meinheld/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "High performance asynchronous Python WSGI Web Server"; - homepage = https://meinheld.org/; + homepage = "https://meinheld.org/"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/meld3/default.nix b/pkgs/development/python-modules/meld3/default.nix index a1729ecb04e32..013bd56aa3d89 100644 --- a/pkgs/development/python-modules/meld3/default.nix +++ b/pkgs/development/python-modules/meld3/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An HTML/XML templating engine used by supervisor"; - homepage = https://github.com/supervisor/meld3; + homepage = "https://github.com/supervisor/meld3"; license = licenses.free; }; diff --git a/pkgs/development/python-modules/meliae/default.nix b/pkgs/development/python-modules/meliae/default.nix index b0cdbd60c3e23..e02e72c1add5b 100644 --- a/pkgs/development/python-modules/meliae/default.nix +++ b/pkgs/development/python-modules/meliae/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Memory Usage Analyzer"; - homepage = https://launchpad.net/meliae; + homepage = "https://launchpad.net/meliae"; license = licenses.gpl3; maintainers = with maintainers; [ xvapx ]; }; diff --git a/pkgs/development/python-modules/memcached/default.nix b/pkgs/development/python-modules/memcached/default.nix index 854f7440daa17..6547316048079 100644 --- a/pkgs/development/python-modules/memcached/default.nix +++ b/pkgs/development/python-modules/memcached/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python API for communicating with the memcached distributed memory object cache daemon"; - homepage = http://www.tummy.com/Community/software/python-memcached/; + homepage = "http://www.tummy.com/Community/software/python-memcached/"; license = licenses.psfl; }; diff --git a/pkgs/development/python-modules/memory_profiler/default.nix b/pkgs/development/python-modules/memory_profiler/default.nix index e0367e6c50511..0dafde83c4046 100644 --- a/pkgs/development/python-modules/memory_profiler/default.nix +++ b/pkgs/development/python-modules/memory_profiler/default.nix @@ -22,7 +22,7 @@ python.pkgs.buildPythonPackage rec { This is a python module for monitoring memory consumption of a process as well as line-by-line analysis of memory consumption for python programs. ''; - homepage = https://pypi.python.org/pypi/memory_profiler; + homepage = "https://pypi.python.org/pypi/memory_profiler"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/mesonpep517/default.nix b/pkgs/development/python-modules/mesonpep517/default.nix index ec63526070adf..fd44f3e4480e4 100644 --- a/pkgs/development/python-modules/mesonpep517/default.nix +++ b/pkgs/development/python-modules/mesonpep517/default.nix @@ -35,8 +35,8 @@ buildPythonPackage rec { meta = { description = "Create pep517 compliant packages from the meson build system"; - homepage = https://gitlab.com/thiblahute/mesonpep517; + homepage = "https://gitlab.com/thiblahute/mesonpep517"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/metaphone/default.nix b/pkgs/development/python-modules/metaphone/default.nix index e167ee494a82d..a9a4409c0de62 100644 --- a/pkgs/development/python-modules/metaphone/default.nix +++ b/pkgs/development/python-modules/metaphone/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; meta = with stdenv.lib; { - homepage = https://github.com/oubiwann/metaphone; + homepage = "https://github.com/oubiwann/metaphone"; description = "A Python implementation of the metaphone and double metaphone algorithms"; license = licenses.bsd3; maintainers = with maintainers; [ ris ]; diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix index 003234c2adfc1..5129fe253c71c 100644 --- a/pkgs/development/python-modules/micawber/default.nix +++ b/pkgs/development/python-modules/micawber/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ beautifulsoup4 ]; meta = with stdenv.lib; { - homepage = https://micawber.readthedocs.io/en/latest/; + homepage = "https://micawber.readthedocs.io/en/latest/"; description = "A small library for extracting rich content from urls"; license = licenses.mit; longDescription = '' diff --git a/pkgs/development/python-modules/milksnake/default.nix b/pkgs/development/python-modules/milksnake/default.nix index 014bb223225df..6d063021697c1 100644 --- a/pkgs/development/python-modules/milksnake/default.nix +++ b/pkgs/development/python-modules/milksnake/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python library that extends setuptools for binary extensions"; - homepage = https://github.com/getsentry/milksnake; + homepage = "https://github.com/getsentry/milksnake"; license = licenses.asl20; maintainers = with maintainers; [ matthiasbeyer ]; }; diff --git a/pkgs/development/python-modules/minimock/default.nix b/pkgs/development/python-modules/minimock/default.nix index 856f7b45adf49..6275d92b05593 100644 --- a/pkgs/development/python-modules/minimock/default.nix +++ b/pkgs/development/python-modules/minimock/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A minimalistic mocking library for python"; - homepage = https://pypi.python.org/pypi/MiniMock; + homepage = "https://pypi.python.org/pypi/MiniMock"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index a27867467edfb..a3d6cb8879ead 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple APIs to access any Amazon S3 compatible object storage server"; - homepage = https://github.com/minio/minio-py; + homepage = "https://github.com/minio/minio-py"; maintainers = with maintainers; [ peterromfeldhk ]; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/miniupnpc/default.nix b/pkgs/development/python-modules/miniupnpc/default.nix index d267cb6a97623..b3c559c846225 100644 --- a/pkgs/development/python-modules/miniupnpc/default.nix +++ b/pkgs/development/python-modules/miniupnpc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "miniUPnP client"; - homepage = http://miniupnp.free.fr/; + homepage = "http://miniupnp.free.fr/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 75011a8219fe7..cde668bd5fbe9 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "The fastest markdown parser in pure Python"; - homepage = https://github.com/lepture/mistune; + homepage = "https://github.com/lepture/mistune"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/mmpython/default.nix b/pkgs/development/python-modules/mmpython/default.nix index 0a41b6e3c87da..dbb6590eee6d5 100644 --- a/pkgs/development/python-modules/mmpython/default.nix +++ b/pkgs/development/python-modules/mmpython/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mmpython"; src = fetchurl { - url = https://sourceforge.net/projects/mmpython/files/latest/download; + url = "https://sourceforge.net/projects/mmpython/files/latest/download"; sha256 = "1b7qfad3shgakj37gcj1b9h78j1hxlz6wp9k7h76pb4sq4bfyihy"; name = "${pname}-${version}.tar.gz"; }; @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Media Meta Data retrieval framework"; - homepage = https://sourceforge.net/projects/mmpython/; + homepage = "https://sourceforge.net/projects/mmpython/"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/pkgs/development/python-modules/mnemonic/default.nix index ca41917744af5..2811d0ecda549 100644 --- a/pkgs/development/python-modules/mnemonic/default.nix +++ b/pkgs/development/python-modules/mnemonic/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = { description = "Implementation of Bitcoin BIP-0039"; - homepage = https://github.com/trezor/python-mnemonic; + homepage = "https://github.com/trezor/python-mnemonic"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/mock-open/default.nix b/pkgs/development/python-modules/mock-open/default.nix index edb3407270f2a..449430a593d1a 100644 --- a/pkgs/development/python-modules/mock-open/default.nix +++ b/pkgs/development/python-modules/mock-open/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optional (pythonOlder "3.3") mock; meta = with lib; { - homepage = https://github.com/nivbend/mock-open; + homepage = "https://github.com/nivbend/mock-open"; description = "A better mock for file I/O"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/mock/default.nix b/pkgs/development/python-modules/mock/default.nix index 6978bee000a31..de1ff58243e67 100644 --- a/pkgs/development/python-modules/mock/default.nix +++ b/pkgs/development/python-modules/mock/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Mock objects for Python"; - homepage = http://python-mock.sourceforge.net/; + homepage = "http://python-mock.sourceforge.net/"; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/modeled/default.nix b/pkgs/development/python-modules/modeled/default.nix index 298c69194f20f..e4cdec7766d61 100644 --- a/pkgs/development/python-modules/modeled/default.nix +++ b/pkgs/development/python-modules/modeled/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Universal data modeling for Python"; - homepage = https://bitbucket.org/userzimmermann/python-modeled; + homepage = "https://bitbucket.org/userzimmermann/python-modeled"; license = licenses.lgpl3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/moderngl/default.nix b/pkgs/development/python-modules/moderngl/default.nix index 5802b33041f0d..48abc30c9f7d1 100644 --- a/pkgs/development/python-modules/moderngl/default.nix +++ b/pkgs/development/python-modules/moderngl/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/moderngl/moderngl; + homepage = "https://github.com/moderngl/moderngl"; description = "High performance rendering for Python 3"; license = licenses.mit; platforms = platforms.linux; # should be mesaPlatforms, darwin build breaks. diff --git a/pkgs/development/python-modules/modestmaps/default.nix b/pkgs/development/python-modules/modestmaps/default.nix index b25e6f5644edf..c7b1071954d2c 100644 --- a/pkgs/development/python-modules/modestmaps/default.nix +++ b/pkgs/development/python-modules/modestmaps/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library for building interactive maps"; - homepage = http://modestmaps.com; + homepage = "http://modestmaps.com"; license = stdenv.lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index db20d9442ef10..c1c69598cd05c 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "MongoEngine is a Python Object-Document Mapper for working with MongoDB"; - homepage = http://mongoengine.org/; + homepage = "http://mongoengine.org/"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/monotonic/default.nix b/pkgs/development/python-modules/monotonic/default.nix index c784730da6e87..38a25841c7b6c 100644 --- a/pkgs/development/python-modules/monotonic/default.nix +++ b/pkgs/development/python-modules/monotonic/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An implementation of time.monotonic() for Python 2 & < 3.3"; - homepage = https://github.com/atdt/monotonic; + homepage = "https://github.com/atdt/monotonic"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index fb84847acff73..77448d0e15fe3 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { standard library. Examples include useful utilities like transparent support for zipped files, useful design patterns such as singleton and cached_class, and many more. "; - homepage = https://github.com/materialsvirtuallab/monty; + homepage = "https://github.com/materialsvirtuallab/monty"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/more-itertools/2.7.nix b/pkgs/development/python-modules/more-itertools/2.7.nix index e0786aefa2c2e..f9a6ac732e2ea 100644 --- a/pkgs/development/python-modules/more-itertools/2.7.nix +++ b/pkgs/development/python-modules/more-itertools/2.7.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = !stdenv.hostPlatform.is32bit; meta = { - homepage = https://more-itertools.readthedocs.org; + homepage = "https://more-itertools.readthedocs.org"; description = "Expansion of the itertools module"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index 37152b3a502ac..cd128fb216497 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = !stdenv.hostPlatform.is32bit; meta = { - homepage = https://more-itertools.readthedocs.org; + homepage = "https://more-itertools.readthedocs.org"; description = "Expansion of the itertools module"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix index 061eedfe7b015..c9fd953f350e4 100644 --- a/pkgs/development/python-modules/moretools/default.nix +++ b/pkgs/development/python-modules/moretools/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { description = '' Many more basic tools for python 2/3 extending itertools, functools, operator and collections ''; - homepage = https://bitbucket.org/userzimmermann/python-moretools; + homepage = "https://bitbucket.org/userzimmermann/python-moretools"; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/mortgage/default.nix b/pkgs/development/python-modules/mortgage/default.nix new file mode 100644 index 0000000000000..8861a19811f78 --- /dev/null +++ b/pkgs/development/python-modules/mortgage/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mortgage"; + version = "1.0.5"; + + src = fetchPypi { + inherit version pname; + hash = "sha256:18fcb356c631e9cc27fa7019f6ff6021707e34b9ce3a3b7dc815661288709921"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + doCheck = false; # No tests in sdist + + disabled = pythonOlder "3.5"; + + meta = { + description = "Mortgage calculator"; + license = lib.licenses.mit; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index c84427b01c476..0d45103a29528 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -85,7 +85,7 @@ buildPythonPackage rec { meta = with lib; { description = "Allows your tests to easily mock out AWS Services"; - homepage = https://github.com/spulec/moto; + homepage = "https://github.com/spulec/moto"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/mox3/default.nix b/pkgs/development/python-modules/mox3/default.nix index 480e28dffcbc8..bdbccc790cfd8 100644 --- a/pkgs/development/python-modules/mox3/default.nix +++ b/pkgs/development/python-modules/mox3/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Mock object framework for Python"; - homepage = https://docs.openstack.org/mox3/latest/; + homepage = "https://docs.openstack.org/mox3/latest/"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/mozsvc/default.nix b/pkgs/development/python-modules/mozsvc/default.nix index a7b3984b912ef..780a162a916e5 100644 --- a/pkgs/development/python-modules/mozsvc/default.nix +++ b/pkgs/development/python-modules/mozsvc/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyramid simplejson konfig ]; meta = with stdenv.lib; { - homepage = https://github.com/mozilla-services/mozservices; + homepage = "https://github.com/mozilla-services/mozservices"; description = "Various utilities for Mozilla apps"; license = licenses.mpl20; maintainers = with maintainers; [ nadrieril ]; diff --git a/pkgs/development/python-modules/mpd/default.nix b/pkgs/development/python-modules/mpd/default.nix index 48693293458e5..5ae3e2b41ec70 100644 --- a/pkgs/development/python-modules/mpd/default.nix +++ b/pkgs/development/python-modules/mpd/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An MPD (Music Player Daemon) client library written in pure Python"; - homepage = http://jatreuman.indefero.net/p/python-mpd/; + homepage = "http://jatreuman.indefero.net/p/python-mpd/"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/mplleaflet/default.nix b/pkgs/development/python-modules/mplleaflet/default.nix index 62c5282b335b3..bfe442d05f518 100644 --- a/pkgs/development/python-modules/mplleaflet/default.nix +++ b/pkgs/development/python-modules/mplleaflet/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "Convert Matplotlib plots into Leaflet web maps"; - homepage = https://github.com/jwass/mplleaflet; + homepage = "https://github.com/jwass/mplleaflet"; license = with lib.licenses; [ bsd3 ]; }; } diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix index a74150f971b0c..e79f16b1c3b74 100644 --- a/pkgs/development/python-modules/mpv/default.nix +++ b/pkgs/development/python-modules/mpv/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "mpv"; - version = "0.4.5"; + version = "0.4.6"; disabled = isPy27; src = fetchFromGitHub { owner = "jaseg"; repo = "python-mpv"; rev = "v${version}"; - sha256 = "1y80c2k4s42lzvm5dz8wi186i7rsn1vs1wn30hp6v6vs62fb91fi"; + sha256 = "1fh0fdv0k2yz7l6a62hf2svpgz34dzn84sh8fnv2x7wrkwd6r8qn"; }; buildInputs = [ mpv ]; diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix index dd255d4d00490..7074dab739be8 100644 --- a/pkgs/development/python-modules/mrbob/default.nix +++ b/pkgs/development/python-modules/mrbob/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 six ]; meta = with stdenv.lib; { - homepage = https://github.com/domenkozar/mr.bob; + homepage = "https://github.com/domenkozar/mr.bob"; description = "A tool to generate code skeletons from templates"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index 10e62f5cc58f0..705ae9b61ccbe 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msal"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "16l2bmmm5pdlb61av5748mhy0lg9r965lmyn69is6mhsyr9zi38s"; + sha256 = "0pqprfgcsns89gmlm284zcvqnlsn3a5c46n1p33kdk53gyyym66y"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix index c23f0b6572ebf..d646c1ed15f25 100644 --- a/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msgpack-numpy"; - version = "0.4.4.3"; + version = "0.4.5"; src = fetchPypi { inherit pname version; - sha256 = "a02c0069fb580c6a2dda9b98d40d34fda3840863112a5465ba9b54fa2ee005a5"; + sha256 = "0z3ls52iamqv6fbn1ljnd5nnnzaiakczciry5c3vym5r77wgc9mg"; }; buildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Numpy data type serialization using msgpack"; - homepage = https://github.com/lebedov/msgpack-numpy; + homepage = "https://github.com/lebedov/msgpack-numpy"; license = licenses.bsd3; maintainers = with maintainers; [ aborsu ]; }; diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index 8095c151da7c4..70a52dfe99460 100644 --- a/pkgs/development/python-modules/msgpack/default.nix +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; meta = { - homepage = https://github.com/msgpack/msgpack-python; + homepage = "https://github.com/msgpack/msgpack-python"; description = "MessagePack serializer implementation for Python"; license = lib.licenses.asl20; # maintainers = ?? ; diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index 6f53314bd287c..b415537106eb6 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -18,7 +18,7 @@ }: buildPythonPackage rec { - version = "0.6.11"; + version = "0.6.13"; pname = "msrest"; # no tests in PyPI tarball @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Azure"; repo = "msrest-for-python"; rev = "v${version}"; - sha256 = "1lq3bf7kzs9h9sk6ahpf0vidklv0ahx3bm4wpv3qka3jb64yqdmi"; + sha256 = "1s34xp6wgas17mbg6ysciqlgb3qc2p2d5bs9brwr05ys62l6y8cz"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/msrestazure/default.nix b/pkgs/development/python-modules/msrestazure/default.nix index 04f7428e6b616..a97469e8073a0 100644 --- a/pkgs/development/python-modules/msrestazure/default.nix +++ b/pkgs/development/python-modules/msrestazure/default.nix @@ -12,7 +12,7 @@ }: buildPythonPackage rec { - version = "0.6.2"; + version = "0.6.3"; pname = "msrestazure"; # Pypi tarball doesnt include tests @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Azure"; repo = "msrestazure-for-python"; rev = "v${version}"; - sha256 = "09qwdg4la4jwp5ibypdwsn7h8m2sh8c1kdxvffyxcjan50h14s04"; + sha256 = "0pd3qw96c9fz4qgimnc0qf0pz7m9rr1wzhxj8m792swaf3pb18z8"; }; propagatedBuildInputs = [ adal msrest ]; diff --git a/pkgs/development/python-modules/msrplib/default.nix b/pkgs/development/python-modules/msrplib/default.nix index bba72ea62bb92..ffb87ff48ee0d 100644 --- a/pkgs/development/python-modules/msrplib/default.nix +++ b/pkgs/development/python-modules/msrplib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ eventlib application gnutls ]; meta = with stdenv.lib; { - homepage = https://github.com/AGProjects/python-msrplib; + homepage = "https://github.com/AGProjects/python-msrplib"; description = "Client library for MSRP protocol and its relay extension (RFC 4975 and RFC4976)"; license = licenses.lgpl3; }; diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index f31bb4c064e72..c41b472a69385 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library to parse MT940 files and returns smart Python collections for statistics and manipulation"; - homepage = https://github.com/WoLpH/mt940; + homepage = "https://github.com/WoLpH/mt940"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 0b05416436d32..16fea2898dd34 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Multidict implementation"; - homepage = https://github.com/aio-libs/multidict/; + homepage = "https://github.com/aio-libs/multidict/"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix index 8b2de6c5af196..ed55b0421cd89 100644 --- a/pkgs/development/python-modules/multipledispatch/default.nix +++ b/pkgs/development/python-modules/multipledispatch/default.nix @@ -19,9 +19,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; meta = { - homepage = https://github.com/mrocklin/multipledispatch/; + homepage = "https://github.com/mrocklin/multipledispatch/"; description = "A relatively sane approach to multiple dispatch in Python"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix index 51fe7a83c9d52..df304efb91995 100644 --- a/pkgs/development/python-modules/multiprocess/default.nix +++ b/pkgs/development/python-modules/multiprocess/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Better multiprocessing and multithreading in python"; - homepage = https://github.com/uqfoundation/multiprocess; + homepage = "https://github.com/uqfoundation/multiprocess"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/multiset/default.nix b/pkgs/development/python-modules/multiset/default.nix index 5cc159dc20597..020617abebf4c 100644 --- a/pkgs/development/python-modules/multiset/default.nix +++ b/pkgs/development/python-modules/multiset/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "An implementation of a multiset"; - homepage = https://github.com/wheerd/multiset; + homepage = "https://github.com/wheerd/multiset"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/munch/default.nix b/pkgs/development/python-modules/munch/default.nix index 764523e0cf7af..0d7d6f7c633af 100644 --- a/pkgs/development/python-modules/munch/default.nix +++ b/pkgs/development/python-modules/munch/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A dot-accessible dictionary (a la JavaScript objects)"; license = licenses.mit; - homepage = https://github.com/Infinidat/munch; + homepage = "https://github.com/Infinidat/munch"; }; } diff --git a/pkgs/development/python-modules/munkres/default.nix b/pkgs/development/python-modules/munkres/default.nix index 5e83818a0143a..93e0c27fcca1b 100644 --- a/pkgs/development/python-modules/munkres/default.nix +++ b/pkgs/development/python-modules/munkres/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { checkPhase = "nosetests"; meta = with stdenv.lib; { - homepage = http://bmc.github.com/munkres/; + homepage = "http://bmc.github.com/munkres/"; description = "Munkres algorithm for the Assignment Problem"; license = licenses.bsd3; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index 2e826ab61e81e..82b33b6b40200 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cython bindings for MurmurHash2"; - homepage = https://github.com/explosion/murmurhash; + homepage = "https://github.com/explosion/murmurhash"; license = licenses.mit; maintainers = with maintainers; [ aborsu sdll ]; }; diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix index 5dd34fef112f7..273a009a1f414 100644 --- a/pkgs/development/python-modules/mutag/default.nix +++ b/pkgs/development/python-modules/mutag/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { propagatedBuildInputs = [ pyparsing ]; meta = with stdenv.lib; { - homepage = https://github.com/aroig/mutag; + homepage = "https://github.com/aroig/mutag"; description = "A script to change email tags in a mu indexed maildir"; license = licenses.gpl3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/muttils/default.nix b/pkgs/development/python-modules/muttils/default.nix index 868700b622372..01e789fb75941 100644 --- a/pkgs/development/python-modules/muttils/default.nix +++ b/pkgs/development/python-modules/muttils/default.nix @@ -10,7 +10,7 @@ buildPythonPackage { disabled = isPy3k; src = fetchurl { - url = https://www.blacktrash.org/hg/muttils/archive/8bb26094df06.tar.bz2; + url = "https://www.blacktrash.org/hg/muttils/archive/8bb26094df06.tar.bz2"; sha256 = "1a4kxa0fpgg6rdj5p4kggfn8xpniqh8v5kbiaqc6wids02m7kag6"; }; @@ -19,7 +19,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Utilities for use with console mail clients, like mutt"; - homepage = https://www.blacktrash.org/hg/muttils; + homepage = "https://www.blacktrash.org/hg/muttils"; license = licenses.gpl2Plus; }; diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix index ce987311a74f1..b26a3f948c8a1 100644 --- a/pkgs/development/python-modules/mwclient/default.nix +++ b/pkgs/development/python-modules/mwclient/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python client library to the MediaWiki API"; license = licenses.mit; - homepage = https://github.com/mwclient/mwclient; + homepage = "https://github.com/mwclient/mwclient"; }; } diff --git a/pkgs/development/python-modules/mwoauth/default.nix b/pkgs/development/python-modules/mwoauth/default.nix index 778a081992c1e..94a85d41d9e77 100644 --- a/pkgs/development/python-modules/mwoauth/default.nix +++ b/pkgs/development/python-modules/mwoauth/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library designed to provide a simple means to performing an OAuth handshake with a MediaWiki installation with the OAuth Extension installed."; - homepage = https://github.com/mediawiki-utilities/python-mwoauth; + homepage = "https://github.com/mediawiki-utilities/python-mwoauth"; license = licenses.mit; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix index 570d0c3e749c8..14834923954fd 100644 --- a/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/pkgs/development/python-modules/myfitnesspal/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Access your meal tracking data stored in MyFitnessPal programatically"; - homepage = https://github.com/coddingtonbear/python-myfitnesspal; + homepage = "https://github.com/coddingtonbear/python-myfitnesspal"; license = licenses.mit; maintainers = with maintainers; [ bhipple ]; }; diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix index 5f30316eb711e..2af73f2d8974c 100644 --- a/pkgs/development/python-modules/mygpoclient/default.nix +++ b/pkgs/development/python-modules/mygpoclient/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { The mygpoclient library allows developers to utilize a Pythonic interface to the gpodder.net web services. ''; - homepage = https://github.com/gpodder/mygpoclient; + homepage = "https://github.com/gpodder/mygpoclient"; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ skeidel ]; }; diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index e66f102e6cab7..5850d7e67b030 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -1,22 +1,16 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python, protobuf3_6 }: +{ lib, buildPythonPackage, fetchFromGitHub, python }: let - py = python.override { - packageOverrides = self: super: { - protobuf = super.protobuf.override { - protobuf = protobuf3_6; - }; - }; - }; + py = python; in buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.19"; + version = "8.0.20"; src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - sha256 = "1jscmc5s7mwx43gvxjlqc30ylp5jjpmkqx7s3b9nllbh926p3ixg"; + sha256 = "1pm98mjbkhwawhni98cjhp0gg3mim75i0sdby77vzrlcrxajxkbw"; }; propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ]; @@ -32,7 +26,8 @@ in buildPythonPackage rec { A MySQL driver that does not depend on MySQL C client libraries and implements the DB API v2.0 specification. ''; - homepage = https://github.com/mysql/mysql-connector-python; + homepage = "https://github.com/mysql/mysql-connector-python"; + changelog = "https://raw.githubusercontent.com/mysql/mysql-connector-python/${version}/CHANGES.txt"; license = [ lib.licenses.gpl2 ]; maintainers = with lib.maintainers; [ primeos ]; }; diff --git a/pkgs/development/python-modules/nagiosplugin/default.nix b/pkgs/development/python-modules/nagiosplugin/default.nix index ef46e7ccafd45..6b6e889b5d5de 100644 --- a/pkgs/development/python-modules/nagiosplugin/default.nix +++ b/pkgs/development/python-modules/nagiosplugin/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python class library which helps with writing Nagios (Icinga) compatible plugins"; - homepage = https://github.com/mpounsett/nagiosplugin; + homepage = "https://github.com/mpounsett/nagiosplugin"; license = licenses.zpl21; maintainers = with maintainers; [ symphorien ]; }; diff --git a/pkgs/development/python-modules/namedlist/default.nix b/pkgs/development/python-modules/namedlist/default.nix index ae07076bb0574..b66ecb6210c5b 100644 --- a/pkgs/development/python-modules/namedlist/default.nix +++ b/pkgs/development/python-modules/namedlist/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Similar to namedtuple, but instances are mutable"; - homepage = https://bitbucket.org/ericvsmith/namedlist; + homepage = "https://bitbucket.org/ericvsmith/namedlist"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ivan ]; }; diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix index de4803c60e499..3384ed67c1efc 100644 --- a/pkgs/development/python-modules/nameparser/default.nix +++ b/pkgs/development/python-modules/nameparser/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A simple Python module for parsing human names into their individual components"; - homepage = https://github.com/derek73/python-nameparser; + homepage = "https://github.com/derek73/python-nameparser"; license = licenses.lgpl21Plus; }; diff --git a/pkgs/development/python-modules/nanoleaf/default.nix b/pkgs/development/python-modules/nanoleaf/default.nix index ccf0be4ae6d22..ea15da78bfb5b 100644 --- a/pkgs/development/python-modules/nanoleaf/default.nix +++ b/pkgs/development/python-modules/nanoleaf/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python interface for Nanoleaf Aurora lighting"; - homepage = https://github.com/software-2/nanoleaf; + homepage = "https://github.com/software-2/nanoleaf"; license = licenses.mit; maintainers = with maintainers; [ elseym ]; }; diff --git a/pkgs/development/python-modules/nanomsg-python/default.nix b/pkgs/development/python-modules/nanomsg-python/default.nix index 31662cd3941aa..29d71d0243f90 100644 --- a/pkgs/development/python-modules/nanomsg-python/default.nix +++ b/pkgs/development/python-modules/nanomsg-python/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Bindings for nanomsg"; - homepage = https://github.com/tonysimpson/nanomsg-python; + homepage = "https://github.com/tonysimpson/nanomsg-python"; license = licenses.mit; maintainers = with maintainers; [ bgamari ]; }; diff --git a/pkgs/development/python-modules/nanotime/default.nix b/pkgs/development/python-modules/nanotime/default.nix index 8dd520a04e9a9..fc9306eb5714c 100644 --- a/pkgs/development/python-modules/nanotime/default.nix +++ b/pkgs/development/python-modules/nanotime/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Provides a time object that keeps time as the number of nanoseconds since the UNIX epoch"; - homepage = https://github.com/jbenet/nanotime/tree/master/python; + homepage = "https://github.com/jbenet/nanotime/tree/master/python"; license = licenses.mit; maintainers = with maintainers; [ cmcdragonkai ]; }; diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 8bdfdb9d7200a..918d491083d65 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = { description = "Natural sorting for python"; - homepage = https://github.com/SethMMorton/natsort; + homepage = "https://github.com/SethMMorton/natsort"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/naturalsort/default.nix b/pkgs/development/python-modules/naturalsort/default.nix index f7dcbe4d827ca..98ced7a381c24 100644 --- a/pkgs/development/python-modules/naturalsort/default.nix +++ b/pkgs/development/python-modules/naturalsort/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple natural order sorting API for Python that just works"; - homepage = https://github.com/xolox/python-naturalsort; + homepage = "https://github.com/xolox/python-naturalsort"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; }; diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index b0357c16165c3..49e4862999c7a 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = { description = "Converting Jupyter Notebooks"; - homepage = https://jupyter.org/; + homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/nbformat/2.nix b/pkgs/development/python-modules/nbformat/2.nix index fbc71202d2860..faf2cee2b0084 100644 --- a/pkgs/development/python-modules/nbformat/2.nix +++ b/pkgs/development/python-modules/nbformat/2.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = { description = "The Jupyter Notebook format"; - homepage = https://jupyter.org/; + homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh globin ]; }; diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 179c5e8b9b6c7..2f8c57e00338b 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.0.4"; + version = "5.0.6"; src = fetchPypi { inherit pname version; - sha256 = "562de41fc7f4f481b79ab5d683279bf3a168858268d4387b489b7b02be0b324a"; + sha256 = "049af048ed76b95c3c44043620c17e56bc001329e07f83fec4f177f0e3d7b757"; }; LC_ALL="en_US.utf8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = { description = "The Jupyter Notebook format"; - homepage = https://jupyter.org/; + homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh globin ]; }; diff --git a/pkgs/development/python-modules/nbsmoke/default.nix b/pkgs/development/python-modules/nbsmoke/default.nix index 6fff7857565d1..46d47fd1679c8 100644 --- a/pkgs/development/python-modules/nbsmoke/default.nix +++ b/pkgs/development/python-modules/nbsmoke/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Basic notebook checks and linting"; - homepage = https://github.com/pyviz/nbsmoke; + homepage = "https://github.com/pyviz/nbsmoke"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index 4557d6656502b..06a210db6c475 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Jupyter Notebook Tools for Sphinx"; - homepage = https://nbsphinx.readthedocs.io/; + homepage = "https://nbsphinx.readthedocs.io/"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix index 020fab8f88873..41f5425317d65 100644 --- a/pkgs/development/python-modules/nbval/default.nix +++ b/pkgs/development/python-modules/nbval/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "A py.test plugin to validate Jupyter notebooks"; - homepage = https://github.com/computationalmodelling/nbval; + homepage = "https://github.com/computationalmodelling/nbval"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/ndg-httpsclient/default.nix b/pkgs/development/python-modules/ndg-httpsclient/default.nix index d9c7e41c576f0..687f589fe1afb 100644 --- a/pkgs/development/python-modules/ndg-httpsclient/default.nix +++ b/pkgs/development/python-modules/ndg-httpsclient/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/cedadev/ndg_httpsclient/; + homepage = "https://github.com/cedadev/ndg_httpsclient/"; description = "Provide enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"; license = licenses.bsd2; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix new file mode 100644 index 0000000000000..631beabea8a2f --- /dev/null +++ b/pkgs/development/python-modules/neo/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, numpy +, quantities +}: + +buildPythonPackage rec { + pname = "neo"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0n74miad4dadavnzi1hqlyzyk795x7qq2adp71i011534ixs70ik"; + }; + + propagatedBuildInputs = [ numpy quantities ]; + + checkInputs = [ nose ]; + + checkPhase = '' + nosetests --exclude=iotest + ''; + + meta = with lib; { + homepage = "https://neuralensemble.org/neo/"; + description = "Package for representing electrophysiology data in Python"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix index ed56e6803f4c8..200392c85f8af 100644 --- a/pkgs/development/python-modules/netaddr/default.nix +++ b/pkgs/development/python-modules/netaddr/default.nix @@ -27,13 +27,13 @@ buildPythonPackage rec { patches = [ (fetchpatch { - url = https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch; + url = "https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch"; sha256 = "0s1cdn9v5alpviabhcjmzc0m2pnpq9dh2fnnk2x96dnry1pshg39"; }) ]; meta = with stdenv.lib; { - homepage = https://github.com/drkjam/netaddr/; + homepage = "https://github.com/drkjam/netaddr/"; description = "A network address manipulation library for Python"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 17d1cd596759d..62373ebc42d64 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Interface to netCDF library (versions 3 and 4)"; - homepage = https://pypi.python.org/pypi/netCDF4; + homepage = "https://pypi.python.org/pypi/netCDF4"; license = licenses.free; # Mix of license (all MIT* like) }; } diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index 1c9af258995db..b5353a5842d3e 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library to scan local network for services and devices"; - homepage = https://github.com/home-assistant/netdisco; + homepage = "https://github.com/home-assistant/netdisco"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/netifaces/default.nix b/pkgs/development/python-modules/netifaces/default.nix index 1f1cc3857e412..94cdb8290133a 100644 --- a/pkgs/development/python-modules/netifaces/default.nix +++ b/pkgs/development/python-modules/netifaces/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://alastairs-place.net/projects/netifaces/; + homepage = "https://alastairs-place.net/projects/netifaces/"; description = "Portable access to network interfaces from Python"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix index 6054e6d3a7328..301d2c7a39471 100644 --- a/pkgs/development/python-modules/nevow/default.nix +++ b/pkgs/development/python-modules/nevow/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pages if appropriate. Once a form post has validated successfully, the method will be called with the coerced values. ''; - homepage = https://github.com/twisted/nevow; + homepage = "https://github.com/twisted/nevow"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 436c9fe637943..06c6f9cb0c1f9 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -31,6 +31,7 @@ , xvfbwrapper , pytestcov , codecov +, sphinx # other dependencies , which , bash @@ -49,11 +50,11 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.3.1"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "bb190964b568d64b04b73d2aa7eae31061fdbc3051d8c27bb34b1632db07ec71"; + sha256 = "1nr0z0k4xx1vswkp03g1lf8141mr4j2fbwd7wmpay4vz46qcp786"; }; postPatch = '' @@ -61,6 +62,10 @@ buildPythonPackage rec { --replace "/usr/bin/env bash" "${bash}/bin/bash" ''; + nativeBuildInputs = [ + sphinx + ]; + propagatedBuildInputs = [ click dateutil @@ -102,15 +107,14 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; # ignore tests which incorrect fail to detect xvfb checkPhase = '' - LC_ALL="en_US.UTF-8" pytest -v nipype -k 'not display' + LC_ALL="en_US.UTF-8" pytest nipype/tests -k 'not display' ''; + pythonImportsCheck = [ "nipype" ]; meta = with stdenv.lib; { homepage = "https://nipy.org/nipype/"; description = "Neuroimaging in Python: Pipelines and Interfaces"; license = licenses.bsd3; maintainers = with maintainers; [ ashgillman ]; - # tests hang, blocking reviews of other packages - broken = isPy38; }; } diff --git a/pkgs/development/python-modules/nipype/neurdflib.nix b/pkgs/development/python-modules/nipype/neurdflib.nix index 33526bebd558d..0a266ff7bf826 100644 --- a/pkgs/development/python-modules/nipype/neurdflib.nix +++ b/pkgs/development/python-modules/nipype/neurdflib.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "A temporary convenience package for changes waiting to be merged into the primary rdflib repo"; - homepage = https://pypi.org/project/neurdflib; + homepage = "https://pypi.org/project/neurdflib"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index f73fb6dac33d9..17e4669b6bedd 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Prefetch sources from github"; - homepage = https://github.com/seppeljordan/nix-prefetch-github; + homepage = "https://github.com/seppeljordan/nix-prefetch-github"; license = licenses.gpl3; maintainers = with maintainers; [ seppeljordan ]; }; diff --git a/pkgs/development/python-modules/nixpkgs-pytools/default.nix b/pkgs/development/python-modules/nixpkgs-pytools/default.nix index ebb8b7c70eb75..401c481411602 100644 --- a/pkgs/development/python-modules/nixpkgs-pytools/default.nix +++ b/pkgs/development/python-modules/nixpkgs-pytools/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tools for removing the tedious nature of creating nixpkgs derivations"; - homepage = https://github.com/nix-community/nixpkgs-pytools; + homepage = "https://github.com/nix-community/nixpkgs-pytools"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/pkgs/development/python-modules/nixpkgs/default.nix index 66e8bb2a735a1..7df6d72c55c44 100644 --- a/pkgs/development/python-modules/nixpkgs/default.nix +++ b/pkgs/development/python-modules/nixpkgs/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Allows to `from nixpkgs import` stuff in interactive Python sessions"; - homepage = https://github.com/t184256/nixpkgs-python-importer; + homepage = "https://github.com/t184256/nixpkgs-python-importer"; license = licenses.mit; maintainers = with maintainers; [ t184256 ]; }; diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index ef6d51cb19a4d..4f0a90a36af86 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Natural Language Processing ToolKit"; - homepage = http://nltk.org/; + homepage = "http://nltk.org/"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ lheckemann ]; }; diff --git a/pkgs/development/python-modules/nmigen-boards/default.nix b/pkgs/development/python-modules/nmigen-boards/default.nix index e40624b7a5cd7..55f70f74db94a 100644 --- a/pkgs/development/python-modules/nmigen-boards/default.nix +++ b/pkgs/development/python-modules/nmigen-boards/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Board and connector definitions for nMigen"; - homepage = https://github.com/nmigen/nmigen-boards; + homepage = "https://github.com/nmigen/nmigen-boards"; license = licenses.bsd2; maintainers = with maintainers; [ emily ]; }; diff --git a/pkgs/development/python-modules/nmigen-soc/default.nix b/pkgs/development/python-modules/nmigen-soc/default.nix index bcd3deece5415..4c15e65e62b29 100644 --- a/pkgs/development/python-modules/nmigen-soc/default.nix +++ b/pkgs/development/python-modules/nmigen-soc/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "System on Chip toolkit for nMigen"; - homepage = https://github.com/nmigen/nmigen-soc; + homepage = "https://github.com/nmigen/nmigen-soc"; license = licenses.bsd2; maintainers = with maintainers; [ emily ]; }; diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/nmigen/default.nix index 010b44729661d..3cb2056c7cfc6 100644 --- a/pkgs/development/python-modules/nmigen/default.nix +++ b/pkgs/development/python-modules/nmigen/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "A refreshed Python toolbox for building complex digital hardware"; - homepage = https://github.com/nmigen/nmigen; + homepage = "https://github.com/nmigen/nmigen"; license = licenses.bsd2; maintainers = with maintainers; [ emily ]; }; diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix index 1c38918c14772..9c787147407ae 100644 --- a/pkgs/development/python-modules/node-semver/default.nix +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/podhmo/python-semver; + homepage = "https://github.com/podhmo/python-semver"; description = "A port of node-semver"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/python-modules/nodeenv/default.nix b/pkgs/development/python-modules/nodeenv/default.nix index 042ee1e3e616e..f3f1c2b86c1bc 100644 --- a/pkgs/development/python-modules/nodeenv/default.nix +++ b/pkgs/development/python-modules/nodeenv/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "Node.js virtual environment builder"; - homepage = https://github.com/ekalinin/nodeenv; + homepage = "https://github.com/ekalinin/nodeenv"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/noise/default.nix b/pkgs/development/python-modules/noise/default.nix index d136c41aa3704..736444ec6e19a 100644 --- a/pkgs/development/python-modules/noise/default.nix +++ b/pkgs/development/python-modules/noise/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/caseman/noise; + homepage = "https://github.com/caseman/noise"; description = "Native-code and shader implementations of Perlin noise"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/python-modules/nose-cov/default.nix b/pkgs/development/python-modules/nose-cov/default.nix index 1d3d6179ae634..4b94e2657e979 100644 --- a/pkgs/development/python-modules/nose-cov/default.nix +++ b/pkgs/development/python-modules/nose-cov/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ nose covCore ]; meta = with lib; { - homepage = https://pypi.org/project/nose-cov/; + homepage = "https://pypi.org/project/nose-cov/"; license = licenses.mit; description = "This plugin produces coverage reports. It also supports coverage of subprocesses."; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/development/python-modules/nose-cover3/default.nix b/pkgs/development/python-modules/nose-cover3/default.nix index 273c0ab042f9a..7f954f7ebca35 100644 --- a/pkgs/development/python-modules/nose-cover3/default.nix +++ b/pkgs/development/python-modules/nose-cover3/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Coverage 3.x support for Nose"; - homepage = https://github.com/ask/nosecover3; + homepage = "https://github.com/ask/nosecover3"; license = licenses.lgpl21; }; diff --git a/pkgs/development/python-modules/nose-cprof/default.nix b/pkgs/development/python-modules/nose-cprof/default.nix index c8bc7dbaf6826..aa3f0d37f092b 100644 --- a/pkgs/development/python-modules/nose-cprof/default.nix +++ b/pkgs/development/python-modules/nose-cprof/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python nose plugin to profile using cProfile rather than the default Hotshot profiler"; - homepage = https://github.com/msherry/nose-cprof; + homepage = "https://github.com/msherry/nose-cprof"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/nose-exclude/default.nix b/pkgs/development/python-modules/nose-exclude/default.nix index 7f679e545e7df..81204a34bd9c1 100644 --- a/pkgs/development/python-modules/nose-exclude/default.nix +++ b/pkgs/development/python-modules/nose-exclude/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { license = lib.licenses.lgpl21; description = "Exclude specific directories from nosetests runs"; - homepage = https://github.com/kgrandis/nose-exclude; + homepage = "https://github.com/kgrandis/nose-exclude"; maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/nose-focus/default.nix b/pkgs/development/python-modules/nose-focus/default.nix index ef86a35b30411..d7b13eb1059b4 100644 --- a/pkgs/development/python-modules/nose-focus/default.nix +++ b/pkgs/development/python-modules/nose-focus/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Decorator and plugin to make nose focus on specific tests"; - homepage = https://nose-focus.readthedocs.io/en/latest/; + homepage = "https://nose-focus.readthedocs.io/en/latest/"; license = licenses.wtfpl; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/nose-of-yeti/default.nix b/pkgs/development/python-modules/nose-of-yeti/default.nix index 7a783da311776..b7fd1e241aaa7 100644 --- a/pkgs/development/python-modules/nose-of-yeti/default.nix +++ b/pkgs/development/python-modules/nose-of-yeti/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Nose plugin providing BDD dsl for python"; - homepage = https://github.com/delfick/nose-of-yeti; + homepage = "https://github.com/delfick/nose-of-yeti"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/nose-pattern-exclude/default.nix b/pkgs/development/python-modules/nose-pattern-exclude/default.nix index 24d74b938afb6..2170ac224d950 100644 --- a/pkgs/development/python-modules/nose-pattern-exclude/default.nix +++ b/pkgs/development/python-modules/nose-pattern-exclude/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Exclude specific files and directories from nosetests runs"; - homepage = https://github.com/jakubroztocil/nose-pattern-exclude; + homepage = "https://github.com/jakubroztocil/nose-pattern-exclude"; license = licenses.bsd3; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/nose-randomly/default.nix b/pkgs/development/python-modules/nose-randomly/default.nix index 23315f9531b24..eb75a375d7701 100644 --- a/pkgs/development/python-modules/nose-randomly/default.nix +++ b/pkgs/development/python-modules/nose-randomly/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Nose plugin to randomly order tests and control random.seed"; - homepage = https://github.com/adamchainz/nose-randomly; + homepage = "https://github.com/adamchainz/nose-randomly"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix index bec5156d22e07..a5ed49a29d73a 100644 --- a/pkgs/development/python-modules/nose/default.nix +++ b/pkgs/development/python-modules/nose/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A unittest-based testing framework for python that makes writing and running tests easier"; - homepage = http://readthedocs.org/docs/nose/; + homepage = "http://readthedocs.org/docs/nose/"; license = licenses.lgpl3; }; diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index 749a4d4618b19..300ed80ca4081 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -3,28 +3,29 @@ , fetchPypi , six , pythonOlder -, mock , coverage }: buildPythonPackage rec { pname = "nose2"; - version = "0.9.1"; + version = "0.9.2"; + + # Requires mock 2.0.0 if python < 3.6, but NixPkgs has mock 3.0.5. + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "16drs4bc2wvgwwi1pf6pmk6c00pl16vs1v7djc4a8kwpsxpibphf"; + sha256 = "0pmbb6nk31yhgh4zkcblzxsznml7f7pf5q1ihgrwvbxv4mwzfql7"; }; - propagatedBuildInputs = [ six coverage ] - ++ stdenv.lib.optionals (pythonOlder "3.4") [ mock ]; + propagatedBuildInputs = [ six coverage ]; # AttributeError: 'module' object has no attribute 'collector' doCheck = false; meta = with stdenv.lib; { description = "nose2 is the next generation of nicer testing for Python"; - homepage = https://github.com/nose-devs/nose2; + homepage = "https://github.com/nose-devs/nose2"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/nose_progressive/default.nix b/pkgs/development/python-modules/nose_progressive/default.nix index 6d9d98f27abd4..b4683ef12cbf6 100644 --- a/pkgs/development/python-modules/nose_progressive/default.nix +++ b/pkgs/development/python-modules/nose_progressive/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = !isPy3k; meta = with stdenv.lib; { - homepage = https://github.com/erikrose/nose-progressive; + homepage = "https://github.com/erikrose/nose-progressive"; description = "A testrunner with a progress bar and smarter tracebacks"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/nose_warnings_filters/default.nix b/pkgs/development/python-modules/nose_warnings_filters/default.nix index 2b1ee207cfed0..81e7de8815ee1 100644 --- a/pkgs/development/python-modules/nose_warnings_filters/default.nix +++ b/pkgs/development/python-modules/nose_warnings_filters/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "Allow injecting warning filters during nosetest"; - homepage = https://github.com/Carreau/nose_warnings_filters; + homepage = "https://github.com/Carreau/nose_warnings_filters"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/nosejs/default.nix b/pkgs/development/python-modules/nosejs/default.nix index c2d3ee94c7b5e..9d30855c68e12 100644 --- a/pkgs/development/python-modules/nosejs/default.nix +++ b/pkgs/development/python-modules/nosejs/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://pypi.org/project/NoseJS/; + homepage = "https://pypi.org/project/NoseJS/"; description = "A Nose plugin for integrating JavaScript tests into a Python test suite"; license = licenses.free; }; diff --git a/pkgs/development/python-modules/nosexcover/default.nix b/pkgs/development/python-modules/nosexcover/default.nix index 2fb698388795d..84cc4994b08ac 100644 --- a/pkgs/development/python-modules/nosexcover/default.nix +++ b/pkgs/development/python-modules/nosexcover/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Extends nose.plugins.cover to add Cobertura-style XML reports"; - homepage = https://github.com/cmheisel/nose-xcover/; + homepage = "https://github.com/cmheisel/nose-xcover/"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/notebook/2.nix b/pkgs/development/python-modules/notebook/2.nix index d081a5a92fbe4..8b8cce2f82453 100644 --- a/pkgs/development/python-modules/notebook/2.nix +++ b/pkgs/development/python-modules/notebook/2.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { meta = { description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; - homepage = https://jupyter.org/; + homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index b73dc553546d7..4550bb6363185 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { meta = { description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; - homepage = https://jupyter.org/; + homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/notedown/default.nix b/pkgs/development/python-modules/notedown/default.nix index c1dacc84da0c7..8ecbf1f5afab3 100644 --- a/pkgs/development/python-modules/notedown/default.nix +++ b/pkgs/development/python-modules/notedown/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/aaren/notedown; + homepage = "https://github.com/aaren/notedown"; description = "Convert IPython Notebooks to markdown (and back)"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ vcanadi ]; diff --git a/pkgs/development/python-modules/notify/default.nix b/pkgs/development/python-modules/notify/default.nix index f3a1d6514eb59..7e71eb8b30213 100644 --- a/pkgs/development/python-modules/notify/default.nix +++ b/pkgs/development/python-modules/notify/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { version = "0.1.1"; src = fetchurl { - url = http://www.galago-project.org/files/releases/source/notify-python/notify-python-0.1.1.tar.bz2; + url = "http://www.galago-project.org/files/releases/source/notify-python/notify-python-0.1.1.tar.bz2"; sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx"; }; @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Python bindings for libnotify"; - homepage = http://www.galago-project.org/; + homepage = "http://www.galago-project.org/"; license = licenses.lgpl3; }; diff --git a/pkgs/development/python-modules/notify2/default.nix b/pkgs/development/python-modules/notify2/default.nix index 2d5851929075d..a7928fb66c659 100644 --- a/pkgs/development/python-modules/notify2/default.nix +++ b/pkgs/development/python-modules/notify2/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Pure Python interface to DBus notifications"; - homepage = https://bitbucket.org/takluyver/pynotify2; + homepage = "https://bitbucket.org/takluyver/pynotify2"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ mog ]; }; diff --git a/pkgs/development/python-modules/notmuch/default.nix b/pkgs/development/python-modules/notmuch/default.nix index 5d5a85b6fdd8a..4ae42b3390b5a 100644 --- a/pkgs/development/python-modules/notmuch/default.nix +++ b/pkgs/development/python-modules/notmuch/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "A Python wrapper around notmuch"; - homepage = https://notmuchmail.org/; + homepage = "https://notmuchmail.org/"; license = licenses.gpl3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/ntplib/default.nix b/pkgs/development/python-modules/ntplib/default.nix index d6506ae4b4ad7..71397fd84cd18 100644 --- a/pkgs/development/python-modules/ntplib/default.nix +++ b/pkgs/development/python-modules/ntplib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python NTP library"; - homepage = http://code.google.com/p/ntplib/; + homepage = "http://code.google.com/p/ntplib/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index edaed742538ae..f65f5079b2c87 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -12,13 +12,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.7"; + version = "0.6.8.1"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "09mrm7iz2wdrd7y2csbcidg6bkskjignx2pnifh4i8zlh0vm61bg"; + sha256 = "1rn6i2mcljhb9nmh8qj3slcmqzs9jx8s7j8r2b7685n7751h5ipj"; }; checkInputs = [ vmprof pyqt4 ]; @@ -46,7 +46,7 @@ in buildPythonPackage rec { meta = with stdenv.lib; { description = "Python compiler with full language support and CPython compatibility"; license = licenses.asl20; - homepage = https://nuitka.net/; + homepage = "https://nuitka.net/"; }; } diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 829a983e3801d..71e8eec39416d 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -4,7 +4,6 @@ , python , buildPythonPackage , isPy27 -, isPy33 , isPy3k , numpy , llvmlite @@ -26,7 +25,8 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; - propagatedBuildInputs = [numpy llvmlite] ++ stdenv.lib.optional (!isPy3k) funcsigs ++ stdenv.lib.optional (isPy27 || isPy33) singledispatch; + propagatedBuildInputs = [numpy llvmlite] + ++ stdenv.lib.optionals isPy27 [ funcsigs singledispatch]; # Copy test script into $out and run the test suite. checkPhase = '' @@ -36,7 +36,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = http://numba.pydata.org/; + homepage = "http://numba.pydata.org/"; license = stdenv.lib.licenses.bsd2; description = "Compiling Python code using LLVM"; maintainers = with stdenv.lib.maintainers; [ fridh ]; diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index 9725f1311113e..ea93fc1f3f3e6 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { ''; meta = with lib;{ - homepage = https://github.com/alimanfoo/numcodecs; + homepage = "https://github.com/alimanfoo/numcodecs"; license = licenses.mit; description = "Buffer compression and transformation codecs for use in data storage and communication applications"; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/numericalunits/default.nix b/pkgs/development/python-modules/numericalunits/default.nix index 3f041ef698e20..208178f5e11b7 100644 --- a/pkgs/development/python-modules/numericalunits/default.nix +++ b/pkgs/development/python-modules/numericalunits/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = !isPy3k; meta = with stdenv.lib; { - homepage = http://pypi.python.org/pypi/numericalunits; + homepage = "http://pypi.python.org/pypi/numericalunits"; description = "A package that lets you define quantities with unit"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 5acdfd6f8c6d2..b862319d94771 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.11.0"; + version = "2.11.2"; src = fetchPypi { inherit pname version; - sha256 = "1z6b740fpkr8fbbhw79l29hmwf76xcda6ni804sqz0jghm7883yy"; + sha256 = "1dil1rklb41m3v6a0i93ymimv453whsg1m9z6g0z17jbg7gmc98r"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 92bcb131ab193..29f01387dd221 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -5,39 +5,47 @@ , gfortran , pytest , blas +, lapack , writeTextFile , isPyPy , cython , setuptoolsBuildHook }: +assert (!blas.isILP64) && (!lapack.isILP64); + let - blasImplementation = lib.nameFromURL blas.name "-"; cfg = writeTextFile { name = "site.cfg"; text = (lib.generators.toINI {} { - ${blasImplementation} = { - include_dirs = "${blas}/include"; + ${blas.implementation} = { + include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include"; + library_dirs = "${blas}/lib:${lapack}/lib"; + libraries = "lapack,lapacke,blas,cblas"; + }; + lapack = { + include_dirs = "${lib.getDev lapack}/include"; + library_dirs = "${lapack}/lib"; + }; + blas = { + include_dirs = "${lib.getDev blas}/include"; library_dirs = "${blas}/lib"; - } // lib.optionalAttrs (blasImplementation == "mkl") { - mkl_libs = "mkl_rt"; - lapack_libs = ""; }; }); }; in buildPythonPackage rec { pname = "numpy"; - version = "1.18.1"; + version = "1.18.3"; format = "pyproject.toml"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b6ff59cee96b454516e47e7721098e6ceebef435e3e21ac2d6c3b8b02628eb77"; + sha256 = "e46e2384209c91996d5ec16744234d1c906ab79a701ce1a26155c9ec890b8dc8"; }; nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ]; - buildInputs = [ blas ]; + buildInputs = [ blas lapack ]; patches = lib.optionals python.hasDistutilsCxxPatch [ # We patch cpython/distutils to fix https://bugs.python.org/issue1222585 @@ -68,8 +76,10 @@ in buildPythonPackage rec { ''; passthru = { - blas = blas; - inherit blasImplementation cfg; + # just for backwards compatibility + blas = blas.provider; + blasImplementation = blas.implementation; + inherit cfg; }; # Disable test @@ -78,7 +88,7 @@ in buildPythonPackage rec { meta = { description = "Scientific tools for Python"; - homepage = https://numpy.org/; + homepage = "https://numpy.org/"; maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/numtraits/default.nix b/pkgs/development/python-modules/numtraits/default.nix index a0262c7759541..624f32fd337b5 100644 --- a/pkgs/development/python-modules/numtraits/default.nix +++ b/pkgs/development/python-modules/numtraits/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Numerical traits for Python objects"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fridh ]; - homepage = https://github.com/astrofrog/numtraits; + homepage = "https://github.com/astrofrog/numtraits"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index 641db7008f8ac..9046a75260ad9 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; meta = with stdenv.lib; { - homepage = https://github.com/lilydjwg/nvchecker; + homepage = "https://github.com/lilydjwg/nvchecker"; description = "New version checker for software"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index ff66cb9450b2b..9e7d4958e3be5 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Generate network-diagram image from spec-text file (similar to Graphviz)"; - homepage = http://blockdiag.com/; + homepage = "http://blockdiag.com/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix index 8e294f290cbde..aae9b5f743702 100644 --- a/pkgs/development/python-modules/nxt-python/default.nix +++ b/pkgs/development/python-modules/nxt-python/default.nix @@ -27,7 +27,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Python driver/interface for Lego Mindstorms NXT robot"; - homepage = https://github.com/Eelviny/nxt-python; + homepage = "https://github.com/Eelviny/nxt-python"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/development/python-modules/oauth/default.nix b/pkgs/development/python-modules/oauth/default.nix index f4a8e3a62c236..133640f662028 100644 --- a/pkgs/development/python-modules/oauth/default.nix +++ b/pkgs/development/python-modules/oauth/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://code.google.com/archive/p/oauth/; + homepage = "https://code.google.com/archive/p/oauth/"; description = "Library for OAuth version 1.0a"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/oauth2client/default.nix b/pkgs/development/python-modules/oauth2client/default.nix index 8500b53b244c4..dc6e65d95cbf7 100644 --- a/pkgs/development/python-modules/oauth2client/default.nix +++ b/pkgs/development/python-modules/oauth2client/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "A client library for OAuth 2.0"; - homepage = https://github.com/google/oauth2client/; + homepage = "https://github.com/google/oauth2client/"; license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index d8a9769297686..d3617f25a9a7b 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Authenticate JupyterHub users with common OAuth providers, including GitHub, Bitbucket, and more."; - homepage = https://github.com/jupyterhub/oauthenticator; + homepage = "https://github.com/jupyterhub/oauthenticator"; license = licenses.bsd3; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index b8b85f606a945..6c6ddc29de98b 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/idan/oauthlib; + homepage = "https://github.com/idan/oauthlib"; description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic"; maintainers = with maintainers; [ prikhi ]; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/obfsproxy/default.nix b/pkgs/development/python-modules/obfsproxy/default.nix index 8abd3f22ea3d8..c320f299ddb1e 100644 --- a/pkgs/development/python-modules/obfsproxy/default.nix +++ b/pkgs/development/python-modules/obfsproxy/default.nix @@ -29,8 +29,8 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pluggable transport proxy"; - homepage = https://www.torproject.org/projects/obfsproxy; - repositories.git = https://git.torproject.org/pluggable-transports/obfsproxy.git; + homepage = "https://www.torproject.org/projects/obfsproxy"; + repositories.git = "https://git.torproject.org/pluggable-transports/obfsproxy.git"; maintainers = with maintainers; [ phreedom thoughtpolice ]; }; diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index c0e0cddb2c80b..860f8c0051e78 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Draws Python object reference graphs with graphviz"; - homepage = https://mg.pov.lt/objgraph/; + homepage = "https://mg.pov.lt/objgraph/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/od/default.nix b/pkgs/development/python-modules/od/default.nix index 0aaa40e17582e..aa275cb27a69c 100644 --- a/pkgs/development/python-modules/od/default.nix +++ b/pkgs/development/python-modules/od/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Shorthand syntax for building OrderedDicts"; - homepage = https://github.com/epsy/od; + homepage = "https://github.com/epsy/od"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/odfpy/default.nix b/pkgs/development/python-modules/odfpy/default.nix index 5e7cdfc934195..531a80759a06e 100644 --- a/pkgs/development/python-modules/odfpy/default.nix +++ b/pkgs/development/python-modules/odfpy/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "Python API and tools to manipulate OpenDocument files"; - homepage = https://github.com/eea/odfpy; + homepage = "https://github.com/eea/odfpy"; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/odo/default.nix b/pkgs/development/python-modules/odo/default.nix index 6c19bf0a0fd0e..4badad33a08ff 100644 --- a/pkgs/development/python-modules/odo/default.nix +++ b/pkgs/development/python-modules/odo/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/ContinuumIO/odo; + homepage = "https://github.com/ContinuumIO/odo"; description = "Data migration utilities"; license = licenses.bsdOriginal; maintainers = with maintainers; [ fridh costrouc ]; diff --git a/pkgs/development/python-modules/offtrac/default.nix b/pkgs/development/python-modules/offtrac/default.nix index e098ecc8c31d1..be796b5c37dfb 100644 --- a/pkgs/development/python-modules/offtrac/default.nix +++ b/pkgs/development/python-modules/offtrac/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://fedorahosted.org/offtrac; + homepage = "http://fedorahosted.org/offtrac"; description = "Trac xmlrpc library"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/ofxclient/default.nix b/pkgs/development/python-modules/ofxclient/default.nix index 2bde7b174d33f..7eb4bef73504f 100644 --- a/pkgs/development/python-modules/ofxclient/default.nix +++ b/pkgs/development/python-modules/ofxclient/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ofxhome ofxparse beautifulsoup4 lxml keyring ]; meta = with stdenv.lib; { - homepage = https://github.com/captin411/ofxclient; + homepage = "https://github.com/captin411/ofxclient"; description = "OFX client for dowloading transactions from banks"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/ofxtools/default.nix b/pkgs/development/python-modules/ofxtools/default.nix index 1aa6b75e8bfac..da087e8b520f6 100644 --- a/pkgs/development/python-modules/ofxtools/default.nix +++ b/pkgs/development/python-modules/ofxtools/default.nix @@ -1,30 +1,35 @@ { stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, nose , python -, sqlalchemy +, pythonOlder }: buildPythonPackage rec { pname = "ofxtools"; version = "0.8.20"; - src = fetchPypi { - inherit pname version; - sha256 = "87245679911c0c12429a476fd269611512d3e4b44cb8871159bb76ba70f8a46f"; + disabled = pythonOlder "3.7"; + + # PyPI distribution does not include tests + src = fetchFromGitHub { + owner = "csingley"; + repo = pname; + rev = version; + sha256 = "1s3fhhmj1acnmqglh39003db0bi451m4hcrkcpyrkqf5m32lslz8"; }; + checkInputs = [ nose ]; + # override $HOME directory: + # error: [Errno 13] Permission denied: '/homeless-shelter' checkPhase = '' - ${python.interpreter} -m unittest discover -s ofxtools + HOME=$TMPDIR nosetests tests/*.py ''; - buildInputs = [ sqlalchemy ]; - meta = with stdenv.lib; { homepage = "https://github.com/csingley/ofxtools"; description = "Library for working with Open Financial Exchange (OFX) formatted data used by financial institutions"; license = licenses.mit; - broken = true; }; - } diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix index ff4aba83bc803..5667da7fbc6d4 100644 --- a/pkgs/development/python-modules/olefile/default.nix +++ b/pkgs/development/python-modules/olefile/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python package to parse, read and write Microsoft OLE2 files"; - homepage = https://www.decalage.info/python/olefileio; + homepage = "https://www.decalage.info/python/olefileio"; # BSD like + reference to Pillow license = "http://olefile.readthedocs.io/en/latest/License.html"; }; diff --git a/pkgs/development/python-modules/onkyo-eiscp/default.nix b/pkgs/development/python-modules/onkyo-eiscp/default.nix index 39c9870606057..117b8228d2e54 100644 --- a/pkgs/development/python-modules/onkyo-eiscp/default.nix +++ b/pkgs/development/python-modules/onkyo-eiscp/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Control Onkyo receivers over ethernet"; - homepage = https://github.com/miracle2k/onkyo-eiscp; + homepage = "https://github.com/miracle2k/onkyo-eiscp"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 3f3cf38f33320..6c0560bbaffcd 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -18,29 +18,18 @@ buildPythonPackage rec { pname = "onnx"; - version = "1.6.0"; + version = "1.7.0"; # Due to Protobuf packaging issues this build of Onnx with Python 2 gives - # errors on import + # errors on import. + # Also support for Python 2 will be deprecated from Onnx v1.8. disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0ig33jl3591041lyylxp52yi20rfrcqx3i030hd6al8iabzc721v"; + sha256 = "0j6rgfbhsw3a8id8pyg18y93k68lbjbj1kq6qia36h69f6pvlyjy"; }; - # Remove the unqualified requirement for the typing package for running the - # tests. typing is already required for the installation, where it is - # correctly qualified so as to only be required for sufficiently old Python - # versions. - # This patch should be in the next release (>1.6). - patches = [ - (fetchpatch { - url = "https://github.com/onnx/onnx/commit/c963586d0f8dd5740777b2fd06f04ec60816de9f.patch"; - sha256 = "1hl26cw5zckc91gmh0bdah87jyprccxiw0f4i5h1gwkq28hm6wbj"; - }) - ]; - nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ @@ -61,16 +50,20 @@ buildPythonPackage rec { patchShebangs tools/protoc-gen-mypy.py ''; + preBuild = '' + export MAX_JOBS=$NIX_BUILD_CORES + ''; + # The executables are just utility scripts that aren't too important postInstall = '' rm -r $out/bin ''; - # The setup.py does all the configuration (running CMake) - dontConfigure = true; + # The setup.py does all the configuration + dontUseCmakeConfigure = true; meta = { - homepage = http://onnx.ai; + homepage = "http://onnx.ai"; description = "Open Neural Network Exchange"; license = lib.licenses.mit; maintainers = [ lib.maintainers.acairncross ]; diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 160427db7f193..5e3806934d0e3 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ mock pytest pytestcov pytest-flake8 tox ]; meta = with lib; { - homepage = https://github.com/p1c2u/openapi-spec-validator; + homepage = "https://github.com/p1c2u/openapi-spec-validator"; description = "Validates OpenAPI Specs against the OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0.0 specification"; license = licenses.asl20; maintainers = with maintainers; [ rvl ]; diff --git a/pkgs/development/python-modules/openidc-client/default.nix b/pkgs/development/python-modules/openidc-client/default.nix index e0eb1ac8d796e..9cfe714ef6f2b 100644 --- a/pkgs/development/python-modules/openidc-client/default.nix +++ b/pkgs/development/python-modules/openidc-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A CLI python OpenID Connect client with token caching and management"; - homepage = https://github.com/puiterwijk; + homepage = "https://github.com/puiterwijk"; license = licenses.mit; maintainers = with maintainers; [ disassembler ]; }; diff --git a/pkgs/development/python-modules/openpyxl/2.nix b/pkgs/development/python-modules/openpyxl/2.nix index d58192c06667d..73300de645ff4 100644 --- a/pkgs/development/python-modules/openpyxl/2.nix +++ b/pkgs/development/python-modules/openpyxl/2.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { description = "A Python library to read/write Excel 2007 xlsx/xlsm files"; - homepage = https://openpyxl.readthedocs.org; + homepage = "https://openpyxl.readthedocs.org"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lihop sjourdois ]; }; diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index a3f74f0009391..ce6a909a5bfc1 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = { description = "A Python library to read/write Excel 2007 xlsx/xlsm files"; - homepage = https://openpyxl.readthedocs.org; + homepage = "https://openpyxl.readthedocs.org"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lihop sjourdois ]; }; diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index f231169115fdd..501b3fa54a453 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -9,7 +9,7 @@ sha256 = "013r9q4xg2xjmyxybx07zsl2b5lm9vw843anx22ygpvxz1qgz9hp"; }; meta = with stdenv.lib; { - homepage = https://openrazer.github.io/; + homepage = "https://openrazer.github.io/"; license = licenses.gpl2; maintainers = with maintainers; [ roelvandijk evanjs ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix index f9394efe398b5..e9dce6b232220 100644 --- a/pkgs/development/python-modules/opentimestamps/default.nix +++ b/pkgs/development/python-modules/opentimestamps/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Create and verify OpenTimestamps proofs"; - homepage = https://github.com/opentimestamps/python-opentimestamps; + homepage = "https://github.com/opentimestamps/python-opentimestamps"; license = lib.licenses.lgpl3; }; } diff --git a/pkgs/development/python-modules/opentracing/default.nix b/pkgs/development/python-modules/opentracing/default.nix index f20ca7285e685..63107ec372a6b 100644 --- a/pkgs/development/python-modules/opentracing/default.nix +++ b/pkgs/development/python-modules/opentracing/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/opentracing/opentracing-python; + homepage = "https://github.com/opentracing/opentracing-python"; description = "Platform API for OpenTracing"; license = licenses.asl20; maintainers = with maintainers; [ rakesh4g ]; diff --git a/pkgs/development/python-modules/opt-einsum/default.nix b/pkgs/development/python-modules/opt-einsum/default.nix index 1d8c9d9531a66..6bf0e451f040a 100644 --- a/pkgs/development/python-modules/opt-einsum/default.nix +++ b/pkgs/development/python-modules/opt-einsum/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchPypi, lib, numpy, pytest_4 }: buildPythonPackage rec { - version = "3.1.0"; + version = "3.2.1"; pname = "opt_einsum"; src = fetchPypi { inherit version pname; - sha256 = "edfada4b1d0b3b782ace8bc14e80618ff629abf53143e1e6bbf9bd00b11ece77"; + sha256 = "165r7rsl5j94kna4q3vsaq71z23lgxd9b20dgb6abrlas6c6mdw3"; }; propagatedBuildInputs = [ numpy ]; @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Optimizing NumPy's einsum function with order optimization and GPU support."; - homepage = https://github.com/dgasmith/opt_einsum; + homepage = "https://github.com/dgasmith/opt_einsum"; license = licenses.mit; maintainers = with maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 26c7289931796..64ed54cafbe20 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -85,7 +85,7 @@ buildPythonPackage rec { meta = with lib; { description = "A hyperparameter optimization framework"; - homepage = https://optuna.org/; + homepage = "https://optuna.org/"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/orderedmultidict/default.nix b/pkgs/development/python-modules/orderedmultidict/default.nix index f144c43da06f2..82c08d655356b 100644 --- a/pkgs/development/python-modules/orderedmultidict/default.nix +++ b/pkgs/development/python-modules/orderedmultidict/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Ordered Multivalue Dictionary."; - homepage = https://github.com/gruns/orderedmultidict; + homepage = "https://github.com/gruns/orderedmultidict"; license = licenses.publicDomain; maintainers = with maintainers; [ vanzef ]; }; diff --git a/pkgs/development/python-modules/orm/default.nix b/pkgs/development/python-modules/orm/default.nix index c2f6bc4fc5707..dece359b0c0fa 100644 --- a/pkgs/development/python-modules/orm/default.nix +++ b/pkgs/development/python-modules/orm/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "An async ORM"; - homepage = https://github.com/encode/orm; + homepage = "https://github.com/encode/orm"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index ae4e8a0397112..856c2bb45dbc9 100755 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX."; - homepage = https://github.com/gboeing/osmnx; + homepage = "https://github.com/gboeing/osmnx"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/outcome/default.nix b/pkgs/development/python-modules/outcome/default.nix index ff97ca15a9281..6e7593cec1c3a 100644 --- a/pkgs/development/python-modules/outcome/default.nix +++ b/pkgs/development/python-modules/outcome/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Capture the outcome of Python function calls."; - homepage = https://github.com/python-trio/outcome; + homepage = "https://github.com/python-trio/outcome"; license = with lib.licenses; [ mit asl20 ]; maintainers = with lib.maintainers; [ catern ]; }; diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix index 22e82141cdcbf..305b03b4d144d 100644 --- a/pkgs/development/python-modules/ovh/default.nix +++ b/pkgs/development/python-modules/ovh/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Thin wrapper around OVH's APIs"; - homepage = https://github.com/ovh/python-ovh; + homepage = "https://github.com/ovh/python-ovh"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.makefu ]; }; diff --git a/pkgs/development/python-modules/ovito/default.nix b/pkgs/development/python-modules/ovito/default.nix index 694b87581cd64..5f852b29298ee 100644 --- a/pkgs/development/python-modules/ovito/default.nix +++ b/pkgs/development/python-modules/ovito/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Scientific visualization and analysis software for atomistic simulation data"; - homepage = https://www.ovito.org; + homepage = "https://www.ovito.org"; license = licenses.gpl3; maintainers = [ maintainers.costrouc ]; # ensures not built on hydra diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 1e79a7641472b..93adf76459789 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { meta = with lib; { description = "client for Open Geospatial Consortium web service interface standards"; license = licenses.bsd3; - homepage = https://www.osgeo.org/projects/owslib/; + homepage = "https://www.osgeo.org/projects/owslib/"; }; } diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index 0c64c95b4b6c3..ce6836f9f2bd9 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Core utilities for Python packages"; - homepage = https://github.com/pypa/packaging; + homepage = "https://github.com/pypa/packaging"; license = [ licenses.bsd2 licenses.asl20 ]; maintainers = with maintainers; [ bennofs ]; }; diff --git a/pkgs/development/python-modules/pafy/default.nix b/pkgs/development/python-modules/pafy/default.nix index 532181465576b..c657a2fa1b12f 100644 --- a/pkgs/development/python-modules/pafy/default.nix +++ b/pkgs/development/python-modules/pafy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library to download YouTube content and retrieve metadata"; - homepage = https://github.com/mps-youtube/pafy; + homepage = "https://github.com/mps-youtube/pafy"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ odi ]; }; diff --git a/pkgs/development/python-modules/pagelabels/default.nix b/pkgs/development/python-modules/pagelabels/default.nix new file mode 100644 index 0000000000000..d7adc9b17c043 --- /dev/null +++ b/pkgs/development/python-modules/pagelabels/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, pdfrw }: + +buildPythonPackage rec { + pname = "pagelabels"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "07as5kzyvj66bfgvx8bph8gkyj6cgm4lhgxwb78bpdl4m8y8kpma"; + }; + + buildInputs = [ pdfrw ]; + + # upstream doesn't contain tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Python library to manipulate PDF page labels."; + homepage = "https://github.com/lovasoa/pagelabels-py"; + maintainers = with maintainers; [ teto ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/python-modules/pagerduty/default.nix b/pkgs/development/python-modules/pagerduty/default.nix index d3f47dad3ca2f..00236f3c23451 100644 --- a/pkgs/development/python-modules/pagerduty/default.nix +++ b/pkgs/development/python-modules/pagerduty/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/samuel/python-pagerduty; + homepage = "https://github.com/samuel/python-pagerduty"; description = "Library for the PagerDuty service API"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix index 886307b7104ae..977ba3cdeb8b6 100644 --- a/pkgs/development/python-modules/paho-mqtt/default.nix +++ b/pkgs/development/python-modules/paho-mqtt/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; meta = with lib; { - homepage = https://eclipse.org/paho; + homepage = "https://eclipse.org/paho"; description = "MQTT version 3.1.1 client class"; license = licenses.epl10; maintainers = with maintainers; [ mog dotlambda ]; diff --git a/pkgs/development/python-modules/palettable/default.nix b/pkgs/development/python-modules/palettable/default.nix index 6313e759e6bec..9f1aed30ff707 100644 --- a/pkgs/development/python-modules/palettable/default.nix +++ b/pkgs/development/python-modules/palettable/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library of color palettes"; - homepage = https://jiffyclub.github.io/palettable/; + homepage = "https://jiffyclub.github.io/palettable/"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix index 07eab3b7bc92c..09cda2797300e 100644 --- a/pkgs/development/python-modules/pamqp/default.nix +++ b/pkgs/development/python-modules/pamqp/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "RabbitMQ Focused AMQP low-level library"; - homepage = https://pypi.python.org/pypi/pamqp; + homepage = "https://pypi.python.org/pypi/pamqp"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index d0e932dec1bc6..0f4a354208659 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -122,7 +122,7 @@ in buildPythonPackage rec { # https://github.com/pandas-dev/pandas/issues/14866 # pandas devs are no longer testing i686 so safer to assume it's broken broken = stdenv.isi686; - homepage = https://pandas.pydata.org/; + homepage = "https://pandas.pydata.org/"; description = "Python Data Analysis Library"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ raskin fridh knedlsepp ]; diff --git a/pkgs/development/python-modules/pandoc-attributes/default.nix b/pkgs/development/python-modules/pandoc-attributes/default.nix index 8b5652bfb5441..d4da8e3cac622 100644 --- a/pkgs/development/python-modules/pandoc-attributes/default.nix +++ b/pkgs/development/python-modules/pandoc-attributes/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/aaren/pandoc-attributes; + homepage = "https://github.com/aaren/pandoc-attributes"; description = "An Attribute class to be used with pandocfilters"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ vcanadi ]; diff --git a/pkgs/development/python-modules/pandocfilters/default.nix b/pkgs/development/python-modules/pandocfilters/default.nix index a6edb89dcabde..5b87593e0c679 100644 --- a/pkgs/development/python-modules/pandocfilters/default.nix +++ b/pkgs/development/python-modules/pandocfilters/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec{ meta = with stdenv.lib; { description = "A python module for writing pandoc filters, with a collection of examples"; - homepage = https://github.com/jgm/pandocfilters; + homepage = "https://github.com/jgm/pandocfilters"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 0047548779c34..fe401d9483e2e 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -7,15 +7,16 @@ , markdown , pyct , testpath +, tqdm }: buildPythonPackage rec { pname = "panel"; - version = "0.7.0"; + version = "0.8.3"; src = fetchPypi { inherit pname version; - sha256 = "71d446f469b424cb190bc896e78d0415b2bbebf17c6e5b024ed1a73b4448f8f4"; + sha256 = "0iz20k7mqn0560r4358yrzvrrfn00h8s6dim7p7y4icpgjw2mjnb"; }; propagatedBuildInputs = [ @@ -25,6 +26,7 @@ buildPythonPackage rec { markdown pyct testpath + tqdm ]; # infinite recursion in test dependencies (hvplot) @@ -32,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "A high level dashboarding library for python visualization libraries"; - homepage = https://pyviz.org; + homepage = "https://pyviz.org"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index ffe0fbc5da582..baa2ae7e44982 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Parametrize and run Jupyter and nteract Notebooks"; - homepage = https://github.com/nteract/papermill; + homepage = "https://github.com/nteract/papermill"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix index 7999ce03efe00..c439b4099a003 100644 --- a/pkgs/development/python-modules/paperspace/default.nix +++ b/pkgs/development/python-modules/paperspace/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python API for Paperspace Cloud"; - homepage = https://paperspace.com; + homepage = "https://paperspace.com"; license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/python-modules/papis-python-rofi/default.nix b/pkgs/development/python-modules/papis-python-rofi/default.nix index 1344e1588cd52..8750b96f5c90f 100644 --- a/pkgs/development/python-modules/papis-python-rofi/default.nix +++ b/pkgs/development/python-modules/papis-python-rofi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = { description = "A Python module to make simple GUIs with Rofi"; - homepage = https://github.com/alejandrogallo/python-rofi; + homepage = "https://github.com/alejandrogallo/python-rofi"; license = lib.licenses.mit; maintainers = [ lib.maintainers.nico202 ]; }; diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index f770fecd5e59a..39b324dd55c3c 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = { description = "Powerful command-line document and bibliography manager"; - homepage = https://papis.readthedocs.io/en/latest/; + homepage = "https://papis.readthedocs.io/en/latest/"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ nico202 teto ]; }; diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index d6b35725c76e8..096bb2cfb9101 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "param"; - version = "1.9.2"; + version = "1.9.3"; src = fetchPypi { inherit pname version; - sha256 = "a2dcb07c6a4ff48bade69bb5d30d84a96911a7e9dcb76b6de975453f933332f8"; + sha256 = "10crjlsn5vx03xwlnhga9faqq2rlw0qwabi45vnvhmz22qbd8w43"; }; checkInputs = [ flake8 nose ]; @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Declarative Python programming using Parameters"; - homepage = https://github.com/pyviz/param; + homepage = "https://github.com/pyviz/param"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index f5dd38cc743b7..fb921bb2938a9 100644 --- a/pkgs/development/python-modules/parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Parameterized testing with any Python test framework"; - homepage = https://pypi.python.org/pypi/parameterized; + homepage = "https://pypi.python.org/pypi/parameterized"; license = licenses.bsd3; maintainers = with maintainers; [ ma27 ]; }; diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index 029ce4a1712de..430d91a60ecc8 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Parameterization framework for parameterized model creation and handling"; - homepage = https://github.com/sods/paramz; + homepage = "https://github.com/sods/paramz"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix index 26a3a613be441..225ee12e51acf 100644 --- a/pkgs/development/python-modules/parfive/default.nix +++ b/pkgs/development/python-modules/parfive/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "A HTTP and FTP parallel file downloader"; - homepage = https://parfive.readthedocs.io/; + homepage = "https://parfive.readthedocs.io/"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index 04ad3ba9c18c3..cbf4ee0836e48 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/jenisys/parse_type; + homepage = "https://github.com/jenisys/parse_type"; description = "Simplifies to build parse types based on the parse module"; license = licenses.bsd3; maintainers = with maintainers; [ alunduil ]; diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index d79badd66c9e5..bb09646b6b46f 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.12.1"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "a5fca7000c6588d77bc65c28f3f21bfce03b5e44daa8f9f07c17fe364990d717"; + sha256 = "1h4m5df5grjpaf087g8ciishz5ajl28s3140s8bngppvy71f5m56"; }; checkPhase = '' @@ -15,7 +15,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/r1chardj0n3s/parse; + homepage = "https://github.com/r1chardj0n3s/parse"; description = "parse() is the opposite of format()"; license = licenses.bsdOriginal; maintainers = with maintainers; [ alunduil ]; diff --git a/pkgs/development/python-modules/parsel/default.nix b/pkgs/development/python-modules/parsel/default.nix index daaf845cdf0bb..319f83f727552 100644 --- a/pkgs/development/python-modules/parsel/default.nix +++ b/pkgs/development/python-modules/parsel/default.nix @@ -8,19 +8,20 @@ , w3lib , lxml , cssselect +, isPy27 }: buildPythonPackage rec { pname = "parsel"; - version = "1.5.2"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "08v76s6s4li7asnyz8a7gbp9vz522rv5apranyv76mb0lhmjd92d"; + sha256 = "0yawf9r3r863lwxj0n89i7h3n8xjbsl5b7n6xg76r68scl5yzvvh"; }; checkInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ functools32 six w3lib lxml cssselect ]; + propagatedBuildInputs = [ six w3lib lxml cssselect ] ++ lib.optionals isPy27 [ functools32 ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index 24fc578940567..c6a15b8c99fc1 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "A Python Parser"; - homepage = https://github.com/davidhalter/parso; + homepage = "https://github.com/davidhalter/parso"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/parsy/default.nix b/pkgs/development/python-modules/parsy/default.nix index c7ee17f8c8dc8..156da0885473b 100644 --- a/pkgs/development/python-modules/parsy/default.nix +++ b/pkgs/development/python-modules/parsy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.4"; meta = with lib; { - homepage = https://github.com/python-parsy/parsy; + homepage = "https://github.com/python-parsy/parsy"; description = "Easy-to-use parser combinators, for parsing in pure Python"; license = [ licenses.mit ]; maintainers = with maintainers; [ aepsil0n ]; diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index e8a148edb2318..584b4b4315c71 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { meta = { description = "Appendable key-value storage"; license = with lib.licenses; [ bsd3 ]; - homepage = https://github.com/dask/partd/; + homepage = "https://github.com/dask/partd/"; }; } diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix index c71e39ca111af..a51f1c003274c 100644 --- a/pkgs/development/python-modules/parver/default.nix +++ b/pkgs/development/python-modules/parver/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "parver"; - version = "0.2.1"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0jzyylcmjxb0agc4fpdnzdnv2ajvp99rs9pz7qcklnhlmy8scdqv"; + sha256 = "0a6jp17c1ag6b9yp5xgy9wvznk3g0v2f8gpwkcwxpyc9ygk98zdm"; }; propagatedBuildInputs = [ six attrs arpeggio ]; diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index e49ad50d91f45..84ace0bdb822f 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { meta = { description = "A password hashing library for Python"; - homepage = https://code.google.com/p/passlib/; + homepage = "https://code.google.com/p/passlib/"; }; } diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index 210996123a36d..a9c86513fe802 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tools for using a Web Server Gateway Interface stack"; - homepage = http://pythonpaste.org/; + homepage = "http://pythonpaste.org/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index 3301521b085ed..d2ca8d445e420 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Load, configure, and compose WSGI applications and servers"; - homepage = http://pythonpaste.org/deploy/; + homepage = "http://pythonpaste.org/deploy/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index dd93bd404d064..ce012c3d102aa 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pluggable command-line frontend, including commands to setup package file layouts"; - homepage = https://github.com/cdent/pastescript/; + homepage = "https://github.com/cdent/pastescript/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/patch/default.nix b/pkgs/development/python-modules/patch/default.nix index 1a7ce9539476e..a4af8319f622e 100644 --- a/pkgs/development/python-modules/patch/default.nix +++ b/pkgs/development/python-modules/patch/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library to parse and apply unified diffs"; - homepage = https://github.com/techtonik/python-patch/; + homepage = "https://github.com/techtonik/python-patch/"; license = licenses.mit; maintainers = [ maintainers.igsha ]; }; diff --git a/pkgs/development/python-modules/path-and-address/default.nix b/pkgs/development/python-modules/path-and-address/default.nix index 55d7afd9fa466..f30a6ddd40833 100644 --- a/pkgs/development/python-modules/path-and-address/default.nix +++ b/pkgs/development/python-modules/path-and-address/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Functions for server CLI applications used by humans"; - homepage = https://github.com/joeyespo/path-and-address; + homepage = "https://github.com/joeyespo/path-and-address"; license = licenses.mit; maintainers = with maintainers; [ koral]; }; diff --git a/pkgs/development/python-modules/path.py/2.nix b/pkgs/development/python-modules/path.py/2.nix index 318642a393a3f..fb4ff20b7076f 100644 --- a/pkgs/development/python-modules/path.py/2.nix +++ b/pkgs/development/python-modules/path.py/2.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { description = "A module wrapper for os.path"; - homepage = https://github.com/jaraco/path.py; + homepage = "https://github.com/jaraco/path.py"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix index 272c34df429e7..56e856cff9af3 100644 --- a/pkgs/development/python-modules/path.py/default.nix +++ b/pkgs/development/python-modules/path.py/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = { description = "A module wrapper for os.path"; - homepage = https://github.com/jaraco/path.py; + homepage = "https://github.com/jaraco/path.py"; license = lib.licenses.mit; }; @@ -45,7 +45,7 @@ buildPythonPackage rec { patches = [ (fetchpatch { - url = https://github.com/jaraco/path.py/commit/02eb16f0eb2cdc0015972ce963357aaa1cd0b84b.patch; + url = "https://github.com/jaraco/path.py/commit/02eb16f0eb2cdc0015972ce963357aaa1cd0b84b.patch"; sha256 = "0bqa8vjwil7jn35a6984adcm24pvv3pjkhszv10qv6yr442d1mk9"; }) ]; diff --git a/pkgs/development/python-modules/pathlib/default.nix b/pkgs/development/python-modules/pathlib/default.nix index d70178dac8572..cf4dd0999d4a3 100644 --- a/pkgs/development/python-modules/pathlib/default.nix +++ b/pkgs/development/python-modules/pathlib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "Object-oriented filesystem paths"; - homepage = https://pathlib.readthedocs.org/; + homepage = "https://pathlib.readthedocs.org/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index a81c652075c9e..6e04f2e7a0303 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems."; - homepage = https://pypi.python.org/pypi/pathlib2/; + homepage = "https://pypi.python.org/pypi/pathlib2/"; license = with lib.licenses; [ mit ]; }; } diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index e575aa333ebde..2b9134750fe2f 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Parallel graph management and execution in heterogeneous computing"; - homepage = https://github.com/uqfoundation/pathos/; + homepage = "https://github.com/uqfoundation/pathos/"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pathtools/default.nix b/pkgs/development/python-modules/pathtools/default.nix index 8709662e6a185..75901743c7e46 100644 --- a/pkgs/development/python-modules/pathtools/default.nix +++ b/pkgs/development/python-modules/pathtools/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pattern matching and various utilities for file systems paths"; - homepage = https://github.com/gorakhargosh/pathtools; + homepage = "https://github.com/gorakhargosh/pathtools"; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/patsy/default.nix b/pkgs/development/python-modules/patsy/default.nix index a21b4027bbb29..bd3c103b9a746 100644 --- a/pkgs/development/python-modules/patsy/default.nix +++ b/pkgs/development/python-modules/patsy/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = { description = "A Python package for describing statistical models"; - homepage = https://github.com/pydata/patsy; + homepage = "https://github.com/pydata/patsy"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ ilya-kolpakov ]; }; diff --git a/pkgs/development/python-modules/paver/default.nix b/pkgs/development/python-modules/paver/default.nix index 17ae2428b87a5..ec4a40fec1b4e 100644 --- a/pkgs/development/python-modules/paver/default.nix +++ b/pkgs/development/python-modules/paver/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python-based build/distribution/deployment scripting tool"; - homepage = https://github.com/paver/paver; + homepage = "https://github.com/paver/paver"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/paypalrestsdk/default.nix b/pkgs/development/python-modules/paypalrestsdk/default.nix index dbc918e6c0dc9..26c44f0b070be 100644 --- a/pkgs/development/python-modules/paypalrestsdk/default.nix +++ b/pkgs/development/python-modules/paypalrestsdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests six pyopenssl ]; meta = { - homepage = https://developer.paypal.com/; + homepage = "https://developer.paypal.com/"; description = "Python APIs to create, process and manage payment"; license = "PayPal SDK License"; }; diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 310d16026a973..4180d1069e498 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = http://docs.openstack.org/developer/pbr/; + homepage = "http://docs.openstack.org/developer/pbr/"; license = stdenv.lib.licenses.asl20; description = "Python Build Reasonableness"; }; diff --git a/pkgs/development/python-modules/pcpp/default.nix b/pkgs/development/python-modules/pcpp/default.nix index 1c032ea62b436..f621140f137b5 100644 --- a/pkgs/development/python-modules/pcpp/default.nix +++ b/pkgs/development/python-modules/pcpp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/ned14/pcpp; + homepage = "https://github.com/ned14/pcpp"; description = "A C99 preprocessor written in pure Python"; license = licenses.bsd0; maintainers = with maintainers; [ rakesh4g ]; diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix index 41009a4b7a27b..5fc61f6442387 100644 --- a/pkgs/development/python-modules/pdf2image/default.nix +++ b/pkgs/development/python-modules/pdf2image/default.nix @@ -2,18 +2,18 @@ buildPythonPackage rec { pname = "pdf2image"; - version = "1.10.0"; + version = "1.13.1"; propagatedBuildInputs = [ pillow poppler_utils ]; src = fetchPypi { inherit pname version; - sha256 = "0bpprn5wcz414pqpvwjpd5cc0838shkw2cfvrwfiilhr09bhxbhb"; + sha256 = "1l3jic687vnji952f4dp66jwiprpxskja9v4ffw3bpr6gxgq4syz"; }; meta = with stdenv.lib; { description = "A python module that wraps the pdftoppm utility to convert PDF to PIL Image object"; - homepage = https://github.com/Belval/pdf2image; + homepage = "https://github.com/Belval/pdf2image"; license = licenses.mit; maintainers = with maintainers; [ gerschtli ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/pdfkit/default.nix b/pkgs/development/python-modules/pdfkit/default.nix index 0d6edcbd3f48f..dc9d33ddf0df6 100644 --- a/pkgs/development/python-modules/pdfkit/default.nix +++ b/pkgs/development/python-modules/pdfkit/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/pdfkit; + homepage = "https://pypi.python.org/pypi/pdfkit"; description = "Wkhtmltopdf python wrapper to convert html to pdf using the webkit rendering engine and qt"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index ace2b618ef22d..979b116b71372 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, pycryptodome, chardet, nose, sortedcontainers, fetchpatch }: +{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, pycryptodome, chardet, nose, sortedcontainers }: buildPythonPackage rec { pname = "pdfminer_six"; - version = "20200402"; + version = "20200517"; disabled = !isPy3k; @@ -11,18 +11,9 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "1wl64r3ifpwi7mm5pcxc0ji7w380nxcq3zrv66n95lglm4zqkf26"; + sha256 = "00272pxkh6djm37yvlvgd06w7ycf35srwk6n3p58ppw5hgmpkhc2"; }; - patches = [ - # Add shebang line to scripts. See: https://github.com/pdfminer/pdfminer.six/pull/408 - (fetchpatch { - url = "https://github.com/pdfminer/pdfminer.six/commit/0c2f44b6de064d9a3cea99bde5b8e9c6a525a69c.patch"; - sha256 = "1vml66grnvg4g26mya24kiyxsz809d4mr7wz8qmawjbn4ss65y21"; - excludes = [ "CHANGELOG.md" ]; - }) - ]; - propagatedBuildInputs = [ chardet pycryptodome sortedcontainers ]; checkInputs = [ nose ]; @@ -37,4 +28,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ psyanticy marsam ]; }; } - diff --git a/pkgs/development/python-modules/pdfposter/default.nix b/pkgs/development/python-modules/pdfposter/default.nix new file mode 100644 index 0000000000000..43e2f1f57f752 --- /dev/null +++ b/pkgs/development/python-modules/pdfposter/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, pypdf2 }: + +buildPythonPackage rec { + pname = "pdftools.pdfposter"; + version = "0.7.post1"; + + propagatedBuildInputs = [ pypdf2 ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0c1avpbr9q53yzq5ar2x485rmp9d0l3z27aham32bg7gplzd7w0j"; + }; + + meta = with stdenv.lib; { + description = "Split large pages of a PDF into smaller ones for poster printing"; + homepage = "https://pdfposter.readthedocs.io"; + license = licenses.gpl3; + maintainers = with maintainers; [ wamserma ]; + }; +} diff --git a/pkgs/development/python-modules/pdfrw/default.nix b/pkgs/development/python-modules/pdfrw/default.nix new file mode 100644 index 0000000000000..15b8a8dc8d6b4 --- /dev/null +++ b/pkgs/development/python-modules/pdfrw/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pdfrw"; + version = "0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1x1yp63lg3jxpg9igw8lh5rc51q353ifsa1bailb4qb51r54kh0d"; + }; + + # tests require the extra download of github.com/pmaupin/static_pdfs + doCheck = false; + + meta = with stdenv.lib; { + description = "pdfrw is a pure Python library that reads and writes PDFs."; + homepage = "https://github.com/pmaupin/pdfrw"; + maintainers = with maintainers; [ teto ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pdftotext/default.nix b/pkgs/development/python-modules/pdftotext/default.nix index fc329009d313a..24be7ce7f8644 100644 --- a/pkgs/development/python-modules/pdftotext/default.nix +++ b/pkgs/development/python-modules/pdftotext/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple PDF text extraction"; - homepage = https://github.com/jalan/pdftotext; + homepage = "https://github.com/jalan/pdftotext"; license = licenses.mit; maintainers = with maintainers; [ earvstedt ]; }; diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 2c7832f6ab4b7..3cc5c3eec4966 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with stdenv.lib;{ description = "a small, expressive orm"; - homepage = http://peewee-orm.com; + homepage = "http://peewee-orm.com"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 7066ecd3a5277..c7c1ced34f144 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A tool to generate a static blog from reStructuredText or Markdown input files"; - homepage = http://getpelican.com/; + homepage = "http://getpelican.com/"; license = licenses.agpl3; maintainers = with maintainers; [ offline prikhi ]; }; diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index 354bded7b8cf9..77217d1c38d62 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python datetimes made easy"; - homepage = https://github.com/sdispater/pendulum; + homepage = "https://github.com/sdispater/pendulum"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pep257/default.nix b/pkgs/development/python-modules/pep257/default.nix index fc1028a0d1c1f..8f3a1e0ea8bd6 100644 --- a/pkgs/development/python-modules/pep257/default.nix +++ b/pkgs/development/python-modules/pep257/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/GreenSteam/pep257/; + homepage = "https://github.com/GreenSteam/pep257/"; description = "Python docstring style checker"; longDescription = "Static analysis tool for checking compliance with Python PEP 257."; license = licenses.mit; diff --git a/pkgs/development/python-modules/pep8-naming/default.nix b/pkgs/development/python-modules/pep8-naming/default.nix index 5c66eb6cad0ed..4b85ba47ab369 100644 --- a/pkgs/development/python-modules/pep8-naming/default.nix +++ b/pkgs/development/python-modules/pep8-naming/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pep8-naming"; - version = "0.9.1"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "a33d38177056321a167decd6ba70b890856ba5025f0a8eca6a3eda607da93caf"; + sha256 = "0fmzccbmr0jn9ynamdb9ly2ai8qs5qfk8alfgnzr3fbjvpwsbd7k"; }; propagatedBuildInputs = [ @@ -15,7 +15,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/PyCQA/pep8-naming; + homepage = "https://github.com/PyCQA/pep8-naming"; description = "Check PEP-8 naming conventions, plugin for flake8"; license = licenses.mit; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/development/python-modules/peppercorn/default.nix b/pkgs/development/python-modules/peppercorn/default.nix index 1fb661d53e79f..51114a591a57c 100644 --- a/pkgs/development/python-modules/peppercorn/default.nix +++ b/pkgs/development/python-modules/peppercorn/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library for converting a token stream into a data structure for use in web form posts"; - homepage = https://docs.pylonsproject.org/projects/peppercorn/en/latest/; + homepage = "https://docs.pylonsproject.org/projects/peppercorn/en/latest/"; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.all; }; diff --git a/pkgs/development/python-modules/percol/default.nix b/pkgs/development/python-modules/percol/default.nix index 2d11304900902..eddf58e559dca 100644 --- a/pkgs/development/python-modules/percol/default.nix +++ b/pkgs/development/python-modules/percol/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; meta = with lib; { - homepage = https://github.com/mooz/percol; + homepage = "https://github.com/mooz/percol"; description = "Adds flavor of interactive filtering to the traditional pipe concept of shell"; license = licenses.mit; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index 4e451e816c0a5..229e994b41b2a 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Performance plots for Python code snippets"; - homepage = https://github.com/nschloe/perfplot; + homepage = "https://github.com/nschloe/perfplot"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/periodictable/default.nix b/pkgs/development/python-modules/periodictable/default.nix index c88da3ff07f98..e353623268058 100644 --- a/pkgs/development/python-modules/periodictable/default.nix +++ b/pkgs/development/python-modules/periodictable/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec{ }; meta = { - homepage = http://www.reflectometry.org/danse/software.html; + homepage = "http://www.reflectometry.org/danse/software.html"; description = "an extensible periodic table of the elements prepopulated with data important to neutron and x-ray scattering experiments"; license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ rprospero ]; diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index 471552cdcc918..b59fa30357300 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distances and representations of persistence diagrams"; - homepage = https://persim.scikit-tda.org; + homepage = "https://persim.scikit-tda.org"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/persisting-theory/default.nix b/pkgs/development/python-modules/persisting-theory/default.nix index 3e729c2149edd..ca14f80868c8c 100644 --- a/pkgs/development/python-modules/persisting-theory/default.nix +++ b/pkgs/development/python-modules/persisting-theory/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { checkPhase = "nosetests"; meta = with stdenv.lib; { - homepage = https://code.eliotberriot.com/eliotberriot/persisting-theory; + homepage = "https://code.eliotberriot.com/eliotberriot/persisting-theory"; description = "Automate data discovering and access inside a list of packages"; license = licenses.bsd3; maintainers = with maintainers; [ mmai ]; diff --git a/pkgs/development/python-modules/pexif/default.nix b/pkgs/development/python-modules/pexif/default.nix index ac1c7de86820b..f3086b6b05530 100644 --- a/pkgs/development/python-modules/pexif/default.nix +++ b/pkgs/development/python-modules/pexif/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A module for editing JPEG EXIF data"; - homepage = http://www.benno.id.au/code/pexif/; + homepage = "http://www.benno.id.au/code/pexif/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pexpect/default.nix b/pkgs/development/python-modules/pexpect/default.nix index 01b16d5bd6390..4c287cfc37cc1 100644 --- a/pkgs/development/python-modules/pexpect/default.nix +++ b/pkgs/development/python-modules/pexpect/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ptyprocess ]; meta = with lib; { - homepage = http://www.noah.org/wiki/Pexpect; + homepage = "http://www.noah.org/wiki/Pexpect"; description = "Automate interactive console applications such as ssh, ftp, etc"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; diff --git a/pkgs/development/python-modules/pg8000/1_12.nix b/pkgs/development/python-modules/pg8000/1_12.nix index efeee5e077fba..bc4ff9f4f0318 100644 --- a/pkgs/development/python-modules/pg8000/1_12.nix +++ b/pkgs/development/python-modules/pg8000/1_12.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytz six ]; meta = with stdenv.lib; { - homepage = https://github.com/tlocke/pg8000; + homepage = "https://github.com/tlocke/pg8000"; description = "PostgreSQL interface library, for asyncio"; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 33790b97c4ed7..9131d8adaa22d 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ passlib ]; meta = with stdenv.lib; { - homepage = https://github.com/tlocke/pg8000; + homepage = "https://github.com/tlocke/pg8000"; description = "PostgreSQL interface library, for asyncio"; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 1165157feccf0..1668cd94ade98 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -3,6 +3,7 @@ , fetchPypi , isPy3k , pythonOlder +, setuptools , aenum , pytest , pytestcov @@ -10,16 +11,16 @@ buildPythonPackage rec { pname = "pglast"; - version = "1.10"; + version = "1.11"; src = fetchPypi { inherit pname version; - sha256 = "a26ba77127b363446955e8a5317b3194defb1c1bb9d2ed5e7d4830fd4f066d97"; + sha256 = "8463d60b9065daf26e3c0fa6e7515d2a4594847ab417be018858832a475105f1"; }; disabled = !isPy3k; - propagatedBuildInputs = lib.optionals (pythonOlder "3.6") [ aenum ]; + propagatedBuildInputs = [ setuptools ] ++ lib.optionals (pythonOlder "3.6") [ aenum ]; checkInputs = [ pytest pytestcov ]; diff --git a/pkgs/development/python-modules/pgpdump/default.nix b/pkgs/development/python-modules/pgpdump/default.nix index ea9ef0a156f06..0f200409622a8 100644 --- a/pkgs/development/python-modules/pgpdump/default.nix +++ b/pkgs/development/python-modules/pgpdump/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for parsing PGP packets"; - homepage = https://github.com/toofishes/python-pgpdump; + homepage = "https://github.com/toofishes/python-pgpdump"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pgpy/default.nix b/pkgs/development/python-modules/pgpy/default.nix index 50220bb3993da..9067817a3ba94 100644 --- a/pkgs/development/python-modules/pgpy/default.nix +++ b/pkgs/development/python-modules/pgpy/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/SecurityInnovation/PGPy; + homepage = "https://github.com/SecurityInnovation/PGPy"; description = "Pretty Good Privacy for Python 2 and 3"; longDescription = '' PGPy is a Python (2 and 3) library for implementing Pretty Good Privacy diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index ccca0dd155e7b..61ab5532ca9d2 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pgspecial"; - version = "1.11.9"; + version = "1.11.10"; src = fetchPypi { inherit pname version; - sha256 = "77f8651450ccbde7d3036cfe93486a4eeeb5ade28d1ebc4b2ba186fea0023c56"; + sha256 = "1jrq6bhzwvz6db8ays8zff15hbk1iazs2qxrzvrnlkgxxjkp8p7n"; }; checkInputs = [ pytest ]; @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Meta-commands handler for Postgres Database"; - homepage = https://pypi.python.org/pypi/pgspecial; + homepage = "https://pypi.python.org/pypi/pgspecial"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/phe/default.nix b/pkgs/development/python-modules/phe/default.nix index b016a9bd92c36..6a849734e9086 100644 --- a/pkgs/development/python-modules/phe/default.nix +++ b/pkgs/development/python-modules/phe/default.nix @@ -23,7 +23,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "A library for Partially Homomorphic Encryption in Python"; - homepage = https://github.com/n1analytics/python-paillier; + homepage = "https://github.com/n1analytics/python-paillier"; license = licenses.gpl3; }; } diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix index cef6173af3d95..ecfaf3c907800 100644 --- a/pkgs/development/python-modules/phik/default.nix +++ b/pkgs/development/python-modules/phik/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Phi_K correlation analyzer library"; longDescription = "Phi_K is a new and practical correlation coefficient based on several refinements to Pearson’s hypothesis test of independence of two variables."; - homepage = https://phik.readthedocs.io/en/latest/; + homepage = "https://phik.readthedocs.io/en/latest/"; maintainers = with maintainers; [ melsigl ]; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index f16bf3f014ce5..42621493d243d 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.0"; + version = "8.12.2"; src = fetchPypi { inherit pname version; - sha256 = "0mnicas0c5av322d7k6m14j3c10axh9mcvn3vx99vhngdnb9j6hn"; + sha256 = "000vhxjlgvs0w3vywlgx1kq8wj0wk07ybnsdn1qwbamd06msvbb1"; }; meta = { diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index e67932f4a8804..5dd4e25b6620f 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A package for phonon calculations at harmonic and quasi-harmonic levels"; - homepage = https://atztogo.github.io/phonopy/; + homepage = "https://atztogo.github.io/phonopy/"; license = licenses.bsd0; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/phpserialize/default.nix b/pkgs/development/python-modules/phpserialize/default.nix index 0ddeb99f10b1f..9323fe6a264fd 100644 --- a/pkgs/development/python-modules/phpserialize/default.nix +++ b/pkgs/development/python-modules/phpserialize/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = { description = "A port of the serialize and unserialize functions of PHP to Python"; - homepage = https://github.com/mitsuhiko/phpserialize; + homepage = "https://github.com/mitsuhiko/phpserialize"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/pickleshare/default.nix b/pkgs/development/python-modules/pickleshare/default.nix index b46207ae33dfa..496d20d52e3c1 100644 --- a/pkgs/development/python-modules/pickleshare/default.nix +++ b/pkgs/development/python-modules/pickleshare/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tiny 'shelve'-like database with concurrency support"; - homepage = https://github.com/vivainio/pickleshare; + homepage = "https://github.com/vivainio/pickleshare"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix index 8e45c43954d6c..2fad490bc4264 100644 --- a/pkgs/development/python-modules/pid/default.nix +++ b/pkgs/development/python-modules/pid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pid"; - version = "3.0.0"; + version = "3.0.3"; src = fetchPypi { inherit pname version; - sha256 = "0pdp8h1m4brxalcsmzzzmjj66vj98g6wigwmcdj5sf8p7insklgn"; + sha256 = "0z9w99m1vppppj2ypgm0flslgwcjjzlr7x3m62sccavgbg1n2nwj"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/piep/default.nix b/pkgs/development/python-modules/piep/default.nix index 0ef44f9817570..667a8e3b73711 100644 --- a/pkgs/development/python-modules/piep/default.nix +++ b/pkgs/development/python-modules/piep/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Bringing the power of python to stream editing"; - homepage = https://github.com/timbertson/piep; + homepage = "https://github.com/timbertson/piep"; maintainers = with maintainers; [ timbertson ]; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/piexif/default.nix b/pkgs/development/python-modules/piexif/default.nix index 595e246f7778b..af4b539d4574b 100644 --- a/pkgs/development/python-modules/piexif/default.nix +++ b/pkgs/development/python-modules/piexif/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simplify Exif manipulations with Python"; - homepage = https://github.com/hMatoba/Piexif; + homepage = "https://github.com/hMatoba/Piexif"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/pika-pool/default.nix b/pkgs/development/python-modules/pika-pool/default.nix index 5007fc78d10f7..c13490fb3e805 100644 --- a/pkgs/development/python-modules/pika-pool/default.nix +++ b/pkgs/development/python-modules/pika-pool/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pika ]; meta = with stdenv.lib; { - homepage = https://github.com/bninja/pika-pool; + homepage = "https://github.com/bninja/pika-pool"; license = licenses.bsdOriginal; description = "Pools for pikas."; }; diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index b09c4a240e51d..8b0807e3569b6 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pure-Python implementation of the AMQP 0-9-1 protocol"; - homepage = https://pika.readthedocs.org; + homepage = "https://pika.readthedocs.org"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 7b9393754a45b..f28ea5b24a635 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "1.10.2"; + version = "1.11.2"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1y94ay2jz4m55nlyrg283xsjqsxigmj7vzrzf1mskbpjb20335fb"; + sha256 = "03y6xkkqz6rsk23304gg0mn4vgdb0mh1wi9xzrk5vz2ma2wyp8i6"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix index 0f2a2bb4a8b79..019d5551a3a68 100644 --- a/pkgs/development/python-modules/pilkit/default.nix +++ b/pkgs/development/python-modules/pilkit/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { buildInputs = [ pillow nose_progressive nose mock blessings ]; meta = with stdenv.lib; { - homepage = https://github.com/matthewwithanm/pilkit/; + homepage = "https://github.com/matthewwithanm/pilkit/"; description = "A collection of utilities and processors for the Python Imaging Libary"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 7dc6ce9051b72..bdc1351be93e0 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://python-pillow.github.io/; + homepage = "https://python-pillow.github.io/"; description = "Fork of The Python Imaging Library (PIL)"; longDescription = '' The Python Imaging Library (PIL) adds image processing diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix index 4504886d03d09..c7037cf5385f7 100644 --- a/pkgs/development/python-modules/pims/default.nix +++ b/pkgs/development/python-modules/pims/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/soft-matter/pims; + homepage = "https://github.com/soft-matter/pims"; description = "Python Image Sequence: Load video and sequential images in many formats with a simple, consistent interface"; license = licenses.bsdOriginal; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 20a42cddcf9cc..02e6edfffce2f 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Keeps your pinned dependencies fresh"; - homepage = https://github.com/jazzband/pip-tools/; + homepage = "https://github.com/jazzband/pip-tools/"; license = licenses.bsd3; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index d1ffd0931b8b1..f4107dba8f366 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = { description = "The PyPA recommended tool for installing Python packages"; license = with lib.licenses; [ mit ]; - homepage = https://pip.pypa.io/; + homepage = "https://pip.pypa.io/"; priority = 10; }; } diff --git a/pkgs/development/python-modules/pip2nix/default.nix b/pkgs/development/python-modules/pip2nix/default.nix index 8854e7d567847..f6474883b83ae 100644 --- a/pkgs/development/python-modules/pip2nix/default.nix +++ b/pkgs/development/python-modules/pip2nix/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Generate Nix expressions for Python packages"; - homepage = https://github.com/johbo/pip2nix; + homepage = "https://github.com/johbo/pip2nix"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/pipdate/default.nix b/pkgs/development/python-modules/pipdate/default.nix index 93f38fb377967..8dff096557998 100644 --- a/pkgs/development/python-modules/pipdate/default.nix +++ b/pkgs/development/python-modules/pipdate/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "pip update helpers"; - homepage = https://github.com/nschloe/pipdate; + homepage = "https://github.com/nschloe/pipdate"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 4206b58032fb1..36427f9958596 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/coin3d/pivy/; + homepage = "https://github.com/coin3d/pivy/"; description = "A Python binding for Coin"; license = licenses.bsd0; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index 791905aef0f51..2e6fb7c470583 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Interface Python with pkg-config"; - homepage = https://github.com/matze/pkgconfig; + homepage = "https://github.com/matze/pkgconfig"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index 879274a16c325..55c954c20f942 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { doCheck = false; # I don't know why, but with doCheck = true it fails. meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/pkginfo; + homepage = "https://pypi.python.org/pypi/pkginfo"; license = licenses.mit; description = "Query metadatdata from sdists / bdists / installed packages"; diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix index 77bcf6cf4fc69..789f1ca1ff22a 100644 --- a/pkgs/development/python-modules/plac/default.nix +++ b/pkgs/development/python-modules/plac/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Parsing the Command Line the Easy Way"; - homepage = https://github.com/micheles/plac; + homepage = "https://github.com/micheles/plac"; license = licenses.bsdOriginal; maintainers = with maintainers; [ sdll ]; }; diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 428d88d183134..a41265165c7dc 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Python client library for the Plaid API and Link"; - homepage = https://github.com/plaid/plaid-python; + homepage = "https://github.com/plaid/plaid-python"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bhipple ]; }; diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index e794b53950ee8..262bdceb5db75 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { # Fix tests compatibility with PasteDeploy 2+ # https://github.com/Pylons/plaster_pastedeploy/pull/17 (fetchpatch { - url = https://github.com/Pylons/plaster_pastedeploy/commit/d77d81a57e917c67a20332beca8f418651172905.patch; + url = "https://github.com/Pylons/plaster_pastedeploy/commit/d77d81a57e917c67a20332beca8f418651172905.patch"; sha256 = "0n5vnqn8kad41kn9grcwiic6c6rhvy1ji3w81s2v9xyk0bd9yryf"; }) ]; diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index ed95de9ffde61..a387bc061146d 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "PlexAPI"; - version = "3.2.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "1rzy018zcsws56mcghnphhzwj650pwj7qg6nh9z1kjvgwwjfmghf"; + sha256 = "1y6mynsvkm9n2n927x8az9ch4blrjja7im9x7iyfrxahqgz0km77"; }; propagatedBuildInputs = [ requests tqdm websocket_client ]; diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix index 91592596ed43f..45e22a8788e1a 100644 --- a/pkgs/development/python-modules/plone-testing/default.nix +++ b/pkgs/development/python-modules/plone-testing/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Testing infrastructure for Zope and Plone projects"; - homepage = https://github.com/plone/plone.testing; + homepage = "https://github.com/plone/plone.testing"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index a71506c619799..2d14488c4ee24 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "4.4.1"; + version = "4.6.0"; src = fetchPypi { inherit pname version; - sha256 = "acc94f17452471ca3446c2ce491c4d1affb99b9ddd9eac4e05614ac4318f8780"; + sha256 = "0br996lqbyq1prq9hhrzkgpicz5fgvxamzjrrpms20a2y1alkwv1"; }; propagatedBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "Python plotting library for collaborative, interactive, publication-quality graphs"; - homepage = https://plot.ly/python/; + homepage = "https://plot.ly/python/"; license = with lib.licenses; [ mit ]; }; } diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix index c0d44e2851e27..c35fbf7bd13ae 100644 --- a/pkgs/development/python-modules/pluginbase/default.nix +++ b/pkgs/development/python-modules/pluginbase/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/mitsuhiko/pluginbase; + homepage = "https://github.com/mitsuhiko/pluginbase"; description = "A support library for building plugins sytems in Python"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/python-modules/ply/default.nix b/pkgs/development/python-modules/ply/default.nix index ae55cac642f58..e177ce709171e 100644 --- a/pkgs/development/python-modules/ply/default.nix +++ b/pkgs/development/python-modules/ply/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = http://www.dabeaz.com/ply/; + homepage = "http://www.dabeaz.com/ply/"; description = "PLY (Python Lex-Yacc), an implementation of the lex and yacc parsing tools for Python"; longDescription = '' PLY is an implementation of lex and yacc parsing tools for Python. @@ -39,4 +39,4 @@ buildPythonPackage rec { ''; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix index 0aa891cd5acf1..08a562c0133e1 100644 --- a/pkgs/development/python-modules/plyfile/default.nix +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "NumPy-based text/binary PLY file reader/writer for Python"; - homepage = https://github.com/dranjan/python-plyfile; + homepage = "https://github.com/dranjan/python-plyfile"; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/plyplus/default.nix b/pkgs/development/python-modules/plyplus/default.nix index 41327c6fc4869..4b9f1a9a0841f 100644 --- a/pkgs/development/python-modules/plyplus/default.nix +++ b/pkgs/development/python-modules/plyplus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = !isPy3k; meta = { - homepage = https://github.com/erezsh/plyplus; + homepage = "https://github.com/erezsh/plyplus"; description = "A general-purpose parser built on top of PLY"; maintainers = with lib.maintainers; [ twey ]; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix index 26c9a8af5e6ff..9b9b453e56a14 100644 --- a/pkgs/development/python-modules/plyvel/default.nix +++ b/pkgs/development/python-modules/plyvel/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fast and feature-rich Python interface to LevelDB"; platforms = platforms.unix; - homepage = https://github.com/wbolster/plyvel; + homepage = "https://github.com/wbolster/plyvel"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/podcastparser/default.nix b/pkgs/development/python-modules/podcastparser/default.nix index d2fc1093844e4..c65a37a99b9dc 100644 --- a/pkgs/development/python-modules/podcastparser/default.nix +++ b/pkgs/development/python-modules/podcastparser/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "podcastparser"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "gpodder"; repo = "podcastparser"; rev = version; - sha256 = "10bk93fqsws360q1gkjvfzjda3351169zbr6v5lq9raa3mg1ln52"; + sha256 = "1s83iq0mxcikxv6gi003iyavl1ai3siw1d7arijh0g28l0fff23a"; }; checkInputs = [ nose ]; @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { description = "podcastparser is a simple, fast and efficient podcast parser written in Python."; - homepage = http://gpodder.org/podcastparser/; + homepage = "http://gpodder.org/podcastparser/"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/podcats/default.nix b/pkgs/development/python-modules/podcats/default.nix index 8af9e759c953b..48504c8a3ee26 100644 --- a/pkgs/development/python-modules/podcats/default.nix +++ b/pkgs/development/python-modules/podcats/default.nix @@ -20,8 +20,7 @@ buildPythonPackage rec { meta = { description = "Application that generates RSS feeds for podcast episodes from local audio files"; - homepage = https://github.com/jakubroztocil/podcats; + homepage = "https://github.com/jakubroztocil/podcats"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 481fd2c5feb7f..46be9bc92a28f 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi, callPackage -, isPy27, isPy34, pythonOlder +, isPy27 +, pythonOlder , cleo , requests , cachy @@ -66,8 +67,7 @@ in buildPythonPackage rec { pexpect keyring lockfile - ] ++ lib.optionals (isPy27 || isPy34) [ typing pathlib2 glob2 ] - ++ lib.optionals isPy27 [ virtualenv functools32 subprocess32 ] + ] ++ lib.optionals isPy27 [ typing pathlib2 glob2 virtualenv functools32 subprocess32 ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; postInstall = '' diff --git a/pkgs/development/python-modules/polib/default.nix b/pkgs/development/python-modules/polib/default.nix index 2e3928b742c11..304ef95a88463 100644 --- a/pkgs/development/python-modules/polib/default.nix +++ b/pkgs/development/python-modules/polib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library to manipulate gettext files (po and mo files)"; - homepage = https://bitbucket.org/izi/polib/; + homepage = "https://bitbucket.org/izi/polib/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/polyline/default.nix b/pkgs/development/python-modules/polyline/default.nix index 6a5df880fd610..f1dcd699527a7 100644 --- a/pkgs/development/python-modules/polyline/default.nix +++ b/pkgs/development/python-modules/polyline/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/hicsail/polyline; + homepage = "https://github.com/hicsail/polyline"; license = licenses.mit; description = "Python implementation of Google's Encoded Polyline Algorithm Format."; longDescription = "polyline is a Python implementation of Google's Encoded Polyline Algorithm Format (http://goo.gl/PvXf8Y). It is essentially a port of https://github.com/mapbox/polyline built with Python 2 and 3 support in mind."; diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index 5f0c8cd8dad64..c3d5638841d60 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Probabilistic and graphical models for Python, implemented in cython for speed"; - homepage = https://github.com/jmschrei/pomegranate; + homepage = "https://github.com/jmschrei/pomegranate"; license = licenses.mit; maintainers = with maintainers; [ rybern ]; }; diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index 7a893384996d2..6f12a9e69810b 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/wbsoft/python-poppler-qt5; + homepage = "https://github.com/wbsoft/python-poppler-qt5"; license = licenses.gpl2; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index b3b98b2b2ec1d..82ac16e4027a6 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library to provide an easy API to file locking"; - homepage = https://github.com/WoLpH/portalocker; + homepage = "https://github.com/WoLpH/portalocker"; license = licenses.psfl; maintainers = with maintainers; [ jonringer ]; platforms = platforms.unix; # Windows has a dependency on pypiwin32 diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 6d7d7b2563dde..b5650f7dda017 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Monitor TCP ports for bound or unbound states"; - homepage = https://github.com/jaraco/portend; + homepage = "https://github.com/jaraco/portend"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/posix_ipc/default.nix b/pkgs/development/python-modules/posix_ipc/default.nix index c152b1537ecdb..adde770bbc44f 100644 --- a/pkgs/development/python-modules/posix_ipc/default.nix +++ b/pkgs/development/python-modules/posix_ipc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "POSIX IPC primitives (semaphores, shared memory and message queues)"; license = licenses.bsd3; - homepage = http://semanchuk.com/philip/posix_ipc/; + homepage = "http://semanchuk.com/philip/posix_ipc/"; }; } diff --git a/pkgs/development/python-modules/poster3/default.nix b/pkgs/development/python-modules/poster3/default.nix index 175faa343ca7c..269995717aa49 100644 --- a/pkgs/development/python-modules/poster3/default.nix +++ b/pkgs/development/python-modules/poster3/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Streaming HTTP uploads and multipart/form-data encoding"; - homepage = https://atlee.ca/software/poster/; + homepage = "https://atlee.ca/software/poster/"; license = licenses.mit; maintainers = with maintainers; [ WhittlesJr ]; }; diff --git a/pkgs/development/python-modules/power/default.nix b/pkgs/development/python-modules/power/default.nix index a54bd025dc7c0..b3d750f7e6526 100644 --- a/pkgs/development/python-modules/power/default.nix +++ b/pkgs/development/python-modules/power/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cross-platform system power status information"; - homepage = https://github.com/Kentzo/Power; + homepage = "https://github.com/Kentzo/Power"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index f8db636520fbd..3c4c6ae4ec7de 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -37,10 +37,14 @@ buildPythonPackage rec { install -dm755 "$out/share/tmux" install -m644 "powerline/bindings/tmux/powerline.conf" "$out/share/tmux/powerline.conf" + + install -dm755 "$out/share/fish/vendor_functions.d" + install -m644 "powerline/bindings/fish/powerline-setup.fish" "$out/share/fish/vendor_functions.d/powerline-setup.fish" + ''; meta = { - homepage = https://github.com/powerline/powerline; + homepage = "https://github.com/powerline/powerline"; description = "The ultimate statusline/prompt utility"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/pox/default.nix b/pkgs/development/python-modules/pox/default.nix index 3ae276ca28e1d..e4869a8f46cc7 100644 --- a/pkgs/development/python-modules/pox/default.nix +++ b/pkgs/development/python-modules/pox/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Utilities for filesystem exploration and automated builds"; license = licenses.bsd3; - homepage = https://github.com/uqfoundation/pox/; + homepage = "https://github.com/uqfoundation/pox/"; }; } diff --git a/pkgs/development/python-modules/poyo/default.nix b/pkgs/development/python-modules/poyo/default.nix index b6d2eb3bda9d2..3eff663aed9c9 100644 --- a/pkgs/development/python-modules/poyo/default.nix +++ b/pkgs/development/python-modules/poyo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/hackebrot/poyo; + homepage = "https://github.com/hackebrot/poyo"; description = "A lightweight YAML Parser for Python"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index 8731c997aa734..d8e8f33181f64 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Distributed and parallel python"; - homepage = https://github.com/uqfoundation; + homepage = "https://github.com/uqfoundation"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pplpy/default.nix b/pkgs/development/python-modules/pplpy/default.nix index a693c8cad4cc8..706c6251d3ac7 100644 --- a/pkgs/development/python-modules/pplpy/default.nix +++ b/pkgs/development/python-modules/pplpy/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python wrapper for ppl"; - homepage = https://gitlab.com/videlec/pplpy; + homepage = "https://gitlab.com/videlec/pplpy"; maintainers = with maintainers; [ timokau ]; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/pprintpp/default.nix b/pkgs/development/python-modules/pprintpp/default.nix index daf9d0062fb23..5b07613f098ac 100644 --- a/pkgs/development/python-modules/pprintpp/default.nix +++ b/pkgs/development/python-modules/pprintpp/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/wolever/pprintpp; + homepage = "https://github.com/wolever/pprintpp"; description = "A drop-in replacement for pprint that's actually pretty"; license = licenses.bsd2; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 972520793a404..efa12433c8a20 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Resolving Swagger/OpenAPI 2.0 and 3.0.0 Parser"; - homepage = https://github.com/jfinkhaeuser/prance; + homepage = "https://github.com/jfinkhaeuser/prance"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index f16937692c20f..71f34b6ec4d9c 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Low-level communication layer for PRAW"; - homepage = https://praw.readthedocs.org/; + homepage = "https://praw.readthedocs.org/"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix index 963aa19653b5a..6d0a7d301ede5 100644 --- a/pkgs/development/python-modules/pre-commit/default.nix +++ b/pkgs/development/python-modules/pre-commit/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonApplication, pythonOlder +{ lib, fetchPypi, buildPythonPackage, pythonOlder , aspy-yaml , cached-property , cfgv @@ -13,7 +13,7 @@ , virtualenv }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "pre-commit"; version = "1.21.0"; @@ -50,7 +50,7 @@ buildPythonApplication rec { meta = with lib; { description = "A framework for managing and maintaining multi-language pre-commit hooks"; - homepage = https://pre-commit.com/; + homepage = "https://pre-commit.com/"; license = licenses.mit; maintainers = with maintainers; [ borisbabic ]; }; diff --git a/pkgs/development/python-modules/precis-i18n/default.nix b/pkgs/development/python-modules/precis-i18n/default.nix index 4c50aaee706ab..199a6804ea987 100644 --- a/pkgs/development/python-modules/precis-i18n/default.nix +++ b/pkgs/development/python-modules/precis-i18n/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = { - homepage = https://github.com/byllyfish/precis_i18n; + homepage = "https://github.com/byllyfish/precis_i18n"; description = "Internationalized usernames and passwords"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/preggy/default.nix b/pkgs/development/python-modules/preggy/default.nix index cf2867322f7b6..a3ca7d15c77ed 100644 --- a/pkgs/development/python-modules/preggy/default.nix +++ b/pkgs/development/python-modules/preggy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Assertion library for Python"; - homepage = http://heynemann.github.io/preggy/; + homepage = "http://heynemann.github.io/preggy/"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index df9d58013025f..184f01c4592ff 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = { description = "Turns CSS blocks into style attributes "; - homepage = https://github.com/peterbe/premailer; + homepage = "https://github.com/peterbe/premailer"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix index 60f551bec16cf..050295204bc30 100644 --- a/pkgs/development/python-modules/preshed/default.nix +++ b/pkgs/development/python-modules/preshed/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cython hash tables that assume keys are pre-hashed"; - homepage = https://github.com/explosion/preshed; + homepage = "https://github.com/explosion/preshed"; license = licenses.mit; maintainers = with maintainers; [ sdll ]; }; diff --git a/pkgs/development/python-modules/pretend/default.nix b/pkgs/development/python-modules/pretend/default.nix index fed0499624afd..af5b339983150 100644 --- a/pkgs/development/python-modules/pretend/default.nix +++ b/pkgs/development/python-modules/pretend/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/alex/pretend; + homepage = "https://github.com/alex/pretend"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index be0fb7e4023ac..bf1035316a692 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format"; - homepage = http://code.google.com/p/prettytable/; + homepage = "http://code.google.com/p/prettytable/"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/priority/default.nix b/pkgs/development/python-modules/priority/default.nix index f6e7efb78c207..a699f6ff812f7 100644 --- a/pkgs/development/python-modules/priority/default.nix +++ b/pkgs/development/python-modules/priority/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://python-hyper.org/priority/; + homepage = "https://python-hyper.org/priority/"; description = "A pure-Python implementation of the HTTP/2 priority tree"; license = licenses.mit; maintainers = [ maintainers.qyliss ]; diff --git a/pkgs/development/python-modules/prison/default.nix b/pkgs/development/python-modules/prison/default.nix index 4993976b51df8..941da2bf9afd2 100644 --- a/pkgs/development/python-modules/prison/default.nix +++ b/pkgs/development/python-modules/prison/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Rison encoder/decoder"; - homepage = https://github.com/betodealmeida/python-rison; + homepage = "https://github.com/betodealmeida/python-rison"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/privacyidea/default.nix b/pkgs/development/python-modules/privacyidea/default.nix new file mode 100644 index 0000000000000..84cc4530b34e7 --- /dev/null +++ b/pkgs/development/python-modules/privacyidea/default.nix @@ -0,0 +1,51 @@ +{ lib, buildPythonPackage, fetchFromGitHub, cacert, openssl, python + +, cryptography, pyrad, pymysql, python-dateutil, flask-versioned, flask_script +, defusedxml, croniter, flask_migrate, pyjwt, configobj, sqlsoup, pillow +, python-gnupg, passlib, pyopenssl, beautifulsoup4, smpplib, flask-babel +, ldap3, huey, pyyaml, qrcode, oauth2client, requests, lxml, cbor2, psycopg2 + +, mock, pytest, responses, testfixtures +}: + +buildPythonPackage rec { + pname = "privacyIDEA"; + version = "3.3"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "188ki924dig899wlih45xfsm0s7mjkya56vii26bg02h91izrb4b"; + }; + + propagatedBuildInputs = [ + cryptography pyrad pymysql python-dateutil flask-versioned flask_script + defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow + python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel + ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2 + ]; + + checkInputs = [ openssl mock pytest responses testfixtures ]; + # issues with hardware token tests + doCheck = false; + + pythonImportsCheck = [ "privacyidea" ]; + + postPatch = '' + substituteInPlace privacyidea/lib/resolvers/LDAPIdResolver.py --replace \ + "/etc/privacyidea/ldap-ca.crt" \ + "${cacert}/etc/ssl/certs/ca-bundle.crt" + ''; + + postInstall = '' + rm -rf $out/${python.sitePackages}/tests + ''; + + meta = with lib; { + description = "Multi factor authentication system (2FA, MFA, OTP Server)"; + license = licenses.agpl3Plus; + homepage = "http://www.privacyidea.org"; + maintainers = [ maintainers.globin ]; + }; +} diff --git a/pkgs/development/python-modules/privacyidea/ldap-proxy.nix b/pkgs/development/python-modules/privacyidea/ldap-proxy.nix new file mode 100644 index 0000000000000..ec87186a4fddd --- /dev/null +++ b/pkgs/development/python-modules/privacyidea/ldap-proxy.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, twisted, ldaptor, configobj }: + +buildPythonPackage rec { + pname = "privacyidea-ldap-proxy"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "privacyidea"; + repo = pname; + rev = "v${version}"; + sha256 = "1kc1n9wr1a66xd5zvl6dq78xnkqkn5574jpzashc99pvm62dr24j"; + }; + + propagatedBuildInputs = [ twisted ldaptor configobj ]; + + # python 2 zope.interface test import path issues + doCheck = false; + + pythonImportsCheck = [ "pi_ldapproxy" ]; + + meta = with lib; { + description = "LDAP Proxy to intercept LDAP binds and authenticate against privacyIDEA"; + homepage = "https://github.com/privacyidea/privacyidea-ldap-proxy"; + license = licenses.agpl3; + maintainers = [ maintainers.globin ]; + }; +} diff --git a/pkgs/development/python-modules/proboscis/default.nix b/pkgs/development/python-modules/proboscis/default.nix index 3d99d9530f38d..9d4ae92f2c105 100644 --- a/pkgs/development/python-modules/proboscis/default.nix +++ b/pkgs/development/python-modules/proboscis/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python test framework that extends Python's built-in unittest module and Nose with features from TestNG"; - homepage = https://pypi.python.org/pypi/proboscis; + homepage = "https://pypi.python.org/pypi/proboscis"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/process-tests/default.nix b/pkgs/development/python-modules/process-tests/default.nix index 5ab27b67da40e..5ebda6bf04c8f 100644 --- a/pkgs/development/python-modules/process-tests/default.nix +++ b/pkgs/development/python-modules/process-tests/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tools for testing processes"; license = licenses.bsd2; - homepage = https://github.com/ionelmc/python-process-tests; + homepage = "https://github.com/ionelmc/python-process-tests"; }; } diff --git a/pkgs/development/python-modules/proglog/default.nix b/pkgs/development/python-modules/proglog/default.nix index d6fe22e17545e..ef5c21f450d52 100644 --- a/pkgs/development/python-modules/proglog/default.nix +++ b/pkgs/development/python-modules/proglog/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Logs and progress bars manager for Python"; - homepage = https://github.com/Edinburgh-Genome-Foundry/Proglog; + homepage = "https://github.com/Edinburgh-Genome-Foundry/Proglog"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/progress/default.nix b/pkgs/development/python-modules/progress/default.nix index d6c8d9125d167..9ebef268571cc 100644 --- a/pkgs/development/python-modules/progress/default.nix +++ b/pkgs/development/python-modules/progress/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/verigak/progress/; + homepage = "https://github.com/verigak/progress/"; description = "Easy to use progress bars"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix index fcd802b34875d..c756a41b5d0e9 100644 --- a/pkgs/development/python-modules/progressbar/default.nix +++ b/pkgs/development/python-modules/progressbar/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/progressbar; + homepage = "https://pypi.python.org/pypi/progressbar"; description = "Text progressbar library for python"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index aa6c9b709260f..69200d54571d2 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://progressbar-2.readthedocs.io/en/latest/; + homepage = "https://progressbar-2.readthedocs.io/en/latest/"; description = "Text progressbar library for python"; license = licenses.bsd3; maintainers = with maintainers; [ ashgillman ]; diff --git a/pkgs/development/python-modules/progressbar231/default.nix b/pkgs/development/python-modules/progressbar231/default.nix index f982596175451..5271912cc0ad5 100644 --- a/pkgs/development/python-modules/progressbar231/default.nix +++ b/pkgs/development/python-modules/progressbar231/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/progressbar231; + homepage = "https://pypi.python.org/pypi/progressbar231"; description = "Text progressbar library for python"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ twey ]; diff --git a/pkgs/development/python-modules/progressbar33/default.nix b/pkgs/development/python-modules/progressbar33/default.nix index f3b94436d4520..5aef284478497 100644 --- a/pkgs/development/python-modules/progressbar33/default.nix +++ b/pkgs/development/python-modules/progressbar33/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/progressbar33; + homepage = "https://pypi.python.org/pypi/progressbar33"; description = "Text progressbar library for python"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ twey ]; diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix index 17c04df814fa2..2c6bef0c201e4 100644 --- a/pkgs/development/python-modules/prometheus_client/default.nix +++ b/pkgs/development/python-modules/prometheus_client/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "Prometheus instrumentation library for Python applications"; - homepage = https://github.com/prometheus/client_python; + homepage = "https://github.com/prometheus/client_python"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/prompt_toolkit/1.nix b/pkgs/development/python-modules/prompt_toolkit/1.nix index c296af18de97c..bc39a8c922977 100644 --- a/pkgs/development/python-modules/prompt_toolkit/1.nix +++ b/pkgs/development/python-modules/prompt_toolkit/1.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { with it should run fine on both Unix and Windows systems. Also ships with a nice interactive Python shell (called ptpython) built on top. ''; - homepage = https://github.com/jonathanslenders/python-prompt-toolkit; + homepage = "https://github.com/jonathanslenders/python-prompt-toolkit"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix index 4ef7f2213664c..6932cd515c721 100644 --- a/pkgs/development/python-modules/prompt_toolkit/default.nix +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { with it should run fine on both Unix and Windows systems. Also ships with a nice interactive Python shell (called ptpython) built on top. ''; - homepage = https://github.com/jonathanslenders/python-prompt-toolkit; + homepage = "https://github.com/jonathanslenders/python-prompt-toolkit"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/property-manager/default.nix b/pkgs/development/python-modules/property-manager/default.nix index 30c720927e73d..55d7bafc014b5 100644 --- a/pkgs/development/python-modules/property-manager/default.nix +++ b/pkgs/development/python-modules/property-manager/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Useful property variants for Python programming"; - homepage = https://github.com/xolox/python-property-manager; + homepage = "https://github.com/xolox/python-property-manager"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; }; diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index e414dff8aa172..7f66549893bd5 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -60,7 +60,7 @@ buildPythonPackage { meta = { description = "Protocol Buffers are Google's data interchange format"; - homepage = https://developers.google.com/protocol-buffers/; + homepage = "https://developers.google.com/protocol-buffers/"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix index c6cb98e33b2fc..1dfc671c532b0 100644 --- a/pkgs/development/python-modules/prov/default.nix +++ b/pkgs/development/python-modules/prov/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python library for W3C Provenance Data Model (PROV)"; - homepage = https://github.com/trungdong/prov; + homepage = "https://github.com/trungdong/prov"; license = licenses.mit; maintainers = with maintainers; [ ashgillman ]; }; diff --git a/pkgs/development/python-modules/prox-tv/default.nix b/pkgs/development/python-modules/prox-tv/default.nix index 2568620f53939..1cc2ab89360f4 100644 --- a/pkgs/development/python-modules/prox-tv/default.nix +++ b/pkgs/development/python-modules/prox-tv/default.nix @@ -1,13 +1,11 @@ { lib , blas +, lapack , buildPythonPackage , cffi , fetchFromGitHub -, liblapack , nose , numpy -, openblas -, useOpenblas ? true }: buildPythonPackage { @@ -21,8 +19,6 @@ buildPythonPackage { sha256 = "0mlrjbb5rw78dgijkr3bspmsskk6jqs9y7xpsgs35i46dvb327q5"; }; - patches = lib.optional useOpenblas ./use-openblas.patch; - checkInputs = [ nose ]; @@ -32,17 +28,12 @@ buildPythonPackage { cffi ]; - buildInputs = ( - if useOpenblas then - [ openblas ] - else - [ blas liblapack ] - ); + buildInputs = [ blas lapack ]; enableParallelBuilding = true; meta = with lib; { - homepage = https://github.com/albarji/proxTV; + homepage = "https://github.com/albarji/proxTV"; description = "A toolbox for fast Total Variation proximity operators"; license = licenses.bsd2; maintainers = with maintainers; [ multun ]; diff --git a/pkgs/development/python-modules/prox-tv/use-openblas.patch b/pkgs/development/python-modules/prox-tv/use-openblas.patch deleted file mode 100644 index e96faa4d6000f..0000000000000 --- a/pkgs/development/python-modules/prox-tv/use-openblas.patch +++ /dev/null @@ -1,11 +0,0 @@ -index f100b35..448bbaf 100644 ---- a/prox_tv/prox_tv_build.py -+++ b/prox_tv/prox_tv_build.py -@@ -109,6 +109,6 @@ ffi.set_source( - define_macros=[('NOMATLAB', 1)], - extra_compile_args=extra_compile_args, - extra_link_args=extra_link_args, -- libraries=['blas', 'lapack'], -+ libraries=['openblas'], - include_dirs=['/usr/include'] - ) diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index edf502171e788..c66e1e2b40e6a 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Python package for reading Adobe Photoshop PSD files"; - homepage = https://github.com/kmike/psd-tools; + homepage = "https://github.com/kmike/psd-tools"; license = lib.licenses.mit; broken = true; # missing packbits from nixpkgs }; diff --git a/pkgs/development/python-modules/ptest/default.nix b/pkgs/development/python-modules/ptest/default.nix index bdd9fc5c47e16..0cdbeb372e3b5 100644 --- a/pkgs/development/python-modules/ptest/default.nix +++ b/pkgs/development/python-modules/ptest/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Test classes and test cases using decorators, execute test cases by command line, and get clear reports"; - homepage = https://pypi.python.org/pypi/ptest; + homepage = "https://pypi.python.org/pypi/ptest"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/ptyprocess/default.nix b/pkgs/development/python-modules/ptyprocess/default.nix index 5de528ccd4038..233dc6fb3148a 100644 --- a/pkgs/development/python-modules/ptyprocess/default.nix +++ b/pkgs/development/python-modules/ptyprocess/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = { description = "Run a subprocess in a pseudo terminal"; - homepage = https://github.com/pexpect/ptyprocess; + homepage = "https://github.com/pexpect/ptyprocess"; license = lib.licenses.isc; }; } diff --git a/pkgs/development/python-modules/publicsuffix2/default.nix b/pkgs/development/python-modules/publicsuffix2/default.nix new file mode 100644 index 0000000000000..fe360168aa5ab --- /dev/null +++ b/pkgs/development/python-modules/publicsuffix2/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, requests }: + +buildPythonPackage rec { + pname = "publicsuffix2"; + version = "2.20191221"; + + # Tests are missing in the sdist + # See: https://github.com/nexB/python-publicsuffix2/issues/12 + src = fetchFromGitHub { + owner = "nexB"; + repo = "python-publicsuffix2"; + rev = "release-2.2019-12-21"; + sha256 = "1dkvfvl0izq9hqzilnw8ipkbgjs9xyad9p21i3864hzinbh0wp9r"; + }; + + nativeBuildInputs = [ requests ]; + + meta = with stdenv.lib; { + description = '' + Get a public suffix for a domain name using the Public Suffix + List. Forked from and using the same API as the publicsuffix package. + ''; + homepage = "https://pypi.python.org/pypi/publicsuffix2/"; + license = licenses.mpl20; + }; +} diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix index 414c21b263c07..049d8720f4553 100644 --- a/pkgs/development/python-modules/pulp/default.nix +++ b/pkgs/development/python-modules/pulp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/coin-or/pulp; + homepage = "https://github.com/coin-or/pulp"; description = "PuLP is an LP modeler written in python"; maintainers = with maintainers; [ teto ]; license = licenses.mit; diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix new file mode 100644 index 0000000000000..dec80abda1513 --- /dev/null +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, libpulseaudio, glibc, substituteAll, stdenv, pulseaudio, python }: + +buildPythonPackage rec { + pname = "pulsectl"; + version = "20.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1m5fz740r4rk2i8qsnblsn16hai7givqxbx21swhpflan1yzvzzm"; + }; + + patches = [ + (substituteAll { + src = ./library-paths.patch; + libpulse = "${libpulseaudio.out}/lib/libpulse${stdenv.hostPlatform.extensions.sharedLibrary}"; + librt = "${glibc.out}/lib/librt${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + checkInputs = [ pulseaudio ]; + checkPhase = '' + ${python.interpreter} -m unittest pulsectl.tests.all + ''; + + meta = with lib; { + description = "Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)"; + homepage = "https://pypi.python.org/pypi/pulsectl/"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pulsectl/library-paths.patch b/pkgs/development/python-modules/pulsectl/library-paths.patch new file mode 100644 index 0000000000000..5840e515258da --- /dev/null +++ b/pkgs/development/python-modules/pulsectl/library-paths.patch @@ -0,0 +1,22 @@ +diff --git a/pulsectl/_pulsectl.py b/pulsectl/_pulsectl.py +index 4422ddf..3fb2f39 100644 +--- a/pulsectl/_pulsectl.py ++++ b/pulsectl/_pulsectl.py +@@ -31,7 +31,7 @@ else: + if not hasattr(mono_time, 'ts'): + class timespec(Structure): + _fields_ = [('tv_sec', c_long), ('tv_nsec', c_long)] +- librt = CDLL('librt.so.1', use_errno=True) ++ librt = CDLL('@librt@', use_errno=True) + mono_time.get = librt.clock_gettime + mono_time.get.argtypes = [c_int, POINTER(timespec)] + mono_time.ts = timespec +@@ -625,7 +625,7 @@ class LibPulse(object): + + + def __init__(self): +- p = CDLL(ctypes.util.find_library('libpulse') or 'libpulse.so.0') ++ p = CDLL('@libpulse@') + + self.funcs = dict() + for k, spec in self.func_defs.items(): diff --git a/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix b/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix index 51db97835553b..acb9b73403b39 100644 --- a/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix +++ b/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure python implementation of the adb client"; - homepage = https://github.com/JeffLIrion/pure-python-adb; + homepage = "https://github.com/JeffLIrion/pure-python-adb"; license = licenses.mit; maintainers = [ maintainers.makefu ]; }; diff --git a/pkgs/development/python-modules/purepng/default.nix b/pkgs/development/python-modules/purepng/default.nix index c6f28067bf697..fe504a0776b70 100644 --- a/pkgs/development/python-modules/purepng/default.nix +++ b/pkgs/development/python-modules/purepng/default.nix @@ -40,7 +40,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Pure Python library for PNG image encoding/decoding"; - homepage = https://github.com/scondo/purepng; + homepage = "https://github.com/scondo/purepng"; license = licenses.mit; maintainers = with maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/pushbullet/default.nix b/pkgs/development/python-modules/pushbullet/default.nix index 74c0f66b91eb2..b9c2a84728fa6 100644 --- a/pkgs/development/python-modules/pushbullet/default.nix +++ b/pkgs/development/python-modules/pushbullet/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "A simple python client for pushbullet.com"; - homepage = https://github.com/randomchars/pushbullet.py; + homepage = "https://github.com/randomchars/pushbullet.py"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pushover-complete/default.nix b/pkgs/development/python-modules/pushover-complete/default.nix index b526ba6cab119..e588ae9f796eb 100644 --- a/pkgs/development/python-modules/pushover-complete/default.nix +++ b/pkgs/development/python-modules/pushover-complete/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python package for interacting with *all* aspects of the Pushover API"; - homepage = https://github.com/scolby33/pushover_complete; + homepage = "https://github.com/scolby33/pushover_complete"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/pushover/default.nix b/pkgs/development/python-modules/pushover/default.nix index 3ff449037ea72..72d38259129e3 100644 --- a/pkgs/development/python-modules/pushover/default.nix +++ b/pkgs/development/python-modules/pushover/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Bindings and command line utility for the Pushover notification service"; - homepage = https://github.com/Thibauth/python-pushover; + homepage = "https://github.com/Thibauth/python-pushover"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index d1eeb3e31d062..e03543fb52065 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://pvlib-python.readthedocs.io; + homepage = "https://pvlib-python.readthedocs.io"; description = "Simulate the performance of photovoltaic energy systems"; license = licenses.bsd3; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/python-modules/pweave/default.nix b/pkgs/development/python-modules/pweave/default.nix index 13f237750debf..aba58b54c3b53 100644 --- a/pkgs/development/python-modules/pweave/default.nix +++ b/pkgs/development/python-modules/pweave/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Scientific reports with embedded python computations with reST, LaTeX or markdown"; - homepage = http://mpastell.com/pweave/ ; + homepage = "http://mpastell.com/pweave/"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/py-lru-cache/default.nix b/pkgs/development/python-modules/py-lru-cache/default.nix index b1d8c4f2946de..08630928f23b9 100644 --- a/pkgs/development/python-modules/py-lru-cache/default.nix +++ b/pkgs/development/python-modules/py-lru-cache/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "An in-memory LRU cache for python"; - homepage = https://github.com/stucchio/Python-LRU-cache; + homepage = "https://github.com/stucchio/Python-LRU-cache"; license = licenses.gpl3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/py-multibase/default.nix b/pkgs/development/python-modules/py-multibase/default.nix new file mode 100644 index 0000000000000..59876b473a913 --- /dev/null +++ b/pkgs/development/python-modules/py-multibase/default.nix @@ -0,0 +1,46 @@ +{ buildPythonPackage +, fetchPypi +, isPy27 +, lib +, morphys +, pytest +, pytestrunner +, python-baseconv +, six +}: +buildPythonPackage rec { + pname = "py-multibase"; + version = "1.0.1"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version ; + sha256 = "6ed706ea321b487ba82e4172a9c82d61dacd675c865f576a937a94bca1a23443"; + }; + + postPatch = '' + substituteInPlace setup.cfg --replace "[pytest]" "" + substituteInPlace setup.cfg --replace "python_classes = *TestCase" "" + ''; + + nativeBuildInputs = [ + pytestrunner + ]; + + propagatedBuildInputs = [ + morphys + six + python-baseconv + ]; + + checkInputs = [ + pytest + ]; + + meta = with lib; { + description = "Multibase is a protocol for distinguishing base encodings and other simple string encodings"; + homepage = "https://github.com/multiformats/py-multibase"; + license = licenses.mit; + maintainers = with maintainers; [ rakesh4g ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/py-multihash/default.nix b/pkgs/development/python-modules/py-multihash/default.nix new file mode 100644 index 0000000000000..f81b7fb764408 --- /dev/null +++ b/pkgs/development/python-modules/py-multihash/default.nix @@ -0,0 +1,49 @@ +{ base58 +, buildPythonPackage +, fetchPypi +, isPy27 +, lib +, morphys +, pytest +, pytestcov +, pytestrunner +, six +, variants +, varint +}: + +buildPythonPackage rec { + pname = "py-multihash"; + version = "0.2.3"; + + src = fetchPypi { + inherit pname version ; + sha256 = "f0ade4de820afdc4b4aaa40464ec86c9da5cae3a4578cda2daab4b0eb7e5b18d"; + }; + + nativeBuildInputs = [ + pytestrunner + ]; + + propagatedBuildInputs = [ + base58 + morphys + six + variants + varint + ]; + + checkInputs = [ + pytest + pytestcov + ]; + + disabled = isPy27; + + meta = with lib; { + description = "Self describing hashes - for future proofing"; + homepage = "https://github.com/multiformats/py-multihash"; + license = licenses.mit; + maintainers = with maintainers; [ rakesh4g ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/py-radix/default.nix b/pkgs/development/python-modules/py-radix/default.nix index b06de3a27a7fd..16a362591dd74 100644 --- a/pkgs/development/python-modules/py-radix/default.nix +++ b/pkgs/development/python-modules/py-radix/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python radix tree for IPv4 and IPv6 prefix matching"; - homepage = https://github.com/mjschultz/py-radix; + homepage = "https://github.com/mjschultz/py-radix"; license = with licenses; [ isc bsdOriginal ]; maintainers = with maintainers; [ mkg ]; }; diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix index b0ca5c262cfdb..f85312880075c 100644 --- a/pkgs/development/python-modules/py-vapid/default.nix +++ b/pkgs/development/python-modules/py-vapid/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "VAPID is a voluntary standard for WebPush subscription providers"; - homepage = https://github.com/mozilla-services/vapid; + homepage = "https://github.com/mozilla-services/vapid"; license = licenses.mpl20; }; } diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index 7b84d72fde48b..5da15bb91f48b 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library with cross-python path, ini-parsing, io, code, log facilities"; - homepage = https://pylib.readthedocs.org/; + homepage = "https://pylib.readthedocs.org/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/py3dns/default.nix b/pkgs/development/python-modules/py3dns/default.nix index 5a28a045c3e44..223e6c0ab7a40 100644 --- a/pkgs/development/python-modules/py3dns/default.nix +++ b/pkgs/development/python-modules/py3dns/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python 3 DNS library"; - homepage = https://launchpad.net/py3dns; + homepage = "https://launchpad.net/py3dns"; license = licenses.psfl; }; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index d2a2b50d3c055..fda91e8a30538 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Extensible i3status wrapper"; license = licenses.bsd3; - homepage = https://github.com/ultrabug/py3status; + homepage = "https://github.com/ultrabug/py3status"; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix index a442dfa097b9d..3724687463cfd 100644 --- a/pkgs/development/python-modules/py4j/default.nix +++ b/pkgs/development/python-modules/py4j/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Py4J enables Python programs running in a Python interpreter to dynamically access Java objects in a Java Virtual Machine. Methods are called as if the Java objects resided in the Python interpreter and Java collections can be accessed through standard Python collection methods. Py4J also enables Java programs to call back Python objects."; - homepage = https://www.py4j.org/; + homepage = "https://www.py4j.org/"; license = licenses.bsd3; maintainers = [ maintainers.shlevy ]; }; diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index 2102554facebf..cf0784024f179 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "PyGithub"; - version = "1.47"; + version = "1.51"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "v${version}"; - sha256 = "0zvp1gib2lryw698vxkbdv40n3lsmdlhwp7vdcg41dqqa5nfryhn"; + hash = "sha256-8uQCFiw1ByPOX8ZRUlSLYPIibjmd19r/JtTnmQdz5cM="; }; checkInputs = [ httpretty parameterized pytestCheckHook ]; diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py_scrypt/default.nix index 0c2d5eb5c02b2..056a0299670dd 100644 --- a/pkgs/development/python-modules/py_scrypt/default.nix +++ b/pkgs/development/python-modules/py_scrypt/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Bindings for scrypt key derivation function library"; - homepage = https://pypi.python.org/pypi/scrypt; + homepage = "https://pypi.python.org/pypi/scrypt"; maintainers = with maintainers; [ asymmetric ]; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/py_stringmatching/default.nix b/pkgs/development/python-modules/py_stringmatching/default.nix index 16b98320e8e4c..f44071502049d 100644 --- a/pkgs/development/python-modules/py_stringmatching/default.nix +++ b/pkgs/development/python-modules/py_stringmatching/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python string matching library including string tokenizers and string similarity measures"; - homepage = https://sites.google.com/site/anhaidgroup/projects/magellan/py_stringmatching; + homepage = "https://sites.google.com/site/anhaidgroup/projects/magellan/py_stringmatching"; license = licenses.bsd3; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/pyaes/default.nix b/pkgs/development/python-modules/pyaes/default.nix index 5ca837cdee48e..2674211479fd7 100644 --- a/pkgs/development/python-modules/pyaes/default.nix +++ b/pkgs/development/python-modules/pyaes/default.nix @@ -12,6 +12,6 @@ buildPythonPackage rec { meta = { description = "Pure-Python AES"; license = lib.licenses.mit; - homepage = https://github.com/ricmoo/pyaes; + homepage = "https://github.com/ricmoo/pyaes"; }; } diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix index 010c2805d2b6f..58eb5f7028ac1 100644 --- a/pkgs/development/python-modules/pyairvisual/default.nix +++ b/pkgs/development/python-modules/pyairvisual/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { meta = with lib; { description = "A thin Python wrapper for the AirVisual API"; license = licenses.mit; - homepage = https://github.com/bachya/pyairvisual; + homepage = "https://github.com/bachya/pyairvisual"; }; } diff --git a/pkgs/development/python-modules/pyalgotrade/default.nix b/pkgs/development/python-modules/pyalgotrade/default.nix index 7602caf24cf16..3703b5fcca4c1 100644 --- a/pkgs/development/python-modules/pyalgotrade/default.nix +++ b/pkgs/development/python-modules/pyalgotrade/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Algorithmic Trading"; - homepage = http://gbeced.github.io/pyalgotrade/; + homepage = "http://gbeced.github.io/pyalgotrade/"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/pyamf/default.nix b/pkgs/development/python-modules/pyamf/default.nix index 5ac6ef82964cc..1c31efadff7ce 100644 --- a/pkgs/development/python-modules/pyamf/default.nix +++ b/pkgs/development/python-modules/pyamf/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "AMF (Action Message Format) support for Python"; - homepage = https://pypi.python.org/pypi/PyAMF; + homepage = "https://pypi.python.org/pypi/PyAMF"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pyamg/default.nix b/pkgs/development/python-modules/pyamg/default.nix index b299e44f3e347..f229ef5839e91 100644 --- a/pkgs/development/python-modules/pyamg/default.nix +++ b/pkgs/development/python-modules/pyamg/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Algebraic Multigrid Solvers in Python"; - homepage = https://github.com/pyamg/pyamg; + homepage = "https://github.com/pyamg/pyamg"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index 6aeb37cfff6b2..1d0168b6bfa3f 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "PyYAML-based module to produce pretty and readable YAML-serialized data"; - homepage = https://github.com/mk-fg/pretty-yaml; + homepage = "https://github.com/mk-fg/pretty-yaml"; license = lib.licenses.wtfpl; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix index 06dcdf83bccac..a2dd4eaf7cf0a 100644 --- a/pkgs/development/python-modules/pyannotate/default.nix +++ b/pkgs/development/python-modules/pyannotate/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/dropbox/pyannotate; + homepage = "https://github.com/dropbox/pyannotate"; description = "Auto-generate PEP-484 annotations"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index a63e32f9da67f..82f8f5da3d9c9 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,28 +1,19 @@ -{ lib, fetchpatch, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }: let - _arrow-cpp = arrow-cpp.override { inherit python; }; + _arrow-cpp = arrow-cpp.override { python3 = python; }; in buildPythonPackage rec { pname = "pyarrow"; + disabled = !isPy3k; inherit (_arrow-cpp) version src; - patches = [ - # Remove when updating pkgs.arrow-cpp to 0.17 - (fetchpatch { - name = "ARROW-8106-fix-conversion-test"; - url = "https://github.com/apache/arrow/commit/af20bbff30adc560d7e57dd921345d00cc8b870c.patch"; - sha256 = "0ihpw589vh35va31ajzy5zpx3bqd9gdn3342rghi03r245kch9zd"; - stripLen = 1; - }) - ]; - sourceRoot = "apache-arrow-${version}/python"; nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; - propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ]; + propagatedBuildInputs = [ numpy six ]; checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ]; PYARROW_BUILD_TYPE = "release"; @@ -53,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "A cross-language development platform for in-memory data"; - homepage = https://arrow.apache.org/; + homepage = "https://arrow.apache.org/"; license = lib.licenses.asl20; platforms = platforms.unix; maintainers = with lib.maintainers; [ veprbl ]; diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index 4ed93f6355199..83cb8f654e2c0 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A collection of ASN.1-based protocols modules"; - homepage = https://pypi.python.org/pypi/pyasn1-modules; + homepage = "https://pypi.python.org/pypi/pyasn1-modules"; license = licenses.bsd3; platforms = platforms.unix; # same as pyasn1 }; diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix index e1d61866f90d2..206db053a564e 100644 --- a/pkgs/development/python-modules/pyasn1/default.nix +++ b/pkgs/development/python-modules/pyasn1/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "ASN.1 tools for Python"; - homepage = http://pyasn1.sourceforge.net/; + homepage = "http://pyasn1.sourceforge.net/"; license = "mBSD"; platforms = platforms.unix; # arbitrary choice }; diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 5036307982bd6..d9f602aa7e21c 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple API to access Netatmo weather station data"; license = licenses.mit; - homepage = https://github.com/jabesq/netatmo-api-python; + homepage = "https://github.com/jabesq/netatmo-api-python"; maintainers = with maintainers; [ delroth ]; }; } diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 8e6678a42b96e..b704e54321b96 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python client bindings for D-Bus AT-SPI"; - homepage = https://wiki.linuxfoundation.org/accessibility/d-bus; + homepage = "https://wiki.linuxfoundation.org/accessibility/d-bus"; license = licenses.gpl2; maintainers = with maintainers; [ jtojnar ]; platforms = with platforms; unix; diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index ae2780e1dc35f..19aa73bec5981 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python client library for the Apple TV"; - homepage = https://github.com/postlund/pyatv; + homepage = "https://github.com/postlund/pyatv"; license = licenses.mit; maintainers = with maintainers; [ elseym ]; }; diff --git a/pkgs/development/python-modules/pyaudio/default.nix b/pkgs/development/python-modules/pyaudio/default.nix index 62fec908a4d37..91791f5a06744 100644 --- a/pkgs/development/python-modules/pyaudio/default.nix +++ b/pkgs/development/python-modules/pyaudio/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for PortAudio"; - homepage = https://people.csail.mit.edu/hubert/pyaudio/; + homepage = "https://people.csail.mit.edu/hubert/pyaudio/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pyavm/default.nix b/pkgs/development/python-modules/pyavm/default.nix index 2279f79281812..4535767a69c9d 100644 --- a/pkgs/development/python-modules/pyavm/default.nix +++ b/pkgs/development/python-modules/pyavm/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple pure-python AVM meta-data handling"; - homepage = http://astrofrog.github.io/pyavm/; + homepage = "http://astrofrog.github.io/pyavm/"; license = licenses.mit; maintainers = [ maintainers.smaret ]; }; diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index 85140d3db49b1..045cf19c8c001 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python3 Parser for Android XML file and get Application Name without using Androguard"; - homepage = https://github.com/appknox/pyaxmlparser; + homepage = "https://github.com/appknox/pyaxmlparser"; # Files from Androguard are licensed ASL 2.0 license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index 6c32de593c1de..6a141484bb4b5 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/pybase64; + homepage = "https://pypi.python.org/pypi/pybase64"; description = "Fast Base64 encoding/decoding"; license = licenses.bsd2; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/development/python-modules/pybfd/default.nix b/pkgs/development/python-modules/pybfd/default.nix index 29ae5ed3c5c88..d04d7bfb5af7d 100644 --- a/pkgs/development/python-modules/pybfd/default.nix +++ b/pkgs/development/python-modules/pybfd/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { LIBOPCODES_LIBRARY = "${libopcodes}/lib/libopcodes.so"; meta = { - homepage = https://github.com/Groundworkstech/pybfd; + homepage = "https://github.com/Groundworkstech/pybfd"; description = "A Python interface to the GNU Binary File Descriptor (BFD) library"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index dc9cbefe0b57d..1a06a699c32f8 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python tools for querying and manipulating BIDS datasets"; - homepage = https://github.com/bids-standard/pybids; + homepage = "https://github.com/bids-standard/pybids"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index a8c66a49fb8ce..3cfdbba31c1f3 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { ]; meta = { - homepage = https://github.com/pybind/pybind11; + homepage = "https://github.com/pybind/pybind11"; description = "Seamless operability between C++11 and Python"; longDescription = '' Pybind11 is a lightweight header-only library that exposes diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix index 79c015576a5bf..ee880fda39878 100644 --- a/pkgs/development/python-modules/pybindgen/default.nix +++ b/pkgs/development/python-modules/pybindgen/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = (!isPy3k); # Fails to import module 'cxxfilt' from pygccxml on Py3k meta = with stdenv.lib; { - homepage = https://github.com/gjcarneiro/pybindgen; + homepage = "https://github.com/gjcarneiro/pybindgen"; description = "Python Bindings Generator"; license = licenses.lgpl2; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/python-modules/pyblake2/default.nix b/pkgs/development/python-modules/pyblake2/default.nix index e106ee3f3f187..a0f62cf0e77f5 100644 --- a/pkgs/development/python-modules/pyblake2/default.nix +++ b/pkgs/development/python-modules/pyblake2/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { meta = { description = "BLAKE2 hash function extension module"; license = lib.licenses.publicDomain; - homepage = https://github.com/dchest/pyblake2; + homepage = "https://github.com/dchest/pyblake2"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pyblock/default.nix b/pkgs/development/python-modules/pyblock/default.nix index 4dcc343402565..e7af4f70b1e5e 100644 --- a/pkgs/development/python-modules/pyblock/default.nix +++ b/pkgs/development/python-modules/pyblock/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://www.centos.org/docs/5/html/5.4/Technical_Notes/python-pyblock.html; + homepage = "https://www.centos.org/docs/5/html/5.4/Technical_Notes/python-pyblock.html"; description = "Interface for working with block devices"; license = licenses.gpl2Plus; broken = isPy3k; # doesn't build on python 3, 2018-04-11 diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index e7ad1ef2d3515..f915c49835083 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python package for controlling Neato pybotvac Connected vacuum robot"; - homepage = https://github.com/stianaske/pybotvac; + homepage = "https://github.com/stianaske/pybotvac"; license = licenses.mit; maintainers = with maintainers; [ elseym ]; }; diff --git a/pkgs/development/python-modules/pybrowserid/default.nix b/pkgs/development/python-modules/pybrowserid/default.nix index 946fb1a054fe8..fe5ace886ac08 100644 --- a/pkgs/development/python-modules/pybrowserid/default.nix +++ b/pkgs/development/python-modules/pybrowserid/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for the BrowserID Protocol"; - homepage = https://github.com/mozilla/PyBrowserID; + homepage = "https://github.com/mozilla/PyBrowserID"; license = licenses.mpl20; maintainers = with maintainers; [ worldofpeace ]; }; diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index e2d391493d2d6..dfd29ce8bd5f7 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Open-source software for robot simulation, integrated with OpenAI Gym"; - homepage = https://pybullet.org/; + homepage = "https://pybullet.org/"; license = licenses.zlib; maintainers = with maintainers; [ timokau ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index c38366894dc6b..d61279e38d5d2 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, meson, ninja, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPy33, isPy3k }: +{ lib, fetchFromGitHub, meson, ninja, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPy3k }: buildPythonPackage rec { pname = "pycairo"; @@ -6,8 +6,6 @@ buildPythonPackage rec { format = "other"; - disabled = isPy33; - src = fetchFromGitHub { owner = "pygobject"; repo = "pycairo"; @@ -32,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python 2/3 bindings for cairo"; - homepage = https://pycairo.readthedocs.io/; + homepage = "https://pycairo.readthedocs.io/"; license = with licenses; [ lgpl2 mpl11 ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; diff --git a/pkgs/development/python-modules/pycallgraph/default.nix b/pkgs/development/python-modules/pycallgraph/default.nix index 9a6a3f4be2e96..293489cce05b1 100644 --- a/pkgs/development/python-modules/pycallgraph/default.nix +++ b/pkgs/development/python-modules/pycallgraph/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://pycallgraph.slowchop.com; + homepage = "http://pycallgraph.slowchop.com"; description = "Call graph visualizations for Python applications"; maintainers = with maintainers; [ auntie ]; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index b3e31a9bc7889..dc4ab1d4bbda4 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -28,7 +28,7 @@ in buildPythonPackage { meta = with stdenv.lib; { description = "Python wrapper to libcangjie"; - homepage = http://cangjians.github.io/projects/pycangjie/; + homepage = "http://cangjians.github.io/projects/pycangjie/"; license = licenses.lgpl3Plus; maintainers = [ maintainers.linquize ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index a9864a0f09536..a0a0ff76337b1 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Closed caption converter"; - homepage = https://github.com/pbs/pycaption; + homepage = "https://github.com/pbs/pycaption"; license = with licenses; [ asl20 ]; }; } diff --git a/pkgs/development/python-modules/pycarddav/default.nix b/pkgs/development/python-modules/pycarddav/default.nix index c5c6182e4e064..674c9e9af86bf 100644 --- a/pkgs/development/python-modules/pycarddav/default.nix +++ b/pkgs/development/python-modules/pycarddav/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Command-line interface carddav client"; - homepage = http://lostpackets.de/pycarddav; + homepage = "http://lostpackets.de/pycarddav"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index 22f519c048659..f44aa2e8f8e24 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/saghul/pycares; + homepage = "https://github.com/saghul/pycares"; description = "Interface for c-ares"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pycassa/default.nix b/pkgs/development/python-modules/pycassa/default.nix index d5b6805c2bb04..d366486c8f895 100644 --- a/pkgs/development/python-modules/pycassa/default.nix +++ b/pkgs/development/python-modules/pycassa/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "A python client library for Apache Cassandra"; - homepage = https://github.com/pycassa/pycassa; + homepage = "https://github.com/pycassa/pycassa"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/pycdio/default.nix b/pkgs/development/python-modules/pycdio/default.nix index 5b1d774c16958..d5633f9eaefaf 100644 --- a/pkgs/development/python-modules/pycdio/default.nix +++ b/pkgs/development/python-modules/pycdio/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/libcdio/; + homepage = "https://www.gnu.org/software/libcdio/"; description = "Wrapper around libcdio (CD Input and Control library)"; maintainers = with maintainers; [ rycee ]; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/pychart/default.nix b/pkgs/development/python-modules/pychart/default.nix index 259c87347d72e..98c3242cb29d3 100644 --- a/pkgs/development/python-modules/pychart/default.nix +++ b/pkgs/development/python-modules/pychart/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library for creating high quality encapsulated Postscript, PDF, PNG, or SVG charts"; - homepage = https://pypi.python.org/pypi/PyChart; + homepage = "https://pypi.python.org/pypi/PyChart"; license = licenses.gpl2; }; } diff --git a/pkgs/development/python-modules/pychef/default.nix b/pkgs/development/python-modules/pychef/default.nix index 51ce6241bb9c0..6d60573b96eb1 100644 --- a/pkgs/development/python-modules/pychef/default.nix +++ b/pkgs/development/python-modules/pychef/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/coderanger/pychef; + homepage = "https://github.com/coderanger/pychef"; description = "Python implementation of a Chef API client"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 4939cd18e43a7..cc69bbc9ee70c 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "4.2.0"; + version = "4.2.3"; src = fetchPypi { inherit pname version; - sha256 = "05h7ncymyh1715v2jkj312qza5qlqrz6yfpgyv4kdf1m07zh7pxh"; + sha256 = "1nqy9zvzxzncfmmbsj4ccb36gymh4pp1n1l9fdhv8fi0ai9b7dyp"; }; disabled = !isPy3k; @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Python 3.4+ to communicate with the Google Chromecast"; - homepage = https://github.com/balloob/pychromecast; + homepage = "https://github.com/balloob/pychromecast"; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix new file mode 100644 index 0000000000000..eaf20baf75c32 --- /dev/null +++ b/pkgs/development/python-modules/pyclipper/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, setuptools_scm +, cython +}: + +buildPythonPackage rec { + pname = "pyclipper"; + version = "1.1.0.post3"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "164yksvqwqvwzh8f8lq92asg87hd8rvcy2xb5vm4y4ccvd5xgb7i"; + }; + + nativeBuildInputs = [ + setuptools_scm + cython + ]; + + # Requires pytest_runner to perform tests, which requires deprecated + # features of setuptools. Seems better to not run tests. This should + # be fixed upstream. + doCheck = false; + pythonImportsCheck = [ "pyclipper" ]; + + meta = with stdenv.lib; { + description = "Cython wrapper for clipper library"; + homepage = "https://github.com/fonttools/pyclipper"; + license = licenses.mit; + maintainers = with maintainers; [ matthuszagh ]; + }; +} diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index e8daa3820769b..a51aa1b931aa7 100644 --- a/pkgs/development/python-modules/pycm/default.nix +++ b/pkgs/development/python-modules/pycm/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Multiclass confusion matrix library"; - homepage = https://pycm.ir; + homepage = "https://pycm.ir"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index acaf78cc4d296..289332eb7c485 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python style guide checker (formerly called pep8)"; - homepage = https://pycodestyle.readthedocs.io; + homepage = "https://pycodestyle.readthedocs.io"; license = licenses.mit; maintainers = with maintainers; [ kamadorueda diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index 0803d65893067..4015f9164e9de 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for reading and writing collada documents"; - homepage = http://pycollada.github.io/; + homepage = "http://pycollada.github.io/"; license = "BSD"; # they don't specify which BSD variant platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix index 7594c7c1e5703..330acab3e1d0b 100644 --- a/pkgs/development/python-modules/pycontracts/default.nix +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "PyContracts"; - version = "1.8.12"; + version = "1.8.14"; src = fetchPypi { inherit pname version; - sha256 = "e76adbd832deec28b2045a6094c5bb779a0b2cb1105a23b3efafe723e2c9937a"; + sha256 = "03q5m595ysjrc9h57m7prrca6b9l4yrzvdijnzxnhd61p7jzbh49"; }; buildInputs = [ nose ]; @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Allows to declare constraints on function parameters and return values"; - homepage = https://pypi.python.org/pypi/PyContracts; + homepage = "https://pypi.python.org/pypi/PyContracts"; license = licenses.lgpl2; }; } diff --git a/pkgs/development/python-modules/pycosat/default.nix b/pkgs/development/python-modules/pycosat/default.nix index ad49e38d06589..9fc633c6808b6 100644 --- a/pkgs/development/python-modules/pycosat/default.nix +++ b/pkgs/development/python-modules/pycosat/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = { description = "Bindings to picosat SAT solver"; - homepage = https://github.com/ContinuumIO/pycosat; + homepage = "https://github.com/ContinuumIO/pycosat"; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix index aec477d36a0de..584ba838cc297 100644 --- a/pkgs/development/python-modules/pycountry/default.nix +++ b/pkgs/development/python-modules/pycountry/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://bitbucket.org/flyingcircus/pycountry; + homepage = "https://bitbucket.org/flyingcircus/pycountry"; description = "ISO country, subdivision, language, currency and script definitions and their translations"; license = licenses.lgpl2; }; diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix index 4845c625652f2..ea7caba5eb4f1 100644 --- a/pkgs/development/python-modules/pycparser/default.nix +++ b/pkgs/development/python-modules/pycparser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "C parser in Python"; - homepage = https://github.com/eliben/pycparser; + homepage = "https://github.com/eliben/pycparser"; license = licenses.bsd3; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/pycrc/default.nix b/pkgs/development/python-modules/pycrc/default.nix index e9ea8646b4156..ca65f784038ae 100644 --- a/pkgs/development/python-modules/pycrc/default.nix +++ b/pkgs/development/python-modules/pycrc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = https://github.com/cristianav/PyCRC; + homepage = "https://github.com/cristianav/PyCRC"; description = "Python libraries for CRC calculations (it supports CRC-16, CRC-32, CRC-CCITT, etc)"; license = licenses.gpl3; maintainers = with maintainers; [ guibou ]; diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index e7858888d3610..a9a302cf51bd4 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = http://www.pycrypto.org/; + homepage = "http://www.pycrypto.org/"; description = "Python Cryptography Toolkit"; platforms = pycryptodome.meta.platforms; }; diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 17bb7c9dcd03a..cf88c6722a640 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = { - homepage = https://www.pycryptodome.org/; + homepage = "https://www.pycryptodome.org/"; description = "Python Cryptography Toolkit"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index bf6ac65fc7f66..5cc4446c5a3dd 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { meta = { description = "A self-contained cryptographic library for Python"; - homepage = https://www.pycryptodome.org; + homepage = "https://www.pycryptodome.org"; license = lib.licenses.bsd2; }; diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix index fc61d689329e0..c187c6a557614 100644 --- a/pkgs/development/python-modules/pyct/default.nix +++ b/pkgs/development/python-modules/pyct/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cli for python common tasks for users"; - homepage = https://github.com/pyviz/pyct; + homepage = "https://github.com/pyviz/pyct"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index 225c605a57fff..b9a75734b8e44 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -13,7 +13,6 @@ , python , mkDerivation , stdenv -, isPy3k }: let compyte = import ./compyte.nix { @@ -29,11 +28,12 @@ buildPythonPackage rec { sha256 = "ada56ce98a41f9f95fe18809f38afbae473a5c62d346cfa126a2d5477f24cc8a"; }; - preConfigure = '' + preConfigure = with stdenv.lib.versions; '' ${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \ --boost-lib-dir=${boost}/lib \ --no-use-shipped-boost \ - --boost-python-libname=boost_python${stdenv.lib.optionalString isPy3k "3"} + --boost-python-libname=boost_python${major python.version}${minor python.version} \ + --cuda-root=${cudatoolkit} ''; postInstall = '' @@ -61,7 +61,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/inducer/pycuda/; + homepage = "https://github.com/inducer/pycuda/"; description = "CUDA integration for Python."; license = licenses.mit; maintainers = with maintainers; [ artuuge ]; diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix index 28dff352e389f..789d9d4cb8ead 100644 --- a/pkgs/development/python-modules/pycups/default.nix +++ b/pkgs/development/python-modules/pycups/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings for libcups"; - homepage = http://cyberelk.net/tim/software/pycups/; + homepage = "http://cyberelk.net/tim/software/pycups/"; license = with licenses; [ gpl2Plus ]; }; } diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 36e5b96319e39..44ff6b7f08413 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ''; meta = { - homepage = http://pycurl.sourceforge.net/; + homepage = "http://pycurl.sourceforge.net/"; description = "Python wrapper for libcurl"; }; } diff --git a/pkgs/development/python-modules/pycurl2/default.nix b/pkgs/development/python-modules/pycurl2/default.nix index 478f4451cf7a5..1cdfb6c4413fc 100644 --- a/pkgs/development/python-modules/pycurl2/default.nix +++ b/pkgs/development/python-modules/pycurl2/default.nix @@ -25,7 +25,7 @@ buildPythonPackage { buildInputs = [ simplejson unittest2 nose ]; meta = with lib; { - homepage = https://pypi.python.org/pypi/pycurl2; + homepage = "https://pypi.python.org/pypi/pycurl2"; description = "A fork from original PycURL library that no maintained from 7.19.0"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 4e0623e5cc1e4..ef33b6fb2bd52 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.4"; + version = "1.5.1"; disabled = !isPy3k; src = fetchFromGitHub { owner = "samuelcolvin"; repo = pname; rev = "v${version}"; - sha256 = "1zmnwyvvrj6nb2r1wh63yb6dzqaxw8m4njzqycjdq9911c5gwg6z"; + sha256 = "0fwrx7p6d5vskg9ibganahiz9y9299idvdmzhjw62jy84gn1vrb4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydbus/default.nix b/pkgs/development/python-modules/pydbus/default.nix index 27b2d237cfcdc..09f777b018132 100644 --- a/pkgs/development/python-modules/pydbus/default.nix +++ b/pkgs/development/python-modules/pydbus/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pygobject3 ]; meta = { - homepage = https://github.com/LEW21/pydbus; + homepage = "https://github.com/LEW21/pydbus"; description = "Pythonic DBus library"; license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ gnidorah ]; diff --git a/pkgs/development/python-modules/pydenticon/default.nix b/pkgs/development/python-modules/pydenticon/default.nix index 9b650181e8cac..db04991e6ebc0 100644 --- a/pkgs/development/python-modules/pydenticon/default.nix +++ b/pkgs/development/python-modules/pydenticon/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow mock ]; meta = with stdenv.lib; { - homepage = https://github.com/azaghal/pydenticon; + homepage = "https://github.com/azaghal/pydenticon"; description = "Library for generating identicons. Port of Sigil (https://github.com/cupcake/sigil) with enhancements"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index 639bd99da33b5..6f4e4c97fd1c0 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -8,19 +8,19 @@ }: buildPythonPackage rec { - version = "1.4.1"; + version = "1.4.2"; pname = "pydicom"; src = fetchPypi { inherit pname version; - sha256 = "0ki4736h6mp77733rsrwicl8pyig39idywzcmwvw3nzi2r1yc7w8"; + sha256 = "1483hv74fhfk4q18r4rda7yixqqdxrd1djzp3492s81ykxd4k24l"; }; propagatedBuildInputs = [ numpy pillow ]; checkInputs = [ pytest pytestrunner ]; meta = with stdenv.lib; { - homepage = https://pydicom.github.io; + homepage = "https://pydicom.github.io"; description = "Pure-Python package for working with DICOM files"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/python-modules/pydispatcher/default.nix b/pkgs/development/python-modules/pydispatcher/default.nix index 68772cab30681..066410b7a0da7 100644 --- a/pkgs/development/python-modules/pydispatcher/default.nix +++ b/pkgs/development/python-modules/pydispatcher/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://pydispatcher.sourceforge.net/; + homepage = "http://pydispatcher.sourceforge.net/"; description = "Signal-registration and routing infrastructure for use in multiple contexts"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pydns/default.nix b/pkgs/development/python-modules/pydns/default.nix index 48bc3c3fa005e..399eab3e67423 100644 --- a/pkgs/development/python-modules/pydns/default.nix +++ b/pkgs/development/python-modules/pydns/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python DNS library"; - homepage = http://pydns.sourceforge.net/; + homepage = "http://pydns.sourceforge.net/"; license = licenses.psfl; }; diff --git a/pkgs/development/python-modules/pydocstyle/2.nix b/pkgs/development/python-modules/pydocstyle/2.nix index a2f2daa2fe9c7..21e39b68d12c2 100644 --- a/pkgs/development/python-modules/pydocstyle/2.nix +++ b/pkgs/development/python-modules/pydocstyle/2.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python docstring style checker"; - homepage = https://github.com/PyCQA/pydocstyle/; + homepage = "https://github.com/PyCQA/pydocstyle/"; license = licenses.mit; maintainers = with maintainers; [ dzabraev ]; }; diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix index 39d9f9f9a23dd..1825c690f30cc 100644 --- a/pkgs/development/python-modules/pydocstyle/default.nix +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pydocstyle"; - version = "4.0.1"; + version = "5.0.2"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = version; - sha256 = "1sr8d2fsfpam4f14v4als6g2v6s3n9h138vxlwhd6slb3ll14y4l"; + sha256 = "03z8miyppm2xncrc9yjilwl7z5c5cpv51zha580v64p8sb2l0j7j"; }; propagatedBuildInputs = [ snowballstemmer ]; @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python docstring style checker"; - homepage = https://github.com/PyCQA/pydocstyle/; + homepage = "https://github.com/PyCQA/pydocstyle/"; license = licenses.mit; maintainers = with maintainers; [ dzabraev ]; }; diff --git a/pkgs/development/python-modules/pydocumentdb/default.nix b/pkgs/development/python-modules/pydocumentdb/default.nix index 659997d715897..7a78730d39b05 100644 --- a/pkgs/development/python-modules/pydocumentdb/default.nix +++ b/pkgs/development/python-modules/pydocumentdb/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Azure Cosmos DB API"; - homepage = https://github.com/Azure/azure-cosmos-python; + homepage = "https://github.com/Azure/azure-cosmos-python"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index 021043d9e9dbc..0a637a48ba2f8 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/erocarrera/pydot; + homepage = "https://github.com/erocarrera/pydot"; description = "Allows to easily create both directed and non directed graphs from Python"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/pydotplus/default.nix b/pkgs/development/python-modules/pydotplus/default.nix index 03b594a131a0b..bb25ecd85e26f 100644 --- a/pkgs/development/python-modules/pydotplus/default.nix +++ b/pkgs/development/python-modules/pydotplus/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/erocarrera/pydot; + homepage = "https://github.com/erocarrera/pydot"; description = "An improved version of the old pydot project that provides a Python Interface to Graphviz’s Dot language"; license = licenses.mit; maintainers = with maintainers; [ ashgillman ]; diff --git a/pkgs/development/python-modules/pydy/default.nix b/pkgs/development/python-modules/pydy/default.nix index 8bdb2affc532d..82556ac1a7104 100644 --- a/pkgs/development/python-modules/pydy/default.nix +++ b/pkgs/development/python-modules/pydy/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python tool kit for multi-body dynamics"; - homepage = http://pydy.org; + homepage = "http://pydy.org"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pyechonest/default.nix b/pkgs/development/python-modules/pyechonest/default.nix index 33e8d9c3fa9d1..510849edf4757 100644 --- a/pkgs/development/python-modules/pyechonest/default.nix +++ b/pkgs/development/python-modules/pyechonest/default.nix @@ -12,6 +12,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tap into The Echo Nest's Musical Brain for the best music search, information, recommendations and remix tools on the web"; - homepage = https://github.com/echonest/pyechonest; + homepage = "https://github.com/echonest/pyechonest"; }; } diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/pkgs/development/python-modules/pyelftools/default.nix index c619df297fefb..9e557668de065 100644 --- a/pkgs/development/python-modules/pyelftools/default.nix +++ b/pkgs/development/python-modules/pyelftools/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library for analyzing ELF files and DWARF debugging information"; - homepage = https://github.com/eliben/pyelftools; + homepage = "https://github.com/eliben/pyelftools"; license = licenses.publicDomain; maintainers = [ maintainers.igsha ]; }; diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix index 28c74487c9664..c6bc941046d5c 100644 --- a/pkgs/development/python-modules/pyemd/default.nix +++ b/pkgs/development/python-modules/pyemd/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python wrapper for Ofir Pele and Michael Werman's implementation of the Earth Mover's Distance"; - homepage = https://github.com/wmayner/pyemd; + homepage = "https://github.com/wmayner/pyemd"; license = licenses.mit; maintainers = with maintainers; [ rvl ]; }; diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index f144cf5555250..91626bd5e5555 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -1,16 +1,18 @@ { stdenv , buildPythonPackage +, isPy27 , fetchPypi , enchant2 }: buildPythonPackage rec { pname = "pyenchant"; - version = "2.0.0"; + version = "3.0.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "fc31cda72ace001da8fe5d42f11c26e514a91fa8c70468739216ddd8de64e2a0"; + sha256 = "0nfmckqm45fbfz795qw5hgvygdxgxchdiwp3kmm1k05z99j6mlhv"; }; propagatedBuildInputs = [ enchant2 ]; @@ -35,7 +37,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "pyenchant: Python bindings for the Enchant spellchecker"; - homepage = https://github.com/pyenchant/pyenchant; + homepage = "https://github.com/pyenchant/pyenchant"; license = licenses.lgpl21; }; diff --git a/pkgs/development/python-modules/pyepsg/default.nix b/pkgs/development/python-modules/pyepsg/default.nix index 4822e528deea1..2e0b2c282a26c 100644 --- a/pkgs/development/python-modules/pyepsg/default.nix +++ b/pkgs/development/python-modules/pyepsg/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple Python interface to epsg.io"; license = licenses.lgpl3; - homepage = https://pyepsg.readthedocs.io/en/latest/; + homepage = "https://pyepsg.readthedocs.io/en/latest/"; maintainers = with maintainers; [ mredaelli ]; }; diff --git a/pkgs/development/python-modules/pyext/default.nix b/pkgs/development/python-modules/pyext/default.nix index 2e4c639465b45..9351ee5d1043c 100644 --- a/pkgs/development/python-modules/pyext/default.nix +++ b/pkgs/development/python-modules/pyext/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Simple Python extensions"; - homepage = https://github.com/kirbyfan64/PyExt; + homepage = "https://github.com/kirbyfan64/PyExt"; license = licenses.mit; maintainers = with maintainers; [ edwtjo ]; }; diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index db8b05e8d6838..db0ee541e09ce 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchPypi, buildPythonPackage -, setuptools, six, traits, wxPython +, setuptools, six, traits }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1g2g3za64rfffbivlihbf5njrqbv63ln62rv9d8fi1gcrgaw6akw"; }; - propagatedBuildInputs = [ setuptools six traits wxPython ]; + propagatedBuildInputs = [ setuptools six traits ]; doCheck = false; # Needs X server diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 6bc2be39fd36f..d5e093ce86681 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fake file system that mocks the Python file system modules"; license = licenses.asl20; - homepage = http://pyfakefs.org/; + homepage = "http://pyfakefs.org/"; maintainers = with maintainers; [ gebner ]; }; } diff --git a/pkgs/development/python-modules/pyfantom/default.nix b/pkgs/development/python-modules/pyfantom/default.nix index b9e15d376b5bc..a3facfc771ce1 100644 --- a/pkgs/development/python-modules/pyfantom/default.nix +++ b/pkgs/development/python-modules/pyfantom/default.nix @@ -16,7 +16,7 @@ buildPythonPackage { doCheck = false; meta = with stdenv.lib; { - homepage = http://pyfantom.ni.fr.eu.org/; + homepage = "http://pyfantom.ni.fr.eu.org/"; description = "Wrapper for the LEGO Mindstorms Fantom Driver"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/pkgs/development/python-modules/pyfftw/default.nix index 41330ca6405fc..c8dc83b4eba51 100644 --- a/pkgs/development/python-modules/pyfftw/default.nix +++ b/pkgs/development/python-modules/pyfftw/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; - homepage = http://hgomersall.github.com/pyFFTW/; + homepage = "http://hgomersall.github.com/pyFFTW/"; license = with licenses; [ bsd2 bsd3 ]; maintainers = with maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 036872e23e36c..85176d9ccca29 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { checkInputs = [ unittest2 ]; meta = with stdenv.lib; { - homepage = https://launchpad.net/pyflakes; + homepage = "https://launchpad.net/pyflakes"; description = "A simple program which checks Python source files for errors"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/pyfma/default.nix b/pkgs/development/python-modules/pyfma/default.nix index 6c7038b94888b..936f9c2a02df1 100644 --- a/pkgs/development/python-modules/pyfma/default.nix +++ b/pkgs/development/python-modules/pyfma/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fused multiply-add for Python"; - homepage = https://github.com/nschloe/pyfma; + homepage = "https://github.com/nschloe/pyfma"; license = licenses.mit; maintainers = [ maintainers.costrouc]; }; diff --git a/pkgs/development/python-modules/pyfribidi/default.nix b/pkgs/development/python-modules/pyfribidi/default.nix index fcb201c031106..e71550867a3dd 100644 --- a/pkgs/development/python-modules/pyfribidi/default.nix +++ b/pkgs/development/python-modules/pyfribidi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A simple wrapper around fribidi"; - homepage = https://github.com/pediapress/pyfribidi; + homepage = "https://github.com/pediapress/pyfribidi"; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index d73ee24f58477..4cb6138d5ebb4 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "pyftdi"; - version = "0.49.0"; + version = "0.51.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "eblot"; repo = pname; rev = "v${version}"; - sha256 = "063kwvgw7g4nn09pyqwqy72vnhzw0aajg23bi32vr0k49g8fx27s"; + sha256 = "14mkwk44bgm6s4kqagz7nm6p6gsygmksl2628jaqh7ppblxca9as"; }; propagatedBuildInputs = [ pyusb pyserial ]; diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index e7c5b922dc063..721d279478d6d 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/giampaolo/pyftpdlib/; + homepage = "https://github.com/giampaolo/pyftpdlib/"; description = "Very fast asynchronous FTP server library"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/pyfttt/default.nix b/pkgs/development/python-modules/pyfttt/default.nix index 44d6679e47c3c..8592d9b0aeefa 100644 --- a/pkgs/development/python-modules/pyfttt/default.nix +++ b/pkgs/development/python-modules/pyfttt/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Package for sending events to the IFTTT Webhooks Channel"; - homepage = https://github.com/briandconnelly/pyfttt; + homepage = "https://github.com/briandconnelly/pyfttt"; maintainers = with maintainers; [ peterhoeg ]; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/pyfxa/default.nix b/pkgs/development/python-modules/pyfxa/default.nix index 4bde8e9997ac8..0f964bfc9f976 100644 --- a/pkgs/development/python-modules/pyfxa/default.nix +++ b/pkgs/development/python-modules/pyfxa/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Firefox Accounts client library for Python"; - homepage = https://github.com/mozilla/PyFxA; + homepage = "https://github.com/mozilla/PyFxA"; license = licenses.mpl20; }; } diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index a3d6f6e4c21a5..b02b604342528 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Sexy and simple python charting"; - homepage = http://www.pygal.org; + homepage = "http://www.pygal.org"; license = licenses.lgpl3; maintainers = with maintainers; [ sjourdois ]; }; diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index b9c45ce8967de..8f9a9e5e59c36 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for games"; - homepage = http://www.pygame.org/; + homepage = "http://www.pygame.org/"; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/python-modules/pygbm/default.nix b/pkgs/development/python-modules/pygbm/default.nix index 702dbf70ee962..0d2747c1cb46d 100644 --- a/pkgs/development/python-modules/pygbm/default.nix +++ b/pkgs/development/python-modules/pygbm/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Experimental Gradient Boosting Machines in Python"; - homepage = https://github.com/ogrisel/pygbm; + homepage = "https://github.com/ogrisel/pygbm"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; broken = true; diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/pkgs/development/python-modules/pygccxml/default.nix index d4c46d6b83597..14bd14ab75e70 100644 --- a/pkgs/development/python-modules/pygccxml/default.nix +++ b/pkgs/development/python-modules/pygccxml/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/gccxml/pygccxml; + homepage = "https://github.com/gccxml/pygccxml"; description = "Python package for easy C++ declarations navigation"; license = licenses.boost; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/python-modules/pygdbmi/default.nix b/pkgs/development/python-modules/pygdbmi/default.nix index c294b02c31d9f..447fbdfcdc444 100644 --- a/pkgs/development/python-modules/pygdbmi/default.nix +++ b/pkgs/development/python-modules/pygdbmi/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Parse gdb machine interface output with Python"; - homepage = https://github.com/cs01/pygdbmi; + homepage = "https://github.com/cs01/pygdbmi"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/pygeoip/default.nix b/pkgs/development/python-modules/pygeoip/default.nix index 0b0e8f55fa7f4..6cd21a94a9bec 100644 --- a/pkgs/development/python-modules/pygeoip/default.nix +++ b/pkgs/development/python-modules/pygeoip/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pure Python GeoIP API"; - homepage = https://github.com/appliedsec/pygeoip; + homepage = "https://github.com/appliedsec/pygeoip"; license = licenses.lgpl3Plus; }; } diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 013ce9ae91624..4e0c294de0191 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.1.1"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "klXVB9XYe/It/VeZeniQgBAzH8IfmoPsoSGlP2V76zw="; + sha256 = "11q3a0p4mvzdskla0c6ffcrddldfbh7dc4p5l6xrriwri88j356y"; }; preConfigure = lib.optionalString stdenv.isDarwin '' @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "A set of Python bindings to the libgit2 shared library"; - homepage = https://pypi.python.org/pypi/pygit2; + homepage = "https://pypi.python.org/pypi/pygit2"; license = licenses.gpl2; }; } diff --git a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix b/pkgs/development/python-modules/pygments-markdown-lexer/default.nix index 65688cf17bb5d..8f41995cf395e 100644 --- a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix +++ b/pkgs/development/python-modules/pygments-markdown-lexer/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/jhermann/pygments-markdown-lexer; + homepage = "https://github.com/jhermann/pygments-markdown-lexer"; description = "Pygments Markdown Lexer – A Markdown lexer for Pygments to highlight Markdown code snippets"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix index c7dfdef4be487..d846cc4f18c72 100644 --- a/pkgs/development/python-modules/pygmo/default.nix +++ b/pkgs/development/python-modules/pygmo/default.nix @@ -45,7 +45,7 @@ in buildPythonPackage { meta = with lib; { description = "Parallel optimisation for Python"; - homepage = https://esa.github.io/pagmo2/; + homepage = "https://esa.github.io/pagmo2/"; license = licenses.gpl3Plus; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index b1890c73e80bf..2a1b8bcb4105f 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://pygobject.readthedocs.io/; + homepage = "https://pygobject.readthedocs.io/"; description = "Python bindings for Glib"; license = licenses.gpl2; maintainers = with maintainers; [ jtojnar ]; diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 706284b56dbcb..1a084f8a87070 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python interface to Graphviz graph drawing package"; - homepage = https://github.com/pygraphviz/pygraphviz; + homepage = "https://github.com/pygraphviz/pygraphviz"; license = licenses.bsd3; maintainers = with maintainers; [ matthiasbeyer ]; }; diff --git a/pkgs/development/python-modules/pygreat/default.nix b/pkgs/development/python-modules/pygreat/default.nix index 103e215f047be..bdced30f9831e 100644 --- a/pkgs/development/python-modules/pygreat/default.nix +++ b/pkgs/development/python-modules/pygreat/default.nix @@ -24,7 +24,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Python library for talking with libGreat devices"; - homepage = https://greatscottgadgets.com/greatfet/; + homepage = "https://greatscottgadgets.com/greatfet/"; license = with licenses; [ bsd3 ]; }; diff --git a/pkgs/development/python-modules/pygtail/default.nix b/pkgs/development/python-modules/pygtail/default.nix index 503dad717c2be..492a36c50a253 100644 --- a/pkgs/development/python-modules/pygtail/default.nix +++ b/pkgs/development/python-modules/pygtail/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { meta = with lib; { description = "A library for reading log file lines that have not been read"; license = licenses.gpl2Plus; - homepage = https://github.com/bgreenlee/pygtail; + homepage = "https://github.com/bgreenlee/pygtail"; }; } diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix index 18540aca50ebd..98ef4afacc194 100644 --- a/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/pkgs/development/python-modules/pyhamcrest/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; # pypi tarball does not include tests meta = with stdenv.lib; { - homepage = https://github.com/hamcrest/PyHamcrest; + homepage = "https://github.com/hamcrest/PyHamcrest"; description = "Hamcrest framework for matcher objects"; license = licenses.bsd3; maintainers = with maintainers; [ diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index 73de6ba08394a..7717706561dac 100644 --- a/pkgs/development/python-modules/pyhaversion/default.nix +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python module to the newest version number of Home Assistant"; - homepage = https://github.com/ludeeus/pyhaversion; + homepage = "https://github.com/ludeeus/pyhaversion"; maintainers = [ maintainers.makefu ]; }; } diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/pkgs/development/python-modules/pyhcl/default.nix index d3e0da07868b2..62d40e368efc2 100644 --- a/pkgs/development/python-modules/pyhcl/default.nix +++ b/pkgs/development/python-modules/pyhcl/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyhcl"; - version = "0.4.2"; + version = "0.4.4"; disabled = !isPy3k; src = fetchFromGitHub { owner = "virtuald"; repo = pname; rev = version; - sha256 = "01y5fn3pis43i0w0858wmrc8azfinp07a16ixglmg28gg07c0zkd"; + sha256 = "0rcpx4vvj2c6wxp31vay7a2xa5p62kabi91vps9plj6710yz29nc"; }; # https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/setup.py#L64 diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix index f0e50895d83ed..487f7ca66f313 100644 --- a/pkgs/development/python-modules/pyhocon/default.nix +++ b/pkgs/development/python-modules/pyhocon/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/chimpler/pyhocon/; + homepage = "https://github.com/chimpler/pyhocon/"; description = "HOCON parser for Python"; # Long description copied from # https://github.com/chimpler/pyhocon/blob/55a9ea3ebeeac5764bdebebfbeacbf099f64db26/setup.py diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index 33df2985cfc35..7d8fa826b0e77 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.62"; + version = "0.1.65"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3547ad176f287a9d3b4409692485b6fb456107d70350a32071423e13803cfdab"; + sha256 = "0a562dqxs2j9q0xyywrh43dlbpdqr3mhvrrk8abdpmgj6gl33zac"; }; # PyPI tarball does not include tests/ directory @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python 3 Interface to interact with Homematic devices"; - homepage = https://github.com/danielperna84/pyhomematic; + homepage = "https://github.com/danielperna84/pyhomematic"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index 20fd48bcb2bd1..d579d3e96fbed 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "PyiCloud is a module which allows pythonistas to interact with iCloud webservices"; - homepage = https://github.com/picklepete/pyicloud; + homepage = "https://github.com/picklepete/pyicloud"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index a9523826b1102..9dcdfb64c93aa 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/PyICU/; + homepage = "https://pypi.python.org/pypi/PyICU/"; description = "Python extension wrapping the ICU C++ API"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/pyinotify/default.nix b/pkgs/development/python-modules/pyinotify/default.nix index 0e070d8a89d9e..7193fe118fd28 100644 --- a/pkgs/development/python-modules/pyinotify/default.nix +++ b/pkgs/development/python-modules/pyinotify/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/seb-m/pyinotify/wiki; + homepage = "https://github.com/seb-m/pyinotify/wiki"; description = "Monitor filesystems events on Linux platforms with inotify"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/pyjwkest/default.nix b/pkgs/development/python-modules/pyjwkest/default.nix index 3c5b96af2ad04..945cc20528e3d 100644 --- a/pkgs/development/python-modules/pyjwkest/default.nix +++ b/pkgs/development/python-modules/pyjwkest/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { meta = { description = "Implementation of JWT, JWS, JWE and JWK"; - homepage = https://github.com/rohe/pyjwkest; + homepage = "https://github.com/rohe/pyjwkest"; license = lib.licenses.asl20; }; diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index e91fbe2b3e466..9255c02ac2eef 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "JSON Web Token implementation in Python"; - homepage = https://github.com/jpadilla/pyjwt; + homepage = "https://github.com/jpadilla/pyjwt"; license = licenses.mit; maintainers = with maintainers; [ prikhi ]; }; diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix index 2dd014821e6b1..f266d17bb4608 100644 --- a/pkgs/development/python-modules/pykdtree/default.nix +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "kd-tree implementation for fast nearest neighbour search in Python"; - homepage = https://github.com/storpipfugl/pykdtree; + homepage = "https://github.com/storpipfugl/pykdtree"; license = licenses.lgpl3; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index a8fff00ae1510..311417bf0e44f 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/pschmitt/pykeepass; + homepage = "https://github.com/pschmitt/pykeepass"; description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)"; license = lib.licenses.gpl3; }; diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index 8482b1e1bc800..a787b86952753 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://www.pykka.org; + homepage = "http://www.pykka.org"; description = "A Python implementation of the actor model"; license = licenses.asl20; maintainers = []; diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index 3073f55ca3ae3..1aa96dfe464db 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Code audit tool for python"; - homepage = https://github.com/klen/pylama; + homepage = "https://github.com/klen/pylama"; # ambiguous license declarations: https://github.com/klen/pylama/issues/64 license = [ licenses.lgpl3 ]; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index 6d58fbfb21a91..6a6853e559948 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/pylast/pylast; + homepage = "https://github.com/pylast/pylast"; description = "A python interface to last.fm (and compatibles)"; license = licenses.asl20; maintainers = with maintainers; [ rvolosatovs ]; diff --git a/pkgs/development/python-modules/pylatexenc/default.nix b/pkgs/development/python-modules/pylatexenc/default.nix index 146aed9a3ecf8..02a0f8758369d 100644 --- a/pkgs/development/python-modules/pylatexenc/default.nix +++ b/pkgs/development/python-modules/pylatexenc/default.nix @@ -1,30 +1,28 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "pylatexenc"; - version = "2.1"; + version = "2.4"; src = fetchFromGitHub { owner = "phfaist"; - repo = pname; + repo = "pylatexenc"; rev = "v${version}"; - sha256 = "0wnl00y5dl56aw9j4y21kqapraaravbycwfxdmjsbgl11nk4llx9"; + sha256 = "0i4frypbv90mjir8bkp03cwkvwhgvc9p3fw6q2jz1dn7fw94v2rv"; }; pythonImportsCheck = [ "pylatexenc" ]; - checkInputs = [ pytest ]; - checkPhase = '' - pytest - ''; + dontUseSetuptoolsCheck = true; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Simple LaTeX parser providing latex-to-unicode and unicode-to-latex conversion"; homepage = "https://pylatexenc.readthedocs.io"; - downloadPage = "https;//www.github.com/phfaist/pylatexenc"; + downloadPage = "https://www.github.com/phfaist/pylatexenc/releases"; license = licenses.mit; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/pkgs/development/python-modules/pylev/default.nix b/pkgs/development/python-modules/pylev/default.nix index f198d214172d2..5df0ce4690ef7 100644 --- a/pkgs/development/python-modules/pylev/default.nix +++ b/pkgs/development/python-modules/pylev/default.nix @@ -16,7 +16,7 @@ buildPythonPackage { }; meta = with lib; { - homepage = https://github.com/toastdriven/pylev; + homepage = "https://github.com/toastdriven/pylev"; description = "A pure Python Levenshtein implementation that's not freaking GPL'd"; license = licenses.bsd3; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/pylibconfig2/default.nix b/pkgs/development/python-modules/pylibconfig2/default.nix index 6cea70c570895..3c2a0be941df0 100644 --- a/pkgs/development/python-modules/pylibconfig2/default.nix +++ b/pkgs/development/python-modules/pylibconfig2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyparsing ]; meta = with stdenv.lib; { - homepage = https://github.com/heinzK1X/pylibconfig2; + homepage = "https://github.com/heinzK1X/pylibconfig2"; description = "Pure python library for libconfig syntax"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/pylibftdi/default.nix b/pkgs/development/python-modules/pylibftdi/default.nix new file mode 100644 index 0000000000000..54058ae1982d8 --- /dev/null +++ b/pkgs/development/python-modules/pylibftdi/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, libftdi1 +, libusb1 +}: + +buildPythonPackage rec { + pname = "pylibftdi"; + version = "0.18.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "17c5h4xz1grynbpffngjflk3dlw2g2zbhkwb7h5v4n9rjdv41l5x"; + }; + + propagatedBuildInputs = [ + libftdi1 + libusb1 + ]; + + postPatch = '' + substituteInPlace pylibftdi/driver.py \ + --replace "self._load_library('libusb')" "cdll.LoadLibrary('${libusb1.out}/lib/libusb-1.0.so')" \ + --replace "self._load_library('libftdi')" "cdll.LoadLibrary('${libftdi1.out}/lib/libftdi1.so')" + ''; + + pythonImportsCheck = [ "pylibftdi" ]; + + meta = with lib; { + homepage = "https://bitbucket.org/codedstructure/pylibftdi/src/default/"; + description = "Minimal pythonic wrapper to Intra2net's libftdi driver for FTDI's USB devices"; + license = licenses.mit; + maintainers = with maintainers; [ matthuszagh ]; + }; +} diff --git a/pkgs/development/python-modules/pylibgen/default.nix b/pkgs/development/python-modules/pylibgen/default.nix index 559b75eec4122..9dc6689e90006 100644 --- a/pkgs/development/python-modules/pylibgen/default.nix +++ b/pkgs/development/python-modules/pylibgen/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to Library Genesis"; - homepage = https://pypi.org/project/pylibgen/; + homepage = "https://pypi.org/project/pylibgen/"; license = licenses.mit; maintainers = [ maintainers.nico202 ]; }; diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/pkgs/development/python-modules/pyliblo/default.nix index 3c637ffced308..4c0a406bed349 100644 --- a/pkgs/development/python-modules/pyliblo/default.nix +++ b/pkgs/development/python-modules/pyliblo/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { buildInputs = [ liblo cython ]; meta = with stdenv.lib; { - homepage = http://das.nasophon.de/pyliblo/; + homepage = "http://das.nasophon.de/pyliblo/"; description = "Python wrapper for the liblo OSC library"; license = licenses.lgpl21; }; diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix index 053d73af1a373..26d6e4fb6fb61 100644 --- a/pkgs/development/python-modules/pylibmc/default.nix +++ b/pkgs/development/python-modules/pylibmc/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Quick and small memcached client for Python"; - homepage = http://sendapatch.se/projects/pylibmc/; + homepage = "http://sendapatch.se/projects/pylibmc/"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index 8530e6f8543db..af4b0177eb26f 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.0.14"; + version = "2.0.15"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "07fkwb4phfr71dpajnq6l64phjxvljx2nf8ibs12n9gwjdvm9i52"; + sha256 = "0wpzd3j01njxfclbhxz31s5clc7il67nhm4lz89q2aaj19c0xzsa"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylint/1.9.nix b/pkgs/development/python-modules/pylint/1.9.nix index b1253c65b3383..568d85b7e1b70 100644 --- a/pkgs/development/python-modules/pylint/1.9.nix +++ b/pkgs/development/python-modules/pylint/1.9.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/PyCQA/pylint; + homepage = "https://github.com/PyCQA/pylint"; description = "A bug and style checker for Python"; platforms = platforms.all; license = licenses.gpl1Plus; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 95f86e31c041a..c596b4042cc36 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/PyCQA/pylint; + homepage = "https://github.com/PyCQA/pylint"; description = "A bug and style checker for Python"; platforms = platforms.all; license = licenses.gpl1Plus; diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix index bd27de6eba77f..d21002f91606e 100644 --- a/pkgs/development/python-modules/pyls-black/default.nix +++ b/pkgs/development/python-modules/pyls-black/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ black toml python-language-server ]; meta = with lib; { - homepage = https://github.com/rupert/pyls-black; + homepage = "https://github.com/rupert/pyls-black"; description = "Black plugin for the Python Language Server"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/python-modules/pyls-isort/default.nix b/pkgs/development/python-modules/pyls-isort/default.nix index fa94441e20034..9dc614035e0ee 100644 --- a/pkgs/development/python-modules/pyls-isort/default.nix +++ b/pkgs/development/python-modules/pyls-isort/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/paradoxxxzero/pyls-isort; + homepage = "https://github.com/paradoxxxzero/pyls-isort"; description = "Isort plugin for python-language-server"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix index 414c2cccbea3f..b4fd98607d8a4 100644 --- a/pkgs/development/python-modules/pyls-mypy/default.nix +++ b/pkgs/development/python-modules/pyls-mypy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/tomv564/pyls-mypy; + homepage = "https://github.com/tomv564/pyls-mypy"; description = "Mypy plugin for the Python Language Server"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/python-modules/pymacaroons/default.nix b/pkgs/development/python-modules/pymacaroons/default.nix index 96023c01e1e53..c9ffcc0a0702c 100644 --- a/pkgs/development/python-modules/pymacaroons/default.nix +++ b/pkgs/development/python-modules/pymacaroons/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Macaroon library for Python"; - homepage = https://github.com/ecordell/pymacaroons; + homepage = "https://github.com/ecordell/pymacaroons"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pymaging/default.nix b/pkgs/development/python-modules/pymaging/default.nix index 81100a8e214bf..68a2e59b298c9 100644 --- a/pkgs/development/python-modules/pymaging/default.nix +++ b/pkgs/development/python-modules/pymaging/default.nix @@ -16,7 +16,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; - homepage = http://pymaging.rtfd.org; + homepage = "http://pymaging.rtfd.org"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/pymaging_png/default.nix b/pkgs/development/python-modules/pymaging_png/default.nix index 61239f1cbe364..9bf2559e2f0c2 100644 --- a/pkgs/development/python-modules/pymaging_png/default.nix +++ b/pkgs/development/python-modules/pymaging_png/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; - homepage = https://github.com/ojii/pymaging-png/; + homepage = "https://github.com/ojii/pymaging-png/"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/pymatgen-lammps/default.nix b/pkgs/development/python-modules/pymatgen-lammps/default.nix index c38f56885d146..c80472a6730a5 100644 --- a/pkgs/development/python-modules/pymatgen-lammps/default.nix +++ b/pkgs/development/python-modules/pymatgen-lammps/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "A LAMMPS wrapper using pymatgen"; - homepage = https://gitlab.com/costrouc/pymatgen-lammps; + homepage = "https://gitlab.com/costrouc/pymatgen-lammps"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 4f99d0021e0ed..f9869cc2c7f40 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A robust materials analysis code that defines core object representations for structures and molecules"; - homepage = https://pymatgen.org/; + homepage = "https://pymatgen.org/"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index d47ea812ca8fe..51b057e740ce3 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.6"; + version = "2.4.8"; src = fetchPypi { inherit pname version; - sha256 = "1c8bxbm18h4idfdxqgklcz4n5bgsyl9y14gl9314fpflwa2c7ds8"; + sha256 = "1djzr6cg3l19icwplmpii7zzr8gms9qcc2lfr8yc05siqzclk5xk"; }; propagatedBuildInputs = [ future lxml ]; diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix index 2411abc5ac4a4..853799497296a 100644 --- a/pkgs/development/python-modules/pymbolic/default.nix +++ b/pkgs/development/python-modules/pymbolic/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "A package for symbolic computation"; - homepage = https://mathema.tician.de/software/pymbolic; + homepage = "https://mathema.tician.de/software/pymbolic"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index 39472bb317766..0c99b501c3f26 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -9,6 +9,8 @@ , tqdm , six , h5py +, arviz +, packaging , pytest , nose , parameterized @@ -37,6 +39,8 @@ buildPythonPackage rec { tqdm six h5py + arviz + packaging ]; checkInputs = [ @@ -56,7 +60,7 @@ buildPythonPackage rec { meta = { description = "Bayesian estimation, particularly using Markov chain Monte Carlo (MCMC)"; - homepage = https://github.com/pymc-devs/pymc3; + homepage = "https://github.com/pymc-devs/pymc3"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ilya-kolpakov ]; }; diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index dbed3c7f0375a..a0575bbfede78 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pymediainfo"; - version = "4.1"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0mhpxs7vlqx8w75z93dy7nnvx89kwfdjkla03l19an15rlyqyspd"; + sha256 = "0vg2icmsc44k1ra898rjfp912xijsn96s0zplax6w13lpzb9jb9r"; }; postPatch = '' @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python wrapper for the mediainfo library"; - homepage = https://github.com/sbraz/pymediainfo; + homepage = "https://github.com/sbraz/pymediainfo"; license = licenses.mit; maintainers = with maintainers; [ jfrankenau ]; }; diff --git a/pkgs/development/python-modules/pyment/default.nix b/pkgs/development/python-modules/pyment/default.nix index bb27e5b3c3dd2..fbf2c93fde605 100644 --- a/pkgs/development/python-modules/pyment/default.nix +++ b/pkgs/development/python-modules/pyment/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/dadadel/pyment; + homepage = "https://github.com/dadadel/pyment"; description = "Create, update or convert docstrings in existing Python files, managing several styles"; license = licenses.gpl3; maintainers = with maintainers; [ jethro ]; diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index 2baf3181ac69c..6896eaa097ec4 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A command-line tool to show the weather report by a given station ID"; - homepage = http://www.schwarzvogel.de/software/pymetar.html; + homepage = "http://www.schwarzvogel.de/software/pymetar.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ erosennin ]; }; diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index a10bb9169edf6..35fb4673ef51c 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/mongodb/mongo-python-driver; + homepage = "https://github.com/mongodb/mongo-python-driver"; license = licenses.asl20; description = "Python driver for MongoDB"; }; diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix index 85be0b4309c73..0fc0494265582 100644 --- a/pkgs/development/python-modules/pympler/default.nix +++ b/pkgs/development/python-modules/pympler/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tool to measure, monitor and analyze memory behavior"; - homepage = https://pythonhosted.org/Pympler/; + homepage = "https://pythonhosted.org/Pympler/"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/pymsgbox/default.nix b/pkgs/development/python-modules/pymsgbox/default.nix index 38cc411f54df0..d844144addbcd 100644 --- a/pkgs/development/python-modules/pymsgbox/default.nix +++ b/pkgs/development/python-modules/pymsgbox/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A simple, cross-platform, pure Python module for JavaScript-like message boxes"; - homepage = https://github.com/asweigart/PyMsgBox; + homepage = "https://github.com/asweigart/PyMsgBox"; license = licenses.bsd3; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/pymssql/default.nix b/pkgs/development/python-modules/pymssql/default.nix deleted file mode 100644 index 954be3f40e2d0..0000000000000 --- a/pkgs/development/python-modules/pymssql/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, freetds, cython, setuptools-git }: - -buildPythonPackage rec { - pname = "pymssql"; - version = "3.0.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "4d0ed31c76983d723c0c979b18e2273623621e630ca4901f17a86128aca13f84"; - }; - - buildInputs = [cython setuptools-git]; - propagatedBuildInputs = [freetds]; - - # The tests require a running instance of SQLServer, so we skip them - doCheck = false; - - meta = with lib; { - homepage = http://pymssql.org/en/stable/; - description = "A simple database interface for Python that builds on top - of FreeTDS to provide a Python DB-API (PEP-249) interface to Microsoft - SQL Server"; - license = licenses.lgpl21; - maintainers = with maintainers; [ mredaelli ]; - }; -} diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 2ab33fb183815..1625b15f2ee9d 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "PyMuPDF"; - version = "1.16.16"; + version = "1.16.18"; src = fetchPypi { inherit pname version; - sha256 = "1rw4wjbsp8pnkkqcn097psjd6qinv70pjzvrbns04maybhn4ni6v"; + sha256 = "0gpcmmcjgwc6x4rn6nm3akiijdkpa9nahsw2x8a0i7z7kzj4firk"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/pymvglive/default.nix b/pkgs/development/python-modules/pymvglive/default.nix index 3b7011fa74821..e2c2e8f05a1c4 100644 --- a/pkgs/development/python-modules/pymvglive/default.nix +++ b/pkgs/development/python-modules/pymvglive/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "get live-data from mvg-live.de"; - homepage = https://github.com/pc-coholic/PyMVGLive; + homepage = "https://github.com/pc-coholic/PyMVGLive"; license = licenses.free; }; } diff --git a/pkgs/development/python-modules/pymysql/default.nix b/pkgs/development/python-modules/pymysql/default.nix index 4529a736f13bc..a43dcfb26fcdd 100644 --- a/pkgs/development/python-modules/pymysql/default.nix +++ b/pkgs/development/python-modules/pymysql/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure Python MySQL Client"; - homepage = https://github.com/PyMySQL/PyMySQL; + homepage = "https://github.com/PyMySQL/PyMySQL"; license = licenses.mit; maintainers = [ maintainers.kalbasit ]; }; diff --git a/pkgs/development/python-modules/pymysqlsa/default.nix b/pkgs/development/python-modules/pymysqlsa/default.nix index 11813d3d1bcdd..16c0e1a58d3fa 100644 --- a/pkgs/development/python-modules/pymysqlsa/default.nix +++ b/pkgs/development/python-modules/pymysqlsa/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "PyMySQL dialect for SQL Alchemy"; - homepage = https://pypi.python.org/pypi/pymysql_sa; + homepage = "https://pypi.python.org/pypi/pymysql_sa"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pymystem3/default.nix b/pkgs/development/python-modules/pymystem3/default.nix index 5311d98175286..2b00dd7951d11 100644 --- a/pkgs/development/python-modules/pymystem3/default.nix +++ b/pkgs/development/python-modules/pymystem3/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for the Yandex MyStem 3.1 morpholocial analyzer of the Russian language"; - homepage = https://github.com/nlpub/pymystem3; + homepage = "https://github.com/nlpub/pymystem3"; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/pynac/default.nix b/pkgs/development/python-modules/pynac/default.nix index 755dda341c9df..69233adc264e6 100644 --- a/pkgs/development/python-modules/pynac/default.nix +++ b/pkgs/development/python-modules/pynac/default.nix @@ -13,7 +13,7 @@ buildPythonPackage { }; meta = with stdenv.lib; { - homepage = https://github.com/se-esss-litterbox/Pynac; + homepage = "https://github.com/se-esss-litterbox/Pynac"; description = "A Python wrapper around the Dynac charged particle simulator"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index 1561c3c4d6def..be24815ba13e1 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { maintainers = with maintainers; [ va1entin ]; description = "Python binding to the Networking and Cryptography (NaCl) library"; - homepage = https://github.com/pyca/pynacl/; + homepage = "https://github.com/pyca/pynacl/"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/pynamecheap/default.nix b/pkgs/development/python-modules/pynamecheap/default.nix index 571206a71678c..84c13b9d1caaa 100644 --- a/pkgs/development/python-modules/pynamecheap/default.nix +++ b/pkgs/development/python-modules/pynamecheap/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Namecheap API client in Python."; - homepage = https://github.com/Bemmu/PyNamecheap; + homepage = "https://github.com/Bemmu/PyNamecheap"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pync/default.nix b/pkgs/development/python-modules/pync/default.nix index 24d285423f174..b7c819c4593da 100644 --- a/pkgs/development/python-modules/pync/default.nix +++ b/pkgs/development/python-modules/pync/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Wrapper for Mac OS 10.8 Notification Center"; - homepage = https://pypi.python.org/pypi/pync/1.4; + homepage = "https://pypi.python.org/pypi/pync/1.4"; license = licenses.mit; platforms = platforms.darwin; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/python-modules/pynisher/default.nix b/pkgs/development/python-modules/pynisher/default.nix index 5f877fd90d26d..27e41f300c728 100644 --- a/pkgs/development/python-modules/pynisher/default.nix +++ b/pkgs/development/python-modules/pynisher/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "The pynisher is a little module intended to limit a functions resources."; - homepage = https://github.com/sfalkner/pynisher; + homepage = "https://github.com/sfalkner/pynisher"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/pynmea2/default.nix b/pkgs/development/python-modules/pynmea2/default.nix index f950c7798b88d..71d874740c505 100644 --- a/pkgs/development/python-modules/pynmea2/default.nix +++ b/pkgs/development/python-modules/pynmea2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { checkPhase = "pytest"; meta = { - homepage = https://github.com/Knio/pynmea2; + homepage = "https://github.com/Knio/pynmea2"; description = "Python library for the NMEA 0183 protcol"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ geistesk ]; diff --git a/pkgs/development/python-modules/pynrrd/default.nix b/pkgs/development/python-modules/pynrrd/default.nix index 02361fe84debf..7a136176cf64f 100644 --- a/pkgs/development/python-modules/pynrrd/default.nix +++ b/pkgs/development/python-modules/pynrrd/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; meta = with lib; { - homepage = https://github.com/mhe/pynrrd; + homepage = "https://github.com/mhe/pynrrd"; description = "Simple pure-Python reader for NRRD files"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/python-modules/pynvml/default.nix b/pkgs/development/python-modules/pynvml/default.nix index c64d723ec32f0..75d8056fa5576 100644 --- a/pkgs/development/python-modules/pynvml/default.nix +++ b/pkgs/development/python-modules/pynvml/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings for the NVIDIA Management Library"; - homepage = https://www.nvidia.com; + homepage = "https://www.nvidia.com"; license = licenses.bsd3; maintainers = [ maintainers.bcdarwin ]; }; diff --git a/pkgs/development/python-modules/pynzb/default.nix b/pkgs/development/python-modules/pynzb/default.nix index 4225d30c6fe41..530a5e2e179ff 100644 --- a/pkgs/development/python-modules/pynzb/default.nix +++ b/pkgs/development/python-modules/pynzb/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/ericflo/pynzb; + homepage = "https://github.com/ericflo/pynzb"; description = "Unified API for parsing NZB files"; license = licenses.bsd3; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix index 8576de1b379c4..8b35ef4b3da2c 100644 --- a/pkgs/development/python-modules/pyobjc/default.nix +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { description = "A bridge between the Python and Objective-C programming languages"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ sauyon ]; - homepage = https://pythonhosted.org/pyobjc/; + homepage = "https://pythonhosted.org/pyobjc/"; }; } diff --git a/pkgs/development/python-modules/pyogg/default.nix b/pkgs/development/python-modules/pyogg/default.nix index 88fdc960a2bbe..3edf3768956f1 100644 --- a/pkgs/development/python-modules/pyogg/default.nix +++ b/pkgs/development/python-modules/pyogg/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = { description = "Xiph.org's Ogg Vorbis, Opus and FLAC for Python"; - homepage = https://github.com/Zuzu-Typ/PyOgg; + homepage = "https://github.com/Zuzu-Typ/PyOgg"; license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ pmiddend ]; }; diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index 14ccdaa64c3b2..99f002b9317b6 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pyomo: Python Optimization Modeling Objects"; - homepage = http://pyomo.org; + homepage = "http://pyomo.org"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 0fd6253e5fdfa..ed8c4c4a090a4 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python wrapper for OpenCL"; - homepage = https://github.com/pyopencl/pyopencl; + homepage = "https://github.com/pyopencl/pyopencl"; license = licenses.mit; maintainers = [ maintainers.fridh ]; }; diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index ed643eb219835..2a3b90733c46f 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0bdf5ed600df30c8830455702338902528717c0af85ac5914f1dc5aa0bfa6eee"; }; - propagatedBuildInputs = [ pkgs.libGLU pkgs.libGL pkgs.freeglut pillow ]; + propagatedBuildInputs = [ pillow ]; patchPhase = let ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' @@ -47,7 +47,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://pyopengl.sourceforge.net/; + homepage = "http://pyopengl.sourceforge.net/"; description = "PyOpenGL, the Python OpenGL bindings"; longDescription = '' PyOpenGL is the cross platform Python binding to OpenGL and diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 8d5f6291c26dc..33fd3c6e10d40 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -85,24 +85,24 @@ buildPythonPackage rec { # 4 patches for 2020 bug # https://github.com/pyca/pyopenssl/pull/828 (fetchpatch { - url = https://github.com/pyca/pyopenssl/commit/0d2fd1a24b30077ead6960bd63b4a9893a57c101.patch; + url = "https://github.com/pyca/pyopenssl/commit/0d2fd1a24b30077ead6960bd63b4a9893a57c101.patch"; sha256 = "1c27g53qrwxddyx04sxf8yvj7xgbaabla7mc1cgbfd426rncbqf3"; }) (fetchpatch { - url = https://github.com/pyca/pyopenssl/commit/d08a742573c3205348a4eec9a65abaf6c16110c4.patch; + url = "https://github.com/pyca/pyopenssl/commit/d08a742573c3205348a4eec9a65abaf6c16110c4.patch"; sha256 = "18xn8s1wpycz575ivrbsbs0qd2q48z8pdzsjzh8i60xba3f8yj2f"; }) (fetchpatch { - url = https://github.com/pyca/pyopenssl/commit/60b9e10e6da7ccafaf722def630285f54510ed12.patch; + url = "https://github.com/pyca/pyopenssl/commit/60b9e10e6da7ccafaf722def630285f54510ed12.patch"; sha256 = "0aw8qvy8m0bhgp39lmbcrpprpg4bhpssm327hyrk476wwgajk01j"; }) (fetchpatch { - url = https://github.com/pyca/pyopenssl/commit/7a37cc23fcbe43abe785cd4badd14bdc7acfb175.patch; + url = "https://github.com/pyca/pyopenssl/commit/7a37cc23fcbe43abe785cd4badd14bdc7acfb175.patch"; sha256 = "1c7zb568rs71rsl16p6dq7aixwlkgzfnba4vzmfvbmy3zsnaslq2"; }) ]; - # Seems to fail unpredictably on Darwin. See http://hydra.nixos.org/build/49877419/nixlog/1 + # Seems to fail unpredictably on Darwin. See https://hydra.nixos.org/build/49877419/nixlog/1 # for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail. doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/pyotp/default.nix b/pkgs/development/python-modules/pyotp/default.nix index 6c1dcadaccf1a..c78b7fb14590a 100644 --- a/pkgs/development/python-modules/pyotp/default.nix +++ b/pkgs/development/python-modules/pyotp/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python One Time Password Library"; - homepage = https://github.com/pyotp/pyotp; + homepage = "https://github.com/pyotp/pyotp"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index 1b8fffa1d2942..731bba046e854 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python wrapper around the OpenWeatherMap web API"; - homepage = https://pyowm.readthedocs.io/; + homepage = "https://pyowm.readthedocs.io/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index 41576c5ad1fc8..b4788999a353a 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -3,21 +3,21 @@ buildPythonPackage rec { pname = "pypandoc"; - version = "unstable-2018-06-18"; + version = "1.5"; src = fetchFromGitHub { owner = "bebraw"; repo = pname; - rev = "87912f0f17e0a71c1160008df708c876d32e5819"; - sha256 = "0l6knkxxhmni4lx8hyvbb71svnhza08ivyklqlk5fw637gznc0hx"; + rev = version; + sha256 = "1lpslfns6zxx7b0xr13bzg921lwrj5am8za0b2dviywk6iiib0ld"; }; postPatch = '' # set pandoc path statically sed -i '/^__pandoc_path = None$/c__pandoc_path = "${pandoc}/bin/pandoc"' pypandoc/__init__.py - # Fix tests: requires network access - substituteInPlace tests.py --replace "pypandoc.convert(url, 'html')" "'GPL2 license'" + # Skip test that requires network access + sed -i '/test_basic_conversion_from_http_url/i\\ @unittest.skip\("no network access during checkPhase"\)' tests.py ''; preCheck = '' @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Thin wrapper for pandoc"; - homepage = https://github.com/bebraw/pypandoc; + homepage = "https://github.com/bebraw/pypandoc"; license = licenses.mit; maintainers = with maintainers; [ sternenseemann bennofs ]; }; diff --git a/pkgs/development/python-modules/pyparser/default.nix b/pkgs/development/python-modules/pyparser/default.nix index 1c00d726eadc6..8e4deafd542c7 100644 --- a/pkgs/development/python-modules/pyparser/default.nix +++ b/pkgs/development/python-modules/pyparser/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Simple library that makes it easier to parse files"; - homepage = https://bitbucket.org/rw_grim/pyparser; + homepage = "https://bitbucket.org/rw_grim/pyparser"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.nico202 ]; }; diff --git a/pkgs/development/python-modules/pypcap/default.nix b/pkgs/development/python-modules/pypcap/default.nix index 620b1d8116068..06a669e3f4fc2 100644 --- a/pkgs/development/python-modules/pypcap/default.nix +++ b/pkgs/development/python-modules/pypcap/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { checkInputs = [ dpkt ]; meta = with lib; { - homepage = https://github.com/pynetwork/pypcap; + homepage = "https://github.com/pynetwork/pypcap"; description = "Simplified object-oriented Python wrapper for libpcap"; license = licenses.bsd3; maintainers = with maintainers; [ geistesk ]; diff --git a/pkgs/development/python-modules/pypeg2/default.nix b/pkgs/development/python-modules/pypeg2/default.nix index de2ddc98a8ede..7aa0f2eda42cf 100644 --- a/pkgs/development/python-modules/pypeg2/default.nix +++ b/pkgs/development/python-modules/pypeg2/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "PEG parser interpreter in Python"; - homepage = http://fdik.org/pyPEG; + homepage = "http://fdik.org/pyPEG"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/pyplatec/default.nix b/pkgs/development/python-modules/pyplatec/default.nix index a17c650e0f0e4..78d939bca1cf3 100644 --- a/pkgs/development/python-modules/pyplatec/default.nix +++ b/pkgs/development/python-modules/pyplatec/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library to simulate plate tectonics with Python bindings"; - homepage = https://github.com/Mindwerks/plate-tectonics; + homepage = "https://github.com/Mindwerks/plate-tectonics"; license = licenses.lgpl3; }; diff --git a/pkgs/development/python-modules/pypoppler/default.nix b/pkgs/development/python-modules/pypoppler/default.nix index ccda4f2631d20..3287c70db9cb1 100644 --- a/pkgs/development/python-modules/pypoppler/default.nix +++ b/pkgs/development/python-modules/pypoppler/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://code.launchpad.net/~mriedesel/poppler-python/main; + homepage = "https://code.launchpad.net/~mriedesel/poppler-python/main"; description = "Python bindings for poppler-glib, unofficial branch including bug fixes, and removal of gtk dependencies"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/pyprind/default.nix b/pkgs/development/python-modules/pyprind/default.nix index de1b17be739da..42c99c3008837 100644 --- a/pkgs/development/python-modules/pyprind/default.nix +++ b/pkgs/development/python-modules/pyprind/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Progress Bar and Percent Indicator Utility"; - homepage = https://github.com/rasbt/pyprind; + homepage = "https://github.com/rasbt/pyprind"; license = licenses.bsd3; maintainers = with maintainers; [ jfrankenau ]; }; diff --git a/pkgs/development/python-modules/pyprof2calltree/default.nix b/pkgs/development/python-modules/pyprof2calltree/default.nix index 198445177c410..7244438c6e081 100644 --- a/pkgs/development/python-modules/pyprof2calltree/default.nix +++ b/pkgs/development/python-modules/pyprof2calltree/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pyprof2calltree"; - version = "1.4.4"; + version = "1.4.5"; # Fetch from GitHub because the PyPi packaged version does not # include all test files. @@ -10,12 +10,12 @@ buildPythonPackage rec { owner = "pwaller"; repo = "pyprof2calltree"; rev = "v" + version; - sha256 = "1vrip41ib7nmkwa8rjny1na1wyp7nvvgvm0h9bd21i262kbm4nqx"; + sha256 = "0akighssiswfhi5285rrj37am6flg3ip17c34bayq3r8yyk1iciy"; }; meta = with lib; { description = "Help visualize profiling data from cProfile with kcachegrind and qcachegrind"; - homepage = https://pypi.python.org/pypi/pyprof2calltree/; + homepage = "https://pypi.python.org/pypi/pyprof2calltree/"; license = licenses.mit; maintainers = with maintainers; [ sfrijters ]; }; diff --git a/pkgs/development/python-modules/pyptlib/default.nix b/pkgs/development/python-modules/pyptlib/default.nix index 6349b56b4749f..f820f161de566 100644 --- a/pkgs/development/python-modules/pyptlib/default.nix +++ b/pkgs/development/python-modules/pyptlib/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; # No such file or directory errors on 32bit meta = with stdenv.lib; { - homepage = https://pypi.org/project/pyptlib/; + homepage = "https://pypi.org/project/pyptlib/"; description = "A python implementation of the Pluggable Transports for Circumvention specification for Tor"; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/pyqrcode/default.nix b/pkgs/development/python-modules/pyqrcode/default.nix index 4313f700ae177..7cb0a94eb74a1 100644 --- a/pkgs/development/python-modules/pyqrcode/default.nix +++ b/pkgs/development/python-modules/pyqrcode/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "A QR code generator written purely in Python with SVG, EPS, PNG and terminal output"; - homepage = https://github.com/mnooner256/pyqrcode; + homepage = "https://github.com/mnooner256/pyqrcode"; license = licenses.bsd3; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 9f7c75a02d30d..05cf0aba354b9 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { meta = { description = "Python bindings for Qt"; license = "GPL"; - homepage = http://www.riverbankcomputing.co.uk; + homepage = "http://www.riverbankcomputing.co.uk"; maintainers = [ stdenv.lib.maintainers.sander ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index a9d78960fc435..52b27638ac72e 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -141,7 +141,7 @@ in buildPythonPackage rec { meta = with lib; { description = "Python bindings for Qt5"; - homepage = http://www.riverbankcomputing.co.uk; + homepage = "http://www.riverbankcomputing.co.uk"; license = licenses.gpl3; platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ sander ]; diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index a2c4a9491b6d7..3d7fe0bcc5f47 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Scientific Graphics and GUI Library for Python"; - homepage = http://www.pyqtgraph.org/; + homepage = "http://www.pyqtgraph.org/"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index b48f21b9e78db..22e7f07691022 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -86,7 +86,7 @@ in buildPythonPackage rec { meta = with lib; { description = "Python bindings for Qt5"; - homepage = http://www.riverbankcomputing.co.uk; + homepage = "http://www.riverbankcomputing.co.uk"; license = licenses.gpl3; platforms = platforms.mesaPlatforms; }; diff --git a/pkgs/development/python-modules/pyquery/default.nix b/pkgs/development/python-modules/pyquery/default.nix index 70f144b625813..6ba9cb91982b4 100644 --- a/pkgs/development/python-modules/pyquery/default.nix +++ b/pkgs/development/python-modules/pyquery/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/gawel/pyquery; + homepage = "https://github.com/gawel/pyquery"; description = "A jquery-like library for python"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/pyrabbit2/default.nix b/pkgs/development/python-modules/pyrabbit2/default.nix index 36182e9986be1..96f5d66cf650a 100644 --- a/pkgs/development/python-modules/pyrabbit2/default.nix +++ b/pkgs/development/python-modules/pyrabbit2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Pythonic interface to the RabbitMQ Management HTTP API"; - homepage = https://github.com/deslum/pyrabbit2; + homepage = "https://github.com/deslum/pyrabbit2"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix new file mode 100644 index 0000000000000..31cbf77d94e0f --- /dev/null +++ b/pkgs/development/python-modules/pyrad/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage, fetchFromGitHub, lib, netaddr, six, nose }: + +buildPythonPackage rec { + pname = "pyrad"; + version = "2.3"; + + src = fetchFromGitHub { + owner = "pyradius"; + repo = pname; + rev = version; + sha256 = "0hy7999av47s8100afbhxfjb8phbmrqcv530xlvskndby4a8w94k"; + }; + + propagatedBuildInputs = [ netaddr six ]; + checkInputs = [ nose ]; + + checkPhase = '' + nosetests -e testBind + ''; + + meta = with lib; { + description = "Python RADIUS Implementation"; + homepage = "https://bitbucket.org/zzzeek/sqlsoup"; + license = licenses.mit; + maintainers = [ maintainers.globin ]; + }; +} diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index a851344b4ce70..3de55f628c44a 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "The Pyramid Web Framework, a Pylons project"; - homepage = https://trypyramid.com/; + homepage = "https://trypyramid.com/"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/pyramid_chameleon/default.nix b/pkgs/development/python-modules/pyramid_chameleon/default.nix index 398869e467b7e..9e148ca8ed515 100644 --- a/pkgs/development/python-modules/pyramid_chameleon/default.nix +++ b/pkgs/development/python-modules/pyramid_chameleon/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Chameleon template compiler for pyramid"; - homepage = https://github.com/Pylons/pyramid_chameleon; + homepage = "https://github.com/Pylons/pyramid_chameleon"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/pyramid_exclog/default.nix b/pkgs/development/python-modules/pyramid_exclog/default.nix index 912fb06c11bec..0c2abeb74e282 100644 --- a/pkgs/development/python-modules/pyramid_exclog/default.nix +++ b/pkgs/development/python-modules/pyramid_exclog/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A package which logs to a Python logger when an exception is raised by a Pyramid application"; - homepage = https://docs.pylonsproject.org/; + homepage = "https://docs.pylonsproject.org/"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/pyramid_hawkauth/default.nix b/pkgs/development/python-modules/pyramid_hawkauth/default.nix index a272325505710..ff966d906c885 100644 --- a/pkgs/development/python-modules/pyramid_hawkauth/default.nix +++ b/pkgs/development/python-modules/pyramid_hawkauth/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { version = "0.1.0"; src = fetchgit { - url = https://github.com/mozilla-services/pyramid_hawkauth.git; + url = "https://github.com/mozilla-services/pyramid_hawkauth.git"; rev = "refs/tags/v${version}"; sha256 = "038ign7qlavlmvrhb2y8bygbxvy4j7bx2k1zg0i3wblg2ja50w7h"; }; @@ -21,7 +21,7 @@ buildPythonPackage rec { buildInputs = [ webtest ]; meta = with stdenv.lib; { - homepage = https://github.com/mozilla-services/pyramid_hawkauth; + homepage = "https://github.com/mozilla-services/pyramid_hawkauth"; description = "A Pyramid authentication plugin for HAWK"; license = licenses.mpl20; }; diff --git a/pkgs/development/python-modules/pyramid_jinja2/default.nix b/pkgs/development/python-modules/pyramid_jinja2/default.nix index 216fb57c22107..6be0fe479d2ff 100644 --- a/pkgs/development/python-modules/pyramid_jinja2/default.nix +++ b/pkgs/development/python-modules/pyramid_jinja2/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Jinja2 template bindings for the Pyramid web framework"; - homepage = https://github.com/Pylons/pyramid_jinja2; + homepage = "https://github.com/Pylons/pyramid_jinja2"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/pyramid_mako/default.nix b/pkgs/development/python-modules/pyramid_mako/default.nix index 80546ee768e4d..2bae93d1e306e 100644 --- a/pkgs/development/python-modules/pyramid_mako/default.nix +++ b/pkgs/development/python-modules/pyramid_mako/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyramid Mako ]; meta = with stdenv.lib; { - homepage = https://github.com/Pylons/pyramid_mako; + homepage = "https://github.com/Pylons/pyramid_mako"; description = "Mako template bindings for the Pyramid web framework"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/pyramid_multiauth/default.nix b/pkgs/development/python-modules/pyramid_multiauth/default.nix index 7c01e3e093bdf..f441aaed8c13f 100644 --- a/pkgs/development/python-modules/pyramid_multiauth/default.nix +++ b/pkgs/development/python-modules/pyramid_multiauth/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies"; - homepage = https://github.com/mozilla-services/pyramid_multiauth; + homepage = "https://github.com/mozilla-services/pyramid_multiauth"; license = licenses.mpl20; }; diff --git a/pkgs/development/python-modules/pyreadability/default.nix b/pkgs/development/python-modules/pyreadability/default.nix index 60bdbf0116744..9aa87d238ec94 100644 --- a/pkgs/development/python-modules/pyreadability/default.nix +++ b/pkgs/development/python-modules/pyreadability/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/hyperlinkapp/python-readability; + homepage = "https://github.com/hyperlinkapp/python-readability"; description = "fast python port of arc90's readability tool, updated to match latest readability.js!"; license = lib.licenses.asl20; }; diff --git a/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix index a2b0423e55842..b1868e7edde51 100644 --- a/pkgs/development/python-modules/pyregion/default.nix +++ b/pkgs/development/python-modules/pyregion/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python parser for ds9 region files"; - homepage = https://github.com/astropy/pyregion; + homepage = "https://github.com/astropy/pyregion"; license = licenses.mit; maintainers = [ maintainers.smaret ]; }; diff --git a/pkgs/development/python-modules/pyreport/default.nix b/pkgs/development/python-modules/pyreport/default.nix index d75119b6e3286..9795d30ea2e2d 100644 --- a/pkgs/development/python-modules/pyreport/default.nix +++ b/pkgs/development/python-modules/pyreport/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/pyreport; + homepage = "https://pypi.python.org/pypi/pyreport"; license = licenses.bsd0; description = "Pyreport makes notes out of a python script"; }; diff --git a/pkgs/development/python-modules/pyres/default.nix b/pkgs/development/python-modules/pyres/default.nix index 99c4b7116d5af..d4bd8789144af 100644 --- a/pkgs/development/python-modules/pyres/default.nix +++ b/pkgs/development/python-modules/pyres/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python resque clone"; - homepage = https://github.com/binarydud/pyres; + homepage = "https://github.com/binarydud/pyres"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/pyrfc3339/default.nix b/pkgs/development/python-modules/pyrfc3339/default.nix index ba72bf4be94be..3c157d83fec1b 100644 --- a/pkgs/development/python-modules/pyrfc3339/default.nix +++ b/pkgs/development/python-modules/pyrfc3339/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Generate and parse RFC 3339 timestamps"; - homepage = https://github.com/kurtraschke/pyRFC3339; + homepage = "https://github.com/kurtraschke/pyRFC3339"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index a0545ece74a2f..a11c2cad92824 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { description = "A Python library for probabilistic modeling and inference"; - homepage = http://pyro.ai; + homepage = "http://pyro.ai"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ teh ]; broken = true; diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix index fdeed6656237f..64f1aa56546d9 100644 --- a/pkgs/development/python-modules/pyro4/default.nix +++ b/pkgs/development/python-modules/pyro4/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Distributed object middleware for Python (RPC)"; - homepage = https://github.com/irmen/Pyro4; + homepage = "https://github.com/irmen/Pyro4"; license = licenses.mit; maintainers = with maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/pyroma/default.nix b/pkgs/development/python-modules/pyroma/default.nix new file mode 100644 index 0000000000000..4ec06506b38b7 --- /dev/null +++ b/pkgs/development/python-modules/pyroma/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, docutils, pygments, setuptools +}: + +buildPythonPackage rec { + pname = "pyroma"; + version = "2.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "00j1j81kiipi5yppmk385cbfccf2ih0xyapl7pw6nqhrf8vh1764"; + }; + + propagatedBuildInputs = [ docutils pygments setuptools ]; + + meta = with stdenv.lib; { + description = "Test your project's packaging friendliness"; + homepage = "https://github.com/regebro/pyroma"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 5a49fa10fbf42..0a28ef6369bc7 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.11"; + version = "0.5.12"; src = fetchPypi { inherit pname version; - sha256 = "1wjamijkg2pp9mgj5k4qw3jl2i3ajikkps0zp5c52wcxm3qmks85"; + sha256 = "1lry042qsamdzyw6zpmdld0v14g6cl05jsr9qdb7h5wnahf80mq1"; }; # requires root priviledges diff --git a/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix index 3380cf1205c3e..96d160619588a 100644 --- a/pkgs/development/python-modules/pyrr/default.nix +++ b/pkgs/development/python-modules/pyrr/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "3D mathematical functions using NumPy"; - homepage = https://github.com/adamlwgriffiths/Pyrr/; + homepage = "https://github.com/adamlwgriffiths/Pyrr/"; license = licenses.bsd2; maintainers = with maintainers; [ c0deaddict ]; }; diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index bbed677dfaf63..28b804470ffe8 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/tobgu/pyrsistent/; + homepage = "https://github.com/tobgu/pyrsistent/"; description = "Persistent/Functional/Immutable data structures"; license = licenses.mit; maintainers = with maintainers; [ desiderius ]; diff --git a/pkgs/development/python-modules/pyrss2gen/default.nix b/pkgs/development/python-modules/pyrss2gen/default.nix index 1c65d7ca5c71d..ee51e84ba0f40 100644 --- a/pkgs/development/python-modules/pyrss2gen/default.nix +++ b/pkgs/development/python-modules/pyrss2gen/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://www.dalkescientific.om/Python/PyRSS2Gen.html; + homepage = "http://www.dalkescientific.om/Python/PyRSS2Gen.html"; description = "Library for generating RSS 2.0 feeds"; license = licenses.bsd2; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/pyrtlsdr/default.nix b/pkgs/development/python-modules/pyrtlsdr/default.nix index 0bb2403108476..ad40aa6f05eb3 100644 --- a/pkgs/development/python-modules/pyrtlsdr/default.nix +++ b/pkgs/development/python-modules/pyrtlsdr/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for librtlsdr (a driver for Realtek RTL2832U based SDR's)"; - homepage = https://github.com/roger-/pyrtlsdr; + homepage = "https://github.com/roger-/pyrtlsdr"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index ddd8b0ce29545..4bda0b3c65c0f 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { nativeBuildInputs = [ swig ]; meta = { - homepage = https://pyscard.sourceforge.io/; + homepage = "https://pyscard.sourceforge.io/"; description = "Smartcard library for python"; license = stdenv.lib.licenses.lgpl21; maintainers = with stdenv.lib.maintainers; [ layus ]; diff --git a/pkgs/development/python-modules/pyschedule/default.nix b/pkgs/development/python-modules/pyschedule/default.nix index 5fbabdc098833..c387bdef4b8c8 100644 --- a/pkgs/development/python-modules/pyschedule/default.nix +++ b/pkgs/development/python-modules/pyschedule/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Formulate and solve resource-constrained scheduling problems"; - homepage = https://github.com/timnon/pyschedule; + homepage = "https://github.com/timnon/pyschedule"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix index 2dfa1f22962e6..f268566fb5442 100644 --- a/pkgs/development/python-modules/pyscss/default.nix +++ b/pkgs/development/python-modules/pyscss/default.nix @@ -32,7 +32,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "A Scss compiler for Python"; - homepage = https://pyscss.readthedocs.org/en/latest/; + homepage = "https://pyscss.readthedocs.org/en/latest/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index 1ffc546cfa1e2..acc27811b2844 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = { description = "A wrapper around the SDL2 library and as such similar to the discontinued PySDL project"; - homepage = https://github.com/marcusva/py-sdl2; + homepage = "https://github.com/marcusva/py-sdl2"; license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ pmiddend ]; }; diff --git a/pkgs/development/python-modules/pysensors/default.nix b/pkgs/development/python-modules/pysensors/default.nix index 3f55a015991b3..cc2dee7957d8d 100644 --- a/pkgs/development/python-modules/pysensors/default.nix +++ b/pkgs/development/python-modules/pysensors/default.nix @@ -25,7 +25,7 @@ buildPythonPackage { meta = with stdenv.lib; { maintainers = with maintainers; [ guibou ]; description = "Easy hardware health monitoring in Python for Linux systems"; - homepage = https://pysensors.readthedocs.org; + homepage = "https://pysensors.readthedocs.org"; license = licenses.bsd2; platforms = platforms.linux; }; diff --git a/pkgs/development/python-modules/pysftp/default.nix b/pkgs/development/python-modules/pysftp/default.nix index 0ed5790a51976..61fc4f122d291 100644 --- a/pkgs/development/python-modules/pysftp/default.nix +++ b/pkgs/development/python-modules/pysftp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ paramiko ]; meta = with stdenv.lib; { - homepage = https://bitbucket.org/dundeemt/pysftp; + homepage = "https://bitbucket.org/dundeemt/pysftp"; description = "A friendly face on SFTP"; license = licenses.mit; longDescription = '' diff --git a/pkgs/development/python-modules/pysha3/default.nix b/pkgs/development/python-modules/pysha3/default.nix index d459be25a86e9..8bdbb8601954b 100644 --- a/pkgs/development/python-modules/pysha3/default.nix +++ b/pkgs/development/python-modules/pysha3/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = { description = "Backport of hashlib.sha3 for 2.7 to 3.5"; - homepage = https://github.com/tiran/pysha3; + homepage = "https://github.com/tiran/pysha3"; license = lib.licenses.psfl; }; } diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix index 17d60f7507d36..185465bb640db 100644 --- a/pkgs/development/python-modules/pyshp/default.nix +++ b/pkgs/development/python-modules/pyshp/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pure Python read/write support for ESRI Shapefile format"; - homepage = https://github.com/GeospatialPython/pyshp; + homepage = "https://github.com/GeospatialPython/pyshp"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix index d9168f291c029..452320e1d71cc 100644 --- a/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation { meta = { description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process"; license = stdenv.lib.licenses.gpl2; - homepage = http://www.pyside.org/docs/apiextractor/; + homepage = "http://www.pyside.org/docs/apiextractor/"; maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index df309c5c68aff..8eae5034a4f8f 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { meta = { description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; license = lib.licenses.lgpl21; - homepage = http://www.pyside.org; + homepage = "http://www.pyside.org"; }; } diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index feeeda812f989..7cb132c1ad702 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { meta = { description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process"; license = stdenv.lib.licenses.gpl2; - homepage = http://www.pyside.org/docs/generatorrunner/; + homepage = "http://www.pyside.org/docs/generatorrunner/"; maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index a968935dc0600..c5561525db503 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code"; license = lib.licenses.gpl2; - homepage = http://www.pyside.org/docs/shiboken/; + homepage = "http://www.pyside.org/docs/shiboken/"; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index 6c2b357c5668f..9698c09f34784 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Development tools (pyside-uic/rcc/lupdate) for PySide, the LGPL-licensed Python bindings for the Qt framework"; license = licenses.gpl2; - homepage = https://wiki.qt.io/PySide; + homepage = "https://wiki.qt.io/PySide"; maintainers = [ ]; platforms = platforms.all; }; diff --git a/pkgs/development/python-modules/pysigset/default.nix b/pkgs/development/python-modules/pysigset/default.nix index 85bcf56f0628a..4e1b87a1f1b0d 100644 --- a/pkgs/development/python-modules/pysigset/default.nix +++ b/pkgs/development/python-modules/pysigset/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Provides access to sigprocmask(2) and friends and convenience wrappers to python application developers wanting to SIG_BLOCK and SIG_UNBLOCK signals"; - homepage = https://github.com/ossobv/pysigset; + homepage = "https://github.com/ossobv/pysigset"; license = licenses.gpl3; maintainers = with maintainers; [ dzabraev ]; }; diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index 7b0fba1a5aeeb..f5169b68393d6 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/PySlurm/pyslurm; + homepage = "https://github.com/PySlurm/pyslurm"; description = "Python bindings to Slurm"; license = licenses.gpl2; maintainers = with maintainers; [ bhipple ]; diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix index 99a9f01d4b095..e242dbe5e96e3 100644 --- a/pkgs/development/python-modules/pysmbc/default.nix +++ b/pkgs/development/python-modules/pysmbc/default.nix @@ -3,13 +3,13 @@ , setuptools }: buildPythonPackage rec { - version = "1.0.19"; + version = "1.0.21"; pname = "pysmbc"; src = fetchPypi { inherit pname version; extension = "tar.bz2"; - sha256 = "0dwffbfp3ay8y35hhc37ip61xdh522f5rfs097f3ia121h9x1mvj"; + sha256 = "14b75f358ical7zzqh3g1qkh2dxwxn2gz7sah5f5svndqkd3z8jy"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/pysmi/default.nix b/pkgs/development/python-modules/pysmi/default.nix index 62c631ac98cc1..a3a7c3d7ec102 100644 --- a/pkgs/development/python-modules/pysmi/default.nix +++ b/pkgs/development/python-modules/pysmi/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://pysmi.sf.net; + homepage = "http://pysmi.sf.net"; description = "SNMP SMI/MIB Parser"; license = licenses.bsd2; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix index e40271289935f..c0bed855a4cd8 100644 --- a/pkgs/development/python-modules/pysnmp/default.nix +++ b/pkgs/development/python-modules/pysnmp/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyasn1 pycryptodomex pysmi ]; meta = with stdenv.lib; { - homepage = http://snmplabs.com/pysnmp/index.html; + homepage = "http://snmplabs.com/pysnmp/index.html"; description = "A pure-Python SNMPv1/v2c/v3 library"; license = licenses.bsd2; maintainers = with maintainers; [ primeos koral ]; diff --git a/pkgs/development/python-modules/pysnooper/default.nix b/pkgs/development/python-modules/pysnooper/default.nix index bb41a4d185569..61e1de20acf93 100644 --- a/pkgs/development/python-modules/pysnooper/default.nix +++ b/pkgs/development/python-modules/pysnooper/default.nix @@ -1,32 +1,30 @@ { lib , buildPythonPackage , fetchPypi -, python-toolbox , pytest , isPy27 }: buildPythonPackage rec { - version = "0.3.0"; + version = "0.4.1"; pname = "pysnooper"; src = fetchPypi { inherit version; pname = "PySnooper"; - sha256 = "14vcxrzfmfhsmdck1cb56a6lbfga15qfhlkap9mh47fgspcq8xkx"; + sha256 = "1xngly13x3ylwwcdml2ns8skpxip2myzavp3b9ff2dpqaalf0hdl"; }; # test dependency python-toolbox fails with py27 doCheck = !isPy27; checkInputs = [ - python-toolbox pytest ]; meta = with lib; { description = "A poor man's debugger for Python"; - homepage = https://github.com/cool-RR/PySnooper; + homepage = "https://github.com/cool-RR/PySnooper"; license = licenses.mit; maintainers = with maintainers; [ seqizz ]; }; diff --git a/pkgs/development/python-modules/pysolr/default.nix b/pkgs/development/python-modules/pysolr/default.nix index 0544b84e532fb..bf56d7ca56e67 100644 --- a/pkgs/development/python-modules/pysolr/default.nix +++ b/pkgs/development/python-modules/pysolr/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pysolr"; - version = "3.8.1"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "88ecb176627db6bcf9aeb94a3570bfa0363cb68be4b2a6d89a957d4a87c0a81b"; + sha256 = "1rj5jmscvxjwcmlfi6hmkj44l4x6n3ln5p7d8d18j566hzmmzw3f"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index ddab28471a8c4..83d1a60665821 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/amelchio/pysonos; + homepage = "https://github.com/amelchio/pysonos"; description = "A SoCo fork with fixes for Home Assistant"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ juaningan ]; diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index dd83e87d724ba..8de0bd02b51c9 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Apache Spark"; - homepage = https://github.com/apache/spark/tree/master/python; + homepage = "https://github.com/apache/spark/tree/master/python"; license = licenses.asl20; maintainers = [ maintainers.shlevy ]; }; diff --git a/pkgs/development/python-modules/pysparse/default.nix b/pkgs/development/python-modules/pysparse/default.nix index 5c3a6bb26f86e..fda5ad596088c 100644 --- a/pkgs/development/python-modules/pysparse/default.nix +++ b/pkgs/development/python-modules/pysparse/default.nix @@ -3,7 +3,8 @@ , fetchFromGitHub , numpy , setuptools -, liblapack +, blas +, lapack , isPy27 , python }: @@ -24,8 +25,8 @@ buildPythonPackage { propagatedBuildInputs = [ numpy - numpy.blas - liblapack + blas + lapack ]; # Include patches from working version of PySparse 1.3-dev in @@ -41,7 +42,7 @@ buildPythonPackage { ''; meta = with lib; { - homepage = https://github.com/PythonOptimizers/pysparse; + homepage = "https://github.com/PythonOptimizers/pysparse"; description = "A Sparse Matrix Library for Python"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; diff --git a/pkgs/development/python-modules/pyspf/default.nix b/pkgs/development/python-modules/pyspf/default.nix index 8f1fc795ea9fc..74e264b9da092 100644 --- a/pkgs/development/python-modules/pyspf/default.nix +++ b/pkgs/development/python-modules/pyspf/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = http://bmsi.com/python/milter.html; + homepage = "http://bmsi.com/python/milter.html"; description = "Python API for Sendmail Milters (SPF)"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/pyspotify/default.nix b/pkgs/development/python-modules/pyspotify/default.nix index e329d4f7b6e01..d6d0a6007f661 100644 --- a/pkgs/development/python-modules/pyspotify/default.nix +++ b/pkgs/development/python-modules/pyspotify/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://pyspotify.mopidy.com; + homepage = "http://pyspotify.mopidy.com"; description = "A Python interface to Spotify’s online music streaming service"; license = licenses.unfree; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix index d80cbf41629df..14abe9ff02d31 100644 --- a/pkgs/development/python-modules/pyspread/default.nix +++ b/pkgs/development/python-modules/pyspread/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pyspread is a non-traditional spreadsheet application that is based on and written in the programming language Python"; - homepage = https://manns.github.io/pyspread/; + homepage = "https://manns.github.io/pyspread/"; license = licenses.gpl3; }; } diff --git a/pkgs/development/python-modules/pysptk/default.nix b/pkgs/development/python-modules/pysptk/default.nix index 46864632964ae..a4a293ec1b074 100644 --- a/pkgs/development/python-modules/pysptk/default.nix +++ b/pkgs/development/python-modules/pysptk/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python wrapper for Speech Signal Processing Toolkit (SPTK)"; - homepage = https://pysptk.readthedocs.io/en/latest/; + homepage = "https://pysptk.readthedocs.io/en/latest/"; license = licenses.mit; maintainers = with maintainers; [ hyphon81 ]; }; diff --git a/pkgs/development/python-modules/pysqlite/default.nix b/pkgs/development/python-modules/pysqlite/default.nix index b13cd1781d289..a1916f09a6cd8 100644 --- a/pkgs/development/python-modules/pysqlite/default.nix +++ b/pkgs/development/python-modules/pysqlite/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://pysqlite.org/; + homepage = "https://pysqlite.org/"; description = "Python bindings for the SQLite embedded relational database engine"; longDescription = '' pysqlite is a DB-API 2.0-compliant database interface for SQLite. diff --git a/pkgs/development/python-modules/pysrim/default.nix b/pkgs/development/python-modules/pysrim/default.nix index 8fb7345505166..b8570427d3031 100644 --- a/pkgs/development/python-modules/pysrim/default.nix +++ b/pkgs/development/python-modules/pysrim/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "Srim Automation of Tasks via Python"; - homepage = https://gitlab.com/costrouc/pysrim; + homepage = "https://gitlab.com/costrouc/pysrim"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix index f383854d5b44e..e8c9aa3d5c88c 100644 --- a/pkgs/development/python-modules/pysrt/default.nix +++ b/pkgs/development/python-modules/pysrt/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ chardet ]; meta = with stdenv.lib; { - homepage = https://github.com/byroot/pysrt; + homepage = "https://github.com/byroot/pysrt"; license = licenses.gpl3; description = "Python library used to edit or create SubRip files"; }; diff --git a/pkgs/development/python-modules/pyssim/default.nix b/pkgs/development/python-modules/pyssim/default.nix index 38dddda9b2e52..ad2057351d9ad 100644 --- a/pkgs/development/python-modules/pyssim/default.nix +++ b/pkgs/development/python-modules/pyssim/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Module for computing Structured Similarity Image Metric (SSIM) in Python"; - homepage = https://github.com/jterrace/pyssim; + homepage = "https://github.com/jterrace/pyssim"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix index 8ae01e493970f..1900bc31f2122 100644 --- a/pkgs/development/python-modules/pystache/default.nix +++ b/pkgs/development/python-modules/pystache/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et"; - homepage = https://github.com/defunkt/pystache; + homepage = "https://github.com/defunkt/pystache"; license = licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix index 47d6ea7e26b84..0164b393493d7 100644 --- a/pkgs/development/python-modules/pystemd/default.nix +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -17,7 +17,7 @@ python.pkgs.buildPythonPackage rec { meta = with stdenv.lib; { description = "A thin Cython-based wrapper on top of libsystemd, focused on exposing the dbus API via sd-bus in an automated and easy to consume way."; - homepage = https://github.com/facebookincubator/pystemd/; + homepage = "https://github.com/facebookincubator/pystemd/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ flokli ]; }; diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix index e569042f729a4..1d3df7dfc3496 100644 --- a/pkgs/development/python-modules/pystemmer/default.nix +++ b/pkgs/development/python-modules/pystemmer/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Snowball stemming algorithms, for information retrieval"; - homepage = http://snowball.tartarus.org/; + homepage = "http://snowball.tartarus.org/"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index c1c765f1adc99..d46d3cfc5006b 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for Subversion"; - homepage = http://pysvn.tigris.org/; + homepage = "http://pysvn.tigris.org/"; license = licenses.asl20; broken = true; }; diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix index a1c70b4c20525..40b221d3dc9de 100644 --- a/pkgs/development/python-modules/pytado/default.nix +++ b/pkgs/development/python-modules/pytado/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python binding for Tado web API. Pythonize your central heating!"; - homepage = https://github.com/wmalgadey/PyTado; + homepage = "https://github.com/wmalgadey/PyTado"; license = licenses.gpl3; maintainers = with maintainers; [ elseym ]; }; diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix index 6b19a8f0c7355..9155151950a80 100644 --- a/pkgs/development/python-modules/pytaglib/default.nix +++ b/pkgs/development/python-modules/pytaglib/default.nix @@ -22,17 +22,17 @@ buildPythonPackage rec { patches = [ # fix tests on python 2.7 (fetchpatch { - url = https://github.com/supermihi/pytaglib/commit/0c4ae750fcd5b18d2553975c7e3e183e9dca5bf1.patch; + url = "https://github.com/supermihi/pytaglib/commit/0c4ae750fcd5b18d2553975c7e3e183e9dca5bf1.patch"; sha256 = "1kv3c68vimx5dc8aacvzphiaq916avmprxddi38wji8p2ql6vngj"; }) # properly install pyprinttags (fetchpatch { - url = https://github.com/supermihi/pytaglib/commit/ba7a1406ddf35ddc41ed57f1c8d1f2bc2ed2c93a.patch; + url = "https://github.com/supermihi/pytaglib/commit/ba7a1406ddf35ddc41ed57f1c8d1f2bc2ed2c93a.patch"; sha256 = "0pi0dcq7db5fd3jnbwnfsfsgxvlhnm07z5yhpp93shk0s7ci2bwp"; }) (fetchpatch { - url = https://github.com/supermihi/pytaglib/commit/28772f6f94d37f05728071381a0fa04c6a14783a.patch; + url = "https://github.com/supermihi/pytaglib/commit/28772f6f94d37f05728071381a0fa04c6a14783a.patch"; sha256 = "0h259vzj1l0gpibdf322yclyd10x5rh1anzhsjj2ghm6rj6q0r0m"; }) ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/supermihi/pytaglib; + homepage = "https://github.com/supermihi/pytaglib"; description = "Python 2.x/3.x bindings for the Taglib audio metadata library"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.mrkkrp ]; diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix index 675bd47481ebd..f09bd95d0703a 100644 --- a/pkgs/development/python-modules/pyte/default.nix +++ b/pkgs/development/python-modules/pyte/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple VTXXX-compatible linux terminal emulator"; - homepage = https://github.com/selectel/pyte; + homepage = "https://github.com/selectel/pyte"; license = licenses.lgpl3; maintainers = with maintainers; [ flokli ]; }; diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 451ff9d0bca9f..0111695ca73f7 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytesseract"; - version = "0.3.3"; + version = "0.3.4"; src = fetchPypi { inherit pname version; - sha256 = "0lml55jrvdzy9fm31zpw64fqc4d6p5djg1ax2kgnimzfscxghh8h"; + sha256 = "16l9b9f5v0a9j5jfgpd8irk9yhc9byzirrzv1rlkapdbz36sbn5g"; }; patches = [ @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://pypi.org/project/pytesseract/; + homepage = "https://pypi.org/project/pytesseract/"; license = licenses.asl20; description = "A Python wrapper for Google Tesseract"; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix index 7f707ebc46b63..f2491bd571c1f 100644 --- a/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/aio-libs/pytest-aiohttp/; + homepage = "https://github.com/aio-libs/pytest-aiohttp/"; description = "Pytest plugin for aiohttp support"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/pytest-annotate/default.nix b/pkgs/development/python-modules/pytest-annotate/default.nix index c21ae854c9a7b..53879bffbc8af 100644 --- a/pkgs/development/python-modules/pytest-annotate/default.nix +++ b/pkgs/development/python-modules/pytest-annotate/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/kensho-technologies/pytest-annotate; + homepage = "https://github.com/kensho-technologies/pytest-annotate"; description = "Generate PyAnnotate annotations from your pytest tests"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 0ef79cd09894d..2e98654c5d460 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/jlaska/pytest-ansible; + homepage = "https://github.com/jlaska/pytest-ansible"; description = "Plugin for py.test to simplify calling ansible modules from tests or fixtures"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/pytest-arraydiff/default.nix b/pkgs/development/python-modules/pytest-arraydiff/default.nix index e01d26b530ecb..8b1de360f4940 100644 --- a/pkgs/development/python-modules/pytest-arraydiff/default.nix +++ b/pkgs/development/python-modules/pytest-arraydiff/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin to help with comparing array output from tests"; - homepage = https://github.com/astrofrog/pytest-arraydiff; + homepage = "https://github.com/astrofrog/pytest-arraydiff"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix index 272b1fa56b90a..1365c43b03a73 100644 --- a/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/pkgs/development/python-modules/pytest-astropy/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Meta-package containing dependencies for testing"; - homepage = https://astropy.org; + homepage = "https://astropy.org"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 346530d4a8191..1484432c045ad 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "library for testing asyncio code with pytest"; license = licenses.asl20; - homepage = https://github.com/pytest-dev/pytest-asyncio; + homepage = "https://github.com/pytest-dev/pytest-asyncio"; }; } diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix index e215feac44f60..29225859dfd4a 100644 --- a/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/pkgs/development/python-modules/pytest-bdd/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "BDD library for the py.test runner"; - homepage = https://github.com/pytest-dev/pytest-bdd; + homepage = "https://github.com/pytest-dev/pytest-bdd"; license = licenses.mit; maintainers = with maintainers; [ jm2dev ]; }; diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index 924f16694c53f..eedbbc274f4f3 100644 --- a/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "Py.test fixture for benchmarking code"; - homepage = https://github.com/ionelmc/pytest-benchmark; + homepage = "https://github.com/ionelmc/pytest-benchmark"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-catchlog/default.nix b/pkgs/development/python-modules/pytest-catchlog/default.nix index fb020ba471fc7..35d3fce49d1b0 100644 --- a/pkgs/development/python-modules/pytest-catchlog/default.nix +++ b/pkgs/development/python-modules/pytest-catchlog/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { license = licenses.mit; - homepage = https://pypi.python.org/pypi/pytest-catchlog/; + homepage = "https://pypi.python.org/pypi/pytest-catchlog/"; description = "py.test plugin to catch log messages. This is a fork of pytest-capturelog."; }; } diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index f91b8191eb153..104a2ae64906e 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "pytest plugin allowing multiple failures per test"; - homepage = https://github.com/okken/pytest-check; + homepage = "https://github.com/okken/pytest-check"; license = licenses.mit; maintainers = [ maintainers.flokli ]; }; diff --git a/pkgs/development/python-modules/pytest-click/default.nix b/pkgs/development/python-modules/pytest-click/default.nix index e20ebc77ad1dd..e271373b73ef0 100644 --- a/pkgs/development/python-modules/pytest-click/default.nix +++ b/pkgs/development/python-modules/pytest-click/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "pytest plugin for click"; - homepage = https://github.com/Stranger6667/pytest-click; + homepage = "https://github.com/Stranger6667/pytest-click"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index e376abbc33a24..420afd3c55554 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing"; - homepage = https://github.com/pytest-dev/pytest-cov; + homepage = "https://github.com/pytest-dev/pytest-cov"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/pkgs/development/python-modules/pytest-cram/default.nix index ff2a29384bc0b..237e5ee7355ed 100644 --- a/pkgs/development/python-modules/pytest-cram/default.nix +++ b/pkgs/development/python-modules/pytest-cram/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = { description = "Test command-line applications with pytest and cram"; - homepage = https://github.com/tbekolay/pytest-cram; + homepage = "https://github.com/tbekolay/pytest-cram"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix index 1c323929a8e0c..7a6e3f7d93140 100644 --- a/pkgs/development/python-modules/pytest-datafiles/default.nix +++ b/pkgs/development/python-modules/pytest-datafiles/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { license = licenses.mit; - homepage = https://pypi.python.org/pypi/pytest-catchlog/; + homepage = "https://pypi.python.org/pypi/pytest-catchlog/"; description = "py.test plugin to create a 'tmpdir' containing predefined files/directories."; }; } diff --git a/pkgs/development/python-modules/pytest-dependency/default.nix b/pkgs/development/python-modules/pytest-dependency/default.nix index 2f82f4d7dbd49..13806781125ea 100644 --- a/pkgs/development/python-modules/pytest-dependency/default.nix +++ b/pkgs/development/python-modules/pytest-dependency/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/RKrahl/pytest-dependency; + homepage = "https://github.com/RKrahl/pytest-dependency"; description = "Manage dependencies of tests"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 6b60eb6d3c586..2417bdd4ac094 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "py.test plugin for testing of Django applications"; - homepage = https://pytest-django.readthedocs.org/en/latest/; + homepage = "https://pytest-django.readthedocs.org/en/latest/"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index cdf60b7b07c64..ed71592361ccc 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin with advanced doctest features"; - homepage = https://astropy.org; + homepage = "https://astropy.org"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-env/default.nix b/pkgs/development/python-modules/pytest-env/default.nix index 909a193bd7b1b..3e2fb0a05dc7f 100644 --- a/pkgs/development/python-modules/pytest-env/default.nix +++ b/pkgs/development/python-modules/pytest-env/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin used to set environment variables"; - homepage = https://github.com/MobileDynasty/pytest-env; + homepage = "https://github.com/MobileDynasty/pytest-env"; license = licenses.mit; maintainers = with maintainers; [ earvstedt ]; }; diff --git a/pkgs/development/python-modules/pytest-expect/default.nix b/pkgs/development/python-modules/pytest-expect/default.nix index 557446b5adcc8..dfd498c6b1e16 100644 --- a/pkgs/development/python-modules/pytest-expect/default.nix +++ b/pkgs/development/python-modules/pytest-expect/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "py.test plugin to store test expectations and mark tests based on them"; - homepage = https://github.com/gsnedders/pytest-expect; + homepage = "https://github.com/gsnedders/pytest-expect"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix index 7fc3d4e951fb0..7c7d4c66cd47a 100644 --- a/pkgs/development/python-modules/pytest-fixture-config/default.nix +++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple configuration objects for Py.test fixtures. Allows you to skip tests when their required config variables aren’t set."; - homepage = https://github.com/manahl/pytest-plugins; + homepage = "https://github.com/manahl/pytest-plugins"; license = licenses.mit; maintainers = with maintainers; [ ryansydnor ]; }; diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index d3b2df60399d4..88f5cc0e1888b 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "py.test plugin for efficiently checking PEP8 compliance"; - homepage = https://github.com/tholo/pytest-flake8; + homepage = "https://github.com/tholo/pytest-flake8"; maintainers = with lib.maintainers; [ jluttine ]; license = lib.licenses.bsd2; }; diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index df7981e6bfc0f..d1f06b03a8d3a 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { license = licenses.mit; - homepage = https://pypi.python.org/pypi/pytest-flakes; + homepage = "https://pypi.python.org/pypi/pytest-flakes"; description = "pytest plugin to check source code with pyflakes"; }; } diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index 472e0b3559d0f..3139e32a0b176 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -25,8 +25,8 @@ buildPythonPackage rec { meta = { description = "Run tests in isolated forked subprocesses"; - homepage = https://github.com/pytest-dev/pytest-forked; + homepage = "https://github.com/pytest-dev/pytest-forked"; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index 6d84ef0de7db5..836da1e157ffa 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = { description = "Easily test your HTTP library against a local copy of httpbin.org"; - homepage = https://github.com/kevin1024/pytest-httpbin; + homepage = "https://github.com/kevin1024/pytest-httpbin"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index 235d6f3af2451..9aa4410ec030d 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin to perform isort checks (import ordering)"; - homepage = https://github.com/moccu/pytest-isort/; + homepage = "https://github.com/moccu/pytest-isort/"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index 5f2516b646c5c..6ea0b9d3e574d 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "Plugin for the pytest testing framework to test server connections locally"; - homepage = https://pypi.python.org/pypi/pytest-localserver; + homepage = "https://pypi.python.org/pypi/pytest-localserver"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix index 369ddf2c47676..9b25e2045e9d4 100644 --- a/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/pkgs/development/python-modules/pytest-metadata/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-metadata"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1fk6icip2x1nh4kzhbc8cnqrs77avpqvj7ny3xadfh6yhn9aaw90"; + sha256 = "1711gippwsl7c1wi8pc2y75xqq5sn1sscpqvrxjvpjm8pcx2138n"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index c4ef0d8111170..c65e617b79503 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Thin-wrapper around the mock package for easier use with py.test."; - homepage = https://github.com/pytest-dev/pytest-mock; + homepage = "https://github.com/pytest-dev/pytest-mock"; license = licenses.mit; maintainers = with maintainers; [ nand0p ]; }; diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index d86647b7503a1..a239c1dbe634f 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pytest plugin to help with testing figures output from Matplotlib"; - homepage = https://github.com/matplotlib/pytest-mpl; + homepage = "https://github.com/matplotlib/pytest-mpl"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index 4fb2146d7a74d..2e1bd1b626d92 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Mypy static type checker plugin for Pytest"; - homepage = https://github.com/dbader/pytest-mypy; + homepage = "https://github.com/dbader/pytest-mypy"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-openfiles/default.nix b/pkgs/development/python-modules/pytest-openfiles/default.nix index 0fb23f245fbef..daa55f91cd292 100644 --- a/pkgs/development/python-modules/pytest-openfiles/default.nix +++ b/pkgs/development/python-modules/pytest-openfiles/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin for detecting inadvertent open file handles"; - homepage = https://astropy.org; + homepage = "https://astropy.org"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-ordering/default.nix b/pkgs/development/python-modules/pytest-ordering/default.nix index ec340806964b9..6cd1ed227976f 100644 --- a/pkgs/development/python-modules/pytest-ordering/default.nix +++ b/pkgs/development/python-modules/pytest-ordering/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/ftobia/pytest-ordering; + homepage = "https://github.com/ftobia/pytest-ordering"; description = "Pytest plugin to run your tests in a specific order"; license = licenses.mit; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/development/python-modules/pytest-pep257/default.nix b/pkgs/development/python-modules/pytest-pep257/default.nix index 0ff8890a6fbd0..8c20cf873aba8 100644 --- a/pkgs/development/python-modules/pytest-pep257/default.nix +++ b/pkgs/development/python-modules/pytest-pep257/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pep257 ]; meta = with stdenv.lib; { - homepage = https://github.com/anderslime/pytest-pep257; + homepage = "https://github.com/anderslime/pytest-pep257"; description = "py.test plugin for PEP257"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pytest-pep8/default.nix b/pkgs/development/python-modules/pytest-pep8/default.nix index 1fcb99574b2a8..82a900a9d2f02 100644 --- a/pkgs/development/python-modules/pytest-pep8/default.nix +++ b/pkgs/development/python-modules/pytest-pep8/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { license = licenses.mit; - homepage = https://pypi.python.org/pypi/pytest-pep8; + homepage = "https://pypi.python.org/pypi/pytest-pep8"; description = "pytest plugin to check PEP8 requirements"; }; } diff --git a/pkgs/development/python-modules/pytest-raisesregexp/default.nix b/pkgs/development/python-modules/pytest-raisesregexp/default.nix index bc7d141320034..638548e9424f1 100644 --- a/pkgs/development/python-modules/pytest-raisesregexp/default.nix +++ b/pkgs/development/python-modules/pytest-raisesregexp/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple pytest plugin to look for regex in Exceptions"; - homepage = https://github.com/Walkman/pytest_raisesregexp; + homepage = "https://github.com/Walkman/pytest_raisesregexp"; license = with licenses; [ mit ]; }; } diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index 4de823c2c8702..c9871368bbe4e 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://pytest-relaxed.readthedocs.io/; + homepage = "https://pytest-relaxed.readthedocs.io/"; description = "Relaxed test discovery/organization for pytest"; license = licenses.bsd0; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/pytest-remotedata/default.nix b/pkgs/development/python-modules/pytest-remotedata/default.nix index 7d801a2789c5f..94bc02159bf43 100644 --- a/pkgs/development/python-modules/pytest-remotedata/default.nix +++ b/pkgs/development/python-modules/pytest-remotedata/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin for controlling remote data access"; - homepage = https://astropy.org; + homepage = "https://astropy.org"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index f5c35905cf651..f772fb131d840 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "pytest plugin to re-run tests to eliminate flaky failures"; - homepage = https://github.com/pytest-dev/pytest-rerunfailures; + homepage = "https://github.com/pytest-dev/pytest-rerunfailures"; license = licenses.mpl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/pytest-sanic/default.nix b/pkgs/development/python-modules/pytest-sanic/default.nix index 647d7abb07c4e..68f8fd4fcee7f 100644 --- a/pkgs/development/python-modules/pytest-sanic/default.nix +++ b/pkgs/development/python-modules/pytest-sanic/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "A pytest plugin for Sanic"; - homepage = https://github.com/yunstanford/pytest-sanic/; + homepage = "https://github.com/yunstanford/pytest-sanic/"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix index c940dcadc7ea5..909b8e8010361 100644 --- a/pkgs/development/python-modules/pytest-services/default.nix +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Services plugin for pytest testing framework"; - homepage = https://github.com/pytest-dev/pytest-services; + homepage = "https://github.com/pytest-dev/pytest-services"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index 6bc7047866ee4..ef03762e188d7 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A goodie-bag of unix shell and environment tools for py.test"; - homepage = https://github.com/manahl/pytest-plugins; + homepage = "https://github.com/manahl/pytest-plugins"; maintainers = with maintainers; [ ryansydnor ]; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pytest-socket/default.nix b/pkgs/development/python-modules/pytest-socket/default.nix index a28970a8ec45e..dcfa203601467 100644 --- a/pkgs/development/python-modules/pytest-socket/default.nix +++ b/pkgs/development/python-modules/pytest-socket/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest Plugin to disable socket calls during tests"; - homepage = https://github.com/miketheman/pytest-socket; + homepage = "https://github.com/miketheman/pytest-socket"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-subtesthack/default.nix b/pkgs/development/python-modules/pytest-subtesthack/default.nix index b639b61ad4d3c..d42eb5f8aa31b 100644 --- a/pkgs/development/python-modules/pytest-subtesthack/default.nix +++ b/pkgs/development/python-modules/pytest-subtesthack/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Terrible plugin to set up and tear down fixtures within the test function itself"; - homepage = https://github.com/untitaker/pytest-subtesthack; + homepage = "https://github.com/untitaker/pytest-subtesthack"; license = licenses.publicDomain; }; } diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix index 5ece578dc2587..2ff6f40e34485 100644 --- a/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/pkgs/development/python-modules/pytest-sugar/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "A plugin that changes the default look and feel of py.test"; - homepage = https://github.com/Frozenball/pytest-sugar; + homepage = "https://github.com/Frozenball/pytest-sugar"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index 3849fffd47c0d..30bd93e433dc4 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; patches = fetchpatch { - url = https://bitbucket.org/pytest-dev/pytest-timeout/commits/36998c891573d8ec1db1acd4f9438cb3cf2aee2e/raw; + url = "https://bitbucket.org/pytest-dev/pytest-timeout/commits/36998c891573d8ec1db1acd4f9438cb3cf2aee2e/raw"; sha256 = "05zc2w7mjgv8rm8i1cbxp7k09vlscmay5iy78jlzgjqkrx3wkf46"; }; @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib;{ description = "py.test plugin to abort hanging tests"; - homepage = https://bitbucket.org/pytest-dev/pytest-timeout/; + homepage = "https://bitbucket.org/pytest-dev/pytest-timeout/"; license = licenses.mit; maintainers = with maintainers; [ makefu costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix index a5c3515026837..1f2978228e248 100644 --- a/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/pkgs/development/python-modules/pytest-tornado/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "A py.test plugin providing fixtures and markers to simplify testing of asynchronous tornado applications."; - homepage = https://github.com/eugeniy/pytest-tornado; + homepage = "https://github.com/eugeniy/pytest-tornado"; license = licenses.asl20; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix index 0e8add5417be9..27350efd74576 100644 --- a/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Create a Python virtual environment in your test that cleans up on teardown. The fixture has utility methods to install packages and list what’s installed."; - homepage = https://github.com/manahl/pytest-plugins; + homepage = "https://github.com/manahl/pytest-plugins"; license = licenses.mit; maintainers = with maintainers; [ ryansydnor ]; }; diff --git a/pkgs/development/python-modules/pytest-warnings/default.nix b/pkgs/development/python-modules/pytest-warnings/default.nix index 78cd02897f9ae..7f9de5b5eca52 100644 --- a/pkgs/development/python-modules/pytest-warnings/default.nix +++ b/pkgs/development/python-modules/pytest-warnings/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = { description = "Plugin to list Python warnings in pytest report"; - homepage = https://github.com/fschulze/pytest-warnings; + homepage = "https://github.com/fschulze/pytest-warnings"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index c8e41fdaa35d8..d71d28612eec9 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "py.test xdist plugin for distributed testing and loop-on-failing modes"; - homepage = https://github.com/pytest-dev/pytest-xdist; + homepage = "https://github.com/pytest-dev/pytest-xdist"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pytest/4.nix b/pkgs/development/python-modules/pytest/4.nix index 2524dc61afdca..d77e52ab7f6df 100644 --- a/pkgs/development/python-modules/pytest/4.nix +++ b/pkgs/development/python-modules/pytest/4.nix @@ -6,11 +6,6 @@ buildPythonPackage rec { version = "4.6.8"; pname = "pytest"; - preCheck = '' - # don't test bash builtins - rm testing/test_argcomplete.py - ''; - src = fetchPypi { inherit pname version; sha256 = "6192875be8af57b694b7c4904e909680102befcb99e610ef3d9f786952f795aa"; @@ -25,7 +20,14 @@ buildPythonPackage rec { doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 checkPhase = '' runHook preCheck - $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" + + # don't test bash builtins + rm testing/test_argcomplete.py + + # determinism - this test writes non deterministic bytecode + rm -rf testing/test_assertrewrite.py + + PYTHONDONTWRITEBYTECODE=1 $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" runHook postCheck ''; @@ -39,7 +41,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://docs.pytest.org; + homepage = "https://docs.pytest.org"; description = "Framework for writing tests"; maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index bb44cebad9145..8f86e41be3b75 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = https://docs.pytest.org; + homepage = "https://docs.pytest.org"; description = "Framework for writing tests"; maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytestcache/default.nix b/pkgs/development/python-modules/pytestcache/default.nix index 2875bf88340fb..f2427991e3f24 100644 --- a/pkgs/development/python-modules/pytestcache/default.nix +++ b/pkgs/development/python-modules/pytestcache/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { license = licenses.mit; - homepage = https://pypi.python.org/pypi/pytest-cache/; + homepage = "https://pypi.python.org/pypi/pytest-cache/"; description = "pytest plugin with mechanisms for caching across test runs"; }; } diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix index fa937e9626c33..5ea632fa7f80c 100644 --- a/pkgs/development/python-modules/pytestrunner/default.nix +++ b/pkgs/development/python-modules/pytestrunner/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Invoke py.test as distutils command with dependency resolution"; - homepage = https://github.com/pytest-dev/pytest-runner; + homepage = "https://github.com/pytest-dev/pytest-runner"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix index e372913af7dfd..1bd44dc3fc7c0 100644 --- a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix +++ b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = https://github.com/tgalal/python-axolotl-curve25519; + homepage = "https://github.com/tgalal/python-axolotl-curve25519"; description = "Curve25519 with ed25519 signatures"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/pkgs/development/python-modules/python-axolotl/default.nix index 55a0a355a9e66..3b55811f4e47c 100644 --- a/pkgs/development/python-modules/python-axolotl/default.nix +++ b/pkgs/development/python-modules/python-axolotl/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography python-axolotl-curve25519 protobuf ]; meta = with lib; { - homepage = https://github.com/tgalal/python-axolotl; + homepage = "https://github.com/tgalal/python-axolotl"; description = "Python port of libaxolotl-android"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix index 62aa11749a8a4..b4857d7abefbe 100644 --- a/pkgs/development/python-modules/python-binance/default.nix +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = { description = "Binance Exchange API python implementation for automated trading"; - homepage = https://github.com/sammchardy/python-binance; + homepage = "https://github.com/sammchardy/python-binance"; license = lib.licenses.mit; maintainers = [ lib.maintainers.bhipple ]; }; diff --git a/pkgs/development/python-modules/python-constraint/default.nix b/pkgs/development/python-modules/python-constraint/default.nix new file mode 100644 index 0000000000000..e6fcc4f8ab7ac --- /dev/null +++ b/pkgs/development/python-modules/python-constraint/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + # Check inputs +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-constraint"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "python-constraint"; + repo = "python-constraint"; + rev = version; + sha256 = "1dv11406yxmmgkkhwzqicajbg2bmla5xfad7lv57zyahxz8jzz94"; + }; + + checkInputs = [ pytestCheckHook ]; + dontUseSetuptoolsCheck = true; + + meta = with lib; { + description = "Constraint Solving Problem resolver for Python."; + homepage = "https://labix.org/doc/constraint/"; + downloadPage = "https://github.com/python-constraint/python-constraint/releases"; + license = licenses.bsd2; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/python-ctags3/default.nix b/pkgs/development/python-modules/python-ctags3/default.nix index c37abf7b55f4a..bc7b848499689 100644 --- a/pkgs/development/python-modules/python-ctags3/default.nix +++ b/pkgs/development/python-modules/python-ctags3/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with lib; { description = "Ctags indexing python bindings"; - homepage = https://github.com/jonashaag/python-ctags3; + homepage = "https://github.com/jonashaag/python-ctags3"; license = licenses.lgpl3Plus; }; } diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index 9cfc68dee4659..d643603a0679e 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -44,19 +44,19 @@ buildPythonPackage rec { checkInputs = [ nose dbus dbus-python which pycodestyle pyflakes - pygobject3 bluez bluez.test networkmanager + pygobject3 bluez (lib.getOutput "test" bluez) networkmanager ]; checkPhase = '' runHook preCheck - export PATH="$PATH:${bluez.test}/test"; + export PATH="$PATH:${lib.getOutput "test" bluez}/test"; nosetests -v runHook postCheck ''; meta = with lib; { description = "Mock D-Bus objects for tests"; - homepage = https://github.com/martinpitt/python-dbusmock; + homepage = "https://github.com/martinpitt/python-dbusmock"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ callahad ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/python-docx/default.nix b/pkgs/development/python-modules/python-docx/default.nix index f86cdc665a1d0..15ccd45760ddb 100644 --- a/pkgs/development/python-modules/python-docx/default.nix +++ b/pkgs/development/python-modules/python-docx/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Create and update Microsoft Word .docx files"; - homepage = https://python-docx.readthedocs.io/en/latest/; + homepage = "https://python-docx.readthedocs.io/en/latest/"; license = lib.licenses.mit; maintainers = [ lib.maintainers.alexchapman ]; }; diff --git a/pkgs/development/python-modules/python-doi/default.nix b/pkgs/development/python-modules/python-doi/default.nix index 0cb6b2a7502dc..2fcd30e84b3e1 100644 --- a/pkgs/development/python-modules/python-doi/default.nix +++ b/pkgs/development/python-modules/python-doi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library to work with Document Object Identifiers (doi)"; - homepage = https://github.com/alejandrogallo/python-doi; + homepage = "https://github.com/alejandrogallo/python-doi"; maintainers = with maintainers; [ teto ]; }; } diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index d663bfd8bc950..bc71a662f3ecd 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Add .env support to your django/flask apps in development and deployments"; - homepage = https://github.com/theskumar/python-dotenv; + homepage = "https://github.com/theskumar/python-dotenv"; license = licenses.bsdOriginal; maintainers = with maintainers; [ earvstedt ]; }; diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix index 4691785dae161..523229220efe7 100644 --- a/pkgs/development/python-modules/python-editor/default.nix +++ b/pkgs/development/python-modules/python-editor/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library that provides the `editor` module for programmatically"; - homepage = https://github.com/fmoo/python-editor; + homepage = "https://github.com/fmoo/python-editor"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 5cf1efc49b7e6..419b490648736 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -1,35 +1,46 @@ -{ stdenv, fetchurl, buildPythonPackage, pkgconfig, python, enlightenment }: +{ stdenv +, fetchurl +, buildPythonPackage +, pkgconfig +, python +, dbus-python +, enlightenment +}: # Should be bumped along with EFL! buildPythonPackage rec { pname = "python-efl"; - version = "1.23.0"; + version = "1.24.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz"; - sha256 = "16yn6a1b9167nfmryyi44ma40m20ansfpwgrvqzfvwix7qaz9pib"; + sha256 = "1vk1cdd959gia4a9qzyq56a9zw3lqf9ck66k8c9g3c631mp5cfpy"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ enlightenment.efl ]; - propagatedBuildInputs = [ python.pkgs.dbus-python ]; + propagatedBuildInputs = [ dbus-python ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${stdenv.lib.getDev python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" + NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl evas) $NIX_CFLAGS_COMPILE" ''; - preBuild = "${python.interpreter} setup.py build_ext"; + preBuild = '' + ${python.interpreter} setup.py build_ext + ''; - installPhase= "${python.interpreter} setup.py install --prefix=$out"; + installPhase = '' + ${python.interpreter} setup.py install --prefix=$out + ''; doCheck = false; meta = with stdenv.lib; { description = "Python bindings for EFL and Elementary"; - homepage = https://phab.enlightenment.org/w/projects/python_bindings_for_efl/; + homepage = "https://phab.enlightenment.org/w/projects/python_bindings_for_efl/"; platforms = platforms.linux; license = with licenses; [ gpl3 lgpl3 ]; maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index e1c380b64c3a5..128fb8961d4d9 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Engine.IO server"; - homepage = https://github.com/miguelgrinberg/python-engineio/; + homepage = "https://github.com/miguelgrinberg/python-engineio/"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/python-modules/python-etcd/default.nix b/pkgs/development/python-modules/python-etcd/default.nix index 1369479ac4f44..714c324b44051 100644 --- a/pkgs/development/python-modules/python-etcd/default.nix +++ b/pkgs/development/python-modules/python-etcd/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python client for Etcd"; - homepage = https://github.com/jplana/python-etcd; + homepage = "https://github.com/jplana/python-etcd"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/python-fontconfig/default.nix b/pkgs/development/python-modules/python-fontconfig/default.nix index dbfde18a87412..88778ff794eaf 100644 --- a/pkgs/development/python-modules/python-fontconfig/default.nix +++ b/pkgs/development/python-modules/python-fontconfig/default.nix @@ -26,7 +26,7 @@ in buildPythonPackage rec { ''; meta = { - homepage = https://github.com/Vayn/python-fontconfig; + homepage = "https://github.com/Vayn/python-fontconfig"; description = "Python binding for Fontconfig"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ gnidorah ]; diff --git a/pkgs/development/python-modules/python-forecastio/default.nix b/pkgs/development/python-modules/python-forecastio/default.nix index 68f9ad16977b4..7ef2eee4f2e51 100644 --- a/pkgs/development/python-modules/python-forecastio/default.nix +++ b/pkgs/development/python-modules/python-forecastio/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://zeevgilovitz.com/python-forecast.io/; + homepage = "https://zeevgilovitz.com/python-forecast.io/"; description = "A thin Python Wrapper for the Dark Sky (formerly forecast.io) weather API"; license = licenses.bsd2; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index bbdf7aa6033c3..0c1f7c67e3df5 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -1,22 +1,24 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests, six, mock, httmock }: +{ stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder }: buildPythonPackage rec { - pname = "python-gitlab"; - version = "1.15.0"; + pname = "python-gitlab"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "45125a0ed4d0027d4317bdbd71ca02fc52b0ac160b9d2c3c5be131b4d19f867e"; + sha256 = "4c4ea60c8303f4214522b18038df017cae35afda7474efa0b4e19c2e73bc3ae2"; }; - propagatedBuildInputs = [ requests six ]; + propagatedBuildInputs = [ requests ]; checkInputs = [ mock httmock ]; + disabled = pythonOlder "3.6"; + meta = with stdenv.lib; { description = "Interact with GitLab API"; - homepage = https://github.com/python-gitlab/python-gitlab; - license = licenses.lgpl3; + homepage = "https://github.com/python-gitlab/python-gitlab"; + license = licenses.lgpl3; maintainers = with maintainers; [ nyanloutre ]; }; } diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 90dee35d290a3..17deff412cb72 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A wrapper for the Gnu Privacy Guard"; - homepage = https://pypi.python.org/pypi/python-gnupg; + homepage = "https://pypi.python.org/pypi/python-gnupg"; license = licenses.bsd3; maintainers = with maintainers; [ copumpkin ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix index 1fdd036bd127e..e7dbaa1d64e35 100644 --- a/pkgs/development/python-modules/python-hosts/default.nix +++ b/pkgs/development/python-modules/python-hosts/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library for managing a hosts file. It enables adding and removing entries, or importing them from a file or URL"; - homepage = https://github.com/jonhadfield/python-hosts; + homepage = "https://github.com/jonhadfield/python-hosts"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index df7e07e552391..d6986f06975af 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ future six ecdsa rsa ]; meta = with stdenv.lib; { - homepage = https://github.com/mpdavis/python-jose; + homepage = "https://github.com/mpdavis/python-jose"; description = "A JOSE implementation in Python"; license = licenses.mit; maintainers = [ maintainers.jhhuh ]; diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix index 0141141b43c40..26ab4c118ce50 100644 --- a/pkgs/development/python-modules/python-json-logger/default.nix +++ b/pkgs/development/python-modules/python-json-logger/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; meta = with stdenv.lib; { - homepage = https://github.com/madzak/python-json-logger; + homepage = "https://github.com/madzak/python-json-logger"; description = "A python library adding a json log formatter"; license = licenses.bsdOriginal; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index f972187d6fc7e..16c53cd7caba6 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder , pytest, mock, pytestcov, coverage -, future, futures, ujson +, future, futures, ujson, isPy38 }: buildPythonPackage rec { @@ -26,11 +26,13 @@ buildPythonPackage rec { pytest ''; + disabled = isPy38; + propagatedBuildInputs = [ future ujson ] ++ stdenv.lib.optional (pythonOlder "3.2") futures; meta = with stdenv.lib; { - homepage = https://github.com/palantir/python-jsonrpc-server; + homepage = "https://github.com/palantir/python-jsonrpc-server"; description = "A Python 2 and 3 asynchronous JSON RPC server"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index c8bb1b5fa6f80..9f42839960d3c 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -71,7 +71,7 @@ buildPythonPackage rec { ++ stdenv.lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ]; meta = with stdenv.lib; { - homepage = https://github.com/palantir/python-language-server; + homepage = "https://github.com/palantir/python-language-server"; description = "An implementation of the Language Server Protocol for Python"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/python-modules/python-ldap-test/default.nix b/pkgs/development/python-modules/python-ldap-test/default.nix index 3ba81cacfd41c..3f543e8569b91 100644 --- a/pkgs/development/python-modules/python-ldap-test/default.nix +++ b/pkgs/development/python-modules/python-ldap-test/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tool for testing code speaking with LDAP server"; - homepage = https://github.com/zoldar/python-ldap-test; + homepage = "https://github.com/zoldar/python-ldap-test"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/python-libarchive/default.nix b/pkgs/development/python-modules/python-libarchive/default.nix index bae94191fc034..02fe234792444 100644 --- a/pkgs/development/python-modules/python-libarchive/default.nix +++ b/pkgs/development/python-modules/python-libarchive/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Multi-format archive and compression library"; - homepage = https://libarchive.org/; + homepage = "https://libarchive.org/"; license = licenses.bsd0; broken = true; }; diff --git a/pkgs/development/python-modules/python-logstash/default.nix b/pkgs/development/python-modules/python-logstash/default.nix index f4ecccf068323..55d3c60cd448a 100644 --- a/pkgs/development/python-modules/python-logstash/default.nix +++ b/pkgs/development/python-modules/python-logstash/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python logging handler for Logstash"; - homepage = https://github.com/vklochan/python-logstash; + homepage = "https://github.com/vklochan/python-logstash"; maintainers = with maintainers; [ peterromfeldhk ]; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index e967ba9934d28..4c66ed02cfcab 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = { description = "LZ4 Bindings for Python"; - homepage = https://github.com/python-lz4/python-lz4; + homepage = "https://github.com/python-lz4/python-lz4"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/python-lzf/default.nix b/pkgs/development/python-modules/python-lzf/default.nix index e8b89563f03a6..3064afe3ba425 100644 --- a/pkgs/development/python-modules/python-lzf/default.nix +++ b/pkgs/development/python-modules/python-lzf/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "liblzf python bindings"; - homepage = https://github.com/teepark/python-lzf; + homepage = "https://github.com/teepark/python-lzf"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index d48a6288a7ddb..7ba794716bfec 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "A python interface to the libmagic file type identification library"; - homepage = https://github.com/ahupp/python-magic; + homepage = "https://github.com/ahupp/python-magic"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index 2b3c4ba1e9b50..61cd5e34855ce 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -59,7 +59,7 @@ in buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for Mapnik"; - homepage = https://mapnik.org; + homepage = "https://mapnik.org"; license = licenses.lgpl21; }; diff --git a/pkgs/development/python-modules/python-markdown-math/default.nix b/pkgs/development/python-modules/python-markdown-math/default.nix index 053b4897e833f..a72e20021df3e 100644 --- a/pkgs/development/python-modules/python-markdown-math/default.nix +++ b/pkgs/development/python-modules/python-markdown-math/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Math extension for Python-Markdown"; - homepage = https://github.com/mitya57/python-markdown-math; + homepage = "https://github.com/mitya57/python-markdown-math"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ klntsky ]; }; diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index eb7c915319650..5b8c140df67ec 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "python-miio"; - version = "0.4.8"; + version = "0.5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "19423b3386b23d2e0fc94a8f6a358bcfbb44eed05376e33fd434d26d168bd18c"; + sha256 = "fa9c318256945ad4a8623fdf921ce81c466a7aea18b04a6711efb662f520b195"; }; checkInputs = [ pytest ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for interfacing with Xiaomi smart appliances"; - homepage = https://github.com/rytilahti/python-miio; + homepage = "https://github.com/rytilahti/python-miio"; license = licenses.gpl3; maintainers = with maintainers; [ flyfloh ]; }; diff --git a/pkgs/development/python-modules/python-mnist/default.nix b/pkgs/development/python-modules/python-mnist/default.nix index 67cb4eae25117..3b0ecf2377023 100644 --- a/pkgs/development/python-modules/python-mnist/default.nix +++ b/pkgs/development/python-modules/python-mnist/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/sorki/python-mnist; + homepage = "https://github.com/sorki/python-mnist"; description = "Simple MNIST data parser written in Python"; license = licenses.bsd3; maintainers = with maintainers; [ cmcdragonkai ]; diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix index e3e75d8860433..c279234248723 100644 --- a/pkgs/development/python-modules/python-multipart/default.nix +++ b/pkgs/development/python-modules/python-multipart/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "A streaming multipart parser for Python"; - homepage = https://github.com/andrew-d/python-multipart; + homepage = "https://github.com/andrew-d/python-multipart"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/python-nomad/default.nix b/pkgs/development/python-modules/python-nomad/default.nix index c4ec84512a62e..f03b3b10e4871 100644 --- a/pkgs/development/python-modules/python-nomad/default.nix +++ b/pkgs/development/python-modules/python-nomad/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-nomad"; - version = "1.1.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1rf6ad35vg3yi1p4l383xwx0ammdvr1k71bxg93bgcvljypx4cyn"; + sha256 = "0ivkfdrmb4wpyawvwrgm3jvx6hn49vqjpwbkmkmamigghqqwacx3"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/python-oauth2/default.nix b/pkgs/development/python-modules/python-oauth2/default.nix index 4361b0a108dd3..bc3c13478e61b 100644 --- a/pkgs/development/python-modules/python-oauth2/default.nix +++ b/pkgs/development/python-modules/python-oauth2/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Framework that aims at making it easy to provide authentication via OAuth 2.0 within an application stack"; - homepage = https://github.com/wndhydrnt/python-oauth2; + homepage = "https://github.com/wndhydrnt/python-oauth2"; license = licenses.mit; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/python-packer/default.nix b/pkgs/development/python-modules/python-packer/default.nix index ff3d28b47466e..04cbaf772479a 100644 --- a/pkgs/development/python-modules/python-packer/default.nix +++ b/pkgs/development/python-modules/python-packer/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An interface for packer.io"; - homepage = https://github.com/nir0s/python-packer; + homepage = "https://github.com/nir0s/python-packer"; license = licenses.asl20; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/pkgs/development/python-modules/python-periphery/default.nix index 1c6cdcc28a1f4..d1f5de83a4c89 100644 --- a/pkgs/development/python-modules/python-periphery/default.nix +++ b/pkgs/development/python-modules/python-periphery/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/vsergeev/python-periphery; + homepage = "https://github.com/vsergeev/python-periphery"; description = "Linux Peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) with Python 2 & 3"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bandresen ]; diff --git a/pkgs/development/python-modules/python-prctl/default.nix b/pkgs/development/python-modules/python-prctl/default.nix index 5d092f5e6eab7..4da75195025d3 100644 --- a/pkgs/development/python-modules/python-prctl/default.nix +++ b/pkgs/development/python-modules/python-prctl/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = { description = "Python(ic) interface to the linux prctl syscall"; - homepage = https://github.com/seveas/python-prctl; + homepage = "https://github.com/seveas/python-prctl"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ catern ]; diff --git a/pkgs/development/python-modules/python-ptrace/default.nix b/pkgs/development/python-modules/python-ptrace/default.nix index 426b956880ada..9ca1affed887c 100644 --- a/pkgs/development/python-modules/python-ptrace/default.nix +++ b/pkgs/development/python-modules/python-ptrace/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python binding of ptrace library"; - homepage = https://github.com/vstinner/python-ptrace; + homepage = "https://github.com/vstinner/python-ptrace"; license = licenses.gpl2; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index 9c2b18ba00696..b9e7c136b3804 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/python-rapidjson/python-rapidjson; + homepage = "https://github.com/python-rapidjson/python-rapidjson"; description = "Python wrapper around rapidjson "; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/python-simple-hipchat/default.nix b/pkgs/development/python-modules/python-simple-hipchat/default.nix index 24a21959b8c91..f41aefe92aaaa 100644 --- a/pkgs/development/python-modules/python-simple-hipchat/default.nix +++ b/pkgs/development/python-modules/python-simple-hipchat/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Easy peasy wrapper for HipChat's v1 API"; - homepage = https://github.com/kurttheviking/simple-hipchat-py; + homepage = "https://github.com/kurttheviking/simple-hipchat-py"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index 008e5e25a480a..d83fa3b9ad344 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/un33k/python-slugify; + homepage = "https://github.com/un33k/python-slugify"; description = "A Python Slugify application that handles Unicode"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/pkgs/development/python-modules/python-snappy/default.nix index 328b1ec0994d7..084c66e172ad0 100644 --- a/pkgs/development/python-modules/python-snappy/default.nix +++ b/pkgs/development/python-modules/python-snappy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for the snappy compression library from Google"; - homepage = https://github.com/andrix/python-snappy; + homepage = "https://github.com/andrix/python-snappy"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 8f85f991534d9..23c806c3bab3b 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Socket.IO server"; - homepage = https://github.com/miguelgrinberg/python-socketio/; + homepage = "https://github.com/miguelgrinberg/python-socketio/"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix index 846a9c26d70b7..b6a4893437210 100644 --- a/pkgs/development/python-modules/python-sql/default.nix +++ b/pkgs/development/python-modules/python-sql/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = { - homepage = https://python-sql.tryton.org/; + homepage = "https://python-sql.tryton.org/"; description = "A library to write SQL queries in a pythonic way"; maintainers = with lib.maintainers; [ johbo ]; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 9b70d76bfed77..f36f82395685f 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -2,42 +2,40 @@ , fetchPypi , buildPythonPackage , certifi +, decorator , future , urllib3 , tornado , pytest +, isPy3k }: buildPythonPackage rec { pname = "python-telegram-bot"; - version = "12.3.0"; + version = "12.7"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0yrg5342zz0hpf2pc85ffwx57msa6jpcmvvjfkzh8nh2lc98aq21"; + sha256 = "1vwf4pgjrg9a6w51ds9wmzq31bmi3f7xs79gdzzfxfmqmy1hb2r1"; }; - prePatch = '' - rm -rf telegram/vendor - substituteInPlace telegram/utils/request.py \ - --replace "import telegram.vendor.ptb_urllib3.urllib3 as urllib3" "import urllib3 as urllib3" \ - --replace "import telegram.vendor.ptb_urllib3.urllib3.contrib.appengine as appengine" "import urllib3.contrib.appengine as appengine" \ - --replace "from telegram.vendor.ptb_urllib3.urllib3.connection import HTTPConnection" "from urllib3.connection import HTTPConnection" \ - --replace "from telegram.vendor.ptb_urllib3.urllib3.util.timeout import Timeout" "from urllib3.util.timeout import Timeout" \ - --replace "from telegram.vendor.ptb_urllib3.urllib3.fields import RequestField" "from urllib3.fields import RequestField" + checkInputs = [ pytest ]; + propagatedBuildInputs = [ certifi future urllib3 tornado decorator ]; - touch LICENSE.dual + # --with-upstream-urllib3 is not working properly + postPatch = '' + rm -rf telegram/vendor ''; - - checkInputs = [ pytest ]; - propagatedBuildInputs = [ certifi future urllib3 tornado ]; + setupPyGlobalFlags = "--with-upstream-urllib3"; # tests not included with release doCheck = false; + pythonImportsCheck = [ "telegram" ]; meta = with stdenv.lib; { description = "This library provides a pure Python interface for the Telegram Bot API."; - homepage = https://python-telegram-bot.org; + homepage = "https://python-telegram-bot.org"; license = licenses.lgpl3; maintainers = with maintainers; [ veprbl pingiun ]; }; diff --git a/pkgs/development/python-modules/python-toolbox/default.nix b/pkgs/development/python-modules/python-toolbox/default.nix index 5170c5a8a0904..bdf09fdf2c79f 100644 --- a/pkgs/development/python-modules/python-toolbox/default.nix +++ b/pkgs/development/python-modules/python-toolbox/default.nix @@ -4,10 +4,11 @@ , fetchFromGitHub , isPy27 , nose +, pytest }: buildPythonPackage rec { - version = "0.9.4"; + version = "1.0.10"; pname = "python_toolbox"; disabled = isPy27; @@ -15,17 +16,17 @@ buildPythonPackage rec { owner = "cool-RR"; repo = pname; rev = version; - sha256 = "1qy2sfqfrkgxixmd22v5lkrdykdfiymsd2s3xa7ndlvg084cgj6r"; + sha256 = "1hpls1hwisdjx1g15cq052bdn9fvh43r120llws8bvgvj9ivnaha"; }; checkInputs = [ docutils - nose + pytest ]; meta = with lib; { description = "Tools for testing PySnooper"; - homepage = https://github.com/cool-RR/python_toolbox; + homepage = "https://github.com/cool-RR/python_toolbox"; license = licenses.mit; maintainers = with maintainers; [ seqizz ]; }; diff --git a/pkgs/development/python-modules/python-u2flib-host/default.nix b/pkgs/development/python-modules/python-u2flib-host/default.nix index 38785d813138f..eddf0deb015c9 100644 --- a/pkgs/development/python-modules/python-u2flib-host/default.nix +++ b/pkgs/development/python-modules/python-u2flib-host/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python based U2F host library"; - homepage = https://github.com/Yubico/python-u2flib-host; + homepage = "https://github.com/Yubico/python-u2flib-host"; license = licenses.bsd2; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix index 8f6c7c54cb2e6..e7579058f71ae 100644 --- a/pkgs/development/python-modules/python-uinput/default.nix +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pythonic API to Linux uinput kernel module"; - homepage = http://tjjr.fi/sw/python-uinput/; + homepage = "http://tjjr.fi/sw/python-uinput/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 67fbd4e24ebe1..936a1eb2e3ed5 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-utils"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "34aaf26b39b0b86628008f2ae0ac001b30e7986a8d303b61e1357dfcdad4f6d3"; + sha256 = "12c0glzkm81ljgf6pwh0d4rmdm1r7vvgg3ifzp8yp9cfyngw07zj"; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-vagrant/default.nix b/pkgs/development/python-modules/python-vagrant/default.nix index 88982f15293b2..92ba757667daa 100644 --- a/pkgs/development/python-modules/python-vagrant/default.nix +++ b/pkgs/development/python-modules/python-vagrant/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = { description = "Python module that provides a thin wrapper around the vagrant command line executable"; - homepage = https://github.com/todddeluca/python-vagrant; + homepage = "https://github.com/todddeluca/python-vagrant"; license = lib.licenses.mit; maintainers = [ lib.maintainers.pmiddend ]; }; diff --git a/pkgs/development/python-modules/python-wifi/default.nix b/pkgs/development/python-modules/python-wifi/default.nix index 7e4f2ebccf05c..7300efc77bccf 100644 --- a/pkgs/development/python-modules/python-wifi/default.nix +++ b/pkgs/development/python-modules/python-wifi/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { inherit version; description = "Read & write wireless card capabilities using the Linux Wireless Extensions"; - homepage = http://pythonwifi.tuxfamily.org/; + homepage = "http://pythonwifi.tuxfamily.org/"; # From the README: "pythonwifi is licensed under LGPLv2+, however, the # examples (e.g. iwconfig.py and iwlist.py) are licensed under GPLv2+." license = with licenses; [ lgpl2Plus gpl2Plus ]; diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix index 8a160da29648d..e5d7a7f0326d5 100644 --- a/pkgs/development/python-modules/python-xmp-toolkit/default.nix +++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -36,7 +36,7 @@ buildPythonPackage { ''; meta = with stdenv.lib; { - homepage = https://github.com/python-xmp-toolkit/python-xmp-toolkit; + homepage = "https://github.com/python-xmp-toolkit/python-xmp-toolkit"; description = "Python XMP Toolkit for working with metadata"; license = licenses.bsd3; maintainers = [ maintainers.kiwi ]; diff --git a/pkgs/development/python-modules/python3-openid/default.nix b/pkgs/development/python-modules/python3-openid/default.nix index d0b10c42d0191..27445554ddfa4 100644 --- a/pkgs/development/python-modules/python3-openid/default.nix +++ b/pkgs/development/python-modules/python3-openid/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "OpenID support for modern servers and consumers"; - homepage = https://github.com/necaris/python3-openid; + homepage = "https://github.com/necaris/python3-openid"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix index 24f56ae53b24c..ca4aa726d50d8 100644 --- a/pkgs/development/python-modules/python_fedora/default.nix +++ b/pkgs/development/python-modules/python_fedora/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Fedora Module"; - homepage = https://github.com/fedora-infra/python-fedora; + homepage = "https://github.com/fedora-infra/python-fedora"; license = licenses.lgpl2; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/python_keyczar/default.nix b/pkgs/development/python-modules/python_keyczar/default.nix index da4f3ed529ecb..c9e29ab5c6398 100644 --- a/pkgs/development/python-modules/python_keyczar/default.nix +++ b/pkgs/development/python-modules/python_keyczar/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Toolkit for safe and simple cryptography"; - homepage = https://pypi.python.org/pypi/python-keyczar; + homepage = "https://pypi.python.org/pypi/python-keyczar"; license = licenses.asl20; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix index bb8d236335c43..d3f1a0a81204a 100644 --- a/pkgs/development/python-modules/python_openzwave/default.nix +++ b/pkgs/development/python-modules/python_openzwave/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python wrapper for the OpenZWave C++ library"; - homepage = https://github.com/OpenZWave/python-openzwave; + homepage = "https://github.com/OpenZWave/python-openzwave"; license = licenses.gpl3Plus; maintainers = with maintainers; [ etu ]; inherit (openzwave.meta) platforms; diff --git a/pkgs/development/python-modules/python_statsd/default.nix b/pkgs/development/python-modules/python_statsd/default.nix index d6b262d9aa35c..6455b69451724 100644 --- a/pkgs/development/python-modules/python_statsd/default.nix +++ b/pkgs/development/python-modules/python_statsd/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A client for Etsy's node-js statsd server"; - homepage = https://github.com/WoLpH/python-statsd; + homepage = "https://github.com/WoLpH/python-statsd"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix index 3b89e3245caae..0027c8d32a63d 100644 --- a/pkgs/development/python-modules/pythonnet/default.nix +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -84,7 +84,7 @@ buildPythonPackage rec { meta = with lib; { description = ".Net and Mono integration for Python"; - homepage = https://pythonnet.github.io; + homepage = "https://pythonnet.github.io"; license = licenses.mit; maintainers = with maintainers; [ jraygauthier ]; broken = true; diff --git a/pkgs/development/python-modules/pytidylib/default.nix b/pkgs/development/python-modules/pytidylib/default.nix index 4ece6fb413437..a0aade1fe670f 100644 --- a/pkgs/development/python-modules/pytidylib/default.nix +++ b/pkgs/development/python-modules/pytidylib/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python wrapper for HTML Tidy (tidylib) on Python 2 and 3"; - homepage = https://countergram.github.io/pytidylib/; + homepage = "https://countergram.github.io/pytidylib/"; license = licenses.mit; maintainers = with maintainers; [ layus ]; }; diff --git a/pkgs/development/python-modules/pytoml/default.nix b/pkgs/development/python-modules/pytoml/default.nix index d65de81232351..8ec17b158449d 100644 --- a/pkgs/development/python-modules/pytoml/default.nix +++ b/pkgs/development/python-modules/pytoml/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A TOML parser/writer for Python"; - homepage = https://github.com/avakar/pytoml; + homepage = "https://github.com/avakar/pytoml"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 2de5b21d86f3b..7321fbef0d6e6 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -31,9 +31,9 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/inducer/pytools/; + homepage = "https://github.com/inducer/pytools/"; description = "Miscellaneous Python lifesavers."; license = lib.licenses.mit; maintainers = with lib.maintainers; [ artuuge ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 0556ff93c13c9..2318738411f45 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchurl, fetchgit, buildPythonPackage, python, pythonOlder, +{ stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python, cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null, magma ? null, - mklSupport ? false, mkl ? null, + mklDnnSupport ? true, useSystemNccl ? true, openMPISupport ? false, openmpi ? null, - buildNamedTensor ? false, - buildBinaries ? false, + buildDocs ? false, cudaArchList ? null, - fetchFromGitHub, lib, numpy, pyyaml, cffi, click, typing, cmake, hypothesis, numactl, + numpy, pyyaml, cffi, click, typing, cmake, oneDNN, hypothesis, numactl, psutil, linkFarm, symlinkJoin, + # virtual pkg that consistently instantiates blas across nixpkgs + # See https://github.com/NixOS/nixpkgs/pull/83888 + blas, + # ninja (https://ninja-build.org) must be available to run C++ extensions tests, ninja, # dependencies for torch.utils.tensorboard - tensorboardSupport ? true, pillow, six, future, tensorflow-tensorboard, + pillow, six, future, tensorflow-tensorboard, protobuf, utillinux, which, isPy3k }: assert !openMPISupport || openmpi != null; -assert !tensorboardSupport || tensorflow-tensorboard != null; # assert that everything needed for cuda is present and that the correct cuda versions are used assert !cudaSupport || cudatoolkit != null; @@ -28,17 +30,11 @@ assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version; let hasDependency = dep: pkg: lib.lists.any (inp: inp == dep) pkg.buildInputs; matchesCudatoolkit = hasDependency cudatoolkit; - matchesMkl = hasDependency mkl; in # confirm that cudatoolkits are sync'd across dependencies assert !(openMPISupport && cudaSupport) || matchesCudatoolkit openmpi; assert !cudaSupport || matchesCudatoolkit magma; -# confirm that mkl is sync'd across dependencies -assert !mklSupport || mkl != null; -assert !(mklSupport && cudaSupport) || matchesMkl magma; -assert !mklSupport || (numpy.blasImplementation == "mkl" && numpy.blas == mkl); - let cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; @@ -108,7 +104,7 @@ let "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH "; in buildPythonPackage rec { - version = "1.2.0"; + version = "1.4.1"; pname = "pytorch"; disabled = !isPy3k; @@ -122,11 +118,9 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1biyq2p48chakf2xw7hazzqmr5ps1nx475ql8vkmxjg5zaa071cz"; + sha256 = "1aa1il4f98pswfj20cv27yfb91l1jcq4515i7mvq7sh5647yzwms"; }; - dontUseCmakeConfigure = true; - preConfigure = lib.optionalString cudaSupport '' export TORCH_CUDA_ARCH_LIST="${lib.strings.concatStringsSep ";" final_cudaArchList}" export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ @@ -134,6 +128,44 @@ in buildPythonPackage rec { export CUDNN_INCLUDE_DIR=${cudnn}/include ''; + patches = [ + # Prevents a race condition which would be introduced by pull 30333. + # See https://github.com/pytorch/pytorch/issues/32277 + # Can be removed >1.5.0. + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/30332.patch"; + sha256 = "1v9dwbhz3rdxcx6sz8y8j9n3bj6nqs78b1r8yg89yc15n6l4cqx2"; + }) + + # Fixes errors with gcc-9 compilation. Cherry-picked on advice from ezyang. + # See https://github.com/pytorch/pytorch/issues/32277 + # Can be removed >1.5.0. + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/30333.patch"; + sha256 = "139413fl37h2fnil0cv99a67mqqnsh02k74b92by1qyr6pcfyg3q"; + }) + ]; + + # Use pytorch's custom configurations + dontUseCmakeConfigure = true; + + BUILD_NAMEDTENSOR = true; + BUILD_DOCS = buildDocs; + + USE_MKL = blas.implementation == "mkl"; + + # Unlike MKL, MKLDNN is FOSS, so we enable support for it by default. Note + # that this was renamed to dnnl and then renamed again to oneDNN upstream, but + # pytorch still calls it by the old name mkldnn. + USE_MKLDNN = mklDnnSupport; + USE_MKLDNN_CBLAS = mklDnnSupport; + + preBuild = '' + export MAX_JOBS=$NIX_BUILD_CORES + ${python.interpreter} setup.py build --cmake-only + ${cmake}/bin/cmake build + ''; + preFixup = '' function join_by { local IFS="$1"; shift; echo "$*"; } function strip2 { @@ -155,8 +187,7 @@ in buildPythonPackage rec { PYTORCH_BUILD_VERSION = version; PYTORCH_BUILD_NUMBER = 0; - BUILD_NAMEDTENSOR = buildNamedTensor; # experimental feature - USE_SYSTEM_NCCL=true; # don't build pytorch's third_party NCCL + USE_SYSTEM_NCCL=useSystemNccl; # don't build pytorch's third_party NCCL # Suppress a weird warning in mkl-dnn, part of ideep in pytorch # (upstream seems to have fixed this in the wrong place?) @@ -165,7 +196,7 @@ in buildPythonPackage rec { # # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++: # https://github.com/pytorch/pytorch/blob/v1.2.0/setup.py#L17 - NIX_CFLAGS_COMPILE = lib.optionals (numpy.blas == mkl) [ "-Wno-error=array-bounds" ]; + NIX_CFLAGS_COMPILE = lib.optionals (blas.implementation == "mkl") [ "-Wno-error=array-bounds" ]; nativeBuildInputs = [ cmake @@ -174,9 +205,8 @@ in buildPythonPackage rec { ninja ] ++ lib.optionals cudaSupport [ cudatoolkit_joined ]; - buildInputs = [ - numpy.blas - ] ++ lib.optionals cudaSupport [ cudnn magma nccl ] + buildInputs = [ blas blas.provider oneDNN ] + ++ lib.optionals cudaSupport [ cudnn magma nccl ] ++ lib.optionals stdenv.isLinux [ numactl ]; propagatedBuildInputs = [ @@ -184,23 +214,37 @@ in buildPythonPackage rec { click numpy pyyaml - ] ++ lib.optionals openMPISupport [ openmpi ] - ++ lib.optional (pythonOlder "3.5") typing - ++ lib.optionals tensorboardSupport [pillow six future tensorflow-tensorboard]; + # the following are required for tensorboard support + pillow six future tensorflow-tensorboard protobuf + ] ++ lib.optionals openMPISupport [ openmpi ]; - checkInputs = [ hypothesis ninja ]; + checkInputs = [ hypothesis ninja psutil ]; - doCheck = false; # tests take a long time for channel release, so doCheck should be overridden only when developing - checkPhase = "${cudaStubEnv}python test/run_test.py" - + " --exclude utils" # utils requires git, which is not allowed in the check phase + # Tests take a long time and may be flaky, so just sanity-check imports + doCheck = false; + pythonImportsCheck = [ + "torch" + ]; + + checkPhase = with lib.versions; with lib.strings; concatStringsSep " " [ + cudaStubEnv + "${python.interpreter} test/run_test.py" + "--exclude" + (concatStringsSep " " [ + "utils" # utils requires git, which is not allowed in the check phase - # Other tests which have been disabled in previous nix derivations of pytorch. - # --exclude dataloader sparse torch utils thd_distributed distributed cpp_extensions - ; + # "dataloader" # psutils correctly finds and triggers multiprocessing, but is too sandboxed to run -- resulting in numerous errors + # ^^^^^^^^^^^^ NOTE: while test_dataloader does return errors, these are acceptable errors and do not interfere with the build + + # tensorboard has acceptable failures for pytorch 1.3.x due to dependencies on tensorboard-plugins + (optionalString (majorMinor version == "1.3" ) "tensorboard") + ]) + ]; postInstall = '' mkdir $dev cp -r $out/${python.sitePackages}/torch/lib $dev/lib cp -r $out/${python.sitePackages}/torch/include $dev/include + cp -r $out/${python.sitePackages}/torch/share $dev/share ''; postFixup = stdenv.lib.optionalString stdenv.isDarwin '' @@ -230,9 +274,9 @@ in buildPythonPackage rec { meta = { description = "Open source, prototype-to-production deep learning platform"; - homepage = https://pytorch.org/; + homepage = "https://pytorch.org/"; license = lib.licenses.bsd3; platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport) darwin; - maintainers = with lib.maintainers; [ teh thoughtpolice stites tscholak ]; # tscholak esp. for darwin-related builds + maintainers = with lib.maintainers; [ teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds }; } diff --git a/pkgs/development/python-modules/pytricia/default.nix b/pkgs/development/python-modules/pytricia/default.nix index 2f95d7fcecb22..80e95fb605077 100644 --- a/pkgs/development/python-modules/pytricia/default.nix +++ b/pkgs/development/python-modules/pytricia/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library for fast IP address lookup in Python"; - homepage = https://github.com/jsommers/pytricia; + homepage = "https://github.com/jsommers/pytricia"; license = with licenses; [ lgpl3Plus ]; maintainers = with maintainers; [ mkg ]; }; diff --git a/pkgs/development/python-modules/pytun/default.nix b/pkgs/development/python-modules/pytun/default.nix index 32e3b683e4103..fed78cea96fe5 100644 --- a/pkgs/development/python-modules/pytun/default.nix +++ b/pkgs/development/python-modules/pytun/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/montag451/pytun; + homepage = "https://github.com/montag451/pytun"; description = "Linux TUN/TAP wrapper for Python"; license = licenses.mit; maintainers = with maintainers; [ montag451 ]; diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix index afda908113b49..a4df0bd71e6aa 100644 --- a/pkgs/development/python-modules/pytzdata/default.nix +++ b/pkgs/development/python-modules/pytzdata/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Timezone database for Python"; - homepage = https://github.com/sdispater/pytzdata; + homepage = "https://github.com/sdispater/pytzdata"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pyu2f/default.nix b/pkgs/development/python-modules/pyu2f/default.nix index 16aa7b0ec31ba..c703a8fe30c4a 100644 --- a/pkgs/development/python-modules/pyu2f/default.nix +++ b/pkgs/development/python-modules/pyu2f/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "U2F host library for interacting with a U2F device over USB"; - homepage = https://github.com/google/pyu2f/; + homepage = "https://github.com/google/pyu2f/"; license = licenses.asl20; maintainers = with maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index c35c35d6c57e1..c26f9bcabe6eb 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyudev"; - version = "0.21.0"; + version = "0.22.0"; src = fetchPypi { inherit pname version; - sha256 = "0arz0dqp75sszsmgm6vhg92n1lsx91ihddx3m944f4ah0487ljq9"; + sha256 = "0xmj6l08iih2js9skjqpv4w7y0dhxyg91zmrs6v5aa65gbmipfv9"; }; postPatch = '' @@ -28,7 +28,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://pyudev.readthedocs.org/; + homepage = "https://pyudev.readthedocs.org/"; description = "Pure Python libudev binding"; license = lib.licenses.lgpl21Plus; }; diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix index c87d9d465bc66..ea9cedeeae199 100644 --- a/pkgs/development/python-modules/pyunifi/default.nix +++ b/pkgs/development/python-modules/pyunifi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "API towards Ubiquity Networks UniFi controller"; - homepage = https://github.com/finish06/unifi-api; + homepage = "https://github.com/finish06/unifi-api"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/pyupdate/default.nix b/pkgs/development/python-modules/pyupdate/default.nix index f4bf22854e74f..9ce93d67a52ad 100644 --- a/pkgs/development/python-modules/pyupdate/default.nix +++ b/pkgs/development/python-modules/pyupdate/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { # This description is terrible, but it's what upstream uses. description = "Package to update stuff"; - homepage = https://github.com/ludeeus/pyupdate; + homepage = "https://github.com/ludeeus/pyupdate"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix index c54711bb6c846..624090e98aa01 100644 --- a/pkgs/development/python-modules/pyusb/default.nix +++ b/pkgs/development/python-modules/pyusb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, libusb, libusb1 }: +{ stdenv, fetchPypi, buildPythonPackage, libusb1 }: buildPythonPackage rec { pname = "pyusb"; @@ -17,14 +17,12 @@ buildPythonPackage rec { sed -i -e "s|find_library=None|find_library=lambda _:\"$libusb\"|" usb/backend/libusb1.py ''; - propagatedBuildInputs = [ libusb ]; - # No tests included doCheck = false; meta = with stdenv.lib; { description = "Python USB access module (wraps libusb 1.0)"; # can use other backends - homepage = http://pyusb.sourceforge.net/; + homepage = "https://pyusb.github.io/pyusb/"; license = licenses.bsd3; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index 2115374aa43b2..a943c8eb523ba 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/pkgs/development/python-modules/pyutil/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { we're not alone in wanting tools like these. ''; - homepage = http://allmydata.org/trac/pyutil; + homepage = "http://allmydata.org/trac/pyutil"; license = licenses.gpl2Plus; }; diff --git a/pkgs/development/python-modules/pyutilib/default.nix b/pkgs/development/python-modules/pyutilib/default.nix index e9397ad6fa8be..3877db3254b77 100644 --- a/pkgs/development/python-modules/pyutilib/default.nix +++ b/pkgs/development/python-modules/pyutilib/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "PyUtilib: A collection of Python utilities"; - homepage = https://github.com/PyUtilib/pyutilib; + homepage = "https://github.com/PyUtilib/pyutilib"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pyuv/default.nix b/pkgs/development/python-modules/pyuv/default.nix index cd76b283028f8..7f476d3c11d2a 100644 --- a/pkgs/development/python-modules/pyuv/default.nix +++ b/pkgs/development/python-modules/pyuv/default.nix @@ -20,8 +20,8 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python interface for libuv"; - homepage = https://github.com/saghul/pyuv; - repositories.git = git://github.com/saghul/pyuv.git; + homepage = "https://github.com/saghul/pyuv"; + repositories.git = "git://github.com/saghul/pyuv.git"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix index be6d10d0a0ea1..ae41d19654309 100644 --- a/pkgs/development/python-modules/pyvcd/default.nix +++ b/pkgs/development/python-modules/pyvcd/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package for writing Value Change Dump (VCD) files"; - homepage = https://github.com/SanDisk-Open-Source/pyvcd; + homepage = "https://github.com/SanDisk-Open-Source/pyvcd"; changelog = "https://github.com/SanDisk-Open-Source/pyvcd/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = [ maintainers.sb0 maintainers.emily ]; diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/pkgs/development/python-modules/pyviz-comms/default.nix index f83ee05bc2609..4bb0bce52eb06 100644 --- a/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/pkgs/development/python-modules/pyviz-comms/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyviz_comms"; - version = "0.7.2"; + version = "0.7.4"; src = fetchPypi { inherit pname version; - sha256 = "c1722a496b08eb20ae3f2fedcc1ebcd207567b62e6453c7198a0b8f78ae96049"; + sha256 = "092nl8pq1jqdylj0xyqwgi5qxvhy6qj2nx2lwwfkbnixlg6g8bbi"; }; propagatedBuildInputs = [ param ]; @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Launch jobs, organize the output, and dissect the results"; - homepage = https://pyviz.org/; + homepage = "https://pyviz.org/"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index a7fbf3012951f..25845c9847a30 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyvmomi"; - version = "6.7.1.2018.12"; + version = "7.0"; src = fetchFromGitHub { owner = "vmware"; repo = pname; rev = "v${version}"; - sha256 = "1pgl95rbghidbyr8hndjzfzgb1yjchfcknlqgg3qbqvljnz9hfja"; + sha256 = "1qqljrlc9h7kddx3xxc6479gk75fvaxspfikzjn6zj5mznsvfwj5"; }; # requires old version of vcrpy diff --git a/pkgs/development/python-modules/pyvoro/default.nix b/pkgs/development/python-modules/pyvoro/default.nix index 83bdcec86bd22..e998654178203 100644 --- a/pkgs/development/python-modules/pyvoro/default.nix +++ b/pkgs/development/python-modules/pyvoro/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/joe-jordan/pyvoro; + homepage = "https://github.com/joe-jordan/pyvoro"; description = "2D and 3D Voronoi tessellations: a python entry point for the voro++ library"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/pywal/default.nix b/pkgs/development/python-modules/pywal/default.nix index 3fd6189187819..b565188ccea9e 100644 --- a/pkgs/development/python-modules/pywal/default.nix +++ b/pkgs/development/python-modules/pywal/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3."; - homepage = https://github.com/dylanaraps/pywal; + homepage = "https://github.com/dylanaraps/pywal"; license = licenses.mit; maintainers = with maintainers; [ Fresheyeball ]; }; diff --git a/pkgs/development/python-modules/pywatchman/default.nix b/pkgs/development/python-modules/pywatchman/default.nix index 40aaea9c01a7a..f9951465e2566 100644 --- a/pkgs/development/python-modules/pywatchman/default.nix +++ b/pkgs/development/python-modules/pywatchman/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Watchman client for Python"; - homepage = https://facebook.github.io/watchman/; + homepage = "https://facebook.github.io/watchman/"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix index fbb226bb1f2e5..66c996a487ba9 100644 --- a/pkgs/development/python-modules/pywavelets/default.nix +++ b/pkgs/development/python-modules/pywavelets/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Wavelet transform module"; - homepage = https://github.com/PyWavelets/pywt; + homepage = "https://github.com/PyWavelets/pywt"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index c5ffb79a5d686..82370faf7ef21 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Support for the WBEM standard for systems management"; - homepage = https://pywbem.github.io; + homepage = "https://pywbem.github.io"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/pywebdav/default.nix b/pkgs/development/python-modules/pywebdav/default.nix index 15cb474f5fe9e..9a56bf7604642 100644 --- a/pkgs/development/python-modules/pywebdav/default.nix +++ b/pkgs/development/python-modules/pywebdav/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1v10vg79h85milnq8w7yd75qq5z6297ywkn9b2kxajldzwqxn3ji"; }; meta = with stdenv.lib; { - homepage = http://code.google.com/p/pywebdav/; + homepage = "http://code.google.com/p/pywebdav/"; description = "WebDAV library including a standalone server for python"; maintainers = with maintainers; [ johbo ]; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix index ff9b20f8177ff..b8a453e99ed09 100644 --- a/pkgs/development/python-modules/pywebpush/default.nix +++ b/pkgs/development/python-modules/pywebpush/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Webpush Data encryption library for Python"; - homepage = https://github.com/web-push-libs/pywebpush; + homepage = "https://github.com/web-push-libs/pywebpush"; license = licenses.mpl20; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix index 63e6e63210070..8b5e3633e25c2 100644 --- a/pkgs/development/python-modules/pyx/default.nix +++ b/pkgs/development/python-modules/pyx/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python package for the generation of PostScript, PDF, and SVG files"; - homepage = http://pyx.sourceforge.net/; + homepage = "http://pyx.sourceforge.net/"; license = with licenses; [ gpl2 ]; }; diff --git a/pkgs/development/python-modules/pyxdg/default.nix b/pkgs/development/python-modules/pyxdg/default.nix index 2f2b6e9b54317..a5cb694b4c152 100644 --- a/pkgs/development/python-modules/pyxdg/default.nix +++ b/pkgs/development/python-modules/pyxdg/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://freedesktop.org/wiki/Software/pyxdg; + homepage = "http://freedesktop.org/wiki/Software/pyxdg"; description = "Contains implementations of freedesktop.org standards"; license = licenses.lgpl2; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/pyxl3/default.nix b/pkgs/development/python-modules/pyxl3/default.nix index c30dd0f024fb9..2fa5ef766699b 100644 --- a/pkgs/development/python-modules/pyxl3/default.nix +++ b/pkgs/development/python-modules/pyxl3/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python 3 port of pyxl for writing structured and reusable inline HTML"; - homepage = https://github.com/gvanrossum/pyxl3; + homepage = "https://github.com/gvanrossum/pyxl3"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix index 5a55c1f47bb2e..a528de8e0ca27 100644 --- a/pkgs/development/python-modules/pyxml/default.nix +++ b/pkgs/development/python-modules/pyxml/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { meta = { description = "A collection of libraries to process XML with Python"; - homepage = http://pyxml.sourceforge.net/; + homepage = "http://pyxml.sourceforge.net/"; }; } diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix index 316e9974cfe28..4d1d16b0f1239 100644 --- a/pkgs/development/python-modules/pyyaml/default.nix +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "The next generation YAML parser and emitter for Python"; - homepage = https://github.com/yaml/pyyaml; + homepage = "https://github.com/yaml/pyyaml"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pyzufall/default.nix b/pkgs/development/python-modules/pyzufall/default.nix index 20666010f9aad..2c5121e61e807 100644 --- a/pkgs/development/python-modules/pyzufall/default.nix +++ b/pkgs/development/python-modules/pyzufall/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://pyzufall.readthedocs.io/de/latest/; + homepage = "https://pyzufall.readthedocs.io/de/latest/"; description = "Library for generating random data and sentences in german language"; license = licenses.gpl3Plus; maintainers = with maintainers; [ davidak ]; diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix index 00f15f801d16c..9748e3e434838 100644 --- a/pkgs/development/python-modules/qasm2image/default.nix +++ b/pkgs/development/python-modules/qasm2image/default.nix @@ -43,7 +43,7 @@ buildPythonPackage { meta = { description = "A Python module to visualise quantum circuit"; - homepage = https://github.com/nelimeee/qasm2image; + homepage = "https://github.com/nelimeee/qasm2image"; license = lib.licenses.cecill-b; maintainers = with lib.maintainers; [ pandaman diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 7c36328f557b2..7c74ddab2b164 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -2,6 +2,7 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub +, fetchpatch , cmake , cvxpy , cython @@ -18,16 +19,16 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.4.1"; + version = "0.5.1"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "Qiskit"; - repo = pname; + repo = "qiskit-aer"; rev = version; fetchSubmodules = true; # fetch muparserx and other required libraries - sha256 = "1j2pv6jx5dlzanjp1qnf32s53d8jrlpv96nvymznkcnjvqn60gv9"; + sha256 = "0pbi8ldz8f1zm7pf2n5229g6kccriq21f24q9cb7bd4j5gdky5sk"; }; nativeBuildInputs = [ @@ -47,9 +48,17 @@ buildPythonPackage rec { pybind11 ]; - prePatch = '' + patches = [ + (fetchpatch{ + name = "qiskit-aer-pr-727-fix-random-unitary-test.patch"; + url = "https://github.com/Qiskit/qiskit-aer/commit/09afb3b6b0710042ab65d88e863363f2c843dcb0.patch"; + sha256 = "0521b7i4fpc5brqs08w381g3c655f9cbn6my1740jnk7dv5lhsv9"; + }) + ]; + + postPatch = '' # remove dependency on PyPi cmake package, which isn't in Nixpkgs - substituteInPlace setup.py --replace "'cmake'" "" + substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'" "" ''; dontUseCmakeConfigure = true; @@ -81,7 +90,7 @@ buildPythonPackage rec { # Tests include a compiled "circuit" which is auto-built in $HOME export HOME=$(mktemp -d) # move tests b/c by default try to find (missing) cython-ized code in /build/source dir - cp -r test $HOME + cp -r $TMP/$sourceRoot/test $HOME # Add qiskit-aer compiled files to cython include search pushd $HOME @@ -92,7 +101,8 @@ buildPythonPackage rec { meta = with lib; { description = "High performance simulators for Qiskit"; - homepage = "https://github.com/QISKit/qiskit-aer"; + homepage = "https://qiskit.org/aer"; + downloadPage = "https://github.com/QISKit/qiskit-aer/releases"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; # Doesn't build on aarch64 (libmuparserx issue). diff --git a/pkgs/development/python-modules/qiskit-aqua/default.nix b/pkgs/development/python-modules/qiskit-aqua/default.nix index ee01a5c4cb56b..8037d28f82cf3 100644 --- a/pkgs/development/python-modules/qiskit-aqua/default.nix +++ b/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -2,6 +2,7 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub +# , cplex , cvxopt , dlx , docplex @@ -10,19 +11,20 @@ , networkx , numpy , psutil +, python , qiskit-ignis , qiskit-terra , quandl , scikitlearn # Check Inputs -, parameterized +, ddt , pytestCheckHook , qiskit-aer }: buildPythonPackage rec { pname = "qiskit-aqua"; - version = "0.6.5"; + version = "0.7.0"; disabled = pythonOlder "3.5"; @@ -31,11 +33,12 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aqua"; rev = version; - sha256 = "03c0gl2qxyngf3cccjghjb0bhp0w78sdbvhim08cimf3cd577ldz"; + sha256 = "0yykw6k1rb3f2ihcp0y9pb0695mcmy29nyqlj89qs4da0503vxvh"; }; # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. propagatedBuildInputs = [ + # cplex cvxopt docplex dlx # Python Dancing Links package @@ -57,19 +60,33 @@ buildPythonPackage rec { # It can also be installed at runtime from the pip wheel. # We disable appropriate tests below to allow building without pyscf installed + # NOTE: we remove cplex b/c we can't build pythonPackages.cplex. + # cplex is only distributed in manylinux1 wheel (no source), and Nix python is not manylinux1 compatible + postPatch = '' substituteInPlace setup.py \ - --replace "pyscf; sys_platform == 'linux' or (python_version < '3.8' and sys_platform != 'win32')" "" + --replace "pyscf; sys_platform != 'win32'" "" \ + --replace "cplex; python_version >= '3.6' and python_version < '3.8'" "" # Add ImportWarning when running qiskit.chemistry (pyscf is a chemistry package) that pyscf is not included - echo -e "\nimport warnings\ntry: import pyscf;\nexcept:\n " \ + echo -e "\nimport warnings\ntry: import pyscf;\nexcept ImportError:\n " \ "warnings.warn('pyscf is not supported on Nixpkgs so some qiskit features will fail." \ "You must install it yourself via pip or add it to your environment from the Nix User Repository." \ "See https://github.com/NixOS/nixpkgs/pull/83447 for details', ImportWarning)\n" \ >> qiskit/chemistry/__init__.py + + # Add ImportWarning when running qiskit.optimization that cplex (optimization package) is not included + echo -e "\nimport warnings\ntry: import cplex;\nexcept ImportError:\n " \ + "warnings.warn('cplex is not supported on Nixpkgs so some qiskit features will fail." \ + "You must install it yourself via pip or add it to your environment from the Nix User Repository." \ + "', ImportWarning)\n" \ + >> qiskit/optimization/__init__.py + ''; - checkInputs = [ parameterized qiskit-aer pytestCheckHook ]; + postInstall = "rm -rf $out/${python.sitePackages}/docs"; # Remove docs dir b/c it can cause conflicts. + + checkInputs = [ ddt qiskit-aer pytestCheckHook ]; dontUseSetuptoolsCheck = true; pythonImportsCheck = [ "qiskit.aqua" @@ -84,42 +101,35 @@ buildPythonPackage rec { "--ignore=test/chemistry/test_qeom_ee.py" "--ignore=test/chemistry/test_qeom_vqe.py" "--ignore=test/chemistry/test_vqe_uccsd_adapt.py" - - # Following tend to be slow tests, all pass - "--ignore=test/aqua/test_vqc.py" - "--ignore=test/aqua/test_hhl.py" - "--ignore=test/aqua/test_qgan.py" - "--ignore=test/aqua/test_mcr.py" - "--ignore=test/aqua/test_mcu1.py" - "--ignore=test/aqua/test_vqe.py" ]; disabledTests = [ # Disabled due to missing pyscf "test_validate" # test/chemistry/test_inputparser.py # Disabling slow tests > 10 seconds - "test_clique_vqe" - "test_delta_3_qasm" - "test_evaluate_qasm_mode" - "test_evolve_1_suzuki" - "test_exact_cover_vqe" - "test_exchangedata" - "test_expected_value_0_statevector" - "test_expected_value_1_qasm" - "test_expected_value_2_statevector" + "TestVQE" + "TestVQC" + "TestQSVM" "test_graph_partition_vqe" - "test_lookup_rotation" - "test_mct_with_dirty_ancillae_15" - "test_mcrz_11" + "TestLookupRotation" + "_vqe" + "TestHHL" + "TestQGAN" + "test_evaluate_qasm_mode" "test_measurement_error_mitigation_auto_refresh" - "test_qgan_training" - "test_qsvm_multiclass" - "test_shor_factoring_0" - "test_vertex_cover_vqe" - "test_vqc_with_raw_feature_vector_on_wine" - "test_vqe_2_iqpe" - "test_vqe_qasm" + "test_exchangedata" "test_wikipedia" + "test_shor_factoring_1__15___qasm_simulator____3__5__" + "test_readme_sample" + "test_ecev" + "test_expected_value" + "test_qubo_gas_int_paper_example" + "test_shor_no_factors_1_5" + "test_shor_no_factors_2_7" + "test_evolve_2___suzuki___1__3_" + "test_delta_4" + "test_swaprz" + "test_deprecated_algo_result" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index bed1bffe1a67d..5f8f0d94e4ff9 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.6.0"; + version = "0.7.0"; disabled = pythonOlder "3.6"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "0arbhwaa2kx04jbrj6hk3vvn92wdk6lrr9zx36pr6p22r0yyxnj9"; + sha256 = "1n13jjx1cx5gswwk8rpxfjqyk97cwx1n2hwsabkcbi7fksw3c5jk"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index 2f0a99dc0f82d..79998a8432573 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -3,59 +3,61 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, python , numpy , qiskit-terra +, scikitlearn , scipy # Check Inputs +, ddt , pytestCheckHook , qiskit-aer }: buildPythonPackage rec { pname = "qiskit-ignis"; - version = "0.2.0"; + version = "0.3.0"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; # Pypi's tarball doesn't contain tests src = fetchFromGitHub { owner = "Qiskit"; - repo = pname; + repo = "qiskit-ignis"; rev = version; - sha256 = "08a60xk5dq5wmqc23r4hr2v2nsf9hs0ybz832vbnd6d80dl6izyc"; + sha256 = "16h04n9hxw669nq2ii16l6h75x8afisvp3j062n4c62kcqci0x4x"; }; - patches = [ - # Update tests for compatibility with qiskit-aer 0.4 (#342). Remove in version > 0.2.0 - (fetchpatch { - url = "https://github.com/Qiskit/qiskit-ignis/commit/d78c494579f370058e68e360f10149db81b52477.patch"; - sha256 = "0ygkllf95c0jfvjg7gn399a5fd0wshsjpcn279kj7855m8j306h6"; - }) - # Fix statevector test over-eager validation (PR #333) - (fetchpatch { - url = "https://github.com/Qiskit/qiskit-ignis/commit/7cc8eb2e852b383ea429233fa43d3728931f1707.patch"; - sha256 = "0mdygykilg4qivdaa731z3y56l3ax4jp1sil9npqv0gn4p03c9g5"; - }) - ]; + # Fixed qiskit-ignis PR #385, figured this is easier than fetchpatch + postPatch = '' + substituteInPlace qiskit/ignis/logging/ignis_logging.py --replace "self.configure_logger" "self._configure_logger" + ''; propagatedBuildInputs = [ numpy qiskit-terra + scikitlearn scipy ]; + postInstall = "rm -rf $out/${python.sitePackages}/docs"; # this dir can create conflicts # Tests pythonImportsCheck = [ "qiskit.ignis" ]; dontUseSetuptoolsCheck = true; - preCheck = ''export HOME=$TMPDIR''; + preCheck = "export HOME=$TMPDIR"; checkInputs = [ + ddt pytestCheckHook qiskit-aer ]; + # Test is in test/verification/test_entanglemet.py. test fails due to out-of-date calls & bad logic with this file since qiskit-ignis#328 + # see qiskit-ignis#386 for all issues. Should be able to re-enable in future. + disabledTests = [ "TestEntanglement" ]; meta = with lib; { description = "Qiskit tools for quantum hardware verification, noise characterization, and error correction"; - homepage = "https://github.com/QISKit/qiskit-ignis"; + homepage = "https://qiskit.org/ignis"; + downloadPage = "https://github.com/QISKit/qiskit-ignis/releases"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index 4a015e15d5d6e..78c28a282cb92 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -2,35 +2,41 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub + # Python requirements , cython , dill +, fastjsonschema , jsonschema , numpy , marshmallow , marshmallow-polyfield -, matplotlib , networkx , ply , psutil +, python-constraint +, retworkx , scipy , sympy + # Python visualization requirements, semi-optional +, ipywidgets +, matplotlib +, pillow +, pydot +, pygments +, pylatexenc +, seaborn # test requirements , ddt , hypothesis -, ipywidgets , nbformat , nbconvert -, pillow -, pydot -, python -, pygraphviz -, pylatexenc , pytestCheckHook +, python }: buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.12.0"; + version = "0.14.1"; disabled = pythonOlder "3.5"; @@ -38,13 +44,14 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "1yarfziy2w8n1d7zyyxykfs68608j8md4kwfyhbyc6wy483fk9sy"; + sha256 = "0pd7x2jrqy7q1s38ychqw9bayjn2rvi6rq7c2c0kd160rwj1l2sc"; }; nativeBuildInputs = [ cython ]; propagatedBuildInputs = [ dill + fastjsonschema jsonschema numpy marshmallow @@ -53,37 +60,40 @@ buildPythonPackage rec { networkx ply psutil + python-constraint + retworkx scipy sympy + # Optional/visualization inputs + ipywidgets + matplotlib + pillow + pydot + pygments + pylatexenc + seaborn ]; + postPatch = '' + # Fix relative imports in tests + touch test/python/dagcircuit/__init__.py + ''; # *** Tests *** checkInputs = [ ddt hypothesis - ipywidgets nbformat nbconvert - pillow - pydot - pygraphviz - pylatexenc pytestCheckHook ]; + dontUseSetuptoolsCheck = true; # can't find setup.py, so fails. tested by pytest pythonImportsCheck = [ "qiskit" "qiskit.transpiler.passes.routing.cython.stochastic_swap.swap_trial" ]; - dontUseSetuptoolsCheck = true; # can't find setup.py, so fails. tested by pytest - - disabledTests = [ - "test_long_name" # generated circuit images differ for some reason - "test_jupyter_jobs_pbars" # needs IBMQ provider package (qiskit-ibmq-provider), circular dependency - ]; - pytestFlagsArray = [ "--ignore=test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency ]; @@ -112,7 +122,8 @@ buildPythonPackage rec { longDescription = '' Allows the user to write quantum circuits easily, and takes care of the constraints of real hardware. ''; - homepage = "https://github.com/QISKit/qiskit-terra"; + homepage = "https://qiskit.org/terra"; + downloadPage = "https://github.com/QISKit/qiskit-terra/releases"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 3b5c9e706dc45..ded9c68e6fe5a 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.17.0"; + version = "0.19.1"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit"; rev = version; - sha256 = "1cnjcvvzklyq102fipqnwd5ham0sp0451gp7j79cwwsxzvji6pcc"; + sha256 = "0p1sahgf6qgbkvxb067mnyj6ya8nv7y57yyiiaadhjw242sjkjy5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qpid-python/default.nix b/pkgs/development/python-modules/qpid-python/default.nix index 713e9db566e42..f7221a981ea6b 100644 --- a/pkgs/development/python-modules/qpid-python/default.nix +++ b/pkgs/development/python-modules/qpid-python/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://qpid.apache.org/; + homepage = "http://qpid.apache.org/"; description = "Python client implementation and AMQP conformance tests for Apache Qpid"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix index b5ce1eb26fe18..4d63cb5f45489 100644 --- a/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -45,6 +45,6 @@ buildPythonPackage { description = "A Python binding to QScintilla, Qt based text editing control"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ lsix ]; - homepage = https://www.riverbankcomputing.com/software/qscintilla/; + homepage = "https://www.riverbankcomputing.com/software/qscintilla/"; }; } diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index 8150290ca7484..2cf88805b7925 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Iconic fonts in PyQt and PySide applications"; - homepage = https://github.com/spyder-ide/qtawesome; + homepage = "https://github.com/spyder-ide/qtawesome"; license = licenses.mit; platforms = platforms.linux; # fails on Darwin }; diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 885eee8d4b6b0..0a932729ff356 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -10,26 +10,27 @@ , pygments , ipykernel , pyqt5 +, qtpy }: buildPythonPackage rec { pname = "qtconsole"; - version = "4.6.0"; + version = "4.7.3"; src = fetchPypi { inherit pname version; - sha256 = "654f423662e7dfe6a9b26fac8ec76aedcf742c339909ac49f1f0c1a1b744bcd1"; + sha256 = "8f5ae5571f0e921db9f2d12613ed667c350ee22c7db598d9bbbe143e8533f932"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; - propagatedBuildInputs = [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5]; + propagatedBuildInputs = [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5 qtpy]; # : cannot connect to X server doCheck = false; meta = { description = "Jupyter Qt console"; - homepage = https://jupyter.org/; + homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ fridh ]; diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 5d2210e00c45c..313b1266a52d9 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Abstraction layer for PyQt5/PyQt4/PySide2/PySide"; - homepage = https://github.com/spyder-ide/qtpy; + homepage = "https://github.com/spyder-ide/qtpy"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/quamash/default.nix b/pkgs/development/python-modules/quamash/default.nix index b39e081c47127..ed52c191c2278 100644 --- a/pkgs/development/python-modules/quamash/default.nix +++ b/pkgs/development/python-modules/quamash/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of the PEP 3156 event-loop (asyncio) api using the Qt Event-Loop"; - homepage = https://github.com/harvimt/quamash; + homepage = "https://github.com/harvimt/quamash"; license = licenses.bsd2; maintainers = with maintainers; [ borisbabic ]; }; diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index 6e92881aad0d4..ca6d8f0cfdb32 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Quantities is designed to handle arithmetic and"; - homepage = https://python-quantities.readthedocs.io/; + homepage = "https://python-quantities.readthedocs.io/"; license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 2f609651c8e79..6066e1e3b8441 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { superconducting circuits, and quantum nanomechanical resonators. ''; - homepage = http://qutip.org/; + homepage = "http://qutip.org/"; license = licenses.bsd0; broken = true; }; diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index 920cc22fb3916..998fa9296982d 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Interact with radare2"; - homepage = https://github.com/radare/radare2-r2pipe; + homepage = "https://github.com/radare/radare2-r2pipe"; license = licenses.mit; maintainers = with maintainers; [ timokau ]; }; diff --git a/pkgs/development/python-modules/rabbitpy/default.nix b/pkgs/development/python-modules/rabbitpy/default.nix index 7406faca6014c..26f3ffd4fe6b4 100644 --- a/pkgs/development/python-modules/rabbitpy/default.nix +++ b/pkgs/development/python-modules/rabbitpy/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pure python, thread-safe, minimalistic and pythonic RabbitMQ client library"; - homepage = https://pypi.python.org/pypi/rabbitpy; + homepage = "https://pypi.python.org/pypi/rabbitpy"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/pkgs/development/python-modules/radicale_infcloud/default.nix index 08d4a8f36a347..4b30d643fbd7d 100644 --- a/pkgs/development/python-modules/radicale_infcloud/default.nix +++ b/pkgs/development/python-modules/radicale_infcloud/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { doCheck = false; # Tries to import radicale, circular dependency meta = with stdenv.lib; { - homepage = https://github.com/Unrud/RadicaleInfCloud/; + homepage = "https://github.com/Unrud/RadicaleInfCloud/"; description = "Integrate InfCloud into Radicale's web interface"; license = with licenses; [ agpl3 gpl3 ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/radio_beam/default.nix b/pkgs/development/python-modules/radio_beam/default.nix index d21da2c7583c7..8ed5c720ef317 100644 --- a/pkgs/development/python-modules/radio_beam/default.nix +++ b/pkgs/development/python-modules/radio_beam/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = { description = "Tools for Beam IO and Manipulation"; - homepage = http://radio-astro-tools.github.io; + homepage = "http://radio-astro-tools.github.io"; license = lib.licenses.bsd3; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ smaret ]; diff --git a/pkgs/development/python-modules/random2/default.nix b/pkgs/development/python-modules/random2/default.nix index ecc049b34f468..1334fa2aa32ca 100644 --- a/pkgs/development/python-modules/random2/default.nix +++ b/pkgs/development/python-modules/random2/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = http://pypi.python.org/pypi/random2; + homepage = "http://pypi.python.org/pypi/random2"; description = "Python 3 compatible Python 2 `random` Module"; license = licenses.psfl; }; diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix index a2da451905a10..024d043c471b8 100644 --- a/pkgs/development/python-modules/rarfile/default.nix +++ b/pkgs/development/python-modules/rarfile/default.nix @@ -37,7 +37,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "RAR archive reader for Python"; - homepage = https://github.com/markokr/rarfile; + homepage = "https://github.com/markokr/rarfile"; license = licenses.isc; }; } diff --git a/pkgs/development/python-modules/ratelimiter/default.nix b/pkgs/development/python-modules/ratelimiter/default.nix index 375b6639368ee..15437889fc2fb 100644 --- a/pkgs/development/python-modules/ratelimiter/default.nix +++ b/pkgs/development/python-modules/ratelimiter/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/RazerM/ratelimiter; + homepage = "https://github.com/RazerM/ratelimiter"; license = licenses.asl20; description = "Simple python rate limiting object"; maintainers = with maintainers; [ helkafen ]; diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix index 9ea04fa8bdf74..45a408640b520 100644 --- a/pkgs/development/python-modules/raven/default.nix +++ b/pkgs/development/python-modules/raven/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "A Python client for Sentry (getsentry.com)"; - homepage = https://github.com/getsentry/raven-python; + homepage = "https://github.com/getsentry/raven-python"; license = [ lib.licenses.bsd3 ]; maintainers = with lib.maintainers; [ primeos ]; }; diff --git a/pkgs/development/python-modules/rawkit/default.nix b/pkgs/development/python-modules/rawkit/default.nix index 6bee2bf1b0a3f..a114d2400aa77 100644 --- a/pkgs/development/python-modules/rawkit/default.nix +++ b/pkgs/development/python-modules/rawkit/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { patches = [ # Python 3.7 compatibility (fetchpatch { - url = https://github.com/photoshell/rawkit/commit/663e90afa835d398aedd782c87b8cd0bff64bc9f.patch; + url = "https://github.com/photoshell/rawkit/commit/663e90afa835d398aedd782c87b8cd0bff64bc9f.patch"; sha256 = "1cdw0x9bgk0b5jnpjnmd8jpbaryarr3cjqizq44366qh3l0jycxy"; }) ]; @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "CTypes based LibRaw bindings for Python"; - homepage = https://rawkit.readthedocs.org/; + homepage = "https://rawkit.readthedocs.org/"; license = licenses.mit; maintainers = with maintainers; [ jfrankenau ]; }; diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix index 71b40318a514a..477a11f2ce907 100644 --- a/pkgs/development/python-modules/rbtools/default.nix +++ b/pkgs/development/python-modules/rbtools/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://www.reviewboard.org/docs/rbtools/dev/; + homepage = "https://www.reviewboard.org/docs/rbtools/dev/"; description = "RBTools is a set of command line tools for working with Review Board and RBCommons"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/pkgs/development/python-modules/rcssmin/default.nix index 53a8e046b55b6..30d5a3c0e2782 100644 --- a/pkgs/development/python-modules/rcssmin/default.nix +++ b/pkgs/development/python-modules/rcssmin/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://opensource.perlig.de/rcssmin/; + homepage = "http://opensource.perlig.de/rcssmin/"; license = licenses.asl20; description = "CSS minifier written in pure python"; }; diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index badaf9b3787bf..261ba794e70a6 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "rdflib"; - version = "4.2.2"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0398c714znnhaa2x7v51b269hk20iz073knq2mvmqp2ma92z27fs"; + sha256 = "0mdi7xh4zcr3ngqwlgqdqf0i5bxghwfddyxdng1zwpiqkpa9s53q"; }; propagatedBuildInputs = [isodate html5lib SPARQLWrapper ]; @@ -31,6 +31,6 @@ buildPythonPackage rec { meta = { description = "A Python library for working with RDF, a simple yet powerful language for representing information"; - homepage = http://www.rdflib.net/; + homepage = "http://www.rdflib.net/"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index 8369c3df94385..8d36df3d980a4 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = { description = "readme_renderer is a library for rendering readme descriptions for Warehouse"; - homepage = https://github.com/pypa/readme_renderer; + homepage = "https://github.com/pypa/readme_renderer"; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index 948e523cb7e47..e9245d426f05f 100644 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx extension for Read the Docs overrides"; - homepage = https://github.com/rtfd/readthedocs-sphinx-ext; + homepage = "https://github.com/rtfd/readthedocs-sphinx-ext"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index d1355560ac17a..2d3d3cd23fdd9 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six regex ]; meta = with stdenv.lib; { - homepage = https://github.com/Toilal/rebulk/; + homepage = "https://github.com/Toilal/rebulk/"; license = licenses.mit; description = "Advanced string matching from simple patterns"; }; diff --git a/pkgs/development/python-modules/recaptcha_client/default.nix b/pkgs/development/python-modules/recaptcha_client/default.nix index 09090540a5b04..bcb6741bb2952 100644 --- a/pkgs/development/python-modules/recaptcha_client/default.nix +++ b/pkgs/development/python-modules/recaptcha_client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A CAPTCHA for Python using the reCAPTCHA service"; - homepage = http://recaptcha.net/; + homepage = "http://recaptcha.net/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix index 98cee494f3f1b..26ba8a68d87ad 100644 --- a/pkgs/development/python-modules/recommonmark/default.nix +++ b/pkgs/development/python-modules/recommonmark/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "A docutils-compatibility bridge to CommonMark"; - homepage = https://github.com/rtfd/recommonmark; + homepage = "https://github.com/rtfd/recommonmark"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/rednose/default.nix b/pkgs/development/python-modules/rednose/default.nix index fa142cf872367..8c3c98bf63015 100644 --- a/pkgs/development/python-modules/rednose/default.nix +++ b/pkgs/development/python-modules/rednose/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python nose plugin adding color to console results"; - homepage = https://github.com/JBKahn/rednose; + homepage = "https://github.com/JBKahn/rednose"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 5a0cb50903a7b..a9456ac963c77 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "Alternative regular expression module, to replace re"; - homepage = https://bitbucket.org/mrabarnett/mrab-regex; + homepage = "https://bitbucket.org/mrabarnett/mrab-regex"; license = lib.licenses.psfl; maintainers = with lib.maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/regional/default.nix b/pkgs/development/python-modules/regional/default.nix index 5f2aee1b42afe..26f0755b3fe11 100644 --- a/pkgs/development/python-modules/regional/default.nix +++ b/pkgs/development/python-modules/regional/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple manipualtion and display of spatial regions"; - homepage = https://github.com/freeman-lab/regional; + homepage = "https://github.com/freeman-lab/regional"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index 6a7cbdcc5aff1..ebe3dc772d72a 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "reikna"; - version = "0.7.4"; + version = "0.7.5"; src = fetchPypi { inherit pname version; - sha256 = "52bbce24fa1fd7bb950d38ce9b60f497dd00ac6b26688d80ab9bce709f063e71"; + sha256 = "d01f4264c8379ef2962a93aacb002d491b92ef9b5b22b45f77e7821dfa87bef7"; }; checkInputs = [ sphinx pytestcov pytest ]; @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = { description = "GPGPU algorithms for PyCUDA and PyOpenCL"; - homepage = https://github.com/fjarri/reikna; + homepage = "https://github.com/fjarri/reikna"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.fridh ]; diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 3b98128bcf796..a6da936999e2f 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { ]; meta = { - homepage = https://relatorio.tryton.org/; + homepage = "https://relatorio.tryton.org/"; description = "A templating library able to output odt and pdf files"; maintainers = with lib.maintainers; [ johbo ]; license = lib.licenses.gpl3; diff --git a/pkgs/development/python-modules/remotecv/default.nix b/pkgs/development/python-modules/remotecv/default.nix index 5c401fe799b51..9ab250f78afbd 100644 --- a/pkgs/development/python-modules/remotecv/default.nix +++ b/pkgs/development/python-modules/remotecv/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "OpenCV worker for facial and feature recognition"; - homepage = https://github.com/thumbor/remotecv/wiki; + homepage = "https://github.com/thumbor/remotecv/wiki"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; broken = true; # no longer compatible with latest pillow diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix index 46f562ee5d6dd..3240c524d3bd7 100644 --- a/pkgs/development/python-modules/rencode/default.nix +++ b/pkgs/development/python-modules/rencode/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, isPy33 , fetchgit , cython }: @@ -8,10 +7,9 @@ buildPythonPackage { pname = "rencode"; version = "git20150810"; - disabled = isPy33; src = fetchgit { - url = https://github.com/aresch/rencode; + url = "https://github.com/aresch/rencode"; rev = "b45e04abdca0dea36e383a8199783269f186c99e"; sha256 = "b4bd82852d4220e8a9493d3cfaecbc57b1325708a2d48c0f8acf262edb10dc40"; }; @@ -19,7 +17,7 @@ buildPythonPackage { buildInputs = [ cython ]; meta = with stdenv.lib; { - homepage = https://github.com/aresch/rencode; + homepage = "https://github.com/aresch/rencode"; description = "Fast (basic) object serialization similar to bencode"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 619da0e28bfee..e37a8f57e9e22 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -42,6 +42,6 @@ in buildPythonPackage rec { meta = { description = "An Open Source Python library for generating PDFs and graphics"; - homepage = http://www.reportlab.com/; + homepage = "http://www.reportlab.com/"; }; } diff --git a/pkgs/development/python-modules/repoze_lru/default.nix b/pkgs/development/python-modules/repoze_lru/default.nix index ef2a7fb246a9c..afaac0b35f3e1 100644 --- a/pkgs/development/python-modules/repoze_lru/default.nix +++ b/pkgs/development/python-modules/repoze_lru/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A tiny LRU cache implementation and decorator"; - homepage = http://www.repoze.org/; + homepage = "http://www.repoze.org/"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix b/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix index 9e144340fb351..0cc55ef7fea5c 100644 --- a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix +++ b/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_interface sphinx ]; meta = with stdenv.lib; { - homepage = https://github.com/repoze/repoze.sphinx.autointerface; + homepage = "https://github.com/repoze/repoze.sphinx.autointerface"; description = "Auto-generate Sphinx API docs from Zope interfaces"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index 2d4d24cf8057a..43fd7fe67de91 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Reproject astronomical images"; - homepage = https://reproject.readthedocs.io; + homepage = "https://reproject.readthedocs.io"; license = licenses.bsd3; maintainers = [ maintainers.smaret ]; }; diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index 46d1dbdbbd623..2cbbee3c9c40c 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "Amazon Web Services version 4 authentication for the Python Requests library."; - homepage = https://github.com/sam-washington/requests-aws4auth; + homepage = "https://github.com/sam-washington/requests-aws4auth"; license = licenses.mit; maintainers = [ maintainers.basvandijk ]; }; diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index e2409ec598fb5..4042197e1c31a 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Persistent cache for requests library"; - homepage = https://pypi.python.org/pypi/requests-cache; + homepage = "https://pypi.python.org/pypi/requests-cache"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/requests-file/default.nix b/pkgs/development/python-modules/requests-file/default.nix index fac222176519f..6c94144ef1540 100644 --- a/pkgs/development/python-modules/requests-file/default.nix +++ b/pkgs/development/python-modules/requests-file/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests six ]; meta = { - homepage = https://github.com/dashea/requests-file; + homepage = "https://github.com/dashea/requests-file"; description = "Transport adapter for fetching file:// URLs with the requests python library"; license = lib.licenses.asl20; }; diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix index dd802abdb557d..c4394fa87cdf4 100644 --- a/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "OAuthlib authentication support for Requests"; - homepage = https://github.com/requests/requests-oauthlib; + homepage = "https://github.com/requests/requests-oauthlib"; maintainers = with maintainers; [ prikhi ]; }; } diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index 8dba9a91226e2..5a87d0a0e05bc 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = { description = "A toolbelt of useful classes and functions to be used with python-requests"; - homepage = http://toolbelt.rtfd.org; + homepage = "http://toolbelt.rtfd.org"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ matthiasbeyer ]; }; diff --git a/pkgs/development/python-modules/requests-unixsocket/default.nix b/pkgs/development/python-modules/requests-unixsocket/default.nix index d0deaba92448e..a244b9ba30c4d 100644 --- a/pkgs/development/python-modules/requests-unixsocket/default.nix +++ b/pkgs/development/python-modules/requests-unixsocket/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Use requests to talk HTTP via a UNIX domain socket"; - homepage = https://github.com/msabramo/requests-unixsocket; + homepage = "https://github.com/msabramo/requests-unixsocket"; license = licenses.asl20; maintainers = [ maintainers.catern ]; }; diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 260c03295760d..3d216e4bc44f8 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An Apache2 licensed HTTP library, written in Python, for human beings"; - homepage = http://docs.python-requests.org/en/latest/; + homepage = "http://docs.python-requests.org/en/latest/"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/requests_download/default.nix b/pkgs/development/python-modules/requests_download/default.nix index 8062834e1803e..b31573a91ca0b 100644 --- a/pkgs/development/python-modules/requests_download/default.nix +++ b/pkgs/development/python-modules/requests_download/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { format = "wheel"; #src = pkgs.fetchurl { - # url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.2-py2.py3-none-any.whl; + # url = "https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.2-py2.py3-none-any.whl"; # sha256 = "1ballx1hljpdpyvqzqn79m0dc21z2smrnxk2ylb6dbpg5crrskcr"; #}; @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "Download files using requests and save them to a target path"; - homepage = https://www.github.com/takluyver/requests_download; + homepage = "https://www.github.com/takluyver/requests_download"; license = lib.licenses.mit; maintainers = [ lib.maintainers.fridh ]; }; diff --git a/pkgs/development/python-modules/requests_ntlm/default.nix b/pkgs/development/python-modules/requests_ntlm/default.nix index 12cbae543ce21..2a34f73c0a7d1 100644 --- a/pkgs/development/python-modules/requests_ntlm/default.nix +++ b/pkgs/development/python-modules/requests_ntlm/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "HTTP NTLM authentication support for python-requests"; - homepage = https://github.com/requests/requests-ntlm; + homepage = "https://github.com/requests/requests-ntlm"; license = licenses.isc; maintainers = with maintainers; [ elasticdog ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix index a83e196005d62..43088cf5122ec 100644 --- a/pkgs/development/python-modules/resampy/default.nix +++ b/pkgs/development/python-modules/resampy/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/bmcfee/resampy; + homepage = "https://github.com/bmcfee/resampy"; description = "Efficient signal resampling"; license = licenses.isc; }; diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index 5163c7389b27e..09b713dc87cba 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/zopefoundation/RestrictedPython; + homepage = "https://github.com/zopefoundation/RestrictedPython"; description = "A restricted execution environment for Python to run untrusted code"; license = lib.licenses.zpl21; maintainers = with lib.maintainers; [ juaningan ]; diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix index 340c558b7a42e..4f62d232ab5e7 100644 --- a/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "reStructuredText linter"; - homepage = https://github.com/twolfson/restructuredtext-lint; + homepage = "https://github.com/twolfson/restructuredtext-lint"; license = lib.licenses.unlicense; }; } diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index a6b22220da350..715a4cfb43fea 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = { description = "ReStructuredText viewer"; - homepage = https://mg.pov.lt/restview/; + homepage = "https://mg.pov.lt/restview/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ koral ]; }; diff --git a/pkgs/development/python-modules/retry/default.nix b/pkgs/development/python-modules/retry/default.nix index a4743dcbfe46c..03deee5bae215 100644 --- a/pkgs/development/python-modules/retry/default.nix +++ b/pkgs/development/python-modules/retry/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Easy to use retry decorator"; - homepage = https://github.com/invl/retry; + homepage = "https://github.com/invl/retry"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/retry_decorator/default.nix b/pkgs/development/python-modules/retry_decorator/default.nix index 496705acbc404..ea6a214691e82 100644 --- a/pkgs/development/python-modules/retry_decorator/default.nix +++ b/pkgs/development/python-modules/retry_decorator/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/pnpnpn/retry-decorator; + homepage = "https://github.com/pnpnpn/retry-decorator"; description = "Retry Decorator for python functions"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/retrying/default.nix b/pkgs/development/python-modules/retrying/default.nix index 9074634e9b6ab..75a17fb6dc44b 100644 --- a/pkgs/development/python-modules/retrying/default.nix +++ b/pkgs/development/python-modules/retrying/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/rholder/retrying; + homepage = "https://github.com/rholder/retrying"; description = "General-purpose retrying library"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/retworkx/default.nix b/pkgs/development/python-modules/retworkx/default.nix new file mode 100644 index 0000000000000..531edab274674 --- /dev/null +++ b/pkgs/development/python-modules/retworkx/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, pythonOlder +, pythonAtLeast +, isPy37 +, isPy38 +, fetchFromGitHub +, fetchPypi + # Check inputs +, pytestCheckHook +}: + +let + rx-version = "0.3.3"; + wheel-args = if isPy37 then + { python = "cp37"; sha256 = "1gbz7sh9i4h41xs9c40lixfdigmvfykkgxgzwsrs8v0smx20dczy"; } + else if isPy38 then + { python = "cp38"; sha256 = "09xxgp4ac4q6mfkj6lsqqfrzz1cb02vxy7wlv0bq3z2hd0jcanxk"; } + else throw "python version & hash not included. Override attribute `wheel-args` with version & hash at https://pypi.org/project/retworkx"; + + github-source = fetchFromGitHub { + owner = "Qiskit"; + repo = "retworkx"; + rev = rx-version; + sha256 = "160w5vkzrl5rzcrdwhjq820i5lmc527m6hg0kxx0k6n2bz9qn26g"; + }; +in +buildPythonPackage rec { + pname = "retworkx"; + version = rx-version; + format = "wheel"; + + disabled = pythonOlder "3.5" || pythonAtLeast "3.9"; # compiled versions only included for 3.5 <= py <= 3.8 + + src = fetchPypi { + inherit pname version format; + inherit (wheel-args) python sha256; + abi = if pythonOlder "3.8" then "${wheel-args.python}m" else wheel-args.python; + platform = "manylinux2010_x86_64"; # i686, aarch64, and ppc64 also available, restricting to x86 for simplicity + }; + + pythonImportsCheck = [ "retworkx" ]; + + checkInputs = [ pytestCheckHook ]; + preCheck = '' + pushd $(mktemp -d) + cp -r ${github-source}/$sourceRoot/tests . + ''; + postCheck = "popd"; + + meta = with lib; { + description = "A python graph library implemented in Rust."; + homepage = "https://retworkx.readthedocs.io/en/latest/index.html"; + downloadPage = "https://github.com/Qiskit/retworkx/releases"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/development/python-modules/rfc-bibtex/default.nix b/pkgs/development/python-modules/rfc-bibtex/default.nix index dd114fd70960b..7eb79d1b251cc 100644 --- a/pkgs/development/python-modules/rfc-bibtex/default.nix +++ b/pkgs/development/python-modules/rfc-bibtex/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { disabled = !isPy3k; meta = with stdenv.lib; { - homepage = https://github.com/iluxonchik/rfc-bibtex/; + homepage = "https://github.com/iluxonchik/rfc-bibtex/"; description = "Generate Bibtex entries for IETF RFCs and Internet-Drafts"; license = licenses.mit; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix index eda1be2c11096..3af6d2f022bec 100644 --- a/pkgs/development/python-modules/rfc3986/default.nix +++ b/pkgs/development/python-modules/rfc3986/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "rfc3986"; - version = "1.3.2"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0344d0bd428126ce554e7ca2b61787b6a28d2bbd19fc70ed2dd85efe31176405"; + sha256 = "17dvx15m3r49bmif5zlli8kzjd6bys6psixzbp14sd5367d9h8qi"; }; checkInputs = [ pytest ]; @@ -16,7 +16,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://rfc3986.readthedocs.org; + homepage = "https://rfc3986.readthedocs.org"; license = licenses.asl20; description = "Validating URI References per RFC 3986"; }; diff --git a/pkgs/development/python-modules/rfc7464/default.nix b/pkgs/development/python-modules/rfc7464/default.nix index 60a5308d718a8..9e5a5d3689da6 100644 --- a/pkgs/development/python-modules/rfc7464/default.nix +++ b/pkgs/development/python-modules/rfc7464/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = https://github.com/moshez/rfc7464; + homepage = "https://github.com/moshez/rfc7464"; description = "RFC 7464 is a proposed standard for streaming JSON documents."; license = [ licenses.mit ]; maintainers = with maintainers; [ shlevy ]; diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix index 577c21d6e0b4f..bfc53910b29a3 100644 --- a/pkgs/development/python-modules/rhpl/default.nix +++ b/pkgs/development/python-modules/rhpl/default.nix @@ -6,7 +6,7 @@ buildPythonPackage { format = "other"; src = fetchurl { - url = http://ftp-stud.hs-esslingen.de/pub/Mirrors/archive.fedoraproject.org/fedora/linux/releases/10/Everything/source/SRPMS//rhpl-0.218-1.src.rpm; + url = "http://ftp-stud.hs-esslingen.de/pub/Mirrors/archive.fedoraproject.org/fedora/linux/releases/10/Everything/source/SRPMS//rhpl-0.218-1.src.rpm"; sha256 = "0c3sc74cjzz5dmpr2gi5naxcc5p2qmzagz7k561xj07njn0ddg16"; }; diff --git a/pkgs/development/python-modules/rig/default.nix b/pkgs/development/python-modules/rig/default.nix index d83afd7885f09..bc43aac3551ad 100644 --- a/pkgs/development/python-modules/rig/default.nix +++ b/pkgs/development/python-modules/rig/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, isPy34, isPy35, isPy27 +, isPy35, isPy27 , numpy, pytz, six, enum-compat, sentinel }: @@ -16,7 +16,7 @@ buildPythonPackage rec { # This is the list of officially supported versions. Other versions may work # as well. - disabled = !(isPy35 || isPy34 || isPy27); + disabled = !(isPy27 || isPy35); # Test Phase is only supported in development sources. doCheck = false; diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix index 258ad7cece104..6bb9eb71773f1 100644 --- a/pkgs/development/python-modules/ripser/default.nix +++ b/pkgs/development/python-modules/ripser/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Lean Persistent Homology Library for Python"; - homepage = https://ripser.scikit-tda.org; + homepage = "https://ripser.scikit-tda.org"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix index 287ae0391df36..49520b1ee452e 100644 --- a/pkgs/development/python-modules/rjsmin/default.nix +++ b/pkgs/development/python-modules/rjsmin/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://opensource.perlig.de/rjsmin/; + homepage = "http://opensource.perlig.de/rjsmin/"; license = licenses.asl20; description = "Javascript minifier written in python"; }; diff --git a/pkgs/development/python-modules/rl-coach/default.nix b/pkgs/development/python-modules/rl-coach/default.nix index bee588457ff24..e9efb0c02b4ec 100644 --- a/pkgs/development/python-modules/rl-coach/default.nix +++ b/pkgs/development/python-modules/rl-coach/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0c4f3a334ff55d534d2fc7f83d5e791f64b780391039e367f6cd9b4381838744"; + sha256 = "0i47hf0l76ydyrky6f8h760bfr0zg5g3vy675x6m6pgm9wrklkqc"; }; propagatedBuildInputs = [ @@ -94,5 +94,7 @@ buildPythonPackage rec { homepage = "https://nervanasystems.github.io/coach/"; license = licenses.asl20; maintainers = with maintainers; [ timokau ]; + # pythonPackages.gym is too new + broken = true; # since 2020-04-20 }; } diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index c1695a25b4569..11fff472e98a1 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Test data generator for Robot Framework"; - homepage = https://github.com/mkorpela/RoboMachine; + homepage = "https://github.com/mkorpela/RoboMachine"; license = licenses.asl20; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/pkgs/development/python-modules/roboschool/default.nix b/pkgs/development/python-modules/roboschool/default.nix index a86e17e921b68..53b909844ac9c 100644 --- a/pkgs/development/python-modules/roboschool/default.nix +++ b/pkgs/development/python-modules/roboschool/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Open-source software for robot simulation, integrated with OpenAI Gym"; - homepage = https://github.com/openai/roboschool; + homepage = "https://github.com/openai/roboschool"; license = licenses.mit; maintainers = with maintainers; [ timokau ]; }; diff --git a/pkgs/development/python-modules/robot-detection/default.nix b/pkgs/development/python-modules/robot-detection/default.nix index 81428b44ad98d..5cf864cd8019e 100644 --- a/pkgs/development/python-modules/robot-detection/default.nix +++ b/pkgs/development/python-modules/robot-detection/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library for detecting if a HTTP User Agent header is likely to be a bot"; - homepage = https://github.com/rory/robot-detection; + homepage = "https://github.com/rory/robot-detection"; license = licenses.gpl3Plus; }; } diff --git a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix index 6af58312523e3..73b538aa12f7c 100644 --- a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Database Library contains utilities meant for Robot Framework"; - homepage = https://github.com/franz-see/Robotframework-Database-Library; + homepage = "https://github.com/franz-see/Robotframework-Database-Library"; license = licenses.asl20; maintainers = with maintainers; [ talkara ]; }; diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix index 9baf3e40227a0..b0cb616dbde97 100644 --- a/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/pkgs/development/python-modules/robotframework-requests/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Robot Framework keyword library wrapper around the HTTP client library requests"; - homepage = https://github.com/bulkan/robotframework-requests; + homepage = "https://github.com/bulkan/robotframework-requests"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/robotframework-ride/default.nix b/pkgs/development/python-modules/robotframework-ride/default.nix index 4db1db04acce3..368c4e4c15ade 100644 --- a/pkgs/development/python-modules/robotframework-ride/default.nix +++ b/pkgs/development/python-modules/robotframework-ride/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Light-weight and intuitive editor for Robot Framework test case files"; - homepage = https://code.google.com/p/robotframework-ride/; + homepage = "https://code.google.com/p/robotframework-ride/"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/robotframework-selenium2library/default.nix b/pkgs/development/python-modules/robotframework-selenium2library/default.nix index 67f04f4f99199..14ce2db5d0b2b 100644 --- a/pkgs/development/python-modules/robotframework-selenium2library/default.nix +++ b/pkgs/development/python-modules/robotframework-selenium2library/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Web testing library for Robot Framework"; - homepage = https://github.com/robotframework/Selenium2Library; + homepage = "https://github.com/robotframework/Selenium2Library"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index 7294126f5162e..2bba9cfbdd8af 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Web testing library for Robot Framework"; - homepage = https://github.com/robotframework/SeleniumLibrary; + homepage = "https://github.com/robotframework/SeleniumLibrary"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix index b5ca464938b64..e9565cff15932 100644 --- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "SSHLibrary is a Robot Framework test library for SSH and SFTP"; - homepage = https://github.com/robotframework/SSHLibrary; + homepage = "https://github.com/robotframework/SSHLibrary"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/robotframework-tools/default.nix b/pkgs/development/python-modules/robotframework-tools/default.nix index 97bc9de0bf757..0ed0bcaf4948b 100644 --- a/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/pkgs/development/python-modules/robotframework-tools/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Tools for Robot Framework and Test Libraries"; - homepage = https://bitbucket.org/userzimmermann/robotframework-tools; + homepage = "https://bitbucket.org/userzimmermann/robotframework-tools"; license = licenses.gpl3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index bd96da2896480..a1251fa0093af 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Generic test automation framework"; - homepage = https://robotframework.org/; + homepage = "https://robotframework.org/"; license = licenses.asl20; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix index 1a2ef201c50d6..c5094b4ee59d4 100644 --- a/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A tool for checking that Robot Framework test cases have expected statuses and log messages"; - homepage = https://github.com/robotframework/statuschecker; + homepage = "https://github.com/robotframework/statuschecker"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix index 59ef766adf111..75b7fac0cfc02 100644 --- a/pkgs/development/python-modules/robotsuite/default.nix +++ b/pkgs/development/python-modules/robotsuite/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python unittest test suite for Robot Framework"; - homepage = https://github.com/collective/robotsuite/; + homepage = "https://github.com/collective/robotsuite/"; license = licenses.gpl3; }; } diff --git a/pkgs/development/python-modules/rocket-errbot/default.nix b/pkgs/development/python-modules/rocket-errbot/default.nix index 616927531a56b..29970e7fd281e 100644 --- a/pkgs/development/python-modules/rocket-errbot/default.nix +++ b/pkgs/development/python-modules/rocket-errbot/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }) ]; meta = { - homepage = https://github.com/errbotio/rocket; + homepage = "https://github.com/errbotio/rocket"; description = "Modern, multi-threaded and extensible web server"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index 9a0b91fdeb8a1..51fc191dd4676 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -24,7 +24,7 @@ buildPythonApplication rec { checkInputs = [pytest]; propagatedBuildInputs = [ capstone filebytes ]; meta = with stdenv.lib; { - homepage = https://scoding.de/ropper/; + homepage = "https://scoding.de/ropper/"; license = licenses.bsd3; description = "Show information about files in different file formats"; maintainers = with maintainers; [ bennofs ]; diff --git a/pkgs/development/python-modules/routes/default.nix b/pkgs/development/python-modules/routes/default.nix index 1e2e67c6206d2..985f6244cc652 100644 --- a/pkgs/development/python-modules/routes/default.nix +++ b/pkgs/development/python-modules/routes/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python re-implementation of the Rails routes system for mapping URLs to application actions"; - homepage = http://routes.groovie.org/; + homepage = "http://routes.groovie.org/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/rpdb/default.nix b/pkgs/development/python-modules/rpdb/default.nix index 8b22ef967d5c7..d7faeeaed7c98 100644 --- a/pkgs/development/python-modules/rpdb/default.nix +++ b/pkgs/development/python-modules/rpdb/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "pdb wrapper with remote access via tcp socket"; - homepage = https://github.com/tamentis/rpdb; + homepage = "https://github.com/tamentis/rpdb"; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/rpkg/default.nix b/pkgs/development/python-modules/rpkg/default.nix index bbe20fd1e8258..2be6830130dc6 100644 --- a/pkgs/development/python-modules/rpkg/default.nix +++ b/pkgs/development/python-modules/rpkg/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for dealing with rpm packaging"; - homepage = https://pagure.io/fedpkg; + homepage = "https://pagure.io/fedpkg"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix index a468bee275c92..1c4fd16eedf63 100644 --- a/pkgs/development/python-modules/rply/default.nix +++ b/pkgs/development/python-modules/rply/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python Lex/Yacc that works with RPython"; - homepage = https://github.com/alex/rply; + homepage = "https://github.com/alex/rply"; license = licenses.bsd3; maintainers = with maintainers; [ nixy ]; }; diff --git a/pkgs/development/python-modules/rpmfluff/default.nix b/pkgs/development/python-modules/rpmfluff/default.nix index 76fc508a5d828..1893f7dd19c3c 100644 --- a/pkgs/development/python-modules/rpmfluff/default.nix +++ b/pkgs/development/python-modules/rpmfluff/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "lightweight way of building RPMs, and sabotaging them"; - homepage = https://pagure.io/rpmfluff; + homepage = "https://pagure.io/rpmfluff"; license = licenses.gpl2; maintainers = with maintainers; [ disassembler ]; }; diff --git a/pkgs/development/python-modules/rpy2/2.nix b/pkgs/development/python-modules/rpy2/2.nix index aef184d4afc25..e178d3c821163 100644 --- a/pkgs/development/python-modules/rpy2/2.nix +++ b/pkgs/development/python-modules/rpy2/2.nix @@ -99,7 +99,7 @@ buildPythonPackage rec { ''; meta = { - homepage = http://rpy.sourceforge.net/rpy2; + homepage = "http://rpy.sourceforge.net/rpy2"; description = "Python interface to R"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index 613e7af7d3a1d..c0c0420e925a5 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -98,7 +98,7 @@ buildPythonPackage rec { ]; meta = { - homepage = http://rpy.sourceforge.net/rpy2; + homepage = "http://rpy.sourceforge.net/rpy2"; description = "Python interface to R"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index 5b2345f803e35..5b6dba0f9ed01 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Remote Python Call (RPyC), a transparent and symmetric RPC library"; - homepage = https://rpyc.readthedocs.org; + homepage = "https://rpyc.readthedocs.org"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix index 1b3d339b07850..459ca04379689 100644 --- a/pkgs/development/python-modules/rsa/default.nix +++ b/pkgs/development/python-modules/rsa/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://stuvel.eu/rsa; + homepage = "https://stuvel.eu/rsa"; license = licenses.asl20; description = "A pure-Python RSA implementation"; }; diff --git a/pkgs/development/python-modules/rtslib/default.nix b/pkgs/development/python-modules/rtslib/default.nix index c1d27488bddfb..28b66ec5a521c 100644 --- a/pkgs/development/python-modules/rtslib/default.nix +++ b/pkgs/development/python-modules/rtslib/default.nix @@ -2,20 +2,20 @@ buildPythonPackage rec { pname = "rtslib"; - version = "2.1.71"; + version = "2.1.72"; src = fetchFromGitHub { owner = "open-iscsi"; - repo ="${pname}-fb"; + repo = "${pname}-fb"; rev = "v${version}"; - sha256 = "0cn9azi44hf59mp47207igv72kjbkyz4rsvgzmwbpz0s57b0hnab"; + sha256 = "13kycf9xkyxm1ik8yh3qpd96vird8y65daigyiyb4jvx0lmrd0kv"; }; propagatedBuildInputs = [ six pyudev pygobject3 ]; meta = with stdenv.lib; { description = "A Python object API for managing the Linux LIO kernel target"; - homepage = https://github.com/open-iscsi/rtslib-fb; + homepage = "https://github.com/open-iscsi/rtslib-fb"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix index f378434228167..4f042dcf90f7b 100644 --- a/pkgs/development/python-modules/rubymarshal/default.nix +++ b/pkgs/development/python-modules/rubymarshal/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ hypothesis ]; meta = with stdenv.lib; { - homepage = https://github.com/d9pouces/RubyMarshal/; + homepage = "https://github.com/d9pouces/RubyMarshal/"; description = "Read and write Ruby-marshalled data"; license = licenses.wtfpl; maintainers = [ maintainers.ryantm ]; diff --git a/pkgs/development/python-modules/ruffus/default.nix b/pkgs/development/python-modules/ruffus/default.nix index 37222964b0471..b3f09ee88ffa3 100644 --- a/pkgs/development/python-modules/ruffus/default.nix +++ b/pkgs/development/python-modules/ruffus/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Light-weight Python Computational Pipeline Management"; - homepage = http://www.ruffus.org.uk; + homepage = "http://www.ruffus.org.uk"; license = licenses.mit; maintainers = [ maintainers.kiwi ]; }; diff --git a/pkgs/development/python-modules/runsnakerun/default.nix b/pkgs/development/python-modules/runsnakerun/default.nix index b3a38320a2bf9..6d601197d76ee 100644 --- a/pkgs/development/python-modules/runsnakerun/default.nix +++ b/pkgs/development/python-modules/runsnakerun/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "GUI Viewer for Python profiling runs"; - homepage = http://www.vrplumber.com/programming/runsnakerun/; + homepage = "http://www.vrplumber.com/programming/runsnakerun/"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index fca11c100cf07..d2d63b2b5c4c8 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = { description = "Helper library for creating Runway models"; - homepage = https://github.com/runwayml/model-sdk; + homepage = "https://github.com/runwayml/model-sdk"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/rx/default.nix b/pkgs/development/python-modules/rx/default.nix index 6183596ef7dd5..fd57a8013c1f9 100644 --- a/pkgs/development/python-modules/rx/default.nix +++ b/pkgs/development/python-modules/rx/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/ReactiveX/RxPY; + homepage = "https://github.com/ReactiveX/RxPY"; description = "Reactive Extensions for Python"; maintainers = with lib.maintainers; [ thanegill ]; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/rxv/default.nix b/pkgs/development/python-modules/rxv/default.nix index 8133936798ed8..7f3e6527d060f 100644 --- a/pkgs/development/python-modules/rxv/default.nix +++ b/pkgs/development/python-modules/rxv/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automation Library for Yamaha RX-V473, RX-V573, RX-V673, RX-V773 receivers"; - homepage = https://github.com/wuub/rxv; + homepage = "https://github.com/wuub/rxv"; license = licenses.mit; maintainers = with maintainers; [ flyfloh ]; }; diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 0f800c14fa97b..c6241e88ef9b3 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3."; - homepage = https://github.com/dask/s3fs/; + homepage = "https://github.com/dask/s3fs/"; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 18ffbc4e5c356..27551a798d7b0 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/boto/s3transfer; + homepage = "https://github.com/boto/s3transfer"; license = stdenv.lib.licenses.asl20; description = "A library for managing Amazon S3 transfers"; }; diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix new file mode 100644 index 0000000000000..c268f26995950 --- /dev/null +++ b/pkgs/development/python-modules/safety/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchPypi, requests, dparse, click, setuptools, pytestCheckHook }: + +buildPythonPackage rec { + pname = "safety"; + version = "1.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "23bf20690d4400edc795836b0c983c2b4cbbb922233108ff925b7dd7750f00c9"; + }; + + propagatedBuildInputs = [ requests dparse click setuptools ]; + + # Disable tests depending on online services + checkInputs = [ pytestCheckHook ]; + dontUseSetuptoolsCheck = true; + disabledTests = [ + "test_check_live" + "test_check_live_cached" + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + meta = with lib; { + description = + "Safety checks your installed dependencies for known security vulnerabilities"; + homepage = "https://github.com/pyupio/safety"; + license = licenses.mit; + maintainers = with maintainers; [ thomasdesr ]; + }; +} diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index 92def3935e727..a33bec431d68a 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://salmon-mail.readthedocs.org/; + homepage = "https://salmon-mail.readthedocs.org/"; description = "Pythonic mail application server"; license = licenses.gpl3; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/python-modules/sampledata/default.nix b/pkgs/development/python-modules/sampledata/default.nix index fcc27e3c4dbe3..93d45b3d1a0da 100644 --- a/pkgs/development/python-modules/sampledata/default.nix +++ b/pkgs/development/python-modules/sampledata/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { meta = { description = "Sample Data generator for Python "; - homepage = https://github.com/jespino/sampledata; + homepage = "https://github.com/jespino/sampledata"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix index 8de675d4ea16c..02278d9be415c 100644 --- a/pkgs/development/python-modules/samplerate/default.nix +++ b/pkgs/development/python-modules/samplerate/default.nix @@ -9,7 +9,7 @@ buildPythonPackage { version = "0.3.3"; src = pkgs.fetchgit { - url = https://github.com/cournape/samplerate; + url = "https://github.com/cournape/samplerate"; rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210"; sha256 = "0mgic7bs5zv5ji05vr527jlxxlb70f9dg93hy1lzyz2plm1kf7gg"; }; @@ -28,7 +28,7 @@ buildPythonPackage { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/cournape/samplerate; + homepage = "https://github.com/cournape/samplerate"; description = "High quality sampling rate convertion from audio data in numpy arrays"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/sandboxlib/default.nix b/pkgs/development/python-modules/sandboxlib/default.nix index 1a3511dab9774..541bd81087148 100644 --- a/pkgs/development/python-modules/sandboxlib/default.nix +++ b/pkgs/development/python-modules/sandboxlib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Sandboxing Library for Python"; - homepage = https://pypi.python.org/pypi/sandboxlib/0.3.1; + homepage = "https://pypi.python.org/pypi/sandboxlib/0.3.1"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 5c1e0e8124686..14eb1d9a3f376 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -132,7 +132,7 @@ buildPythonPackage rec { meta = with lib; { description = "A microframework based on uvloop, httptools, and learnings of flask"; - homepage = http://github.com/channelcat/sanic/; + homepage = "http://github.com/channelcat/sanic/"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/sarge/default.nix b/pkgs/development/python-modules/sarge/default.nix index 4d7a3a5972f7d..37a72278d8563 100644 --- a/pkgs/development/python-modules/sarge/default.nix +++ b/pkgs/development/python-modules/sarge/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://sarge.readthedocs.org/; + homepage = "https://sarge.readthedocs.org/"; description = "A wrapper for subprocess which provides command pipeline functionality"; license = licenses.bsd3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix index 2aec6dced1c91..1715cf2b7c32e 100644 --- a/pkgs/development/python-modules/sasmodels/default.nix +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "Library of small angle scattering models"; - homepage = http://sasview.org; + homepage = "http://sasview.org"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ rprospero ]; }; diff --git a/pkgs/development/python-modules/scales/default.nix b/pkgs/development/python-modules/scales/default.nix index 4fb169b155849..0407c1fa86d89 100644 --- a/pkgs/development/python-modules/scales/default.nix +++ b/pkgs/development/python-modules/scales/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Stats for Python processes"; - homepage = https://www.github.com/Cue/scales; + homepage = "https://www.github.com/Cue/scales"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/scandir/default.nix b/pkgs/development/python-modules/scandir/default.nix index bc71fde5cedba..f92b1f5a6ed73 100644 --- a/pkgs/development/python-modules/scandir/default.nix +++ b/pkgs/development/python-modules/scandir/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "A better directory iterator and faster os.walk()"; - homepage = https://github.com/benhoyt/scandir; + homepage = "https://github.com/benhoyt/scandir"; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 4f058a0761bdd..ec0ccc102f342 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Powerful interactive network packet manipulation program"; - homepage = https://scapy.net/; + homepage = "https://scapy.net/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ primeos bjornfor ]; diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix index 4d4ec409e0285..118c95cc8c57c 100644 --- a/pkgs/development/python-modules/schedule/default.nix +++ b/pkgs/development/python-modules/schedule/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python job scheduling for humans"; - homepage = https://github.com/dbader/schedule; + homepage = "https://github.com/dbader/schedule"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index 2c1173ce68fcc..d4d45e8bd3bf0 100644 --- a/pkgs/development/python-modules/schema/default.nix +++ b/pkgs/development/python-modules/schema/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library for validating Python data structures"; - homepage = https://github.com/keleshev/schema; + homepage = "https://github.com/keleshev/schema"; license = licenses.mit; maintainers = [ maintainers.tobim ]; }; diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index c5e36f8ac0703..6391e833114a4 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://scikit-bio.org/; + homepage = "http://scikit-bio.org/"; description = "Data structures, algorithms and educational resources for bioinformatics"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix index 122af8cfda23a..8705488ba14cf 100644 --- a/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/pkgs/development/python-modules/scikit-fmm/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python extension module which implements the fast marching method"; - homepage = https://github.com/scikit-fmm/scikit-fmm; + homepage = "https://github.com/scikit-fmm/scikit-fmm"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index fa6ced432f72e..41f2609df7817 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = { description = "Image processing routines for SciPy"; - homepage = https://scikit-image.org; + homepage = "https://scikit-image.org"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/scikit-optimize/default.nix b/pkgs/development/python-modules/scikit-optimize/default.nix index f82dc947b066f..f8e30397189bc 100644 --- a/pkgs/development/python-modules/scikit-optimize/default.nix +++ b/pkgs/development/python-modules/scikit-optimize/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sequential model-based optimization toolbox"; - homepage = https://scikit-optimize.github.io/; + homepage = "https://scikit-optimize.github.io/"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/scikit-tda/default.nix b/pkgs/development/python-modules/scikit-tda/default.nix index 0c33f7a0dabd4..f6d573573b9c4 100644 --- a/pkgs/development/python-modules/scikit-tda/default.nix +++ b/pkgs/development/python-modules/scikit-tda/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Topological Data Analysis for humans"; - homepage = https://github.com/scikit-tda/scikit-tda; + homepage = "https://github.com/scikit-tda/scikit-tda"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/scikitlearn/0.20.nix b/pkgs/development/python-modules/scikitlearn/0.20.nix index 92977331a847a..4d8e8d00f4345 100644 --- a/pkgs/development/python-modules/scikitlearn/0.20.nix +++ b/pkgs/development/python-modules/scikitlearn/0.20.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A set of python modules for machine learning and data mining"; - homepage = http://scikit-learn.org; + homepage = "https://scikit-learn.org"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index 4830e3fb2abca..454e631634bfb 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "0.21.3"; + version = "0.22.2.post1"; # UnboundLocalError: local variable 'message' referenced before assignment disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { inherit pname version; - sha256 = "eb9b8ebf59eddd8b96366428238ab27d05a19e89c5516ce294abc35cea75d003"; + sha256 = "0z81n13dxvd6qwq5lsnzw2machmxbirhdhr73v90fi55ic9qslsp"; }; buildInputs = [ @@ -41,15 +41,6 @@ buildPythonPackage rec { ]; checkInputs = [ pytest ]; - patches = [ - # Fixes tests by changing threshold of a test-case that broke - # with numpy versions >= 1.17. This should be removed for versions > 0.21.2. - ( fetchpatch { - url = "https://github.com/scikit-learn/scikit-learn/commit/b730befc821caec5b984d9ff3aa7bc4bd7f4d9bb.patch"; - sha256 = "0z36m05mv6d494qwq0688rgwa7c4bbnm5s2rcjlrp29fwn3fy1bv"; - }) - ]; - LC_ALL="en_US.UTF-8"; doCheck = !stdenv.isAarch64; @@ -61,7 +52,13 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A set of python modules for machine learning and data mining"; - homepage = http://scikit-learn.org; + changelog = let + major = versions.major version; + minor = versions.minor version; + dashVer = replaceChars ["."] ["-"] version; + in + "https://scikit-learn.org/stable/whats_new/v${major}.${minor}.html#version-${dashVer}"; + homepage = "https://scikit-learn.org"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix index ba3d5eaaff0e9..7927da30c8926 100644 --- a/pkgs/development/python-modules/scikits-odes/default.nix +++ b/pkgs/development/python-modules/scikits-odes/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A scikit offering extra ode/dae solvers, as an extension to what is available in scipy"; - homepage = https://github.com/bmcage/odes; + homepage = "https://github.com/bmcage/odes"; license = licenses.bsd3; maintainers = with maintainers; [ flokli idontgetoutmuch ]; platforms = [ "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 6c62adb7821ce..ace6c248ab2cf 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -53,9 +53,11 @@ in buildPythonPackage rec { setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; + SCIPY_USE_G77_ABI_WRAPPER = 1; + meta = { description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. "; - homepage = https://www.scipy.org/; + homepage = "https://www.scipy.org/"; maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/scour/default.nix b/pkgs/development/python-modules/scour/default.nix index 7c198519331b8..67eac72964439 100644 --- a/pkgs/development/python-modules/scour/default.nix +++ b/pkgs/development/python-modules/scour/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "An SVG Optimizer / Cleaner "; - homepage = https://github.com/scour-project/scour; + homepage = "https://github.com/scour-project/scour"; license = licenses.asl20; maintainers = with maintainers; [ worldofpeace ]; }; diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index c57d10cf89086..b17be3c77d884 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/jbardin/scp.py; + homepage = "https://github.com/jbardin/scp.py"; description = "SCP module for paramiko"; license = licenses.lgpl3; maintainers = with maintainers; [ xnaveira ]; diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 05c0c43c15c75..2827f7151f4dc 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -26,7 +26,7 @@ }: buildPythonPackage rec { - version = "2.0.1"; + version = "2.1.0"; pname = "Scrapy"; disabled = isPy27; @@ -78,7 +78,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "85581a01f4160a103ca9906ffa4e44474f4ecd1685f0934728892c58ebf111f6"; + sha256 = "640aea0f9be9b055f5cfec5ab78ee88bb37a5be3809b138329bd2af51392ec7f"; }; postInstall = '' diff --git a/pkgs/development/python-modules/scripttest/default.nix b/pkgs/development/python-modules/scripttest/default.nix index 2ae7a4c8e361c..ab53585fe8c20 100644 --- a/pkgs/development/python-modules/scripttest/default.nix +++ b/pkgs/development/python-modules/scripttest/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library for testing interactive command-line applications"; - homepage = https://pypi.python.org/pypi/ScriptTest/; + homepage = "https://pypi.python.org/pypi/ScriptTest/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix index 4e500d6853528..128e9276608dd 100644 --- a/pkgs/development/python-modules/scs/default.nix +++ b/pkgs/development/python-modules/scs/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , blas -, liblapack +, lapack , numpy , scipy , scs @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; buildInputs = [ - liblapack + lapack blas ]; diff --git a/pkgs/development/python-modules/sdnotify/default.nix b/pkgs/development/python-modules/sdnotify/default.nix index 478453821782d..f1a7fc4d52c0a 100644 --- a/pkgs/development/python-modules/sdnotify/default.nix +++ b/pkgs/development/python-modules/sdnotify/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pure Python implementation of systemd's service notification protocol"; - homepage = https://github.com/bb4242/sdnotify; + homepage = "https://github.com/bb4242/sdnotify"; license = licenses.mit; maintainers = with maintainers; [ pmiddend ]; }; diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix index 6b9f00783fd26..2cd7590b83d16 100644 --- a/pkgs/development/python-modules/secp256k1/default.nix +++ b/pkgs/development/python-modules/secp256k1/default.nix @@ -40,9 +40,9 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/ludbb/secp256k1-py; + homepage = "https://github.com/ludbb/secp256k1-py"; description = "Python FFI bindings for secp256k1"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ chris-martin ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/secretstorage/2.nix b/pkgs/development/python-modules/secretstorage/2.nix index 8fa044e638a40..378be5be31300 100644 --- a/pkgs/development/python-modules/secretstorage/2.nix +++ b/pkgs/development/python-modules/secretstorage/2.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/mitya57/secretstorage; + homepage = "https://github.com/mitya57/secretstorage"; description = "Python bindings to FreeDesktop.org Secret Service API"; license = licenses.bsd3; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix index e2c3e975b9a3a..d10ea9c8be2b1 100644 --- a/pkgs/development/python-modules/secretstorage/default.nix +++ b/pkgs/development/python-modules/secretstorage/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder, cryptography, jeepney, pygobject3 }: +{ lib, fetchPypi, buildPythonPackage, pythonOlder, cryptography, jeepney }: buildPythonPackage rec { pname = "secretstorage"; @@ -15,14 +15,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography jeepney - pygobject3 ]; # Needs a D-Bus Sesison doCheck = false; meta = with lib; { - homepage = https://github.com/mitya57/secretstorage; + homepage = "https://github.com/mitya57/secretstorage"; description = "Python bindings to FreeDesktop.org Secret Service API"; license = licenses.bsd3; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/python-modules/secure/default.nix b/pkgs/development/python-modules/secure/default.nix index 6d2f2871ec2d6..49fcb52a154ff 100644 --- a/pkgs/development/python-modules/secure/default.nix +++ b/pkgs/development/python-modules/secure/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , maya , requests }: @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "0.2.1"; pname = "secure"; + disabled = isPy27; src = fetchFromGitHub { owner = "typeerror"; diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix index 030178fef8302..159047eafd7ce 100644 --- a/pkgs/development/python-modules/selectors2/default.nix +++ b/pkgs/development/python-modules/selectors2/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://www.github.com/SethMichaelLarson/selectors2; + homepage = "https://www.github.com/SethMichaelLarson/selectors2"; description = "Back-ported, durable, and portable selectors"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/selectors34/default.nix b/pkgs/development/python-modules/selectors34/default.nix index 7bb66be3096ec..6d02c9dc79b28 100644 --- a/pkgs/development/python-modules/selectors34/default.nix +++ b/pkgs/development/python-modules/selectors34/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A backport of the selectors module from Python 3.4"; - homepage = https://github.com/berkerpeksag/selectors34; + homepage = "https://github.com/berkerpeksag/selectors34"; license = licenses.psfl; maintainers = with maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index ada159aaa121c..b32dfe2653e43 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "The selenium package is used to automate web browser interaction from Python"; - homepage = http://www.seleniumhq.org; + homepage = "http://www.seleniumhq.org"; license = licenses.asl20; maintainers = with maintainers; [ jraygauthier ]; }; diff --git a/pkgs/development/python-modules/semantic/default.nix b/pkgs/development/python-modules/semantic/default.nix index b5855fbb143dc..f0371f860cf56 100644 --- a/pkgs/development/python-modules/semantic/default.nix +++ b/pkgs/development/python-modules/semantic/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Common Natural Language Processing Tasks for Python"; - homepage = https://github.com/crm416/semantic; + homepage = "https://github.com/crm416/semantic"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 3201de0ba46cc..bc0262a89c934 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Python package to work with Semantic Versioning (http://semver.org/)"; - homepage = https://github.com/k-bx/python-semver; + homepage = "https://github.com/k-bx/python-semver"; license = licenses.bsd3; maintainers = with maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix index bb9f115590e99..16528c976ac6f 100644 --- a/pkgs/development/python-modules/send2trash/default.nix +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Send file to trash natively under macOS, Windows and Linux"; - homepage = https://github.com/hsoft/send2trash; + homepage = "https://github.com/hsoft/send2trash"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/sepaxml/default.nix b/pkgs/development/python-modules/sepaxml/default.nix index 1790ae2e8f5d0..94fd2d65d4645 100644 --- a/pkgs/development/python-modules/sepaxml/default.nix +++ b/pkgs/development/python-modules/sepaxml/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/raphaelm/python-sepaxml/; + homepage = "https://github.com/raphaelm/python-sepaxml/"; description = "SEPA Direct Debit XML generation in python"; license = licenses.mit; maintainers = with maintainers; [ elohmeier ]; diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index feddc24985aba..b7fba99860026 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)"; - homepage = http://blockdiag.com/; + homepage = "http://blockdiag.com/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix index f568ad6b04451..701de52004610 100644 --- a/pkgs/development/python-modules/serpent/default.nix +++ b/pkgs/development/python-modules/serpent/default.nix @@ -4,7 +4,6 @@ , lib , python , isPy27 -, isPy33 , enum34 , attrs , pytz @@ -19,7 +18,7 @@ buildPythonPackage rec { sha256 = "1arnckykpkvv2qrp49l1k7q5mr5pisswl0rvdx98x8wsl1n361pk"; }; - propagatedBuildInputs = lib.optionals (isPy27 || isPy33) [ enum34 ]; + propagatedBuildInputs = lib.optionals isPy27 [ enum34 ]; checkInputs = [ attrs pytz ]; checkPhase = '' @@ -28,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A simple serialization library based on ast.literal_eval"; - homepage = https://github.com/irmen/Serpent; + homepage = "https://github.com/irmen/Serpent"; license = licenses.mit; maintainers = with maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/serpy/default.nix b/pkgs/development/python-modules/serpy/default.nix index b627322307dcc..7a1b8348a0e65 100644 --- a/pkgs/development/python-modules/serpy/default.nix +++ b/pkgs/development/python-modules/serpy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { meta = { description = "ridiculously fast object serialization"; - homepage = https://github.com/clarkduvall/serpy; + homepage = "https://github.com/clarkduvall/serpy"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/serverlessrepo/default.nix b/pkgs/development/python-modules/serverlessrepo/default.nix index 90be965c4f2df..1e6f8307fbcab 100644 --- a/pkgs/development/python-modules/serverlessrepo/default.nix +++ b/pkgs/development/python-modules/serverlessrepo/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/awslabs/aws-serverlessrepo-python; + homepage = "https://github.com/awslabs/aws-serverlessrepo-python"; description = "Helpers for working with the AWS Serverless Application Repository"; longDescription = '' A Python library with convenience helpers for working with the diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix index 2f7acce976de6..e8541da6cd454 100644 --- a/pkgs/development/python-modules/serversyncstorage/default.nix +++ b/pkgs/development/python-modules/serversyncstorage/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { broken = cornice.version != "0.17"; description = "The SyncServer server software, as used by Firefox Sync"; - homepage = https://github.com/mozilla-services/server-syncstorage; + homepage = "https://github.com/mozilla-services/server-syncstorage"; license = licenses.mpl20; maintainers = with maintainers; [ nadrieril ]; }; diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service_identity/default.nix index f39dd48232be8..5465fe7c99426 100644 --- a/pkgs/development/python-modules/service_identity/default.nix +++ b/pkgs/development/python-modules/service_identity/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { meta = with lib; { description = "Service identity verification for pyOpenSSL"; license = licenses.mit; - homepage = https://service-identity.readthedocs.io; + homepage = "https://service-identity.readthedocs.io"; }; } diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix index e45638edd101d..5b678ee1d508a 100644 --- a/pkgs/development/python-modules/setproctitle/default.nix +++ b/pkgs/development/python-modules/setproctitle/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Allows a process to change its title (as displayed by system tools such as ps and top)"; - homepage = https://github.com/dvarrazzo/py-setproctitle; + homepage = "https://github.com/dvarrazzo/py-setproctitle"; license = licenses.bsdOriginal; maintainers = with maintainers; [ exi ]; }; diff --git a/pkgs/development/python-modules/setuptools-git/default.nix b/pkgs/development/python-modules/setuptools-git/default.nix index 862a7bc277869..5c0b40b4af4e0 100644 --- a/pkgs/development/python-modules/setuptools-git/default.nix +++ b/pkgs/development/python-modules/setuptools-git/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Setuptools revision control system plugin for Git"; - homepage = https://pypi.python.org/pypi/setuptools-git; + homepage = "https://pypi.python.org/pypi/setuptools-git"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/setuptools/44.0.nix b/pkgs/development/python-modules/setuptools/44.0.nix index 194b90cb42ad2..66330ca250f8a 100644 --- a/pkgs/development/python-modules/setuptools/44.0.nix +++ b/pkgs/development/python-modules/setuptools/44.0.nix @@ -66,7 +66,7 @@ in buildPythonPackage rec { meta = with stdenv.lib; { description = "Utilities to facilitate the installation of Python packages"; - homepage = https://pypi.python.org/pypi/setuptools; + homepage = "https://pypi.python.org/pypi/setuptools"; license = with licenses; [ psfl zpl20 ]; platforms = python.meta.platforms; priority = 10; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 93c6c0ca38e50..c4ff18697e564 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -66,7 +66,7 @@ in buildPythonPackage rec { meta = with stdenv.lib; { description = "Utilities to facilitate the installation of Python packages"; - homepage = https://pypi.python.org/pypi/setuptools; + homepage = "https://pypi.python.org/pypi/setuptools"; license = with licenses; [ psfl zpl20 ]; platforms = python.meta.platforms; priority = 10; diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix index b423ac9b15b64..54622c36e6b78 100644 --- a/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/pkgs/development/python-modules/setuptools_scm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://bitbucket.org/pypa/setuptools_scm/; + homepage = "https://bitbucket.org/pypa/setuptools_scm/"; description = "Handles managing your python package versions in scm metadata"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/setuptoolsdarcs/default.nix b/pkgs/development/python-modules/setuptoolsdarcs/default.nix index d696a5be08fa1..5e58f80985f5e 100644 --- a/pkgs/development/python-modules/setuptoolsdarcs/default.nix +++ b/pkgs/development/python-modules/setuptoolsdarcs/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Setuptools plugin for the Darcs version control system"; - homepage = http://allmydata.org/trac/setuptools_darcs; + homepage = "http://allmydata.org/trac/setuptools_darcs"; license = licenses.bsd0; }; } diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix index 6a7bb38a74d13..8a37f41086eae 100644 --- a/pkgs/development/python-modules/sfepy/default.nix +++ b/pkgs/development/python-modules/sfepy/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://sfepy.org/; + homepage = "https://sfepy.org/"; description = "Simple Finite Elements in Python"; license = licenses.bsd3; maintainers = with maintainers; [ wd15 ]; diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix index aa18f07e49e50..913840110c911 100644 --- a/pkgs/development/python-modules/sh/default.nix +++ b/pkgs/development/python-modules/sh/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = { description = "Python subprocess interface"; - homepage = https://pypi.python.org/pypi/sh/; + homepage = "https://pypi.python.org/pypi/sh/"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/sharedmem/default.nix b/pkgs/development/python-modules/sharedmem/default.nix index 42277fc00c597..9111fd971ca0e 100644 --- a/pkgs/development/python-modules/sharedmem/default.nix +++ b/pkgs/development/python-modules/sharedmem/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; meta = { - homepage = http://rainwoodman.github.io/sharedmem/; + homepage = "http://rainwoodman.github.io/sharedmem/"; description = "Easier parallel programming on shared memory computers"; maintainers = with lib.maintainers; [ edwtjo ]; license = lib.licenses.gpl3; diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix index 707a79e105517..8bf73209ad8fc 100644 --- a/pkgs/development/python-modules/shellingham/default.nix +++ b/pkgs/development/python-modules/shellingham/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tool to Detect Surrounding Shell"; - homepage = https://github.com/sarugaku/shellingham; + homepage = "https://github.com/sarugaku/shellingham"; license = licenses.isc; maintainers = with maintainers; [ mbode ]; }; diff --git a/pkgs/development/python-modules/shippai/default.nix b/pkgs/development/python-modules/shippai/default.nix index 7682d2086034c..1bae1c50fb66e 100644 --- a/pkgs/development/python-modules/shippai/default.nix +++ b/pkgs/development/python-modules/shippai/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Use Rust failures as Python exceptions"; - homepage = https://github.com/untitaker/shippai; + homepage = "https://github.com/untitaker/shippai"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; }; diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index 4db1172e0410b..be1a642438cda 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.22.0"; + version = "1.23.0"; src = fetchPypi { inherit pname version; - sha256 = "0pgkd0pngmygafld283zfx7whlv6yp3ldgd4sjv8bxjcsb19iw59"; + sha256 = "16rkbhdj7al7p8s1pfsjx9agxpvisbvyvcd04rm1kigpz87p9c1i"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/shortuuid/default.nix b/pkgs/development/python-modules/shortuuid/default.nix index ac2fef9f2dfa0..fc2a25dab5cec 100644 --- a/pkgs/development/python-modules/shortuuid/default.nix +++ b/pkgs/development/python-modules/shortuuid/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A generator library for concise, unambiguous and URL-safe UUIDs"; - homepage = https://github.com/stochastic-technologies/shortuuid/; + homepage = "https://github.com/stochastic-technologies/shortuuid/"; license = licenses.bsd3; maintainers = with maintainers; [ zagy ]; }; diff --git a/pkgs/development/python-modules/should-dsl/default.nix b/pkgs/development/python-modules/should-dsl/default.nix index 987d7e60cea60..abfe47bfc7a72 100644 --- a/pkgs/development/python-modules/should-dsl/default.nix +++ b/pkgs/development/python-modules/should-dsl/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Should assertions in Python as clear and readable as possible"; - homepage = http://www.should-dsl.info/; + homepage = "http://www.should-dsl.info/"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/shouldbe/default.nix b/pkgs/development/python-modules/shouldbe/default.nix index ccff9ff4b9f88..1623d216ac9c9 100644 --- a/pkgs/development/python-modules/shouldbe/default.nix +++ b/pkgs/development/python-modules/shouldbe/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Assertion Helpers inspired by Shouldly"; - homepage = https://pypi.python.org/pypi/shouldbe/; + homepage = "https://pypi.python.org/pypi/shouldbe/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/showit/default.nix b/pkgs/development/python-modules/showit/default.nix index 4060b1a4fc514..0cc379161324c 100644 --- a/pkgs/development/python-modules/showit/default.nix +++ b/pkgs/development/python-modules/showit/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "simple and sensible display of images"; - homepage = https://github.com/freeman-lab/showit; + homepage = "https://github.com/freeman-lab/showit"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/shutilwhich/default.nix b/pkgs/development/python-modules/shutilwhich/default.nix index d88141c8b3584..a30e23c894e0e 100644 --- a/pkgs/development/python-modules/shutilwhich/default.nix +++ b/pkgs/development/python-modules/shutilwhich/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Backport of shutil.which"; license = licenses.psfl; - homepage = https://github.com/mbr/shutilwhich; + homepage = "https://github.com/mbr/shutilwhich"; maintainers = with maintainers; [ multun ]; }; } diff --git a/pkgs/development/python-modules/sievelib/default.nix b/pkgs/development/python-modules/sievelib/default.nix index d579f3ef7445e..8204cc3b41562 100644 --- a/pkgs/development/python-modules/sievelib/default.nix +++ b/pkgs/development/python-modules/sievelib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "Client-side Sieve and Managesieve library written in Python"; - homepage = https://github.com/tonioo/sievelib; + homepage = "https://github.com/tonioo/sievelib"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ leenaars ]; longDescription = '' diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix index 1214730dad879..6916b704fcd48 100644 --- a/pkgs/development/python-modules/signedjson/default.nix +++ b/pkgs/development/python-modules/signedjson/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl typing-extensions ]; meta = with stdenv.lib; { - homepage = https://pypi.org/project/signedjson/; + homepage = "https://pypi.org/project/signedjson/"; description = "Sign JSON with Ed25519 signatures"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix index ad1f2643e5f03..5b084c399ba50 100644 --- a/pkgs/development/python-modules/simanneal/default.nix +++ b/pkgs/development/python-modules/simanneal/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python implementation of the simulated annealing optimization technique"; - homepage = https://github.com/perrygeo/simanneal; + homepage = "https://github.com/perrygeo/simanneal"; license = licenses.isc; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index 1eacd25bededd..3b6803aa5de20 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "A very simple Salesforce.com REST API client for Python"; - homepage = https://github.com/simple-salesforce/simple-salesforce; + homepage = "https://github.com/simple-salesforce/simple-salesforce"; license = licenses.asl20; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/simple-websocket-server/default.nix b/pkgs/development/python-modules/simple-websocket-server/default.nix index 312f58bf9fa9f..c802068137240 100644 --- a/pkgs/development/python-modules/simple-websocket-server/default.nix +++ b/pkgs/development/python-modules/simple-websocket-server/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "A python based websocket server that is simple and easy to use"; - homepage = https://github.com/dpallot/simple-websocket-server/; + homepage = "https://github.com/dpallot/simple-websocket-server/"; license = licenses.mit; maintainers = with maintainers; [ rvolosatovs ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/simpleai/default.nix b/pkgs/development/python-modules/simpleai/default.nix index 230ac17fa0aa4..c8d1a99326f96 100644 --- a/pkgs/development/python-modules/simpleai/default.nix +++ b/pkgs/development/python-modules/simpleai/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/simpleai-team/simpleai; + homepage = "https://github.com/simpleai-team/simpleai"; description = "This lib implements many of the artificial intelligence algorithms described on the book 'Artificial Intelligence, a Modern Approach'"; maintainers = with maintainers; [ NikolaMandic ]; }; diff --git a/pkgs/development/python-modules/simpleaudio/default.nix b/pkgs/development/python-modules/simpleaudio/default.nix new file mode 100644 index 0000000000000..948716a9b7cb8 --- /dev/null +++ b/pkgs/development/python-modules/simpleaudio/default.nix @@ -0,0 +1,24 @@ +{ alsaLib, buildPythonPackage, fetchFromGitHub, isPy27, lib }: + +buildPythonPackage rec { + pname = "simpleaudio"; + version = "1.0.4"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "hamiltron"; + repo = "py-simple-audio"; + rev = version; + sha256 = "12nypzb1m14yip4zrbzin5jc5awyp1d5md5y40g5anj4phb4hx1i"; + }; + + buildInputs = [ alsaLib ]; + + meta = with lib; { + homepage = "https://github.com/hamiltron/py-simple-audio"; + description = + "A simple audio playback Python extension - cross-platform, asynchronous, dependency-free"; + license = licenses.mit; + maintainers = with maintainers; [ lucus16 ]; + }; +} diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix index 0aded2f423f59..cb6f50fdd2871 100644 --- a/pkgs/development/python-modules/simpleeval/default.nix +++ b/pkgs/development/python-modules/simpleeval/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "1skvl467kj83rzkhk01i0wm8m5vmh6j5znrfdizn6r18ii45a839"; }; meta = { - homepage = https://github.com/danthedeckie/simpleeval; + homepage = "https://github.com/danthedeckie/simpleeval"; description = "A simple, safe single expression evaluator library"; maintainers = with lib.maintainers; [ johbo ]; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/simplefix/default.nix b/pkgs/development/python-modules/simplefix/default.nix index 8b84d6a248eee..0696844342616 100644 --- a/pkgs/development/python-modules/simplefix/default.nix +++ b/pkgs/development/python-modules/simplefix/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple FIX Protocol implementation for Python"; - homepage = https://github.com/da4089/simplefix; + homepage = "https://github.com/da4089/simplefix"; license = licenses.mit; maintainers = with maintainers; [ catern ]; }; diff --git a/pkgs/development/python-modules/simplegeneric/default.nix b/pkgs/development/python-modules/simplegeneric/default.nix index 491e218154c02..ea320a2ad5af5 100644 --- a/pkgs/development/python-modules/simplegeneric/default.nix +++ b/pkgs/development/python-modules/simplegeneric/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = { description = "Simple generic functions"; - homepage = http://cheeseshop.python.org/pypi/simplegeneric; + homepage = "http://cheeseshop.python.org/pypi/simplegeneric"; license = lib.licenses.zpl21; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 54e19d2e6045d..fe08f5bbe2e53 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { default, encoding is done in an encoding neutral fashion (plain ASCII with \uXXXX escapes for unicode characters). ''; - homepage = https://github.com/simplejson/simplejson; + homepage = "https://github.com/simplejson/simplejson"; license = with lib.licenses; [ mit afl21 ]; }; } diff --git a/pkgs/development/python-modules/simplekml/default.nix b/pkgs/development/python-modules/simplekml/default.nix index 4f6cc190f0efa..6b8bac25b87b3 100644 --- a/pkgs/development/python-modules/simplekml/default.nix +++ b/pkgs/development/python-modules/simplekml/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generate KML with as little effort as possible"; - homepage = https://readthedocs.org/projects/simplekml/; + homepage = "https://readthedocs.org/projects/simplekml/"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ rvolosatovs ]; }; diff --git a/pkgs/development/python-modules/simpleparse/default.nix b/pkgs/development/python-modules/simpleparse/default.nix index 339f6d1debd7c..acb071781173d 100644 --- a/pkgs/development/python-modules/simpleparse/default.nix +++ b/pkgs/development/python-modules/simpleparse/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Parser Generator for Python"; - homepage = https://pypi.python.org/pypi/SimpleParse; + homepage = "https://pypi.python.org/pypi/SimpleParse"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix index 981b6693f7d47..348dd51599fa5 100644 --- a/pkgs/development/python-modules/simpy/default.nix +++ b/pkgs/development/python-modules/simpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = https://simpy.readthedocs.io/en/latest/; + homepage = "https://simpy.readthedocs.io/en/latest/"; description = "A process-based discrete-event simulation framework based on standard Python."; license = [ licenses.mit ]; maintainers = with maintainers; [ shlevy ]; diff --git a/pkgs/development/python-modules/singledispatch/default.nix b/pkgs/development/python-modules/singledispatch/default.nix index e0b207735dfae..789a24f3e818f 100644 --- a/pkgs/development/python-modules/singledispatch/default.nix +++ b/pkgs/development/python-modules/singledispatch/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "This library brings functools.singledispatch from Python 3.4 to Python 2.6-3.3."; - homepage = https://docs.python.org/3/library/functools.html; + homepage = "https://docs.python.org/3/library/functools.html"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix index 29e278c211ab7..76820b6ebc6aa 100644 --- a/pkgs/development/python-modules/sipsimple/default.nix +++ b/pkgs/development/python-modules/sipsimple/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "SIP SIMPLE implementation for Python"; - homepage = https://sipsimpleclient.org/; + homepage = "https://sipsimpleclient.org/"; license = licenses.gpl3; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix index 9f949bf8203ba..46f7f6d38b6bb 100644 --- a/pkgs/development/python-modules/six/default.nix +++ b/pkgs/development/python-modules/six/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "A Python 2 and 3 compatibility library"; - homepage = https://pypi.python.org/pypi/six/; + homepage = "https://pypi.python.org/pypi/six/"; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix index 47df62dd1c6a6..e4a01778352ad 100644 --- a/pkgs/development/python-modules/sklearn-deap/default.nix +++ b/pkgs/development/python-modules/sklearn-deap/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Use evolutionary algorithms instead of gridsearch in scikit-learn"; - homepage = https://github.com/rsteca/sklearn-deap; + homepage = "https://github.com/rsteca/sklearn-deap"; license = licenses.lgpl3; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/slicedimage/default.nix b/pkgs/development/python-modules/slicedimage/default.nix index 3273e5fe3a333..08bdc183186cb 100644 --- a/pkgs/development/python-modules/slicedimage/default.nix +++ b/pkgs/development/python-modules/slicedimage/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to access sliced imaging data"; - homepage = https://github.com/spacetx/slicedimage; + homepage = "https://github.com/spacetx/slicedimage"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/slicerator/default.nix b/pkgs/development/python-modules/slicerator/default.nix index 896ecbdd26b8e..45d406f560e6f 100644 --- a/pkgs/development/python-modules/slicerator/default.nix +++ b/pkgs/development/python-modules/slicerator/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/soft-matter/slicerator; + homepage = "https://github.com/soft-matter/slicerator"; description = "A lazy-loading, fancy-sliceable iterable"; license = licenses.bsdOriginal; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/slimit/default.nix b/pkgs/development/python-modules/slimit/default.nix index e82cbe5b705e6..30654bd03f618 100644 --- a/pkgs/development/python-modules/slimit/default.nix +++ b/pkgs/development/python-modules/slimit/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { # Some patches from https://github.com/rspivak/slimit/pull/65 patches = lib.optionals isPy3k [ (fetchpatch { - url = https://github.com/lelit/slimit/commit/a61e12d88cc123c4b7af2abef21d06fd182e561a.patch; + url = "https://github.com/lelit/slimit/commit/a61e12d88cc123c4b7af2abef21d06fd182e561a.patch"; sha256 = "0lbhvkgn4l8g9fwvb81rfwjx7hsaq2pid8a5gczdk1ba65wfvdq5"; }) (fetchpatch { - url = https://github.com/lelit/slimit/commit/e8331659fb89e8a4613c5e4e338c877fead9c551.patch; + url = "https://github.com/lelit/slimit/commit/e8331659fb89e8a4613c5e4e338c877fead9c551.patch"; sha256 = "1hv4ysn09c9bfd5bxhhrp51hsi81hdidmx0y7zcrjjiich9ayrni"; }) ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "JavaScript minifier"; - homepage = https://slimit.readthedocs.org/; + homepage = "https://slimit.readthedocs.org/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index 0f12dbb8850c1..379a7e1b01c1c 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { runs a suite of vulnerability detectors, prints visual information about contract details, and provides an API to easily write custom analyses. ''; - homepage = https://github.com/trailofbits/slither; + homepage = "https://github.com/trailofbits/slither"; license = licenses.agpl3; maintainers = [ maintainers.asymmetric ]; }; diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index 53d2006315c12..b5315549119e1 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { meta = { description = "Elegant Python library for XMPP"; license = lib.licenses.mit; - homepage = https://dev.louiz.org/projects/slixmpp; + homepage = "https://dev.louiz.org/projects/slixmpp"; }; } diff --git a/pkgs/development/python-modules/slob/default.nix b/pkgs/development/python-modules/slob/default.nix index 48400f910c4f5..9e6ba2ff63500 100644 --- a/pkgs/development/python-modules/slob/default.nix +++ b/pkgs/development/python-modules/slob/default.nix @@ -25,7 +25,7 @@ buildPythonPackage { ''; meta = with stdenv.lib; { - homepage = https://github.com/itkach/slob/; + homepage = "https://github.com/itkach/slob/"; description = "Reference implementation of the slob (sorted list of blobs) format"; license = licenses.gpl3; maintainers = [ maintainers.rycee ]; diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 48cfcb132f094..6244ea62333e8 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "smart_open"; - version = "1.9.0"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "0xmnp8ywakwg3y21gqdvjw8a4v42vaxfq6njqizzllm4c9g2nk76"; + sha256 = "1692h0j6jbxmm0acy1lbbbf4j34l0idi1vpzk6b5ixm0akzcfgl1"; }; # nixpkgs version of moto is >=1.2.0, remove version pin to fix build diff --git a/pkgs/development/python-modules/smartdc/default.nix b/pkgs/development/python-modules/smartdc/default.nix index 50667ce939871..2fe9926cab9a0 100644 --- a/pkgs/development/python-modules/smartdc/default.nix +++ b/pkgs/development/python-modules/smartdc/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Joyent SmartDataCenter CloudAPI connector using http-signature authentication via Requests"; - homepage = https://github.com/atl/py-smartdc; + homepage = "https://github.com/atl/py-smartdc"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/smpplib/default.nix b/pkgs/development/python-modules/smpplib/default.nix new file mode 100644 index 0000000000000..fe22f121efb7e --- /dev/null +++ b/pkgs/development/python-modules/smpplib/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage, fetchPypi, lib, python, six, tox, mock, pytest }: + +buildPythonPackage rec { + pname = "smpplib"; + version = "2.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0jzxlfwf0861ilh4xyd70hmkdbvdki52aalglm1bnpxkg6i3jhfz"; + }; + + propagatedBuildInputs = [ six ]; + checkInputs = [ tox mock pytest ]; + + checkPhase = '' + pytest + ''; + + postInstall = '' + rm -rf $out/${python.sitePackages}/tests + ''; + + meta = with lib; { + description = "SMPP library for Python"; + homepage = "https://github.com/python-smpplib/python-smpplib"; + license = licenses.lgpl3Plus; + maintainers = [ maintainers.globin ]; + }; +} diff --git a/pkgs/development/python-modules/smugline/default.nix b/pkgs/development/python-modules/smugline/default.nix index 514a3005725e2..d779a79ed21a2 100644 --- a/pkgs/development/python-modules/smugline/default.nix +++ b/pkgs/development/python-modules/smugline/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/gingerlime/smugline; + homepage = "https://github.com/gingerlime/smugline"; description = "A simple command line tool for smugmug "; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/smugpy/default.nix b/pkgs/development/python-modules/smugpy/default.nix index c2028228c31c4..43ac45b1235e7 100644 --- a/pkgs/development/python-modules/smugpy/default.nix +++ b/pkgs/development/python-modules/smugpy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for the SmugMug API"; license = with licenses; [ mit ]; - homepage = https://github.com/chrishoffman/smugpy; + homepage = "https://github.com/chrishoffman/smugpy"; }; doCheck = false; # Tries to login to Smugmug… diff --git a/pkgs/development/python-modules/snakebite/default.nix b/pkgs/development/python-modules/snakebite/default.nix index 09945a094c7d2..b4d83e672271f 100644 --- a/pkgs/development/python-modules/snakebite/default.nix +++ b/pkgs/development/python-modules/snakebite/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure Python HDFS client"; - homepage = https://github.com/spotify/snakebite; + homepage = "https://github.com/spotify/snakebite"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix index c55d6c7376a52..a34996b8734cc 100644 --- a/pkgs/development/python-modules/snakeviz/default.nix +++ b/pkgs/development/python-modules/snakeviz/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "snakeviz"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "11a8cd4g98vq2x61i99ncl5w83clnndwg909ya4y1cdf0k1ckb40"; + sha256 = "0s6byw23hr2khqx2az36hpi52fk4v6bfm1bb7biaf0d2nrpqgbcj"; }; # Upstream doesn't run tests from setup.py @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Browser based viewer for profiling data"; - homepage = https://jiffyclub.github.io/snakeviz; + homepage = "https://jiffyclub.github.io/snakeviz"; license = licenses.bsd3; maintainers = with maintainers; [ nixy ]; }; diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix index 1e008d96497bb..6e319a1834188 100644 --- a/pkgs/development/python-modules/snapcast/default.nix +++ b/pkgs/development/python-modules/snapcast/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "snapcast"; - version = "2.0.10"; + version = "2.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "2a862a57ca65aa11cf010a19cdfee37e5728d486ee92684b00233442613b5120"; + sha256 = "1z3c9p22pm3823jzh917c3rryv02mhigrjkjf9wlhzmjwx5vmjqf"; }; checkInputs = [ pytest ]; @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Control Snapcast, a multi-room synchronous audio solution"; - homepage = https://github.com/happyleavesaoc/python-snapcast/; + homepage = "https://github.com/happyleavesaoc/python-snapcast/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/snappergui/default.nix b/pkgs/development/python-modules/snappergui/default.nix index 6b31145d519ab..ff274c1ba8b3f 100644 --- a/pkgs/development/python-modules/snappergui/default.nix +++ b/pkgs/development/python-modules/snappergui/default.nix @@ -21,7 +21,7 @@ buildPythonPackage { propagatedBuildInputs = [ pygobject3 dbus-python ]; meta = with stdenv.lib; { - homepage = https://github.com/ricardomv/snapper-gui; + homepage = "https://github.com/ricardomv/snapper-gui"; description = "Graphical frontend for snapper"; license = licenses.gpl2; maintainers = with maintainers; [ tstrobel ]; diff --git a/pkgs/development/python-modules/sniffio/default.nix b/pkgs/development/python-modules/sniffio/default.nix index f5674c09e0216..82275762ce3dc 100644 --- a/pkgs/development/python-modules/sniffio/default.nix +++ b/pkgs/development/python-modules/sniffio/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/python-trio/sniffio; + homepage = "https://github.com/python-trio/sniffio"; license = licenses.asl20; description = "Sniff out which async library your code is running under"; }; diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index 8212379e3d48b..901987fbff66a 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub, attrs, cryptography, async-timeout, pytest-aiohttp, pytest }: +{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub +, attrs, cryptography, async-timeout, pytest-aiohttp, pytestCheckHook +}: buildPythonPackage rec { pname = "snitun"; @@ -13,12 +15,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs cryptography async-timeout ]; - checkInputs = [ pytest pytest-aiohttp ]; + checkInputs = [ pytestCheckHook pytest-aiohttp ]; - checkPhase = '' - # https://github.com/NabuCasa/snitun/issues/61 - pytest ${lib.optionalString stdenv.isDarwin "-k 'not test_multiplexer_data_channel_abort_full'"} tests/ - ''; + disabledTests = lib.optionals stdenv.isDarwin [ + "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61 + # port binding conflicts + "test_snitun_single_runner_timeout" + "test_snitun_single_runner_throttling" + ]; meta = with lib; { homepage = "https://github.com/nabucasa/snitun"; diff --git a/pkgs/development/python-modules/snowballstemmer/default.nix b/pkgs/development/python-modules/snowballstemmer/default.nix index 61a12c2b298d3..c546fefcf5034 100644 --- a/pkgs/development/python-modules/snowballstemmer/default.nix +++ b/pkgs/development/python-modules/snowballstemmer/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms"; - homepage = http://sigal.saimon.org/en/latest/index.html; + homepage = "http://sigal.saimon.org/en/latest/index.html"; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/snug/default.nix b/pkgs/development/python-modules/snug/default.nix index a697ed0161a04..08896467b4e52 100644 --- a/pkgs/development/python-modules/snug/default.nix +++ b/pkgs/development/python-modules/snug/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tiny toolkit for writing reusable interactions with web APIs"; license = licenses.mit; - homepage = https://snug.readthedocs.io/en/latest/; + homepage = "https://snug.readthedocs.io/en/latest/"; maintainers = with maintainers; [ mredaelli ]; }; diff --git a/pkgs/development/python-modules/snuggs/default.nix b/pkgs/development/python-modules/snuggs/default.nix index a97bbf4012c96..f88b6080fdf3c 100644 --- a/pkgs/development/python-modules/snuggs/default.nix +++ b/pkgs/development/python-modules/snuggs/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "S-expressions for Numpy"; license = licenses.mit; - homepage = https://github.com/mapbox/snuggs; + homepage = "https://github.com/mapbox/snuggs"; maintainers = with maintainers; [ mredaelli ]; }; } diff --git a/pkgs/development/python-modules/sockjs-tornado/default.nix b/pkgs/development/python-modules/sockjs-tornado/default.nix index 10722e8af06d5..a74c40486fc15 100644 --- a/pkgs/development/python-modules/sockjs-tornado/default.nix +++ b/pkgs/development/python-modules/sockjs-tornado/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tornado ]; meta = with lib; { - homepage = https://github.com/mrjoes/sockjs-tornado/; + homepage = "https://github.com/mrjoes/sockjs-tornado/"; description = "SockJS python server implementation on top of Tornado framework"; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/socksipy-branch/default.nix b/pkgs/development/python-modules/socksipy-branch/default.nix index 37961f898f597..e17f38cb50dd6 100644 --- a/pkgs/development/python-modules/socksipy-branch/default.nix +++ b/pkgs/development/python-modules/socksipy-branch/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = http://code.google.com/p/socksipy-branch/; + homepage = "http://code.google.com/p/socksipy-branch/"; description = "This Python module allows you to create TCP connections through a SOCKS proxy without any special effort"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 6548c3637a8f2..3c2a5e2a356d9 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, isPy27 , ptable , click , requests @@ -17,6 +18,7 @@ buildPythonPackage rec { pname = "softlayer-python"; version = "5.8.4"; + disabled = isPy27; propagatedBuildInputs = [ ptable click requests prompt_toolkit pygments urllib3 ]; @@ -35,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "A set of Python libraries that assist in calling the SoftLayer API."; - homepage = https://github.com/softlayer/softlayer-python; + homepage = "https://github.com/softlayer/softlayer-python"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/sorl_thumbnail/default.nix b/pkgs/development/python-modules/sorl_thumbnail/default.nix index 098e2292efd53..1979daf85be37 100644 --- a/pkgs/development/python-modules/sorl_thumbnail/default.nix +++ b/pkgs/development/python-modules/sorl_thumbnail/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://sorl-thumbnail.readthedocs.org/en/latest/; + homepage = "https://sorl-thumbnail.readthedocs.org/en/latest/"; description = "Thumbnails for Django"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/sortedcollections/default.nix b/pkgs/development/python-modules/sortedcollections/default.nix index b8261d88628cd..ffcf0bfeac041 100644 --- a/pkgs/development/python-modules/sortedcollections/default.nix +++ b/pkgs/development/python-modules/sortedcollections/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Sorted Collections"; - homepage = http://www.grantjenks.com/docs/sortedcollections/; + homepage = "http://www.grantjenks.com/docs/sortedcollections/"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/sortedcontainers/default.nix b/pkgs/development/python-modules/sortedcontainers/default.nix index b2b7f20350309..c5ae45b8500c0 100644 --- a/pkgs/development/python-modules/sortedcontainers/default.nix +++ b/pkgs/development/python-modules/sortedcontainers/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Python Sorted Container Types: SortedList, SortedDict, and SortedSet"; - homepage = http://www.grantjenks.com/docs/sortedcontainers/; + homepage = "http://www.grantjenks.com/docs/sortedcontainers/"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index e538875da2b5f..9a6baf80f04a4 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sounddevice"; - version = "0.3.14"; + version = "0.3.15"; src = fetchPypi { inherit pname version; - sha256 = "c7b0f7ad86550668da55404eabcb63d4212ec622fcce86510092306b77d2e80a"; + sha256 = "028f6e5df83027f4bfba5d6d61e6d46eb8689f9e647825e09f539920dee17d2c"; }; propagatedBuildInputs = [ cffi numpy portaudio ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = { description = "Play and Record Sound with Python"; - homepage = http://python-sounddevice.rtfd.org/; + homepage = "http://python-sounddevice.rtfd.org/"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/soundfile/default.nix b/pkgs/development/python-modules/soundfile/default.nix index ff11e75a0de13..dea0e345a9997 100644 --- a/pkgs/development/python-modules/soundfile/default.nix +++ b/pkgs/development/python-modules/soundfile/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "An audio library based on libsndfile, CFFI and NumPy"; license = lib.licenses.bsd3; - homepage = https://github.com/bastibe/PySoundFile; + homepage = "https://github.com/bastibe/PySoundFile"; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix index 8995e98ca7875..b8cdd63cbde51 100644 --- a/pkgs/development/python-modules/soupsieve/default.nix +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = { description = "A CSS4 selector implementation for Beautiful Soup"; license = lib.licenses.mit; - homepage = https://github.com/facelessuser/soupsieve; + homepage = "https://github.com/facelessuser/soupsieve"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index beee4a186c9e9..0c9909622681e 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython"; - homepage = https://github.com/explosion/spaCy; + homepage = "https://github.com/explosion/spaCy"; license = licenses.mit; maintainers = with maintainers; [ danieldk sdll ]; }; diff --git a/pkgs/development/python-modules/spake2/default.nix b/pkgs/development/python-modules/spake2/default.nix index 2d2f066eaedc1..4038e2255afa2 100644 --- a/pkgs/development/python-modules/spake2/default.nix +++ b/pkgs/development/python-modules/spake2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "SPAKE2 password-authenticated key exchange library"; - homepage = https://github.com/warner/python-spake2; + homepage = "https://github.com/warner/python-spake2"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/spambayes/default.nix b/pkgs/development/python-modules/spambayes/default.nix index bbd7cbb210e08..f33748379d1ed 100644 --- a/pkgs/development/python-modules/spambayes/default.nix +++ b/pkgs/development/python-modules/spambayes/default.nix @@ -15,6 +15,6 @@ buildPythonPackage rec { meta = { description = "Statistical anti-spam filter, initially based on the work of Paul Graham"; - homepage = http://spambayes.sourceforge.net/; + homepage = "http://spambayes.sourceforge.net/"; }; } diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index a1b9eae398df3..355453ed26e63 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sparse"; - version = "0.8.0"; + version = "0.9.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a3dc14ee5314caa2e64331b0b50c8f92e8999d7d275179a804a114e6cb1f8b81"; + sha256 = "04gfwm1y9knryx992biniqa3978n3chr38iy3y4i2b8wy52fzy3d"; }; checkInputs = [ pytest ]; @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sparse n-dimensional arrays computations"; - homepage = https://github.com/pydata/sparse/; + homepage = "https://github.com/pydata/sparse/"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/speaklater/default.nix b/pkgs/development/python-modules/speaklater/default.nix index 5de86d9e14c2f..03b525147bfdf 100644 --- a/pkgs/development/python-modules/speaklater/default.nix +++ b/pkgs/development/python-modules/speaklater/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Implements a lazy string for python useful for use with gettext"; - homepage = https://github.com/mitsuhiko/speaklater; + homepage = "https://github.com/mitsuhiko/speaklater"; license = licenses.bsd0; maintainers = with maintainers; [ matejc ]; }; diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 39edcf9b8f558..3e520919f3347 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = { description = "Library for reading and analyzing astrophysical spectral data cubes"; - homepage = http://radio-astro-tools.github.io; + homepage = "http://radio-astro-tools.github.io"; license = lib.licenses.bsd3; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ smaret ]; diff --git a/pkgs/development/python-modules/speedtest-cli/default.nix b/pkgs/development/python-modules/speedtest-cli/default.nix index ef97617225c08..7476a54a98bd7 100644 --- a/pkgs/development/python-modules/speedtest-cli/default.nix +++ b/pkgs/development/python-modules/speedtest-cli/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Command line interface for testing internet bandwidth using speedtest.net"; - homepage = https://github.com/sivel/speedtest-cli; + homepage = "https://github.com/sivel/speedtest-cli"; license = licenses.asl20; maintainers = with maintainers; [ makefu domenkozar ]; }; diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index bad76f8cb93e2..02155483b2094 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for C library for finding and handling crystal symmetries"; - homepage = https://atztogo.github.io/spglib; + homepage = "https://atztogo.github.io/spglib"; license = licenses.bsd3; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/sphfile/default.nix b/pkgs/development/python-modules/sphfile/default.nix index f1455f945a9fe..b10552bf09348 100644 --- a/pkgs/development/python-modules/sphfile/default.nix +++ b/pkgs/development/python-modules/sphfile/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Numpy-based NIST SPH audio-file reader"; - homepage = https://github.com/mcfletch/sphfile; + homepage = "https://github.com/mcfletch/sphfile"; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/sphinx-argparse/default.nix b/pkgs/development/python-modules/sphinx-argparse/default.nix index f5de476d1096a..3f1a80c3c97ba 100644 --- a/pkgs/development/python-modules/sphinx-argparse/default.nix +++ b/pkgs/development/python-modules/sphinx-argparse/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "A sphinx extension that automatically documents argparse commands and options"; - homepage = https://github.com/ribozz/sphinx-argparse; + homepage = "https://github.com/ribozz/sphinx-argparse"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ clacke ]; }; diff --git a/pkgs/development/python-modules/sphinx-testing/default.nix b/pkgs/development/python-modules/sphinx-testing/default.nix index 8f95397055560..1a8521bf43825 100644 --- a/pkgs/development/python-modules/sphinx-testing/default.nix +++ b/pkgs/development/python-modules/sphinx-testing/default.nix @@ -27,8 +27,8 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/sphinx-doc/sphinx-testing; + homepage = "https://github.com/sphinx-doc/sphinx-testing"; license = lib.licenses.bsd2; description = "Testing utility classes and functions for Sphinx extensions"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/sphinx/2.nix b/pkgs/development/python-modules/sphinx/2.nix index 541c292fe8f12..5cf2cecd97f2d 100644 --- a/pkgs/development/python-modules/sphinx/2.nix +++ b/pkgs/development/python-modules/sphinx/2.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { meta = { description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; - homepage = http://sphinx.pocoo.org/; + homepage = "http://sphinx.pocoo.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ nand0p ]; }; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 0989809a1ff07..9c7d699d20f03 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { meta = { description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; - homepage = http://sphinx.pocoo.org/; + homepage = "http://sphinx.pocoo.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ nand0p ]; }; diff --git a/pkgs/development/python-modules/sphinx_pypi_upload/default.nix b/pkgs/development/python-modules/sphinx_pypi_upload/default.nix index 52590817c71b7..6d353cc63c966 100644 --- a/pkgs/development/python-modules/sphinx_pypi_upload/default.nix +++ b/pkgs/development/python-modules/sphinx_pypi_upload/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Setuptools command for uploading Sphinx documentation to PyPI"; - homepage = https://bitbucket.org/jezdez/sphinx-pypi-upload/; + homepage = "https://bitbucket.org/jezdez/sphinx-pypi-upload/"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix index 515f6b6156aaf..bb9fcb293da7c 100644 --- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "ReadTheDocs.org theme for Sphinx"; - homepage = https://github.com/snide/sphinx_rtd_theme/; + homepage = "https://github.com/snide/sphinx_rtd_theme/"; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix index 60d7a20feb591..5644834b2816b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books"; - homepage = http://sphinx-doc.org/; + homepage = "http://sphinx-doc.org/"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 36fb29fde595c..bc9a90efcf235 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi, isPy3k , oset, pybtex, pybtex-docutils, sphinx }: @@ -6,6 +6,8 @@ buildPythonPackage rec { version = "1.0.0"; pname = "sphinxcontrib-bibtex"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "629612b001f86784669d65e662377a482052decfd9a0a17c46860878eef7b9e0"; diff --git a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix index dde8bfbb7dd21..fca1856863b78 100644 --- a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document."; - homepage = http://sphinx-doc.org/; + homepage = "http://sphinx-doc.org/"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 88b54d8e94f73..42a6046a1fb5c 100644 --- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "sphinxcontrib-htmlhelp is a sphinx extension which ..."; - homepage = http://sphinx-doc.org/; + homepage = "http://sphinx-doc.org/"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix index ca2c8e99d41d6..6c860cafa59fb 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "sphinxcontrib-jsmath is a sphinx extension which renders display math in HTML via JavaScript."; - homepage = http://sphinx-doc.org/; + homepage = "http://sphinx-doc.org/"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix index 2c3aed60b59f6..d3c9fe1528060 100644 --- a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-katex"; - version = "0.5.1"; + version = "0.6.0"; # pkgutil namespaces are broken in nixpkgs (because they can't scan multiple # directories). But python2 is EOL, so not supporting it should be ok. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0qssq2qc12rnwb6yhw3xj69cwij3jp3sqzwb6n85qp36g4vxrkb6"; + sha256 = "1692q3f3z1rsd3nyxd8wrv0vscwcq2gqjbv79c8ws402y3m7y5ni"; }; propagatedBuildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index 92471c6c3d0f4..358ad771c5d5f 100644 --- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document."; - homepage = http://sphinx-doc.org/; + homepage = "http://sphinx-doc.org/"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index 76fba6e1b3a0a..04b19aef8bf67 100644 --- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)."; - homepage = http://sphinx-doc.org/; + homepage = "http://sphinx-doc.org/"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index b3e1ca01dba4d..79b2aa42e36be 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Sphinx spelling extension"; - homepage = https://bitbucket.org/dhellmann/sphinxcontrib-spelling; + homepage = "https://bitbucket.org/dhellmann/sphinxcontrib-spelling"; maintainers = with maintainers; [ nand0p ]; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index 747fa1cb2434f..bcf24413d63d7 100644 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "TikZ extension for Sphinx"; - homepage = https://bitbucket.org/philexander/tikz; + homepage = "https://bitbucket.org/philexander/tikz"; maintainers = with maintainers; [ costrouc ]; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix index d4f17171e3b8d..b1bdf6a0dff62 100644 --- a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { description = "Sphinx API for Web Apps"; - homepage = http://sphinx-doc.org/; + homepage = "http://sphinx-doc.org/"; license = lib.licenses.bsd2; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix b/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix index 5173c54be34f2..9f042efcc97b7 100644 --- a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Provides a Sphinx domain for describing RESTful HTTP APIs"; - homepage = https://bitbucket.org/birkenfeld/sphinx-contrib; + homepage = "https://bitbucket.org/birkenfeld/sphinx-contrib"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix b/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix index 2dfaf7dbc143b..93c53581c4fac 100644 --- a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Extension for adding a simple Blog, News or Announcements section to a Sphinx website"; - homepage = https://bitbucket.org/prometheus/sphinxcontrib-newsfeed; + homepage = "https://bitbucket.org/prometheus/sphinxcontrib-newsfeed"; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index fac73dc8715a2..1ff38f0a6dfbb 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "Browser abstraction for web acceptance testing"; - homepage = https://github.com/cobrateam/splinter; + homepage = "https://github.com/cobrateam/splinter"; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/spyder/3.nix b/pkgs/development/python-modules/spyder/3.nix index 7987775cee1d2..e5c5683f5dc41 100644 --- a/pkgs/development/python-modules/spyder/3.nix +++ b/pkgs/development/python-modules/spyder/3.nix @@ -1,62 +1,38 @@ -{ stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle, - psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc, +{ stdenv, buildPythonPackage, fetchFromGitHub, jedi, pycodestyle, + psutil, pyflakes, rope, pylint, keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, - spyder-kernels_0_5, qtpy, pyzmq, chardet -, pyqtwebengine + spyder-kernels_0_5, qtpy, pyzmq, chardet, pyqtwebengine }: buildPythonPackage rec { pname = "spyder"; version = "3.3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "1z7qw1h3rhca12ycv8xrzw6z2gf81v0j6lfq9kpwh472w4vk75v1"; + src = fetchFromGitHub { + owner = "spyder-ide"; + repo = "spyder"; + rev = "v3.3.6"; + sha256 = "1sk9xajhzpklk5bcbdhpfhx3gxhyrahsmj9bv2m6kvbqxdlx6bq6"; }; - nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; - propagatedBuildInputs = [ - jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring - numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5 + jedi pycodestyle psutil pyflakes rope pylint keyring numpydoc + qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5 pygments qtpy pyzmq chardet pyqtwebengine ]; - # There is no test for spyder + # tests fail with a segfault doCheck = false; - desktopItem = makeDesktopItem { - name = "Spyder"; - exec = "spyder"; - icon = "spyder"; - comment = "Scientific Python Development Environment"; - desktopName = "Spyder"; - genericName = "Python IDE"; - categories = "Application;Development;Editor;IDE;"; - }; - postPatch = '' # remove dependency on pyqtwebengine - # this is still part of the pyqt 5.11 version we have in nixpkgs + # this is still part of the pyqt 5.13 version we have in nixpkgs sed -i /pyqtwebengine/d setup.py substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5" ''; - # Create desktop item - postInstall = '' - mkdir -p $out/share/icons - cp spyder/images/spyder.svg $out/share/icons - cp -r $desktopItem/share/applications/ $out/share - ''; - - dontWrapQtApps = true; - - preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") - ''; - meta = with stdenv.lib; { - description = "Scientific python development environment"; + description = "Library providing a scientific python development environment"; longDescription = '' Spyder (previously known as Pydee) is a powerful interactive development environment for the Python language with advanced editing, interactive @@ -65,6 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/spyder-ide/spyder/"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ gebner marcus7070 ]; }; } diff --git a/pkgs/development/python-modules/sqlalchemy-citext/default.nix b/pkgs/development/python-modules/sqlalchemy-citext/default.nix index b91e338540431..1f0dd5eb7eae5 100644 --- a/pkgs/development/python-modules/sqlalchemy-citext/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-citext/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "A sqlalchemy plugin that allows postgres use of CITEXT"; - homepage = https://github.com/mahmoudimus/sqlalchemy-citext; + homepage = "https://github.com/mahmoudimus/sqlalchemy-citext"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix index eefb53dd7a607..35e6854137e39 100644 --- a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { doCheck = !isPyPy; # failures due to sqla version mismatch meta = with stdenv.lib; { - homepage = https://github.com/dahlia/sqlalchemy-imageattach; + homepage = "https://github.com/dahlia/sqlalchemy-imageattach"; description = "SQLAlchemy extension for attaching images to entity objects"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index ba93fb040b9a8..c64d8f61f79c9 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { # See: https://review.openstack.org/#/c/608382/ patches = [ (fetchpatch { - url = https://github.com/openstack/sqlalchemy-migrate/pull/18.patch; + url = "https://github.com/openstack/sqlalchemy-migrate/pull/18.patch"; sha256 = "1qyfq2m7w7xqf0r9bc2x42qcra4r9k9l9g1jy5j0fvlb6bvvjj07"; }) ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/openstack/sqlalchemy-migrate; + homepage = "https://github.com/openstack/sqlalchemy-migrate"; description = "Schema migration tools for SQLAlchemy"; license = licenses.asl20; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index c58ec72498a04..db23e2ab7db29 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.36.0"; + version = "0.36.3"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - sha256 = "1wkk6jj0jkp2hi3ziqw95q0b19zabpvzm6v5kixgnssj027hq0yv"; + sha256 = "0fj9qiz5hq8gf9pnir077sl58chry7jz63fnj1vgx5rmq1dsys7j"; }; propagatedBuildInputs = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/kvesteri/sqlalchemy-utils; + homepage = "https://github.com/kvesteri/sqlalchemy-utils"; description = "Various utility functions and datatypes for SQLAlchemy"; license = licenses.bsd3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 93a2fa233f6ed..b536059bed195 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ++ lib.optionals stdenv.isDarwin [ "MemUsageWBackendTest" "MemUsageTest" ]; meta = with lib; { - homepage = http://www.sqlalchemy.org/; + homepage = "http://www.sqlalchemy.org/"; description = "A Python SQL toolkit and Object Relational Mapper"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/sqlite3dbm/default.nix b/pkgs/development/python-modules/sqlite3dbm/default.nix index bc49c0e426ba6..66a1200eeb2a5 100644 --- a/pkgs/development/python-modules/sqlite3dbm/default.nix +++ b/pkgs/development/python-modules/sqlite3dbm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "sqlite-backed dictionary"; - homepage = https://github.com/Yelp/sqlite3dbm; + homepage = "https://github.com/Yelp/sqlite3dbm"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix index e631a5ac5d900..b6aee633e0ea4 100644 --- a/pkgs/development/python-modules/sqlparse/default.nix +++ b/pkgs/development/python-modules/sqlparse/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlparse"; - version = "0.3.0"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0wxqrm9fpn4phz6rqm7kfd1wwkwzx376gs27nnalwx12q0lwlgbw"; + sha256 = "e162203737712307dfe78860cc56c8da8a852ab2ee33750e33aeadf38d12c548"; }; checkInputs = [ pytest ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { longDescription = '' Provides support for parsing, splitting and formatting SQL statements. ''; - homepage = https://github.com/andialbrecht/sqlparse; + homepage = "https://github.com/andialbrecht/sqlparse"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/sqlsoup/default.nix b/pkgs/development/python-modules/sqlsoup/default.nix new file mode 100644 index 0000000000000..a6ffd3227cd44 --- /dev/null +++ b/pkgs/development/python-modules/sqlsoup/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage, fetchPypi, lib, sqlalchemy, nose }: + +buildPythonPackage rec { + pname = "sqlsoup"; + version = "0.9.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mj00fhxj75ac3i8xk9jmm7hvcjz9p4x2r3yndcwsgb659rvgbrg"; + }; + + propagatedBuildInputs = [ sqlalchemy ]; + checkInputs = [ nose ]; + + meta = with lib; { + description = "A one step database access tool, built on the SQLAlchemy ORM"; + homepage = "https://bitbucket.org/zzzeek/sqlsoup"; + license = licenses.mit; + maintainers = [ maintainers.globin ]; + }; +} diff --git a/pkgs/development/python-modules/squaremap/default.nix b/pkgs/development/python-modules/squaremap/default.nix index fb339550062af..4927d8c725d4e 100644 --- a/pkgs/development/python-modules/squaremap/default.nix +++ b/pkgs/development/python-modules/squaremap/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Hierarchic visualization control for wxPython"; - homepage = https://launchpad.net/squaremap; + homepage = "https://launchpad.net/squaremap"; license = licenses.bsd3; broken = true; # wxPython doesn't seem to be able to be detected by pip }; diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix index e7e9a1e5391b8..3b1844fb138ec 100644 --- a/pkgs/development/python-modules/srptools/default.nix +++ b/pkgs/development/python-modules/srptools/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python-Tools to implement Secure Remote Password (SRP) authentication"; - homepage = https://github.com/idlesign/srptools; + homepage = "https://github.com/idlesign/srptools"; license = licenses.bsd3; maintainers = with maintainers; [ elseym ]; }; diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index 028378ad32d68..39765f06a50e9 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Modern high-performance serialization utilities for Python"; - homepage = https://github.com/explosion/srsly; + homepage = "https://github.com/explosion/srsly"; license = licenses.mit; maintainers = with maintainers; [ danieldk ]; }; diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/pkgs/development/python-modules/ssdeep/default.nix index f33143a0f0200..fc6b548ed5b85 100644 --- a/pkgs/development/python-modules/ssdeep/default.nix +++ b/pkgs/development/python-modules/ssdeep/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/DinoTools/python-ssdeep; + homepage = "https://github.com/DinoTools/python-ssdeep"; description = "Python wrapper for the ssdeep library"; license = licenses.lgpl3; }; diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index 547bddbd84d80..3c1d2c9976fa8 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = !isPy27; meta = with stdenv.lib; { - homepage = https://github.com/codingjoe/ssdp; + homepage = "https://github.com/codingjoe/ssdp"; description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)."; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix index 8157b893d742c..fb0c013ef08fe 100644 --- a/pkgs/development/python-modules/sseclient/default.nix +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Client library for reading Server Sent Event streams"; - homepage = https://github.com/btubbs/sseclient; + homepage = "https://github.com/btubbs/sseclient"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/sshpubkeys/default.nix b/pkgs/development/python-modules/sshpubkeys/default.nix index aefb4bd4d4b16..6e250cf85f2f4 100644 --- a/pkgs/development/python-modules/sshpubkeys/default.nix +++ b/pkgs/development/python-modules/sshpubkeys/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "OpenSSH Public Key Parser for Python"; - homepage = https://github.com/ojarva/python-sshpubkeys; + homepage = "https://github.com/ojarva/python-sshpubkeys"; license = licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/sslib/default.nix b/pkgs/development/python-modules/sslib/default.nix index 3e5be211d42bb..0f1edfd31bded 100644 --- a/pkgs/development/python-modules/sslib/default.nix +++ b/pkgs/development/python-modules/sslib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/jqueiroz/python-sslib; + homepage = "https://github.com/jqueiroz/python-sslib"; description = "A Python3 library for sharing secrets"; license = licenses.mit; maintainers = with maintainers; [ jqueiroz ]; diff --git a/pkgs/development/python-modules/starfish/default.nix b/pkgs/development/python-modules/starfish/default.nix index 8fc0a23b065f9..1affd797c13d2 100644 --- a/pkgs/development/python-modules/starfish/default.nix +++ b/pkgs/development/python-modules/starfish/default.nix @@ -82,7 +82,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pipelines and pipeline components for the analysis of image-based transcriptomics data"; - homepage = https://spacetx-starfish.readthedocs.io/en/latest/; + homepage = "https://spacetx-starfish.readthedocs.io/en/latest/"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; broken = true; # incompatible with latest python-dateutil, scikit-image diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index cad0aa79705f8..842622e56f866 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { # https://github.com/tiangolo/fastapi/issues/683. Please update when # possible. FastAPI is currently Starlette's only dependent. - version = "0.13.2"; + version = "0.13.4"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "1ls8d121zyyhry5ji7gf7vjvhyqdpr4za3qx1llq48943fmaxxpq"; + sha256 = "1rk20rj62iigkkikb80bmalriyg1j3g28s25l8z2gijagv1v5c7l"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index 32aecdc919155..29fd116c0d590 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library and cli tool that makes it easy to build static sites using Jinja2"; - homepage = https://staticjinja.readthedocs.io/en/latest/; + homepage = "https://staticjinja.readthedocs.io/en/latest/"; license = licenses.mit; maintainers = with maintainers; [ fgaz ]; }; diff --git a/pkgs/development/python-modules/statistics/default.nix b/pkgs/development/python-modules/statistics/default.nix index 4380e592ff56b..283954c838ba1 100644 --- a/pkgs/development/python-modules/statistics/default.nix +++ b/pkgs/development/python-modules/statistics/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "A Python 2.* port of 3.4 Statistics Module"; - homepage = https://github.com/digitalemagine/py-statistics; + homepage = "https://github.com/digitalemagine/py-statistics"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/statsd/default.nix b/pkgs/development/python-modules/statsd/default.nix index 36042a72ea881..cf376113b3e3c 100644 --- a/pkgs/development/python-modules/statsd/default.nix +++ b/pkgs/development/python-modules/statsd/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { maintainers = with maintainers; [ domenkozar ]; description = "A simple statsd client"; license = licenses.mit; - homepage = https://github.com/jsocol/pystatsd; + homepage = "https://github.com/jsocol/pystatsd"; }; } diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index 61d354c8d5f50..c65fb0990f0fc 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "statsmodels"; - version = "0.11.0"; + version = "0.11.1"; src = fetchPypi { inherit pname version; - sha256 = "0wcc7xbwlf8r2diw9fnzf4bg9h5cg406w7phd3dz37hx17yfi3ha"; + sha256 = "5bde3fa0a35a91b45dba7cbc28270b5b649ff1d721c89290883f6e831672d5f0"; }; checkInputs = with self; [ nose ]; @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = { description = "Statistical computations and models for use with SciPy"; - homepage = https://www.github.com/statsmodels/statsmodels; + homepage = "https://www.github.com/statsmodels/statsmodels"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix index 4d4e75d5326d3..32e4bab5afccb 100644 --- a/pkgs/development/python-modules/stem/default.nix +++ b/pkgs/development/python-modules/stem/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Controller library that allows applications to interact with Tor"; - homepage = https://stem.torproject.org/; + homepage = "https://stem.torproject.org/"; license = licenses.gpl3; maintainers = with maintainers; [ phreedom ]; }; diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 2e3071ed29cac..d6ec10579f9b8 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Manage dynamic plugins for Python applications"; - homepage = https://pypi.python.org/pypi/stevedore; + homepage = "https://pypi.python.org/pypi/stevedore"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix index c7ea7804198d6..3e09506ac66bc 100644 --- a/pkgs/development/python-modules/stm32loader/default.nix +++ b/pkgs/development/python-modules/stm32loader/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Flash firmware to STM32 microcontrollers in Python"; - homepage = https://github.com/florisla/stm32loader; + homepage = "https://github.com/florisla/stm32loader"; changelog = "https://github.com/florisla/stm32loader/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3; maintainers = with maintainers; [ emily ]; diff --git a/pkgs/development/python-modules/stompclient/default.nix b/pkgs/development/python-modules/stompclient/default.nix index 1efcd6a65005b..4cb59cf5f2852 100644 --- a/pkgs/development/python-modules/stompclient/default.nix +++ b/pkgs/development/python-modules/stompclient/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Lightweight and extensible STOMP messaging client"; - homepage = https://bitbucket.org/hozn/stompclient; + homepage = "https://bitbucket.org/hozn/stompclient"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index e8e4eb4bf35b6..1615f57d5e59a 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with Strava v3 REST API"; - homepage = https://github.com/hozn/stravalib; + homepage = "https://github.com/hozn/stravalib"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix index bb4824b5c026b..2e4b416f0478e 100644 --- a/pkgs/development/python-modules/strictyaml/default.nix +++ b/pkgs/development/python-modules/strictyaml/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Strict, typed YAML parser"; - homepage = https://hitchdev.com/strictyaml/; + homepage = "https://hitchdev.com/strictyaml/"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/stringcase/default.nix b/pkgs/development/python-modules/stringcase/default.nix index 79f05f9b72d64..531f1eb92231d 100644 --- a/pkgs/development/python-modules/stringcase/default.nix +++ b/pkgs/development/python-modules/stringcase/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/okunishinishi/python-stringcase; + homepage = "https://github.com/okunishinishi/python-stringcase"; description = "Convert string cases between camel case, pascal case, snake case etc…"; license = licenses.mit; maintainers = with maintainers; [ alunduil ]; diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix index 7326f7d48e1b6..c70cac59920e0 100644 --- a/pkgs/development/python-modules/stringtemplate/default.nix +++ b/pkgs/development/python-modules/stringtemplate/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://www.stringtemplate.org/; + homepage = "https://www.stringtemplate.org/"; description = "Text Templating Library"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index ff520c5ffe39a..d675a1fd350d9 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.44.0"; + version = "2.48.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0aaaf8dp989im2n0cdmslq0ys4ia970yl1irhxiwwqarmh6fap5i"; + sha256 = "1w9ns4jjj0p50im9vbjn084zph1g2sfa6l01ydl98qsyj76f4psi"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index fece2f1b44347..2156c7f28021a 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { description = "Painless structural logging"; - homepage = http://www.structlog.org/; + homepage = "http://www.structlog.org/"; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index 71b643e5cb58f..4c26a62060e6c 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -48,7 +48,7 @@ buildPythonPackage { meta = with lib; { description = "A powerful and scalable library that can be used for a variety of time series data mining tasks"; - homepage = https://github.com/TDAmeritrade/stumpy; + homepage = "https://github.com/TDAmeritrade/stumpy"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/stups-zign/default.nix b/pkgs/development/python-modules/stups-zign/default.nix index a4355dd7808f9..6b80f55636a92 100644 --- a/pkgs/development/python-modules/stups-zign/default.nix +++ b/pkgs/development/python-modules/stups-zign/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { patches = [ # pytest 5 is currently unsupported. Fetch and apply a pr that resolves this. (fetchpatch { - url = https://github.com/zalando-stups/zign/commit/50140720211e547b0e59f7ddb39a732f0cc73ad7.patch; + url = "https://github.com/zalando-stups/zign/commit/50140720211e547b0e59f7ddb39a732f0cc73ad7.patch"; sha256 = "1zmyvg1z1asaqqsmxvsx0srvxd6gkgavppvg3dblxwhkml01awqk"; }) ]; diff --git a/pkgs/development/python-modules/subdownloader/default.nix b/pkgs/development/python-modules/subdownloader/default.nix index 24b082123b826..c4d57bef0ea9f 100644 --- a/pkgs/development/python-modules/subdownloader/default.nix +++ b/pkgs/development/python-modules/subdownloader/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tool for automatic download/upload subtitles for videofiles using fast hashing"; - homepage = http://www.subdownloader.net; + homepage = "https://www.subdownloader.net"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index 61d406edafc73..25e20a44118cc 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -28,11 +28,11 @@ buildPythonPackage rec { pname = "subliminal"; - version = "2.0.5"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1dzv5csjcwgz69aimarx2c6606ckm2gbn4x2mzydcqnyai7sayhl"; + sha256 = "12v2clnbic8320fjsvkg3xfxfa7x8inhjk61z00pzwx46g3rqhy6"; }; propagatedBuildInputs = [ @@ -50,7 +50,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/Diaoul/subliminal; + homepage = "https://github.com/Diaoul/subliminal"; description = "Python library to search and download subtitles"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/subprocess32/default.nix b/pkgs/development/python-modules/subprocess32/default.nix index 0f43a73546dff..3fc4378fc34d9 100644 --- a/pkgs/development/python-modules/subprocess32/default.nix +++ b/pkgs/development/python-modules/subprocess32/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://pypi.python.org/pypi/subprocess32; + homepage = "https://pypi.python.org/pypi/subprocess32"; description = "Backport of the subprocess module from Python 3.2.5 for use on 2.x"; maintainers = with lib.maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/suds-jurko/default.nix b/pkgs/development/python-modules/suds-jurko/default.nix index 25ff5fd1636a1..e83448d82cf9a 100644 --- a/pkgs/development/python-modules/suds-jurko/default.nix +++ b/pkgs/development/python-modules/suds-jurko/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Lightweight SOAP client (Jurko's fork)"; - homepage = https://bitbucket.org/jurko/suds; + homepage = "https://bitbucket.org/jurko/suds"; license = licenses.lgpl3; }; diff --git a/pkgs/development/python-modules/suds/default.nix b/pkgs/development/python-modules/suds/default.nix index c4a8e480ed40b..77f4c731265e3 100644 --- a/pkgs/development/python-modules/suds/default.nix +++ b/pkgs/development/python-modules/suds/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { # - https://lwn.net/Vulnerabilities/559200/ broken = true; description = "Lightweight SOAP client"; - homepage = https://fedorahosted.org/suds; + homepage = "https://fedorahosted.org/suds"; license = licenses.lgpl3Plus; }; diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 0973225243725..ea937bef1bee4 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { meta = with lib; { description = "SunPy: Python for Solar Physics"; - homepage = https://sunpy.org; + homepage = "https://sunpy.org"; license = licenses.bsd2; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix index 47cdc8a28b116..687aec08a0172 100644 --- a/pkgs/development/python-modules/supervise_api/default.nix +++ b/pkgs/development/python-modules/supervise_api/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = { description = "An API for running processes safely and securely"; - homepage = https://github.com/catern/supervise; + homepage = "https://github.com/catern/supervise"; license = lib.licenses.lgpl3; maintainers = with lib.maintainers; [ catern ]; }; diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index 4ae57add6e77d..93dc91b4d10ac 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "A system for controlling process state under UNIX"; - homepage = http://supervisord.org/; + homepage = "http://supervisord.org/"; license = licenses.free; # http://www.repoze.org/LICENSE.txt maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix index b4c5fdf4022e2..2e6e7548efd8d 100644 --- a/pkgs/development/python-modules/sure/default.nix +++ b/pkgs/development/python-modules/sure/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Utility belt for automated testing"; - homepage = https://sure.readthedocs.io/en/latest/; + homepage = "https://sure.readthedocs.io/en/latest/"; license = licenses.gpl3Plus; }; diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix index ac62b8b415d18..a8427558f4364 100644 --- a/pkgs/development/python-modules/svg-path/default.nix +++ b/pkgs/development/python-modules/svg-path/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "SVG path objects and parser"; - homepage = https://github.com/regebro/svg.path; + homepage = "https://github.com/regebro/svg.path"; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix index 36f6dc06850fc..b592ee75decec 100644 --- a/pkgs/development/python-modules/svg2tikz/default.nix +++ b/pkgs/development/python-modules/svg2tikz/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { }; meta = with stdenv.lib; { - homepage = https://github.com/kjellmf/svg2tikz; + homepage = "https://github.com/kjellmf/svg2tikz"; description = "An SVG to TikZ converter"; license = licenses.gpl2Plus; maintainers = with maintainers; [ gal_bolle ]; diff --git a/pkgs/development/python-modules/svgwrite/default.nix b/pkgs/development/python-modules/svgwrite/default.nix index 186bf0a1ce2bc..08c3f6e52cae3 100644 --- a/pkgs/development/python-modules/svgwrite/default.nix +++ b/pkgs/development/python-modules/svgwrite/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library to create SVG drawings"; - homepage = https://github.com/mozman/svgwrite; + homepage = "https://github.com/mozman/svgwrite"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/swagger-ui-bundle/default.nix b/pkgs/development/python-modules/swagger-ui-bundle/default.nix index 9922e08193493..823f834b417c4 100644 --- a/pkgs/development/python-modules/swagger-ui-bundle/default.nix +++ b/pkgs/development/python-modules/swagger-ui-bundle/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "swagger-ui-bundle"; - version = "0.0.5"; + version = "0.0.6"; src = fetchPypi { pname = "swagger_ui_bundle"; inherit version; - sha256 = "0v69v94mzzb63ciwpz3n8jwxqcyll3fsyx087s9k9q543zdqzbh1"; + sha256 = "1lqxz7q9l2iwf7w11nhw5lnglsh1lgcvq8ydvhabkcc76il3ndy5"; }; # patch away unused test requirements since package contains no tests @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "bundled swagger-ui pip package"; - homepage = https://github.com/dtkav/swagger_ui_bundle; + homepage = "https://github.com/dtkav/swagger_ui_bundle"; license = licenses.asl20; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/development/python-modules/sybase/default.nix b/pkgs/development/python-modules/sybase/default.nix index 7821c7b3d7437..8fd0f023d0fa3 100644 --- a/pkgs/development/python-modules/sybase/default.nix +++ b/pkgs/development/python-modules/sybase/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "The Sybase module provides a Python interface to the Sybase relational database system"; - homepage = http://python-sybase.sourceforge.net; + homepage = "http://python-sybase.sourceforge.net"; license = licenses.bsd3; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix index 68664d0d0fdb1..9b1117a94a177 100644 --- a/pkgs/development/python-modules/symengine/default.nix +++ b/pkgs/development/python-modules/symengine/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library providing wrappers to SymEngine"; - homepage = https://github.com/symengine/symengine.py; + homepage = "https://github.com/symengine/symengine.py"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; broken = true; diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix index cbe2a2131918b..f0be01b92d89c 100644 --- a/pkgs/development/python-modules/systemd/default.nix +++ b/pkgs/development/python-modules/systemd/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python module for native access to the systemd facilities"; - homepage = http://www.freedesktop.org/software/systemd/python-systemd/; + homepage = "http://www.freedesktop.org/software/systemd/python-systemd/"; license = licenses.lgpl21; }; } diff --git a/pkgs/development/python-modules/sysv_ipc/default.nix b/pkgs/development/python-modules/sysv_ipc/default.nix index 37853980f43a0..1c2e3baa526b2 100644 --- a/pkgs/development/python-modules/sysv_ipc/default.nix +++ b/pkgs/development/python-modules/sysv_ipc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "SysV IPC primitives (semaphores, shared memory and message queues)"; license = licenses.bsd3; - homepage = http://semanchuk.com/philip/sysv_ipc/; + homepage = "http://semanchuk.com/philip/sysv_ipc/"; maintainers = with maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/tableaudocumentapi/default.nix b/pkgs/development/python-modules/tableaudocumentapi/default.nix index a2f8fbb2f5369..5260a678e8c7a 100644 --- a/pkgs/development/python-modules/tableaudocumentapi/default.nix +++ b/pkgs/development/python-modules/tableaudocumentapi/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python module for working with Tableau files"; - homepage = https://github.com/tableau/document-api-python; + homepage = "https://github.com/tableau/document-api-python"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/tables/3.5.nix b/pkgs/development/python-modules/tables/3.5.nix index 4cca72aa313a4..bf0eb51c851c1 100644 --- a/pkgs/development/python-modules/tables/3.5.nix +++ b/pkgs/development/python-modules/tables/3.5.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = { description = "Hierarchical datasets for Python"; - homepage = http://www.pytables.org/; + homepage = "http://www.pytables.org/"; license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index d67bec7a4968b..cd2af0dc28d6e 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = { description = "Hierarchical datasets for Python"; - homepage = http://www.pytables.org/; + homepage = "http://www.pytables.org/"; license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index cda898d2725df..4686d02486fce 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.8.6"; + version = "0.8.7"; pname = "tabulate"; src = fetchPypi { inherit pname version; - sha256 = "5470cc6687a091c7042cee89b2946d9235fe9f6d49c193a4ae2ac7bf386737c8"; + sha256 = "db2723a20d04bcda8522165c73eea7c300eda74e0ce852d9022e0159d7895007"; }; checkInputs = [ nose ]; @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Pretty-print tabular data"; - homepage = https://bitbucket.org/astanin/python-tabulate; + homepage = "https://bitbucket.org/astanin/python-tabulate"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/tadasets/default.nix b/pkgs/development/python-modules/tadasets/default.nix index 61f6b86645534..d1de836a5b8c4 100644 --- a/pkgs/development/python-modules/tadasets/default.nix +++ b/pkgs/development/python-modules/tadasets/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Great data sets for Topological Data Analysis"; - homepage = https://tadasets.scikit-tda.org; + homepage = "https://tadasets.scikit-tda.org"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/tarman/default.nix b/pkgs/development/python-modules/tarman/default.nix index 305daecc8de5c..f2a503cb55d86 100644 --- a/pkgs/development/python-modules/tarman/default.nix +++ b/pkgs/development/python-modules/tarman/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/matejc/tarman; + homepage = "https://github.com/matejc/tarman"; description = "Archive manager with curses interface"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/tasklib/default.nix b/pkgs/development/python-modules/tasklib/default.nix index 197c98def3ab3..9e37df17bf29e 100644 --- a/pkgs/development/python-modules/tasklib/default.nix +++ b/pkgs/development/python-modules/tasklib/default.nix @@ -27,7 +27,7 @@ in buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/robgolding/tasklib; + homepage = "https://github.com/robgolding/tasklib"; description = "A library for interacting with taskwarrior databases"; maintainers = with maintainers; [ arcnmx ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index d2d12ca0b962e..ee9a9716d1178 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six dateutil kitchen pytz ]; meta = with stdenv.lib; { - homepage = https://github.com/ralphbean/taskw; + homepage = "https://github.com/ralphbean/taskw"; description = "Python bindings for your taskwarrior database"; license = licenses.gpl3Plus; maintainers = with maintainers; [ pierron ]; diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix index 55a164773cae1..e7cbb7848f41c 100644 --- a/pkgs/development/python-modules/tblib/default.nix +++ b/pkgs/development/python-modules/tblib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Traceback fiddling library. Allows you to pickle tracebacks."; - homepage = https://github.com/ionelmc/python-tblib; + homepage = "https://github.com/ionelmc/python-tblib"; license = licenses.bsd2; maintainers = with maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/telegram/default.nix b/pkgs/development/python-modules/telegram/default.nix index df45aaaee3bc2..6074f479071ec 100644 --- a/pkgs/development/python-modules/telegram/default.nix +++ b/pkgs/development/python-modules/telegram/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/liluo/telegram; + homepage = "https://github.com/liluo/telegram"; description = "Telegram APIs"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix index b74fe9dc0de48..ccacb9157e214 100644 --- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/tulir/telethon-session-sqlalchemy; + homepage = "https://github.com/tulir/telethon-session-sqlalchemy"; description = "SQLAlchemy backend for Telethon session storage"; license = licenses.mit; maintainers = with maintainers; [ nyanloutre ]; diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index b94796b708e94..a125cfd9bff32 100644 --- a/pkgs/development/python-modules/telethon/default.nix +++ b/pkgs/development/python-modules/telethon/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; meta = with lib; { - homepage = https://github.com/LonamiWebs/Telethon; + homepage = "https://github.com/LonamiWebs/Telethon"; description = "Full-featured Telegram client library for Python 3"; license = licenses.mit; maintainers = with maintainers; [ nyanloutre ]; diff --git a/pkgs/development/python-modules/tempita/default.nix b/pkgs/development/python-modules/tempita/default.nix index a903aae104efd..a45edb8d26738 100644 --- a/pkgs/development/python-modules/tempita/default.nix +++ b/pkgs/development/python-modules/tempita/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { buildInputs = [ nose ]; meta = { - homepage = https://github.com/gjhiggins/tempita; + homepage = "https://github.com/gjhiggins/tempita"; description = "A very small text templating language"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 10de193866b38..ebc79212c25de 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Objects and routines pertaining to date and time"; - homepage = https://github.com/jaraco/tempora; + homepage = "https://github.com/jaraco/tempora"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index fa039e7b17068..17ce469dc1c52 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/jd/tenacity; + homepage = "https://github.com/jd/tenacity"; description = "Retrying library for Python"; license = licenses.asl20; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/tensorflow-estimator/1/default.nix b/pkgs/development/python-modules/tensorflow-estimator/1/default.nix index 3e3d50bc6f429..c34d6948d89eb 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/1/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/1/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "TensorFlow Estimator is a high-level API that encapsulates model training, evaluation, prediction, and exporting."; - homepage = http://tensorflow.org; + homepage = "http://tensorflow.org"; license = licenses.asl20; maintainers = with maintainers; [ jyp ]; }; diff --git a/pkgs/development/python-modules/tensorflow-estimator/2/default.nix b/pkgs/development/python-modules/tensorflow-estimator/2/default.nix index 47ce0f83b02d0..dbac36ff07fbf 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/2/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "TensorFlow Estimator is a high-level API that encapsulates model training, evaluation, prediction, and exporting."; - homepage = http://tensorflow.org; + homepage = "http://tensorflow.org"; license = licenses.asl20; maintainers = with maintainers; [ jyp ]; }; diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index b585ab4f81b53..9ae3464f3f8ff 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -1,15 +1,18 @@ { lib , fetchFromGitHub +, fetchpatch , buildBazelPackage , buildPythonPackage , python , setuptools , wheel +, absl-py , tensorflow , six , numpy , decorator , cloudpickle +, gast , hypothesis , scipy , matplotlib @@ -18,7 +21,7 @@ }: let - version = "0.7"; + version = "0.8.0"; pname = "tensorflow_probability"; # first build all binaries and generate setup.py using bazel @@ -28,21 +31,37 @@ let src = fetchFromGitHub { owner = "tensorflow"; repo = "probability"; - rev = "v${version}"; - sha256 = "0sy9gmjcvmwciamqvd7kd9qw2wd7ksklk80815fsn7sj0wiqxjyd"; + rev = "${version}"; + sha256 = "07cm8zba8n0ihzdm3k4a4rsg5v62xxsfvcw4h0niz91c0parqjqy"; }; + patches = [ + (fetchpatch { + name = "gast-0.3.patch"; + url = "https://github.com/tensorflow/probability/commit/ae7a9d9771771ec1e7755a3588b9325f050a84cc.patch"; + sha256 = "0kfhx30gshm8f3945na9yjjik71r20qmjzifbigaj4l8dwd9dz1a"; + excludes = ["testing/*"]; + }) + (fetchpatch { + name = "cloudpickle-1.2.patch"; + url = "https://github.com/tensorflow/probability/commit/78ef12b5afe3f567d16c70b74015ed1ddff1b0c8.patch"; + sha256 = "12ms2xcljvvrnig0j78s3wfv4yf3bm5ps4rgfgv5lg2a8mzpc1ga"; + }) + ]; + nativeBuildInputs = [ # needed to create the output wheel in installPhase python setuptools wheel + absl-py + tensorflow ]; bazelTarget = ":pip_pkg"; fetchAttrs = { - sha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + sha256 = "0nmk7sbgl1ag20333v9r7l5cka6wapbskikfhi3y5a8l9f6hxkl3"; }; buildAttrs = { @@ -75,6 +94,7 @@ in buildPythonPackage { numpy decorator cloudpickle + gast ]; # Listed here: @@ -103,7 +123,7 @@ in buildPythonPackage { meta = with lib; { description = "Library for probabilistic reasoning and statistical analysis"; - homepage = https://www.tensorflow.org/probability/; + homepage = "https://www.tensorflow.org/probability/"; license = licenses.asl20; maintainers = with maintainers; [ timokau ]; }; diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix index e0108aed5ef67..6cc3636b7f303 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "TensorFlow's Visualization Toolkit"; - homepage = http://tensorflow.org; + homepage = "http://tensorflow.org"; license = licenses.asl20; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix index 202b167c7e6cd..945896dda018a 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "TensorFlow's Visualization Toolkit"; - homepage = http://tensorflow.org; + homepage = "http://tensorflow.org"; license = licenses.asl20; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/tensorflow/1/bin.nix b/pkgs/development/python-modules/tensorflow/1/bin.nix index 05d59f9ed0ae7..9bd2bc78437a9 100644 --- a/pkgs/development/python-modules/tensorflow/1/bin.nix +++ b/pkgs/development/python-modules/tensorflow/1/bin.nix @@ -110,7 +110,7 @@ in buildPythonPackage { meta = with stdenv.lib; { description = "Computation using data flow graphs for scalable machine learning"; - homepage = http://tensorflow.org; + homepage = "http://tensorflow.org"; license = licenses.asl20; maintainers = with maintainers; [ jyp abbradar ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/python-modules/tensorflow/1/default.nix b/pkgs/development/python-modules/tensorflow/1/default.nix index 1b7c338d2a12b..4dc5c57070d18 100644 --- a/pkgs/development/python-modules/tensorflow/1/default.nix +++ b/pkgs/development/python-modules/tensorflow/1/default.nix @@ -300,9 +300,9 @@ let # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "1qygfcvvn9vysap9nk6xccxi9mgmzyxiywz6k456f811l1v70p2c" + "09j57w6kc0vkfcdwr0qggy3qgrgq82kfa2jrwvvcnij4bl3wj40j" else - "0kfjanw0mfbh30vi1ms2xlg8yp429cbyfriik6yxd5cla2pncg2j"; + "14g8z49qz7d8n1c2mcsfhr7yqpcy7mhmpm6hgmqvpgb8vm7yvwrc"; }; buildAttrs = { @@ -341,7 +341,7 @@ let meta = with stdenv.lib; { description = "Computation using data flow graphs for scalable machine learning"; - homepage = http://tensorflow.org; + homepage = "http://tensorflow.org"; license = licenses.asl20; maintainers = with maintainers; [ jyp abbradar ]; platforms = with platforms; linux ++ darwin; @@ -430,7 +430,10 @@ in buildPythonPackage { EOF ''; - passthru.libtensorflow = bazel-build.out; + passthru = { + deps = bazel-build.deps; + libtensorflow = bazel-build.out; + }; inherit (bazel-build) meta; } diff --git a/pkgs/development/python-modules/tensorflow/2/bin.nix b/pkgs/development/python-modules/tensorflow/2/bin.nix index 95a7b2a37485e..acb5f473ec9d5 100644 --- a/pkgs/development/python-modules/tensorflow/2/bin.nix +++ b/pkgs/development/python-modules/tensorflow/2/bin.nix @@ -19,7 +19,7 @@ , opt-einsum , backports_weakref , tensorflow-estimator_2 -, tensorflow-tensorboard +, tensorflow-tensorboard_2 , cudaSupport ? false , cudatoolkit ? null , cudnn ? null @@ -77,7 +77,7 @@ in buildPythonPackage { google-pasta wrapt tensorflow-estimator_2 - tensorflow-tensorboard + tensorflow-tensorboard_2 keras-applications keras-preprocessing ] ++ lib.optional (!isPy3k) mock @@ -159,6 +159,14 @@ in buildPythonPackage { done ''; + # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow + # and the propagated input tensorflow-tensorboard, which causes environment collisions. + # Another possibility would be to have tensorboard only in the buildInputs + # See https://github.com/NixOS/nixpkgs/pull/44381 for more information. + postInstall = '' + rm $out/bin/tensorboard + ''; + pythonImportsCheck = [ "tensorflow" "tensorflow.keras" @@ -168,7 +176,7 @@ in buildPythonPackage { meta = with stdenv.lib; { description = "Computation using data flow graphs for scalable machine learning"; - homepage = http://tensorflow.org; + homepage = "http://tensorflow.org"; license = licenses.asl20; maintainers = with maintainers; [ jyp abbradar cdepillabout ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/python-modules/tensorflow/2/default.nix b/pkgs/development/python-modules/tensorflow/2/default.nix index 2867308f9c43f..4dd378d1410bd 100644 --- a/pkgs/development/python-modules/tensorflow/2/default.nix +++ b/pkgs/development/python-modules/tensorflow/2/default.nix @@ -294,9 +294,9 @@ let # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "0hg3ysy644950a34j28hrb317cz8gcbb9n84d36wdailvnlshghb" + "1kqk1gx5g63kb2zdj392x6mnpbrmgqghrdv597aipn7s23xzj8pd" else - "1gy4pz9kn30wb9c4a9584fibb88c3h38y3dqa99yw1lbsbyyi28c"; + "1plpcm2ydpajsrxdvmmpfy7l0gfdir78hap72w4k7ddm6d3rm2fv"; }; buildAttrs = { @@ -335,7 +335,7 @@ let meta = with stdenv.lib; { description = "Computation using data flow graphs for scalable machine learning"; - homepage = http://tensorflow.org; + homepage = "http://tensorflow.org"; license = licenses.asl20; maintainers = with maintainers; [ jyp abbradar ]; platforms = with platforms; linux ++ darwin; @@ -421,7 +421,10 @@ in buildPythonPackage { ''; # Regression test for #77626 removed because not more `tensorflow.contrib`. - passthru.libtensorflow = bazel-build.out; + passthru = { + deps = bazel-build.deps; + libtensorflow = bazel-build.out; + }; inherit (bazel-build) meta; } diff --git a/pkgs/development/python-modules/tensorly/default.nix b/pkgs/development/python-modules/tensorly/default.nix index 33aca636f45f0..94acabe78d2d4 100644 --- a/pkgs/development/python-modules/tensorly/default.nix +++ b/pkgs/development/python-modules/tensorly/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tensor learning in Python"; - homepage = https://tensorly.org/; + homepage = "https://tensorly.org/"; license = licenses.bsd3; maintainers = [ maintainers.bcdarwin ]; }; diff --git a/pkgs/development/python-modules/termcolor/default.nix b/pkgs/development/python-modules/termcolor/default.nix index 2931f0e519999..7879482f17d7d 100644 --- a/pkgs/development/python-modules/termcolor/default.nix +++ b/pkgs/development/python-modules/termcolor/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Termcolor"; - homepage = https://pypi.python.org/pypi/termcolor; + homepage = "https://pypi.python.org/pypi/termcolor"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index af1c4d53e13a8..51e9b98db5bb4 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Terminals served by Tornado websockets"; - homepage = https://github.com/jupyter/terminado; + homepage = "https://github.com/jupyter/terminado"; license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/tess/default.nix b/pkgs/development/python-modules/tess/default.nix index c168492be721a..883d541f81203 100644 --- a/pkgs/development/python-modules/tess/default.nix +++ b/pkgs/development/python-modules/tess/default.nix @@ -23,7 +23,7 @@ buildPythonPackage { meta = with lib; { description = "A module for calculating and analyzing Voronoi tessellations"; - homepage = https://tess.readthedocs.org; + homepage = "https://tess.readthedocs.org"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 8fca654632e0d..b3db882c82b27 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "6.10.3"; + version = "6.14.1"; src = fetchPypi { inherit pname version; - sha256 = "8f22100d4fb841b958f64e71c8820a32dc46f57d4d7e077777b932acd87b7327"; + sha256 = "0rh38zj8wywgqlsi5j75c7drpqhkrg50qknj1kdmvg4kdlab7ljq"; }; checkInputs = [ pytest mock sybil zope_component twisted ]; @@ -19,7 +19,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/Simplistix/testfixtures; + homepage = "https://github.com/Simplistix/testfixtures"; description = "A collection of helpers and mock objects for unit tests and doc tests"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix index c9d0e8f0ad2c9..8357cd2c45683 100644 --- a/pkgs/development/python-modules/testpath/default.nix +++ b/pkgs/development/python-modules/testpath/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Test utilities for code working with files and commands"; license = licenses.mit; - homepage = https://github.com/jupyter/testpath; + homepage = "https://github.com/jupyter/testpath"; }; } diff --git a/pkgs/development/python-modules/testrepository/default.nix b/pkgs/development/python-modules/testrepository/default.nix index 188c320e761ae..f3c7e169207f0 100644 --- a/pkgs/development/python-modules/testrepository/default.nix +++ b/pkgs/development/python-modules/testrepository/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A database of test results which can be used as part of developer workflow"; - homepage = https://pypi.python.org/pypi/testrepository; + homepage = "https://pypi.python.org/pypi/testrepository"; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/testresources/default.nix b/pkgs/development/python-modules/testresources/default.nix index ce00b17b17737..1aaddc3dec9c3 100644 --- a/pkgs/development/python-modules/testresources/default.nix +++ b/pkgs/development/python-modules/testresources/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pyunit extension for managing expensive test resources"; - homepage = https://launchpad.net/testresources; + homepage = "https://launchpad.net/testresources"; license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/testscenarios/default.nix b/pkgs/development/python-modules/testscenarios/default.nix index 6fddc17af322c..751ab02670a3b 100644 --- a/pkgs/development/python-modules/testscenarios/default.nix +++ b/pkgs/development/python-modules/testscenarios/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pyunit extension for dependency injection"; - homepage = https://pypi.python.org/pypi/testscenarios; + homepage = "https://pypi.python.org/pypi/testscenarios"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index 1a99378a541ba..8264314c96a6b 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "A set of extensions to the Python standard library's unit testing framework"; - homepage = https://pypi.python.org/pypi/testtools; + homepage = "https://pypi.python.org/pypi/testtools"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/text-unidecode/default.nix b/pkgs/development/python-modules/text-unidecode/default.nix index ff5d242559321..5f5a0bf851275 100644 --- a/pkgs/development/python-modules/text-unidecode/default.nix +++ b/pkgs/development/python-modules/text-unidecode/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "The most basic Text::Unidecode port"; - homepage = https://github.com/kmike/text-unidecode; + homepage = "https://github.com/kmike/text-unidecode"; license = licenses.artistic1; }; } diff --git a/pkgs/development/python-modules/textwrap3/default.nix b/pkgs/development/python-modules/textwrap3/default.nix index 5b8e10db83ea7..791479b69e149 100644 --- a/pkgs/development/python-modules/textwrap3/default.nix +++ b/pkgs/development/python-modules/textwrap3/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Textwrap from Python 3.6 backport plus a few tweaks"; - homepage = https://github.com/jonathaneunice/textwrap3; + homepage = "https://github.com/jonathaneunice/textwrap3"; license = licenses.psfl; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index c12a00c011ff7..6f1eaa8049583 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Practical Machine Learning for NLP in Python"; - homepage = https://github.com/explosion/thinc; + homepage = "https://github.com/explosion/thinc"; license = licenses.mit; maintainers = with maintainers; [ aborsu danieldk sdll ]; }; diff --git a/pkgs/development/python-modules/threadpool/default.nix b/pkgs/development/python-modules/threadpool/default.nix index a604302add1e9..bbc3074c9642e 100644 --- a/pkgs/development/python-modules/threadpool/default.nix +++ b/pkgs/development/python-modules/threadpool/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://chrisarndt.de/projects/threadpool/; + homepage = "https://chrisarndt.de/projects/threadpool/"; description = "Easy to use object-oriented thread pool framework"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/thrift/default.nix b/pkgs/development/python-modules/thrift/default.nix index 7d80be987f70e..999d950771c71 100644 --- a/pkgs/development/python-modules/thrift/default.nix +++ b/pkgs/development/python-modules/thrift/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for the Apache Thrift RPC system"; - homepage = http://thrift.apache.org/; + homepage = "http://thrift.apache.org/"; license = licenses.asl20; maintainers = with maintainers; [ hbunke ]; }; diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix index 6f2d0de9accdf..ee805ce6300f3 100644 --- a/pkgs/development/python-modules/thumbor/default.nix +++ b/pkgs/development/python-modules/thumbor/default.nix @@ -83,7 +83,7 @@ buildPythonPackage rec { meta = with lib; { description = "A smart imaging service"; - homepage = https://github.com/thumbor/thumbor/wiki; + homepage = "https://github.com/thumbor/thumbor/wiki"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/thumborpexif/default.nix b/pkgs/development/python-modules/thumborpexif/default.nix index 2a1240526abb0..586045edc2738 100644 --- a/pkgs/development/python-modules/thumborpexif/default.nix +++ b/pkgs/development/python-modules/thumborpexif/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Module to parse and edit the EXIF data tags in a JPEG image"; - homepage = http://www.benno.id.au/code/pexif/; + homepage = "http://www.benno.id.au/code/pexif/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index 07f8edc3becba..cf688d75f01e5 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -65,9 +65,9 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to the TileDB storage manager"; - homepage = https://github.com/TileDB-Inc/TileDB-Py; + homepage = "https://github.com/TileDB-Inc/TileDB-Py"; license = licenses.mit; maintainers = with maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/tilestache/default.nix b/pkgs/development/python-modules/tilestache/default.nix index c76cc6645d907..d4e54fcc40e16 100644 --- a/pkgs/development/python-modules/tilestache/default.nix +++ b/pkgs/development/python-modules/tilestache/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A tile server for rendered geographic data"; - homepage = http://tilestache.org; + homepage = "http://tilestache.org"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/timeout-decorator/default.nix b/pkgs/development/python-modules/timeout-decorator/default.nix index af1a85c962718..bf37e671cd138 100644 --- a/pkgs/development/python-modules/timeout-decorator/default.nix +++ b/pkgs/development/python-modules/timeout-decorator/default.nix @@ -11,6 +11,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Timeout decorator"; license = licenses.mit; - homepage = https://github.com/pnpnpn/timeout-decorator; + homepage = "https://github.com/pnpnpn/timeout-decorator"; }; } diff --git a/pkgs/development/python-modules/tinycss/default.nix b/pkgs/development/python-modules/tinycss/default.nix index 223d778095af4..42250b058d587 100644 --- a/pkgs/development/python-modules/tinycss/default.nix +++ b/pkgs/development/python-modules/tinycss/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with pkgs.lib; { description = "Complete yet simple CSS parser for Python"; license = licenses.bsd3; - homepage = https://pythonhosted.org/tinycss/; + homepage = "https://pythonhosted.org/tinycss/"; maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 894d4f737fb65..2d8581cfb9077 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Low-level CSS parser for Python"; - homepage = https://github.com/Kozea/tinycss2; + homepage = "https://github.com/Kozea/tinycss2"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/tissue/default.nix b/pkgs/development/python-modules/tissue/default.nix index 895700f681e8f..8f551ab5926da 100644 --- a/pkgs/development/python-modules/tissue/default.nix +++ b/pkgs/development/python-modules/tissue/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pep8 ]; meta = with stdenv.lib; { - homepage = https://github.com/WoLpH/tissue; + homepage = "https://github.com/WoLpH/tissue"; description = "Tissue - automated pep8 checker for nose"; license = licenses.lgpl2; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix index e25d871f978dd..aed342c119f51 100644 --- a/pkgs/development/python-modules/titlecase/default.nix +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; meta = { - homepage = https://github.com/ppannuto/python-titlecase; + homepage = "https://github.com/ppannuto/python-titlecase"; description = "Python Port of John Gruber's titlecase.pl"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index 5e7380f7bb3be..dff50c78cf6c2 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -30,7 +30,7 @@ python.pkgs.buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/barseghyanartur/tld; + homepage = "https://github.com/barseghyanartur/tld"; description = "Extracts the top level domain (TLD) from the URL given"; license = licenses.lgpl21; maintainers = with maintainers; [ genesis ]; diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index 07865a6b4b839..e771470b4003b 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ pytest responses ]; meta = { - homepage = https://github.com/john-kurkowski/tldextract; + homepage = "https://github.com/john-kurkowski/tldextract"; description = "Accurately separate the TLD from the registered domain and subdomains of a URL, using the Public Suffix List."; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix index 2a74a00539f9a..3448d40cf3a49 100644 --- a/pkgs/development/python-modules/tlsh/default.nix +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -26,7 +26,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Trend Micro Locality Sensitive Hash"; - homepage = https://github.com/trendmicro/tlsh; + homepage = "https://github.com/trendmicro/tlsh"; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/tlslite-ng/default.nix b/pkgs/development/python-modules/tlslite-ng/default.nix index ac68019d3695e..244444a276f59 100644 --- a/pkgs/development/python-modules/tlslite-ng/default.nix +++ b/pkgs/development/python-modules/tlslite-ng/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pure python implementation of SSL and TLS."; - homepage = https://pypi.python.org/pypi/tlslite-ng; + homepage = "https://pypi.python.org/pypi/tlslite-ng"; license = licenses.lgpl2; maintainers = [ maintainers.erictapen ]; }; diff --git a/pkgs/development/python-modules/tlslite/default.nix b/pkgs/development/python-modules/tlslite/default.nix index fb1cdd0a47114..ac0c572ec3e70 100644 --- a/pkgs/development/python-modules/tlslite/default.nix +++ b/pkgs/development/python-modules/tlslite/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pure Python implementation of SSL and TLS"; - homepage = https://pypi.python.org/pypi/tlslite; + homepage = "https://pypi.python.org/pypi/tlslite"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/tmdb3/default.nix b/pkgs/development/python-modules/tmdb3/default.nix index 87b62cd78ac11..47247c6911d60 100644 --- a/pkgs/development/python-modules/tmdb3/default.nix +++ b/pkgs/development/python-modules/tmdb3/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information"; - homepage = https://pypi.python.org/pypi/tmdb3; + homepage = "https://pypi.python.org/pypi/tmdb3"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix index 6ad6a62861d9e..f420cbaee9740 100644 --- a/pkgs/development/python-modules/todoist/default.nix +++ b/pkgs/development/python-modules/todoist/default.nix @@ -14,8 +14,7 @@ buildPythonPackage rec { meta = { description = "The official Todoist Python API library"; - homepage = https://todoist-python.readthedocs.io/en/latest/; + homepage = "https://todoist-python.readthedocs.io/en/latest/"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 6834876d8f81a..62d3f2dde24de 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { substituteInPlace requirements.txt \ --replace "pendulum==2.0.4" "pendulum>=2.0.4" \ --replace "click-completion==0.5.0" "click-completion>=0.5.0" \ + --replace "click==7.0" "click>=7.0" \ --replace "pbr==5.1.2" "pbr>=5.1.2" \ --replace "inquirer==2.5.1" "inquirer>=2.5.1" ''; diff --git a/pkgs/development/python-modules/tokenlib/default.nix b/pkgs/development/python-modules/tokenlib/default.nix index 24f54b98a96ed..0ffb5ce0cb73e 100644 --- a/pkgs/development/python-modules/tokenlib/default.nix +++ b/pkgs/development/python-modules/tokenlib/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = "0.3.1"; src = fetchgit { - url = https://github.com/mozilla-services/tokenlib.git; + url = "https://github.com/mozilla-services/tokenlib.git"; rev = "refs/tags/${version}"; sha256 = "0bq6dqyfwh29pg8ngmrm4mx4q27an9lsj0p9l79p9snn4g2rxzc8"; }; @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests webob ]; meta = with stdenv.lib; { - homepage = https://github.com/mozilla-services/tokenlib; + homepage = "https://github.com/mozilla-services/tokenlib"; description = "Generic support library for signed-token-based auth schemes"; license = licenses.mpl20; }; diff --git a/pkgs/development/python-modules/tokenserver/default.nix b/pkgs/development/python-modules/tokenserver/default.nix index 08f3f87321fe6..6d3c7e2be0548 100644 --- a/pkgs/development/python-modules/tokenserver/default.nix +++ b/pkgs/development/python-modules/tokenserver/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "The Mozilla Token Server"; - homepage = https://github.com/mozilla-services/tokenserver; + homepage = "https://github.com/mozilla-services/tokenserver"; license = licenses.mpl20; maintainers = with maintainers; [ nadrieril ]; }; diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index de48b3736cfcc..deff7769dfb4b 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, isPy34 +{ lib, buildPythonPackage, fetchPypi, isPy27 , enum34, functools32, typing }: @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optionals isPy27 [ enum34 functools32 ] - ++ lib.optional (isPy27 || isPy34) typing; + ++ lib.optional isPy27 typing; # The Pypi tarball doesn't include tests, and the GitHub source isn't # buildable until we bootstrap poetry, see diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index 7f506e564139e..cb635d227f7ca 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec{ ''; meta = with lib; { - homepage = https://github.com/pytoolz/toolz; + homepage = "https://github.com/pytoolz/toolz"; description = "List processing tools and functional utilities"; license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix index dd1156f4355cd..eddd6ac4fd184 100644 --- a/pkgs/development/python-modules/toposort/default.nix +++ b/pkgs/development/python-modules/toposort/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A topological sort algorithm"; - homepage = https://pypi.python.org/pypi/toposort/1.1; + homepage = "https://pypi.python.org/pypi/toposort/1.1"; maintainers = with maintainers; [ tstrobel ]; platforms = platforms.unix; license = licenses.asl20; diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 0413fd33f6f02..4d37157909969 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "PyTorch vision library"; - homepage = https://pytorch.org/; + homepage = "https://pytorch.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ericsagnes ]; }; diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index 1d8a03578cdaa..102cf0fed5740 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = { description = "A web framework and asynchronous networking library"; - homepage = http://www.tornadoweb.org/; + homepage = "http://www.tornadoweb.org/"; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 5cec769deccc9..d6bc9ea7f39a9 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Virtualenv-based automation of test activities"; - homepage = https://tox.readthedocs.io/; + homepage = "https://tox.readthedocs.io/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index ec281138aebfb..c00eac75ee0dc 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.42.1"; + version = "4.45.0"; src = fetchPypi { inherit pname version; - sha256 = "251ee8440dbda126b8dfa8a7c028eb3f13704898caaef7caa699b35e119301e2"; + sha256 = "00339634a22c10a7a22476ee946bbde2dbe48d042ded784e4d88e0236eca5d81"; }; checkInputs = [ nose coverage glibcLocales flake8 ]; @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "A Fast, Extensible Progress Meter"; - homepage = https://github.com/tqdm/tqdm; + homepage = "https://github.com/tqdm/tqdm"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/traceback2/default.nix b/pkgs/development/python-modules/traceback2/default.nix index fe15285f0653d..3a70df1548d0c 100644 --- a/pkgs/development/python-modules/traceback2/default.nix +++ b/pkgs/development/python-modules/traceback2/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A backport of traceback to older supported Pythons"; - homepage = https://pypi.python.org/pypi/traceback2/; + homepage = "https://pypi.python.org/pypi/traceback2/"; license = licenses.psfl; }; diff --git a/pkgs/development/python-modules/tracing/default.nix b/pkgs/development/python-modules/tracing/default.nix index 094c01eef78b3..2d91ae6a13784 100644 --- a/pkgs/development/python-modules/tracing/default.nix +++ b/pkgs/development/python-modules/tracing/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://liw.fi/tracing/; + homepage = "http://liw.fi/tracing/"; description = "Python debug logging helper"; license = licenses.gpl3; maintainers = []; diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix index d77ca31687fd1..6d198534149d2 100644 --- a/pkgs/development/python-modules/trackpy/default.nix +++ b/pkgs/development/python-modules/trackpy/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Particle-tracking toolkit"; - homepage = https://github.com/soft-matter/trackpy; + homepage = "https://github.com/soft-matter/trackpy"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; broken = true; # not compatible with latest pandas diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index 0342abdfefe04..001106328085a 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -31,8 +31,8 @@ buildPythonPackage rec { meta = { description = "Traitlets Python config system"; - homepage = http://ipython.org/; + homepage = "http://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index 84aa1c5784e38..5bd849908356b 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -4,7 +4,6 @@ , python , pytest , numpy -, isPy33 }: buildPythonPackage rec { @@ -28,11 +27,11 @@ buildPythonPackage rec { # https://github.com/enthought/traits/issues/187 # https://github.com/enthought/traits/pull/188 # Furthermore, some tests fail due to being in a chroot - doCheck = isPy33; + doCheck = false; meta = with stdenv.lib; { description = "Explicitly typed attributes for Python"; - homepage = https://pypi.python.org/pypi/traits; + homepage = "https://pypi.python.org/pypi/traits"; license = "BSD"; }; diff --git a/pkgs/development/python-modules/traittypes/default.nix b/pkgs/development/python-modules/traittypes/default.nix new file mode 100644 index 0000000000000..2c8f6dd803129 --- /dev/null +++ b/pkgs/development/python-modules/traittypes/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, isPy27 +, pytest +, nose +, numpy +, scipy +, pandas +, xarray +, traitlets +}: + +buildPythonPackage rec { + pname = "traittypes"; + version = "unstable-2019-06-23"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "jupyter-widgets"; + repo = pname; + rev = "0a030b928991dec732c17a7a1cb13acbcd7650a2"; + sha256 = "0rlm5krmq6n8yi47dgdsjyrkz3m079pndpbzkz2gx98pb3jd9pjs"; + }; + + patches = [ + (fetchpatch { + name = "fix-intarray-test.patch"; + url = "https://github.com/minrk/traittypes/commit/a02441e5b259e5858453a853207260c9bd4efbb5.patch"; + sha256 = "120dsvr5nksizw75z1ah3h38mi399fxbvz5anakica557jahi0aw"; + }) + ]; + + propagatedBuildInputs = [ traitlets ]; + + checkInputs = [ numpy pandas xarray nose pytest ]; + + meta = with lib; { + description = "Trait types for NumPy, SciPy, XArray, and Pandas"; + homepage = "https://github.com/jupyter-widgets/traittypes"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; + +} diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix index 0ed6f84ff3022..887c46863362c 100644 --- a/pkgs/development/python-modules/transaction/default.nix +++ b/pkgs/development/python-modules/transaction/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Transaction management"; - homepage = https://pypi.python.org/pypi/transaction; + homepage = "https://pypi.python.org/pypi/transaction"; license = licenses.zpl20; }; } diff --git a/pkgs/development/python-modules/transforms3d/default.nix b/pkgs/development/python-modules/transforms3d/default.nix new file mode 100644 index 0000000000000..8b21e64e9a7ec --- /dev/null +++ b/pkgs/development/python-modules/transforms3d/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, pytest +, numpy +, scipy +, sympy +}: + +buildPythonPackage rec { + pname = "transforms3d"; + version = "unstable-2019-12-17"; + + disabled = isPy27; + + # no Git tag or PyPI release in some time + src = fetchFromGitHub { + owner = "matthew-brett"; + repo = pname; + rev = "6b20250c610249914ca5e3a3a2964c36ca35c19a"; + sha256 = "1z789hgk71a6rj6mqp9srpzamg06g58hs2p1l1p344cfnkj5a4kc"; + }; + + propagatedBuildInputs = [ numpy sympy ]; + + checkInputs = [ pytest scipy ]; + checkPhase = "pytest transforms3d"; + + meta = with lib; { + homepage = "https://matthew-brett.github.io/transforms3d"; + description = "Convert between various geometric transformations"; + license = licenses.bsd2; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/transip/default.nix b/pkgs/development/python-modules/transip/default.nix index 977ff17ececd0..e71660d5b88e5 100644 --- a/pkgs/development/python-modules/transip/default.nix +++ b/pkgs/development/python-modules/transip/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "TransIP API Connector"; - homepage = https://github.com/benkonrath/transip-api; + homepage = "https://github.com/benkonrath/transip-api"; license = licenses.mit; maintainers = with maintainers; [ flyfloh ]; }; diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index f4eb4fe5293b6..4ab3e11acb130 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pytransitions/transitions; + homepage = "https://github.com/pytransitions/transitions"; description = "A lightweight, object-oriented finite state machine implementation in Python"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/translationstring/default.nix b/pkgs/development/python-modules/translationstring/default.nix index 53f8818808354..0933b90ede9f7 100644 --- a/pkgs/development/python-modules/translationstring/default.nix +++ b/pkgs/development/python-modules/translationstring/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://pylonsproject.org/; + homepage = "https://pylonsproject.org/"; description = "Utility library for i18n relied on by various Repoze and Pyramid packages"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/transmissionrpc/default.nix b/pkgs/development/python-modules/transmissionrpc/default.nix index 932045b6502d7..eb209a0d49ecd 100644 --- a/pkgs/development/python-modules/transmissionrpc/default.nix +++ b/pkgs/development/python-modules/transmissionrpc/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python implementation of the Transmission bittorent client RPC protocol"; - homepage = https://pypi.python.org/pypi/transmissionrpc/; + homepage = "https://pypi.python.org/pypi/transmissionrpc/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 1d488eed4e1b7..1ec88ff1b7710 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "treq"; - version = "18.6.0"; + version = "20.4.1"; src = fetchPypi { inherit pname version; - sha256 = "91e09ff6b524cc90aa5e934b909c8d0d1a9d36ebd618b6c38e37b17013e69f48"; + sha256 = "115wwb3sripl3xvwpygwyrxrapyis0i7w1yq591z3dwl9k9fgzk8"; }; propagatedBuildInputs = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/twisted/treq; + homepage = "https://github.com/twisted/treq"; description = "A requests-like API built on top of twisted.web's Agent"; license = licenses.mit; maintainers = with maintainers; [ nand0p ]; diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix new file mode 100644 index 0000000000000..be135f651213c --- /dev/null +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, numpy }: + +buildPythonPackage rec { + pname = "trimesh"; + version = "3.6.38"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rdffk6a1jlfanb4i0prvy68qya8waa390yyw2kix4ja8fk7y6sx"; + }; + + propagatedBuildInputs = [ numpy ]; + + # tests are not included in pypi distributions and would require lots of + # optional dependencies + doCheck = false; + + meta = with lib; { + description = "Python library for loading and using triangular meshes."; + homepage = "https://trimsh.org/"; + license = licenses.mit; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 11f3c94aece3d..135142529a958 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = { description = "An async/await-native I/O library for humans and snake people"; - homepage = https://github.com/python-trio/trio; + homepage = "https://github.com/python-trio/trio"; license = with lib.licenses; [ mit asl20 ]; maintainers = with lib.maintainers; [ catern ]; }; diff --git a/pkgs/development/python-modules/trollius/default.nix b/pkgs/development/python-modules/trollius/default.nix index 21a3c5d6d08f1..b81a92d08e668 100644 --- a/pkgs/development/python-modules/trollius/default.nix +++ b/pkgs/development/python-modules/trollius/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Port of the asyncio project to Python 2.7"; - homepage = https://github.com/vstinner/trollius; + homepage = "https://github.com/vstinner/trollius"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/trueskill/default.nix b/pkgs/development/python-modules/trueskill/default.nix index 2106e4d2e76c0..18033aff391c4 100644 --- a/pkgs/development/python-modules/trueskill/default.nix +++ b/pkgs/development/python-modules/trueskill/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "The video game rating system"; - homepage = https://trueskill.org; + homepage = "https://trueskill.org"; license = licenses.bsd3; maintainers = with maintainers; [ eadwu diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index 42cbf23e56fab..4c99c8e937709 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = { description = "High quality TLS certs while you wait, for the discerning tester"; - homepage = https://github.com/python-trio/trustme; + homepage = "https://github.com/python-trio/trustme"; license = with lib.licenses; [ mit asl20 ]; maintainers = with lib.maintainers; [ catern ]; }; diff --git a/pkgs/development/python-modules/ttystatus/default.nix b/pkgs/development/python-modules/ttystatus/default.nix index bce0ad8d7c0c1..8cf8c426b3b9c 100644 --- a/pkgs/development/python-modules/ttystatus/default.nix +++ b/pkgs/development/python-modules/ttystatus/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://liw.fi/ttystatus/; + homepage = "http://liw.fi/ttystatus/"; description = "Progress and status updates on terminals for Python"; license = licenses.gpl3; maintainers = []; diff --git a/pkgs/development/python-modules/tunigo/default.nix b/pkgs/development/python-modules/tunigo/default.nix index 767bb21f0fd4b..9f2f177552de8 100644 --- a/pkgs/development/python-modules/tunigo/default.nix +++ b/pkgs/development/python-modules/tunigo/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for the browse feature of Spotify"; - homepage = https://github.com/trygveaa/python-tunigo; + homepage = "https://github.com/trygveaa/python-tunigo"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index 88174a94ef485..13fafe788fd24 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests six requests_oauthlib ]; meta = with lib; { - homepage = https://github.com/tweepy/tweepy; + homepage = "https://github.com/tweepy/tweepy"; description = "Twitter library for python"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/twiggy/default.nix b/pkgs/development/python-modules/twiggy/default.nix index 9a87c684f1bef..6c502ebe011c6 100644 --- a/pkgs/development/python-modules/twiggy/default.nix +++ b/pkgs/development/python-modules/twiggy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://twiggy.wearpants.org; + homepage = "http://twiggy.wearpants.org"; # Taken from http://i.wearpants.org/blog/meet-twiggy/ description = "Twiggy is the first totally new design for a logger since log4j"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index fa167896ea07d..18e28c358b496 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.35.1"; + version = "6.39.0"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "10a1hqvxn0w6z696ay1bbxra6qn8bxg87d6g9iryd2hjnn8sfh4b"; + sha256 = "1l2j54kjd1lrf072a3i5037qxpm8n378dddzd3m711ylz6vp638f"; }; buildInputs = [ nose mock ]; @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Twilio API client and TwiML generator"; - homepage = https://github.com/twilio/twilio-python/; + homepage = "https://github.com/twilio/twilio-python/"; license = licenses.mit; maintainers = with maintainers; [ flokli ]; }; diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index 097e691f7c182..e11d7392e1c0d 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; # pypi package comes without tests, other homepage does not provide all verisons meta = with lib; { - homepage = http://twill.idyll.org/; + homepage = "http://twill.idyll.org/"; description = "A simple scripting language for Web browsing"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 762df433f9734..b3dddbbba68e9 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = { description = "Collection of utilities for interacting with PyPI"; - homepage = https://github.com/pypa/twine; + homepage = "https://github.com/pypa/twine"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 2bea54818c243..d38d6aebcbd88 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://twistedmatrix.com/; + homepage = "https://twistedmatrix.com/"; description = "Twisted, an event-driven networking engine written in Python"; longDescription = '' Twisted is an event-driven networking engine written in Python diff --git a/pkgs/development/python-modules/txdbus/default.nix b/pkgs/development/python-modules/txdbus/default.nix new file mode 100644 index 0000000000000..0fbe4900f9e56 --- /dev/null +++ b/pkgs/development/python-modules/txdbus/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, six, twisted }: + +buildPythonPackage rec { + pname = "txdbus"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0z41n1ikpdvk0nm8dbyh6g9bg781q4j6hg2b09b5k4wdqm17zxbg"; + }; + + propagatedBuildInputs = [ six twisted ]; + pythonImportsCheck = [ "txdbus" ]; + + meta = with stdenv.lib; { + description = "Native Python implementation of DBus for Twisted"; + homepage = "https://github.com/cocagne/txdbus"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ geistesk ]; + }; +} diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index 0514be0fb4d4b..5095265e33f69 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; meta = { - homepage = https://pypi.python.org/pypi/typed-ast; + homepage = "https://pypi.python.org/pypi/typed-ast"; description = "a fork of Python 2 and 3 ast modules with type comment support"; license = lib.licenses.asl20; }; diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 51dc355525068..042bd2e765475 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "This library provides run-time type checking for functions defined with argument type annotations"; - homepage = https://github.com/agronholm/typeguard; + homepage = "https://github.com/agronholm/typeguard"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/typesystem/default.nix b/pkgs/development/python-modules/typesystem/default.nix index 8a66d6cbcc9f8..bfaed58b13fb2 100644 --- a/pkgs/development/python-modules/typesystem/default.nix +++ b/pkgs/development/python-modules/typesystem/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "A type system library for Python"; - homepage = https://github.com/encode/typesystem; + homepage = "https://github.com/encode/typesystem"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index 6c1e85eb93c1c..1d8929e3d7ea0 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -24,7 +24,7 @@ in buildPythonPackage rec { meta = with lib; { description = "Backported and Experimental Type Hints for Python 3.5+"; - homepage = https://github.com/python/typing; + homepage = "https://github.com/python/typing"; license = licenses.psfl; maintainers = with maintainers; [ pmiddend ]; }; diff --git a/pkgs/development/python-modules/typing/default.nix b/pkgs/development/python-modules/typing/default.nix index c6351690f5ee3..6c25031a8dc7c 100644 --- a/pkgs/development/python-modules/typing/default.nix +++ b/pkgs/development/python-modules/typing/default.nix @@ -24,7 +24,7 @@ in buildPythonPackage rec { meta = with lib; { description = "Backport of typing module to Python versions older than 3.5"; - homepage = https://docs.python.org/3/library/typing.html; + homepage = "https://docs.python.org/3/library/typing.html"; license = licenses.psfl; }; } diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 9948dd1e84ebe..f10f76d53cf39 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tzinfo object for the local timezone"; - homepage = https://github.com/regebro/tzlocal; + homepage = "https://github.com/regebro/tzlocal"; license = licenses.cddl; }; } diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix index 8fd8eaf8329dc..93cd1a21a94d2 100644 --- a/pkgs/development/python-modules/u-msgpack-python/default.nix +++ b/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "A portable, lightweight MessagePack serializer and deserializer written in pure Python"; - homepage = https://github.com/vsergeev/u-msgpack-python; + homepage = "https://github.com/vsergeev/u-msgpack-python"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index f0b42e6609f7b..7e03017ce56be 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Universal array library"; - homepage = https://github.com/Quansight-Labs/uarray; + homepage = "https://github.com/Quansight-Labs/uarray"; license = licenses.bsd0; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index a9d68978c3b0c..d60ec743032e2 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/ujson; + homepage = "https://pypi.python.org/pypi/ujson"; description = "Ultra fast JSON encoder and decoder for Python"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/ukpostcodeparser/default.nix b/pkgs/development/python-modules/ukpostcodeparser/default.nix index 42588347c8517..a2c452046ab94 100644 --- a/pkgs/development/python-modules/ukpostcodeparser/default.nix +++ b/pkgs/development/python-modules/ukpostcodeparser/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "UK Postcode parser"; - homepage = https://github.com/hamstah/ukpostcodeparser; + homepage = "https://github.com/hamstah/ukpostcodeparser"; license = licenses.publicDomain; maintainers = with maintainers; [ siddharthist ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/umalqurra/default.nix b/pkgs/development/python-modules/umalqurra/default.nix index a41921a9d8cf6..2eea9ebf385c4 100644 --- a/pkgs/development/python-modules/umalqurra/default.nix +++ b/pkgs/development/python-modules/umalqurra/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # https://github.com/tytkal/python-hijiri-ummalqura/issues/4 meta = with stdenv.lib; { description = "Date Api that support Hijri Umalqurra calendar"; - homepage = https://github.com/tytkal/python-hijiri-ummalqura; + homepage = "https://github.com/tytkal/python-hijiri-ummalqura"; license = with licenses; [ publicDomain ]; }; diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index 465c02beb4f4e..9979183c497b6 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -42,7 +42,7 @@ def test_umap_transform_on_iris()" meta = with lib; { description = "Uniform Manifold Approximation and Projection"; - homepage = https://github.com/lmcinnes/umap; + homepage = "https://github.com/lmcinnes/umap"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/umemcache/default.nix b/pkgs/development/python-modules/umemcache/default.nix index 95c0d628697c9..07bb181958adf 100644 --- a/pkgs/development/python-modules/umemcache/default.nix +++ b/pkgs/development/python-modules/umemcache/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Ultra fast memcache client written in highly optimized C++ with Python bindings"; - homepage = https://github.com/esnme/ultramemcache; + homepage = "https://github.com/esnme/ultramemcache"; license = licenses.bsdOriginal; }; } diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index f2c02c8a6c67b..2e87565554c66 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://pythonhosted.org/uncertainties/; + homepage = "https://pythonhosted.org/uncertainties/"; description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; maintainers = with maintainers; [ rnhmjoj ]; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index c03e8724d3dd1..a598591b0f083 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python cross-version byte-code deparser"; - homepage = https://github.com/rocky/python-uncompyle6/; + homepage = "https://github.com/rocky/python-uncompyle6/"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/unicodecsv/default.nix b/pkgs/development/python-modules/unicodecsv/default.nix index d0f54a7c6b2b5..83ef602de600e 100644 --- a/pkgs/development/python-modules/unicodecsv/default.nix +++ b/pkgs/development/python-modules/unicodecsv/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Drop-in replacement for Python2's stdlib csv module, with unicode support"; - homepage = https://github.com/jdunck/python-unicodecsv; + homepage = "https://github.com/jdunck/python-unicodecsv"; maintainers = with maintainers; [ koral ]; }; diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix index 8d3ecc5437759..0ff066850ddb7 100644 --- a/pkgs/development/python-modules/unidecode/default.nix +++ b/pkgs/development/python-modules/unidecode/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { buildInputs = [ glibcLocales ]; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/Unidecode/; + homepage = "https://pypi.python.org/pypi/Unidecode/"; description = "ASCII transliterations of Unicode text"; license = licenses.gpl2; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/unidiff/default.nix b/pkgs/development/python-modules/unidiff/default.nix index 81e9019f489ca..d1e18111db318 100644 --- a/pkgs/development/python-modules/unidiff/default.nix +++ b/pkgs/development/python-modules/unidiff/default.nix @@ -2,19 +2,19 @@ buildPythonPackage rec { pname = "unidiff"; - version = "0.5.5"; + version = "0.6.0"; # PyPI tarball doesn't ship tests src = fetchFromGitHub { owner = "matiasb"; repo = "python-unidiff"; rev = "v${version}"; - sha256 = "1nvi7s1nn5p7j6aql1nkn2kiadnfby98yla5m3jq8xwsx0aplwdm"; + sha256 = "0farwkw0nbb5h4369pq3i6pp4047hav0h88ba55rzz5k7mr25rgi"; }; meta = with lib; { description = "Unified diff python parsing/metadata extraction library"; - homepage = https://github.com/matiasb/python-unidiff; + homepage = "https://github.com/matiasb/python-unidiff"; license = licenses.mit; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/python-modules/unifi/default.nix b/pkgs/development/python-modules/unifi/default.nix index d7a8e6eaf04d4..4d2eae618c32f 100644 --- a/pkgs/development/python-modules/unifi/default.nix +++ b/pkgs/development/python-modules/unifi/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An API towards the Ubiquity Networks UniFi controller"; - homepage = https://pypi.python.org/pypi/unifi/; + homepage = "https://pypi.python.org/pypi/unifi/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/units/default.nix b/pkgs/development/python-modules/units/default.nix index 02a3fc940aeef..13ae42823ff10 100644 --- a/pkgs/development/python-modules/units/default.nix +++ b/pkgs/development/python-modules/units/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python support for quantities with units"; - homepage = https://bitbucket.org/adonohue/units/; + homepage = "https://bitbucket.org/adonohue/units/"; license = licenses.psfl; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/unittest-data-provider/default.nix b/pkgs/development/python-modules/unittest-data-provider/default.nix index ec34a451156dc..67a3cf313aecf 100644 --- a/pkgs/development/python-modules/unittest-data-provider/default.nix +++ b/pkgs/development/python-modules/unittest-data-provider/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "PHPUnit-like @dataprovider decorator for unittest"; - homepage = https://github.com/yourlabs/unittest-data-provider; + homepage = "https://github.com/yourlabs/unittest-data-provider"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix index 8d815833a4075..f39876d6396ae 100644 --- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "9d28ddf6524cf0ff9293f61bd12e792de298f8561a5c945acea63fb437789e0e"; }; meta = with lib; { - homepage = https://github.com/xmlrunner/unittest-xml-reporting/tree/master/; + homepage = "https://github.com/xmlrunner/unittest-xml-reporting/tree/master/"; description = "A unittest runner that can save test results to XML files"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ rprospero ]; diff --git a/pkgs/development/python-modules/unittest2/default.nix b/pkgs/development/python-modules/unittest2/default.nix index 85ca7157e12ce..65774d1e33ab0 100644 --- a/pkgs/development/python-modules/unittest2/default.nix +++ b/pkgs/development/python-modules/unittest2/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A backport of the new features added to the unittest testing framework"; - homepage = https://pypi.python.org/pypi/unittest2; + homepage = "https://pypi.python.org/pypi/unittest2"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/unpaddedbase64/default.nix b/pkgs/development/python-modules/unpaddedbase64/default.nix index b69f894cb5cb8..bcb902e5bfdb2 100644 --- a/pkgs/development/python-modules/unpaddedbase64/default.nix +++ b/pkgs/development/python-modules/unpaddedbase64/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/matrix-org/python-unpaddedbase64; + homepage = "https://github.com/matrix-org/python-unpaddedbase64"; description = "Unpadded Base64"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/unrpa/default.nix b/pkgs/development/python-modules/unrpa/default.nix new file mode 100644 index 0000000000000..aad23c6fdf9f4 --- /dev/null +++ b/pkgs/development/python-modules/unrpa/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, uncompyle6, isPy27 }: + +buildPythonPackage rec { + pname = "unrpa"; + version = "2.3.0"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0yl4qdwp3in170ks98qnldqz3r2iyzil5g1775ccg98qkh95s724"; + }; + + propagatedBuildInputs = [ uncompyle6 ]; + + pythonImportsCheck = [ "unrpa" ]; + + meta = with lib; { + homepage = "https://github.com/Lattyware/unrpa"; + description = "A program to extract files from the RPA archive format"; + license = licenses.gpl3; + maintainers = with maintainers; [ leo60228 ]; + }; +} diff --git a/pkgs/development/python-modules/untangle/default.nix b/pkgs/development/python-modules/untangle/default.nix index f8f172e78b135..9b8e915a8ba7b 100644 --- a/pkgs/development/python-modules/untangle/default.nix +++ b/pkgs/development/python-modules/untangle/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convert XML documents into Python objects"; - homepage = "http://github.com/stchris/untangle"; + homepage = "https://github.com/stchris/untangle"; license = licenses.mit; maintainers = [ maintainers.arnoldfarkas ]; }; diff --git a/pkgs/development/python-modules/upass/default.nix b/pkgs/development/python-modules/upass/default.nix index baf536fdbadd9..2d532be36404f 100644 --- a/pkgs/development/python-modules/upass/default.nix +++ b/pkgs/development/python-modules/upass/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Console UI for pass"; - homepage = https://github.com/Kwpolska/upass; + homepage = "https://github.com/Kwpolska/upass"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/update-copyright/default.nix b/pkgs/development/python-modules/update-copyright/default.nix index 9ff1137fb5656..169c361e50743 100644 --- a/pkgs/development/python-modules/update-copyright/default.nix +++ b/pkgs/development/python-modules/update-copyright/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "An automatic copyright update tool"; - homepage = http://blog.tremily.us/posts/update-copyright; + homepage = "http://blog.tremily.us/posts/update-copyright"; license = licenses.gpl3; }; } diff --git a/pkgs/development/python-modules/update-dotdee/default.nix b/pkgs/development/python-modules/update-dotdee/default.nix index b537ca8c264a9..ec9dbd947c089 100644 --- a/pkgs/development/python-modules/update-dotdee/default.nix +++ b/pkgs/development/python-modules/update-dotdee/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generic modularized configuration file manager"; - homepage = https://github.com/xolox/python-update-dotdee; + homepage = "https://github.com/xolox/python-update-dotdee"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; }; diff --git a/pkgs/development/python-modules/update_checker/default.nix b/pkgs/development/python-modules/update_checker/default.nix index ad401d80190d1..913c8903e9ea7 100644 --- a/pkgs/development/python-modules/update_checker/default.nix +++ b/pkgs/development/python-modules/update_checker/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python module that will check for package updates"; - homepage = https://github.com/bboe/update_checker; + homepage = "https://github.com/bboe/update_checker"; license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix index 7e7994392747b..47fc285a5463a 100644 --- a/pkgs/development/python-modules/uproot-methods/default.nix +++ b/pkgs/development/python-modules/uproot-methods/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/scikit-hep/uproot-methods; + homepage = "https://github.com/scikit-hep/uproot-methods"; description = "Pythonic mix-ins for ROOT classes"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/uptime/default.nix b/pkgs/development/python-modules/uptime/default.nix index 035acbcec2b6d..0e1d10f7ae5e0 100644 --- a/pkgs/development/python-modules/uptime/default.nix +++ b/pkgs/development/python-modules/uptime/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/Cairnarvon/uptime; + homepage = "https://github.com/Cairnarvon/uptime"; description = "Cross-platform way to retrieve system uptime and boot time"; license = licenses.bsd2; maintainers = with maintainers; [ rob ]; diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 64333f23929c0..af13fa8d17af0 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -2,7 +2,7 @@ , pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }: buildPythonPackage rec { - version = "4.5.0"; + version = "4.6.1"; pname = "uranium"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "1l8fwj521irla42bdbw298d3c5rjpn1nm9xhjnx7hidbqixr5d27"; + sha256 = "07pksjbgxs1ks2i6pgxkwfg9c56pcql7f9p89dnwaf2rcn7yhx6r"; }; disabled = pythonOlder "3.5.0"; @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python framework for building Desktop applications"; - homepage = https://github.com/Ultimaker/Uranium; + homepage = "https://github.com/Ultimaker/Uranium"; license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar gebner ]; diff --git a/pkgs/development/python-modules/uritemplate/default.nix b/pkgs/development/python-modules/uritemplate/default.nix index 64a2fd51ee3b8..5077267528a5f 100644 --- a/pkgs/development/python-modules/uritemplate/default.nix +++ b/pkgs/development/python-modules/uritemplate/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/python-hyper/uritemplate; + homepage = "https://github.com/python-hyper/uritemplate"; description = "URI template parsing for Humans"; license = with licenses; [ asl20 bsd3 ]; maintainers = with maintainers; [ matthiasbeyer ]; diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix index f81a6d814e9f9..7af69e5ded89e 100644 --- a/pkgs/development/python-modules/urlgrabber/default.nix +++ b/pkgs/development/python-modules/urlgrabber/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pycurl six ]; meta = with stdenv.lib; { - homepage = http://urlgrabber.baseurl.org; + homepage = "http://urlgrabber.baseurl.org"; license = licenses.lgpl2Plus; description = "Python module for downloading files"; maintainers = with maintainers; [ qknight ]; diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index ce1e8490c9fb4..5abf99670c19b 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Powerful, sanity-friendly HTTP client for Python"; - homepage = https://github.com/shazow/urllib3; + homepage = "https://github.com/shazow/urllib3"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 8e255dc69dc0d..3e71cae26e394 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -15,8 +15,8 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A full-featured console (xterm et al.) user interface library"; - homepage = http://excess.org/urwid; - repositories.git = git://github.com/wardi/urwid.git; + homepage = "http://excess.org/urwid"; + repositories.git = "git://github.com/wardi/urwid.git"; license = licenses.lgpl21; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix index 468420f0e5ceb..1b5c58b9ca508 100644 --- a/pkgs/development/python-modules/urwidtrees/default.nix +++ b/pkgs/development/python-modules/urwidtrees/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tree widgets for urwid"; - homepage = https://github.com/pazz/urwidtrees; + homepage = "https://github.com/pazz/urwidtrees"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/us/default.nix b/pkgs/development/python-modules/us/default.nix index 53b5bc9ad166f..307f6fd752456 100644 --- a/pkgs/development/python-modules/us/default.nix +++ b/pkgs/development/python-modules/us/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { state name lookup, is contiguous or continental, URLs to shapefiles for state, census, congressional districts, counties, and census tracts ''; - homepage = https://github.com/unitedstates/python-us/; + homepage = "https://github.com/unitedstates/python-us/"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix index 8b397d3c42c6f..34e6025dcfb6c 100644 --- a/pkgs/development/python-modules/usbtmc/default.nix +++ b/pkgs/development/python-modules/usbtmc/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python implementation of the USBTMC instrument control protocol"; - homepage = http://alexforencich.com/wiki/en/python-usbtmc/start; + homepage = "http://alexforencich.com/wiki/en/python-usbtmc/start"; license = licenses.mit; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/pkgs/development/python-modules/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix index 827ef72d2eb8a..80985eed48120 100644 --- a/pkgs/development/python-modules/user-agents/default.nix +++ b/pkgs/development/python-modules/user-agents/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python library to identify devices by parsing user agent strings"; - homepage = https://github.com/selwin/python-user-agents; + homepage = "https://github.com/selwin/python-user-agents"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/uuid/default.nix b/pkgs/development/python-modules/uuid/default.nix index 5e31f6ccad09b..c7bcb77007017 100644 --- a/pkgs/development/python-modules/uuid/default.nix +++ b/pkgs/development/python-modules/uuid/default.nix @@ -11,6 +11,6 @@ buildPythonPackage rec { meta = with lib; { description = "UUID object and generation functions (Python 2.3 or higher)"; - homepage = http://zesty.ca/python/; + homepage = "http://zesty.ca/python/"; }; } diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index f6cc91413c039..d839c421ea0a8 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://www.uvicorn.org/; + homepage = "https://www.uvicorn.org/"; description = "The lightning-fast ASGI server"; license = licenses.bsd3; maintainers = with maintainers; [ wd15 ]; diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix index 5efd676f53ddb..c6dee84da3065 100644 --- a/pkgs/development/python-modules/validators/default.nix +++ b/pkgs/development/python-modules/validators/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Data Validation for Humans™"; - homepage = https://github.com/kvesteri/validators; + homepage = "https://github.com/kvesteri/validators"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/validictory/default.nix b/pkgs/development/python-modules/validictory/default.nix index c27d13ab8f120..81e80375e6801 100644 --- a/pkgs/development/python-modules/validictory/default.nix +++ b/pkgs/development/python-modules/validictory/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Validate dicts against a schema"; - homepage = https://github.com/sunlightlabs/validictory; + homepage = "https://github.com/sunlightlabs/validictory"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index c518314d96496..ddd4015aad1e7 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automatically mock your HTTP interactions to simplify and speed up testing"; - homepage = https://github.com/kevin1024/vcrpy; + homepage = "https://github.com/kevin1024/vcrpy"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/vcversioner/default.nix b/pkgs/development/python-modules/vcversioner/default.nix index ffe184e263ab9..5f7f30e2c336e 100644 --- a/pkgs/development/python-modules/vcversioner/default.nix +++ b/pkgs/development/python-modules/vcversioner/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "take version numbers from version control"; - homepage = https://github.com/habnabit/vcversioner; + homepage = "https://github.com/habnabit/vcversioner"; license = licenses.isc; }; } diff --git a/pkgs/development/python-modules/vdf/default.nix b/pkgs/development/python-modules/vdf/default.nix index 2ce3e24f4cd5e..7d4e3e34b86dd 100644 --- a/pkgs/development/python-modules/vdf/default.nix +++ b/pkgs/development/python-modules/vdf/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "vdf"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "ValvePython"; repo = pname; rev = "v${version}"; - sha256 = "08rb982hcwc9pr9gl0zfk9266h84fwbz097qjfkss3srwghr1247"; + sha256 = "0d9bhxdznry7kzyma00cxwjn6rqnd6vw8v5ym68k6qswgfzb569i"; }; checkInputs = [ pytest pytestcov mock ]; @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library for working with Valve's VDF text format"; - homepage = https://github.com/ValvePython/vdf; + homepage = "https://github.com/ValvePython/vdf"; license = licenses.mit; maintainers = with maintainers; [ metadark ]; }; diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 3ee7787a8a450..1a5494634bb03 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -1,11 +1,36 @@ -{ stdenv, python3Packages, fetchFromGitHub, fetchpatch, rustPlatform, pkgconfig, openssl, CoreServices, Security }: +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, fetchpatch +, rustPlatform +, pkg-config +, openssl +, CoreServices +, Security +, click +, click-log +, click-threading +, requests_toolbelt +, requests +, requests_oauthlib # required for google oauth sync +, atomicwrites +, milksnake +, shippai +, hypothesis +, pytest +, pytest-localserver +, pytest-subtesthack +, setuptools_scm +}: # Packaging documentation at: # https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst -python3Packages.buildPythonApplication rec { +buildPythonPackage rec { version = "unstable-2018-08-05"; pname = "vdirsyncer"; name = "${pname}-${version}"; + disabled = isPy27; src = fetchFromGitHub { owner = "spk"; @@ -20,11 +45,11 @@ python3Packages.buildPythonApplication rec { inherit src; sourceRoot = "source/rust"; cargoSha256 = "0cqy0s55pkg6hww86h7qip4xaidh6g8lcypdj84n2x374jq38c5d"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ click click-log click-threading requests_toolbelt requests @@ -34,9 +59,16 @@ python3Packages.buildPythonApplication rec { shippai ]; - nativeBuildInputs = with python3Packages; [ setuptools_scm ]; + nativeBuildInputs = [ + setuptools_scm + ]; - checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ]; + checkInputs = [ + hypothesis + pytest + pytest-localserver + pytest-subtesthack + ]; patches = [ (fetchpatch { @@ -53,6 +85,9 @@ python3Packages.buildPythonApplication rec { echo 'Version: ${version}' >PKG-INFO sed -i 's/spec.add_external_build(cmd=cmd/spec.add_external_build(cmd="true"/g' setup.py + + # fixing test + sed -i "s/invalid value for \"--verbosity\"/invalid value for \\\'--verbosity\\\'/" tests/system/cli/test_sync.py ''; preBuild = '' @@ -62,11 +97,11 @@ python3Packages.buildPythonApplication rec { checkPhase = '' rm -rf vdirsyncer - make DETERMINISTIC_TESTS=true test + make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/unit/utils/test_vobject.py::test_replace_uid --deselect=tests/unit/sync/test_sync.py::TestSyncMachine" test ''; meta = with stdenv.lib; { - homepage = https://github.com/pimutils/vdirsyncer; + homepage = "https://github.com/pimutils/vdirsyncer"; description = "Synchronize calendars and contacts"; maintainers = with maintainers; [ matthiasbeyer gebner ]; license = licenses.mit; diff --git a/pkgs/development/python-modules/vdirsyncer/stable.nix b/pkgs/development/python-modules/vdirsyncer/stable.nix new file mode 100644 index 0000000000000..cb90bfbc59886 --- /dev/null +++ b/pkgs/development/python-modules/vdirsyncer/stable.nix @@ -0,0 +1,88 @@ +{ stdenv +, pythonAtLeast +, buildPythonPackage +, fetchPypi +, isPy27 +, fetchpatch +, click +, click-log +, click-threading +, requests_toolbelt +, requests +, requests_oauthlib # required for google oauth sync +, atomicwrites +, milksnake +, shippai +, hypothesis +, pytest +, pytest-localserver +, pytest-subtesthack +, setuptools_scm +}: + +# Packaging documentation at: +# https://github.com/pimutils/vdirsyncer/blob/0.16.7/docs/packaging.rst +buildPythonPackage rec { + version = "0.16.7"; + pname = "vdirsyncer"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "6c9bcfb9bcb01246c83ba6f8551cf54c58af3323210755485fc23bb7848512ef"; + }; + + propagatedBuildInputs = [ + click click-log click-threading + requests_toolbelt + requests + requests_oauthlib # required for google oauth sync + atomicwrites + ]; + + nativeBuildInputs = [ + setuptools_scm + ]; + + checkInputs = [ + hypothesis + pytest + pytest-localserver + pytest-subtesthack + ]; + + patches = [ + # Fixes for hypothesis: https://github.com/pimutils/vdirsyncer/pull/779 + (fetchpatch { + url = "https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch"; + sha256 = "0dbzj6jlxhdidnm3i21a758z83sdiwzhpd45pbkhycfhgmqmhjpl"; + }) + ]; + + postPatch = '' + # Invalid argument: 'perform_health_check' is not a valid setting + substituteInPlace tests/conftest.py \ + --replace "perform_health_check=False" "" + substituteInPlace tests/unit/test_repair.py \ + --replace $'@settings(perform_health_check=False) # Using the random module for UIDs\n' "" + ''; + + checkPhase = '' + make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/system/cli/test_sync.py::test_verbosity" test + ''; + # Tests started to fail lately, for any python version even as low as 3.5 but + # if you enable the check, you'll see even severer errors with a higher then + # 3.5 python version. Hence it's marked as broken for higher then 3.5 and the + # checks are disabled unconditionally. As a general end user advice, use the + # normal "unstable" `vdirsyncer` derivation, not this one. + doCheck = false; + + meta = with stdenv.lib; { + homepage = "https://github.com/pimutils/vdirsyncer"; + description = "Synchronize calendars and contacts"; + license = licenses.mit; + # vdirsyncer (unstable) works with mainline python versions + broken = (pythonAtLeast "3.6"); + maintainers = with maintainers; [ loewenheim ]; + }; +} diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 73485329ef760..4bd3f1b993182 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { jupyter nbextension install --user --py vega jupyter nbextension enable --user vega ''; - homepage = https://github.com/vega/ipyvega; + homepage = "https://github.com/vega/ipyvega"; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/vega_datasets/default.nix b/pkgs/development/python-modules/vega_datasets/default.nix index f028f85f3ec53..5845557c54c15 100644 --- a/pkgs/development/python-modules/vega_datasets/default.nix +++ b/pkgs/development/python-modules/vega_datasets/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python package for offline access to vega datasets"; - homepage = https://github.com/altair-viz/vega_datasets; + homepage = "https://github.com/altair-viz/vega_datasets"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 7a67fdf727b3d..8817b057cc94f 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library for deferring decorator actions"; - homepage = https://pylonsproject.org/; + homepage = "https://pylonsproject.org/"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/verboselogs/default.nix b/pkgs/development/python-modules/verboselogs/default.nix index f4c78858913b7..99eb80530ef5b 100644 --- a/pkgs/development/python-modules/verboselogs/default.nix +++ b/pkgs/development/python-modules/verboselogs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Verbose logging for Python's logging module"; - homepage = https://github.com/xolox/python-verboselogs; + homepage = "https://github.com/xolox/python-verboselogs"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; }; diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index a33286714173b..8094a15a32e76 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Version-string management for VCS-controlled trees"; - homepage = https://github.com/warner/python-versioneer; + homepage = "https://github.com/warner/python-versioneer"; license = licenses.publicDomain; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/versiontools/default.nix b/pkgs/development/python-modules/versiontools/default.nix index e92dbae8138e0..ea282c22ddc8e 100644 --- a/pkgs/development/python-modules/versiontools/default.nix +++ b/pkgs/development/python-modules/versiontools/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = (!isPy3k); meta = with stdenv.lib; { - homepage = https://launchpad.net/versiontools; + homepage = "https://launchpad.net/versiontools"; description = "Smart replacement for plain tuple used in __version__"; license = licenses.lgpl2; }; diff --git a/pkgs/development/python-modules/veryprettytable/default.nix b/pkgs/development/python-modules/veryprettytable/default.nix index 8d71e6331f5b2..eff996c3ae4c8 100644 --- a/pkgs/development/python-modules/veryprettytable/default.nix +++ b/pkgs/development/python-modules/veryprettytable/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A simple Python library for easily displaying tabular data in a visually appealing ASCII table format"; - homepage = https://github.com/smeggingsmegger/VeryPrettyTable; + homepage = "https://github.com/smeggingsmegger/VeryPrettyTable"; license = licenses.free; }; diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix index 55d618899fd75..895699df9549c 100644 --- a/pkgs/development/python-modules/vidstab/default.nix +++ b/pkgs/development/python-modules/vidstab/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/AdamSpannbauer/python_video_stab; + homepage = "https://github.com/AdamSpannbauer/python_video_stab"; description = "Video Stabilization using OpenCV"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix index c3ee5237935ea..ce5756656bcbf 100644 --- a/pkgs/development/python-modules/vine/default.nix +++ b/pkgs/development/python-modules/vine/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python promises"; - homepage = https://github.com/celery/vine; + homepage = "https://github.com/celery/vine"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/virtkey/default.nix b/pkgs/development/python-modules/virtkey/default.nix index cf62704e8bec4..9ab89e9ac0dda 100644 --- a/pkgs/development/python-modules/virtkey/default.nix +++ b/pkgs/development/python-modules/virtkey/default.nix @@ -18,7 +18,7 @@ in buildPythonPackage rec { meta = with lib; { description = "Extension to emulate keypresses and to get the layout information from the X server"; - homepage = https://launchpad.net/virtkey; + homepage = "https://launchpad.net/virtkey"; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 62c86567655bb..df4c191bd5479 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -1,30 +1,53 @@ { buildPythonPackage , fetchPypi , lib -, recursivePthLoader +, stdenv +, pythonOlder +, isPy27 +, appdirs +, contextlib2 +, distlib +, filelock +, importlib-metadata +, importlib-resources +, pathlib2 +, setuptools_scm +, six }: buildPythonPackage rec { pname = "virtualenv"; - version = "16.7.9"; + version = "20.0.21"; src = fetchPypi { inherit pname version; - sha256 = "0d62c70883c0342d59c11d0ddac0d954d0431321a41ab20851facf2b222598f3"; - }; + sha256 = "1kxnxxwa25ghlkpyrxa8pi49v87b7ps2gyla7d1h6kbz9sfn45m1"; - # Doubt this is needed - FRidh 2017-07-07 - pythonPath = [ recursivePthLoader ]; + }; - patches = [ ./virtualenv-change-prefix.patch ]; + nativeBuildInputs = [ + setuptools_scm + ]; - # Tarball doesn't contain tests - doCheck = false; + propagatedBuildInputs = [ + appdirs + distlib + filelock + six + ] ++ lib.optionals isPy27 [ + contextlib2 + ] ++ lib.optionals (isPy27 && !stdenv.hostPlatform.isWindows) [ + pathlib2 + ] ++ lib.optionals (pythonOlder "3.7") [ + importlib-resources + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; meta = { description = "A tool to create isolated Python environments"; - homepage = http://www.virtualenv.org; + homepage = "http://www.virtualenv.org"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ goibhniu ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch b/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch deleted file mode 100644 index f3e8ea854f6a0..0000000000000 --- a/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch +++ /dev/null @@ -1,62 +0,0 @@ -Without this patch `virtualenv --python=python2.7 .` fails with an -error because it notices that the python readline.so is not in the -same path as python2.7. I assume this is to avoid copying the wrong -file on systems where it is possible to find incompatible libraries by -accident. Adding "/nix/store" to the prefix fixes this problem. - -A sitecustomize.py is created in the virtualenv which makes libraries -from the python specified by the --python argument available to the -virtualenv. For example, this makes readline and sqlite3 available -when a wrapped python is specified. If no --python argument is passed, -it will only add the path to the python used when building -`virtualenv`, which is the unwrapped python, so sqlite3 won't be -available. - - -diff --git a/virtualenv.py b/virtualenv.py -index bcf3225..3530997 100755 ---- a/virtualenv.py -+++ b/virtualenv.py -@@ -1163,20 +1163,7 @@ def path_locations(home_dir, dry_run=False): - - - def change_prefix(filename, dst_prefix): -- prefixes = [sys.prefix] -- -- if IS_DARWIN: -- prefixes.extend( -- ( -- os.path.join("/Library/Python", VERSION, "site-packages"), -- os.path.join(sys.prefix, "Extras", "lib", "python"), -- os.path.join("~", "Library", "Python", VERSION, "site-packages"), -- # Python 2.6 no-frameworks -- os.path.join("~", ".local", "lib", "python", VERSION, "site-packages"), -- # System Python 2.7 on OSX Mountain Lion -- os.path.join("~", "Library", "Python", VERSION, "lib", "python", "site-packages"), -- ) -- ) -+ prefixes = ["/nix/store", sys.prefix] - - if hasattr(sys, "real_prefix"): - prefixes.append(sys.real_prefix) -@@ -1199,6 +1186,8 @@ def change_prefix(filename, dst_prefix): - if src_prefix != os.sep: # sys.prefix == "/" - assert relative_path[0] == os.sep - relative_path = relative_path[1:] -+ if src_prefix == "/nix/store": -+ relative_path = "/".join(relative_path.split("/")[1:]) - return join(dst_prefix, relative_path) - assert False, "Filename {} does not start with any of these prefixes: {}".format(filename, prefixes) - -@@ -1375,6 +1364,11 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy - site_filename_dst = change_prefix(site_filename, home_dir) - site_dir = os.path.dirname(site_filename_dst) - writefile(site_filename_dst, SITE_PY) -+ wrapper_path = join(prefix, "lib", PY_VERSION, "site-packages") -+ writefile( -+ join(site_dir, 'sitecustomize.py',), -+ "import sys; sys.path.append('%s')" % wrapper_path -+ ) - writefile(join(site_dir, "orig-prefix.txt"), prefix) - site_packages_filename = join(site_dir, "no-global-site-packages.txt") - if not site_packages: diff --git a/pkgs/development/python-modules/visitor/default.nix b/pkgs/development/python-modules/visitor/default.nix index 78dc29bbeb0e1..1c0d725ac86b6 100644 --- a/pkgs/development/python-modules/visitor/default.nix +++ b/pkgs/development/python-modules/visitor/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = https://github.com/mbr/visitor; + homepage = "https://github.com/mbr/visitor"; description = "A tiny pythonic visitor implementation"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix index a9eb492c01e4b..70e7dbeba6975 100644 --- a/pkgs/development/python-modules/vmprof/default.nix +++ b/pkgs/development/python-modules/vmprof/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A vmprof client"; license = licenses.mit; - homepage = https://vmprof.readthedocs.org/; + homepage = "https://vmprof.readthedocs.org/"; broken = true; }; diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix index 95cf6efaa46af..1bb87d9d12223 100644 --- a/pkgs/development/python-modules/vobject/default.nix +++ b/pkgs/development/python-modules/vobject/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for reading vCard and vCalendar files"; - homepage = http://eventable.github.io/vobject/; + homepage = "http://eventable.github.io/vobject/"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix index 4a27252e060c3..f310148d75d49 100644 --- a/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/balloob/voluptuous-serialize; + homepage = "https://github.com/balloob/voluptuous-serialize"; license = licenses.asl20; description = "Convert Voluptuous schemas to dictionaries so they can be serialized"; maintainers = with maintainers; [ etu ]; diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix index 70512edf40018..6dd8ab8693891 100644 --- a/pkgs/development/python-modules/voluptuous/default.nix +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Voluptuous is a Python data validation library"; - homepage = http://alecthomas.github.io/voluptuous/; + homepage = "http://alecthomas.github.io/voluptuous/"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/vsts/default.nix b/pkgs/development/python-modules/vsts/default.nix index 0f49ffd05c605..8095ccf98f0c1 100644 --- a/pkgs/development/python-modules/vsts/default.nix +++ b/pkgs/development/python-modules/vsts/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python APIs for interacting with and managing Azure DevOps"; - homepage = https://github.com/microsoft/azure-devops-python-api; + homepage = "https://github.com/microsoft/azure-devops-python-api"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/vxi11/default.nix b/pkgs/development/python-modules/vxi11/default.nix index 7bae1e9860be7..15a9d7073abc4 100644 --- a/pkgs/development/python-modules/vxi11/default.nix +++ b/pkgs/development/python-modules/vxi11/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "VXI-11 driver for controlling instruments over Ethernet"; - homepage = https://github.com/python-ivi/python-vxi11; + homepage = "https://github.com/python-ivi/python-vxi11"; license = licenses.mit; maintainers = with maintainers; [ bgamari ]; }; diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index acbe03793db33..72da3204a646f 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/Pylons/waitress; + homepage = "https://github.com/Pylons/waitress"; description = "Waitress WSGI server"; license = licenses.zpl20; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix index b5c9e14da355a..dd947c0555ce3 100644 --- a/pkgs/development/python-modules/wakeonlan/default.nix +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A small python module for wake on lan"; - homepage = https://github.com/remcohaszing/pywakeonlan; + homepage = "https://github.com/remcohaszing/pywakeonlan"; license = licenses.wtfpl; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix index bc298b2794df4..34815f99a94c5 100644 --- a/pkgs/development/python-modules/warlock/default.nix +++ b/pkgs/development/python-modules/warlock/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six jsonpatch jsonschema jsonpointer ]; meta = with stdenv.lib; { - homepage = https://github.com/bcwaldon/warlock; + homepage = "https://github.com/bcwaldon/warlock"; description = "Python object model built on JSON schema and JSON patch"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix index 7cf69fdb614da..a4bbee43d012b 100644 --- a/pkgs/development/python-modules/warrant/default.nix +++ b/pkgs/development/python-modules/warrant/default.nix @@ -37,7 +37,7 @@ buildPythonPackage { meta = with lib; { description = "Python library for using AWS Cognito with support for SRP"; - homepage = https://github.com/capless/warrant; + homepage = "https://github.com/capless/warrant"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index 8a6af2e69dbbe..1865b5792b164 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A lightweight console printing and formatting toolkit"; - homepage = https://github.com/ines/wasabi; + homepage = "https://github.com/ines/wasabi"; license = licenses.mit; maintainers = with maintainers; [ danieldk ]; }; diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 361baea49167a..5347c696cc225 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "watchdog"; - version = "0.9.0"; + version = "0.10.2"; src = fetchPypi { inherit pname version; - sha256 = "965f658d0732de3188211932aeb0bb457587f04f63ab4c1e33eab878e9de961d"; + sha256 = "0ss58k33l5vah894lykid6ar6kw7z1f29cl4hzr5xvgs8fvfyq65"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python API and shell utilities to monitor file system events"; - homepage = https://github.com/gorakhargosh/watchdog; + homepage = "https://github.com/gorakhargosh/watchdog"; license = licenses.asl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix index 39ce62ca47c79..4b604bd2c6ac6 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { a Terminal. It is implemented in python (no C library calls) and has no 3rd-party dependencies. ''; - homepage = https://github.com/jquast/wcwidth; + homepage = "https://github.com/jquast/wcwidth"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index f112d6f15557b..c1eaa1fd75437 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://weasyprint.org/; + homepage = "https://weasyprint.org/"; description = "Converts web documents to PDF"; license = licenses.bsd3; maintainers = with maintainers; [ elohmeier ]; diff --git a/pkgs/development/python-modules/webapp2/default.nix b/pkgs/development/python-modules/webapp2/default.nix index 584440eab6ae9..01c1ca309d4c2 100644 --- a/pkgs/development/python-modules/webapp2/default.nix +++ b/pkgs/development/python-modules/webapp2/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Taking Google App Engine's webapp to the next level"; - homepage = http://webapp-improved.appspot.com; + homepage = "http://webapp-improved.appspot.com"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/webassets/default.nix b/pkgs/development/python-modules/webassets/default.nix index 4556eefed2dd3..176d2f6616087 100644 --- a/pkgs/development/python-modules/webassets/default.nix +++ b/pkgs/development/python-modules/webassets/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Media asset management for Python, with glue code for various web frameworks"; - homepage = https://github.com/miracle2k/webassets/; + homepage = "https://github.com/miracle2k/webassets/"; license = licenses.bsd2; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/webcolors/default.nix b/pkgs/development/python-modules/webcolors/default.nix index 3ca97c4556ce3..e0e2f97501be3 100644 --- a/pkgs/development/python-modules/webcolors/default.nix +++ b/pkgs/development/python-modules/webcolors/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Library for working with color names/values defined by the HTML and CSS specifications"; - homepage = https://bitbucket.org/ubernostrum/webcolors/overview/; + homepage = "https://bitbucket.org/ubernostrum/webcolors/overview/"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/webencodings/default.nix b/pkgs/development/python-modules/webencodings/default.nix index c4ab0dd59cad4..fa89241d7d8f9 100644 --- a/pkgs/development/python-modules/webencodings/default.nix +++ b/pkgs/development/python-modules/webencodings/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "Character encoding aliases for legacy web content"; - homepage = https://github.com/SimonSapin/python-webencodings; + homepage = "https://github.com/SimonSapin/python-webencodings"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/webhelpers/default.nix b/pkgs/development/python-modules/webhelpers/default.nix index 37f9735f47c2c..d88f8210ae1dc 100644 --- a/pkgs/development/python-modules/webhelpers/default.nix +++ b/pkgs/development/python-modules/webhelpers/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://webhelpers.readthedocs.org/en/latest/; + homepage = "https://webhelpers.readthedocs.org/en/latest/"; description = "Web Helpers"; license = licenses.free; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix index bd2e0574a4766..77e91feebac67 100644 --- a/pkgs/development/python-modules/webob/default.nix +++ b/pkgs/development/python-modules/webob/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "WSGI request and response object"; - homepage = http://pythonpaste.org/webob/; + homepage = "http://pythonpaste.org/webob/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/webrtcvad/default.nix b/pkgs/development/python-modules/webrtcvad/default.nix index 7bd0f20bfa134..f90d0b97bee6d 100644 --- a/pkgs/development/python-modules/webrtcvad/default.nix +++ b/pkgs/development/python-modules/webrtcvad/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Interface to the Google WebRTC Voice Activity Detector (VAD)"; - homepage = https://github.com/wiseman/py-webrtcvad; + homepage = "https://github.com/wiseman/py-webrtcvad"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index 484cc33b1f3ed..e885a1ba9b724 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "WebSockets support for any application/server"; - homepage = https://github.com/kanaka/websockify; + homepage = "https://github.com/kanaka/websockify"; license = licenses.lgpl3; }; diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index d97d58b2e5d24..48acb6c881de8 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Helper to test WSGI applications"; - homepage = https://webtest.readthedocs.org/en/latest/; + homepage = "https://webtest.readthedocs.org/en/latest/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/wget/default.nix b/pkgs/development/python-modules/wget/default.nix index 2ffd747d04dd5..a86b693affa42 100644 --- a/pkgs/development/python-modules/wget/default.nix +++ b/pkgs/development/python-modules/wget/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = { description = "Pure python download utility"; - homepage = https://bitbucket.org/techtonik/python-wget/; + homepage = "https://bitbucket.org/techtonik/python-wget/"; license = with lib.licenses; [ unlicense ]; maintainers = with lib.maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index 8b6aa35b1ac6e..4527006fadd55 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { meta = { description = "A built-package format for Python"; license = with lib.licenses; [ mit ]; - homepage = https://bitbucket.org/pypa/wheel/; + homepage = "https://bitbucket.org/pypa/wheel/"; }; } diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix index de6c4c570ccb9..b771615ebbddf 100644 --- a/pkgs/development/python-modules/whichcraft/default.nix +++ b/pkgs/development/python-modules/whichcraft/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/pydanny/whichcraft; + homepage = "https://github.com/pydanny/whichcraft"; description = "Cross-platform cross-python shutil.which functionality"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix index 565032ad523bd..9ef4fd14979d3 100644 --- a/pkgs/development/python-modules/whitenoise/default.nix +++ b/pkgs/development/python-modules/whitenoise/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Radically simplified static file serving for WSGI applications"; - homepage = http://whitenoise.evans.io/; + homepage = "http://whitenoise.evans.io/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix index a7b34cf9b3646..e203cdb293441 100644 --- a/pkgs/development/python-modules/whoosh/default.nix +++ b/pkgs/development/python-modules/whoosh/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fast, pure-Python full text indexing, search, and spell checking library."; - homepage = https://bitbucket.org/mchaput/whoosh; + homepage = "https://bitbucket.org/mchaput/whoosh"; license = licenses.bsd2; maintainers = with maintainers; [ nand0p ]; }; diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index f0aee6b80586b..bb8f1ab3b4d5c 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -21,8 +21,8 @@ buildPythonPackage rec { meta = { description = "IPython HTML widgets for Jupyter"; - homepage = http://ipython.org/; + homepage = "http://ipython.org/"; license = ipywidgets.meta.license; # Build from same repo maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index 138facad701c8..275a46a1472d2 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python image library that sits on top of Pillow, Wand and OpenCV"; - homepage = https://github.com/torchbox/Willow/; + homepage = "https://github.com/torchbox/Willow/"; license = licenses.bsd2; maintainers = with maintainers; [ desiderius ]; }; diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix index 97530989a382d..d687ffd2d0b92 100644 --- a/pkgs/development/python-modules/wordfreq/default.nix +++ b/pkgs/development/python-modules/wordfreq/default.nix @@ -11,38 +11,37 @@ , fetchFromGitHub }: -buildPythonPackage { +buildPythonPackage rec { pname = "wordfreq"; - version = "2.2.0"; + version = "2.3.2"; + disabled = pythonOlder "3"; src = fetchFromGitHub { owner = "LuminosoInsight"; repo = "wordfreq"; # upstream don't tag by version - rev = "bc12599010c8181a725ec97d0b3990758a48da36"; - sha256 = "195794vkzq5wsq3mg1dgfhlnz2f7vi1xajlifq6wkg4lzwyq262m"; + rev = "v${version}"; + sha256 = "078657iiksrqzcc2wvwhiilf3xxq5vlinsv0kz03qzqr1qyvbmas"; }; - checkInputs = [ pytest ]; - - checkPhase = '' - # These languages require additional dictionaries - pytest tests -k 'not test_japanese and not test_korean and not test_languages and not test_french_and_related' - ''; - propagatedBuildInputs = [ regex langcodes ftfy msgpack mecab-python3 jieba ]; - + # patch to relax version requirements for regex # dependency to prevent break in upgrade postPatch = '' substituteInPlace setup.py --replace "regex ==" "regex >=" ''; - - disabled = pythonOlder "3"; + + checkInputs = [ pytest ]; + + checkPhase = '' + # These languages require additional dictionaries + pytest tests -k 'not test_japanese and not test_korean and not test_languages and not test_french_and_related' + ''; meta = with lib; { description = "A library for looking up the frequencies of words in many languages, based on many sources of data"; - homepage = https://github.com/LuminosoInsight/wordfreq/; + homepage = "https://github.com/LuminosoInsight/wordfreq/"; license = licenses.mit; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix index 81c09bf74253b..dafa948f69d83 100644 --- a/pkgs/development/python-modules/worldengine/default.nix +++ b/pkgs/development/python-modules/worldengine/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://world-engine.org; + homepage = "http://world-engine.org"; description = "World generator using simulation of plates, rain shadow, erosion, etc"; license = licenses.mit; maintainers = with maintainers; [ rardiol ]; diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix index 12172c376c95b..65e3669734f6a 100644 --- a/pkgs/development/python-modules/wptserve/default.nix +++ b/pkgs/development/python-modules/wptserve/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "A webserver intended for web browser testing"; - homepage = https://wptserve.readthedocs.org/; + homepage = "https://wptserve.readthedocs.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix index 5ef9dd0750898..a380e6ac37988 100644 --- a/pkgs/development/python-modules/wrapt/default.nix +++ b/pkgs/development/python-modules/wrapt/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { meta = { description = "Module for decorators, wrappers and monkey patching"; license = lib.licenses.bsd2; - homepage = https://github.com/GrahamDumpleton/wrapt; + homepage = "https://github.com/GrahamDumpleton/wrapt"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix index 29c1f8dfa797a..c4bc74a58d230 100644 --- a/pkgs/development/python-modules/wrf-python/default.nix +++ b/pkgs/development/python-modules/wrf-python/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = { description = "WRF postprocessing library for Python"; - homepage = http://wrf-python.rtfd.org; + homepage = "http://wrf-python.rtfd.org"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ mhaselsteiner ]; }; diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index 141b499453edf..83e1fbad3233c 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://ws4py.readthedocs.org; + homepage = "https://ws4py.readthedocs.org"; description = "A WebSocket package for Python"; maintainers = []; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/wsgiproxy2/default.nix b/pkgs/development/python-modules/wsgiproxy2/default.nix index 4877e5f66f25c..ef3ce69742c12 100644 --- a/pkgs/development/python-modules/wsgiproxy2/default.nix +++ b/pkgs/development/python-modules/wsgiproxy2/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://pythonpaste.org/wsgiproxy/; + homepage = "http://pythonpaste.org/wsgiproxy/"; description = "HTTP proxying tools for WSGI apps"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/wsproto/0.14.nix b/pkgs/development/python-modules/wsproto/0.14.nix index b2c3c527d8283..79a66d2e4b1d5 100644 --- a/pkgs/development/python-modules/wsproto/0.14.nix +++ b/pkgs/development/python-modules/wsproto/0.14.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure Python, pure state-machine WebSocket implementation"; - homepage = https://github.com/python-hyper/wsproto/; + homepage = "https://github.com/python-hyper/wsproto/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index dfbf9ceabdc32..95ed95cb860bc 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure Python, pure state-machine WebSocket implementation"; - homepage = https://github.com/python-hyper/wsproto/; + homepage = "https://github.com/python-hyper/wsproto/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/wtf-peewee/default.nix b/pkgs/development/python-modules/wtf-peewee/default.nix index a01aaa4631af2..efd3fbd77ab67 100644 --- a/pkgs/development/python-modules/wtf-peewee/default.nix +++ b/pkgs/development/python-modules/wtf-peewee/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "WTForms integration for peewee models"; - homepage = https://github.com/coleifer/wtf-peewee/; + homepage = "https://github.com/coleifer/wtf-peewee/"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index 40f0b6554515f..98c3b1be93b55 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ Babel ]; meta = with stdenv.lib; { - homepage = https://github.com/wtforms/wtforms; + homepage = "https://github.com/wtforms/wtforms"; description = "A flexible forms validation and rendering library for Python"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix index b946d23acf60e..272c903f57b19 100644 --- a/pkgs/development/python-modules/wurlitzer/default.nix +++ b/pkgs/development/python-modules/wurlitzer/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Capture C-level output in context managers"; - homepage = https://github.com/minrk/wurlitzer; + homepage = "https://github.com/minrk/wurlitzer"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index 689a1336ef79f..e185e26a4f7e3 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { meta = { description = "Cross platform GUI toolkit for Python, Phoenix version"; - homepage = http://wxpython.org/; + homepage = "http://wxpython.org/"; license = lib.licenses.wxWindows; }; diff --git a/pkgs/development/python-modules/x11_hash/default.nix b/pkgs/development/python-modules/x11_hash/default.nix index 060d08869b88c..7cc921047ac1a 100644 --- a/pkgs/development/python-modules/x11_hash/default.nix +++ b/pkgs/development/python-modules/x11_hash/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec{ meta = with stdenv.lib; { description = "Binding for X11 proof of work hashing"; - homepage = https://github.com/mazaclub/x11_hash; + homepage = "https://github.com/mazaclub/x11_hash"; license = licenses.mit; maintainers = with maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/x256/default.nix b/pkgs/development/python-modules/x256/default.nix index 55a3ad7d0cce7..bc0f0f6579089 100644 --- a/pkgs/development/python-modules/x256/default.nix +++ b/pkgs/development/python-modules/x256/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Find the nearest xterm 256 color index for an RGB"; - homepage = https://github.com/magarcia/python-x256; + homepage = "https://github.com/magarcia/python-x256"; license = licenses.mit; maintainers = with maintainers; [ Scriptkiddi ]; }; diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix index 05c7fed589e1f..a71ade1b41b78 100644 --- a/pkgs/development/python-modules/xapian/default.nix +++ b/pkgs/development/python-modules/xapian/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Bindings for Xapian"; - homepage = https://xapian.org/; + homepage = "https://xapian.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index 440db34302539..de779fc2c00ba 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "xapp"; - version = "1.8.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "python-xapp"; rev = version; - sha256 = "0vw3cn09nx75lv4d9idp5fdhd81xs279zhbyyilynq29cxxs2zil"; + sha256 = "1pp3z4q6ryxcc26kaq222j53ji110n2v7rx29c7vy1fbb8mq64im"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index ce46443ec06bd..abce8ac12fe7e 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.15.0"; + version = "0.15.1"; src = fetchPypi { inherit pname version; - sha256 = "c72d160c970725201f769e80fb91cbad68d6ebf21d68fcc371385a6c950459c3"; + sha256 = "64e3138d87b641e22fe7a003c94abc685896b247b63e434505c1e6b38c91a8fb"; }; checkInputs = [ pytest ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { description = "N-D labeled arrays and datasets in Python"; - homepage = https://github.com/pydata/xarray; + homepage = "https://github.com/pydata/xarray"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index 35c11e9008808..8634d616b736b 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/xattr/xattr; + homepage = "https://github.com/xattr/xattr"; description = "Python wrapper for extended filesystem attributes"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/xcaplib/default.nix b/pkgs/development/python-modules/xcaplib/default.nix index 7002c43cf2bcf..25061d5321abf 100644 --- a/pkgs/development/python-modules/xcaplib/default.nix +++ b/pkgs/development/python-modules/xcaplib/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ eventlib application ]; meta = with stdenv.lib; { - homepage = https://github.com/AGProjects/python-xcaplib; + homepage = "https://github.com/AGProjects/python-xcaplib"; description = "XCAP (RFC4825) client library"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index 14f4b24747c7e..990e74d25498c 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot"; - homepage = https://github.com/jrfonseca/xdot.py; + homepage = "https://github.com/jrfonseca/xdot.py"; license = licenses.lgpl3Plus; }; } diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index d5a666856464c..466b72696f321 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A PDF generator using HTML and CSS"; - homepage = https://github.com/xhtml2pdf/xhtml2pdf; + homepage = "https://github.com/xhtml2pdf/xhtml2pdf"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index 9ea1445eff59b..d21142f5dc0db 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/xkcdpass/; + homepage = "https://pypi.python.org/pypi/xkcdpass/"; description = "Generate secure multiword passwords/passphrases, inspired by XKCD"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index 1903c3aaca885..4c98497c8b17a 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fully functional X client library for Python programs"; - homepage = http://python-xlib.sourceforge.net/; + homepage = "http://python-xlib.sourceforge.net/"; license = licenses.gpl2Plus; }; diff --git a/pkgs/development/python-modules/xlrd/default.nix b/pkgs/development/python-modules/xlrd/default.nix index e37b2694576ad..9b5e8b83e3066 100644 --- a/pkgs/development/python-modules/xlrd/default.nix +++ b/pkgs/development/python-modules/xlrd/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://www.python-excel.org/; + homepage = "http://www.python-excel.org/"; description = "Library for developers to extract data from Microsoft Excel (tm) spreadsheet files"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix index 5faf56b7eba70..e1694b9d33e9a 100644 --- a/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/pkgs/development/python-modules/xlsx2csv/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/bitprophet/alabaster; + homepage = "https://github.com/bitprophet/alabaster"; description = "Convert xlsx to csv"; license = licenses.bsd3; maintainers = with maintainers; [ jb55 ]; diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix index 5de0348e00e90..7b8e931fb8748 100644 --- a/pkgs/development/python-modules/xlwt/default.nix +++ b/pkgs/development/python-modules/xlwt/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Library to create spreadsheet files compatible with MS"; - homepage = https://github.com/python-excel/xlwt; + homepage = "https://github.com/python-excel/xlwt"; license = with lib.licenses; [ bsdOriginal bsd3 lgpl21 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix index 07250337f8389..790aaec3ce3d8 100644 --- a/pkgs/development/python-modules/xmltodict/default.nix +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Makes working with XML feel like you are working with JSON"; - homepage = https://github.com/martinblech/xmltodict; + homepage = "https://github.com/martinblech/xmltodict"; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/xmodem/default.nix b/pkgs/development/python-modules/xmodem/default.nix index 00a0bfb604395..48d658ba49b9a 100644 --- a/pkgs/development/python-modules/xmodem/default.nix +++ b/pkgs/development/python-modules/xmodem/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pure python implementation of the XMODEM protocol"; maintainers = with maintainers; [ emantor ]; - homepage = https://github.com/tehmaze/xmodem; + homepage = "https://github.com/tehmaze/xmodem"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix index ec725564f2b2a..b812609a7d7bd 100644 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ b/pkgs/development/python-modules/xmpppy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "XMPP python library"; - homepage = http://xmpppy.sourceforge.net/; + homepage = "http://xmpppy.sourceforge.net/"; license = licenses.gpl3; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/xstatic-bootbox/default.nix b/pkgs/development/python-modules/xstatic-bootbox/default.nix index 1f60a0fbe6cff..ba75ed0b88249 100644 --- a/pkgs/development/python-modules/xstatic-bootbox/default.nix +++ b/pkgs/development/python-modules/xstatic-bootbox/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib;{ - homepage = http://bootboxjs.com; + homepage = "http://bootboxjs.com"; description = "Bootboxjs packaged static files for python"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/pkgs/development/python-modules/xstatic-bootstrap/default.nix index 9abc9b273a2c9..83b33dc3edf48 100644 --- a/pkgs/development/python-modules/xstatic-bootstrap/default.nix +++ b/pkgs/development/python-modules/xstatic-bootstrap/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib;{ - homepage = https://getbootstrap.com; + homepage = "https://getbootstrap.com"; description = "Bootstrap packaged static files for python"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix index e4352e3b98438..3eac032991090 100644 --- a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ xstatic-jquery ]; meta = with lib;{ - homepage = http://plugins.jquery.com/project/jQuery-File-Upload; + homepage = "http://plugins.jquery.com/project/jQuery-File-Upload"; description = "jquery-file-upload packaged static files for python"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix index c47dfbc05d85f..8c872d0bbd19c 100644 --- a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ xstatic-jquery ]; meta = with lib;{ - homepage = https://jqueryui.com/; + homepage = "https://jqueryui.com/"; description = "jquery-ui packaged static files for python"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/xstatic-jquery/default.nix b/pkgs/development/python-modules/xstatic-jquery/default.nix index a1a5e2b4dadc1..3cfbf3eb93267 100644 --- a/pkgs/development/python-modules/xstatic-jquery/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib;{ - homepage = https://jquery.org; + homepage = "https://jquery.org"; description = "jquery packaged static files for python"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/xstatic-pygments/default.nix b/pkgs/development/python-modules/xstatic-pygments/default.nix index 919d262c50d10..c71fce169d9dc 100644 --- a/pkgs/development/python-modules/xstatic-pygments/default.nix +++ b/pkgs/development/python-modules/xstatic-pygments/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib;{ - homepage = https://pygments.org; + homepage = "https://pygments.org"; description = "pygments packaged static files for python"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/xstatic/default.nix b/pkgs/development/python-modules/xstatic/default.nix index bbfcce54d8901..39e5f233ccd2d 100644 --- a/pkgs/development/python-modules/xstatic/default.nix +++ b/pkgs/development/python-modules/xstatic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib;{ - homepage = https://bitbucket.org/thomaswaldmann/xstatic; + homepage = "https://bitbucket.org/thomaswaldmann/xstatic"; description = "Base packaged static files for python"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix index c7708d0f20b73..dacb3b6343688 100644 --- a/pkgs/development/python-modules/xvfbwrapper/default.nix +++ b/pkgs/development/python-modules/xvfbwrapper/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Run headless display inside X virtual framebuffer (Xvfb)"; - homepage = https://github.com/cgoldberg/xvfbwrapper; + homepage = "https://github.com/cgoldberg/xvfbwrapper"; license = licenses.mit; maintainers = with maintainers; [ ashgillman ]; }; diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index 66f31441ec567..a3a5da18a98f2 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/ifduyue/python-xxhash; + homepage = "https://github.com/ifduyue/python-xxhash"; description = "Python Binding for xxHash https://pypi.org/project/xxhash/"; license = licenses.bsd2; maintainers = [ maintainers.teh ]; diff --git a/pkgs/development/python-modules/yahooweather/default.nix b/pkgs/development/python-modules/yahooweather/default.nix index 38c060aa8e849..7bcf637af3276 100644 --- a/pkgs/development/python-modules/yahooweather/default.nix +++ b/pkgs/development/python-modules/yahooweather/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Provide an interface to the Yahoo! Weather RSS feed"; - homepage = https://github.com/pvizeli/yahooweather; + homepage = "https://github.com/pvizeli/yahooweather"; license = licenses.bsd2; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index b883a3d2bc8fe..c01c862e2f453 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.21.0"; + version = "1.23.0"; src = fetchPypi { inherit pname version; - sha256 = "14yijcnmanyd3s2ir38sxl07rzpxgpgw9s6b8sy68jrl7n5nj7ky"; + sha256 = "1agl80csxhiqglm0idwhw98iqfpp61c9inzcdaz4czsfyivzzwsr"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/yanc/default.nix b/pkgs/development/python-modules/yanc/default.nix index 690b110fc93a1..9bbfc41006820 100644 --- a/pkgs/development/python-modules/yanc/default.nix +++ b/pkgs/development/python-modules/yanc/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Yet another nose colorer"; - homepage = https://github.com/0compute/yanc; + homepage = "https://github.com/0compute/yanc"; license = licenses.gpl3; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/yappi/default.nix b/pkgs/development/python-modules/yappi/default.nix index f7a18bba903c5..6ab776d23072a 100644 --- a/pkgs/development/python-modules/yappi/default.nix +++ b/pkgs/development/python-modules/yappi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; meta = with lib; { - homepage = https://github.com/sumerc/yappi; + homepage = "https://github.com/sumerc/yappi"; description = "Python profiler that supports multithreading and measuring CPU time"; license = licenses.mit; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix index dfdd3dd3c05f9..f0d39f69e5558 100644 --- a/pkgs/development/python-modules/yapsy/default.nix +++ b/pkgs/development/python-modules/yapsy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = http://yapsy.sourceforge.net/; + homepage = "http://yapsy.sourceforge.net/"; description = "Yet another plugin system"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/yarg/default.nix b/pkgs/development/python-modules/yarg/default.nix index f49ed20b2b923..97237ba09b094 100644 --- a/pkgs/development/python-modules/yarg/default.nix +++ b/pkgs/development/python-modules/yarg/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "An easy to use PyPI client"; - homepage = https://yarg.readthedocs.io; + homepage = "https://yarg.readthedocs.io"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 19314e19611cd..bfb09f9c1c5ca 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Yet another URL library"; - homepage = https://github.com/aio-libs/yarl/; + homepage = "https://github.com/aio-libs/yarl/"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index 8f97a374df620..32b378ddd57b5 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -12,6 +12,6 @@ buildPythonPackage rec { meta = with lib; { description = "Generate HTML or XML in a pythonic way. Pure python alternative to web template engines. Can fill HTML forms with default values and error messages."; license = [ licenses.lgpl21 ]; - homepage = https://www.yattag.org/; + homepage = "https://www.yattag.org/"; }; } diff --git a/pkgs/development/python-modules/yenc/default.nix b/pkgs/development/python-modules/yenc/default.nix index 3c51d00ec1488..13c8d53f19b38 100644 --- a/pkgs/development/python-modules/yenc/default.nix +++ b/pkgs/development/python-modules/yenc/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec{ meta = { description = "Encoding and decoding yEnc"; license = lib.licenses.lgpl21; - homepage = https://bitbucket.org/dual75/yenc; + homepage = "https://bitbucket.org/dual75/yenc"; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix index fe7f0cf466e11..d241e3f8edc03 100644 --- a/pkgs/development/python-modules/yolk/default.nix +++ b/pkgs/development/python-modules/yolk/default.nix @@ -15,7 +15,7 @@ buildPythonApplication rec { meta = { description = "Command-line tool for querying PyPI and Python packages installed on your system"; - homepage = https://github.com/cakebread/yolk; + homepage = "https://github.com/cakebread/yolk"; maintainers = with maintainers; []; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/yt/default.nix b/pkgs/development/python-modules/yt/default.nix index f2d7e62eca36a..ce89ec0fd3d4d 100644 --- a/pkgs/development/python-modules/yt/default.nix +++ b/pkgs/development/python-modules/yt/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "An analysis and visualization toolkit for volumetric data"; - homepage = https://github.com/yt-project/yt; + homepage = "https://github.com/yt-project/yt"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/yubico-client/default.nix b/pkgs/development/python-modules/yubico-client/default.nix index 99aedd4e68113..f679c54f96caf 100644 --- a/pkgs/development/python-modules/yubico-client/default.nix +++ b/pkgs/development/python-modules/yubico-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Verifying Yubico OTPs based on the validation protocol version 2.0"; - homepage = https://github.com/Kami/python-yubico-client/; + homepage = "https://github.com/Kami/python-yubico-client/"; maintainers= with maintainers; [ peterromfeldhk ]; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix index cf4f6f7dd1468..f4f42cf9e3fcd 100644 --- a/pkgs/development/python-modules/z3c-checkversions/default.nix +++ b/pkgs/development/python-modules/z3c-checkversions/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/z3c.checkversions; + homepage = "https://github.com/zopefoundation/z3c.checkversions"; description = "Find newer package versions on PyPI"; license = licenses.zpl21; }; diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 5570688e98b76..ac7c2b6af010d 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "An implementation of chunked, compressed, N-dimensional arrays for Python"; - homepage = https://github.com/zarr-developers/zarr; + homepage = "https://github.com/zarr-developers/zarr"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/zbaemon/default.nix b/pkgs/development/python-modules/zbaemon/default.nix index c15e46e5d0d8a..a87bd3093f4f8 100644 --- a/pkgs/development/python-modules/zbaemon/default.nix +++ b/pkgs/development/python-modules/zbaemon/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A daemon process control library and tools for Unix-based systems"; - homepage = https://pypi.python.org/pypi/zdaemon; + homepage = "https://pypi.python.org/pypi/zdaemon"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/zbase32/default.nix b/pkgs/development/python-modules/zbase32/default.nix index a5002e80f4947..9c97ad066ed5f 100644 --- a/pkgs/development/python-modules/zbase32/default.nix +++ b/pkgs/development/python-modules/zbase32/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "zbase32, a base32 encoder/decoder"; - homepage = https://pypi.python.org/pypi/zbase32; + homepage = "https://pypi.python.org/pypi/zbase32"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix index 173a619197cec..18fc7bcf51150 100644 --- a/pkgs/development/python-modules/zc_lockfile/default.nix +++ b/pkgs/development/python-modules/zc_lockfile/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Inter-process locks"; - homepage = https://www.python.org/pypi/zc.lockfile; + homepage = "https://www.python.org/pypi/zc.lockfile"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index f68164284dad9..75f8647730cc8 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Structured Configuration Library"; - homepage = https://pypi.python.org/pypi/ZConfig; + homepage = "https://pypi.python.org/pypi/ZConfig"; license = licenses.zpl20; maintainers = [ maintainers.goibhniu ]; }; diff --git a/pkgs/development/python-modules/zdaemon/default.nix b/pkgs/development/python-modules/zdaemon/default.nix index c15e46e5d0d8a..a87bd3093f4f8 100644 --- a/pkgs/development/python-modules/zdaemon/default.nix +++ b/pkgs/development/python-modules/zdaemon/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A daemon process control library and tools for Unix-based systems"; - homepage = https://pypi.python.org/pypi/zdaemon; + homepage = "https://pypi.python.org/pypi/zdaemon"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 72a6e1ba22904..50dda4c8edbda 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = http://docs.python-zeep.org; + homepage = "http://docs.python-zeep.org"; license = licenses.mit; description = "A modern/fast Python SOAP client based on lxml / requests"; maintainers = with maintainers; [ rvl ]; diff --git a/pkgs/development/python-modules/zerobin/default.nix b/pkgs/development/python-modules/zerobin/default.nix index ce993d3d41a68..efc2bb380b8ec 100644 --- a/pkgs/development/python-modules/zerobin/default.nix +++ b/pkgs/development/python-modules/zerobin/default.nix @@ -26,7 +26,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "A client side encrypted pastebin"; - homepage = https://0bin.net/; + homepage = "https://0bin.net/"; license = licenses.wtfpl; }; diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index c7342bbfa553f..ccc34b42afb49 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ openssl bzip2 ]; meta = with stdenv.lib; { - homepage = https://zeroc.com/; + homepage = "https://zeroc.com/"; license = licenses.gpl2; description = "Comprehensive RPC framework with support for Python, C++, .NET, Java, JavaScript and more."; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 25382fa19ad1b..0985da208024c 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.24.5"; + version = "0.26.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0jpgd0rk91si93857mjrizan5gc42kj1q4fi4160qgk68la88fl9"; + sha256 = "029wxa50dwf4hsi7w0d8wmywh125aaaa7l4g024z1cyi511iy5h1"; }; propagatedBuildInputs = [ ifaddr ] @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pure python implementation of multicast DNS service discovery"; - homepage = https://github.com/jstasiak/python-zeroconf; + homepage = "https://github.com/jstasiak/python-zeroconf"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index 9193c2ddc0811..e848511d9ca8f 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://allmydata.org/trac/zfec; + homepage = "http://allmydata.org/trac/zfec"; description = "Zfec, a fast erasure codec which can be used with the command-line, C, Python, or Haskell"; longDescription = '' Fast, portable, programmable erasure coding a.k.a. "forward diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix index 42f0218c84633..9208b54981bcd 100644 --- a/pkgs/development/python-modules/zict/default.nix +++ b/pkgs/development/python-modules/zict/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Mutable mapping tools."; - homepage = https://github.com/dask/zict; + homepage = "https://github.com/dask/zict"; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix new file mode 100644 index 0000000000000..43588361ca787 --- /dev/null +++ b/pkgs/development/python-modules/zimports/default.nix @@ -0,0 +1,38 @@ +{ lib +, isPy3k +, fetchFromGitHub +, buildPythonPackage +, flake8-import-order +, pyflakes +, mock +}: + +buildPythonPackage rec { + pname = "zimports"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "sqlalchemyorg"; + repo = "zimports"; + rev = version; + sha256 = "0a5axflkk0wv0rdnrh8l2rgj8gh2pfkg5lrvr8x4yxxiifawrafc"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ + pyflakes + flake8-import-order + ]; + + checkInputs = [ + mock + ]; + + meta = with lib; { + description = "Python import rewriter"; + homepage = "https://github.com/sqlalchemyorg/zimports"; + license = licenses.mit; + maintainers = with maintainers; [ timokau ]; + }; +} diff --git a/pkgs/development/python-modules/zipfile36/default.nix b/pkgs/development/python-modules/zipfile36/default.nix index 2148dcc4b8025..46dd1e173fb22 100644 --- a/pkgs/development/python-modules/zipfile36/default.nix +++ b/pkgs/development/python-modules/zipfile36/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "Read and write ZIP files - backport of the zipfile module from Python 3.6"; - homepage = https://gitlab.com/takluyver/zipfile36; + homepage = "https://gitlab.com/takluyver/zipfile36"; license = lib.licenses.psfl; maintainers = lib.maintainers.fridh; }; diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index 3b9b1a12ccac3..13cb2131a4d7c 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pathlib-compatible object wrapper for zip files"; - homepage = https://github.com/jaraco/zipp; + homepage = "https://github.com/jaraco/zipp"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/zipstream/default.nix b/pkgs/development/python-modules/zipstream/default.nix index 4d5fabe7fca0c..ec885c6df0f4d 100644 --- a/pkgs/development/python-modules/zipstream/default.nix +++ b/pkgs/development/python-modules/zipstream/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = { description = "A zip archive generator"; - homepage = https://github.com/allanlei/python-zipstream; + homepage = "https://github.com/allanlei/python-zipstream"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ primeos ]; }; diff --git a/pkgs/development/python-modules/zm-py/default.nix b/pkgs/development/python-modules/zm-py/default.nix index 4cd5e9b1d2081..3ce0711569362 100644 --- a/pkgs/development/python-modules/zm-py/default.nix +++ b/pkgs/development/python-modules/zm-py/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "A loose python wrapper around the ZoneMinder REST API"; - homepage = https://github.com/rohankapoorcom/zm-py; + homepage = "https://github.com/rohankapoorcom/zm-py"; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index f15cefaa47571..bcc164ea380ea 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Zope Object Database: object database and persistence"; - homepage = https://pypi.python.org/pypi/ZODB; + homepage = "https://pypi.python.org/pypi/ZODB"; license = licenses.zpl21; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index b24b5853876ae..9a0727c82e90f 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://pypi.python.org/pypi/zodbpickle; + homepage = "https://pypi.python.org/pypi/zodbpickle"; }; } diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index 26d8255c03b2b..2998376b67268 100644 --- a/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Allows you to perform imports names that will only be resolved when used in the code"; - homepage = https://github.com/zopefoundation/zope.deferredimport; + homepage = "https://github.com/zopefoundation/zope.deferredimport"; license = licenses.zpl21; }; } diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix index 0b7bc80bf3a65..c9e6311cf3210 100644 --- a/pkgs/development/python-modules/zope-hookable/default.nix +++ b/pkgs/development/python-modules/zope-hookable/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Supports the efficient creation of “hookable” objects"; - homepage = https://github.com/zopefoundation/zope.hookable; + homepage = "https://github.com/zopefoundation/zope.hookable"; license = licenses.zpl21; }; } diff --git a/pkgs/development/python-modules/zope_broken/default.nix b/pkgs/development/python-modules/zope_broken/default.nix index df3a2053ebf81..aa12167bddc2f 100644 --- a/pkgs/development/python-modules/zope_broken/default.nix +++ b/pkgs/development/python-modules/zope_broken/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ zope_interface ]; meta = with stdenv.lib; { - homepage = http://pypi.python.org/pypi/zope.broken; + homepage = "http://pypi.python.org/pypi/zope.broken"; description = "Zope Broken Object Interfaces"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_component/default.nix b/pkgs/development/python-modules/zope_component/default.nix index 25452fdd07077..fc63f3d1ebfd5 100644 --- a/pkgs/development/python-modules/zope_component/default.nix +++ b/pkgs/development/python-modules/zope_component/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/zope.component; + homepage = "https://github.com/zopefoundation/zope.component"; description = "Zope Component Architecture"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope_configuration/default.nix index e0ec7bd6ca80d..664aa0af6e88b 100644 --- a/pkgs/development/python-modules/zope_configuration/default.nix +++ b/pkgs/development/python-modules/zope_configuration/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Zope Configuration Markup Language (ZCML)"; - homepage = https://github.com/zopefoundation/zope.configuration; + homepage = "https://github.com/zopefoundation/zope.configuration"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/zope_contenttype/default.nix b/pkgs/development/python-modules/zope_contenttype/default.nix index 6db39d6c5b5c4..d3cd69943a758 100644 --- a/pkgs/development/python-modules/zope_contenttype/default.nix +++ b/pkgs/development/python-modules/zope_contenttype/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/zope.contenttype; + homepage = "https://github.com/zopefoundation/zope.contenttype"; description = "A utility module for content-type (MIME type) handling"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_deprecation/default.nix b/pkgs/development/python-modules/zope_deprecation/default.nix index b56e19697119a..c4059dbcd4161 100644 --- a/pkgs/development/python-modules/zope_deprecation/default.nix +++ b/pkgs/development/python-modules/zope_deprecation/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { buildInputs = [ zope_testing ]; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/zope.deprecation; + homepage = "https://github.com/zopefoundation/zope.deprecation"; description = "Zope Deprecation Infrastructure"; license = licenses.zpl20; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/zope_dottedname/default.nix b/pkgs/development/python-modules/zope_dottedname/default.nix index d2a21fd03b043..b2afc9cc23f4f 100644 --- a/pkgs/development/python-modules/zope_dottedname/default.nix +++ b/pkgs/development/python-modules/zope_dottedname/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = http://pypi.python.org/pypi/zope.dottedname; + homepage = "http://pypi.python.org/pypi/zope.dottedname"; description = "Resolver for Python dotted names"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_event/default.nix b/pkgs/development/python-modules/zope_event/default.nix index 3dea7adcb0025..4f9e14ba20d3a 100644 --- a/pkgs/development/python-modules/zope_event/default.nix +++ b/pkgs/development/python-modules/zope_event/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An event publishing system"; - homepage = https://pypi.python.org/pypi/zope.event; + homepage = "https://pypi.python.org/pypi/zope.event"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/zope_exceptions/default.nix b/pkgs/development/python-modules/zope_exceptions/default.nix index dbbba691edbe7..04e68f038e995 100644 --- a/pkgs/development/python-modules/zope_exceptions/default.nix +++ b/pkgs/development/python-modules/zope_exceptions/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Exception interfaces and implementations"; - homepage = https://pypi.python.org/pypi/zope.exceptions; + homepage = "https://pypi.python.org/pypi/zope.exceptions"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/zope_filerepresentation/default.nix b/pkgs/development/python-modules/zope_filerepresentation/default.nix index e9104a1b9392b..0a7e959e11fe8 100644 --- a/pkgs/development/python-modules/zope_filerepresentation/default.nix +++ b/pkgs/development/python-modules/zope_filerepresentation/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_schema ]; meta = with stdenv.lib; { - homepage = https://zopefilerepresentation.readthedocs.io/; + homepage = "https://zopefilerepresentation.readthedocs.io/"; description = "File-system Representation Interfaces"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_i18n/default.nix b/pkgs/development/python-modules/zope_i18n/default.nix index 81558a214461d..662188db153e6 100644 --- a/pkgs/development/python-modules/zope_i18n/default.nix +++ b/pkgs/development/python-modules/zope_i18n/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytz zope_component ]; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/zope.i18n; + homepage = "https://github.com/zopefoundation/zope.i18n"; description = "Zope Internationalization Support"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/pkgs/development/python-modules/zope_i18nmessageid/default.nix index fe9a6b56ed8d4..bf1dc7e0b6b06 100644 --- a/pkgs/development/python-modules/zope_i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope_i18nmessageid/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/zope.i18nmessageid; + homepage = "https://github.com/zopefoundation/zope.i18nmessageid"; description = "Message Identifiers for internationalization"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index d208d4a3529c1..0388c1041ed26 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Zope.Interface"; - homepage = http://zope.org/Products/ZopeInterface; + homepage = "http://zope.org/Products/ZopeInterface"; license = licenses.zpl20; maintainers = [ maintainers.goibhniu ]; }; diff --git a/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/pkgs/development/python-modules/zope_lifecycleevent/default.nix index 738b30c489f55..2beabc8a61c7a 100644 --- a/pkgs/development/python-modules/zope_lifecycleevent/default.nix +++ b/pkgs/development/python-modules/zope_lifecycleevent/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_event zope_component ]; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/zope.lifecycleevent; + homepage = "https://github.com/zopefoundation/zope.lifecycleevent"; description = "Object life-cycle events"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_location/default.nix b/pkgs/development/python-modules/zope_location/default.nix index 7c0df16f77511..1c868a7397193 100644 --- a/pkgs/development/python-modules/zope_location/default.nix +++ b/pkgs/development/python-modules/zope_location/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/zope.location/; + homepage = "https://github.com/zopefoundation/zope.location/"; description = "Zope Location"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix index 537fc1465f231..361095bf18058 100644 --- a/pkgs/development/python-modules/zope_proxy/default.nix +++ b/pkgs/development/python-modules/zope_proxy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/zope.proxy; + homepage = "https://github.com/zopefoundation/zope.proxy"; description = "Generic Transparent Proxies"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope_schema/default.nix index df5322acc87f3..8ecbf0a9907b3 100644 --- a/pkgs/development/python-modules/zope_schema/default.nix +++ b/pkgs/development/python-modules/zope_schema/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/zope.schema; + homepage = "https://github.com/zopefoundation/zope.schema"; description = "zope.interface extension for defining data schemas"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_size/default.nix b/pkgs/development/python-modules/zope_size/default.nix index 8651e2d6822ff..92df0aa1eb7e6 100644 --- a/pkgs/development/python-modules/zope_size/default.nix +++ b/pkgs/development/python-modules/zope_size/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_i18nmessageid zope_interface ]; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/zope.size; + homepage = "https://github.com/zopefoundation/zope.size"; description = "Interfaces and simple adapter that give the size of an object"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_testing/default.nix b/pkgs/development/python-modules/zope_testing/default.nix index 037c5d87f9af0..1ea12eb377d92 100644 --- a/pkgs/development/python-modules/zope_testing/default.nix +++ b/pkgs/development/python-modules/zope_testing/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Zope testing helpers"; - homepage = http://pypi.python.org/pypi/zope.testing; + homepage = "http://pypi.python.org/pypi/zope.testing"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index f6bf7f96a767b..9b7145a585110 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A flexible test runner with layer support"; - homepage = https://pypi.python.org/pypi/zope.testrunner; + homepage = "https://pypi.python.org/pypi/zope.testrunner"; license = licenses.zpl20; maintainers = [ maintainers.goibhniu ]; }; diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index 6c1b9c2bb5b7e..75856a88b7e0e 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple python bindings to Yann Collet ZSTD compression library"; - homepage = https://github.com/sergey-dryabzhinsky/python-zstd; + homepage = "https://github.com/sergey-dryabzhinsky/python-zstd"; license = licenses.bsd2; maintainers = with maintainers; [ eadwu diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix index a85290708fc57..aa5e23c40c489 100644 --- a/pkgs/development/r-modules/bioc-packages.nix +++ b/pkgs/development/r-modules/bioc-packages.nix @@ -123,7 +123,7 @@ in with self; { CGHcall = derive2 { name="CGHcall"; version="2.44.0"; sha256="1k65kaiqvjyllzbpa2367n6f6kkmsy463kpflzs66hqhx2fshsmi"; depends=[Biobase CGHbase DNAcopy impute snowfall]; }; CGHnormaliter = derive2 { name="CGHnormaliter"; version="1.36.0"; sha256="1j92x5dyxp6hjj87g1hgw5q8fd4k2q5rb97ir47xkalkcskg0ddh"; depends=[Biobase CGHbase CGHcall]; }; CGHregions = derive2 { name="CGHregions"; version="1.40.0"; sha256="04j87bd2ygda6np72vs1bx857y5mbaga19ky6pgyxv9lahi62xyw"; depends=[Biobase CGHbase]; }; - CHARGE = derive2 { name="CHARGE"; version="1.2.0"; sha256="0230pvgsf775lq4n9cpxb95bqq438f4z0wx9mmbj4yir8bljy0mk"; depends=[cluster diptest factoextra FactoMineR GenomicRanges IRanges matrixStats modes plyr SummarizedExperiment]; }; + CHARGE = derive2 { name="CHARGE"; version="1.2.0"; sha256="0230pvgsf775lq4n9cpxb95bqq438f4z0wx9mmbj4yir8bljy0mk"; depends=[cluster diptest factoextra FactoMineR GenomicRanges IRanges matrixStats plyr SummarizedExperiment]; }; CHRONOS = derive2 { name="CHRONOS"; version="1.10.1"; sha256="03j4qcak7bpgw80gzxb2mj6k134jqp5frzd5ls6b5290lkknj720"; depends=[biomaRt circlize doParallel foreach graph igraph openxlsx RBGL RCurl XML]; }; CINdex = derive2 { name="CINdex"; version="1.10.0"; sha256="0c4p3v9a0njf28gdhvdbnydlhjgpnwzakhnvkvngs3mhbwpy9ih5"; depends=[bitops dplyr GenomeInfoDb GenomicRanges gplots gridExtra IRanges png S4Vectors som stringr]; }; CMA = derive2 { name="CMA"; version="1.40.0"; sha256="1v77yiqmvd90pxbs64xfpglwy006w88b4zrb5rk90r0vasnvdl5n"; depends=[Biobase]; }; @@ -192,7 +192,7 @@ in with self; { CopywriteR = derive2 { name="CopywriteR"; version="2.14.1"; sha256="1hbiw0m9hmx4na9v502pxf8y5wvxzr68r4d3fqr2755gxx86qck6"; depends=[BiocParallel chipseq CopyhelpeR data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; }; CorMut = derive2 { name="CorMut"; version="1.24.0"; sha256="1p4xj8f5hf1z31943s51inc0mc28bphzy5qs4ay2nccwshbypq0l"; depends=[igraph seqinr]; }; Cormotif = derive2 { name="Cormotif"; version="1.28.0"; sha256="0lb691mvr9zim7z5yplncmlzyr799jym1wvrgfm1diqjz2daixai"; depends=[affy limma]; }; - CountClust = derive2 { name="CountClust"; version="1.10.1"; sha256="1b129r97wv3gm25pk3ccg5bmp2476jyhz1pphapqlrb1im3fixq6"; depends=[cowplot flexmix ggplot2 gtools limma maptpx picante plyr reshape2 slam SQUAREM]; }; + CountClust = derive2 { name="CountClust"; version="1.10.1"; sha256="1b129r97wv3gm25pk3ccg5bmp2476jyhz1pphapqlrb1im3fixq6"; depends=[cowplot flexmix ggplot2 gtools limma picante plyr reshape2 slam SQUAREM]; }; CoverageView = derive2 { name="CoverageView"; version="1.20.1"; sha256="164lla4v6ll0kqzapm3kmwz39k5shl0cwwashpbwiixrrxhcy8d2"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; }; CrispRVariants = derive2 { name="CrispRVariants"; version="1.10.1"; sha256="0n1mw3ybbdaybbcms12cj4vy21wahq5srny0qnbxjlzyl1zjbpr0"; depends=[AnnotationDbi BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges reshape2 Rsamtools S4Vectors]; }; CytoDx = derive2 { name="CytoDx"; version="1.2.1"; sha256="05apvaf4dmkdfsp2aary14i7znjyzk0k6rqcbsk6m98fkp3d9r8b"; depends=[doParallel dplyr flowCore glmnet rpart rpart_plot]; }; @@ -225,7 +225,7 @@ in with self; { DNABarcodes = derive2 { name="DNABarcodes"; version="1.12.0"; sha256="0g6j7ish0fk9jcib94wssjgp1m8ldcp42hyyg1ypr945fa3xghx0"; depends=[BH Matrix Rcpp]; }; DNAcopy = derive2 { name="DNAcopy"; version="1.56.0"; sha256="04cqdqxhva66xwh1s2vffi56b9fcrqd4slcrvqasj5lp2rkjli82"; depends=[]; }; DNAshapeR = derive2 { name="DNAshapeR"; version="1.10.0"; sha256="1rplgi36jn33npihhmk0vdsiali814y5v1wz5fdna3k9b47id6b6"; depends=[Biostrings fields GenomicRanges Rcpp]; }; - DOQTL = derive2 { name="DOQTL"; version="1.18.0"; sha256="0ligqm4l2x5dz794djapri770j27rhibhdzc48y980768gjpkm8k"; depends=[annotate annotationTools Biobase BiocGenerics biomaRt BSgenome_Mmusculus_UCSC_mm10 corpcor doParallel foreach fpc GenomicRanges hwriter IRanges iterators mclust QTLRel regress rhdf5 Rsamtools RUnit VariantAnnotation XML]; }; + DOQTL = derive2 { name="DOQTL"; version="1.18.0"; sha256="0ligqm4l2x5dz794djapri770j27rhibhdzc48y980768gjpkm8k"; depends=[annotate annotationTools Biobase BiocGenerics biomaRt BSgenome_Mmusculus_UCSC_mm10 corpcor doParallel foreach fpc GenomicRanges hwriter IRanges iterators mclust QTLRel rhdf5 Rsamtools RUnit VariantAnnotation XML]; }; DOSE = derive2 { name="DOSE"; version="3.8.2"; sha256="1gh7dhvfc71kawxcfx8xqlir7mwvg5mmz4lqrdrvw5knvi2h3mfa"; depends=[AnnotationDbi BiocParallel DO_db fgsea ggplot2 GOSemSim qvalue reshape2 S4Vectors]; }; DRIMSeq = derive2 { name="DRIMSeq"; version="1.10.1"; sha256="021xzx7ndvjdahi715qvq2xxnnhdsn9h8g6imps5ls3qmk5024d2"; depends=[BiocGenerics BiocParallel edgeR GenomicRanges ggplot2 IRanges limma MASS reshape2 S4Vectors]; }; DSS = derive2 { name="DSS"; version="2.30.1"; sha256="0m18793vqaqamx3rj3pwrirc7ygmmg4774il8d59qmwinlppyxqw"; depends=[Biobase bsseq DelayedArray]; }; @@ -370,7 +370,7 @@ in with self; { GoogleGenomics = derive2 { name="GoogleGenomics"; version="2.4.0"; sha256="0xcj10r85hxh5qy43cjb6ypd849b5wphhhv528simxq4glhgrhxp"; depends=[Biobase Biostrings GenomeInfoDb GenomicAlignments GenomicRanges httr IRanges rjson Rsamtools S4Vectors VariantAnnotation]; }; GraphAT = derive2 { name="GraphAT"; version="1.54.0"; sha256="1xfd0i0j1fai58c15mc3lrg2jc4iwswyfpyg0ff5hnyhmgr3wnsa"; depends=[graph MCMCpack]; }; GraphAlignment = derive2 { name="GraphAlignment"; version="1.46.0"; sha256="1qql33ikps9x0dkvc31sxvyf8w119ax7519v5bv35s3i5yxh16i6"; depends=[]; }; - GraphPAC = derive2 { name="GraphPAC"; version="1.24.0"; sha256="0dwh3xshp74isq3rljlivks04mw4r0vgzg74qwyc2ar5b2j96bbg"; depends=[igraph iPAC TSP]; }; + GraphPAC = derive2 { name="GraphPAC"; version="1.24.0"; sha256="0dwh3xshp74isq3rljlivks04mw4r0vgzg74qwyc2ar5b2j96bbg"; depends=[igraph iPAC RMallow TSP]; }; GreyListChIP = derive2 { name="GreyListChIP"; version="1.14.0"; sha256="1hsjv4r88ldb7pgl5a3im8vdhmbiaj0rrn0clij7jfh5p5r81r1r"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer SummarizedExperiment]; }; Guitar = derive2 { name="Guitar"; version="1.20.1"; sha256="1d4j54jdnsi8gi6p0kk6zxkk6kzd1r1k77mw142xlvh8b6zrl3nq"; depends=[GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges Rsamtools rtracklayer]; }; Gviz = derive2 { name="Gviz"; version="1.26.5"; sha256="1dpkcaar7qgzg3vgafvkplprhwmhzpb7ph009kr6ajm36hx4z81c"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings biovizBase BSgenome digest GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges lattice latticeExtra matrixStats RColorBrewer Rsamtools rtracklayer S4Vectors XVector]; }; @@ -602,7 +602,7 @@ in with self; { PepsNMR = derive2 { name="PepsNMR"; version="1.0.2"; sha256="0x7n8faxrczqwn1kkcp22vwag905pswvr2q198kqbh4fjkxgkmrx"; depends=[ggplot2 gridExtra Matrix matrixStats ptw reshape2]; }; PharmacoGx = derive2 { name="PharmacoGx"; version="1.12.0"; sha256="1ddh6bmrddbdmqdpmyy5mlkqvhrk39c19lzybrirfclq6cydfh5g"; depends=[Biobase caTools downloader lsa magicaxis piano RColorBrewer reshape2]; }; PhenStat = derive2 { name="PhenStat"; version="2.18.1"; sha256="1fq01k4cb4gyzh9knbidcqds2qm1wvlz114s6nldzhl3h0x5h6x5"; depends=[car corrplot ggplot2 graph knitr lme4 logistf MASS msgps nlme nortest pingr reshape SmoothWin]; }; - Pi = derive2 { name="Pi"; version="1.10.0"; sha256="03wzmcz57kdflicjb2wmnxg0fvfmbgizvql5164cf24fsi2lvbgi"; depends=[caret dnet GenomeInfoDb GenomicRanges ggbio ggplot2 ggrepel glmnet Gviz igraph lattice MASS Matrix plot3D randomForest ROCR scales supraHex XGR]; }; + Pi = derive2 { name="Pi"; version="1.10.0"; sha256="03wzmcz57kdflicjb2wmnxg0fvfmbgizvql5164cf24fsi2lvbgi"; depends=[caret dnet GenomeInfoDb GenomicRanges ggbio ggplot2 ggrepel glmnet Gviz igraph lattice MASS Matrix plot3D randomForest ROCR scales supraHex]; }; Pigengene = derive2 { name="Pigengene"; version="1.8.1"; sha256="13pmw7nf8fvn9bnnh7fwqgrlg589796nqv83snanqwqsp4fcklid"; depends=[bnlearn C50 GO_db graph impute MASS matrixStats partykit pheatmap preprocessCore Rgraphviz WGCNA]; }; Polyfit = derive2 { name="Polyfit"; version="1.16.1"; sha256="0nlclhj5ni09blwf5prpcp2iiflqk17ca3gqjl5shvl9y9v8nbqb"; depends=[DESeq]; }; PowerExplorer = derive2 { name="PowerExplorer"; version="1.2.2"; sha256="14dzv3p79x95w6185r2srnmw1i8n6x2b1fd2chbx42b3xa65xliy"; depends=[Biobase BiocParallel data_table DESeq2 ggplot2 gridExtra MASS ROTS S4Vectors SummarizedExperiment vsn]; }; @@ -932,7 +932,7 @@ in with self; { celaref = derive2 { name="celaref"; version="1.0.1"; sha256="0sb1mg2ql09jf7hc5kszh3h9cajma0pdwzf8f58pridwhafw5z0p"; depends=[BiocGenerics dplyr ggplot2 magrittr MAST Matrix readr rlang S4Vectors SummarizedExperiment tibble]; }; cellGrowth = derive2 { name="cellGrowth"; version="1.26.1"; sha256="0zmn45i6shr2d6q2dg2p2raz38cy6k8363maq4r4648fx2bmvkb2"; depends=[lattice locfit]; }; cellHTS2 = derive2 { name="cellHTS2"; version="2.46.1"; sha256="1fj1gshgphbbqhywwzvm3xrw8zfp19dc8fi6kbzv20ikf3am9fml"; depends=[Biobase BiocGenerics Category genefilter GSEABase hwriter locfit prada RColorBrewer splots vsn]; }; - cellTree = derive2 { name="cellTree"; version="1.12.1"; sha256="1qr68f39bqykvjbjp5bw71g41wfp369yc88dqz9wppkzi16vl6z0"; depends=[gplots igraph maptpx slam topGO topicmodels xtable]; }; + cellTree = derive2 { name="cellTree"; version="1.12.1"; sha256="1qr68f39bqykvjbjp5bw71g41wfp369yc88dqz9wppkzi16vl6z0"; depends=[gplots igraph slam topGO topicmodels xtable]; }; cellbaseR = derive2 { name="cellbaseR"; version="1.6.1"; sha256="0052wvb6jijs1v8yv1z049n6cy4qcjbrv20gqbsgl14xj0mif26x"; depends=[BiocParallel data_table doParallel foreach httr jsonlite pbapply R_utils Rsamtools tidyr]; }; cellity = derive2 { name="cellity"; version="1.10.1"; sha256="1ifm50ff9q6lwxyi52qzksimnwvd8yddrp7jkidzlykamh5dg05p"; depends=[AnnotationDbi e1071 ggplot2 mvoutlier org_Hs_eg_db org_Mm_eg_db robustbase topGO]; }; cellscape = derive2 { name="cellscape"; version="1.6.0"; sha256="062x43n5jq8hwlrlgd1ffgbpnifac79j9dzd35f6phb6vc1g63dl"; depends=[dplyr gtools htmlwidgets jsonlite plyr reshape2 stringr]; }; @@ -969,7 +969,7 @@ in with self; { coGPS = derive2 { name="coGPS"; version="1.26.0"; sha256="0jsbgx6xdasqii9wcfn4ilf2dfc790lzzby1bhpzlq94nwlr896h"; depends=[]; }; coMET = derive2 { name="coMET"; version="1.14.0"; sha256="09r81ag9ix4jh3zvwyzym9g7rc7vkyhagcv934r8i4fzzvpiqsz4"; depends=[biomaRt colortools corrplot GenomicRanges gridExtra Gviz hash IRanges psych rtracklayer S4Vectors]; }; coRdon = derive2 { name="coRdon"; version="1.0.3"; sha256="1v4zvzff4r54wjgp48l5vazvfy8w0gvvqxxhajm35p6d2bbpfsvd"; depends=[Biobase Biostrings data_table dplyr ggplot2 purrr stringr]; }; - cobindR = derive2 { name="cobindR"; version="1.20.0"; sha256="1bkwjj825srwm3rn3j88p1q35x03f129ca1hk919nnf92psh47nc"; depends=[BiocGenerics biomaRt Biostrings BSgenome gmp gplots IRanges mclust rtfbs seqinr yaml]; }; + cobindR = derive2 { name="cobindR"; version="1.20.0"; sha256="1bkwjj825srwm3rn3j88p1q35x03f129ca1hk919nnf92psh47nc"; depends=[BiocGenerics biomaRt Biostrings BSgenome gmp gplots IRanges mclust seqinr yaml]; }; codelink = derive2 { name="codelink"; version="1.50.0"; sha256="1nfnb9iz8j31ia9979mjvs9gzdbh9zwfy14qxvjrp3dv8d1gf2rx"; depends=[annotate Biobase BiocGenerics limma]; }; coexnet = derive2 { name="coexnet"; version="1.4.0"; sha256="0751781vsr46xs3dpq2n29li1zipzad9qv6xnfdm34v62yaggy94"; depends=[acde affy Biobase GEOquery igraph limma minet rmarkdown siggenes STRINGdb SummarizedExperiment vsn]; }; cogena = derive2 { name="cogena"; version="1.16.0"; sha256="12r86h6fzr6wqvf70jjxf02zm72ks577m6qcv60wiss609c0b0dn"; depends=[amap apcluster Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots kohonen mclust reshape2]; }; @@ -1336,7 +1336,7 @@ in with self; { nem = derive2 { name="nem"; version="2.56.0"; sha256="02j5rm0h9bjghgba244k0acshbnhrr38ghvx6cmf8za8fw19k3v2"; depends=[boot e1071 graph limma plotrix RBGL RColorBrewer Rgraphviz statmod]; }; netReg = derive2 { name="netReg"; version="1.6.0"; sha256="01qxq7zlbmvh0mazw069fm6bjw0ks90baj8y5i0jc7m101dsm2qi"; depends=[Rcpp RcppArmadillo]; }; netSmooth = derive2 { name="netSmooth"; version="1.2.0"; sha256="1cz3rca9ig9jl8ddcadbij129v5rpb86ncfrdmfj4m9qy0krlyac"; depends=[cluster clusterExperiment data_table entropy Matrix scater SingleCellExperiment SummarizedExperiment]; }; - netbenchmark = derive2 { name="netbenchmark"; version="1.14.0"; sha256="1gc8dnma4pr1j9wq422x8xh89mvb15kyvjvv86fhhshvdisihngw"; depends=[c3net corpcor fdrtool GeneNet GENIE3 grndata Matrix minet PCIT pracma Rcpp]; }; + netbenchmark = derive2 { name="netbenchmark"; version="1.14.0"; sha256="1gc8dnma4pr1j9wq422x8xh89mvb15kyvjvv86fhhshvdisihngw"; depends=[c3net corpcor fdrtool GeneNet GENIE3 grndata Matrix minet pracma Rcpp]; }; netbiov = derive2 { name="netbiov"; version="1.16.0"; sha256="0zg4wkf4z6yi84sdp4h8dg8cq5sm6m04abg15hm68y27vw42prs2"; depends=[igraph]; }; nethet = derive2 { name="nethet"; version="1.14.0"; sha256="1xp08ad4lsmrjgvqydr85k4y0b57hcaxicndh4hz4plqswzl7qpf"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network parcor]; }; netprioR = derive2 { name="netprioR"; version="1.8.1"; sha256="1phdaklcwhv1rv94dvz4mcwi5f1b3gya7bwv7489hsx7pa149sac"; depends=[doParallel dplyr foreach ggplot2 gridExtra Matrix pROC sparseMVN]; }; @@ -1501,7 +1501,7 @@ in with self; { savR = derive2 { name="savR"; version="1.20.0"; sha256="13bwq2a2pygdkmhrcmvz525wsi5i01j911711zgs6x93wj20b2w7"; depends=[ggplot2 gridExtra reshape2 scales XML]; }; scDD = derive2 { name="scDD"; version="1.6.1"; sha256="0dp2awajd5281dwpbs0wb8ij2pq9l60p0b80xhxrb41m5qybcri8"; depends=[arm BiocParallel EBSeq fields ggplot2 mclust outliers S4Vectors scran SingleCellExperiment SummarizedExperiment]; }; scFeatureFilter = derive2 { name="scFeatureFilter"; version="1.2.1"; sha256="04bk4kzs42mi022qr8whngkqxapngnvpxifd0m60r57skz3v6yqa"; depends=[dplyr ggplot2 magrittr rlang tibble]; }; - scPipe = derive2 { name="scPipe"; version="1.4.1"; sha256="1kl1ik1wd3cq7h2njzdnzs9r26qnim4r63c86pfbfymz23n4aqns"; depends=[AnnotationDbi BiocGenerics biomaRt dplyr GenomicRanges GGally ggplot2 glue hashmap magrittr MASS mclust org_Hs_eg_db org_Mm_eg_db Rcpp reshape Rhtslib robustbase rtracklayer S4Vectors scales SingleCellExperiment stringr SummarizedExperiment testthat zlibbioc]; }; + scPipe = derive2 { name="scPipe"; version="1.4.1"; sha256="1kl1ik1wd3cq7h2njzdnzs9r26qnim4r63c86pfbfymz23n4aqns"; depends=[AnnotationDbi BiocGenerics biomaRt dplyr GenomicRanges GGally ggplot2 glue magrittr MASS mclust org_Hs_eg_db org_Mm_eg_db Rcpp reshape Rhtslib robustbase rtracklayer S4Vectors scales SingleCellExperiment stringr SummarizedExperiment testthat zlibbioc]; }; scater = derive2 { name="scater"; version="1.10.1"; sha256="0rijhy7g5qmcn927y1wyd63la1fhyar9fv1hccsqd23jd98yc55a"; depends=[beachmat BiocGenerics BiocParallel DelayedArray DelayedMatrixStats dplyr ggbeeswarm ggplot2 Matrix plyr Rcpp reshape2 Rhdf5lib S4Vectors SingleCellExperiment SummarizedExperiment viridis]; }; scde = derive2 { name="scde"; version="2.10.1"; sha256="1n1r08wqx1bds7lwz2bbksw5l084cmcbgs03jr8s2l92z43kqmm6"; depends=[BiocParallel Cairo edgeR extRemes flexmix MASS mgcv nnet pcaMethods quantreg RColorBrewer Rcpp RcppArmadillo rjson RMTstat Rook]; }; scfind = derive2 { name="scfind"; version="1.4.1"; sha256="07lzjqxvdjjzli8ibqvlndgf9n1x477q1pniv91ynrh6jc8dz8cb"; depends=[bit dplyr hash Rcpp reshape2 SingleCellExperiment SummarizedExperiment]; }; @@ -1581,7 +1581,7 @@ in with self; { switchBox = derive2 { name="switchBox"; version="1.18.0"; sha256="1s49vi0vyh0bmrc6marn69hi9ln12j3kyjkkm2z5fpvv3rvxhgw7"; depends=[gplots pROC]; }; switchde = derive2 { name="switchde"; version="1.8.1"; sha256="1ydc9h62iyfz0786c5zhz3189p2f7sf3z6fjlvqwjqxva5j0f12b"; depends=[dplyr ggplot2 SingleCellExperiment SummarizedExperiment]; }; synapter = derive2 { name="synapter"; version="2.6.1"; sha256="19rf8kkqf070ldhnrdi3xl23j2slv4qadw9cx8wvc4p994f2abj9"; depends=[Biobase Biostrings cleaver knitr lattice MSnbase multtest qvalue RColorBrewer readr rmarkdown]; }; - synergyfinder = derive2 { name="synergyfinder"; version="1.8.0"; sha256="1idc0lnjw8zx6nih1hrzfq9h40zkbdv0iv9si214wx4ynf0w18iv"; depends=[drc ggplot2 gplots gridBase lattice nleqslv reshape2]; }; + synergyfinder = derive2 { name="synergyfinder"; version="1.8.0"; sha256="1idc0lnjw8zx6nih1hrzfq9h40zkbdv0iv9si214wx4ynf0w18iv"; depends=[drc ggplot2 gplots gridBase lattice nleqslv reshape2 SpatialExtremes]; }; synlet = derive2 { name="synlet"; version="1.12.1"; sha256="13rghqqbkxni121ds0slf6cnj2g5zbm3sbbcli95z7mxy2wn3syg"; depends=[doBy dplyr ggplot2 magrittr RankProd RColorBrewer reshape2]; }; systemPipeR = derive2 { name="systemPipeR"; version="1.16.1"; sha256="0qzydz87rld2nhwzbfgrw5jfgh8maa9y54mjx9c4285m11qj2shq"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicFeatures GenomicRanges ggplot2 GO_db GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; }; tRNA = derive2 { name="tRNA"; version="1.0.0"; sha256="1kzl79q0zim9y7px0dirk41qay96nl2bz8sw76nx56pr1d5jh245"; depends=[assertive BiocGenerics Biostrings GenomicRanges ggplot2 IRanges S4Vectors scales stringr XVector]; }; diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 8c50affaeffd6..21e36b509cf08 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -4,7 +4,7 @@ # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix { self, derive }: -let derive2 = derive { snapshot = "2020-01-27"; }; +let derive2 = derive { snapshot = "2020-04-25"; }; in with self; { A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; }; ABACUS = derive2 { name="ABACUS"; version="1.0.0"; sha256="0m1dnkwjr1522l9ddbzzx7ayxvli17sbmk6s28adpmzzjwh2kd1i"; depends=[ggplot2 shiny]; }; @@ -19,7 +19,6 @@ in with self; { ACD = derive2 { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; }; ACDm = derive2 { name="ACDm"; version="1.0.4"; sha256="0b4f02ga5ra66mbrm79g0bnlzmii82rks9kmxixxqgf18yhlyjil"; depends=[dplyr ggplot2 plyr Rsolnp zoo]; }; ACEt = derive2 { name="ACEt"; version="1.8.0"; sha256="0626d6kg485xjya164wagrr5z223jvi93ywbwpdns7fkm03c0dlq"; depends=[BH MASS Rcpp RcppArmadillo]; }; - ACMEeqtl = derive2 { name="ACMEeqtl"; version="1.6"; sha256="049xjv2ym35bbn43zwi68cq27fwdh404vp0r2ca5gxgmmx8kj1cz"; depends=[filematrix]; }; ACNE = derive2 { name="ACNE"; version="0.8.1"; sha256="0kzapsalzw6jsi990qicp4glijh5ddnfimsg5pidgbwxg4i05grl"; depends=[aroma_affymetrix aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; }; ACSNMineR = derive2 { name="ACSNMineR"; version="0.16.8.25"; sha256="0gh604s8qall6zfjlwcg2ilxjvz08dplf9k5g47idhv43scm748l"; depends=[ggplot2 gridExtra scales]; }; ACSWR = derive2 { name="ACSWR"; version="1.0"; sha256="195vjrkang5cl7gwsna0aq4p0h4jym9xg9yh94bnf8vq6wf8j83n"; depends=[MASS]; }; @@ -28,28 +27,27 @@ in with self; { ADCT = derive2 { name="ADCT"; version="0.1.0"; sha256="1glf83ydx4v3ld8c4gb9h3jk6srd054bis5l8k57p1ba4fnqnnpp"; depends=[mvtnorm]; }; ADDT = derive2 { name="ADDT"; version="2.0"; sha256="044bb1jw2m8vwk5q8l7rlz4kqphjvy8i9d59rjg0k5q5l9vczfrp"; depends=[coneproj Matrix nlme]; }; ADGofTest = derive2 { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; }; - ADMM = derive2 { name="ADMM"; version="0.3.1"; sha256="121hqglivik65gv657bdv7a8kzgvrwgwckz2h746fcibv2s7dfsi"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo Rdpack]; }; + ADMM = derive2 { name="ADMM"; version="0.3.2"; sha256="0wxjl9pdrcrbbcl1vq48ajgqdm2m1ymaf5xcnr5sf44v50lxyqic"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo Rdpack]; }; ADMMnet = derive2 { name="ADMMnet"; version="0.1"; sha256="15f1zhgv7xai954qz2ahj4kpxyvr2svxpmybz7j43bhjpkq72dmq"; depends=[Matrix Rcpp RcppEigen]; }; ADMMsigma = derive2 { name="ADMMsigma"; version="2.1"; sha256="1943dza086s22pr0yz41wzn9cdg11x7fl9zr3w012865yj219m7l"; depends=[doParallel dplyr foreach ggplot2 Rcpp RcppArmadillo RcppProgress]; }; ADPF = derive2 { name="ADPF"; version="0.0.1"; sha256="1n7302xx77ngvp9i2h582i1mqslzllcdr0bn3pl2zk9jd8k97p7n"; depends=[]; }; ADPclust = derive2 { name="ADPclust"; version="0.7"; sha256="0s47cpsjykn7imsssa9w9b6g9d1sz2yah78yqzxmh0i3lqd757c1"; depends=[cluster dplyr fields knitr]; }; AEDForecasting = derive2 { name="AEDForecasting"; version="0.20.0"; sha256="16q2sn5zzvysyy3r32jnr21pbdkkn0k0sbarni6fdkx7pj27yijn"; depends=[changepoint forecast signal]; }; - AER = derive2 { name="AER"; version="1.2-8"; sha256="04qfqv36scl5r5fssz0qzbq64602x8bj02fy1f2gzrmvlf315gh9"; depends=[car Formula lmtest sandwich survival zoo]; }; + AER = derive2 { name="AER"; version="1.2-9"; sha256="03al0jfxdbi8sqkav7gz3aqbxm32qjdnh4l93vy1jr3n2h5kjy9v"; depends=[car Formula lmtest sandwich survival zoo]; }; AF = derive2 { name="AF"; version="0.1.5"; sha256="1r87ra55g0qm2s8cgsmdwck93ia2vr8zfab3in45mxm5xc501xgk"; depends=[data_table drgee ivtools stdReg survival]; }; AFM = derive2 { name="AFM"; version="1.2.6"; sha256="0yngk3j1wkamqzrwibn2csbn61jbdb872n0gi4d3hyhgilqzwbwf"; depends=[data_table dbscan fftwtools fractaldim ggplot2 gridExtra gstat igraph mixtools moments plyr png pracma rgl scales shiny shinyjs sp stringr]; }; AFheritability = derive2 { name="AFheritability"; version="0.1.0"; sha256="03w0a4z2x539ykyzdxm1mfqkhzz03cg0aqvgi062jrrm5m6f57ix"; depends=[ggplot2 mvtnorm reshape2 shiny]; }; AGD = derive2 { name="AGD"; version="0.39"; sha256="0hmq684snnffc2v7vmns4ky200a6zh1ggiap03n5cvpb3nlqc6lr"; depends=[gamlss gamlss_dist]; }; AGHmatrix = derive2 { name="AGHmatrix"; version="1.0.2"; sha256="0qipqk8p80463hfkbjnkw8ivziqj2xb15l54x52kcgbd9hl4zami"; depends=[Matrix zoo]; }; AGSDest = derive2 { name="AGSDest"; version="2.3.2"; sha256="0f3qchvdi2n1cr8ipjj332dw8hdza58dvfk21p0c6bhmxzg7f71i"; depends=[ldbounds]; }; - AGread = derive2 { name="AGread"; version="1.0.0"; sha256="0z0c43m7sgw9qfwmr9jv6ppx2zvrm3mpb5gljg5bvv5gd3cfxbpy"; depends=[anytime binaryLogic data_table DescTools dplyr GGIR lubridate magrittr PAutilities Rcpp rlang seewave stringr]; }; + AGread = derive2 { name="AGread"; version="1.1.1"; sha256="0ar0cnlaxxmvn2gdydmm9vr45xjhx06kky556d17l93k0xwfvzm3"; depends=[anytime binaryLogic data_table DescTools dplyr GGIR lubridate magrittr PAutilities Rcpp reshape2 rlang seewave stringr]; }; AHM = derive2 { name="AHM"; version="1.0.1"; sha256="00r1rn7d64a18rckbxvla5yapqv00p9ajxv72fx7s6p80kfal89w"; depends=[devtools dplyr glmnet Matrix mixexp plgp quadprog tibble tidyr]; }; AHMbook = derive2 { name="AHMbook"; version="0.1.4"; sha256="1cxyk420pzhh1scagxjmpm328xrcc1mpdrrch92yfgbgx09zkr4c"; depends=[coda plotrix RandomFields raster sp unmarked]; }; - AHR = derive2 { name="AHR"; version="1.5.0"; sha256="0sscw80cz4r1xmdymp9knz0dfans7yzwjwklv7ahafxlflw5527h"; depends=[etm MASS Rcpp RcppArmadillo survival]; }; AICcmodavg = derive2 { name="AICcmodavg"; version="2.2-2"; sha256="0kpdl31wmwk5i4cqcwlm66c9s0c2b793army9dx50hdgrrzqc0na"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; }; AID = derive2 { name="AID"; version="2.5"; sha256="0il6qjv1gcbxdf1lknsfij4vxzc31qyp359abqzdvkzyxwgbbzsy"; depends=[ggplot2 MASS nortest psych tseries]; }; AIG = derive2 { name="AIG"; version="0.1.9"; sha256="1jnnfmcwxcv4fsdcz7jb2lgczxdwrq3qxg2bhsh1610iwz4gzii7"; depends=[dplyr magrittr mgcv rgl]; }; AIM = derive2 { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival]; }; - ALA4R = derive2 { name="ALA4R"; version="1.7.0"; sha256="1vprq3w8pzla2ffsalpqgzkdv8wqialr45sq0qa0xjdlsrdwxipp"; depends=[assertthat data_table digest httr jsonlite sp stringr wellknown]; }; + ALA4R = derive2 { name="ALA4R"; version="1.8.0"; sha256="0bxfpzj6993sdhh5002vmf84r6gfd46s9vjw3d58hbyrxnsiaipr"; depends=[assertthat data_table digest httr jsonlite sp stringr wellknown]; }; ALDqr = derive2 { name="ALDqr"; version="1.0"; sha256="0gk8hxh4p0fi47sf1zsvvxxbzp38vzk60wh8hmc63phnjab6qkv4"; depends=[HyperbolicDist sn]; }; ALEPlot = derive2 { name="ALEPlot"; version="1.1"; sha256="0bakl8a7xda7vh9zsc66kkd5w5jmb5j28kfwpfq2ifvk2mrakr3w"; depends=[yaImpute]; }; ALS = derive2 { name="ALS"; version="0.0.6"; sha256="1swrn39vy50fazkpf97r7c542gkj6mlvy8gmcxllg7mf2mqx546a"; depends=[Iso nnls]; }; @@ -58,16 +56,16 @@ in with self; { ALTopt = derive2 { name="ALTopt"; version="0.1.2"; sha256="1nbbvniramajg6k83xqgx7r0abjrfja8zz0y3g3j8qmvbcqmjx13"; depends=[cubature lattice]; }; ALassoSurvIC = derive2 { name="ALassoSurvIC"; version="0.1.0"; sha256="0q02rz947bp6i7sbb5nzxq8ky74iprdnpbwnmnn7vg29vhca4b09"; depends=[Rcpp]; }; AMAP_Seq = derive2 { name="AMAP.Seq"; version="1.0"; sha256="0z0rrzps6rm58k4m1ybg77s3w05m5zfya4x8ril78ksxsjwi3636"; depends=[]; }; - AMCP = derive2 { name="AMCP"; version="0.0.4"; sha256="051xvnr4zc25w00kh4gkffgigmhmcbqpwh9654jv37glr8ip2v3l"; depends=[]; }; + AMCP = derive2 { name="AMCP"; version="1.0.0"; sha256="0qb5vcg351jd0ss17zqx6vvyin38qr4dbvc05xc5z8rbca8z6cap"; depends=[]; }; AMCTestmakeR = derive2 { name="AMCTestmakeR"; version="1.0.0"; sha256="1vgncc61gmqhax2a7072jb36bzkycv80xqihkr5qs8jxnqqkndxd"; depends=[]; }; AMGET = derive2 { name="AMGET"; version="1.0"; sha256="18wdzzg5wr7akbd1iasa4mvmy44fb2n5gpghwcrx80knnicy3dxq"; depends=[]; }; AMIAS = derive2 { name="AMIAS"; version="1.1.0"; sha256="08scimlbr22cjr6fqi13rsvpc52sp4psnhrwir5pfl6qcpl1k22j"; depends=[limSolve Matrix zoo]; }; AMModels = derive2 { name="AMModels"; version="0.1.4"; sha256="18h075bzk8s75b3zmjd0x8c6dpl40445d4kv8n0p4ldnx80b1aha"; depends=[unmarked]; }; AMOEBA = derive2 { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; }; - AMORE = derive2 { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; }; + AMORE = derive2 { name="AMORE"; version="0.2-16"; sha256="0vw6hhykg1r6xxja6d4zb2y00x7pfkmhcq9xkidz8p4arinb7xnl"; depends=[]; }; AMPLE = derive2 { name="AMPLE"; version="0.0.2"; sha256="0j19f8rl7gkads4n52l5gfc5k7dx27sswzrypwl7dnxhfp4ivql7"; depends=[dplyr ggplot2 shiny shinyjs tidyr wesanderson]; }; - AMR = derive2 { name="AMR"; version="0.9.0"; sha256="14y7ghqhx3apc2ad4lbjd2swzwgw1qzj0scdgx8jq4b2cv4z2gz6"; depends=[backports cleaner crayon data_table dplyr ggplot2 knitr microbenchmark pillar rlang tidyr]; }; - ANN2 = derive2 { name="ANN2"; version="2.3.2"; sha256="0ib6cs2az0hhfg7vj4dk6fxbwjlc305psqjs188fdya2jrxgq1gs"; depends=[ggplot2 Rcpp RcppArmadillo reshape2 testthat viridisLite]; }; + AMR = derive2 { name="AMR"; version="1.1.0"; sha256="0d157469rkpbxq7b53ibmz84vr6kcf896npn7w1vndfi5rjdlvb4"; depends=[backports cleaner crayon data_table dplyr ggplot2 knitr microbenchmark pillar R6 rlang tidyr vctrs]; }; + ANN2 = derive2 { name="ANN2"; version="2.3.3"; sha256="12l02fnnfa42qy4w1bv2zr963k61xn7mbpj9rycdzi8wl18hxrb8"; depends=[ggplot2 Rcpp RcppArmadillo reshape2 testthat viridisLite]; }; ANOM = derive2 { name="ANOM"; version="0.5"; sha256="14nfy9xplbabfprwxz5fvx26nmqhp657vr6d90dc8vk8ds63ckiz"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; }; ANOVA_TFNs = derive2 { name="ANOVA.TFNs"; version="1.0"; sha256="0dwspvxj2gzyvxsd9xyhv47n1hjlqa7z9qza4h3hn1xda12vkjly"; depends=[FuzzyNumbers]; }; ANOVAIREVA = derive2 { name="ANOVAIREVA"; version="0.1.0"; sha256="04z2g79nnh5yhn4aqw0i7ck2b1z5dbasf1zp1sj6rjjrp9aqmaa6"; depends=[car dplyr ggplot2 plotly rmarkdown shiny]; }; @@ -82,18 +80,20 @@ in with self; { APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; }; APfun = derive2 { name="APfun"; version="0.1.4"; sha256="0k4m3zwxcjfb1y4njig6yyjqzsvqi99zmglbfpvp65s829zxd881"; depends=[maptools raster rgdal sp]; }; APtools = derive2 { name="APtools"; version="6.8.8"; sha256="171aydyd7s8qll7djl4ysy596wxdf5wfwpqwfi14jjglc9r9qrrr"; depends=[cmprsk survival]; }; + AQLSchemes = derive2 { name="AQLSchemes"; version="1.6-9"; sha256="0wv2w8nwkfx5j4ds2azasxwy8mafxaxj6pfdkqkf9n57w2q3i1bj"; depends=[]; }; + AQuadtree = derive2 { name="AQuadtree"; version="1.0.0"; sha256="159p1cymvgf8grpnkgkf6nind2kv6c62aa96qb32aiayrgrm4y4c"; depends=[dplyr sp]; }; AR = derive2 { name="AR"; version="1.1"; sha256="1wn4g2997c4vc3mzq2pv8ld0ryp0i78v4zlqqryvhshxgnz4f2pr"; depends=[DISTRIB]; }; AR1seg = derive2 { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; }; ARCensReg = derive2 { name="ARCensReg"; version="2.1"; sha256="05zjk1wxqfigzg80lvx1940a059jfdr9zbzgzmz2n01glj1lvj63"; depends=[msm mvtnorm numDeriv tmvtnorm]; }; + ARDL = derive2 { name="ARDL"; version="0.1.0"; sha256="08hjxq961jq46kr6fqpjzv9c1sq63amqm0lr40p4wjl7mpf93xzm"; depends=[aod dplyr dynlm lmtest msm stringr zoo]; }; ARHT = derive2 { name="ARHT"; version="0.1.0"; sha256="1fz81a202r8vk655dg6a03zfq3gfkimqjvmc95k3j02xz0iv58kn"; depends=[]; }; ARIbrain = derive2 { name="ARIbrain"; version="0.2"; sha256="18c7yxkrnqh18gcfzvdc5wqig6ywdmjcy8rlz0fdj3b8fb84dfpr"; depends=[hommel plyr RNifti]; }; AROC = derive2 { name="AROC"; version="1.0-2"; sha256="1a7nxspq9kbzji417mr49i0s19ms8wyq48qz7rnlw1mrkipl4p6d"; depends=[Hmisc MASS Matrix moments nor1mix np spatstat]; }; ARPobservation = derive2 { name="ARPobservation"; version="1.2.0"; sha256="1kgflalpymbsfzwg4c70mdxgrbsg8r8z44433v3y9rymhfyq9nmj"; depends=[]; }; ART = derive2 { name="ART"; version="1.0"; sha256="186w1ivj5v3h906crl953qxgai5wiznaih83dgvwgnmabs9p1wvk"; depends=[car]; }; ARTIVA = derive2 { name="ARTIVA"; version="1.2.3"; sha256="1jdvsslc8parz7wibcv51fx62brl2mc6i482hz43j1npsms2z1hl"; depends=[gplots igraph MASS]; }; - ARTP = derive2 { name="ARTP"; version="2.0.5"; sha256="0lwvhf5lamw28sd41vrhyin8ab92rl93j1ahk0aacwvnikgmfkpj"; depends=[]; }; ARTP2 = derive2 { name="ARTP2"; version="0.9.45"; sha256="12nqxry2jkl1n07rbms38mrnp39cn00d0h272d9f1z5x883flv62"; depends=[data_table Formula]; }; - ARTool = derive2 { name="ARTool"; version="0.10.6"; sha256="1wln9s3j3bs5svykp3as483q61fvlfsdcjlb8cs3mzw43nlp591i"; depends=[car dplyr lme4 magrittr plyr]; }; + ARTool = derive2 { name="ARTool"; version="0.10.7"; sha256="1qk029q5ikz33s0d1gpywdb54ljvdlyxkb9v6zrc86f5ixcc7dnd"; depends=[car dplyr lme4 magrittr plyr]; }; ARpLMEC = derive2 { name="ARpLMEC"; version="1.0"; sha256="0irgyf8acg1qn60npchvs258d0cf6cxm53xw0s8qg8iyqns52p75"; depends=[gmm lmec MASS Matrix mnormt mvtnorm numDeriv sandwich tmvtnorm]; }; ASGS_foyer = derive2 { name="ASGS.foyer"; version="0.2.1"; sha256="0f0bl1fxda012d8pgqpaqb80m0nn490xih3ddscfqgb87zgrp4sx"; depends=[sp]; }; ASIP = derive2 { name="ASIP"; version="0.4.9"; sha256="06f1nvy920vyx3bmdi77mwvfsn32xsfxaslhagnf1zh652vfkbwi"; depends=[raster rgdal stringr]; }; @@ -109,6 +109,7 @@ in with self; { AUC = derive2 { name="AUC"; version="0.3.0"; sha256="0ripcib2qz0m7rgr1kiz68nx8f6p408l1ww7j78ljqik7p3g41g7"; depends=[]; }; AUCRF = derive2 { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; }; AUtests = derive2 { name="AUtests"; version="0.98"; sha256="0m2nl55qfwfzlf92f43b9q75xqvrlx7qzcz6qlnjbjcr80s0qj9q"; depends=[logistf]; }; + AWAPer = derive2 { name="AWAPer"; version="0.1.3"; sha256="0v753kp4acjhhfyq9492sr7x9931cq3i774yva322x4dskvk8n2w"; depends=[chron Evapotranspiration maptools ncdf4 R_utils raster sp zoo]; }; AWR = derive2 { name="AWR"; version="1.11.189"; sha256="0q9ss6cyx8vv85zif5v4s2bkv0amhyvzbs41mjjgmwb1csg53jgd"; depends=[rJava]; }; AWR_Athena = derive2 { name="AWR.Athena"; version="2.0.7-0"; sha256="1j9bqhyk0jzry4g379ml65gwxlszn7pjif1dywgns98jbry8mavh"; depends=[rJava RJDBC]; }; AWR_KMS = derive2 { name="AWR.KMS"; version="0.1"; sha256="00aqhyqlncsv0vfcyhaazxaclwm63v5kscssash7529avdwd4gqg"; depends=[AWR jsonlite rJava]; }; @@ -119,19 +120,18 @@ in with self; { AcceptanceSampling = derive2 { name="AcceptanceSampling"; version="1.0-6"; sha256="1z3rmln63ki2kik9kinbwr9qhr32ggbmh4mm3xqy6di119n47ca9"; depends=[]; }; AcousticNDLCodeR = derive2 { name="AcousticNDLCodeR"; version="1.0.2"; sha256="1fgzgwanpv2pzy74xdk3hamc44p8qch467wh163dxby8jr9ik0sb"; depends=[seewave tuneR zoo]; }; AcrossTic = derive2 { name="AcrossTic"; version="1.0-3"; sha256="03180h79jhjd66ibrnsfp3yyp2jlfysp7cymw46phzj2palghsc0"; depends=[lpSolve treeClust]; }; - ActFrag = derive2 { name="ActFrag"; version="0.1.0"; sha256="06l5a679j6289008ls57v420mnzpq9a4ln7svi5bh0vpvws7sr9d"; depends=[accelerometry dplyr ineq survival tidyr]; }; - Actigraphy = derive2 { name="Actigraphy"; version="1.3.2"; sha256="0y0ccmxhdfhdmi4k6pbfvnqknkqbgvfsf2qf7z7rc4xpfgym6574"; depends=[fda SDMTools]; }; + ActFrag = derive2 { name="ActFrag"; version="0.1.1"; sha256="08r3gwjz4fkyy85dxqix0ffm5xyq45032qv3snnzxnlqxslxbqn1"; depends=[accelerometry dplyr ineq survival tidyr]; }; + Actigraphy = derive2 { name="Actigraphy"; version="1.4.0"; sha256="0bpmvszzv5fm72nar3wgnmfl5am7znqfajmlbv38ihkbi7jbwk20"; depends=[fda]; }; ActiveDriver = derive2 { name="ActiveDriver"; version="1.0.0"; sha256="10c7ga48fwvpd5mc4dqiyw4kc2l0iz5qn4hg7xk15r1qmm5rsipa"; depends=[MASS]; }; ActiveDriverWGS = derive2 { name="ActiveDriverWGS"; version="1.0.1"; sha256="08l9dj8d3cd74z1dqn8n4yqykwvqjxsfa067wnxyh7xnfvvnm5v1"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb GenomicRanges IRanges plyr S4Vectors]; }; - ActivePathways = derive2 { name="ActivePathways"; version="1.0.1"; sha256="1xb0d1svmzw404pv8ja6wr4773k7x2lxkrzrayilvzqbfzj1wx20"; depends=[data_table ggplot2 metap]; }; AcuityView = derive2 { name="AcuityView"; version="0.1"; sha256="0f0iclmnwdc8ixiiai4svk4x1g3pjy7dhm3cm58fv6ckx12d3d2l"; depends=[fftwtools imager plotrix]; }; - AdMit = derive2 { name="AdMit"; version="2.1.3"; sha256="150zjxl56axhpgm25hzyhwwc5g77pkgi291d2v56zbjjqycfz2v8"; depends=[mvtnorm]; }; + AdMit = derive2 { name="AdMit"; version="2.1.5"; sha256="1gsskg3ayzyz0wa4abi20zzmkbnal6igwd6m7rafvpgzlffms1r9"; depends=[mvtnorm]; }; AdaSampling = derive2 { name="AdaSampling"; version="1.3"; sha256="1c8dh8lxyb076317n4qk2g3qv5j4mc1dszbh3k1p2b0nxiprqk5i"; depends=[caret class e1071 MASS]; }; AdapEnetClass = derive2 { name="AdapEnetClass"; version="1.2"; sha256="01k3mj4g1ckbng7wkzzn9h0k9yf01cpnnkly0sjda574c5jhj0rc"; depends=[glmnet imputeYn lars quadprog]; }; AdapSamp = derive2 { name="AdapSamp"; version="1.1.1"; sha256="1jayjrsiib2ij4rxxj59g71r3xhzl5yqh0lhi8k6cfy03i7dkvis"; depends=[pracma]; }; AdaptFit = derive2 { name="AdaptFit"; version="0.2-2"; sha256="124lj1sq5cbp35z4ybkc7ci3fi6pgf8pc5k9mpqmyb6dj870q836"; depends=[cluster MASS nlme SemiPar]; }; AdaptFitOS = derive2 { name="AdaptFitOS"; version="0.67"; sha256="0s8vv960pkbccpwlfsg1jsfjnfmq9iy8cj1fak5fn2s60zb7nm0a"; depends=[MASS mgcv nlme SemiPar]; }; - AdaptGauss = derive2 { name="AdaptGauss"; version="1.5.4"; sha256="16p5q5lqq7ys1v4ciiqsp4sw8wlr0w8rjwibr0qgvvdp2wv0lmzd"; depends=[DataVisualizations ggplot2 pracma Rcpp shiny]; }; + AdaptGauss = derive2 { name="AdaptGauss"; version="1.5.6"; sha256="076jjnqp4ayq4kh95qns4kfzfvl6mjllhsq6hfp66bww7w976xxh"; depends=[DataVisualizations pracma Rcpp shiny]; }; AdaptiveSparsity = derive2 { name="AdaptiveSparsity"; version="1.6"; sha256="0imr5m8mll9j6n4icsv6z9rl5kbnwsp9wvzrg7n90nnmcxq2cz91"; depends=[MASS Matrix Rcpp RcppArmadillo]; }; AdequacyModel = derive2 { name="AdequacyModel"; version="2.0.0"; sha256="0amp6ic1wylk24sp9wpx3ci38njj7b9qjqfp89j39hkl6kc1q7sq"; depends=[]; }; AdhereR = derive2 { name="AdhereR"; version="0.5"; sha256="0wma06v02k50j0j8j5k1py3y6mwl8q7bsb288gyn67ms9wgv4fb5"; depends=[clipr colourpicker data_table DBI haven highlight knitr lubridate manipulate readODS readxl RMariaDB RSQLite scales shiny shinyjs shinyWidgets V8 viridisLite]; }; @@ -147,8 +147,8 @@ in with self; { AlgebraicHaploPackage = derive2 { name="AlgebraicHaploPackage"; version="1.2"; sha256="1krm5cx609sv2p0g3xm5jaiqs9li06v717lw7ywjvx7myc9x4c07"; depends=[]; }; AllPossibleSpellings = derive2 { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; }; AlleleRetain = derive2 { name="AlleleRetain"; version="2.0.2"; sha256="0b6h5giskqbjbrk8nf29i75wrhxsjw1c87laiqzrpbp9n717bl20"; depends=[]; }; - AlphaPart = derive2 { name="AlphaPart"; version="0.7.0"; sha256="1bqwbjqmazjgmdpk5s0i3dl4hb3qhz2sy1drhazmgdxhf5qwsq85"; depends=[directlabels gdata ggplot2 pedigree quadprog Rcpp reshape]; }; - AlphaSimR = derive2 { name="AlphaSimR"; version="0.11.1"; sha256="0j8sw9pcxc1qbv6phcs92inyx6hwdfy05ww0y1a5dga39lap1r57"; depends=[BH R6 Rcpp RcppArmadillo]; }; + AlphaPart = derive2 { name="AlphaPart"; version="0.8.1"; sha256="0gmiwx6f1bzyakz6yz9bk25xlys7rlapglrqv5qkmn4l4ddqyhwq"; depends=[directlabels gdata ggplot2 pedigree Rcpp reshape]; }; + AlphaSimR = derive2 { name="AlphaSimR"; version="0.12.1"; sha256="1j7bz54lqh59fnlxcipg0v8iiaqib0prjnhvb0qinzxz0narh7gp"; depends=[BH R6 Rcpp RcppArmadillo]; }; AlphaVantageClient = derive2 { name="AlphaVantageClient"; version="0.0.1"; sha256="095m850v945lw7i3qd812p28srdb5hdk9h52zf6bkr166zai1ni0"; depends=[httr xts]; }; Amelia = derive2 { name="Amelia"; version="1.7.6"; sha256="1shvc8x1kmb0cincgggsv5c5w25k36kqvisdqd3ayy5g98vqvh33"; depends=[foreign Rcpp RcppArmadillo]; }; AmericanCallOpt = derive2 { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; }; @@ -168,10 +168,9 @@ in with self; { AnnotationBustR = derive2 { name="AnnotationBustR"; version="1.2"; sha256="1r52qry6xvn79b6qsbch35jhzg8y71kxqq9xm6gd302cv2xbwq7q"; depends=[ape seqinr]; }; AnnuityRIR = derive2 { name="AnnuityRIR"; version="1.0-0"; sha256="0yvfqzwhm5nhywfhzkxkfm07c0qi6z21j1cdaypz89qn567aj1d9"; depends=[actuar EnvStats fitdistrplus mc2d tseries]; }; AntAngioCOOL = derive2 { name="AntAngioCOOL"; version="1.2"; sha256="1krwms0y3xppc2y4m0az51wcbh4jq7mlr0jwinp66w8gh4k3qnp2"; depends=[caret rJava rpart RWeka]; }; - AntMAN = derive2 { name="AntMAN"; version="1.0"; sha256="1dm2fb59r4drbyi21bf48c9r6ajhm507q80syl3xwyqimgbgm8ss"; depends=[mcclust mvtnorm Rcpp RcppArmadillo sdols]; }; AntWeb = derive2 { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[assertthat httr leafletR plyr rjson]; }; AnthropMMD = derive2 { name="AnthropMMD"; version="3.0.1"; sha256="0f2j4nwni87r11zav4lvy0c8k9v6yrk2li3vls2xa02nlci64x26"; depends=[plotrix scatterplot3d shiny smacof]; }; - Anthropometry = derive2 { name="Anthropometry"; version="1.13"; sha256="1f568ri1s6psaby8y737vrkarbjg64v89d4jyw23hy17apdmszr8"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; }; + Anthropometry = derive2 { name="Anthropometry"; version="1.14"; sha256="0y52g15pcgs4b68sfczn6nnpdqsialsb4mq3wb9a2gba7qdcf76y"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; }; Aoptbdtvc = derive2 { name="Aoptbdtvc"; version="0.0.2"; sha256="1bygvf8vgzz3wa4485x2xxpk784zmw1nwsjjjysm12brrldh8zzh"; depends=[lpSolve MASS]; }; ApacheLogProcessor = derive2 { name="ApacheLogProcessor"; version="0.2.3"; sha256="0h4snigh1yhp34vw52h4b6qbh9c4cvwz2cx8fwvbnw6lslmg5cgv"; depends=[doParallel foreach stringr]; }; AppliedPredictiveModeling = derive2 { name="AppliedPredictiveModeling"; version="1.1-7"; sha256="1wi0sw5w1c51rmh9z98wdpk5rgzsylkkb6g019djiwxvj92l99hh"; depends=[CORElearn ellipse lattice MASS plyr reshape2]; }; @@ -185,37 +184,35 @@ in with self; { ArgumentCheck = derive2 { name="ArgumentCheck"; version="0.10.2"; sha256="0mgx7mzbg2wynixcf9hvs0i9p4zka7c3chrfvjmvvvwwgsy24hkc"; depends=[]; }; Arothron = derive2 { name="Arothron"; version="1.1.1"; sha256="18vman573mss704v5rqa13vq5nwlbdrg1j5b4wc441782znm34y3"; depends=[abind alphashape3d compositions doParallel foreach geometry Morpho rgl Rvcg stringr vegan]; }; ArrayBin = derive2 { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[SAGx]; }; - AsioHeaders = derive2 { name="AsioHeaders"; version="1.12.1-1"; sha256="0phcagfjxrakkap0kffclcqjspb2rmhq81k934mxgh1qz5a68ksv"; depends=[]; }; - AssayCorrector = derive2 { name="AssayCorrector"; version="2.0.0"; sha256="0d2444if5hyfbzyminnspw686r5l4pf9cdj9k48n2539vd61k452"; depends=[kSamples lattice latticeExtra RColorBrewer RVAideMemoire]; }; + AsioHeaders = derive2 { name="AsioHeaders"; version="1.12.2-1"; sha256="0ibbw8njqq53d2gvwh604xkmkjc02zf8z30gm0a1d6cx82n0w8h8"; depends=[]; }; AssetCorr = derive2 { name="AssetCorr"; version="1.0.3"; sha256="0xcyj9xw895p4j03j9c76k7ylhkmf777akg4m90av12ad05njjbv"; depends=[boot ggplot2 mvQuad mvtnorm numDeriv Rdpack VineCopula]; }; AssetPricing = derive2 { name="AssetPricing"; version="1.0-1"; sha256="0pbb1362dgdipbj3h50ykissl3gdqf1j1mpq53ixprvyc966c5h4"; depends=[deSolve polynom]; }; AssocAFC = derive2 { name="AssocAFC"; version="1.0.2"; sha256="1rjiiir472dnr15xyvpn81s62nf01gl70khr8mrni65ssp5m30fb"; depends=[CompQuadForm]; }; AssocTests = derive2 { name="AssocTests"; version="0.0-4"; sha256="1fhqzbj4aj4srkiba79w8wdyc7yy701izklxqqa7lsifnca6gn4j"; depends=[cluster combinat fExtremes mvtnorm]; }; AssotesteR = derive2 { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; }; - AsyK = derive2 { name="AsyK"; version="1.5.3"; sha256="0pa8j757kvb82n1hn2npvv3yam0s1l3mgd7130kz7pas2gkwwy5n"; depends=[decon ICV kedd kerdiest KernSmooth ks locfit OSCV sm]; }; + AsyK = derive2 { name="AsyK"; version="1.5.4"; sha256="0l2d6h1i5bvxizvcjq15z0dhq274qz07fq6hh4j6d6ifm0z34829"; depends=[decon ICV kedd kerdiest KernSmooth ks locfit OSCV sm]; }; AsynchLong = derive2 { name="AsynchLong"; version="2.1"; sha256="111kg1cacqlz4df1lnijybnrifjscjm78ji9p0ia615gacvdcfxa"; depends=[]; }; AtelieR = derive2 { name="AtelieR"; version="0.24"; sha256="0yialpmbsbx70gvps4r58xg9wvqcril8j8yd61lkkmz4b3195zai"; depends=[cairoDevice gWidgetsRGtk2 partitions proto]; }; AtmRay = derive2 { name="AtmRay"; version="1.31"; sha256="162078jd032i72sgaar9hqcnn1lh60ajcqpsz4l5ysxfkghcxlh8"; depends=[]; }; AurieLSHGaussian = derive2 { name="AurieLSHGaussian"; version="0.2.0"; sha256="0dzwqv396inbx4r6758vr4gip1y42ahavspadgm4xhafvipg73rb"; depends=[flexclust igraph lsa reshape2 stringdist]; }; AutoDeskR = derive2 { name="AutoDeskR"; version="0.1.3"; sha256="1n7c8ris8b517bs1wahpvrhwfbvn2q4jbq01kgiv9lfmkjckzfkc"; depends=[httr jsonlite shiny]; }; - AutoModel = derive2 { name="AutoModel"; version="0.4.9"; sha256="07wpdf5b1z6lk69nqybzx333zc57wbnga6dp0vkf1d50hxmpd9yc"; depends=[aod BaylorEdPsych broom car dplyr gtools lmtest MASS ROCR rowr]; }; AutoPipe = derive2 { name="AutoPipe"; version="0.1.6"; sha256="0bzllh92fgsmz79lh6m2f10vsx5qng4l7bwbwkp2kzwnncy7cq63"; depends=[annotate cluster clusterProfiler ConsensusClusterPlus fgsea msigdbr org_Hs_eg_db pamr RColorBrewer Rtsne siggenes]; }; AutoSEARCH = derive2 { name="AutoSEARCH"; version="1.5"; sha256="1s2ldhxijd8n9ba78faik6gn4f07pdzksy0030pqyafxlr3v1qdj"; depends=[lgarch zoo]; }; AutoStepwiseGLM = derive2 { name="AutoStepwiseGLM"; version="0.2.0"; sha256="0wwi8hg2q1zkf28rq7bj0f9fcxc5hj59hkmk0gl9p8i3rghlyrms"; depends=[caret formula_tools]; }; Autoplotprotein = derive2 { name="Autoplotprotein"; version="1.1"; sha256="13mxqmhhdiq7mz4m6nx39dsq7x3bm8fsgskswx48vsq6x2k6byxa"; depends=[ade4 plotrix plyr seqinr XML]; }; AutoregressionMDE = derive2 { name="AutoregressionMDE"; version="1.0"; sha256="1dmg0q4sp2d2anzhw2my8xjhpyjsx0kf7r202q5bkw8yr57jnhvr"; depends=[]; }; + Autoseed = derive2 { name="Autoseed"; version="0.1.0"; sha256="0xr3sjfccvp8h18jqxzajb2pfn4nm8q9maic6k9zzr15fxvphiy5"; depends=[]; }; AzureAuth = derive2 { name="AzureAuth"; version="1.2.3"; sha256="0vi5888qvsmdwvzz46wabg2244liwfzyjd13h1d3wvbarzy7m8wf"; depends=[httr jose jsonlite openssl R6 rappdirs]; }; AzureCognitive = derive2 { name="AzureCognitive"; version="1.0.0"; sha256="1yg8fq77fbgf21dg9zq7kkgqyx6ax9ma46yv1nhnvdhc3dpvax5a"; depends=[AzureAuth AzureRMR httr jsonlite]; }; - AzureContainers = derive2 { name="AzureContainers"; version="1.2.0"; sha256="1mr1xpb1wl8khzhi6hcbfvxmn7jc1p4n7m76rc13axjgv6cb00zr"; depends=[AzureGraph AzureRMR httr openssl processx R6]; }; + AzureContainers = derive2 { name="AzureContainers"; version="1.2.1"; sha256="0ihs0wv91y1klzwcbfy44yx12l8rxpa4g2vm2dbd7g9pz172w7hl"; depends=[AzureGraph AzureRMR httr openssl processx R6]; }; AzureGraph = derive2 { name="AzureGraph"; version="1.1.0"; sha256="0b7bfzvv0115giahs12b0h4qq4fdc5qf5kc8hmvjca6jlgysgvf4"; depends=[AzureAuth httr jsonlite openssl R6]; }; AzureKeyVault = derive2 { name="AzureKeyVault"; version="1.0.3"; sha256="06lz7cg3f9qrl9nzi54fsx37gm517skjl0jn1fwq4s4b07p4klia"; depends=[AzureAuth AzureGraph AzureRMR httr jose jsonlite openssl R6]; }; - AzureKusto = derive2 { name="AzureKusto"; version="1.0.4"; sha256="14gp9qif8p6h7dnw5isls2kvlf77bz3lwr15by2cpa0w5rvzamaj"; depends=[AzureAuth AzureRMR DBI dplyr httr jsonlite openssl R6 rlang tibble tidyselect]; }; - AzureRMR = derive2 { name="AzureRMR"; version="2.3.0"; sha256="01yj145897v2017asy31rxmkzng7zv1r6avnp2c8vl707cd7afd5"; depends=[AzureAuth AzureGraph httr jsonlite R6 uuid]; }; - AzureStor = derive2 { name="AzureStor"; version="3.1.0"; sha256="0wnb7mrchcd3s6zs6ry09xzsvsvgb3s95gagvsprns7y0adgb85m"; depends=[AzureRMR httr mime openssl R6 xml2]; }; - AzureVM = derive2 { name="AzureVM"; version="2.1.0"; sha256="0vb295kcz7j53xhzgsril56b4l8d69jyvkni67bqk8cxxh4qvsgx"; depends=[AzureRMR jsonlite R6]; }; + AzureKusto = derive2 { name="AzureKusto"; version="1.0.5"; sha256="0xzrhqysazcwwp5ismf6pi0kyyncwwp4a0p9s47m0gm8fyhz1h7g"; depends=[AzureAuth AzureRMR DBI dplyr httr jsonlite openssl R6 rlang tibble tidyselect]; }; + AzureRMR = derive2 { name="AzureRMR"; version="2.3.2"; sha256="18lr68axnr728mhgydifgrvwj640vyhqhgh9y4ppb2xv5smbxq7n"; depends=[AzureAuth AzureGraph httr jsonlite R6 uuid]; }; + AzureStor = derive2 { name="AzureStor"; version="3.2.0"; sha256="0g5j5kb5kf62md3yjyjm2py823zikhnsdbq51gk66ixnzzily4sc"; depends=[AzureRMR httr mime openssl R6 xml2]; }; + AzureVM = derive2 { name="AzureVM"; version="2.1.1"; sha256="0kls78lbyp5i0dg3a7nz183r7chw1hhwzqyvmp27jhihazls90ij"; depends=[AzureRMR jsonlite R6]; }; AzureVMmetadata = derive2 { name="AzureVMmetadata"; version="1.0.0"; sha256="0k99ncp9zkyxl0r51041rfgq49gb65f5d3yc89d1gg2aqavk3g2y"; depends=[httr openssl]; }; - AzureVision = derive2 { name="AzureVision"; version="1.0.0"; sha256="1mvnq65sh3kgxfwxvfp26vv0nwa3xldkp65ya4mm0rqxr4zm3h4w"; depends=[AzureCognitive AzureRMR httr]; }; - B2Z = derive2 { name="B2Z"; version="1.4"; sha256="0w7394vs883vb32gs6yhrc1kh5406rs851yb2gs8hqzxad1alvpn"; depends=[coda mvtnorm numDeriv]; }; + AzureVision = derive2 { name="AzureVision"; version="1.0.1"; sha256="0wfnq77rn10wpj0d3s8mbpybc3dgvjc4f3lhgalabif4h11zgz9c"; depends=[AzureCognitive AzureRMR httr]; }; BACA = derive2 { name="BACA"; version="1.3"; sha256="1vbip7wbzix1s2izbm4058wmwar7w5rv3q8bmj9pm7hcapfi19k0"; depends=[ggplot2 RDAVIDWebService rJava]; }; BACCO = derive2 { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[approximator calibrator emulator]; }; BACCT = derive2 { name="BACCT"; version="1.0"; sha256="0bpm4l27vbblzi2hhfbjw2af3ic2jbnyghkvchpq8ww43k8068iv"; depends=[ggplot2 reshape2 rjags]; }; @@ -227,23 +224,23 @@ in with self; { BALLI = derive2 { name="BALLI"; version="0.2.0"; sha256="0qmjwpj56n07dvjwfknqvc02f0y5mlwh2yz4lrw7c4wqgrckcpgi"; depends=[edgeR limma MASS]; }; BAMBI = derive2 { name="BAMBI"; version="2.2.0"; sha256="1ch74zwv01a42vpvr9irdb2a3ivs1zrgdb907p50pq2lasmqdxah"; depends=[bridgesampling coda future_apply gtools label_switching lattice loo mvtnorm qrng RColorBrewer Rcpp RcppArmadillo rootSolve scales]; }; BAMMtools = derive2 { name="BAMMtools"; version="2.1.7"; sha256="1xpks3in0mj1b82z3ax2k3q06bgr3sj0nhr2dbs2crbvszb8hcp2"; depends=[ape gplots Rcpp]; }; - BANEScarparkinglite = derive2 { name="BANEScarparkinglite"; version="0.1.3"; sha256="0z2n4ikj9cr2vcafpn0kmn5v24pdy7cd98asdy7njg5l54hajsxc"; depends=[dplyr httr lubridate RCurl readr rvest XML xml2]; }; - BANOVA = derive2 { name="BANOVA"; version="1.1.6"; sha256="07lxnklz8a2jrrmljhngs1zdrasl7fmn8n60rp8ns394ar7w640m"; depends=[coda rjags rstan runjags]; }; + BAREB = derive2 { name="BAREB"; version="0.1.0"; sha256="1h3bgfxbs489cywgblrpl8jjhgs1krimdvv6fryjnc9rhw1mymdr"; depends=[Rcpp RcppArmadillo]; }; + BARIS = derive2 { name="BARIS"; version="1.1.0"; sha256="0ncc1c6bqkh42cgg2pgfwrjypgcb9a08m49hgf6g6h9f30vqqa52"; depends=[data_table downloader dplyr httr janitor jsonlite magrittr memoise miniUI rgdal rio rstudioapi sf shiny stringi stringr XML]; }; BART = derive2 { name="BART"; version="2.7"; sha256="16klaqzp525da6swlcdcr13mjlm88zpqyqnzjk6l4nlcwa3b7z1m"; depends=[nlme nnet Rcpp survival]; }; BAS = derive2 { name="BAS"; version="1.5.5"; sha256="1iakx36r4lnl6xs77m9mfcj5w3mb4g482s2mpzq65v69k10nj8lj"; depends=[]; }; BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; }; BASS = derive2 { name="BASS"; version="0.2.2"; sha256="1q3sihp2iv1ikggzgd2k3vh2myz8bz31rzlaavw0n84d0h1zjxy2"; depends=[]; }; BASiNET = derive2 { name="BASiNET"; version="0.0.4"; sha256="0pmn4znqhpav729ai7zr027a7sx6bz2lmlk086crmwm1fnwipqq4"; depends=[Biostrings igraph randomForest rJava rmcfs RWeka]; }; - BAT = derive2 { name="BAT"; version="2.0.0"; sha256="0fwyarkgxxgckaky2wjf311ymlh78942j51a2dvjkwlbshcdqbij"; depends=[hypervolume nls2 raster spatstat vegan]; }; + BAT = derive2 { name="BAT"; version="2.0.1"; sha256="0vc75a0m4my6f1fwciwaf6qhhqr09lc59zgifhhz1188xsrv28h1"; depends=[hypervolume nls2 raster spatstat vegan]; }; BAYESDEF = derive2 { name="BAYESDEF"; version="0.1.0"; sha256="030xskgqqg0n85mphjv32ks4ysvxb36f6ayy0176gps14jhmhcp7"; depends=[glmnet gWidgets readxl REdaS]; }; BAYSTAR = derive2 { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[coda mvtnorm]; }; - BAwiR = derive2 { name="BAwiR"; version="1.2"; sha256="0j4vrngfddil4wyaskc0cgqhk496hq7wkrj85hxh76kn85gmfmiv"; depends=[Anthropometry dplyr ggplot2 ggthemes hrbrthemes httr lubridate magrittr plyr purrr reshape2 rvest rworldmap scales stringi stringr tidyr xml2]; }; + BAwiR = derive2 { name="BAwiR"; version="1.2.3"; sha256="0kc4vq2cc6rp2hpy9a9bqmxvfpm9h4k9x7imwa9kgin3didi7vjp"; depends=[Anthropometry dplyr ggplot2 ggthemes hrbrthemes httr lubridate magrittr plyr purrr reshape2 rvest rworldmap scales stringi stringr tibble tidyr xml2]; }; BB = derive2 { name="BB"; version="2019.10-1"; sha256="0kf9sfsm3n036a8a8gjfpc9qdryvadb019kqjh80n1szdv7bdl04"; depends=[quadprog]; }; BBEST = derive2 { name="BBEST"; version="0.1-6"; sha256="1hvgi3679ixpq0c5qbxhkp1j0953k3lklglgxrq9mz2ry6z9n038"; depends=[DEoptim ggplot2 reshape2 shiny wmtsa]; }; BBI = derive2 { name="BBI"; version="0.3.0"; sha256="167sndfp3776p8n9zdpihc9xhqqi8wygzpl49dzkfj53gwa77rnn"; depends=[vegan]; }; BBMM = derive2 { name="BBMM"; version="3.0"; sha256="1cvv786wf1rr5906qg1di2krrv5jgw3dnyl8z2pvs8jyn0kb3fkj"; depends=[]; }; BBMV = derive2 { name="BBMV"; version="2.1"; sha256="11d4wd1zx99hrhwagw73jkk088rz5vgkjml6mckssc2iqvhj1dc9"; depends=[ape]; }; - BBRecapture = derive2 { name="BBRecapture"; version="0.1"; sha256="05xzp5zjmkh0cyl47qfsz0l8drg8mimssybhycc4q69aif9scqxb"; depends=[HI lme4 locfit secr]; }; + BBRecapture = derive2 { name="BBRecapture"; version="0.2"; sha256="1w0m8p4mwjsycv9krmsgdyjckic2nwxbyhrz1s2gng2v1h20zvlf"; depends=[HI lme4 locfit secr]; }; BBmisc = derive2 { name="BBmisc"; version="1.11"; sha256="1lh1n4bvxzivb5rbz69mvd8xdgr3gr2bnqd68a39sd1530l8r90y"; depends=[checkmate]; }; BCA = derive2 { name="BCA"; version="0.9-3"; sha256="0ksd6b0ykydgdn33x29bwwqkrp23cvdj3imps0l6qs1p4465j5nf"; depends=[car clv flexclust Rcmdr RcmdrMisc rpart]; }; BCA1SG = derive2 { name="BCA1SG"; version="0.1.0"; sha256="14jvi5gn19f72szcnyhfpdld00cc7gyih5qrm4bpzvp553f1svvk"; depends=[logOfGamma Matrix]; }; @@ -252,8 +249,8 @@ in with self; { BCDating = derive2 { name="BCDating"; version="0.9.8"; sha256="1px9fimg3fqx8bfkzq6rl34xclc9gcjxqjvj5islpdy4f1ifwph3"; depends=[]; }; BCE = derive2 { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; }; BCEA = derive2 { name="BCEA"; version="2.3-1.1"; sha256="0ppjcbcapmg6j5gdalw1j86w50xwaanvhld9zpzp5fvj8b7f016b"; depends=[dplyr MASS rlang]; }; - BCEE = derive2 { name="BCEE"; version="1.2"; sha256="08jsnsy7l182n0gy2jy0l9a7grr62g57gz3217fzapk2im2q648b"; depends=[BMA leaps Rcpp RcppArmadillo]; }; - BCHM = derive2 { name="BCHM"; version="0.96"; sha256="1zmv6ghg76pdd98qngvkr9814sjq4ah5h0g2z6ch5fnvwry0r2bv"; depends=[cluster clValid coda crayon knitr plyr rjags]; }; + BCEE = derive2 { name="BCEE"; version="1.3.0"; sha256="19sg84qw44pa7dmr2l656zv988cj6ap6069l53vza5ynqswckbw2"; depends=[BMA boot leaps Rcpp RcppArmadillo]; }; + BCHM = derive2 { name="BCHM"; version="0.99"; sha256="1az0njkq30762n5khbm6hlj1knqi4sp723qihwnmkgn8cai130y3"; depends=[cluster coda crayon knitr plyr rjags]; }; BCRA = derive2 { name="BCRA"; version="2.1"; sha256="0n1f2qcwca7lb90qmim5dc3wj3hf5b31nh0xiw64k1cv8lhqc0mz"; depends=[]; }; BCSub = derive2 { name="BCSub"; version="0.5"; sha256="0c8dlxsx23qfyygmajg2amj78ax01kb3808d9hvy7g3hkgp2i2fp"; depends=[MASS mcclust nFactors Rcpp RcppArmadillo]; }; BCellMA = derive2 { name="BCellMA"; version="0.3.4"; sha256="1njprs7ksv0w18ffs0agz0290aa2akw48225iaa3bjhbl08dpidl"; depends=[ggplot2 reshape2]; }; @@ -266,16 +263,16 @@ in with self; { BE = derive2 { name="BE"; version="0.1.1"; sha256="1ldzj1fvbgmnp0cn7g348md2xskm2q5b7y6l1sm3pa2am8jc7ixa"; depends=[rtf]; }; BEACH = derive2 { name="BEACH"; version="1.3.1"; sha256="0biq6c74k8vb8ykafzf3blyi08rp65x1vaw3bfpwdc1ihc9wrgjr"; depends=[devtools DT haven plyr rJava rtf sas7bdat shiny WriteXLS xtable]; }; BEDASSLE = derive2 { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[emdbook MASS matrixcalc]; }; - BEDMatrix = derive2 { name="BEDMatrix"; version="2.0.1"; sha256="03jf8k1sa43ddb6m07g78r1z3rx8aznywmwllsivi674am0qk1qj"; depends=[crochet]; }; + BEDMatrix = derive2 { name="BEDMatrix"; version="2.0.2"; sha256="0azhxz2vq77fnw9678s2i04rws6cdw1prkqp9ng3fz8qphrz5q5y"; depends=[crochet]; }; BENMMI = derive2 { name="BENMMI"; version="4.3-6"; sha256="07jmf4icij8yb83bf7x0vsaf60gcvdzaijjckv5400xjykpm7scm"; depends=[benthos dplyr ggplot2 jsonlite knitr markdown purrr readr tidyr xtable]; }; - BEQI2 = derive2 { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[jsonlite knitr markdown plyr reshape2 xtable]; }; BEST = derive2 { name="BEST"; version="0.5.1"; sha256="0yx3bkaaly0lriyd5xr7aay4c381a5iwanfixz9v37cmvs64rs4s"; depends=[coda HDInterval rjags]; }; BESTree = derive2 { name="BESTree"; version="0.5.2"; sha256="0yij6xdlvhbqifckaylgbhszwwp38d9x6vbpr1nl40mwwnv4bswz"; depends=[plyr]; }; BETS = derive2 { name="BETS"; version="0.4.9"; sha256="0daixk7mqmk2jq35i7mjaslz11gxbnnjgwxfvj8x1s88vz9l74sm"; depends=[DBI digest dplyr DT dygraphs forecast foreign ggplot2 grnn htmltools httr lubridate miniUI plotly rjson rmarkdown RMySQL rstudioapi rvest seasonal shiny sqldf stringr urca webshot xml2 zoo]; }; - BFS = derive2 { name="BFS"; version="0.2.2"; sha256="0if4p0y1yv95c8i0w4gvanzclq0j4pwzscyiq29bfkhcn4izqrmg"; depends=[janitor magrittr progress purrr pxR rvest tibble xml2]; }; - BFpack = derive2 { name="BFpack"; version="0.1.0"; sha256="1sqgn24k5sp928hpqyv0k5bjaz3yc5d7wsl3bkkxixm73w5p7g4j"; depends=[bain lme4 MASS Matrix MCMCpack mvtnorm pracma]; }; + BFS = derive2 { name="BFS"; version="0.2.5"; sha256="0qcqgxzj00n04p20w6hm60lcnccl2mpbxn9mri0x0wdad587jfgi"; depends=[janitor magrittr pins progress purrr pxR rvest tibble xml2]; }; + BFpack = derive2 { name="BFpack"; version="0.1.1"; sha256="0as8mr0g1arqds23k3gx7jcbg7g62yc6fpg45m7f7him4mxxi6k5"; depends=[bain lme4 MASS Matrix mvtnorm pracma]; }; BGData = derive2 { name="BGData"; version="2.1.0"; sha256="168lvmcfj9ch2dfp8haykgz8cwmrp1yqn01hbyssqfgpc42lrgf3"; depends=[BEDMatrix bigmemory bit crochet ff LinkedMatrix symDMatrix synchronicity]; }; BGGE = derive2 { name="BGGE"; version="0.6.5"; sha256="1h76c40y45xhf2vp9g0q5j9lfwh16q9axbk5c9aqn4md008xr1j2"; depends=[]; }; + BGGM = derive2 { name="BGGM"; version="1.0.0"; sha256="14skhkkf7jzc8b3gx8xjrf4xy42y2hrbcmm24gscz4pkfifyhvc0"; depends=[bayesplot cowplot doParallel foreach GGally ggplot2 ggridges MASS Matrix mvnfast mvtnorm network pracma reshape reshape2 shiny sna stringr]; }; BGLR = derive2 { name="BGLR"; version="1.0.8"; sha256="15cv5k44yj5cws9jjd70hvrkm8gzn5x4hfx408n2fbqbv289b5jy"; depends=[truncnorm]; }; BGPhazard = derive2 { name="BGPhazard"; version="2.0.0"; sha256="1qh3jylzdf66kx48gq83gc11d2qd27h4l88s965p25lw99lz528b"; depends=[dplyr ggplot2 ggthemes gridExtra magrittr purrr readr rlang survival tibble]; }; BGSIMD = derive2 { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; }; @@ -286,17 +283,18 @@ in with self; { BHSBVAR = derive2 { name="BHSBVAR"; version="2.0.2"; sha256="1y0fjdrg0wg66r3blb8app0h52f24v8vl04n0mgk9ypm45hm64my"; depends=[Rcpp RcppArmadillo]; }; BHTSpack = derive2 { name="BHTSpack"; version="0.5"; sha256="1sz99sgxhiajxca5bx2ns9g9qs9ymsvh8i5882nlp7c78qxmqc4g"; depends=[R2HTML xtable]; }; BICORN = derive2 { name="BICORN"; version="0.1.0"; sha256="0mqk8vgp6jdk7f0paa06yqlibkd1y3vs69pg7i9mkvxmda7p4nkq"; depends=[]; }; - BIEN = derive2 { name="BIEN"; version="1.2.3"; sha256="0p23kahba55gkk6wx10ii6vrni3b7ia2a4jb64ww4kwp86bknx3d"; depends=[ape DBI rgdal rgeos RPostgreSQL sp]; }; + BIEN = derive2 { name="BIEN"; version="1.2.4"; sha256="1dagrs54ciagm2mgqrvxl6k2akahr0qk63ifxqnks7iljm0x1gw6"; depends=[ape DBI doParallel fasterize foreach raster rgdal rgeos RPostgreSQL sf sp]; }; BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="3.3-12"; sha256="1kphczvj3rxyjvi93cx2j714scvmmpqv5wrg5pdyy8l891jxsr89"; depends=[miceadds Rcpp RcppArmadillo]; }; BIGDAWG = derive2 { name="BIGDAWG"; version="2.3"; sha256="1lnw31dl161siml6vcp74c30g0rld962ry3am9ljxmd9mw83shnz"; depends=[haplo_stats httr knitr XML]; }; - BIGL = derive2 { name="BIGL"; version="1.4.2"; sha256="0lrc7d6g7kr28sjib21x6p7nivyy2s057l0zm4ml1f0h1dppkxdl"; depends=[ggplot2 MASS minpack_lm numDeriv progress rgl robustbase scales]; }; + BIGL = derive2 { name="BIGL"; version="1.4.3"; sha256="1x00n0z9y5qn9nflbrp086a0nzrak8582vhpvbqhj945q7ayvxvy"; depends=[ggplot2 MASS minpack_lm numDeriv progress rgl robustbase scales]; }; BINCOR = derive2 { name="BINCOR"; version="0.2.0"; sha256="0x2s82jql429shk70bhjdy9kamz8dz5ymsxj6kp8ga1711bpwyq6"; depends=[pracma]; }; BIOM_utils = derive2 { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; }; BIOMASS = derive2 { name="BIOMASS"; version="2.1.1"; sha256="0i7z0pxxp2b11gnsb51q89zk8wnxz1d86yv08xqf7zivgdf0sgpc"; depends=[data_table jsonlite minpack_lm rappdirs raster sp]; }; - BIOdry = derive2 { name="BIOdry"; version="0.7"; sha256="1psy1ckla8pdl3nshgzh7w6074fqfylkb3nn74hn0q02lgsz1vd6"; depends=[ecodist nlme]; }; + BIOdry = derive2 { name="BIOdry"; version="0.8"; sha256="1zga8g50wjnnz2h9b3ak9q67qnl1f14cq6hvdzf9f84pphsnpasa"; depends=[ecodist nlme]; }; + BIRDS = derive2 { name="BIRDS"; version="0.1"; sha256="1bfkwyc2hbd23adh11hgzkfr1dpffc3kzshjirizs6nzb7yyq0gz"; depends=[data_table dplyr esquisse geosphere leaflet lubridate magrittr mapedit nnet rgdal rgeos rlang sf shiny shotGroups sp stringr xts]; }; BIS = derive2 { name="BIS"; version="0.2.1"; sha256="0mngmchgc46wc9a7ksyqrvj6k46nm4ih7x69k3xijfia9bgkym0v"; depends=[dplyr readr rvest tidyr xml2]; }; BKPC = derive2 { name="BKPC"; version="1.0.1"; sha256="17gmhf6qq8jn2xzkqvjq60xzy0slz6kgfpd0d6hlpnf30ww7q923"; depends=[kernlab]; }; - BLCOP = derive2 { name="BLCOP"; version="0.3.1"; sha256="1qfkljw5b1k4b5jd08hw6dsmvgr7vg3kjyib5s13q0mkxvclasym"; depends=[fBasics fMultivar fPortfolio MASS quadprog RUnit timeSeries]; }; + BLCOP = derive2 { name="BLCOP"; version="0.3.2"; sha256="00x8xk7c8pdwpbmzshjg2ph1yz55vxmliblj1xr7y0gqhcmgyr27"; depends=[fBasics fMultivar fPortfolio MASS quadprog RUnit timeSeries]; }; BLModel = derive2 { name="BLModel"; version="1.0.2"; sha256="0l5f2v5ggadmrci3qhhmxm3j9i6jii0anq5rv5vk50y2qzii2q15"; depends=[]; }; BLOQ = derive2 { name="BLOQ"; version="0.1-0"; sha256="1ag0dy3cjdxhlspmzfdnpli030g6gwac50n5s30igcyrmw6kl4hf"; depends=[maxLik mvnmle mvtnorm]; }; BLPestimatoR = derive2 { name="BLPestimatoR"; version="0.3.2"; sha256="0prc2m3hixv8hmnyhr5549406ln509llkhpqra2ifpzif0waw704"; depends=[Formula Matrix mvQuad numDeriv randtoolbox Rcpp RcppArmadillo]; }; @@ -304,26 +302,27 @@ in with self; { BLRPM = derive2 { name="BLRPM"; version="1.0"; sha256="15q0jkw4swz35c58nv23k8g1dy1kkbqh5aydjck7pd0fmppqrhpx"; depends=[R6]; }; BLRShiny = derive2 { name="BLRShiny"; version="0.1.0"; sha256="0z3gr0bvjs7y0jkygh7h9habnk2807cwziajpgfmb7dxdrhccj68"; depends=[caret dplyr e1071 ggplot2 rhandsontable rmarkdown shiny]; }; BLSM = derive2 { name="BLSM"; version="0.1.0"; sha256="02xidwp91rh34rcqd0q552wzm2j80axs1nnwwv2aj04g96lf7myj"; depends=[Rcpp RcppEigen]; }; - BMA = derive2 { name="BMA"; version="3.18.11"; sha256="13b9agsra9lv00dkmx57zbf6n7xixxlihk7svxaafk8snbyyhk5z"; depends=[inline leaps robustbase rrcov survival]; }; + BMA = derive2 { name="BMA"; version="3.18.12"; sha256="0yfx6m0y8chxlpyngzw27xsgz3g7481ra0xdhsli36mhj9yvgayb"; depends=[inline leaps robustbase rrcov survival]; }; BMAmevt = derive2 { name="BMAmevt"; version="1.0.4"; sha256="10241cibzmgrmxzjw7fpw64qkayc1wig5xilahyc182841k4if6w"; depends=[coda]; }; BMRBr = derive2 { name="BMRBr"; version="0.2.0"; sha256="0v2ysap5jfkq9fc5blqlfhsv2bs8rqybmp5z4q3g6y3y7qzhypjw"; depends=[rvest xml2]; }; BMRSr = derive2 { name="BMRSr"; version="1.0.0"; sha256="0xdzzwmn2ibzgy68djsf7jxayfwd2yr1qsa0dcg9zl4rhl6b8nrl"; depends=[httr readr stringr tibble xml2]; }; BMRV = derive2 { name="BMRV"; version="1.32"; sha256="1j1cwjk3l7f06nqdwrqdyhzm43bb8hj5wgdd14zc1grxyfc9ya95"; depends=[BH]; }; BMS = derive2 { name="BMS"; version="0.3.4"; sha256="0z3mk1xd1fphf80kdbashkn04jwsr2bghms4d7nav3pw73q41wql"; depends=[]; }; BMT = derive2 { name="BMT"; version="0.1.0.3"; sha256="1vdah5bsn41s2qriq15xi7dw9qzngaacmn5gk6yc7hi89dwyy3yj"; depends=[fitdistrplus partitions]; }; - BMTME = derive2 { name="BMTME"; version="1.0.12"; sha256="0v1f1c2nk7f51c017jscyzkx7y21b3lmxp46xgs8hqcfjfw9b65m"; depends=[BGLR doSNOW dplyr foreach matrixcalc mvtnorm progress Rcpp RcppArmadillo snow tidyr]; }; - BMisc = derive2 { name="BMisc"; version="1.3.1"; sha256="0wh17bf1ii6zan09n59cf9257nb60nh08ig01id9k0bvm9f14ay6"; depends=[formula_tools plm]; }; + BMisc = derive2 { name="BMisc"; version="1.4.1"; sha256="176sqq24xyw9sz1pq721inmqwjxqqzbcp6w65f0m0n4b64yk5gyd"; depends=[]; }; BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; }; BNN = derive2 { name="BNN"; version="1.0.2"; sha256="13h9xqfdqnc9d8brx1xlmvb4nrkpwncwjz98y7i3wijih85wkikd"; depends=[mvtnorm]; }; BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="1.2.4"; sha256="06s0cs3anbby93n7pjcin9195agfzfq9im6f9k7ih3cbg8mzfaqy"; depends=[gplots MASS matrixcalc mvtnorm plyr Rcpp RcppArmadillo truncnorm]; }; BNPTSclust = derive2 { name="BNPTSclust"; version="2.0"; sha256="1ymvklv6d9684xzwdkvaxdjd1q20xmsf6kkfibn2wphlaqs2rh2n"; depends=[MASS mvtnorm]; }; - BNPdensity = derive2 { name="BNPdensity"; version="2019.9.18"; sha256="1s4mifmlvh0b0w4ckllg49z2jwfzy5d2x7lak38r92yg75nabng6"; depends=[coda dplyr ggplot2 gridExtra survival tidyr viridis]; }; + BNPdensity = derive2 { name="BNPdensity"; version="2020.3.4"; sha256="0775fcf5y78ibmhl5fljrlvznn1a74s5ihldb6wgixmm4c0xmz3x"; depends=[coda dplyr ggplot2 gridExtra survival tidyr viridis]; }; BNPmix = derive2 { name="BNPmix"; version="0.2.5"; sha256="16k7161yk1blpqwy9kj8lw565v9zl1298kqmf0agx8wjjjll4jyh"; depends=[coda ggplot2 Rcpp RcppArmadillo]; }; BNSL = derive2 { name="BNSL"; version="0.1.4"; sha256="0nrlx55364kgvkdpyaimgjxwnzmmdl1gmvyv3wkm8n2jyki92xxp"; depends=[bnlearn igraph Rcpp]; }; - BNSP = derive2 { name="BNSP"; version="2.1.2"; sha256="0ww09khxfi51spdh8b1qqi7hfms1djfs8pv2g3w5767aggr0b017"; depends=[coda corrplot cubature Formula ggplot2 gridExtra mgcv plot3D plyr threejs]; }; + BNSP = derive2 { name="BNSP"; version="2.1.3"; sha256="1dsic7vmmgklbd7ykkj1484j8gxkra1xjf0bpqc41wwjdc30gfj9"; depends=[coda corrplot cubature Formula ggplot2 gridExtra label_switching mgcv plot3D plyr threejs]; }; + BNrich = derive2 { name="BNrich"; version="0.1.1"; sha256="0m3cz7npc7mwq2vj68hllbd2vf5xqw00jaxv1pm3c28mq7pb459j"; depends=[bnlearn corpcor glmnet graph]; }; BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; }; BOIN = derive2 { name="BOIN"; version="2.6.4"; sha256="0p1205pxa5a9sbw88fm8lbvzgzyq3mf62lsp0l2c0sfsvcfpydkg"; depends=[Iso]; }; BOSSreg = derive2 { name="BOSSreg"; version="0.1.0"; sha256="1nngs9j1hbb9ws423dxccjxwpkc5zl6l0zv46gb0v6m8y11d077b"; depends=[Matrix Rcpp RcppArmadillo]; }; + BPEC = derive2 { name="BPEC"; version="1.3.1"; sha256="0jvq56cq1wnhwd6wvg02hbx4b5vc2hz1lyxi63pl41rk0xva615a"; depends=[ape coda fields ggmap ggplot2 igraph maptools mvtnorm OpenStreetMap phytools sp]; }; BPM = derive2 { name="BPM"; version="1.0.0"; sha256="17k2d1xjfz85ygx0xnh6yqca9nyypd32d7sbna3k33ynsjqay3x8"; depends=[limma]; }; BRETIGEA = derive2 { name="BRETIGEA"; version="1.0.0"; sha256="176z7ajyfcfljv36d2sa15cvw047rsir3gn0l4lxmcyliw93r4lv"; depends=[]; }; BRISC = derive2 { name="BRISC"; version="0.2.0"; sha256="0dnkf4ld1blbadmxvgd0k021ihszrf2x19qypvv8jvgfrgcr8ax7"; depends=[matrixStats pbapply RANN rdist]; }; @@ -335,15 +334,16 @@ in with self; { BSL = derive2 { name="BSL"; version="3.0.0"; sha256="1cmydj59slj88awc2i7jg84hfaa9j3qp4d1042dgamc7xqvfh397"; depends=[coda copula foreach ggplot2 glasso gridExtra MASS mvtnorm Rcpp RcppArmadillo]; }; BSPADATA = derive2 { name="BSPADATA"; version="1.0"; sha256="1g709i0icxlxq2ljb2sm5iyc8ljqxadi62xc4mg702fsgl0x5ny9"; depends=[mvtnorm pscl spdep]; }; BSSasymp = derive2 { name="BSSasymp"; version="1.2-1"; sha256="0w141yxqpck59n85rjc6d3qy6bwhk1z80zsm21hda0bgfwy9v6wy"; depends=[fICA JADE]; }; + BSW = derive2 { name="BSW"; version="0.1.0"; sha256="0wh8m09nqzvsij8q8mdyr5yafdq7h568s28vih2wpplp0sv01945"; depends=[Matrix matrixStats quadprog]; }; BSagri = derive2 { name="BSagri"; version="0.1-10"; sha256="096l2ilr4x2fbjxchkksxkbiyaf7wwdmzn4xyjx001w873x9dgf6"; depends=[boot gamlss MCPAN mratios multcomp mvtnorm]; }; BTLLasso = derive2 { name="BTLLasso"; version="0.1-10"; sha256="0ab19dcn55nzkl3q865affiqjkd4j9yiil0a7kxcpbm0rva9x6zj"; depends=[Matrix psychotools Rcpp RcppArmadillo stringr TeachingDemos]; }; - BTM = derive2 { name="BTM"; version="0.2.1"; sha256="17h032dbg8n48dc74khab8vpprk76hlyngsgb52wlhczapkckf94"; depends=[Rcpp]; }; + BTM = derive2 { name="BTM"; version="0.3"; sha256="1vb3happ2fw3h7yilm87qxsrmncjnpaapiwqr7ai2p54vk7pax9m"; depends=[Rcpp]; }; BTSPAS = derive2 { name="BTSPAS"; version="2020.1.1"; sha256="004klyyg9gqalwx2i5lx57p1qxrm50nszzg839kv3v421b14qg80"; depends=[actuar coda data_table ggforce ggplot2 gridExtra plyr R2jags reshape2]; }; BTYD = derive2 { name="BTYD"; version="2.4"; sha256="13szcsgsrd7mwc4f47xrfrmsm2sg5sf7pfm21ly4cbvqcz8m0147"; depends=[hypergeo Matrix]; }; BTYDplus = derive2 { name="BTYDplus"; version="1.0.1"; sha256="0x8as4zskpbsvhh8gnvzgp833dkv01cs5fqfva9qri296343kppv"; depends=[bayesm BTYD coda data_table mvtnorm Rcpp]; }; BTdecayLasso = derive2 { name="BTdecayLasso"; version="0.1.0"; sha256="0x1s2zvv3vnapk5wp8582zwflsqvgc8khkvl5ch9i70v739jxp15"; depends=[ggplot2 optimr]; }; BUCSS = derive2 { name="BUCSS"; version="1.1.0"; sha256="1agx6yd29zq6gvwgnd0qahjnk5z7gdbijbg7rk85d5x6pihwmh9q"; depends=[]; }; - BVAR = derive2 { name="BVAR"; version="0.2.1"; sha256="0ql8ivnfkjy4sh376lxpm5bvy54h20zhhgwz8qrkl2x24lxsmwm0"; depends=[mvtnorm]; }; + BVAR = derive2 { name="BVAR"; version="0.2.2"; sha256="0gvzwxnscfny0xfr093bmbhyw82g93zabfd2y20b74l53f0asz9l"; depends=[mvtnorm]; }; BVS = derive2 { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrnnnzdcibm22pzzi9jsfphy6l0c"; depends=[haplo_stats MASS msm]; }; BVSNLP = derive2 { name="BVSNLP"; version="1.1.8"; sha256="0qlmvi189ky6h0a3jyvyil488asx3v6x52mvca7s93dvarxr6rw1"; depends=[doParallel foreach Rcpp RcppArmadillo RcppEigen RcppNumerical]; }; BWStest = derive2 { name="BWStest"; version="0.2.2"; sha256="02amzlfprmw5pyis0dg0kg0x8xqh50a4vfdcxxmklrzik3b1vzzs"; depends=[memoise Rcpp]; }; @@ -353,21 +353,21 @@ in with self; { BaPreStoPro = derive2 { name="BaPreStoPro"; version="0.1"; sha256="0zyyyrr5h8dhjsmgaii8jmb8ignvixpc9nzbfishw9yymjswvm57"; depends=[]; }; BaSTA = derive2 { name="BaSTA"; version="1.9.4"; sha256="1j092gsdip7rpw0g74ha0kjsrqpp5swi7wd4sxlmx6zarcqnxlal"; depends=[snowfall]; }; BaTFLED3D = derive2 { name="BaTFLED3D"; version="0.2.11"; sha256="0gab9iz1ra72hw8j31n97ysyr3cclhgvdxriyjk8wwv2nrmbw12h"; depends=[foreach iterators R6 RColorBrewer rTensor]; }; - BacArena = derive2 { name="BacArena"; version="1.8.1"; sha256="0ivrgv0i81hxfd1gpnx4z6akl0rpcb5sqsvk1xp7rbln14pg1pz4"; depends=[deSolve ggplot2 glpkAPI igraph Matrix plyr R_matlab Rcpp RcppArmadillo RcppEigen ReacTran reshape2 stringr sybil]; }; BalanceCheck = derive2 { name="BalanceCheck"; version="0.2"; sha256="0aal641vfbjk3w6ipwbqqmm9nnxs962hjmpph9wnqaqk5r6s7brs"; depends=[ade4 mvtnorm]; }; BalancedSampling = derive2 { name="BalancedSampling"; version="1.5.5"; sha256="01ayvjfs83dbnk0m9xb7y9rnxxpfpb6w4qjdffd6hdhcn2s5f73d"; depends=[Rcpp SamplingBigData]; }; Ball = derive2 { name="Ball"; version="1.3.9"; sha256="1cznrlgj75xwgpqqsnl0vnjd7pwvkna0cakdz4bcya4hn74dx27y"; depends=[gam mvtnorm survival]; }; BallMapper = derive2 { name="BallMapper"; version="0.2.0"; sha256="1hf94d41cks8mbrb985mpd0nqgirvm096cfv7bsy0182bbxlk6s1"; depends=[fields igraph networkD3 scales stringr testthat]; }; BarBorGradient = derive2 { name="BarBorGradient"; version="1.0.5"; sha256="0g2g7hrm23as1xbj79g48r8sj3gsj66fmi895jqlqfbqrl2fl7a5"; depends=[]; }; - BarcodingR = derive2 { name="BarcodingR"; version="1.0-2"; sha256="1mn5rdax8v1s2z3apk9z0kzy4hw19m8ql6j91l6wd29g2n2bjqxx"; depends=[ape class nnet sp]; }; + BarcodingR = derive2 { name="BarcodingR"; version="1.0-3"; sha256="03x26mrlvg00rnfh74wacpgbdk7xr2lq4yd0bx4q2442nli54rdv"; depends=[ape class nnet sp]; }; Barnard = derive2 { name="Barnard"; version="1.8"; sha256="1ki58hjs5kpmp76kwj1qi6hwmdvjphqb1lvrlhnmkgqxg4hw4vqg"; depends=[]; }; Barycenter = derive2 { name="Barycenter"; version="1.3.1"; sha256="0yhc0wwjqms569gnm8z2l9hgcbw8lyy437ynkij47pa4c1a1qvjy"; depends=[Rcpp RcppArmadillo]; }; BatchExperiments = derive2 { name="BatchExperiments"; version="1.4.2"; sha256="0zvcpgzhbna6p37jlf57j7mzrvh5xs5w17janmv9v4210cpbzi1q"; depends=[backports BatchJobs BBmisc checkmate data_table DBI RSQLite]; }; - BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.5.4"; sha256="0a8p9k232ab36xjr5a8rkk19zf8cx8q1pvx54z0xg1dncn28lxwa"; depends=[curl dplyr furrr future lubridate purrr quantmod rvest scales stringr tibble tidyr XML zoo]; }; + BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.5.7"; sha256="155wwskqagz3qcng71nn0v52mvassdinhmvaf1hv74dakvvfjrj2"; depends=[crayon curl dplyr furrr future lubridate purrr quantmod rvest scales stringr tibble tidyr XML zoo]; }; BatchJobs = derive2 { name="BatchJobs"; version="1.8"; sha256="1zz4sspj596pijxlz321g0jy2rg9ki83j6fihbwisjwr66p2vk1m"; depends=[backports BBmisc brew checkmate data_table DBI digest RSQLite sendmailR stringi]; }; BayHaz = derive2 { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; }; BayLum = derive2 { name="BayLum"; version="0.1.3"; sha256="0hina84s8ax01zpnji4jqqkdap0phvxr78s4rnab0407xrydbf0w"; depends=[ArchaeoPhases coda hexbin KernSmooth Luminescence rjags]; }; BaySIC = derive2 { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[fields poibin rjags]; }; + BayesARIMAX = derive2 { name="BayesARIMAX"; version="0.1.0"; sha256="1kz0x5l97l7zqpi3813ibqk6gsv3wsxnvgcw6lplg7gfxjavcz7w"; depends=[coda forecast TSA]; }; BayesBD = derive2 { name="BayesBD"; version="1.2"; sha256="10ik2lndqgmy6pvdm6cx4fsxgjb2fgi6hlz5ic35ab7fkpi90ka5"; depends=[jpeg mritc png Rcpp RcppArmadillo shiny]; }; BayesBEKK = derive2 { name="BayesBEKK"; version="0.1.0"; sha256="0fykcmf54820krwy7q573gmlcrx96i94knx7rgzc83i287lnpnfg"; depends=[coda MTS mvtnorm]; }; BayesBP = derive2 { name="BayesBP"; version="1.0"; sha256="1gmjljkp4pvm87qf6rq2kixqdx64sfg34b1xxdl242a3cckmjc5y"; depends=[iterators openxlsx]; }; @@ -382,72 +382,75 @@ in with self; { BayesFactor = derive2 { name="BayesFactor"; version="0.9.12-4.2"; sha256="1z083v7is21gm0a458jm5ph3xfdm7mh29a6sg2r1njq82f8x3s3g"; depends=[coda gtools hypergeo Matrix MatrixModels mvtnorm pbapply Rcpp RcppEigen stringr]; }; BayesGESM = derive2 { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[Formula GIGrvg normalp]; }; BayesGOF = derive2 { name="BayesGOF"; version="5.2"; sha256="17wm0228xq3db431abyi9jr0q1q86nnajsn7hmy4dwzgvrlz5s0i"; depends=[Bolstad2 nleqslv orthopolynom VGAM]; }; - BayesLCA = derive2 { name="BayesLCA"; version="1.7"; sha256="0lsqgjqal9092v1wr07p8g5cqm24k2d80sp7hlr7r1xknakmm1b6"; depends=[coda e1071 fields MCMCpack nlme]; }; + BayesGPfit = derive2 { name="BayesGPfit"; version="0.1.0"; sha256="1sz0bb102h5fj1yz0k89cvcy0pvsh6rfm06i6lfz3pdhdjszsx00"; depends=[lattice]; }; + BayesLCA = derive2 { name="BayesLCA"; version="1.8"; sha256="1r62h8g2bjr68682pffjclcrxvpbz24gm28s03dnzjh4aha7f9y7"; depends=[coda e1071 fields MCMCpack nlme]; }; + BayesLN = derive2 { name="BayesLN"; version="0.1.2"; sha256="16nw6nxqqcqlcqjbz1nyk2laz5naqfj9hg1a616x1ms88bhxmcsx"; depends=[coda data_table fAsianOptions ghyp lme4 MASS optimx Rcpp RcppArmadillo]; }; BayesLogit = derive2 { name="BayesLogit"; version="2.1"; sha256="0w3bzk39sxdskwikcz5i0xwfsll4sqgkpr8vw8jvzlcy6dl3yhis"; depends=[]; }; BayesMAMS = derive2 { name="BayesMAMS"; version="0.1"; sha256="1qq3j9nm0k58gpyfavz77v1dwghy8pmpk0v52cj7l8sb3a3aiinm"; depends=[mvtnorm]; }; BayesMFSurv = derive2 { name="BayesMFSurv"; version="0.1.0"; sha256="1yxxzwjh1fgfh7qkzf9dfm3x0vbgb0v4p6bf6b5w14kvm06rzhkg"; depends=[coda FastGP MCMCpack mvtnorm Rcpp RcppArmadillo]; }; - BayesMallows = derive2 { name="BayesMallows"; version="0.4.1"; sha256="0q89al122393nym9i71gz5mh10d304fcnbw2naxwzmj744g3lpm2"; depends=[cowplot dplyr ggplot2 HDInterval igraph PerMallows purrr Rcpp RcppArmadillo Rdpack relations rlang sets tidyr]; }; - BayesMed = derive2 { name="BayesMed"; version="1.0.1"; sha256="1ysc7sh0drqxbisi2dz6gj4jlw6qsd879bbhr5pra7nxgmk4h650"; depends=[MCMCpack polspline R2jags]; }; + BayesMallows = derive2 { name="BayesMallows"; version="0.4.2"; sha256="0fxv2llly4ada34mvvbgmsjq0kypd5ln208c38wqp87im2lvalc6"; depends=[cowplot dplyr ggplot2 HDInterval igraph PerMallows purrr Rcpp RcppArmadillo Rdpack relations rlang sets tidyr]; }; BayesMixSurv = derive2 { name="BayesMixSurv"; version="0.9.1"; sha256="19kf39881q00pap9afwvvggk4s4w3qpz17b7065nig1mvk8dnp8r"; depends=[survival]; }; BayesNI = derive2 { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; }; BayesNSGP = derive2 { name="BayesNSGP"; version="0.1.1"; sha256="11c83iafhl8yasyy8xwk9wladbj986xpmgc8d3yd9dxkic71flw8"; depends=[FNN Matrix nimble StatMatch]; }; - BayesNetBP = derive2 { name="BayesNetBP"; version="1.4.0"; sha256="007anxk76rxwskc7fvbmaw7ihjnwqad0xmiy6iyv68lwrjifvpc2"; depends=[bnlearn doBy fields graph igraph qtl qtlnet RColorBrewer Rgraphviz]; }; + BayesNetBP = derive2 { name="BayesNetBP"; version="1.5.2"; sha256="0i5pr9q8fzfxwxp9cb85xs9gaywfbv6h37bg3xz01d292ir56pl9"; depends=[bnlearn doBy fields graph igraph qtl qtlnet RColorBrewer]; }; BayesPieceHazSelect = derive2 { name="BayesPieceHazSelect"; version="1.1.0"; sha256="0znbmv7crqycdx75jh02h6z8d6cifjszbrldv2yva4mkjxsydag5"; depends=[mvtnorm]; }; BayesPiecewiseICAR = derive2 { name="BayesPiecewiseICAR"; version="0.2.1"; sha256="1qrmw7zmygdzz84p76hyh2d8dx88b8xhbbd7radqm39g35zq5wz6"; depends=[mvtnorm]; }; - BayesPostEst = derive2 { name="BayesPostEst"; version="0.2.0"; sha256="0yyf9mawpq8ynw5mx0684f8yw3ajf01wadfdvs2yanjlgqbmy1sj"; depends=[carData caTools coda dplyr ggmcmc ggplot2 ggridges HDInterval R2jags reshape2 rlang ROCR runjags texreg tidyr]; }; BayesRS = derive2 { name="BayesRS"; version="0.1.3"; sha256="0fhvnckabp0z1cdsbjgv3ijnzaxwhrk83fwcflgqbhvm3a9lzr77"; depends=[coda ggplot2 metRology reshape rjags]; }; - BayesS5 = derive2 { name="BayesS5"; version="1.31"; sha256="1azxn3r0s52zy6y5qsa6yx331795mkk7fb28fcinv2zx9iyvk33w"; depends=[abind Matrix snowfall]; }; + BayesReversePLLH = derive2 { name="BayesReversePLLH"; version="1.3"; sha256="07ijys5qd29qpa1hh6kbbp6fx97nmxydiijd0k0dh262vqfhh5ll"; depends=[Rcpp RcppArmadillo]; }; + BayesS5 = derive2 { name="BayesS5"; version="1.41"; sha256="0vs6s50h4gpxda9lbxfgn76k9kp81l62a6bv22r7ixsjlnd4baql"; depends=[abind Matrix snowfall splines2]; }; BayesSAE = derive2 { name="BayesSAE"; version="1.0-2"; sha256="1xbx9hr254agpcqs1fl7qi7h19fd2bbmjszn44l566n2svgvxwf5"; depends=[coda Formula lattice]; }; - BayesSUR = derive2 { name="BayesSUR"; version="1.0-4"; sha256="1n38k9y1hvymfq556d5v2q69wqycvzdkjjgwzx0sz236wdqi64wv"; depends=[igraph Matrix Rcpp RcppArmadillo tikzDevice xml2]; }; - BayesSenMC = derive2 { name="BayesSenMC"; version="0.1.1"; sha256="0bvlhhivdaw386ir5zb47bxg5dbqlfjfxbs28gjdr0csskwvh107"; depends=[dplyr ggplot2 lme4 Rcpp rstan]; }; + BayesSUR = derive2 { name="BayesSUR"; version="1.1-1"; sha256="0j5cmw85msqpb4zl4fdg1988d8z316zhbgm6yblfk4fgnszdnfh4"; depends=[igraph Matrix Rcpp RcppArmadillo tikzDevice xml2]; }; + BayesSampling = derive2 { name="BayesSampling"; version="1.0.0"; sha256="06gy902ksa753hn5p4zmsxaw6qg4qx4prd8n5m2w1300561cfbkl"; depends=[MASS Matrix]; }; BayesSpec = derive2 { name="BayesSpec"; version="0.5.3"; sha256="17gchdijcjhbr2y4glbq9szjh4qmgivzh6p4fllh589da18nzjcr"; depends=[mvtnorm pscl trust]; }; BayesSummaryStatLM = derive2 { name="BayesSummaryStatLM"; version="1.0-1"; sha256="05mlgyi4fglvjkpqyw3vcjpipqllx37svcb20c1mrsa46m6fm4s7"; depends=[ff mvnfast]; }; BayesTree = derive2 { name="BayesTree"; version="0.3-1.4"; sha256="0saca1ln582szqzc2c78z24b1lszzhc9hvsin73kb7r2dlg5ciii"; depends=[nnet]; }; BayesTreePrior = derive2 { name="BayesTreePrior"; version="1.0.1"; sha256="13igmvw1wj8kzfijzsrhdqr52kv4vqrm91i71ay6f7jnkry3spaw"; depends=[]; }; BayesTwin = derive2 { name="BayesTwin"; version="1.0"; sha256="026blnhihbx9bpd63mxhbp0kpvj0lwbj7mg72alyfr2jnrh1n3lp"; depends=[coda foreign matrixStats rjags]; }; BayesValidate = derive2 { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; }; - BayesVarSel = derive2 { name="BayesVarSel"; version="1.8.0"; sha256="1sf18m4p8zaw2s5fv4p9s99n1n0cgzscgfhm5ngkzif43kwz1l6n"; depends=[MASS mvtnorm]; }; + BayesVarSel = derive2 { name="BayesVarSel"; version="2.0.1"; sha256="1107amhj3bclc434qizffjfmsa2w36qkp6gq7vgl0hwv0ncc0vyn"; depends=[MASS mvtnorm]; }; BayesX = derive2 { name="BayesX"; version="0.3-1"; sha256="0g4cdkvicqzg75qgr62j89dc9mni38ai7705j6jbfx59vn6dbrr5"; depends=[coda colorspace maptools shapefiles sp]; }; BayesXsrc = derive2 { name="BayesXsrc"; version="3.0-1"; sha256="0l8c6xsyqj09m722hdanr1d9n6a1ps77ybm1jaqmp86bqmq1br03"; depends=[]; }; BayesianAnimalTracker = derive2 { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; }; - BayesianFROC = derive2 { name="BayesianFROC"; version="0.2.1"; sha256="017vdlw07mn0g3h8illvs0n4xdq6j6qvx1251gmhwvlnyb9lc2vh"; depends=[bridgesampling car crayon DiagrammeR ggplot2 knitr pracma Rcpp readxl rhandsontable rstan shiny shinydashboard shinythemes xlsx]; }; BayesianGLasso = derive2 { name="BayesianGLasso"; version="0.2.0"; sha256="09yb1qqx6qlsspk3ndrcqxy0956iqznw0rmyvqxgxxp3zd3y21xp"; depends=[MASS statmod]; }; BayesianNetwork = derive2 { name="BayesianNetwork"; version="0.1.5"; sha256="0vnnxzxz68dkfwr9wif8lam3a4khgbslbf49xkygqm8n1swysx2x"; depends=[bnlearn heatmaply lattice networkD3 plotly rintrojs shiny shinyAce shinydashboard shinytest shinyWidgets testthat]; }; BayesianPower = derive2 { name="BayesianPower"; version="0.1.6"; sha256="1n41blyqmjq2zdhbz8srsx32piyg26fwgzfphhka12ybk93b2d2h"; depends=[]; }; BayesianTools = derive2 { name="BayesianTools"; version="0.1.7"; sha256="0330bbnny35h4gsmwg31p3n3i511wrckzmp174ydm55pvsdkhjdg"; depends=[bridgesampling coda DHARMa ellipse emulator gap IDPmisc MASS Matrix msm mvtnorm numDeriv Rcpp tmvtnorm]; }; - Bayesrel = derive2 { name="Bayesrel"; version="0.1.0"; sha256="0nv5rar9h0yf2f710yb7g61lp8gvrkprp4qqqpc6r6vc22g8d02p"; depends=[coda ggplot2 ggridges LaplacesDemon lavaan MASS plotrix Rcsdp Rdpack]; }; + Bayesiangammareg = derive2 { name="Bayesiangammareg"; version="0.1.0"; sha256="0b0fqmig7vgmlrq2884q0apfd89nn5k4dj8rqjizkkbw4qpzmylb"; depends=[mvtnorm]; }; + Bayesrel = derive2 { name="Bayesrel"; version="0.6.1"; sha256="1mdc53g17c4r078mw74iiir03ks8kv60qh16l8fqy00vzwvbgpi9"; depends=[coda ggplot2 ggridges LaplacesDemon lavaan MASS plotrix Rcsdp Rdpack]; }; BaylorEdPsych = derive2 { name="BaylorEdPsych"; version="0.5"; sha256="1kq6nvzdqwawygp7k62lw5hyccsj81jg82hq60yidgxnmmnnf7y2"; depends=[]; }; BcDiag = derive2 { name="BcDiag"; version="1.0.10"; sha256="1gyinmx5wn2kk70hiy28ghilkhfirfjbfqdrqq5h3wfb4khnq6pz"; depends=[fabia]; }; - Bchron = derive2 { name="Bchron"; version="4.5.0"; sha256="0nxf0wzx2y3h7q0c23avn5hs7cqh9347xlk8l8fn65yd0d9xqrch"; depends=[coda dplyr ellipse ggforce ggplot2 ggridges magrittr MASS mclust purrr scales stringr viridis]; }; + Bchron = derive2 { name="Bchron"; version="4.7.1"; sha256="1s6rvbxmsj5ksykxlvfzprxapn83wd8wcrq0yxpfd647jq4y7c20"; depends=[coda dplyr ggforce ggplot2 ggridges magrittr MASS mclust purrr scales stringr]; }; Bclim = derive2 { name="Bclim"; version="3.1.2"; sha256="0dd4fx3rlljj3zb1m8q1bam1bswg497l3y8k0h0mkvjn94b4jbag"; depends=[ggplot2 MASS mclust statmod]; }; - BeSS = derive2 { name="BeSS"; version="1.0.6"; sha256="018gwcxhpmrblqh389krcpvxwrzl6fg25fg3mqrdvkalyx9xja5w"; depends=[glmnet Matrix Rcpp RcppEigen survival]; }; + BeSS = derive2 { name="BeSS"; version="1.0.8"; sha256="1yxinr3bfnk2ryal41l0j7i345aynrr62dd1rarrbyspxfrhimiq"; depends=[glmnet Matrix Rcpp RcppEigen survival]; }; Benchmarking = derive2 { name="Benchmarking"; version="0.28"; sha256="1f13m6fz9wd6zzknglcl0za16dbjsxn9f2714rpg8hcsr3hrlhdl"; depends=[lpSolveAPI ucminf]; }; BenfordTests = derive2 { name="BenfordTests"; version="1.2.0"; sha256="1nnj0w0zwcmg7maqmmpixx7alvsyxva370ssc26ahg6kxy5a621w"; depends=[]; }; Bergm = derive2 { name="Bergm"; version="5.0.1"; sha256="1zy2ar43v7pf1ibbhf7visy1ia24lfpa2kb921vxd7hiilky1h8v"; depends=[coda ergm Matrix matrixcalc MCMCpack mvtnorm network]; }; Bessel = derive2 { name="Bessel"; version="0.6-0"; sha256="0iwm08nhlivi4zwcqdi296a1l4n4lfanfxhaysh9vcsyk1kpiacf"; depends=[Rmpfr]; }; + Bestie = derive2 { name="Bestie"; version="0.1.1"; sha256="1vd139nl8dh707nvq35hylcng1hs8zycvjksnzxmwar1db9kgr7p"; depends=[BiDAG Rcpp]; }; BetaBit = derive2 { name="BetaBit"; version="1.3"; sha256="1x9mfnijgi8726p82d52g2zgmliwsc97v2g96mz9ccz2vqqnwq4w"; depends=[digest]; }; BetaPASS = derive2 { name="BetaPASS"; version="1.1-1"; sha256="17q1bfmijv38zyaj5fxlylf5zmkqry4ca9wm5km6zpksgsg2kjjq"; depends=[betareg ggplot2 pbapply]; }; - BeviMed = derive2 { name="BeviMed"; version="5.3"; sha256="01q5pr776ki973bcld20cqpsz9f10bb30vj95da9gbz5af6bvb14"; depends=[Rcpp]; }; - BeyondBenford = derive2 { name="BeyondBenford"; version="1.2"; sha256="0319jva0b43xcx7l0jyn0cxkazv7qi05bzmpas8wphk9f8r9jlim"; depends=[ggplot2]; }; + BeviMed = derive2 { name="BeviMed"; version="5.7"; sha256="1fjxin14x9i44wq6ad2i70k6sdfzy7zxyq1pibnmsyk4a0k2cfv1"; depends=[Rcpp]; }; + BeyondBenford = derive2 { name="BeyondBenford"; version="1.3"; sha256="08cfm4knssr5zhcc2xl7xgzxx39wv09hil305hi1s219ba7hzx3q"; depends=[ggplot2]; }; Bhat = derive2 { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; }; BiBitR = derive2 { name="BiBitR"; version="0.3.1"; sha256="0wfwph6nw12hb43j14i9ycj8m2zn0m5ynp7afq9cray8rbgvxfv6"; depends=[biclust cluster dendextend foreign lattice randomcoloR viridis]; }; - BiDAG = derive2 { name="BiDAG"; version="1.2.0"; sha256="0cn6aasrhqv5vkdb45a1mjzkgcppv1m57cx2bi97riy3siy5h0dy"; depends=[pcalg Rcpp]; }; + BiDAG = derive2 { name="BiDAG"; version="1.3.4"; sha256="16s7925lz59sscj6zpbm9g1irpg21rqr9kn55175wll2gwgmhy4m"; depends=[graph pcalg Rcpp]; }; BiDimRegression = derive2 { name="BiDimRegression"; version="2.0.0"; sha256="0k0708z6xn04zjkc4sk15649wji6hl5q4rvd28sz5kbq7z54j1j5"; depends=[Formula]; }; BiProbitPartial = derive2 { name="BiProbitPartial"; version="1.0.3"; sha256="0y19b8bkwr7rpygmj03013slmfbyd7aj6714hm14w5rdbnckymw3"; depends=[coda Formula mvtnorm numDeriv optimr pbivnorm Rcpp RcppArmadillo RcppTN]; }; BiSEp = derive2 { name="BiSEp"; version="2.2"; sha256="1ha7rc1q54dr2xl4bpkiwl703igmmi9qphsgv2h0flq7iz0gr351"; depends=[AnnotationDbi GOSemSim mclust]; }; BiTrinA = derive2 { name="BiTrinA"; version="1.3"; sha256="0sjq5a21vpsjs0ad0v8gsqlbk3n8virg1hzj0nvgm3h3xqhymh1d"; depends=[diptest]; }; BiasedUrn = derive2 { name="BiasedUrn"; version="1.07"; sha256="13i2lgfnjhlbbm2yxfc2l5hswqw6x03pwba5csjmirv8kpjw4xr3"; depends=[]; }; BibPlots = derive2 { name="BibPlots"; version="0.0.6"; sha256="0gbywbxhqw226mzhxlkl98yky206f9m81wcrp6r4wj8wqhzc2fay"; depends=[]; }; - BifactorIndicesCalculator = derive2 { name="BifactorIndicesCalculator"; version="0.1.0"; sha256="1yawxab606408ribb1mb3aa6a46blv8aqhi9v68cyc0dbd3cjqx8"; depends=[lavaan mirt MplusAutomation tidyr]; }; + BifactorIndicesCalculator = derive2 { name="BifactorIndicesCalculator"; version="0.2.0"; sha256="117l4j9h64rh65zs5j0xzdx1mn172lkak6pvkhlbc9c8g5rkfcv2"; depends=[lavaan mirt MplusAutomation tidyr]; }; BigQuic = derive2 { name="BigQuic"; version="1.1-8"; sha256="1kg48jqm62qmz5x0h6fgvd5fs5dvg51x4spsn1q503ag4dqqdjc0"; depends=[Matrix Rcpp scalreg]; }; BigSEM = derive2 { name="BigSEM"; version="0.2"; sha256="091fdibcxd8a8kf9k4pvc1sah830wh179f28gag9g816h4qclnx9"; depends=[MASS parcor]; }; BigTSP = derive2 { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[gbm glmnet randomForest tree]; }; BigVAR = derive2 { name="BigVAR"; version="1.0.6"; sha256="03d5a61clkngq67mkf2pyjj3k633kxp7g37myfplbxi55bdfmdlz"; depends=[lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; }; BimodalIndex = derive2 { name="BimodalIndex"; version="1.1.9"; sha256="1m1dcj0ryjicaqjlkch7aymsklmvjvn2dvnbssi1cpi54bzn8l7g"; depends=[mclust oompaBase]; }; BinGSD = derive2 { name="BinGSD"; version="0.0.1"; sha256="0ygr5na7s82xa6vv9f3j6ns5sfhdacyykl1fg422lpkwbss39dnn"; depends=[mvtnorm]; }; - BinNonNor = derive2 { name="BinNonNor"; version="1.5.1"; sha256="1afxf0lcdsvw7ky3v25jyl9z9krknvw10ryi2fhgjbydq1nyijl6"; depends=[BB corpcor Matrix mvtnorm]; }; - BinNor = derive2 { name="BinNor"; version="2.3.1"; sha256="07f08nn9sbpgddm849rgabka1cb19j3s1yg1c1wydbgfkjakv95x"; depends=[corpcor Matrix mvtnorm psych]; }; - BinOrdNonNor = derive2 { name="BinOrdNonNor"; version="1.5"; sha256="0pw0a4g0v9g5k89hy5jz7hy4f3qg8fwyij6b1lj0b7bpy4mg0kv5"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; }; + BinMat = derive2 { name="BinMat"; version="0.1.2"; sha256="17f5aaz8csfs1x1x7dxvbi4g97cp75kz7ikijsyk4pgpalld58a4"; depends=[magrittr MASS pvclust]; }; + BinNonNor = derive2 { name="BinNonNor"; version="1.5.2"; sha256="13zgj4n4jhrmjv1wldvamg6dpd6qpn3nwflvf5qhhbd3r0h0jf9x"; depends=[BB corpcor Matrix mvtnorm]; }; + BinNor = derive2 { name="BinNor"; version="2.3.2"; sha256="1332lffb57si2vay4hcw6zj2mm0pzp3d9cd11vfszgnp17x8b5ss"; depends=[corpcor Matrix mvtnorm psych]; }; + BinOrdNonNor = derive2 { name="BinOrdNonNor"; version="1.5.1"; sha256="1rvzgh0ly349606aw6w4g32c1csy221qizf4wmfzbv19ppixpffy"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; }; BinQuasi = derive2 { name="BinQuasi"; version="0.1-6"; sha256="0jf7zf3yqr2kgcm6h35234x2dqf65d2dzsh63b4q8m5l36r77k59"; depends=[BiocGenerics csaw edgeR GenomicAlignments GenomicRanges IRanges mgcv pracma quadprog RMySQL Rsamtools S4Vectors SummarizedExperiment]; }; BinSegBstrap = derive2 { name="BinSegBstrap"; version="1.0"; sha256="0iia9sbpnqp07h591d7ifvxq74nvnv0xspka2479qy7il9p65d3r"; depends=[Rcpp]; }; Binarize = derive2 { name="Binarize"; version="1.3"; sha256="0xmgxlfyvgkv7xpngy9am6ihzwbjbfgp7psfnyhb1v0kj9iy7ids"; depends=[diptest]; }; @@ -468,23 +471,22 @@ in with self; { Biocomb = derive2 { name="Biocomb"; version="0.4"; sha256="0jqfac81r5731m0i9jq7v5ns9263p8r7i03jyz10y915kfr6ikh6"; depends=[arules class e1071 FSelector gtools MASS nnet pamr pROC randomForest Rcpp rgl ROCR rpart RWeka]; }; Biodem = derive2 { name="Biodem"; version="0.4"; sha256="0k0p4s21089wg3r3pvyy9cxsdf4ijdl598gmxynbzvwpr670qnsh"; depends=[]; }; BiodiversityR = derive2 { name="BiodiversityR"; version="2.11-3"; sha256="1ba19vlxpy88xcryf3xki3h49hbmkz9hf69lni6swl2rh1k7fx41"; depends=[Rcmdr rgl vegan vegan3d]; }; - Biograph = derive2 { name="Biograph"; version="2.0.6"; sha256="0vklqwbifbac3v9ws9fs22yxpqqk5b3m96qzr8j0irnimb5kgh5p"; depends=[Epi etm ggplot2 lubridate msm mstate mvna plyr reshape survival]; }; Bioi = derive2 { name="Bioi"; version="0.2.10"; sha256="1ay8889490nfhxhh72fvk9z4h58xknm2b145xhbx2wbzj65zf9ib"; depends=[assertthat dplyr igraph Rcpp]; }; Biolinv = derive2 { name="Biolinv"; version="0.1-2"; sha256="0g9vw1jcsjawmddkixssm5gbncy17fdd6a3c5b2qd4hx81kxz8q9"; depends=[classInt fields raster sp spatstat]; }; Biopeak = derive2 { name="Biopeak"; version="1.0"; sha256="1l08m1jl8yygbdfzk8klpj1q2m7icvxi98vmk7akxs0sswjc6wd2"; depends=[cluster dbscan factoextra gplots RColorBrewer]; }; - Bios2cor = derive2 { name="Bios2cor"; version="2.0"; sha256="1rrz0vs6wbkwys3l5jv1rdnlhyb4r1q9pv7jlnmsx6c1b4f4vz5n"; depends=[bigmemory bio3d circular igraph]; }; + Bios2cor = derive2 { name="Bios2cor"; version="2.1"; sha256="04wk1cjrrxhpv1kdhd67r1qvjv268xxi0z0r105wy912110z9m6x"; depends=[bigmemory bio3d circular igraph]; }; BisRNA = derive2 { name="BisRNA"; version="0.2.2"; sha256="11jl5109nlm272vncprwplkz4kpvg7yx6yfnbjg47lfrsxcj8n0g"; depends=[MASS]; }; - BisqueRNA = derive2 { name="BisqueRNA"; version="1.0.1"; sha256="0jbplh1vfcr5rwqbli2h5bg7b3rdkc9vbsyj7fzlz474blzfg6mr"; depends=[Biobase lsei]; }; + BisqueRNA = derive2 { name="BisqueRNA"; version="1.0.2"; sha256="0j3z704hnfdmmbs8jzsnk7mvklpg5bs8jika810j8ygl97skdk5h"; depends=[Biobase lsei]; }; BivGeo = derive2 { name="BivGeo"; version="2.0.1"; sha256="1sj52v1zmk425jw9acq9y0jdp3agx103yzf1bjbc5vrmk1x0i0qr"; depends=[]; }; BivRec = derive2 { name="BivRec"; version="1.2.0"; sha256="1q68qs2xm3qry7wc5ilrgjpyygfbcvvqy61yg98h5px302d1ixk3"; depends=[dplyr MASS Rcpp stringr survival]; }; BivRegBLS = derive2 { name="BivRegBLS"; version="1.1.1"; sha256="1kpl0pwm2g40pxrfbz2d95vcrm51flg6bgc83661349cmc9a2511"; depends=[ellipse]; }; - BivUnifBin = derive2 { name="BivUnifBin"; version="1.3.1"; sha256="1ppsayixsbq0f71il93m5ih6gjwf2pavg7dhfj8gm5y8qkiz7pwc"; depends=[BinOrdNonNor rootSolve]; }; + BivUnifBin = derive2 { name="BivUnifBin"; version="1.3.2"; sha256="14v00fycxwnnm4x4hckckqb90j5m8hsbkr65z2zln459l6rsdwx9"; depends=[BinOrdNonNor rootSolve]; }; BivarP = derive2 { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[copula dfoptim survival]; }; Bivariate_Pareto = derive2 { name="Bivariate.Pareto"; version="1.0.3"; sha256="11knwynqfxdz6zl7vzr48jpygcilsxarpmwphaajh62asdlg5w6p"; depends=[compound_Cox]; }; BlakerCI = derive2 { name="BlakerCI"; version="1.0-6"; sha256="0dcmnaf0k195caajy8h4qymyfj45cjwmkcgsbwv0z7x3h9sx5k6v"; depends=[]; }; BlandAltmanLeh = derive2 { name="BlandAltmanLeh"; version="0.3.1"; sha256="11p30zqb3f9ifk3v18dspg18sclz5zxjygy7hw8ccb4bcqhx68lm"; depends=[]; }; Blaunet = derive2 { name="Blaunet"; version="2.0.8"; sha256="127nl041a1rbf8c4ffv8sbkn5y03ywaxkp51yd0sahs2anf415y4"; depends=[cairoDevice ergm foreign gWidgets gWidgetsRGtk2 haven network plot3D plot3Drgl rgl RGtk2 sna statnet_common]; }; - Blendstat = derive2 { name="Blendstat"; version="1.0.2"; sha256="04rn5yqkmqrcali75ly476x0dasysbxilynziy48mrm6q3h7xyjy"; depends=[lattice MASS]; }; + Blendstat = derive2 { name="Blendstat"; version="1.0.3"; sha256="0d5zzqiav7b5prh8332kwqy6ga96lkbkdjis8qwifa11j5qa087a"; depends=[lattice MASS]; }; BlockCov = derive2 { name="BlockCov"; version="0.1.1"; sha256="1ilqd8kvhlq0nc1n4y7g0aiwran3kyqs8i143j6dv2wy3myn5x0l"; depends=[BBmisc dplyr magrittr Matrix Rdpack rlang tibble]; }; BlockFeST = derive2 { name="BlockFeST"; version="1.6"; sha256="0hj7a5as7nxbgjac7lbj6qfwffx3g8x8phpf9a55f1c9cdzi73a5"; depends=[BASIX]; }; BlockMessage = derive2 { name="BlockMessage"; version="1.0"; sha256="1jrcb9j1ikbpw098gqbcj29yhffa15xav90y6vpginmhbfpwlbf4"; depends=[]; }; @@ -499,8 +501,9 @@ in with self; { BondValuation = derive2 { name="BondValuation"; version="0.1.0"; sha256="1sgnf5a6rm1br6i82bmp7s044012bwfxa9yb6bjkq8kr83mf7i6v"; depends=[Rcpp timeDate]; }; BoolFilter = derive2 { name="BoolFilter"; version="1.0.0"; sha256="14z4fzf8p4wgi939qs6v39a3xizccjcx7j4szsydllpkvxbwggbw"; depends=[BoolNet Rlab]; }; BoolNet = derive2 { name="BoolNet"; version="2.1.5"; sha256="11fysc39vfk3zb9qklryi8gl42c3hqgzlvci4jj0zkqnm0v9amqk"; depends=[igraph XML]; }; - Boom = derive2 { name="Boom"; version="0.9.3"; sha256="1mp8vp5fgfirlbgix5vncf05n6b7xyk5giqzxgxnd8g9l4j8r7rd"; depends=[MASS]; }; - BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="1.2.1"; sha256="1fxh39rplcnpfyffvzl7kns04lvfc1jx70nsq1380471z1n144lj"; depends=[Boom igraph]; }; + Boom = derive2 { name="Boom"; version="0.9.5"; sha256="0k76lh8v25v5k0axmgvkn85kf3d36klqqp9nd8hzzaiwkfjc60kh"; depends=[MASS]; }; + BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="1.2.2"; sha256="0wz0b7ayhk97zva3mkxbpsf9ddsqdldzl1b1cv9b7qvakn8k7if9"; depends=[Boom]; }; + BoostMLR = derive2 { name="BoostMLR"; version="1.0.2"; sha256="1iy8v9jc13wncz6z3rqlbxkf9lclq0qynp4m54b5xl35qz9xq676"; depends=[nlme Rcpp RcppArmadillo]; }; BootMRMR = derive2 { name="BootMRMR"; version="0.1"; sha256="07am80603pv1dh5ma3zb0idnslkzm5m3ym8sd1nhkh8zbc6qqmzs"; depends=[]; }; BootPR = derive2 { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; }; BootWPTOS = derive2 { name="BootWPTOS"; version="1.2"; sha256="1860l11xg7444l3x42rq3636csla23gg0mi5in1zibjwn1ddc202"; depends=[fractal wavethresh]; }; @@ -508,86 +511,86 @@ in with self; { Boptbd = derive2 { name="Boptbd"; version="1.0.5"; sha256="1p786avc37yq5g01zh6sqx7b1rvbxrh6gbxsad4bdvr12cjdsss6"; depends=[igraph MASS Matrix]; }; Boruta = derive2 { name="Boruta"; version="6.0.0"; sha256="1pp8zal1vhxlzdhl20phn39m3ffhw5glyqbcgwa0w14zw2mpm6hw"; depends=[ranger]; }; BosonSampling = derive2 { name="BosonSampling"; version="0.1.1"; sha256="0wxn12h903a0mlrkrr3w4qd9ld2a4bifs95i98cnl2dsb76rwf12"; depends=[Rcpp RcppArmadillo]; }; - BradleyTerry2 = derive2 { name="BradleyTerry2"; version="1.1-0"; sha256="13lhs6rynyj9cw13panqbn2jzkhq5fixhfd0ldr128gvw5d43hxg"; depends=[brglm gtools lme4 qvcalc]; }; - BradleyTerryScalable = derive2 { name="BradleyTerryScalable"; version="0.1.0"; sha256="0g12fkfs2sykyd6fzf924zv8gj2js452c4pf0pz2p6156chwrk8c"; depends=[dplyr igraph Matrix purrr Rcpp RcppArmadillo]; }; - BrailleR = derive2 { name="BrailleR"; version="0.30.2"; sha256="0n44qmy7hcxa09zh4wr22mrv61zgpl4w67l0iivm0wibnkgz6vx7"; depends=[devtools dplyr extrafont ggplot2 gridGraphics gridSVG hunspell knitr magrittr moments nortest reticulate rmarkdown roloc rolocISCCNBS whisker XML xtable]; }; + BoutrosLab_plotting_general = derive2 { name="BoutrosLab.plotting.general"; version="6.0.0"; sha256="156wigny50lzqkv6y4f7mww90bijjzdcz2dhjaa4sdkfz5q3kvm3"; depends=[cluster e1071 gridExtra gtable hexbin lattice latticeExtra MASS]; }; + BradleyTerry2 = derive2 { name="BradleyTerry2"; version="1.1-2"; sha256="0vss3ib74cz2zn1afmrvllawghj9z2ay4x1ysvk4rqvjmiia4a2i"; depends=[brglm gtools lme4 qvcalc]; }; Branching = derive2 { name="Branching"; version="0.9.4"; sha256="1c209gdasm7qipv2gg4d1hr0jmhnzz5rddgjxb7xacazc0c2mhff"; depends=[]; }; - BreedingSchemeLanguage = derive2 { name="BreedingSchemeLanguage"; version="0.9.6"; sha256="0lj8s42ndqqllnm8v978481zqmc751v31909rir1pkwcsm3irisx"; depends=[ggplot2 lme4 Matrix Rcpp rrBLUP snowfall]; }; Brobdingnag = derive2 { name="Brobdingnag"; version="1.2-6"; sha256="1m3ajvcksqfck5l5hj5xiflj4ry6d896ybv4f0xxks8chgnwmv0r"; depends=[]; }; BrownDog = derive2 { name="BrownDog"; version="0.2.1"; sha256="0wnf1jcf4cakbvj9j1l7jk9mq7gd4j1il1ha2vglghqn04f27938"; depends=[httpuv jsonlite RCurl]; }; Brq = derive2 { name="Brq"; version="2.5"; sha256="0b7xsamzvg2z746qrpq1nc9181awr7darnk06xi4wzqygbxgnll2"; depends=[]; }; Brundle = derive2 { name="Brundle"; version="1.0.9"; sha256="0z17wgmi272738n8pn6r60v5gbg8cbmwhc94s8f3vipa44h690bc"; depends=[DESeq2 DiffBind lattice Rsamtools]; }; BsMD = derive2 { name="BsMD"; version="2013.0718-1"; sha256="06w1dl5zp1cgjhk3m2zz6xsmcfwdk6ar3gmxdn96v71mqnhv81v1"; depends=[]; }; - Buddle = derive2 { name="Buddle"; version="1.0"; sha256="1aw0xmdw4m778vk9wqxy90dv9rkkb17d51f0sdwypb3l7d4d897b"; depends=[Rcpp RcppArmadillo]; }; + Buddle = derive2 { name="Buddle"; version="2.0.1"; sha256="0hi516cbl93z00jpdgyp3j5hz0xf594vn65p6ahpffwzh1l8s1cf"; depends=[plyr Rcpp RcppArmadillo]; }; BullsEyeR = derive2 { name="BullsEyeR"; version="0.2.0"; sha256="1p8b5w818zi7zs0n13cc3sw8z0z9mfr5cn5y5icsx1jam5amppci"; depends=[Matrix NLP slam tm topicmodels]; }; BurStFin = derive2 { name="BurStFin"; version="1.02"; sha256="16w2s0bg73swdps9r0i8lwvf1najiqyx7w7f91xrsfhmnqkkjzka"; depends=[]; }; BurStMisc = derive2 { name="BurStMisc"; version="1.1"; sha256="0cyi42zkn2dby162x9f95b3hpqxbzx25s7nahb4p86r60xj3a5c0"; depends=[]; }; BusinessDuration = derive2 { name="BusinessDuration"; version="0.2.0"; sha256="17923n1r3n8kp7qqzr2dv8ffax355yyc3b9f6mv2hxy6k31hrrb8"; depends=[chron]; }; - BuyseTest = derive2 { name="BuyseTest"; version="1.8.3"; sha256="0kwv4jcn4rqdcglj2y9xm3i1g47jz7xdkp7r9hnvxq4xh3sp4fqr"; depends=[data_table doParallel foreach lava prodlim Rcpp RcppArmadillo]; }; + BuyseTest = derive2 { name="BuyseTest"; version="1.8.5"; sha256="1czgkp1n9rvc9v8vzb991pn6hw1wx77gjrdz5bfgi2whzdj2dgn0"; depends=[data_table doParallel foreach lava prodlim Rcpp RcppArmadillo]; }; Bvalue = derive2 { name="Bvalue"; version="1.0"; sha256="17zlllzjrcq4grggal3hlg384990n62wnflr2g21fa6hcnglwy7d"; depends=[]; }; C443 = derive2 { name="C443"; version="1.0.0"; sha256="0d04769m9kkjqpj1cgfhqrri893nwi6qn7fz63z5pkym5cig5yyi"; depends=[cluster ggplot2 gridExtra igraph MASS partykit qgraph RColorBrewer reshape2 rpart]; }; C50 = derive2 { name="C50"; version="0.1.3"; sha256="01cbkilvp18r4f2khkj48w0znngvqckng91530kqqdqr2wc1ssac"; depends=[Cubist partykit]; }; CA3variants = derive2 { name="CA3variants"; version="2.0"; sha256="1wnc9qfcligpsi5ycmzw0igm14h6lvf4vd82aygnas6q41vnypwz"; depends=[ggplot2 ggrepel gridExtra multichull]; }; CADFtest = derive2 { name="CADFtest"; version="0.3-3"; sha256="06bwv728ckalzibxginzfica24w18m4g87i0i064m3q89ghmnlqm"; depends=[dynlm sandwich tseries urca]; }; CADStat = derive2 { name="CADStat"; version="3.0.8"; sha256="0wdglw1vyd5gz70r9ma0mwshvizv39nb4ahp8pvr70c4qqzsfhc0"; depends=[bio_infer car gdata gmodels JavaGD JGR lattice MASS quantreg rJava rpart XML]; }; - CAISEr = derive2 { name="CAISEr"; version="1.0.15"; sha256="0igm1yvhllnhqd0bc2z6bfjdmr3w2465xi7vyaa7a68dd5k81apj"; depends=[assertthat ggplot2 gridExtra pbmcapply]; }; + CAISEr = derive2 { name="CAISEr"; version="1.0.16"; sha256="08br6hdpgf9y2fix299diwd8r3q4gylpbzll4knpxq0vi18a3hz3"; depends=[assertthat ggplot2 gridExtra pbmcapply]; }; CALF = derive2 { name="CALF"; version="0.2.0"; sha256="12w1vr0rk6m4lv6zvqrf45k81d301ln1253wyy9xi6mv1hkabg0v"; depends=[ggplot2]; }; CAMAN = derive2 { name="CAMAN"; version="0.74"; sha256="0d932fbqzlxlhn7m8zfx7wr02pc7fm8398rym1jh2cdy2fk5im08"; depends=[mvtnorm sp]; }; CANSIM2R = derive2 { name="CANSIM2R"; version="1.14.1"; sha256="1dnzbd9lyqj3w80lx12qxcsbmv8wy6hxknyi5ijp99cfv7kaq1kc"; depends=[downloader Hmisc reshape2]; }; - CARBayes = derive2 { name="CARBayes"; version="5.1.3"; sha256="13l83wbacwg3mcl8njm872jaz9z15daj9qn5pb6w16iijcblk5ak"; depends=[CARBayesdata coda leaflet MASS matrixcalc MCMCpack Rcpp rgdal sp spam spdep truncnorm]; }; - CARBayesST = derive2 { name="CARBayesST"; version="3.0.2"; sha256="0gi5x0j1vzgkg8xhvsfqdvsn8n6dp6wzlzdsvf5sv9nydcdbac75"; depends=[CARBayesdata coda dplyr gtools leaflet MASS matrixcalc matrixStats Rcpp rgdal sp spam spdep testthat truncdist truncnorm]; }; + CARBayes = derive2 { name="CARBayes"; version="5.2"; sha256="08ajcgc0ycngcl2d757yjz1mpki88aq2jp07nr64j8aqpych5lw2"; depends=[CARBayesdata coda dplyr GGally leaflet MASS matrixcalc MCMCpack Rcpp rgdal sp spam spdep truncnorm]; }; + CARBayesST = derive2 { name="CARBayesST"; version="3.1"; sha256="12l4jdbaadnyngqphzc8fsspynryci9p9h6bl1196arqd5igax94"; depends=[CARBayesdata coda dplyr GGally ggplot2 gridExtra gtools leaflet MASS matrixcalc matrixStats Rcpp rgdal sp spam spdep testthat truncdist truncnorm]; }; CARBayesdata = derive2 { name="CARBayesdata"; version="2.1"; sha256="09rjxdrbpnqm6gv9g1jxh91jmww345wi9vlhb4s1n6b3xnh44fhs"; depends=[shapefiles sp]; }; CARE1 = derive2 { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; }; CARLIT = derive2 { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; }; - CARRoT = derive2 { name="CARRoT"; version="2.0.0"; sha256="1x8y803rvfchmjfw608nframvdm3nvci36bv0bb9h42z8gviyh0v"; depends=[doParallel foreach nnet Rdpack]; }; + CARRoT = derive2 { name="CARRoT"; version="2.5.0"; sha256="1ijmj95gbxa2179bscbbz6qqaqjk7a5i6m4xla5z6h3vrddssxmz"; depends=[doParallel foreach nnet Rdpack]; }; CARS = derive2 { name="CARS"; version="0.2.2"; sha256="18l2bhfwma24q1zg1y1xmlcmnbzjqmmny3h7s179kslagnh3kmsj"; depends=[np]; }; CASMAP = derive2 { name="CASMAP"; version="0.6.0"; sha256="1z321l34da5ggwmbggs9d8m96syra1jm29gj68lfhd7ikbpmw96w"; depends=[Rcpp]; }; - CAST = derive2 { name="CAST"; version="0.3.1"; sha256="1cqadrww0w2wkqmh4mi2bmdr572q5qpnz2c4jpvwqrk2ynhz43qn"; depends=[caret ggplot2]; }; + CAST = derive2 { name="CAST"; version="0.4.0"; sha256="0s92a1ybjqi9d0f7xrk77jg42q3allizb627h28ndg6nj02h23ap"; depends=[caret ggplot2]; }; CATT = derive2 { name="CATT"; version="2.0"; sha256="12xdspl1gbf51snyrl44nn7alfyccdfihibkgvzr66lrby8b8fhg"; depends=[]; }; CATTexact = derive2 { name="CATTexact"; version="0.1.0"; sha256="0mklkmay9ph4d0z2l1gcg0lj429xkyhmz7srdil5rgwqxx9dnqs8"; depends=[]; }; CATkit = derive2 { name="CATkit"; version="3.3.3"; sha256="01q2ssyg0jcjgahaslfgpakjsv2wil654lc6xrg5xbbrkx7ccb90"; depends=[assertr CombMSC Hmisc magic MASS png rtf season signal]; }; - CAWaR = derive2 { name="CAWaR"; version="0.0.1"; sha256="1z8xmwnxwlk0nhi22nabwzggizzsp8jzwfln0h2hkk7h1p8xjlhk"; depends=[fieldRS ggplot2 lubridate raster rgdal rgeos rsMove RStoolbox sp spatialEco]; }; CAinterprTools = derive2 { name="CAinterprTools"; version="1.0.0"; sha256="1ia4qfvj0nzxi6pwqnha2vpfcx3qwaw4vrjqiza11sai274j0pjy"; depends=[ca classInt cluster FactoMineR ggplot2 ggrepel Hmisc RcmdrMisc reshape2]; }; - CAvariants = derive2 { name="CAvariants"; version="5.0"; sha256="0y87xg2iwsmn8klavapncd7vkqvl15z9crmx3ja56ksb36czn8kk"; depends=[ggplot2 ggrepel gridExtra]; }; - CB2 = derive2 { name="CB2"; version="1.3.0"; sha256="050fpyj0zrgl03a2mdp9xrl72ad0d92kl7s9swgn2a7g8ca34c0k"; depends=[dplyr ggplot2 glue magrittr metap pheatmap R_utils Rcpp RcppArmadillo readr stringr tibble tidyr]; }; - CBCgrps = derive2 { name="CBCgrps"; version="2.6"; sha256="0kz7dqi5mbj4q6whdcizg85hw0ikdyb2vfh3xx1v40j09qv9w4vk"; depends=[nortest]; }; + CAvariants = derive2 { name="CAvariants"; version="5.5"; sha256="0bxifvhpjay18k6gkppypc1d0zaln1zhnxabvvld0pz4h59s2hlv"; depends=[ggforce ggplot2 ggrepel gridExtra plotly]; }; + CB2 = derive2 { name="CB2"; version="1.3.1"; sha256="14jx583lgm2yisdz3mkswpgzxz5lb86c9x66b94cn9mrhcnqlfb7"; depends=[dplyr ggplot2 glue magrittr metap pheatmap R_utils Rcpp RcppArmadillo readr stringr tibble tidyr]; }; + CBCgrps = derive2 { name="CBCgrps"; version="2.7"; sha256="1hqndrz3snir3pibqsbyzgbllgmdiprgq27a31vl29vkswpiwwsm"; depends=[nortest]; }; CBDA = derive2 { name="CBDA"; version="1.0.0"; sha256="0qm77vvqjgi83i8izly995ziv9ski8kgzqyq4g81i2k7a5dp8vxv"; depends=[doParallel foreach prettydoc SuperLearner]; }; CBPS = derive2 { name="CBPS"; version="0.21"; sha256="0av9lgdn9z57xl9cp53pi9nq971a6fj4przczw7sdb5saml3yr30"; depends=[glmnet MASS MatchIt nnet numDeriv]; }; + CBSr = derive2 { name="CBSr"; version="1.0.3"; sha256="0lfs8p9nha1aq6dn6sd3pc9x0931zawxprpflfv9gqb8w7n1z4sd"; depends=[NlcOptim rJava]; }; CBT = derive2 { name="CBT"; version="1.0"; sha256="13h6sf7w03nfq2arqymwww13ywnv9xnqbqazlzn856mj3ggaqda7"; depends=[]; }; CC = derive2 { name="CC"; version="1.0"; sha256="189si37ggichqmzy8m686zw1cijix7yfy8ma5iqpnq1q9vm3pcvy"; depends=[]; }; CCA = derive2 { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; }; CCAGFA = derive2 { name="CCAGFA"; version="1.0.8"; sha256="1jxb6d1h5p97wnr45s1fsspksqn771nib415ihxi4vj5w8s94j8b"; depends=[]; }; - CCAMLRGIS = derive2 { name="CCAMLRGIS"; version="3.0.1"; sha256="03wm2cbyvrrfh0f8jxxllqhm176xf06fnghwzakq5ivxpi5a1qsh"; depends=[dplyr geosphere magrittr raster rgdal rgeos sp]; }; + CCAMLRGIS = derive2 { name="CCAMLRGIS"; version="3.0.3"; sha256="0nwz007hn937y6ckkv7lcabyhcj7cvpy23hr03naggdbd4ql0gjf"; depends=[dplyr geosphere magrittr raster rgdal rgeos sp]; }; CCM = derive2 { name="CCM"; version="1.2"; sha256="1mhl7yppniybdffylddbbb65n7gmv029fb46wlsxm4yf2xkplmwy"; depends=[]; }; CCP = derive2 { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; depends=[]; }; CCTpack = derive2 { name="CCTpack"; version="1.5.2"; sha256="1kkxsk9x4jz2bvldmba7fsri3zc1cjz15z0xicjmfc7lj72ngdig"; depends=[MASS mvtnorm polycor psych R2jags rjags]; }; CCpop = derive2 { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; }; CDFt = derive2 { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; }; CDLasso = derive2 { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; }; - CDM = derive2 { name="CDM"; version="7.4-19"; sha256="1ln1r3rk004fmk55iy08bjh3vv4wnkb8zg2wj3r9rq7pi8jn8fv4"; depends=[mvtnorm polycor Rcpp RcppArmadillo]; }; + CDM = derive2 { name="CDM"; version="7.5-15"; sha256="159ny2dz0rf1r3k1mqlfwambffc8rx425sggf5bn51nybpzanq3l"; depends=[mvtnorm polycor Rcpp RcppArmadillo]; }; CDNmoney = derive2 { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; }; CDROM = derive2 { name="CDROM"; version="1.1"; sha256="0mvhqs4m8jp39x1rk31a1sqqmfq1avcnasgh8bizlyxx62igmi1b"; depends=[]; }; CDVine = derive2 { name="CDVine"; version="1.4"; sha256="0cp78pb6yny4n5q2j9k6xdql588536572gbphnw8zkdmrg65qyz7"; depends=[igraph MASS mvtnorm]; }; CDVineCopulaConditional = derive2 { name="CDVineCopulaConditional"; version="0.1.1"; sha256="1wyy324vrwipdsq0p021bj1gdhyxg09g3dkw8wv5v6rfrrs84m9k"; depends=[combinat VineCopula]; }; CEC = derive2 { name="CEC"; version="0.10.2"; sha256="03fxhqlpn7x3djfanlix3yzf1cy6zf854g70gq2d93ix9gis7knv"; depends=[]; }; CEGO = derive2 { name="CEGO"; version="2.4.0"; sha256="1rmx9ppiw7k5cznanz3m4lnhriz3fs4f7wk5h3q9wg9cyzfjhh38"; depends=[DEoptim fastmatch MASS Matrix ParamHelpers quadprog]; }; - CENFA = derive2 { name="CENFA"; version="1.0.0"; sha256="0ah8rh0gbwwhdfxzj9sj4i8iqbybkga09vinlh0r514ayv2qq2x8"; depends=[doSNOW foreach magrittr pbapply raster Rcpp snow sp]; }; + CENFA = derive2 { name="CENFA"; version="1.1.0"; sha256="03l0i24m2mh0gfmg7b48qg15zmfr8a39l1nswvmbmcj2a5hxybf4"; depends=[doSNOW foreach magrittr pbapply raster Rcpp snow sp]; }; CEoptim = derive2 { name="CEoptim"; version="1.2"; sha256="0bbjrhl63cbx1rsr5gclbqhjpnjid8ynk2ygaf1chf8z381n7650"; depends=[MASS msm sna]; }; CFC = derive2 { name="CFC"; version="1.1.2"; sha256="0k0685cgsd0lm7id6h216r4x236xn3nqj4h906qn2i0kvwmx4nda"; depends=[abind doParallel foreach Rcpp RcppArmadillo RcppProgress survival]; }; - CGE = derive2 { name="CGE"; version="0.2.8"; sha256="1bsrnrchwh2fjsx1gm8qx3f792ma5civw3w0j7is5lwyqff2q0cz"; depends=[]; }; - CGGP = derive2 { name="CGGP"; version="1.0.1"; sha256="0vpj2bmij8wwckyzbmid6dyzpwy4jcbgpch3j143rag7pvgmc87q"; depends=[Rcpp RcppArmadillo]; }; - CGManalyzer = derive2 { name="CGManalyzer"; version="1.2"; sha256="1993hxpaplb2qxrjfnm63alks0wb3msrffycmwd9p9md5glzci9y"; depends=[]; }; + CFF = derive2 { name="CFF"; version="1.0"; sha256="04z3q0s4b1yns5l7lplw8qrcdjzsdy9crnhakyzd6r449hjfsvnz"; depends=[]; }; + CGE = derive2 { name="CGE"; version="0.3.1"; sha256="0bn88m0mls7qyv40l2nd1g1hxjdj2rjxwaf9a08xigicix48j7i6"; depends=[]; }; + CGGP = derive2 { name="CGGP"; version="1.0.2"; sha256="0z71sl1vsz3f84scxa25444fb6wm1jbd05syapggjxnjcglmiq45"; depends=[Rcpp RcppArmadillo]; }; + CGManalyzer = derive2 { name="CGManalyzer"; version="1.3"; sha256="1wmp5im18s447rjkj891skrm7558xkqlbx43n9hyxiqg49zq1ng9"; depends=[]; }; CGP = derive2 { name="CGP"; version="2.1-1"; sha256="05a6gydlb99yk2jpy2hyg4c30hqyp8dg2i9dmbjc1n5cmgpg3im9"; depends=[]; }; - CGPfunctions = derive2 { name="CGPfunctions"; version="0.5.7"; sha256="0afyv64kqmjsymnp9vzn55zn8qri2ic4mhsc77rf5s1jzamcgjlp"; depends=[broomExtra car DescTools devtools dplyr ggplot2 ggrepel pwr rlang scales sjstats tibble]; }; + CGPfunctions = derive2 { name="CGPfunctions"; version="0.6.0"; sha256="0n3p49nnm2lj8gzaalrkfkjglxb5bnlgc8cxfgw3jiizikj3dla5"; depends=[BayesFactor broom car DescTools dplyr forcats ggmosaic ggplot2 ggrepel paletteer partykit purrr rlang scales sjstats stringr tidyr]; }; CHCN = derive2 { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; }; CHFF = derive2 { name="CHFF"; version="0.1.0"; sha256="0jv75p1bnwsad2vpxf1zwq97al9xxhk2hpnpsilf0jn0w7g9b2d3"; depends=[]; }; CHMM = derive2 { name="CHMM"; version="0.1.1"; sha256="07fdvnwhblwvljbl2z0vs42nwki67yl5ly3fj40p50k3rnqqmavj"; depends=[mclust]; }; - CHNOSZ = derive2 { name="CHNOSZ"; version="1.3.4"; sha256="01kvqyissybg28c275a2is9v45jrv20ggsz3z6qga2r9kr13a3c7"; depends=[]; }; + CHNOSZ = derive2 { name="CHNOSZ"; version="1.3.6"; sha256="0imfyvagvxqffvz3ksvkmfc2lbfli5lsxvnqby7iw2dp1gzpaxqc"; depends=[]; }; CHsharp = derive2 { name="CHsharp"; version="0.4"; sha256="19mb5zzi9x4pm2z9jbha5dz4k5f1iqjv31aisyv4qh14k5ysdz2i"; depends=[KernSmooth scatterplot3d]; }; CIAAWconsensus = derive2 { name="CIAAWconsensus"; version="1.3"; sha256="0yhay4fp5lyf0sdcf807yvys17qz9cr5f5ikim25mq336p7fp03x"; depends=[Matrix mvtnorm numDeriv stringr]; }; CIEE = derive2 { name="CIEE"; version="0.1.1"; sha256="03kq9cp0v41y0r2l9j5imcrsail2xsvlzhhhsrw454d4s9gqdql9"; depends=[survival]; }; CIFsmry = derive2 { name="CIFsmry"; version="1.0.1.1"; sha256="1m2m2zvg9ghy3bm2sll7jp4xm2vw58kc5xaxd2c9k82771m3a4j0"; depends=[]; }; CIM = derive2 { name="CIM"; version="1.0.0"; sha256="02l8rspiiv6vj6k0q6wpiazny3f2s4dsivsm7zb9cm90qh1rv2d7"; depends=[]; }; + CIMTx = derive2 { name="CIMTx"; version="0.1.0"; sha256="0z2xxmmlybgl3ydyhkdkyd9frwi8ddqi89dfwa0rdl6gg59rawmk"; depends=[arm BART car class dplyr gam magrittr Matching nnet SuperLearner tidyr tmle twang WeightIt]; }; CINID = derive2 { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1agzrqfw0czvvfrzj9yjfpj8xc99"; depends=[]; }; CINNA = derive2 { name="CINNA"; version="1.1.53"; sha256="0mp7fvsxiri6454s7hlpsy9r3ysy6vdb3yslnizgqi38rb17phik"; depends=[centiserve circlize corrplot dendextend factoextra FactoMineR GGally ggplot2 igraph intergraph network pheatmap plyr qdapTools Rtsne sna viridis]; }; CISE = derive2 { name="CISE"; version="0.1.0"; sha256="10mbi4v8dfdc9ngnrrmxpng8fnig5m8nv7799jksbcf6pnj8yv51"; depends=[far gdata glmnet MASS Matrix rARPACK]; }; @@ -602,33 +605,33 @@ in with self; { CLSOCP = derive2 { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; }; CLUSTShiny = derive2 { name="CLUSTShiny"; version="0.1.0"; sha256="19mh5g1ylvlab4xjxw7girxk9zkpxxczhbfijf11b592hbw0qxqk"; depends=[cluster dplyr klaR MASS psycho rmarkdown shiny]; }; CMC = derive2 { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; }; - CMF = derive2 { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp]; }; + CMF = derive2 { name="CMF"; version="1.0.2"; sha256="0hm6srsylg1syz86iz93qyxr7xgh1qvmp27k2hgkj1z1z8lsw1ca"; depends=[Rcpp]; }; CMLS = derive2 { name="CMLS"; version="1.0-0"; sha256="1542qqsl6sksrcpwhnn55d260hkbmy4ikd0v2an96yxk5w95spvn"; depends=[quadprog]; }; - CMPControl = derive2 { name="CMPControl"; version="1.0"; sha256="0cp29cibiydawsl0cq433l9abdivr16b431zlrh45wzr5kzfcs0v"; depends=[compoisson]; }; CMShiny = derive2 { name="CMShiny"; version="0.1.0"; sha256="0ciis3930yhn4dmazsg2yp7wi9hdfj5slr032x8qfllxis7m4k0w"; depends=[caret e1071 epitools Matrix rmarkdown shiny shinyMatrix]; }; CMapViz = derive2 { name="CMapViz"; version="0.1.0"; sha256="1s7xyp13p7fpbq0bghk07dfv90339kxs7k3343jqhrn8djf3as67"; depends=[dplyr ggplot2 readxl reshape2 scales stringr]; }; CMatching = derive2 { name="CMatching"; version="2.3.0"; sha256="0q0hplhsamj46z7g6pa7yg1bap5822ka1419yhcip551djhvnpmv"; depends=[lme4 lmtest Matching multiwayvcov]; }; - CMplot = derive2 { name="CMplot"; version="3.5.1"; sha256="15qplnwx6ma5cxm9v59hv7hca70slzbyaxvsddr9lpd0ph29ijhm"; depends=[]; }; + CMplot = derive2 { name="CMplot"; version="3.6.0"; sha256="1pwxbkslch10pyzyldj6rl32m0qjpbawpxv4f4z1jsbm1gjq1k5z"; depends=[]; }; CNLTreg = derive2 { name="CNLTreg"; version="0.1-2"; sha256="07yi0ajil1113663v3gp5d3453r4l9qm442jnpydx4ygvjk7m2ha"; depends=[adlift miscTools nlt]; }; CNLTtsa = derive2 { name="CNLTtsa"; version="0.1-2"; sha256="1vy0jjg6s8yvsvkx4pin183y5bnikm5cmjcpa9znz9dj1w6hwr5r"; depends=[adlift CNLTreg fields nlt]; }; CNOGpro = derive2 { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; }; - CNVScope = derive2 { name="CNVScope"; version="2.9.4"; sha256="1nkaghrp7wn8h0gq6i4lny2n1lxhk0a6dwyz7d1k5k1vv6xnxwf8"; depends=[BiocManager biomaRt BSgenome_Hsapiens_UCSC_hg19 circlize data_table doParallel dplyr foreach GenomeInfoDb GenomicFeatures GenomicInteractions GenomicRanges ggplot2 heatmaply HiCseg htmltools htmlwidgets igraph InteractionSet IRanges jointseg logging magrittr Matrix matrixStats numbers OpenImageR plotly plyr RCurl reshape2 rslurm rtracklayer S4Vectors shiny shinycssloaders shinyjs shinythemes spatialfil stringr tibble tidyr visNetwork]; }; + CNVScope = derive2 { name="CNVScope"; version="3.0.5"; sha256="0y131sk4dihfnqz30c2jz2pkzk53f266afr56y097vnbhzsqpaiw"; depends=[BiocManager biomaRt BSgenome_Hsapiens_UCSC_hg19 circlize data_table doParallel dplyr DT foreach GenomeInfoDb GenomicFeatures GenomicInteractions GenomicRanges ggplot2 heatmaply HiCseg htmltools htmlwidgets igraph InteractionSet IRanges jointseg logging magrittr Matrix matrixStats numbers OpenImageR plotly plyr RCurl reshape2 rslurm rtracklayer S4Vectors shiny shinycssloaders shinyjs shinythemes spatialfil stringr tibble tidyr visNetwork]; }; CNprep = derive2 { name="CNprep"; version="2.0"; sha256="08dpjikx3ldqzw2kwb12q0kbw15qzl09srjdfs0sz9si0x6bfxs6"; depends=[mclust rlecuyer]; }; CNull = derive2 { name="CNull"; version="1.0"; sha256="14hy86zg18hqxi63bfzrpkz70yrzfxp2v2pva5xnrvx9dmlyz820"; depends=[ape Matrix PhyloMeasures Rcpp]; }; COBRA = derive2 { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; }; COCONUT = derive2 { name="COCONUT"; version="1.0.2"; sha256="1qjrhxn6dkxyimdca3nslaiw3hncfpk1pk4v01mcrnz550z001nz"; depends=[]; }; COMBAT = derive2 { name="COMBAT"; version="0.0.4"; sha256="0m700pl33frdpc9y16y4zyh1ixpardh0r5kmz8a78jrh1acn30id"; depends=[corpcor mvtnorm]; }; - COMBIA = derive2 { name="COMBIA"; version="1.0.6"; sha256="1640bfl5sn00czxnl6j2rrdrzc5arvfpy5b66viybxm2qqbiw49w"; depends=[gdata hash lattice latticeExtra oro_nifti]; }; COMPoissonReg = derive2 { name="COMPoissonReg"; version="0.7.0"; sha256="144vf3vfn5msc8p67q65frza8xyi9nqccjq47fnv33w5h0d9wlxj"; depends=[Rcpp]; }; + CONCUR = derive2 { name="CONCUR"; version="1.2"; sha256="1badxbc8lb5g52anl4dzrd3bpws8j7bx1c4mnzb6862g9jmr7280"; depends=[CompQuadForm dplyr mgcv]; }; CONDOP = derive2 { name="CONDOP"; version="1.0"; sha256="0si9nm93wk9lif3r6jh2nxr4sjq1iqyfavbykja3zcy6yn05i19s"; depends=[earth GenomeInfoDb GenomicRanges IRanges mclust plyr randomForest rminer S4Vectors seqinr]; }; CONS = derive2 { name="CONS"; version="0.1.1"; sha256="0w0rca4z3hij0lbabpdnhv2lb52gx574g7bqp6q16772pi4685hf"; depends=[FactoMineR gridExtra gWidgets pander raster readxl REdaS]; }; CORE = derive2 { name="CORE"; version="3.0"; sha256="0wq9i7nscnzqiqz6zh6hglm7924261bw169q3x6l9i6jgqhvn32d"; depends=[]; }; - CORElearn = derive2 { name="CORElearn"; version="1.53.1"; sha256="01jjw32awqjlvrn2wanljr3v4nphjb8mknzmz4skyhx0zgdm369x"; depends=[cluster nnet rpart]; }; + CORElearn = derive2 { name="CORElearn"; version="1.54.2"; sha256="0nsqmmwngv04dp4wpm9irybiv7bk35x78b8ib4mgk11yzm0wl1nn"; depends=[cluster nnet plotrix rpart rpart_plot]; }; CORM = derive2 { name="CORM"; version="1.0.2"; sha256="0g5plafx2h1ija8jd6rxvy8qsrqprfbwbi1kq1p4jdr9miha20nv"; depends=[cluster limma]; }; COSINE = derive2 { name="COSINE"; version="2.1"; sha256="10ypj849pmvhx117ph3k1jqa62nc4sdmv8665yahds7mh0ymhpjj"; depends=[genalg MASS]; }; COST = derive2 { name="COST"; version="0.1.0"; sha256="06xgnsccd621ihlrdmnnh14vh83q1r2bnp3iqi7vp5553b3y4l3w"; depends=[copula mvtnorm]; }; COUNT = derive2 { name="COUNT"; version="1.3.4"; sha256="02f7779fy0d2bql88x5v9csbxljhnyvl8wb8h83xrmwl7kaxsdpy"; depends=[MASS msme sandwich]; }; COUSCOus = derive2 { name="COUSCOus"; version="1.0.0"; sha256="1ykqi72v8v1b3g9qy6h34dvk5fynzf1rl2mby65p08axmaba5798"; depends=[bio3d matrixcalc]; }; + COVID19 = derive2 { name="COVID19"; version="1.0.0"; sha256="05nnpgiykyi2lk5pddxpwv9j64gvp0b9mb9n760nf226p2f0m7w4"; depends=[dplyr remotes tidyr]; }; CP = derive2 { name="CP"; version="1.6"; sha256="18zblf13riiz3mq3hkvg6vhiwjzpsn6mvgc2p0bqyldy98v4aisd"; depends=[survival]; }; CPAT = derive2 { name="CPAT"; version="0.1.0"; sha256="0zygncwww3cazwmx06bhzq0g41xcqfpw307azdhygc8jmcy6qj71"; depends=[purrr Rcpp RcppArmadillo Rdpack]; }; CPBayes = derive2 { name="CPBayes"; version="1.0.0"; sha256="0m9hy14xmaa0lswn2dlrjvqcsg14smxy3w1nmy48l3af1c2kjnxv"; depends=[forestplot MASS mvtnorm purrr]; }; @@ -646,33 +649,35 @@ in with self; { CRPClustering = derive2 { name="CRPClustering"; version="1.2"; sha256="19m7jg6ck2gqmry2p35h3vv8msm4w1x7qwwmm746r646q7w9ylml"; depends=[dplyr lucid MASS mvtnorm png randomcoloR]; }; CRTSize = derive2 { name="CRTSize"; version="1.0"; sha256="1d45zx26bf0zk0piham69gvb8djqf48g6iisbldv0ds3s2hhcsin"; depends=[]; }; CRTgeeDR = derive2 { name="CRTgeeDR"; version="2.0"; sha256="1fzw8618k152b8d4d6wmzp0bfkz2grwp0rqsplwvfdx23nxq437n"; depends=[ggplot2 MASS Matrix]; }; + CRUF = derive2 { name="CRUF"; version="0.5.1"; sha256="0mx7ksd5csy7v7v0wacfafs84sdfd41sy3f0yzpis9f07r7pqp3w"; depends=[aod miceadds survival survminer]; }; CRWRM = derive2 { name="CRWRM"; version="0.0.1"; sha256="0w6lg5q2c0w5p9vg5qr32pycyl8d1zp0s55jlvf2xhmqx34677hd"; depends=[]; }; CSESA = derive2 { name="CSESA"; version="1.2.0"; sha256="0pv6iabq1w22qbhlsbckdvva4n7igpzrjnrahmq83a6wxgvjbf5j"; depends=[Biostrings]; }; CSFA = derive2 { name="CSFA"; version="1.2.0"; sha256="1nkyhk8qhrrlx8v26yw86l954m4xfcxma4pqbhgw95jvqql5h3li"; depends=[elasticnet fabia FactoMineR pls randomcoloR snowFT]; }; + CSMES = derive2 { name="CSMES"; version="1.0.0"; sha256="1ddr2b39d7nwan6dqf5xx9h6gzfxxk50r1d9vbpb9hc8a7d15vnp"; depends=[caTools data_table mco ROCR rpart zoo]; }; + CSTools = derive2 { name="CSTools"; version="3.0.0"; sha256="1gdvkpq8iji0kxlk4ka10kq7i2qn3r5jcg2c5isf3zjkyjn2f218"; depends=[abind ClimProjDiags data_table ggplot2 maps multiApply ncdf4 plyr qmap rainfarmr reshape2 s2dverification verification]; }; CSclone = derive2 { name="CSclone"; version="1.0"; sha256="0lqsqsgh2sf44fr1r7g179556v294yr1wy7x4320g7adxshrwyh5"; depends=[DNAcopy lpSolve mcclust moments]; }; CSeqpat = derive2 { name="CSeqpat"; version="0.1.2"; sha256="1nqk873cagpn4fba4rmyzb6hni1p5lqcvsr9givrcm0gfx756w1h"; depends=[NLP tm]; }; CTAShiny = derive2 { name="CTAShiny"; version="0.1.0"; sha256="18qw8nx1r4gwlxj9zxn4hllpn29fv3i4fgwyl5fh3qsv9hmbvi0x"; depends=[epitools rpivotTable shiny shinyMatrix]; }; CTM = derive2 { name="CTM"; version="0.2"; sha256="0h1lpygjq46nwkn4km49bngvxmgrnh3csrfln3yjr9yyzs7d3lz1"; depends=[jiebaR plyr]; }; - CTRE = derive2 { name="CTRE"; version="0.1.0"; sha256="1v2327g78rva3n7lvn66rznzzf2qbdak0jp8gakgljpl30kpkv5v"; depends=[assertthat MittagLeffleR plyr tea zoo]; }; CTShiny = derive2 { name="CTShiny"; version="0.1.0"; sha256="0lmzf02w8j4rgz1kh7jwvl0sb6y38r56gwmsf7pkc00w1dskb722"; depends=[caret dplyr e1071 party rhandsontable rmarkdown rpart rpart_plot shiny]; }; CTT = derive2 { name="CTT"; version="2.3.3"; sha256="02z354gf7rzh9xzyflmsag4hgmqgv3sr9s9ja903rwdz1pjqrlff"; depends=[]; }; CTTShiny = derive2 { name="CTTShiny"; version="0.1"; sha256="1c9vsiqyig6kfjpy3dfrysc466h4v9530m49aynz65i1njplswyh"; depends=[CTT ltm psych shiny shinyAce]; }; CTTinShiny = derive2 { name="CTTinShiny"; version="0.1.0"; sha256="1dc6kaxajkvviszmrcvhh9cg2k8g1hbpf1f6fg3wlgnb80fsx9b7"; depends=[CTT foreign shiny]; }; - CUB = derive2 { name="CUB"; version="1.1.3"; sha256="1qdqqiax9yc0vzcqkkzx81nb7gix0x5pknvbqp1xv200776wsfc4"; depends=[Formula]; }; + CUB = derive2 { name="CUB"; version="1.1.4"; sha256="1l47fkfvd91mbfzgl0vwaahbyi53jv3md6zah9ns85ns6xlwap7n"; depends=[Formula]; }; CUFF = derive2 { name="CUFF"; version="1.6"; sha256="06ip6jrw6zgysz1lhlxxj26bv6hwg87qx6spqfinqrc9lz3p1y93"; depends=[DT lmerTest nlme openxlsx xtable]; }; CUMP = derive2 { name="CUMP"; version="2.0"; sha256="0rdscywmi4sylpjpr8r472iapddizb1mqyrd532cvw6frxins7w0"; depends=[]; }; - CUSUMdesign = derive2 { name="CUSUMdesign"; version="1.1.3"; sha256="149d16d5y7zxkzq8gmb5spfrvirv0vyhk2qx0v7vclkr8adz9sva"; depends=[]; }; + CUSUMdesign = derive2 { name="CUSUMdesign"; version="1.1.5"; sha256="1qxq1a8b5pnmlq6rpjzvcp32scn2qknafch3h7qjsy8499zzbxx8"; depends=[]; }; CVD = derive2 { name="CVD"; version="1.0.2"; sha256="0agb0liwbp4wvmxbyxgfb7471ki1agfb6ssh77kvwbkxqmrc8d96"; depends=[]; }; CVR = derive2 { name="CVR"; version="0.1.1"; sha256="1y8m9r409jq5h6xx1rvz7c7aj882jldfxly89zf3cvp2qg3jh7rj"; depends=[PMA Rcpp RcppArmadillo]; }; CVST = derive2 { name="CVST"; version="0.2-2"; sha256="05l3yzkfrbds09ah9cdwn2sn4ryhq78lz33ryzrgkv176jc8qjw5"; depends=[kernlab Matrix]; }; CVThresh = derive2 { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3cplpz2h2ayz6k1nrfx3s2b7a8w1il3vmi69"; depends=[EbayesThresh wavethresh]; }; CVTuningCov = derive2 { name="CVTuningCov"; version="1.0"; sha256="1bwzis82lqwcqp2djy4bnd3vvjr47krlv3pdc5msh12wcs0xhs7n"; depends=[]; }; - CVXR = derive2 { name="CVXR"; version="0.99-7"; sha256="0jbw4gxcjrmzdm2681nfci34mkf16b9w6xi5slq6l5x273rfjh5v"; depends=[bit64 ECOSolveR gmp Matrix R_utils R6 Rcpp RcppEigen Rmpfr scs]; }; + CVXR = derive2 { name="CVXR"; version="1.0-1"; sha256="023pf67ar0g795jdm6k3xjagns7gacmvab0sivrgisl4s51firdk"; depends=[bit64 ECOSolveR gmp Matrix osqp R6 Rcpp RcppEigen Rmpfr scs]; }; CVcalibration = derive2 { name="CVcalibration"; version="1.0-1"; sha256="0ca582fnysrldlzxc3pihsph9pvdgygdh7sfzgxvr5fc3z1jbjzb"; depends=[]; }; CVglasso = derive2 { name="CVglasso"; version="1.0"; sha256="1bh09cd0yabhqv5yfahhvayx3f09yqapzl1yr9nc9xqwyx1d0cfd"; depends=[doParallel dplyr foreach ggplot2 glasso]; }; CaDENCE = derive2 { name="CaDENCE"; version="1.2.5"; sha256="1z3p5y1l67r470x6wrhnyjvw1ndppcm08fpj99x122j7kn6byff2"; depends=[pso]; }; CaPO4Sim = derive2 { name="CaPO4Sim"; version="0.1.0"; sha256="1ihkx0swj9adz2pgfm9c20pcipq748czkyg76q3y0zk1j987nfik"; depends=[DT htmltools magrittr plotly purrr rintrojs shiny shinycssloaders shinydashboard shinydashboardPlus shinyjqui shinyjs shinyWidgets visNetwork]; }; - Cairo = derive2 { name="Cairo"; version="1.5-10"; sha256="1mdmd5zmjkh1b0x928zizgzh42x8swbajffb88rvnjfdhk1z0dvq"; depends=[]; }; + Cairo = derive2 { name="Cairo"; version="1.5-12"; sha256="02v29am4fac3fyq6y1w6r89zwbqqkxjsxrafcwb5s124ikxyl22f"; depends=[]; }; CalSim = derive2 { name="CalSim"; version="0.3.2"; sha256="1a4w9kh9ykms1i30hhd7h8gdkbfl6g071jmcy26j1sbshxrnq8s1"; depends=[spatstat]; }; Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.3"; sha256="03qg9rnz623dwnp68xhhsh9788s49n6xp0migg1nnjaqhrahlgdd"; depends=[]; }; CalibratR = derive2 { name="CalibratR"; version="0.1.2"; sha256="1hnmhijckxd35h8mhpzqpglk1ykdih2c5kg17myc7cci5xjk9nfr"; depends=[doParallel fitdistrplus foreach ggplot2 pROC reshape2]; }; @@ -680,47 +685,45 @@ in with self; { CamelUp = derive2 { name="CamelUp"; version="0.1.1"; sha256="09i6bi2vnd7iyll9s8sbyy73l6kq8xrpf07qbcahs595x5iclgrg"; depends=[data_table R6 shiny shinyalert tidyverse]; }; Canopy = derive2 { name="Canopy"; version="1.3.0"; sha256="0979hpphzhf4v71jx0shh3l8nffmpsn9l6f8ip2wxzcyx571i1wd"; depends=[ape fields pheatmap scatterplot3d]; }; CarletonStats = derive2 { name="CarletonStats"; version="2.0"; sha256="0pgzvw6gf8kjv8ndprwp4wlgdgh5sb75ga8z5syfw57fb05v7ac3"; depends=[]; }; + Carlson = derive2 { name="Carlson"; version="1.0.0"; sha256="1m030x30cd0w2r6y280v9kpqalx6djhyx9hfzhk1qbqh5rk7br2l"; depends=[]; }; Cascade = derive2 { name="Cascade"; version="1.8"; sha256="0d75a9f43ligyjv62476plb86ipfq9y7g9njq4rx84cp17vbb662"; depends=[abind animation cluster igraph lars lattice limma magic nnls survival tnet VGAM]; }; CascadeData = derive2 { name="CascadeData"; version="1.2"; sha256="0czc41f1vj61rkdl6gnnnga3qliyxp0ffl5j9wrhrlwnbdaknics"; depends=[]; }; CatDyn = derive2 { name="CatDyn"; version="1.1-1"; sha256="0gkaxs7apqhq7mp3chjsyhrnk3qkk11f8p7smmyj6h73888ry8jn"; depends=[BB optimx]; }; CatEncoders = derive2 { name="CatEncoders"; version="0.1.1"; sha256="1q9wzq06lac8z9y8b65alsxpb48bw8wqmifd893kknk51xq6r9kl"; depends=[data_table Matrix]; }; CatPredi = derive2 { name="CatPredi"; version="1.1"; sha256="1fqz2mb3xhpzvamf0bpqfql3vd86vq6fq7n6p8xq7lraj1w77lys"; depends=[CPE mgcv rgenoud rms survival]; }; + CatReg = derive2 { name="CatReg"; version="1.0.0"; sha256="10qvp3v8bwsynxxl1a6qkp9ddfqygjc0cm1nbxi86dwyi26mcvz0"; depends=[Rcpp Rdpack]; }; CateSelection = derive2 { name="CateSelection"; version="1.0"; sha256="194lk6anrb05gaarwdg8lj5wm6k61b4r702cja3nf3z91i8paqi7"; depends=[]; }; CausalFX = derive2 { name="CausalFX"; version="1.0.1"; sha256="0v0diqq9fa1v9n3v5m5shvwlgmj91cbbb78243rwib1h3pyacihf"; depends=[igraph rcdd rje]; }; CausalGAM = derive2 { name="CausalGAM"; version="0.1-4"; sha256="1riz11hfg96iks7734rg692l75nfrd3hmr9gw563j27rkk1nfkl6"; depends=[gam]; }; CausalImpact = derive2 { name="CausalImpact"; version="1.2.4"; sha256="0nszqvaxmz9jrb7wqdmjjplajk8mxpyyl14n2fm5p4pyx8srwphq"; depends=[assertthat Boom bsts dplyr ggplot2 zoo]; }; CausalKinetiX = derive2 { name="CausalKinetiX"; version="0.2.1"; sha256="0haxw4vvbw48hlvsl1d1y3xm48qm5vl0d3k5lj89ajwc618nk5jg"; depends=[cvTools deSolve fda glmnet pspline quadprog randomForest sundialr]; }; - Causata = derive2 { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[boot data_table foreach ggplot2 glmnet R_utils RCurl rjson RMySQL stringr XML yaml]; }; CautiousLearning = derive2 { name="CautiousLearning"; version="1.0.1"; sha256="1m5x93l4bscrpcxk0pva6d6n2qnzhzxh0a6a81p97l8lqgs1qw2q"; depends=[BH Rcpp sitmo spc]; }; - CePa = derive2 { name="CePa"; version="0.6"; sha256="1qpxx9x656g678wp190q29vxkb54sfkalg0csg0ndlcvi03dvl3d"; depends=[graph igraph Rgraphviz]; }; + CePa = derive2 { name="CePa"; version="0.7.0"; sha256="0jykh0f168azphjd3h1q81wlvj8zn8qy0c4wi275gvw0xwi104mk"; depends=[graph igraph Rgraphviz]; }; CeRNASeek = derive2 { name="CeRNASeek"; version="2.1.2"; sha256="1bjx474wbxs4wxy6j4n578cggmcj0061kbbkyhfif65qbsfgrcf8"; depends=[gtools igraph survival]; }; - CensMFM = derive2 { name="CensMFM"; version="2.0"; sha256="1p129x2b6avv7h5ifjmkds2yfw0jwm3q1cqyrpy8j9nkli0crg1y"; depends=[ggplot2 gridExtra MomTrunc mvtnorm tlrmvnmvt]; }; - CensMixReg = derive2 { name="CensMixReg"; version="3.1"; sha256="1r7w84bjdxnkhiw7gh499scc6m3ba9b2a8cwayn6sg5a524yn9gs"; depends=[ClusterR mixsmsn mnormt mvtnorm trimcluster]; }; + CenBAR = derive2 { name="CenBAR"; version="0.1.0"; sha256="0qa1jzgvf33fi0vns7v49hjk0wkaxic7dw67m0wr33wjplf93wnh"; depends=[cvTools foreach glmnet MASS mvtnorm survival]; }; CensRegMod = derive2 { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; }; - CensSpatial = derive2 { name="CensSpatial"; version="2.1"; sha256="19nlvg61gcn9mf6nsd0ji7b05vh2qzlszif5bmm8bqxzf8wmilx3"; depends=[geoR lattice moments msm mvtnorm numDeriv optimx psych raster tlrmvnmvt tmvtnorm]; }; Census2016 = derive2 { name="Census2016"; version="0.2.0"; sha256="1c88jmd565v19w8dbvai10f9y5lyfmzsxsjblc3gdykf9kharvcq"; depends=[data_table]; }; CepLDA = derive2 { name="CepLDA"; version="1.0.0"; sha256="15vhk7l5mw2kicw2x60r4z71hc415g8kaf2p06jgf7ykxmzkj7kg"; depends=[astsa class MASS multitaper]; }; CerioliOutlierDetection = derive2 { name="CerioliOutlierDetection"; version="1.1.9"; sha256="0s3pd4y165v69m4wmg9jlc7dl4gz64la9yic67l3n4242wa84p19"; depends=[robustbase]; }; CfEstimateQuantiles = derive2 { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; }; ChIPtest = derive2 { name="ChIPtest"; version="1.0"; sha256="1yn5b5s56k2dbhw6damxj18xbaiz180ym7fiq2i3p2gkcgwpddbz"; depends=[]; }; - ChainLadder = derive2 { name="ChainLadder"; version="0.2.10"; sha256="1mhmmxdy94qchsw8pc86hk78iwb9l3pfhljalxidk62f3qikrjxb"; depends=[actuar cplm ggplot2 lattice MASS Matrix statmod systemfit tweedie]; }; + ChainLadder = derive2 { name="ChainLadder"; version="0.2.11"; sha256="0qqfvhgybdp6l74nswc6xcilzbv54291p8mwjvdhjg29782szyyz"; depends=[actuar cplm ggplot2 lattice MASS Matrix statmod systemfit tweedie]; }; ChangepointTesting = derive2 { name="ChangepointTesting"; version="1.0"; sha256="1nb78b1jpp0wpy9ah2fxkh53hlmb2f82b68msbfhancb8zp2lclv"; depends=[]; }; - ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.16"; sha256="02kxybv9299j36xl4wk6d50crdnz0f6qbyxjiy6xf0s7hnlcr44c"; depends=[Rcpp RcppArmadillo]; }; - ChannelAttributionApp = derive2 { name="ChannelAttributionApp"; version="1.1"; sha256="0qy92ij1riynz7dhri3z85pafww5w9j1gx1bcgr8phlr32a7had7"; depends=[ChannelAttribution data_table ggplot2 shiny]; }; + ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.17"; sha256="0p05iy0ip2y9hndrwlny1d78dirfd5h2262xpcv1cr3mrgh93vvp"; depends=[Rcpp RcppArmadillo]; }; Chaos01 = derive2 { name="Chaos01"; version="1.2.1"; sha256="1wk70l1y0yzbjcjp0r334l1q3hzki0vzn6wbza97mq9pz8wp050r"; depends=[]; }; ChaosGame = derive2 { name="ChaosGame"; version="0.4"; sha256="10bq8i6b6zkg8nzq5np998xabyvijizxfbvw1m2nvfh74vxspj4p"; depends=[colorRamps ggplot2 gridExtra plot3D RColorBrewer rgl sphereplot]; }; ChargeTransport = derive2 { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; }; CheckDigit = derive2 { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; }; ChemoSpec = derive2 { name="ChemoSpec"; version="5.2.12"; sha256="1qr09n2yc009x8ag0lbmn1m93qhck05jc8vx7j5wfa0g4i1b2r7f"; depends=[ChemoSpecUtils plyr readJDX]; }; - ChemoSpec2D = derive2 { name="ChemoSpec2D"; version="0.3.166"; sha256="0b0pis55kz4r55qxwdlic87crnhkifvcylngkaxsfv1vqqz2wwlc"; depends=[ChemoSpecUtils]; }; - ChemoSpecUtils = derive2 { name="ChemoSpecUtils"; version="0.4.38"; sha256="1b7czs41jsniw1hnrm1c5z6pc5yiybbdnp2bqr810farmv61slzz"; depends=[plyr]; }; + ChemoSpec2D = derive2 { name="ChemoSpec2D"; version="0.4.147"; sha256="0rmnkk9ddxr32l09bj8qkh1jpffwkyczjr6vwk1qliwfwsbc78rl"; depends=[ChemoSpecUtils colorspace readJDX]; }; + ChemoSpecUtils = derive2 { name="ChemoSpecUtils"; version="0.4.51"; sha256="0wwzv6qkm6iya6gld1jlxk1hnzf6ndpwjppk93bi6pgjkgjq5i5g"; depends=[plyr]; }; ChemometricsWithR = derive2 { name="ChemometricsWithR"; version="0.1.13"; sha256="166va1g3m1wv21qkmw4wpz0bsrclh3jih8smxphdc13l9pqgclpq"; depends=[devtools kohonen MASS pls]; }; ChillModels = derive2 { name="ChillModels"; version="1.0.2"; sha256="06hgg893anh5z8an4l1xl4liz7d0m79n21h116vkdlymayccydbr"; depends=[]; }; ChoR = derive2 { name="ChoR"; version="0.0-4"; sha256="08mildsx542zfm0kcdakcv7c71hb4jgbcq1lhidf0fz76zj1pzk1"; depends=[commonsMath rJava]; }; ChoiceModelR = derive2 { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; }; CholWishart = derive2 { name="CholWishart"; version="1.1.0"; sha256="1p92i5ibv9805fg8s5wrpxx63k4c1ihs1x2zlaz9vbkqypkl8aqz"; depends=[]; }; - CircMLE = derive2 { name="CircMLE"; version="0.2.2"; sha256="0qavd67295ca8jrwllkgjp5b84kxf4pik226pm9y126bz3rss9a1"; depends=[circular]; }; - CircNNTSR = derive2 { name="CircNNTSR"; version="2.2"; sha256="0z29dsvcwpra1ny8kj486dpnrak272wmkfnaiyashzcqpnkmkg03"; depends=[]; }; + CircMLE = derive2 { name="CircMLE"; version="0.2.3"; sha256="02nhxw75w84m95p3hmkcgbrs547scvfap8130fxm480y0r3d0zc6"; depends=[circular]; }; + CircNNTSR = derive2 { name="CircNNTSR"; version="2.2-1"; sha256="0mpm6vrkl3ap67khky8dndwvl9yzycm0rlv0vzznlygvlsg8sc38"; depends=[]; }; CircOutlier = derive2 { name="CircOutlier"; version="3.2.3"; sha256="1vyac4mjkn6p4p9n5finqqak6g7m3hj04a66v3w797jn1wbd1xly"; depends=[CircStats circular]; }; CircSpaceTime = derive2 { name="CircSpaceTime"; version="0.9.0"; sha256="0dplgm5x4c1xxnv6062n643mn5zh0najw3f41pv2qafc1lil4wx8"; depends=[circular coda ggplot2 Rcpp RcppArmadillo RInside]; }; CircStats = derive2 { name="CircStats"; version="0.2-6"; sha256="07bg4zrs2iqh0pmi44pybi8hlvnxwcaa5zpg85rmf55kflxxkzlf"; depends=[boot MASS]; }; @@ -728,7 +731,7 @@ in with self; { Cite = derive2 { name="Cite"; version="0.1.0"; sha256="1gfjirhswh4dkz88z4gl8m8jznqrvcgd4z3mnszyg1k5w3avlf1q"; depends=[miniUI RefManageR rstudioapi shiny]; }; CityPlot = derive2 { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; }; CityWaterBalance = derive2 { name="CityWaterBalance"; version="0.1.0"; sha256="0nvm6bv2cxszjf33xgn1xcvhrgrgbdcar0jahwf7bs03gdlpmgi1"; depends=[dataRetrieval dplyr EcoHydRology geoknife lubridate reshape2 tgp xts zoo]; }; - Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.3.0"; sha256="0xl587a4yym2a8b1csdgrj6fmggb3084pj3p7z4hqr2pq5jdyadk"; depends=[Rcpp Rdpack]; }; + Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.3.2"; sha256="18ypkjhgxdpcannddch9ipvf3xl3pwx6cgf3983p81cr15s0zgrz"; depends=[Rcpp Rdpack]; }; Claddis = derive2 { name="Claddis"; version="0.3.4"; sha256="161qgj4r8qah3r1m7gx2rwn9ng62y1p6gn62r1gp43pkrp2jlqj9"; depends=[ape clipr gdata phytools strap]; }; ClamR = derive2 { name="ClamR"; version="2.1-1"; sha256="0raz1n79g24a9mc93zj49r20xcmdziw6vvcw5sd3qyjp1ycia13c"; depends=[]; }; ClassComparison = derive2 { name="ClassComparison"; version="3.1.8"; sha256="0fd5s4697pvj295fzvvn5mislf42wfzrcvks17v98388rph586gl"; depends=[Biobase oompaBase]; }; @@ -740,41 +743,42 @@ in with self; { ClimClass = derive2 { name="ClimClass"; version="2.1.0"; sha256="1r836md31z2r5d9xckkbalzbhm4kf5paljv71kxpy53q92k7yi91"; depends=[geosphere ggplot2 reshape2]; }; ClimDown = derive2 { name="ClimDown"; version="1.0.2"; sha256="0dbv5vn985bi9nqxhq7jcj6k38s8dlbqnln3adgd0ih2fwilvalg"; depends=[abind fields foreach ncdf4 PCICt seas udunits2]; }; ClimInd = derive2 { name="ClimInd"; version="0.1-2"; sha256="0brimmkr8ccdbpmcmgbd8ydx4cy0yblfrzcgx151x83wskzq04sj"; depends=[chron SPEI weathermetrics]; }; - ClimMobTools = derive2 { name="ClimMobTools"; version="0.2-7"; sha256="0y2dhf7j230hvsi54dl08ds170ad7aww4c8gk0f5c2v2zfxkbya8"; depends=[httr jsonlite Matrix nasapower PlackettLuce raster RSpectra tibble tidyr]; }; + ClimMobTools = derive2 { name="ClimMobTools"; version="0.3.2"; sha256="1nsisbqsgwk91by6bx8igf1bn94cbcvnw9dbs7gfb14wnng2422l"; depends=[climatrends httr jsonlite Matrix RSpectra tibble]; }; ClimProjDiags = derive2 { name="ClimProjDiags"; version="0.1.0"; sha256="00w7ffcv9axddjvmc0w58c9ncy8z58lf651c5pxsq7492x3vifcm"; depends=[multiApply PCICt plyr]; }; - ClinReport = derive2 { name="ClinReport"; version="0.9.1.14"; sha256="140hpg6ybz1rlql06gk851fcvlb2k53kp46dq22cbs36frggk3rj"; depends=[car dplyr emmeans flextable ggplot2 lme4 officer reshape2 xtable]; }; ClinicalTrialSummary = derive2 { name="ClinicalTrialSummary"; version="1.1.1"; sha256="0b5by4sn9yvrvxr9921yqsgp8ma3g1hi2qbp5j9m836db1zjhyla"; depends=[Rcpp]; }; + ClinicalUtilityRecal = derive2 { name="ClinicalUtilityRecal"; version="0.1.0"; sha256="17xj9cmdkjrzx7mshka2hlkxh8887sprdqix7fd8jcr9bmc6ad9r"; depends=[caret cowplot ggplot2 lattice nloptr]; }; CliquePercolation = derive2 { name="CliquePercolation"; version="0.2.0"; sha256="1zllhl1674734sr0hmfgwdyqlk4rcjdqqrd7rx30llqri478jdff"; depends=[colorspace igraph magrittr Matrix Polychrome qgraph]; }; CloneSeeker = derive2 { name="CloneSeeker"; version="1.0.9"; sha256="0xcdknh2fibg86h2ip8jzsv4sbai1yl19ni3g1h5p0zlyigkhs1s"; depends=[combinat gtools quantmod]; }; + CluMP = derive2 { name="CluMP"; version="0.8"; sha256="130aqfxdp1pj5z3hnmy06rp5ywcmr389wn114ja5c2imxxkm3fi3"; depends=[amap data_table dplyr ggplot2 MASS NbClust rlang tableone]; }; ClueR = derive2 { name="ClueR"; version="1.4"; sha256="0awl3ag48idg0396hcgqrh5f16mbgximr5xbxjiimib5zysdc558"; depends=[e1071]; }; ClusBoot = derive2 { name="ClusBoot"; version="1.0"; sha256="1wh9mv932zarl8w098lgv2jpanp6r8nzdkyayv8nxk7nddl0bn1k"; depends=[]; }; ClusVis = derive2 { name="ClusVis"; version="1.2.0"; sha256="06yckdl3gxjia1gjjqpc29lvy4f7qf47fncslng9ggjnks6il145"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod VarSelLCM]; }; ClussCluster = derive2 { name="ClussCluster"; version="0.1.0"; sha256="1436849m2mnm8j7lf653zv8lcvvg2ch8kkks4bvr39kx21wxy8ss"; depends=[ggplot2 reshape2 rlang scales VennDiagram]; }; - ClustBlock = derive2 { name="ClustBlock"; version="2.1.1"; sha256="0zgrv0bayrfp7hw14zmfl3752l1kjk27lfdgalbx39rgf4pn245g"; depends=[FactoMineR]; }; + ClustBlock = derive2 { name="ClustBlock"; version="2.2.0"; sha256="07hcgfap2bjcwy8bynz1hk2cb1amli204k2fsjc30m9p7bhyrqs3"; depends=[FactoMineR]; }; ClustGeo = derive2 { name="ClustGeo"; version="2.0"; sha256="1p5k2w1k7hnacbazzj2yhxh4z2jngnsl4v5a9b3c8z1dr4nhcwxc"; depends=[sp spdep]; }; ClustImpute = derive2 { name="ClustImpute"; version="0.1.3"; sha256="1rfs8vbpqjskl5ap12x6qmxg4ygaaycaas8x3ylaqvlvyy9ywhki"; depends=[ClusterR copula dplyr magrittr rlang]; }; ClustMMDD = derive2 { name="ClustMMDD"; version="1.0.4"; sha256="0sblf3crpai53dflhyi27yn6mg0xyy9dxhwsk8j57sq5vr50x686"; depends=[Rcpp]; }; ClustOfVar = derive2 { name="ClustOfVar"; version="1.1"; sha256="0grhkab7s58ji4cf7cxh7ahd2dxrj8aqfdf3119b40zxkxbwxcr0"; depends=[PCAmixdata]; }; ClustVarLV = derive2 { name="ClustVarLV"; version="2.0.1"; sha256="1wl4kkhf17fi3vgbv0ph0yii2l93cgisxm3s0g9w8zhyn60dwwb0"; depends=[doParallel foreach iterators plyr Rcpp RcppEigen]; }; Cluster_OBeu = derive2 { name="Cluster.OBeu"; version="1.2.3"; sha256="10i7mnaq968my1c5hi8bdsj05m64wlmrf4n4m118is5h1q7zss8r"; depends=[car cluster clValid data_tree dendextend jsonlite mclust RCurl reshape reshape2 stringr]; }; - ClusterBootstrap = derive2 { name="ClusterBootstrap"; version="1.0.0"; sha256="0m1lfp27vn3ybwimwkrihff5v2bvdc4c46x8bha8hw0wma14lw5i"; depends=[]; }; + ClusterBootstrap = derive2 { name="ClusterBootstrap"; version="1.1.0"; sha256="1n2zsl3y4yg1l5kyjfghv6x5hf5520lwz17cvfkvp0m5h6jqfqzg"; depends=[dplyr magrittr]; }; ClusterR = derive2 { name="ClusterR"; version="1.2.1"; sha256="131k4dsh11xx95rhbr9zx20j9y493hiil6gxbgqks8dqp7n895j7"; depends=[ggplot2 gmp gtools Rcpp RcppArmadillo]; }; ClusterRankTest = derive2 { name="ClusterRankTest"; version="1.0"; sha256="01gzalhibqcdx3a6yc2cm1v77rscva73v5m5m0qkrgqdp9c8ph2a"; depends=[]; }; ClusterStability = derive2 { name="ClusterStability"; version="1.0.3"; sha256="1laa5m3y1rc7jr8q3i9qb3izs7qmadz169w9xm8q3mm3834ngn9b"; depends=[cluster clusterCrit copula Rcpp WeightedCluster]; }; ClusteredMutations = derive2 { name="ClusteredMutations"; version="1.0.1"; sha256="1n31nnvpjh1faw751k8m3ga3wfl0yhdpnszwckqhfzlma1jr8z04"; depends=[seriation]; }; + Clustering = derive2 { name="Clustering"; version="1.6"; sha256="0r0awijhzv611qf2r2n1xwd369s9719r5hfvw2hipiy0jssfqfbv"; depends=[advclust amap apcluster cluster ClusterR data_table gama ggplot2 glue gmp pracma pvclust sqldf xtable]; }; CoClust = derive2 { name="CoClust"; version="0.3-2"; sha256="04xv807785xv9kdspsspx1302ardv8gda06kd590lgawjixai7dh"; depends=[copula gtools]; }; CoDiNA = derive2 { name="CoDiNA"; version="1.1.1"; sha256="00kda4grizdgh9xs0vywg9npjj7i97vbdf0hvzl96657rcillwdh"; depends=[data_table igraph magrittr plyr visNetwork]; }; CoFRA = derive2 { name="CoFRA"; version="0.1002"; sha256="0ldf84dxaanww3qkf64mz5gv3yv2rjp9m6dy64xckds66vw6x0m3"; depends=[gplots stringr]; }; CoImp = derive2 { name="CoImp"; version="1.0"; sha256="06y722flpiqpwq0p7ik86s09mdnvqw3hdybhdzn8vfns5swc8x1y"; depends=[copula gtools locfit nnet]; }; CoRpower = derive2 { name="CoRpower"; version="1.0.3"; sha256="007v6khv2kkf398cqy3vjv0ncd7zc8ad084a5qhpplsnj1f3ll2j"; depends=[osDesign survival]; }; - CoSMoS = derive2 { name="CoSMoS"; version="1.0.1"; sha256="1kh1ka428vv99vwxajyvaz9n5d1ss6h03w7kwwp89hjxrm8wnrc2"; depends=[data_table ggplot2 nloptr pracma]; }; + CoSMoS = derive2 { name="CoSMoS"; version="1.1.3"; sha256="0wzs1w8kbphrw8hmi0zan02yg1jgivdj7r15iqq7n6cd1l4jfc86"; depends=[data_table ggplot2 nloptr]; }; CodataGS = derive2 { name="CodataGS"; version="1.43"; sha256="1bjn6s1f5jn64gwrvjz5kvwfkbqrqhavib6dj9k37rb5nzqkwhp6"; depends=[Matrix]; }; CodeDepends = derive2 { name="CodeDepends"; version="0.6.5"; sha256="0l7kiv3awx50glf5cs841b4zzsff1ml90f0zr868ygvwsr4ps1hq"; depends=[codetools graph XML]; }; CoinMinD = derive2 { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; }; Coinprofile = derive2 { name="Coinprofile"; version="0.1.9"; sha256="1bcip62gm34cx5m8a1mx9px2rhgvdmsgnn6q9q40k8p5hw4cx9g0"; depends=[coin exactRankTests ggplot2 plyr Rdpack zoo]; }; CollapsABEL = derive2 { name="CollapsABEL"; version="0.10.11"; sha256="0libm1wv34av3vm2vvbqcnxjh4y1rwfi8qzjca8qdz9490vngags"; depends=[biganalytics bigmemory collUtils dplyr ggplot2 haplo_stats R_utils rJava RSQLite stringr]; }; CollapseLevels = derive2 { name="CollapseLevels"; version="0.2.0"; sha256="1fn5k83lh0vw5j9vhq0x6ksbkrm25acpslav85wfyknsj9vzmzid"; depends=[dplyr ggplot2 lazyeval magrittr]; }; - CollessLike = derive2 { name="CollessLike"; version="2.0"; sha256="060iqvhyz36s28iyhlr6jj9ah3xd42yaps37kkprajxmyxldk6pp"; depends=[ape igraph]; }; CollocInfer = derive2 { name="CollocInfer"; version="1.0.4"; sha256="1iwf5g2y7i0j8dc19hdhya4m6g47jj968glnclj7a2yaq2yx37cj"; depends=[deSolve fda MASS Matrix spam]; }; ColorPalette = derive2 { name="ColorPalette"; version="1.0-1"; sha256="1dsj5njikx3qm2lnamqqg4qgwwyr11fwx9s5sdi7dkfx3nmf6dac"; depends=[]; }; ComICS = derive2 { name="ComICS"; version="1.0.4"; sha256="0brsb7y1bg23sdpxs4j1y3xdgr1q7iinxnnp17rravw72l991xqa"; depends=[glmnet]; }; @@ -794,11 +798,12 @@ in with self; { CompQuadForm = derive2 { name="CompQuadForm"; version="1.4.3"; sha256="1i30hrqdk64q17vsn918c3q79brchgx2wzh1gbsgbn0dh1ncabq4"; depends=[]; }; CompR = derive2 { name="CompR"; version="1.0"; sha256="1k4q0yanvhdh3ksia7d42lxky19yci5vxhmi6h716g9sxzfsjk6b"; depends=[MASS]; }; CompRandFld = derive2 { name="CompRandFld"; version="1.0.3-6"; sha256="1yr1d97l6yc07jwh30j26gda15pjfcwx2z3w55dh3nr15vds0qcp"; depends=[fields mapproj maps RandomFields scatterplot3d spam]; }; - CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.2.4"; sha256="108x9a83pbk6xiv1fgzwi0fpbvhpiff7aiplrsq2rfv1isjb5xhq"; depends=[data_table expm Matrix]; }; + CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.2.6.2"; sha256="0r8gdr834jqqwiq9h4yz19gcg92rbdd4fr3fwi083vfjml82f0v0"; depends=[data_table expm Matrix]; }; CompareTests = derive2 { name="CompareTests"; version="1.2"; sha256="1z96kh851bpr2szgyjszkpv6m5ma6abz7hrm50fgvfpgxkj7f4yi"; depends=[]; }; ComparisonSurv = derive2 { name="ComparisonSurv"; version="1.0.8"; sha256="1l6c6fwzrmj4sl37rcxhlglwvm1ln4rb138apj1jawnyg2i5si1x"; depends=[muhaz survival survRM2 TSHRC]; }; Compind = derive2 { name="Compind"; version="2.1"; sha256="1cjvpgankifiql67imhxx382q2lz1jq9k0nrwzq560h0xizkak6i"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff np psych smaa spdep]; }; - Compositional = derive2 { name="Compositional"; version="3.6"; sha256="1ngyw7zxvwav65ly6rjqc1zfrgwv3s2a2kyihjf68in6qnqigqxm"; depends=[doParallel emplik foreach MASS mda mixture Rfast Rfast2 sn]; }; + Compositional = derive2 { name="Compositional"; version="3.8"; sha256="103kz32kfzniqbamy1gh7mc9v7q1pjrr03zw1dabzaxfpf9ps4df"; depends=[doParallel emplik foreach MASS mda mixture RANN Rfast Rfast2 sn]; }; + CompoundEvents = derive2 { name="CompoundEvents"; version="0.1.0"; sha256="03shw3016xc41a6by8pnpqs7mmnhs0qmg5aqd4hlfcy3dv2w9wkf"; depends=[]; }; Compounding = derive2 { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; }; ConConPiWiFun = derive2 { name="ConConPiWiFun"; version="0.4.6"; sha256="1kkc4xp5b6q54b76wk4ga28wl668psbpyivl6bnh3xm21276yx5k"; depends=[Rcpp]; }; ConR = derive2 { name="ConR"; version="1.2.4"; sha256="1d36j1q364pakcm8xrbw323pg6dg9brsf6x3hcj1kahcqls9dcff"; depends=[doParallel fields foreach geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils tibble writexl]; }; @@ -812,8 +817,9 @@ in with self; { CongreveLamsdell2016 = derive2 { name="CongreveLamsdell2016"; version="1.0.2"; sha256="0fs0r3k1hvnp241fa0ymq00868skcigizqr68sp3lsmvzsdyxha9"; depends=[Ternary]; }; Conigrave = derive2 { name="Conigrave"; version="0.4.4"; sha256="02nvk5ya9gr06ai8qnjw0xq6hfbrr91b6lx9gq08dbrnmpbmyvqz"; depends=[dplyr ggplot2 miceadds mitools ppcor stringdist stringr]; }; ConjointChecks = derive2 { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; }; - ConnMatTools = derive2 { name="ConnMatTools"; version="0.3.3"; sha256="0zsn3al3di0fd9hkqljpqqy4zbmh97xr6cdi4fzv80ax81fjfqyk"; depends=[]; }; + ConnMatTools = derive2 { name="ConnMatTools"; version="0.3.5"; sha256="082y4xxnp42xa7db5hnbc9qlvkb50wwb3wzi0my04l55a9s0ril7"; depends=[]; }; ConsRank = derive2 { name="ConsRank"; version="2.1.0"; sha256="0hp6zx3y8vwnpska7bnxpmkpgjlgfw6d7jpc0f7p77j0lqlj0xyc"; depends=[gtools proxy rgl rlist]; }; + ConsReg = derive2 { name="ConsReg"; version="0.1.0"; sha256="0ck188ahzprzvqdh2q05bcg9b68dw3xiqqb1xirbm4rp5chyr419"; depends=[adaptMCMC data_table DEoptim dfoptim FME forecast GA GenSA ggplot2 MCMCpack Metrics nloptr Rcpp rlang Rsolnp]; }; ContaminatedMixt = derive2 { name="ContaminatedMixt"; version="1.3.4"; sha256="148zpk5a091kxrn6f73k6piwfwbqdmiyd48qinn6cbfma012n13w"; depends=[caret mclust mixture mnormt mvtnorm]; }; ContourFunctions = derive2 { name="ContourFunctions"; version="0.1.1"; sha256="00p5bdiq8hj95lkr86iwyh50qw0d0d4gs9hhbzcix6lwn8dwqd3s"; depends=[]; }; ConvergenceClubs = derive2 { name="ConvergenceClubs"; version="2.2.1"; sha256="0mn0lnycz5pi821q52g1njjs2pcmvv8yynr13bh237c8cashk2n3"; depends=[lmtest sandwich]; }; @@ -821,7 +827,7 @@ in with self; { CoopGame = derive2 { name="CoopGame"; version="0.2.1"; sha256="1c11b5l6r5csa6zw5a6lfqaygzhnp5jfdf0vkrxpl7fb4bbxhm31"; depends=[geometry gtools rcdd rgl]; }; CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="2.0-11"; sha256="0z1ksim2chwg5acbvav0dzsrnzch1qmbvr2k0dhjmn8lr9rdk4m5"; depends=[dplyr geosphere ggplot2 raster rgbif rgdal rgeos rnaturalearth sp tidyselect]; }; CopCTS = derive2 { name="CopCTS"; version="1.0.0"; sha256="1j0bhkjk181y9k69442diswgwax5whmh5vfqydhf3b1r5ll1wkm3"; depends=[copBasic copula msm]; }; - Copula_Markov = derive2 { name="Copula.Markov"; version="2.7"; sha256="0bgw8493kv0skjdnwyml9m2ilgz0ac4k9nps9kilphw9l9f1if02"; depends=[]; }; + Copula_Markov = derive2 { name="Copula.Markov"; version="2.8"; sha256="0wyb80jj9zgh7kn0nah7dljps72083c92hpds94dw4ccmw6cfwf6"; depends=[]; }; Copula_Markov_survival = derive2 { name="Copula.Markov.survival"; version="0.1.0"; sha256="1r9m96r0mqqjlawhlb9d8d1hf2k2bkal2fmw6g0zabdjb19c75y7"; depends=[survival]; }; Copula_surv = derive2 { name="Copula.surv"; version="1.0"; sha256="1cq12vmsvrxd6anpv6b5jig7x1lf6pj589353h2ba9k0fhkpk51y"; depends=[]; }; CopulaCenR = derive2 { name="CopulaCenR"; version="1.1.2"; sha256="1ksxqgb91vww5q4njidchxwia64g5229dvpxhqhfp8w6hvmib1k1"; depends=[caret copula corpcor flexsurv icenReg magrittr plotly pracma survival]; }; @@ -830,17 +836,17 @@ in with self; { CopyDetect = derive2 { name="CopyDetect"; version="1.3"; sha256="1g3bwd805h62x93xvvn67acf9v6vn7s7ghxpvjhwcfdfj7fwzh6l"; depends=[mirt]; }; CorBin = derive2 { name="CorBin"; version="0.3.3"; sha256="0jf3d0mbr0vmcqmk5p4rcvc3nc4dn6cqcj8fcqyf32y9vwxd2wii"; depends=[]; }; CorDiff = derive2 { name="CorDiff"; version="1.0"; sha256="12rgfhygrdq1ign4ybr8g171wxic8zbp83n1xdsnqpj910k5jdr5"; depends=[mcc]; }; + CorReg = derive2 { name="CorReg"; version="1.2.17"; sha256="06r8a7swvbafkl7ynvhhwbvm8jgqi54q70fk5jv19plff2j4gxmf"; depends=[corrplot elasticnet glmnet lars MASS Matrix mclust mvtnorm Rcpp RcppEigen rpart]; }; Corbi = derive2 { name="Corbi"; version="0.5-0"; sha256="05jr0y0qjv2l5ikx8cj10nl16z5yvcjbzdz5gk7lp6kpnmgq3sbw"; depends=[Matrix]; }; - CoreGx = derive2 { name="CoreGx"; version="0.1.1"; sha256="160lf1hg4a8cxgbsiny8g0yhyp1x1c2pdlys6rc9smllhsmzd9yw"; depends=[Biobase lsa piano rlang]; }; CornerstoneR = derive2 { name="CornerstoneR"; version="1.1.1"; sha256="017j7s3m97sxahgnvk9sm7rfx81cjp1xzsmw7b1aqi7301zjrqa7"; depends=[checkmate data_table ranger vcd]; }; CorporaCoCo = derive2 { name="CorporaCoCo"; version="1.1-0"; sha256="1s3wlcy6mnw9riivw5lc4gd6bjbsd77m15ipr95g46isdcrli8zb"; depends=[data_table RColorBrewer rlist]; }; CorrBin = derive2 { name="CorrBin"; version="1.6"; sha256="0iwad5qf7hqii02s5f85155c5s7v8ghnac4l6l3c45dshrpapp2m"; depends=[boot combinat dirmult geepack mvtnorm]; }; CorrMixed = derive2 { name="CorrMixed"; version="1.0"; sha256="0rj987k8pzsw9n9a20ky23rwc3zyqsl0fcibpmry7p8pw2miaj0z"; depends=[nlme psych]; }; - CorrToolBox = derive2 { name="CorrToolBox"; version="1.6.1"; sha256="1hqbb3raw86g3ww8dmapyy8lac2avs6jbjklfvi9gx06lyw4kv9r"; depends=[BinNonNor BinOrdNonNor GenOrd moments mvtnorm psych]; }; + CorrToolBox = derive2 { name="CorrToolBox"; version="1.6.2"; sha256="0a12vdyqqhw46iladdkbc0hxsbq8pihg056k6hn1rv41g7r08y14"; depends=[BinNonNor BinOrdNonNor GenOrd moments mvtnorm psych]; }; CorrectOverloadedPeaks = derive2 { name="CorrectOverloadedPeaks"; version="1.2.17"; sha256="1g7irjbhwnbhk74y3qxcjlrsn2yz8q6wn7ih16wq669nswryxhxk"; depends=[bitops digest XML]; }; CorrectedFDR = derive2 { name="CorrectedFDR"; version="1.0"; sha256="15047cfjniljzhznkbzq3hyq221y9k7fa04f69zm0k0sxr627gxg"; depends=[]; }; CosW = derive2 { name="CosW"; version="0.1"; sha256="12l4w8b5jnr8773hxk7khrdn705x6bdbw7s8z8w95bfbbi12dj6v"; depends=[fdrtool pracma]; }; - Counterfactual = derive2 { name="Counterfactual"; version="1.1"; sha256="0mz0h5zsmca8fww7nq08m9cld2zbaydn8qad5f2g6vxn382842p9"; depends=[doParallel doRNG foreach Hmisc quantreg survival]; }; + Counterfactual = derive2 { name="Counterfactual"; version="1.2"; sha256="1spryxvnkdz728rl4nb7zlqhynnh0b4m7lnhq4i1n13gfsz1m5j4"; depends=[doParallel doRNG foreach Hmisc quantreg survival]; }; Countr = derive2 { name="Countr"; version="3.5.4"; sha256="10fzmqncbnr47x35xqpsmwzadv9j6r2svisrv8vfpp27mlvp9qwr"; depends=[boot car dplyr flexsurv Formula lattice lmtest MASS Matrix numDeriv optimx pscl RColorBrewer Rcpp RcppArmadillo Rdpack standardize VGAM xtable]; }; CountsEPPM = derive2 { name="CountsEPPM"; version="3.0"; sha256="0iw7sfrb4yyaagwm1f4q9av5zvzia1mp2ns287ppsw3k248lz0kb"; depends=[expm Formula lmtest numDeriv]; }; CovCombR = derive2 { name="CovCombR"; version="1.0"; sha256="07yd0zbvc9db2jw6xigfhxnbkxwb3gxlmywadz7fs3rva2if2ffx"; depends=[CholWishart Matrix nlme]; }; @@ -850,6 +856,7 @@ in with self; { CoxBoost = derive2 { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[Matrix prodlim survival]; }; CoxPhLb = derive2 { name="CoxPhLb"; version="1.2.0"; sha256="0jlh2k5ygj896sfx7dcw5qlb80bl64rsvqfayv0c6a107bmrzsw4"; depends=[survival]; }; CoxPlus = derive2 { name="CoxPlus"; version="1.1.1"; sha256="038wsz206bgc0pnzx403b5ihcwhxpkrpxmwvrvqcxf8333pb62l5"; depends=[Rcpp RcppArmadillo]; }; + CoxR2 = derive2 { name="CoxR2"; version="1.0"; sha256="1fjsa403lbx0hi7b0gsdaz0q9axw521q4xzphbfbknify4y72md6"; depends=[survival]; }; CoxRidge = derive2 { name="CoxRidge"; version="0.9.2"; sha256="0p65mg4hzdgks03k1lj90yj6qbk50s94rwvcwzkb5xxxwrijd10r"; depends=[survival]; }; CpGFilter = derive2 { name="CpGFilter"; version="1.1"; sha256="0ccvk7lawmay0wqdyhs6ww7396dcfzazn72sq6zwyw7dl45k2j0i"; depends=[matrixStats]; }; CpGassoc = derive2 { name="CpGassoc"; version="2.60"; sha256="1zx18x8pxjl2ajnj7a7lb8383m75ysg17f4mzz0vkgl5mnf617ny"; depends=[nlme]; }; @@ -859,7 +866,7 @@ in with self; { CropDetectR = derive2 { name="CropDetectR"; version="0.0.1"; sha256="14sabqld94if7f2m39bh6652cb62hcwx53k8q5k23anzzsn93qlj"; depends=[dplyr EBImage imager reshape2]; }; CrossClustering = derive2 { name="CrossClustering"; version="4.0.3"; sha256="05lbdmblwmmv24h46ixxabbrp7mpajyv7raw1p5h0dmsbfbq9hi5"; depends=[assertive cli cluster crayon dplyr flip glue magrittr mclust purrr]; }; CrossScreening = derive2 { name="CrossScreening"; version="0.1.1"; sha256="1gig80r8p611ysn35ajx7xdjj5wnkcf1vspcf0i06dmh75xpm3w9"; depends=[plyr tables]; }; - CrossVA = derive2 { name="CrossVA"; version="0.9.9"; sha256="0k2czhnb3jws86p2iv9fv3qarxbh1dd4xxnv2hdwz0y82y6mkkvx"; depends=[stringi]; }; + CrossVA = derive2 { name="CrossVA"; version="0.10.0"; sha256="08mq8d6la5gz3yv5a3lc70dxdgf29q1vngi8lrgdy58p9415pxjv"; depends=[stringi]; }; CrossValidate = derive2 { name="CrossValidate"; version="2.3.4"; sha256="1q5wnw2llvlw3hbjg0zccipk3ns31m2339x1aj6m526zhvgl2wvx"; depends=[Modeler oompaBase]; }; CryptRndTest = derive2 { name="CryptRndTest"; version="1.2.2"; sha256="1cg0agwqp1f7pgxdf9wilwparklyfsv900r47fpihnqw3ycvbdai"; depends=[gmp kSamples LambertW MissMech Rmpfr sfsmisc tseries]; }; CrypticIBDcheck = derive2 { name="CrypticIBDcheck"; version="0.3-3"; sha256="1c7n020i9lxp0fam05k9v4az4rvx8fakhzi9fkma82smpl709x8q"; depends=[car chopsticks ellipse rJPSGCS]; }; @@ -867,29 +874,27 @@ in with self; { Cubist = derive2 { name="Cubist"; version="0.2.3"; sha256="1x71n72n12alyl7d9vdf3xb3ks14lql4pxxxnimk2gq7brc5z10r"; depends=[lattice reshape2]; }; CustomerScoringMetrics = derive2 { name="CustomerScoringMetrics"; version="1.0.0"; sha256="166v0hbxy4xgbfqh7sx6zsrv4pghqpimx5xry3h2qwynnvr4ng1a"; depends=[]; }; CutpointsOEHR = derive2 { name="CutpointsOEHR"; version="0.1.2"; sha256="0r772zb7g10akcfnf2hnyvpvba4px9pgslyns7drmijdsh0ncnvj"; depends=[survival]; }; - Cyclops = derive2 { name="Cyclops"; version="2.0.2"; sha256="0pgarrk6znfsl75bq8rvrfl371cs5qjy9xb8zp607pwlprwapvfp"; depends=[BH bit ff ffbase MASS Matrix Rcpp RcppEigen survival]; }; + Cyclops = derive2 { name="Cyclops"; version="2.0.3"; sha256="1gbr9v2qs542c128zmx8nwvccfc1d5gnmhaiy2pb6hj0cqy5fjzb"; depends=[BH bit ff ffbase MASS Matrix Rcpp RcppEigen survival]; }; CytobankAPI = derive2 { name="CytobankAPI"; version="1.3.0"; sha256="1rrqhsqv5xc58dvkrbs9c83pkqz5np59shm7xjmqxdjj2rxj8zqn"; depends=[curl httr jsonlite]; }; CytobankAPIstats = derive2 { name="CytobankAPIstats"; version="2.0"; sha256="0xczcgaxd8dv6fd1j5c8y4il852lq8859d1y16sxs8a3gqn9fbz2"; depends=[CytobankAPI pheatmap shiny shinyFiles xlsx]; }; CytobankBridgeR = derive2 { name="CytobankBridgeR"; version="1.0.0"; sha256="0m8gxbm3p9gvdszymqx10n5rzb406r4f70a0in798c56mp2rcsl4"; depends=[CytobankAPI]; }; D3GB = derive2 { name="D3GB"; version="1.1"; sha256="1r4hxx2qdws7c7hsnswzfh6az8mn720sk8nygilljl2ghnwpq7pa"; depends=[DBI RSQLite]; }; D3partitionR = derive2 { name="D3partitionR"; version="0.5.0"; sha256="10067rdgbpjzgw2wiq75kdd0gd7bl41hp16sxc0k2p72ybqfpw03"; depends=[data_table functional htmlwidgets magrittr RColorBrewer titanic]; }; + DAAG = derive2 { name="DAAG"; version="1.24"; sha256="09fxd21p7v9mpy9s876n1jyc3l7w7s3vs5iglc3xphqbffgzfnvs"; depends=[lattice latticeExtra]; }; DAAGbio = derive2 { name="DAAGbio"; version="0.63-3"; sha256="0n82d9nsvpl6cwp95by8ff9fmdafs2fdi603dlik5890adaw42x4"; depends=[limma]; }; DAC = derive2 { name="DAC"; version="0.1.1"; sha256="0abnl70k4c98n29qi64sfd5nch10abw9fknhf2aksyi0qadsiyjq"; depends=[blavaan flexmix sfsmisc truncnorm]; }; DACF = derive2 { name="DACF"; version="1.0.0"; sha256="0hv7c9lk6ivj4iz953yn11iy5p611q4si4ghn9d5a9i229s5hig8"; depends=[]; }; - DAFOT = derive2 { name="DAFOT"; version="0.0.1"; sha256="18r5fhb6g0s1viifkkicplzab4aand2lxiwph86w80q80bzpjlpg"; depends=[ape gtools tibble tidytree]; }; - DAIME = derive2 { name="DAIME"; version="2.1.1"; sha256="0skj878ri6h1q16nsln58ssanh3nhxfq4124fhcmfc60h1jhv336"; depends=[]; }; + DAIME = derive2 { name="DAIME"; version="2.1.3"; sha256="099pbzgryz9lxhcqlrywcv8zl5af4ir5dyyqvgc16xi5bddxk7ld"; depends=[]; }; DAISIE = derive2 { name="DAISIE"; version="1.4"; sha256="16653wwz20lhf3bpzflpj5d1h7j3cqyfaqk5gn24aifga2jc0wbb"; depends=[DDD deSolve Matrix subplex tensor]; }; DAKS = derive2 { name="DAKS"; version="2.1-3"; sha256="0vmpwxvksnmyq40faimbgpj0y3zbk519986n38ipwdfzllcg0zs4"; depends=[relations sets]; }; - DALEX = derive2 { name="DALEX"; version="0.4.9"; sha256="1zviaf7530v8w996lbma0vplabrapgwldi7h70pr0439sxaqd421"; depends=[ggplot2]; }; - DALEXtra = derive2 { name="DALEXtra"; version="0.2.0"; sha256="1brjc9lybc1sfyk0n6bd44rpapgvi3p60wxw5qaajfcxrxk1286b"; depends=[DALEX ggdendro ggplot2 glmnet gridExtra reticulate]; }; + DALEX = derive2 { name="DALEX"; version="1.2.0"; sha256="0mfcci54622gnk8al9fl2jhs9i2vfly7lam04y5rdacbyiam49j6"; depends=[ggplot2 iBreakDown ingredients]; }; + DALEXtra = derive2 { name="DALEXtra"; version="0.2.1"; sha256="0r1vdjphmfwa95fpd3fx2hqfb23gb4i920j8l8xxraadr9hdac32"; depends=[DALEX ggdendro ggplot2 glmnet gridExtra reticulate]; }; DALY = derive2 { name="DALY"; version="1.5.0"; sha256="1v7ld01xcn5jiygl1c3xhd5h71ip90lks87fs9gmpnivp8jz5cr5"; depends=[]; }; DAMOCLES = derive2 { name="DAMOCLES"; version="2.2"; sha256="1rmm36k5w6y8pkb1vzkxnizx3my94kgai8h3x83cxr6mlbgn9lb8"; depends=[ape caper DAISIE DDD deSolve expm Hmisc Matrix matrixStats picante]; }; - DAMisc = derive2 { name="DAMisc"; version="1.5"; sha256="1m418lmzy4sv5hj90j4r4j1bb2q43hxnmpd0mp16010fyr0asbcy"; depends=[AICcmodavg boot car coda effects fANCOVA games gdata lattice latticeExtra MASS nnet optiscale pscl rstan VGAM xtable]; }; + DAMisc = derive2 { name="DAMisc"; version="1.5.4"; sha256="1xs9jibpxg6py9ry4mad2yj4x99jnv19df0d6f9yc760wipb5ymk"; depends=[AICcmodavg boot car clarkeTest coda effects fANCOVA gdata ggplot2 glue lattice latticeExtra MASS nnet optiscale rstan xtable]; }; DAP = derive2 { name="DAP"; version="1.0"; sha256="0zzb05yxfaqp6qnr979q20rqy8sl5l825mxs0x9366qr7mz5k5ws"; depends=[MASS]; }; - DATforDCEMRI = derive2 { name="DATforDCEMRI"; version="0.55"; sha256="0v26a1gi8l21ga5nqcnyfaa7gc8zxq6wk95b96ajgpdybb0l9s53"; depends=[akima lattice locfit matlab R_methodsS3 R_oo xtable]; }; DBEST = derive2 { name="DBEST"; version="1.8"; sha256="1a598g02hpfgv572gchllqkppynnsp4lx764jg0g66w3b66k0kdy"; depends=[zoo]; }; DBGSA = derive2 { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; }; - DBHC = derive2 { name="DBHC"; version="0.0.2"; sha256="08sl6gv1dw2kpk1zylvyqqga6xvhzhpp5zxa9ql1hyzc2i43jivq"; depends=[ggplot2 reshape2 seqHMM TraMineR]; }; DBI = derive2 { name="DBI"; version="1.1.0"; sha256="1r03j9rdcxb9bhxk40dkmy10ikz4yzsxhy3f9k9ix3x577xbfvd9"; depends=[]; }; DBItest = derive2 { name="DBItest"; version="1.7.0"; sha256="10fvij1bz3pvqqrg0s55x7bfgxh7nrnnjaxp8cwpk3wkp3c77pi5"; depends=[blob callr DBI desc hms lubridate R6 rlang testthat withr]; }; DBKGrad = derive2 { name="DBKGrad"; version="1.7"; sha256="0q11kza0c1caph01f247h7qm4shqycq0g9i152739xzspprjf4i1"; depends=[lattice minpack_lm SDD TSA]; }; @@ -897,21 +902,22 @@ in with self; { DCA = derive2 { name="DCA"; version="2.0"; sha256="1acy33vyf814kr0aj6kdvi9f1qzgynwwzv57ll01gd0iqq36374f"; depends=[coin elasticnet GPArotation locfdr modeest mvtnorm PMA]; }; DCCA = derive2 { name="DCCA"; version="0.1.1"; sha256="06xdx79r7dr14dlk5vgcyd8ar4sc72imlyk66bnia1kvlynvdy69"; depends=[checkmate]; }; DCD = derive2 { name="DCD"; version="0.1.0"; sha256="0p6vk8fdvpcvb1bb5fwy3h1v8y3djlvcm5jl5lnx30ngqj6d7rcj"; depends=[data_table doParallel foreach ggplot2 igraph lattice lsa Matrix plyr qlcMatrix Rdpack ROCR WGCNA]; }; + DCEM = derive2 { name="DCEM"; version="2.0.2"; sha256="0wzbjy70h9agfpmpc5v3y8cdj4d7w2kqq1vmhfsz7vhpxpd1ygd0"; depends=[MASS matrixcalc mvtnorm Rcpp]; }; DCG = derive2 { name="DCG"; version="0.9.3"; sha256="08718x6v3g7kpfv0gpgm19cn3d3ynj7yagzs0jic1j5rwvn04pfb"; depends=[]; }; DCGL = derive2 { name="DCGL"; version="2.1.2"; sha256="1dhkdvdglpsr0fzrfrrr6q76jhwxgrcjsiqn56s082y7v366xvs4"; depends=[igraph limma]; }; DCL = derive2 { name="DCL"; version="0.1.0"; sha256="1ls3x3v0wmddfy7ii7509cglb28l1ix1zaicdc6mhwin0rpp2rx3"; depends=[lattice latticeExtra]; }; DCM = derive2 { name="DCM"; version="0.1.1"; sha256="191gwfv30hdr789jmdrimcc7aqisz635anydsw2v4s28a3zjbipw"; depends=[gWidgets pander readxl]; }; DCODE = derive2 { name="DCODE"; version="1.0"; sha256="19dwms88q0ylxd92l3ivig8p8jjyhk8mhgz0l36m9pcq11gyjc0n"; depends=[seqinr]; }; - DCchoice = derive2 { name="DCchoice"; version="0.0.15"; sha256="1qdqn45ipq0806r25ri4aygzq48k8j5k8rlhi1cafym421yq6bfg"; depends=[Formula interval MASS]; }; + DCPO = derive2 { name="DCPO"; version="0.5.1"; sha256="0kkp59qmr4lpggb3fzp28dxc3vdv32dyy6myv92rrf4s3lyzdxab"; depends=[beepr BH dplyr forcats janitor purrr Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; }; + DCchoice = derive2 { name="DCchoice"; version="0.0.16"; sha256="0wwhdpljg1k70kydhh89lk6c461a9vjw6p2ijzhvgkv2pl5rxaag"; depends=[Formula interval MASS]; }; DChaos = derive2 { name="DChaos"; version="0.1-3"; sha256="12qi8m2rvd5r8clmi44hiwpnr6zf1sjw35wvbvm4nz3431xwf4ng"; depends=[entropy NeuralNetTools nnet outliers pracma sandwich xts zoo]; }; DCluster = derive2 { name="DCluster"; version="0.2-7"; sha256="008nyry64s5g80narcc58273v0jhqzfgwynka6mh7jgi7qsqnxjd"; depends=[boot MASS spdep]; }; - DClusterm = derive2 { name="DClusterm"; version="1.0-0"; sha256="19ifnj7y3zjp15hd6mafjjqbqqyff17zd0ivnl8bd843nalgfxbb"; depends=[DCluster gridExtra latticeExtra lme4 pscl RColorBrewer sp spacetime xts]; }; - DDD = derive2 { name="DDD"; version="4.1"; sha256="09aif9agypw765h148615b6dcjhzw1bvgrzz9dka6n3vk4r1lj5d"; depends=[ape deSolve expm Matrix phytools SparseM subplex]; }; + DClusterm = derive2 { name="DClusterm"; version="1.0-1"; sha256="04i9fyph2k3ffds0nv49371p8lw6dkzcf27pc98f99x0l6c8k5iq"; depends=[DCluster lme4 sp spacetime xts]; }; + DDD = derive2 { name="DDD"; version="4.3"; sha256="001zal1nqayglnwf8hgi1sm8m5gn5jzi9d3q3ckxdcnn36xkla7h"; depends=[ape deSolve expm Matrix phytools SparseM subplex]; }; DDHFm = derive2 { name="DDHFm"; version="1.1.2"; sha256="0lgh6kcfas06p2yy7zy21r05k5521xbj5af3wwwssp5li1cia35g"; depends=[lokern wavethresh]; }; DDIwR = derive2 { name="DDIwR"; version="0.4"; sha256="0z994anrw746iy83503bah2n39rd7qvx4spxn4qwhxhxbjp4gkfw"; depends=[admisc haven readr tibble xml2]; }; DDM = derive2 { name="DDM"; version="1.0-0"; sha256="19g06qk3lzasj294x9wfij729mlq6ryvjqkn3rgl5xp1w0gx9wi2"; depends=[]; }; DDPGPSurv = derive2 { name="DDPGPSurv"; version="1.0"; sha256="1d271yv621jmwd4dmdnhpwrk95gbpw7g6r2v05lc3d6wzlzpd78c"; depends=[MASS mc2d mvnfast Rcpp RcppArmadillo survival]; }; - DDPNA = derive2 { name="DDPNA"; version="0.2.1"; sha256="0854zs6gay78dq0ivpmkrhg387llk0mbfjz8nkvhnkss0mh6bpmk"; depends=[ggalt ggplot2 Hmisc igraph MEGENA plyr scales VennDiagram]; }; DDRTree = derive2 { name="DDRTree"; version="0.1.5"; sha256="16s5fjw7kwlxhrkzdny62sx32fvmg3rxjc3wrh6krd31jh1fqlfk"; depends=[BH irlba Rcpp RcppEigen]; }; DDoutlier = derive2 { name="DDoutlier"; version="0.1.0"; sha256="1az5zq0l3kj959572mlpc4zl73f16iag0yrs217fa9m8xpd3c2sd"; depends=[dbscan pracma proxy]; }; DECIDE = derive2 { name="DECIDE"; version="1.2"; sha256="18kn2pm9r0ims2k1jfsfzh258wwxz0xg86rsbwgq6szh0azlq3qy"; depends=[]; }; @@ -921,22 +927,23 @@ in with self; { DEMOVA = derive2 { name="DEMOVA"; version="1.0"; sha256="09dqhhhihphhdnplmhdq4q5zwc0qvqhirdrxa9x6fr43vwa5zfp4"; depends=[leaps]; }; DES = derive2 { name="DES"; version="1.0.0"; sha256="16p38i8ykwc8gjw6c9dhdwjjpa1b17n9wqhz3rhkbzjh978pky31"; depends=[]; }; DESnowball = derive2 { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue cluster combinat MASS]; }; - DET = derive2 { name="DET"; version="2.0.1"; sha256="1jadxhq2jjjvmkz4bmakb7yzlnf080fpdkdi39czkm489bvjxgd5"; depends=[doParallel pROC]; }; - DEVis = derive2 { name="DEVis"; version="1.0.1"; sha256="0fb8q72gm9h52v6fc12jcvk9k59qrns74yqjvj73nch29gkr16hp"; depends=[DESeq2 ggdendro ggplot2 ggsci ggthemes gridExtra MASS pheatmap plyr PoiClaClu RColorBrewer reshape2 SummarizedExperiment]; }; - DEoptim = derive2 { name="DEoptim"; version="2.2-4"; sha256="10nlsvms5pf0wmn4z1lj6vnmpwr10q8nhdy5xy9rn7hd1627fm0a"; depends=[]; }; + DET = derive2 { name="DET"; version="2.0.2"; sha256="01vyb3mv4g7zpk7cn44i4069ndk9sn9qqs9k52clqbnf1kl1ynbx"; depends=[doParallel pROC]; }; + DEoptim = derive2 { name="DEoptim"; version="2.2-5"; sha256="0nlm2gdvd33yrwambmlrgj76inxz2a65ya7727l98fd4skfdw4mf"; depends=[]; }; DEoptimR = derive2 { name="DEoptimR"; version="1.0-8"; sha256="1vz546hyjyhly70z62h5n3mn62b8llhhmim8ffp9y6jnnb0i2sc4"; depends=[]; }; - DEploid = derive2 { name="DEploid"; version="0.5.2"; sha256="0xjczfql6jl4jxxwvdn3gmwj8bawhj5w6hdamrb0yjdjlhdwb11y"; depends=[htmlwidgets magrittr plotly Rcpp rmarkdown scales]; }; + DEploid = derive2 { name="DEploid"; version="0.5.3"; sha256="0k5bcpfwf9fhkv0wp6s1nvp4l6xgwmdbz3l8mmiy8q1ym7gpvwml"; depends=[htmlwidgets magrittr plotly Rcpp rmarkdown scales]; }; + DFA_CANCOR = derive2 { name="DFA.CANCOR"; version="0.1.6"; sha256="0pyql8xms08qn8kzf1h984ik1pbyy8z1wa1lf588pb6clwmd2mk8"; depends=[MASS MVN]; }; DFIT = derive2 { name="DFIT"; version="1.0-3"; sha256="1h0wvcplb7j7dqz9hkaw30x92ngxzkdvkwpg0142hrqb201zfrac"; depends=[ggplot2 mvtnorm simex]; }; DGCA = derive2 { name="DGCA"; version="1.0.2"; sha256="0k2a24ycagyxdx54dh9w8km25xhmmmhyyl26g76z4g5gqvcw092k"; depends=[matrixStats WGCNA]; }; - DGLMExtPois = derive2 { name="DGLMExtPois"; version="0.1.0"; sha256="1c6lys605sggni40792d1xq8ll5nbdc75r92c87grx7zh74sz98m"; depends=[compoisson COMPoissonReg nloptr progress]; }; + DGLMExtPois = derive2 { name="DGLMExtPois"; version="0.1.2"; sha256="11gfj1pnfk9f8ap66yswbc1pq6k2n6893jadh2nvnhlkdk47bm28"; depends=[COMPoissonReg nloptr progress]; }; DGM = derive2 { name="DGM"; version="1.7.2"; sha256="0z0f8bazzsahvjkpfif50db700mqb7arcglwsfxcar9qdy082vsn"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; }; DGVM3D = derive2 { name="DGVM3D"; version="1.0.0"; sha256="17cxv8rm7kmxms7v7hzbwbdwa3xl1hwgiljf97ppwswglqyik9iv"; depends=[rgl]; }; - DHARMa = derive2 { name="DHARMa"; version="0.2.6"; sha256="0mv95409lr9psh8ia9llpx8a6861iakrfnw2h96gpi2r9scpr8fj"; depends=[ape doParallel foreach gap glmmTMB lme4 lmtest MASS mgcv qrnn sfsmisc spaMM]; }; + DHARMa = derive2 { name="DHARMa"; version="0.3.0"; sha256="160265r53b78lmgn9ynh0f2mqlb632rw8rvkpc72x9kwi7qw4yhw"; depends=[ape doParallel foreach gap glmmTMB lme4 lmtest MASS mgcv qgam sfsmisc spaMM]; }; DHBins = derive2 { name="DHBins"; version="1.1"; sha256="1g69acac7pxw8x0d9czyds7xljhbv9d686c99a3y8b4vh7dnx62s"; depends=[ggplot2]; }; DHS_rates = derive2 { name="DHS.rates"; version="0.7.0"; sha256="11rzwwx6vvr66nfklqh6j86k3d0cdccg6l99azwqif0cmj81rdw5"; depends=[crayon haven matrixStats reshape survey]; }; DIFboost = derive2 { name="DIFboost"; version="0.2"; sha256="0wyjk870n18lq0dwhm9ndsh5vv0d8wkrbcky68w454vzrrw1q9h8"; depends=[mboost penalized stabs]; }; DIFlasso = derive2 { name="DIFlasso"; version="1.0-3"; sha256="195wiy0jjkq6bh2b6wrjmr5l34pzx0i2qqvwp4pzv77sx737ds0v"; depends=[grplasso miscTools penalized]; }; - DIFtree = derive2 { name="DIFtree"; version="3.1.4"; sha256="1q02229vlmyxqasbxiscxvqpcip1r0sbwbp7ja909ljhc5b76pr8"; depends=[gridBase penalized plotrix VGAM]; }; + DIFplus = derive2 { name="DIFplus"; version="1.1"; sha256="1k03lr437gx5y762z3h40hz9kcl4m8xgrndxvbyvsgmn2h6pbwsd"; depends=[plyr TestDataImputation]; }; + DIFtree = derive2 { name="DIFtree"; version="3.1.5"; sha256="110m24brsyvkvc03b9i48alg0x2ya69bz79c4cwi2bwr1cb2xfq1"; depends=[gridBase penalized plotrix VGAM]; }; DIME = derive2 { name="DIME"; version="1.2"; sha256="11l6mk6i3kqphrnq4iwk4b0ridbbpg2pr4pyqaqbsb06ng899xw0"; depends=[]; }; DIMORA = derive2 { name="DIMORA"; version="0.1.0"; sha256="0qcy2pqpx7za4ckf6wvmbhz5a52j44ksn81f8j1lj0z90idj6psn"; depends=[minpack_lm numDeriv]; }; DIRECT = derive2 { name="DIRECT"; version="1.0.1"; sha256="00z4xlc9kxn19lw2b8xq6krsf5v3wfbr1ghl5ah5shr9dnv84lc1"; depends=[]; }; @@ -944,14 +951,14 @@ in with self; { DIconvex = derive2 { name="DIconvex"; version="1.0.0"; sha256="0bnrq9nmryshir6ll43nz20aaqmmw0zjvfml72cpwbvrma8a3qmz"; depends=[lpSolveAPI]; }; DJL = derive2 { name="DJL"; version="3.2"; sha256="0vagpvmnbpnlxa1gj3y3gp0npf8hvpn8lyjrcggdn58rbcm2z3q9"; depends=[car lpSolveAPI]; }; DLASSO = derive2 { name="DLASSO"; version="2.0.2"; sha256="0xdygf6h89d9z4kqb46iqfxgdzq9dmkrxf9ypw78l4d8n9xx2gaa"; depends=[MASS]; }; - DLMtool = derive2 { name="DLMtool"; version="5.4.1"; sha256="0sfb1kx14qq4nxskgavbvsh78v4g5k9dmmp2vv8g2kfi73izwr83"; depends=[abind boot broom crayon devtools dplyr DT fmsb ggplot2 ggrepel gridExtra kableExtra knitr MASS mvtnorm openxlsx purrr Rcpp RcppArmadillo readxl rfishbase rmarkdown shiny snowfall tidyr]; }; - DMMF = derive2 { name="DMMF"; version="0.5.0.2"; sha256="02sk1ykispkjdclsi5xp1m4vmf8mhcqm4q2z73xanvax1kqfb3v3"; depends=[raster rgdal sp]; }; + DLMtool = derive2 { name="DLMtool"; version="5.4.3"; sha256="0gyzwx419cby9x82i5r8xx6g7m97naj47lkay5kq5943sk7b3dvz"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo snowfall]; }; + DMMF = derive2 { name="DMMF"; version="0.5.1.2"; sha256="0p82cfp0561j4ki20rznx46z7vqdxh128a0m0zj8d2wp3csn1aag"; depends=[raster rgdal sp]; }; DMRMark = derive2 { name="DMRMark"; version="1.1.1"; sha256="15wr6j0v9kvbv8y6flkp4svfqy059ziv89nxv91vp0pjmavhpdlz"; depends=[ellipse MCMCpack mvtnorm]; }; DMRnet = derive2 { name="DMRnet"; version="0.2.0"; sha256="1rbba8w4li240gw5z675d7skm72rh0zxzp4rhsn6ivj72jya7jw4"; depends=[glmnet grpreg]; }; DMwR = derive2 { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[abind class lattice quantmod ROCR rpart xts zoo]; }; DMwR2 = derive2 { name="DMwR2"; version="0.0.2"; sha256="1vzfbz2k05j8r2hpig3d2grb99rnnh2s1sviii3prcyqicxfh0i9"; depends=[class DBI dplyr quantmod readr rpart xts zoo]; }; DNAseqtest = derive2 { name="DNAseqtest"; version="1.0"; sha256="1mpmf40vrpw8m75rlqchsnyrz12pgg5bkz7wfca5yy5sbbiwk5pf"; depends=[]; }; - DNAtools = derive2 { name="DNAtools"; version="0.1-22"; sha256="1kkqbzwbivd78lpphsn9xqdxqc46ng6f86nqns18gq0s2g8gvys1"; depends=[multicool Rcpp Rsolnp]; }; + DNAtools = derive2 { name="DNAtools"; version="0.2-2"; sha256="1257gwjlqg4viw9n8g6cvv9anx5filh9d4zmjdm8zqvh7kchm8yf"; depends=[multicool Rcpp RcppParallel RcppProgress Rsolnp]; }; DNLC = derive2 { name="DNLC"; version="1.0.0"; sha256="05410xgpfjsydjmnzry454qcjpws9vhh252q2xq7l0scdj87ly00"; depends=[caTools fdrtool GOstats igraph locfdr mvtnorm spdep]; }; DNMF = derive2 { name="DNMF"; version="1.3"; sha256="09yp6x6vd44ahklcag96fpjgyphyn45rkqkbwr1n36a2d8vxk9nc"; depends=[doParallel foreach gplots Matrix]; }; DNetFinder = derive2 { name="DNetFinder"; version="1.0"; sha256="0q56c2389qaq3wsqpj8s95ncm0xmbl1slr0jmpixb48hhgk0l0ji"; depends=[flare]; }; @@ -966,39 +973,40 @@ in with self; { DPQ = derive2 { name="DPQ"; version="0.3-5"; sha256="0952aq9nh18mwldcxdi170i6aqz6snnsvl5g6qm8jq2m1i9jryjw"; depends=[sfsmisc]; }; DPWeibull = derive2 { name="DPWeibull"; version="1.5"; sha256="1dxrhd3wklg7q3grvplas6wcbs05kga1b2va6d0wkynld01ww9ii"; depends=[binaryLogic Rcpp truncdist]; }; DPtree = derive2 { name="DPtree"; version="1.0.1"; sha256="0d7zf695lwkx4gv50f08cbi3p3mjjay0qgrbmvybf9m15i4zmyd7"; depends=[MASS MCMCpack plyr Rdpack]; }; - DRAFT = derive2 { name="DRAFT"; version="0.3.0"; sha256="02y644fl5dk3qwvv45vb2zkkp4x1zciickna0pj56myh7ls08hxv"; depends=[coda ggplot2 gridExtra lubridate reshape]; }; DRAYL = derive2 { name="DRAYL"; version="1.0"; sha256="0cf5pyx6nwh8srdylpnmymv3dr67fm6qqpwd1hvj1wmyfc8fznpp"; depends=[cubature pracma RConics rmutil]; }; DREGAR = derive2 { name="DREGAR"; version="0.1.3.0"; sha256="15cplshs85r0z659mc7xmj5db7vc95wxs01c34isc22p8z0a287i"; depends=[msgps]; }; DRHotNet = derive2 { name="DRHotNet"; version="1.1"; sha256="040g9h2a2hmnd20y41xnms01iam68f6xhp2x0ckarmx961995bhg"; depends=[maptools PBSmapping raster sp spatstat spdep]; }; DRIP = derive2 { name="DRIP"; version="1.4"; sha256="1rds1161h19waqhiq08hqk5zcn48afccaggmb42xr1zyk31irpi6"; depends=[readbitmap]; }; - DRR = derive2 { name="DRR"; version="0.0.3"; sha256="1yd1fvllfkcrwg9v322n4wkk4q4q84nvy58y4vac9pdr3yf3i4vl"; depends=[CVST kernlab Matrix]; }; + DRR = derive2 { name="DRR"; version="0.0.4"; sha256="1y70si1gig4l7jx5jiqsqliyywfsvimkx53x3zh1lc3yj2j6bqwk"; depends=[CVST kernlab Matrix]; }; DRaWR = derive2 { name="DRaWR"; version="1.0.1"; sha256="1pfdczwzd236c64yw94bgbk0hbl4dhlgjfjwkljmqgqrzsddvgqh"; depends=[Matrix ROCR]; }; DRomics = derive2 { name="DRomics"; version="2.0-1"; sha256="0lfjk202fgvxjljjpakbmdqc41hbpgl39lym215hlqksfpi0jq7a"; depends=[DESeq2 ggplot2 limma]; }; DSAIDE = derive2 { name="DSAIDE"; version="0.8.3"; sha256="0n1ffv48202pnnsdcd3zpgpviy8613fcgx5c796whjffrc4v8m31"; depends=[adaptivetau deSolve dplyr ggplot2 gridExtra lhs nloptr plotly shiny XML]; }; DSAIRM = derive2 { name="DSAIRM"; version="0.8.2"; sha256="05m6hm9h8f41n3wswbp7z80kfvmn65jypj9fwlv3k8bdm4lw1mla"; depends=[adaptivetau boot deSolve dplyr ggplot2 gridExtra lhs nloptr plotly shiny XML]; }; DSBayes = derive2 { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; }; + DSI = derive2 { name="DSI"; version="1.0.0"; sha256="0dc9xhmz4pg5d8pm2wiya7b0m793kx1campnaxl8mcs2gvdfahm9"; depends=[progress R6]; }; DSL = derive2 { name="DSL"; version="0.1-7"; sha256="05wj3zypr2kqfbka930qnwnk2r43pqi13pbs5n6lm8vdq4zjblw4"; depends=[]; }; + DSLite = derive2 { name="DSLite"; version="1.0.0"; sha256="05dd3bdlk0xsl5d6pc1sfraypjjppfpairg4k9vh1ca4a3cq8sr8"; depends=[DSI R6]; }; + DSSAT = derive2 { name="DSSAT"; version="0.0.1"; sha256="06a5n484pc49ynrzaf3fm04884z6qwhd6kw0n4834fynpnflkkym"; depends=[dplyr glue lubridate purrr readr rlang stringr tidyr]; }; DSpat = derive2 { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[mgcv RandomFields rgeos sp spatstat]; }; DSpoty = derive2 { name="DSpoty"; version="0.1.0"; sha256="18z8gk3zj7k2szxg9579qy5klrqjw6zsk5x9jmwrv4qhb98fyji6"; depends=[dplyr httr purrr stringr]; }; - DSsim = derive2 { name="DSsim"; version="1.1.4"; sha256="0cspyd6msh8aci3w1fv234ca2bwpi6ylkbl45d4k0v3wzzfj20hk"; depends=[fields mgcv mrds rgeos shapefiles sp splancs]; }; + DSsim = derive2 { name="DSsim"; version="1.1.5"; sha256="0dr8dc91m7s5c198k9cb26a09f14wb8ihr46c0mr9cg33l2wf3nv"; depends=[fields mgcv mrds rgeos shapefiles sp splancs]; }; DStree = derive2 { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[Ecdat pec Rcpp rpart rpart_plot survival]; }; DSviaDRM = derive2 { name="DSviaDRM"; version="1.0"; sha256="1hj2pgnldrpgapwwz1kf4k6mvyzwdvb1i6czd7sbimsx5hafwps8"; depends=[igraph ppcor]; }; - DT = derive2 { name="DT"; version="0.11"; sha256="09k9s07aah1apc308sj1abvr27mky6fkpl9j6lxl2x55n4immvkg"; depends=[crosstalk htmltools htmlwidgets jsonlite magrittr promises]; }; - DTAT = derive2 { name="DTAT"; version="0.3-3"; sha256="184b8qkwqlygdqzad2x2qf4hdrpsr7yffmf21jrz5yf946y621wl"; depends=[data_table dplyr Hmisc jsonlite km_ci pomp r2d3 shiny survival]; }; + DT = derive2 { name="DT"; version="0.13"; sha256="1db35mi4m4q3kha4vhvh693bv04y7h9pdawhsx8f234qjvz7783r"; depends=[crosstalk htmltools htmlwidgets jsonlite magrittr promises]; }; DTAXG = derive2 { name="DTAXG"; version="0.1.0"; sha256="1jxa0ix0z35i0xdnjl698j8iqjmp6nz8ckah9bap5ay9rkq0xd7f"; depends=[]; }; DTComPair = derive2 { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; }; - DTDA = derive2 { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; }; - DTDA_cif = derive2 { name="DTDA.cif"; version="1.0.1"; sha256="1ams5annm0296y6i5ii54cf95i0739269b4p97rib6nniynpwwxk"; depends=[doParallel foreach Rcpp]; }; + DTDA = derive2 { name="DTDA"; version="2.1-2"; sha256="1nc4j6pzbk5g967k9vh06v8gfr88h611fw6zbvrp2iy6z22arpgf"; depends=[]; }; + DTDA_cif = derive2 { name="DTDA.cif"; version="1.0.2"; sha256="12vkhqxdhir06s35kr76dwns9m02wyicz3mv4r56fqglsfyw77xr"; depends=[doParallel foreach Rcpp]; }; DTDA_ni = derive2 { name="DTDA.ni"; version="1.0"; sha256="0c45cz4y629bc0jnf3m35ywqkrnjcdqbssbb6m10j8b4gszdi35i"; depends=[]; }; DTK = derive2 { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; }; DTMCPack = derive2 { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; }; DTR = derive2 { name="DTR"; version="1.7"; sha256="1lzvk9ar6xf3n2vvy8vb9mvrbx3nafzzhvz5g7vf79jd71yz54jd"; depends=[aod ggplot2 survival]; }; - DTRlearn2 = derive2 { name="DTRlearn2"; version="1.0"; sha256="0aly8byygpgsjfa1lzarcig2dvz852ihdlw7xhb7kx62y8prjzz1"; depends=[foreach glmnet kernlab MASS Matrix]; }; + DTRlearn2 = derive2 { name="DTRlearn2"; version="1.1"; sha256="0l756zb1wkpa1z5zjkc8jndmh2630gckxxfqslabzjmgsjf7fjgm"; depends=[foreach glmnet kernlab MASS Matrix]; }; DTRreg = derive2 { name="DTRreg"; version="1.5"; sha256="0milc5bmks6pxhl5f3zyv3w80ld733v05cvx8i531v2ynac4v6zb"; depends=[]; }; - DTSg = derive2 { name="DTSg"; version="0.3.0"; sha256="1dzzb51zash0r7afvnlv3sn738g6dxgb11s3f0skzl3s83jn15lh"; depends=[checkmate data_table R6]; }; + DTSg = derive2 { name="DTSg"; version="0.4.0"; sha256="0if4h5660wl5pb187lfhv00gdr9wp43w5xk1g4hf83jbnq06q424"; depends=[checkmate data_table R6]; }; DTWBI = derive2 { name="DTWBI"; version="1.1"; sha256="06lp4yc5nhacrgic78l014g2w1ibwgs8dp8zrahk5aripaczl25y"; depends=[dtw e1071 entropy lsa rlist]; }; DTWUMI = derive2 { name="DTWUMI"; version="1.0"; sha256="0pybgbfs2yp2ljbs0kra5z70x3llkiwdngp6cadgs3j9rar4vq4q"; depends=[dtw DTWBI e1071 entropy lsa rlist]; }; - DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.9"; sha256="1m13lhxgw7yj44s5spmlb4xxkranfbmjfh8lhrksikd796vxms3s"; depends=[ggplot2 KernSmooth reshape2 shiny]; }; + DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.10"; sha256="1d8zig3ljld05pwaqsahyvjf95y8k183al5ibx09h6hj3r5bfd8n"; depends=[DT ggplot2 KernSmooth reshape2 shiny]; }; DWDLargeR = derive2 { name="DWDLargeR"; version="0.1-0"; sha256="1bxdvgj38xv2xj98njpyhy12b54nccwnc3v92kkpd3i7nwbw48dy"; depends=[Matrix SparseM]; }; DWLasso = derive2 { name="DWLasso"; version="1.1"; sha256="1i8j8wjfvg69ldr8ahz1zv3m2wgxd701iph94ad22zs9qwqfg16z"; depends=[glmnet hglasso Matrix]; }; DWreg = derive2 { name="DWreg"; version="2.0"; sha256="0bgahzgcxz86n0ady97l48zyahv3p2iyc2ivbij1xrfx3wcx3b5n"; depends=[DiscreteWeibull Ecdat maxLik survival]; }; @@ -1006,7 +1014,7 @@ in with self; { DamiaNN = derive2 { name="DamiaNN"; version="1.0.0"; sha256="09viy1lilz0b29s3myky03981bfnhxjxxgfhdah33cn5x682rbp4"; depends=[caret testthat]; }; DandEFA = derive2 { name="DandEFA"; version="1.6"; sha256="1ir1z76c8742vqdlwv35l4rhr0x7lhghz24g35zn7b30671lypf8"; depends=[gplots polycor]; }; Dark = derive2 { name="Dark"; version="0.9.8"; sha256="1f01aq4g50f07005c8k91cfy9hvl3fmb4yl2924d7512m3884xlv"; depends=[]; }; - DarkDiv = derive2 { name="DarkDiv"; version="0.1.0"; sha256="04yx2j3ywskyi5dq1lsnbkfjg2bhybpmckxlr76qi88v90q3nq6m"; depends=[vegan]; }; + DarkDiv = derive2 { name="DarkDiv"; version="0.2.0"; sha256="0ygd79bgyajm1p58l0anprglcgi0gsflnc4ml61zq91pf6nhczlf"; depends=[vegan]; }; Dasst = derive2 { name="Dasst"; version="0.3.3"; sha256="0nrcvcfzr2y1jc984rpi3fmggns65sphc6nqr9l91h5qvpdcw7cl"; depends=[]; }; DatAssim = derive2 { name="DatAssim"; version="1.0"; sha256="120gazyyxda9faydv2lyqgvflhqi2fhih1szq0sy5v1gh4xb0hhy"; depends=[Rcpp RcppArmadillo]; }; Data2LD = derive2 { name="Data2LD"; version="2.0.0"; sha256="145lvrscq3iyc7cy6xr0vrm5qa2323m3c3g2ikdhj18rhzx4r46k"; depends=[deSolve fda Matrix]; }; @@ -1014,21 +1022,21 @@ in with self; { DataCombine = derive2 { name="DataCombine"; version="0.2.21"; sha256="0iwb4726bk0cjhay694dp43b1553yyk9lpxbncs85kz229b26arm"; depends=[data_table dplyr]; }; DataEntry = derive2 { name="DataEntry"; version="0.9-3"; sha256="0gfsg7wfwy88x7y1dwpgwi6fkizjnhrzj0a5ij70y4a4sjmyiy55"; depends=[digest gWidgets2 gWidgets2RGtk2 RGtk2]; }; DataExplorer = derive2 { name="DataExplorer"; version="0.8.1"; sha256="0724ngcw2b1i2cf8jbak61saqk71f06wszvx7nhba4n0z8l503cz"; depends=[data_table ggplot2 gridExtra networkD3 reshape2 rmarkdown scales]; }; - DataGraph = derive2 { name="DataGraph"; version="1.0.1"; sha256="0rvysvkcs926jzhp7iz9d5np0pa31y825ajn9yyzhbdfk5dg2wry"; depends=[Rcpp]; }; + DataGraph = derive2 { name="DataGraph"; version="1.2.1"; sha256="164wbh3by8qf0p84l5v7vwrzf0f2s305fwmrl01khcll8pk34xlm"; depends=[Rcpp]; }; DataLoader = derive2 { name="DataLoader"; version="1.3"; sha256="18mih6mb95v5xjvmqwby2mma74fcxwyqdm5w8j3bhi4iwgfn6d7v"; depends=[plyr rChoiceDialogs readxl xlsx]; }; DataPackageR = derive2 { name="DataPackageR"; version="0.15.7"; sha256="11bra0kgmvag4mp6hpljd8m3r1306cbncmz3x71iybkahimws813"; depends=[assertthat crayon desc devtools digest futile_logger knitr purrr rmarkdown roxygen2 rprojroot stringr usethis yaml]; }; DataSpaceR = derive2 { name="DataSpaceR"; version="0.7.3"; sha256="0jg77zq12fvwnzfdk83y6wi4547g9r5zlvhjmjj1bp0xp7spcbyk"; depends=[assertthat curl data_table digest httr jsonlite R6 Rlabkey]; }; - DataVisualizations = derive2 { name="DataVisualizations"; version="1.1.9"; sha256="13yrjs37ap8rmx842zp529brfr12rr4d77f2pqlj5wfppngxzv31"; depends=[ggplot2 Rcpp RcppArmadillo sp]; }; + DataVisualizations = derive2 { name="DataVisualizations"; version="1.1.11"; sha256="160jrajyr6vhj05233602b2k5lh3l1znd73hn4vxak7qjh2rajkm"; depends=[ggplot2 Rcpp RcppArmadillo sp]; }; DataViz = derive2 { name="DataViz"; version="0.2.8"; sha256="1dr5nvdzc63x9ymlysvv5i8b7zcffq13pa39q0ychdwr1s3x7vzw"; depends=[Rcpp tibble]; }; DatabaseConnector = derive2 { name="DatabaseConnector"; version="2.4.2"; sha256="1q83lw8zxzq2d1gdcsbr4mqjz6gz0c3m2vi4l8x4mj9kf497dvc3"; depends=[bit DatabaseConnectorJars DBI ff ffbase rJava SqlRender urltools]; }; DatabaseConnectorJars = derive2 { name="DatabaseConnectorJars"; version="1.1.0"; sha256="18m6ynj30r5xdy51b3s39h0jcz1k2wgka888skr6ds2233lhqk2w"; depends=[rJava]; }; - DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="1.1.2"; sha256="02bg4gagd09gqdnlf5bz97d8pygfl7rl02r533y671dz2qqffpa9"; depends=[deldir GeneralizedUmatrix Rcpp RcppArmadillo]; }; + DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="1.1.3"; sha256="1qjlczpxadvzjn4gl2q7rnmpgygsh8ylk8cfvmynx8p675g657cz"; depends=[deldir GeneralizedUmatrix Rcpp RcppArmadillo]; }; Davies = derive2 { name="Davies"; version="1.1-9"; sha256="19n2szki2dc8z01zh5a7bq4scgisnpd2qqbiimgrswjrykgh2fpm"; depends=[]; }; DeLorean = derive2 { name="DeLorean"; version="1.5.0"; sha256="1ry6j4mvxms9hddi9c56p9yhjh66fzss41wqkf6xq398h1wbn4q1"; depends=[BH broom coda dplyr fastICA functional ggplot2 kernlab lattice MASS memoise Rcpp RcppEigen reshape2 rstan rstantools seriation StanHeaders stringr]; }; DeRezende_Ferreira = derive2 { name="DeRezende.Ferreira"; version="0.1.0"; sha256="05c99z3hlwwm0p02cl9z6gjwfxfq2b2qn90l85270bi16llgf42h"; depends=[xts]; }; DealGPL570 = derive2 { name="DealGPL570"; version="0.2.0"; sha256="1c202gzbhqaisxvpiiajcbfsjnqrvygd19304m2n89ansv81vi8r"; depends=[affy dplyr GEOquery stringr tibble]; }; - DecisionAnalysis = derive2 { name="DecisionAnalysis"; version="1.0.0"; sha256="1d0b534s9fidgl5q8q8g5s58v6wv3md4pl5zm5r5q3jlr6z8q5n3"; depends=[Cairo data_tree DiagrammeR dplyr ggplot2 gridExtra tidyr viridisLite]; }; - DeclareDesign = derive2 { name="DeclareDesign"; version="0.20.0"; sha256="0zdpiwh74ljc57s4cgak2j8zg3zyz9f3b47dambw2zdiy0db6wk8"; depends=[estimatr fabricatr generics randomizr rlang]; }; + DeclareDesign = derive2 { name="DeclareDesign"; version="0.22.0"; sha256="1c4ij70d2002rj595fzik75x44jf0gdnrs4bbm5fv4lqnbrm5j37"; depends=[estimatr fabricatr generics randomizr rlang]; }; + DecomposeR = derive2 { name="DecomposeR"; version="1.0.1"; sha256="1p64l2h8c67faybw7v0zvl11y4wcm13i189ssnbh7m2bd460dpql"; depends=[colorRamps dplyr hexbin hht StratigrapheR]; }; DecorateR = derive2 { name="DecorateR"; version="0.1.1"; sha256="1dvyadlksqv8ns043yh91f6kw162k6r0zwn13j1g6pvismw04br9"; depends=[rJava RWeka RWekajars]; }; Deducer = derive2 { name="Deducer"; version="0.7-9"; sha256="14kakyf28i654pndlswjzp6h3h7szpznrg6xznqg150mmn0bs3s6"; depends=[car e1071 effects foreign ggplot2 JGR MASS multcomp plyr rJava scales]; }; DeducerPlugInExample = derive2 { name="DeducerPlugInExample"; version="0.2-0"; sha256="03aw7wr957xzw920ybyzxnck5kx0q2xpcrpq8jh2afyzszy6hzbi"; depends=[Deducer]; }; @@ -1047,20 +1055,21 @@ in with self; { DensParcorr = derive2 { name="DensParcorr"; version="1.1"; sha256="1ifkg7cpimf27yhr60rks77r16kmhwa5h10wv7b64sbfncnyzfmj"; depends=[clime gplots]; }; Density_T_HoldOut = derive2 { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; }; DepLogo = derive2 { name="DepLogo"; version="1.0"; sha256="0h4jpflf8amip62r936lg0k428gypag296kwl58w1d0qa5jyxrkk"; depends=[]; }; - DepthProc = derive2 { name="DepthProc"; version="2.1.2"; sha256="1habp2jq376zwclr17n9aw611v422783r7nfzkh1bl6yv0mchnjy"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; }; + DepthProc = derive2 { name="DepthProc"; version="2.1.3"; sha256="1dq5y6fgmm00imkim4v2s6kn4z5qnwa0dkfkcq4pap7imvi35aab"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; }; Deriv = derive2 { name="Deriv"; version="4.0"; sha256="03mlfy8jzzzbh2l18gnmw0a71n9savx4cw72yhkxq93v2xj8fy3n"; depends=[]; }; - DescTools = derive2 { name="DescTools"; version="0.99.32"; sha256="14sywl9k59j5h84gwddphk1xfvyd55l72axii9fgiifcjvcwj0nk"; depends=[BH boot expm MASS mvtnorm Rcpp]; }; - DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.6"; sha256="0hv0f5azzykwr407q0qxkwja34q5nyzr23bnbfqlxcymgkbhv380"; depends=[DescTools foreign manipulate rstudioapi writexl]; }; + DescTools = derive2 { name="DescTools"; version="0.99.34"; sha256="01sj4p27npxvljg68sn75wd334mm4fkan5ydvr0h2kik620swwqy"; depends=[BH boot expm MASS mvtnorm Rcpp]; }; + DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.7"; sha256="0k9qsz6wn97gy23rzm1rr8c6az05xr01jnsqcxknalkx6hj8h1mg"; depends=[DescTools foreign manipulate rstudioapi writexl]; }; DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.7"; sha256="0241mbz0y3ala7fsb4fwjd0xigsk0wq77hfrjyvnnp97rfjfzmcv"; depends=[GGally ggplot2 plyr reshape2 scales]; }; DescriptiveStats_OBeu = derive2 { name="DescriptiveStats.OBeu"; version="1.3.1"; sha256="1bqq56m4vhmgijxpyllpy08xx29k0p7lhmd0iwa06jdw4lj5rdah"; depends=[dplyr jsonlite magrittr RCurl reshape]; }; DesignLibrary = derive2 { name="DesignLibrary"; version="0.1.4"; sha256="16j9ca3y8mcdbd64yqm6js4lb9hjc74dh4r5y3h1ifvwzj0a78yc"; depends=[DeclareDesign estimatr fabricatr generics glue randomizr rlang]; }; DetMCD = derive2 { name="DetMCD"; version="0.0.5"; sha256="034wb5hwpikli6h2rwiqr19qvzxrr4qwi4q436y7c5a5wgkfzgl5"; depends=[pcaPP Rcpp RcppEigen robustbase]; }; DetR = derive2 { name="DetR"; version="0.0.5"; sha256="1dd4nzkgj5pl9397aa0z3q5fpl27xbdf7q0pqbs821dyynylxzn9"; depends=[MASS pcaPP Rcpp RcppEigen robustbase]; }; - DetSel = derive2 { name="DetSel"; version="1.0.3"; sha256="0rd047nkdhil9ydizrhpqr9pcmi86bq0r0f14rbix6i9hplxz42v"; depends=[ash]; }; + DetSel = derive2 { name="DetSel"; version="1.0.4"; sha256="01mpjy1cmgbrchdjl0gmrq3zx3mlkznml1qcradj2v5mgz26ifrv"; depends=[ash]; }; + DevTreatRules = derive2 { name="DevTreatRules"; version="1.1.0"; sha256="1h4p78mwl5ir31hfb38x1dwq5xxbdlsasvk5vxa3c7xdvhsd2yrf"; depends=[DynTxRegime glmnet modelObj]; }; Devore7 = derive2 { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[lattice MASS]; }; Dforest = derive2 { name="Dforest"; version="0.4.2"; sha256="19jyph2zqfyq9vv22kb6fqy89l0vcviv19zgk10hbd7q850f6ryn"; depends=[ggplot2 rpart]; }; DiPhiSeq = derive2 { name="DiPhiSeq"; version="0.2.0"; sha256="11l2inf99vxz9k292307j8c2b25kc1066svy3vxrfl72rrm4fqa7"; depends=[]; }; - DiPs = derive2 { name="DiPs"; version="0.5.0"; sha256="1bm3zpdp20dz4bgi0jvp064nfb5van11v20605lfq4irf6nqs8j1"; depends=[liqueueR mvnfast plyr rcbalance]; }; + DiPs = derive2 { name="DiPs"; version="0.6.1"; sha256="0r6r0i417z4ax7cw1a7jbjhi0h2i2n43vf0y4770hyrl3m6spwfj"; depends=[liqueueR mvnfast plyr]; }; DiSSMod = derive2 { name="DiSSMod"; version="1.0.0"; sha256="199yipbc2sx2lsl51rpfyh80bfxaahfd2llqmfsp946gvj7339hv"; depends=[MASS matrixcalc psych sfsmisc]; }; DiagrammeR = derive2 { name="DiagrammeR"; version="1.0.5"; sha256="0d73aiv4fra1xwq63n3139anp479ni7dh370lxc3rc15g5qayxq8"; depends=[downloader dplyr glue htmltools htmlwidgets igraph influenceR magrittr purrr RColorBrewer readr rlang rstudioapi scales stringr tibble tidyr viridis visNetwork]; }; DiagrammeRsvg = derive2 { name="DiagrammeRsvg"; version="0.1"; sha256="0j2cm1mx3zrb2k3pcrb96z2z3kws61gyyjsjjv5rqcb5lzdgi65k"; depends=[V8]; }; @@ -1071,40 +1080,40 @@ in with self; { DiceOptim = derive2 { name="DiceOptim"; version="2.0"; sha256="1hx4379yb6d36c494qc237vld4jnfxq18m994p5ii9ks6s7amifn"; depends=[DiceDesign DiceKriging mnormt pbivnorm randtoolbox rgenoud]; }; DiceView = derive2 { name="DiceView"; version="1.3-2"; sha256="0ny9gbaycrq3lr4gqil1yyhkkyxmabl8w6cmkkzlx3yaara0idkf"; depends=[DiceEval DiceKriging rgl]; }; DidacticBoost = derive2 { name="DidacticBoost"; version="0.1.1"; sha256="0z1h61n6nfjvb64fgkzi1sq7ag747crhh593hxkx0cpza29778rz"; depends=[rpart]; }; - Diderot = derive2 { name="Diderot"; version="0.12"; sha256="1cq8yk4r0csnslp286hzs04zzq44q0frz0kyll9jhqjil34qh0x7"; depends=[data_table doParallel foreach igraph RCurl splitstackshape stringi]; }; + Diderot = derive2 { name="Diderot"; version="0.13"; sha256="04d1drxn99r0fqq3zym7yyip9c8rfqhghq20q4zyb42l3hfgv9ai"; depends=[data_table doParallel foreach igraph RCurl splitstackshape stringi]; }; DiffCorr = derive2 { name="DiffCorr"; version="0.4.1"; sha256="1kxp9dbiww086rmvmjvfhbk7jl36dkj88qwii6zg57llf7l5l4hm"; depends=[fdrtool igraph multtest pcaMethods]; }; DiffNet = derive2 { name="DiffNet"; version="1.0-0"; sha256="04dvf0qxnc6jizwfjxw731j7d2fxyapk06rmqvga6h3p075q0mqk"; depends=[data_table doParallel foreach gplots Hmisc igraph lsa Matrix qlcMatrix Rcpp RcppEigen]; }; - DiffXTables = derive2 { name="DiffXTables"; version="0.0.2"; sha256="01kxa0barwy9khwf9yyzdxi4561n5c0q9s2fps8gwb2afxdhxjm0"; depends=[Matrix]; }; + DiffXTables = derive2 { name="DiffXTables"; version="0.1.0"; sha256="1la512kvq1ziw1b3zzn2khh4cjcq2lwq1r17b84x7f4spbfp5l2b"; depends=[]; }; DiffusionRgqd = derive2 { name="DiffusionRgqd"; version="0.1.3"; sha256="1gf5jpvimfrc9ccva0jk85rl4zfkbijm2305ky1rxcgm4kgw4lax"; depends=[colorspace Rcpp RcppArmadillo rgl]; }; DiffusionRimp = derive2 { name="DiffusionRimp"; version="0.1.2"; sha256="1h7145ldlgwrrwj4l1wxdp2rbg2pm4v3pngiq0saz0xi3vpcxwl6"; depends=[colorspace Rcpp RcppArmadillo rgl]; }; DiffusionRjgqd = derive2 { name="DiffusionRjgqd"; version="0.1.1"; sha256="1yb1jaq324qm2x8cl3bs2dflnsx8yfygpw2m3kk5hzaai9gfkqjf"; depends=[colorspace Rcpp RcppArmadillo rgl]; }; - Digiroo2 = derive2 { name="Digiroo2"; version="0.6"; sha256="1b1ahhqz5largjadlk5n6nw2183c05k28mksb1wm26y0lps0vdgr"; depends=[maptools spatstat spdep]; }; DirectEffects = derive2 { name="DirectEffects"; version="0.2"; sha256="0cawn1i1cyczsr9zpcaky79dfdl9anfjgiaa2404capacnj3call"; depends=[Formula glue sandwich]; }; - DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.2"; sha256="060nscnn7wamnbb45a55wr6rirlbpwwjz0kxiw3aiqkm16ilzfbs"; depends=[]; }; + DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.3"; sha256="1qlfvzlig3a2v78fiq6sbbpxklmjczikxdw57m6mqngzrl9vdl2g"; depends=[]; }; DirectedClustering = derive2 { name="DirectedClustering"; version="0.1.1"; sha256="1shdqz0c5bbgknvfqr3ais26cb5mpywnah3d3584w97sy8v7gxm2"; depends=[igraph]; }; - Directional = derive2 { name="Directional"; version="4.1"; sha256="1irg9spq859k26xn6f2pinlcrfzmwxlw56aq4vx27n6b1f2c4kqg"; depends=[bigstatsr doParallel foreach MASS Rfast Rfast2 rgl]; }; + Directional = derive2 { name="Directional"; version="4.3"; sha256="0kbwf3rzh776y7hk8zbb5yq01pm5m5bx5brap8dv5lgxg083jxq8"; depends=[bigstatsr doParallel foreach MASS RANN Rfast Rfast2 rgl]; }; DirichletReg = derive2 { name="DirichletReg"; version="0.6-3.1"; sha256="1lz4b166grrs6vs98mf6a0wg4hvh0p901h697h9dkfhkxw8cqj3f"; depends=[Formula maxLik rgl]; }; DisHet = derive2 { name="DisHet"; version="1.0.0"; sha256="056jcs1qpiyadnmlzd0cj4kp0qzkichxi0pdnxypyq1fsqnpvan3"; depends=[gtools matrixStats]; }; - DisImpact = derive2 { name="DisImpact"; version="0.0.5"; sha256="1n0lyzv6abvrrcxj4zglyl9b0j4ldj0zkznh57frn1j1imb1na1l"; depends=[dplyr magrittr purrr rlang tidyselect]; }; - DiscreteFDR = derive2 { name="DiscreteFDR"; version="1.3-3"; sha256="1qdcmn74mmnk61y6lh76mnqk7hw7v3v67y0zljfz7s3h4vxpad4g"; depends=[Rcpp]; }; + DisImpact = derive2 { name="DisImpact"; version="0.0.7"; sha256="1cd2v1f43lhvs7kk0vq1vyda336zzxyh0gxrkpg397qpqsfh61si"; depends=[dplyr purrr rlang tidyr tidyselect]; }; + DiscreteFDR = derive2 { name="DiscreteFDR"; version="1.3-4"; sha256="0r3z56xcb5als38rhydia482j5xl9kcgamdj6ibd22yi0ya6k4iv"; depends=[Rcpp]; }; DiscreteInverseWeibull = derive2 { name="DiscreteInverseWeibull"; version="1.0.2"; sha256="0vjsvl4m4zccfgizv7mzidbbpzqcm101x448vllcdcrn2xlnkmnq"; depends=[Rsolnp]; }; DiscreteLaplace = derive2 { name="DiscreteLaplace"; version="1.1.1"; sha256="17w4vjvsm7jacvwckjczyah3hglq044r3m6vqdcrg8haz884rav2"; depends=[]; }; - DiscreteQvalue = derive2 { name="DiscreteQvalue"; version="1.0"; sha256="19c2rmizrmpf5vmsfhnk5xswnngdlh1hfcj6k0qdp00kdfgj79ja"; depends=[]; }; + DiscreteQvalue = derive2 { name="DiscreteQvalue"; version="1.1"; sha256="1xl6m3sf02v4y26375jn846ixzcxpqim1r6d4j56y8b5c243jg4h"; depends=[]; }; DiscreteWeibull = derive2 { name="DiscreteWeibull"; version="1.1"; sha256="1rg3ax6jryagf5d3h8m44x9wyhr2qff3srfa9zrk6i64p1ahk9lr"; depends=[Rsolnp]; }; DiscriMiner = derive2 { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; }; Disequilibrium = derive2 { name="Disequilibrium"; version="1.0"; sha256="0cxwsn57rbwyq6lnr273z5z51nb83w45zg9msw4iqfsyq2z5r5a1"; depends=[Formula numDeriv optimr]; }; DisimForMixed = derive2 { name="DisimForMixed"; version="0.2"; sha256="00mknsalikangr17946877m5fy2jgkgasgl6ng4f2nr44f0q9l6q"; depends=[cluster dplyr]; }; - Distance = derive2 { name="Distance"; version="0.9.8"; sha256="19n1kjx7ikphp97118n0zwnv1prlxk9hcpn30ckxc4329m0cafvv"; depends=[mrds]; }; + Distance = derive2 { name="Distance"; version="1.0.0"; sha256="0pgrx2897fb3747vlgzkmr98vfl8wazvqbsbam705sp40mp0gwn7"; depends=[dplyr mrds rlang]; }; DistatisR = derive2 { name="DistatisR"; version="1.0.1"; sha256="0myzfki8yrk0nhgdgsqs4wjbqhzmkdil1g005hc7p4lz3gi09bfx"; depends=[car prettyGraphs]; }; - DistributionOptimization = derive2 { name="DistributionOptimization"; version="1.2.4"; sha256="0qyfi1l8908r98ian1l9q72iz2cyzp09ykgip7l3py2p3m9cg8wc"; depends=[AdaptGauss GA ggplot2]; }; - DistributionTest = derive2 { name="DistributionTest"; version="1.0"; sha256="0ga0cxk8i1n6p33ywy9j65df3p4ypnc6mimvkx3yi1diczln6dbx"; depends=[MASS]; }; + DistributionFitR = derive2 { name="DistributionFitR"; version="0.1"; sha256="0wg43gqsdy1ja0l489k27k9q1w2zq45wzmqnv9wfc734rf8kvlba"; depends=[doParallel foreach stringr]; }; + DistributionOptimization = derive2 { name="DistributionOptimization"; version="1.2.6"; sha256="0pp0f7c9szyx426bnnz4fz4vh5q73m8x896z6pqgx04b6v445361"; depends=[AdaptGauss GA ggplot2 pracma]; }; + DistributionTest = derive2 { name="DistributionTest"; version="1.1"; sha256="11xhr6yv42s1i4qqlb1pvzm8q2116v10gjlkhl0ml3id6lx27nmj"; depends=[MASS]; }; DistributionUtils = derive2 { name="DistributionUtils"; version="0.6-0"; sha256="08vq54pyqxlqsj6q6gsg5ikqa0z3x842j52ld5dxaq272p6xchvl"; depends=[]; }; - DivE = derive2 { name="DivE"; version="1.1"; sha256="1445pyw15dq48qsbnm2bgfm9xfffdww5xbhcs901ai0nyb3f7daa"; depends=[deSolve FME rgeos sp]; }; + DivE = derive2 { name="DivE"; version="1.2"; sha256="1czj89ljvpgl03471cknki2lc64swdqdpf5wsgicad35kgmlrwlh"; depends=[deSolve FME rgeos sp]; }; DivMelt = derive2 { name="DivMelt"; version="1.0.3"; sha256="03vkz8d283l3zgqg7bh5dg3bss27pxv4qih7zwspwyjk81nw3xmr"; depends=[glmnet]; }; DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.6"; sha256="16x3fpchgd12mccvr1k11vjka97sy5vjvjcyd5y3pskgnpycc2sv"; depends=[dplyr ggplot2 glmulti MuMIn qpcR raster unmarked vegan]; }; DnE = derive2 { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; }; DoE_MIParray = derive2 { name="DoE.MIParray"; version="0.13"; sha256="0lbcqfizgrnqmp0b2yn14br7xmabbhywy8h7161hx6hnvnam5r99"; depends=[combinat DoE_base]; }; - DoE_base = derive2 { name="DoE.base"; version="1.1-3"; sha256="0y195kf3fldis17z20blrqkav4xsmy9xq6ak3gw9mgb9x59y7661"; depends=[combinat conf_design lattice MASS numbers partitions vcd]; }; + DoE_base = derive2 { name="DoE.base"; version="1.1-5"; sha256="15m1axp8wpvqdly62chb4p0jzfvmkma6bsw8gagzwm9ibh6xwmkq"; depends=[combinat conf_design lattice MASS numbers partitions vcd]; }; DoE_multi_response = derive2 { name="DoE.multi.response"; version="0.1.0"; sha256="1289jlp10999kvyg5adw3dyc2mhh20i6biyqjbxd6g80a8dajknx"; depends=[DoE_wrapper]; }; DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.11"; sha256="08bgfaiivqqnkhjb18flk1cpa33rh70i6g8v25x1ma3ffxqrwh96"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; }; DoEstRare = derive2 { name="DoEstRare"; version="0.2"; sha256="0y9ymw7114jk1rwiasq400bpgvkxv6rpc954c7v9mgxd3c2nfza7"; depends=[]; }; @@ -1119,27 +1128,25 @@ in with self; { DrBats = derive2 { name="DrBats"; version="0.1.5"; sha256="1iaffippp9kwfrwryf7klmn8nsm2k8pc0bkgpxcsl4vxyy2na3mp"; depends=[ade4 coda MASS Matrix rstan sde]; }; DrImpute = derive2 { name="DrImpute"; version="1.0"; sha256="1adzarrwqb282pqgx2yqswp9rpwd1naxsmar54kddr6qyd6b923b"; depends=[Rcpp RcppArmadillo]; }; DrInsight = derive2 { name="DrInsight"; version="0.1.1"; sha256="02lqf6bwbgcgyg5zx16nvnzpagmcmbsngnhmyv47256vsd9vppjd"; depends=[igraph qusage]; }; - DramaAnalysis = derive2 { name="DramaAnalysis"; version="3.0.1"; sha256="180qfialkkgi1yzl9r7pc75bhbh87n6rx6h5ic0wbdkwsrriwl9m"; depends=[data_table git2r httr readr reshape2 stringr tokenizers xml2]; }; - DriftBurstHypothesis = derive2 { name="DriftBurstHypothesis"; version="0.3.0"; sha256="0v6b8bm683c0np99bwvn3x0bp9xwf9qgli2050n05iiqibc894np"; depends=[Rcpp RcppArmadillo xts zoo]; }; + DriftBurstHypothesis = derive2 { name="DriftBurstHypothesis"; version="0.4.0"; sha256="0cmjysy4g0l9ddadc9g1jl280y999b956saz9v99lg1a3sm4gq9c"; depends=[Rcpp RcppArmadillo xts zoo]; }; DrillR = derive2 { name="DrillR"; version="0.1"; sha256="0n7pim5kk0wfdjcc67v4vvdb7wyhn5bcgi2a12nbyfyydss7pk1g"; depends=[httr]; }; DrugClust = derive2 { name="DrugClust"; version="0.2"; sha256="0acvjqwzkbjmy101m501l7fkfxzkp6zflwvn56li5307xv9ggnfg"; depends=[cclust cluster e1071 MESS ROCR]; }; DstarM = derive2 { name="DstarM"; version="0.3.0"; sha256="16vcv21dgnymhsy9j5x5pblnipf4hdyscajx6pr8kl6i95hs3hmj"; depends=[DEoptim ggplot2 Rcpp RcppArmadillo rtdists RWiener]; }; - DtD = derive2 { name="DtD"; version="0.2.1"; sha256="15xj4xwg8jis8v2d7yv4wqmihqdm47f4n4zy7kpp5n854dvv9f0p"; depends=[checkmate Rcpp RcppArmadillo]; }; + DtD = derive2 { name="DtD"; version="0.2.2"; sha256="1czspjdxjhbfk2df7wk0x3d1ilwrjqw4s4gdc4hq0gjcjqyx0c39"; depends=[checkmate Rcpp RcppArmadillo]; }; DunnettTests = derive2 { name="DunnettTests"; version="2.0"; sha256="1sf0bdxays10n8jh2qy85fv7p593x58d4pas9dwlvvah0bddhggg"; depends=[mvtnorm]; }; DySeq = derive2 { name="DySeq"; version="0.22"; sha256="1sx6mg0bcqb5ff6x305k43zx3fwd16rvxc7xb3ai5h3w7fs9zz7y"; depends=[boot MASS TraMineR]; }; Dykstra = derive2 { name="Dykstra"; version="1.0-0"; sha256="1rc1409ky0ysqr3ccq28yhbs94m6d0z2dfa66k4c7irxjvbagwz6"; depends=[]; }; DynClust = derive2 { name="DynClust"; version="3.13"; sha256="020zl2yljp47r03rcbzrbdmwk482xx27awwzv4kdrbchbzwhxqgm"; depends=[]; }; DynNom = derive2 { name="DynNom"; version="5.0.1"; sha256="1ahs93mks2z423sxk4wjgivdz4ggvwm87dha0aan4fg4jarai98s"; depends=[BBmisc compare dplyr ggplot2 magrittr plotly prediction rms shiny stargazer survival]; }; DynTxRegime = derive2 { name="DynTxRegime"; version="4.3"; sha256="1la4y560rcs163cqmvpwsb1n70n6714kprdxpnkd849caaa93zir"; depends=[dfoptim kernlab modelObj rgenoud]; }; - DynaRankR = derive2 { name="DynaRankR"; version="1.0.0"; sha256="1smxgsxl0s5ynlphssd2q59f40zxin8im91fdcvawchc4qj2lmgg"; depends=[dplyr rlang]; }; + DynaRankR = derive2 { name="DynaRankR"; version="1.1.0"; sha256="1fzicainh1dm016cglm2x6j1i2g5r71vgrj0dnsflbxc5v426sqm"; depends=[dplyr rlang]; }; DynamicDistribution = derive2 { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; }; - DynamicGP = derive2 { name="DynamicGP"; version="1.1-5"; sha256="12y56anyi3amn7czwkk4qakmgqq0mf80xrhb8ccy1sxzk7k86pfz"; depends=[lhs]; }; + DynamicGP = derive2 { name="DynamicGP"; version="1.1-6"; sha256="1d3ycx6vcv7rcagaxvfyxgsdigbzigxarm66ypkdasbli1507is3"; depends=[lhs]; }; E4tools = derive2 { name="E4tools"; version="0.1.1"; sha256="1kmj1fddybjia9ninhcy75kdmq152zjw7s24chpqr5wsblffr3yx"; depends=[accelerometry anytime BBmisc chron data_table DataCombine doParallel doSNOW foreach ggplot2 hms scales signal]; }; EAinference = derive2 { name="EAinference"; version="0.2.3"; sha256="1kzcfya3z6rf1vqjn72yjymdhrn4dzgmwifh3w6k22cy5jxffzn4"; depends=[hdi limSolve MASS msm mvtnorm Rcpp RcppArmadillo]; }; EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; }; EBEN = derive2 { name="EBEN"; version="4.6"; sha256="0gcf5b2viiq69vs8bd8nhk65g9sbzgg212w7zpnz4y6cv9jkk5zz"; depends=[]; }; - EBMAforecast = derive2 { name="EBMAforecast"; version="0.52"; sha256="1809ia0dpkilprv7x19drp1v2qckk0wm596f1i1vl0k37wbhcziv"; depends=[abind Hmisc plyr Rcpp separationplot]; }; - EBPRS = derive2 { name="EBPRS"; version="2.0.1"; sha256="0xrkxfn3iw1gy89inl5k1654dcyjz8ipx2c2kfzi0522zrdpy9ff"; depends=[ROCR]; }; + EBPRS = derive2 { name="EBPRS"; version="2.0.3"; sha256="0fr0vqgsj4lc4kgqsvayzbjg2dzxn40y6nbwrhgx3j94ldl632zq"; depends=[ROCR]; }; EBglmnet = derive2 { name="EBglmnet"; version="4.1"; sha256="0wlscmimj74alcr8k5h1g3alvlpss4g2ah7zkpd42akam3zb4s5z"; depends=[]; }; EBrank = derive2 { name="EBrank"; version="1.0.0"; sha256="1qzhrr3n2zv31mjp224b35324nr9nigzazyfv11j4zhwl1ipf632"; depends=[]; }; ECFsup = derive2 { name="ECFsup"; version="0.1-2"; sha256="0fpcab0gjgsc3sx0plpx068rw3a7kfzs2nyrr477a5m0rcbqf1kh"; depends=[foreach Rcpp RcppArmadillo]; }; @@ -1154,20 +1161,19 @@ in with self; { EDISON = derive2 { name="EDISON"; version="1.1.1"; sha256="12cc13ng5fc4nm0nvqxqplpb2ycz4cln73xqkk85dka2fnpykjc7"; depends=[corpcor MASS]; }; EDMeasure = derive2 { name="EDMeasure"; version="1.2.0"; sha256="1gyv86vip0a3939dbbwz29xkqzncw24r68fzykdjnv3b995510iv"; depends=[dHSIC energy rBayesianOptimization]; }; EDOIF = derive2 { name="EDOIF"; version="0.1.1"; sha256="0lhaajiq01rrvpp2xq2n6ka7pd4xz0spxrf1xv8ljpi2w9kk4p7l"; depends=[boot distr ellipsis ggplot2 igraph simpleboot]; }; - EDR = derive2 { name="EDR"; version="0.6-6"; sha256="10m92p3fy5z2kca4h9awwmvs4pqri92habkvgjvjl5ira09yvyi7"; depends=[sm]; }; EEM = derive2 { name="EEM"; version="1.1.1"; sha256="0w20kakgcpyhfi7fcrss4w67pbaj87hi2scy7g05q3sg2ygac7gj"; depends=[colorRamps ggplot2 R_utils reshape2 sp]; }; - EFA_MRFA = derive2 { name="EFA.MRFA"; version="1.0.7"; sha256="0vblfagcr9zqdzygjrbbgg2pdd9v058ryac5mzy2ry02m534iadm"; depends=[ggplot2 optimbase PCovR psych reshape2 scales]; }; + EFA_MRFA = derive2 { name="EFA.MRFA"; version="1.0.9"; sha256="0id0dhpq9350ax573i769m83fncrd6rlp4qmwvf9jz1lbksighf0"; depends=[ggplot2 optimbase PCovR psych reshape2 scales]; }; EFAutilities = derive2 { name="EFAutilities"; version="2.0.0"; sha256="1vbpz9papk6vvch3kb2qm6nspa4llp4mpck6ky1j8kvkhjzm1za0"; depends=[GPArotation mvtnorm plyr]; }; EFDR = derive2 { name="EFDR"; version="1.0"; sha256="1344ysvrniqn1qv2hx9b9afg9fivccfrj393xy9cqz4j395b6jx0"; depends=[copula doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; }; EFS = derive2 { name="EFS"; version="1.0.3"; sha256="1q8cf8dnxpv5s3lr9145y0wjhak4rz18dzah4xfs5qr4c8nlpl54"; depends=[party pROC randomForest ROCR]; }; - EGAnet = derive2 { name="EGAnet"; version="0.9.0"; sha256="0cb1xjv0m1qxm2slvhs3salxhqjmq71nnqji1nf22yrawsknn2xv"; depends=[corpcor doParallel dplyr fdrtool fitdistrplus foreach ggplot2 ggpubr glasso igraph iterators lavaan MASS Matrix matrixcalc mvtnorm NetworkToolbox OpenMx pbapply plotly plyr psych psychTools qgraph semPlot tidyselect wTO]; }; + EGAnet = derive2 { name="EGAnet"; version="0.9.3"; sha256="1zz7fkr82nxlxs5vzzj3ihcrfb7l6dix5xazljabiilc849x8cas"; depends=[dplyr glasso igraph lavaan Matrix NetworkToolbox plotly qgraph semPlot]; }; EGRET = derive2 { name="EGRET"; version="3.0.2"; sha256="02c9cakj7szywx0r4rylbdnk63b4npqp2i5x1fhxjy0j5bn0hc2f"; depends=[dataRetrieval fields foreach survival truncnorm]; }; EGRETci = derive2 { name="EGRETci"; version="2.0.3"; sha256="1fzcndah890nfd3fg83jhp5lpwb0xfyrccabgvilkrrm4i4x675m"; depends=[binom EGRET]; }; EHR = derive2 { name="EHR"; version="0.1-3"; sha256="1y12j0sjr1zp3bzha1p31f903js674l6ifjccw0y9718sry8dbv2"; depends=[logistf]; }; - EHRtemporalVariability = derive2 { name="EHRtemporalVariability"; version="1.0.2"; sha256="14g1x4zdhzgm122nzsw9gfjqdgz5bcdzcywg0jk6p3df2vi6q6vb"; depends=[dplyr lubridate plotly RColorBrewer scales shiny viridis xts zoo]; }; + EHRtemporalVariability = derive2 { name="EHRtemporalVariability"; version="1.0.4"; sha256="0l91rc1dv63wxasg3n76xlkan9ni70qrznp9h7lhz5v3jafxqd0m"; depends=[dplyr lubridate plotly RColorBrewer scales shiny viridis xts zoo]; }; EIAdata = derive2 { name="EIAdata"; version="0.0.5"; sha256="1dg59shsamd5hrf65p3y6wybskfhw875jf9ssv561b241i6dkn3i"; depends=[XML xts zoo]; }; EILA = derive2 { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; }; - EIX = derive2 { name="EIX"; version="1.0"; sha256="1is5dr5pqinshw2gnlsdq0byldiha076j2yn2z4vfg0pdws9lggc"; depends=[DALEX data_table ggiraphExtra ggplot2 ggrepel iBreakDown MASS Matrix purrr scales tidyr xgboost]; }; + EIX = derive2 { name="EIX"; version="1.1"; sha256="0mz7q35w304mm412x6jqlr65ji7xfkb293iwrqgifgi2pc6f77ny"; depends=[DALEX data_table ggiraphExtra ggplot2 ggrepel iBreakDown MASS Matrix purrr scales tidyr xgboost]; }; EKMCMC = derive2 { name="EKMCMC"; version="0.1.0"; sha256="0sfj6w8780fik0ar9bg8zrxkj10wqagvwrngd58g50fc0z4lhr53"; depends=[numDeriv]; }; EL = derive2 { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; }; EL2Surv = derive2 { name="EL2Surv"; version="1.1"; sha256="0bn2481rf61qnia468y7k95hhazjaghrv919a2y9ar5wcz5nq2kk"; depends=[survival]; }; @@ -1177,22 +1183,21 @@ in with self; { ELT = derive2 { name="ELT"; version="1.6"; sha256="0vbrf912m6f80sqyyrp0z4jhq38fnmcy6hgwy0qh8wgk3p1aqm7c"; depends=[lattice latticeExtra locfit xlsx]; }; ELYP = derive2 { name="ELYP"; version="0.7-5"; sha256="1j2vwcs443x3pf4zypyvbkn8fb5if9b9hf1s821jjjpgach573sc"; depends=[survival]; }; EM_Fuzzy = derive2 { name="EM.Fuzzy"; version="1.0"; sha256="0sz4zkjn6rdzdqmkq6j24bd4sj91y5lan31bldxdfskgz0jpzhbr"; depends=[DISTRIB FuzzyNumbers]; }; - EMA = derive2 { name="EMA"; version="1.4.6"; sha256="0zsc6n149wkn39sa0gw838x6pg3a2g6h4sqd74672sgj4rzx0iip"; depends=[affy AnnotationDbi Biobase biomaRt cluster FactoMineR gcrma GSA heatmap_plus MASS multtest siggenes survival xtable]; }; + EMA = derive2 { name="EMA"; version="1.4.7"; sha256="04srg03ywx78cw4w3apqlbiarz1rdk0mq9a5b7mcrif9kc9bg756"; depends=[affy AnnotationDbi Biobase biomaRt cluster FactoMineR gcrma GSA heatmap_plus MASS multtest siggenes survival xtable]; }; EMAtools = derive2 { name="EMAtools"; version="0.1.3"; sha256="1kzna29kd6s2hgli5azrfz85mbyl1x6knvhhhny2scf7a1fcijsy"; depends=[DataCombine ggplot2 lmerTest sjstats]; }; EMC = derive2 { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[MASS mvtnorm]; }; EMCluster = derive2 { name="EMCluster"; version="0.2-12"; sha256="03s828pczfll5fkwa0w6n4m4wb75paj6x0cxgg9r4qmw8w4ag464"; depends=[MASS Matrix]; }; EMD = derive2 { name="EMD"; version="1.5.8"; sha256="0bvwx5ry41cpj646v93vm50c6qb3m5d7mda9q7znmcr4sdf521j5"; depends=[fields locfit]; }; - EML = derive2 { name="EML"; version="2.0.1"; sha256="1d49ii08nmf16nyh16vlbvywkggwf4ljsdhv89bvfd6f07dly70h"; depends=[digest dplyr emld jqr jsonlite rmarkdown uuid xml2]; }; + EML = derive2 { name="EML"; version="2.0.2"; sha256="05hkm8kf17294by7jhvhbq0cqbpg042xkc5cgx9kzrgld8hxrwqm"; depends=[digest dplyr emld jqr jsonlite rmarkdown uuid xml2]; }; EMMAgeo = derive2 { name="EMMAgeo"; version="0.9.7"; sha256="1wz4zw45xfqbk589cpd188j7619h2ar2czfkisil9x8ksijfixls"; depends=[caTools GPArotation limSolve matrixStats shiny]; }; EMMIXcskew = derive2 { name="EMMIXcskew"; version="0.9-5"; sha256="1ys5kvns6jlw2lk9m6xcy71wx1d581cmphiaxnp3hsqimc8wz7hq"; depends=[MASS mnormt rgl]; }; - EMMIXgene = derive2 { name="EMMIXgene"; version="0.1.1"; sha256="0n23pkn7nfxd9bxhy2fggzadb034g31n4mcwcrvr366d40hqv3iq"; depends=[BH ggplot2 mclust Rcpp RcppArmadillo reshape scales]; }; + EMMIXgene = derive2 { name="EMMIXgene"; version="0.1.3"; sha256="0a5q78s9y6ba1641lrv87kglg39x9wbk5xg7ihzbpl4adrb5sz4f"; depends=[BH ggplot2 mclust Rcpp RcppArmadillo reshape scales]; }; EMMIXmfa = derive2 { name="EMMIXmfa"; version="2.0.11"; sha256="06lfmpw908chhzx512anqacixvvx3y02wm1n4wmpb890rd85n11r"; depends=[]; }; EMMIXskew = derive2 { name="EMMIXskew"; version="1.0.3"; sha256="05y1ivbzbsfab90925l3ahzd3b8y5kjfk3f0p2s9s3sfyxphqah7"; depends=[KernSmooth lattice mvtnorm]; }; EMMLi = derive2 { name="EMMLi"; version="0.0.3"; sha256="1b36kyzvrdljmkysggv8jyaip78pj32ms0xhj2y568hd419lkh2p"; depends=[]; }; EMMREML = derive2 { name="EMMREML"; version="3.1"; sha256="0qwj4jlfhppjxwcjldh49b6idnagazrxybaid3k2c269wvxwvddq"; depends=[Matrix]; }; EMP = derive2 { name="EMP"; version="2.0.5"; sha256="0piagbxk8siagmvzqv2bh12g1y0hy3c0vkxpddlmp7gm3i304rpi"; depends=[ROCR]; }; - EMSC = derive2 { name="EMSC"; version="0.9.0"; sha256="13d915g7iyv724x35i9mr8msy5mhrpqhhva21vdinxbjdy6vdlr9"; depends=[pracma]; }; - EMSHS = derive2 { name="EMSHS"; version="1.0.0"; sha256="1lpv3243z5765b1dihqz9hc3dpw76nwy14mmd4253sw8xpy25w41"; depends=[Rdpack]; }; + EMSC = derive2 { name="EMSC"; version="0.9.1"; sha256="1njqd9ns9d47zpxy5y6xcxhyd3ly5hr3w6q7m5qr2svk9gz1kl50"; depends=[pracma]; }; EMSNM = derive2 { name="EMSNM"; version="1.0"; sha256="0rhaadzhq9jfpnwxfqcsb3yz96rqlwkm165k5n5jxzwxpg1rg2n0"; depends=[]; }; EMSaov = derive2 { name="EMSaov"; version="2.3"; sha256="1hpvwimhkl7za5s8j9n4a8883vy89jrxrhlh0k3cfprnndh4zz05"; depends=[shiny]; }; EMT = derive2 { name="EMT"; version="1.1"; sha256="0m3av1x3jcp3hxnzrfb128kch9gy2zlr6wpy96c5c8kgbngndmph"; depends=[]; }; @@ -1201,7 +1206,7 @@ in with self; { ENMeval = derive2 { name="ENMeval"; version="0.3.0"; sha256="0q5s8nxig8kbr0cblfmf3k20ri19fjs770a0fnzsk0kwlac414hw"; depends=[dismo doParallel foreach maxnet raster]; }; ENiRG = derive2 { name="ENiRG"; version="1.0.1"; sha256="0yjy7g0pia4g18h7mawkxn77dnnqcajnbml21rrv63qwlr347355"; depends=[ade4 fgui gdata miniGUI raster rgrass7 sp]; }; ENmisc = derive2 { name="ENmisc"; version="1.2-7"; sha256="07rix4nbwx3a4p2fif4wxbm0nh0qr7wbs7nfx2fblafxfzhh6jc7"; depends=[Hmisc RColorBrewer vcd]; }; - EPT = derive2 { name="EPT"; version="0.7.3"; sha256="0ymg16wd2dkn6nb0hq43niycydpy5dnadq4011a3815qrkyj7670"; depends=[]; }; + EPT = derive2 { name="EPT"; version="0.7.5"; sha256="1llypf8600mk62cqxnwv5fds8ypfx5is2qkpbp4bh70l3s3lvj31"; depends=[]; }; EQL = derive2 { name="EQL"; version="1.0-1"; sha256="0pa33h0f30l352m6ix296l55lvqxdaib666x2dwy9zx0lmk23w8m"; depends=[lattice ttutils]; }; EQUIVNONINF = derive2 { name="EQUIVNONINF"; version="1.0"; sha256="103wrry0cmikprihmgx8y4kk1pnbjis7rs1xw13w14v902xkr2rq"; depends=[BiasedUrn]; }; ERP = derive2 { name="ERP"; version="2.2"; sha256="17i04rgfj9crnvpi7mf2spwmaw9jgw4kn5fx6x9xbl9cvwwx6q4k"; depends=[corpcor fdrtool irlba mnormt pacman]; }; @@ -1210,7 +1215,6 @@ in with self; { ESEA = derive2 { name="ESEA"; version="1.0"; sha256="06r5lki32mxkznj6yxvlz0ikqcxm3jbaralv4qp9xrw6dy6yyg27"; depends=[igraph parmigene XML]; }; ESG = derive2 { name="ESG"; version="0.1"; sha256="1jw6239asv6lwxrz5v0r5pzg6v500bqxg8361sh4jj67rsrc7g9m"; depends=[]; }; ESGtoolkit = derive2 { name="ESGtoolkit"; version="0.1"; sha256="0r09arhsvamdyahini5yhgc43msdxwvn45l57xbfszahsnr3b3aq"; depends=[CDVine ggplot2 gridExtra Rcpp reshape2 ycinterextra]; }; - ESKNN = derive2 { name="ESKNN"; version="1.0"; sha256="1w43v3q9i7dkx1qwcl5cgh9wdgg5r4s7vfbkk0vcsq9qd8nbcvfy"; depends=[caret]; }; ESTER = derive2 { name="ESTER"; version="0.2.0"; sha256="1jiyqq5hgqc754r434sik9jnlpw66xz56cjdf5ig95qkffzsg224"; depends=[brms cowplot doParallel dplyr foreach ggplot2 lme4 magrittr rlang tidyr]; }; ETAS = derive2 { name="ETAS"; version="0.4.6"; sha256="02xknf7acpha4y2mwn9q974dr2d75nw48wx28i7gprqc7hf6rcsw"; depends=[fields goftest lattice maps Rcpp spatstat]; }; ETC = derive2 { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; }; @@ -1219,16 +1223,18 @@ in with self; { EW = derive2 { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; }; EWGoF = derive2 { name="EWGoF"; version="2.2.2"; sha256="19gd9grjjdv6hilqj41g5qhz7m0ga40q88clwggbp5f0f1yd5sym"; depends=[Rcpp]; }; EWOC2 = derive2 { name="EWOC2"; version="1.0"; sha256="1x3l332pmh69kl0c1rka264mi69avdm938mzd79ck4y3qcgn07vr"; depends=[MASS rjags]; }; + EWS = derive2 { name="EWS"; version="0.1.0"; sha256="04bsl0s690k2wm7jnvgihj5r1fd1r3s2547j1sgl0zm8yvia2l8x"; depends=[numDeriv]; }; EXRQ = derive2 { name="EXRQ"; version="1.0"; sha256="1iqsr52sl2j5q03122a7rsp6n6a2bkysk2r908c89l36gk4sj2i5"; depends=[mnormt quantreg]; }; EZtune = derive2 { name="EZtune"; version="2.0.0"; sha256="1arrd9zkssb8ixx7r4nxwayksz1mk7jkvlcbm264pv9ya6kh3yrh"; depends=[ada e1071 GA gbm optimx rpart]; }; - Eagle = derive2 { name="Eagle"; version="2.1.1"; sha256="0sx9fg3awv086861jyj18a814m6jdckzdvds6375wyd5cvi2ifqd"; depends=[data_table ggplot2 ggthemes matrixcalc mmap R_utils Rcpp RcppEigen shiny shinyBS shinyFiles shinyjs shinythemes]; }; + Eagle = derive2 { name="Eagle"; version="2.2"; sha256="04r2ii4wdxwmx82qd2csiiy6kjim6zmjnp0851qhz9iry84f0g5s"; depends=[data_table ggplot2 ggthemes matrixcalc mmap R_utils Rcpp RcppEigen shiny shinyBS shinyFiles shinyjs shinythemes]; }; EasyABC = derive2 { name="EasyABC"; version="1.5"; sha256="17qv6y8sf2iwwqcv5wfg6sii259gv5jyr72dnfpir2bw78wb3mqx"; depends=[abc lhs MASS mnormt pls tensorA]; }; EasyHTMLReport = derive2 { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc ggplot2 knitr markdown reshape2 scales xtable]; }; EasyMARK = derive2 { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs194dnkx996khfcpxj6jhz355dp35z7c9d"; depends=[coda doParallel foreach MASS random rjags stringr]; }; - EasyMx = derive2 { name="EasyMx"; version="0.2-1"; sha256="03yshzb4wh3n667z9lmrwsz16chpgnl8qv3qlx425mj5iiyv626z"; depends=[OpenMx]; }; + EasyMx = derive2 { name="EasyMx"; version="0.2-12"; sha256="00wj08nwv5zi5d4a1fss40f4cms4svam1hmmxvh60hvc55ygsc3z"; depends=[OpenMx]; }; EbayesThresh = derive2 { name="EbayesThresh"; version="1.4-12"; sha256="07a2dd3za2dc81n6m2xy794sclp3yw7f46lg1igaflh7m9407198"; depends=[wavethresh]; }; - Ecdat = derive2 { name="Ecdat"; version="0.3-4"; sha256="07c6cv8dnz7781i9aavr0gx573nkmqam5v157kkq7478ia1cccpb"; depends=[Ecfun]; }; - Ecfun = derive2 { name="Ecfun"; version="0.2-0"; sha256="1clxwmwd4lmhh7zqspqgn13vrzg40lbqzb0a7b90qla4hk9r4zm4"; depends=[fda gdata jpeg MASS RCurl stringi TeachingDemos tis XML xml2]; }; + Ecdat = derive2 { name="Ecdat"; version="0.3-7"; sha256="0isaysjagpx10fq47xs57ywr5jidi62g18zjv5a1jd3c0wswxbkv"; depends=[Ecfun]; }; + Ecfun = derive2 { name="Ecfun"; version="0.2-2"; sha256="0gal91rhyrgpdxalnsy9pn7s0pj444zscv1m7pdgfzlnqcmf1vlf"; depends=[BMA fda gdata jpeg MASS mvtnorm RCurl stringi TeachingDemos tis XML xml2]; }; + EcoDiet = derive2 { name="EcoDiet"; version="1.0.0"; sha256="19x2ypmsw6jnq1s0nqk3pdkwi5g3g92r6fgxrxlnyvd0jqi9l8b3"; depends=[coda ggplot2 rjags]; }; EcoGenetics = derive2 { name="EcoGenetics"; version="1.2.1-5"; sha256="1953q374msvdw91m2nagxkwh5r9gnq5qss6l6mf34hayq3kwm8s9"; depends=[d3heatmap doParallel edgebundleR foreach ggplot2 htmlwidgets igraph jsonlite magrittr networkD3 party pheatmap plotly raster reshape2 rgdal rkt SoDA sp]; }; EcoHydRology = derive2 { name="EcoHydRology"; version="0.4.12.1"; sha256="075kgy6cxppkclk6nj5xs1f5yv9w8cpr09xwhf2101a6wswknb88"; depends=[DEoptim operators topmodel XML]; }; EcoIndR = derive2 { name="EcoIndR"; version="1.6"; sha256="1pichrwny5hyb19919ldbgkdxp1s6vs03yw0x43ww13ldi314zbn"; depends=[rgeos]; }; @@ -1238,8 +1244,8 @@ in with self; { EcoVirtual = derive2 { name="EcoVirtual"; version="1.1"; sha256="1aryl2sb5ak390lgnm427ilm6xv9lmsjhwdnapzc033zvqb099gj"; depends=[]; }; Ecohydmod = derive2 { name="Ecohydmod"; version="1.0.0"; sha256="0imkzjqp3g28l42jz5m4p85wg5rawmn9hy1wys9xndnaliv6d7r2"; depends=[]; }; EconDemand = derive2 { name="EconDemand"; version="1.0"; sha256="1slpwiaxj7w21zdri9myrzwbwzl62m3cnp0g4fr2rkdlzgb6j5yj"; depends=[]; }; - EdSurvey = derive2 { name="EdSurvey"; version="2.4.0"; sha256="1h27q1qml1ba1b39ymg2ma48738h3027hg5qpxpgkz01xvlzqii3"; depends=[car data_table Formula glm2 haven LaF lfactors lme4 MASS Matrix NAEPprimer quantreg RColorBrewer readr readxl rvest stringi stringr tibble wCorr WeMix xml2 xtable]; }; - EditImputeCont = derive2 { name="EditImputeCont"; version="1.1.4"; sha256="1gqi3mnxnhsynk63hr0ny93m60xq4a0sjc5x0p67l6xybn2fk011"; depends=[editrules igraph Rcpp]; }; + EdSurvey = derive2 { name="EdSurvey"; version="2.5.0"; sha256="09zh0r93a0qkw4glnyrqzxjc13fai5nfjzd9sq06wnl6i9750bmq"; depends=[car data_table Formula glm2 haven LaF lfactors lme4 MASS Matrix NAEPprimer quantreg readxl tibble wCorr WeMix xtable]; }; + EditImputeCont = derive2 { name="EditImputeCont"; version="1.1.6"; sha256="1hpm198awl30i7vbg1jk578s2i3f2kskirb33xvampcwn8mz0nhh"; depends=[editrules igraph Rcpp]; }; EffectLiteR = derive2 { name="EffectLiteR"; version="0.4-4"; sha256="17mhp4acj0myr2b54hgbb3wi5j6a6q999nqr9lwcbx3plyrwlljl"; depends=[car foreign ggplot2 lavaan lavaan_survey nnet shiny survey]; }; EffectStars = derive2 { name="EffectStars"; version="1.9-1"; sha256="131w5bdc615gaa2czi4wyc2f96jcg24ahcmggajrvyhxmi6rag5x"; depends=[VGAM]; }; EffectStars2 = derive2 { name="EffectStars2"; version="0.1-3"; sha256="0yh4krqjh1jb7gjxb9z4f5bzarps0g9jfqbbva782a881dhcdl1x"; depends=[miscTools VGAM]; }; @@ -1247,15 +1253,14 @@ in with self; { EffectsRelBaseline = derive2 { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; }; EfficientMaxEigenpair = derive2 { name="EfficientMaxEigenpair"; version="0.1.4"; sha256="1s0i9a2vk2g4f5gadsvzjfkw91hcjsrbyjg2vgnj1v17xrwgp40w"; depends=[]; }; EleChemr = derive2 { name="EleChemr"; version="1.1.0"; sha256="109dv7ayg5nm6zjd70dp8h5qqwrijikymzgb41dl8vx4pqhv43v3"; depends=[ggplot2]; }; - ElemStatLearn = derive2 { name="ElemStatLearn"; version="2015.6.26.2"; sha256="1ynp3fxzi095im584bgw9v8pzgs9p2v64csyhmf0m2hqyrr4myd0"; depends=[]; }; EloChoice = derive2 { name="EloChoice"; version="0.29.4"; sha256="1g8ivvnv16c2gniwd9xa9z89bm4rac0nrg3mcg1risgf9yk4rgm5"; depends=[psychotools Rcpp RcppArmadillo Rdpack]; }; EloOptimized = derive2 { name="EloOptimized"; version="0.3.0"; sha256="185vh8h6r5wqcbaq3glq8k3fr8jp6h3q2h2ly54agi6bi3fvbs05"; depends=[BAMMtools dplyr lubridate magrittr reshape2 rlang rlist]; }; - EloRating = derive2 { name="EloRating"; version="0.46.10"; sha256="03cnbmm18cfh0awg221j478sb5r4r1v4hcilj5chr8qr4i1xmjvz"; depends=[network Rcpp RcppArmadillo Rdpack sna zoo]; }; + EloRating = derive2 { name="EloRating"; version="0.46.11"; sha256="09nh3ia4s3c9yjhw0f0haqb26fryfc4lf9rgfcbqqzzwgdr1invj"; depends=[network Rcpp RcppArmadillo Rdpack sna zoo]; }; ElstonStewart = derive2 { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[digest kinship2]; }; - EmbedSOM = derive2 { name="EmbedSOM"; version="1.9.1"; sha256="050j943774zmay6b62rqsb9ifd55cy5p77l0fkrb7b42jgxdqwpy"; depends=[]; }; + EmbedSOM = derive2 { name="EmbedSOM"; version="2.1.1"; sha256="1w61dni4vsglxqdhwdy5dcmzb6hx1wb9fhfki8wmal1yaza23ljy"; depends=[FNN ggplot2 igraph Matrix Rtsne umap uwot]; }; EmiStatR = derive2 { name="EmiStatR"; version="1.2.2.0"; sha256="0xwmwbybiyb9688l5n98vir3rwbbjgpw5qb25p20lhlj1pqg95w1"; depends=[doParallel foreach lattice xts zoo]; }; - EmissV = derive2 { name="EmissV"; version="0.665.1.0"; sha256="1xzpsr43pyvmvzbcw66cxv7qs9i8s7pg1w90l3ivx9mz7p8bfz8a"; depends=[data_table lwgeom ncdf4 raster sf sp units]; }; - EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="2.0.1"; sha256="0k37lncjq14py3fvcr925gh66i31aphkniv5dn86gibxzdvbjnqc"; depends=[ggplot2 gridExtra]; }; + EmissV = derive2 { name="EmissV"; version="0.665.2.1"; sha256="1525h28xwwq94maj07rnx13l7i9q7wcrssld5q99741clvzrygk0"; depends=[data_table ncdf4 raster sf sp units]; }; + EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="2.0.2"; sha256="10as0xl24w9pap26cz21nqgysba70l9s4qxfbia7x0wfsz2s25jf"; depends=[ggplot2 gridExtra]; }; EncDNA = derive2 { name="EncDNA"; version="1.0.2"; sha256="0wy2cmcvyqjhg5mqbvdzmihfv8swx7ym2n9mjdqgx0kgnc7k614y"; depends=[Biostrings]; }; EnergyOnlineCPM = derive2 { name="EnergyOnlineCPM"; version="1.0"; sha256="1a3wvclqdwcvq5inhliwjnd7xzqbjvzs8h8ncy6qlhjq6s5n7nm8"; depends=[energy MASS]; }; EngrExpt = derive2 { name="EngrExpt"; version="0.1-8"; sha256="0zclvckj2i7j4kfs58hcjcl722vl2y6dcnjz238cjfgwv279gqhp"; depends=[lattice]; }; @@ -1273,16 +1278,16 @@ in with self; { EnviroPRA = derive2 { name="EnviroPRA"; version="1.0"; sha256="0yirh3vy7wap0qmm3kvjz9y68gcvp9i8qshv80wh8aijxwklpr8n"; depends=[fitdistrplus kSamples MASS truncdist]; }; EnviroStat = derive2 { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; }; Epi = derive2 { name="Epi"; version="2.40"; sha256="046y10vwks5y84pzccmrn6d4pd6qz70imvp1hw5ywp8fnwzfh4g5"; depends=[cmprsk data_table etm MASS Matrix mgcv numDeriv plyr survival zoo]; }; - EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.12.0"; sha256="1i84fslz8sdngvkv34zhzjwzrzzxx6f4s31p8f5smmf028jlpyys"; depends=[]; }; - EpiCurve = derive2 { name="EpiCurve"; version="2.2-1"; sha256="091q03lak2nfk83s10004qnwdng0gl4z92pc174mc41wns7f5d8v"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales timeDate]; }; - EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.0"; sha256="0hpysjl8wfgylbp4ddxmi5msvlp1w70c6pxggc2bwdgap3s127f3"; depends=[deSolve ggplot2 reshape2]; }; + EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.13.0"; sha256="1m9gawd0fv0pl9q8n9rnid8shdy88kxw4hr5fvvf9ifngf8ffmqa"; depends=[]; }; + EpiCurve = derive2 { name="EpiCurve"; version="2.3-1"; sha256="0yi49mdij8gx90kbppxdkm0xzaxhr9i7bpgis64vbx4bpy4ynxbb"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales tibble timeDate]; }; + EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.1"; sha256="0m6yay3r7dqih19f76wxwgq6dh9p1zmp5d9ilj9nd262q61jcy53"; depends=[deSolve ggplot2 reshape2]; }; EpiEstim = derive2 { name="EpiEstim"; version="2.2-1"; sha256="1a21mskjvyz9qdvl3kkf0p15zn1nx1a49c5djp1lacrn6h7g8k9p"; depends=[coarseDataTools coda fitdistrplus ggplot2 gridExtra incidence reshape2 scales]; }; - EpiILM = derive2 { name="EpiILM"; version="1.4.2"; sha256="16vml2p7c4nv0lfis661x7b9wimrni1ncpa256dh99cps9508j28"; depends=[coda]; }; + EpiILM = derive2 { name="EpiILM"; version="1.5"; sha256="0726sb6jisicphchzbcswh8nkgx12cb6sfgwa4ll35nm3vrb5xb1"; depends=[adaptMCMC coda LaplacesDemon]; }; EpiILMCT = derive2 { name="EpiILMCT"; version="1.1.6"; sha256="0qhpmh28zmgqnsyfxgv06g2slix12nn2pglgpvagx2q40rs4fann"; depends=[coda igraph]; }; EpiModel = derive2 { name="EpiModel"; version="1.7.5"; sha256="0w7r26pcsw785rhd17j0sp840xa4mpsfiq04vk36afv27mgfx6wy"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm]; }; EpiReport = derive2 { name="EpiReport"; version="0.1.0"; sha256="1bfh7nrwmplsk7whvmsf0wxg795xrwvarxw974v58mjb282yp87s"; depends=[dplyr extrafont flextable ggplot2 knitr officer png rmarkdown tidyr zoo]; }; EpiSignalDetection = derive2 { name="EpiSignalDetection"; version="0.1.1"; sha256="04bagnx9fs0r3167hmwgc389fl5hq7l4j6kdjjmi360vcaimx9qi"; depends=[dplyr DT ggplot2 ISOweek knitr pander rmarkdown shiny surveillance]; }; - EpiStats = derive2 { name="EpiStats"; version="1.3-1"; sha256="07iz6hhfcawfcb1n9znpafgmmgjgw7pikr71hh5c7f802k1qffw7"; depends=[dplyr epiR]; }; + EpiStats = derive2 { name="EpiStats"; version="1.4-1"; sha256="1i9ymqf0p8wplbmbq4j0ixprjvg22l4z05imxhfj087p3p2sqq8w"; depends=[dplyr epiR]; }; EpistemicGameTheory = derive2 { name="EpistemicGameTheory"; version="0.1.2"; sha256="0b2gnrvhlsw85qv63ib32pj55l7w63wgvbrj5rb209g6h46fby8m"; depends=[lpSolve]; }; Eplot = derive2 { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; }; Equalden_HD = derive2 { name="Equalden.HD"; version="1.2"; sha256="1lwqnm2xg7x79xajjb4fx5b5yaqs0rn8myb2h52pfgm0v37lzvmb"; depends=[]; }; @@ -1298,12 +1303,13 @@ in with self; { EvalEst = derive2 { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd0arvw7bym6naq45f5cravywg8c37n9v967x"; depends=[dse setRNG tfplot tframe]; }; EvaluationMeasures = derive2 { name="EvaluationMeasures"; version="1.1.0"; sha256="0b65y4rb650hhlgc18z0sm0danrrawqkazzdl9krl877djrgx87g"; depends=[]; }; Evapotranspiration = derive2 { name="Evapotranspiration"; version="1.14"; sha256="1v681m7zyhpydyx1mbkk4iwxkkf0mx1317c3z2v465zg9bssp3c7"; depends=[zoo]; }; + EventDetectGUI = derive2 { name="EventDetectGUI"; version="0.3.0"; sha256="02gwgbp692cfmf933jg1f7h4gghhc1v2cswz7rpcazm8h39mc4wh"; depends=[DT EventDetectR ggplot2 plotly shiny shinyBS shinydashboard shinyjs XML]; }; EventDetectR = derive2 { name="EventDetectR"; version="0.3.4"; sha256="1zyv9k0l1s5djvp5hbbrlz96gw3126n43nm2iv6xsil90k2fp827"; depends=[forecast ggplot2 gridExtra imputeTS neuralnet]; }; EventStudy = derive2 { name="EventStudy"; version="0.36"; sha256="0pd7qbpj4agaqc57lianqinnardyh929nr8ammmpal191v2i7hmw"; depends=[curl data_table dplyr ggplot2 httr jsonlite magrittr miniUI openxlsx purrr RColorBrewer readr rlang rstudioapi scales shiny stringr testthat tidyquant tidyr]; }; EvoRAG = derive2 { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; }; EvolutionaryGames = derive2 { name="EvolutionaryGames"; version="0.1.0"; sha256="1v6xpxk4kbjbmv8vh517rd76gyrd9znpxqdh4jqz8lvdpnpla4wv"; depends=[deSolve geometry ggplot2 interp MASS reshape2 rgl]; }; Evomorph = derive2 { name="Evomorph"; version="0.9"; sha256="1br2fyggwz2mxpic8sk384xq1lpbpv0j5gf6xyzhkn2n7kfpf6d5"; depends=[geomorph ggplot2 reshape2 stringr]; }; - ExPanDaR = derive2 { name="ExPanDaR"; version="0.5.0"; sha256="1xnikvdr2a1xahqg6rrpbsf269yppxg47b8ncdr8b3hiy1a5piwr"; depends=[corrplot dplyr DT ggplot2 kableExtra lfe lmtest multiwayvcov openssl rio scales shiny shinycssloaders stargazer tictoc tidyr zip]; }; + ExPanDaR = derive2 { name="ExPanDaR"; version="0.5.1"; sha256="10jgwvq04cf17kdsjggyvnvmkialgcl38r53k5vj64h2zfwyj2wx"; depends=[corrplot dplyr DT ggplot2 kableExtra lfe lmtest multiwayvcov openssl rio rlang scales shiny shinycssloaders stargazer tictoc tidyr zip]; }; ExPosition = derive2 { name="ExPosition"; version="2.8.23"; sha256="0x9400ggmgrnaish0cfgnyvw549g4ibfv9aj6vzq7j68n58vq405"; depends=[prettyGraphs]; }; Exact = derive2 { name="Exact"; version="2.0"; sha256="142yiz9bz1abgpdqkzgdsz3bp3dwbjlmyg29a62djb8630aicgyn"; depends=[]; }; ExactCIdiff = derive2 { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; }; @@ -1314,6 +1320,7 @@ in with self; { ExpDes = derive2 { name="ExpDes"; version="1.2.0"; sha256="0zisgb129fdg2igc3gp8jkrv9bz2r7bz2i20ap07mqlvhq88515a"; depends=[stargazer]; }; ExpDes_pt = derive2 { name="ExpDes.pt"; version="1.2.0"; sha256="0fny5hcg76bm04vpbkvlwzw78m5gj28rvich7k1hhrhlxm3xi3hf"; depends=[stargazer]; }; ExpRep = derive2 { name="ExpRep"; version="1.0"; sha256="0spv3wd9c8sr338n5kdzrs28yh7s90fl70wsdnkibmlxhnh3ay3g"; depends=[]; }; + ExpertChoice = derive2 { name="ExpertChoice"; version="0.2.0"; sha256="1pd4v240ywc4wzh249axxb4kz5dccizc08jdjnaygz35hjdg5hvj"; depends=[DoE_base dplyr far purrr rlist]; }; ExplainPrediction = derive2 { name="ExplainPrediction"; version="1.3.0"; sha256="14m3b9fsrpfpr8avsnhl8b3bzk2xlhwgkwag5iq8bj7bzvv4yck1"; depends=[CORElearn semiArtificial]; }; ExtMallows = derive2 { name="ExtMallows"; version="0.1.0"; sha256="0903jslp74s1vzbklq88y2dm0dgkhd6g77b7aipxam98933k0hzz"; depends=[]; }; ExtractTrainData = derive2 { name="ExtractTrainData"; version="5.0.3"; sha256="0a47b3zb4igx39jn609ll9s4zwbpid723xncdjxrmamdp8dvv8r6"; depends=[raster rgdal rgeos]; }; @@ -1324,47 +1331,47 @@ in with self; { FADA = derive2 { name="FADA"; version="1.3.5"; sha256="0srv3rghbkgyxbcjc1v68c5qgcir1d618skpc8imfmdaz9pnxchn"; depends=[corpcor crossval elasticnet glmnet MASS matrixStats mnormt sda sparseLDA]; }; FAMILY = derive2 { name="FAMILY"; version="0.1.19"; sha256="1912l2zj2cmh8yx8lkg8fpgvfddn6wbi1vrr4yx04mh73gk1s5mk"; depends=[pheatmap pROC]; }; FAMT = derive2 { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[impute mnormt]; }; - FAMoS = derive2 { name="FAMoS"; version="0.2.0"; sha256="08xyj7bnkckyk0d0kxkz7nqm7ib5by0wqmx54pwk3ak4mmh9arzi"; depends=[future R_utils]; }; - FAOSTAT = derive2 { name="FAOSTAT"; version="2.0"; sha256="06z8c964sf73ld4v9vybqjsdxskxp3ssyv0a3mpcs9la5y7n9jaz"; depends=[classInt data_table ggplot2 labeling MASS plyr RJSONIO scales]; }; + FAMoS = derive2 { name="FAMoS"; version="0.3.0"; sha256="14gr9wv9bpibk0rrzzwijvdncx1fgnpbv55nqzbb4jhq7fdckmsa"; depends=[future R_utils]; }; + FAOSTAT = derive2 { name="FAOSTAT"; version="2.1.2"; sha256="11pmbjz4vkg8a68qfkbqlhnggln1vp8m5pllg2y7wwxxa4ld71qk"; depends=[classInt data_table ggplot2 labeling MASS plyr RJSONIO]; }; FARDEEP = derive2 { name="FARDEEP"; version="1.0.1"; sha256="0blvjakcpkh9vpxryk7qyaqnija0r375ckv37kjlr34xg8pg9qnm"; depends=[nnls preprocessCore]; }; FASeg = derive2 { name="FASeg"; version="0.1.9"; sha256="0lazx8dyycyycr8467m9rkxkxhp4r2w737kpkb40y59wncmbvkik"; depends=[]; }; - FAdist = derive2 { name="FAdist"; version="2.2"; sha256="0nw3w4g7y846bm57xyjnb13g7z746kxf8mb2hnljwwsypcg6i2n8"; depends=[]; }; + FAdist = derive2 { name="FAdist"; version="2.3"; sha256="0vy9yavg5apawjfvch5a7abrmsnx36zhlk8jff3dvcx409lykrrn"; depends=[]; }; FAmle = derive2 { name="FAmle"; version="1.3.5"; sha256="1j6x5bbxnrwp9d6xlxc861xslawzfqhi3d11nphyc97afsz0ymnr"; depends=[mvtnorm]; }; FAwR = derive2 { name="FAwR"; version="1.1.1"; sha256="1hzgaxinq81v4f9743lnlj3bkby8pwmaw1gq0fb4yxazav8y7ihy"; depends=[glpkAPI lattice MASS]; }; FBFsearch = derive2 { name="FBFsearch"; version="1.1"; sha256="17fi501prnwwy5dh7kv7cx2zlz2dknjj542ga024s7jvg7i2rhg0"; depends=[Rcpp RcppArmadillo]; }; FBN = derive2 { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; }; FCGR = derive2 { name="FCGR"; version="1.0-0"; sha256="015nnnc9fasx0qjrc3lbxv14rqwyx36xzsw9076grwm5pqahrdsb"; depends=[kerdiest KernSmooth MASS mgcv nlme pspline sfsmisc]; }; FCMapper = derive2 { name="FCMapper"; version="1.1"; sha256="1yjh8rs65nqslvwv7x4rif469zds41s7v3vhq6pca1y17kvj2in1"; depends=[igraph]; }; - FCSlib = derive2 { name="FCSlib"; version="1.0.0"; sha256="0wgk3h03w5wlr8anlp779wqj7ivnlw3brlahc82mb92nq3yc0k5d"; depends=[tiff]; }; + FCPS = derive2 { name="FCPS"; version="1.2.0"; sha256="0npgr3vd7f5xa02apzyyxbbvr5h6s57hii8sirp76avc1qz2371m"; depends=[DataVisualizations ggplot2 mclust]; }; + FCSlib = derive2 { name="FCSlib"; version="1.1.0"; sha256="0sxpzcj6lard3xf24pq42iaryc3idccb076y69swckm0ixhrg85w"; depends=[tiff]; }; FD = derive2 { name="FD"; version="1.0-12"; sha256="0xdpciq14i8rh7v6mw174hip64r7mrzhx7gwri3vp9y7a1380sbi"; depends=[ade4 ape geometry vegan]; }; - FDGcopulas = derive2 { name="FDGcopulas"; version="1.0"; sha256="1i86ns4hq74y0gnxfschshjlc6if3js0disjb4bwfizaclwbw3as"; depends=[numDeriv randtoolbox Rcpp]; }; FDRSeg = derive2 { name="FDRSeg"; version="1.0-3"; sha256="0dh6m5vlx664kryh56jzi3zxydjwa5217nhbwn6adp0q5qdh6d8a"; depends=[Rcpp stepR]; }; FDRreg = derive2 { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda mosaic Rcpp RcppArmadillo]; }; FDRsampsize = derive2 { name="FDRsampsize"; version="1.0"; sha256="0g8kawzyi9x5yndvh330wzqw6rvcnprwq56ngd0j6z51hvvw8qhw"; depends=[]; }; + FDX = derive2 { name="FDX"; version="1.0.1"; sha256="1za2w2xykbfy2pvxxr9xq2lblk65mxrskx80cdcr00ivzj1jx2bn"; depends=[DiscreteFDR PoissonBinomial pracma Rcpp]; }; FDboost = derive2 { name="FDboost"; version="0.3-2"; sha256="1ahdq49ijj4j2yykmzbpgrjn0sm09nzmd33k317y157hnf6zyxvs"; depends=[gamboostLSS MASS Matrix mboost mgcv stabs zoo]; }; FENmlm = derive2 { name="FENmlm"; version="2.4.3"; sha256="1a205a4iv54haixanyzx210lzqg7cnryjvqayvkdj1lhmdql4anw"; depends=[Formula MASS numDeriv Rcpp]; }; FEprovideR = derive2 { name="FEprovideR"; version="1.1"; sha256="02hfdk9qhaq4y19p700w2i7qsdp4z2kyww0pr0pijfivkqks0vpi"; depends=[ggplot2 Matrix poibin]; }; FFD = derive2 { name="FFD"; version="1.0-6"; sha256="19yqb45qj54fmjkqfjbcqsx3wz6fk8inrqif9ds93xjkm6aaiqgp"; depends=[R2HTML tkrplot]; }; - FFTrees = derive2 { name="FFTrees"; version="1.4.0"; sha256="0s2h81vdh8d41kwz5ja831q11wrb7ywdd7aq46x3y9sgg3aabd44"; depends=[caret circlize e1071 igraph pROC progress randomForest rpart stringr yarrr]; }; FField = derive2 { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; }; FGSG = derive2 { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; }; FGalgorithm = derive2 { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; }; - FHDI = derive2 { name="FHDI"; version="1.3.2"; sha256="0s1g2ixdfajh99rslpp2p60297f6xcsdnbagqd6zzsl8wywjl9z4"; depends=[]; }; + FHDI = derive2 { name="FHDI"; version="1.4.0"; sha256="1plc4klvjid5ara6ay081xamxr14j3ldgqdm6ni8543cv07zwd74"; depends=[]; }; FHtest = derive2 { name="FHtest"; version="1.4"; sha256="1wsn0j9ydpp9nfswiqg21p09kgkvaq8fh0y0h8syqgizah7i8vs2"; depends=[interval KMsurv MASS perm survival]; }; FI = derive2 { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; }; FIACH = derive2 { name="FIACH"; version="0.1.2"; sha256="151lc5m8pb7l07kxljm32zy5kd7a4zr5vgsgwsx7ywhijh0r0585"; depends=[Rcpp RcppArmadillo RNiftyReg tkrplot]; }; - FILEST = derive2 { name="FILEST"; version="1.0.3"; sha256="0i622rfr9sb22c922kk0gg4l1akx54m6zx7wy3w1p5xrr1zjjyvp"; depends=[KRIS rARPACK]; }; FIT = derive2 { name="FIT"; version="0.0.6"; sha256="1nkjms9cvigc9sjha1krzhd3nmwsfh8pi0f1plf5k8zpb773zzb2"; depends=[gglasso MASS Rcpp RcppEigen XML]; }; FITSio = derive2 { name="FITSio"; version="2.1-0"; sha256="021xmbavigg70m96xw1bvsdasi5yj2wmafgb6xw4b09fmyv9hvjp"; depends=[]; }; FKF = derive2 { name="FKF"; version="0.1.5"; sha256="1qzf7y3f4xfirjkm795rcxckjbw6sn7xpilhkyvayqm2vyhf7518"; depends=[RUnit]; }; FKSUM = derive2 { name="FKSUM"; version="0.1.3"; sha256="1zz4hyqlq4517jksgx3jfz9m4gfnp49q272n0m4y9yabsd5fdv3a"; depends=[MASS rARPACK Rcpp RcppArmadillo]; }; - FLAME = derive2 { name="FLAME"; version="1.0.0"; sha256="0va9mbwlnvr64hii203rmq4x3izpix0x36kpsns43yb9wdqq70hv"; depends=[dplyr gmp lattice latticeExtra reticulate rlang RPostgreSQL RSQLite]; }; + FLAME = derive2 { name="FLAME"; version="2.0.0"; sha256="067yy0b668pj25a0jscpjb98in22048vxs249a7pa4rs2c1cyai9"; depends=[devtools dplyr glmnet gmp magrittr mice rlang tidyr xgboost]; }; FLLat = derive2 { name="FLLat"; version="1.2-1"; sha256="0306bpwp2az4x4m5sv88hlh7vs0y5isfby7lxrn2gjnk76gg6mw1"; depends=[gplots]; }; FLR = derive2 { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; }; FLSSS = derive2 { name="FLSSS"; version="8.5.6"; sha256="1c6j54ihc385m1f0r86yb83zqv2myfskq48bh9dcynlnc9crs428"; depends=[Rcpp RcppParallel]; }; FLightR = derive2 { name="FLightR"; version="0.4.9"; sha256="0rcnkifq6mi1i5xhk6qy2gl3bry269y4isfr8phl3car0yj39lw1"; depends=[bit CircStats circular fields GeoLight ggmap ggplot2 ggsn maptools mgcv nlme raster RcppArmadillo rgdal rgeos sp truncnorm]; }; FMAdist = derive2 { name="FMAdist"; version="0.1.0"; sha256="0aa4sw93ia6cp386hrq6x448x4w0p6k198rjaqs474j25gqgxrv0"; depends=[EnvStats extraDistr fitdistrplus MASS quadprog STAR]; }; FMC = derive2 { name="FMC"; version="1.0.0"; sha256="1pfqxx7slgcmw4al7i8hy59f4han6b0b7b5az7yh1mscdnghl9bj"; depends=[minimalRSD]; }; + FMCCSD = derive2 { name="FMCCSD"; version="1.0"; sha256="0c50km5ba6biq9p3mycxhy00ij2gr6y5zf3q8ycq0g1mbk8ybfb7"; depends=[numDeriv orthopolynom Rcpp RcppArmadillo splines2]; }; FME = derive2 { name="FME"; version="1.3.6.1"; sha256="065y6r0cwvj1q5i3f88icdf4i47bz33hbhln42gyzqhlavvnj35f"; depends=[coda deSolve MASS minpack_lm minqa rootSolve]; }; FMP = derive2 { name="FMP"; version="1.4"; sha256="0w11a78nz4n7zih9h00xkv7prsy9hlxphbpa7hpnbvq9r98g08qm"; depends=[]; }; FMStable = derive2 { name="FMStable"; version="0.1-2"; sha256="00viigpqfbqc4hyl9cwicbwqf2ksjak28qrqaa16jhbqz93j4fck"; depends=[]; }; @@ -1374,52 +1381,57 @@ in with self; { FOCI = derive2 { name="FOCI"; version="0.1.1"; sha256="1q5zchbm7h5jizk5rl8xr31bdx9h88mzf8ih8kdqmsvpk1ckk13f"; depends=[dplyr magrittr proxy RANN]; }; FPCA2D = derive2 { name="FPCA2D"; version="1.0"; sha256="18bb90ppd9gd8pg9jxfyfkmlsaqk8w25fgaj9fk18ybm2nhsxqm6"; depends=[corpcor]; }; FPCA3D = derive2 { name="FPCA3D"; version="1.0"; sha256="1hrk9caad2s76dx59clxhia45a85khk1y2ii7955f336x55q34a5"; depends=[]; }; + FPDclustering = derive2 { name="FPDclustering"; version="1.4.1"; sha256="19n6fx3fyvnlwh8w8bi8ki3wfmvzdlxl557cj3a9y1wmm3fv2drz"; depends=[cluster ExPosition mvtnorm rootSolve ThreeWay]; }; FPV = derive2 { name="FPV"; version="0.5"; sha256="0pxa8lbcxw2hx2n0frkx0pdndlcfm7gnh9qay9q53cf5gqzzwvvc"; depends=[FuzzyNumbers FuzzyNumbers_Ext_2]; }; FRACTION = derive2 { name="FRACTION"; version="1.0"; sha256="0g25dzsbharsq8bzfka96zccaqppdclax24mz5m080ddg4y8zj49"; depends=[]; }; FRAPO = derive2 { name="FRAPO"; version="0.4-1"; sha256="0mjcrplxr0cyybp5hzzwbq5j03w0f3iiiv1yk7mdqr5gb368dchq"; depends=[cccp Rglpk timeSeries]; }; FRCC = derive2 { name="FRCC"; version="1.0"; sha256="1g1rsdqsvwf7wc16dj16y6r0347j8jsv5l1pxvj1h0579zinaf2b"; depends=[calibrate CCP corpcor MASS]; }; FREQ = derive2 { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; }; FRESA_CAD = derive2 { name="FRESA.CAD"; version="3.1.0"; sha256="1gi637fwfpwbghms96bmfqs7zirjskd9hxiw43s0765h3ypjqwx1"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; }; - FRK = derive2 { name="FRK"; version="0.2.2"; sha256="0m0ngxanyq19myzza4fb75k9vb67mv17iny847bv9qrgg2vbm5r8"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime sparseinv]; }; + FRK = derive2 { name="FRK"; version="0.2.2.1"; sha256="0fjfhkv899v08419109qs1gabnc22h7a5b4z6s6fd1zk1dc4agjn"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime sparseinv]; }; FRegSigCom = derive2 { name="FRegSigCom"; version="0.3.0"; sha256="0w0yhch75wdx6phf5h4radipgpndv5bfxva2pzzd99fkmws4sswn"; depends=[fda Matrix Rcpp RcppEigen]; }; - FSA = derive2 { name="FSA"; version="0.8.26"; sha256="1gnmch98y8b6bssnz769d987rmvyiadrpshpjf5qihcnnq6jp2sy"; depends=[car dplyr dunn_test epitools gplots lmtest plotrix plyr sciplot withr]; }; + FSA = derive2 { name="FSA"; version="0.8.30"; sha256="0f567dm1fcffjsmm4j8c81q748rl944ia5ll22b2ayvv3qf7v9y7"; depends=[car dplyr dunn_test lmtest plotrix plyr sciplot withr]; }; FSAdata = derive2 { name="FSAdata"; version="0.3.8"; sha256="0i7wkz0baxcf1dv6qvc891b4ja4x65p4qicil472k6a9gcf5d4qm"; depends=[]; }; FSInteract = derive2 { name="FSInteract"; version="0.1.2"; sha256="1aci1398aaz0nrl5jy6yh7xik355wf7pwngrsak4qsi94vdj05iy"; depends=[Matrix Rcpp]; }; FSMUMI = derive2 { name="FSMUMI"; version="1.0"; sha256="06ri1zi86cm4arjdlp2pha2bvcc8vz6irvd9n3ja074hv62wxcw4"; depends=[FuzzyR lsa]; }; + FSSF = derive2 { name="FSSF"; version="0.1.1"; sha256="024g2rv64yqxmbbwrbkpkrzdfshl0n6jll6axsgsp4q4ia4r9401"; depends=[Rcpp RcppArmadillo]; }; FSTpackage = derive2 { name="FSTpackage"; version="0.1"; sha256="1fjqsl59fg4x9vkbv4b0qmfxlaa2q3rzpl40grv24yg6ixfagmdb"; depends=[CompQuadForm MASS Matrix mvtnorm SKAT]; }; FSelector = derive2 { name="FSelector"; version="0.31"; sha256="1ryqrwz9h7ggxvmxyw4viajlkvd3r7i6ihcfrwsz6axyk5y0qarg"; depends=[digest entropy randomForest RWeka]; }; FSelectorRcpp = derive2 { name="FSelectorRcpp"; version="0.3.3"; sha256="0x0jysqjvplzmcjs223wma9ng2pyd9mcbdgqmgsiifv0wdic07vi"; depends=[BH foreach iterators Rcpp RcppArmadillo testthat]; }; - FSinR = derive2 { name="FSinR"; version="1.0.6"; sha256="1w2sw0z4qyhnz3h790kznwmka5ml4n0kdqkynnwprsyclvxsfdwn"; depends=[caret class digest dplyr e1071 GA mlbench neuralnet prodlim purrr Rdpack rlang rpart tidyr]; }; + FSinR = derive2 { name="FSinR"; version="1.0.8"; sha256="07cabw86x07sg3mhpzdfrgw20i2mhnxk21zxbzwv4dgld66g9g08"; depends=[caret class digest dplyr e1071 GA mlbench neuralnet prodlim purrr Rdpack rlang rpart tidyr]; }; FTICRMS = derive2 { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[lattice Matrix]; }; FUNTA = derive2 { name="FUNTA"; version="0.1.0"; sha256="02yxz95s2hs26mfmgwhv5d54yyjz0aczjpnay8b4gpzbpd6aci61"; depends=[]; }; FWDselect = derive2 { name="FWDselect"; version="2.1.0"; sha256="0w0hkmhcz7h1lixk7p3yffbbalgxwh2lv463vqz361k80sri6wz7"; depends=[cvTools mgcv]; }; FacPad = derive2 { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[MASS Rlab]; }; FactMixtAnalysis = derive2 { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; }; FactoClass = derive2 { name="FactoClass"; version="1.2.7"; sha256="0hvlr9cw6wfckl8rzl5qqyp0h8rv8gcnyj6x930jq7h44kj0ji7d"; depends=[ade4 ggplot2 ggrepel KernSmooth scatterplot3d xtable]; }; - FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.5"; sha256="079x3n6jh69vrgqmjskccscd21g0vni6bsyga928gndz9nvh3807"; depends=[FactoMineR ggplot2 rmarkdown rrcov]; }; - FactoMineR = derive2 { name="FactoMineR"; version="2.1"; sha256="1b2jsv8vlaynknd7nlra6fdmr56n7678q5s28rqmagbadiqwvj4h"; depends=[car cluster ellipse flashClust ggplot2 ggrepel lattice leaps MASS scatterplot3d]; }; + FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.6"; sha256="0y32k41i1mfh1yxkd8mcgw7x2xkibq9xqf2vgysnibgnabwi15w2"; depends=[FactoMineR ggplot2 rmarkdown rrcov]; }; + FactoMineR = derive2 { name="FactoMineR"; version="2.3"; sha256="0ldgf3daksh6lpblhqys67m4mxqx3q9s9n5plfam6dwshfik0ky6"; depends=[car cluster ellipse flashClust ggplot2 ggrepel lattice leaps MASS scatterplot3d]; }; + FactorAssumptions = derive2 { name="FactorAssumptions"; version="1.1.2"; sha256="0k5jjqfajrq5wc0vp07s6kbfyjks6124hpy09nxw2blrai66vhcm"; depends=[MASS psych]; }; FactorsR = derive2 { name="FactorsR"; version="1.4"; sha256="1nw63j9bi4x09pgdvdml0w0qxfy1dda5hkxbhd3d6f7rky1z0nyf"; depends=[]; }; - Factoshiny = derive2 { name="Factoshiny"; version="2.1"; sha256="0h2qf89z9yb8b1a9hh0l50vnhzbz1xb7akm5390xmlpybh22jagl"; depends=[colourpicker DT FactoInvestigate FactoMineR ggplot2 ggrepel missMDA shiny shinydashboard shinyjqui]; }; + Factoshiny = derive2 { name="Factoshiny"; version="2.2"; sha256="0niic7k9z1j3684l0wmyhkbm1x8a2djig6m2k0s49vgfdaf1hcc0"; depends=[colourpicker DT FactoInvestigate FactoMineR ggplot2 ggrepel missMDA shiny shinydashboard shinyjqui]; }; Fahrmeir = derive2 { name="Fahrmeir"; version="2016.5.31"; sha256="16fbc1zb9x9p04bl7y5nd375pha6bd3hfqqchlk1bqxrj4879y5g"; depends=[]; }; FamEvent = derive2 { name="FamEvent"; version="2.0"; sha256="07xb1k3yxsbwxxg6avw2gvai2qpjjd1imjggr8q6lkgcd8j3yxrb"; depends=[eha kinship2 MASS pracma survival truncnorm]; }; Familias = derive2 { name="Familias"; version="2.4"; sha256="1k6ig2zfkr1a4s3s85ygixmmsrb5m8vqqab8l5ffkspgjvh4dfz2"; depends=[kinship2 paramlink Rsolnp]; }; FarmSelect = derive2 { name="FarmSelect"; version="1.0.2"; sha256="174rzv9k0hdcfdkv7bisy70rip2iy0bnj3qa54i00wqwjdglgjdn"; depends=[fBasics ncvreg Rcpp RcppArmadillo]; }; - FarmTest = derive2 { name="FarmTest"; version="2.0.0"; sha256="0dr7cr3dcvsl02sll16zfyyq1kcv5qmj29psi75h73bzanx3h64n"; depends=[Rcpp RcppArmadillo]; }; + FarmTest = derive2 { name="FarmTest"; version="2.0.1"; sha256="1inwbaa4nckny4cwypqs2s2jmzj61vb6dpjyf8fn2mxdy4qjb9zd"; depends=[Rcpp RcppArmadillo]; }; FastBandChol = derive2 { name="FastBandChol"; version="0.1.1"; sha256="1hlgipn792vaylvc0r44clkjcnkns6p241a1fs8sb3gpq81naazk"; depends=[Rcpp RcppArmadillo]; }; + FastCUB = derive2 { name="FastCUB"; version="0.0.2"; sha256="04bphkfkkjp7gfnsgar5gcxzmkr437mz6y8mbf015m7f4cvdhzjz"; depends=[CUB Formula]; }; FastGP = derive2 { name="FastGP"; version="1.2"; sha256="120qai1yw3yhwm762zridk78n4qclpivwm9f2hkij4bz851qibqv"; depends=[MASS mvtnorm rbenchmark Rcpp RcppEigen]; }; FastGaSP = derive2 { name="FastGaSP"; version="0.5.1"; sha256="09dymlchc4ij5iwwi2hl7shlqr8610lv7r2qh3sbrh7j5vnr5sc9"; depends=[Rcpp RcppEigen RobustGaSP]; }; FastHCS = derive2 { name="FastHCS"; version="0.0.6"; sha256="0ds0g2lbzc33is8g8yxfs6hpvl2zdrgi9fqa7c71c3b3fwn9cqlv"; depends=[matrixStats Rcpp RcppEigen robustbase]; }; - FastImputation = derive2 { name="FastImputation"; version="2.0"; sha256="0zhin8000c78kba6zly9mvpxdxx68kcsh2hn697pxkl73wqsz3p5"; depends=[Matrix]; }; FastKM = derive2 { name="FastKM"; version="1.0"; sha256="0sqxd2pg9y6yn1lnxni32ca3bgbmz04k9z37q9pzgijvf9qvik3f"; depends=[rARPACK]; }; FastKNN = derive2 { name="FastKNN"; version="0.0.1"; sha256="1iz8ybzkvbyqwb00s7cp1zvy9xlmyjid441mf62dq08a0zncnyss"; depends=[assertthat pdist]; }; FastLZeroSpikeInference = derive2 { name="FastLZeroSpikeInference"; version="2018.12.10"; sha256="0ybpmns7bc1j5xzqjl7734grihmvvpa3h52gixv3h70l0r89d8ys"; depends=[]; }; FastPCS = derive2 { name="FastPCS"; version="0.1.3"; sha256="152fy5hq675n1mjdsi31a77rmi3vylvvbfgywrh62chy5xa1bf34"; depends=[matrixStats Rcpp RcppEigen]; }; FastRCS = derive2 { name="FastRCS"; version="0.0.8"; sha256="11kqd8aii9sy65m5inxiqggyajb41iy6w92zp5wggx7pbg9m6lmy"; depends=[matrixStats Rcpp RcppEigen]; }; - FastRWeb = derive2 { name="FastRWeb"; version="1.1-1.1"; sha256="08hqsiglv9ivcv4xmpqqjhqmg3ccba5xa7jahay0m71w2n8m271y"; depends=[base64enc Cairo]; }; + FastRWeb = derive2 { name="FastRWeb"; version="1.1-3"; sha256="1913pyjzxw8kw5hbr8mfwk2mjjfz7cyl6sh71z6cc0jl0af3p1kn"; depends=[base64enc Cairo]; }; FastSF = derive2 { name="FastSF"; version="0.1.1"; sha256="1xajav45h57hchzkvl2pb4mz9xy433lq74jnry0icid8dai5xhwb"; depends=[limSolve Rcpp RcppArmadillo]; }; FatTailsR = derive2 { name="FatTailsR"; version="1.7-5"; sha256="1l2anaf4kixidmvya64ni5b78bl9w2n6xf1lnf297lkdka8gxigw"; depends=[minpack_lm timeSeries]; }; FateID = derive2 { name="FateID"; version="0.1.9"; sha256="0n02591wpi4n0ga42v4xd1jzskcl56nvvls48sdkcnvc7cyi0hjv"; depends=[lle locfit pheatmap princurve randomForest RColorBrewer Rtsne som umap]; }; - FeaLect = derive2 { name="FeaLect"; version="1.14"; sha256="1h6jc8n57mvyz3gi2jdx5xacwv5iim5sx86qzrg3v1higfr54b1l"; depends=[lars rms]; }; + FaultTree = derive2 { name="FaultTree"; version="0.99.4"; sha256="0f1pvi0vaaw29vghxi5qgbl6hn3fpwm2gxpdvchp3k2wk6p2gvk3"; depends=[Rcpp RcppArmadillo]; }; + FcircSEC = derive2 { name="FcircSEC"; version="1.0.0"; sha256="06c1n0xx1q0zh16bgylwbvqzp8q4c5bj626shm2c6r8f9kcjgysh"; depends=[Biostrings seqRFLP stringi]; }; + FeaLect = derive2 { name="FeaLect"; version="1.20"; sha256="1dfi0v313x4a4ck98zlk6yr3nfjrdwr5649x9dx3i7yfkypk2k5c"; depends=[lars rms]; }; FeatureHashing = derive2 { name="FeatureHashing"; version="0.9.1.4"; sha256="00yrji3grqgzg8c1hwqq5kb9xgqlnzwymy0b38cwixadc5w5lq8m"; depends=[BH digest magrittr Matrix Rcpp]; }; FedData = derive2 { name="FedData"; version="2.5.7"; sha256="07qgqhd3pg86qsih1ap7j02vriwabqna974q68bapfm52qnvm77z"; depends=[curl data_table devtools dplyr foreach Hmisc httr igraph lubridate magrittr ncdf4 raster readr rgdal rgeos sf sp stringr tibble xml2]; }; FeedbackTS = derive2 { name="FeedbackTS"; version="1.5"; sha256="120labhmisw1x1bq8c4bl6l14vayvb9xcm6jsj1awacypgrr2ar2"; depends=[automap gstat mapdata maps proj4 sp]; }; @@ -1437,6 +1449,7 @@ in with self; { FindAllRoots = derive2 { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; }; FindIt = derive2 { name="FindIt"; version="1.2.0"; sha256="0zrvkvj907fw86jnzzlwk4d90hi42nq45jprp16xryxb7xxii6i8"; depends=[arm glinternet glmnet igraph lars limSolve lmtest Matrix quadprog sandwich]; }; FinePop = derive2 { name="FinePop"; version="1.5.1"; sha256="184707yvh2mydx42vxrdgv0n4v2dad4an7c4yvlyb9d7z6h0sw2x"; depends=[]; }; + FinePop2 = derive2 { name="FinePop2"; version="0.4"; sha256="1rzsbxbxynn0pl6dlkmsjxiph403ffwlb2brsi8cm4r22jjhcx4i"; depends=[]; }; FisHiCal = derive2 { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n1334yh3z10nijqksr0q98ckd2yrwg2rf"; depends=[igraph Rcpp RcppArmadillo]; }; FisPro = derive2 { name="FisPro"; version="1.0"; sha256="0wj5xf8qcrbmfixmsirwaf9yl5gk0bb588csp867c8n5jnqqyq0p"; depends=[Rcpp Rdpack]; }; FishResp = derive2 { name="FishResp"; version="1.0.3"; sha256="0cydxs9knbmsyxrhqi68aqa12x20k6wcs6jw7z58k2jisypwqclw"; depends=[chron lattice mclust respirometry rMR]; }; @@ -1449,10 +1462,9 @@ in with self; { FlexDir = derive2 { name="FlexDir"; version="1.0"; sha256="1gb5alv9jsnw0135g63cy757pxhdw6cgwfm8dpcm8dj9zqg10dkm"; depends=[]; }; FlexGAM = derive2 { name="FlexGAM"; version="0.7.0"; sha256="1pjlsi747j347vwn94391xr3aknnspgw7rc1jnin7g0n1fgkcww4"; depends=[MASS Matrix mgcv scam]; }; FlexParamCurve = derive2 { name="FlexParamCurve"; version="1.5-5"; sha256="1404cn3bhcdr3mjhpr072zcyl0wnksarsg2sry5d1scsmrn4xq83"; depends=[nlme]; }; - FlexScan = derive2 { name="FlexScan"; version="0.1.0"; sha256="02p8rh3krh30hmzykm03qvm0g1qcrqzcgzlzlww61pswd9j1g53m"; depends=[smerc sp spdep]; }; + FlexScan = derive2 { name="FlexScan"; version="0.2.0"; sha256="1jd93h96qhqvk9xx3va78v76fzl6y0rbm85022zpvk3wz4z2g1xs"; depends=[smerc sp spdep]; }; FlickrAPI = derive2 { name="FlickrAPI"; version="0.1.0.0"; sha256="0bbk7ac4s3gbcjhfg3yz06pxjid3hpd0mqzxzlj5sghn95f479h9"; depends=[jsonlite magrittr RCurl stringr]; }; FloodMapper = derive2 { name="FloodMapper"; version="1.0"; sha256="09pr6324namqrwdr2impgqmdmsf34g9pq91091cg9b1031djgzyq"; depends=[magick raster rgdal sp]; }; - FlowCAr = derive2 { name="FlowCAr"; version="1.1.1"; sha256="0ddds4726rf38153biz5sgmmyi2knw43vmv2fa7njrjxadsiwclq"; depends=[enaR LIM limSolve]; }; FlowRegEnvCost = derive2 { name="FlowRegEnvCost"; version="0.1.1"; sha256="0lw4kv4z0s23jy11y53rxxh7zxa7vajxrcnjgxd74xxs64vjlj88"; depends=[zoo]; }; FlowScreen = derive2 { name="FlowScreen"; version="1.2.6"; sha256="1s9xyrvfsgrl2zxm2an5qj3rs1qx7v7j8wc83jzl28pkwa5xr351"; depends=[changepoint evir zyp]; }; FluMoDL = derive2 { name="FluMoDL"; version="0.0.3"; sha256="0vp3w6hpph6svz8940w9yk9c5iv4n9mj94f9si1ks0xjbi948rqd"; depends=[dlnm mvmeta tsModel]; }; @@ -1463,7 +1475,9 @@ in with self; { ForecastComb = derive2 { name="ForecastComb"; version="1.3.1"; sha256="07cbiv172mpkwvg6svhwgavlfy2144ir3y1l7w37wbd0ygs514id"; depends=[forecast ggplot2 Matrix mtsdi psych quadprog quantreg]; }; ForecastCombinations = derive2 { name="ForecastCombinations"; version="1.1"; sha256="07vzgm2jy992p1l9b8rsv2lbc8cbfzvql85n5ah4p4l3zjxdxgk9"; depends=[quadprog quantreg]; }; ForecastFramework = derive2 { name="ForecastFramework"; version="0.10.3"; sha256="1c57jfcd156468s0bj0v523clg6pnwbw5spkqchbyz0fxzadc14p"; depends=[abind dplyr lubridate magrittr R6 reshape2 tibble]; }; - ForestFit = derive2 { name="ForestFit"; version="0.4.7"; sha256="0p6nygykx4ad8vznpjdx2ipnxpbhmp9sz3pg50hgkhmhzdlpwk1h"; depends=[ars]; }; + ForecastTB = derive2 { name="ForecastTB"; version="1.0.1"; sha256="1wqgw4i65ajwj8la8mgv2qqm4ydgk90i6chdkd8h33rlwh8yddc6"; depends=[circlize decomposedPSF forecast ggplot2 gridExtra imputeTestbench PSF RColorBrewer reshape2]; }; + ForestDisc = derive2 { name="ForestDisc"; version="0.1.0"; sha256="1mzlrqjxsja51yyxckj4ym1vpfpq30vlhvs8clrg8jv7kz86hdwk"; depends=[moments nloptr randomForest]; }; + ForestFit = derive2 { name="ForestFit"; version="0.5.7"; sha256="08q4cibxhq02qawpyvc8cnr3x1gc8pi1rzdqq3i86764ssb2649a"; depends=[ars]; }; ForestGapR = derive2 { name="ForestGapR"; version="0.0.2"; sha256="0xig9nal83xg312kgq6dhi7n67sa8ixlnh79x957w3n5rv9kdyf2"; depends=[igraph raster rgeos sp spatstat VGAM viridis]; }; ForestTools = derive2 { name="ForestTools"; version="0.2.0"; sha256="0q9nk9n001bnz5hd8cxj6wmaf8c7g0kwfkpa0hk6ap42666rrrah"; depends=[APfun imager raster rgeos sp]; }; FormalSeries = derive2 { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; }; @@ -1472,7 +1486,7 @@ in with self; { FossilSim = derive2 { name="FossilSim"; version="2.1.1"; sha256="1dffk14lszq84k61s1jar658qpjc1hm6rwa1gcwwvppvxj6gkvky"; depends=[ape TreeSim]; }; FourScores = derive2 { name="FourScores"; version="1.5.1"; sha256="1la9d1hfcmi0zg58yl0a7nj36giagh0fwrc7wxyqdq0c7zf1hfzq"; depends=[]; }; FourgameteP = derive2 { name="FourgameteP"; version="0.1.0"; sha256="15yn47737768fkjjv8ykc9lw7x58pq44k90d9d4c9hp20zw5f3by"; depends=[]; }; - FrF2 = derive2 { name="FrF2"; version="2.1"; sha256="01sihw40jyjy07i2cy7k4pk3ck13mb31djk15j2s37b786z05fmj"; depends=[BsMD DoE_base igraph scatterplot3d sfsmisc]; }; + FrF2 = derive2 { name="FrF2"; version="2.2"; sha256="0h3inqnb726mbazj72b6gnbn7mqhd9lrs0x5cragq10szx2hvpa8"; depends=[DoE_base igraph scatterplot3d sfsmisc]; }; FrF2_catlg128 = derive2 { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; }; FractalParameterEstimation = derive2 { name="FractalParameterEstimation"; version="1.1.2"; sha256="16xm2g723dm1n1h6as6yvy92sigzhj31f269g5rrzqjcd4d5m8an"; depends=[]; }; Fragman = derive2 { name="Fragman"; version="1.0.9"; sha256="03vmvmnyza4i46v1awkdjz6ccbsiq49dm0mlmwsm801rq6yfihgp"; depends=[]; }; @@ -1481,11 +1495,10 @@ in with self; { FreeSortR = derive2 { name="FreeSortR"; version="1.3"; sha256="1m6ahhixbbizzn09pz71zvinrdshn3j6gmy05jdxa9d932agqk0w"; depends=[ellipse smacof vegan]; }; FreqProf = derive2 { name="FreqProf"; version="0.0.1"; sha256="1yqn2435l2sghfcv5mma0rv9yqvpa69z8cqqsjlrlbih9gib82d4"; depends=[ggplot2 reshape2 shiny]; }; Fstability = derive2 { name="Fstability"; version="0.1.2"; sha256="0kscdmrs5namvhi112b47c811w0bg9s3xg48mfa566pxwxz1nv45"; depends=[]; }; - FunChisq = derive2 { name="FunChisq"; version="2.4.9.1"; sha256="1yfpd6hccymx4s59d1yyz7c4fd478rxsimdkwkyg8cw12qq93nfl"; depends=[BH Rcpp]; }; + FunChisq = derive2 { name="FunChisq"; version="2.5.0"; sha256="10x9c8a15qsrhnqmq9bxla4s0fanlys9fdiaacgvgspnc8426ppg"; depends=[BH Rcpp Rdpack]; }; FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; }; FuncMap = derive2 { name="FuncMap"; version="1.0.10"; sha256="0iaay6qz9a2s77xjfpp7wm37y7xwnvmlw6s5k5riccmqzc6dcjs7"; depends=[mvbutils]; }; - FunctionalNetworks = derive2 { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[Biobase breastCancerVDX]; }; - FunnelPlotR = derive2 { name="FunnelPlotR"; version="0.2.2"; sha256="04i6h1s2p5pdm7g5q2ljrd6ix0hr8n47mczh9jf7c4bhap05zxqj"; depends=[dplyr ggplot2 ggrepel rlang scales]; }; + FunnelPlotR = derive2 { name="FunnelPlotR"; version="0.2.3"; sha256="16bw1fx2pzmxm8gavq791drnpsczxq5yyfbnl2h1xcrzlw4fw4b0"; depends=[dplyr ggplot2 ggrepel rlang scales]; }; FusionLearn = derive2 { name="FusionLearn"; version="0.1.1"; sha256="0n8bj7k2r2vf0v2nsw31k75hzkqj5l4hyfnmvid102hx9cl8hv3y"; depends=[]; }; Fuzzy_p_value = derive2 { name="Fuzzy.p.value"; version="1.1"; sha256="13h6armh9g57zqxyjqk6mq81jlfqxqrg2sb5p9rrhslka5m01zis"; depends=[FuzzyNumbers]; }; FuzzyAHP = derive2 { name="FuzzyAHP"; version="0.9.5"; sha256="02sx32vlvnr0fzw8rf0f6hiikqn7xp1ibpqzxhxwv8yij2qkiyci"; depends=[MASS]; }; @@ -1505,20 +1518,19 @@ in with self; { GAD = derive2 { name="GAD"; version="1.1.1"; sha256="0lyrw0d7i7yn1wkqlbf3rg3dnijfwsjn3kdbsg19hmvwq6qpsak2"; depends=[matrixStats R_methodsS3]; }; GADAG = derive2 { name="GADAG"; version="0.99.0"; sha256="1ycg48idrq2yrk1fxs16yl5wwg3kbfki8xppmh311rrzf75c6z4g"; depends=[igraph MASS Rcpp RcppArmadillo]; }; GADGET = derive2 { name="GADGET"; version="0.2.0"; sha256="0z259dahki3ci5jskm2qp5q89bkr0wr74h7yxy057airc2m1cm7z"; depends=[DiceKriging DiceOptim lhs pbapply]; }; - GADMTools = derive2 { name="GADMTools"; version="3.7-2"; sha256="0aabbs35wbcchab32phiaajzf5zgiis3qfv4nr5dc0mf0qjgsc6h"; depends=[classInt dplyr ggmap ggplot2 ggspatial gridExtra jsonlite lattice maptools prettymapr raster RColorBrewer rgdal rgeos rosm sf sp stringr tidyverse]; }; + GADMTools = derive2 { name="GADMTools"; version="3.8-1"; sha256="02rqpvqawk0y8w20d89cbdbjlmpyvvp826gzzdajqba1wazj6ikx"; depends=[classInt dplyr ggmap ggplot2 ggspatial gridExtra jsonlite lattice maptools prettymapr raster RColorBrewer rgdal rgeos rosm sf sp stringr]; }; GAIPE = derive2 { name="GAIPE"; version="1.0"; sha256="04iarbwxrhn48bk329wxis7ifzndi67kpjx6dcakawkh3g2mzsfz"; depends=[]; }; GAMBoost = derive2 { name="GAMBoost"; version="1.2-3"; sha256="0450h9zf12r524lxk1lrv9imvvkk6fmyd3chnxp18nnvys7215pv"; depends=[Matrix]; }; GAMens = derive2 { name="GAMens"; version="1.2.1"; sha256="1z10wxcg277fra2lch464l0kb02lspw9qr1i2wmq11wcz0k9qnl8"; depends=[caTools gam mlbench]; }; GANPA = derive2 { name="GANPA"; version="1.0"; sha256="0ia8djv46jm397nxjrm9yc5gacf1r4z0ckiliz57cbrqwh7z2wpa"; depends=[GANPAdata]; }; GANPAdata = derive2 { name="GANPAdata"; version="1.0"; sha256="0mhdadl7zgsacn59ym42magg3214k1xhabwn78fv7kgccszcgc86"; depends=[]; }; - GAS = derive2 { name="GAS"; version="0.3.0"; sha256="0qyawq0chwj5xvzczn5vsakis9qdvwjdx3xdfjl5k233rk2hs7nk"; depends=[cubature MASS numDeriv Rcpp RcppArmadillo Rsolnp xts zoo]; }; GAabbreviate = derive2 { name="GAabbreviate"; version="1.3"; sha256="0cq6bg3w0ji44rsz1p4j17fk0jg8rafbjixwi3fjdndc3yd874r5"; depends=[GA psych]; }; GAparsimony = derive2 { name="GAparsimony"; version="0.9.4"; sha256="1p1s5q1basy9v3jy1qxpx5g8mzpkwdfarxmmf7s06c6wq0dl9vp8"; depends=[foreach iterators]; }; GB2 = derive2 { name="GB2"; version="2.1"; sha256="06rcck97pdm1rsb02cy0jd9fknv0mz5jwk364gsaahdk56ddk18a"; depends=[cubature hypergeo laeken numDeriv survey]; }; GB2group = derive2 { name="GB2group"; version="0.2.0"; sha256="185am9j88f3qjv0h8ag91x8qrck4qk0a4k0mcg5k56rf2lf7s7zi"; depends=[GB2 ineq minpack_lm numDeriv]; }; GBJ = derive2 { name="GBJ"; version="0.5.3"; sha256="12lsddkcxz37hn2fvjq158wb1bc6b3hx6wj8q8nj21zpmyl3n2qh"; depends=[BH mvtnorm Rcpp SKAT]; }; GCAI_bias = derive2 { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; }; - GCD = derive2 { name="GCD"; version="4.0.5"; sha256="1hinn8l2kppl0nysx5baz9am0avwdqfnspx2i8wj60w1ns41v5r8"; depends=[]; }; + GCD = derive2 { name="GCD"; version="4.0.6"; sha256="1lc2n9avg1rfh55gbj3q0yd1gvfw60088zg279s7aikx10zv4sx7"; depends=[raster]; }; GCPM = derive2 { name="GCPM"; version="1.2.2"; sha256="0k2ng78bk3bxpj6nz80j5cvjd56zjz328ga68vyyc3hvdjgpspqj"; depends=[Rcpp RcppProgress]; }; GCalcium = derive2 { name="GCalcium"; version="1.0.0"; sha256="0r84qmdsqsgpaqr08imh48mdvy26s2b62hi0hxxwhr9kg7qvj0rd"; depends=[caTools dplyr]; }; GCalignR = derive2 { name="GCalignR"; version="1.0.2"; sha256="1x0as6mmapvn3a28c3qk3wd5gjkx17xgf9c7yb68wp3lj8pknsnm"; depends=[ggplot2 pbapply readr reshape2 stringr]; }; @@ -1526,28 +1538,28 @@ in with self; { GDAdata = derive2 { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; }; GDAtools = derive2 { name="GDAtools"; version="1.4"; sha256="1i5g7gzl3fkhwxqizqwrn8098s5lrr0mk17wmpyf92s1sy315cpv"; depends=[FactoMineR nleqslv nnet]; }; GDELTtools = derive2 { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; }; - GDINA = derive2 { name="GDINA"; version="2.7.8"; sha256="1aj2ssd7vpszl7p22srkkkpx4a7gkc38vrv3bq7j1zr32096y4zj"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; }; + GDINA = derive2 { name="GDINA"; version="2.7.9"; sha256="13pmj069r04h38hg61ibyn1ab15zdy9m0qv60vi25ahgsmg6ccvx"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; }; + GE = derive2 { name="GE"; version="0.0.7"; sha256="0fz90qda36gmdivp12gfxa6xm0fra583676vkcl8arvccqs9cn34"; depends=[CGE data_tree DiagrammeR stringr]; }; GEEaSPU = derive2 { name="GEEaSPU"; version="1.0.2"; sha256="02pwjqd94kranc1f69bx9rzk27kchavhvhl9fygjhrr40nwq3pbg"; depends=[gee Rcpp RcppArmadillo]; }; GEEmediate = derive2 { name="GEEmediate"; version="1.1.3"; sha256="1xprkpjp1pkq4ci1n32d3yy80hx3r4xf2j7f6hv7dvsn4cvdp417"; depends=[gee]; }; GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.18"; sha256="17m58i3jridgxzcckcm0ydd2ijw3zjvg9w4an8j5jbnr62hmcb2s"; depends=[changepoint GENEAread MASS rpart signal]; }; GENEAread = derive2 { name="GENEAread"; version="2.0.8"; sha256="1phiwdq05h92vlrjbvx4xvazzls5bdlnwfxn5mghx0v9j0n3ahrm"; depends=[bitops mmap]; }; GENEAsphere = derive2 { name="GENEAsphere"; version="1.5.1"; sha256="1kgj7i9v2yn0b8lvvsf0nc6lg3i2syrcygwa51pcrzp57vv7hxn5"; depends=[GENEAread ggplot2 MASS misc3d rgl]; }; - GENLIB = derive2 { name="GENLIB"; version="1.0.6"; sha256="0xyq3ggi814vi3x5kxffhi7ygvzcfj3pg0kfi7whcjpi3pjg05h8"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; }; + GENLIB = derive2 { name="GENLIB"; version="1.0.8"; sha256="16n6i7g60hy43bkx075132k5h6ngz3llv0r91q01cnnqciyph6ka"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; }; GENMETA = derive2 { name="GENMETA"; version="0.1"; sha256="1mxwqnbg5bvx1qg62xcd62dl81k11l64yckhl3v854asnaczq3pp"; depends=[magic MASS Matrix]; }; GEOmap = derive2 { name="GEOmap"; version="2.4-4"; sha256="0wk2v0fwcwcm59k711fg829h2w58wkd36im4mg974iai6mqif7qh"; depends=[fields MBA RPMG splancs]; }; - GERGM = derive2 { name="GERGM"; version="0.13.0"; sha256="1h3fzkgc553bvxhcmvmlgk9sdais186h4gs1qagdihwpwn8ymbjk"; depends=[BH coda ggplot2 igraph matrixcalc plyr Rcpp RcppArmadillo RcppParallel scales slackr stringr vegan]; }; GESE = derive2 { name="GESE"; version="2.0.1"; sha256="0h3s2sbnv5wilr2mj6bnl2892p16pxrs341gg6jql1a540p669sk"; depends=[kinship2]; }; GESTr = derive2 { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[gtools mclust]; }; - GET = derive2 { name="GET"; version="0.1-4"; sha256="1zn0jsl77xslf3rkm1py709jhqd3ciyyhiwph6d9ih2nkla9ivak"; depends=[ggplot2 gridExtra gstat plyr sp spatstat]; }; + GET = derive2 { name="GET"; version="0.1-7"; sha256="0q32a7c09h6qcgyf2xav2i4ajc3i4hd2i7k1il99g5i5p6sx040i"; depends=[ggplot2 gridExtra spatstat]; }; GEVStableGarch = derive2 { name="GEVStableGarch"; version="1.1"; sha256="1iypv0k4cbvsdyglgvf7y52sqvl5qcin627pjqwq42kisqynm8d7"; depends=[fExtremes fGarch Rsolnp skewt stabledist timeDate timeSeries]; }; - GEVcdn = derive2 { name="GEVcdn"; version="1.1.6"; sha256="09lzhh16r1hsxa23jkq716yf3x9ap6fkkrz3ij2x83rvwznj8hb3"; depends=[VGAM]; }; + GEVcdn = derive2 { name="GEVcdn"; version="1.1.6-2"; sha256="0vmm9fhyrk5m0zwy7fpq5j9zinws0gn2saf4j9plqc9gj1gphjn0"; depends=[]; }; GEint = derive2 { name="GEint"; version="0.1.5"; sha256="179gpq4qjhgx1fhyjdb80rf2ip80zhhfyn8xjgwq1a425163q1y7"; depends=[bindata geepack mvtnorm nleqslv pracma rje speedglm]; }; GExMap = derive2 { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[Biobase multtest]; }; GFA = derive2 { name="GFA"; version="1.0.3"; sha256="10sivsqxliwcrp0ay3n2my28zki6f8vpv8i9lbld8qinx1iv2mq3"; depends=[]; }; GFD = derive2 { name="GFD"; version="0.2.6"; sha256="1z98j6nvaa4vrh840q1iy5r0h9ns4xbrk3qfkq51l2kmbrck8r7a"; depends=[magic MASS Matrix plotrix plyr]; }; GFE = derive2 { name="GFE"; version="0.1.0"; sha256="0ywrg23z13kp8ggw4wbm4jvr2rvb6kra7ma0mgfj8xzkrxs6vi6m"; depends=[data_table dplyr TeachingSampling]; }; GFGM_copula = derive2 { name="GFGM.copula"; version="1.0.4"; sha256="0cw8ih9dj86cvks0qcpffzjx8lv6qiwvk3f1wri8zashj8lk9am6"; depends=[cmprsk compound_Cox joint_Cox]; }; - GFORCE = derive2 { name="GFORCE"; version="0.1.4"; sha256="1x7dvzgnqfvyvp6ibdsnrn5q01ivcgkzkh0mv8nfwqg5zr78v2cz"; depends=[lpSolve MASS]; }; + GGClassification = derive2 { name="GGClassification"; version="0.1"; sha256="03wis5ng2mnfhp33xrag8xbmvjagzr1909a6x94wv7s2spji00rp"; depends=[Rcpp RcppEigen]; }; GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-9"; sha256="0nd0ky3m1avy82z48g7hcysq0y0agxjxdn0g624dkm2w99avxw3j"; depends=[rgl tkrplot]; }; GGEBiplots = derive2 { name="GGEBiplots"; version="0.1.1"; sha256="1xnxaylikjd378flw3rqw36z27b2limkmyad97zhf1cbva317d1b"; depends=[gge GGEBiplotGUI ggforce ggplot2 scales]; }; GGIR = derive2 { name="GGIR"; version="1.11-0"; sha256="0r0k48qbmm5fnl6rgpwgd8jc4l8nyjp2f4vv2givdqkmylw22281"; depends=[bitops data_table doParallel foreach GENEAread matlab Rcpp signal tuneR zoo]; }; @@ -1555,15 +1567,15 @@ in with self; { GGMridge = derive2 { name="GGMridge"; version="1.1"; sha256="0zbfvvp7l836m118m8nmdvw1w7xq6d3b7qirskjsq1dkk23j41hs"; depends=[MASS mvtnorm]; }; GGMselect = derive2 { name="GGMselect"; version="0.1-12.4"; sha256="0p9djnkclnk64bcrd66agi2gw2j3bqvqhamfm0h59b810kh50kbn"; depends=[gtools lars mvtnorm]; }; GGUM = derive2 { name="GGUM"; version="0.4"; sha256="1l3kwj207c1660msxs085xrjcydxxb5q9i40m8rl25r2nrsm0yip"; depends=[abind psych Rdpack viridis xlsx]; }; - GGally = derive2 { name="GGally"; version="1.4.0"; sha256="1zjmcc5bzagvy7c5cmdcl39xmx07fwi98yrj4i05w7y40kqcsiws"; depends=[ggplot2 gtable plyr progress RColorBrewer reshape rlang]; }; + GGally = derive2 { name="GGally"; version="1.5.0"; sha256="082s321zspg5al6acigwrhg4fsrmkkk5caabg662qbcy8v6n34h6"; depends=[ggplot2 gtable plyr progress RColorBrewer reshape rlang]; }; GHQp = derive2 { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; }; GHS = derive2 { name="GHS"; version="0.1"; sha256="1khjfy62a67r59s2rax9mmnqy5xnnwhbydzhqwwmyspl48mxycdj"; depends=[MASS]; }; GIFTr = derive2 { name="GIFTr"; version="0.1.0"; sha256="101vr2qasky8hnxp5i3lhlnymwzciypqwvhpl6mrr0r0czgpcz2f"; depends=[glue stringr]; }; GIGrvg = derive2 { name="GIGrvg"; version="0.5"; sha256="0mx4n4kf34343yiww80fw5yy0x624xsj71n8fr4dm0a2338pxq8v"; depends=[]; }; GISTools = derive2 { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools MASS RColorBrewer rgeos sp]; }; - GJRM = derive2 { name="GJRM"; version="0.2-1"; sha256="12kbd8nd43fi4vwjc9qpjwcndwx9zq19w0adqxivmlvxhflh93mb"; depends=[copula distrEx evd gamlss_dist ggplot2 ismev magic matrixcalc matrixStats mgcv mnormt numDeriv psych Rmpfr scam survey survival trust trustOptim VGAM VineCopula]; }; + GJRM = derive2 { name="GJRM"; version="0.2-2"; sha256="0hwa3nnlk3q810x5gyx9la090vn8fysm9rdv2gg80j8jifzhs48h"; depends=[copula distrEx evd gamlss_dist ggplot2 ismev magic matrixcalc matrixStats mgcv mnormt numDeriv psych Rmpfr scam survey survival trust trustOptim VGAM VineCopula]; }; GK2011 = derive2 { name="GK2011"; version="0.1.3"; sha256="13vafhbgcsj485f12qv962y07v3hil3pla51vkl2b030amzy86jv"; depends=[]; }; - GLDEX = derive2 { name="GLDEX"; version="2.0.0.6"; sha256="0s8nahy2mdmqlp8z5zsa3mvynwikrna8ks6xj6g2v4j64qd19p09"; depends=[cluster]; }; + GLDEX = derive2 { name="GLDEX"; version="2.0.0.7"; sha256="1w5ahwbnz9xsn3rdxzcxxvc6m5cgq46nln3i5v8vp4imrs8aafb3"; depends=[cluster]; }; GLDreg = derive2 { name="GLDreg"; version="1.0.7"; sha256="1wjrr4x1k0fz8nx9idb4ysamldypriiypj96b5v028lx38jwsk3l"; depends=[ddst GLDEX]; }; GLIDE = derive2 { name="GLIDE"; version="1.0.2"; sha256="1z5h8br6aig24g5gsh8h6npm269id3h5gjjyf5avs4v08b51rpcv"; depends=[doParallel foreach MASS]; }; GLMMRR = derive2 { name="GLMMRR"; version="0.2.0"; sha256="0s3jfh720acfmbadilq2c6gql3yifsbijpmw1jkzbsdc87pqi1db"; depends=[lattice lme4]; }; @@ -1579,8 +1591,8 @@ in with self; { GMDHreg = derive2 { name="GMDHreg"; version="0.2.0"; sha256="07qk9jbav9gm3gh3ag7nz273iab5zlkn0yz31zs2hw646ik1yn14"; depends=[]; }; GMKMcharlie = derive2 { name="GMKMcharlie"; version="1.0.3"; sha256="1ncz3czjg1md1hfahc2403k33nby11ldlq0yixpjs4s8panwpgsb"; depends=[Rcpp RcppArmadillo RcppParallel]; }; GMMAT = derive2 { name="GMMAT"; version="1.1.2"; sha256="1xifcm6kv4v3hw4zskggifd16cn1v7cmnwsgwjfbgrgz3qvyac5c"; depends=[CompQuadForm foreach Matrix Rcpp RcppArmadillo SeqArray SeqVarTools]; }; - GMMBoost = derive2 { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[magic minqa]; }; - GMSE = derive2 { name="GMSE"; version="0.4.0.11"; sha256="1by65202swxcj453q3frac02b2lwny1mm1i95vcjhkqihqkffl2z"; depends=[shiny shinydashboard shinyjs]; }; + GMMBoost = derive2 { name="GMMBoost"; version="1.1.3"; sha256="0p9jnwjc8g83qsxkjz9lhaip1hkpdg6n4fdpz34b96vb7qhzrrqc"; depends=[magic minqa]; }; + GMSE = derive2 { name="GMSE"; version="0.4.0.13"; sha256="0xvdm0q7ghw6hr26134m0g33wfclwf7q9rdrlkkyb6mnzasqdfgs"; depends=[shiny shinydashboard shinyjs]; }; GMSimpute = derive2 { name="GMSimpute"; version="0.0.1.0"; sha256="1hmn5ss81df9j9ibgibs95j98irqzif94vq0c861mq4a65y59fcp"; depends=[ggplot2 glmnet reshape2]; }; GNAR = derive2 { name="GNAR"; version="1.0"; sha256="0iv82f118b54g09dc5ggr2z793dgjhxj22v05kypz5fnbdxcl5qf"; depends=[igraph wordcloud]; }; GNE = derive2 { name="GNE"; version="0.99-3"; sha256="11pk9w4xj27dyfn05bna99xqdb89wp0ljl798d5dyk5fcnhh7217"; depends=[alabama BB nleqslv SQUAREM]; }; @@ -1593,16 +1605,20 @@ in with self; { GPCSIV = derive2 { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; }; GPFDA = derive2 { name="GPFDA"; version="2.2"; sha256="1xqk03g8b8hi1vdqh6a9wml8ln0ad6lmy14z8k8c4wdc5kbzdr0b"; depends=[fda fda_usc MASS spam]; }; GPGame = derive2 { name="GPGame"; version="1.1.0"; sha256="00qiqd7p84k22wbmlmj8a81fy5m5rl6afhj2q61j0akicnbzjfw9"; depends=[DiceDesign DiceKriging GPareto KrigInv MASS mnormt mvtnorm Rcpp]; }; + GPL2025 = derive2 { name="GPL2025"; version="1.0.1"; sha256="0af42g3v91fbcmla2yq98v8rd4ifaznb1xvw7ny41r3843d8appc"; depends=[dplyr]; }; GPLTR = derive2 { name="GPLTR"; version="1.2"; sha256="0b4s090jlp2qpqqr0b1ifwyf2fal156y7vg9mjkw53y623ms5pix"; depends=[rpart]; }; GPM = derive2 { name="GPM"; version="3.0.1"; sha256="01vd68w5pnwhng83x5i0k9c5fhsn9siyzzndkvkmpis4mjm42sgv"; depends=[doParallel foreach iterators lattice lhs pracma randtoolbox Rcpp RcppArmadillo]; }; GPRMortality = derive2 { name="GPRMortality"; version="0.1.0"; sha256="0k5pfyl7r5vsac927aqx19lz93vyk5l3ydqkazn2hwwaw1lh2wav"; depends=[rstan]; }; GPSCDF = derive2 { name="GPSCDF"; version="0.1.1"; sha256="1l50a6p81lykiqlqiwb6kix5s6wzwdi8vddqhl418dlwlsh83ybf"; depends=[dplyr MASS nbpMatching nnet survival]; }; - GPareto = derive2 { name="GPareto"; version="1.1.4"; sha256="1awacgvss2n9r6s7dydgkg05rj328si830rj97fj900qmlv5gg1p"; depends=[DiceDesign DiceKriging emoa KrigInv ks MASS pbivnorm pso randtoolbox Rcpp rgenoud rgl]; }; + GPareto = derive2 { name="GPareto"; version="1.1.4.1"; sha256="0kmy7v3sm1h91havzla0fzmzihncbk01i7pbzsdq6cwhz7225mqj"; depends=[DiceDesign DiceKriging emoa KrigInv ks MASS pbivnorm pso randtoolbox Rcpp rgenoud rgl]; }; GPfit = derive2 { name="GPfit"; version="1.0-8"; sha256="05mpiyi2vxv0wqp422n1mnxa8msc4daq40cwpnpngbcwqhlgqkby"; depends=[lattice lhs]; }; - GPoM = derive2 { name="GPoM"; version="1.2"; sha256="1hhwdpish8j3j9y5q6r5pdsl1kpbwp1hjhcq24iiz4lfssib4k9f"; depends=[deSolve rgl]; }; + GPoM = derive2 { name="GPoM"; version="1.3"; sha256="1c870dfbpswx78n4s1v6zy0l1qknrs9335af0z01v1miyrmi95gd"; depends=[deSolve float rgl]; }; GPoM_FDLyapu = derive2 { name="GPoM.FDLyapu"; version="1.0"; sha256="1hpgiwh7b50gazp1msjsh2840b91wfrxhl2l45lxg6jr1m34q8pj"; depends=[deSolve GPoM]; }; GPrank = derive2 { name="GPrank"; version="0.1.4"; sha256="06j5fk427jkp5lphqlx48vfp4fagnxxnv4iyjcha8nvkswcblwgy"; depends=[gptk matrixStats RColorBrewer tigreBrowserWriter]; }; GPvam = derive2 { name="GPvam"; version="3.0-5"; sha256="0inhhx5ll4ybkwp71ijigxlyxsa0rdyxb38kgfgxb588dsk4scjz"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; + GPvecchia = derive2 { name="GPvecchia"; version="0.1.3"; sha256="1rabini84r5fvl630wkcikjzll89mamc6pqiilvcmsik5c6ymz3w"; depends=[BH fields FNN GpGp Matrix Rcpp RcppArmadillo sparseinv]; }; + GRANBase = derive2 { name="GRANBase"; version="2.6.20"; sha256="0z9378qimdpxrslib2avimik3xqd41angfg12j8vmcbg7zh3binh"; depends=[covr desc dplyr GRANCore htmlTable jsonlite markdown RCurl sendmailR stringi switchr]; }; + GRANCore = derive2 { name="GRANCore"; version="0.2.7"; sha256="0xnm7jb2s4ag4qvsfs1fq0f2ikvfqm3bvxhj8kmmxwynwl5pw287"; depends=[switchr]; }; GRAPE = derive2 { name="GRAPE"; version="0.1.1"; sha256="1jzvf45ch8x8f2x9kmvv02xz9bix5vplh8143vc4m1yyq42x09c6"; depends=[]; }; GRCdata = derive2 { name="GRCdata"; version="1.0"; sha256="0nshii6kfvffncgcrmm7wvniq94j9djj84jikcb6ck49viikkrky"; depends=[cubature nloptr]; }; GROAN = derive2 { name="GROAN"; version="1.2.0"; sha256="14n3k1wwz5pn82wcj00cdns4bp699f58k1nj8hp8jn0q7xr2sgv5"; depends=[plyr rrBLUP]; }; @@ -1615,31 +1631,31 @@ in with self; { GSAgm = derive2 { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[edgeR survival]; }; GSE = derive2 { name="GSE"; version="4.2"; sha256="0vrxn6j5brhwd38zqnr6m3in3hp1xfs1mfhps9qsj20d4w8d1rf9"; depends=[cellWise ggplot2 MASS Rcpp RcppArmadillo robustbase rrcov]; }; GSED = derive2 { name="GSED"; version="2.5"; sha256="0hz7rn0j62gy7bv67dxqpfdq86zv3yqhl9pwafcism94636h8vrj"; depends=[memoise R_utils rootSolve survival]; }; - GSIF = derive2 { name="GSIF"; version="0.5-5"; sha256="104v01yifpagj7kyjfy80c4dgn9wv76py0av90vmgc55qynmvv19"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA scales sp]; }; + GSIF = derive2 { name="GSIF"; version="0.5-5.1"; sha256="1nc177f200m3wfppmdh9cf6g2npx87c0mz2g17zdrw5crx688i8d"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA scales sp]; }; GSM = derive2 { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; }; GSMX = derive2 { name="GSMX"; version="1.3"; sha256="1n1d7rixj14ari46snsmi48qfmy00ihmzvayk3hkrp2d2d0xi2gh"; depends=[MASS]; }; - GSODR = derive2 { name="GSODR"; version="2.0.1"; sha256="0wy2qim636g5rfy046r3qab3r58j3w7ngx57k5gdarbwcjzxw07y"; depends=[countrycode curl data_table future_apply httr R_utils]; }; + GSODR = derive2 { name="GSODR"; version="2.1.0"; sha256="11vww5yx9cz5jgnfm93akh6x6cl2j818b2p7iqc57vly6pi1fz2v"; depends=[countrycode curl data_table future_apply httr R_utils]; }; GSSE = derive2 { name="GSSE"; version="0.1"; sha256="034mmxa6kjq5kgikhb5q75viagz5ck9irrjbxm26zq9099qxm13b"; depends=[Iso zoo]; }; GSelection = derive2 { name="GSelection"; version="0.1.0"; sha256="052vh1haxlzbh3c5i24nrwphapik1y8ribmh6q4axd447ggc0ff9"; depends=[gdata penalized SAM]; }; GSparO = derive2 { name="GSparO"; version="1.0"; sha256="0xna2crxqwy8fj0s79rxbdcaz9x912rp1vdwqv1557fsnmfv2yf0"; depends=[ggplot2 ThreeWay]; }; GUIDE = derive2 { name="GUIDE"; version="1.2.7"; sha256="0klaczmn3jnlzyh45yaqlc897irjfk467f4w03awmflaiwan3h6v"; depends=[rpanel tkrplot]; }; GUILDS = derive2 { name="GUILDS"; version="1.3"; sha256="0zl6x0vn93ybps63fqazvd93f2zwdq0rqqrp7d6n5rnamx99mm8d"; depends=[pracma Rcpp]; }; GUIProfiler = derive2 { name="GUIProfiler"; version="2.0.1"; sha256="10m4d7f2rhw6cmkrnw3jh4iqlkfphf4v7mpfwzw17laq0ncmsx5r"; depends=[graph MASS Nozzle_R1 proftools Rgraphviz rstudioapi]; }; - GUIgems = derive2 { name="GUIgems"; version="0.1"; sha256="0lmx8hw0496vk437p32l933cdb4vpi94f4kz58x20jj07c20maz6"; depends=[ggplot2 igraph MASS msm plyr rpanel stringr]; }; GUTS = derive2 { name="GUTS"; version="1.1.1"; sha256="05njlykhxs62k5cjrfwgbqyckbvf2jxjshg3avf6vhwwf58qyjq9"; depends=[Rcpp]; }; GUniFrac = derive2 { name="GUniFrac"; version="1.1"; sha256="1vgij7c9b0afl5wzwcn0pjdvn8gqz2jxk5q0gchd9zk1qd10a1vl"; depends=[ape matrixStats vegan]; }; - GVARX = derive2 { name="GVARX"; version="1.2"; sha256="1syd2266i4v4xmz22g455y63sbk9jdzz7ni0rlhdvhsmn4pb2d53"; depends=[lmtest lubridate sandwich strucchange tsDyn urca vars xts]; }; + GVARX = derive2 { name="GVARX"; version="1.3"; sha256="00iqwkshp1i9338x9khh8hyszad6150qb11jlvky5fm488wcw1y3"; depends=[lmtest lubridate sandwich strucchange tsDyn urca vars xts]; }; GWAF = derive2 { name="GWAF"; version="2.2"; sha256="11lk1dy24y1d0biihy2aypdvlx569lw1pfjs51m54rhgpwzkw6yd"; depends=[coxme geepack lme4]; }; GWASExactHW = derive2 { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; }; GWASbyCluster = derive2 { name="GWASbyCluster"; version="0.1.7"; sha256="0ivlkxbh8m23vbnjfmhk0vfczd5b8lzy9w4gm1m6jpvdm40kn70x"; depends=[Biobase limma rootSolve snpStats]; }; GWASinlps = derive2 { name="GWASinlps"; version="1.2"; sha256="036lv8f58kz6qdwaviyk1q1qsgcj9cimipq1cjrfpn8snkn7s1gh"; depends=[horseshoe mombf speedglm]; }; - GWASinspector = derive2 { name="GWASinspector"; version="1.4.2"; sha256="1xqrvgm2spwkyhrn215j5b2m6lc6hck9zkrmggbyyqakv04w507d"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr rmarkdown RSQLite]; }; + GWASinspector = derive2 { name="GWASinspector"; version="1.4.7"; sha256="0a75nh9hzhib2x5dg4598y3gyg7sflhdmj27j9hy2f5p03p4l64p"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr R_utils rmarkdown RSQLite]; }; GWEX = derive2 { name="GWEX"; version="1.0.2"; sha256="0iykciifbskcrx1qv4874nxli1sq6nbmlfinq4ksir3p93y7ds87"; depends=[abind doParallel EnvStats fGarch foreach lmomco MASS mvtnorm nleqslv Renext]; }; GWG = derive2 { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; }; GWLelast = derive2 { name="GWLelast"; version="1.2.2"; sha256="1nm4w5m4ca6npmpvh9nb0cnrbzlyv95nvvhgs3pqcrw4igagm4hj"; depends=[doParallel foreach geosphere glmnet sp spgwr]; }; GWRM = derive2 { name="GWRM"; version="2.1.0.3"; sha256="16ahlf1pbcpgha50a7ml2c336by50r287kihwshiazshifi5p3n3"; depends=[doParallel foreach]; }; GWSDAT = derive2 { name="GWSDAT"; version="3.0.3"; sha256="10xvnnhqjs2p1r6yzflhkfi4985ljs57k5k8r6g85y2hq46m80p8"; depends=[deldir digest geometry Kendall lattice MASS Matrix officer readxl rhandsontable sf shiny shinycssloaders shinydashboard shinyjs sm sp splancs zoo]; }; GWmodel = derive2 { name="GWmodel"; version="2.1-3"; sha256="1xha645sx73sy35s856qd4hd3y0n682bnrw0ahfzcr4fvzykc6iy"; depends=[FNN maptools Rcpp RcppArmadillo robustbase sp spacetime spatialreg spdep]; }; + GWnnegPCA = derive2 { name="GWnnegPCA"; version="0.0.1"; sha256="1fdlrdsqdg5gi7w3np7qcqdvxzgrvzj5bzqvh0d32ps59n8agsjy"; depends=[GWmodel nsprcomp sf sp]; }; GWsignif = derive2 { name="GWsignif"; version="1.2"; sha256="0bss5s3ijnlckz44p7jj49bn2r8nwqckpzwzcv0vci915q8jfsj2"; depends=[]; }; GaDiFPT = derive2 { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; }; GameTheory = derive2 { name="GameTheory"; version="2.7"; sha256="0vb7sjia5s58gw9zpkzddps8knxvbrz7fbi3m6digl8bf5vwhxxw"; depends=[combinat gtools ineq kappalab lpSolveAPI]; }; @@ -1647,10 +1663,10 @@ in with self; { GauPro = derive2 { name="GauPro"; version="0.2.2"; sha256="127agnhqbbavcf7sx0zq1c8ldh3w1d1iz5bpd1ixxkyaapmiq4qy"; depends=[lbfgs R6 Rcpp RcppArmadillo]; }; GaussianHMM1d = derive2 { name="GaussianHMM1d"; version="1.0.1"; sha256="1j1cwh0p7czy2l4qf6nymqcp8kkfaki0j2rj8p99nqn2vgc3vcax"; depends=[doParallel foreach]; }; GeDS = derive2 { name="GeDS"; version="0.1.3"; sha256="1ddq4hnyl3m3s4cchccxiqphi742ljcm86zqpa01a5nrjbnr87x6"; depends=[Matrix Rcpp Rmpfr]; }; - GeNetIt = derive2 { name="GeNetIt"; version="0.1-2"; sha256="0frrbakgnng52fvf912rywmcay2ncc01akb6jw9hlixn2qjr0rr1"; depends=[nlme raster rgeos sp spatialEco spdep velox]; }; + GeNetIt = derive2 { name="GeNetIt"; version="0.1-4"; sha256="1z9h3prlf5r7ks0ys4wy0i5i3giaplqmngsqwxllsy70jjb9s90h"; depends=[exactextractr nlme raster rgeos sf sp spdep]; }; GenAlgo = derive2 { name="GenAlgo"; version="2.1.5"; sha256="0d3y9kc2njsbzdngv67d4qrdsnn7nsxph5acc09vmwxpv1cyhxiw"; depends=[ClassDiscovery MASS oompaBase]; }; GenBinomApps = derive2 { name="GenBinomApps"; version="1.0-2"; sha256="1ps1rq8cjlwh658mysdh3xbn5fihanzcwxb38xvg4031vnwv80in"; depends=[]; }; - GenEst = derive2 { name="GenEst"; version="1.4.0.1"; sha256="14scdz77vm5lfzvjqhhczlyyyv1iwqv9i3pssd5f7f7mw6ig16qd"; depends=[corpus DT gsl gtools hellno htmltools lubridate matrixStats mvtnorm Rcpp shiny shinyjs sticky survival]; }; + GenEst = derive2 { name="GenEst"; version="1.4.2"; sha256="0ljw1rlp686j7nkz11pqvmm0swb2ix0pkk5wc0z5hg4xic98vld8"; depends=[corpus DT gsl gtools hellno htmltools htmlwidgets lubridate MASS matrixStats mvtnorm Rcpp shiny shinyjs survival]; }; GenForImp = derive2 { name="GenForImp"; version="1.0"; sha256="1wcvi52fclcm6kknbjh4r9bpkc2rg8nk6cddnf5j8zqbvrwf4k5x"; depends=[mvtnorm sn]; }; GenKern = derive2 { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; }; GenOrd = derive2 { name="GenOrd"; version="1.4.0"; sha256="17mfrj1fwj8mri1w0bl2pw1rqriidmd67i7gpn9v56g9dzw5rzms"; depends=[MASS Matrix mvtnorm]; }; @@ -1661,51 +1677,52 @@ in with self; { GeneClusterNet = derive2 { name="GeneClusterNet"; version="1.0.1"; sha256="1xi4c041c4m39f9wb5fklgmhi6ng78iwzzqch5xk9hx5blq6zd4m"; depends=[G1DBN igraph MASS]; }; GeneCycle = derive2 { name="GeneCycle"; version="1.1.4"; sha256="0pivwfjz1plfhwz7k2c33k6p0pa1014d80qsrk8ig9yqqqlyhy1z"; depends=[fdrtool longitudinal MASS]; }; GeneF = derive2 { name="GeneF"; version="1.0"; sha256="0bizf47944b2zv9ayxb9rhrqx0ilz2xlvkw7x5vbg7l67y2g2l4d"; depends=[]; }; - GeneNet = derive2 { name="GeneNet"; version="1.2.13"; sha256="0w52apk0nnr8nsskf26ff7ana8xiksr8wqmkjxzwhzgg7fncm61p"; depends=[corpcor fdrtool longitudinal]; }; + GeneNet = derive2 { name="GeneNet"; version="1.2.14"; sha256="0cdhrj15rz0w0pyw3r8mikrzsdh95y5i1c0pa3cn0c2bjnjx3x3n"; depends=[corpcor fdrtool longitudinal]; }; GeneralOaxaca = derive2 { name="GeneralOaxaca"; version="1.0"; sha256="19j5c5xr6mdb6pmih94wbjas4yh0dmsqfggg8clvdxkpwk0h338v"; depends=[boot]; }; GeneralisedCovarianceMeasure = derive2 { name="GeneralisedCovarianceMeasure"; version="0.1.0"; sha256="02s1wbsdp5ma4pnmcsdl5dwm156zx12d3n1ypzkc33lxg21ashzj"; depends=[CVST kernlab mgcv xgboost]; }; GeneralizedHyperbolic = derive2 { name="GeneralizedHyperbolic"; version="0.8-4"; sha256="01gqfvmzfslhxdnigzbl3rd55hk6r0kgd8fm9xjl0kb9vmb735lm"; depends=[DistributionUtils MASS]; }; - GeneralizedUmatrix = derive2 { name="GeneralizedUmatrix"; version="1.1.6"; sha256="1s0bn3y0s541v4wzh7rh82cakxcx3i6aff6x1g9m7jan5q9c1gac"; depends=[ggplot2 Rcpp RcppArmadillo]; }; + GeneralizedUmatrix = derive2 { name="GeneralizedUmatrix"; version="1.1.9"; sha256="02wbs1q9wzzgbfnx8nfc8wiyqim8vznlps3w91hgx7s28biq37n7"; depends=[ggplot2 Rcpp RcppArmadillo]; }; GeneticSubsetter = derive2 { name="GeneticSubsetter"; version="0.8"; sha256="0bd4snv3dwabc7mknmd2rjmffj67xq535x0bycajhd83d1jhjars"; depends=[]; }; GenoScan = derive2 { name="GenoScan"; version="0.1"; sha256="0p98imfvvz7l94kim3pxypyjs2pbxng4a2nagbafbady82ylr2vi"; depends=[data_table MASS Matrix seqminer SKAT]; }; GenomicMating = derive2 { name="GenomicMating"; version="2.0"; sha256="02v1pkarmardf7g8hf2n4jj4cq4707g5lcc7gnwsiyyh7pknd1y6"; depends=[dplyr emoa kohonen LowRankQP magrittr plotly qtl Rcpp RcppArmadillo scatterplot3d SOMbrero]; }; - GenomicTools = derive2 { name="GenomicTools"; version="0.2.8"; sha256="060i014x2d7588vl7k0s66hphk23c1y7svcpv58lwwpal96v5cm0"; depends=[circlize data_table GenomicTools_fileHandler gMWT Rcpp RcppArmadillo snpStats stringr]; }; - GenomicTools_fileHandler = derive2 { name="GenomicTools.fileHandler"; version="0.1.4"; sha256="10g47rbqrnfa47fj2g45m79zrxx56fk2z9abzch91m134xhi8qja"; depends=[data_table snpStats]; }; + GenomicTools = derive2 { name="GenomicTools"; version="0.2.9.7"; sha256="196shxbrcgiwaa7aav2aipsbj1smrkbhinn44aw9qfvz2x9zdz0m"; depends=[circlize data_table GenomicTools_fileHandler gMWT Rcpp RcppArmadillo snpStats stringr]; }; + GenomicTools_fileHandler = derive2 { name="GenomicTools.fileHandler"; version="0.1.5.9"; sha256="09l87wf78bj49cdh7r3x81hn15c4pihxih8l59xxrpgdhp69268c"; depends=[data_table snpStats]; }; GeoBoxplot = derive2 { name="GeoBoxplot"; version="1.0"; sha256="164dh49ac3fx38fdglv32lmz92ca8jdd98cbhz6mxsk8r0jcladw"; depends=[]; }; GeoDE = derive2 { name="GeoDE"; version="1.0"; sha256="0wawkzj0344pprm8g884d7by8v74iw96b109rgm7anal48fl30im"; depends=[MASS Matrix]; }; GeoLight = derive2 { name="GeoLight"; version="2.0.0"; sha256="1i49hyj3f5rcw0s6j2csnfwc6mnp5zn44vxjnk05wdkpw6dpvx5i"; depends=[changepoint fields maps MASS]; }; GeoMongo = derive2 { name="GeoMongo"; version="1.0.1"; sha256="19wim724sgmxx9rd5yvmqdml0hppb92b8qvpl5zqrlnzxzm0ih5x"; depends=[data_table geojsonR R6 reticulate]; }; GeoRange = derive2 { name="GeoRange"; version="0.1.0"; sha256="0krj9570wkhdvpaqkq3nf0maglqd44mpwn4v1bymvgpk1i1wf5p3"; depends=[moments proj4 raster sp velociraptr]; }; - GeoTcgaData = derive2 { name="GeoTcgaData"; version="0.2.2"; sha256="0ac0wmd9vbridc7ngwyjgzj2n6wd784rv1dqfyxqjx82g2kxmgqh"; depends=[data_table]; }; + GeoTcgaData = derive2 { name="GeoTcgaData"; version="0.2.3"; sha256="0w53ng7q04wxc5ij1svck26liyy82z7vm8y0r19k9cjca0wjxi97"; depends=[data_table]; }; GeomComb = derive2 { name="GeomComb"; version="1.0"; sha256="05xb6m2ciszxd13yhqdkildh9nsq19ss8885ngj6ynvbchqkii7r"; depends=[forecast ForecastCombinations ggplot2 Matrix mtsdi psych]; }; - GerminaR = derive2 { name="GerminaR"; version="1.3"; sha256="1q52rp0xvs2mmc4mr7dx1zq78xags5j7kdgj8h05m8qh8dfhzvqf"; depends=[agricolae assertthat dplyr DT ggplot2 gsheet gtools magrittr readxl shiny shinydashboard tibble tidyr]; }; + GerminaR = derive2 { name="GerminaR"; version="1.4.2"; sha256="1sppkh42yj5p9kwlpiq3l1v720idbc9ni82m1hbdf9bg49h1gf3i"; depends=[agricolae assertthat dplyr DT ggplot2 gsheet gtools magrittr purrr readxl shiny shinydashboard tibble tidyr]; }; GetBCBData = derive2 { name="GetBCBData"; version="0.5"; sha256="1i5b5sawa8ngjp1afm1grm9hbmkhd5pcwqagkamlihsrmsvcdffn"; depends=[curl dplyr furrr future jsonlite lubridate memoise purrr RCurl readr stringr]; }; GetDFPData = derive2 { name="GetDFPData"; version="1.5.2"; sha256="1xa1dy1lm4v2lch3qmfa990bx8r1qzch7jkpnydlnzmd0qmcbvb4"; depends=[curl dplyr lubridate readr reshape2 stringr tibble xlsx XML]; }; GetHFData = derive2 { name="GetHFData"; version="1.7"; sha256="05xmr880n6arvpn6lb51yn9qssc8594rsxp6cinshk2jh6hq4fnj"; depends=[curl dplyr lubridate RCurl readr stringr]; }; - GetLattesData = derive2 { name="GetLattesData"; version="1.3.1"; sha256="1rq89110qgfi9v47pqahrzzcmh26r1724sgb8bbccsrydfscf994"; depends=[curl dplyr readr stringdist stringr XML]; }; + GetLattesData = derive2 { name="GetLattesData"; version="1.4"; sha256="129hnhmw8aw81whyj3g7npwgmg4fmvsji9h2xfg78nrp0abjxijv"; depends=[curl dplyr readr stringdist stringr XML]; }; GetQuandlData = derive2 { name="GetQuandlData"; version="0.1.0"; sha256="1g1as4m853ab1wp57rzqm0552g0vm7kxzypibv0xywc85084pnmc"; depends=[dplyr jsonlite memoise purrr readr scales stringr]; }; GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; }; GetTDData = derive2 { name="GetTDData"; version="1.4.2"; sha256="1qz75hq1c89riq0jpzjkr9gbk5y7894kb0ydhdyji7kjl1kvgyvx"; depends=[bizdays curl RCurl readxl rvest stringi stringr tidyr XML xml2]; }; GetoptLong = derive2 { name="GetoptLong"; version="0.1.8"; sha256="1l8xkvyl152bsyvxazsvx2sm1vkygn75x0lsg3sbg7xp6drdn3kc"; depends=[GlobalOptions rjson]; }; Ghat = derive2 { name="Ghat"; version="0.1.0"; sha256="1w5agphnbngc0ldb3gbgh4b8ww956lf31bfyxw2zp56crx4akcxf"; depends=[rrBLUP]; }; + Ghost = derive2 { name="Ghost"; version="0.1.0"; sha256="0anrb1n3f3jnq2p0dgqzw5a0gby2slafv2bybgy5gm3f9fsj831w"; depends=[R6]; }; GiNA = derive2 { name="GiNA"; version="1.0.1"; sha256="0his7wsgnggyv9526blxzxa1ni8hwq2ws64wkmha45nvvnm3dsiw"; depends=[doParallel EBImage foreach png]; }; GiRaF = derive2 { name="GiRaF"; version="1.0"; sha256="02356cq0g6v5m72fy5z83bw3nsb7kpc9sy7sykk97735n928z92n"; depends=[BH Rcpp RcppArmadillo]; }; GibbsACOV = derive2 { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; }; Gifi = derive2 { name="Gifi"; version="0.3-9"; sha256="0rwyj60cldf3k118cnc5px16dc5p5bfxgl0w2m1lh6rsqlmza25a"; depends=[colorspace]; }; GillespieSSA = derive2 { name="GillespieSSA"; version="0.6.1"; sha256="0li0jqnbl9rfj8gbspq7fv327fii53rh93ffsxpic7804rmrnbi7"; depends=[]; }; - GillespieSSA2 = derive2 { name="GillespieSSA2"; version="0.2.5"; sha256="1mswjy9fvrgn5353w1mnkmbr98bn1jdinsyc50ygy42z7sd4ijp2"; depends=[assertthat dplyr dynutils Matrix purrr Rcpp RcppXPtrUtils readr rlang stringr tidyr]; }; + GillespieSSA2 = derive2 { name="GillespieSSA2"; version="0.2.6.1"; sha256="0nm9mdy537d2kza7x4bl6mvawgqpna4cva1xa0n9pcw70cc319nx"; depends=[assertthat dplyr dynutils Matrix purrr Rcpp RcppXPtrUtils readr rlang stringr tidyr]; }; GiniDistance = derive2 { name="GiniDistance"; version="0.1.0"; sha256="0jq1dwpsvh3k25lawvzf9ij72jsspzyqsbnrphz8aqwi1dkm3851"; depends=[energy randomForest Rcpp RcppArmadillo readxl]; }; GiniWegNeg = derive2 { name="GiniWegNeg"; version="1.0.1"; sha256="1wqwjalsyp55si839cil6na3khigm0mwn6qkg0kjylq10pabfk2a"; depends=[]; }; - GlmSimulatoR = derive2 { name="GlmSimulatoR"; version="0.2"; sha256="1bbxn8y17dk0n497fvfjl84ssn5qnp5kxlmqzzhzs264vvxfbz0l"; depends=[assertthat cplm dplyr ggplot2 magrittr MASS purrr rlang statmod stringr tweedie]; }; + GlmSimulatoR = derive2 { name="GlmSimulatoR"; version="0.2.1"; sha256="04zgjfzi1cbg7p0dv7f499yv9jf66w620kzrvxbx3yb6h5by6xz2"; depends=[assertthat cplm dplyr ggplot2 magrittr MASS purrr rlang statmod stringr tweedie]; }; GlobalDeviance = derive2 { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; }; GlobalFit = derive2 { name="GlobalFit"; version="1.2"; sha256="01s51nxcsl8xxn6khbv5jsvpwblwf0iamvr477a1rraqqqj94zx0"; depends=[sybil]; }; GlobalOptions = derive2 { name="GlobalOptions"; version="0.1.1"; sha256="0x89hfz80avq4zcskxl71i4zi0mgniqqxfrvz050aa2189wfyja2"; depends=[]; }; - GmAMisc = derive2 { name="GmAMisc"; version="1.0.0"; sha256="14rs13y509hijg4ars3j55fm0133487alm8b9jlffbz8qiln48g4"; depends=[caTools classInt cluster coin corrplot DescTools dismo ggplot2 ggrepel gridExtra Hmisc InPosition kimisc lsr maptools plyr pROC raster RcmdrMisc rgdal rgeos rworldmap shape sp spatialEco spatstat]; }; - Gmedian = derive2 { name="Gmedian"; version="1.2.4"; sha256="0lr1hwprqy9mq5qyp83qqxj8dh5sy487xkqbv2y1qdinzj62pvcn"; depends=[Rcpp RcppArmadillo robustbase RSpectra]; }; - Gmisc = derive2 { name="Gmisc"; version="1.9.1"; sha256="1gskaaimiq65pl5h4h8cp1cp4klniw7qz80z8zlc5nrkzph8s1md"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown stringr XML]; }; + GmAMisc = derive2 { name="GmAMisc"; version="1.1.1"; sha256="0bvf5p779g8nn0wmna61jyns7wdjl0b0283r8b7m0s325mh6ckfv"; depends=[caTools classInt cluster coin corrplot DescTools dismo ggplot2 ggrepel gridExtra Hmisc InPosition kimisc lsr maptools plyr pROC raster RcmdrMisc rgdal rgeos sp spatstat]; }; + Gmedian = derive2 { name="Gmedian"; version="1.2.5"; sha256="0xx8x4g6wb9djmkx3q1bwwa1vgf10avi6ka3x1jzgsxk6x0jsx0i"; depends=[Rcpp RcppArmadillo robustbase RSpectra]; }; + Gmisc = derive2 { name="Gmisc"; version="1.9.2"; sha256="08wkdaf2dyji7vkc0w4ay0f2pkll3psc1ap4rn7pdvfz2wlgs7c9"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown stringr XML]; }; GoFKernel = derive2 { name="GoFKernel"; version="2.1-1"; sha256="0xygsdmggl35fafyp431mkwalwixw2r3f32qll1pf72dfwd8y8d3"; depends=[KernSmooth]; }; - GofKmt = derive2 { name="GofKmt"; version="2.0"; sha256="0018ljzlj7nkf12g0sqa8iyq3j2bnj9la3fwblx9lbdn8nxgllhn"; depends=[Rsolnp]; }; - GoodmanKruskal = derive2 { name="GoodmanKruskal"; version="0.0.2"; sha256="1qwarachkhc2yvjyxfcfbgjc1x9ni5xb7f93zviv8mz3c35bhs3b"; depends=[classInt corrplot]; }; + GofKmt = derive2 { name="GofKmt"; version="2.1.1"; sha256="11dspnx1cljbbwk4xhg1l5vv2c8q24k294c122rdgc2zqp8k2c04"; depends=[ggplot2 Rcpp RcppArmadillo Rsolnp]; }; + GoodmanKruskal = derive2 { name="GoodmanKruskal"; version="0.0.3"; sha256="1d0xkmkcfcwx0qs8m4b9dgrbkg1qpb859mmzg4d1rww8rc0wxh9h"; depends=[classInt corrplot]; }; GoogleKnowledgeGraphR = derive2 { name="GoogleKnowledgeGraphR"; version="0.1.0"; sha256="1jxiq1s48skn43pydsw8s67hf70v9fhhw2drcx9vni3c3szs44qd"; depends=[curl jsonlite]; }; GpGp = derive2 { name="GpGp"; version="0.2.1"; sha256="0sa2xfharyy21mfcxl7hzgmaq3x8iz834mbbcfkqm5qf689i08yj"; depends=[FNN Rcpp RcppArmadillo]; }; Grace = derive2 { name="Grace"; version="0.5.3"; sha256="0r41zvgdd5rqm15axqqssik6plwy7snpgw8m32labkfn3f0pp7n0"; depends=[glmnet MASS scalreg]; }; @@ -1717,7 +1734,8 @@ in with self; { GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.2"; sha256="1x3hnyqq75krlygg82qm0ldd8nsv071nzgr63zkjmifc7hgi0nvb"; depends=[GreedyExperimentalDesignJARs rJava]; }; GreedyExperimentalDesignJARs = derive2 { name="GreedyExperimentalDesignJARs"; version="1.0"; sha256="14i6m5qlh1fca9xmzid01hicd3bkf6rzl139ss78gvw544zrapw7"; depends=[rJava]; }; GreedySBTM = derive2 { name="GreedySBTM"; version="1.0"; sha256="1r29cd8nxpyc82rz2xb9mk9wc17gcdlcl9lw1j3y4npr2z0qhf13"; depends=[Rcpp RcppArmadillo]; }; - Greg = derive2 { name="Greg"; version="1.3.2"; sha256="0df91kzhvcj85baz1z3kfih2kv2yvi8is4adpl4kx6nwfd2d3q82"; depends=[Epi forestplot Gmisc Hmisc htmlTable knitr magrittr nlme rms sandwich stringr]; }; + Greg = derive2 { name="Greg"; version="1.3.3"; sha256="1909lpsax1dwblrq0ab52vwz8iik9h8p5w2nmlsrwfwyv8018yha"; depends=[Epi forestplot Gmisc Hmisc htmlTable knitr magrittr nlme rms sandwich stringr]; }; + GridOnClusters = derive2 { name="GridOnClusters"; version="0.0.7"; sha256="009h5yx81by6jscvibkxb2j5xi4wqarcrw0504yxdnmgi8w3khmr"; depends=[cluster dqrng fossil Rcpp]; }; GriegSmith = derive2 { name="GriegSmith"; version="1.0"; sha256="1a7gnaig1wvxpph7d8c37kx51dznzk0457fzf7alw95iwpyb4z7j"; depends=[spatstat]; }; GrimR = derive2 { name="GrimR"; version="0.5"; sha256="005ywc31yn1cs54kjlkrryw0s7zm8dqqfjkdlkm4s1sbc9r3mssz"; depends=[car]; }; GroupComparisons = derive2 { name="GroupComparisons"; version="0.1.0"; sha256="0fxgh1mksrfmd4yjrpxg3nfby5wyx75lj0shb5xrdzl7pxzh56ai"; depends=[car]; }; @@ -1726,12 +1744,11 @@ in with self; { GrpString = derive2 { name="GrpString"; version="0.3.2"; sha256="14ss6assqk6s9kv4bvzlydm8qrbnslm4vj876q5dn2dw4k50dai1"; depends=[cluster plyr Rcpp]; }; GsymPoint = derive2 { name="GsymPoint"; version="1.1.1"; sha256="1fg8vqd86kcpciphmlcxlm0rk01iza7md5y8kcxp9i732n4zn7r8"; depends=[ROCR Rsolnp truncnorm]; }; GuardianR = derive2 { name="GuardianR"; version="0.9"; sha256="0z0bgm3kr7yqx0yfzhs07k1gs97zpjajfnxn1w1m5w76s7czfzl7"; depends=[RCurl RJSONIO]; }; - Guerry = derive2 { name="Guerry"; version="1.6-1"; sha256="1hpp49w2kd1npsd709cwg125pw6mrqxfv2nn3lcs1mg2r49ki2bl"; depends=[]; }; + Guerry = derive2 { name="Guerry"; version="1.7.0"; sha256="0r92xs1ps48yznc146gqmdvz47zvlqfb14yz2ys8bjlk0wna9agv"; depends=[sp]; }; GuessCompx = derive2 { name="GuessCompx"; version="1.0.3"; sha256="1xbkh1wh2z0n964w8lwi7q4rr7mls0awf5k7n5jjklhq4b6gswic"; depends=[boot dplyr ggplot2 lubridate reshape2]; }; GxM = derive2 { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[minqa nlme Rcpp]; }; HAC = derive2 { name="HAC"; version="1.0-6"; sha256="1cdh3s8nm17mfjj0zdxzhlmakcd0m12xfjx0b4gyx24xkahklr8i"; depends=[copula numDeriv]; }; HACSim = derive2 { name="HACSim"; version="1.0.5"; sha256="0161h3yhi3bh0jq7x105p3rjlrvl46k4iahfz4k84wsvw3akgk1a"; depends=[ape pegas Rcpp RcppArmadillo]; }; - HAP_ROR = derive2 { name="HAP.ROR"; version="1.0"; sha256="1id9amz1cc2l2vnpp0ikbhf8ghbgzqd1b9dfivnyglg7996c3gbg"; depends=[ape hash]; }; HAPim = derive2 { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; }; HARModel = derive2 { name="HARModel"; version="1.0"; sha256="17sajqi2g5z69gvnfhkn850jkavi8syhm58xadd2khrm73nvwh2i"; depends=[Rcpp RcppArmadillo sandwich xts zoo]; }; HARtools = derive2 { name="HARtools"; version="0.0.5"; sha256="10a92jsk1ccgxi5g6byrs4fbj5l2kih7vhib0jg6spdqi6rhqla1"; depends=[assertthat htmltools htmlwidgets jsonlite magrittr]; }; @@ -1742,8 +1759,9 @@ in with self; { HCR = derive2 { name="HCR"; version="0.1.1"; sha256="14s46dyw3ifp3pwwlcwbbl47i6hy2whjj1n65i28am5a33nycgha"; depends=[data_table]; }; HCT = derive2 { name="HCT"; version="0.1.0"; sha256="0p1bj0spqff8m27lvxdfhk8z1r1z04v1dsv7mqbjyzl07w005hk3"; depends=[rstan]; }; HCTR = derive2 { name="HCTR"; version="0.1.1"; sha256="1hg8mpallwxpmamk6q8x87w5hlqqwvbahfw5zmr9pisiagbwcsay"; depends=[glmnet harmonicmeanp MASS ncvreg Rdpack]; }; - HCmodelSets = derive2 { name="HCmodelSets"; version="1.1"; sha256="1krcwx6s4fh8ngx81lmdzd12i8k2yczvc4iv9k718xnaji1b8mkd"; depends=[ggplot2 mvtnorm survival]; }; + HCmodelSets = derive2 { name="HCmodelSets"; version="1.1.1"; sha256="1fk4q6422lzyf4cwirqz1d70av21m6pwmsy2rqjcraclr4mddw7s"; depends=[ggplot2 mvtnorm survival]; }; HDCI = derive2 { name="HDCI"; version="1.0-2"; sha256="0wxbv54kbygymhh4r7052vnbj603c1kya01ykvmqzzkjyyfzidkz"; depends=[doParallel foreach glmnet iterators lattice Matrix mvtnorm slam]; }; + HDCurves = derive2 { name="HDCurves"; version="0.1.0"; sha256="1ifcbwcqgdxicqxcqrsl9kp3zadxhijpwff8ln309378vybr3gh1"; depends=[]; }; HDDesign = derive2 { name="HDDesign"; version="1.1"; sha256="1jim4h9bwn8r637va7m81kwwsfwyzs9pzn5a9i7c8xz8b1x191bj"; depends=[]; }; HDGLM = derive2 { name="HDGLM"; version="0.1"; sha256="0a5lnh3780lsczj8339sp97c5y64a2gsdf77i56fvpxpphq0dnf8"; depends=[]; }; HDInterval = derive2 { name="HDInterval"; version="0.2.0"; sha256="1y51q0dwav3x7c0vp571v89vq1a5mivsxsyahqrv1la12zw0m7il"; depends=[]; }; @@ -1753,14 +1771,14 @@ in with self; { HDclassif = derive2 { name="HDclassif"; version="2.2.0"; sha256="1l5zxhayhzh7q50ycl481hy0br66ylxyvzw1ahmjjrdkm8s3czyj"; depends=[MASS rARPACK]; }; HDclust = derive2 { name="HDclust"; version="1.0.3"; sha256="18l4qp261gj3kscfxs3s03kmb9y5ml31vnpgpm1iy125bks4mr2y"; depends=[Rcpp RcppProgress Rtsne]; }; HDcpDetect = derive2 { name="HDcpDetect"; version="0.1.0"; sha256="0ai35d9df5pmva52sb1rr20f11h0mbal6d179g865b7w6n90kfr1"; depends=[]; }; - HDoutliers = derive2 { name="HDoutliers"; version="1.0"; sha256="0pby640bad0jcf1lkwg2g6flassb1pimnjm411c6x8rgvmiphc23"; depends=[FactoMineR FNN mclust]; }; + HDoutliers = derive2 { name="HDoutliers"; version="1.0.1"; sha256="1h41x13lkvzxs6lswzdwc4zs1z8flrf1qq8cr16xjf1azqk00ac2"; depends=[FactoMineR FNN mclust]; }; HDtest = derive2 { name="HDtest"; version="2.1"; sha256="1c9x4s59762sp7drbm5h1xv22kpifq7p0x3dkrfcd0ficbbma5v8"; depends=[checkmate clime doParallel expm fastclime foreach MASS mvtnorm]; }; HDtweedie = derive2 { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; }; - HEMDAG = derive2 { name="HEMDAG"; version="2.6.0"; sha256="0mrxwm1a1axdm80by9xx0m3fla2v6sigcfiq3p9j7zg2myhk1bn9"; depends=[doParallel foreach graph plyr precrec preprocessCore RBGL]; }; + HEMDAG = derive2 { name="HEMDAG"; version="2.6.1"; sha256="138byk1vzkw9g58ml3vf2ivj0bdanj8klqv0y8s7af3s5swlis18"; depends=[doParallel foreach graph plyr precrec preprocessCore RBGL]; }; HETOP = derive2 { name="HETOP"; version="0.2-6"; sha256="1fjwyqh7l296pghmc4m81q8icgbhvqvxr61zd638fr46gls3ky2p"; depends=[R2jags]; }; HGNChelper = derive2 { name="HGNChelper"; version="0.8.1"; sha256="0qwkk5658j4j6w2wgvxkp38cyvscjp93d3zc7gb97vcihqx0ngxa"; depends=[]; }; HGSL = derive2 { name="HGSL"; version="1.0.0"; sha256="1p453xr3d1bmqc6mrmzb0hz9p0gp25m6v6qr0l3bapcf71vzbvq1"; depends=[]; }; - HH = derive2 { name="HH"; version="3.1-39"; sha256="0qhprqspks2zjxa82cicsr7nqhpaasklsc4apxkmqfyr5dva0q10"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; }; + HH = derive2 { name="HH"; version="3.1-40"; sha256="18m8sj1s1v94a2nvrbii96ji0j9v3jajqyv9wrky72m903cj8nbr"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; }; HHG = derive2 { name="HHG"; version="2.3.2"; sha256="159bs5cxdm770h66fam48451n9krpw2fn5gr397h730x2w7l41ki"; depends=[Rcpp]; }; HI = derive2 { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; }; HIMA = derive2 { name="HIMA"; version="1.0.7"; sha256="0mvphwmm8gmin933bji2l2gbpjzm42vyc7sdka4xpjfsaal9pp9i"; depends=[doParallel foreach iterators ncvreg]; }; @@ -1769,13 +1787,13 @@ in with self; { HK80 = derive2 { name="HK80"; version="0.0.2"; sha256="0c8scpzl5xgqm9rlsvh5nl3bz42i5pzvb873j9bn3bi15gcknbny"; depends=[]; }; HKprocess = derive2 { name="HKprocess"; version="0.0-2"; sha256="1j2yhb7k8zf4nlzdf0p6x9ca7ak4lwwak8mcc60kpilw2fws27k5"; depends=[gtools MCMCpack]; }; HLMdiag = derive2 { name="HLMdiag"; version="0.3.1"; sha256="02pgvfyj3xpy7laxryqivsws8jl3m79fwfzpqj8ad794a06gh87g"; depends=[ggplot2 MASS Matrix mgcv plyr Rcpp RcppArmadillo reshape2 RLRsim]; }; - HLSM = derive2 { name="HLSM"; version="0.8.1"; sha256="17y8xv5h6n0z99a858399wwskqcp897q157rl7b838rqip37xlh9"; depends=[coda igraph MASS]; }; + HLSM = derive2 { name="HLSM"; version="0.8.2"; sha256="1jqfk5mlx603s3v069dab7wm0wy8qil50rw1s5x6f21xrahaqks2"; depends=[abind coda igraph MASS]; }; HMB = derive2 { name="HMB"; version="1.0"; sha256="1a4h2d82hglv13q9mq98i67k1x9mkaf4bm2hr9dl3z0q6x0piwqr"; depends=[Rcpp RcppArmadillo]; }; - HMDHFDplus = derive2 { name="HMDHFDplus"; version="1.9.1"; sha256="0gqaagzzspw3a40dqsqhxhjb8kii6xsc62p9b464rkhrwrm5i4z8"; depends=[httr RCurl XML]; }; + HMDHFDplus = derive2 { name="HMDHFDplus"; version="1.9.13"; sha256="1n507nsqz1blikci56jhp48rdpq38dnadh8warc2jmvwizl22a3b"; depends=[httr RCurl XML]; }; HMM = derive2 { name="HMM"; version="1.0"; sha256="0z0hcqfixx1l2a6d3lpy5hmh0n4gjgs0jnck441akpp3vh37glzw"; depends=[]; }; HMMCont = derive2 { name="HMMCont"; version="1.0"; sha256="1drni4f72x83sprn65wnhw0pv1q8lfkgmxdr9h4rwv1accril85x"; depends=[]; }; HMMEsolver = derive2 { name="HMMEsolver"; version="0.1.2"; sha256="0msin7rq3npz221mvrw3zcs6bwz439six99iblx5p3hkp1n1ljf3"; depends=[Rcpp RcppArmadillo Rdpack]; }; - HMMcopula = derive2 { name="HMMcopula"; version="1.0.3"; sha256="192d0mg0smpdvxvlmha8h3pzfjmzf729ndijc0xngp9yq8syf882"; depends=[copula doParallel foreach matrixcalc mvtnorm]; }; + HMMcopula = derive2 { name="HMMcopula"; version="1.0.4"; sha256="1gmvav02r3miaq4jx05qjcgzw5qv6w1j77vck5gpps8p38zcp34m"; depends=[copula doParallel foreach matrixcalc mvtnorm]; }; HMMextra0s = derive2 { name="HMMextra0s"; version="1.0.0"; sha256="15y5q92x69sn80pc2x7xwbnsfrqpf7cjdja4hkq861jshkksbmg1"; depends=[ellipse mvtnorm]; }; HMMmlselect = derive2 { name="HMMmlselect"; version="0.1.5"; sha256="10h62h03hiip8m1h93sbln413l6cmxmc6hsq3rla6acjk6hfxb2v"; depends=[DirichletReg HiddenMarkov mclust mvtnorm Rcpp]; }; HMMpa = derive2 { name="HMMpa"; version="1.0.1"; sha256="0c3jmvcklywqsjmskx7zbw4d3l8i6bzr5h741v8iwgyw67mjn37g"; depends=[]; }; @@ -1784,11 +1802,9 @@ in with self; { HMR = derive2 { name="HMR"; version="1.0.0"; sha256="128q3d8r3z9gwnhqszwj8z0kf4la7szkwd11a6x0yhglmyrs1905"; depends=[]; }; HMVD = derive2 { name="HMVD"; version="1.0"; sha256="0agzvsl2n3zg3i519b93jqpiq9zix0bbrjdzk3ymsbb42dzkmj0d"; depends=[MASS]; }; HPbayes = derive2 { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[boot corpcor MASS mvtnorm numDeriv]; }; - HRM = derive2 { name="HRM"; version="1.0.2"; sha256="0krd27raa2ys2gsgqpbxpfnmigj8s6mk3al7fh3czx5l0d73iqy1"; depends=[data_table doBy ggplot2 MASS matrixcalc mvtnorm plyr pseudorank Rcpp reshape2 xtable]; }; - HRQoL = derive2 { name="HRQoL"; version="1.0"; sha256="1gr9rhr8gdnh7bw2v3r0xc3yhmzrx2gzgsd8wd5mmsp81ph0h5lz"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; }; + HRM = derive2 { name="HRM"; version="1.2.1"; sha256="0qsxwi0v61k1waw21nrz86jazd5wgq2drhan3w8pmb35q2z20s35"; depends=[data_table doBy ggplot2 MASS matrixcalc mvtnorm plyr pseudorank Rcpp reshape2 xtable]; }; HRW = derive2 { name="HRW"; version="1.0-3"; sha256="12y43sl30949jc9ab10ipx8k4rvb9g8gwaazi8j3k1grh26ivpii"; depends=[KernSmooth]; }; HS = derive2 { name="HS"; version="1.1"; sha256="1vhbchc446j49jj7jgmy4l59n8ahk5l8jp1rl5xwsmn9iqir62mp"; depends=[data_table ggplot2 ggpubr partitions reshape2 tidyr zoo]; }; - HSAR = derive2 { name="HSAR"; version="0.4.2"; sha256="0rxb2klmyynr8rzq6ka8p40lw81wjd0jkw2wg3vg90zny0zps98j"; depends=[Rcpp RcppArmadillo spdep]; }; HSAUR = derive2 { name="HSAUR"; version="1.3-9"; sha256="0b2hyn59lr2pma87fcj7mli3qmrbnfhgd8fv02fa317rj52399qz"; depends=[]; }; HSAUR2 = derive2 { name="HSAUR2"; version="1.1-17"; sha256="0jc554lz5lj7180vd4rbrjkywar4bh38c7i9kyxhd5clg4afxpw8"; depends=[]; }; HSAUR3 = derive2 { name="HSAUR3"; version="1.0-9"; sha256="1rpvblak0xvkavbvbd35zq1lcsl5z1zp30vn70wqbkdj7szhj9b4"; depends=[]; }; @@ -1801,11 +1817,13 @@ in with self; { HTSCluster = derive2 { name="HTSCluster"; version="2.0.8"; sha256="0wnbfh6hdx8692jilgmv8sys1zm6fqc6mim7vvjhyqlmpm8gm0kg"; depends=[capushe edgeR plotrix]; }; HTSSIP = derive2 { name="HTSSIP"; version="1.4.1"; sha256="1j2f6f3i4di4bvsk44gxz0narg45ld2rahfn23wpgni5bszy0vb3"; depends=[ape coenocliner DESeq2 dplyr ggplot2 igraph lazyeval magrittr phyloseq plyr stringr tidyr vegan]; }; HUM = derive2 { name="HUM"; version="1.0"; sha256="1bq74l88jvscmq9ihv5wn06w2wng073ybvqb2bdx2dmiqlpv6jw2"; depends=[gtools Rcpp rgl]; }; + HURDAT = derive2 { name="HURDAT"; version="0.2.3.1"; sha256="0k80bll26wxn902m7p7va7f9xk5kbwkf538jvdw8qdlz5a77a2aa"; depends=[dplyr purrr readr rlang rvest tidyr xml2]; }; HW_pval = derive2 { name="HW.pval"; version="1.0"; sha256="14nmyqw2d9cmn64789yc54fmiqanh6n1dizp7vj94h7b0jwq63yy"; depends=[]; }; HWEBayes = derive2 { name="HWEBayes"; version="1.4"; sha256="1rbffx6pn031a278ps9aqxcaq8yi73s5kf60za143ysbfxv9dphw"; depends=[MCMCpack mvtnorm]; }; HWEintrinsic = derive2 { name="HWEintrinsic"; version="1.2.2"; sha256="035r5bi7m66g351cmrfmf4cj5qqm4fn5pgy3lzsp3gyp2dv0rkg5"; depends=[]; }; HYRISK = derive2 { name="HYRISK"; version="1.2"; sha256="1ngwwzv1pavmscpca3ryzfxzd9rppsh0sm7k4sp2kzc9c0bix4xp"; depends=[kerdiest pbapply reliaR rgenoud sets triangle]; }; - HaDeX = derive2 { name="HaDeX"; version="1.0"; sha256="14f4ql685wrhsmg9yklbfky7b3vsxm4dyiqmpmrl7199kqzinjc0"; depends=[data_table dplyr DT ggplot2 gsubfn latex2exp readr readxl reshape2 shiny stringr tidyr]; }; + HaDeX = derive2 { name="HaDeX"; version="1.1"; sha256="1c87bj4qiq28a51l90r5rhk9nzn8lgssby686fsin0d3y068krbg"; depends=[data_table dplyr DT ggplot2 gsubfn latex2exp readr readxl reshape2 shiny stringr tidyr]; }; + HadamardR = derive2 { name="HadamardR"; version="1.0.0"; sha256="0nr8m6fchpmlvhyisb61y0fymjjrk2k1sd67r14n87sgn3mafh4a"; depends=[numbers openxlsx]; }; HadoopStreaming = derive2 { name="HadoopStreaming"; version="0.2"; sha256="1l9msaizjvnsj1jrpghj4g057qifdgg6vbqhfxhn1fiqdqi2056q"; depends=[getopt]; }; HandTill2001 = derive2 { name="HandTill2001"; version="1.0.0"; sha256="0qxaxwizx24gm3iycdmwdn8mqvnwnjhacsp9nwl9w4djayb5a9sg"; depends=[]; }; Hapi = derive2 { name="Hapi"; version="0.0.3"; sha256="0jqjhfq38k161kqff5cx0vxpsmjm2y5ca7049mvqiwqwvi4fp08m"; depends=[ggplot2 HMM]; }; @@ -1815,11 +1833,11 @@ in with self; { HarmonicRegression = derive2 { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; }; Harvest_Tree = derive2 { name="Harvest.Tree"; version="1.1"; sha256="021zmppy7p2iakaxirfjdb5jzakg1ijma9d25ly2ni0nx0p1mh6z"; depends=[rpart]; }; HellCor = derive2 { name="HellCor"; version="1.2"; sha256="1k7k8gj70wc31w27gykiy0fv2bs9q73414ma0hn3ziqg4cnrgl7m"; depends=[energy]; }; - HelpersMG = derive2 { name="HelpersMG"; version="3.9"; sha256="01az2cwz2vw1z3qjmwi8va4qp37fxy955sjdlk2jbk0cysf3p20q"; depends=[coda lme4]; }; + HelpersMG = derive2 { name="HelpersMG"; version="4.0"; sha256="18rv27xmvalhmshc847yq63srym0k7x352y1m033qpy5j0fjrijz"; depends=[coda lme4]; }; HeritSeq = derive2 { name="HeritSeq"; version="1.0.1"; sha256="0l1saxwj99xwkzcy43v0k9sicqwpw9gc8ywxpablagcddfj05pi3"; depends=[cplm DESeq2 lme4 MASS pbapply SummarizedExperiment tweedie]; }; HextractoR = derive2 { name="HextractoR"; version="1.4"; sha256="1wp7n92wgrjyklq159ymrw8y5ads6lhj2fcz54rzdnccdyx5naxi"; depends=[doParallel foreach seqinr]; }; HiCfeat = derive2 { name="HiCfeat"; version="1.4"; sha256="1imz7zfax74aakzk8457jww9r66qxpr2ncyvjj0y5paxdn76lnnq"; depends=[GenomeInfoDb GenomicRanges glmnet IRanges Matrix rtracklayer]; }; - HiClimR = derive2 { name="HiClimR"; version="2.1.5"; sha256="0qw0gpgp00gvm0kcsghwcnnhslyrigiknw4al6gs91ppq2fd2k78"; depends=[ncdf4]; }; + HiClimR = derive2 { name="HiClimR"; version="2.1.6"; sha256="1s7l78xjvld8cdbz18zk6mbzwwzpm9x6vj6fq4j4hrz11bzsr14y"; depends=[ncdf4]; }; HiCseg = derive2 { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; }; HiDimDA = derive2 { name="HiDimDA"; version="0.2-4"; sha256="0gxkxzys9mcy33xvsim8klaqmb2xwvy5bvgkn9r400j4qfjd3cgg"; depends=[]; }; HiLMM = derive2 { name="HiLMM"; version="1.1"; sha256="09135cwi6kqrvzdlivm86q1dqn6cbbi6nspdm0c2s700jl49pl5z"; depends=[]; }; @@ -1828,19 +1846,19 @@ in with self; { HierDpart = derive2 { name="HierDpart"; version="0.5.0"; sha256="1lrp5snkx5irrx6b19wdfmkpbxdy4gxkhpjibfin109s5r54jvvg"; depends=[ade4 adegenet ape diveRsity entropart GGally ggplot2 hierfstat mmod pegas permute reshape2 tibble vegan]; }; HierO = derive2 { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[bitops RCurl rneos tcltk2 XML]; }; HighDimOut = derive2 { name="HighDimOut"; version="1.0.0"; sha256="0r7mazwq4fsz547d3nyavmqya7144lg3fkl5f7amrp48l9h85vx2"; depends=[DMwR FNN foreach ggplot2 plyr proxy]; }; - HistDAWass = derive2 { name="HistDAWass"; version="1.0.3"; sha256="1kvq9q4lnbl2jkj7dvm2znp2ihvv1j6778pnfkkxflxa8aks29k6"; depends=[class FactoMineR ggplot2 ggridges histogram Rcpp RcppArmadillo]; }; + HighestMedianRules = derive2 { name="HighestMedianRules"; version="1.0"; sha256="01fj3xgrb9iav5v91bq04hzv9nhnwy8l00dx6yykghwvzjwfv3ih"; depends=[RMallow]; }; + HistDAWass = derive2 { name="HistDAWass"; version="1.0.4"; sha256="18l9hjkdcwk1lh19z240s9rqg49v9gpydllcaa5jndysylx8ybjr"; depends=[class FactoMineR ggplot2 ggridges histogram Rcpp RcppArmadillo]; }; HistData = derive2 { name="HistData"; version="0.8-6"; sha256="0an8cki2ahaf3ynbcqgikxi90l3bv7gcn6nnwnli9g1br89y3bd4"; depends=[]; }; HistogramTools = derive2 { name="HistogramTools"; version="0.3.2"; sha256="1wkv6ypn006d8j6bpbhc1knw0bky4y8r7jp87482yd19q5ljsgv0"; depends=[ash Hmisc stringr]; }; HiveR = derive2 { name="HiveR"; version="0.3.42"; sha256="09h061511pk7iy1k9gb3ifa5q6gd17ix9sn2fshl6gp5sxnysn4f"; depends=[jpeg plyr png RColorBrewer rgl tkrgl]; }; - Hmisc = derive2 { name="Hmisc"; version="4.3-0"; sha256="0rb1m6138lqzb46nss9ggvhghipd10vdnwsy6iq2wzynrynzkwkz"; depends=[acepack base64enc cluster data_table foreign Formula ggplot2 gridExtra gtable htmlTable htmltools lattice latticeExtra nnet rpart survival viridis]; }; - Hmsc = derive2 { name="Hmsc"; version="3.0-4"; sha256="1h2szg5qrqfx8h982n860bw0mcwqgj1x269vd7c191yhsfhqgkny"; depends=[abind ape BayesLogit coda fields FNN ggplot2 MASS Matrix MCMCpack mvtnorm nnet pdist pROC statmod truncnorm]; }; + Hmisc = derive2 { name="Hmisc"; version="4.4-0"; sha256="1ivfamwghd2z408fkhs7jy5zl3q0z1a2la16yi8js872br6cyvpi"; depends=[acepack base64enc cluster data_table foreign Formula ggplot2 gridExtra gtable htmlTable htmltools lattice latticeExtra nnet rpart survival viridis]; }; + Hmsc = derive2 { name="Hmsc"; version="3.0-6"; sha256="1n02akdrz4g33aqwigbh9ckdplxvgnzsznwlyx6j40s4rqgv2zrz"; depends=[abind ape BayesLogit coda fields FNN ggplot2 MASS Matrix MCMCpack mvtnorm nnet pdist pROC rlang statmod truncnorm]; }; HoRM = derive2 { name="HoRM"; version="0.1.2"; sha256="0vfsya6423i25szdj5s8pa8pwshiqykikxdbbj7r2nz73x3qp6hy"; depends=[ggplot2 MASS orthopolynom quantmod rsm]; }; Holidays = derive2 { name="Holidays"; version="1.0-7"; sha256="1srfbhlrf0pd6gzhp4hbic555lb7camk084rn1qz2g7fjvyijqiq"; depends=[TimeWarp]; }; Homeric = derive2 { name="Homeric"; version="0.1-3"; sha256="1vcs8fj39zpz45p7gph0mnx65hgr35na0b79i8llyw7i1h7zqzxr"; depends=[]; }; - HotDeckImputation = derive2 { name="HotDeckImputation"; version="1.1.0"; sha256="1mqfn6yw5846ynrcgzka0m6ikfppa5civjkhj42rhp2v2xk25li7"; depends=[Rglpk]; }; Hotelling = derive2 { name="Hotelling"; version="1.0-5"; sha256="1ism2lzi2kmi62gp319qsi64pj2kj5sfh50f1qnv8vgdkb76bdx5"; depends=[corpcor]; }; HyPhy = derive2 { name="HyPhy"; version="1.0"; sha256="0994ymv7sswbp8qw3pay34s926cflw2hq2gnchw7rknybvlsrinq"; depends=[ape R_utils]; }; - HyRiM = derive2 { name="HyRiM"; version="1.0.3"; sha256="0zx292554kr2s4107db5y7sr869kia9q6dyzhdjy11ksw23sj9m4"; depends=[compare orthopolynom]; }; + HyRiM = derive2 { name="HyRiM"; version="2.0.0"; sha256="1wif31xvrwz0dr6z0hfn1v2fxi8rxws52al6h9rlbzciy6xyl7a3"; depends=[compare grImport2 orthopolynom purrr Rglpk]; }; HybridFS = derive2 { name="HybridFS"; version="0.1.3"; sha256="0sb3i8ymgydi9hvxzdzydqap1gd7w5qcrs9clc0y5n26zd2mwqm5"; depends=[caTools FSelector InformationValue ROCR woeBinning]; }; HybridMC = derive2 { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; }; HydeNet = derive2 { name="HydeNet"; version="0.10.9"; sha256="1glzbr91cwp99qk1cyf8824fg8jvghgf84gc64jjn2q70vczcf5f"; depends=[checkmate DiagrammeR dplyr magrittr nnet pixiedust plyr rjags stringr]; }; @@ -1862,13 +1880,13 @@ in with self; { IBrokers = derive2 { name="IBrokers"; version="0.9-12"; sha256="0mhh4kgwrncrcysvnvah6xc7fhx5ywjzn258cs9xj9kzns0jblk6"; depends=[xts zoo]; }; IC2 = derive2 { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; }; ICAFF = derive2 { name="ICAFF"; version="1.0.1"; sha256="0zazx4nv81s75appg10aayks04mx6m5n9yf5hqrbxh3yj68vzxfy"; depends=[]; }; - ICAMS = derive2 { name="ICAMS"; version="2.0.10"; sha256="1f22bwbxnqqccmkmsx4ll8qaviz9w7f64jx1whikvnhsxw634xp5"; depends=[Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicRanges IRanges RColorBrewer stringi]; }; + ICAMS = derive2 { name="ICAMS"; version="2.1.2"; sha256="0jgylkc3asg41b0vac5vcyril0n93yqijjbzwwprfh3ps7pq87s0"; depends=[Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicRanges IRanges RColorBrewer stringi zip]; }; ICAOD = derive2 { name="ICAOD"; version="0.9.9"; sha256="04s51rxhr4axxr1rnhnq87lcn9mjj8g18xr35awnmc4sjg2aavaf"; depends=[cubature mnormt mvQuad nloptr Rcpp RcppEigen sn]; }; - ICBayes = derive2 { name="ICBayes"; version="1.1"; sha256="1bmxba3bv9szzxvjf1blwxwdhw87h7s04cfn63c1gqpnpwsmr03y"; depends=[coda HI survival]; }; + ICBayes = derive2 { name="ICBayes"; version="1.2"; sha256="1hdh7g4nk6yy0xz9564vpvh1blrw30lvyw2wc5mmgn78kwjqla34"; depends=[coda HI survival]; }; ICC = derive2 { name="ICC"; version="2.3.0"; sha256="0y8zh9715cp9bglxpygqwgigrarq37sj845lk1xl0ydwinl0a6kk"; depends=[]; }; ICC_Sample_Size = derive2 { name="ICC.Sample.Size"; version="1.0"; sha256="1w6v1jp8bfvf6c49ikswkc5527gdx5cyqnw95x00pgmm6riwlsp9"; depends=[]; }; ICCbin = derive2 { name="ICCbin"; version="1.1.1"; sha256="1pzlaj7w98pgrlg3zvpmdv0dpgi5gih0j73qv86ak75fkxvrnzzw"; depends=[]; }; - ICD10gm = derive2 { name="ICD10gm"; version="1.0.4"; sha256="19346z1mfdbir47wy6qxniag81s3xwrxpfbiv1rar6a89z3pczlf"; depends=[dplyr magrittr purrr rlang stringi tibble tidyr tidyselect]; }; + ICD10gm = derive2 { name="ICD10gm"; version="1.1"; sha256="0m0j88c8mkc0v22dw25l76gch883n21ifw9dpc189mq887856jp8"; depends=[dplyr magrittr purrr rlang stringi tibble tidyr tidyselect]; }; ICDS = derive2 { name="ICDS"; version="0.1.1"; sha256="1jb98xi37jcf6nl5lx2ip9614l4w7lz7v53jpcbdj0ymqbfx1s70"; depends=[graphite igraph metap org_Hs_eg_db]; }; ICE = derive2 { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; }; ICEbox = derive2 { name="ICEbox"; version="1.1.2"; sha256="170gg2fg9307yc2b25lsj8d1zla0frjxl47qh0njlqlrpi8jmm7i"; depends=[sfsmisc]; }; @@ -1884,28 +1902,29 @@ in with self; { ICSShiny = derive2 { name="ICSShiny"; version="0.5"; sha256="0a13vps0mkv5qs6qnl7ar0mdbkbd7i1c6kgwahmkb3id3n9bw0cl"; depends=[DT ICS ICSNP ICSOutlier rrcov shiny simsalapar]; }; ICV = derive2 { name="ICV"; version="1.0"; sha256="1na87i39jy5d8ibldqcqz3a072ihkgcl0k629sxch9hk6v6j5lly"; depends=[]; }; ICcalib = derive2 { name="ICcalib"; version="1.0.8"; sha256="1y2w12ka0qxh9dg6dlcrnndz1xrv8gkppan64qkyk5vjrh18ajz4"; depends=[fitdistrplus icenReg ICsurv MASS msm numDeriv Rcpp RcppArmadillo survival]; }; - ICcforest = derive2 { name="ICcforest"; version="0.5.0"; sha256="0m4bqw06alpj8p0yska4rizra73mgvcpd4zlgmxr146cgdv2lrgd"; depends=[icenReg ipred partykit survival]; }; + ICcforest = derive2 { name="ICcforest"; version="0.5.1"; sha256="0z511d3drq5flxwvx7kjv3v5yanjhvs5ayvkm996jbiz3k49a12v"; depends=[icenReg ipred partykit survival]; }; ICsurv = derive2 { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; }; ICtest = derive2 { name="ICtest"; version="0.3-2"; sha256="00h72rngcyjhin9g8x80mypm8zx765nm5jgsyjya9m4kw8x4h8la"; depends=[GGally ggplot2 ICS ICSNP JADE png Rcpp RcppArmadillo survey xts zoo]; }; IDCard = derive2 { name="IDCard"; version="0.3.0"; sha256="06b5zqmgh4clni3mv6ab2a52r4z34isbz0hd1i61793gps9fkc0y"; depends=[stringr]; }; IDE = derive2 { name="IDE"; version="0.3.0"; sha256="1m1y7gd8i14kl54qxhjy7bnf2md5vs7bb73k7k92nizv941qn0mn"; depends=[DEoptim dplyr FRK ggplot2 Matrix sp spacetime sparseinv tidyr]; }; - IDF = derive2 { name="IDF"; version="1.1"; sha256="19fx04gvzwzkxbd453l3wx46s22dbnh0nxdrmsr4f7l67kihbwdr"; depends=[evd ismev]; }; IDPSurvival = derive2 { name="IDPSurvival"; version="1.2"; sha256="0hifs8vw3rxlb5vlxs1433pcv2dh7p0mxpgb2n03d98f20vkdwfw"; depends=[gtools Rsolnp survival]; }; IDPmisc = derive2 { name="IDPmisc"; version="1.1.20"; sha256="0zy6mxqa8arq0vvhsdcifzm3085c23rnwa1n36fhircph1xwvfdw"; depends=[lattice]; }; IDSpatialStats = derive2 { name="IDSpatialStats"; version="0.3.10"; sha256="1980nsbcibsas99xcqfc54k6zhh9lg2xdgmihp846xhqgw9xjjy7"; depends=[doParallel foreach igraph spatstat]; }; IDetect = derive2 { name="IDetect"; version="0.1.0"; sha256="1q1jwgildhx6sp883ni7vcsa3gj997855v5ky41dyf34kv7hvdl1"; depends=[]; }; IDmeasurer = derive2 { name="IDmeasurer"; version="1.0.0"; sha256="0n7rziaaxm9dqixmw6rxgq9dwnwdl3dsdnpd9s59k5skdlaxnl5m"; depends=[infotheo lme4 MASS]; }; IDmining = derive2 { name="IDmining"; version="1.0.6"; sha256="0fsl1byz0n5jwswh2ydzz5lsycja54545cf7dr1r3h1a372yz2mv"; depends=[data_table doParallel foreach]; }; + IETD = derive2 { name="IETD"; version="1.0.0"; sha256="0avhyw0zcb8vj0nqfy41yq5kcd8yf9rmaawdvfcy5rqwxmi1mw9l"; depends=[doParallel dplyr foreach ggplot2 lubridate Rdpack]; }; IFP = derive2 { name="IFP"; version="0.2.1"; sha256="06zyadcr8p6q0c5h9n29yl02ixysdj6lfbn9hfir0bk9hyv9yfyr"; depends=[coda haplo_stats]; }; IGG = derive2 { name="IGG"; version="1.0"; sha256="1cibb9z18xc1zx1813lk14n6p5am84hm7w0hkrsif4j3p89lrwif"; depends=[GIGrvg glmnet MASS Matrix pscl]; }; IGP = derive2 { name="IGP"; version="0.1.0"; sha256="0xv89gmyfgnq5kzcmjbp5nx9zbr3gbdzkvffp99bxbkvf759m255"; depends=[PythonInR R6]; }; + IGST = derive2 { name="IGST"; version="0.1.0"; sha256="12ycrfsgwakaj3k39k1j4ky58wr7a2ibyz6j9cznvjjv6cgz9zg5"; depends=[BootMRMR e1071]; }; IHSEP = derive2 { name="IHSEP"; version="0.1"; sha256="1djc5509b5iyi6y0i36h77l6sq1h0w721v2isxqldcqk3gb0bx11"; depends=[lpint Rcpp]; }; IIS = derive2 { name="IIS"; version="1.0"; sha256="01h7nncxn1drnqf1h7snw0pvkgkn8dxq53k2sqcw3kdjlk5mj2l6"; depends=[asbio BSDA Hmisc NSM3 Rfit]; }; ILS = derive2 { name="ILS"; version="0.2"; sha256="0lj3ripkaq6jn00lpxjihjhm8g1gbkppmb1y9kkrymphg80k1by7"; depends=[depthTools fda_usc lattice MASS multcomp]; }; IM = derive2 { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[bmp jpeg png]; }; IMAGE = derive2 { name="IMAGE"; version="1.0"; sha256="0xgrja7qhklcmbm0zz5xg94gw5kl05nk3v77l7vxq2d5sk0435g3"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; }; IMFData = derive2 { name="IMFData"; version="0.2.0"; sha256="1mlxpsbyvh1zi8ivdblbd58zfv5hflnknbasz5z8xk9911czrn6p"; depends=[httr jsonlite plyr]; }; - IMIFA = derive2 { name="IMIFA"; version="2.1.1"; sha256="1kw7lbi26fsyflrjfpn26xdf50yqsfcwnz7vh657j5jsfrgdhw2h"; depends=[matrixStats mclust mvnfast Rfast slam viridis]; }; + IMIFA = derive2 { name="IMIFA"; version="2.1.2"; sha256="1jim9dhiwm4jiwp6amfsfzl0wdk5k7fi08wgjj7l8pcjsrvv98ny"; depends=[matrixStats mclust mvnfast Rfast slam viridis]; }; IMIS = derive2 { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; }; IMP = derive2 { name="IMP"; version="1.1"; sha256="0ilvgz2bngffyx6ifqqx1snsn6mmq7rx3wg44093yrviaw39qdfv"; depends=[dplyr ggplot2 shiny tidyr]; }; IMPACT = derive2 { name="IMPACT"; version="0.1.1"; sha256="0ai22gvmfj9j00cw742szfqqay63b5lmnszkwwdfdvidls43v0bm"; depends=[]; }; @@ -1920,35 +1939,35 @@ in with self; { INLAMSM = derive2 { name="INLAMSM"; version="0.1"; sha256="0km7kwwif2hqqa9jhglvkinzcm6gfp7mn219hqm5ds5rfgrcyl75"; depends=[Matrix MCMCpack]; }; INSPIRE = derive2 { name="INSPIRE"; version="1.5"; sha256="0938l50yxnb5q628mp874ayx9ybvcjddis20y1hzm5cmlsg0hqhg"; depends=[missMDA]; }; IOHanalyzer = derive2 { name="IOHanalyzer"; version="0.1.3"; sha256="0l5baz68714vqlzfp6v1r93lwmv0nsq2wqidgf5zwj5r391y7c5g"; depends=[bsplus colorRamps colorspace colourpicker data_table dplyr DT ggplot2 igraph kableExtra magrittr markdown PlayerRatings plotly RColorBrewer Rcpp reshape2 scales shiny shinydashboard shinyjs withr]; }; - IPCAPS = derive2 { name="IPCAPS"; version="1.1.5"; sha256="0d1nws86k1yph2f4drwrh4jvmmc9nnqmmswpwirmgsp3ma58kc42"; depends=[apcluster expm fpc KRIS LPCM MASS Matrix Rmixmod]; }; - IPDFileCheck = derive2 { name="IPDFileCheck"; version="0.6.2"; sha256="16fapss0y31y9ynizhv9z8zqywf0aam2v7g53dcwylvdjc6qpzi2"; depends=[dplyr eeptools GlobalOptions lubridate testthat]; }; + IPCWK = derive2 { name="IPCWK"; version="1.0"; sha256="0hah1xl6zli0346jh57rjc5x8vynhaysj0l481rmvznsghv6im23"; depends=[MASS survival]; }; IPEC = derive2 { name="IPEC"; version="0.1.2"; sha256="1fglr5hs61n13251145wqzvxy362fx32yzral96xd8li76ljxiic"; depends=[MASS numDeriv]; }; IPMRF = derive2 { name="IPMRF"; version="1.2"; sha256="1zvwwhiy0p134zvm5ldc92pdd1ap72bhbrlf02rz9m2hlsxmwy67"; depends=[gbm party randomForest]; }; - IPMpack = derive2 { name="IPMpack"; version="2.1"; sha256="08b79g5a9maxnxladvc2x2dgcmm427i8p6hhgda3mw2h5qmch2q3"; depends=[MASS Matrix nlme]; }; IPPP = derive2 { name="IPPP"; version="1.1"; sha256="19ccs25fd56ns7ssi51w2jzjd4d57vyimwmfvf27mmigb537bd5y"; depends=[]; }; + IPV = derive2 { name="IPV"; version="0.1.1"; sha256="0bd59sfqqz2g6lwzlg3vqpw0y8q989n4q76qr1dvnq847c6fg8wz"; depends=[ggforce ggplot2]; }; IPWboxplot = derive2 { name="IPWboxplot"; version="0.1.0"; sha256="0lyqcjnbissick5hzwrx21pykq4pww9j0i03j0gy43awl1cq5qq8"; depends=[isotone]; }; - IPWsurvival = derive2 { name="IPWsurvival"; version="0.5"; sha256="0lmw0ifj8cds8lzyjkkv0i0zim23p0a3pawlhmhdm3nfvwawb853"; depends=[survival]; }; IQCC = derive2 { name="IQCC"; version="0.7"; sha256="1zalpmyywkrnci0jd8irakjhiqmr52zhj1sbxf9pz5c7wks2rdbc"; depends=[MASS miscTools qcc]; }; IRATER = derive2 { name="IRATER"; version="0.0.1"; sha256="0jxdvjmnmangbqy3ibb5qrj9jz3wrzs0wa1r2gjk4v8vsbk0ipcf"; depends=[coda lattice plyr R2admb]; }; IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.3.0"; sha256="09nzzalz107l6dscl4xxd8znwd9fppjlfyvn1vfd9jhx7mkjlnlq"; depends=[dplyr IRISSeismic pracma RCurl seismicRoll signal stringr XML]; }; IRISSeismic = derive2 { name="IRISSeismic"; version="1.5.2"; sha256="117p2kh2r2iw758iqlpqaak83czfv34p15907g18x496r5vri429"; depends=[pracma RCurl seismicRoll signal stringr XML]; }; - IROmiss = derive2 { name="IROmiss"; version="1.0.1"; sha256="01l08s1g7h8cki372daa61pw3wac3pbv5d4yqnphg5p8ihsmrc5d"; depends=[equSA huge mvtnorm ncvreg]; }; + IROmiss = derive2 { name="IROmiss"; version="1.0.2"; sha256="0rcyijx5w8nn7n1hc4sdrphgggnq3676f8fpzxs85vkk52z0vp0a"; depends=[equSA huge mvtnorm ncvreg]; }; + IRTBEMM = derive2 { name="IRTBEMM"; version="1.0.2"; sha256="03a1kjhyaqamy4988ns4m9mwbdljcyppcf16hmmi9q0zrzn0d2ki"; depends=[]; }; IRTShiny = derive2 { name="IRTShiny"; version="1.2"; sha256="094ax94y6k5z4vlxfla2w19f57q0z32nwwd5npjbgmnkhvfhhl9v"; depends=[beeswarm CTT ltm psych shiny shinyAce]; }; IRdisplay = derive2 { name="IRdisplay"; version="0.7.0"; sha256="12chk53nf4zckgc4yl7gbvd7m5dvli52inp5b3f0zvcjvfncksli"; depends=[repr]; }; IRkernel = derive2 { name="IRkernel"; version="1.1"; sha256="1viqxs91dys1z4cf7gb59rmqvzb8lc7jdp4azrpmhgwa8qf46s94"; depends=[crayon digest evaluate IRdisplay jsonlite pbdZMQ repr uuid]; }; ISAT = derive2 { name="ISAT"; version="1.0.5"; sha256="0xlq568spfz527jxbqamrn1j87hnasg0kp2bcyjycaghmhsc6zmg"; depends=[gtools stringr]; }; ISBF = derive2 { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9dzh8l1d74wh8lnamq7kf9ai9if"; depends=[]; }; ISCO08ConveRsions = derive2 { name="ISCO08ConveRsions"; version="0.1.0"; sha256="0jqg03rxr3k01y29b7gq89jk2jd2qrshmq3338j8w6531r7y12lg"; depends=[]; }; - ISEtools = derive2 { name="ISEtools"; version="3.1.1"; sha256="1dipff8msky1rxbrckyxh7c5mh40q4a5hjdghsqkxklwh9zmrs44"; depends=[coda Xmisc]; }; + ISEtools = derive2 { name="ISEtools"; version="3.1.1.1"; sha256="00d6znqz2mfmyi9ijgrg2pwl4lnvvsy00ysa7a7vjq7ip8qvcjfq"; depends=[coda Xmisc]; }; ISLR = derive2 { name="ISLR"; version="1.2"; sha256="1bfay6cs40crhh34v2ksn4zdxivimfyjvk19wqbnjr7vs837l3xh"; depends=[]; }; ISM = derive2 { name="ISM"; version="0.1.0"; sha256="0by0w6zgnwcwzbmxx16s8mb1avhc6aiavqp0qkxx6hr70vrgb997"; depends=[rJava xlsx xlsxjars]; }; - ISOcodes = derive2 { name="ISOcodes"; version="2019.12.22"; sha256="1k2f2258bwzs0b3nxma9kcw395qkljvk514a7047rx4dn0iwd874"; depends=[]; }; + ISOcodes = derive2 { name="ISOcodes"; version="2020.03.16"; sha256="1hz1sj57qkkkrgn8slsz2n4jv1fkyp40503j9rg30lxy4gmb83hn"; depends=[]; }; ISOpureR = derive2 { name="ISOpureR"; version="1.1.3"; sha256="1ydhsh3v6n7prrg0dm7hsg8wx1244g791xnz1sjyhljhm31hgwc0"; depends=[futile_logger Rcpp RcppEigen]; }; ISOweek = derive2 { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; }; ISR3 = derive2 { name="ISR3"; version="0.98"; sha256="0mmpdl9ndlj9i0k3zl7ja0g7y9pm67igw925ld5qnz7a36plygxs"; depends=[]; }; + ISRaD = derive2 { name="ISRaD"; version="1.2.3"; sha256="1xgk0mda2w22yf44flyyga15cxffzn25rg83g7dmqa8rqjiis51j"; depends=[assertthat devtools dplyr ggplot2 maps openxlsx pangaear raster rcrossref RCurl rgdal stringr tidyr tidyverse]; }; ISwR = derive2 { name="ISwR"; version="2.0-8"; sha256="1bay7na68awq68bw82dwhcfxp2d3di2dg33islq0mgrhd4sfdfza"; depends=[]; }; ITGM = derive2 { name="ITGM"; version="0.41"; sha256="0q278ga51asrr918l088v6qdl17vnmrcbz7y1xc4rzmb61lkwqy7"; depends=[data_table Fgmutils gsubfn plyr sqldf]; }; - ITNr = derive2 { name="ITNr"; version="0.3.0"; sha256="1aiqkpxnam13r4q8q03yzd6a1wvl2gf40kqncbrpfvcaiv5zsq68"; depends=[blockmodeling circlize comtradr cowplot dplyr fastmatch GGally ggplot2 GoodmanKruskal igraph intergraph maps network networkDynamic plyr RColorBrewer reshape2 sna tnet WDI xergm_common]; }; + ITNr = derive2 { name="ITNr"; version="0.6.0"; sha256="0yxn3768819ph49bizprj3arrvz9rzhb45rkcpfivwfwlyf010yy"; depends=[blockmodeling circlize cowplot dplyr fastmatch GGally ggplot2 igraph intergraph maps network networkDynamic plyr RColorBrewer reshape2 sna tnet WDI]; }; ITRLearn = derive2 { name="ITRLearn"; version="1.0-1"; sha256="03xdbpn3qddcq9krdpnywd3xbzfh2viym2qqx6rcqs7w7bdhhlk6"; depends=[Formula kernlab]; }; ITRSelect = derive2 { name="ITRSelect"; version="1.0-1"; sha256="0llr4hrlbnb728j5rw7vd3r9qlqf571hrldnm72kicis5di2v5di"; depends=[Formula Matrix ncvreg Rglpk svMisc]; }; IUPS = derive2 { name="IUPS"; version="1.0"; sha256="01pv03ink668fi2vxqybli0kgva13gxhqfdxkwz6qk5rnpzwvf5w"; depends=[boot Matching R2jags]; }; @@ -1959,21 +1978,22 @@ in with self; { ImaginR = derive2 { name="ImaginR"; version="0.1.7"; sha256="12ypfrqw6xym84i1axd3h0qd2md96rc0glas3rgzpdhdyw4lbfmn"; depends=[imager jpeg]; }; Imap = derive2 { name="Imap"; version="1.32"; sha256="0b4w0mw9ljw6zxwvi0qzb08yq9n169lzgkdcwizrd07x9k9xjxs7"; depends=[]; }; Immigrate = derive2 { name="Immigrate"; version="0.0.2"; sha256="1khxjh4lpsgv5qqk30ry6r8y3vjblwxsx9frv63pws4x1j6j2apm"; depends=[pROC Rcpp]; }; - ImpactEffectsize = derive2 { name="ImpactEffectsize"; version="0.3.0"; sha256="1r4cm8q72il5n1glgn3c4jyb0mb0mgyc44fy047ijcxwlrrwcswk"; depends=[AdaptGauss matrixStats parallelDist pracma RcppAlgos]; }; + ImpactEffectsize = derive2 { name="ImpactEffectsize"; version="0.4.0"; sha256="05cd3k5ccy0jpz20rrg7wlmpii7zn0bh104h8vg7caw8ilpx7v0x"; depends=[DataVisualizations Hmisc matrixStats parallelDist pracma]; }; ImpactIV = derive2 { name="ImpactIV"; version="1.0"; sha256="1bb6gw1h15hscr71hy779k2x5ywzx63ylim3hby02d7fnnj46p58"; depends=[nnet]; }; ImportExport = derive2 { name="ImportExport"; version="1.1"; sha256="12i9mwspk59zicn1mn21xrs90c8dqxm1q7alqbzscgkpf3xbjrnn"; depends=[chron gdata haven Hmisc RODBC xlsx]; }; ImputeRobust = derive2 { name="ImputeRobust"; version="1.3-1"; sha256="1zvwlpffpm4gqysz57clf8jkqr72yjbzx90pdy95la51m0b6cdbd"; depends=[extremevalues gamlss gamlss_dist lattice mice purrr]; }; InDisc = derive2 { name="InDisc"; version="1.0.2"; sha256="1mvd6r1ly924n17275n4i9p8sghvm929kbir0bq6850kk2m0dgq7"; depends=[optimbase psych]; }; InPosition = derive2 { name="InPosition"; version="0.12.7.1"; sha256="0d9c7dwaa1v0j8p5ff9223fc2gkbmbvyqylma2d8l4x5m92jmkv0"; depends=[ExPosition prettyGraphs]; }; - InSilicoVA = derive2 { name="InSilicoVA"; version="1.2.5"; sha256="1irbfdrab9mz50py8h3gnjj14swh7b1pbrqf2fj04ym206rsca02"; depends=[coda ggplot2 InterVA5 rJava]; }; - IncDTW = derive2 { name="IncDTW"; version="1.1.3"; sha256="1lbg1frx5hlv9pj56xsr4rdzhkq2h21r74hsjhlj0gvg1ykn6hvj"; depends=[data_table ggplot2 Rcpp RcppArmadillo RcppParallel scales]; }; + InSilicoVA = derive2 { name="InSilicoVA"; version="1.2.8"; sha256="0lxv8m394mv9likc8ph17xxd5san326n9c77q7vmgs03a6chqrjx"; depends=[coda ggplot2 InterVA5 rJava]; }; + IncDTW = derive2 { name="IncDTW"; version="1.1.3.1"; sha256="1hwwsh70mmdwqaqw4xxnbvc3g2nhmx64bd0hzxh63wr15jch0w8b"; depends=[data_table ggplot2 Rcpp RcppArmadillo RcppParallel scales]; }; + IncomPair = derive2 { name="IncomPair"; version="0.1.0"; sha256="156mc4csbxz976md7ikjd6sqamzsfc8ik9xf1qbhrfl8y7957kbb"; depends=[]; }; IncucyteDRC = derive2 { name="IncucyteDRC"; version="0.5.4"; sha256="1k7jqcyx5n4my5rbyfa693ganbk91xganyagq8x8szli9h1491ii"; depends=[cowplot dplyr drc DT ggplot2 magrittr shiny tidyr XML]; }; IndTestPP = derive2 { name="IndTestPP"; version="1.0"; sha256="1ywl35k2syv46pz6ap5sjkynapqj04aq197czspqky0pvrq7ldr1"; depends=[]; }; IndepTest = derive2 { name="IndepTest"; version="0.2.0"; sha256="017jasqsxm5m13rhfy9gxvd8nfib5k5y5c8520p3hcffqrxr683p"; depends=[FNN mvtnorm Rdpack]; }; IndependenceTests = derive2 { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; }; IndexConstruction = derive2 { name="IndexConstruction"; version="0.1-2"; sha256="16fwbq4d9k3092qwj7yk2s66gp8rgv7g0ii4240imfjh28zlb6xa"; depends=[fGarch KernSmooth lubridate RcppBDT xts zoo]; }; - IndexNumR = derive2 { name="IndexNumR"; version="0.1.2"; sha256="0dip7v4z36k3fhl8szrbl11gcqy1rr7kgmcsajpdwd16jixj1d27"; depends=[]; }; - IndexNumber = derive2 { name="IndexNumber"; version="1.0"; sha256="03c01f7pk0bf1mlnfmnyc242gpc0ac6svzb6lfwhqkv964kdvhsy"; depends=[]; }; + IndexNumR = derive2 { name="IndexNumR"; version="0.1.3"; sha256="1jrbl2gwgp4msigkspgqcvgvxq169jiiz4acixky37i6hw0n34p6"; depends=[]; }; + IndexNumber = derive2 { name="IndexNumber"; version="1.1"; sha256="1db1bd44zm8wwqr6rpnq97xj6jrv297vzs156by33z18y79fdgbq"; depends=[]; }; IndianTaxCalc = derive2 { name="IndianTaxCalc"; version="1.0.2"; sha256="1fxw884wj9n8drk2xz3rgr4f7b4fckh5firrf5gdz6d1nk9hdvc1"; depends=[]; }; InfDim = derive2 { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; }; InferenceSMR = derive2 { name="InferenceSMR"; version="1.0"; sha256="13d3v8kyk6br33659jgql6j1nqmnd8zszqrwfw2x3khkiqzgdmhk"; depends=[survival]; }; @@ -2013,18 +2033,21 @@ in with self; { IsingSampler = derive2 { name="IsingSampler"; version="0.2.1"; sha256="1cs4vk53b5fy6kywvycfjf62571yx92nvgp5i8hlvms1362ir7gv"; depends=[dplyr magrittr nnet plyr Rcpp]; }; Iso = derive2 { name="Iso"; version="0.0-18"; sha256="014mm5b1f7i6nwlz3kyg1biph0y542kcx5bd13p68cv5a928qzid"; depends=[]; }; IsoCI = derive2 { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; }; + IsoCheck = derive2 { name="IsoCheck"; version="0.1.0"; sha256="06g0srp14yiha95mbmifaqf5yr5ppjnc20nyr237ah3l776mhsif"; depends=[dplyr gtools plyr]; }; IsoGene = derive2 { name="IsoGene"; version="1.0-24"; sha256="0flm0mszankvl3aizwsazyhvz2xkr4gfqiqywpc0r1swqj19610r"; depends=[affy Biobase ff Iso xtable]; }; IsoSpecR = derive2 { name="IsoSpecR"; version="2.0.1"; sha256="1y101x7138pdylp2qsmyd10dh0d3wwic292qfi2kbn3z849dlhnn"; depends=[Rcpp]; }; - IsoplotR = derive2 { name="IsoplotR"; version="3.2"; sha256="00v2b7r537awxmns8m22gk3q225kkh68wwwzip5x6qrvykmnxdk6"; depends=[MASS]; }; + IsoplotR = derive2 { name="IsoplotR"; version="3.3"; sha256="1bldpa7j37k29k51lpbpyr4g4939zw1n9dv498v92w82kzj2p6zf"; depends=[MASS]; }; IsoriX = derive2 { name="IsoriX"; version="0.8.1"; sha256="0rr9frj0mhismls60vgax357jgfyq2wci7rvhvp70fh5k998mzid"; depends=[lattice latticeExtra numDeriv raster rasterVis sp spaMM viridisLite]; }; IsotopeR = derive2 { name="IsotopeR"; version="0.5.4"; sha256="0xgha5alh5y5qfz00rl73q4xlamnmrwij7kckljmy6zgrlrdnl6x"; depends=[colorspace ellipse fgui plotrix runjags]; }; - JADE = derive2 { name="JADE"; version="2.0-2"; sha256="0haqb8fsn1z532z42vjz60na7hlwv5rhayxzbd4rkzx2wcvnlbhn"; depends=[clue]; }; + ItemResponseTrees = derive2 { name="ItemResponseTrees"; version="0.2.4"; sha256="1qcq9sskfpfiixi38m8didml53r1a2cilvjg5pfwgcvnw10vrncz"; depends=[backports checkmate dplyr generics glue magrittr MASS Matrix mirt purrr rlang sets stringr tibble tidyr tidyselect]; }; + J4R = derive2 { name="J4R"; version="1.0.7"; sha256="02ngxyyl8hpjn1r0w8kahqp3hy9xm37m0g4hzb7mdxkkzcxpv7hx"; depends=[]; }; + JADE = derive2 { name="JADE"; version="2.0-3"; sha256="1fj2wawx5ac1fvlp28naqha0i17f1sb47j2qqzgccvx17ycqmmjn"; depends=[clue]; }; JASPAR = derive2 { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; }; JBTools = derive2 { name="JBTools"; version="0.7.2.9"; sha256="0bynqn3daqgmi3l9asy34mfwyfjkn35k465dfqqi3xwx6cbzlg5k"; depends=[colorspace foreach gplots plotrix]; }; JFE = derive2 { name="JFE"; version="2.1.3"; sha256="16fbwi9znvf560vlrpdipg69vw1kyg2081iz1l2adc2wyxp81dda"; depends=[BurStFin fAssets fBasics fPortfolio FRAPO iClick MASS quantmod rugarch tcltk2 timeDate timeSeries xts zoo]; }; JGEE = derive2 { name="JGEE"; version="1.1"; sha256="078348n623hlyc3n9yh67vv5acsnxapmbwybvrb1i7kawmqw5msi"; depends=[gee MASS]; }; JGL = derive2 { name="JGL"; version="2.3.1"; sha256="02p9z32f8j60wnh1szkjr2zfa9zwyw0gqinpsvll4dymf8cjawpw"; depends=[igraph]; }; - JGR = derive2 { name="JGR"; version="1.8-6"; sha256="0n3z4dm4q93did5b7hw802akhr6gyidshvlj2db4sghmf07czk2c"; depends=[JavaGD rJava]; }; + JGR = derive2 { name="JGR"; version="1.8-7"; sha256="0bwnps4n078ssmmnxc3pbhs3wc2x45i9f567yb5h7nqscmhb20fi"; depends=[JavaGD rJava]; }; JM = derive2 { name="JM"; version="1.4-8"; sha256="1nq07hw30fqnag1h08b7crl2yfs85gyrn70aaw11bdbjv06r2x55"; depends=[MASS nlme survival]; }; JMI = derive2 { name="JMI"; version="0.1.0"; sha256="05phkwfb9v4g9jixlvbj6br7sbi64zvrgjwfr0v87ijddkxc9si9"; depends=[Rcpp RcppArmadillo]; }; JMbayes = derive2 { name="JMbayes"; version="0.8-85"; sha256="0s11jpzflc2zg60g4ffcw23c2f4zz3mzddrc2cl5y43xl2v304lb"; depends=[doParallel foreach Hmisc jagsUI MASS nlme Rcpp RcppArmadillo rstan shiny survival xtable]; }; @@ -2034,8 +2057,8 @@ in with self; { JPEN = derive2 { name="JPEN"; version="1.0"; sha256="12rvp5bmlkwyr1gg336k655hp09gym0d2wwry70c1rz30x1sf2zs"; depends=[mvtnorm]; }; JQL = derive2 { name="JQL"; version="3.6.9"; sha256="0d926hngv4r6zl5f6yai3jwhl9hql2hv6ja3yjgplglkns66g4lh"; depends=[caret pdist randomForest]; }; JRF = derive2 { name="JRF"; version="0.1-4"; sha256="1xpvscn9iawwa0vfh3kfwzdni436bf42nvm18b8abh033ljvqpij"; depends=[]; }; - JSM = derive2 { name="JSM"; version="0.1.3"; sha256="1p5vlk2fcrb42pi7srkymjacfg05vlaspvhaw94lq1rhvxdw87yl"; depends=[nlme Rcpp RcppEigen statmod survival]; }; - JSmediation = derive2 { name="JSmediation"; version="0.1.0"; sha256="1qmjkachpvql0nrn7lf2n32w9zp12saha2y3zmdg086k1q12xifl"; depends=[broom data_table dplyr glue knitr magrittr MASS purrr rlang tibble]; }; + JSM = derive2 { name="JSM"; version="1.0.0"; sha256="1nvzkmfwjk5p6j32scsm7gj1zymrbqsfzwwhfyy0mfqvk4rzrd3g"; depends=[nlme Rcpp RcppEigen statmod survival]; }; + JSmediation = derive2 { name="JSmediation"; version="0.1.1"; sha256="06p413jfv02k88jdsbplnz696knxglgcqa4pjrgkhhic6awdh0jf"; depends=[broom data_table dplyr glue knitr magrittr MASS purrr rlang tibble]; }; JWileymisc = derive2 { name="JWileymisc"; version="1.1.0"; sha256="08c09jcax0ppl9q47px2anybcj8rfha8xdx226y002valqji5bz3"; depends=[cowplot data_table emmeans extraoperators ggplot2 ggthemes lavaan lme4 MASS mgcv mice multcompView psych quantreg rms robustbase VGAM]; }; JacobiEigen = derive2 { name="JacobiEigen"; version="0.3-3"; sha256="1zcs9qhf2216c590hj6qc837rnciyfsirg4zg655vxn59fgzpvyb"; depends=[Rcpp]; }; JamendoR = derive2 { name="JamendoR"; version="0.1.0"; sha256="1v5i4ggc4igp83pik32fqp07ff8iv7dp93b3qhxcsy1msa4l88lx"; depends=[dplyr httr jsonlite]; }; @@ -2043,16 +2066,17 @@ in with self; { Jaya = derive2 { name="Jaya"; version="0.1.9"; sha256="0b23l7xp4waxjy1vkk09xaali5axr5900v9hkki4f75wh4gb1l53"; depends=[GA]; }; Jdmbs = derive2 { name="Jdmbs"; version="1.3"; sha256="0jjnn1lrrakai34srp9ks8a563amd1rp9vd4ydnpmgfma5qlify0"; depends=[igraph png]; }; Jmisc = derive2 { name="Jmisc"; version="0.3.1"; sha256="1szn29dng54l2xmrm6pg3d5rmwdc1ks23vsnsmplnr5rx7yj002s"; depends=[]; }; + JoF = derive2 { name="JoF"; version="0.1.0"; sha256="1my6fc4awrc822ibsvx3hiz4l49vp8dx0j05v56r7d27xizy8j0j"; depends=[]; }; JoSAE = derive2 { name="JoSAE"; version="0.3.0"; sha256="1vjxzbfs8a7kpmn2lb9dca67d4njmzjr3pl16s0r9ihmmxxwwili"; depends=[nlme]; }; Johnson = derive2 { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; }; - JointAI = derive2 { name="JointAI"; version="0.6.0"; sha256="13amg3s8hq73qfn6makmqhgdpmq6asqbwhgc0b0haj7iw9ck42ma"; depends=[coda doParallel foreach MASS mcmcse rjags rlang]; }; + JointAI = derive2 { name="JointAI"; version="0.6.1"; sha256="10q1wnyj56mdgkp9m2csxxxpsl7k71a8vq27cbpisf3b1anq9yyw"; depends=[coda doParallel foreach MASS mcmcse rjags rlang]; }; JointModel = derive2 { name="JointModel"; version="1.0"; sha256="1zgs5c7saqyqxvxmhw5sxy5w67abq344aid6igw1da05bfy2az6h"; depends=[lme4 statmod survival]; }; JointNets = derive2 { name="JointNets"; version="2.0.1"; sha256="18n9dsy0w0nh7dznp6gw6g5fhhjhf5y589nb49hri0721kq1h3rb"; depends=[brainR igraph JGL lpSolve MASS misc3d oro_nifti pcaPP rgl shiny]; }; Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; }; JuliaCall = derive2 { name="JuliaCall"; version="0.17.1"; sha256="0v0mn3q9mp8xq6bpm870v9a228b20n22cph3s0ngphni07pi0kwr"; depends=[knitr Rcpp]; }; + JuliaConnectoR = derive2 { name="JuliaConnectoR"; version="0.6.0"; sha256="174ghyj2fmacgm3a2gnpsv2yzg0fzskjqk25cvr8a9qqq2527bv4"; depends=[]; }; JumpTest = derive2 { name="JumpTest"; version="1.1"; sha256="0y375m5477nq0ybnjmfnd8hi45d8jmdnprqvw5f70llpd7bcghh0"; depends=[MASS Rcpp RcppEigen]; }; KANT = derive2 { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; }; - KATforDCEMRI = derive2 { name="KATforDCEMRI"; version="1.0.1"; sha256="1wcm0h9lwpiw4crf15h5pfv9fxzpmf3g4jkylgnn9a36305rpdl8"; depends=[locfit matlab R_matlab]; }; KCSKNNShiny = derive2 { name="KCSKNNShiny"; version="0.1.0"; sha256="13gzqf3g7vj8cc0xm5902q7lad2way8d0ri1fs01dnv97wmwbxvn"; depends=[caret dplyr FNN rhandsontable shiny]; }; KCSNBShiny = derive2 { name="KCSNBShiny"; version="0.1.0"; sha256="1lv5r9qyvr3dnvcs00jyam0whv64qmv5vphhijlar1xa1g1llwqr"; depends=[caret dplyr e1071 rhandsontable shiny]; }; KDViz = derive2 { name="KDViz"; version="1.3.1"; sha256="1if4lkq9kvncqw56j7m9kh4piph091zkivvnhxzxj72zq661q5br"; depends=[htmlwidgets igraph mpa networkD3 rvest stringr tm xml2]; }; @@ -2065,62 +2089,61 @@ in with self; { KMgene = derive2 { name="KMgene"; version="1.2"; sha256="1yj9l1mqhvyhicyycnkd639q3zkrx15ba11z9911l4c0gql8syf1"; depends=[CompQuadForm coxme kinship2 MASS Matrix mgcv nlme survival]; }; KMsurv = derive2 { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; }; KNNShiny = derive2 { name="KNNShiny"; version="0.1.0"; sha256="16zm8bhdivaap3mvhdx2qn1b1j2iqyarclb0y2qd1n4viwcfm9c1"; depends=[caret dplyr e1071 FNN psycho rhandsontable rmarkdown shiny]; }; - KODAMA = derive2 { name="KODAMA"; version="1.5"; sha256="1pb7qba7dp25x4znhvihc21z5jk6bgk6sg0v24gbvqhv5irm7kwf"; depends=[Rcpp RcppArmadillo]; }; + KOBT = derive2 { name="KOBT"; version="0.1.0"; sha256="0dw6s68x95d4z5a6p8bs1368jcxv5jx0wd87js28i2qm3q57ss71"; depends=[glmnet knockoff MASS Rdpack spcov xgboost]; }; KOGMWU = derive2 { name="KOGMWU"; version="1.2"; sha256="1vz0099gp1r10n7w4p480l8rswdw100sns196d9xin2ibmmd2fx9"; depends=[pheatmap]; }; - KONPsurv = derive2 { name="KONPsurv"; version="1.0.2"; sha256="0ylydb4qxf7apklgn8a2sjid92gfbswpn2fyhjjh9f972bg1vdmi"; depends=[Rcpp survival]; }; - KRIG = derive2 { name="KRIG"; version="0.1.0"; sha256="1hpmjzzrh5b042xh14dgxvn5x5ini63vq5jz1i6rjgvsdf734f98"; depends=[Rcpp RcppArmadillo Rdpack]; }; - KRIS = derive2 { name="KRIS"; version="1.1.1"; sha256="0v2xgdwd8lp399il6grjkysq2gj38fmjlxlvg5ciq3g3cp7cdy3m"; depends=[rARPACK]; }; + KONPsurv = derive2 { name="KONPsurv"; version="1.0.3"; sha256="1qijx7b6idjy23kqb5l58l6nc6dh35vrkxv370qpj3y2gvvn9d6x"; depends=[Rcpp survival]; }; KRLS = derive2 { name="KRLS"; version="1.0-0"; sha256="1zyf3smfzfm3n43i35rlj1w6vcip2hxkvk4f8lp77xbsry0gmwjw"; depends=[]; }; KRMM = derive2 { name="KRMM"; version="1.0"; sha256="0wxzhrrc4lx20nxjny7rcfw3bya7drn88zbrlzx9f531298xwbrk"; depends=[cvTools kernlab MASS robustbase]; }; KSD = derive2 { name="KSD"; version="1.0.0"; sha256="0wqmbr51yv7f87pnhph2nrj9y2d5jql2agizcaq6lax23lj6xfb7"; depends=[pryr]; }; KSEAapp = derive2 { name="KSEAapp"; version="0.99.0"; sha256="1gfgpa2d32y6bzvf4ww70sm7niq34sqmyrhi0phlqxshqq9xviqc"; depends=[gplots]; }; KSPM = derive2 { name="KSPM"; version="0.2.0"; sha256="0gysb4qb60xfixyj4slcxs2j1bn57vbq6j08i5ldfr9vfaf1pk0n"; depends=[CompQuadForm DEoptim expm]; }; KScorrect = derive2 { name="KScorrect"; version="1.4.0"; sha256="1khvwc610yp3fd4fn0wcgqpzxg9g7sicjjmwvfcahs8qxn3m5vfa"; depends=[doParallel foreach iterators MASS mclust]; }; - KSgeneral = derive2 { name="KSgeneral"; version="0.1.1"; sha256="1ldk3fvwbr6hw7x3ydgzixgc41a0fbbic699zjlnpj5x4mjg1qby"; depends=[dgof MASS Rcpp]; }; + KSgeneral = derive2 { name="KSgeneral"; version="0.1.2"; sha256="15h65pkkdkakqc86vh90qx2ny9pfmd2pm5vc3qrb797l4b02mqqc"; depends=[dgof MASS Rcpp]; }; KTensorGraphs = derive2 { name="KTensorGraphs"; version="0.2"; sha256="1851cqsn8ghp29hjp3806hl66lqjnz3d69qkmpcmk5nky426ypdr"; depends=[]; }; KappaGUI = derive2 { name="KappaGUI"; version="2.0.2"; sha256="0vklny804xpd9r60j4a01j2gak8jizwjw0abf7yvbcalv3zbpb3k"; depends=[irr shiny]; }; KappaV = derive2 { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[maptools PresenceAbsence rgeos sp]; }; KarsTS = derive2 { name="KarsTS"; version="2.2"; sha256="0ay9qi3wws0vi7lygkljaz6xhskc0mzl6r8wsaia2f5f399ya1hp"; depends=[BaylorEdPsych circular forecast infotheo mgcv missForest MVN nonlinearTseries plot3D rgl stinepack stlplus tcltk2 tkrplot tseries tseriesChaos zoo]; }; - KbMvtSkew = derive2 { name="KbMvtSkew"; version="1.0.1"; sha256="0bbnsalyk6r5pzfpz7cniyck4ganm6jka6vijcrals5sxpg70w7x"; depends=[]; }; + KbMvtSkew = derive2 { name="KbMvtSkew"; version="1.0.2"; sha256="14g27a0dkj4gpf5l2k96fd3aa21fz8b85lf5a1jxj0qgjmr4kib0"; depends=[]; }; KenSyn = derive2 { name="KenSyn"; version="0.3"; sha256="0s8sq3caxn4swac81196dp52r9lbmxb3ni45yaxh53f5g34slsi8"; depends=[lme4 metafor nlme]; }; Kendall = derive2 { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; }; KernSmooth = derive2 { name="KernSmooth"; version="2.23-16"; sha256="1acrkbdn3a74y4dndkcdl1njnpfqz7gk3bsz03g8lfj8l7z53hmq"; depends=[]; }; - KernSmoothIRT = derive2 { name="KernSmoothIRT"; version="6.2"; sha256="1dm3j779y630hxdlxycwha563i3n9viil2ksq49s7m65bnwhj33k"; depends=[plotrix Rcpp rgl]; }; + KernSmoothIRT = derive2 { name="KernSmoothIRT"; version="6.4"; sha256="0qqlmcd04m89pmhrbmxxx4lzzb6sksgrm0j8x7fs5r0sxdqy6rcp"; depends=[plotrix Rcpp rgl]; }; KernelKnn = derive2 { name="KernelKnn"; version="1.1.0"; sha256="1w8k4b2q5bh0kx72ixrdb43aificl991j1akh00xn1zx3gbrjb0p"; depends=[Rcpp RcppArmadillo]; }; - Kernelheaping = derive2 { name="Kernelheaping"; version="2.2.1"; sha256="1mc3jzgmg8gyxs6kk474yz911abqzigxwjwjrmhipc40rrdmmr2z"; depends=[fastmatch ks magrittr MASS mvtnorm plyr sp sparr]; }; + Kernelheaping = derive2 { name="Kernelheaping"; version="2.2.2"; sha256="1aq1yhbs07wl5rjz4v5b8k8brap4p25f76qwr5cif655fxdzxc20"; depends=[fastmatch ks magrittr MASS mvtnorm plyr sp sparr]; }; KnapsackSampling = derive2 { name="KnapsackSampling"; version="0.1.0"; sha256="17yzmd11k1n5iy54vbcvpzvkm8ypbl6n1kfi931wwrrcq9y7hg22"; depends=[lpSolve]; }; Knoema = derive2 { name="Knoema"; version="0.1.16"; sha256="0v6w8rrw8nd4l1by5w9xd4hbxp55cma89kljha47ykvmnflsrjsc"; depends=[base64enc digest httr jsonlite lubridate xts zoo]; }; KnowBR = derive2 { name="KnowBR"; version="2.0"; sha256="0i934gff8ldg0lm5cfcf3ip7abnparaaviq8avs7cbnacs6nw8i1"; depends=[fossil mgcv plotrix sp vegan]; }; KnowGRRF = derive2 { name="KnowGRRF"; version="1.0"; sha256="0nk0baibd184rsg23jx1wg4c2fcaqf8ww7822xrs3w5ym6vwd0rs"; depends=[MASS PRROC randomForest RRF]; }; - KoNLP = derive2 { name="KoNLP"; version="0.80.2"; sha256="1i2f684gsgdmmiricrlc8zgzhxk1r0smyzn08jbhfaxkf7adyczy"; depends=[devtools hash rJava RSQLite Sejong stringr tau]; }; - KoulMde = derive2 { name="KoulMde"; version="3.1.0"; sha256="158lg1jr3lgn85wgdxww6nldy9blxnnjry6hwkp6kcjpg9jljjl8"; depends=[expm Rcpp RcppArmadillo]; }; + KoulMde = derive2 { name="KoulMde"; version="3.1.1"; sha256="0k9077jpr6pv862l7rmrjmi06rl0nlfvn4zdxybsd876r1g861d1"; depends=[expm Rcpp RcppArmadillo]; }; Kpart = derive2 { name="Kpart"; version="1.2.2"; sha256="02df0pr8a0gm8558gbw9svxf5sybmg27grymy71ar9hjnhw5xlf2"; depends=[leaps]; }; KraljicMatrix = derive2 { name="KraljicMatrix"; version="0.2.1"; sha256="0yzilmiiyzd2x3v0cnjphf0wdwiblh37kgrvmfrdy49qly48pvi2"; depends=[dplyr ggplot2 magrittr tibble]; }; KrigInv = derive2 { name="KrigInv"; version="1.4.1"; sha256="0x12xff7lgr1v2243shfz9a8r02qs56p7i0b8j2s6bmrzj1abrwb"; depends=[anMC DiceKriging mvtnorm pbivnorm randtoolbox rgenoud]; }; + Kurt = derive2 { name="Kurt"; version="1.0"; sha256="03ivbvgkw3irmcv41zp1wcqzykz81pvvnh39b20qhbgrai2yln79"; depends=[expm labstatR matrixcalc polynom]; }; L0Learn = derive2 { name="L0Learn"; version="1.2.0"; sha256="17k006nxn9n66nh6nrnhv24p150s7icbhzsaimjidj7hx2c24lms"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2]; }; + L1mstate = derive2 { name="L1mstate"; version="1.0"; sha256="04gw078zyzpmnrxibqz27gf4dgyhhcn6lg15w10c6la079vfixx2"; depends=[colorspace MASS Matrix mstate Rcpp RcppEigen]; }; L1pack = derive2 { name="L1pack"; version="0.38.19"; sha256="09n1045lsx1ap47mhzcqghmwwhj24kvpjjr3ysprj058jp5g7ri0"; depends=[]; }; + L2DensityGoFtest = derive2 { name="L2DensityGoFtest"; version="0.1.0"; sha256="0yhcj58inmj3qafvvpghs1qi8h5f14jki4qxy28jc7g8ciqxcw60"; depends=[fGarch kedd nor1mix]; }; LAGOSNE = derive2 { name="LAGOSNE"; version="2.0.1"; sha256="1lay0zb24k5ms4nfr62pgpriy7nfafnkdjjrd7xxznsi7dqrav0y"; depends=[curl dplyr lazyeval magrittr memoise progress purrr rappdirs rlang sf stringr tibble tidyr]; }; LAM = derive2 { name="LAM"; version="0.4-17"; sha256="1isvhmrrpaamahwkxxsgyq6gbzcvfsk2s4ccjavnab4p79j0x782"; depends=[CDM Rcpp RcppArmadillo sirt]; }; LANDD = derive2 { name="LANDD"; version="1.1.0"; sha256="13szkww9nw8zywfrqd8mwgj9csgragm0bx8ia52rcpakpc3hv3hx"; depends=[BH doParallel fdrtool foreach GGally ggplot2 GOSemSim GOstats igraph intergraph Matrix modeest mvtnorm pROC Rcpp]; }; LARF = derive2 { name="LARF"; version="1.4"; sha256="1sqib7smgjacn07ishwls1nlbvcb6fpp1vhrjwf9g4xf9jk30i8h"; depends=[Formula]; }; LARisk = derive2 { name="LARisk"; version="0.1.0"; sha256="05pszgm53dndq114qqb3kcddbvc16a9mgalxjsyh56aa2a4wh7q6"; depends=[Rcpp]; }; - LBLGXE = derive2 { name="LBLGXE"; version="1.4"; sha256="0a5rhijkp9xmwxlc0sx2fj6nikdwgjh2rw9pqavq8bnvvxq6ykwa"; depends=[dummies hapassoc]; }; LBSPR = derive2 { name="LBSPR"; version="0.1.5"; sha256="0bkq7lj45c5inm4klwxkwv1y39rkhwis53d1qsr908k5xmkbgg0i"; depends=[dplyr ggplot2 gridExtra plotrix RColorBrewer Rcpp shiny tidyr]; }; LCA = derive2 { name="LCA"; version="0.1.1"; sha256="014kih33y8b9nls0pcigw68jbz7vgnq8w1xbwm2d37g1m5y6xlyw"; depends=[]; }; LCAextend = derive2 { name="LCAextend"; version="1.3"; sha256="1l75y3vkbsmsm3pjd5pwy0hlv6gz5ryxs4pkx9aiyhxz2y9wnhpb"; depends=[boot kinship2 mvtnorm rms]; }; LCAvarsel = derive2 { name="LCAvarsel"; version="1.1"; sha256="0aqc9rbrc8n6s9xllmamby219qsnxd4ajvffjr21qlkhkaklirb1"; depends=[doParallel foreach GA MASS memoise nnet poLCA]; }; LCF = derive2 { name="LCF"; version="1.7.0"; sha256="1n5gwnkj26b7w6bzapda049bd4aqb317cip05nf0vy04xjc8giyc"; depends=[quadprog]; }; LCFdata = derive2 { name="LCFdata"; version="2.0"; sha256="1x3vbr6hdviqvd6dxn1kb449g0q5zkfmjsmr5nxd2g82p69lv3xm"; depends=[]; }; - LCMCR = derive2 { name="LCMCR"; version="0.4.3"; sha256="1pzavzlr3fml4chrh0fmj8688a3xa153w5gp404nx3qld5sizqrm"; depends=[]; }; + LCMCR = derive2 { name="LCMCR"; version="0.4.11"; sha256="11vcqjjlcps3nqfrmncfqdadhrwk7fvrnx6xqwnc6l12hr98hic0"; depends=[]; }; LCox = derive2 { name="LCox"; version="0.1.0"; sha256="1cqkqmi6bkd41xxwqqzpdiwdv8m5nrqz3f6cajnnbmgfcjawmrzq"; depends=[fdapace survival]; }; - LDATS = derive2 { name="LDATS"; version="0.2.4"; sha256="1glzg2v8fmbmx9rv4smsy3fcswg8kdhh3g21m1lzld50nlvg2w1f"; depends=[coda digest dplyr extraDistr here lubridate magrittr memoise mvtnorm nnet progress reshape topicmodels viridis]; }; + LDATS = derive2 { name="LDATS"; version="0.2.7"; sha256="0im5lvhfbxvrkz9yvfg5xibzdlss869rdz5mixr4ric9lj0ixx0g"; depends=[coda digest extraDistr lubridate magrittr memoise mvtnorm nnet progress topicmodels viridis]; }; LDAvis = derive2 { name="LDAvis"; version="0.3.2"; sha256="1y9wd379rfv3rd3f65ll21nvh6i8yafvv11f8gw8nn06194dgfzg"; depends=[proxy RJSONIO]; }; LDOD = derive2 { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rmpfr Rsolnp]; }; LDPD = derive2 { name="LDPD"; version="1.1.2"; sha256="1khdx8vwlpliyjc4sxcdiywbxl8lc9f5s3457vcip1j8dv537lbm"; depends=[MASS nleqslv]; }; LDRTools = derive2 { name="LDRTools"; version="0.2-1"; sha256="05srfyplsypi3whfa71lx7pnad23irpf0p7rxmrpv28jgdmrz6wf"; depends=[]; }; LDcorSV = derive2 { name="LDcorSV"; version="1.3.2"; sha256="0lvk3xz400yd3w0cjdfi6hir1ym1mffd504vycwgck5fkzljpcvx"; depends=[]; }; LDheatmap = derive2 { name="LDheatmap"; version="0.99-7"; sha256="1r0j8bihi5z1x0sgaf7dwzpsw9i0nc1vylvipvc0cia2ka1lr9dc"; depends=[genetics Rcpp snpStats]; }; - LDlinkR = derive2 { name="LDlinkR"; version="1.0.1"; sha256="1k7g7z78fs2pjx436x9z0ikldk0ma9yl503xbx5xwpmw9q6c769k"; depends=[httr]; }; + LDlinkR = derive2 { name="LDlinkR"; version="1.0.2"; sha256="0143g41hcljqsfngly56g47pc2pj5xc3myyqia1akxrlwpzdlh7h"; depends=[httr]; }; LDtests = derive2 { name="LDtests"; version="1.0"; sha256="1jwqr7zlp9hv7vw8xp80xvrwbdv796wjgr914v393wfa07j5wbd1"; depends=[]; }; LEANR = derive2 { name="LEANR"; version="1.4.9"; sha256="053xy13ys5hibafdnbkwqdk36hw7dhanp4frfacpfpn5f9nfh95r"; depends=[foreach igraph]; }; LEAP = derive2 { name="LEAP"; version="0.2"; sha256="1yrhanxvr7krvllqzv17qkc4wvmd7mgl57am8sn53773dbfipfc4"; depends=[]; }; @@ -2130,7 +2153,7 @@ in with self; { LFDREmpiricalBayes = derive2 { name="LFDREmpiricalBayes"; version="1.0"; sha256="1imw3djmbpdyplv9dmdzzirp9imk88j0kcxcyfh8yr9ywgd77x6b"; depends=[matrixStats R6]; }; LGEWIS = derive2 { name="LGEWIS"; version="1.1"; sha256="1i52vp0ghjzmyh4r8h6jpyij7x4skw99xvw017b56m8fg64zy70r"; depends=[CompQuadForm geeM mvtnorm SKAT]; }; LGRF = derive2 { name="LGRF"; version="1.0"; sha256="1kdx6y55aa9n6v43zfz6jk8amvvxbx79sqm1jx4ihgkpgcdglan7"; depends=[CompQuadForm geepack SKAT]; }; - LHD = derive2 { name="LHD"; version="0.1.2"; sha256="13g90v9mz1lx8fcwkyy1mg722zsairsay2mr77x0m4drg99ikq6r"; depends=[]; }; + LHD = derive2 { name="LHD"; version="0.1.3"; sha256="1cd3m67r6b6y4wszax0qgj4b00gy8lymfy8fvvyh21grsiyaysc8"; depends=[]; }; LICORS = derive2 { name="LICORS"; version="0.2.0"; sha256="0p9y21k1mj1v397jpb5g6jiw7rpzbyfwr4kv2rp3lyxyasy2ykf0"; depends=[fields FNN locfit Matrix mvtnorm RColorBrewer zoo]; }; LIHNPSD = derive2 { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh028vwjw6l6h10cirbnwr65s458zvh4xqv"; depends=[BB Bolstad2 moments optimx Rmpfr sn]; }; LIM = derive2 { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[diagram limSolve]; }; @@ -2139,30 +2162,30 @@ in with self; { LLM = derive2 { name="LLM"; version="1.0.0"; sha256="0x4488mg8q4nhyjhqlzkwmh51frkkjn0gir22rk8rfzg4r6d18d6"; depends=[partykit RWeka stringr]; }; LLSR = derive2 { name="LLSR"; version="0.0.2.19"; sha256="19flvf15sn3fd21fymcg7ag1psl265m0i7siw1fqb6j6fvsn0y8v"; depends=[crayon digest dplyr ggplot2 minpack_lm nleqslv rootSolve svDialogs svglite XLConnect]; }; LMERConvenienceFunctions = derive2 { name="LMERConvenienceFunctions"; version="2.10"; sha256="08jz0i7sv7gn3bqckphbmnx0kc6yjnfvi06iyf7pcdzjaybxhj06"; depends=[fields LCFdata lme4 Matrix mgcv rgl]; }; - LMest = derive2 { name="LMest"; version="2.6.0"; sha256="1vzwcnp14bfbf7173fnxy1fwl8j9n2hrvmzw9ks6778ykg21q1f6"; depends=[Formula MASS mix mmm MultiLCIRT mvtnorm]; }; + LMest = derive2 { name="LMest"; version="2.6.1"; sha256="16amjb7dj5czlsjmr5s2hnjrfsiqwnc430q3hcncp3lllqib552g"; depends=[Formula MASS mix mmm MultiLCIRT mvtnorm]; }; LMfilteR = derive2 { name="LMfilteR"; version="0.1.2"; sha256="10agjrljnqw689nn9af9ihhb9sq2gmsx7l3zfmrizkavjjk67mcd"; depends=[MASS]; }; LN0SCIs = derive2 { name="LN0SCIs"; version="0.1.5"; sha256="09zr6lrvv7lw9qp3vz4n2dv0v3q7wq06wwvwpb2pm0r335bnrf89"; depends=[]; }; LNIRT = derive2 { name="LNIRT"; version="0.4.0"; sha256="0g2yqpsxz2fsvgvgn60yv2k8mv63anf6g2zzd9njarc524n874r8"; depends=[MASS]; }; LOGAN = derive2 { name="LOGAN"; version="1.0.0"; sha256="00y8kcykw01gv2g20vmpwkc3qqyafwbiw5pa731xlfnh1b8sn0hi"; depends=[dplyr foreign ggplot2 magrittr modules pander psych rlang stringr]; }; LOGICOIL = derive2 { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; }; - LOST = derive2 { name="LOST"; version="1.3"; sha256="01ymnczsnfml04hb6hbi041khkz2aki78qr3hriw7n3bzs5i7xim"; depends=[e1071 gdata MASS miscTools pcaMethods rgl shapes]; }; + LOST = derive2 { name="LOST"; version="2.0.2"; sha256="15ggmvjy2k4j692y9h3anfzmb0hgnx66cbr76grwvcfysdx87ick"; depends=[e1071 gdata geomorph MASS miscTools pcaMethods rgl shapes]; }; LPBkg = derive2 { name="LPBkg"; version="1.2"; sha256="1pgv6cb7m2j7qnrzybnv6x67a3ry8kpvisqj86rvxzclc9q56fdn"; depends=[Hmisc orthopolynom polynom]; }; LPCM = derive2 { name="LPCM"; version="0.46-3"; sha256="1bm5y95lzwcv8arlh55sy17m6hz1x48bcjkrwf3x34ax90qimf66"; depends=[]; }; - LPGraph = derive2 { name="LPGraph"; version="2.0"; sha256="1d3czxihaz3f09bfb34knqb6prhcx50kh8y4qrhhakic999z6ifw"; depends=[car PMA SDMTools]; }; + LPGraph = derive2 { name="LPGraph"; version="2.1"; sha256="1d2kslravi3v9kf6sdabwfpa9s9xxqj3s3d7f7qfcrpfydqixq1q"; depends=[car PMA]; }; LPKsample = derive2 { name="LPKsample"; version="2.0"; sha256="1jg99025vk42rnjdymh3nj71npn4pmdsmk6rvnx3lykpi72f85dz"; depends=[apcluster igraph mclust]; }; LPM = derive2 { name="LPM"; version="2.8"; sha256="0a4cf7chjyfwp1s8dfyfgbm2k6nybfmfh4bhz8b8pfj1an68bdr6"; depends=[fracdiff MASS powdist]; }; - LPRelevance = derive2 { name="LPRelevance"; version="2.1"; sha256="0hcg8yl6l8r0aybprrn0zi8mkwp2wldbh53w9dagfrpnz5la05qa"; depends=[BayesGOF Bolstad2 ggplot2 leaps locfdr polynom reshape2]; }; + LPRelevance = derive2 { name="LPRelevance"; version="3.0"; sha256="0rrk9rs964jbvf2qfr7lzq8bfbl1zgyn84lhpqvr8ylppvs49raw"; depends=[BayesGOF Bolstad2 caret ggplot2 glmnet leaps locfdr MASS polynom reshape2]; }; LPS = derive2 { name="LPS"; version="1.0.10"; sha256="0gf3jmhfki01z8fm5xdx59gxvhgzqd10x2iwa8369iz9dvwbjk8j"; depends=[]; }; LPStimeSeries = derive2 { name="LPStimeSeries"; version="1.0-5"; sha256="0jmcy8076w4bzfnxaq2m3s60c1wdmywkwzfyrc19wdm8idf666wh"; depends=[RColorBrewer]; }; LPTime = derive2 { name="LPTime"; version="1.0-2"; sha256="08lb6884kj9pg12mzx67fdnqb86x5s6yzb72hh3nrz50awj1f8nn"; depends=[orthopolynom]; }; LPWC = derive2 { name="LPWC"; version="1.0.0"; sha256="0jgz8rkhhsdiwz7jq568axcsfwlkzdpwssr76zx33r0gz6mf3lln"; depends=[nleqslv]; }; LPmerge = derive2 { name="LPmerge"; version="1.7"; sha256="1wf7hfj670pnzzxyqm3vwrbrvxdbyprh42s5vpv4y54a0w4nr83g"; depends=[Matrix Rglpk]; }; LPower = derive2 { name="LPower"; version="0.1.1"; sha256="00sabp2snfm0175c0cfyv83yd1zb3b8h2wrr7yxgkmr4i3py1fn7"; depends=[MASS nlme]; }; - LRQMM = derive2 { name="LRQMM"; version="1.2.0"; sha256="0v8jxpg1rpr9fm9069zh8846z5l0ad71i229pvsilvdrn1m4vf3l"; depends=[corpcor GeneticsPed kinship2 Matrix MCMCglmm quantreg SparseM sparsesvd]; }; + LRQMM = derive2 { name="LRQMM"; version="1.2.1"; sha256="1lwhswzi1zn9yiqv9dgn5m6m03wwagldm2n804cwxdfq96c9vhcb"; depends=[corpcor GeneticsPed kinship2 Matrix MCMCglmm quantreg SparseM sparsesvd]; }; LRTH = derive2 { name="LRTH"; version="1.3"; sha256="08vakwb7ca7956gifynzijka441yyx0wd5bq5jfhz56lzcxgfb99"; depends=[]; }; LRcontrast = derive2 { name="LRcontrast"; version="1.0"; sha256="0fs06p853r42nws2camvs87py39hb1ssxhfm6d5n9kkq81snfx4q"; depends=[DoseFinding]; }; LS2W = derive2 { name="LS2W"; version="1.3.4"; sha256="1h4vvl1gfxkdjmy6syl0gf4fv03xxxw82cxwvy10b40sf20lwmnv"; depends=[MASS wavethresh]; }; - LS2Wstat = derive2 { name="LS2Wstat"; version="2.1-1"; sha256="0y9di5n8ls4xzw0yrh0kx8c73s4wf1kzdyy8ssk6garvjln9dn9v"; depends=[geoR LS2W matrixStats RandomFields spdep]; }; + LS2Wstat = derive2 { name="LS2Wstat"; version="2.1-2"; sha256="1rgca2np80m0jqdsp69xys3h6x1sz0jirl3gmww8mcls5gk4v30v"; depends=[LS2W matrixStats RandomFields spdep]; }; LSAfun = derive2 { name="LSAfun"; version="0.6.1"; sha256="1q43ds1779w4m4al8brqj4h4y7ys5q5ysw7jbdrxdrw4lwdh7qlf"; depends=[lsa rgl]; }; LSAmitR = derive2 { name="LSAmitR"; version="1.0-2"; sha256="15qyij193scrvc1ghcssr6qdzxc4l4qh199s09bz5hvr62zwfdgb"; depends=[Hmisc lme4]; }; LSC = derive2 { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[fields gam LICORS Matrix RColorBrewer]; }; @@ -2173,15 +2196,14 @@ in with self; { LSPFP = derive2 { name="LSPFP"; version="1.0.0"; sha256="074qd7zxa54cawipmba1khb6hyrkg553vc25gf2z0ydyv14shm0w"; depends=[bit64 data_table R_utils RCurl seqinr tcltk2]; }; LSRS = derive2 { name="LSRS"; version="0.2.0"; sha256="0p70v5vbxi1rf055mqgsp8v0lxnaj53bmbghli1764yn3x1k3iw6"; depends=[]; }; LTPDvar = derive2 { name="LTPDvar"; version="1.2"; sha256="0r9v5g5y9n85jdcvm7zpapm73ism48m3mmybpcmgcs028h2ndv7v"; depends=[]; }; - LTR = derive2 { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; }; LTRCtrees = derive2 { name="LTRCtrees"; version="1.1.0"; sha256="07mvbk3hwl240r46ahha0a4fzq96awk963zl8dhky51b6abp83gz"; depends=[icenReg inum partykit rpart survival]; }; LUCIDus = derive2 { name="LUCIDus"; version="1.0.0"; sha256="1gkbfb7gnlk19iy7wnls80h3mqa0y13fld1l5ivhskr7sjlla2q0"; depends=[boot doParallel foreach glasso glmnet lbfgs Matrix mvtnorm networkD3 nnet]; }; LVGP = derive2 { name="LVGP"; version="2.1.5"; sha256="03sd777s16nv04ikn9b3rj67ad6n4bwi0rycc7wqdnq0dx6xgniy"; depends=[lhs randtoolbox]; }; LW1949 = derive2 { name="LW1949"; version="1.1.0"; sha256="147ymp7j98ihp1dcz3p5v9ar6h767phjdnga5q5vf1wwa2mxawg7"; depends=[MASS mgcv plotrix]; }; LZeroSpikeInference = derive2 { name="LZeroSpikeInference"; version="1.0.3"; sha256="15x29afaq13iwlj66h97k3kczg9rfgp6i9d76rji58hfgh8i8by6"; depends=[]; }; - LaF = derive2 { name="LaF"; version="0.8.0"; sha256="1nasj0502i0dbzqgm1pdvmc0wj1hk2q5fzanpcsh7zslsikiqxyq"; depends=[Rcpp]; }; + LaF = derive2 { name="LaF"; version="0.8.4"; sha256="1mj010bl4ql0hm33vl0dd08s9dab11y9fa32nsqs6kbb22gjzk6p"; depends=[Rcpp]; }; LabRS = derive2 { name="LabRS"; version="0.1.0"; sha256="1a9qafimia83qldsif5wfqx273mvqbx22p5i0hg8n4jvj4vzpy2w"; depends=[knitr]; }; - LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.2.3"; sha256="0pi1f25mgqp9sxbxsjv8335bi70cinnvapzwp8m2mfizcpbqw9hq"; depends=[data_table maptools rgdal rgeos sp spdep]; }; + LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.2.4"; sha256="0xm6rn8r5z3b04zd7gdrclhzmqcvqxyyjlch5npdyq8sbfd163hh"; depends=[data_table maptools rgdal rgeos sp spdep]; }; LadR = derive2 { name="LadR"; version="1.0.6"; sha256="14n58y1p14wwxwwrbdqv2kkplma8ficpqx8nd22qp931idijpsji"; depends=[L1pack]; }; LagSequential = derive2 { name="LagSequential"; version="0.1.1"; sha256="1i8h4acfx21r0kxbg4i0k48kvhwy2abri191wp4b22amhz4vqyyd"; depends=[]; }; Lahman = derive2 { name="Lahman"; version="7.0-1"; sha256="02f4402nsx3fr31j34lwc0jrygqwznzynn2c11nilgw5bcb29gh9"; depends=[dplyr]; }; @@ -2190,7 +2212,7 @@ in with self; { LambertW = derive2 { name="LambertW"; version="0.6.4"; sha256="09ygalklv0d767nwziqwaxa7h517rzqgaznmb04q43122x2gwb3k"; depends=[ggplot2 lamW MASS RColorBrewer Rcpp reshape2]; }; Langevin = derive2 { name="Langevin"; version="1.2.1"; sha256="1bl7145585z173jv8y6f36ba29q1iq29anm44bdq9hcpql235ihy"; depends=[Rcpp RcppArmadillo]; }; LaplaceDeconv = derive2 { name="LaplaceDeconv"; version="1.0.4"; sha256="0n56cmrb536j1vmfizzag1x8wm68c2znpclwbdl8qraqzp8rmffx"; depends=[orthopolynom polynom]; }; - LaplacesDemon = derive2 { name="LaplacesDemon"; version="16.1.1"; sha256="0xxx8967v015fy56m0hqfnr1mwgisj8ximdl05bs28ymzvdx37kp"; depends=[]; }; + LaplacesDemon = derive2 { name="LaplacesDemon"; version="16.1.4"; sha256="1nv1kx86cg8f2s8q15pzskc0lg94bb250p0fhybrx5sjqv1s2lj1"; depends=[]; }; LassoBacktracking = derive2 { name="LassoBacktracking"; version="0.1.2"; sha256="1z1cnj6r6cq3b8xa9qck3ijfmzsr70r2p9m1ndakijb36pgwrzcs"; depends=[Matrix Rcpp]; }; LassoNet = derive2 { name="LassoNet"; version="0.8.3"; sha256="02m0g078wg9ka3ck92nrpqrm3msw1m7r8k43brcaiffqwhky99vy"; depends=[Rcpp]; }; LassoSIR = derive2 { name="LassoSIR"; version="0.1.1"; sha256="0ap8335ms12nsc7jvd48244zya54w05wj91qkhb0i63730r508c3"; depends=[glmnet]; }; @@ -2205,9 +2227,9 @@ in with self; { LearnBayes = derive2 { name="LearnBayes"; version="2.15.1"; sha256="0ch54v2zz2yyyk0lvn5rfikdmyz1qh9j1wk3585wl8v58mc0h4cv"; depends=[]; }; LearnGeom = derive2 { name="LearnGeom"; version="1.4"; sha256="0qalhy4g47ik8cq2m1zajhv79rla8g72dmcwhnizwn6afhm6fnpm"; depends=[]; }; LearningRlab = derive2 { name="LearningRlab"; version="1.3"; sha256="14q8pm51yrfpny2wg5l0x02zibh7qn11zkg51igadq3r6256rfd1"; depends=[crayon magick]; }; - LendingClub = derive2 { name="LendingClub"; version="2.0.0"; sha256="13qh5p4ksvgd1pmc4mdp8p44ra34fvp3s5p5vhlkpclkv5d4mxq2"; depends=[dplyr httr jsonlite plyr readr]; }; LexisNexisTools = derive2 { name="LexisNexisTools"; version="0.3.0"; sha256="19fcyvq2gs6iyks5x2s0xvbxqzvh9h7hpympvyrsx4026zv8x5cz"; depends=[data_table pbapply quanteda stringdist stringi tibble]; }; LexisPlotR = derive2 { name="LexisPlotR"; version="0.4.0"; sha256="0vlm8wcaj3755cbxrfb7ybla9znd2cbklw2xwyyn6r9i4c9xsfih"; depends=[dplyr ggplot2 tidyr]; }; + LibOPF = derive2 { name="LibOPF"; version="2.6.0"; sha256="0xs4098qd4j1c1vl8x8620xkrfg0iisdzs203djaqb7vqlywmlrn"; depends=[]; }; LiblineaR = derive2 { name="LiblineaR"; version="2.10-8"; sha256="17ykazac7iv02bxl8xg948vhbdr32icdm1v4bk31zmslp4xsk08g"; depends=[]; }; LiblineaR_ACF = derive2 { name="LiblineaR.ACF"; version="1.94-2"; sha256="1ldkb63yhm1ki8i585wp5byx6y0kvclwy3ncacgcdqqk0p41cyi6"; depends=[]; }; Libra = derive2 { name="Libra"; version="1.6"; sha256="0fqmc6fhcmpg9ragk4r4k000wrix9dsd52baz58bp1c80wpvvcf3"; depends=[nnls]; }; @@ -2216,7 +2238,7 @@ in with self; { LightningR = derive2 { name="LightningR"; version="1.0.2"; sha256="1va673aw2hgir8ybbjad6dhbs8izs1z4jcikwa7qp3mkv0zqd0vq"; depends=[httr R6 RCurl RJSONIO]; }; LilRhino = derive2 { name="LilRhino"; version="1.2.0"; sha256="1d1mg77k67b5ddlp41haygagash48b6jy30q20lb231lbiss9ncp"; depends=[beepr data_table dplyr e1071 fastmatch FNN ggplot2 keras neuralnet readr SnowballC stringi textclean tm]; }; LinCal = derive2 { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm8fhaxvdwql894kdp0y5h4pchkdph"; depends=[]; }; - LinRegInteractive = derive2 { name="LinRegInteractive"; version="0.3-2"; sha256="0axczfd71i62bi82spraf3s780yq47p3gb0kpicgdnnmbrj683rl"; depends=[rpanel xtable]; }; + LinRegInteractive = derive2 { name="LinRegInteractive"; version="0.3-3"; sha256="1rkxvkv3ls0cgqcvs74dy6qabh62cjc0xh89dlk88bpc8mz76k8z"; depends=[rpanel xtable]; }; LindenmayeR = derive2 { name="LindenmayeR"; version="0.1.13"; sha256="01wnvmxdb91ai21h3plgsmy6ds7564s5wq2xyr905ma4a2d8afn5"; depends=[stringr]; }; LindleyPowerSeries = derive2 { name="LindleyPowerSeries"; version="0.1.0"; sha256="1nylsmxx1s6g5dzz69kaqccx3c7hzb49jan22b94816pnzd0k7zp"; depends=[lamW]; }; LindleyR = derive2 { name="LindleyR"; version="1.1.0"; sha256="163i604q683znp6q544hnv4vibygwvsxcfhh8m7iaqr42li3c0ak"; depends=[lamW]; }; @@ -2231,7 +2253,7 @@ in with self; { LncMod = derive2 { name="LncMod"; version="1.1"; sha256="08001y7s93i3k3478jqfh9zsgpq6ym1xmdmldi7s76zbfr1nknvy"; depends=[pheatmap survival]; }; LncPath = derive2 { name="LncPath"; version="1.1"; sha256="1cpsy681yq96867nr9g75xb0dilb016shqlhxpdn5xyiakrgjl4v"; depends=[igraph]; }; LocFDRPois = derive2 { name="LocFDRPois"; version="1.0.0"; sha256="0zzdp9wgwr6wn3grimghpj4vq34x37c8bqg8acfzlzih8frqal3r"; depends=[dplyr ggplot2]; }; - LocalControl = derive2 { name="LocalControl"; version="1.1.2"; sha256="0r1qjzwmnh4qgxi5lfpg7v0ksjvcqbn8c23y2cyvb58srmxv7plb"; depends=[cluster gss lattice Rcpp]; }; + LocalControl = derive2 { name="LocalControl"; version="1.1.2.1"; sha256="123s7r11ivnp7fz6zcvzrgfyc17cqvn8k1786hcmgkplq9qnmnf4"; depends=[cluster gss lattice Rcpp]; }; LocalControlStrategy = derive2 { name="LocalControlStrategy"; version="1.3.3"; sha256="05vggk5d0w3f9w5217c9hzy5jhwv24p2g8pcj0l6zxkhic01nbrl"; depends=[cluster lattice]; }; Lock5Data = derive2 { name="Lock5Data"; version="2.8"; sha256="17awskq78h23z2dy96d7hziljhnkx5phpd48q7cppxidyvzfywim"; depends=[]; }; Lock5withR = derive2 { name="Lock5withR"; version="1.2.2"; sha256="10x3i11pb4cig4pgfmw9984na5zjbg7d41y6crakiimf53ihx0c2"; depends=[]; }; @@ -2241,12 +2263,12 @@ in with self; { LogitNet = derive2 { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; }; LogrankA = derive2 { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; }; LogrankPower = derive2 { name="LogrankPower"; version="1.0.0"; sha256="04vynymfv01q423dd9i1li92rl3lp1af3rzn3z4mamkn51mi6my0"; depends=[survival survminer]; }; - LongCART = derive2 { name="LongCART"; version="1.0"; sha256="03fh4glvk48lhmx2lp3vcy9k6jnfnzn73dpljq73fl8zlbr8vv61"; depends=[Formula nlme rpart]; }; + LongCART = derive2 { name="LongCART"; version="2.0"; sha256="1xpbyz6hqwhbcgjv6fxkry30fhq11nw2r9s3smwik8cw8yiciwl5"; depends=[Formula magic nlme rpart survival survminer]; }; LongMemoryTS = derive2 { name="LongMemoryTS"; version="0.1.0"; sha256="0n378sad8i283vs7q63spdhwpwjly2d5zj15d4v2085j7sc7z8vi"; depends=[fracdiff longmemo mvtnorm partitions Rcpp RcppArmadillo]; }; LoopAnalyst = derive2 { name="LoopAnalyst"; version="1.2-6"; sha256="1gy9v6qiwkwbwp4snif2imf6zn50ffjrig54ln57c5v5pk3phnvv"; depends=[nlme]; }; LoopRig = derive2 { name="LoopRig"; version="0.1.1"; sha256="11rarb9fg8abc4dpd8sd8safqw3v6g8k6rcrg2nw97xppwcz8c6b"; depends=[GenomicRanges IRanges S4Vectors]; }; LotkasLaw = derive2 { name="LotkasLaw"; version="0.0.1.0"; sha256="11kq52yavicimp7ll7ljrs69a5fxf68ydb9md7v6b02iw5mwbmz7"; depends=[]; }; - LowRankQP = derive2 { name="LowRankQP"; version="1.0.3"; sha256="1a46rk0fhpnrlfzmydy7zjswrm6hf056qxgf5p10naq6025whf8x"; depends=[]; }; + LowRankQP = derive2 { name="LowRankQP"; version="1.0.4"; sha256="0cg8f42s15vphnifw6gnrhxaj6j5hmgbq8xki5mkwjsizd0ch5na"; depends=[]; }; LowWAFOMNX = derive2 { name="LowWAFOMNX"; version="1.1.1"; sha256="0f75qsv6pisgvk39yagzfxscnyfsgh63rmhp4gpybpl0pqmjp48x"; depends=[Rcpp RSQLite]; }; LowWAFOMSobol = derive2 { name="LowWAFOMSobol"; version="1.1.1"; sha256="1ym3i2m1am356di9lcp5nfmxq0np3c4bwsv6bbmf7hg02j7dhwi4"; depends=[Rcpp RSQLite]; }; Luminescence = derive2 { name="Luminescence"; version="0.9.7"; sha256="15slaiwhk5a15kmxr5slkbsm963v0dwmdl4adnhvc3j0b0c0d0r8"; depends=[bbmle data_table DEoptim httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; }; @@ -2265,7 +2287,7 @@ in with self; { MAP = derive2 { name="MAP"; version="0.1.3"; sha256="19d0m30jh50ibbdgvcvq1vsz5i1vf8qvl0d0nbqklvnndch61jhk"; depends=[flexmix Matrix]; }; MAPA = derive2 { name="MAPA"; version="2.0.4"; sha256="02s223s58k2jk49m0xlz3q9m3nip3h4dl4v58j18z2vgi54dwnjr"; depends=[forecast RColorBrewer smooth]; }; MAPLES = derive2 { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; }; - MARSS = derive2 { name="MARSS"; version="3.10.10"; sha256="03kkg6slq3z12saw0vf6z9wqadzpy4yjh9bm47zl4av4pj03y6lr"; depends=[KFAS mvtnorm nlme]; }; + MARSS = derive2 { name="MARSS"; version="3.10.12"; sha256="09b0q9aq1y4nrgpvr1xkzibv5xf9qdcaxlz02zl9sv4x1zmpi80w"; depends=[KFAS mvtnorm nlme]; }; MARX = derive2 { name="MARX"; version="0.2"; sha256="1rc87hz719khl8mclbkfdix499nsc4nyihaaavd73nany7iprm02"; depends=[fBasics matlab metRology stabledist tseries]; }; MASS = derive2 { name="MASS"; version="7.3-51.5"; sha256="1k0m7pa4gb5apzrrkb5kx5d7bmkm2pl5g15vwb6j067hrqahck26"; depends=[]; }; MASSTIMATE = derive2 { name="MASSTIMATE"; version="1.4"; sha256="1lpmpxgqnczlizx5gwgw96kxqkjqvbjqwf373zkvfmax2pfqr6dn"; depends=[]; }; @@ -2285,8 +2307,8 @@ in with self; { MBESS = derive2 { name="MBESS"; version="4.6.0"; sha256="1fc2zcjfk9k107bl3fs3wf8fxxrcpwyhiz7j1iv3w6zqf2l4fb88"; depends=[boot gsl lavaan MASS mnormt nlme OpenMx sem semTools]; }; MBHdesign = derive2 { name="MBHdesign"; version="2.1.6"; sha256="188kx7594qsxq5wnkpzh3xm6rjvsyj5r4hv8kqaa2mcqp5730k1j"; depends=[class geometry mgcv mvtnorm randtoolbox]; }; MBI = derive2 { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; }; - MBNMAdose = derive2 { name="MBNMAdose"; version="0.2.4"; sha256="0d5fi1i2sr39z5fdl303rjhxvp5h622zbkpfsv3yjq4vp0ymwka0"; depends=[checkmate dplyr magrittr R2jags Rdpack reshape2 rjags scales]; }; - MBNMAtime = derive2 { name="MBNMAtime"; version="0.1.2"; sha256="13742y17aclqbsbc039vlnmrg5sa1y6kjsdayl8ii9xnhbb5f48l"; depends=[checkmate dplyr magrittr R2jags Rdpack reshape2 rjags]; }; + MBNMAdose = derive2 { name="MBNMAdose"; version="0.2.7"; sha256="1r8gz0kpkmgs1czyzwrv018l0z8gypwjdd4gmwbbhhaj84fr3gni"; depends=[checkmate dplyr magrittr R2jags Rdpack reshape2 rjags scales]; }; + MBNMAtime = derive2 { name="MBNMAtime"; version="0.1.3"; sha256="1yyynsdgxdw3zfv0byxbjli332wc3bm8pfhrcy4rsvvvhj458vy7"; depends=[checkmate dplyr magrittr R2jags Rdpack reshape2 rjags]; }; MBSGS = derive2 { name="MBSGS"; version="1.1.0"; sha256="1h5vhmpgrqza12j7ivhwgd5wyb7kkb8mjbxl5w756vyid8g03flz"; depends=[MASS MCMCpack mgcv mnormt truncnorm]; }; MBSP = derive2 { name="MBSP"; version="1.0"; sha256="0mds6jfqgmnm4saqqqqqfcg8zh4qsvd2503g3ij1sn70f0aakwaj"; depends=[coda GIGrvg MASS Matrix MCMCpack]; }; MBmca = derive2 { name="MBmca"; version="0.0.3-5"; sha256="0p7ddpsy4hwkfwyyszidi33qpdg4xllny7g9x24gk782p7kjfgq9"; depends=[chipPCR robustbase]; }; @@ -2298,31 +2320,34 @@ in with self; { MCI2 = derive2 { name="MCI2"; version="1.1.2"; sha256="1vxzfab8yn18icarsdvz8ky7frspxax22sb8c0ki91y1mj9m9mgj"; depends=[MCI osrm REAT reshape tmaptools]; }; MCL = derive2 { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; }; MCMC_OTU = derive2 { name="MCMC.OTU"; version="1.0.10"; sha256="15k3y4bm4cxjb6r30afpw9gksflsxigzb17zwm1ipygq0d0h0zkg"; depends=[coda ggplot2 MCMCglmm]; }; - MCMC_qpcr = derive2 { name="MCMC.qpcr"; version="1.2.3"; sha256="0b9n793spljmsb58jp41vnl9c753xqaw1g4wbi4ax348cvi09jk8"; depends=[coda ggplot2 MCMCglmm]; }; + MCMC_qpcr = derive2 { name="MCMC.qpcr"; version="1.2.4"; sha256="0v0d43wnq3swbrcsbg9qmwkmk4s50grd6cik4ng5baj2i6i4hd2n"; depends=[coda ggplot2 MCMCglmm]; }; MCMC4Extremes = derive2 { name="MCMC4Extremes"; version="1.1"; sha256="06p6xdbja7vrdq4vnhybpkmyf4rkaihcmy9sc81sb0h2wa21vcq0"; depends=[evir]; }; MCMCglmm = derive2 { name="MCMCglmm"; version="2.29"; sha256="1d37rk10zi2yymsxif9091z9lnav7p4cazjfq29fhj90x8vpifhk"; depends=[ape coda corpcor cubature Matrix tensorA]; }; - MCMCpack = derive2 { name="MCMCpack"; version="1.4-5"; sha256="1dfz3impsb70nq7qyk5aj5ixslj2zvwcl1mfqvqzy6zp8kx9r56s"; depends=[coda lattice MASS mcmc quantreg]; }; + MCMCpack = derive2 { name="MCMCpack"; version="1.4-6"; sha256="1ivkm35hkfxgd67hbsga7mghki6np4cfmg719s2sd2d5dy6h3kbb"; depends=[coda lattice MASS mcmc quantreg]; }; MCMCprecision = derive2 { name="MCMCprecision"; version="0.4.0"; sha256="0r0qchiv61sk3drrb0rhwsk55gci4w343hd2gsvclrlyb8r9qhaf"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; }; MCMCtreeR = derive2 { name="MCMCtreeR"; version="1.1"; sha256="00r6f62h7ryil7qxd25icvkqypjjssjsrz4i5sbqsnw5cdy5al8z"; depends=[ape coda sn]; }; - MCMCvis = derive2 { name="MCMCvis"; version="0.13.5"; sha256="0pgihhmizp8dq9fb23ln2m2rbj97r2433n16krji3cm9ji33wndd"; depends=[coda overlapping rstan]; }; + MCMCvis = derive2 { name="MCMCvis"; version="0.14.0"; sha256="0j4a749rc5sj4jd000d28llx7kzn0z1n2p565yvsrj92qnja300p"; depends=[coda overlapping rstan]; }; MCPAN = derive2 { name="MCPAN"; version="1.1-21"; sha256="0q1m0xg8825q9zjwxcz2h2n0dyr21q5bk29qbqpdhirlwm6f1a51"; depends=[magic MCMCpack multcomp mvtnorm plyr]; }; - MCPMod = derive2 { name="MCPMod"; version="1.0-10"; sha256="0ns74qhm9bzi70m9bn61zs4mmqmmxxi77f49pdrcnr8wrrnn1kdn"; depends=[lattice mvtnorm]; }; - MCPModGeneral = derive2 { name="MCPModGeneral"; version="0.1-0"; sha256="1660r7ibgj5jl5nf3p11911n8k3wbnnzagapn73f2g5racwrbx1d"; depends=[DoseFinding MASS]; }; + MCPMod = derive2 { name="MCPMod"; version="1.0-10.1"; sha256="0j15dpxy62vwbd6pcsvkbpi1nklh0yjzwf53kcmv4jhj0v6xmpp9"; depends=[lattice mvtnorm]; }; + MCPModGeneral = derive2 { name="MCPModGeneral"; version="0.1-1"; sha256="0izhbiivlb818ak49hl1f7li1chlyrxk5f80cmw4zkim3l6ddaxq"; depends=[DoseFinding MASS]; }; + MCPModPack = derive2 { name="MCPModPack"; version="0.1"; sha256="110v5gvxc3l138152lzkb98ljrcq5373bykd0dsczc315x4h5wp3"; depends=[devEMF flextable mvtnorm officer Rcpp RcppEigen RcppNumerical shiny shinydashboard]; }; MCS = derive2 { name="MCS"; version="0.1.3"; sha256="1kiz1jq1bm2n8f33nsybp5jfrzzl9xbsi3m9l8818ybmph99xms6"; depends=[]; }; MCSim = derive2 { name="MCSim"; version="1.0"; sha256="1nqry41qa5c02an5fxm3y1g3w1vcqjgsy1an95i3szz1w1ndaj14"; depends=[CircStats MASS]; }; MCTM = derive2 { name="MCTM"; version="1.0"; sha256="14xjfskyrqi0m58lkwjfjpss5j7wy3ajr148n526czrrpccg108j"; depends=[]; }; MChtest = derive2 { name="MChtest"; version="1.0-3"; sha256="1b3p6ry8gkvyphakn3504ibl2x8dbhx95saild0mj0iwm3sjyspf"; depends=[]; }; MConjoint = derive2 { name="MConjoint"; version="0.1"; sha256="02yik28mhvd4rfqwrprdbdjx9c49ds55fh042bsjajs2ip467w5c"; depends=[]; }; + MDBED = derive2 { name="MDBED"; version="1.0.0"; sha256="1r3sizb2mqd4pqjy25krwmsjfkr6cl7lkd8db5jn3hgxx3qh6sgc"; depends=[doParallel foreach ggplot2 lattice orthopolynom psych Rdpack]; }; MDFS = derive2 { name="MDFS"; version="1.0.5"; sha256="17ksjgzi8sxyqczscq1rd6a8zgdd0h9sm3c0ymsf0phr69msvpg0"; depends=[]; }; MDMR = derive2 { name="MDMR"; version="0.5.1"; sha256="1pv57xl7pjsqxz1j8mnfmjaa36mlr749yb4c44ppdrx6khvw662x"; depends=[car CompQuadForm lme4]; }; MDPtoolbox = derive2 { name="MDPtoolbox"; version="4.0.3"; sha256="0aaw787fvcyhw6mbl42icgqfdzvfr618vg179984xqifafr40dyc"; depends=[linprog Matrix]; }; MDSMap = derive2 { name="MDSMap"; version="1.1"; sha256="0knrkfwgl763fwdb3ln3g5y3rarnpqdfgzxf4m045664m7gkipsg"; depends=[princurve reshape rgl smacof]; }; MDSPCAShiny = derive2 { name="MDSPCAShiny"; version="0.1.0"; sha256="0qsjx4v9j5p5a7h1g0xk4j5ib1mdrjsy84bglnjdxr9rpqg2m7n5"; depends=[dplyr MASS psych rmarkdown shiny]; }; + MDSS = derive2 { name="MDSS"; version="1.0-0"; sha256="1shksvj31ygkz048jw4zhqy13dq9c9myrxqs7bizv5yxyzk4bi89"; depends=[]; }; MDimNormn = derive2 { name="MDimNormn"; version="0.8.0"; sha256="080m0irx5v8l45fg9ig5yzcj92s3ah8a9aha288byszli1cchgpn"; depends=[]; }; MDplot = derive2 { name="MDplot"; version="1.0.1"; sha256="1xijh18hrkb807nfkdr7g642aspn5psc8nw29q387jl5hly2w8s9"; depends=[gplots gtools MASS RColorBrewer]; }; MED = derive2 { name="MED"; version="0.1.0"; sha256="0fy0qmxirkdz5kigy2r7l5czjzws0fhjxy13kv1kqh628ldrp109"; depends=[]; }; MEDITS = derive2 { name="MEDITS"; version="0.1.7"; sha256="0n3llnvpxd4bs1vslhmsahvl9vm0pmbmc94gijss16linpskxxkj"; depends=[ggplot2 hms raster rgdal rgeos sp tibble vegan]; }; - MEDseq = derive2 { name="MEDseq"; version="1.0.1"; sha256="13b41hs2s3syb8xbxjdpfk8gh40jv3gxd4dnfwz0mixfppwd5kd0"; depends=[cluster matrixStats nnet seriation stringdist TraMineR WeightedCluster]; }; + MEDseq = derive2 { name="MEDseq"; version="1.1.0"; sha256="1i6y9vv8f9m5nigqz4i9phcnfq30ihd5g2cfhxq1ky9l0f9bnx9f"; depends=[cluster matrixStats nnet seriation stringdist TraMineR WeightedCluster]; }; MEGENA = derive2 { name="MEGENA"; version="1.3.7"; sha256="0cr10pmj1n831scz5kgaq3nkglr3imwgc62cxng2dvdxr9991g21"; depends=[BH cluster doParallel foreach fpc ggplot2 ggraph ggrepel igraph Matrix Rcpp reshape]; }; MEMSS = derive2 { name="MEMSS"; version="0.9-3"; sha256="0fq85jrajfwavq2fvsw2x9hknc57wc253zw2vw970f04khfbragd"; depends=[lme4]; }; MEPDF = derive2 { name="MEPDF"; version="3.0"; sha256="15hbp7g5dsdpvi239jm6jn11fn371ir6la31g0flqkilq6sr1sqd"; depends=[gtools mvtnorm plyr pracma]; }; @@ -2330,30 +2355,33 @@ in with self; { MEclustnet = derive2 { name="MEclustnet"; version="1.2.2"; sha256="0rs58dafxngk2lkq14cy14ayjwgnz1gmi12jmi4z74sdj0b3h0gw"; depends=[e1071 ellipse latentnet MASS mvtnorm nnet vegan]; }; MEtest = derive2 { name="MEtest"; version="1.1"; sha256="0dxm3fs0lqnas70a1ckikvjp2ib9rqsknwcs9n9jfsmm1fqhxdpf"; depends=[statmod]; }; MF = derive2 { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; }; - MFAg = derive2 { name="MFAg"; version="1.5"; sha256="0av47syfb0jkiix0xjnd208bz78gx5ji2y9kb7ni1yd7njm7in9m"; depends=[]; }; + MFAg = derive2 { name="MFAg"; version="1.6"; sha256="0iy1lmky7nagkm03inn6gv7qzz1jyi7fsgzp9iff0xv6d54kwcls"; depends=[]; }; MFDFA = derive2 { name="MFDFA"; version="1.1"; sha256="0nr78p6y4jpg1hrl0h7b7hyvwbr61paf85y3f2dx815x5hscmdhy"; depends=[numbers]; }; MFHD = derive2 { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[deldir depth depthTools fda_usc matrixStats]; }; MFKnockoffs = derive2 { name="MFKnockoffs"; version="0.9.1"; sha256="1bcdqfzmllp3dri1phy365wgc9c37wlag65pzljn4p3mf43w10nq"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; }; MFPCA = derive2 { name="MFPCA"; version="1.3-4"; sha256="18wbas1g848865di96a19kmv0fsnds7cfv81nwhz6l6q8qmlnkf6"; depends=[abind foreach funData irlba Matrix mgcv plyr]; }; MFT = derive2 { name="MFT"; version="2.0"; sha256="0n1xws3dw0650037qyqgp600p8cf098qa5hkbncdfdbl0w34qamy"; depends=[]; }; - MGBT = derive2 { name="MGBT"; version="1.0.2"; sha256="0jgdy8zw5lx2f567n3livgmwhpfcd1s42mp1bj859jx3z5kiwkiy"; depends=[]; }; - MGDrivE = derive2 { name="MGDrivE"; version="1.1.0"; sha256="16nm47vazd06hvi4k3z86lxilgk8y4b3p44h6cm2b8az90irmj5f"; depends=[data_table R6 Rcpp Rdpack]; }; + MGBT = derive2 { name="MGBT"; version="1.0.4"; sha256="1x2yqfb5diqkq82j81slh9kxzxgyy67axyqlqjpv237yf8p0djc0"; depends=[]; }; + MGDrivE = derive2 { name="MGDrivE"; version="1.5.0"; sha256="1dgmmc34m2pj1l2gkwg85sj4rbhhwyrp8cj4m9b9hlz134n3qgwy"; depends=[R6 Rcpp Rdpack]; }; MGL = derive2 { name="MGL"; version="1.1"; sha256="03q453swnangxyc4nvjhzw2zpcy5vp1wpilap5rwymnf0c0xi4j7"; depends=[]; }; MGLM = derive2 { name="MGLM"; version="0.2.0"; sha256="0yyqm53lvp59zy8lkffw9x3zhqrnh29j5v3yyzk6qrgj2slnc7nk"; depends=[]; }; - MGMS2 = derive2 { name="MGMS2"; version="1.0.1"; sha256="0pai8cf4czsscsw35plrqldmqryzn6zji41n4a3x73cr00msfxrb"; depends=[MALDIquant MALDIquantForeign]; }; + MGMS2 = derive2 { name="MGMS2"; version="1.0.2"; sha256="04f1ng4s163x7gvy1iaf0j8pzs0pm2r2saji0srbp2jyhrj68d7z"; depends=[MALDIquant MALDIquantForeign]; }; MGRASTer = derive2 { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; }; MGSDA = derive2 { name="MGSDA"; version="1.4"; sha256="0grwl740yvz2av5nkvmyyrr8ji5f39sjs1c5gxp6lp9p36i2wc32"; depends=[MASS]; }; MHCtools = derive2 { name="MHCtools"; version="1.2.1"; sha256="1mf70x1vd8h8i0iapl54fp8q4gpqd61faxvhpxlhv49g8s5n9pbd"; depends=[rlist]; }; + MHMM = derive2 { name="MHMM"; version="1.0.0"; sha256="0d3djaydw0h7x3vlaghrbgmx024rgv36wfsjhlixzzssb2d6lqzi"; depends=[BH ggplot2 gridExtra Rcpp RcppArmadillo reshape2]; }; MHTcop = derive2 { name="MHTcop"; version="0.1.1"; sha256="1mr8y8brsi37b5qx3fqm0bj90dgknzzwhxfmvyd9kxbxh19whgxq"; depends=[copula matrixStats MCMCpack mvtnorm stabledist]; }; MHTdiscrete = derive2 { name="MHTdiscrete"; version="1.0.1"; sha256="0czpsk4jiwbzd6g2dwssmggsdhwchikmc1skv48d9j4xvglns7yw"; depends=[]; }; MHTmult = derive2 { name="MHTmult"; version="0.1.0"; sha256="1y3vh2kab6nfkiz4nzdhrpy9h6drk1ibfd2h62hpr3y09z9a2yld"; depends=[]; }; MHTrajectoryR = derive2 { name="MHTrajectoryR"; version="1.0.1"; sha256="13idcjx7pjpwvr4c52938yqhhaj1gprb8hjhaim3jx4062wf9pla"; depends=[mgcv]; }; MHadaptive = derive2 { name="MHadaptive"; version="1.1-8"; sha256="1w3bm82v8ahxrf0vqn0pznv7dqn212drinkz8y5kr1flx423l9ws"; depends=[MASS]; }; - MIAmaxent = derive2 { name="MIAmaxent"; version="1.1.0"; sha256="1hdggbsy2bcb2vjrjvn2fjnc1lvig9sqrndjfy37l8z9ndqsi6dm"; depends=[dplyr e1071 raster]; }; + MIAmaxent = derive2 { name="MIAmaxent"; version="1.1.1"; sha256="0azp8w626fhlwrk2qj7lyz9mpxj1hl2l8l1f7pviigdqp35shwf1"; depends=[dplyr e1071 raster]; }; + MIDASwrappeR = derive2 { name="MIDASwrappeR"; version="0.5.1"; sha256="07108dg16i20fg6cvsnbflfz65smwk08vjmf1b193zyvhdikwhfm"; depends=[Rcpp]; }; MIDN = derive2 { name="MIDN"; version="1.0"; sha256="08i9zfmaywi5imp36ahjpirlkl55k01x543nz95i089w3sfrsz0g"; depends=[BiasedUrn]; }; MIICD = derive2 { name="MIICD"; version="2.4"; sha256="1xlvhyh3gg77cym10i8hrxm8r1jm4plvny2c4izic6w89snplyq6"; depends=[MASS mstate survival]; }; MIIVsem = derive2 { name="MIIVsem"; version="0.5.4"; sha256="1fb4xnbp6c3c2dx3jhyqw463ghj4ak8jld148dyrmi9031mqv4fy"; depends=[boot car lavaan Matrix numDeriv]; }; MILC = derive2 { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13gsbqvzb92da6ng3x4iiyb1g0w"; depends=[]; }; + MIMSunit = derive2 { name="MIMSunit"; version="0.8.2"; sha256="1fl7lg4f0dbk9sfrh85ay5pmyfyfmxlsrx5y7x0d86ar76nmk5al"; depends=[caTools dplyr dygraphs ggplot2 lubridate magrittr matlab plyr R_utils RColorBrewer readr signal stringr xts]; }; MIPHENO = derive2 { name="MIPHENO"; version="1.2"; sha256="0hcaq66biv4izszdhqkgxgz91mgkjk1yrwq27fx07a2zmzj44sfv"; depends=[doBy gdata]; }; MIXFIM = derive2 { name="MIXFIM"; version="1.1"; sha256="1xx25b7hfyzynfh3vsqrkriqnqnn173gn8j1vwqmc434c1vy4nx2"; depends=[ggplot2 mvtnorm rstan]; }; MImix = derive2 { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; }; @@ -2362,6 +2390,8 @@ in with self; { MKdescr = derive2 { name="MKdescr"; version="0.5"; sha256="0dgdglr173pjlvbh9kd67pl890pnlzlcfm04ax4bdas6gp1cb6j6"; depends=[ggplot2 scales]; }; MKinfer = derive2 { name="MKinfer"; version="0.4"; sha256="1rs0vjq9d5hhrlw98vxnss4ph8hyqws4wx4wlikfqpp42v96yxl4"; depends=[arrangements boot ggplot2 MKdescr nlme]; }; MKmisc = derive2 { name="MKmisc"; version="1.6"; sha256="0x518icdgq4mrc6qm1flb5lpr9y7j9znh0ah3gw2xsbjiplqd323"; depends=[ggplot2 limma RColorBrewer robustbase scales]; }; + MKomics = derive2 { name="MKomics"; version="0.5"; sha256="0mr0y1ai3jf3jj4dqvs6xv3clgli7d7lzqk8ya6zah388rqmkg9s"; depends=[limma RColorBrewer robustbase]; }; + MKpower = derive2 { name="MKpower"; version="0.4"; sha256="1s9njvdjpqn4i4dxarb9agcdmx9dx1g4icg7mfp8bd6rnslsscn5"; depends=[coin ggplot2 matrixTests MKdescr MKinfer qqplotr]; }; ML_MSBD = derive2 { name="ML.MSBD"; version="1.2.0"; sha256="1dxvvyha984j3h170s2brhbf4lm53f16f12lhnqf3sl4sc0f4xv8"; depends=[ape foreach]; }; MLCIRTwithin = derive2 { name="MLCIRTwithin"; version="2.1.1"; sha256="1x0xmka7kkbjnh3yv4zxxyl17cpmf0rb9hxmdl1srb6ijld4np1b"; depends=[limSolve MASS MultiLCIRT]; }; MLCM = derive2 { name="MLCM"; version="0.4.2"; sha256="14sd9ybwyilympnbyaqmwdrbip4vyn1p93rh9mlxls3bmk6nc4hv"; depends=[]; }; @@ -2372,36 +2402,36 @@ in with self; { MLID = derive2 { name="MLID"; version="1.0.1"; sha256="0ygahmcfbydzic5q3h1ppv5b2ks4lh8mcyfqq27ssmn4g1n6hdvp"; depends=[lme4 nlme]; }; MLML2R = derive2 { name="MLML2R"; version="0.3.3"; sha256="1jgk0h3chab831g5nsppgc6p0xplv11j82491iymnxixqfswb08w"; depends=[]; }; MLMOI = derive2 { name="MLMOI"; version="0.1.1"; sha256="0fliax6ajacm2i416xi26qlwg3y7iw8y6hykkz0mcwp7djyn3n6s"; depends=[Rdpack rJava Rmpfr XLConnect]; }; + MLModelSelection = derive2 { name="MLModelSelection"; version="1.0"; sha256="1qfy2rfx2nvkwisl9wwllqsq2qhqzsdmrh90z5zn5qs07d0305wn"; depends=[MASS Rcpp RcppArmadillo RcppDist]; }; MLPUGS = derive2 { name="MLPUGS"; version="0.2.0"; sha256="1yda37073g640g1qrkjrwa8hbyq6bjlcw3wpznx0bk5h0639bc0s"; depends=[]; }; MLRShiny = derive2 { name="MLRShiny"; version="0.1.0"; sha256="06zcyz8l4754sjbcql3jd3nq1d2lgj92p5h2bh708z52mww71isw"; depends=[corrgram dplyr forecast psych QuantPsyc shiny shinyAce]; }; MLRShiny2 = derive2 { name="MLRShiny2"; version="0.1.0"; sha256="1ygamp0ldz1i0w2xyi205rpd1gd5asw61l36z06j41ghdyiz1lww"; depends=[corrgram dplyr forecast psych QuantPsyc shiny shinyAce]; }; MLZ = derive2 { name="MLZ"; version="0.1.3"; sha256="0yj9241k3yk8qy6w2q26gwbj9b9qynv3s3jpyfxixvkc9kji3wc2"; depends=[dplyr ggplot2 gplots RcppEigen reshape2 TMB]; }; - MLeval = derive2 { name="MLeval"; version="0.2"; sha256="1dv795x8v78b6kpwdzmy0zlyrhwpf7gdwiss51d2kpp4h74ylsgr"; depends=[ggplot2]; }; + MLeval = derive2 { name="MLeval"; version="0.3"; sha256="1g2w5lrr7199n4zyaalbp9xdgl858hdg1pqr3rpd7v5fmamawc69"; depends=[ggplot2]; }; MLmetrics = derive2 { name="MLmetrics"; version="1.1.1"; sha256="061129b36h7xqw4zsznik694n8yy9qq6aaqfhdxkhdv8n5v1nzvp"; depends=[ROCR]; }; MM = derive2 { name="MM"; version="1.6-5"; sha256="0vi6wp6p48jjfmnspdsnmw0yqz39sjk6nrkxdw7kan5h17h4rwd7"; depends=[abind emulator magic Oarray partitions]; }; MM2S = derive2 { name="MM2S"; version="1.0.6"; sha256="1knr15vjc81cp7j67nc2gwkgds6ar3ribi1h0ihg0ch6rfz5c5zs"; depends=[GSVA kknn lattice pheatmap]; }; MM2Sdata = derive2 { name="MM2Sdata"; version="1.0.3"; sha256="0hlm6jp8jq38vkszwdgpf30w11l1fhpblg26zv05j50a6whpmhqd"; depends=[Biobase]; }; - MM4LMM = derive2 { name="MM4LMM"; version="2.0.1"; sha256="1rmzzfzw1hpsmvgc9pcqqf9k8p4fvdh6pizy4sjvavphqvzjfnj6"; depends=[MASS Matrix Rcpp RcppEigen]; }; + MM4LMM = derive2 { name="MM4LMM"; version="2.0.2"; sha256="0zcaqxz1yxv2lkp39ly4jkl9wk94k7md5ks5wjk9l1qk7k5q7yx9"; depends=[MASS Matrix Rcpp RcppEigen]; }; MMAC = derive2 { name="MMAC"; version="0.1.2"; sha256="1xwz48iizf0lvmhc7krsraabc49ky85qvgr23w4ip6jzfv4sn1jr"; depends=[]; }; MMDai = derive2 { name="MMDai"; version="1.4.0"; sha256="0bb7hg8fkmzg87xr1b2hxhy75xi461ks6w12z85k4c77kswfpx3b"; depends=[DirichletReg]; }; MMDvariance = derive2 { name="MMDvariance"; version="0.0.9"; sha256="1yiqabifym7gdknqrhfnql6qc8p163npzrrckbyqjry3yvkqr5wi"; depends=[Biobase lawstat MASS]; }; MMLR = derive2 { name="MMLR"; version="0.2.0"; sha256="1jc33ani6w54j38kxzk0kfj1hjfk80cil2hdja2hcsk6kqwd431d"; depends=[pracma]; }; MMMS = derive2 { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[glmnet survival]; }; MMVBVS = derive2 { name="MMVBVS"; version="0.8.0"; sha256="08nkhrf62yywpm0nw22pqzlcm72sf4zq44640a7pf57bbzm38ccy"; depends=[ggplot2 Rcpp RcppArmadillo reshape reshape2 rlang]; }; - MMWRweek = derive2 { name="MMWRweek"; version="0.1.1"; sha256="16dwmpj13rzxmd2x7xaakw2zq2aly7ajjbfnc39qvdzk6n2x37wn"; depends=[]; }; + MMWRweek = derive2 { name="MMWRweek"; version="0.1.3"; sha256="1l1ks44v52iggw9nhs56lfj6804yab5b17k8fzrc6h1kvj3vda0s"; depends=[]; }; MMeM = derive2 { name="MMeM"; version="0.1.0"; sha256="1b0wdcyqnliw85il5vnwy9l4x1z42kirbg872hl47plwfrp9gahc"; depends=[jointDiag lme4 MASS Matrix matrixcalc psych stringr]; }; MNLR = derive2 { name="MNLR"; version="0.1.0"; sha256="0q80232ndp7pkklzqdbga1vf51dmsxaivm4ia4wah32rc2c87fqp"; depends=[caret e1071 nnet rmarkdown shiny]; }; - MNLpred = derive2 { name="MNLpred"; version="0.0.1"; sha256="1h8qnirhvlskhm7zg7h8jbx76r53gywpswxyj4w7gb04qhdkzmhl"; depends=[MASS tibble]; }; + MNLpred = derive2 { name="MNLpred"; version="0.0.2"; sha256="0b3pgy9hqxwzvw61arvz9zlhx1j4fy9qmzwwzxf67b4ybmkzzsgl"; depends=[MASS]; }; MNM = derive2 { name="MNM"; version="1.0-3"; sha256="16b2yrm2kn943vzrr38qhk6qq20a842xv7iiln4is02csijxw2b3"; depends=[ellipse ICS ICSNP SpatialNP]; }; MNP = derive2 { name="MNP"; version="3.1-0"; sha256="06qs2vsmjs6rcpqlwfc1n5y5hzxf7pngbdmiza1wijm9hh54ikh0"; depends=[MASS]; }; MNS = derive2 { name="MNS"; version="1.0"; sha256="0if46a6rw0f2d72wnykkaa5z5b1p2c0r43il6cbwbcnnb3zd8acb"; depends=[doParallel glmnet igraph MASS mvtnorm]; }; - MOCCA = derive2 { name="MOCCA"; version="1.3"; sha256="1ffpnqcrkrr7vh0f1fyyai0c2wq3v8sk2qhnhds49z7p6xrsmh21"; depends=[cclust class cluster clv]; }; - MODIS = derive2 { name="MODIS"; version="1.1.6"; sha256="0nby3j356hglf2hdddqyq8vm99ynwk4wjmqrbjl5k9pr9yjkhda8"; depends=[bitops curl devtools mapdata mapedit maps maptools ptw raster rgdal rgeos sf sp]; }; + MOCCA = derive2 { name="MOCCA"; version="1.4"; sha256="0g70s7hnmrp4sm8gx49vsijj54y4amlcy6axc4k37k4c9g4sdics"; depends=[cclust class clue cluster]; }; + MODIS = derive2 { name="MODIS"; version="1.1.7"; sha256="0k82xs5nladx3jkiar77kag9a36w9fdf6fga924sfsk1i4rrsigb"; depends=[bitops curl devtools mapdata mapedit maps maptools ptw raster rgdal rgeos sf sp]; }; MODISSnow = derive2 { name="MODISSnow"; version="0.1.0.0"; sha256="1p0mil074gapw6v8paw9595rzp85hxrfsc65llh0ljalmacwgx04"; depends=[gdalUtils lubridate raster RCurl]; }; - MODISTools = derive2 { name="MODISTools"; version="1.1.0"; sha256="0242jxxdkwi39ra160p42psgcgf8alwaij004v29apy03g95rrvd"; depends=[httr jsonlite memoise sf]; }; + MODISTools = derive2 { name="MODISTools"; version="1.1.1"; sha256="0188cffsnpy7nmb0c03i64674xyizx6imkymrwsj3mf9s77wa2v0"; depends=[httr jsonlite memoise raster sf]; }; MODIStsp = derive2 { name="MODIStsp"; version="1.3.9"; sha256="0zjc8q3zi2i0i7l1bmw558sxdcsjba2lh31i428cy9pd886j5jn3"; depends=[bitops data_table gdalUtils gWidgets gWidgetsRGtk2 httr jsonlite pacman raster rgdal rgeos sp stringr xml2 xts]; }; - MOEADr = derive2 { name="MOEADr"; version="1.1.0"; sha256="0q0bm13v85raq5hdfpzg4v5kj12zjh31fr1x0zv9g5blxy10dqgy"; depends=[assertthat FNN]; }; - MOJOV = derive2 { name="MOJOV"; version="1.0.1"; sha256="11mcqxw83z4xx29s34v4rsbb3zvyhlb2lmvf97b77n455gsy5hab"; depends=[aod lattice saws survey]; }; + MOEADr = derive2 { name="MOEADr"; version="1.1.1"; sha256="0aqkqw5ph5rvsgpasc94i264lxapr37gpjhk4rkkynph2gnvq1zx"; depends=[assertthat FNN]; }; MOLHD = derive2 { name="MOLHD"; version="0.2"; sha256="1lrl24x7iig15jwxigvqm3jdwnxkn948sxmywn6zi2b1a5hqz05k"; depends=[arrangements fields]; }; MOQA = derive2 { name="MOQA"; version="2.0.0"; sha256="17w4iwf38k0r2fiwqr420hkbbz1a3r89sqwnd2yn300zmaz64hpr"; depends=[gplots psych readr]; }; MOST = derive2 { name="MOST"; version="0.1.0"; sha256="0nmjx5hsn67hdglcqyanq3az76rs15knv8qy28f8paah5s9w24xf"; depends=[]; }; @@ -2417,10 +2447,11 @@ in with self; { MPS = derive2 { name="MPS"; version="2.3.1"; sha256="08yzynznf33y7y3pf7fayks5hi3cdvzwzn8axg7aky5kvi2bfv22"; depends=[]; }; MPSEM = derive2 { name="MPSEM"; version="0.3-6"; sha256="0kw3aixhl5j8nq4lcx65l80v4lihvpa4qd12n2jrc96lnm6mw00b"; depends=[ape MASS]; }; MPTinR = derive2 { name="MPTinR"; version="1.12.0"; sha256="0iv7hy0lmxadw34cq4gsb5i2my8lbvdfp23qadhiw6ca179hgamy"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; }; - MPTmultiverse = derive2 { name="MPTmultiverse"; version="0.3-3"; sha256="0wl5ww7ii8vbgg3680zh3y5pqz1ipfnhjka1lz62fmp3rs09zmfq"; depends=[coda dplyr ggplot2 limSolve magrittr MPTinR purrr readr reshape2 rlang runjags tibble tidyr TreeBUGS]; }; + MPTmultiverse = derive2 { name="MPTmultiverse"; version="0.4-0"; sha256="0n46sbbnkg2czqmvz3csqkgrr4gpdjqj6488wb6inlaww55kzc99"; depends=[coda dplyr ggplot2 limSolve magrittr MPTinR purrr readr reshape2 rlang runjags tibble tidyr TreeBUGS]; }; MPV = derive2 { name="MPV"; version="1.55"; sha256="127m19q5dq38x2k29rkgvvfidazbmzsarzf9m2sjpx6ay8j8hvpl"; depends=[KernSmooth]; }; MPkn = derive2 { name="MPkn"; version="0.1.0"; sha256="0nvd6sv1wypcmphm0wcymbibcxrqzx3c9s9b191p1pmxyz607vxv"; depends=[]; }; MPsychoR = derive2 { name="MPsychoR"; version="0.10-7"; sha256="10nphm5dzxha4xb7a21b0nxbqy55fg8k748qax7nq3rj4nfjaml7"; depends=[]; }; + MQMF = derive2 { name="MQMF"; version="0.1.0"; sha256="0pg120003zgnxw51agmfjzj8snkb19r1d4hyssxxl5y0ykxk1hn0"; depends=[MASS mvtnorm]; }; MRCE = derive2 { name="MRCE"; version="2.1"; sha256="12q7mqn2qkgv992df71k1xmli61khhbfm7lw0n7z2l7qqldpiw1n"; depends=[QUIC]; }; MRCV = derive2 { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; }; MRFA = derive2 { name="MRFA"; version="0.4"; sha256="1ivzyp3q2nb6h5mhykina75ak7ajfw62rh23yr4pljma7gmr1hhm"; depends=[fields foreach glmnet grplasso plyr randtoolbox]; }; @@ -2436,50 +2467,54 @@ in with self; { MRwarping = derive2 { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; }; MSCMT = derive2 { name="MSCMT"; version="1.3.4"; sha256="1vh0i9nxqiy3qdnb7z7cn5kpp2jahdmaqpnv7q5650pkswhwmfpc"; depends=[ggplot2 lpSolve lpSolveAPI Rdpack Rglpk]; }; MSCquartets = derive2 { name="MSCquartets"; version="1.0.5"; sha256="0gfbawv7ib31pxmcj8ki67a72jqacm8nlizgk95yg7afjlqiyz8v"; depends=[ape phangorn RandomFieldsUtils Rdpack zipfR]; }; - MSEtool = derive2 { name="MSEtool"; version="1.4.3"; sha256="1r4bnw49hhriwrgg1pkg6gkq789c63bhsp71srrf5fv7jna8z0zk"; depends=[abind coda corpcor DLMtool dplyr gplots MASS mvtnorm RcppEigen reshape2 rmarkdown snowfall TMB]; }; + MSEtool = derive2 { name="MSEtool"; version="1.5.0"; sha256="10kczcv468c9s1blh37bj2cyy8zhszlwg7azvw64w2xmqnc782g4"; depends=[abind coda corpcor DLMtool dplyr gplots MASS mvtnorm RcppEigen reshape2 rmarkdown snowfall TMB]; }; MSG = derive2 { name="MSG"; version="0.4"; sha256="0fdxgqfc87iwqnnrgh7m8bfxh8lv42ffi0xxy4i1rv94aiw8gfr5"; depends=[RColorBrewer]; }; - MSGARCH = derive2 { name="MSGARCH"; version="2.31"; sha256="15df35l5nr6cl3q7xprl6ifswh7mg1fvix1x9374qgyafwr40sq4"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; }; + MSGARCH = derive2 { name="MSGARCH"; version="2.42"; sha256="1n5fvj6yx8sfi1vizw89410hc0d37w8mpqfsksdv01pgnfdcs11a"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; }; MSGLasso = derive2 { name="MSGLasso"; version="2.1"; sha256="1k17vnvzr647pwfbdxrpqcsp34iygq86wf0ns4rq8cj6q5mik1bv"; depends=[]; }; MSIseq = derive2 { name="MSIseq"; version="1.0.0"; sha256="1v2why1k6pjsc04044nr74571p7541nciq7xkzmya3jq6dw878j3"; depends=[IRanges R_utils rJava RWeka]; }; MSMwRA = derive2 { name="MSMwRA"; version="1.3"; sha256="0b0fqfv6iick1brqik4rqz2936nfa51i6xlfavs65r9692wks73q"; depends=[]; }; MSPRT = derive2 { name="MSPRT"; version="2.1"; sha256="0c0hhpjpkx8yl5bxqn6nw747jli9fdzkwmi31lzr664r5xinxyf7"; depends=[doParallel foreach ggplot2 iterators nleqslv]; }; MSQC = derive2 { name="MSQC"; version="1.0.2"; sha256="11wcy04cpjlnc71s2svs4lm1cp718dz1p4a1603x6zwpbf22bygn"; depends=[rgl]; }; - MST = derive2 { name="MST"; version="2.1"; sha256="16mnsn2an02k4jrqb6yj0n1i563zny5v10ngfq1y28fqaw6h8yyq"; depends=[Formula MASS partykit survival]; }; + MST = derive2 { name="MST"; version="2.2"; sha256="0p833nyq9p0r0hy02f4sy6gv1wm9flj3dxkv73ihy8503r89bbzz"; depends=[Formula MASS partykit survival]; }; MSbox = derive2 { name="MSbox"; version="1.2.1"; sha256="0lmvpzsw13w18mzi5z85yzify3xsh5sx356ndggfzyl5d5wk7s8g"; depends=[stringr xml2]; }; MScombine = derive2 { name="MScombine"; version="1.4"; sha256="0s3gbf3s5mf00d5mkbqhd9wwnyps7qb4r3zbal8j8nsaspql9nd3"; depends=[plyr]; }; MSwM = derive2 { name="MSwM"; version="1.4"; sha256="1zhfar02s7hm4gjs1flkh9a4526d98hik8bqrksy75758baiqg7l"; depends=[nlme]; }; MTA = derive2 { name="MTA"; version="0.2.0"; sha256="1wic2rw63h2daha23fpyw80x7ywjwqq6rj5jg73iankvdg32mlvm"; depends=[cartography igraph sf sp]; }; + MTAR = derive2 { name="MTAR"; version="0.1.1"; sha256="17r2da1hdvs8qvgar87zdl51jy8w30vczcsi6jrq0rdyi1lld641"; depends=[CompQuadForm MASS Matrix]; }; MTDrh = derive2 { name="MTDrh"; version="0.1.0"; sha256="0ass3b90nr4i0y7v30hk8xhq3hj9bxaxcsr4f8wfi0lnvzfv6aaa"; depends=[]; }; MTE = derive2 { name="MTE"; version="1.0.0"; sha256="009mrl9dgxafl4hrgfzvsfvgx3dljb0rbbs74j2cxc5ray87kp55"; depends=[parcor quantreg]; }; MTGS = derive2 { name="MTGS"; version="0.1.0"; sha256="0ijcw730xap5c38k8z4d976azwcnygxaiv2ksrad8j8nnvnh5zbd"; depends=[glmnet kernlab MRCE]; }; MTLR = derive2 { name="MTLR"; version="0.2.1"; sha256="070121qn7vmxmxgvzv7ymhk19j9kxks4xa7qpd8vkc2rp3ara4cp"; depends=[Rcpp RcppArmadillo survival]; }; + MTPS = derive2 { name="MTPS"; version="0.1.9"; sha256="125ja7wz8fz1w7hfxks7qs524vwk86rp459ahxw9cjnn1qxyv38k"; depends=[class e1071 glmnet MASS rpart]; }; MTS = derive2 { name="MTS"; version="1.0"; sha256="09pypanjmqrvxbrrckydxyyswsgjx4nhb052x4llk7va9w4lbcjs"; depends=[fBasics fGarch mvtnorm Rcpp]; }; MTSYS = derive2 { name="MTSYS"; version="1.2.0"; sha256="04dkan3hxl3difflskp7d1lw1bvxhg4s28ssy2v4m7z7wbpj3v1m"; depends=[]; }; MUACz = derive2 { name="MUACz"; version="1.0.0"; sha256="0sh5h2qn769bpp8l09mvh1cabr2j1vywaqbj6fci84h8zx5y55fj"; depends=[dplyr epiDisplay ggplot2]; }; - MUCflights = derive2 { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[geosphere NightDay RSQLite sp XML]; }; MUS = derive2 { name="MUS"; version="0.1.6"; sha256="0xid624rz0mvd03iy7ydvmx7gkscvsg4kdbaf2nji54ahai3pmn3"; depends=[]; }; MVA = derive2 { name="MVA"; version="1.0-6"; sha256="09j9frr6jshs6mapqk28bd5jkxnr1ghmmbv6f4zz0lrg81zjizl3"; depends=[HSAUR2]; }; MVB = derive2 { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; }; MVLM = derive2 { name="MVLM"; version="0.1.4"; sha256="1zcj405dc4jbiqw6p0fcbam8yc9d6yjpmrx5wjw5zjvig3iqb91k"; depends=[CompQuadForm]; }; MVN = derive2 { name="MVN"; version="5.8"; sha256="1rk8zrf3bavywv4bca1aqsfrirxkvxh5lfwrnj0g8zncd69bd1fc"; depends=[boot car energy kableExtra magrittr MASS moments mvoutlier nortest plyr psych robustbase]; }; MVNBayesian = derive2 { name="MVNBayesian"; version="0.0.8-11"; sha256="1iaxyp480v91887cn4w3l74907wvbzs3ay4cjgzd8xk2dp47w8bg"; depends=[mvtnorm plyr]; }; + MVNtestchar = derive2 { name="MVNtestchar"; version="1.0.2"; sha256="08zvyx829bd2rxbz2i4fwr4hd34y93zgqsklp42zk2mrvfwbivbg"; depends=[ggplot2 Hmisc]; }; + MVQuickGraphs = derive2 { name="MVQuickGraphs"; version="0.1.2"; sha256="1937w8y866bsn9kn6a98c91akhm9ddc5dr9wqm51lkbjyz1zm0j1"; depends=[plotrix]; }; MVR = derive2 { name="MVR"; version="1.33.0"; sha256="1ygz47a2p5r5axql5zsxvsn25pcqyxz6mpw50zfmzrcqdrfa3bg8"; depends=[statmod]; }; MVT = derive2 { name="MVT"; version="0.3"; sha256="0vinlv3d5daf8q7pd9xgs51nxz2njgdba5750vygmv883srlzi9d"; depends=[]; }; - MVar = derive2 { name="MVar"; version="2.1.1"; sha256="17fj2y739afmdrbhnd2la9qiywcyyk0nr1d8936c63nz8xivvssv"; depends=[MASS]; }; - MVar_pt = derive2 { name="MVar.pt"; version="2.1.1"; sha256="0jzsiawisr0378n9ph7s2c2j64xybf9mz00zriw38cjr1lxaqrnf"; depends=[MASS]; }; + MVar = derive2 { name="MVar"; version="2.1.2"; sha256="0j8b3q6nanymkdpilwbk9a1a9fvlawxjj91skpmxrx16kb7j2i3w"; depends=[MASS]; }; + MVar_pt = derive2 { name="MVar.pt"; version="2.1.2"; sha256="00kfaz7xfy3if3v2waji6h1xcjsa9pn4b5jn81q38a3yin78wsw6"; depends=[MASS]; }; MVisAGe = derive2 { name="MVisAGe"; version="0.2.1"; sha256="1plrzzj7cr2hxk1npadvjnk7sanhilh99l5vrkjjh3l6li2ym09b"; depends=[]; }; MWLasso = derive2 { name="MWLasso"; version="1.3.1"; sha256="11lyk46lmjcd60q0mixi41b8ybjgyp1xi18g3ag4450xyhw3r17s"; depends=[]; }; MWRidge = derive2 { name="MWRidge"; version="1.0.0"; sha256="17kvs9npr1ff24z3pv9x2qnfwyy6w3hc7hm60ynzbjlk2rr11xr9"; depends=[glmnet]; }; MWright = derive2 { name="MWright"; version="0.3.2"; sha256="1c57f0wnlhl4gqy17vi93r4fknycvv67b9bifgcvabws390jpx7q"; depends=[cubature]; }; - MXM = derive2 { name="MXM"; version="1.4.5"; sha256="003068bq8lmc29pc6ac9yaskjiqalvhngacac4fnl705l58zhcyg"; depends=[bigmemory coxme doParallel dplyr energy foreach geepack Hmisc knitr lme4 MASS nnet ordinal quantreg relations Rfast Rfast2 survival visNetwork]; }; + MXM = derive2 { name="MXM"; version="1.4.6"; sha256="0dxrilf7frxw3ibwssb8ndi4p1xkbxh3wmrn3dpxjsvv46bvsqki"; depends=[bigmemory coxme doParallel dplyr energy foreach geepack Hmisc knitr lme4 MASS nnet ordinal quantreg relations Rfast Rfast2 survival visNetwork]; }; MaOEA = derive2 { name="MaOEA"; version="0.5.2"; sha256="1yaa8wr1gr1npqpls5g6mlr9dgjwiyvhk6p1dmjw29f7a4g2cam5"; depends=[e1071 gtools lhs MASS nnet nsga2R randtoolbox reticulate stringr]; }; MaXact = derive2 { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; }; - MachineLearning = derive2 { name="MachineLearning"; version="0.1.3"; sha256="0yvrsqzvx8ss614ixa9mwkg2ig3hmfixm78fi8c3wmpc2frvsqrk"; depends=[arules crayon dplyr formula_tools FSelectorRcpp ggplot2 magrittr NbClust rpart rpart_plot]; }; - MachineShop = derive2 { name="MachineShop"; version="2.0.0"; sha256="0whn6xp5339vbsjfs40lq1kz1pizzaaryfg8bgcscqfr4rlxs3av"; depends=[abind dials foreach ggplot2 kernlab magrittr party polspline recipes rlang rsample Rsolnp survival tibble]; }; + MachineLearning = derive2 { name="MachineLearning"; version="0.1.4"; sha256="0wrngi2gi2fp7f3dhjk6c4318z1wi7l9dj7j7fnlydp5dv86ls8n"; depends=[arules crayon dplyr formula_tools FSelectorRcpp ggplot2 magrittr NbClust rpart rpart_plot]; }; + MachineShop = derive2 { name="MachineShop"; version="2.2.0"; sha256="04357qgd95c9xjr0xm8791rf650rzkls5brz0gg8z3j1yywfc3x1"; depends=[abind dials foreach ggplot2 kernlab magrittr Matrix nnet party polspline recipes rlang rsample Rsolnp survival tibble]; }; Maeswrap = derive2 { name="Maeswrap"; version="1.7"; sha256="0cnnr5zq7ax1j7dx7ira7iccqppc6qpdjghjarvdb2zj0lf69yyb"; depends=[geometry lattice rgl stringr]; }; + MajKMeans = derive2 { name="MajKMeans"; version="0.1.0"; sha256="1zphrxyx3jd6rnh1y1qnc6bip34kfqk1a5ms4ps39gfngznh482m"; depends=[MASS]; }; MakefileR = derive2 { name="MakefileR"; version="1.0"; sha256="1pfjic2lsar8ghbb6byr4rqrs30qrgfih092z4rxdpsiwkk3y7l1"; depends=[magrittr]; }; Mangrove = derive2 { name="Mangrove"; version="1.21"; sha256="1qf3fjzf0sb6fqbfdbxwbw6wah3gg2qran4mgg13hcmk4n3j0hxp"; depends=[]; }; - ManifoldOptim = derive2 { name="ManifoldOptim"; version="0.1.4"; sha256="0c5hw01nlnxrys8d9qhwvnls834i0081pf9iic9kx5k6ckc7iwha"; depends=[Rcpp RcppArmadillo]; }; + ManifoldOptim = derive2 { name="ManifoldOptim"; version="1.0.0"; sha256="1lds4cs4v3gpibz74cz319x2zkc6nipiqw1ywcrmv125aixxzglp"; depends=[Rcpp RcppArmadillo]; }; ManlyMix = derive2 { name="ManlyMix"; version="0.1.14"; sha256="0zpcc74965n435d4fah41r9nz0kjyn46hkjl1s0kvlllqj6n69wg"; depends=[]; }; ManyTests = derive2 { name="ManyTests"; version="1.2"; sha256="1mi7wvnkcd95126f1h8vl8skn397yd2zqvcswprqar54p161wgyi"; depends=[]; }; Map2NCBI = derive2 { name="Map2NCBI"; version="1.4"; sha256="1ssqnm9g5p0nnhdyp9dqbbsz3hw8jzdwy0rv3csp8fxm0f1bi1kb"; depends=[rentrez]; }; @@ -2489,19 +2524,19 @@ in with self; { MargCond = derive2 { name="MargCond"; version="1.0.0"; sha256="07qh1lgy8ds11cwlb4rxkl6aiph91zq29sy27b8wwxalycdgjrg8"; depends=[gee lme4 MASS Matrix]; }; MarginalMediation = derive2 { name="MarginalMediation"; version="0.7.0"; sha256="0jwp8rzv0ghir8k7dfmfrq4rvcqf7xww6va16p3jj2nk3r9hiq0x"; depends=[betareg boot cli crayon furniture magrittr purrr rstudioapi stringr tibble]; }; MarketMatching = derive2 { name="MarketMatching"; version="1.1.2"; sha256="0i3wccclrl7lixny24jif0xvmf6lgmwsgqxc6h5c3mv405cp0h1r"; depends=[bsts CausalImpact data_table doParallel dplyr dtw foreach ggplot2 iterators reshape2 scales zoo]; }; + Markovchart = derive2 { name="Markovchart"; version="1.0.6"; sha256="1r1rxsrdil7jxmhfzk8s4rqqs3v97kfvynbh5qa62g14acafm615"; depends=[doParallel foreach ggplot2 metR optimParallel]; }; MarkowitzR = derive2 { name="MarkowitzR"; version="1.0.2"; sha256="0p234zs7lvi83fv02mijrhp7hmr5cklddayb61krhx1h2hn4gzb9"; depends=[gtools matrixcalc]; }; MaskJointDensity = derive2 { name="MaskJointDensity"; version="1.0"; sha256="0nxhsz57cw96in0sg5xg7sicv920kcnxr2rikn39y2qk4vrw6r78"; depends=[ks MASS np plyr]; }; Massign = derive2 { name="Massign"; version="1.1.0"; sha256="09i32lsrx40rxrnb9alfipfrkipy4mza5nr4gcpn2a5h86ak9290"; depends=[]; }; MatManlyMix = derive2 { name="MatManlyMix"; version="1.1.1"; sha256="1d2vd5b9lirdybjclxh0nn4mghq64qjj4l8vnj95cni5pfa18a2c"; depends=[]; }; MatSkew = derive2 { name="MatSkew"; version="0.1.5"; sha256="019v2b1r0bvw84xs50smjb3jdz7gd2adz5d84xd8zq43lnml96d1"; depends=[]; }; - MatTransMix = derive2 { name="MatTransMix"; version="0.1.6"; sha256="07npn31abksi17s8g1cgxnciyw2nm1mzfmbys3kfkgb8nqq0d6g2"; depends=[]; }; + MatTransMix = derive2 { name="MatTransMix"; version="0.1.8"; sha256="0090qfkal40kizr2j6jc9sksg5appp5pv3g8f9yp7jqcgb2hpggd"; depends=[]; }; MatchIt = derive2 { name="MatchIt"; version="3.0.2"; sha256="1pp91pw2sy9hik4sgn4gcsp40hb01n9pfccrwdcffwji5fd1aavq"; depends=[MASS Matching]; }; - MatchIt_mice = derive2 { name="MatchIt.mice"; version="3.0.1"; sha256="04c078fz7s0wll4wizi0mj4s3gdx1kpr5g40gq7znn362z7q25ym"; depends=[MatchIt mice]; }; - MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.0"; sha256="015s3xdaj56prq8lsdry3ibjkrb6gg0fwgzjh496gdx5axvpbk8g"; depends=[Hmisc Matching]; }; - MatchThem = derive2 { name="MatchThem"; version="0.9.1"; sha256="07sby3jyf3v7dmcm3pzjamsj5c6jfc65n1xdvakbd7nmlignb1m3"; depends=[broom dplyr MatchIt mice survey WeightIt]; }; - Matching = derive2 { name="Matching"; version="4.9-6"; sha256="1p36id8cds865b44jdbk6c3fnadvhh203qx6d3g54bi4s7bww3cf"; depends=[MASS]; }; + MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.3"; sha256="1si0zn6vlgyj08841hfjx8an96a8ipnawl4zbalabmpy7r5bfwx8"; depends=[Hmisc Matching]; }; + MatchThem = derive2 { name="MatchThem"; version="0.9.3"; sha256="05m141qn0a9ahraga1lpcjffbddmm70bx9m3javrr9727nnar9wf"; depends=[broom dplyr MatchIt mice survey WeightIt]; }; + Matching = derive2 { name="Matching"; version="4.9-7"; sha256="0vgw0nm40bicda2nwgklc27qsjxbqbjpl9yd28hqxj71xfsyqmhr"; depends=[MASS]; }; Matrix = derive2 { name="Matrix"; version="1.2-18"; sha256="06b1rc1vq65b271f2wpzhqkvhng8hwwnvjflzxkng50i52603zzp"; depends=[lattice]; }; - Matrix_utils = derive2 { name="Matrix.utils"; version="0.9.7"; sha256="1x64r4aj3gy1dzjjysyrk1j9jq3qsnyrqws8i6bs7q8pf6gvr7va"; depends=[grr Matrix]; }; + Matrix_utils = derive2 { name="Matrix.utils"; version="0.9.8"; sha256="0a5fq1scykqk0kc9j051j6fix6j2dqwz5wbgb0amaxsiywz9vigb"; depends=[grr Matrix]; }; MatrixCorrelation = derive2 { name="MatrixCorrelation"; version="0.9.2"; sha256="0s4gxgl6fsy0fnjmsdz4k7p96vl6p00xl9w2fg7v0gikjpz6h5bg"; depends=[plotrix pracma progress Rcpp RcppArmadillo RSpectra]; }; MatrixEQTL = derive2 { name="MatrixEQTL"; version="2.3"; sha256="10r6h5bidj44kfbwiml9pkysbikqphfb21ig61qnx0qa12xcl6l8"; depends=[]; }; MatrixLDA = derive2 { name="MatrixLDA"; version="0.2"; sha256="0fixq35gp0fzmin75sfld2ln0zvnjgzrhk3b5yi7wdqzp99200yy"; depends=[glasso plyr Rcpp RcppArmadillo]; }; @@ -2510,10 +2545,9 @@ in with self; { MaxPro = derive2 { name="MaxPro"; version="4.1-2"; sha256="19a2wp93kx1wkbzd5bvljbm1rr96gr14w4fb0ppbgr2y2a4g8i1v"; depends=[nloptr]; }; MaxSkew = derive2 { name="MaxSkew"; version="1.1"; sha256="0x5x0jpvhp189jnmgh6d1h3ya0dicj5qfcrgr2fhp1v8jjhl125m"; depends=[]; }; MaxentVariableSelection = derive2 { name="MaxentVariableSelection"; version="1.0-3"; sha256="1cmxfdkm5k85b4ivlfy5521hkfj0gq2pb1qlxxklh0fprw87kp9c"; depends=[ggplot2 raster]; }; - MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.4.2"; sha256="1p79wc3f1mcv9nlf8z277h1vzxl33w48knhn0yrw902vr5a0lzhf"; depends=[devtools dplyr futile_logger lubridate magrittr purrr rlang stringr tibble]; }; + MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.4.3"; sha256="08zfd32xhggswzxj35zsvskyaiqx483pkw57f0i2afx3idz3p0am"; depends=[devtools dplyr futile_logger lubridate magrittr purrr rlang stringr tibble]; }; MazamaLocationUtils = derive2 { name="MazamaLocationUtils"; version="0.1.6"; sha256="187lrpc9z3k4jnd1nvqsb0qibz9xz9i1i61vssqm72h1hx1j9j6f"; depends=[digest dplyr geodist httr lubridate magrittr MazamaCoreUtils MazamaSpatialUtils readr revgeo rlang stringr]; }; MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.6.4"; sha256="0wb221h8lwdcx5h5hkvpz9rarizry22qzydibcc2gs6b0d5514ms"; depends=[countrycode dplyr geojsonio lubridate magrittr rgdal rgeos rlang rmapshaper rvest shiny sp stringr xml2]; }; - MazamaWebUtils = derive2 { name="MazamaWebUtils"; version="0.1.7"; sha256="16k6wxwjkdwzx1cqcxpxwaj7i63khly90gyiyfw13di43h8cvsd1"; depends=[dplyr futile_logger lubridate mime stringr webutils]; }; McSpatial = derive2 { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; }; Mcomp = derive2 { name="Mcomp"; version="2.8"; sha256="1wz5fr3dhxn4s0qvxm2mzq9dbz3x0vgh6pixjrgk9d4i9w2p7s60"; depends=[forecast ggplot2]; }; MeTo = derive2 { name="MeTo"; version="0.1.0"; sha256="14hdyh3p3q8yb9w2li2y9pc356jnymsn6n2750zdsrh52b751lpm"; depends=[lubridate]; }; @@ -2523,8 +2557,8 @@ in with self; { MediaK = derive2 { name="MediaK"; version="1.0"; sha256="19cmxl2wksw9kvjsfn1m4nkr5gpcx6bk0sqrabj1n0dla1l32v2a"; depends=[Rcpp RcppEigen]; }; Mediana = derive2 { name="Mediana"; version="1.0.8"; sha256="0j1ikc2iaxl70134v0gijj2i2g0xgjafvn8rc108r9fhm8rpw564"; depends=[doParallel doRNG foreach MASS mvtnorm survival]; }; Mega2R = derive2 { name="Mega2R"; version="1.0.5"; sha256="18fhkghlx4rkafyx0jpxxyjq20xv6y6sfjyz7m68fi73akjz2rw7"; depends=[AnnotationDbi DBI famSKATRC gdsfmt GenomeInfoDb kinship2 pedgene Rcpp RSQLite SKAT]; }; - MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.4.1"; sha256="01irc5qnw7gsvnpifki05ksh7ys8znk0wvhqrzk1bv5294rnq6r1"; depends=[ggplot2 iterpc knitr Matrix plotly rjson rmarkdown robustbase]; }; - Mercator = derive2 { name="Mercator"; version="0.9.6"; sha256="09fk9cmnd636hnbhh3f1swmfk4j6nxfbz42hi2ylpriq7ygp7jq5"; depends=[ClassDiscovery cluster dendextend igraph KernSmooth Polychrome Rtsne Thresher]; }; + MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.4.2"; sha256="0s5d9b66gf4ihbrypbkzkqsws19shw2gbkjrk6cr7l11vw7lfd57"; depends=[ggplot2 iterpc knitr Matrix plotly rjson rmarkdown robustbase]; }; + Mercator = derive2 { name="Mercator"; version="0.10.0"; sha256="04hfcg85vs7gkbbgbsymv7xadzzm2rvypw5awnxrnfmdhwn9r9bk"; depends=[ClassDiscovery cluster dendextend igraph KernSmooth Polychrome Rtsne Thresher]; }; MergeGUI = derive2 { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 rpart]; }; MetABEL = derive2 { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; }; MetFns = derive2 { name="MetFns"; version="3.2.2"; sha256="15fd2d0yysibi2x43qv6b8i1pa18l7z4n0zpmrqhsmvqkgy8sla0"; depends=[astroFns lubridate plotrix pracma]; }; @@ -2534,14 +2568,14 @@ in with self; { MetaAnalyser = derive2 { name="MetaAnalyser"; version="0.2.1"; sha256="0k58325nb7svihhpga7kdbryr9bi5470qsb8aa5llpiggs8j7sfz"; depends=[DT ggvis rstudioapi shiny]; }; MetaComp = derive2 { name="MetaComp"; version="1.1.2"; sha256="1yb115qdmf5rxmjl4y7qr0i6668n46scs4yjpfq9bmy3w9i4ji1x"; depends=[Cairo data_table dplyr ggplot2 plyr reshape2]; }; MetaCycle = derive2 { name="MetaCycle"; version="1.2.0"; sha256="1lh1msrcz70p5jixz5j83pqa3cid21y7m1zvlk872k16awmif00k"; depends=[gnm]; }; - MetaIntegrator = derive2 { name="MetaIntegrator"; version="2.1.1"; sha256="11jblzqid9xyigj916filclk8ih15g04r58msb7lwlh9srn4hjw4"; depends=[AnnotationDbi Biobase BiocManager boot COCONUT data_table DBI dplyr DT GEOmetadb GEOquery ggplot2 ggpubr gplots HGNChelper httpuv magrittr manhattanly Metrics multtest pheatmap plotly plyr pracma preprocessCore readr reshape2 rmarkdown rmeta Rmisc RMySQL ROCR RSQLite stringr zoo]; }; + MetaIntegrator = derive2 { name="MetaIntegrator"; version="2.1.3"; sha256="1763in7zcfr4abhwc0sy27c1qbzbhkyjsasrhwdjjmsc645sqxlx"; depends=[AnnotationDbi Biobase BiocManager boot COCONUT data_table DBI dplyr DT GEOmetadb GEOquery ggplot2 ggpubr gplots HGNChelper httpuv magrittr manhattanly Metrics multtest pheatmap plotly plyr pracma preprocessCore readr reshape2 rmarkdown rmeta Rmisc RMySQL ROCR RSQLite stringr zoo]; }; MetaLandSim = derive2 { name="MetaLandSim"; version="1.0.6"; sha256="1m7i1y9jmhwa3h3xbqqlskgr216x50jb4wx8n3ynh16hw54n07xi"; depends=[coda e1071 fgui googleVis igraph knitr maptools minpack_lm raster rgeos rgrass7 sp spatstat zipfR]; }; MetaLonDA = derive2 { name="MetaLonDA"; version="1.1.8"; sha256="0nalkmsii2anw07r16zcpgafb01l87hgpfr1mwc7nggvhdfp3w2g"; depends=[DESeq2 doParallel edgeR ggplot2 gss metagenomeSeq plyr pracma zoo]; }; MetaPCA = derive2 { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; }; MetaPath = derive2 { name="MetaPath"; version="1.0"; sha256="1vvpfv6yc4rd4apqfs2yzm97xxsv43ghwqnjq6w1xrc4pdx2p634"; depends=[Biobase genefilter GSEABase impute]; }; - MetaSKAT = derive2 { name="MetaSKAT"; version="0.71"; sha256="1bfy1zqblwz7a9fr9i6hs18x2n422x52b928v77r3924nasa67a8"; depends=[SKAT]; }; - MetaStan = derive2 { name="MetaStan"; version="0.1.1"; sha256="0sln7hr892npq508qbswhnpx27vjd5qnh81glazma5m3k2li53jb"; depends=[BH Rcpp RcppEigen rstan rstantools StanHeaders]; }; - MetaSubtract = derive2 { name="MetaSubtract"; version="1.50"; sha256="1aggkvpyl2zpnmqzrr7k22wmb4dyagljcwrkm956nbyvlzx4sx2x"; depends=[]; }; + MetaSKAT = derive2 { name="MetaSKAT"; version="0.80"; sha256="1hkkirbxl17v7sdbj4646fijlwvdw3p10h97r9h46cw6cn77v5gq"; depends=[SKAT]; }; + MetaStan = derive2 { name="MetaStan"; version="0.2.0"; sha256="035qmzkijaql5d9h1a83p535gihy4bbv9n839q9kpp0l05mdwgwm"; depends=[BH Rcpp RcppEigen rstan rstantools StanHeaders]; }; + MetaSubtract = derive2 { name="MetaSubtract"; version="1.60"; sha256="19xg95g2qgyi90pz3733l596gzdj6dmb0k9i4qmhaq4yck69rrhj"; depends=[]; }; MetaUtility = derive2 { name="MetaUtility"; version="2.1.0"; sha256="1lbqqh56pwxlcksv0kf463hc20jb4rkjqkcqal000rzyzd4bi2zj"; depends=[dplyr metafor purrr stringr]; }; MetaboList = derive2 { name="MetaboList"; version="2.0"; sha256="10skvf14ls4qll0l9p6cig4lmj7138khcksyjvd1pqym9axk3wxn"; depends=[dplyr enviPick ggplot2 scales]; }; MetaboLouise = derive2 { name="MetaboLouise"; version="1.0.0"; sha256="1agcp520in0wpxv3x2jvvmv61hasazdymnvjhzl66nwv8lifl98z"; depends=[igraph]; }; @@ -2557,20 +2591,19 @@ in with self; { Methplot = derive2 { name="Methplot"; version="1.0"; sha256="0aaqss9zfn55qi45jffxkksnkw510npjnkygafx49vl77bkagqh5"; depends=[ggplot2 reshape]; }; MethylCapSig = derive2 { name="MethylCapSig"; version="1.0.1"; sha256="16ch9aldr6a9jn42h387n7qvnzs0yx28f2yj6xq0kp476q7rf4ql"; depends=[geepack]; }; Metrics = derive2 { name="Metrics"; version="0.1.4"; sha256="0fh8qbjlwzagh272lgwr4bxcqcjb1qpz53mgs8rzlvncax6nk5bk"; depends=[]; }; - MetricsWeighted = derive2 { name="MetricsWeighted"; version="0.5.0"; sha256="0i9wla42i5p9yqjsrhjylyfszxl7p3k4yfwkvqsw9ncak611ig9x"; depends=[]; }; + MetricsWeighted = derive2 { name="MetricsWeighted"; version="0.5.1"; sha256="0gv66ly2cchx6lf75sw4izpy2frdnzficb8xirdgj57h8cg5yppd"; depends=[]; }; MfUSampler = derive2 { name="MfUSampler"; version="1.0.4"; sha256="0i5siq1jacxbfvakb97qnj3h7pk471rrx8ckwm0d8nl3j586s36y"; depends=[ars coda HI]; }; MiDA = derive2 { name="MiDA"; version="0.1.2"; sha256="144gxsxqljzskxsw5k0y69ix0pxlfvyyznxkjpf2ng4l47pg11z5"; depends=[caret gbm genefilter limma preprocessCore pROC SQN]; }; MiRAnorm = derive2 { name="MiRAnorm"; version="1.0.0"; sha256="154wv0j82xyc4y5cd2czh0q8kzhgrk6qsn0ahc1zn3fnrzc9fgz0"; depends=[ArgumentCheck cluster dendextend ggplot2 MASS npmv plyr reshape2]; }; - MiRKAT = derive2 { name="MiRKAT"; version="1.0.1"; sha256="1adhy9ysjm8xa45sb4x17ryznvg91c9xdf0irpcgc7rbg34rxf5x"; depends=[GUniFrac MASS PearsonDS survival]; }; + MiRKAT = derive2 { name="MiRKAT"; version="1.1.0"; sha256="15ah3zgf67sv0rxw99qvxsfbivni5pkcrmqhf0c3656bjwb397hd"; depends=[CompQuadForm ecodist GUniFrac lme4 MASS Matrix mixtools PearsonDS permute quantreg survival]; }; MiRSEA = derive2 { name="MiRSEA"; version="1.1"; sha256="0jpl6ws5yx1qjzdnip9a37nmvx81az4cbsjm57x613qjpwmg6by3"; depends=[]; }; MiSPU = derive2 { name="MiSPU"; version="1.0"; sha256="1l6q0fm5z5i6gigr940h8kc5rka08psmhcprp8grmsxk3qy2kply"; depends=[ape aSPU cluster Rcpp RcppArmadillo vegan]; }; MiST = derive2 { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; }; MicSim = derive2 { name="MicSim"; version="1.0.15"; sha256="0nbrl013i1jz5hsq5a6526rlsp0qvvrbs86md6yrvhh90bsnf65p"; depends=[chron rlecuyer snowfall]; }; MicroDatosEs = derive2 { name="MicroDatosEs"; version="0.8.2"; sha256="0k0hmi3ciipizmgjw1i5rrsg34yx21s1msn40vc4qc9s1n4wd8dl"; depends=[readr]; }; MicroMacroMultilevel = derive2 { name="MicroMacroMultilevel"; version="0.4.0"; sha256="1q5cyqr4hdl1wp2isk6p4p084i83kg6hd406wdp1nj9lv5i0xvgw"; depends=[]; }; + MicroNiche = derive2 { name="MicroNiche"; version="1.0.0"; sha256="166ci4crkwnnh05rhs5hyrljgm4cdf7gp0ff8kjxjmd60byw80mz"; depends=[ggplot2 reshape2]; }; MicroStrategyR = derive2 { name="MicroStrategyR"; version="1.0-1"; sha256="0a6bk0wnwx8zy9081n7wb12lidgckrhn350r0q5m6aa82l6l8ihi"; depends=[gWidgetsRGtk2]; }; - MigClim = derive2 { name="MigClim"; version="1.6.1"; sha256="116zsmir0hz6ah3qwsr8bb8qhhfzvg1rciwm8a6lq02mvw0v0vrn"; depends=[raster]; }; - MinBAR = derive2 { name="MinBAR"; version="1.1.0"; sha256="03hzv6a56w0d6di3jp3w3fgckwxkqb1cy3xiwcvzyg5lzm4z9p2x"; depends=[dismo ecospat geosphere lattice latticeExtra maxnet raster rgdal sp]; }; MindOnStats = derive2 { name="MindOnStats"; version="0.11"; sha256="13995v4n0hfb53w02jk81pl7nazkvqwwv87y1sr99jr9ppzc08mz"; depends=[]; }; Miney = derive2 { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; }; Minirand = derive2 { name="Minirand"; version="0.1.3"; sha256="19lib0qh3xfzvpgsskl3yypmjygss0w7pimz0136av0px5b4jran"; depends=[]; }; @@ -2592,47 +2625,46 @@ in with self; { MixfMRI = derive2 { name="MixfMRI"; version="0.1-0"; sha256="08k8j52mrjpcrnwz74va4w3cdfrbkzp00wdzrrrzifx7lcmxrqzv"; depends=[EMCluster fftw MASS Matrix MixSim RColorBrewer]; }; MixtureInf = derive2 { name="MixtureInf"; version="1.1"; sha256="12qcflmrpzh4w5b40xq5qicks6p0cwqpf5k84pwabkjb168afddv"; depends=[quadprog]; }; MixtureRegLTIC = derive2 { name="MixtureRegLTIC"; version="1.0.0"; sha256="052gyk4gqv49fa2rxbxnib29f1vjxiw4q8llkfhsv8kw5pw38699"; depends=[]; }; - MoEClust = derive2 { name="MoEClust"; version="1.2.4"; sha256="1w54kfwc4l0fha63mgy7khqiikck9ffhyv9yy0icx3g03hkwmfky"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; }; + MoBPS = derive2 { name="MoBPS"; version="1.4.87"; sha256="0wzmb02d9b49jrz8a4z28yri2zd8dh016an46h2dkmykr1asxg95"; depends=[]; }; + MoEClust = derive2 { name="MoEClust"; version="1.3.0"; sha256="0aqfbm44p48ywdxpy0x48civ927dd742a7sfxx645l65j99kzcxi"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; }; MoLE = derive2 { name="MoLE"; version="1.0.1"; sha256="0bq19vwqjn5hl4mw5imkydbp39gal992vnh2dwrq8bb8cmj3qh91"; depends=[]; }; - MoTBFs = derive2 { name="MoTBFs"; version="1.2"; sha256="1k5xyz93bf10wslrbqygdhm9z14dfl53xzd2fcyjc4xgjzfv1v3b"; depends=[bnlearn ggm lpSolve quadprog]; }; + MoTBFs = derive2 { name="MoTBFs"; version="1.3"; sha256="14rj77g265j04wq3k24byg8i10z9rrsid24kjkfncz5pmrpv1a6g"; depends=[bnlearn ggm lpSolve quadprog]; }; MobileTrigger = derive2 { name="MobileTrigger"; version="0.0.31"; sha256="1zbnxdxh6gr4sgpi10i0pnd85f7i842105jgjswacziqamby6mcy"; depends=[caret ggplot2 kableExtra knitr mailR plyr XML yaml]; }; ModStatR = derive2 { name="ModStatR"; version="1.3.0"; sha256="1wdqkvbycjk4wzzkpc0pyxvxrzqm48xbi8y87nax5l1v5qdfm1n0"; depends=[BioStatR boot ellipse ggplot2 gsl hypergeo jmuOutlier]; }; Modalclust = derive2 { name="Modalclust"; version="0.7"; sha256="0ymzdxp6rh6baih1xm6kj8l8jxjclvnmq0gfp38cl8lpskspb26x"; depends=[class mvtnorm zoo]; }; ModelGood = derive2 { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; }; ModelMap = derive2 { name="ModelMap"; version="3.4.0.1"; sha256="1279k5hznxrb6fq4zd1baw1pm5dj5437g5awkgb8kp7ll8raa2ql"; depends=[corrplot fields HandTill2001 mgcv PresenceAbsence randomForest raster rgdal]; }; - ModelMetrics = derive2 { name="ModelMetrics"; version="1.2.2.1"; sha256="17yw46yr0n9hddvlhh73jdpmpdlpa581n5xjpwkr6cpr2f7xxpqc"; depends=[data_table Rcpp]; }; + ModelMetrics = derive2 { name="ModelMetrics"; version="1.2.2.2"; sha256="0mrlsw4c5y1vdsqynxr2dcvmhh5h37pnd71jw5a5djpbda9g21jy"; depends=[data_table Rcpp]; }; Modelcharts = derive2 { name="Modelcharts"; version="0.1.0"; sha256="1jy78kyyh4r13px2d5bm7fra5bkcpimzfji0hmydspkfi3qla37x"; depends=[dplyr plotly]; }; Modeler = derive2 { name="Modeler"; version="3.4.5"; sha256="15gbg5568qj81wp6yy31amb2b7wl1wvlmgpmdp29lvz1p33jx2y1"; depends=[class ClassComparison ClassDiscovery e1071 neuralnet nnet oompaBase randomForest rpart TailRank]; }; - MomTrunc = derive2 { name="MomTrunc"; version="5.69"; sha256="14wvrkyasz9x54rk8cmdx523hsyvzhg2g6bx63gzah6wg5inmj25"; depends=[hypergeo mvtnorm Rcpp RcppArmadillo tlrmvnmvt]; }; - Momocs = derive2 { name="Momocs"; version="1.2.9"; sha256="13pgn31hv529z33mi020w8wm8ya7hyi5yfsp45a78wdhinqas9mm"; depends=[ape dplyr geometry geomorph ggplot2 jpeg magrittr MASS progress RColorBrewer rgeos sp]; }; + MomTrunc = derive2 { name="MomTrunc"; version="5.87"; sha256="1mnas2vws54h8zzf7f0drnk00rphfxr8g2277gcknbfpr8xkwacz"; depends=[hypergeo mvtnorm Rcpp RcppArmadillo tlrmvnmvt]; }; + Momocs = derive2 { name="Momocs"; version="1.3.0"; sha256="149q4qyplgvcvscg7846m0cjagvby3rj40g9bpx6kvd67arfrl6y"; depends=[cluster dendextend dplyr geometry geomorph ggplot2 jpeg magrittr MASS progress RColorBrewer rgeos sp vegan]; }; Mondrian = derive2 { name="Mondrian"; version="1.0-0"; sha256="07r64q518diphai951pw4vfaw4sd6bqwhi6q5cp4pcl3aqjynkmj"; depends=[RColorBrewer]; }; MonetDB_R = derive2 { name="MonetDB.R"; version="1.0.1"; sha256="1r7vki0rrzwcrfg4f2lfx30g614vf2xi62qb1rs21a9j5741lxlx"; depends=[codetools DBI digest]; }; MonoInc = derive2 { name="MonoInc"; version="1.1"; sha256="14rykw3bfj0vznz0rw4vsg1k4vanfv9cy867vspw966ncl4bw70h"; depends=[compare doParallel foreach iterators sitar]; }; - MonoPhy = derive2 { name="MonoPhy"; version="1.2"; sha256="0997kg8hfwgsc9s155z0wrf7rrhn3vf6681j9psjl3hsspg08z2r"; depends=[ape phangorn phytools RColorBrewer taxize]; }; MonoPoly = derive2 { name="MonoPoly"; version="0.3-10"; sha256="0ls3sjfkinp9c5002ww0xm4l2galf20w2f45nm5irkk9sbqas0jq"; depends=[quadprog]; }; Monte_Carlo_se = derive2 { name="Monte.Carlo.se"; version="0.1.0"; sha256="1d5gp4wvpvrlp82g8k8v668mzhmdlk2pvky34v7hxysap9xgmsqr"; depends=[]; }; MonteCarlo = derive2 { name="MonteCarlo"; version="1.0.6"; sha256="1jwq3by8zfy6sbzahcj5l0vicqn7yyqpb7xhfsaymfspm7xyq6pj"; depends=[abind codetools reshape rlecuyer snow snowfall]; }; - MoonFinder = derive2 { name="MoonFinder"; version="1.0.3"; sha256="1lwjrzk68x1xxa10mk2zwaj6kwlryyad7wcd5vf85di5bbbvpm7n"; depends=[annotate clusterProfiler igraph org_Hs_eg_db pheatmap RColorBrewer]; }; - Morpho = derive2 { name="Morpho"; version="2.7"; sha256="0zgq79yfgkl6g404j9hpdaza5m5qkklh1xpf9xpmyf940pqdw21c"; depends=[colorRamps doParallel foreach MASS Matrix Rcpp RcppArmadillo rgl Rvcg]; }; + Morpho = derive2 { name="Morpho"; version="2.8"; sha256="080ix1j0r67l0y66zq4xzfl8lhd3q4y4hzmmxphxkhmx83rhsik0"; depends=[colorRamps doParallel foreach MASS Matrix Rcpp RcppArmadillo rgl Rvcg]; }; MorseGen = derive2 { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; }; MortCast = derive2 { name="MortCast"; version="2.1-2"; sha256="0p5cjzrl3yhrbhjr31fm84rj7dl7n65qzccj447ky1lvb4c0v2x1"; depends=[wpp2017]; }; MortalityGaps = derive2 { name="MortalityGaps"; version="1.0.0"; sha256="0nfm8xa7gnshrl8hsvmvr3za8nbppp7f7i5h4ni204w7xwvh8jxc"; depends=[crch forecast MASS pbapply]; }; - MortalityLaws = derive2 { name="MortalityLaws"; version="1.8.3"; sha256="1k3wamxgrsl08sfymfqhlgal38nxxgqfibqkh1qkmm4006pp7xx3"; depends=[minpack_lm pbapply RCurl tidyr]; }; + MortalityLaws = derive2 { name="MortalityLaws"; version="1.8.4"; sha256="0sgxkw9f8s3iv6x2clsx6505wjflg6xa3w19m4q6gz8fkbh2sxfv"; depends=[minpack_lm pbapply RCurl tidyr]; }; MortalitySmooth = derive2 { name="MortalitySmooth"; version="2.3.4"; sha256="1clx8gb8jqvxcmfgv0b8jyvh39yrmcmwr472j9g3ymm95m4hr8fq"; depends=[lattice svcm]; }; MortalityTables = derive2 { name="MortalityTables"; version="1.0"; sha256="07pbjgc4qvznw1rfvmz6ndg0gzj0k61iajwn51ijpb7hscwi8937"; depends=[ggplot2 scales]; }; MplusAutomation = derive2 { name="MplusAutomation"; version="0.7-3"; sha256="0sidvznbknc4pdk4w6izpizap2yvbzxbjnmnrxmwj45ypm9pjpqc"; depends=[boot coda data_table digest ggplot2 gsubfn lattice pander plyr rlang texreg xtable]; }; MplusTrees = derive2 { name="MplusTrees"; version="0.1.1"; sha256="1s119p1fgr27rkh671zpzbfnd368m0s1607r8xwgjm0y5ncxwkv7"; depends=[MplusAutomation nlme rpart rpart_plot]; }; - Mqrcm = derive2 { name="Mqrcm"; version="1.0"; sha256="1z8zyjvjz1izaal5y6dnlm86pvydab45d9qnhcnibi2l9r1ladkc"; depends=[Hmisc pch]; }; + Mqrcm = derive2 { name="Mqrcm"; version="1.1"; sha256="15pxrh5i8pm6ckp44mlgq1ld5b1y9kg6vjvis5k812h64gm3aizq"; depends=[Hmisc pch]; }; MsdeParEst = derive2 { name="MsdeParEst"; version="1.7"; sha256="1zhi1jr30sl7jpsw37lc3akfzixlhm9k2hjkha1pjy5fmd5lddlx"; depends=[MASS moments mvtnorm sde]; }; MtreeRing = derive2 { name="MtreeRing"; version="1.4.2"; sha256="097w65ijhdkag26z39kzqqp7bs3bcx4iqapj3qc8inh0iynhnxp6"; depends=[bmp dplR dplyr imager jpeg magick magrittr measuRing png shiny shinydashboard shinyWidgets spatstat tiff]; }; MuChPoint = derive2 { name="MuChPoint"; version="0.6.1"; sha256="15bqsc7bsjg55qxjwxh58bxbwz61a6wv4xxph994g4020b98l01x"; depends=[capushe Matrix Rcpp shiny]; }; MuFiCokriging = derive2 { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; }; - MuMIn = derive2 { name="MuMIn"; version="1.43.15"; sha256="1xp0r7yqvll90jv7i5jx142vj5pmfpfmmn6i9a7kgqx26yzpq87h"; depends=[Matrix nlme]; }; + MuMIn = derive2 { name="MuMIn"; version="1.43.17"; sha256="1ac78wg94j37ikwb8r1lxk6jlj3m804q94630i5vcm663p99cqdc"; depends=[Matrix nlme]; }; MuViCP = derive2 { name="MuViCP"; version="1.3.2"; sha256="1wkiwdz4bblxf1zr57khljqkga9ks9aj1lnidvmhib94q6b8fnf4"; depends=[gtools MASS sm]; }; MullerPlot = derive2 { name="MullerPlot"; version="0.1.2"; sha256="0am5brdmbh2mw74fbw9nha6h4qlhj8psg3142mql1ad99bd0zg4w"; depends=[RColorBrewer]; }; MultAlloc = derive2 { name="MultAlloc"; version="1.2"; sha256="0c3sqfaa08s8mk4yz77kh6q6v9ic5xp52g9prfw1k2kv4nw1k2qd"; depends=[Rglpk]; }; MultEq = derive2 { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; }; - MultNonParam = derive2 { name="MultNonParam"; version="1.3.0"; sha256="13xkwyvqqjvs5nv383y3hy1w0mz2qmqwih5rh9dqs7r7afx7928n"; depends=[]; }; + MultNonParam = derive2 { name="MultNonParam"; version="1.3.3"; sha256="10fkvi4iz9wc7vza2cpqpl85wywbiipbkvbqdxzz7wxr5a3agk2r"; depends=[ICSNP]; }; MultiBD = derive2 { name="MultiBD"; version="0.2.0"; sha256="1qjfr8hx8sr5m8370yzi09r8jnh3i6907wzj3v4h83vmjh81db71"; depends=[BH Rcpp RcppParallel]; }; MultiCNVDetect = derive2 { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; }; MultiFit = derive2 { name="MultiFit"; version="1.0.1"; sha256="1hy2xsmdcsn4jwa06ffymhhd4prxjnqw0jxl77sxq8yb1fc2vk64"; depends=[data_table Rcpp RcppArmadillo]; }; @@ -2641,7 +2673,8 @@ in with self; { MultiLCIRT = derive2 { name="MultiLCIRT"; version="2.11"; sha256="1qls0qp5fz377h50lvpzq3vkw49i3nvizli98gss50nqci8ssqm4"; depends=[limSolve MASS]; }; MultiMeta = derive2 { name="MultiMeta"; version="0.1"; sha256="0gj0wk39fqd21xjcah20jk16jlfrcjarspbjk5xv74c9k4p5gmak"; depends=[expm ggplot2 gtable mvtnorm reshape2]; }; MultiOrd = derive2 { name="MultiOrd"; version="2.4.1"; sha256="09hwd9x0kn1f5p1jiypalvh5akjivhj8v2wh3iaavdf8c2vg04kg"; depends=[corpcor Matrix mvtnorm psych]; }; - MultiRNG = derive2 { name="MultiRNG"; version="1.2.2"; sha256="0ah7m9ykji0v35bnj012621y47qn9l6vk2q17dj4zx5qfi8wdy2l"; depends=[]; }; + MultiPhen = derive2 { name="MultiPhen"; version="2.0.3"; sha256="0razswg4wqsz4q0dvpxp3swmxk82ig8gkyi4vcmxh11nlhb258w3"; depends=[abind epitools HardyWeinberg MASS meta RColorBrewer]; }; + MultiRNG = derive2 { name="MultiRNG"; version="1.2.3"; sha256="12nspgk3iy698bik040mlxslysf6j9c9vww5bclsdm81ckymd0ca"; depends=[]; }; MultiRR = derive2 { name="MultiRR"; version="1.1"; sha256="1jrhx3nlqwsv3i6r8fs142llw88qad41rsh0sj1pv1gb928zpvl3"; depends=[lme4 MASS]; }; MultiRobust = derive2 { name="MultiRobust"; version="1.0.5"; sha256="15l23a2mkpcxc3y93f761c5fwcj5h13yma4qdfdlr8fiqkvc3acg"; depends=[]; }; MultiSV = derive2 { name="MultiSV"; version="0.0-67"; sha256="0924lvkx12aqjxxz8bwqdi4h9xc2acf8aynllx0m45ip5r4gh1g2"; depends=[nlme reshape]; }; @@ -2658,9 +2691,9 @@ in with self; { My_stepwise = derive2 { name="My.stepwise"; version="0.1.0"; sha256="10wka6kzk8krwdsyjfnn78dfqflq4zg3vjkk0i2ywjm5vap6aqa5"; depends=[car lmtest survival]; }; Myrrix = derive2 { name="Myrrix"; version="1.2"; sha256="05x2h4ppjhfm0wlpwyp8ycjg59qj3gv0yqdilxrzb1lkrzln92xb"; depends=[Myrrixjars rJava]; }; Myrrixjars = derive2 { name="Myrrixjars"; version="1.0-2"; sha256="1hhfg83z5kl6l250z3lippx3qc68k1wj1qlfzd6m66rgmk699gyl"; depends=[rJava]; }; - N2H4 = derive2 { name="N2H4"; version="0.5.4"; sha256="1sdxfi4618q9kz18ns1i1i2g5r0c4b6ydijaaxr21z206zi5i5wb"; depends=[dplyr httr jsonlite lubridate rvest tibble tidyr xml2]; }; + N2H4 = derive2 { name="N2H4"; version="0.5.7"; sha256="0wpwcv17jvrjgvr0qhjrjr1i2rdxcga49c1c6m7s58p9wmdi8fg2"; depends=[dplyr httr jsonlite lubridate rvest tibble tidyr xml2]; }; NACHO = derive2 { name="NACHO"; version="1.0.0"; sha256="0mnkfg45bcnrpxq3q7qpzw8kr5k6kdqd6022n0ld7m3wg9bwxzpb"; depends=[cli crayon dplyr ggbeeswarm ggforce ggplot2 ggrepel knitr magrittr purrr rlang rmarkdown rstudioapi scales sessioninfo shiny shinyWidgets tibble tidyr]; }; - NADA = derive2 { name="NADA"; version="1.6-1"; sha256="1jjlm6rljk4nv6b7l2w3xnj31j61wq30sp5pnna8wav6gyjqjfmb"; depends=[survival]; }; + NADA = derive2 { name="NADA"; version="1.6-1.1"; sha256="0jp4mqr77cx7q5lff84s6wb0dwjy9mi0jyhbjc5fsx50bdczc3v7"; depends=[survival]; }; NAEPprimer = derive2 { name="NAEPprimer"; version="1.0.1"; sha256="19p1livdnayfcl88f8r9x1vg30x522q8lgx66pfgwpkxjzvrqa2l"; depends=[]; }; NAM = derive2 { name="NAM"; version="1.7.3"; sha256="12d2yjl0af2ailvwk30fswalx1wzyj500qbrhiczsg1vr4rcqhkh"; depends=[Rcpp]; }; NAPPA = derive2 { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[NanoStringNorm plyr]; }; @@ -2671,6 +2704,7 @@ in with self; { NBDesign = derive2 { name="NBDesign"; version="1.0.0"; sha256="15iwrhwpx2c72xg2jk743qgm85vfv4yhyi5i6pm84ya8drsij70p"; depends=[MASS PWEALL]; }; NBLDA = derive2 { name="NBLDA"; version="0.99.0"; sha256="1fd6f43yhwvdb81r0b9hpmna5bphhqcgwiwjkpdyqz4h9cdmsj21"; depends=[ggplot2 sSeq]; }; NBPSeq = derive2 { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[qvalue]; }; + NBR = derive2 { name="NBR"; version="0.1.2"; sha256="0czl8n2k354i9bsqsd0fiifap2hpi0nhvdi51s6h321wf7khrv1z"; depends=[nlme]; }; NBShiny = derive2 { name="NBShiny"; version="0.1.0"; sha256="0hcmdhj26hc3c8d5nb6yb7amv0rbdxywima0l0jqkxipx56idlcx"; depends=[caret dplyr e1071 rhandsontable rmarkdown shiny]; }; NBShiny2 = derive2 { name="NBShiny2"; version="0.1.0"; sha256="0w4f19av8zl220zq3flmlqn86ivikclnsnkd7bc1wafhr12hmygp"; depends=[caret dplyr e1071 rhandsontable rmarkdown shiny]; }; NCA = derive2 { name="NCA"; version="3.0.2"; sha256="135zh39c19gwka7j4qsnvmr0zy3qld07cqg72mzghspi88v4fi8n"; depends=[doParallel foreach ggplot2 gplots iterators KernSmooth lpSolve quantreg sfa]; }; @@ -2687,11 +2721,10 @@ in with self; { NGBVS = derive2 { name="NGBVS"; version="0.2.0"; sha256="1k7m7wy54irqci6ccclpylbmz0613ha7r531cji99jb7nkpzl6l0"; depends=[Rfast]; }; NGSSEML = derive2 { name="NGSSEML"; version="1.0"; sha256="1kwdziv2rdswbjq2rir2a6yw6ldnck1z7hahyywvw0kbm5fkb4zq"; depends=[car dlm fields interp mvtnorm]; }; NHANES = derive2 { name="NHANES"; version="2.1.0"; sha256="0aphv3rakfcfrv2km1xyxpj1bxiazy6gwrvs7lyhxmq468fk4c9a"; depends=[]; }; - NHEMOtree = derive2 { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[emoa partykit rpart sets]; }; NHLData = derive2 { name="NHLData"; version="1.0.0"; sha256="0dfqalccbkmqrn3h1z6s78l818c8sqn7d6yc8mg872ygmszryci7"; depends=[]; }; NHMM = derive2 { name="NHMM"; version="3.10"; sha256="058p0lyizqhdhapvjxk2c7n0bpid340hv1dn0cypy5w12y7zml4s"; depends=[BayesLogit MASS MCMCpack msm Rcpp]; }; - NHMSAR = derive2 { name="NHMSAR"; version="1.15"; sha256="0fbv5jjrzir9i84pidigjhfnjyyzhnhi7j1mn7cx58wlh9qn9ark"; depends=[glasso lars ncvreg ucminf]; }; - NHPoisson = derive2 { name="NHPoisson"; version="3.2"; sha256="0k6m6ampp7g95d0jm5msvrgc12rqirpanb1ykbdf1ii027pqpwsn"; depends=[car]; }; + NHMSAR = derive2 { name="NHMSAR"; version="1.17"; sha256="149zzk8apl4zv60xagl8zk3zv1fnrbfijmlwn8c4vypvlfdsr981"; depends=[glasso lars ncvreg ucminf]; }; + NHPoisson = derive2 { name="NHPoisson"; version="3.3"; sha256="1i6n59ckcxk1hwyz97jmnv4yb96ianjma6ka8lpz79ivs41jniad"; depends=[car]; }; NHSRdatasets = derive2 { name="NHSRdatasets"; version="0.1.2"; sha256="0xiqbqq7xjyi1vxza853ylyiq4nqr6y10x8i13c2kj756biz4h1n"; depends=[]; }; NIPTeR = derive2 { name="NIPTeR"; version="1.0.2"; sha256="0ll6amqyw33a93xiccihidrnbaqlx1q7kqcd4wks7cvqawd8pgv1"; depends=[Rsamtools S4Vectors sets]; }; NIRStat = derive2 { name="NIRStat"; version="1.0"; sha256="1hi8201zslp1f7m3jci8q03y3f1zlcck2x3i793l7lsyl7qbzd1z"; depends=[ggplot2 gridExtra mgcv]; }; @@ -2703,19 +2736,18 @@ in with self; { NLPclient = derive2 { name="NLPclient"; version="1.0"; sha256="0jhlz9mqziyk5574vl8qjjs4g75x27rlk90wvzm3q9kjrjyvad35"; depends=[curl NLP xml2]; }; NLPutils = derive2 { name="NLPutils"; version="0.0-5"; sha256="1jxxly85iajzb9qckkkar0przyxv005cyvry0qi5dkzhbyl5k490"; depends=[NLP qdap SnowballC]; }; NLRoot = derive2 { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; }; + NMADiagT = derive2 { name="NMADiagT"; version="0.1.2"; sha256="0fskc3ldfdl17gazpfr2hixy79n7db4c1f5yl1jalhwxiabnxjwp"; depends=[coda ggplot2 imguR ks MASS MCMCpack plotrix Rdpack reshape2 rjags]; }; NMAoutlier = derive2 { name="NMAoutlier"; version="0.1.13"; sha256="0d3mg92ky5mhjz6y1903ssanl1lzq4q22yifgjyq29j9snx0jkx1"; depends=[ggplot2 gridExtra MASS netmeta reshape2]; }; - NMF = derive2 { name="NMF"; version="0.21.0"; sha256="1qq25n3k5sgh3srlshb3ic6q92s12c1ilqf5cd5anvq6cqfchc1v"; depends=[cluster colorspace digest doParallel foreach ggplot2 gridBase pkgmaker RColorBrewer registry reshape2 rngtools stringr]; }; + NMF = derive2 { name="NMF"; version="0.22.0"; sha256="0b2ls3x1nkrnam45hagpys624nzxj3v7kxnp0q216yakvx5h57cq"; depends=[Biobase BiocManager cluster colorspace digest doParallel foreach ggplot2 gridBase pkgmaker RColorBrewer registry reshape2 rngtools stringr]; }; NMFN = derive2 { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; }; NMI = derive2 { name="NMI"; version="2.0"; sha256="1rxphy9rhy9zhdiz48dvl9m26x6k681lnyn39lqxs0a6jhrxg7y3"; depends=[]; }; - NMOF = derive2 { name="NMOF"; version="2.0-1"; sha256="1p3qkgw255wn1xzrjp9bgvblmkpi3ngrv57m88r54s5m90h72z26"; depends=[]; }; + NMOF = derive2 { name="NMOF"; version="2.1-0"; sha256="10dxy35ps8qmyfqhrz0g1yyc30d84wwmf084m94nv0pk87blw7s3"; depends=[]; }; NMVANOVA = derive2 { name="NMVANOVA"; version="1.1.0"; sha256="1jlqyg5vn7j8srvifjghd5a7820kadl8kbwib4qxalrfprq81h8p"; depends=[]; }; - NNLM = derive2 { name="NNLM"; version="0.4.3"; sha256="0p7p26070w2j57z5i89pmpgd470yh2z0rrfzpalzdngc8mzp2rkj"; depends=[Rcpp RcppArmadillo RcppProgress]; }; NNMIS = derive2 { name="NNMIS"; version="1.0.1"; sha256="1w2i4xlx249p589yqdgbx1ra406ycxw729vbk1lqadbn71m6blaz"; depends=[survival]; }; - NNS = derive2 { name="NNS"; version="0.4.8"; sha256="09wdq55i8csnmj72dwm0ksmwnzh81w8ry7s55iq18sh7n3j4npn8"; depends=[data_table doParallel dtw rgl stringr]; }; + NNS = derive2 { name="NNS"; version="0.5.1"; sha256="1mlswbxqinqk5vayfnirrj5q738g76g5h0ws4wnayzcrgqf697a7"; depends=[data_table doParallel dtw rgl stringr]; }; NNTbiomarker = derive2 { name="NNTbiomarker"; version="0.29.11"; sha256="0sqlf7vzhpmq2g98c2qlrcqn3ba4ycfxbczgcjiqqhqsvgkpacc1"; depends=[magrittr mvbutils shiny stringr xtable]; }; NORMA = derive2 { name="NORMA"; version="0.1"; sha256="193q6dwn8v7k8xq0amjpvb3v6mn7c6agqa487gvjj78dy1qz720a"; depends=[rootSolve]; }; NORMT3 = derive2 { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; }; - NORTARA = derive2 { name="NORTARA"; version="1.0.0"; sha256="1q4dmn5q939d920spmxxw08afacs3pzhr2gzwyqa5kn8xiz4ffg8"; depends=[corpcor Matrix]; }; NPBayesImputeCat = derive2 { name="NPBayesImputeCat"; version="0.2"; sha256="0fxcs2l6g1gkvydl04ippkq192jn0zl2c304ww4hczzpvn7l8lsp"; depends=[Rcpp]; }; NPC = derive2 { name="NPC"; version="1.1.0"; sha256="06y6vdln5zyinq9bsp66yz6i1v5bkw9pa2hknl9brwc75z359apn"; depends=[coin dplyr matlab permute]; }; NPCD = derive2 { name="NPCD"; version="1.0-11"; sha256="107i33z4q5w2828sm0pm8234kmp1v3a2w72lmhvi0rpnjhg0x120"; depends=[BB R_methodsS3]; }; @@ -2728,18 +2760,18 @@ in with self; { NPMVCP = derive2 { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; }; NPP = derive2 { name="NPP"; version="0.2.0"; sha256="0zm67b9gs32snsd1knmdmz0ksksdin9cvqrqd94n7g378gdql96y"; depends=[]; }; NPS = derive2 { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; }; - NPflow = derive2 { name="NPflow"; version="0.13.1"; sha256="0sq47frh665m8mibif1w3i2z5pb577v1ngdjirbya0a9chpmwc3s"; depends=[ellipse fastcluster ggplot2 gplots pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; }; + NPflow = derive2 { name="NPflow"; version="0.13.3"; sha256="1bgdkm82pmzjv46pkxpvh5ffffmc6q68x5jjl7k330w9vwgx2kf0"; depends=[ellipse fastcluster ggplot2 pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; }; NPsimex = derive2 { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; }; - NSM3 = derive2 { name="NSM3"; version="1.12"; sha256="0spkzx2zm8q85h7ij9r52bsqlwgw2fsc7zw3aaz8644q0xlnjnvj"; depends=[agricolae ash binom BSDA coin combinat epitools fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; }; + NSM3 = derive2 { name="NSM3"; version="1.14"; sha256="0w6ls6k3m395wka6zl64i0nvxjm9c6b3yyd80f6k9k14lmgivm8p"; depends=[agricolae ash binom BSDA coin combinat fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; }; NSO1212 = derive2 { name="NSO1212"; version="1.0.0"; sha256="1yk07n9ksbazj27sax5jhs5f84zy80awrvkhziclsqm3h1g3h7w5"; depends=[httr jsonlite]; }; NST = derive2 { name="NST"; version="2.0.4"; sha256="0kwdfqr30av50k1s8sdf7714kzq9z1qrg85c3r7ljzrajj16vnl3"; depends=[ape permute vegan]; }; NSUM = derive2 { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; }; NScluster = derive2 { name="NScluster"; version="1.3.4"; sha256="1bkzmm573ic6xrsqbbln865rfw2xnmby632m3jcgamddxppx3fjf"; depends=[]; }; NTS = derive2 { name="NTS"; version="1.1.0"; sha256="0sjzc42whb9wr0w6r8qis89sjcfqwci5wnm3ndxxvfhg6x6skmi3"; depends=[dlm MASS MSwM Rdpack tensor]; }; NUCOMBog = derive2 { name="NUCOMBog"; version="1.0.4.2"; sha256="0s6gm3adc9qdh94pxzgccbxx1f1lbgqyvd4xk37xp6f3b5hwljdz"; depends=[snowfall]; }; - NameNeedle = derive2 { name="NameNeedle"; version="1.2.4"; sha256="1f8hmabwafjmgx2z381a3m84zfrd0s9x51haa4c1phq41yfq2lm5"; depends=[]; }; + NameNeedle = derive2 { name="NameNeedle"; version="1.2.6"; sha256="0cs65hs6fbkxv8pc2m4394c68nqbahjcryjnhhrhg50wam3y03lq"; depends=[]; }; NanoStringNorm = derive2 { name="NanoStringNorm"; version="1.2.1"; sha256="05r1hvrxwi2mcq3pv6b699291qg120ijad96s5dah2f6cwx7gm7j"; depends=[gdata vsn XML]; }; - NatureSounds = derive2 { name="NatureSounds"; version="1.0.1"; sha256="1wd9kngkrxlldkzpvb5gxsbjd8z3m0rbjvbw6ca95zhv37kjz4lh"; depends=[]; }; + NatureSounds = derive2 { name="NatureSounds"; version="1.0.3"; sha256="0db7y6213bkmfjr2r3jkdbx0wja778cgnavap03v7fswrl61w61m"; depends=[knitr tuneR]; }; NbClust = derive2 { name="NbClust"; version="3.0"; sha256="1vwb48zy6ln1ddpqmfngii1i80n8qmqyxnzdp6gbaq96lakl3w3c"; depends=[]; }; NeatMap = derive2 { name="NeatMap"; version="0.3.6.2"; sha256="186y06zrh87q6vixl2da2d6apvcj1zkk79c95k081zj5awmryr9b"; depends=[ggplot2 rgl]; }; NegBinBetaBinreg = derive2 { name="NegBinBetaBinreg"; version="1.0"; sha256="0ryi9gdf4sis77c0qxm6r86mfkk1nq9djs297y64nr6ng3rv9p9d"; depends=[boot Matrix mvtnorm]; }; @@ -2749,7 +2781,7 @@ in with self; { NetComp = derive2 { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvxhlr2c19fig4v4a5c6jhqyfdsd60fsv"; depends=[gdata]; }; NetData = derive2 { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; }; NetIndices = derive2 { name="NetIndices"; version="1.4.4"; sha256="0ydivbri8l8zkxi18ghj9h66915scyhca8i9mcyq4b06mjfigss8"; depends=[MASS]; }; - NetLogoR = derive2 { name="NetLogoR"; version="0.3.6"; sha256="02i9jd6sksxkbnm3ldadp1xfmhkb27n5ahhgs70fg2g5nhc2jxs9"; depends=[abind car CircStats data_table Hmisc matrixStats plyr quickPlot raster rgeos sp SpaDES_tools]; }; + NetLogoR = derive2 { name="NetLogoR"; version="0.3.7"; sha256="0w32sp5lc37bd9fb2wn3lnym82jz3wi24fpdrs33cvkbvry12c04"; depends=[abind car CircStats data_table Hmisc matrixStats plyr quickPlot raster rgeos sp SpaDES_tools]; }; NetMix = derive2 { name="NetMix"; version="0.1.5"; sha256="1s6h5d34fd6brpiank2mpvpscvsgw86zfyq677s8nh8bkrc4idzs"; depends=[clue gtools igraph lda MASS Matrix poisbinom Rcpp RcppArmadillo RSpectra]; }; NetOrigin = derive2 { name="NetOrigin"; version="1.0-3"; sha256="162dhyx7z1nd3z14lfvm3dz0qwwvrc3n17zswbnwcfj6g1b1p2f1"; depends=[colorspace Hmisc igraph]; }; NetPreProc = derive2 { name="NetPreProc"; version="1.1"; sha256="0r51dqymf2nqm86py4zwdlf7qf120j0bg9r6a9c0gsyyijh4z40p"; depends=[graph]; }; @@ -2757,16 +2789,16 @@ in with self; { NetSimR = derive2 { name="NetSimR"; version="0.1.0"; sha256="0iadlvc7m78svkjcwx18pk18jg7dv69gm1cvkz8k2a7b1absd9f5"; depends=[]; }; NetSwan = derive2 { name="NetSwan"; version="0.1"; sha256="1mwdy3ahagiifj2bd1ajrafvnxzi74a1x1d3i2laf1hqpz3fbgld"; depends=[igraph]; }; NetWeaver = derive2 { name="NetWeaver"; version="0.0.6"; sha256="058fi3vbp11mbg69n4yp1zf48akfdl6s2p0qpa0v6ngmk2zjk0bq"; depends=[]; }; - NetworkChange = derive2 { name="NetworkChange"; version="0.5"; sha256="1n4nnnds8m0waa64b1k14ph1jdj26pd6fphsd53ad5lpyglpzq0y"; depends=[abind GGally ggplot2 ggrepel ggvis gridExtra igraph LaplacesDemon MASS MCMCpack mvtnorm network qgraph RColorBrewer reshape rlang Rmpfr sna tidyr]; }; + NetworkChange = derive2 { name="NetworkChange"; version="0.6"; sha256="0p08fwxf99dybx6rgchjqhl9xym4x0hhmwwvmg3gvj5jm7rb4kj0"; depends=[abind GGally ggplot2 ggrepel ggvis gridExtra igraph MASS MCMCpack mvtnorm network qgraph RColorBrewer reshape rlang Rmpfr sna tidyr]; }; NetworkComparisonTest = derive2 { name="NetworkComparisonTest"; version="2.2.1"; sha256="0a4v69p1xykzb4s9sqj2bqm333a6sx2j8f8jdnp3l7dlkwg9clqp"; depends=[IsingFit IsingSampler Matrix qgraph reshape2]; }; NetworkDistance = derive2 { name="NetworkDistance"; version="0.3.2"; sha256="1sd5pnm95l0w3737gyrjxhxvnx4wgz72mw5d5q8vp3vygxagx86h"; depends=[doParallel foreach igraph Matrix network pracma Rcpp RcppArmadillo Rdpack RSpectra]; }; NetworkExtinction = derive2 { name="NetworkExtinction"; version="0.1.1"; sha256="1958kpdcqp4hhkqmfjg2qnrzhwcmfkbgdriq9iyqmmcr7qm8c1y7"; depends=[broom dplyr ggplot2 magrittr network scales sna tidyr]; }; NetworkInference = derive2 { name="NetworkInference"; version="1.2.4"; sha256="1x63szbns8wf3k89ibk2p66prngw4fr2ckfn1568mnxdwnzvhrb4"; depends=[assertthat checkmate ggplot2 ggrepel Rcpp RcppProgress]; }; - NetworkRiskMeasures = derive2 { name="NetworkRiskMeasures"; version="0.1.2"; sha256="0c10nahybjd1n0yr78ynbsdnkfa0p7kz6dx3rbwxwsp3x4mrcd6y"; depends=[dplyr expm ggplot2 Matrix]; }; + NetworkRiskMeasures = derive2 { name="NetworkRiskMeasures"; version="0.1.4"; sha256="1121ma43jxc4p9rw0sc8w32shf9xrmn5qd1xsqgzr8diymc49zhg"; depends=[dplyr expm ggplot2 Matrix]; }; NetworkSim = derive2 { name="NetworkSim"; version="0.1.0"; sha256="1gvhzlmq46p99wald4pjnv9wxxqdympjkh3bzi98qa7qi84lny7y"; depends=[igraph incgraph]; }; - NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.3.3"; sha256="1i9kdwd989l53fcx59yg9ac9bi5calj978pgif0rnz8vv4vvsgm2"; depends=[corrplot doParallel fdrtool foreach igraph IsingFit MASS Matrix pbapply ppcor psych pwr qgraph R_matlab]; }; + NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.4.0"; sha256="1z7qkcj2djxf9bgdhjk7bgfxhb54m013qcsi421lbdjlppsysm7a"; depends=[corrplot doParallel fdrtool foreach igraph IsingFit MASS Matrix pbapply ppcor psych pwr qgraph R_matlab]; }; NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.5.2"; sha256="0d73rbp8v0k0j8dp4yigan7krhglx6qfbadvyg7nsj67xc00vbfd"; depends=[ggplot2 nnet reshape2 scales tidyr]; }; - NeuralSens = derive2 { name="NeuralSens"; version="0.1.3"; sha256="0xgn5x8vjfv0k3skyjm5j9wi0qfnmhdpfmg5q7564zylyjb0kvsh"; depends=[caret fastDummies ggforce ggplot2 gridExtra Hmisc NeuralNetTools reshape2 stringr]; }; + NeuralSens = derive2 { name="NeuralSens"; version="0.2.0"; sha256="08hq653mah2yp3fcx6wvv9cy4kb649ydibq12znxn8yhlws9kk3v"; depends=[caret fastDummies ggforce ggplot2 gridExtra Hmisc NeuralNetTools reshape2 scales stringr]; }; Newdistns = derive2 { name="Newdistns"; version="2.1"; sha256="1b5njkzj8b0wrvvfv904di0933k9d320gadmfm5zl6pzdp34bh1i"; depends=[AdequacyModel]; }; NewmanOmics = derive2 { name="NewmanOmics"; version="1.0.4"; sha256="1ny1w4kwdgfzm4jsj6mf3k0c10bwzwz4gmpb5vg3qffddly9wfaz"; depends=[oompaBase]; }; NightDay = derive2 { name="NightDay"; version="1.0.1.1"; sha256="1gwwxk428gkvci4dhfb3zikvidalpqkl0q2r6qpm58c12j14jk1h"; depends=[maps]; }; @@ -2776,10 +2808,11 @@ in with self; { NlinTS = derive2 { name="NlinTS"; version="1.3.8"; sha256="0wbwn33k774ib2849hr39fh89003jwpzimwlj1082zmjvssblc5c"; depends=[Rcpp Rdpack timeSeries]; }; NlsyLinks = derive2 { name="NlsyLinks"; version="2.0.6"; sha256="1kdqifwjkkk4x1ixg3ca6lbqx79ab907nnzwxca5iw721mbk5njg"; depends=[lavaan]; }; Nmisc = derive2 { name="Nmisc"; version="0.3.5"; sha256="1328sfxhkq1lyx8wx2k112iq9lxhg067gnk36vgxpcsq42vdzycr"; depends=[dplyr magrittr purrr rappdirs rlang stringr tibble tidyselect]; }; + NobBS = derive2 { name="NobBS"; version="0.1.0"; sha256="0i0jyny1c29knpcl4szqwyxvdc3dqjfk5lf2xvwjdx3qas92w03l"; depends=[coda dplyr magrittr rjags]; }; NoiseFiltersR = derive2 { name="NoiseFiltersR"; version="0.1.0"; sha256="0y90si8f5hsi273g10hw700r72la30hwqlwg59gaq76wqlkm8j0p"; depends=[caret e1071 kknn MASS nnet randomForest rJava rpart RWeka]; }; NominalLogisticBiplot = derive2 { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[gmodels MASS mirt]; }; NonCompart = derive2 { name="NonCompart"; version="0.4.5"; sha256="0z2iigr8nsyanx9lnf7hq5d5fbnm1kd3ir2scfhaqafxa8y8byq9"; depends=[]; }; - NonNorMvtDist = derive2 { name="NonNorMvtDist"; version="1.0.1"; sha256="135scrxwm52fg4drxfr8dgwp2jrgdgbi3fq13i4cka3i99bpx4lm"; depends=[cubature]; }; + NonNorMvtDist = derive2 { name="NonNorMvtDist"; version="1.0.2"; sha256="11xqdrx03q3anavyxpzb0hz6mcbdy252rzzjlpa2byfdlrfvn178"; depends=[cubature]; }; NonProbEst = derive2 { name="NonProbEst"; version="0.2.3"; sha256="0wpqsz06c5v42xijh7imv9fxz9p01354pw7s91sjn6m12w2a2d0z"; depends=[caret e1071 sampling]; }; NonpModelCheck = derive2 { name="NonpModelCheck"; version="3.0"; sha256="13qk2wbgpdf763q5xg29p2hxwqpml23pcgxrzmx12vnapnqfh71k"; depends=[dr]; }; Nonpareil = derive2 { name="Nonpareil"; version="3.3.4"; sha256="1hhshcggfv92ll5zqh8hd3pldp07n0684yh1252z2jv2vbl87v3z"; depends=[]; }; @@ -2788,19 +2821,18 @@ in with self; { NormalBetaPrime = derive2 { name="NormalBetaPrime"; version="2.2"; sha256="03il9c57dbwgw38rzckkk0wkc37z8kfdrb7b4k471gm7mqhsm3m3"; depends=[GIGrvg glmnet HyperbolicDist MASS Matrix pracma pscl truncnorm]; }; NormalGamma = derive2 { name="NormalGamma"; version="1.1"; sha256="0r3hhfscif0sx9v8f450yf119gpvf3ilpb8n3ziy4v4qf2jlcfnk"; depends=[histogram optimx]; }; NormalLaplace = derive2 { name="NormalLaplace"; version="0.3-0"; sha256="0njgjdx2yvvy5jb5zn6zr7jdz5hck5bbkicv15z4ai4ibmckqjmh"; depends=[DistributionUtils GeneralizedHyperbolic]; }; - NormalizeMets = derive2 { name="NormalizeMets"; version="0.25"; sha256="0hnyr2aklibbvs6b6q4l0zbb9g8qmp2ds4lqic8a9alqn66sfnf2"; depends=[AUC crmn e1071 GGally ggplot2 htmlwidgets impute knitr limma plotly rmarkdown]; }; NostalgiR = derive2 { name="NostalgiR"; version="1.0.2"; sha256="0rpvwi815sdhaxqpji1y6g0vy8mkn5k6wci0a4jf54pkywwkwrwp"; depends=[txtplot]; }; Nozzle_R1 = derive2 { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; }; - Numero = derive2 { name="Numero"; version="1.4.0"; sha256="11fviqs5smbb33qjqc463w5dz8avmba3243wcadj87j60rclqnri"; depends=[Rcpp]; }; + Numero = derive2 { name="Numero"; version="1.4.2"; sha256="1g9jbgygpr22lbikslkdmf7zphrcw826ijkc567av7c96nr9wkib"; depends=[Rcpp]; }; NutrienTrackeR = derive2 { name="NutrienTrackeR"; version="0.99.2"; sha256="1vzha3ywjbd877fqy3r2xkgi8m44s3ss65bij0vcc4mx8lajhgb5"; depends=[ggplot2]; }; OAIHarvester = derive2 { name="OAIHarvester"; version="0.3-0"; sha256="1c57jxb9n397wdkrirbfh70sxllrg9zsy0np698z7kcx83rz5lqr"; depends=[curl xml2]; }; + OBASpatial = derive2 { name="OBASpatial"; version="1.1"; sha256="1a6n440z50v75ms3lmjsa9z7cz0fkmj3k98wsqhq1s7sazd85am4"; depends=[cubature invgamma LaplacesDemon modeest truncdist]; }; OBMbpkg = derive2 { name="OBMbpkg"; version="1.0.0"; sha256="01wch8wwij3fd0jambk0hpkhlnp4ryrq8qnnr2w1iad9zssjyii5"; depends=[]; }; - OBRE = derive2 { name="OBRE"; version="0.1-0"; sha256="1sxfb8mn0ky8x177l3v6wwcr96h5hfwd718h1akwrpir7acldchl"; depends=[pracma]; }; OBsMD = derive2 { name="OBsMD"; version="5.3"; sha256="10acj6d0nvf1zyirp001c2fhsg2gq33zywnp8w70gm1dk7pgzfzr"; depends=[]; }; OCA = derive2 { name="OCA"; version="0.1"; sha256="0kaf46gic8gp8f98y68kqvgm1baicwgvarfiwry1j0bd2rjad64d"; depends=[]; }; - OCNet = derive2 { name="OCNet"; version="0.1.1"; sha256="0s6r57flkgjj1j5lmgd2w34x0hifx3ia1h9sknk7i6l93w2w0a2y"; depends=[fields igraph rgdal rgl sp spam SSN]; }; - ODB = derive2 { name="ODB"; version="1.1.1"; sha256="1hha4rkbc2zh3karkqa0vn4v0nmcd7sljcymy1nh28bx1gx2ffgs"; depends=[DBI RJDBC]; }; - ODEnetwork = derive2 { name="ODEnetwork"; version="1.3.1"; sha256="0j6kw32hq9gfiwmyh4zxx7ibfxplhass7q309y8r656lkhvr9nin"; depends=[checkmate deSolve]; }; + OCNet = derive2 { name="OCNet"; version="0.2.0"; sha256="00gyc7wgzqal2cgc5g7ssq1bkl44xsl4ia7s4kis9z4wz0slkj7i"; depends=[fields igraph rgdal rgl sp spam SSN]; }; + ODB = derive2 { name="ODB"; version="1.2.1"; sha256="0frkbl99ilpmppm4fm97lbkqhmjgcwlz9j5vh5nzzcsxrh8qwicn"; depends=[DBI RJDBC]; }; + ODEnetwork = derive2 { name="ODEnetwork"; version="1.3.2"; sha256="0wicp0xxqq3jl0kjhc26iqpk8rwa9nv2aiwf18pkgnqxbyw6lgnp"; depends=[checkmate deSolve]; }; ODEsensitivity = derive2 { name="ODEsensitivity"; version="1.1.2"; sha256="0yddv5h3y0xfviqjgrbixawd00jc1rh9ngckfqka5j855vhchh66"; depends=[checkmate deSolve ODEnetwork sensitivity]; }; ODS = derive2 { name="ODS"; version="0.2.0"; sha256="0i7giibass7hadvv6mb7k9xrykgfss57jmm6gpbym8qcywhzq4ny"; depends=[cubature survival]; }; OData = derive2 { name="OData"; version="0.6"; sha256="10r4kfhdabramjmkgc4fl0bljaiqbvc7rq4byas7q8cmji2czw6f"; depends=[RJSONIO XML]; }; @@ -2811,7 +2843,7 @@ in with self; { OLScurve = derive2 { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhmlgplkphw1bdia4cyi9q6iwcppw3rjw75f1n"; depends=[lattice]; }; ONETr = derive2 { name="ONETr"; version="1.0.3"; sha256="14l56qcmyyk2ivcfkfv7j2k4i1mfrngpi9zcc88w6xfhz5qlb548"; depends=[plyr RCurl XML]; }; OOBCurve = derive2 { name="OOBCurve"; version="0.3"; sha256="1i7prybs3b60ipl34zrq6mcr6w9kc1d44b14mxcd752k42k6xs2r"; depends=[mlr randomForest ranger]; }; - OOR = derive2 { name="OOR"; version="0.1.2"; sha256="1zw7g0365znyn828qqsn83l2a837wwj9cx7dzcbns28vhqmsn6hm"; depends=[]; }; + OOR = derive2 { name="OOR"; version="0.1.3"; sha256="13v04rx2q6pbiq7dyd29wvimkr4sbq2f5rnn3a0lcbwr3x35r7h9"; depends=[]; }; OOmisc = derive2 { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; }; OPDOE = derive2 { name="OPDOE"; version="1.0-10"; sha256="04z944i4f3i0cjnxh32wf7n2dfyynnvkz4lxdkn90flam2np58yv"; depends=[crossdes gmp mvtnorm nlme orthopolynom polynom]; }; OPI = derive2 { name="OPI"; version="2.9"; sha256="0nkdzl4c6k77phiig3mjwp9dkyarcr4k07mxc6ff72yr776s2pma"; depends=[]; }; @@ -2825,36 +2857,35 @@ in with self; { OSMscale = derive2 { name="OSMscale"; version="0.5.1"; sha256="0rjhyhh1iafgd9h1pbd2clyg2sh0gg7y1aqmiislqyn6h6jrvgqn"; depends=[berryFunctions OpenStreetMap sp]; }; OSNMTF = derive2 { name="OSNMTF"; version="0.1.0"; sha256="0g83wqh97iz3g4ganj2dy3biyn8cmb0v8zz6rydald1hfszj8aa2"; depends=[dplyr MASS]; }; OSTSC = derive2 { name="OSTSC"; version="0.0.1"; sha256="0p92w25xvajsn44rd5hg1m7l9l4m0rpmw175nnqr438432hqh7cc"; depends=[doParallel doSNOW fields foreach MASS]; }; - OTE = derive2 { name="OTE"; version="1.0"; sha256="18w483syhs523yfib9sibzmj16bypqxk4sc4771kfr1958h3igai"; depends=[randomForest]; }; + OTE = derive2 { name="OTE"; version="1.0.1"; sha256="0jvvrrfhpc5kibbxrd5r4dj97jp5m072fxnkpcyz11gi65db3z4g"; depends=[randomForest]; }; OTRselect = derive2 { name="OTRselect"; version="1.0"; sha256="1bh14228yz552ngywjf1qyh1isqj4cgiy7n7d4zg8dpqwxr04ykp"; depends=[lars survival]; }; OTUtable = derive2 { name="OTUtable"; version="1.1.2"; sha256="1sm037ihm12xyp7ns5f0c1psflvm1aj3xnsj5nzh2rsjn35hvd6h"; depends=[]; }; OTclust = derive2 { name="OTclust"; version="1.0.2"; sha256="1nrgjn13nbki59i51m28h3z0bppmvcp7qgv09h2r2vvdk858iy9z"; depends=[class ggplot2 magrittr RColorBrewer Rcpp]; }; OUwie = derive2 { name="OUwie"; version="1.57"; sha256="0faqyvap8jcz6k08k71lszns2h67csgd7q4s12fml153fm3lsjx9"; depends=[ape corHMM corpcor expm geiger lattice nloptr numDeriv paleotree phangorn phytools Rmpfr]; }; OWEA = derive2 { name="OWEA"; version="0.1.1"; sha256="00mx94v3krivsxha6sh13xhn2bdj77g8858vc4r2cy23ab4bg0g7"; depends=[gtools MASS shiny]; }; Oarray = derive2 { name="Oarray"; version="1.4-9"; sha256="04jng89s19rd8lbjm76wm4p4ggkffwnsa5qa60c4lwn2rj89a8a1"; depends=[]; }; - OasisR = derive2 { name="OasisR"; version="3.0.1"; sha256="1qc5zdxjdfayr9x239rrpc27rqnildix0mvc7p13ik5gzzddsxqr"; depends=[measurements outliers rgdal rgeos seg spdep]; }; Observation = derive2 { name="Observation"; version="0.2.0"; sha256="0v81manzcvv8x9hbf75c8klslzdabha53rasyba91vvcbrshhq6j"; depends=[AGread svDialogs]; }; OceanView = derive2 { name="OceanView"; version="1.0.5"; sha256="11gq15v3blisplbi6q6jgfsjbnbmfnyxdz8pq1ny9vgljzninvn1"; depends=[plot3D plot3Drgl rgl shape]; }; Ohit = derive2 { name="Ohit"; version="1.0.0"; sha256="132d4drc2phw9ppxnczb1ycdg3dv085k8p6bcaj3v866j0hfxjgb"; depends=[]; }; - OjaNP = derive2 { name="OjaNP"; version="0.9-12"; sha256="170hn5gx48n0i16cd5rwzs5inb4hsvqb7zwixxsg7pami6ild0vs"; depends=[ICS ICSNP Rcpp]; }; + OjaNP = derive2 { name="OjaNP"; version="1.0-0"; sha256="0xddspnnwlcxh2i66ilh6i920k53y7fv6m1hgj9h28qg2wy0vyah"; depends=[ICS ICSNP Rcpp]; }; OligoSpecificitySystem = derive2 { name="OligoSpecificitySystem"; version="1.3"; sha256="17mspf1ph2ybv046zckykfdcbrsiz40hrs6ib5mpwkfnrvsp1w7l"; depends=[tkrplot]; }; OmicKriging = derive2 { name="OmicKriging"; version="1.4.0"; sha256="08frr38yf5d0l3zwkbq9465xrbyzsn8sx9icqc3yvfnxrkhrpzig"; depends=[doParallel foreach irlba ROCR]; }; OmicsPLS = derive2 { name="OmicsPLS"; version="1.2.0"; sha256="108rp76g4cy7zaxv9q979rlv4pn9kb5i3f3iz29cdvxm55a55khv"; depends=[ggplot2 magrittr tibble]; }; Omisc = derive2 { name="Omisc"; version="0.1.2"; sha256="0ww83srfc7vr1gw2aaa5bahs6lvm11j4057hn06pclz1wb6fnbyw"; depends=[copula MASS psych]; }; OmnibusFisher = derive2 { name="OmnibusFisher"; version="1.0"; sha256="0x3q04g45nixgsrl4biqqi6bk4kx79spq5whm3n4ppr0nkv8dw4h"; depends=[CompQuadForm stringr survey]; }; OnAge = derive2 { name="OnAge"; version="1.0.1"; sha256="1zby5sf92c185b5m19jv4ndgbv6mz107nc47zn1d6bijrypzpc20"; depends=[]; }; - OncoBayes2 = derive2 { name="OncoBayes2"; version="0.5-8"; sha256="1nww1bshjg04zamh2jgmallm97xhdqs8vs7pbf3x8a7p2i3lcvnm"; depends=[abind assertthat bayesplot BH checkmate dplyr Formula ggplot2 RBesT Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; }; + OncoBayes2 = derive2 { name="OncoBayes2"; version="0.6-4"; sha256="15l15yz547drhj7j02wq1qiqh74b3fivsmpzabhfc6ipblzil3vs"; depends=[abind assertthat bayesplot BH checkmate dplyr Formula ggplot2 RBesT Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; }; Oncotree = derive2 { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; }; OneArmPhaseTwoStudy = derive2 { name="OneArmPhaseTwoStudy"; version="1.0.3"; sha256="0q8g33s1jq0ipvwq83xhrly8idsh68licgyivxc628zbm1id5p38"; depends=[Rcpp]; }; OneR = derive2 { name="OneR"; version="2.2"; sha256="1k7rzhcwq5b2yi4zfsc1r0yb6w65gxj9835d2a1dclallja3zav2"; depends=[]; }; OneTwoSamples = derive2 { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f4jmbm6sinkvalvjqwi822x78aiin88kg8qbbb5ml8l89"; depends=[]; }; - OpVaR = derive2 { name="OpVaR"; version="1.0.5"; sha256="14kq95i8n0g1wy3s32llw3803qzkxlyz9307clc1bwzi0wp22x5f"; depends=[actuar evmix goftest MASS pracma ReIns tea truncnorm vcd VineCopula]; }; OpasnetUtils = derive2 { name="OpasnetUtils"; version="1.3"; sha256="0mmn4dpk1wl8slg55xzhpk7jdwhkrka53rwmrsr73sikkh3mcyfn"; depends=[digest ggplot2 httpRequest igraph plyr RCurl reshape2 rgdal rjson sp triangle xtable]; }; - OpenCL = derive2 { name="OpenCL"; version="0.1-3.1"; sha256="0vxfsvin35idgvmc22178bq0r5193pdzba3wwv9djz52fzbj7zys"; depends=[]; }; + OpenCL = derive2 { name="OpenCL"; version="0.2-1"; sha256="1bhnqwrb8phldk5hr06iyvw8fx03x01ddqr4y5zs4a1wpyah7j2w"; depends=[]; }; OpenImageR = derive2 { name="OpenImageR"; version="1.1.6"; sha256="1yl7xvb86vxyf8d5g58hhmrva0gyg8iabb9npsdlnl8j0bg5gfiw"; depends=[jpeg png R6 Rcpp RcppArmadillo shiny tiff]; }; + OpenLand = derive2 { name="OpenLand"; version="1.0.1"; sha256="1wa7hkfwvzzj9lm07hdajwf6g8ys3g2ff8vqva3gqwqa9j1fam9n"; depends=[circlize dplyr ggplot2 gridExtra networkD3 raster tidyr]; }; OpenML = derive2 { name="OpenML"; version="1.10"; sha256="132swv22ymm0wxq8y65y2niq8chmga1mnl1lgn6m3cgljvwad47r"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise stringi XML]; }; OpenMPController = derive2 { name="OpenMPController"; version="0.2-5"; sha256="00hs8v47pr2d726z8izkfrgmayw147hdm16rr9rw1zs3ad216zjj"; depends=[]; }; - OpenMx = derive2 { name="OpenMx"; version="2.15.5"; sha256="1wbzhmyb1lnk39dkcyccmblxvniwsghh0jd94x05pk6yrcq8im5v"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; }; + OpenMx = derive2 { name="OpenMx"; version="2.17.3"; sha256="1s2pcg281ag3qz2wz8yi826f2d3kj3qg916js7zz0nsrljcyv5bc"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; }; OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.12"; sha256="02p9b2y99z9yrrm2pl86p0yqwah0yjic2wdcd4k0mhccimmmkaip"; depends=[abind colorspace GPArotation openxlsx plyr psych pvclust rgl stringr XML]; }; OpenStreetMap = derive2 { name="OpenStreetMap"; version="0.3.4"; sha256="0kyv14lxi86n6aba4jqmsfpmn075k0ki34q6gkkvhq8yv48wg831"; depends=[ggplot2 raster rgdal rJava sp]; }; Opportunistic = derive2 { name="Opportunistic"; version="1.2"; sha256="0kaj11ziij1v65l972x4kbr7vzkx4dwa27ymabiip4dg57a976wr"; depends=[]; }; @@ -2863,14 +2894,14 @@ in with self; { OptHedging = derive2 { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; }; OptInterim = derive2 { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[clinfun mvtnorm]; }; OptM = derive2 { name="OptM"; version="0.1.3"; sha256="1dykfhnkrqz2axzzggpzaiknd52rx8zj4nk3nv2rvh74f9hv8px7"; depends=[boot SiZer]; }; - OptSig = derive2 { name="OptSig"; version="2.0"; sha256="1d5baq6zq5vkklg8sabzs9kril95swvqd6fzkfywixsqnyywcvvm"; depends=[pwr]; }; + OptSig = derive2 { name="OptSig"; version="2.1"; sha256="1k43qsjdc00plgsindjkfn6v098v0zfy7sjkh4n4ybib2qx3v8fn"; depends=[pwr]; }; OptimClassifier = derive2 { name="OptimClassifier"; version="0.1.5"; sha256="1j2svfy5lzvz5vazpf55fvzqy5kk0l47x8qfy6j2jz1dc3gjh2rs"; depends=[clisymbols crayon dplyr e1071 ggplot2 lme4 lmtest MASS nnet nortest rpart]; }; OptimaRegion = derive2 { name="OptimaRegion"; version="1.1"; sha256="1bikc12a5v3q7f26r14pdfmnxpyqzxa94a10mx5g954km3a329ly"; depends=[boot DepthProc fields geometry magrittr mclust nloptr Rdpack Rdsdp rsm spam stringr]; }; OptimalCutpoints = derive2 { name="OptimalCutpoints"; version="1.1-4"; sha256="0n2vmzkc733yzs155zdj2n8ng74x9hy4m91fl7fac8d4gnrnc8yg"; depends=[]; }; OptimalDesign = derive2 { name="OptimalDesign"; version="1.0.1"; sha256="02vxxb25q7fl73y7zq0a89ra0s88wji4mrql7p88014p073lj2as"; depends=[lpSolve Matrix matrixcalc matrixStats plyr quadprog rgl]; }; OptimalTiming = derive2 { name="OptimalTiming"; version="0.1.0"; sha256="1mchb7wdk1v56la30ivi40aq6zma64lrdb94d64d0s7x67m8315w"; depends=[mstate survival]; }; OptionPricing = derive2 { name="OptionPricing"; version="0.1"; sha256="0j98h3fn29xfv7xyp7av459v56chw99pnvmsbqvrv4g77p60f5q2"; depends=[]; }; - Orcs = derive2 { name="Orcs"; version="1.2.0"; sha256="0fwji4w2089zlcjbsbz9pmy54ryl4y10kxms836v1dxrjc5az3sp"; depends=[bookdown knitr lattice latticeExtra plotrix raster Rcpp remotes rgdal sf sp]; }; + Orcs = derive2 { name="Orcs"; version="1.2.1"; sha256="0n693m8z0j4irk9zj6d1gpbn2vhfbfpf7z6iyx19iim3g242823q"; depends=[bookdown knitr lattice latticeExtra plotrix raster Rcpp remotes rgdal sf sp]; }; OrdFacReg = derive2 { name="OrdFacReg"; version="1.0.6"; sha256="16mavsmp6d8rfmimmp5ynwyzir0gycpg8rhd8cwanlrndyclqlpv"; depends=[eha MASS survival]; }; OrdMonReg = derive2 { name="OrdMonReg"; version="1.0.3"; sha256="1xca8pvvq79j484l2rmn4nva8ncx8z51g5diljikck231y8qjqaz"; depends=[]; }; OrdNor = derive2 { name="OrdNor"; version="2.2.1"; sha256="01w97ssdi6m6sdc0n3rvd9h42nri5ba1kzwb1643pijcgz3vl2b8"; depends=[corpcor GenOrd Matrix mvtnorm]; }; @@ -2882,21 +2913,19 @@ in with self; { OutlierDC = derive2 { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[Formula quantreg survival]; }; OutlierDM = derive2 { name="OutlierDM"; version="1.1.1"; sha256="0n8iq464ryc3v4wms7cdka39870w5pg29z9v8gmdsp4d9cfsx9v4"; depends=[MatrixModels outliers pcaPP quantreg]; }; OutlierDetection = derive2 { name="OutlierDetection"; version="0.1.1"; sha256="0z4797j2gr37c1jnhivczff3y2dd2kilyncc087ihpwaa26wv0nl"; depends=[DDoutlier depth depthTools ggplot2 ldbod plotly spatstat]; }; - OutliersO3 = derive2 { name="OutliersO3"; version="0.6.2"; sha256="197r5mxvg968hisgqsd0p1sxjsakmn27gpsh3qx3cnvs1pikj3dr"; depends=[cellWise dplyr FastPCS forcats GGally ggplot2 HDoutliers memisc rlist robustbase robustX tidyr]; }; + OutliersO3 = derive2 { name="OutliersO3"; version="0.6.3"; sha256="165v572w9bnvay9f0xyxzbhgj1i86ndia4rzqy98i48dfdbdb990"; depends=[cellWise dplyr FastPCS forcats GGally ggplot2 HDoutliers memisc rlist robustbase robustX tidyr]; }; OutrankingTools = derive2 { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; }; OwenQ = derive2 { name="OwenQ"; version="1.0.3"; sha256="0kra8pvz21kqwzwsrqh6vwfyq9qqrar3glcycd2gip19273whdim"; depends=[BH Rcpp RcppEigen RcppNumerical]; }; OxyBS = derive2 { name="OxyBS"; version="1.5"; sha256="11l3gm0jvw993jb13f6kpv77m6z0d1jswscma2v28qzkw053r3dc"; depends=[]; }; - PAC = derive2 { name="PAC"; version="1.1.1"; sha256="07f83i43nxf1s2c26kkpcv4iyq517w20y1l7yg41wnmbfi9xlk7s"; depends=[dplyr ggplot2 ggrepel igraph infotheo parmigene Rcpp Rtsne]; }; - PACBO = derive2 { name="PACBO"; version="0.1.0"; sha256="1v3j5bgvf0wh8s4d2yyz0fkc3acdwjlicwnbh1r241b1742x79cb"; depends=[mnormt]; }; + PAC = derive2 { name="PAC"; version="1.1.2"; sha256="1xh8y6ypicfabfm7kv0l4074mskjbcvyv5y13r10g5b7gqk35vkz"; depends=[dplyr ggplot2 ggrepel igraph infotheo parmigene Rcpp Rtsne]; }; PACLasso = derive2 { name="PACLasso"; version="1.0.0"; sha256="1qzzymhfsjy8mk0r0xpd5h4wrx4wk8gq3vi6fnawkq5xkrg26rld"; depends=[lars limSolve MASS penalized quadprog]; }; - PACVr = derive2 { name="PACVr"; version="0.8.2"; sha256="0bqv0zhcyp5v1wln11kkvygdwd70yrixd9cbm5fvjqkmmdvmnrv0"; depends=[BiocGenerics genbankr optparse RCircos]; }; - PAFit = derive2 { name="PAFit"; version="1.0.1.6"; sha256="134dl2hdk8nk0bkjzlln1k9q07m9cfnxqgs4p9sk4r6rwxza5xpg"; depends=[igraph knitr magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; }; - PAFway = derive2 { name="PAFway"; version="0.1.2"; sha256="1sdfw9j6pzbnnhh3ghx7vkynd3523ayaimmpkidb300hdkblln6a"; depends=[GGally ggplot2 gplots igraph network scales sna]; }; + PACVr = derive2 { name="PACVr"; version="0.9.2"; sha256="0pn4k1yxja0blc89ksmhn7pwn3p647hvn6zmi7d0k47dfzy5rch5"; depends=[BiocGenerics Biostrings genbankr GenomicAlignments optparse RCircos]; }; + PAFit = derive2 { name="PAFit"; version="1.0.1.8"; sha256="12rqf7mcbsc4ngq75gw8nrllqc2nd9l5p8jdnx6gjn26ldydg6h6"; depends=[igraph knitr magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; }; + PAFway = derive2 { name="PAFway"; version="0.1.3"; sha256="1ggmqbls8i5zqihzi66kaw09bbip2spiiizfzkx7amcvpm8zsr7r"; depends=[GGally ggplot2 igraph network scales sna]; }; PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; }; PAGWAS = derive2 { name="PAGWAS"; version="2.0"; sha256="0bz47ivd32kx1amgqllqbxyyvj773q7wasgk924hmibabiixa8nx"; depends=[foreach lars mnormt]; }; - PAMA = derive2 { name="PAMA"; version="0.1.0"; sha256="19mz37h1kcfff7fkshg6qzgwm9vqgbzwjkcs5ydd1v6xq37lzapm"; depends=[mc2d PerMallows]; }; + PAMA = derive2 { name="PAMA"; version="0.1.1"; sha256="0iwfak74422gmfciin940rkqg7m2dkzv0d52jrkk0i6z58rhs426"; depends=[mc2d PerMallows]; }; PANDA = derive2 { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster GO_db]; }; - PANICr = derive2 { name="PANICr"; version="1.0.0"; sha256="167s1p7y8mmhcdnng0s5i09kjfh088jhmxs74rkyda52l9hyx363"; depends=[coda MCMCpack xts]; }; PARSE = derive2 { name="PARSE"; version="0.1.0"; sha256="0y408va1rfn3j8cb1i0k8kypyg9mb6yfj513l54f23z31d3bi45m"; depends=[doParallel foreach gplots mvtnorm]; }; PAS = derive2 { name="PAS"; version="1.2.5"; sha256="175p3bnpnhknfsc29hri0l2ipz1x6qcxs2bq7awns8lccam466r2"; depends=[glmnet]; }; PASWR = derive2 { name="PASWR"; version="1.1"; sha256="1rxymnqvflypc6m62f5vw65l8x1m2yah7r11hhpmzdq2l2sg8fci"; depends=[e1071 lattice MASS]; }; @@ -2918,17 +2947,18 @@ in with self; { PCA4TS = derive2 { name="PCA4TS"; version="0.1"; sha256="1qi9nlaf5181afrdvddh10a9vxyhry102n3dhai86im8yz4if9y6"; depends=[tseries]; }; PCA4you = derive2 { name="PCA4you"; version="1.2.4"; sha256="117wb0h4jqjymm1p90m6vgj713iavrmj035c2gz5nynligvfnm83"; depends=[mixOmics]; }; PCADSC = derive2 { name="PCADSC"; version="0.8.0"; sha256="0pwkmmnsw3c6ch2k5wdc8ig71994pdp79v3a5aa9n9aq55a8c2ir"; depends=[ggplot2 Matrix pander reshape2]; }; + PCAmatchR = derive2 { name="PCAmatchR"; version="0.1.6"; sha256="0q4cs9212k1rmmgqy6lq99r6zb96iryszwh0d1xvg03gy7v1xn61"; depends=[]; }; PCAmixdata = derive2 { name="PCAmixdata"; version="3.1"; sha256="0flrsnbchwk06dmkg3vqykp9n4pqs265szn1r10navp8ki3rrmvh"; depends=[]; }; PCDSpline = derive2 { name="PCDSpline"; version="1.0"; sha256="15kmvcwvwlsr1107n7mfajvf9b1kcslnhsdx0drjjhsvq193qrqa"; depends=[matrixcalc nleqslv]; }; PCDimension = derive2 { name="PCDimension"; version="1.1.11"; sha256="0kpw0rpb9k82psfpd19vvvsakvm0pcz1n3kkkcihagp1kzlv4xkw"; depends=[changepoint ClassDiscovery cpm kernlab oompaBase]; }; PCFAM = derive2 { name="PCFAM"; version="1.0"; sha256="196jzv0f6j60zkyagm9n98339ipn8mrhmhl3q4g053z8f6mm9zmv"; depends=[]; }; PCGSE = derive2 { name="PCGSE"; version="0.4"; sha256="0ky1nzhz6v9n34kas9nw2scc6ip7av19g09zcsxaa9436nhip4f6"; depends=[MASS RMTstat safe]; }; PCICt = derive2 { name="PCICt"; version="0.5-4.1"; sha256="17ipmv6ps7c9dv4k9kxjjynnlgr63baz9z9ndwfg0lckc3vw81ya"; depends=[]; }; - PCIT = derive2 { name="PCIT"; version="1.5-3"; sha256="0gi28i2qd09pkaja4w7abcl7sz43jnk98897vc2905fnk9nks65j"; depends=[]; }; PCMBase = derive2 { name="PCMBase"; version="1.2.11"; sha256="010188p7f4nr5jxayq02a8q2r23a9w9rd6njxckca99d903cpwg5"; depends=[ape data_table expm ggplot2 mvtnorm xtable]; }; + PCMBaseCpp = derive2 { name="PCMBaseCpp"; version="0.1.9"; sha256="0k40mxs8w1vk7qwpkv8gnq6cq3kpj7wvf0i6f1qn1wmm2vvz1kfy"; depends=[abind data_table PCMBase Rcpp RcppArmadillo]; }; PCMRS = derive2 { name="PCMRS"; version="0.1-1"; sha256="10n4am4qm23aaghf8awv2llcq7392s62yr6mf5h8nf18hfz29wrn"; depends=[cubature ltm mvtnorm Rcpp RcppArmadillo statmod]; }; PCPS = derive2 { name="PCPS"; version="1.0.7"; sha256="0gxymz0yws1q1bxkpxi0lmbv57xx62h3dl7z3i2cnbagswkax3zh"; depends=[ape nlme phylobase picante RcppArmadillo SYNCSA vegan]; }; - PCRedux = derive2 { name="PCRedux"; version="1.0-4"; sha256="1p62brjmvpahxksjnmlfp8flk4yscpvl0g0j5alwp6wqndn2qxcl"; depends=[bcp changepoint chipPCR ecp fda_usc MBmca pbapply pracma qpcR robustbase shiny zoo]; }; + PCRedux = derive2 { name="PCRedux"; version="1.0-6"; sha256="0s7g6y8iw4w42ihpiqqhbgwaf4fim91pwsp8hh7fh5nawj2wg9k7"; depends=[bcp changepoint chipPCR ecp fda_usc MBmca pbapply pracma qpcR robustbase shiny zoo]; }; PCS = derive2 { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[multtest statmod]; }; PCSinR = derive2 { name="PCSinR"; version="0.1.0"; sha256="1z8yjryw3c43vc6fxcwiindmyq6r63pc1zr3aybwmys6mv697bb4"; depends=[]; }; PCovR = derive2 { name="PCovR"; version="2.7"; sha256="00920h0qlw81vwh46inmvm4mdv0dfd8xvqvrj7l038hhmjb7qsjz"; depends=[GPArotation MASS Matrix ThreeWay]; }; @@ -2944,37 +2974,36 @@ in with self; { PEMM = derive2 { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; }; PGEE = derive2 { name="PGEE"; version="1.5"; sha256="1qcxbqnbpplnfjy83nm9fj9y4abzgbxnsggzx7ix3vb9qs18cdwh"; depends=[MASS mvtnorm]; }; PGM2 = derive2 { name="PGM2"; version="1.0-1"; sha256="03282pcq7gw47awc2mxjsbz6w3zpqjhqd7fzg8la4p00cd0vvmr4"; depends=[]; }; - PGRdup = derive2 { name="PGRdup"; version="0.2.3.4"; sha256="1arviyjmvbkiv4fwfs155360p3fnfqsdnhrjdn0r2pgzmsb66i1y"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; }; + PGRdup = derive2 { name="PGRdup"; version="0.2.3.5"; sha256="11lq2l0j6l3ixi3fmz2gd0idypl18gkhqfwbgg41gzzwj92lsrq4"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; }; PHENIX = derive2 { name="PHENIX"; version="1.3.1"; sha256="1gd9ycrwawi81al4f5v559km1112giwqnwvvk8ynj4kdb5bqpyq4"; depends=[ppcor SuppDists]; }; - PHEindicatormethods = derive2 { name="PHEindicatormethods"; version="1.2.0"; sha256="1x7wf1yhl2yvdmgv88z7ak6ihdjhyrm81wphnk2wpgsg6b4m9g12"; depends=[broom dplyr purrr rlang tidyr]; }; - PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.10"; sha256="17q760k5519alr2skvpnghz3c9jgw07lh5fpw4xf6hjk3qlqq82c"; depends=[]; }; + PHEindicatormethods = derive2 { name="PHEindicatormethods"; version="1.3.1"; sha256="1q07jah44iajyrxqavxlgm752b46bjy5qcc6a36qjd6nbgx60ajh"; depends=[broom dplyr purrr rlang tibble tidyr]; }; + PHInfiniteEstimates = derive2 { name="PHInfiniteEstimates"; version="1.3"; sha256="097a1wqh6c8y0ny6ikpkfqym4fw2vz7rrhqpf6xfb71vf3big90k"; depends=[coxphf lpSolve mlogit Rdpack survival]; }; + PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.11"; sha256="1fq2ny093b4881nwgj6wr8qd5g4dcxb51sdx40ndyxxpq6jj16n9"; depends=[]; }; PHeval = derive2 { name="PHeval"; version="0.5.4"; sha256="06fy5dm4mnp29f01163rw1d1hyl7rlcp4pfw18s87ckpr931qyma"; depends=[survival]; }; - PIGE = derive2 { name="PIGE"; version="1.1"; sha256="0pc24rvvxzpgrsx7xsj98n5vd462hjggakzwp36qdkib69yyr4bn"; depends=[ARTP snowfall survival xtable]; }; PIGShift = derive2 { name="PIGShift"; version="1.0.1"; sha256="115dnsh4b1rxx1d2kc8x3vl5366h5f0i6gg8l1w3v0f8309qigis"; depends=[ape mvtnorm]; }; - PINSPlus = derive2 { name="PINSPlus"; version="2.0.0"; sha256="0glyc9hw3s87h38r4wp8mgk9gqm4x408yf5iaf1yk5yjg9yqb1a1"; depends=[cluster doParallel entropy foreach pbmcapply]; }; + PINSPlus = derive2 { name="PINSPlus"; version="2.0.2"; sha256="0i7fl5ns8i9vdgdb10nqljxqfl2xsnmshvyibp141ashp78hxwna"; depends=[cluster doParallel entropy FNN foreach irlba matrixStats mclust Rcpp RcppArmadillo RcppParallel]; }; PIPS = derive2 { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; }; - PK = derive2 { name="PK"; version="1.3-4"; sha256="1zkjq64p34gzbsbmbdqphssnplzz65wpl486qf4yhawnb4wnkj1v"; depends=[]; }; - PKI = derive2 { name="PKI"; version="0.1-5.1"; sha256="1xs3jxbczhkxnp7cyw2yh1jcwha92y9pdsbka1ligbla70bnvxyj"; depends=[base64enc]; }; - PKNCA = derive2 { name="PKNCA"; version="0.9.1"; sha256="0b9ar6d487b7klvavv6c10q9a8q6ads8bv9x3pb5359jxbfilm3q"; depends=[digest dplyr nlme rlang tidyr]; }; - PKPDmisc = derive2 { name="PKPDmisc"; version="2.1.1"; sha256="1p47zdhilprzcwarfmisq7g7znr73wgxns43mn3d7w5sv671mygv"; depends=[BH data_table dplyr ggplot2 lazyeval magrittr purrr Rcpp readr rlang stringr tibble]; }; + PK = derive2 { name="PK"; version="1.3-5"; sha256="1wzz2qv6h6nc2hcsg4098951i608xbbhc9f9ngamfigh5sbmzbh6"; depends=[]; }; + PKI = derive2 { name="PKI"; version="0.1-7"; sha256="1y02s9g883b2i0ma5n4bz2ik06b9y7y75yhcdilmln2f9p9jyrr1"; depends=[base64enc]; }; + PKNCA = derive2 { name="PKNCA"; version="0.9.3"; sha256="0dbhzdbmcxvia21gn7mqmx7rinykyya2605nnrb7vbw1w6r1sjdv"; depends=[digest dplyr nlme rlang tidyr]; }; + PKPDmisc = derive2 { name="PKPDmisc"; version="2.1.2"; sha256="1cw0bfjwd1h1wbnb66271r1q0j205bdgpd4mdhn0nnigdjlxv549"; depends=[BH data_table dplyr ggplot2 lazyeval magrittr purrr Rcpp readr rlang stringr tibble]; }; PKPDmodels = derive2 { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; }; - PKconverter = derive2 { name="PKconverter"; version="1.3"; sha256="1ddhj1qwdwr6g89q55l9njm1ms1wr80d56klz50ai9xvb91qzn89"; depends=[shiny shinydashboard shinythemes]; }; + PKconverter = derive2 { name="PKconverter"; version="1.5"; sha256="1zk2sjrjhq7n2k2p29r2qc6qdghr3riyjvvawz0g74lidg7hm1ly"; depends=[shiny shinydashboard shinythemes]; }; PKgraph = derive2 { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 lattice proto rggobi RGtk2]; }; PKreport = derive2 { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[ggplot2 lattice]; }; PLIS = derive2 { name="PLIS"; version="1.1"; sha256="0b81s7677wglqvv1b5lx8k2iaks09kz0wrl07245a7j2pk9nxv7p"; depends=[]; }; PLMIX = derive2 { name="PLMIX"; version="2.1.1"; sha256="05mnzsi7y71cvg50qx8hp4m31gqslldl34k41r1f8npyb6ldpdca"; depends=[abind coda foreach ggmcmc ggplot2 gridExtra gtools label_switching MCMCpack PlackettLuce pmr prefmod radarchart rankdist rcdd Rcpp reshape2 StatRank]; }; - PLNmodels = derive2 { name="PLNmodels"; version="0.9.4"; sha256="1a2rdh4hz6pj28ahzwygyd5l44wcsqhsl4rqrnbnlnzabvs6fp9n"; depends=[corrplot dplyr ggplot2 glassoFast gridExtra igraph magrittr MASS Matrix nloptr R6 Rcpp RcppArmadillo tidyr]; }; + PLNmodels = derive2 { name="PLNmodels"; version="0.9.5"; sha256="0a80jjswdca3h1hkp39smavwbq47s0ydp04nb5jcj4yy4v1b9rx5"; depends=[corrplot dplyr ggplot2 glassoFast gridExtra igraph magrittr MASS Matrix nloptr R6 Rcpp RcppArmadillo tidyr]; }; PLRModels = derive2 { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00kxf19jmjsc8cy6cc9q2mjqf8z7690wrg7hb"; depends=[]; }; PLSbiplot1 = derive2 { name="PLSbiplot1"; version="0.1"; sha256="1l8d1k913ic0qwxvrrd447p5ni3mzc6v9lv45b7vqrpzkxdci6gy"; depends=[]; }; PLmixed = derive2 { name="PLmixed"; version="0.1.4"; sha256="1plkcv7k6jijywhxrsx2lxcbavzvagzl8wnz132nqq619wvb57ia"; depends=[lme4 Matrix numDeriv optimx]; }; PLordprob = derive2 { name="PLordprob"; version="1.1"; sha256="1g23h3121g9csr85falm6vgzbva42wz3skhfr2rxmvlc3ca4afyp"; depends=[mnormt]; }; - PMA = derive2 { name="PMA"; version="1.2"; sha256="0cmhkkkgwxi52cprxpx8kljfaz1a3pcinwcjp17b9j9xd9nd0kkv"; depends=[]; }; + PMA = derive2 { name="PMA"; version="1.2.1"; sha256="1rhiylm3jfarnqdkv7nwg536sgsa30ic80dk9byks9w0wf4mn59s"; depends=[]; }; PMCMR = derive2 { name="PMCMR"; version="4.3"; sha256="09bvdj2h1086r2cgy3myrhlylplxxlliv8nwx09c8kb1vn02i2ij"; depends=[]; }; - PMCMRplus = derive2 { name="PMCMRplus"; version="1.4.2"; sha256="0n71q8kcmk1ibqn0fq9p60xrxx1dg7hszn11i51cmsx9695wwk28"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; }; - PML = derive2 { name="PML"; version="1.1"; sha256="11fl7qm98n5wlfwczb6vzj9hswq7mqmb09nh9wl7986jp2wbrjlw"; depends=[dplyr rbokeh tibble tidyr trelliscopejs]; }; - PMmisc = derive2 { name="PMmisc"; version="0.1.2"; sha256="03bavk7ylmrrcc49zy9fb2q08w6138b3srxa4x038syr115k3l6k"; depends=[ggplot2 robust]; }; - PMwR = derive2 { name="PMwR"; version="0.12-0"; sha256="1w3zz3sh06vbyzngcpm52izi2ymnfy897q2zz7vrb6r8xxcbrlwi"; depends=[datetimeutils fastmatch NMOF orgutils textutils zoo]; }; - PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.5.0"; sha256="1b9p7r588klxmwcszffcmn37w5r29n4ab2f54xm23lnlpix80yg6"; depends=[dplyr magrittr RCurl readr readxl survey timeDate]; }; + PMCMRplus = derive2 { name="PMCMRplus"; version="1.4.4"; sha256="1myj2hf1sx32j6hcql1zrbxkibg6l0qggcnrpsr2y40kzbw463pi"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; }; + PML = derive2 { name="PML"; version="1.2"; sha256="0r4mfnkbg7chrnm3lb78hjcz25fal6vvvqwvnzvicl46mdhl94yb"; depends=[dplyr rbokeh tibble tidyr]; }; + PMwR = derive2 { name="PMwR"; version="0.14-0"; sha256="15qfpsnnak8qf41cfq3n4g6iwxnzbifxqm50pnbk76v6727s21hy"; depends=[datetimeutils fastmatch NMOF orgutils textutils zoo]; }; + PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.6.0"; sha256="1xwjw8wcr0xys3bwk7aj0rih2nzdw86rja7fwqis2rfcbk9r8cim"; depends=[dplyr magrittr RCurl readr readxl survey tibble timeDate]; }; POCRE = derive2 { name="POCRE"; version="0.5.0"; sha256="0aph1lmb0xkzm4l4ah2wrx13d138igf4k4w9wb9lca4vv6m7xzqf"; depends=[EbayesThresh ggplot2 pracma]; }; POD = derive2 { name="POD"; version="1.1.4"; sha256="0ivq7jpnyb5zvvi2dx788cawrsh26hyp8j0a8mkfcsnhyhhs7hnb"; depends=[]; }; POET = derive2 { name="POET"; version="2.0"; sha256="0w3jhj45sxisyrpcsazbrbcsz7rmraw71jjm0zixbcgc4klb98ar"; depends=[]; }; @@ -2985,27 +3014,25 @@ in with self; { POUMM = derive2 { name="POUMM"; version="2.1.6"; sha256="16yiymfaci9zklbx3klf3nn9xlf305mdbq5n1ccx4w7g7h0ivdi1"; depends=[adaptMCMC ape coda data_table foreach ggplot2 lamW Rcpp]; }; PP = derive2 { name="PP"; version="0.6.2"; sha256="1y6f8pnvdp59xnm0vh1rjhcxy3nyd3il7r76yyrrfamdr42hh8lc"; depends=[Rcpp]; }; PP3 = derive2 { name="PP3"; version="1.2"; sha256="1g36al9w1rxyhfzbvpw9siqq57h2xl0zr94wysz8i0jzqkkqkrvf"; depends=[]; }; - PPCI = derive2 { name="PPCI"; version="0.1.4"; sha256="18q9jjmmmmghwyzpj42k7xa55anvbg1jnqs2y6c5jzlb2cw3ga4h"; depends=[rARPACK]; }; + PPCI = derive2 { name="PPCI"; version="0.1.5"; sha256="141811iq0g2rq7lxpz9a44kyjfylj85yqgcjq7b23xfg2wbcp8dd"; depends=[rARPACK]; }; PPMR = derive2 { name="PPMR"; version="1.0"; sha256="07fky5xc1dmmn23wwdjm46c86i7q20dv5f2147828v52hhky873g"; depends=[Rcpp RcppArmadillo]; }; PPQplan = derive2 { name="PPQplan"; version="1.0.0"; sha256="159mgwd2d7qzfwj6dnxr77p0fm7rgq9bpks2ra54s446cm4ahgkd"; depends=[ggplot2 plotly tolerance]; }; PPRL = derive2 { name="PPRL"; version="0.3.5.2"; sha256="083al6xi9b62vbx71684bxq2xynvmxw25ak01gwngln1r84gsz5l"; depends=[Rcpp settings]; }; PPforest = derive2 { name="PPforest"; version="0.1.1"; sha256="0iplbw5b2vhqbp6gc123ykzmilwa80akljkv3jzfmi90ckm4k08m"; depends=[doParallel dplyr magrittr plyr Rcpp RcppArmadillo tidyr]; }; PPtree = derive2 { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; }; PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.4"; sha256="008hlgi56p9wydpsb2f1dxi4slml7p417c34lw00hivbl53d6x97"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; }; - PQLseq = derive2 { name="PQLseq"; version="1.1"; sha256="1h8baf0apxvimarr2qwlh6pdzv88ib1dzw927swsyimjg44wjbfc"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; }; PREPShiny = derive2 { name="PREPShiny"; version="0.1.0"; sha256="0zsg07y6nhp2lma3pdz8xd981y3mh8k21il5jv0inma1d1xr4g3f"; depends=[dplyr psycho rmarkdown shiny]; }; PRIMAL = derive2 { name="PRIMAL"; version="1.0.2"; sha256="04fn0c10v9ai7vrrd4qr84rid3x42wq749rn5p1i6nkvmjv3dnhs"; depends=[Matrix Rcpp RcppEigen]; }; PRIMME = derive2 { name="PRIMME"; version="3.0-0"; sha256="1wvwdsaqg5rqx93svvhjvi64x6vxbr0a8za0a7cixy0vdg14vli4"; depends=[Matrix Rcpp]; }; PRIMsrc = derive2 { name="PRIMsrc"; version="0.8.2"; sha256="04g1saf511xs26m1iv9xfsmfs15fdfaxh5qlbay2mcb198270pd8"; depends=[glmnet Hmisc quantreg superpc survival]; }; - PRISM_forecast = derive2 { name="PRISM.forecast"; version="0.1.6"; sha256="0w0fjbaafq90ac35h70z8g95q1i812v0ivkif4lx8l3q7rhjrvb5"; depends=[glmnet xts zoo]; }; + PRISM_forecast = derive2 { name="PRISM.forecast"; version="0.2.0"; sha256="1r2fjnd5wjlb0y5x9pnh80dmkdfdr9yhqckynkc92ngc7dr1f44z"; depends=[glmnet xts zoo]; }; PRISMA = derive2 { name="PRISMA"; version="0.2-7"; sha256="0sk2d07m8rhipa0kdbaf8ngryda6f1ihp5akpnyw2llajf0x8as5"; depends=[ggplot2 gplots Matrix]; }; PRISMAstatement = derive2 { name="PRISMAstatement"; version="1.1.1"; sha256="1vvab8h71g8c910s2h4d12qafqdncfzmsh5f1b4m79plpqi3s49z"; depends=[DiagrammeR]; }; PROBShiny = derive2 { name="PROBShiny"; version="0.1.0"; sha256="17p6pb8nwq36ha697f2lf8nwzj5cylmh8rdzyag49ks5hi9painb"; depends=[epitools LaplacesDemon rmarkdown rpivotTable shiny shinyMatrix]; }; - PROJ = derive2 { name="PROJ"; version="0.1.0"; sha256="0vxa0ysf0rs59vwx70ygr73m5rz77qrbv0jdrnxr502y6chz51ji"; depends=[]; }; + PROJ = derive2 { name="PROJ"; version="0.1.6"; sha256="0h0iky99wqb4cz7imrwz2p3w71s8n21vfdjwi30w240vim6d3lgg"; depends=[]; }; PROMETHEE = derive2 { name="PROMETHEE"; version="1.1"; sha256="0r53mb9ndwm4yli3h50cfamsjzpq6b67g72mszm7lpbqpj58wqw6"; depends=[lpSolve]; }; - PROSPER = derive2 { name="PROSPER"; version="0.3.0"; sha256="1xrzsayrkna1njz77kwikzyyinfsny2jahv829w789698azr1ms4"; depends=[data_table]; }; + PROSPER = derive2 { name="PROSPER"; version="0.3.2"; sha256="1w58sv519fjrmbv5q7pvfd4b3d22v33nlx9m232dkxj6i7qs1dcx"; depends=[data_table]; }; PROTOLIDAR = derive2 { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; }; - PROreg = derive2 { name="PROreg"; version="1.0"; sha256="0c2vgzbdi29rlrnrb971dqrl7rlb9y3rw8nj5rjgwsjqxv607ssj"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; }; PROscorer = derive2 { name="PROscorer"; version="0.0.1"; sha256="0mgj0mi0vzdk0agimsx4k9i4bss0j5lqiayzhldr1hrqrx2a4f3d"; depends=[PROscorerTools]; }; PROscorerTools = derive2 { name="PROscorerTools"; version="0.0.1"; sha256="1vliffkfqdn5l96bncfgayv19i20kmawlxi8q853wamj6npdpv5r"; depends=[]; }; PRROC = derive2 { name="PRROC"; version="1.3.1"; sha256="1m28h8pcd78049lz2qixhkcr9h5b3jik3maqzfbvq9y58z71i4a7"; depends=[]; }; @@ -3019,13 +3046,12 @@ in with self; { PSLM2015 = derive2 { name="PSLM2015"; version="0.2.0"; sha256="1f8kzlqil2ac8a9fbj9fhdni2narh2yaaz044mlx7gsv2ns3ai19"; depends=[dplyr ggplot2 magrittr]; }; PSPManalysis = derive2 { name="PSPManalysis"; version="0.2.2"; sha256="0g59r13nc6w4a4gkjxnvkygp9hax1sw34a5rv6r170gwdj9fiswq"; depends=[pkgbuild]; }; PST = derive2 { name="PST"; version="0.94"; sha256="0f28zrnlficbi9iil6wbh51k9mghpkz63hw05lpmlpx1yl5nd0a6"; depends=[RColorBrewer TraMineR]; }; - PSTR = derive2 { name="PSTR"; version="1.2.4"; sha256="0d1j7khd0fx9fapak6arigzprsl8f5jadspbyzym4g2a78m7cnnq"; depends=[ggplot2 magrittr plotly snowfall tibble]; }; PSW = derive2 { name="PSW"; version="1.1-3"; sha256="0ahm7rp795d7j88n15b3q0gl573p3g0krc7jd1zv87g4bsdc9b5x"; depends=[gtools Hmisc]; }; PTAk = derive2 { name="PTAk"; version="1.3-34"; sha256="0ylnag492v1n0pmzsz73w12frhv8c3r3dxgarf58ny0ir0i0ywvl"; depends=[tensor]; }; PTE = derive2 { name="PTE"; version="1.7"; sha256="1azkrij4kfmvp03lnzm88gwgvz8g54jq94j0qg8ynxvyjzrppc98"; depends=[doParallel foreach survival]; }; - PTXQC = derive2 { name="PTXQC"; version="1.0.0"; sha256="1jybr5smjnc2mm02f13gkcpapaxjqj8ajc6sswy9b23fbcbqzlkw"; depends=[data_table ggdendro ggplot2 gtable kableExtra knitr plyr RColorBrewer reshape2 rmarkdown seqinr UpSetR yaml]; }; + PTXQC = derive2 { name="PTXQC"; version="1.0.4"; sha256="1yywzmnnj3i53hkphjml78hrz5fk0k3nmkp9hzrsja79dpimwn40"; depends=[data_table ggdendro ggplot2 gtable kableExtra knitr plyr RColorBrewer reshape2 rmarkdown seqinr UpSetR yaml]; }; PTwins = derive2 { name="PTwins"; version="0.1.1"; sha256="166mc7w52n9d3n72h5jvvhbki87prkils3yigdf57dn9pyixrd66"; depends=[]; }; - PUPAIM = derive2 { name="PUPAIM"; version="0.1.0"; sha256="0lkfp1jlcf0m0h7hqvbcr0sq0kbdwpvqvz52rs8j5n7ywiky4q3i"; depends=[FSA Metrics minpack_lm]; }; + PUPAIM = derive2 { name="PUPAIM"; version="0.2.0"; sha256="1ky6f4yhm3hjrfxwk8vfalzzjgkq1922my26w457q8nfng7f2m53"; depends=[Metrics minpack_lm nls2]; }; PUlasso = derive2 { name="PUlasso"; version="3.2.3"; sha256="07jf81q898833qswwairkv21dxlz7890219fdgnw3ywgp5kvlp41"; depends=[doParallel foreach ggplot2 Matrix Rcpp RcppEigen]; }; PVAClone = derive2 { name="PVAClone"; version="0.1-6"; sha256="0fj5p3z2cwnyshrr4rq88wpij2xax5p4aq0x4p342kadx9d6x2ga"; depends=[coda dclone dcmle]; }; PVR = derive2 { name="PVR"; version="0.3"; sha256="0pcnazkiwmicr3k6k70r8skqk0pd46fcqhhxghawxjs4slgnygkj"; depends=[ape MASS splancs]; }; @@ -3051,20 +3077,20 @@ in with self; { PanCanVarSel = derive2 { name="PanCanVarSel"; version="0.0.3"; sha256="06xkzg2kvyr6ivm1z71x2pk20j37h36sx6kf4kmc8q50cq73k9jl"; depends=[Matrix msm mvtnorm smoothmest]; }; PanJen = derive2 { name="PanJen"; version="1.6"; sha256="18cl9rls98v286kk6lyxxws3w59zpzgmqi5250gdgcf71xy2lhvm"; depends=[mgcv]; }; PanelCount = derive2 { name="PanelCount"; version="1.0.9"; sha256="1b6c83qypjc3ylvhh24xm4pjk8w34s24v0i9ddlmg92f1518hlkj"; depends=[Rcpp RcppArmadillo statmod]; }; + PanelMatch = derive2 { name="PanelMatch"; version="1.0.0"; sha256="02nsi5bhzqdn3v164f70xs0lll929gi602jw2b1xza7wcszdchfd"; depends=[CBPS data_table ggplot2 MASS Matrix Rcpp RcppArmadillo RcppEigen]; }; Paneldata = derive2 { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; }; - ParBayesianOptimization = derive2 { name="ParBayesianOptimization"; version="0.2.0"; sha256="1sgb0wrk9h52v55qc4q0r11b7x7cjmjfk1klmmvigpjlz1dycz7k"; depends=[crayon data_table dbscan foreach GauPro ggplot2 lhs plotly]; }; + ParBayesianOptimization = derive2 { name="ParBayesianOptimization"; version="1.1.0"; sha256="1famkdri08qsamn5ji4knq42pj8z4lkhacbr8mbj439hkmpsfxkv"; depends=[crayon data_table dbscan DiceKriging foreach ggplot2 ggpubr lhs plotly]; }; ParDNAcopy = derive2 { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[DNAcopy]; }; - ParallelLogger = derive2 { name="ParallelLogger"; version="1.1.1"; sha256="0z2a777536yvqcypzxis7j4k3ns5v4lwdrkib9zx1ngxxzv6k9xn"; depends=[jsonlite snow XML]; }; + ParallelLogger = derive2 { name="ParallelLogger"; version="1.2.0"; sha256="1xc5lgyly7mmi8hw9kzm4yj09z1ngzqkgki7zjgfcrwvfz1lnknr"; depends=[jsonlite snow XML]; }; ParallelPC = derive2 { name="ParallelPC"; version="1.2"; sha256="07y7xb16865khxkvwsk1yglzyy7ja4aj2wpkipaz48i77c3x8bi2"; depends=[]; }; ParallelTree = derive2 { name="ParallelTree"; version="0.1.3"; sha256="1h53qwhc63fglm452b3by7f3g6f3hyqwkmwmbdqdb9rv3j4gvnvg"; depends=[ggplot2]; }; - ParamHelpers = derive2 { name="ParamHelpers"; version="1.13"; sha256="0yaf899yhia2773lkq5a16wz6srpsx7xzkbgf421ai2z90m23ddr"; depends=[backports BBmisc checkmate fastmatch]; }; - ParentOffspring = derive2 { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; }; - Pareto = derive2 { name="Pareto"; version="1.1.0"; sha256="07gvvcpcqr884xnd2kq4zn3c27h1xkx51qp1w3vfsqqccqdi08jw"; depends=[]; }; + ParamHelpers = derive2 { name="ParamHelpers"; version="1.14"; sha256="1sx2ddm8hwvvmk0z65wa689w80py3fny82zjd4d29qwxlv854xmi"; depends=[backports BBmisc checkmate fastmatch]; }; + Pareto = derive2 { name="Pareto"; version="1.1.5"; sha256="1w435yywdbsl8s5qrhxcai89s0qax31rx4faxydkqqhk47d5756r"; depends=[]; }; ParetoPosStable = derive2 { name="ParetoPosStable"; version="1.1"; sha256="1fwji5wrhbxr089dll812csamvb5q2pxn1607rpirarifgfbj28m"; depends=[ADGofTest doParallel foreach lmom]; }; PartCensReg = derive2 { name="PartCensReg"; version="1.39"; sha256="0blzv57cbxqghkz4fc3plvrcw80g0kx17dzmajkfv598m1wm6hc8"; depends=[Matrix optimx ssym]; }; Partiallyoverlapping = derive2 { name="Partiallyoverlapping"; version="2.0"; sha256="0pb0digyigqyzb0zqikgz002kqf1xprcjhxr62a7iqbzy1yycayf"; depends=[]; }; PathSelectMP = derive2 { name="PathSelectMP"; version="1.1"; sha256="036b70bpylmibny6dny79f7gdzn78arqgl2hfs031vygw63yyh9b"; depends=[mice MplusAutomation]; }; - PatternClass = derive2 { name="PatternClass"; version="2.0.0"; sha256="0z2qbg8diskk33ffiqkhkkp5va1p56cij2a6yqfhybrrcxizliw1"; depends=[landscapemetrics raster]; }; + PatternClass = derive2 { name="PatternClass"; version="2.0.1"; sha256="1xwlk6shms38nqxad3d15254wgnkfzy7jyf5w9bbm96kg05mndbz"; depends=[landscapemetrics raster]; }; Patterns = derive2 { name="Patterns"; version="1.2"; sha256="1dfy0jxr4h17j00yf2lfxlczvx6sdjz08hqsrj6r26qz3g6f16br"; depends=[abind animation Biobase c060 cluster elasticnet glmnet gplots igraph jetset KernSmooth lars lattice limma magic Mfuzz movMF msgps nnls pixmap plotrix SelectBoost spls survival tnet VGAM WGCNA]; }; PdPDB = derive2 { name="PdPDB"; version="2.0.1"; sha256="05aqg0rqrnlmvjxa32ms1vywgwhw5zlfkyf2ij0fn06rp8l2z3lv"; depends=[dendextend plyr tseries]; }; Peacock_test = derive2 { name="Peacock.test"; version="1.0"; sha256="0ypvwywipyh8lm8xkazsfjgjpvvyi2g8kid63qff11372p33m6xs"; depends=[]; }; @@ -3076,17 +3102,16 @@ in with self; { PearsonDS = derive2 { name="PearsonDS"; version="1.1"; sha256="0rqh9ji0bah3n1c6fcg7krgqs65qla9p3xrnc4jr7va6ph104im9"; depends=[]; }; PearsonICA = derive2 { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; }; PedCNV = derive2 { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[ggplot2 Rcpp RcppArmadillo]; }; - PeerPerformance = derive2 { name="PeerPerformance"; version="2.2.1"; sha256="1igh8svdbxkcfgi2s70cpwdcy7jb4yhxias80vck203skyiq97vx"; depends=[lmtest sandwich]; }; + PeerPerformance = derive2 { name="PeerPerformance"; version="2.2.2"; sha256="03vkdfwa4smlsycgsd1hmg4qzib5nyknrsz100rqdfdw4g2xn6bn"; depends=[lmtest sandwich]; }; PenCoxFrail = derive2 { name="PenCoxFrail"; version="1.0.1"; sha256="0snjf8jxzyf30xj3wx9p6g073dqw592l1j1c6yxfg8y4kgzhzwq7"; depends=[Matrix Rcpp RcppArmadillo survival]; }; PenIC = derive2 { name="PenIC"; version="1.0.0"; sha256="0vcqawmbm8z6lkcxfq1b2png9viz5q669npbv0s7dn6smwhanlzz"; depends=[MASS Matrix numDeriv]; }; - PepPrep = derive2 { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[biomaRt stringr]; }; PepSAVIms = derive2 { name="PepSAVIms"; version="0.9.1"; sha256="0m4jrq6wcjy0k80gvrnm9f7kvi1ifx9182xfq0psyaxpj0ggvzij"; depends=[elasticnet]; }; Peptides = derive2 { name="Peptides"; version="2.4.1"; sha256="05xhimjw7kdga07ycgwz6mq5ppcx04zy00mx5fvavp314zrqxnsv"; depends=[Rcpp]; }; PerFit = derive2 { name="PerFit"; version="1.4.3"; sha256="0qmh78wrx3vzz41z30db3bb62n325blphjhpzdzykfx77gr8plyr"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; }; PerMallows = derive2 { name="PerMallows"; version="1.13"; sha256="0ny2vc8f0npixaw1kp2d93xr4g46nsg8jjwvi6afv9xjvaz0i6wy"; depends=[Rcpp]; }; - Perc = derive2 { name="Perc"; version="0.1.3"; sha256="1wkhxwq15x2niabgnchr93h132ynswsjb81ignlk1rsqppm4hkr5"; depends=[]; }; + Perc = derive2 { name="Perc"; version="0.1.4"; sha256="0i3b7glnrv6vpc4zxkalh0ad0rf26dl2zwcgl86pz80qmzll8m9r"; depends=[]; }; PerfMeas = derive2 { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[graph limma RBGL]; }; - PerformanceAnalytics = derive2 { name="PerformanceAnalytics"; version="1.5.3"; sha256="0jhjldwyxwq7a47zmk5y1jjck7hvq92p8rlgjvdfy51hx2dmlqqd"; depends=[quadprog xts zoo]; }; + PerformanceAnalytics = derive2 { name="PerformanceAnalytics"; version="2.0.4"; sha256="0ci26hsj4wnw9g0mh4vrn0cg986cpcpx169rvw6v6rbnjxq718bq"; depends=[quadprog xts zoo]; }; PeriodicTable = derive2 { name="PeriodicTable"; version="0.1.2"; sha256="133rwbvapk99dmh3vi8p7sa81d7hjmy0g4a5hcmwr3mdq8jzgwrj"; depends=[]; }; PermAlgo = derive2 { name="PermAlgo"; version="1.1"; sha256="16fhdgr4nza9yknsbwiv8pgljfwp8hhva0crs4dbfd0w4j97n5fp"; depends=[]; }; PerseusR = derive2 { name="PerseusR"; version="0.3.4"; sha256="1k03flbnjndx5mm26hysk64z89858m50kjs8gyldm4s5f09iny6p"; depends=[Biobase plyr stringr XML]; }; @@ -3102,18 +3127,19 @@ in with self; { PhyInformR = derive2 { name="PhyInformR"; version="1.0"; sha256="10d720ww909b1xmdrms554pnn0757nzppnrniar4n157mh0qw7ms"; depends=[ape doParallel foreach geiger ggplot2 gplots gridExtra hexbin iterators PBSmodelling phytools RColorBrewer]; }; PhySortR = derive2 { name="PhySortR"; version="1.0.8"; sha256="19426xjdii74qds0wmq5sa88zys81nyqb9lvf9pfihbjgrjr770a"; depends=[ape phytools]; }; PhyloMeasures = derive2 { name="PhyloMeasures"; version="2.1"; sha256="01axs78s10y1bkx8dbs9vvnphdzik7hpibkwyib1x9mznmyg90hr"; depends=[ape]; }; - PhylogeneticEM = derive2 { name="PhylogeneticEM"; version="1.3.0"; sha256="03yqdg4qfzqvykfwc9cgfxjaj4n57kwz95dfdq6zb7lc56gs69ms"; depends=[ape capushe foreach gglasso glmnet LINselect MASS Matrix plyr Rcpp RcppArmadillo robustbase]; }; + PhylogeneticEM = derive2 { name="PhylogeneticEM"; version="1.4.0"; sha256="14a1lczwr8xhv27wqc88raj3yhy8gvflvxjrx8f5hlq15y3wfp4w"; depends=[ape capushe foreach gglasso glmnet LINselect MASS Matrix plyr Rcpp RcppArmadillo robustbase]; }; PhysActBedRest = derive2 { name="PhysActBedRest"; version="1.0"; sha256="0gmqh700cf6aiagb45iyyf85pgp3b86fx7fbv9lrsm4mda0r8h75"; depends=[chron lubridate stringr]; }; PhysicalActivity = derive2 { name="PhysicalActivity"; version="0.2-2"; sha256="14z6plgwyr46vs9m997rvlz8sdglfs9g087an8668zqkzzs2w4ln"; depends=[]; }; PieceExpIntensity = derive2 { name="PieceExpIntensity"; version="1.0.4"; sha256="023hq0gg1vi0j3yf8p5lisgs8wfp5qwyd4akxxzx7wad2985gxb3"; depends=[Rcpp RcppArmadillo]; }; Pijavski = derive2 { name="Pijavski"; version="1.0"; sha256="1027lmmk17br9zxah980j6l3k2p92065bwigw6gpy9g0g5jjl4f1"; depends=[Rcpp]; }; PivotalR = derive2 { name="PivotalR"; version="0.1.18.3.1"; sha256="1npfi5bdn0f4arp3wpi5ai21ad5fxx3lm7n5wjhvzvcyr6gl38as"; depends=[Matrix]; }; PlackettLuce = derive2 { name="PlackettLuce"; version="0.2-9"; sha256="1sv37wvvp44iwv4bpjhp3mnpyk77c60vi0xwrapzywszi222ynbl"; depends=[igraph Matrix partykit psychotools psychotree qvcalc RSpectra sandwich]; }; + PlaneGeometry = derive2 { name="PlaneGeometry"; version="1.1.0"; sha256="1yr0h2rasx0f7lp3vc30cmryfrsskbqdd1mdd5wv3w794y9fizs5"; depends=[gsl R6 sdpt3r stringr uniformly]; }; Planesmuestra = derive2 { name="Planesmuestra"; version="0.1"; sha256="0v7l4hrfckcf7zmk0ihq2ij0qli7x12j17vd6752d1yjk27fgk57"; depends=[]; }; PlasmaMutationDetector = derive2 { name="PlasmaMutationDetector"; version="1.7.2"; sha256="0qra7q2pzw212qylyrfhv6zjcsldfw84b93cari0qjqnw4gyfph2"; depends=[GenomicRanges ggplot2 robustbase Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; Plasmidprofiler = derive2 { name="Plasmidprofiler"; version="0.1.6"; sha256="10m3knmz0596rm30ncyfprar6l42bjm7r34n4pjz1biqmiz6yz6k"; depends=[ape dplyr gdata ggdendro ggplot2 gridExtra gtable htmlwidgets magrittr plotly plyr RColorBrewer reshape2 stringr]; }; Plasmode = derive2 { name="Plasmode"; version="0.1.0"; sha256="1qcni9zdckhsnw616jn7rdfd09kbl5wd4hljdja0w73jz1wd1z14"; depends=[arm epiDisplay foreign gbm glm2 lattice latticeExtra lme4 MASS Matrix mgcv nlme nnet RColorBrewer survey survival twang xtable]; }; - PlayerRatings = derive2 { name="PlayerRatings"; version="1.0-3"; sha256="16wff9kqcp462qxvhifyx942jp1i6vpsl2y0llph7ahfs8f0prjn"; depends=[]; }; + PlayerRatings = derive2 { name="PlayerRatings"; version="1.1-0"; sha256="04hdjv1gb5b3zym2ryjpqrqhs823nlkmbimfnxw1cfn921ljjgpj"; depends=[]; }; PlotContour = derive2 { name="PlotContour"; version="0.1.0"; sha256="0jjzrxmx1k1s8fyfs9m5a864pmvjh2bdklbhrc3nbhb0c7wd3h9z"; depends=[KernSmooth MASS]; }; PlotPrjNetworks = derive2 { name="PlotPrjNetworks"; version="1.0.0"; sha256="13kbyx2phxb3kss6l32f7krf4k5i350indlsmbhav686v0h3nsgp"; depends=[ggplot2 reshape2]; }; PlotRegionHighlighter = derive2 { name="PlotRegionHighlighter"; version="1.0"; sha256="0n1nkfr3sdaq6f5p9kgx4slrsvhpdbax3rinrkfkb1vnjj4swj77"; depends=[]; }; @@ -3124,22 +3150,23 @@ in with self; { PointFore = derive2 { name="PointFore"; version="0.2.0"; sha256="0ml6xcdl4ygr01q0cjwd11ql7wal91jnf3hs1rfhfr4mh8jpgivx"; depends=[boot car ggplot2 gmm lubridate MASS sandwich]; }; PoisBinNonNor = derive2 { name="PoisBinNonNor"; version="1.3.1"; sha256="1pgaf3yamigcw32sczj4f1dpndwyrxirrfl4jv0vp5j1jd2zhb18"; depends=[BB corpcor Matrix mvtnorm]; }; PoisBinOrd = derive2 { name="PoisBinOrd"; version="1.4.1"; sha256="0bzgb88mg95h6liwnmflpssmz9n5xnwmipnqca611l1kp3rld0nk"; depends=[corpcor GenOrd Matrix mvtnorm]; }; - PoisBinOrdNonNor = derive2 { name="PoisBinOrdNonNor"; version="1.5.1"; sha256="07q0zddkb9vgp9iqw8s9w4cz6iwhdsggx8wf9ma9b5iqzigsv07n"; depends=[BB corpcor GenOrd MASS Matrix]; }; + PoisBinOrdNonNor = derive2 { name="PoisBinOrdNonNor"; version="1.5.2"; sha256="0a6ks20f9vnf8w8n0007yrqaa9vpgqq43vxa88dhvdpn6bbw5w0s"; depends=[BB corpcor GenOrd MASS Matrix]; }; PoisBinOrdNor = derive2 { name="PoisBinOrdNor"; version="1.6.1"; sha256="12mchs62xq5jrq7y66l53yvwgm8iisa16120jmja0xdcr9sgcr84"; depends=[corpcor GenOrd Matrix mvtnorm psych]; }; PoisNonNor = derive2 { name="PoisNonNor"; version="1.6.1"; sha256="0pk1hqydpd6f8419kn986kf55gc3hyycfjyj1nvqsml7ic56ic98"; depends=[BB corpcor MASS Matrix]; }; PoisNor = derive2 { name="PoisNor"; version="1.3.1"; sha256="1s1z6bpxaa1ibdgv6bd5phccswd9bh26abwcywlnb55xl5vrgknv"; depends=[corpcor Matrix mvtnorm]; }; - PoissonBinomial = derive2 { name="PoissonBinomial"; version="1.0.0"; sha256="1yl01302r1b24qkanp8sd1n39s51yr0vyz99jrmpmdk2875zahi3"; depends=[BH Rcpp]; }; + PoissonBinomial = derive2 { name="PoissonBinomial"; version="1.1.0"; sha256="0khsp1jvm0b1nwrfas6d1qagf6m7m44k3yv9ghlknxlvkg79dyy5"; depends=[BH Rcpp]; }; PoissonPCA = derive2 { name="PoissonPCA"; version="1.0.2"; sha256="0rb30l0x8knwvh8li62cfxms9b20db77g4r8cwgwasb9jjljxv3s"; depends=[]; }; PoissonSeq = derive2 { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; }; PolyPatEx = derive2 { name="PolyPatEx"; version="0.9.2"; sha256="1z1hwvsw7b6cz5xfy35a5ldrzb3fhp3swiyz56v1zqblpsaz8n9g"; depends=[gtools]; }; PolyTrend = derive2 { name="PolyTrend"; version="1.2"; sha256="17n6phkzgaqrlzs8x1l5smnij1gxfklr0zj9pqfy5n8xqnpwssm5"; depends=[]; }; - Polychrome = derive2 { name="Polychrome"; version="1.2.3"; sha256="1frh21813ffgax487bcyc6a3z0j9jb27dq5djsbpi7ali38il738"; depends=[colorspace scatterplot3d]; }; - PolynomF = derive2 { name="PolynomF"; version="2.0-2"; sha256="06gkyhacc609s7si604rh4yyqdafc4mqy15wcz90qrwbrhr18gcm"; depends=[Rcpp]; }; + Polychrome = derive2 { name="Polychrome"; version="1.2.5"; sha256="028lzsswb36pdb6mmyysb4iggzlsvwrcxlcdbrkyz3338mvqabn2"; depends=[colorspace scatterplot3d]; }; + PolynomF = derive2 { name="PolynomF"; version="2.0-3"; sha256="067l71i2zjv6gvd0br2m034ls3r5lcmc0amml1qbj4wchd7mqlw9"; depends=[Rcpp]; }; Pomic = derive2 { name="Pomic"; version="1.0.4"; sha256="0xy5fgimbgqqac3n7akhwyvnrvd9fpvx9h8nk4spxrxc8x0km1w7"; depends=[]; }; PooledMeanGroup = derive2 { name="PooledMeanGroup"; version="1.0"; sha256="0i9s7qskjnji3mf6clsi69rnni57v8cysgr9gh3hvxjzlf1sq8y7"; depends=[]; }; PopED = derive2 { name="PopED"; version="0.4.0"; sha256="1cj6nj5w4ckvnldpc7g4mxdps619zlhzsdibd9ih8i2lxh1xbrfz"; depends=[boot codetools dplyr ggplot2 magrittr MASS mvtnorm purrr stringr tibble tidyr]; }; PopGenKit = derive2 { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; }; PopGenReport = derive2 { name="PopGenReport"; version="3.0.4"; sha256="0x9j9f9k65rfr4fxyrxqa9220psfh1bicls6vwbxmqsfdsfnvs0j"; depends=[ade4 adegenet calibrate data_table dismo gap gdistance genetics GGally ggplot2 knitr lattice mmod pegas plyr R_utils raster reshape rgdal RgoogleMaps sp vegan xtable]; }; + PopGenome = derive2 { name="PopGenome"; version="2.7.5"; sha256="0xdwgih1n7bkykbzrnp293yzrlj80vr2v6rlsww61nxlhynbh9yn"; depends=[ff]; }; PopVar = derive2 { name="PopVar"; version="1.2.1"; sha256="09az5wa0zai6axhvrljqdjn74nb7jikqwjqy8f570qxb6jbgfgay"; depends=[BGLR qtl rrBLUP]; }; PortRisk = derive2 { name="PortRisk"; version="1.1.0"; sha256="05yxqcv0cijy3s9zx68f9xy59jv55kmj3v0pz5pgl17j23kb9rlc"; depends=[copula MASS MCMCpack tseries zoo]; }; PortfolioAnalytics = derive2 { name="PortfolioAnalytics"; version="1.1.0"; sha256="1jy89brrdw8ilbi9pjxxq5yhqw85ik4kzdd2sa60crjlhvipx0ff"; depends=[foreach PerformanceAnalytics xts zoo]; }; @@ -3154,36 +3181,38 @@ in with self; { PowerNormal = derive2 { name="PowerNormal"; version="1.2.0"; sha256="1kryqcjvgwk0l4z3gqxdiz47mha3jw5583jlb9z7ml6v7cam06sm"; depends=[]; }; PowerTOST = derive2 { name="PowerTOST"; version="1.4-9"; sha256="08qac2482v2b5s7nfhdn9x5gbl348yfwnzgqprh38qp16zzcylhg"; depends=[cubature mvtnorm TeachingDemos tufte]; }; PowerUpR = derive2 { name="PowerUpR"; version="1.0.4"; sha256="0ng88x1zs4kb8cf2v51kynbp32iz41mh40my5sciyvjbw430bk59"; depends=[]; }; - PowerfulMaxEigenpair = derive2 { name="PowerfulMaxEigenpair"; version="0.1.1"; sha256="1hzp3dpcac5han2ij4w0fwk093lr3pgydb39p848jj7jma5hawxs"; depends=[formatR]; }; PracTools = derive2 { name="PracTools"; version="1.2.1"; sha256="1viwmwis9awr7maprnaj0vdzc5rf6md7xlc9l7hnn51xmaa734ih"; depends=[]; }; PreKnitPostHTMLRender = derive2 { name="PreKnitPostHTMLRender"; version="0.1.0"; sha256="1749cd734f4bf0n4068s2m617k6as8h9bwp44mm3la2xy3vjf5g1"; depends=[knitr rmarkdown XML]; }; PreProcess = derive2 { name="PreProcess"; version="3.1.7"; sha256="1fxzkmrj76mc94xdj7a0nq450021i1jxkigmh5jhrmamkp5581jf"; depends=[oompaBase]; }; PreciseSums = derive2 { name="PreciseSums"; version="0.3"; sha256="02w0pa9dd196sg6zg9w2fp4b0k6wibbw9rbvasr3aphh98kbd6ch"; depends=[]; }; PredPsych = derive2 { name="PredPsych"; version="0.4"; sha256="00h4p1szqzh4a2kjvlriyinh330cfwxsrvs6fi089mr207q890vj"; depends=[caret e1071 ggplot2 MASS mclust party plyr randomForest rpart statmod]; }; - PredictABEL = derive2 { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[epitools Hmisc PBSmodelling ROCR]; }; - PredictionR = derive2 { name="PredictionR"; version="1.0-11"; sha256="1dljdbya93dirx715yqs4vz7hbbcwpgrsvyfgikkm2fj28nnn6k9"; depends=[fitdistrplus]; }; + PredictABEL = derive2 { name="PredictABEL"; version="1.2-4"; sha256="144xmfsp62ssmg501f4y173jrqyv8vps36j4yrwg6ghcmyc01wf8"; depends=[Hmisc lazyeval PBSmodelling ROCR]; }; + PredictionR = derive2 { name="PredictionR"; version="1.0-12"; sha256="0kgc8rjdqskasdaxsbir9gwvm55rw5cpdg3y9nsj7ccg9fc1ji19"; depends=[fitdistrplus Renext]; }; PredictiveRegression = derive2 { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; }; PresenceAbsence = derive2 { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; }; - PrevMap = derive2 { name="PrevMap"; version="1.5.2"; sha256="0nr65vfdzny3y3mly7slm903h4llnn3rxbxz3ml07pnighf7rr3q"; depends=[geoR lme4 Matrix maxLik numDeriv pdist raster splancs truncnorm]; }; + PrevMap = derive2 { name="PrevMap"; version="1.5.3"; sha256="0pgrfrfw587vsci98lxd205r8wl7x7c9ns15ypnhwr8xaysdxnpf"; depends=[lme4 Matrix maxLik numDeriv pdist raster splancs truncnorm]; }; PriorCD = derive2 { name="PriorCD"; version="0.1.0"; sha256="1mb50w2i8sfxjzqd5xnfysn3jnzkkyv6l8algxnp0xpyhcq41pfs"; depends=[dplyr igraph ROCR visNetwork]; }; PriorGen = derive2 { name="PriorGen"; version="1.1.2"; sha256="0qvdqqdy7wdwwcq95mkgfyf7xf6xlpwdfs3gq299yyv2ba57flnm"; depends=[rootSolve]; }; PrivateLR = derive2 { name="PrivateLR"; version="1.2-22"; sha256="0d142fa3wk7yadvs8jszajs6hq9m03p0j6h5r4pbw7j0d1l72hgc"; depends=[]; }; ProDenICA = derive2 { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; }; ProFit = derive2 { name="ProFit"; version="1.3.3"; sha256="0jrw0v7dg5mf4zxg7pqybh9qzsiqb3nnz8g5qlc4iz73mhr9gm2b"; depends=[celestial checkmate cubature FITSio LaplacesDemon magicaxis RColorBrewer]; }; ProFound = derive2 { name="ProFound"; version="1.3.4"; sha256="1kn9kj0vq18jxiavdzx4l4kgyfwjnflfbyqfdihrdfrkz4xz4w3c"; depends=[celestial data_table doParallel FITSio foreach magicaxis RColorBrewer Rcpp]; }; - ProPublicaR = derive2 { name="ProPublicaR"; version="0.9.2"; sha256="17fghv7w4wm4q9nd6l4pl5ibk5i4zgdhlp5pvbzvymhvby0q06sw"; depends=[config dplyr httr lubridate stringr]; }; - ProTrackR = derive2 { name="ProTrackR"; version="0.3.6"; sha256="1lhk3lrspiqcw2ckss52gdjk1f6ph8m7dlb05qxcx8mycq0xd3z9"; depends=[audio lattice signal tuneR XML]; }; + ProPublicaR = derive2 { name="ProPublicaR"; version="1.1.1"; sha256="08bhqm64r79ywj394l1ywwcsjc79wzi85wlbp5xnr49bxzaysfp1"; depends=[config dplyr httr lubridate stringr]; }; + ProTrackR = derive2 { name="ProTrackR"; version="0.3.7"; sha256="15m8g9v254avi68qr7v5q4fzhclkv1q849sj69fs0c9qcli1x384"; depends=[audio lattice signal tuneR XML]; }; + ProbBayes = derive2 { name="ProbBayes"; version="1.1"; sha256="0bkbqyrmpy9swaxsl91w6iiw81znjf1lk4b0vqgn6wdnrir6gkmn"; depends=[ggplot2 gridExtra LearnBayes shiny]; }; ProbForecastGOP = derive2 { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[fields RandomFields]; }; + ProbMarg = derive2 { name="ProbMarg"; version="1.0.0"; sha256="0jv5d5zk7jq5si80rs69bvl7wssv2nihg35f2q4g7jkd7qmsbrq3"; depends=[]; }; ProbYX = derive2 { name="ProbYX"; version="1.1-0"; sha256="0dphf6jr72l235v3yjhwi8bqmv6ac7yrbyfwhx4qjrrcdnsb7qhl"; depends=[rootSolve]; }; ProbeDeveloper = derive2 { name="ProbeDeveloper"; version="1.0.0"; sha256="1d2zr8ikia3mspp2arpx7iwf4a4pq1ywl82pxbxrw6xpz313d5x9"; depends=[Biostrings TmCalculator]; }; ProbitSpatial = derive2 { name="ProbitSpatial"; version="1.0"; sha256="0pq5bsjd00qc83c7x8vlpsxdksywlnfg7rlsvb6j21fz9wi3hpas"; depends=[Matrix numDeriv RANN Rcpp RcppEigen speedglm]; }; ProcMod = derive2 { name="ProcMod"; version="1.0.3"; sha256="17x4c9vgf14l1x3hx3vyv3ygl8bb5qzq7fxg2cnl910drcdnv5sz"; depends=[expm foreach MASS Matrix mvtnorm permute Rdpack]; }; ProfessR = derive2 { name="ProfessR"; version="2.4-1"; sha256="1wsbx0dsygc1ipzhgs1pd0lhdb0qvp4ydqzwarn6zv27rzf4p3bd"; depends=[RPMG]; }; ProfileLikelihood = derive2 { name="ProfileLikelihood"; version="1.1"; sha256="16cdp1nimhg1sd2x0qbffm7clgk54p0838y688z8lnsrjaggmb0x"; depends=[MASS nlme]; }; + ProfoundData = derive2 { name="ProfoundData"; version="0.2.1"; sha256="1zqg821pv3i5nf76s7yppnmy13y14pj0l7rjhk50wlxrxdb53ibz"; depends=[DBI RNetCDF RSQLite settings sqldf zoo]; }; ProgGUIinR = derive2 { name="ProgGUIinR"; version="0.0-4"; sha256="0srhk42ssx4i096sbs4jacqjsc1ffqjxjgvpplzshlqaby1h3795"; depends=[ggplot2 MASS svMisc]; }; ProjectManagement = derive2 { name="ProjectManagement"; version="1.2.4"; sha256="1lv1yf6xslskjqz7mgi8brvpix9g7k0yy6q03gckz1rmcakzqj5p"; depends=[GameTheory kappalab lpSolveAPI plotly triangle]; }; - ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.9.0"; sha256="07nj339k822xnjqcraivl85wcvnq3cp8gz051kq5zmfx19p1wvdv"; depends=[]; }; - ProjectionBasedClustering = derive2 { name="ProjectionBasedClustering"; version="1.0.7"; sha256="1nammbm9hjsgb46cqvhwx45lfaaxw13d12q43fgwk411a91rblm1"; depends=[deldir GeneralizedUmatrix geometry ggplot2 Rcpp shiny shinyjs vegan]; }; + ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.9.1"; sha256="045xyycn2xjxb40vm6nvkp5csxzxasz9pqdnrgapv0ycf02s0c17"; depends=[]; }; + ProjectionBasedClustering = derive2 { name="ProjectionBasedClustering"; version="1.1.1"; sha256="17y1yf8cbcl3yha7mbk22lxmk2v5n98mfqsa886a3012ang4m5sp"; depends=[deldir GeneralizedUmatrix geometry ggplot2 plotly Rcpp shiny shinyjs shinythemes vegan]; }; ProliferativeIndex = derive2 { name="ProliferativeIndex"; version="1.0.1"; sha256="03ipsbs8pfwr8wsx7j2y9c67ic4qcady7xpa47l8dr14ff63cfk7"; depends=[]; }; PropCIs = derive2 { name="PropCIs"; version="0.3-0"; sha256="1ywzi88igzaj2wnbrqa08cy7pw886z2m0x3j7rk45rin9mgpfdfd"; depends=[]; }; PropClust = derive2 { name="PropClust"; version="1.4-6"; sha256="1p15n98b6qprphgbhdqgnsxy9d9kik19h6j9f2dy6x1hkinrzsfa"; depends=[dynamicTreeCut fastcluster]; }; @@ -3196,16 +3225,17 @@ in with self; { PtProcess = derive2 { name="PtProcess"; version="3.3-13"; sha256="0vk1n7hk6v592fi5ld70db6m92zgpjx97axs5h8p53c29984qhwz"; depends=[]; }; PubBias = derive2 { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[R_utils rmeta]; }; PubMedWordcloud = derive2 { name="PubMedWordcloud"; version="0.3.6"; sha256="1wfp1fpr4an7psrwidx38brvhvghmvfsgjy4gdx81p1bdsdn2kw2"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; }; - PublicationBias = derive2 { name="PublicationBias"; version="1.1.0"; sha256="0prdwv3w9n0ppwizfqqvy5qj7krn3nm2zncz17zh7ijdw87xks4i"; depends=[dplyr ggplot2 metafor MetaUtility Rdpack robumeta]; }; + PublicationBias = derive2 { name="PublicationBias"; version="2.0.0"; sha256="15y5pigmv29m627jfkrwgfn224s257ns058p72mawl8yl10bj9fy"; depends=[dplyr ggplot2 metafor MetaUtility Rdpack robumeta]; }; Publish = derive2 { name="Publish"; version="2019.12.04"; sha256="0vcfz6hx2bkwrksz6b0rx0w6j24h3qswgca06jhgq3jzvsmjjckx"; depends=[data_table lava multcomp prodlim survival]; }; - PupilPre = derive2 { name="PupilPre"; version="0.6.1"; sha256="02ffcr4ccwx7m81hla0n1vgbhb79y2vvyv1k5928j7kz5p1lv782"; depends=[dplyr ggplot2 mgcv rlang robustbase shiny signal tidyr VWPre zoo]; }; + PupilPre = derive2 { name="PupilPre"; version="0.6.2"; sha256="123m1zqld0jl26vqz41iic7vxzyfs1aw8zi5ki2cy6wzw9ss87m6"; depends=[dplyr ggplot2 mgcv rlang robustbase shiny signal tidyr VWPre zoo]; }; + PupillometryR = derive2 { name="PupillometryR"; version="0.0.1"; sha256="0fn1cm43jzkdph06awg741x31v5674vxb8zgnz3pfh585jggkb3j"; depends=[data_table dplyr fda fractal ggplot2 lazyeval mgcv rlang signal tidyr zoo]; }; PurBayes = derive2 { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; }; - Pursuit = derive2 { name="Pursuit"; version="1.0.0"; sha256="0wcg9zcln2mpqdyi4k4fcah6s1n0xd0jvc98vl4p1gyygy1x2vdr"; depends=[MASS]; }; + Pursuit = derive2 { name="Pursuit"; version="1.0.1"; sha256="0c4bc0ldfx02a8ws3g3gn7smikg3fdjygybs3q764kxhq88kv42l"; depends=[MASS]; }; PxWebApiData = derive2 { name="PxWebApiData"; version="0.3.0"; sha256="1c2liqh1asd0mk4cvrwpl4pdid2rqfxrma284ah4hwr6sah5lk6w"; depends=[httr jsonlite pxweb rjstat]; }; - PythonInR = derive2 { name="PythonInR"; version="0.1-7"; sha256="1vrvf68sl2k25y3ppjwpi2j4952aq4k76r92qnq3fj92789ndyqv"; depends=[pack R6]; }; + PythonInR = derive2 { name="PythonInR"; version="0.1-11"; sha256="099wsy44g3vh19vixn1ili7fd0a6q5x09hj4hp4i8cf51nihmk2q"; depends=[pack R6]; }; QAIG = derive2 { name="QAIG"; version="0.1.5"; sha256="1cchf5x7wzc3mc6xzvq14kmd9yxr9kq237s8af4xqaz1pv0b093j"; depends=[Formula stringr]; }; QBAsyDist = derive2 { name="QBAsyDist"; version="0.1.2"; sha256="1yql29npaq9yz02bv3hqf5m2mhscjms7qqf4vlaxm8s665rxcxad"; depends=[ald Deriv GoFKernel locpol nloptr quantreg scdensity zipfR]; }; - QCA = derive2 { name="QCA"; version="3.6"; sha256="07n2652l56w5dyz1ph4q7n9xkf0i145dya2w05b7lbilfjzqqxd1"; depends=[admisc shiny venn]; }; + QCA = derive2 { name="QCA"; version="3.7"; sha256="0m78ky2w988d46jk5idhg2vyn8sw5sdvl0gv479snjxidjb78mml"; depends=[admisc lpSolve shiny venn]; }; QCAfalsePositive = derive2 { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; }; QCApro = derive2 { name="QCApro"; version="1.1-2"; sha256="1glfb1x1h05cs07nq5glqvlil58wp3c0kaxi1l7k94y797i8r7hq"; depends=[lpSolve]; }; QCAtools = derive2 { name="QCAtools"; version="0.2.3"; sha256="1q49l2mf02hqvz2ahqjdx7i3yxniy7dn2s74xjl9l6zdq8bypfw2"; depends=[directlabels ggplot2 QCA stringr]; }; @@ -3219,16 +3249,16 @@ in with self; { QGglmm = derive2 { name="QGglmm"; version="0.7.4"; sha256="0ghvicz4ia1180byj28lmg49889hqhb94g1jrkhm6hnzgqbjnfmd"; depends=[cubature]; }; QHOT = derive2 { name="QHOT"; version="0.1.0"; sha256="02z0n2jawd6m7bvyvpcy0j13p1c0zm036g62n56xva18qnq5c9lb"; depends=[]; }; QLearning = derive2 { name="QLearning"; version="0.1.1"; sha256="1bx77yxsnzh0ny3ghala5fw54lxzrxqk9s32qk3dzvfbyp4paggn"; depends=[]; }; - QPBoot = derive2 { name="QPBoot"; version="0.2"; sha256="1nxmxayfq2xcjzix080mkc8y52wl3vs0rcwdl8lmhwfawjb4pap5"; depends=[abind quantspec rugarch]; }; QQperm = derive2 { name="QQperm"; version="1.0.1"; sha256="06xhv54zgnx8i22j23a0dqxhh7my416idpkkwq93qd1rdzgamzc8"; depends=[]; }; QRAGadget = derive2 { name="QRAGadget"; version="0.1.0"; sha256="0vmhbpfbbpbcs6s9zjam893yl54spbx4x4698c504g96hcc19kkp"; depends=[htmlwidgets leaflet magrittr miniUI raster scales shiny sp]; }; QRISK3 = derive2 { name="QRISK3"; version="0.3.0"; sha256="0aqqncmlhb5iks8081y34ydlls3g31j994fqqzsbsc3ckcks87qj"; depends=[]; }; + QRM = derive2 { name="QRM"; version="0.4-31"; sha256="15dyk3zfy92vj4xny04dh5mqcyb8qh61566m313qs17mxwibvn2a"; depends=[gsl Matrix mgcv mvtnorm numDeriv Rcpp timeDate timeSeries]; }; QRank = derive2 { name="QRank"; version="1.0"; sha256="1f924r5bf5vjfl12hk1n5m3f94g30f6vmvzq2bn8295dflyndck0"; depends=[quantreg]; }; QRegVCM = derive2 { name="QRegVCM"; version="1.2"; sha256="0fcydkf6r2qxd59ylr8vn76bkxks91v58gfzvq3rjd5mqf9vsaaq"; depends=[quantreg SparseM truncSP]; }; QSARdata = derive2 { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; }; QTL_gCIMapping = derive2 { name="QTL.gCIMapping"; version="3.2"; sha256="0a4ki5scmc771sr79maian7y790bw71l67d1qpc09qprmf9i36jl"; depends=[data_table doParallel foreach MASS openxlsx parcor qtl Rcpp stringr]; }; QTL_gCIMapping_GUI = derive2 { name="QTL.gCIMapping.GUI"; version="2.0"; sha256="0jj6w8z99vpzgh76lv53zj8nv9p57y3502prr6xwkshj6rp8q1zv"; depends=[data_table doParallel foreach MASS openxlsx parcor qtl QTL_gCIMapping Rcpp shiny stringr]; }; - QTLRel = derive2 { name="QTLRel"; version="1.4"; sha256="1ni8hf7xiadfg4p05wa83x7wg26d030mfjm45phghg0i1n7lfc4b"; depends=[gdata lattice]; }; + QTLRel = derive2 { name="QTLRel"; version="1.6"; sha256="1198qrrl7samm4jzliy5i8wfvladz6wpm48l1g2x6ackm1asiw75"; depends=[gdata lattice]; }; QTOCen = derive2 { name="QTOCen"; version="0.1.1"; sha256="0wlbxk1rd56k02jf3pfzbx6xx5mmf6sb7gvds0067cvb7m42ghcr"; depends=[MatrixModels quantreg Rdpack rgenoud survival]; }; QUALYPSO = derive2 { name="QUALYPSO"; version="1.1"; sha256="0qpjv6krz66qfgyzndxihy5shmlsb0zs3wh49sxp00fh2bci5msw"; depends=[doParallel expm foreach MASS Rfast]; }; QUIC = derive2 { name="QUIC"; version="1.1"; sha256="021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"; depends=[]; }; @@ -3246,8 +3276,8 @@ in with self; { QuantileGradeR = derive2 { name="QuantileGradeR"; version="0.1.1"; sha256="1zwc6bg636gk8zll7wpznd3pzl611hcj2fmzp8b9505rra13p0g2"; depends=[]; }; QuantileNPCI = derive2 { name="QuantileNPCI"; version="0.9.0"; sha256="043lkg1pyaja7a4f9lmcwrvdjpfly2z378s15snwnxj8vb5pgr38"; depends=[]; }; QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.6"; sha256="1520jgkzp8g7gv7ggqhvlrdnpdyhygqjgsd1my5jq30afdqj6qmp"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; }; - QuantumOps = derive2 { name="QuantumOps"; version="3.0.0"; sha256="0kysrfxwnxwll8i2hv0nci8kzmx799vchchkpylqs9ia7j8yn9i6"; depends=[]; }; - Quartet = derive2 { name="Quartet"; version="1.0.3"; sha256="0rgcgnk636jzqdylax0g40kdpvxpbksds73df6j4jxin7dc6b2nk"; depends=[ape memoise Rcpp Rdpack Ternary TreeSearch]; }; + QuantumOps = derive2 { name="QuantumOps"; version="3.0.1"; sha256="0gl1myf7q444imyvsjvxiaxaahf0n0bsggwbd0z3az73l6yf1gjh"; depends=[]; }; + Quartet = derive2 { name="Quartet"; version="1.1.0"; sha256="0sndc86dbd57hv75qm7g8611jayqfx4y6qp215bxgyskhscxv09v"; depends=[ape memoise Rcpp Rdpack Ternary TreeTools]; }; QuasiSeq = derive2 { name="QuasiSeq"; version="1.0-10-2"; sha256="1mr43vys9l1n859lzlcakjrvjllybgrwl0p8mc28h7m87yjkj670"; depends=[edgeR mgcv pracma]; }; R_SamBada = derive2 { name="R.SamBada"; version="0.1.2"; sha256="123a7s3rcmraq4chiqjkdp969jmr4c5br2xamdgvj6gzaf8zpmg0"; depends=[gdsfmt SNPRelate]; }; R_cache = derive2 { name="R.cache"; version="0.14.0"; sha256="1n8n5ihkryrbxv630dwhz4r048nyv676qd3i9f5z5fa04hvlxbqq"; depends=[digest R_methodsS3 R_oo R_utils]; }; @@ -3255,32 +3285,32 @@ in with self; { R_filesets = derive2 { name="R.filesets"; version="2.13.0"; sha256="124rygq0bl9n4akxcm868nl30cyk3rz0iprb98zlpk62gci9f5fg"; depends=[digest R_cache R_methodsS3 R_oo R_utils]; }; R_huge = derive2 { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; }; R_matlab = derive2 { name="R.matlab"; version="3.6.2"; sha256="1fw6ny8xb2j088k3s9lzd15av3j6xc2bvbccyrp7yjx2f3s3i8qv"; depends=[R_methodsS3 R_oo R_utils]; }; - R_methodsS3 = derive2 { name="R.methodsS3"; version="1.7.1"; sha256="11z6v2i7jl647wxi9p5z66yvfnnqv6s7fxqmz7w2gkb6j8wl1f24"; depends=[]; }; + R_methodsS3 = derive2 { name="R.methodsS3"; version="1.8.0"; sha256="19c5870v7b59fs6xk58bh3rfkmhfralmgsax86zzpdmz47pga1g0"; depends=[]; }; R_oo = derive2 { name="R.oo"; version="1.23.0"; sha256="189fb7mmyzwg6nn8rza8iip7fbyws7i2vkmzy672x9mhvgilq4pm"; depends=[R_methodsS3]; }; R_rsp = derive2 { name="R.rsp"; version="0.43.2"; sha256="128zqyvbq9hm9gy86jzhj609lkfw57vr24mdxgh46ncmx66ag4gj"; depends=[digest R_cache R_methodsS3 R_oo R_utils]; }; R_temis = derive2 { name="R.temis"; version="0.1.2"; sha256="1bar4vyjnc9plwqm66vbgf6rakgj095zb7wsypmf3j3az694y62q"; depends=[crayon explor FactoMineR igraph NLP slam SnowballC stringi testthat tm tm_plugin_alceste tm_plugin_europresse tm_plugin_factiva tm_plugin_lexisnexis wordcloud]; }; R_utils = derive2 { name="R.utils"; version="2.9.2"; sha256="1krj1ny7y43lpm2q8c7swxfdc3ngy2j8knzv71f8bfsgh673nsxc"; depends=[R_methodsS3 R_oo]; }; R0 = derive2 { name="R0"; version="1.2-6"; sha256="1yvcgchxlj7hkgqkw6g8pxnracxkld1grgykkcr6wbhminbylqv8"; depends=[MASS]; }; R1magic = derive2 { name="R1magic"; version="0.3.2"; sha256="1xfldr5y7pfdi6qljjvckknsv2wi9rnzwmqxkpgnyc96md2fvwjr"; depends=[]; }; + R2019nCoV = derive2 { name="R2019nCoV"; version="0.1.0"; sha256="1959mwacn0zzq0g5ili2v6aqs51rb6qvlsv16xx7qwml8xahf215"; depends=[dplyr ggplot2 jsonlite maps pinyin]; }; + R2Addhaz = derive2 { name="R2Addhaz"; version="0.1.0"; sha256="1xaqbzq2chsgkg1gc163fq8qcgzq9wwn2bm4mwvc31ay0gg4f3xi"; depends=[ahaz caTools pracma Rdpack survival zoo]; }; R2BEAT = derive2 { name="R2BEAT"; version="1.0.1"; sha256="0x0gb3gpvjmwa6f2p0p45m86l9iy7nwmcjhyi68lg694cvd9ny37"; depends=[]; }; R2BayesX = derive2 { name="R2BayesX"; version="1.1-1"; sha256="1ff8cscl839ykp7l34sscc8zqp516mh64igk7dfv9n02l40w8ypf"; depends=[BayesXsrc colorspace mgcv]; }; R2DGC = derive2 { name="R2DGC"; version="1.0.3"; sha256="0f84fmpf3m2s2p6bllvjs8rgnhwjy54adblv02dq8gakwvb4j2aw"; depends=[]; }; - R2DT = derive2 { name="R2DT"; version="0.1"; sha256="0zydrdx6xdlacq6s01jwv4rv6ydmbwmiif40rilp8h76bim0kdbr"; depends=[data_table devFunc plyr]; }; - R2GUESS = derive2 { name="R2GUESS"; version="2.0"; sha256="16spx5wq755ar5fvkncikaabrw75hbgnxi7j32vjg8qk4knjiwj9"; depends=[fields MCMCpack mixOmics mvtnorm snowfall]; }; + R2DT = derive2 { name="R2DT"; version="0.2"; sha256="0hyisq6mij80v14sjspn9idd1h38sd1knbpd0dn2wy9k2w1fl0pk"; depends=[data_table devFunc plyr]; }; R2HTML = derive2 { name="R2HTML"; version="2.3.2"; sha256="00kxny7hajs9r2kw63qk7d03ggdxx2j1g8vbrmzp806y8aczvik9"; depends=[]; }; R2MLwiN = derive2 { name="R2MLwiN"; version="0.8-6"; sha256="1qhhigb9yryciq3j28q7wcvyw49nvf2mb8m9nj1c14z0pchi7xir"; depends=[coda digest doParallel foreach foreign lattice Matrix memisc R2WinBUGS texreg]; }; - R2OpenBUGS = derive2 { name="R2OpenBUGS"; version="3.2-3.2"; sha256="1cxr93g0fkdv3lqdh63l2gcp7qn3q42pm1r6nzf35550k9ahkhnv"; depends=[boot coda]; }; + R2OpenBUGS = derive2 { name="R2OpenBUGS"; version="3.2-3.2.1"; sha256="0689aqa034xkbyy46m3sjanjkxrii4ma1crm5qw5kaqbx7dg153c"; depends=[boot coda]; }; R2SWF = derive2 { name="R2SWF"; version="0.9-2"; sha256="1f7bj2jqm7ys3rimgpsn252j39mw0xd008p3zqi77x1flisla0z3"; depends=[sysfonts]; }; R2WinBUGS = derive2 { name="R2WinBUGS"; version="2.1-21"; sha256="0k8k214x712vjj2k1am4zzf6scccs3b98ysiz4lwxpzm818wp1ps"; depends=[boot coda]; }; - R2admb = derive2 { name="R2admb"; version="0.7.16"; sha256="0s8p82avxdp5zmkz7amvnphn3lcyhha31mbjghibnhm9g16k0b84"; depends=[coda lattice]; }; + R2admb = derive2 { name="R2admb"; version="0.7.16.2"; sha256="1gwp850ff76lqqn6amj75rjqb1szk6x2vlhqgwng4z45i56bmdf7"; depends=[coda lattice]; }; R2jags = derive2 { name="R2jags"; version="0.5-7"; sha256="0h1d27cddyacx5m5f23rlki97iwni7clffmb2k7a4bznlnjhn50a"; depends=[abind coda R2WinBUGS rjags]; }; R2ucare = derive2 { name="R2ucare"; version="1.0.0"; sha256="1nh2wf3syxjz9flxhf8x9fd2c2ndn4dha4k34lz1nq5j4qz7wfp1"; depends=[RMark stringr]; }; R330 = derive2 { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[lattice leaps rgl s20x]; }; - R3port = derive2 { name="R3port"; version="0.1.1"; sha256="0ww0sqjx0la03qx353h0y5wr5qpc5fir3gjy4fsxkw6jrsyx9vaz"; depends=[plyr reshape2 whisker]; }; + R3port = derive2 { name="R3port"; version="0.2.3"; sha256="0m0nkmr0hj4dhb762vnin3iqhp6j4a73aslgz59wwlqi7v421vaj"; depends=[plyr reshape2 tinytex whisker]; }; R4CouchDB = derive2 { name="R4CouchDB"; version="0.7.5"; sha256="1wd1yqbs8m4zqvdm6x7mrcyk5b5pr4azm3r49nrilg8fnr2bk9rz"; depends=[bitops RCurl RJSONIO]; }; - R4dfp = derive2 { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0acmc1rgb3wr1x8sn56cwhq4xzqzcb"; depends=[]; }; R6 = derive2 { name="R6"; version="2.4.1"; sha256="0gma5z41mx02ka9h96xdyf3p6i1rx0izczrzj26c4mbnh9jgvc16"; depends=[]; }; - R62S3 = derive2 { name="R62S3"; version="1.3.1"; sha256="168iyz9zhnvbfgqnshbk9cvmzalmn1m9gxspdwr5xqa1x17hw6az"; depends=[checkmate]; }; + R62S3 = derive2 { name="R62S3"; version="1.4.1"; sha256="0g01izg77spn79xqwva2gzrvk66i20xlb789wl5rgcz7pz7gpjd2"; depends=[data_table]; }; R6DS = derive2 { name="R6DS"; version="1.2.0"; sha256="0ai1yqfhn634vm88waxdb6j24vwcna29gdqzdrwm0nxwf7l6g0m3"; depends=[R6]; }; RAC = derive2 { name="RAC"; version="1.5"; sha256="0q0kk9j3blrnhv0rfmryc35lli5j4kds2vmjdpg77znagb45609k"; depends=[maps maptools matrixStats ncdf4 plotrix raster rgdal rgeos rstudioapi sp]; }; RAD = derive2 { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[MASS mvtnorm]; }; @@ -3294,22 +3324,22 @@ in with self; { RANN = derive2 { name="RANN"; version="2.6.1"; sha256="10kid40w9w7vkz2hpcfkdpxr4afxzms5dzvfwr0sl5xynzgw76dj"; depends=[]; }; RAP = derive2 { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; }; RAPIDR = derive2 { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[Biostrings data_table GenomicAlignments GenomicRanges PropCIs Rsamtools]; }; - RAPTOR = derive2 { name="RAPTOR"; version="1.0.0"; sha256="1i3p3qa56ghcwh69vv3gnxnw13cbd99ms654j2bqr7g9qb7nl8vj"; depends=[mgcv]; }; + RAPTOR = derive2 { name="RAPTOR"; version="1.0.1"; sha256="1bj3xsl83mb8zwap8icywrfdld382fram79b0n14jbk1l87rj9r4"; depends=[mgcv]; }; RATest = derive2 { name="RATest"; version="0.1.7"; sha256="0xam006fp8qapq2lggpa0bq33qi1ziads6kfsqprdgvcfk64qzsn"; depends=[ggplot2 gridExtra quantreg]; }; RAdwords = derive2 { name="RAdwords"; version="0.1.18"; sha256="1c3m2j2cf1s51p783rdng5ns913bv7rbjc1vpmrmsxg2kf5f6qyq"; depends=[RCurl rjson]; }; RAhrefs = derive2 { name="RAhrefs"; version="0.1.4"; sha256="0yd7jbv2x711dnhbvwjjg7qhg8h8bh5564amsv9bkqw661i042m3"; depends=[assertthat httr jsonlite testthat]; }; RApiDatetime = derive2 { name="RApiDatetime"; version="0.0.4"; sha256="0z08xwdn3vzwmprx5yh2xip5bqk13zrd47lwnsa2yin2phz6yry1"; depends=[]; }; RApiSerialize = derive2 { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; }; - RAppArmor = derive2 { name="RAppArmor"; version="3.2"; sha256="0apw4l7z0jwa7bs7scfysv2amk2rxi7knw9x9j7vqlrgj0i059gm"; depends=[unix]; }; - RArcInfo = derive2 { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; }; - RAthena = derive2 { name="RAthena"; version="1.7.0"; sha256="0l3pdachqiq42bf715a70849gyi0qvf62mg4m9zfnlaifck14fz8"; depends=[data_table DBI reticulate]; }; + RAppArmor = derive2 { name="RAppArmor"; version="3.2.1"; sha256="0n75clpha3452jqk4idb6kffc4zw3vim60k5wh7ajcpwab10j94s"; depends=[unix]; }; + RAthena = derive2 { name="RAthena"; version="1.8.0"; sha256="0i428qcw3myaiy9zyc2wzwaj2d4sv8lg7w8nqppkb00nslv00il8"; depends=[data_table DBI reticulate]; }; RBF = derive2 { name="RBF"; version="1.0.0"; sha256="0q2k2ar9cd62cykg99r86cflx2nknlg32fhhsjay4xs191fapw8j"; depends=[]; }; RBMRB = derive2 { name="RBMRB"; version="2.1.2"; sha256="1m6n2kfg83mlfy22k75hy5zjf547v0rdwk9w6l04yfyrr6himbr8"; depends=[data_table ggplot2 httr plotly rjson]; }; + RBNZ = derive2 { name="RBNZ"; version="1.0.1"; sha256="1bcjxzysdi1jhf46najppx86b791bxdgdq0xx8pjg57f6cwvws52"; depends=[httr lubridate readxl rvest xml2]; }; RBPcurve = derive2 { name="RBPcurve"; version="1.2"; sha256="0zkfvnhm780vid4qqdrx9mnc6jxxrmrnq47pqvk35rm3m4l96782"; depends=[BBmisc checkmate mlr shape TeachingDemos]; }; - RBaseX = derive2 { name="RBaseX"; version="0.1.4"; sha256="0wid1vvbj3vlj1l6z5gd7kkjmskmrggj3dmqba4y7nwyvfr0d0hg"; depends=[dplyr magrittr openssl R6 RCurl stringr]; }; - RBesT = derive2 { name="RBesT"; version="1.5-4"; sha256="1050lhwa7ph5xlzchx0lz7fx6bnfl5zhrim9cy2lh4fxw0vdm7xp"; depends=[assertthat bayesplot BH checkmate dplyr Formula ggplot2 mvtnorm Rcpp RcppEigen rstan StanHeaders]; }; + RBaseX = derive2 { name="RBaseX"; version="0.2.4"; sha256="0y3mza485jj7aj3x4hnspkkgsg8y3zmgvhd3zb9p01iafa3ck91p"; depends=[dplyr magrittr openssl R6 RCurl stringr tibble]; }; + RBesT = derive2 { name="RBesT"; version="1.6-0"; sha256="0wanwx42ayy4likabdjkamzrlwgkwvas1mpcjdrsxirrl7bs38ds"; depends=[assertthat bayesplot BH checkmate dplyr Formula ggplot2 mvtnorm Rcpp RcppEigen rstan StanHeaders]; }; RBitmoji = derive2 { name="RBitmoji"; version="0.0.2"; sha256="1v9qj3vmqsvnccsy735nbflmd81183h2flm0f1ckd4kl08r2fr3f"; depends=[getPass httr jsonlite png RCurl]; }; - RBtest = derive2 { name="RBtest"; version="1.0"; sha256="1pyygx39r5dd81xqzqmxhkwapaq7pc5q1bp0gwx28cp4wi07mm6i"; depends=[mice nnet psych]; }; + RBtest = derive2 { name="RBtest"; version="1.1"; sha256="09da721zfj6cw4i9gifn5f0sv3nj0qfjb96c5w9g9gzx55ihssnk"; depends=[mice nnet psych]; }; RCA = derive2 { name="RCA"; version="2.0"; sha256="0pidb5czrf0dc3ywy6cwm5akgsc62pvf94kfyxibzmd1favykx1h"; depends=[gplots igraph]; }; RCAL = derive2 { name="RCAL"; version="1.0"; sha256="1hpn69891h9cildwr6wsssa3fnnzyw0xw9vfgf4qdg0m9x6il6qb"; depends=[trust]; }; RCALI = derive2 { name="RCALI"; version="0.3.1"; sha256="0hc7h55qi8bpmp9rfh1wgxqs28kbs4yqxch2jlgl42vk5383askq"; depends=[splancs]; }; @@ -3317,19 +3347,20 @@ in with self; { RCMIP5 = derive2 { name="RCMIP5"; version="1.2.0"; sha256="0bwp1ln0y48g2d0bj9b47y0rlwffzv0pi6gjfzv4sg5anhswc9x7"; depends=[abind assertthat digest dplyr Matrix]; }; RCPmod = derive2 { name="RCPmod"; version="2.190"; sha256="1r24g8fcizyqzgp0da90sxpwalgcsgz2b168j2smpylxraiqb037"; depends=[fishMod glmnet gtools MASS]; }; RCRnorm = derive2 { name="RCRnorm"; version="0.0.2"; sha256="1mz1jb7mc9c47hbk9flnddny4zir6r2k5qis30iynwqny521l6ln"; depends=[truncnorm]; }; - RCSF = derive2 { name="RCSF"; version="1.0.1"; sha256="0mqrv0bk17mm8ywicmns90n8g9h161hw1l77ji7hvadiv0y7vznq"; depends=[Rcpp]; }; + RCSF = derive2 { name="RCSF"; version="1.0.2"; sha256="1hjl7qsdgcddn3nh2likndhfhnw9gj3453xqq96gddgb1y0m3bh1"; depends=[Rcpp]; }; + RCT = derive2 { name="RCT"; version="1.0.1"; sha256="07lhss3v13nmn3hr3ky0vdc2miavy0bpymginibn302f07kf8hys"; depends=[broom dplyr forcats ggplot2 glue lfe magrittr MASS pracma purrr rlang stringr tidyr tidyselect]; }; RCarb = derive2 { name="RCarb"; version="0.1.3"; sha256="0z5hpnlzlvbh14f1wjy9rw4ljdsiqdzmqnmh3yqz7mbw5qxx4gzz"; depends=[interp matrixStats]; }; RCassandra = derive2 { name="RCassandra"; version="0.1-3"; sha256="0xa241s81cyw6lfjb522f2mlyrd0gav9yz3z5jab9hpdpgg9ri38"; depends=[]; }; RChronoModel = derive2 { name="RChronoModel"; version="0.4"; sha256="0haqxwic160pnnm90bgchzxmsdwmi6m97i9xrh8js8bp2xn76l5f"; depends=[hdrcde]; }; RCircos = derive2 { name="RCircos"; version="1.2.1"; sha256="1zdq3ga2pd0p2gzlm0vr8w3a4rq4hgka3r56kkcym0za0nmqk51v"; depends=[]; }; + RClickhouse = derive2 { name="RClickhouse"; version="0.5.2"; sha256="1ii4d1nh15km1savahpwgvdn3lb2y7sa44izqydckw1xawwgf7xr"; depends=[bit64 DBI dbplyr dplyr Rcpp]; }; RClone = derive2 { name="RClone"; version="1.0.2"; sha256="1kv02acj0mk5102wvmdnxnkb7qig3jb9amcs4k2r26fpa4hyfa7f"; depends=[]; }; RColetum = derive2 { name="RColetum"; version="0.2.1"; sha256="1hgk9p234m3w49sw2j2rg8c14z3gz1mabvb69b1bxrg7f1mz9slg"; depends=[dplyr httr jsonlite]; }; RColorBrewer = derive2 { name="RColorBrewer"; version="1.1-2"; sha256="1pfcl8z1pnsssfaaz9dvdckyfnnc6rcq56dhislbf571hhg7isgk"; depends=[]; }; RConics = derive2 { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra24s0rjmnkccihhqn3byckqx6y8kq7ds"; depends=[]; }; RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; }; - RCrypto = derive2 { name="RCrypto"; version="0.1.0"; sha256="1lw7hq5ks36fixk0g3gcy4nw21ygwc14jq840hnhyds4glywfpvm"; depends=[dplyr httr jsonlite]; }; - RCurl = derive2 { name="RCurl"; version="1.98-1.1"; sha256="1zqiawhx5v06vmcg87rmx2qdd9fa4svds3i9a1lphchvprr93jkf"; depends=[bitops]; }; - RCzechia = derive2 { name="RCzechia"; version="1.4.5"; sha256="1ar3vkslwzqmljq01swdqk72i2q4pcr7x58pi79gaxwx2p1h4bsl"; depends=[curl dplyr httr jsonlite lwgeom magrittr rlang sf]; }; + RCurl = derive2 { name="RCurl"; version="1.98-1.2"; sha256="1a57jm41550ah3v7cqdv5gdabhp375qgcndr901lns65qg6s0x2x"; depends=[bitops]; }; + RCzechia = derive2 { name="RCzechia"; version="1.4.6"; sha256="1p2np23pyvx6161ad3kcskjvipx5g3dgr58v0pdj7lh1lqnyqzc9"; depends=[curl dplyr httr jsonlite magrittr rlang sf]; }; RDFTensor = derive2 { name="RDFTensor"; version="1.1"; sha256="1xbar13snwyls6rva91bs0632zplfc2qcqlwf7h07r8798m3234s"; depends=[Matrix pracma]; }; RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; }; RDML = derive2 { name="RDML"; version="1.0"; sha256="13ly1p42njbcygwvkyii8sjqbsywjy5w5g1kd7m8kswi5dsk3qqv"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; }; @@ -3343,8 +3374,8 @@ in with self; { REAT = derive2 { name="REAT"; version="3.0.2"; sha256="0x5cal502n8abynx1jk2ccmmggvd41rvd2gc6rxkbyvcp4794l82"; depends=[]; }; REBayes = derive2 { name="REBayes"; version="2.2"; sha256="1jh5vw9pbcf5gpmx3b5b36fh8rz5y8npx53aai0kxh49kjf8d63c"; depends=[Matrix reliaR]; }; RECA = derive2 { name="RECA"; version="1.7"; sha256="1xikj20flqajpkw4wyynmqd1pafbylzwfrmc8bz9pqgggjjhrqql"; depends=[]; }; - REDCapExporter = derive2 { name="REDCapExporter"; version="0.1.0"; sha256="1sqxx6qd7sg76ybpvhk0xzhmlc73bknn3v2cj3s24dyg783ywaqx"; depends=[lubridate RCurl]; }; - REDCapR = derive2 { name="REDCapR"; version="0.10.2"; sha256="0rdni325k0641yfv4g9l1szg1bl48767n6r1xkh8q3fnvqaqwnrg"; depends=[dplyr httr magrittr readr rlang tibble tidyr]; }; + REDCapExporter = derive2 { name="REDCapExporter"; version="0.2.0"; sha256="0h9sz5hd5b0paqybid8xjx7lbirlknazx11phylqixmnl9a8qra3"; depends=[data_table keyring lubridate RCurl]; }; + REDCapR = derive2 { name="REDCapR"; version="0.11.0"; sha256="0frhmnm25w9b84qk7vvvr8wkv1w3dmm0vqxav2cs7jimq38zwcvz"; depends=[checkmate dplyr httr magrittr readr rlang tibble tidyr]; }; REEMtree = derive2 { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; }; REGENT = derive2 { name="REGENT"; version="1.0.6"; sha256="1f2sjqkhw3rbmwbcmx7l7imj696kblisi8y3fz77xygbcbxa6rmq"; depends=[]; }; REPLesentR = derive2 { name="REPLesentR"; version="0.4.1"; sha256="0rwd7hxk12f4f1kpj6sl424yhbxi3h9dz6km5awijazmgv95carz"; depends=[dat knitr modules]; }; @@ -3355,15 +3386,14 @@ in with self; { RESS = derive2 { name="RESS"; version="1.3"; sha256="1vddmifp47ia0sk35rnjpvw6gr9ygygafqczq268h17i1qs6ar22"; depends=[]; }; REST = derive2 { name="REST"; version="1.0.1"; sha256="16v89z7p9qkg7bsypf9vkrnbmb2n7gw3fqnfzbyxwj496wzxdv1x"; depends=[Rcmdr]; }; REdaS = derive2 { name="REdaS"; version="0.9.3"; sha256="09mmcvzgsxvrcq7sq3pw81pxgb1493p8lx8p5hhz8i42vshza6pn"; depends=[]; }; - REddyProc = derive2 { name="REddyProc"; version="1.2"; sha256="1jwmxr9xl45n7r3h6h634lw81j07bn26nhjhwww5nnwwyyylcn4b"; depends=[dplyr magrittr mlegp purrr Rcpp rlang solartime tibble]; }; + REddyProc = derive2 { name="REddyProc"; version="1.2.2"; sha256="0b1vyv92wxbvdh1jaqmfb4qb1clpbh50j8h55nq777zc1l9ml4a7"; depends=[dplyr magrittr mlegp purrr Rcpp rlang solartime tibble]; }; REddyProcNCDF = derive2 { name="REddyProcNCDF"; version="1.1.4"; sha256="099f4mzqj7pjlrs8rdjg44mjm0058x3pj2imrfvk892hmlk4r53p"; depends=[REddyProc]; }; + REndo = derive2 { name="REndo"; version="2.3.1"; sha256="0v0p750nbvmr70qhmq4h995xfnp1phmwa990ifgk8y1ka7frwzrx"; depends=[AER corpcor data_table Formula lme4 Matrix mvtnorm optimx]; }; RFGLS = derive2 { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; }; RFLPtools = derive2 { name="RFLPtools"; version="1.6"; sha256="1hl2crg7jl266zac41xvx151h7kl52346wnlvd8hba64s4s4apay"; depends=[RColorBrewer]; }; RFOC = derive2 { name="RFOC"; version="3.4-6"; sha256="0cs5wmpvrlag9aisbfiwkvwcb3skv5z4sawl30krmsq49mzj7yhd"; depends=[GEOmap MASS RPMG RSEIS splancs]; }; - RFgroove = derive2 { name="RFgroove"; version="1.1"; sha256="1ank7jvmn83w0xzylf7i0fjb60mbrzzydspksfzcy16rkl6f5dvb"; depends=[fda randomForest wmtsa]; }; RFinanceYJ = derive2 { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0zckjkspsajzh8m10cf75ixjlgd0nj8rm41fngm3"; depends=[XML xts]; }; RFishBC = derive2 { name="RFishBC"; version="0.2.3"; sha256="1xhjsinb6dfr1zzzyvawc6bb10dnr3nbx86mi6lrzav42sbq31ni"; depends=[cli clisymbols crayon readbitmap rlang settings stringr tidyr withr]; }; - RFmarkerDetector = derive2 { name="RFmarkerDetector"; version="1.0.1"; sha256="1zd0sbcji620pka5600ilj4bq9gzdnk5kf82qfd5k5dcx7q9x7rk"; depends=[AUCRF ggplot2 randomForest ROCR UsingR WilcoxCV]; }; RFmerge = derive2 { name="RFmerge"; version="0.1-6"; sha256="1pskpfn9wcjq54szcskqakgnv0wwikyadhb1780icivmp10nklnn"; depends=[pbapply randomForest raster sf sp zoo]; }; RForcecom = derive2 { name="RForcecom"; version="1.1"; sha256="1ch1pwpnqagzb9n4qbgr804bmnz819kp36r5a4zhijmq8xpv3qr2"; depends=[httr plyr RCurl XML]; }; RFormatter = derive2 { name="RFormatter"; version="0.1.1"; sha256="0jmzdc2cl4vvffsyfwp493fiygh9xinhv970qxp1667rw8wlap8l"; depends=[formatR]; }; @@ -3371,20 +3401,19 @@ in with self; { RGA = derive2 { name="RGA"; version="0.4.2"; sha256="0pjizgvrh0gbjlyxlb3v93nhigg8rpq3mziv1qlp6r0s5y7cmpi9"; depends=[httr jsonlite lubridate plyr]; }; RGBM = derive2 { name="RGBM"; version="1.0-8"; sha256="0xd64g07y808nzs4zvbx6bxdpbj2ndqg6yzc3p0l43pxm4hyxva0"; depends=[doParallel foreach plyr]; }; RGCCA = derive2 { name="RGCCA"; version="2.1.2"; sha256="0zcxakqnmih0243y5b6r9nmcfanzxd6q344pd5bca5pnm3y43wr0"; depends=[Deriv MASS]; }; - RGCxGC = derive2 { name="RGCxGC"; version="1.1.0"; sha256="06f1jzs2x9im1vbsj2nfwvda8qchpmza1glgx6v4cn5nnli060fp"; depends=[colorRamps mixOmics ptw Rdpack RNetCDF]; }; + RGCxGC = derive2 { name="RGCxGC"; version="1.1-2"; sha256="03ihqra8q50a98adgxrx8l7js963f41kg2fy3lxzh9zma4gzj62q"; depends=[colorRamps mixOmics ptw Rdpack RNetCDF]; }; RGENERATE = derive2 { name="RGENERATE"; version="1.3.5"; sha256="12dq04xpl06zhkzwqx3zy0bkpvb5phbdj2inxsyczf6d4dk209mb"; depends=[RMAWGEN]; }; RGENERATEPREC = derive2 { name="RGENERATEPREC"; version="1.2.5"; sha256="1jqyp91x569la1vc6wl6v7jq6iq1cx2qkds9yiqm85bgzydp4lxw"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; }; RGF = derive2 { name="RGF"; version="1.0.6"; sha256="11pnbiyp39r95c8ajj2jyxz4h1zf6fi8ki78rmn4vp7xm2bl3zff"; depends=[Matrix R6 reticulate]; }; RGIFT = derive2 { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; }; - RGISTools = derive2 { name="RGISTools"; version="1.0.0"; sha256="10ra22xsqz6y4dcc6vbi8fmbd2k84bhf9icys06z02sizzfm8dl7"; depends=[curl fields httr mapview raster Rdpack rjson rvest sf sp tmap urltools XML xml2]; }; RGeckoboard = derive2 { name="RGeckoboard"; version="0.1-5"; sha256="0h7x3kdmlba9siwcnf313ajmz2jsmyhl7pndzs7qaqina3hkl46r"; depends=[httr jsonlite]; }; RGenData = derive2 { name="RGenData"; version="1.0"; sha256="124h2qvp0f6cil7zf4ln3n0jlqcfzdwbihzfaklk2lxxn7gq4mbi"; depends=[]; }; RGenetics = derive2 { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; }; RGeode = derive2 { name="RGeode"; version="0.1.0"; sha256="1g8ha6zg4pvi8qimiihsa6rjfdcyj0q526l44jajjbqczmwg59lv"; depends=[MASS Rcpp]; }; RGoogleAnalytics = derive2 { name="RGoogleAnalytics"; version="0.1.6"; sha256="05wbcdksx5g6y7x4r1pvc9is3afxbpdxdbmc6b4jhn46rg4228z4"; depends=[digest httr lubridate]; }; RGoogleAnalyticsPremium = derive2 { name="RGoogleAnalyticsPremium"; version="0.1.1"; sha256="0d22pdd5kvnrspikfb66ny07pgx96rvykr0zi78rwn6g1symdb4q"; depends=[httr jsonlite lubridate]; }; - RGoogleFit = derive2 { name="RGoogleFit"; version="0.3.1"; sha256="0g4r5vb9zv6mqym1mh028ic9hkmlpklrhq4ks5sys7y60ps893k1"; depends=[bit64 httr jsonlite RCurl]; }; - RGraphics = derive2 { name="RGraphics"; version="2.0-14"; sha256="0bv95g17pvpq3nji0akphdaznh9k85hf5z78qypxwfqr76brxd05"; depends=[ggplot2 lattice]; }; + RGoogleFit = derive2 { name="RGoogleFit"; version="0.4.0"; sha256="0k1vvl4l6pq37llpbq996rbghdfld7mz7bhzbpw393fmrkd45vyi"; depends=[bit64 httr jsonlite RCurl]; }; + RGraphics = derive2 { name="RGraphics"; version="3.0-1"; sha256="1xd0i0k8870r0g7g4nq0dwr8mda5g2v0k66lzhr4znwll20zgg52"; depends=[ggplot2 gridBase gridGraphics gridSVG grImport grImport2 lattice]; }; RGreenplum = derive2 { name="RGreenplum"; version="0.1.2"; sha256="1mc0zmmnb9306j2cjn1j71bp35ri8p35rw6rlmrqyxgpvlw09r3d"; depends=[DBI RPostgres]; }; RGtk2 = derive2 { name="RGtk2"; version="2.20.36"; sha256="1vzb3wklm2iwhvggalalccr06ngx6zgv3bxjb8c3rsg9va82bzyp"; depends=[]; }; RH2 = derive2 { name="RH2"; version="0.2.4"; sha256="14590l3a2znd56nrq1zfbfv7fgii4672qy1xfwiynrh3mjad217k"; depends=[chron rJava RJDBC]; }; @@ -3396,31 +3425,32 @@ in with self; { RI2by2 = derive2 { name="RI2by2"; version="1.3"; sha256="0smc0fb9anq5ih9zx2slfbqyx02njm0hc7g22gpfggskmxf2l509"; depends=[gtools Rcpp]; }; RIA = derive2 { name="RIA"; version="1.4.2"; sha256="0i7z16viwgdsdnlkxq44p5l492asxv7ghn8005hlvpyxqihazkqw"; depends=[nat oro_dicom oro_nifti]; }; RIFS = derive2 { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; }; - RISCA = derive2 { name="RISCA"; version="0.8"; sha256="0z6wq5bmfx6zrj7cnd7y0x8h7qkz4njcvb8jb1mil92zx2z47d43"; depends=[date MASS mvtnorm nlme relsurv riskRegression statmod survival]; }; + RISCA = derive2 { name="RISCA"; version="0.8.2"; sha256="16vpbg0grl497y5r6a3vm0nj1si6qbc6xxiyjb4wsmfgk13rw1dp"; depends=[caret date doParallel foreach glmnet kernlab MASS mvtnorm nlme nnet relsurv statmod SuperLearner survival]; }; RISmed = derive2 { name="RISmed"; version="2.1.7"; sha256="08dmkkxsmwp9b4h2g1bbx03cijn793fsnzkmbima8x9d42vxnm1l"; depends=[]; }; RIdeogram = derive2 { name="RIdeogram"; version="0.2.2"; sha256="0wvzlnisnxwzdzfh8ph4yspr8abi5qk6p4z2qa14ykzn8yry61ni"; depends=[ggplot2 grImport2 rsvg scales tidyr]; }; RImageJROI = derive2 { name="RImageJROI"; version="0.1.1"; sha256="0a4sa60klbpl31qxxvjjbksdhvs3vwm9na1v7014v93fzxy6bjas"; depends=[spatstat]; }; RImagePalette = derive2 { name="RImagePalette"; version="0.1.1"; sha256="054w8xzsn330qg7piq6ajhji9na2swkkdis2567cy3q099npfl5v"; depends=[ggplot2]; }; RImpact = derive2 { name="RImpact"; version="1.0"; sha256="010bdq6r2fv4rs78kl1ixnw1di39v90ckh8bblzi0wv4adlbaza4"; depends=[]; }; - RInSp = derive2 { name="RInSp"; version="1.2.3"; sha256="1nm29q2gysway4r7rdjr08m0w8lh2m9akhjh7swgjwrg4f15kfmy"; depends=[]; }; - RInside = derive2 { name="RInside"; version="0.2.15"; sha256="0azhialpdkfm5yzgazq2mfynm8ndyg9d9b569jmg6qa9b2iqf78y"; depends=[Rcpp]; }; + RInSp = derive2 { name="RInSp"; version="1.2.4"; sha256="1rfikmrz1y7sx9qwsqh5ifqryf6218n9dbhfmk2w2vl2pdgw4xyr"; depends=[]; }; + RInside = derive2 { name="RInside"; version="0.2.16"; sha256="03iabanmj5xkgq7r1n1rkmzjf2zz484637nmd1qg61ga53hsvr3s"; depends=[Rcpp]; }; RItools = derive2 { name="RItools"; version="0.1-17"; sha256="1shcvkgsyjk9jmpf7icj1zjlvmqa11scmymc8cycnffax604frbm"; depends=[abind SparseM survival svd xtable]; }; - RJDBC = derive2 { name="RJDBC"; version="0.2-7.1"; sha256="1d36js3kwlghsjxfhv7rl8nvg210hxwrx8sdxrxb0inwlqsash25"; depends=[DBI rJava]; }; - RJDemetra = derive2 { name="RJDemetra"; version="0.1.4"; sha256="0ddps7i7c9hj36jp0567x1fzks981vw45bz16c1dablskw87b0sf"; depends=[rJava]; }; - RJSDMX = derive2 { name="RJSDMX"; version="2.1-0"; sha256="1z1fhm6as9m35v11n5npv3mlaaal7w5c04g4yl2p26ljsmssfbsh"; depends=[rJava zoo]; }; + RJDBC = derive2 { name="RJDBC"; version="0.2-8"; sha256="1qfq1vjlxhg3hmb1169zkss7kng74jhjninqkfr3cca8x1fq9593"; depends=[DBI rJava]; }; + RJDemetra = derive2 { name="RJDemetra"; version="0.1.5"; sha256="16iri92h0smf2vqwr0za4698qidncmqb4fimbidizqr7205xa1cw"; depends=[rJava]; }; + RJSDMX = derive2 { name="RJSDMX"; version="2.3-3"; sha256="02lbg82g4abng5vcn2g8ghvmg69q35my8smnbvd09yvha8hb49ps"; depends=[rJava zoo]; }; RJSONIO = derive2 { name="RJSONIO"; version="1.3-1.4"; sha256="141ijm9570mg1180isvi0jb9vd3b08s5gb9dl1wa5v0m3s9jq52l"; depends=[]; }; RJSplot = derive2 { name="RJSplot"; version="2.5"; sha256="0p2zqbq29pfjl703wqqjzgmif7yfzz7l8rzarjf5axkdy7w7fcyl"; depends=[]; }; - RJafroc = derive2 { name="RJafroc"; version="1.3.1"; sha256="1sa5x9ya2sgddvvrp5x7v12wcm0x1f5v0ja4flpxqqiv4fcsfni3"; depends=[bbmle binom dplyr ggplot2 mvtnorm numDeriv openxlsx Rcpp stringr]; }; + RJafroc = derive2 { name="RJafroc"; version="1.3.2"; sha256="11waf05ljzfrizsbb2y6bd2cd8k7950kbq26sfyfgf4idh5w0mbp"; depends=[bbmle binom dplyr ggplot2 mvtnorm numDeriv openxlsx Rcpp stringr]; }; RKEA = derive2 { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; }; RKEAjars = derive2 { name="RKEAjars"; version="5.0-4"; sha256="1j4643xc8k3zy4rv0h8dd154jafihnjr43wzz3d93j11g2w9xhq3"; depends=[rJava]; }; - RKEEL = derive2 { name="RKEEL"; version="1.3.1"; sha256="0k13j460jalmjdicrm7rqxb1b25cx1h4c276xbiybmhrmzmjlv5y"; depends=[arules doParallel foreach gdata Matrix pmml R6 rJava RKEELdata RKEELjars XML]; }; + RKEEL = derive2 { name="RKEEL"; version="1.3.2"; sha256="120x49zblhs7grqj919m3ll9q5ddr3kkqicy1am5b8hahybiz5al"; depends=[arules doParallel foreach gdata Matrix pmml R6 rJava RKEELdata RKEELjars XML]; }; RKEELdata = derive2 { name="RKEELdata"; version="1.0.5"; sha256="1swzqw6j006ya48ahg6n1g8faxhqiv9v5q1zrnihpzj6868lf7y3"; depends=[]; }; RKEELjars = derive2 { name="RKEELjars"; version="1.0.19"; sha256="1a879b0xq5jk7r2pf4n41nm0c4himl4yqw083xh2ha4qdhab5kq0"; depends=[downloader]; }; RKHSMetaMod = derive2 { name="RKHSMetaMod"; version="1.1"; sha256="1h8gqqfmlrzyj4n997yn13vqpaw2kwzl45gscy3fdhskzmyg0ss3"; depends=[Rcpp RcppEigen RcppGSL]; }; RKUM = derive2 { name="RKUM"; version="0.1.1"; sha256="1w0v6l61dm7xixnyywsc7xziixz7k9r1ja26zcy77nry5kn6v60q"; depends=[]; }; RKelly = derive2 { name="RKelly"; version="1.0"; sha256="0mkpc95j67rg2gcj2fc4w8kv4v31cpiyvh660y8kc2fjr5q4aj3l"; depends=[]; }; RKlout = derive2 { name="RKlout"; version="1.0"; sha256="17mx099393b1m9dl3l5xjcpzmb9n3cpjghb90m9nidccxkhacmqf"; depends=[RCurl]; }; - RLRsim = derive2 { name="RLRsim"; version="3.1-3"; sha256="1r0xqay3jfg435dh9fqc6yy73wjffp658da194rx63vpfhshgz8w"; depends=[lme4 mgcv nlme Rcpp]; }; + RKorAPClient = derive2 { name="RKorAPClient"; version="0.5.7"; sha256="19sya8zajmpxl4yc9y9b6qmd816zxdlyymm8v6swykh4xlr3ghfg"; depends=[broom dplyr ggplot2 highcharter htmlwidgets httr jsonlite keyring lubridate magrittr plotly PTXQC purrr R_cache tibble tidyr]; }; + RLRsim = derive2 { name="RLRsim"; version="3.1-6"; sha256="1wkkibr250frsbfq70m9jdrylxb492zibf5w03z6zis98pjffssp"; depends=[lme4 mgcv nlme Rcpp]; }; RLT = derive2 { name="RLT"; version="3.2.2"; sha256="1a8cip975z99g8ljng4y86wv1gf1xwg0sqnxz79wj6zxpw8fk37c"; depends=[]; }; RLeafAngle = derive2 { name="RLeafAngle"; version="1.0"; sha256="1anks22hn6qpac556p99kilkhc80h572dvcyz3wj1nqffdrhgrh3"; depends=[]; }; RLogicalOps = derive2 { name="RLogicalOps"; version="0.1"; sha256="1qyn80x3x3bb5wgzyzw6pxs8a6q26yq1fkmkz7f5wywsnrj8hzfj"; depends=[rstackdeque stringr]; }; @@ -3437,7 +3467,8 @@ in with self; { RMTL = derive2 { name="RMTL"; version="0.9"; sha256="08da67wvzmibziqhnlzh43sydaihk4rsq2k5hs6ih3jkkidrhlgv"; depends=[corpcor doParallel foreach MASS psych]; }; RMThreshold = derive2 { name="RMThreshold"; version="1.1"; sha256="0wkc42vcggib002ad6ch43h6avpdgl12szrrrfd2p0wl72cwn5n1"; depends=[Matrix png]; }; RMTstat = derive2 { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; }; - RMaCzek = derive2 { name="RMaCzek"; version="1.2.0"; sha256="02wkcn079pi5il7n0dqyq89qjn0jxwcdzmm5yr894cn9npmkxgzb"; depends=[GA seriation]; }; + RMaCzek = derive2 { name="RMaCzek"; version="1.3.3"; sha256="1kn3h2gp08i8vq8304853bg5yydkdz7xlhqh2djn9r1iy69hhwg4"; depends=[GA seriation]; }; + RMallow = derive2 { name="RMallow"; version="1.1"; sha256="1s6a3347739rfc8rrh2773b278gcbp8hf5j5psm61fz7bavy9gcj"; depends=[combinat]; }; RMariaDB = derive2 { name="RMariaDB"; version="1.0.8"; sha256="1xcr5lg9da4a49dcqy3hhrpz5jn51dqa6dc50vmkq1nw372yv2iw"; depends=[BH bit64 DBI hms plogr Rcpp]; }; RMark = derive2 { name="RMark"; version="2.2.7"; sha256="0qxa383cagzqrnfc3izybb4lrg8z1r3nw1j5b7h4wkjwy0k3kczb"; depends=[coda matrixcalc msm]; }; RMediation = derive2 { name="RMediation"; version="1.1.4"; sha256="19idqx0hwljbcfrpqwa81k7cxbd8kv77ji8yi4n4p7517jbkzma6"; depends=[e1071 lavaan MASS]; }; @@ -3445,37 +3476,35 @@ in with self; { RMixtComp = derive2 { name="RMixtComp"; version="4.1.0"; sha256="00hygbbzbr5sdbhjzg0k4a7wj88dscmaln6bnxl6ywbzhdh902x4"; depends=[ggplot2 plotly RMixtCompIO RMixtCompUtilities scales]; }; RMixtCompIO = derive2 { name="RMixtCompIO"; version="4.0.2"; sha256="03dlljykbn2jjnrys2s02vz091f09f92c7h53qxsd2r19l59ymnf"; depends=[BH doParallel foreach Rcpp RcppEigen]; }; RMixtCompUtilities = derive2 { name="RMixtCompUtilities"; version="4.1.0"; sha256="0c6sjn6j0g6zc44w5knsgd6ga138gci54yilak8w0xrv5kr7mj3w"; depends=[ggplot2 plotly scales]; }; - RMySQL = derive2 { name="RMySQL"; version="0.10.18"; sha256="0r4626sk78fhlgivr0c7mwg9mj29ayr0iz5x90rdl4d5nc2r6kq4"; depends=[DBI]; }; - RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.2"; sha256="07wk0i8iz3cvkiqawxhm61g3nka8adw0zrrv60zx329gg49w0ycl"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; }; - RNAsmc = derive2 { name="RNAsmc"; version="0.4.0"; sha256="17gkhmnrxa1zwh6qhc0x48smgyq35g5gdb4wv0m5pnbyhkqzs7sq"; depends=[RRNA]; }; + RMySQL = derive2 { name="RMySQL"; version="0.10.20"; sha256="0lv9m6zpm8dgv7yixr6xhw379vbq45d7n7gkrmjrppdj8vcih77i"; depends=[DBI]; }; + RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.3"; sha256="1fn3q49dswi8hsyxkkgmq35gbdmnn72kzmfk89vd7gjvm67skvm6"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; }; + RNAsmc = derive2 { name="RNAsmc"; version="0.6.0"; sha256="0q4b24baabzx41zqygy6l2jnyzc4m7knmlnhra4hhc5f5cl5ab8r"; depends=[circlize RRNA]; }; RNAstructureModuleMiner = derive2 { name="RNAstructureModuleMiner"; version="0.1.0"; sha256="026r1h4z1jdfww0ay9iixa77ax6b19pgp589bbn77xg1vwjjlbsk"; depends=[RRNA]; }; RNCBIEUtilsLibs = derive2 { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; }; - RNCEP = derive2 { name="RNCEP"; version="1.0.8"; sha256="0nkx33997c5rgc3ch5a2bb6rrw5xw1y71rliygw5k1ldi335rsm7"; depends=[abind fields fossil maps RColorBrewer sp tgp]; }; + RNCEP = derive2 { name="RNCEP"; version="1.0.9"; sha256="1rbz8i4id5an95pcw6mbc30cjkj3pr5hc4hzfkcyhy5nnfxz784b"; depends=[abind fields maps RColorBrewer sp tgp]; }; RND = derive2 { name="RND"; version="1.2"; sha256="1rl5apgw43c841z0lapi9z2jn979dvqh4x1qkqx1ad77zcq87c85"; depends=[]; }; RNGforGPD = derive2 { name="RNGforGPD"; version="1.0.2"; sha256="0z1jawq3342ffbv1jp7kfzll9pac5ff09qb3fd0vz564kqcvik0n"; depends=[corpcor Matrix mvtnorm VGAM]; }; RNHANES = derive2 { name="RNHANES"; version="1.1.0"; sha256="045ykpgxvc22blbp47ysbk6a6x4akjd39pjr114cr23s7f48g6h4"; depends=[dplyr foreign rvest survey xml2]; }; RNOmni = derive2 { name="RNOmni"; version="0.7.1"; sha256="0lzd820x9yw90ddzmxvd89pkqc3nrljlc6kz4cab50zj3s755ack"; depends=[abind foreach plyr Rcpp RcppEigen]; }; RNRCS = derive2 { name="RNRCS"; version="0.2.5"; sha256="19q78l8mh4701vqvr36vqc87n39s5ivzhiy5lvnxbd4dgibk1jr2"; depends=[ggplot2 magrittr rvest xml2]; }; RNaviCell = derive2 { name="RNaviCell"; version="0.2"; sha256="15k8hkagn5520fy7x672fy329s2v7l0x44s44f6v7ql9mmg4b635"; depends=[RCurl RJSONIO]; }; - RNeXML = derive2 { name="RNeXML"; version="2.4.0"; sha256="164krdabq3xqw8djmbpwj20vx074x9dgcdy5l1hr06cmz2bahqp1"; depends=[ape dplyr httr lazyeval plyr reshape2 stringi stringr tidyr uuid XML xml2]; }; + RNeXML = derive2 { name="RNeXML"; version="2.4.3"; sha256="09d915hl8bfs3qg1lijh5kvs86rf0w25rh8p5p4mjnjdva9ir05z"; depends=[ape dplyr httr lazyeval plyr reshape2 stringi stringr tidyr uuid XML xml2]; }; RNentropy = derive2 { name="RNentropy"; version="1.2.2"; sha256="0chvmrvpyyghilwb63y6pd1zp94i5qhpv5w19x9nw0ypk86pp2dj"; depends=[]; }; RNetCDF = derive2 { name="RNetCDF"; version="2.1-1"; sha256="0i670giq741d78ps6y98xbnqdybkv2svmdd6jbvcbpgdry6pfw89"; depends=[]; }; RNetLogo = derive2 { name="RNetLogo"; version="1.0-4"; sha256="1z7jp454k197c0zbkn64zmf25wadkiznv3w2csgiz917cbx6xcn1"; depends=[igraph rJava]; }; - RNewsflow = derive2 { name="RNewsflow"; version="1.2.1"; sha256="07469svqqjskrf04cm0ga5h94yb5h845dhz5gp740f16ymm0gkci"; depends=[data_table igraph Matrix quanteda Rcpp RcppEigen RcppProgress scales stringi tm wordcloud]; }; - RNifti = derive2 { name="RNifti"; version="1.0.1"; sha256="0hfid40pgfi1ykqka8y3v0m7h0iyd6fbvycvqlad3ibmbg621f0w"; depends=[Rcpp]; }; - RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.7"; sha256="1qx6igv0kdja2c139gbs42cwfjwj7ifcxxlswydvja03iz3k53wz"; depends=[ore Rcpp RcppEigen RNifti]; }; + RNewsflow = derive2 { name="RNewsflow"; version="1.2.3"; sha256="0cbvcz2dgx3nvhvj73k6s901v5p5fy8zl4hx4r696cf14n60c0yb"; depends=[data_table igraph Matrix quanteda Rcpp RcppEigen RcppProgress scales stringi tm wordcloud]; }; + RNifti = derive2 { name="RNifti"; version="1.1.0"; sha256="1z8ninp3aq18w0slcfn8r2fp48cdz8l0k0namsrnvgyp8lzcpqpn"; depends=[Rcpp]; }; + RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.8"; sha256="19lij5zplw7jw65ykkjl85iqpfq3i6sia4wnq7fmkv1xlzwda2f4"; depends=[ore Rcpp RcppEigen RNifti]; }; ROAuth = derive2 { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[digest RCurl]; }; - ROC632 = derive2 { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[penalized survival survivalROC]; }; ROCR = derive2 { name="ROCR"; version="1.0-7"; sha256="1jay8cm7lgq56i967vm5c2hgaxqkphfpip0gn941li3yhh7p3vz7"; depends=[gplots]; }; ROCS = derive2 { name="ROCS"; version="1.3"; sha256="11vdf8701ap6ya7c7kx9jhvg7qfc6vkij3jridna6f4xj384grki"; depends=[poibin rgl]; }; ROCit = derive2 { name="ROCit"; version="1.1.1"; sha256="1bip1zz5chm06pfikkscahph2clsaf9rhhpsla6vmvpfy0d8p070"; depends=[]; }; - ROCt = derive2 { name="ROCt"; version="0.9.5"; sha256="0f7day0rv62ggm1nc7qkh45r6svr84mdk7xxpdf09pi4lbdx0rm6"; depends=[date relsurv survival timereg]; }; + ROCnReg = derive2 { name="ROCnReg"; version="1.0-1"; sha256="05rxb0hqk6w8xz8s52j0skc8p2b4fv8wdvvj8r77yimph1dlc13x"; depends=[lattice MASS Matrix moments nor1mix np pbivnorm spatstat]; }; ROCwoGS = derive2 { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; }; RODBC = derive2 { name="RODBC"; version="1.3-16"; sha256="0fcnszrkk7llz26wccs97glddw793i0f9bd7rwxrld24vn1lng92"; depends=[]; }; RODBCDBI = derive2 { name="RODBCDBI"; version="0.1.1"; sha256="0jkcc1lm8drsx1pkfj5h6rlbr98cgpvbf9ndzdwr048f3s8gd26i"; depends=[DBI RODBC]; }; - RODBCext = derive2 { name="RODBCext"; version="0.3.1"; sha256="06ky97k93bbrlxm4fg770mnz6yqp2zzgwmvzdqrpanfbg7qkfwwn"; depends=[RODBC]; }; RODM = derive2 { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; }; - ROI = derive2 { name="ROI"; version="0.3-2"; sha256="0kx71843sfbml05kdbaf9lx67aqcjhdk4klg8yr020j5100cf17w"; depends=[registry slam]; }; + ROI = derive2 { name="ROI"; version="0.3-3"; sha256="06d9cqa7g5n10cynkkmy42ilzs7jj2lfz9snimis6ipgkm5n0xr9"; depends=[registry slam]; }; ROI_models_globalOptTests = derive2 { name="ROI.models.globalOptTests"; version="1.1"; sha256="0cr4iy4p590zsp47jqyrvhamc4xa9nkpnnddmwqbkgvzmzxf83ap"; depends=[globalOptTests ROI]; }; ROI_models_miplib = derive2 { name="ROI.models.miplib"; version="0.0-2"; sha256="1brlqyprvrq32ww36j3aa4nqfcn1q1mfv58vv92rlv23cb6b94sv"; depends=[R_utils Rglpk ROI]; }; ROI_models_netlib = derive2 { name="ROI.models.netlib"; version="1.1"; sha256="0dhiiyw9srlih3x381jlgl11y0vr9qyn91b7xi208a0vpsmassa7"; depends=[ROI]; }; @@ -3490,9 +3519,9 @@ in with self; { ROI_plugin_neos = derive2 { name="ROI.plugin.neos"; version="0.3-1"; sha256="02apdbw5b0fknmm798g7nrfs25yjiyqza5b2cd4b6vvj2bjnwpsd"; depends=[ROI xml2 xmlrpc2]; }; ROI_plugin_nloptr = derive2 { name="ROI.plugin.nloptr"; version="0.3-3"; sha256="0ls241xahmd77q2s02mpzr1i10nq5vqgic5j786y9q00f6c3lxyd"; depends=[nloptr ROI]; }; ROI_plugin_optimx = derive2 { name="ROI.plugin.optimx"; version="0.3-2"; sha256="13dfczn6dl4d1sx15davn5f4vcri7lk2zzh8ib28268lbwh9ma2s"; depends=[optimx ROI]; }; - ROI_plugin_qpoases = derive2 { name="ROI.plugin.qpoases"; version="0.3-2"; sha256="1mclf6nf9ci331pgf3mw2fci502991vfzkiqx4l2l6n662jpxpqy"; depends=[checkmate Rcpp ROI slam]; }; + ROI_plugin_qpoases = derive2 { name="ROI.plugin.qpoases"; version="0.3-3"; sha256="132zr4nx220697j2x1vm4sl1wklbrnh549zh5gb0zn7q206r56r4"; depends=[checkmate Rcpp ROI slam]; }; ROI_plugin_quadprog = derive2 { name="ROI.plugin.quadprog"; version="0.2-5"; sha256="1c4fd16kgg60gfs52xc64ii4kzl8fb8qz3rpy69d08avb4q6grir"; depends=[quadprog ROI slam]; }; - ROI_plugin_scs = derive2 { name="ROI.plugin.scs"; version="0.3-1"; sha256="1n73qm0aw0azwg9m1r3i3qpymzqy7ly8cgsmr00n8pwsgg858h8v"; depends=[ROI scs slam]; }; + ROI_plugin_scs = derive2 { name="ROI.plugin.scs"; version="0.3-2"; sha256="0g48awvbsnmdlviksyc57piqvhwfx63iq68ymyrgfxfwkjrk4fwl"; depends=[ROI scs slam]; }; ROI_plugin_symphony = derive2 { name="ROI.plugin.symphony"; version="0.2-5"; sha256="1kpa82g33i2fdcnkpcqdpslj14ilrl7cp0fq1jmp4vj8ddz1s9g5"; depends=[ROI Rsymphony slam]; }; ROMDB = derive2 { name="ROMDB"; version="0.1.0"; sha256="14jijcqd2zmps8sacx5nwfclj5yvqf4nx72y8pfvr0nswqqb895i"; depends=[dplyr httr magick purrr RODBC stringr]; }; ROMIplot = derive2 { name="ROMIplot"; version="1.0"; sha256="1njbsvnz7wrsv9l1p70p1ygmckaibz5i6jmvb0sfalp5jdcgl85n"; depends=[MortalitySmooth RCurl]; }; @@ -3506,15 +3535,15 @@ in with self; { ROptEst = derive2 { name="ROptEst"; version="1.2.1"; sha256="0gjdgynmg8499jm5gbnmjipnn1bl7h1rja8lhgbaw48lmq5sr801"; depends=[distr distrEx distrMod MASS RandVar RobAStBase startupmsg]; }; ROptEstOld = derive2 { name="ROptEstOld"; version="1.2.0"; sha256="08njyxb8bnjb9nas3szqvqkfv83lc0187b7biis2nl2rgq6rljzy"; depends=[distr distrEx evd RandVar]; }; ROptRegTS = derive2 { name="ROptRegTS"; version="1.2.0"; sha256="1wy54kjrpfvj2k9ndmq27zzgx6aygh85f7c83g7gn8d5b2y91qy4"; depends=[distr distrEx RandVar ROptEstOld]; }; - ROptSpace = derive2 { name="ROptSpace"; version="0.2.1"; sha256="1sc7f2q9856c351nqb6dgq1d34jpahvfxb5l43npa04lm1hh7hqw"; depends=[Rdpack]; }; + ROptSpace = derive2 { name="ROptSpace"; version="0.2.2"; sha256="09crzp3anw9p9fknw9gv8kzk1gmmdw0hbw1fa2r8i6601xi81ap4"; depends=[Rcpp RcppArmadillo Rdpack]; }; ROptimizely = derive2 { name="ROptimizely"; version="0.2.0"; sha256="059zfn6y687h989wryvpqwgnp9njrrr4ys0gf1ql4pw85b2c50dy"; depends=[httr jsonlite]; }; ROracle = derive2 { name="ROracle"; version="1.3-1"; sha256="07zqzwaq5iqkjcmns2ahl1l71xjlznialb3dbyl4lwsh3p3fhf2n"; depends=[DBI]; }; - RPANDA = derive2 { name="RPANDA"; version="1.7"; sha256="0gf25gj9461bl6hi205zvbc17pjw7r8900mirrp5zh08mjzpjmmd"; depends=[ape cluster coda corpcor deSolve fields fpc geiger glassoFast igraph Matrix mvMORPH mvtnorm phytools picante pracma pspline pvclust Rmpfr TESS]; }; + RPANDA = derive2 { name="RPANDA"; version="1.8"; sha256="0k9k3zc68kr17jd5r0m6jwmfhf43k5r44h4kqa6kdpd03h60m1rh"; depends=[ape cluster coda corpcor deSolve fields fpc geiger glassoFast igraph Matrix mvMORPH mvtnorm phytools picante pracma pspline pvclust Rmpfr TESS]; }; RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; }; RPEClust = derive2 { name="RPEClust"; version="0.1.0"; sha256="1ysw45335lrxmj3j17xyvgz76p00v80f2m7wxfndh91wklqxzm8r"; depends=[clue clusteval mclust]; }; RPEGLMEN = derive2 { name="RPEGLMEN"; version="1.0.1"; sha256="1bcci0ih71bxdrwdz336c5wx47d094nczazy8mv3v41vivrk4jkh"; depends=[PerformanceAnalytics Rcpp RcppEigen RPEIF]; }; - RPEIF = derive2 { name="RPEIF"; version="1.0.3"; sha256="15v2z6iiai7vhbyhql199dpdb4762lhkqbzm24iraqfffxkbhyb8"; depends=[PerformanceAnalytics Rcpp RobStatTM xts zoo]; }; - RPESE = derive2 { name="RPESE"; version="1.0.1"; sha256="0hp7nc86gbmnchvhivywh1cg2w6cbvihypdq0mi1r86pxc0n2z61"; depends=[boot PerformanceAnalytics robustbase RPEGLMEN RPEIF sandwich xts zoo]; }; + RPEIF = derive2 { name="RPEIF"; version="1.0.8"; sha256="0v8kgwzgn1sqs0rgb0mrvzxy1wnk07bm7s4nyz60xcamsj33laj0"; depends=[PerformanceAnalytics xts zoo]; }; + RPESE = derive2 { name="RPESE"; version="1.0.3"; sha256="0a9nq60jg2bhj5cbbgkpz0zisqwrv7cgifbiampx2y6sfrkmhbjg"; depends=[boot PerformanceAnalytics RPEGLMEN RPEIF sandwich xts zoo]; }; RPEXE_RPEXT = derive2 { name="RPEXE.RPEXT"; version="0.0.1"; sha256="0m5ml8ywxrf66mjz6m3xp1lajd7wdq9g7xsaln8n7ykq7h5615fc"; depends=[]; }; RPEnsemble = derive2 { name="RPEnsemble"; version="0.4"; sha256="0y9g22swcz0m5jbzi87ahxw27fb3jlf3iwvxb73kkzixqlvksw9y"; depends=[class MASS]; }; RPMG = derive2 { name="RPMG"; version="2.2-3"; sha256="1di2bcf58z6gc3xknzx35znsjsy1714swvxkdhlq1ljidbdbmmbl"; depends=[]; }; @@ -3526,23 +3555,23 @@ in with self; { RPostgres = derive2 { name="RPostgres"; version="1.2.0"; sha256="16fjwaj1qvr1i9naq19jg2z3dqssi3pp4wwviyqlkj1mmbyh28zx"; depends=[BH bit64 blob DBI hms plogr Rcpp withr]; }; RPresto = derive2 { name="RPresto"; version="1.3.4"; sha256="17hwq76vzr27prwisfxahs1ix9grldknaywnq3v2a3s2x79v8vbv"; depends=[DBI httr jsonlite openssl Rcpp stringi]; }; RProbSup = derive2 { name="RProbSup"; version="2.1"; sha256="0lmv4x235xiykc8jfnp15l4yypm99yz6spsnaxacp49y2aw23jpy"; depends=[]; }; - RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.14"; sha256="1jn288796g61sfffnrfm0nm6igyv0yixlb09yhw8fqih7qg14lnx"; depends=[Rcpp RCurl]; }; + RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.17"; sha256="0krbxalcfg47cmrwfajgbhmn6rs687ranaiq5j0daw7a1k4qdfd8"; depends=[Rcpp RCurl]; }; RPtests = derive2 { name="RPtests"; version="0.1.4"; sha256="1r30pslbjq3dip41la81jlin2vhxdmayg902x9ryjy554awfgh7j"; depends=[glmnet randomForest Rcpp]; }; RPublica = derive2 { name="RPublica"; version="0.1.3"; sha256="1w2pn1g44a00ls8kkzj53a739pq6vzp38px2k0yh10rlzimmb21l"; depends=[curl httr jsonlite]; }; RPushbullet = derive2 { name="RPushbullet"; version="0.3.3"; sha256="0acydm5xc1j6yjmjipfrg7pvc6h0jwihrg1rx97qwddds2xakkxy"; depends=[curl jsonlite]; }; RPyGeo = derive2 { name="RPyGeo"; version="1.0.0"; sha256="1alqgx6blqqwxm76w05g82kc2icx8nvjw7qkdz73gf9ckgza5bb3"; depends=[magrittr purrr raster reticulate rmarkdown sf stringr]; }; RQDA = derive2 { name="RQDA"; version="0.3-1"; sha256="1kqax4m4n5h52gi0jaq5cvdh1dgl0bvn420dbws9h5vrabbw1c1w"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; }; RQEntangle = derive2 { name="RQEntangle"; version="0.1.3"; sha256="178haddk8nnscy2vym3k2a3ca9lf6nl7rpjja8lxqdjninvhvwb2"; depends=[iterators itertools]; }; - RQGIS = derive2 { name="RQGIS"; version="1.0.4"; sha256="0x4jilj5nbikgkcg09913v3dgnfw0aqwwx66xajsfk5lqi6w5vjz"; depends=[raster RCurl readr reticulate rgdal sf sp stringr XML]; }; - RQuantLib = derive2 { name="RQuantLib"; version="0.4.11"; sha256="0849967lkbcfpy9pnnibdjsv83byn85qrk98bzpxm4wmcd1jqqhk"; depends=[Rcpp zoo]; }; + RQuantLib = derive2 { name="RQuantLib"; version="0.4.12"; sha256="1bmjgsdwivrvdysba4hq60xpp7xg1c0p1p05mdm0338zvzix5kb8"; depends=[Rcpp zoo]; }; RRF = derive2 { name="RRF"; version="1.9.1"; sha256="135adnf7cfs8gddmmmgmzarjzg0qfrd7l67367yhy2b1k0s5ng1w"; depends=[]; }; RRI = derive2 { name="RRI"; version="1.1"; sha256="0msdc5j5vx4snl8r3q5nn0mw2i80jds5pjykhmigcrx6jzg6h6i7"; depends=[Rcpp RcppArmadillo]; }; RRNA = derive2 { name="RRNA"; version="1.0"; sha256="14rcqh95ygybci8hb8ays8ikb22g3850s9f3sgx3r4f0ky52dcba"; depends=[]; }; RRPP = derive2 { name="RRPP"; version="0.5.2"; sha256="0j31drphisckab9v93z6spdj9jgd0wx9dkbd2b22ff5la6bvil7k"; depends=[]; }; + RRRR = derive2 { name="RRRR"; version="1.0.0"; sha256="1xia8izpxlacas2qa508wy7d65b461cqqkkv78jbp85h0dzxa0k0"; depends=[expm ggplot2 magrittr matrixcalc mvtnorm]; }; RRTCS = derive2 { name="RRTCS"; version="0.0.3"; sha256="1riz1gjx3c0pf17xwybizb94nm5zgmfsnv6np3afvw831mb1x3l9"; depends=[sampling samplingVarEst]; }; RRate = derive2 { name="RRate"; version="1.0"; sha256="1q3f2gphdf50aijnk5xqfpxcqfd4jq7byb1gpb0vcnaxgi3a9lwm"; depends=[]; }; RRedshiftSQL = derive2 { name="RRedshiftSQL"; version="0.1.2"; sha256="03jbml8d19hcg6achnyc4hcnl5j10yvsx59j80r46zyn0flsnizq"; depends=[DBI RPostgreSQL]; }; - RRphylo = derive2 { name="RRphylo"; version="2.4.0"; sha256="1llrnhwmigcwhb5pr6yr3w91gmqsn5q7xsfk61l03nnslj9vp7aq"; depends=[ape binr car cluster ddpcr doParallel emmeans foreach geiger geomorph lmtest mvMORPH nlme outliers phangorn phytools picante plotrix pvclust R_utils RColorBrewer rlist scales smatr tseries vegan]; }; + RRphylo = derive2 { name="RRphylo"; version="2.4.4"; sha256="1wmd1hm51v2289cfglvx245frjs2c2908znfayvvd2gfhfj6r7rf"; depends=[ape binr car cluster ddpcr doParallel emmeans foreach geiger geomorph lmtest nlme outliers phangorn phytools picante plotrix R_utils RColorBrewer rlist scales smatr vegan]; }; RRreg = derive2 { name="RRreg"; version="0.7.1"; sha256="1mzc9ga5jdh3cf95bxbfy6kdxvqcca74v4hszb63jalzp8w624r9"; depends=[doParallel foreach lme4]; }; RSA = derive2 { name="RSA"; version="0.9.13"; sha256="19xkziixmwwmf7fxkzbsmp9bjii6mznnxyzghbw64kx0kq8bc1ll"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; }; RSADBE = derive2 { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; }; @@ -3550,7 +3579,7 @@ in with self; { RSAlgaeR = derive2 { name="RSAlgaeR"; version="1.0.0"; sha256="1hp0v2vkj9ixiv541d53kyl0ph3jsdc5w98r81gv5ck5ixrp6bxp"; depends=[cvTools ggplot2 hydroGOF lubridate mblm plyr]; }; RSCABS = derive2 { name="RSCABS"; version="0.9.4"; sha256="0zknwd07z933c405n14l7mwl4l697g5sfvw19244yv4fs7f6k5cg"; depends=[gWidgets gWidgetsRGtk2 R2HTML RGtk2]; }; RSCAT = derive2 { name="RSCAT"; version="1.1.0"; sha256="1sh80zlkwma88kssrlwvb6kpqs2dmhfzkck59fgp0xxgxa3vpram"; depends=[ggplot2 gridExtra Metrics rJava shiny shinycssloaders shinyjs]; }; - RSDA = derive2 { name="RSDA"; version="3.0.1"; sha256="1hxzccwjmbj5qnv2z96s9nj8r3fhbixycf4zfkaa5y1dacxz9mk4"; depends=[dplyr FactoMineR forcats ggplot2 ggpolypath glmnet magrittr nloptr princurve purrr randomcoloR reshape RJSONIO rlang scales sqldf stringr tibble tidyselect vctrs XML]; }; + RSDA = derive2 { name="RSDA"; version="3.0.3"; sha256="0335g7m97wx4c8aam19z5qn9s9kgjy67s0wdgcjfjm440pxk2l3r"; depends=[dplyr FactoMineR forcats ggplot2 ggpolypath glmnet labelled magrittr nloptr princurve purrr randomcoloR reshape RJSONIO rlang scales sqldf stringr tibble tidyselect vctrs XML]; }; RSE = derive2 { name="RSE"; version="1.3"; sha256="1dvmj1zwkbp1dj9r8kcvbd8rpknfwfdqaqc5gfl82bh823w72099"; depends=[]; }; RSEIS = derive2 { name="RSEIS"; version="3.9-0"; sha256="16jmakdq6rkyw3cm1ilnaw3ycsg12544ml9gla7y8mgpbglxsn6i"; depends=[RPMG Rwave]; }; RSGHB = derive2 { name="RSGHB"; version="1.2.2"; sha256="16s9iahbcdqykavm5cq8n76hlpfqlljl17xwh0vrz5ac7z4z3rdz"; depends=[MCMCpack]; }; @@ -3559,17 +3588,18 @@ in with self; { RSNNS = derive2 { name="RSNNS"; version="0.4-12"; sha256="1fa32wrhv3q0sdgrcrqrazvvylbn83d75bw8d0ncjfspf7dgx3di"; depends=[Rcpp]; }; RSNPset = derive2 { name="RSNPset"; version="0.5.3"; sha256="1llx6anwkl4as0hdyvmsrlg9z8mkn9p1qxgs6kqs39w87gyx0j36"; depends=[doRNG fastmatch foreach qvalue Rcpp RcppEigen]; }; RSPS = derive2 { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[gridExtra lattice plyr]; }; + RSQL = derive2 { name="RSQL"; version="0.1.1"; sha256="108jv8p0q4cmpjm701k6c2i5vcyaq9xn6wg97rih639gmdaqn28s"; depends=[DBI lgr R6 RSQLite]; }; RSQLite = derive2 { name="RSQLite"; version="2.2.0"; sha256="1m38sj8rwbf3p2lhqabcp7c7djk7s9ng37cz39yxk706v9pi4380"; depends=[BH bit64 blob DBI memoise pkgconfig plogr Rcpp]; }; - RSSL = derive2 { name="RSSL"; version="0.8"; sha256="0pynj5jppl2bxh0hh6lhqr6s54v0ny4mabk0zrx8xzcbidlwyhn1"; depends=[cluster dplyr ggplot2 kernlab MASS Matrix quadprog Rcpp RcppArmadillo reshape2 scales tidyr]; }; + RSSL = derive2 { name="RSSL"; version="0.9.1"; sha256="0845azknk90ix8xgcj18mdn7jbicalid4fcqyxzp747qswy4hh98"; depends=[cluster dplyr ggplot2 kernlab MASS Matrix quadprog Rcpp RcppArmadillo reshape2 scales tidyr]; }; RSSOP = derive2 { name="RSSOP"; version="1.1"; sha256="119xrxpaf68qdb2kj2pbaja6im2nbxsgibb1bnlpnc3fcxkmqcsf"; depends=[]; }; RSSampling = derive2 { name="RSSampling"; version="1.0"; sha256="0p10l7qmksx4ysz1jb84f9nbqzig8wxhwy33yk8hq29nb5i4c9ik"; depends=[LearnBayes]; }; RSVGTipsDevice = derive2 { name="RSVGTipsDevice"; version="1.0-7"; sha256="0jdr8l0hp4kzsvlgs8j1m74sr98z4v2lmiqinmc238m406nhppab"; depends=[]; }; RSarules = derive2 { name="RSarules"; version="1.0"; sha256="0lrql4q45hyhqbix86ixl12mknnjbz3137gx2zkvqpz91bsk145j"; depends=[arules Matrix]; }; RSauceLabs = derive2 { name="RSauceLabs"; version="0.1.6"; sha256="1p7hw6vnlg6w5ggmfpc3q3s6n1fikjkjnxzz97jifiy0zwn5dp9i"; depends=[data_table httr jsonlite whisker xml2]; }; - RScelestial = derive2 { name="RScelestial"; version="1.0.0"; sha256="1amvzp4a69cpm13affvpza8zs1n78a3y93bwpv0fzi2b60im4y9x"; depends=[Rcpp]; }; + RScelestial = derive2 { name="RScelestial"; version="1.0.1"; sha256="10d2kxlqy224y6qypr7g3pnbv9bkrj22zi77wg7y646f5bzdz9qd"; depends=[Rcpp]; }; RSclient = derive2 { name="RSclient"; version="0.7-3"; sha256="07mbw6mcin9ivsg313ycw2pi901x9vjpmi6q7sms1hml4yq50k6h"; depends=[]; }; RSeed = derive2 { name="RSeed"; version="0.1.60"; sha256="0rvb6w4z5c2wcdgx5w6vv7c8il8d0096pgv3fyvw21ag25z605jc"; depends=[graph RBGL sybil]; }; - RSelenium = derive2 { name="RSelenium"; version="1.7.5"; sha256="1ih22z3p1p673dhbjsfmli94bzqp5xk3psslf4c0r9dvmw9h6s5c"; depends=[binman caTools httr openssl wdman XML]; }; + RSelenium = derive2 { name="RSelenium"; version="1.7.7"; sha256="1xn5fdbzmq7b1f5fc9ls23g177bmnd8bn4p4d8aafr6z3jwkmfir"; depends=[binman caTools httr openssl wdman XML]; }; RSentiment = derive2 { name="RSentiment"; version="2.2.2"; sha256="15d1llzxg1apkwykpb7pic2d5lfj9i9a55hab067wrz2yq5jsyfa"; depends=[NLP openNLP plyr stringr]; }; RSiena = derive2 { name="RSiena"; version="1.2-23"; sha256="04picf0f9rahd37r9fm0cisgaiy2aqshnzfh7cvhcqfaqmpxc8kp"; depends=[lattice MASS Matrix]; }; RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.16"; sha256="1plcmxj6sahdy3vvcmxry8cbq1j23bqzhnhn593bkwmzczka24cy"; depends=[base64enc digest httr jsonlite plyr stringr]; }; @@ -3585,18 +3615,19 @@ in with self; { RSurvey = derive2 { name="RSurvey"; version="0.9.3"; sha256="0yk969jdvpgv01zbmk4zyxcmrbdizh37bddj1k128ndyf191z37x"; depends=[colorspace inlmisc MBA raster rgdal rgeos sp]; }; RSvgDevice = derive2 { name="RSvgDevice"; version="0.6.4.4"; sha256="0vplac5jzg6bmvbpmj4nhiiimsr9jlbk8mzyifnnndk9iyf2lcmz"; depends=[]; }; RSwissMaps = derive2 { name="RSwissMaps"; version="0.1.0.1"; sha256="16sdd0115793yj74i9m64yfxxn3gkk4nvb0qk2w8j7jjbqhflis0"; depends=[downloader dplyr ggplot2]; }; + RTCC = derive2 { name="RTCC"; version="0.1.0"; sha256="11z5db4y7nfacp1xgmxa1dsain9sz4634ydnpa4rngcw2q3mx68p"; depends=[matrixStats Rcpp testthat vegan]; }; RTConnect = derive2 { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; }; RTD = derive2 { name="RTD"; version="0.1.1"; sha256="1f36wn9f7wjadvll234m97wqfj4adpvif4x0ywn4wfk91cwa5zib"; depends=[httr jsonlite openssl readr urltools]; }; RTDE = derive2 { name="RTDE"; version="0.2-1"; sha256="1dkv0g760384jmyypffl5kbnsancjx272j91ffpgmg3lmsy8nhqq"; depends=[]; }; + RTL = derive2 { name="RTL"; version="0.1.1"; sha256="1p5i9khwa470hc9bhxlxqh8w5vp73jcsr45mrhwpcyz3i2dlzdzr"; depends=[dplyr EIAdata fabletools feasts fGarch fitdistrplus forecast ggplot2 httr lubridate magrittr PerformanceAnalytics plotly purrr Quandl quantmod readr stringr tibble tibbletime tidyquant tidyr timetk tsibble xts zoo]; }; RTOMO = derive2 { name="RTOMO"; version="1.1-6"; sha256="03jb96ahzgp662vj2v65giv8ss61vad5w26kvq8hg9q06z879jza"; depends=[GEOmap RPMG RSEIS splancs]; }; RTaxometrics = derive2 { name="RTaxometrics"; version="2.3"; sha256="02446y86g21i37ycavg0xc1ggxk0k93d38n71fis9fav06lywxx3"; depends=[]; }; - RTest = derive2 { name="RTest"; version="1.2.6"; sha256="0f7wxscswkg2r6isp0vjfs44dbgqijmh97p053w2mcqi6z1s5cip"; depends=[base64 glue jsonlite magick magrittr rlang stringr testthat XML]; }; RTextureMetrics = derive2 { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; }; RTransProb = derive2 { name="RTransProb"; version="0.3.3"; sha256="1fl8ag7aizj7k7j5ypx632qa98jp3wp8z3mp5z490n1277ajzrkb"; depends=[caret chron e1071 expm MASS Matrix matrixStats neuralnet nnet pracma Rcpp RcppArmadillo zoo]; }; RTransferEntropy = derive2 { name="RTransferEntropy"; version="0.2.12"; sha256="066wyama0gk81l6kc0n31cmf007i1975i7hzvf46qbldvhsc52mc"; depends=[future future_apply Rcpp]; }; RTriangle = derive2 { name="RTriangle"; version="1.6-0.10"; sha256="07ya95gmv53i2argqwgad6wd4sslql2wl1rkvsmgsvmhsb4wp9hd"; depends=[]; }; RUnit = derive2 { name="RUnit"; version="0.4.32"; sha256="1wc1gwb7yw7phf8b0gkig6c23klya3ax11c6i4s0f049k42r78r3"; depends=[]; }; - RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-74"; sha256="0m4xynjjl72znnxrpific8haqff33jsimn6ksaf96aims347lpgv"; depends=[ade4 boot car FactoMineR lme4 MASS mixOmics nnet pls pspearman vegan]; }; + RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-75"; sha256="14wgxly7lc301i7avby3sy1prjr0bfyvky1krn89j217mz12qk1p"; depends=[ade4 boot car FactoMineR lme4 MASS mixOmics nnet pls pspearman vegan]; }; RVFam = derive2 { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme kinship2 lme4 MASS Matrix survival]; }; RVenn = derive2 { name="RVenn"; version="1.1.0"; sha256="016m00xv59lkwm2is32v5nr4lw5a1ymdnz34r3ffflcv9bfrc6n4"; depends=[ggforce ggplot2 magrittr pheatmap purrr rlang vegan]; }; RVerbalExpressions = derive2 { name="RVerbalExpressions"; version="0.1.0"; sha256="1p9wmpgqwnz95sr8km8y6kqax8fcz6sqg54wfdx44kiqkf1ybdsp"; depends=[magrittr]; }; @@ -3605,16 +3636,16 @@ in with self; { RVowpalWabbit = derive2 { name="RVowpalWabbit"; version="0.0.13"; sha256="106lr6iz28gscczs18759zaki7dnxy1873swiakimfqmwpw9dp9n"; depends=[Rcpp]; }; RVtests = derive2 { name="RVtests"; version="1.2"; sha256="0k7w6ml981zvr5bix197qw4kaf7rz5jqnwqlxf7aryxbm39gk16c"; depends=[glmnet pls spls]; }; RWBP = derive2 { name="RWBP"; version="1.0"; sha256="104vr2cdk185hh4zn3vmqvb14p1q8ifk11wdgvk7fli1m1zxxwdd"; depends=[igraph lsa RANN SnowballC]; }; - RWDataPlyr = derive2 { name="RWDataPlyr"; version="0.6.2"; sha256="1928hyfmy21s586nafd5qajbypqslc96zfmxbi42rcmvzim16v3k"; depends=[data_table dplyr feather Rcpp tibble tidyr xts zoo]; }; + RWDataPlyr = derive2 { name="RWDataPlyr"; version="0.6.4"; sha256="1jjra885339n6kpqz28rn9byy4md4s0k47m6ll4a6srd4hsf3ni3"; depends=[data_table dplyr feather Rcpp tibble tidyr xts zoo]; }; RWebLogo = derive2 { name="RWebLogo"; version="1.0.3"; sha256="1n65mlnr163ywjnyyngnigbj0wpgkr38c3nx8hw5r8mwjnf3d617"; depends=[findpython]; }; - RWeka = derive2 { name="RWeka"; version="0.4-41"; sha256="1grsq6wkvci2hs0vcr9zwrf7iyfrlxwag43l0k5hf8icazp8ffmf"; depends=[rJava RWekajars]; }; + RWeka = derive2 { name="RWeka"; version="0.4-42"; sha256="0111n0hr3a2gjd2pv5vlh8mian6k86cp0xrw0yyh6ijxhwl31rc4"; depends=[rJava RWekajars]; }; RWekajars = derive2 { name="RWekajars"; version="3.9.3-2"; sha256="06nsylv65z9hxym1b6qnwllh306bq5phsgr0qn4nyr5im8cv1rhn"; depends=[rJava]; }; - RWiener = derive2 { name="RWiener"; version="1.3-1"; sha256="0w12xvc18l002m8q6ad3laa667xzqjbcfqf0vvcmicgw2j3bbq6h"; depends=[]; }; + RWiener = derive2 { name="RWiener"; version="1.3-2"; sha256="1sk4racp77jbhjaqkghalg139aznchyn1yknyrv975ck040zs8cw"; depends=[]; }; RWildbook = derive2 { name="RWildbook"; version="0.9.3"; sha256="1pznzmv8n33hhj61h07fha1gzafcx705n8323cnz3mx6ziijfh28"; depends=[data_table jsonlite marked]; }; - RWsearch = derive2 { name="RWsearch"; version="4.6.2"; sha256="1sak4ihzvba83q1zvn65983qz50cb1nbz1mwiasr3bzz27hhdp4a"; depends=[brew latexpdf networkD3 sig sos XML]; }; - RXKCD = derive2 { name="RXKCD"; version="1.8-2"; sha256="081zrx293z4009p6fj2za0mkf04nikxmg3i45l667qvy7nmajqlc"; depends=[jpeg png RJSONIO]; }; + RWsearch = derive2 { name="RWsearch"; version="4.8.0"; sha256="0zbf03dhcmbyrs2yhl3phk65471qnd7iszvk9rn81fqhd522vq66"; depends=[brew latexpdf networkD3 sig sos XML]; }; + RXKCD = derive2 { name="RXKCD"; version="1.9.2"; sha256="1yk12ic6kdbwc44ppag2yfnga7xjmifkglhvcw93vc3qg469mm15"; depends=[jpeg plyr png RJSONIO]; }; RXMCDA = derive2 { name="RXMCDA"; version="1.5.5"; sha256="1ci73q8xf3xxqw8b7sk83v5vz2cqgcb4lkx7qi3hd1ff4xkz1fpa"; depends=[kappalab XML]; }; - RXshrink = derive2 { name="RXshrink"; version="1.3.1"; sha256="1kj661g4dkdnnkrc7vh7qpvfrgj77db6lwvvlpbynn8n3l3qbg94"; depends=[lars]; }; + RXshrink = derive2 { name="RXshrink"; version="1.3.2"; sha256="00igwc4v2dc9328akrqswac7f4hn4ij03x9ck932xd0l67zfp8ah"; depends=[lars]; }; RYandexTranslate = derive2 { name="RYandexTranslate"; version="1.0"; sha256="0qrv5mnnkn5fs7vx6i74z46s0qj9f98km5bizgj00832qyrq8q1s"; depends=[httr jsonlite RCurl]; }; RYoudaoTranslate = derive2 { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; }; RZabbix = derive2 { name="RZabbix"; version="0.1.0"; sha256="0c5803chpzvp7dk9pjfx5f0nqynb76ywakz04ah2nw07ypvcyjyr"; depends=[httr jsonlite]; }; @@ -3622,13 +3653,12 @@ in with self; { RZooRoH = derive2 { name="RZooRoH"; version="0.2.3"; sha256="0ihfc8hxqmlkx1xhkz3psw8szwjp01imasvynxbzrjmjf4q6amvq"; depends=[data_table doParallel foreach iterators RColorBrewer]; }; RaPKod = derive2 { name="RaPKod"; version="0.9"; sha256="1qxzi2lf431zd44bcd98ybhzydy1cz12g864l6r668jk91aqy1qg"; depends=[kernlab MASS proxy Rcpp RcppArmadillo]; }; RaProR = derive2 { name="RaProR"; version="1.1-5"; sha256="11hwg609pjcd13qnbchbs86c3q8f4nmh1xfxg3dsiijljl6lzx3n"; depends=[]; }; - RaceID = derive2 { name="RaceID"; version="0.1.7"; sha256="0rpjcd3vgzd09mfjxc8ji73ncl6d7f5zkv1z1f2nzpz9rhxpd3sp"; depends=[cluster coop FateID FNN fpc ggplot2 ica igraph irlba locfit MASS Matrix pheatmap propr quadprog randomForest RColorBrewer Rcpp Rtsne umap vegan]; }; + RaceID = derive2 { name="RaceID"; version="0.1.9"; sha256="0jy0bavlzq522zp5jf4s1dkm2yi40kjwx9cks7lylqcr9sml6xj8"; depends=[cluster coop FateID FNN fpc ggplot2 ica igraph irlba locfit MASS Matrix NlcOptim pheatmap propr quadprog randomForest RColorBrewer Rcpp Rtsne umap vegan]; }; RadData = derive2 { name="RadData"; version="1.0.0"; sha256="14npn5vjcpvymdjkby83msjr3f1gsmzh0083gz6cgrp270fglkaw"; depends=[]; }; RadOnc = derive2 { name="RadOnc"; version="1.1.5"; sha256="0yz2pzcpz32xs04xfs90i714nn28cky7701w1h99cqsxsp892jkq"; depends=[geometry oro_dicom ptinpoly rgl]; }; RadTran = derive2 { name="RadTran"; version="1.0"; sha256="1sb8d4y3b37akbxhdavxrkp34zn3ip061b7gzy0ga57pyn76cvpn"; depends=[ReacTran rootSolve]; }; - RadioGx = derive2 { name="RadioGx"; version="0.0.2"; sha256="1ls56zxsa5l6925ig7d9n3ffns1x0jkbd3zdk530nlffkralwz0k"; depends=[Biobase caTools cluster CoreGx KernSmooth magicaxis Matrix PharmacoGx RColorBrewer reshape2 scales]; }; RadioSonde = derive2 { name="RadioSonde"; version="1.4"; sha256="1v9jdpynmb01m3syhas1s08xxlvjawhlvjkyhils2iggi4xw4hiq"; depends=[]; }; - Radviz = derive2 { name="Radviz"; version="0.8.1"; sha256="1kk8xjlcyb52grj0xgjdkpx658678plrx1a3cfaf37xmvspid5j8"; depends=[dplyr ggplot2 rlang]; }; + Radviz = derive2 { name="Radviz"; version="0.9.1"; sha256="15zz426pqr8wv6wcyj3gnflvslz0123lwhk7878gk794fz74a7yi"; depends=[dplyr ggplot2 hexbin igraph pracma Rcpp RcppArmadillo rlang]; }; RagGrid = derive2 { name="RagGrid"; version="0.2.0"; sha256="0crnpd75lyhd0awzqzqy7bzw4ydgxpyhy1ybb1ff4qsnisbjdbba"; depends=[crosstalk htmltools htmlwidgets knitr]; }; RainfallErosivityFactor = derive2 { name="RainfallErosivityFactor"; version="0.1.0"; sha256="16yrr2bl62m1nr81nzvmdq7s78f7fg50dah5dg5q4j4j7z8qfsqz"; depends=[]; }; Ramble = derive2 { name="Ramble"; version="0.1.1"; sha256="0225za85i5nvf8l89i5bz7nxsxykd3v9fp1wgihmncca6n8vhgpl"; depends=[]; }; @@ -3637,18 +3667,17 @@ in with self; { RandPro = derive2 { name="RandPro"; version="0.2.0"; sha256="1bhbg6lvgr9h6rq3g3ljm2422ngjb18maj80l7f659ql88c8h6mj"; depends=[caret e1071]; }; RandVar = derive2 { name="RandVar"; version="1.2.1"; sha256="17c6bx644n604zpggmwx1z3krgd9v7c88il45cf5yhp7zf7cc718"; depends=[distr distrEx startupmsg]; }; RandomCoefficients = derive2 { name="RandomCoefficients"; version="0.0.2"; sha256="04l0aczrlbkjk0687w2gxs85ia71yy69mgankwkl37ksznh6y81m"; depends=[fourierin ks orthopolynom polynom RCEIM rdetools robustbase sfsmisc snowfall statmod tmvtnorm VGAM]; }; - RandomFields = derive2 { name="RandomFields"; version="3.3.7"; sha256="0fnl1450k33vn49x0gc6xljhrrbcb2m7bl9dpn5r8v6yqk2hwjjx"; depends=[RandomFieldsUtils sp]; }; + RandomFields = derive2 { name="RandomFields"; version="3.3.8"; sha256="1l4r67vmdisdawlhv6l4lqsn5i8wg2p1hs7v5553b3j2mvyy424a"; depends=[RandomFieldsUtils sp]; }; RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="0.5.3"; sha256="0783z23rm5kv0x7796ggx6g07wpf18n7fjzv9r9ryji55sx3r0pa"; depends=[]; }; RanglaPunjab = derive2 { name="RanglaPunjab"; version="2.3.4"; sha256="01j3gww9kil02d44jwlkz6j7lwn2him830bnshkly0s7mgh22pgr"; depends=[jpeg shiny tidyverse]; }; RankAggreg = derive2 { name="RankAggreg"; version="0.6.5"; sha256="031mff1zydxqygx8bn3g0qpwq08kaq5bpmzy6z2y0fa03hgsxz5c"; depends=[gtools]; }; RankResponse = derive2 { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; }; - Rankcluster = derive2 { name="Rankcluster"; version="0.94.1"; sha256="1zc6cqbifs3qhd64dm4991sj1i8mxkdm5z797c4816j4hq7z3nn9"; depends=[Rcpp RcppEigen]; }; - RankingProject = derive2 { name="RankingProject"; version="0.1.1"; sha256="1n1282pym7q2b1bh18wlkmk9f0simzq149h7hacc23vyqzgkjs84"; depends=[]; }; + Rankcluster = derive2 { name="Rankcluster"; version="0.94.2"; sha256="1wm7vbv2a4py9yjpcqrzcpfig18n02ip4qkqi62rw32abdlmz6sx"; depends=[Rcpp RcppEigen]; }; + RankingProject = derive2 { name="RankingProject"; version="0.2.0"; sha256="1y2sydppi7y7j9c7r6xcqfm4v9z646w48pnksf11da8lq2nczww8"; depends=[]; }; RapidPolygonLookup = derive2 { name="RapidPolygonLookup"; version="0.1.1"; sha256="0h4snn3haa4a5rkafg98419by4nnz219wsm3y0dqgm4hw4bvha0g"; depends=[PBSmapping RANN RgoogleMaps sp]; }; Rarity = derive2 { name="Rarity"; version="1.3-6"; sha256="1m742qrgc0c5vda9sb2q5n3ghmqnlnfhr1cfpxfs7s5ic707gmlb"; depends=[]; }; RaschSampler = derive2 { name="RaschSampler"; version="0.8-8"; sha256="0y7dkgv1cy6r1mbmyqm27qwl10rl12g1svpx9jkzq5hq0hnm2xhw"; depends=[]; }; Rata = derive2 { name="Rata"; version="0.0.2"; sha256="1s7am08691lil5hbd8jpa5wnbvr0qqf0gkxczpm6yvizbjpx16qx"; depends=[ggplot2 glpkAPI lpSolveAPI reshape2 Rirt]; }; - RateDistortion = derive2 { name="RateDistortion"; version="1.01"; sha256="1micjlbir1v5ar51g1x7bgkqw9m8217qi82ii6ysgjkhwdvpm075"; depends=[]; }; RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.2.2"; sha256="15xkfjp0bkx9wjp8y27vs0iq2ir4qxjdl8405ix59sjb6lkvv3l2"; depends=[ggplot2 pROC]; }; RationalExp = derive2 { name="RationalExp"; version="0.2.2"; sha256="0a51sfps3sfb71m93jdsmbvj6kafbyfrq790ix238j570f5xafpg"; depends=[snowfall]; }; Rbeast = derive2 { name="Rbeast"; version="0.2.2"; sha256="12i6jm7x1hwkj6skva9sli02rm4krzb2gmzny68d9cjhdcan5baq"; depends=[]; }; @@ -3658,25 +3687,24 @@ in with self; { RblDataLicense = derive2 { name="RblDataLicense"; version="0.2.2"; sha256="1xra0sn4s8rrjmayg36jg6l3i1cvx9ngh30xyhi18226h0qinx9n"; depends=[RCurl xts]; }; Rblpapi = derive2 { name="Rblpapi"; version="0.3.10"; sha256="14wkrjfbjc3rb3159sz8wdvshmrh3d17s01swp59s8if7hr94hq0"; depends=[BH Rcpp]; }; Rborist = derive2 { name="Rborist"; version="0.2-3"; sha256="0qf4m6ibr4mlrmsybb5b8f1hkmp9n6ksjsxc4msd3q4rr99zkczk"; depends=[data_table digest Rcpp]; }; - Rcan = derive2 { name="Rcan"; version="1.3.80"; sha256="1p9df622sqgmfxargwj63pgpdhqr1bc66y07sr6dv1j038776ysj"; depends=[data_table ggplot2 scales]; }; + Rcan = derive2 { name="Rcan"; version="1.3.81"; sha256="0w3c0hlhnkxgzd8ibddprisry3x45blbpxjkcgcldfnnyj5l7mpv"; depends=[data_table ggplot2 scales]; }; Rcapture = derive2 { name="Rcapture"; version="1.4-3"; sha256="1rk1zgab6zi7hcmyqlb18kycv3cd15c7lwhw5kig96f2n3xymzig"; depends=[]; }; RcellData = derive2 { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; }; Rcereal = derive2 { name="Rcereal"; version="1.2.1"; sha256="0nl4p0wqpni16z62610sqcxsz1x6kannl2s1zakpmjkk80pyxlk6"; depends=[]; }; RcextTools = derive2 { name="RcextTools"; version="0.1.1"; sha256="1rrij4ryspff9mn1c3jlzjprnipak7nzlb488pk0ci0awaccp5ga"; depends=[data_table igraph sqldf visNetwork]; }; Rcgmin = derive2 { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; }; - RchivalTag = derive2 { name="RchivalTag"; version="0.0.7"; sha256="0i25rj3f54km2gdr8izgvqdbdbcq4nikywn5narm7sg79fv43pd4"; depends=[mapdata maps maptools ncdf4 oceanmap PBSmapping plyr raster rgeos sp]; }; - Rchoice = derive2 { name="Rchoice"; version="0.3-1.1"; sha256="0nmbb6wfgz164fncljnsr11j2w1hi235hysxn1p2mgc6l301rqhm"; depends=[Formula maxLik msm plm plotrix]; }; - RclusTool = derive2 { name="RclusTool"; version="0.91.2"; sha256="07d295fyiv0f19q75cppyqrac7fxlh2yx85nlmarkc6p3072jyrq"; depends=[class cluster conclust corrplot e1071 factoextra FactoMineR ggplot2 jpeg MASS mclust mda mmand nnet png randomForest reshape sp stringi stringr tcltk2 tkrplot]; }; + RchivalTag = derive2 { name="RchivalTag"; version="0.1.1"; sha256="0kcnzcpj2x23s2d75v6bk3rcp78c38b2dw28afndarmjl6ipzy24"; depends=[mapdata maps maptools ncdf4 oceanmap PBSmapping plyr pracma raster readr rgeos sp]; }; + RclusTool = derive2 { name="RclusTool"; version="0.91.3"; sha256="0f6v2p6dg3fq3vzys6hgwmmgyrxfj2kb4wpbywd7f9p5yd9cfd88"; depends=[class cluster conclust corrplot e1071 factoextra FactoMineR ggplot2 jpeg MASS mclust mda mmand nnet png randomForest reshape sp stringi stringr tcltk2 tkrplot]; }; Rcmdr = derive2 { name="Rcmdr"; version="2.6-2"; sha256="1fv4qx4w9x3gi64vba9qdkp6kghl83z5q7mmdjx7068n484kyhm1"; depends=[abind car effects lme4 RcmdrMisc relimp tcltk2]; }; RcmdrMisc = derive2 { name="RcmdrMisc"; version="2.7-0"; sha256="08k4x957x08cmhad1r5w502zan13gmcfap16wjfb92b4v3f6dzqy"; depends=[abind car colorspace e1071 foreign haven Hmisc MASS nortest readstata13 readxl sandwich]; }; RcmdrPlugin_BiclustGUI = derive2 { name="RcmdrPlugin.BiclustGUI"; version="1.1.1"; sha256="1sdc8ibggz8wpn77g7hddyl7lg86dbyw8qax63p6cqx1pfhb4rra"; depends=[BcDiag BiBitR BicARE biclust fabia gplots iBBiG Rcmdr rqubic s4vd superbiclust viridis]; }; RcmdrPlugin_DoE = derive2 { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc relimp]; }; RcmdrPlugin_EACSPIR = derive2 { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[abind ez nortest R2HTML Rcmdr RcmdrMisc reshape]; }; RcmdrPlugin_EBM = derive2 { name="RcmdrPlugin.EBM"; version="1.0-10"; sha256="02zips1jbfn7cshjlrm1gr632px2zxlys8i0f1nrf1gifl44v1qw"; depends=[abind epiR Rcmdr]; }; - RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.41"; sha256="0h84rr7scqpds1z0mbmsrhxppdh9rxykc5chvzvniab9hz2h7p05"; depends=[Rcmdr readstata13]; }; + RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.41.1"; sha256="0nfb2fdhag4593rmbfi4s4lbsbx76yizfn06rrch4q0sshhrg06m"; depends=[Rcmdr readstata13]; }; RcmdrPlugin_EcoVirtual = derive2 { name="RcmdrPlugin.EcoVirtual"; version="1.0"; sha256="0q879wnrmgbaddv883q9zdnp0i7kjcgn8cffv7lp8nrsqil6l7mc"; depends=[EcoVirtual Rcmdr]; }; RcmdrPlugin_Export = derive2 { name="RcmdrPlugin.Export"; version="0.3-1"; sha256="17fn3si6b6h20c52k1k6fv9mslw3f9v0x1kxixzcvq54scdx0sk0"; depends=[Hmisc Rcmdr xtable]; }; - RcmdrPlugin_FactoMineR = derive2 { name="RcmdrPlugin.FactoMineR"; version="1.6-0"; sha256="07k9x3mdaqzk1503wjsha9f8bxzw1074i9g7sa16yqz5lwky4lr7"; depends=[FactoMineR Rcmdr]; }; + RcmdrPlugin_FactoMineR = derive2 { name="RcmdrPlugin.FactoMineR"; version="1.7"; sha256="1145rpzhq219sl0j2bg5xa0ihq13lmr7ahcn3db4a8mqlz2fp8zy"; depends=[FactoMineR Rcmdr]; }; RcmdrPlugin_FuzzyClust = derive2 { name="RcmdrPlugin.FuzzyClust"; version="1.1"; sha256="1lg6k3h4n45s6wjkl3ycwfngfr2i6mkhirifhbazsvv297bg0iba"; depends=[clue doParallel foreach ggplot2 iterators MASS Rcmdr reshape2 tcltk2 tkrplot]; }; RcmdrPlugin_GWRM = derive2 { name="RcmdrPlugin.GWRM"; version="1.0.2"; sha256="01q4k9s815pgd5cavm6nyxy5npmpxryari9v6wys4n5cjpn5g6xq"; depends=[GWRM Rcmdr RcmdrMisc]; }; RcmdrPlugin_HH = derive2 { name="RcmdrPlugin.HH"; version="1.1-47"; sha256="1bba11izs1jhjsyb0d45c34gcihapk231qbiabcxf8x93sdmg6ga"; depends=[HH lattice mgcv Rcmdr]; }; @@ -3711,25 +3739,27 @@ in with self; { RcmdrPlugin_temis = derive2 { name="RcmdrPlugin.temis"; version="0.7.10"; sha256="02rs5xdj6g57frndc87fly0ans16584j4d0rfpy1h72655cz66ab"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; }; Rcolombos = derive2 { name="Rcolombos"; version="2.0.2"; sha256="0l92icjqqm5fxafqwd09lnmv5x6kvjdg8cphlm37q86nslwr5rkk"; depends=[httr]; }; Rcplex = derive2 { name="Rcplex"; version="0.3-3"; sha256="0abmrqphrpdlc831hwbwx15z4vdgn385kxhnqlbb9v0sjmfyszsl"; depends=[slam]; }; - Rcpp = derive2 { name="Rcpp"; version="1.0.3"; sha256="03h3zyjq948y0hrrs95lfk4zgx6wfrg64hjlrfrzf5na7bfh0d9b"; depends=[]; }; + Rcpp = derive2 { name="Rcpp"; version="1.0.4.6"; sha256="00mk23zmrqn1c4mk9d6csjcbnl12wd7yicjk2ikmw5dyvdfngbs5"; depends=[]; }; Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; }; - RcppAPT = derive2 { name="RcppAPT"; version="0.0.5"; sha256="0188sabgfmgh83yr3hmqpg5cmhllfkxzbxxchqr2r2fmj6x0ib1a"; depends=[Rcpp]; }; - RcppAlgos = derive2 { name="RcppAlgos"; version="2.3.5"; sha256="0ir4m5lzph27c2cwxj32fds4ghx6n3mamxyakkpgr2arbd3sa3zq"; depends=[gmp Rcpp RcppThread]; }; - RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.14"; sha256="1wiigx5g5788j6lyc3f6bs1rsvc4alyc3052g35hxl1giinxmhn4"; depends=[Rcpp]; }; - RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.800.4.0"; sha256="1csh54v4d0ccwmk4bqj4rca1d5rqpafvb4459x3q6k9sys0charx"; depends=[Rcpp]; }; + RcppAPT = derive2 { name="RcppAPT"; version="0.0.6"; sha256="0gkvs276hwa4yzd1bwf12p83cq2i1k021nq4y6ll1gcrj41mkdns"; depends=[Rcpp]; }; + RcppAlgos = derive2 { name="RcppAlgos"; version="2.4.1"; sha256="0s97v2agy8pzaqfjm7cabpfxpkidxl1zwi4vkjdhsfzxjp5xwwms"; depends=[gmp Rcpp RcppThread]; }; + RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.16"; sha256="0bfa35lp6vc4b0h3ymvdx50br233q8vvyjml34ngi81rj0imz3fr"; depends=[Rcpp]; }; + RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.860.2.0"; sha256="1rg9ak0zbv8d9cyj10jq52nrcbk1pvfz28kbkhpx79mpjhrl7pb5"; depends=[Rcpp]; }; RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; }; - RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.6"; sha256="1bkrzdcm18z7qfkcfq5yc4s8z6a43y6cfsa09k6j9ni9bl2pd6hf"; depends=[Rcpp]; }; + RcppBigIntAlgos = derive2 { name="RcppBigIntAlgos"; version="0.2.2"; sha256="1sby2bpp5w7mac4mm9grwyfvd54s0nida3grbs471prkba3h50zv"; depends=[gmp Rcpp RcppThread]; }; + RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.7"; sha256="0q4vj0dh04m2v2p8x0wd78hbfxzj4zi1nmp52ndwnirhs6zfny4l"; depends=[Rcpp]; }; RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.10"; sha256="175bn75akwgz3vcp0n59kiqqz7q9cwkvih241nj8v810cp4gpmkp"; depends=[Rcpp]; }; RcppCWB = derive2 { name="RcppCWB"; version="0.2.8"; sha256="15iiv5kwh7c3pprpyyvjnbj80x9245f3zmfiy41w661n3cnka68p"; depends=[Rcpp]; }; RcppClassic = derive2 { name="RcppClassic"; version="0.9.12"; sha256="0v9v34i1c4dkplavdl14kz1k2rnk4hsaiyv6rkc9403z9isvzzr0"; depends=[Rcpp]; }; RcppClassicExamples = derive2 { name="RcppClassicExamples"; version="0.1.2"; sha256="0dr2104miy7psr73nicfs84652ai0d5liw6wxcwyrx7fmys3p638"; depends=[Rcpp RcppClassic]; }; RcppDE = derive2 { name="RcppDE"; version="0.1.6"; sha256="1i9jj595nqpb16y22z2b8fcf0gq1fg0pbiisbd837p1cyw4nff69"; depends=[Rcpp RcppArmadillo]; }; RcppDL = derive2 { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp]; }; + RcppDate = derive2 { name="RcppDate"; version="0.0.1"; sha256="0psa7drm6chwn5w3h6yhaavf33mvzfaghzqa404l5yvxczy22xqi"; depends=[]; }; RcppDist = derive2 { name="RcppDist"; version="0.1.1"; sha256="02g57xwfipdcljv06krhm02dbqn9kfyj2km6rdg0a7vq9prwdz1x"; depends=[Rcpp RcppArmadillo]; }; RcppDynProg = derive2 { name="RcppDynProg"; version="0.1.3"; sha256="099hbm355d30rwxqjd7j4dfw678551dc5v4y7yy6q4xxyf527lbs"; depends=[Rcpp RcppArmadillo wrapr]; }; RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.7.0"; sha256="1b78qcjim0n9klgkr82n794d6bj9r9f33g0kcsszsns2hir65sk2"; depends=[Matrix Rcpp]; }; RcppEigenAD = derive2 { name="RcppEigenAD"; version="1.0.0"; sha256="18zm9hsfqwiicxsdm87ix3qc261ljxxn2s736p6aayx82b6vwkz6"; depends=[BH functional memoise Rcpp RcppEigen Rdpack readr]; }; - RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.2.11.1.1"; sha256="18m2ij98zsp897w9dwr8pjkrmqkjlgsxwiwa939i3cj75sjj3snh"; depends=[Rcpp RcppArmadillo]; }; + RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.2.12.1.1"; sha256="1nrfkvmz7p6sv1chis205ac13grqzrr950bh5fv1hl5qhyjj2iyk"; depends=[Rcpp RcppArmadillo]; }; RcppExamples = derive2 { name="RcppExamples"; version="0.1.9"; sha256="0568zipgjxgmx086mlfpp5n7v8kf50gwrylvhl1bgvzb2vvr9dhj"; depends=[Rcpp]; }; RcppFaddeeva = derive2 { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; }; RcppGSL = derive2 { name="RcppGSL"; version="0.3.7"; sha256="0cnw2k7cfqrm79r6j283aybflxig80x4n4rjkfp2317wf10mrsa5"; depends=[Rcpp]; }; @@ -3738,17 +3768,18 @@ in with self; { RcppHMM = derive2 { name="RcppHMM"; version="1.2.2"; sha256="0scdzmns1yw2gbarblzd6cbvndlysz54ff17qijiz17ql5cyzly6"; depends=[Rcpp RcppArmadillo]; }; RcppHNSW = derive2 { name="RcppHNSW"; version="0.2.0"; sha256="0gqdkw7vkcm544rz45g0hplg836ygzbfwk9gh9wr0817icvdb3qv"; depends=[Rcpp]; }; RcppHungarian = derive2 { name="RcppHungarian"; version="0.1"; sha256="1yx7kjjampjk47l8cqpv727g0nv23dnld9n8iwf7h1myfrl3yb6h"; depends=[Rcpp]; }; - RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-6"; sha256="0vjx6azp3sny6nv5k1cs6vk61hmbllqw8mgvi7zn15p7ilmhsyyi"; depends=[BH Rcpp RcppArmadillo]; }; + RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-7"; sha256="07vh1wyp2rxhfrb4vi5njchrby99bynd88na8qjxcnbypkgsrhbl"; depends=[BH Rcpp RcppArmadillo]; }; RcppMeCab = derive2 { name="RcppMeCab"; version="0.0.1.2"; sha256="0varavfbrqzma176rw0dr9v5chh7pxh5y9g0rs3v7hqnlghp22y2"; depends=[BH Rcpp RcppParallel]; }; RcppMsgPack = derive2 { name="RcppMsgPack"; version="0.2.3"; sha256="0ffdw5ckkax8j87q0ykjhyp45l7gvxjppdi73kc4r5qxvijll2g3"; depends=[BH Rcpp]; }; RcppNLoptExample = derive2 { name="RcppNLoptExample"; version="0.0.1"; sha256="1fml6hpa12q0lgg5fg6fi9lz6mckwh345pbh95mld2qagzvmg01n"; depends=[nloptr Rcpp]; }; RcppNumerical = derive2 { name="RcppNumerical"; version="0.4-0"; sha256="1a92fql6mijhnr1kxkcxwivf95pk9lhgmhzkshs51h0ybfv5krik"; depends=[Rcpp RcppEigen]; }; - RcppParallel = derive2 { name="RcppParallel"; version="4.4.4"; sha256="0p13f2mywjr7gmskf8ri4y8p5yr1bvr4xrpw2w11vdvafwz1vcia"; depends=[]; }; - RcppProgress = derive2 { name="RcppProgress"; version="0.4.1"; sha256="0yk01hfv961zyp569682k9igvhnwqyg5j0n5fm63sxigj82l2xhi"; depends=[]; }; + RcppParallel = derive2 { name="RcppParallel"; version="5.0.0"; sha256="1mhd6vp47xmfw533h0pkvydv96m57fspvd85g8m7iqb5rcxvhhdb"; depends=[]; }; + RcppProgress = derive2 { name="RcppProgress"; version="0.4.2"; sha256="0j2b37gwjpgmrnr00srdzm751hzlpsjb54ph63xxmcdfnwhlnqmi"; depends=[]; }; RcppQuantuccia = derive2 { name="RcppQuantuccia"; version="0.0.3"; sha256="0cj95y8jcjm33d65y42f5ijw775kq3mh2p0659mp3i3r9fvaishk"; depends=[BH Rcpp]; }; RcppRedis = derive2 { name="RcppRedis"; version="0.1.10"; sha256="07cxp0xdrg1bydlvgryf8jivlqicd880xdfdz6grhqqdxwss8qv1"; depends=[BH RApiSerialize Rcpp]; }; RcppRoll = derive2 { name="RcppRoll"; version="0.3.0"; sha256="0srzfhzkk42kzrdjnhbb37946jp1p688rgysy6k3i2is8jb21zyb"; depends=[Rcpp]; }; RcppSMC = derive2 { name="RcppSMC"; version="0.2.1"; sha256="0k2k1pj05i6hf7gpar3r4mbv9cs04bd4v657saq9vhy30300vg49"; depends=[Rcpp RcppArmadillo]; }; + RcppSimdJson = derive2 { name="RcppSimdJson"; version="0.0.4"; sha256="1bpsrbjhh9l84h2na2dk08xhd5k72vpha6zg0f81f373ckmvd6b3"; depends=[Rcpp]; }; RcppStreams = derive2 { name="RcppStreams"; version="0.1.3"; sha256="06il7q3afaws57m0fxf04f2p5dvs23l1f7gl78pxwzclacdy3839"; depends=[BH Rcpp]; }; RcppTN = derive2 { name="RcppTN"; version="0.2-2"; sha256="0m2wc5n1fzxv56s4gqqnygb24dbadgrpgjm4bs4hr6qazgjapymf"; depends=[Rcpp]; }; RcppTOML = derive2 { name="RcppTOML"; version="0.1.6"; sha256="1nyv4ynryh8vcrzyq01nzj13is40bjhxazlj9ilapyjdv9h5w3bs"; depends=[Rcpp]; }; @@ -3759,28 +3790,30 @@ in with self; { RcppZiggurat = derive2 { name="RcppZiggurat"; version="0.1.5"; sha256="0zmr3nvm5j0fpwxk3x9kxpwqbr66ldfvd10zy8xlgjbslz9myvfv"; depends=[Rcpp RcppGSL]; }; Rcrawler = derive2 { name="Rcrawler"; version="0.1.9-1"; sha256="1m6b1h72h8qjqcg3lzw6im6lpnkxhjg65g9fdjjqay6vy52ynznj"; depends=[callr data_table doParallel foreach httr jsonlite selectr webdriver xml2]; }; Rcriticor = derive2 { name="Rcriticor"; version="2.0"; sha256="1cnmmcdp2g3syrlld1pm7101cbzxh02cpvqvgsj7mp6zxm2k5plv"; depends=[]; }; - Rcsdp = derive2 { name="Rcsdp"; version="0.1.55"; sha256="1sskjf2vv5alnwirz676d8yphzk2a69wkghhkpxb8my1rjlfdgaw"; depends=[]; }; + Rcsdp = derive2 { name="Rcsdp"; version="0.1.57.1"; sha256="1dya0c0fcwr6ydcamz8m06nnq0b80vg7b22dg5jv3qi1n1fgp4lv"; depends=[]; }; Rcssplot = derive2 { name="Rcssplot"; version="1.0.0"; sha256="0hnzwjwk9zh4zbzy8sa0z6amikvpd9k1p1abd38khr8q8k1k8jiv"; depends=[]; }; Rd2md = derive2 { name="Rd2md"; version="0.0.2"; sha256="07j1nnsk5nyl8kvgvh9f684g6bhc01jiq1fcmq2pnpx57jdzfbpi"; depends=[knitr]; }; - Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.9"; sha256="029f85visar52002hdpfw5r2zq37kzbr8rgji76nnqi08jk0if4n"; depends=[formatR roxygen2]; }; + Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.10"; sha256="1bd5n7gdnpwncyxa4csh6ky60yb2i1bn5scsmbaba58b56crgyb5"; depends=[formatR roxygen2 xfun]; }; Rdice = derive2 { name="Rdice"; version="1.0.0"; sha256="1xibvm690808p2g3jch7rh1825yrpgln2hjfclgxjwn822qvs4xr"; depends=[data_table]; }; - Rdimtools = derive2 { name="Rdimtools"; version="0.4.2"; sha256="1pklnvg3qrlhskhk2vra38nnqcfdi3fncddm39w9mpxzbzmb62k7"; depends=[ADMM CVXR Matrix Rcpp RcppArmadillo RcppDE Rcsdp Rdpack RSpectra Rtsne]; }; + Rdimtools = derive2 { name="Rdimtools"; version="1.0.1"; sha256="1r6pqnm0j21dp8mqbamqdnwabljw331gh8v68jayx67bn25ap3w9"; depends=[CVXR maotai Rcpp RcppArmadillo RcppDE RcppDist Rcsdp Rdpack RSpectra]; }; Rdistance = derive2 { name="Rdistance"; version="2.1.3"; sha256="03wh6y9h5jgfc6xdncpgyz0v7lqavikp3pf5wwfmm2rqfj7yjr8c"; depends=[]; }; Rdpack = derive2 { name="Rdpack"; version="0.11-1"; sha256="080y15p2hl4jsq91ak2f1y2kx1iqq5c5wzyx3zyhjwp01cahy0jq"; depends=[bibtex gbRd]; }; Rdrools = derive2 { name="Rdrools"; version="1.1.1"; sha256="0awdj1q9ysrhwli16izi0lb6pppqxs1lb6wlv40111q483p41fj7"; depends=[dplyr magrittr purrr Rdroolsjars rJava rlang tibble]; }; Rdroolsjars = derive2 { name="Rdroolsjars"; version="1.0.1"; sha256="1l9bc1bwpj10irr973hzkhr04i1f3g998n8hcl2k2i9kgv1naqmz"; depends=[rJava]; }; - Rdsdp = derive2 { name="Rdsdp"; version="1.0.4-2"; sha256="05bk6yqvhzvyfzga1dz34w68nlwl2dc8bvhh3ghd07a61fsnkg4x"; depends=[]; }; + Rdsdp = derive2 { name="Rdsdp"; version="1.0.5"; sha256="04268fbajm7pgi5mxpghzw0yjwwx1dy9vdi6yhr20q2lmi6xh19w"; depends=[]; }; Rdsm = derive2 { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla1mrqsd75w3zh02vc7yd226l4rj"; depends=[bigmemory]; }; Rdta = derive2 { name="Rdta"; version="1.0.0"; sha256="1zmyh61wrzqwyfjbfcxg41cri7hy9r0jfwnixcvd086y0vxq7fdn"; depends=[MCMCpack mvtnorm Rdpack]; }; Rdtq = derive2 { name="Rdtq"; version="0.1"; sha256="114pyf95nl132014ygn84xi41c2zf1ii2wfgd1acwnnmfzvdw24s"; depends=[Matrix Rcpp]; }; Rduino = derive2 { name="Rduino"; version="0.1"; sha256="0r1yy3a2n8a4niasfjn77gv130a062i802r7xhbg0abljv5m6ra5"; depends=[serial]; }; ReCiPa = derive2 { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; }; - ReIns = derive2 { name="ReIns"; version="1.0.8"; sha256="1piwmjav32cwki3jhxzv3ld59gddlm5y5dwc8smwk5gzpfypdzm6"; depends=[doParallel foreach Rcpp survival]; }; + ReDaMoR = derive2 { name="ReDaMoR"; version="0.4.2"; sha256="1bvhplbzn3axpl9vwygd209dmfm123ix3c2dpx1i09nhvy2v65lv"; depends=[colourpicker crayon dplyr DT igraph jsonlite magrittr markdown readr rintrojs rstudioapi shiny shinyjs visNetwork]; }; + ReIns = derive2 { name="ReIns"; version="1.0.9"; sha256="1lvc39l42zwyrsr1s5zlj34rmi1i6pvp80z5jgkql0hr9i78fmq9"; depends=[doParallel foreach Rcpp survival]; }; ReacTran = derive2 { name="ReacTran"; version="1.4.3.1"; sha256="05c9jfvj134gy3by7m3r1fbar0m39vaydr7d2py9cakzs44fqfpj"; depends=[deSolve rootSolve shape]; }; RealVAMS = derive2 { name="RealVAMS"; version="0.4-3"; sha256="14jqrqza7bs11y1004wzi3bxkvkdfn43d82l0cyh6py8p37rfz28"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; Rearrangement = derive2 { name="Rearrangement"; version="2.1"; sha256="0q253nj62rl65vjsq6503r80qa2j35wac8lv7ydp9w260p28z923"; depends=[quantreg]; }; Recon = derive2 { name="Recon"; version="0.3.0.0"; sha256="11gag2bl00pcy7ysfycaa58qarh6aigznldkc4kkn2178bl4ii62"; depends=[rootSolve]; }; - RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-11.2"; sha256="1gqf236bpxi0hbhv8bxscv78dwdb3z4x105qfyvzky01aydw5zgn"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; }; + RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-12"; sha256="0ycx2y8dbcslsvyvr2spnr5jy8m5la11ji0scdlqjymaamij8f3h"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; }; + RecordTest = derive2 { name="RecordTest"; version="0.1.2"; sha256="19gxghp8b56gbyv2crjq2bzgaw5m3agd467ihbwkkjqli8cisgip"; depends=[ggplot2]; }; Records = derive2 { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; }; RedditExtractoR = derive2 { name="RedditExtractoR"; version="2.1.5"; sha256="1b6pp1vdn7jnyl8k828dgkxrx8sy2wyhkrn4rnfavqw4qvhm0mhm"; depends=[dplyr igraph magrittr RJSONIO rlang visNetwork]; }; Redmonder = derive2 { name="Redmonder"; version="0.2.0"; sha256="02qrz1b0g7hdacj2s2bks5gfwnypkbiwlmn0bv7im1zz1swg9cp8"; depends=[]; }; @@ -3790,7 +3823,7 @@ in with self; { RegSDC = derive2 { name="RegSDC"; version="0.3.0"; sha256="17w6qqh2vyh34xrpngqknk0g04sc6q7b77l7m0g8aiy904dsvfcr"; depends=[MASS Matrix SSBtools]; }; RegressionFactory = derive2 { name="RegressionFactory"; version="0.7.2"; sha256="1g23paq42xiiqavikbrflwmr8ikls9z97v1xpgg16pb88svdyayc"; depends=[]; }; RegularizedSCA = derive2 { name="RegularizedSCA"; version="0.5.4"; sha256="1nw6hd9y2n1h3j1fqqkymz13xizv5xrsj93w702kkvkbwyl3yall"; depends=[colorspace ggplot2 gtools lattice mice psych RGCCA]; }; - ReinforcementLearning = derive2 { name="ReinforcementLearning"; version="1.0.4"; sha256="14xacbi0bfnb9yn5sn1zksc4av08qrncn0glmbfc9x9i88rfz5m2"; depends=[data_table ggplot2 hash]; }; + ReinforcementLearning = derive2 { name="ReinforcementLearning"; version="1.0.5"; sha256="0zk1hy4p5adyjm1430a8ad5acn9qaax1si8qqfxqayfmlj954sj9"; depends=[data_table ggplot2 hash]; }; RelValAnalysis = derive2 { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; }; Relatedness = derive2 { name="Relatedness"; version="2.0"; sha256="1aidklwk8q2wdfsmhlbd3vzq9kzsyh4wn1g28biyb6lq7iwq1hl4"; depends=[]; }; Relexon = derive2 { name="Relexon"; version="0.2.1"; sha256="1shq1v3y1jhrnkl3fdnrwv23zrh8dx0k7zwqcvn5dxpd3vzsxqxg"; depends=[readr]; }; @@ -3798,20 +3831,21 @@ in with self; { RelimpPCR = derive2 { name="RelimpPCR"; version="0.2.4"; sha256="0svfyh313wawzqx9hfb4cg0wn2ir6nd769z1k3dckdsb8d7xkh3q"; depends=[caret ggplot2 relaimpo reshape2 Rmisc]; }; Renext = derive2 { name="Renext"; version="3.1-0"; sha256="074djs4y71667aylpgh514pzijr90rgpzm4w5ayq9cgaqz22m3am"; depends=[evd numDeriv]; }; RenextGUI = derive2 { name="RenextGUI"; version="1.4-0"; sha256="0jfg4a85j06wxk8vq2q6j8md2kcss0s7k71218gfh9vybk7hl4h6"; depends=[gWidgets gWidgetstcltk R2HTML Renext]; }; - Renvlp = derive2 { name="Renvlp"; version="2.7"; sha256="1h65m1av2z5zj5mmhrf0vspnbws2dp6s6ihyrvcrm24ipcnkvinz"; depends=[Rsolnp]; }; + Renvlp = derive2 { name="Renvlp"; version="2.8"; sha256="1avpy3hz693qj4d64mg6085hd0w6igwl1gs63jcda08d10zy6hg6"; depends=[Rsolnp]; }; ReorderCluster = derive2 { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp]; }; RepaymentPlan = derive2 { name="RepaymentPlan"; version="0.1.0"; sha256="1fd4n24bd5s2kqmls7mmsidblaf8nzm97kz52mfsb6i6fci0pgah"; depends=[]; }; RepeatedHighDim = derive2 { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; }; Replicate = derive2 { name="Replicate"; version="1.2.0"; sha256="0kqy248c8n7qr5hwzvqm7flnjlwd60c577r1d4vzgfxn7azd5v3v"; depends=[ggplot2 metafor]; }; - Replication = derive2 { name="Replication"; version="0.1.1"; sha256="1jf08kd7zwsgrabg14p0ad5ga8gcr2xdiy5mgljb9hz4ffyhb6fs"; depends=[blavaan lavaan MASS mice quadprog rjags runjags]; }; + Replication = derive2 { name="Replication"; version="0.1.2"; sha256="1za7zcdaf839xf8hxy4rcrr1p80n6a3ywb2bsl3wikwa0pxdvvbh"; depends=[blavaan lavaan MASS mice quadprog rjags runjags]; }; Repliscope = derive2 { name="Repliscope"; version="1.1.0"; sha256="0hij4ng77bkd979ndbhx1nqq2rfb69q23ghyd7illgvgrc79y9mr"; depends=[colourpicker ggplot2 shiny]; }; RepoGenerator = derive2 { name="RepoGenerator"; version="0.0.1"; sha256="0d6s2sqyycaqrg32xdkp3pr5i7qmvwrfrjcd7f94a9y3lz4bz5b5"; depends=[git2r httr rmarkdown rstudioapi]; }; ResistorArray = derive2 { name="ResistorArray"; version="1.0-32"; sha256="0zqnl0bbqrj5hn5ywhlqyrlz5ryql88qahlgs9989v4rljcxxlam"; depends=[]; }; ResourceSelection = derive2 { name="ResourceSelection"; version="0.3-5"; sha256="1vg5fkjfwkganxf0ji70pkp071841hjgr5sjxlaky8mx7n0cy80x"; depends=[MASS Matrix pbapply]; }; + RestRserve = derive2 { name="RestRserve"; version="0.2.2"; sha256="1b8wbar98qhhl46s4i7qks5nm2wy5bvfi9029gpd4gmqsq4bmbm7"; depends=[checkmate jsonlite mime R6 Rcpp Rserve uuid]; }; RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; }; Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; }; Rfacebook = derive2 { name="Rfacebook"; version="0.6.15"; sha256="0hp2mbm0hnyasizszvh5x9hv7z2q633zck1a1gvk36nbxb1shx7c"; depends=[httpuv httr rjson]; }; - Rfast = derive2 { name="Rfast"; version="1.9.8"; sha256="0y7r3svw4irbyhq42ncpldbf7mkrh9wcx1k0rjg41q04mj3720ch"; depends=[Rcpp RcppArmadillo RcppZiggurat]; }; + Rfast = derive2 { name="Rfast"; version="1.9.9"; sha256="18m8xhg24kygwhq7avdp1hibilicb5wppi2wdmc36fkqljc274y0"; depends=[Rcpp RcppArmadillo RcppZiggurat]; }; Rfast2 = derive2 { name="Rfast2"; version="0.0.5"; sha256="07w0ypwy19cqf4h94pzh0y8fmq5ibr048qzarrs1qzlnk2hx7k4c"; depends=[Rcpp RcppArmadillo Rfast]; }; Rfit = derive2 { name="Rfit"; version="0.24.2"; sha256="1b3pza2xdpifvrcqbdp5r2wy82ws1844bnpna01hqj65xbw2iix8"; depends=[]; }; Rfolding = derive2 { name="Rfolding"; version="1.0"; sha256="15lf73zxr1slin9faj9k0z8qkb1g9nb7h080nfv99gsi2ks68ssg"; depends=[]; }; @@ -3820,23 +3854,24 @@ in with self; { Rgb = derive2 { name="Rgb"; version="1.6.1"; sha256="0qs3dlv4g45dqphqjm23ky3w6rxh8ff2q6b17kvf57skyf1b1yn8"; depends=[]; }; Rgbp = derive2 { name="Rgbp"; version="1.1.4"; sha256="1y51sms321sbrl3rgzp5hq4y5mqkrjxsyrq75gkcbwfvlakjcfrg"; depends=[mnormt sn]; }; Rglpk = derive2 { name="Rglpk"; version="0.6-4"; sha256="19mzpyimzq9zqnbi05j79b2di3nzaln8swggs9p8sqdr60qvr3d2"; depends=[slam]; }; - Rgnuplot = derive2 { name="Rgnuplot"; version="1.0.3"; sha256="0mwpq6ibfv014fgdfsh3wf8yy82nzva6cgb3zifn3k9lnr3h2fj7"; depends=[]; }; - RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.5.2"; sha256="1y2dinxmzx6mg6ynpk2q7f4k4rxjm66my185gafdcvpc4rl7svs7"; depends=[png]; }; + RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.5.3"; sha256="02v8k0bw70q4qwx4lcdy8p25q7n3ql2ll46lfpqllxa1p26svmfi"; depends=[png sp]; }; Rhpc = derive2 { name="Rhpc"; version="0.19-276"; sha256="1wbdkqmaq3rdj5r9w0mddkcyiabyd9r26jp3i7i4w055mq2r1gs1"; depends=[]; }; RhpcBLASctl = derive2 { name="RhpcBLASctl"; version="0.20-17"; sha256="0iwc06blr5sx7rylwczi2jrha8sk8qs0jklflwpidl0zj1jxdggp"; depends=[]; }; Ricetl = derive2 { name="Ricetl"; version="0.2.5.1"; sha256="1d7229ylnxgh2rvarwga229378ja79l978zjabf3sph4cqc1b965"; depends=[devtools gWidgets gWidgetsRGtk2 plyr readr readxl stringr tidyverse writexl]; }; RichR = derive2 { name="RichR"; version="1.0.0"; sha256="0z0ri90jqdmw0vwxd1b4wr9if5cgm1gqpf6g9p1fdvncf4sdi9by"; depends=[magrittr metap plyr reshape2]; }; RidgeFusion = derive2 { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; }; Ridit = derive2 { name="Ridit"; version="1.1"; sha256="02cni6hzf1bsns7vi8vklnhc0pfb5vwqhjnnfnjnnaxpzpsbvdfn"; depends=[]; }; - RiemBase = derive2 { name="RiemBase"; version="0.2.3"; sha256="08dwnzjy7fhipvqb7p4kbhcfhrnz9i025czci6d0a9nnyscqcgfv"; depends=[pracma Rcpp RcppArmadillo Rdpack]; }; - RiemBaseExt = derive2 { name="RiemBaseExt"; version="0.1.1"; sha256="17899bsb6s4jaql71hsq5abcnf1ybji5236zwh25apc6k7br14fc"; depends=[cluster dbscan energy fastcluster kernlab Rcpp RcppArmadillo Rdpack RiemBase]; }; + RiemBase = derive2 { name="RiemBase"; version="0.2.4"; sha256="1h3ascbdgvp56k5ki6qr849296cdkr2bzc33pwwp033rmd8khpr3"; depends=[pracma Rcpp RcppArmadillo Rdpack]; }; + RiemBaseExt = derive2 { name="RiemBaseExt"; version="0.1.2"; sha256="0g0gkwjh1x18ay03f557g3zvb2cfivpx0pcgsrr3gm0gphli96v8"; depends=[cluster dbscan energy fastcluster kernlab Rcpp RcppArmadillo Rdpack RiemBase]; }; + RiemGrassmann = derive2 { name="RiemGrassmann"; version="0.1.0"; sha256="05dann9sdkdzmjp8jalxb963x42j7w007dk7vgkfngm62z6dr24v"; depends=[Rcpp RcppArmadillo RiemBase RiemBaseExt]; }; + RiemStiefel = derive2 { name="RiemStiefel"; version="0.1.1"; sha256="1sdib0xih81n059gi207q01gfb1ac1n02dsyq0qrdqnz1bhffk69"; depends=[Rcpp RcppArmadillo Rdpack RiemBase RiemBaseExt]; }; Riex = derive2 { name="Riex"; version="1.0.1"; sha256="1jri01s08g819bvw0bgd5z5iaf9rlikkqq993lm0455k909wm34v"; depends=[dplyr ggplot2 httr purrr quantmod rjson stringr tibble tidyr tidyverse TTR urltools xts zoo]; }; Rilostat = derive2 { name="Rilostat"; version="1.0.1"; sha256="0k8x2z3vxfwbynn22wpkfbc1i237bl61dh612nhw19c7v48lhdgg"; depends=[data_table dplyr DT haven plyr RCurl readr stringr tibble xml2]; }; Rinstapkg = derive2 { name="Rinstapkg"; version="0.1.0"; sha256="0fvj4jc00g5b8cc4mrsjj72fdcdmvlky05s2ca0g2gndrjs6vxic"; depends=[digest dplyr httr jsonlite lubridate purrr readr rlang uuid]; }; Rip46 = derive2 { name="Rip46"; version="1.0.2"; sha256="0wfp6fm5mgmjqjkn0c5hvjd95yn4zcv0s8xc5294qf5jqxp8b1w7"; depends=[Rcpp]; }; Rirt = derive2 { name="Rirt"; version="0.0.2"; sha256="0npd2g3a4dh5hlj6l06k1pf0j4731ybqqd4mpi4id16nf81cg104"; depends=[ggplot2 Rcpp reshape2]; }; Risk = derive2 { name="Risk"; version="1.0"; sha256="1i42xcc699syj108mvgklwb30wkf9c9jrg5rmd2ypnqk9mnyg2fg"; depends=[]; }; - RiskPortfolios = derive2 { name="RiskPortfolios"; version="2.1.2"; sha256="10kgr05npq9gyhglvpzk49hsr44rgscnygkv3b0gz7f6jxqkfj9z"; depends=[MASS nloptr quadprog]; }; + RiskPortfolios = derive2 { name="RiskPortfolios"; version="2.1.4"; sha256="1f5789sa2qjjsfsjxi1cidmpdla010zwvwspl46vzr97196hhig7"; depends=[MASS nloptr quadprog]; }; Ritc = derive2 { name="Ritc"; version="1.0.2"; sha256="03smhxjhjfkc9pxhlgg54b6v2jznpmnws8373qpvn9a9ky5bcq2l"; depends=[minpack_lm]; }; RiverBuilder = derive2 { name="RiverBuilder"; version="0.1.1"; sha256="06cd1m4liv2bsh2sxplq2zl45g9zq8gsgvh14d0zr0pqm8z4dsyw"; depends=[]; }; RiverLoad = derive2 { name="RiverLoad"; version="1.0.2"; sha256="0v689r9k52x8d4pvk6jlsgr6lp22fn3kn7s69hryyy3pmfmlbrh9"; depends=[imputeTS]; }; @@ -3844,7 +3879,7 @@ in with self; { RkMetrics = derive2 { name="RkMetrics"; version="1.3"; sha256="1k6vnr1r4h69iznib638z45gd0f8wc4g4h0ji9f0017883g77li1"; depends=[]; }; Rknots = derive2 { name="Rknots"; version="1.3.2"; sha256="1krhma8hy3l5lbm6d8rxjlj9jw1zrd16h4wy4p1clfa5vlhh3bwi"; depends=[bio3d rgl rSymPy]; }; Rlab = derive2 { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; }; - Rlabkey = derive2 { name="Rlabkey"; version="2.3.3"; sha256="14jiksm93c8qn9x0slc5v1f5d1fxcyg2fdxd82czdgp8j2ijwh55"; depends=[httr jsonlite Rcpp]; }; + Rlabkey = derive2 { name="Rlabkey"; version="2.4.0"; sha256="0iah1b4f4gkyik30v0wrydnqx5g03l1jmkifyyfp03sg5cfvgzfv"; depends=[httr jsonlite Rcpp]; }; Rlda = derive2 { name="Rlda"; version="0.2.6"; sha256="0i8n01h9072q339p1kiqhcpwphw0d2x6bsszbhgfqc2b160dk2bl"; depends=[coda doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; }; Rlgt = derive2 { name="Rlgt"; version="0.1-3"; sha256="0g610v5rch5s31gc7dy9zx4mcgsdhn82y1pmr2rs14qma0v7x515"; depends=[BH forecast Rcpp RcppEigen rstan rstantools sn StanHeaders]; }; Rlibeemd = derive2 { name="Rlibeemd"; version="1.4.1"; sha256="06bb939awawpwn4g63b9jzq5b658lsznzy272zl0fy19x62c6bwr"; depends=[Rcpp]; }; @@ -3863,22 +3898,22 @@ in with self; { Rmpi = derive2 { name="Rmpi"; version="0.6-9"; sha256="1rhycla98hxgnnxlxxldr1x51djak7c2jjvlrv3jcsvgwp1ymqdj"; depends=[]; }; Rmst = derive2 { name="Rmst"; version="0.0.3"; sha256="1fykpii17k460qlsjhhh5vag02lhkyk5l3zjmg8hifqp0cjhz2fl"; depends=[ggplot2 Rata reshape2 Rirt]; }; RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.4"; sha256="1k1gnkghap878fck0bbz9mm0fr4cli6lh1d11r0cf47fvl6cc4gr"; depends=[]; }; - Rnets = derive2 { name="Rnets"; version="1.2.1"; sha256="08441hhmf1i97z5xb9pq651y6hwr2yraiyg1ns7qkxm2svz3kwxs"; depends=[data_table glasso ICSNP igraph rlang stringr]; }; Rnmr1D = derive2 { name="Rnmr1D"; version="1.2.5"; sha256="0z97pmkksma225s948r0myd4638cy8vl1x2244w1r6n0cybymnd9"; depends=[base64enc doParallel foreach ggplot2 igraph impute MASS MassSpecWavelet Matrix plotly plyr ptw Rcpp signal speaq XML]; }; - Rnumerai = derive2 { name="Rnumerai"; version="0.3"; sha256="0zvfp9zp73gm6pflf9bx1xk1s45xwwvcd56cbris08d2zfj3b3nl"; depends=[httr lubridate]; }; + Rnumerai = derive2 { name="Rnumerai"; version="2.1"; sha256="1f16fp9gzcaz3ad7iyw10n8jrnmnhxygn00mrcg582jz62dih9bd"; depends=[dplyr ggplot2 httr lubridate purrr tidyr]; }; RobAStBase = derive2 { name="RobAStBase"; version="1.2.1"; sha256="0dn93bcyz9kxbj38sc1wisfa6v0666v9gk6y3zq0ihjkkhkmdwq3"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; }; RobAStRDA = derive2 { name="RobAStRDA"; version="1.2.0"; sha256="1s84j5in4av9zbbszv8j2rpigrd9ws9h4hz64jw7xagsj3xb49kz"; depends=[]; }; RobExtremes = derive2 { name="RobExtremes"; version="1.2.0"; sha256="150p94f0g75g54qcaq4x45lk4sxiyvv1zs4hxkicf46raybvsv89"; depends=[actuar distr distrEx distrMod evd RandVar RobAStBase RobAStRDA robustbase ROptEst startupmsg]; }; RobGARCHBoot = derive2 { name="RobGARCHBoot"; version="1.0.0"; sha256="0m739ix7qj89ppz3k87pc5rgiasmgii467l95clkn6wschfnpfgx"; depends=[Rcpp RcppArmadillo]; }; RobLox = derive2 { name="RobLox"; version="1.2.0"; sha256="1lcylkskfidg576lqfi84l14rvrpfbzmr53hcgzzmfipxhli4dr8"; depends=[Biobase distr distrMod lattice RandVar RColorBrewer RobAStBase]; }; RobLoxBioC = derive2 { name="RobLoxBioC"; version="1.2.0"; sha256="01lydp67v7mc4v3svsnl4zqq2jy1czwg9l9blngjn9ky0hv3haf5"; depends=[affy AnnotationDbi beadarray Biobase BiocGenerics distr distrMod lattice RColorBrewer RobLox]; }; + RobMixReg = derive2 { name="RobMixReg"; version="0.1.0"; sha256="171kwgfxmnwsrhjy3bwl6sl4z8nw9cx588a3snavpvsl7kwdlmmr"; depends=[flexmix gtools MASS robustbase]; }; RobPer = derive2 { name="RobPer"; version="1.2.2"; sha256="0631qfpz61606r50vzn7b3h7arfwxcs8j13q1hg779qx60kwrliy"; depends=[BB quantreg rgenoud robustbase]; }; RobRSVD = derive2 { name="RobRSVD"; version="1.0"; sha256="07z5fw8j5lq7nyxgkvb9i4iwb5inddz2ib4m2bjx6q4c1ricpqz9"; depends=[]; }; RobRex = derive2 { name="RobRex"; version="1.2.0"; sha256="1npgbdvdzb0p0w77fsngrwg968y621p3lx8qw69ns8qgxjkismqp"; depends=[distr RandVar RobAStBase ROptRegTS]; }; - RobStatTM = derive2 { name="RobStatTM"; version="1.0.1"; sha256="05bhly32gi5w5n4w7c276dfvyj9ax1kfiwlj2s7x7l6r8yxkjp25"; depends=[DEoptimR DT fit_models ggplot2 gridExtra PerformanceAnalytics pyinit robust robustbase rrcov shiny shinyjs xts]; }; - RobinHood = derive2 { name="RobinHood"; version="1.2.1"; sha256="0lq06m7zdny5230afssr8cjx7rlfnhmrzi02972dqcc6w9p62270"; depends=[dplyr httr jsonlite lubridate magrittr profvis uuid]; }; + RobStatTM = derive2 { name="RobStatTM"; version="1.0.2"; sha256="14fnz01n0dd0qdlnd9vcqqj0xzfn8av8fvsy2ay0lk22ma3jw83v"; depends=[DEoptimR DT fit_models ggplot2 gridExtra PerformanceAnalytics pyinit robustbase rrcov shiny shinyjs xts]; }; + RobinHood = derive2 { name="RobinHood"; version="1.2.4"; sha256="00riiz1csxmncsd79xj85bl5vbhyp8vj43b2s7wc3zhq0d89kizc"; depends=[dplyr httr jsonlite lubridate magrittr profvis uuid]; }; Robocoap = derive2 { name="Robocoap"; version="0.1-1"; sha256="0aj6iv85a1zfaknjhrzf6lnf0qn726dvnj4dywg9nii1kkqrkq2w"; depends=[data_table igraph markovchain tm]; }; - RobustAFT = derive2 { name="RobustAFT"; version="1.4-4"; sha256="17qjfpagz0wpl8hbyksnag51nj6b9arl9mk5a56avykd2nii95kd"; depends=[robustbase survival]; }; + RobustAFT = derive2 { name="RobustAFT"; version="1.4-5"; sha256="1i119qqlavfj7k0srb8fbbyy2nhsjv9rgrni854liizr9m51cgac"; depends=[robustbase survival]; }; RobustCalibration = derive2 { name="RobustCalibration"; version="0.5.1"; sha256="0wsnvryvrl37acljrda2dm1d8aynqiy66yd2i857m035whixfpqa"; depends=[Rcpp RcppEigen RobustGaSP]; }; RobustGaSP = derive2 { name="RobustGaSP"; version="0.5.7"; sha256="1zjil79a5zwi51bsrifplj2yyxpqg4v9471bsclwzyzll24c46vk"; depends=[nloptr Rcpp RcppEigen]; }; RobustRankAggreg = derive2 { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; }; @@ -3887,7 +3922,8 @@ in with self; { RonFHIR = derive2 { name="RonFHIR"; version="0.4.0"; sha256="1ajpgpp300m0zzqzzwsn8sfy8x751hrr8py9n9xvzjmkgyrh4hhw"; depends=[httr jsonlite R6 stringr]; }; Rook = derive2 { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; }; RootsExtremaInflections = derive2 { name="RootsExtremaInflections"; version="1.2.1"; sha256="0qd6cmzp8fkb75ac79xbh4032vqwax7nk7d6yykpdbn0bnk2kvdi"; depends=[doParallel foreach inflection iterators]; }; - Ropj = derive2 { name="Ropj"; version="0.2-2"; sha256="1jdn4m5xfnm7z7pjchqsy1zhh6kgbi8fw2jl8hw1pckjfyzhlwhw"; depends=[Rcpp]; }; + Ropj = derive2 { name="Ropj"; version="0.3"; sha256="01yzlzab7pldyxqb1g8fmc6iig2d4y887bfxqjxckvd4f76vlkqs"; depends=[Rcpp]; }; + Rosenbrock = derive2 { name="Rosenbrock"; version="0.1.0"; sha256="0qfdyr66g244jvbnssbnj2b2ng740dr4qmillpnwl4h2hh811syv"; depends=[MASS]; }; Rothermel = derive2 { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[ftsa GA]; }; RoughSetKnowledgeReduction = derive2 { name="RoughSetKnowledgeReduction"; version="0.1"; sha256="0zn6y2rp78vay9zwijpzhjpyq1gmcsa13m9fcsxkd1p2c8g5rbmf"; depends=[]; }; RoughSets = derive2 { name="RoughSets"; version="1.3-7"; sha256="0g6nx0cak6619hxv1fq3b30xv0bdwxb776qkdj6ihig6nhkm2hkj"; depends=[Rcpp]; }; @@ -3897,18 +3933,17 @@ in with self; { RpeakChrom = derive2 { name="RpeakChrom"; version="1.1.0"; sha256="1r8f6knpz83arz2kabizx5yyh1myg0h310qlwh8rmy88cdxi1ps9"; depends=[ggplot2 minpack_lm pracma ptw]; }; Rphylip = derive2 { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; }; Rphylopars = derive2 { name="Rphylopars"; version="0.2.12"; sha256="0a3cpyw7fgfklwzzy77sm3brfdha4p9021jaaa2s2hknpr9c1fmp"; depends=[ape doBy geiger MASS Matrix mvnmle phylolm phytools Rcpp RcppArmadillo]; }; - Rpipedrive = derive2 { name="Rpipedrive"; version="0.1.1"; sha256="1rf16q0wfmd3n9idiqpmdhcw7sq27yk2cy9gfl5l6bzj0y6ax1q8"; depends=[httr jsonlite]; }; Rpoet = derive2 { name="Rpoet"; version="1.1.0"; sha256="11gp4zg0wc2a21956355rkr3i3dyaabfz0z30z4phn8s7y3yqr92"; depends=[]; }; Rpolyhedra = derive2 { name="Rpolyhedra"; version="0.4.2"; sha256="0q50f0pp72rwmflxwnridjrcl649kz5h2fm8jfz2pn473mghhya8"; depends=[digest dplyr futile_logger geometry git2r R6 rgl stringr testthat XML]; }; Rpoppler = derive2 { name="Rpoppler"; version="0.1-0"; sha256="19nvv45ahp0c241p1xzlq0sq5qarqg66jw5f1anhqnfi2hi91hcm"; depends=[]; }; - Rprofet = derive2 { name="Rprofet"; version="2.2.0"; sha256="1s0jkq83vfc9jsggnwm31r366b10n6sri2vzpwxybzpjq3d3w5qr"; depends=[binr ClustOfVar ggplot2 gridExtra plyr sqldf stringr]; }; + Rprofet = derive2 { name="Rprofet"; version="2.2.1"; sha256="150123vxdd31p96f3vsri46ryfng2xvnjgm6mdiqczg48xyfpbdp"; depends=[binr ClustOfVar ggplot2 gridExtra plyr sqldf stringr]; }; Rquake = derive2 { name="Rquake"; version="2.4-0"; sha256="14s2mjq9qqxfvlwmq9126h67y5wr7irlc7945pgv1ab9hl1lgmz8"; depends=[GEOmap MBA minpack_lm rgl RPMG RSEIS]; }; - Rquefts = derive2 { name="Rquefts"; version="1.0-5"; sha256="0c3738rn3abmah61kxyys3ab807r7mhcj10shkraq3li6v7aw5kv"; depends=[meteor Rcpp]; }; + Rquefts = derive2 { name="Rquefts"; version="1.0-7"; sha256="1r1b2ga7kfhxsgr2d6ncfyrcpwx1jy0q1h06xajhfpd7i2sk7i84"; depends=[meteor Rcpp]; }; Rramas = derive2 { name="Rramas"; version="0.1-6"; sha256="16aapvz9j81lvi5ryj41bvn3wf51b0gynnzs0jpvva4m3mvzw6an"; depends=[diagram]; }; - Rraven = derive2 { name="Rraven"; version="1.0.8"; sha256="00qlisn7026y0dhgb9ig8liky5k8xrw7app5dj6f8123bi6ligv6"; depends=[NatureSounds pbapply seewave tuneR warbleR]; }; + Rraven = derive2 { name="Rraven"; version="1.0.9"; sha256="00iwjwqwjam45zcsggckdaqcd6sygh8ysahpvrx7xg4h5rdnhg92"; depends=[NatureSounds pbapply seewave tuneR warbleR]; }; Rrdrand = derive2 { name="Rrdrand"; version="0.1-16"; sha256="0j9yyvq8r1cgwj3kw1ak6hyazr67f2q0c1m651wdm0wcvm1ajx7f"; depends=[]; }; - Rsagacmd = derive2 { name="Rsagacmd"; version="0.0.2"; sha256="02mz1q6zjrrjrf40d8y7xpzilk2f14zpsczcw9qr5v9zzch4kjxb"; depends=[foreign magrittr minpack_lm raster rgdal sf stringr XML]; }; - Rsampletrees = derive2 { name="Rsampletrees"; version="1.0.2"; sha256="1wz3dp1myjkxzf9l5mfli3dfbkc2fwg70xx7m9cxa06vq0a4w5pv"; depends=[ape haplo_stats Rcpp]; }; + Rsagacmd = derive2 { name="Rsagacmd"; version="0.0.5"; sha256="06mgynndkm0syzqxryvjcjcjcd7a9fcwq2v1r2qq5073har6r1iy"; depends=[foreign magrittr minpack_lm raster rgdal rlang sf stringr tibble XML]; }; + Rsampletrees = derive2 { name="Rsampletrees"; version="1.0.3"; sha256="1qnvnhhzhyfbka4zjblddj5ad5d6q7rzb8rpikzpvcqn9s57lnqk"; depends=[ape haplo_stats Rcpp]; }; Rsampling = derive2 { name="Rsampling"; version="0.1.1"; sha256="14rp3j7iaii4rc3jkbijmbgvlagxxqjkz3vvfwwpxix43rsi8zsk"; depends=[]; }; Rsconctdply = derive2 { name="Rsconctdply"; version="0.1.3"; sha256="12xc1laxgivv4szp8341pvhmxnzzzzc2s4jhnqsqrbx71lbd9szg"; depends=[dplyr rjson rsconnect]; }; Rserve = derive2 { name="Rserve"; version="1.7-3.1"; sha256="16cg0cak9pvd9l35fjy1lsplxr5ncvb4apzg5mish5kff0cyk89v"; depends=[]; }; @@ -3918,37 +3953,37 @@ in with self; { Rsomoclu = derive2 { name="Rsomoclu"; version="1.7.5.3"; sha256="1l1kvr92n0pd6rkr663701lpz81mf0i4hpf80ssd27773m6yw0kg"; depends=[kohonen Rcpp]; }; Rspc = derive2 { name="Rspc"; version="1.2.2"; sha256="1cnzqpnh009wfs51dc4id9q3giaa8b6dc75b1lhzpwcvw0cxcy4y"; depends=[]; }; Rspotify = derive2 { name="Rspotify"; version="0.1.2"; sha256="1q8ajjx5ghlgxgch9gifvhi2gmsi0ph8pygwrb9jrd3ijahlw5k4"; depends=[dplyr httr jsonlite magrittr plyr]; }; - Rssa = derive2 { name="Rssa"; version="1.0"; sha256="0alh0vq3qqzrn1kklqfp52qknasfq6yzk2dprz3g9pyq05qhmhlw"; depends=[forecast lattice svd]; }; + RsqMed = derive2 { name="RsqMed"; version="0.1.7.1"; sha256="18r78svwbnri5283s5nxg4vrp29r6xx13h0n6w634jdpwaiw56gk"; depends=[GMMAT SIS]; }; + Rssa = derive2 { name="Rssa"; version="1.0.2"; sha256="14gzd6mz9v8c0c15sinf67f1ii6b6ximpfz8daq3800pw2cav49r"; depends=[forecast lattice svd]; }; Rsurrogate = derive2 { name="Rsurrogate"; version="2.0"; sha256="1pjyhlxqi8mcbywa7qa1vxgxr5jca0nc9vm1bx53vr231wgnb7gf"; depends=[survival]; }; Rsymphony = derive2 { name="Rsymphony"; version="0.1-28"; sha256="02x54ygbcd2600prcww1l9pb02skn96rj0jdljpky1228jbib4nx"; depends=[]; }; Rtauchen = derive2 { name="Rtauchen"; version="1.0"; sha256="09282k6qsjxgm26682npfjymmbx5g8flcc44awmkjl2k4fa1q9ha"; depends=[]; }; - RtextSummary = derive2 { name="RtextSummary"; version="0.1.0"; sha256="1kqzml8zmkqx6200g2jw5mmg5g043h6mr1skms1c2q905avd46gv"; depends=[dplyr Matrix_utils mlapi R6 stringr text2vec tidyr tokenizers]; }; - Rtextrankr = derive2 { name="Rtextrankr"; version="1.0.0"; sha256="16dby3xsfcjyp35xdflmgnh7zkqygfbffvj4jqa565vj9ksnq5ir"; depends=[igraph KoNLP sets stringi]; }; Rtnmin = derive2 { name="Rtnmin"; version="2016-7.7"; sha256="0f8ii87v29v61b93hx2yxdppp3nvgnl5imp80sbb4bjsdg0mf989"; depends=[]; }; - Rtrack = derive2 { name="Rtrack"; version="0.9.3"; sha256="0b73cr299hv2k6ia4ama6ciq9506wy2w2cyh1bv5wdqiyvf8hzia"; depends=[crayon KernSmooth openxlsx pbapply randomForest raster readxl rgeos rjson sp]; }; + Rtrack = derive2 { name="Rtrack"; version="0.9.6"; sha256="00xbgfv5a02f05pwlrn3v93ydi3xsil9hznj4rjisf0mc2pmzfj0"; depends=[crayon KernSmooth openxlsx pbapply randomForest raster readxl rgeos rjson sp]; }; Rtsne = derive2 { name="Rtsne"; version="0.15"; sha256="0v17vxizrs1msay24xl2bckfajr2c82wpqj07lyssbrq197nwdsn"; depends=[Rcpp]; }; Rttf2pt1 = derive2 { name="Rttf2pt1"; version="1.3.8"; sha256="0b3f2zkmbyshn19cnaaf042d0zwf43l9jnkqizfhxxwb93a4c1jn"; depends=[]; }; RtutoR = derive2 { name="RtutoR"; version="1.2"; sha256="19wmi30b5i6zj673d76gxl6j0k3ppfyl5fqrcs0dwmmadrrvbajq"; depends=[colourpicker devtools dplyr DT FSelector ggplot2 ggthemes officer plotly rlang rmarkdown shiny shinyBS shinydashboard shinyjs tidyr]; }; Rtwalk = derive2 { name="Rtwalk"; version="1.8.0"; sha256="0zxf66lsfq8by40flv34xzd5yy0wa1ah9li1d0h7f0yh9nbwhxl5"; depends=[]; }; Runiversal = derive2 { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; }; - Runuran = derive2 { name="Runuran"; version="0.27"; sha256="0nvrxv3a0wl3rk5885qm20wxcnfy2lrxv5d99wjd02j3636gq353"; depends=[]; }; + Runuran = derive2 { name="Runuran"; version="0.30"; sha256="1a3z49nrx1azbm4blqcwwcbwnxcrcr8md350viakl8a0b3y2v59q"; depends=[]; }; RunuranGUI = derive2 { name="RunuranGUI"; version="0.3"; sha256="1h2bcc443z8vp4hjf4vss4ds5n6zc6x70kmw13b2431f56jq12fa"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 Runuran rvgtest]; }; - Rvcg = derive2 { name="Rvcg"; version="0.18"; sha256="0a9022ps8cddmblgyzzvfyb77n206dvbv0b7fpnfplis4s68zjkf"; depends=[Rcpp RcppArmadillo RcppEigen]; }; + Rvcg = derive2 { name="Rvcg"; version="0.19.1"; sha256="0brqnvhqj9052kkic1i8mxx7y1si9na5rwj1fmslsf5mih8n4grr"; depends=[Rcpp RcppArmadillo RcppEigen]; }; Rvmmin = derive2 { name="Rvmmin"; version="2018-4.17"; sha256="0mhzzwk311wa157l3n4x5x038asvjd81l45g1jclfsjr0smsffym"; depends=[optextras]; }; Rvoterdistance = derive2 { name="Rvoterdistance"; version="1.1"; sha256="16il36hkq1j6gyl5d8bx5khiiv6fy2m8vkhwiaaiqsliw2sspy4j"; depends=[Rcpp]; }; Rwave = derive2 { name="Rwave"; version="2.4-8"; sha256="1rmqwyj2r84sii0vfqhyhpi3n1n1zia2ca627fq9ksvwn110nrvh"; depends=[]; }; - Rwhois = derive2 { name="Rwhois"; version="1.0.3"; sha256="06mx98wi6r265ykkk81hk17yjkym6ar7c2cwp962ijfk3lxwc9l4"; depends=[stringr]; }; + Rwhois = derive2 { name="Rwhois"; version="1.0.4"; sha256="0gbw1fvin6hwm4893rif9grpsf5s2snzp7zvz3ra4f5jv5bflvpl"; depends=[stringr]; }; Rwinsteps = derive2 { name="Rwinsteps"; version="1.0-1.1"; sha256="0kaxhaa65k1hkhl4kqfxyyk6v967xncrdr5hy8b808zlbqriankc"; depends=[]; }; + Rwofost = derive2 { name="Rwofost"; version="0.6-3"; sha256="0a6fp2hkf51hqmbyp7mlhhnzzxj2gcq0kdrlcm3qmpkv0y44wmmw"; depends=[meteor Rcpp]; }; Rwordseg = derive2 { name="Rwordseg"; version="0.3-2"; sha256="10jhfalh45rrcm76hwz4b5yl408ndx2wkr0i3q1avx6z6i45d8s6"; depends=[HMM tmcn]; }; RxCEcolInf = derive2 { name="RxCEcolInf"; version="0.1-4"; sha256="0qyhxqd5yi4d1prj0i4g3k29zi0mx6wkjx24ynb4arxw6h1vabh4"; depends=[coda lattice MASS MCMCpack mvtnorm]; }; - RxODE = derive2 { name="RxODE"; version="0.9.1-9"; sha256="09qi26ksqznkmmi5sq6sq0jicn1yc4l25dq4snb6r03vbbbq399c"; depends=[assertthat brew cli crayon digest dparser ggforce ggplot2 inline lotri magrittr Matrix memoise mvnfast pillar PreciseSums Rcpp RcppArmadillo remotes rex sys units]; }; + RxODE = derive2 { name="RxODE"; version="0.9.2-0"; sha256="1ynn38wk08szi34pk0hmlnanmfg19arazsqzafyw5kd1v3fdx4g4"; depends=[assertthat brew cli dparser ggplot2 inline knitr lotri magrittr Matrix memoise mvnfast pillar PreciseSums Rcpp RcppArmadillo rex sys units]; }; RxnSim = derive2 { name="RxnSim"; version="1.0.3"; sha256="0fi4aic2brfbl6rsnnfwqq7l8ygvlmr98w0v749l3djpgn7sfrig"; depends=[data_table fingerprint rcdk rJava]; }; - Rxnat = derive2 { name="Rxnat"; version="1.0.6"; sha256="1wzb4dihzbyp23yggi1n7c5ikbq6h2gl9v7bgwxf00y2gwlabjx4"; depends=[httr RCurl]; }; - Ryacas = derive2 { name="Ryacas"; version="1.1.2"; sha256="1m5z6x4w461rwk5ay6fc7y3l4b1nwlhma0lis2q8v93adnwgmg7n"; depends=[magrittr Rcpp]; }; + Rxnat = derive2 { name="Rxnat"; version="1.0.8"; sha256="12xcs2l6vn50bwzfmv60j1qahjw2npfm1a3yjhffcxzh6p8chwbg"; depends=[httr RCurl]; }; + Ryacas = derive2 { name="Ryacas"; version="1.1.3"; sha256="12vkylq06c7kqvvf662cyzhdcnpy928xsjflf1kf0nh6y00gywf8"; depends=[magrittr Rcpp]; }; Ryacas0 = derive2 { name="Ryacas0"; version="0.4.2"; sha256="0k8q9v9016x8vfskwa6zmh2rbblqqfk8bryxslxaj8irzvkggnvl"; depends=[Rcpp settings xml2]; }; S2sls = derive2 { name="S2sls"; version="0.1"; sha256="0qq1rff2cdgrm5rj69jxgrl71i0wmzyn424fdvcg02zdv9ggqhd3"; depends=[spanel]; }; SACCR = derive2 { name="SACCR"; version="2.3"; sha256="0q5fpzmfj08mzxbxksi5fgkfw8n4zsmh37zqnbwkz30llh620hgv"; depends=[data_tree jsonlite Trading]; }; - SACOBRA = derive2 { name="SACOBRA"; version="1.1"; sha256="123kbksamx30l4kib8pkv44knra8yqhvjwbx61xxi7k88qaxvmin"; depends=[mgcv R6 testit]; }; + SACOBRA = derive2 { name="SACOBRA"; version="1.2"; sha256="1v45l56vifkg3v2bfhk3kfg4fn0dfvrjcgy13zzymm8blr7vazi5"; depends=[mgcv R6 testit]; }; SADEG = derive2 { name="SADEG"; version="1.0.0"; sha256="02ilykbdanx1isbd80c43hqpzkckq6dg40y0rklcnck6v96qky3n"; depends=[]; }; SADISA = derive2 { name="SADISA"; version="1.2"; sha256="0yn7f360wl5ykys5zln159xh2h8bx7zb5ddwhv1migjlqry506hp"; depends=[DDD pracma]; }; SAFD = derive2 { name="SAFD"; version="2.1"; sha256="078ki9wrmcf80bwhx4d56gas79xrc17a0081i13yxvjqn6w7f7jd"; depends=[]; }; @@ -3956,25 +3991,26 @@ in with self; { SALES = derive2 { name="SALES"; version="1.0.0"; sha256="1kjmlwa4v2i7hzm947xby9jr0irsf4c851f7jyqyhqna9c65rx0g"; depends=[Matrix]; }; SALTSampler = derive2 { name="SALTSampler"; version="1.1.0"; sha256="1lh1w5kcx2sqv5czpfypdbq5mw7pxjbdk0vyg23zzjs26ynbdkn9"; depends=[lattice]; }; SAM = derive2 { name="SAM"; version="1.1.2.1"; sha256="01gj9k1gf35vm11p0p590irqc5daaiwmq05rl2v3n8h2azaz1c7l"; depends=[Rcpp RcppEigen]; }; - SAMCpack = derive2 { name="SAMCpack"; version="0.1.1"; sha256="1nnrfc74hd39vnb94lxwfjksmjaz62x0alc2ga46gqyygrrg57g5"; depends=[Rcpp RcppArmadillo RcppXPtrUtils Rdpack]; }; + SAMBA = derive2 { name="SAMBA"; version="0.9.0"; sha256="0gxc1s82bfhqj1rpmp0fm87frv77rgr8qjqai7zdgfz3jm474any"; depends=[optimx survey]; }; SAMM = derive2 { name="SAMM"; version="1.1.1"; sha256="175jk3s9w68ccw1h019380lp9cajfsy3zigcnplp87pcn3qg7x2i"; depends=[Rcpp RcppArmadillo]; }; SAMUR = derive2 { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; }; SAMURAI = derive2 { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; }; SAPP = derive2 { name="SAPP"; version="1.0.7"; sha256="0rms9kq87dypdfs248m4393lgpfx37qah0n1s109pfnjh3k64pm3"; depends=[]; }; SAR = derive2 { name="SAR"; version="1.0.1"; sha256="0i6ffssr5iyh4z1ygbg0kg2nq4mlvshym7380f93gf85wpdql5gv"; depends=[AzureRMR AzureStor dplyr httr jsonlite Matrix R6 Rcpp RcppArmadillo RcppParallel]; }; - SARP_compo = derive2 { name="SARP.compo"; version="0.1.0"; sha256="0y1dmpdancnir609csf6i8565sn5hch3lgl3gq69i04nlfvf49f9"; depends=[car igraph]; }; + SARP_compo = derive2 { name="SARP.compo"; version="0.1.3"; sha256="1rps2zfwhxf579v29p929jh1qq71ayy1ij6a5ja6y8rdflzhp4hb"; depends=[car igraph]; }; SARP_moodle = derive2 { name="SARP.moodle"; version="0.3.10"; sha256="0wi6b25cd47kgj09pmfxf1hjsyqnhwj2liyv8f5nfxl9wzkdsxc5"; depends=[]; }; SASPECT = derive2 { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; }; SAScii = derive2 { name="SAScii"; version="1.0"; sha256="0nq859xmrvpbifk8q1kbx3svg61rqdg8p8gr1pn85fr0j3w7h666"; depends=[]; }; SASmarkdown = derive2 { name="SASmarkdown"; version="0.4.3"; sha256="0jc21ylflvv4snik13731acxh9zw79s7hpswk58p2wzvavq8k9zn"; depends=[knitr]; }; SASmixed = derive2 { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; }; - SASxport = derive2 { name="SASxport"; version="1.6.0.1"; sha256="0cswsp19w41g30hqzpazg20b45xw0gypmr213w7cqp6r7zjrxis6"; depends=[Hmisc stringi]; }; + SASxport = derive2 { name="SASxport"; version="1.7.0"; sha256="1na94lxrn8kbhxpiflg14nkdx13rjq9bvvqbxyxh1mq0q7vz7a2l"; depends=[Hmisc stringi]; }; SAVE = derive2 { name="SAVE"; version="1.0"; sha256="1m9rrga8x00hlvn0c1jcz6yz14pdm6h3dq14905mq49sw63c7zll"; depends=[coda DiceKriging]; }; SAVER = derive2 { name="SAVER"; version="1.1.2"; sha256="1s1kw8idkaj7j90fw4qn9k0wd4vz0sblsk06ry6lm4afcar0p158"; depends=[doParallel foreach glmnet iterators Matrix]; }; SAutomata = derive2 { name="SAutomata"; version="0.1.0"; sha256="0d9q7bm2f7s4aslml40n43vwcdkc8rnn9ygydccwi4b9a7y23k58"; depends=[]; }; SBRect = derive2 { name="SBRect"; version="0.26"; sha256="16g0ciy9q9irypsl8x36i0lavl41j3af13r2si0by8q6wj56pxi4"; depends=[rJava]; }; SBSA = derive2 { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp RcppArmadillo]; }; SBSDiff = derive2 { name="SBSDiff"; version="0.1.0"; sha256="0mw1646dmhxw6zz4pq7j0g3mf9bjn72g43sq7m72r8ma8ciqj7r2"; depends=[]; }; + SBmedian = derive2 { name="SBmedian"; version="0.1.0"; sha256="1flydpajgak0sh6v8r67fvjg3fjaylinqjgfrvi91lf29r822zdw"; depends=[expm Rcpp RcppArmadillo Rdpack]; }; SCAT = derive2 { name="SCAT"; version="0.5.0"; sha256="16dh4l5r8b49n68s571npmk14dnnx6y0np7lzvalg61z31zlya29"; depends=[]; }; SCBiclust = derive2 { name="SCBiclust"; version="1.0.0"; sha256="1wrlzgavri6g7s948775nfls83b8fa5mx3xvbvc8kmbrvdwms6cq"; depends=[sigclust sparcl]; }; SCBmeanfd = derive2 { name="SCBmeanfd"; version="1.2.2"; sha256="045498q71zqgcg8p3665vwd99a8ybf21y0sa7y8316zw66wb1caz"; depends=[boot KernSmooth]; }; @@ -3988,24 +4024,24 @@ in with self; { SCMA = derive2 { name="SCMA"; version="1.3.1"; sha256="0j0np99mcr8vgpcg664769gdb3rxm665h4jgj3zplihbh5ihxfj1"; depends=[]; }; SCOR = derive2 { name="SCOR"; version="1.1.0"; sha256="0r462g3wciz0kkvzwnd7660giy16q8bk8chm73syrw4fnfk2vdkv"; depends=[doParallel foreach iterators]; }; SCORER2 = derive2 { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; }; - SCORPIUS = derive2 { name="SCORPIUS"; version="1.0.5"; sha256="01zifl85gw9c3f34yr8llwv6xfdxdrx5z25dfa898hyc100rk9gc"; depends=[dplyr dynutils dynwrap ggplot2 lmds MASS Matrix mclust pbapply pheatmap princurve purrr ranger RANN RColorBrewer tidyr TSP]; }; + SCORPIUS = derive2 { name="SCORPIUS"; version="1.0.6"; sha256="1lrpy96v9wcf143nljrh8md6pr6why22xai59f5k1pvva07rn4vc"; depends=[dplyr dynutils dynwrap ggplot2 lmds MASS Matrix mclust pbapply pheatmap princurve purrr ranger RANN RColorBrewer tidyr TSP]; }; SCPME = derive2 { name="SCPME"; version="1.0"; sha256="0yhsaaa349wbrswcvp7w8c52wzp7rs3528rs4wqa8b3r3fh983mh"; depends=[doParallel dplyr foreach ggplot2 Rcpp RcppArmadillo RcppProgress]; }; SCRSELECT = derive2 { name="SCRSELECT"; version="1.3-3"; sha256="118vwnd5gggvdhq7fbs0553l84vh5mhiag41q4svprd7p0pqd9hd"; depends=[mvtnorm]; }; SCRT = derive2 { name="SCRT"; version="1.3.1"; sha256="0wkxc22hv08riivjl09lhxvffqxxdy4xnvdmc2y69gssyinkbln1"; depends=[]; }; SCVA = derive2 { name="SCVA"; version="1.3.1"; sha256="1gdicpnbr8bdgrbwwslpwpzw2adpp94p8nhsrkdx0bjlpfhd4g9h"; depends=[ggExtra ggplot2 plotly scales]; }; SCperf = derive2 { name="SCperf"; version="1.1.1"; sha256="1kqi3sv9ds58l20pdcnjrrbf7fin82j73yqj5rbx4kjdw560ylb2"; depends=[]; }; SCtools = derive2 { name="SCtools"; version="0.3.0"; sha256="0iw7ckgfpijnbqicky69la3mpxmd1i5p4rgzznymprra3q1lx35h"; depends=[cvTools dplyr furrr future ggplot2 purrr stringr Synth]; }; - SDALGCP = derive2 { name="SDALGCP"; version="0.2.0"; sha256="04yqa0dlr4p6fpc4dsiqwb02j056fz9j8qwf7939b5hpg8k9qwjg"; depends=[geoR maptools mapview Matrix pdist plyr PrevMap progress raster sp spacetime spatstat splancs]; }; + SDALGCP = derive2 { name="SDALGCP"; version="0.3.0"; sha256="1mrx39rspbynnwdpww8vv3rf03589qym70vc9508k7iird5cn0qh"; depends=[geoR maptools mapview Matrix pdist PrevMap progress raster sp spacetime spatstat splancs]; }; SDAR = derive2 { name="SDAR"; version="0.9-3"; sha256="173qssvca1ds37x3518q3vfl2185b4fnkprvb52pp7mpv1w1xdrp"; depends=[grImport2 linbin readxl]; }; SDD = derive2 { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc rgl rpanel sm tseries]; }; SDDE = derive2 { name="SDDE"; version="1.0.1"; sha256="14vql1bypn409w9xcx1jdzff6apiagcz2wng3y24h3mk7yjv9bzy"; depends=[doParallel foreach igraph iterators]; }; + SDEFSR = derive2 { name="SDEFSR"; version="0.7.21"; sha256="02p46vbyzx5lmyxyhks10l94kz18pldgkxxg2zi5vys80gpy5jd2"; depends=[]; }; SDLfilter = derive2 { name="SDLfilter"; version="1.2.1"; sha256="1chvg3vh5mwsczbv2ayq9pj1my1i4m2dmr7az1hh00yvlvilfp0y"; depends=[data_table geosphere ggmap ggplot2 ggsn gridExtra maps raster sp trip]; }; - SDMPlay = derive2 { name="SDMPlay"; version="1.2"; sha256="0kafj5z1fi5d824h0n23qzn8a6n8fqm3bfc0pdfypzbaj2arjz3k"; depends=[dismo gbm raster SDMTools]; }; - SDMTools = derive2 { name="SDMTools"; version="1.1-221.2"; sha256="1xvcd97ikqsfdpk2fddy3k0z1ajqga7nv9bgac9c1wnjk1gqrpgh"; depends=[R_utils]; }; - SDMtune = derive2 { name="SDMtune"; version="1.0.1"; sha256="0214r8qv3lc74vsrz8sb5bl4c9jbc85vlgl6qgj49w5hw9pqidzx"; depends=[cli crayon dismo gbm ggplot2 htmltools jsonlite kableExtra maxnet nnet plotROC progress randomForest raster rasterVis Rcpp reshape2 rstudioapi scales stringr whisker]; }; + SDMPlay = derive2 { name="SDMPlay"; version="1.3"; sha256="0653yzw00ix1kh302h1fs735956dw0m2zvp2ng472f8qywrb395s"; depends=[dismo gbm raster]; }; + SDMtune = derive2 { name="SDMtune"; version="1.1.0"; sha256="0n876g5ddbnn50py0hgxp1p8ck54553w8aacbap3ylsa3ylz08g5"; depends=[dismo gbm ggplot2 jsonlite maxnet nnet progress randomForest raster Rcpp rstudioapi stringr whisker]; }; SDT = derive2 { name="SDT"; version="1.0.0"; sha256="1jwpfd1pnzy9wcl90qv5bgwi19shsw9064dvml9zwbif8yw8dzjj"; depends=[quadprog]; }; SDaA = derive2 { name="SDaA"; version="0.1-3"; sha256="0z10ba4s9r850fjhnrirj2jgnfj931vwzi3kw9502r5k7941lsx0"; depends=[]; }; - SDraw = derive2 { name="SDraw"; version="2.1.8"; sha256="05yn0mqdv5a3zyvd6jhmkjh4w06ry8zy0libr56jmp8fcnninvyw"; depends=[deldir rgeos sp spsurvey]; }; + SDraw = derive2 { name="SDraw"; version="2.1.11"; sha256="0l4yxxqsszfzdkr4fbbxrvy29dk0d9fz4rhjmv95ynbmvbx5yqw4"; depends=[covr deldir rgeos sp spsurvey]; }; SEA = derive2 { name="SEA"; version="1.0"; sha256="1jcjgiy8459d8f603kiipcdq6d2awfcqzdv13hrdjgxpfnd1n1ha"; depends=[data_table doParallel foreach kolmim KScorrect MASS shiny]; }; SEAsic = derive2 { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; }; SECFISH = derive2 { name="SECFISH"; version="0.1.7"; sha256="0yd9k6anz9g4psg5kh1bhp0lr1i4y7in1m0mxk4qp14nl1zqy4fy"; depends=[ggplot2 Hmisc optimization]; }; @@ -4021,15 +4057,15 @@ in with self; { SEchart = derive2 { name="SEchart"; version="0.1"; sha256="19gqcd6xzwg37nzc67p88ip4i0v2f59ds85xfw9qq8lybvdm76k2"; depends=[JM]; }; SFS = derive2 { name="SFS"; version="0.1.4"; sha256="1pig64pj30yyfzyv97f74gshw4lnklrx0npp4da3absk6anb3iv7"; depends=[Rcpp RcppArmadillo]; }; SFtools = derive2 { name="SFtools"; version="0.1.0"; sha256="08k2ywkpk1pzp0qcwm7qx9gnv9hglspl9hrsrrfblagdpkw6rm2x"; depends=[doParallel ff wordspace]; }; - SGB = derive2 { name="SGB"; version="1.0"; sha256="11x0db241c9nkgpdd9p3v48klvkbrxrrbj73xb7lp6ldkdsi7gl2"; depends=[alabama Formula MASS numDeriv]; }; + SGB = derive2 { name="SGB"; version="1.0.1"; sha256="0j48fx9bf2k8k3ykp629jfi1jbs23673nz6rg54rvcrrsl6hb9v3"; depends=[alabama Formula MASS numDeriv]; }; SGCS = derive2 { name="SGCS"; version="2.7"; sha256="12kyfkd2phdmiyflgay2ndl6z5f9gz425mxi48wqs9ar3gh6akdw"; depends=[spatstat]; }; SGL = derive2 { name="SGL"; version="1.3"; sha256="055mx876ydg4kzvcm6rxfkxqz849zgzkzsskvrfgwj9fs1k6ja2v"; depends=[]; }; - SGP = derive2 { name="SGP"; version="1.9-0.0"; sha256="1nfb9sh10d4wkhzrxyq829b6dhf47pbjp0hzsixamiyjjzhrjz5x"; depends=[Cairo colorspace crayon data_table digest doParallel doRNG equate foreach gridBase gtools iterators jsonlite matrixStats plotly quantreg randomNames RSQLite sn toOrdinal]; }; + SGP = derive2 { name="SGP"; version="1.9-5.0"; sha256="0jsn6fvd5vaw6m6d7l83nphl19xmql4ir50av5x84rsi7qv461gg"; depends=[Cairo callr colorspace crayon data_table digest doParallel doRNG equate foreach gridBase gtools iterators jsonlite matrixStats plotly quantreg randomNames rngtools RSQLite sn toOrdinal]; }; SGPdata = derive2 { name="SGPdata"; version="23.0-0.0"; sha256="0801v5fq18bpy6sqsp1g6g7azi5ldl3xqpkrp19gsfbl4kcfbp3m"; depends=[crayon data_table]; }; - SHAPforxgboost = derive2 { name="SHAPforxgboost"; version="0.0.2"; sha256="1d0sq27qs6k8rjrjq0g54s76523a3khb873wdy4hinxhcqwqzcaz"; depends=[BBmisc data_table ggExtra ggforce ggplot2 ggpubr RColorBrewer xgboost]; }; - SHELF = derive2 { name="SHELF"; version="1.6.0"; sha256="1w26vv2r7hd8jpfn6vi4g9z3pav4gy58akvq2vzlcxiaxwv8lvnm"; depends=[ggExtra ggplot2 ggridges gridExtra Hmisc MASS rmarkdown scales shiny shinyMatrix tidyr]; }; + SHAPforxgboost = derive2 { name="SHAPforxgboost"; version="0.0.3"; sha256="09gwjw6pbq9b9fg1nsf2jv6dh2g6nmd5iyq6c8c2imgq0la1khgj"; depends=[BBmisc data_table ggExtra ggforce ggplot2 ggpubr RColorBrewer xgboost]; }; + SHELF = derive2 { name="SHELF"; version="1.7.0"; sha256="0rhxagblk8bmwd4wfbjf52dh6y1brajp6xn8rsjx7q0z4brgcr23"; depends=[ggExtra ggplot2 ggridges gridExtra Hmisc MASS rmarkdown scales shiny shinyMatrix tidyr]; }; SHIP = derive2 { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; }; - SHT = derive2 { name="SHT"; version="0.1.2"; sha256="0h93yky87rgrydn994j3anq7n2s2vgli47v5ra09gwlv8p1ijpxn"; depends=[fastclime pracma Rcpp RcppArmadillo Rdpack]; }; + SHT = derive2 { name="SHT"; version="0.1.3"; sha256="016ll3dclnd3arr7x9vvwls84kypqnnm24r9jmcxkk7n8zl0xwb9"; depends=[fastclime pracma Rcpp RcppArmadillo Rdpack]; }; SI = derive2 { name="SI"; version="0.2.0"; sha256="0i6kpaw5yk39skm77nf56ai25clkparz3l8qx0223jrmdqbf97b7"; depends=[]; }; SIBER = derive2 { name="SIBER"; version="2.1.4"; sha256="1wn69giv6prg9dy10zn2fb63s6a0wqv5maccaf69267anh0s4qpc"; depends=[coda dplyr ellipse ggplot2 hdrcde magrittr mnormt purrr rjags spatstat spatstat_utils tidyr viridis]; }; SIBERG = derive2 { name="SIBERG"; version="2.0.2"; sha256="0wfx1dpjd09gb736sm2xhrkba26nwnzn5x575h39n2g33jwqqy2r"; depends=[mclust]; }; @@ -4039,22 +4075,21 @@ in with self; { SII = derive2 { name="SII"; version="1.0.3.1"; sha256="1xvk04b7725ksfd7h4p7px5zanbf6s7xlmjpb7w0nvbi6km2f7ri"; depends=[]; }; SILGGM = derive2 { name="SILGGM"; version="1.0.0"; sha256="1lhmisgg2zbfksl7czz0fqag3732gkjc44n615ipxbdi2pvnc7m0"; depends=[glasso MASS Rcpp reshape]; }; SILM = derive2 { name="SILM"; version="1.0.0"; sha256="1iaivpdx18djfm5dqak0q9kfl1xfrnx3gk5x9a4y53h1d7jhl9p6"; depends=[glmnet hdi scalreg SIS]; }; - SIMMS = derive2 { name="SIMMS"; version="1.2.0"; sha256="1hss3p2xdrbgnh6710ix0l9dghribiw5fhabhicj7gkjjv6szny6"; depends=[doParallel foreach glmnet MASS survival]; }; SIN = derive2 { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; }; SIRE = derive2 { name="SIRE"; version="1.1.0"; sha256="0f624j087k7krg73bqn2qxdgzq66jyhvzz8n024vz3h4hwagxs5n"; depends=[dplyr igraph magrittr MASS Matrix matrixcalc numDeriv psych Rsolnp stringr systemfit]; }; SIRItoGTFS = derive2 { name="SIRItoGTFS"; version="0.2.4"; sha256="1hyhjwkv26fpplzqrdh41r8j91la5j0jidbwnh2vla6s3wf7jg47"; depends=[data_table dplyr easycsv reshape2 rgdal rgeos sp]; }; - SIS = derive2 { name="SIS"; version="0.8-7"; sha256="17fvl58qfwdfn29x9ar9w9v3a26cihcnqb55zgyhmamc57dinchy"; depends=[glmnet ncvreg survival]; }; + SIS = derive2 { name="SIS"; version="0.8-8"; sha256="1f5czwcgpmmn8habm24p3xh4w7jn2faais2x2gmaiq4dpjfnv6h8"; depends=[glmnet ncvreg survival]; }; SISIR = derive2 { name="SISIR"; version="0.1"; sha256="08lw9y38j5qq00m2vcxsac97lg14j4w1y6607vw8isrb3qb5db9z"; depends=[doParallel expm foreach glmnet Matrix RSpectra]; }; SIfEK = derive2 { name="SIfEK"; version="0.1.0"; sha256="037ps6yfy7w6i8vm0b78c8w9kdmw312dl5nc2qz86rfk8kjg7w27"; depends=[MASS numDeriv ramcmc smfsb]; }; SK = derive2 { name="SK"; version="1.1"; sha256="19yg7yc2k4zz29bh42lw2jpjvkdj33f26xkfs8vz8lpp98yjf2vx"; depends=[FitAR GD MASS RColorBrewer rgeos rtop sp]; }; - SKAT = derive2 { name="SKAT"; version="1.3.2.1"; sha256="0ylfz63xiq2zw9nc8nqr89qbhl3fnkhjgg9x7yxjm78vrn640hkl"; depends=[]; }; + SKAT = derive2 { name="SKAT"; version="2.0.0"; sha256="1qkc95n31bmz5y3saai0z50a081mngjlsypc259hbw355xayj2xr"; depends=[Matrix SPAtest]; }; SLC = derive2 { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; }; SLDAssay = derive2 { name="SLDAssay"; version="1.8"; sha256="04ykj7s9kpvg5bmf7x16154kfpdy45b7y7hhyh31sxlscv7c5bbp"; depends=[]; }; SLEMI = derive2 { name="SLEMI"; version="1.0"; sha256="1yfyqxl9sszym418p64zalc2yna9s9qgk9wvviz7n44icsdps33q"; depends=[caret corrplot doParallel e1071 foreach ggplot2 ggthemes gridExtra Hmisc nnet reshape2 stringr]; }; SLHD = derive2 { name="SLHD"; version="2.1-1"; sha256="0y3ilxd0phmks8zkmpgw7p5zrkwq4k95h976cwk58pavvhfwj9kb"; depends=[]; }; SLICER = derive2 { name="SLICER"; version="0.2.0"; sha256="10i0hfl6js26n8xwk9pldzm9vv7hmii6gzj04lhqy0g3njds25kp"; depends=[alphahull igraph lle]; }; SLIDE = derive2 { name="SLIDE"; version="1.0.0"; sha256="0x4fm29r7icg33k8gw3vqvxib8n9a1xwg484x9yffybips9ka22c"; depends=[]; }; - SLOPE = derive2 { name="SLOPE"; version="0.1.3"; sha256="12naak08qjpn6l1ikqwf17h72zk4b5mppgxx7ks9wmnqy9ylhy3x"; depends=[Rcpp]; }; + SLOPE = derive2 { name="SLOPE"; version="0.2.1"; sha256="1ilwa8hkp8frai77vn1ba6wdqxhwcqpb0mw6ag2np5hjm2a8vrs3"; depends=[foreach lattice Matrix Rcpp RcppArmadillo]; }; SMARTAR = derive2 { name="SMARTAR"; version="1.0.0"; sha256="04v6nvkcjchln8jxa9qm9j2hrxbm8rm9v96v6j313ia8js0krp9q"; depends=[MASS]; }; SMARTp = derive2 { name="SMARTp"; version="0.1.1"; sha256="0gkhl9j4l67brfmln28m4q4hfi271jlg5aijnjwahlj8nsi6384y"; depends=[covr mvtnorm sn]; }; SMC = derive2 { name="SMC"; version="1.1"; sha256="1r4ajgi785lmpnlxrba0n6phmk1f0mb6b5yqk6hx8gng2w8ggclz"; depends=[]; }; @@ -4064,7 +4099,7 @@ in with self; { SMITIDstruct = derive2 { name="SMITIDstruct"; version="0.0.5"; sha256="12ffxj96w3pi18l0scz5sd3dl37vd4vg2wcfykaxdhf8z142ha3k"; depends=[Biostrings ggplot2 sf]; }; SMITIDvisu = derive2 { name="SMITIDvisu"; version="0.0.6"; sha256="0563z9dypxsd9g532i1xfxdi8d29zwdla5ria15harimfda55ksq"; depends=[htmlwidgets jsonlite magrittr Rcpp yaml]; }; SMLoutliers = derive2 { name="SMLoutliers"; version="0.1"; sha256="10frs7wcyn368m7fvw2f1cyd0xqr6sv5jziixnyvr8q5fadyl2p0"; depends=[]; }; - SMM = derive2 { name="SMM"; version="1.0.1"; sha256="0g2blwcir0sxvqrivcyn9a8ssx34834lgcwrjwb6kcrq224dchws"; depends=[DiscreteWeibull seqinr]; }; + SMM = derive2 { name="SMM"; version="1.0.2"; sha256="1g1c7ssdcnzgv6b221ya1xrypg2ksahc7qj1042j8nlx5wg29cld"; depends=[DiscreteWeibull seqinr]; }; SMMA = derive2 { name="SMMA"; version="1.0.2"; sha256="13psgrpljnaxpcq4amiyg5mqhpzmb2hyb7jzh3h8wyq18rvs3s4d"; depends=[Rcpp RcppArmadillo]; }; SMNCensReg = derive2 { name="SMNCensReg"; version="3.0"; sha256="06542jacy74mw6ic0i1ml09pn45sll96bya7dqja6bg9yp0m6bvr"; depends=[Matrix PerformanceAnalytics]; }; SMPracticals = derive2 { name="SMPracticals"; version="1.4-3"; sha256="0zxq84f9i3b86xx6msb25b61gyj9k09iab2b7wg4d93yas9qzayf"; depends=[ellipse MASS nlme survival]; }; @@ -4076,17 +4111,18 @@ in with self; { SNPassoc = derive2 { name="SNPassoc"; version="1.9-2"; sha256="113byj8zbg6xyxb1qzm76sqfyk3fap0sd90691zzm1x2pbfnb3mh"; depends=[haplo_stats mvtnorm survival]; }; SNPknock = derive2 { name="SNPknock"; version="0.8.2"; sha256="121pdgvdffj61hw8x8m76na0cg5iw5gb586q05ikw5d959mmbzrs"; depends=[Rcpp RcppArmadillo RcppProgress Rdpack]; }; SNPmaxsel = derive2 { name="SNPmaxsel"; version="1.0-3"; sha256="0pjvixwqzjd3jwccc8yqq9c76afvbmfq0z1w0cwyj8bblrjpx13z"; depends=[combinat mvtnorm]; }; - SNSequate = derive2 { name="SNSequate"; version="1.3.2"; sha256="0aln71h4g6xayh59zd7bsh66l0jv34zn5kc43ldm2g0d82gh6xr4"; depends=[emdbook knitr magic plyr progress statmod]; }; + SNSequate = derive2 { name="SNSequate"; version="1.3.3"; sha256="1qadhk2acpr0lkh2z37ivif9dbp7zb31lfn32ch2sb0z9pp56his"; depends=[emdbook knitr magic plyr progress statmod]; }; SNscan = derive2 { name="SNscan"; version="1.0"; sha256="1s7dxi7faih0phx5wk2xrrzhvfwicq3h2cg8x2klwbrslin973lz"; depends=[igraph poweRlaw Rmpfr]; }; SOAR = derive2 { name="SOAR"; version="0.99-11"; sha256="1n38gx5sxpkqfkk4y6vpp6g19b8bs5bisni9wn6311s0csizp86m"; depends=[]; }; SODC = derive2 { name="SODC"; version="1.0"; sha256="18s4rcp5dzchvwrzzbfhbs3x91zlg1rymjarxjk5i429mfrn0krx"; depends=[magic MASS ppls psych]; }; SOFIA = derive2 { name="SOFIA"; version="1.0"; sha256="1jlaggxa2nz2r5yb2xmf0dh5wmxfdk6xwn0l3nwsqh82vyxhp7l9"; depends=[png]; }; SOIL = derive2 { name="SOIL"; version="1.1"; sha256="0dvfh84xjzald51kmdb546par2rbjdn3nys9y9w7cvafv2lc5yj9"; depends=[brglm2 glmnet MASS ncvreg]; }; SOLOMON = derive2 { name="SOLOMON"; version="1.0-1"; sha256="0z91wsrgdir25ks4dnirzsg4f1ngal7n40235m3w43j6y6dhkqrc"; depends=[]; }; - SOMbrero = derive2 { name="SOMbrero"; version="1.2-4"; sha256="0l9cw17l18pp99yrqczg8d7zbdbp65iyyy24iq91fsfwr5p1w4xn"; depends=[igraph RColorBrewer scatterplot3d shiny wordcloud]; }; + SOMbrero = derive2 { name="SOMbrero"; version="1.2-5"; sha256="0scr6dfp70im3nf5frkagb2di6n3b5c1yiiwq9d3c0r4gxi40dzc"; depends=[igraph RColorBrewer scatterplot3d shiny wordcloud]; }; SOPIE = derive2 { name="SOPIE"; version="1.5"; sha256="0isvb2vzzpn57bq0ix2pfaqdnl5z8qk6v6fvf15vnxcqg2sm63q5"; depends=[ADGofTest circular]; }; SOR = derive2 { name="SOR"; version="0.23.1"; sha256="1accs4bqy080nfmgkdg7bgamdrcwcn01y6nydvvq12w3v8asdvwh"; depends=[Matrix]; }; SOUP = derive2 { name="SOUP"; version="1.1"; sha256="0k8nlvl4681cz07xjazprcc0jhknfa5hgr7w1qxxmgrp3sprr8r4"; depends=[tensor]; }; + SP2000 = derive2 { name="SP2000"; version="0.0.5"; sha256="0ny7a3i7hb1j3vkdnjy8gyhbvpqnzj588l127p6wxal48ks2g7zp"; depends=[jsonlite pbmcapply purrr rlist tibble]; }; SPADAR = derive2 { name="SPADAR"; version="1.0"; sha256="0xzhcy5nglwx9j2jkm3i9xj1iw1y9wbf6rwfjyhpiwwq6qn8mn5r"; depends=[mapproj RCEIM]; }; SPARQL = derive2 { name="SPARQL"; version="1.16"; sha256="0gak1q06yyhdmcxb2n3v0h9gr1vqd0viqji52wpw211qp6r6dcrc"; depends=[RCurl XML]; }; SPAS = derive2 { name="SPAS"; version="2020.1.1"; sha256="1bvnyxg3npxv63kikmr30jgc14f1s1a5vfh40qs50nbzq84pl6bx"; depends=[BB MASS Matrix msm numDeriv plyr RcppEigen TMB]; }; @@ -4108,6 +4144,7 @@ in with self; { SPREDA = derive2 { name="SPREDA"; version="1.1"; sha256="0fn4p5apjq8zgd3zms2b88ga5wbsv86y59ac5x06w75rf071xglv"; depends=[nlme survival]; }; SPRT = derive2 { name="SPRT"; version="1.0"; sha256="1r4pfqh8k5avi8qgpk5x1cy8lmkn341yvjvd2r7wqwb3mr242r0v"; depends=[]; }; SPSL = derive2 { name="SPSL"; version="0.1-9"; sha256="0kf6mmbvavid3dw2l4fkclk669wi13wkyykhwn5272d6qnhlhhca"; depends=[]; }; + SPUTNIK = derive2 { name="SPUTNIK"; version="1.3"; sha256="0xmd7y0w1wnbavpjhnap2wczprl1xccrgdwgrmv9031lasrd9xv9"; depends=[e1071 edgeR ggplot2 imager infotheo irlba reshape spatstat viridis]; }; SPYvsSPY = derive2 { name="SPYvsSPY"; version="0.1.1"; sha256="1hxc73wwrzqh1r1xr9yd4hy4ma24virg4iv978lfyc9f9n56znp5"; depends=[]; }; SPmlficmcm = derive2 { name="SPmlficmcm"; version="1.4"; sha256="1acs3560a7h6xx286m40abr9b7i5qihn6wni8flj0biahmsszzx6"; depends=[nleqslv]; }; SPreFuGED = derive2 { name="SPreFuGED"; version="1.0"; sha256="1cdamkrr0xpc0l2dypd9lgjidrmalfxs0ms7z3wfmf22a8b3y0d2"; depends=[Biobase boot CMA lattice limma lme4 mvtnorm]; }; @@ -4115,18 +4152,20 @@ in with self; { SQB = derive2 { name="SQB"; version="0.4"; sha256="12ii8xlwd2r77bj76j7l43898ras25z3plhhv106jaklhpcnk23m"; depends=[caret nnet pls rpart]; }; SQDA = derive2 { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[limma mvtnorm PDSCE]; }; SQN = derive2 { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; }; - SQRL = derive2 { name="SQRL"; version="0.7.0"; sha256="166sl5vy1nf854wr9ps66h8166l1l8yla5d6c9icivyik77nqqjv"; depends=[RODBC]; }; - SQUAREM = derive2 { name="SQUAREM"; version="2020.1"; sha256="0v4ax1v8diw2w7fdhfzz1z0bwixkmcrc39ax3y116f399rc06qbs"; depends=[]; }; + SQRL = derive2 { name="SQRL"; version="0.7.1"; sha256="1ipkd1pl3v9an88maailz8ypikyh6rnxzpnb7wfxphks6m2swgfy"; depends=[RODBC]; }; + SQUAREM = derive2 { name="SQUAREM"; version="2020.2"; sha256="1j6sa93xjvynnzx9jx79a3fysbykmbqyknknsqif5bcha6xp6cvf"; depends=[]; }; SRCS = derive2 { name="SRCS"; version="1.1"; sha256="13zf3cqs53w68f9zc1fkb9ql84rvzn7g1hbykqrbvss8hjaq8x1r"; depends=[]; }; SRRS = derive2 { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[gtools tcltk2]; }; SRTtools = derive2 { name="SRTtools"; version="1.2.0"; sha256="1203i6nqclx0faxyvhdaapmfxy8h95jj83svxriqh1hpava5s1dy"; depends=[magrittr]; }; - SSBtools = derive2 { name="SSBtools"; version="0.5.0"; sha256="0z6nzsg8mfmnzzf24w7s7lhkp3xd7vlkgjn34x6yps82ry3mhyra"; depends=[Matrix stringr]; }; - SSDM = derive2 { name="SSDM"; version="0.2.6"; sha256="0qyx755h6rqgc6i3mw0vdaw2jx1yclkm9qxb98njkfk8if7wmbmn"; depends=[dismo e1071 earth gbm gplots mgcv nnet randomForest raster rpart SDMTools shiny shinydashboard shinyFiles sp spThin]; }; - SSDforR = derive2 { name="SSDforR"; version="1.5.12"; sha256="12vhdh808w4qbr7ipidx79y0lsn04za7d0m6dxpn8mgbplr64kdb"; depends=[MAd MASS metafor psych SingleCaseES TSA TTR]; }; + SSBtools = derive2 { name="SSBtools"; version="0.6.0"; sha256="1p00kacf49h475jdq9lf955dpzw81n399zzpzx7igp8d2snccy3f"; depends=[Matrix stringr]; }; + SSDM = derive2 { name="SSDM"; version="0.2.8"; sha256="19l78dkjk76ababkd7xsfn0fy99khfa4i502q4vllpvch4cjz51c"; depends=[dismo e1071 earth gbm ggplot2 mgcv nnet poibin randomForest raster reshape2 rpart scales shiny shinydashboard shinyFiles sp spThin]; }; + SSDforR = derive2 { name="SSDforR"; version="1.5.15"; sha256="0cdjv32mc0j5b3ih9lkcspc4p87i1mlq21bjyx59bd9vgfa1bhkw"; depends=[MAd MASS metafor psych SingleCaseES TTR]; }; SSLASSO = derive2 { name="SSLASSO"; version="1.2-2"; sha256="0vnn9ksdf0qgjflgx1sfj6q6j9jfnarbx2222rh9kb10jy8b16jv"; depends=[]; }; + SSLR = derive2 { name="SSLR"; version="0.9.1"; sha256="00a26p9y0f6df345qkl2ga0q11a6sasv7p76nyvwjb7wcgbl09kz"; depends=[dplyr foreach generics magrittr parsnip plyr proxy purrr RANN Rcpp RcppArmadillo rlang RSSL]; }; SSM = derive2 { name="SSM"; version="1.0.1"; sha256="1h8yyzh5rn5jay70kyzvwirfndi049a5w28qigrjv5rxd7ml84l7"; depends=[]; }; - SSN = derive2 { name="SSN"; version="1.1.13"; sha256="0hk138p1jnlda7d2wxlrf2ipkgliqlip1i5xp67aym979g0b3aaj"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; }; + SSN = derive2 { name="SSN"; version="1.1.15"; sha256="057lh2ym82ff3c25vyh97csns4jwlbvxwc4jai0i4yplxf0ccmha"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; }; SSOSVM = derive2 { name="SSOSVM"; version="0.2.1"; sha256="11wlalpw6yhvv95xr8vvgxgl4jafc2ghzsk5wqyv71ahxarmrlss"; depends=[MASS mvtnorm Rcpp RcppArmadillo]; }; + SSP = derive2 { name="SSP"; version="1.0.1"; sha256="0ccg81rsjki1fcqvj6lgmmmy5yw1gxy8khajl1i80qyi4v7ny9hk"; depends=[ggplot2 sampling vegan]; }; SSRA = derive2 { name="SSRA"; version="0.1-0"; sha256="1d0lg2dz8vf1d63366s5apm0ygrsfxivbrsij907r244zj6i1c37"; depends=[shape stringr]; }; SSRMST = derive2 { name="SSRMST"; version="0.1.1"; sha256="15s6vcmk8a27yw3rlfkajby6qkizp4sfiyi63m7hc86svd15x4wg"; depends=[survival survRM2]; }; SSrat = derive2 { name="SSrat"; version="1.1"; sha256="1mmwla7yqqldv0s5hqljq2k2qljdfhq97m5128gvf3iy7n2yjzgj"; depends=[plyr sna]; }; @@ -4147,7 +4186,7 @@ in with self; { STRAH = derive2 { name="STRAH"; version="1.0"; sha256="0a2av8by99sq7l28c7cjwm6nqhp1i4pd5qxcsarvwd8f9fckvr5z"; depends=[BiocManager Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19]; }; STRMPS = derive2 { name="STRMPS"; version="0.5.8"; sha256="0vlmhrna0laqzjpbg4sgnscrli3cly2lc5d69n6iqfl213zsfz78"; depends=[Biostrings dplyr IRanges purrr ShortRead stringr tibble tidyr]; }; STV = derive2 { name="STV"; version="1.0.1"; sha256="1gzy47s4qg83fagvm19jwpbbplkvxi9qv6ac0j86i0s8v0yrlrks"; depends=[]; }; - STraTUS = derive2 { name="STraTUS"; version="1.1.1"; sha256="0hl8kyg9hsrsqcxg8bcmp5wm70s92scahlac617h2c7rirbjdsxz"; depends=[ape ggplot2 ggtree gmp igraph phangorn RcppAlgos]; }; + STraTUS = derive2 { name="STraTUS"; version="1.1.2"; sha256="0n3i7gbycp1f10058h9xlh3yk21w2izdb3xgs793mmh1i1sjy394"; depends=[ape ggplot2 ggtree gmp igraph phangorn RcppAlgos]; }; SUE = derive2 { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; }; SUMMER = derive2 { name="SUMMER"; version="0.3.0"; sha256="17ymbwga6m2npbvvqqhcnjd89f0jsaz8kwf7n68wwkqvgiqh3qcm"; depends=[ggplot2 maptools Matrix reshape2 sp spdep survey survival viridis]; }; SVMMaj = derive2 { name="SVMMaj"; version="0.2.9"; sha256="1405gigyjfp8by8nfx4g3rhw9x6r6g7dkpgw52jllv6n4036xa3h"; depends=[dplyr ggplot2 gridExtra kernlab reshape2 scales]; }; @@ -4155,18 +4194,17 @@ in with self; { SVN = derive2 { name="SVN"; version="1.0.1"; sha256="0n93lqb1f2s2qvzc8lrcqmr0fhd57xqbi0ymrqqmll31ns679m92"; depends=[data_table igraph memoise]; }; SWIM = derive2 { name="SWIM"; version="0.2.0"; sha256="120rr71hlvwbb3qdwl7s7mhrbjikl11yp55xmddk6xqs13qvi5j0"; depends=[ggplot2 Hmisc nleqslv plyr Rdpack reshape2]; }; SWMPr = derive2 { name="SWMPr"; version="2.3.1"; sha256="1az6ss8wkdgq4l1cmfflajzs7z6w6140bclb289gb090pi69p7gy"; depends=[data_table dplyr ggmap ggplot2 gridExtra httr lattice maptools oce openair RColorBrewer reshape2 tictoc tidyr XML zoo]; }; - SWMPrExtension = derive2 { name="SWMPrExtension"; version="1.1.2"; sha256="0123lcb6jfh3gbh2jmdpargry44fncm7j505vpkcp661fcjckymd"; depends=[broom dplyr EnvStats flextable ggplot2 ggthemes leaflet lubridate magrittr maptools officer RColorBrewer rgdal rgeos rlang scales sp SWMPr tidyr]; }; + SWMPrExtension = derive2 { name="SWMPrExtension"; version="1.1.3"; sha256="1xyn802aadx3fxckqvimkpwbx0pv6g3wqjzjx2k46qnm2gl6ck0v"; depends=[broom dplyr EnvStats flextable ggplot2 ggthemes leaflet lubridate magrittr maptools officer RColorBrewer rgdal rgeos rlang scales sp SWMPr tidyr]; }; SYNCSA = derive2 { name="SYNCSA"; version="1.3.4"; sha256="0n9za302x638s666xs86zy94qch9wn0rln8xy6x9jymhhq9zn0kj"; depends=[FD permute RcppArmadillo vegan]; }; SafeBayes = derive2 { name="SafeBayes"; version="1.1"; sha256="09bhd3z9ia2mvpn1h0hil00j6cm4x9y9ymxc3gj8wd4ybdi3jqlm"; depends=[]; }; - SafeQuant = derive2 { name="SafeQuant"; version="2.3.1"; sha256="0rgi0ij33sdvkpmjynfmsj0f29kl9l9ylsqckg5x4v49m6mzq1yh"; depends=[Biobase corrplot data_table epiR gplots limma optparse seqinr]; }; SailoR = derive2 { name="SailoR"; version="1.0"; sha256="1gb50qd9s3dwdvl6qihpkgwlhckbhn7h3wpz9k74xgyd874krcld"; depends=[]; }; Sample_Size = derive2 { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; }; - SampleSize4ClinicalTrials = derive2 { name="SampleSize4ClinicalTrials"; version="0.1.1"; sha256="15q1jsvnz3bhnjil0wbladahac0ppx3qgg5qz7z70vnivgjah606"; depends=[]; }; + SampleSize4ClinicalTrials = derive2 { name="SampleSize4ClinicalTrials"; version="0.2.2"; sha256="19dl5sfrsmahrf1q0ljpjmp2821mn2h9d53ds9jyci0wv287gzs9"; depends=[]; }; SampleSizeMeans = derive2 { name="SampleSizeMeans"; version="1.1"; sha256="1wbc46n8b8wbcxl21blbzs5728dr8r0l8d3jpzbha8pcav0xrh1m"; depends=[]; }; SampleSizeProportions = derive2 { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; depends=[]; }; SamplerCompare = derive2 { name="SamplerCompare"; version="1.3.0"; sha256="1lqnkgbg1naa3crk3rakrf37vvxj6mbilbpxrv0k5iifdmh0b7k1"; depends=[mvtnorm]; }; SamplingBigData = derive2 { name="SamplingBigData"; version="1.0.0"; sha256="0khrh7vfqqzpfp16x0ic5ml854wr2fj28cx95s6c0pz91hzlxkns"; depends=[]; }; - SamplingStrata = derive2 { name="SamplingStrata"; version="1.5"; sha256="1rh26jcb2ksjfabpqprc0glw4b6ig8hagqjhxrm6pgji9para31x"; depends=[doParallel formattable memoise pbapply]; }; + SamplingStrata = derive2 { name="SamplingStrata"; version="1.5-1"; sha256="01kjm45pc1zfy2xlp9fhynv4x2mzsgjwymr5j7narpmdsm14mxcx"; depends=[doParallel formattable memoise pbapply]; }; SanFranBeachWater = derive2 { name="SanFranBeachWater"; version="0.1.0"; sha256="18w2q3hzcrbmagnjyrn1ikwiyjh723mjb2vy0d8p1a6za0460p9w"; depends=[dplyr lubridate magrittr readr rvest tibble xml2]; }; SanzCircos = derive2 { name="SanzCircos"; version="0.1.0"; sha256="0vw41qldp1gsj4mx2hdd5jfhx9r8pv62i8gvs86p6bvfzy2l1lq4"; depends=[dplyr pbapply purrr randomcoloR readr tibble tidyr]; }; Scale = derive2 { name="Scale"; version="1.0.4"; sha256="1fa3840kji34qpbw6mxfavk8wq0vq0vx2w6ya71idbkxnvwc3y06"; depends=[Hmisc MASS psych]; }; @@ -4193,53 +4231,55 @@ in with self; { Sejong = derive2 { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6dhl23y16yxqzyhqqayvcm98q3l77nf"; depends=[]; }; SeleMix = derive2 { name="SeleMix"; version="1.0.1"; sha256="1qzy59wbjh8llm66l70xi0p3lv94iawh2h5vwa9sqy2ra5vmpaxk"; depends=[mvtnorm]; }; Select = derive2 { name="Select"; version="1.4"; sha256="1qx4wwxxwjq31vf645xvwb0y2z5h4v6ca8fcrfpaj5kc33f333v2"; depends=[ade4 FD lattice latticeExtra Rsolnp]; }; - SelectBoost = derive2 { name="SelectBoost"; version="1.4.0"; sha256="14i6dgg1yqnghjjfvi7l58kqm6pry9b91sy9gkwrvfqg0nz1dpny"; depends=[Cascade glmnet igraph lars msgps Rfast]; }; + SelectBoost = derive2 { name="SelectBoost"; version="2.0.0"; sha256="137fxvlpc2vyn5w93ih8bm6pp198xwlbb9ky8dhxgarh0syz8g4v"; depends=[abind Cascade glmnet igraph lars msgps Rfast spls varbvs]; }; SelvarMix = derive2 { name="SelvarMix"; version="1.2.1"; sha256="02d16ffw5syq0d3yiim9jgrjlz99n956zxp23idpsmq6lb2whq66"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; }; - SemNeT = derive2 { name="SemNeT"; version="1.1.2"; sha256="07vgnfj4wirfpc9mjy6m0qd3pc0423qq8bvpk5zzmynvaqgnb89j"; depends=[doParallel dplyr foreach ggplot2 igraph lsa magrittr NetworkToolbox networktools pbapply plyr purrr qgraph RColorBrewer SemNetCleaner]; }; - SemNetCleaner = derive2 { name="SemNetCleaner"; version="1.1.3"; sha256="177r9z2z8l5ri2h3s94day8d19n13hc4861vc6fcymaa35nh0z02"; depends=[foreign hunspell R_matlab readxl searcher SemNetDictionaries stringdist]; }; + SemNeT = derive2 { name="SemNeT"; version="1.2.0"; sha256="1j1i0c5l490l5h38ni9ylycfmks9giirzk44qhyx2mdqvy1sq5sn"; depends=[doParallel dplyr foreach ggplot2 igraph lsa magrittr NetworkToolbox networktools pbapply plyr purrr qgraph RColorBrewer SemNetCleaner]; }; + SemNetCleaner = derive2 { name="SemNetCleaner"; version="1.1.5"; sha256="1ak6y3jc2dbfl7bd5qg6hh5lrpisxfp87v8408qvvji6962h5fm5"; depends=[foreign htmlTable hunspell knitr R_matlab readxl rmarkdown searcher SemNetDictionaries stringdist stringi]; }; SemNetDictionaries = derive2 { name="SemNetDictionaries"; version="0.1.5"; sha256="179dgq65m4kzbqxgcicnchahslildc43f506sa7x2prbr7by27d3"; depends=[]; }; Semblance = derive2 { name="Semblance"; version="1.1.0"; sha256="1kzrg5z3244nx9y37p092wpangni3fxpx04i5fb4dhrmav4rvgab"; depends=[DescTools fields msos PerformanceAnalytics]; }; SemiCompRisks = derive2 { name="SemiCompRisks"; version="3.3"; sha256="06anhf0kqaz4i84g73w3l4gf0q2mwi00vlkciqfbxpwgrbacplf6"; depends=[Formula MASS survival]; }; SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.6"; sha256="0nga790kcrvmbrx5asp4062711x0kjsccc246l4syiiw30b769ig"; depends=[MASS numDeriv Rsolnp]; }; SemiPar = derive2 { name="SemiPar"; version="1.0-4.2"; sha256="0pa3drpvclkw81ji5m1h5arj5c2rh03dnlff97cnnr1v5kvg1i4w"; depends=[cluster MASS nlme]; }; SenSrivastava = derive2 { name="SenSrivastava"; version="2015.6.25"; sha256="0r4p6wafnfww07kq19lfcs96ncfi0qrl8n9ncp441ri9ajwj54qk"; depends=[]; }; - SensMixed = derive2 { name="SensMixed"; version="2.1-0"; sha256="0ykg94amnm9clf8d3naap8fmv9qqc6j1q52wnb83zk7ry44dp7dh"; depends=[doBy ggplot2 Hmisc lme4 MASS plyr reshape2 shiny shinyBS xtable]; }; SensitivityCaseControl = derive2 { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; }; - SensoMineR = derive2 { name="SensoMineR"; version="1.23"; sha256="0a1s2wrb86a0y2faxj5ax8fa6vfcclgg7bcff4j7jb40ilxnxhn4"; depends=[AlgDesign cluster FactoMineR ggplot2 gtools KernSmooth reshape2]; }; + SensoMineR = derive2 { name="SensoMineR"; version="1.25"; sha256="0bnb8cx3vhmzlrnhgaarbr94l41c5jx4761vzc5xa7m0ih40q3s0"; depends=[AlgDesign cluster FactoMineR ggplot2 gtools KernSmooth reshape2]; }; SensusR = derive2 { name="SensusR"; version="2.3.1"; sha256="1x1a8vnpn6h7905wa4lvf7vibkl2dsa4yyg2sg4bbi719lcki2q0"; depends=[ggmap ggplot2 jsonlite lubridate openssl plyr R_utils]; }; SentimentAnalysis = derive2 { name="SentimentAnalysis"; version="1.3-3"; sha256="0k6sf25hqisjjc97n17vdihpblab0ywv77lfxdzwpsbcv2x6gsx9"; depends=[ggplot2 glmnet moments ngramrr qdapDictionaries spikeslab stringdist tm]; }; SeqAlloc = derive2 { name="SeqAlloc"; version="1.0"; sha256="04rhr3gb2p9i35a3x4k8m0lv42ncfqlhx6sf3bq8yihppwrag8x3"; depends=[]; }; + SeqDetect = derive2 { name="SeqDetect"; version="1.0.7"; sha256="054b5v0jzk9pj9hrxk31kvcdm789lx8gzh70ivskixz57kajmiss"; depends=[dplyr eventdataR igraph Rcpp]; }; SeqFeatR = derive2 { name="SeqFeatR"; version="0.3.1"; sha256="1dvl65n60j7wl0jdb0myi9hprlr9grq6nf9m68gzxm9sz3h8lpvh"; depends=[ape Biostrings calibrate coda ggplot2 phangorn plotrix plyr qvalue R2jags scales tcltk2 widgetTools]; }; SeqGrapheR = derive2 { name="SeqGrapheR"; version="0.4.8.5"; sha256="041hlf64zbndz76r076pmym4dw4xl3fahryvpvjspw0sdlhmfm8c"; depends=[Biostrings cairoDevice gWidgets gWidgetsRGtk2 igraph rggobi]; }; + SeqKat = derive2 { name="SeqKat"; version="0.0.8"; sha256="09b5zrp41241ha5q8bxll9n12sn11hsbv46g2ld1lqsy2razivr4"; depends=[doParallel foreach Rcpp]; }; SeqMADE = derive2 { name="SeqMADE"; version="1.0"; sha256="0nf1xjhk0kpmmzgcxycg3ccxvwq6gydjq7xq6n9m7k7v35v9v3qf"; depends=[MASS]; }; SeqNet = derive2 { name="SeqNet"; version="1.1.0"; sha256="0dbiafqgqnmws38lpa58mkzciprkan5qnrw9aivi89s065ykjd74"; depends=[fitdistrplus ggplot2 igraph mvtnorm purrr RColorBrewer Rcpp rlang tibble]; }; SequenceSpikeSlab = derive2 { name="SequenceSpikeSlab"; version="0.1.1"; sha256="079qm4klgaml99j4cshy3n54pg7q537zlagib4xd8mswdmqdvll6"; depends=[Rcpp RcppProgress selectiveInference]; }; Sequential = derive2 { name="Sequential"; version="3.1"; sha256="0wh5bxqgmkmlbz9bmvpv3lp8mq4iih86a73ccl6fycfpqvq6nf6i"; depends=[boot]; }; SequentialDesign = derive2 { name="SequentialDesign"; version="1.0"; sha256="1gi37pixwbpy7358id1c75rckr352hs8vjs8sk8qgsr97pkm5xdq"; depends=[Sequential]; }; - SetMethods = derive2 { name="SetMethods"; version="2.4"; sha256="06fcin03mvqbg4mk09ygn54li0wdyp57mv902c49zs9v4y8r88cs"; depends=[betareg fmsb ggplot2 ggrepel lattice QCA scatterplot3d]; }; + SetMethods = derive2 { name="SetMethods"; version="2.5"; sha256="1f90szzfv370k2a92p8hi8zcjcfj5dsffhkhdbqk00s45cpjsn20"; depends=[admisc betareg fmsb ggplot2 ggrepel lattice QCA scatterplot3d stargazer]; }; SetRank = derive2 { name="SetRank"; version="1.1.0"; sha256="0p7vwsw05s5hfw1mfh3fbm9nfzsymnxzrdjin7k21dx7asb618wy"; depends=[data_table igraph XML]; }; SetTest = derive2 { name="SetTest"; version="0.2.0"; sha256="08wc6cbnannmwkncqhpcw6l0y7c1v7z3awk5j7fd853nszfmpbk0"; depends=[]; }; - Seurat = derive2 { name="Seurat"; version="3.1.2"; sha256="0m1qi39snbmkkv1p07bzg1r7snc9x6a1y0dghvpk1nzgcfpmnsj4"; depends=[ape cluster cowplot fitdistrplus future future_apply ggplot2 ggrepel ggridges httr ica igraph irlba KernSmooth leiden lmtest MASS Matrix metap pbapply plotly png RANN RColorBrewer Rcpp RcppAnnoy RcppEigen RcppProgress reticulate rlang ROCR rsvd Rtsne scales sctransform SDMTools tsne uwot]; }; + Seurat = derive2 { name="Seurat"; version="3.1.5"; sha256="1lbq2pqhb6ih6iqawlnzdh05zff71pwbw1cpfv2sld3pd7kz0zkm"; depends=[ape cluster cowplot fitdistrplus future future_apply ggplot2 ggrepel ggridges httr ica igraph irlba KernSmooth leiden lmtest MASS Matrix patchwork pbapply plotly png RANN RColorBrewer Rcpp RcppAnnoy RcppEigen RcppProgress reticulate rlang ROCR rsvd Rtsne scales sctransform tsne uwot]; }; ShapeChange = derive2 { name="ShapeChange"; version="1.4"; sha256="1ch7avx8mxjk8vrp17inaihmbsv968wflyk1n4fbjvacbl24vn2b"; depends=[coneproj quadprog]; }; - ShapePattern = derive2 { name="ShapePattern"; version="1.0.1"; sha256="18jzs0sq21qhldm86mgx7yb9kl473vv1aljl9hm4560xy5pd5fnb"; depends=[rgdal rgeos sp]; }; - ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.3"; sha256="1vvfl1ldrn0l9w38hx0hhszvj5a2dpmfl6ljzw7f0ji181lrx96m"; depends=[coneproj raster rgdal]; }; - SharpeR = derive2 { name="SharpeR"; version="1.2.0"; sha256="1gw8wwdqbra4bccbcamqn2j7d853rga1vcvk1p6naih6vbnfqn2s"; depends=[matrixcalc sadists]; }; + ShapePattern = derive2 { name="ShapePattern"; version="2.0.4"; sha256="0bvcxm4rxi0a7cj7w6qpnqmpvqzdww7w43a2fa3bcks8g0hy71pc"; depends=[landscapemetrics raster rgdal rgeos sp]; }; + ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.4"; sha256="15ds3024qcvnq3pnbhpyd6hbif26mdzw1srqv44hwsllgzpi7602"; depends=[coneproj raster]; }; + SharpeR = derive2 { name="SharpeR"; version="1.2.1"; sha256="1xcnbjwcqc9mhb6kqcarkmjcr5zrn5hryfp4i4rayra9yk9k18r8"; depends=[matrixcalc sadists]; }; ShiftShareSE = derive2 { name="ShiftShareSE"; version="1.0.1"; sha256="09sm3frapxv1zhxy84wqyaxdk5jx62ijszfa34zlknlgivividfy"; depends=[Formula]; }; ShinyImage = derive2 { name="ShinyImage"; version="0.1.0"; sha256="0nhsaq6i9lr8gqpdkahw3qr0c0cb0qwc0nqpk1ism21l6zg6ahc9"; depends=[EBImage R6 shiny shinyjs]; }; - ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.3.1"; sha256="1s1kb1rrppk0kfqywgsmyfl32hrq9ywv8241n9d3xv88cflxz237"; depends=[corrplot cowplot CTT data_table deltaPlotR difNLR difR DT ggdendro ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyBS shinydashboard shinyjs stringr VGAM xtable]; }; + ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.3.2"; sha256="1h6zja2yvg0dj01x7l29jv6rx0h3adqnkkjqgajd8vyj5hv536v7"; depends=[corrplot cowplot CTT data_table deltaPlotR difNLR difR DT ggdendro ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyBS shinydashboard shinyjs stringr VGAM xtable]; }; ShinyTester = derive2 { name="ShinyTester"; version="0.1.0"; sha256="0wm4rl2p8ggw6v2chk9b6ygh5y8p8cwzbyra0nr0qr2ka97didp8"; depends=[dplyr purrr readr stringr tidyr visNetwork]; }; - ShortForm = derive2 { name="ShortForm"; version="0.4.4"; sha256="05ia1x8hmaa8df77jbs4nd04jfbglr5z6hfg9v702zhvap0mkijj"; depends=[ggplot2 lavaan stringr tidyr]; }; + ShortForm = derive2 { name="ShortForm"; version="0.4.6"; sha256="0r8flmfhm47kyzy97j3mr87srfsxwlqqsx7v0ay9qm7q2jfg6xsw"; depends=[ggplot2 lavaan stringr tidyr]; }; ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.4.0"; sha256="0iyri3syjk9xv49d87fdyhnxg5c5x827vnak8vgckkkp62sdln2q"; depends=[Rcpp RcppArmadillo]; }; SiER = derive2 { name="SiER"; version="0.1.0"; sha256="1ng6vnh30z6z1nvclsdzc9gdbrsrb2kqdqvs6fwm0j1zqlk12x0y"; depends=[]; }; SiMRiv = derive2 { name="SiMRiv"; version="1.0.4"; sha256="1sdq1mdm5jm66jmq7mas9skq8014xd7iz16av64x645l4qxkawzw"; depends=[mco raster rgdal sp]; }; - SiZer = derive2 { name="SiZer"; version="0.1-5"; sha256="1ldl7rza58fzfbqidr1kanhfhy744nrsxrm13qdpxirdxx3vji6q"; depends=[boot]; }; + SiZer = derive2 { name="SiZer"; version="0.1-7"; sha256="068xaawc9vhi7a0b52jfq5r81kwnxn2wnqar1b35wwckmsd40b20"; depends=[boot]; }; SigOptR = derive2 { name="SigOptR"; version="0.0.1"; sha256="1sylchhhz6kx4r8jx95cvsmjsacjh8pin7acf2fyw2a4nlx9r1a6"; depends=[httr jsonlite]; }; SigTree = derive2 { name="SigTree"; version="1.10.6"; sha256="18gh7azjr979ijc2y4yyskj24ay697rw3j7znc5p4a63s4vpxr9w"; depends=[ape MASS phyext2 phylobase phyloseq RColorBrewer vegan]; }; SightabilityModel = derive2 { name="SightabilityModel"; version="1.3"; sha256="0rgv5735y07yyv5y9c3flzha97ykn34ysmzy6as1z94hqfr4w746"; depends=[]; }; - SignifReg = derive2 { name="SignifReg"; version="2.1"; sha256="01h6cz602m9jpnkpgbr5smmn3xp5aw5h5xl32kyhxqhybg75j6fj"; depends=[]; }; - Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="4.4"; sha256="14qdz49gyjaja6yj053iv998mrib3nbzzf02g30sl5y0cxkpmnd1"; depends=[Deriv MASS]; }; + Signac = derive2 { name="Signac"; version="0.2.5"; sha256="01cpya2x9dzjxicqzrkiafhn571n3dw7n10rwz3cs528qgap43db"; depends=[BiocGenerics data_table dplyr future future_apply GenomeInfoDb GenomicRanges gggenes ggplot2 ggseqlogo IRanges irlba Matrix patchwork pbapply Rsamtools S4Vectors Seurat tidyr zoo]; }; + SignifReg = derive2 { name="SignifReg"; version="3.0"; sha256="0yvbf56ap29rfm10vdv3mc67x1aklkwwapi72vzsi2xhrgwf395d"; depends=[]; }; + Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="4.5"; sha256="1rrdkmyv9fj7jjafl8zvyzpdjli2s004v1wdsifnq1zp0vmv1m9q"; depends=[Deriv MASS]; }; Sim_PLFN = derive2 { name="Sim.PLFN"; version="1.0"; sha256="1jmsydhpfv2z9cr99hfy8cairhkkxpwk4wnz1adixwxazkn7qfah"; depends=[DISTRIB FuzzyNumbers]; }; - SimBIID = derive2 { name="SimBIID"; version="0.1.3"; sha256="1vbib8ajpph35ahyv0x431y9xscinnvzvjzwhw9l810n1agbfay9"; depends=[coda dplyr ggplot2 mvtnorm purrr RColorBrewer Rcpp RcppArmadillo RcppXPtrUtils tibble tidyr]; }; + SimBIID = derive2 { name="SimBIID"; version="0.1.4"; sha256="1kqa1bm0f9kx7nr936hhpsi6hjjb3mlppxycwwi5pmzv9snm83hg"; depends=[coda dplyr ggplot2 mvtnorm purrr RColorBrewer Rcpp RcppArmadillo RcppXPtrUtils tibble tidyr]; }; SimComp = derive2 { name="SimComp"; version="3.3"; sha256="04qkis20zk0z42bv4nznffqlpwby0y0ij27gj4sa0ha864pg0hi5"; depends=[mratios multcomp mvtnorm]; }; SimCop = derive2 { name="SimCop"; version="0.7.0"; sha256="1yrdy77a9h14v92c63ng8phi2ig73wy4xjjdb75322grc0bd3jq6"; depends=[quadprog]; }; SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.7.0"; sha256="10snjwrh95407iracbc52b5cvr3sp2539rrjp7fw63q50pjl285v"; depends=[evd]; }; @@ -4248,26 +4288,25 @@ in with self; { SimDissolution = derive2 { name="SimDissolution"; version="0.1.0"; sha256="1rdsxykh740h22ln635m0ysm00pdw94vp7qhgify4mcvc46c3632"; depends=[alabama dplyr mvtnorm]; }; SimEUCartelLaw = derive2 { name="SimEUCartelLaw"; version="1.0.1"; sha256="1wg9sayk55mp3f2qykvfk0cbqh050vh0n1fhpq4fmlxqll87aml9"; depends=[plot3D plot3Drgl rgl]; }; SimHaz = derive2 { name="SimHaz"; version="0.1"; sha256="04q4xyc1ki1zr3grm3khfg0kbykjy3j9qpg332l7pxp4j3wa3aw3"; depends=[survival]; }; - SimInf = derive2 { name="SimInf"; version="6.4.0"; sha256="0nq20amk41xs4dpxxrllrxnnb8wqf5sshbvgdlm93y7dhamlv8x3"; depends=[Matrix]; }; - SimJoint = derive2 { name="SimJoint"; version="0.3.5"; sha256="117jv2wzi3aqbim9w30k1cvwjnzb23kh6z0p78hm4bz37wm5vdw3"; depends=[Rcpp RcppArmadillo RcppParallel]; }; + SimInf = derive2 { name="SimInf"; version="6.5.1"; sha256="1sacky971igk2x8kmiqfavxvzvyxl53snjpb8zf72ffh3d2nn32c"; depends=[Matrix]; }; + SimJoint = derive2 { name="SimJoint"; version="0.3.7"; sha256="03xf8n1fbbq63wz8kyj19h9vqz14z463cv8xqhmaknlamnnyhis5"; depends=[Rcpp RcppArmadillo RcppParallel]; }; SimMultiCorrData = derive2 { name="SimMultiCorrData"; version="0.2.2"; sha256="0brszbqxf40y65xp96c5hp7hhvz3gv0xlg93r5ik8qdh0bn0y1sw"; depends=[BB GenOrd ggplot2 Matrix nleqslv psych triangle VGAM]; }; SimPhe = derive2 { name="SimPhe"; version="0.2.0"; sha256="01kzypahw41jk8s2c92h0k9w32yaicis07wb6k8qlqcmv0zj8xry"; depends=[]; }; SimRAD = derive2 { name="SimRAD"; version="0.96"; sha256="0ivvd3k04v1akbblxcjhlyc315z3ig7wjs0g3b37lvlfp54ppbrg"; depends=[Biostrings ShortRead zlibbioc]; }; - SimRVPedigree = derive2 { name="SimRVPedigree"; version="0.3.0"; sha256="1ppms2cirdhm8lsfl74mfc1f9zwc7lin6r5xs649czqlj63yzk4i"; depends=[dplyr kinship2]; }; - SimRVSequences = derive2 { name="SimRVSequences"; version="0.2.3"; sha256="188sd1xyi2iaw5ra23wa2ilz5zi7vl6vjcswfcpn49r2yw5i9w4n"; depends=[dplyr intervals kinship2 magrittr Matrix reshape2 rlang SimRVPedigree]; }; + SimRVPedigree = derive2 { name="SimRVPedigree"; version="0.4.4"; sha256="0z7wwwl814bwaijkmg9wcdj5xisiamc9yqypmk0hzj950569aj8p"; depends=[dplyr kinship2]; }; + SimRVSequences = derive2 { name="SimRVSequences"; version="0.2.4"; sha256="0j10dr8mc0jmwixjvzfc20l50z2ismga142cq935jj3cd24j19b6"; depends=[dplyr intervals kinship2 magrittr Matrix reshape2 rlang SimRVPedigree]; }; SimReg = derive2 { name="SimReg"; version="3.0"; sha256="188q399xcrvjw7y7lf3hfbb7x0m0hc4zaf9i1w2c4xzswmvljd8r"; depends=[ontologyIndex ontologyPlot ontologySimilarity Rcpp]; }; SimSCRPiecewise = derive2 { name="SimSCRPiecewise"; version="0.1.1"; sha256="0mhlx9m5db8a40wf275qh59345676m8bpjjmyx1v22f6m9p3b2n4"; depends=[]; }; SimSeq = derive2 { name="SimSeq"; version="1.4.0"; sha256="068gg484w07qb4wajik2s3z79xfj0jg5l4pz69267dxi5kzd9fas"; depends=[fdrtool]; }; SimTimeVar = derive2 { name="SimTimeVar"; version="1.0.0"; sha256="1x0lkgqwx1vz1gbyvy0hx20n638n30j0dny1iz5vs0cvviq3cdv8"; depends=[car corpcor ICC metafor miscTools mvtnorm plyr psych]; }; - SimVitD = derive2 { name="SimVitD"; version="0.1.1"; sha256="0xq9qi3vf1aggcwy2hn7q57zvis6ws1z4azvgp2xsndbn7rg9qda"; depends=[poisson]; }; - SimilaR = derive2 { name="SimilaR"; version="1.0.6"; sha256="1cdcpl8mhzx0yp9x1djpana6fh3wi75350xdjxrikhpx1pmfl8mi"; depends=[BH Rcpp stringi]; }; + SimVitD = derive2 { name="SimVitD"; version="0.1.2"; sha256="0ilv17ngs1y09z459yn5wlg0bql93awdy3gbmrjhv00iyp30kvjp"; depends=[poisson]; }; + SimilaR = derive2 { name="SimilaR"; version="1.0.7"; sha256="1zabx25wqvspyl8yxknr8glz9b0dmk9wn4yz8fry4wd1nx2hl28q"; depends=[BH Rcpp stringi]; }; SimilarityMeasures = derive2 { name="SimilarityMeasures"; version="1.4"; sha256="1w4klcln4hy9vcik9csg7b3b8kk4raxgckwfrhqg089d80xbqsxj"; depends=[]; }; Simile = derive2 { name="Simile"; version="1.3.3"; sha256="1izyjp18m1inac3svkf59z3lddrv44m7pdkhisgkr987xs8gdch4"; depends=[]; }; SimpleTable = derive2 { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; }; SimplicialCubature = derive2 { name="SimplicialCubature"; version="1.2"; sha256="1g7i31naczqf1hxmk1h5y9gq36rdfhf4al9xvwjgi9bj9zhfg3qp"; depends=[]; }; - SimplifyStats = derive2 { name="SimplifyStats"; version="2.0.2"; sha256="0jv6yh6nh26wy18b4k3bi6pxhajmm2jw4hxxrjkpznn14c173qz5"; depends=[assertthat broom dplyr moments tibble]; }; + SimplifyStats = derive2 { name="SimplifyStats"; version="2.0.4"; sha256="08775g6fdx09y8pkfq4k8zxbxpwah7yqq5cg30lmxl7zrpmza5hv"; depends=[assertthat broom dplyr moments tibble]; }; Simpsons = derive2 { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; }; - SimuChemPC = derive2 { name="SimuChemPC"; version="1.3"; sha256="06sxknaykikcgbw7qbbw1risg0sbaisb68vhfd7cl6sg0327dznk"; depends=[rcdk]; }; SinIW = derive2 { name="SinIW"; version="0.2"; sha256="1z7rcjy0i09a9hjpjj1x8i46lv042l20lvb6b0pnsky2sx3v78pd"; depends=[fdrtool pracma]; }; SingleCaseES = derive2 { name="SingleCaseES"; version="0.4.3"; sha256="05bd03ka6qxmq8ls9w0nfklya3qay90s3i0iqjpcd6id4g8cz2kb"; depends=[dplyr magrittr purrr rlang tidyr tidyselect]; }; SitesInterest = derive2 { name="SitesInterest"; version="1.0"; sha256="06l6i6jnzwj683cvd9a9dg4nlb1wy1v3wb561y97a25bikm3mfy6"; depends=[plotrix]; }; @@ -4281,7 +4320,7 @@ in with self; { Sleuth3 = derive2 { name="Sleuth3"; version="1.0-3"; sha256="0ngwri80cwqs50wjza8qyzzwign4ag1ck7fa1x7q5x08w9x6w08m"; depends=[]; }; SmCCNet = derive2 { name="SmCCNet"; version="0.99.0"; sha256="0ixvh1pd1gzbscwg4xjlcgxq5c9vqahil0fysfjc3fnba3wiidzx"; depends=[igraph Matrix pbapply PMA]; }; SmallCountRounding = derive2 { name="SmallCountRounding"; version="0.4.0"; sha256="0rx47hvm4wkmrj1hrwaa8j61y3agfb09n048j9xlda5rismaqk8z"; depends=[Matrix SSBtools]; }; - SmartEDA = derive2 { name="SmartEDA"; version="0.3.3"; sha256="0harv4ybs5qy7qcj9disissw2kj46q54pkra50ysjfs1li1dw860"; depends=[data_table GGally ggplot2 gridExtra ISLR rmarkdown sampling scales]; }; + SmartEDA = derive2 { name="SmartEDA"; version="0.3.4"; sha256="0mw49hjf9k25hnml579dmmijgfq3n6ydqrr0308bw009j5m9rzw9"; depends=[data_table GGally ggplot2 gridExtra ISLR rmarkdown sampling scales]; }; SmartSVA = derive2 { name="SmartSVA"; version="0.1.3"; sha256="10a8s2znsg8ywqkq9fsxiyqfsprrx33pqissazp2vmabs11mg4np"; depends=[isva Rcpp RcppEigen RSpectra sva]; }; SmartSifter = derive2 { name="SmartSifter"; version="0.1.0"; sha256="16rzma87k27qg6qy39mzywdj8pzkp7r9q7bpqyikazp3fk2nmfri"; depends=[mvtnorm rootSolve]; }; SmarterPoland = derive2 { name="SmarterPoland"; version="1.7"; sha256="03vs6hcd96va9kfhl2yq77alnm33j1dxy79kgrx17hlijsy65qqv"; depends=[ggplot2 htmltools httr jsonlite rjson]; }; @@ -4289,7 +4328,7 @@ in with self; { SmoothHazard = derive2 { name="SmoothHazard"; version="1.4.1"; sha256="147wjxgxnijpmixrfyl8kd4scz2w1xb8dcwvpr60zg32nv22g17r"; depends=[lava mvtnorm prodlim]; }; SmoothWin = derive2 { name="SmoothWin"; version="3.0.0"; sha256="0zq2sq0w4rs3hrra24wgbbzv88d1hx6m8q8gmc5h6nbs1172hs66"; depends=[nlme Rfast]; }; SnakesAndLaddersAnalysis = derive2 { name="SnakesAndLaddersAnalysis"; version="2.1.0"; sha256="0h3664h6d32q201qfyv9y2gg4fhg3azdpwpmx4qfbc10hsc1ghl9"; depends=[]; }; - SnowballC = derive2 { name="SnowballC"; version="0.6.0"; sha256="0b7pqdavf5jbf8si4ybnii5fff39p3b1rb5rym05j8s48hs7sqb1"; depends=[]; }; + SnowballC = derive2 { name="SnowballC"; version="0.7.0"; sha256="1wwm71mp4b2mjb5985x782p6xj519dfrpd40qli7lmig6afyw3xi"; depends=[]; }; SoDA = derive2 { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; }; SobolSequence = derive2 { name="SobolSequence"; version="1.0"; sha256="1vmp5jix3zvasvdirv8m88jc0cd8f34b4m1jvhs8g3v9lk8pxrrr"; depends=[Rcpp]; }; SocialNetworks = derive2 { name="SocialNetworks"; version="1.1"; sha256="0d868xka6d35i17r28cvm0ya971xk6y1kycsfff0279w27cjd9x0"; depends=[Rcpp]; }; @@ -4305,21 +4344,21 @@ in with self; { SongEvo = derive2 { name="SongEvo"; version="1.0.0"; sha256="0mc5wlf5axbflys6g8b7xg0di3wwkli7q0a9fby6598fq9hbaqpd"; depends=[boot geosphere lattice sp]; }; SorptionAnalysis = derive2 { name="SorptionAnalysis"; version="0.1.0"; sha256="0drns1ajcga5z56hcgjxld1riwjn7vli8k1ma1xqifpy1qwy7ci6"; depends=[]; }; SortableHTMLTables = derive2 { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[brew testthat]; }; - SortedEffects = derive2 { name="SortedEffects"; version="1.1.0"; sha256="14ddalkbk2bfjxpx3ppcm9ffdqxfi1d44nngbczi8923s9v2y1nc"; depends=[boot dummies Hmisc pbapply quantreg rlist SparseM]; }; + SortedEffects = derive2 { name="SortedEffects"; version="1.2.0"; sha256="0p16kxzss0inzvsd23sh7yiry1znpzdl36wf9dzhb9w7y9js8nxr"; depends=[boot dummies Hmisc pbapply quantreg rlist SparseM]; }; SoundexBR = derive2 { name="SoundexBR"; version="1.2"; sha256="0chc332v3wcz30v70yvdxhvcfdmvf4fj193cn00gl899xfxal89p"; depends=[]; }; SourceSet = derive2 { name="SourceSet"; version="0.1.3"; sha256="159kg4pna24yihkghxc2k5f56dqk8aypxcmj1whgnajmgab29ry1"; depends=[graph gRbase gtools igraph plyr progress reshape2 scales]; }; SoyNAM = derive2 { name="SoyNAM"; version="1.6"; sha256="1vwl2mknk6x0sgk0baxsvb6xy4i7mf2ypkmc9lx869nakrx1ypah"; depends=[lme4 NAM reshape2]; }; - SpATS = derive2 { name="SpATS"; version="1.0-10"; sha256="0h1xf01kar69nr96vf1y19rd543fzysv391z992mqrr98dzws9dc"; depends=[data_table fields plot3Drgl spam]; }; + SpATS = derive2 { name="SpATS"; version="1.0-11"; sha256="00xw6xz764sqlfr7pw2mxzxvm4i1p76n9h8wz62n0p3afn1d1glm"; depends=[data_table fields plot3Drgl spam]; }; SpNMF = derive2 { name="SpNMF"; version="0.1.1"; sha256="1xybxx47i3ww5d7chwl38xc48fbsclgyxcki8h85c6dkm49dxy8i"; depends=[NMF]; }; SpNetPrep = derive2 { name="SpNetPrep"; version="1.1"; sha256="1y3j7mwjxv69lrgqvi8kxvhlmdyr8v7gbg17741008xb32kgma8h"; depends=[leaflet maptools prodlim raster rgdal shiny shinythemes sp spatstat]; }; SpaCCr = derive2 { name="SpaCCr"; version="0.1.0"; sha256="0qm1fr6nnax3i1i77fi73x1z8db557avh6kivs0nskb1dfj8ri4m"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo tidyr]; }; SpaDES = derive2 { name="SpaDES"; version="2.0.4"; sha256="1ihxkr2c7rfpb02chmdv393nfc1id1cg7lq8pbb64xm5vdpyj0bv"; depends=[quickPlot reproducible SpaDES_addins SpaDES_core SpaDES_tools]; }; SpaDES_addins = derive2 { name="SpaDES.addins"; version="0.1.2"; sha256="0z1n48kfwy460zfam88ayfiq8sbzvnf6cpkasr74nykr4fabs5ha"; depends=[devtools magrittr miniUI reproducible rstudioapi shiny SpaDES_core stringi]; }; - SpaDES_core = derive2 { name="SpaDES.core"; version="0.2.7"; sha256="0m2yn907p884xq6da75ji87r5p3zzygkwxa50isz8lgnp31xmgpy"; depends=[backports codetools crayon data_table DiagrammeR dplyr fastdigest fpCompare future httr igraph lubridate quickPlot R_utils raster RCurl reproducible stringi whisker]; }; + SpaDES_core = derive2 { name="SpaDES.core"; version="1.0.0"; sha256="1bz9j787nynjxfa3dnv0ij39bsf5qq9kmqrhlas1sx9qvvzsnfaz"; depends=[backports crayon data_table dplyr fastdigest fpCompare igraph lubridate quickPlot R_utils raster RCurl reproducible rlang stringi whisker]; }; SpaDES_tools = derive2 { name="SpaDES.tools"; version="0.3.4"; sha256="0iz6mnppp2p036b7z0rcv0hbcb3m1s4262ws797qpgxqj22d0hpy"; depends=[backports bit checkmate CircStats data_table fastmatch ff ffbase fpCompare magrittr quickPlot raster Rcpp reproducible rgeos sp]; }; SpaTimeClus = derive2 { name="SpaTimeClus"; version="1.0"; sha256="1l204b8yd11pxwcb026xy39f4lps4sqk6mml8cybnjch8clk9djc"; depends=[Rcpp RcppArmadillo]; }; SpadeR = derive2 { name="SpadeR"; version="0.1.1"; sha256="0iy2rkq4vvps1a73kqq37zpsyl4pvl3vh07dwvpfhvp7f8nxbx99"; depends=[]; }; - SparkR = derive2 { name="SparkR"; version="2.4.4"; sha256="181qys7whk061bk8gl8ah34g4wk3a0lw40dnx18nj8yf5iq6yvzd"; depends=[]; }; + SparkR = derive2 { name="SparkR"; version="2.4.5"; sha256="1bdq2qalirrd018hwj95ab1cmg10mp8innrdgc9m3xcwzdc75nrv"; depends=[]; }; SparseBiplots = derive2 { name="SparseBiplots"; version="3.5.0"; sha256="00ynx0cr543zyx9b633cbdalza9wmfgbvvgvr8b6s5r71lpjii8f"; depends=[sparsepca]; }; SparseDC = derive2 { name="SparseDC"; version="0.1.17"; sha256="0gsfj8631s67a0r9qjjll4rbb57nzk5fwm5bbggvf0027b9hk0pp"; depends=[]; }; SparseFactorAnalysis = derive2 { name="SparseFactorAnalysis"; version="1.0"; sha256="0lgfvydxb86r5hks1mf0p0yhgpx8s8fbkc3q6dimc728rw26qcv5"; depends=[directlabels ggplot2 MASS proto Rcpp RcppArmadillo truncnorm VGAM]; }; @@ -4332,58 +4371,59 @@ in with self; { SpatEntropy = derive2 { name="SpatEntropy"; version="0.1.0"; sha256="0nk399anjhsdki9cra650ynk6sa0366495470sawxcfs3vxmlzrl"; depends=[spatstat]; }; SpatMCA = derive2 { name="SpatMCA"; version="1.0.1.0"; sha256="1sjrm1md4lmhyq1yw3np4llkgdskw3mk667jr0k3isjmr6z88gxa"; depends=[fields MASS Rcpp RcppArmadillo RcppParallel]; }; SpatPCA = derive2 { name="SpatPCA"; version="1.2.0.1"; sha256="0vqajxcjjdp9dv53w0s4d1z63yrnzvs90h7cqs0f6daaihyvm130"; depends=[Rcpp RcppArmadillo RcppParallel]; }; - SpatialAcc = derive2 { name="SpatialAcc"; version="0.1-3"; sha256="0nx3x4jiiwwa2983lbszpm22xgc41gcdcm967h1p9a4xz2a6wgcs"; depends=[]; }; + SpatialAcc = derive2 { name="SpatialAcc"; version="0.1-4"; sha256="09rkzfzg6nh4n7dizkqrz651kp617l2557c9qpxacspl3ngbm82i"; depends=[sp]; }; + SpatialBSS = derive2 { name="SpatialBSS"; version="0.8"; sha256="0dbra7m99b1jn107gp88fdv08whaq02ny3fdddgdxvyf4mlqid8p"; depends=[JADE Rcpp RcppArmadillo sp]; }; SpatialBall = derive2 { name="SpatialBall"; version="0.1.0"; sha256="09iy1smfqnb0rd2s9a1wqgscb1plwcwwph6a8215l4zrs6svszv2"; depends=[dplyr ggplot2 hexbin lubridate RColorBrewer]; }; SpatialEpi = derive2 { name="SpatialEpi"; version="1.2.3"; sha256="0d0kyh591m3hvalqpbj67pynpb9v00kdx1idc5mw4p9hsbfs10xm"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; }; SpatialEpiApp = derive2 { name="SpatialEpiApp"; version="0.3"; sha256="0svnnzqshk08s58ishy8xhqch44mb5svgfphkvpgysdd68dgaysr"; depends=[dplyr dygraphs ggplot2 htmlwidgets knitr leaflet mapproj maptools RColorBrewer rgdal rgeos rmarkdown shiny shinyjs SpatialEpi spdep xts]; }; + SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-8"; sha256="0r2byz5xxc46zqnigdax28q7446ibmzmsmi10lmm2hdks3ml6sl3"; depends=[fields maps]; }; SpatialFloor = derive2 { name="SpatialFloor"; version="1.1.0"; sha256="07mwgcvkkq478l6wxvrdjs9d578x0kgs5xy86lgy5my0xqfcv6y8"; depends=[blocksdesign fields reshape2 taRifx]; }; SpatialGraph = derive2 { name="SpatialGraph"; version="1.0-2"; sha256="0cwswa5g3a6ng8qkwi04jz9pma4i0c16m7jpq6z3djzjin0znyk2"; depends=[igraph rgeos shape sp splancs]; }; - SpatialKDE = derive2 { name="SpatialKDE"; version="0.5.0"; sha256="15v8msvmpy72d0vjrra1rmkkxn7pm11bngr3liw2n43lwkh19l9i"; depends=[dplyr glue magrittr raster Rcpp rlang sf]; }; + SpatialKDE = derive2 { name="SpatialKDE"; version="0.6.1"; sha256="15znbhfflzz1x396mnnbx9lx8xs6rfr2564kr632qb2d9ihj9s45"; depends=[dplyr glue magrittr raster Rcpp rlang sf]; }; SpatialML = derive2 { name="SpatialML"; version="0.1.3"; sha256="0akip0kkd1jjid12iwmaxkhkvcfzkxmrnrsv0b6nnvpjdl1jb589"; depends=[randomForest]; }; SpatialNP = derive2 { name="SpatialNP"; version="1.1-4"; sha256="1hj9fjhyxcvl2d0wdqyc899wy4f6iyi03g65icavkmqnwcs8c7hc"; depends=[]; }; SpatialPack = derive2 { name="SpatialPack"; version="0.3-8"; sha256="0laixlr37048x2dr1zbk41kjp533w47khc1d9rihmlrwxrflprd0"; depends=[]; }; - SpatialPosition = derive2 { name="SpatialPosition"; version="2.0.0"; sha256="00z1kbkd7as4xnzqnizaap9qga4vakx7swyayli26ghp11krgfwr"; depends=[isoband lwgeom raster rgeos sf sp]; }; + SpatialPosition = derive2 { name="SpatialPosition"; version="2.0.1"; sha256="0ljhb5j05kxhw1c2ki1m1688mgbg4pnf8z324i21b9idrcypcizn"; depends=[isoband raster rgeos sf sp]; }; + SpatialRoMLE = derive2 { name="SpatialRoMLE"; version="0.1.0"; sha256="1m80vcd27g11v0gxnjz6p4ghljpxdb8jpkns8ry5yzhfvcpf29jc"; depends=[]; }; SpatialTools = derive2 { name="SpatialTools"; version="1.0.4"; sha256="0jgbrzsx2klvihv65y1ycqyr8awp5kqqz4qwfyfibx3b56lzna1q"; depends=[Rcpp RcppArmadillo spBayes]; }; SpatialVS = derive2 { name="SpatialVS"; version="1.1"; sha256="1xghfiz9wmmx11ssms7zjy3ggkjmc6kkbdwp3v5wjwpwapafzdk3"; depends=[fields MASS nlme]; }; SpatialVx = derive2 { name="SpatialVx"; version="0.6-5"; sha256="1n2d686aa6y8dy1y78i6ncl9abiafj96prfgkgcv8w8jmg0d23z5"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; }; - SpatioTemporal = derive2 { name="SpatioTemporal"; version="1.1.9.1"; sha256="1i9w1gb4klwfwas934lw0a01pyp87y7ydrlk05xgd52i4j1y9wcn"; depends=[MASS Matrix]; }; - Spbsampling = derive2 { name="Spbsampling"; version="1.3.1"; sha256="0k3c1db19ngqlaxc2842gfls5936hb0vb6x0za3f3hcdpd7b5mlc"; depends=[Rcpp RcppArmadillo]; }; + Spbsampling = derive2 { name="Spbsampling"; version="1.3.3"; sha256="14km5g0yngp4ikndnlfmsgrahpklgsclry269fhmxgk9ingr1isx"; depends=[Rcpp RcppArmadillo]; }; SpecDetec = derive2 { name="SpecDetec"; version="1.0.0"; sha256="1940pl4vm1kzszq0hwhqkwbk1xmrimjdf03acpdndy089mdg9avc"; depends=[abind]; }; SpecHelpers = derive2 { name="SpecHelpers"; version="0.2.7"; sha256="1v3v717ah2fkx9225860dwppdf5m6nnnaaa4iwmj30rn17nqr4jh"; depends=[gsubfn splancs]; }; - SpeciesMix = derive2 { name="SpeciesMix"; version="0.3.4"; sha256="0d6hfmzxqcvg4fcvpsfxx36k95fwkws4rlylrixikndj2fncgwb5"; depends=[MASS numDeriv]; }; - SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-2"; sha256="0dnya9mzkf48clp51jrnkz6lc4fps38nn3lap7n2wcp3dvbvdycg"; depends=[Rcpp RcppArmadillo]; }; + SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-3"; sha256="1v76lilyj65f04881yw19v0qi7n08ysdnr7sc4hf5d8wnmvdh3v3"; depends=[Rcpp RcppArmadillo]; }; SpectralMap = derive2 { name="SpectralMap"; version="1.0"; sha256="15689023k9jzg3s7bx5m97dmn00z876amqhxsxksy8n8wf09wr57"; depends=[fields scatterplot3d]; }; - Spectrum = derive2 { name="Spectrum"; version="1.0"; sha256="0ayvzkbbklzvnz3vd6xknsgjw9avp7k0bd4hqz0rkmdfl30jjash"; depends=[ClusterR diptest ggplot2 Rfast]; }; + Spectrum = derive2 { name="Spectrum"; version="1.1"; sha256="0n38d360azkck6vvhr771zsh0gbvd9qsf9ygg5r18vhz0pb1xcfw"; depends=[ClusterR diptest ggplot2 Rfast]; }; SphericalCubature = derive2 { name="SphericalCubature"; version="1.4"; sha256="14xrxhmhavz82rcixnyharnbrvdzs6rh7gbxihaxh431d90w2q3k"; depends=[abind cubature mvmesh SimplicialCubature]; }; SphericalK = derive2 { name="SphericalK"; version="1.2"; sha256="18py4ylm10s75pihjvcy7w948379zy9l9azriw7g7pyp7px29wda"; depends=[]; }; - SplitReg = derive2 { name="SplitReg"; version="1.0.1"; sha256="0gifj5jk88xyda7sb7l0wbpx86gcj7d4yx2mfljlm882yr0ic7aa"; depends=[Rcpp RcppArmadillo]; }; - SplitSoftening = derive2 { name="SplitSoftening"; version="2.0-0"; sha256="0nlli8nap6ilb5ns1xavyb06nhj2dlf4p0gajmsgrz32s2ljhr8s"; depends=[]; }; + SplitReg = derive2 { name="SplitReg"; version="1.0.2"; sha256="1s012qldrsq8rpfpzf7kyd7631b65zai269x53xcaqn75r5ssh3f"; depends=[Rcpp RcppArmadillo]; }; + SplitSoftening = derive2 { name="SplitSoftening"; version="2.0-1"; sha256="0jk46ymgkjh8jg9b9zzn9490cq92fzchvi2yzqiwisww0k15xlvb"; depends=[]; }; SportsAnalytics = derive2 { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; }; - SqlRender = derive2 { name="SqlRender"; version="1.6.3"; sha256="08w40d3cnnqdw11i4ycr11m3xn2a5gg7blqgmdn336dlhqsc9mdc"; depends=[rJava]; }; + SqlRender = derive2 { name="SqlRender"; version="1.6.5"; sha256="17hp55fpa54jgxr668d2lq53wd31zr1yz1rzc9hlih47zy9zmac1"; depends=[rJava]; }; Sstack = derive2 { name="Sstack"; version="1.0.1"; sha256="137vsas2kw3l37c141g51sgx0j6z8ys6hbxjmsdymz1fxsjr4adg"; depends=[doParallel dplyr foreach randomForest]; }; - StAMPP = derive2 { name="StAMPP"; version="1.5.1"; sha256="0yyssscx3l4csban66gb4q35h37gf7pqvvycfsy56n96pnnlrgkf"; depends=[adegenet doParallel foreach pegas]; }; + StAMPP = derive2 { name="StAMPP"; version="1.6.1"; sha256="1x6b032xadjn8yq3n662r9f0lyg5xl71q2lksvx8rn5fmpjlqqrs"; depends=[adegenet doParallel foreach pegas]; }; StMoMo = derive2 { name="StMoMo"; version="0.4.1"; sha256="1c4v2gjipq1y4crc6bqvz2x5c02bl10mh9jacg8dqb2dffsh5y44"; depends=[fanplot fields forecast gnm MASS RColorBrewer reshape2 rootSolve]; }; StMoSim = derive2 { name="StMoSim"; version="3.1.1"; sha256="1y4lnbpgdza6r6w3q161nlmg8775g3zv323amcwxcj41r4v41p96"; depends=[Rcpp RcppParallel]; }; StVAR = derive2 { name="StVAR"; version="1.1"; sha256="0wz5f5i9927fs1s8yczwqs022k912220m28l1sv5f0r081iv656i"; depends=[ADGofTest matlab MCMCpack numDeriv]; }; + StabilizedRegression = derive2 { name="StabilizedRegression"; version="1.0"; sha256="11hfq13b5rc1jj832msrfb0f3fsklx4clp72aqxfccw0z0n8mdq0"; depends=[corpcor ggplot2 ggrepel glmnet MASS R6]; }; StableEstim = derive2 { name="StableEstim"; version="2.1"; sha256="0agi3bfp1xy5pfxxb9ib6xn434agmplgn7kg47nhbh47vf57vang"; depends=[fBasics MASS Matrix numDeriv stabledist testthat xtable]; }; Stack = derive2 { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[bit ff ffbase plyr stringr]; }; StagedChoiceSplineMix = derive2 { name="StagedChoiceSplineMix"; version="1.0.0"; sha256="1008gm6zv5k8lpv0qg42qjriajmx0n4kshjh76mvx91dpi788ivh"; depends=[plyr]; }; StakeholderAnalysis = derive2 { name="StakeholderAnalysis"; version="1.2"; sha256="164mah8h8izxaqp8hc43l6mlnf95pydkcx2laqrlqr9b0bybadxb"; depends=[]; }; - StanHeaders = derive2 { name="StanHeaders"; version="2.21.0-1"; sha256="0gqdp5galy3fgrx9c7ks5hlcla76idfp4awc40xj03wnya51952f"; depends=[RcppEigen]; }; + StanHeaders = derive2 { name="StanHeaders"; version="2.19.2"; sha256="0cmk0fzczx7dcywcw1dhm6gfq84qlsx77qrsk4z3bf3dhr4bznam"; depends=[]; }; StandardizeText = derive2 { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; }; Stat2Data = derive2 { name="Stat2Data"; version="2.0.0"; sha256="1fpp3b4k7x915a9wkpyj4dvvqp0wz7c3lpbh154vrxrdsr712z0k"; depends=[]; }; StatCharrms = derive2 { name="StatCharrms"; version="0.90.94"; sha256="16056gd3wx5qcm9bnrl8hk8dk85j9ikan2dz4acpsfhpga80vp0n"; depends=[cairoDevice car clinfun coxme gWidgets gWidgetsRGtk2 lattice multcomp nlme R2HTML RGtk2 RSCABS survival]; }; - StatDA = derive2 { name="StatDA"; version="1.7"; sha256="1hsy4aivd5ga2zj65hr2c5cn9qgjnhs123qqyg6q959vsjxzp0i0"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat xtable]; }; + StatDA = derive2 { name="StatDA"; version="1.7.4"; sha256="1ld7fx1lip54n24r2d9zvd4hri3w02vd174bdi8pi9j5n8xpxl02"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat sp xtable]; }; StatDataML = derive2 { name="StatDataML"; version="1.0-26"; sha256="1lcckapbhqdbg6alnhm2yls66lnkxnxamdlzx6pbfqv1dhsy36gf"; depends=[XML]; }; StatMatch = derive2 { name="StatMatch"; version="1.3.0"; sha256="1ms8qmxgpfa9sk7kl6hpcal14xxn7i84h662va2n045w7p0qmcjw"; depends=[clue lpSolve proxy RANN survey]; }; StatMeasures = derive2 { name="StatMeasures"; version="1.0"; sha256="1bnbz803xx8kqhy1cx545b35si6f10za0mp5z82qfvd4kv9a9izz"; depends=[data_table]; }; StatPerMeCo = derive2 { name="StatPerMeCo"; version="0.1.0"; sha256="1nm6brlj6h7jx8nqagrfk294ay3pfmkiizabwlb87qfnsfwchpk3"; depends=[]; }; StatRank = derive2 { name="StatRank"; version="0.0.6"; sha256="14d8v3bp8vgksi6q0mxajwd9s8zi6lns3qwi1vcr5xp9rjp4n6iy"; depends=[ggplot2 plyr truncdist]; }; SteinIV = derive2 { name="SteinIV"; version="0.1-1"; sha256="1bm4lc7g9h9jkb1dpzb84289bwxcywp0a8vylv6ipvhiqbqk5d95"; depends=[]; }; - SteinerNet = derive2 { name="SteinerNet"; version="3.0.1"; sha256="1jkvv0hsj85i1zfr1bmdsrbwgl11mxpfci3z7997m5vvb5fb5cxn"; depends=[igraph]; }; Stem = derive2 { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[MASS mvtnorm]; }; StempCens = derive2 { name="StempCens"; version="0.1.0"; sha256="11gspjrcl6yiyr19hankan5mcxipfsdkhha6nsiybs1chg5wx6f4"; depends=[distances ggplot2 gridExtra Matrix MCMCglmm mvtnorm optimx sp spTimer ssym tmvtnorm]; }; - StepReg = derive2 { name="StepReg"; version="1.3.4"; sha256="1fqvz9b2mh1i8zlqnpxfqygydh15y145wszdcvijcbgn5albkl7x"; depends=[Rcpp RcppEigen]; }; + StepReg = derive2 { name="StepReg"; version="1.4.1"; sha256="1ash73v9qwy1717w00vajamkd4rb8rsaxch7y9479yqagclfbl18"; depends=[Rcpp RcppEigen]; }; StepSignalMargiLike = derive2 { name="StepSignalMargiLike"; version="2.6.0"; sha256="0j85lvs2bljfhf482r31sq3xgk8l73hcw22wgxxp8z8nla38cwf9"; depends=[Rcpp]; }; StepwiseTest = derive2 { name="StepwiseTest"; version="1.0"; sha256="1fdm4s9l6grgd45r98ybbsh40rnmnn16c0id6lv28cpmssi0iphi"; depends=[Rcpp RcppArmadillo]; }; StereoMorph = derive2 { name="StereoMorph"; version="1.6.3"; sha256="0sr8i6hq9iir2f717yvm5kdda047hamsqcrl553jjzzcbxg0y5m1"; depends=[bezier jpeg MASS png Rcpp rjson shiny svgViewR tiff]; }; @@ -4393,9 +4433,9 @@ in with self; { StratSel = derive2 { name="StratSel"; version="1.3"; sha256="0hd6q8s8aiymcd33kv0gd0a4wzr86xxdzwn18jgpyk9q8pmg8gvl"; depends=[Formula MASS memisc mnormt pbivnorm]; }; Strategy = derive2 { name="Strategy"; version="1.0.1"; sha256="0phja1r0qfvcswvw5w1x6ny86p84wkqb029fdqgw10djdm9xp0f2"; depends=[xts zoo]; }; StratifiedBalancing = derive2 { name="StratifiedBalancing"; version="0.3.0"; sha256="0pklnm0q0imdhyzhwyb4i0j441dkk4k6qqlx8d4q2xnl62drqnvv"; depends=[bnlearn plyr]; }; - StratifiedMedicine = derive2 { name="StratifiedMedicine"; version="0.2.1"; sha256="0g7r6jz9gqy66784sygg20l0gyikqmkm69hssyqdsvhgslwmdq5r"; depends=[dplyr ggparty ggplot2 glmnet mvtnorm partykit ranger survival]; }; + StratifiedMedicine = derive2 { name="StratifiedMedicine"; version="0.2.3"; sha256="03hjx3c7gfzsx3frh0k484xakw9ssrar4dlilw2x85m55hsn7v9r"; depends=[dplyr ggparty ggplot2 glmnet mvtnorm partykit ranger survival]; }; StratifiedRF = derive2 { name="StratifiedRF"; version="0.2.2"; sha256="0a5djia6xacs17nnr5knr1acwzicrffz73q9nvnhdmihazq8v27d"; depends=[C50 dplyr]; }; - StratigrapheR = derive2 { name="StratigrapheR"; version="0.0.7"; sha256="0650qrip02r079zqfaii9097p2d8dm90356v0f3gialg140rsbys"; depends=[diagram dplyr shiny stringr XML]; }; + StratigrapheR = derive2 { name="StratigrapheR"; version="1.0.1"; sha256="0b63n91ns4z745nrdrrnjmj1pmqi5plj1fkbh9ix7i6a7bd2n023"; depends=[diagram dplyr shiny stringr XML]; }; StreamMetabolism = derive2 { name="StreamMetabolism"; version="1.1.2"; sha256="1sv30i7armk7jhxg5x9lh0r9qq3xixn1k2h0q89halkh1yraal8a"; depends=[chron maptools zoo]; }; StressStrength = derive2 { name="StressStrength"; version="1.0.2"; sha256="1fq26bzmwsk4nzz9bgasyxz9alw8x2ssahz67mham7vw483w79pd"; depends=[]; }; String2AdjMatrix = derive2 { name="String2AdjMatrix"; version="0.1.0"; sha256="058r30kjjna02nmd6ngqfcnn1yk5390i20xvl6qb5qk3bcp2wmxn"; depends=[stringr]; }; @@ -4403,9 +4443,9 @@ in with self; { StructFDR = derive2 { name="StructFDR"; version="1.3"; sha256="1y0wj7y36iq0lznc4qpsr2yis3an34iilpabkaxxmas2q4abg0qb"; depends=[ape cluster dirmult matrixStats nlme]; }; StructureMC = derive2 { name="StructureMC"; version="1.0"; sha256="1pj3inznw6flvmk22dzjcfjnwjhx7r98ngckz0axf6ipp3hb85jn"; depends=[MASS matrixcalc]; }; SubCultCon = derive2 { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; }; - SubTite = derive2 { name="SubTite"; version="3.0.0"; sha256="1kv5083zfxla4v1y7zhkd2rhld8mhmnilkz78q26qp121qqbf93r"; depends=[Rcpp RcppArmadillo]; }; + SubTite = derive2 { name="SubTite"; version="3.0.1"; sha256="12wbipx024p1wrnvjvv82armji6ryzv15i8yry6kaf49zp6wfxiq"; depends=[Rcpp RcppArmadillo]; }; SubVis = derive2 { name="SubVis"; version="2.0.2"; sha256="1nb3zgm6i5lwfwdrn8mk3wkg8a4ldfvs27ai8v46l4316qc1fa9p"; depends=[Biostrings shiny]; }; - SubgrPlots = derive2 { name="SubgrPlots"; version="0.1.2"; sha256="1hiaa4zwk3ll6ans1v7r76pmzbq7j8mhw72s30j7mhgkkkqpnr12"; depends=[alluvial circlize colorspace diagram dplyr geoR ggplot2 ggrepel gridBase gridExtra plyr polyclip scales shape sp survival survRM2 UpSetR VennDiagram]; }; + SubgrPlots = derive2 { name="SubgrPlots"; version="0.1.3"; sha256="1bi5zndkpgvyk563i0jdfrw73kkpa6zi3yx922dv90w6bdb9kvl2"; depends=[alluvial circlize colorspace diagram dplyr ggplot2 ggrepel gridBase gridExtra plyr polyclip scales shape sp survival survRM2 UpSetR VennDiagram]; }; SubgrpID = derive2 { name="SubgrpID"; version="0.11"; sha256="1by23gdkbls7l5xa9nl055nbm0d3138pmfmasqmcy42h62wf7dw6"; depends=[AIM ggplot2 glmnet Matrix rpart survival]; }; SubpathwayGMir = derive2 { name="SubpathwayGMir"; version="1.0"; sha256="1rw94idhbnaszr2xv1wgnjcxlnxkml912pvmqh2a1nqpwca5mscy"; depends=[igraph XML]; }; SubpathwayLNCE = derive2 { name="SubpathwayLNCE"; version="1.0"; sha256="051csjavr9549y54yirfdn266i7swsvpbcakhziyz4sl4afwx5kl"; depends=[BiasedUrn graph igraph RBGL]; }; @@ -4416,16 +4456,17 @@ in with self; { SunterSampling = derive2 { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; }; SupMZ = derive2 { name="SupMZ"; version="0.2.0"; sha256="1n81wqacrpk5x6i1pd1zsjivv2jk41743kg1h7gnp0rb3k58vp7r"; depends=[dplyr magrittr]; }; SuperExactTest = derive2 { name="SuperExactTest"; version="1.0.7"; sha256="1ysfsdzbkldcn7hzxhqikf5h2h9747xhfrirqgr8xx8q81wq989s"; depends=[]; }; - SuperGauss = derive2 { name="SuperGauss"; version="1.0.1"; sha256="0pkk8aaghkrh87g6ahikngp6hahaxwhr8i9vz30vv2bzxpgba54b"; depends=[fftw Rcpp RcppEigen]; }; + SuperGauss = derive2 { name="SuperGauss"; version="1.0.2"; sha256="08nrw96y7b04a9xpyklcnqgisbjxd35pqffpay6cr67zxx0zg81i"; depends=[fftw Rcpp RcppEigen]; }; SuperLearner = derive2 { name="SuperLearner"; version="2.0-26"; sha256="10b0fh71ky92mp0ydi81s6zm3sn47k5agppcg4zpgqmailn94qj4"; depends=[cvAUC nnls]; }; - SuperPCA = derive2 { name="SuperPCA"; version="0.2.0"; sha256="1g2qf2y83clmjx327b9yk6bkx4l7rm0hj0sjvia2fll24m4hxcjz"; depends=[fBasics glmnet MASS matlab matlabr Matrix matrixStats pracma psych R_matlab RSpectra spls timeSeries]; }; + SuperPCA = derive2 { name="SuperPCA"; version="0.3.0"; sha256="139nym0szr7l7hq3xy60jwpx61896h5g7vrklxy7098w53iczyj4"; depends=[fBasics glmnet MASS matlab matlabr Matrix matrixStats pracma psych R_matlab RSpectra spls timeSeries]; }; SuperRanker = derive2 { name="SuperRanker"; version="1.1.1"; sha256="1yiklw9zk7yw0xz5g3lmyl5lv325fnysimdwbxa37nyj6qdfv0ls"; depends=[prodlim Rcpp]; }; SuperpixelImageSegmentation = derive2 { name="SuperpixelImageSegmentation"; version="1.0.1"; sha256="15d611ik6qg0602n6yk34a1pgfciv42nzd8qaarmxnqqrn8i584n"; depends=[ClusterR OpenImageR R6 Rcpp RcppArmadillo]; }; + Superpower = derive2 { name="Superpower"; version="0.0.3"; sha256="0hwlgscygjcqiclgac97ffcmw081g91rvqbd2pj0z0kijz7g597x"; depends=[afex dplyr emmeans ggplot2 gridExtra magrittr MASS mvtnorm reshape2]; }; SuppDists = derive2 { name="SuppDists"; version="1.1-9.5"; sha256="1i3iq12a5x5k49ac01mikzcrrq9gc148xq3m08h4xm07bha6f2v8"; depends=[]; }; SurfaceTortoise = derive2 { name="SurfaceTortoise"; version="1.0.1"; sha256="0q0swp0xs3lmfx2dxffqrna2spyr2l9ka0zbhmw8nkgb1w5rq5q6"; depends=[gstat raster rgeos sp]; }; - Surrogate = derive2 { name="Surrogate"; version="1.5"; sha256="104k7fgbl7aqgapm6qrkx0vhlfvbwl5gqdllrrks74ws7hbmmfgd"; depends=[extraDistr ks lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms rootSolve survival]; }; + Surrogate = derive2 { name="Surrogate"; version="1.7"; sha256="17f91s6fdlbgwxqggnylx45n3j2mdsqi9613ayrhi77yhqhjpm16"; depends=[extraDistr ks lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms rootSolve survival]; }; SurrogateOutcome = derive2 { name="SurrogateOutcome"; version="1.0"; sha256="0x91bmr4n9zn9cc72s91fzzsqhzhrkfpcbcla00gcsfmbjqz3997"; depends=[survival]; }; - SurrogateTest = derive2 { name="SurrogateTest"; version="1.1"; sha256="0m6m44vsfdgv47sswi2s8snmypa7s2ppad73fqnvymq8fm2b3yl2"; depends=[survival]; }; + SurrogateTest = derive2 { name="SurrogateTest"; version="1.2"; sha256="0wkyz9qkmvsrhvdga6w0qkbgqr7kr0yh04kkc19824sqnx452dc5"; depends=[survival]; }; SurvBoost = derive2 { name="SurvBoost"; version="0.1.2"; sha256="17av00iwa3kpw0ihrvvynrfcghnq492b5k7n9fxfgf2nily24x2p"; depends=[directlabels ggplot2 mvtnorm plyr Rcpp RcppArmadillo RcppParallel reshape2 survival]; }; SurvCorr = derive2 { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[fields survival]; }; SurvDisc = derive2 { name="SurvDisc"; version="0.1.1"; sha256="0ajvnm0a4krbm0m584bg58hd7dzl0f2rz5as1zsajx8agywb5qmv"; depends=[cubature MASS mvtnorm nlme simex survival]; }; @@ -4435,8 +4476,8 @@ in with self; { SurvTrunc = derive2 { name="SurvTrunc"; version="0.1.0"; sha256="0b6s7llljp75agd57lmc1yq5acnfwy113khrfjcbm1l5ply6pz7f"; depends=[survival]; }; Survgini = derive2 { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; }; SvyNom = derive2 { name="SvyNom"; version="1.1"; sha256="1jym2x6nd9a3y7nk5hflqpy54gs67y4sqqspkvkalf5l2cc64did"; depends=[Hmisc rms survey survival]; }; - SwarmSVM = derive2 { name="SwarmSVM"; version="0.1-5"; sha256="0nmlnvc1vxk68sc5jv3kvnnf5dpqxn4dxzrn06b9sn2bcxfpmkhy"; depends=[BBmisc checkmate e1071 kernlab LiblineaR Matrix SparseM]; }; - SwimmeR = derive2 { name="SwimmeR"; version="0.1.0.0"; sha256="0979527aaacfq8arp1qh7z3p9crq8x2v90899z2ab0fa6f9n282m"; depends=[dplyr purrr stringr tibble]; }; + SwarmSVM = derive2 { name="SwarmSVM"; version="0.1-6"; sha256="09xq7jx70qjyhblzh6kc40hdr0636rqqdnbka7m6rawhd8ivp8yz"; depends=[BBmisc checkmate e1071 kernlab LiblineaR Matrix SparseM]; }; + SwimmeR = derive2 { name="SwimmeR"; version="0.2.0"; sha256="0x6vidrha9wj24ync3nyfcyzdjdq4z2yf52h4m3gr5pd3ir9pb8f"; depends=[dplyr ggplot2 magrittr pdftools purrr rvest scales stringr tibble]; }; SwissAir = derive2 { name="SwissAir"; version="1.1.5"; sha256="0lh69924vhyilgn562jqn8m7z4dq3xmdj09501sbs7hbxfaiiyly"; depends=[]; }; SyNet = derive2 { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; }; SymTS = derive2 { name="SymTS"; version="1.0"; sha256="17vhm00zd9yxl6li36bsfkm4rsizjsm93ibrzgqnkl72sqmmlwfi"; depends=[]; }; @@ -4445,10 +4486,10 @@ in with self; { SyncRNG = derive2 { name="SyncRNG"; version="1.3.0"; sha256="0sywfmmy6mq6qsxkxjc67665snn1jds01j3h7ni1200igja139g2"; depends=[]; }; SynchWave = derive2 { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; }; Synth = derive2 { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; }; - SynthTools = derive2 { name="SynthTools"; version="1.0.0"; sha256="0izsp1gcch3bb7ssq3w5na5k0nli18mcqkx757icnb32jpy9m3a8"; depends=[dplyr magrittr Rdpack]; }; + SynthTools = derive2 { name="SynthTools"; version="1.0.1"; sha256="19vasz3nnm5vgwqs6g2a5bibmk44br1bxga5zavsx938x3jw9gnd"; depends=[dplyr magrittr Rdpack]; }; T2EQ = derive2 { name="T2EQ"; version="1.1"; sha256="1skkkryw63pfx1xslia1lczb2psja6v6hcbph4isdcksb4l4pcig"; depends=[]; }; TAG = derive2 { name="TAG"; version="0.2.0"; sha256="0s4n2f9x36df1pb5p8n98926lgg9z79fka5r9xqxxsc91h35q9aw"; depends=[DiceKriging doParallel FastGP Matrix mgcv mlegp randtoolbox Rcpp RcppArmadillo]; }; - TAM = derive2 { name="TAM"; version="3.3-10"; sha256="1rkjp5x6wrk1dfspp1imvfals0wvy4w1wb8a5mhfbnilc7vgnlbq"; depends=[CDM Rcpp RcppArmadillo]; }; + TAM = derive2 { name="TAM"; version="3.4-26"; sha256="111d7qkxhwh1lfvldyh9d61pdb5vb6x8lr8n9h95ssvw07vjqvk9"; depends=[CDM Rcpp RcppArmadillo]; }; TANDEM = derive2 { name="TANDEM"; version="1.0.3"; sha256="151rm95q2naw9y58df1lr2qiadnkgfb5j9v47v41bw4iipsmlp4p"; depends=[glmnet Matrix]; }; TAQMNGR = derive2 { name="TAQMNGR"; version="2018.5-1"; sha256="0bf0sgqa53l9y2bhwg2ngiwlcgrmj0nvxchlsmcc8zin388qf4pb"; depends=[Rcpp]; }; TAR = derive2 { name="TAR"; version="1.0"; sha256="0wjh2n9x3yn9by9a6mjvkl96qy7z549g6dsqp7b4d96xwmyqxlbv"; depends=[mvtnorm]; }; @@ -4457,7 +4498,6 @@ in with self; { TBFmultinomial = derive2 { name="TBFmultinomial"; version="0.1.3"; sha256="0cd0dr8vkf0sfriaafp2x63dilxmirm0fljxm82zw77c9j5ly3kv"; depends=[nnet plotrix stringr VGAM]; }; TBSSurvival = derive2 { name="TBSSurvival"; version="1.3"; sha256="1r87qvnlvc18i12yi25lfpdb8b5p33fywi38hs2xp1y2vbvz5s9b"; depends=[BMS coda mcmc normalp R_utils Rsolnp survival]; }; TCA = derive2 { name="TCA"; version="1.1.0"; sha256="0pj052kd378x1gmg5wcbk8c0dca3c2ra65hnagljmsplv169vimy"; depends=[config data_table futile_logger glmnet gmodels Matrix matrixcalc matrixStats nloptr pbapply pracma quadprog rsvd]; }; - TCGA2STAT = derive2 { name="TCGA2STAT"; version="1.2"; sha256="15a5lh0nrdcxdwj7wj5m9rsvk1ygpp6wdjb4swilk91rb1lblikv"; depends=[CNTools XML]; }; TCGAretriever = derive2 { name="TCGAretriever"; version="1.5"; sha256="1xg1rz2h5jbpdd5axli3ripqxb0bj64yrd4y5nzr8axajiaybkj9"; depends=[httr]; }; TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.6"; sha256="15f3w6vhbqy4xzidxasjnqigxchd3jbr2kpm3gggjnkp7rzsfgaf"; depends=[httr jsonlite]; }; TDA = derive2 { name="TDA"; version="1.6.9"; sha256="023jwhh1qc2y30g42pgfaha4n4pixzwrrghxlyss4889fr66q9vw"; depends=[BH FNN igraph Rcpp RcppEigen scales]; }; @@ -4465,12 +4505,11 @@ in with self; { TDAstats = derive2 { name="TDAstats"; version="0.4.1"; sha256="1zmickqk60vm9rzy67hib835v3c45aqjk441p31vpbvhbiy58nq5"; depends=[ggplot2 Rcpp]; }; TDCor = derive2 { name="TDCor"; version="0.1-2"; sha256="18085prcwhl5w717f1f7jcqskw2jvigvjjs2l5y6106ibiam6hxx"; depends=[deSolve]; }; TDD = derive2 { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[pracma RSEIS signal]; }; - TDMR = derive2 { name="TDMR"; version="2.1"; sha256="10lx1yksz61byjcwqi9v59pqka0fs5dhrq4qjmp0i2zvn6cgh1zj"; depends=[adabag SPOT testit twiddler]; }; - TDPanalysis = derive2 { name="TDPanalysis"; version="0.99"; sha256="1kyhs4rpkm3gr55l6hrz4xcb9igk95si1m1sp175580k16n885z0"; depends=[plyr]; }; + TDMR = derive2 { name="TDMR"; version="2.2"; sha256="19ljgj5iy41m7rrawzkxkln7acydssk8zm05k3sfb483s8zygwiq"; depends=[adabag SPOT testit twiddler]; }; + TDPanalysis = derive2 { name="TDPanalysis"; version="1.0"; sha256="0kvbsgwl7b9a3hn4d3snajqmynbajd2d8lc1na0hri2cv8qm8x9h"; depends=[plyr]; }; TDboost = derive2 { name="TDboost"; version="1.2"; sha256="0sc9vby4892gm5b5h8gbdl4misqvgbkfp8fms53dk83malxkw1zx"; depends=[lattice]; }; TE = derive2 { name="TE"; version="0.3-0"; sha256="15530a5qjlh74c1qji76j25mm4c59gifp34y066f8j21f70rahfs"; depends=[MASS rainbow]; }; TEAM = derive2 { name="TEAM"; version="0.1.0"; sha256="1yj7fw935rr7fh7h2p4ra8d3ynz5c6b30fqzm1djgav1k84wcin2"; depends=[ggplot2 ks plyr]; }; - TEEReg = derive2 { name="TEEReg"; version="1.1"; sha256="0v5qz3vvmcm3fh16kjb05j1r0yj23r7hrxf2www20ng3dmga5q0f"; depends=[]; }; TELP = derive2 { name="TELP"; version="1.0"; sha256="0wzm3dz0489ha7dd6lkashvvjydck9jw2pavlx9plpksvzr4q9ph"; depends=[arules arulesViz ggplot2 gridExtra RColorBrewer tcltk2 tm wordcloud]; }; TEQR = derive2 { name="TEQR"; version="6.0-0"; sha256="112znsz36jqh3krnr4j05xl70picih8qpmqky2gllgyr8nky39fr"; depends=[]; }; TERAplusB = derive2 { name="TERAplusB"; version="1.0"; sha256="0mshx615awcf2arm39mgw2gzgpyn7a3f767484g7z4nqqlikwpgc"; depends=[]; }; @@ -4489,7 +4528,7 @@ in with self; { TLMoments = derive2 { name="TLMoments"; version="0.7.5"; sha256="0v86rs7f63f59ng9m6lnjgv52czg1xk814flnhz153fjy7y2pidl"; depends=[ggplot2 hypergeo Rcpp]; }; TLdating = derive2 { name="TLdating"; version="0.1.3"; sha256="12lmakk1zd6wqh1318pnl14i7km2hynjn4ymchfjr2bwmp45c1ra"; depends=[gplots Luminescence]; }; TMB = derive2 { name="TMB"; version="1.7.16"; sha256="0lly12hdi99iklwr0vg9xkyhi038w4gncbf895qcwbndmqp0lx44"; depends=[Matrix RcppEigen]; }; - TMDb = derive2 { name="TMDb"; version="1.0"; sha256="0bbcmsv7b3vvskhdjww03gbcgql44vsvyjz2fajy9w2vgkr6ga90"; depends=[httr jsonlite]; }; + TMDb = derive2 { name="TMDb"; version="1.1"; sha256="062n9mi2f9g2xxpnymja57xnpl855d8mwyfwci7a8cq4c7w7avj7"; depends=[httr jsonlite stringi]; }; TNC = derive2 { name="TNC"; version="0.1.0"; sha256="0639wvylmk9mapvmz79ij65g1phv3ylc683awi4pgaf9yfwlmjkn"; depends=[]; }; TOC = derive2 { name="TOC"; version="0.0-4"; sha256="1c16d4wrzir6v3c323sck6r9yz6mv1a70xamlj5ha1ydmfixcza9"; depends=[bit raster rgdal]; }; TOHM = derive2 { name="TOHM"; version="1.3"; sha256="08qwqryy9vdh906k3rhq4csysxlxgki4jjr505shfrxjvnlc662i"; depends=[EQL igraph Matrix nloptr Rmpfr]; }; @@ -4498,13 +4537,12 @@ in with self; { TPD = derive2 { name="TPD"; version="1.1.0"; sha256="1ppj6ppi0lhlz079ygjnwx1l5f36bsi8zax23ssr1w6h4csw748m"; depends=[ggplot2 gridExtra ks mvtnorm]; }; TPEA = derive2 { name="TPEA"; version="3.1.0"; sha256="1yyc3q4dyf4d8m7wi851dnxf3xnvvfnvj28kl8z8py4r4jsb2hfy"; depends=[foreach igraph Matrix MESS RCurl XML]; }; TPES = derive2 { name="TPES"; version="1.0.0"; sha256="00g1limcappjrly93x7xb1llrgaxivmiky3kw40w2fs0303ha3d7"; depends=[]; }; - TPMplt = derive2 { name="TPMplt"; version="0.1.3"; sha256="0y2adbswgd8z3lzy9hi6qx7hm9ns2ky269q83y50ykyg2ms5qjhg"; depends=[directlabels dlm e1071 ggplot2 RColorBrewer rgl rowr VBTree]; }; TPmsm = derive2 { name="TPmsm"; version="1.2.2"; sha256="1ibb3ayd808x3a562qldaww7czmfq1cd1j4g4ch5k7q38jw5x835"; depends=[KernSmooth]; }; TR8 = derive2 { name="TR8"; version="0.9.20"; sha256="01xkjl269q1qlpm8cxpnb64czcv2xhrjjwp3brhxywx07za1q8lq"; depends=[gWidgets gWidgetstcltk plyr rappdirs RCurl readxl reshape taxize XML]; }; TRADER = derive2 { name="TRADER"; version="1.2-3"; sha256="1w9m2b866dyj82s118m64q8j9a1chpq2km2pnn9mfwwj8sivgdgn"; depends=[dplR]; }; - TRAMPR = derive2 { name="TRAMPR"; version="1.0-8"; sha256="0nxp8wdr7yx94fk14m0r4dh2jxcvjqp6lg02092zww5y7jlbf4ds"; depends=[]; }; + TRAMPR = derive2 { name="TRAMPR"; version="1.0-9"; sha256="16fbzp6b6y25k9h7m4qpmbgj10przywm2rh8kvw8a8p0xkskc9k5"; depends=[]; }; TRD = derive2 { name="TRD"; version="1.1"; sha256="0bhn4bcrq39f5dgqc74jqsfhs1iqfxhawacqqyncbk2372013nqp"; depends=[Rlab]; }; - TRES = derive2 { name="TRES"; version="1.1.0"; sha256="0brj8wszgf9fkqfa3v0qg5wg9wi1b8k2ddixv3p29cdb57gsacdw"; depends=[ManifoldOptim MASS pracma rTensor]; }; + TRES = derive2 { name="TRES"; version="1.1.1"; sha256="0fx52911sjqlgkj3ad8frj3xnd2jlzmzcian9qj3hkmpyjx65648"; depends=[ManifoldOptim MASS pracma rTensor]; }; TRSbook = derive2 { name="TRSbook"; version="1.0.2"; sha256="0lj20i6gybinc196nzjfi6ayzmm970s9vp43lj60v96g5dl7qv1b"; depends=[gdata IndependenceTests RColorBrewer xtable]; }; TSA = derive2 { name="TSA"; version="1.2"; sha256="0gjfqibwdznz0nka95k4fjm935svxjpnqfywwz403crn2lh30h6q"; depends=[leaps locfit mgcv]; }; TSCS = derive2 { name="TSCS"; version="0.1.1"; sha256="0dllaw69rl26hgqac5q66k13gfmnxhn3wf0j8nx5xvi7yclzc3ay"; depends=[ggplot2 rgl tseries]; }; @@ -4523,7 +4561,7 @@ in with self; { TSMSN = derive2 { name="TSMSN"; version="0.0.1"; sha256="0zy9r6i1p161h1zh0vnz1npsh48q3nc2c5hcgzvf78nfznnn6wg1"; depends=[mvtnorm numDeriv progress sn]; }; TSMining = derive2 { name="TSMining"; version="1.0"; sha256="1n32acagffiw31pr485ly3phx33zw7vj009bvw4lbqpixa1pszj2"; depends=[foreach ggplot2 plyr reshape2]; }; TSMySQL = derive2 { name="TSMySQL"; version="2015.4-1"; sha256="1gdda7li320ba9qfxfl5c4cwl2ln5jdbvid98cryj175g0nbmx7b"; depends=[DBI RMySQL tframe TSdbi TSsql]; }; - TSP = derive2 { name="TSP"; version="1.1-8"; sha256="0g44f2a4m7rfx6y51cdbr6vcmmpbwgyzpvfjksq3lb7gcpbr7xrx"; depends=[foreach]; }; + TSP = derive2 { name="TSP"; version="1.1-10"; sha256="0z1v6m0vqjzxc4az3zyjaayygx0jr3mdmc56jjd421iqh0b9z5s4"; depends=[foreach]; }; TSPostgreSQL = derive2 { name="TSPostgreSQL"; version="2015.4-1"; sha256="11201zpbrva6gwc9hg8pynadrps6d8pb3syzba9nyjpv2ck6x3ry"; depends=[DBI RPostgreSQL tframe tframePlus TSdbi TSsql]; }; TSPred = derive2 { name="TSPred"; version="4.0"; sha256="0zjx33llkvvj7m4z16crybw0y6s6zvlblxn2in3j7v9cv0ihhsa8"; depends=[EMD forecast KFAS MuMIn vars wavelets]; }; TSS_RESTREND = derive2 { name="TSS.RESTREND"; version="0.2.13"; sha256="0wbwkhc1b5dql87sj1441cknidpgwcflwlid2yj6d64a6wsipn1l"; depends=[bfast broom ggplot2 RcppRoll strucchange]; }; @@ -4541,8 +4579,7 @@ in with self; { TSfame = derive2 { name="TSfame"; version="2015.4-1"; sha256="197v123mkxr7qlksnb5iadms5zbc8xqbpgr2cspb8x1krz6phssz"; depends=[DBI fame tframe tframePlus tis TSdbi]; }; TSmisc = derive2 { name="TSmisc"; version="2016.8-1"; sha256="0xvn6qlvvdc65l356r8b5ppddjd35k9fc4b5w5wn3j5wzxfllbk1"; depends=[DBI gdata quantmod tframe tframePlus TSdbi tseries zoo]; }; TSodbc = derive2 { name="TSodbc"; version="2015.4-1"; sha256="0m6r97gs483jg6jlmfkbzxg3jvf6q140kvpidjccj224zb1sqlcq"; depends=[DBI RODBC tframe tframePlus TSdbi TSsql]; }; - TSplotly = derive2 { name="TSplotly"; version="1.1.1"; sha256="0amy8lmxl4mid6f5jhd0mcaqwpr8smxj0wa5561md15ix4qnvwmi"; depends=[dcemriS4 forecast ggplot2 plotly prettydoc zoo]; }; - TSrepr = derive2 { name="TSrepr"; version="1.0.3"; sha256="1sbspq2pyyrc9zh2dx8nq3yv58rwziv2a2j1jfgkz8v9zqrsbhqf"; depends=[dtt MASS mgcv quantreg Rcpp wavelets]; }; + TSrepr = derive2 { name="TSrepr"; version="1.0.4"; sha256="1dskk23465gw07bnhq0rf3gig4v69z2w2yzh9wdyfkw0i7vk876g"; depends=[dtt MASS mgcv quantreg Rcpp wavelets]; }; TSsdmx = derive2 { name="TSsdmx"; version="2016.8-1"; sha256="06h1iwgshiq4bvly5l1nrddrh2knc82z2aqxh8ls9ipbs7qjsvaf"; depends=[DBI rJava RJSDMX tframe tframePlus TSdbi]; }; TSsmoothing = derive2 { name="TSsmoothing"; version="0.1.0"; sha256="1m4y6hfw5ghqmvbnha05w6k0abbr08xdcahmh897g68b06vcrjsl"; depends=[ggplot2 gridExtra MASS Matrix]; }; TSsql = derive2 { name="TSsql"; version="2017.4-1"; sha256="0f71q6gqfx4r3ghsmr572cvkpmf2xf7kipf10ii99z1y23dxmsdn"; depends=[DBI tframe tframePlus TSdbi zoo]; }; @@ -4553,9 +4590,9 @@ in with self; { TTS = derive2 { name="TTS"; version="1.0"; sha256="0dhxj474dqjxqg0fc2dcx8p5hrjn9xfkn0rjn2vz3js92fa9ik9h"; depends=[mgcv sfsmisc]; }; TTmoment = derive2 { name="TTmoment"; version="1.0"; sha256="0a4rdb4fk1mqnvvz0r15kni0g5vcj4xkkcwwv7c2gxc94xh5i5ih"; depends=[mvtnorm]; }; TULIP = derive2 { name="TULIP"; version="1.0"; sha256="0v0qnhlgj31mdl8xhhcbdlnmfcfn2scpr0bf2jxkxpyxiavqdfxy"; depends=[glmnet MASS Matrix tensr]; }; - TUWmodel = derive2 { name="TUWmodel"; version="1.0-2"; sha256="1b07isi7s22q65h9yabrz515nr4vxp2ynpl37l2lsf4mcpjjzg4x"; depends=[]; }; - TVsMiss = derive2 { name="TVsMiss"; version="0.1.1"; sha256="1lvswq3syp2mfcf0higmyg5k5qhg1q6jaz8g75az3xajn4jylm0k"; depends=[glmnet Rcpp]; }; - Taba = derive2 { name="Taba"; version="0.1.0"; sha256="0pqmz7gyf719s5b7mjmmmxr5il3pzgsymibxir6ljpgdsdgbgi5s"; depends=[robustbase]; }; + TUWmodel = derive2 { name="TUWmodel"; version="1.1-1"; sha256="1am3ywcj1rqgz5i2g9c6d6fgiv8b2nabllfy84xx1n18pin7mfbk"; depends=[]; }; + TVMM = derive2 { name="TVMM"; version="2.0"; sha256="1ijrni80i4d4mli5c8rf9jmazs3hanhvhhk20fjgalk94zvbp7md"; depends=[MASS robustbase]; }; + Taba = derive2 { name="Taba"; version="0.1.1"; sha256="0dm2wi8k8gligb8j31xr6n95nplq669s7brn9xfnxxmmrmjlvlrl"; depends=[robustbase]; }; Table1Heatmap = derive2 { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; }; TableHC = derive2 { name="TableHC"; version="0.1.2"; sha256="1il86xjc4h1sdq3gpi4s7xbkcgzpgfqy5ivzjdkbq45d06pssk21"; depends=[]; }; TableMonster = derive2 { name="TableMonster"; version="1.7"; sha256="1xa4bkcpzhm50dwbpya346swjjfw46n2x26xm30p8gppilg5c0lb"; depends=[xtable]; }; @@ -4574,23 +4611,23 @@ in with self; { TcGSA = derive2 { name="TcGSA"; version="0.12.7"; sha256="0l28sldpavyvhm9hab9gb7i7rmlxpj7ivffi6xx8lg7qjn6d21v5"; depends=[cluster cowplot ggplot2 GSA gtools lme4 multtest reshape2 stringr]; }; Tcomp = derive2 { name="Tcomp"; version="1.0.1"; sha256="1k0gsf3yr5n9zc2yi6szxm6s7bf61lz4fx8m3v48jlp5w900prwb"; depends=[forecast Mcomp]; }; TeXCheckR = derive2 { name="TeXCheckR"; version="0.6.0"; sha256="1qrzslcipg3j1317dhizxhcxyx2dpx7jh91vkms10wgc6vpqgrw4"; depends=[clisymbols crayon data_table fastmatch hunspell hutils magrittr rstudioapi zoo]; }; - TeachBayes = derive2 { name="TeachBayes"; version="1.0"; sha256="1mfhlkm7wp2i4hvc63xzfyw3q4z1xhlbi933pkqkbrhih94z4rz7"; depends=[dplyr ggplot2 gridExtra LearnBayes shiny]; }; TeachNet = derive2 { name="TeachNet"; version="0.7.1"; sha256="12kkpr96mq0jr07k7ivcmwhrfgas1qrfqfhxa4gm7vv3vkjn0gs9"; depends=[]; }; - TeachingDemos = derive2 { name="TeachingDemos"; version="2.10"; sha256="016pivvy8gzz8f3clnr5dg488rb1lf0l5s00c3v34gm1dgiw5x1f"; depends=[]; }; - TeachingSampling = derive2 { name="TeachingSampling"; version="4.0.1"; sha256="1hh56j1l8wyglnmy92cvh0awcyfjzk6iwgwnhdbc2infjq8fr1lg"; depends=[dplyr magrittr]; }; + TeachingDemos = derive2 { name="TeachingDemos"; version="2.12"; sha256="0i46d7269zhvr3c2a2w1lb3jnhc1cgwhcppqdmnl1ymgw5f40x9y"; depends=[]; }; + TeachingSampling = derive2 { name="TeachingSampling"; version="4.1.1"; sha256="02nywwmv0r8md00kra7wxwzvm6p51l4p8la51bxh8sqq8ajsdswh"; depends=[dplyr magrittr]; }; Tejapi = derive2 { name="Tejapi"; version="1.0.1"; sha256="1v80yjbik6shqad2nvi374dpzs9bjv9ah26agy0khmwnbz6029rk"; depends=[httr jsonlite]; }; TempCont = derive2 { name="TempCont"; version="0.1.0"; sha256="1pl0czrpw74zfm5vycyl0h8hc3n5whf4g6a2759a22384gk5fq7k"; depends=[nlme]; }; - TempleMetrics = derive2 { name="TempleMetrics"; version="1.2.0"; sha256="0g8a799grsjqyq55pnlgixyq2qxhvl5k01jcjwc08q54w2dg0xf0"; depends=[BMisc pbapply]; }; - Temporal = derive2 { name="Temporal"; version="0.1.1"; sha256="0x001apiph67cyh2ckx2k9mi6jb86agnmfvn94i27q9lpy4cn1sh"; depends=[expint numDeriv plyr Rcpp RcppEigen]; }; - Ternary = derive2 { name="Ternary"; version="1.1.3"; sha256="1hpm6ybksyizzkpig88jczj58kzgc82dmm22wy61hqhlbs4pmj1z"; depends=[viridisLite]; }; + Temporal = derive2 { name="Temporal"; version="0.2.0"; sha256="114ld41l2dipw7cpyh7fy3n332v1dkiqvdng6vkk9wm6jmda7wya"; depends=[expint numDeriv plyr Rcpp RcppArmadillo]; }; + Tendril = derive2 { name="Tendril"; version="2.0.4"; sha256="1wvczfklsccs8jd081vb6d6h7i35lhf6na925fm7wq8ars0b23wd"; depends=[dplyr ggplot2 magrittr plotly plyr reshape2 scales]; }; + Ternary = derive2 { name="Ternary"; version="1.1.4"; sha256="0js2ylif6171f1548d05lfw4kdlqkmqa6a510x6i9px93bvvkhsq"; depends=[viridisLite]; }; TestCor = derive2 { name="TestCor"; version="0.0.1.1"; sha256="1rxw5rz687ax3zlpaxb9bak6dd2jdl49h3fdzbz7r8vycwanwydq"; depends=[MASS Rcpp]; }; TestDataImputation = derive2 { name="TestDataImputation"; version="1.1"; sha256="10b1g9m2s6nbs8lrpcx3s1jf0fmqyd07mg3vx1pnma8r3vwy1yh7"; depends=[Amelia mice]; }; - TestDesign = derive2 { name="TestDesign"; version="1.0.1"; sha256="0d4j4ck4w2hhdmbp0cjp483xxgw0dhf226mbrkhfaimr2nddfbpl"; depends=[crayon foreach logitnorm lpsymphony Matrix Rcpp Rdpack]; }; - TestDimorph = derive2 { name="TestDimorph"; version="0.2.9"; sha256="0f2np7rqlcqxj2x1lwx6fryvdizan21j9962i51yi9b6pvkbpn6h"; depends=[caret corrplot DescTools dplyr ggplot2 klaR MASS mda multcompView plotROC plyr purrr randomForest reshape2 Rfast rlang stringr tibble tidyr tmvtnorm truncnorm]; }; + TestDesign = derive2 { name="TestDesign"; version="1.0.2"; sha256="1vz0bbbk74g3i4dlsd972n41mf0dhd74f9p2n47mgs3fh1r598zd"; depends=[crayon foreach logitnorm lpSolve Matrix Rcpp Rdpack]; }; + TestDimorph = derive2 { name="TestDimorph"; version="0.3.1"; sha256="163swi09d3nhgp4zkic7gmh302955jm1qr0dv9l3ciyayrc8z842"; depends=[caret corrplot DescTools dplyr ggplot2 klaR MASS multcompView plotROC plyr purrr randomForest reshape2 Rfast rlang stringr tibble tidyr tmvtnorm truncnorm]; }; TestFunctions = derive2 { name="TestFunctions"; version="0.2.0"; sha256="018nkz8r6vqahrzq3d588i3ffb1bmd1pdk87j4ivcdsx99mq15sn"; depends=[]; }; TestScorer = derive2 { name="TestScorer"; version="1.7.2"; sha256="006c3g3gx55mfr93srldwvgz5vm6nkr3f57yi4qg6krn0d32865f"; depends=[]; }; TestingSimilarity = derive2 { name="TestingSimilarity"; version="1.1"; sha256="1iq0wh13rl6rby44ql4d286r1akzwmbpsvnq9p8lkl8709z0d34w"; depends=[alabama DoseFinding lattice]; }; TexExamRandomizer = derive2 { name="TexExamRandomizer"; version="1.2.3"; sha256="0l0vpx4rkib2m8hwhwy9j8pqyf7gpb9qg8wpnh3238snwpadgy3a"; depends=[assertthat jsonlite Rcpp stringr]; }; + TexMix = derive2 { name="TexMix"; version="0.5.3"; sha256="0qp7rlw4y2kw6bvh3rwy33p1g404q4ar1gg8ycdapwsyckq76nhn"; depends=[classInt Formula maptools RColorBrewer sp]; }; TextForecast = derive2 { name="TextForecast"; version="0.1.2"; sha256="0yj2m22imzllz07wx04nar2mfpyl06jiq0ya1nwgaq74kaiym42p"; depends=[doParallel dplyr forcats ggplot2 glmnet Matrix pdftools plyr pracma RColorBrewer tidyr tidytext tm udpipe wordcloud]; }; ThankYouStars = derive2 { name="ThankYouStars"; version="0.2.0"; sha256="0r77ns3102wj1wvrfsa06l427imxyfhigpbs36cdxl2j87qrjzl6"; depends=[httr jsonlite]; }; ThermIndex = derive2 { name="ThermIndex"; version="0.2.0"; sha256="0s9d55577dq61qixwwfwmqc2k2c8my00j2ng97ng42cw0jc7aylm"; depends=[]; }; @@ -4599,8 +4636,9 @@ in with self; { ThreeArmedTrials = derive2 { name="ThreeArmedTrials"; version="1.0-3"; sha256="06jhgl1fzvkvnhrjs4xcyw6yymwl499rw9xnfwpx44dzxi7nynxj"; depends=[MASS numDeriv]; }; ThreeGroups = derive2 { name="ThreeGroups"; version="0.21"; sha256="0hipxa45v9ysb2qbk33kjycnvqar7bff1ajxd6fzhpc3jc9hflw4"; depends=[]; }; ThreeWay = derive2 { name="ThreeWay"; version="1.1.3"; sha256="17yl8zq029wiy3c0f4ssljx85dnm9n862wj2d24w7p0lxlvarmz6"; depends=[]; }; + ThreeWiseMonkeys = derive2 { name="ThreeWiseMonkeys"; version="0.1.0"; sha256="1qdb3m15q0gg8dk2znc2syy2jdqsp2893a7ilfa8rg3r2vps86yg"; depends=[stringr tuneR]; }; Thresher = derive2 { name="Thresher"; version="1.1.3"; sha256="16zf5cwc2c5j61xcrqsycwrsc162spyqgk9mac7n37mymn5agbwp"; depends=[ade4 ClassDiscovery colorspace MASS movMF oompaBase PCDimension]; }; - ThresholdROC = derive2 { name="ThresholdROC"; version="2.8"; sha256="0w5sxi6fgy3w1qj129g9z83822i7qx5s4js7dvzcdp2yfchj7pb3"; depends=[MASS numDeriv pROC]; }; + ThresholdROC = derive2 { name="ThresholdROC"; version="2.8.2"; sha256="1fsxf43syp371149wmbxjc13rrai69gc61xdlgrqplv4v0nqqk73"; depends=[MASS numDeriv pROC]; }; TickExec = derive2 { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; }; TiddlyWikiR = derive2 { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; }; TideCurves = derive2 { name="TideCurves"; version="0.0.4"; sha256="1i5qm6wwm6m0xrmr6dvk3pn6apxxqw9hznv8vypzwnky7bizkl90"; depends=[chron data_table fields]; }; @@ -4614,7 +4652,6 @@ in with self; { TimeWarp = derive2 { name="TimeWarp"; version="1.0.15"; sha256="1v6f6d1h9dc8npdy0ph5hhc4jjkzh8kac48lz4ahgngi9n0xwql9"; depends=[]; }; Tinflex = derive2 { name="Tinflex"; version="1.5"; sha256="15nbzr3q8rfrqywvlqi48r30fgq4lhlhp1fbnf12j49k6q2aixb1"; depends=[]; }; TipDatingBeast = derive2 { name="TipDatingBeast"; version="1.1-0"; sha256="07lw6jnr76qrxwrwv90hi5ih2xf6g4sz4hfapk5vf1y3ayfskkl0"; depends=[DescTools mclust TeachingDemos]; }; - TippingPoint = derive2 { name="TippingPoint"; version="1.1.0"; sha256="1f5bfag892yk47r1pw2rlvqz9qnkaz8radprpxh0q0knviw3f9fp"; depends=[bayesSurv ggplot2 RColorBrewer reshape2]; }; Tlasso = derive2 { name="Tlasso"; version="1.0.1"; sha256="0flx4l7q3qndp77349ayfrszyim7mvs7yfvv3j9a1mhf3gdn9j14"; depends=[expm huge igraph rTensor]; }; TmCalculator = derive2 { name="TmCalculator"; version="1.0.0"; sha256="067xcpik00r6cdb4q1z09dgdqacyxqg21xn9nzvqfnp6s3nw6a9s"; depends=[]; }; Tmisc = derive2 { name="Tmisc"; version="0.1.22"; sha256="0h25k5xs8wnyzhl8alzlwircdl1hmclljjpcapnfg7na4yskzsaq"; depends=[dplyr rstudioapi tibble]; }; @@ -4625,11 +4662,10 @@ in with self; { TopicScore = derive2 { name="TopicScore"; version="0.0.1"; sha256="1x6s3yn25rj8mbd25yi7f2rz0nwg8n0l1vs6r250kyjb17d2javm"; depends=[combinat Matrix quadprog RSpectra slam]; }; TotalCopheneticIndex = derive2 { name="TotalCopheneticIndex"; version="1.0.1"; sha256="0yc21vs10rzmwx0z6d0gyyncr25835vb7wpn392csc5big6d73xc"; depends=[memoise]; }; TouRnament = derive2 { name="TouRnament"; version="0.2.5"; sha256="09i0frzzxi5ymjlvh81rmisxh35amrvhxbkjq5351fhlpf1n977z"; depends=[]; }; - ToxicoGx = derive2 { name="ToxicoGx"; version="0.1.1"; sha256="06xkz08ppq99s7zrjpkb463rqj2vn7abgm50knac5hi5ixmirdlb"; depends=[Biobase caTools CoreGx data_table downloader dplyr ggplot2 magrittr RColorBrewer reshape2 scales SummarizedExperiment tibble tidyr]; }; - TraMineR = derive2 { name="TraMineR"; version="2.0-14"; sha256="15lcyy9pwm5gfwihb6nkcjjhkl4jan12hfqrwa6rlzzv9z5304j5"; depends=[boot cluster Hmisc RColorBrewer]; }; - TraMineRextras = derive2 { name="TraMineRextras"; version="0.4.6"; sha256="135s6aqkx18c364y9z0an0sbnwkgb2yrzxim3nd5khnbbnqdb5z2"; depends=[cluster RColorBrewer survival TraMineR]; }; + TraMineR = derive2 { name="TraMineR"; version="2.2-0"; sha256="1xnhj5348kp7kg1cqiqm7s4v8yb4n7gxn17xg5qnnypca58szbpf"; depends=[boot cluster Hmisc RColorBrewer]; }; + TraMineRextras = derive2 { name="TraMineRextras"; version="0.4.7"; sha256="0lls9683jq0ws62sqfj3zm1v2v3ymn0flpkv3iwqb5i84mj63aq6"; depends=[cluster RColorBrewer survival TraMineR]; }; TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.2"; sha256="1kpdiwwzxsdwv5255xlvcnxvnp39ky0aws41g1l5i7cpbv88kca5"; depends=[fields RColorBrewer]; }; - Trading = derive2 { name="Trading"; version="1.2"; sha256="0wlwpf1iygcs0cy7ms57b1bbp8f3s193bvc6fcm31ih5ph8pr48i"; depends=[]; }; + Trading = derive2 { name="Trading"; version="2.0"; sha256="1n7m7kd539hpii2xvzhsg4zw4bgb63mh0k99fwk588wf19i0cywk"; depends=[PerformanceAnalytics reticulate]; }; TrafficBDE = derive2 { name="TrafficBDE"; version="0.1.0"; sha256="1lnh9lbjxaradivnd1dkd2szggjh2r4v7klpyxb862dxsmdxxrqw"; depends=[caret data_table dplyr lubridate neuralnet RCurl zoo]; }; Traitspace = derive2 { name="Traitspace"; version="1.1"; sha256="1wlrpnzb39vgkqy0ynbwlgrkkqgklrk6pw7f8p7p2i132qk2c291"; depends=[mclust permute]; }; TrajDataMining = derive2 { name="TrajDataMining"; version="0.1.6"; sha256="1n5qcyc1kb8rdrqaji7pp63l2gyr6jim8spm8ydb4lnqfcnrin9g"; depends=[geosphere rgdal RPostgreSQL sp spacetime trajectories xts]; }; @@ -4640,22 +4676,21 @@ in with self; { TreeDep = derive2 { name="TreeDep"; version="0.1.3"; sha256="0ja2hp9sxzybac6dqdsns5q1rj12swl240znsnsffg9mkvzhq6rl"; depends=[ggplot2 lubridate]; }; TreeLS = derive2 { name="TreeLS"; version="1.0"; sha256="0iqayrwwzd308karhs2pjy2sdp4xg6ncsnah7f68liia1znnld5y"; depends=[BH data_table lidR magrittr raster Rcpp RcppEigen rgl]; }; TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; }; - TreeSearch = derive2 { name="TreeSearch"; version="0.3.2"; sha256="1h7s3i65n5j7mk2qxqyqy0h379jlszywh8hfmd93pn1yh01v3sz3"; depends=[ape clue colorspace memoise phangorn R_cache Rcpp Rdpack]; }; + TreeSearch = derive2 { name="TreeSearch"; version="0.4.0"; sha256="1mlvm0j2farxwyivjsx1994bh8l9qb4cx65096fi5zqzi5ybqigd"; depends=[ape phangorn R_cache Rdpack TreeTools]; }; TreeSim = derive2 { name="TreeSim"; version="2.4"; sha256="0nmzx2723n1f5lr951zz2ih2gnpfim5qzihlayhpf181z1qijv93"; depends=[ape geiger]; }; - TreeSimGM = derive2 { name="TreeSimGM"; version="2.3"; sha256="0qwqvmmdn290llz5hmmx2q24jjmd1bxssrslzv31kzi1yq5h6w0b"; depends=[ape TreeSim]; }; - TreeTools = derive2 { name="TreeTools"; version="0.1.3"; sha256="084kizkldrqj0q7gwl6v7r2v1pazd78qdxwjhnadllcxqid54ay7"; depends=[ape colorspace phangorn R_cache Rcpp]; }; - TrendInTrend = derive2 { name="TrendInTrend"; version="1.1.2"; sha256="1kdjrzv2s5vpyg1lx6qkxj3dyi84qwhrvz17mx731f9pp70cz29j"; depends=[pROC rms]; }; + TreeSimGM = derive2 { name="TreeSimGM"; version="2.5"; sha256="125c9rim272h0dfyygmmijz8dcnch3g9wy1ngki77dyrmdl77yfx"; depends=[ape TreeSim]; }; + TreeTools = derive2 { name="TreeTools"; version="0.1.4"; sha256="103ymrgwq41f2h5v31brxg4cjrqk82wqx0hhasrcpf1vq37dc512"; depends=[ape colorspace phangorn R_cache Rcpp]; }; + TrendInTrend = derive2 { name="TrendInTrend"; version="1.1.3"; sha256="0ijkijyhxhjc7202qssa9wnrmwgv4miv5n8jbml4qqj80kcsbdwp"; depends=[nleqslv pracma pROC rms]; }; TrendSLR = derive2 { name="TrendSLR"; version="1.0"; sha256="1x8j2dg3m7b22gva33y4s318a41wl60sz93y868z4j65hp13jb5k"; depends=[changepoint forecast imputeTS plyr Rssa tseries zoo]; }; TriMatch = derive2 { name="TriMatch"; version="0.9.9"; sha256="17v8hdm594i9qs5hvrzb1k94wrzvx07479rmvbk4314fim27mabg"; depends=[ez ggplot2 gridExtra PSAgraphics psych randomForest reshape2 scales]; }; TriadSim = derive2 { name="TriadSim"; version="0.1.1"; sha256="0m14k512b7q09zx51v2kxa8q9pk2i179w6ckl6jxj2acc860xw3k"; depends=[doParallel foreach snpStats]; }; TrialSize = derive2 { name="TrialSize"; version="1.3"; sha256="1hikhw2l7d3c7cg4p7zzrgdwhy9g4rv06znpw5mc6kwinyakp75q"; depends=[]; }; TrioSGL = derive2 { name="TrioSGL"; version="1.1.0"; sha256="0xzyv1vppw0v1xjpf83nnv1sx1xy7197ay6l7dzvr0vllappdam9"; depends=[]; }; TripleR = derive2 { name="TripleR"; version="1.5.3"; sha256="13s1vlmr4sqa2sq2fbcld86bh3g73yb204aawbks11rjblwzvb0h"; depends=[ggplot2 plyr reshape2]; }; - TropFishR = derive2 { name="TropFishR"; version="1.6.1"; sha256="06793rgidq1hdm3jwg1fxpglf5vh7w3xbk4hzj1pgw04na464ibv"; depends=[doParallel GA GenSA Hmisc MASS msm propagate reshape2]; }; + TropFishR = derive2 { name="TropFishR"; version="1.6.2"; sha256="1mmb573gf82rxsvrjal4iy5f5gjhjaws6kcabnhhp6cn5ainl64r"; depends=[doParallel GA GenSA Hmisc MASS msm propagate reshape2]; }; TruncatedNormal = derive2 { name="TruncatedNormal"; version="2.1"; sha256="13aw1lvfq8mz91fqy65zs5aps231m9mq5v0r82c2ps72jaa7mcpw"; depends=[nleqslv randtoolbox Rcpp RcppArmadillo]; }; Tsphere = derive2 { name="Tsphere"; version="1.0"; sha256="0xgxw2hfj40k5s0b54dcmz7savl8wy4midmmgc7lq4pyb8vd58xx"; depends=[glasso rms]; }; TukeyC = derive2 { name="TukeyC"; version="1.3-3"; sha256="0bdnfr44hk4c1yh7i9ya95gwbwnplj3hf0k0pl1wm4ghiav39vcq"; depends=[doBy]; }; - TukeyRegion = derive2 { name="TukeyRegion"; version="0.1.2"; sha256="03lik9vkah3hjhn0l4ci95v2h4q8mnziq006idipn69l4gmnddxl"; depends=[bfp BH ddalpha MASS Rcpp rgl Rglpk]; }; TunePareto = derive2 { name="TunePareto"; version="2.5"; sha256="0v1ylh4m5s80zp346pxxlvhm5070w83mlzfxjyp4n000c8r2nkf4"; depends=[]; }; TurtleGraphics = derive2 { name="TurtleGraphics"; version="1.0-8"; sha256="0h77pj7rs3lrqi1y2dm1cbrmj13mjpq6y5nw8bcq0s2kbnkfw67l"; depends=[]; }; Tushare = derive2 { name="Tushare"; version="0.1.3"; sha256="12aabkwlifc82yiym3yijpfpjhmhfwpw8mz4fb11qm6n4igr1yhg"; depends=[data_table forecast httr tidyverse]; }; @@ -4668,11 +4703,11 @@ in with self; { UBL = derive2 { name="UBL"; version="0.0.6"; sha256="0238irg7r3g248h4x4bdb308wvfqq99hwykywf4k2bssdd25kwjk"; depends=[automap gstat MBA randomForest sp]; }; UCR_ColumnNames = derive2 { name="UCR.ColumnNames"; version="0.1.0"; sha256="1nwwq93f60r9aik51l7mzckg81f81nz5kgzynyzp5sm4y2wmpzwn"; depends=[]; }; UCSCXenaShiny = derive2 { name="UCSCXenaShiny"; version="0.4.0"; sha256="1m67ahh2k0mc8215nnb32r8nf9niax7y5nn3qpwg1fcav7g9ns66"; depends=[dplyr DT ggplot2 ggpubr magrittr plotly RColorBrewer shiny shinyBS shinyjs shinythemes shinyWidgets tibble UCSCXenaTools zip]; }; - UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.2.10"; sha256="10aansvqf2abgppk7mx9nr7ingy994qci59ikr8rv1y2hnfar2l2"; depends=[dplyr httr jsonlite magrittr readr rlang]; }; + UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.3.1"; sha256="1s4mkl9bf4lgqlfb5rjdk3fas9dsvqd5sgypw6jl2dbdf40krza8"; depends=[dplyr httr jsonlite magrittr readr rlang]; }; UKgrid = derive2 { name="UKgrid"; version="0.1.2"; sha256="135lvzaw4gjnc40aw28706fhiz7p06l1jhw830iyg03w2v4j0ar0"; depends=[data_table dplyr lubridate magrittr tsibble xts zoo]; }; UNCLES = derive2 { name="UNCLES"; version="2.0"; sha256="0c61sm09dh0yfrjrjjnizg7qrf8xgc1zdldwhjh64kq8k8g5wa69"; depends=[class kohonen pdist]; }; UNF = derive2 { name="UNF"; version="2.0.6"; sha256="0sr740dhfp7z9wvhajww43g5gz79x5y5dbflw5a813jgmiqm1jyq"; depends=[base64enc digest]; }; - UNPaC = derive2 { name="UNPaC"; version="1.0.0"; sha256="0mm5fqc5rdf24xw5kkh54nc3a0vp4vigkhl8wj14nyiw4xzi67lr"; depends=[glasso]; }; + UNPaC = derive2 { name="UNPaC"; version="1.1.0"; sha256="12w6vjvkzivnqa6jd75dwr8h8d8xbc2519pqnqw9fk3yanqzx9rk"; depends=[huge PDSCE]; }; UPMASK = derive2 { name="UPMASK"; version="1.2"; sha256="160rsb0nbndf61khcs3s8xv9nj7ln8zl6l11157ywdcjqd2q5qnq"; depends=[DBI dimRed loe MASS RSQLite]; }; UPSvarApprox = derive2 { name="UPSvarApprox"; version="0.1.1"; sha256="1lm3xzj70s070ag2sk24nq5ayckk3mnqfmwppbhq5i4y13fw6vip"; depends=[]; }; USAboundaries = derive2 { name="USAboundaries"; version="0.3.1"; sha256="1mqbxkv347307mbvn70929bi3l8wmiwrp86rxdgy45g2ddjdcb6s"; depends=[]; }; @@ -4686,22 +4721,22 @@ in with self; { UWHAM = derive2 { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; }; UdderQuarterInfectionData = derive2 { name="UdderQuarterInfectionData"; version="1.0.0"; sha256="084bq5ai1ccp4www64z0ipic74zkd8j1ygv0py900164a25wdr9b"; depends=[]; }; Ultimixt = derive2 { name="Ultimixt"; version="2.1"; sha256="0fh2qpm7qpv1170jzbmzqhvwsn69lblizzisgasswy2nix2jjz4y"; depends=[coda gtools]; }; - Umatrix = derive2 { name="Umatrix"; version="3.1"; sha256="131j7yrb0yzffl6gvirdj29zmsbwg8163i15gg9f0clfcrl1kcx6"; depends=[abind AdaptGauss deldir fields geometry ggplot2 pdist plyr png Rcpp reshape2 shiny shinyjs]; }; - Umoments = derive2 { name="Umoments"; version="0.1.0"; sha256="0vgfvfb7ggi353scg4a2kbwagazn7qfyvi3mjn7c9cprcx0w0136"; depends=[]; }; - Umpire = derive2 { name="Umpire"; version="1.3.8"; sha256="1cxglmvzf4s97588x4hdky475wbzz74lay3ry076c7jxxx7pwipz"; depends=[]; }; + Umatrix = derive2 { name="Umatrix"; version="3.3"; sha256="188h959s5pawnny0fxlqmma03iww6af4x0y8p514bwh5xh9rj3kg"; depends=[abind AdaptGauss deldir fields geometry ggplot2 pdist plyr png pracma Rcpp reshape2 shiny shinyjs]; }; + Umoments = derive2 { name="Umoments"; version="0.1.1"; sha256="089d0xmsp0419mxjp6fs0s1palvdkr0i5dzqckcn6r2kjqj7izjg"; depends=[]; }; + Umpire = derive2 { name="Umpire"; version="2.0.0"; sha256="0qdsy795r4vvf7lqwag4h2vcj6n23az15kj5vsclv343gl2xlvp9"; depends=[BimodalIndex mc2d]; }; UncDecomp = derive2 { name="UncDecomp"; version="1.0.1"; sha256="1m44pgk7nffay09m4gkwb0khq0qjd7bq1p72blsmib46wmnwqfsa"; depends=[dplyr ggplot2]; }; - UncerIn2 = derive2 { name="UncerIn2"; version="2.0"; sha256="08cg7armz9xwwn1222aws98cwrvmw0s73pxpnszmrmrli1qs92k1"; depends=[automap fields geoR gstat RandomFields Rcpp sp]; }; - UncertainInterval = derive2 { name="UncertainInterval"; version="0.5.0"; sha256="11vwf45bhgzzriwjjzjvbbwpzknbf6xl5s9ng7gxh58q20jy038j"; depends=[nloptr reshape2 rootSolve zoo]; }; + UncertainInterval = derive2 { name="UncertainInterval"; version="0.6.0"; sha256="0gyw1lgq1mni8m44lfi2vnd2wxq6i6ml6c6hy9amdbwmb7aymhhd"; depends=[car MASS nloptr psych reshape2 rootSolve zoo]; }; UniDOE = derive2 { name="UniDOE"; version="1.0.2"; sha256="14jz4acrvbv59sbr7gya8g0z749vv0i04gl5wl0y4218byjvw6bs"; depends=[Rcpp]; }; UniIsoRegression = derive2 { name="UniIsoRegression"; version="0.0-0"; sha256="0lmrmb9sbk41ak7sbcrzhfnijb1skgb4lqg9m9imc98lcp69h7z0"; depends=[Rcpp]; }; - Unicode = derive2 { name="Unicode"; version="12.0.0-1"; sha256="1wpzj5jwmb9d9iz1xvgn8mc2xjri28g97k4lpafybb1v4xnxqk54"; depends=[]; }; - UniprotR = derive2 { name="UniprotR"; version="1.2.3"; sha256="0xlszwlrfi51day88ailgwr88wn7n0fdc0ms39gqy5jcw0xc9yky"; depends=[alakazam data_tree dplyr ggplot2 ggpubr gridExtra httr magick magrittr plyr scales tidyverse]; }; + Unicode = derive2 { name="Unicode"; version="13.0.0-1"; sha256="12q98hdh46bbx17z6869bmn1j9bbhf524flvn76sqf20phk81xjy"; depends=[]; }; + UniprotR = derive2 { name="UniprotR"; version="1.2.4"; sha256="1zzxm93390nxw27fr62vhd8pafkq6fiy8if0cx4raznlym5615is"; depends=[alakazam data_tree dplyr ggplot2 ggpubr gridExtra httr magick magrittr plyr scales tidyverse]; }; UnitCircle = derive2 { name="UnitCircle"; version="0.1.3"; sha256="0z5ssps8l5ka4aw4984qml15scw4pfssara5dls82afhfhpkszsr"; depends=[]; }; - UnivRNG = derive2 { name="UnivRNG"; version="1.2"; sha256="0cx6bdzzypxnaqi4wkb20saqd5sfa2rga5cqh694l70vj9c3zw26"; depends=[]; }; + UnivRNG = derive2 { name="UnivRNG"; version="1.2.2"; sha256="1hv0gg371ndljvn3x7s5vbkh51h1l1pjk57livw630mvb67cffqw"; depends=[]; }; UpSetR = derive2 { name="UpSetR"; version="1.4.0"; sha256="007i0njnjjy7vbrxabwav7a1kk2n0hn2mkvqsdzzfk10ckp5y7im"; depends=[ggplot2 gridExtra plyr scales]; }; UsingR = derive2 { name="UsingR"; version="2.0-6"; sha256="1lr8z45r5s7fxrd42rswm6w7s3k5nds244b9d525jb5v4n8w9kpw"; depends=[HistData Hmisc MASS]; }; UtilityFrailtyPH12 = derive2 { name="UtilityFrailtyPH12"; version="1.0"; sha256="06f5gmwwk1r14ab6v5jcxz0pmdph7ffi4y57mjg9byn7pjnibflk"; depends=[bindata mvtnorm Phase123 Rcpp RcppArmadillo]; }; - V8 = derive2 { name="V8"; version="3.0.1"; sha256="0xkyja3722qbs2ndyw3171yfsakijnydm2bfqv76cf0gbzxdab5b"; depends=[curl jsonlite Rcpp]; }; + V8 = derive2 { name="V8"; version="3.0.2"; sha256="0cwhdk77fgmlaihh2mf0iclqz7fps7s7hvsw2s65m62w9gbwfhlk"; depends=[curl jsonlite Rcpp]; }; + VALERIE = derive2 { name="VALERIE"; version="1.0.0"; sha256="0rll02y0virzifn5xvsi52kn17j99vwmd23awkbqw50wvp5qkgss"; depends=[GenomicAlignments GenomicRanges ggplot2 ggplotify ggpubr IRanges pheatmap plyr Rsamtools scales]; }; VAR_etp = derive2 { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; }; VARSEDIG = derive2 { name="VARSEDIG"; version="1.9"; sha256="18j73wm22bjvf2y0c09bfmdyx4x2gd0jhfcqhbk1sgsk24zjr63z"; depends=[]; }; VARshrink = derive2 { name="VARshrink"; version="0.3.1"; sha256="09hysmxxawcbyfx6bia546aqydryl2r5p3ai7bvl6ghdckw5mnpl"; depends=[ars corpcor MASS mvtnorm strucchange vars]; }; @@ -4719,24 +4754,22 @@ in with self; { VGAMdata = derive2 { name="VGAMdata"; version="1.0-3"; sha256="1jicadjaqmys1bbgkp64hmm8wwmi6f734il00v8qjz3jl9b02pkn"; depends=[]; }; VGAMextra = derive2 { name="VGAMextra"; version="0.0-1"; sha256="0rlj4q6ry6v3fnpmg4s33ynn7qzs5m98csap55nyn6r9ynrh5gk5"; depends=[VGAM]; }; VHDClassification = derive2 { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; }; - VICmodel = derive2 { name="VICmodel"; version="0.1.2"; sha256="0hrnj8jl31pbzz9rji5g5bc53da5mg75bf1lqgp8igqvhgy0a08k"; depends=[foreach Rcpp]; }; VIF = derive2 { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; }; VIFCP = derive2 { name="VIFCP"; version="1.2"; sha256="0w41k25vss806m5vpwmmcfsmwaixmln0pliql3a6xlwsihha5i34"; depends=[]; }; VIGoR = derive2 { name="VIGoR"; version="1.0"; sha256="1c24s917aafqy46b3xlsw8v3afs11nd5bq83vlygpgnz1612jpga"; depends=[]; }; - VIM = derive2 { name="VIM"; version="4.8.0"; sha256="08x4a4yzgp8adgrv7a3666yma4b60n64mcsnvhzmwdy023f4ysrw"; depends=[car colorspace data_table e1071 laeken MASS nnet ranger Rcpp robustbase sp vcd]; }; - VIMGUI = derive2 { name="VIMGUI"; version="0.10.0"; sha256="14na9ss0vkcys979kdcciynwssqsvy2w566nydgzd3n7gcmx2agm"; depends=[Cairo foreign gWidgets gWidgetsRGtk2 Hmisc RGtk2 survey tkrplot VIM]; }; + VIM = derive2 { name="VIM"; version="5.1.1"; sha256="0w22ir0gvym7gqd6nw2j7w5ivlb3az1dkfxv33imimkb7c83056a"; depends=[car colorspace data_table e1071 laeken magrittr MASS nnet ranger Rcpp robustbase sp vcd]; }; VIRF = derive2 { name="VIRF"; version="0.1.0"; sha256="0bdkmbmkmmj78h9x025qsdzjzcx8xr2s98wlspcsghlz4hxkzcas"; depends=[BigVAR expm gnm ks matlib matrixcalc mgarchBEKK rmgarch]; }; VLF = derive2 { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; }; VLMC = derive2 { name="VLMC"; version="1.4-3-1"; sha256="0cwfpxcj8g68j9z9fl66i0amj8ypf199iv3yyxzsmniqv4w5x4ar"; depends=[MASS]; }; VLTimeCausality = derive2 { name="VLTimeCausality"; version="0.1.0"; sha256="1fsdxpd9vxnx7919a601g6qf2db8f1p7ch5bfrwc0x89y6abzavv"; depends=[dtw ggplot2 RTransferEntropy tseries]; }; VNM = derive2 { name="VNM"; version="7.1"; sha256="19qglcibb7r6jjz0n0piklwfv3hi4jphd6vmyfbm0ccjjkmn5nin"; depends=[Rcpp]; }; VOSONDash = derive2 { name="VOSONDash"; version="0.5.1"; sha256="1mg38fh7rrf1b2madk7lqqg0rmkh73hl20f920b4pdggqnrpmqq6"; depends=[httpuv httr igraph lattice magrittr RColorBrewer rtweet shiny syuzhet tm vosonSML wordcloud]; }; - VRPM = derive2 { name="VRPM"; version="1.2"; sha256="1cai5a71vzkx0d7cwzsxbcz7r9cdkqjk4l4bp2ffj5pp7nrlh15r"; depends=[fields ggplot2 Hmisc kernlab R2HTML ROCR shiny survival viridis]; }; VSE = derive2 { name="VSE"; version="0.99"; sha256="07m5080nw72b77238v2wwdh4dxsvv6y78d4j1329n90wyj2crxl4"; depends=[car GenomicRanges igraph IRanges]; }; VSURF = derive2 { name="VSURF"; version="1.1.0"; sha256="1azfd4sb89mp27l86k293qj81x94gfiy1ihwnb6c558p8h69xsgf"; depends=[doParallel foreach randomForest ranger Rborist rpart]; }; VTShiny = derive2 { name="VTShiny"; version="0.1.0"; sha256="1zq6irla3q7hqs8jpjdya7vy3frqrj72rwmd1sgxwrkgpmpxw6x7"; depends=[EnvStats rmarkdown shiny]; }; VTrack = derive2 { name="VTrack"; version="1.21"; sha256="1acf2b8zy72shc4768rhikfa3590h3l3nwk32jk7pwsms0nb87rf"; depends=[checkmate doParallel foreach gdistance gstat Hmisc intervals lubridate plotKML plyr raster sp spacetime XML]; }; - VWPre = derive2 { name="VWPre"; version="1.2.2"; sha256="02fki480jxf869kaxawwyj9yznhqci8gmhxz45klayyghr90vd4g"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; }; + VUROCS = derive2 { name="VUROCS"; version="1.0"; sha256="1r4hq7az50v7lbyx5w6b4zs2kwi5cypqn9k6ac4kr8jr3jlyanr3"; depends=[doParallel foreach Rcpp RcppArmadillo]; }; + VWPre = derive2 { name="VWPre"; version="1.2.3"; sha256="0pvk7qmi6s8yqf6s0vbf1ldwrs2b37kgayrdsvfpvxhljg79zl1i"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; }; VaRES = derive2 { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; }; VancouvR = derive2 { name="VancouvR"; version="0.1.1"; sha256="1nzjdassan5kh7wk3xf6kry4jifgjn0gan61ibwhyzy1awpcfngv"; depends=[digest dplyr httr purrr readr rlang sf tibble urltools]; }; VarBundle = derive2 { name="VarBundle"; version="0.3.0"; sha256="0jfx9gkb3f29lgc0nrz3xc7m2ham0scx9lay7x5a6ira7crga6cr"; depends=[crayon dplyr glue magrittr R6 stringr tibble]; }; @@ -4754,21 +4787,21 @@ in with self; { VennDiagram = derive2 { name="VennDiagram"; version="1.6.20"; sha256="1ic1jaxzw98si2p4n1fl4n3myhd7fpw0njb634cwhviwybzv6775"; depends=[futile_logger]; }; VertexSimilarity = derive2 { name="VertexSimilarity"; version="0.1"; sha256="0f638y272dbmz5747wxqy9pxasxk3a9f9wf31gf297qx7268ab1m"; depends=[igraph]; }; VertexSort = derive2 { name="VertexSort"; version="0.1-1"; sha256="0n9m5l85ylin6756rsksak94nv0626qd7czhhj6plz4nfrr27sgl"; depends=[igraph snowfall]; }; - VeryLargeIntegers = derive2 { name="VeryLargeIntegers"; version="0.1.6"; sha256="1ccl4j3vb6aw1qfbqil67dy74daldajwzm7s5hqcidm73fd0wknc"; depends=[Rcpp]; }; + VeryLargeIntegers = derive2 { name="VeryLargeIntegers"; version="0.1.8"; sha256="0yvm3kkc7ssk85ripdgbxj8gazqb1dfswgjy63c3gb135zi2cbqk"; depends=[Rcpp]; }; VetResearchLMM = derive2 { name="VetResearchLMM"; version="1.0.0"; sha256="1a7wm04bsr5shak7l8ypxlhlnx3qkq1jdpjnji1n05p6b00ih9h1"; depends=[ggplot2 lme4 lmerTest multcomp nlme]; }; ViSiElse = derive2 { name="ViSiElse"; version="1.2.2"; sha256="1ay09dahlqnfrgf4gl4s45a4ahrk2xliagxqz5h826w2vzsawqcc"; depends=[chron colorspace ggplot2 Matrix reshape2 stringr]; }; VineCopula = derive2 { name="VineCopula"; version="2.3.0"; sha256="0w9lpdb9mjia2vg9h4v418g8zw8xfq83hmih37hf3yp7p88vja1k"; depends=[ADGofTest lattice MASS mvtnorm]; }; + Visualize_CRAN_Downloads = derive2 { name="Visualize.CRAN.Downloads"; version="1.0"; sha256="0hzq00dbddzwvhryl38sffchxqz52xk8fizsfjgk1xxjr3g8icw4"; depends=[cranlogs htmlwidgets plotly]; }; Voss = derive2 { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; }; - VoxR = derive2 { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; }; W2CWM2C = derive2 { name="W2CWM2C"; version="2.0"; sha256="139rbbhshiap3iq4s4n84sip3cwwjn2x7lm7kmzwj5glhl5dc6ga"; depends=[colorspace wavemulcor waveslim]; }; W3CMarkupValidator = derive2 { name="W3CMarkupValidator"; version="0.1-6"; sha256="0nfay5nqss3zlw4nikj8h3zzlnjfxjch4pm3qky15qrcigrybrbl"; depends=[curl xml2]; }; WARN = derive2 { name="WARN"; version="1.2-4"; sha256="18gfk9vqcqarj7j5i240wqv2dclg3csng4mih5izj40xaaxaf6q5"; depends=[MASS]; }; WCE = derive2 { name="WCE"; version="1.0.2"; sha256="105pwpd9ikm0gwz4r12jl6cgs1riwsk9pn5qk9cn3msgwa0sdynx"; depends=[plyr survival]; }; - WCM = derive2 { name="WCM"; version="0.2.1"; sha256="0d2yw6kzn7mvxwllxfbk6vfiy8l1fd7ggjgi92kjn0j0y66cadw4"; depends=[pracma raster]; }; + WCM = derive2 { name="WCM"; version="0.2.2"; sha256="0w1m2vcxc64ksw3dm94wdigil2fpv3cvzyqmkhs2zrfjlgrdchcd"; depends=[pracma raster]; }; WCQ = derive2 { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; }; WDI = derive2 { name="WDI"; version="2.6.0"; sha256="00y8i69yfnflv0xyfpxl0628p5iivr38cjih7w11sfprdgbzawcx"; depends=[RJSONIO]; }; WEE = derive2 { name="WEE"; version="1.0"; sha256="0i3h67p72lr708mwdw3rbzr1lqqr8n2dxv7f0bwyqzxv41sx1iz3"; depends=[doParallel foreach quantreg]; }; - WGCNA = derive2 { name="WGCNA"; version="1.68"; sha256="1s7gy5vd7x67hpgli8r7ba2z99w3psiyv5hqmrh94zw141dg210a"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore Rcpp robust survival]; }; + WGCNA = derive2 { name="WGCNA"; version="1.69"; sha256="022hkprnrafvggi8pkjffkvk1qlnibmbbxxrni00wkrdbga5589f"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore Rcpp survival]; }; WGScan = derive2 { name="WGScan"; version="0.1"; sha256="0jma6di9hbdimswdfm58568vahcjy46hbhb78idjsdz4bl9apvq3"; depends=[data_table MASS Matrix seqminer SKAT]; }; WLreg = derive2 { name="WLreg"; version="1.0.0"; sha256="0paghjcshhrr6y1gm98d6gr78zvgzhl678g9f96hppfa4q3lfpr7"; depends=[inline survival]; }; WMCapacity = derive2 { name="WMCapacity"; version="0.9.6.7"; sha256="167wx759xi7rv74n6sdsdkjnfpxdsiybk4ik70psdgfwdqqcga1y"; depends=[cairoDevice coda gtools gWidgets gWidgetsRGtk2 RGtk2 XML]; }; @@ -4776,36 +4809,36 @@ in with self; { WMWssp = derive2 { name="WMWssp"; version="0.4.0"; sha256="16m4hvjqdcpkvswvqwgm0pq9nm7vjrlqldzi4i69izlwccp37v47"; depends=[]; }; WPC = derive2 { name="WPC"; version="1.0"; sha256="0li502hwa4n945yfnilslyvl12ls66kazbfmxb4kkjbaf500mjp9"; depends=[msm survival]; }; WPKDE = derive2 { name="WPKDE"; version="0.1"; sha256="100vla11fbw16x5n4w4kbslz4n725v4x6j0hrxzrk99ryl0crmf6"; depends=[]; }; - WR = derive2 { name="WR"; version="0.1.0"; sha256="00781l9rmfm8sqsmhqn59ihw3jsjphg8jnvk34bzh6aaxzdfybm9"; depends=[survival]; }; + WR = derive2 { name="WR"; version="0.1.1"; sha256="153f64b2zsykl5f8iwxlcqby96ag1an4w8lhs7dxx72gy5k4vs6c"; depends=[survival]; }; WRS2 = derive2 { name="WRS2"; version="1.0-0"; sha256="1ax7lchbg0f5miq5779p1zmk6pw36hvwwmbpvsfqwahl5wlvii0s"; depends=[MASS mc2d plyr reshape]; }; WRSS = derive2 { name="WRSS"; version="3.0"; sha256="16a7i6glgl5cshsn3w7gxviybmka06ylw5znz94gigyx0vhgv97p"; depends=[GGally ggplot2 Hmisc network nloptr]; }; WRTDStidal = derive2 { name="WRTDStidal"; version="1.1.2"; sha256="1ssrqqf2hypif4nnfyl4lq03glyyg9ry9s14llf1njxamhjggfgg"; depends=[caret dplyr fields foreach forecast ggplot2 gridExtra lubridate purrr quantreg RColorBrewer survival tidyr]; }; - WVPlots = derive2 { name="WVPlots"; version="1.2.3"; sha256="061gzahn3sqzl7kn20k6151qf364sq048z765l0n8995rmv2z08b"; depends=[cdata ggplot2 gridExtra mgcv rqdatatable rquery sigr wrapr]; }; + WVPlots = derive2 { name="WVPlots"; version="1.2.4"; sha256="1mjfk4dijfgaibhrlnxq1iv6q9c2r8zb5ky6f7v840jhwx2k2pnz"; depends=[cdata ggplot2 gridExtra mgcv rqdatatable rquery sigr wrapr]; }; WWGbook = derive2 { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; }; WWR = derive2 { name="WWR"; version="1.2.2"; sha256="0ia1dd12r1l08s9nhgvk55jmqwv58jawm25gd2ni6wpa3mcmq02g"; depends=[inline]; }; WaMaSim = derive2 { name="WaMaSim"; version="1.0.0"; sha256="0sa7qd2bpn3sp06mlpissxxkfhg7j1d07nnwlnz7nyg7pivwnpan"; depends=[magrittr]; }; + WaterML = derive2 { name="WaterML"; version="1.9.0"; sha256="1wp7ps6xypxar89lbndk56sc3px62xz098jlnr9hq124mqac01qb"; depends=[httr XML]; }; Watersheds = derive2 { name="Watersheds"; version="1.1"; sha256="1gn52nl0rr29pqq94gjasc4fi1kjxlrpjdkgm2x56j5jbd162drk"; depends=[lattice maptools rgeos sp splancs]; }; WaveLetLongMemory = derive2 { name="WaveLetLongMemory"; version="0.1.2"; sha256="1p9ld6w2qgbvkvp7xkzzd14v89rxcwl6vlr1zgxkpc5awl1ln1a8"; depends=[fracdiff wmtsa]; }; - WaveSampling = derive2 { name="WaveSampling"; version="0.1.0"; sha256="1xyi4aj2l9bjj6f2y11wl29rabhzmkdph1bd8jh8jwwf2p3502wh"; depends=[Matrix Rcpp RcppArmadillo]; }; + WaveSampling = derive2 { name="WaveSampling"; version="0.1.1"; sha256="081pqxbrz8vsmjgammh0802frl8lqrw9z1svhdqjc65lqkwghh75"; depends=[Matrix Rcpp RcppArmadillo]; }; WaveletANN = derive2 { name="WaveletANN"; version="0.1.0"; sha256="08qnx0lk2laiyx1q1wxj15j0yic65r7mbhr6lqbdllq30v4dcj88"; depends=[forecast fracdiff wavelets]; }; WaveletArima = derive2 { name="WaveletArima"; version="0.1.1"; sha256="19hz2q280m41qh3m9lx3i9p6p5fl6pw8r9b06xk6sn04hxbim8xx"; depends=[forecast fracdiff wavelets]; }; WaveletComp = derive2 { name="WaveletComp"; version="1.1"; sha256="07w2aa0jiflvxyqhgh48705hg8hjspd103jd00i2pcw2v42hwmf8"; depends=[]; }; - WaveletGARCH = derive2 { name="WaveletGARCH"; version="0.1.0"; sha256="1sgpwdhg7snm0in93ky7jv8lgynnxwlmpgznyj747j7jl9cxz5qn"; depends=[FinTS forecast fracdiff rugarch wavelets]; }; + WaveletGARCH = derive2 { name="WaveletGARCH"; version="0.1.1"; sha256="0dj5bmvzfhj1cpn8qi2ax3iipr7jlq0f9vk4b1idqgh5dmdi8lh6"; depends=[FinTS forecast fracdiff rugarch wavelets]; }; WaverR = derive2 { name="WaverR"; version="1.0"; sha256="084fhzggzm075w6wp2lqd3j0an21idhw8z5l8ynz4y96mpmn204a"; depends=[kimisc MASS]; }; WeMix = derive2 { name="WeMix"; version="3.1.3"; sha256="0407ph8cbci4qwgk525r0y88iz45faq52ljlqa46q9076r9j7sng"; depends=[lme4 Matrix minqa NPflow numDeriv Rmpfr statmod]; }; WebGestaltR = derive2 { name="WebGestaltR"; version="0.4.3"; sha256="0l068mikd8ys7w2643kzmzy2qnj0khz3k780n1lm78ikzbk43sr0"; depends=[apcluster doParallel doRNG dplyr foreach httr igraph jsonlite Rcpp readr rlang svglite whisker]; }; WebPower = derive2 { name="WebPower"; version="0.5.2"; sha256="11255q41zai4q6n2mpk3fzhi2lyyr3g8dxqfajkb93f68m1b38jp"; depends=[lavaan lme4 MASS PearsonDS]; }; WeibullFit = derive2 { name="WeibullFit"; version="0.1.0"; sha256="1a80gcqbmvb1rz2dr2syy16wn6ixjn6l40gayys9zy8302hky9ir"; depends=[e1071 FAdist glue kSamples mixdist optimx R_methodsS3 R_oo sqldf xtable]; }; WeibullR = derive2 { name="WeibullR"; version="1.0.12"; sha256="0rj4q9hd49b914lz8q1d8n96xrl0h29avn95aigb3z7f8knf7g9g"; depends=[Rcpp RcppArmadillo]; }; - WeightIt = derive2 { name="WeightIt"; version="0.8.0"; sha256="0pw9pspyls0jk6w0i3dcwxmsfbvagncwgh1ilfgyq0v8mlilvr0y"; depends=[ggplot2]; }; + WeightIt = derive2 { name="WeightIt"; version="0.9.0"; sha256="0p16q0zc7xdxwsvdf15h97zj7cdhr1rmzawljsjn4yzqwqby7nsy"; depends=[backports crayon ggplot2]; }; + WeightSVM = derive2 { name="WeightSVM"; version="1.7-4"; sha256="11j47c16q9qcxpbwi66018qvj7mmw4l9xkl47kyggmyz87kbrk73"; depends=[]; }; Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; }; WeightedCluster = derive2 { name="WeightedCluster"; version="1.4"; sha256="05rmqhgfzh9fs4c1lhmrbk8s46ihaywy7n9qnivf7zcxxzxds0lj"; depends=[cluster RColorBrewer TraMineR]; }; WeightedPortTest = derive2 { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; }; - WeightedROC = derive2 { name="WeightedROC"; version="2019.11.12"; sha256="1zznzvd2nlxq3c5gr88f6midglavmk6368wfqdbg7bwvfxsccgbz"; depends=[]; }; + WeightedROC = derive2 { name="WeightedROC"; version="2020.1.31"; sha256="1f43hwsabciraj1qxfh5wcqnnx1vvcf4pwqs376rcfd9161k15xv"; depends=[]; }; WgtEff = derive2 { name="WgtEff"; version="0.1.2"; sha256="1z8pndv43ssgmzldwaq0088lmf1g2mkmrbmzyaismcpngn9fqxsk"; depends=[]; }; - WhatIf = derive2 { name="WhatIf"; version="1.5-9"; sha256="0ihpp3wbhpsg00g0s31l0ca4q0a2sch2a2j8cgz14g8na43x8831"; depends=[lpSolve pbmcapply Zelig]; }; WhiteStripe = derive2 { name="WhiteStripe"; version="2.3.2"; sha256="0kzwglaazn820fzxd2g1fsiw2rnq0qxagns8b5mm3inflsgs35ng"; depends=[mgcv oro_nifti]; }; - WhopGenome = derive2 { name="WhopGenome"; version="0.9.7"; sha256="1xa7d9x5ny8g79scfkv7v5ix9m3mfzg0fks2bsan9zqyhcd01fsq"; depends=[]; }; WiSEBoot = derive2 { name="WiSEBoot"; version="1.4.0"; sha256="1fch78884ay7m2gy602k8df78gkvjiwzkjk550w0k4xbv430ld0h"; depends=[FAdist wavethresh]; }; WikidataQueryServiceR = derive2 { name="WikidataQueryServiceR"; version="0.1.1"; sha256="1bqgp3wldfmnwwh9llig8xpa4x0rcp1hcwyw7d7pw4ym61b2v65x"; depends=[dplyr httr jsonlite]; }; WikidataR = derive2 { name="WikidataR"; version="1.4.0"; sha256="0ajbizsyk5a7fgbfn26qydxpp5d8qfnlcwbslxrrn913f0yxbcb4"; depends=[httr jsonlite WikipediR]; }; @@ -4813,19 +4846,18 @@ in with self; { WikipediaR = derive2 { name="WikipediaR"; version="1.1"; sha256="0fxk247jb82g0f3nmwraa4kvdpjxy5s4dcyzj9vkjw2lq8by3l0h"; depends=[httr XML]; }; WilcoxCV = derive2 { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; }; WindCurves = derive2 { name="WindCurves"; version="0.1.3"; sha256="0bvbnrkdk0g0radgcw4zbhq6czpvq3f7f34x83qk09i8ngmwd28c"; depends=[drc imputeTestbench readbitmap]; }; + WordOfMouth = derive2 { name="WordOfMouth"; version="1.0.0"; sha256="1ir928rv0xk27arca8bzsdxjvmrkd0azy4ijwnaziqrrm5dpiasj"; depends=[LambertW]; }; WordPools = derive2 { name="WordPools"; version="1.1-1"; sha256="081qnsq7wn1vczgf6ipz8wjmyg4vwhj1s5nrzh0dw4p9yz28dxv2"; depends=[]; }; WordR = derive2 { name="WordR"; version="0.3.1"; sha256="17g8v3xhdy57y0b95zrakhi0zamqi35v0zcmjpy47xyqyk4b2grs"; depends=[dplyr flextable officer]; }; - WorldFlora = derive2 { name="WorldFlora"; version="1.2"; sha256="1pjzxcnmkckq5r04lmsspyh4kijzjwk5aa6d8hpbfci63ab54dhp"; depends=[]; }; + WorldFlora = derive2 { name="WorldFlora"; version="1.5"; sha256="0q7kp0jgn4kb31i5wpvh3f8wfsajg17g7b883av1x097a0jndnjm"; depends=[]; }; Wrapped = derive2 { name="Wrapped"; version="2.0"; sha256="1z5kypsd39z9arsw57axckvl8b4jnr5wv60s9z58f5s89gn5vxxg"; depends=[AdequacyModel ald cubfits evd fBasics gamlss_dist GeneralizedHyperbolic GEVStableGarch glogis irtProb LCA lqmm metRology NormalLaplace normalp ordinal sgt SkewHyperbolic sld sn VarianceGamma VGAM]; }; - WrightMap = derive2 { name="WrightMap"; version="1.2.1"; sha256="16zp7h28fap5hq5xzvkb4lc217yhfmwzfbvw2lsni0gf9qxqkgqd"; depends=[]; }; + WrightMap = derive2 { name="WrightMap"; version="1.2.2"; sha256="0w1iwl45kv6vq5fg88hlkv93bpbrw8jm1wnhk9qxznlm0g13z33x"; depends=[]; }; WriteXLS = derive2 { name="WriteXLS"; version="5.0.0"; sha256="1gypq7zh22kpraz0bgj4jyvy2hbj1l8r7m6y34531vjdgwf67sss"; depends=[]; }; - WufooR = derive2 { name="WufooR"; version="0.9"; sha256="13flcb7hwnhsnlak4m3mvwmbq2fd42027lgp8fhg25sra6dwcd7h"; depends=[dplyr httr jsonlite]; }; + WufooR = derive2 { name="WufooR"; version="1.0.1"; sha256="0iq1lc1b22zdvclkr4yivxxf8z5mdxik7lx9r3b38h2qy2rckqb2"; depends=[dplyr httr jsonlite]; }; XBRL = derive2 { name="XBRL"; version="0.99.18"; sha256="1bwvxqbxdf1ynz2bv27l86h05h8y19q2li2y79xk819p5nkxq341"; depends=[Rcpp]; }; - XGR = derive2 { name="XGR"; version="1.1.7"; sha256="1s65n4d67wj24rn6gi9hh3dlmghrxxjhm6nknhnsdjysab24njnv"; depends=[BiocGenerics dnet dplyr GenomicRanges ggnetwork ggplot2 ggrepel igraph IRanges MASS Matrix RCircos S4Vectors supraHex tidyr]; }; XHWE = derive2 { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; }; XKCDdata = derive2 { name="XKCDdata"; version="0.1.0"; sha256="1lx9frlbc549qrh4d3m79r3l9icfzqkgfgp8raa8x46a2havi0a5"; depends=[assertthat dplyr glue htmltools httr jsonlite magrittr tibble]; }; - XLConnect = derive2 { name="XLConnect"; version="0.2-15"; sha256="1cvq677m09gwpwhj3fy15mbfn0s0b1y35w95pjnijiwpcpdxiq96"; depends=[rJava XLConnectJars]; }; - XLConnectJars = derive2 { name="XLConnectJars"; version="0.2-15"; sha256="1ipqyjgsh5a1ygsbhyqxyj9wfjv1f73cyfrpx6jvf0is5jklhvxx"; depends=[rJava]; }; + XLConnect = derive2 { name="XLConnect"; version="1.0.1"; sha256="0fbfkl26v42bvbz27kjw8cqnq67mwalxqpp5avqjphc17i5a6ylj"; depends=[rJava]; }; XML = derive2 { name="XML"; version="3.99-0.3"; sha256="0lzpqwajs5xaqdna50vl24qkp9xvh00zypjjzy6kgdzk11isgdw1"; depends=[]; }; XML2R = derive2 { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[plyr RCurl XML]; }; XMRF = derive2 { name="XMRF"; version="1.0"; sha256="0jnyy9pcksfadznidqsbwh8nlqv3k0yppj76q8a2g0aidbdmg2cc"; depends=[glmnet igraph MASS Matrix snowfall]; }; @@ -4836,26 +4868,23 @@ in with self; { XRSCC = derive2 { name="XRSCC"; version="0.1"; sha256="0hs2whjsd02avaz79zkrd8gjw9qd7l6ysxmhx4w1r7gb1cj9rr7c"; depends=[]; }; XiMpLe = derive2 { name="XiMpLe"; version="0.10-2"; sha256="16dmslc3ji9zbbm2khw8ib8rhwan0mdlfyd4h29v42lcx6l1d0pv"; depends=[]; }; Xmisc = derive2 { name="Xmisc"; version="0.2.1"; sha256="11gwlcyxhz1p50m68cnqrxmisdk99v8vrsbvyr7k67f0kvsznzs1"; depends=[]; }; - Xplortext = derive2 { name="Xplortext"; version="1.2.1"; sha256="1c19i367vbcf8ikb364kz8488lcd5ignyagg9bhza282grhla7kn"; depends=[FactoMineR flashClust flexclust ggdendro ggplot2 gridExtra MASS slam stringi stringr tm]; }; + Xplortext = derive2 { name="Xplortext"; version="1.3.1"; sha256="03mw84bmwrzl1g5z0dlmfphlslhcgy09lrjw8l13ahfj0a51cvn1"; depends=[FactoMineR flashClust flexclust ggdendro ggplot2 gridExtra MASS slam stringi stringr tm]; }; YPInterimTesting = derive2 { name="YPInterimTesting"; version="1.0.3"; sha256="0fca963rsbs9k7ivffsqk4hzap6ll7s709kqs6aby0plghrdla2w"; depends=[MASS Rcpp]; }; YPPE = derive2 { name="YPPE"; version="1.0.1"; sha256="01q0l22nwfpld2wcygk5x28c2c6cv35hxy2fm1azn8bqsv7xy5il"; depends=[BH Formula MASS Rcpp RcppEigen rstan rstantools StanHeaders survival]; }; - YPmodel = derive2 { name="YPmodel"; version="1.3"; sha256="1vll33nm7xynnbq15wksk9c38jhjfd6l1bbzijn5skqc5yik1r5x"; depends=[]; }; - YRmisc = derive2 { name="YRmisc"; version="0.1.5"; sha256="0vdxw67j4sx3m713s2spvj7jlk9h2g9hg4169zabfah8ni7gdman"; depends=[ggplot2 gridExtra robust]; }; + YRmisc = derive2 { name="YRmisc"; version="0.1.6"; sha256="1crms7dqmhj7br1a5p5j0j7p6sdfimnip31207i6g24f9jkkysv1"; depends=[ggplot2 gridExtra]; }; YaleToolkit = derive2 { name="YaleToolkit"; version="4.2.2"; sha256="12wggdyz0wgnmxnqhp8bypyy1x1p50g49fwdzl2l43il44cdyv0g"; depends=[foreach iterators]; }; + Yamm = derive2 { name="Yamm"; version="1.3.1"; sha256="0av5q1vx2f8dvxv0br9w65qmw3zr3y4vja45g8qbqyfb3gkfclhn"; depends=[depth interp OjaNP pcaPP]; }; YieldCurve = derive2 { name="YieldCurve"; version="4.1"; sha256="0w47j8v2lvarrclnixwzaq98nv1xh2m48q5xvnmk7j9nsv2l3p68"; depends=[xts]; }; YuGene = derive2 { name="YuGene"; version="1.1.6"; sha256="1kv9n82wrms0c4y5fz9ckzhm1a609mnqp0pwvd0fpyscp8krmlpp"; depends=[mixOmics]; }; Z10 = derive2 { name="Z10"; version="0.1.0"; sha256="02kxlzplmss68zj1z97fvpcjyhhpic9hlx8f5j3gqn3m1mqm1dja"; depends=[dplyr lubridate magrittr rjson stringr]; }; ZIBBSeqDiscovery = derive2 { name="ZIBBSeqDiscovery"; version="1.0"; sha256="12g9rga9z6318ni6x6q9hdqlgl93y2xn8vf3gc6sm97fz8pliswx"; depends=[mcc]; }; ZIBseq = derive2 { name="ZIBseq"; version="1.2"; sha256="13rjy4jl9wil6hhpra4qmdis0iyqxchzsf9l7q6r0dz1f7dpd2nq"; depends=[gamlss gamlss_dist nlme]; }; ZIM = derive2 { name="ZIM"; version="1.1.0"; sha256="0scyfjn4ilsvha3x41c3b8bcfi31hlhwm77wn2a8hj5dsvnnmzig"; depends=[MASS]; }; - ZIPFA = derive2 { name="ZIPFA"; version="0.8.0"; sha256="0dx0v01sc769lqvkrk9fyhlifiif2xva20m2d9p341cgzp5875c6"; depends=[doParallel foreach Matrix optimx trustOptim]; }; + ZIPFA = derive2 { name="ZIPFA"; version="0.8.1"; sha256="134pkdn4slhiv27rdkkmh2z7xch30ns0jhzxgd7r05bky0z1iri1"; depends=[doParallel foreach Matrix optimx trustOptim]; }; ZOIP = derive2 { name="ZOIP"; version="0.1"; sha256="0fraxzr2mfd7w705j2fryhh9vpg6nkag6kmk7p7in3zknxwipfh3"; depends=[boot GHQp numDeriv rmutil]; }; ZRA = derive2 { name="ZRA"; version="0.2"; sha256="1sx1q5yf68hhlb5j1hicpj594rmgajqr25llg7ax416j0m2rnagi"; depends=[dygraphs forecast]; }; ZVCV = derive2 { name="ZVCV"; version="1.0.0"; sha256="1npw836q2skx54843lgxvb0rfwafckjc8k8dljykm60ad3z7zak8"; depends=[abind glmnet mvtnorm partitions Rcpp RcppArmadillo]; }; ZeBook = derive2 { name="ZeBook"; version="1.1"; sha256="0v98kbz9njjdx60x9dn8hl8mc6x19i5knjyg2gkwfd667yy1rkl6"; depends=[deSolve triangle]; }; - Zelig = derive2 { name="Zelig"; version="5.1.6.1"; sha256="0mnq397kp3glgc5c2802r3q2gxdbrz05qnpl3431avzywmbjn55s"; depends=[AER Amelia coda dplyr Formula geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; }; - ZeligChoice = derive2 { name="ZeligChoice"; version="0.9-6"; sha256="1whfwc42lsi54xfr423h6jwbvpj6yjyyf0854k1f1ms13liahm8w"; depends=[dplyr Formula jsonlite MASS VGAM Zelig]; }; - ZeligEI = derive2 { name="ZeligEI"; version="0.1-2"; sha256="0kilzfqmm6a41mmjvlynh3rnj30fqiq8gsja28fzwpf0lbl89slg"; depends=[dplyr ei eiPack Formula jsonlite MASS MCMCpack Zelig]; }; ZillowR = derive2 { name="ZillowR"; version="0.1.0"; sha256="1wrr58p76ps29fqzzwgfvfibxrvc72p2yzs5kc2rv1yxzzcpyxvb"; depends=[RCurl XML]; }; ZipRadius = derive2 { name="ZipRadius"; version="1.0.1"; sha256="00q4a2bsajs5ns4vdm289iaj9mczxjn3ssyrnmg2z4wicr2ljizv"; depends=[dplyr geosphere ggplot2 magrittr rlang testthat]; }; Zseq = derive2 { name="Zseq"; version="0.2.0"; sha256="06dndi2b1q79bmxax11bv0l5ifcz1mhpvbn90y6a6xymrgcq0ivi"; depends=[gmp]; }; @@ -4863,6 +4892,7 @@ in with self; { aGE = derive2 { name="aGE"; version="0.0.9"; sha256="17niwni6sd2mdvhskq6vfwplynh67hwq9ijrlgjvhkcslpb2ilp3"; depends=[MASS nlme survey]; }; aLFQ = derive2 { name="aLFQ"; version="1.3.6"; sha256="0kphpvhz36859f5l0k8mbf59g9871mynbs4ybdi0h5nm2cdjy9vx"; depends=[bio3d caret data_table lattice plyr randomForest reshape2 ROCR seqinr]; }; aMNLFA = derive2 { name="aMNLFA"; version="0.1"; sha256="0sj6rxsdib5zmz78c94bjdlcdwhfkvbc7sp3pncj6vsvvzgqcjdp"; depends=[devtools ggplot2 gridExtra MplusAutomation plyr reshape2 stringr]; }; + aPCoA = derive2 { name="aPCoA"; version="1.0"; sha256="0vgwja5309nml34ann46as5qjw7z9qwqapcvnr8b5n38zdw4dz4y"; depends=[ape car cluster mvabund randomcoloR vegan]; }; aRpsDCA = derive2 { name="aRpsDCA"; version="1.1.1"; sha256="0ghg43rd6bnv4jp8pkpd1ixp5l6kq5pr0mxq61q24s24g0m3s64p"; depends=[]; }; aRxiv = derive2 { name="aRxiv"; version="0.5.19"; sha256="0rik0jkh1xi9fizzw46xmcw139g6nla072p7f8jgvzbhp7k58ba2"; depends=[httr XML]; }; aSPC = derive2 { name="aSPC"; version="0.1.2"; sha256="1q301rw7dax5v58srg4jlcam1qq2igkaj7kg8wlnlml0hsck4c4a"; depends=[energy mvtnorm]; }; @@ -4876,7 +4906,7 @@ in with self; { abcADM = derive2 { name="abcADM"; version="1.0"; sha256="0vcabnnnwc0psv9v3rda5aap9s8cq1pjh02zva3ki64hlavf2a10"; depends=[BH Rcpp]; }; abcdeFBA = derive2 { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[corrplot lattice rgl Rglpk]; }; abcrf = derive2 { name="abcrf"; version="1.8.1"; sha256="1ghbd24yhqy3xhdxas6ccn84nkavqpgldx5ck8kijknc7qjm8k27"; depends=[doParallel foreach MASS matrixStats ranger Rcpp RcppArmadillo readr stringr]; }; - abcrlda = derive2 { name="abcrlda"; version="1.0.1"; sha256="0j29ifsvmxfx2g6v4bpbb4s6miwfpf4vlkpbgj6f2q078s4clc85"; depends=[]; }; + abcrlda = derive2 { name="abcrlda"; version="1.0.2"; sha256="0zjdrbg3zx0znqnh0dvmifs9c12b8vjhbaf3nbwab9xh25nsmg75"; depends=[]; }; abctools = derive2 { name="abctools"; version="1.1.3"; sha256="07s9dg10i8lsxl73b4n2hynca2fjgb0ykb0dz8c3zv6cgw3cyx97"; depends=[abc abind Hmisc plyr]; }; abd = derive2 { name="abd"; version="0.2-8"; sha256="191gspqzdv573vaw624ri0f5cm6v4j524bjs74d4a1hn3kn6r9b7"; depends=[lattice mosaic nlme]; }; abdiv = derive2 { name="abdiv"; version="0.2.0"; sha256="053l94br8sdy30078ssncq5i5zvdxa3m72ymbwbh0cm3zmsljj29"; depends=[ape]; }; @@ -4888,17 +4918,17 @@ in with self; { abnormality = derive2 { name="abnormality"; version="0.1.0"; sha256="1fzfskl9akl06nliy8hkv2a0pznpj8pwcypg3gj5r2nzvr3kan9v"; depends=[MASS Matrix]; }; abodOutlier = derive2 { name="abodOutlier"; version="0.1"; sha256="1pvhgxmh23br84r0fbmv7g53z2427birdja96a67vqgz18r3fdvj"; depends=[cluster]; }; abstractr = derive2 { name="abstractr"; version="0.1.0"; sha256="1ymwp7syrynwd4i8aj2x5n8jdi9d96fjzl6jb09n0bnr5fgl7vig"; depends=[colourpicker emojifont ggplot2 gridExtra rintrojs shiny shinythemes]; }; - abtest = derive2 { name="abtest"; version="0.2.0"; sha256="1ky3cf827kj24bhcpk00v5zl5jdkii1gca0x81ay1cjkzfispgws"; depends=[Matrix mvtnorm plotrix RColorBrewer Rcpp sn truncnorm VGAM]; }; + abtest = derive2 { name="abtest"; version="0.2.1"; sha256="1zfd13d7dplawk24dbdr1ka8cbdp5w6sxb0zlm7k4dhvn6ksi8h0"; depends=[Matrix mvtnorm plotrix qgam RColorBrewer Rcpp sn truncnorm]; }; abundant = derive2 { name="abundant"; version="1.1"; sha256="1m76qdmqvwpgm0sihazi2dna7cgsz9rljal18vgffb5wamwmg9k7"; depends=[QUIC]; }; acc = derive2 { name="acc"; version="1.3.3"; sha256="1ii2vm47djxbixa75h690q1s2f9m9x6i8nkygik93j6dayr6kr1m"; depends=[circlize DBI ggplot2 iterators mhsmm nleqslv PhysicalActivity plyr R_utils Rcpp RcppArmadillo RSQLite zoo]; }; accSDA = derive2 { name="accSDA"; version="1.0.0"; sha256="0sgxy5y8kkc1n35657kifwfjsba7y5m1vbr7rkk5lmbpkzahqm61"; depends=[ggplot2 ggthemes gridExtra MASS rARPACK sparseLDA]; }; accelerometry = derive2 { name="accelerometry"; version="3.1.2"; sha256="13xzrwhr4i1nj9c8vrmfdg2rmrc8n446iihcyxmy99sm99hpzyip"; depends=[dvmisc Rcpp]; }; accelmissing = derive2 { name="accelmissing"; version="1.4"; sha256="1nql9inx6azdzi3z4sfm2vdml2mms6krl8wzlf1dn1c97ahn57fy"; depends=[mice pscl]; }; - accept = derive2 { name="accept"; version="0.7.0"; sha256="1r4mhy9g4wjcjgdd0gwdarmr09292il3vdkmx0hz7vh9mffyr9kx"; depends=[dplyr extrafont MASS plotly stringr viridis]; }; + accept = derive2 { name="accept"; version="0.7.1"; sha256="0pn8q0jsi0nb2mm2kv6sjczflflshhy55y7nqqnk70yx9f6wm83y"; depends=[dplyr extrafont MASS plotly stringr viridis]; }; accrual = derive2 { name="accrual"; version="1.3"; sha256="11clm9s5c5518nmp6hd6pjnp0s28y92b2i2x0xgj4j5g816p4j3z"; depends=[fgui SMPracticals tcltk2]; }; accrued = derive2 { name="accrued"; version="1.4.1"; sha256="05g1jb5914z18rcai1ahn7nihn27vr2rnadwv94gc1j7ivvikvs5"; depends=[]; }; ace2fastq = derive2 { name="ace2fastq"; version="0.6.0"; sha256="09kk3yyqnr2xp820g0p3aai9a21figigjr9lxkr3zjq2d8gzwfic"; depends=[stringr]; }; - acebayes = derive2 { name="acebayes"; version="1.8"; sha256="1xm6bw0qm2vlcrk274x0bawzb2lnacb1wsmzba5mg3i75a55pqln"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; }; + acebayes = derive2 { name="acebayes"; version="1.9"; sha256="1imfwm1vpbb24vfmfn1nljhmaz8429mwjihw34892p387s8h7xz2"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; }; acepack = derive2 { name="acepack"; version="1.4.1"; sha256="1f98rpfjmhd92rdc3j004plyfpjailz6j0ycysbac0kgj83haxc2"; depends=[]; }; acfMPeriod = derive2 { name="acfMPeriod"; version="1.0.0"; sha256="1yww8isfrbs2v9s94hx7p2imyszcgadwafdgpj438n2ik0q6p9d5"; depends=[MASS]; }; acid = derive2 { name="acid"; version="1.1"; sha256="030i0y8s283ivbsmjccpbv9v7mgbcg2jk9df7vgcbbns74swf9hd"; depends=[gamlss gamlss_dist Hmisc]; }; @@ -4912,11 +4942,13 @@ in with self; { acss = derive2 { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; }; acss_data = derive2 { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; }; activPAL = derive2 { name="activPAL"; version="0.1.3"; sha256="1h6hp5z89ji73gdzxy1dgbfwjysiy5lvcqh90xagpb7sa7ahs3na"; depends=[devtools dplyr ggplot2 lubridate magrittr tidyr]; }; + activegp = derive2 { name="activegp"; version="1.0.4"; sha256="0sqx2pjy0mw8gls4k4qwl64ip55kgs3k10dfdixdrqly035rhr37"; depends=[hetGP lhs numDeriv Rcpp RcppArmadillo]; }; activity = derive2 { name="activity"; version="1.3"; sha256="12imqj366dp6pam5gap6ji56p5wf1073xz5g4iikfxf5l8snxw92"; depends=[circular insol pbapply]; }; activityCounts = derive2 { name="activityCounts"; version="0.1.2"; sha256="0zgxr2sk3a8kmygfxx1p5hnrfwdkxx7php6jlrhm8wv6052ck8jz"; depends=[lubridate magrittr seewave signal tibble]; }; activpalProcessing = derive2 { name="activpalProcessing"; version="1.0.2"; sha256="1y0bjx2qx53iy930y9iww4q1yzjj8y16cwgixk1mq3w4g1f116d1"; depends=[chron]; }; actogrammr = derive2 { name="actogrammr"; version="0.2.3"; sha256="1jzvarmd41yqlrkagzlc8m19n5mn0w0b36fy50lyvgrfsafjfbqa"; depends=[dplyr ggplot2 lubridate readr tidyr]; }; actuar = derive2 { name="actuar"; version="2.3-3"; sha256="0aw3hlan5y22mdqk1wvnw9ksqhwp4yy5hi0dpv21p7s0hyxhphih"; depends=[expint]; }; + actuaryr = derive2 { name="actuaryr"; version="1.1.1"; sha256="08dzn565ax2l2hrn2m32k6magjbskybywl0hsgkg11nrjvkznwnx"; depends=[crayon dplyr lubridate magrittr purrr tibble]; }; ada = derive2 { name="ada"; version="2.0-5"; sha256="1h3a07czp0w3hrhjcg1fz721y8vsfclzqi3rq8qfzgpfb4h1f06r"; depends=[rpart]; }; adabag = derive2 { name="adabag"; version="4.2"; sha256="109wrl1pwvmyv2l909hrvk7dg4aa9pv449mvdycp50zwrsw9w0a7"; depends=[caret doParallel foreach rpart]; }; adagio = derive2 { name="adagio"; version="0.7.1"; sha256="1h9l0ddrxq8y35iy9hdkxdvdwsqpnpkzzbkbwwhm4380lq1m7a3k"; depends=[]; }; @@ -4929,6 +4961,7 @@ in with self; { adaptiveGPCA = derive2 { name="adaptiveGPCA"; version="0.1.2"; sha256="0bb6hw77dfa66b12xyazlp992gwjb1plylixlmq4cv4yjhnl9n5z"; depends=[ape ggplot2 phyloseq shiny]; }; adaptivetau = derive2 { name="adaptivetau"; version="2.2-3"; sha256="1jficl4yidix35q8yqs3pcv813wq3pg4hpw4ah4dprvg95bl7wwx"; depends=[]; }; adaptsmoFMRI = derive2 { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[coda Matrix MCMCpack mvtnorm spatstat]; }; + add2ggplot = derive2 { name="add2ggplot"; version="0.3.0"; sha256="0c94i1cfp2pvplvxmfvvz2fyj026r1jnax05mrzrc7ppnqzy25y0"; depends=[ggplot2 magick magrittr RColorBrewer zeallot]; }; addhaz = derive2 { name="addhaz"; version="0.5"; sha256="1709jq9rp5lhqk0qpk8zkdwzhcv1bcach8mm7yiz7hzcc1mgxb12"; depends=[boot MASS Matrix]; }; addhazard = derive2 { name="addhazard"; version="1.1.0"; sha256="0hk7br52wjmq605xgslv8lspr35aqpdgkiz2yljz31khy3y3vi8c"; depends=[ahaz rootSolve survival]; }; addinsOutline = derive2 { name="addinsOutline"; version="0.1.6"; sha256="125qfqbpv5xflw8qlyh8m3iyd6biyp3arls3z7y8bqkbghifl730"; depends=[dplyr DT fs miniUI rmarkdown rstudioapi shiny shinyFiles stringr tibble yaml]; }; @@ -4936,29 +4969,29 @@ in with self; { additiveDEA = derive2 { name="additiveDEA"; version="1.1"; sha256="15nxpdybsda6yhjk23bpafr8v1zdx8332pcxf26k795q3ypjpiy2"; depends=[Benchmarking lpSolveAPI]; }; additivityTests = derive2 { name="additivityTests"; version="1.1-4"; sha256="048ds90wqjdjy1nyhna3m06asdklbh8sx1n556kss2j1r1pma1sw"; depends=[]; }; addreg = derive2 { name="addreg"; version="3.0"; sha256="13bwmgxylwi02g60j1rr51cr5jvvkl2nvf2lnnhnq46fhvs2ma7s"; depends=[combinat glm2 turboEM]; }; - ade4 = derive2 { name="ade4"; version="1.7-13"; sha256="16z9jk4qj35ghsk4lwmq241dgc770y8a70dlmp9q4gz6d8ssgl7m"; depends=[MASS]; }; + ade4 = derive2 { name="ade4"; version="1.7-15"; sha256="1xpxznlqm8wb4d5z2dcrl0wi3jjciq2hr5rcx2b5aaipiiyzm1ij"; depends=[MASS pixmap sp]; }; ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.3-0"; sha256="1k1d5vck8plv6rq9nn664p73nhd4k3kah52fvqc3vg2zv1hbizzk"; depends=[ade4 adegraphics lattice tkrplot]; }; adeba = derive2 { name="adeba"; version="1.1.2"; sha256="1z1law3qh6l902g62y8yapk4nypdmb20jmpwhxp9jbglalw9lm73"; depends=[mixtools pdist Rcpp]; }; adegenet = derive2 { name="adegenet"; version="2.1.2"; sha256="01fgrgbiddz2q4l3mx637hhwbs7r0c43yw7vpwl8p8pwbm3nykz0"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny spdep vegan]; }; adegraphics = derive2 { name="adegraphics"; version="1.0-15"; sha256="12k77x6vnjz9s9dvz1r81ajqcl1nh9g33r7dymaqk2cs5q3wvfw7"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; }; - adehabitatHR = derive2 { name="adehabitatHR"; version="0.4.16"; sha256="0qzgshdlayx28j4ziivv1fy925bvbfnqk6dbd1wx5vjgp3c32ppg"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; }; + adehabitatHR = derive2 { name="adehabitatHR"; version="0.4.18"; sha256="0ss3fhpa7i2m4g55ajy9pgwgj393jbw58khgywc3gw9ys53h02sd"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; }; adehabitatHS = derive2 { name="adehabitatHS"; version="0.3.15"; sha256="1qhdwyjic4q24kk0pwrd0r8vdg5clv4g1hbdq07rl71jbcscdhvz"; depends=[ade4 adehabitatHR adehabitatMA sp]; }; adehabitatLT = derive2 { name="adehabitatLT"; version="0.3.25"; sha256="1v83iw9argh11fi47hlb8ykigd8xh70hww3i4j8yrzfqwcr9aj4p"; depends=[ade4 adehabitatMA CircStats sp]; }; adehabitatMA = derive2 { name="adehabitatMA"; version="0.3.14"; sha256="0lfqg9g0wpq70md35b7gdgav3lliaxv8c8i13j3k0q436ids68iy"; depends=[filehash sp]; }; adephylo = derive2 { name="adephylo"; version="1.1-11"; sha256="06pnrycc7562h17gxbli935289a48na3p4vpb2w96i5cbrjg4jqm"; depends=[ade4 adegenet ape phylobase]; }; - adepro = derive2 { name="adepro"; version="2.0.0"; sha256="0q9h7wmkgdnbhg2ygw32jl0bm2vrl32ig2nci9pphgwpsfzb34jq"; depends=[audio Cairo MASS shape shiny shinyBS]; }; + adepro = derive2 { name="adepro"; version="3.0.0"; sha256="0dx57kypg3hqppxpw4aqldnlmfkvxc1z60j3kw78zjm7vam43jcz"; depends=[audio Cairo dplyr gclus haven jsonlite MASS readr rlang seriation shape shiny shinyBS shinyjs shinyWidgets TeachingDemos tidyr V8]; }; adept = derive2 { name="adept"; version="1.1.2"; sha256="0j8sd337j2c583pnwsfgc4r2251y8s5s4pkx79ifrhyc7c2qgfai"; depends=[dplyr dvmisc future magrittr tibble]; }; adeptdata = derive2 { name="adeptdata"; version="1.0.1"; sha256="07146kv1llj5kci7s7v2jrqd7bl6h3rczx43nha5fhr57ldpcm40"; depends=[]; }; - adespatial = derive2 { name="adespatial"; version="0.3-7"; sha256="0chbz14jii0gra6f7zncjrd1m2d2n5wwpq1ihjnwwk8jvyqskd1a"; depends=[ade4 adegraphics adephylo lattice MASS shiny sp spdep vegan]; }; + adespatial = derive2 { name="adespatial"; version="0.3-8"; sha256="01i90802w98zyni6krcngk49f5jgi267w64l0wm8c2izrq4k5zg3"; depends=[ade4 adegraphics adephylo lattice MASS shiny sp spdep vegan]; }; adfExplorer = derive2 { name="adfExplorer"; version="0.1.4"; sha256="11z6jm20giqmmz4dwcpa9fshvrmlmv8m0y1vg053nch05884niz2"; depends=[]; }; adhoc = derive2 { name="adhoc"; version="1.1"; sha256="0a59fv9glcqh4zzd0887ndrhlcaylja6vay2ifajp8an29gjk1vv"; depends=[ape pegas polynom]; }; adimpro = derive2 { name="adimpro"; version="0.9.2"; sha256="1ajq2889y70lxjdpf5zdg7zkz35i3i92li72wb7nbfngxmw47xzv"; depends=[awsMethods]; }; - adiv = derive2 { name="adiv"; version="1.4"; sha256="1gavg22hd0szxqiqws67j993xclgw79ifbqk0108nj13vjfj07kh"; depends=[ade4 adegraphics adephylo ape cluster FactoMineR phylobase phytools rgl]; }; + adiv = derive2 { name="adiv"; version="2.0"; sha256="1lp5vylqj8n29smjp3611gxw0nfgk5blcwrhk3c73w1v6695488b"; depends=[ade4 adegraphics adephylo ape cluster FactoMineR phylobase phytools rgl]; }; adjclust = derive2 { name="adjclust"; version="0.5.9"; sha256="1nrsl9ca7729qfmxi5xzsvkqrx3dkjyr3al4vz3iqphfxv9sdl4h"; depends=[capushe Matrix matrixStats]; }; adjustedcranlogs = derive2 { name="adjustedcranlogs"; version="0.1.0"; sha256="08apfvpqvnnalx230p4qf5ckrwm1sgzras4zfrysgym5d4map9ci"; depends=[cranlogs dplyr lubridate rvest xml2]; }; adklakedata = derive2 { name="adklakedata"; version="0.6.1"; sha256="1lzj3ib4bgfkq5lq12n47pwc52h7k35xbbwj6brwsgx1gd4fx3x6"; depends=[httr rappdirs]; }; adlift = derive2 { name="adlift"; version="1.4-1"; sha256="14q7fnhlqvxdhnfjhdhfmadz241srplbm069a7ybbsql21cphpf3"; depends=[EbayesThresh]; }; - admisc = derive2 { name="admisc"; version="0.5"; sha256="0jqlac39rbvxi6xhyadkyxwmpjcpgl6fl8dn2yjnnn0qgs61y5c3"; depends=[]; }; + admisc = derive2 { name="admisc"; version="0.8"; sha256="071xrqimizhs7qgav84fggw8cls4dhhqvzp8f1g0xw1wvj0wnfx1"; depends=[]; }; admixturegraph = derive2 { name="admixturegraph"; version="1.0.2"; sha256="0ld4qyyvbnr5lz9ff64wjwif4c9xnqyjmbfgbl9bk6pia98zppl3"; depends=[doParallel dplyr foreach ggplot2 MASS neldermead pracma]; }; admmDensestSubmatrix = derive2 { name="admmDensestSubmatrix"; version="0.1.0"; sha256="1a5lfm10aj6wdjibdnmffn75zvy6x69w8nqcx2i23gxg6v0xlqcl"; depends=[Rdpack]; }; adnuts = derive2 { name="adnuts"; version="1.0.1"; sha256="1l52f33yzbvcz27iw0k6iwcnfanr65lw206d7w4609k2vmlw8ink"; depends=[ellipse R2admb rstan]; }; @@ -4969,15 +5002,15 @@ in with self; { advclust = derive2 { name="advclust"; version="0.4"; sha256="1g8a8q4zh6d4152jb66fh7wj7k6ks5k4kfcazzw70jdn10yi6b38"; depends=[clue ggplot2 knitr MASS reshape2]; }; adwave = derive2 { name="adwave"; version="1.3"; sha256="11iy50ng0zxvwsvdsvx262j8zgqaai308lp5is47az7xzvk57mx7"; depends=[waveslim]; }; adwordsR = derive2 { name="adwordsR"; version="0.3.1"; sha256="1w5qg4psm8pj89f09pz7in8zkafaimik1n6hx29y55jpmbxbk2gn"; depends=[RCurl rjson]; }; - aemo = derive2 { name="aemo"; version="0.2.0"; sha256="11msifszq7pzmcmwibf2dk2j5dqjc74hrxdxshlprkp6p8sfhijh"; depends=[assertthat dplyr lubridate stringr]; }; + aemo = derive2 { name="aemo"; version="0.3.0"; sha256="108scwyf0dyvn969cks3ikbj2pf2g4dw051asahx26pl0ggw7ijw"; depends=[assertthat dplyr lubridate stringr]; }; afCEC = derive2 { name="afCEC"; version="1.0.2"; sha256="0jdppp93z5nb8m5qbry6cvd472mwiq1yrmm11906c3z2bfz7791f"; depends=[Rcpp RcppArmadillo rgl]; }; afc = derive2 { name="afc"; version="1.4.0"; sha256="1iy1wa88kf6zi6x7lbd0jdir653cvzvdraliqpxbac413wwb5gwl"; depends=[]; }; - afex = derive2 { name="afex"; version="0.26-0"; sha256="0h3p1svgk1ap3lj08fi8nzdb3710h99bv150krf1x8wci1a0r1if"; depends=[car lme4 lmerTest pbkrtest reshape2]; }; + afex = derive2 { name="afex"; version="0.27-2"; sha256="0qsmcddy4449qjj3ajmqvdiqdkhkswmz5dqf150wxwq897p3bvf2"; depends=[car lme4 lmerTest pbkrtest reshape2]; }; affluenceIndex = derive2 { name="affluenceIndex"; version="1.0"; sha256="1nb2dlsnvjsvkyrfdaskmpr3kv3qgdfb60xgmzvscfli0yf4dzr1"; depends=[]; }; afmToolkit = derive2 { name="afmToolkit"; version="0.0.1"; sha256="1pm3xyh9vq10mmfgknlvlfr9f027xprrgy1dvbbxpi7f111hv1gl"; depends=[assertthat DBI dplyr ggplot2 gridExtra minpack_lm scales tibble]; }; - afpt = derive2 { name="afpt"; version="1.0.0"; sha256="0kshyzvw8sp7p686xi98g758zld3n7kq44lnvly8d0y8fg6ahcl2"; depends=[]; }; + afpt = derive2 { name="afpt"; version="1.1.0.1"; sha256="0cg5cdm9nl1hs6f3j0ljpw4bkqvh3ksyj615b9nnbqs5k28lyds9"; depends=[]; }; aftgee = derive2 { name="aftgee"; version="1.1.3"; sha256="1zkb99938q8pp318a0c0bpgzcqxc8ijygfz904lz6n40c5i2i9lz"; depends=[BB geepack MASS survival]; }; - agRee = derive2 { name="agRee"; version="0.5-2"; sha256="1fhpkhnq8gbdy8k2w5wwn7h7gj0mmvk052fqxfazksxrlqicbbhb"; depends=[coda lme4 miscF R2jags]; }; + agRee = derive2 { name="agRee"; version="0.5-3"; sha256="1wi8jn14kpsj5z49my6fz8j6zxysddxm8svw86cnzsmnbj6mzq7x"; depends=[coda lme4 miscF R2jags]; }; aggregation = derive2 { name="aggregation"; version="1.0.1"; sha256="0j9g604m2ccc7hcy02539yja9cf3xcbl25gvp838bp4x8w18my46"; depends=[]; }; agop = derive2 { name="agop"; version="0.2-3"; sha256="1z90a07wzn5z4cbafwpfh3l3v1bgq9g89qbdjm51f78zynnb27dk"; depends=[]; }; agriTutorial = derive2 { name="agriTutorial"; version="0.1.5"; sha256="0c0p0bqcrnx34q5brnvgq10wkzahvgyybaz2xfmcghbdvzahd2dx"; depends=[emmeans ggplot2 lattice lmerTest nlme pbkrtest]; }; @@ -4985,23 +5018,27 @@ in with self; { agridat = derive2 { name="agridat"; version="1.16"; sha256="1kgmjrj207md86qivadkmv3s2gh3hi9zv63bsj8b9vlcd9f58pfk"; depends=[]; }; agriwater = derive2 { name="agriwater"; version="1.0.0"; sha256="0m1dpv69nf3pjp63z3a5710skgb6sbrmjv6b8rxvq9lrw63993g9"; depends=[raster rgdal sp]; }; agrmt = derive2 { name="agrmt"; version="1.40.4"; sha256="1y2gnq6b4zkxknygg73r8qrd435y7c69iqn8i56kwk1ccc1rwddx"; depends=[]; }; + agroclim = derive2 { name="agroclim"; version="0.1.0"; sha256="16cyqplzmwziqwkicix0sr06zhc0yx615iv3hda0cxbdyf2rllk3"; depends=[abind cowplot easyNCDF ggforce ggplot2 ggpubr gtable multiApply ncdf4 plyr raster reshape sp zoo]; }; agrostab = derive2 { name="agrostab"; version="0.1.0"; sha256="0mcskv3144j594wqljzn5pwbhkxh6sb76b1c2wabzjvi61zrapiv"; depends=[dplyr ggplot2 rlang]; }; agsemisc = derive2 { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; }; ahaz = derive2 { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[Matrix survival]; }; ahnr = derive2 { name="ahnr"; version="0.3.1"; sha256="1g8m3q108ricfyn4fjjaihpr93xz7fm2sfzg3i0fz1n1i703jwm8"; depends=[ggplot2 magrittr matrixcalc pdist pracma purrr visNetwork]; }; ahp = derive2 { name="ahp"; version="0.2.12"; sha256="0zjhgl0smzx4bkhmdm4rmpyrq4hmxy1nkxvwqjr40pz7vm69icqx"; depends=[data_tree DiagrammeR formattable yaml]; }; ahpsurvey = derive2 { name="ahpsurvey"; version="0.4.1"; sha256="1r7x4c318nzbx0ppm9272kfpz2bln1cafkv9irnj85nsdcravr33"; depends=[dplyr knitr magrittr randomNames Rdpack tidyr]; }; + aiRly = derive2 { name="aiRly"; version="0.1.0"; sha256="0d3w5dwk0b3pd49zw2005rili4p3l1i3x4hzp8cf6rljr86x01cy"; depends=[httr jsonlite reshape2 tibble]; }; aiRthermo = derive2 { name="aiRthermo"; version="1.2.1"; sha256="058082qdfi1pbdgf26vbfahri1kbc8b2l816q4dq89j5aj5is0a2"; depends=[]; }; + aibd = derive2 { name="aibd"; version="0.1.8"; sha256="1pgfvz3b276y9pl6m3rghjlvhkrqp04w8gj3zzl7j446d372lm9h"; depends=[commonsMath rscala]; }; aidar = derive2 { name="aidar"; version="1.0.5"; sha256="1q2iz2qzh2yl0v0sc537xq4vbx2nblym3kv419vr7jvrghdpx3vj"; depends=[XML]; }; aimPlot = derive2 { name="aimPlot"; version="1.0.0"; sha256="1d52b7kccxba6j7n0gbd7pzs0p87zn32vv8gdf2f7lyr75qzgz7x"; depends=[ggplot2]; }; aimsir17 = derive2 { name="aimsir17"; version="0.0.1"; sha256="0d3zygsnflymmfh7pflnynsf1klxjjyrqz5g5fnj2vwsicb40l4x"; depends=[tibble]; }; - airGR = derive2 { name="airGR"; version="1.4.3.52"; sha256="0rknrfpyb6qs0ppai8qvqqvf89cvz8f4wk1xf03ks0i4aln1np44"; depends=[]; }; - airGRteaching = derive2 { name="airGRteaching"; version="0.2.6.29"; sha256="15sjwkyvgxihiz35qc8rg1f7f3vb4wdwbrfb37gx8mzql0mwqx4q"; depends=[airGR dygraphs markdown plotrix shiny shinyjs xts]; }; + airGR = derive2 { name="airGR"; version="1.4.3.65"; sha256="1x9zf6bbcaflszqzaki940xy33g4wj4yqsgbg836a1dwv1crd1l7"; depends=[]; }; + airGRteaching = derive2 { name="airGRteaching"; version="0.2.8.69"; sha256="0z2iwqr0qm9wv7hl337l0kbjnc9h0pjahwnk3y89x8frisa2cc32"; depends=[airGR dygraphs markdown plotrix shiny shinyjs xts]; }; aire_zmvm = derive2 { name="aire.zmvm"; version="0.8.2"; sha256="0z9knqdl7ihx2vph154qi1lh4s6yvlcw6kwry8k47mhh3p7pynsd"; depends=[dplyr httr lubridate progress readr readxl rvest sp stringr tidyr xml2]; }; airportr = derive2 { name="airportr"; version="0.1.3"; sha256="1h8h0cdfqgxv8cf9hp82sx5n4a1z88qyyxicj7d2kmmybqqz2r5n"; depends=[dplyr]; }; + airqualityES = derive2 { name="airqualityES"; version="1.0.0"; sha256="1kf673ajk06ggy9524lip5flpfgq0gql7d46kgnri8l3kbzw7zcj"; depends=[tibble]; }; airr = derive2 { name="airr"; version="1.2.0"; sha256="1vswbjmyhygmyqymkfxad9nwsbcgaggian1fyrx63w0y9c4dfv1h"; depends=[readr stringi yaml]; }; ajv = derive2 { name="ajv"; version="1.0.0"; sha256="1qd5ncb7rdnnvqfknsvq9nrpxrh0zv3jyh4b91dcvfvhp262vfrm"; depends=[RJSONIO V8 yaml]; }; - akc = derive2 { name="akc"; version="0.9.3"; sha256="15sams52pzf5d0b1nmixff9xddgl1c1xdni9s1vfj0vnrf64kkn1"; depends=[data_table dplyr ggforce ggplot2 ggraph igraph magrittr rlang stringr textstem tibble tidygraph tidytext widyr]; }; + akc = derive2 { name="akc"; version="0.9.4"; sha256="1bvlj3h1fa3n9dkfhr5zhh8j3m8wafr6370sfg24vjwmiqpmx96j"; depends=[data_table dplyr ggforce ggplot2 ggraph ggwordcloud igraph magrittr rlang stringr textstem tibble tidygraph tidytext widyr]; }; akima = derive2 { name="akima"; version="0.6-2"; sha256="1klprj4a2pgy5pwdwnrn3siisi2lh8hr4z6vz38sdvjkcmakxnk1"; depends=[sp]; }; akmeans = derive2 { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; }; akmedoids = derive2 { name="akmedoids"; version="0.1.5"; sha256="0yn5rjgb5rrhphgbjn49098ybkmzda6yxzfqgbsppfgjidrafhza"; depends=[ggplot2 Hmisc kml longitudinalData reshape2 signal]; }; @@ -5021,24 +5058,25 @@ in with self; { alleHap = derive2 { name="alleHap"; version="0.9.9"; sha256="1fqrw645s3f5363p7jl3dzy8xphxdr1v6wdsjmqcqwpgvjqfr2zz"; depends=[abind]; }; allelematch = derive2 { name="allelematch"; version="2.5.1"; sha256="00117cj01psax4rjvy2nja5r2ss9l8zzjicczh46kp401i1ghmwc"; depends=[dynamicTreeCut]; }; allelic = derive2 { name="allelic"; version="0.1"; sha256="0xs4kd3vqb5ph8kqc3lcqgirrdkz8b627pvnczvci2g0sr3cl18j"; depends=[]; }; + allestimates = derive2 { name="allestimates"; version="0.1.6"; sha256="1jrp5nh9g2alx8aycysiymhylm2r7lqf8s68ppbgy6liw3iazym2"; depends=[broom dplyr ggplot2 MASS speedglm stringr survival tibble tidyr]; }; alluvial = derive2 { name="alluvial"; version="0.1-2"; sha256="039frwrsxq1lb97s7vf2vbyyadimkigs628ymym06fxka53drdkp"; depends=[]; }; + alookr = derive2 { name="alookr"; version="0.3.0"; sha256="0xd80mypg07ifsx17aivciknk231yhi34c8vzwjnyasg2h88s3is"; depends=[caTools cli dlookr dplyr future ggmosaic ggplot2 MASS MLmetrics party purrr randomForest ranger RColorBrewer rlang ROCR rpart tibble tidyr tidyselect unbalanced]; }; alpaca = derive2 { name="alpaca"; version="0.3.2"; sha256="07r13gyqb876p6zx3pydl414zrgc473dnyn5ja6hmzjmkv19lw4k"; depends=[data_table Formula MASS Rcpp RcppArmadillo]; }; alphaOutlier = derive2 { name="alphaOutlier"; version="1.2.0"; sha256="09yrbv7jsiymw5gzp8p92ki70v1fys2k75x4sb9s7wy3c58wn1cd"; depends=[nleqslv quantreg Rsolnp]; }; alphabetr = derive2 { name="alphabetr"; version="0.2.2"; sha256="1pmp6zwhgycb38y5jbvrbv2nza7gyjh508vy09ml483c2cysvc1r"; depends=[clue dplyr multicool Rcpp]; }; alphahull = derive2 { name="alphahull"; version="2.2"; sha256="024d70z9pasyfp83zwgh7fkjky70l74pbzw1wvazzq75p9m91vzv"; depends=[ggplot2 R_utils sgeostat spatstat splancs tripack]; }; alphashape3d = derive2 { name="alphashape3d"; version="1.3"; sha256="15l8hsn3jcn5jzwfpya99v2mzrgmhl3i587nw6cx4aky75ajslcx"; depends=[geometry rgl]; }; alphastable = derive2 { name="alphastable"; version="0.2.1"; sha256="01gwrcxlj2jlb8axs5qmrsixk3a8b7044ypyjg6dpdcxfbcf5fvp"; depends=[mvtnorm nlme nnls stabledist]; }; - alphavantager = derive2 { name="alphavantager"; version="0.1.1"; sha256="0rbvbws0g50z76pvkydadf97gq5yg1l03xlfqyy3yblqh59cj5s6"; depends=[dplyr glue httr jsonlite purrr readr stringr tibble tidyr timetk]; }; + alphavantager = derive2 { name="alphavantager"; version="0.1.2"; sha256="0c97p8njga4xffvsa0kj0s4y0agjr44y9bnjxs5phm1ldcqjs0yj"; depends=[dplyr glue httr jsonlite purrr readr stringr tibble tidyr timetk]; }; alr3 = derive2 { name="alr3"; version="2.0.8"; sha256="1vkwgf5c9zb8pphcw47vfwwk12nfj4nggj8dr88jwbdnv7yd257h"; depends=[car]; }; alr4 = derive2 { name="alr4"; version="1.0.6"; sha256="0v98yzi0fcjxq0ak0w05001h8m9nfa9l0ann9bqvz8bwcmb3jlr2"; depends=[car effects]; }; altR2 = derive2 { name="altR2"; version="1.0.0"; sha256="15nvbq3n76p2857ipyf3q6rs2mwjqsp9gr3rmzbjfm8lrj0faxsv"; depends=[gsl purrr]; }; altair = derive2 { name="altair"; version="4.0.1"; sha256="0s3pvlh6y4h3ni5m8yli6gp6gps7pcpndag40ckr31302ai3bxvq"; depends=[assertthat htmlwidgets magrittr repr reticulate vegawidget]; }; alterryx = derive2 { name="alterryx"; version="0.5.0"; sha256="1p9q4244bm7hf6my8q951idw41xa5gcrdl7znmsng9pwxh8dnz3h"; depends=[base64enc digest httr jsonlite]; }; - altmeta = derive2 { name="altmeta"; version="2.3"; sha256="0fcd2pzp62871b37fcwz1zcidch5akj6a5npcvwzg4zwp8i9rmyl"; depends=[coda rjags]; }; + altmeta = derive2 { name="altmeta"; version="3.0"; sha256="0ga3w1igxfhmhxkvh20kjnxsbsx7lmcv894whpg8n59418s1h2gs"; depends=[coda lme4 Matrix metafor rjags]; }; amap = derive2 { name="amap"; version="0.8-18"; sha256="0zpcb73w413na23f6giml9311jh0j0y766w2fh9i40d2h7bbvyvs"; depends=[]; }; - amber = derive2 { name="amber"; version="0.1.6"; sha256="0n9idgmkqnnsajybkbgczlrr1hyj5z98rixk451lh1r1j2cv8252"; depends=[classInt doParallel foreach Hmisc latex2exp ncdf4 raster rgdal rgeos scico sp viridis xtable]; }; ambhasGW = derive2 { name="ambhasGW"; version="0.0.2"; sha256="0v517i4whip45pk6bwlwval9pz367pcgzz62b2z22mrwgi6m6bck"; depends=[raster rgdal yaml]; }; - ambient = derive2 { name="ambient"; version="0.1.0"; sha256="142q30rhi0wz0gp1v0swm83gbli8j6plpzzpqjwnjc693wd3a1ih"; depends=[Rcpp]; }; + ambient = derive2 { name="ambient"; version="1.0.0"; sha256="0b8nd8g0ydglql2cwi4wmlnv5kyid8q51vz0p08f9m5x73k3z2bd"; depends=[Rcpp rlang]; }; ameco = derive2 { name="ameco"; version="0.2.9"; sha256="0vzwsy7gp17ghl1hgcsbfs9rarzl8dl36x6lplnzrisqv3dqmk25"; depends=[]; }; amelie = derive2 { name="amelie"; version="0.2.1"; sha256="0f4rfijskrw9nmyzbrbz6yfa9d0a5cxjw8n9c36hc6jvh377i7k7"; depends=[]; }; amen = derive2 { name="amen"; version="1.3"; sha256="1qaznfmnh3dlnp41afd37lr328qzy50hn8hi0c302wj0f992ycqg"; depends=[]; }; @@ -5047,106 +5085,100 @@ in with self; { ammistability = derive2 { name="ammistability"; version="0.1.1"; sha256="1vp2857cwn4dd86vj8qf6h4z8hh5q2jvrlpmply8bf70mnmnq18h"; depends=[agricolae ggcorrplot ggplot2 Rdpack reshape2]; }; ampd = derive2 { name="ampd"; version="0.2"; sha256="0bi8qngd37n60ym516yjcahxc536vdwm60rq5ld32170hww69j7c"; depends=[]; }; ampir = derive2 { name="ampir"; version="0.1.0"; sha256="1z9ha329fbji9jlly84cn7z2fxclk3n3w0xddq1mw1gqq3dyb8ba"; depends=[caret kernlab Peptides Rcpp]; }; - amt = derive2 { name="amt"; version="0.0.7"; sha256="1az11vi5kd1sp76xvgshvamyw59dydhp6g4m6c2wqcdll88dlfgn"; depends=[broom checkmate circular ctmm dplyr fitdistrplus FNN geosphere glue KernSmooth lazyeval leaflet lubridate magrittr maptools purrr raster Rcpp rgeos rlang sf sp survival tibble tidyr velox]; }; + amt = derive2 { name="amt"; version="0.1.0"; sha256="0h7ifniqiq6cr0p42yjiykaindwkh1jf5wn0hzn2wg04x1cia995"; depends=[broom checkmate circular ctmm dplyr fitdistrplus FNN geosphere glue KernSmooth lazyeval leaflet lubridate magrittr maptools purrr raster Rcpp rgeos rlang sf sp survival tibble tidyr]; }; anMC = derive2 { name="anMC"; version="0.2.2"; sha256="0ab215nrqn535g9ayqzvgdckhwcrij1mc1296pvlj3grn3f8rhws"; depends=[mvtnorm Rcpp RcppArmadillo]; }; anacor = derive2 { name="anacor"; version="1.1-3"; sha256="0mj8g9p4fla0ax9jvcq7kii4lrhj8g872p11nys06anva22qjp51"; depends=[car colorspace fda]; }; - analogsea = derive2 { name="analogsea"; version="0.7.2"; sha256="1dfvdizbxdc00rcabcv1jpy3py4ncb3g2p1kim8m4sy9rdc299yq"; depends=[aws_s3 httr jsonlite magrittr yaml]; }; - analogue = derive2 { name="analogue"; version="0.17-3"; sha256="1dd94hs517f7a11zjxm7wygcc1g72r5hff4figgmqf8c699p5d9y"; depends=[brglm lattice MASS mgcv princurve vegan]; }; + analogsea = derive2 { name="analogsea"; version="0.8.0"; sha256="1naw9qh6rp1hz3mk19jir0qia1daizbfa695qbp1sg6rdh6is8ag"; depends=[httr jsonlite magrittr yaml]; }; + analogue = derive2 { name="analogue"; version="0.17-4"; sha256="02n4imkkfa4gqzwicvz3dpcfwk68rbh48pj5vn6cx6q15bzxdv0i"; depends=[brglm lattice MASS mgcv princurve vegan]; }; analogueExtra = derive2 { name="analogueExtra"; version="0.1-1"; sha256="1s3qs10hf6hkna0bicid1mc8x8r449bl93xpgyw6lnsjgh2yx62c"; depends=[analogue rgl vegan3d]; }; analysisPipelines = derive2 { name="analysisPipelines"; version="1.0.0"; sha256="1q0xhqzc2x3kvz6kray7ckm2i88k488jicsw7wngnywmjhl4z3ni"; depends=[devtools dplyr futile_logger ggplot2 magrittr pipeR proto purrr RCurl rlang]; }; - analytics = derive2 { name="analytics"; version="3.0"; sha256="0js3c8lwj3knccb55nq03cbjlf4w390p9aid2mi5x80l3ayd9in1"; depends=[car cluster fractal lmtest MASS np powerplus robust trend TSA urca VIM]; }; analyz = derive2 { name="analyz"; version="1.4"; sha256="0qdh1gld2dkl0krbhm2vcqg8dfs03dn51rclgsw02554s06dlgxw"; depends=[]; }; anapuce = derive2 { name="anapuce"; version="2.3"; sha256="05k3ypy4dc8q4jv0by37k66pdwb1wmsd24i6nciris5knfdy9csg"; depends=[]; }; anchoredDistr = derive2 { name="anchoredDistr"; version="1.0.3"; sha256="07q4np0zryb49cpi7w5iz0qna63cyp9nz13d8ws6x9ccg417r99a"; depends=[DBI dplyr ggplot2 np plyr reshape2 Rmisc RSQLite]; }; anchors = derive2 { name="anchors"; version="3.0-8"; sha256="12gd2526y7s2a8i6b9xma2c3sc6zxnwzl6sn8b50hbxizwr8d34j"; depends=[MASS rgenoud]; }; andrews = derive2 { name="andrews"; version="1.0"; sha256="130i86qkdy1xpcf611jpzqgmd17iik7j7spdcfwzk48f31biyp8v"; depends=[]; }; anesrake = derive2 { name="anesrake"; version="0.80"; sha256="1p2g51w80jiadlf4asbnsw46asarzlzr5c1yfhdb31ymqxd7p76q"; depends=[Hmisc weights]; }; - anfis = derive2 { name="anfis"; version="0.99.1"; sha256="1v8di5dzwb1g1ldi7idcmmr9nirp9kxvc8km1qq1i8zaw1bh8pqb"; depends=[]; }; angstroms = derive2 { name="angstroms"; version="0.0.1"; sha256="1k8q4pkb5vcjfp2n2dga3q2ydmdxv020k5qzrb6w01ixrgf15d8l"; depends=[nabor ncdf4 proj4 raster sp spbabel]; }; aniDom = derive2 { name="aniDom"; version="0.1.4"; sha256="1h19q3f16g6kacawd2i9i5lg64q436dsbzk9isf3p2mr7p24xbas"; depends=[rptR]; }; anim_plots = derive2 { name="anim.plots"; version="0.2.1"; sha256="0z811y4zzrqas1ynrq4syhxvbcw2girxa6g9biry9d0qgq1w8cp1"; depends=[animation]; }; animalTrack = derive2 { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; }; + animaltracker = derive2 { name="animaltracker"; version="0.1.0"; sha256="1c2qx03yawfdcg992l2k3w52r4hfxakd74ws56phbn5c3bm540k9"; depends=[dplyr elevatr forcats geosphere ggplot2 leaflet leaflet_extras lubridate raster rgdal scales shiny shinyBS shinycssloaders shinyjs shinythemes shinyWidgets sp tibble tidyr V8 zoo]; }; animation = derive2 { name="animation"; version="2.6"; sha256="02jv4h9hpp8niw9656r5n36kqr71jbyynxnywkkkdi0aj8w3cach"; depends=[magick]; }; - animint2 = derive2 { name="animint2"; version="2019.7.3"; sha256="13s6s0py5hfywgknl0521d0xhdb86988pqwymwsw054l9xhp5dns"; depends=[digest gtable lazyeval MASS plyr reshape2 RJSONIO scales tibble]; }; - anipaths = derive2 { name="anipaths"; version="0.9.7"; sha256="1h6rcrybjfc4kn377bay2c3nfv6qwwi0nk14xh6jfdsxqybq6dw2"; depends=[animation ggmap knitr mgcv RColorBrewer rgdal scales sp]; }; + anipaths = derive2 { name="anipaths"; version="0.9.8"; sha256="02d2z236gjh40p29h86ikspnxim49c3c33r4dnf3yzns622ckm2c"; depends=[animation ggmap mgcv raster RColorBrewer scales sp]; }; + aniview = derive2 { name="aniview"; version="0.1.0"; sha256="1klakkmdk4xllaxd0pllvxi4396n6rz2idz55niy91mp0fhcjhwf"; depends=[htmltools jsonlite]; }; anocva = derive2 { name="anocva"; version="0.1.1"; sha256="1byg40jla71k1901js5h9yq89j63d00vkm60id1fxlpv95c4wdrr"; depends=[cluster]; }; anoint = derive2 { name="anoint"; version="1.4"; sha256="10gdqgag9pddvxh80h458gagvv1474g4pcpa71cg3h7g62rqvmv5"; depends=[glmnet MASS survival]; }; anomalize = derive2 { name="anomalize"; version="0.2.0"; sha256="155la2j9bfdwvaq8qv8gjgfy0y4bjpvrymgk0qzbz80hd771lh2j"; depends=[cli crayon dplyr ggplot2 glue purrr rlang rstudioapi sweep tibble tibbletime tidyr timetk]; }; - anomaly = derive2 { name="anomaly"; version="2.0.2"; sha256="1vhbmf1q2rj21bxzh7s969x3j21r8i5crnvzndal4pryyb8bm97a"; depends=[assertive BH dplyr ggplot2 Rcpp Rdpack reshape2 rlang robust]; }; + anomaly = derive2 { name="anomaly"; version="3.0.1"; sha256="1ccgvlv8vq3p1lpkj66da73v5z8ffl3bkx01j08mcgqkv90lppys"; depends=[assertive BH cowplot dplyr ggplot2 Rcpp Rdpack reshape2 rlang robustbase]; }; anominate = derive2 { name="anominate"; version="0.6"; sha256="01p2qkqf88bzhwywyass5r8dwg2ycflmkbzmsps7fzy0kv3xyb02"; depends=[coda MCMCpack pscl wnominate]; }; - antaresEditObject = derive2 { name="antaresEditObject"; version="0.1.7"; sha256="0whwlqsjc9ygh2iv9bmgxglqk061l3mgfsq1a0848180wci6frwb"; depends=[antaresRead assertthat data_table whisker]; }; - antaresProcessing = derive2 { name="antaresProcessing"; version="0.17.0"; sha256="0mq2b1dkkgli8d53mpcllilh72gf8189f5mf0dxjcv4qinnhrrvm"; depends=[antaresRead data_table stringi]; }; - antaresRead = derive2 { name="antaresRead"; version="2.2.4"; sha256="0vi7g3mz92djxhraii788j4ialyvq013cw0grwndp2rz2bmxmgd8"; depends=[bit64 data_table lubridate plyr shiny stringr]; }; - antaresViz = derive2 { name="antaresViz"; version="0.15.0"; sha256="16gf5spgx56rgf2d25zv5dihhbbgvfxryswfqa4gjlpjc2827zar"; depends=[antaresProcessing antaresRead assertthat data_table dygraphs geojsonio htmltools htmlwidgets leaflet leaflet_minicharts lubridate manipulateWidget plotly rAmCharts raster rgeos shiny sp spMaps webshot]; }; + antaresEditObject = derive2 { name="antaresEditObject"; version="0.1.9"; sha256="09zmhzfdzxpp01wmdk230gff6zwgd5p2w3ppbq3a0df3f56x0hix"; depends=[antaresRead assertthat data_table whisker]; }; + antaresProcessing = derive2 { name="antaresProcessing"; version="0.18.0"; sha256="1rw7g4706g4fdx7c7magxqj71h6iwkbslmyrqfwna4irnifjmv7g"; depends=[antaresRead data_table]; }; + antaresRead = derive2 { name="antaresRead"; version="2.2.5"; sha256="10c3ql08211ylc271xk8ffnix3pzmnaylgf0ynwayp34hkgkf37h"; depends=[bit64 data_table lubridate plyr shiny stringr]; }; + antaresViz = derive2 { name="antaresViz"; version="0.15.1"; sha256="1qak4gkqpglmpavm5xm0amszqfzm3zgapxk81l5gn6ff9ilby7fp"; depends=[antaresProcessing antaresRead assertthat data_table dygraphs geojsonio htmltools htmlwidgets leaflet leaflet_minicharts lubridate manipulateWidget plotly rAmCharts raster rgeos shiny sp spMaps webshot]; }; anthro = derive2 { name="anthro"; version="0.9.2"; sha256="15857msr80wqikf2rr7db3f8hhfwnaay10wnj27yig0yls46a99f"; depends=[survey]; }; - antitrust = derive2 { name="antitrust"; version="0.99.11"; sha256="025pm7n06yid28b34llm4rh0mlz0daz9ygh5z0hd87scp8f9gy00"; depends=[BB evd MASS numDeriv rhandsontable shiny]; }; antiword = derive2 { name="antiword"; version="1.3"; sha256="034znb0g9wwb8gi1r3z75v3sbb4mh83qrc4y8mbfx5lbgh8zhj6j"; depends=[sys]; }; anyLib = derive2 { name="anyLib"; version="1.0.5"; sha256="1x9x58hhkkwdskmgdjv94ynh811n9w0752hh4214adl1qpn576vm"; depends=[BiocManager curl devtools httr withr]; }; anytime = derive2 { name="anytime"; version="0.3.7"; sha256="0vkckxaq1ga73iszwr4lyf12c1cann1w9lhflz4p3xdgx468fzb9"; depends=[BH Rcpp]; }; aod = derive2 { name="aod"; version="1.3.1"; sha256="1g03ajhs6bid80i83xn3917abhymzgrydqx86wxxpkqga018hb85"; depends=[]; }; aods3 = derive2 { name="aods3"; version="0.4-1.1"; sha256="1kdmgzd5nkzm0awdjls6fc8p9hxsph9ha9k1jxbppdi4i6f0i7rv"; depends=[boot lme4]; }; + aof = derive2 { name="aof"; version="0.1.2"; sha256="0552i5wvm04dq8a8y1x36sprc9cbx6k7c3bmsgqxm71dpsxajb0i"; depends=[bcpa]; }; aoos = derive2 { name="aoos"; version="0.5.0"; sha256="0y92vs27i0mkpjdclqzq4j9g1axkymhi3v8xp1v6hazh35yzjkfj"; depends=[magrittr roxygen2]; }; - aoristic = derive2 { name="aoristic"; version="0.6"; sha256="0b9h2l59vvrvbjjwwb43j74frvwa8lsj4x5kwhwpsfjfch1yqwjl"; depends=[classInt ggplot2 GISTools lubridate maptools MASS plotKML RColorBrewer reshape2 rgdal sp spatstat]; }; + aoristic = derive2 { name="aoristic"; version="1.0.0"; sha256="1qfphg5mh26q832pkh05q50lg60viyiwwcwmsagqb6r64llmysak"; depends=[foreign formattable ggplot2 htmltools lubridate openxlsx plyr]; }; apTreeshape = derive2 { name="apTreeshape"; version="1.5-0"; sha256="0mnydk157557pnkjvcadlghn5d8w9kxas4kwz4y4w21xg7z1jrig"; depends=[ape coda cubature pbapply quantreg]; }; - apa = derive2 { name="apa"; version="0.3.2"; sha256="09yqpl9vdi0kh5dyjlykdvvhya6cvy7mawsk2gvkvn0yq5bawvnv"; depends=[dplyr magrittr purrr rmarkdown stringr]; }; + apa = derive2 { name="apa"; version="0.3.3"; sha256="1nvhl5fqramsdrkpl1nmgr1vmki5c1lkdi1kkx7ihf0cz35f7c2a"; depends=[dplyr magrittr MBESS purrr rmarkdown stringr tibble]; }; apaTables = derive2 { name="apaTables"; version="2.0.5"; sha256="0h986jqdl65fd33gfa433ik77r6lm9zrq75qfk5r8xsdgzb4wgva"; depends=[boot broom car dplyr tibble]; }; apaText = derive2 { name="apaText"; version="0.1.1"; sha256="1r217k60w027i63nbj24b1rm37m4qf7a6iirc941s945babkxcmb"; depends=[dplyr]; }; apc = derive2 { name="apc"; version="1.3"; sha256="1hgkqkvry9is8kjk2w46k637sig7fdznnc75wbrc8bq1hbrmf785"; depends=[lattice]; }; - apcf = derive2 { name="apcf"; version="0.1.3"; sha256="0wpq0739bpiqqlkl18c81x2g1g4k7xkam03vpj46wmmpa4z0glaa"; depends=[Rcpp]; }; + apcf = derive2 { name="apcf"; version="0.1.4"; sha256="0hylflzcfb2ziys5fdnwqlcmlzs45mch1plb5p0wf2aq5p8cdlx7"; depends=[Rcpp]; }; apcluster = derive2 { name="apcluster"; version="1.4.8"; sha256="0lzf2jqm56i74wif6x5sw3j0w2qc4sni49zq2fgbl89b7lwkvchj"; depends=[Matrix Rcpp]; }; apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; }; ape = derive2 { name="ape"; version="5.3"; sha256="08wbk1kxhs32bmmvqlqanbdg1w235amd35k8m00fngsj9h9xzc08"; depends=[lattice nlme Rcpp]; }; apercu = derive2 { name="apercu"; version="0.2.4"; sha256="046gf4dzypl6mmq7xqkyrdasq9rsjxzsii7w4nxkbn4c40kh7bf7"; depends=[pls]; }; - apex = derive2 { name="apex"; version="1.0.3"; sha256="157i67yvb9xqlhzcgkxj7n5lq65svxs82z38dv2c0k8p4krjl1pd"; depends=[adegenet ape phangorn]; }; - apexcharter = derive2 { name="apexcharter"; version="0.1.3"; sha256="1kgn5bs329l2brrsd0qda87jgkjxa9ksm2plffl4v46nqkz53038"; depends=[ggplot2 htmlwidgets jsonlite magrittr rlang scales]; }; + apex = derive2 { name="apex"; version="1.0.4"; sha256="1ddzbzpnc17yvbl5yfyp0widqlx48qwlh80xcmyzhv045s680rdk"; depends=[adegenet ape phangorn]; }; + apexcharter = derive2 { name="apexcharter"; version="0.1.4"; sha256="1kn0i10wrkb48r3gxxv82mih575csv5695d1l90mh35x45hjgir6"; depends=[ggplot2 htmlwidgets jsonlite magrittr rlang shiny]; }; aphid = derive2 { name="aphid"; version="1.3.3"; sha256="1jqpn7w5sgy4k49qd9ci6yj89s55gzwl5w5ldw793mzpg6if7lfn"; depends=[kmer openssl Rcpp]; }; aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; }; + aplot = derive2 { name="aplot"; version="0.0.4"; sha256="09drrirj7k06gzhda36whpl21b7ca4grsxqlayaxrmilvapmf795"; depends=[ggplot2 magrittr patchwork]; }; aplpack = derive2 { name="aplpack"; version="1.3.3"; sha256="010saim43d3hr83ksi916846rh6qfbb0gvhsf5jbdx95m4bai9g3"; depends=[]; }; apmsWAPP = derive2 { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[aroma_light Biobase DESeq edgeR genefilter gtools multtest seqinr]; }; apng = derive2 { name="apng"; version="1.0"; sha256="13hvr1w566anrhdicaqwqjgfq2lk3zkn5gcfgy8zazjnad4vy07y"; depends=[bitops]; }; - apollo = derive2 { name="apollo"; version="0.0.9"; sha256="1gzwfra74bb8jihc75lgymf5m194xmk6wz7p9mhjchgvb98czjqz"; depends=[coda maxLik mnormt mvtnorm numDeriv randtoolbox Rcpp RcppArmadillo RcppEigen RSGHB sandwich]; }; - apparent = derive2 { name="apparent"; version="1.1"; sha256="03n3pq620xg1vykzsmvxp6wr9hs561pl5ds50g7zmxk9z0ijcb32"; depends=[outliers]; }; + apollo = derive2 { name="apollo"; version="0.1.0"; sha256="0i80js5gxz3rj6977iwnm7pi9qgq2iz4h83nz8301ra94g7kjv40"; depends=[coda Deriv maxLik mnormt mvtnorm numDeriv randtoolbox Rcpp RcppArmadillo RcppEigen RSGHB sandwich]; }; apple = derive2 { name="apple"; version="0.3"; sha256="194z2f6hwdjjxdkjwlmfhpfp26p9yp3gparklhdbb6zlb4a9nnhz"; depends=[MASS]; }; appnn = derive2 { name="appnn"; version="1.0-0"; sha256="0wkpr6lcd68wlzk6n622ab7sd99l837073czn4k56hw8bw9v68j3"; depends=[]; }; approximator = derive2 { name="approximator"; version="1.2-7"; sha256="0smqjdla9mvzy164nsb0pw0sgal3w2wnyhqidp74h0smyczrr1zw"; depends=[emulator mvtnorm]; }; - approxmatch = derive2 { name="approxmatch"; version="1.0"; sha256="1z1lrbfvm380p2az88hrxr3f2cgbv2h70wzm99vi9a2dmh0pl7qy"; depends=[]; }; + approxmatch = derive2 { name="approxmatch"; version="2.0"; sha256="1n6v1h4zf1nf8j1a5d0h95v6q8dff39v9061i7zzi9ci3lw04748"; depends=[]; }; aprean3 = derive2 { name="aprean3"; version="1.0.1"; sha256="17rnq02sncl6rzwyln10200s43b8z1s2j0kdi9kgcb6qr51v12rv"; depends=[]; }; apricom = derive2 { name="apricom"; version="1.0.0"; sha256="1gyd1yln14cn0iswj7sjs4hav6j6d4f3ncps4gqbci5fwha5blcr"; depends=[logistf penalized rms shrink]; }; aprof = derive2 { name="aprof"; version="0.4.1"; sha256="14qclp88j4ygd4vrxxpgy2s9939wcajjsqycdzpvn64ws29sdpvh"; depends=[testthat]; }; apsimr = derive2 { name="apsimr"; version="1.2"; sha256="14vhsm6am2c2q2sgabnhxr0lgldifss0anjpisrhjqk04njllviy"; depends=[ggplot2 lubridate MASS mgcv reshape2 XML]; }; apsrtable = derive2 { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; }; apt = derive2 { name="apt"; version="2.5"; sha256="1y18bqnnxy5p0xx9gbfrnrzq3nlhw3psl5zlibrw6lfhb8lxd4mk"; depends=[car copula erer gWidgets urca]; }; - aptg = derive2 { name="aptg"; version="0.1.0"; sha256="06z8041h1k9v0ymd7azn11xzhqxb8lda4r7nyg51h8z3i8mpq1ba"; depends=[ape brranching phytools taxize xml2]; }; - apyramid = derive2 { name="apyramid"; version="0.1.0"; sha256="0r0mx5m3jwjdw0npvlch4h6n73sy277wzcrffm6zz0ki9rkm0can"; depends=[dplyr forcats ggplot2 glue rlang scales tidyselect]; }; - aqfig = derive2 { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; }; + apyramid = derive2 { name="apyramid"; version="0.1.1"; sha256="0lqmk2cm4dflzq1f67mfdxpq9slfz2k9fnsvhrwb5dj5kw2az3i6"; depends=[dplyr forcats ggplot2 glue rlang scales tidyselect]; }; aqp = derive2 { name="aqp"; version="1.19"; sha256="1z5qbzhsn79xz17i53hy48xnwf64k5cc24jxwvysyv8p2ylrir0i"; depends=[cluster digest lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; }; aqr = derive2 { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[RCurl xts]; }; ar_matrix = derive2 { name="ar.matrix"; version="0.1.0"; sha256="1d531hkl50szfa1q0zbp8dp1a9jli63kwvxjgc9n0ar279y47qdz"; depends=[MASS Matrix sp sparseMVN]; }; arabicStemR = derive2 { name="arabicStemR"; version="1.2"; sha256="1vflynbi7aln7x2p4jg9gsvfrxn4v6qkb4wbrzxmj561lqy9fcay"; depends=[]; }; arc = derive2 { name="arc"; version="1.2"; sha256="1advs0aqxh84c5n9akww8cdafh7npgaibrb42wncwhv9nfi7wy1v"; depends=[arules discretization Matrix R_utils]; }; archdata = derive2 { name="archdata"; version="1.2"; sha256="0igh6qy3yv5hzprj9izpkqp3f6jkb7pydqzmnl8sqhqjqvb3lnij"; depends=[]; }; - archetypal = derive2 { name="archetypal"; version="1.0.0"; sha256="1b5c881balv4p0zr7bgg741mzfnw5fvg6ns303rsqashydxcnyiv"; depends=[doParallel geometry inflection lpSolve Matrix]; }; + archetypal = derive2 { name="archetypal"; version="1.1.0"; sha256="1x1642p2l19drp22mi1pci7v3s19j885pkx0s2kn7aawpjfis9nw"; depends=[doParallel geometry inflection lpSolve Matrix plot3D]; }; archetypes = derive2 { name="archetypes"; version="2.2-0.1"; sha256="0ibxsr173ib77gjhid91m85s8gjii4mi2w3d52q5301igv20p7r0"; depends=[modeltools nnls]; }; archiDART = derive2 { name="archiDART"; version="3.3"; sha256="01fmyp3f26v5rdgi00qyn139fgq55yxz5nhx223hg78qwrrbjvpw"; depends=[geometry gtools rgl sp TDA XML]; }; archivist = derive2 { name="archivist"; version="2.3.4"; sha256="1i11hrcq1910jgd6diw6h3sxx624v57zjianm49pqvb2dvd0b8y7"; depends=[DBI digest flock httr lubridate magrittr RCurl RSQLite]; }; archivist_github = derive2 { name="archivist.github"; version="0.2.6"; sha256="092fzi505vx9xbk41m86d0isxna42iflp7q2kjiqa6z1ccvim2yx"; depends=[archivist digest git2r httr jsonlite]; }; - arcos = derive2 { name="arcos"; version="0.8.2"; sha256="055sr3brad4p47d018s14zsxlqyzfcvk7zdkqfdi9bxqway8vm7q"; depends=[dplyr jsonlite magrittr stringr urltools vroom]; }; areal = derive2 { name="areal"; version="0.1.5"; sha256="01fh4al7hz9hxnvkp4my8937czhr8jnxyvpnj4gmhsm4alv25yfc"; depends=[dplyr glue purrr rlang sf]; }; areaplot = derive2 { name="areaplot"; version="1.2-1"; sha256="1bmr092pgflgyss50xy1hs5xjl57i2wmfg7qa513sh120fi2mina"; depends=[]; }; arena2r = derive2 { name="arena2r"; version="1.0.0"; sha256="14zjpglp389pldi436935fz6mgi4jdgfii1m035nsvihrms9gqkh"; depends=[dplyr ggplot2 magrittr purrr rlang shiny shinyBS shinydashboard shinyjs tidyr]; }; - arf3DS4 = derive2 { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nfmcj1vp28wj0wymsjdz8ylxhm3jblbgmxc"; depends=[corpcor]; }; arfima = derive2 { name="arfima"; version="1.7-0"; sha256="0kj8qv6m2fcdw8x735n8fk9cynm0jxi5v9hif0f879sxk6qkxb9y"; depends=[ltsa]; }; - argo = derive2 { name="argo"; version="2.0.0"; sha256="0gy43p7wdja3q99db56b8dr3yx8ca0zjv4gc33xv61fypdimgqrd"; depends=[boot glmnet Matrix XML xtable xts zoo]; }; argon2 = derive2 { name="argon2"; version="0.2-0"; sha256="0kqn06rpb39jlzizjlnc5c44mfic8llrshxn7ljgmyj35lbqwxqh"; depends=[]; }; argonDash = derive2 { name="argonDash"; version="0.2.0"; sha256="1wykr7y5375g1nb18ynybccxmd948xrr0gdwxxqsfjf782vlgd2d"; depends=[argonR htmltools shiny]; }; argonR = derive2 { name="argonR"; version="0.2.0"; sha256="15hlvansqnky9bnq4r7xza3hb1hzylmhz8117wxz9lxa1wiky2is"; depends=[htmltools rstudioapi]; }; argosfilter = derive2 { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; }; argparse = derive2 { name="argparse"; version="2.0.1"; sha256="1as7h6z7kzgv0fqzpnp76qbm96b4jcd37azd58b7rz0l1n94764l"; depends=[findpython jsonlite R6]; }; argparser = derive2 { name="argparser"; version="0.6"; sha256="1pxiz9jlhlnpzqn1lz349r07i7glw708w202x6dlnxp112fg7k4x"; depends=[]; }; - ari = derive2 { name="ari"; version="0.3.3"; sha256="1gbbims0vqm3rnkrg064aa2h359hl4il4grdpy0va8hq3mrkvkrb"; depends=[hms progress purrr rmarkdown rvest text2speech tuneR webshot xml2]; }; + ari = derive2 { name="ari"; version="0.3.5"; sha256="03w99c918jp23d0kl26vx4m7xjicpgwl5rhn9d0fsm4kvv7j87li"; depends=[hms progress purrr rmarkdown rvest text2speech tuneR webshot xml2]; }; aricode = derive2 { name="aricode"; version="0.1.2"; sha256="0w5ap0lhp9x67qvz3z80y49311g6h24x11yn8ziv75s3kaxy2wvz"; depends=[Matrix Rcpp]; }; arkdb = derive2 { name="arkdb"; version="0.0.5"; sha256="00ih2in6q0kismpc5jc8w3609nxjkmybx8i19cjlbr93y2zjm29i"; depends=[DBI progress]; }; - arkhe = derive2 { name="arkhe"; version="0.2.0"; sha256="0qw5n73vzzkqlb7c1n4f38v3vlmc2cqwq59j4zqvs9h5ipbf15bm"; depends=[]; }; + arkhe = derive2 { name="arkhe"; version="0.2.2"; sha256="0wfi6wgarjfkni4l1wy863i1cbqsckcw3ar357rkcwz3kks47f6p"; depends=[]; }; arm = derive2 { name="arm"; version="1.10-1"; sha256="0vvp90jygajd6ydky57z66wqjq9msfbl88irj5jbsray574mh4bg"; depends=[abind coda lme4 MASS Matrix nlme]; }; armada = derive2 { name="armada"; version="0.1.0"; sha256="191iwf5y1za3wssawkyi9jcingfqqxcvv88hglpw6j7y3x5f47hf"; depends=[anapuce circlize ClustOfVar ComplexHeatmap doParallel FAMT glmnet impute mvtnorm qvalue VSURF]; }; armspp = derive2 { name="armspp"; version="0.0.2"; sha256="098c59hdzr4ly8sx72xkcbjmiz5y65id1slsscwjji1yssb23lqq"; depends=[Rcpp]; }; @@ -5154,38 +5186,38 @@ in with self; { aroma_affymetrix = derive2 { name="aroma.affymetrix"; version="3.2.0"; sha256="19xh67ncr8cs8i9k803qsnx7jhwj2b72ls7nznf3dn3frw9wyyfj"; depends=[aroma_apd aroma_core future listenv MASS matrixStats R_cache R_devices R_filesets R_methodsS3 R_oo R_utils]; }; aroma_apd = derive2 { name="aroma.apd"; version="0.6.0"; sha256="1l9p5qww71h6wlg2z15wirsfz2i7hmf637l17zaf3n7fp9s3flc7"; depends=[R_huge R_methodsS3 R_oo R_utils]; }; aroma_cn = derive2 { name="aroma.cn"; version="1.6.1"; sha256="1d9g81b12a3m03wrvb3cvg33fjybgiabpxhci2y2rr6diay42pmr"; depends=[aroma_core matrixStats PSCBS R_cache R_filesets R_methodsS3 R_oo R_utils]; }; - aroma_core = derive2 { name="aroma.core"; version="3.2.0"; sha256="1c4spy2sc80clz49irzilsqy65k6q2vl86qaydnymkzljcz7bbpg"; depends=[future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; }; + aroma_core = derive2 { name="aroma.core"; version="3.2.1"; sha256="1nc88h7khjabgzyj4nvjkx9dzmic6bhhfskf024yq3rf1d55v09g"; depends=[BiocManager future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; }; arpr = derive2 { name="arpr"; version="0.1.1"; sha256="0j69nbmhmhmyfna011gv68wvxv1x2lijz94pyg9g2ax720x74i2q"; depends=[magrittr]; }; arrApply = derive2 { name="arrApply"; version="2.1"; sha256="0qy7iwi580rrf3sycsbv6qgxsqcdy9pdbnkdrx81j68qni9iw737"; depends=[Rcpp RcppArmadillo]; }; arrangements = derive2 { name="arrangements"; version="1.1.8"; sha256="03dzvahy8mwp6w1smnbp83zk8w8pfkmsfd1f68bd8jjvdb5lrz71"; depends=[gmp R6]; }; - arrayhelpers = derive2 { name="arrayhelpers"; version="1.0-20160527"; sha256="1ib91hpg6xgy0jr4sb8ib19x0v4f5n96lak0qm0z5vksawgcnp1l"; depends=[svUnit]; }; - arrow = derive2 { name="arrow"; version="0.15.1.1"; sha256="0qdzq22x3cqfwa9a62rl718kbmq87rk3s0k17hsh5122sb8lwvh1"; depends=[assertthat bit64 purrr R6 Rcpp rlang tidyselect]; }; + arrayhelpers = derive2 { name="arrayhelpers"; version="1.1-0"; sha256="02rl530qxi1idiqpmzg5wr9vl5c7phizhpj64k5pn8xq9zfxbpaz"; depends=[svUnit]; }; + arrow = derive2 { name="arrow"; version="0.17.0"; sha256="0sacpxbz68797sf9irrjfchcfs1m4dbidnvb1z7gb4xiyin0npz8"; depends=[assertthat bit64 purrr R6 Rcpp rlang tidyselect vctrs]; }; ars = derive2 { name="ars"; version="0.6"; sha256="0zs1rk3i7pc9wcvxrvjcls194mfbvmkz7cb6pwd1cm3fzjwsyxsp"; depends=[]; }; arse = derive2 { name="arse"; version="1.0.0"; sha256="0ssaalc058m09gfcr1n0s729rx2plia3zkhlynj67drclyvhyb0i"; depends=[dplyr pracma]; }; - arsenal = derive2 { name="arsenal"; version="3.3.0"; sha256="1bn1i5cdy6caw6ndqcfy41x3qb0hj3g4r8p4jl24gljygd3rvzgh"; depends=[]; }; + arsenal = derive2 { name="arsenal"; version="3.4.0"; sha256="090q0kjpcjdxa6r22pb7wzhvgcdq41khh1af7pqgg1rvn2d97x4n"; depends=[knitr]; }; artfima = derive2 { name="artfima"; version="1.5"; sha256="1nqsq9fsqk9kag9n7i2r9yvf578nkdfrkkv7qy8650prka0jca2p"; depends=[gsl ltsa]; }; - arules = derive2 { name="arules"; version="1.6-4"; sha256="003c5cd3xzq39h7c19px077ygm0n1v7k83icy5zzrnkagyds2p8n"; depends=[Matrix]; }; - arulesCBA = derive2 { name="arulesCBA"; version="1.1.6"; sha256="1b82am0sv5211x65r45k7pw52hfywv5i8zqr5asczdkx07s6273s"; depends=[arules discretization glmnet Matrix testthat]; }; + arules = derive2 { name="arules"; version="1.6-5"; sha256="0bcvfn8lvcv74vv9z3kgg7yq5hm7wjqhmzadi55cbm8zxd76g84v"; depends=[Matrix]; }; + arulesCBA = derive2 { name="arulesCBA"; version="1.2.0"; sha256="1d72lrfbyr2g7n6r04vyaqs3pvs3jhkfr4yfgn2fj690q3ff0qr3"; depends=[arules discretization glmnet Matrix]; }; arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; }; - arulesSequences = derive2 { name="arulesSequences"; version="0.2-22"; sha256="0m4g1mgc1swixq9z2v30bjvgnkqsjrinsmwqznrycxyzcgwbn8b3"; depends=[arules]; }; + arulesSequences = derive2 { name="arulesSequences"; version="0.2-24"; sha256="0sgysrvmdsr6l0661llrmsnnn397n2niv0bhlm0i31ak0fwh1ljz"; depends=[arules]; }; arulesViz = derive2 { name="arulesViz"; version="1.3-3"; sha256="1c51l4hqai07qx20lbdvffxw9kx0vkgbccw7b9wz1h2n5ma90c8y"; depends=[arules colorspace DT igraph plotly scatterplot3d seriation vcd visNetwork]; }; asVPC = derive2 { name="asVPC"; version="1.0.2"; sha256="07nfwr0lsfpwgfdgzcdn1svw8dnjfni5ga9q77yjd1bj0wf76ci2"; depends=[ggplot2 plyr]; }; asaur = derive2 { name="asaur"; version="0.50"; sha256="0c1rgic76w3i2xhna7i52lyc0p01s5b1mxyn55gqw6i19v9mq0b3"; depends=[]; }; - asbio = derive2 { name="asbio"; version="1.6-1"; sha256="0fhn0c743ndirqc9sbjq819xbrhjky2adk7nrjh2khjfbfrf0fw6"; depends=[deSolve gWidgets lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; }; - asciiSetupReader = derive2 { name="asciiSetupReader"; version="2.3.0"; sha256="1gfd1pqanxc3wsl1pmqc9csbzlffryvjkd1p2fa7b0kbwl1ln63s"; depends=[data_table haven miniUI readr rstudioapi shiny stringr vroom zoo]; }; + asbio = derive2 { name="asbio"; version="1.6-3"; sha256="15b3018wyf41iajy92a0nzhhz0qfawi05zy5my1hq3l5mrlkidh1"; depends=[deSolve gWidgets gWidgetstcltk lattice multcompView mvtnorm pixmap plotrix scatterplot3d tkrplot]; }; + asciiSetupReader = derive2 { name="asciiSetupReader"; version="2.3.1"; sha256="031x6kvzpfh2falzg2qgch2czj74a4mskl8cn83y9rs0shswvmhx"; depends=[data_table haven miniUI readr rstudioapi shiny stringr vroom zoo]; }; asciicast = derive2 { name="asciicast"; version="1.0.0"; sha256="0vga88cq2hzi0bwq43n1yz5cm8kaag9xpg8v73gj06fb93lhha9x"; depends=[curl jsonlite processx tibble uuid V8]; }; asciiruler = derive2 { name="asciiruler"; version="0.2"; sha256="0xhkbsy9dypk09avazgxczyfkh3rhdxhwci688dw1lxnhxv1hj24"; depends=[stringr]; }; asd = derive2 { name="asd"; version="2.2"; sha256="0p3r4qjam3sl3rpcilb0pgx4xx3ly71xqnvkv31vzjs885lgxz4l"; depends=[mvtnorm]; }; asdreader = derive2 { name="asdreader"; version="0.1-3"; sha256="15a922aw0v5w4hrha03xifx8cpifcc773gambgwqq6i5nz08ya26"; depends=[]; }; ash = derive2 { name="ash"; version="1.0-15"; sha256="1ay2a2agdmiz7zzvn26mli0x0iwk09g5pp4yy1r23knhkp1pn2lb"; depends=[]; }; + ashr = derive2 { name="ashr"; version="2.2-47"; sha256="1rqb5j30ylaf1h4l66x4jxyn5inrvhc42d90qd5mgkxsq0ghdlr4"; depends=[etrunct invgamma Matrix mixsqp Rcpp SQUAREM truncnorm]; }; asht = derive2 { name="asht"; version="0.9.4"; sha256="1aq384vgf26ig3isyp99z09glcjhl2qd43kp8qdcwk75dcrmxd7z"; depends=[bpcp coin exact2x2 exactci perm ssanv]; }; askpass = derive2 { name="askpass"; version="1.1"; sha256="07q0ik8jzk44vpwh48rr3fnpd7dzsdhjjsl4l850rffv3dyq4h6v"; depends=[sys]; }; - aslib = derive2 { name="aslib"; version="0.1"; sha256="0dkb6bb6dqavjklbciqxqhi3fdqib9asdnhiap2gp9b9wfnkyq7k"; depends=[BatchExperiments BatchJobs BBmisc checkmate corrplot ggplot2 llama mlr parallelMap ParamHelpers plyr reshape2 RWeka stringr yaml]; }; asnipe = derive2 { name="asnipe"; version="1.1.12"; sha256="01k2qr9vpazj4mhz4zpngav31d69qr73i8fc59x8gdbi3ipic7rs"; depends=[MASS Matrix]; }; aspace = derive2 { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[Hmisc shapefiles splancs]; }; aspect = derive2 { name="aspect"; version="1.0-5"; sha256="0pbc0daxw20xcbgqyyd5gbs9kmbaf2dq8ajllx0mnfwdcak9jfgj"; depends=[]; }; aspi = derive2 { name="aspi"; version="0.2.0"; sha256="0rhvxw243vvdv3hxa6pi343gcjc2cbxq1jzqirl9k1l4i3897l87"; depends=[]; }; - asremlPlus = derive2 { name="asremlPlus"; version="4.1-36"; sha256="1qh6k1vf3a01dzllapjwrz7qw7bl2pxbbwij20pwhb4v8njpy1y7"; depends=[dae doParallel dplyr foreach ggplot2 plyr RColorBrewer reshape stringr]; }; + asremlPlus = derive2 { name="asremlPlus"; version="4.2-18"; sha256="1v83ahb7rndybfzaw6gnv0m4fvp8nv8gsrsasa8x59n6pd5jkjd9"; depends=[dae doParallel dplyr foreach ggplot2 plyr RColorBrewer reshape stringr]; }; assertable = derive2 { name="assertable"; version="0.2.7"; sha256="1npks9rcrnchmd0silq6qrvqkmdkp9fwjkyyvvp1lqjclyxk6vkk"; depends=[data_table]; }; assertive = derive2 { name="assertive"; version="0.3-5"; sha256="0blbbhlxcb5ffdxqxi62xs33ljiawh6s22a0pyvbbh79jf46rzr3"; depends=[assertive_base assertive_code assertive_data assertive_data_uk assertive_data_us assertive_datetimes assertive_files assertive_matrices assertive_models assertive_numbers assertive_properties assertive_reflection assertive_sets assertive_strings assertive_types knitr]; }; assertive_base = derive2 { name="assertive.base"; version="0.0-7"; sha256="1xs3ysvj0z57c58jw57pckq2rynia6ks4rmjmc02alczhk54wbgh"; depends=[]; }; @@ -5203,10 +5235,10 @@ in with self; { assertive_sets = derive2 { name="assertive.sets"; version="0.0-3"; sha256="1cqvh2syvh5b6d85h601zjmsdbbf3h8q98ids4dfl4frdshpasc7"; depends=[assertive_base]; }; assertive_strings = derive2 { name="assertive.strings"; version="0.0-3"; sha256="0n6jrk88670g4ym0r8ii40a08a90z1xadj8wcryk8h0nl04dchfm"; depends=[assertive_base assertive_types stringi]; }; assertive_types = derive2 { name="assertive.types"; version="0.0-3"; sha256="0zxq1jfrzgw95ll7alvm0xnk7aihjdksngq4ya2whyvfjbmv4vdb"; depends=[assertive_base assertive_properties codetools]; }; - assertr = derive2 { name="assertr"; version="2.6"; sha256="0g4ii6vhp0155a29ljhs64a09x0nzy5ybvwwchhk4mkcgsvnvfkj"; depends=[dplyr MASS rlang]; }; + assertr = derive2 { name="assertr"; version="2.7"; sha256="1x868pd4dac1c7b1q5390wqh2f6s50km8nqcpim3nxcj2l4qkqdb"; depends=[dplyr MASS rlang]; }; assertthat = derive2 { name="assertthat"; version="0.2.1"; sha256="17wy5bdfzg73sg2clisg1k3zyn1adkj59x56m5nwia2k8z67zkw5"; depends=[]; }; - assignPOP = derive2 { name="assignPOP"; version="1.1.7"; sha256="0zx7cblfzfpi5jvagni56845lg198zkx5q43ip3lg8h0sq2h8qp2"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; }; - assignR = derive2 { name="assignR"; version="1.1.3"; sha256="0pmzgz955nqxlcnb0f0kbv415kysjl12niyh704ksvhs5yw0xhah"; depends=[maptools raster rgdal sp]; }; + assignPOP = derive2 { name="assignPOP"; version="1.1.9"; sha256="1cbk2l827mfi4fi1jai0lzbcj2wvrzd3kw4frmqn4anx6nbcr0qf"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; }; + assignR = derive2 { name="assignR"; version="1.2.0"; sha256="0p722j4nclbpvjrp0hrgz8c1cijlk31sfjlf84wz326qp12dy3af"; depends=[maptools raster rgdal sp]; }; assist = derive2 { name="assist"; version="3.1.6"; sha256="13r029z32f2xcspafx01jkgmabbjcvnp8wg1wx1liwxh3mf2zalg"; depends=[lattice nlme]; }; assocInd = derive2 { name="assocInd"; version="1.0.1"; sha256="16yzgvlqbapjhvzm5nw8vfrhh8mp9llnhck4bpgmszyrh93z1ha5"; depends=[]; }; assortnet = derive2 { name="assortnet"; version="0.12"; sha256="1vyzrb8vsi9pcdn6jd83k77bg0q2a3dwdvlnmxnshqiif2pakb8m"; depends=[]; }; @@ -5222,100 +5254,112 @@ in with self; { asymmetry = derive2 { name="asymmetry"; version="2.0.2"; sha256="0x5yzlf804mhwfr9244b04vnixiyh5d8vmqrfffgid3dijg2zszm"; depends=[gplots smacof]; }; asympTest = derive2 { name="asympTest"; version="0.1.4"; sha256="02l07psiy1888zx86j2r1l5lznz47wdmzbh39pd2nbj8r9i80szr"; depends=[]; }; asypow = derive2 { name="asypow"; version="2015.6.25"; sha256="0il38djkmw5ka7czpalmhq6yycx7flpdpgbd7p5nx52rsjdv49mj"; depends=[]; }; - atable = derive2 { name="atable"; version="0.1.5"; sha256="0jvlch6yhcz5azxj9yllah0x98plws5camxqis58qyqiapgvl9h8"; depends=[DescTools doBy effsize Hmisc plyr reshape2 settings]; }; - atakrig = derive2 { name="atakrig"; version="0.9.5"; sha256="0lw4mx029aks0w1lhxv58v9r4c01rrayq79bapdbd8lf8ivpcp3n"; depends=[doSNOW FNN foreach gstat MASS Rcpp rgeos snow sp]; }; + atable = derive2 { name="atable"; version="0.1.6"; sha256="17i3vhfayi8h12c4y1spagb9wcq1vsrh7miz20rbinpi9x9671nj"; depends=[DescTools doBy effsize Hmisc plyr reshape2 settings]; }; atlas = derive2 { name="atlas"; version="1.0.0"; sha256="02wm22j40llmdi6z3rzgbc5fpkzmjfq0xar33bypvj1dx1zxygnd"; depends=[httr testthat]; }; atmcmc = derive2 { name="atmcmc"; version="1.0"; sha256="05k69b5wlysz3kh0yiqvshgvr0nyz34zkvn6bjs30cwz7s9j21pn"; depends=[]; }; atmopt = derive2 { name="atmopt"; version="0.1.0"; sha256="1h79ngq1236gz4w29fs3nj46a3m1x8a28z3xnhc6wn3a46cf8zzi"; depends=[DoE_base gtools hierNet]; }; atsd = derive2 { name="atsd"; version="1.2.0"; sha256="0jan8r5f2r3l2xpdf9rrv4smkr2l645rfdgdfjb1xa54jd3pqvqs"; depends=[httr RCurl]; }; - attachment = derive2 { name="attachment"; version="0.0.9"; sha256="0z47v5nqvw0grgll2bl66zy82igg1ncy78jm9dwv45yd4dl2xi10"; depends=[desc devtools glue knitr magrittr rmarkdown stringr]; }; + attachment = derive2 { name="attachment"; version="0.1.0"; sha256="0j3zm0ibf1iv67jy4mq1fzckgbxhxyx74frplsl2np0fbdgsxdz6"; depends=[desc glue knitr magrittr rmarkdown roxygen2 stringr]; }; attempt = derive2 { name="attempt"; version="0.3.0"; sha256="1q0r4r0hirw2kxsvcq5rqkmbxzi7fa6fxaqi6rmzwiz25025iv71"; depends=[rlang]; }; attenuation = derive2 { name="attenuation"; version="1.0.0"; sha256="0ys4psvkvimmym4qj9cmhq8y7x10kv0x6bsvpjkrsc3l8p2g3474"; depends=[]; }; atus = derive2 { name="atus"; version="0.2"; sha256="1i67rx8p5v4shgbfcym4lbnlw55xx7w2fdzhgsgjjyfpwbpm7h4h"; depends=[]; }; - auRoc = derive2 { name="auRoc"; version="0.2-0"; sha256="1q5cpa1y96bs5x0vifi0h6ca4yasg3z57yhq29vicd433h3phy3x"; depends=[coda MBESS ProbYX rjags]; }; + auRoc = derive2 { name="auRoc"; version="0.2-1"; sha256="152jdvzigcplii5amj0mnral3g2jyy3rfsc745mx36sspw1396yx"; depends=[coda MBESS ProbYX rjags]; }; aucm = derive2 { name="aucm"; version="2019.12-1"; sha256="1vjb5jiq2iz6c8nhfcbqg21nms7nf485xlrgd7mdkbzvqxxl43h6"; depends=[kyotil]; }; auctestr = derive2 { name="auctestr"; version="1.0.0"; sha256="15b1x0c9yhl91gir7jmivp8vxzc8q7wvb0mgam9454avc6l29x4y"; depends=[dplyr tidyr]; }; - audio = derive2 { name="audio"; version="0.1-6"; sha256="1f3k7n8x716kqx439jd0g0dc5iwc33jzzas4ikjrlgidp89i89iz"; depends=[]; }; + audio = derive2 { name="audio"; version="0.1-7"; sha256="0x4wcl8nlymmzhsdd255ybxdwnshksmr92y6drcajnij8mx3kq2j"; depends=[]; }; audiolyzR = derive2 { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin plotrix RJSONIO]; }; audit = derive2 { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; }; - auditor = derive2 { name="auditor"; version="1.1.0"; sha256="10f9vk92w35rd56jsp81a31fm7ys28f9acnp2qr1n28c14m4pbvz"; depends=[DALEX ggplot2 ggrepel gridExtra hnp scales]; }; - augSIMEX = derive2 { name="augSIMEX"; version="3.7.3"; sha256="0cdqpckc4aiwi2dnkcvk2m9n0bg9f7qmd84n3rdw6clcrd0f95wz"; depends=[Formula MASS nleqslv Rcpp rootSolve]; }; - augmentedRCBD = derive2 { name="augmentedRCBD"; version="0.1.1"; sha256="0l2x8f8xqrvsn4gbi707xw2nfxcvcmxwgpzq4vh8ngxnq89m2179"; depends=[dplyr emmeans flextable ggplot2 moments multcomp multcompView officer Rdpack reshape2 stringi]; }; - auk = derive2 { name="auk"; version="0.4.0"; sha256="1wrplqbzfa0jp91hxc1jd5vjm587pz1768s7csfqvrgn8ziy9akx"; depends=[assertthat countrycode dplyr httr magrittr rlang stringi stringr tidyr]; }; + auditor = derive2 { name="auditor"; version="1.2.0"; sha256="14swypvjfkd8qi34dsv2sg2fj0ls4xz42vy4csd2qxj0zwi3rlap"; depends=[DALEX ggplot2 ggrepel gridExtra hnp scales]; }; + augSIMEX = derive2 { name="augSIMEX"; version="3.7.4"; sha256="0620yxqi160ar91shl5macn890zpc60c9nqy4w8i6m7sskv6gl3z"; depends=[Formula MASS nleqslv Rcpp]; }; + augmentedRCBD = derive2 { name="augmentedRCBD"; version="0.1.2"; sha256="1m5iwsy6a580k8b2ph186w2aa9nqy1551mwr4zx4cwyh06m8hrq3"; depends=[dplyr emmeans flextable ggplot2 moments multcomp multcompView officer Rdpack reshape2 stringi]; }; + auk = derive2 { name="auk"; version="0.4.1"; sha256="0xrxl8qzmc0dnjn7s32wwrdv1z7v7a4wfpz4vrradfn84vxway30"; depends=[assertthat countrycode dplyr httr magrittr rlang stringi stringr tidyr]; }; aurelius = derive2 { name="aurelius"; version="0.8.4"; sha256="00bpf9sggvnajpmg3zsdgfjinkb6wbrcf1ris7qfhh1rp5rz4m4m"; depends=[gbm glmnet jsonlite]; }; auth0 = derive2 { name="auth0"; version="0.2.1"; sha256="077nqh28q3b9jb25fy0157l06zpx3x0rg4z5dz2dqsh88xy4nhqj"; depends=[htmltools httr shiny shinyjs yaml]; }; auto_pca = derive2 { name="auto.pca"; version="0.3"; sha256="01m2ldpcxzj7fhgmr9wp4ha3gqdyh7l5bkrnw83smcbq5229hsyy"; depends=[plyr psych]; }; autoBagging = derive2 { name="autoBagging"; version="0.1.0"; sha256="01k44rgkpbbr3m2x360aq0fz2qi7nz036g5dsh2y3jy94rmddbyy"; depends=[abind caret cluster CORElearn e1071 entropy infotheo lsr MASS minerva party rpart xgboost]; }; autoFRK = derive2 { name="autoFRK"; version="1.2.0"; sha256="0xj4wh8m0zjhbcp3s6gfyakkqp2i9dm19hij0nl1x02xz8gl9kij"; depends=[fields filehash filehashSQLite filematrix FNN LatticeKrig MASS mgcv Rcpp RcppEigen RcppParallel RSpectra spam]; }; - autocogs = derive2 { name="autocogs"; version="0.1.2"; sha256="11sjj6945099w499r6sgxx2vrz0aqx4bjjh6vklyfkjm6xvh4ckj"; depends=[broom checkmate diptest dplyr ggplot2 hexbin MASS mclust moments progress tibble]; }; + autocogs = derive2 { name="autocogs"; version="0.1.3"; sha256="1xv2sv5p5pskp7mw9zcgcbwsbfzjiabigld92npd3mzy8n7zdli6"; depends=[broom checkmate diptest dplyr ggplot2 hexbin MASS mclust moments progress tibble]; }; autoencoder = derive2 { name="autoencoder"; version="1.1"; sha256="0ly1aanayk28nx6yqfhl7d0zm4vg6rfjikf5ibn8zhmkrfyflj1y"; depends=[]; }; - autoimage = derive2 { name="autoimage"; version="2.0.1"; sha256="1mwkrnyk7ygjmqbhpz86kzzmgk57q3kppp13m6rv2a65macbby2z"; depends=[fields ggplot2 mapproj maps MBA viridisLite]; }; + autoimage = derive2 { name="autoimage"; version="2.1"; sha256="0xqx2cmh7wfaj3mk3y5bld64frawaj3k0cnbd2cd13mrq8ma6j7b"; depends=[fields ggplot2 mapproj maps MBA viridisLite]; }; + autokeras = derive2 { name="autokeras"; version="1.0.1"; sha256="171q7i1zygzmkm34bi7grx5rvnjwks60ifk4k86kki5aiipzx4d5"; depends=[keras reticulate]; }; automagic = derive2 { name="automagic"; version="0.5.1"; sha256="1mmm6kj6mxrn3s4v8ryszkxr9z7bh9cvhin7xjq111fkwly7wjkq"; depends=[dplyr formatR knitr magrittr purrr remotes yaml]; }; automap = derive2 { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[gstat lattice reshape sp]; }; automl = derive2 { name="automl"; version="1.3.2"; sha256="1nrg8q3y6rv69nmnsylg8rps4b4prx46j5a8ljlr24yc34504ck3"; depends=[]; }; automultinomial = derive2 { name="automultinomial"; version="2.0.0"; sha256="04rjg3xjlhnkchzvdxqm762z5abm81s5b9czgzmli30zh07bf3fd"; depends=[igraph Matrix numDeriv]; }; autoplotly = derive2 { name="autoplotly"; version="0.1.2"; sha256="0ajzzj9w9f0v9n37liml63hq5xwkqq53lw85p0a2h99n4lg2hdg8"; depends=[ggfortify ggplot2 plotly]; }; - autopls = derive2 { name="autopls"; version="1.3"; sha256="1qf5gk1vsz1p5670w7bgzh3b15wvrx1gy6ih4sivw0vj8bcjxbw9"; depends=[pls]; }; autoshiny = derive2 { name="autoshiny"; version="0.0.2"; sha256="0s06ynnirgsh19x8qq4020piirkhvjqpvz372syygvlal062y6cn"; depends=[shiny]; }; + autota = derive2 { name="autota"; version="0.1.3"; sha256="07n34v4lpql5n0y94pm07ywl2z9azjgjrpw7qyfxa6qw6gv71gid"; depends=[base64enc glue httpuv magrittr memoise purrr RJSONIO rlang rlist rstudioapi stringdist stringr xml2]; }; autothresholdr = derive2 { name="autothresholdr"; version="1.3.5"; sha256="1dvc21w57ir34vhcrbz58scl4ly057yn1ibmdkly99hwfkpihv3x"; depends=[checkmate filesstrings glue ijtiff magrittr purrr Rcpp rlang]; }; - av = derive2 { name="av"; version="0.4.0"; sha256="0r9z3iahrjlwpvcc29450c669576yprchg1znivq7p9lzff83plc"; depends=[]; }; + av = derive2 { name="av"; version="0.5.0"; sha256="0v99y47dsa2z3c4qawipdrzynla2aab3x0c8qzdi5w9r5y9a38sh"; depends=[]; }; available = derive2 { name="available"; version="1.0.4"; sha256="18dqm10dicbvjd5wli4nkv4fip0fgh2b9h9gm5511ayfsdg8lc8l"; depends=[cli clisymbols crayon desc glue jsonlite memoise SnowballC stringdist tibble tidytext udapi yesno]; }; avar = derive2 { name="avar"; version="0.1.1"; sha256="1i0bk3y0ca58ihwn4di8rpkp5vs2j5b80rcvaf72n9h2hp8i2ncz"; depends=[Rcpp RcppArmadillo simts]; }; averisk = derive2 { name="averisk"; version="1.0.3"; sha256="02j27d4jxgy2bk5sgxp1xdfyqr321civs99qj0g8cp34gwqk0j3m"; depends=[MASS]; }; aweek = derive2 { name="aweek"; version="1.0.0"; sha256="0a9d4yp694qch34mf08qc5fwsn21h9mw1ak6vylaq73nwiihajw9"; depends=[]; }; - aws = derive2 { name="aws"; version="2.4-0"; sha256="1jwa2n8n4ngznd8na89gnab97m94sz4bsmd3fld5h4pppilac80h"; depends=[awsMethods gsl]; }; + aws = derive2 { name="aws"; version="2.4-2"; sha256="1czlsy64nx6j7h1smgb561yyv3f98pwqwglk77yla4mx3fp14bvq"; depends=[awsMethods gsl]; }; aws_alexa = derive2 { name="aws.alexa"; version="0.1.7"; sha256="0k3kwkmi13j2nrkyi6ahpc98s24idx4m5s4wkqkgqhi8xaljpp7c"; depends=[aws_signature dplyr httr xml2]; }; + aws_comprehend = derive2 { name="aws.comprehend"; version="0.2.1"; sha256="0qn4mkdd17c8kmrm4ml7l1x3rzaw3gbykhrj3m0ga53crcqdhqri"; depends=[aws_signature httr jsonlite]; }; aws_ec2metadata = derive2 { name="aws.ec2metadata"; version="0.2.0"; sha256="1lbljg2fp3yh1hwlbmprkc1prw80jv0ycvpg1vggagm68wm5x288"; depends=[curl jsonlite]; }; - aws_polly = derive2 { name="aws.polly"; version="0.1.2.1"; sha256="10wr30a52m0nq3a6bqqvfzic86g5sq485zy5xfgay2y5ivsdz6k8"; depends=[aws_signature httr jsonlite tuneR]; }; - aws_s3 = derive2 { name="aws.s3"; version="0.3.12.1"; sha256="1nwj5yqgqpc475cia39x5277w9jalm6lmsa4j3spcr254qdkjl7q"; depends=[aws_signature base64enc digest httr xml2]; }; + aws_iam = derive2 { name="aws.iam"; version="0.1.8"; sha256="1p4w50icfw6mrzr6aazdbh977yvyvsf1yavjscyvv11xf3y9f9j2"; depends=[aws_signature httr jsonlite xml2]; }; + aws_kms = derive2 { name="aws.kms"; version="0.1.4"; sha256="0f9l62g4z68ickzi4if3pw3algb41rn47z9cpxga8aggkclk86l4"; depends=[aws_signature base64enc httr jsonlite]; }; + aws_lambda = derive2 { name="aws.lambda"; version="0.2.0"; sha256="0vp13qw7mw8dz01q30z7bnj47qx9js1zmxasc2n733gi07fdj62f"; depends=[aws_signature base64enc httr jsonlite]; }; + aws_polly = derive2 { name="aws.polly"; version="0.1.5"; sha256="1xfx9g5iq1wcl27cmj4ss3y3f5yr1qmma77ki09g3ji2xvd50101"; depends=[aws_signature httr jsonlite tuneR]; }; + aws_s3 = derive2 { name="aws.s3"; version="0.3.21"; sha256="132cczq0ml7lpp2yl6l4p99dn1zihrncnpa6wyad4m9mnr50a8dx"; depends=[aws_signature base64enc curl digest httr xml2]; }; aws_signature = derive2 { name="aws.signature"; version="0.5.2"; sha256="0skibgf2l6n7ql51gnlmvjyfmaqa8ijc9gywmyhvrcj9bix2pydf"; depends=[base64enc digest]; }; + aws_transcribe = derive2 { name="aws.transcribe"; version="0.1.3"; sha256="1nni1b935i2ir67lfhcj0106vzr310mk2jvln32gvzbnqxcggz7m"; depends=[aws_signature httr jsonlite]; }; + aws_translate = derive2 { name="aws.translate"; version="0.1.4"; sha256="1x6cvpfddgwywsji4ywygmqn3pwy3i1aci9lk4nsrrfkzggwcbpb"; depends=[aws_signature httr jsonlite]; }; awsMethods = derive2 { name="awsMethods"; version="1.1-1"; sha256="0hbmrcpdyg15zg4rysscsmxpxlpy0dkxx2aa63qibq7l1k14v4sh"; depends=[]; }; awsjavasdk = derive2 { name="awsjavasdk"; version="0.2.0"; sha256="1461h565il4y68g0a3k7wgn9jyb6pys8405f780ldg6g44aa7p60"; depends=[assertthat R_utils rappdirs rJava]; }; - azuremlsdk = derive2 { name="azuremlsdk"; version="0.5.7"; sha256="1r9s1avkr03hradzr66lz7xxz4s6ax8d6amxkhcnphyaykss8gh1"; depends=[DT ggplot2 htmltools plyr reticulate rstudioapi]; }; + aziztest = derive2 { name="aziztest"; version="0.1.0"; sha256="0ida4n8dxliq3i1mhjknr5zn0vglfdp4mcg1frz423vds0grzdcn"; depends=[]; }; + azuremlsdk = derive2 { name="azuremlsdk"; version="0.6.85"; sha256="16w4gispm3sk48zaw1mi0qxg3qgkpy995p6rak7liqkndqfpzh7s"; depends=[DT ggplot2 htmltools plyr reticulate rstudioapi servr shiny shinycssloaders]; }; + b3archives = derive2 { name="b3archives"; version="1.0.0"; sha256="0hhf6nj1k3xngrjfywylx0f6jsi5vsi9wns7h4c3fck76p09rrfq"; depends=[dplyr purrr xml2]; }; b6e6rl = derive2 { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; }; bPeaks = derive2 { name="bPeaks"; version="1.2"; sha256="1z6jghcmw0lwv17ms7gdp5zzimaawq3ahbwkxa4062g373592smd"; depends=[]; }; bReeze = derive2 { name="bReeze"; version="0.4-3"; sha256="17nc6qvw9l6sq8knd1mk193md2y3z1jlcjymqzl389yxj8s0i2il"; depends=[lubridate]; }; bSims = derive2 { name="bSims"; version="0.2-1"; sha256="024k9s42a9w5pmw024b15sj5ilcfpkm7lv59yimjicr9lmw246kb"; depends=[deldir intrval MASS mefa4 pbapply]; }; bWGR = derive2 { name="bWGR"; version="1.6.6"; sha256="1m5spafvl5pn0s60vaf8wz7iaibsa7laq7kp8y9xj20pp3f76hvr"; depends=[Rcpp]; }; - baRcodeR = derive2 { name="baRcodeR"; version="0.1.4"; sha256="17vf4rrw6p2b7ynxgldc7f24i8ml7h486ip2mv60gj4kz1cjzx0y"; depends=[DT miniUI qrcode rstudioapi shiny]; }; + baRcodeR = derive2 { name="baRcodeR"; version="0.1.5"; sha256="1fdywv7mvxx3q8pildsfllmw814f2p71xcwvfmplngv2vgrpzz9w"; depends=[DT miniUI qrcode rstudioapi shiny]; }; + baRulho = derive2 { name="baRulho"; version="1.0.1"; sha256="0wclqjh7pwb0hrhj04mrcchdxvi4ma56gxphgi3x04gx6n04pczg"; depends=[pbapply seewave tuneR warbleR]; }; babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; }; babel = derive2 { name="babel"; version="0.3-0"; sha256="1iwvx69051yhlxbcl6bypvc3mcih0q8bf3i29r3i79356hp12xqa"; depends=[edgeR]; }; babelwhale = derive2 { name="babelwhale"; version="1.0.1"; sha256="0mgkg9hji4mab3l33vvyyyc1d2q84l1zrmg63vr3b3gr0d62jcnl"; depends=[crayon dplyr dynutils processx purrr]; }; - babette = derive2 { name="babette"; version="2.1.1"; sha256="1zfc1xlaqrwbg0q9bzxbc7s1jqy2cnip1dmw9qgacxnjwxmz8hj2"; depends=[beastier beautier mauricer phangorn remotes stringr testit tracerer xml2]; }; + babette = derive2 { name="babette"; version="2.1.2"; sha256="06985zzibckrjqxfvbdxg88yv3jssbaaildjdp68zb8qk5bsds12"; depends=[beastier beautier mauricer phangorn remotes stringr testit tracerer xml2]; }; babynames = derive2 { name="babynames"; version="1.0.0"; sha256="1vchzyk5pkr0zhh1q8k9g771n45jxiislipwkgrgamv7yzr49xsp"; depends=[tibble]; }; bacistool = derive2 { name="bacistool"; version="0.9.9"; sha256="06734pi829xhfkpdhysa62x1sc0shhbdn6l9vls2cyfr30w6y6md"; depends=[rjags]; }; backShift = derive2 { name="backShift"; version="0.1.4.2"; sha256="1nj7mcdpzfzq68qg86rrys752gzw69n99yyb0jzg6r8qrgpcxj49"; depends=[clue ggplot2 igraph MASS matrixcalc mvnmle reshape2]; }; backbone = derive2 { name="backbone"; version="1.1.0"; sha256="1ggs22s5pxy0y8plnnr1mkvgcc3bvpz9a2427cw3kpp61gcsh5a8"; depends=[Matrix poibin]; }; backpipe = derive2 { name="backpipe"; version="0.2.3"; sha256="12k2cv9x8h0b002m9c8g4vj5a7chp4b8jqz377ia0diqw89dydpm"; depends=[]; }; - backports = derive2 { name="backports"; version="1.1.5"; sha256="0k19w68b2aihyj5mflw3732gkkzs78sssqdns960pdw3yfnkiv33"; depends=[]; }; + backports = derive2 { name="backports"; version="1.1.6"; sha256="170rphqq28j0pcr28g6dxv3isp436ajhyzkpri31pn0lfm3szs6h"; depends=[]; }; backtest = derive2 { name="backtest"; version="0.3-4"; sha256="1s0mf247dz2vvyf4m3sp9xiqhv7xcs4rphyg9gdcy73060sah2ad"; depends=[lattice]; }; bacondecomp = derive2 { name="bacondecomp"; version="0.1.1"; sha256="1sd6pbhmx8vxz5c2cvvadbjy7p15y91gzs3n0ish7h5br1vq8fpm"; depends=[]; }; bacr = derive2 { name="bacr"; version="1.0.1"; sha256="14zr1v4rihx0ra3x0vsb81vsz0g8gzskkdxkg7nhiz835hp2fiy8"; depends=[MCMCpack]; }; badgecreatr = derive2 { name="badgecreatr"; version="0.2.0"; sha256="0mdixklaxky5gs8zm99ky280vxxlbq1mxnaarq6x0d1cb71bzv4l"; depends=[git2r]; }; badger = derive2 { name="badger"; version="0.0.7"; sha256="1djgzn6ixfsdr0v4f3714mv2z2kl776dd2hq670g7bla4lp6344s"; depends=[desc dlstats rvcheck]; }; - bagRboostR = derive2 { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; }; baggedcv = derive2 { name="baggedcv"; version="1.0"; sha256="1rqs4sm6g1anck5s2dxlm1vcmylpphcbs2dpvf1sjki5lrzdq9z4"; depends=[doParallel foreach kedd mclust]; }; - baggr = derive2 { name="baggr"; version="0.3.0"; sha256="084w2a5y0d060hihl5n88ai4pbg312g6y5lapy4kb2qcjd7i9zg1"; depends=[bayesplot BH crayon forestplot ggplot2 gridExtra Rcpp RcppEigen rstan rstantools StanHeaders testthat]; }; - bain = derive2 { name="bain"; version="0.2.3"; sha256="0n5z9sdvjbx1xagxyvyiqdwyxrlkfd2vjnrzhlshamr4xh0csa48"; depends=[lavaan]; }; + baggr = derive2 { name="baggr"; version="0.4.0"; sha256="1cbajifb4gavamj46zs9vk6ihhg6wnv2hn75452bdc2mc4ingn5n"; depends=[bayesplot BH crayon forestplot ggplot2 gridExtra Rcpp RcppEigen rstan rstantools StanHeaders testthat]; }; + baguette = derive2 { name="baguette"; version="0.0.1"; sha256="1n8fjac9jha3g48w1iddqrh54gd4lzv1bs3f747y6jasp99y3vg7"; depends=[butcher C50 dials dplyr earth furrr generics hardhat magrittr parsnip purrr rlang rpart rsample tibble tidyr withr]; }; + bahc = derive2 { name="bahc"; version="0.1.0"; sha256="1i5s3qjwwsm94vplkifv72kql8wgiwsc7n1d0707rva92iyv7rcy"; depends=[fastcluster matrixStats]; }; + bain = derive2 { name="bain"; version="0.2.4"; sha256="15car9j11s0ywss13g5swf1dxjjc91xmbkvx200mivca9bj6245m"; depends=[lavaan]; }; bairt = derive2 { name="bairt"; version="0.1.2"; sha256="17nc0lp0bzwshik33v0gq5d6nd2gvm4799b7rfiq089zhnzv90kj"; depends=[coda mvtnorm shiny shinyjs]; }; baitmet = derive2 { name="baitmet"; version="1.0.1"; sha256="02ydakqr8v41hdnhcsgigwnic8d48qswryg1srb5w1fqdmdglnkl"; depends=[erah HiClimR Rcpp signal XML]; }; balance = derive2 { name="balance"; version="0.2.4"; sha256="13ksd1ysd2by8qdc3vn1fgnaj1c2v0py7f501bajiyq6hpcwn1c5"; depends=[ggplot2]; }; ballr = derive2 { name="ballr"; version="0.2.6"; sha256="0434b7hr5lcz2f7mdfkkmvh407ypyycki0bjda6lgiy0pr22hwsc"; depends=[dplyr janitor lubridate magrittr rlang rvest xml2]; }; bama = derive2 { name="bama"; version="0.9.1"; sha256="1yx0gv5qxq3si5vzrrjy8y6d3b0v433aljyniyx9dp6q6mcqrhvw"; depends=[Rcpp RcppArmadillo]; }; - bamboo = derive2 { name="bamboo"; version="0.9.24"; sha256="1fw1wniba0kxb44d2w9r9nh5sy1jhrk48bn0zblz2y6gvwn8m2vn"; depends=[rscala]; }; + bamboo = derive2 { name="bamboo"; version="0.9.25"; sha256="1il8sn8ck36b1m9hazhf6gmr58iqi2hjn0rrpcv1laij0lybrcws"; depends=[rscala]; }; bamdit = derive2 { name="bamdit"; version="3.3.2"; sha256="11v9hy8ijbcqhwim0s3y69dz11jvys4vjvfnshj4p5qdz38sji6l"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; }; - bamlss = derive2 { name="bamlss"; version="1.1-1"; sha256="06i0yfmq5k98yqs8mfw3ppkanlp34v18fb1xynxaxwgj9d58h5k3"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp survival]; }; + bamlss = derive2 { name="bamlss"; version="1.1-2"; sha256="0s0i2qpwcshfqxciwp5w7mxvw0a1x52y4yaspvf1gx9jms7bqn8b"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm raster sp survival]; }; bamp = derive2 { name="bamp"; version="2.0.8"; sha256="0p7vi9gqplqnrc0vl55m1xx160k5kdxs4sxqxyrg908yhsnr5vj6"; depends=[abind coda]; }; banR = derive2 { name="banR"; version="0.2.1"; sha256="0bqy8srxsd0r872scpij8lyrvb0n8jicwpvf9wh1xk1bjmlq3vb5"; depends=[dplyr httr magrittr purrr readr rlang tibble]; }; bandit = derive2 { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; }; - bang = derive2 { name="bang"; version="1.0.0"; sha256="16wy2imrdvhpdzi6ix9k69afqdyc44d1xr655yd3q1cl12x1nr04"; depends=[bayesplot rust]; }; + bang = derive2 { name="bang"; version="1.0.1"; sha256="0m7p9gzspkyp40ir842ff4b1827w9rh7x49kpp3y4dpi83krqy5a"; depends=[bayesplot rust]; }; bannerCommenter = derive2 { name="bannerCommenter"; version="0.1.1"; sha256="0ndm4z6gkd9flxsh1sx08c5ahm8297hzn8f5hc1mpn5m998ajjsj"; depends=[]; }; banter = derive2 { name="banter"; version="0.9.3"; sha256="1ziys0zy66477ynr8rp2kv7w82n6226whn47aa06kkb4nhcqfk2c"; depends=[dplyr ggplot2 gridExtra magrittr plyr randomForest ranger rfPermute rlang tibble tidyr]; }; banxicoR = derive2 { name="banxicoR"; version="0.9.0"; sha256="0vchm2hnqm45fhn8k38rcam4vkazmifcl40390s2r04bgvqr0pnl"; depends=[rvest stringr xml2]; }; bapred = derive2 { name="bapred"; version="1.0"; sha256="08kvc4cc984jv08ikwbja8zxidrcdiwi5w88hlqakbm8yc6hzssa"; depends=[affy affyPLM Biobase FNN fuzzyRankTests glmnet lme4 MASS mnormt sva]; }; barcode = derive2 { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; }; barplot3d = derive2 { name="barplot3d"; version="1.0.1"; sha256="182kpiknv3id1bsgcc6b3ahbxmm8x3lxcpf1r6rckpr3s0whfx3g"; depends=[rgl]; }; - barsurf = derive2 { name="barsurf"; version="0.3.1"; sha256="07s43sy5200mwxasmcar4lsw7bm1112ck7z62rbyxnawg1zmrwq5"; depends=[colorspace]; }; + barsurf = derive2 { name="barsurf"; version="0.4.0"; sha256="1n8kwzawdgbazd4cshavlki1di5xfczgfpd7vv2rrb8cmwlsnw61"; depends=[colorspace kubik]; }; + bartBMA = derive2 { name="bartBMA"; version="1.0"; sha256="15syk5a3lgzfyp17wk8mk14317yxsr47br26kyah5jg3dq4cyqdg"; depends=[BH mvnfast Rcpp RcppArmadillo Rdpack]; }; + bartCause = derive2 { name="bartCause"; version="1.0-2"; sha256="1cg5z9hn78zmymls7dpqpg439mfvh6np3gj7qwb9y682va4ky34h"; depends=[dbarts]; }; bartMachine = derive2 { name="bartMachine"; version="1.2.4.2"; sha256="100zcpbndbps01qnybrgmsfnh37j93661l4v7zcin0i56cvgg998"; depends=[bartMachineJARs car missForest randomForest rJava]; }; bartMachineJARs = derive2 { name="bartMachineJARs"; version="1.1"; sha256="1wpfzrb6mrx3xmxy4rgnwygmpqq2l4ki2xqr4m51g1bl9nwirhzj"; depends=[rJava]; }; basad = derive2 { name="basad"; version="0.2.0"; sha256="1qc2amkrjrgdqys275p82lmbpjszm5rzjdpri7hqc9d8b8q1vc9q"; depends=[Rcpp RcppEigen rmutil]; }; @@ -5324,38 +5368,39 @@ in with self; { base64enc = derive2 { name="base64enc"; version="0.1-3"; sha256="13b89fhg1nx7zds82a0biz847ixphg9byf5zl2cw9kab6s56v1bd"; depends=[]; }; base64url = derive2 { name="base64url"; version="1.4"; sha256="0n1c2b68vza1dh7sk38v6biiwm72c4jpl79kpdg1bsb0hq9qy18x"; depends=[backports]; }; baseballDBR = derive2 { name="baseballDBR"; version="0.1.2"; sha256="0w54g1avcqamc12lmvjchlqbqck9jfjccm441k03nsql460mpydq"; depends=[dplyr magrittr rvest xml2]; }; - baseflow = derive2 { name="baseflow"; version="0.11.2"; sha256="10y73s22xmrzvm697vdmnr7zal83jrxy4ifvskyhdqzsljj53p3j"; depends=[airGR]; }; - basefun = derive2 { name="basefun"; version="1.0-6"; sha256="08ys5iqzbf95pimgaj1g2q7lwhxj73jc737ap55358h75dx0nzdx"; depends=[Matrix orthopolynom polynom variables]; }; - baseline = derive2 { name="baseline"; version="1.2-2"; sha256="044m1znvz2c6h0z7x4zkqxld2l138kpv2pirbiz41pk72gvzv50v"; depends=[SparseM]; }; + baseflow = derive2 { name="baseflow"; version="0.12.0"; sha256="0zz7clrqifxk0igvqr38ic8sif86nli8gp8np8nfx89md2zz1njk"; depends=[airGR]; }; + basefun = derive2 { name="basefun"; version="1.0-7"; sha256="1g72g77yzf6ji4aglm4hpaqbz5ma2d6y93g7r17066iwyzl0ygn3"; depends=[Matrix orthopolynom polynom variables]; }; + baseline = derive2 { name="baseline"; version="1.2-3"; sha256="1d8k5py3wn82nm9pnsnh9ylbdkmkm3j938cdil3igwd3qzkjp63b"; depends=[limSolve SparseM]; }; basetheme = derive2 { name="basetheme"; version="0.1.2"; sha256="0yck4qc7qd406s7kw95xgnfc0pfvzk3ylhkv6mk6l2wbkfm8ldrb"; depends=[]; }; - basicMCMCplots = derive2 { name="basicMCMCplots"; version="0.2.4"; sha256="03mggvdasqrkq41dpfwsrhnxh98hfqfr3z58hrfhnjrzydwxbci9"; depends=[]; }; + basf = derive2 { name="basf"; version="0.1.0"; sha256="0v4hhgg8qq4hdih22i3akrjpc4xjnwi81968nyfcv00gy8fd5gjv"; depends=[sf tibble]; }; + basicMCMCplots = derive2 { name="basicMCMCplots"; version="0.2.5"; sha256="0sdvhm7n9n67gwymv7whk6f6lfgp74gczisqw90096la566ndd2f"; depends=[]; }; basicTrendline = derive2 { name="basicTrendline"; version="2.0.3"; sha256="10rq9hriyn50b28ikvl0vsvchbkrc0pjzxamq4ix1xd04n4drkl9"; depends=[investr scales]; }; basicspace = derive2 { name="basicspace"; version="0.24"; sha256="1cy226njbax7dcgql89fns4l4w9fq328x3h0vb93l5jk883jgi8h"; depends=[]; }; - basictabler = derive2 { name="basictabler"; version="0.3.0"; sha256="1dzjdgc8ffnr219m5zb410ln1rbnzz96g1aqb70pkg9gp0ykgk29"; depends=[dplyr htmltools htmlwidgets jsonlite R6]; }; - basket = derive2 { name="basket"; version="0.9.10"; sha256="1773f0abhz854sdb0jfhmfpgxpkagb3x6mzi77jycfl6ywhry48h"; depends=[cli crayon dplyr foreach GenSA ggplot2 gridExtra igraph itertools RColorBrewer tibble tidyr]; }; + basictabler = derive2 { name="basictabler"; version="0.3.1"; sha256="1yrrg0mgxfqrn068ggx7b5xqj8wccigb5x6aya2hw3b035cbfprs"; depends=[dplyr htmltools htmlwidgets jsonlite R6]; }; + basket = derive2 { name="basket"; version="0.10.2"; sha256="0d3qp1p11w9warl4cd9icnygqyiarm6vzsnph2hl09lmsqbghahl"; depends=[cli crayon dplyr foreach GenSA ggplot2 ggraph gridExtra igraph itertools RColorBrewer tibble tidygraph tidyr]; }; bastah = derive2 { name="bastah"; version="1.0.7"; sha256="08xdba16wj0inp0kq2sbcrdr6wj8bwlq7rqnfrzjrz03wxhc5bk0"; depends=[BigQuic foreach glmnet lars MASS Matrix scalreg]; }; batade = derive2 { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; }; batch = derive2 { name="batch"; version="1.1-5"; sha256="0wdgfvk2i542cqg34ikvzwlix09f2jyjb32a0f4zh9vg9nrywswq"; depends=[]; }; batchmeans = derive2 { name="batchmeans"; version="1.0-3"; sha256="1qkdljngvlahk0pbrkarkjh2g4sxxwiva9f3m5y8gz8pjw9fpy9n"; depends=[]; }; batchscr = derive2 { name="batchscr"; version="0.1.0"; sha256="094l2cq7lcdrlsdmsxmbal7srxdg20rxbms46h1sd414wq26d413"; depends=[]; }; - batchtools = derive2 { name="batchtools"; version="0.9.12"; sha256="16x524hvy9d8p7r4fi1c8mixcvzgsjbf3y0vxaa56ssbbab4p7f9"; depends=[backports base64url brew checkmate data_table digest fs progress R6 rappdirs stringi withr]; }; + batchtools = derive2 { name="batchtools"; version="0.9.13"; sha256="02bwfinwgn5nl638997javig61jmr0ci0qybmprz13jnvmam1yns"; depends=[backports base64url brew checkmate data_table digest fs progress R6 rappdirs stringi withr]; }; batman = derive2 { name="batman"; version="0.1.0"; sha256="0ccgx506p4iri23k2ikb8jmh04dp08w66785bv52iy8kd359h43f"; depends=[Rcpp]; }; batteryreduction = derive2 { name="batteryreduction"; version="0.1.1"; sha256="0j838q7063bplkzd50kmnxji80cgysfsq7m1qifv8z7a2zsh8c8g"; depends=[pracma]; }; - baycn = derive2 { name="baycn"; version="1.0.0"; sha256="1wjm7isdvb4z5lyhix849sxzngbmk8ccdvc8qgjgdcfmnx15binq"; depends=[egg ggplot2 MASS]; }; - bayes4psy = derive2 { name="bayes4psy"; version="1.2.0"; sha256="0dv285nq44a971hyha8rkynac3gaq78pp5bicmznxds53lhnw2ji"; depends=[BH circular cowplot dplyr emg ggplot2 mcmcse metRology Rcpp RcppEigen reshape rstan rstantools StanHeaders]; }; + baycn = derive2 { name="baycn"; version="1.1.0"; sha256="1nimy9vc1i9an9992wwdr0qq8zi9363rjiv5ci81wliys1qlggaq"; depends=[egg ggplot2 gtools MASS]; }; + bayes4psy = derive2 { name="bayes4psy"; version="1.2.3"; sha256="0f8rlivqc36x15c16dybpqgankhc73gcn206yhnr7nyb896nfnl0"; depends=[BH circular cowplot dplyr emg ggplot2 mcmcse metRology Rcpp RcppEigen reshape rstan rstantools StanHeaders]; }; bayesAB = derive2 { name="bayesAB"; version="1.1.2"; sha256="0xg29s3h4dy43snlc365q80ix96hwh4mfy1qvv87yys3i9zfinm5"; depends=[ggplot2 Rcpp rlang]; }; - bayesCL = derive2 { name="bayesCL"; version="0.0.1"; sha256="1l278lxidn16nma2ny14wjajcqyzbr6j5xl2lj08cic26c7hvjbm"; depends=[]; }; - bayesDccGarch = derive2 { name="bayesDccGarch"; version="2.0"; sha256="1s2b8f43wi9ja966n2p2r4l4s79vk6xb8mqaxsagnw90g969p681"; depends=[coda numDeriv]; }; + bayesCT = derive2 { name="bayesCT"; version="0.99.2"; sha256="11y22xg7f47vj47pd5z44g20ff2jjn67s39win0qngl69ii1ph98"; depends=[bayesDP dplyr magrittr msm purrr survival]; }; + bayesDP = derive2 { name="bayesDP"; version="1.3.3"; sha256="0g2kw8rsa9s5ahvsr4j363nqs4s49pmbaxgsqrlg8nizjsmj8p49"; depends=[ggplot2 MCMCpack Rcpp RcppArmadillo survival]; }; bayesDem = derive2 { name="bayesDem"; version="2.5-1"; sha256="1cxrqil1p692mbzkcj1fvsx335qyy6c1y43mq48s4shs1hhc69bn"; depends=[bayesLife bayesPop bayesTFR gWidgets gWidgetsRGtk2 RGtk2 wpp2015]; }; - bayesGARCH = derive2 { name="bayesGARCH"; version="2.1.3"; sha256="1480mmzfshchfbfh3x420cq5qblfh59jkl21hkq2jvnwppksdn9w"; depends=[coda mvtnorm]; }; + bayesGARCH = derive2 { name="bayesGARCH"; version="2.1.5"; sha256="01lmpi659cisr7rixz8khaxzyvkvdkvcxjj37x3lw7dpf4ir2535"; depends=[coda mvtnorm]; }; bayesImageS = derive2 { name="bayesImageS"; version="0.6-0"; sha256="1m0az3z8hwaxpqd1ljly9vlp41dp7c7p39r0rx7k9vcs201vlcg8"; depends=[Rcpp RcppArmadillo]; }; bayesLife = derive2 { name="bayesLife"; version="4.1-0"; sha256="1sswnwv4x77sd07d3hpsf3wfd5szrdnc4fni8glzl8rk3y0r3jns"; depends=[bayesTFR car coda data_table hett wpp2019]; }; bayesPop = derive2 { name="bayesPop"; version="8.1-1"; sha256="1xhzind6k23rcgy1iw0bqks6wz77755qs9pw6sqinfi8qbv0ax1l"; depends=[abind bayesLife bayesTFR data_table fields googleVis MortCast plyr reshape2 rworldmap wpp2012 wpp2019]; }; bayesQR = derive2 { name="bayesQR"; version="2.3"; sha256="1c6y7r9h9626ghp68pl5k1g0l95fwd6dp0jfznmhy53qza0ny8z4"; depends=[]; }; - bayesSurv = derive2 { name="bayesSurv"; version="3.2"; sha256="1zp302pfi64nnqdiqldvfi1lm0wv2dplz5sfjp0ydl1qc16z0axp"; depends=[coda smoothSurv survival]; }; + bayesSurv = derive2 { name="bayesSurv"; version="3.3"; sha256="00brysldz0zbjbjs0qnd2mbpc3ipyz7224bnbwlf8d3b6ivw8iwv"; depends=[coda smoothSurv survival]; }; bayesTFR = derive2 { name="bayesTFR"; version="6.4-0"; sha256="159lcii3hpl91vypl16adzair6ik85fyjybyy6fjibxvjkn3fh3b"; depends=[coda MASS mvtnorm wpp2019]; }; bayesammi = derive2 { name="bayesammi"; version="0.1.0"; sha256="1vfcmk47x71c5akj3ppxzb74293pikspknkkv08f8p15v0chk7fs"; depends=[dplyr ggplot2 lme4 magrittr MASS mvtnorm rlang rstiefel scales tibble tidyr tmvtnorm]; }; - bayesanova = derive2 { name="bayesanova"; version="1.2"; sha256="1qn3bjy2k12xg67xrlscrl6nql2g0v3i3r5c0349xpq1ya2kaiya"; depends=[]; }; + bayesanova = derive2 { name="bayesanova"; version="1.3"; sha256="11ask03l4s0459bbd968686hsbzgmm5qjwjwb9nqvfaqhwmjl0z2"; depends=[]; }; bayesbio = derive2 { name="bayesbio"; version="1.0.0"; sha256="08qa4lzkrcwin7n3kzfqfdlnlqahdmjl1lxpdh29n780cgyjfvs0"; depends=[]; }; bayesboot = derive2 { name="bayesboot"; version="0.2.2"; sha256="0976ryd0gbw3kpmxg2qxyp1m2swnrpa86vdhvqrqxp7fcrs8cs2z"; depends=[HDInterval plyr]; }; bayescount = derive2 { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[coda rjags runjags]; }; @@ -5366,35 +5411,37 @@ in with self; { bayesloglin = derive2 { name="bayesloglin"; version="1.0.1"; sha256="0j2ziahf6mwsz2gvb1azvdzlmszlpqgr5zqcqa68pxgq947sa2cs"; depends=[igraph]; }; bayeslongitudinal = derive2 { name="bayeslongitudinal"; version="0.1.0"; sha256="0g45ikpnbry1albb3asrzab5z3sy98yf74c64qn02d65xgafifwg"; depends=[LearnBayes MASS mvtnorm]; }; bayesm = derive2 { name="bayesm"; version="3.1-4"; sha256="154glks7rsjkza0sfi1kj7wj727py9sl1ba6sswflwmwc9n226q6"; depends=[Rcpp RcppArmadillo]; }; - bayesmeta = derive2 { name="bayesmeta"; version="2.4"; sha256="0h2b237ml90z9xcbjy5fgc4l8k09210g101cf25mngbz76wxvy87"; depends=[forestplot metafor]; }; + bayesmeta = derive2 { name="bayesmeta"; version="2.5"; sha256="1dvprpmrqnwxhsxb4h972rx7mww6r6w7y5mjw7wm4p1pddzdhqyc"; depends=[forestplot metafor]; }; bayesmix = derive2 { name="bayesmix"; version="0.7-4"; sha256="1qms1nnk2nq3gqr8zf2b9ri4wv8jrxv5i8s087k1rwdvya3k5r9a"; depends=[coda rjags]; }; bayesplot = derive2 { name="bayesplot"; version="1.7.1"; sha256="0sq0ajnm96hmlqf1cv5n2gshh3qdij4n1zbm7qrniz2q6b5aj342"; depends=[dplyr ggplot2 ggridges glue reshape2 rlang tibble tidyselect]; }; bayespref = derive2 { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; }; bayesreg = derive2 { name="bayesreg"; version="1.1"; sha256="12g5sklip3i8fpzrhvbikhgnl6kx8fxb88hfv8f34jy71r3h7zyp"; depends=[pgdraw]; }; bayess = derive2 { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[combinat gplots MASS mnormt]; }; bayest = derive2 { name="bayest"; version="1.1"; sha256="0nl3zq5bp6yqw351vcrzph5y0jn9bml7isf4nsxl7braivalf72n"; depends=[]; }; - bayestestR = derive2 { name="bayestestR"; version="0.5.0"; sha256="172ilq2h8gkn6ggxafvkjq7bgjs2rymm15w5b4ql7i8cv41cdll2"; depends=[insight]; }; + bayestestR = derive2 { name="bayestestR"; version="0.6.0"; sha256="0s7wdmk8avgaqk2b7fcf4bsh13isrkl1q4y7z2y8jhdagxxxnzd1"; depends=[insight]; }; bayesvl = derive2 { name="bayesvl"; version="0.8.5"; sha256="1gb2in8hjiqb3daqz6phn1639i6p2w641kxrm3zh4rm3d6hg6hzr"; depends=[bayesplot bnlearn coda dplyr ggplot2 reshape2 rstan StanHeaders viridis]; }; bayfoxr = derive2 { name="bayfoxr"; version="0.0.1"; sha256="1295296mbjpmd0bg1pfxvyp0az3sry6gsq9ir3l8x64w5a4qrzd5"; depends=[]; }; baymedr = derive2 { name="baymedr"; version="0.1.0"; sha256="0y01s6dpnhnxqqvl15cdxmb5ysb685bbp47xifyp5nz8sjh2pci0"; depends=[rlang stringr]; }; - bayou = derive2 { name="bayou"; version="2.1.1"; sha256="17gvb2dmviwibnlqn6p3p9pcc3705xh9r8lrm90p0yg7nhm0cn02"; depends=[ape assertthat coda denstrip fitdistrplus foreach geiger MASS Matrix mnormt phytools Rcpp RcppArmadillo]; }; baystability = derive2 { name="baystability"; version="0.1.0"; sha256="1zv4bf5a4p21w2qpr6lcsgsxb0xv15v8p33031rsypmnbs9i80dp"; depends=[dplyr ggfortify ggplot2 lme4 magrittr MASS matrixStats reshape2 rlang rstiefel scales tibble tidyr tidyverse]; }; - baytrends = derive2 { name="baytrends"; version="1.1.0"; sha256="0yml560cbamp7pf433va28vsfi5rcrjm61rbk8384bbjlslpsdkj"; depends=[dataRetrieval digest gdata lubridate memoise mgcv plyr survival XML zCompositions]; }; + baytrends = derive2 { name="baytrends"; version="1.2.1"; sha256="05vd748wp72dnlc5p1higwlvxpyk2pq2xhcl2i58fy3pky2bxsg5"; depends=[dataRetrieval digest gdata lubridate memoise mgcv plyr survival XML zCompositions]; }; bazar = derive2 { name="bazar"; version="1.0.11"; sha256="1q2w5pvlb51lzbb5k719sf1lrhffandkfqlcvi2prw4dmq7qjxv9"; depends=[kimisc]; }; bbefkr = derive2 { name="bbefkr"; version="4.2"; sha256="1wjx652w3p41sq71a2zdzmb7frjxm6xvcgrc2ark2spwb0lbjjw6"; depends=[]; }; bbemkr = derive2 { name="bbemkr"; version="2.0"; sha256="015c57s8mpimm82nddnh382wlkisxgdmc2hvp7k38pcnqxc5gb5q"; depends=[MASS]; }; - bbl = derive2 { name="bbl"; version="0.3.0"; sha256="0vlmdxhq9vgyff6sab6i90rq54z09kqdckysmhfcdr05zfwgcd5l"; depends=[pROC RColorBrewer Rcpp]; }; - bbmle = derive2 { name="bbmle"; version="1.0.22"; sha256="1idn55w5f3iw4r0ydyww8xyinninw07sxlwfqb565vmdrs87dwl4"; depends=[bdsmatrix lattice MASS Matrix mvtnorm numDeriv]; }; + bbl = derive2 { name="bbl"; version="0.3.1"; sha256="1a6f5744xwn28qkqxlc5q7crarlx0jjg4z7wpp7jwr6ar152apvm"; depends=[pROC RColorBrewer Rcpp]; }; + bbmle = derive2 { name="bbmle"; version="1.0.23.1"; sha256="0p3l9shbr2846qmw8n0fyzf4j7gmi08aypl82jml3dwh26q1whk0"; depends=[bdsmatrix lattice MASS Matrix mvtnorm numDeriv]; }; bbo = derive2 { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; }; + bbreg = derive2 { name="bbreg"; version="1.0.0"; sha256="1v2m7ky9kd16psm9w8njfjzkwc4prvyq0fgbl6i210pjwwv9zvhr"; depends=[betareg expint Formula statmod]; }; + bbricks = derive2 { name="bbricks"; version="0.1.2"; sha256="08ylvxkcpg4imrv6qzpmkxvdckqnib8b9ly47zircyjqmzzdrain"; depends=[]; }; bbw = derive2 { name="bbw"; version="0.1.3"; sha256="1z3an561qh0rfi3jhh1ghsdbg8aimqmf4hpqri2jz39in3p0gwg4"; depends=[car]; }; bc3net = derive2 { name="bc3net"; version="1.0.4"; sha256="15dghd0v1s71h77iw8b49v5h7wcda5mb4540lfyibsdipbashv2h"; depends=[c3net igraph infotheo lattice Matrix]; }; - bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-3"; sha256="1g9l4abnpp1iq5wy3rl2jv47ql9zh6s2qrhyj06x22358lpinjnl"; depends=[boot nnet Rcpp RcppArmadillo rgl]; }; + bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-4"; sha256="0bhwwr9pa78a8lhjz2cfbm09jq585p89l6dr2ihpil4q5r8cmsjr"; depends=[boot nnet Rcpp RcppArmadillo rgl]; }; bcRep = derive2 { name="bcRep"; version="1.3.6"; sha256="1fibx11ykkkjv4sgg6zc2a0g270384z2cf68hwghnld0wi002b5z"; depends=[ape doParallel foreach gplots ineq plotrix proxy stringdist vegan]; }; bcaboot = derive2 { name="bcaboot"; version="0.2-1"; sha256="0wf1igkb0lidz4pvh3kfccs9858m1g9650wprrvrpwsdfrcd7rc9"; depends=[]; }; bcdata = derive2 { name="bcdata"; version="0.1.2"; sha256="0h5mrcpq64d2i9q6m5n8bq4g06zfyyscllwg6k1zm22vsw1yi1ki"; depends=[cli crul dbplyr dplyr glue jsonlite leaflet leaflet_extras purrr readr readxl rlang sf tidyselect xml2]; }; bcf = derive2 { name="bcf"; version="1.3"; sha256="1f8szjgsyhnff3zzmmy7bnsam12ywj46n3fxsj1y3fn1m5wnd8mz"; depends=[Rcpp RcppArmadillo]; }; bcgam = derive2 { name="bcgam"; version="1.0"; sha256="1dg2fcjw8xal77irviiz260qpar2iqkjvi2k4qfm71jyq0ir0axk"; depends=[coda igraph nimble]; }; bcmaps = derive2 { name="bcmaps"; version="0.18.0"; sha256="0zq5fp9r6n2mpjd96ri7lmp63g8lm5sjwgfmc4cligrch3kakzxy"; depends=[httr rappdirs sf]; }; + bcmixed = derive2 { name="bcmixed"; version="0.1.4"; sha256="0am6amk1axfxkxgp9nmfys4fp4snplfncwkzh02im7a6zr3v1m63"; depends=[MASS nlme]; }; bcp = derive2 { name="bcp"; version="4.0.3"; sha256="0vhs89lb2wpanqsljclpvwbjmgdsc3jicws8bzqiqh8mbs3nzpxy"; depends=[Rcpp RcppArmadillo]; }; bcpa = derive2 { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[plyr Rcpp]; }; bcpmeta = derive2 { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; }; @@ -5402,11 +5449,13 @@ in with self; { bcrypt = derive2 { name="bcrypt"; version="1.1"; sha256="1wwdin8x09y8n8zrwj1ylh5ikcz0v0la4wmrsvbdr61cg336wzx4"; depends=[openssl]; }; bcv = derive2 { name="bcv"; version="1.0.1"; sha256="0yqcfariw9sw0b8cpljcr7vf5rf0cwr1wbif23icchfaxk2m42gj"; depends=[]; }; bdDwC = derive2 { name="bdDwC"; version="0.1.15"; sha256="0yraq8a0wgz12rzi2dx0gdcz5rx99qd2pzw972wjqyq3rs41pwx0"; depends=[shiny shinyBS shinydashboard shinyFiles shinyjs]; }; + bda = derive2 { name="bda"; version="14.3.19"; sha256="0x2aw5lb32f4i1g1ls68rf92356vvmsr1rxps7laaiqh5xjzvqv2"; depends=[]; }; bdchecks = derive2 { name="bdchecks"; version="0.1.7"; sha256="1pzsvn1m1f9bdmhxmh57pvn9jm4z41rkvv6h60hq2lfgkapnjy7q"; depends=[bdDwC data_table DT finch knitr rgbif shiny shinyBS shinydashboard shinyjs spocc yaml]; }; bdclean = derive2 { name="bdclean"; version="0.1.15"; sha256="14cy8yaqd6bg2zyh2wvndydk9sigaydavxl4cfypqz5kqdhj82z9"; depends=[bdchecks bdDwC data_table DT finch knitr leaflet rgbif rmarkdown shiny shinydashboard shinyjs spocc]; }; bde = derive2 { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[ggplot2 shiny]; }; + bdl = derive2 { name="bdl"; version="1.0.2"; sha256="0zkfpv540cadl8vsy6n85120jmmbla78kmx2k6ifglwx7i7m5ps7"; depends=[dplyr ggplot2 ggpubr httr jsonlite magrittr purrr randomcoloR sf tibble tidyr tmap tmaptools]; }; bdots = derive2 { name="bdots"; version="0.1.19"; sha256="1cj6ly62d50z6713119hadl90cxf5x30wpnpx6mssmd49zds6nxb"; depends=[doParallel doRNG foreach Matrix mvtnorm nlme]; }; - bdpar = derive2 { name="bdpar"; version="1.0.1"; sha256="1i0xhw0nqdpmmddvfp4scf3wgld7ng2pcw8685grv5vxrlgc308p"; depends=[ini magrittr pipeR purrr R6 rlist svMisc]; }; + bdpar = derive2 { name="bdpar"; version="2.0.0"; sha256="0vn53pzr8j3jdl03jzcyjgf0n486l472jm3mm92df3219733l2wi"; depends=[magrittr pipeR purrr R6 rlist]; }; bdpopt = derive2 { name="bdpopt"; version="1.0-1"; sha256="1z7mdqklw3frsdzyhvx8s8wvblwm28fr1gca2yrivqjng0r47lx4"; depends=[coda rjags]; }; bdpv = derive2 { name="bdpv"; version="1.3"; sha256="0wcnmamqrbqwskgv2yhnxq2kb179n63c825y9hsl20rfca0ijh6m"; depends=[]; }; bdribs = derive2 { name="bdribs"; version="1.0.4"; sha256="19qakmdw3l8vfxkr4p1ydkyfs4cmq37lqzw7l5zx5rdn6zlhqwh4"; depends=[rjags]; }; @@ -5417,105 +5466,106 @@ in with self; { bea_R = derive2 { name="bea.R"; version="1.0.6"; sha256="15pdbwz7av8862bl144n998qk0w9rqwip9m2brdm5hj7id5xdlif"; depends=[chron colorspace data_table DT ggplot2 googleVis gtable htmltools htmlwidgets httpuv httr jsonlite magrittr munsell plyr Rcpp scales shiny shinydashboard stringi stringr xtable yaml]; }; beadarrayFilter = derive2 { name="beadarrayFilter"; version="1.1.0"; sha256="044dq5irc00v2f2gjz0vb69w7q7b84lppc55ganabdv4f0dxdblc"; depends=[beadarray RColorBrewer]; }; beadarrayMSV = derive2 { name="beadarrayMSV"; version="1.1.0"; sha256="0785vmjsli37hjyppk7hlqmn0b683s1apysx9dghbw4h6rgvr8n9"; depends=[Biobase geneplotter limma rggobi]; }; - beadplexr = derive2 { name="beadplexr"; version="0.2.0"; sha256="0ci19jai28hizcfdgj3a69vw20yk25xg6vp6fk1xhkkp0hh9wnd2"; depends=[cluster dplyr drc flowCore fpc ggplot2 lazyeval magrittr mclust purrr raster tibble tidyr yaml]; }; - beam = derive2 { name="beam"; version="2.0.0"; sha256="1b61cabaw3pixzmzsrxh4mnbdrnxfd7ffyibn3kgk1dr0sc9d1da"; depends=[assertthat BH fdrtool igraph knitr Matrix Rcpp RcppArmadillo]; }; + beadplexr = derive2 { name="beadplexr"; version="0.4.0"; sha256="0y5xrs88zm2bp2dlz8bndldispyj6ipgjr7vzrfl26yd2p7qjqd0"; depends=[cluster dplyr drc fpc ggplot2 magrittr mclust purrr raster rlang tibble tidyr yaml]; }; + beakr = derive2 { name="beakr"; version="0.3.1"; sha256="1mir7scqwmsqs6hhi0xramdxk75x7zs4ppwrgc688y8j7dgg01ys"; depends=[base64enc httpuv jsonlite magrittr mime R6 stringr webutils]; }; + beam = derive2 { name="beam"; version="2.0.1"; sha256="0z95d5kjfv6byk8j5smkn74kgcircav739jrawmx161lxvznf49i"; depends=[assertthat BH fdrtool igraph knitr Matrix Rcpp RcppArmadillo]; }; beanplot = derive2 { name="beanplot"; version="1.2"; sha256="0wmkr704fl8kdxkjwmaxw2a2h5dwzfgsgpncnk2p2wd4768jknj9"; depends=[]; }; beanz = derive2 { name="beanz"; version="2.4"; sha256="18i4ygz83l60fdfkl4yg9kp5n2vmqn6yd7qkpkiplq0mzg5s4nk9"; depends=[BH loo Rcpp RcppEigen rstan rstantools StanHeaders survival]; }; beast = derive2 { name="beast"; version="1.1"; sha256="0ikbnzdzp2lv1nh5mxxanra81v4dl6svg3ywqcqd6wgzri70a4ry"; depends=[RColorBrewer]; }; beastier = derive2 { name="beastier"; version="2.1.1"; sha256="17qzjk4lq83khj5f04jhkr3q2w7snv4aq4zrbnsziszwnlazyqqy"; depends=[ape assertive beautier phangorn rappdirs remotes rJava stringr xml2]; }; - beautier = derive2 { name="beautier"; version="2.3.2"; sha256="0wwlv1z030mi2q895z9m9xpkfq348ka3ljyiaddzp9niappszpcj"; depends=[ape assertive geiger rappdirs seqinr stringr testit]; }; + beats = derive2 { name="beats"; version="0.1.1"; sha256="1vg8h2lyn61lii346pf3b5vwxf5cfswmi4b5mmimvgx1ix2i6sxb"; depends=[dplyr ggplot2 lubridate purrr readr shiny zoo]; }; + beautier = derive2 { name="beautier"; version="2.3.5"; sha256="12yiq8z95w69gch9kd15p8vvwx8i2q6gpgix5ih2h6x5g4gzl72a"; depends=[ape assertive pryr rappdirs seqinr stringr testit]; }; bedr = derive2 { name="bedr"; version="1.0.7"; sha256="0zpqvyjgwyqawxm8qrhcv8zq2b3yxgcqkkc87br29yrl7sjb8h6j"; depends=[data_table R_utils testthat VennDiagram yaml]; }; beepr = derive2 { name="beepr"; version="1.3"; sha256="061sfld23b516jws4llml0a4jsdk4z74rll4z58l2rvahkqsdrfp"; depends=[audio stringr]; }; beeswarm = derive2 { name="beeswarm"; version="0.2.3"; sha256="0hy89bwv7jixlg91li1fywa77916am2whqp1m1fx1khd45g44581"; depends=[]; }; beezdemand = derive2 { name="beezdemand"; version="0.1.0"; sha256="1i6p36cfvz87k6llpibklmdbjb7vp1v38ijxaqkmv1jzc28sj3cl"; depends=[ggplot2 nlmrt nls2 nlstools reshape2]; }; beginr = derive2 { name="beginr"; version="0.1.7"; sha256="1a1lzjmq0qimm8yrb4n6knh23gyqxgax60n95rih95sg34904d0m"; depends=[cranlogs]; }; - behaviorchange = derive2 { name="behaviorchange"; version="0.2.1"; sha256="12dakzc3k85na3wvnwisynpzy4i2vw2i2amkrf4lf6rahn0rkfs1"; depends=[BiasedUrn data_tree DiagrammeR DiagrammeRsvg ggplot2 googlesheets gridExtra gtable magrittr ufs viridis]; }; + behaviorchange = derive2 { name="behaviorchange"; version="0.2.2"; sha256="1xqvlybfmgpr0dg0ys6yjshlghgph6zg81d3bbx8cpbxdysm8lkl"; depends=[BiasedUrn data_tree DiagrammeR DiagrammeRsvg ggplot2 googlesheets gridExtra gtable magrittr png ufs viridis yum]; }; behavr = derive2 { name="behavr"; version="0.3.2"; sha256="01ny099m2zmvlalwiq3nqkgynnxn1mdspch15lkawwd40q8s9s4p"; depends=[data_table]; }; belex = derive2 { name="belex"; version="0.1.0"; sha256="1563yngc1lvncmx3h6kgsj1r6k3hvxidh6h9rb7apxs2rq5k32ms"; depends=[XML]; }; - belg = derive2 { name="belg"; version="1.0.1"; sha256="162f3rayxz05qzfbry4x98aissyd8gzcp7aa1x59q0vl8jd5dcid"; depends=[Rcpp RcppArmadillo]; }; + belg = derive2 { name="belg"; version="1.0.2"; sha256="0daiqhpdwbl3l4civfq9v51hdgj9vams102fcb8n4v2qj83kx1wv"; depends=[raster Rcpp RcppArmadillo]; }; bench = derive2 { name="bench"; version="1.1.1"; sha256="1ldqmf0anwgw6b9jgy5mnnjjncayc1x54pvjm6f5gqv0225ksdw3"; depends=[glue pillar profmem rlang tibble]; }; benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; }; benchmarkme = derive2 { name="benchmarkme"; version="1.0.3"; sha256="003d97rs0gb6l6hq7d4lxgdngrgb5lii6fxw2n7l50m14hib2sv2"; depends=[benchmarkmeData doParallel dplyr foreach httr Matrix tibble]; }; - benchmarkmeData = derive2 { name="benchmarkmeData"; version="1.0.3"; sha256="1qiw9d93y4m2ch20hsgvf1k3r9dqf60mrdr6cc647m1qv2syjgrk"; depends=[dplyr tibble]; }; - benchr = derive2 { name="benchr"; version="0.2.3-1"; sha256="1q8g9v7zbspd2gmydwwfi3avdsnmn5ahr9iybdqsicgfch5plsf5"; depends=[Rcpp RcppProgress]; }; + benchmarkmeData = derive2 { name="benchmarkmeData"; version="1.0.4"; sha256="1n4vjkagqlm6kw2hilf4gjfcdjad0bcg652j9nl2ygbq3kdnh1vf"; depends=[dplyr tibble]; }; + benchr = derive2 { name="benchr"; version="0.2.5"; sha256="1xh1n41ll50zz3v26i8lg5f92i90rc78ywnl0rczryh621whx80n"; depends=[Rcpp RcppProgress]; }; bender = derive2 { name="bender"; version="0.1.1"; sha256="07npksrj094h884lli0fjvwjc1lhcwzlsk9wx82761mka5xajv4v"; depends=[httr jsonlite R6]; }; benford_analysis = derive2 { name="benford.analysis"; version="0.1.5"; sha256="0y0c7l2r9s7lg9bw4ndcqwisa5l6a2cpydn1vmz88h3yva0l68cg"; depends=[data_table]; }; bentcableAR = derive2 { name="bentcableAR"; version="0.3.0"; sha256="1gjrlv94av9955jqhicaiqm36rrgmy0avxn9y7wbp2s1sbg7fyg7"; depends=[]; }; benthos = derive2 { name="benthos"; version="1.3-6"; sha256="1vywnc6k37gpaq7g59v3qa6619svcmnd8ri5zm5l0ila2s3ccb2c"; depends=[dplyr lazyeval readr]; }; - ber = derive2 { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; }; berryFunctions = derive2 { name="berryFunctions"; version="1.18.2"; sha256="0yicwsz6v5nffvw2wmjmc2zhcik7avz3xmj8zhb77xhaq9dazk9s"; depends=[abind]; }; - bestNormalize = derive2 { name="bestNormalize"; version="1.4.2"; sha256="0df4fspcmf8scifgy2v69qlqp7zzyicjmscmyxp1m8wzd7cwzd0q"; depends=[doParallel doRNG dplyr foreach LambertW nortest]; }; + bestNormalize = derive2 { name="bestNormalize"; version="1.5.0"; sha256="0af21qxrz1jvkva8lz72h6c2xc5ha0rwiv253b4n1m8w27z39d7h"; depends=[doParallel doRNG dplyr foreach LambertW nortest recipes tibble]; }; bestSDP = derive2 { name="bestSDP"; version="0.1.2"; sha256="1rff6jij9wmlpalzilvid8jvj2pczrchx0yrg0vhy00j64zg6jzs"; depends=[dplyr DT ggplot2 readxl rlist shiny shinyBS shinydashboard shinyjs shinythemes shinyWidgets stringr tidyr]; }; - bestglm = derive2 { name="bestglm"; version="0.37.1"; sha256="13wd1jnh9d82s4qz81k78y1v47ld0csdgn9k4izca2g039jqjxmq"; depends=[glmnet grpreg lattice leaps pls]; }; + bestglm = derive2 { name="bestglm"; version="0.37.3"; sha256="1zncy958hlwyyxrp6yvq1inq6mpyrbr6cdkf8maijfirr5j8f0ya"; depends=[glmnet grpreg lattice leaps pls]; }; betaboost = derive2 { name="betaboost"; version="1.0.1"; sha256="1zdyzxl2kp2i5lkiz280wz4av9wqklbn25zmq6n4yb6a579yjfn8"; depends=[gamboostLSS mboost]; }; betacal = derive2 { name="betacal"; version="0.1.0"; sha256="19wgpgf9yhckl9qx9v24f4yh055wfalphcxwm7lg68px6ap2pxl9"; depends=[]; }; betafam = derive2 { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; }; betalink = derive2 { name="betalink"; version="2.2.1"; sha256="1wskr8nh1jzcrnc8fn58lscphsvj5z9p1i1pnpfdjn60mdb09rkp"; depends=[igraph plyr stringr]; }; betapart = derive2 { name="betapart"; version="1.5.1"; sha256="0j72rfvnn0ag6vxp8nw5v68n3qblyp5gd0y8z1kchs4dbq1v288g"; depends=[ape fastmatch geometry picante rcdd]; }; - betareg = derive2 { name="betareg"; version="3.1-2"; sha256="0k9g39wgdr10rvcl8aq3vxm7vfix9cvdxd4nz4cg59vi4l82f239"; depends=[flexmix Formula lmtest modeltools sandwich]; }; - betas = derive2 { name="betas"; version="0.1.1"; sha256="1v85r6lrk21viwzam42gi42bgbwh5ibn3dpbh3aqrf3dnn1rdsyd"; depends=[robust]; }; + betaper = derive2 { name="betaper"; version="1.1-1"; sha256="0ids2k783lrrf376nfccflzp3alrq15ym484ixjcnxxz84ncmmcl"; depends=[vegan]; }; + betareg = derive2 { name="betareg"; version="3.1-3"; sha256="0ik2qydr75dwaphw35l1myi50fbkw43zmkarrw8jsj8nqmz3h6fc"; depends=[flexmix Formula lmtest modeltools sandwich]; }; betategarch = derive2 { name="betategarch"; version="3.3"; sha256="0hqvyps3lwix2fkzk18wrkhxpqhgardvib9sq1ip8gn8sn1dsi8y"; depends=[zoo]; }; bethel = derive2 { name="bethel"; version="0.2"; sha256="1zlkw672k1c5px47bpa2vk3w2906vkhvifz20h6xm7s51gmm64i0"; depends=[]; }; beyondWhittle = derive2 { name="beyondWhittle"; version="1.1.1"; sha256="1nr414wvfwycp3s9v592jd4gk5wdjfklk7ypqabx73k5fsxrcc0g"; depends=[BH forecast ltsa MASS MTS Rcpp RcppArmadillo]; }; bezier = derive2 { name="bezier"; version="1.1.2"; sha256="1vw5128v8h973xwa1fdm9cw2jvrldj87nd55lddlp3qsz3ag4br6"; depends=[]; }; bfast = derive2 { name="bfast"; version="1.5.7"; sha256="0n75minka55rxpvs3qkj0c65ydn1gc3i8lkr2gdyn1adjkl5yn01"; depends=[forecast raster sp strucchange zoo]; }; bfp = derive2 { name="bfp"; version="0.0-40"; sha256="03risiq2b7bc3gwlgpcsy1gvja6n5w1j3kw13s2wrd420hddzk4s"; depends=[Rcpp]; }; + bfsMaps = derive2 { name="bfsMaps"; version="0.9.4"; sha256="0pb081kpmf7040r99szhg7ppvb21cvc9k9bq6lhglinb8wxad9g8"; depends=[DescTools maptools rgdal rlang sp spdep]; }; bfsl = derive2 { name="bfsl"; version="0.1.0"; sha256="1hl53nis8bb1ffgkx91ij9vh680cpkb80y548y67y9w18iyd4aw4"; depends=[]; }; bfw = derive2 { name="bfw"; version="0.4.1"; sha256="1dwl6p70wbgippysl7vk8nv6rc78f6h5xl8fna98zv99qf0ib31c"; depends=[coda MASS runjags]; }; bgeva = derive2 { name="bgeva"; version="0.3-1"; sha256="0qm4xknyab8hdyn3in2hsvm8s062cnmqqf41b5jvax1mi5hs0z8c"; depends=[magic mgcv trust]; }; bggum = derive2 { name="bggum"; version="1.0.2"; sha256="04vr9z81awavkhk3lbi8yasmi242lrbnq0pzqp38xlrn5xkf8b1w"; depends=[Rcpp RcppDist]; }; bgmfiles = derive2 { name="bgmfiles"; version="0.0.6"; sha256="10qldfjjq5fx5jrrakdxc8k2pf0vp8ifg18nq56lvx9n28mqigim"; depends=[]; }; - bgmm = derive2 { name="bgmm"; version="1.8.3"; sha256="09hsqjjyzlpl0fqb7832j5ydrr0yc42zb1c9q1y5hbrms7yp00p8"; depends=[car combinat lattice mvtnorm]; }; + bgmm = derive2 { name="bgmm"; version="1.8.4"; sha256="1r8qd4niah18jg0lw3vqq1465likal5j7nvlgnblpidd5svn4a2n"; depends=[car combinat lattice mvtnorm]; }; bgsmtr = derive2 { name="bgsmtr"; version="0.7"; sha256="17706qims9637ppwg0vszkcm6kmvhzyrdihkgigpiv5lknhk2q3m"; depends=[CholWishart coda EDISON glmnet inline LaplacesDemon Matrix matrixcalc miscTools mnormt mvtnorm Rcpp sparseMVN statmod]; }; - bhm = derive2 { name="bhm"; version="1.15"; sha256="1xfm1k3wf4k1c65pd9201c00y4qda3lw9aycjh6q34ixyl6g5jg5"; depends=[coda MASS survival]; }; - bhrcr = derive2 { name="bhrcr"; version="1.0.3"; sha256="1w52f4ghl328vdcr8hwvmdrnxnj45fy4r21yqzg5q1fpd4mpjw2i"; depends=[AER Cairo MASS MCMCpack msm mvtnorm survival]; }; + bhm = derive2 { name="bhm"; version="1.16"; sha256="097vfpqkkbgps9wkabc1k18fa5vv0shbn1jz6g5l96xv96nvx93w"; depends=[coda ggplot2 MASS survival]; }; + bhpm = derive2 { name="bhpm"; version="1.7"; sha256="0fhk2gmghibf7la864dzm19bm76525gzbj03vw0y0zwbv9shbpcp"; depends=[coda]; }; biasbetareg = derive2 { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; }; bib2df = derive2 { name="bib2df"; version="1.1.1"; sha256="0d57883df774qqwpssmly3f1gci32yc5sgwc3x8f2rjih23s1nf6"; depends=[dplyr httr humaniformat stringr]; }; - bibliometrix = derive2 { name="bibliometrix"; version="2.3.2"; sha256="02sikbjnsfd1gxwlbdiafp35af22gmz2p6i951l3syxpcvylxfc8"; depends=[dplyr DT factoextra FactoMineR ggplot2 ggraph ggrepel igraph Matrix networkD3 RColorBrewer reshape2 rio RISmed rscopus shiny shinycssloaders shinythemes SnowballC stringdist stringr]; }; + bibliometrix = derive2 { name="bibliometrix"; version="3.0.0"; sha256="0nblrda78xrvm36v0xmgfm3wgwmmwnzwprw1bgzh8sr2w72cc0ym"; depends=[dimensionsR dplyr DT factoextra FactoMineR ggplot2 ggraph ggrepel igraph Matrix networkD3 pubmedR RColorBrewer rio rscopus shiny shinycssloaders shinythemes SnowballC stringdist stringr tidyr]; }; bibtex = derive2 { name="bibtex"; version="0.4.2.2"; sha256="140hkjzdp3033cvji861rd06z1ixgpnn4n5amygqsmhnixk8ff07"; depends=[stringr]; }; - biclique = derive2 { name="biclique"; version="1.0.4"; sha256="0jflbl1fbi3v3igi447f8i2zs9vh84xk1rci6dmwm0k9s9zqfrs2"; depends=[]; }; - biclust = derive2 { name="biclust"; version="2.0.1"; sha256="1y5n6wfa1lx88ck3x09rcg0dh3pw89225h85hmq2la1s1fpa48i0"; depends=[additivityTests colorspace flexclust ggplot2 lattice MASS tidyr]; }; - biclustermd = derive2 { name="biclustermd"; version="0.2.0"; sha256="075qr8bizwf08zac87a0xhhcgf1d3qvdd29jwl79yd63vlczf38k"; depends=[biclust clues doParallel dplyr foreach ggplot2 magrittr nycflights13 tidyr]; }; + biclique = derive2 { name="biclique"; version="1.0.5"; sha256="1fdf2r1jc2x8yw0fcw7yyjdxz4b870w6y7mr68qixqxwpl6943zq"; depends=[]; }; + biclust = derive2 { name="biclust"; version="2.0.2"; sha256="1pk7mvwlg4hkc4cn4w6wr2c192qx03d1xfwlzclk5bw1nmcg483b"; depends=[additivityTests colorspace flexclust ggplot2 lattice MASS tidyr]; }; + biclustermd = derive2 { name="biclustermd"; version="0.2.2"; sha256="00d7lhkcr9bj45zwpm78hdp3qllfisx097dsql3g64v9ix2q44g5"; depends=[biclust clusteval doParallel dplyr foreach ggplot2 magrittr nycflights13 phyclust tidyr]; }; bife = derive2 { name="bife"; version="0.7"; sha256="04wnc6n3wcykzmhrnd2zkj507ymzbw1n8wssi3bwcylanzj59a3h"; depends=[data_table Formula Rcpp RcppArmadillo]; }; bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; }; - bigKRLS = derive2 { name="bigKRLS"; version="3.0.5.1"; sha256="1za8pxij1nwpdz3lz51zqib99pc73s92lz0k01fkcgw5rj78kgs8"; depends=[BH bigalgebra biganalytics bigmemory ggplot2 Rcpp RcppArmadillo shiny]; }; bigMap = derive2 { name="bigMap"; version="2.1.0"; sha256="0bpnzz3acqn006jk8db5yyvbhl3sq807926igjcxj813i3r0x98r"; depends=[BH bigmemory colorspace RColorBrewer Rcpp RcppArmadillo]; }; bigQueryR = derive2 { name="bigQueryR"; version="0.5.0"; sha256="051c8rkj77dm78237dzhf3lcdawv0xv72pwfiim9bi89z9mp6f9m"; depends=[assertthat googleAuthR googleCloudStorageR httr jsonlite]; }; bigReg = derive2 { name="bigReg"; version="0.1.2"; sha256="1hmvh5j40zpzz6c88hmikphps8rb741yvkg60dxmkfl8gxqsrp3w"; depends=[MASS Rcpp RcppArmadillo uuid]; }; - bigalgebra = derive2 { name="bigalgebra"; version="0.8.4.2"; sha256="0xgaks6yx6gh333g27rij28hhxlziknxaqw5cbw1cr7srdl295i9"; depends=[BH bigmemory]; }; biganalytics = derive2 { name="biganalytics"; version="1.1.14"; sha256="1hsqdg5hkhs6z9pwvn055q02hzpksjwrf33q5zdnkm387g188ca6"; depends=[BH biglm bigmemory foreach Rcpp]; }; - bigassertr = derive2 { name="bigassertr"; version="0.1.1"; sha256="0jyycg9qkqswqakbc2p80s7qrv0hm3mn0zwg4v373zcf4z21rvlh"; depends=[]; }; - bigchess = derive2 { name="bigchess"; version="1.5.2"; sha256="021l5pvbh6v95wavxl118k2gvlaadwr18d8f712jzarcnfi1hvy3"; depends=[ff ffbase RSQLite subprocess]; }; + bigassertr = derive2 { name="bigassertr"; version="0.1.3"; sha256="1f0abvsixdkrr8nfm0knby69j0pac4srlg8nlsmrymz6nzcf82d9"; depends=[]; }; + bigchess = derive2 { name="bigchess"; version="1.7.1"; sha256="1h8i8qmnr9030xr8ld4rk7v6zpxbirw09i71imrrja6lsxr7v3qn"; depends=[ff ffbase processx RSQLite]; }; bigdatadist = derive2 { name="bigdatadist"; version="1.1"; sha256="16gkybwcp9sxqb0iic2fhmc4gndr44ayg14wrfcjvjaj4g5r6xs2"; depends=[FNN MASS pdist rrcov]; }; bigdist = derive2 { name="bigdist"; version="0.1.4"; sha256="1qfnmhyfadmnnagbhdl4jjrb53i1srszf19idp8fy6bczbjq85yi"; depends=[assertthat bigstatsr furrr proxy]; }; - biglars = derive2 { name="biglars"; version="1.0.2"; sha256="17zs25dvlja9ynx2fm5f4nmgkx4mnyqs5iscwsyahr6qigx1rz9x"; depends=[ff]; }; biglasso = derive2 { name="biglasso"; version="1.3-7"; sha256="1s9l8n0a3nv6viyp62k890nhdpfh8jl1ahhsa51x7bx2agdqplhi"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; }; bigleaf = derive2 { name="bigleaf"; version="0.7.1"; sha256="0hsssz5973vapkmmh9dgzrijyjj1s75iarq3cpfi7ljm4n748qig"; depends=[robustbase solartime]; }; biglm = derive2 { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; }; biglmm = derive2 { name="biglmm"; version="0.9-1"; sha256="1f4w59jvq7lq0bh5fs41czw0yc8h56iijbj0hlcq47zyqx6gll9a"; depends=[DBI]; }; - bigmatch = derive2 { name="bigmatch"; version="0.6.1"; sha256="1s9i42h82cdp4qqdpw11dmymvrz0f9vj14ibyrlqjkg18lpz0m5y"; depends=[liqueueR mvnfast plyr rcbalance]; }; + bigmatch = derive2 { name="bigmatch"; version="0.6.2"; sha256="16nmc0n78gzk8x8jhxdilj47gjqqv46sgiivccn5zkv08k1h3jj2"; depends=[liqueueR mvnfast plyr rcbalance]; }; bigmemory = derive2 { name="bigmemory"; version="4.5.36"; sha256="03pg8mxdc7q0249visjmc8bc3xmwxsfg3i2n6higicj4cfz7zihq"; depends=[BH bigmemory_sri Rcpp]; }; bigmemory_sri = derive2 { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; }; - bigml = derive2 { name="bigml"; version="0.1.2"; sha256="0vl5krjbgckknxwl26b2hn63jhb80zbn7abpckhxzxfxzncpnfz9"; depends=[plyr RCurl RJSONIO]; }; bigparallelr = derive2 { name="bigparallelr"; version="0.2.3"; sha256="1xg48zbwhchclc6lc67hc3j1d0b7cajd4whspj68ipm38w8h7l23"; depends=[bigassertr doParallel flock foreach RhpcBLASctl]; }; bigreadr = derive2 { name="bigreadr"; version="0.2.0"; sha256="0d5fgs16kdsl23jqrgz7in63pwhh7bvj7m8pa8nj11v84ji6lagr"; depends=[bigassertr data_table Rcpp]; }; bigrquery = derive2 { name="bigrquery"; version="1.2.0"; sha256="1ggh2gngr5x0g6y7d55y6kvn94anf7qi1bkc28cjmw61hxjq38fb"; depends=[assertthat bit64 curl DBI gargle glue httr jsonlite prettyunits progress rapidjsonr Rcpp rlang tibble]; }; + bigsnpr = derive2 { name="bigsnpr"; version="1.3.0"; sha256="1021nxqpl018ph2np50n02szjdlwc71r6yx5sbszd8dxbpb0hfjn"; depends=[bigassertr bigparallelr bigreadr bigstatsr bigutilsr data_table foreach ggplot2 magrittr Matrix Rcpp RcppArmadillo rmio]; }; + bigsparser = derive2 { name="bigsparser"; version="0.1.0"; sha256="1f02hpdw2r6r4sqm16qz1rz0yz8rr42jlhnmigf0kqxvx5r9mwss"; depends=[bigassertr Rcpp rmio]; }; bigsplines = derive2 { name="bigsplines"; version="1.1-1"; sha256="1kf04p2lglzdi1fdryk27nmj2a2jca2ii7ki8vak93sq21isb179"; depends=[quadprog]; }; - bigstatsr = derive2 { name="bigstatsr"; version="1.1.2"; sha256="1bp53gbsgxlizv9vq68scbadiq08isvzl0iv9nwa22ywlpaabybf"; depends=[bigassertr bigparallelr bigreadr cowplot foreach ggplot2 Rcpp RcppArmadillo rmio RSpectra tibble]; }; + bigstatsr = derive2 { name="bigstatsr"; version="1.2.3"; sha256="0386hrfjsdnm5ns9kkym8nhzfadcn0shdr3yj77051lwxfngdmbx"; depends=[bigassertr bigparallelr cowplot foreach ggplot2 Rcpp RcppArmadillo rmio RSpectra tibble]; }; bigstep = derive2 { name="bigstep"; version="1.0.3"; sha256="0ygp1vljqqn5vzpjxlv9d6fxxv3bi2kfyqfs1gf0jgxwb9417b82"; depends=[bigmemory magrittr matrixStats R_utils RcppEigen speedglm]; }; bigtabulate = derive2 { name="bigtabulate"; version="1.1.5"; sha256="1jvp3m0ms2cav9z8vvhh80gsa0kvc351brv2jq99rxv1mwvpa4xj"; depends=[BH biganalytics bigmemory Rcpp]; }; bigtcr = derive2 { name="bigtcr"; version="1.1"; sha256="1l03yc28afdm7glbw4ay0zsywjgqg5l90qz1hfhslsy8gg7d5wq5"; depends=[]; }; bigtime = derive2 { name="bigtime"; version="0.1.0"; sha256="136gy2i4qwa2drklllyzp3z0dbijlavgf3sxy73bf84df2yq1c9i"; depends=[corrplot lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; }; - bigutilsr = derive2 { name="bigutilsr"; version="0.2.2"; sha256="19d4rj598094fncblncd0bampm19srrmczrsmwvj5njf3cxkvxdp"; depends=[bigparallelr nabor Rcpp robust robustbase RSpectra]; }; + bigutilsr = derive2 { name="bigutilsr"; version="0.3.0"; sha256="0fjmczbfap20y39vaym01wxl0c4vckqxgjkki9z1s66rglxr6zg9"; depends=[bigassertr bigparallelr nabor Rcpp robustbase RSpectra]; }; bikeshare14 = derive2 { name="bikeshare14"; version="0.1.2"; sha256="1sib83driqv9k4aa131nw3xasslrxvnxkn3mr8kxycxccky025n9"; depends=[]; }; - bikm1 = derive2 { name="bikm1"; version="0.9.0"; sha256="09ibaj5nd7ql5l30z726nifym5bnmkx4nbw982p9h2440rdx0g5b"; depends=[ade4 ggplot2 gtools pracma reshape2]; }; - bild = derive2 { name="bild"; version="1.1-5"; sha256="03has1zi57inicahl52ja006vv5cdndyxfsxp77l6nc3zc6ixna8"; depends=[]; }; + bikm1 = derive2 { name="bikm1"; version="1.0.0"; sha256="1pj41d59n3iflwc4iwnwv6g2vhjs9498k85cml7jwb814xpl9jsj"; depends=[ade4 ggplot2 gtools pracma reshape2]; }; + bild = derive2 { name="bild"; version="1.2-0"; sha256="0aygx77fn2w249q6ghpxclhm9xb2ngdzrirldr3lpidg6ivc443v"; depends=[]; }; billboard = derive2 { name="billboard"; version="0.1.0"; sha256="1z3y8dijhc1381y91n5zq305xzm1gpvs0g4mdpfr7zrblpa8ws39"; depends=[tibble]; }; billboarder = derive2 { name="billboarder"; version="0.2.8"; sha256="1n51xildr8h3fqm3yhalgvq6pwlpzbcv230jg7skp8147wmwcmi7"; depends=[ggplot2 htmltools htmlwidgets jsonlite magrittr scales shiny]; }; bimetallic = derive2 { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; }; - bimets = derive2 { name="bimets"; version="1.4.2"; sha256="13gv3p3mldmdwvbvivh4fx8ygmjvf0gza69gprv4z1wphb6rz7yn"; depends=[xts zoo]; }; + bimets = derive2 { name="bimets"; version="1.4.3"; sha256="00gbfjp4gshc5izbjlzsc6vib1rfkilbwd89xc4fn51z1hfsvpzl"; depends=[xts zoo]; }; bimixt = derive2 { name="bimixt"; version="1.0"; sha256="0nhszpzjqy8z3vngl5jdzqxzshnn92wgi0ci5n3n5kzi24xkfrzc"; depends=[pROC]; }; binGroup = derive2 { name="binGroup"; version="2.2-1"; sha256="0cb7j6b0s3y56mv1967awwri0kv0rf3sr3vwf9gc2zbjggxi9ffp"; depends=[partitions Rdpack]; }; + binGroup2 = derive2 { name="binGroup2"; version="1.0.2"; sha256="025b087av8zqn7i0ggfdzkkckqql4pc12z4h4r4bw8la2krcdw3z"; depends=[partitions rBeta2009 Rcpp RcppArmadillo Rdpack]; }; binMto = derive2 { name="binMto"; version="0.0-7"; sha256="0rg9rsdy14jx7zjv60krcz1vh0sxqimsai0wynhx2sx0kydw4ngy"; depends=[mvtnorm]; }; binaryGP = derive2 { name="binaryGP"; version="0.2"; sha256="0i4xi0gxk0lamjdygyx0azdp3kfqmva1g20nl3p65w4yx77m88d6"; depends=[GPfit lhs logitnorm nloptr Rcpp RcppArmadillo]; }; binaryLogic = derive2 { name="binaryLogic"; version="0.3.9"; sha256="19ig9qgjjnivfihjy41pc13qlrb95679mmk4zks5lbbri8qi4qxj"; depends=[]; }; @@ -5533,97 +5583,100 @@ in with self; { binnednp = derive2 { name="binnednp"; version="0.4.0"; sha256="1qswrr982x5hy2vl2fc603j98cjli9l40zzvvjy2l91p8xxrc5dn"; depends=[doParallel fitdistrplus foreach kedd mclust nor1mix Rcpp Rdpack]; }; binom = derive2 { name="binom"; version="1.1-1"; sha256="0mjj92dqf5q69jxzqya4izb1mly3mkydbnmlm4wb3zqqg82a324c"; depends=[]; }; binomSamSize = derive2 { name="binomSamSize"; version="0.1-5"; sha256="1an6dcqsjh5r0w4kc3n6yfvvha5qhrb2i4bpf7g5ykhl3i60zfcc"; depends=[binom]; }; - binomialMix = derive2 { name="binomialMix"; version="1.0"; sha256="01l3083bc6k2n18nfi1alc737l5zcankv30f4i0z3ajlqpd2jqr9"; depends=[dplyr gmp lubridate MASS rlang Rmpfr stringr]; }; + binomialMix = derive2 { name="binomialMix"; version="1.0.1"; sha256="1ak3h0lgjmrv9miwn7fl6jvcp8xdld53swjz71q67q999s42np0m"; depends=[dplyr gmp lubridate MASS rlang Rmpfr stringr]; }; + binomialRF = derive2 { name="binomialRF"; version="0.1.0"; sha256="1liqhnp4j3fxy552fi4yz5vmfzh5blpmxx6fa3g62dgnhcm9sy18"; depends=[data_table randomForest rlist]; }; binomialcftp = derive2 { name="binomialcftp"; version="1.0"; sha256="00c7ymlxk1xnx3x1814x7bcyir7q5sy4rb82dcpzf2bdly4xa1qr"; depends=[]; }; binomlogit = derive2 { name="binomlogit"; version="1.2"; sha256="1njz1g9sciwa8q6h0zd8iw45vg3i1fwcvicj5y8srpk8wqw3qp7k"; depends=[]; }; binostics = derive2 { name="binostics"; version="0.1.2"; sha256="1izcck2dq8ay9ni1wjg426w5rj39gxwzls1sgnngggapl3pmqzz2"; depends=[]; }; + binovisualfields = derive2 { name="binovisualfields"; version="0.1.1"; sha256="0s2p0miqjckkj4v9l0c7zsdnnq69j08p4c5sgdxvkzlv23rnrkyd"; depends=[gtools plotrix shiny]; }; binr = derive2 { name="binr"; version="1.1"; sha256="0kgk91zy7bdrhpkh9c5bi206y9hjwjwzb508i8qqmznqyxmza70r"; depends=[]; }; binseqtest = derive2 { name="binseqtest"; version="1.0.3"; sha256="0661a2bqmv6bckq23c6m04ggwrp8z10lfgjg9dgkz4bfxsd297gs"; depends=[clinfun]; }; - binsmooth = derive2 { name="binsmooth"; version="0.2.1"; sha256="0izfgsjajq64n9x7lv19dscg7z39jspwa9fpvxmyxhiv3d3fz8f0"; depends=[ineq pracma triangle]; }; + binsmooth = derive2 { name="binsmooth"; version="0.2.2"; sha256="1sidv8ra377glaacib1j4ksg5bg759hk7h6fadrfzip3hgxgjg9x"; depends=[ineq pracma triangle]; }; binsreg = derive2 { name="binsreg"; version="0.2.0"; sha256="031a794bkb9qdy51p4jgjg3hvh8ga0hwakcdrjn0hv4ls9f5gsm7"; depends=[ggplot2 sandwich]; }; binst = derive2 { name="binst"; version="0.2.1"; sha256="09kzk7n1j9nzgyijwirzk33z6p6hc67zkd05hv1i9qfijy31gci4"; depends=[rpart]; }; bio_infer = derive2 { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; }; bio3d = derive2 { name="bio3d"; version="2.4-1"; sha256="07rw6c2d95gb5myxh31727j0jrchd0xisa3x89jjmf4zzs3vv7v7"; depends=[Rcpp]; }; + bioC_logs = derive2 { name="bioC.logs"; version="1.1"; sha256="18v8hj426vdfz30jifhd17fv65w5nv0f55ff9r8s2ahi6qv3w828"; depends=[]; }; bioOED = derive2 { name="bioOED"; version="0.2.1"; sha256="0wx58bngpzlrbbcnx8l1lqhsg51y98wcym1238p87drf64x2mj1n"; depends=[bioinactivation corrplot dplyr FME ggplot2 MEIGOR rlang tidyr tidyselect tidyverse]; }; bioPN = derive2 { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; }; - bioRad = derive2 { name="bioRad"; version="0.4.0"; sha256="100b1fz7dxpvsc452r4yvd4g6gmzz80pvw1l0sp6g4310gyzs2fb"; depends=[curl fields ggmap ggplot2 maptools raster rgdal rhdf5 sp]; }; + bioRad = derive2 { name="bioRad"; version="0.5.1"; sha256="0vkq7dsmqsxdghs6g55iv9wcnjw0qs50djswjscn0yz3gyl95w6x"; depends=[assertthat curl fields ggmap ggplot2 maptools raster rgdal rhdf5 sp tidyr viridis viridisLite]; }; bioacoustics = derive2 { name="bioacoustics"; version="0.2.2"; sha256="13m5w888fap7nxn3pwimi04zdp848n20ha01v7gkzdkchdnbbchb"; depends=[htmltools moments Rcpp stringr tuneR]; }; biocompute = derive2 { name="biocompute"; version="1.0.3"; sha256="1c23yd0vhar1hvzskr7h6g3a78mcrwminm2pkdmc9qlpy8s8smvv"; depends=[cli crayon curl digest httr jsonlite jsonvalidate magrittr rmarkdown stringr uuid yaml]; }; biogas = derive2 { name="biogas"; version="1.23.2"; sha256="05g6nyi872skvr34kw5c71ggnnjc3fv95imc327yjqhmqmwx3m19"; depends=[]; }; biogeo = derive2 { name="biogeo"; version="1.0"; sha256="14sqgg8b06gp5dajxvyj9s3ndsk7jpkfr0mkyl2l61kgp6qx53rh"; depends=[maptools raster sp stringr vegan]; }; - biogram = derive2 { name="biogram"; version="1.6.1"; sha256="0n9ahj0lbq3hsk6v9brjwqh3iha5dyg2xn5kngn8m8rvl0flf9k2"; depends=[bit combinat entropy partitions slam]; }; + biogram = derive2 { name="biogram"; version="1.6.3"; sha256="1y7yaa6xwv11b6a4qf4qb3d7rsz0yiiq1k5mb0dbm3avydnl9c4b"; depends=[combinat entropy partitions slam]; }; bioimagetools = derive2 { name="bioimagetools"; version="1.1.4"; sha256="078xqgq4bgphzflfajxnyfxrmhs28224abby0fq5q9bh1hngkn58"; depends=[EBImage httr tiff]; }; bioinactivation = derive2 { name="bioinactivation"; version="1.2.3"; sha256="0gz1bbakf6b23jsbvrr8314yxajxcr1akm5srgm883lrf1p5ax13"; depends=[deSolve dplyr FME ggplot2 lazyeval MASS purrr rlang]; }; biolink = derive2 { name="biolink"; version="0.1.6"; sha256="1szsplhzrn660aw442ad73rwhmyqjwqq6faaz4bw86khsvxh993y"; depends=[DBI glue memoise rentrez RMySQL xml2]; }; biomartr = derive2 { name="biomartr"; version="0.9.2"; sha256="12bw15hvjg7fbrq1mwn2xgzbplydy8rlq982hs118mlwdrlqb06q"; depends=[biomaRt Biostrings curl data_table downloader dplyr fs httr jsonlite philentropy purrr R_utils RCurl readr stringr tibble XML]; }; - biomod2 = derive2 { name="biomod2"; version="3.3-7.1"; sha256="0g8knlkrxlwxbh1qzxhv2lf1zxrlqf7s6yhzvch18y8w021d8d9c"; depends=[abind dismo earth gbm ggplot2 MASS mda nnet PresenceAbsence pROC randomForest raster rasterVis reshape rpart sp]; }; + biomod2 = derive2 { name="biomod2"; version="3.4.6"; sha256="0nvxg0a78ynydx3wd16vaildw9x4hiagmx4wkrwkzbyhyi2pgza1"; depends=[abind caret checkmate dismo doParallel dplyr earth ENMeval foreach gbm ggplot2 lattice MASS maxnet mda nnet PresenceAbsence pROC purrr randomForest raster rasterVis reshape rlang rpart sp tidyr]; }; bionetdata = derive2 { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; }; - bioplots = derive2 { name="bioplots"; version="0.0.1"; sha256="184wp1jvgf7a80srrfq72a4r1la2psr8b16kxs00v2gcbgjyvr10"; depends=[ggplot2 gplots RColorBrewer reshape2]; }; - bios2mds = derive2 { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap cluster e1071 rgl scales]; }; + bios2mds = derive2 { name="bios2mds"; version="1.2.3"; sha256="1k0r3fnkzfczx3wp3m8zpndk6gxca7idsp0z13rw84zjrgqaw6jm"; depends=[amap cluster e1071 rgl scales]; }; bioset = derive2 { name="bioset"; version="0.2.3"; sha256="15vchim8cim42j1if0jars696rh50vmbggr9748q321f6ngm1w1i"; depends=[dplyr magrittr rlang tibble tidyr]; }; biosignalEMG = derive2 { name="biosignalEMG"; version="2.1.0"; sha256="0bbkrfqkmks4z8c7rh0k43lvm71vn3fzrw3kpj012ym77whwkvay"; depends=[signal]; }; biospear = derive2 { name="biospear"; version="1.0.2"; sha256="10y4hbncwiqpxzqvzjrmfgp804zczdgvwpjcj0dzaa0sx1njdzja"; depends=[cobs corpcor devtools glmnet grplasso MASS Matrix mboost pkgconfig plsRcox pROC PRROC RCurl survAUC survival]; }; biostat3 = derive2 { name="biostat3"; version="0.1.4"; sha256="12inmmy5xjd0c6vs2s00z13rm5ykndxpmmgi8h7pkw30rhq4snyc"; depends=[car MASS muhaz survival]; }; biotic = derive2 { name="biotic"; version="0.1.2"; sha256="1p18jkdd263dgk90626n9awkj6m4zn1n7897596fzrzrahksa978"; depends=[]; }; biotools = derive2 { name="biotools"; version="3.1"; sha256="15y3ccmj1gslzc0lp0gvc66hf0yigx3zkqnw46crgrizjm2kmjay"; depends=[boot lattice MASS rpanel SpatialEpi tkrplot]; }; - bipartite = derive2 { name="bipartite"; version="2.14"; sha256="0wy7ciw59b7z2gzp5qiphss9p208qf6dyprl59nksb462fg4rxyq"; depends=[fields igraph MASS permute sna vegan]; }; + bipartite = derive2 { name="bipartite"; version="2.15"; sha256="0gr1wm9bvvrvwv5gzzfic7yknp826ga44vjbil84x1kp0h0k1f46"; depends=[fields igraph MASS permute sna vegan]; }; bipartiteD3 = derive2 { name="bipartiteD3"; version="0.2.0"; sha256="1jvhlycmxii4vcm9qbj246qkwhd1bcggqq56b5rmbyqwd4vhqh8f"; depends=[downloader dplyr purrr r2d3 RColorBrewer stringr tibble tidyr]; }; biplotbootGUI = derive2 { name="biplotbootGUI"; version="1.2"; sha256="07lrs2n6s54h97vjriszszhksdbi14s2i234kwfhg7aq47k6l0jl"; depends=[cluster dendroextras MASS matlib rgl shapes tcltk2 tkrplot]; }; - birankr = derive2 { name="birankr"; version="1.0.0"; sha256="004ckrr9jiclh1wfzchrv2s1b33y9lv465kx1jb2q4pr2m1j027c"; depends=[data_table Matrix]; }; + birankr = derive2 { name="birankr"; version="1.0.1"; sha256="1azgrzgw5bnfac8p287ir5zl6kxc6jij20p6cfc3lbbl03f8sa1k"; depends=[data_table Matrix]; }; birdring = derive2 { name="birdring"; version="1.4"; sha256="0rskrf0r5nrzfcac0zvc60vabvs9dws2zx1rxssvw6xmwyiiy1z6"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; }; birk = derive2 { name="birk"; version="2.1.2"; sha256="07ck59m5mw897a60vmdn1b3qrmqj20qpfsn3093haqbpn8z13dmn"; depends=[]; }; birtr = derive2 { name="birtr"; version="1.0.0"; sha256="0bcxvj30wzwclw1lcyhvwj3k7awd39lrvzia1nrg53hw90bfs811"; depends=[]; }; biscale = derive2 { name="biscale"; version="0.1.2"; sha256="1m7b1sjqngcfqc5z1b10i3s9m6lml2jiw6ab5dk9dr01i4yw0nhw"; depends=[classInt dplyr ggplot2 glue rlang tidyr]; }; bisect = derive2 { name="bisect"; version="0.9.0"; sha256="1dr95gnc9rb3i8603wspf0hznmvk5akk46nyf1bhv88mjz2i5q77"; depends=[]; }; bisectr = derive2 { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; }; - bisque = derive2 { name="bisque"; version="1.0.1"; sha256="05rx8fcmb46486iqxgkcf69dih80iwswx41ml1f5d2dnjf5b1p34"; depends=[doRNG foreach itertools mvQuad Rcpp RcppArmadillo RcppEigen]; }; - bit = derive2 { name="bit"; version="1.1-15.1"; sha256="0y351ajlrn9ywbiai46mjpwmw5pqc9ik2z24rf0bnbdcvaxdr7r8"; depends=[]; }; + bisque = derive2 { name="bisque"; version="1.0.2"; sha256="0zp2r1vg29q2ds34hhyjv9pz761mi0qncx9p4ilwnfd5yj9pmzwq"; depends=[foreach itertools mvQuad Rcpp RcppArmadillo RcppEigen]; }; + bit = derive2 { name="bit"; version="1.1-15.2"; sha256="12xjkkkmflkz8s435by4r23b57cz7z67z84907f6qg99hn1yg0qb"; depends=[]; }; bit64 = derive2 { name="bit64"; version="0.9-7"; sha256="07znvz9vp1nz1y5ljng4qyskvm943cdbmy996s67560ijxzsm6kv"; depends=[bit]; }; + bite = derive2 { name="bite"; version="0.3"; sha256="00sph3pdbb9p21s3263ni4by2ivvya1sbjm9wvwx1rwjr4f31jps"; depends=[ape coda MASS phytools sm vioplot xml2]; }; bitops = derive2 { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; }; bitsqueezr = derive2 { name="bitsqueezr"; version="0.1.1"; sha256="0dy180r9cclq46mh0fzc68p5zm9x2z5pa8ajgsk7qycdkyw5v829"; depends=[]; }; biva = derive2 { name="biva"; version="0.1.0"; sha256="1vppvk2n60hhi7p8y8rdyckmh4yk70wqyhbg7rbgh833s66whypw"; depends=[corrgram rpivotTable shiny shinyAce]; }; bivarRIpower = derive2 { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; }; - bivariate = derive2 { name="bivariate"; version="0.4.1"; sha256="13qmwz8lwgxppjsq491f8grsg2myhwma4ikhx2k40lag98dpgc9f"; depends=[barsurf intoo KernSmooth mvtnorm]; }; + bivariate = derive2 { name="bivariate"; version="0.5.0"; sha256="0b8wrzh51wqxiksja4jgjfqfqq3nlnx8vcvnmyhl1nzn9jyzdrfg"; depends=[barsurf intoo KernSmooth mvtnorm]; }; bivgeom = derive2 { name="bivgeom"; version="1.0"; sha256="1cn8k7q011whr4f7zig85dsrkz04614z9ns2ky6k6i16s5n3glxy"; depends=[bbmle copula]; }; bivquant = derive2 { name="bivquant"; version="0.1"; sha256="05dn4qik2dvmgqc2613vddh312bqhza1vnf94an75888gxri5h03"; depends=[copula cubature lpSolve MASS mvtnorm regpro]; }; - bivrp = derive2 { name="bivrp"; version="1.2"; sha256="1yrciaadxlkxzbgdsig80yjn9iqrv8a6ccz62hsnyb3knycpcln1"; depends=[MASS mrfDepth]; }; + bivrp = derive2 { name="bivrp"; version="1.2-2"; sha256="0b38nh38vgqjllb1z9627dm86yp0s06ky1g829g8kkz7rffdp2za"; depends=[MASS]; }; biwavelet = derive2 { name="biwavelet"; version="0.20.19"; sha256="0pdjjjjiwnl7ihlwzjd9hwl5kzq5wbnbqfmm5pp8gvkcypj9k7rb"; depends=[fields foreach Rcpp]; }; biwt = derive2 { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[MASS rrcov]; }; bizdays = derive2 { name="bizdays"; version="1.0.6"; sha256="1av96rj4fllfais9xwh1p8601xvsj0awfh9n2n1x5kzca966h8fq"; depends=[jsonlite]; }; bjscrapeR = derive2 { name="bjscrapeR"; version="0.1.0"; sha256="18chbgiwify272iqf0w4vsqh73wbk12d8m2awc5hbnfqblz3phwd"; depends=[dplyr glue readr tibble]; }; bkmr = derive2 { name="bkmr"; version="0.2.0"; sha256="0dk6dn73bqlvwinn3aginls4533931xcr3h59k0w60yxs3v8yakv"; depends=[dplyr fields magrittr MASS nlme tidyr tmvtnorm truncnorm]; }; - blackbox = derive2 { name="blackbox"; version="1.1.27"; sha256="1mpxil8fr56xiy64177s6m16pygfsr6i1bn4crvnhypz9197in8c"; depends=[foreach geometry lattice MASS nloptr numDeriv pbapply proxy rcdd Rcpp RcppEigen spaMM]; }; + blackbox = derive2 { name="blackbox"; version="1.1.32"; sha256="180y19ls0vdk98smhs9hxpcwg3hwpl62d19zdiml38bjlxmr0kav"; depends=[foreach geometry lattice MASS nloptr numDeriv pbapply proxy rcdd Rcpp RcppEigen spaMM]; }; blaise = derive2 { name="blaise"; version="1.3.4"; sha256="14jk62sw4xs0yip8gh1w2795l8p0ybv83c24ijizxymg16h7i9g7"; depends=[dplyr readr stringr tibble]; }; blandr = derive2 { name="blandr"; version="0.5.1"; sha256="1rqas71hlf000b3z824d8ljshf8bx91bbrzaxxnx5n3chv19w6z6"; depends=[ggplot2 jmvcore knitr R6 rmarkdown stringr]; }; blastula = derive2 { name="blastula"; version="0.3.1"; sha256="0vanb8ghzskicnk7gw7mw67790lw953jf3jgyyhd71qdgz6wjli7"; depends=[base64enc commonmark curl dplyr fs getPass here htmltools httr jsonlite magrittr mime rlang rmarkdown stringr uuid]; }; - blavaan = derive2 { name="blavaan"; version="0.3-8"; sha256="0sspwr2pfm5an8lg3xwgmq45nxv39yll66bkgk0qjdbfxb2zhzzx"; depends=[bayesplot BH coda future_apply lavaan loo MCMCpack mnormt nonnest2 Rcpp RcppEigen rstan rstantools StanHeaders]; }; + blavaan = derive2 { name="blavaan"; version="0.3-9"; sha256="1a79hvpn1ynd28wj137dmqq6gjxdl7x3ml1mx111vrdlbw8whdmv"; depends=[bayesplot BH coda future_apply lavaan loo MCMCpack mnormt nonnest2 Rcpp RcppEigen rstan rstantools StanHeaders]; }; blendedLink = derive2 { name="blendedLink"; version="1.0"; sha256="19d1pnjag89jjvkl5a6wx531qjqp4cv5jk95md6jby27yr52r8vp"; depends=[]; }; blender = derive2 { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; }; blin = derive2 { name="blin"; version="0.0.1"; sha256="1h94azm7gli9i4v3li5c1p36p3rkcj2p5j6rqzlzf0pcqs0bsc09"; depends=[abind glmnet MASS Matrix mvtnorm]; }; - blink = derive2 { name="blink"; version="1.0.0"; sha256="1a1rc4k78604ypgwrb3ysd2ak27vqhbwjn662mrr4a36kgw1z0w3"; depends=[plyr RecordLinkage stringdist]; }; blkbox = derive2 { name="blkbox"; version="1.0"; sha256="14bl0b5w46gb7v8p94df5r56nj849r7jqisajagvd1irda3vkc7z"; depends=[bartMachine caret dplyr e1071 ggplot2 glmnet gtools kknn knitr magrittr nnet pamr party plyr pROC randomForest reshape reshape2 rJava rmarkdown shiny shinyjs stringr tibble tidyr xgboost]; }; blm = derive2 { name="blm"; version="2013.2.4.4"; sha256="1w6c30cq38j4i1q4hjg12l70mhy5viw886l1lsnxyvniy113in4i"; depends=[]; }; blme = derive2 { name="blme"; version="1.0-4"; sha256="1ca2b0248k0fj3lczn9shfjplz1sl4ay4v6djldizp2ch2vwdgy2"; depends=[lme4]; }; blmeco = derive2 { name="blmeco"; version="1.4"; sha256="1370djpy87816bfr0g8730x7q4d4xx9aa41iqm622q5b5zm2jzmp"; depends=[arm lme4 MASS]; }; blob = derive2 { name="blob"; version="1.2.1"; sha256="1slb5mvxfyi92i8ifx2qa31hp57inilwhq1g9lzvgha6jrxbqm7g"; depends=[rlang vctrs]; }; + blockCV = derive2 { name="blockCV"; version="2.1.1"; sha256="0431d38zzkbpri65p5vnr8wc5b27124c4jaj845rgjlkvvb0xysm"; depends=[progress raster sf]; }; blockForest = derive2 { name="blockForest"; version="0.2.4"; sha256="14xggdm34hmdlz3hvvp5layk6mb016yppqf9x9rbia9lmmjbhgfh"; depends=[Matrix Rcpp RcppEigen survival]; }; blockRAR = derive2 { name="blockRAR"; version="1.0.2"; sha256="1d9izlcgz85kcz1sh11mcxq96qh0cwv6638jha851h2f4lnc8aa4"; depends=[arm dplyr ldbounds magrittr tibble]; }; blockTools = derive2 { name="blockTools"; version="0.6-3"; sha256="0023p0msfmp8swq4f5aff40m976np7y051x8hjizzw91hrfa4w2n"; depends=[MASS tibble]; }; blockcluster = derive2 { name="blockcluster"; version="4.4.3"; sha256="0al1v4r26rh4fx4g8gyk8mxfagn75xb9n4lwh3s6xvk87x33p20c"; depends=[Rcpp rtkore]; }; blockmatrix = derive2 { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; }; - blockmodeling = derive2 { name="blockmodeling"; version="0.3.4"; sha256="11v9903y9dwlzaqp8sx0fsibcg82phvappddy37r8lnxd4vchsd2"; depends=[doParallel doRNG foreach Matrix]; }; + blockmodeling = derive2 { name="blockmodeling"; version="0.3.6"; sha256="12paf76l3wlxad14bkxn37lw9rg6ka473m86wlcf3yhriw8kbaiz"; depends=[Matrix]; }; blockmodels = derive2 { name="blockmodels"; version="1.1.1"; sha256="088629i4g63m8rnqmrv50dgpqbnxd1a4zl5wr3ga0pdpqhmd53wp"; depends=[digest Rcpp RcppArmadillo]; }; - blockrand = derive2 { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; }; - blocksdesign = derive2 { name="blocksdesign"; version="3.8"; sha256="1vjx94i3n63hzs9nx0gs9cjc4947lrgq9ld60cxjrdsgk53f53s5"; depends=[lme4 plyr PolynomF]; }; - blogdown = derive2 { name="blogdown"; version="0.17"; sha256="1ijfskdl9apvs95km2f7p2m1imcbxvqxd8wkp3rdmgfs73pfk33r"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; }; - blorr = derive2 { name="blorr"; version="0.2.1"; sha256="1lvh5jr1jidrkwidpy6plzd58p8q3rxa23wl4xsf8milw180w69p"; depends=[car caret checkmate cli clisymbols crayon dplyr e1071 ggplot2 glue gridExtra magrittr purrr Rcpp rlang scales shiny tibble]; }; + blockrand = derive2 { name="blockrand"; version="1.5"; sha256="0bic3b8l7mp2hpwd8k1diwy6a4lj92i7s5k20i2wy8kw0c74jwfh"; depends=[]; }; + blocksdesign = derive2 { name="blocksdesign"; version="3.9"; sha256="12misnycbfqr5la4h35dx33cs7jxjxrh8cxmsh4pwbw38b6kjc86"; depends=[lme4 plyr PolynomF]; }; + blogdown = derive2 { name="blogdown"; version="0.18"; sha256="10alz3s803pw8yy8c540xfnn86zhvgk7lyx7c3v0q50b64m4arjl"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; }; + blorr = derive2 { name="blorr"; version="0.2.2"; sha256="1fwpaj4sc4jh4f25zlx8z2gn2gfnj5ibic95rn60iq75mp9r6x44"; depends=[car caret checkmate cli clisymbols crayon dplyr e1071 ggplot2 gridExtra magrittr purrr Rcpp rlang scales tibble xplorerr]; }; blrm = derive2 { name="blrm"; version="1.0-1"; sha256="0p0nmbxil4l89fcryrgsg9mxzb5fyg93p50aqkjy00ms05hwd0hx"; depends=[boot mvtnorm openxlsx reshape2 rjags]; }; blsAPI = derive2 { name="blsAPI"; version="0.2.1"; sha256="0p45g4qqaialh5m9bxgrvnc7nqmm0429syw0bml8h4h8vy4014a7"; depends=[httr rjson]; }; blscrapeR = derive2 { name="blscrapeR"; version="3.2.0"; sha256="0dq9yg9xik715b36vc3fch4ab3njqa22w7b7b905b9gyagkv2zbv"; depends=[dplyr ggplot2 httr jsonlite magrittr purrr stringr tibble]; }; bltm = derive2 { name="bltm"; version="0.1.0"; sha256="1sx4ii65ddvdw45za8j320v1s9d1pz5k2gx979yymhyxi8fmq69z"; depends=[mvnfast Rfast]; }; bmass = derive2 { name="bmass"; version="1.0.3"; sha256="0dafixd996lamn5kfbqpiawblalhyw1gi394j46n2sij2r209d76"; depends=[]; }; bmd = derive2 { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; }; - bmem = derive2 { name="bmem"; version="1.5"; sha256="1miiki743rraralk9dp12dsjjajj3iizcrfwmplf6xas6pl8sfk6"; depends=[Amelia lavaan MASS sem snowfall]; }; + bmem = derive2 { name="bmem"; version="1.7"; sha256="1g259j2jzmbbv98l0w6jc4k18ad0a7hvq2s9jgjdxk8n6ymbx67v"; depends=[Amelia lavaan MASS sem snowfall]; }; bmeta = derive2 { name="bmeta"; version="0.1.2"; sha256="19pm60xpmlanngq4nbibp0n5m98xw24b2xghz92ly31i3mkg2n68"; depends=[forestplot R2jags]; }; bmixture = derive2 { name="bmixture"; version="1.4"; sha256="0dh4qy0snxw7d82v68zymwm5pfvzwdfkyaha6kgh2mvin5k2vaqm"; depends=[BDgraph]; }; bmk = derive2 { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda functional plyr]; }; @@ -5632,9 +5685,9 @@ in with self; { bmotif = derive2 { name="bmotif"; version="2.0.0"; sha256="1vvh20hzf2nfc28pp2vjgip3xjv617lawfjawd51v3xmfnk3bvj2"; depends=[gtools Rcpp reshape2 tensor]; }; bmp = derive2 { name="bmp"; version="0.3"; sha256="0jd67r11bn98hjwgyr6gas423787xy7ji2hq7ay80blkkcj91xxx"; depends=[]; }; bmrm = derive2 { name="bmrm"; version="4.1"; sha256="1brdd5mhr5282wkdc62lgsqcxw077p69rknjk7fjcs282ahcik2s"; depends=[LowRankQP lpSolve matrixStats Rcpp]; }; - bnclassify = derive2 { name="bnclassify"; version="0.4.4"; sha256="1jjyqh850glllvghgfbxsji6yw1grzyxm59pcbxkwm3yynviq0ml"; depends=[assertthat BH entropy matrixStats Rcpp rpart]; }; + bnclassify = derive2 { name="bnclassify"; version="0.4.5"; sha256="1ik3n0g6gw7504ryg5skwygyc545150r297gii4mr2zj252lf069"; depends=[assertthat BH entropy matrixStats Rcpp rpart]; }; bnlearn = derive2 { name="bnlearn"; version="4.5"; sha256="0y452cw1dxm1cik4na1zq6g0zv5ybiwc1cq9sdashq1jacjpc158"; depends=[]; }; - bnma = derive2 { name="bnma"; version="1.0.0"; sha256="1gaplf5lw7x6nfihk6n0kyf67vx4d8zq6mylhwlmfhpfrpiy030k"; depends=[coda ggplot2 igraph rjags]; }; + bnma = derive2 { name="bnma"; version="1.1.1"; sha256="1iwm4843hq07i4r73vaf8pymk0p4m3vpbw3l37l79i4c2ysqgv3h"; depends=[coda ggplot2 igraph rjags]; }; bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.5"; sha256="1d9jmfx0id4lmw122zga7hb52vlfdfqn4amhzpsmhyck99rv92j4"; depends=[pec prodlim Rcpp]; }; bnormnlr = derive2 { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; }; bnpa = derive2 { name="bnpa"; version="0.3.0"; sha256="0qsxk47i7q4d8hbs2xj5k5sf8bqyzhq7rbj4y7w8ljprznlydgl9"; depends=[bnlearn fastDummies lavaan Rgraphviz semPlot xlsx]; }; @@ -5648,7 +5701,8 @@ in with self; { boilerpipeR = derive2 { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; }; bold = derive2 { name="bold"; version="0.9.0"; sha256="0ppdhbpdffvs0sgh7ykkhr585nhk66w6vqw793wa4ia57yl49s25"; depends=[crul data_table jsonlite plyr reshape stringr tibble xml2]; }; bomrang = derive2 { name="bomrang"; version="0.7.0"; sha256="0xlsivhnank7bc3y06wk5avlzlc24mfvn9c18rhgxxib8mzf8aak"; depends=[crayon curl data_table dplyr foreign hoardr httr janitor jsonlite lubridate magrittr raster readr rgdal rvest tidyr xml2]; }; - bookdown = derive2 { name="bookdown"; version="0.17"; sha256="10b4gnd6z3w13pysqqan43blxcbk7bgbzc7wr83b23ag1lh2n40j"; depends=[htmltools knitr rmarkdown tinytex xfun]; }; + bookdown = derive2 { name="bookdown"; version="0.18"; sha256="1my6g16phx21v5cvfqcnjibh3zcv02xkix347aafd6a7r3hnxpq5"; depends=[htmltools knitr rmarkdown tinytex xfun]; }; + bookdownplus = derive2 { name="bookdownplus"; version="1.5.8"; sha256="1cdxz5c69cgdk7wxr0xwhzw361rpg7j8xjv9hjf1877qqmhxbrkd"; depends=[bookdown knitr magick xaringan]; }; boostmtree = derive2 { name="boostmtree"; version="1.4.1"; sha256="16adb9akrdw1cfcarrv9l5cxhn1nzskir6nwl9nawl1r727s57z6"; depends=[nlme randomForestSRC]; }; boostr = derive2 { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; }; boot = derive2 { name="boot"; version="1.3-24"; sha256="0yv0l55kjmlfdx1xhgyjdi0bskxhfal74wr5jxaib1qj99nmkm49"; depends=[]; }; @@ -5667,10 +5721,9 @@ in with self; { bootstrapFP = derive2 { name="bootstrapFP"; version="0.4.3"; sha256="19bsahkxh6g2fjz5j1bdq47vnyy38xd0vr4ahkbjz61x0h8g4nli"; depends=[sampling]; }; boottol = derive2 { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; }; bor = derive2 { name="bor"; version="0.1.0"; sha256="1r5jacmin0cq9zipxa9nmp3jnh6wsddd4wnzw2n5sggnf24ryp8g"; depends=[]; }; - boral = derive2 { name="boral"; version="1.7"; sha256="0li7jdzgq2ffhrf0nly96syp72vv3c6rbcni19kk2wgyv16mjwcm"; depends=[abind coda fishMod MASS mvtnorm R2jags]; }; + boral = derive2 { name="boral"; version="1.8"; sha256="1m3c58hsm87dpv5z9fqik6d29z3ar5iylgl93qn676xgjli0283x"; depends=[abind coda corpcor fishMod MASS mvtnorm R2jags reshape2]; }; borrowr = derive2 { name="borrowr"; version="0.1.1"; sha256="0q9lkdzf7v9rggrwcny551cx7lfqli60dxqgqx0d2x819d7h0k1d"; depends=[BART mvtnorm Rcpp]; }; - bossMaps = derive2 { name="bossMaps"; version="0.1.0"; sha256="0w4ks1xicvfm8ari4fr18wjm0qj2nxdsapl6lpfjz8l1id0y78cg"; depends=[doParallel foreach ggplot2 raster rgdal rgeos scales sp tidyr]; }; - botor = derive2 { name="botor"; version="0.2.0"; sha256="13lyw6pmz923vdkyaa9n623h134kq0n5gb6qi8bpx8rhq2sycbdb"; depends=[checkmate logger reticulate]; }; + botor = derive2 { name="botor"; version="0.3.0"; sha256="1izhpc491f54p3hz32kcp2b2yxkg59ni1caglyllg22bckw228sg"; depends=[checkmate logger reticulate]; }; boussinesq = derive2 { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; }; boxcoxmix = derive2 { name="boxcoxmix"; version="0.21"; sha256="0pav4nksh1zbic11l38jyyq8i58hfvwzkp88ra6nny3jn2axzipl"; depends=[npmlreg qicharts statmod]; }; boxplotdbl = derive2 { name="boxplotdbl"; version="1.3.0"; sha256="1y1b45q69sxbszd83s8ch10z4i55h34ixm8q7yxr7byx3px8y65n"; depends=[]; }; @@ -5680,8 +5733,9 @@ in with self; { bpca = derive2 { name="bpca"; version="1.3-0"; sha256="16a7b94nk5psnm435vrwilcsria9mhr5d31fwzxy53pzp8n78kcr"; depends=[rgl scatterplot3d]; }; bpcp = derive2 { name="bpcp"; version="1.4"; sha256="0jwz9vrz6ivz70qzgvpvksk94rw5m7vi6yijbg8dj6biq5rq01lv"; depends=[ggplot2 survival]; }; bpgmm = derive2 { name="bpgmm"; version="1.0.5"; sha256="0dxyrcf1qyf3ymj36d9flaw8405m7c1cqxbv6yrqm2dhba0ymyxq"; depends=[gtools label_switching MASS mcmcse mvtnorm pgmm Rcpp RcppArmadillo]; }; - bpnreg = derive2 { name="bpnreg"; version="1.0.2"; sha256="0lacfg4qdc3006f9ydxs9x50asdixm12s7ljwzm71a8phcqfimsv"; depends=[BH haven MASS Rcpp RcppArmadillo]; }; + bpnreg = derive2 { name="bpnreg"; version="1.0.3"; sha256="0s1whwi12fs77lycngrm0394cp6cy3g1pikhf670n94y21pk2bvi"; depends=[BH haven MASS Rcpp RcppArmadillo]; }; bpp = derive2 { name="bpp"; version="1.0.0"; sha256="11fgn92vvl7kklv0xdisf8gnf2rbhq11qyckqsxvc5wa821lmnkm"; depends=[mvtnorm]; }; + bqror = derive2 { name="bqror"; version="0.1.0"; sha256="1rgf4m4vh1rfrmsxx8227xm1pdnb1fq5kipdinz9zi99wiw75x2m"; depends=[GIGrvg invgamma MASS NPflow pracma truncnorm]; }; bqtl = derive2 { name="bqtl"; version="1.0-32"; sha256="0jjqgsm9fmvz5nkgz608xfljjpmaf4rs4f7kxvpqn4b1l9s5lhci"; depends=[]; }; braQCA = derive2 { name="braQCA"; version="1.0.0.1"; sha256="1chyy8sk3iqs54sqg79dp1vjz3gcvnbzqbmgasdynir38b45scjh"; depends=[bootstrap dplyr QCA]; }; bracer = derive2 { name="bracer"; version="1.1.1"; sha256="1l722jg88i4898v8fwb9klwl9mbpaz1phypbpqc1j2kp2n2vq0vb"; depends=[stringr]; }; @@ -5695,30 +5749,30 @@ in with self; { brant = derive2 { name="brant"; version="0.2-0"; sha256="1hdwdrdl6ad112zd7q248am3qk19alnj647nrk9xxxgd7s6a9pnb"; depends=[MASS Matrix]; }; brazilmaps = derive2 { name="brazilmaps"; version="0.1.0"; sha256="1nvd8x4m4m3966qph6390kqwpsrv7vy4yf6pam98xxkjbl9a41nf"; depends=[dplyr ggplot2 magrittr sf sp]; }; brea = derive2 { name="brea"; version="0.2.0"; sha256="0mb043fdhxrg9gyf4g55ydjx37j20394nvd4d0fmiym98lccyi04"; depends=[]; }; - breakDown = derive2 { name="breakDown"; version="0.1.6"; sha256="13vcqcrm8h4bwr6rd24z0q0nbx2bpxkg39irhv2aybjg3ll8xq77"; depends=[ggplot2]; }; + breakDown = derive2 { name="breakDown"; version="0.2.0"; sha256="1ywa7122id4infcb31rbazdd2w2hm0ff8p0a7insy3lvq0xmqd44"; depends=[ggplot2]; }; breakage = derive2 { name="breakage"; version="1.1-1"; sha256="0zjazyz92criiimpz4wyd4hd8ccspvh3hhqpd4qkfdzdf9wp3kns"; depends=[Imap]; }; - breakaway = derive2 { name="breakaway"; version="3.0"; sha256="0y3h7gifv279z3x77jmr97c0i3vy58m5wsr8pa2vyn26m02rbkpc"; depends=[]; }; breakfast = derive2 { name="breakfast"; version="1.0.0"; sha256="0p0svsqphd5w99pf5c5jmak1xxl8md881lapa8aps9xr73m4x6lf"; depends=[plyr]; }; breakpoint = derive2 { name="breakpoint"; version="1.2"; sha256="004vi1qr7iib8ykg6sp7xzv0bb841h4vsz2x0cyrhkdp41frglx9"; depends=[doParallel foreach ggplot2 MASS msm]; }; - breathtestcore = derive2 { name="breathtestcore"; version="0.4.6"; sha256="1d175pwph88nqd3i5nvs4csga9jnlzqxnsimlm63mnbnbxyzbf2q"; depends=[assertthat broom dplyr ggfittext ggplot2 MASS multcomp nlme purrr readr readxl signal stringr tibble tidyr xml2]; }; - breathteststan = derive2 { name="breathteststan"; version="0.4.7"; sha256="0lvyp3524cha6ckfx2c25829ys1g97xhjc3mi5cmdbfg8zfgcy58"; depends=[BH dplyr purrr Rcpp RcppEigen rstan rstantools StanHeaders stringr tibble tidyr]; }; + breathtestcore = derive2 { name="breathtestcore"; version="0.6.0"; sha256="1nk1hnnb8qd6hhsh56k3zkmhx27q0xxx1igxvrgd3gd28rm6c1vb"; depends=[assertthat broom dplyr ggfittext ggplot2 MASS multcomp nlme purrr readr readxl signal stringr tibble tidyr xml2]; }; + breathteststan = derive2 { name="breathteststan"; version="0.6.0.0"; sha256="0r89h9m6s6qsbzsfp0br95gzpb5cq33yanc2h2m5x8l4wp5n38vi"; depends=[BH dplyr purrr Rcpp RcppEigen rstan rstantools StanHeaders stringr tibble tidyr]; }; brew = derive2 { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"; depends=[]; }; brglm = derive2 { name="brglm"; version="0.6.2"; sha256="0c9ngscc6zlfm90fqyggnj04qfkhp5qgf5q3wnfpxwyc8cm47by2"; depends=[profileModel]; }; - brglm2 = derive2 { name="brglm2"; version="0.6.0"; sha256="1955fqnw97hn9r2q15a06xn80ijbrkfkxjihq91dfj82mb38fqyv"; depends=[enrichwith lpSolveAPI MASS Matrix nnet numDeriv]; }; + brglm2 = derive2 { name="brglm2"; version="0.6.2"; sha256="13apd1p770slnbrqs44khgv7fsh6g3fzd3n04hq36zz308avns9z"; depends=[enrichwith lpSolveAPI MASS Matrix nnet numDeriv]; }; + brickr = derive2 { name="brickr"; version="0.3.2"; sha256="1sr1bpf8alvm09l0b5cy564b1nc8zcm13ibbngxxwrc7mq3gawk1"; depends=[colorspace dplyr farver ggplot2 magrittr purrr rgl scales tidyr]; }; bridgedist = derive2 { name="bridgedist"; version="0.1.0"; sha256="0hqkpwpi3nv6mfhljl65zcflf4wy72ag36hdam6s7kynfj41qz6w"; depends=[]; }; bridger2 = derive2 { name="bridger2"; version="0.1.0"; sha256="0clp42nnbvd01n65azdi2ghp0mfqwsipzdl2d30q04lcvfkdpxrf"; depends=[BSDA data_table ggplot2 outliers plotly shiny shinydashboard]; }; - bridgesampling = derive2 { name="bridgesampling"; version="0.8-1"; sha256="1gjklf88yi6xw0idfm720bdmryhj7dxir211rfl6wk7jsiasxhlh"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; }; - brinton = derive2 { name="brinton"; version="0.1.3"; sha256="0nirqv0r53873jk0g7ip0n5ll5qasm0jbj2rlk1c7mms5lad9lzy"; depends=[forcats ggplot2 gridExtra lubridate pander qpdf RColorBrewer rmarkdown sm tibble]; }; + bridgesampling = derive2 { name="bridgesampling"; version="1.0-0"; sha256="1awhvv0v42w2q6llqi1wqpaiv5zx74cqzigdsvphy2jfp8ajw64y"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; }; + brinton = derive2 { name="brinton"; version="0.1.6"; sha256="080z4hs6fkfavrkfg3h6h150y7w5h4rxaag6bwlrrsx9dnwzpb3r"; depends=[forcats GGally ggplot2 glue gridExtra lubridate pander RColorBrewer rmarkdown sm tibble]; }; + brio = derive2 { name="brio"; version="1.0.0"; sha256="10gjg205vvdwbw3nr8bfrxy5fzqd27y1fsbyn17xnpk57c66igvc"; depends=[]; }; briqr = derive2 { name="briqr"; version="0.1.0"; sha256="073pdk1094ng4kggzdjvihl791r2qlja1j2w3pfmh2027kn520r8"; depends=[dplyr httr jsonlite magrittr tibble]; }; briskaR = derive2 { name="briskaR"; version="0.1.2"; sha256="1y9sabj7pfgyvv6s3bbvrb0xhjhwc4pcfsfx847kqdajid92qx8w"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; }; brlrmr = derive2 { name="brlrmr"; version="0.1.7"; sha256="0s47qz8y416x0gz91pzdpr97pmlvddwkvll454vnlafxxk9p5lds"; depends=[boot brglm MASS profileModel Rcpp]; }; - brm = derive2 { name="brm"; version="1.0"; sha256="0h4kgig28hkqv1amadznc0n9256dx613rxbn8s8si11ygx79x2dd"; depends=[]; }; - brms = derive2 { name="brms"; version="2.11.1"; sha256="1k3b8ax5d7d2m0b9h3hkivj3wfvp3rpq62v2caq1wnk9irxsciab"; depends=[abind backports bayesplot bridgesampling coda future ggplot2 glue loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; }; + brms = derive2 { name="brms"; version="2.12.0"; sha256="1699lwkklfhjz7fddawlig552g2zvrc34mqwrzqjgl35r9fm08gs"; depends=[abind backports bayesplot bridgesampling coda future ggplot2 glue loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; }; brnn = derive2 { name="brnn"; version="0.8"; sha256="119lxm691ci2bf62jwmbhqsl39xy3jvsi988rr6sdslwaxqyx35b"; depends=[Formula truncnorm]; }; broman = derive2 { name="broman"; version="0.69-5"; sha256="1y1l1p0ddy4a3vwa01yhrc5zcgnl673ar9prkn89pspbdab7km2s"; depends=[assertthat ggplot2 jsonlite RPushbullet]; }; - broom = derive2 { name="broom"; version="0.5.3"; sha256="177m249dxbf9pf249610qrl58v025ws41ipfihy66751pwsv2n8d"; depends=[backports dplyr generics nlme purrr reshape2 stringr tibble tidyr]; }; - broom_mixed = derive2 { name="broom.mixed"; version="0.2.4"; sha256="176817l4d31xbi7yfsjlw287va2wjllxizhi5z3p7x5mi7fkyv2c"; depends=[broom coda dplyr nlme plyr purrr reshape2 stringr tibble tidyr TMB]; }; - broomExtra = derive2 { name="broomExtra"; version="1.0.1"; sha256="0jb3s4fzy2s0bnpp8dz1dp1lhnaag18bi7gay738i5bx8f558if8"; depends=[broom broom_mixed dplyr magrittr rlang]; }; + broom = derive2 { name="broom"; version="0.5.6"; sha256="0da3jsb02xckrk6alznicn6l5lnyvdhc64qklyarnd77miqgc1hb"; depends=[backports dplyr generics nlme purrr reshape2 stringr tibble tidyr]; }; + broom_mixed = derive2 { name="broom.mixed"; version="0.2.5"; sha256="121yqj85q6pdnfhbma98a2qli1k1vkx6jdxzfg125m2iahxs9i9y"; depends=[broom coda dplyr nlme plyr purrr reshape2 stringr tibble tidyr TMB]; }; + broomExtra = derive2 { name="broomExtra"; version="4.0.0"; sha256="0sc6cikqcjmm9hr7xzz5l383p822dygsx50g8q358y92m1w2nka8"; depends=[broom broom_mixed dplyr ipmisc parameters performance rlang]; }; brotli = derive2 { name="brotli"; version="1.2"; sha256="07rgdgxh9bvn0qavpclxmkglwyl6ndqasxcs6j12if698dkn976b"; depends=[]; }; brr = derive2 { name="brr"; version="1.0.0"; sha256="050ivnqcaxiyypd1sxfpy6ianhzzmvs6c77ga40g3440cvfigkgw"; depends=[gsl hypergeo pander stringr SuppDists TeachingDemos]; }; brranching = derive2 { name="brranching"; version="0.5.0"; sha256="07dxynk8pbpbsqwaxg9vhpjv4wx8mb1lqxy1nkczjayn1yrpjfm5"; depends=[ape conditionz crul curl phylocomr phytools taxize]; }; @@ -5726,21 +5780,21 @@ in with self; { brunnermunzel = derive2 { name="brunnermunzel"; version="1.4.1"; sha256="1lba5cpiray65zg1pv3xv6yl1xg78rqlwxkcmhgizlh1rhpd430p"; depends=[]; }; bs4Dash = derive2 { name="bs4Dash"; version="0.5.0"; sha256="1y75i6bsdy1bsbzwjblsnimw1zzk0zl3qnzqfq9zcnf6q2ghi3r2"; depends=[htmltools shiny]; }; bsam = derive2 { name="bsam"; version="1.1.2"; sha256="1m2lpqm2i4i35hzr1iylrb8skx8rsys3w542xjyqw030bs7b1rdk"; depends=[coda dplyr ggplot2 gridExtra lubridate msm mvtnorm rjags rworldxtra sp tibble]; }; - bsamGP = derive2 { name="bsamGP"; version="1.2.2"; sha256="1r7jmrj91na9718digggsjqfqc2l0s0md68vr3s9xcb77c4bbhyi"; depends=[ggplot2 gridExtra MASS]; }; + bsamGP = derive2 { name="bsamGP"; version="1.2.3"; sha256="1wqs2y9f7fgdvshhzwpjp811h4xhdd1lplpadnpffa2lmyv7vh5s"; depends=[ggplot2 gridExtra MASS]; }; bsearchtools = derive2 { name="bsearchtools"; version="0.0.61"; sha256="11fqz8kdhqpc3jq34vgv3frzawgsl5y0s83rb2p54yb5yhd3p68w"; depends=[Rcpp]; }; bshazard = derive2 { name="bshazard"; version="1.1"; sha256="1kidypyqlilf794mksjvhja8bmnd9hdhz91ywy0mcddgc6wbar4h"; depends=[Epi survival]; }; bspec = derive2 { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; }; bsplinePsd = derive2 { name="bsplinePsd"; version="0.6.0"; sha256="0f785l02hiq3f7anxqhm09f7lrqgkkqhly7f1x78cxm22hvrqyhg"; depends=[Rcpp]; }; bsplus = derive2 { name="bsplus"; version="0.1.1"; sha256="0s3407z48b7sdbkjkqcjk2j1wvs0z7chvdjzphil83l0vp3j5x0s"; depends=[glue htmltools lubridate magrittr purrr rmarkdown stringr]; }; bspmma = derive2 { name="bspmma"; version="0.1-2"; sha256="1a3p1h7bks5yrxv791wfa680v4a6q10p59iz6wvfifhf3ndlaw49"; depends=[]; }; - bssm = derive2 { name="bssm"; version="0.1.8-1"; sha256="1754n6cgfnq4q6b0yqbgrkgwnp2ia1pv5xnppqaij2m9gbycrznw"; depends=[BH coda diagis ggplot2 ramcmc Rcpp RcppArmadillo sitmo]; }; - bssn = derive2 { name="bssn"; version="0.7"; sha256="1g2xhb7bqapwd5zbc4bl4h1fskd7k6gd0rz74hnydiiwxrwiihf6"; depends=[sn]; }; + bssm = derive2 { name="bssm"; version="0.1.11"; sha256="05hdpq0zkwg66hj2hv79mp6df85lxm7hw4z1i7crqz7yx6s37dld"; depends=[BH coda diagis ggplot2 ramcmc Rcpp RcppArmadillo sitmo]; }; + bssn = derive2 { name="bssn"; version="1.0"; sha256="1brxbvcvqy8n9xpvp5kz47x5ps8hdqgnh6s49051qaylp95qm432"; depends=[ClusterR mvtnorm sn ssmn]; }; bst = derive2 { name="bst"; version="0.3-17"; sha256="0x7hv0gx5kn8dwgbkabz7d4dh2l75zdawgdj5zxan13k7b9n3l8y"; depends=[doParallel foreach gbm rpart]; }; bsts = derive2 { name="bsts"; version="0.9.2"; sha256="1v32wsjcfcq0zwklrp0c83xw4h49v49nmjs973mdzh4q05wzlpmp"; depends=[Boom BoomSpikeSlab xts zoo]; }; btb = derive2 { name="btb"; version="0.1.30"; sha256="1f94zzpg3q6ldd436cv1wqpfbpw5f706073wk38a4dkg57dwrbgi"; depends=[BH Rcpp RcppArmadillo RcppParallel sf sp]; }; - btergm = derive2 { name="btergm"; version="1.9.4"; sha256="17bjd1d2yj1l98mbflklznxd3q7zi5nzj943nxzva7ij3hdsn6l4"; depends=[boot coda ergm ggplot2 igraph Matrix network ROCR RSiena sna speedglm statnet_common xergm_common]; }; + btergm = derive2 { name="btergm"; version="1.9.7"; sha256="1p7s5432azz3rdsa7wb2nnlpajq1msard6x3lg95bdgjldnl3nfc"; depends=[boot coda ergm ggplot2 igraph Matrix network ROCR RSiena sna speedglm statnet_common xergm_common]; }; bucky = derive2 { name="bucky"; version="1.0.6"; sha256="01rlx0m6h66y1p9k5llg17qpajjhk2vmhbpwc4i5igf5x5g4clgc"; depends=[lmtest sandwich]; }; - buildmer = derive2 { name="buildmer"; version="1.4"; sha256="1g18kx525mb9hi8f4msrzqwxsgfxhzpc6yh2q4wn159ca3j0wgs7"; depends=[lme4 mgcv nlme plyr]; }; + buildmer = derive2 { name="buildmer"; version="1.5"; sha256="0m9dz2fb2cwc5l7wnb2dsnqyfkh1ppnlfz9r38ihanav7awsrb17"; depends=[lme4 mgcv nlme plyr]; }; bujar = derive2 { name="bujar"; version="0.2-7"; sha256="1r14mh5j2w87mc6b192hi4qg97si2xv6v826j6c1awh7w3vqbbr9"; depends=[bst earth elasticnet gbm mboost mda modeltools mpath rms survival]; }; bulletcp = derive2 { name="bulletcp"; version="1.0.0"; sha256="1k7lw8gflih47ncz8hgsj0sxbajnkhz1k7yb7rwbdnzcki3n3jln"; depends=[assertthat dplyr mvtnorm Rdpack]; }; bulletr = derive2 { name="bulletr"; version="0.1"; sha256="181rnrp62almf08gr41qnrnq8qnbqraqdvj4zixdh8fachsq2imp"; depends=[dplyr ggplot2 plotly plyr reshape2 robustbase smoother xml2 zoo]; }; @@ -5759,55 +5813,55 @@ in with self; { bvenn = derive2 { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; }; bvls = derive2 { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; }; bwd = derive2 { name="bwd"; version="0.1.0"; sha256="1ryd5cqbpns9dsis2a9vjg6fcg23284c3dr3j3l18krdshdksfr0"; depends=[]; }; - bwimage = derive2 { name="bwimage"; version="1.2"; sha256="1wm17spxfrgf8kfc6fadri54sdk0b9813s9y4rp2xiwmy5sp6aj2"; depends=[jpeg png]; }; - bwsTools = derive2 { name="bwsTools"; version="1.0.1"; sha256="15pa0nxk3wksi11p1bs48cyaqxk0lxqvnwiwznw8f7bjkacnn1hl"; depends=[crossdes dplyr igraph magrittr rlang tidyr]; }; - bysykkel = derive2 { name="bysykkel"; version="0.2.3"; sha256="1cbfmmmw7a37fwgwgfvc8yqxl4dh5n30qcnva9wsm903wccmb2cr"; depends=[glue httr jsonlite lubridate magrittr tibble]; }; + bwimage = derive2 { name="bwimage"; version="1.3"; sha256="1r5l7z90q2qs92dzp78jj4gf1kg1gc85g6y5rn2z8vxjbvbc5vma"; depends=[jpeg png]; }; + bwsTools = derive2 { name="bwsTools"; version="1.1.0"; sha256="06gvw966p2qgkw1c2rdr5hiha47aclb398kjf8sgh5dcka9sv256"; depends=[crossdes dplyr ggplot2 igraph magrittr rlang tidyr]; }; + bysykkel = derive2 { name="bysykkel"; version="0.3.1"; sha256="1lvqbax7dvli4265856f9667ckp9g5l4radz2cp0yk0slsjgsdpg"; depends=[glue httr jsonlite lubridate tibble]; }; bytescircle = derive2 { name="bytescircle"; version="1.1"; sha256="0c83d37kijcvr00pc4qqdci14cpbg6988izyjfjk1yliavyc6mwf"; depends=[]; }; bzinb = derive2 { name="bzinb"; version="1.0.4"; sha256="1424lwsm2ra124h0ahbl42szbx500fqkf9ccw9k1688iwxnfg7f2"; depends=[BH Rcpp]; }; c060 = derive2 { name="c060"; version="0.2-5"; sha256="1862lic0vvidbd7s63j65iz4rf70d5337l80vvrbgv8d7fhnxz0y"; depends=[glmnet lattice mlegp penalizedSVM peperr survival tgp]; }; c14bazAAR = derive2 { name="c14bazAAR"; version="1.2.0"; sha256="0bgf7fa428zp55qnkzhgghrj4hyv2lkhzg8b6msbq3bz2bah7jlz"; depends=[crayon data_table dplyr httr magrittr pbapply rlang tibble tidyr]; }; c212 = derive2 { name="c212"; version="0.95"; sha256="1cgmldy2ysz3934fxh0mmzrb2vw33j3pmws53ng7yxg79mb9ixja"; depends=[coda]; }; c2c = derive2 { name="c2c"; version="0.1.0"; sha256="149np512wjnlr9glmqxpiamf6c31v0bh6ym95jpdhk0iw3ic9kvh"; depends=[]; }; - c3 = derive2 { name="c3"; version="0.2.0"; sha256="1af4lrgck1bff8jjp9vwyw2rpq54d1ng13rpcqlf58asdja29s9h"; depends=[data_table dplyr htmlwidgets jsonlite lazyeval viridis]; }; + c3 = derive2 { name="c3"; version="0.3.0"; sha256="1c2k7ml153bby749qi3a6nckhwwr71mvvps9dkbzkxkwnmlwpz1h"; depends=[data_table dplyr htmlwidgets jsonlite lazyeval viridis]; }; c3net = derive2 { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; }; cAIC4 = derive2 { name="cAIC4"; version="0.9"; sha256="0imy4kq09an9azqi3aahw3lsmby8km2am0w7fb314xq6ghzf9xmp"; depends=[lme4 Matrix mgcv mvtnorm nlme RLRsim]; }; - cIRT = derive2 { name="cIRT"; version="1.3.0"; sha256="0jbjkmzw3z935pq12k5kmy3vdpqlpm70siv8f0bnlw42sai1qcw1"; depends=[Rcpp RcppArmadillo]; }; + cIRT = derive2 { name="cIRT"; version="1.3.1"; sha256="1x7cbawzzpzripzyg4yavc9s6kx06ff4q151kbvylr9wsf78s6qg"; depends=[Rcpp RcppArmadillo]; }; cNORM = derive2 { name="cNORM"; version="1.2.2"; sha256="1lid4j6i65xmmakab0bbs7vyhkrvax3l5kv7r66x665gm8y00h0b"; depends=[lattice latticeExtra leaps]; }; cOde = derive2 { name="cOde"; version="1.0.0"; sha256="12222wlsk9l6m9y477mjl8x279xhs8c1l1wsq92khwycm1j06jfy"; depends=[]; }; cPCG = derive2 { name="cPCG"; version="1.0"; sha256="1pfbsv2rcjsryn6nr56a7i4yb7k0m3gdfn4q9l1kpzhmv9lic7m1"; depends=[Rcpp RcppArmadillo]; }; - cRegulome = derive2 { name="cRegulome"; version="0.3.1"; sha256="0j3rv7vakv27r1n1yxmd50nlnyc4y329w0dmrw56dwkdkk4zzbsg"; depends=[DBI ggplot2 ggridges httr igraph R_utils RSQLite UpSetR VennDiagram]; }; - cSEM = derive2 { name="cSEM"; version="0.1.0"; sha256="1vqqlajyvcwk0nd546kq03x14vi7iq9bs2mq2zlp571v7g5gmfi1"; depends=[abind alabama cli crayon expm future future_apply lavaan magrittr MASS Matrix matrixcalc matrixStats polycor psych purrr Rdpack symmoments]; }; + cSEM = derive2 { name="cSEM"; version="0.2.0"; sha256="0ynqclr78vi97bd4wds0zws2iydziwzqsfjhpcpi87wca0chm4z8"; depends=[abind alabama cli crayon expm future future_apply lavaan magrittr MASS Matrix matrixcalc matrixStats polycor psych purrr Rdpack symmoments]; }; ca = derive2 { name="ca"; version="0.71.1"; sha256="095lk7p2b9835hc3a03c4019wg0baf0dhz6c2vqpaq1m9k4jy304"; depends=[]; }; caMST = derive2 { name="caMST"; version="0.1.3"; sha256="1hhxyw7sbzm2v09xaxvq347gl8p5wkjxx43187mqbw0nzknlg5bg"; depends=[catR diagram mstR]; }; caRamel = derive2 { name="caRamel"; version="1.1"; sha256="06nppjx66xwdqchna5j6xlhfzs5g36nv8srwivbnfixys29awabb"; depends=[geometry]; }; caRpools = derive2 { name="caRpools"; version="0.83"; sha256="10m7fw1zfr9i6v2qg235diwf3fmfr88incxnqpvnhmqcn082mxrp"; depends=[biomaRt DESeq2 rmarkdown scatterplot3d seqinr sm VennDiagram xlsx]; }; caTools = derive2 { name="caTools"; version="1.18.0"; sha256="0y1kgyiy322yhb0phzwvf2zgjz9awp13lhzhk9v1ddg88656jhq3"; depends=[bitops]; }; - cabinets = derive2 { name="cabinets"; version="0.3.1"; sha256="1f6pkh2vpnqdqhbd6ipy5553xh7bppc7y7xbz9lw27wn5fppilzl"; depends=[crayon fs glue here purrr R6 rjson rstudioapi stringr usethis withr]; }; + cabinets = derive2 { name="cabinets"; version="0.4.0"; sha256="1crxr1pxs4if86g405x47709zdyv8fqdmlm2wpilcl2bdcpia0y4"; depends=[crayon fs git2r glue here purrr R6 rjson rstudioapi stringr usethis withr]; }; cabootcrs = derive2 { name="cabootcrs"; version="2.0"; sha256="1a473ca90306brhfrzf5hw6d6v252kd2vfwkvgblwy26jmrrr2km"; depends=[lpSolve]; }; cacIRT = derive2 { name="cacIRT"; version="1.4"; sha256="145j6isqa8yj2nvlqkxagd076zs10ng3n44khi5p4jj77fjc8gh6"; depends=[]; }; caesar = derive2 { name="caesar"; version="1.0.0"; sha256="0z1bb5cmjr97l3h9svy4r4bj58jkmq6kdkip577cvy2xf5q9n410"; depends=[binhf]; }; caffsim = derive2 { name="caffsim"; version="0.2.2"; sha256="00bkgmmqrydpji2pvhcchgl2p8w5ksby4g80i3h76q0bm2325w9h"; depends=[dplyr ggplot2 markdown mgcv shiny tibble tidyr]; }; cairoDevice = derive2 { name="cairoDevice"; version="2.28"; sha256="14885gpmhdzmxbz3q59s5sd3kjkyi5yf9lpnjwmvc482n8ix4lpq"; depends=[]; }; calACS = derive2 { name="calACS"; version="2.2.2"; sha256="0a53k2rzyjksb0ypr5zrask4a6mgiyrqx0l2z3lm218y8pk2jf1w"; depends=[]; }; - calcWOI = derive2 { name="calcWOI"; version="1.0.2"; sha256="09g96inaayp0brbxw75l7k1cqn50f7qw0glb2g04657zmlk16i52"; depends=[LS2W wavethresh]; }; - calculus = derive2 { name="calculus"; version="0.2.0"; sha256="0ks92pis7471p2qq66lysb3hw99qbm068v5gf82mknk56lfbymdc"; depends=[Rcpp]; }; + calcWOI = derive2 { name="calcWOI"; version="1.0.3"; sha256="1bxsn9b99hnb365qvlzr0ymwavamlyhs5sm9s2fdjh4zv3f32n3l"; depends=[dualtrees LS2W wavethresh]; }; + calculus = derive2 { name="calculus"; version="0.2.1"; sha256="0hs7hzjl6xjza20v9zx9a1piywxa6w3h2rskr52d1dcbc0vwhinp"; depends=[Rcpp]; }; calendar = derive2 { name="calendar"; version="0.0.1"; sha256="18ha6vpx2bpk8p08hajiq2d201fbqhzcycp8ks6wrr06fy04z689"; depends=[lubridate tibble]; }; calibrar = derive2 { name="calibrar"; version="0.2.0"; sha256="1544bc5rhhc6d1mky7ngza00wwh63q07dkbzlwfgyavly8m9cplb"; depends=[cmaes foreach optimx]; }; calibrate = derive2 { name="calibrate"; version="1.7.5"; sha256="1s423nr176l2sc66wp7hzgqkv7c2bq8d2bjrrvrrm5qa9y3zdx1k"; depends=[MASS]; }; calibrateBinary = derive2 { name="calibrateBinary"; version="0.1"; sha256="1k6sl4bg05piyczpk6wsva914gcmy8viyz4423gx9i6ddflb7xdb"; depends=[gelnet GPfit kernlab randtoolbox]; }; calibrator = derive2 { name="calibrator"; version="1.2-8"; sha256="1m9g1pmnr6d9jkg5ab0l0cbqfj7kmx7sdmcdqdhn9ifyhhn7812y"; depends=[cubature emulator mvtnorm]; }; - callr = derive2 { name="callr"; version="3.4.1"; sha256="0nyba0knzd44zz2xmr7zd9qh3rny0q8msysxf49843d9rlyv6y70"; depends=[processx R6]; }; + callr = derive2 { name="callr"; version="3.4.3"; sha256="1dc20gdawy9mhnc452qlshv2p4krs6c2gymvpv365mn141zjgdq1"; depends=[processx R6]; }; calmate = derive2 { name="calmate"; version="0.12.1"; sha256="07sjbq7bcrhal52pdzsb5pfmk6a8a44wg8xn79sv4y5v74c5xaqz"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; }; calpassapi = derive2 { name="calpassapi"; version="0.0.2"; sha256="0i81ffdfw3m15cfbag3l9s245dyhapqhy7adb3228vam3qp3n59b"; depends=[digest dplyr httr jsonlite stringr]; }; camsRad = derive2 { name="camsRad"; version="0.3.0"; sha256="06gar6qan1ka01ngjvbpcv649yvfga697mplwn1x6qnfr4ngb7cs"; depends=[httr xml2]; }; - camtrapR = derive2 { name="camtrapR"; version="1.2.3"; sha256="0sjniyi36ri0yz2bbhc0f8kwghz3wqcp1hi7sf2fx0y6hg33z6xn"; depends=[data_table overlap secr sp]; }; - cancensus = derive2 { name="cancensus"; version="0.2.0"; sha256="1vggqpv7l472dc889fh2ldsijgwpv9s6ai8jhqhz2q2xdg099v7c"; depends=[digest dplyr httr jsonlite rlang]; }; + camtrapR = derive2 { name="camtrapR"; version="2.0.2"; sha256="1bmxcwidzn993qsbz8cq9b9z449yhqd01bjx8imxykl0qy1xbbcq"; depends=[data_table overlap secr sp]; }; + cancensus = derive2 { name="cancensus"; version="0.2.1"; sha256="09ck076csz9srz660c1y2lmmvdjk2k14w1bmwizfl5vs3sb1k010"; depends=[digest dplyr httr jsonlite rlang]; }; cancerGI = derive2 { name="cancerGI"; version="1.0.0"; sha256="1chkcyf9m98gbn6b3vmb1baw7kii4g5vxvg2xfi7i6wwdn8sqr65"; depends=[igraph qvalue reshape2 survival systemfit]; }; cancerTiming = derive2 { name="cancerTiming"; version="3.1.8"; sha256="1sfi8q2f5ag7iak0sf9pmqncb89w3gnxdiwjwpivkwhr28ais4mq"; depends=[gplots LearnBayes]; }; - candisc = derive2 { name="candisc"; version="0.8-0"; sha256="0hq5bwvq791rhff2c29xdjbbkcyydii1lbsy05c1fapyn88ir0mi"; depends=[car heplots]; }; + candisc = derive2 { name="candisc"; version="0.8-3"; sha256="0bshi686sad31052glai1wmzxshvafp1vkar7zirds3x737gb0fp"; depends=[car heplots]; }; canprot = derive2 { name="canprot"; version="0.1.2"; sha256="0lc31vw49sc2zsrn52aqqljcc4n79j4i4845sr201ga67w07vrrb"; depends=[CHNOSZ xtable]; }; - cansim = derive2 { name="cansim"; version="0.3.3"; sha256="17rhhqzs49zhgkhcdi4xq7cgj4hb6900bxvw43nbwqr3gcif1wpq"; depends=[dplyr httr jsonlite purrr readr rlang rvest stringr tibble xml2]; }; - canvasXpress = derive2 { name="canvasXpress"; version="1.26.5"; sha256="0bgba7sz1xd3r8l130m40p0wyiq5mvsww6n5lji3qkiqihzdd0ra"; depends=[htmlwidgets httr]; }; + cansim = derive2 { name="cansim"; version="0.3.5"; sha256="0lqkyq2n8v2y172ihyb9vh3mimrkg2yx2c42cxdaz4p7gqiq7z8r"; depends=[dplyr httr jsonlite purrr readr rlang rvest stringr tibble xml2]; }; + canvasXpress = derive2 { name="canvasXpress"; version="1.27.6-1"; sha256="0vk2iddcyc81qgvlw3k31sh2hsjbxsrcb77mxay3s32wkqr7knwa"; depends=[htmlwidgets httr]; }; + canvasXpress_data = derive2 { name="canvasXpress.data"; version="1.27.6"; sha256="0kh5g3incl5lv4pb8fd9nzvlvfvyfs3bms78hlf71z8kkag9hzn1"; depends=[]; }; cap = derive2 { name="cap"; version="1.0"; sha256="1pv8hskxjbp589dn7rx80yaa1ld76x1w37bss2fyrys1p3qr78aa"; depends=[MASS multigroup]; }; caper = derive2 { name="caper"; version="1.0.1"; sha256="0md0sngj7wsv2d4d7fmyyz9qqismk3ps9l3qk1blqz1yi19pq124"; depends=[ape MASS mvtnorm]; }; capitalR = derive2 { name="capitalR"; version="1.3.0"; sha256="08lvncia9mdrnw84zydf1k7336xawiirh2swziqfwx3z1n172n52"; depends=[]; }; @@ -5817,57 +5871,62 @@ in with self; { captr = derive2 { name="captr"; version="0.3.0"; sha256="13j2nq9hm37g4h5fjdpz7kix0sqajdd7zssjfgil06ixfmnsijkx"; depends=[curl jsonlite]; }; capushe = derive2 { name="capushe"; version="1.1.1"; sha256="1aa76ir1kp67hiz7dr60azyc71yzslshyc640fjh0fpw0sp5kwbc"; depends=[MASS]; }; capwire = derive2 { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; }; - car = derive2 { name="car"; version="3.0-6"; sha256="0yv5mwaa0ymrbis9590mx0zcj3w6j4drhs6ab13zhx4zc3x1b7b6"; depends=[abind carData lme4 maptools MASS mgcv nlme nnet pbkrtest quantreg rio]; }; + car = derive2 { name="car"; version="3.0-7"; sha256="11sfk1l41j27mrfy16g7b02c570n3gy9icvpcrfjh1biykqa565d"; depends=[abind carData lme4 maptools MASS mgcv nlme nnet pbkrtest quantreg rio]; }; carData = derive2 { name="carData"; version="3.0-3"; sha256="0cg2yxzn0pdjqykr60my1fzpfkqac21fll5hv3m9w5c9sayq8swq"; depends=[]; }; carSurv = derive2 { name="carSurv"; version="1.0.0"; sha256="0wv7lp10i4sdfqyizg77ghblp3pcp7wzhs946sm0wl6w00krav9j"; depends=[corpcor fdrtool mboost Rcpp survival]; }; caracas = derive2 { name="caracas"; version="0.0.1"; sha256="1pn6qf6m32psylnw1rnp2pdkwpsa5jz0lhfwj5c0ll23a8ln7627"; depends=[reticulate]; }; - carat = derive2 { name="carat"; version="0.1.0"; sha256="09vqcljl74x6qbk88mf9xnp1hwzg1mwvmxi43gmw8qcg13zcfiai"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo stringr]; }; - carbonate = derive2 { name="carbonate"; version="0.1.2"; sha256="1v4ssdk7j60sm4iahywb4x710ijvzj0yczcmr75zvq9rjfki1b54"; depends=[clipr httr magick R6 RSelenium rtweet wdman yaml]; }; + carat = derive2 { name="carat"; version="0.1.1"; sha256="1ql4lr3x6kiwq1xj671bm1y9mc8iw41j5y5796dfnw7a5251sy67"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo stringr]; }; + carbonate = derive2 { name="carbonate"; version="0.1.3"; sha256="0y1wjrlh0rbfl1wz9028b637gs20giifp9ykg1yir2ak7fpwbq85"; depends=[clipr details httr magick R6 RSelenium rtweet wdman yaml]; }; carcass = derive2 { name="carcass"; version="1.6"; sha256="0nhp35nxjqqmy15rf9vc0qyymy7d0v8mc84570b9nc62g5xac8xy"; depends=[arm expm lme4 MASS survival]; }; cardidates = derive2 { name="cardidates"; version="0.4.8"; sha256="1mfd5sgzswhs9rln2bgxx8c54z69xp8l5dfmx7jfh8jl43qkzpjf"; depends=[boot lattice pastecs]; }; cardioModel = derive2 { name="cardioModel"; version="1.4"; sha256="1a2nvn4a4zc89pb01m20pxqgbj0ypzzvx9w2vfzwly1kzkhvc9hr"; depends=[lubridate nlme]; }; care = derive2 { name="care"; version="1.1.10"; sha256="00h36by40v60mqzbf615a99sdfz0i42i57wybxrcm7y1y2la0da8"; depends=[corpcor]; }; careless = derive2 { name="careless"; version="1.1.3"; sha256="07yq6sfp110pkd3khfn8ajdqz2r4ipcs90mpaiynh12xl0n67x7k"; depends=[psych]; }; - caret = derive2 { name="caret"; version="6.0-85"; sha256="0jxbf2zcvbb5s2pnjzg182awjvylc57q7z5plx6gs6gm62zxjafs"; depends=[foreach ggplot2 lattice ModelMetrics nlme plyr pROC recipes reshape2 withr]; }; + caret = derive2 { name="caret"; version="6.0-86"; sha256="0dyflixdw98lvk2x3w136sw24ij0fwx5c7l709dmqr5z7xy1qjns"; depends=[foreach ggplot2 lattice ModelMetrics nlme plyr pROC recipes reshape2 withr]; }; caretEnsemble = derive2 { name="caretEnsemble"; version="2.0.1"; sha256="127gqd23xjis62irqviihzk80zydrdplwh65zcmd7ng29ih5wnby"; depends=[caret data_table digest ggplot2 gridExtra lattice pbapply plyr]; }; + carfima = derive2 { name="carfima"; version="2.0.2"; sha256="1n68jqn42m54xn7jq8qywrpnvggrcsgvgnlqg6nw0pgiplbkynih"; depends=[DEoptim invgamma mvtnorm pracma truncnorm]; }; caribou = derive2 { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; }; caroline = derive2 { name="caroline"; version="0.7.6"; sha256="1afxxbrd7w628l4pxdmvwbs7mbgxlhnfq3nxk2s93w47gn7r9fp7"; depends=[]; }; carpenter = derive2 { name="carpenter"; version="0.2.2"; sha256="13ahhdc6f5ngrhb7slqbxzfs3wswixh0argyr6l46cv4fdkaa80s"; depends=[dplyr lazyeval magrittr pander tibble tidyr]; }; carrier = derive2 { name="carrier"; version="0.1.0"; sha256="0bqnwnnjqjk9q0lxq6kkz9s75ss10lfyyywyyi24m8wppxpw1vqc"; depends=[pryr rlang]; }; cartograflow = derive2 { name="cartograflow"; version="1.0.0"; sha256="1sczhvkkrdhcn2phjpsvb86ik0bgyhbgcza7dz6d4qmpl8195bs9"; depends=[dplyr g_data ggplot2 maptools plotly reshape2 rgdal rgeos rlang sp]; }; cartogram = derive2 { name="cartogram"; version="0.2.0"; sha256="1b6jr6sf821xa2cbm09zmnvvai6azh7p9zhz78a4yqpiwdw122sc"; depends=[packcircles sf]; }; - cartography = derive2 { name="cartography"; version="2.2.1"; sha256="0fbgaaq354j6hg7m9wgpw4z1b26njl4liysb2vzgi3py5n9xg3dp"; depends=[classInt raster Rcpp rgeos rosm sf sp]; }; + cartography = derive2 { name="cartography"; version="2.4.1"; sha256="0pb914zbqvii95mfsqkxs2y22fj620ry2hdqbkbvh5pdq5ls549v"; depends=[classInt curl png raster Rcpp rgeos sf slippymath sp]; }; cartools = derive2 { name="cartools"; version="0.1.0"; sha256="0gc5502373f0c2m2rh6awvyfqrg1wx1f341dm2byk9znba887lgs"; depends=[animation devtools dplyr gapminder ggplot2 knitr rlist rmarkdown roxygen2 sde shiny tidyverse usethis]; }; carx = derive2 { name="carx"; version="0.7.1"; sha256="1qyqsj6pfzzqyaj6076zvgcimhl4cll6sxfb6aigm02rwfkq5gvh"; depends=[matrixStats mvtnorm nlme tmvtnorm xts zoo]; }; caschrono = derive2 { name="caschrono"; version="2.1"; sha256="0p103r6v37c4li1j9x5mdflhx24zil8nhgpdvw5ijrvyixds0nn2"; depends=[Hmisc zoo]; }; cascsim = derive2 { name="cascsim"; version="0.4"; sha256="0n6frnbby1pjpx1z9lzxflmja2mg0dy99c5f7biakpaqi82x5xjb"; depends=[copula fitdistrplus moments R2HTML scatterplot3d]; }; caseMatch = derive2 { name="caseMatch"; version="1.0.8"; sha256="0bp2g0zzcspa6riinsa3bp1qwiip6z058hn2y5mw0w9xah8a685a"; depends=[]; }; casebase = derive2 { name="casebase"; version="0.1.0"; sha256="0216qzyxv44cl9f806lal9lx4n0zzr9csx8ggyjva04h5iiqrq6w"; depends=[data_table ggplot2 survival VGAM]; }; + casen = derive2 { name="casen"; version="0.1.4"; sha256="19f52vqrzqd8mmnaf39jmsm5mhydv74gpnb4rxr3n9w07ppb77c9"; depends=[dplyr glue haven janitor labelled magrittr purrr rlang srvyr survey tibble tidyr]; }; casino = derive2 { name="casino"; version="0.1.0"; sha256="07fphn46718gr1zm0xr43mwv7yk697xrc40lxxin315cf3gm0cka"; depends=[crayon dplyr ggplot2 magrittr purrr R6 tibble tidyr]; }; cassandRa = derive2 { name="cassandRa"; version="0.1.0"; sha256="0rwqzxbflxn1iyggm3mq6pkbl61mhk4vdwqwzlwrhrvvr2ib236r"; depends=[bipartite boot dplyr ggplot2 magrittr purrr reshape2 tidyr vegan]; }; - castor = derive2 { name="castor"; version="1.5.5"; sha256="1bsdyi905zafk8av0svw6ql0pg4ns1q7w810xx448k0hpq4v468l"; depends=[naturalsort nloptr Rcpp]; }; + castor = derive2 { name="castor"; version="1.5.7"; sha256="1pkwjpl7mcpn4b6cbpcznjhkblx8g5m1gfyyqjm95zkmjbnqrjj0"; depends=[naturalsort nloptr Rcpp]; }; cat = derive2 { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; }; - cat_dt = derive2 { name="cat.dt"; version="0.1.0"; sha256="1rxq1kaw03c7m2jz4n6v5x4l9fiaqahdrvh9624zapf9mfhky0lm"; depends=[Matrix Rglpk]; }; + cat_dt = derive2 { name="cat.dt"; version="0.2.0"; sha256="1g9058gqkk2ij29aicvvqx9yx7iwh4a58akp6qznppfln4zw9wcb"; depends=[ggplot2 Matrix Rglpk]; }; catIrt = derive2 { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; }; catR = derive2 { name="catR"; version="3.16"; sha256="1w39dxfzqk065v64qzmfamx8p1njsv13a461s6clagbqmhysmzbx"; depends=[]; }; catSurv = derive2 { name="catSurv"; version="1.2.0"; sha256="0z91643grmzgd1qn867c7nk3v38vyy6h7q0k082r6hgnfbl6vx6c"; depends=[BH jsonlite ltm plyr Rcpp RcppArmadillo RcppGSL RcppParallel]; }; catch = derive2 { name="catch"; version="1.0"; sha256="16gdjrmlsnpyc38fihggj6c7wpgpmf4phcwrimnncdhwlk038yn8"; depends=[MASS Matrix tensr]; }; catchr = derive2 { name="catchr"; version="0.2.2"; sha256="02swyg21wd6793nk590lis5bh36lb2mjvv1k05szf22k08vsqv77"; depends=[purrr rlang]; }; catcont = derive2 { name="catcont"; version="0.5.0"; sha256="0ix6ipm3nn9aq5vxirjga2kwwfnxn4v8ggfjlg5v9027v2r8rb96"; depends=[dplyr]; }; - catdap = derive2 { name="catdap"; version="1.3.4"; sha256="0i877l61f6c75pczi235rzci67w29zv1d7z5zn5p5ymndclvlpl2"; depends=[]; }; - catdata = derive2 { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; }; + catdap = derive2 { name="catdap"; version="1.3.5"; sha256="0fyhl69z2lznymvpzxra9qvcg85ggzkfjy68c6mzdmf1ja44d2k5"; depends=[]; }; + catdata = derive2 { name="catdata"; version="1.2.2"; sha256="14kx7yi0cv6dyh9wjasb8gn6cp1bhglgwql7dc2a7lqvdcp0d5vj"; depends=[MASS]; }; cate = derive2 { name="cate"; version="1.1"; sha256="1mw4h03gbrrf69jhw3g8a761gxrz2i7aiqdb0vc1dv75pkjspwmj"; depends=[corpcor esaBcv leapp MASS Matrix ruv sva]; }; + categoryEncodings = derive2 { name="categoryEncodings"; version="1.4.3"; sha256="0ns8ml2hm41650bi8yag6w3k9nb2ky43370444cgy3i7ajpzw87w"; depends=[data_table glmnet sparsepca]; }; catenary = derive2 { name="catenary"; version="1.1.2"; sha256="1n64kq3lkaf00a2mghs67hnxvi4dp6g12pwifyx0bd418wkw9wf3"; depends=[boot broom dplyr ggplot2 tidyverse]; }; catfun = derive2 { name="catfun"; version="0.1.4"; sha256="1482rll333fvy4h58f15flfs7qrck3vk9bzpdn3hayhnmc7svmma"; depends=[broom cli DescTools epitools Hmisc magrittr rlang]; }; + cati = derive2 { name="cati"; version="0.99.3"; sha256="0hq6hdzriab380pc0mx6g8xqflqj5mznr4b7fqw2f51kx8ang8hg"; depends=[ade4 ape e1071 FD geometry hypervolume nlme rasterVis vegan]; }; catlearn = derive2 { name="catlearn"; version="0.7.1"; sha256="194gqx94wkl4zr01ms5g684ma328q35cfqpwa63jv98scrybrbwj"; depends=[doParallel dplyr foreach Rcpp tidyr]; }; catmap = derive2 { name="catmap"; version="1.6.4"; sha256="18449qh10jxfi8p49gmbnib5y013nfdgdblbs4n0mfs0nnzb10sx"; depends=[forestplot metafor]; }; - catnet = derive2 { name="catnet"; version="1.15.5"; sha256="1mwhchja3k9mrhclg6janxsjjs4x20ppg3gx6jymfai2bdv23azh"; depends=[]; }; + catnet = derive2 { name="catnet"; version="1.15.7"; sha256="015qh9k0jj5plp777j3kl20601qiwadkaqrdb0483h3gwqwy828g"; depends=[]; }; catseyes = derive2 { name="catseyes"; version="0.2.3"; sha256="1p0jnjjfl1jqqqk8q6yfsxrh30idfbss7v6lrrm25x8zrhxah0ww"; depends=[]; }; catspec = derive2 { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; }; - cattonum = derive2 { name="cattonum"; version="0.0.3"; sha256="03xshvf1yna9i0gbxx1ackq375890lvbkw6pp5zjs0fyidg0fmww"; depends=[dplyr purrr Rcpp rlang tibble tidyselect]; }; + cattonum = derive2 { name="cattonum"; version="0.0.4"; sha256="0w2b1v871vhmsglh2islmr1hjvxinnzaygl1rqpplr21274glj1m"; depends=[dplyr purrr Rcpp rlang tibble tidyselect]; }; causalMGM = derive2 { name="causalMGM"; version="0.1.1"; sha256="13qx71rfc6m7mvlpwma7ks09f3mlxknxw3jlv3b4iq5pjs8f1v5r"; depends=[rJava]; }; causaldrf = derive2 { name="causaldrf"; version="0.3"; sha256="16gqx8b8alwm8a4lm69qamnqr3bg2qbz0d6q4lyqyrwsk12grid6"; depends=[mgcv survey]; }; causaleffect = derive2 { name="causaleffect"; version="1.3.10"; sha256="0z7vdhm9g95s9nkyx4jdzqrap24nb63n8mr23b9gqm6s1m47sc0z"; depends=[ggm igraph XML]; }; + causaloptim = derive2 { name="causaloptim"; version="0.6.5"; sha256="0197mxaag1hmj20ljcybrwvyjjbhxi0xyybz3hiaxwcfhn5zdxld"; depends=[igraph Rcpp shiny]; }; causalsens = derive2 { name="causalsens"; version="0.1.2"; sha256="1xy8nybflbw6hymc15mmz27ic6hcq89wryb8q6d4zi216lwv2nww"; depends=[]; }; causalweight = derive2 { name="causalweight"; version="0.1.3"; sha256="0bg3xxnbixz2p5qrkziwf3jh6rpcp6c1fngv0vpq1y957j3fw5f2"; depends=[hdm LARF mvtnorm np]; }; cba = derive2 { name="cba"; version="0.2-21"; sha256="0j2hbp0xlfp28gqgnkcvmb4yp1kc5m2bp5x7pr4m1pz2b1s7h7m6"; depends=[proxy]; }; @@ -5878,7 +5937,7 @@ in with self; { cblasr = derive2 { name="cblasr"; version="1.0.0"; sha256="1bz8d4124qpja4bvzn6k1swi89cfyrcpwg2nwyj4r8y0m1hbpc71"; depends=[Rcpp]; }; cbq = derive2 { name="cbq"; version="0.1.0.0"; sha256="1h02pf0jb5qg1ww9phmm3m49ix2qgvk7kyyav6923vp1hn5y5hbj"; depends=[BH Formula Rcpp RcppEigen rstan StanHeaders]; }; cbsem = derive2 { name="cbsem"; version="1.0.0"; sha256="0gc14rhfy566yw2yqzq7yk0xanpzcz7zp3km483azgk816vakbn4"; depends=[]; }; - cbsodataR = derive2 { name="cbsodataR"; version="0.3.5"; sha256="1j0v360q5vwl4xqzd35glwilcz8hv6kh4kky19zkzckkj4qqzidi"; depends=[jsonlite whisker]; }; + cbsodataR = derive2 { name="cbsodataR"; version="0.4.1"; sha256="1nrkh2505xkpdrvs1wlibp8md0qvlpknwiydiiqn216ipzjyp8p7"; depends=[jsonlite whisker]; }; ccChooser = derive2 { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; }; ccRemover = derive2 { name="ccRemover"; version="1.0.4"; sha256="1npd0vx2hyg7qbwd650987i49v5cxr6i1hlj5rw6fxc0b808s596"; depends=[]; }; ccaPP = derive2 { name="ccaPP"; version="0.3.3"; sha256="1p08gih67950khfkzhiksa8qw2f9mrmyqiiapsjpv6zc5g0lchhk"; depends=[pcaPP Rcpp RcppArmadillo robustbase]; }; @@ -5888,22 +5947,23 @@ in with self; { cccrm = derive2 { name="cccrm"; version="1.2.1"; sha256="180hzxm4z91hh008lysq1f0zky7qngg5z1laa1c119g4rqqcdskl"; depends=[gdata nlme]; }; ccda = derive2 { name="ccda"; version="1.1.1"; sha256="1kka4vmhpcnl4skdmijzsxrfj6dgax6hhlxvp7gkqlfaazq8pzf0"; depends=[MASS]; }; ccdrAlgorithm = derive2 { name="ccdrAlgorithm"; version="0.0.5"; sha256="171k70p4qyasr385ma3cvcga2b4nbz2dfry78wqx5yb1aa6wwcyc"; depends=[Rcpp sparsebnUtils]; }; - ccfa = derive2 { name="ccfa"; version="1.1.0"; sha256="1paxk1jkkl8yy71h8zqw7kmhy5yz93sp7z9mpnckwyxmsbs58ps8"; depends=[BMisc doParallel foreach formula_tools ggplot2 pbapply quantreg TempleMetrics tidyr]; }; cchs = derive2 { name="cchs"; version="0.4.1"; sha256="1aq6mc3hyhp3g8yzk6y82zz8nriwmxms9lgpw06rf857im6bn5ls"; depends=[survival]; }; + cchsflow = derive2 { name="cchsflow"; version="1.6.0"; sha256="0fj27d4hz4yrs7crqi1zbn7xwbibkjr1nr6srj1zy8lkl7rhicy2"; depends=[dplyr haven magrittr sjlabelled stringr]; }; cclust = derive2 { name="cclust"; version="0.6-21"; sha256="1n5hh0017bcq8ck52qq89jm9zgdfpmiksrypsnv2vvhk3nr0s91c"; depends=[]; }; ccmm = derive2 { name="ccmm"; version="1.0"; sha256="0855nr74xxpy7in2vrw15g8pv7nm1374irc1c5hikr5hadk5pf8v"; depends=[MASS]; }; ccostr = derive2 { name="ccostr"; version="0.1.0"; sha256="0yfmj8v7ip595v87w9dmlzl5rih2j0lsapswh9b9vvc20wnk48ld"; depends=[data_table dplyr forcats ggplot2 knitr msm Rdpack rlang survival tibble]; }; ccrs = derive2 { name="ccrs"; version="0.1.0"; sha256="1nyw4ip9v7y6yfbfdz3bwhy4r6hpp1hiip3ycldxlkl9wrxkxgrw"; depends=[cds colorspace dplyr limSolve lsbclust msm]; }; ccss = derive2 { name="ccss"; version="1.0"; sha256="0m2facn6kwxrjxg9a8z0pjnhp0rkgw6nxj6sac93ig24zygx4380"; depends=[]; }; cctools = derive2 { name="cctools"; version="0.1.2"; sha256="03lp9pa9qr2hi584ivvmswxmwjw1c3a6xqladpqldjhzvzpxvcwi"; depends=[qrng Rcpp RcppArmadillo]; }; - cdata = derive2 { name="cdata"; version="1.1.5"; sha256="1ls1hc455j48rv7l5nh4dqpi27r4gnm65w7yd70m226h0ch6hsjb"; depends=[rqdatatable rquery wrapr]; }; + cdata = derive2 { name="cdata"; version="1.1.6"; sha256="06a5bj9nzafp6aamvnjij6xf7flqp2b01rpmir9chg05rvkjhb2b"; depends=[rqdatatable rquery wrapr]; }; cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; }; - cdcfluview = derive2 { name="cdcfluview"; version="0.9.0"; sha256="0i6jipzpfcqs48w0cwjyynf3lpdppa7xh27q1rwv3jsqd246880v"; depends=[dplyr httr jsonlite MMWRweek purrr readr sf units xml2]; }; + cdcfluview = derive2 { name="cdcfluview"; version="0.9.1"; sha256="0j892zwg7y9gm057n1nk7r08wa8b611dzbanphfplh33j66rm4yg"; depends=[dplyr httr jsonlite MMWRweek purrr readr sf tibble units xml2]; }; cdcsis = derive2 { name="cdcsis"; version="2.0.3"; sha256="0hv52valyig3zzywm3058c5nxb2n7y3j2vfibxdbfg8414wwapd9"; depends=[ks mvtnorm Rcpp]; }; cde = derive2 { name="cde"; version="0.4.1"; sha256="19aifi2wh3hi929bf15v96z6gbzawgawjdipvx1v95krzij8fl2n"; depends=[data_table viridisLite]; }; cder = derive2 { name="cder"; version="0.2-2"; sha256="0aw2c170sqx2y4iz16avqijahwxlsaz590mxvsx4bicfd8nrcynk"; depends=[curl dplyr glue lubridate readr rlang stringr tibble]; }; cdfquantreg = derive2 { name="cdfquantreg"; version="1.2.2"; sha256="094mk2hvxww2lndx5wkw368ynqx6klbdwl30d1yv7kqmr2yy7388"; depends=[Formula MASS pracma]; }; cdlTools = derive2 { name="cdlTools"; version="0.14"; sha256="0zf00y8qcklz2yp7vx6mjvx2h2p4kq44r51z4qy88kq9v62rqz3k"; depends=[httr raster]; }; + cdlei = derive2 { name="cdlei"; version="1.0"; sha256="1zsgryrwr1nqhcyizrh67lm953b87ih9l4rvc6i59s4vg2ph1ph1"; depends=[]; }; cdom = derive2 { name="cdom"; version="0.1.0"; sha256="00xqqqhskjlkz8ii7kqyabxk8995w7g9jiz1isyqjpwg8nsa3x28"; depends=[broom ggplot2 minpack_lm tidyr]; }; cdparcoord = derive2 { name="cdparcoord"; version="1.0.1"; sha256="0ym2ypw4bsvmx9q4vskrq4pdd92y47vs8pay8san40rgzwqr2agb"; depends=[data_table freqparcoord partools plotly]; }; cds = derive2 { name="cds"; version="1.0.3"; sha256="1h34k96h7ajkaqsw4dlqri63hrbnshaqwrdl74wlgycdlbvrqj05"; depends=[clue colorspace copula limSolve MASS]; }; @@ -5913,10 +5973,12 @@ in with self; { ceg = derive2 { name="ceg"; version="0.1.0"; sha256="01la7kv0a3inc9vy5x010ysicfiv404bqfgs8csvqixviap9rd74"; depends=[graph Rgraphviz]; }; celestial = derive2 { name="celestial"; version="1.4.6"; sha256="1gls0qvr8mxz79lsmk76v253f747g0cqys8p8wjmpijs8r0pyr4z"; depends=[NISTunits pracma RANN]; }; cellVolumeDist = derive2 { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[gplots minpack_lm]; }; - cellWise = derive2 { name="cellWise"; version="2.1.0"; sha256="1zwpgzwrmpr354bdvqdd5hxx7a39m1057ncqzrk2azki37byhdqg"; depends=[ggplot2 gridExtra matrixStats Rcpp RcppArmadillo reshape2 robustbase rrcov scales svd]; }; + cellWise = derive2 { name="cellWise"; version="2.1.1"; sha256="10cx5nmqcxx6prwkcpv7av10qcl4qygra9sdnbavbvwgvf46l28z"; depends=[ggplot2 gridExtra matrixStats Rcpp RcppArmadillo reshape2 robustbase rrcov scales svd]; }; cellranger = derive2 { name="cellranger"; version="1.1.0"; sha256="16fgi3annn34c3cxi0pxf62mmmmxi21hp0zzlv7bkfsjqy4g4f2x"; depends=[rematch tibble]; }; + celltrackR = derive2 { name="celltrackR"; version="0.3.1"; sha256="1mnqaklc3rkx5mm41n99ky11bjs4l0dppapkwfvkyg3a0h0xzsbb"; depends=[ellipse]; }; cem = derive2 { name="cem"; version="1.1.19"; sha256="17i6jp6czjgchg16zndnh828hs8v28x25gy5f8mkzfhc5pfjd8mq"; depends=[combinat lattice MatchIt nlme randomForest]; }; cenGAM = derive2 { name="cenGAM"; version="0.5.3"; sha256="0qic2g2bq24k9jimxdk8g7bsmi4br2r6159ipdhh5ym81ji3sf5p"; depends=[mgcv]; }; + cenROC = derive2 { name="cenROC"; version="1.0.0"; sha256="1y7l4pmvky41n22l35rk984v2wmd3ss0gc08nijxb78nxx3kvs7p"; depends=[condSURV]; }; censCov = derive2 { name="censCov"; version="1.0-0"; sha256="0i9vmyi12f1m5xnrl4cxk3z9qv7ymzxsyf4gbnpg1ph63yfnhv3g"; depends=[survival]; }; censNID = derive2 { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; }; censReg = derive2 { name="censReg"; version="0.5-30"; sha256="1zpbswyl1l7z4rfb1rws66g5vf150vj4d1y54681lvvbawhlnym3"; depends=[glmmML maxLik miscTools plm sandwich]; }; @@ -5928,7 +5990,7 @@ in with self; { censys = derive2 { name="censys"; version="0.1.0"; sha256="0r0yvaidn0qn96hx461415hywsjfgaz9wvvdssx7w97v2ndnk9sy"; depends=[httr jsonlite purrr stringi]; }; centiserve = derive2 { name="centiserve"; version="1.0.0"; sha256="1m6gqz2rk7023340laa5pc0ncbfka2qi9ajvh65fwijd7xvv3n5c"; depends=[igraph Matrix]; }; centralplot = derive2 { name="centralplot"; version="0.1.0"; sha256="1slzvbm1vvgj1gkcx9pb46fz8q55vfyqrxsvx4qzi5kp7d9h4dy2"; depends=[ggplot2]; }; - centrifugeR = derive2 { name="centrifugeR"; version="0.1.3"; sha256="00sdyj7p2dawnp7nbpnpxqzavfr5gbvrbvvqkldm187iclw6bci8"; depends=[pracma]; }; + centrifugeR = derive2 { name="centrifugeR"; version="0.1.4"; sha256="1gky1j5glgigpj21hhm6mkc2xvvb9q8k3y1p4zn40r82lvggpnhz"; depends=[pracma]; }; cents = derive2 { name="cents"; version="0.1-41"; sha256="03ycbd0c8b7danbblaixg6sm7msr9ixkanqswczqa8n2frhjfgj0"; depends=[]; }; cepR = derive2 { name="cepR"; version="0.1.0"; sha256="1yqny6vgsjbrfxlk965pyk38n87ylf4513kbaljmgggrlyaz0qap"; depends=[dplyr httr magrittr purrr tibble]; }; cepp = derive2 { name="cepp"; version="1.7"; sha256="01hvm6586xnb1crvk7brqh3dm2j44ia5lrl5swnf6pb682yskbq0"; depends=[randtoolbox trust]; }; @@ -5936,8 +5998,9 @@ in with self; { ceramic = derive2 { name="ceramic"; version="0.6.0"; sha256="0n0l1b7gb05kqjrh696faq868q3nbwlg34y6wgr0w205kdq6qs17"; depends=[curl dplyr fs glue jpeg magrittr png purrr rappdirs raster reproj rlang slippymath sp spex tibble]; }; cernn = derive2 { name="cernn"; version="0.1"; sha256="0gz2x20pgsiq85hwkkpg4s1cdlw9plygx0446djc7qsymp469p2w"; depends=[]; }; cetcolor = derive2 { name="cetcolor"; version="0.2.0"; sha256="0kygdcr9ldanr0z4qpygwh0padki7s2ad0j6myky601g4228z79q"; depends=[]; }; - ceterisParibus = derive2 { name="ceterisParibus"; version="0.3.1"; sha256="1vysa4yq5qjvhpl0x3snaqa45ywsn8hhpnc657v02kvvzlgx508j"; depends=[DALEX ggplot2 gower knitr]; }; + ceterisParibus = derive2 { name="ceterisParibus"; version="0.4.2"; sha256="0hxklydsqb69y5sv2hanp5ja9k0063swf5si1j6gcj15lp7phpif"; depends=[DALEX ggplot2 gower knitr]; }; cfa = derive2 { name="cfa"; version="0.10-0"; sha256="12z58y4ls9m58wpj1xa4ir2p2apzxaskps05sxy2946m24i71zfk"; depends=[]; }; + cfdecomp = derive2 { name="cfdecomp"; version="0.1.0"; sha256="1cgm55z05ksd1zga8qhk8z2cskaxgs9rbm0nnz9wyphaq42vsiq6"; depends=[]; }; cffdrs = derive2 { name="cffdrs"; version="1.8.6"; sha256="1acj27ip4grrji5zyx7hv5b6x3bx87f29id9rnn19gj35mj5a9fl"; depends=[data_table doParallel foreach geosphere raster rgdal spatial_tools]; }; cfma = derive2 { name="cfma"; version="1.0"; sha256="006z5g3rqpg44jqdf6ivyxr47sxm5cd9cqhayfi8qk73xx5w4lv9"; depends=[]; }; cg = derive2 { name="cg"; version="1.0-3"; sha256="1kbyal1sicbr10yvxpwgcij710kqpi23vmndp9kyfzn3k8zfird3"; depends=[Hmisc lattice MASS multcomp nlme rms survival VGAM]; }; @@ -5948,12 +6011,13 @@ in with self; { cghRA = derive2 { name="cghRA"; version="1.6.0"; sha256="16dlw27s8wckc75xcwc2g74pw6bar0y0ii3h53w1hql05d4f7sb8"; depends=[DNAcopy Rgb]; }; cglasso = derive2 { name="cglasso"; version="1.1.1"; sha256="0d3r6jxrh1z4qnpxcfvwd7bcayzya2dhfl3hpfqd2dzm8fwwc2lf"; depends=[igraph MASS]; }; cglm = derive2 { name="cglm"; version="1.1"; sha256="1r3wrds5lbirzzqsi12prwykxa5361jb95pq7j95nlp6y8kcb94j"; depends=[data_table nleqslv Rcpp RcppArmadillo]; }; - cgmanalysis = derive2 { name="cgmanalysis"; version="2.5"; sha256="0mpdd56zhvdlwl305752ivmabmlqb2pkayqrscraq7kshb3fm8cr"; depends=[ggplot2 lubridate pastecs pracma readr readxl zoo]; }; - cgraph = derive2 { name="cgraph"; version="5.0.1"; sha256="14x0q2353kfd66788amxydayqigrhfgdkf9i6rcliwc0cx9hqcck"; depends=[]; }; + cgmanalysis = derive2 { name="cgmanalysis"; version="2.6.1"; sha256="0jrsn5i04gaxkcgjyrmlpx66gw27smq7r0s2v1j7hfd15q875sz6"; depends=[ggplot2 lubridate pastecs pracma readr readxl XML zoo]; }; + cgraph = derive2 { name="cgraph"; version="6.0.1"; sha256="0hmp07iz7ya3j8jaghm4pa0b84lsinc48rsibbh47sd3i6pkxfik"; depends=[]; }; cgwtools = derive2 { name="cgwtools"; version="3.0.1"; sha256="15qllfcgls6hpj51xa7mklr5ppxrs2avbiwq3y4bqbb20fld78w3"; depends=[]; }; chandwich = derive2 { name="chandwich"; version="1.1.2"; sha256="196k13qg9kl94yki989ncx2mrvvj82vv8mi453s8lqmv9s875841"; depends=[numDeriv]; }; changedetection = derive2 { name="changedetection"; version="0.2.0"; sha256="0j8x7qyna7qgjhx56yxav1g3wj3r47zvx2hivybsjis2gqbl82hr"; depends=[glmnet L1pack Rdpack]; }; changepoint = derive2 { name="changepoint"; version="2.2.2"; sha256="1jbki95pck10phpxna0b4i79hhl912zqi5ii9mjqb673y64dszkj"; depends=[zoo]; }; + changepoint_geo = derive2 { name="changepoint.geo"; version="1.0.1"; sha256="1jlixdrq97n6bh09jq3hamlwkqfqbmqs14kr8swx20f8fvfr3fj2"; depends=[changepoint changepoint_np ggplot2 Rdpack]; }; changepoint_mv = derive2 { name="changepoint.mv"; version="1.0.1"; sha256="1cv7gkfzzb8qmm49ygrkcsvlj3hx41wj8h2msa9rrawj33awj1c6"; depends=[assertive ggplot2 Rcpp Rdpack reshape2 tbart zoo]; }; changepoint_np = derive2 { name="changepoint.np"; version="1.0.1"; sha256="0ai5p77x3261ps22x8z00qiv1d3z2mf8qgi0bfc5bqnnzf44k0c2"; depends=[changepoint Rdpack zoo]; }; changepointsHD = derive2 { name="changepointsHD"; version="0.3.3"; sha256="1wdhmkg21kb5jd95a0aqqp2qgdkndc69rbdxjf792gq8f1rigarh"; depends=[Rcpp RcppArmadillo]; }; @@ -5965,29 +6029,31 @@ in with self; { chebpol = derive2 { name="chebpol"; version="2.1-2"; sha256="126cgqnl9jy332q0ywg9dr11d4q1aichwwakb1xcrxrqw2j26zzi"; depends=[geometry]; }; checkLuhn = derive2 { name="checkLuhn"; version="1.1.0"; sha256="1s1ix5n98bcbzcvrz5h19sk9pchdvrhpy3ppmw96ys8vylzm58mv"; depends=[dplyr stringr]; }; checkarg = derive2 { name="checkarg"; version="0.1.0"; sha256="0rkdjs2c4yx9laqgayxz57bwxhwgdh6ndrr4i3b1kh31lcmk1xc6"; depends=[]; }; - checkmate = derive2 { name="checkmate"; version="1.9.4"; sha256="08ddpgs4mv5d5y4j054pm8drmxkn7yvhfpbghwxlizjpnxa5g8ps"; depends=[backports]; }; - checkpoint = derive2 { name="checkpoint"; version="0.4.8"; sha256="0j5z6kmpfns8i28bkdbmwcmbv8cxmfws9d57kv3g1g3km2fmiwcl"; depends=[]; }; + checkdown = derive2 { name="checkdown"; version="0.0.3"; sha256="0bl8207lyjgjcrd55jn0dlrkbhk7qavxxrixni8jgsf5v83ydkrm"; depends=[knitr markdown]; }; + checkmate = derive2 { name="checkmate"; version="2.0.0"; sha256="193gkifr9spp0x0rwnjq1spdhjkfkh4mv27iklskcj604075phhd"; depends=[backports]; }; + checkpoint = derive2 { name="checkpoint"; version="0.4.9"; sha256="0kwbfkk3zm60w993gvwxxrikbxjdw4sgjrs9h18v3yw19kw1q9m5"; depends=[]; }; checkr = derive2 { name="checkr"; version="0.5.0"; sha256="14hkpfbw5ibdwz2jygir2f2bb2qgrj62gn3449n4dif31nswaj2f"; depends=[err]; }; - cheese = derive2 { name="cheese"; version="0.0.2"; sha256="08947y0zh3kp4ggvbrv7rl5rgj3yhmdwpbbkg8vd0hmbyz8vycc0"; depends=[dplyr forcats kableExtra knitr magrittr purrr rlang stringr tibble tidyr tidyselect]; }; + cheddar = derive2 { name="cheddar"; version="0.1-636"; sha256="1lf39v0p583jgiyb02vx0rgbwzmmhgkfpwjib2fzh9ffbs8bfk66"; depends=[]; }; + cheese = derive2 { name="cheese"; version="0.0.3"; sha256="0li828ijwgiggn80s3y1x6d7nblifzhc05biln9knvg2g3d22ca7"; depends=[dplyr forcats kableExtra knitr magrittr purrr rlang stringr tibble tidyr tidyselect]; }; chemCal = derive2 { name="chemCal"; version="0.2.1"; sha256="1kq82x57qm68im6lyqjqmh4p34s4y7fn5v6ymclxjr47mdv8npb5"; depends=[]; }; chemmodlab = derive2 { name="chemmodlab"; version="1.0.0"; sha256="0lzibshhfz52m61xldf0xq4cc1xx64fjlw18hlkiv65dj3gcj2mh"; depends=[caret class e1071 elasticnet foreach lars MASS nnet pls pROC randomForest rpart tree]; }; chemometrics = derive2 { name="chemometrics"; version="1.4.2"; sha256="0shqns0n964pfwnd0q5sadglrlpgs4g5fbv45fsj9p37l4pq61dp"; depends=[class e1071 lars MASS mclust nnet pcaPP pls robustbase rpart som]; }; cherry = derive2 { name="cherry"; version="0.6-13"; sha256="1bpahdymkc2w6mc5pjyq4q59iwzskw37swx3sw4rnbmnhzhwaf8n"; depends=[bitops hommel lpSolve Matrix]; }; - chest = derive2 { name="chest"; version="0.2.0"; sha256="1p5ggkx73k1ji40y94sbihwh05lbwy6pb060nf3spx0vfs0y8q4m"; depends=[broom forestplot MASS scales speedglm survival tibble tidyselect tidyverse]; }; + chest = derive2 { name="chest"; version="0.3.1"; sha256="0m37x5jqlpfr3gbfc3yacwv2aqzcszjxrav7janxsckpxngxrarb"; depends=[broom dplyr forestplot ggplot2 magrittr MASS speedglm survival tibble]; }; chi = derive2 { name="chi"; version="0.1"; sha256="1y91mwahj4j2wz0y5k5vdpq7ygq834h8jkn37n74lqnwvv1968rr"; depends=[]; }; chi2x3way = derive2 { name="chi2x3way"; version="1.1"; sha256="13qc8sigiw4gcxk8y50q7yfgzbssjyl41fizzjqzcp3p14kpsmzw"; depends=[]; }; chicane = derive2 { name="chicane"; version="0.1.1"; sha256="1d2rvaxdcambawf8l4sn566nr3s8xgf8nfpqa5n6lazvik8vb7kb"; depends=[data_table doParallel foreach gamlss gamlss_tr iterators MASS]; }; childesr = derive2 { name="childesr"; version="0.1.2"; sha256="170xjsk0sjwlw3w3nf9jmq4yd6ivbznmjhqq2np5grn1rwlswawb"; depends=[DBI dbplyr dplyr jsonlite magrittr purrr RMySQL]; }; childhoodmortality = derive2 { name="childhoodmortality"; version="0.3.0"; sha256="1ixd10jyzgr1ssnjas35kngpsqyjzl73wwpvcspv06cn12sv2b8d"; depends=[dplyr matrixStats plyr]; }; childsds = derive2 { name="childsds"; version="0.7.4"; sha256="1dyzidmbr7608y65kymf7x5s19qjsz9hxzfv51ml1kaymml1hbf3"; depends=[boot class dplyr gamlss gamlss_dist magrittr purrr purrrlyr reshape2 tibble tidyr VGAM]; }; - chilemapas = derive2 { name="chilemapas"; version="0.1.4"; sha256="1y873bb94chjkskzbj1k8dh7jvcx1qsifafaqkp3544y7si1l0lv"; depends=[dplyr magrittr rlang rmapshaper sf stringr]; }; + chilemapas = derive2 { name="chilemapas"; version="0.2"; sha256="0s2f5bhr7d64rlk4x7cv6zjrbnf5g86lgg026svgrdxvs1vqa4as"; depends=[dplyr magrittr rlang rmapshaper sf stringr]; }; chillR = derive2 { name="chillR"; version="0.70.21"; sha256="0sj97c4sgmywr5fl5csjyk9g6sy4a6vw2ryvg0idsfidklrdfvxd"; depends=[assertthat dplyr fields ggplot2 httr jsonlite Kendall pls plyr R_utils raster RCurl readxl reshape2 rlang RMAWGEN sp XML]; }; chinese_misc = derive2 { name="chinese.misc"; version="0.2.1"; sha256="17sffxjpga8mq8xfxhas9jqj71bb80ayz4m2dgnmg1w6bb3p7bsp"; depends=[jiebaR Matrix NLP purrr slam stringi tm]; }; chipPCR = derive2 { name="chipPCR"; version="0.0.8-10"; sha256="1mff7n7ga4sfwvcq7zkjkrl68nybnm2zkn37hmxvnw9yl3ls9lnw"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; }; chisq_posthoc_test = derive2 { name="chisq.posthoc.test"; version="0.1.2"; sha256="0lvj3jqhaj1ijjpzvpq3fn3a1y3fgv69pxh91j6k958pn6vmp40i"; depends=[]; }; - chk = derive2 { name="chk"; version="0.3.0"; sha256="1s819nkcyfipa2fz684850xv4hh6x4iph6dyxd6xrfxx7mi5vvw8"; depends=[lifecycle rlang]; }; + chk = derive2 { name="chk"; version="0.4.0"; sha256="0d7vjbz8s77r3s8i78bgzb7vgni0ryr9jh0h5nr20aqig68dr82k"; depends=[lifecycle rlang]; }; chlorpromazineR = derive2 { name="chlorpromazineR"; version="0.1.2"; sha256="0zg3xjq67na98n4amsm5v4cn9ba1k7c0lb7k2lvxa3n1w7rndpw3"; depends=[]; }; - chngpt = derive2 { name="chngpt"; version="2019.11-30"; sha256="1yw6hsshpsavmx3v1ndh4b0crr8wsak8h1vbv5qrbj3g1jzazrx7"; depends=[boot kyotil MASS survival]; }; + chngpt = derive2 { name="chngpt"; version="2020.2-26"; sha256="103fwjxm1z9k9l7nw8ckj8zjwlk9dkqrk58gn8hpzd44rxv1476c"; depends=[boot kyotil MASS survival]; }; choiceDes = derive2 { name="choiceDes"; version="0.9-3"; sha256="1nsc8p4svfc6z7ckffl24c0acnaxi6cnpz7jq03vzn6spxvpjcmw"; depends=[AlgDesign]; }; cholera = derive2 { name="cholera"; version="0.7.0"; sha256="0ja013k431vd0sjy74y2mlrii46rbwb5x886jaza4ihb48mgz7ah"; depends=[deldir ggplot2 HistData igraph KernSmooth pracma RColorBrewer sp threejs TSP]; }; choplump = derive2 { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; }; @@ -5996,74 +6062,73 @@ in with self; { choroplethr = derive2 { name="choroplethr"; version="3.6.3"; sha256="0m6kyrgnv5s1q2ncc63rfxcwqdqx5adqk14q57ss4r84i14dm5yb"; depends=[acs dplyr ggmap ggplot2 gridExtra Hmisc R6 RgoogleMaps stringr tigris WDI]; }; choroplethrAdmin1 = derive2 { name="choroplethrAdmin1"; version="1.1.1"; sha256="13ljs21hdhiv6n4napmk1gjnjhpll6j5wyijzv4xnnbi1y3ns7a9"; depends=[ggplot2]; }; choroplethrMaps = derive2 { name="choroplethrMaps"; version="1.0.1"; sha256="0ghqb2d1h0qkbcsll6ck2qk5sfvdwsrlh3phlbsjbak30832j7fr"; depends=[]; }; - chorrrds = derive2 { name="chorrrds"; version="0.1.9.2"; sha256="0g999i5nlxhbjcnx3kfv4qzd16ybj0da5bwkkn0bsb9qbp8s7lll"; depends=[dplyr forcats magrittr purrr stringr XML zoo]; }; + chorrrds = derive2 { name="chorrrds"; version="0.1.9.4"; sha256="1sdj2x6qiqp787v1xzwixjaidi2pyg42snrrkyhmnflfksgdbmys"; depends=[dplyr forcats magrittr purrr rvest stringr xml2]; }; christmas = derive2 { name="christmas"; version="1.0.0"; sha256="06a2r56vh7m6j0kfbf3b3aapn52x693fzdn29sxfvyackdk5dhj3"; depends=[animation]; }; chromer = derive2 { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[data_table dplyr httr]; }; chromoMap = derive2 { name="chromoMap"; version="0.2"; sha256="1ljjwkv7rdy1mcrkb8dd5lfkg54gxzclsjvla4qnc8j5hmfp0p8g"; depends=[htmltools htmlwidgets]; }; chromoR = derive2 { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[gdata haarfisz]; }; - chron = derive2 { name="chron"; version="2.3-54"; sha256="0vc7dxqwx0jqzwszax6di3091npsxnhnbvr7sy7rlip0jqzarwqd"; depends=[]; }; - chronosphere = derive2 { name="chronosphere"; version="0.2.0"; sha256="0c1qahgjnnncckyizdrpsxywq5120xflv9cgwdwhypgda3r05kql"; depends=[raster sp]; }; + chron = derive2 { name="chron"; version="2.3-55"; sha256="09gbs7c1ynlg0kl1m6nkbn75ysk16g13r17snnaws64qwywiywqg"; depends=[]; }; + chronosphere = derive2 { name="chronosphere"; version="0.2.2"; sha256="11vc7ids362jm1xd4z4mfmjbpsxw8wmjnn26ivy7n42xlqqzzpnf"; depends=[raster sp]; }; chunkR = derive2 { name="chunkR"; version="1.1.1"; sha256="1kw3hsx5k4cdicx0hc1v0mf2nzvqg95shx2xv05vb2pass48qw48"; depends=[Rcpp]; }; - chunked = derive2 { name="chunked"; version="0.4"; sha256="0pqk6nnxxnlsw9zal62ajjalrlmvkdrzyz2l8r10jd7s61vhra40"; depends=[DBI dplyr LaF lazyeval]; }; + chunked = derive2 { name="chunked"; version="0.5.0"; sha256="1b28hqngdkkn4wnkd3b8vcaf3md6jan73nbx240v6s2nj2anlnc8"; depends=[DBI dplyr LaF progress rlang]; }; ciTools = derive2 { name="ciTools"; version="0.5.1"; sha256="02jgi09vkzsan47mvg65ciqc1q4vmrl14v2i5bsaqxbvxwd65lww"; depends=[arm boot dplyr lme4 magrittr MASS survival tibble]; }; + cicerone = derive2 { name="cicerone"; version="1.0.1"; sha256="02dzd82vldn1k5i0j8kw1pp1jwakqnsvd1k88czh3qqfaa4wsrq5"; depends=[assertthat R6 shiny]; }; cifti = derive2 { name="cifti"; version="0.4.5"; sha256="092334lcpkzv52bg53hzx64dnrwq67f3p9fzwchmafx1l46xrqx9"; depends=[gifti oro_nifti R_utils xml2]; }; cimir = derive2 { name="cimir"; version="0.4-0"; sha256="0sp8hd354hnrmbyn3gm2sgvkf32n7kqpg9bc56583ibyfc8s4gwm"; depends=[curl dplyr glue jsonlite purrr rlang stringr tidyr]; }; cin = derive2 { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; }; cinterpolate = derive2 { name="cinterpolate"; version="1.0.0"; sha256="1aw6hs41xin2hhgmi4pr5510v4sn6x735lachpc5gpbxch5h3f82"; depends=[]; }; cir = derive2 { name="cir"; version="2.0.0"; sha256="0ycjnbikpyhcfdik7c5knw4s9gl8y5h4219c4fhs4axs04np004v"; depends=[]; }; - circglmbayes = derive2 { name="circglmbayes"; version="1.2.3"; sha256="1a60d8jpvwx2qwmy2if60c5vni9hp73fdwgz7mwi5xd5l67zwd3h"; depends=[BH coda ggplot2 Rcpp RcppArmadillo reshape2 shiny]; }; circlize = derive2 { name="circlize"; version="0.4.8"; sha256="0jvr9hmxyhg0zx101iiqkrg8wfaj86kp62xpv42n2j9fkn5r1mi2"; depends=[colorspace GlobalOptions shape]; }; circular = derive2 { name="circular"; version="0.4-93"; sha256="0hki85rs8wc5950pjaw28q54rly2napfbcrx3pchlfap6wwy5kkn"; depends=[boot mvtnorm]; }; circumplex = derive2 { name="circumplex"; version="0.3.5"; sha256="1qbh1piwbbwri3m3b00n4rlicmihfivsqq7gh02vqw01fckg60sl"; depends=[assertthat boot dplyr ggforce ggplot2 glue htmlTable magrittr purrr Rcpp RcppArmadillo rlang tibble tidyr]; }; cit = derive2 { name="cit"; version="2.2"; sha256="1lf8r3r4zwvs08vl4byhw6rvf54nb7vg83558pi0b5866m7in4sc"; depends=[]; }; citbcmst = derive2 { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; }; citccmst = derive2 { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; }; - citecorp = derive2 { name="citecorp"; version="0.2.2"; sha256="1a5hw9xaa84n847rb8a317svhya1dpfbb79sabaw6m6db4nagm6z"; depends=[crul data_table fauxpas jsonlite]; }; + citecorp = derive2 { name="citecorp"; version="0.3.0"; sha256="0lqxa6qfysrk3rpg9fnsxhrfsd0qsbfxhc3b43090fhlxq9gk3wm"; depends=[crul data_table fauxpas jsonlite]; }; citr = derive2 { name="citr"; version="0.3.2"; sha256="1qbarvafjb8jgkrnrhh6jw7mcglmjwf7dpdiibxf39jkmlhf7las"; depends=[assertthat curl httr miniUI RefManageR rstudioapi shiny shinyjs yaml]; }; ciuupi = derive2 { name="ciuupi"; version="1.1.0"; sha256="0czfmmf62p1vml24s87pdwv52spqycchpkqzwk8vyd4n1z27r5s2"; depends=[functional nloptr pracma statmod]; }; - civis = derive2 { name="civis"; version="2.1.0"; sha256="0bpm42q243ghq03x9vajs0yjdhy4lgn7fqndc53172inmkxwp7dy"; depends=[future httr jsonlite memoise]; }; + civis = derive2 { name="civis"; version="2.1.2"; sha256="085cy1icqn78vimkjv2zdd5m1qf47qj9hl8vkpd29a948nkiv9xf"; depends=[future httr jsonlite memoise]; }; cjoint = derive2 { name="cjoint"; version="2.1.0"; sha256="1bs380ji9vsc1d77wqhl0ij9xblww3g9x3hiwpcpz26wihqcx7ac"; depends=[DT ggplot2 lmtest Matrix sandwich shiny shinyBS shinyjs survey]; }; ckanr = derive2 { name="ckanr"; version="0.4.0"; sha256="17mb8ank4p39mkmkrpj40hk2g1wpn06k0rx65hqd5h49pvlj21d3"; depends=[DBI dbplyr dplyr httr jsonlite magrittr]; }; clValid = derive2 { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[class cluster]; }; cladoRcpp = derive2 { name="cladoRcpp"; version="0.15.1"; sha256="0msay6yvm6wc964gwrz31ky5w4mizakji3j6rpkydz0zlrl52v1j"; depends=[Rcpp RcppArmadillo]; }; - clam = derive2 { name="clam"; version="2.3.2"; sha256="1za0njc10mcvdmyyy4yy6sgzl6kk2kix319w84d5mcs2zrfb83j4"; depends=[]; }; + clam = derive2 { name="clam"; version="2.3.4"; sha256="1d86m3mf18h0rx03bxc8rx9zsjd77b60ik85mblxg4d4apvzh096"; depends=[]; }; clampSeg = derive2 { name="clampSeg"; version="1.0-5"; sha256="05922fddvi7s4imdnr9fb27aqskgd489amw9h86g5vw4l494lnl9"; depends=[Rcpp stepR]; }; clarifai = derive2 { name="clarifai"; version="0.4.2"; sha256="0igi4xl27nz0r85hpws2zfc2gn5z2nmywp3saxgp74mh2y99lg6s"; depends=[curl jsonlite]; }; - class = derive2 { name="class"; version="7.3-15"; sha256="1x1hqz8xyhbpq4krsh02glqnlzcch25agkmn4a3da9n723b37gzn"; depends=[MASS]; }; + clarkeTest = derive2 { name="clarkeTest"; version="0.1.0"; sha256="0vbb3j9rnh42qyp78a4jykp7p560d0ryfp28xgvxax8h8hr80457"; depends=[]; }; + class = derive2 { name="class"; version="7.3-16"; sha256="1jpdgj0lsi60q0mqbhfw809w8d66whix27y6wpdzll6775g3j3ll"; depends=[MASS]; }; classGraph = derive2 { name="classGraph"; version="0.7-5"; sha256="19jb9jr1gfg4karymrbilh0zjrlsczhy2q03x5b0jxnh4ykhxfj8"; depends=[graph Rgraphviz]; }; - classInt = derive2 { name="classInt"; version="0.4-2"; sha256="0w980hrw8sgfdfyd5dsimalq7gwhvqm7507abk7k363pvgks23dv"; depends=[class e1071 KernSmooth]; }; - classiFunc = derive2 { name="classiFunc"; version="0.1.1"; sha256="1qaima3sii394741p5n06lcqkk4fiv9apb7qqnpi6srx5h02lfl5"; depends=[BBmisc checkmate dtw fda fda_usc fdasrvf proxy rucrdtw zoo]; }; + classInt = derive2 { name="classInt"; version="0.4-3"; sha256="1b1lqhpzxm6b8pza8l3s0cxy74mm9y45lcd3354i2v3bg8m7mply"; depends=[class e1071 KernSmooth]; }; classifierplots = derive2 { name="classifierplots"; version="1.3.3"; sha256="01rvn0jwliyxj7q4cmyv8an5g7fzn6y3sccp8mj6bcqjyblfcfaa"; depends=[caret data_table ggplot2 gridExtra png Rcpp ROCR]; }; classifly = derive2 { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; }; - classyfireR = derive2 { name="classyfireR"; version="0.3.0"; sha256="1cagdwr8i3f4c4hjdgg64f3kp7ibndh766na7psd0pmki5s8grsv"; depends=[cli clisymbols crayon dplyr httr jsonlite magrittr purrr stringr tibble]; }; + classyfireR = derive2 { name="classyfireR"; version="0.3.3"; sha256="17h9xx5ap77ry50rbpl9gi1hbp1vahdwl99kkqsra79b8aixs2kj"; depends=[cli clisymbols crayon dplyr httr jsonlite magrittr purrr stringr tibble]; }; cld2 = derive2 { name="cld2"; version="1.2"; sha256="03ffg1nxdlmg66sgg0w2jdx2s5jzdp8qhja24z0il2qy3qsa915k"; depends=[Rcpp]; }; - cld3 = derive2 { name="cld3"; version="1.2"; sha256="11bjkbhjxaf6lc96qm8zk4k1i66b69f8dmc303i1560b2jj2zah3"; depends=[Rcpp]; }; + cld3 = derive2 { name="cld3"; version="1.3"; sha256="1xaac0phck00i2pm81m2xphy7r3lvbvj9z14y6asfz0cfjm7acx3"; depends=[Rcpp]; }; clean = derive2 { name="clean"; version="1.1.0"; sha256="11jfg9xh6xyhcva4pq5bl7bg2d2ar12mp568j8j79dqlci3f53zx"; depends=[crayon knitr pillar rlang]; }; - cleanEHR = derive2 { name="cleanEHR"; version="1.0"; sha256="0i8q7y4izc7q1pshdajy0n9wyihj4wlzzkd52ykam3dxqnwlnyh4"; depends=[data_table ggplot2 knitr pander Rcpp XML yaml]; }; - cleanNLP = derive2 { name="cleanNLP"; version="3.0.0"; sha256="15prwj32rq28dqqpfagaq4vfbimjws7ldrjm7waf4w6rcavz7r93"; depends=[Matrix reticulate stringi udpipe]; }; + cleanNLP = derive2 { name="cleanNLP"; version="3.0.2"; sha256="0fwi717mmw6nb81x4wlq6pfcgv0jizrw2fkiaxz0wnhvkh3i82y6"; depends=[Matrix reticulate stringi udpipe]; }; cleancall = derive2 { name="cleancall"; version="0.1.1"; sha256="1gq7bjywgslybfk97k3fxglp6j78a0cklaammccvffs3b94i4zh4"; depends=[]; }; cleandata = derive2 { name="cleandata"; version="0.3.0"; sha256="1lm7k25j16p888xvd7rzzd3sb3namzjlpjn22xmmpzlzyl0h7dhk"; depends=[]; }; - cleaner = derive2 { name="cleaner"; version="1.3.0"; sha256="0k0nhq6ap3gwdx6vdq226d7x1sp7inrm4cgxlibvaycrg8zbcjxb"; depends=[crayon knitr pillar rlang]; }; + cleaner = derive2 { name="cleaner"; version="1.4.0"; sha256="0y35cshg2a31s4ykbmzchgca7bckzr53xzzbm6941liwrfysn278"; depends=[crayon knitr pillar rlang vctrs]; }; cleanerR = derive2 { name="cleanerR"; version="0.1.1"; sha256="0rghn8rx7dj5clmc1dqvqwfm9kiva04k9gxsjjga3109l4jcpg63"; depends=[data_table plyr]; }; cleangeo = derive2 { name="cleangeo"; version="0.2-3"; sha256="02py25pir16yklffpdicljxhwdf7bqchqllgdk069f5gikfc8yrr"; depends=[maptools rgeos sp]; }; cleanr = derive2 { name="cleanr"; version="1.3.0"; sha256="15icq6p2sxaz5jsdwqlqg7mgal4310vk96w53wzv3dzpzxndz7s4"; depends=[checkmate pkgload rprojroot]; }; - clere = derive2 { name="clere"; version="1.1.4"; sha256="1nk3chcnaa4y1c5rr6c3bapvi106ikbk9grqcq6s6j0imny1jp4a"; depends=[lasso2 Rcpp RcppEigen]; }; + clere = derive2 { name="clere"; version="1.2.0"; sha256="0qc26ycycxphrbksk7jb1m6vh66a2zsnw8k4jnazs23sqdg24im9"; depends=[Rcpp RcppEigen]; }; clespr = derive2 { name="clespr"; version="1.1.2"; sha256="1993kd70w48a110im47vcpll0c6nfrm7m33r6l8rzgwnpsmcls8g"; depends=[AER clordr doParallel foreach magic MASS pbivnorm survival]; }; - clhs = derive2 { name="clhs"; version="0.7-2"; sha256="093hqqbmwbrcggqjcz4yiaavvwpv6xi12nc50ca9sg5ajlg4xg65"; depends=[cluster ggplot2 plyr raster reshape2 scales sp]; }; - cli = derive2 { name="cli"; version="2.0.1"; sha256="0x28i7kj4qndk6mnn99qn9w2nfldv8csjnsn0n8phfnxq5hnmp5y"; depends=[assertthat crayon fansi glue]; }; + clhs = derive2 { name="clhs"; version="0.7-3"; sha256="19v617dayirbzb5w6mz79lsjinvr2jjlwdm61pd2pppk099fxgqr"; depends=[cluster ggplot2 plyr raster reshape2 scales sp]; }; + cli = derive2 { name="cli"; version="2.0.2"; sha256="1dhkah6jvr96k4h4agcc2rfls75bpjb0j58fzaz3dc0fp3jk8229"; depends=[assertthat crayon fansi glue]; }; cliapp = derive2 { name="cliapp"; version="0.1.0"; sha256="152hllp4iiva2qib79700v1mx1biy8bg4sy496vwq6mi4afvswjy"; depends=[cli crayon fansi glue prettycode progress R6 selectr withr xml2]; }; - clickR = derive2 { name="clickR"; version="0.4.40"; sha256="1wwipqg5d158f4j26bvz2ig2wrcnlxqc713pxnnfml0nmrvnx41w"; depends=[beeswarm boot flextable lme4 lmerTest officer xtable]; }; - clickstream = derive2 { name="clickstream"; version="1.3.0"; sha256="01bii527xy7hdph1pm6f1g4qnwa5yf3mwz01rjg1h2gc12s5vzgg"; depends=[arules ClickClust data_table ggplot2 igraph linprog MASS plyr reshape2 Rsolnp]; }; + clickR = derive2 { name="clickR"; version="0.4.47"; sha256="1fs0zh9djgvy8cicvab9i6dji85l1z8wlr6wpfypnwvnblc64qam"; depends=[beeswarm boot flextable lme4 lmerTest officer xtable]; }; + clickstream = derive2 { name="clickstream"; version="1.3.1"; sha256="0z1yy5lr9m5x9ybimjy3f6kn490abdi038xi0qw7ny80f1ca6ry7"; depends=[arules ClickClust data_table ggplot2 igraph linprog MASS plyr reshape2 Rsolnp]; }; + clifford = derive2 { name="clifford"; version="1.0-2"; sha256="17br7p4zj1cjf1nbwbk0a2jjxj589qgvlnzi6yp4dqlf2g0w01z6"; depends=[BH Rcpp]; }; clifro = derive2 { name="clifro"; version="3.2-2"; sha256="11bfvaf1b1wv83dw8ggj7ldsc6fs8s3gl7jdzyq7l1w7innihp9s"; depends=[ggplot2 lubridate magrittr RColorBrewer RCurl reshape2 scales xml2]; }; clikcorr = derive2 { name="clikcorr"; version="1.0"; sha256="0zdnbcl5q293mmm6pbn4ri7p1q6z6sff74axsb3nyd153v2xamr5"; depends=[mvtnorm]; }; - climate = derive2 { name="climate"; version="0.3.0"; sha256="1pabgfx25rza823jrbmk6x2yzv3s7y3zwgiags34z62h9m51772a"; depends=[imgw RCurl XML]; }; + climate = derive2 { name="climate"; version="0.9.4"; sha256="1xbywpk6xls93ipvmpislyrpmzbybg09040gvqg7w5pklnb4bvnf"; depends=[RCurl XML]; }; climateStability = derive2 { name="climateStability"; version="0.1.3"; sha256="1zag722sznr22xid2v1k4a9sh3sr3grfa3wwd2m943zpvyi1sk9a"; depends=[raster]; }; climatol = derive2 { name="climatol"; version="3.1.2"; sha256="0p3nk4n7izj0cmmqd9apa1gix5lfdzp08ydy0n7rkl5kbkmrkb6n"; depends=[mapdata maps]; }; - climbeR = derive2 { name="climbeR"; version="0.0.1"; sha256="10i74bph7dhv2xj01qdhymlmfwj32lzxivanif11zmzmq9p5bqsw"; depends=[ggplot2]; }; + climatrends = derive2 { name="climatrends"; version="0.1.0"; sha256="1jn7xib07n6f9vq614cxahxph4mrs8xbv484npl0702klpk6fjqg"; depends=[nasapower tibble]; }; climdex_pcic = derive2 { name="climdex.pcic"; version="1.1-11"; sha256="01ax0kas43g3h21ixzc80f9gl4m9846gmk8v48rr0gkhcmbcc6jx"; depends=[PCICt Rcpp]; }; clime = derive2 { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; }; climextRemes = derive2 { name="climextRemes"; version="0.2.1"; sha256="1ii79zfdz90agirh3kbq80qk8nib9ks8f42f6y664j4pwk9550w3"; depends=[boot extRemes]; }; - climwin = derive2 { name="climwin"; version="1.2.2"; sha256="02kc8zvmygy9vbcx6lmxz2pyiz0sii3l35m869zr3a8hi9rx000x"; depends=[evd ggplot2 gridExtra lme4 lubridate Matrix MuMIn nlme numDeriv plyr RcppRoll reshape]; }; clinDR = derive2 { name="clinDR"; version="2.2.1"; sha256="02l0k2kl3g9nq072ljiw8dfrrxpsrk7kb5drxb830jy8jdvys3hv"; depends=[doParallel DoseFinding foreach ggplot2 rstan]; }; clinPK = derive2 { name="clinPK"; version="0.9.0"; sha256="1n1m8szd8mxdshwz8l3hfdxi7zrmsah46kxkv7jiffwnfhijfhsm"; depends=[curl testit]; }; clinUtiDNA = derive2 { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; }; @@ -6075,14 +6140,12 @@ in with self; { clogitLasso = derive2 { name="clogitLasso"; version="1.1"; sha256="1j2kscd6d1jham6yqx5rp78x5vfj2faylkxkbcjaqbynlnqbbxd0"; depends=[foreach lassoshooting]; }; clogitboost = derive2 { name="clogitboost"; version="1.1"; sha256="19wcb7229amlxn6xahxj6pf9rwfm02s7qkxz2yvyhnq95y0clxkm"; depends=[Rcpp]; }; clordr = derive2 { name="clordr"; version="1.5.0"; sha256="0yzkkzp60gnap96hlfpjncxfkfvvma15yxpwf5pv5fgffacb8281"; depends=[doParallel foreach MASS pbivnorm rootSolve tmvmixnorm ttutils]; }; - cloudSimplifieR = derive2 { name="cloudSimplifieR"; version="0.1.9"; sha256="0wp582y817f6z7kpw9nn665d6pdn0zqyadjbragw7ij4x73ncksq"; depends=[aws_s3 aws_signature jsonlite readr]; }; cloudUtil = derive2 { name="cloudUtil"; version="0.1.12"; sha256="18g946j00anlk20d0fh01w0xyj1kwyy7jhlgz5a85wmp6s2gkz74"; depends=[]; }; cloudml = derive2 { name="cloudml"; version="0.6.1"; sha256="1j15q9yb2rc4fbjxfh21fiq6is8dnb8nfyi7g8iazgfwb3p9ahpx"; depends=[config jsonlite packrat processx rprojroot rstudioapi tfruns withr yaml]; }; - clpAPI = derive2 { name="clpAPI"; version="1.2.11"; sha256="0xwwv4ccflrrapqlzwccblyhda5bmbhs7agwwwjriwxnhxghlpbm"; depends=[]; }; + clpAPI = derive2 { name="clpAPI"; version="1.2.13"; sha256="1v1ff7plr9x212cfsva9xp80q7x3vgkgmwj8qj0cch36p5p4973h"; depends=[]; }; clr = derive2 { name="clr"; version="0.1.2"; sha256="088ks9lrhlyvg3yvlfmb0091yp6qp5bzg9h5r6ryv3bk6y56sajx"; depends=[dplyr lubridate magrittr]; }; - clrdag = derive2 { name="clrdag"; version="0.6.0"; sha256="1py5x1783c9d83hgar3g70qgbsakgs6n5ckpx87fiw32l040abwa"; depends=[Rcpp RcppArmadillo]; }; clttools = derive2 { name="clttools"; version="1.3"; sha256="0va9k1b4xsb2sgpxzvid6sa8m6b8i3r4kgghclmb78nnrs480cwi"; depends=[]; }; - clubSandwich = derive2 { name="clubSandwich"; version="0.4.0"; sha256="1kz68vmfahsszxkck3c59qi35sr7987ym0znp07h3smrw1r85xcd"; depends=[sandwich]; }; + clubSandwich = derive2 { name="clubSandwich"; version="0.4.2"; sha256="0zmy42n0j0li3kzkbpwxhv6walvd5cffx1ra3p4ksxxk8fjdlf61"; depends=[sandwich]; }; clue = derive2 { name="clue"; version="0.3-57"; sha256="05rdcahawxlxci3fjxihjvvh33wqpxw50sx015165ab4nh3rsdkf"; depends=[cluster]; }; clues = derive2 { name="clues"; version="0.6.2.2"; sha256="1pvalkpvxjj6qrvffbx0sqvfmcxf6dkzrpklshkx1b2k5s4z8791"; depends=[]; }; cluscov = derive2 { name="cluscov"; version="1.1.0"; sha256="0345v5r6b53243h5bir29v0w77pmwjqjkqfrjnk5j5r1wbh98q1w"; depends=[MASS quantreg]; }; @@ -6091,9 +6154,8 @@ in with self; { clustDRM = derive2 { name="clustDRM"; version="0.1-0"; sha256="1c5z08a15scp3nrwyh0c03pdaawvm3ivbygqpbglwxim7zf73rd2"; depends=[caret doParallel DoseFinding DT foreach IsoGene MCPMod multcomp ORCME ORIClust pheatmap RColorBrewer readr shiny]; }; clustEff = derive2 { name="clustEff"; version="0.1.2"; sha256="1hy7jc8yfg554l439lfrppdsizrdmvxrqf9dwbkjckbvggg54f0k"; depends=[cluster fda qrcm]; }; clustMD = derive2 { name="clustMD"; version="1.2.1"; sha256="0w4s9dab2mm5x0xibyl6s101c64if945a2cmwin9psd95p76mcny"; depends=[ggplot2 MASS mclust msm mvtnorm reshape2 truncnorm viridis]; }; - clustMixType = derive2 { name="clustMixType"; version="0.2-1"; sha256="1m6pv1r3wdszji8nqs6yyl2405092yrdxq3vl8z1x15lnj1c87yh"; depends=[RColorBrewer]; }; - clustRcompaR = derive2 { name="clustRcompaR"; version="0.2.0"; sha256="151xq8qf1mrl35kyhdliwl2jpdkpkbl3gdnrvrybanihry2p0kqg"; depends=[dplyr ggplot2 ppls quanteda]; }; - clustcurv = derive2 { name="clustcurv"; version="1.0.0"; sha256="055hxwpvfm37gvgc5ar8qk6ksny89hmr79w1jmxyynml47lwllrl"; depends=[doParallel doRNG foreach ggfortify ggplot2 Gmedian survival wesanderson]; }; + clustMixType = derive2 { name="clustMixType"; version="0.2-5"; sha256="0i3n8w2lsaiak7nz5ypnwnjkr5qq0slklcdpykmaikfmzahihvla"; depends=[RColorBrewer]; }; + clustcurv = derive2 { name="clustcurv"; version="2.0.0"; sha256="1zjyf81ifd2sgkgs548iy1awjhjmb541rrrw2pb92cn8ph7z7nc1"; depends=[data_table doParallel doRNG foreach ggfortify ggplot2 Gmedian KernSmooth npregfast RColorBrewer survival tidyr wesanderson]; }; cluster = derive2 { name="cluster"; version="2.1.0"; sha256="055af3yz2biqbsbwm4arwr1yqnj4gicpzv2i6dbfl5pnz2z5byga"; depends=[]; }; cluster_datasets = derive2 { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; }; clusterCrit = derive2 { name="clusterCrit"; version="1.2.8"; sha256="10pz1bikdbkm2ky3xnagp0qv60whalavp6j39b4p7d75jj5xcxgk"; depends=[]; }; @@ -6103,24 +6165,23 @@ in with self; { clusterRepro = derive2 { name="clusterRepro"; version="0.9"; sha256="0s7qqvaf5yxxwhw6qyzfmk65c49yz405gljarwav6aglkx9883cl"; depends=[]; }; clusterSEs = derive2 { name="clusterSEs"; version="2.6.2"; sha256="15a9hn8g70y64v5lq91mwjbx411ji2b5zvm1wm4qz820jri5wy20"; depends=[AER Formula lmtest mlogit plm sandwich]; }; clusterSim = derive2 { name="clusterSim"; version="0.48-3"; sha256="1037d9nwj214vgmva6590kvyqr19brbnmb36inkgph4mg3276lsf"; depends=[ade4 cluster e1071 MASS R2HTML rgl]; }; - clusterability = derive2 { name="clusterability"; version="0.1.0.0"; sha256="1zc6b8j4vq1dz7f15x7ip2qwh56srj0wk1pkjwjca0ddlagaj72z"; depends=[diptest]; }; + clusterability = derive2 { name="clusterability"; version="0.1.1.0"; sha256="15gimcs6wrasafg1ys7id0mkg9fvacxbwpgg9d4b5avk4gff39bs"; depends=[diptest]; }; clusteredinterference = derive2 { name="clusteredinterference"; version="1.0.1"; sha256="01w7i9pmvwmrlf5q6y2d48ib0bm16j16xiw4pqnrvbndx4d6wf6n"; depends=[cubature Formula lme4 numDeriv rootSolve]; }; clusterfly = derive2 { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[e1071 plyr reshape2 rggobi RGtk2]; }; clusterhap = derive2 { name="clusterhap"; version="0.1"; sha256="1ic6588mqp146jsvrxlxk449zw4n81xixgrny9r29497z7hg5a1m"; depends=[]; }; clustering_sc_dp = derive2 { name="clustering.sc.dp"; version="1.0"; sha256="0cppka7613cbjjf1q2yp6fln511wbqdhh8d4gs6p0fbq379kzmvc"; depends=[]; }; - clusterlab = derive2 { name="clusterlab"; version="0.0.2.8"; sha256="10z5p79a7nafnljl3s17mw22zasxp45nfbxmhilmyfq6kblxj1zm"; depends=[ggplot2 reshape]; }; - clustermole = derive2 { name="clustermole"; version="1.0.0"; sha256="05sip8zis5i0sin9fsz39yin06154si63h45sp5pkzb0qwacyqbr"; depends=[dplyr GSVA magrittr rlang tibble tidyr]; }; - clustermq = derive2 { name="clustermq"; version="0.8.8.1"; sha256="1xx2dq3rhyxq3qzgr6gh1yh2qli0s5hrvn096ak18z6ydzyn2g0z"; depends=[narray progress purrr R6 rzmq]; }; + clustermole = derive2 { name="clustermole"; version="1.0.1"; sha256="15d7khwg4rjshbkkcqrmw9dk8wy683z8ix5n6xdrlvp0rq3l3n2c"; depends=[dplyr GSVA magrittr rlang tibble tidyr]; }; + clustermq = derive2 { name="clustermq"; version="0.8.9"; sha256="128b71h9vxai3j7bbbkx9pm5mabpxdad5qwgxrc8a6sws790yn4b"; depends=[narray progress purrr R6 rzmq]; }; clusternomics = derive2 { name="clusternomics"; version="0.1.1"; sha256="05nkw6h2dvky07fj50myzw5xlkqyiflbn4vwqw8a1q2idv4awi7b"; depends=[magrittr MASS plyr]; }; - clusternor = derive2 { name="clusternor"; version="0.0-3"; sha256="0qf1k5y9i60skdqz7glq7czwg84gafnxfg0npx772xydvivan210"; depends=[Rcpp]; }; + clusternor = derive2 { name="clusternor"; version="0.0-4"; sha256="19ac45jn9lkd600nnaib2f0ricdvh0dv3l1ap6c9vn655rgl9i3s"; depends=[Rcpp]; }; clustertend = derive2 { name="clustertend"; version="1.4"; sha256="1aqg8cy1hk3lmzvyqh9qc1mcknrva2i0c77hyd0yff9whz80ik4j"; depends=[]; }; clusteval = derive2 { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp]; }; - clustrd = derive2 { name="clustrd"; version="1.3.6-2"; sha256="06njv48sb3j7d5517l6c886hqmlyp5vk6pk5zpmdmzcxay6c81qy"; depends=[ca cluster corpcor dplyr fpc GGally ggplot2 ggrepel plyr rARPACK tibble]; }; - clustree = derive2 { name="clustree"; version="0.4.1"; sha256="0jsffqd25ad08q35a3ggzblhia7y6m5gj972kij6nrbah920qk0x"; depends=[checkmate dplyr ggplot2 ggraph ggrepel igraph rlang tidygraph viridis]; }; + clustrd = derive2 { name="clustrd"; version="1.3.7-2"; sha256="0j0nmqc9q9djg824g89z27xizdy1jdsygz1gc0r0mrzdd3dyk2ya"; depends=[ca cluster corpcor dplyr fpc GGally ggplot2 ggrepel plyr rARPACK tibble]; }; + clustree = derive2 { name="clustree"; version="0.4.2"; sha256="0bpqvy49vyvfmmrbbkf1kv87x125kr10fhdyg9d27pdwrgiqwssx"; depends=[checkmate dplyr ggplot2 ggraph ggrepel igraph rlang tidygraph viridis]; }; clustringr = derive2 { name="clustringr"; version="1.0"; sha256="07f0ywpkf8igic7ijvvrjlngq3smjcv9nqnah41fp6wfgvh49ifq"; depends=[assertthat dplyr forcats ggplot2 ggraph igraph magrittr rlang stringdist stringi stringr tidygraph]; }; clustsig = derive2 { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; }; clustvarsel = derive2 { name="clustvarsel"; version="2.3.3"; sha256="1dw9iniy2vw4yz1jip4jja6fsp03kbr86mm5knbhhyc0l24i0wrz"; depends=[BMA foreach iterators Matrix mclust]; }; - clv = derive2 { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[class cluster]; }; + clv = derive2 { name="clv"; version="0.3-2.2"; sha256="072jn3xh6ii7vfp0gx03k1hiafnla1lkyn5hpj17nmqc0jvzp683"; depends=[class cluster]; }; cmaes = derive2 { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; }; cmaesr = derive2 { name="cmaesr"; version="1.0.3"; sha256="03zx2nrw24wmmjjpyh8pswasjjq0amf0g375fm2b3s111dx8fbj9"; depends=[BBmisc checkmate ggplot2 ParamHelpers smoof]; }; cmce = derive2 { name="cmce"; version="0.1.0"; sha256="0d52ci906zbd4q43qylcyw93acxh7f20jn3r0k74ynyy47131dnd"; depends=[]; }; @@ -6129,7 +6190,6 @@ in with self; { cmmr = derive2 { name="cmmr"; version="0.1.2"; sha256="0nik1pzd1rckalvn7xh6s699kkdjnra3q3bn5x16c1lmpz5bp2s4"; depends=[httr progress RJSONIO]; }; cmna = derive2 { name="cmna"; version="1.0.2"; sha256="18vbqa258m0g5pvfhqi2vbr8n2bil07n9spgz1wh2axw1c3bcf76"; depends=[]; }; cmocean = derive2 { name="cmocean"; version="0.2"; sha256="0v1bm2qgvjb82ynakglr61swx5jy41ngn6vml5gllv3r7skqr1is"; depends=[]; }; - cmpprocess = derive2 { name="cmpprocess"; version="1.1"; sha256="03r0sfkf955w59dixya5agff0xdlwmxrlwvik7716l1alydcl4vl"; depends=[compoisson numDeriv]; }; cmprsk = derive2 { name="cmprsk"; version="2.2-9"; sha256="0xhgfg5b4i9skkaxp7gzkafgg5bqs5q1rp4hpw2jjmykg2nifn99"; depends=[survival]; }; cmprskQR = derive2 { name="cmprskQR"; version="0.9.2"; sha256="1b3di5fsgglriv00fxydpc4p8lh0xcgi6jc04awq2vmp6s8kvjmw"; depends=[quantreg survival]; }; cmrutils = derive2 { name="cmrutils"; version="1.3.1"; sha256="0nrq84bkd23lvvg8ls2smkjcnfnydhbcni3n6s8w0579i9xga8dv"; depends=[chron]; }; @@ -6140,20 +6200,23 @@ in with self; { cnbdistr = derive2 { name="cnbdistr"; version="1.0.1"; sha256="05qi41jimslbngjgbwzfda0q25hb28ax79v9yckvrbpgjc8dk990"; depends=[hypergeo]; }; cncaGUI = derive2 { name="cncaGUI"; version="1.0"; sha256="1v55kvrc05bsm1qdyfw3r3h64wlv3s6clxbr8k512lfk99ry42kn"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; }; cnmlcd = derive2 { name="cnmlcd"; version="1.2-0"; sha256="1vpn926wf8vkifscnb35y4c74721iar2wykrl50fcv0fg16yggnd"; depends=[lsei]; }; - coRanking = derive2 { name="coRanking"; version="0.1.4"; sha256="03wvy19jrb3q31yfpmakji25zwc6zx26irj4rwkad81iwdqihq3s"; depends=[]; }; + cnum = derive2 { name="cnum"; version="0.1.1"; sha256="03dl8s10jrkj70p4rdxj1d06n2silhfhc0w3jphzll7zx1p8w0pa"; depends=[stringr]; }; + coRanking = derive2 { name="coRanking"; version="0.2.1"; sha256="10489vbd917mzz5lw7ygi6q8q5qa7sp5d8xgv1ykn4lfx0avch69"; depends=[]; }; coala = derive2 { name="coala"; version="0.6.0"; sha256="0h7kc12yc90y5i733l6sfd9h12h0a2c7wv9wscjslj18sl3w3ccv"; depends=[assertthat digest R6 Rcpp RcppArmadillo rehh scrm]; }; coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; }; + coalitions = derive2 { name="coalitions"; version="0.6.12"; sha256="11844sz65axj23xwv505jxck37xv3a5n36jpdr9ywvmb19gshar7"; depends=[checkmate dplyr ggplot2 gtools jsonlite lubridate magrittr purrr RCurl rlang rvest stringr tidyr xml2]; }; coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-5"; sha256="1k42vl49kfbllc5d66yn7y9f4jgbkfibmd85nl7hwm0gkgkssg36"; depends=[MCMCpack]; }; - cobalt = derive2 { name="cobalt"; version="4.0.0"; sha256="14g5a0j3lcd61igsi2phhfpcfxwgiq7jlakr9nr4yb5h345zwvx7"; depends=[backports crayon ggplot2 ggstance gridExtra gtable]; }; + cobalt = derive2 { name="cobalt"; version="4.1.0"; sha256="1qpvkxbiw6i3q2kp9hvhxjkz9hyffbdgqzaqf71233nrbimqbg2w"; depends=[backports crayon ggplot2 gridExtra gtable]; }; cobiclust = derive2 { name="cobiclust"; version="0.1.0"; sha256="068cqrhx7lxsvcjb62rgrca7y20cybz4445bl1qc6k16ca4bh0m9"; depends=[cluster]; }; cobs = derive2 { name="cobs"; version="1.3-4"; sha256="0hiw5smk6kgk0gb9840kcqkhkybl7n30s77xhjc395x09izbgix1"; depends=[quantreg SparseM]; }; + coca = derive2 { name="coca"; version="1.0.4"; sha256="1mk6vhy3s243rn4bwfr72900x0fcfs729k179kc81zvjj3v7m0h9"; depends=[caret cluster fpc glmnet Matrix nnet pheatmap RColorBrewer]; }; cocktailApp = derive2 { name="cocktailApp"; version="0.2.1"; sha256="1aq7m3qb4s5v59ym8p5vh7lr5s1xfp8b04x64a014k47gakgiw1d"; depends=[dplyr DT forcats ggplot2 ggtern magrittr shiny shinythemes tibble tidyr]; }; cocor = derive2 { name="cocor"; version="1.1-3"; sha256="106zyrrypil8jyg0pva5zj4hgb53z81nca3d0mh2q3j55zq3wl12"; depends=[]; }; cocoreg = derive2 { name="cocoreg"; version="0.1.1"; sha256="0jrrkak964pl1vih592jgqgl6bw08j0fa1rh3j85x64bqq4m7278"; depends=[abind CCAGFA combinat e1071 ggplot2 glmnet gridExtra MASS multiway pls reshape RGCCA]; }; cocorresp = derive2 { name="cocorresp"; version="0.4-1"; sha256="10prxmc80yk0l5v1gcy92clmjvjywimypqpzjb6gh5pipsqr4swr"; depends=[vegan]; }; cocron = derive2 { name="cocron"; version="1.0-1"; sha256="0dl14y9v9kndy5gzhhbhq3f31ja724y1hra40givy6bij7h2cj30"; depends=[]; }; coda = derive2 { name="coda"; version="0.19-3"; sha256="1mn50bshky968gn4nf6vnkaa768fnvm1xmhkms7szwdw9341zpyk"; depends=[lattice]; }; - coda_base = derive2 { name="coda.base"; version="0.2.1"; sha256="1ammzzh4w8g5d6c1wfqg7pglrc5lq8sr3qzgf1bjsrm9p5ysw1li"; depends=[MASS Rcpp RcppArmadillo]; }; + coda_base = derive2 { name="coda.base"; version="0.2.2"; sha256="166j7bf7gm28176ajm9gyl56ncwhlxrjizbp3ah6ssp7a72x2xyi"; depends=[Rcpp RcppArmadillo]; }; codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; }; codebook = derive2 { name="codebook"; version="0.8.2"; sha256="1glzrvffhrgya6617m8zgbf2r8v1y1wpml11ayanz4s4k2xzzlmc"; depends=[dplyr DT forcats future ggplot2 glue haven htmltools jsonlite knitr labeling labelled likert lubridate miniUI pander psych purrr rio rlang rmarkdown rstudioapi shiny skimr stringr tibble tidyr tidyselect userfriendlyscience]; }; codemetar = derive2 { name="codemetar"; version="0.1.8"; sha256="1zqpxh0hx7jh1xki1sx9bs5a30hv4gfaqqlnd630a5n68hghjmg2"; depends=[commonmark crul curl desc gh git2r glue jsonlite magrittr memoise pingr pkgbuild purrr readr sessioninfo stringi stringr tibble usethis whisker xml2]; }; @@ -6161,44 +6224,47 @@ in with self; { codetools = derive2 { name="codetools"; version="0.2-16"; sha256="00bmhzqprqfn3w6ghx7sakai6s7il8gbksfiawj8in5mbhbncypn"; depends=[]; }; codified = derive2 { name="codified"; version="0.2.0"; sha256="1hmw7yrw4qx8v9rkqqvqf4013s9whq5qlgwz7v882j4slpvm6gb1"; depends=[checkmate dplyr kableExtra knitr magrittr readr rlang tibble tidyr]; }; codingMatrices = derive2 { name="codingMatrices"; version="0.3.2"; sha256="0kldx2h3mksw4644d0ask6ij7i63rrwk0njlsvkbdjz3bf7pdv1b"; depends=[fractional Matrix]; }; - codyn = derive2 { name="codyn"; version="2.0.3"; sha256="1jmnkipalxfy8dwgskrx3npcmb717bpvkpx97md44xhh8l7mmk2s"; depends=[assertthat permute vegan]; }; - coefficientalpha = derive2 { name="coefficientalpha"; version="0.5"; sha256="0pfw64z7f0gp415nn7519rcw829a7wnwnjx94sc55jsvgb1di3kc"; depends=[lavaan rsem]; }; + coefficientalpha = derive2 { name="coefficientalpha"; version="0.7"; sha256="0li1js501sa8m0ba76ymn4lz5y4np7kf96gnxz9kypg50kd58yis"; depends=[lavaan rsem]; }; coefplot = derive2 { name="coefplot"; version="1.2.6"; sha256="036njf2xwmjvyamanb7nfn2n09ps2rdgk3zrxn6khwp8ly245nps"; depends=[dplyr dygraphs ggplot2 magrittr plyr purrr reshape2 tibble useful]; }; coenocliner = derive2 { name="coenocliner"; version="0.2-2"; sha256="0r4h0r3av2d1cxmjpwaabjn807626pzqnra2x542wdnnf7h8nmdf"; depends=[]; }; coenoflex = derive2 { name="coenoflex"; version="2.2-0"; sha256="06f75spl4wkbgicm0bksnid2lb1gkvi05915wn5y4km45d82fkkr"; depends=[mgcv]; }; coexist = derive2 { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; }; - cofad = derive2 { name="cofad"; version="0.1.0"; sha256="034ihvg2bqlfhpwivza15slksn7zxk3k20rdyx9zlriqzfgvlwws"; depends=[]; }; + cofad = derive2 { name="cofad"; version="0.1.1"; sha256="0c27wfdk98mq0531avlgfxf2wmxcjyg39pgl9i37im7ri2s7kpnr"; depends=[]; }; cofeatureR = derive2 { name="cofeatureR"; version="1.1.1"; sha256="1awfrlnbpw9ivfvaahznx6dx5jp8ln0154vh2pznp520q59h1mbs"; depends=[dplyr ggplot2 lazyeval tibble]; }; coga = derive2 { name="coga"; version="1.1.0"; sha256="0p2mdia89gj7w0j33qxil1l2zg6civj18i3pqym7aijzz1fgwnzp"; depends=[cubature Rcpp RcppGSL]; }; cogmapr = derive2 { name="cogmapr"; version="0.9.1"; sha256="1iz776avw05a0lcna78fycixacby4bjf8ar1jazsf34yss6zka23"; depends=[car dplyr ggplot2 graph magrittr Rgraphviz tidyr]; }; - cohorttools = derive2 { name="cohorttools"; version="0.1.0"; sha256="0350q0dyy0rfk2g8anc62cib2gq7hi4zzg3gsd02fhwadz5gnjga"; depends=[DiagrammeR DiagrammeRsvg Epi epitools rsvg survival]; }; - coil = derive2 { name="coil"; version="1.1.0"; sha256="1b73r51vyw4cb4ck3xvig0nhjf3hglg58s4kc1b28zzqzl7ay78k"; depends=[ape aphid seqinr]; }; + cognitoR = derive2 { name="cognitoR"; version="1.0.1"; sha256="1qd3hsblciqnjysx3hqdkwmzpl2zf72jiwywicjpbpv1i703c4wx"; depends=[base64enc config dplyr httr jsonlite shiny shinyjs yaml]; }; + cohorttools = derive2 { name="cohorttools"; version="0.1.2"; sha256="0hfpl2dm5ykagwmmdmk0hpbkzzd0zqmf9andm510safjp4mlbcy0"; depends=[cmprsk DiagrammeR DiagrammeRsvg Epi ggplot2 rsvg survival]; }; + coil = derive2 { name="coil"; version="1.2.1"; sha256="0s11v1hcksljpxnlkmrlnnamx4mlsck45hsjm4xlhc1zb7x9kqf5"; depends=[ape aphid seqinr]; }; coin = derive2 { name="coin"; version="1.3-1"; sha256="0qi03fyqw42a2vnqcia5l2m1mzyarj2q1iblknx9n19bdsd53qjx"; depends=[libcoin matrixStats modeltools multcomp mvtnorm survival]; }; coindeskr = derive2 { name="coindeskr"; version="0.1.0"; sha256="0iwkg9qx5gymzjxw3w1zlwq9336kbqp4z8a9wf9a1p2gp9727qcm"; depends=[httr jsonlite]; }; - coinmarketcapr = derive2 { name="coinmarketcapr"; version="0.3"; sha256="149ilps378rvk4g3icasb843d90vmx69kfdcl6a8828v1mg0pcvs"; depends=[cli crayon curl data_table ggplot2 jsonlite]; }; + coinmarketcapr = derive2 { name="coinmarketcapr"; version="0.3.2"; sha256="0n62kcw7yxpvxd2bzki432cis5rvfw8b8syfvgv5wpq53bavq3px"; depends=[cli crayon curl data_table ggplot2 jsonlite]; }; cointReg = derive2 { name="cointReg"; version="0.2.0"; sha256="0n4s809avhlrmrjdqzc2s752m7x96c4432gnjd4qv77r2nns7dw4"; depends=[checkmate MASS matrixStats]; }; cointmonitoR = derive2 { name="cointmonitoR"; version="0.1.0"; sha256="0rsacvib9prgb199m5ndi0zlgfsvf1giqc5s41wp0yvxdxjdq5lw"; depends=[cointReg matrixStats]; }; - cold = derive2 { name="cold"; version="2.0-0"; sha256="10kn2kycyc6di30ji6lk5agsczh1zdv65s8ryj6q2f40v0y0zlck"; depends=[cubature]; }; + cold = derive2 { name="cold"; version="2.0-1"; sha256="143zmccaiijz4cfiwh1a48h95bqa0ypa9ivv43qkx9y55911a05x"; depends=[cubature MASS]; }; colf = derive2 { name="colf"; version="0.1.3"; sha256="1av82yrp6csw7700ymipd02j73cmzn0apv7ykachjw09nzk86kvj"; depends=[nlsr]; }; collUtils = derive2 { name="collUtils"; version="1.0.5"; sha256="0gbk3lrb2lwq2ixrpcngng6qz6axjb4iyqy5606x1zmjm71c060p"; depends=[Rcpp rJava]; }; + collapse = derive2 { name="collapse"; version="1.1.0"; sha256="0pypbs6g6gvsyagdxfk6x0qsh9byrwyqv9v0ajp20cqbx0s22kxi"; depends=[lfe Rcpp]; }; collapsibleTree = derive2 { name="collapsibleTree"; version="0.1.7"; sha256="0b65pbp1wnpsrayqi630ds4r98jvcvynnlp6wxdqrnnr9nzw5343"; depends=[data_tree htmlwidgets]; }; collateral = derive2 { name="collateral"; version="0.4.2"; sha256="1i1fzvm838s2cfmxw654vwmp9rl9f9985vjildkxyx2f6571sjfm"; depends=[crayon pillar purrr]; }; collectArgs = derive2 { name="collectArgs"; version="0.4.0"; sha256="0fz5w1xsxiddzrwahrg50px4igyhd4plq655jaix6grancs7kvix"; depends=[magrittr]; }; - collections = derive2 { name="collections"; version="0.2.3"; sha256="1fkajfmh7zx2a111js2sdlkzx5q0an67s7ns9jsy65zl7iqis3i0"; depends=[xptr]; }; + collections = derive2 { name="collections"; version="0.3.0"; sha256="01mgkfl849gy0xzs3ccbkg4pmpzs6f1n953izrcf5797qg8xqkr5"; depends=[]; }; + collector = derive2 { name="collector"; version="0.1.3"; sha256="1yn6gzccdbp7n4qnwqpv66617qldjabzrlww41v6wqn9b7qyr0ii"; depends=[dplyr EnvStats evaluator flextable ggplot2 ggpubr magrittr officer purrr quanteda readr rlang rmarkdown stringr tibble tidyr xaringan]; }; collidr = derive2 { name="collidr"; version="0.1.2"; sha256="1b8yy0p1r4gs6azcl1aqkny3hws5hhl9bvsrkrhgk2r2xni9sk6f"; depends=[dplyr jsonlite stringr]; }; collpcm = derive2 { name="collpcm"; version="1.1"; sha256="14rlipdww5sm1ijp2ggpnd23m14qh10zm99cfq1w0kky9jfl0fkn"; depends=[latentnet network vegan]; }; colmozzie = derive2 { name="colmozzie"; version="1.1.1"; sha256="0sn7dqg7rnddnmdb10c6scws6kgi1lz4lw8nc698x63z431ah1p8"; depends=[]; }; coloc = derive2 { name="coloc"; version="3.2-1"; sha256="0sm2mji8bihvcshkh9g18sgbwznhh8j4hip50rk7ckac3vc8y75h"; depends=[BMA data_table ggplot2 reshape snpStats]; }; - colocalization = derive2 { name="colocalization"; version="1.0.1"; sha256="0ax560r5f629zv8rfa91ynx8g3kcn5ga553k5svircl21n65zb1y"; depends=[ggplot2]; }; colocalized = derive2 { name="colocalized"; version="0.2.0"; sha256="1q98wfqk0p9p92jgjf8liamz6grzwy6h57k7681fm07wfnyr268g"; depends=[doParallel foreach purrr]; }; + colorBlindness = derive2 { name="colorBlindness"; version="0.1.6"; sha256="18922caddz7c5dj5mbyl7qihgsnk384w31k17rwngm5hckz2d5yi"; depends=[colorspace cowplot ggplot2 gridGraphics gtable]; }; colorRamps = derive2 { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; }; - colorSpec = derive2 { name="colorSpec"; version="1.1-1"; sha256="0c1da94abjq439h7y2rylidp9lnh6i2wc7m27cawkr983jpxcq0m"; depends=[MASS spacesXYZ]; }; + colorSpec = derive2 { name="colorSpec"; version="1.2-1"; sha256="1y6wq4g4rf2carqi387v94502nb5jmw7f6f7grbdzbkixs77bkg2"; depends=[MASS spacesXYZ]; }; colordistance = derive2 { name="colordistance"; version="1.1.0"; sha256="0aiqvx0mlraczkcfhzfcaavmqqmxiffnghhw266f84bphxw6b5q2"; depends=[abind ape clue emdist gplots jpeg magrittr mgcv plotly png scales scatterplot3d spatstat]; }; coloredICA = derive2 { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; }; colorednoise = derive2 { name="colorednoise"; version="1.0.5"; sha256="094iil7f8w5cinw5j1ja3a2l1w352hlj6f3vfsvs6k1ww5f1sd6l"; depends=[dplyr purrr Rcpp RcppArmadillo tibble tidyr]; }; colorfindr = derive2 { name="colorfindr"; version="0.1.4"; sha256="175h476dzq1f2x25vdd268xj4ja4lv8fhfj9vld85waqi0sq515g"; depends=[bmp dplyr jpeg magrittr pixmap plotly plotwidgets png purrr rsvg stringr tibble tiff treemap]; }; colorfulVennPlot = derive2 { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; }; colorhcplot = derive2 { name="colorhcplot"; version="1.3.1"; sha256="009pyyb30kwshldd7v7zfy5rxys6i0dhlc5w8ail61acbg4rlrmz"; depends=[]; }; + colorist = derive2 { name="colorist"; version="0.1.0"; sha256="1j5gd1fis62xylgaf7dj5n0dnalarz7mg824iakzmqgcqzjm06l4"; depends=[colorspace ggplot2 magrittr raster scales tidyr]; }; colormap = derive2 { name="colormap"; version="0.1.4"; sha256="0032ji9n8pivl70jppq989fgg781wil8zag7pfl1hs9xrpin8asy"; depends=[ggplot2 stringr V8]; }; colorpatch = derive2 { name="colorpatch"; version="0.1.2"; sha256="18p9hgccp37pbdf437xffkv6z500896v08fsw2jm8zcl9ladygaf"; depends=[colorspace ggplot2 gridExtra TSP]; }; colorr = derive2 { name="colorr"; version="1.0.0"; sha256="1wwrgb9fc9gzxxwxrdrkwwrmhqqllv29wr4q8y1shj9d3nzcpwmh"; depends=[]; }; @@ -6207,47 +6273,45 @@ in with self; { colortools = derive2 { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; }; colourlovers = derive2 { name="colourlovers"; version="0.3.5"; sha256="172ny0w9n2ys8pa7zxkfjsl7lv6fa59bmmbkzlwfx59wamxahmky"; depends=[httr jsonlite png XML]; }; colourpicker = derive2 { name="colourpicker"; version="1.0"; sha256="0z3v2083g7kwdp21x9s2n1crfh24agpdq3yxkcdzc2awn2pwpnpi"; depends=[ggplot2 htmltools htmlwidgets jsonlite miniUI shiny shinyjs]; }; - colourvalues = derive2 { name="colourvalues"; version="0.3.2"; sha256="1ap2k9b4f0x8di0vk4756x05im64ypxhcz6s584w6j7hx4jfl3wr"; depends=[BH Rcpp]; }; + colourvalues = derive2 { name="colourvalues"; version="0.3.4"; sha256="0b5ni3wx8hid6kf13mihphjxdrfz7srlgd9vhrlbxk9mlxzh593y"; depends=[BH Rcpp]; }; colourvision = derive2 { name="colourvision"; version="2.0.2"; sha256="15ndhqpp5fi9jgiri9ysl68nf4rdamh9c25svf5nvh2wvv8shrd9"; depends=[Matrix rgl]; }; colr = derive2 { name="colr"; version="0.1.900"; sha256="0ilz1y0jd2vgyh81g3dwx2l64sir6z6sgmqx7lnvr1hafsqnwfc8"; depends=[]; }; colt = derive2 { name="colt"; version="0.1.1"; sha256="028jqvgr14ig8jxp8h2lrf7mainzppgqh6v1479qfv4l9is3bnwy"; depends=[crayon]; }; - comat = derive2 { name="comat"; version="0.7.2"; sha256="1rca5n47ypw8mbhx40x9vi4wvkpnzzyxgm4vb7sq32w5pnydnkcn"; depends=[Rcpp RcppArmadillo]; }; + comat = derive2 { name="comat"; version="0.8.2"; sha256="0yhldgbz992pplxpsmkyhw54b35yr3x9fdd05iprnnq1r04hsr09"; depends=[Rcpp RcppArmadillo]; }; comato = derive2 { name="comato"; version="1.1"; sha256="0lidwr5vw10655p7q0iqzq3phq5y1i86w3bjdv87cwx3m6333bz6"; depends=[cluster clusterSim gdata igraph lattice Matrix XML]; }; combinat = derive2 { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; }; combiter = derive2 { name="combiter"; version="1.0.3"; sha256="11pcvrpbvkzkjwks2z6ww7s9d5fkh8zl0jw52a5ya3y1wkqcs3n6"; depends=[iterators itertools Rcpp]; }; comclim = derive2 { name="comclim"; version="0.9.5"; sha256="1s6zh16j0q2n7gkvhd4bym9w3hyg4b9n5lpgspqp2nlygdl6jxxb"; depends=[]; }; cometExactTest = derive2 { name="cometExactTest"; version="0.1.5"; sha256="0ar9axm9cd1wd937xcmsmd7xqilnfyab8gsrpkiqpc3fjh86qyrp"; depends=[dplyr]; }; + cometr = derive2 { name="cometr"; version="0.1"; sha256="00ikz2096bq8fh2sy15bgnwq0b1rbjj49yc0xs9v3xsr6ghsjkph"; depends=[callr httr jsonlite R_utils R6 yaml]; }; comf = derive2 { name="comf"; version="0.1.9"; sha256="0n9893nli8rf9g5c9yyqrhbk3xsbvynv1vlpn03i5xs05aj3r88h"; depends=[plyr reshape]; }; commandr = derive2 { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; }; commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; }; commonmark = derive2 { name="commonmark"; version="1.7"; sha256="024iz1qp2kv6iz6y69ir0jk3qhjps86rhkzlcmhqsxx97rx7cjni"; depends=[]; }; - commonsMath = derive2 { name="commonsMath"; version="1.2.4"; sha256="12hwl3xjm7kl5y36v3y4jyr2gk4l87mff237qms2hy8y41nwwagr"; depends=[]; }; + commonsMath = derive2 { name="commonsMath"; version="1.2.5"; sha256="1c4lgmggpc22mhwcpy521b2pg8wf4bbjp0a6rbcn0aki90xw9ckk"; depends=[]; }; comorbidity = derive2 { name="comorbidity"; version="0.5.3"; sha256="10zlq1586abngdrw5hgba78ridn3xj4q68f34slxpk0gxwa94n7p"; depends=[checkmate data_table]; }; compHclust = derive2 { name="compHclust"; version="1.0-3"; sha256="0agay7rn5mrw07imz4l547b7m9pfcg3rhz4krfxrvg1q2z2kryvj"; depends=[]; }; compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; }; compare = derive2 { name="compare"; version="0.2-6"; sha256="0k9zms930b5dz9gy8414li21wy0zg9x9vp7301v5cvyfi0g7xzgw"; depends=[]; }; compareC = derive2 { name="compareC"; version="1.3.1"; sha256="0dachfr23lps2jj1y5gc958k54vskmww84gdgk4amihsdgjsnphg"; depends=[]; }; - compareDF = derive2 { name="compareDF"; version="2.0.0"; sha256="1h93kh2bzy94ylghwixwhg8s6issz94ya0358xff3v9f6nlwh7k6"; depends=[dplyr htmlTable magrittr openxlsx stringr tidyr]; }; - compareGroups = derive2 { name="compareGroups"; version="4.2.0"; sha256="0lq5yd6d1vz8lzy1lnfav2726g3xdfxlbza055g0paxbxzxgs2n0"; depends=[chron epitools flextable HardyWeinberg kableExtra knitr officer rmarkdown SNPassoc survival writexl]; }; + compareDF = derive2 { name="compareDF"; version="2.0.2"; sha256="1bsrb9v1rr4s67q01gqf9bjp7hla47kxxkc4a4kflmjjixb4fzz3"; depends=[dplyr htmlTable magrittr openxlsx stringr tidyr]; }; + compareGroups = derive2 { name="compareGroups"; version="4.4.1"; sha256="1pyqlqfb3km4ggl8z8nf5hyfa4az0nav98ik1f6zlrdydswdyl71"; depends=[chron flextable HardyWeinberg kableExtra knitr officer rmarkdown SNPassoc survival writexl]; }; compareODM = derive2 { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; }; + comparer = derive2 { name="comparer"; version="0.2.1"; sha256="1ric6niwx9718qrdkiclmjbrx4vjbg7jwvd6917hihzyjgbsi9fj"; depends=[R6]; }; comparison = derive2 { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; }; compas = derive2 { name="compas"; version="0.1"; sha256="1ckryllwd8avz6456970qhfa3wpcsmhkicnibnv7gl4crzf44xgx"; depends=[bio3d Rcpp RcppEigen]; }; compboost = derive2 { name="compboost"; version="0.1.0"; sha256="0q7jfj5yc2jvddyyhnzv8fnlmngjfws7cg2blxai76s2fw6bmgxp"; depends=[checkmate glue R6 Rcpp RcppArmadillo]; }; - compeir = derive2 { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[etm lattice]; }; compendiumdb = derive2 { name="compendiumdb"; version="1.0.3"; sha256="0glaqlzz5wr14yfhka1y7yw5ha6yc4waw61msbz0vkwj5z2hd2hk"; depends=[Biobase GEOquery RMySQL]; }; - comperank = derive2 { name="comperank"; version="0.1.0"; sha256="0fxg32kp4v42455fia48rnbd3v84g4vsh4r4qc29d0gg93ymz9hp"; depends=[comperes dplyr Rcpp rlang tibble]; }; + comperank = derive2 { name="comperank"; version="0.1.1"; sha256="0wz46rkpx1cjjng3i03pms2x27cik9wbx7al5r289ym3664zb83m"; depends=[comperes dplyr Rcpp rlang tibble]; }; comperes = derive2 { name="comperes"; version="0.2.3"; sha256="1mz8002zqyyzdd2ija0iqc1fm10px6ll0bsl3pmfwwdqbqx17rmz"; depends=[dplyr magrittr rlang tibble tidyr]; }; - competitiontoolbox = derive2 { name="competitiontoolbox"; version="0.1.2"; sha256="1k45y7zcckvpcx4pdin9zlsx1vrqlqx9lz67cbsawb254wbylc4l"; depends=[antitrust ggplot2 rhandsontable shiny trade]; }; completejourney = derive2 { name="completejourney"; version="1.1.0"; sha256="0ysbpmd7rglz3diy2cpcgvmmcnysradb4ddiwix7kbhzrhvhrdrs"; depends=[curl dplyr progress stringr tibble zeallot]; }; complexity = derive2 { name="complexity"; version="1.1.1"; sha256="1lpsvry88jpqfw0wkdlwjzkqjl17f4adjcqvq0dwk483mi54xnfk"; depends=[combinat shiny]; }; complexplus = derive2 { name="complexplus"; version="2.1"; sha256="16w9v7d1ckavqmr86l34frr37pkvdn0iqnb17ssb8xaggns5lgqx"; depends=[expm Matrix]; }; complmrob = derive2 { name="complmrob"; version="0.7.0"; sha256="0dvkc5y53041agkjz3rl898hkq686pxzr6flf2qx1g3jbza3pk1y"; depends=[boot ggplot2 robustbase scales]; }; - compoisson = derive2 { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; }; - compositions = derive2 { name="compositions"; version="1.40-3"; sha256="103hbmibrf1n333pn4xpll1gqqsv4szms0n5gdq7zak31aar0bg4"; depends=[bayesm robustbase tensorA]; }; + compositions = derive2 { name="compositions"; version="1.40-5"; sha256="0l9ayz2nb2wqhl7v9hkfl7pd950ba0h6hma8zqncbcxh6xh2k7l7"; depends=[bayesm robustbase tensorA]; }; compound_Cox = derive2 { name="compound.Cox"; version="3.19"; sha256="1wl8jg916567nk0wy37in6syh7z2rw70v5jm7s0w3ifiqs5v7nzb"; depends=[numDeriv survival]; }; comprehenr = derive2 { name="comprehenr"; version="0.6.7"; sha256="0c0wid4lch7yrz41b8n773hy4zj80sfb1lhy4pclvlsjdr5zryk6"; depends=[]; }; - compstatr = derive2 { name="compstatr"; version="0.2.0"; sha256="07kak4dc1q44m58wb7ps4bf5ikcnjfkvd7fn1mxfxvqljrdy6978"; depends=[dplyr fs httr janitor lubridate purrr readr rlang rvest sf stringr tibble tidyr xml2]; }; - compute_es = derive2 { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; }; + compute_es = derive2 { name="compute.es"; version="0.2-5"; sha256="00133s3l3g70xrfnxgxhvbjr8izvaj9h0c73iaiyjmlgj84x69m8"; depends=[]; }; comtradr = derive2 { name="comtradr"; version="0.2.2"; sha256="177gnmgwqns65z5y9nw4xp8qmw5z70454zb54jw1879xrgfsrciz"; depends=[httr jsonlite magrittr purrr]; }; con2aqi = derive2 { name="con2aqi"; version="0.1.0"; sha256="1gdd1y6xg26fz199hvryzsnp16qbsz13chqqxyxnkgrai1l72mhf"; depends=[]; }; conStruct = derive2 { name="conStruct"; version="1.0.4"; sha256="1klhzsxrkbz16dnm3r2qxyq2z02zqrps9kij2jy6241ni9qmnn2f"; depends=[BH caroline doParallel foreach gtools Rcpp RcppEigen rstan rstantools StanHeaders]; }; @@ -6255,21 +6319,21 @@ in with self; { concaveman = derive2 { name="concaveman"; version="1.0.0"; sha256="0b6a37h4k3p879gp4qp3297q0fzq3yn79yhkwjrcxhcl86sg5nb6"; depends=[dplyr jsonlite magrittr sf V8]; }; conclust = derive2 { name="conclust"; version="1.1"; sha256="1k9y1mniy7s51dmm5ia693k72s2vxk5bznxxf74s7mx9n3mg2i8r"; depends=[]; }; concor = derive2 { name="concor"; version="1.0-0.1"; sha256="0hjyvi6p16cyrmq0bq7fph1r5f3adp7zpf123wkm5bkjnc5122k0"; depends=[]; }; - concordance = derive2 { name="concordance"; version="1.6"; sha256="0pb4mndrh1nimf59ajjcydlvc79nm6p7c219iymkn0b1hbrnx7lf"; depends=[]; }; + concordance = derive2 { name="concordance"; version="2.0.0"; sha256="1xlm0c91bsbij8dr23fh781c6bg8l74kma6x7nnapkpm7jim279x"; depends=[dplyr purrr rlang stringr tibble tidyr]; }; concreg = derive2 { name="concreg"; version="0.6"; sha256="1ncs9cpviv5kd49hahlhi7wn2yk70msi22qv8fw91hf81ccimlp2"; depends=[survival]; }; - concurve = derive2 { name="concurve"; version="2.3.0"; sha256="1bjdlr3hpnv69g5jg2y18zkly0al3g9qj8cq0dlpk7x6930imqx7"; depends=[bcaboot boot dplyr flextable ggplot2 knitr MASS metafor officer pbmcapply ProfileLikelihood rlang scales survival survminer tibble tidyr]; }; + concurve = derive2 { name="concurve"; version="2.5.0"; sha256="1zmm3y1abm6gjvl9vjmsi2rn2vxgy4qp9crmlrhx3yzij58m15sq"; depends=[bcaboot boot cowplot dplyr flextable ggplot2 knitr lme4 MASS metafor officer patchwork pbmcapply ProfileLikelihood scales survival survminer tibble tidyr]; }; cond = derive2 { name="cond"; version="1.2-3.1"; sha256="1j0gf28mg2j6ahs83nk662bix1lb2c9184vn8sblw433zxqaa2ny"; depends=[statmod survival]; }; condGEE = derive2 { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; }; - condMVNorm = derive2 { name="condMVNorm"; version="2015.2-1"; sha256="04563jljnjhbiaiq33gn5dxjfvv05xp3lhl3w942v0smy0cdhrh4"; depends=[mvtnorm]; }; + condMVNorm = derive2 { name="condMVNorm"; version="2020.1"; sha256="115pxnff2ckdxx0avbs0hfdhh1sljiz1y6h7ggd5hidrxd3559m4"; depends=[mvtnorm]; }; condSURV = derive2 { name="condSURV"; version="2.0.1"; sha256="0xjpypc4fzrnfjcznyc2bslkkza4fib8nx8ff2j7xh2nf84lk3f1"; depends=[doParallel doRNG foreach KernSmooth np survival]; }; condformat = derive2 { name="condformat"; version="0.8.0"; sha256="1x3sm3fn5lb07gmxvfaa0xnhk5mjnim90p7mwail8dmi9nygrb9d"; depends=[dplyr gridExtra gtable htmlTable htmltools knitr lazyeval magrittr rlang rmarkdown scales tibble tidyselect]; }; - condir = derive2 { name="condir"; version="0.1.1"; sha256="133598h1ga4jyr77lchnby6m8bh3adq6s38cgw45q4fyvzad4qds"; depends=[BayesFactor effsize knitr psych shiny xtable]; }; + condir = derive2 { name="condir"; version="0.1.2"; sha256="1vd3nw2hhldy7igpx58p6if6q2h99d7ypb2ldxkssq6y79n8hq99"; depends=[BayesFactor effsize knitr psych shiny xtable]; }; conditionz = derive2 { name="conditionz"; version="0.1.0"; sha256="0ijnsg6n3p3y8y9il012xg5if57hdzvrgxjcykfrrlil4m7ixn6c"; depends=[R6 uuid]; }; condusco = derive2 { name="condusco"; version="0.1.0"; sha256="0zydinzlksynkz4r712rzv9qqdx8dkdz3h1ygi9cfmd6hya3580s"; depends=[assertthat bigrquery DBI jsonlite]; }; condvis = derive2 { name="condvis"; version="0.5-1"; sha256="1ngxqfa0mr86cv610da4ljypxpdvx0n5pfgj3zfksnwxlwc0dvbj"; depends=[MASS]; }; condvis2 = derive2 { name="condvis2"; version="0.1.0"; sha256="1xvxqr311wwi8ns31zqnxxb7bji3vl296j3qfq7vh0alxlhd4n4r"; depends=[cluster DendSer ggplot2 kmed plyr RColorBrewer scales shiny]; }; coneproj = derive2 { name="coneproj"; version="1.14"; sha256="0km7njsxjgrv4d8bx709nci59ngm00jg1r55702yapyjl0f2zg93"; depends=[Rcpp RcppArmadillo]; }; - conf = derive2 { name="conf"; version="1.6.2"; sha256="0q5cs0m2r0pickx2w27nq01rshfzfrxj95lxic1r2lyblf06hqgz"; depends=[fitdistrplus pracma STAR statmod]; }; + conf = derive2 { name="conf"; version="1.6.3"; sha256="0i8ayn47jli06d76y5a7n087zj7ag6hhjwq5xi109jbfynzxv1h0"; depends=[fitdistrplus pracma STAR statmod]; }; conf_design = derive2 { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; }; confSAM = derive2 { name="confSAM"; version="0.2"; sha256="1l67ndya07hh0yqfbabfhsvp3hryklx0022grpr0cb7ff88d1zam"; depends=[]; }; confidence = derive2 { name="confidence"; version="1.1-2"; sha256="0m6iz59n5jpi0ig3za3nir4d4bdsysf5g47d2nakfmaz03wk520z"; depends=[ggplot2 knitr markdown plyr xtable]; }; @@ -6278,30 +6342,33 @@ in with self; { configural = derive2 { name="configural"; version="0.1.1"; sha256="0xn52lg0fzd0m0k9sw90lv8vzhlp6knaya4crzl6rhfihyv9bq3m"; depends=[cli crayon dplyr stringr]; }; confinterpret = derive2 { name="confinterpret"; version="1.0.0"; sha256="0qldaqpx7kpk71zfwv465jrscwzc9w3xfv52i4h01k9aw3q6m8ja"; depends=[]; }; conflicted = derive2 { name="conflicted"; version="1.0.4"; sha256="0xp04cdvmp3b1phazhmjqn0vmax1b2218xsb5854ffv43m7qvrra"; depends=[memoise rlang]; }; + conflr = derive2 { name="conflr"; version="0.1.1"; sha256="1bjdmvi0n8746g7dxwgzh3fi33sq4bgfr0nd3nqd2caj8ryi2gv9"; depends=[askpass commonmark curl glue httr knitr miniUI purrr R6 rlang rmarkdown rstudioapi shiny stringi xml2]; }; conformalClassification = derive2 { name="conformalClassification"; version="1.0.0"; sha256="03v6xbgipb97byarqj0d38z9yb2g54mkkw343jxmi2j058z26yw7"; depends=[doParallel foreach mlbench randomForest]; }; confoundr = derive2 { name="confoundr"; version="1.2"; sha256="000vf828qv04pplx8yc8q3mafxf4g0axip6z5zbsj2581yxv9jjh"; depends=[dplyr ggplot2 gridExtra magrittr purrr rlang Rmpfr scales stringr tidyr]; }; - confreq = derive2 { name="confreq"; version="1.5.4-3"; sha256="1jn9v9z04a2yni4l3i7969kzzpgaxkdfdggi74dgp3jchda6vip7"; depends=[gmp]; }; + confreq = derive2 { name="confreq"; version="1.5.5-0"; sha256="1aww0i9mh08y05941di40f9jagy7s48rw0cs7w55gsyffl5yy1ir"; depends=[gmp]; }; congressbr = derive2 { name="congressbr"; version="0.2.2"; sha256="1br6bhfy0i0ashz9dpv63ag2d4yqvpl7ml82hsf15gjq6mwvr1nr"; depends=[dplyr glue httr janitor lubridate magrittr progress pscl purrr stringi stringr tibble tidyr xml2]; }; conicfit = derive2 { name="conicfit"; version="1.0.4"; sha256="1d704xgiyqmbwfxnsmhqg885x10q8yqxmrk4khqpg3lh696bw97d"; depends=[geigen pracma]; }; conics = derive2 { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; }; conjoint = derive2 { name="conjoint"; version="1.41"; sha256="1iq3226a6fn1gddmh2nxlzvjcvbj7502r9520g9d4xdmk8smfx33"; depends=[AlgDesign broom cluster fpc ggfortify ggplot2]; }; - conjurer = derive2 { name="conjurer"; version="1.0.0"; sha256="0mhdl6wwvdjgal0qagyqlfs7fa0fnm24hg452dmszy85crk832dm"; depends=[]; }; - connections = derive2 { name="connections"; version="0.1.0"; sha256="1jkk9s3w6d3751hb2y4d2lilndhpfs2alqgg6k23q7bav6848wyp"; depends=[DBI dbplyr dplyr pins rscontract uuid]; }; + conjurer = derive2 { name="conjurer"; version="1.1.1"; sha256="0rxbmr2s270sy7rbyb876sidbcjzv0g99s1n0w6pd6aymmf0715c"; depends=[]; }; + connections = derive2 { name="connections"; version="0.1.1"; sha256="08fbyzyp26nh1a46p0zi3q0wzgl0cd9bjp4lhw2bwv1bv7yayamp"; depends=[DBI dbplyr dplyr pins rscontract uuid]; }; conover_test = derive2 { name="conover.test"; version="1.1.5"; sha256="0f1p10klidk1xic1wd48j9rjh2fb3z6pfjx4y021lglx1w3av68k"; depends=[]; }; - conquestr = derive2 { name="conquestr"; version="0.3.7"; sha256="13pkbgw0z2icpc2l16g1wy92bbhmrk3l0jfhvh0sa8zj5idw35z1"; depends=[]; }; + conquer = derive2 { name="conquer"; version="1.0.0"; sha256="0yqk3hl0rgb71zywc8lvvdrhmzh7aij6gqk83pf3ywd69va0mq38"; depends=[matrixStats Rcpp RcppArmadillo]; }; + conquestr = derive2 { name="conquestr"; version="0.5.1"; sha256="1ha2jxh4xi39w4cznbdbbdhq5s5csmbf4p4j7blr80g72b46jvcp"; depends=[Rcpp reshape]; }; constants = derive2 { name="constants"; version="0.0.2"; sha256="1j9d52riwx7v1ppfdw0x517j7xh92qgskd4mj5yk9qa233brcwyy"; depends=[]; }; constellation = derive2 { name="constellation"; version="0.2.0"; sha256="1d49rnyf2z3bvx158nsmgmb0x7xcgxl9f8y98pwg5wlqck7af99q"; depends=[data_table]; }; constrainedKriging = derive2 { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; }; - contact = derive2 { name="contact"; version="1.0.1"; sha256="16dqvfkdckd59yx48s3qv5iz1jn087v4m93yjzmmvv78agqdi1m2"; depends=[ape data_table geosphere igraph lubridate raster rgdal rgeos sf sp]; }; + contact = derive2 { name="contact"; version="1.2.2"; sha256="0pxjz6wra5kb2z5xahsdlnfhbiybr2dmp818vfvbrb0sp9ca4wkc"; depends=[ape data_table doParallel foreach geosphere igraph lubridate raster rgdal rgeos sf sp]; }; container = derive2 { name="container"; version="0.3.0"; sha256="128fj97mx52kap299fmhn3whnaismsd4cq3zqpbfvwxx2ii4fd33"; depends=[R6]; }; - contextual = derive2 { name="contextual"; version="0.9.8.2"; sha256="03123mghmixy9v2c5lqg0df5ycxa09mir94rkjgs8lp62ncq170r"; depends=[data_table doParallel foreach Formula iterators itertools R_devices R6 rjson]; }; + contextual = derive2 { name="contextual"; version="0.9.8.3"; sha256="0mpbbg13ba5lwsh6rcy5g8vbfycv3182bqkgw66rn3r8fvkmy516"; depends=[data_table doParallel foreach Formula iterators itertools R_devices R6 rjson]; }; contfrac = derive2 { name="contfrac"; version="1.1-12"; sha256="0sq5c7ny235yrkv2xc4insgxby6rvzc1qsj8h301cd2if3lwbgwm"; depends=[]; }; conting = derive2 { name="conting"; version="1.7"; sha256="08f271j3gxcp4shda08kkv0v9ayaadvxgcglfsn6hjmw4hn298zg"; depends=[BMS coda gtools mvtnorm tseries]; }; contoureR = derive2 { name="contoureR"; version="1.0.5"; sha256="1izq1alkf24zd2sf2ir2adyrkwhdj7n89cv6z0dfh5mfqld5bkdn"; depends=[geometry plyr Rcpp reshape]; }; - contrast = derive2 { name="contrast"; version="0.21"; sha256="1fgm6qm3svqg8ryq2kd1h9z6f3ni8kki7gl3izvjw6wir97ph8nw"; depends=[geepack Hmisc MASS nlme rms sandwich]; }; + contrast = derive2 { name="contrast"; version="0.22"; sha256="11zz59dn63gpn455ryp0cmrx32li30yylf6ldrmw1wnn0zq702ww"; depends=[nlme rms sandwich]; }; contribution = derive2 { name="contribution"; version="0.1.0"; sha256="06y6qa7c0zifg6fqfpwry4z367ckiyk9v09n8cqc6q98c3ddkwj3"; depends=[dplyr ggplot2 gh magrittr rlang tidyr]; }; control = derive2 { name="control"; version="0.2.5"; sha256="02s8h5kwpzfrivx3ign84gwlybkcs03ibawyxdny9zz5yhb7x3bs"; depends=[expm Matrix pracma signal]; }; controlTest = derive2 { name="controlTest"; version="1.1.0"; sha256="19r8nvi35ldzgayifskjj706fv76hv6sj68yvggybp27rgyqbjfl"; depends=[survival]; }; + convergEU = derive2 { name="convergEU"; version="0.4.2"; sha256="1zdfhfzpgpjx24gzz9cn98nbn42c7r5iq2fr6bwpn1lniw3hgx27"; depends=[broom caTools devtools dplyr eurostat formattable ggplot2 ggpubr gridExtra kableExtra knitr magrittr purrr readr readxl rlang rmarkdown stringr tibble tidyr tidyverse]; }; convertGraph = derive2 { name="convertGraph"; version="0.1"; sha256="1jsrygj6ydzc0nzyzaq95j4blqavj7dqz182vgm1ckv8an3if0jx"; depends=[]; }; convertr = derive2 { name="convertr"; version="0.1"; sha256="1y9aq5in2qv1323amblmq3g22flpqvpkgkrw12kahg56mqf2b3iq"; depends=[DT miniUI rstudioapi shiny]; }; convevol = derive2 { name="convevol"; version="1.3"; sha256="1b0lygbrdm6rqascck5iwjnm248lklc4cxr71qlgand5jsblpcnn"; depends=[ape cluster geiger MASS phytools]; }; @@ -6313,19 +6380,19 @@ in with self; { coop = derive2 { name="coop"; version="0.6-2"; sha256="052n2h7yhjj88x87sd3ci9ahhhn5r5rvsm79kh3r2zqbxsr8zzrh"; depends=[]; }; coopProductGame = derive2 { name="coopProductGame"; version="2.0"; sha256="1348pgqfvvysdixsjibgkvwjsmqasnlmwf9kyr39lw8jb81z25h0"; depends=[dplyr GameTheory ggplot2 gtools kappalab lpSolveAPI]; }; cooptrees = derive2 { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[gtools igraph optrees]; }; - copBasic = derive2 { name="copBasic"; version="2.1.4"; sha256="0bcnpqc54lxgnxr6zgp2rz8vcbsicnjcs3vs3lsdhymlxifps7la"; depends=[lmomco randtoolbox]; }; + copBasic = derive2 { name="copBasic"; version="2.1.5"; sha256="0p7ngjpfhl4mjrcjmadik2ly5zzyjfafywjmaxza7frgrj6bflf4"; depends=[lmomco randtoolbox]; }; copCAR = derive2 { name="copCAR"; version="2.0-2"; sha256="032gphv64v2mmy63q86qgpa31i36ix6fkjsdxmzgqyxcyzgb0jcy"; depends=[mcmcse numDeriv Rcpp RcppArmadillo spam]; }; cope = derive2 { name="cope"; version="0.2.3"; sha256="1r02nb6wy25ixhdcbqqz167s7ny3hydpxfxry5ar4136qvcamgyy"; depends=[abind fields maps MASS Matrix mvtnorm nlme]; }; + copent = derive2 { name="copent"; version="0.1"; sha256="100mkig645gis01w7cbr1hyn7kmiwi5avmwknymimchqwyf026m6"; depends=[]; }; coppeCosenzaR = derive2 { name="coppeCosenzaR"; version="0.1.3"; sha256="1chwsfyaf5rmlsypr43n7px8b2220dfa5mzcriq1swylgbx4181l"; depends=[]; }; coprimary = derive2 { name="coprimary"; version="1.0"; sha256="0pjln9p5lzv6wl5xrz0kb90hnjlnp7ch2kvh054nxdbmlxv5akc3"; depends=[digest gsDesign plyr proto]; }; cops = derive2 { name="cops"; version="1.0-2"; sha256="0ifp3cai490lw6dnyyjj4822x8g2mswhaamnw5ljwnxdbmjwhhrw"; depends=[cmaes cordillera crs dfoptim GenSA MASS minqa NlcOptim nloptr pso rgenoud rgl Rsolnp scatterplot3d smacof subplex]; }; - copula = derive2 { name="copula"; version="0.999-19.1"; sha256="0bk92fx71282dx0whwv4rsfchw7pm7axicrl3r6f3gm4rlldf68r"; depends=[ADGofTest colorspace gsl lattice Matrix mvtnorm numDeriv pcaPP pspline stabledist]; }; + copula = derive2 { name="copula"; version="0.999-20"; sha256="1c0gbjfhvm839cdmy7n15an9jg6qygdq8bvp9awhbjysway4fgbx"; depends=[ADGofTest colorspace gsl lattice Matrix mvtnorm numDeriv pcaPP pspline stabledist]; }; copulaData = derive2 { name="copulaData"; version="0.0-1"; sha256="1s917g8wasxndg1xq4b4fjaq29nyzzigpflgqcy4rxdb7r54dl0z"; depends=[]; }; copulaedas = derive2 { name="copulaedas"; version="1.4.3"; sha256="01wp8jnz7kndknj7lh9ia7mm41k1vbaksalyy9v19bb77yhgzmba"; depends=[copula mvtnorm truncnorm vines]; }; corHMM = derive2 { name="corHMM"; version="1.22"; sha256="03di9250hjn5fiwn47f0pr4zprmsza4if3xpmy3j1czahc8zlqnj"; depends=[ape corpcor expm GenSA nloptr nnet numDeriv phangorn Rmpfr]; }; corTest = derive2 { name="corTest"; version="0.9.8"; sha256="03dhy84a7caf030br9ybr5zxfq49y72gwj462ay245b09k4f2v3r"; depends=[MASS]; }; corTools = derive2 { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; }; - corclass = derive2 { name="corclass"; version="0.1.1"; sha256="0ai8si992f58mrvc8hq598zbw9d4jslnc96lpzj5d89lljjv3hf5"; depends=[igraph]; }; cord = derive2 { name="cord"; version="0.1.1"; sha256="18xj6cwmx1a7p3vqx5img8qf8s75nc6pcv78v15j081pgn786ma5"; depends=[Rcpp RcppArmadillo]; }; cordillera = derive2 { name="cordillera"; version="0.8-0"; sha256="0cpysfivwmim36gcqn1i7450a33hv4pdbvil7syb0hr7vdm083dd"; depends=[dbscan yesno]; }; coreCT = derive2 { name="coreCT"; version="1.3.2"; sha256="0xxcgd5qar9fwhyzs5g3fc45naca4xmcgmw88ygav02vv5y93w03"; depends=[igraph oro_dicom plyr raster]; }; @@ -6335,26 +6402,29 @@ in with self; { corehunter = derive2 { name="corehunter"; version="3.2.1"; sha256="0cxvhmi768kz3q8hydb6y9nqvc8hvkmq8nc5yfry4k94whk12wax"; depends=[naturalsort rJava]; }; corkscrew = derive2 { name="corkscrew"; version="1.1"; sha256="1nb81r4lsrajcj3xz3f7p6xznnb38yg3rnnh44rd3kabca4d8r1s"; depends=[ggplot2 gplots igraph RColorBrewer]; }; corlink = derive2 { name="corlink"; version="1.0.0"; sha256="06n9pcvbn8y9gy0mn9c0sw05424ss8smpaw3ly6a785cmj3d9b6m"; depends=[]; }; - cornet = derive2 { name="cornet"; version="0.0.3"; sha256="0f0fwyz2kp59xb4a7kxa66h0y9940fba56dlyncin5szr5nhfrpp"; depends=[glmnet palasso]; }; + cornet = derive2 { name="cornet"; version="0.0.4"; sha256="0chp7ifcc0a9dz6ang4wjiwj7q309g9nsgyql6qmml985d8bazcy"; depends=[glmnet palasso]; }; coroICA = derive2 { name="coroICA"; version="1.0.1"; sha256="0hjy1sdii8kk859bj1xv3vh1hzxznhymhgdb583z57i0hqxnijiv"; depends=[MASS]; }; + coronavirus = derive2 { name="coronavirus"; version="0.1.0"; sha256="19im0kb6pv8czbq3h675nhfa1r6jj9whi2mq2wi3ldnzfa925bqw"; depends=[]; }; corpcor = derive2 { name="corpcor"; version="1.6.9"; sha256="1hi3i9d3841snppq1ks5pd8cliq1b4rm4dpsczmfqvwksg8snkrf"; depends=[]; }; corpora = derive2 { name="corpora"; version="0.5"; sha256="0b4yw37msx9h8hf5mjs4h10gdmc1qc2gv5bzyj1r90n4gcli042d"; depends=[]; }; - corporaexplorer = derive2 { name="corporaexplorer"; version="0.8.0"; sha256="0rn35wqi4bb90k440dk1sm862azx3pfgc2d6z489fdqq7xsjnk3a"; depends=[data_table dplyr forcats ggplot2 lubridate magrittr padr plyr RColorBrewer re2r rlang rmarkdown scales shiny shinycssloaders shinydashboard shinyjs shinyWidgets stringi stringr tibble tidyr zoo]; }; - corpus = derive2 { name="corpus"; version="0.10.0"; sha256="0c984rsnbai2qrm2s10lkdfgx31m0ax46zhl74bns2bxfmagcn3l"; depends=[utf8]; }; + corporaexplorer = derive2 { name="corporaexplorer"; version="0.8.2"; sha256="14l64mcqfa2ayyl6d48s9fc2qh485wk02s23cy4nssn7sg1b3a5z"; depends=[data_table dplyr ggplot2 lubridate magrittr padr plyr RColorBrewer rlang rmarkdown scales shiny shinydashboard shinyjs shinyWidgets stringi stringr tibble tidyr]; }; + corpus = derive2 { name="corpus"; version="0.10.1"; sha256="1mcjn6jsrvyxwcf8kx86fy7z0zsarvq6ccja3r27v7b8fjrb8mng"; depends=[utf8]; }; corpustools = derive2 { name="corpustools"; version="0.4.2"; sha256="00v61i4c43s69mchy5zkbxgvxjx8kqlzm2vcb7snjblmd84w4id5"; depends=[data_table digest igraph Matrix quanteda R6 Rcpp RcppProgress RNewsflow SnowballC stringi tokenbrowser udpipe wordcloud]; }; corr2D = derive2 { name="corr2D"; version="1.0.0"; sha256="12k6vbqyb33kfj2xdg8rbydnp2yk15kv4b0m4lid4gf2lqmy3jwz"; depends=[colorspace doParallel fields foreach mmand profr rgl xtable]; }; corrDNA = derive2 { name="corrDNA"; version="1.0.1"; sha256="1mfjrzpcb63ydyj1yxa0wd3vh4z0rdwsqv09w0a0l4l7mhb5jz2k"; depends=[mvtnorm]; }; corrcoverage = derive2 { name="corrcoverage"; version="1.2.1"; sha256="0r5n2g341jlinwrxxwxkav9i6qsf097pmfi07aiq663b13r3864x"; depends=[data_table magrittr matrixStats Rcpp RcppArmadillo]; }; correctedAUC = derive2 { name="correctedAUC"; version="0.0.3"; sha256="0c2kq7asq5mp48p8niqb84wnw4q2q2985wxbrywrhsszm9p3xspb"; depends=[ICC mnormt]; }; corregp = derive2 { name="corregp"; version="2.0.2"; sha256="1v048dibn2x3y5mi2damcsr9i5kdig5n53g5j9gf31lqkzzjmnh3"; depends=[data_table diagram ellipse gplots rgl]; }; + correlation = derive2 { name="correlation"; version="0.2.0"; sha256="0ckwpsvpnv7caz8pgxy5cf2pfhgvkgd29jm3vwan5nbyjwhgc9nb"; depends=[bayestestR effectsize insight parameters]; }; correlationfunnel = derive2 { name="correlationfunnel"; version="0.1.0"; sha256="0kg770nfr1cd31b8y8g1kx046k401lha9hbj7lq543gl7s77aw2x"; depends=[cli crayon dplyr forcats ggplot2 ggrepel magrittr plotly purrr recipes rlang rstudioapi stringr tibble tidyr]; }; correlbinom = derive2 { name="correlbinom"; version="0.0.1"; sha256="1ix3ccxzr7vqblbda5awsva3h95b69v7kc6adz622bbi8r36xxcq"; depends=[Rmpfr]; }; corrgram = derive2 { name="corrgram"; version="1.13"; sha256="1g5159vihsz5a2cfmg4g4i1lildn2x2wzck5sd0vml5810rxjpma"; depends=[seriation]; }; corrplot = derive2 { name="corrplot"; version="0.84"; sha256="1k03qd8db7pwg1v318xapx5mpiypiz2n07qr19c4b45diri5xkhd"; depends=[]; }; - corrr = derive2 { name="corrr"; version="0.4.0"; sha256="0zjqkgsnwgcyi8hdskr7in0liqhpj9qml96agawzj11iy0bf6387"; depends=[dplyr ggplot2 ggrepel purrr rlang seriation tibble]; }; + corrr = derive2 { name="corrr"; version="0.4.2"; sha256="1mk6vvsmankrc6m5rm3y58wblsbyqar6js36c73x5g3fs95s58fj"; depends=[dplyr ggplot2 ggrepel purrr rlang seriation tibble]; }; corrsieve = derive2 { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; }; corset = derive2 { name="corset"; version="0.1-4"; sha256="0ladyqvkys4cldvbhkii9jwn1k5p1ym2g5bgdlz1hq1sv30ixn2f"; depends=[]; }; - corto = derive2 { name="corto"; version="0.99.10"; sha256="0ss28d0fi30waywgz47j7vxqqxxgiixk4qandlvaxjyik3yy0n4g"; depends=[dplyr knitr pbapply rmarkdown]; }; + cort = derive2 { name="cort"; version="0.3.0"; sha256="1krb3d0g060b9a5a3pb782vd632lfncbxbmcvh6q21as0flm2hpv"; depends=[furrr magrittr nloptr osqp purrr Rcpp Rdpack]; }; + corto = derive2 { name="corto"; version="1.0.8"; sha256="0p9issdhi5iz7fjc0qc3s3vp286j1b3aydjvj273zcjshjhc27ia"; depends=[dplyr knitr pbapply plotrix rmarkdown]; }; corx = derive2 { name="corx"; version="1.0.2"; sha256="1k9k1w5i5yky6c9jn5s80rf0r5r6qn7w0xwamjbankp2i4ryna5z"; depends=[clipr crayon ggcorrplot glue moments ppcor psych tidyselect]; }; cosa = derive2 { name="cosa"; version="2.0.0"; sha256="1ra1m75ay829xlhjax82px4ffflnfgh2mrmzzj4i8ml545d9hmgr"; depends=[msm nloptr]; }; cosinor = derive2 { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; }; @@ -6363,7 +6433,7 @@ in with self; { cosso = derive2 { name="cosso"; version="2.1-1"; sha256="1wyq27qak0kz4bbzynm24r5ksvb6ddd43h2ykh6m935xck16blyb"; depends=[glmnet quadprog Rglpk]; }; costat = derive2 { name="costat"; version="2.4"; sha256="0c47bklqjgjmdglw3mi9lvygwjr5w6i1zv91ll3vpnl5dnay0692"; depends=[wavethresh]; }; costsensitive = derive2 { name="costsensitive"; version="0.1.2.10"; sha256="192q55123yzcjjh4047ppxa3h7gk9afqnvm1nlhzs4ccqz71g411"; depends=[]; }; - cotram = derive2 { name="cotram"; version="0.1-1"; sha256="0rjwx94gpdndpwagy2wdjdvr5b8n8qrjv9yjyxph9xw533paiz49"; depends=[basefun mlt tram variables]; }; + cotram = derive2 { name="cotram"; version="0.2-0"; sha256="1jp3qmypgbdyilxf3x93pzrw36ha9xd66n8bmv38q4hkhha3z8ar"; depends=[basefun mlt tram variables]; }; cotrend = derive2 { name="cotrend"; version="1.0.2"; sha256="17h67vnpnlv11bf3ka5mlnah9bizxjhvicsvbygy91dqbhjhj9wb"; depends=[xts]; }; couchDB = derive2 { name="couchDB"; version="1.4.1"; sha256="1n99amvnsjp88y091603hjsvp243c5i6dbrsvdjfmzgj5dsrv70m"; depends=[bitops httr RCurl rjson]; }; countHMM = derive2 { name="countHMM"; version="0.1.0"; sha256="12z0nz7in2msb5wa5yyjxx19ih8psw06m7xwlapvjksslippp6gs"; depends=[]; }; @@ -6372,7 +6442,7 @@ in with self; { countcolors = derive2 { name="countcolors"; version="0.9.1"; sha256="1gnwmw3inh8asbk6qba34vzx1k2cnh4m9d1346gxhzhlxvl6xiza"; depends=[colordistance jpeg png]; }; countfitteR = derive2 { name="countfitteR"; version="1.0"; sha256="1kb7na35xk257a6bd9ihgbn13ygn5s553s9nph0hg7iw5nikknap"; depends=[ggplot2 MASS shiny]; }; countgmifs = derive2 { name="countgmifs"; version="0.0.2"; sha256="0k6fjg0v9n7vi89wd025gdjh1q3l6nnc5yn8i2bfw0i5vmv8rhi3"; depends=[MASS]; }; - countrycode = derive2 { name="countrycode"; version="1.1.0"; sha256="1pmv2jxr1ydgv8r5n20s5z80hdmzgvhm4cxdqhbkf7nfyipwl8xl"; depends=[]; }; + countrycode = derive2 { name="countrycode"; version="1.1.2"; sha256="0ha2qmsmdrb6dkw62srcl1jxljkhh67jaj96ypz91c0sqz11zjjf"; depends=[]; }; countyfloods = derive2 { name="countyfloods"; version="0.1.0"; sha256="0ld8p8dfk9khvwffbn8sad0j3an25s7cvbi6jxljgx4zc6ldh699"; depends=[dataRetrieval dplyr ggplot2 lubridate maps plyr R_utils tidyr]; }; countytimezones = derive2 { name="countytimezones"; version="1.0.0"; sha256="0sk22fmz9d3wvlfvjl1xdavvl04q1ywy8ww2gi5am3yiizkf0v9w"; depends=[dplyr lubridate]; }; countyweather = derive2 { name="countyweather"; version="0.1.0"; sha256="0q56bnh9x6jyj1sdd1q4yv2n774mbv268pgp285bjybgqm2pyisz"; depends=[dplyr geosphere ggmap ggplot2 lubridate purrr raster rnoaa sp stringi tibble tidyr tigris]; }; @@ -6381,28 +6451,32 @@ in with self; { covRobust = derive2 { name="covRobust"; version="1.1-3"; sha256="0zcfala4l0j4w0sx5hlw40vxiypans3d7pgkxy25nj0d2m1jkvba"; depends=[]; }; covTestR = derive2 { name="covTestR"; version="0.1.4"; sha256="0j9kay8lwkhpdyg0fbfars1m58v0i58v1v5sm7m72s7kz8qh2yfs"; depends=[purrr Rcpp RcppArmadillo rlang]; }; covafillr = derive2 { name="covafillr"; version="0.4.4"; sha256="1vsay0qlqcw3l6xp18rxrkhwsadsv9rpxwpj9f4d3vlr8inkiv4h"; depends=[Rcpp RcppEigen]; }; - covatest = derive2 { name="covatest"; version="1.1.1"; sha256="0fnm3ljk4my3xinv0qswi57l51z0j6cva7by00p8f5992hhk3sn9"; depends=[gstat lubridate matrixcalc sp spacetime zoo]; }; - coveffectsplot = derive2 { name="coveffectsplot"; version="0.0.4"; sha256="0lx42f86w5z7i0p2z5kwrm8rbcm4vriaagfhpixc8n7aq6mkb7bl"; depends=[colourpicker dplyr egg ggplot2 ggstance markdown shiny shinyjs tidyr]; }; + covatest = derive2 { name="covatest"; version="1.1.2"; sha256="08cff9ppw94r7bicgc4hrcgymslgn390hw26z7xnhdgfj7swq1nn"; depends=[gstat lubridate matrixcalc sp spacetime zoo]; }; + coveffectsplot = derive2 { name="coveffectsplot"; version="0.0.9"; sha256="1nz7r2fqmfgfg37dcnifljm22ifipjydfcvf2dl03d10av67c0cn"; depends=[colourpicker data_table dplyr egg ggplot2 ggstance markdown shiny shinyjs table1 tidyr]; }; covequal = derive2 { name="covequal"; version="0.1.0"; sha256="1qj6djqf1rnjmnaz1nryj9dc104082w258dzjjp5q18gg1ck8v0c"; depends=[corpcor RMTstat]; }; covfefe = derive2 { name="covfefe"; version="0.1.0"; sha256="178qc77y4bn04qad3g70wr8y4v0ggyg807w67m8wvhbcxqr8yq7c"; depends=[tokenizers]; }; - covglasso = derive2 { name="covglasso"; version="1.0"; sha256="1i5k61jivmipzpk53hpab9vnc57rnyl24jy503lnk5r1plb9w93i"; depends=[Rcpp RcppArmadillo]; }; - covr = derive2 { name="covr"; version="3.4.0"; sha256="0p44kr6yz5sqza5zvq6divqglzkpv0if9pjpjmzhmdaaddjrqzg5"; depends=[crayon digest httr jsonlite rex withr yaml]; }; + covglasso = derive2 { name="covglasso"; version="1.0.1"; sha256="1wyh5f7rhwrk042wcr31db4v0wpd12kxwfg1qqszdg3jq6xbyz25"; depends=[Rcpp RcppArmadillo]; }; + covid19_analytics = derive2 { name="covid19.analytics"; version="1.0.1"; sha256="1lig3sdx6a9r2b1mz3ichm0scjb9akaar0qziq7vsfp8ynsgb11r"; depends=[ape deSolve gplots htmlwidgets pheatmap plotly]; }; + covid19france = derive2 { name="covid19france"; version="0.1.0"; sha256="11072mc794l0m84k2b08zhyfvxf6n6ym91i7kkm3cbirxp6bhnqy"; depends=[dplyr glue lubridate magrittr readr stringr tidyr]; }; + covid19italy = derive2 { name="covid19italy"; version="0.1.0"; sha256="1wd4f97gmw7l9zc0dpfwxii8gfhnwhk0c04gjvwk9xjdp5psx5gb"; depends=[devtools]; }; + covid19us = derive2 { name="covid19us"; version="0.1.2"; sha256="13sj6pz81czima6n5zi1vdbzjbxa37nc6l6md3ix6w9rdhiajfbg"; depends=[curl dplyr glue httr lubridate magrittr purrr snakecase stringr tibble tidyr]; }; + covr = derive2 { name="covr"; version="3.5.0"; sha256="1pvr95h7jg9hqq1qq1cccy323pkxldrwafl08151cc410499k4fb"; depends=[crayon digest httr jsonlite rex withr yaml]; }; covreg = derive2 { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; }; covsep = derive2 { name="covsep"; version="1.1.0"; sha256="19dvwhl85yx9ddwxvnq5sdd534s6llcw61gckrav48hq49x1bqld"; depends=[mvtnorm]; }; cowbell = derive2 { name="cowbell"; version="0.1.0"; sha256="1zz0g30zvqfk5lh09y90iq3s7x2wwbs852i3d56mfp926gxdxc2y"; depends=[ggplot2 misc3d rgl]; }; cowplot = derive2 { name="cowplot"; version="1.0.0"; sha256="19cqdhgfyr1wj0fz0c5ly8f0aiy9sfgzq6lzb78hkx0hdp2agybh"; depends=[ggplot2 gtable rlang scales]; }; - cowsay = derive2 { name="cowsay"; version="0.7.0"; sha256="1f5hc1sj79yd3l2c6vrcj6xx2hdfxb16c3d2sgr7yps8j5fyrb9h"; depends=[crayon fortunes rmsfact]; }; + cowsay = derive2 { name="cowsay"; version="0.8.0"; sha256="12hximrdpikkczpwqjmah11nbwzyf7j1x7zcxa7igqwq8nfgv2yv"; depends=[crayon fortunes rmsfact]; }; coxed = derive2 { name="coxed"; version="0.3.2"; sha256="1pj0w7a40zmnsmvlqi8kxa4psyijqwwjyjmvcvbs9xylqlwna6ih"; depends=[dplyr ggplot2 gridExtra mgcv PermAlgo rms survival tidyr]; }; coxinterval = derive2 { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[Matrix survival timereg]; }; coxme = derive2 { name="coxme"; version="2.2-16"; sha256="04aid8v0y2afwwbfm39np1pgdla4jw427gy2wazsphf495b4pkm0"; depends=[bdsmatrix Matrix nlme survival]; }; - coxmeg = derive2 { name="coxmeg"; version="1.0.9"; sha256="19p2j6i34jg6akfyr6hv2xmashpsvf8y5bbql6a62b3f5yz5639v"; depends=[coxme MASS Matrix matrixcalc microbenchmark nloptr rARPACK Rcpp RcppEigen SNPRelate]; }; + coxmeg = derive2 { name="coxmeg"; version="1.0.10"; sha256="00gp0a7fx7xjk6wccrmwywgvxk8bcdqv9ph1z53qx8mqxyqnz4g6"; depends=[coxme MASS Matrix matrixcalc microbenchmark nloptr rARPACK Rcpp RcppEigen SNPRelate]; }; coxphMIC = derive2 { name="coxphMIC"; version="0.1.0"; sha256="0lmma5wzcczr762xqa4yamvwvyviqxk8gdrps3sydg3n14hckp6d"; depends=[numDeriv survival]; }; coxphSGD = derive2 { name="coxphSGD"; version="0.2.1"; sha256="17ga33v7a89dsygk5yypkz03x7dvjhibnwlvwfvgb2p7djd8w465"; depends=[survival]; }; coxphf = derive2 { name="coxphf"; version="1.13"; sha256="16bman8xv5xx7gg8s54sj3hc4isqxk4h3q93h4q3h3j0bdvww2yy"; depends=[survival]; }; coxphw = derive2 { name="coxphw"; version="4.0.1"; sha256="116dp6zispa8k7y6jrn4v9ipf0jqdhj68w9qqc2qwcapawvrd0nh"; depends=[survival]; }; coxrobust = derive2 { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; }; coxrt = derive2 { name="coxrt"; version="1.0.3"; sha256="1xggczjx5psl4m4m83vh4y6swnh3pf9rngnzx3268iznfz1g43h2"; depends=[BB ggplot2 gss inline Rcpp RcppArmadillo survival]; }; - coxsei = derive2 { name="coxsei"; version="0.1"; sha256="1agr0gmyy1f2x6yspj04skgpi1drpbc1fcbwhhhjsz1j6c64xagy"; depends=[]; }; + coxsei = derive2 { name="coxsei"; version="0.3"; sha256="1k3xsjwv1ji8n2qry2j93svr8a114mxkdl5y2zwz7mp82dmv0ld6"; depends=[]; }; cp4p = derive2 { name="cp4p"; version="0.3.6"; sha256="1zddkkj0ynvfck3kw1682wffbxw0d3dc4flmxxp03lclq70fc8bd"; depends=[limma MESS multtest qvalue]; }; cpa = derive2 { name="cpa"; version="1.0"; sha256="14kcxayw4cdbjfa6bvfzqp8flwc0sr3hmh2dnr1dfax0hnccd71m"; depends=[]; }; cpca = derive2 { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhfmdg4rd1s6pfqrdl7bwbcmq4lqf"; depends=[]; }; @@ -6414,6 +6488,7 @@ in with self; { cplots = derive2 { name="cplots"; version="0.4-0"; sha256="1k4kazw7lw2d991brnzhma6qvg8kwslrbi9q4gy61x02wcig927n"; depends=[circular]; }; cpm = derive2 { name="cpm"; version="2.2"; sha256="1n1iqhalp99mbh8jha0pv759fb97sqxdiiq9bxy3wm6aqmssvdb1"; depends=[]; }; cppRouting = derive2 { name="cppRouting"; version="2.0"; sha256="0yfiyg1clnl85lk5ah8dcchv71drk6r093vpl82xnczyan5z94sr"; depends=[data_table Rcpp RcppParallel RcppProgress]; }; + cppcor = derive2 { name="cppcor"; version="1.2"; sha256="0x55dx7q5mqqr3mhkkq9qs6gwfzrlgay9clasp9a736drmpgm6vb"; depends=[caret doParallel e1071 foreach gWidgets gWidgetsRGtk2 mvtnorm pacman]; }; cpr = derive2 { name="cpr"; version="0.2.3"; sha256="1a2lza1bw74xzrs17a9gr9mnpvnnrykhwd73yqi63wp3k4sm42rb"; depends=[dplyr ggplot2 lazyeval lme4 magrittr plot3D Rcpp RcppArmadillo rgl tibble tidyr]; }; cprr = derive2 { name="cprr"; version="0.2.0"; sha256="049xnma0rdnya7zp05iraq15nwjgmdmli9g7xxprab822047vld7"; depends=[]; }; cpsurvsim = derive2 { name="cpsurvsim"; version="1.2.0"; sha256="1fn88cqryji1syzhnx726m5svxnrlyynxk4jhp5ny8g3knai6nnk"; depends=[Hmisc knitr plyr]; }; @@ -6423,7 +6498,6 @@ in with self; { cqcr = derive2 { name="cqcr"; version="0.1.2"; sha256="11bcqr4bw11vjqdgddpfjb4dsk0dxdasddkp1g310l71vw7zaryg"; depends=[anytime dplyr httr jsonlite purrr rlang snakecase]; }; cqrReg = derive2 { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; }; cquad = derive2 { name="cquad"; version="2.1"; sha256="1cq57qd33cbzhgnnw4fk36xch0prwr9a404sxi7b4ijwgzw84d0h"; depends=[MASS plm]; }; - cr17 = derive2 { name="cr17"; version="0.1.0"; sha256="1zyq77gxycbwyqhv5w0zw4n7v3ipjs6rcbja43g0k5q8h0gjnnn1"; depends=[cmprsk dplyr ggplot2 gridExtra gtable scales survival]; }; cramer = derive2 { name="cramer"; version="0.9-3"; sha256="1kdad8nndhics4282gfy9ncllk2kpawdy8ybq71vcd7hc7kf0zq5"; depends=[boot]; }; crank = derive2 { name="crank"; version="1.1-2"; sha256="0wwbdh5sfi2bg13nrlkxxij4k053kjx9afm4gjpgs6iir6pml711"; depends=[]; }; cranlike = derive2 { name="cranlike"; version="1.0.2"; sha256="06xgxgwpmfrwmcd0gnr9prjjbhd1y0ky1zb8yh09v0bvsf6ixnyx"; depends=[DBI debugme desc RSQLite]; }; @@ -6436,19 +6510,20 @@ in with self; { crblocks = derive2 { name="crblocks"; version="1.0-0"; sha256="0y101kgi7ryjv18fyjp0ralp4qj7kgshmbd4mf7n3hdjay0znss5"; depends=[]; }; crch = derive2 { name="crch"; version="1.0-4"; sha256="18qjvh1lkw1f6rrhnb21f30xxrcq8whbs3x1jgkw6q14rf1483ri"; depends=[Formula ordinal sandwich scoringRules]; }; credentials = derive2 { name="credentials"; version="1.1"; sha256="0izwskymymkxdwsdj7zapqpkc6g37c0m6c2na0y00s1kwr73d2qd"; depends=[askpass curl jsonlite openssl sys]; }; + creditmodel = derive2 { name="creditmodel"; version="1.1.9"; sha256="19jgxckjyssvr6nv6vsqizm3rzn1m445a0bsk4kp57nggrpnyahs"; depends=[cli data_table doParallel dplyr foreach ggplot2 glmnet rpart xgboost]; }; credsubs = derive2 { name="credsubs"; version="1.0.1"; sha256="0n3684fxknvvs57g2vjqykgdjfbpl6242nd23sm9nv2fn57q8k2c"; depends=[]; }; credule = derive2 { name="credule"; version="0.1.3"; sha256="1vciqkxkf93z067plipvhbks9k9sfqink5rhifzbnwc2c5gxp5mx"; depends=[]; }; cregg = derive2 { name="cregg"; version="0.3.0"; sha256="08dhn4i5i27zw3ayqp7lkw5z8dzckv8fhflpvz0mphax34pm3z72"; depends=[ggplot2 ggstance lmtest sandwich scales survey]; }; - crevents = derive2 { name="crevents"; version="0.1.0"; sha256="0f8xa2dn1896523am61k1ajqgmn8v6k772van6d0lajlz7crmw2c"; depends=[crul jsonlite tibble]; }; crfsuite = derive2 { name="crfsuite"; version="0.3"; sha256="10mify8y1f6iwfckfrhhhw6j01p1cd9bq5xwcyz121wkfhnny6rx"; depends=[data_table Rcpp]; }; - cricketr = derive2 { name="cricketr"; version="0.0.22"; sha256="10dfzm297knwcqnznsprrwgrfa83hxqvr3px9mdgqj9q97c2bn3b"; depends=[dplyr forecast ggplot2 lubridate plotrix scatterplot3d XML]; }; + cricketr = derive2 { name="cricketr"; version="0.0.23"; sha256="0daxw2rdx4j1b4h557zhqlbbqbzdai5vzy3fal4mp6hgv350d5ks"; depends=[dplyr forecast ggplot2 httr lubridate plotrix scatterplot3d XML]; }; crimCV = derive2 { name="crimCV"; version="0.9.6"; sha256="14ckk88i7jk8a7kl51d7qfdis44jng6zz9zd72cdp80a57dvrvzq"; depends=[]; }; crimedata = derive2 { name="crimedata"; version="0.2.0"; sha256="073zlk9b4saz72d33z73mc9qzfk49bxwjhph6zbw27nl38k74j7d"; depends=[digest dplyr httr magrittr purrr readr sf stringr tibble]; }; crimelinkage = derive2 { name="crimelinkage"; version="0.0.4"; sha256="1zzk50kyccvnp51vzp28c9yi23hsp25arrgdn88lwfwa0m43rlar"; depends=[geosphere igraph]; }; crisp = derive2 { name="crisp"; version="1.0.0"; sha256="1gs8jnd9y9pd55w6kwv9mvmg3wd8hjiw3lwx7k242pxccsxklfxq"; depends=[MASS Matrix]; }; crmPack = derive2 { name="crmPack"; version="1.0.0"; sha256="11zy1ci9d0zjbmc0gws9j9qrnfcqvky1ws9p41wjn0zifcckc5gi"; depends=[GenSA ggplot2 gridExtra MASS mvtnorm rjags]; }; - crminer = derive2 { name="crminer"; version="0.2.0"; sha256="1rlh7bxk8bry2v9fnqzy0ph62dda1pzifksr7v4pmdyhji9mjw33"; depends=[crul hoardr jsonlite pdftools xml2]; }; - crmn = derive2 { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[Biobase pcaMethods]; }; + crmReg = derive2 { name="crmReg"; version="1.0.1"; sha256="1i3i4pd1ff7cmyd268p5kmncrk0lrq4q4cjhkhxbp2pah041q4wk"; depends=[FNN ggplot2 gplots pcaPP plyr robustbase rrcov]; }; + crminer = derive2 { name="crminer"; version="0.3.2"; sha256="1zq689dk13z0sjp8awjj8jqiw2vkdw70fpyadyis0yfqxyvnzcv5"; depends=[crul hoardr jsonlite pdftools xml2]; }; + crmn = derive2 { name="crmn"; version="0.0.21"; sha256="0wp99fsw7y859gp1x22f77r9rv1m0xspbzhzgshzf7hi86xb57k5"; depends=[Biobase pcaMethods]; }; crn = derive2 { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; }; crochet = derive2 { name="crochet"; version="2.2.0"; sha256="1cbv79nyycxk6f8ldcsnn2pvgxqlnrj0qs19nhafnq2clxy863k6"; depends=[]; }; cromwellDashboard = derive2 { name="cromwellDashboard"; version="0.5.1"; sha256="0d57c1wdd1ds9fr7p256la63qbv8mirljgrvl1k8fp5gcnkps5wb"; depends=[dplyr DT httr shiny shinydashboard stringr]; }; @@ -6460,13 +6535,12 @@ in with self; { crossdes = derive2 { name="crossdes"; version="1.1-1"; sha256="1d7lv3ibq1rwxx8kc3ia6l9dbz2dxdd5pnf2vhhjmwm448iamcfd"; depends=[AlgDesign gtools]; }; crossmatch = derive2 { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[nbpMatching survival]; }; crossrun = derive2 { name="crossrun"; version="0.1.0"; sha256="0br57nraqhs5f1cpidc8kd31izm82wvhiw9pxcdj9v51l9vifbmx"; depends=[Rmpfr]; }; - crosstalk = derive2 { name="crosstalk"; version="1.0.0"; sha256="0lfa89vhrzi7a1rghmygcjr8gzddw35sinb3jx6g49mc9jias7mk"; depends=[ggplot2 htmltools jsonlite lazyeval R6 shiny]; }; + crosstalk = derive2 { name="crosstalk"; version="1.1.0.1"; sha256="03ihj7cimkklrbad9zic78xsrfcisygmgy859hqnx0hiph80p9rn"; depends=[htmltools jsonlite lazyeval R6]; }; crossval = derive2 { name="crossval"; version="1.0.3"; sha256="0acpcisg6pkxblyc4j9hiri58h1rn7ay43p5ib5ia8a4a8bnfa4p"; depends=[]; }; crosswalkr = derive2 { name="crosswalkr"; version="0.2.6"; sha256="1rxd6vy7vdrawmg7zkydl1f2wwklnzgh9dsnxbg966xrr3l9x1n9"; depends=[haven labelled readr readxl tibble]; }; crossword_r = derive2 { name="crossword.r"; version="0.3.6"; sha256="1s31613s4qxxspka9bhgq3rq8xraf48mwfv6phvz6v06gijh64lr"; depends=[dplyr jsonlite magrittr R6 r6extended stringr]; }; - crov = derive2 { name="crov"; version="0.1.3"; sha256="0gvrki9ldm3yrnp6zx2awqg4p3pqjzv1088gn3nbg00j0i3s9m5h"; depends=[gtools VGAM]; }; - crp_CSFP = derive2 { name="crp.CSFP"; version="2.0.2"; sha256="0gazmhf5bv994x441m2xm0w18h9lw3y68qzdf6gmyqimj4wjqjgf"; depends=[MASS]; }; - crplyr = derive2 { name="crplyr"; version="0.3.3"; sha256="0jkh4jq0pwz1pqgckdylcdjg7d45z0xl3pdvyb93pcvi073na9na"; depends=[crunch dplyr ggplot2 lazyeval purrr rlang scales stringr tibble viridisLite]; }; + crov = derive2 { name="crov"; version="0.2.0"; sha256="1i3a5nagzinsla6p3wjyj3x12gyfqs6vapaqxgr3dh6m727jw5i5"; depends=[gtools VGAM]; }; + crplyr = derive2 { name="crplyr"; version="0.3.4"; sha256="1vpvp11xrlqq7qinndfda6r9dqfqin9gg75hx4y8sh3b9ar2zywd"; depends=[crunch dplyr ggplot2 lazyeval lifecycle purrr rlang scales stringr tibble tidyselect viridisLite]; }; crqa = derive2 { name="crqa"; version="1.0.9"; sha256="1k6jgkmgbjab78dynng1hlxdbnqrpwmiiw54rgyfhx6v3lcir75d"; depends=[fields Matrix plot3D pracma tseriesChaos]; }; crqanlp = derive2 { name="crqanlp"; version="0.3"; sha256="1ndd5k44w232x6k564r84lyahljgcnldfwgih3iiar3il94drbdg"; depends=[corpus crqa gutenbergr RCurl tm]; }; crrSC = derive2 { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; }; @@ -6475,43 +6549,46 @@ in with self; { crs = derive2 { name="crs"; version="0.15-31.1"; sha256="1p16nnxskjf3fdrdm5y1n5zj0acyrmc73ff75rgry1b1fd4yk61x"; depends=[boot np quantreg rgl]; }; crseEventStudy = derive2 { name="crseEventStudy"; version="1.2"; sha256="1fgjj78p54fk0bkvx0fq1h7c5j4c64g10cdjzmmqhhxlyjwp5z7y"; depends=[sandwich]; }; crskdiag = derive2 { name="crskdiag"; version="1.0.1"; sha256="0100wbyvchx6jwlrwc6rwhdjanips5c0f5zqzs2c0dgwygpqw30w"; depends=[cmprsk]; }; + crsmeta = derive2 { name="crsmeta"; version="0.3.0"; sha256="19v0bq80cma74jjl0k42pmlpd5jfv6b0hr7j2iq0d47h50pvrd02"; depends=[]; }; crsnls = derive2 { name="crsnls"; version="0.2"; sha256="0rv0xrdl9ix6bhaf554gma8zf923w47f8j1dkbs8g6xjqjr1c40a"; depends=[]; }; crso = derive2 { name="crso"; version="0.1.1"; sha256="1r10vz8z5y52a5v5phw22fhqwv9p7g66xfsx0906bcx74dn3f2b3"; depends=[foreach]; }; crsra = derive2 { name="crsra"; version="0.2.3"; sha256="1rkqm88zmvp9gw442cby6qpvfw4pfw65wz0gyl2h37w87c3wwvrw"; depends=[digest dplyr knitr purrr rcorpora readr tibble tidytext]; }; crtests = derive2 { name="crtests"; version="0.2.1"; sha256="0z8idz37dgwvi1q2vryldii7fn9yxd32gds77ml76jfplxbkikpd"; depends=[caret plyr stringr]; }; crul = derive2 { name="crul"; version="0.9.0"; sha256="1h1iyp625x2fx22dai9y0pmg64q65p9iiilkkd0qlr1ir9ljrd57"; depends=[curl httpcode jsonlite mime R6 urltools]; }; - crunch = derive2 { name="crunch"; version="1.26.1"; sha256="01ajcvn31nb8cdmqmalmxvp1pvh7nmd9fyg2fc1zm7yy3a2klp9l"; depends=[crayon curl httpcache httr jsonlite]; }; + crunch = derive2 { name="crunch"; version="1.26.3"; sha256="1hnzx9kc0h1x9pjpq9vmdk79vxqwwgh1ncskj9zvmjdmbaj6vyj3"; depends=[crayon curl httpcache httr jsonlite]; }; crunchy = derive2 { name="crunchy"; version="0.3.1"; sha256="1qvwzym2hj61zjlm7j34j8jl5kfpkpx35xfjjyl5y35a5y50sz8g"; depends=[crunch httpcache miniUI rstudioapi shiny]; }; - cruts = derive2 { name="cruts"; version="0.5"; sha256="08mklbmwgaq6cf3hd40mingplwjss5im30l5j6nmy7lijp15nq7k"; depends=[lubridate ncdf4 raster sp stringr]; }; - crypto = derive2 { name="crypto"; version="1.1.3"; sha256="0n8b5cp7fp65zp99i8mr6gxi4w0m0l9pyjzq572p2fd8pss1g5nr"; depends=[cli crayon curl dplyr httr jsonlite lubridate progress reshape2 rstudioapi rvest tibble tidyr xml2 xts]; }; + cruts = derive2 { name="cruts"; version="1.1"; sha256="1ih6h9qk4yflzars00d61smjqj7s4bfvc2ikp6vlki9f6k012xcx"; depends=[lubridate ncdf4 raster sp stringr]; }; cryst = derive2 { name="cryst"; version="0.1.0"; sha256="04da19dy3mkngd3ma44cd8cdkb5acjy9lbhfipa9flp339j1pp57"; depends=[flux pracma]; }; csSAM = derive2 { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; }; csabounds = derive2 { name="csabounds"; version="1.0.0"; sha256="15l7i15w5jk4h3148dlk8v2i4awns5vxvv6m59qcv0hzns6jhx9j"; depends=[BMisc ggplot2 pbapply progress qte]; }; csampling = derive2 { name="csampling"; version="1.2-2.1"; sha256="0kqx7j96yafsqi9cz551fqpwkbcabxl8zpwa2jms862z41xbgsv3"; depends=[marg statmod survival]; }; cshapes = derive2 { name="cshapes"; version="0.6"; sha256="0mp6grkibmqk4k1yi4w2sglpp9ari5cfw4iip49a0z58qa98npw7"; depends=[maptools plyr sp]; }; csn = derive2 { name="csn"; version="1.1.3"; sha256="102w1qh9hgz4j9lh5hnbw1z3b7p034si73q4pkk564a2mhzlksw4"; depends=[mvtnorm]; }; - csodata = derive2 { name="csodata"; version="0.1.5.0"; sha256="0qngazgky4nzcvz994652291dk2jizqykxjmqf0j3cv6wgsrhfrz"; depends=[dplyr httr jsonlite R_cache reshape2 rjstat sf]; }; + csodata = derive2 { name="csodata"; version="1.0.1.1"; sha256="1aldw10cjqz9563v5d4i1m4jb7pfimada3sdhwxkzsqqylvh6chg"; depends=[dplyr httr jsonlite R_cache reshape2 rjstat sf]; }; csp = derive2 { name="csp"; version="0.1.0"; sha256="1pc5mcn9difpp4cmfb0a8pqhbpkfakxjkbr7bpqmfiwcfk8rzr1h"; depends=[]; }; csrplus = derive2 { name="csrplus"; version="1.03-0"; sha256="0kljndmiwblsvvdnxfywida9k0dmdwjq63d934l5yl6z7k4zd0xa"; depends=[sp]; }; cssTools = derive2 { name="cssTools"; version="1.0"; sha256="1p8c21c1hilmd9ibqyz493fy1x95hb2pidybsyicch53gkb542br"; depends=[sna]; }; cstab = derive2 { name="cstab"; version="0.2-2"; sha256="1lr401fvi88f4jv8jh4brx95ymncfw8clripz1r6a46inj80nj4j"; depends=[cluster fastcluster Rcpp]; }; cstar = derive2 { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; }; - csv = derive2 { name="csv"; version="0.5.4"; sha256="019hagmz68bg10x4ykbr67i5dx7277pxdsqlvq06fzlf47kgizm5"; depends=[]; }; + csv = derive2 { name="csv"; version="0.5.5"; sha256="1i5apqdljr201jqd3r7mdlxczwfj9kz5b6k2myjalisgrgwgy642"; depends=[]; }; csvread = derive2 { name="csvread"; version="1.2.1"; sha256="1r9jvf7nbkxgl6dycdnb89yh39vacrzy8z04g8qz225rklg5b288"; depends=[]; }; csvy = derive2 { name="csvy"; version="0.3.0"; sha256="0id015szw1c63vd1h0515jsqdhyn32sxpxm89f3sb1qkgq3yynmy"; depends=[data_table jsonlite yaml]; }; + ctDNAtools = derive2 { name="ctDNAtools"; version="0.4.0"; sha256="0apdz3dv6snlshiq314clkpqycppd3mmyq4skyd1bdrbycnm5s96"; depends=[assertthat BiocGenerics Biostrings BSgenome dplyr ellipsis furrr GenomeInfoDb GenomicAlignments GenomicRanges IRanges magrittr purrr rlang Rsamtools tidyr VariantAnnotation]; }; + ctgt = derive2 { name="ctgt"; version="1.0"; sha256="0iznqskyi80xs8xn2hrrlal9qz9cwq6m9ml6wfwyynbzgn7vmvvh"; depends=[BH Rcpp]; }; cthreshER = derive2 { name="cthreshER"; version="1.1.0"; sha256="18b66d08dq8pvnixmm4ir4r800b37z5yillaa88l317mdilbci9s"; depends=[Matrix]; }; ctl = derive2 { name="ctl"; version="1.0.0-4"; sha256="027cij4vdsq3xhi38izzn07q6xwja7n8v95l7kk1pp92y9qkvqv3"; depends=[MASS qtl]; }; ctmcd = derive2 { name="ctmcd"; version="1.4.1"; sha256="01nflgdyb70kh4f8bnxpavr31fz4fh02kgz2nlx3zzblnm2idbcx"; depends=[coda expm numDeriv Rcpp RcppArmadillo]; }; ctmcmove = derive2 { name="ctmcmove"; version="1.2.9"; sha256="1pxyxbbhfa8arqfb7qw10ya1b8hy9ylqbqqzys6d9dsixvdk98h0"; depends=[fda gdistance Matrix raster sp]; }; ctmle = derive2 { name="ctmle"; version="0.1.2"; sha256="0qc1ji8fjpr88dn6mrpijfcx1ij4zkrxsbcw405hxal7rli0gyp3"; depends=[glmnet SuperLearner tmle]; }; - ctmm = derive2 { name="ctmm"; version="0.5.8"; sha256="17bqq67pwkkdmhv45n85w6y2n59vgaf5zhma2bhq1bn6dimgf1dq"; depends=[data_table digest expm fasttime Gmedian gsl manipulate MASS numDeriv pbivnorm pracma raster rgdal shape sp]; }; - ctqr = derive2 { name="ctqr"; version="1.0"; sha256="1q4icv8qicgwr664cbrmkh2x9xmlrc80yvz8gnaqh86248kn4yp3"; depends=[pch survival]; }; + ctmm = derive2 { name="ctmm"; version="0.5.9"; sha256="0in7dc83gbqpf6gcz0nz23a2fq5xwjx8qkgy0bgsnsrwmx32b0ar"; depends=[data_table digest expm fasttime Gmedian gsl manipulate MASS numDeriv pbivnorm pracma raster rgdal shape sp]; }; + ctqr = derive2 { name="ctqr"; version="1.1"; sha256="1iv6mms7p0xca91mpj61cj8kxv2bwqrpvwdsbx2lk6hgys8g70y2"; depends=[pch survival]; }; ctrdata = derive2 { name="ctrdata"; version="1.2"; sha256="146nb5sv6mj43kqs8iz58nzyx4xrrk5khay2hjjpfrh1g076bw8k"; depends=[clipr curl httr jsonlite nodbi rvest xml2]; }; ctrlGene = derive2 { name="ctrlGene"; version="1.0.1"; sha256="0x7j11v7jj4k1jml6lrnjq79awhrvsm3pig1yxsd337jlfml3ra9"; depends=[psych]; }; - ctsem = derive2 { name="ctsem"; version="3.0.9"; sha256="0kkkyvmdz43npgh2xx4dsr0s02xj6x9d89rahqn2h0560qjd1059"; depends=[BH cOde data_table Deriv ggplot2 MASS Matrix mize mvtnorm numDeriv OpenMx pkgbuild plyr quantreg Rcpp RcppEigen rstan rstantools StanHeaders]; }; + ctsem = derive2 { name="ctsem"; version="3.2.0"; sha256="1dsk74vci4k43b53lz9dwbrcj59f9fr527bls0l83kkas8dsd6m8"; depends=[BH cOde data_table Deriv ggplot2 MASS Matrix mize mvtnorm numDeriv OpenMx pkgbuild plyr quantreg Rcpp RcppEigen rstan rstantools StanHeaders]; }; ctv = derive2 { name="ctv"; version="0.8-5"; sha256="0kl6z8dbbjgm29q0c5xy6lihjgf5cdihrllm27x0zbcvy8lyl51p"; depends=[]; }; - cuRe = derive2 { name="cuRe"; version="1.0.0"; sha256="0bdj3ak1s6rg84d82iy95g1sdanl6y5a4rdsnixqzrhb9kvnrv0s"; depends=[date numDeriv relsurv rootSolve rstpm2 statmod survival]; }; + cuRe = derive2 { name="cuRe"; version="1.0.1"; sha256="0vw2iv9inz8md7lz6f1p456wxjc07kap1mvqf58hixqxbrb23dgi"; depends=[date numDeriv relsurv rstpm2 statmod survival]; }; cubature = derive2 { name="cubature"; version="2.0.4"; sha256="0jpyq8j7x06dpiz29w48av879ygldzgls9z810192hsymkmfaz6r"; depends=[Rcpp]; }; + cubelyr = derive2 { name="cubelyr"; version="1.0.0"; sha256="0h9s5j9q05bdzdv7dbghzfbhqf96kyxyrxx1mqf8phzc77w4yh25"; depends=[dplyr glue pillar purrr rlang tibble tidyselect]; }; cubeview = derive2 { name="cubeview"; version="0.2.0"; sha256="1352hi2j9x9rx4iy3xvsca86nsh39x1vnymd17f5qc8c3plfm8db"; depends=[base64enc htmltools htmlwidgets lattice raster stars viridisLite]; }; cubfits = derive2 { name="cubfits"; version="0.1-3"; sha256="0i2iybm9vpyqnahzka66yms1namdd36bz1i1yjy74qsc1h995rga"; depends=[coda foreach]; }; cubing = derive2 { name="cubing"; version="1.0-5"; sha256="1q23fplvklaaldicqic0zpnh301m08zb9k21l47zj47g9m9pj4bc"; depends=[rgl]; }; @@ -6534,22 +6611,22 @@ in with self; { cusum = derive2 { name="cusum"; version="0.4.1"; sha256="0vjq3slkjdgls41xm637xkrg8jhv6y75xiyfcgpwrp32ixmakpcd"; depends=[checkmate data_table Rcpp]; }; cutoff = derive2 { name="cutoff"; version="1.3"; sha256="0anrvmlvcxah620il3fkq6ldp7hx4nwdnzcpmfc5mhlsry0lp178"; depends=[do ROCit set survival]; }; cutoffR = derive2 { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; }; - cutpointr = derive2 { name="cutpointr"; version="1.0.1"; sha256="0nny2zp97ldfcd3ficyzlphv9fcwmpji9ynw7ygvx24skp291f35"; depends=[dplyr foreach ggplot2 gridExtra purrr Rcpp rlang tibble tidyr]; }; + cutpointr = derive2 { name="cutpointr"; version="1.0.2"; sha256="0jlh7d1nj9w1rw04sg89a81qxm6dfmsdqq37y1b10fllvhnc93fq"; depends=[dplyr foreach ggplot2 gridExtra purrr Rcpp rlang tibble tidyr]; }; cuttlefish_model = derive2 { name="cuttlefish.model"; version="1.0"; sha256="1rmkfyfd1323g2ymd5gi1aksp160cwy5ha5cjqh5r6fzd8hhqjxs"; depends=[]; }; cvAUC = derive2 { name="cvAUC"; version="1.1.0"; sha256="13bk97l5nn97h85iz93zxazhr63n21nwyrpnl856as9qp59yvn64"; depends=[data_table ROCR]; }; cvGEE = derive2 { name="cvGEE"; version="0.3-0"; sha256="085qjm520l2441nakfxy851s6bfy5832b5fy54z5fp4xr1jn6snm"; depends=[]; }; cvTools = derive2 { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase]; }; cvar = derive2 { name="cvar"; version="0.4-0"; sha256="1rfsmw2a639pkj8l5g2xm6z48jrxsywbysk7c0czpdvrh4h9h84f"; depends=[fGarch gbutils Rdpack]; }; cvcqv = derive2 { name="cvcqv"; version="1.0.0"; sha256="0327r4jw6m4avcz1zvdkxszqwaw2s9sh1i1jagl6aggd7aaiiyg0"; depends=[boot dplyr MBESS R6 SciViews]; }; - cvcrand = derive2 { name="cvcrand"; version="0.0.4"; sha256="1150vn753m95gpc1clyf4xzzgwmnzdh83prw8a3ikps0l6grvrps"; depends=[tableone]; }; + cvcrand = derive2 { name="cvcrand"; version="0.1.0"; sha256="0zdf41sjqyi7mybxhypfx1vpc15w7qj9jg9bav64qbk0q5nk7jyc"; depends=[tableone]; }; cvequality = derive2 { name="cvequality"; version="0.2.0"; sha256="1im839vzfqylphp2vr20avnzkyl02n88fngbs63d4ik7c72d9992"; depends=[]; }; cvmdisc = derive2 { name="cvmdisc"; version="0.1.0"; sha256="19b9kxqgbk1d631l3jph87pzhk4zf3xd5q5j2xsrbqz8zmm96sn9"; depends=[CompQuadForm]; }; cvmgof = derive2 { name="cvmgof"; version="1.0.0"; sha256="0rnd7icqjprhbpmn383ah4fi5nz0hmg88fa612fmivkvnpn79v6j"; depends=[lattice]; }; - cvms = derive2 { name="cvms"; version="0.3.2"; sha256="0k7v5m95dqanm8hb8j4jx4r4phxx8zrl9nagqampy2sgiwlld6wg"; depends=[broom caret data_table dplyr ggplot2 lifecycle lme4 mltools MuMIn plyr pROC purrr rlang stringr tibble tidyr]; }; + cvms = derive2 { name="cvms"; version="1.0.1"; sha256="0z7vp323vlz53icpksgl9idnkg5sf3kh6gi2fpkwafrx0h7fqdr7"; depends=[broom checkmate data_table dplyr ggplot2 lifecycle lme4 MuMIn plyr pROC purrr recipes rlang stringr tibble tidyr]; }; cvq2 = derive2 { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; }; cvxbiclustr = derive2 { name="cvxbiclustr"; version="0.0.1"; sha256="00k75zy8v6qd5fg0h258i5z8ljjkfgkxz45cspysl1ap89d5n7df"; depends=[igraph Matrix]; }; cvxclustr = derive2 { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[igraph Matrix]; }; - cwbtools = derive2 { name="cwbtools"; version="0.1.2"; sha256="0ylzh61587299zqa3i6fc76x2lhdmpvhj0h4bhqwy75csp1wisvp"; depends=[curl data_table pbapply R6 RcppCWB stringi xml2]; }; + cwbtools = derive2 { name="cwbtools"; version="0.2.0"; sha256="1f60zlj75a1fxvw92j8gg707lw4p23c7qg9zzk1s9ph4d42g63sb"; depends=[curl data_table jsonlite pbapply R6 RcppCWB RCurl rstudioapi stringi usethis xml2]; }; cwhmisc = derive2 { name="cwhmisc"; version="6.6"; sha256="1pf365g4f51cfrhlff9mqw2ddvkps0abax17zcn3vw1ba2djalnp"; depends=[lattice]; }; cwm = derive2 { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; }; cxhull = derive2 { name="cxhull"; version="0.2.0"; sha256="1m03ym83ghgmb0j14aihfj6divmnr13f5s9jwknicjsxz3p3divk"; depends=[]; }; @@ -6561,29 +6638,31 @@ in with self; { cycloids = derive2 { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bfyhd1d53557wcbl2bqwjzlpw5x3vdnsan"; depends=[]; }; cymruservices = derive2 { name="cymruservices"; version="0.5.0"; sha256="1xhdvijybdy7312qdbp50881yix587pmym0hchnwb3h0vhjv553v"; depends=[memoise pingr stringi]; }; cyphid = derive2 { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; }; - cyphr = derive2 { name="cyphr"; version="1.0.2"; sha256="0wfwkjn0a99n90f46c3y6vqpz5w549vm5slrjql9mz6l1r7jz0cf"; depends=[getPass openssl sodium]; }; + cyphr = derive2 { name="cyphr"; version="1.1.0"; sha256="03w26b5vvy9zwzp001g0lpwcndwqdsfsz80x11kik0cih1g8apsw"; depends=[getPass openssl sodium]; }; cystiSim = derive2 { name="cystiSim"; version="0.1.0"; sha256="0pz8jxi4lgcwzrb4dh8xn63xhpaga5rzg5hwqicwv8isc16iqizd"; depends=[ggplot2 knitr magrittr]; }; cytoDiv = derive2 { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; }; cytofan = derive2 { name="cytofan"; version="0.1.0"; sha256="0gqs98mnwiawnyfb9hs5nlin8d1fj64bszn4b40gs8ajyh36r9pp"; depends=[ggplot2 RColorBrewer]; }; cytometree = derive2 { name="cytometree"; version="2.0.2"; sha256="18g7av73lmnyga1kk24bf8jy599zn9n6qhr13mxsqgi0zdinicfa"; depends=[cowplot ggplot2 GoFKernel igraph mclust Rcpp RcppArmadillo]; }; + cytominer = derive2 { name="cytominer"; version="0.2.1"; sha256="0snifz15ijn5bfl3ppfqjp7ac68hsx0rzxlcnxj3285d10p0wljq"; depends=[caret doParallel dplyr foreach futile_logger magrittr Matrix purrr rlang tibble tidyr]; }; + czso = derive2 { name="czso"; version="0.2.3"; sha256="1gaflfi1sq49vjaah8mnbydvyqwwkl1ca2ay399dn9gw1kjcq0fd"; depends=[curl dplyr httr jsonlite lifecycle magrittr readr rlang stringi stringr tibble usethis]; }; d3Network = derive2 { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; }; d3Tree = derive2 { name="d3Tree"; version="0.2.0"; sha256="0xjr36hdd00dy8s8z1a1s44dn2wg0nm6yqc1rri2l0dqrbh4nrbn"; depends=[dplyr htmlwidgets magrittr plyr stringr]; }; d3heatmap = derive2 { name="d3heatmap"; version="0.6.1.2"; sha256="1ici8j0wzzklhmw94qlxm292qs562vc32wq8mnjsas2n1p35vkmk"; depends=[base64enc dendextend htmlwidgets png scales]; }; d3plus = derive2 { name="d3plus"; version="0.1.0"; sha256="0kadz83pals03n0v3zqhmhf6visigk52yn58xckhb57fid4xzj5w"; depends=[htmlwidgets magrittr]; }; d3r = derive2 { name="d3r"; version="0.8.7"; sha256="0xl3im76lp7pd5lhp8jfyqdm4j4zvjrx5a5fl81xv2cf7x3n4f2a"; depends=[dplyr htmltools tidyr]; }; - dBlockmodeling = derive2 { name="dBlockmodeling"; version="0.1.1"; sha256="17vw8mf03ry2qz3nbwch51p2x1j18vrzyf881dh604wql5k8yfjc"; depends=[]; }; + dBlockmodeling = derive2 { name="dBlockmodeling"; version="0.2.0"; sha256="0c1hvawb9gw6vckims3g8kzn2c4f0as5x1vw39sdvkwc92xy26lv"; depends=[]; }; dChipIO = derive2 { name="dChipIO"; version="0.1.5"; sha256="1xrafw5h071d8rfqaic3gifc80jpiddjz5x6l2cr8kgjvph60gqh"; depends=[]; }; dCovTS = derive2 { name="dCovTS"; version="1.1"; sha256="1pd50nfmfcqpi8zj20ngl0hc23qa4rabqhc1xci3ivyhs0valhsl"; depends=[doParallel energy foreach]; }; dGAselID = derive2 { name="dGAselID"; version="1.2"; sha256="0da7fi872i3ycb3j5v4isr4x2z39a68w4mdq859zslmqhiqd43b6"; depends=[ALL Biobase genefilter MLInterfaces]; }; dHSIC = derive2 { name="dHSIC"; version="2.1"; sha256="1c1xz1f1fp937w4rlylvqv3ii0p9dafvmn4fqq8rzxhcg5rn9j4l"; depends=[Rcpp]; }; - dLagM = derive2 { name="dLagM"; version="1.0.21"; sha256="0ppgisp76a9fc3p63ckm445sh2dy5jybh5q7karg9hsx4y13appd"; depends=[AER dynlm formula_tools lmtest MASS nardl plyr roll strucchange wavethresh]; }; - dMod = derive2 { name="dMod"; version="1.0.0"; sha256="1mj2a9hpfldxbsiggi27nz3w0klp7qwpplpwh4bi9ik25vll25a0"; depends=[cOde deSolve doParallel dplyr foreach ggplot2 plyr rootSolve stringr]; }; + dLagM = derive2 { name="dLagM"; version="1.1.2"; sha256="0mn90jl9648q9r8mw6h0jsjrjhiqylry55f7zi1rjbr4p838djn9"; depends=[AER dynlm formula_tools lmtest MASS nardl plyr roll strucchange wavethresh]; }; + dMod = derive2 { name="dMod"; version="1.0.1"; sha256="1xw52kliyiv9vrw0m9y7baqdcpqz4706625if8b63nfr70i77a9p"; depends=[cOde deSolve doParallel dplyr foreach ggplot2 plyr rootSolve stringr]; }; dSVA = derive2 { name="dSVA"; version="1.0"; sha256="0vy0flyg82x0n9vw6jf9f76qy84sp0wnis91faj37ac5hdv3pvsb"; depends=[sva]; }; daarem = derive2 { name="daarem"; version="0.4.1"; sha256="1krixphwjh4wp38in7ypwc4y4ncdrryhsnjnn1y48fm2jgc8zvjl"; depends=[]; }; - dabestr = derive2 { name="dabestr"; version="0.2.2"; sha256="10vzp28bx4vf9jc3l9jjw94wir75j8h60lcncafbdwvxjh5alpfs"; depends=[boot cowplot dplyr ellipsis forcats ggbeeswarm ggforce ggplot2 magrittr rlang simpleboot stringr tibble tidyr]; }; - dad = derive2 { name="dad"; version="3.3.0"; sha256="1154jk4j1h5wr3c68pj0slh90jxccia28wpmygn9mz0mlvx9km9l"; depends=[DescTools e1071 lattice]; }; - dae = derive2 { name="dae"; version="3.1-21"; sha256="0b562s3w5h0nmq32yfw4y55w9ax2kgf67w3mdy5qaipqhjf35jq6"; depends=[ggplot2 plyr]; }; - daewr = derive2 { name="daewr"; version="1.1-8"; sha256="1p5nblh745mq2zk48qa5dfpplywrz9yycmckv6ky4dv67j40qpqx"; depends=[BsMD FrF2 lattice stringi]; }; + dabestr = derive2 { name="dabestr"; version="0.2.5"; sha256="0kaxqlagp7ckq3h67l608vzfq98yrd47skwb2pzcf3dg3q5gsjz6"; depends=[boot cowplot dplyr ellipsis forcats ggbeeswarm ggforce ggplot2 magrittr plyr RColorBrewer rlang simpleboot stringr tibble tidyr]; }; + dad = derive2 { name="dad"; version="3.4.0"; sha256="0jgirdnp3gaychnjg4mp4p1mdn31hlngs1znzvlxhrd0cqyi4ccd"; depends=[DescTools e1071 ggplot2]; }; + dae = derive2 { name="dae"; version="3.1-23"; sha256="1qpsnyjq2imci45hn0c00cwgvhdrcbrfrvwmjm87k8vb3g0wqhgr"; depends=[ggplot2 plyr]; }; + daewr = derive2 { name="daewr"; version="1.2-3"; sha256="0ic7lpydsdiilqsbvc5yskrrl6a2l6kmgiz1idz0ic0klyk6rnig"; depends=[FrF2 lattice stringi]; }; daff = derive2 { name="daff"; version="0.3.5"; sha256="00zcdf215m7p3xm9yv571v09znhdqacxg69hb5b5j749mp4wdsyj"; depends=[jsonlite V8]; }; dafs = derive2 { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; }; dagR = derive2 { name="dagR"; version="1.1.3"; sha256="13jyhwjvvrjjja18rqzfdcw9ck90qm5yjwd25nygxgdf1894y03b"; depends=[]; }; @@ -6594,8 +6673,10 @@ in with self; { dams = derive2 { name="dams"; version="0.2"; sha256="0hf5s8i61r5q4h3s8dfmdl3vkj7v15ha59pjvpjqx3yihsgziqz9"; depends=[RCurl]; }; dang = derive2 { name="dang"; version="0.0.11"; sha256="14bxzbkrqzs0ic7n4rlaa429lwdgldlcx97h8l7ma6jh8c0fx3qr"; depends=[]; }; dani = derive2 { name="dani"; version="0.1-1"; sha256="0ff0hcb5r8k6m6kv1zhjrpvl7gr1al3q0zlk4yjj89qd2j5byqp8"; depends=[Epi]; }; - dann = derive2 { name="dann"; version="0.1.0"; sha256="0v6dnf7acjg6w64nwrscxhi3g7pr6bdiwdbiyaa8k760yg4r965n"; depends=[dplyr fpc ggplot2 magrittr MASS mlbench purrr rlang stringr tibble]; }; + dann = derive2 { name="dann"; version="0.2.0"; sha256="18c9rx7qg76pnmg2h4zazqq7k0vxgqh70j85cb7cc8lf0qsj6l8i"; depends=[fpc ggplot2 MASS purrr Rcpp RcppArmadillo rlang stringr tibble]; }; + danstat = derive2 { name="danstat"; version="0.1.0"; sha256="1wb4v4s9qc7qna7jgd1kk0xvyaqmxhnmjvr5wlk5jjl355lhjxbc"; depends=[httr jsonlite readr]; }; dapr = derive2 { name="dapr"; version="0.0.3"; sha256="136chxijyxrl5sbiggxf56zga26zqds647z1z2igwn5mdff1wxyb"; depends=[]; }; + daqapo = derive2 { name="daqapo"; version="0.3.0"; sha256="1fyl95y57grqckyx1vp4x4f2mq8rk0l2vxh4cyr75cw23j6p4lsc"; depends=[bupaR dplyr edeaR glue lubridate magrittr miniUI purrr readr rlang shiny stringdist stringr tidyr xesreadR]; }; darksky = derive2 { name="darksky"; version="1.3.0"; sha256="1740cw5qifgvqa0nafd6lmllxi32n1zm45zlify1yn3h1qdcszhb"; depends=[ggplot2 gridExtra gtable httr plyr]; }; dartR = derive2 { name="dartR"; version="1.1.11"; sha256="0k768ppm4iw4fi72dp8f1684kizqp1spfb4cnnqxq1dy6w0qz5i8"; depends=[adegenet ape data_table directlabels dismo doParallel foreach gdistance ggplot2 hierfstat igraph leaflet MASS mmod pca3d pegas plyr PopGenReport qvalue reshape2 rgdal rrBLUP seqinr SNPassoc SNPRelate sp StAMPP stringr tidyr vegan]; }; darts = derive2 { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; }; @@ -6603,41 +6684,43 @@ in with self; { dat = derive2 { name="dat"; version="0.4.0"; sha256="1nw16hsw9b4hpcl5rqrlw6yk9y2h1pd0ra1c7iz82sknkyd5afi6"; depends=[aoos data_table dplyr Formula magrittr progress tibble]; }; data_table = derive2 { name="data.table"; version="1.12.8"; sha256="1p7rf4v3ysflpgcmy9krkwmcy7z22wb08xm443649waz6lx5z9yk"; depends=[]; }; data_tree = derive2 { name="data.tree"; version="0.7.11"; sha256="1mm27p3k2qw77wqrx05qs39nazcgpn0af0ahlps4gm62fs9pzddq"; depends=[R6 stringr]; }; - dataCompareR = derive2 { name="dataCompareR"; version="0.1.2"; sha256="0n10dqnrlpwafxys68b3ly156235lhqby71qay0vb0r6bvl2g349"; depends=[dplyr knitr markdown stringi]; }; dataMaid = derive2 { name="dataMaid"; version="1.4.0"; sha256="133ipl06sc8iicvkbgjxfs0qia76r2p1qhi693vacgfdbd7cmak5"; depends=[ggplot2 gridExtra haven htmltools magrittr pander rmarkdown robustbase stringi whoami]; }; dataMeta = derive2 { name="dataMeta"; version="0.1.1"; sha256="13xxayqxbps07h0xr5b7sb7q30gy5zm7jzzaq4k20fskkjrzhzcm"; depends=[dplyr]; }; - dataPreparation = derive2 { name="dataPreparation"; version="0.4.2"; sha256="12707zncdzsj05gw336g37qigbzq3iqmxx7agca32prx0mj39wdj"; depends=[data_table lubridate Matrix progress stringr]; }; + dataPreparation = derive2 { name="dataPreparation"; version="0.4.3"; sha256="1fchr68siq6vxz4qzlkrm2p6zld3s8mw7izmyzqffvrlqmrh0bdm"; depends=[data_table lubridate Matrix progress stringr]; }; dataQualityR = derive2 { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; }; - dataRetrieval = derive2 { name="dataRetrieval"; version="2.7.5"; sha256="0aagj04x5792rp73h5lwvrx63nh739jn3cmhhrzchm9symq8x8mx"; depends=[curl httr jsonlite lubridate readr xml2]; }; + dataRetrieval = derive2 { name="dataRetrieval"; version="2.7.6"; sha256="0375gqpj7xhbj7b2445984swcqhp6389w1jy3llvkdwzrf3pfvnc"; depends=[curl httr jsonlite lubridate readr xml2]; }; datacheck = derive2 { name="datacheck"; version="1.2.2"; sha256="1i3n5g1b6ix8gpn4c74s7ll1dbrllrzgpb1f3hk449d6p4kmisq6"; depends=[Hmisc shiny stringr]; }; datadigest = derive2 { name="datadigest"; version="1.0.2"; sha256="1v4nwflrgjhwkrdlrjnqyq1spv1jkgxn1kmapml0zrvnvwf0r1a1"; depends=[haven Hmisc htmltools htmlwidgets jsonlite miniUI shiny tibble]; }; datadogr = derive2 { name="datadogr"; version="0.1.2"; sha256="10zbxb9gkymw78ras9y4wrifz7cxh3y630yzjcf9ds2p557vcjzp"; depends=[anytime dplyr glue httr lubridate purrr stringr tibble tidyr]; }; dataesgobr = derive2 { name="dataesgobr"; version="1.0.0"; sha256="10znkaq45m4bgiyjx4x8s6ilvxlry6h0z54pkg8jgmblrpfazmqb"; depends=[dplyr DT httr jsonlite readODS readr readxl shiny shinycssloaders shinyFiles shinyjs shinythemes stringi stringr yaml]; }; + dataframeexplorer = derive2 { name="dataframeexplorer"; version="0.1.6"; sha256="0sp2323lf3sq7na6z9v1lir46v75c7ssklbkkmjxx43pbw3q4rjy"; depends=[data_table dplyr magrittr openxlsx plyr tibble tidyr]; }; dataframes2xls = derive2 { name="dataframes2xls"; version="0.4.7"; sha256="10krlv0l5w021z0qd7rj93pzfjjmcjlda4xz4vq470bxbjmn1bss"; depends=[]; }; datafsm = derive2 { name="datafsm"; version="0.2.3"; sha256="18q6s8sz8bm2xlfvhj0x5sagpn363s3k21s428wd0bqzqlppwbmb"; depends=[caret GA Rcpp]; }; + datagovsgR = derive2 { name="datagovsgR"; version="0.3.1"; sha256="03ynpga01yh8xm4p41kq32wvmbh9cf1jp1mbyzzl6ziwgz95n0q8"; depends=[data_table dplyr httr purrr stringr]; }; datamap = derive2 { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; }; datamaps = derive2 { name="datamaps"; version="0.0.3"; sha256="00pvns98miq56z3prbb5qg608d5ns9wbp0711x3mmqg0bld1xwmp"; depends=[htmlwidgets magrittr]; }; datamart = derive2 { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[base64 gsubfn markdown RCurl RJSONIO XML]; }; datanugget = derive2 { name="datanugget"; version="1.0.0"; sha256="1ki4kgz6y9a313f07jml39pdxhadgs287rkpnlwvcw6kgj5qxala"; depends=[doSNOW foreach]; }; dataonderivatives = derive2 { name="dataonderivatives"; version="0.3.1"; sha256="0q1zd1l7l0hmbs1bx469d706rmprjbz2f2dgcnfp9wxfgqpfxkz1"; depends=[assertthat httr lubridate readr tibble]; }; + dataone = derive2 { name="dataone"; version="2.1.4"; sha256="19v5c2xbdsz06dcx7xz4jld3dgp98k66cps2hnxpd33wbm8n7x6h"; depends=[base64enc datapack hash httr jsonlite parsedate plyr stringr uuid XML]; }; datapack = derive2 { name="datapack"; version="1.3.2"; sha256="0v9m7fbzi1w5p3arb0ywl4yglyw87civc59ndqsdm8rp84gbvnbl"; depends=[digest hash redland uuid XML]; }; - datapackage_r = derive2 { name="datapackage.r"; version="0.1.2"; sha256="0y4adfgdf2k04aaimxzj1fz50j6w6fqc8gvjls47nlqhi3dgmdav"; depends=[config future httr iterators jsonlite jsonvalidate purrr R_utils R6 readr rlist stringr tableschema_r urltools V8]; }; + datapackage_r = derive2 { name="datapackage.r"; version="1.3.0"; sha256="0njvv5g64yp29wz7vdcfqqf0xjzp9pcs79mmll07bm9jfr528rd5"; depends=[config future httr iterators jsonlite jsonvalidate purrr R_utils R6 readr rlist stringr tableschema_r urltools V8]; }; datapasta = derive2 { name="datapasta"; version="3.1.0"; sha256="0sqv29iv2rv50rbw1601rn8p7gv7rsw00djhl7h1znr0igzi5b82"; depends=[clipr readr rstudioapi]; }; + dataresqc = derive2 { name="dataresqc"; version="1.0.3"; sha256="1b04lzb479p95iv7gzb5ds6c48l8kcps857qjy3wqkhr67jhd0dc"; depends=[]; }; datarium = derive2 { name="datarium"; version="0.1.0"; sha256="1v98yxsxhfqlalz5qy3x5axb7fy067vf3y0qg7ngixphmy9qybym"; depends=[]; }; - datarobot = derive2 { name="datarobot"; version="2.16.0"; sha256="0hks5qww2m3l65qbmhybdc9zsbd8i8wj8vb5n9ss00bva1syi92v"; depends=[curl httr jsonlite yaml]; }; + datarobot = derive2 { name="datarobot"; version="2.17.0"; sha256="1k4idrbc9fgw8afc7cq9fqg189b86h1q0fkpq06k7dc4fl65wyna"; depends=[curl httr jsonlite yaml]; }; datasauRus = derive2 { name="datasauRus"; version="0.1.4"; sha256="1w1yhwwrmh95bklacz44wjwynxd8cj3z8b9zvsnzmk18m5a4k0fl"; depends=[]; }; dataseries = derive2 { name="dataseries"; version="0.2.0"; sha256="11wc2p5m8qbdmkpbd21lpwl28a1dpab88c3gqyrhsn0298lpnip4"; depends=[]; }; datasets_load = derive2 { name="datasets.load"; version="1.2.0"; sha256="0x2m3k4grqizm97p41gjy3zkmhshicndp6cwyncl149yay6x8y5i"; depends=[DT miniUI shiny]; }; datastepr = derive2 { name="datastepr"; version="0.0.2"; sha256="039yggdj8jdici7hwmkjwgix45lvwjl7rw5h2rfzsm9xaq6vw1z2"; depends=[dplyr lazyeval magrittr R6 tibble]; }; datastructures = derive2 { name="datastructures"; version="0.2.8"; sha256="1lf48c77z4br1sv8kdbxadn30v5ygn9shjgsf8g37rci7nngpx1k"; depends=[BH purrr Rcpp]; }; datasus = derive2 { name="datasus"; version="0.4.1.1"; sha256="1vcyn0iia71c58959d3wcdqlh6336p3lsxbvwsj0fd9sll0a605s"; depends=[dplyr httr magrittr RCurl readr rvest stringi stringr xml2]; }; - datautils = derive2 { name="datautils"; version="0.1.5"; sha256="1yy25a84zmfh54jvxwa7mv4j296rmjgd40m4p81mrsswlqvncmfn"; depends=[deldir gplots gtools]; }; dataverse = derive2 { name="dataverse"; version="0.2.0"; sha256="0lyga8rdsir2yr1n9nr10iiaf6a7dxp1nb04bx8mq8ljrvpkgr8n"; depends=[httr jsonlite xml2]; }; - date = derive2 { name="date"; version="1.2-38"; sha256="1ziy17kz02j7lals14s43rs9lmxxfn2ppfi55q4b3m4gfj9pr4jc"; depends=[]; }; + date = derive2 { name="date"; version="1.2-39"; sha256="0mwp1619rxqyyyyxk224fh0x6g4rgyvr97q0kj076cxp71b97cdm"; depends=[]; }; + daterangepicker = derive2 { name="daterangepicker"; version="0.1.0"; sha256="1605ch84ad3nmmad0yy3id0izv0nz536lxwib6rkdkjik5761gqk"; depends=[htmltools jsonify shiny]; }; datetime = derive2 { name="datetime"; version="0.1.4"; sha256="0nn1yxknsn3crmwbkws5kvfjhd65dw0fkfbg67gba0dyaqp1jg37"; depends=[]; }; - datetimeutils = derive2 { name="datetimeutils"; version="0.3-0"; sha256="1f63vzinj39pf85bw9xa4szkwmy4d4rxxnqm1jd396ywppgxzn7c"; depends=[]; }; + datetimeutils = derive2 { name="datetimeutils"; version="0.4-0"; sha256="0m98v8jv8n0yyaqxwqwkagwnj4xqx8dygdsmv564jifc355ghc5b"; depends=[]; }; datoramar = derive2 { name="datoramar"; version="0.1.0"; sha256="0zq6vhq6dmsyagmqrmb85z6fy9qhwra3s3iasr3jgc4ryr009pml"; depends=[httr jsonlite tibble]; }; - datos = derive2 { name="datos"; version="0.2.0"; sha256="0ndwgqh8jvnl328k4zg2mn8j6nvz9526jk6h10y676v2pffcfgvw"; depends=[dplyr rlang yaml]; }; datr = derive2 { name="datr"; version="0.1.0"; sha256="0sqwhn6zdaq8i45ry207mpbda1djjaxp9mcn13hi5wkry6z0bmlr"; depends=[devtools]; }; datrProfile = derive2 { name="datrProfile"; version="0.1.0"; sha256="1bhyk3xjgwf92i765z3bkdnzkxg8fshriz9r6m371q1c75xysfil"; depends=[dplyr odbc RSQLite]; }; dave = derive2 { name="dave"; version="2.0"; sha256="1rraphpp34czyjj15xzvj1ihlnqzcppqls9n2g85n49zv0n1ngn8"; depends=[cluster labdsv nnet tree vegan]; }; @@ -6646,22 +6729,22 @@ in with self; { dbConnect = derive2 { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[gWidgets RMySQL]; }; dbEmpLikeGOF = derive2 { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702cp3lvlif2fzmvccys8iy7bv1fbg6ki2l8bvn2f7c5p"; depends=[]; }; dbEmpLikeNorm = derive2 { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; }; - dbarts = derive2 { name="dbarts"; version="0.9-13"; sha256="1i9f1nc1ky6bav639x6kgszy91986q2m64147icdiv4diijzdcfx"; depends=[]; }; + dbarts = derive2 { name="dbarts"; version="0.9-17"; sha256="1zbjri8d22m56dkj3rdzfvwn4h046367vjzl6l173wkq1fhraxwh"; depends=[]; }; dbfaker = derive2 { name="dbfaker"; version="0.1.0"; sha256="00n2z4q5drpg26pw826i16rg07m7w66a0r466q2lrl14hxs4rcaq"; depends=[assertive DBI dplyr foreach parsedate RPostgreSQL tidyr]; }; dbflobr = derive2 { name="dbflobr"; version="0.0.1"; sha256="1j97gwmqr8mv05yfd1dxm0v3l0vxrjrqf0drvkms2nja5asbhinq"; depends=[checkr DBI flobr glue RSQLite]; }; dblcens = derive2 { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; }; dblr = derive2 { name="dblr"; version="0.1.0"; sha256="0wzmhmp706mw0pkh81nsb7qzclwyhm6f2mjvpvz043ng5xrxwvvw"; depends=[CatEncoders data_table Metrics xgboost]; }; dbmss = derive2 { name="dbmss"; version="2.7-1"; sha256="0gasvpgmmpq8x776qmfrv4xiniz2fi1zxywzi7rm8xgmwr5q9kp3"; depends=[cubature ggplot2 Rcpp RcppParallel reshape2 spatstat spatstat_utils tibble]; }; - dbparser = derive2 { name="dbparser"; version="1.0.4"; sha256="0s69da7czznnmv2kgipss1cdklx5ijh0q5aa2lg2gx3an1rjbgp2"; depends=[DBI odbc purrr readr RMariaDB tibble tidyr XML]; }; - dbplot = derive2 { name="dbplot"; version="0.3.2"; sha256="0xw1zjvf1fa092kyryq2pk7dd4y60ka8yczaxk0f231mmsm1741p"; depends=[dplyr ggplot2 purrr rlang]; }; - dbplyr = derive2 { name="dbplyr"; version="1.4.2"; sha256="1q2dflr88s5a1amzfld3087q422vf70052qn84zyd8895kdg10xp"; depends=[assertthat DBI dplyr glue purrr R6 rlang tibble tidyselect]; }; + dbnR = derive2 { name="dbnR"; version="0.3.4"; sha256="0m273disj1byg4g21zgwspryjsxsdqj9scih2m0hcghf76n22822"; depends=[bnlearn data_table magrittr Rcpp]; }; + dbparser = derive2 { name="dbparser"; version="1.1.0"; sha256="12fx17bj076nl493mian9rz3iv1fx86qr0q2k2z6hqsvg4866q1j"; depends=[DBI dplyr odbc purrr readr RMariaDB RSQLite tibble XML]; }; + dbplot = derive2 { name="dbplot"; version="0.3.3"; sha256="1svizj9hcd417yii8ll9s3mnvdqpa5awy9xl71kbwpfcnpdzqf1r"; depends=[dplyr ggplot2 magrittr purrr rlang]; }; + dbplyr = derive2 { name="dbplyr"; version="1.4.3"; sha256="1si8sahr1kwq1xgjzi9klkahad07pyrsngy75y1f74f64907pb39"; depends=[assertthat DBI dplyr glue lifecycle purrr R6 rlang tibble tidyselect]; }; dbscan = derive2 { name="dbscan"; version="1.1-5"; sha256="1vh29nmmana2755zcy15i1mhj3amwc2r84cq9d71wqr7ygzynphk"; depends=[Rcpp]; }; dbstats = derive2 { name="dbstats"; version="1.0.5"; sha256="0pr80mx8y87l96hhg0rp3ajxl7yx2f8qr0y1zrjkbzxavjmp9k34"; depends=[cluster pls]; }; dbx = derive2 { name="dbx"; version="0.2.5"; sha256="1g1pm0zw667m0wdzndak1qzym527lcl6gmdfzi5b3rlinkk2y0s2"; depends=[DBI]; }; dc3net = derive2 { name="dc3net"; version="1.2.0"; sha256="19ibsvbnq6y88vqvgkm31zrqwjhpml59d792bz0zkk50r1q5bnyr"; depends=[c3net igraph RedeR]; }; dcGOR = derive2 { name="dcGOR"; version="1.0.6"; sha256="0rvwa25r23yayx1i6xhkfaw2z85d2iyfx3slg3aq1m0fa7kj380p"; depends=[dnet igraph Matrix]; }; - dccvalidator = derive2 { name="dccvalidator"; version="0.1.0"; sha256="1b8w2bq5fmxriyvfj76cispfp5bz7gpqf774z4i6yd6hbswa5ilw"; depends=[config ggplot2 glue golem jsonlite jsonvalidate knitr markdown purrr readr readxl reticulate rlang shiny shinyBS shinydashboard shinyjs skimr stringr tibble visdat]; }; - dcemriS4 = derive2 { name="dcemriS4"; version="0.55"; sha256="15x4hjc5fwpn80h90q5x9a3p84pp3mxsmcx4hq5l0j52l9dy9nv3"; depends=[oro_nifti]; }; + dccvalidator = derive2 { name="dccvalidator"; version="0.2.0"; sha256="141vzkmzbm0wwc5pmkxw4hf5iqra6gnw97gdx6fq473fk22c6cd2"; depends=[config ggplot2 glue golem htmltools knitr markdown purrr reactable readr readxl reticulate rlang shiny shinyBS shinydashboard shinyjs skimr tibble visdat]; }; dclone = derive2 { name="dclone"; version="2.3-0"; sha256="0w1bhzsnmnhsrrw5ffm89pj2wy2fmx14y7g6b1mb2wlwbczjzzsh"; depends=[coda Matrix rjags rstan]; }; dclust = derive2 { name="dclust"; version="0.1.0"; sha256="1icfx52v3g7kkkc11pw0xlrc8dlx5q3n2zbrd3fccmw17jzxqbg7"; depends=[openssl phylogram]; }; dcminfo = derive2 { name="dcminfo"; version="0.1.7"; sha256="03r0ynzc5cck2rz20zbg5zx8v6s66ivizqav1pjkyvp6kxkmnf8q"; depends=[CDM]; }; @@ -6674,14 +6757,14 @@ in with self; { ddi = derive2 { name="ddi"; version="0.1.0"; sha256="0pnkylz7l6brx6i73wys637w811psxhnr39lcmkag41s6jcgabd5"; depends=[]; }; ddiv = derive2 { name="ddiv"; version="0.1.0"; sha256="1r2sxlkw1vxf2svdi1nary3hb7c5k1b4j820mj268r9swmy632ch"; depends=[MASS segmented]; }; ddpca = derive2 { name="ddpca"; version="1.1"; sha256="1qsanid7sr2nc9pwzyz4cbjc1vg0rj255d3rnh1rb22agrgj2bc1"; depends=[MASS Matrix quantreg RSpectra]; }; - ddpcr = derive2 { name="ddpcr"; version="1.12"; sha256="0kda154m588vdkjzm1vdr9irbb57l4w25pqjhqhawasvrna8nicf"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinyjs]; }; - ddsPLS = derive2 { name="ddsPLS"; version="1.1.1"; sha256="03vi7dwg24sa3bmwkhvvw8x0vll2i59zlqa5w17fs9c7cbc77w3y"; depends=[corrplot doParallel foreach MASS RColorBrewer Rcpp Rdpack]; }; + ddpcr = derive2 { name="ddpcr"; version="1.14"; sha256="16f80bg5zfjq2vzd7f9bk2s6alia3rcv21p04bjvj47aq5pk22ys"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinyjs tibble]; }; + ddsPLS = derive2 { name="ddsPLS"; version="1.1.4"; sha256="0h0iiycprham72k3yq81d15gnliln0i2r71lxhsqrcbrly9hpanr"; depends=[corrplot doParallel foreach MASS RColorBrewer Rcpp Rdpack]; }; ddst = derive2 { name="ddst"; version="1.4"; sha256="1y0immm337adkd2bjx8c5pf02w9wysv3gj26f4qf0jiba0f2wk8n"; depends=[evd orthopolynom]; }; deBInfer = derive2 { name="deBInfer"; version="0.4.2"; sha256="108vijk71sgsj14hwfv78r4lnn68cybvnpr92zvrvl0d82b7qxfd"; depends=[coda deSolve MASS mvtnorm PBSddesolve plyr RColorBrewer truncdist]; }; deGradInfer = derive2 { name="deGradInfer"; version="1.0.1"; sha256="0yczn63fhpirvz1g1kq9q0m04sisflxxgxy70c87jyvrw12nfwss"; depends=[deSolve gdata gptk]; }; - deSolve = derive2 { name="deSolve"; version="1.27.1"; sha256="05sax045qrk550gsn2i7krb9rbg51rx88x4v190acsigqknxffrv"; depends=[]; }; + deSolve = derive2 { name="deSolve"; version="1.28"; sha256="0jasvdzig0pzhzspmy20089az19r91xjfb9q6h8gj7c4mr6fymac"; depends=[]; }; deTS = derive2 { name="deTS"; version="1.0"; sha256="08yq7vfcd8fv8qw2w0f1rnj3rzys9kslmkqspmiz6prmzqvj1zf1"; depends=[pheatmap RColorBrewer]; }; - deaR = derive2 { name="deaR"; version="1.2.0"; sha256="1p3lsck0zwzfgjxyvzgvxig9g5p7i67pf71hrhzpmkxvafafx9jw"; depends=[dplyr ggplot2 gridExtra igraph lpSolve plotly tidyr writexl]; }; + deaR = derive2 { name="deaR"; version="1.2.1"; sha256="16rhpdw3fyc2fyrm0yfmq0im5r4svhs4v52gjh9y6lx4n8pmncph"; depends=[dplyr ggplot2 gridExtra igraph lpSolve plotly tidyr writexl]; }; deadband = derive2 { name="deadband"; version="0.1.0"; sha256="02pq3d0l0wy8bdlyfir3zf46j1ascx4qajyq5cf28yl62q6ngq5d"; depends=[TTR]; }; deal = derive2 { name="deal"; version="1.2-39"; sha256="0sw0v1mm004ky1gjw3dmvf2vb7nf2j9s9386bhqxijw63j7xnjd3"; depends=[]; }; deamer = derive2 { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; }; @@ -6691,9 +6774,9 @@ in with self; { decido = derive2 { name="decido"; version="0.2.0"; sha256="17myg67qry1sbd1scv9bbvdh67fpcnqcb6r8n0kajdxb96vnlqk0"; depends=[Rcpp]; }; decision = derive2 { name="decision"; version="0.1.0"; sha256="13d0yyg5zp7n3r92l0l1dsffxfph6vacrlzga9rz41l5pja72z6g"; depends=[]; }; decisionSupport = derive2 { name="decisionSupport"; version="1.105.2"; sha256="095qwgsw6y1clv2hyjr56s2wg8q1nhd22ikh9b3l2mcsw2xdzvjy"; depends=[chillR fANCOVA ggplot2 msm mvtnorm nleqslv rriskDistributions]; }; - deckgl = derive2 { name="deckgl"; version="0.1.8"; sha256="0nm9jf166343sd01mchw2v6qpsfjgdhf6zd2p92rqyhp9k0hq5lv"; depends=[base64enc htmltools htmlwidgets jsonlite magrittr readr tibble yaml]; }; + deckgl = derive2 { name="deckgl"; version="0.2.5"; sha256="1rqw84pzbip9752q4zmhrhv8gis5dc8q6v1kkgnblhkg10wrb0lw"; depends=[base64enc htmltools htmlwidgets jsonlite magrittr readr tibble yaml]; }; decode = derive2 { name="decode"; version="1.2"; sha256="1qp0765gl3pgfdzjwj7icf3zminxxmrlw6gx3vj51y6c2y5ws4as"; depends=[]; }; - decoder = derive2 { name="decoder"; version="1.1.13"; sha256="1kpcx754djfr8y0flpa1hrr92s0wbxw23rlvb6q3k9absvdvvmg6"; depends=[backports]; }; + decoder = derive2 { name="decoder"; version="1.2.2"; sha256="1jxgd32bn36ldal26wivhdxgjy247l7r4ickacr1p8rrwxvhpk18"; depends=[]; }; decomposedPSF = derive2 { name="decomposedPSF"; version="0.1.3"; sha256="0p9n0qi21facdp9c4fzs78ap4w1wvpvkv51kgx1gkr949kw8cv4n"; depends=[forecast PSF Rlibeemd tseries]; }; decompr = derive2 { name="decompr"; version="4.5.0"; sha256="1kbk4z1pr1j4i1sgfkjxzjy2j2fcmrf3vacnrpv1fba2ib10619k"; depends=[]; }; decon = derive2 { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; }; @@ -6702,10 +6785,11 @@ in with self; { deducorrect = derive2 { name="deducorrect"; version="1.3.7"; sha256="10lvhdnnc6xiy20hy6s5rpqcvilj8x0y6sn92rfjkdbfsl00sslp"; depends=[editrules]; }; deductive = derive2 { name="deductive"; version="0.1.3"; sha256="19h41a20c27gmky9xrgqkf0n2s8fzn2hiivs5dg71kl9gc4m1jhn"; depends=[lintools stringdist validate]; }; deep = derive2 { name="deep"; version="0.1.0"; sha256="1764cnsax8jwp2pb6rnmlb0f5m99jss84yi9rp017hdm20izvzrq"; depends=[]; }; - deepNN = derive2 { name="deepNN"; version="0.3"; sha256="1h2hk95ja8r4c9ha0phsndp4h5j3d4q4dw3mjmhycij7igy4m3kd"; depends=[Matrix]; }; + deepNN = derive2 { name="deepNN"; version="1.0"; sha256="0jpf25i0f3a0dfqykx8dl8qq7f37l1n28pzp715bxc0izsrrx9bk"; depends=[Matrix]; }; deepboost = derive2 { name="deepboost"; version="0.1.6"; sha256="1nf9gjk9gjl2dz7cr3vh5lg8nxkbqwr82a132nw853axbdgbs9ga"; depends=[Rcpp]; }; + deepdep = derive2 { name="deepdep"; version="0.2.0"; sha256="1yl1vnz9qysv38zn7dhz05s38l701zrbrx58bcpg862i8xf1nl40"; depends=[cranlogs ggforce ggplot2 ggraph graphlayouts httr igraph jsonlite scales]; }; + deepdive = derive2 { name="deepdive"; version="1.0.1"; sha256="1385pxkcdaf3rs2br1dghm7d7zd94mfgmqjns4z09mryv72n7cl0"; depends=[data_table fastDummies plyr rpart stringr treeClust]; }; deepgmm = derive2 { name="deepgmm"; version="0.1.59"; sha256="1kmvk0vmfzs49n67j2cd1d46fi9gvmxklcqghgmwfw25k4xmpgkb"; depends=[corpcor mvtnorm]; }; - deeplr = derive2 { name="deeplr"; version="1.0.0"; sha256="0pg1vy4x53qns8qn5sv0nqplf23w8dwj0b0wbibpr52lgqjc34r7"; depends=[httr purrr rjson stringr tibble tokenizers utf8]; }; deepnet = derive2 { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; }; default = derive2 { name="default"; version="1.0.0"; sha256="0hzxgp9la9kll5cw3m4gd02rii571xsn1v53kz407k7k6rfg5mda"; depends=[]; }; define = derive2 { name="define"; version="0.2.8"; sha256="12xy1l1z1ilk85kbl7x4na99n6hc5axwrhpb6m6ipmbii4vv407v"; depends=[encode Hmisc latexpdf SASxport spec]; }; @@ -6713,7 +6797,8 @@ in with self; { deformula = derive2 { name="deformula"; version="0.1.1"; sha256="0h85yzl8kvjwrn1mkzyblvknf7gg8kx8y85qnvkwfbr9ik42ngn1"; depends=[]; }; degreenet = derive2 { name="degreenet"; version="1.3-3"; sha256="07mkj2sdp09624mmb1x3djjypnrzn43qn2j4m93blli51j6zchm3"; depends=[igraph network]; }; deisotoper = derive2 { name="deisotoper"; version="0.0.7"; sha256="0lpmx3qy44xjlil4nsbvcbczxq22vr8xn6v9a5bdx7cd31qwm2l3"; depends=[rJava]; }; - deldir = derive2 { name="deldir"; version="0.1-23"; sha256="0790dwxb2mz1ffz8gd5vwdr0if2q76dzy3vab5rsykf9kz72n4g0"; depends=[]; }; + delayed = derive2 { name="delayed"; version="0.3.0"; sha256="04f4k683jzb763sb9knb81lw8df56y1378g4i3c1x8m83bvj1mhs"; depends=[assertthat BBmisc data_table future igraph progress R6 rlang rstackdeque uuid visNetwork]; }; + deldir = derive2 { name="deldir"; version="0.1-25"; sha256="0kdglv8rc1pb4ilcid4xc9wpv5kkj2y6x6wg7919k3hya7mz58ph"; depends=[]; }; delt = derive2 { name="delt"; version="0.8.2"; sha256="06g03wy9r2qvly0lnv5fv4k366mhlk56qkvak0xaxy99p1i34kmv"; depends=[denpro]; }; deltaPlotR = derive2 { name="deltaPlotR"; version="1.6"; sha256="15vjg3viyfrxvvh34p8i7j8p0vpg5628g8198adhi0i2ri3ygz9a"; depends=[MASS]; }; deltar = derive2 { name="deltar"; version="1.0.0"; sha256="1ki89ysz4qlq5z094ybg3aqfcb6g633ccvpj1cg6nri9z5qjwpm1"; depends=[Bchron]; }; @@ -6724,16 +6809,17 @@ in with self; { demogR = derive2 { name="demogR"; version="0.6.0"; sha256="06x82ffbdv6ifl8xh52d3npdwha67v1ylfjp78j5pa4wdqkg221b"; depends=[]; }; demography = derive2 { name="demography"; version="1.22"; sha256="1m15capbfknr4rqxmfgj1vb7rmgambk6r9ic37149525sg7wn3j6"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; }; demu = derive2 { name="demu"; version="0.3.0"; sha256="1mp5iz8mg0d6cyqi3f6fdhk6x5xxvng5bi13b7jnlp60wpjrq0il"; depends=[ClusterR fields Matrix Rcpp RcppArmadillo spam]; }; - dendextend = derive2 { name="dendextend"; version="1.13.2"; sha256="1iclvd9cyckd4djpa87ynm05fk6zl4b4m735za1w4irimc130m3r"; depends=[ggplot2 magrittr viridis]; }; + dendextend = derive2 { name="dendextend"; version="1.13.4"; sha256="1pjbz6sb4pgh3d5pm53vmf3q8y6lq3hrgjd6547xxs3m63sb8mn4"; depends=[ggplot2 magrittr viridis]; }; dendroTools = derive2 { name="dendroTools"; version="1.0.7"; sha256="052957wbrwgnm5lab3ynwlziih4d0hhm7agaa907zfbrz2xl6nr0"; depends=[boot brnn Cubist dplyr ggplot2 gridExtra knitr lubridate magrittr MLmetrics oce plotly psych randomForest reshape2 scales viridis]; }; dendroextras = derive2 { name="dendroextras"; version="0.2.3"; sha256="0hb7crbgsnbcwvbk05iz5ik45n7zgysmwjj6xc46131yd8l0i1qx"; depends=[]; }; dendrometeR = derive2 { name="dendrometeR"; version="1.0.0"; sha256="1par27ipgbfbrmdlwvkf82i5dgnfrcawmavakrf8lplin2hhb7gs"; depends=[forecast pspline zoo]; }; dendsort = derive2 { name="dendsort"; version="0.3.3"; sha256="1m4qh79ppfvipmbi8m8vwq0hqmwwipbg5izihz5j6x8a4g5i6iym"; depends=[]; }; denoiSeq = derive2 { name="denoiSeq"; version="0.1.1"; sha256="18w69gxbnazg5k8bzi76slcqxnbfmrndp548zazz8bpxz3jns699"; depends=[]; }; - denoiseR = derive2 { name="denoiseR"; version="1.0"; sha256="094nknr3hyx4kv18vnpdzrcpmfb4r7x9jgrp3p6x4nwrgzdh3r95"; depends=[FactoMineR irlba Matrix]; }; + denoiseR = derive2 { name="denoiseR"; version="1.0.2"; sha256="1q5kxiwfkrf2k0gpidzhl4hyzyjcm33rwlw4dan9nkx1181naw9l"; depends=[FactoMineR irlba Matrix]; }; denovolyzeR = derive2 { name="denovolyzeR"; version="0.2.0"; sha256="03ya5clzqp12lfhw073ri0pwgxn53a6pvnais317a8bv1yinxspb"; depends=[dplyr reshape2]; }; denpro = derive2 { name="denpro"; version="0.9.2"; sha256="19hrpfd44jaavq81dbyj3frris4aflfc8lig0471whv0pc6jci2k"; depends=[]; }; denseFLMM = derive2 { name="denseFLMM"; version="0.1.2"; sha256="1lfhd73zvvz6glq41lb2a9x63fjwjfp53zmy9g78fg6gz5lbnbpm"; depends=[MASS Matrix mgcv mvtnorm]; }; + densitr = derive2 { name="densitr"; version="0.1.0"; sha256="1vqdvfka6wdfxqfy2qcacss0h6wxykmwyijr5blpvlpafjdmngaq"; depends=[changepoint]; }; densityClust = derive2 { name="densityClust"; version="0.3"; sha256="1zry0vafajzmr37aylglxfvwplhdygbkb9cvzvh8cy0xgnjrnx13"; depends=[FNN ggplot2 ggrepel gridExtra RColorBrewer Rcpp Rtsne]; }; densratio = derive2 { name="densratio"; version="0.2.1"; sha256="0x333kfx5mdzzjsqy37j4bmv9iddlgp3wi4774lx8d159lbr6irp"; depends=[]; }; denstrip = derive2 { name="denstrip"; version="1.5.4"; sha256="0hzxphj740q6pfa1q42knr7n12bmnawg7b2fs74msxn83dka5cmq"; depends=[lattice]; }; @@ -6752,13 +6838,12 @@ in with self; { descr = derive2 { name="descr"; version="1.1.4"; sha256="05maviw8l8qhmy7p80gs3dlyy6pqk5k1686ny4xla4psj8mr7lbk"; depends=[xtable]; }; describedata = derive2 { name="describedata"; version="0.1.0"; sha256="10ryy886jr2gwi6h90girl82ivwrmhz1vcwi4f6khmmpwsy95hav"; depends=[broom dplyr forcats ggplot2 haven lmtest purrr rlang stringr tibble tidyr]; }; describer = derive2 { name="describer"; version="0.2.0"; sha256="1pjyihmn4gkaamixsc3qwynsc02pwv9bgn6s7z7acmmsybhhs6xn"; depends=[]; }; - descriptr = derive2 { name="descriptr"; version="0.5.0"; sha256="0bbd3h07s4mfhryh6yyvgs4xs0nshxngyapz89jsc1drl3dn6plh"; depends=[cli dplyr forcats ggplot2 gridExtra magrittr purrr rlang scales tibble tidyr vistributions xplorerr]; }; + descriptr = derive2 { name="descriptr"; version="0.5.1"; sha256="0s4zjh5vw73sj5pxq6v4nnrprbdxz470hnw8m2hzx6n04abbkzd1"; depends=[cli dplyr ggplot2 gridExtra magrittr purrr rlang scales tibble tidyr vistributions xplorerr]; }; descstatsr = derive2 { name="descstatsr"; version="0.1.0"; sha256="1pz5lww1dkkqvsq6h0vkch39bj76qffmmag3zlag5in75s4wj0wl"; depends=[moments zoo]; }; - desctable = derive2 { name="desctable"; version="0.1.6"; sha256="1qmwfhsy8lvz7gi49gdka3jizdhrnrnk08ka36h46kf7b7lv0p1g"; depends=[dplyr DT htmltools pander purrr]; }; + desctable = derive2 { name="desctable"; version="0.1.7"; sha256="12axy5knsvzh2pxzax9k9zl69vasvabchcspy6ssirfbln660z1f"; depends=[dplyr DT htmltools pander purrr]; }; deseasonalize = derive2 { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[FitAR lattice]; }; desiR = derive2 { name="desiR"; version="1.2.1"; sha256="0ghcv96bbwn74mka4dpf2lkpnlikjn3q6lx2sl8bbw77nriap0n6"; depends=[]; }; designGG = derive2 { name="designGG"; version="1.1"; sha256="1x043j36llwd7kd4skbpl2smz2ybsxjqf5yd1xwqmardq60gdv2w"; depends=[]; }; - designGLMM = derive2 { name="designGLMM"; version="0.1.0"; sha256="0ya246mqclkhg8cq6f5mzqn67qks22f3fribyjcvhrx395n0f21v"; depends=[]; }; designmatch = derive2 { name="designmatch"; version="0.3.1"; sha256="0px6iyqik4sfs25yybamvf3ay0vd6r75acj8hin76jl6l7fwk30f"; depends=[lattice MASS Rglpk slam]; }; designr = derive2 { name="designr"; version="0.1.9"; sha256="1rdnz7xq2h7bxb8fvsimj4bjdqx9z0xnsg59ibb0gi69vvlswac8"; depends=[crossdes dplyr MASS tibble]; }; desirability = derive2 { name="desirability"; version="2.1"; sha256="094gxvp6a60lfcc0a0gk9rv1p6ajnzq9m58sy8cvhcj5337g4fmk"; depends=[]; }; @@ -6768,19 +6853,19 @@ in with self; { detect = derive2 { name="detect"; version="0.4-2"; sha256="03xzv13y2l15afyp00lgvbh51vxg1jaakxjcbnsxzdgb11039x2g"; depends=[Formula Matrix pbapply]; }; detectRUNS = derive2 { name="detectRUNS"; version="0.9.6"; sha256="0yl1x0jz66hingbl094picsiyrxzxvnz0grq63rva6nwn7pv1c0b"; depends=[data_table ggplot2 gridExtra iterators itertools plyr Rcpp reshape2]; }; detector = derive2 { name="detector"; version="0.1.0"; sha256="010i063b94hzx7qac8gpl67gmk7hzgqm9i1c7pbbw4la3wcd9lz7"; depends=[stringr]; }; + detectseparation = derive2 { name="detectseparation"; version="0.1"; sha256="0y0d1irw3pzvyvc7smii0ikx7dv376s2cdixjcs5c3jsw0iqxyim"; depends=[lpSolveAPI pkgload ROI ROI_plugin_lpsolve]; }; detpack = derive2 { name="detpack"; version="1.1.3"; sha256="1mk2k9akagz7knd4n5p8nxkmnm2mdv9izk4i5yl2v9nv5v39mc4h"; depends=[]; }; detrendeR = derive2 { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; }; - detrendr = derive2 { name="detrendr"; version="0.6.4"; sha256="0n7mrh05y5jg2y77xv25yadw01lr8ms5ki32i32k38zlc635c1sl"; depends=[assertthat autothresholdr checkmate doParallel dplyr filesstrings foreach fs glue ijtiff iterators magrittr matrixStats plyr purrr Rcpp RcppParallel rlang sigmoid stringi stringr withr]; }; + detrendr = derive2 { name="detrendr"; version="0.6.5"; sha256="1xl6vr3hf47drfyg0mfxdkdpcxphc8skbkdijz4csjgki875i6a6"; depends=[autothresholdr checkmate doParallel dplyr filesstrings foreach ijtiff iterators magrittr matrixStats plyr purrr Rcpp RcppParallel rlang stringr withr]; }; detzrcr = derive2 { name="detzrcr"; version="0.3.0"; sha256="1f4c6l9nk7cis5gnf3f97nys4b9c13cxcn2h1m60mva1d5p9zzpb"; depends=[DT ggplot2 MASS shiny]; }; devEMF = derive2 { name="devEMF"; version="3.7"; sha256="0fv44y440xr52xymh1zyrryf7xrkm9lbs3qgybwfzz0ssx2iy6al"; depends=[]; }; devFunc = derive2 { name="devFunc"; version="0.1"; sha256="0f2s5gssk9napmah7zcss1rnh7pzlq90gzwcnvyr9rrq6k118n8q"; depends=[plyr stringr]; }; devRate = derive2 { name="devRate"; version="0.1.10"; sha256="0c5hg98w83d02lvb7rbgx8c24li58vpxjy71if337p7cyzzd1lqg"; depends=[]; }; devoid = derive2 { name="devoid"; version="0.1.0"; sha256="1aq7yyfpid3r41c6v5v92im2iq9m3d7gnisc9rkc9zpjfpbpzpx8"; depends=[]; }; - devtools = derive2 { name="devtools"; version="2.2.1"; sha256="0i2f549hxkn0j1x1avkhwy68c9r48v9284j7x9cak2q6dfsqz61f"; depends=[callr cli covr crayon desc digest DT ellipsis git2r glue httr jsonlite memoise pkgbuild pkgload rcmdcheck remotes rlang roxygen2 rstudioapi rversions sessioninfo testthat usethis withr]; }; - dexter = derive2 { name="dexter"; version="1.0.3"; sha256="1400m0wq1yqsiyihycfc41pa5zjzbjjh81aj4k20h627bkj75dn7"; depends=[DBI dplyr MASS Rcpp RcppArmadillo rlang RSQLite tidyr]; }; + devtools = derive2 { name="devtools"; version="2.3.0"; sha256="1l6w765q180bg5mmdq5k2ymf6apz7ldhnknzf6ynfp1kf70pbhsg"; depends=[callr cli covr crayon desc digest DT ellipsis git2r glue httr jsonlite memoise pkgbuild pkgload rcmdcheck remotes rlang roxygen2 rstudioapi rversions sessioninfo testthat usethis withr]; }; + dexter = derive2 { name="dexter"; version="1.0.7"; sha256="0didyrdiyv3vcimkmr7g4nl9pl6678vj0a7750nbi5zyn6q6dll9"; depends=[DBI dplyr MASS Rcpp RcppArmadillo rlang RSQLite tidyr]; }; dexterMST = derive2 { name="dexterMST"; version="0.1.2"; sha256="1h56dr2z2pzi4zdy3dmyb2vg2jg1v5602c497khkvrbr7qfx8zra"; depends=[crayon DBI dbplyr dexter dplyr fastmatch igraph Rcpp rlang RSQLite tibble tidyr]; }; - dextergui = derive2 { name="dextergui"; version="0.2.1"; sha256="1c92j70zihzsqi83rs7hgnp70qgg6y0hdcs3gxin80grsihj1frw"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets jsonlite networkD3 RCurl readODS readxl rlang shiny shinyBS shinyFiles shinyjs tibble tidyr writexl]; }; - df2json = derive2 { name="df2json"; version="0.0.2"; sha256="10m7xn7rm4aql1bzpckjcx5kvdw44m1pxgzqkgkd40lzqb1cwk18"; depends=[rjson]; }; + dextergui = derive2 { name="dextergui"; version="0.2.2"; sha256="1g6qxjmxkrna10lahsdfilpjw587kk6zh8vs1saw9l27i3izpbi9"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets jsonlite networkD3 RCurl readODS readxl rlang shiny shinyBS shinyFiles shinyjs tibble tidyr writexl]; }; dfCompare = derive2 { name="dfCompare"; version="1.0.0"; sha256="1lhx69j0bkjbnp5jz23hrbxjcf04vf3big4k593ixz003xs2077f"; depends=[]; }; dfConn = derive2 { name="dfConn"; version="0.2.1"; sha256="03yl00mqj6r7p2xmrwam2chgqlq4qpfcm85n4b3b41vrm27xg11g"; depends=[data_table doParallel fields foreach ggplot2 gplots gtools nlme Rcpp RcppArmadillo stringr]; }; dfadjust = derive2 { name="dfadjust"; version="1.0.1"; sha256="0hzfkgf84j670vi4jfhlggbnzj96xa860212y3b0h5liwz1iazsy"; depends=[]; }; @@ -6788,56 +6873,57 @@ in with self; { dfcrm = derive2 { name="dfcrm"; version="0.2-2.1"; sha256="01rn3zvi9xljmx48lkclckhnixian1vwq1frr8n784dsclp86spg"; depends=[]; }; dfexplore = derive2 { name="dfexplore"; version="0.2.1"; sha256="04nbhn59l1kas26nwj4qflkjvvr33sj1mm7zg7fhvya85gvlhrbf"; depends=[ggplot2]; }; dfmeta = derive2 { name="dfmeta"; version="1.0.0"; sha256="0ca48adfhaxac33jmxbynlyg3ak9l5mmjhlr69n4hnz6325gn9vb"; depends=[data_table ggplot2 lme4 plyr]; }; - dfmta = derive2 { name="dfmta"; version="1.7-0"; sha256="0ci5faqkrpqkqkl0hrx9j78cid3cr1bs5mlkw4xargf3n4lfgk5j"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; + dfmta = derive2 { name="dfmta"; version="1.7-1"; sha256="13i4ck32z2p4plmy7lz2y4zakc1w915f5h6d9s6vj71212rrg9qm"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; + dfoliatR = derive2 { name="dfoliatR"; version="0.1.0"; sha256="1vgcz763fvapwh98453040yddyka83p9bhgqssx9c0n69z20ylix"; depends=[dplR dplyr forcats ggplot2 ggpubr MASS plyr reshape2 rlang]; }; dfoptim = derive2 { name="dfoptim"; version="2018.2-1"; sha256="1gya0sx8ajy04kscds06d6m9prxdwr1dmyfc6awsm6r1jwbibzb3"; depends=[]; }; dfped = derive2 { name="dfped"; version="1.1"; sha256="11ffsah14igba276m9d3cla0kgb3isizm5d7j1iqcd0wq23il7hq"; depends=[ggplot2 rstan]; }; dfphase1 = derive2 { name="dfphase1"; version="1.1.1"; sha256="0bk4bl5lqd7m4mzk6kg71fmh918wcy85zghr3lyayxlk30fl4ppc"; depends=[lattice Rcpp robustbase]; }; dfpk = derive2 { name="dfpk"; version="3.5.1"; sha256="010rlxj66ar3y61fnm7ys3p6aimlr8ylqq4q4flzr9m88klz8701"; depends=[BH dfcrm ggplot2 PK Rcpp RcppEigen rstan StanHeaders]; }; + dfvad = derive2 { name="dfvad"; version="0.3.0"; sha256="1n6hwpgnpd8vlv187ajl6js8z3yvl60h87q3kzgi9hvn9v73ip5z"; depends=[]; }; dga = derive2 { name="dga"; version="1.2"; sha256="13mfampnghcs5xplzq69bw948lqhw561pn54j3gb0ydsg5bm5vmr"; depends=[chron]; }; - dggridR = derive2 { name="dggridR"; version="2.0.3"; sha256="1gdwxrl5c5mprfk7rx5mk8davi4mmg1crccxaaipnbnsilg9j9vh"; depends=[dplyr ggplot2 Rcpp rgdal sp]; }; - dglars = derive2 { name="dglars"; version="2.1.5"; sha256="0d66vcn16l9w638vwplj9cmhdq6q1rlg9rhaycxpa6788x44di85"; depends=[Matrix]; }; + dglars = derive2 { name="dglars"; version="2.1.6"; sha256="13bnvinqgpmkisjri0sjsyzsh9nqplpry3n3galkv8dqhgpncq4w"; depends=[Matrix]; }; dglm = derive2 { name="dglm"; version="1.8.3"; sha256="0vj4vddqcrjzgqsi6zsxm22gj5pa5dm50wcxip4vi8kbwxaahnaj"; depends=[statmod]; }; dgmb = derive2 { name="dgmb"; version="1.2"; sha256="1r5md917wipx78n63x87fpvsc3h87c68cpacrrs9dhss199p1a5k"; depends=[abind MASS]; }; dgo = derive2 { name="dgo"; version="0.2.15"; sha256="16z3vag1fwsnmynqh0zpwq5qp5ac3xf4787lwqy7asx8qgcc3wmw"; depends=[assertthat data_table dgodata ggplot2 lubridate R6 rstan survey]; }; dgodata = derive2 { name="dgodata"; version="0.0.2"; sha256="03cyiig8pn7fdkrkrd29cwy5g63bp57bpl9jmdxfi03smngzbz0m"; depends=[]; }; dgof = derive2 { name="dgof"; version="1.2"; sha256="02qnb3i131hx05k8l5n3xbl5sqmmc2fh19bsgcacgj8ixs4wyjvi"; depends=[]; }; + dgumbel = derive2 { name="dgumbel"; version="1.0.1"; sha256="1qlc81rh6fcrai9ls27j83bjac26qhpfnchf9pdjz86dyclfjx43"; depends=[Rcpp RcppEigen]; }; dhReg = derive2 { name="dhReg"; version="0.1.0"; sha256="07x2zfcskia79xvz40g30qd9f2d4bn2s26bw892s469v3hcdqzyp"; depends=[forecast future future_apply testthat]; }; dhga = derive2 { name="dhga"; version="0.1"; sha256="1n48irj53g3kn451ak5ly50wxdn7qmzi2kib8clsvcx2n7mvpgcm"; depends=[VennDiagram]; }; dhglm = derive2 { name="dhglm"; version="2.0"; sha256="1918wkylldcdxjggly3a4yh4cv2nkig5bjfx0j79av633hahlg92"; depends=[boot car MASS Matrix sandwich]; }; dhh = derive2 { name="dhh"; version="0.0.1"; sha256="00kg2x1was85aq2vr15bak8y5p4mymbs8pbriijlbw64401djmb0"; depends=[]; }; di = derive2 { name="di"; version="1.1.4"; sha256="1w2gjhyi410z98d8wnhbd69jxm69nz4pmnr4fb09i70a90f53s25"; depends=[scales]; }; diagis = derive2 { name="diagis"; version="0.1.3-1"; sha256="1cagcr5znhrg4fp96d79ly0z7bs3hhh3zfspclyfc88p2p3qsd96"; depends=[coda ggplot2 gridExtra Rcpp RcppArmadillo]; }; - diagmeta = derive2 { name="diagmeta"; version="0.3-1"; sha256="1hbh0j9bybz1dv5krygzaharpg4prfj29h8jn4x88jiiip64f4rc"; depends=[lme4 meta]; }; + diagmeta = derive2 { name="diagmeta"; version="0.4-0"; sha256="1z7h1sxcqn53121m33d2w196lyzkrgj1afc8i8h9iab99fgqvpk7"; depends=[lme4 meta]; }; diagonals = derive2 { name="diagonals"; version="1.0.1"; sha256="0m9hlxww6n405fn26gbw36kjlb7b9759hj56lz820wkj972zw301"; depends=[]; }; diagram = derive2 { name="diagram"; version="1.6.4"; sha256="0f6ffprn5k0ir1s7m9s7izc64aa17r3gnygagz5bihrlsvawaavw"; depends=[shape]; }; - dialr = derive2 { name="dialr"; version="0.3.0"; sha256="1wdl3m6mlpxhy75kyzxypf053n2zaf8skk0xq1m4gklq4disbg32"; depends=[dialrjars rJava]; }; - dialrjars = derive2 { name="dialrjars"; version="8.10.14"; sha256="0xzgrqgydgrljp3ylqk24hwgj9mcpxsfd4xp3wx8k1d4jmz80gw8"; depends=[rJava]; }; - dials = derive2 { name="dials"; version="0.0.4"; sha256="04vz6spp8lw011a9fn8z0bkba9nghgj2hvsxy3n6dqqs3ajd4nfa"; depends=[DiceDesign dplyr glue purrr rlang scales tibble withr]; }; + dialr = derive2 { name="dialr"; version="0.3.1"; sha256="0lh3glgh95r1rnbnbx2qii429kp3dk4yhwf6zm3n0zxiibmsrhgf"; depends=[dialrjars rJava]; }; + dialrjars = derive2 { name="dialrjars"; version="8.12.0"; sha256="0c68n2i29v69xlyzsivzajhrh55b1ih55sr6j907klxgds1hb767"; depends=[rJava]; }; + dials = derive2 { name="dials"; version="0.0.6"; sha256="0hvhn8adkb8pywfh058vj681bccm4iyky11ijc01xk2w3iaslyr9"; depends=[DiceDesign dplyr glue lifecycle purrr rlang scales tibble withr]; }; diaplt = derive2 { name="diaplt"; version="1.3.0"; sha256="1kkqhkv3s8rrpqd05jidjdnqmlnb3s9f8rr34rfqj7k4nh0qzzcz"; depends=[]; }; dice = derive2 { name="dice"; version="1.2"; sha256="0gic7lqnsdmwv3dbzwwmcwdfyfqlq8kpr2pciqphd1j2ligzwl3s"; depends=[gtools]; }; diceR = derive2 { name="diceR"; version="0.6.0"; sha256="1jwgngvajnm80g079z4jks5f3y2hy7hz3h9cf7c6wlb8spmaffxr"; depends=[abind apcluster assertthat blockcluster caret class cli clue cluster clusterCrit clValid dbscan dplyr e1071 flux ggplot2 gplots Hmisc infotheo kernlab klaR kohonen magrittr mclust NMF poLCA progress purrr quantable RankAggreg RColorBrewer Rcpp Rtsne sigclust stringr tibble tidyr]; }; dichromat = derive2 { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3mkbafvfiw0775iq4gapysf88xq2zp6spiw59i"; depends=[]; }; dicionariosIBGE = derive2 { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; depends=[]; }; - did = derive2 { name="did"; version="1.2.2"; sha256="0slc0rdajwri1zrlxaw251b2xlkc002f67bq5v68iirys3hlm37n"; depends=[BMisc ggplot2 gridExtra knitr MASS pbapply]; }; + did = derive2 { name="did"; version="1.2.3"; sha256="05xc41491mq0v9gm841m8l3cdjhjip3z1aqjqaqpaz05rwp3bngx"; depends=[BMisc ggplot2 gridExtra knitr MASS pbapply]; }; didrooRFM = derive2 { name="didrooRFM"; version="1.0.0"; sha256="12clfnbm56jwldw0afb0nb0argnd97mx7369jiywhxy0p4xqibqq"; depends=[dplyr]; }; dief = derive2 { name="dief"; version="1.2"; sha256="1i4icdfqvw7imaj1fh392zmzfyz8aqlv9s5naqxm1pm0lqfxl6ca"; depends=[flux fmsb ggplot2 plyr]; }; dielectric = derive2 { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; }; - diem = derive2 { name="diem"; version="1.0"; sha256="09qf47y3mbhkdy7nmy9mcvx371hyss81igc5frbhbp85z2pf5zzb"; depends=[dbscan ggplot2 igraph Matrix Rcpp RcppEigen scales]; }; dietr = derive2 { name="dietr"; version="1.0"; sha256="0wz7nvhn1c3l36kpmdv4j3ia3wp77qzjlx8rmqv7al0wpmjnxcb6"; depends=[rfishbase]; }; diezeit = derive2 { name="diezeit"; version="0.1-0"; sha256="0rq1k08byvqn99wpql7drnrcxlzcqrcxixh7bczbc8dv1hhsgk9i"; depends=[brew httr jsonlite]; }; - difNLR = derive2 { name="difNLR"; version="1.3.0"; sha256="1p3iiaw1wy9ni74y96yp4003406wy1jz773nq919hmrqj0agxkg7"; depends=[CTT ggplot2 msm nnet plyr reshape2 VGAM]; }; + difNLR = derive2 { name="difNLR"; version="1.3.2"; sha256="13kzd2c96nymi27d0yladpl2fyd2sl0rlbbfk55cv5w5zlachggl"; depends=[CTT ggplot2 msm nnet plyr reshape2 VGAM]; }; difR = derive2 { name="difR"; version="5.0"; sha256="0k0vw5l3pig514ngpvf0rwhwxc316ws352fgw49c3c95ydsz6wd8"; depends=[deltaPlotR lme4 ltm mirt]; }; difconet = derive2 { name="difconet"; version="1.0-4"; sha256="0cjadi4mnpfmy18vyp0dw55mnhs0zddf51w59gvq6gszk145z3bq"; depends=[data_table gplots mvtnorm stringr]; }; diffEnrich = derive2 { name="diffEnrich"; version="0.1.1"; sha256="19bq2frd2h8gh6mdy3pcwd54zzv170c0m1m3wnp5c4gadb9424qf"; depends=[dplyr ggnewscale ggplot2 here reshape2 rlang stringr]; }; diffIRT = derive2 { name="diffIRT"; version="1.5"; sha256="0kip6wz9l9q80qsqwf32pwz7d9vqin6dgfwf0nxlrlzf8xjsxgim"; depends=[statmod]; }; diffMeshGP = derive2 { name="diffMeshGP"; version="0.1.0"; sha256="1dc37hxh3fi27gw11kij57j78p87bza77s82niagdv6dqhldj5a4"; depends=[]; }; diffdepprop = derive2 { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee PropCIs rootSolve]; }; - diffdf = derive2 { name="diffdf"; version="1.0.3"; sha256="0nz0jwa02yc16cx51z5hp5zaw40gbcyqli3jpxgrnzw76f8jhkah"; depends=[tibble]; }; + diffdf = derive2 { name="diffdf"; version="1.0.4"; sha256="03cr0gvspchdj49kiggsm6i9h5d9z07aswggj4n46lnyz52ihivj"; depends=[tibble]; }; diffeR = derive2 { name="diffeR"; version="0.0-6"; sha256="0ivdcfirs3jbd6m3rryq590szkhplm2kr9chjgcgd88ar5nrqfg7"; depends=[ggplot2 raster reshape2 rgdal]; }; diffee = derive2 { name="diffee"; version="1.1.0"; sha256="01lb1prz70mxgymhhsvx48kbfy69xyyaabsmfhf28af9wfb89662"; depends=[igraph pcaPP]; }; diffeqr = derive2 { name="diffeqr"; version="0.1.3"; sha256="1696bxh916688zlfxbm6jaqk245xw51ar7rqz7m2nla0ibka86sj"; depends=[JuliaCall stringr]; }; - diffman = derive2 { name="diffman"; version="0.1.0"; sha256="03m8qbzxyinknx0d87kq8hnag8xdv09vwaafahk80x1lvg389559"; depends=[data_table dplyr igraph Matrix progress Rcpp sf tidyverse]; }; - diffobj = derive2 { name="diffobj"; version="0.2.3"; sha256="17wq3haj2i8x5cy1xx2c8hj2p65hasrjyiqxcq61kzvxd0zyjxzw"; depends=[crayon]; }; + diffman = derive2 { name="diffman"; version="0.1.1"; sha256="08b4kqxfg8pmyl2xg8flb581s9wnkdcy5rrmrxp8a89y265qmirx"; depends=[data_table dplyr igraph Matrix progress Rcpp sf tidyverse]; }; + diffobj = derive2 { name="diffobj"; version="0.2.4"; sha256="1nygk8qly4jypwsvxwrvgq2v9mj1d619g6qrzxk3v1bi89vqws18"; depends=[crayon]; }; diffpriv = derive2 { name="diffpriv"; version="0.4.2"; sha256="12q2v93369bshid83rsy1csbr9ay6rfpd8zdxm12zi7py3f9sjs8"; depends=[gsl]; }; diffr = derive2 { name="diffr"; version="0.1"; sha256="0ydwnpyzirynffsnvip667y0jqzy7yfqlfpqhb38xvmd9rmwfbp8"; depends=[htmlwidgets]; }; diffrprojects = derive2 { name="diffrprojects"; version="0.1.14"; sha256="1mnqf5zs1w8dx9y5iwn4blyzb9j60ayzc04zxj5l8804nd527n25"; depends=[dplyr hellno magrittr R6 Rcpp RSQLite rtext stringb stringdist]; }; @@ -6845,24 +6931,25 @@ in with self; { diffusion = derive2 { name="diffusion"; version="0.2.7"; sha256="1j9s9vw5sc4k956bk4yp3bf4fnp7lhhkwcvlzvsh1w4dyaj8l35h"; depends=[dfoptim nloptr systemfit]; }; diffusionMap = derive2 { name="diffusionMap"; version="1.2.0"; sha256="1rvk7069brlm1s9kqj4c31mwwr3mw4hmhay95cjjjfmw5xclff2j"; depends=[igraph Matrix scatterplot3d]; }; diffusr = derive2 { name="diffusr"; version="0.1.4"; sha256="1f3h387kblw1xzdnxphwgfl1n7f6i07kk7kfslvbfxkalbish6ii"; depends=[igraph Rcpp RcppEigen]; }; - digest = derive2 { name="digest"; version="0.6.23"; sha256="18h5s8vkdcz2vhpsx6g3ig00zalrihr03skn95zw3lr2y56pafmp"; depends=[]; }; + digest = derive2 { name="digest"; version="0.6.25"; sha256="1r9dkq0kxkps54gkmgcdngsd068p054va2vhnqhs5jmwp2vsvk0m"; depends=[]; }; digitalPCR = derive2 { name="digitalPCR"; version="1.1.0"; sha256="0hwqq84yr1hnvf4bygc5425887dhqjjjyy1ils71iavcal04s8pb"; depends=[]; }; digitize = derive2 { name="digitize"; version="0.0.4"; sha256="1qw4x4z9vrs79sd9b2daw668nc6nvjl4qhayfqmd87yxa2ydv6x0"; depends=[readbitmap]; }; dils = derive2 { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp]; }; dimRed = derive2 { name="dimRed"; version="0.2.3"; sha256="110d6y83ib1nfpxzmvkvb3fn3brskwkdbsk4dqrdrswrd4znxrg6"; depends=[DRR magrittr]; }; + dimensionsR = derive2 { name="dimensionsR"; version="0.0.1"; sha256="1g0jwf3lvv3zaarrcvqh3a8fgzm4p8d7g73hqg29lgmb6q8shb8d"; depends=[httr jsonlite]; }; dina = derive2 { name="dina"; version="2.0.0"; sha256="1sq7998xc5qhvd8clc8r32ch7axinh2a2dc7i1w2p148wv130yhd"; depends=[Rcpp RcppArmadillo rgen simcdm]; }; dinamic = derive2 { name="dinamic"; version="1.0"; sha256="0mx72q83bbwm10ayr3f1dzwr5wgz7gclw7rh39yyh95slg237nzr"; depends=[]; }; dineq = derive2 { name="dineq"; version="0.1.0"; sha256="1xrhrdc970f7hm9xng9z7xmshnmmz89cn3gmnyabzprx44ccr9sl"; depends=[boot Hmisc]; }; - dint = derive2 { name="dint"; version="2.1.2"; sha256="01z3fw3rhhnwgibgrcgv0n2664s78xndk1k2jghz7ig07sgrmr8p"; depends=[]; }; - dipsaus = derive2 { name="dipsaus"; version="0.0.4"; sha256="1qh4aqhg9y1z4wf81fjc42418wz6rz0mn537ys6av8ln2qy4b2v9"; depends=[base64enc base64url cli crayon data_table digest fastmap future future_apply jsonlite R6 Rcpp RcppParallel rlang shiny stringr synchronicity txtq]; }; + dint = derive2 { name="dint"; version="2.1.3"; sha256="0nxppn7gx4sjwn7jns5bwbqfid3jkbsx2lxi0rjdkbsawy77fc85"; depends=[]; }; + dipsaus = derive2 { name="dipsaus"; version="0.0.6"; sha256="1vbyzlz6ci43ckz5hl8j67fm6g34jqn2rwaq799jz0c1zz0fjlww"; depends=[base64enc base64url cli crayon digest fastmap future future_apply jsonlite progressr R6 Rcpp RcppParallel rlang shiny startup stringr synchronicity txtq]; }; diptest = derive2 { name="diptest"; version="0.75-7"; sha256="0rcgycgp0bf8vhga1wwgfcz3pqs5l26hgzsgf2f97dwfna40i1p1"; depends=[]; }; directPA = derive2 { name="directPA"; version="1.4"; sha256="0rbdygdslr2gvg4mvnp09lc9rv0sg9jwdf5a5ks50v67n25x6y5d"; depends=[calibrate rgl]; }; - directlabels = derive2 { name="directlabels"; version="2018.05.22"; sha256="0xcpc56ssb9430b0xcdhayk3qaak2qcakyss2pz14y5w2027hblv"; depends=[quadprog]; }; + directlabels = derive2 { name="directlabels"; version="2020.1.31"; sha256="08s1gnwp4bn8xahwjaq0f1qzhwh2dvybzhq3z7xyzn8cnyzmis6c"; depends=[quadprog]; }; directotree = derive2 { name="directotree"; version="1.0.0"; sha256="1yv703mb3fnvjxr2rrxvb8x869hbbjx4l94qbbsmy0ssknayq60y"; depends=[collapsibleTree data_tree]; }; - dirichletprocess = derive2 { name="dirichletprocess"; version="0.3.1"; sha256="09ibrlsbn80ghrblk6qblrs0s8fzfnjash1v7x6a2hpg92h9g86y"; depends=[ggplot2 gtools mvtnorm]; }; + dirichletprocess = derive2 { name="dirichletprocess"; version="0.3.1.1"; sha256="1sxypnhi7pnz08ys2z0riyk7x80qg7sbilkgsz3jnpqjsal6d0ha"; depends=[ggplot2 gtools mvtnorm]; }; dirmcmc = derive2 { name="dirmcmc"; version="1.3.3"; sha256="117p3jvinmha7a2phcpzq38ig05kcranp15xbxqvv0cgh3c95fjr"; depends=[mcmcse]; }; dirmult = derive2 { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; }; - disaggregation = derive2 { name="disaggregation"; version="0.1.2"; sha256="1ga87gawbivgf3zb34m0qc72v16ds5vq49gx8y5xmrgnk0975x12"; depends=[cowplot doParallel dplyr foreach ggplot2 maptools Matrix raster RcppEigen rgdal rgeos sp sparseMVN splancs TMB]; }; + disaggregation = derive2 { name="disaggregation"; version="0.1.3"; sha256="04wmwwhmcgi1cdr8iyhilsphpzb7r5xs04vhqx5z01y7cgardivx"; depends=[cowplot doParallel dplyr foreach ggplot2 maptools Matrix raster RcppEigen rgdal rgeos sp sparseMVN splancs TMB]; }; discSurv = derive2 { name="discSurv"; version="1.4.1"; sha256="0xi016ah8xc8bv92qvyslvx30anncrki49ccg3qw79yh5vzns1wk"; depends=[data_table functional mgcv mvtnorm]; }; discfrail = derive2 { name="discfrail"; version="0.1"; sha256="1ll8c0fwwmz2yw8w582422r8bk9lr1570d7m7w2n1flrnqpqmk8j"; depends=[Matrix numDeriv survival]; }; discgolf = derive2 { name="discgolf"; version="0.2.0"; sha256="07clh1awnibgrh7vl4a51r8dbya2rbmicm8v8x8mq8h8am2b3j0s"; depends=[crul jsonlite xml2]; }; @@ -6871,17 +6958,18 @@ in with self; { disclapmix = derive2 { name="disclapmix"; version="1.7.3"; sha256="0hh20ff3szh9s9r1hdymk73ysn0v5lh2gfzgqpvfvdhcc5z8xjk7"; depends=[cluster disclap MASS Rcpp RcppProgress]; }; disco = derive2 { name="disco"; version="0.6"; sha256="1abvhf0yb4mw02j1krjb7q68jpwdnl2narcalf3vkjcbflcp76z3"; depends=[ggplot2 RColorBrewer tmod]; }; discord = derive2 { name="discord"; version="0.1"; sha256="0nrjpl7l9lzkn92fwzaj3vh8zv2b6706gnh5c4zalkld0xac3c23"; depends=[dplyr]; }; + discourseGT = derive2 { name="discourseGT"; version="1.0.0"; sha256="1faq344prjmya13jxpxfdq1vh1gqkssjmsq62i8lhmk8kwkp6nax"; depends=[GGally ggplot2 ggpubr igraph network]; }; discoveR = derive2 { name="discoveR"; version="1.2.4"; sha256="0f1f4wmh4ys3awlf5kxm6l0xj2qw86y14sj03bd1gs252r43zrbg"; depends=[colourpicker DT factoextra ggplot2 rmarkdown rstudioapi shiny shinyAce shinydashboard shinydashboardPlus shinyjs stringi zip]; }; discreteMTP = derive2 { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; }; discreteRV = derive2 { name="discreteRV"; version="1.2.2"; sha256="1lhf67cccr96zl3j1sysh2bv0pbgvkbgjdzm35fvrdm7k74ypjsi"; depends=[MASS plyr]; }; - discretecdAlgorithm = derive2 { name="discretecdAlgorithm"; version="0.0.6"; sha256="10rw3x58xlhyvrnsryypy8r8hqp3nswsii37z9hzm2wa00ffl3sf"; depends=[igraph Rcpp RcppEigen sparsebnUtils]; }; + discretecdAlgorithm = derive2 { name="discretecdAlgorithm"; version="0.0.7"; sha256="01x3qfjj7dwv0m9q8zdhfrpbj9ys9y5p7d3z8ywjrqy4jw88svjs"; depends=[igraph Rcpp RcppEigen sparsebnUtils]; }; discretization = derive2 { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; }; - discrim = derive2 { name="discrim"; version="0.0.1"; sha256="1g698bimrvzbzzv6mfafwmdyyziscr055zhssnz69j250mh81kyw"; depends=[dials parsnip purrr rlang tibble withr]; }; + discrim = derive2 { name="discrim"; version="0.0.2"; sha256="0zwr0rm8qsykimsqpxv8g76fzrspkfafrf4kfqvb7z941pi65y23"; depends=[dials parsnip purrr rlang tibble withr]; }; diseasemapping = derive2 { name="diseasemapping"; version="1.4.6"; sha256="16y2w8qjq442qdbqlrg3s2mn53rlcipl22m3q168gda5klm4f7sl"; depends=[sp]; }; - disk_frame = derive2 { name="disk.frame"; version="0.3.3"; sha256="0wxc73sh8k5inwxlgrv3cjmkc6bqvdh9i1dqdpnfmxs2kirr17i8"; depends=[bigreadr bit64 crayon data_table dplyr fs fst furrr future future_apply globals glue jsonlite pryr purrr Rcpp rlang stringr]; }; + disk_frame = derive2 { name="disk.frame"; version="0.3.4"; sha256="03mm73fps4hsryk3mlw088jx2z1a75xifwbixbv4fy38xihs973j"; depends=[benchmarkme bigreadr bit64 crayon data_table dplyr fs fst furrr future future_apply globals glue jsonlite pryr purrr Rcpp rlang stringr]; }; diskImageR = derive2 { name="diskImageR"; version="1.0.0"; sha256="1r19k5fdjn6vkn11p5df77fnxfqaz3nciiaai0f3pr2bgpfppzka"; depends=[subplex zoo]; }; dismo = derive2 { name="dismo"; version="1.1-4"; sha256="1j4pzbyvn8msi3k2y79nc6pqlrald46168ibznjwrr6rdiqhy4gj"; depends=[raster sp]; }; - dispRity = derive2 { name="dispRity"; version="1.3.3"; sha256="0lq6zf335312phriyh1mz4w6rwljjdipdj0qfb3298f6nkwp2miy"; depends=[ade4 ape Claddis geiger geometry geoscale mnormt paleotree phangorn phyclust vegan]; }; + dispRity = derive2 { name="dispRity"; version="1.3.5"; sha256="1nn2bqjs0krib5z7m1mlpv5rwwv7m85vbdfz2rszx4rbfvg1nbkr"; depends=[ade4 ape Claddis geiger geometry geoscale mnormt phangorn phyclust vegan]; }; disparityfilter = derive2 { name="disparityfilter"; version="2.2.3"; sha256="0dkk3qws631mf0g02di5rsrvh5954cykysyri0g8aqgik0j9dg06"; depends=[igraph]; }; displayHTS = derive2 { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; }; dispmod = derive2 { name="dispmod"; version="1.2"; sha256="16r6is0pchzc9mxpz0c44f72j76vsh3j9damalcxajrha06dkdq4"; depends=[]; }; @@ -6898,15 +6986,15 @@ in with self; { distdrawr = derive2 { name="distdrawr"; version="0.1.3"; sha256="1c8wznfml8k5gwyanfg7rqr22a96xx8rgm7f4z3bv5gsgsbps49y"; depends=[]; }; distfree_cr = derive2 { name="distfree.cr"; version="1.5.1"; sha256="0h7cywxnasxmqnl9f2f9wp4viwvv72hjx2drr78prqy3nn3lvqwx"; depends=[]; }; distill = derive2 { name="distill"; version="0.7"; sha256="111i58s7c9q317ypnpxm1gzc8ssb3751yr4l4j1wyjv49l72sayi"; depends=[base64enc bookdown digest downloader htmltools jsonlite knitr lubridate mime png progress rmarkdown rprojroot rstudioapi stringr whisker xfun xml2 yaml]; }; - distillery = derive2 { name="distillery"; version="1.0-6"; sha256="1mi3ig9jq0kd7yrwc5m37lmrw04p1b4lirnbsxi10z3n5yay4429"; depends=[]; }; + distillery = derive2 { name="distillery"; version="1.0-7"; sha256="0w72vb3p51m0hwms9icwgy1xg3dplmpjrxibl2s92lpdrv737249"; depends=[]; }; disto = derive2 { name="disto"; version="0.2.0"; sha256="09pafy8y1ifgglqmal32dy34acx06ypsq2bgwsn6fjiqr9kw401j"; depends=[assertthat broom dplyr factoextra fastcluster fastmatch ggplot2 pbapply proxy tidyr]; }; - distory = derive2 { name="distory"; version="1.4.3"; sha256="1mszk8fv1z46d7y1q37mhq9b5yk39w2i9rq6mgdf03afdslrmrip"; depends=[ape]; }; + distory = derive2 { name="distory"; version="1.4.4"; sha256="1ljrs91h4v1h5lb295hjki8bmra2lg3d1bn5x731pnv43pf3ck06"; depends=[ape]; }; distr = derive2 { name="distr"; version="2.8.0"; sha256="1dyff4m33xmw6hxb3jxzr8vvajg3qz3rfcrfxjxwsswlddfz0zdv"; depends=[MASS sfsmisc startupmsg]; }; - distr6 = derive2 { name="distr6"; version="1.3.2"; sha256="04v98si3slhzl5z424ylpp6d9m3220w9sppjfnr1py9b1kap43gx"; depends=[checkmate data_table pracma R6 R62S3]; }; + distr6 = derive2 { name="distr6"; version="1.3.6"; sha256="133vk8n21icdacwb2f5mq1rgnxz2gy11mqirlw55srzamy9mwdfw"; depends=[checkmate data_table R6 R62S3 set6]; }; distrDoc = derive2 { name="distrDoc"; version="2.8.0"; sha256="1iq2gbfbsf3h279yh3fnqsi39gdw15vc6r1g33xcb8kgmmqmvf0p"; depends=[distr distrEx distrMod distrSim distrTeach distrTEst MASS RandVar startupmsg]; }; distrEllipse = derive2 { name="distrEllipse"; version="2.8.0"; sha256="1ymfa8xpgs8zjp4psiwmll5z0vji496fivxmcavspzxy31cw70wx"; depends=[distr distrEx distrSim mvtnorm setRNG startupmsg]; }; distrEx = derive2 { name="distrEx"; version="2.8.0"; sha256="1gwhsnlrnzyp2x97d9wfdy5pa9z3q5il934wjv4kxs9wsvkwsr5h"; depends=[distr startupmsg]; }; - distrMod = derive2 { name="distrMod"; version="2.8.3"; sha256="0zg7wc9khfi66yl80k472hwvyc3wf2kbqwd1zsp6sb44jh9hlzsw"; depends=[distr distrEx MASS RandVar sfsmisc startupmsg]; }; + distrMod = derive2 { name="distrMod"; version="2.8.4"; sha256="1mddy0pqza99x9jccxqz8gf6c4zj6cxqrk38dhd3p5lc52r76hwa"; depends=[distr distrEx MASS RandVar sfsmisc startupmsg]; }; distrRmetrics = derive2 { name="distrRmetrics"; version="2.8.0"; sha256="17kbl8b4q8w7il1f02yqr11filhbd5axjwwna20gvjim501jizwi"; depends=[distr fBasics fGarch startupmsg]; }; distrSim = derive2 { name="distrSim"; version="2.8.0"; sha256="0g16mljlz7fnb5k6c9h5vplm3n51sdbybv9cifbia0y6p9zml383"; depends=[distr setRNG startupmsg]; }; distrTEst = derive2 { name="distrTEst"; version="2.8.0"; sha256="06rdcwfgbhc81zqisg414nj0kji59xvhm782b63hk54a8b2zwhh5"; depends=[distrSim setRNG startupmsg]; }; @@ -6920,9 +7008,10 @@ in with self; { divagis = derive2 { name="divagis"; version="1.0.0"; sha256="1kcz7i3h9xxpqhlq0rl08pgcwd16ygjjmm0jjv9knn2ggc3j1jzz"; depends=[rgdal sp]; }; diveMove = derive2 { name="diveMove"; version="1.4.5"; sha256="0lik5r5y7q5r7gh9d9y9r2m8vvibn13dp9p50j0hpzk67wgw3vya"; depends=[geosphere KernSmooth quantreg uniReg]; }; diveRsity = derive2 { name="diveRsity"; version="1.9.90"; sha256="11pfq3syvjmfwfimjc2jnlprcnynvargr4yjd8h0aa6qzgdrrx5q"; depends=[ggplot2 qgraph Rcpp shiny]; }; + diverge = derive2 { name="diverge"; version="1.0.3"; sha256="0vpmlfarl9h4wymz0q4kclbycia4j6a5bclpjdbz1hac4ciw7nih"; depends=[truncnorm]; }; diverse = derive2 { name="diverse"; version="0.1.5"; sha256="10kmx3qv58xhqs1icsxqq0y0cm8y2hx9ysb65brd3hhg33alzvk3"; depends=[foreign proxy reshape2]; }; diversitree = derive2 { name="diversitree"; version="0.9-13"; sha256="00vi4klywi35hd170ksjv3xja3hqqbkcidcnrrlpgv4179k0azix"; depends=[ape deSolve Rcpp subplex]; }; - diversityForest = derive2 { name="diversityForest"; version="0.1.0"; sha256="1vxn0qzv509sqcg5ra94yw9anagrpvj90j9rkfh8v9bmmcj6pcjy"; depends=[Matrix Rcpp RcppEigen]; }; + diversityForest = derive2 { name="diversityForest"; version="0.2.0"; sha256="16qwmz6fmh7jxypp5myj55fx6fwzzm2mq59v30spp2c2zd89aya7"; depends=[Matrix Rcpp RcppEigen]; }; divest = derive2 { name="divest"; version="0.8.2"; sha256="0kzl3niscd88kzlpnx75xx6mk1jkwxwn7gm2a6vnhpvniyyk6rs8"; depends=[Rcpp RNifti]; }; divo = derive2 { name="divo"; version="1.0.1"; sha256="06c4kjl6llvvdr2gk480jcmj2abmqwph7x4vk5nflxm7piimvg7v"; depends=[cluster]; }; dixon = derive2 { name="dixon"; version="0.0-6"; sha256="1prvr16a9n7qyaznir2bl7mg6nlvbdv9pk75p3xipzjg36hwyam8"; depends=[spatstat splancs]; }; @@ -6936,29 +7025,30 @@ in with self; { dlmap = derive2 { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[ibdreg mgcv nlme qtl wgaim]; }; dlnm = derive2 { name="dlnm"; version="2.3.9"; sha256="0vbrp9x7n94wjrigw124i3i7szy0bsh4sdggi8nsizn2ccsv5pnq"; depends=[mgcv nlme tsModel]; }; dlookr = derive2 { name="dlookr"; version="0.3.13"; sha256="1i1aiy4v3bvlrz0w0hc5qlv5flqgzbgavqmaql6bc8nz5s9p071s"; depends=[classInt corrplot DMwR dplyr ggplot2 gridExtra kableExtra knitr magrittr mice moments prettydoc purrr RcmdrMisc RColorBrewer rlang rmarkdown rpart smbinning tibble tidyr tidyselect tinytex xtable]; }; - dlsem = derive2 { name="dlsem"; version="2.4.5"; sha256="0ywcssjzkdqxlmjbsqdcgl9kivih5zw865556lnxx3zqnfygxzlv"; depends=[graph Rgraphviz]; }; + dlsem = derive2 { name="dlsem"; version="2.4.6"; sha256="1h3bwqqpfjkl41b2mbfhsj0pi9kri0h0i28wiid6arjrmm87nsf8"; depends=[graph Rgraphviz]; }; dlstats = derive2 { name="dlstats"; version="0.1.3"; sha256="0inij1rzw8i683lyzvnjhfzrng7zx727y9wcijv6ny2fw64cdd6n"; depends=[ggplot2 jsonlite magrittr RColorBrewer scales]; }; + dm = derive2 { name="dm"; version="0.1.1"; sha256="15268znsb90ndpq7x55lb7brg67ydshki8mc6b53c5y6b8icl5mr"; depends=[backports cli DBI dplyr DT glue igraph lifecycle magrittr pillar purrr rlang tibble tidyr tidyselect vctrs]; }; dma = derive2 { name="dma"; version="1.4-0"; sha256="003snr09hazszwqnvjrbv8vyz6ihgcfcfhrlshg451dddn920615"; depends=[MASS]; }; dmacs = derive2 { name="dmacs"; version="0.1.0"; sha256="1prw6h8sj6fcpajg6xwqhi8v5jfl74mbjdjrdy524miw56fh9h0r"; depends=[lavaan MplusAutomation]; }; dmai = derive2 { name="dmai"; version="0.4.0"; sha256="0ma89jl0l598sffpikvjj40f2djjcnjq29k6y1bav4dm2g51qgmq"; depends=[dplyr ggplot2 magrittr stringr tibble tidyr]; }; - dmdScheme = derive2 { name="dmdScheme"; version="1.0.0"; sha256="1l3s7nf0xik8q0j7krrmh1n0g06671l4p2grmswgd4s2wgjq48k2"; depends=[digest dplyr knitr magrittr openxlsx rappdirs readxl rlang rmarkdown tibble writexl xml2 yaml]; }; + dmdScheme = derive2 { name="dmdScheme"; version="1.1.0"; sha256="1s1s16jjfmlwg29wsszmnr3a70sx5gij8gi4ign2rmgwiiyfi7ra"; depends=[digest knitr magrittr openxlsx rappdirs readxl rlang rmarkdown writexl xml2 yaml]; }; dml = derive2 { name="dml"; version="1.1.0"; sha256="0z1dalgxh5nhrac49vh60d5awzjylc8b8mn5fk379c324milm59l"; depends=[lfda MASS]; }; dmm = derive2 { name="dmm"; version="2.1-5"; sha256="1i94bsgc12ysivpy9mdmzcdfki1f84x036danki7ynrbym2b3c7a"; depends=[MASS Matrix nadiv pls robustbase]; }; dmt = derive2 { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; }; dmutate = derive2 { name="dmutate"; version="0.1.2"; sha256="06gr49j5jz6ns1zydwsqysgkigi2sbm4hdd2jbb82f05rd9spyf3"; depends=[dplyr MASS]; }; - dnet = derive2 { name="dnet"; version="1.1.6"; sha256="11zvqrlwhil19fpss14fd8iq1mbz0xn0r2cibyd40hdhaixz7nkl"; depends=[graph igraph Matrix Rgraphviz supraHex]; }; + dnet = derive2 { name="dnet"; version="1.1.7"; sha256="05mqgp8x2h6vjf8j9466kpng7bbga134c2y808qgdmjdnv9fcaxc"; depends=[graph igraph Matrix Rgraphviz supraHex]; }; dng = derive2 { name="dng"; version="0.2.1"; sha256="0yi1fs4yvlsy3j128l7s5kwq8mhdd5fr74y2bzj7cjrxi7wgz2hg"; depends=[Rcpp]; }; dnr = derive2 { name="dnr"; version="0.3.4"; sha256="0hzaa308pppq2cqpb067f3y3nyv1p2xdmgy3dykf90psnn5v011p"; depends=[arm ergm glmnet igraph network sna]; }; - do = derive2 { name="do"; version="1.1.0.0"; sha256="1v80vq8rc8ywajgi08xxkpcbhi800qjix5fyqi12ynq83wqmn93x"; depends=[data_table plyr]; }; - doBy = derive2 { name="doBy"; version="4.6-3"; sha256="1d0d6pwai1g4i5jls0jm9va29ci5hy92n5957608f3fzi1jwy635"; depends=[broom Deriv dplyr magrittr MASS Matrix pbkrtest plyr tibble]; }; + do = derive2 { name="do"; version="1.2.0.0"; sha256="093rgvwhfsgv3qmc78p69il9zk12xzzbq14dfy4x79318jaz42wh"; depends=[data_table plyr tmcn]; }; + doBy = derive2 { name="doBy"; version="4.6.5"; sha256="1ckazh701b4ilg8bj17ji903538jmb49d997gm49ah5j5jc1x0g7"; depends=[broom Deriv dplyr magrittr MASS Matrix pbkrtest plyr tibble]; }; doFuture = derive2 { name="doFuture"; version="0.9.0"; sha256="1sfymhgjph1xrw49dxyc2slxxgal7v4yanklr4zql7r4vqinhk19"; depends=[foreach future globals iterators]; }; doMC = derive2 { name="doMC"; version="1.3.6"; sha256="1cn9gxavhvjswip8pwvkpi7q6wpzdllcsdjabga8akf55nggqxr9"; depends=[foreach iterators]; }; doMPI = derive2 { name="doMPI"; version="0.2.2"; sha256="0ahwm17p3gq1yvc8v6sr6sb8z7i6zws8d1pf46qynl0gd4amg938"; depends=[foreach iterators Rmpi]; }; doParallel = derive2 { name="doParallel"; version="1.0.15"; sha256="0vnqbha3gig3awbfvsfx3ni5jir398md1n7xmsb8jihnjsk7xbbi"; depends=[foreach iterators]; }; - doRNG = derive2 { name="doRNG"; version="1.7.1"; sha256="1sb75aqkliprglfxc4x4wds6alqgzhvl2n812g1d32a88ra3slr7"; depends=[foreach iterators pkgmaker rngtools]; }; - doRedis = derive2 { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9bf5wbfm6y9gi233s8qgsk4dnr84n3nizx"; depends=[foreach iterators rredis]; }; + doRNG = derive2 { name="doRNG"; version="1.8.2"; sha256="1jff27zzrvd1fd61x2m9468h8xn3s1c9f6wibviy5zdhj5dx9s9k"; depends=[foreach iterators rngtools]; }; + doRedis = derive2 { name="doRedis"; version="2.0.0"; sha256="0lw8j339az2dgcrahmkhp7k5dpvy1dalk1sfsjp2hzfhm3xqabc8"; depends=[foreach iterators redux]; }; doSNOW = derive2 { name="doSNOW"; version="1.0.18"; sha256="0rj72z5505cprh6wykhhiz08l9bmd966srqh2qypwivf321bvrvh"; depends=[foreach iterators snow]; }; - dobin = derive2 { name="dobin"; version="1.0.1"; sha256="11k97bmgigkiqkz9r5ilap5l2xdpwprl9v7f73rckxcw6pwsnlk3"; depends=[FNN pracma]; }; + dobin = derive2 { name="dobin"; version="1.0.2"; sha256="1vhvwdl7a8bf4q64jz8a6afm3smdn3jgxvs17jjlilarpdazl3p5"; depends=[pracma RANN]; }; dobson = derive2 { name="dobson"; version="0.4"; sha256="0xfn7s3wzrv1md40bdjrnjfiqyxg5c6lrcpnvayjdgrhxq161hhq"; depends=[]; }; dockerfiler = derive2 { name="dockerfiler"; version="0.1.3"; sha256="128648s9lj96p3nlxwy4gs108w5kjcg6w48nfx3r52gb8w2z7948"; depends=[attempt glue R6]; }; docknitr = derive2 { name="docknitr"; version="1.0.1"; sha256="1mhdjv6yznzyx911f0m3m0i7jlzj7h12ikkxb9b6zj68bdplv30b"; depends=[knitr rstudioapi sys]; }; @@ -6971,13 +7061,14 @@ in with self; { documenter = derive2 { name="documenter"; version="0.1.1"; sha256="0y6zrvmb9bhc1ni4v89h9pq5ara8p2v4b35ylasia5s9x1y93mcp"; depends=[htmltools magrittr officer xml2 yaml]; }; docxtools = derive2 { name="docxtools"; version="0.2.1"; sha256="09fcamrr3yw1zrj4bx8ra9yidprk1h44p48by85zjqwd1ly4gqbf"; depends=[dplyr ggplot2 lubridate purrr rlang stringr tidyr]; }; docxtractr = derive2 { name="docxtractr"; version="0.6.1"; sha256="03bcaiwxxybbdxh26rp4bl66aiv4hxmgn21w6dxm383xha03iqfw"; depends=[dplyr httr magrittr purrr xml2]; }; - dodgr = derive2 { name="dodgr"; version="0.2.5"; sha256="0n4jh7rdj4qxmi1wns3ida8pa7rlvz6lrjl0n9ba18w3mgg1z483"; depends=[callr digest igraph magrittr osmdata Rcpp RcppParallel]; }; + dodgr = derive2 { name="dodgr"; version="0.2.6"; sha256="0fy7dd4gi1kymmlipz5xgl9sx9m7rybhqm6jjjj36bjmik90g675"; depends=[callr digest magrittr osmdata Rcpp RcppParallel RcppThread]; }; doex = derive2 { name="doex"; version="1.2"; sha256="1r999z30ipa04pgck0hfalqxihb1bj8sdhlkkhf4plb7maaz3qm3"; depends=[]; }; dominanceanalysis = derive2 { name="dominanceanalysis"; version="1.3.0"; sha256="0850z2ppdgbfwbv8l40ngl00n4mdj4ciky1g918zazd3jrg88s38"; depends=[]; }; domino = derive2 { name="domino"; version="0.3.1"; sha256="0f67w0z5jy82kgm3l1rji430ayigw30vmmwp3i1nz0xibsx7jxv4"; depends=[]; }; - donut = derive2 { name="donut"; version="1.0.0"; sha256="1m10kcdcr9ma4zmc1gj3lyza8zxvnn57wvxznaappaba4a5b47v2"; depends=[]; }; + donut = derive2 { name="donut"; version="1.0.1"; sha256="17qiy9j0qm2q2gcysd5717bdl9nmkd7pd5z22pcj3icvxcpssval"; depends=[]; }; doremi = derive2 { name="doremi"; version="0.1.1"; sha256="1h36sj60l5sd5ybbdyrv0wkr9p18j7iwg111khq0znb71xi5nzp7"; depends=[data_table ggplot2 lme4 lmerTest zoo]; }; dosearch = derive2 { name="dosearch"; version="1.0.4"; sha256="1hq85jym0plf8hj77bfd623nhyjgfqqzm1w92n3lii3j5lv9vrwg"; depends=[Rcpp]; }; + dosedesignR = derive2 { name="dosedesignR"; version="0.2.4"; sha256="0c8rilx4afih457f9gafgijm569g366lp4wms0vhc0f9kgr1z8h3"; depends=[DoseFinding DT ggplot2 lattice latticeExtra shiny shinyjs]; }; dosresmeta = derive2 { name="dosresmeta"; version="2.0.1"; sha256="0qdalzdk7q4wx3vl5f3i64m8cb7vhi4pqzghar32j0a7l6gla04z"; depends=[mvmeta]; }; dostats = derive2 { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; }; dotCall64 = derive2 { name="dotCall64"; version="1.0-0"; sha256="1b8p7m3w0m7bp977c6jz74xkd611cxg11j49yza59k5fp338scb9"; depends=[]; }; @@ -6987,17 +7078,16 @@ in with self; { doubcens = derive2 { name="doubcens"; version="1.1"; sha256="1hn65n67by3xqbcnaf5jja5pli0g6wpbbz2sfzd7i2nms7kiywhp"; depends=[]; }; double_truncation = derive2 { name="double.truncation"; version="1.4"; sha256="190fwl119ycmiszkq0mqc6dh8adwqx7b0ipmhz71qvqdzgh9gjm9"; depends=[]; }; downloader = derive2 { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; }; + downloadthis = derive2 { name="downloadthis"; version="0.1.3"; sha256="187vgc9rmqq8iqqyqc79rd5q0ccnfs65794gs2pna1ma94ahcxc4"; depends=[base64enc bsplus fs htmltools magrittr mime purrr readr rmarkdown writexl]; }; downscale = derive2 { name="downscale"; version="3.0-1"; sha256="0kmv4d5fa6mmhmbfqfxzk1gv55j15d7madsdqi8470bwh0kkya4y"; depends=[cubature minpack_lm raster Rmpfr sp]; }; downscaledl = derive2 { name="downscaledl"; version="1.0"; sha256="0lqxngzpxj65b48j5w0n8dg6fp4lgg5zpgxc2wj6d9wh5f97l71b"; depends=[dplyr keras magrittr raster Rcpp RcppArmadillo rgdal rstack sp tensorflow]; }; downsize = derive2 { name="downsize"; version="0.2.2"; sha256="18b9shd79z0bsdnp0apqqwv6c73j4wnfiv41ywqz761nmxbldxbn"; depends=[magrittr R_utils]; }; dpa = derive2 { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[igraph sem]; }; dparser = derive2 { name="dparser"; version="0.1.8"; sha256="1yx425s3iq03j043g41pyfp3cgmajb4qh50zirhd0qpplzwy8xj5"; depends=[digest]; }; - dpcR = derive2 { name="dpcR"; version="0.5"; sha256="17l9g11qqs2fkskg331889m8nkkrwzrq0n684rdn62pnd5j2n5pi"; depends=[binom chipPCR dgof e1071 evd multcomp pracma qpcR rateratio_test readxl shiny signal spatstat]; }; dpcid = derive2 { name="dpcid"; version="1.0"; sha256="1gx8gyrxvm07mjiasl0b80y0x3crq6gy170v6s817d11jw44n86z"; depends=[]; }; - dpglasso = derive2 { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; }; - dplR = derive2 { name="dplR"; version="1.7.0"; sha256="1ylzki6wvsbcxlz4k532a8yh0kwc6817vkbks7l060acssbycipr"; depends=[digest lattice Matrix matrixStats plyr png R_utils signal stringi stringr XML]; }; + dplR = derive2 { name="dplR"; version="1.7.1"; sha256="1df4g9zz47h0flx5ww6bvlm364q81l2c5flzpa985sv87rq6cz4j"; depends=[digest lattice Matrix matrixStats plyr png R_utils signal stringi stringr XML]; }; dplRCon = derive2 { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; }; - dplyr = derive2 { name="dplyr"; version="0.8.3"; sha256="032c89wa04g9rih9shyvwl3il0bsrv3xk489x6867sk9bb3amd38"; depends=[assertthat BH glue magrittr pkgconfig plogr R6 Rcpp rlang tibble tidyselect]; }; + dplyr = derive2 { name="dplyr"; version="0.8.5"; sha256="0602b4a9nffxx67q57csqp87nkrv33nn9wlaw1458yys9fzx6l2p"; depends=[assertthat BH ellipsis glue magrittr pkgconfig plogr R6 Rcpp rlang tibble tidyselect]; }; dplyr_teradata = derive2 { name="dplyr.teradata"; version="0.3.2"; sha256="1pq630hlvpfrhaxqn6yh0kgapgibrnbic78g130d40visak60j1p"; depends=[bit64 DBI dbplyr dplyr odbc rstudioapi]; }; dplyrAssist = derive2 { name="dplyrAssist"; version="0.1.0"; sha256="1lqizh70b1apyr4578917gv6s0i7p84ak96a57kvwipmh36a4ywn"; depends=[DT magrittr miniUI plyr rstudioapi shiny shinyAce shinyWidgets stringr tidyr tidyverse]; }; dpmr = derive2 { name="dpmr"; version="0.1.9"; sha256="1cnjywkvjb4fhbf4shjmsrq47f1fg2x21hcm1q5512bm0wg9i6jd"; depends=[digest httr jsonlite magrittr rio]; }; @@ -7007,14 +7097,14 @@ in with self; { dqshiny = derive2 { name="dqshiny"; version="0.0.3"; sha256="1fra6fbv8if7wwr8vi3261rdzv4kj99y841lb9xiv1mh72r3mx58"; depends=[htmltools shiny]; }; dr = derive2 { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; }; dr4pl = derive2 { name="dr4pl"; version="1.1.11"; sha256="0vv3h4sxw38grhr70s28sxkca20adnqdmpp8qqwlbr3dw950yaa3"; depends=[ggplot2 Matrix matrixcalc Rdpack tensor]; }; - drLumi = derive2 { name="drLumi"; version="0.1.2"; sha256="09ps8rcqrm6a1y8yif2x82l0k4jywq60pkndh9nzfpbsw4ak2lby"; depends=[chron gdata ggplot2 Hmisc irr minpack_lm msm plyr reshape rootSolve stringr]; }; dragon = derive2 { name="dragon"; version="0.2.1"; sha256="1y2dav9151zdcqw1maxhh3s4c1syk5rs8yb8grx8xkffvg5123w7"; depends=[broom colorspace colourpicker cowplot DT igraph magrittr RColorBrewer shiny shinyBS shinydashboard shinythemes shinyWidgets tidyverse visNetwork]; }; dragonking = derive2 { name="dragonking"; version="0.1.0"; sha256="01b01wd1s2b8sa9f0kfbf2pbzhaqra7xxskigqh3vlj389xqm1id"; depends=[]; }; dragulaR = derive2 { name="dragulaR"; version="0.3.1"; sha256="1cw5v7m1b4pxsizsjb3zdzhydxj577p6q5fcjklsvpzmiixzlyav"; depends=[htmlwidgets shiny shinyjs]; }; - drake = derive2 { name="drake"; version="7.9.0"; sha256="1p3d14yi65p7x2hpvfhvwpbaasawvj3i0h9ws1ic4c096gclw1b3"; depends=[base64url digest igraph rlang storr txtq vctrs]; }; + drake = derive2 { name="drake"; version="7.12.0"; sha256="1whiw94qmmwf0q3kl2r6qh759zmrfzm39ba3yciillykc8xqmnkh"; depends=[base64url digest igraph rlang storr txtq vctrs]; }; drat = derive2 { name="drat"; version="0.1.5"; sha256="0i80c4hyclwnq8g8amvdid9pwr11mwbscwydaxmvbrbhv3qzjg6d"; depends=[]; }; draw = derive2 { name="draw"; version="1.0.0"; sha256="0kbz8rcgygl4fhmljzaan5jl7wjvfljcaykm7q9lw9s6m78p06gz"; depends=[]; }; drc = derive2 { name="drc"; version="3.0-1"; sha256="0c8xn8ripzq270hy8d16fcnx02l02alddznd7fqwk3jyi6113h1y"; depends=[car gtools MASS multcomp plotrix scales]; }; + dreamerr = derive2 { name="dreamerr"; version="1.0.0"; sha256="1ri5krfkk538x0afgs6jqv34sg3vad4dn2r395iivixpd77swvg1"; depends=[Formula]; }; drfit = derive2 { name="drfit"; version="0.7.2"; sha256="03ahzmjzrkdrv36yj6vfg3g5bwn6lb7mlxmli68sixag5h83xq7f"; depends=[DBI drc MASS odbc qcc reshape2]; }; drgee = derive2 { name="drgee"; version="1.1.10"; sha256="0hy7887mvlxh73zk2yzp46bqakq924n940j21lw25jgygmzz1176"; depends=[data_table nleqslv Rcpp RcppArmadillo survival]; }; driftR = derive2 { name="driftR"; version="1.1.0"; sha256="0mvrmwfqg234kk5klhmw7vmf8i0g485xkx5nk73iam16fbzl9y5g"; depends=[dplyr glue janitor lubridate magrittr readr readxl rlang stringr tibble]; }; @@ -7022,45 +7112,47 @@ in with self; { drmdel = derive2 { name="drmdel"; version="1.3.1"; sha256="1bpm9jj9dxk2daxp1yb7pn9jd750p27qa84vdfxpacm5r0mggnys"; depends=[]; }; dropR = derive2 { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; }; droptest = derive2 { name="droptest"; version="0.1.3"; sha256="1wlfhj6c4pb5mcybyd2bcn55y3azk7dv7d7il97qwbhl8kf59csl"; depends=[data_table]; }; - drsmooth = derive2 { name="drsmooth"; version="1.9.0"; sha256="1wgi961bvbsnq4bygxbpy4sy5fy34lrrkaaj0r2rxcahwa1sc38n"; depends=[boot car DTK lubridate mgcv multcomp pgirmess segmented]; }; drtmle = derive2 { name="drtmle"; version="1.0.5"; sha256="1gnzprdjs4aws5q92a0dmlfzpwi3in3rsylbwr0r6cnghymgs69s"; depends=[doFuture future future_apply future_batchtools np SuperLearner]; }; drugCombo = derive2 { name="drugCombo"; version="1.1.1"; sha256="0f4akxmj5jd89jm7kzkmqksxmb6fqj7jawvm3hpw6limyry3mp4z"; depends=[BIGL Deriv ggplot2 minpack_lm nlme rgl]; }; drumr = derive2 { name="drumr"; version="0.1.0"; sha256="09xi3sf424bpq10fq25j209dylfbi1lfd911r44ffadkxzvp5p1s"; depends=[audio stringr]; }; ds = derive2 { name="ds"; version="4.0"; sha256="1iic5fb27cnhsa83zg28hydrhzc01i9z0711xvk95c3gv7mbfp2p"; depends=[]; }; - ds4psy = derive2 { name="ds4psy"; version="0.1.0"; sha256="15knnl0ld8vnb3mv06p7425h7w5y5m598k4dny8svqwranhs856a"; depends=[cowplot ggplot2 here readr stringr tibble tidyr tidyverse unikn]; }; - dsa = derive2 { name="dsa"; version="0.70.3"; sha256="0ilfrrfdvw86p6q5jskh0fqnqrcz75j2ldzhvwfpbdr9bh65jfai"; depends=[dygraphs extrafont forecast ggplot2 gridExtra htmlwidgets R2HTML reshape2 rJava timeDate tsoutliers xtable xts zoo]; }; + ds4psy = derive2 { name="ds4psy"; version="0.2.0"; sha256="0gh224lyrbrky9p68cp47w7zzp8gmy3hgd9dzq0fng47lx97v6dq"; depends=[cowplot dplyr ggplot2 here magrittr tibble unikn]; }; + dsa = derive2 { name="dsa"; version="0.74.18"; sha256="17pyr5jn6mjcch5cl22z8mg31anirmgdjs6k9vjmz5ar35fcb1vi"; depends=[dygraphs extrafont forecast ggplot2 gridExtra htmlwidgets R2HTML reshape2 rJava timeDate tsoutliers xtable xts zoo]; }; dsample = derive2 { name="dsample"; version="0.91.2.2"; sha256="18c0zxaqwgbn9kmkwlnicwd74ljy2sxj0b9ksif13pdlj3zn57h1"; depends=[MASS]; }; - dscore = derive2 { name="dscore"; version="1.0.0"; sha256="1569bv769izsbqslbij69nq5lagd2676zavs9fkwbsqw7j9nb5x0"; depends=[dplyr Rcpp RcppArmadillo stringr tidyr]; }; - dse = derive2 { name="dse"; version="2015.12-1"; sha256="1976h57zallhzq43nshg77bsykcvkfwnasha1w59c44fjpl1gs9w"; depends=[setRNG tfplot tframe]; }; + dscore = derive2 { name="dscore"; version="1.2.0"; sha256="01lv9yq5d817rx686l1cw1s2265a7wx9g41xhsdx59wkz37wrzwv"; depends=[dplyr Rcpp RcppArmadillo stringr tidyr]; }; + dse = derive2 { name="dse"; version="2020.2-1"; sha256="170rxrniszs8h59ah4mn4mz8d7kzix4g3vlz4icd8w6bl40c6ykc"; depends=[setRNG tfplot tframe]; }; dslabs = derive2 { name="dslabs"; version="0.7.3"; sha256="0fhd6zwa4lmgrrybywvj1vxd98a483yca605dj2pwipqifh1x6ka"; depends=[ggplot2]; }; dslice = derive2 { name="dslice"; version="1.2.0"; sha256="1k9hxpmr563p8bpd9m991lx5ig366mzk9j1lzldci9pq4jiayin1"; depends=[ggplot2 Rcpp scales]; }; - dsm = derive2 { name="dsm"; version="2.2.17"; sha256="0n2nn05zb8zd2wah1cfzv8a9qwbh6an3jwsfy0x6lbkk63bs5mxw"; depends=[ggplot2 mgcv mrds nlme numDeriv plyr statmod]; }; - dsmodels = derive2 { name="dsmodels"; version="1.1.0"; sha256="0gidxi4ph49mjm2hdf9flphfb9916al4cpdkiig504n7ms2sbpbg"; depends=[latex2exp pryr shape]; }; + dsm = derive2 { name="dsm"; version="2.3.0"; sha256="0b7jdhfrpkyjhxxlkgxsnnidmmpbb3jkx41iqmp08bxipbjyw4kr"; depends=[ggplot2 mgcv mrds nlme numDeriv plyr statmod]; }; dsr = derive2 { name="dsr"; version="0.2.2"; sha256="0bs5aspi2khs9n60q7d2ah6zv4rzhbyk2bafd17c12jzjqlh1228"; depends=[dplyr frailtypack rlang]; }; dsrTest = derive2 { name="dsrTest"; version="0.2.1"; sha256="1kljlfi7jf6fa8b5f3wxjsa9rlmzcp4qix3m2qyapz2lqd85mbb7"; depends=[asht exactci loglognorm]; }; - dssd = derive2 { name="dssd"; version="0.2.0"; sha256="0g99aaywqlvs9ycb3mkbkziclvrsdknpv3jg340z03panph4yr1q"; depends=[lwgeom plot3D rgdal sf]; }; - dst = derive2 { name="dst"; version="1.4.0"; sha256="0zr04m33ky98y5n6jbczcfn898i7y8zc1hygfm8p9rrnw93d2lin"; depends=[]; }; + dssd = derive2 { name="dssd"; version="0.2.1"; sha256="0lfr3bb3nba6pkg13d3kiblbp4naqxcdkvdqsa0y1zlhak74cgcj"; depends=[plot3D rgdal sf]; }; + dst = derive2 { name="dst"; version="1.4.1"; sha256="1cz1fcyxpyv0ywmwlqdhgj3nzidnzcaxc1nkh8y5mph9wm612c25"; depends=[]; }; + dstack = derive2 { name="dstack"; version="0.2.0"; sha256="091hxqg6sy0qsz6jypi1nybg42mgdqw2ygkpmr5bnpc0n8yp55mq"; depends=[base64enc httr nanotime rjson rlist uuid yaml]; }; dstat = derive2 { name="dstat"; version="1.0.4"; sha256="023jp0xdbg200ww1gnr3fzgjqd82acag0jps7q6j6m27q11psvgz"; depends=[]; }; dtangle = derive2 { name="dtangle"; version="2.0.9"; sha256="0yg1fbrqixqp93vdw3grvz1la5l2kidgs730qp6yihkp3260cxf3"; depends=[DEoptimR]; }; + dti = derive2 { name="dti"; version="1.5.1"; sha256="08da7v7sl88g2jixfplvw9rc5rvlifq3fvyrgh9naa5jsmd8h5ia"; depends=[adimpro aws awsMethods gsl oro_dicom oro_nifti quadprog rgl]; }; dtp = derive2 { name="dtp"; version="0.1.0"; sha256="0qy8nrbq22bfbajkxq6blkq7583pc5mb392gmqb3c9daxmqn42vb"; depends=[Formula gtools plyr]; }; dtpcrm = derive2 { name="dtpcrm"; version="0.1.1"; sha256="0k25fm0z3snpx1v2kwd50svgnkjhn5c0hy1gnlw2lif6rjz1fzd9"; depends=[dfcrm diagram]; }; dtplyr = derive2 { name="dtplyr"; version="1.0.1"; sha256="0jgisglpaj1n6jhwqwsa1583i4ifazqdd9hh581w5akx5p0f05mp"; depends=[crayon data_table dplyr rlang tibble tidyselect]; }; dtree = derive2 { name="dtree"; version="0.4.2"; sha256="1cpv0pyf515610djxzfw1c83p3alk5a93clg4x9gk7a7qy4cyhr1"; depends=[caret evtree party partykit rpart]; }; dtt = derive2 { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; }; - dttr2 = derive2 { name="dttr2"; version="0.0.1"; sha256="042zll9hw4ljwr85x4dmkv8nz6r0mpawaa5s58ngxypshss8sbg0"; depends=[checkr hms]; }; + dttr2 = derive2 { name="dttr2"; version="0.1.0"; sha256="0fy4prwbg1jr27d6xfs46gyrqn21w513vq48cgw7pyls7zrqigys"; depends=[chk hms lifecycle]; }; dtw = derive2 { name="dtw"; version="1.21-3"; sha256="02hyhx1sy5h3vzh9zixy18a7d47df4k5d0wyflcvlcbsbcl6p90s"; depends=[proxy]; }; - dtwSat = derive2 { name="dtwSat"; version="0.2.5"; sha256="0qvjzqmi6plkq5l4r52c7wil58n41l5f5dxzpk9r4yis8bdm5zlq"; depends=[caret dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer Rdpack reshape2 rgdal scales snow sp xtable zoo]; }; + dtwSat = derive2 { name="dtwSat"; version="0.2.6"; sha256="1mx3xxhf2ywi6cia47sn77wzxd8rg9wir7r8dx92k5dvawr425ki"; depends=[caret data_table dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer Rdpack reshape2 rgdal scales snow sp xtable zoo]; }; dtwclust = derive2 { name="dtwclust"; version="5.5.6"; sha256="05dszmj89id2hk9apxa7721737s6292w2l7vazj7aqwk1jyghjpm"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel RcppThread reshape2 RSpectra shiny shinyjs]; }; dual = derive2 { name="dual"; version="0.0.3"; sha256="1alxh9mj610m7wgr6a97mpzy5ia9vzckhz6wmxyix7xh9mzbn1gw"; depends=[]; }; + dualtrees = derive2 { name="dualtrees"; version="0.1.4"; sha256="05mxwiwnv48jf6ya5qmfc7g2w8wkzhk56k9g0gr2m4cpfab7d5h2"; depends=[]; }; duawranglr = derive2 { name="duawranglr"; version="0.6.5"; sha256="04w8ll6p8m0ljcp96sfp028afgxddk4wyncfdwiywi0ps34zh084"; depends=[digest dplyr haven readr readxl]; }; dub = derive2 { name="dub"; version="0.2.0"; sha256="066lzyk44380mf17vx4db4a3a4rs7zl85mj5hjg172khjbqnbixw"; depends=[]; }; duckduckr = derive2 { name="duckduckr"; version="1.0.0"; sha256="1wki8xvqp5hr27iafd9jbryl9faywfkdkpn0pa0afywbic39k2cm"; depends=[crul jsonlite]; }; dummies = derive2 { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; }; dummy = derive2 { name="dummy"; version="0.1.3"; sha256="081a5h33gw6ym4isy91h6mcf247c2vsdygv9ll07a3mgjcjnk79p"; depends=[]; }; + dundermifflin = derive2 { name="dundermifflin"; version="0.1.1"; sha256="0rp8p4ln92kfxkczl7vi9r2jhxb1ky203s02940cjjkczsphpcc1"; depends=[crayon stringi]; }; dunn_test = derive2 { name="dunn.test"; version="1.3.5"; sha256="0lqwvyl3pyygfc73nf81gzw3zl3w43r7ki0yw2dgrzhkpb2iji4a"; depends=[]; }; dupiR = derive2 { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; }; - dupree = derive2 { name="dupree"; version="0.2.0"; sha256="12dlqmvk2zlxh283xjf2d6x12cy6r3rsy88y5g40h9002m7i2jqy"; depends=[dplyr lintr magrittr purrr rlang stringdist tibble]; }; - durmod = derive2 { name="durmod"; version="1.1-2"; sha256="1mp97x8px4s53m91m5vnkixgz087wgd4bas64xdbki6y53zimzjj"; depends=[data_table mvtnorm nloptr numDeriv Rcpp]; }; + dupree = derive2 { name="dupree"; version="0.3.0"; sha256="0q8c0z1yhym20rhfjrc8n03gk458z0n8axx013rcwk1vc2zwk670"; depends=[dplyr lintr magrittr purrr rlang stringdist tibble]; }; + durmod = derive2 { name="durmod"; version="1.1-4"; sha256="0d721sbxjfh00gpxd4hj8iq04awfd0pcd6bw8cv7kny21l2f3w44"; depends=[data_table mvtnorm nloptr numDeriv Rcpp]; }; dvmisc = derive2 { name="dvmisc"; version="1.1.4"; sha256="01v6sixx0f3nrn6ymfifb3pvd2msfrwm21kmdv38laxq29vc4rsi"; depends=[cubature data_table dplyr ggplot2 MASS mvtnorm pracma rbenchmark Rcpp survey tab]; }; dwdradar = derive2 { name="dwdradar"; version="0.2.0"; sha256="06wa3m77931lv47530hyczwdjrrfdmgczmbhwy0z9fzhn8kz0ipp"; depends=[]; }; dwlm = derive2 { name="dwlm"; version="0.1.0"; sha256="0n5dil9qvyy4gish3wnv8bzq0ci1p0dr2vmbbadl29jl7rd1v0rc"; depends=[]; }; @@ -7073,14 +7165,14 @@ in with self; { dynOmics = derive2 { name="dynOmics"; version="1.2"; sha256="0fsck5wx4rcfckjr6xg0s3a6cvh4881cqzy0af91icqg0p3zjj2l"; depends=[ggplot2 gplots]; }; dynRB = derive2 { name="dynRB"; version="0.15"; sha256="0fa6g4aj2cncg6mi0yc2yn6321qi7fz9d9cvqrnxhcnbbghdyzq9"; depends=[corrplot dplyr foreign ggplot2 RColorBrewer reshape2 vegan]; }; dynaTree = derive2 { name="dynaTree"; version="1.2-10"; sha256="1ng672mlv98xnsbd4xq70hxc8j158la4n63y46rw74granaz29ya"; depends=[]; }; - dynamac = derive2 { name="dynamac"; version="0.1.10"; sha256="10qz2wx39rb7d1z0drzxm4m30bg9hvi3bjr9m10z3hdkzsg1ybvw"; depends=[lmtest MASS]; }; + dynamac = derive2 { name="dynamac"; version="0.1.11"; sha256="0dzw4h128z53vwdpkikhxqil0xjrcjrp1zmz0fy2qhq0n74sdyar"; depends=[lmtest MASS]; }; dynamicGraph = derive2 { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; }; dynamicTreeCut = derive2 { name="dynamicTreeCut"; version="1.63-1"; sha256="1fadbql7g5r2vvlkr89nlrjxwp4yx4xrdqmv077qvmnx9vv0f4w3"; depends=[]; }; dynamichazard = derive2 { name="dynamichazard"; version="0.6.6"; sha256="1ad4ymi28yx6vh3x8p4pm4ph81fb9fkhk4zfhbl60522d4kjbsjq"; depends=[boot Rcpp RcppArmadillo survival]; }; dynamo = derive2 { name="dynamo"; version="1.0"; sha256="0arsv686ix7xpca57ayqgifim1q35dl4w2mx7fw8bc0lidapilyp"; depends=[abind glamlasso MortalitySmooth Rcpp RcppArmadillo]; }; dynatopmodel = derive2 { name="dynatopmodel"; version="1.2.1"; sha256="0lpfhj69bvagqzzg2kjqvn9xx8f93ii34flrrns20z3bxla6gds9"; depends=[deSolve lubridate maptools raster rgdal rgeos sp topmodel xts zoo]; }; dyncomp = derive2 { name="dyncomp"; version="0.0.2-1"; sha256="13wp2k8nbgrbrqng2dmgy0ixgidk51wq9y7mv5pdbvdajxdsyh11"; depends=[zoo]; }; - dyndimred = derive2 { name="dyndimred"; version="1.0.2"; sha256="1iqn28vl1vf0jbs0jrngg711lzsrliksvxyf1c8d9zp8k4glris0"; depends=[dynutils irlba]; }; + dyndimred = derive2 { name="dyndimred"; version="1.0.3"; sha256="03znghb5nygggwfmy9id07fn1wfkhwyzyzahdrlx68pg03dhlbg5"; depends=[dynutils irlba lmds]; }; dynetNLAResistance = derive2 { name="dynetNLAResistance"; version="0.1.0"; sha256="018y3m648ni31rlisjfnrx1d10mm48wpxanlnnxxpnqxjcywg2x8"; depends=[doParallel foreach igraph]; }; dynfrail = derive2 { name="dynfrail"; version="0.5.2"; sha256="1q7ml24j0ycy2bwpa14vl96315ni7x9rfp0qmf36w00mylgc3ry6"; depends=[dplyr magrittr Rcpp RcppArmadillo survival tibble tidyr]; }; dynia = derive2 { name="dynia"; version="0.2"; sha256="1swip4kqjln3wsa9xl0g92zklqafarva923nw7s44g4pjdy73d5l"; depends=[]; }; @@ -7089,38 +7181,39 @@ in with self; { dynparam = derive2 { name="dynparam"; version="1.0.0"; sha256="0rzkksb0j7vybz4mk9c4sm3zcxdjll1bqx54cbal8a0iq259rigp"; depends=[assertthat carrier dplyr dynutils Hmisc magrittr purrr stringr testthat tibble tidyr]; }; dynpred = derive2 { name="dynpred"; version="0.1.2"; sha256="111ykasaiznn3431msj4flfhmjvzq7dd1mnzn1wklc5ndix1pvf9"; depends=[survival]; }; dynprog = derive2 { name="dynprog"; version="0.1.1"; sha256="11zsx2c4hv7k22pw85aa01zk4r0qpzwnf73ynylkfxfbi87rda9s"; depends=[rlang]; }; - dynr = derive2 { name="dynr"; version="0.1.15-1"; sha256="1vd93mckc8q8wvs3sgly7j1vn1i2qis6pcyqiag6nqz5xjfv6rn4"; depends=[car deSolve fda ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr Rdpack reshape2 stringi tibble xtable]; }; - dynsbm = derive2 { name="dynsbm"; version="0.6"; sha256="0sdy42ihymhzx577jc2qr7lwirc9lviz3sagfy09zhbwizz5a4kw"; depends=[RColorBrewer Rcpp riverplot]; }; + dynr = derive2 { name="dynr"; version="0.1.15-25"; sha256="1kwrx1wg7hwgwkdgws8pvdv2yj5m77xp7fnpxlj50c7xm3chjm78"; depends=[car deSolve fda ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr Rdpack reshape2 stringi tibble xtable]; }; + dynsbm = derive2 { name="dynsbm"; version="0.7"; sha256="169yk539vynjbn89q6vs3l3fx7hk8n3i1msa4jws5vypgljc2rir"; depends=[RColorBrewer Rcpp riverplot]; }; dynsim = derive2 { name="dynsim"; version="1.2.1"; sha256="0nkxn9v4f353fhcn1vsdrh29mrms10zid63b84flg3c6hvc0x4qr"; depends=[ggplot2 gridExtra MASS]; }; dynsurv = derive2 { name="dynsurv"; version="0.3-7"; sha256="0ar8n84fpfy68cx321syg8hvjxjnh00mw0a9sid9dw58f956phf8"; depends=[BH ggplot2 nleqslv plyr reshape survival]; }; - dynutils = derive2 { name="dynutils"; version="1.0.4"; sha256="1rzwcfbv5aqa08fy9i1fiz4a7v3z2skyyjz392rjsbwpnlk77ryh"; depends=[assertthat crayon desc dplyr magrittr Matrix proxyC purrr Rcpp remotes stringr tibble]; }; - dynwrap = derive2 { name="dynwrap"; version="1.1.4"; sha256="11c8rd9yv54a7g1ypdniw4vchcpa3lbijnh67srp6fymrlf82z7d"; depends=[assertthat babelwhale crayon dplyr dynparam dynutils FNN glue hdf5r igraph jsonlite magrittr Matrix processx purrr readr reshape2 stringr testthat tibble tidyr yaml]; }; + dynutils = derive2 { name="dynutils"; version="1.0.5"; sha256="1vcnz0yrss64i8pw459z2kp17b0fqgw41rpxbzpixhsqsz9sy22x"; depends=[assertthat crayon desc dplyr magrittr Matrix proxyC purrr Rcpp remotes stringr tibble]; }; + dynwrap = derive2 { name="dynwrap"; version="1.2.0"; sha256="10j1lp3118ad4q09i0ml162lq33mlipr22nfib120mzx5dj3fgp2"; depends=[assertthat babelwhale crayon dplyr dynparam dynutils FNN glue igraph magrittr Matrix processx purrr readr reshape2 stringr testthat tibble tidyr yaml]; }; e1071 = derive2 { name="e1071"; version="1.7-3"; sha256="0pf2pjb590z0jikgv1037xcp7dq06mg3dzmyffjw6gk7dd9blbdv"; depends=[class]; }; eAnalytics = derive2 { name="eAnalytics"; version="0.1.4"; sha256="15hhd4q2yxzq3a3awvk81ixa43hk519ym8ap7v1ahghyr0njnyyf"; depends=[dplyr DT energyr googleVis leaflet plotly shiny shinydashboard shinytest shinyWidgets]; }; eChem = derive2 { name="eChem"; version="1.0.0"; sha256="0wmf204hqd4s5har5l9bkcbrbmbqbb8m11w2aivi2gs98f3hy51p"; depends=[animation plot3D]; }; eDMA = derive2 { name="eDMA"; version="1.5-3"; sha256="0wyp81si6lcispqng4c7lii22qbyblvijgnlxvcsnkcxj5hpm76j"; depends=[Rcpp RcppArmadillo xts zoo]; }; eGST = derive2 { name="eGST"; version="1.0.0"; sha256="0qi4vg0pwy55js9ww1cw85ssim3x7s2p98cjijxvlrvid8sns5bq"; depends=[MASS matrixStats mvtnorm purrr]; }; eMLEloglin = derive2 { name="eMLEloglin"; version="1.0.1"; sha256="087zw48lykls2jcsmpqd5jkrlpr0j423snp00liszjhdpdh59saq"; depends=[lpSolveAPI]; }; + eNchange = derive2 { name="eNchange"; version="1.0"; sha256="07vdi05fr6mynb86haas21izdcjiagw14p1h8n0qr1hb3klvs8n5"; depends=[ACDm doParallel foreach hawkes iterators Rcpp]; }; eNetXplorer = derive2 { name="eNetXplorer"; version="1.1.0"; sha256="1n84rf9axvvjf6s0mamf5z889hg3y32mhypasmxc455698z3d1k5"; depends=[calibrate expm glmnet gplots Matrix progress RColorBrewer survcomp survival survivalROC]; }; ePCR = derive2 { name="ePCR"; version="0.9.9-11"; sha256="0bkvjvygdnzcc23sslgkcrx11mzwgsqss37lwnbr7rq0jp1sw46s"; depends=[Bolstad2 glmnet hamlet impute pracma survival timeROC]; }; eRTG3D = derive2 { name="eRTG3D"; version="0.6.2"; sha256="04m39jkp4lvv145wmcswc87qx36wpfkm95kq9fik8a3jb5myvjll"; depends=[CircStats ggplot2 gridExtra pbapply plotly plyr raster rasterVis sp tiff]; }; - eRm = derive2 { name="eRm"; version="1.0-0"; sha256="11p8j61arq1ih2qi33wf0442vcdbp3zvknzm5aknsifwl4mbzzly"; depends=[lattice MASS Matrix]; }; - eSDM = derive2 { name="eSDM"; version="0.3.2"; sha256="0vjphknba4a6y1wdgv9v6r3a6kj088fq83b4387d4z72g0kkwcmc"; depends=[colorRamps colourpicker dichromat dplyr DT leaflet lwgeom purrr raster RColorBrewer rlang ROCR sf shiny shinycssloaders shinydashboard shinyjs tmap units viridis zip]; }; - eaf = derive2 { name="eaf"; version="1.8"; sha256="1plzvfa2vs3njky7xk9dvic2xapdnzb5iycrksv0qj03ylbh6410"; depends=[modeltools]; }; + eRm = derive2 { name="eRm"; version="1.0-1"; sha256="0njqzznnhnkvalmhiq5yq1w7gwp2myki5cv61w42ydvd27hdyyg9"; depends=[colorspace lattice MASS Matrix psych]; }; + eSDM = derive2 { name="eSDM"; version="0.3.3"; sha256="1iss3l7krcfjxa1pana1ijsbggpbv72gs2sc2gskdrhy5jwlk334"; depends=[dplyr magrittr purrr rlang ROCR sf shiny units]; }; + eaf = derive2 { name="eaf"; version="1.9-1"; sha256="0h7nilqa11s4casalilmk4ssgcl1lqn1w4033zxgc20y7f9rxhsg"; depends=[modeltools]; }; earlyR = derive2 { name="earlyR"; version="0.0.1"; sha256="14davqhh3n5dfsddnfd79ni56bssrpwhvkqkdb77a8x9fn8w32pv"; depends=[distcrete EpiEstim epitrix]; }; earlygating = derive2 { name="earlygating"; version="1.0"; sha256="0y6xjkh9p8bvanc9p5sycah8v81k85xr8i7vyvjb9g4a64srwhd7"; depends=[betareg doParallel foreach]; }; earlywarnings = derive2 { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[fields ggplot2 Kendall KernSmooth lmtest moments nortest quadprog som spam tgp tseries]; }; earth = derive2 { name="earth"; version="5.1.2"; sha256="13a8qfv94bqnjkacnr0nz1g8yd99cnyz4k2qslyclrckqbl9hvrj"; depends=[Formula plotmo TeachingDemos]; }; - earthtide = derive2 { name="earthtide"; version="0.0.9"; sha256="14i1ihswvspqlis9h9m4xfjmhqwz1nj6blhdzqanvd05abw6qnkx"; depends=[BH R6 Rcpp RcppArmadillo RcppParallel]; }; + earthtide = derive2 { name="earthtide"; version="0.0.10"; sha256="09cd4vwkl33zgdwvhvi9jl6za9w61zjj9fyq3x2cxz4hgj346fbm"; depends=[BH R6 Rcpp RcppArmadillo RcppParallel]; }; earthtones = derive2 { name="earthtones"; version="0.1.1"; sha256="17biiw0ig8i8ihc2f8csp0bqryygg27ic2v1vrf81ax3qzhngy4l"; depends=[ggmap]; }; easyAHP = derive2 { name="easyAHP"; version="0.1.1"; sha256="161mn90j9ph1p9277mj61hch8ndcv7k9izs32q93y5wp474gzynd"; depends=[]; }; easyCODA = derive2 { name="easyCODA"; version="0.31.1"; sha256="1g3k8a06zsif5a7xma4dz5zcdbxyc6i58jf5rnnyypxhj6xm5abc"; depends=[ca ellipse vegan]; }; easyDes = derive2 { name="easyDes"; version="5.0"; sha256="1msybgv4b7xlvp93lk64mdrqprr5qqc9ma1bz7glchhlkyyl8c21"; depends=[multcomp PMCMRplus]; }; - easyNCDF = derive2 { name="easyNCDF"; version="0.0.4"; sha256="1hd7b6pdm5j41a4v0jxhbqdy2bz5gj86fsfwj0l7gg7h32d6hkhq"; depends=[abind ncdf4]; }; - easyPSID = derive2 { name="easyPSID"; version="0.1.0"; sha256="10373pbgkgc2aizff54qx95yixlcdbp3xbwlml0lm2rm449bjd6x"; depends=[foreign LaF stringr]; }; + easyNCDF = derive2 { name="easyNCDF"; version="0.1.0"; sha256="1p6b1lcbw2ix6hqqghgfid5yd58yqg1cqnj99r5svli3ivr7x6js"; depends=[abind ClimProjDiags ncdf4]; }; + easyPSID = derive2 { name="easyPSID"; version="0.1.1"; sha256="07m560j8bpzifik305ix33b26xg7w4xjn7lz9g9gp120cqs765dx"; depends=[foreign LaF stringr]; }; easyPubMed = derive2 { name="easyPubMed"; version="2.13"; sha256="1wd8idyqz7kgygp34mjp2abx82775ry8l07vsqdlqnc6fdnvg55d"; depends=[]; }; easySVG = derive2 { name="easySVG"; version="0.1.0"; sha256="03gl5gl0yqgpygd4kna79wrhflbnq3zrz3iq2i8hk9xqd83mszh3"; depends=[]; }; - easySdcTable = derive2 { name="easySdcTable"; version="0.3.3"; sha256="0hhi1nwc84b0mjs2sw2qmvj3cmfkk9kr3rni9fkyyds1dhwgrvvh"; depends=[sdcTable shiny SSBtools]; }; + easySdcTable = derive2 { name="easySdcTable"; version="0.5.0"; sha256="0qv0w5pfhbvf1zfi1zjq304a8z50fmi4l9vqjfqy7gz5gb6y5z43"; depends=[sdcTable shiny SSBtools]; }; easyVerification = derive2 { name="easyVerification"; version="0.4.4"; sha256="08mih1arx01vj7cs1jsln644pcvslpyw1rgr6jmv2czr6xd8qb7d"; depends=[pbapply Rcpp SpecsVerification]; }; easyalluvial = derive2 { name="easyalluvial"; version="0.2.2"; sha256="0x7rkxvpc9xbkhnb5r1bal0fircn412v34fwgpm42h21rkjwiybw"; depends=[caret dplyr e1071 forcats ggalluvial ggplot2 ggridges gridExtra magrittr progress purrr randomForest RColorBrewer recipes rlang stringr tibble tidyr]; }; easyanova = derive2 { name="easyanova"; version="7.0"; sha256="1zpwh3r1r0n11hgqzph8f2aac44qb6rpnhk73hcblq0f9vs0an55"; depends=[nlme]; }; @@ -7128,58 +7221,58 @@ in with self; { easynls = derive2 { name="easynls"; version="5.0"; sha256="1ma2q4y5dxk6q99v880vqfsgy1fha96j7pi8ch699l0pi6bx0d6c"; depends=[]; }; easypackages = derive2 { name="easypackages"; version="0.1.0"; sha256="00paxdwz4bw3imqhcsw6hj1h0gmnpishlxcj79n826vhdy23jc4y"; depends=[assertthat devtools]; }; easypower = derive2 { name="easypower"; version="1.0.1"; sha256="1vf0zv55yf96wjxja6ifdjvgc9nw0jl0hnc1ygyjd8pmwbgdz9bl"; depends=[pwr]; }; + easyr = derive2 { name="easyr"; version="0.3-1"; sha256="139xg91j01i5sczbifga3476j98qv9n3vs5wp4ai66blfsiqf1yy"; depends=[data_table digest dplyr foreign glue Hmisc lubridate openssl qs readxl rlang stringr tibble XML]; }; easyreg = derive2 { name="easyreg"; version="4.0"; sha256="1w4wlhziyhdyldm0zgnm73fnxrh0fv8hwcw5j8ircxb4npx7bcgg"; depends=[nlme]; }; + eatDB = derive2 { name="eatDB"; version="0.4.0"; sha256="0jdz36mzv8x2p4aifdscplnl1nb2dwwdmvc29wn14k47lm8c982h"; depends=[DBI RSQLite]; }; ebGenotyping = derive2 { name="ebGenotyping"; version="2.0.1"; sha256="1jllzc7kvvckrws8qhgvwy626llyb68sp1davp7swx48sf7rwcxc"; depends=[]; }; ebSNP = derive2 { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; }; eba = derive2 { name="eba"; version="1.9-0"; sha256="1xbjd7n895wzzybpjf634a1jpbwqxwh7l17phz6zv7h6dfw19nx4"; depends=[nlme psychotools]; }; ebal = derive2 { name="ebal"; version="0.1-6"; sha256="1cpinmbrgxxv0fzi9qi2inv4hw2lz7iq4b0ggp316rdqqb5bj9r0"; depends=[]; }; ebdbNet = derive2 { name="ebdbNet"; version="1.2.5"; sha256="0kal4sqx12y04696ilwnwkmss4rn16dkbnalgqimz6i4jhz8n23h"; depends=[igraph]; }; - ebimetagenomics = derive2 { name="ebimetagenomics"; version="0.6"; sha256="0jaz7l71pnf3i2q83mx0pjqli9sn30a4b9vshcmp70v3h6xdj9wx"; depends=[breakaway sads vegan]; }; - ebirdst = derive2 { name="ebirdst"; version="0.1.0"; sha256="1bj4jb2cg08z58p9ih9c9f3jfy8xxm4rz99hdm29282dy37xn7dz"; depends=[car data_table dplyr fasterize gbm ggplot2 gridExtra mgcv PresenceAbsence rappdirs raster rgdal scales sf stringr tidyr viridisLite xml2]; }; + ebirdst = derive2 { name="ebirdst"; version="0.2.1"; sha256="1cmi0hdh6363hcbqwglald3bn22rlvl4yqg4l3by6005mirjgx2i"; depends=[car data_table dplyr ggplot2 gridExtra magrittr mgcv PresenceAbsence rappdirs raster rgdal rlang scales sf stringr tidyr viridisLite xml2]; }; ebmc = derive2 { name="ebmc"; version="1.0.0"; sha256="0v9hkzy8ljddmi6wdjd1jga4ib566ikr1vgrvxba67ka524r6bbp"; depends=[C50 DMwR e1071 pROC randomForest rpart]; }; ebreg = derive2 { name="ebreg"; version="0.1.0"; sha256="033ldzj9r9y14nq5bsy1ds9vys8imk1ysii8b889zd1bi319b05y"; depends=[lars Rdpack]; }; ecb = derive2 { name="ecb"; version="0.2"; sha256="17hj4d48j6rran64ajzlgkgz17mab51fa3lz8rm3mw0qhahkjlmc"; depends=[curl httr rsdmx xml2]; }; ecd = derive2 { name="ecd"; version="0.9.1"; sha256="0d8mf5q6n7k5qj6kxvrb3habl0qmn2rxv814kydkrz2bg0scvm1q"; depends=[digest ggplot2 gridExtra gsl moments optimx polynom RcppFaddeeva Rmpfr RSQLite stabledist xtable xts yaml zoo]; }; ecdfHT = derive2 { name="ecdfHT"; version="0.1.1"; sha256="1n3n9n86pj8c54l3xvp7knvi0ajbnjmz9pi79p7wfq92a90fqx48"; depends=[rgl]; }; - ecespa = derive2 { name="ecespa"; version="1.1-10"; sha256="1n6wvz463w0ainn9a52arjhs5q9pwciknb5328pr6y287fwa3nnn"; depends=[spatstat]; }; + ecespa = derive2 { name="ecespa"; version="1.1-11"; sha256="154zny4ny5cbba9wpm2wmgvsi7wl77aiagc660xpwfvpiwmbxsmk"; depends=[spatstat]; }; echarts4r = derive2 { name="echarts4r"; version="0.2.3"; sha256="0yxgxwsyhmbnw3llcgr4xh0i0d74awgsapdw7xsh57wzc539666m"; depends=[broom corrplot countrycode d3r data_tree dplyr htmltools htmlwidgets jsonlite magrittr purrr scales shiny stringi]; }; echelon = derive2 { name="echelon"; version="0.1.0"; sha256="0dw15igx8jwgfr1f7p5pspxjiqhqmfp7shdhq8g07f4bj76irzm4"; depends=[]; }; echo_find = derive2 { name="echo.find"; version="3.0"; sha256="15rrja2z01y4pbh2w4h2xcnwv9c81ppnb848203vavvlilm475y1"; depends=[boot minpack_lm]; }; echogram = derive2 { name="echogram"; version="0.1.2"; sha256="0kir7x32fk3fc63kr3b2j0hfkmivs2pwrlxyjvdg7xqc59hjp3ma"; depends=[geosphere readHAC]; }; - echor = derive2 { name="echor"; version="0.1.3"; sha256="1m843219038jvmwd5fsnlh63nl7as7d4030i6wnksg6pw6v6f1s8"; depends=[dplyr geojsonsf httr lubridate plyr purrr readr rlang tibble tidyr]; }; - ecipex = derive2 { name="ecipex"; version="1.0"; sha256="0pzmrpnis52hvy80p3k60mg9xldq6fx8g9n3nnqi3z56wxmqpdv7"; depends=[CHNOSZ]; }; + echor = derive2 { name="echor"; version="0.1.4"; sha256="0c14nhq97m7m0597ss0qddr9dys7sf3qw2pw0gfwr4xmk2bzdxih"; depends=[dplyr geojsonsf httr plyr purrr readr rlang tibble tidyr]; }; + ecipex = derive2 { name="ecipex"; version="1.1"; sha256="16iyi6n0pnyfmy47b0ranjbh3spvq8cgkmcamzhgjfj7qn0ix184"; depends=[CHNOSZ]; }; eclust = derive2 { name="eclust"; version="0.1.0"; sha256="01x327w02m357lngmgv3drni2s67sass25xk9vni1z434n8i4428"; depends=[caret data_table dynamicTreeCut magrittr pacman pander stringr WGCNA]; }; ecm = derive2 { name="ecm"; version="4.4.0"; sha256="1f9x3lcihvnkc5fr4g94h0m5a9h4rjmq9hkjs34il2id8bw92gj7"; depends=[car]; }; - ecmwfr = derive2 { name="ecmwfr"; version="1.2.1"; sha256="0crqmr3rph0xkxkfgl3rz3aqc75vh7kn7sjnixspg04mh2p27cpb"; depends=[httr keyring memoise]; }; - eco = derive2 { name="eco"; version="4.0-1"; sha256="08fblbr9qp2v0cp69hy68c18xjqvx0nsnx42n2vd1gc6r7apapj6"; depends=[MASS]; }; - ecodist = derive2 { name="ecodist"; version="2.0.3"; sha256="1fhlsiywvfyw03dhbwk2g9blymsjvzhcbwdsqn59bmdjk7aiy79x"; depends=[]; }; - ecoengine = derive2 { name="ecoengine"; version="1.11.0"; sha256="1d5x6hvqrqjj0wg07m4dbgb9ljdq73ibavzy2q5magnfn50a7rzm"; depends=[assertthat data_table dplyr httr jsonlite lubridate magrittr plyr whisker]; }; + ecmwfr = derive2 { name="ecmwfr"; version="1.2.2"; sha256="0gr1cqvl6p3x63kqg8v1xnk8h6g1acqb3agq9p51zqzcx40hdsrc"; depends=[curl getPass httr keyring memoise]; }; + ecodist = derive2 { name="ecodist"; version="2.0.5"; sha256="1kijyik0fnjhl69j230mkkdnkknmrbzj43mcj3xv7jy61i2sy0by"; depends=[]; }; ecolMod = derive2 { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793vr220kgn3bmn8hxhw32rax294krmwn4v"; depends=[deSolve diagram rootSolve shape]; }; ecolottery = derive2 { name="ecolottery"; version="1.0.0"; sha256="0w5aq1aaqzz74vlj8hgnmn60l8rdrchx022dpspqnpvpzdlh65z5"; depends=[abc ggplot2]; }; econet = derive2 { name="econet"; version="0.1.81"; sha256="0hm1v4fjzyzdaxiw6lar7fxnqsckis3n7nrsravhbllhcf0aqq7w"; depends=[bbmle dplyr igraph intergraph MASS Matrix minpack_lm plyr sna spatstat_utils tnet]; }; - econetwork = derive2 { name="econetwork"; version="0.2"; sha256="0ilqxyvpkiwhhgml19f1rf08bn061nf76d7fby3084ypgc4iwi1b"; depends=[igraph Matrix_utils rdiversity]; }; - economiccomplexity = derive2 { name="economiccomplexity"; version="0.3"; sha256="058cyzr01jrgi9090wn8vpjhf074bq7g76vfbyk58jic0k78k634"; depends=[dplyr igraph magrittr Matrix rlang tibble tidyr]; }; - econullnetr = derive2 { name="econullnetr"; version="0.2.0"; sha256="1amgwcsm42ffrdx5a11nkvdx37qqjfh7z54z1hl4b07n8rg1rp7c"; depends=[bipartite gtools reshape2]; }; - ecoreg = derive2 { name="ecoreg"; version="0.2.2"; sha256="1yzyqvhshgc7ip251y7hsvip4xwf8i92bvvz84mn0mzv5b4mq3im"; depends=[]; }; + econetwork = derive2 { name="econetwork"; version="0.4"; sha256="0p20yj4xki4cj4pww51i6wj6cxp5k3ksc2vcb4f4qh7lr82hnb09"; depends=[bipartite blockmodels igraph Matrix_utils rdiversity]; }; + economiccomplexity = derive2 { name="economiccomplexity"; version="1.0"; sha256="1bqayzpfz26lb985l66j27qybyqx0148fiikb8diamq0mbx3picc"; depends=[igraph Matrix]; }; + ecoreg = derive2 { name="ecoreg"; version="0.2.3"; sha256="1bhh4bnvrvgz49wim5r0b4awfsn9l23wvl4kl0vny0s4hm7cgahc"; depends=[]; }; ecoseries = derive2 { name="ecoseries"; version="0.1.5"; sha256="1q35hp5hl6z28hns5rnp3mjn6hqp5qh714pagw7fw4d4a6wnvacy"; depends=[magrittr RCurl readr rjson rvest tibble xml2 zoo]; }; ecosim = derive2 { name="ecosim"; version="1.3-1"; sha256="0gpgjswqmibnz9lpcidvw3y1wmd38l4lyha4fbs0agiz6yyfiyjn"; depends=[deSolve stoichcalc]; }; ecospace = derive2 { name="ecospace"; version="1.3.1"; sha256="0xrhlhpndycj2hdf50lygymc1hwmczx74r6l9f2qmm6v90c0729k"; depends=[FD]; }; - ecospat = derive2 { name="ecospat"; version="3.0"; sha256="1c9cbxs022f2bjnvgdfxhmqkzr30svna596r1fn5i7zsqd7dm0w6"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo doParallel ecodist foreach gbm gtools iterators maptools MigClim poibin PresenceAbsence randomForest raster rms snowfall sp spatstat vegan]; }; - ecotox = derive2 { name="ecotox"; version="1.4.1"; sha256="12dfnsvqwk4iy8r3iks51hh1gcj3hhws10hsng6daqc0xp1y6dpr"; depends=[tibble]; }; + ecospat = derive2 { name="ecospat"; version="3.1"; sha256="17mxny0m0pl0b4vn7slc2qqabjp3i91nz0yjwfvrd827s2hhcra9"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo doParallel ecodist foreach gbm gtools iterators maps maptools matrixStats poibin PresenceAbsence randomForest raster rms snowfall sp spatstat vegan]; }; + ecotox = derive2 { name="ecotox"; version="1.4.2"; sha256="0i4wjarg8gj4hfr0d4fqk74ymhkzrq3vkklpv5v1511ci19hpv16"; depends=[tibble]; }; ecotoxicology = derive2 { name="ecotoxicology"; version="1.0.1"; sha256="084xkr59d7x9zxmsnsyym2x8jshz6ag6rvnmhd1i6fzar8ypwccb"; depends=[]; }; - ecoval = derive2 { name="ecoval"; version="1.2.5"; sha256="0rlgi8cd7jdybb2dqx6ndp8rg02bvsvhksmh8vk8g5fg2wk0rll3"; depends=[jpeg rivernet utility]; }; + ecoval = derive2 { name="ecoval"; version="1.2.6"; sha256="1kizssw71a0sq4z48lqsj5yrnq8f0iw4p4xsbbskiz45c6j8nsa5"; depends=[jpeg rivernet utility]; }; ecp = derive2 { name="ecp"; version="3.1.2"; sha256="11f9p869xr0zg779i46gmflxlq4xclk9wxbab0nj2fan26pn4sfy"; depends=[Rcpp]; }; ecr = derive2 { name="ecr"; version="2.1.0"; sha256="0vvkdxlcqaim9mkgwgdxrx1xhw3lshi1nxfw3kqllq14p3l6xss4"; depends=[BBmisc checkmate ggplot2 parallelMap ParamHelpers reshape2 smoof]; }; ectotemp = derive2 { name="ectotemp"; version="0.1.2"; sha256="0dy6n2gaz6qgfj2gvavlgl4ic15wq1lb9ykynihi77nyxnz67i46"; depends=[dplyr psych]; }; ed50 = derive2 { name="ed50"; version="0.1.1"; sha256="058p1750ba5hp4rczi26grgwjia2ny1880v1vfp6wxad13r459pq"; depends=[boot]; }; ed50simulation = derive2 { name="ed50simulation"; version="0.1.1"; sha256="00fknpssrpin8bpjhf2lsjx3lbpinrmqa6jzmgy3nslkc51x0939"; depends=[boot]; }; eda4treeR = derive2 { name="eda4treeR"; version="0.2.0"; sha256="0fh6nfgvbkvjm1f0b292ggi0mr8ylq5pg2wp8cph46j8rhbgbdxz"; depends=[dae dplyr emmeans ggplot2 lme4 magrittr pbkrtest tidyverse]; }; - edarf = derive2 { name="edarf"; version="1.1.1"; sha256="0f27hs7vn4v2jis3d66s48hr0ki8m8ndspcw1cwns5vjwb77iqwm"; depends=[data_table ggplot2 mmpf]; }; + edbuildmapr = derive2 { name="edbuildmapr"; version="0.1.1"; sha256="1zv5031zx9lz6ii74947kp5vw8lqx0gi5si2mbvmfk7ywc4dv3jh"; depends=[dplyr magrittr sf spdep stringr tidyselect tmap]; }; + edbuildr = derive2 { name="edbuildr"; version="0.1.1"; sha256="0cbwkvlj5w3vbg2k20fqxanrahly3ca22zdlfqk62v38i78cpldq"; depends=[dplyr magrittr openxlsx scales stringr tidyselect]; }; edcc = derive2 { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; }; edci = derive2 { name="edci"; version="1.1-3"; sha256="1f1ry2adfranfrrvf1gkiy58pra3z6bray4v5fgr0z9n1ybcaff0"; depends=[]; }; eddi = derive2 { name="eddi"; version="0.0.1"; sha256="19cgrqdcji509igb6rmlwb75xyyvrh34nv6zyjjfcsc31p5nvf95"; depends=[raster rgdal]; }; + eddington = derive2 { name="eddington"; version="2.1.1"; sha256="0v88v2xmvirnj661jsg2qh7n8afaw71mqks9csnmmz3c16agp7b6"; depends=[Rcpp]; }; edeR = derive2 { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; }; - edeaR = derive2 { name="edeaR"; version="0.8.3"; sha256="18v85mzs5gys3x4vj9dh941xxbfajlp6zly2q7pf842hs33fipbi"; depends=[bupaR data_table dplyr ggplot2 ggthemes glue hms lubridate miniUI purrr rlang shiny shinyTime stringr tibble tidyr zoo]; }; + edeaR = derive2 { name="edeaR"; version="0.8.4"; sha256="14skrsgnd4nslmhi3cpg5v8vz8q11diywd5ad0wbr01aak2bv10c"; depends=[bupaR data_table dplyr ggplot2 ggthemes glue hms lubridate miniUI purrr rlang shiny shinyTime stringr tibble tidyr zoo]; }; edf = derive2 { name="edf"; version="1.0.0"; sha256="14ikm6j0ndxrk7c7lh5mbd2aci46d4j9a30mvcgnxy3kq6046a7b"; depends=[]; }; edfReader = derive2 { name="edfReader"; version="1.2.1"; sha256="076far4fhd6rpa6fwffad4cgchjvar135yblvlrm33s9pd5bf0hn"; depends=[]; }; edfun = derive2 { name="edfun"; version="0.2.0"; sha256="1wxx6bgy03z7c1d6556bbjl1cb49n2vn734fw2d5c1jk0zsh3fmz"; depends=[]; }; @@ -7187,50 +7280,52 @@ in with self; { edgeCorr = derive2 { name="edgeCorr"; version="1.0"; sha256="19n67yc58ksin7xydrnfsyyw7fqawm5xli67cz4lv4wb62w6r6ld"; depends=[]; }; edgeRun = derive2 { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table edgeR]; }; edgebundleR = derive2 { name="edgebundleR"; version="0.1.4"; sha256="0pajr95qqppk2m4l7rfi46rll32z8a7lmq0vmb3p8n0aks5ajn1n"; depends=[htmlwidgets igraph rjson shiny]; }; + edgedata = derive2 { name="edgedata"; version="0.1.0"; sha256="0fx8s2gq9haj66r2zm9hmq0g93g8xgkraakpdpzd8n37pp0ivv7f"; depends=[]; }; + edina = derive2 { name="edina"; version="0.1.1"; sha256="1lpmidyxi54byrsnwwadkh5rr454635xrwa4v2wz8mqr2hngxis3"; depends=[ggplot2 jjb Rcpp RcppArmadillo reshape2 rgen]; }; editData = derive2 { name="editData"; version="0.1.2"; sha256="1ibpd2rlm6i9izyizmdhzxv8agrw920hxbin5y79cmf78rdg1sxy"; depends=[DT miniUI rstudioapi shiny tibble]; }; editrules = derive2 { name="editrules"; version="2.9.3"; sha256="07j8wj0fk34irqgsz70h2wad3wdjv5xl1cl702vxbr0nvmpw2ngl"; depends=[igraph lpSolveAPI]; }; edrGraphicalTools = derive2 { name="edrGraphicalTools"; version="2.2"; sha256="105jv2sz10xbl881lkhgmxzgmb8629mqsminhd197khrkf9nv40i"; depends=[lasso2 MASS mvtnorm rgl]; }; edstan = derive2 { name="edstan"; version="1.0.6"; sha256="1gm1rxwywigyfdlcm2yj1m9qjb4s6w7chr1ck7b32x1pdxdl3ns5"; depends=[ggplot2 rstan]; }; educineq = derive2 { name="educineq"; version="0.1.0"; sha256="0qd6kvcy280glv3q6lcrawmnsfvp90as95chgi3hav0yj2dpakn6"; depends=[flexsurv ineq]; }; + edwards97 = derive2 { name="edwards97"; version="0.1.0"; sha256="1ybksvrp7pd78ncmzdn67q9w3baxx6kf886214cqa5yfbi8jsc4z"; depends=[broom cli glue rlang tibble withr]; }; eechidna = derive2 { name="eechidna"; version="1.4.0"; sha256="07537brbdinkrmygbd2galyl6acbcbg2pkjafkdhxdgklpxv7j9m"; depends=[colourpicker dplyr ggplot2 ggthemes magrittr plotly purrr rgdal rgeos shiny sp stringi tibble tidyr tidyselect]; }; - eefAnalytics = derive2 { name="eefAnalytics"; version="1.0.6"; sha256="07wpz8zlgkbzkhmv569w7rnz3i830391arrh17sg2gc4fx9h1559"; depends=[geoR lme4 metafor mvtnorm]; }; eegkit = derive2 { name="eegkit"; version="1.0-4"; sha256="1r1lack4ps9hwqq56rq37431rcxf3x79zgvda6vrmh4s0ziy6v4x"; depends=[bigsplines eegkitdata ica rgl signal]; }; eegkitdata = derive2 { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; }; eel = derive2 { name="eel"; version="1.1"; sha256="0cv6dhw57yy140g73z94g9x1s42fpyfliv9cm2z1alm7xwap1l0x"; depends=[emplik rootSolve]; }; eemR = derive2 { name="eemR"; version="1.0.1"; sha256="1w3nwlrbxm7z4c3acx991zk5drgs67qys7kgl0qakh5vrdsrxw3v"; depends=[assertthat dplyr pracma purrr R_matlab rlist stringr viridis]; }; - eeptools = derive2 { name="eeptools"; version="1.2.2"; sha256="1sc9km926pnl6dhk7ir2zx4693bki10zrq09v07k177wq7xlphw9"; depends=[arm data_table ggplot2 maptools vcd]; }; eesim = derive2 { name="eesim"; version="0.1.0"; sha256="0ljj1jp9cl0im8k7sfjd28ggj4q9a14df3554kwxkssr1vsn1wbc"; depends=[dplyr lubridate purrr viridis]; }; effectFusion = derive2 { name="effectFusion"; version="1.1.2"; sha256="0m392wrkmgvys7a2bk2w1swfkjikkllng8sy8wb8s2j9y6c3wanp"; depends=[bayesm cluster ggplot2 GreedyEPL gridExtra MASS Matrix mcclust]; }; effectR = derive2 { name="effectR"; version="1.0.2"; sha256="1icr1sx98x3h8rbky1agdh809arhjqcypyajl7y50yis8a5pkycb"; depends=[ggplot2 reshape2 rmarkdown seqinr shiny viridis]; }; effects = derive2 { name="effects"; version="4.1-4"; sha256="1jbpyji7qn5hz8a6afsfbng0nx0a7w0v3v51wpmnbipfjchyalhy"; depends=[carData colorspace estimability lattice lme4 nnet survey]; }; - effectsize = derive2 { name="effectsize"; version="0.0.1"; sha256="07vgmxdl75798hgdh90zysafjh97rmmj2wjjyr6xff4fbhi8rlkb"; depends=[bayestestR insight parameters]; }; + effectsize = derive2 { name="effectsize"; version="0.3.0"; sha256="0kijp4wamkidaxysc11dd4vhvnm4wnbi87871wcbwn27k5b6i5dg"; depends=[bayestestR insight parameters]; }; effectsizescr = derive2 { name="effectsizescr"; version="0.1.0"; sha256="0shfjk6r3bz04jakrn5nwgymjx60lk83i0akcx7zqfxp3k8yncs5"; depends=[Kendall]; }; efflog = derive2 { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; }; - effsize = derive2 { name="effsize"; version="0.7.6"; sha256="129vs8kp10h6yhrrmn77518120bmfr55l6nkpbxkvylnr641b5a2"; depends=[]; }; + effsize = derive2 { name="effsize"; version="0.8.0"; sha256="129g9nv6qmbh6z7gazx4vxs5myvcgdhszi28396gsvzrlzi0ik8b"; depends=[]; }; efreadr = derive2 { name="efreadr"; version="0.2.2"; sha256="1h27by1m451wrnw017005avs5yj3fjzrm2lq5153aqm1mbbxxwvs"; depends=[dplyr ensurer magrittr readr]; }; efts = derive2 { name="efts"; version="0.9-0"; sha256="1cdn37sij3q73z9gal6x3nnnds55whfj5ywyww119hx092xcb2h4"; depends=[lubridate magrittr ncdf4 plyr stringr udunits2 xts]; }; ega = derive2 { name="ega"; version="2.0.0"; sha256="04kwh24aap22yclmcrix3vi553qb30hd43mgfzpdl0cw3ibrh7xg"; depends=[ggplot2 mgcv]; }; egcm = derive2 { name="egcm"; version="1.0.12"; sha256="0nssf5six1j7z6fss7478zdbsfx60myzw833m7nsnaf1r8n4ixaf"; depends=[ggplot2 MASS pracma quantmod tseries urca xts zoo]; }; egg = derive2 { name="egg"; version="0.4.5"; sha256="1fy7srpiavfn8kyrr1m84an7acgwi6ydzrg71m3b0vk7y9ybmj0m"; depends=[ggplot2 gridExtra gtable]; }; eggCounts = derive2 { name="eggCounts"; version="2.3"; sha256="0y74dd8s406yz6nhwlb09hgarw90a68wji2vykxpqcrfll814g7q"; depends=[BH boot coda lattice numbers Rcpp RcppEigen rootSolve rstan StanHeaders]; }; - egoTERGM = derive2 { name="egoTERGM"; version="2.1.1"; sha256="1zp3kr7s43rjp45qbd6lv48mbmby5rrz1vdz9s64v43rjm8v2jyz"; depends=[boot btergm ergm GGally Matrix network sna speedglm xergm_common]; }; - egor = derive2 { name="egor"; version="0.19.10"; sha256="0s9s15j1v5z2v8jhfz8zrmfl43hmn7rw1afs1wjw1kvzz41k1jlm"; depends=[dplyr igraph network plyr purrr rlang shiny survey tibble tidygraph tidyr]; }; - eha = derive2 { name="eha"; version="2.8.0"; sha256="0nsspy1v780hlvhbpp78ybmxrwqbj12nz98pnh495dnlkq5fa5h5"; depends=[survival]; }; + egor = derive2 { name="egor"; version="0.20.03"; sha256="03np4p2pf1nc5rmzg9wxjrqi7h3f7672l574cfi731j0yw8bfcwx"; depends=[dplyr igraph network purrr rlang shiny survey tibble tidygraph tidyr]; }; + eha = derive2 { name="eha"; version="2.8.1"; sha256="00sny5wm415drcsvvzq6gk9r4fc4z7f7y9lix61hnf8ibqfv7bb1"; depends=[survival]; }; ehaGoF = derive2 { name="ehaGoF"; version="0.1.0"; sha256="1qrx9rmf4ifasxycnzj06xn3gl0gp9w1vplb4wrghiziqw5cqird"; depends=[]; }; - ehelp = derive2 { name="ehelp"; version="1.1.1"; sha256="1sd8g0a94dg8l568srxxsvyc0nmvbsy1rq75sn8cc2cdxv4vilq8"; depends=[]; }; + ehelp = derive2 { name="ehelp"; version="1.2"; sha256="0264nx4bidrbwhlxx9llarvh4zb3xnzln8km14823q1hclkpm2fq"; depends=[]; }; ei = derive2 { name="ei"; version="1.3-3"; sha256="0i8pvpal23zwsqldhmm3iis4vw9s08mlydpshaig2dsd9549gn11"; depends=[cubature eiPack ellipse foreach MASS mnormt msm mvtnorm plotrix sp tmvtnorm ucminf]; }; - eiCompare = derive2 { name="eiCompare"; version="2.1"; sha256="0kv4k1zk1gz3fapy2i2ydy0n38hy95i10r3hr3dx8mkkf3nsj46h"; depends=[cubature data_table ei eiPack ellipse foreach ggplot2 magrittr mnormt msm mvtnorm plotrix plyr R_utils stringr tidyr tmvtnorm ucminf]; }; - eiPack = derive2 { name="eiPack"; version="0.1-9"; sha256="1rivccqfr5hz80xgfw652993zg0pw7yd0by52hyp7bwm89gsjksq"; depends=[coda MASS msm]; }; - eiPartialID = derive2 { name="eiPartialID"; version="0.1.2"; sha256="0721p89llzjznz2b6zlf54v7fy9lb9c5qb7w8q0l582iy5cwaw35"; depends=[eco MASS sandwich]; }; + eiPack = derive2 { name="eiPack"; version="0.2-1"; sha256="0xcgl9pr6d960zhp8fd944ba5p5ybp520lp2a4jgsj1lcvqf8xbn"; depends=[coda MASS msm]; }; eia = derive2 { name="eia"; version="0.3.4"; sha256="1yjrgmf6s9c35wpgpg66gi0wmfynm3kbcyaknsw44blpkd35c6yq"; depends=[dplyr httr jsonlite lubridate magrittr memoise purrr readxl tibble]; }; + eicm = derive2 { name="eicm"; version="1.0.0"; sha256="1xa4rfwq64zf5zkdxqslzmph3qc99mfrb8gvf00mqx6qvdzj3475"; depends=[doSNOW foreach GA iterators pso snow ucminf]; }; eigeninv = derive2 { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; }; eigenmodel = derive2 { name="eigenmodel"; version="1.11"; sha256="1l3n0z736xf3x6cyxzmmq1jb2glxi2b75z7v39y4471knh6nbb4d"; depends=[]; }; eigenprcomp = derive2 { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; }; eikosograms = derive2 { name="eikosograms"; version="0.1.1"; sha256="13s5wqcc8iwnhn3msrh9dfrvq9bwlby93p9v5wcnrm8m9iskax1s"; depends=[plyr]; }; + eimpute = derive2 { name="eimpute"; version="0.1.0"; sha256="0q8b98fmfrbk00jr7gzqaij781g5v9wj883xphyrvr0khlr499xl"; depends=[Rcpp RcppEigen]; }; + einet = derive2 { name="einet"; version="0.1.0"; sha256="02v4k6031q2bcjkhbypzkgdj1lyvqbsi1nb0y40zb26bk2381ycq"; depends=[assertthat entropy igraph magrittr shiny]; }; eive = derive2 { name="eive"; version="2.3"; sha256="073hwx944db7zxq6yib6yvciaic11k49zl1iqphippcd5ygkad80"; depends=[Rcpp]; }; eivtools = derive2 { name="eivtools"; version="0.1-8"; sha256="0ynmrql6dv10m7cwba5mzwlbvp6ab53nzqqvk3ihwyiqzmnnmpk4"; depends=[R2jags]; }; eiwild = derive2 { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[coda gtools lattice]; }; - eixport = derive2 { name="eixport"; version="0.4.0"; sha256="06knza8mm7d8i1h72axq3s9id1cdrrq0gjc6lc3q65hf5hx89k1q"; depends=[cptcity ncdf4 raster sf sfheaders silicate sp tidyr]; }; + eixport = derive2 { name="eixport"; version="0.4.6"; sha256="0jyz6xqhl893zf902i36fpmj7a8hncpp1s0n9qr8kkwjba6yd1ba"; depends=[cptcity ncdf4 raster sf sfheaders silicate sp tidyr]; }; + elaborator = derive2 { name="elaborator"; version="1.0"; sha256="1jhs1hiwlww0sr3yacg5amr1mhwjwa10b374klrkkvzzw2y20p1x"; depends=[bsplus dendextend dplyr forcats gclus haven plotly purrr RColorBrewer reshape2 rlang seriation shape shiny shinyBS shinycssloaders shinydashboard shinyjs shinyWidgets tidyr V8]; }; elasso = derive2 { name="elasso"; version="1.1"; sha256="0nz3vw803dvk4s45zc9swyrkjwna94z84dn4vfj3j17h74a0cij2"; depends=[glmnet SiZer]; }; elastic = derive2 { name="elastic"; version="1.1.0"; sha256="1xg8gqa0maasx85fbff4vid2r8s0fgzj4iswyayybzik99zb26ly"; depends=[crul curl jsonlite R6]; }; elasticIsing = derive2 { name="elasticIsing"; version="0.2"; sha256="1zjgvz7w5j06x2cd1fzjl85di95ah67m1lanw01kic2bvhfwfbn6"; depends=[cvTools glmnet magrittr qgraph reshape2]; }; @@ -7255,21 +7350,22 @@ in with self; { elliptic = derive2 { name="elliptic"; version="1.4-0"; sha256="1dhba0yfxjd5rlqsxp5a7s2hclfkla9wigsr39dlma67l6qjjmxn"; depends=[MASS]; }; elmNNRcpp = derive2 { name="elmNNRcpp"; version="1.0.1"; sha256="1n71b5pqd1szhmp4q1h9aqgkx7s54f5i3xk5nljwzsn7cyih1kb3"; depends=[KernelKnn Rcpp RcppArmadillo]; }; elo = derive2 { name="elo"; version="2.1.1"; sha256="1i6qcw2plw12v065142kx58d911zr1gcsd1xic152zxvh89nmhxx"; depends=[pROC Rcpp]; }; - emIRT = derive2 { name="emIRT"; version="0.0.9"; sha256="0861xa299qkdmmbxl2zsr1al4ysznzbx4yj9z655mrm9b11sh4bj"; depends=[pscl Rcpp RcppArmadillo]; }; - emax_glm = derive2 { name="emax.glm"; version="0.1.2"; sha256="04di6bp97cxjbbszakb64y15bjmnd2j8zvxdj8gdbgmhxk9wmbwd"; depends=[AER MASS pander pracma pROC]; }; - emba = derive2 { name="emba"; version="0.1.1"; sha256="0sgh97jzfxna4dww8xmj1qy5435d4lm2yar2ra6nf416snlppjxv"; depends=[Ckmeans_1d_dp igraph magrittr rje usefun visNetwork]; }; - embed = derive2 { name="embed"; version="0.0.5"; sha256="0iwhif1yq3wb6xy0k03w0ygyl8rlcal0h2ncxc9rwqlny8xgvxph"; depends=[dplyr generics keras lme4 purrr recipes rlang rstanarm tensorflow tibble tidyr uwot withr]; }; + elsa = derive2 { name="elsa"; version="1.1-28"; sha256="01sj2a4yhv5m6qj6ih26zw4yzd8s27lll7yp0yysjjrwz79a0fbq"; depends=[raster sp]; }; + emIRT = derive2 { name="emIRT"; version="0.0.11"; sha256="1h91q9vi9cv14bmkaakyynw2z9sx51w0c2kw2in0x91wx7scmd0p"; depends=[pscl Rcpp RcppArmadillo]; }; + emayili = derive2 { name="emayili"; version="0.3.9"; sha256="0cc4i0d56k1l87ifa0x9vpfw0615hk7hzgyxfp68fh5yrj0fc6ab"; depends=[base64enc curl glue httr magrittr mime stringi]; }; + emba = derive2 { name="emba"; version="0.1.4"; sha256="133831zghkjr8bx2b995zw7rmn9vwws3xwkjzd9akz8myfdzp55v"; depends=[Ckmeans_1d_dp igraph magrittr purrr readr rje usefun visNetwork]; }; + embed = derive2 { name="embed"; version="0.0.6"; sha256="1bwr32923b04cnvsm3pqzsw4rnihjqdfpqkh6pga520dw9x2w1dd"; depends=[dplyr generics keras lme4 purrr recipes rlang rstanarm tensorflow tibble tidyr uwot withr]; }; embryogrowth = derive2 { name="embryogrowth"; version="7.6"; sha256="0bsg904jikb1dqichkinpgm0difg17sfczw6q4zab6r02s7yb53s"; depends=[deSolve HelpersMG numDeriv optimx]; }; - emdbook = derive2 { name="emdbook"; version="1.3.11"; sha256="0a515jdzvg87npvrh7md7zp0v5nlz7c2jr7pba5dql6slb0d8j7q"; depends=[bbmle coda lattice MASS plyr]; }; - emdi = derive2 { name="emdi"; version="1.1.6"; sha256="1zxbbn0rl2z7zksh1k8wznry4k1bs08ipla1kaxyadj3i2wdk2y3"; depends=[boot ggplot2 gridExtra HLMdiag maptools MASS moments MuMIn nlme openxlsx parallelMap readODS reshape2 rgeos]; }; + emdbook = derive2 { name="emdbook"; version="1.3.12"; sha256="0ls3zxxlwmdv7zn1v9i1y9zc2sn0hbgmyjvsj7zn3ajsw7wwlih6"; depends=[bbmle coda lattice MASS plyr]; }; + emdi = derive2 { name="emdi"; version="1.1.7"; sha256="0zkvkw4vbr19zc6ac1yvg8nsd70zl1vkdxlcydsadybgff4kq55b"; depends=[boot ggplot2 gridExtra HLMdiag maptools MASS moments MuMIn nlme openxlsx parallelMap readODS reshape2 rgeos]; }; emdist = derive2 { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; }; emg = derive2 { name="emg"; version="1.0.8"; sha256="05j96ch20nca4dci25w0m9y8l6yhm26fapkmm4rfqg6si8agr52s"; depends=[moments]; }; emhawkes = derive2 { name="emhawkes"; version="0.9.0"; sha256="1h6map6w66q91s6g1qr9wfk589cbvva1banqrxzzf29g7ihl15vh"; depends=[maxLik]; }; - emld = derive2 { name="emld"; version="0.3.0"; sha256="16f1za636bbdp9y5mq40n2v77l2zbmwrph870wm12rmn7cjl9bwq"; depends=[jsonld jsonlite xml2 yaml]; }; + emld = derive2 { name="emld"; version="0.4.0"; sha256="16ikzkvl4xn7ixa4sfh21isx2gpppvx5ajpann26f35645pm51xk"; depends=[jsonld jsonlite xml2 yaml]; }; emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; }; emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; }; - emmeans = derive2 { name="emmeans"; version="1.4.3.01"; sha256="16v5j31516nbqnj2zhgqvyp5yxd4zcs5zi0aspa5plr2qikvrkmg"; depends=[estimability mvtnorm numDeriv plyr xtable]; }; - emoa = derive2 { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; }; + emmeans = derive2 { name="emmeans"; version="1.4.6"; sha256="0mxk7ghlv4r6sna4897q1la2xgyn1dw3r9srhm9x4h5l4701avfa"; depends=[estimability mvtnorm numDeriv plyr xtable]; }; + emoa = derive2 { name="emoa"; version="0.5-0.1"; sha256="0rkr4d4fyqxmsrlbzar27z97qkw4cl1dkvfnhbdwpgg9fi1cixmz"; depends=[]; }; emojifont = derive2 { name="emojifont"; version="0.5.3"; sha256="1cdrrl3hvrs8rskyy6zgr7q2mmg8yb9k8sld1m64zsp7y009g19k"; depends=[ggplot2 proto showtext sysfonts]; }; emon = derive2 { name="emon"; version="1.3.2"; sha256="19khjjpyxvzhzihqq15w02l5v5ryyvxlklz1ch2gkmqcpnvyga32"; depends=[MASS mgcv]; }; emov = derive2 { name="emov"; version="0.1.1"; sha256="04w0bjyxvfb4ky573byp7j9b7x4gqycr5pgpnsl6rzag00zsf45a"; depends=[]; }; @@ -7277,14 +7373,15 @@ in with self; { empiricalFDR_DESeq2 = derive2 { name="empiricalFDR.DESeq2"; version="1.0.3"; sha256="0h2mcdw4v3ac6dn0s4z37l4sdzbi12sxrnn0f0gc9z207dyyf6w3"; depends=[DESeq2 GenomicRanges]; }; emplik = derive2 { name="emplik"; version="1.0-4.3"; sha256="1g4hz85bvw29c77zs0ig487z92jjl682vv457x81l077h0psvk7c"; depends=[quantreg]; }; emplik2 = derive2 { name="emplik2"; version="1.21"; sha256="1980bwc4fc4rwzlwya030n5rv8rq0s82hnw955mvaxrbmicnqlla"; depends=[]; }; - ems = derive2 { name="ems"; version="1.2.7"; sha256="1l4javnfhlb6y40dpdvri2795yj0s9zqf8bi02s5llx5lcq3bxbd"; depends=[]; }; + ems = derive2 { name="ems"; version="1.3.2"; sha256="1ambmd183f9959kwms71q3ks187y2ngpab45xlclpm2108n5j3pb"; depends=[boot rms survival]; }; emstreeR = derive2 { name="emstreeR"; version="2.2.0"; sha256="1qbv61j2ya6zvyp8494xi8dhjlb58jmqil9cm5z0pr7p2sr6l32r"; depends=[BBmisc BH ggplot2 Rcpp RcppArmadillo RcppMLPACK scatterplot3d]; }; emuR = derive2 { name="emuR"; version="2.0.4"; sha256="152lg7sf98a7qrblz1ryjdpsprk2arfzwlq8z7b4ilr771lq0plw"; depends=[base64enc compare DBI dplyr git2r httpuv jsonlite MASS mime purrr RCurl readr rlang RSQLite rstudioapi shiny stringr tibble tidyr uuid wrassp]; }; emulator = derive2 { name="emulator"; version="1.2-20"; sha256="11z25iqyzck0s4hw0i86i9jsi52w9bjxx3zdpafssyfqfk7z5avw"; depends=[mvtnorm]; }; - enaR = derive2 { name="enaR"; version="3.0.0"; sha256="0sy7k8l6b8p34bcf9bpjr1y6qkjkvn77y2w2ws7ivcr1fynrhm5p"; depends=[gdata limSolve MASS network sna stringr]; }; + enRich = derive2 { name="enRich"; version="3.1"; sha256="0xl9rhz6mflzp1g5d51xz74dsm8qp16jbkflhzrha3vfirn2jh8q"; depends=[]; }; enc = derive2 { name="enc"; version="0.2.2"; sha256="16x8cckw0ah2yfczvv4j1jy4f8m23fkac38fz068964sv4l8z645"; depends=[]; }; encode = derive2 { name="encode"; version="0.3.6"; sha256="04zwclmqasbx54m77wqfr9jg4axhkkqnykaxv3if8lnr46fl3zyc"; depends=[]; }; encryptr = derive2 { name="encryptr"; version="0.1.3"; sha256="01gsimhrb9c7k5d9h5dbvm4h9i7fc9vzi8wgqb5f191ki27fsw9w"; depends=[dplyr knitr openssl purrr readr rlang]; }; + endoSwitch = derive2 { name="endoSwitch"; version="1.0.0"; sha256="1cj4skk317ppnayk1ph63vll49vs74fljc25cn1iviwgjq64ly0k"; depends=[data_table maxLik msm]; }; endogMNP = derive2 { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; }; endogenous = derive2 { name="endogenous"; version="1.0"; sha256="079fmfxl9gf080zq5m1ixmgry9dawg2y6ixbfyc5da5jxf3zk9h8"; depends=[mvtnorm]; }; endorse = derive2 { name="endorse"; version="1.6.1"; sha256="067wrb5vhi9qn66rwp38cb4kss2yc55blh5dnl99fsvpc0qs146p"; depends=[coda]; }; @@ -7296,7 +7393,6 @@ in with self; { engsoccerdata = derive2 { name="engsoccerdata"; version="0.1.5"; sha256="06fdgjgnk4lwshrkd0jad411x5nz9sxlri9fdhxrf2dr2hik4l8q"; depends=[dplyr magrittr tidyr]; }; enpls = derive2 { name="enpls"; version="6.1"; sha256="12088v9xnj5b3dlakqz1hbzxz4mdai7xi7s2fpx8lj3y3lx7znmb"; depends=[doParallel foreach ggplot2 plotly pls reshape2 spls]; }; enrichR = derive2 { name="enrichR"; version="2.1"; sha256="0ymhzs9d2wl0s9rvbqc1hqb78mlzwhlc7mmijpfqkm5r720pf6m1"; depends=[httr rjson]; }; - enrichvs = derive2 { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; }; enrichwith = derive2 { name="enrichwith"; version="0.3.1"; sha256="05fhx323ani86wdxbjp8dgw4d1iq4kr1887646w072a6iq93bwhm"; depends=[]; }; ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.5"; sha256="0p744151pbj278lyc8d8p7rc20n70abpfgxz6jr10jarmq3r6x7l"; depends=[chron]; }; ensembleMOS = derive2 { name="ensembleMOS"; version="0.8.2"; sha256="16d8030zfdwifqrh45vz3gf5n0bix0mhsmsnydgjq1fghdklcmyx"; depends=[chron ensembleBMA evd]; }; @@ -7304,13 +7400,14 @@ in with self; { ensemblepp = derive2 { name="ensemblepp"; version="1.0-0"; sha256="08k7v61p2sgr07dklabl0g7apsn9da60sfb14gfrwipwi8bsd4pv"; depends=[]; }; ensr = derive2 { name="ensr"; version="0.1.0"; sha256="18b81iswvby7k5akbfdyc6a8j1621d4d35hxmgjip5kyvf5cb3p8"; depends=[data_table ggplot2 glmnet]; }; ensurer = derive2 { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; }; + entcn = derive2 { name="entcn"; version="0.1.0"; sha256="0wpa1293d1bdlx8pikzfh4vqhw7p45bi140aj3x4m8p21h5b4gd6"; depends=[bitops RCurl rjson RYoudaoTranslate stringr]; }; entropart = derive2 { name="entropart"; version="1.6-4"; sha256="1wr3pkn786crklsjzg1kq3dm1ks230jp391g31cgf5hfm537c3qb"; depends=[ade4 ape EntropyEstimation ggplot2 ggpubr reshape2 SPECIES vegan]; }; entropy = derive2 { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; }; - entrymodels = derive2 { name="entrymodels"; version="0.1.0"; sha256="0clyv5ws5nnnyys596zbmdndds43xrvnnkbdk59kj3wscw0hq982"; depends=[dplyr magrittr readr]; }; + entrymodels = derive2 { name="entrymodels"; version="0.2.0"; sha256="18byy6ky37n0a3ixrl6jik9pqbv07sbfkm9vb7wrziyywdfqmzp8"; depends=[dplyr magrittr readr]; }; envDocument = derive2 { name="envDocument"; version="2.4.1"; sha256="074m7adnasvys28kjdgj9071fi90vsl4yv5zvpxik4crlx098dlw"; depends=[]; }; - envalysis = derive2 { name="envalysis"; version="0.3.3"; sha256="1ys93g5gxr9x1v4hg98dcpwa40n5xkh1j8drrmpnmxwq6gv01r6r"; depends=[drc ggplot2]; }; - enveomics_R = derive2 { name="enveomics.R"; version="1.7.0"; sha256="0nk356svi25lzw5iza0jmg6krxhizilm7ja3sgym65319jpcflbp"; depends=[fitdistrplus investr sn]; }; - enviGCMS = derive2 { name="enviGCMS"; version="0.5.7"; sha256="00hydrvawm2zx6d8dcfd5p5l01lvrk5hsfq8k67b2iysjn2sh531"; depends=[animation BiocParallel broom crosstalk data_table dplyr DT genefilter ggplot2 ggraph ggridges igraph iterators itertools mixtools plotly rcdk RColorBrewer reshape2 rmarkdown shiny shinythemes]; }; + envalysis = derive2 { name="envalysis"; version="0.4"; sha256="1qfg8z63qc6n8agv0g7n3qjcwid32axwkyyjjxa271by335aplha"; depends=[drc ggplot2]; }; + enveomics_R = derive2 { name="enveomics.R"; version="1.8.0"; sha256="00akdhqs7jabk7g33rwmxs92jcr39shy9s456nqxk6x4244d2vb3"; depends=[fitdistrplus investr sn]; }; + enviGCMS = derive2 { name="enviGCMS"; version="0.6.0"; sha256="0d0a7zv3nlsk8dq7wn3mg0nnvry56r9zm4y593mr1shcnmfm6nyn"; depends=[animation BiocParallel broom crosstalk data_table dplyr DT genefilter ggplot2 ggraph ggridges igraph mixtools plotly RColorBrewer Rdisop reshape2 rmarkdown shiny shinythemes]; }; enviPat = derive2 { name="enviPat"; version="2.4"; sha256="1gvb7jmwwh4l44b50xmrq3bysr2iv6442yh9pdk6n81g3bgpz1d0"; depends=[]; }; enviPick = derive2 { name="enviPick"; version="1.5"; sha256="04q6zwqq2ip8b8h2n1jpgx1bzcvi7lazljs0806wiakbc79x232p"; depends=[readMzXmlData shiny]; }; envirem = derive2 { name="envirem"; version="2.1"; sha256="175190l81r24v6ygr759l4qwi4i3v6n57jmgswamr01px4pvhxag"; depends=[huxtable palinsol raster RSAGA sp]; }; @@ -7318,38 +7415,40 @@ in with self; { envnames = derive2 { name="envnames"; version="0.4.0"; sha256="12mfbcksrp733jycasaiavlsmx138xmjpywly1wha4ds6bfw93hr"; depends=[]; }; envoutliers = derive2 { name="envoutliers"; version="1.0.0"; sha256="1wkd6xpsw5n9jx0qq5p88h6j8vkcyiyajd3zb6im5bc4d73nmi07"; depends=[car changepoint ecp ismev lokern MASS robustbase]; }; eoR = derive2 { name="eoR"; version="0.4.0"; sha256="0vn4s4af94n9h6x7z14qwpz94rgsd5m3mv55wva7x3h99ryhm83s"; depends=[data_table]; }; - eoffice = derive2 { name="eoffice"; version="0.1.8"; sha256="03yjw8yy3x81hnisiznx2gch4flhp7b9vafavx2r8ny86mqya1k9"; depends=[broom devEMF dplyr flextable ggplot2 ggplotify gplots htmlwidgets magick magrittr officer plotly R_devices rvg tibble]; }; + eoffice = derive2 { name="eoffice"; version="0.1.9"; sha256="019z09jml67ymc2y8y853nflcsvibkligvnngar8f9qv3k2j5k7j"; depends=[broom devEMF dplyr flextable ggplot2 ggplotify htmlwidgets magick magrittr officer plotly R_devices rvg]; }; epade = derive2 { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; }; epandist = derive2 { name="epandist"; version="1.1.1"; sha256="0hxgbjns5bk82rgcmykxifnnxcnqdzmkimkkmpdif64zr5g3gjdg"; depends=[]; }; epanetReader = derive2 { name="epanetReader"; version="0.7.3"; sha256="05pwa6z03qsjwr9pxpbxycsd21p7mf5j5ajyg4yaas5g100s1k8c"; depends=[]; }; - eph = derive2 { name="eph"; version="0.2.0"; sha256="0j41hmiw59q9mwzsw94s0m0hrh4fqhbmayqbblfizh7gr7wijz53"; depends=[assertthat attempt curl dplyr expss glue janitor magrittr purrr questionr readr readxl stringr tibble tidyr tidyverse zoo]; }; + eph = derive2 { name="eph"; version="0.3.0"; sha256="19v892mryggsvr4w8sbxr8zpwfm94hs52am4r8gc7wxrdid2h3c0"; depends=[assertthat attempt curl dplyr expss glue htmltools janitor leaflet magrittr purrr questionr readr readxl rlang rvest sf stringr tibble tidyr tidyverse xml2 zoo]; }; epiDisplay = derive2 { name="epiDisplay"; version="3.5.0.1"; sha256="08ym6hcbmajzr4rasdb35fxk79vgpzfc16rmcm34f7f3zzz09dyl"; depends=[foreign MASS nnet survival]; }; epiGWAS = derive2 { name="epiGWAS"; version="1.0.2"; sha256="0jqblfmz02za3b2pgi15379bzgh98yv5kyv8kh0lkzhrmpgph2zj"; depends=[DescTools glmnet matrixStats SNPknock]; }; - epiR = derive2 { name="epiR"; version="1.0-11"; sha256="1f9v22g7pfsywq44pck436x0dxp6nxicl3jv0d5bbppzjyf1ghp7"; depends=[BiasedUrn survival]; }; + epiR = derive2 { name="epiR"; version="1.0-14"; sha256="134jswcln8y7fwphn8x926wxvb6ax848jcwnhfa8jzs6jw0f1csi"; depends=[BiasedUrn survival]; }; epibasix = derive2 { name="epibasix"; version="1.5"; sha256="0ivr51x37cbdryli9b4p4iq9v2c90zwmywrwdmg7ryq5vprvvbp0"; depends=[]; }; epicontacts = derive2 { name="epicontacts"; version="1.1.0"; sha256="0f4a1y311z3fxw7ygj6fgsq6d2qn0ivxsjlh742pkmg3jb63s0f3"; depends=[colorspace dplyr igraph magrittr threejs visNetwork]; }; epidata = derive2 { name="epidata"; version="0.3.0"; sha256="1b00k086wiwhhrlh4348wqqza1v0whakwy5h7q95rmgxz7lppiim"; depends=[dplyr httr jsonlite purrr readr rvest stringi tidyr xml2]; }; epiflows = derive2 { name="epiflows"; version="0.2.0"; sha256="09ri1p73ih0i08irc06ff169hi5vcl8bdi63b056kzxgmv17yqkp"; depends=[epicontacts geosphere ggmap ggplot2 htmltools htmlwidgets leaflet sp tibble visNetwork]; }; + epikit = derive2 { name="epikit"; version="0.1.1"; sha256="0wa7lfkkwygqmbyfjmwr4si2cdi7s1hd1bwsk1jaip1d3r0hyyrb"; depends=[binom dplyr forcats glue rlang scales tibble tidyr tidyselect]; }; epimdr = derive2 { name="epimdr"; version="0.6-5"; sha256="1nxdlz7gl9vrha9iw92y0s9dmm101gkz0rsqxqg1rdxanr6hs6sh"; depends=[deSolve polspline shiny]; }; epinet = derive2 { name="epinet"; version="2.1.8"; sha256="10bgq66n99kkz0nhmsz508aypxk57zk19p5l3xrb28n72k4rfgrf"; depends=[network]; }; epiphy = derive2 { name="epiphy"; version="0.3.4"; sha256="04wsppjycnrzrml3zxrpr0xdxxas3hj8rskiivx5vfmfjpwipq4r"; depends=[ggplot2 msm pbapply Rcpp transport]; }; episcan = derive2 { name="episcan"; version="0.0.1"; sha256="02687f8gpc2czn19lapvazd6mnm8902ay0lhgi3wdrzfhir42m4r"; depends=[]; }; - episensr = derive2 { name="episensr"; version="0.9.4"; sha256="1cjfmj9alf46mpfzx7jfh6yrn7i4ldpnks28zxk42ln1zhb6jh6f"; depends=[actuar boot ggplot2 gridExtra magrittr plyr reshape trapezoid triangle]; }; + episensr = derive2 { name="episensr"; version="0.9.6"; sha256="193abdngrvxriv1dxjv0panf0whczli637xfs2fr05p588lljpr6"; depends=[actuar boot ggplot2 gridExtra magrittr plyr reshape trapezoid triangle]; }; episheet = derive2 { name="episheet"; version="0.4.0"; sha256="0y3wy91hr3b9iky5k81mf897wg2gcdv05afhndjqwcfb0xkn2f9q"; depends=[assertthat dplyr ggplot2 magrittr rlang tidyr]; }; episplineDensity = derive2 { name="episplineDensity"; version="0.0-1"; sha256="0nmh97xajnnh54i04yq8fdici4n5xvcbpdbjdbz79483gnils4vn"; depends=[nloptr pracma]; }; epistasis = derive2 { name="epistasis"; version="0.0.1-1"; sha256="0dfh26bs72i01hpxpgpgyiwpmg9mjpib8zynhc5ssxa0skm518wz"; depends=[glasso igraph Matrix tmvtnorm]; }; epitab = derive2 { name="epitab"; version="0.2.2"; sha256="0yi65bblsikwsa9i7wys1mqf6pp6j01kyc8xkyrhs5n62y1k68nc"; depends=[kableExtra knitr MASS survival xml2]; }; - epitools = derive2 { name="epitools"; version="0.5-10"; sha256="1qqa2kam3j3mkbgk62g6lwygk2fkdlrpbi27wl37j4dkdkvx013m"; depends=[]; }; + epitools = derive2 { name="epitools"; version="0.5-10.1"; sha256="0jqn3pas4lsans50jwakmvpyc7m7x0kxq6dzyckd3vgww56qa65l"; depends=[]; }; epitrix = derive2 { name="epitrix"; version="0.2.2"; sha256="1rqpvdky002h6mz636b77l4kd0im16pww62l6vnwh83si1m9pkki"; depends=[distcrete sodium stringi]; }; - eplusr = derive2 { name="eplusr"; version="0.11.0"; sha256="081qxdr2yhb3yyjgrxd94f11izlxv6x9s9ka1ms1wqhip8gkvssi"; depends=[callr cli crayon data_table lubridate processx progress R6 RSQLite stringi units]; }; + eplusr = derive2 { name="eplusr"; version="0.12.0"; sha256="1h8adyh1cjy3giqc3vj5gdx77h5fqfx44abw816k640h758lkjmp"; depends=[callr cli crayon data_table lubridate processx progress R6 RSQLite stringi units]; }; eply = derive2 { name="eply"; version="0.1.2"; sha256="0al44pvqf6ls3dh129vlv3g56hk1nbql09rj0qsb04d9kaz9anrp"; depends=[magrittr]; }; epoc = derive2 { name="epoc"; version="0.2.6-1.1"; sha256="1qlj4cl7mh5k52v2ippfs3cish5iadnix5w46p25hjqiriksclna"; depends=[elasticnet irr lassoshooting Matrix survival]; }; - epos = derive2 { name="epos"; version="0.1.0"; sha256="0b9r552hbrs281z7pxxw1hxgv9d15qmyzvgk5xsrgh8wivkh4lwp"; depends=[dplyr ggplot2 gridExtra hashmap stringr testthat tidyr TopKLists xtable]; }; + eponge = derive2 { name="eponge"; version="0.1.0"; sha256="19wd80l35acij793spxglcwz346i2iivk6n0q2304wjcca6qzds7"; depends=[rlang]; }; epr = derive2 { name="epr"; version="3.0"; sha256="0czfz6qkcpa2qqs3pqii27hgpdvdzfrvxl0ip67v58hamq7kvjfv"; depends=[car lme4]; }; epsiwal = derive2 { name="epsiwal"; version="0.1.0"; sha256="0lmcmiqcc1pjj1d0zyn0hc23if1lkm85p6vcjqbddpnv9ags2mbh"; depends=[]; }; + epuR = derive2 { name="epuR"; version="0.1"; sha256="0dx808dq78c1s78fv0my79ar7h20fyxa0gpfdv85zi80v9g82g4z"; depends=[data_table lubridate openxlsx stringr xts zoo]; }; epubr = derive2 { name="epubr"; version="0.6.1"; sha256="0rp9q6hriilps5h6nc1226w5dvzws1g78pg3ldrq2r4dakpvsmjj"; depends=[dplyr magrittr tibble tidyr xml2 xslt]; }; epxToR = derive2 { name="epxToR"; version="0.4-0"; sha256="1vw9czdxp80jpvcc8bj5m4fshlavlawc1735m0s0d0x14z3giy6g"; depends=[httr XML]; }; - eq5d = derive2 { name="eq5d"; version="0.5.0"; sha256="0h5vrrl1kgq1kp1xli8safp6iig526ib0lz1hs067awkvxnka5yn"; depends=[]; }; + eq5d = derive2 { name="eq5d"; version="0.7.0"; sha256="0k9hvazynphhpwpbxi9dgmrjqp0nlmgkikx6qpdg5hp2psl0lmyx"; depends=[]; }; eqn2svg = derive2 { name="eqn2svg"; version="0.1.0"; sha256="01hqmhjy62ic28jsx8zn0zg87pipxmd82795pj66661qkq306lb0"; depends=[htmltools magrittr]; }; eqs2lavaan = derive2 { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; }; eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; }; @@ -7366,61 +7465,63 @@ in with self; { erboost = derive2 { name="erboost"; version="1.3"; sha256="09hlpn6mqsmxfrrf7j3iy8ibb2lc4aw7rxy21g3pgqdmd9sbprim"; depends=[lattice]; }; ercv = derive2 { name="ercv"; version="1.0.1"; sha256="0rs4yhm9sjnqkrgqqy6b8wj9fgk910hxc8d7zi4qwql0v1gid27l"; depends=[]; }; erer = derive2 { name="erer"; version="2.5"; sha256="0wgzd7r63d20vghmbilqn1p5033i5p31asya1gzwlipgyfxmqp0b"; depends=[lmtest systemfit tseries urca]; }; - ergMargins = derive2 { name="ergMargins"; version="0.1.0"; sha256="0f65150ahlxx75k72f2shmlryq5qbszl9p0qxxpl87sfpclsaa0x"; depends=[btergm ergm Matrix network numDeriv statnet xergm_common]; }; ergm = derive2 { name="ergm"; version="3.10.4"; sha256="08hzhc06sfchbq8kq5yvs7gxz0v6nvx0qdb2g6ac38n54cd0npw8"; depends=[coda dplyr lpSolve MASS Matrix network purrr rlang robustbase statnet_common tibble trust]; }; ergm_count = derive2 { name="ergm.count"; version="3.4.0"; sha256="1bvbqckssqj91q56nz17mrvadk1i2mm301z9rj8qkh8116fwf93w"; depends=[ergm network statnet_common]; }; ergm_ego = derive2 { name="ergm.ego"; version="0.5"; sha256="1vvyfjvkddc1qr189wqbp8sbqmd317y71ml9jjjjns3znahriqv3"; depends=[coda ergm network purrr RColorBrewer rlang statnet_common tibble]; }; ergm_rank = derive2 { name="ergm.rank"; version="1.2.0"; sha256="1vc96rjsqvs6ybnzkpv12h0hsrx2s96k4hjilzjpjnhbazh5vynz"; depends=[ergm network statnet_common]; }; ergm_userterms = derive2 { name="ergm.userterms"; version="3.10.0"; sha256="1aqrgdayh73dkr71gf8vawlj6qgv66pxr4klxgqb6ffan66b5p8g"; depends=[ergm network statnet_common]; }; ergmharris = derive2 { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; }; + ergmito = derive2 { name="ergmito"; version="0.2-1"; sha256="0g823winannv0i0v4b1mdsivcgrmr1y7nr3iia4si7gvx3r07fgk"; depends=[ergm MASS network Rcpp RcppArmadillo texreg]; }; erp_easy = derive2 { name="erp.easy"; version="1.1.0"; sha256="193n45w0rq3cy0nmxvv0h6s3yr8kfjlg90nd4dnqlsq85zlsizij"; depends=[gtools plyr signal]; }; erpR = derive2 { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; }; err = derive2 { name="err"; version="0.2.0"; sha256="1915b0vmqdd8whwdrqjphld1jaxawh5b7di6wf7q3sx779lblsrs"; depends=[]; }; errint = derive2 { name="errint"; version="1.0"; sha256="1ya7fsvwhmgxw87r32m4345n8pw2pbpv026xvml03s1kiam8qwbw"; depends=[rootSolve VGAM]; }; - errorist = derive2 { name="errorist"; version="0.0.2"; sha256="061v8z11sgzbhzcnyixfv9ff0vhiszjh0dy1rvzbyjsvjzmdimq0"; depends=[searcher]; }; + errorist = derive2 { name="errorist"; version="0.1.0"; sha256="0zq5h2wffn9d3f3blzh736478k91smlvz5hxy55hcjqffpxcp4ah"; depends=[searcher]; }; errorizer = derive2 { name="errorizer"; version="0.2.1"; sha256="10p7ydm81x2gls0wn692llgj2rxhg4s96rv7gvihmgi5dflraypq"; depends=[]; }; - errorlocate = derive2 { name="errorlocate"; version="0.2.0"; sha256="0lm0fp7b4ggx744b7kymman813rqw18qr7pd8r3j52spy3kq90lk"; depends=[lpSolveAPI validate]; }; + errorlocate = derive2 { name="errorlocate"; version="0.3.0"; sha256="04vr2ll3mdy1znm11lv739drckv82n45qbpda3qyjyzlffvgkmhg"; depends=[lpSolveAPI validate]; }; errors = derive2 { name="errors"; version="0.3.3"; sha256="037spyvw4rm2fcsq7a53svljlsgssrzrshyq01fnky0kq3z0iqqm"; depends=[]; }; + errum = derive2 { name="errum"; version="0.0.3"; sha256="18frrfnhnmg4fjlpfwj8aklzfwafpwqvagm0aschkqc8mz6wnjbz"; depends=[Rcpp RcppArmadillo]; }; es_dif = derive2 { name="es.dif"; version="1.0.1"; sha256="0cpncj68dhqfcpw7fjqc23d84rq767hqpw6la6iszfrrc27bx4lw"; depends=[]; }; esDesign = derive2 { name="esDesign"; version="1.0.2"; sha256="16dhddw4gp210bb1mmx5df1ziffadiz06s4i3znnzac8rv5564hp"; depends=[]; }; esaBcv = derive2 { name="esaBcv"; version="1.2.1"; sha256="0hgjcdbiy1a71vsb2vcyp0xmhy6wi4nlh1sqsfb2vxckc95i9i21"; depends=[corpcor svd]; }; esaddle = derive2 { name="esaddle"; version="0.0.6"; sha256="0i89yid4zryc95aj8n512wj3cs5nx351w4rc1nghq5a7vp139fa7"; depends=[doParallel mvnfast plyr Rcpp RcppArmadillo]; }; esaps = derive2 { name="esaps"; version="0.1.0"; sha256="1rchs4i7n221gyhj9kbka4zmi2lf72q3ak2pdxkr7w6pcx6803yz"; depends=[plyr readODS readxl]; }; esc = derive2 { name="esc"; version="0.5.1"; sha256="0gns7gz55p6pha05413r3hlvd7f2v1amxkg13d197mab1ypqic7q"; depends=[]; }; + escalation = derive2 { name="escalation"; version="0.1.2"; sha256="1s1kkh9wmd4sanmyramq4fa23fpb26v9nk4d2yg2phgaigxyp041"; depends=[BOIN dfcrm DiagrammeR dplyr ggplot2 gtools magrittr purrr RColorBrewer stringr tibble tidyr tidyselect viridis]; }; eseis = derive2 { name="eseis"; version="0.5.0"; sha256="03pjcms3aj7sm2wrld64v1dw53bqn9pmsayndma03abjh66rblii"; depends=[caTools fftw IRISSeismic matrixStats multitaper raster Rcpp reticulate rgdal rmarkdown shiny signal sp XML]; }; eshrink = derive2 { name="eshrink"; version="0.1.0"; sha256="0s1jl652za7qwv70kmc1h3vbwlijl49527pwpm0z347lz2jdcigj"; depends=[glmnet MASS]; }; esmisc = derive2 { name="esmisc"; version="0.0.3"; sha256="1d6xrdxwn85c8s60s7vzaymh7wa9f7fzd79hq5spzd12fr3zisvj"; depends=[ggplot2 raster readr]; }; esmprep = derive2 { name="esmprep"; version="0.2.0"; sha256="076sm26mkkvig2g04k32z2dlp2h9gnqgzckhirl4pqm01siknl61"; depends=[lubridate]; }; - esquisse = derive2 { name="esquisse"; version="0.2.3"; sha256="0xx9d4xhcbbjc5nzwq0azhilkkn2q0q3xl1nbidj10c9f3ma699j"; depends=[ggplot2 ggthemes hrbrthemes htmltools jsonlite miniUI rlang rstudioapi scales shiny shinyWidgets stringi]; }; + esquisse = derive2 { name="esquisse"; version="0.3.0"; sha256="1cb30qmsxpkx62rjaasly13l00bvz03i9jq5apsr4fk26vw7gfrk"; depends=[ggplot2 htmltools jsonlite miniUI rlang rstudioapi scales shiny shinyWidgets stringi]; }; esreg = derive2 { name="esreg"; version="0.5.0"; sha256="1njwqm3hrcxwl6y7gwa4zq0q5139293qk503ahw23dxwzdsiy2z5"; depends=[Formula quantreg Rcpp RcppArmadillo]; }; essHist = derive2 { name="essHist"; version="1.2.2"; sha256="0rvlxfcl42h4pjqf37mx7bc4k21iwvnys6l5rf2jsl7yk1b9hmbn"; depends=[Rcpp]; }; essurvey = derive2 { name="essurvey"; version="1.0.5"; sha256="078bm5knrhij4rdv7hqv5ci0dfdci7lw4yrqbikp8miapivv88vp"; depends=[haven httr rvest tibble xml2]; }; - estatapi = derive2 { name="estatapi"; version="0.3.0"; sha256="0gjc5x1b2l5qnwdg77nzy6d7bf9q93ll39sfy89izqm8wsydwwkp"; depends=[dplyr httr purrr readr]; }; + estatapi = derive2 { name="estatapi"; version="0.4.0"; sha256="0wp5w9w0b832fnl7kchjqmychnf5896q50grw8hwdc1km14dfzkg"; depends=[dplyr httr purrr readr rlang tibble]; }; estimability = derive2 { name="estimability"; version="1.3"; sha256="0cifdaa71spkcxl4db4z884jrya865sg3dhcv4isd8fnzg2pjcd3"; depends=[]; }; - estimatr = derive2 { name="estimatr"; version="0.20.0"; sha256="0mrx14chg9qb90hlivn90l1jv9la4n1bkznbdx58ghli73k8dvdz"; depends=[Formula generics Rcpp RcppEigen rlang]; }; + estimatr = derive2 { name="estimatr"; version="0.22.0"; sha256="1kfih2fak7w9zqbhjgfrysdzrk4lpcx9p23x0gys4f9hxl9j1pm2"; depends=[Formula generics Rcpp RcppEigen rlang]; }; estmeansd = derive2 { name="estmeansd"; version="0.2.0"; sha256="07xbdsfz8vidp8pv2ix5g2y6y2cks14fzbjx74pa17696rnklrw3"; depends=[metaBLUE]; }; estout = derive2 { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; }; estprod = derive2 { name="estprod"; version="1.1"; sha256="15grcpyhaazd1sl8544gx4zpjqi9p17d6siyb6a1ykzzyy1v1fln"; depends=[boot Formula gmm lazyeval minpack_lm]; }; estudy2 = derive2 { name="estudy2"; version="0.9.1"; sha256="1hc90jcnbb69f8p5h2vv6qlnx2n1pzdpbk4xcqw6mi7472dsmz7l"; depends=[matrixStats quantmod Rcpp zoo]; }; - esvis = derive2 { name="esvis"; version="0.2.0"; sha256="0l4c87l9n94q14hwky7d7i4h9c5zh8r04zlcz9w4mx7ixfd34zir"; depends=[sfsmisc]; }; + esvis = derive2 { name="esvis"; version="0.3.0"; sha256="0h64m3ay4q1l7rgz7vscpnh2x6gkxzzkqkam1hkfnvmxiy2a95f2"; depends=[dplyr ggplot2 Hmisc magrittr purrr rlang sfsmisc tibble tidyr]; }; etable = derive2 { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[Hmisc xtable]; }; etasFLP = derive2 { name="etasFLP"; version="1.4.0"; sha256="04d526yajakzivlcsz8631p0j482cbbgfpdmzkc9zr1m4495xxif"; depends=[fields mapdata maps rgl]; }; ether = derive2 { name="ether"; version="0.1.6"; sha256="1f3phh5vdfvlxqrpzsn6ysz0q3mbhr862fzsd3sp8m8qhry86cbx"; depends=[dplyr httr jsonlite Rmpfr]; }; - ethnobotanyR = derive2 { name="ethnobotanyR"; version="0.1.6"; sha256="1v1vsj1nzmgji6kzgfkdmy08ajn8iag4jzw0lwh81b3vmdx8f4g2"; depends=[circlize cowplot dplyr ggplot2 magrittr reshape]; }; + ethnobotanyR = derive2 { name="ethnobotanyR"; version="0.1.7"; sha256="13xbiywrw6ixby9s1ipwb45p9c96d75vw906fpzy6axdv2c4pp70"; depends=[circlize cowplot dplyr ggplot2 ggridges magrittr reshape]; }; etl = derive2 { name="etl"; version="0.3.8"; sha256="19m1sp3ryqb1gw7i9lh8dpmwbgy0c0dpsivj27wkr36bdhfvrfls"; depends=[DBI downloader dplyr janitor lubridate readr rlang rvest stringr tibble usethis xml2]; }; - etm = derive2 { name="etm"; version="1.0.5"; sha256="1yivbq8y0ijcl1m4nir4q9hp4pi6iphwxgjprygsdf7vp98wq677"; depends=[data_table lattice Rcpp RcppArmadillo survival]; }; + etm = derive2 { name="etm"; version="1.1"; sha256="02yvh473l5qajaymhsxwb235a9r7q3nsig9a9mrfca68xih8yvgd"; depends=[data_table lattice Rcpp RcppArmadillo survival]; }; etma = derive2 { name="etma"; version="1.1-1"; sha256="0g9244yx50y1gw0f37hskbcgyv4nldmzr86v3rmf3afabmjbyzjj"; depends=[]; }; etrunct = derive2 { name="etrunct"; version="0.1"; sha256="0ayazgyqlc8jcqr03cwfmfhm4pck6xri1r6vkgqy4arqkrrnrcqr"; depends=[]; }; - eudract = derive2 { name="eudract"; version="0.9.0"; sha256="0idxccm3cqb34gjypbh635rlqvjgcwbmywp1cv41mz2g56kbrcnb"; depends=[dplyr magrittr tidyr xml2 xslt]; }; + eudract = derive2 { name="eudract"; version="0.9.2"; sha256="1yl72vhfaqq005h00bxafdqxpbm0qf9349gd9fq80h5vy20qrm3q"; depends=[dplyr magrittr tidyr xml2 xslt]; }; eulerian = derive2 { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[graph]; }; - eulerr = derive2 { name="eulerr"; version="6.0.0"; sha256="0pvyg91xamhmz4k1b18g96imkddk64d6dadg74v1mnbzjiq742wh"; depends=[GenSA polyclip polylabelr Rcpp RcppArmadillo]; }; + eulerr = derive2 { name="eulerr"; version="6.1.0"; sha256="1r7y01vj293r1lhxk4anqqq6k2gnflzx2a2sfsyf7ccqmw95w0cj"; depends=[GenSA polyclip polylabelr Rcpp RcppArmadillo]; }; europepmc = derive2 { name="europepmc"; version="0.3"; sha256="1ngqs1sqzkbwv98dd5z4cxj8bnz41wyd0g060a2vpqi3s99s4i2h"; depends=[dplyr httr jsonlite plyr progress purrr urltools xml2]; }; europop = derive2 { name="europop"; version="0.3.1"; sha256="1ym257bxr4a0dmln1j8x3pf87wrryzgqyzhvk61whc6n2bj62x1s"; depends=[]; }; - eurostat = derive2 { name="eurostat"; version="3.5.2"; sha256="02xixnsz04ll2kidv6kmcpgf8681p6brf2vcxhr0p0qcl0ibvpcw"; depends=[broom classInt countrycode curl dplyr httr jsonlite lubridate RColorBrewer readr RefManageR sf sp stringi stringr tibble tidyr]; }; - ev_trawl = derive2 { name="ev.trawl"; version="0.1.0"; sha256="14yhnhqq1gz2rfy13v1dybnf55pyyimajbarxyp7gaqnd66nfq3p"; depends=[eva evir fExtremes ghyp hypergeo testthat]; }; - eva = derive2 { name="eva"; version="0.2.5"; sha256="03hyzbqi2mgdrmzrjnwzvy0ndf7ha5959b63sgd1g0b998fibbmd"; depends=[EnvStats Matrix]; }; + eurostat = derive2 { name="eurostat"; version="3.6.1"; sha256="1l2j9fdq33ivb3wns5bdr1dccaf494vwbyya3f2gz2g8mc2qpn0a"; depends=[broom classInt countrycode curl dplyr httr jsonlite lubridate RColorBrewer readr RefManageR sf sp stringi stringr tibble tidyr tidyselect]; }; + evabic = derive2 { name="evabic"; version="0.0.1"; sha256="196gmq8v8a45zkk4qqr3hzbrrxnmwryb0q81bqcdap5zf4w7153x"; depends=[]; }; + evalITR = derive2 { name="evalITR"; version="0.1.0"; sha256="05nqcy9x3f2ks9xvzd3cd000q2kybdycgrlvz5pv7ipw1dlysgg2"; depends=[]; }; evaluate = derive2 { name="evaluate"; version="0.14"; sha256="0a2y7j534gbgixkwj9r1z76l2vssw4g1hznzbpclc076wkdqpj58"; depends=[]; }; - evaluator = derive2 { name="evaluator"; version="0.4.1"; sha256="1h1s2n09i6r9w17lr8ry9acg6kfsmf3c4w45jdwvz1pmy1ss8whi"; depends=[cli crayon dplyr extrafont ggplot2 magrittr mc2d purrr readr readxl rlang rstudioapi scales stringi tibble tidyr vctrs viridis]; }; + evaluator = derive2 { name="evaluator"; version="0.4.2"; sha256="0k2fwim023lbnxq67hhv03cds824x8n374pnqsk67ajgahxwh3by"; depends=[cli crayon dplyr extrafont ggplot2 magrittr mc2d purrr readr readxl rlang rstudioapi scales stringi tibble tidyr vctrs viridis]; }; evclass = derive2 { name="evclass"; version="1.1.1"; sha256="00lbhcgswpv0amz0mb93kx9p91sf0d7zvxfw9i8x1zpmpfd6nhcj"; depends=[FNN]; }; evclust = derive2 { name="evclust"; version="1.1.0"; sha256="06w1spqz5gidycwzwf51414iy182bc1ncis7m4bwx6a268vrznnx"; depends=[FNN limSolve Matrix mclust plyr quadprog R_utils]; }; evd = derive2 { name="evd"; version="2.3-3"; sha256="1d2r8ppblxrq6s60pf0gv4rp8ja58j8lbpax8a996ais1hpfzi9g"; depends=[]; }; @@ -7430,13 +7531,14 @@ in with self; { eventdataR = derive2 { name="eventdataR"; version="0.2.0"; sha256="11apbbj68x1kxpwvihf4ng7wxy54jl1aw7r9hyq6gn7h8sk6lpjn"; depends=[]; }; events = derive2 { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; }; eventstream = derive2 { name="eventstream"; version="0.1.0"; sha256="0imrs872b6fjvw74smniiiicvizyign6wmwwybljk704cshzcy2f"; depends=[abind AtmRay changepoint dbscan glmnet MASS tensorA]; }; + evgam = derive2 { name="evgam"; version="0.1.2"; sha256="0wnyrvfg1pj1adwmsvqwpnz31pfhj6vdsivj2mmdzqh4milf9l22"; depends=[mgcv Rcpp RcppArmadillo]; }; evian = derive2 { name="evian"; version="2.1.0"; sha256="1slnzq55gg3p16fs22v69mafiggiy5f70sj8fh65lc0hphybh6w2"; depends=[doParallel foreach ProfileLikelihood sandwich]; }; evidence = derive2 { name="evidence"; version="0.8.10"; sha256="02kqk95kx4nv13fg6z55a5rv6sq6lv8azg0jjxbkg1j6hg15p7ai"; depends=[LaplacesDemon lattice LearnBayes loo rstan rstanarm]; }; - evidenceFactors = derive2 { name="evidenceFactors"; version="1.00"; sha256="12wndimbygn7h57f3q0xmxmvqrcdj98f0a58m22z2l0vmym53rhb"; depends=[sensitivitymv]; }; + evidenceFactors = derive2 { name="evidenceFactors"; version="1.8"; sha256="0g9w1q8ir6qmvk5vvbpipiyias7nj74ks2h94ja7al8sz68gralx"; depends=[sensitivitymv]; }; evir = derive2 { name="evir"; version="1.7-4"; sha256="1h7a7z7v5k33y5hsdfczsri3vpbwspfgazhv4saknv2h11rgfpki"; depends=[]; }; evmix = derive2 { name="evmix"; version="2.12"; sha256="02rabc9snci00s1x7h0svfr66lmw1wjcdg0149wc52mnccsdaivf"; depends=[gsl MASS SparseM]; }; evobiR = derive2 { name="evobiR"; version="1.1"; sha256="0502xj1gv2g943vfqyllz4sr5z4mixf5vqlqi2v96mymnv9iwsr8"; depends=[ape geiger phytools seqinr shiny]; }; - evolqg = derive2 { name="evolqg"; version="0.2-6"; sha256="1jc6mndlmd0y8wxcqqrlyk211i4ay3yna9clm0p1cnxy4cbn8lq5"; depends=[ape coda expm ggplot2 igraph Matrix matrixcalc MCMCpack mvtnorm plyr Rcpp RcppArmadillo reshape2 vegan]; }; + evolqg = derive2 { name="evolqg"; version="0.2-7"; sha256="1ib39whfx1hpjgy8g9pfcix1ki7w6bf2ka8z15avcmj32jl8ns6f"; depends=[ape coda expm ggplot2 igraph Matrix matrixcalc MCMCpack mvtnorm plyr Rcpp RcppArmadillo reshape2 vegan]; }; evolvability = derive2 { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; }; evoper = derive2 { name="evoper"; version="0.5.0"; sha256="064fcpd04ws8v6sl0bakiw34jmmfpg1w5pkq94y2gh1c576x4vwz"; depends=[boot data_table deSolve futile_logger ggplot2 plot3D plyr reshape RNetLogo rrepast]; }; evt0 = derive2 { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; }; @@ -7449,14 +7551,14 @@ in with self; { exactLoglinTest = derive2 { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; }; exactRankTests = derive2 { name="exactRankTests"; version="0.8-31"; sha256="1154dkcid3njhamdp87qs9bnx7l8bdqkcjsds9q9f2xmizs9x8gw"; depends=[]; }; exactci = derive2 { name="exactci"; version="1.3-3"; sha256="03r35f6dyrck5pf43ypb1sjwfnvkhjkm1mbms3wh67ayfs2ypn0s"; depends=[ssanv]; }; - exactextractr = derive2 { name="exactextractr"; version="0.1.2"; sha256="18f01431cs4dziq3x77pni7axvmnh2hnvs97jh9sbanjdx6iqvj2"; depends=[raster Rcpp sf]; }; + exactextractr = derive2 { name="exactextractr"; version="0.2.1"; sha256="0wspmg4vb96yq38g17f10q54k8ijpzlhh3hac1d2dn9zgk3riffh"; depends=[raster Rcpp sf]; }; exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; }; - exampletestr = derive2 { name="exampletestr"; version="1.5.2"; sha256="0lfhgjirsl2b1vksjfrw3wlvw6x34d20vldh313qkjrg2yihpk1q"; depends=[checkmate filesstrings fs glue magrittr ore purrr readr rlang roxygen2 stringr styler usethis withr]; }; - exams = derive2 { name="exams"; version="2.3-4"; sha256="1sa76qnzf7llj97xc41l2s8n4fqlg1wcvyq9sq59f1blfwxcnnd7"; depends=[]; }; + exampletestr = derive2 { name="exampletestr"; version="1.6.1"; sha256="1szkx35wn24yi6iw6hkl85hzwqd8glvjq69hsypsxg1k4r1i99wg"; depends=[checkmate filesstrings fs magrittr ore purrr readr rlang roxygen2 rstudioapi stringr styler usethis withr]; }; + exams = derive2 { name="exams"; version="2.3-6"; sha256="1cn0gmaayv857zl7l7zmnblmpx84qkjxqrigrymy578y04qjc4zx"; depends=[]; }; exceedProb = derive2 { name="exceedProb"; version="0.0.1"; sha256="02pb8b0rxygbv6501rcr2hb0bhz1r78k5znav161kk25fb9bxs5v"; depends=[BH Rcpp]; }; - excelR = derive2 { name="excelR"; version="0.3.1"; sha256="15frhi1laiwbd2izfm91ilvzcyl97svmx6slca5j2c6v5db3vzmq"; depends=[htmlwidgets jsonlite]; }; + excelR = derive2 { name="excelR"; version="0.4.0"; sha256="1pb4sy54zjv5vrh7gjjv7qlpab74km6mfsmfyl0yhmr0jx01hrw0"; depends=[htmlwidgets jsonlite]; }; excerptr = derive2 { name="excerptr"; version="2.0.0"; sha256="1xglpg9i45dd103ahj46lin42x9c8lgff2b5c4k3799gaki9sjzz"; depends=[checkmate reticulate]; }; - excursions = derive2 { name="excursions"; version="2.4.4"; sha256="140p0vks40vsj1bi89rhdqih5jh7795pxzzqm9140vfiv8b0aya5"; depends=[Matrix sp]; }; + excursions = derive2 { name="excursions"; version="2.4.5"; sha256="13as2zwwa1fbbcrdda10v1lbkkj9mazyhrzckndfbvpnskm10wb6"; depends=[Matrix sp]; }; exdex = derive2 { name="exdex"; version="1.0.1"; sha256="15wdi24fq8q4ja4527k1adv6lkzyhylp8nwlsrb91q0sbmmprrqs"; depends=[chandwich Rcpp RcppArmadillo RcppRoll]; }; exif = derive2 { name="exif"; version="0.1.0"; sha256="12phqn5x1x0xs2xczl3064q983dalm261vqpyafhdcndm1y3gwbc"; depends=[Rcpp]; }; exifr = derive2 { name="exifr"; version="0.3.1"; sha256="0394f04wq5dnqbnbaq7gxv4ggis4kf3b8dhhjzlybsbip6nmv54x"; depends=[curl jsonlite plyr rappdirs tibble]; }; @@ -7469,15 +7571,14 @@ in with self; { expert = derive2 { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; }; expint = derive2 { name="expint"; version="0.1-6"; sha256="0iai25cglcdnf44d2d1fz1xpw4q600my4zq4493fk4cs5673mlf7"; depends=[]; }; explor = derive2 { name="explor"; version="0.3.5"; sha256="1v3z067w5kskwr0wmrr26m3yfsmg9pf17ma9ck2srgyxqmddc0sj"; depends=[dplyr DT formatR ggplot2 highr RColorBrewer scatterD3 shiny tidyr]; }; - explore = derive2 { name="explore"; version="0.5.3"; sha256="0fji8klf2wxrkyp1vdlcvj8i0b9c4c68qvsakbm45fnyz20q3v4a"; depends=[assertthat broom DBI dplyr DT forcats ggplot2 gridExtra magrittr MASS odbc rlang rmarkdown rpart rpart_plot shiny stringr tibble]; }; + explore = derive2 { name="explore"; version="0.5.5"; sha256="0xivjnbic4jnbr21l1rvs2799qhkk3jrwsgdlgnmr6s6ddnqiif7"; depends=[assertthat broom DBI dplyr DT forcats ggplot2 gridExtra magrittr MASS odbc rlang rmarkdown rpart rpart_plot shiny stringr tibble]; }; exploreR = derive2 { name="exploreR"; version="0.1"; sha256="154j5wiiy9vqdvh1qvdkz2fdp2phcygbbjl7nj5nkn07xwxbsc77"; depends=[ggplot2]; }; expm = derive2 { name="expm"; version="0.999-4"; sha256="15k0acg2aqb2ajhwal6l7vhhp03m4lg579805d34554cl0kn9l2q"; depends=[Matrix]; }; - export = derive2 { name="export"; version="0.2.2"; sha256="03i3jk4b9q1sak6m36p349bzqcwfq3bw6y8sgrw65475mrwipm4m"; depends=[broom flextable officer openxlsx rgl rvg stargazer xml2 xtable]; }; expose = derive2 { name="expose"; version="0.0.3"; sha256="0dlxlxm3g9d8vmgp13i1825z1jzah94ih1vyif46s43xq0nf9anj"; depends=[e1071 foreach gam ggplot2 glmnet Matrix nnet polspline RColorBrewer Rcpp repmis SuperLearner xgboost]; }; expp = derive2 { name="expp"; version="1.2.4"; sha256="00r5f80wnz91n0ksp1dvrxpd6zyfis2v3rizsnm7qqnnwj3d4q1c"; depends=[deldir rgeos sp spatstat spdep]; }; expperm = derive2 { name="expperm"; version="1.6"; sha256="0cybna0q3qn3slyc4lv5rby4pr0xkwq0h6n7hl1zhsaqv4c2zc5b"; depends=[Rcpp]; }; expsmooth = derive2 { name="expsmooth"; version="2.3"; sha256="0alqg777g7zzbjbg86f00p2jzzlp4zyswpbif7ndd0zr8xis6zdc"; depends=[forecast]; }; - expss = derive2 { name="expss"; version="0.10.1"; sha256="0pqvv8y3v00ymamz0xxbccb1pyic6h62hr5qm4hyw2sa82hh74dp"; depends=[data_table foreign htmlTable magrittr matrixStats]; }; + expss = derive2 { name="expss"; version="0.10.2"; sha256="15f5xdapqx3bhw3xdlx5v76mmbyd72qkyn1adwxiclx03sylqjf2"; depends=[data_table foreign htmlTable magrittr matrixStats]; }; expstudies = derive2 { name="expstudies"; version="0.0.5"; sha256="07li3lf7gnziws452arv38dayc30dym30qkw5d3ifp6za1aih5pv"; depends=[dplyr lubridate magrittr Rcpp]; }; exptest = derive2 { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; }; exreport = derive2 { name="exreport"; version="0.4.1"; sha256="0vj60rchhrc5q6x1kv7b95fcmh2a5qynli2w54rrrw1nx54xm8c2"; depends=[ggplot2 reshape2]; }; @@ -7485,7 +7586,7 @@ in with self; { extRC = derive2 { name="extRC"; version="1.0"; sha256="1cawfkd98n70y54qg8i2h82xrrgygr48sq31yzx9hllkx33pk97d"; depends=[MASS]; }; extRemes = derive2 { name="extRemes"; version="2.0-11"; sha256="0hmgynxhzswqnhwb2sxrkczgam8c17s3vpxqc5bcz0bwczpxxyvm"; depends=[distillery Lmoments]; }; extWeibQuant = derive2 { name="extWeibQuant"; version="1.1"; sha256="08dzw5xfgqx0c7ac632c5mg5jmjjw7wwpcr4c9lvz5rv72ykh2rh"; depends=[]; }; - extdplyr = derive2 { name="extdplyr"; version="0.1.4"; sha256="0rxwpspn3905f4l27cwgi9rlj379hb6b4kkb0kjq8gzpkg2fznh1"; depends=[dplyr lazyeval tidyr]; }; + extdplyr = derive2 { name="extdplyr"; version="0.1.5"; sha256="1zbnp0h0lv1dr40dhdw6ii8rmc5lxcq4wjsm83xpd3y8x9xpglnl"; depends=[dplyr lazyeval tidyr]; }; exteriorMatch = derive2 { name="exteriorMatch"; version="1.0.0"; sha256="0cdfj1n502iws1g03rk7x0c18zyazqf3vci9kjm6lrv4j2qwrvip"; depends=[]; }; extfunnel = derive2 { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jisamsapav6swa8sskf1b6x5hglnrv3i4qyyy"; depends=[rmeta]; }; extlasso = derive2 { name="extlasso"; version="0.2"; sha256="05774y0i01lrbyws6zx5ymhcglllv1wc7gzrnyx8i5d1lxdinsyd"; depends=[]; }; @@ -7495,14 +7596,15 @@ in with self; { extrafont = derive2 { name="extrafont"; version="0.17"; sha256="0b9k2n9sk23bh45hjgnkxpjyvpdrz1hx7kmxvmb4nhlhm1wpsv9g"; depends=[extrafontdb Rttf2pt1]; }; extrafontdb = derive2 { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; }; extraoperators = derive2 { name="extraoperators"; version="0.1.1"; sha256="1clyp97ssmdq9ggbv3w5yskx7khnlm4ji7ym3k3b4bx1pazcw4q4"; depends=[]; }; - extremeIndex = derive2 { name="extremeIndex"; version="0.0.1"; sha256="0qyf7ban7cm9fnznbf78xffcfp5sc32s7kb3wn53mc5abgiad90b"; depends=[boot evd evir gmm goftest]; }; + extraterrestrial = derive2 { name="extraterrestrial"; version="0.1.0"; sha256="0clss1zwgw1497n2xif82kplr1w1ajs4xs02041ads3l8craj7y1"; depends=[]; }; + extremeIndex = derive2 { name="extremeIndex"; version="0.0.2"; sha256="1zdw6ik2jh1fir01ay3ynw1l756ba05d5vqqcphnawvg0jkvhxvk"; depends=[boot evd evir gmm goftest]; }; extremeStat = derive2 { name="extremeStat"; version="1.4.0"; sha256="0fvkvlm47ri05w9h5qa937ijsc5lg51jc825wq9pmn7aiv58yxzm"; depends=[berryFunctions evd evir extRemes fExtremes ismev lmomco pbapply RColorBrewer Renext]; }; extremefit = derive2 { name="extremefit"; version="1.0.2"; sha256="07gx6dp0kz4y1jn90hsfvkhn6k7i4flh7ghdz9v5nwda86f55q2s"; depends=[]; }; extremevalues = derive2 { name="extremevalues"; version="2.3.2"; sha256="0pyngxljdnjwnbwcb0gmxcirv70r1s1wyq4m1wm5rprpdj8v9xil"; depends=[gWidgets gWidgetstcltk]; }; extremis = derive2 { name="extremis"; version="0.90"; sha256="1cnwn70d9swks5b2y915l18gky9v23vaqlaaggshi0ghn3snb4sm"; depends=[emplik]; }; extremogram = derive2 { name="extremogram"; version="1.0.2"; sha256="13k869v6j4ik9p8w0gf1absvb45xbd3nnwghsz0ix7y0vyvry358"; depends=[boot MASS]; }; exuber = derive2 { name="exuber"; version="0.3.0"; sha256="1g0cr7lgj8j5qdvrm7zmafhqafi1iwln590pcmfrfs37cynd5fkx"; depends=[cli doSNOW dplyr foreach generics ggplot2 glue gridExtra lubridate purrr Rcpp RcppArmadillo rlang tibble tidyr zoo]; }; - eyeTrackR = derive2 { name="eyeTrackR"; version="1.0.0"; sha256="1spv9167fw0nkwm98l5dkl9xs293c624gh87zrisjq4b4xawgxgx"; depends=[data_table plyr stringr]; }; + eyeTrackR = derive2 { name="eyeTrackR"; version="1.0.1"; sha256="14m7l8v0ry1ami1jl0xjp743m1ycklgfwi06vk5amppdp5w3w3qr"; depends=[data_table plyr stringr]; }; eyelinker = derive2 { name="eyelinker"; version="0.2.0"; sha256="14rfcdxad9iazwd46q6bm8gg1ryh6s8kf7arj00hhb7xz3gvk9c2"; depends=[intervals readr stringi stringr tibble]; }; eyetracking = derive2 { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; }; eyetrackingR = derive2 { name="eyetrackingR"; version="0.1.8"; sha256="18bz8fhy2hph7h8mm7hdhjfhi5gznj4qcl05rk3n99hkxl24qn73"; depends=[broom dplyr ggplot2 lazyeval purrr tidyr zoo]; }; @@ -7514,43 +7616,42 @@ in with self; { ezknitr = derive2 { name="ezknitr"; version="0.6"; sha256="060a2175zh1nhzmqgz1mpj2c6721n5w5bv695jj4rbl2s2b2h4qj"; depends=[knitr markdown R_utils]; }; ezmmek = derive2 { name="ezmmek"; version="0.2.1"; sha256="06cjp0hbq4blg7jj0jzp372xi1vgd1nwp27nzfsbchszn3j85lgf"; depends=[assertable dplyr ggplot2 magrittr nls2 purrr scales tidyr]; }; ezpickr = derive2 { name="ezpickr"; version="2.0.0"; sha256="1x7v7zsr8hjrwi48dkryqryp607550gs77b058qcdgcdznlqwzp2"; depends=[haven jsonlite magrittr mboxr purrr readxl rmarkdown stringr textreadr tibble vroom writexl]; }; - ezplot = derive2 { name="ezplot"; version="0.3.1"; sha256="1cs5i3ik6q6s30z8nh6ckc68vcqkf1hnzy3wn6d0rypmny7jkfkc"; depends=[dplyr forcats ggplot2 rlang]; }; + ezplot = derive2 { name="ezplot"; version="0.4.0"; sha256="0w3hf0a8q897v452cgr7hkw7354ifmp8paw646sy98n2ykyz506l"; depends=[dplyr forcats ggplot2 rlang]; }; ezsim = derive2 { name="ezsim"; version="0.5.5"; sha256="03x75vmf75qsmk4zb09j7xrb11w31rpfwd3dvv12nwjgndh9bnld"; depends=[digest foreach ggplot2 Jmisc plyr reshape]; }; fANCOVA = derive2 { name="fANCOVA"; version="0.5-1"; sha256="034m2mmm6wmsjd41sg82m9ppqjf4b1kgw5vl2w7kzqfx0lypaiwv"; depends=[]; }; fAsianOptions = derive2 { name="fAsianOptions"; version="3042.82"; sha256="13p1r93rgnf03wj0kkfpw4w4dlzd1ypkam50xqpjfm38qm4zvkds"; depends=[fBasics fOptions timeDate timeSeries]; }; fAssets = derive2 { name="fAssets"; version="3042.84"; sha256="0aj3gjd54ajviikwh075bympw7dx2dcsgj5p8j96vx2qbbwjmgvb"; depends=[ecodist energy fBasics fMultivar MASS mvnormtest robustbase sn timeDate timeSeries]; }; - fBasics = derive2 { name="fBasics"; version="3042.89"; sha256="0x6s6js52sz0rv3y66ax1bkf4mn9ihjmkyrm5clf7ymw5hvd5f5q"; depends=[gss MASS spatial stabledist timeDate timeSeries]; }; + fBasics = derive2 { name="fBasics"; version="3042.89.1"; sha256="1m8x1f9kvsbdcn3ys24hw0vgbxrzdrcp11ai0s3pilp7q91j095d"; depends=[gss MASS spatial stabledist timeDate timeSeries]; }; fBonds = derive2 { name="fBonds"; version="3042.78"; sha256="1yb5vyqj66m82xks5qi5cnsppylpprbk656z4lxzg30873hi8pcf"; depends=[fBasics timeDate timeSeries]; }; fCertificates = derive2 { name="fCertificates"; version="0.5-4"; sha256="1a49gkzvb83lqqw65lxlaszpicn663hwi9wrbsb3f6z7znylkzaf"; depends=[fBasics fExoticOptions fOptions]; }; - fChange = derive2 { name="fChange"; version="0.2.1"; sha256="1kg0rja62ds8ajazcajkh6jyc9qn3czd3fs2bhrbjcpav13ld51x"; depends=[fda lattice reshape2 sandwich sde]; }; - fCopulae = derive2 { name="fCopulae"; version="3042.82"; sha256="10wknqrrs5j63v7qnp5qmk85688r36vli4r99i49y2i2nv10yp5r"; depends=[fBasics fMultivar timeDate timeSeries]; }; - fDMA = derive2 { name="fDMA"; version="2.2.4"; sha256="0lpp6gyynfziyn5ar3wlq628b5lvw5dhxzw6wr5xwwfaarqf7qfx"; depends=[doParallel foreach forecast gplots iterators itertools MSwM png psych Rcpp RcppArmadillo tseries xts zoo]; }; + fCopulae = derive2 { name="fCopulae"; version="3042.82.1"; sha256="005ydbgyz7b1g3l2dn4r46113siyza9ag27f51r28md885dnbjpi"; depends=[fBasics fMultivar timeDate timeSeries]; }; + fDMA = derive2 { name="fDMA"; version="2.2.5"; sha256="12frifhrwmkkmlm28nc48985r8543f28xy13nyfa8xigyj3mcz40"; depends=[doParallel foreach forecast gplots iterators itertools MSwM png psych Rcpp RcppArmadillo tseries xts zoo]; }; fExoticOptions = derive2 { name="fExoticOptions"; version="3042.80"; sha256="1b3y7j5ywic6xhsj2afq6y5f5l0npgav854rb87938rjckz95d4h"; depends=[fBasics fOptions timeDate timeSeries]; }; fExpressCertificates = derive2 { name="fExpressCertificates"; version="1.3"; sha256="0dcfwl0ib87p748hvwscm5ii9fhfarqfl3zqxa8kin2n0hrvkdb6"; depends=[fCertificates fExoticOptions fOptions Matrix mvtnorm tmvtnorm]; }; fExtremes = derive2 { name="fExtremes"; version="3042.82"; sha256="1n0afql4csgsqf7j9x2v8yxncvpknms643l9knm0fqb4pdbaw58c"; depends=[fBasics fGarch timeDate timeSeries]; }; - fGarch = derive2 { name="fGarch"; version="3042.83.1"; sha256="0cmdjw419iad0f7iv1wjznddiag6khp4k011hz85nr5hrzzj3c1d"; depends=[fastICA fBasics Matrix timeDate timeSeries]; }; - fICA = derive2 { name="fICA"; version="1.1-0"; sha256="0lfs31clax57qsrriq9wxjrjv2bckl7lf1csffzfwiqm6sp6mgxg"; depends=[JADE Rcpp RcppArmadillo]; }; + fGarch = derive2 { name="fGarch"; version="3042.83.2"; sha256="06c6f07bg05cbn7s40ak6ywyja4cfbznazj5my9rcyahjvc6b553"; depends=[fastICA fBasics Matrix timeDate timeSeries]; }; + fICA = derive2 { name="fICA"; version="1.1-1"; sha256="0bnvhpr5w84bb8147gx5jwpz762b462nddgagv9ylhra3wxp44mz"; depends=[JADE Rcpp RcppArmadillo]; }; fImport = derive2 { name="fImport"; version="3042.85"; sha256="0rm4mwhk5ial016vl6dny8s87gd5i9p04akdyg2fndpcqwfmb5lc"; depends=[timeDate timeSeries]; }; - fMultivar = derive2 { name="fMultivar"; version="3042.80"; sha256="0d9ijyjqqnzvy04ncx4vqd38gvgprrnzwiy5mn61wj9a4zsfgnbc"; depends=[cubature fBasics mvtnorm sn timeDate timeSeries]; }; + fMultivar = derive2 { name="fMultivar"; version="3042.80.1"; sha256="0v61sf9x54ymka9x15vz38afj1lxmgfpcwrr73lzhccf6ci6fx9m"; depends=[cubature fBasics mvtnorm sn timeDate timeSeries]; }; fNonlinear = derive2 { name="fNonlinear"; version="3042.79"; sha256="0kwjs7xx4ykw14mw3pff2axrq497jl4g23gbayswb8vrx1qhjibd"; depends=[fBasics timeDate timeSeries]; }; fOptions = derive2 { name="fOptions"; version="3042.86"; sha256="1cqyggb1hb7z0gfgkziynz7nm85z0fn3bvz1iwpy49yy8ll7rfzr"; depends=[fBasics timeDate timeSeries]; }; - fPortfolio = derive2 { name="fPortfolio"; version="3042.83"; sha256="05dprxn0h2cd13m84rb1s5n8nr9m4v4dslqmm99481rp66kgc004"; depends=[fAssets fBasics fCopulae kernlab MASS quadprog Rglpk rneos robustbase Rsolnp slam timeDate timeSeries]; }; + fPortfolio = derive2 { name="fPortfolio"; version="3042.83.1"; sha256="1knyrjgfzwf4ppvnb5n325p5f6sidr6q53ss0zw8binhj22gli4y"; depends=[fAssets fBasics fCopulae kernlab MASS quadprog Rglpk rneos robustbase Rsolnp slam timeDate timeSeries]; }; fRLR = derive2 { name="fRLR"; version="1.1"; sha256="005bmljxgvx8v87nz4l3ycg09sahyd34pg8arjz5gdc17d4mjjfc"; depends=[Rcpp]; }; fRegression = derive2 { name="fRegression"; version="3042.82"; sha256="0pi777xfk101g0r2qpcd0qxqqfnvck3sii990d946ljw6366mamc"; depends=[fBasics lmtest mgcv nnet polspline timeDate timeSeries]; }; fSRM = derive2 { name="fSRM"; version="0.6.4"; sha256="1n91gzjx9r3r3xl400w38miva0b69c0f23h2056kq9p1bax2nm86"; depends=[foreign ggplot2 gridExtra lavaan plyr reshape2 scales tcltk2]; }; fTrading = derive2 { name="fTrading"; version="3042.79"; sha256="0xnfg4npfdrvmp1n6vbsm7if16n5j83b7y1i2m5b34cqnlz9d69y"; depends=[fBasics timeDate timeSeries]; }; fUnitRoots = derive2 { name="fUnitRoots"; version="3042.79"; sha256="1hsv47dm0hx3s04g9h0bjdgi79zbfihnfxxdc2jskqp94yl7azsy"; depends=[fBasics timeDate timeSeries urca]; }; fabCI = derive2 { name="fabCI"; version="0.1"; sha256="123bc56nnx6hcj257imsd8sc6d0pggw08lf4m0lr90631gcm1mkn"; depends=[]; }; - fabMix = derive2 { name="fabMix"; version="4.6"; sha256="1xh3x9qbg61jgm80s2qrx43b55vmiam1i8mciijax8ipf56pk6j7"; depends=[coda corrplot doParallel foreach ggplot2 label_switching MASS mclust mvtnorm RColorBrewer Rcpp RcppArmadillo]; }; - fable = derive2 { name="fable"; version="0.1.1"; sha256="1h71slynwfsmv59yf7mm3gk3i56c5ggk3sd44fm83yhvv6080w3m"; depends=[dplyr fabletools Rcpp rlang tidyr tsibble]; }; - fabletools = derive2 { name="fabletools"; version="0.1.1"; sha256="0cbiqd7cx4kws9lhwydrjlcxcm46vl6srslzw1h5ljfmgjkvkf8p"; depends=[dplyr generics ggplot2 R6 rlang tibble tidyr tidyselect tsibble]; }; + fabMix = derive2 { name="fabMix"; version="5.0"; sha256="1gii3mdii9nw423xxn9mhv1pjbw967wdarn828w04zm9dkdcwm48"; depends=[coda corrplot doParallel foreach ggplot2 label_switching MASS mclust mvtnorm RColorBrewer Rcpp RcppArmadillo]; }; + fable = derive2 { name="fable"; version="0.2.0"; sha256="1z3yaf61zyz92lykzwid4scmfrpy73r7kq4zv01pcj9573p5khy3"; depends=[dplyr fabletools Rcpp rlang tibble tidyr tsibble]; }; + fabletools = derive2 { name="fabletools"; version="0.1.3"; sha256="16lkr26sl88vnww2fsqiqdv4ljk0y1fyha55g0sq4vsnypg9bhdz"; depends=[dplyr generics ggplot2 R6 rlang tibble tidyr tidyselect tsibble vctrs]; }; fabricatr = derive2 { name="fabricatr"; version="0.10.0"; sha256="0kh2mfgyqz3fpilc4wycxj3vihhbdnjzsjrsp88nmsk0p5mjmljj"; depends=[rlang]; }; face = derive2 { name="face"; version="0.1-5"; sha256="0n7vlq29krsdcp8r32irhvf7xbcxy5g7663qncmbhj5x45sviqh6"; depends=[Matrix matrixcalc mgcv]; }; - facebook_S4 = derive2 { name="facebook.S4"; version="1.1.0"; sha256="1if3fgyvj6pbf48yjwa5fkn3s4rl6kj9s1nk6dwphykhx72ghzrj"; depends=[httr magrittr plyr rjson]; }; facerec = derive2 { name="facerec"; version="0.1.0"; sha256="1dipcnxjz6yd34w0jrrvj5p0pwdgz1l5m9zvri7mflnz7g34gmaj"; depends=[dplyr httr jsonlite knitr magrittr rlang snakecase stringr]; }; facilitation = derive2 { name="facilitation"; version="0.5.2"; sha256="0gyqa3njyynvdhfziq33xqc7cjhszii67mk8809ncvh6abkdx1hw"; depends=[animation Matrix Rcpp]; }; - factoextra = derive2 { name="factoextra"; version="1.0.6"; sha256="0bpsbcmp6jpa9qk53dhfzghrz98dh0h0n68brl7rjz724yjbvhn8"; depends=[abind cluster dendextend FactoMineR ggplot2 ggpubr ggrepel reshape2 tidyr]; }; + factoextra = derive2 { name="factoextra"; version="1.0.7"; sha256="1allvdjhd3pq8xz30b1cymwcik5iaahghrjrlnn54cwkfhfg0kv2"; depends=[abind cluster dendextend FactoMineR ggplot2 ggpubr ggrepel reshape2 tidyr]; }; factoptd = derive2 { name="factoptd"; version="1.0.3"; sha256="1ir50im3kr1xhqk4qwrm2h5fq9gqgrwshbamvjlf8n1wnn03mcb6"; depends=[MASS partitions]; }; + factor_switching = derive2 { name="factor.switching"; version="1.1"; sha256="126f7939xq3g27yfalp85ivwfpk93fs8gcig037z42i0xsywh9kp"; depends=[coda HDInterval lpSolve]; }; factorEx = derive2 { name="factorEx"; version="1.0.0"; sha256="12ykf42x5fqddlsvv3556sawfakribj0pwm5vfcg3y2y99a26qxg"; depends=[arm doParallel estimatr foreach genlasso igraph mvtnorm pbapply pbmcapply prodlim sandwich stringr]; }; factorMerger = derive2 { name="factorMerger"; version="0.4.0"; sha256="127k5h1gbbnjr6gxgck2n9glvvwkd69xq7n6gzmrq8gszk8v1x5m"; depends=[agricolae colorRamps dplyr forcats formula_tools ggplot2 ggpubr knitr magrittr MASS mvtnorm proxy reshape2 scales survival]; }; factorQR = derive2 { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; }; @@ -7559,6 +7660,7 @@ in with self; { factorplot = derive2 { name="factorplot"; version="1.1-2"; sha256="025lfk122w66yxym3njcpzwnbhg40xi7p1c9vnxczcb8kz31745s"; depends=[multcomp nnet]; }; factorstochvol = derive2 { name="factorstochvol"; version="0.9.3"; sha256="15gamzznss9vfmbvbk61sgabxfsra2i49bs142jl1ahk7wchiskw"; depends=[corrplot GIGrvg Rcpp RcppArmadillo stochvol]; }; factory = derive2 { name="factory"; version="0.1.0"; sha256="1715bx2rn8kk5qd196jnrv5f95l54n4y0aqqdzfkgrmqihcy8ahx"; depends=[purrr rlang]; }; + factset_analyticsapi_engines = derive2 { name="factset.analyticsapi.engines"; version="3.0.1"; sha256="0v96z837dii1q7mbpd48zwpl2qjzqnhignb80g0xkc4iygsnrrms"; depends=[caTools httr jsonlite R6 rlang]; }; factset_protobuf_stach = derive2 { name="factset.protobuf.stach"; version="1.0.2"; sha256="0qdvgq0w58pb0bn4x5v25i8pvij3lc8l9x9bj68s9zb29ankl3ss"; depends=[R6 RProtoBuf]; }; factualR = derive2 { name="factualR"; version="0.5"; sha256="1wz8ibcmilcx62yy29nd2i1pdmjf7fm0g9i5s58gdn8cjlhnw1jl"; depends=[RCurl RJSONIO]; }; fad = derive2 { name="fad"; version="0.2-1"; sha256="09lbakil37fyji3bwydspzvrnwm0992x8783zyyv2jk37y0wr1ip"; depends=[Matrix Rcpp RSpectra]; }; @@ -7567,7 +7669,7 @@ in with self; { fairness = derive2 { name="fairness"; version="1.0.1"; sha256="1n17vrp0a3zii3444a2a7k33ffmyxmm15c8m7ln2fypya1z2pc5l"; depends=[caret devtools e1071 ggplot2 pROC]; }; faisalconjoint = derive2 { name="faisalconjoint"; version="1.15"; sha256="08sb4za8qyadvigq2z7b0r44qk2lpahpnz9nv16xfjb1zhdkz5w3"; depends=[]; }; fakeR = derive2 { name="fakeR"; version="1.0"; sha256="0f4ngnd8s34j1327zp3aqnsiw0gfxkp1i24ng20hrmfl13s1qmxp"; depends=[mvtnorm polycor pscl VGAM]; }; - fakemake = derive2 { name="fakemake"; version="1.6.0"; sha256="019dwh7n7k2djrpm0kik5qn7w3ifszppmpraqn4jyddn1jmllsn3"; depends=[callr igraph MakefileR withr]; }; + fakemake = derive2 { name="fakemake"; version="1.7.1"; sha256="0mckcgc12yxmpsgkcnmaf1pa634rz8x1zc97h023pnsd1cdwsp4l"; depends=[callr igraph MakefileR withr]; }; falcon = derive2 { name="falcon"; version="0.2"; sha256="09hlvwwj3k3nhcsxijjvv8x74a9m200ayjjplrp4baxvczwyq341"; depends=[]; }; falconx = derive2 { name="falconx"; version="0.2"; sha256="0648mvbc7ga7vr2xqzyln3dgd11h5s4bqhv3p55mj7smr4qv7hv9"; depends=[]; }; fam_recrisk = derive2 { name="fam.recrisk"; version="0.1"; sha256="1lyrq7bq7p7ijc2vf545nazw4akncz08548ya1dv3lsc5jmkgfzj"; depends=[]; }; @@ -7587,7 +7689,7 @@ in with self; { fasstr = derive2 { name="fasstr"; version="0.3.1"; sha256="1msafxyx2xwgjw87yfbqqfn5ajfc6gla2nf41s6g4wjzg245n5zn"; depends=[dplyr e1071 fitdistrplus ggplot2 lubridate openxlsx PearsonDS plyr purrr RcppRoll scales tidyhydat tidyr zyp]; }; fast = derive2 { name="fast"; version="0.64"; sha256="098rk6kszdx3szcwvwzcv7zlcd6qvqvbqch7q8ilas6vbki81ba4"; depends=[zoo]; }; fastAdaboost = derive2 { name="fastAdaboost"; version="1.0.0"; sha256="1pv1y6znvc37pgwk99v4r0hljhipq8v6r3r5cb5vhgyl0bfi8g38"; depends=[Rcpp rpart]; }; - fastDummies = derive2 { name="fastDummies"; version="1.6.0"; sha256="0fkmc1kr11vf3pikj5is5951dx79705c7djfvg7bsbbvpvll0crj"; depends=[data_table tibble]; }; + fastDummies = derive2 { name="fastDummies"; version="1.6.1"; sha256="1vqpzrrahwabvpcfzzkgw98yxclsmjqrjzfa7jvd5dsz0bgil4r7"; depends=[data_table stringi tibble]; }; fastGHQuad = derive2 { name="fastGHQuad"; version="1.0"; sha256="1rjia8wggadr9xwxcmzmal0rc4g6pa3dr5888fbbnb6abl8b2lrj"; depends=[Rcpp]; }; fastGraph = derive2 { name="fastGraph"; version="2.1"; sha256="0lz199607hqpwxzhff4jzhmjq6cbakd335iyclmlscllgfzgnhql"; depends=[]; }; fastHICA = derive2 { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; }; @@ -7595,8 +7697,7 @@ in with self; { fastJT = derive2 { name="fastJT"; version="1.0.5"; sha256="1knk4zjrkkv1i3a8n68vdrpxkwdkf19zw75p93hygfmbbz6r88v4"; depends=[Rcpp]; }; fastLink = derive2 { name="fastLink"; version="0.5.0"; sha256="1hgz4c26qlsdlp7gx0rsvkwn6xv86d7yk186sp7j6nfh2p9b1ccz"; depends=[adagio data_table doParallel dplyr FactoClass foreach gtools Matrix plotrix Rcpp RcppArmadillo RcppEigen stringdist stringi stringr]; }; fastM = derive2 { name="fastM"; version="0.0-4"; sha256="1n9a431w0hl4kr3pa32kcyd1d73acz4vb9vhfkckk3099mg46d9m"; depends=[Rcpp RcppArmadillo]; }; - fastNaiveBayes = derive2 { name="fastNaiveBayes"; version="2.1.0"; sha256="0gjhprbgrvc42nzz6ya6331cgrfqn08q3vwnd3s3fd4a2ig5xn2k"; depends=[Matrix]; }; - fastR = derive2 { name="fastR"; version="0.10.3"; sha256="1sz6krxiamq3rp4h9ah2b1zvyyrlvsn7lpvrjv1xda2c1kqqkvmk"; depends=[lattice mosaic mosaicCalc mosaicData]; }; + fastNaiveBayes = derive2 { name="fastNaiveBayes"; version="2.2.0"; sha256="11cxylh68wy8q6j979ba5awghmav57gnyzmssra4az6p4i4wvv9i"; depends=[Matrix]; }; fastR2 = derive2 { name="fastR2"; version="1.2.1"; sha256="15mqsdy79zvd4srrszdjp0kh9lfcq3yxp7j5d4xcqbjbwsgy68il"; depends=[dplyr ggplot2 lattice maxLik miscTools mosaic numDeriv]; }; fastSOM = derive2 { name="fastSOM"; version="1.0.1"; sha256="1fzy7lfx1fn9993h0qh6vbwq0w4gfgbdrprmzb1z3aqq6nqvmngm"; depends=[]; }; fastStat = derive2 { name="fastStat"; version="1.3"; sha256="1f4554p487l7cig2xihfbgl55x7w04xbazd01pic0l8819mgmy5n"; depends=[car do e1071 ggplot2 ggrepel plyr reshape2 set survival tseries]; }; @@ -7610,22 +7711,23 @@ in with self; { fastdigest = derive2 { name="fastdigest"; version="0.6-3"; sha256="02csl261v7nassi5119ygw6jglm8q6rssg7lgyxzj73mkyilm832"; depends=[]; }; fasterElasticNet = derive2 { name="fasterElasticNet"; version="1.1.2"; sha256="1hr0wc6s6zpq1hkfgshf0dqjxb7s2849bb8lb04nmi6p42r3628g"; depends=[Rcpp RcppArmadillo]; }; fasteraster = derive2 { name="fasteraster"; version="1.1.1"; sha256="1ycr2h046jds2758xvxn00rhglx3zarbzn3r38j66j5pnz2iiq4f"; depends=[Rcpp]; }; - fasterize = derive2 { name="fasterize"; version="1.0.0"; sha256="0q8n1r5n06yr6vmnwrdajx8923646bzm7ywgn2f0zxl214plf56s"; depends=[raster Rcpp RcppArmadillo sp]; }; + fasterize = derive2 { name="fasterize"; version="1.0.2"; sha256="1sffpjp4ycn495qfzragqq73zd5ykbhkbw89yj65nnifcyr1krhl"; depends=[raster Rcpp RcppArmadillo sp]; }; fastglm = derive2 { name="fastglm"; version="0.0.1"; sha256="1vqw02j4y28mngki87r42f1mhlkvajqp2gpbvk0l2adrkz70l0bn"; depends=[Rcpp RcppEigen]; }; - fastlogranktest = derive2 { name="fastlogranktest"; version="0.1.0"; sha256="0c0cv0a0y97grjywlcp71z6cnjgvaih4bnf2f332iq2lh6kb0j1x"; depends=[BH Rcpp]; }; + fastlogranktest = derive2 { name="fastlogranktest"; version="0.1.1"; sha256="0plvflhf5xcgw62hxp67ryy60sci69cbzm7klv786h2gz62v5qms"; depends=[BH Rcpp]; }; fastmaRching = derive2 { name="fastmaRching"; version="1.1.0"; sha256="085xr5i6h6vwl1flzbkwqsm8d815s0p02p0mir60jqjvy0s7haip"; depends=[raster rgdal sp]; }; fastmap = derive2 { name="fastmap"; version="1.0.1"; sha256="1v7sp56xiha0bh78g3w92k52p9vkp7ryzpw0z66nyddxzrfv0y27"; depends=[]; }; fastmatch = derive2 { name="fastmatch"; version="1.1-0"; sha256="0z80jxkygmzn11sq0c2iz357s9bpki548lg926g85gldhfj1md90"; depends=[]; }; fastmit = derive2 { name="fastmit"; version="0.1.1"; sha256="13hczsfbzssd272kpbq8l2l64lqrkmi2j6f3xyp9jvvxdd506kq0"; depends=[Rcpp RcppArmadillo]; }; fastnet = derive2 { name="fastnet"; version="0.1.6"; sha256="16jdwvk1xhl6bn9fx5s8pzvbizx6c0jmg6arqf201a7ghw2wi4xh"; depends=[doParallel foreach igraph tidygraph]; }; - fastpos = derive2 { name="fastpos"; version="0.2.0"; sha256="117b2hi1x9qh9q39sdwg9g69r70axivwyb8qs1jk2yrfh9fbrz2k"; depends=[MASS plyr Rcpp RcppArmadillo RcppProgress]; }; + fastpos = derive2 { name="fastpos"; version="0.3.0"; sha256="0w11pfbnh0px33i2myfdzi2xhskc61dan1yf2h8hvsr5x7y490lw"; depends=[MASS plyr Rcpp RcppArmadillo RcppProgress]; }; fastpseudo = derive2 { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; }; fastqcr = derive2 { name="fastqcr"; version="0.1.2"; sha256="12x3lkg5zc4ckyg4x3xxqb779yhrr0fys7asf5b8shz49f86fmm9"; depends=[dplyr ggplot2 gridExtra magrittr readr rmarkdown rvest scales tibble tidyr xml2]; }; fastrtext = derive2 { name="fastrtext"; version="0.3.4"; sha256="0k38290pz92ysw57298nng7bbghf5cicvin7l9q6l89pk3qa5wp0"; depends=[assertthat Rcpp]; }; - fastshap = derive2 { name="fastshap"; version="0.0.4"; sha256="0ll1ak1ps24q2m8h71swszcm3p8qzj29gaaznihws3mvppkygc57"; depends=[abind ggplot2 gridExtra matrixStats plyr Rcpp RcppArmadillo tibble]; }; + fastshap = derive2 { name="fastshap"; version="0.0.5"; sha256="08f25ib5mry6h8lvj0g3clc9kfl5g2wdd8x8bw455wwmbcm6x5vg"; depends=[abind ggplot2 gridExtra matrixStats plyr Rcpp RcppArmadillo tibble]; }; fasttime = derive2 { name="fasttime"; version="1.0-2"; sha256="11i4c0zrkvvqsax0az1fvmc0jxfsjyx28434k1qgzhj9g2j9m9cf"; depends=[]; }; fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.4"; sha256="01a9d6b2f6g858vg64kr0w0qmv2jqhk9kk3hb6jdr2rly4j8p14x"; depends=[kinship2 multgee]; }; - fauxpas = derive2 { name="fauxpas"; version="0.2.0"; sha256="0l77gxcf06p984z9vgaf1kag609h9qyrgav84lxkv97h6f3fflnc"; depends=[httpcode R6 whisker]; }; + fauxnaif = derive2 { name="fauxnaif"; version="0.5.6"; sha256="1fgaj3rl2aqdf2x8z9lp8p5g7bfii98g4h2mmlhic4g135r7bznp"; depends=[glue magrittr rlang]; }; + fauxpas = derive2 { name="fauxpas"; version="0.5.0"; sha256="129fzqb7wsskbn50s8x0marr4wm8jrns6hiycqcsk166k3dnyyy8"; depends=[httpcode R6 whisker]; }; favnums = derive2 { name="favnums"; version="1.0.0"; sha256="0siax7gjr25lpf1li3hawx6nviggs68c0lap2d9i38azlhvj891w"; depends=[]; }; fbRads = derive2 { name="fbRads"; version="0.2"; sha256="1a65gfvizzm6psspcvlhkxligdf9j1whrgzkg7ww520lk3z8lnnd"; depends=[bit64 data_table digest futile_logger jsonlite plyr RCurl]; }; fbRanks = derive2 { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; }; @@ -7641,57 +7743,56 @@ in with self; { fcros = derive2 { name="fcros"; version="1.6.1"; sha256="04yr6lqs38lczsmdvdm78qn63836qj7xwspgh3h3n3gh8cssd83x"; depends=[]; }; fcuk = derive2 { name="fcuk"; version="0.1.21"; sha256="1sb7p1m5qb88028mrw95lhh8l7dxj696hjh88nfsdpnscryknfpv"; depends=[magrittr purrr stringdist tibble]; }; fdANOVA = derive2 { name="fdANOVA"; version="0.1.2"; sha256="1pycq5a4czqzi8wcfmlc9ncg827j7n0qxyj90wcv39nbcrnl3da1"; depends=[doBy doParallel fda foreach ggplot2 magic MASS]; }; - fda = derive2 { name="fda"; version="2.4.8"; sha256="0n39rzbhg1hipzn51rzmbchn2358qgapg08iv7lmiqj5y7i9qns2"; depends=[Matrix]; }; - fda_usc = derive2 { name="fda.usc"; version="2.0.1"; sha256="0ii00vv4c4cvswd5vs82a1j7gbxl328bjxdk39r1xcd26iz94vlb"; depends=[doParallel fda foreach iterators MASS mgcv nlme]; }; + fda = derive2 { name="fda"; version="5.1.4"; sha256="0js4ggl3aiwsqk6npwz72yhcznkb63smddds24ngf6a0p8yp5p2x"; depends=[Matrix]; }; + fda_usc = derive2 { name="fda.usc"; version="2.0.2"; sha256="0z44vkzjm2h6r5af0k1iic1szvw82rbwjrm541zlwn2jycj4q96a"; depends=[doParallel fda foreach iterators MASS mgcv nlme]; }; fdaACF = derive2 { name="fdaACF"; version="0.1.0"; sha256="19cnjs05cdln1jg568ybj1qsb8s848l8fzcw1p5i8rh92gm2x4w4"; depends=[CompQuadForm pracma]; }; fdaMixed = derive2 { name="fdaMixed"; version="0.6"; sha256="0hyhb67qvvhyq68k5h4ffvsl4lmw66nfy5l14kwxnn42h3b810sc"; depends=[Formula Rcpp RcppArmadillo]; }; - fdaPDE = derive2 { name="fdaPDE"; version="1.0"; sha256="15x5n48hn151j9h8bnqjyjnaq575mckz6dcb9lxr9zmwidg58gb2"; depends=[geometry Matrix plot3D plot3Drgl RcppEigen rgl]; }; fdadensity = derive2 { name="fdadensity"; version="0.1.2"; sha256="1i2xzchlsixgjzyfmbv547sy6mq90xrnyc2kpd11wwfgfrpj1ix3"; depends=[fdapace Rcpp]; }; fdakma = derive2 { name="fdakma"; version="1.2.1"; sha256="0j9qgblrl7v4586dd6v0hjicli6jh8pkk5lzn8afpl75xfs24six"; depends=[]; }; - fdapace = derive2 { name="fdapace"; version="0.5.1"; sha256="0i9y9vz676jspanbbrfbygyq5bxplcv4c5q4yql1y0r8zkg4xq2z"; depends=[Hmisc MASS Matrix numDeriv pracma Rcpp RcppEigen]; }; - fdasrvf = derive2 { name="fdasrvf"; version="1.9.2"; sha256="0hdxpin1ydc9sl9wp5axn6sj2mwlhndxya92ss1i8lj1cxmlz42d"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo testthat tolerance viridisLite]; }; + fdapace = derive2 { name="fdapace"; version="0.5.2"; sha256="02kxd6604jnn0gg2bgpdalhhj390qyqk7zkzz2li5mgq8ym61n1p"; depends=[Hmisc MASS Matrix numDeriv pracma Rcpp RcppEigen]; }; + fdasrvf = derive2 { name="fdasrvf"; version="1.9.3"; sha256="148rkidnflrdjmid9p2m08qz0li21mibyr0ahqzhry14dcw24g01"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo testthat tolerance viridisLite]; }; fdatest = derive2 { name="fdatest"; version="2.1"; sha256="0zdnmssir5jz2kbfz4f4xshjfv4pivqx7cbh2arlx6ypkjrjws8n"; depends=[fda]; }; fdcov = derive2 { name="fdcov"; version="1.1.0"; sha256="0savsgcifcjjqrmbpn6m30gncq5iigqxpb19l710wlx8nm98svjh"; depends=[corrplot matlab]; }; fdistr = derive2 { name="fdistr"; version="0.1.0"; sha256="1i9nq4jmszbmwk4m6jfn7rifsn7aay40cj6kz23b9ihj3phqffi8"; depends=[dplyr ggplot2 magrittr usethis]; }; - fdm2id = derive2 { name="fdm2id"; version="0.9.1"; sha256="0dnjhrwwk5lqb2niqakp4fi7k8jgzdzaw62bbrqp3y409m49kcy9"; depends=[arules car caret class cluster e1071 FactoMineR flexclust fpc glmnet ibr irr kohonen leaps MASS mclust mda meanShiftR NMF nnet pls questionr randomForest ROCR rpart Rtsne SnowballC stopwords text2vec wordcloud xgboost]; }; + fdm2id = derive2 { name="fdm2id"; version="0.9.3"; sha256="0ylr8843hdilzj2c38csxw98pvib9pgw25j7kbgw8531931xqls0"; depends=[arules car caret class cluster e1071 FactoMineR flexclust fpc glmnet ibr irr kohonen leaps MASS mclust mda meanShiftR nnet pls questionr randomForest ROCR rpart Rtsne SnowballC stopwords text2vec wordcloud xgboost]; }; fdq = derive2 { name="fdq"; version="0.11"; sha256="1lzv1pmzjixp8wpap0w3lad1ns9z2hjbxkfpyp9jy9mxprj1w3q9"; depends=[data_table Fgmutils ggplot2 plyr randomcoloR sqldf]; }; fdrDiscreteNull = derive2 { name="fdrDiscreteNull"; version="1.3"; sha256="17nzqy4i1c5kcqyps52827q5apyjn4znb1ql4qvfm8v2m1fvily3"; depends=[MCMCpack qvalue]; }; fdrci = derive2 { name="fdrci"; version="2.1"; sha256="1sgrsmlz7sbr1maw3qnpzqz3z75fh5nyiibpsq8j0y12xac8d0x3"; depends=[]; }; fdrtool = derive2 { name="fdrtool"; version="1.2.15"; sha256="1h46frlk7d9f4qx0bg6p55nrm9wwwz2sv6d1nz7061wdfsm69yb5"; depends=[]; }; fds = derive2 { name="fds"; version="1.8"; sha256="1284vncixrzrz9x6b52gslrbrbia07sd0xac7nwdqhp5f5v5wfi0"; depends=[rainbow RCurl]; }; - fdth = derive2 { name="fdth"; version="1.2-1"; sha256="0rr9p2rns5ws111iqcicrlpcv47fkbxf161yxkkzfs2l3f1kgw14"; depends=[]; }; - feasts = derive2 { name="feasts"; version="0.1.2"; sha256="139ra1dgh6zy862gyr2w2agdrhplhh3rv7zv8k5vhi06sm59zggs"; depends=[dplyr fabletools ggplot2 lubridate rlang scales tibble tidyr tsibble]; }; + fdth = derive2 { name="fdth"; version="1.2-5"; sha256="01phrn8x245kplljjajqlsma7847j058spbxajnklamywf002qzr"; depends=[xtable]; }; + feasts = derive2 { name="feasts"; version="0.1.3"; sha256="16fzwgyhb99cxn6ynq3qxdzf0gyqjh9q7sa9ma5rr23cr460rsab"; depends=[dplyr fabletools ggplot2 lubridate rlang scales slider tibble tidyr tsibble vctrs]; }; feather = derive2 { name="feather"; version="0.3.5"; sha256="1gxd0h2m56sjjlzn4dry6s13nddxc4l5i11gsvavaf2dwbahdzsh"; depends=[hms Rcpp tibble]; }; feature = derive2 { name="feature"; version="1.2.13"; sha256="07hkw0bv38naj2hdsx4xxrm2dngi6w3rbvgr7s50bjic8hlgy1ra"; depends=[ks misc3d rgl]; }; featurefinder = derive2 { name="featurefinder"; version="1.1"; sha256="024g3adhxx1ynl9wnc2yl3illj4347ak6wkfmvqxfwd6llsa79ld"; depends=[plyr rpart rpart_plot]; }; features = derive2 { name="features"; version="2015.12-1"; sha256="0rd8r1dxzddb6718hcm8ck7531c9wdrjfy8n67875bbxgzcvds61"; depends=[lokern]; }; featuretoolsR = derive2 { name="featuretoolsR"; version="0.4.3"; sha256="1qgk9z8ld9yyw37r3birbds4a7jffq3qqkvlnldvz3yk81ir7kw7"; depends=[caret cli dplyr magrittr purrr reticulate stringr testthat tibble]; }; featurizer = derive2 { name="featurizer"; version="0.2"; sha256="05jvwsvpbdj94q3wl7ld6xmfc9p7ff9zsmryd3mmxz0hzbq2cnkc"; depends=[]; }; - febr = derive2 { name="febr"; version="1.0.3"; sha256="0rpk9k33ykcb8m475p420hpc1rj64i29dq8h0r9d49yl90ixhrn6"; depends=[dplyr glue googlesheets pedometrics readr sp stringr xlsx]; }; + febr = derive2 { name="febr"; version="1.1.0"; sha256="12580kbssixrgpr147vw52h88i0wvvpj44pp1n0ivxzmmzbvpqrv"; depends=[dplyr glue pedometrics sf stringr]; }; fechner = derive2 { name="fechner"; version="1.0-3"; sha256="0bassigcipwlr2g8cdjh8jyhmb903k3hla9gnigcbz7qwzlfwa86"; depends=[]; }; federalregister = derive2 { name="federalregister"; version="0.2.0"; sha256="0qr8nd3ylnwcv1wxspw5i7ray5sh30zr648spg0lpqq8dp2b8p7b"; depends=[curl httr jsonlite]; }; fedregs = derive2 { name="fedregs"; version="1.0.0"; sha256="171j6r6qxnx9gk9x9gpdyh51ssrgmf7sczc4889qr3qqw15sm4bn"; depends=[dplyr httr magrittr purrr rvest stringi tidyr tidytext xml2]; }; fedreporter = derive2 { name="fedreporter"; version="0.2.1"; sha256="18hs358iyxmbh28jy9f65zvanpr6bk4gq75qbj255y1zzdsjr9x1"; depends=[httr jsonlite]; }; - feedeR = derive2 { name="feedeR"; version="0.0.7"; sha256="08mnfi96qkr1fj53ywqmya957swcwrfd3hqk0qaf2ni96sxxnp98"; depends=[digest dplyr lubridate RCurl XML]; }; + feedeR = derive2 { name="feedeR"; version="0.0.8"; sha256="15fl3xb7mp7as2hl97l2vvl2k8cp48dnzy17jgrw5g1hg4yk1wgh"; depends=[digest dplyr lubridate readr stringr tibble xml2]; }; feisr = derive2 { name="feisr"; version="1.0.1"; sha256="0pwaj509qz6z4rz54b10xmv2476qygmrm4bpc3szah6pf2pf0zmm"; depends=[aod Formula plm Rdpack]; }; + fellov = derive2 { name="fellov"; version="0.1"; sha256="0z4b08ykajzwa5852dknqz5qqlmhklbwdq8x5zhyfmwba5zfbjav"; depends=[]; }; felp = derive2 { name="felp"; version="0.2.2"; sha256="1kd2619cj8697l1zpigz78vshc5gd8yvrg7zmw3mik7pjafz1k32"; depends=[prettycode]; }; fence = derive2 { name="fence"; version="1.0"; sha256="18l3fliww60d9n9hbfdny5vr9mi78krwpjj5sypdsb77d6332h9q"; depends=[fields ggplot2 lme4 MASS sae snow snowfall]; }; fergm = derive2 { name="fergm"; version="1.1.4"; sha256="1d979z2m5f13i1w9d8kh9rnaafavsap169w0nycpd5j2f3dfhyn7"; depends=[ergm extrafont ggplot2 matrixStats network reshape2 rstan]; }; fermicatsR = derive2 { name="fermicatsR"; version="1.4"; sha256="1587f67fypj22rdi1319zq765lcc9z518bzl1jr4lz6c8lrzfm9i"; depends=[]; }; - fetchR = derive2 { name="fetchR"; version="2.1-1"; sha256="0i5k40i7ryfbk1l4nn0k5hnmzhhp6970ns1j82hnih7kmdl4rlwj"; depends=[plotKML rgdal rgeos sp]; }; - ff = derive2 { name="ff"; version="2.2-14"; sha256="1w724q4jpzbvzpilb2ifviaxkjgk9lzwxz9gksnvicbmfa20fqqw"; depends=[bit]; }; - ffbase = derive2 { name="ffbase"; version="0.12.7"; sha256="04kxx2f3f0743c5nvpb7x1x0pcd220dazpd5ag1pidxbz3xa85nw"; depends=[bit fastmatch ff]; }; + ff = derive2 { name="ff"; version="2.2-14.2"; sha256="1r1pbrf5s4rdm3msxxr8fy1f2xjihqciclsnvxf59qzz6g1nmh7q"; depends=[bit]; }; + ffbase = derive2 { name="ffbase"; version="0.12.8"; sha256="0mjk7dkq1ginqqfvngzny747ggf9a8fd7kblq96n5ys1jrwjyqhq"; depends=[bit fastmatch ff]; }; ffmanova = derive2 { name="ffmanova"; version="1.1.0"; sha256="0019m9vxnh5yxr5k7zflzyhd533a842cjjkcpqyannshnrbfndvy"; depends=[]; }; ffmetadata = derive2 { name="ffmetadata"; version="1.0.0"; sha256="0gjv5fl3p0kz28c91l4qf34a2685a24l5841ixdg7wivfs5v9npv"; depends=[httr jsonlite]; }; ffstream = derive2 { name="ffstream"; version="0.1.6"; sha256="036ikhah4y85khgfmvxwsn3vavvw1is8i9k2lw474wxlh4cxa3kd"; depends=[Rcpp]; }; - fftw = derive2 { name="fftw"; version="1.0-5"; sha256="037jnf0hgjlw4k2yj8kl9vi8h6vzsff261hn35f1kndywpl4zjdg"; depends=[]; }; + fftw = derive2 { name="fftw"; version="1.0-6"; sha256="1kkhn79x3akp2v28aqmif0dd2fn1pw145fjgyy29i4ab6pngazir"; depends=[]; }; fftwtools = derive2 { name="fftwtools"; version="0.9-8"; sha256="1nqvpzda281rxi1cmwajxxsn3sc3gz7scv8bvs5jm34kf36whha6"; depends=[]; }; fgac = derive2 { name="fgac"; version="0.6-1"; sha256="0paddf5a4w0g2i0ay7my0bppwh534d8ghy6csfxl5jj034xjgwkk"; depends=[]; }; fgdr = derive2 { name="fgdr"; version="1.0.0"; sha256="0wf0ayn2vx2pkid08ssr7ygq9k9qxsw86wwppm2r9b7i8cw7kbf8"; depends=[jpmesh magrittr purrr raster readr rlang sf sp stars stringr tibble xml2]; }; fgeo = derive2 { name="fgeo"; version="1.1.4"; sha256="0axglmk05li3plb79rccskhddjzq3pdx3mgxr8yqysymf1nscrq6"; depends=[cli crayon dplyr fgeo_analyze fgeo_plot fgeo_tool fgeo_x glue magrittr purrr rlang rstudioapi]; }; - fgeo_analyze = derive2 { name="fgeo.analyze"; version="1.1.11"; sha256="148ks0y8k29v5z69g04k2l1ncml18xcwgagi6mngj72b4h3cpc6p"; depends=[dplyr fgeo_tool glue lubridate magrittr MASS purrr rlang tibble tidyr withr]; }; + fgeo_analyze = derive2 { name="fgeo.analyze"; version="1.1.13"; sha256="1cj4bazggpic0i5sq9iqq0y0j2xvp01i9ccv0pchg82xlgis33gw"; depends=[dplyr fgeo_tool glue lubridate magrittr MASS purrr rlang tibble tidyr withr]; }; fgeo_plot = derive2 { name="fgeo.plot"; version="1.1.9"; sha256="18zw4bsqdqdpy103kdyl40162mii6s1lp2w4cpi50svx7g7xhgh5"; depends=[dplyr fgeo_tool ggplot2 ggrepel glue magrittr purrr rlang stringr]; }; - fgeo_tool = derive2 { name="fgeo.tool"; version="1.2.5"; sha256="1sy0w2n2727v44fv56zijj03q732q3qnxyn1r1j8spmb257bhvn6"; depends=[dplyr glue magrittr purrr readr rlang tibble tidyselect]; }; + fgeo_tool = derive2 { name="fgeo.tool"; version="1.2.6"; sha256="0di1alxmxh47akbhy75b7vpix674xg4iynac4ga859nia56fisz1"; depends=[dplyr glue magrittr purrr readr rlang tibble tidyselect]; }; fgeo_x = derive2 { name="fgeo.x"; version="1.1.4"; sha256="0swps9rli74fmfb2j4kf55kw39gxz0q49m74ad4vcs0ylyp0sxrb"; depends=[memoise]; }; fgm = derive2 { name="fgm"; version="1.0"; sha256="0i6lbqxxjq78dql14qwqs7slnn0kyls2g3a9biabny2narwf6n3m"; depends=[fdapace JGL]; }; fgof = derive2 { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; }; @@ -7700,8 +7801,7 @@ in with self; { fhidata = derive2 { name="fhidata"; version="2019.8.27"; sha256="0cm8ixpr3gjzprjcv43zdnysw8qhv72pf3fd2vckql01mlk16p42"; depends=[data_table]; }; fiberLD = derive2 { name="fiberLD"; version="0.1-6"; sha256="1i3bl2qsc77m81l11an9ihl4vy86s8jd5x6pasib77rl2877ad4x"; depends=[doParallel foreach Matrix VGAM]; }; fic = derive2 { name="fic"; version="1.0.0"; sha256="18xz94w1ab17jfi61bdg9z3pm63g488v17ns2ivizkza4gg07pv8"; depends=[abind ggplot2 mvtnorm numDeriv scales survival tensor]; }; - fieldRS = derive2 { name="fieldRS"; version="0.2.2"; sha256="0jrcdsv46zx7six9ll5sha32wx36wqajaladj6z8xym2n9ay8d5b"; depends=[caret concaveman ggplot2 raster rgeos sp spatialEco stringdist]; }; - fields = derive2 { name="fields"; version="10.0"; sha256="173zm5vr236ydiq0v27qy0l3x7h9fc7jly38iakg77j26i0a01il"; depends=[maps spam]; }; + fields = derive2 { name="fields"; version="10.3"; sha256="12k97vfjlz5h8vynirnvik1nyj1iw25n8xl7awmx9mpd6wvgy2s9"; depends=[maps spam]; }; fiery = derive2 { name="fiery"; version="1.1.2"; sha256="01ahdvcag8ifpp6jl6cgjjrchwxbr9fzvzqysj77kg3n5dcqm6cl"; depends=[assertthat crayon future glue httpuv later R6 reqres stringi uuid]; }; filehash = derive2 { name="filehash"; version="2.4-2"; sha256="14zv7h5195dmfksgk8qvjgc2qq8253vga6267aa1bqs5bpvmdl5n"; depends=[]; }; filehashSQLite = derive2 { name="filehashSQLite"; version="0.2-4"; sha256="1higvkmj4wvnwpvayqinzaygiksij20d77dx118q0gffsczadamh"; depends=[DBI filehash RSQLite]; }; @@ -7710,21 +7810,23 @@ in with self; { filenamer = derive2 { name="filenamer"; version="0.2.3"; sha256="19gavhh5q7dziv0yc000w06qp58wk2cm52cxjl33p1q4cjk6gg3m"; depends=[]; }; files = derive2 { name="files"; version="0.0.1"; sha256="1vhhawqjjbb6fadkn3l10mvz63w3vmcwvl93fk0q9mhkifzlj9kc"; depends=[]; }; filesstrings = derive2 { name="filesstrings"; version="3.1.5"; sha256="072alawp6j08mwlw1pz50g3lfi726kpsc744x5fvy71d7w4gqn6l"; depends=[checkmate magrittr matrixStats ore rlang strex stringi stringr tibble withr]; }; - filling = derive2 { name="filling"; version="0.2.0"; sha256="0yxixwgvn7jq09j4r3q33mmdda9a4anfi7y0xqscbdjz6p9bx48w"; depends=[CVXR nabor Rcpp RcppArmadillo Rdpack ROptSpace RSpectra]; }; - fillr = derive2 { name="fillr"; version="0.1.1"; sha256="01z4841hxnpf8s9s327fqprb4gl9k8pkyv2mgc5vfl86r1pd7m1b"; depends=[]; }; - finalfit = derive2 { name="finalfit"; version="0.9.7"; sha256="1y1fllbrqy4q79w4l3830aqlf32v4clfzajqnwiylxwxw71v7yaa"; depends=[boot broom dplyr forcats GGally ggplot2 gridExtra Hmisc lme4 magrittr mice pillar plyr pROC purrr scales stringr survival survminer tibble tidyr]; }; - finbif = derive2 { name="finbif"; version="0.2.0"; sha256="1wb4hl5j2g3fgapd7x8jl2180s48p51nngyb8zvs7jacl32a04bh"; depends=[digest httr jsonlite lubridate lutz]; }; + filling = derive2 { name="filling"; version="0.2.1"; sha256="17bhfzvzdyri8yx7b40yhdx3x2gb2vy2i8sz2cyjyw9idnd8svmr"; depends=[CVXR nabor Rcpp RcppArmadillo Rdpack ROptSpace RSpectra]; }; + fillr = derive2 { name="fillr"; version="1.0.0"; sha256="1gx1ihp8j90ywmm6mmmfq4jd6apxawk9s5dfw3jq0wm1c290zqpv"; depends=[]; }; + finalfit = derive2 { name="finalfit"; version="1.0.1"; sha256="0ndnsllz8p96jj6in4ffqpfdawp45rh1fn2ralcrgdldhs6lg1xq"; depends=[boot broom dplyr forcats GGally ggplot2 gridExtra lme4 magrittr mice pillar pROC purrr scales stringr survival tidyr]; }; + finbif = derive2 { name="finbif"; version="0.3.0"; sha256="0f5mkwinnfqhv0kgywbzi1lhfdhnh5mhhh8kj5pyxfwncbg109z4"; depends=[digest httr jsonlite lubridate lutz]; }; finch = derive2 { name="finch"; version="0.3.0"; sha256="1cglyq3b0cvl05yrnpy6xn0nj0n817hgpcsxp3m07cvj8xidib02"; depends=[data_table digest EML hoardr plyr rappdirs xml2]; }; findR = derive2 { name="findR"; version="0.2.1"; sha256="1a7cf6kd7i2l4ffr2b17nb9xnpsjhf6fcwpjy06r0qgcapnfp54b"; depends=[pdftools stringr]; }; findpython = derive2 { name="findpython"; version="1.0.5"; sha256="0icifm4z6hhpmcjrg75a875iph0ci890ss02kdv3725pijc236iy"; depends=[]; }; findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; }; fingerPro = derive2 { name="fingerPro"; version="1.1"; sha256="1a1lj8gyrbgcg8hr03cj2bjzlaafddspri7abc83ys1raqwd4j68"; depends=[car GGally ggplot2 gridExtra klaR MASS plyr Rcmdr Rcpp RcppGSL RcppProgress reshape rgl scales]; }; fingerprint = derive2 { name="fingerprint"; version="3.5.7"; sha256="04jcwkydjrs31pia6kq8z2n9s54im950q08hs2ay15xjxxkmb8ic"; depends=[]; }; - fingertipsR = derive2 { name="fingertipsR"; version="1.0.0"; sha256="0hk2qlq7saqxlkd3yh4vq3s9cwcrjs65dwzhcglz5296w90dyscl"; depends=[curl dplyr DT httr jsonlite miniUI readr rlang shiny shinycssloaders]; }; + fingertipsR = derive2 { name="fingertipsR"; version="1.0.3"; sha256="0r67d47w4qvxh7n70600z0i1s9ykpp0jshay69clgbmavl0vg7hv"; depends=[curl dplyr DT httr jsonlite miniUI readr rlang shiny shinycssloaders]; }; fingertipscharts = derive2 { name="fingertipscharts"; version="0.0.10"; sha256="1l3mirspz28djlzma04lkkynfbz8qfq0asr662q102j31qx6vnm4"; depends=[curl dplyr geojsonio ggplot2 httr leaflet lemon mapproj purrr rlang scales sf stringr tibble tidyr]; }; finiteruinprob = derive2 { name="finiteruinprob"; version="0.6"; sha256="0z4l0crymh58chxniqq70fqmvi6f5jkgvz72vbc7s3l9lrrapgr3"; depends=[numDeriv sdprisk]; }; + finity = derive2 { name="finity"; version="0.1.4.1"; sha256="0xs3vx0vj165hj4dq8ivrdf6fcvj23zhp2ai79rgpyb5rr5ndkvc"; depends=[BH Rcpp RcppArmadillo stabledist]; }; finreportr = derive2 { name="finreportr"; version="1.0.1"; sha256="1mansiyl4p4zqc1h2aw9zgzb3fy4mppgmshdm8mcf4nbm340g4vk"; depends=[curl dplyr httr rvest XBRL xml2]; }; fipe = derive2 { name="fipe"; version="0.0.1"; sha256="055jav8h4wws76jahm2d5dj49wkvzchh3f2vk5d50pny4dc7smar"; depends=[dplyr forcats furrr future httr jsonlite lubridate magrittr purrr readr stringr tibble tidyr]; }; + firebase = derive2 { name="firebase"; version="0.1.0"; sha256="154a386ga9bjgam9rxp0y9033hx55p7f3294z52r6dz2y87h3lz2"; depends=[cli R6 shiny]; }; firebehavioR = derive2 { name="firebehavioR"; version="0.1.2"; sha256="10krny60dkpgwjjnriap91qmrnfq1rl5ck4ynf4h6x016bv0m374"; depends=[ggplot2]; }; fishMod = derive2 { name="fishMod"; version="0.29"; sha256="0pbs4z27vwa3c42xdw3mr6l2i581bgvn2pk52kawbcnnlsff92ar"; depends=[]; }; fishdata = derive2 { name="fishdata"; version="0.1.3"; sha256="04162m1j570cdwhffkwjs1x1qlsc20djj1jwx2hl2cqmbp584ppq"; depends=[]; }; @@ -7733,7 +7835,7 @@ in with self; { fishmethods = derive2 { name="fishmethods"; version="1.11-1"; sha256="049a25rwxqy6a8jfm0irjka3bl7vkask32f9h7fsr5ddlyzvg5pz"; depends=[boot bootstrap data_table lme4 MASS numDeriv]; }; fishmove = derive2 { name="fishmove"; version="0.3-3"; sha256="1knbv087cg0czjcgdbrlpg69pp1dxb57b7ak5j1mcy7ay3a41a9h"; depends=[boot ggplot2 MASS plyr]; }; fishtree = derive2 { name="fishtree"; version="0.3.2"; sha256="19kq38l4cm7g2frvf2zdlk1j636k2f5k0bf6v7wn2zcmivy0xzsw"; depends=[ape jsonlite memoise rlang]; }; - fishualize = derive2 { name="fishualize"; version="0.1.0"; sha256="17ywlnjq1digkc73r9bc0czdwh7f3sp8lzbh53rx99dad7bpm9kd"; depends=[ggplot2 gridExtra png]; }; + fishualize = derive2 { name="fishualize"; version="0.2.0"; sha256="13z6n62fpans1fxjxlpz2xqqpq0ng5via67vk4nkvp0nxmlrlhky"; depends=[downloader dplyr ggplot2 gridExtra httr magrittr png rlang scales stringr tidyr]; }; fit_models = derive2 { name="fit.models"; version="0.5-14"; sha256="0vjbzmx0ambm6yzidb4vbgmhclwzwv2iz2cwl54ccdkvx4cx3fck"; depends=[lattice]; }; fit4NM = derive2 { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 tkrplot]; }; fitDRC = derive2 { name="fitDRC"; version="1.1.1"; sha256="09z9l27iwl0fd3zy6rsdhmy8qbm5d9a4wcaj5rxp7ynlnpi102aa"; depends=[]; }; @@ -7751,35 +7853,35 @@ in with self; { fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.5.0"; sha256="00cc7kjs54wk2cxbkd14gldsrjmf4i35vwr6c2kfsassvjjhbmpm"; depends=[]; }; fixedTimeEvents = derive2 { name="fixedTimeEvents"; version="1.0"; sha256="0z7ji8yzp4pj76ad64l7ivknkbi82ijx6abd3a18wicqhrh433sj"; depends=[]; }; fixerapi = derive2 { name="fixerapi"; version="0.1.6"; sha256="0ikf8dn0l9c9gshp4bph3wasl0bh6lfybinc8n1rvb202231hmgb"; depends=[jsonlite tibble tidyr]; }; - fixest = derive2 { name="fixest"; version="0.2.1"; sha256="1zs3jzrsg25hg8jrk1vc82xh5l07qc20109gvyv1m2arxs2ggnhs"; depends=[Formula MASS nlme numDeriv Rcpp]; }; + fixest = derive2 { name="fixest"; version="0.4.1"; sha256="1jdx6mhi2hibd8zbpbba324z6f76irhkvwaanw2840qq8pql5rjf"; depends=[Formula MASS nlme numDeriv Rcpp]; }; fizzbuzzR = derive2 { name="fizzbuzzR"; version="0.1.1"; sha256="119gbi9y4n8r52hk9vj7zf795dv9xnk7lnngljjcd7ydnhygwd4h"; depends=[]; }; - flacco = derive2 { name="flacco"; version="1.7"; sha256="1w77smmbrwglayr2rj88b00x7wan9f3x1fq8h6xyhybfvrw7vr0r"; depends=[BBmisc checkmate mlr]; }; + flacco = derive2 { name="flacco"; version="1.8"; sha256="15h2q9xgddy7gw6r52c2nk618f3z1mjn4xz9pzdvhm1d3kqggwa4"; depends=[BBmisc checkmate mlr]; }; flagr = derive2 { name="flagr"; version="0.3.2"; sha256="195c78cml2pjzfvpkaxbzcg1dfdqxi76138p0v3x3zzva9d8nlji"; depends=[]; }; + flair = derive2 { name="flair"; version="0.0.2"; sha256="0hvg9k7l6vdhmbmql1viyn54f07r31ssyyhdv2v242i0npa2l25r"; depends=[dplyr evaluate ggplot2 glue knitr magrittr purrr rmarkdown stringr]; }; flam = derive2 { name="flam"; version="3.2"; sha256="0v6kcl4n7wq052p7jdgbzlh9fpk8bzlrqw12i6pib1wd3slj0asa"; depends=[MASS Rcpp]; }; flamingos = derive2 { name="flamingos"; version="0.1.0"; sha256="0gic6y8wpxffpyi3zy0wh7apy4z6argxbz284n80k2mzh6lh029k"; depends=[Rcpp RcppArmadillo]; }; - flan = derive2 { name="flan"; version="0.7"; sha256="1r1vkf207k0il7r314gq1lxz0ndhdbbvx338mn8zhrkrd2ln9hpq"; depends=[lbfgsb3 Rcpp RcppArmadillo RcppGSL]; }; flare = derive2 { name="flare"; version="1.6.0.2"; sha256="1ybrsx1djqldw0l5l1iz4pfh6xxb8ckkg1ric7wnsr51wm9ljlh5"; depends=[igraph lattice MASS Matrix]; }; flars = derive2 { name="flars"; version="1.0"; sha256="06qma1ar1nj7n6g9alk1qydm5bkj6lsjx0pqkikxpb41d91civqk"; depends=[fda MASS Matrix Rcpp RcppEigen]; }; flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; }; - flashlight = derive2 { name="flashlight"; version="0.6.0"; sha256="11ihz72kq77asg6lk2yfasxb99z4ixpddklvs26fglss58p24041"; depends=[dplyr ggplot2 ggpubr MetricsWeighted rlang tidyr]; }; + flashlight = derive2 { name="flashlight"; version="0.7.2"; sha256="1d0mps51sxg9hc8fr4462m2jwr0hv7f8qk6sxlh3d3x3ci9zk6xq"; depends=[dplyr ggplot2 ggpubr MetricsWeighted rlang rpart rpart_plot tidyr]; }; flatr = derive2 { name="flatr"; version="0.1.1"; sha256="10l98a3f57wahfpdqxj70r25zfhk4vzzd014pdnriy458yrfd7rw"; depends=[dplyr magrittr tibble]; }; flatxml = derive2 { name="flatxml"; version="0.0.2"; sha256="1f7pc3chzimkg23490qvppy63sk4ds3aaahc36sa4dc4qmhabyms"; depends=[RCurl xml2]; }; - flexPM = derive2 { name="flexPM"; version="2.0"; sha256="0h3qs9w9pc2nc24q1diz7j3s93y40ijpmgq2l0xg9mzcgjz9kz8c"; depends=[survival]; }; + flexCWM = derive2 { name="flexCWM"; version="1.92"; sha256="1fxwq12mki10ikf5lyh1pb58svfzs4llg68v4d9iznia8aa0grhq"; depends=[ContaminatedMixt mclust numDeriv statmod]; }; flexclust = derive2 { name="flexclust"; version="1.4-0"; sha256="0x7wxk8y46ndyz6fdacym0rd6p9wh3pcfr28chjcg5d7fm849zl2"; depends=[class lattice modeltools]; }; flexdashboard = derive2 { name="flexdashboard"; version="0.5.1.1"; sha256="0fy3nbrr67zqgd44r2mc850s5sp0hzfcw3zqs15m8kxzj1aw067x"; depends=[htmltools htmlwidgets jsonlite knitr rmarkdown shiny]; }; flexmet = derive2 { name="flexmet"; version="1.0.0.0"; sha256="0xhr4i46s3k7a4yz2sd1sphn8wz27xcl580s2kqkr1ifg8941kv8"; depends=[]; }; flexmix = derive2 { name="flexmix"; version="2.3-15"; sha256="0hrz2axp2c9548b1r0bmrl57219nn030qndb83a8garkzq5lqi5s"; depends=[lattice modeltools nnet]; }; flexmixNL = derive2 { name="flexmixNL"; version="0.0.1"; sha256="0bk5v0cnsn1qkd1b86vj0bnpr4l9d6523kpkgzb1l1sqyscawfmm"; depends=[flexmix gnm]; }; - flexrsurv = derive2 { name="flexrsurv"; version="1.4.4"; sha256="08xhanbrd4pfm014ydh8dz6dpm6xw7qjdq0wr2flld04924yv9p8"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis statmod survival]; }; + flexrsurv = derive2 { name="flexrsurv"; version="1.4.5"; sha256="1xwh6fj854hr5j1mdh4cbp3hbrbdl4nb2ili876rq08wb9wq5pkf"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis statmod survival]; }; flexsurv = derive2 { name="flexsurv"; version="1.1.1"; sha256="0x7p1rv51pplfyyzcg63ssb8z56mig7y0363hkr0219w3cvyq9nr"; depends=[deSolve mstate muhaz mvtnorm quadprog Rcpp survival tibble tidyr]; }; - flexsurvcure = derive2 { name="flexsurvcure"; version="1.0.0"; sha256="1blhwbkp0a3a7xnqyxp952wxkihdxb0xh68sk827h8rxis9zr4z4"; depends=[flexsurv gtools survival]; }; - flextable = derive2 { name="flextable"; version="0.5.6"; sha256="1f869f2dfqkzhf6yix7xcbs8rn1nwq3sg623h74zg6h1pl6px66w"; depends=[base64enc data_table gdtools htmltools knitr officer rlang rmarkdown xml2]; }; + flexsurvcure = derive2 { name="flexsurvcure"; version="1.1.0"; sha256="0q77cc2l4xa7jkmx5sl9qwsxsdaf688ckp7j6pprv0nkzv8js16r"; depends=[flexsurv gtools survival]; }; + flextable = derive2 { name="flextable"; version="0.5.9"; sha256="1rkz0nhwjy1l8sb0kmna5v492n2ydnk7gydswnmf88r8vfyjczhw"; depends=[base64enc data_table gdtools htmltools knitr officer rlang rmarkdown xml2]; }; flifo = derive2 { name="flifo"; version="0.1.5"; sha256="03x66l3ryrjvwbxxd0ncjrb5w9kc7fswmp5psb1cb7r87f395gm3"; depends=[bazar pryr]; }; - flightplanning = derive2 { name="flightplanning"; version="0.7.2"; sha256="0l7pm4sdjdr0n5njnh4lxydayr55p4i5w2a6i3b998z8fdl0vpv9"; depends=[rgdal rgeos sp]; }; + flightplanning = derive2 { name="flightplanning"; version="0.8.0"; sha256="0q5xdjgjj9j73djpvzc34ig2gk43xan5jg9pn195m1x8lz41yvk9"; depends=[rgdal rgeos sp]; }; flip = derive2 { name="flip"; version="2.5.0"; sha256="08x5hwxaxbgc745gblja7gcy0b5wbp7jf90lkha75zl5cc9iyksl"; depends=[cherry e1071 plyr someMTP]; }; flippant = derive2 { name="flippant"; version="1.1.0"; sha256="06aj90y7c33c1q0nw1c67vr1pfmp9fw78az6ivrbq110f2k1m12w"; depends=[assertive_files assertive_numbers assertive_properties assertive_strings assertive_types data_table ggplot2 magrittr minpack_lm plyr RcppRoll stringi withr wmtsa]; }; flipscores = derive2 { name="flipscores"; version="0.2"; sha256="0b55qxdrn6m0pbk4aj9zr1d9s7id6pclsaz939p48jmqx07zayjg"; depends=[]; }; - float = derive2 { name="float"; version="0.2-3"; sha256="1sf0pj5543alh25b96fw8jjsmiaky3r4nw9xhn349gv50rf0nhrj"; depends=[]; }; + float = derive2 { name="float"; version="0.2-4"; sha256="1wf1dfybgbhvh9sa5z41xkh8liwp5n9gyydfq2mpg6bag0r457z1"; depends=[]; }; flobr = derive2 { name="flobr"; version="0.2.0"; sha256="1pwk190bj1f8312bg95hj5y19ripm2jf6l1cbbsmfh2xw5x0xz0z"; depends=[blob checkr]; }; flock = derive2 { name="flock"; version="0.7"; sha256="1zg93p74icj4bhxnmnssj2xp6vw4yaksyavq03497v33xfpdxss7"; depends=[Rcpp]; }; flood = derive2 { name="flood"; version="0.1.1"; sha256="0nlmjh2l7dij1aqd70hhj0m550knlin3am14azqkx4pacs1kir3p"; depends=[copula evd magrittr TLMoments]; }; @@ -7789,24 +7891,22 @@ in with self; { flowfield = derive2 { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; }; flowr = derive2 { name="flowr"; version="0.9.10"; sha256="18mjshfg3827b26b8nz52pl04ph7n887vw0ym5fybjm8gy5wwpdg"; depends=[diagram params whisker]; }; flows = derive2 { name="flows"; version="1.1.1"; sha256="0l152p17plkrbnrlis8rfr9ij406agckdxvnjsciilv6qwcync29"; depends=[igraph reshape2 sp]; }; - flsa = derive2 { name="flsa"; version="1.5.1"; sha256="0x4fksps364841qckp218rfslx1dvwns1rhw2w7dcnhj7kfkcv59"; depends=[]; }; + flsa = derive2 { name="flsa"; version="1.5.2"; sha256="0c6cdf3hkl3s5yqwbn1qhqhyaw5pgd83a5bc30wbzq03hk7rh9ks"; depends=[]; }; fluoSurv = derive2 { name="fluoSurv"; version="1.0.0"; sha256="1dv4lf7k28bih2qqkpy15f7d14ibxk48p3z6sj3dj5yvh25mhv81"; depends=[]; }; fluspect = derive2 { name="fluspect"; version="1.0.0"; sha256="0j80wx00s8ljqg1qaqw66rj7kxhhk438hb0syv0lr9vld03cxy2w"; depends=[pracma]; }; flux = derive2 { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; }; fluxweb = derive2 { name="fluxweb"; version="0.2.0"; sha256="1ssq90fqm4p0j4g171mx208lmgz3hkxs8hgsffkawpmxgacs0gh1"; depends=[]; }; - flying = derive2 { name="flying"; version="0.1.1"; sha256="0mjn2h8101hkdhas746iqy97dsyyi50bfpi02q0ypfr6zsxji2bq"; depends=[kableExtra knitr Rcpp rmarkdown]; }; - flyio = derive2 { name="flyio"; version="0.1.4"; sha256="1mrv5gvsr4zbh8bghrrizgrqz1cqn4pl3gizr77jl9mlxxpmhx20"; depends=[assertthat aws_s3 googleCloudStorageR stringr]; }; + flying = derive2 { name="flying"; version="0.1.3"; sha256="04wfcsbq8icvk1nnczvic5cp4nb40hxj3g6lasyb1dvhsh0svg0q"; depends=[kableExtra knitr Rcpp rmarkdown]; }; fma = derive2 { name="fma"; version="2.4"; sha256="1x175mhljvplm7b2iwcvkzalv3a79p8gqj9d4f06l5v4shxlrab9"; depends=[forecast]; }; fmbasics = derive2 { name="fmbasics"; version="0.3.0"; sha256="1dnf09rgwpc7n7ydlp7r5cwy2fa4vh1h9mbjqzfhk0208kz6jpl0"; depends=[assertthat fmdates lubridate tibble]; }; - fmcmc = derive2 { name="fmcmc"; version="0.2-0"; sha256="0hczf41pykxz8j9y8d2mqawzk5q9w44875jk4p4pf7jbkff5rzxf"; depends=[coda]; }; + fmcmc = derive2 { name="fmcmc"; version="0.3-0"; sha256="1r019pzk5h00s6ki897gbzsyhlnwljxklzqnfz87gbg1n5dvhqp4"; depends=[coda MASS]; }; fmdates = derive2 { name="fmdates"; version="0.1.4"; sha256="1bbcwkh65nf2gak9b81zgg32c5ihwhmai3nc43ayf6ivhqsxw8x0"; depends=[assertthat lubridate]; }; - fmri = derive2 { name="fmri"; version="1.9.2.1"; sha256="0ij6j3hk3rb2vinhh2jxac085qd258zr4jk60difh5krsk9kksyc"; depends=[aws awsMethods metafor nlme]; }; + fmri = derive2 { name="fmri"; version="1.9.3"; sha256="0is9lgp27g8dv3rmxn4mlf9m53izx5j7h974cy3ls3lq0pdp99va"; depends=[aws metafor nlme]; }; fmriqa = derive2 { name="fmriqa"; version="0.3.0"; sha256="1z09nf1c305a78c129jvs21b9z91wyhazz41wrn4bimmhfhx7szv"; depends=[ggplot2 gridExtra imager optparse pracma RcppEigen reshape2 RNifti tidyr viridisLite]; }; - fmrs = derive2 { name="fmrs"; version="1.0-9"; sha256="1x9g67701kcnz3p97iynr74sn0mfpxpp16mv1l4zxlhhfn2v5lwx"; depends=[survival]; }; fmsb = derive2 { name="fmsb"; version="0.7.0"; sha256="0x1wkzfdvv4s5xmr0whcwjz4aac71gacwymj2c3mzj2bbswwlw45"; depends=[]; }; foba = derive2 { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; }; focusedMDS = derive2 { name="focusedMDS"; version="1.3.3"; sha256="18s86dbbpyajscqr9frprf2vp1zif7vh4lw5m0cjskfc6gmsdp2p"; depends=[htmlwidgets]; }; - foghorn = derive2 { name="foghorn"; version="1.1.4"; sha256="1nxz41yhlg28jdihixy2w44nfvaliyfmxibxk58j7hfgyyvlm21s"; depends=[clisymbols crayon curl httr jsonlite rvest tibble xml2]; }; + foghorn = derive2 { name="foghorn"; version="1.1.5"; sha256="08lb3d7q7g0hvg68d9lbvssch0d4vxbfriy92pyx1vi57jaavnl6"; depends=[clisymbols crayon curl httr jsonlite rvest tibble xml2]; }; foieGras = derive2 { name="foieGras"; version="0.4.0"; sha256="0jrxdmsjxc8zjfgcv6n0kili0dzxppy0qdhqaji2ggklzynp4i33"; depends=[argosfilter dplyr furrr future ggplot2 gridExtra lubridate RcppEigen rworldmap sf stringr tibble tidyr TMB]; }; folderfun = derive2 { name="folderfun"; version="0.1.2"; sha256="08kfw7i5xqbk07ssp4j79p3x0gf0jq2fbcq99lb10r6ndcgp5rxp"; depends=[]; }; fontBitstreamVera = derive2 { name="fontBitstreamVera"; version="0.1.1"; sha256="0nipdlmhjv1wr3aidcl97nk6mppdkd65krgwqnhdsnv0jpfv761j"; depends=[]; }; @@ -7819,85 +7919,85 @@ in with self; { foodweb = derive2 { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; }; foolbox = derive2 { name="foolbox"; version="0.1.1"; sha256="06lcr5v6bcqqxskrwdm16b46zq4h67x8bwqya88jxs5bgi5w0hj3"; depends=[magrittr rlang]; }; forams = derive2 { name="forams"; version="2.0-5"; sha256="1fh3m9896ksv1h7b027yb955bzyv70yafhqvn5crkzalzk3jpb0s"; depends=[vegan]; }; - forcats = derive2 { name="forcats"; version="0.4.0"; sha256="1cnjh23z59fhbjmy7y95425hcq3m5wrwqvahsxwi7zm6d9bwp0vw"; depends=[ellipsis magrittr rlang tibble]; }; + forcats = derive2 { name="forcats"; version="0.5.0"; sha256="1i4hblsjgwkrcwgvgsb5yj33pw1hwdj3lr9dvxymkv1kjdw0x5lg"; depends=[ellipsis magrittr rlang tibble]; }; foreSIGHT = derive2 { name="foreSIGHT"; version="0.9.81"; sha256="1p3w5cs52ph79p2l78apvibr82w7sfbwf8436jfbb4gcahjhmrnk"; depends=[cowplot directlabels doParallel GA ggplot2 moments zoo]; }; - foreach = derive2 { name="foreach"; version="1.4.7"; sha256="0q7iyniw5iri4hl57bhil3r69s5wnaijzn0q0x4h3z42245jqqwm"; depends=[codetools iterators]; }; + foreach = derive2 { name="foreach"; version="1.5.0"; sha256="0584nv49x8d8m1cak5drb54sxs3y594gd521kjsdwk4c849sgy8s"; depends=[codetools iterators]; }; forecTheta = derive2 { name="forecTheta"; version="2.2"; sha256="1a7ip3czm8k82kb8dx95m8q47kjhifdj51gzavd1zj9ni3vwbhfn"; depends=[forecast tseries]; }; - forecast = derive2 { name="forecast"; version="8.10"; sha256="0jccr2wg7sii38lyqrs58fkxf2az7nw6v0jya27hpbz9bg8ib3kr"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca zoo]; }; - forecastHybrid = derive2 { name="forecastHybrid"; version="4.2.17"; sha256="1k3jwxqwkprcf2qr5x1b8hzzdvbyzdiablpvqnr0482x4vza8lmc"; depends=[doParallel foreach forecast ggplot2 purrr thief zoo]; }; - forecastML = derive2 { name="forecastML"; version="0.7.0"; sha256="00zxwdv6nsm8fzizv1gqm682kpr7cnp0j49ihziayp7i9il4wa6k"; depends=[data_table dplyr dtplyr future_apply ggplot2 lubridate magrittr purrr rlang tidyr]; }; + forecast = derive2 { name="forecast"; version="8.12"; sha256="1ycj5z4wd5a16nlcjy07dqm8jkih240xa02cn4wvysnnhkapyq7b"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca zoo]; }; + forecastHybrid = derive2 { name="forecastHybrid"; version="5.0.18"; sha256="0sgz50dl2939jl3azkxpv8kd00jcbkcgd5s6cng3kivrbrfslahp"; depends=[doParallel foreach forecast ggplot2 purrr thief zoo]; }; + forecastML = derive2 { name="forecastML"; version="0.8.0"; sha256="18a05lp4v4gpplldwx3kwkblnhkplgjiis0jq529sjxk53plyfi1"; depends=[data_table dplyr dtplyr future_apply ggplot2 lubridate magrittr purrr rlang tibble tidyr]; }; forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.3-0"; sha256="0p47x7ic2ib7znqbp8br4b2ci75f5w8x413z9g4n30m002p7irp1"; depends=[Rcpp]; }; - foreign = derive2 { name="foreign"; version="0.8-75"; sha256="0g4mi101srjbl17ydb2hl3854m3xj0llj6861lfr30sp08nkqavl"; depends=[]; }; + foreign = derive2 { name="foreign"; version="0.8-78"; sha256="01anirfbfa3ip5pyqv72cg4x7p0jsppmbvxrllw7bm28fl1hgiyq"; depends=[]; }; forensic = derive2 { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[combinat genetics]; }; forensim = derive2 { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; }; - forestChange = derive2 { name="forestChange"; version="0.6"; sha256="13zzng022m1jhca0d2w868kqp9h0wfpjmh0xnlb8jl1l4vfc68r9"; depends=[curl raster rgdal rvest SDMTools xml2]; }; + forestChange = derive2 { name="forestChange"; version="1.0"; sha256="1d9qza1f16sz8pyafn3q7cyg9hw0ix4nqcgb9ipcnvmkyrc00f1a"; depends=[curl dplyr gdalUtils ggplot2 landscapemetrics raster rgdal rvest sp tibble xml2]; }; forestControl = derive2 { name="forestControl"; version="0.2.1"; sha256="1m75s98bs8n3qad8gp6a333dh3mbi0rbbic9iwnsqyklzkhmx1nr"; depends=[dplyr magrittr purrr Rcpp tibble]; }; - forestError = derive2 { name="forestError"; version="0.1.0"; sha256="1pmrhzcqywm0qj6csiywfavf5vc6qg66j5qgfhd6yk7h9nvd5gnm"; depends=[doParallel foreach Rcpp]; }; - forestFloor = derive2 { name="forestFloor"; version="1.11.1"; sha256="1sslxq44qmmmdhr7800bz8lj9w2l7f7x1vly3w2z7j1qdijc7nw7"; depends=[kknn randomForest Rcpp rgl]; }; + forestError = derive2 { name="forestError"; version="0.2.0"; sha256="093qf50b4isiba4dcv06c1h0fy4db06605fiazwqd2cyd2gar46p"; depends=[data_table purrr]; }; forestHES = derive2 { name="forestHES"; version="1.0-1"; sha256="05l04ly3l8xkdz3rnnrfa4y0wfmh1am2ixbz1vfarnqkc0zppwpj"; depends=[]; }; forestRK = derive2 { name="forestRK"; version="0.0-5"; sha256="0zm0q7bckmjl1j3yh5pw4r6rq64rfmzjvmvqniza5691jagjz60m"; depends=[ggplot2 igraph knitr mlbench partykit pkgKitten rapportools]; }; forestSAS = derive2 { name="forestSAS"; version="1.0.1"; sha256="1jva2nivvcrczvqfhxa6vv1hsazp5m7djgfp7mfp1kpr136lyf2d"; depends=[spatstat]; }; forestinventory = derive2 { name="forestinventory"; version="0.3.1"; sha256="0brbg0q8j9ymvm527db7063kgs6i6flja7mxqk7yvaf3dh8wsi46"; depends=[ggplot2 plyr tidyr]; }; - forestmangr = derive2 { name="forestmangr"; version="0.9.1"; sha256="1b0yijc1yzgwkypyxb6v03sw32r3zz9rfjw63xiwzspq7hkbpinx"; depends=[broom car dplyr FinCal formattable ggdendro ggplot2 ggpmisc ggthemes gridExtra magrittr minpack_lm plyr purrr rlang scales systemfit tibble tidyr]; }; + forestmangr = derive2 { name="forestmangr"; version="0.9.2"; sha256="0f65yb4kixbvr8jp6063rgd8hxd5pycsx1dx9477222rmhp6f723"; depends=[broom car dplyr FinCal forcats formattable ggdendro ggplot2 ggpmisc ggthemes gridExtra magrittr minpack_lm plyr purrr rlang scales systemfit tibble tidyr tidyselect]; }; forestmodel = derive2 { name="forestmodel"; version="0.5.0"; sha256="09gwgsh42gkmhs8ijq5xfbbkb1hk6sjb0q32mw2ymc6x9ycr1a9j"; depends=[broom dplyr ggplot2 lazyeval tibble]; }; forestplot = derive2 { name="forestplot"; version="1.9"; sha256="1vcma7dvlvyhz6n25pj19h70i8xmz6vibkf945qkmj5hhrb7zxia"; depends=[checkmate magrittr]; }; + forestr = derive2 { name="forestr"; version="2.0.2"; sha256="1kz8f3x2dmsprj2r23gz61fpwg7n14nbjxr16x4cpixvnk427p94"; depends=[dplyr ggplot2 moments plyr tibble tidyr viridis]; }; foretell = derive2 { name="foretell"; version="0.2.0"; sha256="18vi438n480gizfhnciw67gngvbjnmky19186b1wy75av7fgc1gp"; depends=[nloptr]; }; forge = derive2 { name="forge"; version="0.2.0"; sha256="0pjfzsc35agkh0zfw2czwajkbsyn6liys5irl5bhz5r1vim3jmwa"; depends=[magrittr rlang]; }; formatR = derive2 { name="formatR"; version="1.7"; sha256="1nsxbrx31k3y6yql30qkrvdfyznlia2qfvwv95mfiy7m7wdn4rm3"; depends=[]; }; formattable = derive2 { name="formattable"; version="0.2.0.1"; sha256="1s7jjgm0j24vdwm39933ygh6xnxcfvzy4kl2mmfgas4czfcmd4rf"; depends=[htmltools htmlwidgets knitr rmarkdown]; }; formula_tools = derive2 { name="formula.tools"; version="1.7.1"; sha256="15d3ikfmsh9zszfgfkrxb3jkipl41inm7n6bhs73kwlnklnygq2g"; depends=[operator_tools]; }; formulaic = derive2 { name="formulaic"; version="0.0.6"; sha256="020sbchj445kwwfj17ixmhsgl38qpwb723r6r8pbc6b3q0zw4b3d"; depends=[data_table DT]; }; + formulops = derive2 { name="formulops"; version="0.5.0"; sha256="1mkpv5xjykrhgknq0gh4yg2a3j4xb8q2d6dh0wv8zd9h59hvrzda"; depends=[]; }; + forrel = derive2 { name="forrel"; version="1.0.1"; sha256="0apx62cwg3xb64gmflgq500h8vclqbwazd9aj0s6c7ix0j0phs73"; depends=[glue maxLik pedmut pedprobr pedtools]; }; fortunes = derive2 { name="fortunes"; version="1.5-4"; sha256="109ly9kpfn6hy294ava8795wy5z9l1bnl98hhhv8kn9naf4camdg"; depends=[]; }; forward = derive2 { name="forward"; version="1.0.5"; sha256="0cc0s534s32b9ark2zazwqhgy0zsxb2p63r6503v82784rpqv2yv"; depends=[MASS]; }; forwards = derive2 { name="forwards"; version="0.1.3"; sha256="07374a1ak5h8q3diqyvsw3q1grqi3679w9sshf1jkhlrj7wn0dmv"; depends=[]; }; - fossil = derive2 { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[maps shapefiles sp]; }; + fossil = derive2 { name="fossil"; version="0.4.0"; sha256="1hbls9m8yapnfzpv9s850ixakmnan8min1ynk7dqkbpb2px85h1p"; depends=[maps shapefiles sp]; }; foto = derive2 { name="foto"; version="1.0.0"; sha256="10mfxgg5f1r85cwr0jjnsa4csp1afcrjvyjvp31060nm638clcgh"; depends=[raster]; }; fourPNO = derive2 { name="fourPNO"; version="1.1.0"; sha256="0a0z2403kdh3fjb0ypjjk3m6fg77bg6m7hwb5jhlymcy2rwkay7w"; depends=[Rcpp RcppArmadillo]; }; fourierin = derive2 { name="fourierin"; version="0.2.4"; sha256="140721p4h5mjr7r25ckv8wfhbj88xw6v47b613r5bpalg8gw650l"; depends=[Rcpp RcppArmadillo]; }; fpCompare = derive2 { name="fpCompare"; version="0.2.3"; sha256="1pyv52rvbqd5v6ns86pc119q019ps070bd819x7a98s4hmbf76zq"; depends=[]; }; fpa = derive2 { name="fpa"; version="1.0"; sha256="0kgpl9qq0l10h0vdd2f8vnir0kdylh1jvvv5z4d9ygj1pl9qywhk"; depends=[fields reshape]; }; - fpc = derive2 { name="fpc"; version="2.2-4"; sha256="1gsnl5sbdg86b2wdrsy6wq83xj6mrziiq7rxa8cqksgljc7gp6yf"; depends=[class cluster diptest flexmix kernlab MASS mclust prabclus robustbase]; }; + fpc = derive2 { name="fpc"; version="2.2-5"; sha256="10504hzivbn89ip0cd5bcxd36ivbgin1lw1xhyh3xfckcm25v1a5"; depends=[class cluster diptest flexmix kernlab MASS mclust prabclus robustbase]; }; fpca = derive2 { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; }; fpeek = derive2 { name="fpeek"; version="0.1.1"; sha256="0x7q5rl02ih0zmjfzvsc1vmn7s7yzdkf2gbmzc3mh7qadwpnf89p"; depends=[Rcpp]; }; fpest = derive2 { name="fpest"; version="0.1.1"; sha256="013r8295spm02j558aqvnrnbkg2g73gl5vi4lqzngbw8yr8qlkri"; depends=[]; }; - fplot = derive2 { name="fplot"; version="0.2.0"; sha256="0sq662qblkq6yngi5d98byjmf2xyfq9rlrg8pl1gr3pn000wi8b3"; depends=[data_table Formula Rcpp]; }; + fplot = derive2 { name="fplot"; version="0.2.1"; sha256="0ryb1pfx1qp4vlzpy4a3c0wqk6k9ds44xy12n056jyqiggc7kd12"; depends=[data_table Formula Rcpp]; }; + fplyr = derive2 { name="fplyr"; version="1.1.0"; sha256="0s76hzmqal9fmpwgg996l86vz156lwkhfb2ag996m4h6m37zgqx7"; depends=[data_table iotools]; }; fpmoutliers = derive2 { name="fpmoutliers"; version="0.1.0"; sha256="108bp3smk9jnckd5237xly4ywmal03rq1kidq5z61l6zrhc3yfh9"; depends=[arules doParallel foreach Matrix pmml pryr R_utils XML]; }; fpop = derive2 { name="fpop"; version="2019.08.26"; sha256="1gz5db9hlkvzkp5y7zzn9h57qz7ilpdyxyf05vy9kxbj36kgc19n"; depends=[]; }; fpow = derive2 { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; }; fpp = derive2 { name="fpp"; version="0.5"; sha256="1jqnx6bgpvnbbj2fa2b6m6aj8jd5cb9kz877r8kp7a5qj62xv1ww"; depends=[expsmooth fma forecast lmtest tseries]; }; fpp2 = derive2 { name="fpp2"; version="2.3"; sha256="1krrvwg25qjfpfjdwd3n0d87ihl4zf7y1bnh6gbi92sdja3ljq48"; depends=[expsmooth fma forecast ggplot2]; }; - fpp3 = derive2 { name="fpp3"; version="0.1"; sha256="17j5y1y46dn21049rfiwr7j0f5q2kc6jvxdpw252l063dqdb9pd9"; depends=[cli crayon dplyr fable fabletools feasts ggplot2 lubridate magrittr purrr rstudioapi tibble tidyr tsibble tsibbledata]; }; - fptdApprox = derive2 { name="fptdApprox"; version="2.1"; sha256="00vxwcwca7zfm4fr0x9898snr6j0474ci1bahjmpj2jxiclwnhzs"; depends=[]; }; + fpp3 = derive2 { name="fpp3"; version="0.2"; sha256="0346g5cj876kd34hvkjl3yn25i3k3ypbnp5qnqk7nahz8akdk0g2"; depends=[cli crayon dplyr fable fabletools feasts ggplot2 lubridate magrittr purrr rstudioapi tibble tidyr tsibble tsibbledata]; }; + fptdApprox = derive2 { name="fptdApprox"; version="2.2"; sha256="10f9n6cx5n6djblj97a2zw4khaj3phchmq4l8gk2fy535jjqaqlr"; depends=[]; }; fracdiff = derive2 { name="fracdiff"; version="1.5-1"; sha256="1dhfjlhr9sb38qgpsx0sm73l9lgc13d0fk32l7fmjfnalhr3n45q"; depends=[]; }; fracprolif = derive2 { name="fracprolif"; version="1.0.7"; sha256="124p5x59smqf8ba0xwhlq69w77zga2bv9plzwkadf700lzvaj2wx"; depends=[emg numDeriv]; }; fractal = derive2 { name="fractal"; version="2.0-4"; sha256="18lr9z0gslvfc3z8vyj3krqj3bfhg60zv1fzinrwwkc4cpk1w7mp"; depends=[ifultools MASS sapa scatterplot3d splus2R wmtsa]; }; fractaldim = derive2 { name="fractaldim"; version="0.8-4"; sha256="0fln4qn0d79agnnlzi8b9g9qn90zynq1cg9v5isiyi71345v45nr"; depends=[abind]; }; - fractalrock = derive2 { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8khgq269669ri16qxhar9646w40cw7wzh79r9gpf00"; depends=[futile_any futile_logger quantmod timeDate]; }; fractional = derive2 { name="fractional"; version="0.1.3"; sha256="1jz83y53s0xdphh1z3v3z7xhcmhx7rp0iiazw2vdsx2747r3rirn"; depends=[Rcpp]; }; + fragility = derive2 { name="fragility"; version="1.0"; sha256="13pb64i0mxcdvlpn71qs0vkv7rw1mxiy2cfnyw2ncnallw32ph5i"; depends=[metafor netmeta plotrix]; }; fragilityindex = derive2 { name="fragilityindex"; version="0.1.0"; sha256="06f7w0ff8mmydgylz5a0z29fc78spvmay3sjq0rz9k44w4bb9z3q"; depends=[pbapply stringr survival]; }; frailtyEM = derive2 { name="frailtyEM"; version="1.0.1"; sha256="0ajqmn8353va8k3idsl90xsrhpdqarfmvg84d4kwayxlqy6dmbb0"; depends=[expint ggplot2 magrittr Matrix msm numDeriv Rcpp survival tibble]; }; frailtyHL = derive2 { name="frailtyHL"; version="2.3"; sha256="115iv1d2c9mvviick8b24bn6kdbsvnf21nvfjm9a8dk0x07hrv5g"; depends=[cmprsk Matrix survival]; }; frailtySurv = derive2 { name="frailtySurv"; version="1.3.6"; sha256="0k41a5x7qzrajk2l59q5b8kjj084vids4ailr8r7r2lnf6r9xrav"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; }; - frailtypack = derive2 { name="frailtypack"; version="3.1.0"; sha256="1x6i3kc8xl2dfmbljki94ivkh2hlkisq5hmxzk48i4288hrl2jcn"; depends=[boot doBy jsonlite MASS nlme rhandsontable shiny shinyBS shinydashboard shinyjs shinythemes statmod survC1 survival]; }; + frailtypack = derive2 { name="frailtypack"; version="3.2.0"; sha256="11159b60j6pk5vvvc8vlb606gjwbfc7d7aqb896aba2rciwddk6n"; depends=[boot doBy jsonlite MASS nlme rhandsontable shiny shinyBS shinydashboard shinyjs shinythemes statmod survC1 survival]; }; frair = derive2 { name="frair"; version="0.5.100"; sha256="1j557dqvc5xiz7xbl4h7vp55pc3hly8ci01qy36p02vlxhzf4hj3"; depends=[bbmle boot lamW]; }; frambgrowth = derive2 { name="frambgrowth"; version="0.1.0"; sha256="1xmy1zxp7aa2n8frlxhn1bl41zda1jldvvxb3q41yam3pslc8m1q"; depends=[]; }; franc = derive2 { name="franc"; version="1.1.2"; sha256="1bhszr0g0blx0jmdwxkicn1zz1fhfgyhzsncgy3181i987429gdg"; depends=[jsonlite]; }; frapplot = derive2 { name="frapplot"; version="0.1.3"; sha256="12924szk2p0582nv97gi8pxrbv41zqpjryc6jqgg4llhp7ydz7xf"; depends=[]; }; frbs = derive2 { name="frbs"; version="3.2-0"; sha256="0biv6j31qi0f4i063ygmbp6v6ws1nxijn5kyhg5sz1rnbr0msl28"; depends=[]; }; - fredr = derive2 { name="fredr"; version="1.0.0"; sha256="1hv51m0ihdpb73rp2gwj2q2xpjzlqpf9p3xzqdmy9nhwpfbj14nh"; depends=[httr jsonlite rlang tibble]; }; freealg = derive2 { name="freealg"; version="1.0-0"; sha256="0a3s89379lxr0dw068wfwzlqjq70zbaxil1vwwa4bf2i7s46mcgl"; depends=[Rcpp]; }; freegroup = derive2 { name="freegroup"; version="1.1-0"; sha256="0ssshs2d6l2ip1xx9x581w0cdnd2459a1mh360ybwajkjgak2ci6"; depends=[magic magrittr plyr]; }; - freeknotsplines = derive2 { name="freeknotsplines"; version="1.0.1"; sha256="1yl53rnngrpj5mv1fgd0rgiqaw431g4ckxl1bq0l712647njx02a"; depends=[]; }; - freestats = derive2 { name="freestats"; version="0.0.3"; sha256="0b18n8idap089gkmjknzzb94dvs2drpdqs0mrw7dqnacxgbbqwfj"; depends=[MASS mvtnorm]; }; - freesurfer = derive2 { name="freesurfer"; version="1.6.5"; sha256="0g5rpskwgxx37b60vxn89kf2d6b2y66v508xyrsx3h47q973kjia"; depends=[neurobase R_utils reshape2]; }; - freesurferformats = derive2 { name="freesurferformats"; version="0.1.7"; sha256="0451m10kcn8zngsv8nfz9na7pw7apf15zxdp9ny63plfs063340z"; depends=[pkgfilecache]; }; + freesurfer = derive2 { name="freesurfer"; version="1.6.7"; sha256="1wk0xjx0a99zm7gdn7i5z92wmqnlzng6n6g8w9whxvmy0rq6i19j"; depends=[neurobase R_utils reshape2]; }; + freesurferformats = derive2 { name="freesurferformats"; version="0.1.9"; sha256="02qqp81b93dv84g3gbsl1705j5hj6ndv45npbbh35v5rsgswz9d9"; depends=[pkgfilecache]; }; freetypeharfbuzz = derive2 { name="freetypeharfbuzz"; version="0.2.5"; sha256="11agmqdp6sy32jk2840cj8wmgywq0yjar18zsnsn56qfvn4b1k1c"; depends=[fontquiver]; }; freqdist = derive2 { name="freqdist"; version="0.1"; sha256="1pb45jabv9s3qa7v1isd5wm9b0g9p04q5h18spcaax8397s0d2fv"; depends=[]; }; freqdom = derive2 { name="freqdom"; version="2.0.1"; sha256="0ig0ygnlcb5ndjjm5x8jpp37gvgwli9xv6zsvbbgfh72q418qswp"; depends=[matrixcalc mvtnorm]; }; freqdom_fda = derive2 { name="freqdom.fda"; version="0.9.1"; sha256="15wq9s3v441dybc8kglpbv9hdvsr9rjjq4qp4d2ipxglfp0iqj9p"; depends=[fda freqdom mvtnorm]; }; freqparcoord = derive2 { name="freqparcoord"; version="1.0.1"; sha256="011p8xh0i0x0w5rv5qz5a7fxwdhxd8l2bqi9bxv5almxd0y7ajqx"; depends=[FNN GGally ggplot2 mvtnorm]; }; - frequency = derive2 { name="frequency"; version="0.3.1"; sha256="0m3vgcwldl7zv0nwdwfz80qanibmfp8j5iv79kydhrmzzr04rbf5"; depends=[DT ggplot2 gtools knitr rmarkdown]; }; - frequencyConnectedness = derive2 { name="frequencyConnectedness"; version="0.2.1"; sha256="006cb7x65if7md5w6w90nacdmg39pv7dc8zxvchc52kmfzlps0ds"; depends=[knitr pbapply urca vars]; }; + frequency = derive2 { name="frequency"; version="0.4.0"; sha256="1m3hrbkspnmcl956f7m4fpfd980qdxmyagsm5kd79dzh3qka2xly"; depends=[DT ggplot2 gtools knitr rmarkdown]; }; + frequencyConnectedness = derive2 { name="frequencyConnectedness"; version="0.2.2"; sha256="1mn20isy146ya4i33xxszmhvdwqkkg0cd18002mq8bvnkb65fxd2"; depends=[knitr pbapply urca vars]; }; frequentdirections = derive2 { name="frequentdirections"; version="0.1.0"; sha256="0rmifh221c8z3cqyqg0bfxnih9f64hvv98jz44i6grnlablfwwgw"; depends=[ggplot2]; }; fresh = derive2 { name="fresh"; version="0.1.0"; sha256="101ycxwk1z59zb2p6hfg4a8l565gfqbzmhw60nz22fql4gyhl8q9"; depends=[htmltools rstudioapi sass shiny]; }; frm = derive2 { name="frm"; version="1.2.2"; sha256="1dl0vca9r2dams99sc13pfpi0b3yb02x59f4c1jz07zz005c8l23"; depends=[]; }; @@ -7905,28 +8005,29 @@ in with self; { frmpd = derive2 { name="frmpd"; version="1.1.0"; sha256="0irgqdr0vr8k408lsxcrjkjbjvqvmy5mnjw9c1ghs86isrp5mciz"; depends=[]; }; frmqa = derive2 { name="frmqa"; version="0.1-5"; sha256="0vd5jnjzhkc0vd4cqn4cs6a3limd4fxwyb5i7845rwmkzk1944aj"; depends=[partitions Rmpfr]; }; fromo = derive2 { name="fromo"; version="0.2.1"; sha256="0srq13j0xqbyrmm8n93b5qwc25nz921z45yf467d7gfhxsbgy3hm"; depends=[Rcpp]; }; - frontier = derive2 { name="frontier"; version="1.1-6"; sha256="18qxzzhmxbwnflb90pls5d4kmijg0rhpsmnnysvmmppm8h6nf7nf"; depends=[Formula lmtest micEcon miscTools moments plm]; }; + frontier = derive2 { name="frontier"; version="1.1-8"; sha256="1qhasynm23yihmhb4d7w72msq2z1xf4xnzrkah3z8jv11yxhg1i2"; depends=[Formula lmtest micEcon miscTools moments plm]; }; frontiles = derive2 { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; }; frost = derive2 { name="frost"; version="0.0.4"; sha256="03snjlq4b9j84v0yimc3xzgjvryzzi76b9n53k0s2lvv1yzrri7x"; depends=[]; }; - frostr = derive2 { name="frostr"; version="0.1.0"; sha256="02ygg5dxpnv72gpwwsarhkl5hk6hldxjqpw875p7hb1ny7khgmfg"; depends=[httr jsonlite tibble tidyr]; }; frt = derive2 { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; }; - fs = derive2 { name="fs"; version="1.3.1"; sha256="1g26rgx13dzigp2vrlld6h28q33lwbax97zvwdrq2pc3iz54v4yn"; depends=[Rcpp]; }; - fsbrain = derive2 { name="fsbrain"; version="0.0.3"; sha256="1s7i9rpazp5s3vnm9y6ajpy06wbd7gjdzr9mbndjnsb9w985957a"; depends=[dplyr fields freesurferformats pkgfilecache reshape rgl squash]; }; + fs = derive2 { name="fs"; version="1.4.1"; sha256="0kksig9pk8aid9l6r250na8z8j9919jvs20lj0s6m9bcybgh74df"; depends=[]; }; + fsMTS = derive2 { name="fsMTS"; version="0.1.5"; sha256="1vxj9wkzpbk44hby4fdyhj72748c65by612kpphs6vmgzmw4y471"; depends=[freqdom glasso lars mpmi randomForestSRC]; }; + fsbrain = derive2 { name="fsbrain"; version="0.1.0"; sha256="0gwn8cnafcvkmzw7lf5q63xyfkhbj8wy1szcwmazkpkmg0zlwwcv"; depends=[data_table dplyr fields freesurferformats pkgfilecache reshape rgl squash]; }; fscaret = derive2 { name="fscaret"; version="0.9.4.4"; sha256="18fhyfl3f8syyc3g937qx87dmwbv7dray6b97p1s6lnssiv61gsw"; depends=[caret gsubfn hmeasure]; }; fsdaR = derive2 { name="fsdaR"; version="0.4-9"; sha256="1iaqqdwhh29fhq4r64adfrjmsyzq4v60bz9111vkazj4kr45wxxv"; depends=[ggplot2 rJava rrcov]; }; fsia = derive2 { name="fsia"; version="1.1.1"; sha256="0id7cnswrqylgpwjil1zfn89ryrdpl20fim8x1srl8s1hm5bg35r"; depends=[]; }; fslr = derive2 { name="fslr"; version="2.24.1"; sha256="1psjqvjv8krlkj7dcfwygz563a4cpn7h21z330hxh5q10rwhabi8"; depends=[neurobase oro_nifti R_utils]; }; fso = derive2 { name="fso"; version="2.1-1"; sha256="0hn2ypm0nwfbmnh9il78pi30x7gfmayfangqyh0d63ngyz40bvma"; depends=[labdsv]; }; fssemR = derive2 { name="fssemR"; version="0.1.6"; sha256="1l80anvlf21kvwb95w5mn0i2q773z0vbznx1lqvgsawprhcdiv20"; depends=[glmnet igraph MASS Matrix mvtnorm qtl Rcpp RcppEigen stringr]; }; - fst = derive2 { name="fst"; version="0.9.0"; sha256="0ya5lh8p0qy5pcr6wxsrn43wj1r9gb9qycyn8gvl26ic3hxwk2rf"; depends=[Rcpp]; }; + fst = derive2 { name="fst"; version="0.9.2"; sha256="11r35v8irv6a4gnbw06wrlipsrqq2m86dmcfijp5k07n59hgipi3"; depends=[Rcpp]; }; fsthet = derive2 { name="fsthet"; version="1.0.1"; sha256="0z6az1jcvdahgn97r6cpj1s6fn0lvr7j12gcw2r7wbpajrvyl5j6"; depends=[]; }; ftDK = derive2 { name="ftDK"; version="1.0"; sha256="1xs2rr2afjza97kpym5zkas3k78pilxjlh7lp1gc66banldr71g2"; depends=[dplyr httr pbapply purrr tibble]; }; + ftExtra = derive2 { name="ftExtra"; version="0.0.1"; sha256="0zgz4sjxx6ls27afb9djmxvwq46pp5jwxxbb87wnjc9fn5vvnnxy"; depends=[dplyr flextable jsonlite magrittr purrr rlang rmarkdown stringr tidyr tidyselect]; }; ftnonpar = derive2 { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; }; fts = derive2 { name="fts"; version="0.9.9.2"; sha256="08pwhi19db173d4nsk5rl8xa8qmaddj4bn3cjxb8ql4kny59i57q"; depends=[BH zoo]; }; - ftsa = derive2 { name="ftsa"; version="5.5"; sha256="1c7b3b6zrm45y2110j0dqlgilfiiyx4wqhgdiq82q6kagng32cl1"; depends=[colorspace fda forecast MASS pcaPP pdfCluster rainbow sde]; }; + ftsa = derive2 { name="ftsa"; version="5.6"; sha256="1zg15jf65hi8gg5s6xmk70x6w9k2ay1b5nf7xnvllis4hi9n8s3j"; depends=[colorspace fda forecast MASS pcaPP pdfCluster rainbow sde]; }; ftsspec = derive2 { name="ftsspec"; version="1.0.0"; sha256="12f9yws1r26i240ijq0xqprl3pgbw50wv68jsm75ycplbs2jsyhs"; depends=[sna]; }; fuel = derive2 { name="fuel"; version="1.0.2"; sha256="0ziw370ch8g2hnlimxfgski4n28b83jnwrhlh7ibszk0lz593rkr"; depends=[]; }; - fueleconomy = derive2 { name="fueleconomy"; version="0.1"; sha256="1svy5naqfwdvmz98l80j38v06563vknajisnk596yq5rwapl71vj"; depends=[]; }; + fueleconomy = derive2 { name="fueleconomy"; version="1.0.0"; sha256="16a8wyliiidi6rw14ksimygfkl4a7yhxvss7l9bcvr1wfiplrn65"; depends=[]; }; fugeR = derive2 { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[Rcpp snowfall]; }; fugue = derive2 { name="fugue"; version="0.1.7"; sha256="1myvi9cizxvahb6wn2k26v3x958xsrm2p414ar05injmfjdfnsmi"; depends=[]; }; fullfact = derive2 { name="fullfact"; version="1.3"; sha256="1dy5ppa22i9axqcwx2184qv2vjcbml0yh5b89zx9rg2zsnv4ygym"; depends=[afex lme4]; }; @@ -7934,45 +8035,45 @@ in with self; { fun = derive2 { name="fun"; version="0.2"; sha256="0944m10nym4rsb6rhdwqn04c7l3bz43jcw3q8hv4vljdf5kyg9ar"; depends=[]; }; funData = derive2 { name="funData"; version="1.3-4"; sha256="14s86s8ap52qr50cwmiqhkfnnb5ckf9hnmzslfmz44k3ydp9d7hp"; depends=[abind fields foreach]; }; funFEM = derive2 { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[elasticnet fda MASS]; }; + funGp = derive2 { name="funGp"; version="0.1.0"; sha256="03khkwdq2kc7wxr7jr50kms4w63w6iz90431d960dg4s0gff29h8"; depends=[doFuture foreach future knitr microbenchmark progressr qdapRegex scales]; }; funHDDC = derive2 { name="funHDDC"; version="2.3.0"; sha256="1dym1bzywng5yjfzpppxx043pwcbvrxxq0bn1d6xqqkqcpzn2zhp"; depends=[fda MASS]; }; funLBM = derive2 { name="funLBM"; version="1.0"; sha256="0krx5v1lakrrxk0j249k7sr7c6r40yg1l8l10laf4444j2qn8rjp"; depends=[fda funFEM]; }; funModeling = derive2 { name="funModeling"; version="1.9.3"; sha256="0dqpb5igdpdnbwr6y8wr11hcn84clshnx0q913512jvcrx0h0pd9"; depends=[cli dplyr entropy ggplot2 gridExtra Hmisc lazyeval moments pander RColorBrewer reshape2 ROCR scales stringr]; }; funbarRF = derive2 { name="funbarRF"; version="1.0.2"; sha256="14xfhwp4vffl215fqdxdxpmjblyw75ylxqjzja794adywm06sz19"; depends=[BioSeqClass Biostrings randomForest]; }; - funchir = derive2 { name="funchir"; version="0.1.4"; sha256="1mbsy65628q117c2k01wvibpjd3ibigy4yc1c8m0rf9jwsc67qjb"; depends=[data_table]; }; + funchir = derive2 { name="funchir"; version="0.2.0"; sha256="1rj5khv1xcaaip5xh8kcsp2jgmbmnc9q5kwr46l4mxvxyndndi1k"; depends=[data_table]; }; functional = derive2 { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; }; functools = derive2 { name="functools"; version="0.2.0"; sha256="0g62jdia3n09vq8mx1m2r4nl3jfcadzpym0wkldzzzjcfs90vl6b"; depends=[]; }; - funcy = derive2 { name="funcy"; version="1.0.1"; sha256="08r9nyqq83vzaddxcqwf4zilkz935p40vssfn3afs1bkkda5xyya"; depends=[calibrate car cluster fda fields flexclust kernlab MASS Matrix plyr sm wavethresh]; }; + funest = derive2 { name="funest"; version="0.0.1.3"; sha256="1pi556klfnbmrsx5c0f3v4hdn5m4dxxm71ijivanpwfqnfls8xh3"; depends=[funData MFPCA pec prodlim purrr ranger Rdpack survival tdROC]; }; fungible = derive2 { name="fungible"; version="1.95.2"; sha256="031z94a5ayc8sd7vgwj0g1wxzq28mibnr9a0wskgfgvhm80f8pmd"; depends=[clue GPArotation lattice MASS mvtnorm nleqslv Rcsdp RSpectra]; }; funique = derive2 { name="funique"; version="0.0.1"; sha256="0p9k4nxjns1xid9vmslkaap0hm6yq6pbyvylgygd808if4q1z8k6"; depends=[]; }; funnelR = derive2 { name="funnelR"; version="0.1.0"; sha256="143lb048krgh8rkkz6sm8h464kdy62w29fvvyar795vqi10bb5fy"; depends=[ggplot2]; }; funneljoin = derive2 { name="funneljoin"; version="0.1.0"; sha256="17g1mvq9z5m29r0v2r2nn8980j515jamnpwvvnzj83vk84bz94rq"; depends=[broom dplyr glue magrittr purrr rlang tibble tidyr]; }; - funprog = derive2 { name="funprog"; version="0.1.0"; sha256="1npyijpsbb9n3z8pyvf2pbnf67jlcqw4wl2jm860i3z13j1cnhmn"; depends=[]; }; + funprog = derive2 { name="funprog"; version="0.2.0"; sha256="1gs0mahvzgnv5pfvz32acq0jk3rnssg6bxqzlqpyqg0r3g4m80mf"; depends=[]; }; funr = derive2 { name="funr"; version="0.3.2"; sha256="11mjd1ba9kwawh7k5py54mkq4g1df79d7qivan8fj11qfwfzm679"; depends=[]; }; - funrar = derive2 { name="funrar"; version="1.3.1"; sha256="1i206awpkc5vvi3aii5kszf57wipqqkqply2xfn0b969fnd0ln6x"; depends=[cluster dplyr]; }; + funrar = derive2 { name="funrar"; version="1.4.1"; sha256="0xqccch59f8cz4a7ybjdr6k625bir5nsjrp4iyfirrb877d17m5z"; depends=[cluster]; }; funreg = derive2 { name="funreg"; version="1.2"; sha256="199zvqali0sb0z4yp20rm5da0kd7z3rgv47g1cb1apsbcw0cq51n"; depends=[MASS mgcv mvtnorm]; }; funtimes = derive2 { name="funtimes"; version="6.1"; sha256="1qr0z0nn3dv2yxq4sacsm0xs4pnda31zc10rz427rdyjrps85838"; depends=[dbscan Jmisc Kendall Rdpack]; }; - furniture = derive2 { name="furniture"; version="1.9.5"; sha256="1vls4x1nppi1ivra7jyhh9cqixpjf6gixk6hcirqnbb4vr4zww2p"; depends=[crayon dplyr knitr magrittr rstudioapi tibble]; }; + furniture = derive2 { name="furniture"; version="1.9.7"; sha256="1czc1ayfpqf6h7n5fjzx1vwkzm9vg1dr62hl5k511b9kdc8lfsfh"; depends=[dplyr knitr magrittr]; }; furrr = derive2 { name="furrr"; version="0.1.0"; sha256="1ld9aa9hydna94hgm6p91zjbfv1dz1vsgchjlpknkg6irbvkfafx"; depends=[future globals purrr rlang]; }; fusedest = derive2 { name="fusedest"; version="1.3.1"; sha256="1nz5bkvn8y9f8h0ya6wblryg7bwj1vnz1vyqmd1hfr85bxfgl83c"; depends=[igraph Matrix Rcpp RcppEigen]; }; fuser = derive2 { name="fuser"; version="1.0.1"; sha256="17lsfpd9hdichj3wflac896zyjbq7a8w2gmlgj8nbgg80f646fgr"; depends=[glmnet irlba Matrix Rcpp RcppEigen RSpectra]; }; fusionclust = derive2 { name="fusionclust"; version="1.0.0"; sha256="1h03nlk4gnz4j5h2h5bxazkka2qq983h7nglm1ghzqvbqjk6sv37"; depends=[bbmle]; }; - futile_any = derive2 { name="futile.any"; version="1.3.2"; sha256="09z12dlj7cnkfwnmgsjknsghirv1cry83w4a9k4d0w5a1jnlr5jg"; depends=[lambda_r]; }; futile_logger = derive2 { name="futile.logger"; version="1.4.3"; sha256="1r3nayk0z9n1svbf8640vw90dal5q07nkn0gv4bnva3pbzb352sy"; depends=[futile_options lambda_r]; }; - futile_matrix = derive2 { name="futile.matrix"; version="1.2.7"; sha256="0nbzcy5l3nllppwmdib1s11s7b4m7mfvqb90n6b2hgmd48jsw8wg"; depends=[futile_logger lambda_r lambda_tools RMTstat]; }; futile_options = derive2 { name="futile.options"; version="1.0.1"; sha256="0w15agpi88y3qkv6fl72zy2pzyplzgvnj41a4ixhg64mw1sck73s"; depends=[]; }; futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; }; futility = derive2 { name="futility"; version="0.4"; sha256="0zjb87brz7pkx3nq3q30y69cmcxpqqsra447p60qh7005kgr9vx4"; depends=[]; }; - future = derive2 { name="future"; version="1.16.0"; sha256="1xaqh0b2knf5bp23mc0kriq0iqhqna31q3b7d960piqjhzrb03dm"; depends=[digest globals listenv]; }; + future = derive2 { name="future"; version="1.17.0"; sha256="0d4y7gwcgqx2z0y6h5bh4lrz0m7b0inii5cjcq0kk8za762bi8rg"; depends=[digest globals listenv]; }; future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.16.2"; sha256="08lh1sp0v1vagi34s218a1ygj63whkf3s9w0kyf25v64gsdavkzc"; depends=[BatchJobs future R_utils]; }; - future_apply = derive2 { name="future.apply"; version="1.4.0"; sha256="1kgq6dv96hdy35kysqkn606nj7s9dp4ibgpm6n46gqhc5n75lzkk"; depends=[future globals]; }; - future_batchtools = derive2 { name="future.batchtools"; version="0.8.1"; sha256="034sgd5pcv6d4jbi21ishwz5r1ym82g1pvyv3s0sl1jsy5g55v0w"; depends=[batchtools future]; }; + future_apply = derive2 { name="future.apply"; version="1.5.0"; sha256="095a681ngbwbp7v53ladwya7ar8fgwnlgr3r1yklf3vdxwd54xll"; depends=[future globals]; }; + future_batchtools = derive2 { name="future.batchtools"; version="0.9.0"; sha256="1srcc4vv9nm49nq8llxik9ys4f45lz2shwlc4l9wp0zmxinzi3sr"; depends=[batchtools future]; }; future_callr = derive2 { name="future.callr"; version="0.5.0"; sha256="0rjvjmffc4m9kr4p40q1gyv1zf49m8q0fb04kmdi7a8q2jfflpna"; depends=[callr future]; }; + future_tests = derive2 { name="future.tests"; version="0.2.1"; sha256="1f75y7s9yrsz8c3vbsvp55zllp6sbpjrxbxknm1rfhg4sc2ak33c"; depends=[cli crayon future prettyunits sessioninfo]; }; futureheatwaves = derive2 { name="futureheatwaves"; version="1.0.3"; sha256="122b2z86bzxfch67y6cpq8wj62mw0dgkzbmnpwi247kdx7w5mw1f"; depends=[data_table dplyr ggplot2 ggthemes leaflet Rcpp stringr tidyr]; }; fuzzr = derive2 { name="fuzzr"; version="0.2.2"; sha256="1cwq7a5j6lzrlz9dw3hsfap988rh1kkgf03yni7c33zl69xp5w77"; depends=[assertthat progress purrr]; }; fuzzyFDR = derive2 { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; }; fuzzyRankTests = derive2 { name="fuzzyRankTests"; version="0.3-10"; sha256="1xj5xsm2s4ylv3b8v80qny201iddjym07h8d50asas7xy1k7945z"; depends=[]; }; - fuzzySim = derive2 { name="fuzzySim"; version="2.0"; sha256="00rl5npz656hwpd1ah8bgh9baqpa9z2lgxc44amm5w3pb9pqjkbs"; depends=[]; }; - fuzzyforest = derive2 { name="fuzzyforest"; version="1.0.6"; sha256="1g8vmz0srddw879prk7br535rdrgngpiyz2m0zchwahfjkn7yqz5"; depends=[doParallel doRNG foreach ggplot2 mvtnorm randomForest]; }; + fuzzySim = derive2 { name="fuzzySim"; version="3.0"; sha256="18h0lxzqyp7fzjv7vnyfbwpaxjx15sw0h9l5yq846xzhkza79xxp"; depends=[]; }; + fuzzyforest = derive2 { name="fuzzyforest"; version="1.0.8"; sha256="0sb7qia01a5h6p12riq6vdq9likmqb6i949axsxszy5sf1zk50v5"; depends=[doParallel foreach ggplot2 mvtnorm randomForest]; }; fuzzyjoin = derive2 { name="fuzzyjoin"; version="0.1.5"; sha256="1lz7zxpqn206rgk956c4z9sfj3rg66pwcyci7d3r63cbgynq1gcs"; depends=[dplyr geosphere purrr stringdist stringr tibble tidyr]; }; fuzzyreg = derive2 { name="fuzzyreg"; version="0.5.1"; sha256="19ppb1m655z3n7h4wcd5bwjciw4ynjbi883ki50mr5di3zy64n4r"; depends=[limSolve quadprog]; }; fuzzywuzzyR = derive2 { name="fuzzywuzzyR"; version="1.0.3"; sha256="1kbli1m44317m95a0r34vza9p27vd9ala05jrbrdkadninwdynal"; depends=[R6 reticulate]; }; @@ -7988,54 +8089,54 @@ in with self; { gDefrag = derive2 { name="gDefrag"; version="0.2"; sha256="0z2jbb53x0knxajap1f2w25s732xqy1fyayxh2mzlbhm0zf3pjjw"; depends=[igraph maptools rgdal rgeos sp]; }; gIPFrm = derive2 { name="gIPFrm"; version="3.1"; sha256="08rfdac442picbw1r3xyxjzf2dc57svg44am0714z4r72mshvj04"; depends=[]; }; gLRTH = derive2 { name="gLRTH"; version="0.2.0"; sha256="1drmmr576n3pbr0q1cnnx4k7r4iz061n2cizv1kpr3wcc1g291pn"; depends=[]; }; - gMCP = derive2 { name="gMCP"; version="0.8-14"; sha256="11q2d4a352z7c0ln10mdpms1cl4bh5hqmg9avmbxw54z4i00mdvy"; depends=[CommonJavaJars JavaGD MASS Matrix multcomp mvtnorm PolynomF rJava xlsxjars]; }; - gMOIP = derive2 { name="gMOIP"; version="1.3.0"; sha256="0v3hxy95g9nl5njmlskb18c5icsyq5n1sg41lm8gpgx4qp5fd4zb"; depends=[geometry ggplot2 ggrepel MASS plyr rgl]; }; - gMWT = derive2 { name="gMWT"; version="1.1"; sha256="1ws96x3vjswh6m6s9zn3r9gp7xp6ybdkkxsq9a73ng2zqz2qjdl0"; depends=[clinfun Rcpp RcppArmadillo]; }; + gMCP = derive2 { name="gMCP"; version="0.8-15"; sha256="01048j9489rrhv9syqrbw4c5i5gsll41ysm27awxw6l1rshbqsqn"; depends=[CommonJavaJars JavaGD MASS Matrix multcomp mvtnorm PolynomF rJava xlsxjars]; }; + gMOIP = derive2 { name="gMOIP"; version="1.4.3"; sha256="0zk2m81kbsb40bjgvv29cl7azr2kfa528ph1lhrp88zsiv3hv3py"; depends=[dplyr geometry ggplot2 ggrepel MASS Matrix plyr purrr Rfast rgl rlang]; }; + gMWT = derive2 { name="gMWT"; version="1.1.1"; sha256="1vbw548fyrf012ry54p3gybdsil8c9llg2r9njhsiy7rb0gz2613"; depends=[clinfun Rcpp RcppArmadillo]; }; gPCA = derive2 { name="gPCA"; version="1.0"; sha256="1ylb1d24dxnzpws9bbanwhyizjr3ljky2bhrph4c5yaq0zwwbrkw"; depends=[]; }; gPdtest = derive2 { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; }; gProfileR = derive2 { name="gProfileR"; version="0.7.0"; sha256="1h1v0kgpsn04ald2izznh7fr2riwisj5hcgz4k7h3qc931rf0r4k"; depends=[plyr RCurl]; }; - gRain = derive2 { name="gRain"; version="1.3-3"; sha256="1vbsvnipy014lda8djxz5a81c0c967hci31jlmkkg5523p8l2g6r"; depends=[graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; + gRain = derive2 { name="gRain"; version="1.3-4"; sha256="0gd04qd92mnd9j9r1ln3m19dywkbx4aq979lxm0csm7d0vhbdq99"; depends=[graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; gRapfa = derive2 { name="gRapfa"; version="1.0"; sha256="07yzwzna9pdyzndxk6wwyl6v3gkfc7dvy1ixmdl3d38mcl1ahwyq"; depends=[igraph]; }; - gRbase = derive2 { name="gRbase"; version="1.8-5.1"; sha256="04xccgrprzv1hs6v19fiy4fcyp9frsrrsw6nyw1ksh8cx4w681ar"; depends=[graph igraph magrittr Matrix RBGL Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; + gRbase = derive2 { name="gRbase"; version="1.8-6.4"; sha256="08rp6jjpcxzzad617fycc4yq7jlkclkvfa3dvb2qj4k4g1xpl2h9"; depends=[graph igraph magrittr Matrix RBGL Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; gRc = derive2 { name="gRc"; version="0.4-3.2"; sha256="0f8m83wqhmsn6p0v0msdzyy9vl900nc9ddr8y78181jxcd9mqd0d"; depends=[gRbase MASS]; }; - gRim = derive2 { name="gRim"; version="0.2-0"; sha256="0ihl4vsnp6xkcpcf37p2xcqnbvyvjamcz5060f1kirn8xzwzq29y"; depends=[gRain graph gRbase igraph Rcpp RcppArmadillo]; }; + gRim = derive2 { name="gRim"; version="0.2.1"; sha256="0j5r4pnjmyc9z0yfs8bgp0w8w4prlqwvnxmg5pm5gz09h8kkd2qq"; depends=[gRain graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; gSEM = derive2 { name="gSEM"; version="0.4.3.4"; sha256="18kh41ibvfflz59gykiq7j2c6a72i8b0w8c2mcprd1nzhnyhvmhy"; depends=[DiagrammeR htmlwidgets knitr MASS]; }; - gSeg = derive2 { name="gSeg"; version="0.6"; sha256="19njl093qidwjcwzxkzip78ahgq3zwhc0kscvhjpzb49qkg3srrj"; depends=[]; }; + gSeg = derive2 { name="gSeg"; version="0.7"; sha256="0np15vsnnksd59gzwk64fyjcawmrjq1n0rbjiw56zhsn19gkjx25"; depends=[]; }; gStream = derive2 { name="gStream"; version="0.2.0"; sha256="1f4xnbavm99yhjmaahazigps41mqlfvvl29kf4fs1yjqr531y36b"; depends=[]; }; gTests = derive2 { name="gTests"; version="0.2"; sha256="1h1sd8mrzcniq7rx7frdlxwpnsn8lifng1x99fqq703hs3znl1yq"; depends=[ade4]; }; - gWQS = derive2 { name="gWQS"; version="2.0.0"; sha256="1ip8zmnvdrw5m2rcfzj4xw9fv5i74909lnxk9m3y8l3vl5iavn8y"; depends=[broom dplyr future future_apply ggplot2 ggrepel kableExtra knitr MASS nnet plotROC pscl reshape2 rlist Rsolnp]; }; - gWQSRS = derive2 { name="gWQSRS"; version="1.1.0"; sha256="1k8yxql65grp2nr4i966139ywz3wwj5vf5nqwgqv4fwxfsmv9mga"; depends=[aods3 broom dplyr future future_apply ggplot2 ggrepel gWQS kableExtra knitr MASS nnet plotROC pscl reshape2 rlist Rsolnp]; }; + gWQS = derive2 { name="gWQS"; version="2.0.1"; sha256="1yl8c9v66n5zbkdcxbrzmjdf24in3gkrxgnyr2lc7pi414zb2dbg"; depends=[broom dplyr future future_apply ggplot2 ggrepel kableExtra knitr MASS nnet plotROC reshape2 rlist Rsolnp]; }; + gWQSRS = derive2 { name="gWQSRS"; version="1.1.1"; sha256="1nhh4g40fl60fnbjn92i6knj9cxd73hd4zr553cmrdr5i3gsmsl2"; depends=[aods3 broom dplyr future future_apply ggplot2 ggrepel gWQS kableExtra knitr MASS nnet plotROC reshape2 rlist Rsolnp]; }; gWidgets = derive2 { name="gWidgets"; version="0.0-54.1"; sha256="1vwwjpi4lbgzw3fw3j9cccs9qhqa11v5hvq4hv5px373dla8pcn2"; depends=[]; }; gWidgets2 = derive2 { name="gWidgets2"; version="1.0-8"; sha256="0p6lav6lrwgsw29sl8vshzgi8j2smcavx047qq31s9bsn2dcw58n"; depends=[digest]; }; gWidgets2RGtk2 = derive2 { name="gWidgets2RGtk2"; version="1.0-7"; sha256="14c933j0wj3lb5da75zxg3w3mfqh0nqk8rczbi4dnqd8sna6jks9"; depends=[gWidgets2 memoise RGtk2]; }; gWidgets2tcltk = derive2 { name="gWidgets2tcltk"; version="1.0-6"; sha256="0arh0yxx63m4df1ccrv0q3vkjncwv3ink8vkalp6ashi2932yfma"; depends=[digest gWidgets2 memoise]; }; gWidgetsRGtk2 = derive2 { name="gWidgetsRGtk2"; version="0.0-86"; sha256="0b1xqffbzxlaaaqf1vzfl0a7b6wnnslsp8v5fbxblv7w951rsc4m"; depends=[cairoDevice gWidgets RGtk2]; }; gWidgetstcltk = derive2 { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rqh4927bal7j718bn2ziy6rws8yq682lmp5vbqhdd36afv2"; depends=[digest gWidgets]; }; + gadget2 = derive2 { name="gadget2"; version="2.3.5"; sha256="1v1qg6rj3q09vkwhj5l3ijzyrgdp36fxkpv55q7l22b47b2krv17"; depends=[]; }; gafit = derive2 { name="gafit"; version="0.5.1"; sha256="160z3cv22prf7118447dla9g1gimwkfad8zdil3fg8n4l22rk51a"; depends=[]; }; gaiah = derive2 { name="gaiah"; version="0.0.2"; sha256="1qc3crjxramyxl86dp8mcmvskixny7x6ji0jqf5dqf5r5qc7zrs9"; depends=[dplyr geosphere ggplot2 lazyeval magrittr maptools raster rgeos sp stringr tidyr]; }; gainML = derive2 { name="gainML"; version="0.1.0"; sha256="1mqhrdjdmc2n7dxilxkqn6xq7z0qnxpigw5bbffnjvvsmdamah0n"; depends=[fields FNN]; }; gains = derive2 { name="gains"; version="1.2"; sha256="1nmrhc7qjlyzn04r1qyjdws5fin3idmi789kbxzilax12ya8xr7k"; depends=[]; }; - galgo = derive2 { name="galgo"; version="1.4"; sha256="1v150flk1x0rixpgvi8crd5iq28w4jk8h2iyv48hz5qmm2pvz1li"; depends=[e1071 MASS nnet R_oo randomForest rpart]; }; galts = derive2 { name="galts"; version="1.3.1"; sha256="0jg0yng1kc6s0qdhq8ps38dsxdcrgdcn8dl2dlclw6rcbknb6h4k"; depends=[DEoptim genalg]; }; gam = derive2 { name="gam"; version="1.16.1"; sha256="1fbldshnfy37bpqprazwp1rkyh9f67mr2krnxpl4688mqq143l40"; depends=[foreach]; }; - gamCopula = derive2 { name="gamCopula"; version="0.0-6"; sha256="0fz6phhdmk0zd3irki4kj5wkpdjbgxd4svw6pinpk4vg3qwz83jd"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; }; + gamCopula = derive2 { name="gamCopula"; version="0.0-7"; sha256="0zi9g2vxkn1hxc2qyyr1x8p1f9w7fc1j5dmm2mmm333gixkkz9nb"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; }; gamRR = derive2 { name="gamRR"; version="0.7.0"; sha256="0zn8921a4i1lz5wpdfbd72pqb25r12abyqw7y2w53kfhdzs57f3l"; depends=[boot mgcv]; }; gama = derive2 { name="gama"; version="1.0.3"; sha256="1k79m01r3y9am62414947zfwb1w1gh0nn48najivbjyk9i2avn9r"; depends=[ArgumentCheck cluster clusterCrit GA ggplot2 NbClust Rfast]; }; gamair = derive2 { name="gamair"; version="1.0-2"; sha256="1cjrd576l9md1jb1fc1y6iay5y49i0d8by024qsc7yik6f6mdl13"; depends=[]; }; - gambin = derive2 { name="gambin"; version="2.4.1"; sha256="03n5zcwfq8g1vk5w22hw8fhqkc63zz4g9d3gdxa5g8v7v56l3dqy"; depends=[doParallel foreach gtools]; }; - gamboostLSS = derive2 { name="gamboostLSS"; version="2.0-1"; sha256="06n2xk7k24gz95jy1cr6shpfd89ylispq6mn3fvxblqdf8vhdixj"; depends=[mboost stabs]; }; + gambin = derive2 { name="gambin"; version="2.4.3"; sha256="0rb4yh01kk2nbw9dl9vhsd9c7c1fi3pq5f0h7lmngi8zlf80rk69"; depends=[doParallel foreach gtools]; }; + gamboostLSS = derive2 { name="gamboostLSS"; version="2.0-1.1"; sha256="1zrmn2r9814q37nmc29p9lyvpgrz6q7pwby5h37ldsxzzwxqz1ig"; depends=[mboost stabs]; }; gamboostMSM = derive2 { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch57ksll8d5i3jzk0kh40593b20c17g3hvc33920c7r0"; depends=[mboost]; }; - gameofthrones = derive2 { name="gameofthrones"; version="1.0.0"; sha256="15jgpv197aqb56iyp4afjajx2rcxz21dhigx9mxipa0b8g2h0s6k"; depends=[ggplot2 gridExtra MASS]; }; + gameofthrones = derive2 { name="gameofthrones"; version="1.0.2"; sha256="10ns4yl1s8adlf334gl8yararj1fpxbg3gy7h69s554m4h878awk"; depends=[ggplot2 gridExtra MASS]; }; games = derive2 { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[Formula MASS maxLik stringr]; }; - gamesGA = derive2 { name="gamesGA"; version="1.1.3.6"; sha256="1agvh27m5sy8psbsw9nbi39wl7cf406fl9sd9hkc14139w9drfwv"; depends=[shiny]; }; + gamesGA = derive2 { name="gamesGA"; version="1.1.3.7"; sha256="0km0z2haqgykl01xkzsbkpwibavgqfjygx7cg08ni68gw501689l"; depends=[shiny]; }; gamlr = derive2 { name="gamlr"; version="1.13-5"; sha256="0fc27b6qcm01drb7pb14wri2hlb464jig3x7sb8njwrxcqqia14n"; depends=[Matrix]; }; - gamlss = derive2 { name="gamlss"; version="5.1-5"; sha256="0gcngfck0dk2rhjg0z1fnc61dqs0s049jy2rkywaf57531s2k8bc"; depends=[gamlss_data gamlss_dist MASS nlme survival]; }; - gamlss_add = derive2 { name="gamlss.add"; version="5.1-5"; sha256="1fw60f07b7yx7aw00915z49w1d6d7dm4b2sqvcji1682milnxa3n"; depends=[gamlss gamlss_dist mgcv nnet rpart]; }; + gamlss = derive2 { name="gamlss"; version="5.1-6"; sha256="16b7ick1khvldbvfmmpw9cjs1vznnrisvifq7717fxzd8c9s5jdr"; depends=[gamlss_data gamlss_dist MASS nlme survival]; }; + gamlss_add = derive2 { name="gamlss.add"; version="5.1-6"; sha256="0g80bn0nszs2nmka6dypyvqnsgxp7mzhf5nd82n5x4jm3ca3dbdj"; depends=[gamlss gamlss_dist mgcv nnet rpart]; }; gamlss_cens = derive2 { name="gamlss.cens"; version="5.0-1"; sha256="1s83dgifidvc6cbrqirwlvwfzg08mlhmxxiqkbmnsy09i5j9fzd3"; depends=[gamlss gamlss_dist survival]; }; gamlss_countKinf = derive2 { name="gamlss.countKinf"; version="3.5.1"; sha256="1xalp909gxxhyhh4chlr1ssyfhydhw1w3szzbynajji98576zaqv"; depends=[gamlss gamlss_dist]; }; gamlss_data = derive2 { name="gamlss.data"; version="5.1-4"; sha256="1dgfspbmps6ipzcmw681wjdp320nm50dwsxafgrcwxndqgc7fdqd"; depends=[]; }; gamlss_demo = derive2 { name="gamlss.demo"; version="4.3-3"; sha256="01p6abppwbnh2a2ks1g08z4iwq2fxf125y9s4qzssybsn76a3gf3"; depends=[gamlss_dist gamlss_tr rpanel]; }; - gamlss_dist = derive2 { name="gamlss.dist"; version="5.1-5"; sha256="1rl7hzdg5xpvaq3yyzwxhsaqzzs0qidi3ibv454fisijgv8l4vqw"; depends=[MASS]; }; + gamlss_dist = derive2 { name="gamlss.dist"; version="5.1-6"; sha256="1p904x0b07z4amaqdn2xhs7qzbq8lisr6lqc844s3pkxzmny7w1z"; depends=[MASS]; }; gamlss_inf = derive2 { name="gamlss.inf"; version="1.0-1"; sha256="0m091zxjm5wvhm6mzbpzkr275n3qnlb3v4099k0a1jymahk4w7vr"; depends=[gamlss gamlss_dist]; }; gamlss_mx = derive2 { name="gamlss.mx"; version="4.3-5"; sha256="1jfs3ib2imwgazf8v23fa12iaflv0pm944bkqklx8qcljxp1lcs7"; depends=[gamlss gamlss_dist nnet]; }; gamlss_nl = derive2 { name="gamlss.nl"; version="4.1-0"; sha256="083l5lsb0csxcp4vffvdv2nr7jk3s2gkcavx66m8inzw16j7xilz"; depends=[gamlss survival]; }; @@ -8043,32 +8144,32 @@ in with self; { gamlss_tr = derive2 { name="gamlss.tr"; version="5.1-0"; sha256="1px9lhwad13s544g4ba8m7nxxd425jyakh6x1p4byxl8bn9w9qgr"; depends=[gamlss gamlss_dist]; }; gamlss_util = derive2 { name="gamlss.util"; version="4.3-4"; sha256="0p8lnwrn7cx97qnxls1x532f3ywszdyib2qiwx5qc7sam59h9c8j"; depends=[gamlss gamlss_dist zoo]; }; gamlssbssn = derive2 { name="gamlssbssn"; version="0.1.0"; sha256="1l8d4qwmq9dklm9imb3cvlncwa6jygf8kg2j1599h1nfhyyhj2vv"; depends=[gamlss gamlss_dist MASS]; }; - gamm4 = derive2 { name="gamm4"; version="0.2-5"; sha256="11wblnh22xq3m3z25i30v2kd0zlf8wa3cm5z38z56rhk3l2wf5bc"; depends=[lme4 Matrix mgcv]; }; + gamm4 = derive2 { name="gamm4"; version="0.2-6"; sha256="128c725y9s07c1m9cvd9hgi9hldrymcs5divd8pw7bdjh9jvdiap"; depends=[lme4 Matrix mgcv]; }; gamm4_test = derive2 { name="gamm4.test"; version="0.1.0"; sha256="0ab6rksr88fsv6whp6cxyshpv5ixmf9lw51cl3rzk870r8q326wg"; depends=[doParallel foreach gamm4 Matrix mgcv plotly RColorBrewer]; }; gammSlice = derive2 { name="gammSlice"; version="2.0-2"; sha256="1klxg1yhmfaz1zjnw1kxl1lm5plkakqh014rpkak2lj8zgf8qnyy"; depends=[KernSmooth lattice mgcv]; }; gamreg = derive2 { name="gamreg"; version="0.3"; sha256="1svrgbb8qdy2hzpq1g38v2lzmlbrn7qljix827biqzwgiajy69gg"; depends=[doParallel foreach glmnet Rcpp RcppArmadillo robustHD]; }; gamsel = derive2 { name="gamsel"; version="1.8-1"; sha256="107hbshi36dcyykhy6w1i1ih84xwdqv1q3nad73d3krf7bhvhg5f"; depends=[foreach mda]; }; ganalytics = derive2 { name="ganalytics"; version="0.10.7"; sha256="03jf7325cgg5p6lzcrzzzx0b40vf3l5vhw95lih098kpmlr1zadf"; depends=[assertthat googleAnalyticsR httpuv httr jsonlite lazyeval lubridate plyr R6 rvest scales selectr stringr tibble XML xml2]; }; - gap = derive2 { name="gap"; version="1.2.1"; sha256="1dbgijnwgmzhrfs2jml5sl09zv73dkai11844chrlfshgv6as82s"; depends=[]; }; + gap = derive2 { name="gap"; version="1.2.2"; sha256="0d5qcmf1lvipf28v3pdcn9prmm8idbcbsxjn54h2na0v6wmsarlw"; depends=[]; }; gap_datasets = derive2 { name="gap.datasets"; version="0.0.4"; sha256="1zlxm3nh1b1mqb94fq2b7sc7v99m9ywz7bz9lz5bhwblk5fzmjii"; depends=[]; }; gapfill = derive2 { name="gapfill"; version="0.9.6"; sha256="0384v7capab7dbyvz6b2jvnh840z6ab3857my0h3cgsys3lhn3c5"; depends=[fields foreach ggplot2 quantreg Rcpp]; }; - gapmap = derive2 { name="gapmap"; version="0.0.4"; sha256="0xz19n0vvdzbfg6afp3y0qfbs3f2nfxib1cyya3cax5wqqfbzw3i"; depends=[ggplot2 reshape2]; }; gapminder = derive2 { name="gapminder"; version="0.3.0"; sha256="067cra1ca4ngwjx8d1y9pyzwcpsfi1wcal0glzyy6ghd1k6jflpv"; depends=[tibble]; }; + garchx = derive2 { name="garchx"; version="1.0"; sha256="1k8f6251hpj38rllw10w97r9j4asqg111kwcpnxh4rilbhjcra36"; depends=[zoo]; }; gargle = derive2 { name="gargle"; version="0.4.0"; sha256="08zhfk2sl342w35i5n2c93ayypg3z0kbl0020l3y9adqka1vazgx"; depends=[fs glue httr jsonlite rlang withr]; }; garray = derive2 { name="garray"; version="1.1.2"; sha256="0s2dgi556x9jnhafvzz4qkxdbq9dm12gsvsqd2g9iy3468fx9flq"; depends=[]; }; - gaselect = derive2 { name="gaselect"; version="1.0.7"; sha256="0bivbvs8yyspqskvka1s1sr6w3k0m5kk4b66wfz9bfdygnywd6wz"; depends=[Rcpp RcppArmadillo]; }; - gasfluxes = derive2 { name="gasfluxes"; version="0.4-3"; sha256="017y3d67f22r6pxpjxab634kpdcxjd5mq53h3g45cxic1jz3znym"; depends=[AICcmodavg data_table MASS sfsmisc]; }; + gaselect = derive2 { name="gaselect"; version="1.0.9"; sha256="089gyllcmq5rgf5yffclifc7rc8rmq4wk1dhznigxkij4zap67hx"; depends=[Rcpp RcppArmadillo]; }; + gasfluxes = derive2 { name="gasfluxes"; version="0.4-4"; sha256="0gi0zk0h5rw75n6znada0cwa9qzy8higsiiqwgdm3q827j1x8iva"; depends=[AICcmodavg data_table MASS sfsmisc]; }; gastempt = derive2 { name="gastempt"; version="0.4.4"; sha256="16sgjysc9x6l07jdnw515jzvc8nf237a1a3wmcwc5khyacg29lr4"; depends=[assertthat BH dplyr ggplot2 nlme Rcpp RcppEigen rstan rstantools shiny StanHeaders stringr tibble]; }; - gaston = derive2 { name="gaston"; version="1.5.5"; sha256="0xiy36wrl480lzfcidw5k39arjmwzx4vx5qq8d4qb7ykq25hkjzz"; depends=[Rcpp RcppEigen RcppParallel]; }; + gaston = derive2 { name="gaston"; version="1.5.6"; sha256="1bx6iqfjb9lf3vn0z7v8wjv9m7issvqsnymm4qsgl3622s6qz6rg"; depends=[Rcpp RcppEigen RcppParallel]; }; gatepoints = derive2 { name="gatepoints"; version="0.1.3"; sha256="02qxxf4a6rl3l0jdgqxmzxfnqd9lh5i0q2knaxxsiz0nd74c1jg5"; depends=[]; }; gaussDiff = derive2 { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; }; - gausscov = derive2 { name="gausscov"; version="0.0.2"; sha256="1a0m7br0yrj8k30rhqxq63jr6vdqhr6n983l34d1c9snspiyqxck"; depends=[]; }; + gausscov = derive2 { name="gausscov"; version="0.0.3"; sha256="012fjyx2gfkab1pfpwrpah81v21rdvj0adnihy150c7y9r773bzz"; depends=[]; }; gaussfacts = derive2 { name="gaussfacts"; version="0.0.2"; sha256="095x7k7m7sy1gqkbm6wiqn26252dclz62sbnkv6cjvmbdxajl7m9"; depends=[]; }; gaussquad = derive2 { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[orthopolynom polynom]; }; - gazepath = derive2 { name="gazepath"; version="1.2"; sha256="0h5a9bpgx268yh0zy3y4xfvij1ncx92x5qphjc94xmzbrl0br1mf"; depends=[jpeg scales SDMTools shiny zoo]; }; + gazepath = derive2 { name="gazepath"; version="1.3"; sha256="1sv0vdwzmvpnj2k8lphnf4y12fi5md0j2725fjkv1n7a3dkd6faa"; depends=[jpeg scales shiny sp zoo]; }; gb = derive2 { name="gb"; version="2.3.3"; sha256="0gkdkbwr168vi7lgccla49l43rkmjcfrwlqdr65mg5syzcxrh7nh"; depends=[boot KernSmooth]; }; gbRd = derive2 { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; }; - gbfs = derive2 { name="gbfs"; version="1.3.1"; sha256="0kw884fziiczdlvwxrmrxbpikiyglwfa6sf7xqqp4x5vwfrjqmn5"; depends=[curl dplyr httr jsonlite lubridate purrr readr stringr]; }; + gbfs = derive2 { name="gbfs"; version="1.3.2"; sha256="1sgs026bhap2kyla4s7dq9vgxk0daxs3ggixfhin1jqvriqx2b18"; depends=[curl dplyr httr jsonlite lubridate purrr readr stringr]; }; gbm = derive2 { name="gbm"; version="2.1.5"; sha256="0vs6ljaqhwwpgr8wlbhmm4v147rd82kl16rpaijqiylxcc8dxyq6"; depends=[gridExtra lattice survival]; }; gbm2sas = derive2 { name="gbm2sas"; version="2.1"; sha256="0ssjlv849vssmncn01ccpp2myqib5f3g88g0d4rqma2z0ivdpk23"; depends=[gbm]; }; gbp = derive2 { name="gbp"; version="0.1.0.4"; sha256="0awg724gsfwlb0fjcvw0450qdsk4m8x8is16pj5c8fx6nc8rn8bv"; depends=[data_table magrittr Rcpp RcppArmadillo rgl]; }; @@ -8082,42 +8183,42 @@ in with self; { gcerisk = derive2 { name="gcerisk"; version="19.05.24"; sha256="1dn3x9afb6lwys5adi621s6357s66lsif5zv64ilxmckmy2j71zl"; depends=[cmprsk ggplot2 survival]; }; gcite = derive2 { name="gcite"; version="0.10.1"; sha256="0ljgzzl4yy1in5iz42iqkrsq6da4qx838anwdlvbdy96dyafl4ad"; depends=[data_table httr pbapply rvest tm wordcloud xml2]; }; gclus = derive2 { name="gclus"; version="1.3.2"; sha256="1cz0g0i972955hhaji30rx8448x7f3as7z1sww9i5h86ybgirilw"; depends=[cluster]; }; - gcmr = derive2 { name="gcmr"; version="1.0.1"; sha256="093j1cmfw83rck00lx2ns7sfaya7kfc8k7af0q80az7w2g9hmmpv"; depends=[betareg car Formula geoR lmtest nlme sandwich sp]; }; + gcmr = derive2 { name="gcmr"; version="1.0.2"; sha256="0mh542na2byb4aha548lfkzllfnk4rmzcm23jm6642pndvxpnfmj"; depends=[betareg car Formula lmtest nlme sandwich sp]; }; gconcord = derive2 { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; }; gcookbook = derive2 { name="gcookbook"; version="2.0"; sha256="11g1q187l4j31b6cdzdx5z3s14z3s09l7ynl36pzzn9j19l8cmrc"; depends=[]; }; gdalUtilities = derive2 { name="gdalUtilities"; version="1.0.0"; sha256="1z452lh1n65g78dqynnwq3rcrmm7g4jz7qr25px7qav0zi6944mf"; depends=[raster sf]; }; - gdalUtils = derive2 { name="gdalUtils"; version="2.0.3"; sha256="00q9lcwm1nr2j31wyk567vy89ifhgh0lxv8h869x4k0r6xlqxp7i"; depends=[foreach R_utils raster rgdal sp]; }; - gdalcubes = derive2 { name="gdalcubes"; version="0.2.3"; sha256="04wxy0w1sh1d64995m0b1ss9ly7n2dz7vdgmxgrdn07w7vhbhacx"; depends=[jsonlite ncdf4 Rcpp RcppProgress]; }; + gdalUtils = derive2 { name="gdalUtils"; version="2.0.3.2"; sha256="0krapdy50nd5dvcdflz39dzxpig3zklng3hgxavqg2nvwazalvsc"; depends=[foreach R_utils raster rgdal sp]; }; + gdalcubes = derive2 { name="gdalcubes"; version="0.2.4"; sha256="1xsii3aj11q96xw1zkdri5crynd1g8d499qa74p2c75wqp296mrh"; depends=[jsonlite ncdf4 Rcpp RcppProgress]; }; gdata = derive2 { name="gdata"; version="2.18.0"; sha256="0zwdj7lscgxr8r62ii8hbdh4mb7sa9w4f5nv32zzrxdvymcpya2b"; depends=[gtools]; }; gdimap = derive2 { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[abind colorspace geometry gridExtra gsl movMF oro_nifti rgl]; }; - gdistance = derive2 { name="gdistance"; version="1.2-2"; sha256="0lqpxsg01ibkaq50qyccdhsl2sbb4kh9bcfifs1yzsg45bq27jf8"; depends=[igraph Matrix raster sp]; }; - gdm = derive2 { name="gdm"; version="1.3.11"; sha256="1bsy8fjzc0034hxw5n4ip4lkwr38fiyvw9q21bk17sxn44cnnxz4"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; }; + gdistance = derive2 { name="gdistance"; version="1.3-1"; sha256="04v86kdpag3dvp4zm4ia9y0g9nxa39ka0nmqyw7rkhkmzfs7m6hf"; depends=[igraph Matrix raster sp]; }; + gdm = derive2 { name="gdm"; version="1.4.2"; sha256="1q2bmqrxlac72jdmaldf4m6cwv60aaxxqws518dcn83bs788mbcm"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; }; gdmp = derive2 { name="gdmp"; version="0.2.0"; sha256="0fy8x9l6swrb78apwq9d9msz2y8dkfd2fkyp1pkmzxwdb85lmcdm"; depends=[]; }; gdns = derive2 { name="gdns"; version="0.3.1"; sha256="1vydl7jacldidzx1hhqang9fw8zar8wy4cgdmr9pbw22ffw2qq7s"; depends=[httr jsonlite stringi]; }; - gdpc = derive2 { name="gdpc"; version="1.1.0"; sha256="1q1c9pypkb8dv6bvgizaca4p43krc52fvlvjz9l6nkpazr1qx33d"; depends=[doParallel foreach Rcpp RcppArmadillo xts zoo]; }; + gdpc = derive2 { name="gdpc"; version="1.1.1"; sha256="1wdfmsc8g7paj3rj75wcvqcjw92bkgc57nz1wc90y67gh1xvxs1i"; depends=[doParallel foreach Rcpp RcppArmadillo xts zoo]; }; gds = derive2 { name="gds"; version="0.1.0"; sha256="0kc3l93640x8d6g3pa9gbr7ci5hmryg9i1nqpasgnvb6ixv6azbm"; depends=[]; }; - gdtools = derive2 { name="gdtools"; version="0.2.1"; sha256="1aax50wyrs4336zpf247l8wmp4spab2n70msziy1ip4gbjn26wa1"; depends=[Rcpp systemfonts]; }; + gdtools = derive2 { name="gdtools"; version="0.2.2"; sha256="08njzin0c6biw62j5w30r9j85vr1m2cg4hmv5d76nym860yrlqjf"; depends=[Rcpp systemfonts]; }; gdxdt = derive2 { name="gdxdt"; version="0.1.0"; sha256="1yrjixq4srmaiy5iaprix4096yhf3ldyklgjag4kxd3l5acwap4h"; depends=[data_table]; }; - gear = derive2 { name="gear"; version="0.1.4"; sha256="1wa35965fw4ga3p72z9w40pcc3jdc3fl7gdkfbwgakg7vc6f24xq"; depends=[lattice optimx sp]; }; + gear = derive2 { name="gear"; version="0.3.4"; sha256="0ibn2kr0rjj546cbcqhr6x69s25xh7si5fri59055j42g62mdnxy"; depends=[autoimage optimx Rcpp]; }; gee = derive2 { name="gee"; version="4.13-20"; sha256="167pzgnmj4cjc41ykps1mfwi6s7y32zxyycn5z17vn4v0pp4q0ak"; depends=[]; }; gee4 = derive2 { name="gee4"; version="0.1.0.0"; sha256="1vvzb9sc69g292zmh9djd15jgc7falypd5p7mzw6ps7mirpbnicf"; depends=[Formula Rcpp RcppArmadillo]; }; geeM = derive2 { name="geeM"; version="0.10.1"; sha256="1r9zyjv7r7r7avdqi54dvczf971frz8pgrs1a04kan5mh4ls6xpy"; depends=[Matrix]; }; geecure = derive2 { name="geecure"; version="1.0-6"; sha256="0nmnrkfgblv38qvk66bdk8933icr59mayqwljkvmpy59sm6br2k5"; depends=[geepack MASS Matrix survival]; }; geepack = derive2 { name="geepack"; version="1.3-1"; sha256="1pyn50pn18ffnraqjb6ncgh3a70c91wq4xyy8n5bva7153556cc2"; depends=[broom magrittr MASS]; }; geesmv = derive2 { name="geesmv"; version="1.3"; sha256="0gm953z8q5cc1adl3d6vj5djg2inc880zfcdl5gd56fnb5gl6h1w"; depends=[gee MASS matrixcalc nlme]; }; - geex = derive2 { name="geex"; version="1.0.11"; sha256="19qqgr16cd4zsmfgl9ny92ncvf1418ilvhb9h3axw24mkycins61"; depends=[lme4 Matrix numDeriv rootSolve]; }; + geex = derive2 { name="geex"; version="1.0.12"; sha256="0zqfd416wl6inr423xzxrnc0as0yrxfqy7fdjyc39i60kghfqyh3"; depends=[lme4 Matrix numDeriv rootSolve]; }; geigen = derive2 { name="geigen"; version="2.3"; sha256="0blg4w9wjprbax8z6md3285v12ajcjmcrpca52l3kd5qmxlvizy7"; depends=[]; }; geiger = derive2 { name="geiger"; version="2.0.6.4"; sha256="0r5g50lpq2cawh3cirj8g954wy129s6a4wjw78blpcc6kdvi5p4d"; depends=[ape coda colorspace deSolve digest MASS mvtnorm ncbit Rcpp subplex]; }; gelnet = derive2 { name="gelnet"; version="1.2.1"; sha256="10ygdfz9f5xhahlqb2divwvaljhiz8jhsd12wvq0qalx0v1h5j0p"; depends=[]; }; gemlog = derive2 { name="gemlog"; version="0.36"; sha256="06av0gg9b96fdfq275wany036jxzrym3g5klbjmj1cjvl1kyvjim"; depends=[signal]; }; gemma2 = derive2 { name="gemma2"; version="0.1.1"; sha256="1kbjb5cjgrbdf695nz916w40a78zy5xjmr99l835iy27k3i2p61i"; depends=[Matrix readr]; }; gems = derive2 { name="gems"; version="1.1.1"; sha256="174mjnpldb0rwjvwdgpcg1acm526gs0pjf9gi5mn9d3x9yz4r5jx"; depends=[data_table MASS msm plyr]; }; - gemtc = derive2 { name="gemtc"; version="0.8-2"; sha256="0c2a9gz6rvsc5qh66ixxa4dz6lwhcmmsf2vnvxl98c9kbvdwfqm9"; depends=[coda igraph meta plyr Rglpk rjags truncnorm]; }; + gemtc = derive2 { name="gemtc"; version="0.8-4"; sha256="1vg71vskvpky84371vq9i2x1i8axd7dcsbbv4zac9h2xlf63l39j"; depends=[coda igraph meta plyr Rglpk rjags truncnorm]; }; gen2stage = derive2 { name="gen2stage"; version="1.0"; sha256="16xbzgkjskzm1wik3dznvwhqddrpmcgsgd372n4a67rbb46jgx6r"; depends=[clinfun]; }; gen5helper = derive2 { name="gen5helper"; version="1.0.1"; sha256="0z7hisn57md18vcfb6f44hy6zzp9dirrjyxi4x1id3mqa3mligb6"; depends=[dplyr ggplot2 minpack_lm naturalsort plyr pracma rlang tidyr]; }; - genBaRcode = derive2 { name="genBaRcode"; version="1.2.2"; sha256="0ls5xly4rrwjby04015yrs8f072fdg492bk4lj1zr2hy0z4m98jc"; depends=[ape Biostrings dplyr futile_logger future future_apply ggnetwork ggplot2 ggraph ggseqlogo ggtree igraph network phangorn RColorBrewer reshape2 S4Vectors shiny ShortRead stringdist VennDiagram visNetwork]; }; genBart = derive2 { name="genBart"; version="1.0.1"; sha256="12z5vj41npwawz954zqkjfmg9inh063ilh7m82pn73asrxif0ay3"; depends=[clValid data_table fastcluster ggplot2 gtools limma NMF pca3d psych qusage RColorBrewer reshape2 rmarkdown scales shiny shinydashboard shinyjs statmod stringr VennDiagram]; }; genSurv = derive2 { name="genSurv"; version="1.0.3"; sha256="0k5rfpq603szjb76gxffvsbqcav8182h8zwvg4kar68k72yfw1xs"; depends=[]; }; + genTS = derive2 { name="genTS"; version="0.1.3"; sha256="1ky8h8yzqfkb91ny9z08gr7irzvjqr1b42k89ahcrmk458hjwgqr"; depends=[shiny]; }; genalg = derive2 { name="genalg"; version="0.2.0"; sha256="1wzfamq8k5yhwbdx0wy1w5bks93brj0p890xxc4yqrja4w38ja3s"; depends=[]; }; genasis = derive2 { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1ji55yp72mds7p3x1zvvpiks2r7w712p"; depends=[fitdistrplus Kendall]; }; gencve = derive2 { name="gencve"; version="0.3"; sha256="00wbmaffm7mbfv3zl6mb24w1df1a8p24girwdh3a522lw3045iwf"; depends=[C50 class e1071 glmnet lars MASS nnet plus randomForest rpart]; }; @@ -8131,17 +8232,18 @@ in with self; { geneSignatureFinder = derive2 { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[class cluster survival]; }; genemodel = derive2 { name="genemodel"; version="1.1.0"; sha256="1x6n6k9ifv2swhyrghvm6fsz5vh85cdik8225175i9msvmkh928n"; depends=[stringr]; }; genepi = derive2 { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; }; - genepop = derive2 { name="genepop"; version="1.1.4"; sha256="1i7pifh7dyz3vr7138hxcsfixz8y5q5g503gcairvrisf7ggj9fr"; depends=[Rcpp RcppProgress stringr]; }; + genepop = derive2 { name="genepop"; version="1.1.7"; sha256="0b36nspq3kkad52k0viw1pdsf7h9h5ivi0ix7zg8i0z7vkhnm0cy"; depends=[Rcpp RcppProgress stringr]; }; generalCorr = derive2 { name="generalCorr"; version="1.1.5"; sha256="1kjmg9paxhpd6csia69k169qgm8s388iysrjnm4bqv9zxn21zwwg"; depends=[lattice meboot np psych xtable]; }; generalhoslem = derive2 { name="generalhoslem"; version="1.3.4"; sha256="0fmfhmdb16gf3v9h50vif4f3f6bm03qq7wplnmzyxa80jb60fcc0"; depends=[MASS reshape]; }; generator = derive2 { name="generator"; version="0.1.0"; sha256="0xjvnmnpdms8rrxxcz6pd8w4rnbv3ghzqv4m63zxia2l98x7z4rf"; depends=[]; }; generics = derive2 { name="generics"; version="0.0.2"; sha256="0xk1xhpy7gpv3pvaygzhpfdxj72zmb38pb4nscfyg2ff36vx3cvi"; depends=[]; }; + genero = derive2 { name="genero"; version="0.1.0"; sha256="0akwwy5xbh7s40v8dr1zr7jfglv0iyh4zn0sb0rnz4r57qr6nh8w"; depends=[]; }; genesysr = derive2 { name="genesysr"; version="1.0.0"; sha256="05jp8z7313r5wi9a5yw7fh198l7nd2ywzwg4f23yp4kfrkkgawn5"; depends=[dplyr httr jsonlite]; }; genetics = derive2 { name="genetics"; version="1.3.8.1.2"; sha256="1v0ylnia6c44v356dsmnkx6054vcxazpzsrdh3yph5ch5vg6gjrh"; depends=[combinat gdata gtools MASS mvtnorm]; }; genie = derive2 { name="genie"; version="1.0.4"; sha256="0ymrn42ik0rfildmyq4z0gsd7injda0dsjgx69nqb6hq0x8s5hqa"; depends=[Rcpp]; }; genio = derive2 { name="genio"; version="1.0.12"; sha256="15v9hdnb1jknbvflvgyyhcx0cqjn3v9zl66mswk59j56qm58bkr9"; depends=[Rcpp readr tibble]; }; genius = derive2 { name="genius"; version="2.2.0"; sha256="0062g7wyclrbaljwib57s95x5wamc01fr3hgwjjzgv850vbbjqlv"; depends=[dplyr purrr readr reshape2 rvest stringr tibble tidyr tidytext]; }; - geniusr = derive2 { name="geniusr"; version="1.1.0"; sha256="1qnzqlgzq507g9iik00gh242nh3zcg38awrlaxl5zgnsp852kjnv"; depends=[attempt curl httr purrr rvest stringr tibble xml2]; }; + geniusr = derive2 { name="geniusr"; version="1.2.0"; sha256="04h0a61ngs0cmjf23imx76bm82dzkp4q4j31h3xlic05dx2lvyan"; depends=[curl dplyr httr purrr rvest stringr tibble xml2]; }; genlasso = derive2 { name="genlasso"; version="1.4"; sha256="01p1cs0h6gwr6f18aaqirgd8yxrhyamakc763y9dm6mndrba2x0g"; depends=[igraph MASS Matrix]; }; genlogis = derive2 { name="genlogis"; version="1.0.0"; sha256="01av5invhviii7adqihh10ib47rjzwfsqdgw3lfg1c72kzrqywgr"; depends=[distr doParallel foreach ggplot2 manipulate]; }; geno2proteo = derive2 { name="geno2proteo"; version="0.0.3"; sha256="1q054ai42f5gmrj791abj02f663zs7ymdh3pfs3b2lq6i4w9s2fb"; depends=[BiocGenerics GenomicRanges IRanges R_utils RUnit S4Vectors]; }; @@ -8153,62 +8255,59 @@ in with self; { genomicper = derive2 { name="genomicper"; version="1.6"; sha256="12msl6syw5a3dvxg9fr1yprcpb9qwn8v2dvkpxgagal11p9q1kx7"; depends=[DBI]; }; genotypeR = derive2 { name="genotypeR"; version="0.0.1.8"; sha256="1kwzjn6hrnfizs44cz4a8qa4mdhdzqssc4axx0s6vngmkmsrffig"; depends=[colorspace doBy plyr reshape2 zoo]; }; genpathmox = derive2 { name="genpathmox"; version="0.3"; sha256="0r1iqwm5jh93lbh87ks5qm4qqsp98928vg7qmv1pkahdlvl3ramw"; depends=[diagram mice plspm quantreg]; }; - genpwr = derive2 { name="genpwr"; version="1.0.1"; sha256="1vz4pq8rfvw0pbxhm83mbgsrj17ldcssq92b48p6vlpb403jsm91"; depends=[ggplot2 MASS nleqslv]; }; - genridge = derive2 { name="genridge"; version="0.6-6"; sha256="1hqarvd767h2vbjqfjzdr0548hxj87kv1073hfqyq5fybdlzsjx3"; depends=[car]; }; + genpwr = derive2 { name="genpwr"; version="1.0.2"; sha256="0k05l0d2qk2g3ic6f46xkhgy8ziwalrfx4nc0qi2k7i44kz720mg"; depends=[ggplot2 MASS nleqslv]; }; + genridge = derive2 { name="genridge"; version="0.6.7"; sha256="07mdkkq4j8i5x8d4yfsp2rfpf7gkcgdcsw9b2ng5f7gdnblrw0dr"; depends=[car]; }; gensemble = derive2 { name="gensemble"; version="1.0.1"; sha256="03ql1qxrxixr70hs9mwiqw92qyrg9pj4046pb42g435yncw321ad"; depends=[]; }; gensphere = derive2 { name="gensphere"; version="1.1"; sha256="1xzli40fw94n89cv2qyb321csad1w9zidqc226wlifl2m44cw6f7"; depends=[geometry mvmesh rgl SimplicialCubature SphericalCubature]; }; gensvm = derive2 { name="gensvm"; version="0.1.3"; sha256="1r9vd6h3divmjd73p3541mngv452v1dkxc41q7mbkd5qhy34km74"; depends=[]; }; genvar = derive2 { name="genvar"; version="0.0.2.0"; sha256="1agkyq84kl64q77n5sml44ind16c1zf16ivr6c7n08746gra3mbc"; depends=[clubSandwich foreign Formula plm readstata13 rlang sandwich]; }; geoBayes = derive2 { name="geoBayes"; version="0.6.3"; sha256="153a7kp73wxm5hzzq038p3mnykhakv0c9qa8fpbjijccmbi89970"; depends=[coda optimr sp]; }; - geoCount = derive2 { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp RcppArmadillo]; }; geoGAM = derive2 { name="geoGAM"; version="0.1-2"; sha256="0q09pk2npn4hjymklwfrhz2ybmjpcb6kvqkpn9l3a6cdjgk6bkmj"; depends=[grpreg MASS mboost mgcv]; }; - geoR = derive2 { name="geoR"; version="1.7-5.2.2"; sha256="0ynns6961sbylmqyy1lq0l000gab9kq5pz9ciffj0spdw8s91sxc"; depends=[MASS RandomFields sp splancs]; }; - geoRglm = derive2 { name="geoRglm"; version="0.9-11"; sha256="0qf3nm0snrmplbwgcac0iinni7h2wqm13lm34zzfl00idzv0k9b9"; depends=[geoR sp]; }; - geoSpectral = derive2 { name="geoSpectral"; version="0.17.4"; sha256="0i2k5k66gmf7zvipcd0a489rnpj14j4a4xw9k5dccpj6ybwd47l7"; depends=[dplyr leaflet maps plotly rbokeh rgdal sp spacetime xts]; }; + geoR = derive2 { name="geoR"; version="1.8-1"; sha256="1lvgkpvv4a05lsb1dgphpv733lxbpcj7p2bj1yjjbfch8n04f1lr"; depends=[MASS RandomFields sp splancs]; }; + geoSpectral = derive2 { name="geoSpectral"; version="0.17.5"; sha256="0bw8mv1kq27hql37zcalz3zjj57bhs7g724wfpvzav2rlzvs8n7f"; depends=[dplyr leaflet maps plotly rbokeh rgdal sp spacetime xts]; }; + geoTS = derive2 { name="geoTS"; version="0.1.3"; sha256="12v50r2ym3nb21sskq7h4xsk6nzci06l9iync2ny91iwl7c9nrjc"; depends=[doParallel ff foreach iterators raster sp]; }; geoaxe = derive2 { name="geoaxe"; version="0.1.0"; sha256="043y7kb24hp66j7pnpqsdixvdmppwp72y8i4f8q7xrkhaqlfb93v"; depends=[jsonlite rgeos sp]; }; - geobr = derive2 { name="geobr"; version="1.1"; sha256="1j6g62c4nrjqgvk0yk8b9p52p7a7czwkzly1ld0svvh1hz3yv93x"; depends=[httr readr sf]; }; - geodetector = derive2 { name="geodetector"; version="1.0-3"; sha256="1x6mr05976vdxxgcb4fd3v7mq2lanrl44nqz6f6rk2dy3yhdqi5c"; depends=[maptools rgdal rgeos sp]; }; + geobr = derive2 { name="geobr"; version="1.3"; sha256="0xgjlpxpdkh46gv4pz91hq1q6hxz1ikbfqh5g3xrzwf58hw6mz7h"; depends=[httr readr sf]; }; + geocacheR = derive2 { name="geocacheR"; version="0.1.0"; sha256="04ckxmird6n179xvsx50cjdz046igjxxqdnz5pfxi8pdklnky20c"; depends=[dplyr magrittr stringr threewords tibble]; }; + geodetector = derive2 { name="geodetector"; version="1.0-4"; sha256="00zyx68jjl4mldah8mxfvwvv5yfkd4f1s2rlx6fsw6h8y2cwzj3l"; depends=[maptools rgdal rgeos sp]; }; geodist = derive2 { name="geodist"; version="0.0.3"; sha256="1qxrbpx265l5vwvicspbqzr2s0k3k6lsrzvxnbhnds95jgq9yw4q"; depends=[]; }; + geodiv = derive2 { name="geodiv"; version="0.1.1"; sha256="0vww273947isk9ds6hjg9k47k8kbsbgyjap6iqgqyd9bl9437yrm"; depends=[dplyr e1071 phonTools pracma raster Rcpp RcppArmadillo rgdal rgeos sf sp spatial tibble zoo]; }; geoelectrics = derive2 { name="geoelectrics"; version="0.2.0"; sha256="1dmpaf16750ni4yr36cglfz9pv9jax8jxb3kwn47kxgnx3l8qq98"; depends=[fields lattice rgl]; }; geofacet = derive2 { name="geofacet"; version="0.1.10"; sha256="07viqfm8h469zjmpk4vp6zxmvwdcsn2wi0j8plyx1nirmxl7s0mw"; depends=[geogrid ggplot2 ggrepel gridExtra gtable imguR rnaturalearth sp]; }; - geofd = derive2 { name="geofd"; version="1.0"; sha256="16312g9mgw52mpsfky1j20zcqkkv91ihl0xhvv1bl80diffzf0zi"; depends=[fda geoR]; }; + geofd = derive2 { name="geofd"; version="2.0"; sha256="1rsgy4nxfp1gi4vwh8zfzksr6sr2ga31kmd56q5m56gw530570ra"; depends=[fda]; }; geogrid = derive2 { name="geogrid"; version="0.1.1"; sha256="0b8afwgj9x56z6zh525y7qkiwbv77mjcw3v19kfba0426jn4vi87"; depends=[Rcpp RcppArmadillo rgeos sf sp]; }; geohashTools = derive2 { name="geohashTools"; version="0.3.0"; sha256="0lc5ib6iylbxn02bl72sh3b6j51zm3b1rnjrj5jdyjj22hm7n7sa"; depends=[]; }; geojson = derive2 { name="geojson"; version="0.3.2"; sha256="0iqf8jkqgl97a07v8ixr2pbvamwyjswqckdwl3kkxgx7bycndprv"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; }; - geojsonR = derive2 { name="geojsonR"; version="1.0.7"; sha256="11d6rn7z2i8x4j3myzk9gkaw6y5asi92ya9lxc9cn1zv8jlsamvr"; depends=[R6 Rcpp RcppArmadillo]; }; - geojsonio = derive2 { name="geojsonio"; version="0.8.0"; sha256="00gh6wq1gxnvcx5fswmjc2qxw3jjcc5kf4gdrqn7lv1lip9qm3m1"; depends=[geojson httr jqr jsonlite magrittr maptools readr rgdal rgeos sf sp V8]; }; - geojsonlint = derive2 { name="geojsonlint"; version="0.3.0"; sha256="1ww52fg80mqwpn9rxz7qy698djjgzngp3fdhhhvixfrzl0ha810r"; depends=[crul jsonlite jsonvalidate V8]; }; - geojsonsf = derive2 { name="geojsonsf"; version="1.3.0"; sha256="1wr3g4rcvv7wh0gjw5mic3msz7wgcg6ra3zai5kxbv3wq2i9hfcg"; depends=[BH curl jsonify rapidjsonr Rcpp]; }; + geojsonR = derive2 { name="geojsonR"; version="1.0.8"; sha256="015g1xpvbwgng5vh79q8gx6900skv3p7s2v3xbka08qllvsg5by1"; depends=[R6 Rcpp RcppArmadillo]; }; + geojsonio = derive2 { name="geojsonio"; version="0.9.2"; sha256="1m315vr0vw60g6j5i7x293szhji3d4p7f54hxmz1aqw4y7fkr8f6"; depends=[crul geojson jqr jsonlite magrittr maptools readr rgeos sf sp V8]; }; + geojsonlint = derive2 { name="geojsonlint"; version="0.4.0"; sha256="0l6xlf6l9shyvdd2ghkhcgbkxpmycapfpxakzbvd92j1x8dmr9az"; depends=[crul jsonlite jsonvalidate V8]; }; + geojsonsf = derive2 { name="geojsonsf"; version="1.3.3"; sha256="0a1ij0nq5d4cvrmqs0mpnc2a1c4h9ms29yln9iay9qi5c5pjdd1k"; depends=[curl jsonify rapidjsonr Rcpp sfheaders]; }; geoknife = derive2 { name="geoknife"; version="1.6.3"; sha256="092in9wihgijhbkawzjqwfyazz22n4sc06x2gj14yvmp63x5dj36"; depends=[curl httr progress sp whisker xml2]; }; geomapdata = derive2 { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; }; - geomedb = derive2 { name="geomedb"; version="2.0.0"; sha256="1lrxhgrrx12irbk9rlvyqcvzhw842c4hp9mqw7gzqcldhpc40isd"; depends=[ape data_table httr jsonlite]; }; - geomerge = derive2 { name="geomerge"; version="0.3.1"; sha256="0pvyhpv4vq8mvvlybxhviq8rbazw29dgf9m0xnldaxg9r6lqdp4d"; depends=[geosphere ggplot2 gridExtra inlmisc lubridate raster scales sp spdep]; }; + geomerge = derive2 { name="geomerge"; version="0.3.2"; sha256="1i6n88k8icwihr9w7ipjb50f68zad602dipb3hd887y4kyf14wni"; depends=[geosphere ggplot2 gridExtra inlmisc lubridate raster scales sp spdep]; }; geometa = derive2 { name="geometa"; version="0.6-1"; sha256="0q06vj2r8xyiwrkrzixv0ymvwvznk2a6i2sdmykwyzm7vw7phwkw"; depends=[httr jsonlite R6 XML]; }; - geometr = derive2 { name="geometr"; version="0.1.1"; sha256="0bh8m76273vk2hnn2d4fbr9a89av0f8fnww9lfa1v392i56zfi2z"; depends=[checkmate crayon deldir dplyr raster Rcpp rgdal rlang sf sp spatstat tibble]; }; + geometr = derive2 { name="geometr"; version="0.2.4"; sha256="0r7cxc69fchrify0gsll4nzdbx5hcw8221y0q0yns5x10zqrscvk"; depends=[checkmate crayon deldir dplyr raster Rcpp readr rgdal rlang sf sp spatstat tibble]; }; geometry = derive2 { name="geometry"; version="0.4.5"; sha256="1n10l8ax3783v3lgaacb15qsn8b3f0wpmhg3k39j31s6ciyd3vcg"; depends=[linprog lpSolve magic Rcpp RcppProgress]; }; - geomnet = derive2 { name="geomnet"; version="0.2.0"; sha256="0xanzx8p34bac4zcf9j69nivwhllvsrw7x70mzgl95jhg3gvv96a"; depends=[dplyr ggplot2 network plotly readr sna tidyr]; }; - geomorph = derive2 { name="geomorph"; version="3.2.0"; sha256="0i9i9xcpiqfsh1gk8xar46q6bqv5vkv8kxshxq26wgpyysnls88a"; depends=[ape jpeg rgl RRPP]; }; + geomorph = derive2 { name="geomorph"; version="3.2.1"; sha256="0cndp449szvkmmm0lvz4dggg3xym6xycvx9iyhmmvmpm3qhpjlfg"; depends=[ape jpeg rgl RRPP]; }; geonames = derive2 { name="geonames"; version="0.999"; sha256="0yz1b7y3vwa4izrhpry4n3iwzb7y67s5p3kgnd7d29cl5pcbpmqx"; depends=[rjson]; }; geonapi = derive2 { name="geonapi"; version="0.3-1"; sha256="137g89qbwayd3iw4hfy85a40c8wyyhqd2qsrbqr6j5x155q39wlf"; depends=[geometa httr openssl R6 XML]; }; geonetwork = derive2 { name="geonetwork"; version="0.3"; sha256="0qjnv91rcxzw44fmbgm4qpcrbj5qgz1lgmyw53imyhxgyv55awxv"; depends=[geosphere igraph rgdal sf sp]; }; geoops = derive2 { name="geoops"; version="0.2.0"; sha256="0n9n0j849jbqv6y6lqhyhddr5zfz8i9yi03gpg9862nzkvxd3c4k"; depends=[Rcpp]; }; - geoparser = derive2 { name="geoparser"; version="0.1.2"; sha256="0vca4ijybqgk5dmbk0af4ykvbdkny8dm9d4frh5ikzk28hkvnlik"; depends=[digest dplyr httr jsonlite lazyeval purrr stringr tidyr]; }; geophys = derive2 { name="geophys"; version="1.4-1"; sha256="1s64sbr0chv0z2vaw059khfkv8iga1kr6428kkglgafq5x2d6h3q"; depends=[cluster GEOmap RFOC RPMG RSEIS]; }; - georob = derive2 { name="georob"; version="0.3-11"; sha256="1rl1wyr9splx58a1y8vgi2gmy9y6ngm4lydwbkp0fk77wiyv9s26"; depends=[abind constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; }; - geosample = derive2 { name="geosample"; version="0.2.1"; sha256="1gpzrsza8ys2jdazb2ixc70y1w5lrkahlmvws1i071zby1la01iy"; depends=[pdist sf sp splancs]; }; + georob = derive2 { name="georob"; version="0.3-13"; sha256="1ddynk8ss5jslxrwz7rg650d05qa5sh5qc3rzkrq8s4hpvw1zqgw"; depends=[abind constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; }; geosapi = derive2 { name="geosapi"; version="0.4-1"; sha256="00c2566r50v4vgqzjvghf4spyfqqxnwkhxj38ivym3l8b0d5fd2x"; depends=[httr openssl R6 XML]; }; geoscale = derive2 { name="geoscale"; version="2.0"; sha256="0gisds0in32xhw54fxfyxvwxgrfjs871wmqf6l915nr896rlx0bm"; depends=[]; }; geosed = derive2 { name="geosed"; version="0.1.1"; sha256="07j4q6sgrf83h2gi2j5qap5rifz8gimdacd3b7ld1p3b6ai6kv3r"; depends=[]; }; - geospacom = derive2 { name="geospacom"; version="0.5-8"; sha256="14qyjbq0n43c2zr9gp11gdqgarvmicx3gpq2ql2vjfzrmirxwjgg"; depends=[classInt geosphere maptools rgeos sp]; }; - geospark = derive2 { name="geospark"; version="0.2.1"; sha256="0r5zf80lb5jmqjahv7iszz8kr0983bwnb3cgrm78fg9fs3sv1sjn"; depends=[dbplyr dplyr sparklyr]; }; + geospark = derive2 { name="geospark"; version="0.3.1"; sha256="004axa0k9xg1hra8jihwgnc379k8pib1h0zkr82j0m9sii4wrk6r"; depends=[dbplyr dplyr sparklyr]; }; geosphere = derive2 { name="geosphere"; version="1.5-10"; sha256="15xlgsmn0vwky1l13n6acdz6jn2b2na3gf6x367y3qh1f5w4zkan"; depends=[sp]; }; geospt = derive2 { name="geospt"; version="1.0-2"; sha256="1814nn0naxvbn0bqfndpmizjbqcs6rm87g2s378axkn6qpii4bh8"; depends=[fields genalg gsl gstat limSolve MASS minqa plyr sgeostat sp TeachingDemos]; }; geosptdb = derive2 { name="geosptdb"; version="0.5-0"; sha256="0m0dlazhq2za71mi3q8mz2zvz7yrmda7lha02kh9n820bx89v33z"; depends=[FD fields geospt gsl limSolve minqa sp StatMatch]; }; - geostatsp = derive2 { name="geostatsp"; version="1.7.8"; sha256="1wjjwy365c6wlsxv9l50ph6drzmsyl0mkad36zrgzl9arxhnbkwx"; depends=[abind Matrix numDeriv raster sp]; }; + geostatsp = derive2 { name="geostatsp"; version="1.8.0"; sha256="0vn5zklrw3ds440babgzdm2k8z7pvdqsbwwwcg94d6l188v9mgd3"; depends=[abind Matrix numDeriv raster sp]; }; geotech = derive2 { name="geotech"; version="1.0"; sha256="18s7w6h1svc4n1hcgj5njfkf3nflkc53cdwsq5112p3442rlz33f"; depends=[]; }; geotools = derive2 { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; }; - geotoolsR = derive2 { name="geotoolsR"; version="1.0"; sha256="1arbyb1q96ya3smn9sqzqji5v21x37iyyxmvlmqmjj75an8ix5dp"; depends=[dplyr geoR ggplot2 tidyr]; }; - geotopbricks = derive2 { name="geotopbricks"; version="1.5.3"; sha256="06mi13gzilp844bramrly9ar52vs3747m3236g0bwjy3b7gqdq9c"; depends=[raster rgdal stringr zoo]; }; + geotoolsR = derive2 { name="geotoolsR"; version="1.1"; sha256="162s37j7wh14h91b6acn453bvgpk3cakfi7mgrdvr5bjdqqn7j7v"; depends=[dplyr geoR ggplot2 tidyr]; }; + geotopbricks = derive2 { name="geotopbricks"; version="1.5.4"; sha256="1mn15mchxkv9qqjrcsyx0pf56sdz0ba7i5jd1ci1ilr6rig81ckz"; depends=[raster rgdal stringr zoo]; }; + geouy = derive2 { name="geouy"; version="0.1.9"; sha256="180s3xkfyg281483x6kdh64ydlpd073xxrl7vakzymnm3qv83mql"; depends=[dplyr fs ggplot2 ggsn ggthemes glue raster rgdal rlang sf sp stringr xml2]; }; geoviz = derive2 { name="geoviz"; version="0.2.2"; sha256="1wx1p72532xpg6y3rlrvaiwx57xad3d9fvy9mbadvj418xwxnmim"; depends=[abind chron curl dplyr ggplot2 glue magrittr png progress purrr raster readr rgdal rgeos rgl rlang sf slippymath sp stringr tibble tidyr]; }; geozoning = derive2 { name="geozoning"; version="1.0.0"; sha256="0cqdi2jgqrxc339qkr57dp11jp40x99f9inwamnh7ymg2q7kq14s"; depends=[deldir fields ggplot2 gstat maptools RandomFields raster rgeos sp]; }; geozoo = derive2 { name="geozoo"; version="0.5.1"; sha256="0g91yhg7zw1bp0lxxblr2irckjg2rl4pg1vgglccnmxkzn0ji2qi"; depends=[bitops]; }; @@ -8218,7 +8317,7 @@ in with self; { gert = derive2 { name="gert"; version="0.3"; sha256="0caxjcdc2karsxasivkh5sasjkzlif25pw0whdjyq6zh3bvmdlkp"; depends=[askpass credentials openssl]; }; gesca = derive2 { name="gesca"; version="1.0.4"; sha256="1ndn8wgp22pr017x6v7jw8jy4gd06x8110qa860hw8i6pn47wfwv"; depends=[]; }; gestalt = derive2 { name="gestalt"; version="0.1.8"; sha256="1cb04rd3yvkd47byynrn0pq6brlsi2z2iavh4gfrwmqyvks34k51"; depends=[rlang]; }; - gestate = derive2 { name="gestate"; version="1.3.2"; sha256="1fr811f4d7zc75wxdrasd91wsa5ngzzb0p73ycy6lfwpm839i28q"; depends=[doParallel foreach shiny shinythemes survival survRM2]; }; + gestate = derive2 { name="gestate"; version="1.4.0"; sha256="1ybwi1733w8z97sdj38l66mb8ynhqhl68ijns6rvwqxphac6v5x8"; depends=[doParallel foreach shiny shinythemes survival]; }; getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.3.1"; sha256="1961w8vpgamna5a9m367mc9szl3vlv8wgmbhfjc0yxp818p07g3a"; depends=[curl data_table hoardr raster tibble]; }; getMet = derive2 { name="getMet"; version="0.3.2"; sha256="0j1h1vy8rd7czpnb4msdb9k560pnh7kjkmpqqwzwin2ms1c0mggb"; depends=[EcoHydRology jsonlite]; }; getPass = derive2 { name="getPass"; version="0.2-2"; sha256="03ydafhh0sk3rcnpr3paajyji64x2ddp6p814p9mvbmyrblcgzcc"; depends=[rstudioapi]; }; @@ -8226,21 +8325,21 @@ in with self; { getTBinR = derive2 { name="getTBinR"; version="0.7.0"; sha256="03xfi6cdsw5h7pmnzaxh9ig2j05jmyzzcjrslayanwdfwk370zas"; depends=[data_table dplyr ggplot2 ggthemes magrittr plotly purrr rlang scales tibble tidyr viridis]; }; gethr = derive2 { name="gethr"; version="0.1.0"; sha256="0kpi9b9yg2nh332zkml24pmj6vgjfh8mrfjjg5a636s2rg98g5g7"; depends=[httr jsonlite]; }; getlandsat = derive2 { name="getlandsat"; version="0.2.0"; sha256="15450v93lc4i2qda0zlb5vplwbarkmf3f6sb4rlrdpv9vlj85hff"; depends=[crul data_table rappdirs readr tibble xml2]; }; - getmstatistic = derive2 { name="getmstatistic"; version="0.2.0"; sha256="0rxj1dyfqy3fw2jhv05sw9x70p67rxmq3aqffymzal61rz6cnr3y"; depends=[ggplot2 gridExtra gtable metafor psych stargazer]; }; + getmstatistic = derive2 { name="getmstatistic"; version="0.2.1"; sha256="0jbg668kwkvnzgk6678w000mijch28ni9rr5b9c1l9icwcsphmlc"; depends=[ggplot2 gridExtra gtable metafor psych stargazer]; }; getopt = derive2 { name="getopt"; version="1.20.3"; sha256="0zzmzgwl9a4y3s34600vmih22d6y32294f9bvxrnmffnvkgmy7sk"; depends=[]; }; - gets = derive2 { name="gets"; version="0.21"; sha256="0frpfwb1sbbnhs1j77dlxrpsfl9nk6nyjg6aly0hn2vpi9p934ns"; depends=[zoo]; }; - getspres = derive2 { name="getspres"; version="0.1.0"; sha256="1y51l9bq5p025nyv37q7mmda7yw2qrw42dz50pwlrmi8h27l9zkf"; depends=[colorRamps colorspace dplyr metafor plotrix RColorBrewer]; }; - gettz = derive2 { name="gettz"; version="0.0.3"; sha256="1i06nfm824131q8lwwhrbzg2g9lbnmyp8k57w2vag7v8jj5rdrda"; depends=[]; }; - gexp = derive2 { name="gexp"; version="1.0-0"; sha256="0jasxyr9rwdj1lmsc5zr77kkzm4nci3pxgc4npr7j0wcim7k8lby"; depends=[jpeg mvtnorm png]; }; + gets = derive2 { name="gets"; version="0.22"; sha256="0k5lji4gglb1is3j2596yibr6cx4h82aslwcbm4hb6jjb76ajmcv"; depends=[zoo]; }; + getspres = derive2 { name="getspres"; version="0.1.1"; sha256="1k69b7by1398pc9knp97r3k6pv8hixzianqal71ggdrwsb3n1gis"; depends=[colorRamps colorspace dplyr metafor plotrix RColorBrewer]; }; + gettz = derive2 { name="gettz"; version="0.0.4"; sha256="1j83pdny3phfflkdjwiflyfvighn73pysw5bac4hx079dda8k25g"; depends=[]; }; + gexp = derive2 { name="gexp"; version="1.0-1"; sha256="1i3sarsawax1landjbm8gxrcrimwzdgrbybzipqwxdrmlgvxslqk"; depends=[jpeg mvtnorm png]; }; gfcanalysis = derive2 { name="gfcanalysis"; version="1.5.0"; sha256="1cg34c4hr8kwc23qlv2m6qw2k7ah4w8s70q0hf4hnvp66rw4kaqh"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; }; gfer = derive2 { name="gfer"; version="0.1.10"; sha256="1y0ra8k7zka43ibiii16vbwnc3m1i77yc9zj8rhzhmvhajjwad3l"; depends=[circlize data_table ggplot2 ggrepel googlesheets gsheet httr jsonlite rvest scatterpie stringi tidyr V8 xml2]; }; gfmR = derive2 { name="gfmR"; version="1.1-0"; sha256="0qzzbcra1fnbp0h31b1as20yhmqmi7p62xrhikj64an9avg9b277"; depends=[faraway nnet]; }; - gfoRmula = derive2 { name="gfoRmula"; version="0.2.1"; sha256="0hqjpav6zaxgk5mwx72qphcpc4gvm2072kl15419arr6aqf79kkq"; depends=[data_table ggplot2 ggpubr nnet stringr survival truncnorm truncreg]; }; + gfoRmula = derive2 { name="gfoRmula"; version="0.3.1"; sha256="1y1k5zwv06kc6qk7ki7x7c1618irvwd6iw26gs5n8lv8z3cifqmy"; depends=[data_table ggplot2 ggpubr nnet progress stringr survival truncnorm truncreg]; }; gg_gap = derive2 { name="gg.gap"; version="1.3"; sha256="0m66050ryn31xmsmmikjsssllasvjdmp9yjbwfdwfpwdv106zn9h"; depends=[cowplot ggplot2]; }; ggBubbles = derive2 { name="ggBubbles"; version="0.1.4"; sha256="116rl8j0s9xwhh9jl5yj9fspkhv2zrirbx9247hhns9ngrdn4i3x"; depends=[dplyr ggplot2]; }; ggChernoff = derive2 { name="ggChernoff"; version="0.2.0"; sha256="09bh9isvx3hwwvg72fv6z3fvp8dimpbhvbp328z8amq8jjhph4vf"; depends=[ggplot2 scales]; }; ggExtra = derive2 { name="ggExtra"; version="0.9"; sha256="18mbi6gblqmrsciad1d2c9ngllk6mayaqj43k40hjq9ydqnvjbgj"; depends=[colourpicker ggplot2 gtable miniUI R6 scales shiny shinyjs]; }; - ggPMX = derive2 { name="ggPMX"; version="1.0"; sha256="0cv99y4w2p8g0q2w1yv0fc5r2prwcniqlawks86z9avr7963ppmq"; depends=[assertthat checkmate data_table GGally ggplot2 gtable knitr magrittr R6 rmarkdown stringr yaml zoo]; }; + ggPMX = derive2 { name="ggPMX"; version="1.1"; sha256="0magxjrm6za9g1hhmykv47gh6lyc1zz7bffcrchxnybsv5mih9p8"; depends=[assertthat checkmate data_table GGally ggplot2 gtable knitr magrittr R6 rmarkdown stringr yaml zoo]; }; ggQC = derive2 { name="ggQC"; version="0.0.31"; sha256="1j9cs97hcj5zmqvn5rjr3gl0b9748s3pv2nb7v66dsyjdwvj7wyy"; depends=[dplyr ggplot2 tidyr]; }; ggQQunif = derive2 { name="ggQQunif"; version="0.1.5"; sha256="0vrxmqxy946mwdq0mb2m1ch41r0chrw7hcn18dr3mp10bv7pl7wj"; depends=[dplyr ggplot2 scales]; }; ggROC = derive2 { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; }; @@ -8250,58 +8349,63 @@ in with self; { ggTimeSeries = derive2 { name="ggTimeSeries"; version="1.0.1"; sha256="12gi0zfl8g3x78skpkhska8b3z1pp636shrbx33rkq0iacsipqga"; depends=[data_table ggplot2]; }; ggVennDiagram = derive2 { name="ggVennDiagram"; version="0.3"; sha256="1jgxzb3iffhx6xyn14nldljkaangdvzrxzfkibsb6g787fgv8ng9"; depends=[dplyr ggplot2 sf VennDiagram]; }; ggallin = derive2 { name="ggallin"; version="0.1.1"; sha256="0hrxa7m07ppvnndivxcgxksdyblb6fw17aw46maqavlvcrz3fjgm"; depends=[ggplot2 scales]; }; - ggalluvial = derive2 { name="ggalluvial"; version="0.11.1"; sha256="05c59w9rmp59ajw8ybr155c9xfxzlgc76xcnxh3890nh7nn7h0m1"; depends=[dplyr ggplot2 lazyeval rlang tidyr tidyselect]; }; + ggalluvial = derive2 { name="ggalluvial"; version="0.11.3"; sha256="19kad21rysh9f6fifd9drw9q90c3chpq33pip10zl2k1zl2wlif0"; depends=[dplyr ggplot2 lazyeval rlang tidyr tidyselect]; }; ggalt = derive2 { name="ggalt"; version="0.4.0"; sha256="0ssa274d41vhd6crzjz7jqzbwgnjimxwxl23p2cx35aqs5wdfjpc"; depends=[ash dplyr extrafont ggplot2 gtable KernSmooth maps MASS plotly proj4 RColorBrewer scales tibble]; }; ggamma = derive2 { name="ggamma"; version="1.0.1"; sha256="1zc4p2bz4pxqycrzgb9wwl53lxqcikxsihna6ff8pmw1n623j85z"; depends=[]; }; - gganimate = derive2 { name="gganimate"; version="1.0.4"; sha256="0z25fanxakc4vh67dnx99iygkxkpv8rjh9vlyypbwgy6rrg2mvpc"; depends=[ggplot2 glue plyr progress rlang scales stringi tweenr]; }; - ggasym = derive2 { name="ggasym"; version="0.1.2"; sha256="1nhsiamiv8dwn5cb2l7z7dzy46x6qcygxr2ncp0nqp6rnl7mh712"; depends=[broom corrr dplyr ggplot2 magrittr purrr rlang scales stringr tibble tidyr]; }; + gganimate = derive2 { name="gganimate"; version="1.0.5"; sha256="0kvz9gm56zz61bq7sky0m9mrlk8awjx0xm3yw9dawz1vw4a5fr3x"; depends=[ggplot2 glue plyr progress rlang scales stringi tweenr]; }; + ggasym = derive2 { name="ggasym"; version="0.1.3"; sha256="1vfwzjwmh27ki0j7nadmnl28wddjs4nzmraak868hmph9a2bjdgj"; depends=[dplyr ggplot2 magrittr purrr rlang scales stringr tibble tidyr]; }; ggbeeswarm = derive2 { name="ggbeeswarm"; version="0.6.0"; sha256="0crk29p5vi1r3a988kms4y7r0iqwgwzsikgvh18r9wbzyr98bb5v"; depends=[beeswarm ggplot2 vipor]; }; ggbuildr = derive2 { name="ggbuildr"; version="0.1.0"; sha256="0pld635v6fv46ky7s4icwxlcnr7z6bp5ikf20adpkljwhy0wwxak"; depends=[ggplot2 purrr readr]; }; + ggbump = derive2 { name="ggbump"; version="0.1.0"; sha256="15cnzv2q3gylkmd1zj044cp14ldnkc4fzwmxaqpc8cagwf9i10zk"; depends=[dplyr ggplot2 purrr tidyr]; }; + ggcharts = derive2 { name="ggcharts"; version="0.1.0"; sha256="0prv174ifhj4chp23r4wwmgkhw2g8q8chm2jixzbks2z08xqvahs"; depends=[dplyr ggplot2 magrittr patchwork rlang]; }; ggconf = derive2 { name="ggconf"; version="0.1.3"; sha256="0g4xasqhdiqfqahakv6p5npl56f2iakx4bnc9v9zcjr077kdda4n"; depends=[ggplot2 rly]; }; ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.3"; sha256="0hi9lz121ya1l2lbm7rqlxg6fs6bvxck396dngnidrhl5fvqb41b"; depends=[ggplot2 reshape2]; }; - ggdag = derive2 { name="ggdag"; version="0.2.1"; sha256="0cqshv72fd188z58k0df67i52x4ss764x28x7xn2m9f7cypnqw38"; depends=[dagitty dplyr forcats ggforce ggplot2 ggraph ggrepel igraph magrittr pillar plyr purrr stringr tibble tidygraph]; }; + ggdag = derive2 { name="ggdag"; version="0.2.2"; sha256="0gv7gf2bbrd0m1hjvk6j39ckyvxn5lj749q4fzlzzc5mxr3qdfyz"; depends=[dagitty dplyr forcats ggplot2 ggraph ggrepel igraph magrittr pillar purrr stringr tibble tidygraph]; }; ggdark = derive2 { name="ggdark"; version="0.2.1"; sha256="1w93g2j4g45x9s841v9zi18lxzda81ipa13fajqc6p9xk8frvgrf"; depends=[ggplot2]; }; ggdemetra = derive2 { name="ggdemetra"; version="0.2.1"; sha256="1d5adnamv2gnnj3q8779brl827d2zbqpkgfz2r097jndy5ng1021"; depends=[ggplot2 ggrepel gridExtra RJDemetra]; }; ggdendro = derive2 { name="ggdendro"; version="0.1-20"; sha256="1zzq1hxd0d1qa5hrzwfkdw6fzscpcafbwbpkrb62dm559y8awp0j"; depends=[ggplot2 MASS]; }; ggdistribute = derive2 { name="ggdistribute"; version="1.0.3"; sha256="07bsnfp1chf52gprw7g5kyqf6l6yzmnlv13x9dj1wa6rjwq1342i"; depends=[data_table dplyr ggplot2 magrittr tibble]; }; ggdmc = derive2 { name="ggdmc"; version="0.2.6.0"; sha256="1gncv7npl548k3zd41x2gwg5qywn5rp6zb4i7ga78sy77mvi3x92"; depends=[coda data_table ggplot2 matrixStats Rcpp RcppArmadillo]; }; gge = derive2 { name="gge"; version="1.4"; sha256="0plwk5j2n0309ghgn8r4ws3azwn7n4jb7yfykiiwwalhs3k05lsa"; depends=[nipals reshape2 rgl]; }; + ggeasy = derive2 { name="ggeasy"; version="0.1.2"; sha256="06rynzv6vqngay5cjrig550dfada66075qs69l4rpfqci0vh05km"; depends=[ggplot2 rlang]; }; ggedit = derive2 { name="ggedit"; version="0.3.0"; sha256="1v9apfkm47jcqyhjrvv8ig09gz6zsss5xj5mrckfjybd5ca08rzn"; depends=[colourpicker dplyr ggplot2 magrittr miniUI plyr purrr rlang rstudioapi scales shiny shinyAce shinyBS tidyr]; }; - ggeffects = derive2 { name="ggeffects"; version="0.14.0"; sha256="1djz82xww86h8f33m2vm40lliicppgyhm6hyn3h6rzrqjrlrsmdw"; depends=[insight magrittr MASS purrr sjlabelled sjmisc]; }; - ggenealogy = derive2 { name="ggenealogy"; version="1.0.0"; sha256="1wi29f7allky84w9w2512v8gs687gvypsbd7r4vyxs24l6pfssyc"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; }; - ggetho = derive2 { name="ggetho"; version="0.3.4"; sha256="05wh0qk5cbcvcfgj5wf12qqbjgl1bbwcxywc16qdby7r4h5wy0gn"; depends=[behavr data_table ggplot2 labeling rlang scales stringr]; }; + ggeffects = derive2 { name="ggeffects"; version="0.14.3"; sha256="06p80bgjhjknzlb4vs4n41i9n9vv5agncakl9f92zkaahgyzd6sd"; depends=[insight MASS sjlabelled]; }; + ggenealogy = derive2 { name="ggenealogy"; version="1.0.1"; sha256="19six9ln1yaqv268abm9qvb61nl8zdz3gghwr8hmwsa94xwhzhkq"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; }; + ggetho = derive2 { name="ggetho"; version="0.3.5"; sha256="1gwd4mkja2xypzm2c1w61lq126cn1fdcw8l8gkzsl2ljn2xd2phi"; depends=[behavr data_table ggplot2 labeling rlang scales stringr]; }; ggfan = derive2 { name="ggfan"; version="0.1.3"; sha256="1p3hbznpsaznlk0lnjyazc130www0p5919qplg3kspng7qh8p22w"; depends=[colorspace dplyr ggplot2 rstan]; }; ggfittext = derive2 { name="ggfittext"; version="0.8.1"; sha256="1a5k8fba2qjxnpd14vqkakpzcwkzqbpvs8h6fb9zh62y91n6p26v"; depends=[ggplot2 shades stringi]; }; ggfocus = derive2 { name="ggfocus"; version="1.0.0"; sha256="03q0rz7flm8sc8hrlkcm5fz66qiyxb8z8q4bh9dglhw0jc8q1fvb"; depends=[dplyr ggplot2 magrittr RColorBrewer rlang]; }; ggforce = derive2 { name="ggforce"; version="0.3.1"; sha256="04926cqrda6psvy2nzkkw4czwyxdp7fnxg76byp14v12kgd72lm0"; depends=[ggplot2 gtable MASS polyclip Rcpp RcppEigen rlang scales tidyselect tweenr withr]; }; - ggformula = derive2 { name="ggformula"; version="0.9.2"; sha256="16ycabhnp78fsiv1dc63ccgh9gmpsy2683vbmq0fdzl6w3pd87sr"; depends=[ggplot2 ggstance magrittr mosaicCore rlang stringr tibble tidyr]; }; - ggfortify = derive2 { name="ggfortify"; version="0.4.8"; sha256="191q2z7w0l4v7swjlxs2hjgbjngw2838688s7ygnj0kigsm310f3"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; }; + ggformula = derive2 { name="ggformula"; version="0.9.4"; sha256="04vdhg1bbc1psrx9ggaphz7cx4fw5xsmhkqpqfcg2w4ba2bjy46f"; depends=[ggforce ggplot2 ggstance magrittr mosaicCore rlang stringr tibble]; }; + ggfortify = derive2 { name="ggfortify"; version="0.4.9"; sha256="1p6knrbyaynaqwd939w09hpf1zz1gn95cb46sfgppl8l98krb2h5"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; }; gggenes = derive2 { name="gggenes"; version="0.4.0"; sha256="13hrjh80rlri8vm736p85v2jwwpck8gc5jfps1qrqcq86kv2xgkn"; depends=[ggfittext ggplot2 rlang]; }; ggghost = derive2 { name="ggghost"; version="0.2.1"; sha256="0kvsjadxxdf6yvzk4a6yqkg02q1ysslvf3m0a369bdim396z4hnv"; depends=[animation ggplot2]; }; gggibbous = derive2 { name="gggibbous"; version="0.1.0"; sha256="1g6igmj2nh4b516p1wcs1cwgzdnawvf3snxzwxjkmdc4yqbzyz24"; depends=[ggplot2 scales]; }; ggguitar = derive2 { name="ggguitar"; version="0.1.1"; sha256="1lmfs54h91gzcxin37v4flkywbq3fs648mm1h9ak03xlj5nagzsi"; depends=[dplyr ggplot2 gridExtra lazyeval readr tibble]; }; gghalfnorm = derive2 { name="gghalfnorm"; version="1.1.2"; sha256="1sy0m6pqmnjbqv60rljyblhis0dxwkhw751jhlad5arcgrcwf4k8"; depends=[ggplot2 ggrepel]; }; - gghalves = derive2 { name="gghalves"; version="0.0.1"; sha256="03s1wrfgkd55zmf3scv6kp32s3lcpbm5prnc5ndgad43zq8jyi09"; depends=[ggplot2 gtable]; }; - gghighlight = derive2 { name="gghighlight"; version="0.2.0"; sha256="1500lv7lsf2aaw4jny61apx62nnj76mnwfvr8kl3qidip53cah48"; depends=[dplyr ggplot2 ggrepel lifecycle magrittr purrr rlang scales tibble]; }; - ggimage = derive2 { name="ggimage"; version="0.2.7"; sha256="01yymg5q4bjnchlxpc7yjskjaz1bkf707fvr01kn18cr4bb606mg"; depends=[ggplot2 ggplotify jsonlite magick rvcheck scales tibble]; }; - gginference = derive2 { name="gginference"; version="0.1.0"; sha256="0dikyqryz25ikm047clkwn0ihlxa5zia2bxp71fh8ynxxvzixz3k"; depends=[ggplot2 rlang]; }; + gghalves = derive2 { name="gghalves"; version="0.1.0"; sha256="17adlc7p8visbjn2camia6z4mnxxkiij16lbqrjbkrxb8j8m3b78"; depends=[ggplot2 gtable]; }; + gghighlight = derive2 { name="gghighlight"; version="0.3.0"; sha256="13zs3wy1zm1h1zdh0lpp19fw54giswnqbxxcimz9iyzbpg3da9va"; depends=[dplyr ggplot2 ggrepel lifecycle purrr rlang tibble]; }; + ggimage = derive2 { name="ggimage"; version="0.2.8"; sha256="0p2bbcw1fwzpfnmdq2h9h18xka9jrzfd2v705rbniv8nas0ga14d"; depends=[ggplot2 ggplotify jsonlite magick rvcheck scales tibble]; }; + ggimg = derive2 { name="ggimg"; version="0.1.0"; sha256="0lgak04690xvy0j1g8rgbj9x81ychkx6hp1f8d92piz432wb1z71"; depends=[abind ggplot2 jpeg png]; }; + gginference = derive2 { name="gginference"; version="0.1.1"; sha256="1nla93arkq68j6w56y4p6mj4i8j6rg8rpl0p2yhdzcq8bgzkqym8"; depends=[ggplot2 rlang]; }; gginnards = derive2 { name="gginnards"; version="0.0.3"; sha256="15ly88wjsd2fqvp483376rm2fczcbmj1s1vagb70z9z7968407xy"; depends=[ggplot2 magrittr rlang stringr tibble]; }; ggiraph = derive2 { name="ggiraph"; version="0.7.0"; sha256="1002mf2dp7ram5yrj9qlg9rawz083k130k6bjvdidq0x800ps7b4"; depends=[gdtools ggplot2 htmltools htmlwidgets purrr Rcpp rlang uuid xml2]; }; ggiraphExtra = derive2 { name="ggiraphExtra"; version="0.2.9"; sha256="1qmw7z10h1x6xnlpq7shafg6w2bal8ni02c07fyy9f7hm02xfnzs"; depends=[dplyr ggforce ggiraph ggplot2 magrittr mgcv mycor plyr ppcor purrr RColorBrewer reshape2 scales sjlabelled sjmisc stringr tidyr webshot ztable]; }; ggjoy = derive2 { name="ggjoy"; version="0.4.1"; sha256="012md2m0jqfcccb933j423m3ck31v3p0pd41gjxpyg9082y7ixyj"; depends=[ggplot2 ggridges]; }; - gglasso = derive2 { name="gglasso"; version="1.4"; sha256="0r4zfgkys8104iw1vzww3qid8a6dyn03x0jlgwrdvavfj86yhq54"; depends=[]; }; - gglogo = derive2 { name="gglogo"; version="0.1.4"; sha256="0yqjafak83rjbxydqlkys68yvpakjqhdlh2b4rk94wsb40j5kq4p"; depends=[dplyr ggplot2 jpeg knitr magrittr plyr purrr reshape2]; }; + gglasso = derive2 { name="gglasso"; version="1.5"; sha256="12l0ac1n54z41yw7c00fm6q2mjmhp9blk4f8vp7q2my2xxwh1fmj"; depends=[]; }; + gglogo = derive2 { name="gglogo"; version="0.1.5"; sha256="08wg0svcksdzchp6bdllmsnklxia3d0ygqwzgmqb2sga8nbkf5hl"; depends=[dplyr ggplot2 jpeg knitr magrittr plyr purrr reshape2 rlang tidyr]; }; ggloop = derive2 { name="ggloop"; version="0.1.0"; sha256="0jpbgb16jfsv557zvishln98y7nd6p1ryp6hxkrkmhp9p35vzvc0"; depends=[assertthat ggplot2 lazyeval magrittr plyr]; }; gglorenz = derive2 { name="gglorenz"; version="0.0.1"; sha256="0ar9ih6yvxb5pyba8y8jjsbwaq808baysjhpd15psjzhfbimjqfm"; depends=[ggplot2 ineq]; }; - ggm = derive2 { name="ggm"; version="2.3"; sha256="1n4y459x2i0jil8chjjqqjs28a8pzfxrws2fcjkg3il7zy0zwbw3"; depends=[igraph]; }; + ggm = derive2 { name="ggm"; version="2.5"; sha256="11wc6k2kj2ydy0dyks5mbvbhxm1r43id87anl1jg6dn0yv4m78di"; depends=[graph igraph]; }; ggmap = derive2 { name="ggmap"; version="3.0.0"; sha256="13dmzl6z62pzjiffilarkji46vy0sacxa8a7mhrhc3biq3ylzhln"; depends=[bitops digest dplyr ggplot2 glue httr jpeg magrittr plyr png purrr RgoogleMaps rjson scales stringr tibble tidyr]; }; - ggmcmc = derive2 { name="ggmcmc"; version="1.3"; sha256="0p3akjbi0044nma8ynvqa42bkrgrb0jjx323k2pbrnlkq8x3ma1b"; depends=[dplyr GGally ggplot2 tidyr]; }; + ggmcmc = derive2 { name="ggmcmc"; version="1.4.1"; sha256="05dsxp5694hljbjz13gpb4f9sxv5jphsihza101ck08yzgn6kpvf"; depends=[dplyr GGally ggplot2 tidyr]; }; + ggmix = derive2 { name="ggmix"; version="0.0.1"; sha256="19dp4ic3mxrqdzr0hi44fm2axfi2b693k4xfs28h664123c9kyvn"; depends=[glmnet MASS Matrix]; }; ggmosaic = derive2 { name="ggmosaic"; version="0.2.0"; sha256="0byhp7125r015wbbnv6fq13bx38krf11r39jx9dzbr0ci6kqzkdb"; depends=[dplyr ggplot2 plotly productplots purrr rlang tidyr]; }; ggmr = derive2 { name="ggmr"; version="0.1.1"; sha256="0941rvh7m5knlhp0m0mhm4j8spmch0pyvwhzs3bycq3vzlvzv1w7"; depends=[MASS]; }; ggmsa = derive2 { name="ggmsa"; version="0.0.2"; sha256="1ryzifcm1qsqng5gljdhgx6p81i8wg9s86j9bnlcllp0d6mbca2x"; depends=[Biostrings ggplot2 ggseqlogo magrittr tidyr treeio]; }; ggmuller = derive2 { name="ggmuller"; version="0.5.4"; sha256="0y7bm9fm5i8acpy6fa903ca2r9yasky7kg2hicm4xz5ni09jm20x"; depends=[ape dplyr ggplot2]; }; - ggnetwork = derive2 { name="ggnetwork"; version="0.5.1"; sha256="13qisn4msjzkpcmn7rh2c4ymqfxp9bayrvqngp9pysfmr6wvc6ia"; depends=[ggplot2 ggrepel network sna]; }; - ggnewscale = derive2 { name="ggnewscale"; version="0.4.0"; sha256="0w9lykxdrifm69mr157x1hirz37ws9m5lpmxaqbfq5picqyvplsx"; depends=[ggplot2 stringi]; }; + ggnetwork = derive2 { name="ggnetwork"; version="0.5.8"; sha256="1gdvywx2n4ph0dr8q1c5gfsmv4jjy0g41cnhjn68kkmg5fdc3ix8"; depends=[ggplot2 ggrepel igraph network sna]; }; + ggnewscale = derive2 { name="ggnewscale"; version="0.4.1"; sha256="1ryg0zs5qa2gjch3c21ylwwzr6kqbla2jpwfkrwbqbgjryhbphlm"; depends=[ggplot2]; }; ggnormalviolin = derive2 { name="ggnormalviolin"; version="0.1.2"; sha256="1gbv2b86nznw5bs05c4ns96b8hsxkhikhcf8syl2qbbafzy8vx6y"; depends=[dplyr ggplot2 magrittr scales]; }; ggpage = derive2 { name="ggpage"; version="0.2.3"; sha256="1qi8ydq3fxb1smk0jg9z1cv2xjq8c1lsnmz8l7c61rvdbjm3710v"; depends=[dplyr ggplot2 magrittr purrr rlang stringr tidytext]; }; ggparallel = derive2 { name="ggparallel"; version="0.2.0"; sha256="0zxaff0jbqkbavsmh1yyp3vdrxsam6a66hjw8lamv9pksdw1s2wf"; depends=[ggplot2 plyr reshape2]; }; @@ -8309,26 +8413,27 @@ in with self; { ggparty = derive2 { name="ggparty"; version="1.0.0"; sha256="0s6hr5p930kl3pj6ajwgwqz6yikc3l9hhzy1yn0nqc0r8pp2jyqf"; depends=[checkmate ggplot2 gtable partykit rlang survival]; }; ggperiodic = derive2 { name="ggperiodic"; version="1.0.0"; sha256="1cig715qy1kjjrn89cf505njdl2xccvjc5l0fwbqh86xgjayslxb"; depends=[data_table dplyr ggplot2 sticky tidyselect]; }; ggplot_multistats = derive2 { name="ggplot.multistats"; version="1.0.0"; sha256="1afzfa86vc484bcwpg7m1ky03jpax584rigzgai8w06pifkmz0il"; depends=[ggplot2 hexbin rlang scales]; }; - ggplot2 = derive2 { name="ggplot2"; version="3.2.1"; sha256="0mjswqiqcwm0aqxll16bx2kwa6c9km3aql87bdj4347n1ali94g3"; depends=[digest gtable lazyeval MASS mgcv reshape2 rlang scales tibble viridisLite withr]; }; + ggplot2 = derive2 { name="ggplot2"; version="3.3.0"; sha256="0j21am605kqqzlwhm45kaj0m2irnmy2vz0j7kzi9f0qdzrv3q3ij"; depends=[digest glue gtable isoband MASS mgcv rlang scales tibble withr]; }; ggplot2movies = derive2 { name="ggplot2movies"; version="0.0.1"; sha256="067ld6djxcpbliv70r2c1pp4z50rvwmn1xbvxfcqdi9s3k9a2v8q"; depends=[]; }; ggplotAssist = derive2 { name="ggplotAssist"; version="0.1.3"; sha256="1g0s1dkbrxmwqjqppagdbnx24s0nbjn09xwxix3dkfssz6drhala"; depends=[dplyr editData gcookbook ggplot2 ggthemes magrittr miniUI moonBook rstudioapi scales shiny shinyAce shinyWidgets stringr tibble tidyverse]; }; ggplotgui = derive2 { name="ggplotgui"; version="1.0.0"; sha256="1yfglg5438mwyml845isimzma5q6824x19jka509ng49bzmf1za0"; depends=[ggplot2 haven plotly RColorBrewer readr readxl shiny stringr]; }; - ggplotify = derive2 { name="ggplotify"; version="0.0.4"; sha256="0nv3wdmxnc5ww9m3xlgnb0jp30j45dg33nqc6gg3y36svg8anjcg"; depends=[ggplot2 gridGraphics rvcheck]; }; + ggplotify = derive2 { name="ggplotify"; version="0.0.5"; sha256="0pfnp4lrissf21z7867kdm6slr979kchyva8iaf83i1302kscph3"; depends=[ggplot2 gridGraphics rvcheck]; }; ggplotlyExtra = derive2 { name="ggplotlyExtra"; version="0.0.1"; sha256="1m2rhylpzj934gb50lxjp47rxz0kwl9i1p3n7w1rz4qi96pr5p1c"; depends=[ggplot2 plotly rlang]; }; - ggpmisc = derive2 { name="ggpmisc"; version="0.3.3"; sha256="1m5ajcy6l8gb2h2ph32ij9dgn6fqpcsf9nf5dr5gas7a15ihpcas"; depends=[broom dplyr ggplot2 gridExtra lubridate magrittr MASS plyr polynom rlang scales splus2R stringr tibble xts zoo]; }; + ggpmisc = derive2 { name="ggpmisc"; version="0.3.4"; sha256="0xc1yp0kphipq23ri4ij93garx1x2nrf4i0lhs6m10pp9yz7fbmj"; depends=[broom dplyr ggplot2 gridExtra lubridate magrittr MASS plyr polynom rlang scales splus2R stringr tibble xts zoo]; }; ggpointdensity = derive2 { name="ggpointdensity"; version="0.1.0"; sha256="0c9a14j3b0hvamqylhzldw2hjdxmfbllwahjkf3gg2rw337ld9iy"; depends=[ggplot2]; }; - ggpol = derive2 { name="ggpol"; version="0.0.5"; sha256="0n54mmk9alc3bd9q3jb64xvxnszqndfwpi6h6n09gpvlrbj8mkdx"; depends=[dplyr ggplot2 gtable plyr rlang]; }; + ggpol = derive2 { name="ggpol"; version="0.0.6"; sha256="1316g0y0i4nm4nsa422pbrv4w3g0rv1jxy6m7qasarq2mml9lxjs"; depends=[dplyr ggplot2 glue gtable plyr rlang tibble]; }; ggpolypath = derive2 { name="ggpolypath"; version="0.1.0"; sha256="0g9zfal3vqcx16fi4abxm6l5sam475lk1f6bdik487wc2v0dkq83"; depends=[ggplot2]; }; - ggpubr = derive2 { name="ggpubr"; version="0.2.4"; sha256="0ln1gh3zlfx5s7zqcpvfdiksq74v1pma5kwkhc6r0riqnjjd19pf"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif glue gridExtra magrittr polynom purrr rlang scales tidyr]; }; + ggpubr = derive2 { name="ggpubr"; version="0.2.5"; sha256="0kb3hpmnhj4mkbx1kx0kv5y22himr8dijqx7ra0h8hi0pf2l2ha7"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif glue gridExtra magrittr polynom purrr rlang scales tidyr]; }; ggpval = derive2 { name="ggpval"; version="0.2.3"; sha256="04s0pwi0pljdd8r6wnjyb3i3php6qgvpc1mdvhywcx2i2zqip2qx"; depends=[data_table ggplot2]; }; - ggquickeda = derive2 { name="ggquickeda"; version="0.1.5"; sha256="13kszfsxnpbkcn3lnlcmrw5a0c3ny8gv9dn4ciphl40rk7qpi26v"; depends=[colourpicker dplyr DT Formula GGally ggplot2 ggpmisc ggpubr ggrepel ggstance gridExtra Hmisc lazyeval markdown plotly quantreg rlang scales shiny shinyjs stringr survival survminer table1 tidyr]; }; + ggquickeda = derive2 { name="ggquickeda"; version="0.1.6"; sha256="1yj1gfl7hvshjp5gqm1jgrfvnnvrn32zkv5d2il41hmp8hp71y2d"; depends=[colourpicker dplyr DT Formula GGally ggplot2 ggpmisc ggpubr ggrepel ggstance gridExtra Hmisc lazyeval markdown plotly quantreg rlang scales shiny shinyjqui shinyjs stringr survival survminer table1 tidyr]; }; ggquiver = derive2 { name="ggquiver"; version="0.2.0"; sha256="1hsayqxf4brck1rx97yyprw1axc83lksgf7mn3rh8hqx4h1f5f0f"; depends=[dplyr ggplot2]; }; - ggraph = derive2 { name="ggraph"; version="2.0.0"; sha256="0qj7w3af0pgmd9mil6y571jikfkln7b8csvzg6b08spwbglfy1s3"; depends=[digest dplyr ggforce ggplot2 ggrepel graphlayouts gtable igraph MASS Rcpp rlang scales tidygraph viridis]; }; + ggraph = derive2 { name="ggraph"; version="2.0.2"; sha256="1ckq82hg52vr2wydkqv2wrppgjyvddd6bwqzrngqlm7j71xapjl0"; depends=[digest dplyr ggforce ggplot2 ggrepel graphlayouts gtable igraph MASS Rcpp rlang scales tidygraph viridis]; }; ggraptR = derive2 { name="ggraptR"; version="1.2"; sha256="18r70pnz7x8728lg447ds7swgk539gga9shax7rs4x56a710pf3q"; depends=[dplyr ggplot2 pacman purrr shiny]; }; ggrasp = derive2 { name="ggrasp"; version="1.0"; sha256="0lini89mcxl30kx38vny9896hdf4afrz5dgivbbikkb2yyfh2cq1"; depends=[ape bgmm colorspace ggplot2 mixtools]; }; - ggrepel = derive2 { name="ggrepel"; version="0.8.1"; sha256="10vjrcmx8yknfbx93d9a4y3z8gafri0fhimw6hcq733dmdvkml6m"; depends=[ggplot2 Rcpp scales]; }; + ggrepel = derive2 { name="ggrepel"; version="0.8.2"; sha256="1qaifn3dazdqbqlii210xhw7yf142iw7g9p2axmmxbz90p0by08d"; depends=[ggplot2 Rcpp scales]; }; ggridges = derive2 { name="ggridges"; version="0.5.2"; sha256="03pz257aw0mkh5k75rby9givkc1ky3n5scvhjhjiz9vry9fpffmh"; depends=[ggplot2 plyr scales withr]; }; - ggroups = derive2 { name="ggroups"; version="1.2.1"; sha256="159bzdck1npcp3spfi3ash1y5zhga9y0fbgw5vzrkayqrw4ayx4n"; depends=[]; }; + ggrisk = derive2 { name="ggrisk"; version="1.0"; sha256="02a11q0mz3a5qqssakys8jxy5rqmi6cwk6japv65fkz741fh65wx"; depends=[cutoff do egg fastStat ggplot2 nomogramFormula rms set survival]; }; + ggroups = derive2 { name="ggroups"; version="2.0.3"; sha256="1qlx1jfmmpygswwbrqs7pxm426zggxgvd4q3jp9abfaq9aczs10p"; depends=[]; }; ggsci = derive2 { name="ggsci"; version="2.9"; sha256="0g73x6grbka7ahjh6z23m3wrcifp5rdfdiasbl8lq4sp6rplxwaa"; depends=[ggplot2 scales]; }; ggseas = derive2 { name="ggseas"; version="0.5.4"; sha256="1jpdijwll5l7bg7cmjnklkxffysi9ckzg50rw2a2cd00zwby11q9"; depends=[ggplot2 rlang seasonal zoo]; }; ggseqlogo = derive2 { name="ggseqlogo"; version="0.1"; sha256="13q6kcpxrqxqbji889fx63p0nsi08lk5yymkchig75r5k1d18ky1"; depends=[ggplot2]; }; @@ -8339,40 +8444,42 @@ in with self; { ggsom = derive2 { name="ggsom"; version="0.4.0"; sha256="0qsih00rm3ng2zh6p2s7a35rh1qlvbkn82s53v765w60fjmhwkwf"; depends=[assertthat data_table dplyr entropy ggplot2 kohonen magrittr tibble tidyr]; }; ggspatial = derive2 { name="ggspatial"; version="1.0.3"; sha256="0ka15qj3f0yq9nfkgk77wp490nz9ymi80918apv9zp6x39kcprj9"; depends=[abind ggplot2 plyr raster reshape2 rlang rosm scales sf tibble tidyr]; }; ggspectra = derive2 { name="ggspectra"; version="0.3.5"; sha256="0pvkh4cr9nyhhv9ikjs7nhjagal63k8zfbik28cmw2c2x31m019v"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands scales tidyr]; }; - ggstance = derive2 { name="ggstance"; version="0.3.3"; sha256="0kdksay61hyb6612b07r84chh7a9aibjyclk3qcypvr9aang8hkh"; depends=[ggplot2 plyr rlang withr]; }; - ggstatsplot = derive2 { name="ggstatsplot"; version="0.1.4"; sha256="09dzph9h4zj6msz9d5dn7g8rbvl5781gagsad5hfjqn8m7vc1a47"; depends=[broomExtra cowplot crayon dplyr forcats ggcorrplot ggExtra ggplot2 ggrepel ggsignif groupedstats insight metaBMA metafor pairwiseComparisons paletteer parameters psych purrr rlang scales statsExpressions tibble tidyr WRS2]; }; + ggstance = derive2 { name="ggstance"; version="0.3.4"; sha256="0aqz3dn02cgij018a4sglqwrwr9dzzj12l8xr1064q7hfd4f64m1"; depends=[ggplot2 plyr rlang withr]; }; + ggstar = derive2 { name="ggstar"; version="0.0.4"; sha256="02mvbp3pdx90b36nwpm975h0c11vza9177h3pym9nqxyx2dp72qa"; depends=[ggplot2 gridExtra scales]; }; + ggstatsplot = derive2 { name="ggstatsplot"; version="0.4.0"; sha256="01hyrhpbz5ggpy7r26z9dgfc56972kzj8x8awvsr634l522lwa7g"; depends=[broomExtra correlation cowplot dplyr ggcorrplot ggExtra ggplot2 ggrepel ggsignif groupedstats insight ipmisc pairwiseComparisons paletteer purrr rlang statsExpressions tidyr]; }; ggswissmaps = derive2 { name="ggswissmaps"; version="0.1.1"; sha256="0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4"; depends=[ggplot2]; }; - ggtern = derive2 { name="ggtern"; version="3.1.0"; sha256="1fhs5s3sxhb46abzni7cyymyknk9z7ff8fanln41pkih76s5i18j"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; }; + ggtern = derive2 { name="ggtern"; version="3.3.0"; sha256="12lxmql9zspglp0baqp419l0vgilrf8lyxsza142bfyvmdbhh6d3"; depends=[compositions ggplot2 gridExtra gtable hexbin latex2exp lattice MASS plyr proto scales]; }; ggthemes = derive2 { name="ggthemes"; version="4.2.0"; sha256="0rrkzfggc1nlda1w1lbqdycx6nawxbkac1szhvkwrqlzh6agxcsv"; depends=[ggplot2 purrr scales stringr tibble]; }; - ggupset = derive2 { name="ggupset"; version="0.1.0"; sha256="157dqwc185y2nqrqka0b14im7k1yzj8swr0jaxz46xxm0qgqk8cc"; depends=[ggplot2 gtable rlang scales tibble]; }; + ggupset = derive2 { name="ggupset"; version="0.2.1"; sha256="1hqd1csli8iifxdghkvbyrjal7h4dd92ya287llaa2v4wdsqa1hm"; depends=[ggplot2 gtable rlang scales tibble]; }; ggversa = derive2 { name="ggversa"; version="0.0.1"; sha256="0xqn8iznrm8q30pxwka88wi1z7lndi6lm12rq6ngcaxf294fbz01"; depends=[]; }; ggvis = derive2 { name="ggvis"; version="0.4.5"; sha256="091i9f17912j8qcyxppjgwzjnyqj7769ixs9d2gjg6f2clskqdw2"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; }; ggvoronoi = derive2 { name="ggvoronoi"; version="0.8.3"; sha256="04dv33vnip0rrli1diq43v7vhr86bmxjdyxjbxz5x4371kbb312j"; depends=[deldir ggplot2 raster rgeos sp]; }; ggwordcloud = derive2 { name="ggwordcloud"; version="0.5.0"; sha256="0mr92738s3j9wm6mkr5hd2flqsqw3vfjifv3fajsygysbwrl8dn8"; depends=[colorspace ggplot2 png Rcpp scales]; }; gh = derive2 { name="gh"; version="1.1.0"; sha256="1bc9bn1078s664hc806dh0y1ncxif77q479rfmxfir9z7hwaz7yy"; depends=[cli httr ini jsonlite]; }; - ghibli = derive2 { name="ghibli"; version="0.3.0"; sha256="1527225yp9czmq7y1r08jvzwhxdxi50n5szay92hl9ln829x9phh"; depends=[]; }; - ghyp = derive2 { name="ghyp"; version="1.5.8"; sha256="0ncaib6k4z02p3lw4c0l5b7dhxjylmqxqbx96kgj7z1na6jkvmf3"; depends=[MASS numDeriv]; }; - gibble = derive2 { name="gibble"; version="0.2.0"; sha256="11fhswszdgackwkvals4k7pn8syfphkwvfx7kiv7psnsr94q376n"; depends=[dplyr rlang tibble]; }; + ghibli = derive2 { name="ghibli"; version="0.3.2"; sha256="0762dy3x7w0q1swag2lh33cpqdr9bbqw0963ymdpnchawdh5m50z"; depends=[prismatic]; }; + ghql = derive2 { name="ghql"; version="0.1.0"; sha256="19awg98r2hwwwwrwh0166y8ij1clf58vrf02i8fhhfzddx3an6bz"; depends=[crul graphql jsonlite R6]; }; + ghyp = derive2 { name="ghyp"; version="1.6.0"; sha256="10v35slafbnxhjbv30vi784zw3jp1zaz4pp65jb9nw4f0vch3anc"; depends=[MASS numDeriv]; }; + gibble = derive2 { name="gibble"; version="0.3.0"; sha256="19sj32jbq12a8zf03a39yqj8jln53nhb4b2v3khbq60nr9bxlm1r"; depends=[dplyr rlang tibble]; }; gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; }; gifski = derive2 { name="gifski"; version="0.8.6"; sha256="00w4bzp0rrp4isy1rnxs6g1q07r3wndadk3mqdrxk2wxi7jmghna"; depends=[]; }; gifti = derive2 { name="gifti"; version="0.7.5"; sha256="1y64bc33b5f64a4khp916s9zb7kbb24xgdg3pdlh0f8m6zrbmp4a"; depends=[base64enc R_utils xml2]; }; gim = derive2 { name="gim"; version="0.28.0"; sha256="1m9pb3dcphyjmadxr87lrd4fb2jacrx2mmcgrvqzc16gfm66n6d5"; depends=[numDeriv]; }; - gimme = derive2 { name="gimme"; version="0.6-1"; sha256="1ipak83ma1fl24snsd7xlbbhgv67m03r3g8xh9rhvmr6ajag7ada"; depends=[data_tree igraph imputeTS lavaan MIIVsem qgraph]; }; + gimme = derive2 { name="gimme"; version="0.7-1"; sha256="117157nyyyzb102cs2in7s44dl3v6d0aqbfyybq4rqb5cqqmfsvj"; depends=[data_tree igraph imputeTS lavaan MIIVsem nloptr qgraph]; }; gimmeTools = derive2 { name="gimmeTools"; version="0.1"; sha256="1g170rz3c3qx27yy67f7xab4gkm0pbbvwlwkcsczfxphad609ryl"; depends=[easycsv magrittr miniUI rhandsontable rintrojs rstudioapi shiny shinyjs shinyWidgets]; }; - gimms = derive2 { name="gimms"; version="1.1.1"; sha256="06vq0apsadyfgnz7906v2kjy0nx3yn0agq4yschxz1r1zmgrnyki"; depends=[curl Kendall ncdf4 raster RCurl zyp]; }; + gimms = derive2 { name="gimms"; version="1.1.3"; sha256="0ij252zz75nfngh5idzznrdi4jn1ymbn24s6qilpf2qf8zilh89i"; depends=[curl Kendall ncdf4 raster zyp]; }; giphyr = derive2 { name="giphyr"; version="0.2.0"; sha256="0273f7lama8bhaalafs66m6ksp32vx0j6rmh1qr4484i7wkmdfqn"; depends=[dplyr httr miniUI purrr rstudioapi shiny tibble]; }; gistr = derive2 { name="gistr"; version="0.5.0"; sha256="07k9p5sfy0k45frx63dwp6pk3gyh5zdv79f4knsciakk6xq9ds59"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; }; git2r = derive2 { name="git2r"; version="0.26.1"; sha256="0dbl845sahv2i641ncaf06w06djravwc5wknp9syzx0ad8l0kmhk"; depends=[]; }; - git2rdata = derive2 { name="git2rdata"; version="0.2.0"; sha256="1hzvr1h6rbqqf69xkjc1c2x3c5wqp8za40yim7vd7sb398f1iq4q"; depends=[assertthat git2r yaml]; }; + git2rdata = derive2 { name="git2rdata"; version="0.2.1"; sha256="11mdalfgarqscb6yg0p9g4mwzwnbkq40migpv5sk0i3vdz0xpapp"; depends=[assertthat git2r yaml]; }; gitgadget = derive2 { name="gitgadget"; version="0.5.2"; sha256="0la0x3p50wk5wv2p4vkf3rh72psz3k18lcymxn354nqb7m1xdggs"; depends=[callr curl dplyr jsonlite markdown miniUI rstudioapi shiny shinyFiles usethis]; }; githubinstall = derive2 { name="githubinstall"; version="0.2.2"; sha256="0hqh86r2007hzdbm8rr0fwqhhsna7ji8sdgmdnrxkxraa5f2pfz3"; depends=[curl data_table devtools httr jsonlite mockery]; }; gitignore = derive2 { name="gitignore"; version="0.1.3"; sha256="0ckvl5i99k9sjvlk3cfjyclhmchrlqdz4379nmlckh4jpmnckzk0"; depends=[clipr clisymbols crayon curl glue here jsonlite purrr xfun]; }; gitlabr = derive2 { name="gitlabr"; version="1.1.6"; sha256="1p68w0q8mjpz2hr6ys1qbfw1y4b35hgs27kzfkzv9hfi1vxqfd1h"; depends=[arpr base64enc dplyr httr magrittr purrr stringr tibble yaml]; }; gitlink = derive2 { name="gitlink"; version="0.1.3"; sha256="1g34cyx35wlpq42alsayk69x708zxqgvbdndb7j6n1q0rm4vncvd"; depends=[htmltools rlang]; }; givitiR = derive2 { name="givitiR"; version="1.3"; sha256="0y2slhxhj7k413kjaydin9hq3x2xgx4cgjshdplwnmg3x2nakn31"; depends=[alabama rootSolve]; }; - gjam = derive2 { name="gjam"; version="2.2.7"; sha256="008g394sqcxr3jdhivldaaqi3d6h2mn16wdxcsqmspk80kiljnvr"; depends=[MASS RANN Rcpp RcppArmadillo]; }; + gjam = derive2 { name="gjam"; version="2.3.1"; sha256="1mz4d0ivlrmas73wb8mcs6cw5f34ilakpr59mffyli4wkkplqf4k"; depends=[MASS RANN Rcpp RcppArmadillo]; }; gk = derive2 { name="gk"; version="0.5.1"; sha256="1hgxb1lp78pbnj22i7ryf46im301j05y7hh75z2fxvv5nqgg2v75"; depends=[Ecdat lubridate progress]; }; - gkmSVM = derive2 { name="gkmSVM"; version="0.79.0"; sha256="04dakbgfvfalz4rm4fvvybp506dn5fbj5g86ybfhrc6wywjllsz3"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges kernlab Rcpp ROCR rtracklayer S4Vectors seqinr]; }; + gkmSVM = derive2 { name="gkmSVM"; version="0.80.0"; sha256="0ljcga246ad0ql8x3drvrdsyp0f20mgp3p6lnl79xb76qgfdnm0p"; depends=[kernlab Rcpp ROCR seqinr]; }; glacierSMBM = derive2 { name="glacierSMBM"; version="0.1"; sha256="0117fzz2b1lccs0kkwz59w2yysi72j54yvz7373pz11w7rjds84f"; depends=[raster sp udunits2]; }; glamlasso = derive2 { name="glamlasso"; version="3.0"; sha256="1ynhl868kh25l8m04ln6ix31z9r26lrbr5ajprpq9yfhqs4l9ddc"; depends=[Rcpp RcppArmadillo]; }; glancedata = derive2 { name="glancedata"; version="1.0.1"; sha256="01j7syjn33pc7hq032nmyak38wn35yv3n7is9g2ggs14kj3xqb0c"; depends=[dplyr forcats GGally ggplot2 gridExtra openxlsx purrr tibble tidyr]; }; @@ -8381,7 +8488,7 @@ in with self; { glasso = derive2 { name="glasso"; version="1.11"; sha256="02p3612rpydk195n2qr77lp1j2w8zsw1ckkk98c8angm4r5q8dsc"; depends=[]; }; glassoFast = derive2 { name="glassoFast"; version="1.0"; sha256="1sgmh4l06q7mrmgnimphpqgix4k4jzaj2l30kpmnf92caa2v7ngw"; depends=[]; }; glba = derive2 { name="glba"; version="0.2"; sha256="0ckcz6v6mfbv34s8sp086czhb5l58sky79k84332rrz6wj47p3md"; depends=[]; }; - glcm = derive2 { name="glcm"; version="1.6.4"; sha256="1al4i8r9g7izl5d4c3ccqx6zw9vfcvdr6zgzql8wjkq9fsdrrnq1"; depends=[Rcpp RcppArmadillo]; }; + glcm = derive2 { name="glcm"; version="1.6.5"; sha256="13my6y9jqd86cg5n74p4b8mqbdgwnanxx4qf1rrhm5jxf6sa31qm"; depends=[raster Rcpp RcppArmadillo]; }; gld = derive2 { name="gld"; version="2.6.2"; sha256="1wrw7i5bq7rb2ahadm57y9fmr697r7lp9ln7ajcd592b0nn60n4i"; depends=[e1071 lmom]; }; gldrm = derive2 { name="gldrm"; version="1.5"; sha256="1mbdxqjw6sa47kigwrjq1gn6vi36zhg9j2lck144iwa10ms0y9xp"; depends=[]; }; glinternet = derive2 { name="glinternet"; version="1.0.10"; sha256="15dikazmhs7md7j8p45f67h3947br18hsrjl74cjk10vazd0ihng"; depends=[]; }; @@ -8394,21 +8501,21 @@ in with self; { glmaag = derive2 { name="glmaag"; version="0.0.6"; sha256="1yk5bx1gyj97b5qjy30q1gsjlp9amklwf070i0129f8dj7vjyaf0"; depends=[data_table foreach ggplot2 gridExtra huge Matrix maxstat OptimalCutpoints plotROC pROC Rcpp RcppArmadillo shiny survival survminer]; }; glmbb = derive2 { name="glmbb"; version="0.3"; sha256="12yabwswps0fmprh8nb9jdny9xrm13jvc0d9m3w04ppmsvalrmwl"; depends=[digest]; }; glmc = derive2 { name="glmc"; version="0.3-1"; sha256="0x6jk2l5rpjkp5x815gpiwv8maa7mhmy6m8gaxbv1cbn3zyccynn"; depends=[emplik]; }; - glmdisc = derive2 { name="glmdisc"; version="0.3"; sha256="13x5ri4kig0h49j3fqpj5ad37jnm0phnxr42h64562fcj7bmiidq"; depends=[caret gam MASS nnet Rcpp RcppEigen RcppNumerical]; }; + glmdisc = derive2 { name="glmdisc"; version="0.5"; sha256="0985j4gh4069pwcf3spsi8czq6xn9vhajliprxjwlv3xbisjcf8s"; depends=[caret gam MASS nnet Rcpp RcppEigen RcppNumerical]; }; glmdm = derive2 { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; }; glmertree = derive2 { name="glmertree"; version="0.2-0"; sha256="0lfn6dap38i6cnfy4gdap13aq81h9cm3bip7ci57q9br9b00x7ib"; depends=[Formula lme4 partykit]; }; + glmglrt = derive2 { name="glmglrt"; version="0.1.0"; sha256="0y3bwf6lg6wh2kq5p4flmvnc15c87w4xgxb0qnbvwmdnabsjd7zh"; depends=[MASS parameters]; }; glmgraph = derive2 { name="glmgraph"; version="1.0.3"; sha256="16sq6i7kbw20nvwikpa02z3pb7wqw3270j6ss7f8sgf548skhmx0"; depends=[Rcpp RcppArmadillo]; }; glmlep = derive2 { name="glmlep"; version="0.2"; sha256="0rq2vxbr732r725pn8qdvppxcrhjhyvlr550svfgy1inq985c1w4"; depends=[]; }; - glmm = derive2 { name="glmm"; version="1.3.0"; sha256="088m626c2f75ij457mskdyi927y6g01m5rgfsjaxpm7xbywk51sw"; depends=[doParallel foreach itertools Matrix mvtnorm trust]; }; glmmEP = derive2 { name="glmmEP"; version="1.0-3.1"; sha256="0fql85m0mxn58jh3mgrcw56bb4dx7amrz39ngqrljwi5pv5i7aj4"; depends=[lme4 matrixcalc]; }; glmmLasso = derive2 { name="glmmLasso"; version="1.5.1"; sha256="1az9vdnyqyrfn1q7zrn6x4ywx77b0vg65cni45x37b0ybkwpis39"; depends=[Matrix minqa]; }; glmmML = derive2 { name="glmmML"; version="1.1.0"; sha256="121iclp86nfm9mybvfwascs937i0z2mbv982hn894q6g7jkqiw1l"; depends=[]; }; - glmmTMB = derive2 { name="glmmTMB"; version="0.2.3"; sha256="035hkywa37bz555fv6znxd4hfcs5w884365wfnwk4jx5vann4vvb"; depends=[lme4 Matrix nlme RcppEigen TMB]; }; - glmmboot = derive2 { name="glmmboot"; version="0.5.0"; sha256="0d1nym28svij00wjp2lx42fczllxmjl95hy45dgy6j3k70pvvgfi"; depends=[]; }; + glmmTMB = derive2 { name="glmmTMB"; version="1.0.1"; sha256="0sdx1q7wc7895xh8747r4p0wkij0xjgn5ij62ipi9423zd0sr0mm"; depends=[lme4 Matrix nlme RcppEigen TMB]; }; + glmmboot = derive2 { name="glmmboot"; version="0.5.1"; sha256="1q4lp5s00vmymvln4qcsnfgcn918dsvkdhq16h0f94yiqczadsb9"; depends=[]; }; glmmfields = derive2 { name="glmmfields"; version="0.1.3"; sha256="1sygppwm58hvwj95nlyz59cjlnkrq82kpws6izbivl7p6wb06lil"; depends=[assertthat BH broom cluster dplyr forcats ggplot2 loo mvtnorm nlme Rcpp RcppEigen reshape2 rstan rstantools StanHeaders]; }; glmmsr = derive2 { name="glmmsr"; version="0.2.3"; sha256="1fbg5zji0xjr9q1yc6phsp37nsrj7nfs8yiri0j9s84wzgwjili1"; depends=[BH lme4 Matrix numDeriv R6 Rcpp RcppEigen]; }; glmnet = derive2 { name="glmnet"; version="3.0-2"; sha256="0b3nnfzp8dxcdkvxr0yvy6d58yk3xg4kz1wqa42bxqppbakmd2gl"; depends=[foreach Matrix shape]; }; - glmnetUtils = derive2 { name="glmnetUtils"; version="1.1.4"; sha256="1bf5gn3wrlm3mzgrf9dyv07yv90aly5zqgzf597ws6600ln1j9nd"; depends=[glmnet Matrix]; }; + glmnetUtils = derive2 { name="glmnetUtils"; version="1.1.5"; sha256="0q8h3pniblcgvghffsiz0qqipq8cpln4dg8nwg0k4m1j2n6h582h"; depends=[glmnet Matrix]; }; glmnetcr = derive2 { name="glmnetcr"; version="1.0.5"; sha256="0s21kaky23wgm0nbgncrg6xiwnp5x5s2zcv854493rrclx2s6r5w"; depends=[glmnet]; }; glmpath = derive2 { name="glmpath"; version="0.98"; sha256="1jbiqqd1s93i941dhyyx50zlgwavhyjfw8bx13z4gz05rdvi4gn8"; depends=[survival]; }; glmpathcr = derive2 { name="glmpathcr"; version="1.0.8"; sha256="00hbgp1kdbvihqvx03vv6gq32whrkcfq3n32bbj3cda85dnivlwq"; depends=[glmpath]; }; @@ -8424,50 +8531,50 @@ in with self; { globals = derive2 { name="globals"; version="0.12.5"; sha256="1ha8iasgijp4q3v2b0b17y1wh7cd3nvzd9b03w49qm2bidkaf68m"; depends=[codetools]; }; globe = derive2 { name="globe"; version="1.2-0"; sha256="0xa0q5dac0g7xdlr679f3km8nqxlm7gi4msp9fbfivfvy0rmri96"; depends=[]; }; glogis = derive2 { name="glogis"; version="1.0-1"; sha256="1sbvcg5slvd2c7fasvbj534x36rh11zq3mxv5z0jwpqd6h1xadmd"; depends=[sandwich zoo]; }; - glpkAPI = derive2 { name="glpkAPI"; version="1.3.1"; sha256="06p8zvmshymcw994mmf1ar00kfj645z8dp18yy4i5bl6qydbpb8k"; depends=[]; }; + glpkAPI = derive2 { name="glpkAPI"; version="1.3.2"; sha256="1qwq6vbx1symly6k72xgj5qzqw7j6wdsgiflm649pdxnisfgzh00"; depends=[]; }; glrt = derive2 { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; }; - glue = derive2 { name="glue"; version="1.3.1"; sha256="1a1ycg9r3gd91visp49q49rsrdgyf8kr9dxdy3hk99kikn4z5hag"; depends=[]; }; + glue = derive2 { name="glue"; version="1.4.0"; sha256="1hb9j2519jv9zgkgjb25hnqi22i7zxnaksqd16m4nxa1f6gl0v7a"; depends=[]; }; gluedown = derive2 { name="gluedown"; version="1.0.2"; sha256="1vq5zgwlwj5rzdwj7z9ypnvj2fw9m653bdbivb2hx2z2hl8qwfp9"; depends=[glue]; }; - gluvarpro = derive2 { name="gluvarpro"; version="2.0"; sha256="0ka9ymajkm910r8nzvcx19zvpmz8vr59k1a5vhbz49sqqc0ri68g"; depends=[ggplot2 gridExtra pracma scales tidyr zoo]; }; + gluvarpro = derive2 { name="gluvarpro"; version="4.0"; sha256="09l9yincr1k5j9wnj3zvfzsffjh3r54aa8fn0ik8vhlbq13ag8kp"; depends=[ggplot2 gridExtra pracma scales tidyr zoo]; }; gmDatabase = derive2 { name="gmDatabase"; version="0.5.0"; sha256="0prap4a8pvylmvakd2ii87jz9bqf0vvfsxdi4iwa40nx444hqhx2"; depends=[DBI digest foreach RMySQL shiny]; }; gma = derive2 { name="gma"; version="1.0"; sha256="08hxbs9z4vq5zjis0lgdcvlysaj1k7i0icdk3wsyqf3wd9znsibi"; depends=[car MASS nlme]; }; gmailr = derive2 { name="gmailr"; version="1.0.0"; sha256="0wgh428qrwn6rxkcv9xmpya4ygrmc5pblxp0fw0ddgwbl99dhhi5"; depends=[base64enc crayon gargle httr jsonlite lifecycle magrittr mime rematch2]; }; gmapsdistance = derive2 { name="gmapsdistance"; version="3.4"; sha256="1hazf6xb4ja6h2lrl63kbd78wzny9sljiid9rq1r3szn3l1mc7dn"; depends=[RCurl XML]; }; gmat = derive2 { name="gmat"; version="0.2.1"; sha256="035x8b982qk3ik9qhxa9jhkczmafix6nbpbz0r5smby6q6bhj6jz"; depends=[gRbase igraph]; }; gmediation = derive2 { name="gmediation"; version="0.1.1"; sha256="0md4h298vqw67qrjcaia6xz8s7akdpcmxa83irm12qgbh56a5rpr"; depends=[MASS plyr VGAM]; }; - gmeta = derive2 { name="gmeta"; version="2.3-0"; sha256="1izfz6gkisa8rskhfka6q73rcgzwdsmkdhy79jwcaqk25jrwfk60"; depends=[BiasedUrn binom]; }; gmfd = derive2 { name="gmfd"; version="1.0.1"; sha256="03sag09x7pjyzsp6w1z06108ig068krmw75064cnl3pqfvfyjfgr"; depends=[]; }; gmm = derive2 { name="gmm"; version="1.6-4"; sha256="15dwf3dgr88n3s1i4lqmv75vfmrc85kdhhgs2gprqkhpgprmzb83"; depends=[sandwich]; }; gmnl = derive2 { name="gmnl"; version="1.1-3.1"; sha256="01mman2nh7wzlhh89iwaskz9n15v3p5llid5557dwmqn8ybzsdvx"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; }; gmodels = derive2 { name="gmodels"; version="2.18.1"; sha256="0s8kd8krqk4kwv2zqxpsfy3w8qdwf5naf4b5l383vidq9sil0qb2"; depends=[gdata MASS]; }; gmp = derive2 { name="gmp"; version="0.5-13.6"; sha256="0j2sz2nw41y9306rl1b8hbn0spz7453z5iawcq0bvslyrhc1d9ir"; depends=[]; }; gmt = derive2 { name="gmt"; version="2.0-1"; sha256="1g1sj9gq3h3s0pdcfvzg7iifkns5azn3pa83if0d3yzc28cjf0yz"; depends=[]; }; - gmvarkit = derive2 { name="gmvarkit"; version="1.1.2"; sha256="02m6brh7rj35a0yjzmfc1p16rlyb97fsqbsqjj0ndcdadbqcxz73"; depends=[Brobdingnag mvnfast pbapply]; }; + gmvarkit = derive2 { name="gmvarkit"; version="1.1.3"; sha256="08vfyad8fs6zpwgvxs2qrvnbii824fx4yxghrvcqx25x1j71vvnl"; depends=[Brobdingnag mvnfast pbapply]; }; gnFit = derive2 { name="gnFit"; version="0.2.0"; sha256="0cji4zjslh18dfj0l827r6br4hx2f0akiaxrg7fhhyyyhgdcjnsm"; depends=[ismev rmutil]; }; gnlm = derive2 { name="gnlm"; version="1.1.1"; sha256="1krbz791l5qc06sh6my0bkq420b5afncw87lhyx1yiml2yg46zrk"; depends=[rmutil]; }; - gnm = derive2 { name="gnm"; version="1.1-0"; sha256="01d7wxsh4d9w4jh8vn62sjzgpll650yl3klfhlaa8j0qwpxr2fml"; depends=[MASS Matrix nnet qvcalc relimp]; }; + gnm = derive2 { name="gnm"; version="1.1-1"; sha256="1lddsdsg43wpg681s906i4xqqfbjdd1qb9ml5dfprb02i1806aa2"; depends=[MASS Matrix nnet qvcalc relimp]; }; gnmf = derive2 { name="gnmf"; version="0.7.1"; sha256="1vbcsxg61mlsdir8szd0rdxfswr7kr6a07750ar2l9b4rkg3yfqz"; depends=[]; }; - gnn = derive2 { name="gnn"; version="0.0-1"; sha256="1wjir501l9cfkl9xrga06h3nwrz9lqsl9ypqxjj3iz6yi7jd12w1"; depends=[keras qrng tensorflow]; }; + gnn = derive2 { name="gnn"; version="0.0-2"; sha256="0sh9b6d0zvrml7d1bnirxld2lwrgrd7ma3ky7xl71kis0x3fjdq9"; depends=[keras qrng tensorflow]; }; gnorm = derive2 { name="gnorm"; version="1.0.0"; sha256="17h43qwb07wk5hiif89k6dgn6bbdsqfy2jy3k5blbdhhp3b9jcqp"; depends=[]; }; gnumeric = derive2 { name="gnumeric"; version="0.7-8"; sha256="0iwl00mzsg8h8q67bjp6485idjlmj24362b1rbmkifckss8hrc98"; depends=[XML]; }; goeveg = derive2 { name="goeveg"; version="0.4.2"; sha256="0k9pyph065x8wp452x8kz28ikhsbrm80ln4yssmcgqm7085dyyya"; depends=[cluster fields Hmisc mgcv vegan]; }; - gofCopula = derive2 { name="gofCopula"; version="0.3-1"; sha256="05n30mvy7rn1pkyy2pfhk05nab6pkagydws8ri3ixmyvrspal23b"; depends=[copula doSNOW foreach MASS numDeriv progress R_utils SparseGrid VineCopula yarrr]; }; - gofMC = derive2 { name="gofMC"; version="1.1.2"; sha256="0hbqx0z2517qgmp6sjg76hv74yrkfbswb9rmfjmsmcyzj2x67w86"; depends=[ggplot2 scales]; }; + gof = derive2 { name="gof"; version="1.0.1"; sha256="0m9g3g5aw8wiz6am56ms2a5ipyk68gxd00bgs840lprgfdd4iw1n"; depends=[lava mets Rcpp RcppArmadillo]; }; + gofCopula = derive2 { name="gofCopula"; version="0.3-2"; sha256="068l2xik9i7z58dcj0nyp24w7lh97nimdfcs74cyfv15av23x0n7"; depends=[copula crayon doSNOW foreach MASS numDeriv progress R_utils SparseGrid VineCopula yarrr]; }; gofastr = derive2 { name="gofastr"; version="0.3.0"; sha256="02jn4xbbafl7siwvkqns1818wmw813x9cvqfcnpnmcippiqhrb0b"; depends=[data_table quanteda slam SnowballC tm]; }; goffda = derive2 { name="goffda"; version="0.0.6"; sha256="0j2fx3vzd4rda4hlhgkkcq1rgn79rah2r5dkx2rikl3rkfjjj6yi"; depends=[fda_usc glmnet ks Rcpp RcppArmadillo]; }; goft = derive2 { name="goft"; version="1.3.4"; sha256="15n1av7r6w8hihxlgw9pd570qgrlcprkkacln15chvjs3b0i60la"; depends=[fitdistrplus]; }; goftest = derive2 { name="goftest"; version="1.2-2"; sha256="0ivnkqhv5xgiv05dm648nngacymd8x8g0fyppv3bc0mhcqk9k5z4"; depends=[]; }; gogarch = derive2 { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fastICA fGarch]; }; goldi = derive2 { name="goldi"; version="1.0.1"; sha256="191ac02bwrxr3khq6qirhxzfhv7pqfhqyg7jb473p5vwygpvc53l"; depends=[dplyr futile_logger magrittr Rcpp RcppArmadillo SnowballC tm]; }; - golem = derive2 { name="golem"; version="0.1"; sha256="06nn0a3l4zxjz732wsglyqjgz39frzn8dcr2k39h7b37vkwwkk2m"; depends=[attempt cli crayon desc dockerfiler DT glue htmltools pkgload processx remotes rlang roxygen2 rsconnect rstudioapi shiny stringr testthat usethis yesno]; }; + golem = derive2 { name="golem"; version="0.2.1"; sha256="07g5sagdq1n5i24bc8pnx9y303adraqppq1j9lyd4n5q0phbgh2y"; depends=[attempt cli config crayon desc dockerfiler fs here htmltools jsonlite pkgload remotes rlang roxygen2 rstudioapi shiny testthat usethis yaml]; }; gomms = derive2 { name="gomms"; version="1.0"; sha256="1i9d5y28wrhal990x7xxy99v3z9y2pzlakj7wnynd3dpx5pqr0jj"; depends=[]; }; goodpractice = derive2 { name="goodpractice"; version="1.0.2"; sha256="08rnm8z0pry5mwpc7p37r6f2rd56dry9djpcvvs9yl170w56psx0"; depends=[clisymbols covr crayon cyclocomp desc jsonlite lintr praise rcmdcheck rstudioapi whoami withr xml2 xmlparsedata]; }; googleAnalyticsR = derive2 { name="googleAnalyticsR"; version="0.7.1"; sha256="1px57a5kqmnlny11p0niak6096pz1q8jvd9xbyld99hrwicav13r"; depends=[assertthat dplyr googleAuthR httr jsonlite magrittr memoise purrr rlang tibble tidyr]; }; googleAuthR = derive2 { name="googleAuthR"; version="1.1.1"; sha256="053s6n28cq35gn18ywipygw3bpwsi1qv6rr4vv2bi9q6sy6rb8q3"; depends=[assertthat digest gargle httr jsonlite memoise rlang]; }; + googleCloudRunner = derive2 { name="googleCloudRunner"; version="0.1.1"; sha256="0pdy9z3k2pz2vvp64g60ddigy5nvy3p9qwaqh2bxiw6vs5g4yaqs"; depends=[assertthat googleAuthR googleCloudStorageR httr jsonlite openssl yaml]; }; googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.5.1"; sha256="0sd6ca1ksv22avr5rcvkf5089f9igb8gqa83kidlc4xklaj6g92m"; depends=[assertthat curl googleAuthR httr jsonlite openssl yaml zip]; }; - googleCloudVisionR = derive2 { name="googleCloudVisionR"; version="0.1.0"; sha256="1n7lbqx7qiahmirydli9nvq4w4i26qnyk3s2kxy4aj413619ym67"; depends=[caTools data_table googleAuthR jsonlite purrr]; }; + googleCloudVisionR = derive2 { name="googleCloudVisionR"; version="0.2.0"; sha256="1n4gkmnwp9wadxz1izggxnpcpm4bz3imhq5y3i2szr8zwafcqqjv"; depends=[data_table glue googleAuthR jsonlite purrr]; }; googleComputeEngineR = derive2 { name="googleComputeEngineR"; version="0.3.0"; sha256="1s0qvnijzkja645lim373swk815n3s1292q6sk3q36ss70q42cfg"; depends=[assertthat future googleAuthR httr jsonlite]; }; - googleLanguageR = derive2 { name="googleLanguageR"; version="0.2.0"; sha256="1l0gnynild95k9fw1d398zd4dkws97p13vvfv6jaklqj0xmh9ib8"; depends=[assertthat base64enc googleAuthR jsonlite magrittr purrr tibble]; }; + googleLanguageR = derive2 { name="googleLanguageR"; version="0.3.0"; sha256="0lm50g3gshp18nvygi6is2rayzhcx0rw2rvb4lvm0jlx5m96xgxb"; depends=[assertthat base64enc googleAuthR jsonlite magrittr purrr tibble]; }; googlePolylines = derive2 { name="googlePolylines"; version="0.7.2"; sha256="0czfsmf8gv38g950l9xkk67q9v53pk9xk9yr2flbdpm8nlrdpjz7"; depends=[BH Rcpp]; }; googlePrintr = derive2 { name="googlePrintr"; version="0.0.1"; sha256="19rm78x8qd61ilc6h1kn3dw63m6dfsckqkd3n76krvi0akgl72w5"; depends=[googleAuthR httr jsonlite]; }; googlePublicData = derive2 { name="googlePublicData"; version="0.16.1"; sha256="15hyslpqvncg21q581h061rfyg99y8lavqw1x8hzl7xzd49bn9r5"; depends=[readxl XML]; }; @@ -8477,29 +8584,30 @@ in with self; { googlenlp = derive2 { name="googlenlp"; version="0.2.0"; sha256="0d0g18i3im2s5f14k69ym3vwf9a7zkaval3nwrip97xcl6kf4x9h"; depends=[dplyr httr jsonlite purrr readr rlang]; }; googler = derive2 { name="googler"; version="0.0.1"; sha256="1aayji3ncqxl58k29d93dbx05s9rp9bc63fl2cpl1cys7gilblxx"; depends=[jsonlite tibble]; }; googlesheets = derive2 { name="googlesheets"; version="0.3.0"; sha256="11q07nxys72wkxx9mawmjyf20gvwvrb7h3gpa73h6lgh2vgrwnv8"; depends=[cellranger dplyr httr jsonlite purrr readr stringr tibble tidyr xml2]; }; - googlesheets4 = derive2 { name="googlesheets4"; version="0.1.0"; sha256="1n12s92cbn6cnnkm629brdkghvj0r8x7rz191c0lbdfd8mgbw1pw"; depends=[cellranger curl gargle glue googledrive httr magrittr purrr rematch2 rlang tibble]; }; + googlesheets4 = derive2 { name="googlesheets4"; version="0.1.1"; sha256="1vj6viw9mbmwn0gs9s9yr9lsjl83dlzf37g64qi4vr3p28vg5cjs"; depends=[cellranger curl gargle glue googledrive httr magrittr purrr rematch2 rlang tibble]; }; googleway = derive2 { name="googleway"; version="2.7.1"; sha256="0axpr81p3gdp1nmfn000lk288sdn8z5qmzjvagdxqn5j44hq6sj1"; depends=[curl googlePolylines htmltools htmlwidgets jpeg jqr jsonlite magrittr scales shiny viridisLite]; }; goric = derive2 { name="goric"; version="1.1-0"; sha256="1smjq9vljszgngs5i6x55jwg0imzc5gsfdqxzcs4541fp3pvk999"; depends=[MASS Matrix mvtnorm nlme quadprog]; }; gorica = derive2 { name="gorica"; version="0.1.0"; sha256="09b5i6r2s449gvk0vagvf7kd6y0pgr4cz7hdwplq01x246bhjs6q"; depends=[bain lavaan lme4 MASS mvtnorm quadprog]; }; + gotop = derive2 { name="gotop"; version="0.1.0"; sha256="1gak2yqj82d8h34mksy8ii28n7ga0qfi3709gc1xpg7ax1bgp83h"; depends=[htmltools jsonlite rmarkdown]; }; govStatJPN = derive2 { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; }; govdown = derive2 { name="govdown"; version="0.8.0"; sha256="0sfjpbpzpay9jw5fys8dkkfilw9r8yfj2xhb20pvjk3l6hrsjwvk"; depends=[rmarkdown]; }; gower = derive2 { name="gower"; version="0.2.1"; sha256="007ivwn1nagpi26qq8iih1c2l61c53glvv60n90hi341ry8vwgxg"; depends=[]; }; - gpDDE = derive2 { name="gpDDE"; version="0.8.2"; sha256="100g2f8zlpbwxb46h62pgvidll8aflz1zl4inyh8dml6vhm9pilp"; depends=[CollocInfer deSolve fda forecast lars limSolve MASS nnls penalized trustOptim TSA]; }; - gpairs = derive2 { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3dfsfcr7kppp6zxj08v5hxym1gpz3l"; depends=[barcode colorspace lattice MASS vcd]; }; - gpclib = derive2 { name="gpclib"; version="1.5-5"; sha256="08j81b8wymsgin20n54gvm6m54rmdic51p6qzs9cz4pmgl7dkkjv"; depends=[]; }; + gpairs = derive2 { name="gpairs"; version="1.3.3"; sha256="08m1ydrr239vnhjbl47mng3i2w9bqmd8fijrwsraq5ysvn826n27"; depends=[barcode colorspace lattice MASS vcd]; }; + gpclib = derive2 { name="gpclib"; version="1.5-6"; sha256="11jjgg74l8hy9jz4jylhriqnzv8jcf12y1bkx22v29z3fhgkwkps"; depends=[]; }; gpg = derive2 { name="gpg"; version="1.2.2"; sha256="1qc7w4d6frp0j4yk0q7slkj1mps80bv78lixcpw1shgx48rp41kh"; depends=[askpass curl]; }; gpk = derive2 { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; }; gplm = derive2 { name="gplm"; version="0.7-4"; sha256="0apvj14nl5qbi4dhhdx5nih5lvjwfcipvr8cyk6xsz4r5gfr2iw4"; depends=[AER]; }; - gplots = derive2 { name="gplots"; version="3.0.1.2"; sha256="0vrm7wqrmqsmfrc070r9chpzb0vv60pay2lyar9qxfry6bsrvx86"; depends=[caTools gdata gtools KernSmooth]; }; + gplots = derive2 { name="gplots"; version="3.0.3"; sha256="0hs6mk48i9yd43rg9wfjc2nxsjjwrnpifxqvxkv8ah18kvpd6xnp"; depends=[caTools gdata gtools KernSmooth]; }; gpmap = derive2 { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[foreach ggplot2 isotone plyr]; }; gppm = derive2 { name="gppm"; version="0.2.0"; sha256="1n9is3xj52lsck2fiy9j320p2ca6ib36s251i7g3iz99a77b0ahh"; depends=[ggplot2 ggthemes MASS mvtnorm Rcpp rstan]; }; - gprofiler2 = derive2 { name="gprofiler2"; version="0.1.8"; sha256="0xa2r40alsj9d1kgkchli7p9wcffbjqbz16f8crribgl47zwlvxc"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly plyr RCurl tidyr viridisLite]; }; + gprofiler2 = derive2 { name="gprofiler2"; version="0.1.9"; sha256="112hmmvdwg8xz90w1bsbzc55y4xi9jj4dqy0q4bsgp49x58r92rb"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly RCurl tidyr viridisLite]; }; gptk = derive2 { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[fields Matrix]; }; gpuR = derive2 { name="gpuR"; version="2.0.3"; sha256="1afbnrnk0hrsd3qa7gh269wxn1maq7dpi6wpjhhbp2gwr6100vqy"; depends=[assertive BH Rcpp RcppEigen RViennaCL]; }; gqlr = derive2 { name="gqlr"; version="0.0.2"; sha256="0gzhqyrbnz3qjzkr4slryrlfhlaxm474y9fahlj0sb0hvcx68pxj"; depends=[graphql jsonlite magrittr pryr R6]; }; gquad = derive2 { name="gquad"; version="2.1-1"; sha256="19k7cqp2j5vb6m9hxdm951wfjh6nsswb64pdz9g93ypcqrg02wa4"; depends=[ape seqinr]; }; grImport = derive2 { name="grImport"; version="0.9-3"; sha256="109mrdvq06xq3zgn9ngz0c7zzgqkv5zbpvsb2i636vmlk6y4dpkd"; depends=[XML]; }; grImport2 = derive2 { name="grImport2"; version="0.2-0"; sha256="19q0dd8fpp1g4xf6sg5f8dxybwxjfw553ra6wgjd8b74fzca40m1"; depends=[base64enc jpeg png XML]; }; + grabsampling = derive2 { name="grabsampling"; version="1.0.0"; sha256="031a4ak84k2mbhrmjbai3q8qnf2z3d9rp0xra67x74a99av9lzs9"; depends=[extraDistr ggplot2 ggthemes plyr reshape2]; }; gradDescent = derive2 { name="gradDescent"; version="3.0"; sha256="1jxgvnjw9qk5bkb0fw4kyks4vb9d1933jn79ry0w6956mq2xbb79"; depends=[]; }; grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; }; gradeR = derive2 { name="gradeR"; version="1.0.5"; sha256="1c7x16z1mn7ys63vdwpy8b2x21k35pbmnpl52h372pfrsvxxhb23"; depends=[testthat]; }; @@ -8510,69 +8618,70 @@ in with self; { granova = derive2 { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; }; granovaGG = derive2 { name="granovaGG"; version="1.4.0"; sha256="0khqlqc6jg9cpdq06g6jlpfjcw3m6rj40ipljfai8g1630ril6q4"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; }; grapes = derive2 { name="grapes"; version="1.0.0"; sha256="079b7w2xhb0a481s7qihhka0l9ydkjdph0865wjjkcbpr4775p26"; depends=[magrittr]; }; - graph4lg = derive2 { name="graph4lg"; version="0.2.0"; sha256="1y0kc7jm878ck287h3088nmfwfky1m7j88085zb5fd04273cy8hl"; depends=[ade4 adegenet diveRsity doBy ecodist ggplot2 igraph Imap MASS Matrix mclust pegas raster Rdpack rgdal sf sp spatstat stringr tidyr vegan]; }; + graph4lg = derive2 { name="graph4lg"; version="0.3.0"; sha256="0sy8jd771r16hnzpal0di4w0qmjmdpgny7zj4xq1y2bnsnlhv5bh"; depends=[ade4 adegenet diveRsity doBy ecodist ggplot2 igraph Imap MASS Matrix mclust pegas raster Rdpack rgdal sf sp spatstat stringr tidyr vegan]; }; graphTweets = derive2 { name="graphTweets"; version="0.5.3"; sha256="0jf52lclwvqgybdj6fknzx046bh6jgwxvqs4c5g1ii8f2lsz9y07"; depends=[combinat dplyr igraph magrittr purrr rlang tidyr zeallot]; }; grapherator = derive2 { name="grapherator"; version="1.0.0"; sha256="071by9b8figbsf4g0f8a8mgcdksjksc57mnlgggilw7py1yjnjlh"; depends=[BBmisc checkmate deldir ggplot2 lhs reshape2 vegan]; }; graphframes = derive2 { name="graphframes"; version="0.1.2"; sha256="1bv7d0sggwab4rd486ayw9gkb5ja5p5fin5pn92xnrmz8cgwsfxq"; depends=[forge sparklyr tibble]; }; graphicalExtremes = derive2 { name="graphicalExtremes"; version="0.1.0"; sha256="1cc4xcb72yci2gq2zn3g1nh3ba802anpymm0hajdbz3kb0wz1gyn"; depends=[igraph matrixcalc mvtnorm Rdpack]; }; - graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.2"; sha256="1jzhqbdylpzc8d28vz2k34i9dpxx5x34bgvx73z8wjglnn6j27b8"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; }; + graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.3"; sha256="1xd98irbh67a7vbj6a4arl51dnkj5c0c1mcmh1c1hsac8mdj29w0"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; }; graphicsQC = derive2 { name="graphicsQC"; version="1.0-8"; sha256="12vg93xfmkv73i19vkb10q2qngmsxd3y42z3l6izdywbdc3cdfkg"; depends=[XML]; }; graphkernels = derive2 { name="graphkernels"; version="1.6"; sha256="1gn3ihqz7m0rdvvc2fp7hsgq583wh5cnz7200a2ff89xc04zs3dc"; depends=[igraph Rcpp RcppEigen]; }; - graphlayouts = derive2 { name="graphlayouts"; version="0.5.0"; sha256="03dizbhhdhnzbj2i5zvqgs617kwcv4h2pha4f16adic0fph1rxl3"; depends=[igraph Rcpp RcppArmadillo]; }; + graphlayouts = derive2 { name="graphlayouts"; version="0.6.0"; sha256="1la016m37kp79zk8p1yx9kaha8y6d4w52w39h0mzv1mfsi6d75w0"; depends=[igraph Rcpp RcppArmadillo]; }; graphon = derive2 { name="graphon"; version="0.3.3"; sha256="1jsjbyk1hbmdlgap3gaf1cdrrbgfccr4lgpdi7g3bzp3mjjbijh5"; depends=[Rdpack ROptSpace]; }; graphql = derive2 { name="graphql"; version="1.5"; sha256="0zi1l93yk5rlgdy4j2nph14w0h8kgvnbzk9fi2jfys8s3fz54ksr"; depends=[jsonlite Rcpp]; }; graphscan = derive2 { name="graphscan"; version="1.1.1"; sha256="1dgjb0grdymhimdgwnddjcivgy2i9r1i1nni4v9mx0447skcahk9"; depends=[ape rgl snowfall sp]; }; - gratia = derive2 { name="gratia"; version="0.3.0"; sha256="0n0ps6r65bh8yl6rq6jdh9lxcm66py3rphcz6649v3qz24ijq110"; depends=[cowplot dplyr ggplot2 mgcv mvnfast purrr rlang tibble tidyr]; }; + graphsim = derive2 { name="graphsim"; version="0.1.2"; sha256="12ck2svjwfl2zqyhzzm3h9a57hy3gklpbbw8j9nnmagskxags5x3"; depends=[igraph Matrix matrixcalc mvtnorm]; }; + gratia = derive2 { name="gratia"; version="0.3.1"; sha256="0jgbx0mzm4a31fy9r046n4q9pkzmjxbbnbh9jsrlvj811qyni7gb"; depends=[cowplot dplyr ggplot2 mgcv mvnfast purrr rlang tibble tidyr]; }; graticule = derive2 { name="graticule"; version="0.1.2"; sha256="1yvrijvyjilfql72dxj32b3sczqv065zj61729wrrzn63xcifvmb"; depends=[raster sp]; }; - grattan = derive2 { name="grattan"; version="1.8.0.0"; sha256="1604hrbh897hdgxg2ack4c47xzqlgwgy4nn96lyc2sk3qvw0l7s7"; depends=[assertthat data_table fastmatch forecast fy hutils ineq magrittr Rcpp rsdmx zoo]; }; - gravitas = derive2 { name="gravitas"; version="0.1.0"; sha256="0w53rz6ips5cl2xigb16ffskjdnlx98f20slkpvdh4s2vwvbvk74"; depends=[dplyr ggplot2 ggridges ineq lubridate lvplot magrittr RColorBrewer rlang shiny stringr tibble tidyr tsibble]; }; + grattan = derive2 { name="grattan"; version="1.8.0.1"; sha256="113f4rsmmv9czc4khdfndxw5cxsiad7scqmnrfcj2ar03ybbp2gn"; depends=[assertthat data_table fastmatch forecast fy hutils ineq magrittr Rcpp rsdmx zoo]; }; + gravitas = derive2 { name="gravitas"; version="0.1.2"; sha256="1hgxr6yq98w3vfbl9h575bi7l2g10ahgdqcq06r3apksikfn6pc2"; depends=[dplyr ggplot2 ggridges ineq lubridate lvplot magrittr RColorBrewer rlang shiny stringr tibble tidyr tsibble]; }; gravity = derive2 { name="gravity"; version="0.9.8"; sha256="1yx71gidv3ivjfip994ciaiwk2cvvm8z16yax4lwpwgl1fxj1p4k"; depends=[censReg dplyr glm2 lmtest magrittr MASS multiwayvcov purrr Rdpack rlang sandwich survival tibble tidyr]; }; + grec = derive2 { name="grec"; version="1.4.1"; sha256="1vy3idjvayzx9j9pf5bv5bxycjca3w3c4x4lzzbrdi3c97508sa8"; depends=[imagine raster]; }; greenclust = derive2 { name="greenclust"; version="1.1.0"; sha256="198ix55x8cl5wx09p6ahzy3bvig86mvqf2qywjfilp6b4hnjgk7l"; depends=[]; }; gremlin = derive2 { name="gremlin"; version="0.1.0.1"; sha256="1qsjj910lmwdnmbn0fxakw713sk7myavgrmp5xm86my7cm866hmb"; depends=[Matrix]; }; gren = derive2 { name="gren"; version="0.0.1"; sha256="1wb5wwdjxi7q36md7xzmbw5lrggcgghkz3pmxipjpxw8kfv804xp"; depends=[glmnet Iso pROC Rcpp RcppArmadillo]; }; - greport = derive2 { name="greport"; version="0.7-1"; sha256="1h1g3khb30n3y8l1sxpas2s6s667az4yxvsq42x5dfx8fic42p6n"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; }; + greport = derive2 { name="greport"; version="0.7-2"; sha256="1p5x4sar88ss8n1m0c73arac10mq4ircjad38kbin6l0nk9z1mh2"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; }; greta = derive2 { name="greta"; version="0.3.1"; sha256="0wy1619drj8ir6r44xcliiirgibksd80gmjx21am2h580k0x0xq2"; depends=[coda future progress R6 reticulate tensorflow]; }; gretel = derive2 { name="gretel"; version="0.0.1"; sha256="1yyj4aing56f2vy0gshxwb623g9idg8k4701v3s53lqn4m2ybazk"; depends=[Rcpp ResistorArray]; }; grex = derive2 { name="grex"; version="1.9"; sha256="0s6nan76rrmh3yhgvzb7pqdrzx2w9px8ay4v9yiib4bamy9wmhpb"; depends=[]; }; - greybox = derive2 { name="greybox"; version="0.5.7"; sha256="1igx5lv0li3j5kaz70255fbh8w3icnvvqcqifr381q1jbhv3zal1"; depends=[forecast lamW nloptr numDeriv Rcpp statmod]; }; + greybox = derive2 { name="greybox"; version="0.5.9"; sha256="15xpw17v5msnfrxi42w9jd1cb9jwzx2hgjq4v31pdrl5kdc2yn0w"; depends=[forecast lamW nloptr pracma Rcpp statmod]; }; greyzoneSurv = derive2 { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; }; - grf = derive2 { name="grf"; version="1.0.1"; sha256="0m2r60w5w1c2h3rnia0zxbdvn2mrixq7p4qcw54lv491lyyxl0my"; depends=[DiceKriging lmtest Matrix Rcpp RcppEigen sandwich]; }; + grf = derive2 { name="grf"; version="1.1.0"; sha256="0bm5r26iabpk2yjln5i14vlcv3kg3p9n8sv9q1xm9v33j0qda507"; depends=[DiceKriging lmtest Matrix Rcpp RcppEigen sandwich]; }; gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; }; gridBezier = derive2 { name="gridBezier"; version="1.1-1"; sha256="1n5d6svxblcxpzf79px0qjxsydpwjpnfcagnwk35ljinyd0wv68z"; depends=[]; }; gridDebug = derive2 { name="gridDebug"; version="0.5-0"; sha256="12zrl7p8p7071w5viymdipycja7a2arvy0aahgahd5nlx1k1gha0"; depends=[graph gridGraphviz gridSVG]; }; gridExtra = derive2 { name="gridExtra"; version="2.3"; sha256="0fwfk3cdwxxim7nd55pn7m31bcaqj48y06j7an2k1v1pybk0rdl1"; depends=[gtable]; }; gridGeometry = derive2 { name="gridGeometry"; version="0.2-0"; sha256="0y7y1ld03cqpibmjssid6n3n8gf98hi9ngcfbkh6acyzck812bc7"; depends=[polyclip]; }; - gridGraphics = derive2 { name="gridGraphics"; version="0.4-1"; sha256="1kr3p54bkv2q7agxrva30y9bkwkiq1k2cfl5z1kvyjv6f5xi4w5p"; depends=[]; }; + gridGraphics = derive2 { name="gridGraphics"; version="0.5-0"; sha256="0rlyc3xk8kfrfzbfd8n4javq3yxqd7lsfmi4q5n6s61srnrl6c1r"; depends=[]; }; gridGraphviz = derive2 { name="gridGraphviz"; version="0.3"; sha256="1jz0d6kc8ci55ffm6dns8bhak9xnaq7mg5mpv3fk53lircn7mwl5"; depends=[graph Rgraphviz]; }; gridSVG = derive2 { name="gridSVG"; version="1.7-1"; sha256="03ra820lm0gydrvxmck658aaj3mqqkqrinxc134r5npl8bv4x2hg"; depends=[jsonlite XML]; }; gridsample = derive2 { name="gridsample"; version="0.2.1"; sha256="062aryy26x07m31r6m0fj1zgnjhivlh1fikx9lv2rdgk0rh4yzz0"; depends=[data_table geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils]; }; gridsampler = derive2 { name="gridsampler"; version="0.6"; sha256="0wqpqg9c372sv8zqks6v93gawiyfghw58hn7m8q45dxpqm16ss3k"; depends=[BiasedUrn ggplot2 plyr reshape2 shiny shinyBS shinythemes]; }; - gridtext = derive2 { name="gridtext"; version="0.1.0"; sha256="1fk1ywb088fr1cyfjjsc1qrrvpn6khb3vv8ilxss0d2nclx6zkar"; depends=[jpeg markdown png Rcpp RCurl rlang stringr testthat xml2]; }; + gridtext = derive2 { name="gridtext"; version="0.1.1"; sha256="06rb3xn8zf9m1v8kam39a7cp6iaw4xpirwjvp0y99gx3q5ijf5d7"; depends=[jpeg markdown png Rcpp RCurl rlang stringr testthat xml2]; }; gripp = derive2 { name="gripp"; version="0.2.20"; sha256="0rshipm8rdynl19a4dsvvvlhkd0n4vjfkidwnv5iilc5ini7c4qr"; depends=[GA GenSA usethis]; }; grnn = derive2 { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; }; - groc = derive2 { name="groc"; version="1.0.6"; sha256="0x7rrf5bw05s257xhzklpc6hslpjnzjx02hlrz4r9zixbfffmawc"; depends=[MASS mgcv pls robust robustbase rrcov]; }; + groc = derive2 { name="groc"; version="1.0.7"; sha256="1qi16br426z90d58130n47riy7q1lcq19zl585a001av4lrmmqzv"; depends=[MASS mgcv pls robustbase rrcov]; }; gromovlab = derive2 { name="gromovlab"; version="0.7-6"; sha256="02s7x23610dbpmrqh7pimspa10v3fnmj48fwmh0a6igd74rmj2mg"; depends=[ape cluster glpkAPI igraph quadprog]; }; groupICA = derive2 { name="groupICA"; version="0.1.1"; sha256="1wl828ligvvw55xic383gdn7aq4mbwsnkl4ym6f71jn5g3p36d0i"; depends=[MASS]; }; groupRemMap = derive2 { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; }; - groupdata2 = derive2 { name="groupdata2"; version="1.1.2"; sha256="0v206sq4h50v1scb2i8qwwi3kxiqamxwrnn1gblwk9i3xkmqs48y"; depends=[dplyr numbers plyr rlang tibble]; }; + groupWQS = derive2 { name="groupWQS"; version="0.0.1"; sha256="1009lw80knvspphvzz3jhclyflm9s300n2048gb7lrrnam657016"; depends=[glm2 Rsolnp]; }; + groupdata2 = derive2 { name="groupdata2"; version="1.2.0"; sha256="119ianzcv5dwvdyfxmgm7qgv99zbanm1ikal0rxc70c5n5lagv83"; depends=[checkmate dplyr lifecycle numbers plyr rlang tibble]; }; grouped = derive2 { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; }; - groupedSurv = derive2 { name="groupedSurv"; version="1.0.4"; sha256="106z47icn680nyzj9gkq7g8gv73ajgmx0ypiv4l1j01cd3nripj2"; depends=[BH doParallel doRNG foreach qvalue Rcpp RcppEigen]; }; - groupedstats = derive2 { name="groupedstats"; version="0.1.1"; sha256="0fp073mf2qghi4l1jfr41r1b7n0h3zaa96q7wk7xwi3a3d7vs152"; depends=[broomExtra dplyr glue haven lme4 parameters purrr rlang rstudioapi sjstats skimr tibble tidyr]; }; + groupedSurv = derive2 { name="groupedSurv"; version="1.0.4.1"; sha256="1kapz07hswpcvm9mmgc06l71f7ymx7aq816mzwca6cvccvqnrl5n"; depends=[BH doParallel foreach qvalue Rcpp RcppEigen]; }; + groupedstats = derive2 { name="groupedstats"; version="0.2.2"; sha256="0znxy8nshc3c95ninarsgxv3r894p4kk8k9sv7a5qkpw7v4fj2mm"; depends=[broomExtra dplyr glue haven ipmisc lme4 parameters purrr rlang sjstats skimr tibble tidyr]; }; groupsubsetselection = derive2 { name="groupsubsetselection"; version="1.0.3"; sha256="118cj5xc8nbq4fs2gbzg1nhynixaflbl0si77gyy4ybw0drsz4nj"; depends=[]; }; grove = derive2 { name="grove"; version="1.1"; sha256="0fqsj5dx7py7cin3hvfkxglh8v3x0dwj6cxy4h5vbddjl687db5x"; depends=[Rcpp RcppArmadillo wavethresh]; }; growfunctions = derive2 { name="growfunctions"; version="0.14"; sha256="1pvyiw20fxm3l4giyq4iizc67yy36i6wq4ch2qyqg4mfd4bki2g4"; depends=[ggplot2 mvtnorm Rcpp RcppArmadillo reshape2 spam]; }; growth = derive2 { name="growth"; version="1.1.1"; sha256="05yxjlbv1i4ly8yp3aqbxzq1z2mp7sfx7xyqw48qsdv0acqai7jy"; depends=[rmutil]; }; - growthPheno = derive2 { name="growthPheno"; version="1.0-21"; sha256="1lhzf1i1k786c6j0vn3ay6mnmk3bh7xhymq2ywwjz228hszn1bf2"; depends=[dae GGally ggplot2 Hmisc RColorBrewer readxl reshape]; }; + growthPheno = derive2 { name="growthPheno"; version="1.0-22"; sha256="0xhy6w8xcyavb10z5qnzc2bfzn158vmajrcm318s4afwm1ynqix5"; depends=[dae GGally ggplot2 Hmisc RColorBrewer readxl reshape]; }; growthcurver = derive2 { name="growthcurver"; version="0.3.0"; sha256="0q7g00b9sxxlq8yscmmccr8r4mwzpc707arbrr46iii8ra9icvlb"; depends=[minpack_lm]; }; growthmodels = derive2 { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; }; growthrate = derive2 { name="growthrate"; version="1.3"; sha256="1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd"; depends=[clime Matrix mvtnorm]; }; growthrates = derive2 { name="growthrates"; version="0.8.1"; sha256="1ivids4qfyhi3k5l6mvi6bhajnbxhiqmm4qdcmmfrmzs8c59cvvm"; depends=[deSolve FME lattice]; }; - grpSLOPE = derive2 { name="grpSLOPE"; version="0.2.1"; sha256="1r9irf83f7szhkdqis2rakil8fsr3rqsfrj4dmbg3r3rnr8wl8nh"; depends=[SLOPE]; }; + grpSLOPE = derive2 { name="grpSLOPE"; version="0.3.0"; sha256="0v20v3rdjmz517rl86nkrsaa1dl2p49kdkgk7ynv92p2ib37wwga"; depends=[Rcpp]; }; grplasso = derive2 { name="grplasso"; version="0.4-6"; sha256="0xr6plgnc3lp93rd4jk4dqjix8kgl8s2b68fh41k6jwd5y8d7pks"; depends=[]; }; grplassocat = derive2 { name="grplassocat"; version="1.0"; sha256="0pi5vq7yqg0ha91y6296ckshxyq3135cg6zcs9x6xba5m5024k4p"; depends=[grplasso]; }; - grpreg = derive2 { name="grpreg"; version="3.2-1"; sha256="126b2gblclp62xv8r54lqg3crd3317bqacr70whmhnadlwcpgqvb"; depends=[Matrix]; }; - grpregOverlap = derive2 { name="grpregOverlap"; version="2.2-0"; sha256="1kq8wxpx21irwckndgfkzdy5jgzf7pmcwpclmjzjxznv6cyaikd0"; depends=[grpreg Matrix]; }; - grpss = derive2 { name="grpss"; version="3.0.1"; sha256="01bjjhv3vkvn5h363g5a9dlm7kzq10q7ixmrc0kkq5hsbs31vl3x"; depends=[doParallel foreach grpreg MASS]; }; + grpreg = derive2 { name="grpreg"; version="3.2.2"; sha256="12432rdyv6b837n3b6kwjrqsmx7bs6qdmyz02x4l956pwmp5g7z5"; depends=[Matrix]; }; grr = derive2 { name="grr"; version="0.9.5"; sha256="0arbcgrvhkwb5xk4nry1ffg2qj0v8ivhjghdr505ib4357g0c9i9"; depends=[]; }; grt = derive2 { name="grt"; version="0.2.1"; sha256="1dw5rjs82r82l6qryyyq9cczm770v4iv60d7pi1nb4b0733ndbd5"; depends=[MASS]; }; gsDesign = derive2 { name="gsDesign"; version="3.0-1"; sha256="0cixg176ihbkwkcllabr2klc15cssdnfzwklf0q1wd23lmv6aj43"; depends=[ggplot2 plyr xtable]; }; @@ -8580,42 +8689,44 @@ in with self; { gsalib = derive2 { name="gsalib"; version="2.1"; sha256="1k3zjdydzb0dfh1ihih08d4cw6rdamgb97cdqna9mf0qdjc3pcp1"; depends=[]; }; gsarima = derive2 { name="gsarima"; version="0.1-4"; sha256="1ay3iamnvg7mbnl1xaxxcyic559bdnfspy883w2bwgy20yhr34yg"; depends=[MASS]; }; gsbDesign = derive2 { name="gsbDesign"; version="1.0-1"; sha256="0wb62y4fcca1qq27kgk59qxm1nx5njcs94cr8x1bsnk88z945p9p"; depends=[gsDesign lattice]; }; + gsbm = derive2 { name="gsbm"; version="0.1.0"; sha256="0slx4063fnys60mxa9gqdmza9h9pif3qqyjw7y5nfcm8p06ckdbn"; depends=[softImpute]; }; gscaLCA = derive2 { name="gscaLCA"; version="0.0.2"; sha256="0s6rnyd632xq04pnyq1j3571qv7j5bzxir2nhk5jk9i8myf9fc9k"; depends=[devtools doSNOW fastDummies fclust foreach ggplot2 gridExtra MASS progress psych stringr]; }; gscounts = derive2 { name="gscounts"; version="0.1-3"; sha256="1xcsvnam858l9am30mmqb6m0vcflijhli22ix8g56rcvfsh208q1"; depends=[Rcpp]; }; gset = derive2 { name="gset"; version="1.1.0"; sha256="1gingqw6la8n7mnl47wpz9sicxca4zi2m8p35n6cnihrniibhajc"; depends=[Hmisc MCMCpack mvtnorm]; }; - gsg = derive2 { name="gsg"; version="2.0"; sha256="17fjl7aw1s814krnszxd4y1d4210bnkrf4kb2fwsycqwcwms5pm7"; depends=[boot mgcv mvtnorm numDeriv]; }; - gsheet = derive2 { name="gsheet"; version="0.4.2"; sha256="1mfpg91855qg0bi6wk0wy58b58lm06jw9fqdl6psqdvnmaf7n2w5"; depends=[httr stringr]; }; + gsheet = derive2 { name="gsheet"; version="0.4.5"; sha256="0b8q44cqkjfy6vnffm94czq4ag8xfbxik52026ahq95kcf9v2j91"; depends=[httr stringr]; }; gskat = derive2 { name="gskat"; version="1.0"; sha256="19mbif7wr88vk5wlc7m2l4xghjmfj2qd3s8yvjlkawbnjk8x6ib0"; depends=[CompQuadForm e1071 gee geepack Matrix]; }; gsl = derive2 { name="gsl"; version="2.1-6"; sha256="0p4rh7npp6qbfc5sxjq86xjn7c9ivf3pd60qf1hldwckjqin7m7m"; depends=[]; }; gsloid = derive2 { name="gsloid"; version="0.1.0"; sha256="1ma5si86ynfsis0pnw8hyv6xc4frbkhy5ks03mr0z16gasffkycg"; depends=[]; }; gsmoothr = derive2 { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; }; gsrsb = derive2 { name="gsrsb"; version="1.1.1"; sha256="0yjxzc69ihsx5ni6jb4shsvl9vskqlls3gmpckmzx5nsh1l5s5vb"; depends=[ldbounds mvtnorm xtable]; }; - gss = derive2 { name="gss"; version="2.1-10"; sha256="1qhywsn9244fc7ir705xc8s832ygd7w0j72k3d58bdx9wv57xi16"; depends=[]; }; + gss = derive2 { name="gss"; version="2.1-12"; sha256="02qpxx8lwkxsxv3xhkkxgpsj7i5nqaqs04afd2aby7b746v2pjdw"; depends=[]; }; gstar = derive2 { name="gstar"; version="0.1.0"; sha256="1582f7jcphb32j3wdc345qa5sgm2xyimlc6r5r5jay7ca5ll8c98"; depends=[dplyr ggplot2 reshape2 xts zoo]; }; - gstat = derive2 { name="gstat"; version="2.0-4"; sha256="0sksk3a08bx70h8230ca7sz8jhwp37f4d34igh192668vz0cvljp"; depends=[FNN lattice sp spacetime zoo]; }; + gstat = derive2 { name="gstat"; version="2.0-5"; sha256="1c6dhjzn9rmb67j51izx9lvjdxnvvc4h5sxgixqd19vg9bh5694d"; depends=[FNN lattice sp spacetime zoo]; }; gsubfn = derive2 { name="gsubfn"; version="0.7"; sha256="00j6b8b6xsx6v370h220x233rpk6asca78165y3d48jpwvwisdc9"; depends=[proto]; }; gsw = derive2 { name="gsw"; version="1.0-5"; sha256="0lv4x4is53xybgg205dncizpnqnakqk47b5wgys2kr4ixqc8jipb"; depends=[testthat]; }; gsynth = derive2 { name="gsynth"; version="1.0.9"; sha256="1m9s3gymm0z6frfzmz7kv8cbdnla2vp4aam5b2zzcxwflzwbplm3"; depends=[abind doParallel foreach GGally ggplot2 MASS mvtnorm Rcpp RcppArmadillo]; }; + gt = derive2 { name="gt"; version="0.2.0.5"; sha256="1kc8x3bzlpqnxr1in8s3a6d52hvhs93vgbdamxzz67q7rgdzfhhk"; depends=[checkmate commonmark dplyr fs ggplot2 glue htmltools magrittr rlang sass scales stringr tibble tidyselect]; }; gt4ireval = derive2 { name="gt4ireval"; version="2.0"; sha256="1d567iz57xqszm45l1wq4n2qrrmyz8ssll1vllfmncb9ibbnx4f3"; depends=[]; }; gtWAS = derive2 { name="gtWAS"; version="1.1.0"; sha256="1kbkz0iwc3gfj982m93m2wdr1xm5rhy70k6bdc7kms9ivh5fh6sh"; depends=[]; }; gtable = derive2 { name="gtable"; version="0.3.0"; sha256="1lyncxf2dqdjgw1071cn9c8zwzkz6sldnd5cgmicf70bc726qf7x"; depends=[]; }; gtcorr = derive2 { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; }; gte = derive2 { name="gte"; version="1.2-2"; sha256="1x528iakyjhh4j92cgm6fr49a3rdi4cqy28qhsfr2dwvxzxchl6h"; depends=[survival]; }; + gtfs2gps = derive2 { name="gtfs2gps"; version="1.1-0"; sha256="13y8nry300g0c98asmxpqbaz7vxwlqqfd9d12290i0fmnzl3kn2z"; depends=[data_table furrr future lwgeom magrittr pbapply raster Rcpp rgdal sf sfheaders sp units]; }; gtfsrouter = derive2 { name="gtfsrouter"; version="0.0.1"; sha256="0znr0hw6f8wxy3vj944lrlsb0a70w2p20gw50jr2ij9xikawh2ih"; depends=[data_table Rcpp]; }; gtheory = derive2 { name="gtheory"; version="0.1.2"; sha256="1xc1jl69z5csalqk3hx83s53awcl1fjq6p0x2pczhs7dsvwd6lks"; depends=[lme4]; }; - gtools = derive2 { name="gtools"; version="3.8.1"; sha256="0f5syk1qq6cjq6hwymvkiyhzwa389z94722v881ipbfqkd2q8505"; depends=[]; }; + gtools = derive2 { name="gtools"; version="3.8.2"; sha256="1pnwy412wvhhvnnx8qg6s9hrgcnsfhnfcpf2560ipipk845acfsh"; depends=[]; }; gtop = derive2 { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts lassoshooting quadprog]; }; gtrendsR = derive2 { name="gtrendsR"; version="1.4.4"; sha256="0b05m5jbgbhdjmwp89zaa276z1h2qib2h30msg69lhwbdcsva96q"; depends=[anytime curl ggplot2 jsonlite]; }; - gtsummary = derive2 { name="gtsummary"; version="1.2.4"; sha256="0sn05c68p74zk90j3zxj9jqa1aim28ydqlw3gfn8j4h72pnklyv0"; depends=[broom broom_mixed crayon dplyr glue knitr lifecycle magrittr purrr rlang stringr survival tibble tidyr tidyselect usethis]; }; - gtx = derive2 { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; }; + gtsummary = derive2 { name="gtsummary"; version="1.3.0"; sha256="0gwxpzvzdz0c7akidfgjbm44j4qx5yhh9009fl7qf2547380fsd7"; depends=[broom broom_mixed crayon dplyr forcats glue gt knitr lifecycle magrittr purrr rlang stringr survival tibble tidyr tidyselect usethis]; }; guardianapi = derive2 { name="guardianapi"; version="0.1.1"; sha256="17xmmr6pfzhdnmf45jzvk84gbfnmlw1qfv1gqjaw85vgm8b6jn6l"; depends=[dplyr httr jsonlite rlang tibble]; }; guess = derive2 { name="guess"; version="0.1"; sha256="198pxi0yipgm9wccpj3y4a0gkibhyxcmb7v5dz7ipzrk44ha5g6j"; depends=[Rsolnp]; }; + guf = derive2 { name="guf"; version="1.0.2"; sha256="1dfmja2da211pcid4hr7x9q0sgz37756rpykm1ax862avdl8hsmc"; depends=[]; }; gumbel = derive2 { name="gumbel"; version="1.10-2"; sha256="0s9idcrssnl683abwky9zvqylciy0b51z935yfvb2bm8b0b0b4ij"; depends=[]; }; gunit = derive2 { name="gunit"; version="1.0.0"; sha256="0vmm47f21n9f334aj38gzrmv1c4sp76njk95ld9gv6fcfxgsipyh"; depends=[magrittr stringr tibble units]; }; gunsales = derive2 { name="gunsales"; version="0.1.2"; sha256="02vz16lhym72vvf48yai1g371wygdlmi63a6ylc147l0b69jgw31"; depends=[data_table dplyr ggplot2 seasonal x13binary zoo]; }; gustave = derive2 { name="gustave"; version="0.4.1"; sha256="1sdfx3zmnamdwgnyvs3rn38wmwiyww1a620jyfc984b9r2zqvd1w"; depends=[Matrix]; }; gutenbergr = derive2 { name="gutenbergr"; version="0.1.5"; sha256="1c6n2vj38srqmlcl0d2yp749rhn9n5mmz31x98fij4x55km53sci"; depends=[dplyr lazyeval purrr readr stringr urltools]; }; - gvc = derive2 { name="gvc"; version="0.5.2"; sha256="0cfvli6ap5kw3agv94d7g7rhmlxd66yyngc7c9pl4fsxf7sm6nx4"; depends=[decompr diagonals]; }; + gvc = derive2 { name="gvc"; version="5.2.0"; sha256="15z4r8xkz0alabh3z278hylz042f2r5cqdllc5n3hfx5q3ch19xx"; depends=[decompr diagonals]; }; gvcR = derive2 { name="gvcR"; version="0.1.0"; sha256="0r54924b9a65k11p8y3p7jxbvmpb7s7vs87v65hhl98gxacj5hk8"; depends=[dplyr eda4treeR lme4 magrittr]; }; gvcm_cat = derive2 { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[MASS Matrix mgcv]; }; gvlma = derive2 { name="gvlma"; version="1.0.0.3"; sha256="16dhd407bwjs91c3p9kk43646197s7n9vbyghxb4ckrpv3fsaxp0"; depends=[]; }; @@ -8625,20 +8736,23 @@ in with self; { gwfa = derive2 { name="gwfa"; version="0.0.4"; sha256="0jz82d9lfyd07z0jjlfqzsg7a3vnyz0s1j0rrb5sg9pnvcfjk9qy"; depends=[Rcpp sp]; }; gwrpvr = derive2 { name="gwrpvr"; version="1.0"; sha256="0x15nv2pfv99c04lgs6q6hgczarld34xc4aqw9bn179m7j02v6m3"; depends=[]; }; gwrr = derive2 { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; }; + gwsem = derive2 { name="gwsem"; version="0.1.17"; sha256="1f2hym3md1agq2ml7f2v1dkb308iy1rl68c12f7n3ycsw0ql70ix"; depends=[BH data_table lifecycle OpenMx qqman Rcpp]; }; gym = derive2 { name="gym"; version="0.1.0"; sha256="0vcwzgawqwjsf65hr1mbjkz3px8zsibfkn42jpsg39n13jpfjq8v"; depends=[httr jsonlite]; }; - gyriq = derive2 { name="gyriq"; version="1.0.2"; sha256="12vbnhianzi4l43czaxrbnbkz1h8lvmwjys0y3c2ml3g6dmwwfji"; depends=[CompQuadForm irlba mvtnorm survival]; }; - h2o = derive2 { name="h2o"; version="3.28.0.2"; sha256="1975898p9bh61qa01aqzdkxjcnblgbkn0ld7das9ibav4w5jjva5"; depends=[jsonlite RCurl]; }; + h2o = derive2 { name="h2o"; version="3.30.0.1"; sha256="1xdhd0h0hncg7s5nsrb97arqiyd9r3cxv1in36lx7pyplxcfy4fb"; depends=[jsonlite RCurl]; }; h2o4gpu = derive2 { name="h2o4gpu"; version="0.2.0"; sha256="06d2rrr27xvnsai6zjiaiw0jjfzdza1cc39c03d6pjkvnh0mqh2c"; depends=[magrittr reticulate]; }; hBayesDM = derive2 { name="hBayesDM"; version="1.0.2"; sha256="04p4d0hy2l6bmxyh2k5q0g19b7fbpsl9frmcvrf5rxkaasxyxwn6"; depends=[BH data_table ggplot2 loo Rcpp RcppEigen rstan StanHeaders]; }; - hIRT = derive2 { name="hIRT"; version="0.2.0"; sha256="1vgmr36dbcn2ah9pzhc46zh1va7y7w3zr4mpmyf626m1bq0alb39"; depends=[pryr rms]; }; + hIRT = derive2 { name="hIRT"; version="0.3.0"; sha256="0s0i6p9iv0yv0l15dnwkpcmc91751jyjs1y1nz671lz6jpb8rz5c"; depends=[ltm Matrix pryr rms]; }; + hJAM = derive2 { name="hJAM"; version="1.0.0"; sha256="1pnjcn54zi4d7h9zc9wr1gv51dzb0vasfcrw4c1kqymhxsq2yfh3"; depends=[dplyr ggplot2 ggpubr reshape2]; }; hNMF = derive2 { name="hNMF"; version="0.9"; sha256="0qavavgiqah4dv0gz8v5ssz637sd341n9s0pyc232n2jhqpzl0cz"; depends=[MASS NMF nnls oro_nifti R_matlab rasterImage spatialfil]; }; hR = derive2 { name="hR"; version="0.2.1"; sha256="1y0rzcrxb21fhxnpvhijxg0syhj8n20882cy79g5x4rv4xrngw1z"; depends=[data_table data_tree knitr rhandsontable shiny]; }; hSDM = derive2 { name="hSDM"; version="1.4.1"; sha256="1jwqjzr0zpckzh2jpqh17v6ypq4mzn5khlv6p37y59zz8bh9mvxp"; depends=[coda]; }; haarfisz = derive2 { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; }; - hablar = derive2 { name="hablar"; version="0.2.0"; sha256="0242gqcjh04kgv1zf9idm4v2vrxm1vm8nvwhcl3mf08w9a8la2aw"; depends=[dplyr]; }; + hablar = derive2 { name="hablar"; version="0.3.0"; sha256="12gm5n3p2kmjwhkf60n4bjn3lrj7lrs5sgmvads9sfp2ckhaiysk"; depends=[dplyr lubridate purrr]; }; hackeRnews = derive2 { name="hackeRnews"; version="0.1.0"; sha256="0vrdbk4dxbykb3hs35nxkl3s2ds92gs5qz66p85w8j5zjmwbw2x6"; depends=[future_apply httr jsonlite tibble]; }; hagis = derive2 { name="hagis"; version="3.0.1"; sha256="1bljpva3j7x87hdmy8s9sh37r5vd8wkjzjqbk57akl654x6b0gfv"; depends=[data_table ggplot2 pander]; }; hail = derive2 { name="hail"; version="0.1.1"; sha256="1nrc9msqyy5iq2i6p8875anbqswxl2z6vdd4hvihnl22qh5fnbvh"; depends=[]; }; + hal9001 = derive2 { name="hal9001"; version="0.2.5"; sha256="16pzcjk0d7kvj3f8dxxzz5sjcsa6m5axc8rb29vxpmg54kyqypys"; depends=[assertthat glmnet Matrix origami Rcpp RcppEigen]; }; + haldensify = derive2 { name="haldensify"; version="0.0.5"; sha256="02bmch7impx5cyv7nifhqln2ppk1qyyzr8w6my77p18wx52h1d4l"; depends=[assertthat data_table future_apply ggplot2 hal9001 origami Rdpack]; }; halfcircle = derive2 { name="halfcircle"; version="0.1.0"; sha256="1gbqbv3cn8w09i3f2ji3qq0snb4fy9243y12agw686fx46dfmhxs"; depends=[scales]; }; hamlet = derive2 { name="hamlet"; version="0.9.6"; sha256="076fh28grlrv38qywshi79m84jsz1ck9k4n0rg4svvr3gqkdbcn2"; depends=[]; }; handlr = derive2 { name="handlr"; version="0.2.0"; sha256="1p14q9swvy8yvd52wcms777vfcb9vandi0pd4cmqmyz1hpsi31d8"; depends=[crul jsonlite mime RefManageR urltools xml2]; }; @@ -8650,18 +8764,17 @@ in with self; { haploR = derive2 { name="haploR"; version="3.0.1"; sha256="162wqjpmgapy54n8msrw5apgzj586ps0kkc5wmbqay3l94xgnvzk"; depends=[DT httr plyr RCurl RUnit tibble XML]; }; haploReconstruct = derive2 { name="haploReconstruct"; version="0.1.2"; sha256="17zdl9c3yy6jdzv1wp0ailbga456pmmybzxh3dldymhj8qf32cx0"; depends=[data_table dbscan foreach gplots igraph matrixStats stringi zoo]; }; haplotyper = derive2 { name="haplotyper"; version="0.1"; sha256="0pcshlh29c4zazhkcq4371kqh9inrbx494y5a1qb1k2c92fkax31"; depends=[]; }; - haplotypes = derive2 { name="haplotypes"; version="1.1"; sha256="0qnsrjzanyyiar8zpmwvfks3gj7cl8libnyg8bx983p25jwifcwl"; depends=[ape network pegas phangorn plotrix sna]; }; + haplotypes = derive2 { name="haplotypes"; version="1.1.2"; sha256="07grdwli0kxnnnf7mg8z7gjpny88h71vf867g50f08yybgb46y70"; depends=[ape network phangorn plotrix sna]; }; happybiRthday = derive2 { name="happybiRthday"; version="0.0.1"; sha256="0rrvi5kx09p74xwxvqcwibbh4qjlk4jxb89grx74chjxk9ak2yv8"; depends=[data_table dplyr gh lubridate tidyr]; }; happytime = derive2 { name="happytime"; version="0.1.0"; sha256="03iblwb6w2dh9sibfi4nlswidck13hzsn7123838zp4sxfnrp041"; depends=[]; }; hapsim = derive2 { name="hapsim"; version="0.31"; sha256="0jw6iw89d4y8wjy58biv40szp123ql7frz1mmdjdxljmwaby963h"; depends=[MASS]; }; - hardhat = derive2 { name="hardhat"; version="0.1.1"; sha256="06l4zcqz76c2m9lxa5d6wqcbq1xkkxk0wynka09y5fyh9q82c0g6"; depends=[glue rlang tibble vctrs]; }; + hardhat = derive2 { name="hardhat"; version="0.1.2"; sha256="1fhs6inbjh7kdv6jamibpb2fccysg1k0w99hbdwhrc5yyljpqfil"; depends=[glue rlang tibble vctrs]; }; harmonicmeanp = derive2 { name="harmonicmeanp"; version="3.0"; sha256="17irfw8788yhh36698p9w8wab6wcin1yzfinlbs3gdg70d42zcnd"; depends=[FMStable]; }; harrietr = derive2 { name="harrietr"; version="0.2.3"; sha256="0n6vsqysj4ijh06z6nqmj8x1z4w9711dxhbfp8p8fwi0l75pj0cj"; depends=[ape dplyr ggtree lazyeval magrittr rlang tidyr]; }; - harrypotter = derive2 { name="harrypotter"; version="2.1.0"; sha256="151kpg47b1hyv6rc3cksykqw8pz0xqm0q9xf9sxa2w14ibymvc8k"; depends=[ggplot2 gridExtra]; }; + harrypotter = derive2 { name="harrypotter"; version="2.1.1"; sha256="1j3sv0rpp4lcrf09j4a3an4lkwi2x1z18iv62fk6c2kpp9b14b8r"; depends=[ggplot2 gridExtra]; }; hash = derive2 { name="hash"; version="2.2.6.1"; sha256="0b3fl0rvgwb992knl81vm99lsldg5clvaqjh6mamm6zqmb6dz056"; depends=[]; }; hashFunction = derive2 { name="hashFunction"; version="1.0"; sha256="1v57xj8xwv6xhxvgp0zxgvs5vcjw8z5k2ciwbn0jxf4ilyd66cgj"; depends=[]; }; hashids = derive2 { name="hashids"; version="0.9.0"; sha256="0233qly4rb1g4znxm9h9h8gskzrjyav6nd26xkdl7990m5hcbcwh"; depends=[]; }; - hashmap = derive2 { name="hashmap"; version="0.2.2"; sha256="1qypmyi033rjxjk055rv94qfqa99gm5hj5gfd9fiiq1xln3z700j"; depends=[BH Rcpp]; }; hashr = derive2 { name="hashr"; version="0.1.0"; sha256="1ri2zz2l1rrc1qmpqamzw21d9y06c7yb3wr60izw81l8z4mmyc3a"; depends=[]; }; hasseDiagram = derive2 { name="hasseDiagram"; version="0.1.3"; sha256="1r9z6jc9lbdj2xc81gpnbswrl8rhs8zrlsnypfrny40g3j402iap"; depends=[graph Rgraphviz]; }; haven = derive2 { name="haven"; version="2.2.0"; sha256="0g9d6mxqmrw2zdms78jpx2sx73pczlyy771v1h5hmxqz9sqyk7hr"; depends=[forcats hms Rcpp readr rlang tibble tidyselect]; }; @@ -8685,7 +8798,7 @@ in with self; { hdd = derive2 { name="hdd"; version="0.1.0"; sha256="0hnqjfp78s8fiabibf0dl57sj170ri1ysf7pyrk45z4qsnizbyn2"; depends=[data_table fst readr]; }; hddplot = derive2 { name="hddplot"; version="0.59"; sha256="18llkpawm12cjxlcrlra60m16virfpjqiaqkvy9mb3wq1zif61rh"; depends=[MASS multtest]; }; hddtools = derive2 { name="hddtools"; version="0.8.2"; sha256="02gbqlzwxc77gllgz9sf2s73y4ngyb4warabdfyj2sm2g7jl6y12"; depends=[gdata Hmisc raster RCurl rgdal rnrfa sp stringr tibble XML zoo]; }; - hdf5r = derive2 { name="hdf5r"; version="1.3.1"; sha256="0hvi2cvyv6zlxgpawnmsihxclp2ln88slbrnmaxagmjswskxsrpx"; depends=[bit64 R6]; }; + hdf5r = derive2 { name="hdf5r"; version="1.3.2"; sha256="0c2p06k9bp9rf0fyavnxw5d8jr2bbgx3gjblahz581cpvsfksj9i"; depends=[bit64 R6]; }; hdfqlr = derive2 { name="hdfqlr"; version="0.6-1"; sha256="1z8sylaaki8ab9k7m4hp3530rnkxjh39zvw4n962fw5fb9a11dx3"; depends=[]; }; hdi = derive2 { name="hdi"; version="0.1-7"; sha256="1q58bvlqh59hv3vb3dw92r0w1nwyifnqm5ccss54fzmf2gjsj1cj"; depends=[glmnet linprog MASS scalreg]; }; hdlm = derive2 { name="hdlm"; version="1.3.1"; sha256="1zl6bksw0apkmn5shf8qjpxjyx6vb40dc4m4db76hhn5nhcp10ic"; depends=[foreach glmnet iterators MASS Matrix]; }; @@ -8695,19 +8808,20 @@ in with self; { hdpca = derive2 { name="hdpca"; version="1.1.3"; sha256="09h96wm6r6w1imkm4k9bg5l0vcq2yvbp6iqx786x99ds8jzppsb9"; depends=[boot lpSolve]; }; hdrcde = derive2 { name="hdrcde"; version="3.3"; sha256="0c2qbw4c3mq1cb068kjs72rxlbibz8svwcrx853jyr8ybs23z7ab"; depends=[ash ggplot2 KernSmooth ks locfit RColorBrewer]; }; hds = derive2 { name="hds"; version="0.8.1"; sha256="1smg5ixrl7f2x3wn7s5i26dyadn5sigpf4jsk236z1bhnz617ax4"; depends=[survival tensor]; }; - healthcareai = derive2 { name="healthcareai"; version="2.3.0"; sha256="0lyx9fldw28gx2lr2cpi7lyrwf5qz549v2vqxjx83ih5kxm6mlnp"; depends=[caret cowplot data_table dbplyr dplyr e1071 forcats generics ggplot2 glmnet lubridate MLmetrics purrr ranger recipes rlang ROCR stringr tibble tidyr xgboost]; }; + healthcareai = derive2 { name="healthcareai"; version="2.4.0"; sha256="04bv187agpmzb1igfdjb4naqlpffp4za7skb75xxr2hb1rcgcdvw"; depends=[caret cowplot data_table dplyr e1071 generics ggplot2 glmnet lubridate MLmetrics purrr ranger recipes rlang ROCR stringr tibble tidyr xgboost]; }; healthforum = derive2 { name="healthforum"; version="0.1.0"; sha256="13ih00amv9hrpngm6pxc8vzqzhx8c0yqgaprxdcp5li90lg5r3av"; depends=[magrittr purrr rvest stringr tokenizers xml2]; }; heatex = derive2 { name="heatex"; version="1.0"; sha256="0c7bxblq24m80yi24gmrqqlcw8jh0lb749adsh51yr6nzpap6i9n"; depends=[]; }; heatmap_plus = derive2 { name="heatmap.plus"; version="1.3"; sha256="0rzffm15a51b7l55k0krk6w7v8czy3vpwz1qmbybr7av0pln7wn3"; depends=[]; }; - heatmap3 = derive2 { name="heatmap3"; version="1.1.6"; sha256="13aa9rd16k67b1fr6471bdz2a1i04k7279ck1i4rjdly9rbksnjx"; depends=[fastcluster]; }; + heatmap3 = derive2 { name="heatmap3"; version="1.1.7"; sha256="1gdjc5b4f4nf5zpfdl0ch352p3bwbcw5hkd5vlarxvb2qkf9pcxs"; depends=[fastcluster]; }; heatmapFit = derive2 { name="heatmapFit"; version="2.0.4"; sha256="1rswp1wp58f21fpyjybcvvmnn53kr54ij83hp05qbvl7yn1fsnrb"; depends=[]; }; - heatmaply = derive2 { name="heatmaply"; version="1.0.0"; sha256="0576gml3bcl7r1biigzj1rag2xzz422knbw7arc8d2gsakjj757g"; depends=[assertthat colorspace dendextend egg ggplot2 htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis webshot]; }; + heatmaply = derive2 { name="heatmaply"; version="1.1.0"; sha256="133q8ir45vhfxs2lnd96k97g21ihg2arfhp349kmk339pk32fcxz"; depends=[assertthat colorspace dendextend egg ggplot2 htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis webshot]; }; heatwaveR = derive2 { name="heatwaveR"; version="0.4.2"; sha256="1fp38vlb4646jg397gsxmf5ws15grmmg6hdzijwll5zsg6a9xhg4"; depends=[data_table dplyr ggplot2 lubridate plotly Rcpp RcppArmadillo RcppRoll tibble zoo]; }; heavy = derive2 { name="heavy"; version="0.38.196"; sha256="05k788ynw9fhhmjydzp8dbk1vhl44j2rz2shqwn02i40jmwdvwrk"; depends=[]; }; - heddlr = derive2 { name="heddlr"; version="0.5.0"; sha256="1xjlp283vv6fwdjyschjriijczhiiinjmkd3i1m5f57n0yvwpq03"; depends=[rlang utf8 yaml]; }; + heddlr = derive2 { name="heddlr"; version="0.6.0"; sha256="0ixmcgvfbq4hi3wv1fyzpwacmxmixsw5yq6mq5xygk6ji03m1v23"; depends=[rlang utf8 yaml]; }; hedgehog = derive2 { name="hedgehog"; version="0.1"; sha256="1mvjnm2zlc4pvw9vnhxr0dj1g1sfqvlrnnhcipzfbvr147yan9l5"; depends=[rlang testthat]; }; - heemod = derive2 { name="heemod"; version="0.11.0"; sha256="0zzjq4cmyr25p4x91jw542jiqmds6qikbp8gyix34dcmk765drnk"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr rlang tibble]; }; + heemod = derive2 { name="heemod"; version="0.12.0"; sha256="14fa2bcmzxymnis6kj46phbcbxz2a9i9p8cqpq6s6c6hzj5g9fw6"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr purrr rlang tibble]; }; heims = derive2 { name="heims"; version="0.4.0"; sha256="0vnq31jwn09grni4gdhf1hzd87b62as4f65b2qw7ky6mi38ahr5d"; depends=[bit64 data_table fastmatch hutils lubridate magrittr]; }; + helda = derive2 { name="helda"; version="1.0.1"; sha256="1qfnqa94csq7c67prpmyvnkkzbylv4cq4zsmici9c19s9yw4kf76"; depends=[dplyr ggplot2 rlang sqldf stringr]; }; helixvis = derive2 { name="helixvis"; version="1.0.1"; sha256="113rnpnrcnw18ks78fgq79zdrw3kmpzpimlc45gvj0za2fbyci3p"; depends=[ggforce ggplot2 rlang]; }; hellno = derive2 { name="hellno"; version="0.0.1"; sha256="1j787rw9hh75bvkckmlz5xkgwc22gd7si3mgjd7v60dd6lykfa88"; depends=[]; }; helloJavaWorld = derive2 { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; }; @@ -8715,35 +8829,35 @@ in with self; { helsinki = derive2 { name="helsinki"; version="0.9.29"; sha256="0bn5iyxjn9qs6f0dmhv51ssayywbx1rayh80zbzk0gsm94nhs0d9"; depends=[maptools RCurl rjson sp]; }; heplots = derive2 { name="heplots"; version="1.3-5"; sha256="1vyhfkp66gi17jni3gsbv9kn1s0n00qigr13q8xbzbgylz5jjiln"; depends=[car MASS]; }; here = derive2 { name="here"; version="0.1"; sha256="1vb5dxqdpimy51q1gjsypyq14p2hhvj7wsvh6g35pj1g03cyg9av"; depends=[rprojroot]; }; - hereR = derive2 { name="hereR"; version="0.3.0"; sha256="119py0lpbnc03v2md3wg5pbq7kz40rw82jhmc529i6hkz4qf65js"; depends=[curl data_table jsonlite lwgeom sf stringr]; }; + hereR = derive2 { name="hereR"; version="0.3.3"; sha256="0z8w50cjz2zivdlbxipn8av055ssgrv9077v4413xkjgv4c000f1"; depends=[curl data_table jsonlite lwgeom sf stringr]; }; heritability = derive2 { name="heritability"; version="1.3"; sha256="0a0pw8hppkgypl4jaa38hks9nxfwz2zbsd4w6w40j1hxlyy4km8m"; depends=[MASS]; }; hermite = derive2 { name="hermite"; version="1.1.2"; sha256="0j9s7ayvbvmgwybrvf703b72qbn8gskb105pis19ig2sslllzda3"; depends=[maxLik]; }; hero = derive2 { name="hero"; version="0.4.7"; sha256="129v2pjbxm5aalr5lfx0kh20rhwksnb80pc459pxg0xkwxvy1l3d"; depends=[fields Matrix optimx pbapply rgeos sp]; }; - hesim = derive2 { name="hesim"; version="0.2.2"; sha256="1wchccw9761iz0sk5sd8ahdzpphrd4k9rmgg8f9cgp43aza68ic2"; depends=[data_table flexsurv MASS R6 Rcpp RcppArmadillo survival]; }; + hesim = derive2 { name="hesim"; version="0.2.3"; sha256="1x4bhg2rmp8vf0fhpnj7pkfaywcss203c9n23b43hafzy5pkcd6w"; depends=[data_table flexsurv MASS R6 Rcpp RcppArmadillo survival]; }; het_test = derive2 { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; }; hetGP = derive2 { name="hetGP"; version="1.1.2"; sha256="0r7hzw6ccyrqpq51adljd2ljv9dl00c0dr8frjrhibpzpc68z3sz"; depends=[DiceDesign MASS Rcpp]; }; hett = derive2 { name="hett"; version="0.3-2"; sha256="1kmspw0738pdall5scmllsa79dynliai2glk1h5rzm4030r5rd6j"; depends=[lattice MASS]; }; hettx = derive2 { name="hettx"; version="0.1.1"; sha256="0zfxg88l83pzj37c5khpv4vi0v28fdnp0p8yz39scm8d8lya1dkm"; depends=[doParallel dplyr foreach formula_tools MASS moments mvtnorm plyr purrr quantreg tidyverse]; }; heuristica = derive2 { name="heuristica"; version="1.0.2"; sha256="1wqdwggnma6p667ivr0xja4vvn3jgzbkc5whkkijmdmxpjzg1wz6"; depends=[Hmisc]; }; - heuristicsmineR = derive2 { name="heuristicsmineR"; version="0.2.1"; sha256="0zpkkz20jlppdvsxcxs0w2n79af21ry1vvmbqlm1scgkr86674yd"; depends=[BH bupaR data_table DiagrammeR dplyr ggplot2 ggthemes magrittr petrinetR processmapR purrr Rcpp rlang scales tidyr]; }; + heuristicsmineR = derive2 { name="heuristicsmineR"; version="0.2.4"; sha256="0dp85yvn0fr22l174ff34pv9xfxh3d7na9dxim2z7f4ialdnialw"; depends=[BH bupaR data_table DiagrammeR dplyr ggplot2 ggthemes magrittr petrinetR processmapR purrr Rcpp rlang scales stringr tidyr]; }; hexSticker = derive2 { name="hexSticker"; version="0.4.6"; sha256="02zdnxnhci0d9dclb6z3zc8sm1c4bj8zzbapwy34h8bs3sz1c8xn"; depends=[ggimage ggplot2 hexbin showtext sysfonts]; }; hexView = derive2 { name="hexView"; version="0.3-4"; sha256="01hiqyibsd4as7jcklzg09pl12la341mg561vn16z4jzdarfvkfc"; depends=[]; }; - hexbin = derive2 { name="hexbin"; version="1.28.0"; sha256="0b58jb1kz39wzrnkv077cfzns889xly7psvhxnm3xmnx6yvd986d"; depends=[lattice]; }; + hexbin = derive2 { name="hexbin"; version="1.28.1"; sha256="1ry6jm3lqz3mj0s5rzbs6mpkz2hxpnvbw8c1vwc4pj7b173r5l22"; depends=[lattice]; }; hextri = derive2 { name="hextri"; version="0.6"; sha256="05rvigi225npncbr1brc6apc7gsg9a5jzcbmhvflwp3hbcg3hn02"; depends=[FNN hexbin]; }; hflights = derive2 { name="hflights"; version="0.1"; sha256="1rb6finck13i6949i6hsgfk90q4ybxh1m3is2mlw2m6087bpzfbd"; depends=[]; }; hglasso = derive2 { name="hglasso"; version="1.2"; sha256="1qq41ma33wz7qjs5zx72yvngpsiq62z9sd6d5hvvl83brq0fcr4b"; depends=[fields glasso igraph mvtnorm]; }; hglm = derive2 { name="hglm"; version="2.2-1"; sha256="1lyxkvqzfll1qrz5c2km9ikhq0dm63x39by4vc1nmkd24yza93nc"; depends=[hglm_data MASS Matrix]; }; hglm_data = derive2 { name="hglm.data"; version="1.0-1"; sha256="0mw1s0kahsh9jmwkxysfy5f7vbld7mpzmdnnww6im5h21jhnczx2"; depends=[MASS Matrix sp]; }; - hgm = derive2 { name="hgm"; version="1.17"; sha256="11hv4pfv3gqiargvwvrxqzfji75j291w1nilawf8yjc3isnc4wjp"; depends=[deSolve]; }; + hgm = derive2 { name="hgm"; version="1.18"; sha256="0d0s4hkn46cg85wl7nmjn707iw38kjs69p6xz33pzc1yf51l8z7w"; depends=[deSolve]; }; hgutils = derive2 { name="hgutils"; version="0.2.7"; sha256="1svxhz80h84wn1fj58p8g3rp553ima1wfdbbkm2cqnihwjxhha62"; depends=[crayon dplyr limSolve magrittr stringr]; }; - hhh4contacts = derive2 { name="hhh4contacts"; version="0.13.0"; sha256="17f31xhh6kk7sx5d5dvpwpvl72wd45zgb4fcpdayx3yrm719csz9"; depends=[surveillance]; }; + hhh4contacts = derive2 { name="hhh4contacts"; version="0.13.1"; sha256="1cqwn09iqgh6131cm4b5j0kx7k5vil0ak42v064g4maayj0yqy7p"; depends=[surveillance]; }; hhi = derive2 { name="hhi"; version="1.2.0"; sha256="1yl52c3nqdi8v60sr01l0vv8359803dm2i4c9ifazgj3h3a4h0yp"; depends=[ggplot2]; }; hht = derive2 { name="hht"; version="2.1.3"; sha256="022a8zz2m34q89h29jglfj21knlqd8dwi85qmsi78ly1vacnzap8"; depends=[EMD fields spatstat]; }; hiPOD = derive2 { name="hiPOD"; version="1.0"; sha256="1i15ickz2s0kffh99qq30pl5hsl0lbj0kp55jnbv4x72hndzhmla"; depends=[rgl]; }; hiddenf = derive2 { name="hiddenf"; version="2.0"; sha256="0shc1kfiq527mkc5i97zcm51hsvknnhjg7dyfvbfqyk145v6sz00"; depends=[]; }; - hier_part = derive2 { name="hier.part"; version="1.0-4"; sha256="03acdgzkhbk4p0wxw2g1hzklmq9hzmdkkvfj742vzfswdd803yg9"; depends=[gtools]; }; + hier_part = derive2 { name="hier.part"; version="1.0-6"; sha256="15wlpb2rsn6am8galsbjiy4psp78nlv1x2hz3cnqbwj508w6gsj0"; depends=[betareg gtools MASS]; }; hierDiversity = derive2 { name="hierDiversity"; version="0.1"; sha256="1n4jg003h9hvr2n43jwxgfpazvc5ij5lqvspxi49w8fpzpcrqrjj"; depends=[]; }; - hierNet = derive2 { name="hierNet"; version="1.8"; sha256="06ag2vnpdjpmw9q0gzghkxsqx6mh743j8wpsbah4ff742h23hy0w"; depends=[]; }; + hierNet = derive2 { name="hierNet"; version="1.9"; sha256="0fdnj50s985w06wrjc67hcy6fc4lj8jbxlskgrli9m0181vbdj69"; depends=[]; }; hierarchicalDS = derive2 { name="hierarchicalDS"; version="3.0"; sha256="16d6l3y21nhynfjk4swp3pnjr6vhcxq369djgxz907zsjby35gkz"; depends=[coda ggplot2 Matrix mc2d MCMCpack mvtnorm rgeos truncnorm xtable]; }; hierarchicalSets = derive2 { name="hierarchicalSets"; version="1.0.2"; sha256="0m5mnx1zmiscj0k1gnljr7fla4y1qhysi32a8q9jlah2q7grk7x9"; depends=[ggdendro ggplot2 gtable MASS Matrix RColorBrewer Rcpp scales]; }; hierband = derive2 { name="hierband"; version="1.0"; sha256="0d95hrgkd8b5sww3wsgs6v9zg9pm71ick8x8kj8d6vyib350h6yn"; depends=[]; }; @@ -8753,9 +8867,9 @@ in with self; { highSCREEN = derive2 { name="highSCREEN"; version="0.3"; sha256="179l82n7l7dfn40k6zgigw56ggwqyi34gllc2wvcw3yvfnd3l7s4"; depends=[gplots]; }; highTtest = derive2 { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqmfcg4536lhyn5p6w88sq1vj74qr5wzydga1"; depends=[]; }; highcharter = derive2 { name="highcharter"; version="0.7.0"; sha256="0qfv25dqr7l54jq3vrnwphsj7wzk0an3vfx1zik36wi05yf2w8br"; depends=[assertthat broom crosstalk dplyr htmltools htmlwidgets igraph jsonlite lubridate magrittr purrr quantmod rlang rlist stringr tibble tidyr whisker xts yaml zoo]; }; - highfrequency = derive2 { name="highfrequency"; version="0.6.3"; sha256="0fhkarhqgrigbfakf5lmandc5wmdb4q9dq974wygifa3j6khqxz4"; depends=[cubature data_table lubridate mvtnorm Rcpp RcppArmadillo RcppRoll readr robustbase xts zoo]; }; + highfrequency = derive2 { name="highfrequency"; version="0.6.5"; sha256="1j7wn75xql6pw7inmvh9729l320wd3ss68jhz7y8cp4c60w2mkww"; depends=[cubature data_table lubridate mvtnorm Rcpp RcppArmadillo RcppRoll readr robustbase xts zoo]; }; highlight = derive2 { name="highlight"; version="0.5.0"; sha256="1shar4y07wyixg0ichdrn2xhgwkl3mv2pxkalqzisc69w605b3hf"; depends=[]; }; - highlightHTML = derive2 { name="highlightHTML"; version="0.2.1"; sha256="06k2idx9aadjd6xp6kadm9jh7ap1hwg7vh0bc8vw9ll82wcp1nv1"; depends=[]; }; + highlightHTML = derive2 { name="highlightHTML"; version="0.2.5"; sha256="0j3zrvil7k5wfsbgfj2b4nbx77qsj3b4makv5angcf8s59p7q80r"; depends=[]; }; highmean = derive2 { name="highmean"; version="3.0"; sha256="1lq7z0l1737j4wvsy7951405afylyywp7vf2i7girzh459fdfzpc"; depends=[MASS mnormt mvtnorm]; }; highr = derive2 { name="highr"; version="0.8"; sha256="0my6idnhmmgs4q1vs40y2lh56yij2p59mpwvm53wjs2zk6x1zl2b"; depends=[]; }; highriskzone = derive2 { name="highriskzone"; version="1.4.5"; sha256="09ad025ydpfsrkcfqsfm4cj6lk8shrdh6vyya7isqwrd5jfyf1qc"; depends=[deldir fields ks maps Matrix mvtnorm rgeos spatstat]; }; @@ -8765,7 +8879,7 @@ in with self; { hillR = derive2 { name="hillR"; version="0.4.0"; sha256="0wivagbn4clfm3vbxbl3p93d9yxms94gkvi7p15lh0jfdppzm4c9"; depends=[ade4 ape FD plyr tibble]; }; hilldiv = derive2 { name="hilldiv"; version="1.5.1"; sha256="1jp4xvrpqd575y2x0i73s0bq708bzi6gdhqgz85bia6d5kf05lq9"; depends=[ape data_table FSA geiger ggplot2 ggpubr qgraph RColorBrewer scales vegan]; }; hillmakeR = derive2 { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; }; - hindex = derive2 { name="hindex"; version="0.1.0"; sha256="12w1zz467grihjvan1db7c30psm0j85k82p01fzqgwdam3cd8as3"; depends=[foreach ggplot2]; }; + hindex = derive2 { name="hindex"; version="0.2.0"; sha256="01mcd2br33qqkfcyxl584f3l6kyb2cgzpd207p0mynzdaallgxgc"; depends=[foreach ggplot2 purrr]; }; hindexcalculator = derive2 { name="hindexcalculator"; version="1.0.0"; sha256="06b4dn629avmnyqxb0l39m00wz9cg9dddmm6qhgwgnzlxh14ifgk"; depends=[]; }; hint = derive2 { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; }; hipread = derive2 { name="hipread"; version="0.2.1"; sha256="0zll3w0arwjaz16dr9dxns3s25p3fiq4ccnziq4nw7i552zaixd7"; depends=[BH R6 Rcpp rlang tibble]; }; @@ -8785,7 +8899,7 @@ in with self; { hmi = derive2 { name="hmi"; version="0.9.17"; sha256="08cppa061xn13lyp7d9jsybn0cc6k2ffml79m5bp7fk11gzq18mb"; depends=[boot coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm rlang tmvtnorm VGAM]; }; hmlasso = derive2 { name="hmlasso"; version="0.0.1"; sha256="0ydcyz9pw30ji8ghrvkgcbmp27d661vajl97b8cwis52605a3gfx"; depends=[BH MASS Matrix Rcpp RSpectra]; }; hmm_discnp = derive2 { name="hmm.discnp"; version="2.1-12"; sha256="1jxbwqh0cc0f07qza0kjbhh3zy7xlk5q7gb8078kprg37if1qd2p"; depends=[nnet]; }; - hmmhdd = derive2 { name="hmmhdd"; version="1.0"; sha256="16jz951d1ssai0gmfnnfikkkvc8yca29a82dq7092kbzwc4i90sk"; depends=[gmfd mvtnorm roahd]; }; + hmma = derive2 { name="hmma"; version="1.0.0"; sha256="1gpdq1pka9j0yvci791g74kgrvbz9x9gnw7irf0048msis0lqcv4"; depends=[bnlearn graph MCMCpack mhsmm Rgraphviz]; }; hmmm = derive2 { name="hmmm"; version="1.0-4"; sha256="1sbr85lcmcw3lv0ygqwfbarr91dp3br1xnlygy49145cvl93nfci"; depends=[MASS mvtnorm nleqslv quadprog]; }; hms = derive2 { name="hms"; version="0.5.3"; sha256="1baki0qw5ijgiflvsdvqj3apg4yanf12vx14kwbqdzk5rz46fasf"; depends=[pkgconfig rlang vctrs]; }; hmstimer = derive2 { name="hmstimer"; version="0.0.2"; sha256="0qv2pls6mplnv3mylbiwh83gnvq2qkdpnnjnxnhrgmwia9fapixs"; depends=[]; }; @@ -8807,7 +8921,7 @@ in with self; { hornpa = derive2 { name="hornpa"; version="1.0"; sha256="0pfvk2jkrwgvshgq9g55qijgpjh0677rpbya0r8759n92v3axbp4"; depends=[]; }; horserule = derive2 { name="horserule"; version="1.0.0"; sha256="0d348pn0ld7lr9lfl1z05905l9kl296j0xic1pib6r5l1c5600r9"; depends=[gbm ggplot2 inTrees MASS mvnfast randomForest RColorBrewer Rdpack]; }; horseshoe = derive2 { name="horseshoe"; version="0.2.0"; sha256="1qhkw6agkhpmgf27429c3kqqhbvpg61l0dvfxg7n564y2ha76r3c"; depends=[]; }; - hot_deck = derive2 { name="hot.deck"; version="1.1"; sha256="13pfgcyqaf5ik3pi8vgm06xmqli4hgslzlmhy1zi951anzdr49bd"; depends=[mice]; }; + hot_deck = derive2 { name="hot.deck"; version="1.1-2"; sha256="089sfkpl9m1xxpxxxa9kpc99lcswsz90dhq1k7iji2f7wby5i905"; depends=[mice]; }; hotspot = derive2 { name="hotspot"; version="1.0"; sha256="0a4w5d6rg324hd06lfwr1hxf6bwr10n55s3ynz5bpkh9c61yik3n"; depends=[]; }; hotspots = derive2 { name="hotspots"; version="1.0.3"; sha256="12v88k3yz1bsxx9p5dx8y54ccqcglwknm2jr7ybygdj2yasjr5l0"; depends=[ineq lattice]; }; housingData = derive2 { name="housingData"; version="0.3.0"; sha256="0ngfx2vjx705xixzpz0rgx1481cr2szj4yfi5g7ma1hhivddl7d1"; depends=[]; }; @@ -8815,116 +8929,119 @@ in with self; { hpa = derive2 { name="hpa"; version="1.0.1"; sha256="18055gh3nasdh6fh1xw95zl2vidqkw5b99b1zhh78j84lzs6r3gm"; depends=[Rcpp RcppArmadillo]; }; hpackedbubble = derive2 { name="hpackedbubble"; version="0.1.0"; sha256="1br7q4958f1zgvisglsaf41nz2ahnqi3bzazvlfnmk3nq03cb1ri"; depends=[htmlwidgets]; }; hpcwld = derive2 { name="hpcwld"; version="0.5"; sha256="17k4mw41gygwgvh7h78m0jgzh1bivrvrsr8lgxxw3sbkw88lwb40"; depends=[multicool partitions]; }; - hpiR = derive2 { name="hpiR"; version="0.3.0"; sha256="0i15hmcf35kh16nrlc03y5jmrssr3k734s7vym7wbiwfy4x8d37b"; depends=[caret dplyr forecast ggplot2 gridExtra imputeTS lubridate magrittr MASS pdp plyr purrr ranger rlang robustbase zoo]; }; + hpiR = derive2 { name="hpiR"; version="0.3.2"; sha256="0gz9ngnjgys7hzijsma2iyywwiv7vjar5gls28ds11wq8pmsv96n"; depends=[dplyr forecast ggplot2 gridExtra imputeTS lubridate magrittr MASS pdp plyr purrr ranger rlang robustbase zoo]; }; hpoPlot = derive2 { name="hpoPlot"; version="2.4"; sha256="176bf93gjwbi2z7nz81w4aycwax6f7jxvs3236zrmf0f0f4m7bkc"; depends=[functional magrittr Rgraphviz]; }; hqmisc = derive2 { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; }; hqreg = derive2 { name="hqreg"; version="1.4"; sha256="1j6zp3rmpjx409vm7kq159mlawg87wsq0ypdkan34yxxv9py2jmi"; depends=[]; }; - hrIPW = derive2 { name="hrIPW"; version="0.1.2"; sha256="0bgcz4v9cj3aajcp25bv4g7magj54n86qy5nmgr6kqm8sspy260x"; depends=[survival]; }; - hrbrthemes = derive2 { name="hrbrthemes"; version="0.6.0"; sha256="0k6agxva3zqq3z9j8g7ismabvyr7j96qqidck23dgbgwgivjfkkq"; depends=[extrafont gdtools ggplot2 htmltools knitr magrittr rmarkdown scales]; }; + hrIPW = derive2 { name="hrIPW"; version="0.1.3"; sha256="1ns0mxkcfs2jva4wsbqkybgasgyxvxlcfxayky6lrfhic8jxvmg4"; depends=[survival]; }; + hrbrthemes = derive2 { name="hrbrthemes"; version="0.8.0"; sha256="057h60b5p53dcyjyfwlgjc1ry968s9s64dw78p443w8717zk7zpc"; depends=[extrafont gdtools ggplot2 htmltools knitr magrittr rmarkdown scales]; }; hrcomprisk = derive2 { name="hrcomprisk"; version="0.1.1"; sha256="0w0ij2yqgg6gkn3pdaism1xqw3dfnm670j2pmsd85qk1ybxzq9l5"; depends=[survival]; }; - hsdar = derive2 { name="hsdar"; version="1.0.0"; sha256="0lm92bznyhyfzjfd2j6bfqh78pa8qbwf1q7hai9880ghf99fz81m"; depends=[caret raster rgdal signal]; }; + hscovar = derive2 { name="hscovar"; version="0.2.1"; sha256="0cy3x96dmw6cbsrnl3h1npzhxqy8bqy2437kz06qi7d5hmi4q721"; depends=[foreach Matrix pwr rlist]; }; + hsdar = derive2 { name="hsdar"; version="1.0.1"; sha256="1apcch51hagrbm7x3s7wl78bm2mpyxg4py7syz37b58r9dph1905"; depends=[caret raster rgdal signal]; }; hsicCCA = derive2 { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; }; hsm = derive2 { name="hsm"; version="0.2.0"; sha256="066shjikqrrkxpnra4zknax1a0sk5nx9ms1br58vwqqvqq479rym"; depends=[]; }; hsmm = derive2 { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; }; hsphase = derive2 { name="hsphase"; version="2.0.2"; sha256="1b62k9sc6604djy37anslvqjpbrj9wsc9mvnfbrnmhqf4g0nnpdq"; depends=[Rcpp RcppArmadillo snowfall]; }; + hsrecombi = derive2 { name="hsrecombi"; version="0.1.3"; sha256="1b74dq0hry1867zsv52fpxspq1hzzrdvplkfr6n4zg3p9wf2kkxd"; depends=[data_table dplyr hsphase Rcpp rlist]; }; hsstan = derive2 { name="hsstan"; version="0.6"; sha256="14k63agcq8m2lg5pw2309pi78950254v3z2m92pl4wjsikmsqrc1"; depends=[BH ggplot2 loo pROC Rcpp RcppEigen rstan rstantools StanHeaders]; }; htdp = derive2 { name="htdp"; version="0.1.4"; sha256="0w579qp0p544xryb5r08m1nhqf7rmgv9q0lyx6my4av62l70ka5w"; depends=[Rcpp]; }; htm2txt = derive2 { name="htm2txt"; version="2.1.1"; sha256="09q026yy8qm1fb3a4bf9vsp4j09kayl7xmk0p58ikar5l3bmfdjv"; depends=[]; }; htmlTable = derive2 { name="htmlTable"; version="1.13.3"; sha256="0g9r156k9yl1f092hfw3b9wjx11akf0shbi3x0d0mvpnflvc8nfl"; depends=[checkmate htmltools htmlwidgets knitr magrittr rstudioapi stringr]; }; - htmltab = derive2 { name="htmltab"; version="0.7.1"; sha256="0lymagm7z6zn0ddygqxi831ikk74112lkqkbvs5j1djhmr359ajc"; depends=[httr XML]; }; + htmltab = derive2 { name="htmltab"; version="0.7.1.1"; sha256="0nmb8zq6n13zj4rzgg74xpc6y8vkkwn8cqnyszq5h23gnn61inyl"; depends=[httr XML]; }; htmltidy = derive2 { name="htmltidy"; version="0.5.0"; sha256="1djkjff3750fm1sp54kf9cjvsqz2x7ia1ns12h5vqqcvwzfd0701"; depends=[htmltools htmlwidgets Rcpp XML xml2]; }; htmltools = derive2 { name="htmltools"; version="0.4.0"; sha256="06l17d8jkf438yk2mchpsp4j90bynnapz3nabh5vkcc324p5a62v"; depends=[digest Rcpp rlang]; }; htmlwidgets = derive2 { name="htmlwidgets"; version="1.5.1"; sha256="10fp306l1nybkah6jrlrqwwdb6zvklbddp8i3w9v9naj8la5jbnl"; depends=[htmltools jsonlite yaml]; }; htree = derive2 { name="htree"; version="2.0.0"; sha256="15bi5c2p4aghihp3k12s78447j2x9hbsaq56b5lc8jmd1vf0jdwb"; depends=[]; }; - hts = derive2 { name="hts"; version="5.1.5"; sha256="0mvsxrk7wkfn81hbk8a80fckiqiwdbvhq42k7c6lm69gamnbak2f"; depends=[forecast Matrix matrixcalc Rcpp RcppEigen SparseM]; }; - httk = derive2 { name="httk"; version="1.10.1"; sha256="05zbxyxlq94i6v4wwx7znr9p4k5gn9z7yi818v9f76bv8xi7mxv2"; depends=[data_table deSolve magrittr msm mvtnorm survey truncnorm]; }; + hts = derive2 { name="hts"; version="6.0.0"; sha256="17bqby360fnl7gzy6a8immpp711abdj5lf7kvjv13zypgrix3cn9"; depends=[forecast Matrix matrixcalc Rcpp RcppEigen SparseM]; }; + httk = derive2 { name="httk"; version="2.0.1"; sha256="02msk6nb3sscww7pa68finfvpmrf8z4jsw08672q4qz50sjccjlp"; depends=[data_table deSolve magrittr msm mvtnorm purrr survey truncnorm]; }; httpRequest = derive2 { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; }; httpcache = derive2 { name="httpcache"; version="1.1.0"; sha256="11hdc1jj2jbgvsps1h55azq0cr2fl556k631ns9k0747sjfmy2k9"; depends=[digest httr]; }; - httpcode = derive2 { name="httpcode"; version="0.2.0"; sha256="06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv"; depends=[]; }; + httpcode = derive2 { name="httpcode"; version="0.3.0"; sha256="0xig0rvc81hg7mw0iq9s0an1nw24fg0kfs2p2n6dzhwl9w506fjr"; depends=[]; }; httping = derive2 { name="httping"; version="0.2.0"; sha256="0hdcf51yak8yagy4xj9cyck934lgmvpkd08jvlql33ir5mqvvv3i"; depends=[httpcode httr jsonlite magrittr pryr]; }; - httptest = derive2 { name="httptest"; version="3.2.2"; sha256="1q2lhqi5lhdc15wjrcr4z2yxjrfhjkgn0wwxr0mawsfz8cy3703q"; depends=[digest httr jsonlite testthat]; }; + httptest = derive2 { name="httptest"; version="3.3.0"; sha256="1xcq0siyjb17yggaycxgp3byi276vwfa71450zbbzcb8617wsapd"; depends=[curl digest httr jsonlite testthat]; }; httpuv = derive2 { name="httpuv"; version="1.5.2"; sha256="13ax0hs2lc39ilznh1zarwqdzahcbhb8adilrfik3xg0fkljpcwk"; depends=[BH later promises R6 Rcpp]; }; httr = derive2 { name="httr"; version="1.4.1"; sha256="0mp1il13q6n49n2hv1p2p8x6avjan6dr5az19ql4hb78pc3pwp37"; depends=[curl jsonlite mime openssl R6]; }; hues = derive2 { name="hues"; version="0.2.0"; sha256="062i7yc16nmnp15c1jh4xffw2lpklp36wkn1yvagh186ahnlgffx"; depends=[colorspace]; }; - huge = derive2 { name="huge"; version="1.3.4"; sha256="07n3j1va2z4v30rj22cww72khgzbz2xsp0yc0qswlrwyxi4my5i3"; depends=[igraph MASS Matrix Rcpp RcppEigen]; }; + huge = derive2 { name="huge"; version="1.3.4.1"; sha256="11m80dnaxqw5v006q6kvhndl2y5ih5553fcqg4jcaljd8sp9xvvq"; depends=[igraph MASS Matrix Rcpp RcppEigen]; }; humanFormat = derive2 { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; }; humaniformat = derive2 { name="humaniformat"; version="0.6.0"; sha256="0vaynjzz57pk4y1liag9lpn9jkag2033a6bkn28zzm7ndg3344l6"; depends=[Rcpp]; }; humanize = derive2 { name="humanize"; version="0.2.0"; sha256="0hhhd640n77s8xaa2gbd9fckdk2yjg68gdb7wjy56a2khzqfssxr"; depends=[assertthat glue lubridate]; }; - humanleague = derive2 { name="humanleague"; version="2.1.0"; sha256="1mp7lqwx97r60amllz9cjsixw21zspgs4zkp0nc63z315vgfzwrx"; depends=[Rcpp]; }; + humanleague = derive2 { name="humanleague"; version="2.1.2"; sha256="181gz1plz9g8bbjaf67ndhfd2qz5ksnd2l212wm1a383ddc58pmr"; depends=[Rcpp]; }; humidity = derive2 { name="humidity"; version="0.1.5"; sha256="143pn8jjinlda76b94qh5zw2sfajw0ifcx774x6adr2il5a5wm99"; depends=[]; }; hunspell = derive2 { name="hunspell"; version="3.0"; sha256="0mwqw5p0ph083plm2hr2hqr50bjg2dw862dpsfm4l2fgyy3rryq1"; depends=[digest Rcpp]; }; hurdlr = derive2 { name="hurdlr"; version="0.1"; sha256="1ryrqsxa07isxv2zx156bcn36d4yjvwpirb8jqcmqm97q7rmihmq"; depends=[]; }; - hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.1.0"; sha256="1wwa1b96yglmnkvn209v8g0cvx567i2mxd7y6vjzzy5l428cf9f0"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate mapproj maps purrr RColorBrewer rlang stringr tidyr]; }; + hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.1.1"; sha256="0a8xy71dkq2bzdnc90irxmbcxhi0anh87ic22x7b22c3m5605w6s"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate mapproj maps purrr RColorBrewer rlang stringr tidyr]; }; hutils = derive2 { name="hutils"; version="1.5.1"; sha256="1x2x8gg2hdwxj1gz81pjls4y3yilssksirsbjnjd665rjs3jx7fj"; depends=[data_table fastmatch magrittr]; }; hutilscpp = derive2 { name="hutilscpp"; version="0.3.0"; sha256="1x7h1fq6qyylda8k3a1v6s0cx7pf169k86akb6ccwgiikqqsp51h"; depends=[data_table hutils Rcpp]; }; huxtable = derive2 { name="huxtable"; version="4.7.1"; sha256="0nkx6kpvh4z0fby7cv9bvripkqdha4f4c893h53a543q0ap06pjh"; depends=[assertthat generics glue memoise rlang stringr tibble tidyselect]; }; hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; }; + hwig = derive2 { name="hwig"; version="0.0.1"; sha256="0i9is1izwi82gcrngi1k6q6aq548rqpccvs3mp74jinqsw51czcf"; depends=[asnipe data_table spatsoc]; }; hwordcloud = derive2 { name="hwordcloud"; version="0.1.0"; sha256="0civbwv276lcwvfs4qzz14r8rk14kg1ml4zzhi3msnkkh29v70y2"; depends=[colourpicker htmlwidgets shiny wordcloud2]; }; hwriter = derive2 { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; }; hwwntest = derive2 { name="hwwntest"; version="1.3.1"; sha256="1mz5svx5vbisdl5wxdnwip13pq4slyigc7j52l526rr9n0l0pr5v"; depends=[polynom wavethresh]; }; hybridEnsemble = derive2 { name="hybridEnsemble"; version="1.0.0"; sha256="08y11cmlhnl456wxsvh3ll1f9ywkmgqjwlwr3v3qhm54nlanwvkr"; depends=[ada AUC e1071 FNN genalg GenSA glmnet kernelFactory NMOF nnet nnls pso quadprog randomForest reportr Rmalschains ROCR rotationForest rpart soma tabuSearch]; }; - hybridHclust = derive2 { name="hybridHclust"; version="1.0-5"; sha256="0w06vna66hlmvx10dl1l0nzbnxkd634gxjz26w015f83vpmfc5vz"; depends=[cluster]; }; - hybridModels = derive2 { name="hybridModels"; version="0.3.5"; sha256="0bg065j3y3xwxlib9i78pa0ghlblyp4qq1kmh3j02w8xi00rnrs6"; depends=[doParallel foreach ggplot2 GillespieSSA reshape2 stringr]; }; + hybridModels = derive2 { name="hybridModels"; version="0.3.6"; sha256="15405qz4fnvid7ka1l694hcc7s6yv39ff62rsdl7jhzq468qkikj"; depends=[doParallel doRNG foreach ggplot2 GillespieSSA reshape2 stringr]; }; hydra = derive2 { name="hydra"; version="0.1.0"; sha256="0r3r8cds4h15narawxhzkrvgnf00vlgrgqdgnmbzjyyb1dmry8wn"; depends=[]; }; hydroApps = derive2 { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; }; - hydroGOF = derive2 { name="hydroGOF"; version="0.3-10"; sha256="010f2i53rl4fjl65fg5wzaci0kc5khpak5v1zz9yxsj77fmrmvfy"; depends=[hydroTSM xts zoo]; }; - hydroPSO = derive2 { name="hydroPSO"; version="0.4-1"; sha256="0ic43rpcr9n7fjyvw7n57pm9lhqk09pi7lg2nvngj2fg4y8288jb"; depends=[Hmisc hydroGOF hydroTSM lattice lhs scatterplot3d sp vioplot zoo]; }; - hydroTSM = derive2 { name="hydroTSM"; version="0.5-1"; sha256="053id9ldr10mafww3vas9fiy16lz0n1mqqfg6wjsbm5r15jkz3ha"; depends=[automap e1071 gstat lattice maptools sp xts zoo]; }; + hydroGOF = derive2 { name="hydroGOF"; version="0.4-0"; sha256="0fw8b66k7gdkdjxgmdpp3lk9d8p0wmlvhq2rkcvajjb5wd09f43a"; depends=[hydroTSM xts zoo]; }; + hydroPSO = derive2 { name="hydroPSO"; version="0.5-0"; sha256="1g7h4x9d0kadpvcpw6km8mp6d913ff0wjavxz1dcxrz3ix7z7bza"; depends=[data_table Hmisc hydroGOF hydroTSM lattice lhs scatterplot3d sp vioplot zoo]; }; + hydroTSM = derive2 { name="hydroTSM"; version="0.6-0"; sha256="1msavd2k05apsky88zkk1l3c6y3v95fwhmr6xmwsap70bj25krsv"; depends=[automap e1071 gstat lattice maptools sp xts zoo]; }; hydrogeo = derive2 { name="hydrogeo"; version="0.6-1"; sha256="16m6yvr9yhvb0vdh9pqd6gzf3h9km7gd89y6risjddv6g83469k8"; depends=[]; }; hydrolinks = derive2 { name="hydrolinks"; version="0.10.0"; sha256="0004a03bx9l9wq6zdz5az41rjxv1ka4qmnxk6ksy8i7365wsay88"; depends=[dbplyr dplyr httr rappdirs RSQLite sf units]; }; - hydroscoper = derive2 { name="hydroscoper"; version="1.2"; sha256="1aq35rz46ylkwlc6m55c73xyyrcx7p6mmvqj6sac9jdjwn74jvaj"; depends=[jsonlite pingr readr stringi stringr tibble]; }; + hydroscoper = derive2 { name="hydroscoper"; version="1.3"; sha256="03g841a1sbhp2kcdl39b9577lyd9i1241smn41578dcyrxshc2in"; depends=[jsonlite pingr readr stringi stringr tibble]; }; hydrostats = derive2 { name="hydrostats"; version="0.2.7"; sha256="16xrl94289kk1fb6pj0j8q8b40rmsm86fz2msmrmxh7mdp6hmxx9"; depends=[]; }; - hyfo = derive2 { name="hyfo"; version="1.4.0"; sha256="03xd4nm8zmc8gw8rml8svfim64xcslvpmdcldlri9cf89s8v35br"; depends=[data_table ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; }; + hyfo = derive2 { name="hyfo"; version="1.4.2"; sha256="1wpncjrp6ks5s939csf2grcndgg8gkhh9513s1bsqkymf3nq57rk"; depends=[data_table ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; }; hyper_fit = derive2 { name="hyper.fit"; version="1.1.1"; sha256="1xibiydfkhzsw0yqfc0xfzj4yz8xyxqlvnfpyxg33v5fwp9wap3v"; depends=[LaplacesDemon magicaxis MASS rgl]; }; hyper2 = derive2 { name="hyper2"; version="1.0-7"; sha256="155ycb26mgk0ic899ji1pv1k2mmwfzwaa0zj38a9v6fwdgw87rpl"; depends=[cubature magrittr partitions Rcpp]; }; hyperSMURF = derive2 { name="hyperSMURF"; version="2.0"; sha256="1aczsph6ax5xfd5rfvsd9bmgaq3j2f5f82fx8whrgbin0hxz19d8"; depends=[randomForest unbalanced]; }; - hyperSpec = derive2 { name="hyperSpec"; version="0.99-20200115"; sha256="19z65pc6fvgs7dl050fhvljs8ylwag2gdnsvdlniy7q3qr5mv16i"; depends=[dplyr ggplot2 lattice latticeExtra lazyeval testthat XML]; }; - hypercube = derive2 { name="hypercube"; version="0.2.0"; sha256="13b521vpxzk80ldr0v4bayxm4kwssqzpmzlykv5xhghvfdsqxqri"; depends=[dplyr plotly stringr]; }; - hypergate = derive2 { name="hypergate"; version="0.8.1"; sha256="17n8bs869c56jm76nq82alkajbyhbgn6nydzb1zh82i0ns269rlz"; depends=[]; }; + hyperSpec = derive2 { name="hyperSpec"; version="0.99-20200213.1"; sha256="1a1isalw10i7gqhxl0hi6qklv5x089bxhi2jg9fbbk0vw4axr2yx"; depends=[dplyr ggplot2 lattice latticeExtra lazyeval testthat xml2]; }; + hypercube = derive2 { name="hypercube"; version="0.2.1"; sha256="0m0n64rl5fnhvhfdknrza8a0h5lw8vbgakaqbyfx77ixhwqhjn1l"; depends=[dplyr plotly stringr]; }; + hypergate = derive2 { name="hypergate"; version="0.8.3"; sha256="0h36wi4bdxinv7p9alyb7jv1902vdanxx7yvyaw2dcqkdjlzzj49"; depends=[]; }; hypergea = derive2 { name="hypergea"; version="1.3.6"; sha256="1k1525bkkj83j2nn9ixidb8vjvdmc4l9jvfarzgg532gg7wn3841"; depends=[]; }; hypergeo = derive2 { name="hypergeo"; version="1.2-13"; sha256="13jdiy216znwhr91iqnh03mvkmyscw439syb3h4i67dd78sphnvd"; depends=[contfrac deSolve elliptic]; }; hypersampleplan = derive2 { name="hypersampleplan"; version="0.1.1"; sha256="1sk3s1jm46ac4i7p433s3kyngj86kq2821zzhp30a3y8vi1j2psq"; depends=[]; }; hypervolume = derive2 { name="hypervolume"; version="2.0.12"; sha256="0jd49jncmg23vm9rkcy6sd4zjwlw75hwps7wahpb36zs9kb63ssq"; depends=[data_table e1071 fastcluster geometry hitandrun ks maps MASS mvtnorm pdist progress raster Rcpp RcppArmadillo rgeos rgl sp]; }; hypothesestest = derive2 { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; }; hypothesisr = derive2 { name="hypothesisr"; version="0.1.1"; sha256="0z06risagphhvqiw4lrxy52q6q2yr10w2yxsm8iz1wh9ik097pcv"; depends=[dplyr httr jsonlite]; }; - hypr = derive2 { name="hypr"; version="0.1.5"; sha256="0xd4vy4zl0anxgisldxag5qciawcii4v41ix846gn16vd46npfrk"; depends=[MASS pracma]; }; + hypr = derive2 { name="hypr"; version="0.1.6"; sha256="01zn533q43221542m24ybnyx5lhb6sz76qqzfglsaq794l8sr0my"; depends=[MASS pracma]; }; + hystReet = derive2 { name="hystReet"; version="0.0.1"; sha256="08zdsyh82xvnbybwnz5015ds0pcqqid339pvmm3044filk46vyki"; depends=[httr jsonlite lubridate]; }; hysteresis = derive2 { name="hysteresis"; version="2.6"; sha256="00v19m52bg2i3zg8p7yj56axzj9sm64qr61226p5h7sn0zrpws3b"; depends=[car MASS msm]; }; hzar = derive2 { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[coda foreach MCMCpack]; }; iAdapt = derive2 { name="iAdapt"; version="0.1.0"; sha256="0ykcvqm1aswc4iypapml22194nxi6mxvxipy6wj7l9g4cazfa8j8"; depends=[shiny shinydashboard]; }; iBATCGH = derive2 { name="iBATCGH"; version="1.3"; sha256="0pnkkabzi57czcwd9i15nwv8ggwvyxmvn1wam7yrrrbvmi17lmrm"; depends=[msm Rcpp RcppArmadillo]; }; iBST = derive2 { name="iBST"; version="1.0"; sha256="02p7lcr1wrf21v4568jc8hmjcijy3fnbv77s8nlhv2s4p0pgzh5x"; depends=[Rcpp rpart survival]; }; - iBreakDown = derive2 { name="iBreakDown"; version="0.9.9"; sha256="1sxd2x837qmi47p0c9bmy1lqldv2l214qw5n28w3bkwalbdaizyk"; depends=[DALEX ggplot2]; }; + iBreakDown = derive2 { name="iBreakDown"; version="1.2.0"; sha256="0y4zjpyn8j76jrs5phjzs5lfq3lqjspmrwcksqv9wq0rbdgh14vk"; depends=[ggplot2]; }; iC10 = derive2 { name="iC10"; version="1.5"; sha256="1xq6xv582wxdb0nc2nia3q38155gx8z26idiqyx7h1rjb20hhwdl"; depends=[iC10TrainingData impute pamr]; }; iC10TrainingData = derive2 { name="iC10TrainingData"; version="1.3.1"; sha256="175ymib3h359296hk36psryksisipx63ybvacz8hys21irzx58j1"; depends=[]; }; iCARH = derive2 { name="iCARH"; version="2.0.1.1"; sha256="0722dfydq16vhdk7hrdwngkppq0g20ghak614jfnrfr6rnrn630s"; depends=[abind ggplot2 igraph KEGGgraph MASS Matrix mc2d RCurl reshape2 rstan]; }; - iCellR = derive2 { name="iCellR"; version="1.3.0"; sha256="060kyq67aql7ykhr888qd3w8qm65sgix5nhiaxvwsz6jgq7lrrl2"; depends=[ape ggdendro ggplot2 ggpubr ggrepel gridExtra hdf5r Hmisc htmlwidgets knitr Matrix NbClust pheatmap plotly plyr RColorBrewer reshape Rtsne scatterplot3d shiny uwot]; }; + iCellR = derive2 { name="iCellR"; version="1.4.5"; sha256="1pw2pnpp2q2h8iipilbaw6mdm7dkgrw5p7ya1zap04m005jzvap0"; depends=[ape ggdendro ggplot2 ggpubr ggrepel gridExtra hdf5r Hmisc htmlwidgets igraph knitr Matrix NbClust pheatmap plotly plyr progress RColorBrewer reshape Rtsne scatterplot3d shiny uwot]; }; iCiteR = derive2 { name="iCiteR"; version="0.2.1"; sha256="0hbps2q5i7yj6zvqawlayhqqr5iv39yqc0xnk7fvra7rimzc1qid"; depends=[httr]; }; iClick = derive2 { name="iClick"; version="1.5"; sha256="0yq0r9nz1mf9ci6l30ylqxbgl8mf1ahyqzr7m6nks0ygxabipdnd"; depends=[boot car coefplot fBasics forecast lattice lmtest lubridate openair papeR rugarch sandwich timeDate timeSeries xts zoo]; }; iCluster = derive2 { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; }; iDINGO = derive2 { name="iDINGO"; version="1.0.3"; sha256="0aa7g7shcbjzjwhnrh6hd4idjdka9rd7jawkvqvyjnwcql2qlapv"; depends=[GGMridge glasso igraph mvtnorm scales visNetwork]; }; iDOS = derive2 { name="iDOS"; version="1.0.0"; sha256="1jj98ikzvfp6qbnh2j6msi0m89sbmjjafgry43rq7qmczzs81hl8"; depends=[VennDiagram]; }; iDynoR = derive2 { name="iDynoR"; version="1.0"; sha256="01702vl10191mbq2wby1m0y6h8i6y6ic4pa83d27cg3yccsrhziz"; depends=[vegan XML]; }; - iECAT = derive2 { name="iECAT"; version="0.8"; sha256="0kv8db7ss3vk21ccl8qfj4x69npfzwmm3piddj9l0vwrwd3ccl32"; depends=[MetaSKAT SKAT]; }; iFad = derive2 { name="iFad"; version="3.0"; sha256="0jrl9bayihp3wb4k5w9kc71qlsdxk7vl83ydfibx2bg79c4hf3cs"; depends=[coda MASS Rlab ROCR]; }; iGSEA = derive2 { name="iGSEA"; version="1.2"; sha256="1xlz8mbxqnrwyqj7jwma7vmvjlaccajbfxf3hi4wp5qs2pch8806"; depends=[]; }; iGasso = derive2 { name="iGasso"; version="1.4"; sha256="17xxqncl5xcphdqclghcazygcgibf8ijdf4kkl3ga11xf70sahj2"; depends=[CompQuadForm lattice]; }; - iMRMC = derive2 { name="iMRMC"; version="1.2.1"; sha256="0n0i37cqj82cv5ksyva5pkwm5lasgpwljsqm692n4dkmkimc1wv9"; depends=[]; }; + iIneq = derive2 { name="iIneq"; version="1.0.1"; sha256="1mcr084ik1dc5fndj6ci7px4l1y8jz9kr59riqkf0bm6hras5rfg"; depends=[doParallel foreach]; }; + iMRMC = derive2 { name="iMRMC"; version="1.2.2"; sha256="12ljry3gqzqjk72ndc557pn6jz3c23y5hcjlphw4kggrz7wb7b91"; depends=[]; }; iMediate = derive2 { name="iMediate"; version="0.5.5"; sha256="1lwhrzm4g2fcazh782g7p11v5pyx165ig1dzgkmdmjffpwk0w8b4"; depends=[MBESS mvtnorm plotly]; }; - iNOTE = derive2 { name="iNOTE"; version="1.0"; sha256="1969xmgfv9405r09zpd2icvjd9vvzw4dx5qaqxk1a0jvbvhp3h88"; depends=[CompQuadForm mixtools plyr]; }; + iNEXT = derive2 { name="iNEXT"; version="2.0.20"; sha256="14bagsb0ja3j53i0g4a2ax2gj7lyc6sjcc7isdjx94clbnc2zcsg"; depends=[ggplot2 reshape2]; }; + iNZightTools = derive2 { name="iNZightTools"; version="1.8.3"; sha256="1sf3gsxss4xnncjrlw49ljvlzz70zckq14mm5n6kmsz9nwaay2jk"; depends=[chron dplyr forcats haven lubridate magrittr readr readxl stringr survey tibble tidyr validate zoo]; }; iRF = derive2 { name="iRF"; version="2.0.0"; sha256="1ll4lxg743p2zipxcq13yjsc7j7dk766dcyixwxilllbisg0dh8y"; depends=[AUC data_table doParallel dplyr foreach Matrix RColorBrewer Rcpp]; }; iRafNet = derive2 { name="iRafNet"; version="1.1-1"; sha256="0w9bry49apkrrrabglnv5w9l47jakmc30jh8q22a8gazwss293fb"; depends=[ROCR]; }; - iRefR = derive2 { name="iRefR"; version="1.13"; sha256="17kjfga62xc4s1kii5clxszbag2dr1dyxfm7jasr20prx28ya6pp"; depends=[graph igraph RBGL]; }; iRegression = derive2 { name="iRegression"; version="1.2.1"; sha256="1kwsrmsflmqan96aj0dczlszfww1dlg6rwycyid52f7ghg9810rn"; depends=[mgcv]; }; iRepro = derive2 { name="iRepro"; version="1.1"; sha256="1sqg1n83m1308v6bk8ilra8w01frqyd8vpvmv63rllxz38r3vyhz"; depends=[]; }; iSDM = derive2 { name="iSDM"; version="1.0"; sha256="1hzs187mwv3k2wx6dpvkizjhkcx63mznd06wiw6047lf5jrlif0a"; depends=[ade4 colorRamps geometry geosphere maptools MASS pdist raster rgdal rgl sp virtualspecies]; }; - iSTATS = derive2 { name="iSTATS"; version="1.1.0"; sha256="0hkyf3qa35hk8hs4qraz2y433ad93bjmi1mlmzfaw132x96f8zvf"; depends=[Cairo data_table ggplot2 gtools plotly rstudioapi shiny shinyBS shinyWidgets]; }; + iSTATS = derive2 { name="iSTATS"; version="1.2"; sha256="0ddkgszkihlpfi3vq3m3jyr293471vgj27c5frpap0bs404lhqh8"; depends=[Cairo data_table ggplot2 gtools plotly rstudioapi shiny shinyBS shinyWidgets]; }; iTOP = derive2 { name="iTOP"; version="1.0.2"; sha256="1n6nlmmx2h63nksycgzr7qsnd1j6bxa629av7cfd3ihriim7dj47"; depends=[corpcor Matrix]; }; iWISA = derive2 { name="iWISA"; version="1.0-2"; sha256="0jqi1kh7jlc04nb9d1w711q4i8j1vgwbxjls09z7853kv22wxfyz"; depends=[fda ggplot2 waveslim]; }; iWeigReg = derive2 { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6qw019fx8a7vsabm37867zycssn77z9nc8"; depends=[MASS trust]; }; iZID = derive2 { name="iZID"; version="0.0.1"; sha256="1jaqdh6i5xyfw4y2wd9qivzjklf4j2xxnya8ssn7rv5bz6misgcz"; depends=[doParallel extraDistr foreach rootSolve]; }; - iadf = derive2 { name="iadf"; version="0.1.0"; sha256="02zx9n4ncg10bbydrr05631vzc4w2b1jg3x6xiaffg7x5rh4mnyf"; depends=[dplR dplyr manipulate rlang tibble tidyr]; }; - iai = derive2 { name="iai"; version="1.1.0"; sha256="1ck5znn3l80ahh6n6qvp8rw4307blkqyr1jmq9ksifb5hkqpxyfw"; depends=[JuliaCall rlang stringr]; }; - iarm = derive2 { name="iarm"; version="0.3.0"; sha256="0v5zb2pgzqb9brmq0calmghq20i8w3wx147781v4f6ll0abkhvxx"; depends=[eRm PP psychotools vcdExtra]; }; + iadf = derive2 { name="iadf"; version="0.1.1"; sha256="0ys8rd05s0j6cs7snmp1car7lp7k4awvs8gnlqaw9zcd7w7k9r06"; depends=[dplR dplyr manipulate rlang tibble tidyr tidyselect]; }; + iai = derive2 { name="iai"; version="1.2.0"; sha256="0v1xsnhx73ldpsbnki5g0q86dih1pcgb1f10mmq7dn47s2mm6zxg"; depends=[JuliaCall rlang stringr]; }; + iarm = derive2 { name="iarm"; version="0.4.1"; sha256="1z0k970sk8qliknfsz88yij1aigf0dxk43h92iwg17xi64hvjs11"; depends=[eRm ggplot2 gridExtra Hmisc PP psychotools vcdExtra]; }; ibd = derive2 { name="ibd"; version="1.5"; sha256="0rxvy4hn4fpbv6y214ggkmgfvzwns5mkanp4h8201rjk3v84mk2r"; depends=[car emmeans lpSolve multcomp]; }; ibdreg = derive2 { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; }; ibeemd = derive2 { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[deldir fields rgeos sp spdep]; }; @@ -8940,59 +9057,55 @@ in with self; { icRSF = derive2 { name="icRSF"; version="1.2"; sha256="1a7046lspk70cvrvzwzhnqcmc3cqa5a9bmzlw012jvcn39m2ca3l"; depends=[icensmis Rcpp]; }; ica = derive2 { name="ica"; version="1.0-2"; sha256="0ya1nph1zwhad0bfz4yxs27kl45yk1dhnphdlrq34p8pqrpmj8g7"; depends=[]; }; ical = derive2 { name="ical"; version="0.1.6"; sha256="1raanaagas1c8w66d8s045z5ip1i97xca4233d55jk6cazv0mb1w"; depends=[V8]; }; - icamix = derive2 { name="icamix"; version="1.0.6"; sha256="0jys9r7wjxlwsq5rssih2lvsar1192w8vigdhhrcmf3d5z5ic1kp"; depends=[Rcpp RcppArmadillo]; }; icapca = derive2 { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; }; icarus = derive2 { name="icarus"; version="0.3.1"; sha256="0ipbhzvwdn1cnzgdw33cwv901768srxfi588bimjx2ssl80mqn3a"; depends=[]; }; iccbeta = derive2 { name="iccbeta"; version="1.2.0"; sha256="03ms1c8qpbgxabj3hh4n0gwcazw6cd0cvixck5rz8fkvj04xzjak"; depends=[lme4 Rcpp RcppArmadillo]; }; - icd = derive2 { name="icd"; version="4.0.6"; sha256="0zi56c6x2jy1yihrar6whhyb5csyhzwdxw0nr8c05xm28w1j6xwb"; depends=[rappdirs Rcpp RcppEigen]; }; icd_data = derive2 { name="icd.data"; version="1.0"; sha256="0cynr9327wfg88661w4hali48mb6ghyvlqgybsa38k9bbf57v8aa"; depends=[]; }; icdGLM = derive2 { name="icdGLM"; version="1.0.0"; sha256="1mh9kwn21n19v4lrmj33ghpna7dl66fx19gi6lcjanmrpzrkwdnz"; depends=[Matrix]; }; icemelt = derive2 { name="icemelt"; version="1.0"; sha256="13pjbyh2ggns36m8s43m2cb0kvisjlfxq75gqscldp75zjli2wi8"; depends=[survival]; }; icenReg = derive2 { name="icenReg"; version="2.0.13"; sha256="1kyzvhcrmafprwdpc4dhjdg8dxf0zic4r22hzdnah9rfihds086l"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; }; - icensBKL = derive2 { name="icensBKL"; version="1.1"; sha256="12zx5x81jy48mp0l6a5ga0ikkjxvndv5cv2xf6d2lczfk7fz9lbp"; depends=[gtools Icens MASS mvtnorm smoothSurv survival TeachingDemos]; }; + icensBKL = derive2 { name="icensBKL"; version="1.2"; sha256="1zzv80jnn8ilnc1gv4nj24l2fl8805rjhqjgkb0xx4y9zhpg1jkp"; depends=[gtools Icens MASS mvtnorm smoothSurv survival TeachingDemos]; }; icensmis = derive2 { name="icensmis"; version="1.3.1"; sha256="1c0j43wffb5h99chlj8j45lpan7dpn2i0r4rr6b2kq16p1zabfjw"; depends=[Rcpp]; }; icesAdvice = derive2 { name="icesAdvice"; version="2.0-0"; sha256="0sx93fsx2srmynnvs3bjb525m9a5w70qr9lghmkqa07crd991vfr"; depends=[]; }; icesDatras = derive2 { name="icesDatras"; version="1.3-0"; sha256="0yaqlximxa3rcjxgrd0mii02mm9gpcxgw3i8pymp00bk8zixvj30"; depends=[]; }; icesSAG = derive2 { name="icesSAG"; version="1.3-6"; sha256="08nlsvs23j7ax03gwld3ycyvhfrhs70jdjif3562q1ysgvvkbf45"; depends=[httr icesVocab openssl png xml2]; }; - icesTAF = derive2 { name="icesTAF"; version="3.3-2"; sha256="113qbqpna6dvf9vrrnlapm0rix1fc1hawaa7jsa2rj7q4pbyijc7"; depends=[bibtex lattice]; }; + icesTAF = derive2 { name="icesTAF"; version="3.4-0"; sha256="1gsqcwz547g04x7ixrf7yiy0xf9p61fw2j7dqyj3y4wmfwll9wgz"; depends=[bibtex lattice]; }; icesVocab = derive2 { name="icesVocab"; version="1.1-4"; sha256="0ydrxxmglgcsmjccamhfyw4cr2q583y4836v3wm2gxs5pcf9q86g"; depends=[XML]; }; icmm = derive2 { name="icmm"; version="1.1"; sha256="1w9f1rniz67rrvq0akc64s5433ddmr2cgbcljil4c58yyz8hinx8"; depends=[EbayesThresh]; }; - icosa = derive2 { name="icosa"; version="0.9.81"; sha256="05gpiksncdi536f4py7szfi6myny1gqj8i0hsgpma7cfcm3npn0l"; depends=[igraph raster Rcpp rgdal rgl sp]; }; + icosa = derive2 { name="icosa"; version="0.10.0"; sha256="1vd1qn1070rml7mygj9k13b96zrc77bw90g8f44s7wmhabn6214q"; depends=[igraph Rcpp sp]; }; icpsrdata = derive2 { name="icpsrdata"; version="0.4.0"; sha256="01whs8wssjx3qgdnc1ixh59gvn1bajqm5q3zj1jpw1dqjh71qzf0"; depends=[httr purrr rvest]; }; - icr = derive2 { name="icr"; version="0.6.1"; sha256="1hmlh01p286zq26ya2x7hn4xba2g0q988pmvmxy6lfv0nigys0gs"; depends=[Rcpp]; }; + icr = derive2 { name="icr"; version="0.6.2"; sha256="1xqvzn02x13d706irv83zycpxhm8yq1c34rh1nphddy5gri7gwjb"; depends=[Rcpp]; }; icrf = derive2 { name="icrf"; version="1.0.0"; sha256="1qz4wv23hspbrfzrj80qmhi0759zh3gn23rnns18j3020f506jdd"; depends=[Icens]; }; icsw = derive2 { name="icsw"; version="1.0.0"; sha256="0g7bcqs0rpbs1p202i9wjbl8hhy3r196zambm044xyf7kvsbzzf6"; depends=[]; }; idar = derive2 { name="idar"; version="1.1"; sha256="0nac7sav4rrp6a94aqgp8qyb22wg7y7gc5n1dhid894yc9z47a5f"; depends=[ape FD picante spatstat]; }; idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; }; idbr = derive2 { name="idbr"; version="0.3"; sha256="02syk7fmif0xnddl8189vnl329r8mwl3iwv2rsf6cw7mwg30fhyw"; depends=[countrycode dplyr httr jsonlite]; }; - idealstan = derive2 { name="idealstan"; version="0.7.2"; sha256="0nn7i6gr1ggk43xn9a454jbrxhqxw37srjvz4va0kcc02wy5pxq9"; depends=[bayesplot BH dplyr forcats gghighlight ggplot2 ggrepel lazyeval Rcpp RcppEigen rlang rstan rstantools scales shinystan StanHeaders stringr svDialogs tidyr]; }; ideamdb = derive2 { name="ideamdb"; version="0.0.9"; sha256="1f4dcv6c8ny7pik547f4840vhll26mzfcijnfsiqx31xhn0gsizd"; depends=[dplyr ggplot2 stringr tidyr]; }; - idefix = derive2 { name="idefix"; version="0.4.0"; sha256="03gmhmpdkiy0721k14ig6aaqj304kjgi3g9l9v5s59h716r1cfyv"; depends=[dplyr MASS mlogit Rcpp RcppArmadillo Rdpack scales shiny tmvtnorm]; }; + idefix = derive2 { name="idefix"; version="0.4.3"; sha256="1kpan1499n9paibrr5gc0n5s05ls64fx8raiwckc7hfzsnh1fb26"; depends=[dplyr MASS mlogit Rcpp RcppArmadillo Rdpack scales shiny tmvtnorm]; }; idem = derive2 { name="idem"; version="4.0"; sha256="0zgc6b5gzgm5dhjqk1vkm94khizc8sngn3igv23z1v18g73vdxhi"; depends=[BH Rcpp RcppEigen rstan rstantools sqldf StanHeaders survival]; }; idendr0 = derive2 { name="idendr0"; version="1.5.3"; sha256="11c12d166bp2i498d8y6ipg5jhz1xsdsrmnhjqnrqqzp9avvrsjp"; depends=[tkrplot]; }; identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; }; ideq = derive2 { name="ideq"; version="0.1.4"; sha256="06xk9ghvh3fb79lbkmbqsk07xj06qaigiw41rzbi3bji3fjq1prw"; depends=[matrixcalc mvtnorm pdist Rcpp RcppArmadillo rgen]; }; ider = derive2 { name="ider"; version="0.1.0"; sha256="021s4fybki7a6mdsr6gkjrzfhaqdcg0m2a6r24y91jklxlxqxmws"; depends=[FNN]; }; - idiogramFISH = derive2 { name="idiogramFISH"; version="1.12.1"; sha256="0apmq28pb7wj4pyd3iv9872mq7bp5qrx5kiz9f6swlvr7mc0js1m"; depends=[crayon dplyr plyr]; }; + idiogramFISH = derive2 { name="idiogramFISH"; version="1.14.7"; sha256="1cr7s2cw3dq0rh3k6hdgxhdmgpp3ynhjiikkn9f63lgrrgyzizgq"; depends=[crayon dplyr tidyr]; }; idm = derive2 { name="idm"; version="1.8.2"; sha256="04f0i0kwdxywmj2i184knx5a5v9svx0lbam6wpz49hghg7qpy0w5"; depends=[animation ca corpcor dummies ggplot2 ggrepel]; }; idmTPreg = derive2 { name="idmTPreg"; version="1.1"; sha256="1329sjb4dnw3yiyg16whbj4l2v0kg8phg1x4ysvyp2kqkmw14yq6"; depends=[doParallel foreach survival]; }; idmodelr = derive2 { name="idmodelr"; version="0.3.1"; sha256="147rlcm7dj20xbwi392w82m1mnw90mvcp4yjgfplm34z6y90ljir"; depends=[deSolve dplyr furrr future ggplot2 magrittr purrr rlang stringr tibble tidyr viridis]; }; idr = derive2 { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; depends=[]; }; ids = derive2 { name="ids"; version="1.0.1"; sha256="1s6ga94gds5ydr9f8qbjfgfpg2dvbnkcrlybqlb33hk3c0c2l8dn"; depends=[openssl uuid]; }; idx2r = derive2 { name="idx2r"; version="1.0.0"; sha256="14d3rasnf8mghwzpg6h4larybgy7drrv0jh71x28qwry49acsqyh"; depends=[]; }; - ie2misc = derive2 { name="ie2misc"; version="0.8.5"; sha256="1i59836a3kjsra5ibk66ic35yqk28p3biylall8gngjssiig92c1"; depends=[data_table gWidgets2 gWidgets2tcltk lubridate openxlsx qdap reader readxl stringi]; }; ieeeround = derive2 { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; }; - iemisc = derive2 { name="iemisc"; version="0.9.7"; sha256="152qmwyfpdzif9wbjk6j60sfamy8l2fhrr3vjw5m3c05grczyn7m"; depends=[CHNOSZ data_table fpCompare gsubfn IAPWS95 iemiscdata listless pracma r_import rgdal sp stringi testit units zoo]; }; + iemisc = derive2 { name="iemisc"; version="0.9.8"; sha256="0xpgafv1zl3gxs3jydqni5icdz74n7f0bgbdvw8gykrr1a6rarln"; depends=[CHNOSZ data_table fpCompare gsubfn IAPWS95 iemiscdata pracma r_import rgdal sp stringi testit units zoo]; }; iemiscdata = derive2 { name="iemiscdata"; version="0.6.1"; sha256="0a9x90kisgmrka0frk9myb1qdq3nl092n78wrif31b42arifa8h9"; depends=[]; }; iemisctext = derive2 { name="iemisctext"; version="0.9.99"; sha256="02rr7sjjbrvfxwjl87f2ki245a8cw5fvx7z2z4rl8ixxlyxj9p5v"; depends=[]; }; ifa = derive2 { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; }; - ifaTools = derive2 { name="ifaTools"; version="0.20"; sha256="0fkhnfnpa41z8hw72jgfqwgbfgzfqqnl8j2xwnqng1jymrwx97jv"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; }; + ifaTools = derive2 { name="ifaTools"; version="0.21"; sha256="1vnrf67d0b83nmvk91sw1w2lgjlldp7dslxnrxh7lb94h3z6jigd"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; }; ifctools = derive2 { name="ifctools"; version="0.3.2"; sha256="18g0l0vh9z4nvl6jil32983c4z1dvawrivi4kz4g562q3habm279"; depends=[]; }; ifs = derive2 { name="ifs"; version="0.1.5"; sha256="03g9cgs0zp89b1d7rpcn5clkvmg0spnariwrifd8hha476ldvfcy"; depends=[]; }; ifultools = derive2 { name="ifultools"; version="2.0-5"; sha256="040kvbczcmmbaiaz0k0pdq9af541pjj6iwzh1a3w4szh9w6b5a3j"; depends=[MASS splus2R]; }; ig_vancouver_2014_topcolour = derive2 { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; }; igate = derive2 { name="igate"; version="0.3.3"; sha256="0b8dk976z0764cmxwcq6w2f3akv7iivivharinq029p90b600qza"; depends=[dplyr ggplot2 kableExtra knitr rmarkdown stringr xtable]; }; - igraph = derive2 { name="igraph"; version="1.2.4.2"; sha256="0scrbqb26pam8akblb4g9rkz888s0xffw3gcly78s4ijj67barxd"; depends=[magrittr Matrix pkgconfig]; }; + igraph = derive2 { name="igraph"; version="1.2.5"; sha256="126z1ygbmi3g7hk97snf22rnx680dyi30idssm5zacba5rdngp8c"; depends=[magrittr Matrix pkgconfig]; }; igraphdata = derive2 { name="igraphdata"; version="1.0.1"; sha256="19w5npa4b8c054v94xlr7nmhhg2fhq4m8jbds86skp8zvipl4rkl"; depends=[]; }; igraphinshiny = derive2 { name="igraphinshiny"; version="0.1"; sha256="1ww5s4jfihzcx4k35lbhzsf54z720xh7b2p5alzk843m6rx77986"; depends=[igraph shiny]; }; igraphtosonia = derive2 { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; }; @@ -9000,33 +9113,34 @@ in with self; { ihpdr = derive2 { name="ihpdr"; version="1.1.0"; sha256="0ga90dwnxygz63m894h4aj2lkjqi99qalkgw9ncfqggq5255h6l3"; depends=[dplyr httr lubridate magrittr purrr readxl rlang rvest tidyr xml2]; }; ihs = derive2 { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; }; iilasso = derive2 { name="iilasso"; version="0.0.2"; sha256="043m1n5840459zsknkb54801apb0a2cqfprncmj2wp235rbqj832"; depends=[BH Matrix Rcpp]; }; - ijtiff = derive2 { name="ijtiff"; version="2.0.4"; sha256="1jfvqn22v2rji8rnyjmpa2y3q14r514q2wdmh7ykiplvhlm9kyga"; depends=[checkmate dplyr filesstrings fs glue magrittr purrr Rcpp readr rlang stringr withr]; }; + ijtiff = derive2 { name="ijtiff"; version="2.0.5"; sha256="1qrp82vvd6gz6a0jjnbhwzfs5qcxv6f97cpl4hpqdq5gmlsahjjv"; depends=[checkmate dplyr filesstrings fs magrittr purrr Rcpp readr rlang stringr withr]; }; ilc = derive2 { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[date demography forecast rainbow survival]; }; - imageData = derive2 { name="imageData"; version="0.1-59"; sha256="096y589r1mrbvzax5i7sdczkl613kyn8g93qcddqb6jjljw03qmi"; depends=[dae GGally ggplot2 Hmisc RColorBrewer reshape XLConnect]; }; + imageData = derive2 { name="imageData"; version="0.1-60"; sha256="1ry4l45az9az8wk1k16jxbszxwh0m9s3g838w7dad0midr2hs8qr"; depends=[dae GGally ggplot2 Hmisc RColorBrewer readxl reshape]; }; imagefluency = derive2 { name="imagefluency"; version="0.2.3"; sha256="0f4kizxc86q6pgx5dbp14y6866b1ldyf7zgpfikd2iqhvxbs7qwa"; depends=[magick OpenImageR pracma R_utils readbitmap]; }; - imagefx = derive2 { name="imagefx"; version="0.3.0"; sha256="1jw85kb2xxq1yzjnvpd8l5avvamyh12kimss7w31ry2wgsad2mdz"; depends=[moments signal]; }; - imager = derive2 { name="imager"; version="0.41.2"; sha256="19fqgjhg04garbipx20g72h9dd6k0jj4ac48nby6km4h665vrs4v"; depends=[Cairo downloader igraph jpeg magrittr plyr png purrr Rcpp readbitmap stringr]; }; + imagefx = derive2 { name="imagefx"; version="0.4.1"; sha256="1mxd33y8zbq8kig6m6xihb5w8wrjppgmpyjspvaxjwk7si9a09k1"; depends=[moments signal]; }; + imager = derive2 { name="imager"; version="0.42.1"; sha256="1d7a49lcna77wyfjf5q1b89jck3p3vnysnkgz4drb0qkpy6hz76b"; depends=[downloader igraph jpeg magrittr png purrr Rcpp readbitmap stringr]; }; imagerExtra = derive2 { name="imagerExtra"; version="1.3.2"; sha256="1f6mxfn7am4ph9acbbx53r4bk4vsm73p7arh8rvrsic9pgma3gqf"; depends=[fftwtools imager magrittr Rcpp]; }; imageviewer = derive2 { name="imageviewer"; version="0.1.0"; sha256="1rsrwy5v0gnsmbay1zqijhvll2l1bs844m52w65588j9nlx4fci9"; depends=[htmlwidgets]; }; - imagine = derive2 { name="imagine"; version="1.5.2"; sha256="1k017a1qw7bahk1aif3ky7f1aynvrppmhvxbcmai646pmx99kbxn"; depends=[Rcpp]; }; - imbalance = derive2 { name="imbalance"; version="1.0.2"; sha256="1vkzxm8wb9g1mibnlp63gnky2gcgai5j09v63zki3jpxwxwli4nx"; depends=[bnlearn C50 FNN ggplot2 KernelKnn mvtnorm Rcpp RcppArmadillo smotefamily]; }; + imagine = derive2 { name="imagine"; version="1.5.3"; sha256="1ss0gm769s8cmma3hnah15vmc2c5wxn0l3s4vas7jbvkwi62am6h"; depends=[Rcpp]; }; + imbalance = derive2 { name="imbalance"; version="1.0.2.1"; sha256="14f7p3x8818b1asfynp3w4sxdacsd14dzs7r166s1jdadwwfwi1s"; depends=[bnlearn C50 FNN ggplot2 KernelKnn mvtnorm Rcpp RcppArmadillo smotefamily]; }; imdbapi = derive2 { name="imdbapi"; version="0.1.0"; sha256="11v7c0s7qqf02b186md5lhgkgmywkn8lmmanlz3gfcxca26g047y"; depends=[dplyr httr stringr]; }; imfr = derive2 { name="imfr"; version="0.1.7"; sha256="1ch05d37gp0niml80k2apab1942aa05r77s52vgh2pfcx9kklv20"; depends=[dplyr httr jsonlite]; }; imgpalr = derive2 { name="imgpalr"; version="0.3.0"; sha256="1kb1ggrlkrh086nwq47sf2y20r7ydk4ww2j3gq0s4iz00aa34pxg"; depends=[downloader dplyr farver jpeg magrittr tibble]; }; imgrec = derive2 { name="imgrec"; version="0.1.0"; sha256="1v4q2hxil7f0jnj4nql44d9dssh8kz1mnj8ah5slndnn1fbymy8f"; depends=[base64enc dplyr httr jsonlite knitr rlang]; }; imguR = derive2 { name="imguR"; version="1.0.3"; sha256="14f7ghgc8rbrpqb21rinfbrj1wh80i6ii0awwi814152v5qzj4b3"; depends=[httr jpeg png]; }; - imgw = derive2 { name="imgw"; version="0.2.0"; sha256="00zkjxqnw1zwcpj8mmdw1ydpcq0sbhs54ismm1i8r6ymb13j5fgj"; depends=[RCurl XML]; }; - iml = derive2 { name="iml"; version="0.9.0"; sha256="15rv943q1kqilsr1h0pkm2gci1cl7775xma4swjfmbqmdc6acjq0"; depends=[checkmate data_table foreach Formula ggplot2 glmnet gridExtra Metrics partykit prediction R6 yaImpute]; }; + iml = derive2 { name="iml"; version="0.10.0"; sha256="0xm3q42qahq798ilgg050df0mahhbdfd3fx3i7cpx606h38si0x7"; depends=[checkmate data_table Formula future future_apply ggplot2 gridExtra Metrics prediction R6]; }; immer = derive2 { name="immer"; version="1.1-35"; sha256="1nmf9wxxyq3p8b5kikpsr8b0v4s84zjpahg1rxvcrhc8blg26hjq"; depends=[CDM coda MASS psychotools Rcpp RcppArmadillo sirt TAM]; }; immuneSIM = derive2 { name="immuneSIM"; version="0.8.7"; sha256="0brj12xnkzmn3n91vb39fq3q68wmzmwx9l38dl38yypp0l8pknjl"; depends=[Biostrings data_table ggplot2 ggthemes igraph Metrics plyr poweRlaw RColorBrewer repmis reshape2 stringdist stringr]; }; - imp4p = derive2 { name="imp4p"; version="0.8"; sha256="0k126zp38n1bw3q0b77smr6plpcim87i66amvwbv61w84ansgbv6"; depends=[Iso norm Rcpp truncnorm]; }; + imp4p = derive2 { name="imp4p"; version="0.9"; sha256="1z8q3h8smlnn3i7b0hpc360607ingqz4hblm93bmljri2k1amcvw"; depends=[Iso missForest missMDA norm Rcpp truncnorm]; }; impactflu = derive2 { name="impactflu"; version="0.1.0"; sha256="0wpaq2q61g6hl9fffs5cjbzdz1qc8dxsbknfs0iarwkn08460bn5"; depends=[dplyr glue lubridate magrittr Rcpp rlang tibble]; }; impimp = derive2 { name="impimp"; version="0.3.1"; sha256="0xkxph4f1rcpkryx9v339bfbsnq3xwdj1flb4j2dgh99apj126sq"; depends=[]; }; - implicitMeasures = derive2 { name="implicitMeasures"; version="0.1.0"; sha256="0j0mzsfli9m063nmy547jcwrzbdqs3m06k9jj4bjn8fdv45pabzk"; depends=[dplyr ggplot2 plyr qpdf tidyr xtable]; }; + implicitMeasures = derive2 { name="implicitMeasures"; version="0.1.2"; sha256="0fss5rws8m53p3a26s2gb8bvg3ddiddnp25qj8jspa8f0iyzj48i"; depends=[ggplot2 stringr tidyr xtable]; }; + implied = derive2 { name="implied"; version="0.3.0"; sha256="08hjbw6fa9k71pfkbniwzbysnisl93bx3b7ik8dny029agp10nfx"; depends=[]; }; implyr = derive2 { name="implyr"; version="0.3.0"; sha256="1i0m95azyi46wnh59dcs52l78i1yqy677rlr4b6c0r945m67advn"; depends=[assertthat DBI dbplyr dplyr rlang tidyselect]; }; r_import = derive2 { name="r_import"; version="1.1.0"; sha256="0blf9539rbfwcmw8zsb4k58slb4pdnc075v34vmyjw752fznhcji"; depends=[]; }; importar = derive2 { name="importar"; version="0.1.1"; sha256="0xv445fmjhsbdlsq03k2rlycnggn3rcyq5a49zrg4jvjamzr0rgr"; depends=[]; }; - importinegi = derive2 { name="importinegi"; version="1.0.0"; sha256="0rlnvc2m0cy5jqvylfbgg31dxpdsd37ca1bcpwcpgwcx3d3l373j"; depends=[data_table dplyr foreign haven rgdal]; }; + importinegi = derive2 { name="importinegi"; version="1.1.1"; sha256="0lhlrmij4ggwpjcyimyhjywp18i0rr2f9fkvs4nf9pj1xb87rd3l"; depends=[data_table dplyr foreign haven rgdal]; }; + impressionist_colors = derive2 { name="impressionist.colors"; version="1.0"; sha256="03z5w7y7vbvlnn30r9y3ip93h364f87nhwdb9hcki26csiq2bnlv"; depends=[]; }; imptree = derive2 { name="imptree"; version="0.5.1"; sha256="0f087000092ydnpj3ch4mbip8wp32scn8xw4vlkq5lf6130gfs1b"; depends=[Rcpp]; }; imputeFin = derive2 { name="imputeFin"; version="0.1.0"; sha256="1k61q4cd3j7rj0d35y3gyahjz4ac970m6mifc9pzxryi3w5373c4"; depends=[MASS zoo]; }; imputeLCMD = derive2 { name="imputeLCMD"; version="2.0"; sha256="10v3iv1iw6mnss6ry836crq9zdgid2y1h3pvigzjsrmnp5n89mfz"; depends=[impute norm pcaMethods tmvtnorm]; }; @@ -9041,17 +9155,16 @@ in with self; { imsig = derive2 { name="imsig"; version="1.0.0"; sha256="01ww48x9a189dvr81bangfhchr70l0sg26jdpcxf41nh2fmslfxx"; depends=[ggplot2 gridExtra HiClimR igraph RColorBrewer survival]; }; in2extRemes = derive2 { name="in2extRemes"; version="1.0-3"; sha256="1lgsqm29zmjyf8kynyra2p3q7bs4fyd7ac4v6s3pbahzhhzdk94y"; depends=[extRemes]; }; inTrees = derive2 { name="inTrees"; version="1.2"; sha256="1mwn2ijkyw0y9xcgrr56wxd2326ikarlsi79l59dplvlx2iwbi6c"; depends=[arules data_table gbm RRF xgboost xtable]; }; - inaparc = derive2 { name="inaparc"; version="0.2.0"; sha256="0rgbnvvqzbx4j40qz32l1bxmg3wwzbl6719wb9m3xpakblvhhxs2"; depends=[kpeaks lhs]; }; - inarmix = derive2 { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp]; }; + inaparc = derive2 { name="inaparc"; version="1.1.0"; sha256="0ni34bkl7v1ypci8j8qhkfbf7gnx77wi4v9w1ww18z2jizsrk5h3"; depends=[kpeaks lhs]; }; inbreedR = derive2 { name="inbreedR"; version="0.3.2"; sha256="09fr13ckyn2skiigkn4qdx5g080gcmyyrvzhcp0wrml9wpmy0h4z"; depends=[data_table]; }; incR = derive2 { name="incR"; version="1.1.0"; sha256="0q41bs7pf6hqyfwvcwc2sxq44jq95qq3qsddz53f8gphwjsyf1v7"; depends=[dplyr ggplot2 lubridate maptools rgeos]; }; inca = derive2 { name="inca"; version="0.0.4"; sha256="1r3niibd6pja59am8in9gpyvxi2g5bh8bqqhdixzwaj3xzyyipii"; depends=[Matrix Rcpp RcppArmadillo]; }; - incadata = derive2 { name="incadata"; version="0.8.2"; sha256="1ayr7krqcs25b5zg80m2s4g3pdasfaj2qfdnjp871im5i6bplai5"; depends=[backports decoder dplyr rvest sweidnumbr xml2]; }; + incadata = derive2 { name="incadata"; version="0.9.1"; sha256="0987zazkp3cxvk88i3yqb70s2i1cg108vc8wyhh2867s3rqdrpgh"; depends=[decoder rvest sweidnumbr xml2]; }; incgraph = derive2 { name="incgraph"; version="1.0.1"; sha256="0zjvxk2krdlm5bcr0m80nxy46f69a1xadfjw5sjw249b28wdclml"; depends=[BH dplyr orca purrr Rcpp testthat tibble]; }; - incidence = derive2 { name="incidence"; version="1.7.0"; sha256="1ljn9phxsf47qp12xv1ly76lm4gcqfnhrisx4sy9f6pz5rx6k5s3"; depends=[aweek ggplot2]; }; + incidence = derive2 { name="incidence"; version="1.7.1"; sha256="1d76d1pm4g8y0jalc18dcipi1fzwx843gcbrspcbk8nhdkjxlny4"; depends=[aweek ggplot2]; }; inctools = derive2 { name="inctools"; version="1.0.15"; sha256="0ikldiwgizs2p9vcalk5729dr6krysnyr4ni0ybg9gljw7iafdlf"; depends=[binom cubature doParallel dplyr foreach ggplot2 glm2 magrittr plyr pracma rlang tibble tmvtnorm]; }; indelmiss = derive2 { name="indelmiss"; version="1.0.9"; sha256="0i4qnvc0xb3ngnk8xdscmx7qnicfs7s6czawf6schb1nh2pjpzyq"; depends=[ape numDeriv phangorn Rcpp]; }; - indicspecies = derive2 { name="indicspecies"; version="1.7.8"; sha256="1j70plalgn9y69m958q5jxhrzd14prcjbniiljnjl243xbbydgv9"; depends=[permute]; }; + indicspecies = derive2 { name="indicspecies"; version="1.7.9"; sha256="1xza0ha42frz5wizf268j49y3201vpsm4kgj0czsw9wygzjl008f"; depends=[permute]; }; indirect = derive2 { name="indirect"; version="0.2.0"; sha256="1k7xwsx655nzl43s1mkaysyn5gydq973gynmqip67lssnm7cnch4"; depends=[gplots MASS]; }; inegiR = derive2 { name="inegiR"; version="3.0.0"; sha256="1rhkdmpz7mxi7ddyygss5rlh3c8hgxhzdk3fnvnlizc1l55cc6c0"; depends=[jsonlite lubridate plyr tibbletime XML zoo]; }; ineq = derive2 { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; }; @@ -9060,22 +9173,25 @@ in with self; { inference = derive2 { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; }; inferference = derive2 { name="inferference"; version="1.0.0"; sha256="1x6i8ycba9z57m1n143p1j9pmlfrhjhi4iw0fsny8xmcvqrlr85p"; depends=[Formula lme4 numDeriv]; }; inferr = derive2 { name="inferr"; version="0.3.0"; sha256="1z5bfq0gv1h6iw8nwc19ar6f2sgsvgs3ghq52s09wclqk2yy4azz"; depends=[dplyr magrittr purrr Rcpp rlang shiny tibble tidyr]; }; + infinitefactor = derive2 { name="infinitefactor"; version="1.0"; sha256="0j6f9q8z81znwakyx4h0l8ypz0y4yv11d7l3rwljmn4rgspyjl5c"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; }; infix = derive2 { name="infix"; version="0.1.0"; sha256="1zgy8f8b9pmpvpgqh3niczkr94xkc53xcjim73djmd10azw3kgrk"; depends=[magrittr]; }; inflection = derive2 { name="inflection"; version="1.3.5"; sha256="1xyx2jnvyjn7n1xsg3m2qpl03qrnmlp9b8fa2h77f922fwj1zxgv"; depends=[]; }; influence_ME = derive2 { name="influence.ME"; version="0.9-9"; sha256="0f6d2hvs9qllyfpsp2cgh7w8yjxafclbk47n8av7j9zpp7s5yg9v"; depends=[lattice lme4 Matrix]; }; influence_SEM = derive2 { name="influence.SEM"; version="2.2"; sha256="1cabl6486mlrmk0418s18wii3n6nl1ckv6w9281wdk4fy27y9qk2"; depends=[lavaan]; }; + influenceAUC = derive2 { name="influenceAUC"; version="0.1.1"; sha256="10iflbcx3hrd0f7y0izkpc9xkhn5bi8if8qdqk8151idzwq6g2jp"; depends=[dplyr geigen ggplot2 ggrepel ROCR]; }; influenceR = derive2 { name="influenceR"; version="0.1.0"; sha256="12p9362hkndlnz1rd8j2rykg57kbm6l7ks60by3rd25xg50k5jag"; depends=[igraph Matrix]; }; + influential = derive2 { name="influential"; version="0.1.0"; sha256="057nz5p7m903s78656wvw073w62xw783wf2r14xcdw5sj24c7lcl"; depends=[igraph]; }; influxdbr = derive2 { name="influxdbr"; version="0.14.2"; sha256="03dzw86mvbc8w38q9skjki1z17vc04k9q8dx7sd3xg6xbr10f9d9"; depends=[dplyr httr jsonlite magrittr purrr rlang tibble tidyr xts zoo]; }; - infoDecompuTE = derive2 { name="infoDecompuTE"; version="0.6.1"; sha256="04fgmz58nvw0jwbj8y1r42ny84024h47w9cc0z96aqag5kg1wmxm"; depends=[MASS]; }; + infoDecompuTE = derive2 { name="infoDecompuTE"; version="0.6.2"; sha256="0r1capiv4zr31dsy0sqly9zb00i86zq2ihbgsmb5g4cy0f04xlqz"; depends=[MASS]; }; informR = derive2 { name="informR"; version="1.0-5"; sha256="16pz47wlr1gr8z5hdnrjpczm967khqiqgdfiw15a0bby6qdvni2y"; depends=[abind relevent]; }; infotheo = derive2 { name="infotheo"; version="1.2.0"; sha256="18xacczfq3z3xpy434js4nf3l19lczngzd0lq26wh22pvg1yniwv"; depends=[]; }; infra = derive2 { name="infra"; version="0.1.2"; sha256="0jycnnmrrjq37lv67xbvh6p63d6l4vbgf3i1z9y7r75d6asspzn1"; depends=[]; }; infraFDTD_assist = derive2 { name="infraFDTD.assist"; version="0.6"; sha256="04j5nl5vxk79iciz6s9bpiyn319c2dbh7fdahgwira2r30w2fxv9"; depends=[fields]; }; infutil = derive2 { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; }; - ingredients = derive2 { name="ingredients"; version="0.5.0"; sha256="1vq3ym3vvjz11ixi0ggmqggw7s88ha7kk1y6li5cpnsjiqqyv09k"; depends=[DALEX ggplot2 scales]; }; + ingredients = derive2 { name="ingredients"; version="1.2.0"; sha256="1q196y9xzn4wk44fa1bvh0hcbizgm93rwir82nyk31k5pgixk967"; depends=[ggplot2 gridExtra scales]; }; ini = derive2 { name="ini"; version="0.3.1"; sha256="04yqij344dwm0xqgara8xia42mlmij3i8711qbb5534w05a1l6bv"; depends=[]; }; injectoR = derive2 { name="injectoR"; version="0.2.4"; sha256="0sa32cspp6y3m04yfmd02kxx55mk7l9jxf4r9pk1a6k3sqnj6fl8"; depends=[]; }; - inlabru = derive2 { name="inlabru"; version="2.1.12"; sha256="0ry32hsf9f4hd1jka51d7jbxlalhknwnc3zj9i9bggx38bb9w9fg"; depends=[ggplot2 Matrix rgdal rgeos sp]; }; + inlabru = derive2 { name="inlabru"; version="2.1.13"; sha256="1khsfhays6xna060f4h0rc7yjsq89xl42d36fy33ixgk0rh9vlnc"; depends=[ggplot2 Matrix rgdal rgeos sp]; }; inline = derive2 { name="inline"; version="0.3.15"; sha256="0s4wssvpan189fijahknxq5s22ww9bzmdlmyhnra748r7khky17z"; depends=[]; }; inlinedocs = derive2 { name="inlinedocs"; version="2019.12.5"; sha256="11d8cnrzgq95w7hn234rcwrr1mmrv63f69807pnzxizxbgnp7wz3"; depends=[]; }; inlmisc = derive2 { name="inlmisc"; version="0.4.9"; sha256="0yd8bysa5l3ihypckmx4g5zh176s6p4xsyw5pavc6pz8239wj5k2"; depends=[checkmate data_table GA htmltools htmlwidgets igraph knitr leaflet raster rgdal rgeos rmarkdown scales sp tinytex xtable yaml]; }; @@ -9084,18 +9200,18 @@ in with self; { inplace = derive2 { name="inplace"; version="0.1.0"; sha256="1lmvfjxgficlzxbn953wvfa1n9lys9gqprix6zbqqr4d6vkm0srj"; depends=[Rcpp]; }; insect = derive2 { name="insect"; version="1.2.0"; sha256="0lbck8jbhymzkhm1iqd2y2xg8a26yjizw7x31b1l1kqc1l0p3kmv"; depends=[ape aphid kmer openssl phylogram RANN seqinr xml2]; }; insideRODE = derive2 { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve lattice nlme]; }; - insight = derive2 { name="insight"; version="0.8.0"; sha256="1bkcwvjpfy4q4k478x8x42yiqz6v0fk6z6hfp6fli3h63smlmck0"; depends=[]; }; + insight = derive2 { name="insight"; version="0.8.3"; sha256="0lm5a4r368mq1pwmxjk2xnz25lb9j4v7mdkl1bahk2alklxgb8yj"; depends=[]; }; insol = derive2 { name="insol"; version="1.2.1"; sha256="1d2vqmbp94ff80mfkmq4a8y12r6ryym8hh1568ip9qbn7snc64v1"; depends=[raster]; }; inspectdf = derive2 { name="inspectdf"; version="0.0.7"; sha256="03yli2fiyb3kw189aga9hiyxm9f9b2lhpx1cjv9silfgm0xj54lh"; depends=[dplyr ggfittext ggplot2 magrittr progress Rcpp tibble tidyr]; }; instaR = derive2 { name="instaR"; version="0.2.4"; sha256="0c4m471ragkpksr0h21cdgnjxcknf01xqz543dahxgzjg9ncjwhg"; depends=[httr jsonlite]; }; install_load = derive2 { name="install.load"; version="1.2.1"; sha256="148q0rjal5hfcb8ilxzd1bz38mn8vxqrsfg5x4jy48psk00fk3d9"; depends=[]; }; insuranceData = derive2 { name="insuranceData"; version="1.0"; sha256="0wryh8i1v3bnpbqn6d6dpxr9bwwl6mnh5cb5igz0yanh4m1rx96w"; depends=[]; }; - insurancerating = derive2 { name="insurancerating"; version="0.4.3"; sha256="0m4ndbyinmqd1207qmw796zm7xs10bqyc5k3pqvvjy765fcni95k"; depends=[classInt data_table evtree ggplot2 lubridate mgcv stringr]; }; + insurancerating = derive2 { name="insurancerating"; version="0.6.0"; sha256="16032rjs0xhyg60iwbnwmx7kq86aqhfdrz67cj892zb0iii9y131"; depends=[classInt data_table dplyr evtree ggplot2 lubridate magrittr mgcv patchwork stringr tidyr]; }; intRegGOF = derive2 { name="intRegGOF"; version="0.85-5"; sha256="0xjq8vdlgqlzrvp752gd4qfrpnpapx7k6xzfsvfril8ngvm9a162"; depends=[]; }; intRvals = derive2 { name="intRvals"; version="1.0.0"; sha256="0391raj5wq6issvzqm8bfnv1ap2hh5nfsqi9r1x5ss37fvcq5fjm"; depends=[lme4 plyr]; }; intamap = derive2 { name="intamap"; version="1.4-9"; sha256="060sghkqsdrxpa340rvjskh2wafdkffa5q8nlbg1msnsmk639lkn"; depends=[automap doParallel evd foreach gstat MASS mvtnorm rgdal sp]; }; intamapInteractive = derive2 { name="intamapInteractive"; version="1.1-12"; sha256="1h8kzinfpp2rwal11xqs9g99rmigs0jlsr5h0qh0zsill73minid"; depends=[automap gstat intamap rgdal sp spatstat spcosa]; }; - intccr = derive2 { name="intccr"; version="3.0.1"; sha256="1yp94cr59i120aqbzss48b4n6z29dcgd97qz06vnh812lfrj1wxd"; depends=[alabama doParallel foreach MASS]; }; + intccr = derive2 { name="intccr"; version="3.0.2"; sha256="1v2zhyap414w41dgy2jjz3fnrvk0vawf02dvb1nprrid7fqsnf9i"; depends=[alabama doParallel foreach MASS]; }; intcensROC = derive2 { name="intcensROC"; version="0.1.1"; sha256="0qkgp6iw2s772zk2533jsar64f5mqgy4874swgarnfgd4jvkwy2k"; depends=[pracma Rcpp RcppEigen]; }; intdag = derive2 { name="intdag"; version="1.0.1"; sha256="0mb0a1ccc67clfa75b4hl901zdmx7fxw713c4ybx3i5wc2ldl8ph"; depends=[]; }; intePareto = derive2 { name="intePareto"; version="0.0.1"; sha256="0mynqvmdb39zqx1z2y6bscfjkwf880b7pd149xsdbc6f49hlnfw6"; depends=[apeglm biomaRt DESeq2 GenomeInfoDb GenomicAlignments GenomicRanges IRanges rPref Rsamtools]; }; @@ -9103,12 +9219,12 @@ in with self; { integr = derive2 { name="integr"; version="1.0.0"; sha256="172vj29bdk42ibgwj7dl06wslpg2dccp1i8iscbz1yd0j5kw36sq"; depends=[DiagrammeR DiagrammeRsvg dplyr gtools rsvg]; }; intensity_analysis = derive2 { name="intensity.analysis"; version="0.1.6"; sha256="1ydmn7njqk6i2667zaha8mvfndss4im39czadg1f3z6sndp2lsji"; depends=[diffeR ggplot2 raster reshape2 rgdal]; }; interAdapt = derive2 { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[knitcitations knitr mvtnorm RCurl shiny]; }; + interactionR = derive2 { name="interactionR"; version="0.1.0"; sha256="0iv631ws6y6gc3cyihiw4x90n0r4l8j8gxw2g8l6j8hccg4avsdh"; depends=[car flextable huxtable msm officer]; }; interactionTest = derive2 { name="interactionTest"; version="1.2"; sha256="0ycr839l07xahakr4r2jvlmd0fcxfm4qi3g8agnyh24c2kwl3ck2"; depends=[]; }; - interactions = derive2 { name="interactions"; version="1.1.1"; sha256="0xsqsylfgqgdy7bh32v8x0yn5naf1jclv05dvpyvhladgd0q1c0m"; depends=[cli crayon generics ggplot2 jtools rlang tibble]; }; - intercure = derive2 { name="intercure"; version="0.1.0"; sha256="0j71dqcbcfl1zpfidh3xys5h3ggyhrzq3avkdm9v18pv464x8xlv"; depends=[foreach iterators MASS Matrix survival]; }; - interep = derive2 { name="interep"; version="0.3.0"; sha256="03a51vambjl7gwxk43k47iff65lc6xs66vmkiw3dhxjr3b3nxrh8"; depends=[MASS Rcpp RcppArmadillo]; }; + interactions = derive2 { name="interactions"; version="1.1.3"; sha256="11nn3w4qsnh0idf7cwnrclg9h8vdjfl9rbvfk1c4l65pm4f61xrv"; depends=[cli crayon generics ggplot2 jtools rlang tibble]; }; + interep = derive2 { name="interep"; version="0.3.1"; sha256="0j5mpbx0h1p7si3n532fpzsq5d2ris77vmvqabz1vdzlv4dzlmk8"; depends=[MASS Rcpp RcppArmadillo]; }; interferenceCI = derive2 { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; }; - interflex = derive2 { name="interflex"; version="1.0.8"; sha256="117bq8cid36v6d2lrcywv5xqh6wm2z0fj9hwkjzwqhfkd8qhpq0a"; depends=[doParallel foreach ggplot2 lfe Lmoments lmtest mgcv pcse Rcpp RcppArmadillo sandwich]; }; + interflex = derive2 { name="interflex"; version="1.1.3"; sha256="1ga6m3f3dr70db5xkpbdx2vmv09cd2da8ky785dpl69chmxrcmhp"; depends=[caret doParallel foreach ggplot2 ggplotify gridExtra gtable lfe Lmoments lmtest mgcv pcse RColorBrewer Rcpp RcppArmadillo sandwich]; }; interfr = derive2 { name="interfr"; version="0.1.0"; sha256="1wn7i8dsll1qq3v39hgpbqnkjc8f4wlffy73453rw9lpq61y2fgj"; depends=[CircStats colorSpec plotrix]; }; intergraph = derive2 { name="intergraph"; version="2.0-2"; sha256="1ipxdrfxhcxhcbqvrzqh3impwk4xryqlqlgjl7f2mwrf365zs6ph"; depends=[igraph network]; }; interim = derive2 { name="interim"; version="0.8.0"; sha256="1hcq1cx6fv4ivvyd3ww3gsbw12g6rw83qqqbrcgzlnjl1q0jh3nf"; depends=[]; }; @@ -9120,11 +9236,12 @@ in with self; { interpret = derive2 { name="interpret"; version="0.1.24"; sha256="0nhxxcdw21qi356nxs0abp2fv87izs3667rw774251r9sbpq5vn1"; depends=[]; }; interpretR = derive2 { name="interpretR"; version="0.2.4"; sha256="0nfh3pyr7nn0r41xk0mfb4fs5rjkbh43lbw14x7pdmbgzpgsc22c"; depends=[AUC randomForest]; }; interval = derive2 { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[Icens MLEcens perm survival]; }; - intervals = derive2 { name="intervals"; version="0.15.1"; sha256="1r2akz8dpix1rgvdply4r3m2zc08r0n96w9c97hma80g61a3i2ws"; depends=[]; }; + intervals = derive2 { name="intervals"; version="0.15.2"; sha256="0mvwfwc03ifb30a3dzbmkv9adwqb8ajxhcw24d8xip8px063plhb"; depends=[]; }; intervcomp = derive2 { name="intervcomp"; version="0.1.2"; sha256="1l6x1fl84li6is3b92b96q3fbv0rpgqy2lvw9cbi2cq8nh9imnyx"; depends=[]; }; interventionalDBN = derive2 { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; }; - intkrige = derive2 { name="intkrige"; version="1.0.0"; sha256="1x0jg4vdbf3ipns1slw2pb1myiswnpka9lyxma69lgk2nmwmz9p2"; depends=[gstat raster Rcpp RcppArmadillo Rdpack sp]; }; - intoo = derive2 { name="intoo"; version="0.3.1"; sha256="0i1141r95zv8sv6l047avsgyq1kbxilczrhsn6gkvjg5vkmqn9rr"; depends=[]; }; + intkrige = derive2 { name="intkrige"; version="1.0.1"; sha256="1p3fn5nzn1iliy025187k590qrsw3z3d47p67gzwwd6h050yrl86"; depends=[gstat raster Rcpp RcppArmadillo Rdpack sp]; }; + intmed = derive2 { name="intmed"; version="0.1.1"; sha256="1y9ryz7sxhal4s35cbplfs67596dh57kqy10wyg49x8aq80gpgnr"; depends=[doParallel dplyr EValue foreach MASS mice stringr tibble tidyverse]; }; + intoo = derive2 { name="intoo"; version="0.4.0"; sha256="0s4jii34cgvyi573z569l1827yf90vj4ih9krsgvpbvk7lfdbagg"; depends=[]; }; intrinsicDimension = derive2 { name="intrinsicDimension"; version="1.2.0"; sha256="0cka20ifxx9njnvp18bzhrvmh3cwjnxkc0a23qzi43dahc51ijbc"; depends=[yaImpute]; }; introgress = derive2 { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[genetics nnet RColorBrewer]; }; intrval = derive2 { name="intrval"; version="0.1-1"; sha256="1p66cjpn43xib7rrnyv3jqr6bb49d3dxf888p8hxnr7kx9wfalkn"; depends=[]; }; @@ -9141,15 +9258,17 @@ in with self; { investr = derive2 { name="investr"; version="1.4.0"; sha256="0l47bfwxssfr3maprkpwnmgxnxccl3ch4grc7f968iiqk83mcxw9"; depends=[nlme]; }; invgamma = derive2 { name="invgamma"; version="1.1"; sha256="12ga2y4wc9bc5zz6vimvxwgjpsx3ys3209nq63gscbw559ydxa5a"; depends=[]; }; io = derive2 { name="io"; version="0.3.2"; sha256="1cyl8wvbngdrdkkckng1bs699rjp737j99kbd8r155fjj0370nx4"; depends=[filenamer stringr]; }; - ioanalysis = derive2 { name="ioanalysis"; version="0.2.1"; sha256="14bmi6kk8ra9b7px3l98sdm1zjr8516cfkya8fpdfbaxqjdv4byj"; depends=[ggplot2 plot3D]; }; + ioanalysis = derive2 { name="ioanalysis"; version="0.2.2"; sha256="1z7awlbll7lxarl18x5rmlxr36kp0yvx0blvhn2q7fr7zyjffgk4"; depends=[ggplot2 plot3D]; }; ioncopy = derive2 { name="ioncopy"; version="2.1.1"; sha256="1lkav3xvh2qazfmcxwisrjy8wzf639a4md71499jj5rmy650crys"; depends=[shiny]; }; ionflows = derive2 { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[Biostrings]; }; ionr = derive2 { name="ionr"; version="0.3.0"; sha256="18rv5n5gihb6pz36s45yj17sdjsbj4485k4lnggdjj1gbbjkz2ni"; depends=[gplots psych]; }; iopsych = derive2 { name="iopsych"; version="0.90.1"; sha256="0adxwxnb1zdlld3icdggx7cq6cp8z4h1jf105485w322a8c6s9ik"; depends=[mco mvtnorm]; }; iosmooth = derive2 { name="iosmooth"; version="0.94"; sha256="06xgzhjgb6pznjzfli193q7kn8sh5jmqsssgymwj98bw7iwn4q3z"; depends=[]; }; iotables = derive2 { name="iotables"; version="0.4.2"; sha256="1ds6j8x965fc2j11r507ljqwcaam0zz5q2vkhq9gkl53fjfgajlk"; depends=[dplyr eurostat forcats kableExtra knitr lubridate magrittr plyr purrr readxl tibble tidyr]; }; - iotools = derive2 { name="iotools"; version="0.2-5"; sha256="0rn6kvlcijnhlwajh6nmi80qlamxgz0x3pn09yp4hyfpl3zxg1fz"; depends=[]; }; + iotools = derive2 { name="iotools"; version="0.3-1"; sha256="0x24s38shvgqvxpx57qjf86g6f9p9y201yymdl61n5yw439pg88f"; depends=[]; }; ip2location = derive2 { name="ip2location"; version="8.0.0"; sha256="1rhy3jlcl4hcynhjgy3gjx9g9kyn30gq1jwfpll23jixvmrx64by"; depends=[jsonlite reticulate stringr]; }; + ipADMIXTURE = derive2 { name="ipADMIXTURE"; version="0.1.0"; sha256="1fl7nyxg7gakjdggdc311wf037zaxwpqsw3ax7liq1pvw6flb9h7"; depends=[ape treemap]; }; + ipaddress = derive2 { name="ipaddress"; version="0.2.0"; sha256="0i9l6lflapc890cb4vvyhgr69lc64z2ci7yxv5qgafpk8wq4fr03"; depends=[AsioHeaders blob Rcpp rlang vctrs]; }; ipc = derive2 { name="ipc"; version="0.1.3"; sha256="10h54j83l7khk1lkpdwn6hwaz31i3v6svg4q1lxzvr2aqdsj7hy0"; depends=[R6 shiny txtq]; }; ipcwswitch = derive2 { name="ipcwswitch"; version="1.0.3"; sha256="1pqlfkglgsahzsw7z9wsx7k0i9n0kx77g9p1j7i9dz7j74s6g09r"; depends=[survival]; }; ipdmeta = derive2 { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; }; @@ -9157,10 +9276,13 @@ in with self; { ipeadatar = derive2 { name="ipeadatar"; version="0.1.0"; sha256="1qg67xmp9x5yv1gm0k6czycg89rpfa8cscrihmqibhscp5dansnj"; depends=[curl dplyr jsonlite lubridate magrittr purrr sjlabelled]; }; ipflasso = derive2 { name="ipflasso"; version="1.1"; sha256="0gf1yj35vr92qi59hffcf4hzrh2b439kfd6m745wgpxq6wic1hs3"; depends=[glmnet survival]; }; ipfp = derive2 { name="ipfp"; version="1.0.1"; sha256="12aklhf9p70r9b2wi0qgbl835b4lil805c31n1ka4kdix4b4cpr4"; depends=[]; }; - ipfr = derive2 { name="ipfr"; version="1.0.1"; sha256="1gd2nh88xip7dw5sfb79b4g3jhhkzrqwii1vczcjdnghbk0yp96r"; depends=[dplyr ggplot2 magrittr mlr tidyr]; }; + ipfr = derive2 { name="ipfr"; version="1.0.2"; sha256="0q44zw5g76qfqrqv6w2a8p905n4ljxab9jmyqk6fv9vs8j2kyivg"; depends=[dplyr ggplot2 magrittr mlr tidyr]; }; ipft = derive2 { name="ipft"; version="0.7.2"; sha256="0jifmkwac5yfl110200ljm3pas3321j068af9xqzqs0av20m8hps"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; }; + ipify = derive2 { name="ipify"; version="0.2.0"; sha256="05mi8i839iadpz4apkxpxx86zphkgv748mwvdgjxnz82c7s10q9k"; depends=[httr]; }; iplots = derive2 { name="iplots"; version="1.1-7.1"; sha256="1bz8n9cnx6zy3wsr49h55r0l5ikfl0xjg4r76fi4giid2a3ba4lf"; depends=[png rJava]; }; + ipmisc = derive2 { name="ipmisc"; version="2.0.0"; sha256="0yjbxqi89nv7ksvxihfpbm4fn22y7jgj5ngpn5gd7rmg9bq68g0d"; depends=[crayon dplyr forcats magrittr rlang rstudioapi tibble tidyr zeallot]; }; ipptoolbox = derive2 { name="ipptoolbox"; version="1.2"; sha256="0scbny4crgr23qcp0vgsxhwmj5g5q5c1c4mb5mmb5njyvc34s01l"; depends=[AlgDesign copula evd kolmim triangle]; }; + ipr = derive2 { name="ipr"; version="0.1.0"; sha256="1db06r784c6jga0anp6p5b3k47yfhr84nzxyjn52pc9zkg3yifjm"; depends=[]; }; ipred = derive2 { name="ipred"; version="0.9-9"; sha256="0vs1hqfx7yd0xdbmfsf2gim7spkni0845cj6gswn0nhdfdq7ma0d"; depends=[class MASS nnet prodlim rpart survival]; }; iprior = derive2 { name="iprior"; version="0.7.3"; sha256="15qzqwikxy85fcd7psz363b5wb0kpi85icfyb47hbgdhln8fi2qb"; depends=[doSNOW foreach ggplot2 mvtnorm Rcpp RcppEigen reshape2 scales]; }; ips = derive2 { name="ips"; version="0.0.11"; sha256="02jxanfhsjrabj33nwjv71vdc87hiyzikyqrfdj9ix6dky6lm199"; depends=[ape phangorn plyr seqinr XML]; }; @@ -9172,7 +9294,7 @@ in with self; { ipwErrorY = derive2 { name="ipwErrorY"; version="2.1"; sha256="14p22mwc120kdlf6r1hfx4kp7nqrz2nl2vpvy45j8rbrc571b6ka"; depends=[nleqslv]; }; iq = derive2 { name="iq"; version="1.3"; sha256="1bs5gmj0vc396pc6ybmfq2wmv4hfn6lbiyqzdsr4zq01r4y4iwgs"; depends=[]; }; iqLearn = derive2 { name="iqLearn"; version="1.5"; sha256="1zn43zvx0mjzh96bm73scacmladamy8jmhxim7hcfq39cfhiw3c8"; depends=[]; }; - irace = derive2 { name="irace"; version="3.3"; sha256="040d1cl8q5hmcji66bvgvm9wb8w6v7xzfsggbrar8490s9ldjhj4"; depends=[]; }; + irace = derive2 { name="irace"; version="3.4.1"; sha256="1dhlspv1gqg7cm7j95zhl0k2zr0s159krjmxm07k5fp68ax95sky"; depends=[R6]; }; ircor = derive2 { name="ircor"; version="1.0"; sha256="07apa4l4ib11xw25d44b403s3la29sqlid13q41hjrlfxafm91ld"; depends=[]; }; irg = derive2 { name="irg"; version="0.1.1"; sha256="0g5rhahiq2k269n8ip4yj6ncra07j7flraphzxmis931sfpdsvam"; depends=[data_table RcppRoll]; }; irlba = derive2 { name="irlba"; version="2.3.3"; sha256="1h7mzrqdjc41814cf6c93sbyl7nxwvsf3x8apl9rhmydgdlk7qkf"; depends=[Matrix]; }; @@ -9184,25 +9306,25 @@ in with self; { irtDemo = derive2 { name="irtDemo"; version="0.1.4"; sha256="0rpwryybnj7b4bxn0mn1m496y85s2fpqdd78lmdl6jg1ck4j4pb3"; depends=[fGarch shiny]; }; irtProb = derive2 { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; }; irtoys = derive2 { name="irtoys"; version="0.2.1"; sha256="0h6iiaxikhbxhbyksbjnb09qdxinlkwr2v9yzs5wslbni14paq5q"; depends=[ltm sm]; }; - irtplay = derive2 { name="irtplay"; version="1.4.0"; sha256="0v2zwb9jqfbbmfs8zshzvmmhz7g98pm3k9q83yb38q2zakvg1jip"; depends=[dplyr ggplot2 gridExtra pbapply purrr reshape2 rlang statmod tidyr]; }; + irtplay = derive2 { name="irtplay"; version="1.5.0"; sha256="0jj3ac2vc1wkkwdaw8gw08y6y178n5lm468jymb6xrp1s22j22lm"; depends=[dplyr ggplot2 gridExtra Matrix pbapply purrr reshape2 rlang statmod tidyr]; }; irtrees = derive2 { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; }; irtreliability = derive2 { name="irtreliability"; version="0.1-1"; sha256="15qs8bvgrwajj5kfd57rd34l1p2805ilyd7w60ngrqc14d6az9d2"; depends=[fastGHQuad ltm mirt]; }; isa2 = derive2 { name="isa2"; version="0.3.5"; sha256="17vm0906szhrh2k5x694vwcfijbzmd1v3axpszfybc0lgds437cv"; depends=[lattice]; }; isdals = derive2 { name="isdals"; version="2.0-4"; sha256="15p432fskdz2r8523cw122mfhvrq8vdsdsrd0kz9yfin4b5z3zfh"; depends=[]; }; - isdparser = derive2 { name="isdparser"; version="0.3.0"; sha256="1fdp4zk3pzpi5m026rlsrhyl4r5rfxy9sr8d04w2i0316rziv7kc"; depends=[data_table tibble]; }; + isdparser = derive2 { name="isdparser"; version="0.4.0"; sha256="05xkffmiiyhas5hzdjdylbrvh6fjc2fjh7s00iwjxkp4ba7rwq3g"; depends=[data_table lubridate tibble]; }; isingLenzMC = derive2 { name="isingLenzMC"; version="0.2.5"; sha256="1pd1s3a1rv7vlxd5db1pgwdjps8w5im4zz2h3qzal9cwbis0hb51"; depends=[]; }; - island = derive2 { name="island"; version="0.2.4"; sha256="1jwqyrkxljhrxnd4jnfzm2bdgg192865nm1pxizbr7ws0b4z9fyi"; depends=[]; }; - islasso = derive2 { name="islasso"; version="1.1.0"; sha256="1kp94lscl738wlw0hn1xakcgi10zbxpnvkpvzj5ybwvpbjy3qb9a"; depends=[glmnet Matrix]; }; + island = derive2 { name="island"; version="0.2.5"; sha256="0kmrdxpfybmc9l3rqr1b7r1k0js2ri8r2rlg0zk1nd5m14p7c4l2"; depends=[]; }; + islasso = derive2 { name="islasso"; version="1.1.1"; sha256="1jqshk18g6fj51ppz8fxi2a2hydcqf469ff0h9k7lha7a46h26ff"; depends=[glmnet Matrix]; }; ismev = derive2 { name="ismev"; version="1.42"; sha256="19giigxwf62cdkf7mglsca649n2ignb9bxyg9zl7im1vm3ngnmqd"; depends=[mgcv]; }; - isni = derive2 { name="isni"; version="1.1"; sha256="0m7z8gxam4f3d0ggyk502c42aaxvjanxcv5c1p62jv13vgb0jrik"; depends=[Formula lme4 matrixcalc mixor mvtnorm nlme nnet]; }; + isni = derive2 { name="isni"; version="1.2"; sha256="1nw7i20fli3sg1g1dl17g8rz5bpx49gcmlyw4nvfyhdxqr38nb0r"; depends=[Formula lme4 matrixcalc mixor mvtnorm nlme nnet]; }; isnullptr = derive2 { name="isnullptr"; version="1.0.1"; sha256="0kwjxq59n3qncdw63vsdvz7v5mzbl5lmckdfgiiw35pzmahnxzh9"; depends=[]; }; - isoband = derive2 { name="isoband"; version="0.2.0"; sha256="1r023s73qypnvpx18znr9ymylr022m90v65mz2jasn0a1kjrfcbq"; depends=[Rcpp testthat]; }; + isoSurv = derive2 { name="isoSurv"; version="0.1.0"; sha256="00dbrblqdylh2z636hwxr79lk2f8sa15wqcm7m6vd5m2jdhw4xay"; depends=[Iso survival]; }; + isoband = derive2 { name="isoband"; version="0.2.1"; sha256="1ndlnv4g9pbd02y50sx4ffg2ccwqbi7fm2v1lh22wdd8pq33d20q"; depends=[Rcpp testthat]; }; isoboost = derive2 { name="isoboost"; version="1.0.0"; sha256="0arah62y2gyjhrwjyf4hbzlzyvnx3594436pvk8jjcjyfk7bzr6c"; depends=[Iso isotone rpart]; }; - isocat = derive2 { name="isocat"; version="0.2.4"; sha256="0hbkkzcsw7hy40jilb4dahckxi8wfrcvpzrlbfigsc2hdlgm7591"; depends=[dplyr foreach magrittr plyr raster sp]; }; + isocat = derive2 { name="isocat"; version="0.2.5"; sha256="15y1pjyf1lcwxybrsr1n7z8w2dx1cpldcshc3fprqgy0zm2d9ij7"; depends=[foreach magrittr plyr raster sp]; }; isocir = derive2 { name="isocir"; version="2.0-6"; sha256="0dkxdx2g1c579q97r45shws2gylkwqlvrhmc14ddmzi45xhxlql6"; depends=[circular combinat TSP]; }; isopam = derive2 { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[cluster vegan]; }; isopat = derive2 { name="isopat"; version="1.0"; sha256="0fznvgycyd35dh7pbq1xhp667gsficlmycn5pcrqcbs89069xr1s"; depends=[]; }; - isoph = derive2 { name="isoph"; version="1.1.3"; sha256="0905qw3aa7l09ljzm4q78pgy1z8kzv0jzhxa49293z9jy6g3x0mm"; depends=[Iso survival]; }; isotone = derive2 { name="isotone"; version="1.1-0"; sha256="0alk0cma5h3yn4w2nqcahprijsm89b0gby9najbngzi5vnxr6nvn"; depends=[nnls]; }; isotonic_pen = derive2 { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; }; isotree = derive2 { name="isotree"; version="0.1.8"; sha256="043bxl7qfwwh6pirbk65rjb81bk6xmg5isqf9p3bygjpa910pqfi"; depends=[Rcereal Rcpp]; }; @@ -9223,17 +9345,16 @@ in with self; { its_analysis = derive2 { name="its.analysis"; version="1.4.1"; sha256="0f3wn7d3j6c0hhg2gp439y5m3namlswgdln18xxbvzzr4s8kz0wx"; depends=[boot car forecast ggplot2 plyr]; }; itsadug = derive2 { name="itsadug"; version="2.3"; sha256="0wzdy82h05264n9cr84w5j98vz24was9hh1y0wdp56ws3dfbav9m"; depends=[mgcv plotfunctions]; }; itsmr = derive2 { name="itsmr"; version="1.9"; sha256="0dmijaq6q31irwrjqv5gq1yfbgggwb3m6rwbg4lx1r9l3cqays7i"; depends=[]; }; - itunesr = derive2 { name="itunesr"; version="0.1.3"; sha256="1czwkrqy3jqw1x0z5zj2kvp4p11s5zdiswwhx9jfxdcsg86zhr45"; depends=[curl jsonlite lubridate xml2]; }; iva = derive2 { name="iva"; version="0.1.0"; sha256="0dchb263ygilxapwsw2gpl18z12wcjsz8zz5fg7h068hmcysa88g"; depends=[Formula ucminf]; }; ivdesc = derive2 { name="ivdesc"; version="1.0.0"; sha256="134dia4wwg7pazc92ccsb3pmsp9kpszr3j5ziyh0ld53qdmcsmz3"; depends=[knitr purrr rsample]; }; ivfixed = derive2 { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; }; - ivmodel = derive2 { name="ivmodel"; version="1.7.1"; sha256="0v8alqn141s9rymk29xqmdx7gpp8ivz4525afvarxmp9sm2rqq0q"; depends=[Formula ggplot2 Matrix reshape2]; }; - ivmte = derive2 { name="ivmte"; version="1.1.0"; sha256="0a7m04n7lyqykfix0shjhbgnl502zlyigxb997v8wbmx9sx2vk56"; depends=[Formula]; }; + ivmodel = derive2 { name="ivmodel"; version="1.8.1"; sha256="0c0lzjvp9dzj92p65v5lqmr701ksklx06lf6fcylj2w9hczf5klw"; depends=[Formula ggplot2 Matrix reshape2]; }; + ivmte = derive2 { name="ivmte"; version="1.2.0"; sha256="19jcydb5n950av2c9j89sakjkq1jbwnarrl0hwmdy573jqh4d8a5"; depends=[Formula]; }; ivpack = derive2 { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER lmtest sandwich]; }; ivpanel = derive2 { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; }; ivprobit = derive2 { name="ivprobit"; version="1.1"; sha256="05b5gf5gmi2yrkg61n7w12qlgpnjakd1z8hhqxy6py8hahsf84gm"; depends=[Formula]; }; ivregEX = derive2 { name="ivregEX"; version="1.0"; sha256="0zh3rqvhn8ald6lxv9kywy2v1p0nr9ijv6plhpbxc6k51zzsgyl8"; depends=[AER Formula lmtest sandwich]; }; - ivtools = derive2 { name="ivtools"; version="2.2.0"; sha256="183lfv18r763jki8i37b8hk1k1kiglmhvjnfzigqzkzqc4cwibm1"; depends=[ahaz data_table nleqslv numDeriv Rcpp survival]; }; + ivtools = derive2 { name="ivtools"; version="2.3.0"; sha256="1wv0r9dy893hafbbrjcjrphb8dgql71ya4zfbkl5dfp7d4ncfxl0"; depends=[ahaz data_table nleqslv numDeriv Rcpp survival]; }; ivx = derive2 { name="ivx"; version="1.0.0"; sha256="0gxq0w9cmgg17y7kdjxfzaq8nr4knashfav0vjpq6ba9jh5grk9l"; depends=[magrittr Rcpp RcppArmadillo tibble]; }; jSDM = derive2 { name="jSDM"; version="0.1.0"; sha256="0lkapg6v5lh53vnsg5hcr9qis8qimb6ilds23dqcyhi6w3dys9nb"; depends=[coda corrplot Rcpp RcppArmadillo RcppGSL]; }; jSonarR = derive2 { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[jsonlite RCurl]; }; @@ -9241,7 +9362,7 @@ in with self; { jabr = derive2 { name="jabr"; version="0.1.2"; sha256="19hcg2jn7vxmnqwq1828396pgnq53nyw30s19rhy1d7rk5k7dy1p"; depends=[ckanr dplyr glue httr magrittr pillar purrr rappdirs rlang stringr tibble tidyr]; }; jaccard = derive2 { name="jaccard"; version="0.1.0"; sha256="1dmla6qc1k8iw2d7zfjqhf13gqd2lpsrj09yh47ljf994fpab936"; depends=[dplyr magrittr qvalue Rcpp]; }; jack = derive2 { name="jack"; version="1.1.1"; sha256="1mp7cfmh3bzfansb3dyqq347qk6kkf4ndn23pbd78h1xcb54555b"; depends=[DescTools gmp multicool mvp partitions]; }; - jackalope = derive2 { name="jackalope"; version="1.0.0"; sha256="1v2n8ip0nfrdpd263yvr9jnmz9yx9m76vdwds18wj8504y95fzcv"; depends=[ape R6 Rcpp RcppArmadillo RcppProgress Rhtslib zlibbioc]; }; + jackalope = derive2 { name="jackalope"; version="1.1.0"; sha256="0mhsns4q7q7m3dzwkskmrsz3ppp6xvrc89salg62kqhpcay324al"; depends=[ape R6 Rcpp RcppArmadillo RcppProgress Rhtslib zlibbioc]; }; jackknifeKME = derive2 { name="jackknifeKME"; version="1.2"; sha256="0c5shl6s46kz7a623gccqk2plrrf2g29nwr6vbny6009pq3jvzam"; depends=[imputeYn]; }; jackstraw = derive2 { name="jackstraw"; version="1.3"; sha256="02qcaf2p0fyni6n2zhd7vp65kniz74di0pf5jzz79jwj15cfd1b0"; depends=[cluster ClusterR corpcor irlba lfa qvalue rsvd]; }; jacpop = derive2 { name="jacpop"; version="0.6"; sha256="0kq6rn33civ2g6i5nwfqvcgmnn5k2dwmw60lkmz4ywm0y4xxlkai"; depends=[]; }; @@ -9249,7 +9370,7 @@ in with self; { jagsUI = derive2 { name="jagsUI"; version="1.5.1"; sha256="1samj54hyarx9j6k652jl988y3fhxsqg50hfzxdwairg0m2mlgmq"; depends=[coda lattice rjags]; }; james_analysis = derive2 { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; }; janeaustenr = derive2 { name="janeaustenr"; version="0.1.5"; sha256="1wyn4qc28a3sval8shmyi2d7s4nl3jh96s8pzq871brxcmrncbwr"; depends=[]; }; - janitor = derive2 { name="janitor"; version="1.2.1"; sha256="1sgak2zdwy9kwz24q88dpjjvnc8pmw9iansy5ci2hphh3wiykali"; depends=[dplyr magrittr purrr rlang snakecase tidyr]; }; + janitor = derive2 { name="janitor"; version="2.0.1"; sha256="1dy8dlvnxg057qxpd5lk30wcxa15vw95888ccd99sqra789llm3n"; depends=[dplyr lifecycle lubridate magrittr purrr rlang snakecase stringi stringr tidyr tidyselect]; }; jaod = derive2 { name="jaod"; version="0.2.0"; sha256="0cphwfmv5pbkf9hvz9w25gncldycgdfxmg6ajbvj9mdl46z3jddw"; depends=[crul jsonlite tibble]; }; jarbes = derive2 { name="jarbes"; version="1.7.2"; sha256="0qjnx0m65f6a8r6y5mwplaq518lrsf73k8zbf728v857nbjlhf2l"; depends=[ggExtra ggplot2 gridExtra MASS mcmcplots R2jags rjags]; }; jcext = derive2 { name="jcext"; version="0.1.1"; sha256="02zppiyq3gy551zi1g00gam1w4y1wgzn5zi9wrcz8yw915dla0ix"; depends=[ggplot2 maps RColorBrewer rworldmap sp stringr]; }; @@ -9257,7 +9378,6 @@ in with self; { jcp = derive2 { name="jcp"; version="1.0"; sha256="1p3bjn3m7mw8rxcmd79ss23v9sb1ad28qcirj5czpj274glnj26k"; depends=[]; }; jdx = derive2 { name="jdx"; version="0.1.3"; sha256="0d9m0sbdrlh8jfijn5mrfw8y2bpj5vxm0bcjlcc42ipxj47962l9"; depends=[rJava]; }; jeek = derive2 { name="jeek"; version="1.1.1"; sha256="15n0k0i1wwp72g8zqrjmglnckab3p65q3rnpg6d6h8hjcpv82i7g"; depends=[igraph lpSolve pcaPP]; }; - jenkins = derive2 { name="jenkins"; version="1.0"; sha256="02yqadbwnpbscnyjf6xqdfz9j7dqyz3741nrwz4cn9d4j4c3sjdi"; depends=[curl jsonlite]; }; jetpack = derive2 { name="jetpack"; version="0.4.3"; sha256="16l4wkrkf4ihhhpwzd62gvz30n8lxyvail70vmcg41gzdyw76hbl"; depends=[crayon desc docopt packrat remotes]; }; jetset = derive2 { name="jetset"; version="3.4.0"; sha256="0c99h5npsv2gf5d59s4qhkaqmjhbwa3prcykk24wzhnpfq6y6xhp"; depends=[AnnotationDbi org_Hs_eg_db]; }; jfa = derive2 { name="jfa"; version="0.1.0"; sha256="13fhxzhaq29z1kbaf4y9gb1m3706gvd2wsann9kz2mbpa2p9jk3a"; depends=[]; }; @@ -9267,16 +9387,18 @@ in with self; { jjb = derive2 { name="jjb"; version="0.1.1"; sha256="0y9yvnzg6xngz1fvzl5jm4yb1pg6wrp3id0gysv214wcznf3gna9"; depends=[]; }; jlctree = derive2 { name="jlctree"; version="0.0.1"; sha256="17n39jc7cwv6hiayy7h1859prdwy2j3pz1vhi6jqnzm4wy6p8a9a"; depends=[lme4 rpart survival]; }; jmcm = derive2 { name="jmcm"; version="0.2.1"; sha256="1giyd0agjz1qpgj7q55maxk7jjmpwc3mrj02ailvwl44rdvhl90v"; depends=[Formula lattice Rcpp RcppArmadillo roptim]; }; - jmdem = derive2 { name="jmdem"; version="1.0"; sha256="1qz2l02m4gnxrm1ankr5qqlskl8amphzj8r763yas218fvzfa34q"; depends=[statmod VGAM]; }; + jmdem = derive2 { name="jmdem"; version="1.0.1"; sha256="15zrxgd5fgi4wzp4s963pnwj3vkgxs4ygqrcpncy9b6j2cxrivdc"; depends=[statmod VGAM]; }; jmdl = derive2 { name="jmdl"; version="0.3.0"; sha256="0167yj368lh1n79jwbqs4g2asb67hfmgh97519linmfpx0n6xdpa"; depends=[boot Formula MASS minqa mnormt mvtnorm]; }; jmetrik = derive2 { name="jmetrik"; version="1.1"; sha256="1if1kxx8apgkbxpkjnlj2lpsfnyj2splsg1p3j5vxa7q6wx70f9j"; depends=[]; }; + jmotif = derive2 { name="jmotif"; version="1.1.1"; sha256="0b2qllpfgs6q5fwfhxl5b4xdyzbvnja7ld766akf0xxznxvglkrg"; depends=[Rcpp RcppArmadillo]; }; jmuOutlier = derive2 { name="jmuOutlier"; version="2.2"; sha256="1vj9n1hsf780f7l0a22kmi3qm84j4dzjybjkh5zwh6bhwfjnjws3"; depends=[]; }; - jmv = derive2 { name="jmv"; version="1.0.8"; sha256="0h62kmg7z08a5kz4fyz0l1s1hx6i8p75xm5k2pq80jryd6nk3xkg"; depends=[afex BayesFactor car emmeans GGally ggplot2 ggridges GPArotation jmvcore lavaan MASS multcomp mvnormtest nnet PMCMR psych R6 ROCR vcd vcdExtra]; }; - jmvconnect = derive2 { name="jmvconnect"; version="1.0.9"; sha256="1x74zwnp3cdwqsv7djnqcv6k0nrf7v7ng6pk79lzninbssm24sr1"; depends=[BH evaluate httr jmvcore rappdirs Rcpp]; }; - jmvcore = derive2 { name="jmvcore"; version="1.0.8"; sha256="11g6cmiw6l3xkppm6xz1k2lm6xl69ll2av9vn755ngbvf09fgywn"; depends=[base64enc R6 rjson rlang stringi]; }; + jmv = derive2 { name="jmv"; version="1.2.5"; sha256="1hqiclddizvfyvylkak8ia990bfncb9f7gcyljgxmra3djn9mhdn"; depends=[afex BayesFactor car emmeans GGally ggplot2 ggridges GPArotation jmvcore lavaan MASS multcomp mvnormtest nnet PMCMR psych R6 ROCR vcd vcdExtra]; }; + jmvconnect = derive2 { name="jmvconnect"; version="1.2.8"; sha256="0nfd8zxb9pcvn0180vhwccgy5m00lziq0wh0pwxmnazg1x6n0raw"; depends=[BH evaluate httr jmvcore rappdirs Rcpp]; }; + jmvcore = derive2 { name="jmvcore"; version="1.2.5"; sha256="16ki47sm9ng6jqvyyrgw7s09ag4b28dyaqgn5fck1r7ph2l82lp8"; depends=[base64enc R6 rjson rlang stringi]; }; jocre = derive2 { name="jocre"; version="0.3.3"; sha256="1i9n3r16pq6r4sy3fc1rxpil5ws8v2is0xdxafinvwr1hzkv1gz6"; depends=[boot KernSmooth plyr TSP]; }; joinXL = derive2 { name="joinXL"; version="1.0.1"; sha256="1l76bckjz5r1kdsh0s10i0gpca12rkfkp14346fn7avdcw73v23i"; depends=[data_table openxlsx R_utils rChoiceDialogs Rcpp readxl rJava timeDate timeSeries]; }; - joineR = derive2 { name="joineR"; version="1.2.4"; sha256="05wr7gr3mnsfj8a1m5v1b71gh3fc4pyhj6rqapls7iwrkywbf1b6"; depends=[lattice MASS nlme statmod survival]; }; + joineR = derive2 { name="joineR"; version="1.2.5"; sha256="07rsxqvy62w2z48fkgbhfk5b3q9qwkmz11n8j8qkhipqs0h1zwwq"; depends=[lattice MASS nlme statmod survival]; }; + joineRML = derive2 { name="joineRML"; version="0.4.4"; sha256="1h4js01zp627b5z5c5daz2a2cz38f3m2a1bijcpmbg17qskv6wp0"; depends=[cobs doParallel foreach generics ggplot2 lme4 MASS Matrix mvtnorm nlme randtoolbox Rcpp RcppArmadillo survival tibble]; }; joineRmeta = derive2 { name="joineRmeta"; version="0.1.2"; sha256="0lkj3rry8kvdcl3dxrkvnql8rl3fsgc4lk5qdifhl41aws2q7ccs"; depends=[ggplot2 gridExtra gtools JM joineR lme4 MASS Matrix meta msm statmod survival]; }; joinet = derive2 { name="joinet"; version="0.0.3"; sha256="01rql7nidmzhrz6agy5kphsln5nl4lpyrqdrfmf5w98zjr8yqkpr"; depends=[cornet glmnet palasso]; }; joint_Cox = derive2 { name="joint.Cox"; version="3.7"; sha256="1h9cqmly5rrrqvxzkx5fxjaqzks9hpvb2ggaw8b5rn67wbyblrl9"; depends=[survival]; }; @@ -9289,32 +9411,32 @@ in with self; { josaplay = derive2 { name="josaplay"; version="0.1.3"; sha256="0q6kjk3mjxwbqvq3zz0ylpi1viznp9pxzngqpjzv5sibv0ndh0lf"; depends=[magrittr utf8]; }; jose = derive2 { name="jose"; version="1.0"; sha256="1yna3x4hi0vn23dqi605nn1y313brwh2wcv527bm3mdbscgsi2jf"; depends=[jsonlite openssl]; }; jpeg = derive2 { name="jpeg"; version="0.1-8.1"; sha256="1a8mi70x79a691r40yiw684jkg1mr9n8agkxlcksxcnrdybs9c0x"; depends=[]; }; - jpmesh = derive2 { name="jpmesh"; version="1.1.3"; sha256="0ybv19bmrcwzan151p4px0vv6qnaqmk4fgqvqlh4syjnrb6xv0c5"; depends=[leaflet magrittr miniUI purrr rlang sf shiny tibble units]; }; - jpndistrict = derive2 { name="jpndistrict"; version="0.3.4"; sha256="1z1rgqibksxrz0048zk78xlsm595jbm3y6xkrqcifm1xnqgh1fys"; depends=[dplyr jpmesh leaflet magrittr miniUI purrr rlang sf shiny tibble tidyr tidyselect]; }; + jpmesh = derive2 { name="jpmesh"; version="1.2.0"; sha256="0n2il3y9fix0hrva08hk6hdqqqw5y0vwh5m89vqssr4pccyd1syd"; depends=[leaflet magrittr miniUI purrr rlang sf shiny tibble units]; }; + jpndistrict = derive2 { name="jpndistrict"; version="0.3.6"; sha256="0wwkj1m22mwzpagg2plzpwn51sjvnhzhz5q3y8wwza72zhd9sx3h"; depends=[dplyr googlePolylines jpmesh leaflet magrittr miniUI purrr rlang sf shiny tibble tidyr tidyselect]; }; jqr = derive2 { name="jqr"; version="1.1.0"; sha256="00x5a61bsn2ywzc2haz19f6h0sqhlx7z3k1n9y0729dwm4id89ms"; depends=[lazyeval magrittr]; }; - jrc = derive2 { name="jrc"; version="0.3.0"; sha256="1sa6rpmnj48mlwz5h5nfvq4h3yi64bbh5lkxmhs5lc2x03a6nqd6"; depends=[httpuv jsonlite mime R6 stringi stringr]; }; + jquerylib = derive2 { name="jquerylib"; version="0.1"; sha256="0spq9x6fmnw9nnxanwrm17pwsc29mfw7v7v91ypzwb79wkyx3lys"; depends=[htmltools]; }; + jrc = derive2 { name="jrc"; version="0.3.1"; sha256="0vzmmzblwx055jvd90bz6s5iy901kqanbrs64c3wpaxvjigwf87z"; depends=[httpuv jsonlite mime R6 stringi stringr]; }; jrich = derive2 { name="jrich"; version="0.60-35"; sha256="1y486bfqmfg3f22wm0lfk3lh20ljgi8qrgn5jji0f417wh48nf0x"; depends=[ape]; }; jrt = derive2 { name="jrt"; version="1.0.1"; sha256="023i0xqz8mhnjnii92vjw64mjnnlf8jaji99i4c2vxcr7m83jm0r"; depends=[directlabels dplyr ggplot2 ggsci irr mirt psych tidyr]; }; jrvFinance = derive2 { name="jrvFinance"; version="1.4.1"; sha256="1gkivmvc0njm32w7yhbh02h9p212xa3m4cvrwcy7yray8g6phdxp"; depends=[]; }; js = derive2 { name="js"; version="1.1"; sha256="1xsdr14k4djcd1nqybvfzhviics4igsj8yz3r0j2nqhin2wjynlf"; depends=[V8]; }; jsTree = derive2 { name="jsTree"; version="1.0.1"; sha256="0n754illyw29bprll676k9qm5vk5h8qss6gb8lls57kdzj51x2jz"; depends=[data_table htmlwidgets jsonlite]; }; jskm = derive2 { name="jskm"; version="0.3.8"; sha256="1z420lx4ayn19k8d13p4ii8r035jingli618mpfjl3wk95hzigqf"; depends=[ggplot2 gridExtra plyr scales survey survival]; }; - jsmodule = derive2 { name="jsmodule"; version="1.0.4"; sha256="1b81k4kgx0bzwdvq777gfj36mhw1832fbb8bijx6np2w46z1xkyg"; depends=[data_table devEMF DT epiDisplay geepack GGally ggplot2 haven Hmisc jskm jstable labelled MatchIt maxstat pROC purrr RColorBrewer readr readxl rstudioapi see shiny shinycustomloader shinyWidgets survC1 survey survIDINRI survival tableone timeROC]; }; + jsmodule = derive2 { name="jsmodule"; version="1.0.6"; sha256="0qf82yrf3jdhwydwcwiqxlznsn5ayiqigdilyp0xqrrx8s8mkb26"; depends=[data_table devEMF DT epiDisplay geepack GGally ggplot2 haven Hmisc jskm jstable labelled MatchIt maxstat pROC purrr RColorBrewer readr readxl rstudioapi see shiny shinycustomloader shinyWidgets survC1 survey survIDINRI survival tableone timeROC]; }; json64 = derive2 { name="json64"; version="0.1.3"; sha256="19q8qgf4wnd3np12ajy180klpjy0g2csw5micwb4sl7qfzl6wc7j"; depends=[jsonlite]; }; - jsonify = derive2 { name="jsonify"; version="1.0.0"; sha256="0cxdbihcl4w43gvskjw420i6dm689jcydp2dzc371152ysdsjjzd"; depends=[BH rapidjsonr Rcpp]; }; + jsonify = derive2 { name="jsonify"; version="1.1.1"; sha256="14zlg99bryxwhdcydpapjykzqml08ld13mj0kkgijgph2jmzm140"; depends=[rapidjsonr Rcpp]; }; jsonld = derive2 { name="jsonld"; version="2.1"; sha256="0lp0lp9nbk31dia2nq6xba29ymak9h5wl4zbq4pdqw6qm9iwz6ww"; depends=[curl jsonlite V8]; }; - jsonlite = derive2 { name="jsonlite"; version="1.6"; sha256="0lyvhnr6n57h3a89bvipii7x17nvfaycm9j5j50bfrlr48jv9ic8"; depends=[]; }; + jsonlite = derive2 { name="jsonlite"; version="1.6.1"; sha256="0xrki07wc17bkmhz0h7jay784j1sls2i9bf1mfpj6yl59791v4kl"; depends=[]; }; jsonstat = derive2 { name="jsonstat"; version="0.0.2"; sha256="0p0d3snl1971p5ikrkmwqrjjh4fy0b89qk3rnd1dayfb0r80xnnj"; depends=[cli dplyr jsonlite rlang]; }; jsonvalidate = derive2 { name="jsonvalidate"; version="1.1.0"; sha256="1vxklvkva547mzbgi7hll46sfx274c6j4m70algygphz783x3dsx"; depends=[V8]; }; jsr223 = derive2 { name="jsr223"; version="0.3.3"; sha256="0i00nbsj6b4mx9pgp5rana1kj57hi4lz3lsiniv7baz5avmhp65n"; depends=[curl jdx R6 rJava]; }; - jstable = derive2 { name="jstable"; version="0.9.2"; sha256="0vp6bb2yqnh81avy085y6ylb3qll671xmjddi6gilzmbxpks9xl6"; depends=[car coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; }; - jstor = derive2 { name="jstor"; version="0.3.7"; sha256="0if7ngqs9ncnkg9kiag3k51ipxiyrkaqm7lzmvp84hysqq8536jc"; depends=[cli crayon dplyr furrr magrittr pryr purrr readr rlang stringr tibble tidyr xml2]; }; + jstable = derive2 { name="jstable"; version="0.9.3"; sha256="0dac786q715syizmncg5ql3w6ahswsp15f8f61m3gxhnimn6f6la"; depends=[car coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; }; + jstor = derive2 { name="jstor"; version="0.3.8"; sha256="034n9x4skn7l0d9c4qfa01vlrqpkvk0dgplmc6cz07qm0hl35xcw"; depends=[cli crayon dplyr furrr magrittr pryr purrr readr rlang stringr tibble tidyr xml2]; }; jtGWAS = derive2 { name="jtGWAS"; version="1.5.1"; sha256="06cgsncgrqslxcc7s0lb3zwa85bhzkmjzz3f04716xpzwa186vxq"; depends=[Rcpp]; }; - jtools = derive2 { name="jtools"; version="2.0.2"; sha256="1vm2jd70w4a9qfnq2wjixnvpv9yilal6xpfjajgqx289c19csvq9"; depends=[crayon generics ggplot2 magrittr pander pkgconfig rlang tibble]; }; + jtools = derive2 { name="jtools"; version="2.0.5"; sha256="1mlnspb75cwzqqjlskq21a19jlxljxqj8bnan3w782h1nnp52y6g"; depends=[crayon generics ggplot2 magrittr pander pkgconfig rlang tibble]; }; jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; }; jubilee = derive2 { name="jubilee"; version="0.3.3"; sha256="1j2y44pfx9z2k169lh42b4dnfrrnk8jqsjn3wz4l9iscr6r91lx7"; depends=[data_table dplyr readxl xts yaml zoo]; }; junctions = derive2 { name="junctions"; version="1.1"; sha256="1v5jx4mw6x4q3fivsvidd49b8czzbvv5icj39h6jrpmqvrnc8w32"; depends=[Rcpp]; }; - junr = derive2 { name="junr"; version="0.1.3"; sha256="0wcglpziyi6z4n7w70srziljba3jkb27iqxbxz4kk6774c7valbf"; depends=[httr jsonlite]; }; justifier = derive2 { name="justifier"; version="0.1.0"; sha256="14795pf94bzcnnaf5w0xqzy06vqvs76gdvr1rn4ihqh2az00l6n7"; depends=[data_tree DiagrammeR purrr ufs yum]; }; jvcoords = derive2 { name="jvcoords"; version="1.0.2"; sha256="1mlamzg0qz5l23v2w08imrlbnzc3b3amr6yz5hbaf8vc3k3cff5f"; depends=[]; }; jvnVaR = derive2 { name="jvnVaR"; version="1.0"; sha256="0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci"; depends=[]; }; @@ -9323,9 +9445,8 @@ in with self; { kStatistics = derive2 { name="kStatistics"; version="1.0"; sha256="1bfxn38lx5yvz65l9kn29wmqjlv80jar3sra6d89rn58l6rszj6n"; depends=[]; }; kableExtra = derive2 { name="kableExtra"; version="1.1.0"; sha256="1nicvw06xsf3a1f5c10mih07b76m2v5s5h165vmz0qx6n1a3492i"; depends=[digest glue htmltools knitr magrittr readr rmarkdown rstudioapi rvest scales stringr viridisLite webshot xml2]; }; kader = derive2 { name="kader"; version="0.0.8"; sha256="15f2swgngw5rdjdsh5kd55wm2nivlfs8pv4mdn0b75qihwgg1zkk"; depends=[]; }; - kamila = derive2 { name="kamila"; version="0.1.1.3"; sha256="0ssyqn6n1jlslg5kvimakjq9xnb4r8k6ri1a76b13lr11zbl4l10"; depends=[abind gtools KernSmooth plyr Rcpp]; }; - kangar00 = derive2 { name="kangar00"; version="1.3"; sha256="1gxz2lq8vbpjvnriakwipy4fl3mvhrdpnyrnyra3w7zmhlbfp2dd"; depends=[bigmemory biomaRt CompQuadForm data_table igraph lattice sqldf]; }; - kantorovich = derive2 { name="kantorovich"; version="2.0.0"; sha256="0y965nkhgk0z2q2j3sycfg76aqqi3ry8avg0bz9xggpd60bhh5vd"; depends=[gmp lpSolve rcdd Rglpk]; }; + kamila = derive2 { name="kamila"; version="0.1.2"; sha256="01rwalv2qigxl3j3jyhrdbxlarwf0xdc8xa6c42sgcl6qpna5vn7"; depends=[abind gtools KernSmooth plyr Rcpp]; }; + kangar00 = derive2 { name="kangar00"; version="1.4"; sha256="0cgyxvgk6bxvh77y9vl0p024dya9ffr9fhmwlcxbysbr4p3kyiaj"; depends=[bigmemory biomaRt CompQuadForm data_table igraph KEGGgraph lattice sqldf]; }; kaos = derive2 { name="kaos"; version="0.1.2"; sha256="0hzzb8ldydl4g3cl1579q8jv835q4cdmn8agafp6qqdhwi1xxw8k"; depends=[ggplot2 reshape2]; }; kaphom = derive2 { name="kaphom"; version="0.3"; sha256="081drgckirc0wv2viyhhnabrlfzi0nkpq6pffw2rxfjyxdsyvnwa"; depends=[]; }; kappaSize = derive2 { name="kappaSize"; version="1.2"; sha256="0lrcyj85zcl73m6bhbzl6rkprrfpfwmm4amyjkg1xsasy5zlwk67"; depends=[]; }; @@ -9335,6 +9456,7 @@ in with self; { kayadata = derive2 { name="kayadata"; version="0.4.3"; sha256="116bcjfsq9k4x6dy92xbs18rlc09wcwylqyni0dw4c8pww64n937"; depends=[dplyr forcats ggplot2 magrittr scales stringr tidyr]; }; kazaam = derive2 { name="kazaam"; version="0.1-0"; sha256="0j7vysnmiv9sggcxdn3nrgfvyl52pza4kkjnsa0xlb3fzq9qpwlz"; depends=[pbdMPI]; }; kcirt = derive2 { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[corpcor mvtnorm snowfall]; }; + kcopula = derive2 { name="kcopula"; version="0.1.0"; sha256="07ddrq4lxp8i6n7c7ac7x9mdg9gfmlh7bv3n34qalwv0a6fa061w"; depends=[pracma]; }; kcpRS = derive2 { name="kcpRS"; version="1.0.0"; sha256="067j91rhw56kf15h7hxpm9qr6i59fvy5fh9ycfdqcps83wjgx62x"; depends=[doParallel foreach RColorBrewer Rcpp roll]; }; kde1d = derive2 { name="kde1d"; version="1.0.2"; sha256="0m6y1anzl5agb8xpywn2pv6hx4l7k0352bxnzxcs23iksbimxx13"; depends=[BH randtoolbox Rcpp RcppEigen]; }; kdecopula = derive2 { name="kdecopula"; version="0.9.2"; sha256="0g5c12wm3byd4chd8i9mxv599gsf4ip4qghx83j3mmhsmn05zf4y"; depends=[lattice locfit qrng quadprog Rcpp RcppArmadillo]; }; @@ -9348,22 +9470,24 @@ in with self; { kehra = derive2 { name="kehra"; version="0.1"; sha256="1cc0bmbg0dncay50ap7cs2516qngzz3ddaab0jk5r6lwfq87h8qx"; depends=[Hmisc raster reshape2 sp stringr xts zoo]; }; kelvin = derive2 { name="kelvin"; version="2.0-0"; sha256="04xdgpmysksm79m3vqmb4zra3pq09nv99w4fbdla1lmy7z8pkdrk"; depends=[Bessel]; }; kendallRandomWalks = derive2 { name="kendallRandomWalks"; version="0.9.4"; sha256="1mfqblvsn9p6gdcnbypfpzk0xzn6bz1ajbrkz2dap5w35dia3kxa"; depends=[actuar dplyr ggplot2 tibble]; }; - kequate = derive2 { name="kequate"; version="1.6.2"; sha256="08p2dv5swp5458n9sx262s330cj8iy86vr6d8989mjzfys2jyb4q"; depends=[equateIRT ltm mirt]; }; + kequate = derive2 { name="kequate"; version="1.6.3"; sha256="1ii3wlypm2qqkfxr3z1sdnmgc43h2zzlw6v4h2xxjdlznzxkp3mr"; depends=[equateIRT ltm mirt]; }; keras = derive2 { name="keras"; version="2.2.5.0"; sha256="14a1mhx95446s8smd4s7adzlmpzx18kqsbgzva4gbya1b48bkw3l"; depends=[generics magrittr R6 reticulate tensorflow tfruns zeallot]; }; kerasR = derive2 { name="kerasR"; version="0.6.1"; sha256="1yi7710vgcwz0jhishbga41sc6qyk83a0avmq01dvqjsz3cdfsfc"; depends=[reticulate]; }; + kerastuneR = derive2 { name="kerastuneR"; version="0.1.0.1"; sha256="09vvs6pbjdniyfip86kbfrfyjzqzvf382sba4c733ww8qgbngv9i"; depends=[data_table dplyr plotly reticulate rjson RJSONIO rstudioapi tensorflow tidyjson]; }; kerdiest = derive2 { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; }; - kergp = derive2 { name="kergp"; version="0.5.0"; sha256="000hs9mi22k0wyafnj5a3vnhfq9la0s159afnd9133bjx0l6q2g7"; depends=[doFuture doParallel lattice MASS nloptr numDeriv Rcpp testthat]; }; + kergp = derive2 { name="kergp"; version="0.5.1"; sha256="16zb7gsbp3bg4kpn7lszw8rn24i40f6jmxcf751vca1f7pfn38pj"; depends=[doFuture doParallel lattice MASS nloptr numDeriv Rcpp testthat]; }; kernDeepStackNet = derive2 { name="kernDeepStackNet"; version="2.0.2"; sha256="04bdggxvggmppp289n2zw6ijdm7y05gws6z7bp6fr8n1zsxy2w3c"; depends=[caret DiceKriging DiceOptim GA GenSA glmnet globalOptTests lhs matrixStats mvtnorm Rcpp RcppEigen]; }; kerndwd = derive2 { name="kerndwd"; version="2.0.2"; sha256="0nf5hyb274gn02n4lygwryv1jaqff77i040bd8gs1xykgvy6jxny"; depends=[]; }; kernelFactory = derive2 { name="kernelFactory"; version="0.3.0"; sha256="001kw9k3ivd4drd4mwqapkkk3f4jgljiaprhg2630hmll064s89j"; depends=[AUC genalg kernlab randomForest]; }; kernelPSI = derive2 { name="kernelPSI"; version="1.1.1"; sha256="1gnp3ixqmijy6xanlc4l8255biwxmlfyhd3y68arry9rzfjkmxpz"; depends=[CompQuadForm kernlab lmtest pracma Rcpp RcppArmadillo]; }; - kernelTDA = derive2 { name="kernelTDA"; version="0.1.1"; sha256="0rghj0yx32r6565mb06k83qfmnf7lajdhdg2zf8kjd9jyzidqdrn"; depends=[BH mvtnorm Rcpp RcppEigen Rdpack]; }; - kernelboot = derive2 { name="kernelboot"; version="0.1.6"; sha256="151jksyd316wdlinzikpik9g4x4qnqyl87sg4lbdnzq6w35c5j38"; depends=[future future_apply Rcpp]; }; + kernelTDA = derive2 { name="kernelTDA"; version="1.0.0"; sha256="0nzb2z10c3pqj8p47w663mrnmk3g8x61zz99ka8fwcspw1wq3g8m"; depends=[BH mvtnorm Rcpp RcppEigen Rdpack]; }; + kernelboot = derive2 { name="kernelboot"; version="0.1.7"; sha256="1465n9fasyxwm4xx9vajaf5n355z2qdkfzhpp3a6mkv58pydbjss"; depends=[future future_apply Rcpp]; }; kernhaz = derive2 { name="kernhaz"; version="0.1.0"; sha256="1cxwjnfyhxfjdbhs21airycs704jic21pdpsbxsx37wkl11cxpai"; depends=[doParallel foreach GA rgl]; }; kernlab = derive2 { name="kernlab"; version="0.9-29"; sha256="0vqhndl4zm7pvkfvq0f6i9cbrm7pij6kmdp7d7w39pa100x6knn3"; depends=[]; }; kernplus = derive2 { name="kernplus"; version="0.1.2"; sha256="0z5zpj89nw7cdphg6frmjwqjxsl6g95xsa8zgsxmw2q75wwj1saz"; depends=[circular KernSmooth mixtools]; }; kernscr = derive2 { name="kernscr"; version="1.0.5"; sha256="1kcj710q8jbc34g6fcv2nk07hpsb81mfx8hvivgxq8x58028gjzs"; depends=[MASS mvtnorm]; }; - keyholder = derive2 { name="keyholder"; version="0.1.3"; sha256="0r45wd36bf3ir3j3llcy40w6l8440ncvx3c1f6qvb8zgl4bl6z22"; depends=[dplyr rlang tibble]; }; + keyATM = derive2 { name="keyATM"; version="0.1.0"; sha256="0jska1nzwbb7lmm18wpa99jdgvv7mgl1cm47k7qspg1jmx5alj5d"; depends=[dplyr fastmap ggplot2 ggrepel magrittr Matrix purrr quanteda Rcpp RcppEigen RcppProgress rlang stringr tibble tidyr]; }; + keyholder = derive2 { name="keyholder"; version="0.1.4"; sha256="1k648a16015qq29msls2s5y5ql9myi1908klih5gj09pf2fr93wq"; depends=[dplyr rlang tibble]; }; keyplayer = derive2 { name="keyplayer"; version="1.0.3"; sha256="0j4n46r9ivkbzqz8g22dq2bpmx7bs05yb5qp27p9jnfh5x19v2ds"; depends=[igraph matpow sna]; }; keypress = derive2 { name="keypress"; version="1.2.0"; sha256="19l33519f726i3q20y34v1aavrn4fpj3zn5caij3l9q2asw2kqk2"; depends=[]; }; keyring = derive2 { name="keyring"; version="1.1.0"; sha256="1hpfd4hbx43i39l995rg86kfxi7wlyla1gv8mwcdr4xx7z122zzq"; depends=[assertthat filelock getPass openssl R6 rappdirs sodium yaml]; }; @@ -9373,11 +9497,11 @@ in with self; { kgc = derive2 { name="kgc"; version="1.0.0.2"; sha256="14zbcimnglh5jj07dcaxp1dfjaz8syswy29nf8z39qmslv1hg9kk"; depends=[plyr shiny shinythemes]; }; kgschart = derive2 { name="kgschart"; version="1.3.5"; sha256="1gdsrmnv8z99cldvig7grlq8gsbv3wpx7zdamw85lz563n4ln94d"; depends=[abind deepnet ggplot2 gridExtra magrittr matrixStats nnet png shiny stringr]; }; khroma = derive2 { name="khroma"; version="1.3.0"; sha256="1bpap5ljnsjwj0d6r90zhxvgs87j6v2pwxxd6ny14jzn402f1zp8"; depends=[]; }; - kidney_epi = derive2 { name="kidney.epi"; version="1.1.0"; sha256="191yrqdviwvfl62c62qqfa154hglxpfwcxllhgwlm8nsysg46z5i"; depends=[]; }; + kidney_epi = derive2 { name="kidney.epi"; version="1.2.0"; sha256="1hd6w7kxim5slmmqalf5sfjg8jcvhyzn5g4gf6h0lmaprsfszhja"; depends=[]; }; kimisc = derive2 { name="kimisc"; version="0.4"; sha256="0nbjspbq9akhmamfdn192p5b6ki7xqhp422ih6v77xsnrhl5m24z"; depends=[memoise plyr pryr]; }; kin_cohort = derive2 { name="kin.cohort"; version="0.7"; sha256="0wijsjz0piz5j9rm2nr3d5dfpiyba740mbfbkmfll9pz72s58wz8"; depends=[survival]; }; kineticF = derive2 { name="kineticF"; version="1.0"; sha256="1k54zikgva9fw9c4vhkc9b0kv8sq5pmc962s8wxr6qv97liv9p46"; depends=[circular lqmm MASS plotrix sp splancs]; }; - kinship2 = derive2 { name="kinship2"; version="1.8.4"; sha256="18qljqzdv2pc8i3lp6y68ifsqkh3j7gd2bq773myadarapnm7n1k"; depends=[Matrix quadprog]; }; + kinship2 = derive2 { name="kinship2"; version="1.8.5"; sha256="1mhnb805l1q5n4nf1gqb0jw8nbpg1yc0l1c61k3zr7mdrjv2dhkj"; depends=[Matrix quadprog]; }; kirby21_base = derive2 { name="kirby21.base"; version="1.7.0"; sha256="0drm9h1f91yb75v9jzcaysj2cijcana949xvq8bgkqklmf9zwfl5"; depends=[git2r]; }; kirby21_fmri = derive2 { name="kirby21.fmri"; version="1.7.0"; sha256="1z2l6bn53mwkll9ki4169lqlz6wcfp29xzdrqyw606j2xrs4wc22"; depends=[kirby21_base]; }; kirby21_t1 = derive2 { name="kirby21.t1"; version="1.7.0"; sha256="0bv8rrk9jh02h3gill1g2w246j4zv98cjchz7i2c092lvqps8szs"; depends=[kirby21_base]; }; @@ -9385,12 +9509,13 @@ in with self; { kitagawa = derive2 { name="kitagawa"; version="2.2-2"; sha256="0hl2l42jz4wkcx94cqycw8zb3ffg72fp2f310sh5icrcnyw43bmp"; depends=[kelvin]; }; kiwisR = derive2 { name="kiwisR"; version="0.1.8"; sha256="0nncb1xvic0gmj4gllsk1lgwsizlq3vsnifjcf4dp716iik0h0sr"; depends=[dplyr httr jsonlite lubridate purrr tibble]; }; kknn = derive2 { name="kknn"; version="1.3.1"; sha256="1nzkg3dxaiqp87p56wm895qx5xn86hv5hjr73qvl1yiaxiq0x112"; depends=[igraph Matrix]; }; - klaR = derive2 { name="klaR"; version="0.6-14"; sha256="1g995df6286sd64nw7q9bihzkqhrasks45n8xk678y57kcadksai"; depends=[combinat MASS questionr]; }; + klaR = derive2 { name="klaR"; version="0.6-15"; sha256="1bhgkq6spjawy5lsh663rnby4fzrx4k2qwqp4ci4p9pq8g35pzjv"; depends=[combinat MASS questionr]; }; klassR = derive2 { name="klassR"; version="0.1.2"; sha256="1wfgqy4pfbaikm0qqf6dirjw0imbl6si9i0nwn8l17i7c8g8g55s"; depends=[httr jsonlite tm]; }; klausuR = derive2 { name="klausuR"; version="0.12-10"; sha256="12fjs4dnwaki8sz718xgsg8qrqhsgf87cs0bylf0p3f5k8hrmk4b"; depends=[polycor psychometric xtable]; }; + klic = derive2 { name="klic"; version="1.0.2"; sha256="1fwzm6cn9jx1xi2ffn21nq6h3i46saiawjk5kdhwwjp8vy83krys"; depends=[cluster coca gplots Matrix pheatmap RColorBrewer wesanderson]; }; klustR = derive2 { name="klustR"; version="0.1.0"; sha256="1g2q6h3cbm8v3gqz0f6v8bl5na9972k38d94czjfxmx4cv7wfgx8"; depends=[htmlwidgets jsonlite]; }; km_ci = derive2 { name="km.ci"; version="0.5-2"; sha256="1l6kw8jppaa1802yc5pbfwwgac56nhwc9p076ivylhms4w7cdf8v"; depends=[survival]; }; - kmc = derive2 { name="kmc"; version="0.2-3"; sha256="0r1zm8r51zijv67d0dri7mg5z5ihy7h1n16kpf7ap9ravkc8zbik"; depends=[emplik Rcpp rootSolve]; }; + kmc = derive2 { name="kmc"; version="0.2-4"; sha256="0y8bdgdxsz53fiqc2yr39agndxs4zxj7mmplj273map9k0slnnqk"; depends=[emplik Rcpp rootSolve]; }; kmconfband = derive2 { name="kmconfband"; version="0.1"; sha256="10n5w8k57faqcclwshs4m66i2i5b70i6f3xq5nqlgsi2ldkysbc9"; depends=[survival]; }; kmcudaR = derive2 { name="kmcudaR"; version="1.1.0"; sha256="16dkv9ag5375zc23nqakbg7v6knxvh1pips9rjsls0d7rw2bg1bs"; depends=[Rcpp RcppEigen]; }; kmeRs = derive2 { name="kmeRs"; version="1.1.0"; sha256="1wafa9wgqlwrk6jwmbn34n3rmvbc9s6s235z8mscbqgw67snwcq6"; depends=[Biostrings rDNAse tcR]; }; @@ -9404,37 +9529,36 @@ in with self; { kmodR = derive2 { name="kmodR"; version="0.1.0"; sha256="1y1pqrrralklflyb1dw8bslfcyqrw8ryijfbhkwba7ykpxcf9fda"; depends=[]; }; knitLatex = derive2 { name="knitLatex"; version="0.9.0"; sha256="1igacc2sx8897wmnhh8kngd0fq6zqbi30chy5c8jw60zc38mi3wi"; depends=[knitr]; }; knitcitations = derive2 { name="knitcitations"; version="1.0.10"; sha256="0d73qr1zhkx0255vzzf7fs8vpmfnzl91ni4zp5y0l42h8p98vdn5"; depends=[digest httr RefManageR]; }; - knitr = derive2 { name="knitr"; version="1.27"; sha256="02nysgnx6xv0kd351s1d59yx4g0drsd9lmcgxs0rsw5f1jiycgdg"; depends=[evaluate highr markdown stringr xfun yaml]; }; + knitr = derive2 { name="knitr"; version="1.28"; sha256="0ai382fmpz25qrhdgchs3vph2cdvyd73xyryg4jby5fp67d03vh5"; depends=[evaluate highr markdown stringr xfun yaml]; }; knitrBootstrap = derive2 { name="knitrBootstrap"; version="1.0.2"; sha256="1aj60j7f0gcs120fdrnfbnb7vk7lfn1phil0mghg6a5zldz4cqs3"; depends=[knitr markdown rmarkdown]; }; knitrProgressBar = derive2 { name="knitrProgressBar"; version="1.1.0"; sha256="18v5jrscfrin3mcs63bpj0q1drxk3zkhlbw93sqh0qrq04d4x02v"; depends=[R_oo R6]; }; knn_covertree = derive2 { name="knn.covertree"; version="1.0"; sha256="0msfcmwydws7q7m5jdb0dxab0nkbl7mq5llg6v3r4qrnlvrdggvz"; depends=[Matrix Rcpp RcppEigen]; }; knnGarden = derive2 { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; }; knnIndep = derive2 { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; }; - knncat = derive2 { name="knncat"; version="1.2.2"; sha256="1d392910y3yy46j8my1a7m0xkij2rc6vwq5fg22qk00vqli8drz2"; depends=[]; }; knnp = derive2 { name="knnp"; version="2.0.0"; sha256="0qgq8la3zndlb1wwqv9b2kw52y9ns36pi4ds68pkm81bhzq5nqis"; depends=[doParallel foreach forecast parallelDist plyr]; }; knockoff = derive2 { name="knockoff"; version="0.3.2"; sha256="1ky69f3hwwgy2il097mx0z7aakxsq692g9ink8z8cb4wnrp4bk07"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; }; knor = derive2 { name="knor"; version="0.0-7"; sha256="1xxv210sjj9w06pf36q7haz9fkqdc17jyqdsiqsxj3q8zj585qfc"; depends=[Rcpp]; }; knotR = derive2 { name="knotR"; version="1.0-2"; sha256="0kd1b9wibpwyaanz9ny61qgfvcg4d3rzpy05sfshlpp0b1y8d3xj"; depends=[]; }; - kntnr = derive2 { name="kntnr"; version="0.4.2"; sha256="0y2is6ww13dzkm9p7wl8n5rmbcx4qlnzhbidc1h6bg75r5anpphq"; depends=[base64enc dplyr httr jsonlite lubridate purrr rlang rstudioapi stringr tibble tidyr]; }; + kntnr = derive2 { name="kntnr"; version="0.4.4"; sha256="1af5qhj82dixf1qcbz3sfj52pzgy8gnafzifwxnhrp7vpn4rnv6m"; depends=[base64enc dplyr httr jsonlite lubridate purrr rlang rstudioapi stringr tibble tidyr]; }; koRpus = derive2 { name="koRpus"; version="0.11-5"; sha256="053882fnz6c7yjiz72jg6sawd9q57h110nd4yjay65piadi9mci5"; depends=[data_table sylly]; }; koRpus_lang_en = derive2 { name="koRpus.lang.en"; version="0.1-3"; sha256="013zxm5x5hwdx1hqgb7mh3zmn8dri3fhq1brmzg936gddhxap6is"; depends=[koRpus sylly_en]; }; - kofdata = derive2 { name="kofdata"; version="0.1.3.3"; sha256="08rmqm8z1xqf2kdjrxlj90v2fc2cqj43yynm1k46vmcs9m224y9k"; depends=[httr jsonlite xts zoo]; }; + kofdata = derive2 { name="kofdata"; version="0.1.3.4"; sha256="036d3mvhdlpaisms3vg6v35lvy48w8yld7mz3rdd3dw6bszzrg5k"; depends=[httr jsonlite xts zoo]; }; kofnGA = derive2 { name="kofnGA"; version="1.3"; sha256="0w0881ydnqdah04sifi25ypzxdwnsiqxfq1xam4yhr670bdak1vm"; depends=[bigmemory]; }; kohonen = derive2 { name="kohonen"; version="3.0.10"; sha256="1ck7j13x701g67bx81x7plszz804jfhl1yg42krcj9x88vm5cscr"; depends=[Rcpp]; }; kokudosuuchi = derive2 { name="kokudosuuchi"; version="0.4.2"; sha256="1nwydfyr9waa5h8h8nrmwxy0jx7i4893g5khfv6b4g09z6g5cyly"; depends=[curl dplyr glue httr purrr rlang sf shiny stringr tibble xml2]; }; kolmim = derive2 { name="kolmim"; version="1.0"; sha256="0g1i0cazi4nhfwdd3ywqrar1sn7bw77w38qjii045w5vqg05srkp"; depends=[]; }; komaletter = derive2 { name="komaletter"; version="0.3.2"; sha256="0gw86j9fvklz2x9hcl4h3kxjjki5fagmh2dskkpvabmgpk3725z1"; depends=[rmarkdown]; }; - konfound = derive2 { name="konfound"; version="0.1.2"; sha256="1sza54hvg16jxrl37zmsrqvdlxjqhyd0kaxpb9fqd7rkbjqdp0m2"; depends=[broom dplyr ggplot2 margins pbkrtest purrr rlang tidyr]; }; + konfound = derive2 { name="konfound"; version="0.2.1"; sha256="16c7wqifcsr4rmx6gi1n1lhmmn183gmgmqnvy9lc71vz6b8w31xq"; depends=[broom crayon dplyr ggplot2 mice purrr rlang tidyr]; }; kosel = derive2 { name="kosel"; version="0.0.1"; sha256="1gdsy4i58byqxddpsm5nk1r3hlgik5gs2b8jqcm8n1r4ib6pg0ay"; depends=[glmnet ordinalNet]; }; kpcalg = derive2 { name="kpcalg"; version="1.0.1"; sha256="1gd5bisyfwb12l9jmwhi2arlxrabc01vgv4m1qqs23vybsd6yh52"; depends=[energy graph kernlab mgcv pcalg RSpectra]; }; - kpeaks = derive2 { name="kpeaks"; version="0.1.0"; sha256="1qxpncwyshv35h1190py6a69mljabfcjjs7v17a2rb5asahy3rk8"; depends=[]; }; + kpeaks = derive2 { name="kpeaks"; version="1.1.0"; sha256="057xfqn08lqczgrj1r63d7vbncg24x9va9lnk8c47nwzl1x8aphd"; depends=[]; }; kpmt = derive2 { name="kpmt"; version="0.1.0"; sha256="15d26khc0v3kc1c7l1avqp48pfqmc6xj32029mv7myivr41ashk3"; depends=[matrixStats]; }; kpodclustr = derive2 { name="kpodclustr"; version="1.0"; sha256="1fywgdj4q3kg8y9lwnj6vxg9cwgs5ccwj6m3knfgg92f8ghnsbsw"; depends=[clues]; }; kriens = derive2 { name="kriens"; version="0.1"; sha256="1qi65k9fsbbkbw0w40rv60p5ygrvr10rmlyxdaqa5bdpcmrbly5z"; depends=[]; }; - krige = derive2 { name="krige"; version="0.3-1"; sha256="1dxn9prl79ln0m5dlwh62m553lrah1w1kwix02xafhiawl4rxp40"; depends=[MASS mvtnorm]; }; + krige = derive2 { name="krige"; version="0.4.1"; sha256="1mpg1zqabgpi4f4dfnmlpdhs8hnc560sdpp41k4whjnbhqg9flxd"; depends=[invgamma MASS mvtnorm]; }; kriging = derive2 { name="kriging"; version="1.1"; sha256="04bxr34grf2nlrwvgrlh84pz7yi0r8y7dc2wk0v5h5z6yf5a085w"; depends=[]; }; krm = derive2 { name="krm"; version="2019.12-11"; sha256="1dzgvj30bjq4af0470hyxad6bf1y676wk789gqf8rgfwywkk8rr6"; depends=[kyotil]; }; - ks = derive2 { name="ks"; version="1.11.6"; sha256="0hcccjfqnzdxkmnfzq8c5a7yhc138azwyl7rp29d1vl1jawwrwfq"; depends=[FNN kernlab KernSmooth Matrix mclust mgcv multicool mvtnorm]; }; + ks = derive2 { name="ks"; version="1.11.7"; sha256="1f6jvxy0hmngyvnvrknzbmhl42njk0vqyycvydm4qnp8cqirqvba"; depends=[FNN kernlab KernSmooth Matrix mclust mgcv multicool mvtnorm]; }; ksNN = derive2 { name="ksNN"; version="0.1.2"; sha256="06x471hck95xqy7rbh53ibhzh6kfjra7y9ipqdj2rqdkmfdj72q8"; depends=[Rcpp]; }; kselection = derive2 { name="kselection"; version="0.2.0"; sha256="1arg96r2pldvb89rfqnfpjxwksyac2mhmbimbkwzm7wrnbnrcn5d"; depends=[]; }; ksharp = derive2 { name="ksharp"; version="0.1.0.1"; sha256="1dnkj838y8c1b53mlljhjqs3nd864i9xcqsv9n4fw28b4br9m570"; depends=[]; }; @@ -9445,35 +9569,35 @@ in with self; { ktaucenters = derive2 { name="ktaucenters"; version="0.1.0"; sha256="15ddjr4c90b5hc4977gk35zb2kswrcvai3xighy7qj6g9lgiszgf"; depends=[dbscan dplyr GSE MASS]; }; ktsolve = derive2 { name="ktsolve"; version="1.2"; sha256="1606b9anlqjwcbf3jp1rpwzvyx94k79q6zw3p9j0a4nxdvgxlx1j"; depends=[BB nleqslv rootSolve]; }; ktspair = derive2 { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[Biobase]; }; - kubik = derive2 { name="kubik"; version="0.1.2"; sha256="1cjr8vcvjgy425sgr23cl2xrsz9smgil4lkkzm94b8g5rwyk731g"; depends=[intoo]; }; + kubik = derive2 { name="kubik"; version="0.2.0"; sha256="1f5v88pfm9szkshbnkkd0pdphqwrbblfmmys7j8k60y919lwgv0z"; depends=[]; }; kuiper_2samp = derive2 { name="kuiper.2samp"; version="1.0"; sha256="0gcgayh7qdic9zprdvs6r8qvpqs467zrm0qzp2acb7alcp01jhpi"; depends=[]; }; kulife = derive2 { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; }; kutils = derive2 { name="kutils"; version="1.69"; sha256="12pg26a85h0jxlfcyai68dbh4bq1gnq8v1ngi8k9qvafbrpc6gx8"; depends=[foreign lavaan openxlsx plyr RUnit xtable]; }; kvh = derive2 { name="kvh"; version="1.4.1"; sha256="0hnqlybphx8qnx98ynykxpz4ys4prp9zbmkak02qlvmnxwc2cqg0"; depends=[Rcpp]; }; kwb_hantush = derive2 { name="kwb.hantush"; version="0.3.0"; sha256="1rlm7i95yw66asgkag93phig2y9lic4xl2fv3cbnr3v751f6a59m"; depends=[hydroGOF lattice]; }; kyotil = derive2 { name="kyotil"; version="2019.11-22"; sha256="13ihijshgzi3lg07p24yzyxjsrfy9nsf6r5vcssz19y9w26scaj2"; depends=[]; }; - kza = derive2 { name="kza"; version="4.1.0"; sha256="128r4xmqxy1i1svcmv8786qqmriyqygd8d49cp53x8gb56k011xa"; depends=[]; }; + kza = derive2 { name="kza"; version="4.1.0.1"; sha256="1vx7wc8iwmr9d6ff2kcy6y3nyfj6jfzv4hxkv1fsas0rbjgfick4"; depends=[]; }; kzfs = derive2 { name="kzfs"; version="1.5.0.2"; sha256="0x0fc807p0pwsjkhjq51ymwr9nhs6cb0m82029cz8bbn3yf6cymq"; depends=[digest kzft]; }; kzft = derive2 { name="kzft"; version="0.17"; sha256="1y6almhs1x21cr4bbf5fj3mnhp65ivzs869660cyg70sva853sv7"; depends=[polynom]; }; kzs = derive2 { name="kzs"; version="1.4"; sha256="1srffwfg0ps8zx0c6hs2rc2y2p01qjl5g1ypqsbhq88vkcppx1w9"; depends=[lattice]; }; - l0ara = derive2 { name="l0ara"; version="0.1.5"; sha256="15qajzpvqnikg9k199cqvwp9qbrxx4zr9lsvyad96pa9qr156gvb"; depends=[Rcpp RcppArmadillo]; }; + l0ara = derive2 { name="l0ara"; version="0.1.6"; sha256="1cv48rbq080z7zx32hmlkpq7mi5axr09a1hyv3knl1vb9gql4qjq"; depends=[Rcpp RcppArmadillo]; }; l1kdeconv = derive2 { name="l1kdeconv"; version="1.2.0"; sha256="1mk92sz9nsmxsn7yplhfcz07k022lrr61114ckrmm0x8hfd89zj8"; depends=[ggplot2 mixtools]; }; l2boost = derive2 { name="l2boost"; version="1.0.1"; sha256="0f2gapzpvjnr8n1jgn60jpmcas4s8nk2q8q4k5v4ypwvpfqp7kk1"; depends=[MASS]; }; laGP = derive2 { name="laGP"; version="1.5-5"; sha256="1a269cy9qmjldb5hv1nl9naq1rr35z37xjpp4kannj6p560fm476"; depends=[tgp]; }; labdsv = derive2 { name="labdsv"; version="2.0-1"; sha256="099rzl9hy70rmb5fg0vx26mlhr4ra2s0hl3jgv22s8hqpvlmakas"; depends=[cluster MASS mgcv Rtsne]; }; label_switching = derive2 { name="label.switching"; version="1.8"; sha256="0xwwhn249aibip12yxjwlrpyqj6zvc95zc7n9jf2vjjpashyc3yk"; depends=[combinat lpSolve]; }; - labelVector = derive2 { name="labelVector"; version="0.1.0"; sha256="08ydgmvks09hbln10zmqxv9hxgiha0n9w5cgych9bnkqdca74gah"; depends=[]; }; + labelVector = derive2 { name="labelVector"; version="0.1.1"; sha256="156066jbsmqal1q4xwwkyrqfzq0as6r2add0x240y21zak6i8x9q"; depends=[]; }; labeledLoop = derive2 { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; }; labeling = derive2 { name="labeling"; version="0.3"; sha256="13sk7zrrrzry6ky1bp8mmnzcl9jhvkig8j4id9nny7z993mnk00d"; depends=[]; }; - labelled = derive2 { name="labelled"; version="2.2.1"; sha256="1mrpsayrar5m3w2s7ck3m5x62bcns1jhyc6jw12b3bdca251v1ai"; depends=[dplyr haven]; }; + labelled = derive2 { name="labelled"; version="2.2.2"; sha256="1hs83kb0z9ri7q1lpxczf65prf2kgpp7ljb7d5dx9bffqdy1j5h6"; depends=[dplyr haven]; }; labelmachine = derive2 { name="labelmachine"; version="1.0.0"; sha256="18l7argmf7d60cv34w7acjg4bk08nhi2cc5p61sx2zmq28v8nndr"; depends=[yaml]; }; labelrank = derive2 { name="labelrank"; version="0.1"; sha256="03pmpkjdhgw80473kdzdz4s4828pa8f5bja2zqicxrhvyvicvz6f"; depends=[pdist]; }; labstatR = derive2 { name="labstatR"; version="1.0.9"; sha256="1ysk23dwan1lsfwnf9v86yqyzc8wsgzmy18ycz34s4d9biq6y1zd"; depends=[]; }; labstats = derive2 { name="labstats"; version="1.0.1"; sha256="1780slp9l1rqwr5ika6hv606jzbaa3g1ywzkjkd3ff2gb0cby3ni"; depends=[]; }; - lacm = derive2 { name="lacm"; version="0.0.3"; sha256="0qhvffiw2bcpnv6l4y4h12ss59yc2j0hwsg2nr4a7w4nh6yk9fwc"; depends=[numDeriv statmod]; }; + lacm = derive2 { name="lacm"; version="0.1.0"; sha256="0nlk9fzpbz55zzjizlwnsgfj9ik4zfq1s7b68yw1nndaq47lpljy"; depends=[numDeriv statmod]; }; lactcurves = derive2 { name="lactcurves"; version="1.0.0"; sha256="06dj8ajg6ndnyakywy16wbqjjr2jkidvnjv33vxcacwijympaqqy"; depends=[orthopolynom]; }; - lacunaritycovariance = derive2 { name="lacunaritycovariance"; version="1.0-8"; sha256="1dya5jbrr76p20k37v07g8wck8vrdr2j3r04pqhmwq6i7h0w2c30"; depends=[RcppRoll spatstat]; }; - laeken = derive2 { name="laeken"; version="0.5.0"; sha256="1g9r3y7b0gl91hijk9awa8rjk97mqpkxinzq2cgmx0m38ng9ylpa"; depends=[boot MASS]; }; + lacunaritycovariance = derive2 { name="lacunaritycovariance"; version="1.0-13"; sha256="041vldak0s24hci4fm2k1vwm5nvv1nxld94psiaz1v1fh4k781jm"; depends=[RcppRoll spatstat]; }; + laeken = derive2 { name="laeken"; version="0.5.1"; sha256="199rjkhjjygpr6cjzab87as46acb5npi44m4yycvk7lnd0blma8s"; depends=[boot MASS]; }; laercio = derive2 { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; }; lagged = derive2 { name="lagged"; version="0.3-0"; sha256="0bm3d6pgb25rw1njarki60j4d7mx7rni25a21iw1l650slg7sscm"; depends=[]; }; lagsarlmtree = derive2 { name="lagsarlmtree"; version="1.0-1"; sha256="1v3a580scxb1v5na3ab3ax9qlzbnay7nhm3ln5l8f9zgsqrg5lyh"; depends=[Formula partykit spatialreg]; }; @@ -9481,19 +9605,19 @@ in with self; { laketemps = derive2 { name="laketemps"; version="0.5.1"; sha256="04742r379bzgbfr4243wwkb26cvfmnw50jzgygq7vblq00grzska"; depends=[dplyr reshape2]; }; lamW = derive2 { name="lamW"; version="1.3.0"; sha256="00qa1sxyqb2r7f9yidg43cq2v1285f45xpm3z928jpi424mpg0fc"; depends=[Rcpp RcppParallel]; }; lambda_r = derive2 { name="lambda.r"; version="1.2.4"; sha256="1mh1g0gsd58gng0hb29vww2yqb2jfs07kba5kxnnqck5j3izwlnj"; depends=[formatR]; }; - lambda_tools = derive2 { name="lambda.tools"; version="1.0.9"; sha256="1wslxxh6rxny3n06y16dqwpczi3k42vrq4pbwwshl6kzhl56r45b"; depends=[lambda_r]; }; lamme = derive2 { name="lamme"; version="0.0.1"; sha256="1x9jl79iqikpjixajly1k8w2nkzskns2m0v242giknl0ikw298h1"; depends=[]; }; landest = derive2 { name="landest"; version="1.0"; sha256="1lp5sfqk0n7i23fmwjgzsabml1fsji1h9xq5khxzaz1bzqv1s08g"; depends=[survival]; }; landpred = derive2 { name="landpred"; version="1.0"; sha256="1bl17xkx18i8i7arccnjmxvhjn4yiy7w64hg4n0xmhk8pg0l3mrg"; depends=[survival]; }; landsat = derive2 { name="landsat"; version="1.1.0"; sha256="15ymmwhkgw0lqyy2sryss3nsmkrjf4cc0bzlsr41vh5c2636srfd"; depends=[lmodel2 mgcv rgdal sp]; }; landsat8 = derive2 { name="landsat8"; version="0.1-10"; sha256="169b5ka98ka9chbmksz6syaygc9wgl8i2gz1h2xkxj3lk9jcg01r"; depends=[rgdal sp]; }; landscapeR = derive2 { name="landscapeR"; version="1.2"; sha256="1zm5mj861ycbc2m28yjqnkifx8grc4l718mf8r422m78jfakvcjy"; depends=[raster Rcpp]; }; - landscapemetrics = derive2 { name="landscapemetrics"; version="1.4.2"; sha256="04hv1v4nzvsnvhl1sdsvi4ga6kajj5qipyxyqw4y9ps3h1iw1c41"; depends=[cli ggplot2 raster Rcpp RcppArmadillo sp tibble]; }; + landscapemetrics = derive2 { name="landscapemetrics"; version="1.4.3"; sha256="1yy9n4dg8q9r7h34rc40idqmvrgnd06fj95jcs6fwfdqnq78mc2j"; depends=[cli ggplot2 raster Rcpp RcppArmadillo sp tibble]; }; landscapetools = derive2 { name="landscapetools"; version="0.5.0"; sha256="11zp6r414nkj8vhsbryzhkxmpal2bva8msaxf1v69xax70ilxyf1"; depends=[ggplot2 raster Rcpp tibble]; }; landsepi = derive2 { name="landsepi"; version="0.0.8"; sha256="0k2hkrj0r3hx5jvmgx852s030md3cqhm7yixl0xxlkxwqrylw7qc"; depends=[fields maptools MASS Matrix Rcpp rgdal rgeos sf sp splancs]; }; languageR = derive2 { name="languageR"; version="1.5.0"; sha256="1iipnr2b4hd2w718prbh075j56m5xnchlcb2vg26m16qpydp6afn"; depends=[]; }; languagelayeR = derive2 { name="languagelayeR"; version="1.2.4"; sha256="1q82shdcdd84nr6bnfwgyyb81z8dycvj1i3vhwvdg710s15rgiyk"; depends=[attempt curl httr jsonlite]; }; - languageserver = derive2 { name="languageserver"; version="0.3.3"; sha256="16x5a63x49xzgh32sqxfriabax45ng01vmr5i1srp30am55sxa18"; depends=[callr collections desc jsonlite lintr R6 readr repr stringr styler xml2 xmlparsedata]; }; + languageserver = derive2 { name="languageserver"; version="0.3.5"; sha256="04i7pasvj2varq3khk6w0z1liwnwfr648gwvqz9qs7gkyknydp4y"; depends=[callr collections desc fs jsonlite lintr R6 repr stringi styler xml2 xmlparsedata]; }; + languageserversetup = derive2 { name="languageserversetup"; version="0.1.2"; sha256="05i8kcp1zpbkrqpq5vxxvxk9p7phyngxl0q6v76va0i7qnmy1v7a"; depends=[]; }; lans2r = derive2 { name="lans2r"; version="1.0.5"; sha256="1m3hz85gl9m4vafdy7mj3z560d11mdwlwvnzy8n7d1cjqryn7a2b"; depends=[dplyr ggplot2 lazyeval R_matlab reshape2 tidyr]; }; lar = derive2 { name="lar"; version="0.1-2"; sha256="0qda0y4ag10kg83wxs3z754kc8c1dg2rwciy64klk7an4ln43i5b"; depends=[data_table treemap xlsx]; }; largeList = derive2 { name="largeList"; version="0.3.1"; sha256="0csijzlxajj0rh24w5n7fs6ss301zr6zfv5khyq4a9g437bwhc2i"; depends=[]; }; @@ -9503,18 +9627,17 @@ in with self; { lassopv = derive2 { name="lassopv"; version="0.2.0"; sha256="0yawnjw063jypk3riy9xab9cmliv6c9dnabi18670khd3gzb2r9z"; depends=[lars]; }; lassoscore = derive2 { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47rcflhylz8zxvzkyycbc1a4gf6hbcpp21rqd7d"; depends=[glasso glmnet Matrix]; }; lassoshooting = derive2 { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; }; - latdiag = derive2 { name="latdiag"; version="0.2-4"; sha256="051chvky3hlfr4hwm9qickl6aaxwnxa88zksmzczqfspby771hq6"; depends=[]; }; - latentnet = derive2 { name="latentnet"; version="2.10.1"; sha256="1xabby9b5idbs2q04shg05sw26mnrvc3dsngcdrcz7s2crz9mr57"; depends=[abind coda ergm MASS mvtnorm network sna statnet_common]; }; + latdiag = derive2 { name="latdiag"; version="0.3"; sha256="13wk8vhiwr9drcx5f4wlgbin6hc83zv54yr4h3qhjagm3hxcxbw0"; depends=[Rdpack]; }; + latentnet = derive2 { name="latentnet"; version="2.10.5"; sha256="05yjf7a16imv1p2lg5dmfk183xll49crnkg0mbz4c4b39nksy85v"; depends=[abind coda ergm MASS mvtnorm network sna statnet_common]; }; later = derive2 { name="later"; version="1.0.0"; sha256="11xjavj7siz0xv2ffq1ld4bwl35jyrcfpvvs4p3ilpifxx49hyr7"; depends=[BH Rcpp rlang]; }; latex2exp = derive2 { name="latex2exp"; version="0.4.0"; sha256="12nbcgfmv13k6sc6m326ras9bcvy380b7rxcxphn06r3cfkby0zw"; depends=[magrittr stringr]; }; latexpdf = derive2 { name="latexpdf"; version="0.1.6"; sha256="07g33z5lyxinlrzpk6pd41m4c4bbfql611yqcqxasf8wra9bb0jr"; depends=[]; }; latte = derive2 { name="latte"; version="0.2.1"; sha256="1dcwxxj3yran5a3a8vvdfmx4ap69ql2jncxvmci4p4vcw4ki9j9g"; depends=[dplyr ggplot2 glue magrittr memoise mpoly stringr usethis]; }; - lattice = derive2 { name="lattice"; version="0.20-38"; sha256="0b8abkz7syscq883mrgv63pkwaqkcpwfx8rgbqy9vgfva0z5xszx"; depends=[]; }; - latticeDensity = derive2 { name="latticeDensity"; version="1.1.0"; sha256="0amxkdf240pgqaydkfvmv1mgsl17jv57938sl96clw1bzd4ilnld"; depends=[sp spam spatstat spdep splancs]; }; + lattice = derive2 { name="lattice"; version="0.20-41"; sha256="1dapkmh4jlb9sxfrpvapvlfhczl4s8p3r20bn47gcgdk1izmbjjl"; depends=[]; }; latticeExtra = derive2 { name="latticeExtra"; version="0.6-29"; sha256="04fzwcqs594rk5qp98yilh3kdh3sw4xf8wld5rp94ggpaqfw7bbc"; depends=[jpeg lattice png RColorBrewer]; }; - lava = derive2 { name="lava"; version="1.6.6"; sha256="0nfab5fgnmxh8cplg8rd8cp34fny5j0k5wn4baj51r6ck7fq9g3s"; depends=[numDeriv SQUAREM survival]; }; + lava = derive2 { name="lava"; version="1.6.7"; sha256="0ffzxbb8pvfh1m6j61az4ga37snyhylq2941fyc76w7w9i2sixv3"; depends=[numDeriv SQUAREM survival]; }; lava_tobit = derive2 { name="lava.tobit"; version="0.5"; sha256="15dlcjgnvrpdxymcwf4rvk72ssr650dy1ayp50zlrp2va0p6h4kw"; depends=[lava mets mvtnorm survival]; }; - lavaSearch2 = derive2 { name="lavaSearch2"; version="1.5.4"; sha256="0zq5i568pd0xwjbxwi0ndhmjxglyd9y2x8yfvnrmg3pq1wxqys6h"; depends=[doParallel ggplot2 lava MASS Matrix multcomp mvtnorm nlme Rcpp RcppArmadillo reshape2 sandwich]; }; + lavaSearch2 = derive2 { name="lavaSearch2"; version="1.5.5"; sha256="1rb330dzmknrgy2fzbgr76js1izd635sj3jxb7bmm4rfg2z09r6n"; depends=[doParallel ggplot2 lava MASS Matrix multcomp mvtnorm nlme Rcpp RcppArmadillo reshape2 sandwich]; }; lavaan = derive2 { name="lavaan"; version="0.6-5"; sha256="04kvsh2m6mnzlhv83phr3hjzy4sx1ck6f7dgsm7xb8cs84dnxszy"; depends=[MASS mnormt numDeriv pbivnorm]; }; lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.2"; sha256="0qgswdpxb5af0l3v70sg0jrgsdwr88gz6zzwbk3pw5x6qnvnwb6r"; depends=[lavaan psych semPlot shiny shinyAce]; }; lavaan_survey = derive2 { name="lavaan.survey"; version="1.1.3.1"; sha256="133hpy8s00y6jzwwzl9brdh70w26jycdm3n1c6bcryghwh3ai4xr"; depends=[lavaan MASS survey]; }; @@ -9529,28 +9652,29 @@ in with self; { lazyraster = derive2 { name="lazyraster"; version="0.5.0"; sha256="0zf9xlxyzmgxy1nl2kg7fvpfamjz04gf4yxjn3r9j7fjkik35cnp"; depends=[quadmesh raster vapour]; }; lazyrmd = derive2 { name="lazyrmd"; version="0.2.0.1"; sha256="0yzamy1bfq0d7mnrr24wzvvw6lq7rhfs6qnqypfmym65j5kfj0f8"; depends=[digest htmltools htmlwidgets knitr rmarkdown]; }; lazysql = derive2 { name="lazysql"; version="0.1.3"; sha256="18vff80rl8ckjwfqi9dhzs1q35a1wrxvynidji6dy2kvvk38xnpa"; depends=[checkmate magrittr plyr]; }; - lazytrade = derive2 { name="lazytrade"; version="0.3.9"; sha256="1lms83qf0vpflszxjzpxrsr7991lkzqr1ch9ivx70anjaaijgql3"; depends=[dplyr ggplot2 h2o lubridate magrittr openssl readr ReinforcementLearning stringr]; }; + lazytrade = derive2 { name="lazytrade"; version="0.3.10"; sha256="1m8wv5ii4inqw45nzqfqyrhzajr37mk9v4h8vxvy0ya00cibs9hb"; depends=[dplyr ggplot2 h2o lubridate magrittr openssl readr ReinforcementLearning stringr]; }; lba = derive2 { name="lba"; version="2.4.4"; sha256="0izqndm992zv3sg8v5lpnxbdbxhpxl6hq3bf6xgq3pnw8vl3f6nb"; depends=[alabama MASS plotrix rgl scatterplot3d]; }; lbfgs = derive2 { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp]; }; - lbfgsb3 = derive2 { name="lbfgsb3"; version="2015-2.13.1"; sha256="15g465dy4izybmgmbgzmiyaxdfa6l1mcvyh6rc3hgapnlmnvb66m"; depends=[numDeriv]; }; - lbfgsb3c = derive2 { name="lbfgsb3c"; version="2019-11.26"; sha256="1wp4vhagh1pvvg6v7gayj7ljicipaa3jz4wbnml4fnzpwzp0irgv"; depends=[numDeriv Rcpp RcppArmadillo]; }; + lbfgsb3c = derive2 { name="lbfgsb3c"; version="2020-3.2"; sha256="07mhiaxhjjma5c65z3pz7wchgsqn4b19labzyq25ncnmj319fxrg"; depends=[numDeriv Rcpp RcppArmadillo]; }; lbiassurv = derive2 { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; }; lbreg = derive2 { name="lbreg"; version="1.3"; sha256="1z9vixf6sl0k9lizngc3859lk32srkk1d8y133sl6s37ppmqb4s2"; depends=[MASS]; }; - lcc = derive2 { name="lcc"; version="1.0.3"; sha256="0jvih9j6r8q26m3rjzng6sn2l41n5hgfsg2w298ac1v6asv3a1kn"; depends=[gdata ggplot2 gridExtra hnp nlme]; }; + lcars = derive2 { name="lcars"; version="0.3.1"; sha256="14h6p4cbvx586zmaw480cy8gnjc6w7081dps9imvmf5lwcag66mb"; depends=[ggplot2 shiny trekcolors]; }; + lcc = derive2 { name="lcc"; version="1.0.4"; sha256="1g4j4m21jpxphw264kdnxnqnqlp29asc5h5qziqcbxdgmly087ns"; depends=[gdata ggplot2 gridExtra hnp nlme]; }; lcda = derive2 { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; }; + lchemix = derive2 { name="lchemix"; version="0.1.0"; sha256="1g2w57fi6kvsyir14hnxh0v6xwjdnbisafvjxvn1g6a4h55dg9i0"; depends=[MCMCpack mvtnorm]; }; lclGWAS = derive2 { name="lclGWAS"; version="1.0.3"; sha256="03b6ijqvyirv96hc3dsqf4f0zzqlmq5451mcb14d2mw3s6xy1vmq"; depends=[BH Rcpp]; }; lcmm = derive2 { name="lcmm"; version="1.8.1"; sha256="1n7g4m8r8n2zi53ah35gn0nx666fh6brbysgbsyb2yv4hjrf5v08"; depends=[survival]; }; lconnect = derive2 { name="lconnect"; version="0.1.0"; sha256="0wk1kx0awj6d9w4sn0csws0sksx9cb4b4l9xpjqnyavc4zfhxj8l"; depends=[igraph sf]; }; lcopula = derive2 { name="lcopula"; version="1.0.4"; sha256="11rjymm4zj3brifzrrfwqv9v8rzkzqk072xlzyjxm2p08dd11xxb"; depends=[copula pcaPP Rcpp]; }; lcpm = derive2 { name="lcpm"; version="0.1.1"; sha256="0pqmizli5rhyaxvxrjycf8d5kqrm23i3vdz00r8zmijjpiz2p9s2"; depends=[Matrix numDeriv plyr]; }; - lctools = derive2 { name="lctools"; version="0.2-7"; sha256="1pllm5jf9mpy4nf4bn4vifhr173kddabzybjwq4rg9cni92zm3dn"; depends=[MASS pscl reshape weights]; }; - lcyanalysis = derive2 { name="lcyanalysis"; version="1.0.3"; sha256="0nkqrm8r5iyvw2gbixvi0bnqx2wafg67cqz9mn99halzk9hpynl9"; depends=[quantmod TTR xts zoo]; }; + lctools = derive2 { name="lctools"; version="0.2-8"; sha256="03k6d78lzc8jxndnwh39h6fagr6ibhr9354vzvsw873912sxs8c9"; depends=[MASS pscl reshape sp weights]; }; + lcyanalysis = derive2 { name="lcyanalysis"; version="1.0.4"; sha256="0pwr6r8nbvmppqwd9gxap6v49l7iaq5syaq11spxp5yc2h3pa2rg"; depends=[quantmod TTR xts zoo]; }; lda = derive2 { name="lda"; version="1.4.2"; sha256="03r4h5kgr8mfy44p66mfj5bp4k00g8zh4a1mhn46jw14pkhs21jn"; depends=[]; }; lda_svi = derive2 { name="lda.svi"; version="0.1.0"; sha256="1x72zqks8163qpmld21n5vn5q3jazp6g54arf53038rd0c59191q"; depends=[BH Rcpp RcppArmadillo Rdpack reshape2 tm]; }; ldaPrototype = derive2 { name="ldaPrototype"; version="0.1.1"; sha256="0r78x7sn6mg4hgwydk1lgvfzkmgwkzqq0kvn8pqawx9pg8d8h4jb"; depends=[checkmate colorspace data_table dendextend fs lda progress]; }; ldamatch = derive2 { name="ldamatch"; version="1.0.1"; sha256="1dmmjw7h0rrgwga7235bryzzvmx68gmkpy5v1pwvnkk4rxp8xamh"; depends=[car data_table entropy foreach gmp iterators iterpc kSamples MASS RUnit]; }; - ldat = derive2 { name="ldat"; version="0.3.0"; sha256="1bmj5pwkj89mkha74lash4j24b7mj1c7q9as3c4pi5pk4m2s7xwl"; depends=[BH lvec Rcpp]; }; - ldatuning = derive2 { name="ldatuning"; version="1.0.0"; sha256="021k91a76yxjpda2850jcnxvawlrisvw35rw2p6ylfwkylaf4sz9"; depends=[ggplot2 reshape2 Rmpfr scales slam topicmodels]; }; + ldat = derive2 { name="ldat"; version="0.3.3"; sha256="1n8v4nzfv3ayr46ahrz60vasam8mx1phb4vss05d9xh7sxlkx7gv"; depends=[BH lvec Rcpp]; }; + ldatuning = derive2 { name="ldatuning"; version="1.0.2"; sha256="0367y6k5i4sccwfcm89xyc62qblrlwnm6hsa2jf346rnrfz9hkkc"; depends=[ggplot2 reshape2 Rmpfr scales slam topicmodels]; }; ldbod = derive2 { name="ldbod"; version="0.1.2"; sha256="1ylzkswnhf4jnjx2ijasy49pj78ffx333za0bx2fnf3g85kicqiv"; depends=[mnormt RANN]; }; ldbounds = derive2 { name="ldbounds"; version="1.1-1.1"; sha256="10rmkidvvhwnrkc62c5ld44xhbvx1k8mch28h1yryakn8gznp3p8"; depends=[lattice]; }; ldhmm = derive2 { name="ldhmm"; version="0.5.1"; sha256="1jwgxwzz56n6hhpp1qks1x0jsfbrjgfsl6h5sp7498l4d2f279ij"; depends=[ecd ggplot2 moments optimx scales xts zoo]; }; @@ -9559,7 +9683,7 @@ in with self; { leaderCluster = derive2 { name="leaderCluster"; version="1.2"; sha256="1lqhckarqffm2l3ynji53a4hrfn0x7zab7znddia76r2h6nr02zb"; depends=[]; }; leafR = derive2 { name="leafR"; version="0.3"; sha256="0bb05y0py2q0qmvapbv3ibrycjb8i4adl25807i8l7g768y3llsr"; depends=[data_table lazyeval lidR raster sp]; }; leafSTAR = derive2 { name="leafSTAR"; version="1.0"; sha256="16zfaj0v6dx6mhy6m126lxa6w0dzfw4acm83jlbrizaz52amhv6a"; depends=[]; }; - leafem = derive2 { name="leafem"; version="0.0.1"; sha256="0yjbwhxjifhf1yw3phc12hlrr080y4331dwgpxdg62x7v0y5xl31"; depends=[htmltools htmlwidgets leaflet raster sf sp]; }; + leafem = derive2 { name="leafem"; version="0.1.1"; sha256="00wbi5mlrpy81py4g2l8hijyb07shk0cy2pxxb8xvy4sjgyq80jw"; depends=[base64enc htmltools htmlwidgets leaflet mapdeck png raster scales sf sp]; }; leaflet = derive2 { name="leaflet"; version="2.0.3"; sha256="053kn4a2lbhzq2c68c4q782yrbyx4a7zw7j1s6p7k2d75chk1aja"; depends=[base64enc crosstalk htmltools htmlwidgets leaflet_providers magrittr markdown png raster RColorBrewer scales sp viridis]; }; leaflet_esri = derive2 { name="leaflet.esri"; version="1.0.0"; sha256="01bwzxh2rdhpvvazaxsji8axl765q1ix1fdxla6i61nvqkpw3dz1"; depends=[htmltools leaflet leaflet_extras]; }; leaflet_extras = derive2 { name="leaflet.extras"; version="1.0.0"; sha256="0li7651cwlz7sg04xdrmvhkrf0n6amaydck7gqz0wkb6wq8hcyzw"; depends=[htmltools htmlwidgets leaflet magrittr stringr]; }; @@ -9578,62 +9702,63 @@ in with self; { learNN = derive2 { name="learNN"; version="0.2.0"; sha256="0q0j25vi7hrwaf38y10m24czf3rsvj937jvkz3ns12bd8srlflah"; depends=[]; }; learnPopGen = derive2 { name="learnPopGen"; version="1.0.4"; sha256="04wxina3n2bspxdp3d4bgqrwyxqxx46pfp8zgzr3rsj89ml8if9l"; depends=[gtools phytools]; }; learningr = derive2 { name="learningr"; version="0.29.1"; sha256="0z3rs7y9yd81f14sbk3dwq1ifr4vca2s3kl1gnkqlns3dycgyp08"; depends=[plyr]; }; - learnr = derive2 { name="learnr"; version="0.10.0"; sha256="0278q9nbkc4nb0rp930kjrwyidf0v7y38d1s187m4f4bs7ha82k6"; depends=[checkmate ellipsis evaluate htmltools htmlwidgets jsonlite knitr markdown rappdirs renv rmarkdown rprojroot shiny withr]; }; + learnr = derive2 { name="learnr"; version="0.10.1"; sha256="08xwmms6x58y3dsfbl9c6d03145hb4ij97nqr1cc9dxxilmr6x31"; depends=[checkmate ellipsis evaluate htmltools htmlwidgets jsonlite knitr markdown rappdirs renv rmarkdown rprojroot shiny withr]; }; learnrbook = derive2 { name="learnrbook"; version="0.0.2"; sha256="1k17dk8ahn1ifwid1hhx0k7fpgc62zg82y66bbf6nhd4dgdbbv2p"; depends=[]; }; learnstats = derive2 { name="learnstats"; version="0.1.1"; sha256="1sa064cr7ykl4s1ssdfmb3v1sjrnkbwdh04hmwwd9b3x0llsi9vv"; depends=[ggplot2 Rcmdr shiny]; }; - ledger = derive2 { name="ledger"; version="2.0.4"; sha256="19jqy24c8xkpcs9d5w4a1ih474xpnxjnq1q8940mfkx1vq2bz1m5"; depends=[dplyr rio rlang stringr tibble tidyr tidyselect]; }; + leastcostpath = derive2 { name="leastcostpath"; version="1.2.1"; sha256="0fkkvdribvpis0gy951dn6ph0znziqfxjyhpl4mvzbsn0np75n34"; depends=[gdistance pbapply raster rgdal rgeos sp]; }; + ledger = derive2 { name="ledger"; version="2.0.6"; sha256="11j4mzkkgphpwda5g9wl0ppxh5kslx7gqip5b7frmq1vk08fxf1p"; depends=[dplyr rio rlang stringr tibble tidyr tidyselect]; }; leerSIECyL = derive2 { name="leerSIECyL"; version="1.0.2"; sha256="1zx28gpnys9mmhq7wwljfnq92wj1h1vxgqiirnfmn36z942nvmxl"; depends=[RCurl]; }; - lefse = derive2 { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape fBasics geiger picante SDMTools vegan]; }; + legco = derive2 { name="legco"; version="0.1.3"; sha256="1615whdqihpzfhp5ll3x3jg4py04l52dc87kbdmgln4ygxyy5sqh"; depends=[httr jsonlite]; }; + legislatoR = derive2 { name="legislatoR"; version="1.0"; sha256="1553hpb2cmv3hw6v4c7qwgg8n18jwx101yaqnmaaiv8gfyh6j43m"; depends=[curl dplyr]; }; legocolors = derive2 { name="legocolors"; version="0.2.0"; sha256="06jbq12jzga1p5jajhnnkk11s9gjw5ngmnrvhmbvirhsbafp0fjv"; depends=[]; }; - leiden = derive2 { name="leiden"; version="0.3.2"; sha256="0kf6fxqf5l5vilm9g7vspc18daw84cwhpafs5szb1skwd6vrfdzw"; depends=[igraph Matrix reticulate]; }; + leiden = derive2 { name="leiden"; version="0.3.3"; sha256="1hh6bmbz6cpqwl4i94gxylgv9x92zbqdg81r8r4ymfy8c70f3df2"; depends=[igraph Matrix reticulate]; }; leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; }; - lemon = derive2 { name="lemon"; version="0.4.3"; sha256="0wsn5bfg10wq4dnrgpyraz2bzx9p19c7hf1pwj3h4zmpqfgsdbpw"; depends=[ggplot2 gridExtra gtable knitr lattice plyr scales]; }; + lemon = derive2 { name="lemon"; version="0.4.4"; sha256="0m9hqwi709j9iwsxn8jh63741jiyr7ppwgqaw2zkv285p3m5wvd5"; depends=[ggplot2 gridExtra gtable knitr lattice plyr rlang scales]; }; lenses = derive2 { name="lenses"; version="0.0.3"; sha256="08akwzlc5gk2rxbh9xp67n5ahdcld60932ascczjv0accrkxizhk"; depends=[magrittr rlang tidyselect]; }; leri = derive2 { name="leri"; version="0.0.1"; sha256="1309v58xdw3p6y2wpnl64vgsds5kvfiary2a3fa041kz23jzbp3c"; depends=[ncdf4 raster]; }; lero_lero = derive2 { name="lero.lero"; version="0.2"; sha256="03ll7jzcay0swwpmxyf0y9k2h8mxx4p5v3ggm9dgdz4j99934l70"; depends=[]; }; - lessR = derive2 { name="lessR"; version="3.9.0"; sha256="1sia0x9rlfy0p7ilpkb32klv5ydd6jgqcl8n877d1m6xn947fy0z"; depends=[colorspace ellipse foreign lattice latticeExtra leaps openxlsx png rmarkdown robustbase sas7bdat triangle viridisLite wesanderson]; }; + lessR = derive2 { name="lessR"; version="3.9.3"; sha256="1r4hsznvrsy6cb1qwy5vnc9b8wbjsya87161z3w9crgxrw1dbls8"; depends=[colorspace ellipse foreign lattice latticeExtra leaps openxlsx png rmarkdown robustbase sas7bdat triangle viridisLite wesanderson]; }; lest = derive2 { name="lest"; version="1.1.0"; sha256="1d69kvdl31crv4ik8bwylq3s3f4skzrjc4x49c79w443g64n2jp9"; depends=[]; }; lestat = derive2 { name="lestat"; version="1.9"; sha256="1skxymdf3ncmdbskh7711xxgwsmwxfxnl52gcgw06jscx6s6wrsd"; depends=[MASS]; }; + letsR = derive2 { name="letsR"; version="3.2"; sha256="1ahmm290vgmdqnm7wz1fif1g31nsvqszkf921dpddv291xqmbksp"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; }; lexRankr = derive2 { name="lexRankr"; version="0.5.2"; sha256="0vb4m4g88k05yhjla1gwp8ck08356r9dzwal6cq7lb6xm6pl5gvi"; depends=[igraph Rcpp SnowballC]; }; lexicon = derive2 { name="lexicon"; version="1.2.1"; sha256="0x7rscsh6par2lj11sby7bmz41cxn63iiw51lgh29z09cg8j606c"; depends=[data_table syuzhet]; }; lexiconPT = derive2 { name="lexiconPT"; version="0.1.0"; sha256="0w53gnr29nzc1ib54rnxdycs0c5f7vpv586qmvxxzy4ar16kisaq"; depends=[]; }; lfactors = derive2 { name="lfactors"; version="1.0.4"; sha256="1r8qlwj3zsm233jfx9ag0q5g1knvjmbwl3785pwcd12zi6f68dcc"; depends=[]; }; lfda = derive2 { name="lfda"; version="1.1.3"; sha256="0sk409jx4chs2wzhpfw7rlg9pwpdqg32ncfl3w243ypq73jq0qv3"; depends=[plyr rARPACK]; }; lfe = derive2 { name="lfe"; version="2.8-5"; sha256="1hi3jw2s0xwly5lbvhs8ysm9ky69sixzcf7z6fwlsn9lsdrwb07x"; depends=[Formula Matrix sandwich xtable]; }; - lfl = derive2 { name="lfl"; version="1.4.2"; sha256="0lr7r04jpsrp54g4flpwihymvwa3idxhzfjxfbx4ah16rd47nk5x"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; }; + lfl = derive2 { name="lfl"; version="2.0"; sha256="1qlsj2lhgz5ivdlyvlg3gjr99qy88nwf78app0bmb2abq3ym82sc"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; }; lfstat = derive2 { name="lfstat"; version="0.9.4"; sha256="0lm9fyw45kdkkjldkmagykn9p3l3jlw2ky3h00f7j6rqkizjm6r0"; depends=[dygraphs lattice latticeExtra lmom lmomRFA plyr xts zoo]; }; lg = derive2 { name="lg"; version="0.4.1"; sha256="1srlklq6hkb4yd3lbbazswj866i3wzk2524hhj1v45yr7d5qhxv0"; depends=[ggplot2 ks localgauss logspline mvtnorm np tseries]; }; lgarch = derive2 { name="lgarch"; version="0.6-2"; sha256="05xksc4d6dbf5ls4lf2gpk9xyi99fikr7dva88b84rfgads1yhrh"; depends=[zoo]; }; - lgcp = derive2 { name="lgcp"; version="1.5"; sha256="1n1f87qg0y9r22p3q1qjnfrs7xarvsidgqgg6v2bsb55viwy11g3"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat spatstat_utils]; }; - lgr = derive2 { name="lgr"; version="0.3.3"; sha256="1ivab8vw4bp206yq21dz7ix3slghjdzh4k6q6w9xpvphwscx0h48"; depends=[R6]; }; + lgcp = derive2 { name="lgcp"; version="1.6"; sha256="1bsf69l81w7182ay4lrq1miqdr4f4jv5ppcalrqhqjcwhkq1nlkb"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat spatstat_utils]; }; + lgr = derive2 { name="lgr"; version="0.3.4"; sha256="14qq2q526iv2wxdssddv0sqqaz8vj7xgw1rrqspjvqnl8l6bckab"; depends=[R6]; }; lgrdata = derive2 { name="lgrdata"; version="0.1.1"; sha256="0h1crdhqfp6hzx30lp0w015scf2566hhrl2i7mkxy868rkl3aig9"; depends=[]; }; lgtdl = derive2 { name="lgtdl"; version="1.1.5"; sha256="1sixq56d2px36q0xq3kl0zwj2yzm3q8fhgqjvmajcdd5jl8l7130"; depends=[]; }; lhmixr = derive2 { name="lhmixr"; version="0.1.0"; sha256="1c4ydgq1z2y0xk8xqdsim6xvgxdbl3gglfk5kcr9k4m01arvv0rf"; depends=[]; }; - lhs = derive2 { name="lhs"; version="1.0.1"; sha256="0lzaqr7xi3ckln5nglv5xf5njm359slpz1jc6s02hpsqdw6armd4"; depends=[Rcpp]; }; - liayson = derive2 { name="liayson"; version="1.0.2"; sha256="1kz7svfjd8wr826kwqkisiyhszb5df7inf77w2yb2rahkza50m49"; depends=[ape arules biomaRt distances e1071 gplots matlab phangorn plyr proxy RColorBrewer]; }; + lhs = derive2 { name="lhs"; version="1.0.2"; sha256="0n0i1hr9gmc0hfcs2cvpjvdfgm6k26rhcq3q22r8ic0gfj953572"; depends=[Rcpp]; }; libcoin = derive2 { name="libcoin"; version="1.0-5"; sha256="1cm9x1dlg9f7fh7n5nw3x4a7rl88c7ylrlc8x3rx4mq5w1j42x0a"; depends=[mvtnorm]; }; librarian = derive2 { name="librarian"; version="1.7.0"; sha256="0n3q2ppa3p0w8ypgx9s738pmprfbqi9qg8n58xzplp809p903dj9"; depends=[BiocManager remotes]; }; librarysnapshot = derive2 { name="librarysnapshot"; version="0.1.2"; sha256="0v4x564zpm58kxs5n84bi6mcjhbzjg6a2lc30vsc8kbm3qy0nq38"; depends=[]; }; libsoc = derive2 { name="libsoc"; version="0.7"; sha256="1r548rvj98wl0yp6jx5d2qhvy1y4883qp0w3jjk97vp07a1cywn8"; depends=[]; }; libstableR = derive2 { name="libstableR"; version="1.0.2"; sha256="1gkcgbc8a7ks9x8mqmlz98hk55q3qy62izam7csz1s0r5dzsyqcr"; depends=[Rcpp RcppGSL]; }; - lidR = derive2 { name="lidR"; version="2.2.1"; sha256="1yg26r6rhjl44k2x3magij2gn30z7w8vr3njhrwqgmawhgvg0dqq"; depends=[BH data_table future gdalUtils glue lazyeval raster Rcpp RcppArmadillo RCSF rgdal rgeos rgl rlas sf sp]; }; + lidR = derive2 { name="lidR"; version="2.2.4"; sha256="1p0swwwwmfnyzq9k3zf68cl1b4l2vg2d5xy0s4vs5xqjfprbffwd"; depends=[BH data_table future gdalUtils glue lazyeval raster Rcpp RcppArmadillo RCSF rgdal rgeos rgl rlas sf sp]; }; lifecontingencies = derive2 { name="lifecontingencies"; version="1.3.6"; sha256="0v8xrnmviq938x779f3h55iq8bhvbkwgz35v1dxgzbxwclj7jycl"; depends=[markovchain Rcpp]; }; lifecourse = derive2 { name="lifecourse"; version="2.0"; sha256="1m8ihqvzhzpq2m2pdvh37bpq9pdbj23r3y0jkl3q8farh3qj473d"; depends=[TraMineR]; }; - lifecycle = derive2 { name="lifecycle"; version="0.1.0"; sha256="11rk7hkw63rfrf4aqmb4xrb88kg95xh8hajpjvjfwjym2v02h74n"; depends=[glue rlang]; }; + lifecycle = derive2 { name="lifecycle"; version="0.2.0"; sha256="0912865c6675fsblrfdk6s568krsj1x8qbk1kipy7m05xs6nwx19"; depends=[glue rlang]; }; lifelogr = derive2 { name="lifelogr"; version="0.1.0"; sha256="1wygvw61ygpww0kahxhmjdncwg4zc2cshs0brzw18nfqaj8vpfav"; depends=[dplyr fitbitScraper ggplot2 lazyeval lubridate modelr plyr R6 shiny stringr tibble tidyr]; }; lift = derive2 { name="lift"; version="0.0.2"; sha256="0ynsyl6lw7z7bvwzk2idgxzzqji5ffnnc3bll9h4gwdw666g7fln"; depends=[]; }; liftLRD = derive2 { name="liftLRD"; version="1.0-8"; sha256="1m24f4mc70l808cpkcdm91hzb5b3bkzibvgyfi9zs6cs8apcvmy3"; depends=[adlift nlt]; }; liftr = derive2 { name="liftr"; version="0.9.2"; sha256="0azi831c4f0vcq27a3q86vj90zvwrzcy4plhj9hqkk4qz8xw113x"; depends=[knitr rmarkdown rstudioapi stringr yaml]; }; liger = derive2 { name="liger"; version="1.0"; sha256="0vn49p8ldb7ss35by04qh7r1arn5w8gci1rqbyfqw8ignwjrdc7s"; depends=[matrixStats Rcpp RcppArmadillo]; }; - lightr = derive2 { name="lightr"; version="0.1"; sha256="0ijqsgszjgxp3xci6fr17krbzns6r0qyxna60ad85c5ri868rmzs"; depends=[pbmcapply xml2]; }; + lightr = derive2 { name="lightr"; version="1.1"; sha256="0qwz8c9d68sdb5592l8xwpj7kiwli6qg78a3w74vhk8hj8q18g0r"; depends=[future_apply progressr xml2]; }; lightsout = derive2 { name="lightsout"; version="0.3"; sha256="0ypniqf9wk35dd9j57wd7gxchr5hy25fwhmkndz2z8b9ajhm3c9b"; depends=[magrittr shiny shinyjs]; }; likeLTD = derive2 { name="likeLTD"; version="6.3.0"; sha256="1mjf4667xd9pf2684d7vqaj54l5s9pgljn4vkfp32wzbfknq6y8r"; depends=[DEoptim gdata ggplot2 gtools rtf]; }; likelihood = derive2 { name="likelihood"; version="1.7"; sha256="0q8lvwzlniijyzsznb3ys4mv1cqy7ibj9nc3wgyb4rf8676k4f8v"; depends=[nlme]; }; likelihoodAsy = derive2 { name="likelihoodAsy"; version="0.50"; sha256="009alsxsv9fjpihp3zl0a94y6cvr49nh21skba64lzz9fypm9j8l"; depends=[alabama cond digest nleqslv pracma Rsolnp]; }; likelihoodExplore = derive2 { name="likelihoodExplore"; version="0.1.0"; sha256="13cnql7pbx8qq1j3cfb3lkzzf2k55shpfa0jd00z30ys6imxzcfn"; depends=[lazyeval plyr]; }; likert = derive2 { name="likert"; version="1.3.5"; sha256="0c4irxs7pp1z8nj4s8cq23daw4h94n3h7x4f6q1d85614qcl9l3p"; depends=[ggplot2 gridExtra plyr psych reshape2 xtable]; }; - lilikoi = derive2 { name="lilikoi"; version="0.1.0"; sha256="1v7xrkv8xxmq6cdww4z1p9vlvy71cqgd3yb5mal4v9w2wrfaps6z"; depends=[caret corrplot devtools dplyr e1071 gbm ggplot2 glmnet hash Hmisc infotheo Matrix pamr princurve pROC R_oo randomForest reshape2 RWeka stringr]; }; - lillies = derive2 { name="lillies"; version="0.2.5"; sha256="0cqlxcq8yyw87m018hv8s82d6qmh9x93j0hyqycl6w5fdpp62hf0"; depends=[ddpcr dplyr knitr pracma progress rlang survival tidyr]; }; + lillies = derive2 { name="lillies"; version="0.2.7"; sha256="167hlqj9ivsjxhlfv3z1c017iqbj08aig86ncrk9inpqj3zvkyxy"; depends=[ddpcr dplyr knitr pracma progress rlang survival tidyr]; }; limSolve = derive2 { name="limSolve"; version="1.5.6"; sha256="1829rd2cnd8qj80z9a7sgc7gx4sf3kvl5g6d2a0lqqw30f9sjzmr"; depends=[lpSolve MASS quadprog]; }; lime = derive2 { name="lime"; version="0.5.1"; sha256="021wz43dfc3f2k275c98hcnnx7dyyjj18dm2zf8vh7rbk9bnf0sj"; depends=[assertthat ggplot2 glmnet gower htmlwidgets Matrix Rcpp RcppEigen shiny shinythemes stringi]; }; limitplot = derive2 { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; }; @@ -9648,11 +9773,11 @@ in with self; { linemap = derive2 { name="linemap"; version="0.1.0"; sha256="0qkbmpfr742xbs3xn5ppx6q0prwrr9mk1c1mv050cm47dm7jcs6l"; depends=[sf]; }; lineqGPR = derive2 { name="lineqGPR"; version="0.1.1"; sha256="180rvmpasdw8r3w5lw6dxg5jkj875dklvifi2msyp0vaq1nbpbwp"; depends=[broom ggplot2 MASS Matrix mvtnorm nloptr plot3D purrr quadprog tmg TruncatedNormal]; }; lineup = derive2 { name="lineup"; version="0.37-11"; sha256="0lk2wm8wsaaxw3j7yvmg6qif0r0s1jlwqyg73d3xjnjhxgy03zp4"; depends=[class qtl]; }; - lingtypology = derive2 { name="lingtypology"; version="1.0.15"; sha256="1iy33d29fdwpsw13094ykjijidhpcgkxqdqxfmlw4s6ma08sx4gh"; depends=[leaflet leaflet_minicharts rowr stringdist]; }; + lingtypology = derive2 { name="lingtypology"; version="1.1.2"; sha256="079xh4h8fwa9pm6q145fnvrj1bzi7j2lm7850qqmbqkpz62b1yg6"; depends=[leaflet leaflet_minicharts stringdist]; }; linguisticsdown = derive2 { name="linguisticsdown"; version="1.2.0"; sha256="1y2g8h0p4q4mjrawzyprsdw8ynqcbpnjypyhdaf03pcwqglcirkl"; depends=[DT knitr magrittr miniUI rstudioapi shiny stringr]; }; - link2GI = derive2 { name="link2GI"; version="0.4.1"; sha256="1frxm3xyz9bjym4h95bnwgmvgix6n8jz1bvg3pvhxczb2qld52wb"; depends=[devtools R_utils roxygen2 sf stringr]; }; + link2GI = derive2 { name="link2GI"; version="0.4.3"; sha256="1f6pp8cw2cgg669dwgbsmcbq870y5v5qjbdkrrxzfxbyk4j24fqx"; depends=[devtools R_utils raster roxygen2 sf stringr]; }; linkR = derive2 { name="linkR"; version="1.1.1"; sha256="1748r7s5g0gvsmghrb7l5lmdbzb9f4vkbgj51v308jr64r1k7l93"; depends=[svgViewR]; }; - linkcomm = derive2 { name="linkcomm"; version="1.0-11"; sha256="1w5sfmzvrk30fr161pk0cy5nj8kasqm6hqgyafq6r280b5s272cb"; depends=[dynamicTreeCut igraph RColorBrewer]; }; + linkcomm = derive2 { name="linkcomm"; version="1.0-12"; sha256="04725prwikkzqjq8say8b7f1k5z2c5qzsmsflynp1my893dlal0j"; depends=[dynamicTreeCut igraph RColorBrewer]; }; linkim = derive2 { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; }; linkprediction = derive2 { name="linkprediction"; version="1.0-0"; sha256="0p2abdq6ad689236w2d0khlycpjgy6j7xrlb96ngl6csgxwm07bl"; depends=[igraph intergraph]; }; linkspotter = derive2 { name="linkspotter"; version="1.2.0"; sha256="0wk27jn8jr5rskjxbixshmp2dl0l74hrc8r6x3rvhy0x0b00zks2"; depends=[dplyr energy ggplot2 Hmisc infotheo mclust minerva pbapply rAmCharts shiny tidyr visNetwork]; }; @@ -9660,19 +9785,19 @@ in with self; { linpk = derive2 { name="linpk"; version="1.0"; sha256="14l3vv507z7x63ziynp07902599syah0icvzq4rxfjf48bf96l63"; depends=[mvtnorm]; }; linprog = derive2 { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; }; lintools = derive2 { name="lintools"; version="0.1.3"; sha256="1wv94j0j89zq15b80x0cylfxar5ajrdrcdn62mkgjij3m8zqs7fa"; depends=[]; }; - lintr = derive2 { name="lintr"; version="2.0.0"; sha256="09gbci4v5n4gsfzminly8332fw7faxdi1kkyvpa10dydx02sjcwb"; depends=[codetools crayon cyclocomp digest httr jsonlite knitr rex rstudioapi stringdist testthat xml2 xmlparsedata]; }; + lintr = derive2 { name="lintr"; version="2.0.1"; sha256="14yfh641afg6griaadbdciyr3k94fl55s055qwzghgk5gdsj61zy"; depends=[codetools crayon cyclocomp digest httr jsonlite knitr rex rstudioapi testthat xml2 xmlparsedata]; }; + lipidomeR = derive2 { name="lipidomeR"; version="0.1.2"; sha256="1a9zi821mn7w18lg7psc9bagi3c5snvwqgda2f10rw5jff60fkfd"; depends=[BiocManager dplyr ggplot2 knitr limma reshape2 shadowtext stringr tableone tidyr]; }; liqueueR = derive2 { name="liqueueR"; version="0.0.1"; sha256="0rpjib0dz39la63gy9bw9gmdfq2fcx40y4y4wcb6ky41qcjdp1nd"; depends=[itertools]; }; liquidSVM = derive2 { name="liquidSVM"; version="1.2.4"; sha256="1fka0jbc200n0il1qbp5nb9819afi11b1ndwqpsd6bhfjgrcga8m"; depends=[]; }; lira = derive2 { name="lira"; version="2.0.1"; sha256="10bjmapnlw5z5cnbdpkwisvjkmk7zi9xqrvgmb5psj317zcxfc2p"; depends=[coda rjags]; }; lisa = derive2 { name="lisa"; version="0.1.1"; sha256="1i5fbcac24rp8s7z2v23aqy7xv0p610zj5xfb6vscsvhdlvg4w1a"; depends=[]; }; lisp = derive2 { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; }; lisrelToR = derive2 { name="lisrelToR"; version="0.1.4"; sha256="0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5"; depends=[]; }; - list = derive2 { name="list"; version="9.1"; sha256="17d8pscn56wlp6pcz2mvqjmrwv22fhphiiblrnfnd36m65nd58dm"; depends=[arm coda corpcor gamlss_dist magic MASS mvtnorm quadprog sandwich VGAM]; }; + list = derive2 { name="list"; version="9.2"; sha256="1gn0g4qq9rr6vwnwq6525hx7iy3q3vmy3g2v3ba69v4jcdc0a0mx"; depends=[arm coda corpcor gamlss_dist magic MASS mvtnorm quadprog sandwich VGAM]; }; listWithDefaults = derive2 { name="listWithDefaults"; version="1.2.0"; sha256="1rv9jq9zlr5dm08mimba6ni2p5vkfybrgrqk1alm7y6mqpx56byp"; depends=[assertthat]; }; - listarrays = derive2 { name="listarrays"; version="0.3.0"; sha256="0y3485wcirr7srjn4ahx0ym3z9y4a66v6g1pyb6czxzj1wi0i0sn"; depends=[]; }; + listarrays = derive2 { name="listarrays"; version="0.3.1"; sha256="0nfpqywq9pl9yj566y0jw0h89g0ppsc614538ns1jc3l5r2myils"; depends=[]; }; listdtr = derive2 { name="listdtr"; version="1.0"; sha256="08drps03nndpdxswyv8bjm1bcckjav5pjj7fdx3dzyn0v4dfy619"; depends=[ggplot2]; }; listenv = derive2 { name="listenv"; version="0.8.0"; sha256="0ps8bk7zlhbviawrw7vw25skjq81hkk3ijyi6g74dmfqy8zsyapx"; depends=[]; }; - listless = derive2 { name="listless"; version="0.0-2"; sha256="1gr6l4vih7j28kg2mj1xj2yhlpwjc4p894vsxri25vq0r9kgcdym"; depends=[magrittr tidyr]; }; listviewer = derive2 { name="listviewer"; version="3.0.0"; sha256="0zirxdj58h43062f68h6nqcgmpnvdglxx3kjbs4i4k0z9wvqhx8r"; depends=[htmltools htmlwidgets shiny]; }; liteq = derive2 { name="liteq"; version="1.1.0"; sha256="0w3w9f6374qwvlrqknavqh9b38n5q1r6aw5zmz5lahvadalwdbwi"; depends=[assertthat DBI rappdirs RSQLite]; }; litteR = derive2 { name="litteR"; version="0.7.0"; sha256="070g65z50dqffa6c5b3n7yp3zmx9hpk7k3vspnpcmsgpd32r0h6n"; depends=[dplyr fs ggplot2 purrr readr rlang rmarkdown stringr tidyr yaml]; }; @@ -9681,7 +9806,6 @@ in with self; { live = derive2 { name="live"; version="1.5.13"; sha256="1s6yrbwlc4wqszl2yvy1x6d93my18ba8sm8pwfy547cd1x055vig"; depends=[breakDown data_table dplyr e1071 forestmodel ggplot2 gower MASS mlr shiny]; }; livechatR = derive2 { name="livechatR"; version="0.1.0"; sha256="1k0z6q3s9iw962m1lwlx45p95flzl5jg1xh6ng426v9jh1yyrbb2"; depends=[data_table dplyr jsonlite magrittr purrr]; }; ljr = derive2 { name="ljr"; version="1.4-0"; sha256="0jby94ml8w6pwnxbmv6qfjww2myvvnn9vrmlqpdh71dhgp3z35py"; depends=[]; }; - llama = derive2 { name="llama"; version="0.9.2"; sha256="0knlmfddp70ddhjb9slyibbb9qj7pfybqccv3i4f545qxmmykj2n"; depends=[BBmisc checkmate ggplot2 mlr parallelMap plyr rJava]; }; llbayesireg = derive2 { name="llbayesireg"; version="1.0.0"; sha256="0jhkmrjkqfm1flwsbpv6060j6g7cj4ngm0drvrlvsiqpni0k96mh"; depends=[coda ggplot2 llogistic MASS MCMCpack Rcpp rstan StanHeaders]; }; lle = derive2 { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[MASS scatterplot3d snowfall]; }; lllcrc = derive2 { name="lllcrc"; version="1.2"; sha256="06n1fcd3g3z5rl2cyx8jhyscq9fb52mmh0cxg81cnbmai3sliccb"; depends=[combinat data_table plyr VGAM]; }; @@ -9694,15 +9818,15 @@ in with self; { lmSupport = derive2 { name="lmSupport"; version="2.9.13"; sha256="0ln5c91mbxkymgnv2nw5m3nrm5bwckpikgb9x1qhmjc55m98wkb8"; depends=[AICcmodavg car gplots gvlma lme4 pbkrtest psych pwr]; }; lmboot = derive2 { name="lmboot"; version="0.0.1"; sha256="1v7a3vlv0187mpg3y3pj7f3pbk1v5n6amw732chy10vdw5nmfkwd"; depends=[evd]; }; lmds = derive2 { name="lmds"; version="0.1.0"; sha256="130azb0nc2wwxv0qi8v5s4rd02p9lc92zwn634pv7b8awbw81i65"; depends=[assertthat dynutils irlba Matrix]; }; - lme4 = derive2 { name="lme4"; version="1.1-21"; sha256="035j2hqkwv939xl07pm2vykvf3wlx8qj317846n9pkpqkyv58mbz"; depends=[boot lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; }; + lme4 = derive2 { name="lme4"; version="1.1-23"; sha256="0qh29kqli0l3naylgb6jha6jllx4nwryr3hv9yk37blgyyql5mcr"; depends=[boot lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen statmod]; }; lmeNB = derive2 { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[lmeNBBayes numDeriv statmod]; }; lmeNBBayes = derive2 { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; }; lmeSplines = derive2 { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; }; lmeVarComp = derive2 { name="lmeVarComp"; version="1.1"; sha256="0m6syydy89c52hhi0w503l5vkgya2d5ps70z5wmdd39nm4jna68w"; depends=[]; }; lmec = derive2 { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; }; lmem_qtler = derive2 { name="lmem.qtler"; version="0.1.1"; sha256="0qbllj66y294n1m8dsyrnwyvzscbzg8mb2dmjyghcrfaz925vkin"; depends=[lattice lme4 pastecs qtl stringr]; }; - lmenssp = derive2 { name="lmenssp"; version="1.2"; sha256="1vc90x3y1vzmzblc15kqar3nd3c3p8p9nvmpk0ib52n0qv5pr6wz"; depends=[geoR MASS mvtnorm nlme]; }; - lmerTest = derive2 { name="lmerTest"; version="3.1-1"; sha256="0r2vvs3nl6p8xla3gd943khb4ixp0alvspqpnz2y6n3wk8zgh3jj"; depends=[ggplot2 lme4 MASS numDeriv]; }; + lmerTest = derive2 { name="lmerTest"; version="3.1-2"; sha256="1qkdxx5sri65zgpb9gw4nkfkdam51kgy4hxclk5c40yk7y3p0n1q"; depends=[ggplot2 lme4 MASS numDeriv]; }; + lmeresampler = derive2 { name="lmeresampler"; version="0.1.1"; sha256="13i0crk6agw5pcj3znvxj60jfsmncnir7ahwdczgm7kh08hk0f6l"; depends=[boot dplyr Matrix nlmeU plyr RLRsim]; }; lmf = derive2 { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; }; lmfor = derive2 { name="lmfor"; version="1.4"; sha256="012bk6r6gf6y9skfch2pqr2irv70108sz1x6hakl1bifb4lgnbjp"; depends=[magic nlme spatstat]; }; lmm = derive2 { name="lmm"; version="1.2"; sha256="1xymcizqfqh2jp0rxgfgniflyqzgcwg04g9mllva5xgc1ydcg69k"; depends=[]; }; @@ -9715,7 +9839,7 @@ in with self; { lmom = derive2 { name="lmom"; version="2.8"; sha256="1lnj41gynaar5isyijg5nbll64qdxa12dnqvz7lxhaclqcjskqna"; depends=[]; }; lmomPi = derive2 { name="lmomPi"; version="0.5.0"; sha256="07ggfzgvhc6kkqs8bbs6z01rbhgb0ki2y4li6r0nkiby1wcpx0py"; depends=[lmom stringr]; }; lmomRFA = derive2 { name="lmomRFA"; version="3.3"; sha256="113sz2lgb3yv3ayy3x831qww3d088yw2iyjrdc8jfhq6id1w9giq"; depends=[lmom]; }; - lmomco = derive2 { name="lmomco"; version="2.3.2"; sha256="1gqwn5yjd3zcwd5nysayf88vjhj2j1qxfgqcw63q7f2ih0xk1lqp"; depends=[goftest Lmoments MASS]; }; + lmomco = derive2 { name="lmomco"; version="2.3.6"; sha256="18qpkx601gzy33d9kfrpf6mxxb9z6rkz030cx3drb4w5n6langjb"; depends=[goftest Lmoments MASS]; }; lmreg = derive2 { name="lmreg"; version="1.2"; sha256="02a4nqqcfkjlq21mpk8abd4lj4ib2nps3ndf7zgmzygkd1z0df18"; depends=[MASS]; }; lmridge = derive2 { name="lmridge"; version="1.2"; sha256="091rznzh77bmsv7sw9xmsq6s9pnljyq7qyl74kgcxss718134jr3"; depends=[]; }; lmtest = derive2 { name="lmtest"; version="0.9-37"; sha256="02nasm0j2vwkhz11dxqixs23msy1s3yj0jps6949fmgh9gwjkjfx"; depends=[zoo]; }; @@ -9725,20 +9849,22 @@ in with self; { loa = derive2 { name="loa"; version="0.2.45.4"; sha256="0dcpadv453885a2s8l064zn1xswi2v819154j822jr22kd7bj57v"; depends=[lattice MASS mgcv plyr png RColorBrewer rgdal RgoogleMaps sp]; }; loadr = derive2 { name="loadr"; version="0.1.2"; sha256="1zqg90hxw6c3k3gd0caj8fh5ym3f97gsr9cvi6ndlzqh4957cd5n"; depends=[]; }; lobstr = derive2 { name="lobstr"; version="1.1.1"; sha256="0vkif17825x33cz8r89j0qph4wj5l8fzfgl8nh2g7m2v140cxjdq"; depends=[crayon Rcpp rlang]; }; - locStra = derive2 { name="locStra"; version="1.2"; sha256="1aka3fl8g0v3md1nx50z2zw3bb365lskysdy64n6rlgibmlflwc5"; depends=[Matrix Rcpp RcppEigen Rdpack]; }; - localICE = derive2 { name="localICE"; version="0.1.0"; sha256="0pch4mdn0bj3rlqsai3lqrkv6pw04238n9qvlwzwcwii3wyqhkgs"; depends=[checkmate ggplot2]; }; - localIV = derive2 { name="localIV"; version="0.2.1"; sha256="09z5iqqa9ia4v88fbgf23ww8wxywpyndhzl5mhsp5dvpnj0vyhx1"; depends=[KernSmooth mgcv sampleSelection]; }; + locStra = derive2 { name="locStra"; version="1.3"; sha256="1lrdjr63ybdmdm74b76ahc71d9vhrlqbcc9193s7kbhzcms7f60a"; depends=[Matrix Rcpp RcppEigen Rdpack]; }; + localICE = derive2 { name="localICE"; version="0.1.1"; sha256="1pyq6kdahsy9qa0jzmring48r0i9h4rkp8lxpf9afksgm1qn0c5z"; depends=[checkmate ggplot2]; }; + localIV = derive2 { name="localIV"; version="0.3.0"; sha256="0h5hjh30y5273qb7a4kdr3l63g9m9ni2avx5ccqv7xcv49jq296k"; depends=[KernSmooth mgcv rlang sampleSelection]; }; localModel = derive2 { name="localModel"; version="0.3.12"; sha256="1yg61zia8gqgzbg33k6q43ni04cj6y9l3k8vdcw8j1qzasnhz0b2"; depends=[ggplot2 glmnet ingredients partykit]; }; localgauss = derive2 { name="localgauss"; version="0.40"; sha256="0y0pcg2i7lr4wipxawn06hy0q11znhcn2ah6rqwnlyy8pab70pyq"; depends=[foreach MASS matrixStats]; }; localsolver = derive2 { name="localsolver"; version="2.3"; sha256="1d18rihzqf1f5j9agfp8jysll7lqk1ai23hkdqkn6wwxj442llv4"; depends=[]; }; locfdr = derive2 { name="locfdr"; version="1.1-8"; sha256="1falkbp2xz07am8jlhwlvyqvxnli4nwl188kd0g58vdfjcjy3mj2"; depends=[]; }; - locfit = derive2 { name="locfit"; version="1.5-9.1"; sha256="0lafrmq1q7x026m92h01hc9cjjiximqqi3v1g2hw7ai9vf7i897m"; depends=[lattice]; }; + locfit = derive2 { name="locfit"; version="1.5-9.4"; sha256="1vcw16qww4v4547w0gfvhqg60l051bsdlxa6zfcgcj9xbxf6dlyr"; depends=[lattice]; }; locits = derive2 { name="locits"; version="1.7.3"; sha256="0sjnwqiqwzdkglvbdxbkg17gjp0vyqvywsy0qq7adxj5hh0yah05"; depends=[igraph wavethresh]; }; locpol = derive2 { name="locpol"; version="0.7-0"; sha256="1p915n0l09kbwkly627074jslxl01yssp1rf0c7sygvsw6sgy5lm"; depends=[]; }; lodGWAS = derive2 { name="lodGWAS"; version="1.0-7"; sha256="0g5b44d3wb5hnx5l2n76myb1pc9ml3a052n1a4gvgqapa5as35s2"; depends=[rms survival]; }; loder = derive2 { name="loder"; version="0.2.0"; sha256="0m6g8c25dmq0wgpy8y6cbggymxdvqwb6lp2yzs5bgpq183512spb"; depends=[]; }; - lodi = derive2 { name="lodi"; version="0.9.1"; sha256="1207lbin53wlacs6kk8gwzbwllddh4byvs6ai6b9d345k6f9gr56"; depends=[rlang]; }; + lodi = derive2 { name="lodi"; version="0.9.2"; sha256="16xqcza87gsqi6kzx0bdv3w9zyvvppjd20rq08lc8vb75nlkx1yb"; depends=[rlang]; }; + lodr = derive2 { name="lodr"; version="1.0"; sha256="0bmdw489dv1069krnx9yi0bcgx1vx4ymc6s4pix4shha5c5fbiz4"; depends=[Rcpp RcppArmadillo Rdpack]; }; loe = derive2 { name="loe"; version="1.1"; sha256="1n16pgfxg9vcn729xxjbbvavg2ywbdcch9v2ph8nv3z7psc0q46c"; depends=[MASS]; }; + loewesadditivity = derive2 { name="loewesadditivity"; version="0.1.0"; sha256="0j9vvh2ys09hy2k3mbrlf0p493ymrxvfsdcjw0p6rlls54z9lqqc"; depends=[dplyr ggplot2 gridExtra magrittr metR rlang rootSolve tidyr viridis]; }; log4r = derive2 { name="log4r"; version="0.3.2"; sha256="18r5g0817wfn0kmqwv6vf7r2vavi0xh6mqmxrh59y9w3c84npfhl"; depends=[]; }; logKDE = derive2 { name="logKDE"; version="0.3.2"; sha256="09gachibj0klqa9ijw572lwphbh9qj6zqray5byq1dh7zsiq516q"; depends=[pracma Rcpp]; }; logNormReg = derive2 { name="logNormReg"; version="0.3-0"; sha256="172d0y9rb7j0d3m7d22ycfip6s8hk8hlp9810d7r95ra5dr5dx8z"; depends=[]; }; @@ -9750,14 +9876,13 @@ in with self; { logcondiscr = derive2 { name="logcondiscr"; version="1.0.6"; sha256="08wwxsrpflwbzgs6vb3r0f52hscxz1f4q0xabr1yqns06gir1kxd"; depends=[cobs Matrix mvtnorm]; }; logger = derive2 { name="logger"; version="0.1"; sha256="00gfy2i58qn5na8cxxrkm1pvsw85xx2gdk0y6dzxhcjfx3wyplaw"; depends=[]; }; logging = derive2 { name="logging"; version="0.10-108"; sha256="13gd40ygx586vs6xcp6clg69a92aj8zxlk1rn3xzkx8klfjimjc5"; depends=[]; }; - loggit = derive2 { name="loggit"; version="1.1.1"; sha256="1w9a3mbf863dk6lnd95mwr15rxjpv1rra1z45jnqk8w56g1s7q4d"; depends=[dplyr jsonlite]; }; - loggle = derive2 { name="loggle"; version="1.0"; sha256="0r1r8m2ckva17vbvwkzhq1lx6bap0kbfj9hxyk46adslcf3xxrxp"; depends=[doParallel foreach glasso igraph Matrix sm]; }; + loggit = derive2 { name="loggit"; version="1.2.0"; sha256="0nr6hmmdxgqaf3d0fjvc2l40vfwm6xsw5k87gcqdck0knal8pw7d"; depends=[dplyr jsonlite]; }; logiBin = derive2 { name="logiBin"; version="0.3"; sha256="06y5bqm3j6xdr1cd607v2sqkghnd2bv6bvxc6cz8dvp8jabqa0zm"; depends=[data_table doParallel foreach iterators partykit]; }; logihist = derive2 { name="logihist"; version="1.0"; sha256="1q3322rh3g31c5i80aw54pln0m1jgxmbx30cn31nlh3ijkvnpq9a"; depends=[ggplot2]; }; logistf = derive2 { name="logistf"; version="1.23"; sha256="0f1qn7q3h0qg2qdiz69ab03qvl4xhizqg304vjak72390nj25nss"; depends=[mgcv mice]; }; logistic4p = derive2 { name="logistic4p"; version="1.5"; sha256="0h0dxyklqc95ykyril1a3d2bdnszj5l9dqbxzh2wbfmk06prvh8b"; depends=[MASS]; }; logisticPCA = derive2 { name="logisticPCA"; version="0.2"; sha256="07ikyn127ld0fjdw7x911wrswqwqpw4lbcz0iffvh6jfjkgyk341"; depends=[ggplot2]; }; - logisticRR = derive2 { name="logisticRR"; version="0.2.0"; sha256="1ammq50p26hyjgqwhpza4225zk813r1vfs42r9lqv7pf0gkl4zid"; depends=[nnet]; }; + logisticRR = derive2 { name="logisticRR"; version="0.3.0"; sha256="0i9x7rynxcybdnjqbjsny8jsl96mivzdazdgmcg72qrv8qfwpszl"; depends=[nnet]; }; logitnorm = derive2 { name="logitnorm"; version="0.8.37"; sha256="1a9plxsxy29j9xpvwsznbbj150h9daay5zfzlmkh5y0f7f15w3a9"; depends=[]; }; loglognorm = derive2 { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; }; logmult = derive2 { name="logmult"; version="0.7.1"; sha256="0y9z5l93hm8p3r1rd6g11miqg1a02b9hy5mgcxv2q0hm1pg2vh0q"; depends=[gnm qvcalc]; }; @@ -9773,13 +9898,13 @@ in with self; { longitudinal = derive2 { name="longitudinal"; version="1.1.12"; sha256="1d83ws28nxi3kw5lgd5n5y7865djq7ky72fw3ddi1fkkhg1r9y6l"; depends=[corpcor]; }; longitudinalData = derive2 { name="longitudinalData"; version="2.4.1"; sha256="0lnvcfgj721bawl1ciz0jw83mfsnzkhg6jn824vr3qdm4rbib2vd"; depends=[class clv misc3d rgl]; }; longitudinalcascade = derive2 { name="longitudinalcascade"; version="0.3.2.1"; sha256="03nqglxyz6qfalxdnyh2aarxv3agn0b3r4nhsji4v9703h4m1fvg"; depends=[dplyr ggplot2 lubridate rlang scales survival tidyr zoo]; }; - longmemo = derive2 { name="longmemo"; version="1.1-1"; sha256="0myn2xpg0mw3x5zma0y1dza2jg3x9zj9z8xv2z8l2q9pm228xn0d"; depends=[]; }; - longpower = derive2 { name="longpower"; version="1.0-19"; sha256="0m5c544d6vl2zhbyi0spy7ylvr366m7vrmk3xfghcvd5anbzpjk6"; depends=[lme4 nlme]; }; + longmemo = derive2 { name="longmemo"; version="1.1-2"; sha256="01rj5x9cgscsrakbx9155mbvs35fd3j484cfz5cds9vl521fjr3r"; depends=[]; }; + longpower = derive2 { name="longpower"; version="1.0-21"; sha256="0095jml46lchyp17gsqpjabq80xjddlvd4ir8y2jsg8sgd3pc8vs"; depends=[lme4 nlme]; }; longurl = derive2 { name="longurl"; version="0.3.0"; sha256="0ysa70zlkk3ybddj3yd3vbhjnkjbrisiz5a2hgbjx10p33m1r3am"; depends=[dplyr httr purrr]; }; loo = derive2 { name="loo"; version="2.2.0"; sha256="1hq1zcj76x55z9kic6cwf7mfq9pzqfbr341jbc9wp7x8ac4zcva6"; depends=[checkmate matrixStats]; }; lookupTable = derive2 { name="lookupTable"; version="0.1"; sha256="0ipy0glrad2gfr75kd8p3999xnfw4pgpbg6p064qa8ljqg0n1s49"; depends=[data_table dplyr]; }; loon = derive2 { name="loon"; version="1.2.3"; sha256="0h6vbsdp7m9wawjswzzpx7sq8q06xj9l1ln11vfwsyfnp4c66bfs"; depends=[gridExtra]; }; - loon_data = derive2 { name="loon.data"; version="0.0.6"; sha256="01bd3w5xfr7lnbdhi9al5svlg7x3xs4l0jbqsrlamzc96izkm952"; depends=[]; }; + loon_data = derive2 { name="loon.data"; version="0.0.8"; sha256="164i9dbx8a2mwydrzr9bsbx1fqwhg3avl373jk6mpn51m290f8vc"; depends=[]; }; loop = derive2 { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; }; loopr = derive2 { name="loopr"; version="1.0.1"; sha256="1qzfjv15ymk8mnvb556g2bfk64jpl0qcvh4bm3wihplr1whrwq6y"; depends=[dplyr lazyeval magrittr plyr R6]; }; loose_rock = derive2 { name="loose.rock"; version="1.0.16"; sha256="0vk9zmiy730c1d397v5p7v8ywjv1wv9vabmhdjyrfdx7bijfy57m"; depends=[digest dplyr futile_options ggplot2 MASS reshape2]; }; @@ -9787,7 +9912,7 @@ in with self; { lorec = derive2 { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; }; lorentz = derive2 { name="lorentz"; version="1.0-2"; sha256="0napn1j6gwilskjnv2hjrxzrbcbh7cvfj578h0la9bpkm1xhi7di"; depends=[emulator magrittr tensor]; }; lori = derive2 { name="lori"; version="2.2.0"; sha256="1jsnfrkn6zn20gs8qhw5znfzaqp9j274yfqajcgfvy916j50acac"; depends=[data_table rARPACK svd]; }; - lotri = derive2 { name="lotri"; version="0.1.1"; sha256="1zqp56hxqyf9a820p2d272ykqnrym2qc5sbmah68qv8ql9n1z9qg"; depends=[Matrix]; }; + lotri = derive2 { name="lotri"; version="0.2.1"; sha256="0szhng56b4pa3wp4ffyvz647ad1xnk14xavnfqcr9wi022r22mc1"; depends=[Matrix]; }; lowmemtkmeans = derive2 { name="lowmemtkmeans"; version="0.1.2"; sha256="08zhdw48rzw47yzhg4s37bkliyngxs46cyb57dvng1s3m0w0dhvi"; depends=[Rcpp RcppArmadillo]; }; lpSolve = derive2 { name="lpSolve"; version="5.6.15"; sha256="1fpkyjyqykwa1dxnhiky01pm09syxg169lm7hpy39bdbg10vw9s6"; depends=[]; }; lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17.6"; sha256="04ah9xjr3574i3sfif90f6mln1cxpq7ia2nza30j5pfijqr7vwgd"; depends=[]; }; @@ -9814,7 +9939,7 @@ in with self; { lshorth = derive2 { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; }; lsl = derive2 { name="lsl"; version="0.5.6"; sha256="1hwzklx1qp5ljc059j2hridg3caw4cgn7rbqs8xh2arzcvqdw3rb"; depends=[ggplot2 lavaan reshape2]; }; lslx = derive2 { name="lslx"; version="0.6.9"; sha256="0jfy6j5z53daarv8d8vqsgqdiy6s720m7qlcvrhicc8drvj88mrm"; depends=[ggplot2 lavaan R6 Rcpp RcppEigen]; }; - lsm = derive2 { name="lsm"; version="0.1.9"; sha256="1cyqbsd12m5m8f1vx8lyv21jdcs308fkp4zqlz2482m5fiinlaj2"; depends=[]; }; + lsm = derive2 { name="lsm"; version="0.2.0"; sha256="1rc55w526ss99parjb40w3fbqlxfkhzknxysmqn4fkxrhrylzqn5"; depends=[]; }; lsmeans = derive2 { name="lsmeans"; version="2.30-0"; sha256="1z35dzfgib0fk201gzjhgmnryhl3mkz50gz8g6nfv4mj9kzc5x5f"; depends=[emmeans]; }; lspartition = derive2 { name="lspartition"; version="0.4"; sha256="1n0pag5l4kx211dl5z9xbqijp7l04jcm0i6jgvkk2b0x9v32q4r5"; depends=[combinat dplyr ggplot2 MASS matrixStats mgcv pracma]; }; lspline = derive2 { name="lspline"; version="1.0-0"; sha256="0bc1nfpp1r5fi8rrg295k4r8pm03baqplrzwmk3sn4kdbp0apvgk"; depends=[]; }; @@ -9826,18 +9951,18 @@ in with self; { ltbayes = derive2 { name="ltbayes"; version="0.4"; sha256="0kv5k56hmc1m7bv5pmmmk46822szsgwqgpwydn0x56az7xn6hjk6"; depends=[mcmc MHadaptive numDeriv]; }; ltm = derive2 { name="ltm"; version="1.1-1"; sha256="1qrgzwx5l58qf5rfp1knxc84r0g943q5sdr3ky74zzwpnmrf2vf7"; depends=[MASS msm polycor]; }; ltmix = derive2 { name="ltmix"; version="0.2.0"; sha256="1p0p904lvhxwwj3vn0rrl6ydygnldgxqpk82y3b9p2ywvvfh86yv"; depends=[gtools pracma]; }; - ltmle = derive2 { name="ltmle"; version="1.1-0"; sha256="1mlsggl0vdnlgf8j0bjmh4zrfdpmkfi9jhar35npxz9r0yfjmw8f"; depends=[Matrix matrixStats speedglm]; }; + ltmle = derive2 { name="ltmle"; version="1.2-0"; sha256="1mqrf77319cjs3q48iigrkjc3rjibz7qyij49a7l0nim3c1hd0b0"; depends=[Matrix matrixStats speedglm]; }; ltsa = derive2 { name="ltsa"; version="1.4.6"; sha256="10wmw9r00400ng2zlysd8jqgypjclshxj83x32002j2a9cz4f186"; depends=[]; }; ltsbase = derive2 { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; }; ltsk = derive2 { name="ltsk"; version="1.0.8"; sha256="1ykgz5cas924kmq9ak2j8vhr7gg9s458qarqkmyg9wdfj1srqi7p"; depends=[fields gstat sp]; }; ltsspca = derive2 { name="ltsspca"; version="0.1.0"; sha256="0hgl2zd8y01z8mhnqg1hlv1l7klpwhwk7q8b99pw9vgnh1f2gnfs"; depends=[pracma Rcpp RcppArmadillo]; }; ltxsparklines = derive2 { name="ltxsparklines"; version="1.1.2"; sha256="1jnygg7wm2768lrrzball8rn8f60xy4nc3a18h4d32jpnbhifj13"; depends=[]; }; - lubridate = derive2 { name="lubridate"; version="1.7.4"; sha256="14a823il77w3wmmnzr89vwrqp50y56dh5raycnaw6c8nv5xsh32i"; depends=[Rcpp stringr]; }; + lubridate = derive2 { name="lubridate"; version="1.7.8"; sha256="0g2m9dyhgds4shdrk76w7rqdl9msam4rii2qrhz12gipzhi9k89x"; depends=[generics Rcpp]; }; lucid = derive2 { name="lucid"; version="1.7"; sha256="0hrb8qlm8g4h1ziwxq7m53pf7g8fxhcb2xryavm6rniqpcx8yb7g"; depends=[nlme]; }; ludic = derive2 { name="ludic"; version="0.1.8"; sha256="1yvv3h7arm8hp89j9nr5vdl8ahxcpggi2qq431l7xbw9jka41qdp"; depends=[fGarch landpred Matrix Rcpp RcppArmadillo]; }; lue = derive2 { name="lue"; version="0.2.1"; sha256="0is5rd1dz91bzphmfbbzi3s6rgc5g9qza2r26k70xs67dgn0qbjq"; depends=[ncdf4 raster]; }; lulcc = derive2 { name="lulcc"; version="1.0.4"; sha256="00ymbp20kbjyzrsrxa262y0y7fj4jgsbqf56aapb657xvafxvy5q"; depends=[lattice raster rasterVis ROCR]; }; - lumberjack = derive2 { name="lumberjack"; version="1.1.3"; sha256="086xm1br03pwyv6qjmv4fjq5pm9p287zglpxrirr4s4giv3q45am"; depends=[R6]; }; + lumberjack = derive2 { name="lumberjack"; version="1.1.4"; sha256="18idnirla4v0571gilc4qmjz2s25rsmjy4f1y98pdazrbxdllds9"; depends=[R6]; }; lunar = derive2 { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; }; lutz = derive2 { name="lutz"; version="0.3.1"; sha256="15b8gzwykxyqycjba319jpsbny07j8ny9y4lnrg8mcf488ycz57y"; depends=[lubridate Rcpp]; }; luzlogr = derive2 { name="luzlogr"; version="0.2.0"; sha256="0n0cm94aianwcypa0gwdjvyy3dwbkfv6zi1gq2jn57b41fg20lq5"; depends=[assertthat]; }; @@ -9846,7 +9971,7 @@ in with self; { lvmcomp = derive2 { name="lvmcomp"; version="1.2"; sha256="08hs97bdz4n0bdhvqqq5xywfy140s69c750rn38criq4cw4gm3z7"; depends=[coda Rcpp RcppArmadillo]; }; lvnet = derive2 { name="lvnet"; version="0.3.5"; sha256="1wqqxavs2s0hmlifyaa1jrlc8hj4z72fkgjckkmh9m2r4jp9zy0g"; depends=[corpcor dplyr glasso lavaan Matrix mvtnorm OpenMx psych qgraph semPlot]; }; lvplot = derive2 { name="lvplot"; version="0.2.0"; sha256="01sisj2vbx2yb5w9cjzyaf9j46vh4kkw05xccq1f7wmsg69zmj6b"; depends=[ggplot2 RColorBrewer]; }; - lwgeom = derive2 { name="lwgeom"; version="0.1-7"; sha256="1l3f9six3x56j32l7jdb2iym8641k2vy94xjxzf5219cvx6p6abp"; depends=[Rcpp sf units]; }; + lwgeom = derive2 { name="lwgeom"; version="0.2-3"; sha256="0zq85lgmqhxa0f8kgq616lbnh9ads3cwjrfyf9hf1h85wfg0fa6n"; depends=[Rcpp sf units]; }; lxb = derive2 { name="lxb"; version="1.5"; sha256="16x1mvhxqhvibzmv6mlqcmkgic2sha1xagf7r2azmn4z8x1m9w6n"; depends=[]; }; lymphclon = derive2 { name="lymphclon"; version="1.3.0"; sha256="1jns41sk2rx1j3mg06dzy434k30gpfhbkn6s47fmyv1y8701vfl0"; depends=[corpcor expm MASS]; }; m2b = derive2 { name="m2b"; version="1.0"; sha256="0agzw67mmwrw1f61yn24z5w1pgjssdapg3li0a53i3ylnij45mzr"; depends=[caret caTools e1071 geosphere ggplot2 randomForest]; }; @@ -9855,6 +9980,7 @@ in with self; { mBvs = derive2 { name="mBvs"; version="1.3"; sha256="0vxwdi45pd79c3lz507wlw2alvf501q27lwvd34j6y68p3vyv1vj"; depends=[]; }; mDAG = derive2 { name="mDAG"; version="1.2.2"; sha256="0k85sl0jmpcpiz92cz6x3kd8jc6yyfv9z4wm1kyaikcf5q4qlad4"; depends=[bnlearn logistf mgm nnet pcalg Rcpp RcppArmadillo]; }; mExplorer = derive2 { name="mExplorer"; version="1.0.0"; sha256="1563d9r7f25vw5vsph21z3dwz9n40dpaiyx28ay1bbp5i1x2l3rb"; depends=[nnet qusage]; }; + mFLICA = derive2 { name="mFLICA"; version="0.1.1"; sha256="0r7jpbshmb2p090f2bd7f458rlp2gck1wv7yspf1v55xxjwb6r5x"; depends=[dtw ggplot2]; }; mFilter = derive2 { name="mFilter"; version="0.1-5"; sha256="0anc93mciq8j64knd0i38sfgv10w1gd375wnfzn1fq8sj3lby7kb"; depends=[]; }; mGSZ = derive2 { name="mGSZ"; version="1.0"; sha256="08l98i75h2h8kx9ksvzp5qr8jhf0l6n4j7rg8fcn7hk8chn8v5zh"; depends=[Biobase GSA ismev limma MASS]; }; mHG = derive2 { name="mHG"; version="1.1"; sha256="1rz5ncrvvv9h9grls15apa63v2nh9j87fmp4mwjjil37jx6a5zki"; depends=[]; }; @@ -9862,26 +9988,27 @@ in with self; { mMPA = derive2 { name="mMPA"; version="1.2.0"; sha256="0g4zjknz52fpk7f436j95aw93aa8q2jwcrb1pqkm294kr276nnd9"; depends=[]; }; mQTL = derive2 { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf4k7ggnw6hsjm8lr84i108dks"; depends=[MASS outliers qtl]; }; mRMRe = derive2 { name="mRMRe"; version="2.1.0"; sha256="1m41859sa0nd4hdnsq3ir337834cpmgg564f6ph57dmmwz0wa8zy"; depends=[igraph survival]; }; - mRpostman = derive2 { name="mRpostman"; version="0.3.0"; sha256="18ky3xpgb4rns65574jr9fy8jwi6nrz6py9ai8nqf2r1s0bdmww3"; depends=[assertthat base64enc curl magrittr stringr]; }; + mRpostman = derive2 { name="mRpostman"; version="0.3.1"; sha256="0jghbqszf56xp3kvx9rcf11bj0j46hh3xgzvaihbpb67lcj8mvyw"; depends=[assertthat base64enc curl magrittr stringr]; }; mSTEM = derive2 { name="mSTEM"; version="1.0-1"; sha256="0mh09mqqpq9k8jrxs9d39009idld3b4y98ik75czdy580jmdg7mm"; depends=[doParallel foreach latex2exp]; }; mSimCC = derive2 { name="mSimCC"; version="0.0.1"; sha256="1f15r214srcdb4yacmy4hq890a674iqd2s7bry5dk20k46qdl026"; depends=[doParallel foreach]; }; - maSAE = derive2 { name="maSAE"; version="1.0.0"; sha256="0z349p4bipqrfn60cf14b19d1d1b30a302mxkyaknf32n0rz18lk"; depends=[]; }; - mable = derive2 { name="mable"; version="2.0.1"; sha256="1jz0nnjx0sidxgvqfsmps3h4g4f73fpks37r6v11da0dmkcb1biz"; depends=[aftgee icenReg survival]; }; + mStats = derive2 { name="mStats"; version="3.2.2"; sha256="0bvv2133813qfqbqx45x7g3h82jkz8b322ldjj89x2wxc7alwmhs"; depends=[]; }; + maSAE = derive2 { name="maSAE"; version="2.0.1"; sha256="0c7vs0pc4yva726g2vly07r1dnf4ahdkdkq6y6ni0d1hgz296w87"; depends=[]; }; + mable = derive2 { name="mable"; version="2.1.1"; sha256="14bjyij9m86bha1g79aay6x127aq6pqw3hgdklf943inggqb3ava"; depends=[aftgee icenReg survival]; }; maboost = derive2 { name="maboost"; version="1.0-0"; sha256="18d36cgvn8p75nidfr6al458jbzwc1i7x77y1ks50y9phrz3wf65"; depends=[C50 rpart]; }; macc = derive2 { name="macc"; version="1.0.1"; sha256="1qj4mlikbqrxa6m46527xmxdbk7b3l95z6jdgpmi0ifywjiv52a4"; depends=[car lme4 MASS nlme optimx]; }; machQA = derive2 { name="machQA"; version="0.1.4"; sha256="1rdrjy9sxql2c9y691a1jrmgsv7m1ihsschixxb6wc7aahf7mav6"; depends=[machina plyr]; }; machina = derive2 { name="machina"; version="0.1.6"; sha256="009mzqb5jgnilj9b5ldmm5600008bljlqacm8jjxvqsfnfdfg8zv"; depends=[DT httr jsonlite lubridate rhandsontable xts]; }; - macleish = derive2 { name="macleish"; version="0.3.4"; sha256="18pxb1ayqiw8irh05hib6gi5fqyxxgx93jrdd69wwcd455lmn7dv"; depends=[dplyr etl lubridate readr sf]; }; + macleish = derive2 { name="macleish"; version="0.3.5"; sha256="13s8fv9827xjcxxnf74n6f814v27v5jdss45wb5fdzq8ingaq41x"; depends=[dplyr etl lubridate readr sf]; }; mada = derive2 { name="mada"; version="0.5.9"; sha256="1l07dbgm9ghvqq9gh7g6yjfvxk0iq8xfyxz03j4nklbs10k3a0pz"; depends=[ellipse mvmeta mvtnorm]; }; maddison = derive2 { name="maddison"; version="0.1"; sha256="1ji51wnj0ybjd30b4bwn5npyswrmcfrbxcmdlngwzvca1knh8g1c"; depends=[]; }; maditr = derive2 { name="maditr"; version="0.6.3"; sha256="12ycnn384k0hsxlwk2pc3qhaz6rk71sr5qg6harpv3y6w84df8n1"; depends=[data_table magrittr]; }; - madness = derive2 { name="madness"; version="0.2.6"; sha256="1nk6kzjv0fgzbsp3crldq12id2k2wzm4bk9h9bnlkyrjf1hmfiaf"; depends=[expm Matrix matrixcalc]; }; + madness = derive2 { name="madness"; version="0.2.7"; sha256="0vcpydqnpmg9rvvzyjyqvd3qgs42n8cr9cafai51989v2w2bcf85"; depends=[expm Matrix matrixcalc]; }; madr = derive2 { name="madr"; version="1.0.0"; sha256="0lzg75kphz4a0w6n0jbsq87g72jvrbkyas4j813mryq2nv4lmsl4"; depends=[]; }; madrat = derive2 { name="madrat"; version="1.64.5"; sha256="1gccfpzbm5cq9q288k86mq0madh8x9nhw06hrrcfjj5waqhi30lj"; depends=[assertthat digest magclass rlang spam stringr]; }; mads = derive2 { name="mads"; version="0.1.5"; sha256="1ac34iff9hvl1bxk3gs5s3i311g9y59nd6v9jhvnfd6wfhck7krs"; depends=[mrds]; }; madsim = derive2 { name="madsim"; version="1.2.1"; sha256="11gfyimbz363p5xy1x6rsz5fcgzcr55myc5aaz5lazjkcnfn17aq"; depends=[]; }; mafs = derive2 { name="mafs"; version="0.0.3"; sha256="1apacrk8y5b5ids62vd1kn2k28bya9pydxxmdw2dhjyzkgrakdhn"; depends=[cmprsk colorspace CombMSC Epi etm forecast forecastHybrid fracdiff ggplot2 ggseas gtable munsell numDeriv plyr quadprog Rcpp scales tictoc tidyr timeDate tseries zoo]; }; - magclass = derive2 { name="magclass"; version="5.7.0"; sha256="0r4zkx90djh5nnv56icd2na0zsr7daig28gxkldcpj2c6l2n6526"; depends=[abind maptools reshape2 sp]; }; + magclass = derive2 { name="magclass"; version="5.7.3"; sha256="072hcp9m80c1r2vdhk6xp9gpbmiljpslalzh1i9hh7h7hgvp0bj7"; depends=[abind maptools reshape2 sp]; }; magic = derive2 { name="magic"; version="1.5-9"; sha256="0snmdh6vk0p6ar1swsihisinxrx7l8371dri5lk0z24ysgr5w7gs"; depends=[abind]; }; magicLamp = derive2 { name="magicLamp"; version="0.1.0"; sha256="1nfcnbqd6vawz8l3vgkbhmm462xdvaa4pn6axzmz8hl05xv2k3cv"; depends=[httr tibble]; }; magicaxis = derive2 { name="magicaxis"; version="2.0.10"; sha256="053l455si22mddc5cgihhnpkmxr2anfqvbzsa89djjpw5ah2vg1x"; depends=[celestial mapproj MASS plotrix RColorBrewer sm]; }; @@ -9897,7 +10024,7 @@ in with self; { makeProject = derive2 { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; }; makedummies = derive2 { name="makedummies"; version="1.2.1"; sha256="062rvijhy2dybpgxzp44cg46bfyb8lp9yasv3mhskhf3yg717sqp"; depends=[tibble]; }; malani = derive2 { name="malani"; version="1.0"; sha256="1jps28gfkiysr356ackxf1my5xz6rpx3a2bv68pziy2614hrqbs9"; depends=[e1071]; }; - malariaAtlas = derive2 { name="malariaAtlas"; version="0.0.5"; sha256="1hz23b7yq8vq5ydj1xwazg1zkl4f4kykgy6qhh6v8mwk70yg4s1w"; depends=[curl dplyr ggplot2 gridExtra httr raster rgdal rlang sp stringi tidyr xml2]; }; + malariaAtlas = derive2 { name="malariaAtlas"; version="1.0.0"; sha256="0ibnsk8ibkcikkw8fiiyw2xiyy61bmrirlrv4l4ili4wna0h9w0q"; depends=[curl dplyr ggplot2 gridExtra httr raster rgdal rlang sp stringi tidyr xml2]; }; mallet = derive2 { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; }; managelocalrepo = derive2 { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[assertthat stringr]; }; mandelbrot = derive2 { name="mandelbrot"; version="0.2.0"; sha256="04a288jj8h1a04r584a02wg9dm3c6zifhqwj964ybsvgb4m6g99s"; depends=[reshape2]; }; @@ -9905,56 +10032,57 @@ in with self; { mangoTraining = derive2 { name="mangoTraining"; version="1.0-7"; sha256="0lw46j44jhdcyh079a7zjmxcnv5c6qsfachinlwv3ild1gwggr3p"; depends=[]; }; manhattanly = derive2 { name="manhattanly"; version="0.2.0"; sha256="185fkakx4v35n4gmlpk2kfm2bm8p320q4khkw936m09zx3aqz398"; depends=[ggplot2 magrittr plotly]; }; manhplot = derive2 { name="manhplot"; version="1.1"; sha256="17yw10gpfp6bqmilb09v61jd2amz6cv1z38si4nqnhbvmac065qd"; depends=[ggplot2 ggrepel gridExtra reshape2]; }; - manifestoR = derive2 { name="manifestoR"; version="1.3.0"; sha256="1bxmlg6fmr4ky9m7b65rrylspwhwc8k9s1cbxnx9dyl33wh39ci6"; depends=[base64enc dplyr DT functional htmltools htmlwidgets httr jsonlite magrittr NLP psych tibble tm zoo]; }; + manifestoR = derive2 { name="manifestoR"; version="1.4.0"; sha256="1rnqm9s91q6kff951402zxl3cmnl8j19ybg9vmcmcm7bjbv5w2l0"; depends=[base64enc dplyr DT functional htmltools htmlwidgets httr jsonlite magrittr NLP psych tibble tm zoo]; }; manipulate = derive2 { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; }; - manipulateWidget = derive2 { name="manipulateWidget"; version="0.10.0"; sha256="1zagrbwkn2d50zzw8i2vyb1hsq4cydmfsqiy1a2qlp6zrv8a6q9x"; depends=[base64enc codetools htmltools htmlwidgets knitr miniUI shiny webshot]; }; - manymodelr = derive2 { name="manymodelr"; version="0.2.2"; sha256="02jswli6k4m9662zf48maix28lr7w93rgwvzgm0nv1zf2mdrh6qb"; depends=[caret dplyr e1071 magrittr Metrics plyr purrr reshape2 tibble]; }; - maotai = derive2 { name="maotai"; version="0.1.2"; sha256="0j95q2b9719ffw4nbm0ziyprkj3p8s958xyqyrx202d1r9i0igs6"; depends=[Matrix mclust Rcpp RcppArmadillo Rdpack RSpectra shapes]; }; + manipulateWidget = derive2 { name="manipulateWidget"; version="0.10.1"; sha256="1vi71sjh7z1a880wffk8qqw7iysvk42q78giqxmm2sqz2a912qlx"; depends=[base64enc codetools htmltools htmlwidgets knitr miniUI shiny webshot]; }; + manymodelr = derive2 { name="manymodelr"; version="0.2.4"; sha256="13d1lgz22wpvbn56m32w5m1w2gk2jz0p3m2130lmwain4nb9rsmk"; depends=[caret dplyr e1071 ggplot2 magrittr Metrics plyr purrr reshape2 tibble]; }; + maotai = derive2 { name="maotai"; version="0.1.5"; sha256="08cww0hh3ry3sjxx9wwnddjgqyzfxpikif3wyhfpqdwlrbsrnk4j"; depends=[cluster labdsv Matrix Rcpp RcppArmadillo RcppDist Rdpack RSpectra Rtsne shapes]; }; mapReasy = derive2 { name="mapReasy"; version="1.0"; sha256="13va0z967ckwxnnianki5aj66km0x6r37nj4mz9qd3b0bps4g2kj"; depends=[Hmisc rgdal sp]; }; mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; }; mapcan = derive2 { name="mapcan"; version="0.0.1"; sha256="1a4135wc1h4nzcv6xq0bg75i744wyq8p7q0ix7y2x2gb6s35w46k"; depends=[dplyr ggplot2 magrittr]; }; mapdata = derive2 { name="mapdata"; version="2.3.0"; sha256="0xnxh73rgcq55zrw81a2bq8yd67bxc2rafp4shf6nyrqj04iip0y"; depends=[maps]; }; - mapdeck = derive2 { name="mapdeck"; version="0.2.1"; sha256="1slj4yrw7qir3cz70yqawbsz521n4614h6gjn0qpj75rj12wnxlk"; depends=[BH colourvalues geojsonsf googlePolylines htmltools htmlwidgets jsonify magrittr rapidjsonr Rcpp shiny spatialwidget]; }; - mapedit = derive2 { name="mapedit"; version="0.5.0"; sha256="16rdksnkx6s7w92as896scfdnl1smp00fdnxmlz4ayym2a26wagb"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet leaflet_extras leafpm mapview miniUI sf shiny]; }; + mapdeck = derive2 { name="mapdeck"; version="0.3.2"; sha256="15xy8gdv7nwlqk61sfwa0m7miwyr776sqvhqn9x0jzm4r9y2cp4d"; depends=[BH colourvalues geojsonsf googlePolylines htmlwidgets jsonify magrittr rapidjsonr Rcpp sfheaders shiny spatialwidget]; }; + mapedit = derive2 { name="mapedit"; version="0.6.0"; sha256="1ix0sjsqb6646xyi73am9ic97plw9y9p4pl8mrkpzvqzm0pxdhxx"; depends=[dplyr htmltools htmlwidgets jsonlite leafem leaflet leaflet_extras leafpm mapview miniUI raster scales sf shiny sp]; }; mapfit = derive2 { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; }; mapi = derive2 { name="mapi"; version="1.0.1"; sha256="0qfwxrd0ya5amw7f96pfxf3f8m97s7vhaz62clqn083mw8ddaz2l"; depends=[data_table pbapply Rcpp sf]; }; mapmisc = derive2 { name="mapmisc"; version="1.7.7"; sha256="07hnfn0fnydckniyhixrsw7m22hmvzksqxlwcw2i0jb7qq3h3vqa"; depends=[raster sp]; }; mapplots = derive2 { name="mapplots"; version="1.5.1"; sha256="18s2y66f8vi8g2r8a25zbgp2xm079r8v8qxv0w71h8krycs6vs9p"; depends=[]; }; - mapproj = derive2 { name="mapproj"; version="1.2.6"; sha256="1rggww8cbwv0vzlj5afzhbsbngg4bzj5znbkz7wmxsbshfbsm9b2"; depends=[maps]; }; + mapproj = derive2 { name="mapproj"; version="1.2.7"; sha256="0nscsfq8md6ri9258xz57c3dj81wdl6kdwf4a9qcrwwbn20i427h"; depends=[maps]; }; mapr = derive2 { name="mapr"; version="0.4.0"; sha256="169ah9v7cpw3hmaj6n575gi1zwazf4vh59n46zghb1x68nc2gqs0"; depends=[data_table ggplot2 gistr jsonlite leaflet RColorBrewer rworldmap sp spocc]; }; maps = derive2 { name="maps"; version="3.3.0"; sha256="05i2ppl5z4p8rawgqmy3z4ia05fcblpq1vvrmrkgkkpdlhczx6hr"; depends=[]; }; + mapsFinland = derive2 { name="mapsFinland"; version="0.1.1"; sha256="0kx9r28lvc6bbl478i9gyy58kbp5hi7akysyld87fxk5x0601j19"; depends=[]; }; mapsRinteractive = derive2 { name="mapsRinteractive"; version="1.0.0"; sha256="0lpmizhaan7zp201wjaq544wadizwpswch7sn6m3sjwn8rswg6av"; depends=[gstat raster rgdal rgeos sp]; }; - mapsapi = derive2 { name="mapsapi"; version="0.4.2"; sha256="1l7sp65ghdcli6ajkvlnhfizjq16mw2cmlf8jbif3al1vhbv4dvw"; depends=[bitops magrittr plyr sf xml2]; }; + mapsapi = derive2 { name="mapsapi"; version="0.4.5"; sha256="0qgdlwgc3rmkpdam4mk7jbs79l5mnzjxz5a763icvr1clgna6xn2"; depends=[bitops magrittr RgoogleMaps sf stars xml2]; }; maptools = derive2 { name="maptools"; version="0.9-9"; sha256="0v4llkxk8qs61vq4ykvaim4k23aagdaz0p62ns7zfq02sln3pfk9"; depends=[foreign lattice sp]; }; - maptpx = derive2 { name="maptpx"; version="1.9-2"; sha256="1i5djmjg0lsi7xlkbvn90njq1lbyi74zwc2nldisay4xsbgqg7fj"; depends=[slam]; }; maptree = derive2 { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; }; - mapview = derive2 { name="mapview"; version="2.7.0"; sha256="1cqa7hw7h0n6ing87bq903ax2m4iw82xb2jdgl55z9v9rdhxp0xh"; depends=[base64enc brew htmltools htmlwidgets lattice leafem leaflet leafpop png raster Rcpp satellite scales sf sp svglite uuid viridisLite webshot]; }; + mapview = derive2 { name="mapview"; version="2.7.8"; sha256="1hj9yx85jskmh6qm5ljzjlkxcwjffvswlgi453kn2rp7xzxbyv9b"; depends=[base64enc htmltools htmlwidgets lattice leafem leaflet leafpop png raster satellite scales sf sp viridisLite webshot]; }; mar1s = derive2 { name="mar1s"; version="2.1.1"; sha256="1ljkvgxrramfx1rnp2rg6516mjxaa6s96amrnmqymnyjz7wlf37l"; depends=[cmrutils fda zoo]; }; march = derive2 { name="march"; version="3.1"; sha256="1y3ndnkxrqxavp7b5dwhn1mijhhn06k5b6iickzjr4bfmpfnk340"; depends=[]; }; marcher = derive2 { name="marcher"; version="0.0-2"; sha256="0hcxbfrwniih4kvx5sxhlffz1pc87kf52v8hvaf193rhhdykis5q"; depends=[magrittr Matrix minpack_lm mvtnorm numDeriv plyr RColorBrewer scales zoo]; }; - marelac = derive2 { name="marelac"; version="2.1.9"; sha256="07xhlsdzz2j5smh3v4hpm8zp4ljg9aa3i67j65hs1cq27q1jg1n7"; depends=[seacarb shape]; }; + marelac = derive2 { name="marelac"; version="2.1.10"; sha256="08phsghzvi0z78pkb5lkamni83fsw0bqfri99j6bjf6y14aygif9"; depends=[seacarb shape]; }; marg = derive2 { name="marg"; version="1.2-2.1"; sha256="1r6rl7dhvm8dghm7pm4hfw3924qja65hczl6d47v9ixnv4rxyzr9"; depends=[statmod survival]; }; margins = derive2 { name="margins"; version="0.3.23"; sha256="1gn18bmz7zwdv5fm62g4kj1x0y4lzhwvwgk4xc9hfi2mh5w08j4f"; depends=[data_table MASS prediction]; }; marima = derive2 { name="marima"; version="2.2"; sha256="03nvh93r4052li84yjqzc106gwh1542q9s192s980gs6sgy8scm6"; depends=[]; }; marindicators = derive2 { name="marindicators"; version="1.0.0"; sha256="1id055jc624n34vxb68gdy2kgfsm5y61dkfskzhlrwq9d5npxv6m"; depends=[]; }; markdown = derive2 { name="markdown"; version="1.1"; sha256="06zwbrp14bri3470anadd7dvgmw06xf8df6v2pk64wx3f9sd934d"; depends=[mime xfun]; }; + markdownInput = derive2 { name="markdownInput"; version="0.1.2"; sha256="1qxil2liikbbn6w8niyc03fwqvwvdv6wiy98ip8j77729i7g2hln"; depends=[markdown shiny shinyAce]; }; marked = derive2 { name="marked"; version="1.2.6"; sha256="0k367sjyac1w894rndz5m0drmbd56nzyx5mr7mvhsqzq3gnv4dw5"; depends=[bookdown coda data_table expm kableExtra knitr lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; }; + marketr = derive2 { name="marketr"; version="0.0.1"; sha256="0pchyfhim18m88r9m9dhihj89isvjwgmka9bdi64n0hnmv0qv8ds"; depends=[dplyr magrittr rlang tibble tidyr]; }; markmyassignment = derive2 { name="markmyassignment"; version="0.8.2"; sha256="1jrx72k3glwv5nci3h3qbqbs0x9mqld92v4irw2sfjzcmb7qyma3"; depends=[checkmate codetools httr lazyeval rlang testthat yaml]; }; markophylo = derive2 { name="markophylo"; version="1.0.7"; sha256="09rg5rwm0dm881fpm9yzygd6d3dyrxjsrvl0yhfpkzbpdihfympn"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; }; - markovchain = derive2 { name="markovchain"; version="0.8.2"; sha256="1dqkrwk9xmclwzk76lqj9s87jchvfcnmqi9rfjha6lyr5hy7c79g"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; }; + markovchain = derive2 { name="markovchain"; version="0.8.4"; sha256="154prv8bwx9a9956l3vkph60j8cg49q78q217qfqh2j2v7h7rfb9"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; }; marl = derive2 { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; }; marmap = derive2 { name="marmap"; version="1.0.3"; sha256="0hjy58kk2kg7v2nq7kfw5rdcrpfhikwr30lz71pfgis34833i7yy"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; }; - marqLevAlg = derive2 { name="marqLevAlg"; version="2.0.1"; sha256="0lcr5bn101krgqwjnbk9r3xizwwxnsgyi84hg95jpb5f2sa2bpg8"; depends=[doParallel foreach]; }; + marqLevAlg = derive2 { name="marqLevAlg"; version="2.0.2"; sha256="0q3whfhi17qa8dfd5hjyqxc7a7p8hdfkkmvccdigfbqvksf24fxs"; depends=[doParallel foreach]; }; mase = derive2 { name="mase"; version="0.1.2"; sha256="1023xvv6yngbc183hb13057spjildywqd0jw2w9jway3zv4dbw9v"; depends=[boot dplyr foreach glmnet magrittr Matrix Rdpack rpms survey]; }; mason = derive2 { name="mason"; version="0.2.6"; sha256="01ppc7f18kf4xv4lrhib0cfm85v658grmxpny3h3kdb4pi4rbspy"; depends=[broom dplyr lazyeval magrittr tidyr]; }; - mastif = derive2 { name="mastif"; version="1.0"; sha256="1xxfql4d298ib9h8821jp717a60vgxq7nzs08yb3xyzp0c3djja2"; depends=[corrplot RANN Rcpp RcppArmadillo repmis xtable]; }; matR = derive2 { name="matR"; version="0.9.1"; sha256="1qw2vqmpq7gc3dmr9r000ccjj7xa0h82waxnvryz3l17ggryyjjm"; depends=[BIOM_utils MGRASTer]; }; - matahari = derive2 { name="matahari"; version="0.1.2"; sha256="1bn30c2xf9vw0p4jnw3mjjlr6f5nsib0ffb8736n2v4rrifgxqsg"; depends=[clipr jsonlite purrr readr rlang rstudioapi tibble]; }; + matahari = derive2 { name="matahari"; version="0.1.3"; sha256="03mhn4qh1vcz2hr0mxp6gijwgrzvbpfb8dq7lqhchbk5gq5g3fnh"; depends=[clipr jsonlite purrr readr rlang rstudioapi tibble]; }; matchMulti = derive2 { name="matchMulti"; version="1.1.7"; sha256="0k5psmjzcyr7pm603vni7w2hvslck05r81cngm26pql2prdrv5yk"; depends=[coin Hmisc MASS mvtnorm plyr rcbsubset weights]; }; matchbook = derive2 { name="matchbook"; version="1.0.7"; sha256="0xfqg8z2zkn215kqmjjkqdwrgsk7cn4jdpxfgd6razhcbvflg48j"; depends=[]; }; matchingMarkets = derive2 { name="matchingMarkets"; version="1.0-2"; sha256="1jj5hzxiivqinkpddmkqdxgi83jm6blann9wgv4g8prn3lvp0i85"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; }; matchingR = derive2 { name="matchingR"; version="1.3.0"; sha256="1rpw5a52alh5diiqr7f87vhpgp3w3f8lg8wkaqvr5idid9fkll1i"; depends=[Rcpp RcppArmadillo]; }; - matchmaker = derive2 { name="matchmaker"; version="0.1.0"; sha256="162zyvnz80rivy99na1hwp0drq913gvp1gs2jiaficpv4xlxl6ia"; depends=[cli forcats rlang]; }; + matchmaker = derive2 { name="matchmaker"; version="0.1.1"; sha256="1sa2cah8gjvg0159rv1sfw9p0aljg66xmij31mz2vfk5683r4b00"; depends=[cli forcats rlang]; }; matconv = derive2 { name="matconv"; version="0.4.0"; sha256="0kl0647m45mrk13fyr0mkx1x9v3im66ciky8k8nmy4ahkffyasi4"; depends=[]; }; mateable = derive2 { name="mateable"; version="0.3.1"; sha256="1ka9xxicibpfg6k3njq5f5576jwj734r1mb46a2cmiyq676ks7pp"; depends=[FNN Rcpp sn]; }; mathgraph = derive2 { name="mathgraph"; version="0.9-14"; sha256="11wcnjligjc0m0ibi7v5f9w4j2g0fmw33za8407d9fqdb0i5pf60"; depends=[]; }; @@ -9962,19 +10090,20 @@ in with self; { matie = derive2 { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[cba dfoptim gplots igraph mvtnorm seriation]; }; matlab = derive2 { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; }; matlabr = derive2 { name="matlabr"; version="1.5.2"; sha256="1ba6cajnzldb1gmn7rf0b198h6mdh58r3frm0z0cmvbinspwz3x7"; depends=[stringr]; }; - matlib = derive2 { name="matlib"; version="0.9.2"; sha256="09afscydrn5bk91qb26r8w7f33nhxp1ih4h55y6adcw7p6hjrw27"; depends=[car MASS rgl xtable]; }; + matlib = derive2 { name="matlib"; version="0.9.3"; sha256="09fndv9dpc48s1i263amhgk7bjhz0wzksbhkzkl392v85r84bj6x"; depends=[car MASS rgl xtable]; }; matpow = derive2 { name="matpow"; version="0.1.1"; sha256="1a6q21ba16qfdpykmjwgmrb1kkvvyx48qg8cbgpdmch0vhibcgcp"; depends=[]; }; + matricks = derive2 { name="matricks"; version="0.8.2"; sha256="0ik61jxd4hpw149dbbmis3wsfsim60mw9d0qjwh047qfg6sm1vsc"; depends=[ggplot2 Rcpp reshape2 rlang]; }; matrixLaplacian = derive2 { name="matrixLaplacian"; version="1.0"; sha256="1ixqdv3sz3sc79wn3vqhlq79j7x7cvl878m5hgvbcg6klfvlmmci"; depends=[scatterplot3d]; }; matrixNormal = derive2 { name="matrixNormal"; version="0.0.1"; sha256="1nvsgcp8x691pa2rjz2fgknybwpni6fppm16l5bjkrg47ka0pbcd"; depends=[mvtnorm]; }; matrixProfile = derive2 { name="matrixProfile"; version="0.5.0"; sha256="0nd54k878xf7hzwxawh03c3na4jfvb68afarkwrmmffjlp3i8a9g"; depends=[fftw signal TTR zoo]; }; - matrixStats = derive2 { name="matrixStats"; version="0.55.0"; sha256="06fvx0rlaz80k0lkqq2n7v0309xpz7h7ss0m9kgyikp4xs8bvmhn"; depends=[]; }; + matrixStats = derive2 { name="matrixStats"; version="0.56.0"; sha256="09qgfv9x32x6ncgf19iy7yjp26fwy6p5wm8spc2xzfc0qhylmqrr"; depends=[]; }; matrixStrucTest = derive2 { name="matrixStrucTest"; version="1.0.0"; sha256="06la9xmpi1viyjml4m1akbna3lwkz5lnq95v1nnf73i9zpfwz03k"; depends=[]; }; matrixTests = derive2 { name="matrixTests"; version="0.1.8"; sha256="18f0nklhq5xsh8dwqqz2kdq5csyxc8jdx3r0d1hcm27l3l48h56s"; depends=[matrixStats]; }; matrixcalc = derive2 { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; }; - matrixpls = derive2 { name="matrixpls"; version="1.0.5"; sha256="04sshb88rq2mp3y4rrs6nkzr4kc380vx380r911c7j975l55a183"; depends=[assertive lavaan MASS matrixcalc psych]; }; + matrixpls = derive2 { name="matrixpls"; version="1.0.9"; sha256="13wsd0kbn77mjd5rkfdv9di8pxg898adrgdpqcyridvikjhqlh0j"; depends=[assertive lavaan MASS matrixcalc psych]; }; matrixsampling = derive2 { name="matrixsampling"; version="2.0.0"; sha256="05dbn7rj07jx1hj7i6k3akf11hysxg6v32kav9fvsqmiy2zkippa"; depends=[keep]; }; - matsbyname = derive2 { name="matsbyname"; version="0.4.11"; sha256="0v236k0wsj1i92fmh1jikh7qwq7gxsi7dc7kamls611p48wk9082"; depends=[dplyr Hmisc magrittr]; }; - matsindf = derive2 { name="matsindf"; version="0.3.2"; sha256="1jjfsavhmhjicvccfzh3j1a1ayfhvp81d6fybq660b076ya1hkrr"; depends=[dplyr magrittr matsbyname purrr rlang rlist tibble tidyr]; }; + matsbyname = derive2 { name="matsbyname"; version="0.4.13"; sha256="1sx6nqqndfs39dkim9c5gqxl4afacq2wkcnrj95byl5a24s3sw5d"; depends=[dplyr Hmisc magrittr purrr rlang tibble]; }; + matsindf = derive2 { name="matsindf"; version="0.3.4"; sha256="0r8hs53c4xv7lldz8mzh3hy5jq64c3cza9yifjjzpwvlw42y631l"; depends=[dplyr magrittr matsbyname purrr rlang rlist tibble tidyr]; }; mau = derive2 { name="mau"; version="0.1.2"; sha256="1wgiai8f1kbjh9hfwv4m0kavd44ib5xb33p8m16zpawnw14m7sj5"; depends=[data_table ggplot2 gtools igraph RColorBrewer Rdpack stringr]; }; mauricer = derive2 { name="mauricer"; version="2.0.5"; sha256="01x1cigwr95hzyz1pm9w5xi2j9z4zf54p6bwhn0y865gln80wvnz"; depends=[beastier stringr]; }; maxLik = derive2 { name="maxLik"; version="1.3-8"; sha256="1rfzd2n7ak69pbnnzbvd0c4kk9h812sq1f17hamnqx77pw84sh1k"; depends=[miscTools sandwich]; }; @@ -9984,17 +10113,18 @@ in with self; { maxlike = derive2 { name="maxlike"; version="0.1-8"; sha256="0lbj212dbx8lbkw808xlhniw5864bh86xs8zwvxcnngj0abapalh"; depends=[raster]; }; maxmatching = derive2 { name="maxmatching"; version="0.1.0"; sha256="1xbwrhmr8gzvlcprib7nzvqrcd355bhx7wkqxrvfk4g7dvskf9ka"; depends=[igraph]; }; maxnet = derive2 { name="maxnet"; version="0.1.2"; sha256="1rfcylbv068pz4jgry5ijszwf5fibz566s5iv0ar8dhv0fhjr86z"; depends=[glmnet]; }; + maxnodf = derive2 { name="maxnodf"; version="1.0.0"; sha256="1czhy3177bb4a5rxi2s4j3c9xn9f0b2pbkdka1dzw6ga389wdwb3"; depends=[Rcpp]; }; maxstat = derive2 { name="maxstat"; version="0.7-25"; sha256="114z1rwxwvk05ijjhdppzm148n1h192fp0w12ky10zkrhf6kphbg"; depends=[exactRankTests mvtnorm]; }; mazeGen = derive2 { name="mazeGen"; version="0.1.3"; sha256="192xygg3l4rpqp49sgd5hpp4h3f8wjhyldn0l8abxhsks7jd2kfb"; depends=[igraph]; }; mazealls = derive2 { name="mazealls"; version="0.2.0"; sha256="14j6syw1zkgs4cnmxzqpm6klmgvck2gg97wkzmy9al6n0biy8gmb"; depends=[TurtleGraphics]; }; mazeinda = derive2 { name="mazeinda"; version="0.0.1"; sha256="0ns4ib73y4fghf7p1wg0a05js4mqr66dpp49p1h039pqrb0f1vwd"; depends=[foreach]; }; mbbefd = derive2 { name="mbbefd"; version="0.8.8.5"; sha256="1bnbavhii2wm9944l4j5x21y9b3kp0sdshz32r1k7cy1y569zd6r"; depends=[actuar alabama fitdistrplus gsl MASS Rcpp]; }; mbclusterwise = derive2 { name="mbclusterwise"; version="1.0"; sha256="1ilqaxcxf1k3ck910s0xqwnp88w8ag5rn1dpvaa1i7jlcldsbnhp"; depends=[ade4 doParallel foreach kknn]; }; - mbend = derive2 { name="mbend"; version="1.2.3"; sha256="0w1rrj1zcbvi8nlspzqa8142ilvbw9q6m26kmxqcp9mvqzbnbd30"; depends=[]; }; + mbend = derive2 { name="mbend"; version="1.2.5"; sha256="0p9clxfrrj0j58splarb8ljvini1gi7mmn2fqay7w4hc5l8rhh6d"; depends=[]; }; mbest = derive2 { name="mbest"; version="0.6"; sha256="1x0f7y5hj6a35wq1xn6g7jyjn9c4zryahwlf07qrypgrcnj2m8vx"; depends=[abind bigmemory foreach lme4 logging nlme]; }; mbir = derive2 { name="mbir"; version="1.3.5"; sha256="10sd5gk2k94cmi49nbpywqvh9bxj9q3psa3d00zmw1a7d6c0jjpd"; depends=[effsize psych]; }; mblm = derive2 { name="mblm"; version="0.12.1"; sha256="1fipb3bryaimr30lcxsxrn0ymv24z39swca7s4z7p9xcfg3ban1b"; depends=[]; }; - mboost = derive2 { name="mboost"; version="2.9-1"; sha256="02ia3y0fxfjl02fb1nnl93j640fyl18jm15cgxyybhf27w4jdvb7"; depends=[lattice Matrix nnls partykit quadprog stabs survival]; }; + mboost = derive2 { name="mboost"; version="2.9-2"; sha256="1ajlspdkh7zj9jhjhz7zsllv3dzwpx272ksrk91gzidda4hbmiil"; depends=[lattice Matrix nnls partykit quadprog stabs survival]; }; mboxr = derive2 { name="mboxr"; version="0.2.0"; sha256="1d11fpz17k65dzw9sjc7zfs1jpajzrh2pvr2s435p83g3mpf40vz"; depends=[dplyr lubridate magrittr purrr reticulate stringr tibble tidyr]; }; mbrglm = derive2 { name="mbrglm"; version="0.0.1"; sha256="0yxq1xk8qy5hpiqqldyrs78lp4ggdp5lj2lmh8rqq1xvsfr6nrh4"; depends=[enrichwith nleqslv]; }; mbsts = derive2 { name="mbsts"; version="1.0"; sha256="0wkglh1g0kdlgw4afqxvwb26difnqhf6g5jsbf8y39mpipxla365"; depends=[KFAS MASS Matrix MCMCpack pscl]; }; @@ -10004,7 +10134,7 @@ in with self; { mcGlobaloptim = derive2 { name="mcGlobaloptim"; version="0.1"; sha256="1p8841y9a4yq51prv6iirgw9ln8jznx8nk547sc5xlznksjy1g9n"; depends=[randtoolbox snow]; }; mcMST = derive2 { name="mcMST"; version="1.0.1"; sha256="18ka76g9pgpycaw0hl8vxpabd8584q1l5d3xmrzy1zwincsg7vgs"; depends=[BBmisc checkmate ecr ggplot2 gtools lhs parallelMap reshape2 vegan]; }; mcPAFit = derive2 { name="mcPAFit"; version="0.1.4"; sha256="1h5kiry8bvdrgyqf7cqsag0b7rscwc7phayzf6h4css1667bvm0g"; depends=[PAFit RColorBrewer Rcpp]; }; - mcStats = derive2 { name="mcStats"; version="0.1.1"; sha256="1jc9mzk97d8fcbn6rh6prgwbdir2hzjfxm0ydw75h6mkgiqchcz0"; depends=[dplyr ggplot2 ggthemes gridExtra magrittr rlang tidyr]; }; + mcStats = derive2 { name="mcStats"; version="0.1.2"; sha256="1r8dxdfcvznl2968xr6fbany1rh7wq5z1p7fhdf5g4b5l28j8pf9"; depends=[dplyr ggplot2 ggthemes gridExtra magrittr rlang tidyr]; }; mcbiopi = derive2 { name="mcbiopi"; version="1.1.6"; sha256="1caw2sy15hw2zw0bdynwnsa7hn4rly34hlxp06nwm5lssz8l2597"; depends=[]; }; mcc = derive2 { name="mcc"; version="1.0"; sha256="0p661a870bvh3xhcahqqq85azn9rjl3vacjy96jsdn86irj4s0vi"; depends=[]; }; mcca = derive2 { name="mcca"; version="0.7.0"; sha256="01nm0plgkik241qhd06v1vs84lf7agc0vkxa27cpr5qlfl4cm4zb"; depends=[caret e1071 MASS nnet pROC rgl rpart]; }; @@ -10012,36 +10142,38 @@ in with self; { mcclust = derive2 { name="mcclust"; version="1.0"; sha256="00qprmsjwbn2d0jl7p9mz8pv7k8ld3mzk862pr1grigk0lqwhx06"; depends=[lpSolve]; }; mccmeiv = derive2 { name="mccmeiv"; version="2.1"; sha256="1lkghvvwxvg474p37h1mpbackr5qmy05qkx8yiq4x066wrfq1w1i"; depends=[MASS numDeriv survival]; }; mccr = derive2 { name="mccr"; version="0.4.4"; sha256="1scqds1yx317qmjappy2h1m564dcmsqqfpdm8pm3plalag16xrhj"; depends=[]; }; - mcemGLM = derive2 { name="mcemGLM"; version="1.1"; sha256="07ky3bvcns24qia9pyvf5lp7764h8gn2g8zr304iz4x9bq6jvsi0"; depends=[Rcpp RcppArmadillo trust]; }; + mcemGLM = derive2 { name="mcemGLM"; version="1.1.1"; sha256="0p6z32c69ik8wjjn50vzjmr4plsfbxr2p0hr50wknkwwb7i20hp6"; depends=[Rcpp RcppArmadillo trust]; }; mcen = derive2 { name="mcen"; version="1.0"; sha256="0dgic137n3qvxljj3f7j3kq3x2rkblxzg55hjbknspwp0i7i4lx8"; depends=[faraway flexclust glmnet Matrix]; }; mcga = derive2 { name="mcga"; version="3.0.3"; sha256="109m01mab5awjf8zjzwl9j7hzac15dyq3x6zba9hsy5i02k5d5w4"; depends=[GA Rcpp]; }; mcgfa = derive2 { name="mcgfa"; version="2.2.1"; sha256="19z5008274pwlwv47imixnfd4nxwnrhdhsq2m3grjzndxp41i4xz"; depends=[]; }; mcgibbsit = derive2 { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh46966v01dh26fy79dfklk3zjf262zp3c62ld9yf"; depends=[coda]; }; - mcglm = derive2 { name="mcglm"; version="0.5.0"; sha256="154js7nzxw7wvvz3vbcyh4iws33k1ckq0wcp4mkz9s6374lgw25s"; depends=[assertthat Matrix Rcpp RcppArmadillo]; }; mcheatmaps = derive2 { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; }; mclcar = derive2 { name="mclcar"; version="0.1-9"; sha256="0bwnivmajsrvmwskhk44qhz4nnc0irxq83g0kzbj4wshhivnwryp"; depends=[fields maxLik nleqslv rsm spam spdep]; }; mcll = derive2 { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; }; mclogit = derive2 { name="mclogit"; version="0.6.1"; sha256="1flq3g5jbp8nnx066wz35bg8wzlnnp9jp731w87vba483amakcds"; depends=[Matrix memisc]; }; - mclust = derive2 { name="mclust"; version="5.4.5"; sha256="0whandnda1fnjn5k3hgxdbp3b0xr7nlzy1j37saqb536h8q9dwkm"; depends=[]; }; + mclust = derive2 { name="mclust"; version="5.4.6"; sha256="1z46qask09x3xpv0wzvhn09218vwyrip4f5jrhnx96khpwvczzyl"; depends=[]; }; mclustcomp = derive2 { name="mclustcomp"; version="0.3.1"; sha256="0jdfdmgd46w7b38nbpd0lj9vqzi2nnf8fv0crj08lfin5ng7jvaa"; depends=[Rcpp RcppArmadillo Rdpack]; }; - mcmc = derive2 { name="mcmc"; version="0.9-6"; sha256="1fc6a6asn53lx7x7pnlb5mb716nv4pcmbp99f1i30y4hzygihfj4"; depends=[]; }; - mcmcabn = derive2 { name="mcmcabn"; version="0.2"; sha256="0mn12dkag1wlr0sdzfxxl1hkwkkwl9p2c4imnm4nzhw510zaa4fj"; depends=[abn coda cowplot ggplot2 ggpubr gRbase]; }; + mcmc = derive2 { name="mcmc"; version="0.9-7"; sha256="0q42m8ab7b6bxhns494ksjdss5f3c5m2jjfdlfj6fk1nz7ax7i5p"; depends=[]; }; + mcmcabn = derive2 { name="mcmcabn"; version="0.3"; sha256="0p4g7bnaq87kgfhsc3a8wdifngs4lb5il5wy9im81gz30ji9gbn7"; depends=[abn coda cowplot ggplot2 ggpubr gRbase]; }; mcmcderive = derive2 { name="mcmcderive"; version="0.0.1"; sha256="12asjw8rnnr7249fb7z7mp5w8y5vb0zig93jzsf77gghhfjmp4dl"; depends=[abind checkr err mcmcr purrr]; }; mcmcplots = derive2 { name="mcmcplots"; version="0.4.3"; sha256="0187z79gmvcrwqybxh3ckhcrqi0nqhvcvlczgxfkpq95y5czprdq"; depends=[coda colorspace denstrip sfsmisc]; }; mcmcr = derive2 { name="mcmcr"; version="0.2.0"; sha256="0jiyr0ncwhkgvkq4jb27iv1pxra9jbrjkv57lla71afr6glisqp2"; depends=[abind checkr coda err]; }; - mcmcse = derive2 { name="mcmcse"; version="1.3-2"; sha256="0yz0zhqhsxxg1b0cf15ijxfj4q8csjng18bmq45anabllq16ymkj"; depends=[ellipse Rcpp RcppArmadillo]; }; + mcmcse = derive2 { name="mcmcse"; version="1.4-1"; sha256="05sxz2bjb1y389vrmykcn6hwhgpykzpnh94aq34mbpqdsrb1y63b"; depends=[ellipse Rcpp RcppArmadillo]; }; mco = derive2 { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; }; - mcompanion = derive2 { name="mcompanion"; version="0.5-1"; sha256="11drfgy0knixhwjsywcr95b0isfmqkx9ygxq4phdnz839m2bki30"; depends=[gbutils MASS Matrix Rdpack]; }; + mcompanion = derive2 { name="mcompanion"; version="0.5-3"; sha256="0051agyzbhrsxi9wpfpqcq98h7y25627s2czf30qxcq80m7xbhj0"; depends=[gbutils MASS Matrix Rdpack]; }; mcp = derive2 { name="mcp"; version="0.2.0"; sha256="19bckg1wzv6k2j57s38rpjqrimj34lzaa3f0izxz36sahavyy2vj"; depends=[bayesplot coda dplyr future future_apply ggplot2 loo magrittr patchwork purrr rjags rlang stringr tibble tidybayes tidyr tidyselect]; }; mcparallelDo = derive2 { name="mcparallelDo"; version="1.1.0"; sha256="1ivh0d4f7ks6xwcjywk62h1zhr7h5bbhzpisky7973wi4g8vipbn"; depends=[checkmate R_utils R6]; }; mcprofile = derive2 { name="mcprofile"; version="0.2-3"; sha256="0rakaa1p6z0p4jl4df357vi58wzph81ik6plc8zzl370r8mj1y8q"; depends=[ggplot2 mvtnorm quadprog]; }; mcr = derive2 { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; }; mcsm = derive2 { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[coda MASS]; }; mctest = derive2 { name="mctest"; version="1.2.5"; sha256="1brqa8rvb5jvwmjz4wms7rhzv9xpvqydzkjm46ckz9fsiwrkq5mf"; depends=[]; }; + mcunit = derive2 { name="mcunit"; version="0.3.1"; sha256="12zlm14gcfid7h9szrggwmhy54d0wk57r8w8l3p3x3yp49144v67"; depends=[Rdpack rlang simctest testthat]; }; md = derive2 { name="md"; version="1.0.4"; sha256="13z8f3p84kivk6j58fb1qpzrmml41mq9pgv9nv2gvxrhyhanzi46"; depends=[]; }; md_log = derive2 { name="md.log"; version="0.1.1"; sha256="0ix5nz38xzlhrga40hfhlfss938mrfbni2wysvz2qbpm59qxrhg0"; depends=[futile_logger]; }; mda = derive2 { name="mda"; version="0.4-10"; sha256="19g6kn6g0shidrjfffklbmzc5w7mcimrxhagx4nmpslg59ibqdkh"; depends=[class]; }; - mdatools = derive2 { name="mdatools"; version="0.9.4"; sha256="1w3q3mzxbclzfllj277miap89161i6l1jf278iq07d0q9v0x7lnv"; depends=[]; }; + mdapack = derive2 { name="mdapack"; version="0.0.1"; sha256="1lz620nb51ih79djlma2hnasjr499dqkbvdn077n9pq14912z8q0"; depends=[covr curl devtools ggplot2 gh git2r httr knitr openssl pkgbuild reshape2 rlang rmarkdown roxygen2 spelling testthat]; }; + mdatools = derive2 { name="mdatools"; version="0.10.3"; sha256="0xpwysdqyimcxhkmkwq2pwhsv23i4nhfjwsdjrfywnjghw90a286"; depends=[]; }; + mde = derive2 { name="mde"; version="0.1.0"; sha256="129h28fhnfl4b0sm8q4ivaw0h5jhkglnkg8dzsvnis1gg2vn46hw"; depends=[dplyr magrittr purrr]; }; mded = derive2 { name="mded"; version="0.1-2"; sha256="1j8fcz5yc70p9qd9l010xj1b625scdps8z1pqh75b45p2hiqbhlc"; depends=[]; }; mdendro = derive2 { name="mdendro"; version="1.0.1"; sha256="0pk7b7zn9afc947parkj1qa4d85gq16lalg07fjfripxjnmvjahw"; depends=[rJava]; }; mdftracks = derive2 { name="mdftracks"; version="0.2.0"; sha256="0l8dc6ljrhbm8jwadaa3xkf6nx90vyiig15p7rryswczz9hw5ga6"; depends=[hellno]; }; @@ -10049,11 +10181,12 @@ in with self; { mdir_logrank = derive2 { name="mdir.logrank"; version="0.0.4"; sha256="0bhsr005dq9v85sjm2g9xlpksxwzsmsk14g0q5v3hkjvm5wk6xmv"; depends=[MASS]; }; mdmb = derive2 { name="mdmb"; version="1.3-18"; sha256="0jvwwdblky080j8cwfjna2d11z7hr672cdw9bkjz7ngd44blyp8x"; depends=[CDM coda miceadds Rcpp RcppArmadillo sirt]; }; mdpeer = derive2 { name="mdpeer"; version="1.0.1"; sha256="1vsqhah8h47s8k687fwa352549mdz16mwk1g7rcmhx75c2k85w2q"; depends=[boot ggplot2 glmnet magic nlme nloptr psych reshape2 rootSolve]; }; - mds = derive2 { name="mds"; version="0.3.0"; sha256="098ynvwra7ylli1pklmmfl9xnmiyd13iw5zd7g2xlqmg3rrphysg"; depends=[lubridate parsedate]; }; + mds = derive2 { name="mds"; version="0.3.1"; sha256="1zqd595c06b9mdy7iczx41p1xdm140161chmlpsj82mphjjinh88"; depends=[lubridate parsedate]; }; mdsOpt = derive2 { name="mdsOpt"; version="0.4-3"; sha256="0chk95n8gvj8jxvqq3bkdsw3hjaizcqd0x2lk32rkaq52lp3l9d8"; depends=[animation clusterSim plotrix smacof smds spdep symbolicDA]; }; mdscore = derive2 { name="mdscore"; version="0.1-3"; sha256="10cl5r6kd9chdik5v0q91x40xpw2cjvvyi220z4bvngpb0989x8j"; depends=[MASS]; }; mdsdt = derive2 { name="mdsdt"; version="1.2"; sha256="0nbzc54jac4wmfyrs821ycxh749cb1zfxcws0nbpk35rydqkc627"; depends=[ellipse mnormt polycor]; }; mdsr = derive2 { name="mdsr"; version="0.1.7"; sha256="1angy75nyhzwfhmb4axs14yl0jsxjaiqh5nz2jpmi5j890y32zda"; depends=[babynames DBI dbplyr downloader dplyr fs ggplot2 mosaic RMySQL]; }; + mdsstat = derive2 { name="mdsstat"; version="0.3.2"; sha256="1ff53ddvn9rla02a0g4hgp9c1grlwja05ans9gjk5ya2nwilpj2l"; depends=[lubridate mds]; }; mdw = derive2 { name="mdw"; version="2017.12-03"; sha256="054vssnypbik0yf6smicggnkrqf6kx8k21nbf5rminsh00sx39k1"; depends=[]; }; meaRtools = derive2 { name="meaRtools"; version="1.0.4"; sha256="1nxyvdq4670696mhg0svxxlvk9hnr8szai8b18pw6754kmw1bjvn"; depends=[emdist ggplot2 gridExtra gtools lattice plyr Rcpp reshape2]; }; meanShiftR = derive2 { name="meanShiftR"; version="0.53"; sha256="1pla9hr9nbbnc3hcmk0ywfh6129zng5lp3dmjqb3cgdrmwkdrx9i"; depends=[]; }; @@ -10064,50 +10197,49 @@ in with self; { meboot = derive2 { name="meboot"; version="1.4-7"; sha256="1i0h71aj49hyj889447s611gz668ys7xlr1i82b5nvaf6chfbfin"; depends=[dynlm nlme]; }; medExtractR = derive2 { name="medExtractR"; version="0.1"; sha256="08hzl5kk3jqs8vc53zrd1qj5g24dkpvwwvswqp57719c4ybi3ia3"; depends=[stringr]; }; mederrRank = derive2 { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; }; - medfate = derive2 { name="medfate"; version="0.8.2"; sha256="0f86cpczzkpx8sy6krx970zy1fmsn93mjkm9mq00w2nw91kqjrh6"; depends=[ggplot2 GSIF meteoland Rcpp sp spdep]; }; + medfate = derive2 { name="medfate"; version="0.9.0"; sha256="0vxrj9x9f975vxfjsv83riyazlvbpn5q9z49ywnayiikn1snbrnh"; depends=[ggplot2 meteoland Rcpp sp spdep]; }; medflex = derive2 { name="medflex"; version="0.6-6"; sha256="04cjqhyihxf1imbl9y9s58qpy6lmxsh2gwy4bras03hx52slzl5r"; depends=[boot car Matrix multcomp sandwich]; }; mediacloudr = derive2 { name="mediacloudr"; version="0.1.0"; sha256="1r11mpz44msla71lqw45r9s8z7rwvbnqi026l0ljx6crby183h0w"; depends=[httr jsonlite rvest xml2]; }; mediation = derive2 { name="mediation"; version="4.5.0"; sha256="0i88wvqqw8cmxmh9i78rqzp4s16zhf12dgl9fsk9bhw7hxhhc0i1"; depends=[boot Hmisc lme4 lpSolve MASS Matrix mvtnorm sandwich]; }; - medicalrisk = derive2 { name="medicalrisk"; version="1.2"; sha256="1zdxv3rj7768kbyxfvr9n0hp4z7y0sf3r7ssqv731hjjp656l6xp"; depends=[hash plyr reshape2]; }; + medicalrisk = derive2 { name="medicalrisk"; version="1.3"; sha256="12p3mjy6lphjajxz7is04cahp0598ip9ixfkdimvw1k8n5hs9mj0"; depends=[hash plyr reshape2]; }; medicare = derive2 { name="medicare"; version="0.2.1"; sha256="00a1gml2khzisdavnaip6ap4bw45b17nbl9cqb1mqrm4y0p9gm16"; depends=[]; }; meditate = derive2 { name="meditate"; version="0.1.3"; sha256="02mgnbxlvi73zpnghlcx89jvri8144cf0bzq0hrbhh2nq2c1sdjg"; depends=[audio checkmate deldir wesanderson]; }; meditations = derive2 { name="meditations"; version="1.0.1"; sha256="0wnx3zadpngfch0sb0ifqvsmzl613639f1yazwsgvhk29mycx4ss"; depends=[]; }; medmod = derive2 { name="medmod"; version="1.0.0"; sha256="1f7bzdcjnbz9izlfblxcaa85qxx8kzn62qgjd3qlb7jl7mdy5q54"; depends=[ggplot2 jmvcore lavaan R6]; }; meetupapi = derive2 { name="meetupapi"; version="0.1.0"; sha256="1iaxpfzgn478np9cjwz0zalfy1p7jwabnwpfv31svw052i8bs9yl"; depends=[dplyr httr magrittr purrr]; }; mefa = derive2 { name="mefa"; version="3.2-7"; sha256="1qrf6d3y38q7yy6bg3bxg7514d9paz1f8y6sr7lbksi30qn92fmj"; depends=[]; }; - mefa4 = derive2 { name="mefa4"; version="0.3-6"; sha256="0zl30ag3v7ywaw3i0mngwg6f75cmd29z8ivxqzm6lqzgapcjlw2m"; depends=[Matrix]; }; + mefa4 = derive2 { name="mefa4"; version="0.3-7"; sha256="0iq3n77gbl3zbplaqp1nwb72y9w797m938albx27727pkzyanxf1"; depends=[Matrix]; }; meifly = derive2 { name="meifly"; version="0.3"; sha256="1x3lhy7fmasss0rq60z5qp74ni32sahw62s8cnp2j431sp95pczc"; depends=[leaps MASS plyr]; }; mekko = derive2 { name="mekko"; version="0.1.0"; sha256="09y50k4r4mnx351a5zhkqg9s2xyl3d149dhmfy2z6hzm5yg2ajyi"; depends=[ggplot2]; }; - meltt = derive2 { name="meltt"; version="0.4.0"; sha256="0m0r7in1s8vq2pvq7pxgwjfhqds8pwhcrn5hy0wa126s1y88v34x"; depends=[dplyr ggplot2 leaflet plyr Rcpp RcppArmadillo reticulate shiny shinyjs tibble tidyr]; }; + meltt = derive2 { name="meltt"; version="0.4.1"; sha256="1113rdw0jglwkcd3g31llhgzqmwpxfz2bp60m3x2zdbdrvwc1z9n"; depends=[dplyr ggplot2 leaflet plyr Rcpp RcppArmadillo reticulate shiny shinyjs tibble tidyr]; }; melviewr = derive2 { name="melviewr"; version="0.0.1"; sha256="19syc3d6zc0hmcjjdj7ibrdqxcdlh95ny970f3ska453qh1898b2"; depends=[cairoDevice gtools gWidgets gWidgetsRGtk2 jsonlite RColorBrewer RGtk2 RNifti]; }; mem = derive2 { name="mem"; version="2.15"; sha256="1q8h6mbpzybg1vzi2pgp8fpxfrp4d729n5ghh0a54wjdwdjgkpq1"; depends=[boot dplyr EnvStats ggplot2 mclust RColorBrewer RcppRoll sm tidyr]; }; memapp = derive2 { name="memapp"; version="2.13"; sha256="0n4awpxsz34rrz53bp4dyfgs9zssrxd4f8zyj6zw89j6ahkz85w6"; depends=[dplyr DT foreign formattable ggplot2 haven mem openxlsx plotly RColorBrewer readxl RODBC shiny shinyBS shinydashboard shinyjs shinythemes shinyWidgets stringi stringr tidyr]; }; meme = derive2 { name="meme"; version="0.2.2"; sha256="1q78q8080vvqni8ncqp326pidfjfia0f2b6pis08m7fr1q1gcqca"; depends=[ggplot2 gridGraphics magick showtext sysfonts]; }; memery = derive2 { name="memery"; version="0.5.2"; sha256="1hr52g69lr2n84yczm8i8yxh7rys5nr8jk1hcmv548p5y79l8k9s"; depends=[Cairo colourpicker cowplot ggplot2 jpeg magrittr png purrr shiny shinyBS shinycssloaders showtext sysfonts]; }; memgene = derive2 { name="memgene"; version="1.0.1"; sha256="1x3vf2f1yh40xw5vqcjlrn07zn9zh3sx4kc9dijxzygd9crl5a29"; depends=[ade4 gdistance raster vegan]; }; - memisc = derive2 { name="memisc"; version="0.99.21"; sha256="0fbljiz6ifyfjkqk4nsxmnqafdklqsbzihnbdg4cwbr25dx83hyq"; depends=[data_table lattice MASS repr]; }; - memnet = derive2 { name="memnet"; version="0.1.0"; sha256="1lhpij3dm4whsawy6cxcfcwn9q881i8jbjpkrwvdsn63ibxrm55s"; depends=[BH igraph Rcpp]; }; + memisc = derive2 { name="memisc"; version="0.99.22"; sha256="0w1p7zcdrif692i40r5m06lykr2f0vhibrh5pwz7ndhbxlr1pk8x"; depends=[data_table lattice MASS repr]; }; memo = derive2 { name="memo"; version="1.0.1"; sha256="14nvqi1qsin45ksd0wp9cigjk1gghr4jijdqkaqh177dwa244r9j"; depends=[digest]; }; memochange = derive2 { name="memochange"; version="1.1.0"; sha256="1im6342by0pf1kmz8jps9d3y752k87bl02v5ddywbvh0idkdnba5"; depends=[forecast fracdiff longmemo LongMemoryTS sandwich strucchange urca]; }; memoise = derive2 { name="memoise"; version="1.1.0"; sha256="034qfc2xlh30x1q2vya239w34a3ir3y2fwnx2agbgbi6592zjxmj"; depends=[digest]; }; memor = derive2 { name="memor"; version="0.2"; sha256="10w2jw9ma7yds2d179l7bv4rzpggp3l04kvqnncii6yf5f4lj9cd"; depends=[knitr rmarkdown yaml]; }; memoria = derive2 { name="memoria"; version="1.0.0"; sha256="05nx6xkgf1mkn1ajjizwp66xhn7ddbvgdnmkdbcl4s7sq456vczw"; depends=[cowplot ggplot2 HH ranger stringr tidyr viridis viridisLite zoo]; }; - memuse = derive2 { name="memuse"; version="4.0-0"; sha256="1g63nssxrgqgzw8qjz8202qpwhps8fbck6pn77j2wsc82dm73y7v"; depends=[]; }; - merDeriv = derive2 { name="merDeriv"; version="0.1-7"; sha256="0zvsbpz8v8bw458rvafw4cm8dwxbnvakm01ry3bxvq34hzg8ffg6"; depends=[lavaan lme4 Matrix nonnest2 sandwich]; }; + memuse = derive2 { name="memuse"; version="4.1-0"; sha256="1bbjp8y0ji71956fbaxiil7ynq2nkmmgz7i9xps83m3bbp5d3mjq"; depends=[]; }; + merDeriv = derive2 { name="merDeriv"; version="0.1-9"; sha256="1zp9w79pm3n8673h3h7ic9zx6p5i0cd6kpmbyfs365flgvcbdmsg"; depends=[lavaan lme4 Matrix matrixcalc nonnest2 numDeriv sandwich]; }; merTools = derive2 { name="merTools"; version="0.5.0"; sha256="19qf3nn57hvd80x2l0m34w2jaky0jgsgc4nh0vdqjl8kpx4044cr"; depends=[abind arm blme broom dplyr foreach ggplot2 lme4 mvtnorm shiny]; }; mergeTrees = derive2 { name="mergeTrees"; version="0.1.3"; sha256="17aqgfd1ky5zq6i9s1djvdqjdd8lzkblf0cdw82i9mpzfhcz1fav"; depends=[Rcpp]; }; mergedblocks = derive2 { name="mergedblocks"; version="1.0.0"; sha256="0g209f9vr5gjgsljnb6i8jr48azv982dbfc1anggfip82qivicqn"; depends=[randomizeR]; }; merlin = derive2 { name="merlin"; version="0.0.2"; sha256="0r1hxbpqhih0nyya26hphymz4jrw88zfd3bypf1hwj5dsk60341f"; depends=[MASS randtoolbox statmod survival]; }; merror = derive2 { name="merror"; version="2.0.2"; sha256="13d9r5r83zai8jnzxaz1ak40876aw20zbpr244gs55rvj5j7f87q"; depends=[]; }; messaging = derive2 { name="messaging"; version="0.1.0"; sha256="0q19cqp1zgh0yhk1ql0jqf414bhx6jwhkairq6wx2cmkli2g7k1y"; depends=[dplyr glue magrittr rlang stringr]; }; - metR = derive2 { name="metR"; version="0.5.0"; sha256="0dpbzyawswlvzydx54i4f75zv79qww1p5hk1p4pzjc7fmgx9ba57"; depends=[checkmate curl data_table digest dplyr fields Formula formula_tools ggplot2 gridExtra gtable lubridate maps maptools Matrix memoise plyr purrr RCurl scales sp stringr]; }; + metR = derive2 { name="metR"; version="0.7.0"; sha256="0zdnsggvmkyxq0a6n7rhzp82n4hciayzajs4svw504i30ij5q5db"; depends=[checkmate data_table digest fields Formula formula_tools ggplot2 gtable lubridate memoise plyr purrr RCurl scales sp stringr]; }; metRology = derive2 { name="metRology"; version="0.9-28-1"; sha256="1syjwblyd18myxrs0hx4m91fgb6zs3r4g7w701j2f2pw6j9mvz0y"; depends=[MASS numDeriv robustbase]; }; metScanR = derive2 { name="metScanR"; version="1.2.3"; sha256="1v7zrxj3wspx6f5n5s75skcygbf3r85rn4p0z9iwbrbrgxwi4qgs"; depends=[geosphere leaflet matlab plyr RCurl]; }; - meta = derive2 { name="meta"; version="4.9-9"; sha256="1z475n7g6rawz07p6myqgg6cgz4rbsfgmn6phbfpz4hf7wx84g9q"; depends=[CompQuadForm lme4 metafor]; }; + meta = derive2 { name="meta"; version="4.11-0"; sha256="06miv0yjxqxabi9iff08hydzb6qjdahy3dswxgkdp5zybma6dva6"; depends=[CompQuadForm lme4 metafor]; }; meta4diag = derive2 { name="meta4diag"; version="2.0.8"; sha256="1ila8x9r1rdmlwfpzfx1zj5yx1m4yrbhyb74db4wqbh1dswn7zsm"; depends=[caTools shiny shinyBS sp]; }; metaBLUE = derive2 { name="metaBLUE"; version="1.0.0"; sha256="0ppn4bvr10z32pghmv4wjv86k6n5y5bkfxc6h5mvb556v6jnl6d8"; depends=[Matrix]; }; metaBMA = derive2 { name="metaBMA"; version="0.6.2"; sha256="0g2npgr9rqf0f9xqdp4wl3263shrp28j4i63j4fwd91xk9qmy8my"; depends=[BH bridgesampling coda LaplacesDemon logspline mvtnorm Rcpp RcppEigen rstan rstantools StanHeaders]; }; - metaDigitise = derive2 { name="metaDigitise"; version="1.0.0"; sha256="04hycv9dpy39l8fhql69mcn5w97f7sjxrhiz5vbpbawvfbkl0f0l"; depends=[magick purrr]; }; + metaDigitise = derive2 { name="metaDigitise"; version="1.0.1"; sha256="1cwvb6b4a1pfixbknbjjylsmpkccgi163h0kbf7zfjaqjg2y9mzh"; depends=[magick purrr]; }; metaLik = derive2 { name="metaLik"; version="0.43.0"; sha256="1li40pgd9z00nrph9njwn6wysb1i9dkpqzcp6fzds6asvcxlqqfl"; depends=[]; }; metaMA = derive2 { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[limma SMVar]; }; metaMix = derive2 { name="metaMix"; version="0.3"; sha256="17qkwg9iz5v63ybyvqppbf044l0pi0ym5pw283174dlx8lfac60q"; depends=[data_table ggplot2 gtools Matrix Rmpi]; }; @@ -10119,62 +10251,62 @@ in with self; { metabolighteR = derive2 { name="metabolighteR"; version="0.1.0"; sha256="1kbwxwcx5f836bhwx32a41c6753832wigx0b6gi9zblc4qsnqvlq"; depends=[dplyr httr magrittr purrr]; }; metacart = derive2 { name="metacart"; version="2.0-2"; sha256="1rn246avzisbrw9parap7hpgxb7pj5y43zfvayaiz4ilhdl5vj4y"; depends=[ggplot2 gridExtra Rcpp rpart]; }; metacoder = derive2 { name="metacoder"; version="0.3.3"; sha256="0d7fpx5zpggc8k3y882mlw4szn7ghzckyiaxj9x652xink8zi397"; depends=[ape biomformat cowplot crayon dplyr GA ggfittext ggplot2 ggrepel igraph lazyeval magrittr phylotate RColorBrewer Rcpp RCurl readr reshape reshape2 rlang scales seqinr stringr svglite taxa taxize tibble traits vegan viridisLite zoo]; }; - metacom = derive2 { name="metacom"; version="1.5.2"; sha256="0v2rscql8vks12v5s9rvfrylh175if2mnpr69wsvr2snlcjxmirq"; depends=[vegan]; }; + metacom = derive2 { name="metacom"; version="1.5.3"; sha256="0c0gzn28cl2sl52wx2n36jm9c18d9s3yqjyx88kgbmd9069z1nvk"; depends=[vegan]; }; metacor = derive2 { name="metacor"; version="1.0-2.1"; sha256="0y3z7jbhw5c2dbn9fx9wlw1311irjc2xvnm5hnaixbbj53qz24n0"; depends=[gsl rmeta]; }; metadynminer = derive2 { name="metadynminer"; version="0.1.6"; sha256="0zg08lwnimnmfwac0d5kg8yhsl88gmn029dra18phy1jzkfnsx34"; depends=[Rcpp]; }; metadynminer3d = derive2 { name="metadynminer3d"; version="0.0.1"; sha256="0riqr2hhk4h0rm7m4njb2dd2f24jff7lzf9chh83sq4q3wldgpz5"; depends=[metadynminer misc3d Rcpp rgl]; }; metafolio = derive2 { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[colorspace MASS plyr Rcpp RcppArmadillo]; }; - metafor = derive2 { name="metafor"; version="2.1-0"; sha256="009x5w163g4pbak23i5xw3ipk5s9xljkdj9py5vir3vpxxazk267"; depends=[Matrix nlme]; }; + metafor = derive2 { name="metafor"; version="2.4-0"; sha256="1b599fxk7s0brkchmx698fr5k4g1kzkia2rnlvhg349ffs5nfjmn"; depends=[Matrix nlme]; }; metaforest = derive2 { name="metaforest"; version="0.1.3"; sha256="1q6m60cd7gl7y0gdjd10ky25hwv5jc4x5g5sr5w61xc3j2hnw8in"; depends=[data_table ggplot2 gtable metafor ranger]; }; metafuse = derive2 { name="metafuse"; version="2.0-1"; sha256="1zdw22f5kzvy2xr3c2csy873hcags60as567brc2sw17d0apfy8j"; depends=[evd glmnet MASS Matrix]; }; - metagear = derive2 { name="metagear"; version="0.4"; sha256="0ww1j34600y99wyanj9ffg1019xqshb9c32wiqnsblyw8pq4va5f"; depends=[EBImage gWidgets gWidgetsRGtk2 hexView MASS Matrix metafor RCurl stringr]; }; + metagam = derive2 { name="metagam"; version="0.1.0"; sha256="1mya00bvbxz3fg506s4km1193yamgzqqq8v6v286jcp19w4jr07s"; depends=[dplyr furrr ggplot2 knitr metafor metap purrr rlang stringr tibble tidyr viridis]; }; + metagear = derive2 { name="metagear"; version="0.6"; sha256="1xfpjqawnwsg2djnygzyg6ak7gylj60wlhfkkipnrpy8bbpvc8j2"; depends=[EBImage hexView MASS Matrix metafor RCurl stringr]; }; metagen = derive2 { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[BatchExperiments BatchJobs BBmisc ggplot2 lhs MASS metafor ParamHelpers plyr]; }; - metaheur = derive2 { name="metaheur"; version="0.2.0"; sha256="1rr5mjx3v87alj7cl9hxldvhhbpkz1fzmymmkqv0hs65pny6gbqw"; depends=[doParallel foreach ggplot2 preprocomb reshape2]; }; metaheuristicOpt = derive2 { name="metaheuristicOpt"; version="2.0.0"; sha256="0ra4hl9l1jlzymj218m2i6xrxfacyx4aaln5pk7q4di2ks0nq11m"; depends=[]; }; - metamedian = derive2 { name="metamedian"; version="0.1.4"; sha256="00jzgf8zdcbgnz89g55lq9c6ybh3praa68b9wwj6sx63hnkicvgd"; depends=[estmeansd Hmisc metafor]; }; + metamedian = derive2 { name="metamedian"; version="0.1.5"; sha256="1v2nha2qc9vs2s9nfvbia033ppprkwxj5fadlrpy20fj2lr8z7z6"; depends=[estmeansd Hmisc metafor]; }; metamer = derive2 { name="metamer"; version="0.2.0"; sha256="0wdhr83mph9v7vb9mfhf7lcwmp0smz72sniass7kxcbj6j9hga4g"; depends=[FNN progress]; }; metamicrobiomeR = derive2 { name="metamicrobiomeR"; version="1.1"; sha256="16ymdhhr7h2785gfgrw7qi1fjvawiz599h42qi7l0v6djinbxlw2"; depends=[caret compositions dplyr foreign gamlss gdata ggplot2 gplots gridExtra httr jsonlite knitr lme4 lmerTest magrittr matrixStats meta mgcv plyr randomForest RColorBrewer RCurl repmis reshape2 rmarkdown tidyr zCompositions]; }; metamisc = derive2 { name="metamisc"; version="0.2.2"; sha256="0ll245a3f442n7jyjshcn87l725mgk132ri73kynrwh0z8g2r7i5"; depends=[ggplot2 lme4 metafor mvtnorm plyr pROC]; }; - metan = derive2 { name="metan"; version="1.2.1"; sha256="0bgyrza03fdjd8hannzc70hrmd2cn6cvs58kq4lmjds5vckk27w5"; depends=[ade4 cowplot dendextend dplyr FWDselect GGally ggforce ggplot2 ggrepel gplots lattice lme4 lmerTest magrittr progress rlang tibble tidyr tidyselect]; }; - metansue = derive2 { name="metansue"; version="2.3"; sha256="18vy294862lfgxiw9cikai9svy3wpwk2bvz3vp20fcslg90mn3xp"; depends=[]; }; + metansue = derive2 { name="metansue"; version="2.4"; sha256="1ja7a3z4d764a1rcf256kmzf8xc6d8x7mqq12vzznw5ks8r2p9hk"; depends=[]; }; metap = derive2 { name="metap"; version="1.3"; sha256="1jmmmmjiklaxfl604hwqil193ydaghvd5jv8xsr4bx3pzn5i9kvz"; depends=[lattice mutoss Rdpack TFisher]; }; metaplot = derive2 { name="metaplot"; version="0.8.3"; sha256="1zw8bq2fy9m15dfc92ag0dz2k9dqrf5jbvfaycizcgsgaqd79s1c"; depends=[dplyr encode ggplot2 gridExtra gtable lattice magrittr rlang scales tidyr]; }; metaplotr = derive2 { name="metaplotr"; version="0.0.3"; sha256="01iala6cxsxv30fnlh80md5mpy3ksd2piw90zcls8f68g1c6v1jy"; depends=[ggplot2 gridExtra]; }; metaplus = derive2 { name="metaplus"; version="0.7-11"; sha256="05pkgw0zlq3q9mvdw2yxz9mxzqwq3c8q6cwvh87cigw1pf8y9an7"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; }; metapost = derive2 { name="metapost"; version="1.0-6"; sha256="098f7sifg814mc4sb1nb4d6dlr1xms5hwyp08ksxg0i4ayf9jf3c"; depends=[gridBezier]; }; + metapower = derive2 { name="metapower"; version="0.1.0"; sha256="0y1s7szljpx763dm38nnm5q54x7paq0hn7l47c3vyjha99fpzzjw"; depends=[cowplot dplyr ggplot2 knitr magrittr rlang rmarkdown testthat tidyr]; }; metapro = derive2 { name="metapro"; version="1.5.8"; sha256="0ymbqzm317fiywzxaizddhvjzwp2wyx9y7zgbg4nrz11l3r2bp2n"; depends=[metap rSymPy]; }; + metarep = derive2 { name="metarep"; version="1.0.1"; sha256="0jnxx11jxj63ry0bkjlh9g2x2pr2qi24nql99iibz2ckbx8344p3"; depends=[meta]; }; metasens = derive2 { name="metasens"; version="0.4-0"; sha256="1rgb2b48lwvrg1f39dzg6d9jr1ya2p7la2jrc3zs3jks28arjr2x"; depends=[meta]; }; metatest = derive2 { name="metatest"; version="1.0-5"; sha256="1h3dcs1m7606b3a41yw2lak3lrqmsbpnx67qv24wvq003apz1sfd"; depends=[]; }; + metathis = derive2 { name="metathis"; version="1.0.2"; sha256="07aha4j401zlm6abfmq70vqc215bpsi5hqi50npz33rpb1m3r9rq"; depends=[htmltools knitr magrittr purrr]; }; metavcov = derive2 { name="metavcov"; version="1.1"; sha256="1x87knvypkfg0x223aiak7fy7zdlfn74crmvnqzhxf2vmxljnvnh"; depends=[corpcor]; }; - metaviz = derive2 { name="metaviz"; version="0.3.0"; sha256="1ayz9za3zwmyna1hanzm83gb7vw3dclj3z4g35rk5dz6s4zgqsvm"; depends=[dplyr ggplot2 ggpubr gridExtra metafor nullabor RColorBrewer]; }; + metaviz = derive2 { name="metaviz"; version="0.3.1"; sha256="0jvv49rw66v7saj2y1q88rp6fyzq7473af5d3k77ymvjbpqyrbyz"; depends=[dplyr ggplot2 ggpubr gridExtra metafor nullabor RColorBrewer]; }; metawho = derive2 { name="metawho"; version="0.2.0"; sha256="1mflkrlnb1wk9vbbj621cy64s78q677d8fcnsi1ybh49k7sqmw20"; depends=[dplyr forestmodel magrittr metafor purrr rlang]; }; meteR = derive2 { name="meteR"; version="1.2"; sha256="02637d3dnfq0jv9d74y99x7ms89y3jcmkpazc44g44sa7jx4i510"; depends=[distr nleqslv]; }; meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; }; meteoForecast = derive2 { name="meteoForecast"; version="0.53"; sha256="15bjhkcn4zcll3cfgpzcdj0zv753x29qsjndy3h2zzqn83qywx9s"; depends=[ncdf4 raster sp XML zoo]; }; meteogRam = derive2 { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; }; - meteoland = derive2 { name="meteoland"; version="0.8.3"; sha256="0xbnb5kpb565ivi1qx2jmbgx5zg3bv65q4a7aylhdxijsjdr8vcv"; depends=[httr jsonlite ncdf4 Rcpp rgdal sp spdep]; }; + meteoland = derive2 { name="meteoland"; version="0.9.2"; sha256="0mrkdvc6dj7jny5b4fqshq2wmc9mvmvixbdzsgcyfqlxzzg5r1qz"; depends=[httr jsonlite ncdf4 Rcpp rgdal sp spdep]; }; meteor = derive2 { name="meteor"; version="0.3-4"; sha256="01009d9wpxybig4n82m48hqqg1k4x4shcjxfy8y0kk7cgfdb4naw"; depends=[Rcpp]; }; meteorits = derive2 { name="meteorits"; version="0.1.1"; sha256="1vk8pbhfc5mbkbpw7ml81gx9i8187xp3vx36pbyyhjbrpy6gqabx"; depends=[MASS pracma Rcpp RcppArmadillo]; }; methcon5 = derive2 { name="methcon5"; version="0.1.0"; sha256="08xsi6j65izxqcrlh37f2d7m3pwna1v6zvdv96mqylsjqgqmbk5x"; depends=[dplyr magrittr purrr rlang]; }; - metricTester = derive2 { name="metricTester"; version="1.3.6"; sha256="0m49sl42bf0rlkvg3sq87vgx3dv65pxvcm07gflx5wlr26x1r0s1"; depends=[ape doParallel dplyr foreach geiger MASS picante plotrix spacodiR vegan]; }; metricsgraphics = derive2 { name="metricsgraphics"; version="0.9.0"; sha256="1zbx82b34y0rr4w7rzvyc1nzk95w6cdkg0j1kkshbmkvplq6v9i4"; depends=[htmltools htmlwidgets magrittr]; }; metropolis = derive2 { name="metropolis"; version="0.1.5"; sha256="0nhkzy1miycqa2jqh9gh1l48n03nig99q19f46dm8qqci7a90vlp"; depends=[coda]; }; - mets = derive2 { name="mets"; version="1.2.6"; sha256="0vaqizmr27144dkh5mh095vih0p70j3ly9zwk5h0fklmn8bf2qhl"; depends=[lava mvtnorm numDeriv Rcpp RcppArmadillo survival timereg]; }; + mets = derive2 { name="mets"; version="1.2.7.1"; sha256="1b3bsxdwzl5rilnsga9cgzb7dafcfk2q39582rif34wim8xxzzv7"; depends=[lava mvtnorm numDeriv Rcpp RcppArmadillo survival timereg]; }; metsyn = derive2 { name="metsyn"; version="0.1.2"; sha256="0iwp0nz07yd33qd93fjblmvik1l1xkv6rkccn3054zs2bkrzjq4f"; depends=[foreach readr stringr tibble]; }; - mev = derive2 { name="mev"; version="1.13"; sha256="0mcjis66v9jzcdamagizvz5c58qpzqa9dzj0ypqfv1cl061d6c4j"; depends=[alabama boot evd nleqslv nloptr Rcpp RcppArmadillo TruncatedNormal]; }; + mev = derive2 { name="mev"; version="1.13.1"; sha256="1zbr5f8w56c9z0lp4ak47fxnnfrdm74liqcjvij0n4ajqs6glaak"; depends=[alabama boot evd nleqslv nloptr Rcpp RcppArmadillo TruncatedNormal]; }; mewAvg = derive2 { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; }; mexhaz = derive2 { name="mexhaz"; version="1.7"; sha256="1z0516i7asyn3248xzvvc377slcy2zv6f9qalkd33r3dlc0js4s8"; depends=[lamW MASS numDeriv statmod survival]; }; mfGARCH = derive2 { name="mfGARCH"; version="0.1.9"; sha256="0vmxyjg2jj39dd1307d5jwz3033j8ldfqhysmmzl3i1b5ypfd5q5"; depends=[maxLik numDeriv Rcpp zoo]; }; - mfbvar = derive2 { name="mfbvar"; version="0.5.2"; sha256="02gvh3qvqb08j684y3ylwz1rddi11884xs8nr7b93p5nypgfr9bp"; depends=[dplyr ggplot2 GIGrvg lubridate magrittr Rcpp RcppArmadillo RcppParallel RcppProgress stochvol tibble]; }; - mfe = derive2 { name="mfe"; version="0.1.4"; sha256="1lif39zr6x1ysv8s90b1wgshp5pa175fxcjvx0hz6g15d29gwgy6"; depends=[cluster clusterCrit e1071 ECoL infotheo MASS rpart rrcov]; }; + mfbvar = derive2 { name="mfbvar"; version="0.5.3"; sha256="065bpwlzqmvgrdm9jp8030jcs4sqnckyxvrgdn0jcnmmgiq88vgx"; depends=[dplyr ggplot2 GIGrvg lubridate magrittr Rcpp RcppArmadillo RcppParallel RcppProgress stochvol tibble]; }; + mfdb = derive2 { name="mfdb"; version="6.2-0"; sha256="11xi915plc90awasmny9ynwmz0yw18frfp1q2xv7bqk4v96fcxgp"; depends=[DBI getPass logging RPostgreSQL]; }; mfp = derive2 { name="mfp"; version="1.5.2"; sha256="1i90ggbyk2p1ym7xvbf4rhyl51kmfp6ibc1dnmphgw15wy56y97a"; depends=[survival]; }; mfx = derive2 { name="mfx"; version="1.2-2"; sha256="04pwp67i4sn4rf497pgy6qifwvrcmwyxn8x5sn96fy8qyrdzjfhj"; depends=[betareg lmtest MASS sandwich]; }; mgarchBEKK = derive2 { name="mgarchBEKK"; version="0.0.2"; sha256="1k4c34srnckbh5kchzmm44l91ma9sw0gi4y225igs3cl79212q9c"; depends=[mvtnorm tseries]; }; - mgc = derive2 { name="mgc"; version="1.0.1"; sha256="0bdj890v2rinsddny8kwa48cgqh9qlzfd7k5s4i9mg40ajr0f291"; depends=[MASS SDMTools]; }; - mgcViz = derive2 { name="mgcViz"; version="0.1.4"; sha256="0gxxmnawvq88jljdszhjw85px4w0q73nmgyq61hlfvjd2k8lscc8"; depends=[gamm4 GGally ggplot2 gridExtra KernSmooth matrixStats mgcv miniUI plyr qgam rgl shiny viridis]; }; + mgcViz = derive2 { name="mgcViz"; version="0.1.6"; sha256="12isaqpbhdg2qhw76wj6hqi233dw3md061bbirkgzr5clrb8kxlk"; depends=[gamm4 GGally ggplot2 gridExtra KernSmooth matrixStats mgcv miniUI plyr qgam rgl shiny viridis]; }; mgcv = derive2 { name="mgcv"; version="1.8-31"; sha256="1if34mqsn9r7g0l82lxvvx0wjhi9paqdymyd73nschxcl1if8vbk"; depends=[Matrix nlme]; }; mglmn = derive2 { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; }; - mgm = derive2 { name="mgm"; version="1.2-7"; sha256="1s0m9xjq2d067ba2cx87q83nqmdza34vw9g0g0mqd8ap53rmqhas"; depends=[glmnet gtools Hmisc matrixcalc qgraph stringr]; }; + mgm = derive2 { name="mgm"; version="1.2-9"; sha256="0fbri6a6g36cpqw577hdmy2qyj8hd2zkaafj7s5564y1z7xkxn4x"; depends=[glmnet gtools Hmisc matrixcalc qgraph stringr]; }; mgpd = derive2 { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[corpcor evd fields numDeriv]; }; mgsub = derive2 { name="mgsub"; version="1.7.1"; sha256="0v3386a7i71ixqidqfqakl428rnq0z9pjz08lgmyvray0ls5vmvi"; depends=[]; }; mgwrsar = derive2 { name="mgwrsar"; version="0.1"; sha256="13h56fgq3fs28fqh19hwbcza622xd921qnjwcgw2rjwaabqz70w5"; depends=[doParallel foreach htmltools leaflet Matrix nabor Rcpp RcppEigen sp spgwr]; }; @@ -10192,46 +10324,49 @@ in with self; { micEconAids = derive2 { name="micEconAids"; version="0.6-18"; sha256="0s2gkf6widdnxqqb1xjqdvji8vhdz5a4q05clbbbyq1h409q7qvl"; depends=[lmtest micEcon miscTools systemfit]; }; micEconCES = derive2 { name="micEconCES"; version="0.9-8"; sha256="06g6z8hf7y9d942w6gya0fd5aidzfjkx3280gjygdlwpv7nlpqzv"; depends=[car DEoptim micEcon minpack_lm miscTools systemfit]; }; micEconIndex = derive2 { name="micEconIndex"; version="0.1-6"; sha256="1ihly6qpyg1pms4nkvs6khxxqwr3fwg57i8pg0yhyy1apqxyj2xl"; depends=[miscTools]; }; - micEconSNQP = derive2 { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[MASS miscTools systemfit]; }; + micEconSNQP = derive2 { name="micEconSNQP"; version="0.6-8"; sha256="183hg4iap97is8cdaqxmnj9z8yybvpfnhg2kf85nfy1nl7b30xl2"; depends=[MASS miscTools systemfit]; }; micar = derive2 { name="micar"; version="1.1.1"; sha256="09vpijva39fwpvdpfglwr3xmz469pnmz371ms7z5av6w2193ls5n"; depends=[httr jsonlite]; }; - mice = derive2 { name="mice"; version="3.7.0"; sha256="1wx1s1gc07iz63w4m8z0i1n5mc273f89grp5d3hfla7ypicjkasf"; depends=[broom dplyr lattice MASS mitml nnet Rcpp rlang rpart survival]; }; + mice = derive2 { name="mice"; version="3.8.0"; sha256="1ibybvigqkkla4xwhqs2w4m6c68alfcdsljx99nn4p92rzb1ig04"; depends=[broom dplyr lattice Rcpp tidyr]; }; miceFast = derive2 { name="miceFast"; version="0.5.1"; sha256="0n09l6y7jwcskv2lfynyzl614c7x84yyc52wqwyhnzvd8lzapp5d"; depends=[data_table Rcpp RcppArmadillo]; }; miceMNAR = derive2 { name="miceMNAR"; version="1.0.2"; sha256="1s607icaf3c25mn8xdi3zkzmm8m7qd9a6vjdlz5j7ig2gc9f2y2d"; depends=[GJRM mice mvtnorm pbivnorm sampleSelection]; }; - miceRanger = derive2 { name="miceRanger"; version="1.2.0"; sha256="1bjg7qmywls76cqcyz5pwg00cryk4hf495jbk5a6j3rq9ihdagkm"; depends=[corrplot crayon data_table DescTools FNN foreach ggplot2 ggpubr ranger]; }; - miceadds = derive2 { name="miceadds"; version="3.7-6"; sha256="1jpddrw7vrm4v7n01qg7kigaicljnnrhqfjwnm9hl13mc2r928cg"; depends=[mice mitools Rcpp RcppArmadillo]; }; + miceRanger = derive2 { name="miceRanger"; version="1.3.5"; sha256="07h3ah2z2nnwcs63mhlxvli9a9fsv9pnjbl5d0khgwpn7w4gmyxj"; depends=[corrplot crayon data_table DescTools FNN foreach ggplot2 ggpubr ranger]; }; + miceadds = derive2 { name="miceadds"; version="3.8-9"; sha256="1n5blg3vbl9sknwp9y123m597cvp6l1c25fyxqdbamw7b8ymzncp"; depends=[mice mitools Rcpp RcppArmadillo]; }; micemd = derive2 { name="micemd"; version="1.6.0"; sha256="1n8kzdf2713dw9mbzvbwl0gknzi9amdqnabfw2wmb70gsvma3f48"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; }; michelRodange = derive2 { name="michelRodange"; version="1.0.0"; sha256="1pykqb9hmpvn77k0vhfh36iyhamz9h5kpswq3ql31h9nknfy3ixi"; depends=[magrittr]; }; micompr = derive2 { name="micompr"; version="1.1.0"; sha256="0qsxs35mmqx8hpszcb1z87xczh0vh0m0plqrj22af5mjjvif76n9"; depends=[]; }; microPop = derive2 { name="microPop"; version="1.5"; sha256="1gikp20n2b50fkybbg2hmlfjdcm0imjwygjsjnyv3wrjzypm2i78"; depends=[deSolve]; }; microbats = derive2 { name="microbats"; version="0.1-1"; sha256="1mahvblaiwg1xk2s34wd1ic8ddc9lh6g0azik2pd97bsf0krkyw8"; depends=[]; }; microbenchmark = derive2 { name="microbenchmark"; version="1.4-7"; sha256="1xl4m4yl4h2zcjiz8wsa7f3sh55qg2xr3sgpvz18rlix6b3173r6"; depends=[]; }; - microdemic = derive2 { name="microdemic"; version="0.4.0"; sha256="0i4pkrw02ad8ssvryndf7pxgk5wcyn4126yvl28fxk38249kvc9v"; depends=[crul data_table jsonlite tibble]; }; + microdemic = derive2 { name="microdemic"; version="0.5.0"; sha256="1i89vq3b7gq0pdh8hf92jzh0fyghhhxf8hmb72naz0vpl6xa301a"; depends=[crul data_table httpcode jsonlite tibble]; }; microhaplot = derive2 { name="microhaplot"; version="1.0.1"; sha256="0g15g7d19yz11nn2g0h8h2m8k1cvmpryz72pnalgv5yi58md5l5i"; depends=[dplyr DT ggiraph ggplot2 gtools magrittr scales shiny shinyBS shinyWidgets tidyr]; }; micromap = derive2 { name="micromap"; version="1.9.3"; sha256="1iciwy0kcg4qa0xc4gkqcilq33ac1s184vw13cbbkv0d1b5cgkgv"; depends=[ggplot2 maptools RColorBrewer rgdal sp]; }; micromapST = derive2 { name="micromapST"; version="1.1.1"; sha256="15ch132x3wnpf7rmy25nah7iyfxfk90p7lvavqjhrnavhjsfxbxx"; depends=[labeling RColorBrewer stringr]; }; - micropan = derive2 { name="micropan"; version="2.0"; sha256="0hn5k1mj60bn2hm1c87206q9hr5qqswbihdzkc27w3bpxwglgvl7"; depends=[dplyr igraph microseq rlang stringr tibble]; }; + micropan = derive2 { name="micropan"; version="2.0.1"; sha256="1hij7cqrcqlxfr5mbambi32f59zrrfi28fhaaqrlf0lkh4jnfbnj"; depends=[dplyr igraph microseq rlang stringr tibble]; }; microplot = derive2 { name="microplot"; version="1.0-42"; sha256="062dd4k6ryyl44lwbc2qgdsfcs1fiv9j2n6lx9driw6vng533b6q"; depends=[cowplot flextable ggplot2 HH Hmisc htmltools lattice officer]; }; - microsamplingDesign = derive2 { name="microsamplingDesign"; version="1.0.6"; sha256="093rldfx3b45j4qn0r42d7fmqzx4h43s6vq4zlysdimq4ncxdm3v"; depends=[abind deSolve devtools ggplot2 gridExtra gtools knitr MASS matrixcalc matrixStats plyr Rcpp RcppArmadillo readr reshape2 shiny stringr]; }; + microsamplingDesign = derive2 { name="microsamplingDesign"; version="1.0.7"; sha256="1cd9h331gvapa6p72mlyddrixb0jzka7q10i78fmpc2mcdl7alw0"; depends=[abind deSolve devtools ggplot2 gridExtra gtools knitr MASS matrixcalc matrixStats plyr Rcpp RcppArmadillo readr reshape2 shiny stringr]; }; microseq = derive2 { name="microseq"; version="2.0"; sha256="1i4xw7v5c3fzkz4gbcdp35idj1sm47gc4fmjwjsk9czi8nh591wr"; depends=[dplyr Rcpp rlang stringr tibble]; }; microsynth = derive2 { name="microsynth"; version="2.0.13"; sha256="1ijv7kbxl087m0wzdbzl9p74116dfwid03dlamy4b1l308azc4ag"; depends=[boot kernlab LowRankQP MASS nleqslv pracma survey]; }; midas = derive2 { name="midas"; version="1.0.1"; sha256="1alqxk23651jnkg0xn4rpvk71z5rhvx3y0wjrgkw2qw95s7jjn72"; depends=[shiny xml2]; }; midasr = derive2 { name="midasr"; version="0.7"; sha256="02kjyzbznmy0362ambnnh8vc7ywbgikk3n7705sww9p0k0pywrrx"; depends=[forecast Formula MASS Matrix numDeriv optimx quantreg sandwich texreg zoo]; }; midastouch = derive2 { name="midastouch"; version="1.3"; sha256="1pjzcf0hjfhr5p0la8pz1njw7bhfrcrzpqfsdqk2z5c6dbh4awzq"; depends=[]; }; - midrangeMCP = derive2 { name="midrangeMCP"; version="1.3"; sha256="1733dlhzbgrjdzd88rh9dkqhxh05gr078sbmihab7whbrpsq8068"; depends=[SMR WriteXLS xtable]; }; + midrangeMCP = derive2 { name="midrangeMCP"; version="2.1"; sha256="0blvwyvvv5gvnwnlawmqyj00ziwchxk9f39f5nc8d066pwh3mcw4"; depends=[gWidgets gWidgetsRGtk2 pacman SMR writexl xtable]; }; migest = derive2 { name="migest"; version="1.8.1"; sha256="12gk1ip1kw3x35bazxqqjf1drbs2h7kpgzbh5psd6ppphj81dzjg"; depends=[dplyr magrittr mipfp purrr stringr tidyr]; }; migration_indices = derive2 { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; }; migui = derive2 { name="migui"; version="1.1"; sha256="1qchjsc7ff2b6s9w6ncj9knjv6pyp90jd4jxljn2rr1ix1gc45za"; depends=[arm gWidgets2 mi]; }; miic = derive2 { name="miic"; version="1.0.3"; sha256="088szscn9v9279w86mypxphp3avv17iijvcvlckx3h1ka75lkx27"; depends=[bnlearn igraph MASS ppcor Rcpp]; }; + milorGWAS = derive2 { name="milorGWAS"; version="0.3"; sha256="1z44sbs3lmrx32wagk5rr3rc2k8iqq860fz0bi983llmgmhaqdxn"; depends=[gaston Rcpp RcppEigen]; }; milr = derive2 { name="milr"; version="0.3.0"; sha256="0z4d22fd6gd3zbi973vws9jqyh4c4m4i4ajcpxv934vxmbj0cma9"; depends=[glmnet numDeriv pipeR Rcpp RcppArmadillo RcppParallel]; }; - mime = derive2 { name="mime"; version="0.8"; sha256="18w98prfbivvygiyamsf9yg090kzbnvw2fn9b27823gmis4d08ny"; depends=[]; }; + mime = derive2 { name="mime"; version="0.9"; sha256="107sqarmyhxlch5nrg796i5z03p9mshskisiq2fm628ajk99gkrc"; depends=[]; }; mimi = derive2 { name="mimi"; version="0.2.0"; sha256="1ig34qd37my74nmlv3jcfrj7cnd55alxpf2flf2sssk2ws1y56xh"; depends=[data_table doParallel FactoMineR foreach glmnet rARPACK softImpute]; }; - mimsy = derive2 { name="mimsy"; version="0.4.2"; sha256="0f2yy5s9dxl8k12lrnc0w5d8vl0c9by0zc7gv05a2sq5jl7zrr8j"; depends=[dplyr lubridate magrittr openxlsx]; }; - minMSE = derive2 { name="minMSE"; version="0.1.1"; sha256="11m34nmxi2v80lsix8k44vl8ms5541js4av6h3pvx11px3i3c841"; depends=[MASS]; }; + mimsy = derive2 { name="mimsy"; version="0.4.3"; sha256="1mj0g2j0fw3j36r59yad7bfqhpjl1mjlca9fmmvxfjr878b4ld5g"; depends=[dplyr lubridate magrittr openxlsx]; }; + minMSE = derive2 { name="minMSE"; version="0.3.1"; sha256="0xzd2hw7ga5fi54d35vr9n3sbnp6acak27fl4lv089sn1ig6s95p"; depends=[MASS]; }; + mindr = derive2 { name="mindr"; version="1.2.3"; sha256="1slglva5ipbzj748k7rxvlw6g2iqdkvyf8qnplnzcjc2qsjljd1q"; depends=[data_tree htmlwidgets jsonlite knitr]; }; mineCitrus = derive2 { name="mineCitrus"; version="1.0.0"; sha256="031nfhrsc5rlqls3vyrk18lx0pd4ssdk96cmfr4ifaciz0rgv8h2"; depends=[ggplot2]; }; mined = derive2 { name="mined"; version="1.0-2"; sha256="1py6gylya8dhmxcyfrcwbwc5q226m041rs3cmj4q0dhqy8iy2zsw"; depends=[Rcpp RcppEigen]; }; minerva = derive2 { name="minerva"; version="1.5.8"; sha256="0k4ww3qfqrsnkccxk9dyq39xrc42g8gvj5g8drglg4fyci7jfs9h"; depends=[Rcpp RcppArmadillo]; }; miniCRAN = derive2 { name="miniCRAN"; version="0.2.12"; sha256="1jyrx86y8qdb3xdfpj812k0v492z3i6dnwy761qslwmn15xx8845"; depends=[assertthat httr igraph XML]; }; miniGUI = derive2 { name="miniGUI"; version="0.8-1"; sha256="0qb2fbkjwzn909yrk89d4951bwf8n05i0s265l8v2d4lpns9hc2i"; depends=[]; }; + miniMeta = derive2 { name="miniMeta"; version="0.2"; sha256="03r6xwcgchw42irqr8jy5hsbv8brk6f77h4zi9qhhz3zmkryjbw2"; depends=[colourpicker jsonlite markdown meta metafor readxl rhandsontable shiny shinyjs shinyWidgets WriteXLS]; }; miniUI = derive2 { name="miniUI"; version="0.1.1.1"; sha256="1h5h2sc57h95d6bsgs95l26911g38hvjc1v50bc31xl9689l2as5"; depends=[htmltools shiny]; }; minimalRSD = derive2 { name="minimalRSD"; version="1.0.0"; sha256="1p1jpi8lnv952k4c1wjgbgpb0hv4zg0f9qrd43cx0caibkqvhzf7"; depends=[]; }; minimap = derive2 { name="minimap"; version="0.1.0"; sha256="0y5yzic9pwpzs01gnl82syankijcjp85n22jn5zda0bp3y01r53r"; depends=[]; }; @@ -10245,37 +10380,41 @@ in with self; { minxent = derive2 { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; }; mipfp = derive2 { name="mipfp"; version="3.2.1"; sha256="1gxazpg81vj5dywpb6jb29188jw28qil6pfygawa7znnjn3k5ca6"; depends=[cmm numDeriv Rsolnp]; }; mipred = derive2 { name="mipred"; version="0.0.1"; sha256="0kijn2xj0dh28rm2sjgd8j1a3c5avc3fjfvvcmzfasvxqdjflv6j"; depends=[mice]; }; - mirt = derive2 { name="mirt"; version="1.31"; sha256="1jfpb69ih0kyffjf9k7z8yhfyw6ngqhkjxmpzgmm0v8lr2mnw0gq"; depends=[dcurver Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; }; + miraculix = derive2 { name="miraculix"; version="0.9.20"; sha256="0s5r7ikym3s85706wznfc3lh3ap95pv1p2796bi1n19ivd671myc"; depends=[RandomFieldsUtils]; }; + mirt = derive2 { name="mirt"; version="1.32"; sha256="14xijqfyvhp7272n8h89kayi7va3cn2j02gw0fdxivfjlbqa03d2"; depends=[dcurver Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; }; mirtCAT = derive2 { name="mirtCAT"; version="1.9.3"; sha256="1yd03rkviqxl9rsqnny3fgn2rj0hss49nav11b9w4np8lv9zkwgh"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; }; - mirtjml = derive2 { name="mirtjml"; version="1.3.0"; sha256="12m2qhxgjc4qappw4w159326kgbz069xiqqc44qgzw3xhpl5lm5q"; depends=[GPArotation Rcpp RcppArmadillo]; }; misaem = derive2 { name="misaem"; version="0.9.2"; sha256="0awn0dvriycgmrx31ibckwjm2cq1wxrqjjjaq0bjgjsl37f4xnkk"; depends=[MASS mvtnorm]; }; misc3d = derive2 { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; }; - miscF = derive2 { name="miscF"; version="0.1-4"; sha256="1kvkbvrmaqclwdfghkrsmnzb6xbi97icay2wwb7k5m34xhx4ha82"; depends=[MASS MCMCpack mvtnorm R2jags]; }; - miscFuncs = derive2 { name="miscFuncs"; version="1.2-10"; sha256="1kqya581n76ff9avhj6xm6nwsbw7zlm4mwy0vyvdlqlf7c381qq0"; depends=[mvtnorm roxygen2]; }; + miscF = derive2 { name="miscF"; version="0.1-5"; sha256="0g6wk2zxqq6j949hnbvwmfd72y25zjfbrfrfxsj21q84w41fgjkb"; depends=[MASS MCMCpack mvtnorm R2jags]; }; + miscFuncs = derive2 { name="miscFuncs"; version="1.3"; sha256="0wn7i9656km53wlml360qgpzqxlv1jsjnh4swhqgf5dyjva8i141"; depends=[mvtnorm roxygen2]; }; miscIC = derive2 { name="miscIC"; version="0.1.0"; sha256="0pnwc3b318xxnmb7scrj4qkqlvqfyczspdg496kl0ixsiaafr1ad"; depends=[nnls]; }; miscTools = derive2 { name="miscTools"; version="0.6-26"; sha256="16pwfxpyl0zv3hjxx2kjchkg7p6kbj0s2rrpskj7rkhjr9imlg5y"; depends=[digest]; }; - misclassGLM = derive2 { name="misclassGLM"; version="0.2.0"; sha256="1dz36q2gl0q8d0s2rxn28b8ykw31wcdxf91s7ypmjggfdj64i8br"; depends=[bigmemory foreach MASS Matrix mlogit numDeriv ucminf]; }; + misclassGLM = derive2 { name="misclassGLM"; version="0.3.2"; sha256="1b344dy5fm45jkjrqcx16905n9x0iwihr73mq2m0qfq7ay87nsrh"; depends=[bigmemory foreach MASS Matrix mlogit numDeriv ucminf]; }; miscor = derive2 { name="miscor"; version="0.1-1"; sha256="1vn0q0i2f1szjywddb7h7krpbf0qch6gmbzs03m4zb03xd70983b"; depends=[]; }; miscset = derive2 { name="miscset"; version="1.1.0"; sha256="1gwi7jnqdf2fa8yk8gmcc7dcv72bbdl7yj3yccj3r5jjk41vdp91"; depends=[data_table devtools ggplot2 gridExtra Rcpp xtable]; }; mise = derive2 { name="mise"; version="0.1.0"; sha256="1ydbm76w3y0p5h82shxjblwlzbrmzwx0bgq9w2axjwz2nx8jfw0a"; depends=[]; }; + miselect = derive2 { name="miselect"; version="0.9.0"; sha256="0dfqni7r5zwdvwmrmvqhycmxhazivz6vnz2ccjy0hyfad29g0v7s"; depends=[]; }; mispr = derive2 { name="mispr"; version="1.0.0"; sha256="166piax3f7di8h0i07fbdx45lxz1p47j378v6yl6zdc3525adpjx"; depends=[e1071 MASS penalized]; }; misreport = derive2 { name="misreport"; version="0.1.1"; sha256="1f78zcw4cg51mjvflhwd64hip2gj8x9ng1mhh4w43yv3x8hmbd6h"; depends=[mvtnorm numDeriv VGAM]; }; missCompare = derive2 { name="missCompare"; version="1.0.1"; sha256="0f173463dsr2xcj228aysfnabrdv8i2c9sprmd2jndn65dv8hhsz"; depends=[Amelia data_table dplyr ggdendro ggplot2 Hmisc ltm magrittr MASS Matrix mi mice missForest missMDA pcaMethods plyr rlang tidyr VIM]; }; missDeaths = derive2 { name="missDeaths"; version="2.5.1"; sha256="1vj1d4r2ikc7ppm5kgivc7bj81qkyymrs11cxj1gdll6xyfn1g1d"; depends=[cmprsk MASS mitools Rcpp relsurv rms survival]; }; missForest = derive2 { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[foreach itertools randomForest]; }; missMDA = derive2 { name="missMDA"; version="1.16"; sha256="0c5a9ygvvx2qi9hgbwnhl4hcljy2b4hi2x3py2qyay9bp0zvchxm"; depends=[doParallel FactoMineR foreach mice mvtnorm]; }; + missMethods = derive2 { name="missMethods"; version="0.1.0"; sha256="0c2bzi1q8mqcma47j8l6yf24figf493rn671svrrsfz38gdirmpv"; depends=[]; }; missRanger = derive2 { name="missRanger"; version="2.1.0"; sha256="06ic99zg91ikzvmwbj05ma46rc4ayfwylv8cnj21sbr5nxw0qpz9"; depends=[FNN ranger]; }; missSBM = derive2 { name="missSBM"; version="0.2.1"; sha256="00jxj1f7hr78srlm49finf9j2q14y1cl66rwdkm1i81l8db5fvcp"; depends=[ape corrplot ggplot2 igraph magrittr nloptr R6 Rcpp RcppArmadillo]; }; missingHE = derive2 { name="missingHE"; version="1.3.2"; sha256="0i4af7479nnrbljbianwq4r6f0gs80y29mq9chykjyrbh0fpj15n"; depends=[bayesplot BCEA coda ggmcmc ggplot2 ggthemes gridExtra loo mcmcplots mcmcr R2jags]; }; mistat = derive2 { name="mistat"; version="1.0-5"; sha256="1vyx918b7iv1wcnk23bnlxljwy0hglpdx5drhrs5qcd45f6jrghc"; depends=[]; }; - mistr = derive2 { name="mistr"; version="0.0.2"; sha256="12zh6ys3lfc5ylidjhbmbxvbhjd3rg9vd89pv94547z9y1yf6sx5"; depends=[bbmle]; }; + mistr = derive2 { name="mistr"; version="0.0.3"; sha256="00pq56zlp27wsa88830pwqx1s2m3x7klzaw96jan8mp3r7hwskr4"; depends=[bbmle]; }; mistral = derive2 { name="mistral"; version="2.1.0"; sha256="1cr79p8q82lpj9d0y6q24xmfkxmnlqv8ivkd0baj7fxfb1nb8sak"; depends=[DiceKriging doParallel e1071 emoa foreach ggplot2 iterators Matrix mvtnorm quadprog]; }; + misty = derive2 { name="misty"; version="0.3.0"; sha256="1yiiqdpl5bfgy4y41195a5fvbbx1v1g5idw4swbadzz2sxn66w57"; depends=[haven lavaan readxl]; }; mitml = derive2 { name="mitml"; version="0.3-7"; sha256="0yqyxkyi1kmv5k63wxj5kkg5g8igk1axk2csb4xhj6wz0p89dxy6"; depends=[haven jomo pan]; }; mitools = derive2 { name="mitools"; version="2.4"; sha256="0c2x2n1p53lcw0vx4vmy5j7m2f95i7g2iwbryl89imr99rvz617j"; depends=[DBI]; }; mix = derive2 { name="mix"; version="1.0-10"; sha256="0z16ddbh79kqxi64bl1h2sd8anpgc48n9d1nyr2zlln39nhv8w8g"; depends=[]; }; - mixAK = derive2 { name="mixAK"; version="5.1"; sha256="0i9gp66d1mzskiif0bk0w88cinc923fsj4vi7pv0im2cwmxksiiq"; depends=[coda colorspace fastGHQuad lme4 mnormt]; }; + mixAK = derive2 { name="mixAK"; version="5.2"; sha256="1fgyky6giscldrk13wjbkk26lbg6jzn6xzxm4wy4bjgbfmbar42m"; depends=[coda colorspace fastGHQuad lme4 mnormt]; }; mixEMM = derive2 { name="mixEMM"; version="1.0"; sha256="0344ay1avi37kvh5w9bknayx67yh7rflj6zhw68d2888v7cbghjy"; depends=[]; }; - mixKernel = derive2 { name="mixKernel"; version="0.3"; sha256="1kf8niplqf97n10zi6hkp9gmyyd15v6vsy741c089iwiazmixhdf"; depends=[corrplot ggplot2 LDRTools Matrix mixOmics phyloseq psych quadprog vegan]; }; + mixIndependR = derive2 { name="mixIndependR"; version="0.2.1"; sha256="0m858jjspkacfyxikisqij4d5ipz6fklgcczxzh7i4kv248p43w3"; depends=[stringr]; }; + mixKernel = derive2 { name="mixKernel"; version="0.4"; sha256="0bqa4inim7819pl3dr2kfzdvv7phqkjqfx3zal8mmxcjpkpxs4mf"; depends=[corrplot ggplot2 LDRTools Matrix mixOmics phyloseq psych quadprog reticulate vegan]; }; mixPHM = derive2 { name="mixPHM"; version="0.7-2"; sha256="1wvkdb9zj2j8dpppnyins05rg877zbydqsl3qaan62wznkknxcac"; depends=[lattice survival]; }; mixR = derive2 { name="mixR"; version="0.1.1"; sha256="1xd3v5rk59380zh7r6l5blmcy4gib9xp44j5dcrk6ivs6fgycsxh"; depends=[ggplot2 Rcpp]; }; mixRasch = derive2 { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; }; @@ -10290,25 +10429,25 @@ in with self; { mixedsde = derive2 { name="mixedsde"; version="5.0"; sha256="0ss1ng4nx91gxj85wxxfyh9ljxsj3ag6lsj1a5d2815p9jzl7dsv"; depends=[MASS moments plot3D sde]; }; mixexp = derive2 { name="mixexp"; version="1.2.5"; sha256="0nbf10xhrr51rb1b2apcj4p3ci8xbi7flgz500ar3mxh8h8l74sq"; depends=[daewr gdata lattice]; }; mixggm = derive2 { name="mixggm"; version="1.0"; sha256="1wiiayld7rwp3mwz93zizrv0dzw02mqrzprc4z6c4jj25c8pypw5"; depends=[foreach GA mclust memoise network Rcpp RcppArmadillo]; }; - mixl = derive2 { name="mixl"; version="1.1"; sha256="0v3yxhar1ms6y2j73a5hgyh1c9v6lg5xl646mv0ischqj21bysbh"; depends=[maxLik numDeriv randtoolbox Rcpp readr sandwich stringr]; }; + mixl = derive2 { name="mixl"; version="1.1.2"; sha256="03ylzl5fyypyxhjfhbnhcswmq2cngzspvkzn8bnlgkd496qr14j8"; depends=[maxLik numDeriv randtoolbox Rcpp readr sandwich stringr]; }; mixlink = derive2 { name="mixlink"; version="0.1.5"; sha256="0ywgrcplhspc0x5fniw52xqz20y7j9mwgy4ky8lv3vii659mr52m"; depends=[mvtnorm numDeriv Rcpp RcppGSL]; }; mixlm = derive2 { name="mixlm"; version="1.2.4"; sha256="0jwz918qnz1p71y82ayrgir9rpij8zk3jgmn63nq5xrlf0jbjcdd"; depends=[car leaps multcomp pls pracma]; }; - mixmeta = derive2 { name="mixmeta"; version="1.0.7"; sha256="0y0q38w9ljadh64kmmfn8chsmmrhpik54rh64iiq45b8ihxb1sq8"; depends=[]; }; + mixmeta = derive2 { name="mixmeta"; version="1.0.8"; sha256="1wx95pgd096d359n5mrl98hpwc2c1r2jw3pzvilkawx0y8lw68na"; depends=[]; }; mixor = derive2 { name="mixor"; version="1.0.4"; sha256="1l296z0a3kamb1m94pfx3vczp36pa0np101fy5c23kh45s59pbs7"; depends=[survival]; }; mixreg = derive2 { name="mixreg"; version="0.0-6"; sha256="04g863yxrlj0wqsmzzxph5110g3gjk094r59zzk0b9r89m8vhpsl"; depends=[]; }; mixsep = derive2 { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; }; - mixsmsn = derive2 { name="mixsmsn"; version="1.1-6"; sha256="0zlbs0yn336xdzymrb065rbg1zj8f7zri77lmd7c4w1rxhfjh9a9"; depends=[mvtnorm]; }; + mixsmsn = derive2 { name="mixsmsn"; version="1.1-7"; sha256="1xw8bxkivp50ax0ygsravmzmksdqqg9fdm3hwpl39ikhj0cpa7zr"; depends=[mvtnorm]; }; + mixsqp = derive2 { name="mixsqp"; version="0.3-17"; sha256="0dmk5xpgq55bwdjfrnv6frfx708frszscx03h8l9cdsj3l1d002n"; depends=[irlba Rcpp RcppArmadillo]; }; mixtNB = derive2 { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; }; - mixtools = derive2 { name="mixtools"; version="1.1.0"; sha256="13wdm0xs5bakhpa8ypg6lvhjaqkxyabwz4glxdwn0jwdvkcdhgsl"; depends=[MASS segmented survival]; }; + mixtools = derive2 { name="mixtools"; version="1.2.0"; sha256="08whic8hmmzi55b7azwj11l2x5r9s5qbyrv7s9jr08156vqkw0zg"; depends=[kernlab MASS segmented survival]; }; mixtox = derive2 { name="mixtox"; version="1.3.2"; sha256="0mdnp1yrcxvan5l7jj91s41vq5y1kdnkhhinqrklmg4ph5f29dmq"; depends=[minpack_lm]; }; mixture = derive2 { name="mixture"; version="1.5"; sha256="1ahr8jw93xnd5hmy3h4sr209ql7gmkwbvnnfmiplbpc17czqgcn4"; depends=[]; }; mize = derive2 { name="mize"; version="0.2.3"; sha256="1rc3mhcwidmfbkfyxwldm9hg25lh7a81jlj2zv45vsj5hbrmvk6c"; depends=[]; }; - mizer = derive2 { name="mizer"; version="1.0.1"; sha256="1vn03f3j9vd8hwz18i67blif33y3cd7hc8m1h4aw7wkgdpqsyb4b"; depends=[deSolve ggplot2 plyr progress Rcpp reshape2]; }; + mizer = derive2 { name="mizer"; version="2.0.0"; sha256="152bjz37b1sjg1x9sl6286hisk2qpcckfh4gxw1wbdn7kh99law1"; depends=[assertthat deSolve dplyr ggplot2 plotly plyr progress Rcpp reshape2]; }; mkde = derive2 { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; }; - mkin = derive2 { name="mkin"; version="0.9.49.8"; sha256="01sjahhwz80aixxjksfb2bnilryggzs57cmhw6r6crq2sarzcqin"; depends=[deSolve inline lmtest numDeriv R6]; }; + mkin = derive2 { name="mkin"; version="0.9.49.11"; sha256="1palzxv5vyk5hnc09mwja3xz42r3mqpqlcn5rc8kxkm4kg0z3v4c"; depends=[deSolve inline lmtest nlme numDeriv pkgbuild purrr R6]; }; mknapsack = derive2 { name="mknapsack"; version="0.1.0"; sha256="1kzmx7d512681a4hjirfgcd7a8rvndb4da66p16gms5nnxzsby9c"; depends=[assertthat data_table lpSolve]; }; mkssd = derive2 { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; }; - mlDNA = derive2 { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[e1071 igraph pROC randomForest ROCR rsgcc snowfall]; }; mlPhaser = derive2 { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; }; mlVAR = derive2 { name="mlVAR"; version="0.4.4"; sha256="0ib566qygm28lqhr3w9vzfxnpsmazlipzrfsdm3cw21wpz2lvxcr"; depends=[abind arm clusterGeneration corpcor dplyr graphicalVAR lme4 MplusAutomation mvtnorm plyr qgraph]; }; mlapi = derive2 { name="mlapi"; version="0.1.0"; sha256="023vk5bp8cjcq88sapkl87kdxr92bay1dyxl6xirnyj699pyj51k"; depends=[Matrix R6]; }; @@ -10324,45 +10463,46 @@ in with self; { mlergm = derive2 { name="mlergm"; version="0.5"; sha256="145004r8xihphsng8pna430a8rqg0ibqx92jwyjkn7hzpx17p7xf"; depends=[cowplot ergm GGally ggplot2 lpSolve Matrix network plyr reshape2 sna stringr]; }; mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; }; mlf = derive2 { name="mlf"; version="1.2.1"; sha256="09ihnibpknpp26hdlbxyr99yz7z0n8qpsjs5aq3zngng0yh3wdn9"; depends=[]; }; - mlflow = derive2 { name="mlflow"; version="1.5.0"; sha256="1aks7azc3s51f40jhqgkr5hl43h18w5njzms7q6vchbdhb8cydrq"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr xml2 yaml zeallot]; }; + mlflow = derive2 { name="mlflow"; version="1.8.0"; sha256="03pdn05zgiz8plgf69nw4ji1fkzphampn7pk7ljf6w5dssznjja9"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr xml2 yaml zeallot]; }; mlgt = derive2 { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; }; mlica2 = derive2 { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; }; - mlmRev = derive2 { name="mlmRev"; version="1.0-7"; sha256="0gj7yk2gll6y99q4h6ggds37fcww8d326h44rygcl155y0482rky"; depends=[lme4]; }; + mlmRev = derive2 { name="mlmRev"; version="1.0-8"; sha256="0ln4nazhc1prnlmvhfzhx268vx3klb0xnz1nsiwh0pwyskskyzym"; depends=[lme4]; }; mlma = derive2 { name="mlma"; version="4.0-1"; sha256="0pk2h4m74r95dfkqzliixi6z1rwdfc6gbz8c3162y22m919f00vc"; depends=[car gplots lme4]; }; mlmc = derive2 { name="mlmc"; version="1.0.0"; sha256="01h7w0ajyg3bccynlpbi3yjpy089wczbfbajpg6yw5v4dppw7k7a"; depends=[ggplot2 Rcpp]; }; mlmi = derive2 { name="mlmi"; version="1.0.0"; sha256="08sm836y40af3jd5gcl5pnyv1gqpx4ngkkw4xfp82h1j4yk47sy5"; depends=[cat gsl MASS Matrix mix norm]; }; mlmm_gwas = derive2 { name="mlmm.gwas"; version="1.0.6"; sha256="14xp8k7sww1skyw5l2006gpaw2c6yrri5nmfx4yav4vqdlhcj2k1"; depends=[coxme Matrix multcomp multcompView sommer]; }; mlmmm = derive2 { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; }; - mlogit = derive2 { name="mlogit"; version="1.0-2"; sha256="18dnwbs0jlsp8sli6qr4j5gpg8v619hyq0cwkb1ms1kwngpszhsw"; depends=[Formula lmtest MASS Rdpack statmod zoo]; }; + mlogit = derive2 { name="mlogit"; version="1.0-3.1"; sha256="034vymf296abpajkic303j0x4mak62m8iav86k3d3g6hy3c03dp4"; depends=[Formula lmtest MASS Rdpack statmod zoo]; }; mlogitBMA = derive2 { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[abind BMA maxLik]; }; - mlr = derive2 { name="mlr"; version="2.17.0"; sha256="0x7jggvhg8pf1hw013qrg7zdaf8yq5znjl2ap0f9a6w2j34b32yf"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; }; - mlr3 = derive2 { name="mlr3"; version="0.1.6"; sha256="096rn1ljkimhfvd487wyp3qb28dm7qhpyj35nghgci7y7cq50jam"; depends=[backports checkmate data_table digest lgr mlbench mlr3measures mlr3misc paradox R6 uuid]; }; - mlr3db = derive2 { name="mlr3db"; version="0.1.3"; sha256="0zg5hmlc7mybhrz0hrz4rmvdhbvjp4d0im0r22qvsd3phv614v8m"; depends=[checkmate data_table digest dplyr mlr3 R6]; }; - mlr3filters = derive2 { name="mlr3filters"; version="0.1.1"; sha256="0xis7yk3ycchpykl2kp0w1rx806rxnyrrcxnw9m240svzs3367x3"; depends=[backports checkmate data_table mlr3 mlr3misc paradox R6]; }; - mlr3learners = derive2 { name="mlr3learners"; version="0.1.5"; sha256="0yraazjfrd3vpbl9na5c77yy8lcdhisq30d7nl13ha2pssn7ifb3"; depends=[data_table mlr3 mlr3misc paradox R6]; }; - mlr3measures = derive2 { name="mlr3measures"; version="0.1.1"; sha256="0pbsj1yra3wx5xny4ak901qfj983lk8nsiqw2x8kzz46dskx4wzl"; depends=[checkmate]; }; - mlr3misc = derive2 { name="mlr3misc"; version="0.1.6"; sha256="1kcxkpm66n71rc2pzy1xpkfm797palfz2axj0shms4xpjilzfzf1"; depends=[backports checkmate data_table R6]; }; - mlr3pipelines = derive2 { name="mlr3pipelines"; version="0.1.2"; sha256="14clmipbqinmyrxfa363gjffdzijz1vd2zzbgkkldv44xszgb7p9"; depends=[backports checkmate data_table digest mlr3 mlr3misc paradox R6 withr]; }; - mlr3proba = derive2 { name="mlr3proba"; version="0.1.1"; sha256="0cangy4j3haglsc356az9l73k62m8i9b5wdvc5kpb848f63yzafc"; depends=[BBmisc checkmate data_table distr6 mboost mlr3 mlr3misc mlr3pipelines paradox R6 survival]; }; - mlr3tuning = derive2 { name="mlr3tuning"; version="0.1.1"; sha256="09wmil8v5vn705zhsj0rjag6sh3n1mdsjb79xca8x4a72lv09i45"; depends=[checkmate data_table lgr mlr3 mlr3misc paradox R6]; }; + mlr = derive2 { name="mlr"; version="2.17.1"; sha256="0fwjl5dy516vrh2lx5rgps85q0jz8ka5dx61bz7lfxk21k8bjw8b"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; }; + mlr3 = derive2 { name="mlr3"; version="0.2.0"; sha256="049wabal63560k0mlhn0rwydd50kjwlz56xygyqd18hhfjcnf6m1"; depends=[backports checkmate data_table digest lgr mlbench mlr3measures mlr3misc paradox R6 uuid]; }; + mlr3data = derive2 { name="mlr3data"; version="0.1.0"; sha256="0cdicfrrmba87adkcnpzm9gkcspjskqsbs8xryj1d0c48lzws7ab"; depends=[]; }; + mlr3db = derive2 { name="mlr3db"; version="0.1.5"; sha256="09hins00pc569vz26mkyg3736vhl01szl8hbwp2vyrh3mdn21c9m"; depends=[backports checkmate data_table digest dplyr mlr3 R6]; }; + mlr3filters = derive2 { name="mlr3filters"; version="0.2.0"; sha256="1dps9v4w82qnhvlrshwpaqppjmy405syp4qdirm456ydfw2gywcy"; depends=[backports checkmate data_table mlr3 mlr3misc paradox R6]; }; + mlr3learners = derive2 { name="mlr3learners"; version="0.2.0"; sha256="1r9f31wlhqwpslb2sgj6x3akggqdmnglb3s44zfhy6mqi1fwdgxn"; depends=[data_table mlr3 mlr3misc paradox R6]; }; + mlr3measures = derive2 { name="mlr3measures"; version="0.1.3"; sha256="1hvhpshmdd76136srndd60d5xijpil5daf392y9lalqq0if6903d"; depends=[checkmate]; }; + mlr3misc = derive2 { name="mlr3misc"; version="0.2.0"; sha256="0gynix0l0dzx6zjkw4fmb1rcyfp5vf4hvszf4ny2aqv3pggb03a8"; depends=[backports checkmate data_table R6]; }; + mlr3pipelines = derive2 { name="mlr3pipelines"; version="0.1.3"; sha256="0qkhd4gcfh3higz0zqgrblxj70pszg8xb6l5flwp08hlwj1cw44j"; depends=[backports checkmate data_table digest mlr3 mlr3misc paradox R6 withr]; }; + mlr3proba = derive2 { name="mlr3proba"; version="0.1.5"; sha256="1vnykzqbd27qaknxkcji17ld81z24hxwiw9d04m68vb8v62fkrag"; depends=[checkmate data_table distr6 mlr3 mlr3misc mlr3pipelines paradox R6 survival]; }; + mlr3shiny = derive2 { name="mlr3shiny"; version="0.1.1"; sha256="0jn5n6k1dq59g5m6pvpp964pcjv1mjbdbdz7dag7gs26g8c215jb"; depends=[data_table DT e1071 mlr3 mlr3learners mlr3measures plyr purrr ranger readxl shiny shinyalert shinydashboard shinyjs shinythemes shinyWidgets stringr]; }; + mlr3tuning = derive2 { name="mlr3tuning"; version="0.1.2"; sha256="0559jj4xbzg63df2rn0sw6r6fz5b463k2lcx83l4q3mki72pl9xx"; depends=[checkmate data_table lgr mlr3 mlr3misc paradox R6]; }; mlr3verse = derive2 { name="mlr3verse"; version="0.1.1"; sha256="1spwmylnsks479nkj688nd8h3slkh8cnmrxrvh7s2zyqla6arigx"; depends=[mlr3 mlr3db mlr3filters mlr3learners mlr3misc mlr3pipelines mlr3tuning mlr3viz paradox]; }; - mlr3viz = derive2 { name="mlr3viz"; version="0.1.0"; sha256="1c28hrpp3majw781jaayjhg9rwr52r0v00dfv78jy6rgaps9r37h"; depends=[checkmate data_table ggplot2 mlr3misc]; }; - mlrCPO = derive2 { name="mlrCPO"; version="0.3.4-4"; sha256="0v8d336f7xghs2pdh6r5j21i6mcy0p2wdzx4nkj69fsc5gn0n058"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; }; - mlrMBO = derive2 { name="mlrMBO"; version="1.1.3"; sha256="1y67kc8kcbim23kkymkn10h761r5pyq80cfzz6a7f0rnmagzvqxp"; depends=[backports BBmisc checkmate data_table lhs mlr parallelMap ParamHelpers smoof]; }; + mlr3viz = derive2 { name="mlr3viz"; version="0.1.1"; sha256="0k5a0h2jhk375hl4hwn1dxapjnm2hxhayw8rfh1i1p3qvswhgwla"; depends=[checkmate data_table ggplot2 mlr3misc]; }; + mlrCPO = derive2 { name="mlrCPO"; version="0.3.6"; sha256="1z9s52y318wp43q7n28h89m5s58bcfawzj9zx03ji1adf68sk9ah"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; }; + mlrMBO = derive2 { name="mlrMBO"; version="1.1.4"; sha256="007944cb6hz7rah0bk66mpfa22jinz9i224wljgnj0w51lpipbjv"; depends=[backports BBmisc checkmate data_table lhs mlr parallelMap ParamHelpers smoof]; }; mlsjunkgen = derive2 { name="mlsjunkgen"; version="0.1.1"; sha256="109ag52x4y3rzx8yccilrnl24mz4ximzx6v4lrbak7dpiclqrw7a"; depends=[]; }; - mlt = derive2 { name="mlt"; version="1.1-1"; sha256="0n2avjmi53y69wf0cz6v1n358n9vaf6shlf3vcppy2c2zny5l8rn"; depends=[alabama basefun BB coneproj nloptr numDeriv sandwich survival variables]; }; - mlt_docreg = derive2 { name="mlt.docreg"; version="1.0-4"; sha256="07x3qnfrlb3m71jyd0rqa3svdplcia3zis1qmcwm1c936p7nvjg4"; depends=[mlt numDeriv]; }; + mlt = derive2 { name="mlt"; version="1.1-2"; sha256="0dxfyq9wf49sy57gjvp2v6wp50wbiracvfsd4mbrgz4k36h3w5ra"; depends=[alabama basefun BB coneproj nloptr numDeriv sandwich survival variables]; }; + mlt_docreg = derive2 { name="mlt.docreg"; version="1.0-5"; sha256="1dp5h86bcga9lkc1hy5sbc3as0piyzxlz6z5iwli2a33ssyihxql"; depends=[mlt numDeriv]; }; mltest = derive2 { name="mltest"; version="1.0.1"; sha256="14gyssfph088v936mpywmd4y8z9vdv0zk8638vlg23j8cf5j4al2"; depends=[]; }; mltools = derive2 { name="mltools"; version="0.3.5"; sha256="045v28w7vz1zjxim8vfc6ncvg2mavr1q332x0hzlqpfzrk7gz4vh"; depends=[data_table Matrix]; }; mlxR = derive2 { name="mlxR"; version="4.1.0"; sha256="1jb214isf0zbx1j7xkidmc4jrvlw3hfvs7q2if3489p0si1n2k23"; depends=[ggplot2]; }; - mma = derive2 { name="mma"; version="9.0-0"; sha256="1nam7gn3a7jp4dcy9q6ypk7icknflvgmsdzv218qhf28zaw2ybza"; depends=[car doParallel foreach gbm gplots lattice plotrix survival]; }; + mma = derive2 { name="mma"; version="10.2-2"; sha256="021nc865rdis0m939y8qvk9nnhp9lmfn4rlqhvfxfc4774sphmll"; depends=[car gbm gplots lattice plotrix survival]; }; mmabig = derive2 { name="mmabig"; version="2.0-0"; sha256="1kp7q2xvkbwa8syk82dsynzizjmhh9z3p7r5hnnvp169as0yvgwl"; depends=[car glmnet gplots mma survival]; }; - mmand = derive2 { name="mmand"; version="1.5.4"; sha256="04kqxdbj54nflgx9lb80xxp121ligdzjkym850z3kbw60ashxybh"; depends=[Rcpp]; }; + mmand = derive2 { name="mmand"; version="1.6.1"; sha256="19s6v083iry95akhc2ccj617sjcddalb6dp87j3lqjlgybxws62q"; depends=[Rcpp]; }; mmap = derive2 { name="mmap"; version="0.6-19"; sha256="0s3vlwdcwifl2a2byr0f2cc4vmbdparc55x889a3h115ga7k91w2"; depends=[]; }; mmapcharr = derive2 { name="mmapcharr"; version="0.3.0"; sha256="175qb6ay6zlcdcxzc86lmlddfzjc8j8i1b8cvi2q0j6nbl2kl50r"; depends=[Rcpp rmio]; }; mmc = derive2 { name="mmc"; version="0.0.3"; sha256="03nhfhiiadga8mcp33kj20g33v9n5i62fdqgi20h5p80g849k719"; depends=[MASS survival]; }; - mmcm = derive2 { name="mmcm"; version="1.2-7"; sha256="11dgb8crz5pjpx66cxxzn4lg58jbaxxhfqlcw3hdp9wpvyqjh3sb"; depends=[mvtnorm OpenMPController]; }; - mmds = derive2 { name="mmds"; version="1.1"; sha256="0f5qzkfhi7vg8vsd8r41idmbwrrgc7qzfnp81adms2yzrza17wrw"; depends=[]; }; + mmcm = derive2 { name="mmcm"; version="1.2-8"; sha256="09xcvgzgg5x890jibmmbcd3rr8q8vmwxwk6s8zgn9a8hfdwqny9a"; depends=[mvtnorm]; }; mme = derive2 { name="mme"; version="0.1-6"; sha256="1k60y1yrf7fv939v32kf3il7r3cws0kih4bpm0ap28fvbx3vr3yb"; depends=[MASS Matrix]; }; mmeln = derive2 { name="mmeln"; version="1.4"; sha256="0q5w3ajc1v798dyvryny2a0c52hzhxrjm4md08mqvww65pdzhqc4"; depends=[]; }; mmeta = derive2 { name="mmeta"; version="2.3"; sha256="0hyxpph2hfjwiy95r0n3h64aab5ziqp2a8gmmpp6nyc77h638czb"; depends=[aod]; }; @@ -10371,21 +10511,23 @@ in with self; { mmm2 = derive2 { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; }; mmmgee = derive2 { name="mmmgee"; version="1.20"; sha256="0y3pwnc9h7y2l9cvgfl62nl1vnnkla2y8082jhdvxsb3mk88rgad"; depends=[Matrix mvtnorm]; }; mmod = derive2 { name="mmod"; version="1.3.3"; sha256="1dz6887mlqbagjj98wcabmxj9hvsz8pgsizy1fqkwjhhs44c62y4"; depends=[adegenet pegas]; }; - mmpca = derive2 { name="mmpca"; version="1.0.2"; sha256="0km129g98bbzi48akqad97nxss5qkxpsx77hpmam4nsbfj4idn6f"; depends=[CMF digest gsl Rcpp RcppEigen]; }; + mmpca = derive2 { name="mmpca"; version="2.0.1"; sha256="05vir7hjv5dccfcizyn5n6qxx2p53111if16l44a7ifg5k599xj9"; depends=[digest gsl Rcpp RcppEigen]; }; mmpf = derive2 { name="mmpf"; version="0.0.5"; sha256="1w1ll1l7yzwb1wmlrcfpgqyzni7yb20kxy422y867hx2ndxlfwpz"; depends=[checkmate data_table]; }; mmpp = derive2 { name="mmpp"; version="0.6"; sha256="16aypjf4i0ya3qgxqrrg8y0xbnq1pnqky1dpkgln5q494hphyg91"; depends=[]; }; mmppr = derive2 { name="mmppr"; version="0.1"; sha256="0fswkqcw0xkqd9gmqabb61i32zscp5jzfx0z43wq7mrlwynryylv"; depends=[expm reshape2]; }; mmsample = derive2 { name="mmsample"; version="0.1"; sha256="0mdd2zryadd31a5pls5fvlxx52mr54jsi1i6mwrs4y7rl3i9v95z"; depends=[MASS Rcpp RcppArmadillo]; }; - mmtfa = derive2 { name="mmtfa"; version="0.3"; sha256="0qfszr6f10v27w1pfns78dyarznqryl4m1ppyqap7l8fc12sliky"; depends=[matrixStats mvnfast]; }; mmtsne = derive2 { name="mmtsne"; version="0.1.0"; sha256="1by0hrggla6idc1isnq072i1wfpw4x7id3hkg8l65gy8iycccd12"; depends=[]; }; mnis = derive2 { name="mnis"; version="0.2.7"; sha256="1yhhgrhsk3ww93vd29ipw16bkn16w0b2i7d46cb5bb5xs4s7vivd"; depends=[dplyr httr jsonlite Rcpp stringi tibble]; }; mniw = derive2 { name="mniw"; version="1.0"; sha256="1iamq6cq027ncakm4rfx2p1k2mcj7nk5vk57m8ndnbmmi2y9wwv9"; depends=[Rcpp RcppEigen]; }; mnj = derive2 { name="mnj"; version="1.0"; sha256="05rz6krcq56zqvvaz3myf1aki2z635g2zrqyl25n2da1cvyjwdzq"; depends=[rpart]; }; mnlfa = derive2 { name="mnlfa"; version="0.1-53"; sha256="1hw4m6zpb2322041aizam1l71zxz3i7siawid8npig8v9dhkaqrf"; depends=[CDM Rcpp RcppArmadillo]; }; mnlogit = derive2 { name="mnlogit"; version="1.2.6"; sha256="0dfwpkl8g7ap5xr48smiv8vdbamd2r1liy9nwpsn0kcsr9cj65n9"; depends=[Formula lmtest mlogit]; }; + mnonr = derive2 { name="mnonr"; version="1.0.0"; sha256="143qkn3bx37a6r7kgmspqh55l2r8k9f93jgxr6qpg51w411k5ilb"; depends=[]; }; mnormpow = derive2 { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; }; - mnormt = derive2 { name="mnormt"; version="1.5-5"; sha256="1b34xxrnf35khsx82mhvmk96sgfr2flyasaah7qkb2976pwxay7z"; depends=[]; }; + mnormt = derive2 { name="mnormt"; version="1.5-6"; sha256="0k8y08gj6z525yvc7y3dl2kzgnafbj3i7lvpamypsmqxf74zql99"; depends=[]; }; mnreadR = derive2 { name="mnreadR"; version="2.1.4"; sha256="11mfpf12pjpgvcih6q8l9fwspj2gy78fcirimzv7gn061nr4v7sg"; depends=[dplyr ggplot2 nlme tibble tidyr]; }; + mnt = derive2 { name="mnt"; version="1.0"; sha256="1an80q0gv65fd9av9kd5lic6z0g3w3ai2v8asgcvfqrdd87f3piw"; depends=[MASS pracma]; }; + mob = derive2 { name="mob"; version="0.1.0"; sha256="0zxp02fl514wb3apcyg072wdydqbnbfqkjj9gq5ql1kkvgh9wqf8"; depends=[gbm Hmisc Rborist]; }; mobForest = derive2 { name="mobForest"; version="1.3.1"; sha256="1g5yfs70abl7pacprijlwdq3l72aqkbqs09z1pmw64wv4wa1vm25"; depends=[modeltools party sandwich strucchange zoo]; }; mobsim = derive2 { name="mobsim"; version="0.1.0"; sha256="077hw1162giwc90y5dvj9052i5hxdf2ii29m9q8ky028375dsd0f"; depends=[Rcpp sads vegan]; }; moc = derive2 { name="moc"; version="2.0"; sha256="0fgp8dg9qf7aw1qawmszlxs4bcccqmd87y4kkzdqggm807c2k5gh"; depends=[]; }; @@ -10403,43 +10545,43 @@ in with self; { modeLLtest = derive2 { name="modeLLtest"; version="1.0.0"; sha256="1f80bgw1l6zgwlhz1agdrl5d44jfrk50yi3jgwf14l4zjx8x8rp3"; depends=[coxrobust MASS quantreg Rcpp RcppArmadillo survival]; }; modeest = derive2 { name="modeest"; version="2.4.0"; sha256="087dw0013y4m7fcl06mxylh9lnp6acysl80d80r9srv4pw4r950s"; depends=[fBasics stable stabledist statip]; }; modehunt = derive2 { name="modehunt"; version="1.0.7"; sha256="0qz9kmf1qfs2dr7kzm9l7ac0h5rvi3b9j9896p991sk4bcalsl0b"; depends=[]; }; - modelDown = derive2 { name="modelDown"; version="1.0.1"; sha256="0rdpma8g461a17n6qsdvjb9s5nnhap1n05mavjy8cpj7d8j7ikkv"; depends=[archivist auditor breakDown DALEX devtools drifter DT ggplot2 kableExtra psych svglite whisker]; }; + model4you = derive2 { name="model4you"; version="0.9-5"; sha256="1l94196x594ff61f8iaywpmw9ra3g27bnlchjl14hb9h0l21vbgm"; depends=[Formula ggplot2 gridExtra partykit sandwich survival]; }; + modelDown = derive2 { name="modelDown"; version="1.1"; sha256="1l0aggkh0ykpqrp59bdz1cyl1ai397cw4hya80b7fm7s49imwczg"; depends=[archivist auditor breakDown DALEX devtools drifter DT ggplot2 kableExtra psych svglite whisker]; }; modelObj = derive2 { name="modelObj"; version="4.0"; sha256="1py2y80x37mmnl2y0pxdbhqkjrln6x210hg0g224d34lxk71m172"; depends=[]; }; - modelStudio = derive2 { name="modelStudio"; version="0.2.1"; sha256="0fxrfd9ylgy39ivrvcg3gfvfbwbxwwrjx0bvgzibmvb6p8fg68qr"; depends=[iBreakDown ingredients jsonlite r2d3]; }; - modelbased = derive2 { name="modelbased"; version="0.1.1"; sha256="08ck275nfvskrnvlixclyz994bagwlc1gcca0qnh3x9mq9xcspiy"; depends=[bayestestR emmeans insight parameters]; }; + modelStudio = derive2 { name="modelStudio"; version="1.0.2"; sha256="0n3hghhw255nfcfrngbbcldvfy96cc13qlim6palmaln4zqhxsi0"; depends=[digest iBreakDown ingredients jsonlite progress r2d3]; }; + modelbased = derive2 { name="modelbased"; version="0.1.2"; sha256="0440pckpw9vfbvvhxsikayb0b6k479icr2m9ps0yr0xph240x9hw"; depends=[bayestestR emmeans insight parameters]; }; modeldata = derive2 { name="modeldata"; version="0.0.1"; sha256="0dzjgb5g60hgqppxvzin8m51clkw8d89if7dw5ha46j2paw1n5r9"; depends=[]; }; - modeldb = derive2 { name="modeldb"; version="0.2.0"; sha256="1qcgmv31gd1x0mzxq4lcarmswsr75qgq5zpfcwchxzrz97ncbwgd"; depends=[dplyr ggplot2 progress purrr rlang tibble tidypredict]; }; + modeldb = derive2 { name="modeldb"; version="0.2.2"; sha256="14s8xh05qxv414xcnww1b3s0jqwnjb3l1dqf7q1qbw33ilwcmsfb"; depends=[dplyr ggplot2 progress purrr rlang tibble tidypredict]; }; modelfree = derive2 { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; }; modelgrid = derive2 { name="modelgrid"; version="1.1.1.0"; sha256="1z6g0akczry7vldkk6anfq572zbsfzbd6qnyllgjpbxhy3rrrq0r"; depends=[caret dplyr ggplot2 lattice magrittr purrr]; }; modelplotr = derive2 { name="modelplotr"; version="1.0.0"; sha256="1b1pcah28b2fsr5l7v3lwxgvl03jr2cyxk5x5plnc3vwy5g0bnpm"; depends=[dplyr ggfittext ggplot2 gridExtra magrittr RColorBrewer rlang scales]; }; - modelr = derive2 { name="modelr"; version="0.1.5"; sha256="0nnfhlzz75ihs8azy963cc4cwg1kx81rybk4z3wm98bbghwfxfs5"; depends=[broom dplyr magrittr purrr rlang tibble tidyr]; }; - modelsummary = derive2 { name="modelsummary"; version="0.1.0"; sha256="1g6yc89q267zjplqpwiy6wwvdswyhr6lhg2sldm8zhmbm81jcvks"; depends=[broom checkmate dplyr generics magrittr purrr stringr tibble tidyr]; }; - modeltools = derive2 { name="modeltools"; version="0.2-22"; sha256="1s9lmkac3rl0nknf4wizfhg7ryq7c8yvvyc4z619238br27hhsi5"; depends=[]; }; + modelr = derive2 { name="modelr"; version="0.1.6"; sha256="1x2m34m4qirb401krmgc5wg3g7ndbcglfab2l0655rmky3fz7rfp"; depends=[broom dplyr magrittr purrr rlang tibble tidyr tidyselect]; }; + modelsummary = derive2 { name="modelsummary"; version="0.2.0"; sha256="16z9cdjdg8inp21sq54sc0s30w09draznq8x2zyg5cmsilrbn9p7"; depends=[broom checkmate dplyr generics gt magrittr purrr stringr tibble tidyr]; }; + modeltests = derive2 { name="modeltests"; version="0.1.1"; sha256="0s6bnc2q0qxa3v92bsz5xczi4f9nhqz78vzb5jldjwlm4lwwy0xf"; depends=[dplyr generics purrr testthat tibble]; }; + modeltools = derive2 { name="modeltools"; version="0.2-23"; sha256="1vqh69256h344sbj5affm0kmc77dakrxp6442xfdnfd0y5d8sgkb"; depends=[]; }; modelwordcloud = derive2 { name="modelwordcloud"; version="0.1"; sha256="0ardib0h923i7jk8bgcq6pn2zazx9acf9sdggifsk46hdz8hvqnm"; depends=[]; }; moderndive = derive2 { name="moderndive"; version="0.4.0"; sha256="16fbr80v0f5v6is19d5zh9s2qgqw2cb5q71lna7lp0hi22xljl98"; depends=[broom dplyr formula_tools ggplot2 glue infer janitor knitr magrittr rlang stringr tibble]; }; - modes = derive2 { name="modes"; version="0.7.0"; sha256="185qjrmz2sj0l5931g4d3kx3jpgjn4rf4lln84h6g97prk1ykqmj"; depends=[]; }; modest = derive2 { name="modest"; version="0.3-1"; sha256="07rs014hdcabp2n0gg14pz2gmqgbw38vjv7a80vkzzh3601hxqws"; depends=[knitr rhandsontable shiny shinyBS]; }; modesto = derive2 { name="modesto"; version="0.1.2"; sha256="0vmdj8wcy0vv9jaihxrj0m5sr7favz18ngfqc8pd8rd4ipcnxkjf"; depends=[markovchain]; }; modi = derive2 { name="modi"; version="0.1.0"; sha256="0v78vzb22v2h2qlfhsyi0d2j3c2gj3wgv67p6gv74269kiaglf92"; depends=[MASS norm]; }; - modifiedmk = derive2 { name="modifiedmk"; version="1.4.0"; sha256="0dcriw45qmh1r05kf7v6r6q1qz58zfyfi8diskzvj7zclicg59md"; depends=[boot]; }; + modifiedmk = derive2 { name="modifiedmk"; version="1.5.0"; sha256="171l3ls7icaanqf6jb64jabwq0mis2g1fswr0jfkpkrw5iw1c66q"; depends=[boot]; }; modiscloud = derive2 { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; }; - modmarg = derive2 { name="modmarg"; version="0.9.2"; sha256="1clyfvn5k87nyh5cj4b0yi2zkavwvnirhlirxkzi8m2qijdl9vgh"; depends=[]; }; modopt_matlab = derive2 { name="modopt.matlab"; version="1.0-2"; sha256="0g5mswalv4y7p1k3n8a6qf7wb072m4bjq2ml2j83dz2j2bmvygsd"; depends=[ROI ROI_plugin_glpk ROI_plugin_quadprog]; }; moduleColor = derive2 { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut impute]; }; modules = derive2 { name="modules"; version="0.8.0"; sha256="1xzlnnl4ka9h4qwq4gg65pzhacq9ip6v347yrhms14c86a851k8k"; depends=[]; }; modygliani = derive2 { name="modygliani"; version="1.0"; sha256="01g96cdm4hgbsh6xsdfjg7vp7zb138sxwgv0msrlm27a6p4fcnlx"; depends=[]; }; moezipfR = derive2 { name="moezipfR"; version="1.0.2"; sha256="0sfl1c7cvm1milcglcvz9lyvgricsdm7shx0jxyn50y7xz0padww"; depends=[tolerance VGAM]; }; mogavs = derive2 { name="mogavs"; version="1.1.0"; sha256="0lhmwdv991bv7j8k066jr7ii94w60ydjpf5pzmv8jlblf3w2pr02"; depends=[cvTools]; }; - mokken = derive2 { name="mokken"; version="2.8.11"; sha256="1dypdf5gdz0hr3izafzfknyqx2vbr1z77c4c7vqdygv2wzhwy5i1"; depends=[poLCA]; }; - moko = derive2 { name="moko"; version="1.0.1"; sha256="1d1gyv44z8k196hfh8a9iccmlrwb42bj1xzabs07h306gpi9m73d"; depends=[DiceKriging DiceOptim emoa GenSA GPareto mco]; }; - molaR = derive2 { name="molaR"; version="4.4"; sha256="0prd2avg3aj4y8zi7yd2sgcary8igqxrjcp0igail84kpnal53zq"; depends=[alphahull rgl Rvcg]; }; + moko = derive2 { name="moko"; version="1.0.2"; sha256="16hcr570h73ljgfb14pcli358m5vy022bqx1davn26z21n3ls44y"; depends=[DiceKriging DiceOptim emoa GenSA GPareto mco]; }; + molaR = derive2 { name="molaR"; version="4.5"; sha256="1mfb05cfg0jh60yxnmwhja6m38185r58kbz2ak0ikgaqd9lls07s"; depends=[alphahull rgl Rvcg]; }; mombf = derive2 { name="mombf"; version="2.2.9"; sha256="0z7crgvl1c15s0pn6isa9i4phfsbhl6msc1jdbk88ckh09ilx0z7"; depends=[mclust mgcv mvtnorm ncvreg Rcpp RcppArmadillo survival]; }; momentchi2 = derive2 { name="momentchi2"; version="0.1.5"; sha256="1fv0jmwws4mkl9dsaybfpj29ncvqx2idsijgwz2qjblcg309a6k9"; depends=[]; }; + momentfit = derive2 { name="momentfit"; version="0.1-0"; sha256="0f9303plxg5f58s2ypyzly5sghk535cfm078sigj0c9izam3nhmc"; depends=[sandwich]; }; moments = derive2 { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; }; - momentuHMM = derive2 { name="momentuHMM"; version="1.5.0"; sha256="0qbl6vl9s30z3qh7c7g9ml7dr0rjicpw0m6wbjsan3isqj3aa6p6"; depends=[argosfilter Brobdingnag car CircStats conicfit crawl data_tree doParallel doRNG dplyr extraDistr foreach geosphere ggmap ggplot2 lubridate magrittr MASS mitools moveHMM mvtnorm nleqslv numDeriv prodlim qdapRegex raster Rcpp RcppArmadillo rlang scatterplot3d sp survival]; }; + momentuHMM = derive2 { name="momentuHMM"; version="1.5.1"; sha256="01s0nv37w7nzg4jpm94sxi2m9kxlswcr00l1fm1y1c6x1asx4hpq"; depends=[argosfilter Brobdingnag car CircStats conicfit crawl data_tree doParallel doRNG dplyr extraDistr foreach geosphere ggmap ggplot2 lubridate magrittr MASS mitools moveHMM mvtnorm nleqslv numDeriv prodlim qdapRegex raster Rcpp RcppArmadillo rlang scatterplot3d sp survival]; }; momr = derive2 { name="momr"; version="1.1"; sha256="091vzaw8dm29q89lg2iys25rbg2aslgdn9sk06x038nngxdrn95r"; depends=[gplots Hmisc nortest]; }; mondate = derive2 { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; }; - mongolite = derive2 { name="mongolite"; version="2.1.0"; sha256="0w9szs80a6isff6f2mwhh0wcigssf80v3njvisfczcj3cbwdqxnr"; depends=[jsonlite mime openssl]; }; + mongolite = derive2 { name="mongolite"; version="2.2.0"; sha256="1q9vj5jhvwvzjjcaanyj6zhmplyk7rmibp4hvyabp9lpig2clnsm"; depends=[jsonlite mime openssl]; }; monitoR = derive2 { name="monitoR"; version="1.0.7"; sha256="1h1g0m1j13mz37xxwck4s7a0bfqvi0nrzfw60j7bkzaah8zxcc9n"; depends=[tuneR]; }; monkeylearn = derive2 { name="monkeylearn"; version="0.2.0"; sha256="18lpfs64h0hy4vkdjlnmxwgagvf54kn8a1c866vv00ckyp85fvn2"; depends=[cowsay digest dplyr httr jsonlite magrittr purrr ratelimitr tibble tidyr]; }; monmlp = derive2 { name="monmlp"; version="1.1.5"; sha256="19cx60csm8mnf6ksg64vlhi8wi1c7bmv9l55y9zmaljblr0kmzxf"; depends=[optimx]; }; @@ -10456,12 +10598,11 @@ in with self; { morse = derive2 { name="morse"; version="3.2.5"; sha256="1y3daw8ccn0n61kj6lj6m3m4pfj936k786d385lyq05211rkdgqr"; depends=[coda deSolve dplyr epitools ggplot2 gridExtra magrittr reshape2 rjags tibble tidyr zoo]; }; mortAAR = derive2 { name="mortAAR"; version="1.0.2"; sha256="047xagjmqj6sla0zlz0ljdivggkv04i45yn7637a33ni1pmb83al"; depends=[magrittr Rdpack reshape2]; }; mortyr = derive2 { name="mortyr"; version="0.0.1"; sha256="1mpgb9rcknghwm9xsn3d8s6fy4j319sinb6l76s8aq06n4f3hr7g"; depends=[httr jsonlite tibble]; }; - mosaic = derive2 { name="mosaic"; version="1.5.0"; sha256="1j3dq8y2zpr3cad5pgbd3qm9ls17z0s6f9qqp5ddh110wf5kz0h4"; depends=[broom dplyr ggdendro ggformula ggplot2 ggrepel glue gridExtra lattice latticeExtra lazyeval leaflet MASS Matrix mosaicCore mosaicData readr tidyr]; }; - mosaicCalc = derive2 { name="mosaicCalc"; version="0.5.0"; sha256="05s14rmgi15xcz50hcz7l26l95yx9g4i3kihzh0laz8bpi443i39"; depends=[MASS mosaic mosaicCore]; }; + mosaic = derive2 { name="mosaic"; version="1.6.0"; sha256="07964r7mjq050ddm0n5j20zgx08qfhwxazkxlm63scwpkx3kskj9"; depends=[broom dplyr ggdendro ggformula ggplot2 ggrepel glue gridExtra lattice latticeExtra leaflet MASS Matrix mosaicCore mosaicData readr rlang tidyr]; }; mosaicCore = derive2 { name="mosaicCore"; version="0.6.0"; sha256="1klw97h6lchw1cpcl8s637ikcl428cckmjq0czi7mibh9q9mw72z"; depends=[dplyr lazyeval MASS rlang tidyr]; }; mosaicData = derive2 { name="mosaicData"; version="0.17.0"; sha256="04z0mdm52mykqsxsinhmsihn181zf6cw321gayk2rjp7lj7mwdq9"; depends=[]; }; mosaicModel = derive2 { name="mosaicModel"; version="0.3.0"; sha256="1gx4rzh0h922gyb50vz6q5vqqp5ry5hf2mq95948q2gcady91k5w"; depends=[caret dplyr ggformula ggplot2 knitr lazyeval MASS mosaicCore testthat tibble tidyr tidyverse]; }; - mosmafs = derive2 { name="mosmafs"; version="0.1.0"; sha256="1i12w3k9wcr7n28z8wwrrajclalfiwiavlf6i5whbn4z5wpnmh4l"; depends=[BBmisc checkmate ecr MASS mlr mlrCPO parallelMap ParamHelpers smoof]; }; + mosmafs = derive2 { name="mosmafs"; version="0.1.2"; sha256="04syr5qr91hyv1m5hfrjsriq0qgidaln06m7f3jgc1qyrni930rw"; depends=[BBmisc checkmate ecr MASS mlr mlrCPO parallelMap ParamHelpers smoof]; }; mosum = derive2 { name="mosum"; version="1.2.3"; sha256="1xrrx0gaby5gbqssvhwracm8wny31lqzd64hkmr81s41z8srkxx9"; depends=[plot3D RColorBrewer Rcpp]; }; motmot = derive2 { name="motmot"; version="2.1.3"; sha256="09qsyc4ifdl316kjqqkarmflpjcd0ivkhx5fzi3502anj6dxpjnq"; depends=[ape caper coda ks mvtnorm Rcpp]; }; motoRneuron = derive2 { name="motoRneuron"; version="1.0.0"; sha256="1hdsf4c1v5hfaqpi5y1v60zqq5fdmlqdvzpsq77diclp9vzdshja"; depends=[dygraphs ggplot2]; }; @@ -10470,25 +10611,26 @@ in with self; { mousetrack = derive2 { name="mousetrack"; version="1.0.0"; sha256="0lf0xh0c3xl27nh5w8wwyrm2jfzfajm2f73xjdgf746dp365qc8n"; depends=[pracma]; }; mousetrap = derive2 { name="mousetrap"; version="3.1.4"; sha256="1iizlcq6ak9hfqwaz8d0zmijfnw2v7fwgksxng9mxiqiva98is8a"; depends=[cstab diptest dplyr fastcluster fields ggplot2 magrittr pracma psych RColorBrewer Rcpp scales tidyr]; }; movMF = derive2 { name="movMF"; version="0.2-4"; sha256="0j5gp1l374479lsijw1hz00pxs09zzh7hapljv80lsvr24vfscpa"; depends=[clue skmeans slam]; }; - move = derive2 { name="move"; version="3.2.2"; sha256="14wmiyk52iar90kbzi6ksl75i0kg2nmsq08sms9rr2wgswr9f7km"; depends=[geosphere httr memoise raster Rcpp rgdal sp xml2]; }; + move = derive2 { name="move"; version="3.3.0"; sha256="03i3qin4yjg7dvk78r4hgb5v3pqs4mgq9i88q63ma1fd0qs2fx9r"; depends=[geosphere httr memoise raster Rcpp rgdal sp xml2]; }; moveHMM = derive2 { name="moveHMM"; version="1.7"; sha256="031msh427hgjyr37imalr7smd79yqscw9xq5rjrixxc2w5qly9jj"; depends=[boot CircStats geosphere ggmap ggplot2 MASS numDeriv Rcpp RcppArmadillo sp]; }; - moveVis = derive2 { name="moveVis"; version="0.10.3"; sha256="1sphh8v16k0qis1ajc81sg0lb3dca7mf0wz4khlxra8sg6cj4gk2"; depends=[av cowplot curl dplyr geosphere ggplot2 gifski lubridate magick magrittr move pbapply plyr raster RStoolbox sf slippymath sp zoo]; }; + moveVis = derive2 { name="moveVis"; version="0.10.5"; sha256="1lj22yr6v3vg795r72gkbhyabycppxbjsaldqiqgckhkdfh3lziw"; depends=[av cowplot curl ggplot2 gifski lubridate lwgeom magick magrittr move pbapply raster sf slippymath]; }; moveWindSpeed = derive2 { name="moveWindSpeed"; version="0.2.3"; sha256="14a2iymn4j831xlh42z5qxmhnh7xpp5bxasgpkhnb3v0b5ldyilh"; depends=[move Rcpp]; }; movecost = derive2 { name="movecost"; version="0.3"; sha256="0lrnk09sdbamxc4xhrkgggjcim1xhbsnq13f3ysadn7d1rjazl9i"; depends=[gdistance raster rgdal rgeos sp]; }; mozzie = derive2 { name="mozzie"; version="0.1.0"; sha256="09dwrv4r0hi19gzi1vpif3q4wlbny9h22430g1hhv0wkqs86mhmw"; depends=[]; }; mp = derive2 { name="mp"; version="0.4.1"; sha256="0awvwqwb25q47j14b450k1k5mh2yzwhn7gizjv5j7lyiamk30iwq"; depends=[Rcpp RcppArmadillo]; }; + mpMap2 = derive2 { name="mpMap2"; version="1.0.3"; sha256="0fa89sbqd22h4px9lizmsl7f5xmd1g56i6n1x0x418qvlmgrnn6j"; depends=[car fastcluster ggplot2 igraph jsonlite Matrix nnls progress pryr qtl RColorBrewer Rcpp sn]; }; mpa = derive2 { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; }; - mpath = derive2 { name="mpath"; version="0.3-21"; sha256="0sgfzpyzl2494d9nj09qs1dszpzsv9wwf79wj9aypjm8sndl18yj"; depends=[bst doParallel foreach MASS numDeriv pscl]; }; + mpath = derive2 { name="mpath"; version="0.3-25"; sha256="1s1n0d681vlgdil9yqm7c5hh62k5mljgzga9475m40ajam1gfcik"; depends=[bst doParallel foreach MASS numDeriv pscl]; }; mpbart = derive2 { name="mpbart"; version="0.2"; sha256="1145n0lxmm0kjm2lc358d79hqws48crj17pjvmchl1pbfd7zi4r8"; depends=[bayesm cvTools mlbench mlogit]; }; mpcmp = derive2 { name="mpcmp"; version="0.1.3"; sha256="11j12ns04g2xdw5r34x86bacwacf3618rzpqz8wvfs1l192l001c"; depends=[]; }; mpcv = derive2 { name="mpcv"; version="1.1"; sha256="0vwycspiw9saj811f6alkbijivy7szpahf35bxn2rpn2bdhbn21i"; depends=[lpSolve]; }; mpe = derive2 { name="mpe"; version="1.0"; sha256="17bgdbg1zrf78djd3mwycidwibxvsis7pwkrcynvghcc8l2zfci9"; depends=[mvtnorm]; }; - mplot = derive2 { name="mplot"; version="1.0.3"; sha256="0mjxfk9j83d4ldj62clf71ygxqhc48mdszggnh2mf30waiqnlcbc"; depends=[bestglm doParallel doRNG dplyr foreach ggplot2 glmnet googleVis leaps plyr reshape2 scales shiny shinydashboard tidyr]; }; + mplot = derive2 { name="mplot"; version="1.0.4"; sha256="1f3llh1599q8259la02nvdigrs4p4j1l4qsp5bxi19my6gff0l10"; depends=[bestglm doParallel doRNG dplyr foreach ggplot2 glmnet googleVis leaps plyr reshape2 scales shiny shinydashboard tidyr]; }; mpm = derive2 { name="mpm"; version="1.0-22"; sha256="0wijw8v0wmbfrda5564cmnp788qmlkk21yn5cp5qk8aprm9l1fnk"; depends=[KernSmooth MASS]; }; mpmcorrelogram = derive2 { name="mpmcorrelogram"; version="0.1-4"; sha256="0gv9xswrfvndcjal0csab1w2cnl4rg8pznyxbz84b0qr95jg81ag"; depends=[vegan]; }; - mpmi = derive2 { name="mpmi"; version="0.43"; sha256="15nhh7lizx06mws6gibsvmv29mz1q9id5rqmdbzlk8h1050lcg20"; depends=[KernSmooth]; }; - mpoly = derive2 { name="mpoly"; version="1.1.0"; sha256="1ixidhgp6bfb31kwv7gfvra47zs2f9qa3pf00qrqxkn6zgjkbspd"; depends=[ggplot2 orthopolynom partitions plyr polynom stringr tidyr]; }; - mppR = derive2 { name="mppR"; version="1.2.0"; sha256="0ij1r4pihlm79mywacz5fmgd6nww9026mp9a3hamslpn68pflvpz"; depends=[ggplot2 igraph qtl]; }; + mpmi = derive2 { name="mpmi"; version="0.43.1"; sha256="1lz7928vz52hs8dad9rj34hnkv8y0yj4mfiydwkrqvsl8avwc4qk"; depends=[KernSmooth]; }; + mpoly = derive2 { name="mpoly"; version="1.1.1"; sha256="10is69ks22ka1cqw3xk0fvy4z3b2drm8lanqwj178qrzj7ipf7i0"; depends=[ggplot2 orthopolynom partitions plyr polynom stringi stringr tidyr]; }; + mppR = derive2 { name="mppR"; version="1.2.1"; sha256="0q4pyfwypicmx8lqkgjkmagh6kyr6iww8xa64fxv0ayf8pcbzrca"; depends=[ggplot2 igraph qtl]; }; mppa = derive2 { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrcnk3m8y58akapi66lj8xplcx4"; depends=[]; }; mpr = derive2 { name="mpr"; version="1.0.5"; sha256="132ahy05zrh2164bffiywgbarxvzkc30k79w7ph9ca8d9mpgj70b"; depends=[survival]; }; mpt = derive2 { name="mpt"; version="0.6-1"; sha256="13f48nflz6b3dk1d22ndfn22sdkz1rzhbh8c85lxk23qhfyc6fv6"; depends=[]; }; @@ -10499,30 +10641,33 @@ in with self; { mra = derive2 { name="mra"; version="2.16.11"; sha256="0268msdy4cs2ifpagmwiabi6aav54ckn214ai18aqv2h97hmixw0"; depends=[]; }; mratios = derive2 { name="mratios"; version="1.4.0"; sha256="0pjcwqx3zykpwyykwgqziwignd41sjm2s1blyjwc1lhymis4ldzq"; depends=[mvtnorm]; }; mrbayes = derive2 { name="mrbayes"; version="0.1.0"; sha256="0p0a1g6xv7g3scmn290ja4bicbdz5c9y6c4hfn4c7advd6ha6ang"; depends=[]; }; - mrbsizeR = derive2 { name="mrbsizeR"; version="1.2.1"; sha256="0kvzvbvw3ygx09bjil7wqw2345dzh1bkbaqdk4q5c1szk95rw93b"; depends=[fields maps Rcpp]; }; + mrbin = derive2 { name="mrbin"; version="1.3.0"; sha256="1wn80icmg1fcjrv739l47wcbx9l1p4zl0l0vphw5pmj4kd03x7sh"; depends=[]; }; + mrbsizeR = derive2 { name="mrbsizeR"; version="1.2.1.1"; sha256="0v06sd5sh7ghlr8lgrv6l4glmv7chj3951pw4ssxrly4hz2rh6i0"; depends=[fields maps Rcpp]; }; mrds = derive2 { name="mrds"; version="2.2.1"; sha256="1prhzyps4sckl24d4fpmkafiawx8c0xdwiixn9fa3i2cxv9ia6hd"; depends=[mgcv numDeriv optimx Rsolnp]; }; mreg = derive2 { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; }; mregions = derive2 { name="mregions"; version="0.1.6"; sha256="0ix77hqcllhcpldchlnvciiflm6ysylynnnqvczpf8vx7gwa3lrk"; depends=[data_table httr jsonlite rappdirs sp tibble wellknown xml2]; }; - mrfDepth = derive2 { name="mrfDepth"; version="1.0.11"; sha256="0x4z4agwbzlyzbkf6aj7y9061cm05dvhzpg05wc7k59xbq1ns1sv"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; }; - mrfse = derive2 { name="mrfse"; version="0.1"; sha256="156qy6g2s6cxyd1ijzn709jniml6308gdzvkzcks5q6s7gs9sl2m"; depends=[]; }; - mrgsolve = derive2 { name="mrgsolve"; version="0.10.0"; sha256="1z2i3sl5s6z1pk3fy324zfm9gpdzr1g4af2fhrwhsdk97l6580ij"; depends=[BH dplyr magrittr Rcpp RcppArmadillo rlang tibble tidyselect]; }; + mrf2d = derive2 { name="mrf2d"; version="0.2.0"; sha256="0h8v4iyz24pi2md6l5kcdnhksafjqr41xqrxxyly4nfx4fqz16s7"; depends=[dplyr ggplot2 Rcpp RcppArmadillo Rdpack reshape2]; }; + mrfDepth = derive2 { name="mrfDepth"; version="1.0.12"; sha256="14kc0rjrdgh1zyiibiq79gd1npdxydml6lcxyf4pwdzipaa1yrg4"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; }; + mrfse = derive2 { name="mrfse"; version="0.2"; sha256="1dx21m54jsprlngj20q1bgvbw1bbm0sm8i01xanj68bx796ng14j"; depends=[]; }; + mrgsolve = derive2 { name="mrgsolve"; version="0.10.1"; sha256="19l6xvqax8gk9gy6svdhap61hprd6h7gv046isqsy03cv65hbkhq"; depends=[BH dplyr glue lifecycle magrittr Rcpp RcppArmadillo rlang tibble tidyselect]; }; mri = derive2 { name="mri"; version="1.0.1"; sha256="1dssq556kid6c3djp0s6v853cranv2wjs2c9521l5ykg5g33hfmv"; depends=[]; }; - mritc = derive2 { name="mritc"; version="0.5-1"; sha256="12sfyw5b1lryczl92xvyvhl37qfx3ybg4y9awsl0b7f51zi0lzy3"; depends=[lattice misc3d oro_nifti]; }; + mritc = derive2 { name="mritc"; version="0.5-2"; sha256="07b1b2k1ka43ikj2mhwnazw3ig7w10bf759fimxpksvk5k6wanx2"; depends=[lattice misc3d oro_nifti]; }; mro = derive2 { name="mro"; version="0.1.1"; sha256="00gc2hd8q5hb2xrswclcqqw1gxl83zmpma6bhsggg3kppsw1dpjv"; depends=[MASS matrixcalc]; }; ms_sev = derive2 { name="ms.sev"; version="1.0.4"; sha256="1sr2rgiskgwjhwif70qj6ga8i8kg4bh342hff66b2a54rxrchmw5"; depends=[]; }; msBP = derive2 { name="msBP"; version="1.4"; sha256="17hsnfipb6mgwhbc9rxzx5azc57ravz7zfnbc8r73sn1b270ydpb"; depends=[]; }; msSurv = derive2 { name="msSurv"; version="1.2-2"; sha256="02qm3mq17d2yj5mbz6gapd3zfi1wmiad5hpyimcb39impk43n2hf"; depends=[class graph lattice]; }; msaFACE = derive2 { name="msaFACE"; version="0.1.0"; sha256="1lh8crz507nlddm946lmn73xbnsh4cs0kg238ysnsvxs726c83fs"; depends=[]; }; msaR = derive2 { name="msaR"; version="0.3.0"; sha256="0lj9yhsissr4rgavyhgdxi2nrkq2088darzraisx9jsirjr49jf8"; depends=[ape htmlwidgets]; }; + msae = derive2 { name="msae"; version="0.1.1"; sha256="00snnml0vg0zx8cngc9ghma4y6fm8a20lmlf7f7bb2cgffa7q0ip"; depends=[magic]; }; msaenet = derive2 { name="msaenet"; version="3.1"; sha256="067p97z54dwhxy0w4ihi8dddcbvglh8ssynbh29fl9jyxfwjr1ms"; depends=[foreach glmnet Matrix mvtnorm ncvreg survival]; }; msap = derive2 { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; }; mschart = derive2 { name="mschart"; version="0.2.5"; sha256="08j342slv4ca6qkd12hh7jmmv5wv6kfxamw34dr6sd89kzrfdj0p"; depends=[cellranger data_table htmltools officer R6 writexl xml2]; }; mscstexta4r = derive2 { name="mscstexta4r"; version="0.1.2"; sha256="1hjcasmn33xav2mw085lcndv0432l6sz327aikf63491wj1sj7mw"; depends=[dplyr httr jsonlite pander stringi]; }; - mscstts = derive2 { name="mscstts"; version="0.5.2"; sha256="1zvicr1c9lh7cscbx7j5d98zkjwq7piggyz6ssz19gpp2gfc4igy"; depends=[httr jsonlite tuneR]; }; + mscstts = derive2 { name="mscstts"; version="0.5.3"; sha256="0snrlab77gmnlppz3hjkdjaxlqv7v68ncxlvgmw9g33p87g7fnkf"; depends=[httr jsonlite tuneR]; }; mscsweblm4r = derive2 { name="mscsweblm4r"; version="0.1.2"; sha256="031s00wpr9zfjpii56m67q1phn05vqlhb8cfzhyf6fbrxvpb8k7n"; depends=[httr jsonlite pander]; }; + msd = derive2 { name="msd"; version="0.1.0"; sha256="03j50vq8mypidxzplznsa874inh5zy2v9rbw9yd7wsxwi8jf0s2b"; depends=[]; }; msda = derive2 { name="msda"; version="1.0.2"; sha256="05khpa5qasnngn6yvk87gv5262plqpw4knb6hzgy52w401k0y80r"; depends=[MASS Matrix]; }; msde = derive2 { name="msde"; version="1.0.4"; sha256="1jyvsadkha4976vdf8nn2dbrsymr4n932cqrkmhawmy6pxa2c45g"; depends=[Rcpp RcppArmadillo RcppProgress]; }; - mseapca = derive2 { name="mseapca"; version="1.0"; sha256="115njdk8cv55zxd38hq9qaca686ykckni0f3xl8w3bn32gb5g9a7"; depends=[XML]; }; msgl = derive2 { name="msgl"; version="2.3.9"; sha256="0793d12cd1mcnr97byhfwpnvm329w78f56n7dcs4116hlizp8l9h"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; }; msgpackR = derive2 { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; }; msgps = derive2 { name="msgps"; version="1.3.1"; sha256="0r8i0sw412jr148bid8sfpjcfbkf5589dqcqyvf5cm84cj7axnpz"; depends=[]; }; @@ -10531,7 +10676,7 @@ in with self; { msir = derive2 { name="msir"; version="1.3.2"; sha256="0pvc3q162vqq3k39nni732x05zzfz4y9y2zf56d83185ypszv9kb"; depends=[mclust]; }; msltrend = derive2 { name="msltrend"; version="1.0"; sha256="1rwy77ijf3hzq2zp47cijwvqcq34rdlfxwhrd9l56bvmlmzr1dqx"; depends=[changepoint forecast plyr Rssa tseries zoo]; }; msm = derive2 { name="msm"; version="1.6.8"; sha256="1d32y8f0vb2dfv3999liigpns788j145nrvd1xpxb9i2lsg8mwgk"; depends=[expm mvtnorm survival]; }; - msma = derive2 { name="msma"; version="2.0"; sha256="15g8cwafbd5bsff3cd53yzgxacsswgl0rzygr40drs7nwsi4qbk1"; depends=[mvtnorm]; }; + msma = derive2 { name="msma"; version="2.1"; sha256="1k1xfbwyapwjs7bp9v0vrdfrz54hsyxh562xni1n8m61l4gwkvzx"; depends=[mvtnorm]; }; msme = derive2 { name="msme"; version="0.5.3"; sha256="0mq57zdas1s87nblnvbif9lisgahfhvmabglvp9imr1mvpwybpbh"; depends=[lattice MASS]; }; msmtools = derive2 { name="msmtools"; version="1.3"; sha256="0p7xpj78cjc1s015ma7vc38kqiy6wvpyixrdinx4ngig1pqfrq4p"; depends=[data_table msm survival]; }; msos = derive2 { name="msos"; version="1.1.1"; sha256="0jp4xw03iwc6dkk93kkky9k6xd285ylzp1x7jxkl3h0884jvyjyf"; depends=[mclust tree]; }; @@ -10541,7 +10686,7 @@ in with self; { mstate = derive2 { name="mstate"; version="0.2.12"; sha256="0qnhivbibzss8yfsg44cvbf73n4jj4i28rbdysl88g14ig5sabgv"; depends=[RColorBrewer survival]; }; mstherm = derive2 { name="mstherm"; version="0.4.7"; sha256="04jrp0w17svwmrvx356jmh04npbwhk9nvfy3r39vqr82yrvn6jip"; depends=[doParallel foreach nls2 plotrix RColorBrewer]; }; mstknnclust = derive2 { name="mstknnclust"; version="0.2.0"; sha256="10fwl90ykk4i839shy588gxag185x6c397brn57917yiiyqfamq2"; depends=[amap igraph]; }; - mstrio = derive2 { name="mstrio"; version="11.2.0"; sha256="1d4vgmbrkalbdglydnwld09jgw5zidiwrzy83f1168zmm5lfg30x"; depends=[httr jsonlite miniUI openssl R6 rstudioapi shiny shinyjs]; }; + mstrio = derive2 { name="mstrio"; version="11.2.1"; sha256="1lkkl4qc6vjl3b5crpsf27d6fwbk2d96v3ybxq9ndc8ia2jc8fkf"; depends=[crul data_table httr jsonlite miniUI openssl R6 rstudioapi shiny shinyjs]; }; msu = derive2 { name="msu"; version="0.0.1"; sha256="1vhh9725dbywmzihnmsq1jircpn91r8227j2f76fvma9rwss90p7"; depends=[entropy]; }; mtconnectR = derive2 { name="mtconnectR"; version="1.2.1"; sha256="0hl46h535mjqwgrhmxlixhfsych3blzcynffp55nr1ynrra4dn06"; depends=[data_table dplyr dtw ggplot2 lubridate magrittr plyr proxy stringr tidyr XML]; }; mthapower = derive2 { name="mthapower"; version="0.1.1"; sha256="0g6dn0qn7z6qc1gbzspy1n7b803427bc9fv5yqk7j8i1is1p8h94"; depends=[]; }; @@ -10549,28 +10694,28 @@ in with self; { mtsdi = derive2 { name="mtsdi"; version="0.3.5"; sha256="0j4hl690n8x7zfpygw5qv0m0jyl8dnz1d3r4314w06h7c578n2kp"; depends=[gam]; }; muHVT = derive2 { name="muHVT"; version="1.0.1"; sha256="0qxfnnz88h00a2zfx0kagv7g4w3ck74x1zqcmxgrvwpdy3z851zn"; depends=[conf_design deldir dplyr ggplot2 gtools Hmisc magrittr MASS plyr polyclip purrr rgeos sp splancs]; }; muRL = derive2 { name="muRL"; version="0.1-12"; sha256="1nzi0nyspva5ach0q0rvlljlfgmac8vxxggkwdzz1pr1cxhkprwd"; depends=[maps stringr]; }; - muRty = derive2 { name="muRty"; version="0.3.0"; sha256="1125182flpz6a90dh3gldyhlnh9l605cb59b92j3d0p754ansdrm"; depends=[clue lpSolve]; }; + muRty = derive2 { name="muRty"; version="0.3.1"; sha256="0v7wfb6347h4inf9jcbp6n4xfsqjzgj0i5sdfgqmbw0d5pcpnvhz"; depends=[clue lpSolve]; }; muStat = derive2 { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; }; muckrock = derive2 { name="muckrock"; version="0.1.0"; sha256="16lm1iiaaws7clby7qgblqdiznw6abjjgvsxlfpza7l2xdvplxpg"; depends=[]; }; - mudata2 = derive2 { name="mudata2"; version="1.1.0"; sha256="094xvcw80grfz1q8al8pcnz14drf69amyn3phpav90znnk6b9bhn"; depends=[dplyr fs ggplot2 glue jsonlite lubridate magrittr readr rlang stringr tibble tidyr tidyselect withr]; }; + mudata2 = derive2 { name="mudata2"; version="1.1.2"; sha256="0c8x39m7cy9l2r3ywbircgp79g7lmd37m2500z3icmkx6x6k6393"; depends=[dplyr fs ggplot2 glue jsonlite lubridate magrittr readr rlang stringr tibble tidyr tidyselect withr]; }; mudens = derive2 { name="mudens"; version="1.3.2"; sha256="18kv8xfmmmk0dyw64lwrlrks0gana0s7gaff6nxs59ndgb1pj6yp"; depends=[Rcpp survival]; }; mudfold = derive2 { name="mudfold"; version="1.1.2"; sha256="1g66axwrrvlsb03yhwa16pvxbl2wvpm7fzzl6nlw0cxlh99w7r33"; depends=[boot broom dplyr ggplot2 glmnet mgcv reshape2 zoo]; }; mueRelativeRisk = derive2 { name="mueRelativeRisk"; version="0.1.1"; sha256="16yclfmgxc32pv00vyb9fjdh4syax8ynizr8a29haiq22q5fqclh"; depends=[]; }; muhaz = derive2 { name="muhaz"; version="1.2.6.1"; sha256="08qh43zx6h3yby44q2vxphfvmfdmqxpgyp0734yn341sy9n8pkkk"; depends=[survival]; }; muir = derive2 { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; }; mulset = derive2 { name="mulset"; version="1.0.0"; sha256="0pigiy6hfiqh6x4zx6zqn3ykk36s3abzzyb67jdlf4jzc5zhrl9g"; depends=[digest gtools]; }; - multDM = derive2 { name="multDM"; version="1.0"; sha256="06vjbsjmqdnndpqacfpgq5w8q6xg81s7vd9fhwdkww3adr7r8cg3"; depends=[]; }; + multDM = derive2 { name="multDM"; version="1.1.1"; sha256="06r9dxp1ww5prp1gq67ch1n173dqa93islbjhqnsdaqrhaa7wav2"; depends=[MTS]; }; multbxxc = derive2 { name="multbxxc"; version="1.0.1"; sha256="1ip5awjc2ljpy6nsr4y42x0yg4n7lyaxp9kzfjvwp41k9lriz4gm"; depends=[Rcpp RcppArmadillo rmumps]; }; - multcomp = derive2 { name="multcomp"; version="1.4-12"; sha256="14c2f10rz546w7ly5f4r6wnd07yj5gic38an17gxny1vf2nsff0b"; depends=[codetools mvtnorm sandwich survival TH_data]; }; + multcomp = derive2 { name="multcomp"; version="1.4-13"; sha256="1nszi22rcc551yc75h9cdfkdqsxw1rz30vadazmpyzihp1bh63yk"; depends=[codetools mvtnorm sandwich survival TH_data]; }; multcompView = derive2 { name="multcompView"; version="0.1-8"; sha256="1rfq9wvvrghq0542ff40wy8vdmsyd8spzz6ihcywcvxdfa8m6g8j"; depends=[]; }; multdyn = derive2 { name="multdyn"; version="1.6"; sha256="06yab2lmxp7lc7zjk8n194mn5vza0yjbp276iair3ry35my4h3v8"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; }; multfisher = derive2 { name="multfisher"; version="1.1"; sha256="0vzvq7v2xz35fx8pg25c9xqkic09k6fcg9zh81j7pgqmzi2wwrp8"; depends=[]; }; - multgee = derive2 { name="multgee"; version="1.6.0"; sha256="17qrfvxxapqzjy2ps7kk9k9hkmb9zdxflwclyagp1amgv50la49f"; depends=[gnm VGAM]; }; + multgee = derive2 { name="multgee"; version="1.7.0"; sha256="0f7lwla0i0why8lk4fsyxsc1qhyq4asqvy5pr04mqfxxr8x3nm5v"; depends=[gnm VGAM]; }; multiApply = derive2 { name="multiApply"; version="2.1.1"; sha256="1vsknqzwkimmb9axa72slzpzij4mvkcy3578i7xjx3grfa6kbnlh"; depends=[doParallel foreach plyr]; }; multiAssetOptions = derive2 { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; }; multiCA = derive2 { name="multiCA"; version="1.1"; sha256="1vgb13cfq10g8hxykgi3is3mrlbm76vh40cznapl7xxmw226ccrl"; depends=[bitops multcomp]; }; multiColl = derive2 { name="multiColl"; version="1.0"; sha256="01csf5gjk2wrv6d0m1j23gk6dcixck318ywfq1a1a0j1dl9wmvx4"; depends=[]; }; - multiDimBio = derive2 { name="multiDimBio"; version="1.2.1"; sha256="1zykfchfl4icjp5y2pjd5vlfrpzhd13xbh2fy3indhh6kdzbdkyy"; depends=[ggplot2 gridGraphics lme4 MASS misc3d pcaMethods RColorBrewer]; }; + multiDimBio = derive2 { name="multiDimBio"; version="1.2.2"; sha256="0xadpvnyghpqh2q1gp1fqwv591sm3icmx60x4g8gn1vybi51k5rx"; depends=[ggplot2 gridGraphics lme4 MASS misc3d pcaMethods RColorBrewer]; }; multiPIM = derive2 { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; }; multiRDPG = derive2 { name="multiRDPG"; version="1.0.1"; sha256="0r6n148pakixw4caj0zwib8zirgl98lm0mxqmhvmqjh389icskxc"; depends=[]; }; multiROC = derive2 { name="multiROC"; version="1.1.1"; sha256="15ydbxpkdyvsc55di13jvwh9p6dzxc1yj93w1cwsd8jp2y10wsd3"; depends=[boot magrittr zoo]; }; @@ -10579,37 +10724,38 @@ in with self; { multicastR = derive2 { name="multicastR"; version="1.3.0"; sha256="07y3a7apk6pjnfqki52jc5vbzb1w53fla7wcpc184f4zpqfc783q"; depends=[curl data_table gsubfn stringi XML xml2 xtable]; }; multichull = derive2 { name="multichull"; version="1.0.0"; sha256="1gc7kxxlbanc6rmmbf6h85jf7kj0a78h23m5vwwqqliv018qsv2n"; depends=[igraph plotly shiny shinythemes]; }; multicmp = derive2 { name="multicmp"; version="1.1"; sha256="0mz7ksc5h6dy95l3kbsamm191372blhlrj573krc57bj93lmp1a5"; depends=[numDeriv]; }; - multicolor = derive2 { name="multicolor"; version="0.1.3"; sha256="0jniqa8zrl13534pyl200i54m52lhfwq7h7irf806ga70lvfgk0k"; depends=[cowsay crayon dplyr glue magrittr purrr stringi stringr tibble tidyr]; }; + multicolor = derive2 { name="multicolor"; version="0.1.4"; sha256="1yswpqm62cvpfj6zxrprbvamjah3zxhsvn19qgpqmha0098lx5g2"; depends=[cowsay crayon dplyr glue magrittr purrr stringi stringr tibble tidyr]; }; multicon = derive2 { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[abind foreach mvtnorm psych sciplot]; }; multicool = derive2 { name="multicool"; version="0.1-11"; sha256="0xk408qbz9cxwf51j3pmy55gcjcnws8mc6j3vyn9zhramxj7x40w"; depends=[Rcpp]; }; multicross = derive2 { name="multicross"; version="2.0.0"; sha256="1ic632ig0mzvq00hrkjs8vfa5mzp8vwrqflfqfdr5wkdvcqqnhbb"; depends=[AnnotationDbi crossmatch MASS Matrix nbpMatching org_Ce_eg_db org_Hs_eg_db org_Mm_eg_db Seurat]; }; multifluo = derive2 { name="multifluo"; version="1.1"; sha256="1hnh1gj6lfnh2fn0v064bszydgsr6p9f7p8yxyw5rdxfrxymiw09"; depends=[agricolae ellipse imager]; }; multifwf = derive2 { name="multifwf"; version="0.2.2"; sha256="1l6z3pzz6g6w1spp1f918jh6w0jm93qyc882rj8jhn1198d2s8nd"; depends=[]; }; - multigraph = derive2 { name="multigraph"; version="0.92"; sha256="1wxia62qjy94cbcpf85nyxba6gb9d9607pkqhgy2dc5dyhhw61vs"; depends=[multiplex]; }; - multigroup = derive2 { name="multigroup"; version="0.4.4"; sha256="1r79zapziz3jkd654bwsc5g0rphrk9hkp1fpik8jvjsa1cix40mq"; depends=[MASS]; }; + multigraph = derive2 { name="multigraph"; version="0.93"; sha256="1966c38y7a7ik1a0sn3vcprckjphz7xvd6hkq3nhf4xdarbnwrxv"; depends=[multiplex]; }; + multigroup = derive2 { name="multigroup"; version="0.4.5"; sha256="1d3m2c3md9iiv1gfqfyik1xj3fsas85bmf2vbkaks8ljxa42f55k"; depends=[MASS]; }; multilaterals = derive2 { name="multilaterals"; version="1.0"; sha256="11zfdhn6qzqz0n31g23bn40wnfzkjndb753iiqvihirphzb74v5v"; depends=[ape igraph]; }; multilevel = derive2 { name="multilevel"; version="2.6"; sha256="19zrvpq23dn69d7kai1rgw5b8ibmgybnbg6isliq0n8bv9jvrzia"; depends=[MASS nlme]; }; multilevelPSA = derive2 { name="multilevelPSA"; version="1.2.5"; sha256="0926jaicdxk846vyfphb2hyg3zan3wal44x1bwamws0zf4flc4hj"; depends=[ggplot2 MASS party plyr PSAgraphics psych reshape xtable]; }; - multilinguer = derive2 { name="multilinguer"; version="0.0.3"; sha256="0j7v0d0xibxk8ir09pxb3v13xlm7h35phhgw2cxfd934z146x8v9"; depends=[askpass fs rstudioapi rvest sys usethis xml2 zip]; }; + multilevelTools = derive2 { name="multilevelTools"; version="0.1.1"; sha256="01fzx7j0mkb4fr7axv34184w6w5nfsdcr51nscci1mi5b2805x1s"; depends=[cowplot data_table extraoperators ggplot2 JWileymisc lavaan lme4 lmerTest nlme zoo]; }; + multilinguer = derive2 { name="multilinguer"; version="0.0.4"; sha256="0kavgvbzv8bvv9qlr92j8mx7b802w513mqalrdyln0pw36c9i13x"; depends=[askpass fs rstudioapi rvest sys usethis xml2 zip]; }; + multimark = derive2 { name="multimark"; version="2.1.2"; sha256="15qdj3h5j30i56yx089pq8iii5kkk3ay6xr6z2msk22zj1rv7ahh"; depends=[Brobdingnag coda Matrix mvtnorm prodlim raster RMark sp statmod]; }; multimode = derive2 { name="multimode"; version="1.4"; sha256="142k2jbi6y9aaqz9cwl4wk2m1y1n1fgvk873nk3psdv2h6r77slx"; depends=[diptest ks rootSolve]; }; multinbmod = derive2 { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; }; multinet = derive2 { name="multinet"; version="3.2"; sha256="00v0ac3pizdf8r6sm45hdrpj487pgcw9snf26zqcyhhlx5b8wicz"; depends=[igraph RColorBrewer Rcpp]; }; multinets = derive2 { name="multinets"; version="0.2.2"; sha256="1i5jsq1xy0g0l5d1z3hz4gj6inj4rhd6lf2s5xzd5k8ccp5aba8c"; depends=[igraph Rcpp]; }; multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; }; multinomineq = derive2 { name="multinomineq"; version="0.2.1"; sha256="09h5nccfcrnl78rdxwsw5cqirfq40a6x4dmpkibc475z3xndk2rm"; depends=[coda quadprog Rcpp RcppArmadillo RcppProgress RcppXPtrUtils Rglpk]; }; - multipanelfigure = derive2 { name="multipanelfigure"; version="2.0.2"; sha256="0f24b0msx6y9ccdi65d8rxf589vw5rz6pxwa55bivq8cy5s4gc27"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types ggplot2 gridGraphics gtable magick magrittr stringi]; }; - multipleNCC = derive2 { name="multipleNCC"; version="1.2-1"; sha256="080wpyifpw41p6jip2ia7439jdhzyb7lbhs2qzzg0hn6c0qq7mrr"; depends=[mgcv survival]; }; - multiplex = derive2 { name="multiplex"; version="2.9.2"; sha256="1qwxyzm4i33siybh65qny6bbmv039kdp7mfd5cbbx252qrz9379s"; depends=[]; }; + multipanelfigure = derive2 { name="multipanelfigure"; version="2.1.2"; sha256="0cm5bd7k0fx6d3gybcll6vvh14byanyk6dj4civqij7psa48iagc"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types ggplot2 gridGraphics gtable magick magrittr stringi]; }; + multipleNCC = derive2 { name="multipleNCC"; version="1.2-2"; sha256="0bnc14l5b3x68qnwf3ma8wrclmp6n7fxsc0sbd7cfaayhp8dzcb1"; depends=[mgcv survival]; }; + multiplex = derive2 { name="multiplex"; version="2.9.4"; sha256="0c1gpmh1jric8zzip5m3fr8wjxiqa7jhfklgdni22shlccnjxn33"; depends=[]; }; multipol = derive2 { name="multipol"; version="1.0-7"; sha256="1rkrg3kayxa05jayg8bk1mm3hcvi76570wqfja5953hd9j4krgha"; depends=[abind]; }; multirich = derive2 { name="multirich"; version="2.1.1"; sha256="04jr5jvds70j2psyxz12d2my61jcj5hvdyv10pvar2rpqaw0yxyh"; depends=[]; }; multiselect = derive2 { name="multiselect"; version="0.1.0"; sha256="1cda38zq7c1r56wdfpr5dg0jfw4kzi9p7jq59qm04j461j9ag3q6"; depends=[Hmisc]; }; multisensi = derive2 { name="multisensi"; version="2.1-1"; sha256="0f8i1jvrnmdsws5w7fz9k5pb5yfl5b9hnfd8aq4zj1r6m90kb6sz"; depends=[knitr sensitivity]; }; multisom = derive2 { name="multisom"; version="1.3"; sha256="0msxmrj4iawxg4vf4r7kj26zalxz4di2w4nxgxiakiig4g4ggy9z"; depends=[class kohonen]; }; multispatialCCM = derive2 { name="multispatialCCM"; version="1.0"; sha256="1fzd91w10iln8qb81z240lq3fi4gq22l4rh9npkav6fiq6g6rlp8"; depends=[]; }; - multistate = derive2 { name="multistate"; version="0.2"; sha256="0jdgyzc99k4py39g98c4dlcdl918568ihcyhb7csxbsn1zn1qm9l"; depends=[date relsurv statmod survival]; }; multistateutils = derive2 { name="multistateutils"; version="1.2.4"; sha256="1h1hi9pv28dbznjnafybjlbk196rj2f8lwrzwq2a5cpj0q7s582f"; depends=[data_table dplyr magrittr networkD3 Rcpp tidyr]; }; multitaper = derive2 { name="multitaper"; version="1.0-14"; sha256="04wd9bbhyx7697pfy0fpj02v1csr48hkpqj62h9p8a6w84ji4k68"; depends=[]; }; - multivariance = derive2 { name="multivariance"; version="2.2.0"; sha256="1877yym7fhnjhjdfchpdjrcyz10w7flsvjq78s51y0km0rblycph"; depends=[igraph microbenchmark Rcpp]; }; + multivariance = derive2 { name="multivariance"; version="2.3.0"; sha256="00hvsia4xcs2r2lj9qqnlj4klivvpx58fmhr4dgy3waq8pp5a0dv"; depends=[igraph microbenchmark Rcpp]; }; multivator = derive2 { name="multivator"; version="1.1-9"; sha256="0vbqvhmym46zjr1h4s53sjrddfjpv8wi0sq4lrh2rmqarq068416"; depends=[emulator mvtnorm]; }; multiviewtest = derive2 { name="multiviewtest"; version="2.0.0"; sha256="09svd9jbvn92vkaifr33vg5scyh6311kpkr0lgsdj6lycz9cb4q7"; depends=[doParallel foreach irlba Matrix matrixStats mclust randnet]; }; multiwave = derive2 { name="multiwave"; version="1.4"; sha256="19581kjcyw86cnzhvhhpn997fixm811ggmvb8jkb3dsxg8vp60jc"; depends=[]; }; @@ -10620,34 +10766,33 @@ in with self; { mumm = derive2 { name="mumm"; version="0.2.1"; sha256="1wjg2pqn2wb9hk9mqgpi3k26qwjnkmp4apx09lxcwrz35bbwhfzv"; depends=[lme4 Matrix Rcpp RcppEigen stringr TMB]; }; munfold = derive2 { name="munfold"; version="0.3.5"; sha256="17zizx9r0f8dxb7dkgn1nn0fp7ydy6r155p1zfz0v93jc26lc1hb"; depends=[MASS memisc]; }; munsell = derive2 { name="munsell"; version="0.5.0"; sha256="16g1fzisbpqb15yh3pqf3iia4csppva5dnv1z88x9dg263xskwyh"; depends=[colorspace]; }; - munsellinterpol = derive2 { name="munsellinterpol"; version="2.5-1"; sha256="1x5nh4h35mkajsdgi4vrvs1cd4iagdrp9al2a6lll96jw0y1c65y"; depends=[rootSolve spacesRGB spacesXYZ]; }; + munsellinterpol = derive2 { name="munsellinterpol"; version="2.6-1"; sha256="02fj62hfxg2zvkbmlqxka5j9mkc7j07czqhs18wbcz38kamfgw2j"; depends=[rootSolve spacesRGB spacesXYZ]; }; murphydiagram = derive2 { name="murphydiagram"; version="0.12.2"; sha256="0f699cdfsl4f9w9f18cxkdlq1vyhsv83ynl6ck0r3wwh8f1zsmnd"; depends=[]; }; music = derive2 { name="music"; version="0.1.1"; sha256="04ygmlga7i8bpxcrlmj8wc956asf73krghga6fnh2flm675dp42f"; depends=[audio crayon]; }; musicNMR = derive2 { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; }; musica = derive2 { name="musica"; version="0.1.3"; sha256="0cfzfar706l0xdb0n11m18mayj5rrplvf4qry36vgxsiaxcba90r"; depends=[data_table lubridate magrittr qmap]; }; + mustashe = derive2 { name="mustashe"; version="0.1.2"; sha256="0ihngnjay9zg8570za2rja0m2hxjy1ygc4zaif862sqflza68kdp"; depends=[digest formatR qs tibble]; }; mut = derive2 { name="mut"; version="1.1"; sha256="0v0vviarsmaiap3fa82ia01cblana65fd3cbj7jkd3aral6pm6yz"; depends=[expm Familias IBDsim paramlink]; }; mutSignatures = derive2 { name="mutSignatures"; version="1.2"; sha256="1kbp221lm43a5wiw754yjkd3qidmca20m0i8jlxsqk8ijbp40ky2"; depends=[cluster doParallel foreach ggplot2 pracma proxy]; }; mutoss = derive2 { name="mutoss"; version="0.1-12"; sha256="1yk7p7pb2xm38d3j19ysgwmix48lvimbhkhjjwk5jmr1a0ysx298"; depends=[multcomp multtest mvtnorm plotrix]; }; mutossGUI = derive2 { name="mutossGUI"; version="0.1-11"; sha256="08pcca9gzns83az6jbjzv4xhm1wgmchhzz4f54x1aq0nmvsz3qq1"; depends=[CommonJavaJars JavaGD JGR multcomp mutoss plotrix rJava]; }; mvLSW = derive2 { name="mvLSW"; version="1.2.3"; sha256="05g6v4jbg1km2215lxbwzx8frr4in7xal9pai3y6l23d66lvh1iz"; depends=[fields wavethresh xts zoo]; }; mvMISE = derive2 { name="mvMISE"; version="1.0"; sha256="0lnc5g3ksl5cvwylh8p8baxyvq3z32a2i337q7lhg00j031ccy5c"; depends=[lme4 MASS]; }; - mvMORPH = derive2 { name="mvMORPH"; version="1.1.1"; sha256="101ds24bir84yj7cnc4l4yv85xga981mk5ap420f3r9lp8db3h6x"; depends=[ape corpcor glassoFast pbmcapply phytools spam subplex]; }; + mvMORPH = derive2 { name="mvMORPH"; version="1.1.2"; sha256="0hhnd9ki9zcgxxfxjb0q2pmpgyfv9r5993n4rw87dh3mjxb0xsxx"; depends=[ape corpcor glassoFast pbmcapply phytools spam subplex]; }; mvMonitoring = derive2 { name="mvMonitoring"; version="0.1.0"; sha256="03nvq8nmrmrpzyxlsqzww5ghk640115l1jgmgwfahhjxkdpkzfxx"; depends=[BMS dplyr lazyeval plyr rlang robustbase xts zoo]; }; mvPot = derive2 { name="mvPot"; version="0.1.4"; sha256="04l9dn8amwp366b6lic5fkl4kck0x2m3xcsqz6as4c3h772nhq1w"; depends=[evd gmp MASS numbers]; }; - mvProbit = derive2 { name="mvProbit"; version="0.1-8"; sha256="07dizclqjlwj29yb3xwjihjh8kmn6jiq5cpf8rcirylzykfdv3wk"; depends=[abind bayesm maxLik miscTools mvtnorm]; }; mvQuad = derive2 { name="mvQuad"; version="1.0-6"; sha256="016477dhjdkqiadc631vzpbp967mn4yli6by3s1k348mlfirwsi3"; depends=[data_table statmod]; }; - mvSLOUCH = derive2 { name="mvSLOUCH"; version="2.2"; sha256="1df9lwj9f65sw8jd2cxjg08p6z9llpxjzyjcryn764a4ncnx7gf3"; depends=[abind ape Matrix matrixcalc mvtnorm ouch PCMBase TreeSim]; }; + mvSLOUCH = derive2 { name="mvSLOUCH"; version="2.4"; sha256="06bpg2pp3kq9bvr4ab3c0ma7bxb56k514dgqvc3n6pfvavcgxkvf"; depends=[abind ape Matrix matrixcalc mvtnorm ouch PCMBase TreeSim]; }; mvShapiroTest = derive2 { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; }; - mvabund = derive2 { name="mvabund"; version="4.0.1"; sha256="0la935gsiryfc0zixxr1dqj0av271x96pqxbi3bp6dksbw5gm68k"; depends=[MASS Rcpp RcppGSL statmod tweedie]; }; + mvabund = derive2 { name="mvabund"; version="4.1.3"; sha256="1z58h4dk3mc2hfnfvc7pghk471cbp7ah2s1z2ria5igw4s80962b"; depends=[MASS Rcpp RcppGSL statmod tweedie]; }; mvbutils = derive2 { name="mvbutils"; version="2.8.232"; sha256="0awd0jy492ha321c20kmmgl20kqphdmrmswakc0rq6h8z9d55kdg"; depends=[]; }; mvc = derive2 { name="mvc"; version="1.3"; sha256="0kmh6vp7c2y9jf71f4a29b0fxcl0h7m4p8wig4dk3fi7alhjf7ym"; depends=[rattle]; }; mvcluster = derive2 { name="mvcluster"; version="1.0"; sha256="0yfl31scdgsiljvpv1yxc5bwwzr6kbhpjwqh2kql7xf0m0hc1pr4"; depends=[Rcpp RcppArmadillo]; }; mvctm = derive2 { name="mvctm"; version="1.2"; sha256="0810bmk748cvbls4djspqvkk65j605djqicqg4rkwy2a799l3rgc"; depends=[Formula MNM nlme quantreg Rfit SpatialNP]; }; mvdalab = derive2 { name="mvdalab"; version="1.4"; sha256="18wchy517qd45w5y0sr8lcafb7kmscy0q9vsryk9if6x2jq22lqz"; depends=[car dummies ggplot2 MASS moments penalized plyr reshape2 sn]; }; mvglmmRank = derive2 { name="mvglmmRank"; version="1.2-2"; sha256="00zxqby8syb959fqgw9i7b0yamgjwddq32jlin6qmnzys5bg1556"; depends=[MASS Matrix numDeriv]; }; - mvgraphnorm = derive2 { name="mvgraphnorm"; version="1.81"; sha256="14sfnm0pikv82abiqfv2m1bziwyy2r0bmhq64j783cyppv5fb69z"; depends=[bnlearn corpcor igraph Matrix mvtnorm qpgraph]; }; mvinfluence = derive2 { name="mvinfluence"; version="0.8-3"; sha256="0nygsldkm61ny5ljcc1r667rywj239j4x59ssi81cb2005kkjgm5"; depends=[car heplots]; }; - mvmesh = derive2 { name="mvmesh"; version="1.5"; sha256="0my43559jh8ln1fx5rh5vw24vr6kxpd2h5scylfxfv2qfk794l0b"; depends=[abind geometry rcdd rgl SimplicialCubature]; }; + mvmesh = derive2 { name="mvmesh"; version="1.6"; sha256="1y6p7xp9fv0xswjdc6py1xqlx1ys1iyr559s9wkyja4hzcpya2my"; depends=[abind geometry rcdd rgl SimplicialCubature]; }; mvmeta = derive2 { name="mvmeta"; version="1.0.3"; sha256="08zki4bxd7l5hpa9dly9jw796kn4rfv6v6gmx21yvfppyryrvmvd"; depends=[mixmeta]; }; mvnTest = derive2 { name="mvnTest"; version="1.1-0"; sha256="0p37skzpljzz19x1hwh2hbxqins19zkbz7nlgfws5pgp9apazafq"; depends=[MASS mvtnorm]; }; mvna = derive2 { name="mvna"; version="2.0.1"; sha256="10i42hjm5bk62c20pmxhya283yzw1902ivkflmyqy79jri266dxf"; depends=[lattice]; }; @@ -10656,45 +10801,49 @@ in with self; { mvnmle = derive2 { name="mvnmle"; version="0.1-11.1"; sha256="131k2bnn6194y3f35r9cgys8g1z2y52123ng8iijpkpbfd147y92"; depends=[]; }; mvnormtest = derive2 { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; }; mvnpermute = derive2 { name="mvnpermute"; version="1.0.0"; sha256="0mbyj5i5vysrnl3pgypl0cjf3sylsvzfl1pcxkn0q16560vqh2ba"; depends=[]; }; - mvord = derive2 { name="mvord"; version="0.3.6"; sha256="0xg73pa7bj42ya69w8bmcgf1nfxa5yh1aq8fc0dk0ygcg3h0g21k"; depends=[BB dfoptim MASS Matrix minqa mnormt numDeriv optimx pbivnorm ucminf]; }; + mvord = derive2 { name="mvord"; version="1.0.0"; sha256="1x5846sb31s45817j05nr5pp8zd1rgq22n8wncj2a61y01ll7qwy"; depends=[BB dfoptim MASS Matrix minqa mnormt numDeriv optimx pbivnorm ucminf]; }; mvoutlier = derive2 { name="mvoutlier"; version="2.0.9"; sha256="1d562h3xicq962h27fi95qhrz9vkwxk0p8axhps1cy4b49w4bygi"; depends=[robCompositions robustbase sgeostat]; }; mvp = derive2 { name="mvp"; version="1.0-8"; sha256="0i2fd9s0dlpaa4vwkiq5is2d4vxc90hkdl0yk57gl651i8nxwnha"; depends=[magic magrittr mpoly partitions Rcpp]; }; mvprpb = derive2 { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; }; + mvrsquared = derive2 { name="mvrsquared"; version="0.0.3"; sha256="1bnfw8524zwlcixr7dmhm0liijs7fjxv1a8jrnrd6hzih04a9h6j"; depends=[Matrix Rcpp RcppArmadillo]; }; mvrtn = derive2 { name="mvrtn"; version="1.0"; sha256="0k0k76wk5zq0cjydncsrb60rdhmb58mlf7zhclhaqmli1cy697k8"; depends=[]; }; mvsf = derive2 { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld748kn5j2jbgdr3ca9m3i5nlwf"; depends=[mvnormtest nortest]; }; mvst = derive2 { name="mvst"; version="1.1.0"; sha256="03q0kdychsmn4wcn50b6dqhxn4f2mjvrr5rac942xdv75w8qklc9"; depends=[MCMCpack mnormt mvtnorm]; }; - mvtmeta = derive2 { name="mvtmeta"; version="1.0"; sha256="0g0d4lrz854wkd0dz5aiad54i46aqkfhsq6cpbsfv0w5l2kwiqqz"; depends=[gtools]; }; - mvtnorm = derive2 { name="mvtnorm"; version="1.0-12"; sha256="03rfmii9j8x8fjv7hp8qd28z0svl4w0x54k2f4jpwv4qa7079i24"; depends=[]; }; + mvtmeta = derive2 { name="mvtmeta"; version="1.1"; sha256="0s0s5922c5rs8cqk100nci3akqnhbvibm2n2gn8049v3qcyfajyb"; depends=[gtools]; }; + mvtnorm = derive2 { name="mvtnorm"; version="1.1-0"; sha256="0pfb6qk4yb6xaya8i1wvx6dnc3jj4s2g94sq2kzv4p8zn4pf24l1"; depends=[]; }; mvtsplot = derive2 { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; }; - mwa = derive2 { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem MASS rJava]; }; + mwa = derive2 { name="mwa"; version="0.4.2"; sha256="18qrj3v99y1rykz82xmkbhzfjrm54dr620p8hm1s1pxjmlysyyc8"; depends=[cem MASS rJava]; }; mwaved = derive2 { name="mwaved"; version="1.1.7"; sha256="0g0yddsgdfyvqaj59qi6k3sknpbppdmgvq0rgnil5q8ki5skvgis"; depends=[Rcpp shiny]; }; mwshiny = derive2 { name="mwshiny"; version="2.0.0"; sha256="07x36dymd79aziz8k3sfx7l82xzmv43pkwndsfv9ii58q7nli1hz"; depends=[shiny]; }; mxkssd = derive2 { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; }; + mxmmod = derive2 { name="mxmmod"; version="1.0.1"; sha256="0rb0dqd4dzf5agij4cikz9a8cf6saz2q7bybxjagb8y4yjyhy2xv"; depends=[OpenMx]; }; myTAI = derive2 { name="myTAI"; version="0.9.2"; sha256="1inf6625qxr57jkwx5h3f3rdmlxf74my8bvigl8hxivd9z5z3wbl"; depends=[doParallel dplyr edgeR fitdistrplus foreach ggplot2 gridExtra nortest RColorBrewer Rcpp RcppArmadillo readr reshape2 scales taxize tibble]; }; mycobacrvR = derive2 { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; }; mycor = derive2 { name="mycor"; version="0.1.1"; sha256="00hqmvga22bv43833s974s7ky7lbry3r2bb5kza7kvkn1p6773rg"; depends=[lattice]; }; myepisodes = derive2 { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; }; mztwinreg = derive2 { name="mztwinreg"; version="1.0-1"; sha256="1rg6ikaqdrc7q44s3r3km8h45prnvcpzpxd7nxbmh209iz9j19ai"; depends=[mclogit rms]; }; - n1qn1 = derive2 { name="n1qn1"; version="6.0.1-3"; sha256="1k13x4h2rbcra3b8873ymvn4bgj6psaw05ba0hac0spymbp01fzi"; depends=[Rcpp RcppArmadillo]; }; + n1qn1 = derive2 { name="n1qn1"; version="6.0.1-7"; sha256="1mwcv8gp6c2vj8n9w8y17318a2qrl6rjq8qcfx611fqf6dfrfchq"; depends=[Rcpp RcppArmadillo]; }; nCDunnett = derive2 { name="nCDunnett"; version="1.1.0"; sha256="0q2db1pixqr0wbx4bd05c98i1p0vgaqsfa1iwjxr08c62a5xhkks"; depends=[]; }; nCal = derive2 { name="nCal"; version="2018.8-20"; sha256="1idgpzivw5wa423z86rf60ri50cyh8p38p4r493i9b2m9qzzqf1x"; depends=[drc gdata gWidgets kyotil]; }; nCopula = derive2 { name="nCopula"; version="0.1.1"; sha256="03qbfvx0lg9prg52fk1jxar2bng2x6scac4g2c64kvp6vmf6x4mv"; depends=[copula Deriv stringi stringr]; }; nFCA = derive2 { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; }; - nFactors = derive2 { name="nFactors"; version="2.3.3.1"; sha256="0qylbwn064smdw2adyx1hxwy4m320g78ihllfnss4kkmxk0ki05z"; depends=[boot lattice MASS psych]; }; + nFactors = derive2 { name="nFactors"; version="2.4.1"; sha256="1diybai7pwaj9adn60b7nhvvpjjkwg3jimwp2ahgca9askmv93h2"; depends=[lattice MASS psych]; }; + nJira = derive2 { name="nJira"; version="0.1.1"; sha256="0vh167kxljp68f0dx307wl6fp8nlp34vgrkr815z30mhx03p8j9r"; depends=[httr plyr rjson]; }; nLTT = derive2 { name="nLTT"; version="1.4.3"; sha256="0gpmlvam7k4gsiidblfl4f57mgkbq2pakzqak4yx4pxa9f8gpilm"; depends=[ape coda deSolve testit]; }; nVennR = derive2 { name="nVennR"; version="0.2.1"; sha256="11qkwd8laf67iqyzx3ia424vykvsvy0k9d7labdgqfx2ihd95hh2"; depends=[Rcpp]; }; na_tools = derive2 { name="na.tools"; version="0.3.1"; sha256="1lbzsckfg297n85kzbin65x1l6qgg9l50hd3xi2gflxc7n2xb8bw"; depends=[]; }; naaccr = derive2 { name="naaccr"; version="1.0.0"; sha256="1hw74a2gjm3gxq0s0qlndhqw0vij6p31walz1ic741z7hqsffqq7"; depends=[data_table stringi]; }; nabor = derive2 { name="nabor"; version="0.5.0"; sha256="1nj39cdfwrmhgsi3cq8imxv3n6xzc1v6dzdb2cf2hybjk368v4s7"; depends=[BH Rcpp RcppEigen]; }; nadiv = derive2 { name="nadiv"; version="2.16.2.0"; sha256="0gvpl8jrczk9afc7qg6w8w0gn28nia5mh3vanlsp7j0kj3vzqqc5"; depends=[Matrix]; }; - naivebayes = derive2 { name="naivebayes"; version="0.9.6"; sha256="1rmpc7ynnl909m20njdy5nc7siqqlj5xra3ry41b0pgb966ijcdz"; depends=[]; }; - naivereg = derive2 { name="naivereg"; version="1.0.2"; sha256="11prmwb6jc0la4w2qlmbr9n529sn4mv3zm9h80svg6gs119a9yb0"; depends=[gmm grpreg ncvreg]; }; + naijR = derive2 { name="naijR"; version="0.0.7"; sha256="1q93y959b2r8gf5ccw897kk3ky7i7mc6wrcspnpaipznrc4pnidi"; depends=[mapdata maps]; }; + naivebayes = derive2 { name="naivebayes"; version="0.9.7"; sha256="070m78d8hsbqfbapb6g8vvh91gyznqfdpqsaq6z3raps8zlybsag"; depends=[]; }; + naivereg = derive2 { name="naivereg"; version="1.0.5"; sha256="1cxfl419pp7xh1xrad29gvpn6hm0rhk40vylj97ypndh6gmnynzz"; depends=[glmnet gmm grpreg ncvreg]; }; nakagami = derive2 { name="nakagami"; version="1.0.0"; sha256="1i9m1nlqfdk9k3bzf8qlfc11spzfqly49n1pk7phvykzjgd1c1s4"; depends=[assertthat]; }; - namedCapture = derive2 { name="namedCapture"; version="2019.7.30"; sha256="12cnd16015ig0qx41gfkf7915iyzlaa7ixdv72x9vx3rylw86y4q"; depends=[]; }; + namedCapture = derive2 { name="namedCapture"; version="2020.4.1"; sha256="0zdw3h3n4qjv9cpidb3g523ld6rrh49l2c1yhfqhk5wb7vddrs46"; depends=[]; }; namer = derive2 { name="namer"; version="0.1.5"; sha256="1687x6rc46bp2bmqkixzry5cc7lxjqwjk8ngrbg2fk7mzb4pwvnq"; depends=[dplyr fs glue magrittr purrr rstudioapi tibble]; }; namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; }; - nandb = derive2 { name="nandb"; version="2.0.5"; sha256="0y1lw79mpvyfbxfzjrdfnpgny4s2axbl23gl67fj45jrbjh56wxz"; depends=[assertthat autothresholdr BBmisc checkmate detrendr dplyr filesstrings ggplot2 glue ijtiff magrittr purrr Rcpp reshape2 rlang stringr viridis withr]; }; - naniar = derive2 { name="naniar"; version="0.4.2"; sha256="0qy3wgb4wixn01yyhbjf0dmx5xq42m4c3d46y2ysfj59181p39lm"; depends=[dplyr forcats ggplot2 glue magrittr purrr rlang tibble tidyr UpSetR viridis visdat]; }; + nandb = derive2 { name="nandb"; version="2.0.6"; sha256="0gxpm22lmjbh63cifii5hwrh4wgk3f58wvp0frj5ns9jyfl6k4ik"; depends=[assertthat autothresholdr BBmisc checkmate detrendr dplyr filesstrings ggplot2 glue ijtiff magrittr purrr Rcpp reshape2 rlang stringr viridis withr]; }; + naniar = derive2 { name="naniar"; version="0.5.0"; sha256="0n0x7s7rd7zwp0jrzwl6c246yha514nwn77avd5iiq53kwypnlg9"; depends=[dplyr forcats ggplot2 glue magrittr purrr rlang tibble tidyr UpSetR viridis visdat]; }; nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; }; nanostringr = derive2 { name="nanostringr"; version="0.1.4"; sha256="1g1hm5kz2bl3qqs2cz4nhvmak7mbh5pry34lp6lwnbxrgi97i1iz"; depends=[assertthat ccaPP dplyr epiR magrittr purrr rlang]; }; nanotime = derive2 { name="nanotime"; version="0.2.4"; sha256="115i9v3h2fakq14jfc0yf7i96xvy8qas4qvmp0s9digy6ms7xyrd"; depends=[bit64 RcppCCTZ zoo]; }; @@ -10704,18 +10853,18 @@ in with self; { nasadata = derive2 { name="nasadata"; version="0.9.0"; sha256="0y88qdy8c1y0prsajxic5vdqfixv9knjsbhw3vbfac8wv3a69bjl"; depends=[dplyr jsonlite plyr png]; }; nasapower = derive2 { name="nasapower"; version="1.1.3"; sha256="1grfbj68vxsy50a0zylgfddwgr3ilrk2v60755vra9ckpmnf31zi"; depends=[APSIM crul curl jsonlite lubridate readr tibble]; }; nasaweather = derive2 { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; }; - nat = derive2 { name="nat"; version="1.8.13"; sha256="12n81jzlzamnpkf5inczfc1x8qmfibszpkakpyc0q7r7wgpykbgv"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; }; + nat = derive2 { name="nat"; version="1.8.14"; sha256="02v1hvxsp3z7rday2mr5f52kkyszcl3ind3p8vllyl705s3ci2ll"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; }; nat_nblast = derive2 { name="nat.nblast"; version="1.6.5"; sha256="0fp01rrvz7n84sdmfhi0wzd9mvg7wi682l4qg5dj82cm98v80l3p"; depends=[dendroextras nabor nat plyr rgl spam]; }; nat_templatebrains = derive2 { name="nat.templatebrains"; version="0.9"; sha256="0r0ydhxnax4x4gwp60bgarhgp59g4sis7msa3rq4kddv8qdi3gix"; depends=[digest igraph memoise nat rappdirs rgl]; }; nat_utils = derive2 { name="nat.utils"; version="0.5.1"; sha256="12g87ar795xfbz7wljksb24x9hqvcirjr50y4mbpx1427r0l7clv"; depends=[]; }; - nationwider = derive2 { name="nationwider"; version="1.1.0"; sha256="01hp8igbvbn1qa203cdnlwnfzymjifzmzcyfaszzf9q4f17f07r8"; depends=[dplyr httr lubridate magrittr readxl rvest stringr tidyr xml2 zoo]; }; - natserv = derive2 { name="natserv"; version="0.3.0"; sha256="0plfcf9c1lwfmac3nnx07hyhpr12q6mfmmj0dz8xyxdspd2ps81w"; depends=[crul data_table tibble xml2]; }; + nationwider = derive2 { name="nationwider"; version="1.1.1"; sha256="1crflv2wvrsyrhl612f7awvm0yfhl381q7pq190n3ydg093y32r6"; depends=[dplyr httr lubridate magrittr readxl rvest stringr tidyr xml2 zoo]; }; + natmanager = derive2 { name="natmanager"; version="0.4.0"; sha256="03vqy6kwc749ccydmjwjl49sydg534ijn0kpm11s4jp6nmybgzsa"; depends=[curl gh remotes usethis withr]; }; + natserv = derive2 { name="natserv"; version="0.4.0"; sha256="11wws7ikvvlmg7b1g1v6qdnhh40783ap5j3w3533wwdlj1igjzms"; depends=[crul data_table tibble xml2]; }; natural = derive2 { name="natural"; version="0.9.0"; sha256="0zxwbf3gg2h0bhl2w0md3rd162vlsgg0dv3187hc0ax7333cc4cx"; depends=[glmnet Matrix]; }; naturalsort = derive2 { name="naturalsort"; version="0.1.3"; sha256="0mz801y9mzld9ypp3xmsjw2d8l9q97sdnv09wrci9xi3yg2sjf6d"; depends=[]; }; - nbc4va = derive2 { name="nbc4va"; version="1.1"; sha256="025p9h1ghrsq4h439gx25ffpyvh2kp1i51hm7kbzx8nmh4ka8aff"; depends=[]; }; nbconvertR = derive2 { name="nbconvertR"; version="1.3.2"; sha256="0yhmz177r1miain65vspclahhz8cg7638ldbpsw8ylgf7a60l0sg"; depends=[]; }; nbpMatching = derive2 { name="nbpMatching"; version="1.5.1"; sha256="0f90k9vq05gkc0sgywb98frig63df0ih4z41dq7m2inx1zk5rqns"; depends=[Hmisc MASS]; }; - nc = derive2 { name="nc"; version="2019.10.19"; sha256="1z8v8i2bvqj1vdhijxabv0rw6ammfgzxxmwax1ywcka9jr0x1fnw"; depends=[data_table]; }; + nc = derive2 { name="nc"; version="2020.3.23"; sha256="18hjwa86y14sdwzz46k6w9hb8s8w58bxmnqy2spib8qy6dvvpfj4"; depends=[data_table]; }; ncappc = derive2 { name="ncappc"; version="0.3.0"; sha256="0bf00iskrd3x43839bwn957mi3qvm2dhcmqa7hl1ib0gp2r1cnzx"; depends=[bookdown Cairo dplyr ggplot2 gridExtra gtable knitr lazyeval magrittr PopED purrr readr reshape2 rlang rmarkdown scales tibble tidyr xtable]; }; ncar = derive2 { name="ncar"; version="0.4.2"; sha256="12cz4mlcmg8vdcn6747q1vz20wyypf89jq3nzx17s3aki0vlnwmj"; depends=[NonCompart rtf]; }; ncbit = derive2 { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; }; @@ -10723,50 +10872,52 @@ in with self; { ncdf4 = derive2 { name="ncdf4"; version="1.17"; sha256="1xls44ln2zjrrlimxl8v4bk2ni3g45c9j0gxdnjx31rikmrc95fv"; depends=[]; }; ncdfgeom = derive2 { name="ncdfgeom"; version="1.1.0"; sha256="19gbpf19vjzfigi9awhqjx6zsv92h4w1lg3dps3sgaibym9lq3zk"; depends=[dplyr ncmeta RNetCDF sf]; }; ncdump = derive2 { name="ncdump"; version="0.0.3"; sha256="09g98mzpky32z41jf23ahzhyv34l34y1gqq99j2hl4pqlvvhxs9i"; depends=[dplyr ncdf4]; }; - ncf = derive2 { name="ncf"; version="1.2-8"; sha256="1j2q1dqhr8xk9fhzjkpnx8ff427d1m8qr07l2zj5lwyh9wbr1jzn"; depends=[]; }; + ncf = derive2 { name="ncf"; version="1.2-9"; sha256="0wxn004jn4wba2zqnfrd513pw4mjxkmk4n1xj829nxadn1zbkcax"; depends=[]; }; ncg = derive2 { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; }; ncmeta = derive2 { name="ncmeta"; version="0.2.0"; sha256="1qrb2mnb4qjgx1ss1zwz7z034xrb9p0w0q9mqdh6rg4qgdsfhdxh"; depends=[dplyr rlang RNetCDF tibble tidyr]; }; ncodeR = derive2 { name="ncodeR"; version="0.2.0.1"; sha256="1pxiqxhq2rxs8rxxhw1hbds7z2qkf7ws26a8wsbw815yn6jm10n8"; depends=[cli R6 rhoR]; }; ncpen = derive2 { name="ncpen"; version="1.0.0"; sha256="0vl4cbrsifr5s1691gacmp0lk3aqyq0yfafafzv6g3zygi4igrsa"; depends=[Rcpp RcppArmadillo]; }; - ncvreg = derive2 { name="ncvreg"; version="3.11-1"; sha256="09s8k8gqsnwm6f5x1rr1f32pzam67migxwkbj4lfvw85v3pljdmr"; depends=[]; }; + ncvreg = derive2 { name="ncvreg"; version="3.11.2"; sha256="047z848chp1c10ijhw50a9mkjhhi9pd8d21c7jc9h9r2q3zgkixq"; depends=[]; }; ndjson = derive2 { name="ndjson"; version="0.8.0"; sha256="0lvzbgfi1sg4kya1mvv67z14qk3vz9q57x22qh57xq8ampdkg812"; depends=[data_table Rcpp tibble]; }; ndl = derive2 { name="ndl"; version="0.2.18"; sha256="0b235v6jf98rrqp5aqw3jkk7mq8dbqmhb758zbzza1mavh4n2k7s"; depends=[Hmisc MASS Rcpp]; }; ndtv = derive2 { name="ndtv"; version="0.13.0"; sha256="1qfjvq5wch256gmg7pw9jwda33r4963a8p8jmp27cmpzdwycvnzy"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; }; nearfar = derive2 { name="nearfar"; version="1.2"; sha256="116rq797a5fascirz8xg465fywjf40j1k5czryvqzpik0if0w00r"; depends=[car GenSA MASS nbpMatching]; }; neariso = derive2 { name="neariso"; version="1.0.1"; sha256="1b2gnws75kkqsi8mg9n0zzdaawx57a6zz47cswabj5m6nb09ikh8"; depends=[]; }; neat = derive2 { name="neat"; version="1.2.1"; sha256="0ifx2qbr8g6myz380rwayas26vg13wkblssvma4kbgfksw7cccgj"; depends=[igraph]; }; - neatRanges = derive2 { name="neatRanges"; version="0.1.0"; sha256="0g6b5mi57ajqwn8s09rw1njc1v4lrqy5dcnlphwx9i89lfa8lbah"; depends=[data_table]; }; + neatRanges = derive2 { name="neatRanges"; version="0.1.3"; sha256="1zfp6f1q7m0bks0shvzr120nd5jxba28xhi7vrd55qfy7g72167g"; depends=[data_table Rcpp]; }; + neatStats = derive2 { name="neatStats"; version="1.0.4"; sha256="0fh06q7136azsl0ml0f67vgw90pqcpp0b57r1gmq9f5kwjbwg1yy"; depends=[BayesFactor bayestestR Exact ez ggplot2 MBESS pROC]; }; neatmaps = derive2 { name="neatmaps"; version="2.1.0"; sha256="1kz1na3fzpd8vkxmpp5rz8ksyf8q2wk456csiii82winv9a2zxc9"; depends=[ConsensusClusterPlus dplyr ggplot2 heatmaply igraph]; }; needmining = derive2 { name="needmining"; version="0.1.1"; sha256="0qsj0ihjchrnl4s44rpsizbcz033z00dmzvic2y1msv0bnfawl6p"; depends=[randomForest rtweet SnowballC SparseM stringr tau tm]; }; needs = derive2 { name="needs"; version="0.0.3"; sha256="16dkjpijz3rz7kd5ggxsdg55iwd42nll1vk6g5ix4xdbqrx6cp9x"; depends=[]; }; needy = derive2 { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; }; negenes = derive2 { name="negenes"; version="1.0-12"; sha256="0b82822vl86gni0pv5f6pjfzmks35i7q2rqkhgyb9z9c677g991q"; depends=[]; }; - neighbr = derive2 { name="neighbr"; version="1.0.2"; sha256="1l85x3p4h2z2npj1xqggviyd3kvkgni5cnx5p3g52s9jwqrj43kb"; depends=[]; }; + neighbr = derive2 { name="neighbr"; version="1.0.3"; sha256="1rmglfjmx6bfd4w1cpx4rvp7hy2vqvcamy854h5dq0l3kwk4pjcm"; depends=[]; }; neldermead = derive2 { name="neldermead"; version="1.0-11"; sha256="0gf9rfwz48sadl6960mpfb6a3l9n5p28yq3n0a9vz8mr57vh1dzg"; depends=[optimbase optimsimplex]; }; + neo2R = derive2 { name="neo2R"; version="2.1.0"; sha256="1fhi74d4730pxrmv1p2gz8ylvnilxn4l837nha6ndyhy00xfgkk6"; depends=[base64enc jsonlite RCurl]; }; neo4r = derive2 { name="neo4r"; version="0.1.1"; sha256="0s4rjhn2mc8ca4p8p474a83dc277vrf7l968xwxkiac0d4fgbra7"; depends=[attempt data_table glue httr igraph jsonlite magrittr purrr R6 rlang rstudioapi shiny tibble tidyr tidyselect]; }; neonUtilities = derive2 { name="neonUtilities"; version="1.3.3"; sha256="1lmk2h58ablfggyicyhndw3n74lrpb7zcp5y1nh24i0mkqrf6gfm"; depends=[data_table downloader dplyr gdata httr jsonlite lubridate pbapply plyr readr stringr tidyr]; }; neotoma = derive2 { name="neotoma"; version="1.7.4"; sha256="1fknzp7qg5l5lkfvqfld0x67zj3xmi8vivsg70m47mbpcs92hmcf"; depends=[analogue dplyr httr jsonlite leaflet plyr reshape2 xml2]; }; nephro = derive2 { name="nephro"; version="1.2"; sha256="1izmzx8lah322xzb42asfnrvr2c9yqd0zf7fmrhwd3p4rr1rqa7d"; depends=[]; }; - nesRdata = derive2 { name="nesRdata"; version="0.3.0"; sha256="06wnm1bv7i2r6sj2hyk1zypwhr3ir89gh2bkd6kmhb7s5wv6cd5v"; depends=[dplyr purrr rappdirs readr]; }; + neptune = derive2 { name="neptune"; version="0.1.0"; sha256="0nynxvkzcdsmznyviw18gqky1kw7dxgc13nrsbf6999lr3s3shkj"; depends=[reticulate]; }; nestfs = derive2 { name="nestfs"; version="1.0"; sha256="0lzbjj287s5kmw9635gfyl3jdgfh5mxbwxqxmnwynbwccixk0akc"; depends=[dgof pROC]; }; - netCoin = derive2 { name="netCoin"; version="1.1.23"; sha256="0v5ia8iwn7i21a5xa6wjnm1pn1z1y0ccbg6qqnfzg01x1d751s5q"; depends=[haven igraph Matrix]; }; + netCoin = derive2 { name="netCoin"; version="1.1.24"; sha256="14g7b5z1l5hc30pchwlyrgh6ggzfiq7n07h4yznz64cb459ishrh"; depends=[haven igraph Matrix]; }; netSEM = derive2 { name="netSEM"; version="0.5.1"; sha256="0k4ngl4p1v2rp1sf2x65m7p0cd6ha98fyx21b73ki0531q0d9fil"; depends=[DiagrammeR DiagrammeRsvg gtools htmlwidgets knitr magrittr MASS png rsvg segmented svglite]; }; netassoc = derive2 { name="netassoc"; version="0.6.3"; sha256="1hyshnbpq60a3y13b4sh1c2rk78x09q01b7q6xrgv10w7bn9r2sg"; depends=[corpcor huge igraph infotheo vegan]; }; - netchain = derive2 { name="netchain"; version="0.1.0"; sha256="187pgsp6dn15n9bx9sj1pjx8wyfp2cs5s89s72hclanic479pv4g"; depends=[gtools igraph Matrix Rcpp stringr]; }; - netcoh = derive2 { name="netcoh"; version="0.2"; sha256="0q60hvyparlwdww6as6hcdzfs6q3n8z1rfpj53r5q2s77x6q07xx"; depends=[Matrix Rcpp RcppArmadillo]; }; + netchain = derive2 { name="netchain"; version="0.2.0"; sha256="1skpf1n6a17mjkcxqpl6vrskk04yvqa0v4n2zw9x5r1h46q9m6qk"; depends=[gtools igraph Matrix Rcpp stringr]; }; netcom = derive2 { name="netcom"; version="1.0.4"; sha256="0fka14sffm0p1gldk27fd62ng05spfpbn665b4w5hdf1z4z0bs20"; depends=[clue expm igraph Matrix pdist pracma vegan]; }; + netcontrol = derive2 { name="netcontrol"; version="0.1"; sha256="1gskb728ycnhz9a9g9ghm0dz3ajf3dzgyv23bsk9i01wj9hrxhc0"; depends=[expm MASS Matrix pracma Rcpp RcppArmadillo Rdpack]; }; netdep = derive2 { name="netdep"; version="0.1.0"; sha256="0mrbqn5d8iqvs98a0kski0vya135z7l902xafya96s2h288jchx7"; depends=[igraph igraphdata MASS mvrtn]; }; netgen = derive2 { name="netgen"; version="1.3.2"; sha256="1yqi4rb6w9ipxgbl1j1s2s81cg7nzrn65irn5gs82hsq94d6vv2j"; depends=[BBmisc checkmate ggplot2 igraph lhs mvtnorm stringr]; }; netgsa = derive2 { name="netgsa"; version="3.1.0"; sha256="0mn4dnvckdskigdfbszjnfmb3m6yfbz4qc26qwh1wznwx5wmcbf0"; depends=[corpcor dplyr glassoFast glmnet graph graphite igraph magrittr Matrix msigdbr quadprog rlang]; }; netgwas = derive2 { name="netgwas"; version="1.11"; sha256="13d889ji6x0v5pmqlr1gs9yskm3262fzb5i2l9lw6y6bc72q3l06"; depends=[glasso huge igraph MASS Matrix qtl RBGL tmvtnorm]; }; netjack = derive2 { name="netjack"; version="1.2.0"; sha256="060ygb0kxi0gx1ya38cmf5hhyy6jkwq5519azdqhq5i324cwzzm7"; depends=[brainGraph ggplot2 igraph Rdpack]; }; - netmeta = derive2 { name="netmeta"; version="1.2-0"; sha256="0cy123bs5azg5yinncmgzaxm0m33dzxbwjh0xlvwv2v27m4w4sqk"; depends=[ggplot2 magic MASS meta]; }; + netmeta = derive2 { name="netmeta"; version="1.2-1"; sha256="11yigmk11a9gi3qg3gcszmnp11729qap8yv5pvsss5qfhahfs4qa"; depends=[ggplot2 magic MASS meta]; }; netrankr = derive2 { name="netrankr"; version="0.2.1"; sha256="0csgi09ijp7ygwk7x057l9xjrzyhr7sav8hamh0p6i72l6719ssl"; depends=[igraph Rcpp RcppArmadillo]; }; netregR = derive2 { name="netregR"; version="1.0.1"; sha256="0n5absjra0imddz1spy1piij5rdz76wi4g568yby3rbhkm1896rs"; depends=[Matrix]; }; nets = derive2 { name="nets"; version="0.9"; sha256="1wcr0fj50w3rqxw0k9cb81c2psdkb0dwwwzrjvxv50hksbhyi8kn"; depends=[igraph]; }; netstat = derive2 { name="netstat"; version="0.1.1"; sha256="1h87cl3ry5hwwqxza3n24zpvwn89hhclsa2400sw4ijdy2ivpn2j"; depends=[]; }; network = derive2 { name="network"; version="1.16.0"; sha256="0dnf1wl3za2lhx2lwd8smhlijl1cfhckgr8zz9piiirrfi2m2kx2"; depends=[magrittr tibble]; }; - networkABC = derive2 { name="networkABC"; version="0.5-3"; sha256="0f3wbm76i8m9f52b0zvb2fvziqh43xy67llnv4lm54yj5szxvjr0"; depends=[network RColorBrewer sna]; }; + networkABC = derive2 { name="networkABC"; version="0.7-0"; sha256="0vn5hgry4i1dzgp34vdfa6wifsz54jh05avs9xrbzg6zmf1y2cif"; depends=[network RColorBrewer sna]; }; networkD3 = derive2 { name="networkD3"; version="0.4"; sha256="02wxki67drppgfka1is1ykg1f2rxf0x0657c0crj7ipfy62jbf1k"; depends=[htmlwidgets igraph magrittr]; }; networkDynamic = derive2 { name="networkDynamic"; version="0.10.1"; sha256="183cnxbcly887vmxcvyvwcn19i8s7yyb57k1q5vhimx8vvcxivi2"; depends=[network statnet_common]; }; networkDynamicData = derive2 { name="networkDynamicData"; version="0.2.1"; sha256="176al8jp0gha6yzhyn5flmyackmmdnh1h8sasqrdcmba7ha7cya6"; depends=[network networkDynamic]; }; @@ -10775,38 +10926,39 @@ in with self; { networkTomography = derive2 { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; }; networkreporting = derive2 { name="networkreporting"; version="0.1.1"; sha256="1ssbz8lw4mlwcblwfbyffvayvb2gmihq4qlz5q9222fn4aa3raxd"; depends=[dplyr functional ggplot2 lazyeval plyr reshape2 stringr surveybootstrap]; }; networksis = derive2 { name="networksis"; version="2.1-3"; sha256="1kvil3qs7xd94ak9jgvj1nss55gjg0y7d35zmass9h1hjkcrq7bg"; depends=[network]; }; - networktools = derive2 { name="networktools"; version="1.2.1"; sha256="0s7xcan0qkzpri6r2jm6c1d62f5lx88m3wa2rgkn1mvdq0sh3igg"; depends=[cocor eigenmodel ggplot2 gridExtra igraph IsingFit NetworkComparisonTest nnet psych qgraph R_utils RColorBrewer reshape2 smacof wordcloud]; }; - networktree = derive2 { name="networktree"; version="0.2.1"; sha256="1fl2zh5b7avkkp4c34szrm37fp7jamn54vzyhrzamjd3jqr32hmy"; depends=[Formula gridBase Matrix mvtnorm partykit qgraph]; }; + networktools = derive2 { name="networktools"; version="1.2.3"; sha256="0jj5cbp036vjjfj10i1lxzj4yi06xbdy1j20j6a035s8l2wc57pl"; depends=[cocor eigenmodel ggplot2 gridExtra igraph IsingFit NetworkComparisonTest nnet psych qgraph R_utils RColorBrewer reshape2 smacof wordcloud]; }; + networktree = derive2 { name="networktree"; version="0.2.2"; sha256="0dlci3sqdh6f3w82h0p6c2pn15d170m9ls8zllgscd1sbyry4k4x"; depends=[Formula gridBase Matrix mvtnorm partykit qgraph reshape2]; }; neuRosim = derive2 { name="neuRosim"; version="0.2-12"; sha256="1hsnw9xipdr74fydq9013252ycbi9igh28s0j4dbdx52pv3iixzl"; depends=[deSolve]; }; neural = derive2 { name="neural"; version="1.4.2.2"; sha256="05hrqgppgwp38rdzw86naglxj0bz3wqv04akq7f0jxbbjc6kwy4j"; depends=[]; }; neuralnet = derive2 { name="neuralnet"; version="1.44.2"; sha256="09l808vgjh059a3f94vgsprfyp5c1hrbjn6i1cn34cxnbljwsrjz"; depends=[Deriv MASS]; }; neurobase = derive2 { name="neurobase"; version="1.29.0"; sha256="16y1d4qg4d57l43080vlpn5jnh462qnv9z0w6dv0zwlk74psm9ha"; depends=[abind matrixStats oro_nifti R_utils RNifti]; }; neuroblastoma = derive2 { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq53xxbh2dw3hjsmf1zkyqli9qyacxf72fnkyhhl8b45"; depends=[]; }; + neurocInstall = derive2 { name="neurocInstall"; version="0.12.0"; sha256="1fkb6ji9gigqdjl50hbgdgfidqpjgqlh1aidf6vn4qnfr92bsvqf"; depends=[devtools]; }; neurohcp = derive2 { name="neurohcp"; version="0.8.1"; sha256="01q9dkrpmwfj4r7is97f3lsmn84vm5qpvf44zfm1a6hhpxa0n7z0"; depends=[base64enc digest httr xml2]; }; neuroim = derive2 { name="neuroim"; version="0.0.6"; sha256="00cjr6pkip6zi2d0q3qbn3lb3k0z82v6c19qslvgpa9n0g63dr5p"; depends=[abind assertthat hash iterators Matrix Rcpp readr rgl stringr yaImpute]; }; neuropsychology = derive2 { name="neuropsychology"; version="0.5.0"; sha256="0hlbjf8hxz4cl7fvg9mbyfmcyyxncc2nh9h1mrd2yzgrpgn0d0b5"; depends=[BayesFactor caret dplyr ggcorrplot ggplot2 Hmisc htmlTable lme4 MuMIn png ppcor psych stringi tidyr tidyverse tm wordcloud2]; }; neutralitytestr = derive2 { name="neutralitytestr"; version="0.0.2"; sha256="1p1zjc3fiphkxflsyzrxx8af98aa0gp9pvby63mmrsjb0z7ps948"; depends=[cowplot dplyr ggplot2 ggpmisc pracma scales]; }; - neverhpfilter = derive2 { name="neverhpfilter"; version="0.2-0"; sha256="0m4gbqnjw2nmhf25svznlf6pd0b0mslk52lpirmlj1iv04w1aq1i"; depends=[xts zoo]; }; + neverhpfilter = derive2 { name="neverhpfilter"; version="0.3-1"; sha256="1x2sc9v40hrlg60v3887a680359zdql9c7n8y97dh7v8w7mw547x"; depends=[xts zoo]; }; newTestSurvRec = derive2 { name="newTestSurvRec"; version="1.0.2"; sha256="06p782md33wqh5wa1735yg5i01d42p74kl7h5qhqs9cd732ls6pz"; depends=[]; }; newsanchor = derive2 { name="newsanchor"; version="0.1.1"; sha256="1s8qhq9jk5gnsimnvy7kdayya0ks0ly309l7zxm5rafj5x7k5vwn"; depends=[askpass devtools httr jsonlite lubridate tidyr xml2]; }; - newsmap = derive2 { name="newsmap"; version="0.7.0"; sha256="1fhpkih37i4abrv9ili1vpwk4pgmnhq5d5flqjdi025h9gb0zq8y"; depends=[Matrix quanteda stringi]; }; + newsmap = derive2 { name="newsmap"; version="0.7.1"; sha256="0cm9xrpsvhxlqvnqp7r44gx2rzy50hsvmqdlriw0yqd3fp9357qd"; depends=[Matrix quanteda stringi]; }; ngram = derive2 { name="ngram"; version="3.0.4"; sha256="1q4y64dy7vcjikbfx20fpdiy1kwvxay4y90xr5j8d8zkqnva0way"; depends=[]; }; ngramrr = derive2 { name="ngramrr"; version="0.2.0"; sha256="1p8s4p3h27g647rxx9qjfad5dzbngjbmvhw4gz0jbsmfqrsf72by"; depends=[tau tm]; }; ngspatial = derive2 { name="ngspatial"; version="1.2-1"; sha256="1c65ws9b9s2grr44lqg8026c4p2875d0426dfmrakpb44mw2zppp"; depends=[batchmeans Rcpp RcppArmadillo]; }; - ngstk = derive2 { name="ngstk"; version="0.2.3"; sha256="0196hnbqw9bji3bl2phjs9z5n84x5fs7iiirfd6gjyqv9xlfwd2p"; depends=[configr data_table future optparse stringi stringr]; }; nhanesA = derive2 { name="nhanesA"; version="0.6.5"; sha256="0bb53s379qrm8xqp4bsi5vgk6v6hvwadzjv09pvdp1n45z7rqj86"; depends=[Hmisc magrittr plyr rvest stringr xml2]; }; - nhdR = derive2 { name="nhdR"; version="0.5.2"; sha256="0qi7ls10pdjcihkdnhbvbnv8dwcy1448pd5fzhpy0kjky7hfi7bj"; depends=[curl dplyr foreign gdalUtils ggplot2 httr maps memoise purrr rappdirs rgdal rlang rvest sf stringr units xml2]; }; - nhdplusTools = derive2 { name="nhdplusTools"; version="0.3.12"; sha256="0111yy4pqxhqz7lk30zm7lryzarpjlxnvkzvix630xzvms8jkx1n"; depends=[dplyr httr igraph jsonlite magrittr prettymapr R_utils RANN rosm sf tidyr units xml2]; }; + nhdR = derive2 { name="nhdR"; version="0.5.3"; sha256="0zd10zy9kn97nm2i0y8h5wjdmzxblv5azybycwf08aqr0x6axh3n"; depends=[curl dplyr foreign gdalUtils ggplot2 httr maps memoise purrr rappdirs rgdal rlang rvest sf stringr units xml2]; }; + nhdplusTools = derive2 { name="nhdplusTools"; version="0.3.13"; sha256="1r2rcdlx1wsxrr931nwlprkbsmbj1bxgkjmafd1v8fxnl6cgdkk7"; depends=[dplyr httr igraph jsonlite magrittr prettymapr R_utils RANN rosm sf tidyr units xml2]; }; nhds = derive2 { name="nhds"; version="1.0.3"; sha256="1cgw3hmsik3vlnb1lgalhvhrqzwdv08dp80vwpw1nwbf8whcbxjn"; depends=[]; }; - nhlscrape = derive2 { name="nhlscrape"; version="0.1.2"; sha256="06k7pabyz0nbx1z6p2d3cymf6jph4gxa4fhzfgqzzqg9ai5kmccq"; depends=[DBI httr jsonlite RSQLite rvest xml2]; }; + nhlscrape = derive2 { name="nhlscrape"; version="0.1.3"; sha256="0x6y747j6lha3jw4v2wavgd12xw5nx4m8biv9rmq9z0qy53vncjc"; depends=[DBI httr jsonlite RSQLite rvest xml2]; }; nhm = derive2 { name="nhm"; version="0.1.0"; sha256="1yf9hnbmfb7xj8mbhnq40wvd0pd88x9qspy1jr3x0n8nb75i3jlp"; depends=[deSolve maxLik mvtnorm]; }; - nhstplot = derive2 { name="nhstplot"; version="1.0.1"; sha256="1f07gfmbx80as54mlzdbs2z1vzc78rjy6i6m7zd4jplgcqdcynws"; depends=[ggplot2]; }; + nhstplot = derive2 { name="nhstplot"; version="1.1.0"; sha256="1yk7q731a4y9mhngdsb8xdw2id6m1q78329ja19hdpi6nnd7nhgn"; depends=[ggplot2]; }; nice = derive2 { name="nice"; version="0.4-1"; sha256="1p8vmimiq9sbjvbx6c2wqwwkpnzw4kkdvjry6qyadmm3frwhj5qb"; depends=[]; }; nicheROVER = derive2 { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; }; + nichevol = derive2 { name="nichevol"; version="0.1.19"; sha256="0qj5cb0fyw0x1bczl6l0kl6jqir4yg8sb9fsfkd3h64d0ls2arl5"; depends=[ape castor concaveman geiger raster rgdal rgeos sf sp stringr]; }; nilde = derive2 { name="nilde"; version="1.1-3"; sha256="0h88if7dh16inyy5zh0yjqmc0c57k99la038p5vlwkj62vvjscmm"; depends=[]; }; - nima = derive2 { name="nima"; version="0.6.1"; sha256="0rfb624pap2ga19vll6hbvjh2jr8dh3i1bj1h8qpqpb5nk6lkf4x"; depends=[assertthat dplyr ggplot2 ggthemes gridExtra gtools scales]; }; + nima = derive2 { name="nima"; version="0.6.2"; sha256="0n8r8h1m0v0ssbpv6p32jby49f45qbicwr0awm7x054p48qk49cy"; depends=[assertthat dplyr ggplot2 ggthemes gridExtra gtools scales]; }; nimble = derive2 { name="nimble"; version="0.9.0"; sha256="04anz8xfkdv2c00hax305lycp0gzjspsq34hfgm3w51kz6nqzhpb"; depends=[coda igraph R6]; }; - nimbleEcology = derive2 { name="nimbleEcology"; version="0.1.0"; sha256="195g1hcx7fyqx2la2ci88m2bykcnzrv27k4q4qq3z69c54fc5p7d"; depends=[nimble]; }; + nimbleEcology = derive2 { name="nimbleEcology"; version="0.2.1"; sha256="0bf0pqvsfvbhnpnk5hs3f90dqvw2n1j9y8ajaw9j7n4gld3wzxqb"; depends=[nimble]; }; nipals = derive2 { name="nipals"; version="0.7"; sha256="14rq54qy4gc4l9f5h48vrsrh7sb0wzzxbvjn0zax82pz2fw6nybx"; depends=[]; }; nitrcbot = derive2 { name="nitrcbot"; version="1.2"; sha256="0lainbw9j5aj9s824afpxdjl3q2f728jfpdfji7kpi9hdg8jixhx"; depends=[dplyr httr jsonlite RCurl]; }; nivm = derive2 { name="nivm"; version="0.3"; sha256="111jkgirgsl1j36xgwi81wzwxial3vdw8mqzi1faldxxd9a2cixm"; depends=[bpcp ssanv]; }; @@ -10818,17 +10970,18 @@ in with self; { nlgeocoder = derive2 { name="nlgeocoder"; version="0.1.3"; sha256="13d30kfgfsny5gnn3yjfnclky6yixaa8sg0m689rszqxrvbrj79x"; depends=[jsonlite]; }; nlirms = derive2 { name="nlirms"; version="3.4.4"; sha256="1njyfip377a0f6hf9y32s077b4jv4h8ydbjgnl68yfypxbfn2xyx"; depends=[gridExtra gtable]; }; nlist = derive2 { name="nlist"; version="0.1.0"; sha256="0i5appxx79fcv2g0frkzlv2yfym6kmmzbsk76rbh7ap8hram04jg"; depends=[abind chk coda purrr term]; }; - nlme = derive2 { name="nlme"; version="3.1-143"; sha256="13iixbs2ibldc75rl7rav5n5kx33zwm33xnfw1yvlkpcqf38bd22"; depends=[lattice]; }; + nlme = derive2 { name="nlme"; version="3.1-147"; sha256="1rqc3wy3lmy0wczsvsn8yszzsxhppfwg4iznb1j6ki2qawpdij7g"; depends=[lattice]; }; nlmeODE = derive2 { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve lattice nlme]; }; nlmeU = derive2 { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; }; - nlmixr = derive2 { name="nlmixr"; version="1.1.1-3"; sha256="04gm74mjwz8fidapk0040fghy4wpj19412n54v8wli10xjwwb76w"; depends=[BH brew cli crayon digest dparser fastGHQuad flextable generics ggplot2 huxtable lattice lbfgs lbfgsb3c magrittr Matrix memoise minqa n1qn1 nlme R_utils Rcpp RcppArmadillo RcppEigen rex RxODE StanHeaders stringr sys tidyr vpc yaml]; }; + nlmixr = derive2 { name="nlmixr"; version="1.1.1-7"; sha256="1dl3f0lns8cm32gx64i2jims4wknannl776mn2spzqh5z6g3nnzw"; depends=[BH brew cli dparser fastGHQuad flextable generics ggplot2 huxtable lbfgsb3c magrittr Matrix memoise n1qn1 nlme Rcpp RcppArmadillo RcppEigen RxODE StanHeaders stringr tidyr vpc yaml]; }; + nlmm = derive2 { name="nlmm"; version="1.0.1"; sha256="0q5vz4xqdb510i26zbcq4djcribn7h477akh8f56nzjgq231vhcq"; depends=[BH HI lqmm MASS Matrix mvtnorm nlme numDeriv Qtools Rcpp RcppArmadillo statmod]; }; nlmrt = derive2 { name="nlmrt"; version="2016.3.2"; sha256="1g0qq0a933ay65gkp04qgn2wqk6vw79pj2a228c2ski4rcmkjxyn"; depends=[]; }; - nloptr = derive2 { name="nloptr"; version="1.2.1"; sha256="15yz60kljxwnhm2m3gryjzxl3ynhkhd5jiwc179b1hz6rlzf71hz"; depends=[]; }; - nlpred = derive2 { name="nlpred"; version="1.0.0"; sha256="0a13agsacn7qw2i8ggd9v8w7k44r4faby1vv163gsa764ppj70m4"; depends=[assertthat bde cvAUC data_table np Rdpack ROCR SuperLearner]; }; + nloptr = derive2 { name="nloptr"; version="1.2.2.1"; sha256="1bhh2v14phzndjhiq7yw9vych6vzn5yy3vk9q35zcp3jhjjbwdyh"; depends=[]; }; + nlpred = derive2 { name="nlpred"; version="1.0.1"; sha256="05jna8hzd5v36a0dwag6zr8ms1pkryas3qarwb946bkxlslffp27"; depends=[assertthat bde cvAUC data_table np Rdpack ROCR SuperLearner]; }; nlraa = derive2 { name="nlraa"; version="0.53"; sha256="064mbajrpwm2pkiyb9lwmhhf3gxzkixay3vdz9lgfd3rr9gfrk06"; depends=[knitr nlme]; }; nlreg = derive2 { name="nlreg"; version="1.2-2.2"; sha256="0gkcxg5m287axhvkl00xy26vidawhhb1ii1s13rh49v0yccwvvqh"; depends=[statmod survival]; }; nlrr = derive2 { name="nlrr"; version="0.1"; sha256="09wm8s5sadkhkq9pb3fjk66cb2xn8py46w1d7yp7fjhczh31bjsq"; depends=[Hmisc rms]; }; - nlrx = derive2 { name="nlrx"; version="0.4.0"; sha256="0b5szfg20szzip6ylafgv94nx34dp4qcyg83lcip0kvz597ymd66"; depends=[crayon dplyr EasyABC furrr genalg GenSA igraph lhs magrittr purrr raster readr rstudioapi sensitivity sf stringr tibble tidyr XML]; }; + nlrx = derive2 { name="nlrx"; version="0.4.1"; sha256="1p29x6ayf3daahn8addh6xfrwl45rsllf4vx1k8l7hqwgxfa73rl"; depends=[crayon dplyr EasyABC furrr genalg GenSA igraph lhs magrittr purrr raster readr rstudioapi sensitivity sf stringr tibble tidyr XML]; }; nls_multstart = derive2 { name="nls.multstart"; version="1.0.0"; sha256="08zdyx5hp1xbqjspk0f89fca5gc0b5j87hsccvn9dxn2lrnwk8nb"; depends=[dplyr minpack_lm purrr tibble tidyr]; }; nls2 = derive2 { name="nls2"; version="0.2"; sha256="0k46i865p6jk0jchy03jiq131pc20h9crn3hygzy305rdnqvaccq"; depends=[proto]; }; nlsMicrobio = derive2 { name="nlsMicrobio"; version="0.0-1"; sha256="0676n78265z00dacmq593c9l2239ii574djm9s7i7w8jk1kdhzx2"; depends=[nlstools]; }; @@ -10843,45 +10996,47 @@ in with self; { nlt = derive2 { name="nlt"; version="2.2-1"; sha256="10wf00qzf28dxjfvv12wsqxlfn6xz15wk8njrzgsgm9px1g6s21f"; depends=[adlift EbayesThresh]; }; nltm = derive2 { name="nltm"; version="1.4.2"; sha256="02f3rn5l1hfvjpymy7vljmh6iq9w1w96016kx75qw563zwhmp5kx"; depends=[survival]; }; nlts = derive2 { name="nlts"; version="1.0-2"; sha256="0s49qjwavl9ns2746nn4zy4h4dh0njfcvznm3qd61qhs7np9w1db"; depends=[acepack locfit]; }; - nmaINLA = derive2 { name="nmaINLA"; version="0.1.2"; sha256="0layk1pqry2g3xiwmasrnsvmw91sgg7iz15d6iz6hbq4za61hr0k"; depends=[]; }; + nmaINLA = derive2 { name="nmaINLA"; version="0.2.0"; sha256="0z3iln81dj0sg64hi7dxypcslff5yl6nlx0hkra1kc24rhxfzhh2"; depends=[]; }; nmadb = derive2 { name="nmadb"; version="1.2.0"; sha256="17r5vc57ilhy6cfcqpfyp9nzzjaa5gc8qkgfn3y8sppqh1g1mi40"; depends=[devtools jsonlite RCurl readxl]; }; - nmathresh = derive2 { name="nmathresh"; version="0.1.4"; sha256="0nsywahzph06c7grk3ch65fvll4ninqz97y007d6qdqgmym9vxjq"; depends=[ggplot2 gridExtra gtable Matrix nnls]; }; + nmathresh = derive2 { name="nmathresh"; version="0.1.5"; sha256="0ndrkd68wkkj0ib0qamfmawfy4j07cg1nx4rx32amx2j0rc851yl"; depends=[ggplot2 gridExtra gtable Matrix nnls]; }; nmfem = derive2 { name="nmfem"; version="1.0.5"; sha256="0hlddml20bp38yp1dji3l9mc1vnzmdrj6myf19n9p9xb85a30b9c"; depends=[capushe d3heatmap dplyr mixtools plyr tidyr]; }; nmfgpu4R = derive2 { name="nmfgpu4R"; version="0.2.5.2"; sha256="05066rgbbp6kj2d67nzf3d1pf32gypz9ammz4ba88yxblydb3cwk"; depends=[Matrix Rcpp SparseM stringr]; }; nmixgof = derive2 { name="nmixgof"; version="0.1.0"; sha256="0cbwrsxrcf8pn4ycn6r0z8jdidw5l6kdvwyrks69fq4pjzx988d6"; depends=[Rcpp unmarked]; }; - nmslibR = derive2 { name="nmslibR"; version="1.0.3"; sha256="1m3bq0vg774kqragdx1ydm4q2if3yn9llbd6ybv3c8bmbdb9h405"; depends=[KernelKnn Matrix R6 Rcpp RcppArmadillo reticulate]; }; + nmslibR = derive2 { name="nmslibR"; version="1.0.4"; sha256="1fw565n4128nswl2qx248ab60is98iqijq5blwskxc9hjddf95a4"; depends=[KernelKnn Matrix R6 Rcpp RcppArmadillo reticulate]; }; nmw = derive2 { name="nmw"; version="0.1.4"; sha256="1vj7b2p40x0h3xp45qzar86i9439mj8y3r5hnlbwa025jqdf2g0q"; depends=[numDeriv]; }; - nnTensor = derive2 { name="nnTensor"; version="1.0.2"; sha256="12h25kn3d70ldlqpd4nqnycv3mnzfx1f9gcw1yaspmnhs1x6gddf"; depends=[fields plot3D rTensor tagcloud]; }; + nnGarrote = derive2 { name="nnGarrote"; version="1.0.2"; sha256="1rci3m362wlis8z9afbkcr9vk0ihvay389cq4c8jd9gmcwdrv61g"; depends=[caret glmnet multicool]; }; + nnTensor = derive2 { name="nnTensor"; version="1.0.4"; sha256="1br3jcj79crrb7s22pjp0pxxkni8fagqkr96xb9sbf2dszyva15b"; depends=[fields ggplot2 plot3D rTensor tagcloud]; }; nna = derive2 { name="nna"; version="0.0.2.1"; sha256="17cz1jf7iv61wspqldfdwbdjhlr0wq09idkzlivfb8aik5w9f0z5"; depends=[]; }; - nnet = derive2 { name="nnet"; version="7.3-12"; sha256="17amqnw9dpap2w8ivx53hxha2xrm0drwfnj32li0xk41hlz548r7"; depends=[]; }; + nnet = derive2 { name="nnet"; version="7.3-13"; sha256="1z0rj5cm4ycw1y0gd5wwwg8c2298v90iybgqdqh17967jbi2125f"; depends=[]; }; nnetpredint = derive2 { name="nnetpredint"; version="1.2"; sha256="1c6s9wm6vhylwv4xhp2hkllw18zj8hdr17ls9vlxm9qs3wx1v48w"; depends=[RSNNS]; }; nnfor = derive2 { name="nnfor"; version="0.9.6"; sha256="0bciy6k79g7abvj3pmmdc4wzg5mp11zgmdbx17x4by993p2clhw9"; depends=[forecast glmnet MASS neuralnet plotrix tsutils uroot]; }; - nngeo = derive2 { name="nngeo"; version="0.3.0"; sha256="056xsffd7sn430lqmjsisk04929d44zqnwyikcdp46zhqyqpnk2m"; depends=[igraph lwgeom RANN raster Rcpp sf sp stars units]; }; + nngeo = derive2 { name="nngeo"; version="0.3.7"; sha256="1xyj5zjhim2scigkr4ycz7ma18a0sgi60jrhrcv9rnn2fg1hx5c7"; depends=[lwgeom RANN sf units]; }; nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; }; nnls = derive2 { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; }; + nnt = derive2 { name="nnt"; version="0.1.4"; sha256="1rrqq8m3plsq13hsh53h948wbx37gl87hplj4ms2pxxf1zwqsmnj"; depends=[survival survRM2]; }; noaaoceans = derive2 { name="noaaoceans"; version="0.2.0"; sha256="1hvjkma14kl8f69ichk27ddxlg9cqnzif8x43ckxyny6h341bbkf"; depends=[httr jsonlite rvest xml2]; }; noaastormevents = derive2 { name="noaastormevents"; version="0.1.1"; sha256="1ra852r5hw1ng3f4jk866jx0z2dszwvbidmfrdjchv9bfrjwmlmx"; depends=[choroplethr choroplethrMaps data_table dplyr forcats ggplot2 htmltab hurricaneexposure lubridate maps plyr RColorBrewer rlang stringr tidyr viridis XML]; }; - noctua = derive2 { name="noctua"; version="1.5.0"; sha256="0r6fwrvhss64hp6kpk2qg9pawav3sfapxqj65fm32zi8643ly5hc"; depends=[data_table DBI paws]; }; + noctua = derive2 { name="noctua"; version="1.6.0"; sha256="1gdlfjgxrhkdp8klis2rz60hvldw5qlzhrcp8frbyjvb8qa83b76"; depends=[data_table DBI paws]; }; nodbi = derive2 { name="nodbi"; version="0.4.0"; sha256="1jlqzj9lv9wnsb8hwy8y91369i6ykp8av35abakfpxg0302svay9"; depends=[data_table jsonlite]; }; nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; }; nofrills = derive2 { name="nofrills"; version="0.3.0"; sha256="18hryq6clywlr2f45az6ryslkkarly45nacln4bwk6ip0yfl5s98"; depends=[rlang]; }; noia = derive2 { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; }; noise = derive2 { name="noise"; version="1.0"; sha256="1a48s9vpz3nc058966lad8hydmg7z0vbzfwcf6nxc9g3c8mw4nig"; depends=[preprocessCore]; }; noisyCE2 = derive2 { name="noisyCE2"; version="1.0.0"; sha256="11cf7b472i6lsb4kh04rhp5mhj7l8ig0kxmkz05kazkr6cs41s6i"; depends=[magrittr]; }; - nomclust = derive2 { name="nomclust"; version="1.1.1106"; sha256="17hb89k72sw3ya0wm3n95mpx4vj7mpl4mzs8qwl2773dh2mcjgjq"; depends=[cluster dummies]; }; - nomisr = derive2 { name="nomisr"; version="0.4.1"; sha256="0a94s1xqij6k2kkzdzxp5837qgv9czzgl6wp0z9a95xizy3hkjsx"; depends=[dplyr httr jsonlite readr rlang rsdmx tibble]; }; + nomclust = derive2 { name="nomclust"; version="2.1.4"; sha256="02zmkcv41zbbdz62wmrg4hj7dqcp5q8bd0rwyaq57p4630lcv02m"; depends=[cluster plyr]; }; + nomisr = derive2 { name="nomisr"; version="0.4.3"; sha256="0p1vc6qzs7lyflw9jndimylv614dny27nz18xkmay2419vwh463f"; depends=[dplyr httr jsonlite readr rlang rsdmx snakecase tibble]; }; nomnoml = derive2 { name="nomnoml"; version="0.1.0"; sha256="0yzbs9by2fvwvxpl2xzjikzcjv8dvcr5v2v82ibz5jpnnsbl1ac4"; depends=[htmlwidgets png webshot]; }; nomogramEx = derive2 { name="nomogramEx"; version="3.0"; sha256="16235rwblnzn8k53817llwy2pzhnpifh6ij159nxymjm8ar9qpbp"; depends=[pracma rms]; }; - nomogramFormula = derive2 { name="nomogramFormula"; version="1.1.0.0"; sha256="1cblsxyyizsjz079qlbvhmb51n2cmxxsrh1ca7xwxc0zj6ihg02w"; depends=[rms]; }; + nomogramFormula = derive2 { name="nomogramFormula"; version="1.2.0.0"; sha256="1j6g5kndl0n2g8acwq8pn09sk0bjcsphbcd77ha1j5dnwdmy73c0"; depends=[do Hmisc rms]; }; noncompliance = derive2 { name="noncompliance"; version="0.2.2"; sha256="1lcybgj95z7lz7p26xbsdiv0vvms4ab4f8kad0pclacf1l43v0j6"; depends=[data_table Rcpp]; }; noncomplyR = derive2 { name="noncomplyR"; version="1.0"; sha256="1a9m6r9cizw42nmy24jdsrsbllg5z84fs8b239axnh1fxzskg2qy"; depends=[MCMCpack]; }; nonet = derive2 { name="nonet"; version="0.4.0"; sha256="1043vplj8libbzll172h82dfwnz2lsdba5na2g9liryg8p08h4v8"; depends=[caret dplyr e1071 ggplot2 glmnet pROC purrr randomForest rlang rlist tidyverse]; }; nonlinearICP = derive2 { name="nonlinearICP"; version="0.1.2.1"; sha256="1m9a1f0yrbjl0nx2l7r76pyi78b2bxj8v4jx92yga91f975mw6np"; depends=[caTools CondIndTests data_tree randomForest]; }; - nonlinearTseries = derive2 { name="nonlinearTseries"; version="0.2.7"; sha256="0p6gkhiajk168jw92gkfl4nf93fp6a4ya0c3gvsn9vz8r07pvkbr"; depends=[Matrix Rcpp RcppArmadillo rgl TSA tseries zoo]; }; + nonlinearTseries = derive2 { name="nonlinearTseries"; version="0.2.8"; sha256="0m1pmw1vj6qsn5iavxbcpjlx5higp2viqvah5ivxxbvf0595zy1v"; depends=[Matrix Rcpp RcppArmadillo rgl TSA tseries zoo]; }; nonmem2R = derive2 { name="nonmem2R"; version="0.2.1"; sha256="0a7h9wb8dqjgzyk4hd9ivhy90n80wrrp4zkrxnvgfvza1619qd52"; depends=[ggplot2 gridExtra lattice latticeExtra MASS mvtnorm reshape2 splines2]; }; - nonmemica = derive2 { name="nonmemica"; version="0.9.0"; sha256="1vn70qynw2j2sf0z55dr9cl0inqzdk48xybsavcivn5dbl5lzzg2"; depends=[csv dplyr encode lazyeval magrittr metaplot rlang spec tidyr xml2]; }; + nonmemica = derive2 { name="nonmemica"; version="0.9.1"; sha256="0hhrg29wjqhb5pk13scg2zgqzzhf5azvfbph0rrfdb5qkj585awd"; depends=[csv dplyr encode lazyeval magrittr metaplot rlang spec tidyr xml2]; }; nonneg_cg = derive2 { name="nonneg.cg"; version="0.1.6"; sha256="15361k0kjy1465s8pr9jb5jy22mibi37zcnza7mbfh5l66hr29kh"; depends=[Rcpp]; }; - nonnest2 = derive2 { name="nonnest2"; version="0.5-2"; sha256="1bq44qqmm59j91m0sny4xnqmxqlga4cm48qdsw8xfs3x19xwmxk6"; depends=[CompQuadForm lavaan mvtnorm sandwich]; }; + nonnest2 = derive2 { name="nonnest2"; version="0.5-3"; sha256="1mnv4pa583ir9s03h952hk40lwdywr3g88g76sk1zsa54rcmn82c"; depends=[CompQuadForm lavaan mvtnorm sandwich]; }; nonpar = derive2 { name="nonpar"; version="1.0.1"; sha256="0pxks3nga7jrcvq0pzr1axj3a9xvzky836fl7966a09ws1vff7i4"; depends=[]; }; nonparaeff = derive2 { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[gdata geometry Hmisc lpSolve psych pwt rms]; }; nontarget = derive2 { name="nontarget"; version="1.9"; sha256="0ndqcr73sja5ks5kdahhakpz9lw3rp26imklagdv4f5agqnb608s"; depends=[enviPat mgcv nontargetData]; }; @@ -10892,8 +11047,7 @@ in with self; { nord = derive2 { name="nord"; version="1.0.0"; sha256="1gisqca85vzbqq5hs5bgqjgrjyksxj176x97kv9vv6mwll8kijl9"; depends=[ggplot2]; }; nordklimdata1 = derive2 { name="nordklimdata1"; version="1.2"; sha256="0c2hbh3qy8nrs275lxpzfgqsfgwp81m4kv0layvnjj09fcybm54x"; depends=[]; }; norm = derive2 { name="norm"; version="1.0-9.5"; sha256="01j1h412yfjx5r4dd0w8rhlf55997spgb6zd6pawy19rgw0byp1h"; depends=[]; }; - norm2 = derive2 { name="norm2"; version="2.0.2"; sha256="1bpkxgcz940mn7r62sn1w38kii93sjdxbvfayp0nhl4a2qanwxsm"; depends=[]; }; - normalp = derive2 { name="normalp"; version="0.7.0.1"; sha256="1gvbqirvb0q6c3831qqm5x7nj7rls1v7nfj7mf1nmwg5b0ljakp0"; depends=[]; }; + normalp = derive2 { name="normalp"; version="0.7.2"; sha256="0fqpz6v9v3xjmyh7mh2yvkjdn3v4d0nk93x7s0gj28kazl7137kz"; depends=[]; }; normalr = derive2 { name="normalr"; version="1.0.0"; sha256="1ahrg188vbhnrnwag0zi6lcb3g0y1mbz06sl3j1wyllq5l918cc7"; depends=[magrittr MASS purrr rlang shiny]; }; normtest = derive2 { name="normtest"; version="1.1"; sha256="073r2mwfs6c4vqh8921nlyygl0f20nhv997s0iwf00d3jckkc4pp"; depends=[]; }; normwhn_test = derive2 { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40hgdg24i2f28cdaw65hg9gmsgv4lsvvr2m3r74vi6"; depends=[]; }; @@ -10902,13 +11056,13 @@ in with self; { nortestARMA = derive2 { name="nortestARMA"; version="1.0.2"; sha256="11ala9z0snsbn1xmj9yzs4kyh9js1w19x0dnnmh5cbr9bi7aag50"; depends=[astsa]; }; nos = derive2 { name="nos"; version="1.1.0"; sha256="0hbncama8cx8q0rc56bil38fbj33z49v4d6zdkvxs6wgmmglnrfs"; depends=[dplyr gmp]; }; nose = derive2 { name="nose"; version="1.0"; sha256="17l78vmfqc22inq6zaqpnk2m91wp0nfjbbwfcpfqykf8lk9ipqna"; depends=[]; }; - nosoi = derive2 { name="nosoi"; version="1.0.0"; sha256="0g4s8324k46m8gfj1mdjiqz2cw4ips7nnzl8xyar89ylqy7gvqiw"; depends=[data_table dplyr magrittr raster reshape2 stringr]; }; + nosoi = derive2 { name="nosoi"; version="1.0.2"; sha256="1inmcbl39msfbw7f055p1qrpnpj4hi27anlbj6ig86jpkbjp5b2q"; depends=[data_table dplyr magrittr raster reshape2 stringr]; }; not = derive2 { name="not"; version="1.2"; sha256="1671j3yirzdyhb02khx1yddslyig5jlnb0bdbgdlkb21n4zwaqa4"; depends=[]; }; notifyR = derive2 { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; }; notifyme = derive2 { name="notifyme"; version="0.3.0"; sha256="0b6xrv6c4id7rs0dafg96pl4brn4yma5xh9wjz78ql44bg3w5s91"; depends=[dplyr httr magrittr]; }; nowcasting = derive2 { name="nowcasting"; version="1.1.4"; sha256="1nj34cbkv1xlhmcfhxs32shv00mz02rp95xj59qkq5by53sx8qwq"; depends=[corpcor DBI httr lubridate magic matlab Matrix RCurl RMySQL vars xts zoo]; }; noweb = derive2 { name="noweb"; version="1.1-2"; sha256="1h0v92l5jzgiy5rz33pan1l6rb3mykckmvn5c8jm3hhph6ipgqad"; depends=[]; }; - np = derive2 { name="np"; version="0.60-9"; sha256="1z4jcpx8bbgwslv42wrphfd1qfq965qjn0kmfxm5f6hbbycahcgy"; depends=[boot cubature quadprog quantreg]; }; + np = derive2 { name="np"; version="0.60-10"; sha256="06h8k0kdv5s258jr6s08fabvlycrbs7iq34jk2f2hfmqm2y4nyx2"; depends=[boot cubature quadprog quantreg]; }; npExact = derive2 { name="npExact"; version="0.2"; sha256="055wm5lcj98wb71lqp2zdyl8kkwvi6lwmnaylynvr907xqabaqvd"; depends=[]; }; npIntFactRep = derive2 { name="npIntFactRep"; version="1.5"; sha256="14ms66ppzb4jjsa3fparic6gdn913f6wv2ccjyb02j1ahs4iaa4g"; depends=[ez plyr]; }; npROCRegression = derive2 { name="npROCRegression"; version="1.0-5"; sha256="09ngfj0bd9cp19lpwsbknp2y71x36k03ph84bmf67wm1q2na7f93"; depends=[lattice]; }; @@ -10920,7 +11074,7 @@ in with self; { npbr = derive2 { name="npbr"; version="1.6"; sha256="1jvq4snwrwjhhjgm8n8yxd5y94ks5zzi0xwdn931yp300qnikyzc"; depends=[Benchmarking np quadprog Rglpk]; }; npcopTest = derive2 { name="npcopTest"; version="1.03"; sha256="1kpa3avi95aa93y038f4zqhhdp8vdscdk0c6397qmqjg34hf1dnr"; depends=[]; }; npcp = derive2 { name="npcp"; version="0.1-11"; sha256="0zkf01rv065x6sg8b8yal6125wbvjzaris5l9ghn2279q1fwdqz3"; depends=[]; }; - npcure = derive2 { name="npcure"; version="0.1-4"; sha256="0fdl903akry53cbk3cpmsfgzj71vmpz9qksk1dzrg8yzsql37mf6"; depends=[permute zoo]; }; + npcure = derive2 { name="npcure"; version="0.1-5"; sha256="0hf6w8w76qmjdsd6zgg85jj5ypmmg1a1ryzqwnxcypsdjxaq539z"; depends=[permute zoo]; }; nph = derive2 { name="nph"; version="2.0"; sha256="037vh3x3zlgg7jcbbwvcrlhm38d17zgz0m6d54y84mcclzzyc746"; depends=[ggplot2 mvtnorm]; }; nplplot = derive2 { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; }; nplr = derive2 { name="nplr"; version="0.1-7"; sha256="1h3qv9dlw2gx8km3slyvrl588nif1n87df8xwmm6p75ziqhn2f56"; depends=[]; }; @@ -10933,19 +11087,18 @@ in with self; { npphen = derive2 { name="npphen"; version="1.1-0"; sha256="0pbf9sqdapl5q09g1hj5hi4j2wigrd0b6s0gbv1gx4wn68alrals"; depends=[ks lubridate raster rgdal rts snow]; }; npreg = derive2 { name="npreg"; version="1.0-1"; sha256="0fsx71hc26zc26rwnvmmbrcy970xq92s63zllfa2q81c3jyf2qsh"; depends=[]; }; npregfast = derive2 { name="npregfast"; version="1.5.1"; sha256="0s9ci3nybzwykrgi9z2rqp6l15mqbxf759ks0clvkbm7wxv3whk5"; depends=[doParallel foreach ggplot2 mgcv sfsmisc shiny shinyjs wesanderson]; }; - nprobust = derive2 { name="nprobust"; version="0.2.1"; sha256="086x6p4ipd910nnm2whsvbjkvmjny69ryh0lw0j5jjq2ddah5p1i"; depends=[ggplot2 Rcpp RcppArmadillo]; }; + nprobust = derive2 { name="nprobust"; version="0.3.0"; sha256="0nb2ca6ljg1c2jmjhxrpfynrvmjzp5zr8dxwyhdhzl0smrkjybj4"; depends=[ggplot2 Rcpp RcppArmadillo]; }; nproc = derive2 { name="nproc"; version="2.1.5"; sha256="1p5wjz0rafg27fsl48l9pmki3px1k0pav3ignz4swik5i1nhnc8w"; depends=[ada e1071 glmnet MASS naivebayes randomForest ROCR tree]; }; nprotreg = derive2 { name="nprotreg"; version="1.0.0"; sha256="06n82i5m7sgfj759zdwwh8fqybkbchvnaaqcds64m6hbms592bh3"; depends=[expm]; }; npsf = derive2 { name="npsf"; version="0.5.2"; sha256="0iz4dh2cv1bi90wdf08x70rdm44xmzblck69rlg7vnsb6n2q2is9"; depends=[Formula randtoolbox Rcpp sfsmisc]; }; npsm = derive2 { name="npsm"; version="0.5.1"; sha256="00xh3x731lqb5vbzmfmlldrvc8s4s88dc394iifsn2g7r5naxks0"; depends=[plyr Rfit]; }; - npsp = derive2 { name="npsp"; version="0.7-5"; sha256="0ci3am6lbmb1raxdqj4ckcm7y1889j0zsk52awl15sjhkx8l2saa"; depends=[quadprog sp spam]; }; npsr = derive2 { name="npsr"; version="0.1.1"; sha256="1fzvilzjg9z05991sr1s1bdp17kfl6d1580qdllk8is9ac06np0v"; depends=[gmp infotheo MASS]; }; npst = derive2 { name="npst"; version="2.0"; sha256="1y5ij3nmh9pj6p97jpx75g26sk508mznr0l67cwj381zfb77hj1n"; depends=[]; }; npsurv = derive2 { name="npsurv"; version="0.4-0"; sha256="1wq4c9yfha5azjhrn40iiqkshmvh611sa90jp3lh82n4bl9zfk20"; depends=[lsei]; }; npsurvSS = derive2 { name="npsurvSS"; version="1.0.1"; sha256="0k9xvxii5527vynf7yy50j7z4jhxgk5ydhdcaaygm9ynx5yq14ip"; depends=[]; }; nptest = derive2 { name="nptest"; version="1.0-0"; sha256="13h93sx5fsbfiy3q88j4bl0p3hwqzi8l4ab0r0qha78dzd6skq2v"; depends=[]; }; nricens = derive2 { name="nricens"; version="1.6"; sha256="0fpgp6k3mhb0qxbx6248k9bscnmlzwj70mqh631a1nc4cpdjvw3q"; depends=[survival]; }; - nsRFA = derive2 { name="nsRFA"; version="0.7-14"; sha256="0sd3br2a5jf6mqbxk8s2i7px9vi9bk3pl8bd5884k40xqcj77irs"; depends=[]; }; + nsRFA = derive2 { name="nsRFA"; version="0.7-15"; sha256="004dm143v032b80knpz7pj3z71lci7vgd6hz1zz22rpfg27ghgdd"; depends=[]; }; nsROC = derive2 { name="nsROC"; version="1.1"; sha256="1fi7k61fja98kpn528jprjdycwz01rnqm368m82anxh21k7q4s1m"; depends=[sde survival]; }; nsapi = derive2 { name="nsapi"; version="0.1.1"; sha256="06xf2p6f911vwpzky47r35fjgjvlhp13p9pf1zlvjrv66kdw8vbp"; depends=[crul xml2]; }; nsarfima = derive2 { name="nsarfima"; version="0.1.0.0"; sha256="0iw1daha6c2l4zmqa0m917kgbx3d7mh7bhwbrsyxmvr5qs81drhk"; depends=[]; }; @@ -10960,18 +11113,15 @@ in with self; { nsprcomp = derive2 { name="nsprcomp"; version="0.5.1-2"; sha256="1zlc1ximx96f235c0l8qfs6vbp1kpnbf943wxsfahnnlnxvwi59f"; depends=[]; }; nsrr = derive2 { name="nsrr"; version="0.1.3"; sha256="11g0xgznd2n29cc9zxr0rrkqhxhjnp277gb7z871kgk6qnjswpwv"; depends=[digest httr jsonlite]; }; nucim = derive2 { name="nucim"; version="1.0.6"; sha256="0bw9a2xz2w5jlr2qlbia6jfm2yp09n3gzg8a630p1ks75xvlmkbx"; depends=[bioimagetools EBImage fields stringr]; }; - nullabor = derive2 { name="nullabor"; version="0.3.5"; sha256="0hnrawf8s2g0xjc9kh2p3pbdnbai7q71z7arab5mnrz6qbiyym34"; depends=[dplyr forecast fpc ggplot2 magrittr MASS moments purrr rlang tibble tidyr tidyverse tsibble]; }; + nullabor = derive2 { name="nullabor"; version="0.3.9"; sha256="19nfmsnzndg9pdjg7m9w4vm4c3209ny52cpjdhmmhggvf7dxaiyg"; depends=[dplyr forecast fpc ggplot2 magrittr MASS moments purrr rlang tibble tidyr tsibble viridis]; }; numDeriv = derive2 { name="numDeriv"; version="2016.8-1.1"; sha256="0idk02pqkziik932bd8k72d1q775g1is3m4bc861pcxfz6gx3i6q"; depends=[]; }; numGen = derive2 { name="numGen"; version="0.1.1"; sha256="1y41wq31r8126dz1sj23smq2k6v9yqczq4ddgzqb73dsrx9dmmc0"; depends=[]; }; - numKM = derive2 { name="numKM"; version="0.1.0"; sha256="0pnwb7skp5jx5ibgfkympq59m9sf71gvk5zc0fwik539vrzfykdf"; depends=[survival]; }; + numKM = derive2 { name="numKM"; version="0.2.0"; sha256="0g5jw12fmfc6nl6a3ghpslkjd2d7pbihl70sks35r7dalmr6ihzk"; depends=[survival]; }; numOSL = derive2 { name="numOSL"; version="2.6"; sha256="03h1p56650x4my5vq5jlmjsz5xj0w2j75qfr08rh7nr38dwgp1k8"; depends=[]; }; numbers = derive2 { name="numbers"; version="0.7-5"; sha256="1dz23rmjzdns4av28kk8bc9psj71q2bpcgm1m7sxnyzcxpm8hczc"; depends=[]; }; numbersBR = derive2 { name="numbersBR"; version="0.0.2"; sha256="0ihxlny745gpz1ngq862rydn1zwn8zni1xw9mmgw8hkylsrnjfq8"; depends=[stringr]; }; - numform = derive2 { name="numform"; version="0.5.0"; sha256="1c9vhzm4rjh8b5bkzkv1r9j2y1iqndq9ndandix28wdgn2v6lzv6"; depends=[glue]; }; + numform = derive2 { name="numform"; version="0.6.0"; sha256="0v19dcr5xwi0bf4s0qwipxpmxbw42l2li1h9i73kdrigznhlqq8h"; depends=[glue]; }; nutriNetwork = derive2 { name="nutriNetwork"; version="0.1.1"; sha256="0ya95h88jkiwc7cg7ic8bmyd7b0lgnhxrywwqvi2j6m6nbvvaxzy"; depends=[glasso huge igraph Matrix tmvtnorm]; }; - nutshell = derive2 { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_audioscrobbler nutshell_bbdb]; }; - nutshell_audioscrobbler = derive2 { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; }; - nutshell_bbdb = derive2 { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; }; nvctr = derive2 { name="nvctr"; version="0.1.1"; sha256="0hjrimg0hvwgkx2hbln6k8z0f2bp9kln7mxxh623qjp0hg4mcvcn"; depends=[magrittr pracma]; }; nvmix = derive2 { name="nvmix"; version="0.0-3"; sha256="0dvx21nfp82s7bk5vd9xxp9979w4mq8v1hx1zxa97sv2xr4g2m5y"; depends=[Matrix qrng]; }; nws = derive2 { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; }; @@ -10982,7 +11132,6 @@ in with self; { oaColors = derive2 { name="oaColors"; version="0.0.4"; sha256="040sdqrk9dciylnnrrshlj06s9qhvngii9shx1p8412ip7mk8r1m"; depends=[MASS RColorBrewer]; }; oaPlots = derive2 { name="oaPlots"; version="0.0.25"; sha256="0c5ig1ar02vg38pjjmp3gd53ij1j7pzajs0zrlfajz141qkv2ysr"; depends=[ggplot2 oaColors]; }; oai = derive2 { name="oai"; version="0.3.0"; sha256="1ipw9bq3ra66d1ddj1rylyyd20mlcb2i7phzhywra53s1fdifq1g"; depends=[httr plyr stringr tibble xml2]; }; - oak = derive2 { name="oak"; version="0.2.3"; sha256="1119llsv9pik6fpw3zhiz6xnqc2svsf0dfwcg9iywdjclv4bqqbs"; depends=[foreach purrr R6 rlang rlist rstudioapi]; }; oaqc = derive2 { name="oaqc"; version="1.0"; sha256="1rc0l79xygmr2rp5sjadzigbj65a13z5xlvrxzy26cl0wsxwhmjf"; depends=[]; }; oasis = derive2 { name="oasis"; version="3.0.4"; sha256="1h1w46rbkbsjvh3fjniy3v7y30r2vf1kiqs807kavf0bpb6a1202"; depends=[fslr mmand neurobase oro_nifti]; }; oaxaca = derive2 { name="oaxaca"; version="0.1.4"; sha256="12w5l2a8i2964rxy9km2srlycx35y7ia8p07ra7gsxr4h8156z3c"; depends=[Formula ggplot2 reshape2]; }; @@ -10998,15 +11147,17 @@ in with self; { obsSens = derive2 { name="obsSens"; version="1.3"; sha256="1vfm1mzsycwkqa39vf3fcdv1s6adps9hw1rxlvl8v9kq746hcabw"; depends=[]; }; observer = derive2 { name="observer"; version="0.1.2"; sha256="1027827k57qb4xppx0xxxffd1s3n7pz754irdx3v1v3piix8xi8m"; depends=[bazar bit dplyr lazyeval magrittr tibble]; }; occ = derive2 { name="occ"; version="1.1"; sha256="1aka29qqwbd494kvi15yyyqkb9hks4ky2gcvykxhx2drm2fnsn4g"; depends=[]; }; - oce = derive2 { name="oce"; version="1.1-1"; sha256="0hwfnpb6q6pmckzgh67ryvqd1jkrzzhn187x1655rnmkmp9zis1c"; depends=[gsw Rcpp testthat]; }; - oceanis = derive2 { name="oceanis"; version="1.0.6"; sha256="16sww5552xx04np8dxlqlhn1qzhjdmwd1z7b8dp9pskxbr9fhdb4"; depends=[classInt dplyr DT foreign ggplot2 leaflet leaflet_extras lwgeom mapview munsell readODS sf sfc shiny shinyBS shinyjs shinythemes stringr tidyr units xlsx]; }; - oceanmap = derive2 { name="oceanmap"; version="0.1.0.1"; sha256="0cdv5rizrlbzz1ifcqh726kmki0j68w829k9f0cfnckmh3rwj2y6"; depends=[abind extrafont fields lubridate mapdata maps maptools ncdf4 plotrix raster sp]; }; + ocd = derive2 { name="ocd"; version="1.0"; sha256="0r14w09wzyxp685jbzqj3dirnhsq106d23igl1jd5xpwbj2192n5"; depends=[]; }; + oce = derive2 { name="oce"; version="1.2-0"; sha256="18ls8c8ia00dn9f9lxk01mvwqmxd1ilx1d7y59d1nixd40mjy1wr"; depends=[gsw Rcpp testthat]; }; + oceanis = derive2 { name="oceanis"; version="1.0.7"; sha256="0vlac6clq8902x3s6abl9ljwwk5a5gzxs66hij0080lj28l1wr82"; depends=[classInt dplyr DT ggplot2 leaflet leaflet_extras lwgeom mapview sf shiny shinyBS shinyjs shinythemes stringr units]; }; + oceanmap = derive2 { name="oceanmap"; version="0.1.1"; sha256="06h4yxqcn3rjr3m2n82w128z110a4k5rg6msrbd0gcqksxc4vd2v"; depends=[abind extrafont fields lubridate mapdata maps maptools ncdf4 plotrix raster sp]; }; oceanwaves = derive2 { name="oceanwaves"; version="0.1.0"; sha256="0izgnqjji3xrvv8xbpsdbrx53wdb3rg3045xx6gcknfl2fj5iky7"; depends=[bspec ggplot2 signal]; }; - ocedata = derive2 { name="ocedata"; version="0.1.5"; sha256="0rs3nzacvg5mbbmbhcj8g9ikjlw26x2mka7lp644l17kgmzzynh6"; depends=[testthat]; }; + ocedata = derive2 { name="ocedata"; version="0.1.6"; sha256="0rf02bx7bb00ipp23jbpj2xdmj15xzi54qw3hms3ccghmaj40a28"; depends=[testthat]; }; ockc = derive2 { name="ockc"; version="1.0"; sha256="0chzrs3ipa2518r4d35z4fxffgq12p1mwj0hzkxw19gdgq6aa8s7"; depends=[flexclust modeltools]; }; oclust = derive2 { name="oclust"; version="0.1.0"; sha256="005ml6vhi9rw6js2v4f1dc2ci8kcd7iwrkgbs4c1qxc836ygq0yx"; depends=[entropy mclust]; }; ocomposition = derive2 { name="ocomposition"; version="1.1"; sha256="0fk8ia95yjlvyvmjw7qg72piqa40kcqq9wlb3flc6a81pys1ycb5"; depends=[bayesm coda]; }; ocp = derive2 { name="ocp"; version="0.1.1"; sha256="0q52s8j3z3xwnma3sxx6019qxid66bf0a43w4g8xjagplwps57dx"; depends=[]; }; + ocs4R = derive2 { name="ocs4R"; version="0.1"; sha256="1sm2fl503ky4pxv9873zykidb56f7dygq1xckjsh0d7m78n4gzx5"; depends=[curl httr jsonlite openssl R6 XML]; }; odbc = derive2 { name="odbc"; version="1.2.2"; sha256="1p30n1f6yfx80rk29l94asdi0chk4c7h6pp09aq9bbsq9g8109dq"; depends=[BH bit64 blob DBI hms Rcpp rlang]; }; odds_converter = derive2 { name="odds.converter"; version="1.4.8"; sha256="09s8pg55gpsxmrbimzg5rsr1n07la93781sar6vab5p9zn9zxgx4"; depends=[]; }; odds_n_ends = derive2 { name="odds.n.ends"; version="0.1.1"; sha256="0kgdv4m14h4a16b0k2s2qjyjn0kxk5sf4qkbi6ikm6kqdh5ashp4"; depends=[MASS]; }; @@ -11015,32 +11166,38 @@ in with self; { odeintr = derive2 { name="odeintr"; version="1.7.1"; sha256="0wfb5lgv10p0qyfbn9hdg14bda37v43lpgbwv6nbw63zzbsbazqi"; depends=[BH Rcpp]; }; odin = derive2 { name="odin"; version="1.0.1"; sha256="1m1rqlh9z6hpna6qhyxhavqph3j66hbd2b5md5ha2hrbjq93yynm"; depends=[cinterpolate crayon deSolve digest jsonlite R6 ring]; }; odk = derive2 { name="odk"; version="1.5"; sha256="0fcnr4c1clwx1sk6fgg4cx506gdi90n2h05g0i47p4s5bra0qwwl"; depends=[gsheet openxlsx]; }; - odpc = derive2 { name="odpc"; version="2.0.1"; sha256="06d574sj7p5qlf7s3lbrwd56mcs4lq3pn9bkzwxhpybibgrfzn5q"; depends=[doParallel foreach forecast Rcpp RcppArmadillo]; }; - odr = derive2 { name="odr"; version="1.0.0"; sha256="0niadinljx5pph329dgixivdc9s1l27ik9755fbfhmplhj92ihi2"; depends=[]; }; + odpc = derive2 { name="odpc"; version="2.0.2"; sha256="0wmra56w9k1bp27lhv6ssz400ggzmggl7l32vxkhynnxr0aphx7c"; depends=[doParallel foreach forecast Rcpp RcppArmadillo]; }; + odr = derive2 { name="odr"; version="1.0.2"; sha256="0dj5piyd6h92q6agv8yvzky3qpxjn6zpgvf502hf0n6k9gx6kdpl"; depends=[]; }; + oenb = derive2 { name="oenb"; version="0.0.1"; sha256="1x1jlqp6r27c4gb7wafzpmh5rq6yq61a2d395r5lsmv2g5jb4biz"; depends=[dplyr XML]; }; ofGEM = derive2 { name="ofGEM"; version="1.0"; sha256="0xdkl8k12an9pdy6i5nay4m2iakrwsp0lr3zl8gphii75j0ywz7k"; depends=[CompQuadForm forestplot MASS]; }; - officer = derive2 { name="officer"; version="0.3.6"; sha256="1i6jmnbkx7gd0qyf6akhizmxp7y1dh3h7a886mcbmrzka9d60zh4"; depends=[base64enc digest htmltools magrittr R6 Rcpp rlang uuid xml2 zip]; }; - offlineChange = derive2 { name="offlineChange"; version="0.0.2"; sha256="1d8jm8mm8g1fcbffk697qap58dcw3yyvrm9daviy42jsz59nbsxs"; depends=[Rcpp]; }; + officer = derive2 { name="officer"; version="0.3.8"; sha256="0xhx5n6qksyh2s9hvwhnc8y0hn362asc5y94ld06snad786hz0rw"; depends=[magrittr R6 uuid xml2 zip]; }; + offlineChange = derive2 { name="offlineChange"; version="0.0.4"; sha256="005afrm4ki4zz3zkgrf8c1v9gf5cjhc5g50mjkqya3r8npaccwq2"; depends=[Rcpp]; }; oglmx = derive2 { name="oglmx"; version="3.0.0.0"; sha256="13axmhbqhv4kkcdsdmp9r7p0d0kyqlsaqgyyllbkxlxb4hfz79b6"; depends=[maxLik]; }; ohenery = derive2 { name="ohenery"; version="0.1.1"; sha256="0i7cc110c30y7dm86srh2xkikkmlr28mvy0kkjxywxmiwnrsmzjq"; depends=[dplyr magrittr maxLik Rcpp]; }; ohtadstats = derive2 { name="ohtadstats"; version="2.1.1"; sha256="0hkjs322vii1dsminlkwpwi12sc9pd88jag7p4dmy6nfw2hh2d69"; depends=[lattice]; }; oii = derive2 { name="oii"; version="1.0.2.1"; sha256="1n41hikn53ikyynsravg127cw5csa8s0s1l63w5hym7c6j625ya5"; depends=[Deducer gmodels rapportools]; }; + ojsr = derive2 { name="ojsr"; version="0.1.0"; sha256="0lgpdcavk60qyqn3fprqmyi4bi43kjd8llnpb3bibx7h010kg834"; depends=[dplyr magrittr oai purrr rlang rvest stringr tidyr urltools xml2]; }; okcupiddata = derive2 { name="okcupiddata"; version="0.1.0"; sha256="1l04rr4yr73a6q2am9ylyr5prf347hkf2jx735w78rsb6472kbaq"; depends=[]; }; okmesonet = derive2 { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; }; olctools = derive2 { name="olctools"; version="0.3.0"; sha256="1gbchwynvmryarz32f24v56kj57h7x6nrrm878fkjkpq140cqwzz"; depends=[Rcpp]; }; + ollggamma = derive2 { name="ollggamma"; version="1.0.2"; sha256="1990hr9gww636xr4gkvc816hd0pc78nw3ypbzflkh5g3pmsn7bc2"; depends=[]; }; olr = derive2 { name="olr"; version="1.1"; sha256="1l6m2gbglh8idy4k2q23qgfb7in1a6pnwiji1gbygfan6paw4xza"; depends=[plyr]; }; - olsrr = derive2 { name="olsrr"; version="0.5.2"; sha256="13qampcc07qfjj4r3ira0m1j2wgnrkf5p1wswr9g814azhm52haz"; depends=[car checkmate cli clisymbols crayon dplyr ggplot2 gh glue goftest gridExtra magrittr nortest purrr Rcpp recipes rlang shiny stringr tibble tidyr]; }; + olsrr = derive2 { name="olsrr"; version="0.5.3"; sha256="0rh1jb0z0ypspzcp4vbpzjz960yj76myk2j4zb1vi9gnnj3clw8y"; depends=[car data_table ggplot2 goftest gridExtra nortest Rcpp]; }; omd = derive2 { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; }; omics = derive2 { name="omics"; version="0.1-5"; sha256="1y2x33mfgq98nglhvpr1wq1v6nfiq4njy2yac47x72rpwxsj9vb1"; depends=[lme4 pheatmap]; }; + omicwas = derive2 { name="omicwas"; version="0.3.1"; sha256="14vx9mhy51ma05m85plsnx53rhq1rd4nw9709sf8ibc55gdrfg5l"; depends=[broom data_table dplyr ff glmnet magrittr MASS matrixStats PCDimension R_utils ridge rlang sva tidyr]; }; ompr = derive2 { name="ompr"; version="0.8.0"; sha256="1nmd5wa1g2xzmwqfqf882bxcrmkxbb5b414cbbzvmqzfs34yk6bl"; depends=[data_table lazyeval Matrix progress Rcpp rlang]; }; ompr_roi = derive2 { name="ompr.roi"; version="0.8.0"; sha256="1cbrchvpd31lxpxvw2l3q9k5jmffarb1shca8kwm76y5a6zxxq63"; depends=[Matrix ompr ROI slam]; }; omu = derive2 { name="omu"; version="1.0.2"; sha256="03mj5xk447gadsnvqrm97cjcyfq4xzkgc46kw85gishv7w9qmqrk"; depends=[dplyr ggfortify ggplot2 KEGGREST magrittr plyr reshape2 stringr tidyr]; }; oncomodel = derive2 { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; }; - oncrawlR = derive2 { name="oncrawlR"; version="0.1.8"; sha256="0l7b3gx21jli97jq0i87bkp01v1b4xmmh9k4zjhdij6412rv0rfh"; depends=[caret DALEX dplyr e1071 formattable fs ggplot2 htmltools jsonlite pdp pROC RCurl readr rlang rlist scales sparkline tidyr webshot xgboost]; }; + oncrawlR = derive2 { name="oncrawlR"; version="0.2.0"; sha256="0cm26diaf3jlzfrpgh13q0hakakmj6vy41wk9z0w81az4jcg9sn9"; depends=[caret DALEX dplyr e1071 formattable fs ggplot2 htmltools jsonlite pdp pROC RCurl readr rjson rlang rlist scales sparkline tidyr webshot xgboost]; }; onehot = derive2 { name="onehot"; version="0.1.1"; sha256="1cdsz007wr054k5phvihhg4qx0fc039k2s6484m92kws8mb2ziix"; depends=[]; }; onelogin = derive2 { name="onelogin"; version="0.2.0"; sha256="06p3a8kaxmvsj8nn7dy8w6wv1jjw67is991hqg9q0fa20ifym3dl"; depends=[glue jsonlite magrittr R6 safer tibble]; }; - onemap = derive2 { name="onemap"; version="2.1.2"; sha256="142yasn8pyd046d8s0k3i4ynmpq7rh6v2vjdnj88yn99zshaxfig"; depends=[ggplot2 MDSMap plotly Rcpp reshape2]; }; + onemap = derive2 { name="onemap"; version="2.1.3"; sha256="0fwkr845zz0j8ccrwpksb28lly1rsgj3603ak1aqqgmlx6481p08"; depends=[ggplot2 MDSMap plotly Rcpp reshape2]; }; + onemapsgapi = derive2 { name="onemapsgapi"; version="1.0.0"; sha256="11w3xkjxhjf0b78hfjxjk650giswaf1js471backz4pcb97gaigl"; depends=[dplyr furrr future httr purrr rlang stringr tidyr]; }; onewaytests = derive2 { name="onewaytests"; version="2.4"; sha256="1rsamf6mwpah02zwpv270sn17aaav0c030wlsv90k2awmkms2ka6"; depends=[car ggplot2 moments nortest]; }; onion = derive2 { name="onion"; version="1.2-7"; sha256="17jx7saxcsahyyivln4v9fzzcmidy6ygjd9n81skv5jpr491zkgk"; depends=[]; }; + onlineCOV = derive2 { name="onlineCOV"; version="1.3"; sha256="04ikvsd76f6xhja7djyv433m88lfj2vf0y9qi6x1s4i9kh8xkbz9"; depends=[]; }; onlinePCA = derive2 { name="onlinePCA"; version="1.3.1"; sha256="08qivsfnwz5vp089lv9czsaz3nfi42kn9yhgzf27dji18y2xscic"; depends=[Rcpp RcppArmadillo RSpectra]; }; onlineVAR = derive2 { name="onlineVAR"; version="0.1-1"; sha256="01z2d91mbdjvwwiqjq1dbqp50jbc9v6d7nw4gs7d1abhsqyiqa13"; depends=[lattice]; }; onls = derive2 { name="onls"; version="0.1-1"; sha256="0m7pnlzkqwzi6jncjzxzfvznipd4wg03zd9fc0ymwm9jvhm4p14g"; depends=[minpack_lm]; }; @@ -11048,72 +11205,75 @@ in with self; { ontologyIndex = derive2 { name="ontologyIndex"; version="2.5"; sha256="127hlf0z5fmbgnq4p9h8nvn6p72d2fpcn846zzb99s213421jnry"; depends=[]; }; ontologyPlot = derive2 { name="ontologyPlot"; version="1.4"; sha256="0sj1jg9lr1w3ahzw7fj86vp2bnvf4nq0x3hiqb3hzngwyj9bykpn"; depends=[ontologyIndex paintmap Rgraphviz]; }; ontologySimilarity = derive2 { name="ontologySimilarity"; version="2.3"; sha256="1rh3cpj3r82xp4gqvspvgwwi3a29gyi0azrf4r1nshhi8qdx9avw"; depends=[ontologyIndex Rcpp]; }; + oolong = derive2 { name="oolong"; version="0.3.4"; sha256="1zhgk9y1iy90kn6kwx2r80jy6fymgkd59c03xx936sijk0wnpwrq"; depends=[cowplot digest dplyr ggplot2 irr miniUI purrr quanteda R6 shiny stm text2vec tibble]; }; oompaBase = derive2 { name="oompaBase"; version="3.2.9"; sha256="1cmw2s5dznmv675484jgvkzgvi6vhg0zbxsq6zhpqsisf672pjhl"; depends=[cluster]; }; oompaData = derive2 { name="oompaData"; version="3.1.1"; sha256="0by9qfxlx6fdmp12qnphlli5hdn5balvx4ckg64fw6vwa291g7b0"; depends=[]; }; opalr = derive2 { name="opalr"; version="1.3.0"; sha256="029sxy31in377p7s25y601vmdhcxxs6cn36xvqhkxcx15j96mprp"; depends=[httr jsonlite mime progress xml2]; }; opart = derive2 { name="opart"; version="2019.1.0"; sha256="0yw4vlip4whhvp23yjr57h5j0ii8ighp77g3fjjzr3l56slmrmcz"; depends=[]; }; openCR = derive2 { name="openCR"; version="1.4.1"; sha256="046ijw5ss8nb0m11p7r682zi7242m0ljydnsrr3gwrnmc4ayk6xv"; depends=[abind MASS nlme plyr Rcpp RcppParallel secr stringr]; }; - openEBGM = derive2 { name="openEBGM"; version="0.8.2"; sha256="0v6jr1yry937knvkrn448rkilwfl7w90169lm5vnp53ds6fhh7bj"; depends=[data_table ggplot2]; }; + openEBGM = derive2 { name="openEBGM"; version="0.8.3"; sha256="120lp7fy6abj6f8g6naq4018d0dfzz6bq3dlh0xdhd4iclb7pplv"; depends=[data_table ggplot2]; }; openNLP = derive2 { name="openNLP"; version="0.2-7"; sha256="15yl74wv6w1d2wwpn1xlkkpam3c62977gnqal651fv623v29gg35"; depends=[NLP openNLPdata rJava]; }; openNLPdata = derive2 { name="openNLPdata"; version="1.5.3-4"; sha256="0j45rh9qki8r5wavaysrfsvb3wc3x8jjicqff2yi0r34j58xvlv8"; depends=[rJava]; }; openSTARS = derive2 { name="openSTARS"; version="1.1.0"; sha256="1cjws49r22cmdax136zcy3k35yzbajkm6pyfibgcw2iqdxy1vcxg"; depends=[data_table progress raster rgdal rgrass7 sf sp SSN]; }; - openVA = derive2 { name="openVA"; version="1.0.8"; sha256="17nqh43gmhlb383ack1pbjkdfdb2g0k527zprdp1xkyxbp92v7xa"; depends=[cli crayon ggplot2 InSilicoVA InterVA4 InterVA5 Tariff]; }; + openVA = derive2 { name="openVA"; version="1.0.10"; sha256="0ly0pwwj40sylv2c96siyq38j491527x4dd02xga9cnscinpbgvp"; depends=[cli crayon ggplot2 InSilicoVA InterVA4 InterVA5 Tariff]; }; openadds = derive2 { name="openadds"; version="0.2.0"; sha256="1jb8zd3rpxfkjkg895iab6m4cfi53p5vy3nnpjkgq7ym6499qjcv"; depends=[crul dplyr jsonlite maptools rappdirs readr tibble xml2]; }; - openair = derive2 { name="openair"; version="2.7-0"; sha256="1h2hyk93xvcw3i86k1kw7w9y2s39l6xnj7hjqp3wawgm4nnsr5kp"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr Rcpp readr rlang tidyr]; }; - openblender = derive2 { name="openblender"; version="0.3.4"; sha256="0lf6gm1kzslqkrps2wasavfqwaz80q67jjrzf38m1dls0nwzvh1x"; depends=[httr jsonlite xml2]; }; + openair = derive2 { name="openair"; version="2.7-2"; sha256="1bbhnbg9v2n3g4cnd3ryivdbid9kdcd45m0rfxr0hxbcq3a8gwmk"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr Rcpp readr rlang tidyr]; }; + openblender = derive2 { name="openblender"; version="0.5.71"; sha256="0imk1pam0rcdwclnz66n4bvwj94l6dc63fayar3ampd8j2mxpa4q"; depends=[httr jsonlite]; }; opencage = derive2 { name="opencage"; version="0.1.4"; sha256="1lqs38lml73axsjlsjkmcsb2irgs40mjrx2cn3k0bjb63qyb9hf5"; depends=[dplyr httr jsonlite memoise]; }; - opencastR = derive2 { name="opencastR"; version="0.1.2"; sha256="0fnp4bsr35knff7q19jqmlwdnfh9qzk2zsvg92y3pg1g64fmxazv"; depends=[httr jsonlite]; }; - opencpu = derive2 { name="opencpu"; version="2.1.5"; sha256="1s2jzssiqcf4n6zqb1hj78zpm6rh13r6vbk0drydc6iwqdhg302h"; depends=[brew curl evaluate httpuv jsonlite knitr mime openssl protolite rappdirs remotes sys webutils zip]; }; + opencastR = derive2 { name="opencastR"; version="0.1.3"; sha256="1ljn7bzrqc2sgah1a6q2g9hi38nm8davhdc2vyzx7d40z7ysfpas"; depends=[httr jsonlite]; }; + opencpu = derive2 { name="opencpu"; version="2.1.6"; sha256="0wv357288j3wl8mgm8yr7yzm2z0hzdg7k1056smhxjlrb42bww95"; depends=[brew curl evaluate httpuv jsonlite knitr mime openssl protolite rappdirs remotes sys webutils zip]; }; opencv = derive2 { name="opencv"; version="0.1"; sha256="0m649g6k6cgxnljjx8czypjawbyzx7xjcg32wddxkrgi2b236lwh"; depends=[magrittr Rcpp]; }; - opendatatoronto = derive2 { name="opendatatoronto"; version="0.1.1"; sha256="1rabbpq1jmihrm5wz8i5pkxfhpbm8x6dk3bqj56fnkzqkmg6zwjj"; depends=[ckanr geojsonsf magrittr readxl sf tibble xml2]; }; + opendatatoronto = derive2 { name="opendatatoronto"; version="0.1.3"; sha256="1rcdv2zk3ckrp2fig71lgzw5i06767qqlrdj80r4b522nxx7npyn"; depends=[ckanr curl magrittr readxl sf tibble xml2]; }; opendotaR = derive2 { name="opendotaR"; version="0.1.4"; sha256="17cygsw3nkg6zincfrcdh1509rlz3n5zrv9wvv7mjngm61sn79nf"; depends=[dplyr jsonlite lubridate]; }; openintro = derive2 { name="openintro"; version="1.7.1"; sha256="059azlasdkmp8f54qpjf3mq5dyqakw0dgx0kx85wfdmhq38zal5n"; depends=[]; }; + openmetrics = derive2 { name="openmetrics"; version="0.1.1"; sha256="16glrs2wisfkhnhmd11554fg9yp3axkj81kmwxcw12fgsq1bk52q"; depends=[R6]; }; openssl = derive2 { name="openssl"; version="1.4.1"; sha256="1ihz2qi33lhngl19xdanq0pbmfaacy63794mg8ll7z2lab3yryzp"; depends=[askpass]; }; opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; }; - opentripplanner = derive2 { name="opentripplanner"; version="0.2.0.4"; sha256="15r6n3bkmiwir30v82ajzl2drhw2x2shjnwjs3ddqkczak2v4q8c"; depends=[checkmate dplyr geodist googlePolylines httr jsonlite pbapply sf]; }; + opentripplanner = derive2 { name="opentripplanner"; version="0.2.1.0"; sha256="0qml2mwpmbp91w2c6aynyssfffp88jdz995gh8j4pj7150bvsihy"; depends=[checkmate dplyr geodist googlePolylines httr jsonlite pbapply sf]; }; openxlsx = derive2 { name="openxlsx"; version="4.1.4"; sha256="1mwxldw9i9nfksx1i6h1kfs7vmsz9fgyllbsipar4vnfyqhqp8q7"; depends=[Rcpp stringi zip]; }; + opera = derive2 { name="opera"; version="1.1"; sha256="1nvm7a1g0pzzlpyk7g5plys1byl4xq2wz59hqys5gxiq0y5sgqwm"; depends=[]; }; operator_tools = derive2 { name="operator.tools"; version="1.6.3"; sha256="1v4dg7xhz24dnp0zxn815x1405ig64ibii6y40la1gvmzcc41dz5"; depends=[]; }; operators = derive2 { name="operators"; version="0.1-8"; sha256="0zgcv2q46qyqv4dhbd33s4044zjw38w8dqfpzs0c1lxjpkil3dnx"; depends=[]; }; - oppr = derive2 { name="oppr"; version="0.0.4"; sha256="1wxdrcchg8izdr4zdvq8dpgz5n2m4b5w4lavmvd3vhvjs6i6bb60"; depends=[ape assertthat cli ggplot2 lpSolveAPI magrittr Matrix proto Rcpp RcppArmadillo RcppProgress tibble tidytree uuid viridisLite]; }; + oppr = derive2 { name="oppr"; version="1.0.1"; sha256="17jmwag893ccl9x9xixig91yamb8xl8g8ahbdrhcnrr8jnxnswi2"; depends=[ape assertthat cli ggplot2 lpSolveAPI magrittr Matrix proto Rcpp RcppArmadillo RcppProgress tibble tidytree uuid viridisLite]; }; ops = derive2 { name="ops"; version="1.0"; sha256="0cvwyn5sz5lx8sin8w4k8ymslfl4nfaa012a9vcl2hvp4850rk25"; depends=[]; }; optAUC = derive2 { name="optAUC"; version="1.0"; sha256="0j1llzqa3n7kqw3i5bb7284z0hi6s5jbjfl9zap0l7xf6hg4x1dn"; depends=[MASS]; }; optBiomarker = derive2 { name="optBiomarker"; version="1.0-27"; sha256="1kkj602d4klwyd8kylawgfysg8dlp2g6j7afkppzv5x8mbhs5ji4"; depends=[e1071 ipred MASS Matrix msm randomForest rgl rpanel]; }; - optCluster = derive2 { name="optCluster"; version="1.2.0"; sha256="144pk0iqng5qqpq40r65hakpqllnpd184wpgf4j9za1mkwb4il45"; depends=[cluster clValid gplots kohonen MBCluster_Seq mclust RankAggreg]; }; + optCluster = derive2 { name="optCluster"; version="1.3.0"; sha256="0vzdd9awxli0zzyh2xb7j7wxza3fz5awyz6bjwf13qbjrrq43q2q"; depends=[cluster gplots kohonen MBCluster_Seq mclust RankAggreg]; }; optDesignSlopeInt = derive2 { name="optDesignSlopeInt"; version="1.1"; sha256="0vpm4359rq5v231k63vgaac6iv2ybfkcpy59n86djb710b3h2qcn"; depends=[MCMCpack neldermead]; }; optR = derive2 { name="optR"; version="1.2.5"; sha256="0q7jf4m0gzm11izl5lff17pvr855smqmc6zzi1bc7m6h3z865l32"; depends=[]; }; optband = derive2 { name="optband"; version="0.2.1"; sha256="1rv4r7h7x3xipav917cz9bcr6nqjzbinfrqxv8mcls9gdl9ha3y9"; depends=[LambertW]; }; optbdmaeAT = derive2 { name="optbdmaeAT"; version="1.0.1"; sha256="1y1mvcyjihpj1wgjmifhmd10717wr1srp7h87azs4gfypgsiqchn"; depends=[igraph MASS Matrix]; }; optextras = derive2 { name="optextras"; version="2019-12.4"; sha256="1sqkid6h13h8i8wzri26s828ycwlxlwpwxd85r8bw9h8hs1n602r"; depends=[numDeriv]; }; optiRum = derive2 { name="optiRum"; version="0.40.1"; sha256="1kl9mzh53pwhrxbn89dsjjpfji7k8vmysscd1qd9sw7vqdan8g6x"; depends=[AUC data_table ggplot2 knitr plyr scales stringr XML]; }; - optiSel = derive2 { name="optiSel"; version="2.0.2"; sha256="0k3651h7ih59w13jzkbh8m5pddi1g1zci5rn9dm3b873yjr2nalx"; depends=[data_table doParallel ECOSolveR foreach kinship2 magic MASS Matrix nadiv optiSolve pedigree plyr pspline purrr quadprog Rcpp RcppArmadillo reshape2 stringr]; }; - optiSolve = derive2 { name="optiSolve"; version="0.1"; sha256="1wnpj7z0vqf91gzgz6r2ympnljq4mczxnnyk3sq7gvf6df4ic2m1"; depends=[alabama cccp MASS Matrix nloptr plyr Rcpp Rcsdp shapes stringr]; }; + optiSel = derive2 { name="optiSel"; version="2.0.3"; sha256="0wkvpwvcckhsjnk17pgdrbsl0qihdpibjbmw2x5izc0vj2zw7fzf"; depends=[data_table doParallel ECOSolveR foreach kinship2 magic MASS Matrix nadiv optiSolve pedigree plyr pspline purrr quadprog Rcpp RcppArmadillo reshape2 stringr]; }; + optiSolve = derive2 { name="optiSolve"; version="0.1.2"; sha256="0jlxn2rkq6dj59p84f0xdkdgl1yzfbf3ldxryb612j9ivcfkcrvp"; depends=[alabama cccp MASS Matrix nloptr plyr Rcpp shapes stringr]; }; opticskxi = derive2 { name="opticskxi"; version="0.1"; sha256="1vdz5sgjgyh2nj034w87d2yxcbbg97f1b0vijlwzwjkrfz5knfhl"; depends=[ggplot2 magrittr]; }; opticut = derive2 { name="opticut"; version="0.1-2"; sha256="1j479wa7mlp62c2y7shha1w7ybhfy8wvjfaz27kmwd1f61ma1g0l"; depends=[betareg MASS mefa4 pbapply pscl ResourceSelection]; }; optifunset = derive2 { name="optifunset"; version="1.0"; sha256="18pvdl04ln1i0w30ljdb3k86j27zg2nvrn3ws54c1g6zg9haqhbg"; depends=[]; }; optigrab = derive2 { name="optigrab"; version="0.9.2.1"; sha256="1c3q4kx8rkgpjsy0hy2w2dd9kv51avnw1ab82hzmjgngfnvaig0n"; depends=[magrittr stringi]; }; optim_functions = derive2 { name="optim.functions"; version="0.1"; sha256="1la3v8yd9cdichp3mka4x86hr9lynh6qfg7h9ab6cwijw6kzkn6g"; depends=[lhs randtoolbox stringr]; }; optimCheck = derive2 { name="optimCheck"; version="1.0"; sha256="1qjkv1mfyn7sw0dkxxcdaqj85vl71cgffpf3k3mvzy0s8yhxjb4n"; depends=[]; }; - optimParallel = derive2 { name="optimParallel"; version="0.8-1"; sha256="176m425pp3jf48jip513hvbrvgjv78qzylmksqw5ks8yhylq41l9"; depends=[]; }; - optimStrat = derive2 { name="optimStrat"; version="2.0"; sha256="0n9igrxyasl2h2xjsx044ma3nqbd8258psc2h6za2pw6jjwwlz4g"; depends=[cubature mvtnorm shiny]; }; + optimParallel = derive2 { name="optimParallel"; version="1.0"; sha256="1m7rny7c1x1kaa4swqndhmb83ilihp3ksyfpys9mqlzchja96229"; depends=[]; }; + optimStrat = derive2 { name="optimStrat"; version="2.1"; sha256="0splvrnrs8ayiycyxs02vcs5m0s2r68sblmcdlbi49fmxgw48di9"; depends=[cubature mvtnorm shiny]; }; optimalThreshold = derive2 { name="optimalThreshold"; version="1.0"; sha256="1m39q36p7i7z31b90awriq5jf9rfybyw5lj3m1w33v2ssipkzp1n"; depends=[ars coda HDInterval mgcv rjags]; }; optimbase = derive2 { name="optimbase"; version="1.0-9"; sha256="0ivz24kf3yacgq5bl3s3az1pcyhsz0cza5f8vdksy5gchwqplm8n"; depends=[Matrix]; }; optimization = derive2 { name="optimization"; version="1.0-7"; sha256="09s62ax3w8zijfp2cmh2lvdqbl3nijbjkwq4n3icasi53lzg2179"; depends=[colorspace Rcpp]; }; - optimos_prime = derive2 { name="optimos.prime"; version="0.1.1"; sha256="0r7xjx86m4bklqss7h4cfsw69q74z4z6y40vfrbd6j3qz9ay66xg"; depends=[ggplot2 plotly tidyverse]; }; + optimos_prime = derive2 { name="optimos.prime"; version="0.1.2"; sha256="1a76gfzpd2s4gq15cd3frndak7wc6q3xqh9sllkk665031fx6z1h"; depends=[ggplot2 plotly tidyverse]; }; optimr = derive2 { name="optimr"; version="2019-12.16"; sha256="003wz9r3xdi47ad22l4dkhp0dalknb2s9fp82yamjx7x1xbfvcbk"; depends=[numDeriv optextras Rcgmin Rvmmin setRNG]; }; optimsimplex = derive2 { name="optimsimplex"; version="1.0-7"; sha256="1if32133556zwmijlz6085fg1h65442hy03lzia0ahap3yndqfqy"; depends=[optimbase]; }; optimus = derive2 { name="optimus"; version="0.2.0"; sha256="01njyjfrm6kjwx2qq41c0hsgxzydnrmr3538cpbfdn5i0z5blgyx"; depends=[mvabund ordinal]; }; - optimx = derive2 { name="optimx"; version="2018-7.10"; sha256="0npzgb5ky3p2iky4917grmysawh7mb5gwz4i7ssmh73ypqnndfhk"; depends=[numDeriv]; }; + optimx = derive2 { name="optimx"; version="2020-4.2"; sha256="00bi2sr2hr7x6cfwlsn7hz2r56lcyv9naa8vmfcgr1r269fc50b3"; depends=[numDeriv]; }; + optinterv = derive2 { name="optinterv"; version="0.1.0"; sha256="1yvjb9fyqj3pfglfdwdq4kpw9i5g5i3klgpqb05xdnacbnpdxvmp"; depends=[boot distances Hmisc lattice pbapply rootSolve weights]; }; optional = derive2 { name="optional"; version="2.0"; sha256="0hj0gwvk9svllv44kfdgv3a2mriwqnaxvn3rj7w1djha7mryl6jl"; depends=[magrittr]; }; optionstrat = derive2 { name="optionstrat"; version="1.4.1"; sha256="0vidaf888zdls5yxy7637fqg6r39l3rxw9bhn16s4xmag7kawljv"; depends=[]; }; - optiscale = derive2 { name="optiscale"; version="1.1"; sha256="1c263w9df66m7lgvzpdfm2zwx9nj8wcdpgh5gijachr2dzffmrp2"; depends=[lattice]; }; - optismixture = derive2 { name="optismixture"; version="0.1"; sha256="0nacfbqlnzajp1hfhf0yzm2d86fxpp4kw2zy33q8k2d4sr56bird"; depends=[Matrix mvtnorm]; }; + optiscale = derive2 { name="optiscale"; version="1.2"; sha256="185yv0xizrrjik0ydyknms28p8ql9x54bhnq3wpyrbiinjm51fms"; depends=[lattice]; }; optmatch = derive2 { name="optmatch"; version="0.9-13"; sha256="1n6h6j0rk750jqxwxkbzdid1ig5xp8xpjw356xrqg02wm7x2gwzq"; depends=[digest Rcpp RItools survival]; }; - optparse = derive2 { name="optparse"; version="1.6.4"; sha256="0wyrc42ja3ab5szx46zmz8lm7vzfqxkjca0m0sms8g9hqbmmay6d"; depends=[getopt]; }; + optparse = derive2 { name="optparse"; version="1.6.6"; sha256="1l301dy3gc8pn7j00awcjh41wmc1ks9kswak255kbsa6f54rsxsi"; depends=[getopt]; }; optpart = derive2 { name="optpart"; version="3.0-3"; sha256="18h659gbgzflq81lcchc058xjgljkmhpsjkh51ylygwrv1qjrz2i"; depends=[cluster labdsv MASS plotrix]; }; optrcdmaeAT = derive2 { name="optrcdmaeAT"; version="1.0.0"; sha256="16g4612mwyfsckn6l71fbrjnnjv4yvnac1cccbrn3k8jh07qgb1h"; depends=[igraph MASS Matrix]; }; optrees = derive2 { name="optrees"; version="1.0"; sha256="1zqpjii8dsfs98n58qpif81ckvyxkr0661svhlbgzi19xb2vszqs"; depends=[igraph]; }; optweight = derive2 { name="optweight"; version="0.2.5"; sha256="1mfk9sp47flqq7i762wip5191j8m0q9kbyxs4a7f0pd76qwf67q2"; depends=[ggplot2 Matrix osqp]; }; - opusminer = derive2 { name="opusminer"; version="0.1-0"; sha256="1m4gsjylz58pbmhgcy4l9hqdsgy8ra1zg0d3rb6h2qiwfyfm0yh4"; depends=[arules Matrix Rcpp]; }; + opusminer = derive2 { name="opusminer"; version="0.1-1"; sha256="1vw6pbk1iiaxmfws95wmwf56p3afk10s5c3x9f0lliamckpyzkck"; depends=[arules Matrix Rcpp]; }; orQA = derive2 { name="orQA"; version="0.2.1"; sha256="0vivjrpcbql42y078gi91kfpfdpv73j23jkiv8fpazzwzdi8ydqq"; depends=[genefilter gtools nlme Rcpp]; }; ora = derive2 { name="ora"; version="2.0-1"; sha256="0albxqma220rnrpfdq3z9cawr83q1a0zzczbbcy4nijjm4mswphy"; depends=[DBI ROracle]; }; orca = derive2 { name="orca"; version="1.1-1"; sha256="1wd5nh2vh6j1rp78hbw17qipi67f0wimrbkiarak8f7k5pfiy1zn"; depends=[]; }; @@ -11125,7 +11285,6 @@ in with self; { ordcrm = derive2 { name="ordcrm"; version="1.0.0"; sha256="1hy24s23l099b21w5j3p2f0748s8xmhxhslfp65fg7ycwda5qsyw"; depends=[rms]; }; orddom = derive2 { name="orddom"; version="3.1"; sha256="165axs15fvwhrp89xd87l81q3h2qjll1vrwcsap645cwvb85nwsh"; depends=[psych]; }; orderbook = derive2 { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[hash lattice]; }; - orderedLasso = derive2 { name="orderedLasso"; version="1.7.1"; sha256="1qywvvdbxjqq886i1gd1hsxx92zm7lbalm0acylabap5m2nf9q53"; depends=[ggplot2 Iso Matrix quadprog reshape2]; }; ordering = derive2 { name="ordering"; version="0.7.0"; sha256="0sgwgcjg6sazmi11c9qvxfrzg671kcp18i2q20xbmbj4v3yqhwbh"; depends=[]; }; orderly = derive2 { name="orderly"; version="1.0.4"; sha256="0z83aha45nhi7mym1mygp60jim8znyknmc254gd2cvmg7cmifzb7"; depends=[DBI digest docopt fs ids R6 RSQLite withr yaml zip]; }; orders = derive2 { name="orders"; version="0.1.3"; sha256="14p0wk7y9hbhxwifr4fjp3h9dll0sin8q88an6a536d4f2045j7c"; depends=[Newdistns]; }; @@ -11137,22 +11296,23 @@ in with self; { ordinalForest = derive2 { name="ordinalForest"; version="2.3-1"; sha256="1yhaq6bg9npxsc9v6v9viqlwyrpdag1hy0z25h10cfygg8h1ranl"; depends=[combinat ggplot2 nnet Rcpp]; }; ordinalLBM = derive2 { name="ordinalLBM"; version="1.0"; sha256="1sfzkm3f9s5nbalakgk5v919wr7hdlr5p280rw2p8dy4wxr3xk3s"; depends=[RColorBrewer reshape2]; }; ordinalNet = derive2 { name="ordinalNet"; version="2.7"; sha256="13d7mvjfqdikd9lvdpsn3xr7yhkcqlv9ljy21qai9qna1cfd4x2q"; depends=[]; }; - ordinalRR = derive2 { name="ordinalRR"; version="1.0"; sha256="07gihg8hppxa7bp5wxcshqawj3vkzicmdsrnjyrasr3glv08b9lj"; depends=[rjags]; }; + ordinalRR = derive2 { name="ordinalRR"; version="1.1"; sha256="1sfkq8gryyls22208ympw5scgb4jkd27pyc1qklw4x7cz9wfnfbp"; depends=[rjags]; }; ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.6"; sha256="0axpndyyns649mwifq8f16l8n8x9nic8cv8l71ljyr2gwlm0nqz0"; depends=[survival]; }; + ordinalpattern = derive2 { name="ordinalpattern"; version="0.2.0"; sha256="0nf7323wd8wm4qxlhr6cvm1l87rwfdr5c4qivhncy0m2n5vknc1c"; depends=[gtools mvtnorm]; }; ore = derive2 { name="ore"; version="1.6.3"; sha256="1vh6w3arrhgkfjjjw7ci91xmz4wpfr3cmwd5zkqch89dgn07skkv"; depends=[]; }; ores = derive2 { name="ores"; version="0.3.1"; sha256="12war455cfcn2llig7pkx05b70dp5y7warjq03ayqq6i7c945mhb"; depends=[httr]; }; - orf = derive2 { name="orf"; version="0.1.2"; sha256="123lx1wa3sbi5l5zy92rq30f0hqq1pjpjyaklq9n1k9z28aa7p14"; depends=[ggplot2 ranger Rcpp xtable]; }; + orf = derive2 { name="orf"; version="0.1.3"; sha256="19drrxvnh9y33p0g8pv9bhl6i8jpsdc7nkcpbpxbrsc5hs96dycp"; depends=[ggplot2 ranger Rcpp xtable]; }; org = derive2 { name="org"; version="2019.4.2"; sha256="0jrnr22slgzwsdb4a1jb1l878smhvfb680cgmgb3a88jqj4jfscl"; depends=[]; }; orgR = derive2 { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[data_table ggplot2 ggthemes lubridate stringr]; }; orgutils = derive2 { name="orgutils"; version="0.4-1"; sha256="1yc3avhq3786his7nd60zfbzd9inkfrfz938r8378z59zbb1mzqq"; depends=[textutils]; }; orientlib = derive2 { name="orientlib"; version="0.10.3"; sha256="1qi46hkz73b8722zc3w6wvsq1ydlk37yxn9rd1dqygqbs1svkmvv"; depends=[]; }; origami = derive2 { name="origami"; version="1.0.3"; sha256="034h9dnllzllqd0pzx2if69x17gaxfjrfi4ini6gh23asr3krls3"; depends=[abind assertthat data_table future future_apply listenv]; }; originr = derive2 { name="originr"; version="0.3.0"; sha256="1r4w8gilr25gdqm3slviwas3s7qkpiyv4ifzp7qkby6vrdswnngb"; depends=[crul data_table jsonlite taxize xml2]; }; - orloca = derive2 { name="orloca"; version="4.8"; sha256="01fq3sas2xlp56f6s8jn5079pchszg2pbvzy8d5psxpb5jz59mwc"; depends=[knitr png rmarkdown ucminf]; }; - orloca_es = derive2 { name="orloca.es"; version="4.6"; sha256="1yfsvihm8p4ggdfam50i2xg7dy7khww5qqk6g4lry3m1icwx6vsy"; depends=[orloca]; }; + orloca = derive2 { name="orloca"; version="4.9"; sha256="02fqak8s68q522kgvrqqz9rfhpzby0ln032cisjwgk7nlcx4wbjk"; depends=[knitr png rmarkdown ucminf]; }; + orloca_es = derive2 { name="orloca.es"; version="4.9"; sha256="00zb08dqcsh1ljl4f2djm1pwbrfbaddgapn3v8nascmwxlhb2hkw"; depends=[orloca]; }; ormPlot = derive2 { name="ormPlot"; version="0.3.2"; sha256="0sdn7vrc35pl763snfrrcn0fa6i3agr57sjayjz93friijddkcp6"; depends=[ggplot2 gtable rms]; }; oro_dicom = derive2 { name="oro.dicom"; version="0.5.3"; sha256="1ar70xk2bqk7jgckfivgp4np3dxaynmgdg41n8x0sg9cpxl2lc38"; depends=[oro_nifti]; }; - oro_nifti = derive2 { name="oro.nifti"; version="0.9.1"; sha256="19w9dzyfmfgxgxb5i0l06b6gzqksx879iwicfs76fwmb1q2ph540"; depends=[abind bitops RNifti]; }; + oro_nifti = derive2 { name="oro.nifti"; version="0.10.1"; sha256="02hyc2b9azdlsbl6zb4xd4hc523hi091jimxlv1sp0044ynqzczv"; depends=[abind bitops RNifti]; }; oro_pet = derive2 { name="oro.pet"; version="0.2.6"; sha256="1dczii7knh9241ksswxk9zg1d69mhk2ilrk4kjv7cj9nfm8fgmja"; depends=[minpack_lm msm oro_dicom oro_nifti]; }; orsifronts = derive2 { name="orsifronts"; version="0.1.1"; sha256="1js4q2s1mn263x8szl5q47ajfxv9lsjd5zyphwyhbkqrnd8ijd3w"; depends=[sp]; }; orsk = derive2 { name="orsk"; version="1.0-5"; sha256="19bpvsdjwjm62a2kfh3xjpqnn39kls656kh832frkqa08bdd7zjk"; depends=[BB BHH2]; }; @@ -11162,32 +11322,34 @@ in with self; { osDesign = derive2 { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; }; osc = derive2 { name="osc"; version="1.0.5"; sha256="00a0ys5ni0hg5zxi0sr5ak3n4c252vhvd6gynnx1b0lqna7bz9qi"; depends=[raster]; }; osd = derive2 { name="osd"; version="0.1"; sha256="1py9p15nrcydr8w9ilxkxabiz9zlqnls8xn9avjkxd8x6602jx6p"; depends=[JADE nnls]; }; + osfr = derive2 { name="osfr"; version="0.2.8"; sha256="1yzi8k6ddr8kfgsliigbwzaiqapqa65ismbvxn30ny6raa4rf2xx"; depends=[crul fs httr jsonlite memoise purrr rlang stringi tibble]; }; oshka = derive2 { name="oshka"; version="0.1.2"; sha256="02hglpq5lknq93zbcf219lhnhppzgygkhxqixb15f89rxf9fczgs"; depends=[]; }; osmar = derive2 { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[geosphere RCurl XML]; }; - osmdata = derive2 { name="osmdata"; version="0.1.2"; sha256="1zz3ba2f74fllpg5ggbhyixzdkrz4kxmk74ml717kjh49kj3wl4j"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp tibble xml2]; }; - osmose = derive2 { name="osmose"; version="0.1.1"; sha256="0fiijnrvvydhj6j9yb02rn5sg8arcpj3jz977m2zwjgqy878cffg"; depends=[rlist stringr]; }; + osmdata = derive2 { name="osmdata"; version="0.1.3"; sha256="1a57fg8j7ski050l17hv137mlb5ir7qx7212y9d49arbwlh9bpcq"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp tibble xml2]; }; + osmose = derive2 { name="osmose"; version="3.3.3"; sha256="0b6998m3id0llpvlj5xgdrrrx1j90kxax9nfn2a5f0xq7hpcd9cg"; depends=[fields knitr mgcv ncdf4 rappdirs rlist rmarkdown stringr]; }; osmplotr = derive2 { name="osmplotr"; version="0.3.2"; sha256="0k5rjxsi1sfcxcl6lf8zcncqnshz2jaz7hcwn2ifg4yhvxvkfma8"; depends=[curl e1071 ggm ggplot2 httr mapproj osmdata rgeos sp spatstat]; }; osqp = derive2 { name="osqp"; version="0.6.0.3"; sha256="1266n04c8zsv4ixf7y25jkccv9lx3rvmd7bnkxynbwga9psd3l0j"; depends=[Matrix R6 Rcpp]; }; - osrm = derive2 { name="osrm"; version="3.3.2"; sha256="10adkq8sm0jvyd35m8vvjxiqvay976fsgffyxh9sh564l053srkp"; depends=[gepaf isoband jsonlite lwgeom RCurl sf sp]; }; + osrm = derive2 { name="osrm"; version="3.3.3"; sha256="1kiy3ij2fkvaxsgbhwn1lvhqav6prsqfi5ipzkihi2piw2gfns2r"; depends=[gepaf isoband jsonlite RCurl sf sp]; }; osrmr = derive2 { name="osrmr"; version="0.1.35"; sha256="1pmsybyqkgpqz0yhfmwrsa2smgmclxzk9mlzcqmm8ph6dcd1x0s8"; depends=[assertthat bitops R_utils rjson stringr]; }; otinference = derive2 { name="otinference"; version="0.1.0"; sha256="1l75jjnkyk8yzaw9zyk45jq9ys304i6pzm2xd5apxrb1jk75a3li"; depends=[MASS Rglpk sm transport]; }; - otpr = derive2 { name="otpr"; version="0.2.0"; sha256="1l34fda1y1y359khr1flwk7848rq7hhfmkqnifxhdsz73i2hcrr0"; depends=[checkmate geojsonsf httr jsonlite]; }; + otpr = derive2 { name="otpr"; version="0.3.0"; sha256="02p0wiz791023zpwy8dq8blsax2yfji3cpp4b77n7ri1fsisfy39"; depends=[checkmate geojsonsf httr janitor jsonlite]; }; otrimle = derive2 { name="otrimle"; version="1.3"; sha256="1vq2sm3g32cr8x0nzxq9g3zk0qhcd2syzrcvrfx5ncf3i3f9gq5n"; depends=[doParallel foreach mclust]; }; otsad = derive2 { name="otsad"; version="0.2.0"; sha256="1jb6raxm70aywbgs7bdyw8vccy1nj924f4hkpjrlgnvzmy0hyhvs"; depends=[ggplot2 plotly reticulate sigmoid]; }; - otuSummary = derive2 { name="otuSummary"; version="0.1.0"; sha256="15sjjkivh37kjcj02s2l8xabn3x1kg348i69kyhbvsbqawh2s9y0"; depends=[fossil reldist reshape2 vegan]; }; + otuSummary = derive2 { name="otuSummary"; version="0.1.1"; sha256="04l667qmp7wqkbdsk87j92gf89s13090kzs8cjlmxsp6i69r34z2"; depends=[reshape2 vegan]; }; otvPlots = derive2 { name="otvPlots"; version="0.2.1"; sha256="0fjx0kl9y77mazwy7lg4mxc9sg8ysvvbl4h3k6bvfpnjm5x62hff"; depends=[data_table ggplot2 gridExtra Hmisc moments quantreg scales stringi]; }; ouch = derive2 { name="ouch"; version="2.14-1"; sha256="0ddf9bw5lhj8vb0ja78jf99i0smq4rgmm842k4a4ygap41vdyn2b"; depends=[subplex]; }; outForest = derive2 { name="outForest"; version="0.1.0"; sha256="0wkji836xrf7izx3ibrf1ylcm4ph766ih3qd7wqjsjfx2cz5bpjr"; depends=[FNN missRanger ranger]; }; outbreaker = derive2 { name="outbreaker"; version="1.1-8"; sha256="0przz78jzkwl580w83p0aigaykfki2hdzprwqic7dy6yxnpqlpm3"; depends=[adegenet ape igraph]; }; - outbreaker2 = derive2 { name="outbreaker2"; version="1.1.0"; sha256="0ijyrlbg9xg2p7zr1klyd450ffiddp4fa7arxlhdjf7lsxhbl0h9"; depends=[ape ggplot2 magrittr Rcpp visNetwork]; }; + outbreaker2 = derive2 { name="outbreaker2"; version="1.1.1"; sha256="01i8abwg3g352nbrpaf8iahsjc4cbpph993x867yyvgj12nvsgs3"; depends=[ape ggplot2 magrittr Rcpp visNetwork]; }; outbreaks = derive2 { name="outbreaks"; version="1.5.0"; sha256="00369lnh65nfkcbjd5i39irdv2hcwy5cinb2dvv2x4c2q2ax9f0d"; depends=[]; }; outcomerate = derive2 { name="outcomerate"; version="1.0.1"; sha256="07mwml7r98qjgvrp938sqf7klyspz110583j0zwb72j69n4whmrj"; depends=[Rdpack]; }; outliers = derive2 { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; }; - outliertree = derive2 { name="outliertree"; version="1.1.3"; sha256="07spgpvw665f53ifcsxgdq5q8wm4fsvjmqf7qsbwknlvly06cmcn"; depends=[Rcereal Rcpp]; }; + outliertree = derive2 { name="outliertree"; version="1.2.0"; sha256="1az71acng963j58cina4ng40762g0japrms99ff7ly1pw4252vrq"; depends=[Rcereal Rcpp]; }; outreg = derive2 { name="outreg"; version="0.2.2"; sha256="04f1x7mxq4swbd7bfwjjgx4838jm6qj4piaighmhcscwrdkxa1cp"; depends=[magrittr reshape2 sandwich stringr tidyr]; }; ouxy = derive2 { name="ouxy"; version="1.1"; sha256="0f07m8zs4vnr0vpsdw1qdzdrq80qyq4477l06w9i3bb0n64yxcaa"; depends=[abc adephylo ape coda EasyABC geiger maps MCMCpack nlme phytools Sim_DiffProc TreeSim]; }; + overdisp = derive2 { name="overdisp"; version="0.1.0"; sha256="0j1rr9grzhlma9hgljxhn70ia268pc6f3gbinrlqky3pg73xjg2k"; depends=[]; }; overlap = derive2 { name="overlap"; version="0.3.2"; sha256="1j3m6ir1chdz0si2fhcw6gs7c9h09bv0chz18rpzxsywww6d4rzy"; depends=[]; }; - overlapping = derive2 { name="overlapping"; version="1.5.4"; sha256="1j3jmv15hy6h4d3v4rwg0796dz6np3pv67xrn2vcgvh1s1rmqnzs"; depends=[ggplot2 testthat]; }; + overlapping = derive2 { name="overlapping"; version="1.6"; sha256="0qy5jw4nn4l6rb36sxd9waz7x4g18q42dsk12hvsnan5jyzcdwfn"; depends=[ggplot2 testthat]; }; overlapptest = derive2 { name="overlapptest"; version="1.1"; sha256="0r732za6lm7dk5r237nhadgbpinaz5dmb6f7pn3mbg0plkdy3mff"; depends=[spatstat]; }; overture = derive2 { name="overture"; version="0.4-0"; sha256="1s16x5kn0apb0w1f7hqzcsqvw3x621y5n6yr1qn7yb7431pdw3cz"; depends=[bigmemory]; }; owdbr = derive2 { name="owdbr"; version="1.0.1.1"; sha256="0q4654zr5aw04sssy7127vafry72b7p3d8i44fqvqg3055awin0i"; depends=[data_table dplyr httr jsonlite magrittr tibble]; }; @@ -11195,20 +11357,20 @@ in with self; { ows4R = derive2 { name="ows4R"; version="0.1-4"; sha256="1chvb7i9a6kalnjacfvwrnp5j0fhr6da6v6llazqarij9njxfing"; depends=[geometa httr openssl R6 rgdal sf XML]; }; oxcAAR = derive2 { name="oxcAAR"; version="1.0.0"; sha256="19inf2bcpfj4jzfym1v5f1w5fkmcycz5jrfc2hf0wsvixy53lfxa"; depends=[jsonlite stringr]; }; oz = derive2 { name="oz"; version="1.0-21"; sha256="0p4r8qbpv7q6vad940540pd3lk79pyfj41h2cn22hsy1j0va1qbv"; depends=[]; }; - ozmaps = derive2 { name="ozmaps"; version="0.3.0"; sha256="0f6is4kn24wl2rxs5826zv3w0nl8fnbxrxdlxb3larlprbkln5y8"; depends=[oz tibble]; }; + ozmaps = derive2 { name="ozmaps"; version="0.3.6"; sha256="17lh5lgblyryvgk2cman1xwqz5hc0v4s58f3xz36z5qjrcs1599r"; depends=[oz sf tibble]; }; p2distance = derive2 { name="p2distance"; version="1.0.1"; sha256="1ims8i5z5k97kjpdysgx8g7lgvnvf7amahcrssw7bk38bvbxawni"; depends=[]; }; p3state_msm = derive2 { name="p3state.msm"; version="1.3"; sha256="0gbrka62ylxx64r3abpk60y92k2lk5smlf8na68qazph8llsl2rv"; depends=[survival]; }; pAnalysis = derive2 { name="pAnalysis"; version="2.0"; sha256="0pykdlbynzgcbnjs8xs8frgncf53l8qgf6na34adq7da76n570hi"; depends=[coin ggplot2]; }; pBrackets = derive2 { name="pBrackets"; version="1.0"; sha256="0cwv609hzp8anfv3cgfbspz8w0g1ljfz05wm4xfhwy15v32fckrj"; depends=[]; }; pCODE = derive2 { name="pCODE"; version="0.9.3"; sha256="067hhlj75l04b404fidvb2rkj6bb3zxrjy37p5vzvc5a1p1pcnf5"; depends=[deSolve fda MASS pracma]; }; - pCalibrate = derive2 { name="pCalibrate"; version="0.1-1"; sha256="04a7dmf9sjw44y53i469f8fjm8as2vwr0pgk4s91l63pxdqnjvfl"; depends=[epitools exact2x2 MCMCpack]; }; + pCalibrate = derive2 { name="pCalibrate"; version="0.2-1"; sha256="0gi4hjnykn4gbj9krmw4z1qy4lbxkvacczkks3zkwalw9ylwkpxl"; depends=[exact2x2 MCMCpack]; }; pGLS = derive2 { name="pGLS"; version="0.0-1"; sha256="1rlk8q09sikf4vpzsx0c7s6qqh2hxf8dy2bgcm4nnkbv2nfjz438"; depends=[MASS]; }; pGMGM = derive2 { name="pGMGM"; version="1.0"; sha256="1hkczz38g8a8253jm8vhm8948fs91g6b2rfzkz47srkkby9ksa4x"; depends=[JGL MASS mvtnorm]; }; pGPx = derive2 { name="pGPx"; version="0.1.1"; sha256="0b3pjrk7496nlw1cv5m6yfp02c663452z67y21yhhm26b17nrldv"; depends=[DiceKriging KrigInv pbivnorm pracma randtoolbox Rcpp RcppArmadillo rgenoud]; }; pKSEA = derive2 { name="pKSEA"; version="0.0.1"; sha256="1k9javxbhx28hf5k3i66ggqwlws2w9qwp01g8f7jmyp92pxr3qqd"; depends=[]; }; pMineR = derive2 { name="pMineR"; version="0.31"; sha256="1j71dcldzmk4kzspx4v5s3vqqkllgwkckfm1g145qgg26c1gyc6l"; depends=[cluster DiagrammeR stringr XML]; }; pRF = derive2 { name="pRF"; version="1.2"; sha256="17srabk7mam16rdzc5g9ggdrhjjk8wibny40gxvgzkv7qgq7m80x"; depends=[dplyr ggplot2 multtest permute randomForest reshape2]; }; - pROC = derive2 { name="pROC"; version="1.16.1"; sha256="0qkp1byl2xspxaaf0by6mvvrhg7wlz6fxmynz2hkh0ds24w7ig9m"; depends=[plyr Rcpp]; }; + pROC = derive2 { name="pROC"; version="1.16.2"; sha256="0apwa5zzqh74pjnvf5a1s5qf6i9r5h44jdllfrwymkd2v479d2xn"; depends=[plyr Rcpp]; }; pRSR = derive2 { name="pRSR"; version="3.1.1"; sha256="1irx95b7cwvx3gpn9brjjn4k947m8frz542r18nilc9f1159mb3s"; depends=[]; }; pSI = derive2 { name="pSI"; version="1.1"; sha256="0cvw38dqqlyx7cpl27hq33f5xns2d0019lyr98pwndcnbp09mx0b"; depends=[gdata]; }; pa = derive2 { name="pa"; version="1.2-1"; sha256="1pfgzxirkb0p8f6smjlrbp1qpsh0vsvqf306cvldaj9zx8cw0q9f"; depends=[ggplot2]; }; @@ -11216,12 +11378,13 @@ in with self; { pack = derive2 { name="pack"; version="0.1-1"; sha256="0x4p8clwp49s2y67y7in530xwhjngnqwagf9xnyb1jp0z3myd3r7"; depends=[]; }; packClassic = derive2 { name="packClassic"; version="0.5.2"; sha256="04a1sg9vx3r0sq54q9kj0kpahp6my246jy3bivgy09g5fjk0dmkj"; depends=[]; }; packHV = derive2 { name="packHV"; version="2.2"; sha256="0bj7zhlz2283y1hfdqdn7xil4wscwri1f5hszarwjwczx4n5sv81"; depends=[survival WriteXLS]; }; - packMBPLSDA = derive2 { name="packMBPLSDA"; version="0.6"; sha256="0dnj99f8gl5qwn7xjg5jm7hj2ywdmmixbl2ak429ygilf8hlxzwd"; depends=[ade4 DiscriMiner doParallel FactoMineR foreach MASS pROC]; }; + packMBPLSDA = derive2 { name="packMBPLSDA"; version="0.8.0"; sha256="0jn47zhcfssa2rwjh8jc2zc93g766pslxx8vjm0bsnzyzjl2yqb9"; depends=[ade4 DiscriMiner doParallel FactoMineR foreach MASS pROC]; }; packS4 = derive2 { name="packS4"; version="0.9.3"; sha256="0kkh4lfdbr2ydyfpymwrdkms1d4mj8430p6vxvj5wrgl4vh85gwd"; depends=[codetools]; }; packageDiff = derive2 { name="packageDiff"; version="0.1"; sha256="0qxgx2ac0x7p9j9clj7hgjahf7xwzcjkcw0d2n6w0r9c4g0mw9w2"; depends=[diffr htmlwidgets]; }; packageRank = derive2 { name="packageRank"; version="0.3.0"; sha256="1617xah0c8rnyjq09k69yrmalfryx921fflpx7k7bk52zwrrblc9"; depends=[cranlogs data_table ggplot2 memoise RCurl rversions]; }; packagedocs = derive2 { name="packagedocs"; version="0.4.0"; sha256="0zw9ana7s42ardphhdaklba02yjj1v8gliq4l98397mjmzc6f4xd"; depends=[crayon devtools digest evaluate highlight htmltools lazyrmd magrittr rmarkdown stringr whisker yaml]; }; - packagefinder = derive2 { name="packagefinder"; version="0.1.5"; sha256="11dv9684370jnk4lsyqnqcqngrix3fwjhlhgsar6m01vvhy9w1c0"; depends=[crayon formattable httr jsonlite lubridate pander stringr tidyr]; }; + packagefinder = derive2 { name="packagefinder"; version="0.2.1"; sha256="01nfh9han9k6gg59c6qhahfkwl9bi45ncs7mhrp0fkmxw6z21fyh"; depends=[crayon formattable htmlTable httr jsonlite lubridate pander stringr textutils tidyr]; }; + packager = derive2 { name="packager"; version="1.2.0"; sha256="1jgcas51wmn00s4j9qxr8igs8mhdhv62f4pd5ajlx7qhc8h78qw8"; depends=[callr checkmate codetools crayon cyclocomp desc devtools fakemake git2r httr pkgbuild pkgload rcmdcheck remotes rprojroot usethis whisker whoami withr]; }; packagetrackr = derive2 { name="packagetrackr"; version="0.1.1"; sha256="0xjq27j7bd7lps0vp9gdinxn19wl10k2cp9wb2xjih7p6l0wd57g"; depends=[dplyr httr magrittr rappdirs]; }; packcircles = derive2 { name="packcircles"; version="0.3.3"; sha256="0gik0splf48zfl40297nh7lbgvd2qqlci99wv841mfy7858ai933"; depends=[Rcpp]; }; packrat = derive2 { name="packrat"; version="0.5.0"; sha256="1xy5dd2hrpqa07jfl4s7dsrya05mf36ms74j833scdz0zf89586n"; depends=[]; }; @@ -11229,10 +11392,10 @@ in with self; { paco = derive2 { name="paco"; version="0.4.1"; sha256="0vlvvmkx2yhm28vly68gapzi2rjf7zilnl96hvysip9n8hq4w71d"; depends=[ape plyr vegan]; }; pacotest = derive2 { name="pacotest"; version="0.3.1"; sha256="0mpdgd8pr7clh5ickz245kqlhh197cnmm8kzxp84fddjb3i1m011"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; }; pact = derive2 { name="pact"; version="0.5.0"; sha256="043hbydj5f6889xrfsrn8jrgid2nnbsz6d7jpn4hywwa97snw4ny"; depends=[glmnet survival]; }; - padr = derive2 { name="padr"; version="0.5.0"; sha256="1lckaizlffgdzs7rhlkafam2clqkn3130r4fdnanm2bvd6b0z220"; depends=[dplyr lubridate Rcpp rlang]; }; + padr = derive2 { name="padr"; version="0.5.1"; sha256="19cl8h27ddwm40hw3kbkzcg32xnry40xns6ikmknl4zpws65m8wl"; depends=[dplyr lubridate Rcpp rlang]; }; paf = derive2 { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; }; pafdR = derive2 { name="pafdR"; version="1.0"; sha256="1yimsd4h23hcf752p5flda3dqk8hgn6qm9k0pmbapxj4jbsw14w5"; depends=[curl exams stringr]; }; - pagedown = derive2 { name="pagedown"; version="0.7"; sha256="1qvi327y6mll8ig1gnvbvyq4m9apw7ayh6i9bjzrwds0x8s4f3bp"; depends=[bookdown htmltools httpuv jsonlite later processx rmarkdown servr websocket xfun]; }; + pagedown = derive2 { name="pagedown"; version="0.9"; sha256="018hd456y58qn887v58hrzwij18s03rvizkj1gdays0z5pbzpspp"; depends=[bookdown htmltools httpuv jsonlite later processx rmarkdown servr websocket xfun]; }; pagenum = derive2 { name="pagenum"; version="1.1"; sha256="0908rlr9sd1a2qwz0idw8ccxhji73sk24gyrdl071lpnd1rs2wl7"; depends=[]; }; pageviews = derive2 { name="pageviews"; version="0.3.0"; sha256="031y67nqqvf3fa2273m7z2cldda0ijh63qwkh4gis3hz9hfril0v"; depends=[curl httr jsonlite]; }; painter = derive2 { name="painter"; version="0.1.0"; sha256="0qr6p13h50rlavcsamxmijfr4dfrbv1k088m28qf8a4gam3ap85b"; depends=[]; }; @@ -11240,9 +11403,9 @@ in with self; { pairedCI = derive2 { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; }; pairheatmap = derive2 { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; }; pairsD3 = derive2 { name="pairsD3"; version="0.1.0"; sha256="0ql6pqijf24pfyid52hmf5fmh4w1ca3sm47z9vknqpnjbn47v8q2"; depends=[htmlwidgets shiny]; }; - pairwise = derive2 { name="pairwise"; version="0.4.4-5.1"; sha256="0j15qbpym0y9ipc4l3z95f0bzc0pgzayspyqv81p7xakksnj2y02"; depends=[]; }; + pairwise = derive2 { name="pairwise"; version="0.4.4-7"; sha256="1cgan403p9p08q3cwxnfwgrjg1l23dpmy4fjzcfla6mw24qn60wh"; depends=[]; }; pairwiseCI = derive2 { name="pairwiseCI"; version="0.1-27"; sha256="0yp9nibdrsddjqq6vdlfbpvmfgm209h99b6qqqd6wgfzng327822"; depends=[boot coin MASS MCPAN mcprofile]; }; - pairwiseComparisons = derive2 { name="pairwiseComparisons"; version="0.1.3"; sha256="1m36zm49alsw871lh0can5c6hjsdpb23vchh8srg0rgd2zxnaw5q"; depends=[broomExtra dplyr forcats jmv purrr rlang stringr tibble tidyr WRS2]; }; + pairwiseComparisons = derive2 { name="pairwiseComparisons"; version="0.3.0"; sha256="07l4i3wmi92b05ix2sy30nghwrqax5fp88f0y897bgyf7wm5fd1b"; depends=[broomExtra dplyr forcats ipmisc jmv purrr rlang tidyBF tidyr WRS2]; }; pak = derive2 { name="pak"; version="0.1.2"; sha256="05s8rg84w4xhpbaa98p3lgvsnbjrxfbcz5izgkamqa1dw4gdxml4"; depends=[assertthat base64enc callr cli cliapp crayon curl desc filelock glue jsonlite lpSolve pkgbuild pkgcache prettyunits processx ps R6 rematch2 rprojroot tibble]; }; palaeoSig = derive2 { name="palaeoSig"; version="2.0-3"; sha256="1sn2nbiq037l81qvrqbg7gf1312g8vy574hsfng07qk1jpx7vwkk"; depends=[assertr dplyr forcats ggplot2 ggrepel magrittr MASS mgcv purrr rioja rlang TeachingDemos tibble tidyr vegan]; }; palasso = derive2 { name="palasso"; version="0.0.7"; sha256="1r7kcx0i1xqvqpqwvh5khsv3g0hj3j8f56q9jbya18scywk2ivzg"; depends=[glmnet Matrix survival]; }; @@ -11252,17 +11415,17 @@ in with self; { paleofire = derive2 { name="paleofire"; version="1.2.4"; sha256="1vgai4my6kl0fldghp6a1qr8xhxiyw137kd80d0zir6q47nlnc2x"; depends=[GCD ggplot2 lattice locfit plyr raster rgdal]; }; paleomorph = derive2 { name="paleomorph"; version="0.1.4"; sha256="05l55miahkmj8ikq8qz20y6kgxvxmdf04kji898i7fp8qyj4vfpa"; depends=[]; }; paleotree = derive2 { name="paleotree"; version="3.3.25"; sha256="04l7mh198sm1j8b75ydm7sq55l3nnwns29wj8cli4n3m009bjr5a"; depends=[ape jsonlite phangorn phytools png RCurl]; }; - paletteer = derive2 { name="paletteer"; version="1.0.0"; sha256="02r7d78pvbw0xyghvngacqn0sg2zh8g8qldi8ix7khvxgh03xlvy"; depends=[gameofthrones ggthemes glue harrypotter jcolors oompaBase palr pals prismatic rematch2 rlang rstudioapi scico viridisLite]; }; + paletteer = derive2 { name="paletteer"; version="1.1.0"; sha256="0w81ssvykqaamsdwc27m57x2cl4qmby1ny18aj0fihsh2rk5cg02"; depends=[gameofthrones ggthemes harrypotter jcolors oompaBase palr pals prismatic rematch2 rlang rstudioapi scico viridisLite]; }; palettesForR = derive2 { name="palettesForR"; version="0.1.2"; sha256="0nkb0dszj3a9ba7w6kfyn8lxacqsjw60i87p3g2gyl098kjwv7qv"; depends=[]; }; palettetown = derive2 { name="palettetown"; version="0.1.1"; sha256="1kjj1sqib1ns7895plp8c7h317pxwbyxi2shjkcgadkcsv2yjsxn"; depends=[]; }; palinsol = derive2 { name="palinsol"; version="0.93"; sha256="0k29sl2j7yf4yc0dhb047rxwg9np9l6pdwv6wyb4j80yc07vc9am"; depends=[gsl]; }; palm = derive2 { name="palm"; version="1.1.3"; sha256="1w13a1517h9dqfkc0863fsb08mapx8cafypk3b61djh69hcpbl0v"; depends=[gsl minqa mvtnorm R6 Rcpp spatstat]; }; palmtree = derive2 { name="palmtree"; version="0.9-0"; sha256="0cd5p82gp2g1zq8kf9ybi4wa1r2jg4dbxbp5n01qs4apmyyncl4d"; depends=[Formula partykit]; }; - palr = derive2 { name="palr"; version="0.1.0"; sha256="1v0bajsnzqamx9y275qhvzp56vzzs3hyp4mr5ijqynqj4376fqys"; depends=[]; }; + palr = derive2 { name="palr"; version="0.2.0"; sha256="0c9fg3kbl2n6m01ck2pmavgxbk953vdxqsc3cw6phnnav93kr5cf"; depends=[]; }; pals = derive2 { name="pals"; version="1.6"; sha256="18bl15figc9mhlvxz71da6s2mzyja6rdb2cpm6h5vya1lpv3snmk"; depends=[colorspace dichromat mapproj maps]; }; pamctdp = derive2 { name="pamctdp"; version="0.3.2"; sha256="0qs8lj5g2fx5rfd0afv76x9x7wqm333qmjv6zzip6pf11dzkghyj"; depends=[ade4 FactoClass xtable]; }; pamm = derive2 { name="pamm"; version="1.121"; sha256="191f0g90s1m3w68mszmdsdv5yw7xd1vsdbwsfvmyydgxn4261pwk"; depends=[lattice lme4 lmerTest mvtnorm]; }; - pammtools = derive2 { name="pammtools"; version="0.1.14"; sha256="1zr8n6j9220qv3a2q309n1ckjd4b6l2k24kfx3p4wibam8g9pqbc"; depends=[checkmate dplyr Formula ggplot2 lazyeval magrittr mgcv msm mvtnorm purrr rlang survival tibble tidyr]; }; + pammtools = derive2 { name="pammtools"; version="0.2.2"; sha256="03znv9ajy1y5lks42d8vhd7a20n9hv8xnrl6mxw7cjhh94h1x1gl"; depends=[checkmate dplyr Formula ggplot2 lazyeval magrittr mgcv mvtnorm pec purrr rlang survival tibble tidyr]; }; pampe = derive2 { name="pampe"; version="1.1.2"; sha256="092n04nrp886kd163v32f5vhp9r7gnayxzqb6pj57ilm5w1yrcsk"; depends=[leaps]; }; pamr = derive2 { name="pamr"; version="1.56.1"; sha256="0ycpgkk23y3zzkb42n2skcyl35ps1n7jmyzfj7pbxr3f6gr2grfh"; depends=[cluster survival]; }; pan = derive2 { name="pan"; version="1.6"; sha256="1dk3jjj826p7xrz10qz04vyc068xnypg7bp0pj4c32z3da0xzh5d"; depends=[]; }; @@ -11273,7 +11436,7 @@ in with self; { panelView = derive2 { name="panelView"; version="1.1.2"; sha256="0kbh2g8yynv2mvvndy89lkm5yhy2hr04z52i2ccv9yfrkyignlfp"; depends=[ggplot2 gridExtra]; }; panelWranglR = derive2 { name="panelWranglR"; version="1.2.13"; sha256="0zj0m08518zi6xsa7qik61ys1qqa2lqiar4l7acclkw58w5zrmbc"; depends=[caret data_table Hmisc]; }; panelaggregation = derive2 { name="panelaggregation"; version="0.1.1"; sha256="0x8ldqb9216pclfvs4ymdpian43v2ydkyflpf0k6lcn35r04xfr6"; depends=[data_table]; }; - panelr = derive2 { name="panelr"; version="0.7.1"; sha256="0xd3f3acfjvnryhwdf3aqa3vgpagl87sgd7annn29rk3lznv8rv2"; depends=[crayon dplyr Formula ggplot2 jtools lme4 lmerTest magrittr purrr rlang stringr tibble]; }; + panelr = derive2 { name="panelr"; version="0.7.2"; sha256="1xbhrz4lpxxyraiyyh1dqh3fpck3gx5yd8laibzqb7mxb0ili2n7"; depends=[crayon dplyr Formula ggplot2 jtools lme4 lmerTest magrittr purrr rlang stringr tibble]; }; panelvar = derive2 { name="panelvar"; version="0.5.2"; sha256="1rr7d0cyz6afxhwqslvcnbfb03cizpfldzwsfnkzxqmxpqasbw80"; depends=[ggplot2 knitr MASS Matrix matrixcalc progress reshape2 texreg]; }; pangaear = derive2 { name="pangaear"; version="1.0.0"; sha256="0i7k1sdhslw33dzpnrmajynq52svg8ri4mxz6aww2cah9y8vxlzl"; depends=[crul hoardr jsonlite oai png tibble xml2]; }; papayar = derive2 { name="papayar"; version="1.0"; sha256="11vkjhazfwfixsr6dba5jrcsr3r3mqgvj5s070b4gp70d6k1z8s5"; depends=[htmltools neurobase oro_nifti servr]; }; @@ -11281,15 +11444,14 @@ in with self; { paperplanes = derive2 { name="paperplanes"; version="0.0.1.9"; sha256="1d9grc95xqxn91lvk8v7w3z90bhl8savkhihwshyjp8ij2xpzfkl"; depends=[]; }; parSim = derive2 { name="parSim"; version="0.1.1"; sha256="1iqxv1qspx6b32qdczdzhc4sdjy5a2pb8mvg8jnc18jydi7ljs64"; depends=[dplyr pbapply]; }; parade = derive2 { name="parade"; version="0.1"; sha256="07x02j9jlldz4p0cyhw292041l3pziv56bhbzp4f0qpxhcbn5zn4"; depends=[]; }; - paradox = derive2 { name="paradox"; version="0.1.0"; sha256="00rhn8vwlcl4gnvgkqbaqyx9j1ymmgmqjry3smhc5xqnclx2spzs"; depends=[backports checkmate data_table mlr3misc R6]; }; + paradox = derive2 { name="paradox"; version="0.2.0"; sha256="0n26mpmbab8wpzwizgxwwms4qsm9p8vpifhvyqx0211zk10472hz"; depends=[backports checkmate data_table mlr3misc R6]; }; parallelDist = derive2 { name="parallelDist"; version="0.2.4"; sha256="0gqf9vi9hlbflxj941jv7hli8jiy2sqg8b312h401f8rkfqa9ckv"; depends=[Rcpp RcppArmadillo RcppParallel]; }; - parallelMCMCcombine = derive2 { name="parallelMCMCcombine"; version="1.0"; sha256="05krkd643awqhfrylq9lxr2cmgvnm1msn2x8p1l1483n2gzyklz7"; depends=[mvtnorm]; }; parallelML = derive2 { name="parallelML"; version="1.2"; sha256="05j0rb81i8342m8drwgmgi1w30q96yf501d83cdq4zhjbchphbl1"; depends=[doParallel foreach]; }; - parallelMap = derive2 { name="parallelMap"; version="1.4"; sha256="0nzd4vzdmqahvzccav4w0rbyi7lh41yb2s47472z2agp4piiavzv"; depends=[BBmisc checkmate]; }; + parallelMap = derive2 { name="parallelMap"; version="1.5.0"; sha256="0kjyskwvkqvsyjq55rhypif6z92r33llb7krrhc9f9w68xzp5yja"; depends=[BBmisc checkmate]; }; parallelSVM = derive2 { name="parallelSVM"; version="0.1-9"; sha256="0nhxkllpjc3775gpivj8c5a9ssl42zgvswwaw1sdhwg3cxcib99h"; depends=[doParallel e1071 foreach]; }; parallelize_dynamic = derive2 { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; }; - paramGUI = derive2 { name="paramGUI"; version="2.1.3"; sha256="1z7k4wgzm1bga8djyk44r1kr1mzdb9mrd6fvb5nrd69d76pvldji"; depends=[colorspace fields shiny shinydashboard TIMP]; }; - parameters = derive2 { name="parameters"; version="0.4.1"; sha256="0xkdn1079sr6kgyhc1zmn9imca4bghnxs3f91h0z7vkzjj73qdbi"; depends=[bayestestR insight]; }; + paramGUI = derive2 { name="paramGUI"; version="2.1.4"; sha256="0k2wkl99ji3w7xmd9k7zzvrr3dbf3237q7lxm527dnrq331pmxmi"; depends=[colorspace fields shiny shinydashboard TIMP]; }; + parameters = derive2 { name="parameters"; version="0.6.1"; sha256="0mylxkf1y6mk4kf6c57x102sf4c800pfasjcfbf1hnsh6ya0m6dy"; depends=[bayestestR insight]; }; paramhetero = derive2 { name="paramhetero"; version="0.2.0"; sha256="16gvs8328bnqvhx47f0xwnmbmlakxmp4ivnjxk2b13z6qjs70ij4"; depends=[ggplot2 ggpubr lme4 survey]; }; paramlink = derive2 { name="paramlink"; version="1.1-2"; sha256="0y6wsrxwyavipmrjjznr2n920w0p6qlwapxc9mnkh9c6w3yznka2"; depends=[assertthat kinship2 maxLik]; }; params = derive2 { name="params"; version="0.6.1"; sha256="0w7k8k7z8p1y2w0dhpfssa868xaikfzfdjw2vlj1yl299k5yisax"; depends=[whisker]; }; @@ -11300,7 +11462,6 @@ in with self; { parcoords = derive2 { name="parcoords"; version="1.0.0"; sha256="15w0g789a2igagfrgv1978ib4ipxpfkid5jpj4q344mpdvgp6ip2"; depends=[crosstalk htmlwidgets]; }; parcor = derive2 { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[Epi GeneNet glmnet MASS ppls]; }; parfm = derive2 { name="parfm"; version="2.7.6"; sha256="1n548gaf62m56n8rlcz1mhpqxikd33vydjwl4wps441drp1dbvs0"; depends=[msm optimx sn survival]; }; - parglm = derive2 { name="parglm"; version="0.1.4"; sha256="15xwij5nq95dykmg4i356fm8pf4ml8vxcphwnr14371bk3l026vl"; depends=[Matrix Rcpp RcppArmadillo]; }; parlitools = derive2 { name="parlitools"; version="0.4.1"; sha256="05xii25acmbdbhrkwgw812352vhxqpp5m8qbl346bp6v74ixi8aj"; depends=[dplyr hansard mnis readr sf snakecase stringi]; }; parma = derive2 { name="parma"; version="1.5-3"; sha256="0yjpmxz20v6k107qylw42yf1b231hzym9dizjcq1kalivvscczc5"; depends=[corpcor nloptr quadprog Rglpk slam truncnorm]; }; parmigene = derive2 { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; }; @@ -11308,10 +11469,10 @@ in with self; { parsec = derive2 { name="parsec"; version="1.2.3"; sha256="142zxj34qsf0s537bcabf04yi2qfmy65bgczpkvbyv5vkajxl10v"; depends=[igraph netrankr]; }; parsedate = derive2 { name="parsedate"; version="1.2.0"; sha256="0gb3w6hmwxayhijpf36p5dk4h6bbdps57x3cgikwvvxkgi83rarr"; depends=[rematch2]; }; parsemsf = derive2 { name="parsemsf"; version="0.1.1"; sha256="0ks4503k06ib5lq4ar2rg0sdni99rjcqxj76b0mclasxbi07kjsa"; depends=[DBI dbplyr dplyr lazyeval RSQLite stringr tidyr]; }; - parsetools = derive2 { name="parsetools"; version="0.1.1"; sha256="0fl06h4aph0rr55n3c4gw9wkblvjipgyl5drpycmpldj8kix1nz2"; depends=[]; }; - parsnip = derive2 { name="parsnip"; version="0.0.5"; sha256="1y3bkxkk1ib5p6zzz5js28n761rmxgws3rl1ravq37vk0h16bhg1"; depends=[dplyr generics globals glue magrittr prettyunits purrr rlang tibble tidyr vctrs]; }; + parsetools = derive2 { name="parsetools"; version="0.1.3"; sha256="1d18cdaw90g3362218d5i1j8n30p46drjygfri79sqgxhidb25sz"; depends=[]; }; + parsnip = derive2 { name="parsnip"; version="0.1.0"; sha256="0z28dwm1z5crlgrpkxfdllynhnhbr91qp7c03pv25wpkf445ypxb"; depends=[dplyr generics globals glue magrittr prettyunits purrr rlang tibble tidyr vctrs]; }; partDSA = derive2 { name="partDSA"; version="0.9.14"; sha256="1kp0cdsdjiay349jz22iqfzvspny8s343cfan8xahgf931k9h8p6"; depends=[survival]; }; - partialAR = derive2 { name="partialAR"; version="1.0.11"; sha256="1x7vsrjn91nr4bbkzz9mp8h93j9yhwwaqw1abh5n3bsrkq3xmgqj"; depends=[data_table ggplot2 KFAS MASS plot3D Rcpp tseries urca zoo]; }; + partialAR = derive2 { name="partialAR"; version="1.0.12"; sha256="0fv1ffgqdbl04b4cmfmvzwah8ms9cxx3dsdralkk92bxxhybcjsl"; depends=[data_table ggplot2 KFAS MASS plot3D Rcpp tseries urca zoo]; }; partialCI = derive2 { name="partialCI"; version="1.2.0"; sha256="0hi936yg4g5bg61ix2i68f8q4c5nvvshl2728ynz1rl970qfcrp7"; depends=[data_table ggplot2 glmnet KFAS MASS partialAR Rcpp TTR zoo]; }; partialOR = derive2 { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpxq5rxb6crp7yhlc13i42kybv8fr10jaagjj"; depends=[nnet]; }; particles = derive2 { name="particles"; version="0.2.2"; sha256="0pncfpk89hsfjch8h5b86rx7hsgdyg9bsxc54f5bf0y8gh9v98qj"; depends=[digest dplyr igraph magrittr mgcv Rcpp rlang tidygraph]; }; @@ -11323,9 +11484,10 @@ in with self; { partitions = derive2 { name="partitions"; version="1.9-22"; sha256="1qqy4df28wy4q0g572azrj171jlhvrnzbh7x0wr2g7v6gr20y0ns"; depends=[gmp polynom sets]; }; partools = derive2 { name="partools"; version="1.1.6"; sha256="0w7p88y4ab4v14k16k95cyb5f3yl2g6ban11775rmi2h9xqkfxk8"; depends=[data_table pdist regtools]; }; partsm = derive2 { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; }; - party = derive2 { name="party"; version="1.3-3"; sha256="1sbwpwxdz81ikp64kc0s06vdwy04bccff2kr0phwx9235nhfwwlz"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; }; - partykit = derive2 { name="partykit"; version="1.2-5"; sha256="17324y5v65i0va2mvm26gl89s01xwcffg34fwq1mvylk1xwk13pl"; depends=[Formula inum libcoin mvtnorm rpart survival]; }; + party = derive2 { name="party"; version="1.3-4"; sha256="0zqyyzpri61kj300b6kqspfhwqvx4c8svia726cg33lnwx7vv2bn"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; }; + partykit = derive2 { name="partykit"; version="1.2-7"; sha256="1h8jld63mm7ri9cny8jz0cibma68n7p66qvyn9g0jx99kir3r6aw"; depends=[Formula inum libcoin mvtnorm rpart survival]; }; parviol = derive2 { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; }; + parzer = derive2 { name="parzer"; version="0.1.4"; sha256="09rlqz4vhlg6zl48y2xpm6hdmwc74lcpid3qyha9bvy0gnimz5f4"; depends=[Rcpp]; }; pass_lme = derive2 { name="pass.lme"; version="0.9.0"; sha256="1rxm509vnkdvdxii4jwniirdb2pv90rjkf6wjc9zrjh88jrl678k"; depends=[]; }; passport = derive2 { name="passport"; version="0.2.0"; sha256="1jiwivrz7781zmwxmw13rxl80cr9r5pinnk5bvqz8nhfmlx0zmgd"; depends=[]; }; passt = derive2 { name="passt"; version="0.1.1"; sha256="03ymx1bvbz2qwlkxb5iis6k3d3d5fivhcz1w23fwqhgq976zrdj2"; depends=[dplyr magrittr rlang tidyr]; }; @@ -11334,7 +11496,6 @@ in with self; { pastis = derive2 { name="pastis"; version="0.1-2"; sha256="0211pzj3xrmqgxjpspij95kmlpa2klpicw49n6pnz2g1fapjy2bd"; depends=[ape caper]; }; patPRO = derive2 { name="patPRO"; version="1.1.0"; sha256="1l6q6glklmfgivs4gw0v8q4qa57wr2bna477sn2v401hcwmgnfyn"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; }; patchDVI = derive2 { name="patchDVI"; version="1.9.1616"; sha256="1akdlzw8v2p1zz09bm88d63jyxj7fv5h50p459p9ml4yc816xvji"; depends=[]; }; - patchPlot = derive2 { name="patchPlot"; version="0.1.5"; sha256="1b4k0dvvj6qwyxbqb36knyrawvy5qq8hl45pz896c9rkqhlg02bx"; depends=[datautils]; }; patchSynctex = derive2 { name="patchSynctex"; version="0.1-4"; sha256="1li3kw7a77sx6dss8pnxzb0p0sdy1kfm1zdnmhhj043zihrryd5p"; depends=[stringr]; }; patchwork = derive2 { name="patchwork"; version="1.0.0"; sha256="0qrwbcswh7ylrmghi17k6wk7w51cz6mcmvcyyd41hy3m2ywmkywb"; depends=[ggplot2 gtable]; }; patentsview = derive2 { name="patentsview"; version="0.2.2"; sha256="003pcddz6adsh893xvlb9d72r316z14nlp3fwm1vbc50hpa24w6z"; depends=[httr jsonlite]; }; @@ -11346,64 +11507,64 @@ in with self; { patrick = derive2 { name="patrick"; version="0.0.1"; sha256="16r0q3d9bq06393v46gabn9y9w2w7nqjcl65b7y2ryp35nv0aqsi"; depends=[dplyr purrr rlang testthat tibble]; }; patternator = derive2 { name="patternator"; version="0.1.0"; sha256="0s4vrhdfblllnhpz2awhhrkwm8d4170xg7fpsp7kvvqy8z8biwvi"; depends=[data_table]; }; patternize = derive2 { name="patternize"; version="0.0.2"; sha256="0hd6l66ybrjjndad5m2li9qqsjd0k2blhvjm469j6ab95073zq9f"; depends=[abind dplyr imager magrittr Morpho purrr raster rgdal RNiftyReg sp vegan]; }; - patternplot = derive2 { name="patternplot"; version="0.3.2"; sha256="0bzy1fq9za1251h8iiixyq397wnw9k3s59i3wi2pyjca2dydhr9a"; depends=[dplyr ggplot2 gridExtra gtable jpeg png R6 Rcpp RcppParallel]; }; + patternplot = derive2 { name="patternplot"; version="1.0.0"; sha256="0n4y23g894amwi62lx10k15i28rsmiaw52bds8dzmvkykkp9mm8q"; depends=[dplyr ggplot2 gridExtra gtable jpeg png R6 Rcpp RcppParallel]; }; pauwels2014 = derive2 { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; }; - pavo = derive2 { name="pavo"; version="2.3.0"; sha256="0ix4jaqzzz5gqazhm4wmjkwyhk9xkgmwlabns1lyixl57l22p6s7"; depends=[cluster geometry magick pbmcapply plot3D sp viridisLite]; }; + pavo = derive2 { name="pavo"; version="2.4.0"; sha256="1f71plrm5j5k66lw0za1a16rfjbl1gq4cwczybrc9rpzz6a0i6li"; depends=[cluster future_apply geometry lightr magick plot3D progressr sp viridisLite]; }; pawacc = derive2 { name="pawacc"; version="1.2.2"; sha256="0d5k0bq8zmb7sjvba3ljp97mba2iycnw44rnsnn2aajs02l1c2xg"; depends=[SparseM]; }; - pawls = derive2 { name="pawls"; version="1.0.0"; sha256="01sf1cmd216ca5iwmw4hfnxi9lvh16r441cfcaa3n77zhq0i4w7n"; depends=[]; }; - paws = derive2 { name="paws"; version="0.1.6"; sha256="1d47i4bjqd1dam98w7wyy3zbqmjb4gaplybzir9sl3k0fwr0sk1n"; depends=[paws_analytics paws_application_integration paws_compute paws_cost_management paws_customer_engagement paws_database paws_machine_learning paws_management paws_networking paws_security_identity paws_storage]; }; - paws_analytics = derive2 { name="paws.analytics"; version="0.1.6"; sha256="1wyc8br5vv8cp4axy9vi0asbk9fw3w7nbw5lgwrakz1zs29rhrcy"; depends=[paws_common]; }; - paws_application_integration = derive2 { name="paws.application.integration"; version="0.1.6"; sha256="11dyi8pir23zh18z4w516gkgpddx6pz9zzlcrsh6nik0389zrrid"; depends=[paws_common]; }; - paws_common = derive2 { name="paws.common"; version="0.2.5"; sha256="12rjhxqqypckjiiiic1474kbvf0hiv38wz3gj9z8c0wks7sp94ck"; depends=[base64enc digest httr ini jsonlite xml2]; }; - paws_compute = derive2 { name="paws.compute"; version="0.1.6"; sha256="0ls2d25c9w5hn0h2cw0an06x3fhiff0dnxipws81rxi9vnplqb8g"; depends=[paws_common]; }; - paws_cost_management = derive2 { name="paws.cost.management"; version="0.1.6"; sha256="1fwp4v32hkvzjks79ri5732am09dm4mh42iwg5lk5dl16im6xj13"; depends=[paws_common]; }; - paws_customer_engagement = derive2 { name="paws.customer.engagement"; version="0.1.6"; sha256="1xsprrm7k7hakhvisfm6j29j9any1rc73cs3ilfcjfqqdf54jkpw"; depends=[paws_common]; }; - paws_database = derive2 { name="paws.database"; version="0.1.6"; sha256="16nr5fg0q2afhzji0b74pgarhhhbqjipd200hsv9plfhwl4s3ylc"; depends=[paws_common]; }; - paws_machine_learning = derive2 { name="paws.machine.learning"; version="0.1.6"; sha256="194vwvafhixn1hw3z3gpcimf2d2a978037xwl81wbpyzjrzmk3w2"; depends=[paws_common]; }; - paws_management = derive2 { name="paws.management"; version="0.1.6"; sha256="1jazj6fj2akkk4dldcdbp24phy5pi32gv367jjsl9x9z85jfbvj2"; depends=[paws_common]; }; - paws_networking = derive2 { name="paws.networking"; version="0.1.6"; sha256="1jbn3y0qkzyiw2bnz14rys3z2l88hailnpbsyd4k83azfy9s5vx5"; depends=[paws_common]; }; - paws_security_identity = derive2 { name="paws.security.identity"; version="0.1.6"; sha256="1lgidvngdjkpniwzydk3xxr9aqjqrpgjc8s9f6am5llxg7jx5g9m"; depends=[paws_common]; }; - paws_storage = derive2 { name="paws.storage"; version="0.1.6"; sha256="15y1qkzfyyqjqzyh68s17n7qavaq08js8vmx64c93zdlj11y6hag"; depends=[paws_common]; }; + paws = derive2 { name="paws"; version="0.1.7"; sha256="02kg1mlcpmf8z69xqc1ylbpzr3mwizkzkzz7kwb769wzd2k9d1m5"; depends=[paws_analytics paws_application_integration paws_compute paws_cost_management paws_customer_engagement paws_database paws_machine_learning paws_management paws_networking paws_security_identity paws_storage]; }; + paws_analytics = derive2 { name="paws.analytics"; version="0.1.7"; sha256="135s4sxix8jf3gzk5b8v8z6x6afkhbv48pkbn0l0kzx05jvpy1py"; depends=[paws_common]; }; + paws_application_integration = derive2 { name="paws.application.integration"; version="0.1.7"; sha256="07pllnyrmv1az00n5y76zqd0zsln29d1q9zynw9xpjwrbplialb8"; depends=[paws_common]; }; + paws_common = derive2 { name="paws.common"; version="0.3.0"; sha256="0x6s30qacz0czvshamfr1p9q4x10kmwx9iwa23yv7jmd0l44gj2k"; depends=[base64enc digest httr ini jsonlite xml2]; }; + paws_compute = derive2 { name="paws.compute"; version="0.1.7"; sha256="1c2g4wdfv0s876va4qpma5rv2hr5gkj60si820dwk6zqrv8l48f4"; depends=[paws_common]; }; + paws_cost_management = derive2 { name="paws.cost.management"; version="0.1.7"; sha256="01hf9z967bflxb0xplilay3mrwk8sg376hh2fc4a3plnqbg05cap"; depends=[paws_common]; }; + paws_customer_engagement = derive2 { name="paws.customer.engagement"; version="0.1.7"; sha256="1s5p4cp5hndk4saf8y5bl6ml0gk83g7bh0wqdb4phxqgcyg1c7rq"; depends=[paws_common]; }; + paws_database = derive2 { name="paws.database"; version="0.1.7"; sha256="09nnq3x1fd7m30gyr49ip5x4yq0bbm3l1dqbs0h8pifsrajajb0h"; depends=[paws_common]; }; + paws_machine_learning = derive2 { name="paws.machine.learning"; version="0.1.7"; sha256="0kdlsgw9pkkdzy2km0f16gc170yifincbcsj2xzp9968wllpz0q1"; depends=[paws_common]; }; + paws_management = derive2 { name="paws.management"; version="0.1.7"; sha256="1cfrqii3ablrmq82jz8ak7j81c5nzg7fs3vhmgqf6jxpr098hwrq"; depends=[paws_common]; }; + paws_networking = derive2 { name="paws.networking"; version="0.1.7"; sha256="1zwpyfs9vxljgb48da1cilb0b5vn9cqizykhywysnp1cs89xjb0r"; depends=[paws_common]; }; + paws_security_identity = derive2 { name="paws.security.identity"; version="0.1.7"; sha256="1pjcd6g8kml9vs5cqzingg22prp85dfdkwgicgqbm20r18chc7lw"; depends=[paws_common]; }; + paws_storage = derive2 { name="paws.storage"; version="0.1.7"; sha256="1v33i75vd30arhqa98snd4fq4b0wpwpjys72781myfcb64l7fph4"; depends=[paws_common]; }; pbapply = derive2 { name="pbapply"; version="1.4-2"; sha256="1xmk4p006v8gij26rs6kp5prjyf2n32nqjxiyp8a6kvgyc4z46dc"; depends=[]; }; pbatR = derive2 { name="pbatR"; version="2.2-13"; sha256="01ra1ggdpxdl1xqjdh86qynr5gkgzw01ww6j9bwgx4mj20i6j1ha"; depends=[rootSolve survival]; }; - pbdMPI = derive2 { name="pbdMPI"; version="0.4-2"; sha256="1lbm0a2hm2pxfm1fws4bsh4xk986q9zlqhs1qcdr46m74l3lrq2m"; depends=[float rlecuyer]; }; + pbdBASE = derive2 { name="pbdBASE"; version="0.5-3"; sha256="1f90bk1mp1s03177b9g5w5ni77jzrzc1pl3bjx0w0fjbjs1myn79"; depends=[pbdMPI pbdSLAP]; }; + pbdMPI = derive2 { name="pbdMPI"; version="0.4-3"; sha256="1mxikhr0qfqksr62v5dxvzgqx07391p7ikjk9g2w4xzrzmxs8fc3"; depends=[float rlecuyer]; }; pbdNCDF4 = derive2 { name="pbdNCDF4"; version="0.1-4"; sha256="0fd29mnbns30ck09kkh53dgj24ddrqzks4xrrk2hh1wiy7ap1h95"; depends=[]; }; pbdPROF = derive2 { name="pbdPROF"; version="0.4-0"; sha256="174jwrkvw5qz1430y6id01w1czlw45j1yw8a8dyw36knrmvmdz10"; depends=[]; }; pbdRPC = derive2 { name="pbdRPC"; version="0.2-1"; sha256="1pz71zfs9qw96dj3h5mrm734vbbi4drlv9hrw91dbzm3a7jsxg4q"; depends=[]; }; - pbdSLAP = derive2 { name="pbdSLAP"; version="0.2-8"; sha256="0xwg3yr6125iyhq80qjh3vjs2akxnfgh66h372dsniv89x8qaaaz"; depends=[pbdMPI rlecuyer]; }; + pbdSLAP = derive2 { name="pbdSLAP"; version="0.3-0"; sha256="1jxpgsxkzi3s1qf3g01xma9mqwgi1b22x5lh5xnr78wa0764dyd3"; depends=[pbdMPI rlecuyer]; }; pbdZMQ = derive2 { name="pbdZMQ"; version="0.3-3"; sha256="1jkfcfhspvqra7vbllrvkz3jx8j7d0ang6zzcdjgpb7200sc29mf"; depends=[]; }; pbivnorm = derive2 { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; }; - pbkrtest = derive2 { name="pbkrtest"; version="0.4-7"; sha256="1si3bhi59xc51a0pgjjglccq3h4aljyhw2k1b8574s145fnh7fsw"; depends=[lme4 MASS Matrix]; }; + pbkrtest = derive2 { name="pbkrtest"; version="0.4-8.6"; sha256="0s5xhhrhv5i9680lw6af9lj2x4jc3fygmzzk0jjpxnb8g4b3p1jz"; depends=[lme4 magrittr MASS Matrix]; }; pbm = derive2 { name="pbm"; version="1.1.0"; sha256="054navz4fmn25nq3lsfnsnm35shj9wq4qz69d4ajw0q09gnb1cy8"; depends=[]; }; pbmcapply = derive2 { name="pbmcapply"; version="1.5.0"; sha256="0i58gcqpnbyvc448qfgm45b7rpbmrnagsvk1h1hsqchbbicfslnz"; depends=[]; }; pbo = derive2 { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; }; pbs = derive2 { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; }; pbv = derive2 { name="pbv"; version="0.3-19"; sha256="18cypzbyamafq942bwp3k0ml3crwcpxa6rdck8657kkc22lq05g5"; depends=[Rcpp RcppArmadillo]; }; - pcFactorStan = derive2 { name="pcFactorStan"; version="1.3.0"; sha256="1jifdqf9zip16i2sycn05123hmf19rhq2wrdfixfd2rfcbjwcaab"; depends=[BH igraph loo mvtnorm Rcpp RcppEigen reshape2 rstan StanHeaders]; }; + pcFactorStan = derive2 { name="pcFactorStan"; version="1.4.0"; sha256="0fj2732q5kyal8x4s30dxmgpngq9x4wzgjsna5r5lg7izd0s0hk1"; depends=[BH igraph loo mvtnorm Rcpp RcppEigen reshape2 rstan StanHeaders]; }; pcIRT = derive2 { name="pcIRT"; version="0.2.4"; sha256="0crll51s14nisnaxjln7bc3b1a181v358nfkh1p5iiyn98clacl6"; depends=[combinat Rcpp]; }; pcLasso = derive2 { name="pcLasso"; version="1.1"; sha256="1wdwin6xszysydspxjb8b6r3y416ri3zndh0s142b2487lhmqkb6"; depends=[svd]; }; pca3d = derive2 { name="pca3d"; version="0.10.1"; sha256="1fz7p95hhvgzlh1vxlifyzbqccv4rsm7yldzca5p0dwm4rgsdkd4"; depends=[ellipse rgl]; }; pcaBootPlot = derive2 { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; }; - pcaL1 = derive2 { name="pcaL1"; version="1.5.3"; sha256="1pf1vsprng83yd4j0rhx4fvj54fr2ra4wng61bw9npzmnshkymwk"; depends=[]; }; + pcaL1 = derive2 { name="pcaL1"; version="1.5.4"; sha256="1myl12537bxwmyicm8v891rflq8g6bhz9j0gcjcqgf9z80y52ayc"; depends=[]; }; pcaPP = derive2 { name="pcaPP"; version="1.9-73"; sha256="1z2kdf9gfp965xbcd4rg6vf20d1bl443na0qjkpq7gmzpaq6cifa"; depends=[mvtnorm]; }; - pcadapt = derive2 { name="pcadapt"; version="4.1.0"; sha256="0631qx37ffz21bgwvjq2y5xn4dvz6kpmwg3rlmkxa93kwsx2b7rb"; depends=[data_table ggplot2 magrittr mmapcharr plotly Rcpp rmio robust RSpectra vcfR]; }; - pcalg = derive2 { name="pcalg"; version="2.6-8"; sha256="1pp7y0v3li8y5q599cz10ws6nql4xqdmgxfjp69h1dmc5635kr06"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; }; + pcadapt = derive2 { name="pcadapt"; version="4.3.1"; sha256="0xa2dsr0f0a5kdbnbf3c4fznzvv9s3h3yp1wfgjyd8ilp4lk8nlx"; depends=[bigutilsr data_table ggplot2 magrittr mmapcharr Rcpp rmio RSpectra]; }; + pcalg = derive2 { name="pcalg"; version="2.6-10"; sha256="0sjxkbplrdgql2xap8p3025n7hnmp5cf5j17bay5riv3wwhfd225"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; }; pccc = derive2 { name="pccc"; version="1.0.3"; sha256="1dd1kh0gx7ffwnmxqn3zbcsxiav4z70psis24dgqxwq42r0kw5mk"; depends=[dplyr Rcpp]; }; pcdpca = derive2 { name="pcdpca"; version="0.4"; sha256="0ys4hrin0w3f87d1d986wvrfkfwapzj9hz7d7v92r60ns74g7r5m"; depends=[fda freqdom]; }; + pcds = derive2 { name="pcds"; version="0.1.1"; sha256="1y6msc2b35gcd99yb1zv13li1ilw6c53pcw7jmly4p7sb35kqlqb"; depends=[combinat interp plot3D plotrix Rdpack]; }; pcensmix = derive2 { name="pcensmix"; version="1.2-1"; sha256="1yrz4hdj52in8z65qyl18kh7frv75rb8ss5ljv3vbm6yhxi32jnd"; depends=[]; }; pcev = derive2 { name="pcev"; version="2.2.2"; sha256="1l0afcdzkxzkhkc8ln2fzi50hc7nfq46lg6hhx6rrzkb41w82iqw"; depends=[corpcor RMTstat]; }; pcg = derive2 { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; }; pcgen = derive2 { name="pcgen"; version="0.2.0"; sha256="1v2fmxbj9gz5sg0hizw03ad8cfm9v25708h7fvnf6gb42b2mmyb3"; depends=[ggm graph Hmisc lme4 MASS Matrix pcalg sommer]; }; - pch = derive2 { name="pch"; version="1.3"; sha256="13pfrvp539fz4hxp08yil93caw3cjdna7xnky5fqd0lhc84fwq76"; depends=[survival]; }; + pch = derive2 { name="pch"; version="1.4"; sha256="0vfx0jirmfcy47l6xw1yvss68624605378cpqc58ygllwddcqz1y"; depends=[survival]; }; pcmabc = derive2 { name="pcmabc"; version="1.1"; sha256="1x4qvs5v134z93j1r3zg08kynqyhgd2yc3y2vk0vif8mabvx3zv4"; depends=[ape mvSLOUCH phangorn TreeSim yuima]; }; pcnetmeta = derive2 { name="pcnetmeta"; version="2.6"; sha256="0rpd1bgg932xhj03fnskhbg7ni9nfd8qrvxvix8qmbgw8bwdsbgd"; depends=[coda rjags]; }; pco = derive2 { name="pco"; version="1.0.1"; sha256="0k1m450wfmlym976g7p9g8arqrvnsxgdpcazk5kh3m3jsrvrcchf"; depends=[]; }; - pcr = derive2 { name="pcr"; version="1.2.0"; sha256="0817ibih6rs52g560z8cbw2zpr0hbzrz94c913x4114w1k737bq9"; depends=[ggplot2]; }; - pcrcoal = derive2 { name="pcrcoal"; version="1.2.0"; sha256="0rd610ny8p7by3gi6kk130ii0qcswqsng5mzmxz8hrxqk0cs4c9x"; depends=[ape ggplot2 phylosim]; }; + pcr = derive2 { name="pcr"; version="1.2.2"; sha256="1lmgm8k3s7780ivrdj0zk1ninx7b5jffir6q5p2p47h62qqjmp5d"; depends=[ggplot2]; }; pcrsim = derive2 { name="pcrsim"; version="1.0.2"; sha256="04177xl513k01prmf93kha91dyxmb9v80d1y4lz73fxsifj6bhar"; depends=[data_table ggplot2 gWidgets mc2d plyr strvalidator]; }; pcse = derive2 { name="pcse"; version="1.9.1.1"; sha256="1rb9146vjkf36vc5v3frykmsff7kp6qp1hhmj8pak583in4rz8f8"; depends=[]; }; - pct = derive2 { name="pct"; version="0.2.7"; sha256="1bpmfrdidnz1aqg8llz00rrvk70f7gy2jdb0i8l3kvf8gg3ws3qb"; depends=[boot readr sf stplanr]; }; - pcts = derive2 { name="pcts"; version="0.14-3"; sha256="16ldn685ninrnn095wnckfki12jicwj15m9806a0dw1g51qy1699"; depends=[BB gbutils lagged ltsa lubridate Matrix mcompanion PolynomF Rdpack sarima zoo]; }; + pct = derive2 { name="pct"; version="0.4.0"; sha256="0wsf3n1yisxjcd9gbfx94671bkfdh2j4il6c6gdqmr6wkj0n74kp"; depends=[boot readr sf stplanr]; }; + pcts = derive2 { name="pcts"; version="0.14-4"; sha256="0c5r71d6c08g5v5cwvy93fwp1lhmqh99azq8nn1ikfxadi7kndln"; depends=[BB gbutils lagged ltsa lubridate Matrix mcompanion PolynomF Rdpack sarima zoo]; }; pdR = derive2 { name="pdR"; version="1.7"; sha256="05rnyb9znb71ilr9kf62x30knby1rm0p4ain220wvb62vkz054d7"; depends=[boot car coefplot lmtest papeR plm sandwich]; }; pdSpecEst = derive2 { name="pdSpecEst"; version="1.2.4"; sha256="1sf2d7vh7a1qc0cq230an8pzg9qi9g640z0ql8x2pp9wfawfzn1f"; depends=[ddalpha multitaper Rcpp RcppArmadillo Rdpack]; }; pdc = derive2 { name="pdc"; version="1.0.3"; sha256="0503n7aiy0qrl790yfjvpm7bbyz1i4818rlg96q0fvzb58zqmyvc"; depends=[]; }; @@ -11418,6 +11579,7 @@ in with self; { pdp = derive2 { name="pdp"; version="0.7.0"; sha256="0wcszaq4c14f9a2r1gd32mzhs035jlg2w8mkfklzigcj7fv9xmi8"; depends=[ggplot2 gridExtra lattice magrittr mgcv plyr viridis]; }; pdqr = derive2 { name="pdqr"; version="0.2.1"; sha256="1444r51lh66kmhvkp8ivr95zlnxfgv28whl0axwb56hf5vi44lp9"; depends=[]; }; pds3 = derive2 { name="pds3"; version="0.5.0"; sha256="1hipi4ygk30khrrslxq3m9qdichazhrl34k444shs7gi6wjx9ilr"; depends=[rly]; }; + pdynmc = derive2 { name="pdynmc"; version="0.8.0"; sha256="1m87vgr6hh3g0j1x0725b4x6a28h6ks59v0vl8c4hki131k4rmf5"; depends=[data_table dplyr MASS Matrix optimx qlcMatrix Rdpack]; }; peRiodiCS = derive2 { name="peRiodiCS"; version="0.5.0"; sha256="1366gmn6qfciwcjsfnbl3hfa16ffn11g00fm0kv74ilvm3nnawk3"; depends=[Hmisc rms]; }; peRspective = derive2 { name="peRspective"; version="0.1.0"; sha256="1zz3znzaa80k60jddys5fhxwx4c8lyqymx5fw2zvj654rnk0mmzc"; depends=[crayon dplyr glue httr jsonlite magrittr purrr rlang rlist stringr tibble]; }; peacots = derive2 { name="peacots"; version="1.3"; sha256="128qpz06b0giz80lp9yq9l6pxcjglfr97yickg7z64vzzl2jilmq"; depends=[]; }; @@ -11426,16 +11588,17 @@ in with self; { pear = derive2 { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1q90lhddq4sp46m0q7qyxb192"; depends=[]; }; pearson7 = derive2 { name="pearson7"; version="1.0-2"; sha256="0x8bnlzgmfah8lzdg8skxs7bm8yq0nkrhqi7q43h902j4jl5b8jy"; depends=[]; }; pec = derive2 { name="pec"; version="2019.11.03"; sha256="1h6fk3k9w61a9xqhvkm1zdv75nsl06n78036qvcxkcf0bkfxl360"; depends=[foreach prodlim rms survival timereg]; }; - pedgene = derive2 { name="pedgene"; version="3.2"; sha256="1cl95fw6wdh4k6rg1nlydh09gf96pcgyfd3bxdcaisq0vfn05g0j"; depends=[CompQuadForm kinship2 Matrix survey]; }; + pedSimulate = derive2 { name="pedSimulate"; version="0.0.3"; sha256="0nm8iszmi3f91l09ziw5iwmkdggx9j8w17sx3k2ar4wibq4swsfi"; depends=[]; }; + pedgene = derive2 { name="pedgene"; version="3.3"; sha256="0y6kr5ad4fmxljsj0czs9h1dkz63wvqiira9ibgsf0707xb0vh7f"; depends=[CompQuadForm kinship2 Matrix survey]; }; pedigree = derive2 { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[HaploSim Matrix reshape]; }; pedigreeTools = derive2 { name="pedigreeTools"; version="0.1"; sha256="0kgbjyw9dlp4s91cyg5w0p2vn2h9pg9ixrhc5pwvkp3v1acd0xfm"; depends=[Matrix]; }; pedigreemm = derive2 { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; }; pedmut = derive2 { name="pedmut"; version="0.1.0"; sha256="0b8qlcl4g8kjix4q1drs1yk7wnilxqslv4p8svyabcg8wb4bnvwa"; depends=[]; }; - pedometrics = derive2 { name="pedometrics"; version="0.6-6"; sha256="1w9wa73wva6z0d56g221l8qmc5igfypwsa2xq4sn4r501bdy8qpq"; depends=[lattice latticeExtra Rcpp]; }; - pedprobr = derive2 { name="pedprobr"; version="0.1.0"; sha256="1nn8pmxzj1lnfynaws87lbrk2p5y8im4cdm46vw91lbk00z7j3vc"; depends=[pedmut pedtools]; }; - pedquant = derive2 { name="pedquant"; version="0.1.2"; sha256="18shjp241ihy01ksmp2sqrpq5y693njml4wqaayypb961s1850kj"; depends=[curl data_table ggplot2 gridExtra httr jsonlite readr readxl rvest scales stringi TTR webdriver xml2 zoo]; }; - pedtools = derive2 { name="pedtools"; version="0.9.1"; sha256="1qki2yf0dy9yl7b0n8va2knzpjnrai4v5qg6538kqsbpx1i9rxcy"; depends=[kinship2]; }; - pegas = derive2 { name="pegas"; version="0.12"; sha256="0sb8cmz4d238mcb56hv9fa0cagm00k82r7aj4cj4lxa1flxlpy8p"; depends=[adegenet ape]; }; + pedometrics = derive2 { name="pedometrics"; version="0.7.0"; sha256="0rqldc67yrcg16i5q9wrmfmh3lw3qrfdxwdb4mxkjxx18v4fv737"; depends=[lattice latticeExtra Rcpp]; }; + pedprobr = derive2 { name="pedprobr"; version="0.2.0"; sha256="1s986n05wciq0nwvaqhq5d4rdzdh9sli66qihmfm43rqy246kjlr"; depends=[pedmut pedtools]; }; + pedquant = derive2 { name="pedquant"; version="0.1.5"; sha256="01kmagaapx5qlvar0l862rl8s1caqzdld3qjygxi9zl232042x89"; depends=[curl data_table ggplot2 gridExtra httr jsonlite readr readxl rvest scales stringi TTR xml2 zoo]; }; + pedtools = derive2 { name="pedtools"; version="0.9.3"; sha256="1jc11d1hd4wwc3lfa5h7g9sy6crybidc2mlasc3sbasjdzr1cyxb"; depends=[kinship2]; }; + pegas = derive2 { name="pegas"; version="0.13"; sha256="002i7s4g0nhnq0v05gs0yssqiyhpq2f7rw2rhn31hsbgxc86frvy"; depends=[adegenet ape]; }; pems_utils = derive2 { name="pems.utils"; version="0.2.26.4"; sha256="13d5cg2wdz84inby017bra6xzwhkp5qcy1b213r387fq771h2xrx"; depends=[baseline dplyr ggplot2 lattice latticeExtra loa RColorBrewer Rcpp rlang]; }; penDvine = derive2 { name="penDvine"; version="0.2.4"; sha256="0znpvsr7zy2wgy7znha1qiajcrz1z6mypi3f5hpims33z7npa7dl"; depends=[doParallel fda foreach lattice latticeExtra Matrix quadprog TSP]; }; penMSM = derive2 { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp]; }; @@ -11444,11 +11607,10 @@ in with self; { penalizedLDA = derive2 { name="penalizedLDA"; version="1.1"; sha256="1bw5wiixmmg1vr3v0d59vh67f0gy2rvr30bi58skvrkb25qcjq6l"; depends=[flsa]; }; penalizedSVM = derive2 { name="penalizedSVM"; version="1.1.2"; sha256="03zw95bc6svbnzak9x72s3b8l9gh581mxn2di1fl89gxlh864amd"; depends=[corpcor e1071 lhs MASS mlegp statmod tgp]; }; penaltyLearning = derive2 { name="penaltyLearning"; version="2019.5.29"; sha256="0m4smrpsw9pr8vpnx75yxp3q2z8fn25c9f2sxaqv2vjwdnyza5sx"; depends=[data_table geometry ggplot2]; }; - pencopula = derive2 { name="pencopula"; version="0.3.5.1"; sha256="1ivnqfq70gvnzc19brkvdlq0ks5dd954dj46j3pqpg6crvdrzh9r"; depends=[fda lattice latticeExtra quadprog]; }; pencopulaCond = derive2 { name="pencopulaCond"; version="0.2"; sha256="18hjjxnd0l2ms20ddqkghfbd4as5kq2rgwqzpz4y38k6nw76x511"; depends=[doParallel fda foreach igraph lattice latticeExtra pacotest quadprog TSP]; }; pendensity = derive2 { name="pendensity"; version="0.2.13"; sha256="1wcsib7m2161nqqrmgdvrj7lr8zq6njc9xr935hwfh3qbbgkmfjb"; depends=[fda lattice]; }; - pense = derive2 { name="pense"; version="1.2.5"; sha256="05v63xfmriipgziqw87h2y1m2dyvxwq6qd67x0kw5rq37zvyj3ak"; depends=[Matrix Rcpp RcppArmadillo robustbase]; }; - pensim = derive2 { name="pensim"; version="1.2.9"; sha256="10nrnxwfs41bhybs7j6xgnx0pq3c802n9k8irngmh8iy4w3wbhrq"; depends=[MASS penalized]; }; + pense = derive2 { name="pense"; version="1.2.9"; sha256="0ls573kx3z09v848fi5pvidc5l2dhmqv9vvyjspzzfiff3z6w09i"; depends=[Matrix Rcpp RcppArmadillo robustbase]; }; + pensim = derive2 { name="pensim"; version="1.3.2"; sha256="12rh9n6jjnlzjsdjjw60ams7l0n05skwkbql5d0jqrmpbxrca6rp"; depends=[MASS penalized]; }; peperr = derive2 { name="peperr"; version="1.1-7.1"; sha256="12k9crhsv3p4zrcbyr85cfwp68z3r1w2kb62g7jb7h311c7zykjx"; depends=[snowfall survival]; }; peptider = derive2 { name="peptider"; version="0.2.2"; sha256="109z81x6jcsx2651lclff7ak55zb1i89pyi58rxri40aamx4b1x2"; depends=[discreteRV dplyr plyr]; }; pequod = derive2 { name="pequod"; version="0.0-5"; sha256="0mwrgyrxgiifpnpy15qxpdrdmd7dxqihccrnj5nh8fq9fvwymamg"; depends=[car ggplot2]; }; @@ -11456,18 +11618,17 @@ in with self; { perccal = derive2 { name="perccal"; version="1.0"; sha256="1akak068d0g70amj5sbvnqbywzy21l4wz11mhp71b7cp4xmr9n12"; depends=[Rcpp RcppArmadillo RcppEigen]; }; perccalc = derive2 { name="perccalc"; version="1.0.5"; sha256="14557k7khc3l5m0vlam0fvbsb6p78v9gfcnx5ksxcvrab28xj7p3"; depends=[multcomp tibble]; }; perfectphyloR = derive2 { name="perfectphyloR"; version="0.2.0"; sha256="00gvmn66lb9hfli7yc3l5913xpngib1vksg5zjnxqxiwdibjfqx8"; depends=[ape phytools Rcpp RcppArmadillo]; }; - performance = derive2 { name="performance"; version="0.4.3"; sha256="1164585ywbnrcy7an57kifh2gdb6g08z9pxw75ywqdcfyd51i3dz"; depends=[bayestestR insight]; }; + performance = derive2 { name="performance"; version="0.4.5"; sha256="0j6wmnwhfdd3v1a17qmg491q50579knjzscmyr4yk3xr0jbsbg8x"; depends=[bayestestR insight]; }; performanceEstimation = derive2 { name="performanceEstimation"; version="1.1.0"; sha256="08jx2zl6xh0rp54xa70gb717wbfdzfrx9b47i3b3ly41qaf85vrc"; depends=[dplyr ggplot2 parallelMap tidyr]; }; pergola = derive2 { name="pergola"; version="1.0"; sha256="1650ipp2b455xdkznwm7bnxvimad7nbyr9i1lg2vdh64j1qfh7gl"; depends=[seriation]; }; - periscope = derive2 { name="periscope"; version="0.4.7"; sha256="1kzk8vp7w3ki4z9arhf340hkbh44jzwf5p2lzyy5wx6z92s4lv5d"; depends=[DT ggplot2 logging lubridate openxlsx shiny shinyBS shinydashboard shinydashboardPlus]; }; + periscope = derive2 { name="periscope"; version="0.4.9-1"; sha256="1cnvzg3gvv5xf0parx55qxd9dp8zdr9gqlz2h5fqhs9d384zb8dl"; depends=[DT ggplot2 logging lubridate openxlsx shiny shinyBS shinydashboard shinydashboardPlus]; }; perm = derive2 { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; }; - permDep = derive2 { name="permDep"; version="1.0.2"; sha256="0dv740vnjy99rc6px8w4ngis3w6zc4c67m0bx2lh327sqb7q3zsd"; depends=[BB survival]; }; permGPU = derive2 { name="permGPU"; version="0.14.9"; sha256="10r2qxbvzjxv3520lrn6cwi5akhhwgkhz7yaqxi5vh2f5l0s49wy"; depends=[Biobase foreach RUnit survival]; }; permGS = derive2 { name="permGS"; version="0.2.5"; sha256="0d2kp3c1fmnjjmsvc2qwh6m66yqvy2vrrxgv1fj2i4clsbavfa0y"; depends=[coin survival]; }; permPATH = derive2 { name="permPATH"; version="1.1"; sha256="06h1lqpmkg4ajjh4r837qp094h105n4mpvafnp2nsbv9yyayd4h8"; depends=[R2HTML xtable]; }; permubiome = derive2 { name="permubiome"; version="1.3"; sha256="0x5c9yf9xl14p1dxbhdggw75pnp0pzvm6bdigfpmhkq9qamdyscf"; depends=[dabestr ggplot2 gridExtra Matrix]; }; permuco = derive2 { name="permuco"; version="1.1.0"; sha256="1mp3yp4p1b382c31a3jcmq1n90zvb1lggacb3zdblpmz1yrj4v1c"; depends=[Matrix permute]; }; - permutations = derive2 { name="permutations"; version="1.0-5"; sha256="0891yqrj45fn11762d4an3bri8ihlxf0102z06mbfdy4hf8582h0"; depends=[magic numbers partitions]; }; + permutations = derive2 { name="permutations"; version="1.0-6"; sha256="1bygr2fa2qjka4bbx9i6l1iiy15anz427y3zh8hdq0r21aygmi7v"; depends=[magic numbers partitions]; }; permute = derive2 { name="permute"; version="0.9-5"; sha256="0ra8p5mf2590azrkas8z2ry7mif77xqxd29n4zgyi5vll225726j"; depends=[]; }; permutes = derive2 { name="permutes"; version="1.0"; sha256="1lrhlqwv1y2vgklgwp16jw90vmgifnp4rlxw55hhj8gs97agv5y8"; depends=[ggplot2 lmPerm plyr viridis]; }; perry = derive2 { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; }; @@ -11477,15 +11638,14 @@ in with self; { perspectev = derive2 { name="perspectev"; version="1.1"; sha256="175s1nq5z4gfs5qb39lq230g6n0v8fxzs5hr9j2rgx0knpbjfq03"; depends=[ape boot doParallel foreach ggplot2 mapproj sp]; }; perturb = derive2 { name="perturb"; version="2.10"; sha256="07c84x67hzyr70zkmd00f4gxqzcrpizc7w7h2hs22xy6p719a5i2"; depends=[gdata]; }; perturbR = derive2 { name="perturbR"; version="0.1.3"; sha256="1sdk5ls8x66lds4cy40xbl383px4xmrh21cw4bgy83rzbjjzwp2h"; depends=[ggplot2 igraph]; }; - pesel = derive2 { name="pesel"; version="0.7.2"; sha256="08f4nmiyisq6zb55zxy0ipwbp4x2vslcy1a2hkbpvzpns5472cnb"; depends=[]; }; + pesel = derive2 { name="pesel"; version="0.7.3"; sha256="125rgbar1aiw7x3ywfb09s3gh3k0zal0p44h4928d854mn4m986s"; depends=[]; }; petitr = derive2 { name="petitr"; version="1.0"; sha256="0i13zhdrdka0ij0khdzj6ylvvcn4wxvplb8a368i1s64cpgak30c"; depends=[]; }; petrinetR = derive2 { name="petrinetR"; version="0.2.1"; sha256="0h9nsjsj87b6qvvkg81kn0j2c4xkzq89sddp9l6pjh636bdqwf8i"; depends=[DiagrammeR dplyr purrr visNetwork xml2]; }; petro_One = derive2 { name="petro.One"; version="0.2.3"; sha256="1xky85vfk2mpj8xxdqggismzirm3rx2wr51g12zr80i1dx5wak4i"; depends=[cluster data_table dplyr ggplot2 graph magrittr RColorBrewer Rgraphviz rvest RWeka SnowballC tibble tm urltools wordcloud xml2]; }; - pewdata = derive2 { name="pewdata"; version="0.3.0"; sha256="01h4h8rxsg7ykz10qajvq2cdlj3mwj5jf2gzv1mswga8g86dkdhq"; depends=[foreign magrittr purrr rio RSelenium stringr]; }; + pewdata = derive2 { name="pewdata"; version="0.3.1"; sha256="1dn6v41kwrs8dj66063y7l6vryih2q49qcfvmhaiaxzvbpzymiyc"; depends=[foreign magrittr purrr rio RSelenium stringr]; }; pez = derive2 { name="pez"; version="1.2-0"; sha256="0rar132szi9idr99aaz3rs4r62b515pl91q0yxahg30ixnym7fjm"; depends=[ade4 animation ape apTreeshape caper FD Matrix mvtnorm phytools picante quantreg vegan]; }; pfa = derive2 { name="pfa"; version="1.1"; sha256="0ikdd7ps8wnjp9nm66w447m06hqxnnk553jglxikl2w5d9vk6b31"; depends=[lars POET quantreg]; }; pgam = derive2 { name="pgam"; version="0.4.15"; sha256="12llflsb32dfvxl3nbyb9bsl9bmd35g5g163hd3axzmg1bgi21ls"; depends=[]; }; - pgbart = derive2 { name="pgbart"; version="0.6.16"; sha256="09mrx375xny47yx6ybmyr66z9p96jjk98z8l1gd0l9s3kffj42n8"; depends=[BayesTree]; }; pgdraw = derive2 { name="pgdraw"; version="1.1"; sha256="1s1b1izpgryrqsjkdh3yvr137054sipj3kwdkzlx2af8xjr53f85"; depends=[Rcpp]; }; pgee_mixed = derive2 { name="pgee.mixed"; version="0.1.0"; sha256="115vvpv54q80486i3xs2yhmfyx476cf4g1v43q6l7wj3jwzcrvbg"; depends=[copula mvtnorm Rcpp RcppArmadillo]; }; pgirmess = derive2 { name="pgirmess"; version="1.6.9"; sha256="1i1qn68isaz2lbpqyydjgj9kri09aknza5qjn6m1wa1alyl7f611"; depends=[boot maptools rgdal rgeos sp spdep splancs]; }; @@ -11500,26 +11660,25 @@ in with self; { ph2mult = derive2 { name="ph2mult"; version="0.1.1"; sha256="0w3w18fkr9xzv6mpb00cz5id33zgsnl6s8zgjpchzvrhmpjpp437"; depends=[clinfun]; }; phangorn = derive2 { name="phangorn"; version="2.5.5"; sha256="0ihkaykqjmf80d8wrk3saphxvnv58zma6pd13633bd3cwanc33f5"; depends=[ape fastmatch igraph magrittr Matrix quadprog Rcpp]; }; phantom = derive2 { name="phantom"; version="0.1.3"; sha256="0kgw65jziw5s03isq5ywmqijhkbik5i84k30hx5gbi0zzgj8y0h1"; depends=[gplots MASS NMF qusage RColorBrewer Rcpp RcppArmadillo]; }; - phase1PRMD = derive2 { name="phase1PRMD"; version="1.0.1"; sha256="1gg11rvs5zqza66f7r7sw7g3w8nzi3il1883wpwzqhp58hsphjdw"; depends=[arrayhelpers coda dplyr ggplot2 gridExtra kableExtra knitr MASS phase1RMD plyr RColorBrewer reshape2 rjags]; }; - phase1RMD = derive2 { name="phase1RMD"; version="1.0.8"; sha256="1wvlajsqb8y8f30asq1lyk87kmakh2risnky98g5gday765y90qa"; depends=[arrayhelpers boot coda ggplot2 mvtnorm rjags]; }; + phase1PRMD = derive2 { name="phase1PRMD"; version="1.0.2"; sha256="0gr73nsp0an0ci6l86h9fw6l791jdw0b1497qi58w25zypggdyac"; depends=[arrayhelpers coda dplyr ggplot2 gridExtra kableExtra knitr MASS plyr RColorBrewer reshape2 rjags]; }; + phase1RMD = derive2 { name="phase1RMD"; version="1.0.9"; sha256="0dnyqa6jias2jqjqjpiq32jnd21ghb2shw45vdq8b5xyb8rxclwj"; depends=[arrayhelpers boot coda ggplot2 mvtnorm rjags]; }; phaseR = derive2 { name="phaseR"; version="2.1.3"; sha256="1xqh6k8zl0jc2srklb8vg57f88kssm80b286asg2cawanj06qs2k"; depends=[deSolve]; }; phateR = derive2 { name="phateR"; version="1.0.0"; sha256="1xfbzqhly569i4ic2gv4vn4sqnyqzhgqil17z1133sx78r4yj83a"; depends=[ggplot2 Matrix reticulate]; }; phd = derive2 { name="phd"; version="0.1"; sha256="1scwan3pkhdl0nyhpjrkcal1f58x0jkdkhixdcxppr1363r1v22a"; depends=[glmnet]; }; pheatmap = derive2 { name="pheatmap"; version="1.0.12"; sha256="1hdh74az3vyzz6dqa311rhxdm74n46lyr03p862kn80p0kp9d7ap"; depends=[gtable RColorBrewer scales]; }; phenModel = derive2 { name="phenModel"; version="1.0"; sha256="07jsc8jiwgxvhv4m6nr7llm22zzh5hd3pakw5c93jzim2835zvkp"; depends=[dplyr ggplot2 reshape]; }; phenability = derive2 { name="phenability"; version="2.0"; sha256="0can8qgdpfr4h6jfg23cnwh7hhmwv6538wg2jla9w138la7rhpd1"; depends=[calibrate]; }; - phenesse = derive2 { name="phenesse"; version="0.1.0"; sha256="0f9fwa0x7wmgkwmqx5afffhv1c5x6p67kpb9pki85x8b7nd1gqgl"; depends=[boot fitdistrplus]; }; + phenesse = derive2 { name="phenesse"; version="0.1.1"; sha256="18jhsycs3whrxamm50pavnqmjfjs27fyp4iy61d9m7mqbkg18js2"; depends=[boot fitdistrplus]; }; phenex = derive2 { name="phenex"; version="1.4-5"; sha256="00lsymflbmlxzxz8rxcpc94pc9zmhybial9f2xkz98h6h45zgrjl"; depends=[DEoptim foreach]; }; phenmod = derive2 { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat lattice pheno RColorBrewer]; }; pheno = derive2 { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme quantreg SparseM]; }; - pheno2geno = derive2 { name="pheno2geno"; version="1.4.0"; sha256="0fy8z6x1y0sakp07jb6zs0w0f86pbbllicj4qylxzfd5rpn1rqr0"; depends=[mixtools qtl VGAM]; }; phenoCDM = derive2 { name="phenoCDM"; version="0.1.3"; sha256="1cyqwc36zwa2a4ljy0xnqz0hhw0r98qk2an5y002lrchkqydplwp"; depends=[rjags]; }; phenocamapi = derive2 { name="phenocamapi"; version="0.1.5"; sha256="1kvb7lsixhh2sqdd5r9si0wbnrzfg3fbs29pb2nvl3086hnshl9i"; depends=[data_table RCurl rjson]; }; - phenocamr = derive2 { name="phenocamr"; version="1.1.3"; sha256="1wfrzs0sdhp7ivj9n6c2i8dr35gl6dp2rai69ylh5xxlk643a2ck"; depends=[changepoint daymetr httr jsonlite memoise shiny zoo]; }; - phenofit = derive2 { name="phenofit"; version="0.2.5-2"; sha256="1mjwg56v6b0mak7hrm821lrckq0j8nzc4w2lyqxsancil5xlqnqd"; depends=[data_table dplyr foreach ggplot2 gridExtra iterators jsonlite lubridate magrittr numDeriv optimx plyr purrr Rcpp RcppArmadillo reshape2 shiny spam stringr tibble tidyr ucminf zoo]; }; + phenocamr = derive2 { name="phenocamr"; version="1.1.4"; sha256="1abcwbds406m1dncn188n8y3fqwxx2h7g7xrca8j6bw2ld69jswd"; depends=[changepoint daymetr httr jsonlite memoise MODISTools zoo]; }; + phenofit = derive2 { name="phenofit"; version="0.2.7"; sha256="0159jn606hm9mzrfhfnjl9dab9k8118x8g6pg3y86l31mwri6skv"; depends=[data_table dplyr foreach ggplot2 gridExtra iterators jsonlite JuliaCall lubridate magrittr numDeriv optimx plyr purrr Rcpp RcppArmadillo reshape2 shiny spam stringr tibble tidyr ucminf zoo]; }; phenology = derive2 { name="phenology"; version="7.3"; sha256="0hklk5k0i6vv733dm3npphg0zrhlb14ps6j6wwvsx50sqr3xl9jg"; depends=[HelpersMG lmf numDeriv optimx]; }; phenomap = derive2 { name="phenomap"; version="1.2.1"; sha256="0kpngxqrbahild5nblfvgx2kna43hqqldx5q3b127dnqwzbhfvbb"; depends=[doParallel dplyr phenex plyr raster rgdal stringr]; }; - phenopix = derive2 { name="phenopix"; version="2.3.1"; sha256="1yy163nh2b74m0v7f2gkgxaplvw4whs2h30bkw4chl0zyrcrci86"; depends=[bcp doParallel foreach gtools iterators jpeg plyr raster SDMTools sp stringr strucchange zoo]; }; + phenopix = derive2 { name="phenopix"; version="2.4"; sha256="0l6g4zc2wlmdizgbi3c8580ahyx59izpdas9sjbnas719hn59wvc"; depends=[bcp doParallel foreach gtools iterators jpeg plyr raster sp stringr strucchange zoo]; }; phiDelta = derive2 { name="phiDelta"; version="1.0.1"; sha256="0g1g5516p8i1gfpvsy75rdirib8sx1ki2mbf1cvgsnzh70h72gbv"; depends=[]; }; phia = derive2 { name="phia"; version="0.2-1"; sha256="0rv2akl5a488vax4sd9wnx765mch4vvcmg3iyxyljzl5kpqh5r00"; depends=[car Matrix]; }; philentropy = derive2 { name="philentropy"; version="0.4.0"; sha256="09vi6mfcig397226kq2fgymwg5ng8iysi6b2f616masscgshplxz"; depends=[dplyr KernSmooth Rcpp]; }; @@ -11528,9 +11687,9 @@ in with self; { phonenumber = derive2 { name="phonenumber"; version="0.2.2"; sha256="1m5idp538lvynmfp8m7l89js6hk5lpp26k419bdvj3hd3ap0n9lg"; depends=[]; }; phonfieldwork = derive2 { name="phonfieldwork"; version="0.0.3"; sha256="1d7rhyzdhm17hdd7ibvkgz3js01c7wskvxlhr1c6kzbvf0mibmb6"; depends=[phonTools rmarkdown tuneR]; }; phonics = derive2 { name="phonics"; version="1.3.2"; sha256="03iacdpzzw90jgh38mhs49gswz3292nlkizc1xr02xry6nd7357a"; depends=[BH data_table Rcpp]; }; - photobiology = derive2 { name="photobiology"; version="0.9.30"; sha256="0q15x9lgz0mvqnykg36iryz7nb0c92mz6zqyy56cypc6wwakym2i"; depends=[dplyr lubridate plyr polynom rlang splus2R stringr tibble zoo]; }; + photobiology = derive2 { name="photobiology"; version="0.10.1"; sha256="1wg98lsixdz1qimigjxx7gwqxv36mgyb5i065gmsjf5jhd6w40jw"; depends=[dplyr lubridate plyr polynom rlang splus2R stringr tibble zoo]; }; photobiologyFilters = derive2 { name="photobiologyFilters"; version="0.5.0"; sha256="1zijk6g9xf29ql7pybjs1zqkyn8s2zav4vz2pskj548v6hmrcw3x"; depends=[photobiology]; }; - photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.21-1"; sha256="1n9vhxp4qvwqnqqpbkd8iz4pfl4x81kjyxm7fj9yzyjvdjfiq0sq"; depends=[colorSpec dplyr lazyeval lubridate photobiology readr readxl stringr tibble tidyr]; }; + photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.22-1"; sha256="1dqjlcra3vqydxjf6rwha6y1bykkpqwf8bqjkljs4kb89642qbv1"; depends=[colorSpec dplyr lazyeval lubridate photobiology readr readxl stringr tibble tidyr]; }; photobiologyLEDs = derive2 { name="photobiologyLEDs"; version="0.4.3-1"; sha256="0inhl6ba1fzkak4752m60hkm6fzapzyz5kchvz18yv33dmm13v1c"; depends=[photobiology]; }; photobiologyLamps = derive2 { name="photobiologyLamps"; version="0.4.3"; sha256="1df7ngcyrmvhab80w1ggyv1p9srsvwr9f6pm8yl7hvkpkv6jbdsk"; depends=[photobiology]; }; photobiologyPlants = derive2 { name="photobiologyPlants"; version="0.4.2"; sha256="0ab5ks72mb5x03xc0ww9fcl0h13ja8402b1s670lqmmhyvp6fj3s"; depends=[photobiology photobiologyWavebands]; }; @@ -11538,9 +11697,7 @@ in with self; { photobiologySun = derive2 { name="photobiologySun"; version="0.4.1"; sha256="15wp8q29m5c4qplind9098ikxmm1r60lw8cm0pa48lmh33638ia3"; depends=[photobiology]; }; photobiologyWavebands = derive2 { name="photobiologyWavebands"; version="0.4.3"; sha256="04nc3yhd97k2pb1jv2bgda8mii4y4ph1884wagw8y3lc0g4dkicv"; depends=[photobiology]; }; photosynthesis = derive2 { name="photosynthesis"; version="1.0.0"; sha256="089b42s4277j6pmxa3jsg0bcrilqanp7dblnz6hlmgprqcbmlhwb"; depends=[crayon dplyr furrr future glue gunit magrittr purrr rlang stringr tealeaves tidyr tidyselect units]; }; - phrasemachine = derive2 { name="phrasemachine"; version="1.1.2"; sha256="1145c8ymarhbza8253rw4ybnq0k5pcckqxpdcr8s2y23pj182r1p"; depends=[NLP openNLP stringr]; }; phreeqc = derive2 { name="phreeqc"; version="3.6.0"; sha256="17dv4c94y7z5yaqx1g8llbmwpg15pkkixkhmi5knyyvi2fd23vkl"; depends=[]; }; - phtt = derive2 { name="phtt"; version="3.1.2"; sha256="1fvvx5jilq5dlgh3qlfsjxr8jizy4k34a1g3lknfkmvn713ycp7v"; depends=[pspline]; }; phuassess = derive2 { name="phuassess"; version="1.1"; sha256="0jplj9gih32dllx2hw5aqvc9b94sbrbv66s3a5r8mdbpjh93rhng"; depends=[]; }; phuse = derive2 { name="phuse"; version="0.2.2"; sha256="0aihiz0gkvs7bq9f9fmfxsv7wk5yifcnmgnjl3y9qf2dzl5787bb"; depends=[git2r httr jsonlite RCurl rlist SASxport shiny stringr yaml]; }; phybreak = derive2 { name="phybreak"; version="0.2.0"; sha256="0vapc0w308wv1cd72p2xbj3q7jfnxwp08g5g8855a38pcn3njbfg"; depends=[ape phangorn Rcpp stringr]; }; @@ -11548,7 +11705,7 @@ in with self; { phyext2 = derive2 { name="phyext2"; version="0.0.4"; sha256="0j871kgqm9fll0vdgh071z77ib51y8pxxm0ssjszljvvpx1mb8rb"; depends=[ape phylobase]; }; phylin = derive2 { name="phylin"; version="2.0.2"; sha256="0v6fyk2prja448vdi7ipwzws28fjfi188pfncjf9mhn8jrgpfxl6"; depends=[]; }; phyloTop = derive2 { name="phyloTop"; version="2.1.1"; sha256="1n44kr3a9yg8yvy3m493zi04x6aiqm424fp2ls9yzyx1cga2h9nk"; depends=[ape igraph NHPoisson phylobase]; }; - phylobase = derive2 { name="phylobase"; version="0.8.6"; sha256="1n9g69llrh8xfmrnxh78rr09cxy5qbc99dr3amg121pl1qhpn4g7"; depends=[ade4 ape Rcpp rncl RNeXML]; }; + phylobase = derive2 { name="phylobase"; version="0.8.10"; sha256="0jzr1gdvmi4l640hwwzh9bxqmpja69bn3ygnaqx37awvyh7khi2s"; depends=[ade4 ape Rcpp rncl RNeXML]; }; phylocanvas = derive2 { name="phylocanvas"; version="0.1.3"; sha256="1l5br500lwwf7vp8wph5ykpkpqd15lypvhzy0c1cc8g8c6f7pckn"; depends=[ape htmlwidgets phylobase]; }; phyloclim = derive2 { name="phyloclim"; version="0.9.5"; sha256="107kilh0gwr84ig54g92zyk7zv553pky2bzpjqgf9fjwbm6fvmrs"; depends=[ape raster sp]; }; phylocomr = derive2 { name="phylocomr"; version="0.3.2"; sha256="1qdhf6a7cqp12i4macy5wcbk6mf01fqbm4rc11yl63qr72zwrbhy"; depends=[sys tibble]; }; @@ -11558,25 +11715,24 @@ in with self; { phylolm = derive2 { name="phylolm"; version="2.6"; sha256="0vah8ibicldi57wab4sk1kx7gdq6h34bm6swmxzhq7kikxfwmmyj"; depends=[ape future_apply]; }; phylometrics = derive2 { name="phylometrics"; version="0.0.1"; sha256="1pmr6l3wmaf91wdlsc5m63l07fibngnly2qzkma0rdi463ii03il"; depends=[mvtnorm]; }; phylopath = derive2 { name="phylopath"; version="1.1.2"; sha256="15fs845ay7nbhaxwapc2b33f134nqj1m365l44iyikdm4cacmdx0"; depends=[ape ggm ggplot2 ggraph igraph MuMIn pbapply phylolm purrr tibble]; }; - phyloseqGraphTest = derive2 { name="phyloseqGraphTest"; version="0.0.2"; sha256="1xgv2kf7j3ia5vk10r7w9588rfv7asdaf8f3yxwp5q7aqn3krm6q"; depends=[ggnetwork ggplot2 igraph intergraph phyloseq]; }; - phylosim = derive2 { name="phylosim"; version="3.0.5"; sha256="07adqgkxng0jj51nhwlsxxnd0bdxrk54lvj1fs53yxy236q6xwkf"; depends=[ape compoisson ggplot2 R_methodsS3 R_oo]; }; - phylotaR = derive2 { name="phylotaR"; version="1.0.0"; sha256="0plxc3l9fxxj9mfnhnpp5wrxyvxm292fxrwx2g8xysasmjb301v9"; depends=[ggplot2 igraph R_utils rentrez sys treeman treemapify XML]; }; + phyloregion = derive2 { name="phyloregion"; version="1.0.2"; sha256="1zqra1d9r2djwbd04p9wiadvms81hvg1idpji9yq11im10c47pcb"; depends=[ape betapart cluster colorspace data_table fastmatch igraph Matrix phangorn raster rgeos sp vegan]; }; + phyloseqGraphTest = derive2 { name="phyloseqGraphTest"; version="0.1.0"; sha256="0y1hxj68dcic4i7ihnw9hgf28qp6s6kpq4c08dy7gv19gq7sllgd"; depends=[ggnetwork ggplot2 igraph intergraph phyloseq]; }; + phylosignal = derive2 { name="phylosignal"; version="1.3"; sha256="1h73wwczwak5v89mybq16lmmfr0fxfv5mx347ffipy6q9vgvwqx5"; depends=[adephylo ape boot DBI igraph phylobase Rcpp RcppArmadillo]; }; phylotate = derive2 { name="phylotate"; version="1.3"; sha256="092kvn32j06vm8ilwjkgidcz11r3qhsmi0cb0g0nnykw0a0vii4p"; depends=[]; }; phylotools = derive2 { name="phylotools"; version="0.2.2"; sha256="1dhk1ncp5zi4zl1xfnjz64v983dm7bq7iimfjin80j0bdcpps44w"; depends=[ape]; }; phyr = derive2 { name="phyr"; version="1.0.2"; sha256="1qk4mbchi5dcz6vsmwb93gj5ihp2ygvm1ya63mkw11vkyy2nv67c"; depends=[ape dplyr gridExtra latticeExtra lme4 Matrix mvtnorm nloptr Rcpp RcppArmadillo]; }; phyreg = derive2 { name="phyreg"; version="1.0.2"; sha256="0m1psq79zl7h8791pl8g6i0ybda7vgddza8r9mwqhg4sw1q4bzcp"; depends=[]; }; physiology = derive2 { name="physiology"; version="1.2.1"; sha256="1z7xymwgj7bqn0yvcz3q8pvwhpr5vx5qd0x8sayal1vgpqc0nccb"; depends=[Rcpp]; }; - phytools = derive2 { name="phytools"; version="0.6-99"; sha256="03rrcx2r8sbf6510xdd0259p02apy2z84ifk7f076pvwlz5k5x9f"; depends=[animation ape clusterGeneration coda combinat expm gtools maps MASS mnormt nlme numDeriv phangorn plotrix scatterplot3d]; }; + phytools = derive2 { name="phytools"; version="0.7-20"; sha256="12fs20w7f921kn6qj397l2n9q9q6ri6hqpikmhbssah58a973isy"; depends=[animation ape clusterGeneration coda combinat expm gtools maps MASS mnormt nlme numDeriv phangorn plotrix scatterplot3d]; }; phytotools = derive2 { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; }; - picante = derive2 { name="picante"; version="1.8"; sha256="1bcq2j7fs89c2jib68qq6la67rxyg9raryf162mwvjakpf6k19l1"; depends=[ape nlme vegan]; }; + picante = derive2 { name="picante"; version="1.8.1"; sha256="1b16zm8zjjsl181b8krkdcrbcw347kf772c4w7y5332qmfi7jhz0"; depends=[ape nlme vegan]; }; picasso = derive2 { name="picasso"; version="1.3.1"; sha256="1z7zm88wjp7fia7054l7i55f152iddrjj9wbcpcskhc8s6kfg53c"; depends=[MASS Matrix]; }; pid = derive2 { name="pid"; version="0.50"; sha256="05s3xqf95d4avh7gkr49jsm8jzacbv694c3wgppkkc40zip6vkc7"; depends=[DoE_base FrF2 FrF2_catlg128 ggplot2 png]; }; piecepackr = derive2 { name="piecepackr"; version="1.2.1"; sha256="1mh3b862pyxl9zkxmvcflnn4b0nx27s8fj3srs5ph2gwhh7l3zcy"; depends=[grImport2 jpeg png purrr R6 stringr tibble]; }; piecewiseSEM = derive2 { name="piecewiseSEM"; version="2.1.0"; sha256="1dpl3kyph0ry9g9321cknznjdizh03klg0s6hx56g6h8ygb0ar6h"; depends=[car DiagrammeR emmeans igraph lme4 MASS nlme]; }; - pifpaf = derive2 { name="pifpaf"; version="1.0.1"; sha256="0wj1fbhd871fnw7fjlbh0gdjz848mbwl1bzjp3cgmh9s7jnd2kci"; depends=[ggplot2 gridExtra MASS matrixcalc numDeriv sfsmisc]; }; - piggyback = derive2 { name="piggyback"; version="0.0.10"; sha256="08d7jxw7mvfyhjbr8zy95p952j2p94ii6zq38b8xw96g6k1380bz"; depends=[clisymbols crayon fs gh git2r httr jsonlite lubridate magrittr memoise usethis]; }; + piggyback = derive2 { name="piggyback"; version="0.0.11"; sha256="17cmkzp4g5gcapab3g5jxpabsmw4s3zsizqd99bh36xyw76v1jds"; depends=[clisymbols crayon fs gh git2r httr jsonlite lubridate magrittr memoise usethis]; }; pillar = derive2 { name="pillar"; version="1.4.3"; sha256="02sn7zw80wq33jgxk2i6m5jb83sk7y72dfhgyy0apfinv05w92ss"; depends=[cli crayon fansi rlang utf8 vctrs]; }; - pim = derive2 { name="pim"; version="2.0.1"; sha256="1m804clxc8m4nyzi4hhfy118527lgf2sb7589qd61fb83yh6hi8p"; depends=[BB nleqslv]; }; + pim = derive2 { name="pim"; version="2.0.2"; sha256="0kwlm6n23ccs0jz4plsqprg6inj3qv74zhvg9gpxyj3ksvdxp58i"; depends=[BB nleqslv]; }; pimeta = derive2 { name="pimeta"; version="1.1.3"; sha256="1mx0m438db4n041bns6sm8sr8vrj6w8b2kvpmrkkp0bly2vpv40q"; depends=[ggplot2 Rcpp RcppEigen scales]; }; pinbasic = derive2 { name="pinbasic"; version="1.2.2"; sha256="0mcw68wrixz2jf62nfifdgg8bnp4h1p3byivz28wi61blj8iaa75"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; }; pinfsc50 = derive2 { name="pinfsc50"; version="1.1.0"; sha256="1fja8xdqwsm4g223wmb2yg5fqmsg94hchzjd4qrqah1zb8vbdfdn"; depends=[]; }; @@ -11586,7 +11742,7 @@ in with self; { pinnacle_data = derive2 { name="pinnacle.data"; version="0.1.4"; sha256="1sl36i2857b3xwx7iwgy8mkgjvz7nfa74ch1n8kcxbj59ib7mp8p"; depends=[tibble]; }; pinochet = derive2 { name="pinochet"; version="0.1.0"; sha256="0qy18mlw34cv9p7b3qb5bidxyq44k0hzj91hm5vp6wkjhik4knvi"; depends=[]; }; pinp = derive2 { name="pinp"; version="0.0.9"; sha256="1hdj0mqwz0hwl6jsh5zknbgg10bj49giqnr4y3lavfbk8d7qmmvs"; depends=[knitr rmarkdown]; }; - pins = derive2 { name="pins"; version="0.3.1"; sha256="187n23r099fgv6d0xsb4hjah74nni14q380lldv5y17swv0vl89r"; depends=[base64enc crayon httr jsonlite magrittr mime openssl rappdirs withr yaml zip]; }; + pins = derive2 { name="pins"; version="0.4.0"; sha256="1dg4553hjfy948nq3y7fx90ybdxnlwkfjv7zjfrf128zdwpvnb7x"; depends=[backports base64enc crayon digest filelock httr jsonlite magrittr mime openssl rappdirs withr yaml zip]; }; pinyin = derive2 { name="pinyin"; version="1.1.6"; sha256="0rw9qd5hbcmpi30vdqs31ijy37d8jlpqv0xif2nndb8cwj8x5bw2"; depends=[data_table splitstackshape]; }; pipe_design = derive2 { name="pipe.design"; version="0.5.1"; sha256="0r0szkdzifxmnnbr6675w8ij4zwqgxj3gwahc7a74mxr51f7qh8j"; depends=[ggplot2 gtools xtable]; }; pipeGS = derive2 { name="pipeGS"; version="0.4"; sha256="0ki4i70r5f195b4jfv3hxlxz3zj57mhy2yf4984bwr11impilz5w"; depends=[]; }; @@ -11599,50 +11755,50 @@ in with self; { piton = derive2 { name="piton"; version="0.1.1"; sha256="1265y4lv2m5nwrh25sahjkxwmivpxgh9shrdidlmaman7zs6cclr"; depends=[Rcpp]; }; pivmet = derive2 { name="pivmet"; version="0.2.0"; sha256="0xcm0pb5qn2vikhnf7fnp6942syq0xax7fgwmspixa6la5bdkksg"; depends=[bayesmix cluster corpcor MASS mclust mvtnorm RcmdrMisc rjags rstan runjags]; }; pivotaltrackR = derive2 { name="pivotaltrackR"; version="0.1.0"; sha256="024srncm288mn3bz6hv7ljzkchmnljk4yc2d4z7i05vsn7dzd2c6"; depends=[curl httr]; }; - pivottabler = derive2 { name="pivottabler"; version="1.2.3"; sha256="08aapjisah7q0lyw70cfiqkyic633z8cfiq760nnngh88cp1hkc7"; depends=[data_table dplyr htmltools htmlwidgets jsonlite R6]; }; + pivottabler = derive2 { name="pivottabler"; version="1.3.1"; sha256="0c82jd07g5fh9c36izc1brkz0rc7lryp5r1d50cvhlaap7dys588"; depends=[data_table dplyr htmltools htmlwidgets jsonlite R6]; }; pixels = derive2 { name="pixels"; version="0.1.0"; sha256="0lna0z2shs49kh48ipjnyigaa22wb9gm4mq970ldhh9msb7wcv55"; depends=[htmlwidgets miniUI shiny]; }; pixiedust = derive2 { name="pixiedust"; version="0.8.6"; sha256="1dajiblpm51szndz026lmwh6swx8f9f03s6md26d84awcx0q1dpc"; depends=[broom checkmate dplyr htmltools knitr labelVector magrittr scales tidyr]; }; pixmap = derive2 { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; }; pkgKitten = derive2 { name="pkgKitten"; version="0.1.5"; sha256="0nnib0gv9g22b9p01xigsgj04jv29fv7f444invfphfh9cc866m4"; depends=[]; }; pkgbuild = derive2 { name="pkgbuild"; version="1.0.6"; sha256="0xnlz6ivhkbmncg9hfw5p69lm4rjy3wn5lyxmygxyf4rrfnnqwxx"; depends=[callr cli crayon desc prettyunits R6 rprojroot withr]; }; - pkgcache = derive2 { name="pkgcache"; version="1.0.5"; sha256="0d0w3gqw3429dwmfc9804f9pl71l14phh03ppk2q5q1kyp49xw92"; depends=[assertthat cli cliapp crayon curl digest filelock glue prettyunits R6 rappdirs rematch2 rlang tibble uuid withr]; }; + pkgcache = derive2 { name="pkgcache"; version="1.0.7"; sha256="1abjswh5jkx60vssrsfgznl2l97rys00icwrxp1pm6i99aqsiscp"; depends=[assertthat callr cli curl digest filelock glue prettyunits processx R6 rappdirs rlang tibble uuid]; }; pkgcond = derive2 { name="pkgcond"; version="0.1.0"; sha256="0pxj798042g23cf19r67nbgdyhpd868n2pkqjvjgrgr8ivwnkf1h"; depends=[]; }; pkgconfig = derive2 { name="pkgconfig"; version="2.0.3"; sha256="0l1qph8zyi2sic3k2qcd7vlfl7rzfh1q7z7zvjkl5f7y1x2fy3rk"; depends=[]; }; - pkgdown = derive2 { name="pkgdown"; version="1.4.1"; sha256="1y0mnsiq05snzschh2y5a0y1wrwh79c4jclsljjyflibbffhxxcf"; depends=[callr cli crayon desc digest evaluate fansi fs highlight httr magrittr MASS memoise openssl processx purrr rematch2 rlang rmarkdown rstudioapi tibble whisker withr xml2 yaml]; }; + pkgdown = derive2 { name="pkgdown"; version="1.5.1"; sha256="0sy7f4bzbdzh2z8m30hq2i5yx9vrpmridrg4l85qpvwm5j7yhd88"; depends=[callr cli crayon desc digest evaluate fansi fs highlight httr magrittr MASS memoise openssl processx purrr rematch2 rlang rmarkdown rstudioapi tibble whisker withr xml2 yaml]; }; pkgfilecache = derive2 { name="pkgfilecache"; version="0.1.2"; sha256="07x63w19fg7sl547501r2dx2ds5sfdfb29xvqrvjibf8265x25fw"; depends=[downloader rappdirs]; }; pkggraph = derive2 { name="pkggraph"; version="0.2.3"; sha256="1isiywgm20rypc5qr03p0k7lis76zzd96x5ncbvia644d2n13brm"; depends=[curl data_table dplyr ggnetwork ggplot2 htmltools igraph intergraph Matrix network networkD3 plyr RColorBrewer tibble]; }; pkgload = derive2 { name="pkgload"; version="1.0.2"; sha256="0z7jvharafahi2gv5547mk1n499isjzw06kfwymmxc0gd575d1ii"; depends=[desc pkgbuild rlang rprojroot rstudioapi withr]; }; - pkgmaker = derive2 { name="pkgmaker"; version="0.31"; sha256="0cc6v6kpwxwwh7k7zyw13wqdp0f9qzzr1a7vv02lskgii54aa4nb"; depends=[assertthat bibtex codetools digest magrittr registry stringi stringr withr xtable]; }; - pkgnet = derive2 { name="pkgnet"; version="0.4.0"; sha256="0da139p57xvy2v5ld3mnddgak59zjr58ndnbgg3y8msni80g52gq"; depends=[assertthat covr data_table DT futile_logger glue igraph knitr magrittr R6 rlang rmarkdown visNetwork]; }; + pkgmaker = derive2 { name="pkgmaker"; version="0.31.1"; sha256="0r0ga20dy25v9y5gjbds4y6kaa5a7qknh503qdkzllcpzbibh0hp"; depends=[assertthat bibtex codetools digest magrittr registry stringi stringr withr xtable]; }; + pkgnet = derive2 { name="pkgnet"; version="0.4.1"; sha256="194ynbhq6k7gp8l4ccq6m37qhhf791ynbppjh77cc0q50w2jz387"; depends=[assertthat covr data_table DT futile_logger glue igraph knitr magrittr R6 rlang rmarkdown visNetwork]; }; pkgsearch = derive2 { name="pkgsearch"; version="3.0.2"; sha256="1dvlqav7hp43x30rmwr8h3dscc0hc01i6mfc7hxvf7ny1rzckfv0"; depends=[assertthat httr jsonlite parsedate prettyunits tibble]; }; pkgverse = derive2 { name="pkgverse"; version="0.0.1"; sha256="0lsv7s9vsjvfpy19nxbdlbm363j01wwqqnrp0nlrik590hfq4w83"; depends=[devtools usethis]; }; pkmon = derive2 { name="pkmon"; version="1.0"; sha256="0j2v4zlf7vgy5gld29xiii15m9i85cpiwc25rmzjm02cz2p32c72"; depends=[]; }; pkr = derive2 { name="pkr"; version="0.1.2"; sha256="0m045dlcq3rls1w0smy4jvk3c57ckpqdv8xnz261k1gnnyjmz1k2"; depends=[binr foreign forestplot rtf]; }; pks = derive2 { name="pks"; version="0.4-1"; sha256="1lwm65s2b9y6vr1yr683n535yz8hbzc6j289a6yp45v2yai72m07"; depends=[sets]; }; - pksensi = derive2 { name="pksensi"; version="1.1.4"; sha256="0bsl7w96z6hsljdsg9g9xng1sspq2h3ik064g238firxvdyclb46"; depends=[data_table deSolve dplyr getPass ggplot2 magrittr reshape]; }; + pksensi = derive2 { name="pksensi"; version="1.1.5"; sha256="108qm4y1ss1pd6nhckwmg8b45hc3pg0xn5ch8q2xzi1h9imm7hz3"; depends=[data_table deSolve dplyr getPass ggplot2 magrittr reshape]; }; plRasch = derive2 { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; }; - pla = derive2 { name="pla"; version="0.2"; sha256="1qb71zjcxvs3zbfy0sryyxizwix0nw530zsfw661a8vm8sk054kw"; depends=[]; }; plac = derive2 { name="plac"; version="0.1.1"; sha256="08kqnjzbfygnbqvqg5wyw148kfhjqxy46y4vaiq9zzwzj58w8vzn"; depends=[Rcpp RcppEigen survival]; }; placer = derive2 { name="placer"; version="0.1.3"; sha256="0d7b6mkyyrcjn1pqxlj9mjis6vzks986i7vhc8ffkp8hz8sc7271"; depends=[]; }; plainview = derive2 { name="plainview"; version="0.1.0"; sha256="0yvw357p1hwrlj4c2sjr4klmy6j98a3kbdfwg0snaiv0drdyhznk"; depends=[gdalUtils htmltools htmlwidgets lattice png raster viridisLite]; }; plan = derive2 { name="plan"; version="0.4-3"; sha256="0j3mvcy97r7adcs7q6z0w9ng74jcfwii1xp8kcl2cwbzs2fd425r"; depends=[]; }; planar = derive2 { name="planar"; version="1.6"; sha256="0x5xdb2afpc1w8s217hy765mz938kg5b5j7vzqzhlsh2dzdjccpj"; depends=[cubature dielectric ggplot2 plyr Rcpp RcppArmadillo reshape2 statmod]; }; planets = derive2 { name="planets"; version="0.1.0"; sha256="01zh7lgaykr9p186yy0vksn2pmc69b3xxh78w7z6wclvqjb7zh1p"; depends=[]; }; - planor = derive2 { name="planor"; version="1.5-1"; sha256="06xkn12v7ld5fxqjvpmx01jb0a87hnzs8d2clia67sk2h33nlnka"; depends=[bit64 conf_design Rcpp RcppArmadillo]; }; + planor = derive2 { name="planor"; version="1.5-3"; sha256="0klnl8c5h1db8dl9jn159f4ypa8sga0yqdhlh1x8gdkbx7amzrzj"; depends=[bit64 conf_design Rcpp RcppArmadillo]; }; plantecophys = derive2 { name="plantecophys"; version="1.4-4"; sha256="005js9r7xg4jf2aqgsqddkkxhcdnhsiyzc1cqa7j59r4g5xbmh1j"; depends=[]; }; + plantecowrap = derive2 { name="plantecowrap"; version="1.0.4"; sha256="0syxf63xy5whzw03ys5cxyw7689mr7ihgmqddv53jb8rlbwm84p8"; depends=[ggplot2 minpack_lm plantecophys tidyr]; }; plaqr = derive2 { name="plaqr"; version="2.0"; sha256="15pdb57123m3cahvcsyrrvxjwxvs2f389yxip91gjxn68jf6cx1l"; depends=[quantreg]; }; - plater = derive2 { name="plater"; version="1.0.1"; sha256="0v5b9r6iha18qvrjpbr1p8fy06nf31x63ch5cnb4axyqa0x5skpp"; depends=[dplyr]; }; + plater = derive2 { name="plater"; version="1.0.2"; sha256="0z3s33xpfkd1ln37bpsgycbb35hgjq23yi151imdxyv80493vy4w"; depends=[dplyr]; }; platetools = derive2 { name="platetools"; version="0.1.2"; sha256="026i0xxci33r1c4zrjwjpw1wqdnj44nryqzzapa367160p9f2v5y"; depends=[ggplot2 RColorBrewer]; }; plde = derive2 { name="plde"; version="0.1.2"; sha256="1g1b1sgyfxgfkjcr3sdkan8jd6r7yyi0izc83vyj11bdk08jx22h"; depends=[]; }; pleiades = derive2 { name="pleiades"; version="0.2.0"; sha256="1h3q4yf0w0al7n8l7ca4vgx2bhrrz8clli15svlds7n402s8rzp5"; depends=[crul DBI dbplyr dplyr gistr jsonlite rappdirs RSQLite]; }; pleio = derive2 { name="pleio"; version="1.6"; sha256="0av1sl0fdn2ia7ddalbvidhcnsvs36iq618s1bknjw29y5yyq020"; depends=[Matrix rms]; }; - plethem = derive2 { name="plethem"; version="0.1.7"; sha256="1ajcy3wwc23hd6n9jsvr9x82rnpnq5y8h588wgy1jfwydgrshn06"; depends=[data_table deSolve devtools dplyr DT formatR gdata ggplot2 httk magrittr miniUI plotly readxl reshape2 rhandsontable RSQLite rstudioapi shiny shinyBS shinydashboard shinyjs shinythemes shinyWidgets sqldf truncdist V8]; }; plfMA = derive2 { name="plfMA"; version="1.0.4"; sha256="0q6wiiknmgw812kcf9qq309zlizyry7ldn6m08lkw6xq6i4f4s85"; depends=[cairoDevice gWidgets gWidgetsRGtk2 limma RGtk2]; }; plfm = derive2 { name="plfm"; version="2.2.2"; sha256="1jgf3jrkdpsf77i4lf68s6sxax95c9is4nryhnzanq9i5f23j24v"; depends=[abind sfsmisc]; }; plgp = derive2 { name="plgp"; version="1.1-7"; sha256="02g6saabrsd8pra0szbwcbilf6w5ywg2gxqb5zdvbxds2vw36hn0"; depends=[mvtnorm tgp]; }; plink = derive2 { name="plink"; version="1.5-1"; sha256="0rn2i9i8af9aq0xgxhpcdchs2952lq2d2sg8x3js0zi3vcml76k0"; depends=[lattice MASS statmod]; }; + plinkFile = derive2 { name="plinkFile"; version="0.1.0"; sha256="0803hp822v9rqh4h437q2nmab19yamc4dbyi6iimm67ykp0d5xss"; depends=[]; }; plinkQC = derive2 { name="plinkQC"; version="0.3.0"; sha256="1s458cg4y1zisjk3var3fnm1q54hfbl228i9qdxgzkkrhzc9mghw"; depends=[cowplot data_table dplyr ggforce ggplot2 ggrepel igraph optparse R_utils sys UpSetR]; }; - plm = derive2 { name="plm"; version="2.2-0"; sha256="0sn8a3f5xaa1c98br454c6h5jfba7s3jscl61km1gm47qcr8a0vz"; depends=[bdsmatrix Formula lattice lmtest MASS maxLik nlme Rdpack sandwich zoo]; }; + plm = derive2 { name="plm"; version="2.2-3"; sha256="10bwd5xpim12038bxs8bmlaf33smlqy5f0cn7p3j6ipfygdwryld"; depends=[bdsmatrix Formula lattice lmtest MASS maxLik nlme Rdpack sandwich zoo]; }; plmm = derive2 { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[Formula nlme sm]; }; pln = derive2 { name="pln"; version="0.2-1"; sha256="09zg7zwmmqpjr1j59lqsjf4blrkya9wfwddgzfm9rr5jxrzvqcv8"; depends=[]; }; plogr = derive2 { name="plogr"; version="0.2.0"; sha256="0a8dhzlna79ggyhfr0nncgh15a9n6r0dsz664pz0ah323wpblqqf"; depends=[]; }; @@ -11651,21 +11807,21 @@ in with self; { plot3Drgl = derive2 { name="plot3Drgl"; version="1.0.1"; sha256="12p4qc9vmhr86ssx6xnz3cmx84q5jgd28bw9dp4wjrn04n6l4va6"; depends=[plot3D rgl]; }; plot3logit = derive2 { name="plot3logit"; version="1.0.2"; sha256="0pgqlq8rpkrv277d1mfy2z22mkykc5zmhvkg07wsz3hdxr0ifx80"; depends=[ellipse ggplot2 ggtern magrittr reshape2 Ternary]; }; plotGMM = derive2 { name="plotGMM"; version="0.2.1"; sha256="1gp99gvb886kcwjk9yvfd7s6mgy3jf3x0zhpaj9zp0fky12ivz7b"; depends=[amerika ggplot2 wesanderson]; }; - plotKML = derive2 { name="plotKML"; version="0.6-0"; sha256="18c2lwdlxbzlfhlf0bip825v2mfrnqd9gg30l967zv112j7x0hrf"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; }; + plotKML = derive2 { name="plotKML"; version="0.6-1"; sha256="1k5bfajgzcj912ja8s3ashsvfqz0sx10746x4ggyknyp17qrlbzw"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; }; plotMCMC = derive2 { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; }; plotMElm = derive2 { name="plotMElm"; version="0.1.5"; sha256="0wwqzrpkmq9gzazdzlk62qig6vz43niada6fxh1wcsjqjwkcccgp"; depends=[ggplot2 interactionTest]; }; plotROC = derive2 { name="plotROC"; version="2.2.1"; sha256="0bk8j2lp80zcz4kkig1y5a1ig8vbjh7b4inzc46bn07ns1rdjgzg"; depends=[ggplot2 gridSVG plyr rlang shiny]; }; plotSEMM = derive2 { name="plotSEMM"; version="2.4"; sha256="0fircrayhz92zvkigkyb1zpn07bvssqs1ip15p926zj3rl77fqgy"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; }; - plotdap = derive2 { name="plotdap"; version="0.0.5"; sha256="0c0ixynfn7a0n9h78vngsy6rqsypji6ybb4iwbrm14a42q0krhy3"; depends=[cmocean dplyr gganimate ggplot2 lazyeval lubridate magrittr maps raster rerddap rgeos scales sf tidyr viridis]; }; + plotdap = derive2 { name="plotdap"; version="0.0.7"; sha256="1zwf4s2myw20klbc0jnfrbg0hll9528m8vcxnc419nsgm3m2nskb"; depends=[cmocean dplyr gganimate ggnewscale ggplot2 lazyeval lubridate magrittr maps raster rerddap rgeos scales sf tidyr viridis]; }; plotfunctions = derive2 { name="plotfunctions"; version="1.3"; sha256="0cnmwkfjg45187j490sf01gxijhajrpi6j13hfckli2ysn6xrgz3"; depends=[]; }; - plothelper = derive2 { name="plothelper"; version="0.1.6"; sha256="00bwv2ih967sg81pr8ahyc80j24i1dvcay416andg12674k6gj2w"; depends=[ggfittext ggplot2 gridExtra magick plyr scales]; }; + plothelper = derive2 { name="plothelper"; version="0.1.8"; sha256="0g8dnhr1v0k6m1ws35f3mj99fc32i51jxryg1iy5p852g500qqkr"; depends=[farver ggfittext ggplot2 gridExtra magick plyr scales]; }; plotluck = derive2 { name="plotluck"; version="1.1.1"; sha256="16wqj4xfa8b7kal6v8mp2zlhwf9l3y6y5n44qbpvy652gzb2rw2z"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; }; - plotly = derive2 { name="plotly"; version="4.9.1"; sha256="0gadam4qw81q9gpjp7sqrpd7ikmcdsc78d8vjn39g0xzs5j8r845"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr promises purrr RColorBrewer rlang scales tibble tidyr viridisLite]; }; + plotly = derive2 { name="plotly"; version="4.9.2.1"; sha256="1f0x83a2s7200iqi6gpngijks06fcvcbm6701d5r5rxpb8rawppl"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr promises purrr RColorBrewer rlang scales tibble tidyr viridisLite]; }; plotlyGeoAssets = derive2 { name="plotlyGeoAssets"; version="0.0.2"; sha256="1c6i4dz5qmym1pcddgffcqgb76jz84252xldprg2caylrqvzv6b7"; depends=[]; }; - plotmo = derive2 { name="plotmo"; version="3.5.6"; sha256="15555b7y62sc0z3r41gb56fmc6rmj1icnanyibx22v8kjz48vw3q"; depends=[Formula plotrix TeachingDemos]; }; + plotmo = derive2 { name="plotmo"; version="3.5.7"; sha256="135k643vf2np0y20zrhfy4id1bjg7bi285csg5fzvarwlr4nldma"; depends=[Formula plotrix TeachingDemos]; }; plotpc = derive2 { name="plotpc"; version="1.0.4"; sha256="1sf7n7mfyaijldm24bc8r8pfm8pp9cyaja7am14z2wpj2j9f9vyq"; depends=[]; }; plotprotein = derive2 { name="plotprotein"; version="1.0"; sha256="14kfb4xxpfp8klz31kb7cpc39636ax2cx2483vqqkciccb28f0ks"; depends=[ade4 plotrix plyr seqinr XML]; }; - plotrix = derive2 { name="plotrix"; version="3.7-7"; sha256="1x92mmyfry127zzr6cmcj6kjsc4zhxrrdlr0jcxn3bb0hpdfps54"; depends=[]; }; + plotrix = derive2 { name="plotrix"; version="3.7-8"; sha256="104llmr6dvlcnfpmd8zbdlv63k79djc4qqgadjavj4v4cmz1zkcc"; depends=[]; }; plotrr = derive2 { name="plotrr"; version="1.0.0"; sha256="07ilqpa3ypqb2gpnq23r9v4kkfxz06mcak9si9adr9sf6c7gqwxz"; depends=[dplyr ggplot2]; }; plotscale = derive2 { name="plotscale"; version="0.1.6"; sha256="0h2g0rv1lh70nqmqydgg5swwnwmy08wbjajxyb1c2a716rad765j"; depends=[]; }; plotwidgets = derive2 { name="plotwidgets"; version="0.4"; sha256="1w7c9grw4pyyra230196yq32snr4wdg6xi8vh4dx5df2v500wz22"; depends=[]; }; @@ -11673,10 +11829,11 @@ in with self; { plsRbeta = derive2 { name="plsRbeta"; version="0.2.5"; sha256="1p6vj9sw3hm6nax3vahmr6z58bgc8wl787949dszckn03pxhgvpb"; depends=[betareg boot Formula MASS mvtnorm plsRglm]; }; plsRcox = derive2 { name="plsRcox"; version="1.7.4"; sha256="1cpbhz85c8zpxcwi7ads981dynf83r5ka2zqy6i2swbi83jb5p4x"; depends=[kernlab lars mixOmics pls plsRglm risksetROC rms survAUC survcomp survival]; }; plsRglm = derive2 { name="plsRglm"; version="1.2.5"; sha256="004x934c34rgggwb25pcfm3vlj6gc1nfnigjxnxycxjqlx8g567b"; depends=[bipartite boot car MASS mvtnorm]; }; - plsVarSel = derive2 { name="plsVarSel"; version="0.9.4"; sha256="19xz7ds4jx5ql999mwn9zs983rlshf14y4nlah8cfy9gpi0vl1g1"; depends=[bdsmatrix genalg MASS mvtnorm pls progress]; }; + plsVarSel = derive2 { name="plsVarSel"; version="0.9.6"; sha256="0z8igm7ldz2z2vc2fmlqv2pry5lb4mckrcw9rky7cakr3q0gciqw"; depends=[bdsmatrix genalg MASS MSQC mvtnorm pls praznik progress]; }; plsdepot = derive2 { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; }; plsdof = derive2 { name="plsdof"; version="0.2-9"; sha256="1g41nbycgzjwrackbdf08q1phqpyy6zihm5ak2728683vd88fxzv"; depends=[MASS]; }; plsgenomics = derive2 { name="plsgenomics"; version="1.5-2"; sha256="1pvb50nv6jc99bm2hsxpzazg26y49yi24wwwim5xcjj6j1szbip4"; depends=[boot fields MASS plyr reshape2 RhpcBLASctl]; }; + plsmod = derive2 { name="plsmod"; version="0.0.1"; sha256="16yc8ydkc054is0f17nly4kwakfh410i3hqwas0479v1qywcszxb"; depends=[dplyr generics magrittr mixOmics parsnip purrr rlang tibble tidyr]; }; plsmselect = derive2 { name="plsmselect"; version="0.2.0"; sha256="044mwdqv5vw0apmx3yhn6xkdmw6baalvb8c6hhmawcs279kwi1m9"; depends=[dplyr glmnet mgcv survival]; }; plspm = derive2 { name="plspm"; version="0.4.9"; sha256="03aj1ffq11hh931dbkxy9ba74xyvzmr1ylrj4fw1rbryrwqg89v6"; depends=[amap diagram shape tester turner]; }; plspm_formula = derive2 { name="plspm.formula"; version="1.0.1"; sha256="1i2d1q8pz21js1ci8afnqzcky430hh1iwf5f6jr3j9yr9gs365k5"; depends=[plspm]; }; @@ -11688,14 +11845,14 @@ in with self; { plus = derive2 { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; }; pluscode = derive2 { name="pluscode"; version="0.1.0"; sha256="1j9yr5j6mb346a5dn7v9bsppgnxdj1ryimlla4a08rv7bjyq5i6q"; depends=[httr jsonlite]; }; plusser = derive2 { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[lubridate plyr RCurl RJSONIO]; }; - plyr = derive2 { name="plyr"; version="1.8.5"; sha256="0x4mbb3rgv1ayxqidw0p9i10khbg51fz5r62vw4il8d7licqq07a"; depends=[Rcpp]; }; + plyr = derive2 { name="plyr"; version="1.8.6"; sha256="11sjjdn146w95s1vsfmmgdls082cbnm1slv98xvyjhsl2mpx4mga"; depends=[Rcpp]; }; pm4py = derive2 { name="pm4py"; version="1.2.7"; sha256="11xbsmsc9pxd98fy28l3nxzhb6c2pwvh1gmm34jnqn0rjbpb2n9i"; depends=[bupaR petrinetR purrr reticulate stringr]; }; pmc = derive2 { name="pmc"; version="1.0.3"; sha256="06bsab09i9ydgsjx5i50kdb22ldp4g1v83a01kz3mswybi4lv9w2"; depends=[dplyr geiger ggplot2 ouch tidyr]; }; pmcgd = derive2 { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; }; pmd = derive2 { name="pmd"; version="0.1.5"; sha256="18a7j5lvsl2jsay4g7790slj12xkljlnrpvg66cq5cvsid8qm8x8"; depends=[rcdk RColorBrewer rmarkdown shiny]; }; - pmdplyr = derive2 { name="pmdplyr"; version="0.3.0"; sha256="1gyd55h718zf3crhgkdln48jw7y7djgsdjf4j06zr3rgy5mk2sp3"; depends=[dplyr lubridate magrittr pillar rlang tibble tidyr tidyselect vctrs]; }; + pmdplyr = derive2 { name="pmdplyr"; version="0.3.1"; sha256="1155hikxfz9rp111sy96kj2dkka45ip1xi7kximq9ilsn5kwswzn"; depends=[dplyr lubridate magrittr pillar rlang tibble tidyr tidyselect vctrs]; }; pmhtutorial = derive2 { name="pmhtutorial"; version="1.5"; sha256="1hcw8hwpsivbhz86lnzy08q9n8vahnq8f7rmi4xkmg6b44582cqx"; depends=[mvtnorm Quandl]; }; - pmml = derive2 { name="pmml"; version="2.2.0"; sha256="0j2gznmjgzv9ccpgkhpkww99sa165b7jwhx3g61rvbcmg89l3i3m"; depends=[stringr XML]; }; + pmml = derive2 { name="pmml"; version="2.3.1"; sha256="1qsrpbmwgmq9s45f30657cpfzkrvva8h1hqq1g3fd69p5g735rwp"; depends=[stringr XML]; }; pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.3"; sha256="0315kb5x04pidpzr04yaxyynp0mz4ilzp7vkspq4agjkds5hyc88"; depends=[]; }; pmpp = derive2 { name="pmpp"; version="0.1.1"; sha256="1srmkih6zsyf8yf1f045xy1afcz0if6nf1ncslgrq6rgm7330lkw"; depends=[data_table dplyr ggplot2 magrittr MASS Matrix minqa moments plm pracma]; }; pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; }; @@ -11711,31 +11868,33 @@ in with self; { poibin = derive2 { name="poibin"; version="1.5"; sha256="1sxryvwwz6ldsnkzdy56p8c895s5yvpcai9ndyjv1x5q3l05wf9v"; depends=[]; }; poilog = derive2 { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; }; pointRes = derive2 { name="pointRes"; version="1.1.3"; sha256="0yfzidc93ghpf116lxbx4fr0d71wl79y3nz6mkirx4pli6gb8x8d"; depends=[ggplot2 gridExtra plyr TripleR]; }; - pointblank = derive2 { name="pointblank"; version="0.3.0"; sha256="0r94yplk5s9ckj8xlrqzc2xb77aik18anvhg6kbprzjzmhmahhrm"; depends=[dplyr magrittr rlang tidyselect]; }; + pointblank = derive2 { name="pointblank"; version="0.3.1.1"; sha256="0qqj3x4zvh14b2kirvvyzscm9jsk6k11s6cqjdwv6pyb32afn1iq"; depends=[blastula cli DBI dbplyr dplyr ggforce ggplot2 glue gt htmltools magrittr rlang scales tibble tidyselect]; }; pointdensityP = derive2 { name="pointdensityP"; version="0.3.4"; sha256="0vv8j1yz8n2vmmp6bg2i8w3dchdbybsdxn3sk5d1ync2knih8l2s"; depends=[data_table]; }; - pointdexter = derive2 { name="pointdexter"; version="0.1.1"; sha256="058iv9pk3byyvddbkm8g1vc7kmrkbwglbw0v2ns6w066fwiysv70"; depends=[sp splancs]; }; - poio = derive2 { name="poio"; version="0.0-3"; sha256="1smbnqjlicaqq2hswl910yiirzb9zikbk4pqxm9pwpixywj0nkys"; depends=[assertive_base assertive_files assertive_properties assertive_sets assertive_strings assertive_types devtools digest dplyr magrittr R6 stringi tibble whoami]; }; + poio = derive2 { name="poio"; version="0.0-4"; sha256="12d47hn9rsx2n0fl107dpswfklnh8nkm0kspcxf7yfljayvxr474"; depends=[assertive_base assertive_files assertive_properties assertive_sets assertive_strings assertive_types devtools digest dplyr magrittr purrr R6 stringi tibble whoami]; }; poisDoubleSamp = derive2 { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp]; }; - poisFErobust = derive2 { name="poisFErobust"; version="1.0.1"; sha256="0qgwl5gb2rw043zb0h1rrv038ymsd72r8h9gqdr2xkfbi3mnr24r"; depends=[data_table glmmML]; }; + poisFErobust = derive2 { name="poisFErobust"; version="2.0.0"; sha256="1i6y3745i385y3r45i0xk7ciw1k6brmn709k5qhx8xphq0k4an5n"; depends=[data_table glmmML]; }; poisbinom = derive2 { name="poisbinom"; version="1.0.1"; sha256="0mjxg0s3nck7qrmq4bbrhwxfwr6fqml54s9k8q1mkfzlifa7qyf7"; depends=[Rcpp]; }; poismf = derive2 { name="poismf"; version="0.1.3"; sha256="19jznsz59ch3ksgxii9j7lzaqlpc0wlvxx59ax60w76w2c9m0ify"; depends=[Matrix nonneg_cg Rcpp SparseM]; }; poisson = derive2 { name="poisson"; version="1.0"; sha256="1diyf1b84sr6iai3ghd3kcp6fc6w7fan49wzs1lzvxxsmp15ag2d"; depends=[]; }; poisson_glm_mix = derive2 { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; }; poissonMT = derive2 { name="poissonMT"; version="0.3-5"; sha256="14qkc8qz3423b13gp6gsp8cbb1nv9wwjjfa4i9zc15qy5i99ha26"; depends=[checkmate MASS robcbi robustbase]; }; + poissonreg = derive2 { name="poissonreg"; version="0.0.1"; sha256="04qika4k0hak8kp6z4jqdzslymy7wklw4bx6kcmz3932avlwyym9"; depends=[dplyr glue parsnip purrr rlang tibble tidyr]; }; poistweedie = derive2 { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; }; poker = derive2 { name="poker"; version="0.8.8"; sha256="14ik77440z22k4kwq0p1fn7adzi0p8mh8j8hd7ayinvrab4b5r85"; depends=[]; }; - policytree = derive2 { name="policytree"; version="0.9.0"; sha256="15cqmcdxk25y300z5qvhh981bmzph272sciaa40swj5jw5fz357y"; depends=[BH grf Rcpp]; }; + polaroid = derive2 { name="polaroid"; version="0.0.1"; sha256="0m3jbiz4n7mgbbdkd28m6dqsclyjcgshpxd6ws8df7zchx7fch07"; depends=[argonDash argonR colourpicker ggplot2 hexSticker png shiny shinyWidgets]; }; + policytree = derive2 { name="policytree"; version="0.9.2"; sha256="0d0b3rdmcr692rkbg223l0cwc86zlj2p75m9jlgk6w07f1n2h68p"; depends=[BH grf Rcpp]; }; poliscidata = derive2 { name="poliscidata"; version="2.2.3"; sha256="18mmdzf9hrfz36rh1rg1j5q1m131xadppy272y4f4yay0ljafbm2"; depends=[abind car descr ENmisc gplots Hmisc plotrix plyr survey weights xtable]; }; polite = derive2 { name="polite"; version="0.1.1"; sha256="15hiifaf63hx0xn453lr0xhdnxqifrgyrgrymp0a9k3j7qja59jk"; depends=[here httr magrittr memoise ratelimitr robotstxt rvest usethis]; }; - politeness = derive2 { name="politeness"; version="0.4.1"; sha256="0jb5s62qbf5904j0990iv4z1zlqmyvci4dbahkd2lzxsz51ykdq3"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textir tm]; }; + politeness = derive2 { name="politeness"; version="0.6.0"; sha256="1mrg4k76h77qrd34b8imcn4nh0vchf8v6jbymlgigxgr7m75gpmj"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textclean textir tm]; }; politicaldata = derive2 { name="politicaldata"; version="0.1.3"; sha256="1n25k53mmlmmg9p9a36jh4z6xhl1yyv9v1c56mav873105h359wi"; depends=[]; }; - pollen = derive2 { name="pollen"; version="0.71.0"; sha256="0g0g6n8y87jyk7l4s6xpdk60dz4lkg2xp5c5agakkrah8a233920"; depends=[dplyr lubridate purrr]; }; + pollen = derive2 { name="pollen"; version="0.72.0"; sha256="0plxc7rys5q4c1dwammv3b2pnys1hdh5ic0b2ndmv5cbyspf2h0y"; depends=[dplyr lubridate purrr]; }; pollimetry = derive2 { name="pollimetry"; version="1.0.1"; sha256="09zmcwlgzl4fnkdg2m424ibv3izzrm595c7pi4mc3bd1g8sa2ypn"; depends=[brms repmis]; }; pollstR = derive2 { name="pollstR"; version="2.0.1"; sha256="13g5z1hix1bmsxznq5qx82yf445rvvyn67ch9bihxm1hr4cr4sbl"; depends=[httr lubridate purrr stringr]; }; + pollster = derive2 { name="pollster"; version="0.1.1"; sha256="1a4k0d5cs9sziq1idd4q6dakl8cy3w8iakgqnd40w3d7vx63hmfd"; depends=[dplyr forcats labelled rlang stringr tidyr]; }; polmineR = derive2 { name="polmineR"; version="0.8.0"; sha256="1j9f83b1lfb02q830zaffrspxrhp58j9l3cc80cxiflmkm9s1jm9"; depends=[data_table DT jsonlite knitr magrittr Matrix pbapply R6 RcppCWB slam stringi tm xml2]; }; polspline = derive2 { name="polspline"; version="1.1.17"; sha256="0c7fnxpqpy3hibiim4yib6l6bq363s97wwvllxp4lp8h06fjcyyn"; depends=[]; }; polyCub = derive2 { name="polyCub"; version="0.7.1"; sha256="0ln1n5w64vgq63gm4mm9wzl9lbp7ppgaxg0ba0yw0xsr5cmkyp37"; depends=[sp]; }; - polyMatrix = derive2 { name="polyMatrix"; version="0.2.4"; sha256="1z7n2ankfd9nrr7l3rm3pcm26pjss0f8wv187g9dxq4db5qx490k"; depends=[MTS polynom]; }; + polyMatrix = derive2 { name="polyMatrix"; version="0.2.5"; sha256="18s2213wdx9jgwq04b5k6vd7xkq39pcpn4z70n9w0h9l0zmjriaw"; depends=[MTS polynom]; }; polyPK = derive2 { name="polyPK"; version="3.1.0"; sha256="0cb83sq8iz4swr73vwhh8n4k62p6321nsy1sz5fba0wiicycxf55"; depends=[circlize corrplot gplots Hmisc impute imputeLCMD mixOmics pcaMethods pkr plyr ropls sqldf xlsx]; }; polyRAD = derive2 { name="polyRAD"; version="1.1"; sha256="04rhff7yzswilx67ak56vsr4sxfjzhd3d9fihnx2mnyddf1mhamq"; depends=[fastmatch pcaMethods Rcpp]; }; polySegratio = derive2 { name="polySegratio"; version="0.2-5"; sha256="0djw49mbhd7x6jr0f5qkb9akw3fw3ax4w9xv8iwa5f65q5gbxpdf"; depends=[gdata]; }; @@ -11746,69 +11905,74 @@ in with self; { polycor = derive2 { name="polycor"; version="0.7-10"; sha256="0wzwzklflbhi8sv9m7ijwr16v9zmkk0j0v4pbcpf32f8lbn3psna"; depends=[Matrix mvtnorm]; }; polyfreqs = derive2 { name="polyfreqs"; version="1.0.2"; sha256="13859vbpys5yj1qiapyzv9wlvi6x6k0rm335bsi1v07ch3x2bh3b"; depends=[Rcpp]; }; polyglot = derive2 { name="polyglot"; version="0.2.1"; sha256="1w52vhix5pynx2gz9f71yi9x5cdkp4sbs98zz2d5z993qbbf1wyq"; depends=[magick]; }; - polylabelr = derive2 { name="polylabelr"; version="0.1.0"; sha256="1bki35p6a8bgmdwll9sczdicdkvmxcl55vbx5xiabkz58imvcmym"; depends=[Rcpp]; }; + polylabelr = derive2 { name="polylabelr"; version="0.2.0"; sha256="01b2v0l5g8nxwbd6nwqv8ahypgh6gfhd4qabg75brlj7z1iyfzf2"; depends=[Rcpp]; }; polymapR = derive2 { name="polymapR"; version="1.0.20"; sha256="16gyzlvj2nfyl9ypv5cmvqvn3phxpxf36b0bnvslkxyyx0fsyxrx"; depends=[combinat doParallel foreach igraph knitr MDSMap]; }; polynom = derive2 { name="polynom"; version="1.4-0"; sha256="1pflscwc0qzdf0y60j7s0dkglgmz18xajywfbn6s263idyr8idy5"; depends=[]; }; polypoly = derive2 { name="polypoly"; version="0.0.2"; sha256="00c1hrnf575awvh0rlsnf6nkgi9p3fnqhd1knamkgb4icwi5s46d"; depends=[ggplot2 reshape2 rlang tibble]; }; - polyreg = derive2 { name="polyreg"; version="0.6.4"; sha256="0q1zs56b59xq8g1lvqryfdkq3zwix1dhr4606dq4mbf2hsjkvkd5"; depends=[dummies nnet partools RSpectra]; }; + polyreg = derive2 { name="polyreg"; version="0.6.7"; sha256="1znl46m4zfd0f4qwg3r2anz3nyn8hk607772pzxiwj5w3xc96g56"; depends=[dummies nnet partools regtools RSpectra]; }; polysat = derive2 { name="polysat"; version="1.7-4"; sha256="08jmkik4s2171znp3w4i0v0g0k2s0di3xqwr9sf9hyd0sf8af8dp"; depends=[Rcpp]; }; polywog = derive2 { name="polywog"; version="0.4-1"; sha256="02qk1cyvkd77mwlvhj1zzzi0bmy7qxz29j2v730wp7rz4w7h5x5n"; depends=[foreach Formula glmnet iterators Matrix miscTools ncvreg Rcpp stringr]; }; pom = derive2 { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; }; pomdp = derive2 { name="pomdp"; version="0.9.2"; sha256="0bzppkda355zj467ahcyaf2dsjajyiznzi0y07n9pf9ccr6rh5lg"; depends=[igraph]; }; - pomp = derive2 { name="pomp"; version="2.4"; sha256="19j8aqsxx54xacw6vd3yva8jznqrycc831zs5f08x9r2q1ld6yjp"; depends=[coda deSolve digest magrittr mvtnorm plyr reshape2]; }; + pomp = derive2 { name="pomp"; version="2.8"; sha256="13y1jfx9j2dqya9icv4k5wvkjs09d3xhqkzwicf0zdfqlypjd79l"; depends=[coda deSolve digest magrittr mvtnorm plyr reshape2]; }; pompom = derive2 { name="pompom"; version="0.2.0"; sha256="1alz3lrj7m16vhymsvvrcmf0kmgx88q2f3v4j6wiciqv77bnyai1"; depends=[ggplot2 lavaan qgraph reshape2]; }; pooh = derive2 { name="pooh"; version="0.3-2"; sha256="0qwa5j91aypasvsf4xcfbl6lz7llawdr38jiflzmfak2ad72rv7j"; depends=[]; }; pool = derive2 { name="pool"; version="0.1.4.3"; sha256="065pbvhgvvgv00df4kj4zn7mlbrv2iqa1583k0hlgavn15gfm6d2"; depends=[DBI dbplyr dplyr later R6]; }; poolVIM = derive2 { name="poolVIM"; version="1.0.0"; sha256="19yw6pp5l3jmla4wjbvpjq132f645yks49pzsdv123f3qfr8f0m6"; depends=[EmpiricalBrownsMethod Hmisc ranger]; }; poolfstat = derive2 { name="poolfstat"; version="1.1.1"; sha256="12iwhfj1a87mbis7whgp4z3qg97xkj90rw8b9jsqnfmzhz6fn0yp"; depends=[doParallel foreach]; }; - pooling = derive2 { name="pooling"; version="1.1.1"; sha256="0011w80pxz01scj2sa69m1bcfq797hq3ihpw46fdlxsxavz8prwy"; depends=[cubature dplyr dvmisc ggplot2 ggrepel mvtnorm pracma]; }; + pooling = derive2 { name="pooling"; version="1.1.2"; sha256="19mrzax3k35fhgjpnlrigf0nscsdl3xb7k82s5q472k4bcz7ya5b"; depends=[cubature data_table dplyr dvmisc ggplot2 ggrepel mvtnorm numDeriv]; }; + poolr = derive2 { name="poolr"; version="0.8-2"; sha256="1rkfnrz5x7f9kqpivj0gvs3fxfb9agnm8sybb7wmvvcsmshzrpkf"; depends=[Matrix]; }; + poorman = derive2 { name="poorman"; version="0.1.11"; sha256="06b1h2a391ha7jd38rr44mzf2wry2bcgg16ypcv2scnfiwm96gnk"; depends=[]; }; pop = derive2 { name="pop"; version="0.1"; sha256="0hbxdrkasb69x7ipddvyrzl5vvc7dd6rzj1vy7v3chg3rzgq89cj"; depends=[igraph MASS]; }; popEpi = derive2 { name="popEpi"; version="0.4.8"; sha256="1gc7kyik0209pc8mvl6c69lzb3dnkif0mby4l4pq8zfdz73lmi06"; depends=[data_table Epi survival]; }; popKorn = derive2 { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; }; popReconstruct = derive2 { name="popReconstruct"; version="1.0-6"; sha256="0nmf93dy2qf7z9mafpy99ry53aapbxlismn7drn732r8gvravapx"; depends=[coda]; }; - popbio = derive2 { name="popbio"; version="2.6"; sha256="1j8q4rdq8b9r56p0slwkfsknv6linjnmcprrzbck9yr99zfqp067"; depends=[]; }; + popbio = derive2 { name="popbio"; version="2.7"; sha256="02dbb2sinn1n8a9dg8lvf35sc8hb14c90mjymz2gk64xdysf0m2j"; depends=[]; }; popdemo = derive2 { name="popdemo"; version="1.3-0"; sha256="0760ajqaq822m0j092gdqzhgw1mk413k09mmmwyzb0jzj6bd15q3"; depends=[expm MCMCpack]; }; popkin = derive2 { name="popkin"; version="1.3.0"; sha256="1gr2glyavvf2r89zwiama3qhmq32rdzjsqkhv70afmsapk6f4dhr"; depends=[RColorBrewer Rcpp RcppEigen]; }; poplite = derive2 { name="poplite"; version="0.99.23"; sha256="0kf5k4iz4cvzd3avq753jn1gkpnhzi9m4148lq7rgv7h433qydwn"; depends=[DBI dbplyr dplyr igraph lazyeval RSQLite]; }; - poppr = derive2 { name="poppr"; version="2.8.3"; sha256="158sb5v3qmnka431fvgg84pvv1j3mbqmydry63m5yrflzsninv1z"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn polysat rlang shiny vegan]; }; + poppr = derive2 { name="poppr"; version="2.8.5"; sha256="0jq8ykz77z3rgijmhav1sz34a5hkjzs9mlcp5y0354i2l229ylqd"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn polysat rlang shiny vegan]; }; popprxl = derive2 { name="popprxl"; version="0.1.4"; sha256="076aia4qbq5yw2nxafq2ys5n5c7wv77i8k1nmzb3all193vjf203"; depends=[poppr readxl]; }; popsom = derive2 { name="popsom"; version="4.2.1"; sha256="11hzsr69rjklyxkp8jbp6794a4r3cyid0k40dz8d35ca068y2vcl"; depends=[class fields ggplot2 som]; }; poptrend = derive2 { name="poptrend"; version="0.1.0"; sha256="0hypxpb18azg6q1mqrphbx3x262h9ybwhlkb8fyd6vr7jjb5wn3h"; depends=[mgcv]; }; populationPDXdesign = derive2 { name="populationPDXdesign"; version="1.0.3"; sha256="0p73ddv3j1s1vs4j3axnsf39n626qjv0w1qlq9p7km4s6729bhgv"; depends=[devtools ggplot2 plyr roxygen2 shiny shinycssloaders]; }; porridge = derive2 { name="porridge"; version="0.0.4"; sha256="1b43yxhqfrkz777rp6yqw4in5i22lkfnh41f05dqnns2qg5hdlyp"; depends=[MASS mvtnorm Rcpp RcppArmadillo]; }; - portalr = derive2 { name="portalr"; version="0.3.1"; sha256="0i3xg3ccccrcamk7yx3nzllf4ir1xg15d3w6byvi4yx6w25khqcn"; depends=[clisymbols crayon dplyr forecast gh httr lubridate lunar magrittr rlang tibble tidyr usethis]; }; + portalr = derive2 { name="portalr"; version="0.3.3"; sha256="0fxk08666xp3ak207l90qqkz6a0si2mi9sjhb92k304l4j1zjb84"; depends=[clisymbols crayon dplyr forecast gh httr lubridate lunar magrittr rlang tidyr usethis]; }; portes = derive2 { name="portes"; version="3.0"; sha256="144fipskh6yb6xcz3m5bgh2kwjwa58zaw24y88hzzrdvh9glvyrc"; depends=[forecast]; }; - portfolio = derive2 { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; }; + portfolio = derive2 { name="portfolio"; version="0.5-0"; sha256="1hpz5jhnffsb6qzwh0vciszi5wx7x184mk2dai5ph0xvaxbm23r1"; depends=[lattice nlme]; }; portfolio_optimization = derive2 { name="portfolio.optimization"; version="1.0-0"; sha256="1rdhwffsjc1pa1qq7rqy6dwk8yrcblkmijz94p2w7sf2v4jmwxxr"; depends=[magrittr MASS modopt_matlab xts]; }; portfolioBacktest = derive2 { name="portfolioBacktest"; version="0.2.1"; sha256="15yh3vi8qdahmsy2lic77vfv9c5ssalw08lmhq6vk9dbcl04z5n1"; depends=[digest doSNOW evaluate foreach ggplot2 PerformanceAnalytics quantmod R_utils rlang snow xts zoo]; }; portfolioSim = derive2 { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; }; portsort = derive2 { name="portsort"; version="0.1.0"; sha256="0swl39dn7lzwvps18bva4l64a441gkf6lbwcwrhlf93f1ardvxji"; depends=[xts zoo]; }; postDoubleR = derive2 { name="postDoubleR"; version="1.4.12"; sha256="19z8wisi16g7a78gw16r72dkxh3x5qh888qz260ih5naq0p8vy71"; depends=[doParallel ggplot2 glmnet grf neuralnet progress]; }; postGIStools = derive2 { name="postGIStools"; version="0.2.4"; sha256="04d6iqnk7j2lgv1h5c94j6y89jk75pmv26sxa51s5iwkjq7rchym"; depends=[DBI jsonlite rgdal rgeos RPostgreSQL sp stringr]; }; + postHoc = derive2 { name="postHoc"; version="0.1.1"; sha256="0sfwhgh8y6y3df5qx0n488fvddg5fj6cql3gml7fwzjw0hsgkdsw"; depends=[igraph multcomp]; }; posterdown = derive2 { name="posterdown"; version="1.0"; sha256="13plrrnylw3yldm0md1gr5drccfjk9f2wwlhz6lrmb3px7w5nqs0"; depends=[pagedown rmarkdown yaml]; }; postinfectious = derive2 { name="postinfectious"; version="0.1.0"; sha256="1v327zxxiwc1cdksk6s39lkkgck5dxg169pp3jiqmm7xs35dcl6y"; depends=[]; }; postlightmercury = derive2 { name="postlightmercury"; version="1.2"; sha256="1345ckp50jplcdqp3a250c6mhapqh9322jzpxj5dyqmbg2nmgp9i"; depends=[crul jsonlite purrr rvest tibble xml2]; }; postlogic = derive2 { name="postlogic"; version="0.1.0.1"; sha256="11bpmfn375zpyg90dh44h86cvppzri1smmkn26jyydqjz74f4q9w"; depends=[]; }; - potts = derive2 { name="potts"; version="0.5-8"; sha256="0j3c7sh50r1lqd8gl0rq7pq8j9v33wcz46gv7lm0n7y89qj6f45x"; depends=[]; }; + potts = derive2 { name="potts"; version="0.5-9"; sha256="1kiha209w9nyyx4qqsdp51q2y7ny67nzqkdanlrh2106lcab3hj8"; depends=[]; }; + pould = derive2 { name="pould"; version="1.0.0"; sha256="03338c61njhrb1dyxndyci1kdalzc38h0l7a1majv8nf82k40l62"; depends=[BIGDAWG gap ggplot2 haplo_stats reshape2]; }; povcalnetR = derive2 { name="povcalnetR"; version="0.1.0"; sha256="11hwb52lrvdxplsx85ps54k2k7cvr0k4g5s2cj2a5l3rlqbyayx8"; depends=[dplyr ggplot2 ggthemes httr js jsonlite memoise naniar purrr readr stringr tibble tidyr]; }; - powdR = derive2 { name="powdR"; version="1.1.0"; sha256="0by1jxqpqjgpsqzgagirz7z6cgvxa5k33m15qsc4dina12hi21n8"; depends=[baseline ggplot2 ggpubr memisc nnls plotly plyr reshape shiny shinyWidgets tidyr]; }; + powdR = derive2 { name="powdR"; version="1.2.0"; sha256="0l1sb4bxam53jg1zfzqy851652c0yr88gz04z97cqdcn7smg6fgi"; depends=[baseline DT ggplot2 ggpubr nnls plotly plyr reshape shiny shinyWidgets tidyr]; }; powdist = derive2 { name="powdist"; version="0.1.4"; sha256="1my88ag5q9hwkn2wy79jl9008gpvg0bsrnyc81gkdfi7pjh2mp1z"; depends=[gamlss_dist normalp rmutil]; }; - poweRlaw = derive2 { name="poweRlaw"; version="0.70.2"; sha256="1asr6ikr7hmj78jyg8r1gwvcjg14addkxdiz92nh06lv71a183r4"; depends=[VGAM]; }; + poweRlaw = derive2 { name="poweRlaw"; version="0.70.5"; sha256="1z1x93zc4qim53bx4cjq611xfa1rxw7cr2j2saq9vxr1j58fw99p"; depends=[pracma]; }; powerAnalysis = derive2 { name="powerAnalysis"; version="0.2.1"; sha256="0cma4v402n6wcb2gy9g1ymydzh8vimy9nfrrn8xhnjsf7x6jh215"; depends=[]; }; powerCompRisk = derive2 { name="powerCompRisk"; version="1.0.1"; sha256="11xprjn9hzi8gxrsi7wivwgchg9h2apgxa63fp466ngjfy5ybxf4"; depends=[mvtnorm]; }; powerEQTL = derive2 { name="powerEQTL"; version="0.1.3"; sha256="1045vkzl5p20mqlsm0j6vnyyvfz5v6jyy443c38sw1cps0a09i1n"; depends=[powerMediation]; }; powerGWASinteraction = derive2 { name="powerGWASinteraction"; version="1.1.3"; sha256="1i8gfsk9qzx54yn661i4x9k7n7b6r1jd808wv1hcq7870mzyb27k"; depends=[mvtnorm pwr]; }; - powerMediation = derive2 { name="powerMediation"; version="0.2.9"; sha256="1rk8h8qn4b68ra5h5hiy9fvvbpskj9y806rwrvl1l7gs7xlmji7l"; depends=[]; }; + powerMediation = derive2 { name="powerMediation"; version="0.3.2"; sha256="06liw58hwvd5n55axwldrngwfqckmi5yh2i9b2c75cghqdnihvby"; depends=[]; }; powerSurvEpi = derive2 { name="powerSurvEpi"; version="0.1.0"; sha256="1xxicvw113mc2y889rklws3xml5z64sgjpn4wg95gbw6nadch7zz"; depends=[survival]; }; powerbydesign = derive2 { name="powerbydesign"; version="1.0.4"; sha256="0xd4hylx7jl4ksycz5gfjcgy92mh5c9d4r34ap1g81ybmyk7yrsj"; depends=[gdata ggplot2 lme4 MASS plyr reshape2 stringr]; }; powerlmm = derive2 { name="powerlmm"; version="0.4.0"; sha256="0dpfvbp54lhz7ibzihqqrbl45s6dqxn6qyvv39mk2166hjcgi1h2"; depends=[lme4 MASS Matrix scales]; }; powerpkg = derive2 { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; }; powerplus = derive2 { name="powerplus"; version="3.1"; sha256="0ayp6x34hkzgris4j3zbbs0r23n81bhww3wgfyy630ri4sk6brrn"; depends=[complexplus expm MASS Matrix phonTools]; }; ppcSpatial = derive2 { name="ppcSpatial"; version="0.2.0"; sha256="1gi57zngc42wcrihg29nn7qa3gaq105ckp76qmczkldshlpd7x4r"; depends=[dplyr ggplot2 htmltools htmlwidgets leaflet magrittr PakPC2017 rgdal scales shiny tidyr tmap]; }; - ppcc = derive2 { name="ppcc"; version="1.1"; sha256="0c22nkp6c6rl2d6c868pnrda1l6h9bxssmdbca3pdc5s8wjxi0nd"; depends=[]; }; - ppclust = derive2 { name="ppclust"; version="0.1.3"; sha256="1480fcjzz1vfmz3sgcdrpfilqklmb1f0h4vna6xkfib5xh624lxb"; depends=[inaparc MASS]; }; + ppcc = derive2 { name="ppcc"; version="1.2"; sha256="17kf97rh0b1zxh7r12rxc2qd1zlrcvlljk69k8w2jchdxiw398sb"; depends=[]; }; + ppclust = derive2 { name="ppclust"; version="1.1.0"; sha256="0vmgjjy7gin88qailzfcwapndl5s8fm6i8kw9gv6aykg9mr75xlv"; depends=[inaparc MASS]; }; ppcong = derive2 { name="ppcong"; version="0.0.2"; sha256="0k34ibzyxak2a8xhsf4jdp50w8k8dsd1nn3gcdcakx8s2rgymq7v"; depends=[curl jsonlite tfse tibble]; }; ppcor = derive2 { name="ppcor"; version="1.1"; sha256="1x9b2kb8s0bp92b17gby0jwzzr3i4cf3ap9c4nq7m8fav72g0y3a"; depends=[MASS]; }; + ppgam = derive2 { name="ppgam"; version="1.0.1"; sha256="0w2jci5k0y8m7rapj8w6xq849y59m7y4fp9n3f5l6q954mbc6bv0"; depends=[evgam MASS mgcv]; }; ppgmmga = derive2 { name="ppgmmga"; version="1.2"; sha256="1dq0p3xna5r1kiyhiziz3wc78dfqh362qhna5hmkjzhljawr9jg0"; depends=[cli crayon GA ggplot2 ggthemes mclust Rcpp RcppArmadillo]; }; ppitables = derive2 { name="ppitables"; version="0.5.2"; sha256="1fwl2mscnfkbdpdjb0vkyv6xrbi73rfkxlbpri35hfqscaxlzk98"; depends=[tibble tidyr]; }; ppls = derive2 { name="ppls"; version="1.6-1.1"; sha256="1zyrisy3c4cz896j1bjh61sf57wdl9p8ywdq268cl819szfq78mx"; depends=[MASS]; }; @@ -11824,20 +11988,19 @@ in with self; { prais = derive2 { name="prais"; version="1.1.1"; sha256="027qsa1nc680bcs61dlyz0wwap5pgxdfzasg9ny37a55hnikxid5"; depends=[lmtest sandwich]; }; praise = derive2 { name="praise"; version="1.0.0"; sha256="1gfyypnvmih97p2r0php9qa39grzqpsdbq5g0fdsbpq5zms5w0sw"; depends=[]; }; praktikum = derive2 { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; }; - praznik = derive2 { name="praznik"; version="7.0.0"; sha256="0v0z8d2cxisfqci9kr19z8q15pckzmh8z5n753b8kahg2xn0zhj4"; depends=[]; }; + praznik = derive2 { name="praznik"; version="8.0.0"; sha256="037lcic87b6136b5fi9g557idd3rvglw995b94xadcdaqcpy906z"; depends=[]; }; prc = derive2 { name="prc"; version="2019.1-23"; sha256="1aw02sj7kkzzkrxs1jpm2skfz2jrd7fyqlfc1mvkqwac39c6a9ma"; depends=[kyotil nlme]; }; - prcbench = derive2 { name="prcbench"; version="0.8"; sha256="0bidf7268c130xj4c2pxljgkrppvjg8bmivj9zq0cm9nwhm0fdf5"; depends=[assertthat ggplot2 gridExtra memoise precrec PRROC R6 rJava ROCR]; }; + prcbench = derive2 { name="prcbench"; version="0.8.2"; sha256="1b8dmahkymbnf3xxaprzkpizpibnyhjynv352qf4c7l5gvg0d7nq"; depends=[assertthat ggplot2 gridExtra memoise precrec PRROC R6 rJava ROCR]; }; prclust = derive2 { name="prclust"; version="1.3"; sha256="0p0sf8248aigs99py8mpzz743jnrf7n1nv5shag15arxz9yx7zn3"; depends=[Rcpp]; }; - prcr = derive2 { name="prcr"; version="0.1.5"; sha256="1hfr0jijnj5nd25rh16i81bsz8kwz0q9vmn7bqgy467cwvypg9k2"; depends=[class dplyr ggplot2 irr lpSolve purrr tibble tidyr]; }; - pre = derive2 { name="pre"; version="0.7.2"; sha256="156wgyv88a5qvdksfhyyim2h1igaba8gf4mgaq6ii6sxppmik4a8"; depends=[earth Formula glmnet Matrix MatrixModels partykit rpart stringr survival]; }; - preText = derive2 { name="preText"; version="0.6.2"; sha256="0pcnqssv542cfajzrqfsbq0jf628nnmcb3nryvd7d5wk4wdkji4q"; depends=[cowplot ecodist ggplot2 proxy quanteda reshape2 topicmodels vegan]; }; + prcr = derive2 { name="prcr"; version="0.2.1"; sha256="0k5vl14akqf8qvak6h7a19qxn4wzpyxq7lyvdhxfh8l4gs4ca2l6"; depends=[class dplyr forcats ggplot2 irr lpSolve magrittr purrr tibble tidyr]; }; + pre = derive2 { name="pre"; version="1.0.0"; sha256="07iai8vkxmx0dhnqy28gwh1hwc2iqg7bb0mwm8c68qpp8ffxwplm"; depends=[earth Formula glmnet Matrix MatrixModels partykit rpart stringr survival]; }; precintcon = derive2 { name="precintcon"; version="2.3.0"; sha256="1sf0mfqa77aqhbx3hg8pv582ibmfnv6vigqcd3xqsbq7nigy2ms9"; depends=[ggplot2 scales]; }; precrec = derive2 { name="precrec"; version="0.11"; sha256="1y0d0jqpvh0c96zi2fp7q1f25n5sm6ai2k6l54j9c3plkk1vw3lp"; depends=[assertthat data_table ggplot2 gridExtra Rcpp]; }; - predhy = derive2 { name="predhy"; version="0.1.0"; sha256="1m4ysryh66blqnvnskfwmjbz85pziqlii12jv9gpf2a3jnl5dvij"; depends=[]; }; + predhy = derive2 { name="predhy"; version="0.2.0"; sha256="0l3x9ivrlb43x3qbrpw5gjyfc3n3b4bbsav1r4hl96znypwi7j9f"; depends=[]; }; predict3d = derive2 { name="predict3d"; version="0.1.3.3"; sha256="1kb3jacpgzln1ddnkfzhvfpzzf9wig60lppca6iy0fvq5cm8ddr4"; depends=[dplyr ggiraphExtra ggplot2 magrittr modelr moonBook plyr prediction purrr reshape2 rgl rlang stringr TH_data tidyr]; }; prediction = derive2 { name="prediction"; version="0.3.14"; sha256="0awlq5lxfia6m2b91w73rksp93rbwv5gwqb36wbji4rgq41rzbrx"; depends=[data_table]; }; predictionInterval = derive2 { name="predictionInterval"; version="1.0.0"; sha256="029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn"; depends=[ggplot2 MASS MBESS pbapply]; }; - predictmeans = derive2 { name="predictmeans"; version="1.0.1"; sha256="06zspg1v0x1qqaah7xj5jdaqjv7asnzmgybyyzx3j26v4h59p350"; depends=[ggplot2 lme4 Matrix nlme numDeriv pbkrtest plyr]; }; + predictmeans = derive2 { name="predictmeans"; version="1.0.4"; sha256="11282jzmlkbawsh1k4582a7yh4xxfh01sn6zp5nbdsr9c9p6vqfz"; depends=[ggplot2 lme4 Matrix nlme numDeriv pbkrtest plyr]; }; predictoR = derive2 { name="predictoR"; version="1.1.0"; sha256="12y23q08m7v4dl6anbkhf7zxy8wkah5bxy1c2fdcwb6ng3snpfvb"; depends=[ada colourpicker corrplot DT e1071 flexdashboard glmnet kknn neuralnet randomForest rattle ROCR rpart shiny shinyAce shinydashboardPlus shinyjs shinyWidgets tidyverse xgboost zip]; }; predictrace = derive2 { name="predictrace"; version="1.0.0"; sha256="1vpamn1j1jqdjar14j7fn4gvr8wq8lpqfnrwifgl0qvpa4y1938y"; depends=[dplyr here tidyr]; }; predkmeans = derive2 { name="predkmeans"; version="0.1.1"; sha256="0352c50zlyzn8fczrkinayllj9jp978njjl7dazzkzypx0p20va5"; depends=[e1071 maxLik mgcv Rcpp RcppArmadillo]; }; @@ -11848,9 +12011,6 @@ in with self; { prefmod = derive2 { name="prefmod"; version="0.8-34"; sha256="1fkqp75w3im6b0l4sfs1yr2id8ffp2xbpb6lkgnv833cri787d5x"; depends=[colorspace gnm]; }; prepdat = derive2 { name="prepdat"; version="1.0.8"; sha256="19rxyss96cmjhzm69f6l1cd3vkw3wskzhxnbmrz4546x00gf9g5v"; depends=[dplyr psych reshape2]; }; prepplot = derive2 { name="prepplot"; version="0.7"; sha256="1yqiq78iqsk49ky913x4h8f3638blyamrwdhhcmzfgy4n7dnk11x"; depends=[plotrix shape]; }; - preprocomb = derive2 { name="preprocomb"; version="0.3.0"; sha256="08dhzil8prmjb6if0yba9pjncfxf5zzvlrrabva7c5jhny806c5g"; depends=[arules caret clustertend DMwR doParallel e1071 foreach randomForest zoo]; }; - preprosim = derive2 { name="preprosim"; version="0.2.0"; sha256="1z10ranfal51vzsnndfaw5aqddh2w1xx8h50j1p7gx4fi90d0waq"; depends=[caret DMwR doParallel e1071 foreach ggplot2 reshape2]; }; - preproviz = derive2 { name="preproviz"; version="0.2.0"; sha256="0jb85qkzywsd2iyfynd8ngkc136m4qc38phc3fgxm2qw30dacmyh"; depends=[caret ClustOfVar DMwR ggdendro ggplot2 gridExtra randomForest reshape2]; }; preputils = derive2 { name="preputils"; version="1.0.2"; sha256="0cww3x7375ck56cm14ssalvpgvsdi4myr3p19zy4fcjy6fgyyxc5"; depends=[data_table]; }; prereg = derive2 { name="prereg"; version="0.4.0"; sha256="1jhlgp7ajq6mx7gn4kf3b7wqzs3v0678pa1r6p4mgvvynic8rnqj"; depends=[rmarkdown]; }; presens = derive2 { name="presens"; version="2.1.0"; sha256="175nr9pqn3m6kh9bcc1gxqmqv05xdsqdw9lx385lmm1g947d2159"; depends=[marelac measurements]; }; @@ -11868,9 +12028,10 @@ in with self; { prevalence = derive2 { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[coda rjags]; }; prevederer = derive2 { name="prevederer"; version="0.0.1"; sha256="0vkx9nrlgp36xbl95lrb5sb5yivxlcw4yvbs8hgbm31kh0vbz32f"; depends=[httr]; }; prevtoinc = derive2 { name="prevtoinc"; version="0.12.0"; sha256="0ypdxcx9gh87a7ih3cw3yai47rzv41qwh4kpk6007ai8jkjv4n9w"; depends=[dplyr purrr rlang tibble]; }; - priceR = derive2 { name="priceR"; version="0.1.0"; sha256="09jlf8c1lfiqmpm2vdgkacsracwcjgi6xgvlakny2c4iyir45sh5"; depends=[dplyr gsubfn stringr]; }; + prewas = derive2 { name="prewas"; version="1.1.0"; sha256="0lsfy3sr59pzhrr4nz1ryvnmb54vk9hhdlnx8mrxlhfg8hs59l6r"; depends=[ape future future_apply phangorn vcfR]; }; + priceR = derive2 { name="priceR"; version="0.1.1"; sha256="1r276jh95ji6340yya6rnzjy5wpapa192a66cv07qhafvhi8yqfs"; depends=[curl dplyr gsubfn jsonlite lubridate purrr stringi stringr]; }; pricesensitivitymeter = derive2 { name="pricesensitivitymeter"; version="1.1.1"; sha256="0zlvrzrqndnrwawwzqwpj7c7r86mb80njhv7dcm8l5qygnc4xz3b"; depends=[survey]; }; - prim = derive2 { name="prim"; version="1.0.16"; sha256="0i5jpk798qbvyv9adgjbzpg4dvf7x51bcgbdp38fzdnam6g88y5a"; depends=[misc3d rgl]; }; + prim = derive2 { name="prim"; version="1.0.17"; sha256="037gfs6ibkk7rjv21vi2k5jx24plss0jsxkn12arvfg5p6xan08k"; depends=[misc3d rgl]; }; primePCA = derive2 { name="primePCA"; version="1.0"; sha256="0kpyqv3l58xcyd98a7c7ggsna30j6k62aliidlyxgv2ya0g0dshv"; depends=[MASS Matrix softImpute]; }; primefactr = derive2 { name="primefactr"; version="0.1.1"; sha256="11hi75jwjxrl9p5m8yjwjb20pc9y9vkhi8sjrnisdq2hm53m483w"; depends=[]; }; primer = derive2 { name="primer"; version="1.1.1"; sha256="1hw7qd0xq3bvzk5ms9q568a3nkj3ws4jnzbmlypy8c5x3ly6pl1d"; depends=[deSolve lattice]; }; @@ -11879,15 +12040,15 @@ in with self; { princurve = derive2 { name="princurve"; version="2.1.4"; sha256="1b3grra328wkfsmqkkwp3lwdzhbdiwyq380qi5pl9r2jc6arnppj"; depends=[Rcpp]; }; prinsimp = derive2 { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; }; printr = derive2 { name="printr"; version="0.1"; sha256="13yqqcwfqnbhvcxwrr6j45qhnbxng3qwn2ygkr809gibg9grw471"; depends=[knitr]; }; - prioGene = derive2 { name="prioGene"; version="1.0.0"; sha256="0s4vcx5v9agzf84k45lb4ziqqhj9krf096m66m927lb6ik8gx58h"; depends=[AnnotationDbi org_Hs_eg_db]; }; - prioritizr = derive2 { name="prioritizr"; version="4.1.4"; sha256="1z8p9faacbi61sfxyqz0k7zlxyqc03gg9rc9f4a5zbdcnx83bhf3"; depends=[ape assertthat BH data_table doParallel igraph magrittr Matrix plyr proto raster Rcpp RcppArmadillo rgeos sp tibble uuid]; }; + prioGene = derive2 { name="prioGene"; version="1.0.1"; sha256="0k1rlvmfhj1m2zp5zaac8wcwjypd6f4dd8fxxsyrzsafp9aw189l"; depends=[AnnotationDbi org_Hs_eg_db]; }; + prioritizr = derive2 { name="prioritizr"; version="4.1.5"; sha256="08ahfwpyvvz0faii5b4r8dxrkdhvj85gvys1yz1hsnxhnya6m5pi"; depends=[ape assertthat BH data_table doParallel igraph magrittr Matrix plyr proto raster Rcpp RcppArmadillo rgeos sp tibble uuid]; }; prioritizrdata = derive2 { name="prioritizrdata"; version="0.2.2"; sha256="1gljrll89r2y6nb4jwcp1pyjs5qrahqawi84kgg74w2q6xq65kga"; depends=[raster sp]; }; prioritylasso = derive2 { name="prioritylasso"; version="0.2.3"; sha256="1hmf81vcri0sfaphc0221skpvb2gz0zvxlmlhv7k8rhs1pvnqi8g"; depends=[glmnet survival]; }; prism = derive2 { name="prism"; version="0.1.0"; sha256="0d2llrpw5y0svrdzbk52pjrfp76lknrw4r8ciqq0cq3l6kbynh9r"; depends=[dplyr ggplot2 httr lubridate magrittr purrr raster readr stringr]; }; prismatic = derive2 { name="prismatic"; version="0.2.0"; sha256="0j077khvagzs9lxrryi4q1czk1129r93cqf1i1hiz0b3wij2bwsg"; depends=[farver]; }; prisonbrief = derive2 { name="prisonbrief"; version="0.1.0"; sha256="1fnhg6vqdabdnhvgd19vnkfrdgz8a53snfrx6m6mmdwb6cvavb8m"; depends=[data_table dplyr httr magrittr passport rlang rnaturalearth rnaturalearthdata rvest stringr tibble tidyr xml2]; }; prithulib = derive2 { name="prithulib"; version="1.0.2"; sha256="12ybksrvxzc5gjz8m38cs35b7r3kd8m0zqm2c67pqw38vq82sjxm"; depends=[]; }; - prnsamplr = derive2 { name="prnsamplr"; version="0.1.0"; sha256="0hdxbdkmxfd3ax1qfc4fj9bbxz8cv08qzcjwpxgkapgm2jwgxpgc"; depends=[]; }; + prnsamplr = derive2 { name="prnsamplr"; version="0.1.1"; sha256="1nwssm5h43qakqfk4m54m0ks5n0942p4r1ad0v57lmpx50pnnaaw"; depends=[]; }; pro = derive2 { name="pro"; version="0.1.1"; sha256="0f0iliq7bhf313hi0jbwavljic4laxfc0n3gac5y6hzm39gvvgag"; depends=[]; }; proPubBills = derive2 { name="proPubBills"; version="0.1"; sha256="1fpn9x31jjahdyk0f30mbb3ijj4dsghrq9q94r04pjsgr2jw23zx"; depends=[dplyr httr stringr]; }; prob = derive2 { name="prob"; version="1.0-1"; sha256="05qcrsl790hn7p3ap4zj5i1b1sf674wvvrh42lyb7a0nsc09iq9n"; depends=[combinat fAsianOptions]; }; @@ -11896,24 +12057,22 @@ in with self; { probemod = derive2 { name="probemod"; version="0.2.1"; sha256="1cgjr03amssc9rng8ky4w3abhhijj0d2byzm118dfdjzrgmnrf9g"; depends=[]; }; probhat = derive2 { name="probhat"; version="0.2.0"; sha256="04pzvrny045p8rpvh7va55qfak0b3751x2bi3sp9hqiwr8dys02z"; depends=[barsurf intoo kubik]; }; probout = derive2 { name="probout"; version="1.1.1"; sha256="1hasrvxdig8n3fhzsbmq27050dyanzp1j0qlybnrkb41k9gyljda"; depends=[FNN MASS mclust]; }; - probsvm = derive2 { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; }; proccalibrad = derive2 { name="proccalibrad"; version="0.14"; sha256="0vr55rpcqh9wvy3bklssrimp42x85w3sanjgshfij657v68vmx46"; depends=[]; }; - processR = derive2 { name="processR"; version="0.1.0"; sha256="1c36f1l9ylj01hr5fs1413kixd3jx6fdhha4rw1mpcjbn9cxnjgq"; depends=[diagram dplyr flextable ggiraphExtra ggplot2 jtools lavaan magrittr modelr mycor officer prediction psych purrr rlang rrtable semTools shiny shinyWidgets stringr TH_data tidyr tidyselect]; }; - processanimateR = derive2 { name="processanimateR"; version="1.0.2"; sha256="0yz61m5f71lqz3f1y1lsnpbp3cpypsvj7k2cbiixl95qlpxhd1is"; depends=[bupaR DiagrammeR dplyr htmlwidgets magrittr processmapR rlang stringr tidyr]; }; + processR = derive2 { name="processR"; version="0.2.3"; sha256="0zdckw8c4xavrlkaihj3il35whfcam27ra7f4xxhypf9fa9dhzr4"; depends=[diagram dplyr flextable ggplot2 ggrepel interactions lavaan officer predict3d psych purrr rlang rmarkdown rrtable semTools stringr tidyr tidyselect ztable]; }; + processanimateR = derive2 { name="processanimateR"; version="1.0.3"; sha256="1ywn2hv2wg35i6ww1ckr6gcb709sf1c836ml542g8iiggwk3cvz5"; depends=[bupaR DiagrammeR dplyr htmltools htmlwidgets magrittr processmapR rlang stringr tidyr]; }; processcheckR = derive2 { name="processcheckR"; version="0.1.2"; sha256="1l8qx7ivw6vwmw7d7x7dawv11aklbyjwpyial3crhamnj5389ngj"; depends=[bupaR dplyr edeaR glue rlang stringr]; }; processcontrol = derive2 { name="processcontrol"; version="0.1.0"; sha256="0c0bksgq24blfkdgp5bn49sjnaajrg5bag8qzb5zffxbhnm4s30x"; depends=[plyr]; }; - processmapR = derive2 { name="processmapR"; version="0.3.3"; sha256="0skiavjays0qp9yvxfdzhp7iagz3zirq90m08lcl6sa83n5dj8rr"; depends=[bupaR data_table DiagrammeR dplyr edeaR forcats ggplot2 ggthemes glue hms miniUI plotly purrr RColorBrewer rlang scales shiny stringr tidyr]; }; + processmapR = derive2 { name="processmapR"; version="0.3.4"; sha256="0kq940j8frmbal1nqxwv7wshkyv7y3vhax6zr0ngkf18xv73y76z"; depends=[BH bupaR data_table DiagrammeR dplyr edeaR forcats ggplot2 ggthemes glue hms htmltools miniUI plotly purrr RColorBrewer Rcpp rlang scales shiny stringr tidyr]; }; processmonitR = derive2 { name="processmonitR"; version="0.1.0"; sha256="1ckr438yifpsh095j6bb65dq3rdm7cfm8k7qsjmcqwjkww4j74z8"; depends=[bupaR dplyr edeaR ggplot2 magrittr miniUI shiny]; }; - processx = derive2 { name="processx"; version="3.4.1"; sha256="1g6ipcaxg9y94lyrnbp7kkbqfkcdh1fyrqjjclbjp3x7iysdvazi"; depends=[ps R6]; }; + processx = derive2 { name="processx"; version="3.4.2"; sha256="02awswxq6wh3rl99dncw5n6c1xmd0v81xcdp2dfyi6vm6b3gz84l"; depends=[ps R6]; }; prodest = derive2 { name="prodest"; version="1.0.1"; sha256="16nqgd9wrjfxymwbxrnlak54cagbv3fxgbql0w5bxnmyrbbqy509"; depends=[AER DEoptim dplyr Matrix Rsolnp]; }; prodigenr = derive2 { name="prodigenr"; version="0.5.0"; sha256="1h15fwd4rclja0q80y119sah1qbyjlbaqxg360ywq9ig151lxsjq"; depends=[fs git2r rmarkdown rprojroot usethis withr]; }; prodlim = derive2 { name="prodlim"; version="2019.11.13"; sha256="03wvh3kirp1prac5nky6a5whs97rvaf4hc27x0fnh51sa17r42b8"; depends=[KernSmooth lava Rcpp survival]; }; productivity = derive2 { name="productivity"; version="1.1.0"; sha256="1g8b4vlyqq3xyzd4dki01glhc3g9j3ywgwpxylkmzp0ivqic53yc"; depends=[doParallel foreach iterators lpSolveAPI]; }; productplots = derive2 { name="productplots"; version="0.1.1"; sha256="1igs6d0qwgsfk0z3vxabgv5kva9w2kpzi535gjfdrbx34j4pf3gx"; depends=[ggplot2 plyr]; }; prof_tree = derive2 { name="prof.tree"; version="0.1.0"; sha256="0mjvxaacrgkzl0f1wn3fpgah4jh720safni66ri0dnriwcxis6rz"; depends=[data_tree]; }; - profExtrema = derive2 { name="profExtrema"; version="0.2.0"; sha256="13fn32v4jryyw2sc6g76fmf2ivbwql0z39wqpl6ggmiwnj95sfm7"; depends=[DiceKriging KrigInv lhs MASS microbenchmark pGPx quantreg rcdd RColorBrewer]; }; - profdpm = derive2 { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; }; - proffer = derive2 { name="proffer"; version="0.0.2"; sha256="083cxxpwkdjnj15ficfb77yiq96j0xf7z5j7h5slm9spazkr38v6"; depends=[processx profile RProtoBuf]; }; + profExtrema = derive2 { name="profExtrema"; version="0.2.1"; sha256="0gdhamnngh1yh3nb7l656qhdr61s0zn6h1hagh22k2fn11z3xhsl"; depends=[DiceKriging KrigInv lhs MASS microbenchmark pGPx quantreg rcdd RColorBrewer]; }; + proffer = derive2 { name="proffer"; version="0.1.0"; sha256="19bri9v1i5ghh9az247k9wmj8dpkbfzdykmzx26jrkzqqsdbilzg"; depends=[cli processx profile RProtoBuf withr]; }; profile = derive2 { name="profile"; version="1.0"; sha256="0m7fm490gqkbmnbdq3lac87zqb9qyx6546rlpa130rq1jnlgxfp6"; depends=[rlang tibble withr]; }; profileModel = derive2 { name="profileModel"; version="0.6.0"; sha256="0yq8hy43h62hlz8bbf9ila4a3xcwizi1if27b78xc5y857ncwad8"; depends=[]; }; profileR = derive2 { name="profileR"; version="0.3-5"; sha256="0fgc7585a7194c67irafjnx8g2j6mn3qhcfn76c6dh28clp20qp9"; depends=[ggplot2 lavaan RColorBrewer reshape]; }; @@ -11924,23 +12083,22 @@ in with self; { progenyClust = derive2 { name="progenyClust"; version="1.2"; sha256="0azp5pvk316s8xbawcqwqfd80fxb4xn8hc6aq87xwksc6fhwp94l"; depends=[Hmisc]; }; prognosticROC = derive2 { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; }; progress = derive2 { name="progress"; version="1.2.2"; sha256="0dgzb362641aqm8xd88iqa8jmpdm43xs0aba0d5kk6fvapnxi95l"; depends=[crayon hms prettyunits R6]; }; - progressr = derive2 { name="progressr"; version="0.4.0"; sha256="1wgqabp8qmg58gymv3wq9ci5mp64isbdgg1by5s9g8ncwyhnfalb"; depends=[digest]; }; - proj4 = derive2 { name="proj4"; version="1.0-8.1"; sha256="0zhal76wd9k8l1hjm00sgzlxi6c2sc7l8msr9firzmsg07qai8m3"; depends=[]; }; + progressr = derive2 { name="progressr"; version="0.5.0"; sha256="0w4vx1sk0qxnzkjqzvc6facd142qah2nzzkrcmgnsajp025xxfs5"; depends=[digest]; }; + proj4 = derive2 { name="proj4"; version="1.0-10"; sha256="1l6i4735ki6y2qhmg1gmrj93rzrvgpzi23rr3a1akkqp58bnyfaz"; depends=[]; }; projections = derive2 { name="projections"; version="0.3.1"; sha256="12vskql6x04jzik72a0vx83amfj01w9f7mxn052vsv7aaljbi124"; depends=[distcrete ggplot2 incidence]; }; - projects = derive2 { name="projects"; version="2.0.0"; sha256="0m9177ldp0d3f9k2ifrbww5snhvaql8h96shcdm46i1kjnzj4070"; depends=[dplyr fs lubridate magrittr purrr readr rlang rstudioapi sessioninfo stringr tibble zip]; }; + projects = derive2 { name="projects"; version="2.1.0"; sha256="0clrspmrlfi8w8h8afbpfjfg74qn1ys6zsb8gj3g5p0lcap2269g"; depends=[dplyr fs lubridate magrittr purrr readr rlang rstudioapi sessioninfo stringr tibble vctrs zip]; }; projmgr = derive2 { name="projmgr"; version="0.1.0"; sha256="1iysxcl6awvp7zbm04zyq4d9659fcz3sy711jnycsxhsk8hsvmc2"; depends=[gh magrittr]; }; + projpred = derive2 { name="projpred"; version="1.1.6"; sha256="07bixjpnvj9i5hsr9bfycnxryzsw2vg27z1lw86aj7948wdjgar1"; depends=[ggplot2 loo Rcpp RcppArmadillo]; }; promises = derive2 { name="promises"; version="1.1.0"; sha256="01l0ydjvvy6afcg5d6pzvk1ikd3djq8n2flv8c831ksn68z0zsn8"; depends=[later magrittr R6 Rcpp rlang]; }; promote = derive2 { name="promote"; version="1.1.1"; sha256="1cdz4xqinyzpbbgkxxd4f86n1h8zj88vp5z6w01cxd5ykyjf5411"; depends=[httr jsonlite stringr]; }; - promotionImpact = derive2 { name="promotionImpact"; version="0.1.2"; sha256="1mx745q37fqgn46y9qj3ql54r747qfab1yq8878g08cq6y696rmp"; depends=[crayon data_table dplyr ggplot2 ggpubr KernSmooth lmtest prophet Rcpp reshape2 scales stringr strucchange]; }; prop_comb_RR = derive2 { name="prop.comb.RR"; version="1.2"; sha256="10s52fkq7rv6v4gw1yd46f0fbg89ksim0qhgb5jbglzrqh585ny5"; depends=[rootSolve]; }; propOverlap = derive2 { name="propOverlap"; version="1.0"; sha256="0q72z9vbkpll4i3wy3fq06rz97in2cm3jjnvl6p9w8qc44zjlcyl"; depends=[Biobase]; }; propagate = derive2 { name="propagate"; version="1.0-6"; sha256="17jinz1jramlsf87i7vyn2qp82rc1dacljfaxxplrk3crhw3bhs7"; depends=[ff MASS minpack_lm Rcpp tmvtnorm]; }; properties = derive2 { name="properties"; version="0.0-9"; sha256="1zd66cg31yd53rqsc0cwxhlpfn7kvc67qdh3vyj9qib8kwxaw1zl"; depends=[]; }; - prophet = derive2 { name="prophet"; version="0.5"; sha256="0jqzmzgx3z4rl5478mw620sg539b2fwijcrzhd7jikrsv2fy7jcn"; depends=[dplyr dygraphs extraDistr ggplot2 Rcpp rlang rstan scales tidyr xts]; }; proportion = derive2 { name="proportion"; version="2.0.0"; sha256="0a71f6hz6blb7550m9x0di84vp51yjhnn952301rwlrh3axf6dbr"; depends=[ggplot2 TeachingDemos]; }; propr = derive2 { name="propr"; version="4.2.6"; sha256="16ghgzpwz6q9zlaa0pc8wqv0wpz81c75n7zwjyr1lv9y19qwlkfg"; depends=[fastcluster ggplot2 igraph Rcpp]; }; - prospectr = derive2 { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[foreach iterators Rcpp RcppArmadillo]; }; - protViz = derive2 { name="protViz"; version="0.5.1"; sha256="0cznzm1ijlq33yd5wsa61prav77y2vi698w0n2fx1xcv504c4bjv"; depends=[Rcpp]; }; + prospectr = derive2 { name="prospectr"; version="0.2.0"; sha256="16ba2dmg1v2gsd66s25c28s413vg5xcbhicb75qwpijlgmjvfpgi"; depends=[foreach iterators Rcpp RcppArmadillo]; }; + protViz = derive2 { name="protViz"; version="0.6.4"; sha256="1qq9bf4485x8cviry9fmhnv4hw9aw657w134003myzcv42c4pml6"; depends=[Rcpp]; }; protag = derive2 { name="protag"; version="1.0.0"; sha256="1iaw2w1d7hdvlg5vplpqc49wq08dgmm0ifvp2v0ggqb8invvdnw8"; depends=[dplyr ggplot2 RColorBrewer]; }; proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; }; proteomics = derive2 { name="proteomics"; version="0.2"; sha256="01cd4sb79gcx8gbzl624scvjbwhgcsca1wdvvfkhsv7jfwdd2ry2"; depends=[foreach ggplot2 plyr reshape2]; }; @@ -11956,17 +12114,17 @@ in with self; { provParseR = derive2 { name="provParseR"; version="0.2"; sha256="13fb4fl395aqjcs2kyvm5z1ac5jkqn5nh2ylzig2p54h313bg0dk"; depends=[jsonlite]; }; provSummarizeR = derive2 { name="provSummarizeR"; version="1.3"; sha256="0bbiz3lvk0lxxrcgsqww0q79505i0mzxfl03r3pm34amvqc7kl75"; depends=[dplyr provParseR]; }; provViz = derive2 { name="provViz"; version="1.0.6"; sha256="0pnrprybn48jb02888pzn2y7vi1l24fxk6063sv6aiwpncminf9n"; depends=[]; }; - provenance = derive2 { name="provenance"; version="2.3"; sha256="1nzgnjfy91r9995jhn7s96jqqlc35s4kxhqscpj9jv93ngddq3zd"; depends=[IsoplotR MASS]; }; + provenance = derive2 { name="provenance"; version="2.4"; sha256="14dawdlimzbyjwq13kl0z2nkqfykwrj4kqa6pd8id4zyv7kls885"; depends=[IsoplotR MASS]; }; proxy = derive2 { name="proxy"; version="0.4-23"; sha256="17b6qfllqrhzrxqgx7dccffgybnkcria5a68ap5ly3plg04ypm4x"; depends=[]; }; proxyC = derive2 { name="proxyC"; version="0.1.5"; sha256="159bc42x4shm6n3rh9fc8ziv3ivq0ipmpbasrh279hhn1prc8gg6"; depends=[Matrix Rcpp RcppArmadillo RcppParallel]; }; prozor = derive2 { name="prozor"; version="0.2.11"; sha256="1a2k69fvgi6vxgczk81kh8r2jxc6nirc51w6ac239rqjzb1zyhjm"; depends=[AhoCorasickTrie doParallel dplyr foreach Matrix plyr readr seqinr stringr]; }; - prrd = derive2 { name="prrd"; version="0.0.2"; sha256="0ifs55yqvwbcs3xyc90yi763fgavdhajk1ba73g1kchn2ak39qhb"; depends=[config crayon data_table DBI liteq RSQLite]; }; + prrd = derive2 { name="prrd"; version="0.0.3"; sha256="1j1hcs5h6h9nz3pdjnw9p2y837706k9yxxjgiv0mgnwyh8pmz425"; depends=[config crayon data_table DBI liteq RSQLite]; }; pryr = derive2 { name="pryr"; version="0.1.4"; sha256="06vj5xl9x37kbd3l5bw7sbgfdnp37spvrjrn976rxi04clqk966k"; depends=[codetools Rcpp stringr]; }; - ps = derive2 { name="ps"; version="1.3.0"; sha256="1lcq7r0q4jb8x6k023zr2ydj2dg925bqqbkhx1phpnyjrk897498"; depends=[]; }; + ps = derive2 { name="ps"; version="1.3.2"; sha256="0127q6pw9iw8hhcfp231gmdh29nahh2n5jzc38avrzy7yrm4bwl9"; depends=[]; }; psData = derive2 { name="psData"; version="0.2.2"; sha256="013hb6lk9rm2w08m5jbw90ndrcd4wyy2h125jx07c9bs60wh4mp4"; depends=[countrycode DataCombine reshape2 rio xlsx]; }; psSubpathway = derive2 { name="psSubpathway"; version="0.1.1"; sha256="1jzymhh1dy5w735fppqza7ilspsvyidkrdpq2yd3j5xfjckzfh5w"; depends=[GSVA igraph mpmi pheatmap]; }; psbcGroup = derive2 { name="psbcGroup"; version="1.4"; sha256="0l1hmgw4sislryws8hv7r2nglhcs6g9khg0372a70djvhz2l6gfi"; depends=[LearnBayes mvtnorm SuppDists]; }; - pscl = derive2 { name="pscl"; version="1.5.2"; sha256="1phf3awsfr4ncqfqzin5m1pz0g7y1zhbcm2sz7358ssw914fd7rc"; depends=[MASS]; }; + pscl = derive2 { name="pscl"; version="1.5.5"; sha256="0vzf5wazs92bhqhqd66v3vwmbfmnh67gb2466g1xxawim649nk05"; depends=[MASS]; }; pscore = derive2 { name="pscore"; version="0.1-2"; sha256="1sfkxs2kv8lq87j3q9ci7j38c7gzfkp2l36lwcdhiidr2nls2x0c"; depends=[ggplot2 lavaan reshape2]; }; psd = derive2 { name="psd"; version="1.2.0"; sha256="017iqz6awc7k3kv74jdc8wak62zzgnxvakl0qp774kx1kpv6hgji"; depends=[RColorBrewer Rcpp RcppArmadillo signal zoo]; }; psda = derive2 { name="psda"; version="1.3.3"; sha256="0asw6pq8zifacr42dwhy52xhgvl82q95a34x4ymbylj1mipka54k"; depends=[ggplot2 plyr raster rgeos sp]; }; @@ -11974,10 +12132,10 @@ in with self; { pseudo = derive2 { name="pseudo"; version="1.4.3"; sha256="0ccf3gz2g7g5y4acpj2qnb39hrghhdganizlddg6rx7al869fffs"; depends=[geepack KMsurv]; }; pseudorank = derive2 { name="pseudorank"; version="0.3.8"; sha256="1nj2cq8v8gj8wg23yrn8v21jwgd572gbz1wplpaxhk5v2ckhf1p0"; depends=[doBy Rcpp]; }; pseval = derive2 { name="pseval"; version="1.3.1"; sha256="1jgnv1l9adhwrmkmp6wkzz7jf7w1hyqy47ajr29l21p4g037py45"; depends=[survival]; }; - psfmi = derive2 { name="psfmi"; version="0.1.0"; sha256="1gp3gk5qjdfjh6aw2a4y8r9dk1gjsmd9lidr9j43zvc3xsk7pina"; depends=[car foreign ggplot2 miceadds mitools norm pROC ResourceSelection rms survival]; }; - psgp = derive2 { name="psgp"; version="0.3-18"; sha256="1jfkqwqnmzj3m1d9gxbp2rjkbqb0di75gh78zg861by5qhhaz1a7"; depends=[automap doParallel foreach gstat intamap Rcpp RcppArmadillo rgdal sp]; }; - psica = derive2 { name="psica"; version="1.0.1"; sha256="1xgq2xqs26v6y91b2b23b5imzjgxv5dihbn69yyjq91a3nvrfk7p"; depends=[BayesTree gridBase party partykit randomForest Rdpack rpart]; }; - psidR = derive2 { name="psidR"; version="1.9"; sha256="0ljfjxsj6krxyk3ss1n0ccymca4hiwkp9fdb1h1l4rqm0dsj8jj8"; depends=[data_table foreign futile_logger openxlsx RCurl SAScii]; }; + psfmi = derive2 { name="psfmi"; version="0.2.0"; sha256="11gmc48frayyn9w5hnjfis1v92mg1v640s69dzkdvqxdkrzh50bg"; depends=[car dplyr foreign ggplot2 lme4 magrittr mice miceadds mitml mitools norm pROC purrr ResourceSelection rms rsample survival tibble tidyr]; }; + psgp = derive2 { name="psgp"; version="0.3-19"; sha256="0yaf69zk4zkpgx5zyksdxb2g4az0ci8v6r23phzcis9fd21y70ds"; depends=[automap doParallel foreach gstat intamap Rcpp RcppArmadillo rgdal sp]; }; + psica = derive2 { name="psica"; version="1.0.2"; sha256="1cnrd1p8ikv0hl97jwypw8np1ypa0d8k2mizwd1clkv7inbb264g"; depends=[BayesTree gridBase party partykit randomForest Rdpack rpart]; }; + psidR = derive2 { name="psidR"; version="2.0"; sha256="033bi61l9jslz4xhii19i23c10n4irqbzsfm5n54nzznwg85i6d9"; depends=[data_table foreign futile_logger openxlsx RCurl SAScii]; }; pso = derive2 { name="pso"; version="1.0.3"; sha256="0alar695c6kc1rsvwipsrvlxc93f3sy9l0yhp0mggyqgxkkvy406"; depends=[]; }; psoptim = derive2 { name="psoptim"; version="1.0"; sha256="1yziabkd3h05cfl5jy5l8ji2y3w21acvxsq3inxyh0iwyr8qdkkl"; depends=[]; }; pspearman = derive2 { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; }; @@ -11987,33 +12145,36 @@ in with self; { pstest = derive2 { name="pstest"; version="0.1.3.900"; sha256="1rhd4vgqpr9yq0pc3xql3nfgl30v20ldywapp9n967ky2dja4k0z"; depends=[glmx MASS]; }; psy = derive2 { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; }; psych = derive2 { name="psych"; version="1.9.12.31"; sha256="02i9p6appf15hjdsi58g39bzs9as40f9qhy8m7ki30hd1fz1vrr5"; depends=[lattice mnormt nlme]; }; - psychNET = derive2 { name="psychNET"; version="0.0.3"; sha256="14z2hiq2acc5jar8shhmp310f7fing916yhljjhy3knksdd05mjq"; depends=[bigtime car crayon fastDummies glmnet graphicalVAR gtools Hmisc igraph imputeTS longitudinal MASS Matrix mgm mlVAR networktools ordinalNet qgraph SparseTSCGM sparsevar vars]; }; + psychNET = derive2 { name="psychNET"; version="0.0.4.1"; sha256="1h30ag185h9jw1w9119a9hxp984g2yj85hgi4vcwznjj18ssx377"; depends=[bigtime car corpcor crayon doParallel fastDummies glmnet graphicalVAR gtools Hmisc igraph imputeTS longitudinal MASS Matrix mgm mlVAR ncvreg networktools ordinalNet picasso qgraph reshape2 SparseTSCGM vars]; }; psychReport = derive2 { name="psychReport"; version="0.7"; sha256="1dapzq20aw9l4r5grfjd2sf14ga3wcxg67pq5fj6q4bcg5dggc9l"; depends=[cli crayon dplyr ez testthat xtable]; }; psychTools = derive2 { name="psychTools"; version="1.9.12"; sha256="1l1q3l6i40kkbvfjx7nri21jqy9vhdbcc7b5g56a5cqdimkddvkn"; depends=[foreign psych]; }; - psychmeta = derive2 { name="psychmeta"; version="2.3.4"; sha256="0nbgv7abi9i96piqggq9gsyv5p4x2h3rnr50f347mnfg55syha18"; depends=[boot cli crayon data_table dplyr ggplot2 MASS metafor nor1mix progress purrr RCurl reshape2 rlang stringi stringr tibble tidyr tmvtnorm xml2]; }; + psychmeta = derive2 { name="psychmeta"; version="2.3.8"; sha256="1sqcp88kkjdlni3wicjhgw9a8y4a53xr7avbqnq2wzz0n2fa1q29"; depends=[boot cli crayon curl data_table dplyr ggplot2 MASS metafor nor1mix progress purrr reshape2 rlang stringi stringr tibble tidyr tmvtnorm]; }; psycho = derive2 { name="psycho"; version="0.5.0"; sha256="0vcabk9j1yf7nz8fh3xg5rr2ia97mfkka23vbv9jya75dhgd84h2"; depends=[bayestestR dplyr effectsize ggplot2 insight parameters performance scales stringr tidyr]; }; psychometric = derive2 { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; }; - psychomix = derive2 { name="psychomix"; version="1.1-7"; sha256="16dh2y2z37h72ym1dv2xg0v20wjzlnp06h8f923cdy1zigk69d2r"; depends=[flexmix Formula lattice modeltools psychotools]; }; - psychonetrics = derive2 { name="psychonetrics"; version="0.5.1"; sha256="1sa0dkicr7v0wxi0b900zx43z30bcf9pzdw7kihcnykjd8q3vzwd"; depends=[abind corpcor crayon dplyr glasso IsingSampler lavaan magrittr Matrix matrixcalc mgcv mvtnorm numDeriv optimx pbapply pbv qgraph Rcpp RcppArmadillo ucminf VCA]; }; - psychotools = derive2 { name="psychotools"; version="0.5-0"; sha256="145x1zdjvasdyf72hp6wdsw0m1r5c97gzzlbnnmdbcrjqh5zyglb"; depends=[]; }; - psychotree = derive2 { name="psychotree"; version="0.15-2"; sha256="0svb3i3d9r3hvqh17lfzyzj2rnf2wm1wy6sspx67ngdrfy6d1p91"; depends=[Formula partykit psychotools]; }; + psychomix = derive2 { name="psychomix"; version="1.1-8"; sha256="0lfhfcmrk65gkr1yp317b515vmadbcf0vjcnc76d07yp6yfkz5qw"; depends=[flexmix Formula lattice modeltools psychotools]; }; + psychonetrics = derive2 { name="psychonetrics"; version="0.7.1"; sha256="1aj4a0yihiypsvzsrni5qfdjl4h3gffyimrhqcdwfd9wz8q09126"; depends=[abind combinat corpcor dplyr GA ggplot2 glasso IsingSampler lavaan magrittr Matrix matrixcalc mgcv mvtnorm numDeriv optimx pbapply pbv psych qgraph Rcpp RcppArmadillo roptim tidyr ucminf VCA]; }; + psychotools = derive2 { name="psychotools"; version="0.5-1"; sha256="0nm5ngdkyskkj5akbqavdz8njsa8mr61kzknnn1kkdz6bn6zy6lq"; depends=[]; }; + psychotree = derive2 { name="psychotree"; version="0.15-3"; sha256="18lr9dlv5l5fw88n61ch251ddgy1cv6klcj7ba3fg109b86p3bgf"; depends=[Formula partykit psychotools]; }; + psychrolib = derive2 { name="psychrolib"; version="2.5.0"; sha256="154bv16fyyyp5zgcrl2ncyqy15ybjnhqmim75pba11sbww7jdfbw"; depends=[Rcpp]; }; psymonitor = derive2 { name="psymonitor"; version="0.0.2"; sha256="09288w2bk5jhnbyj516jqn5qb33yqqg5kqbg6ylqk7anlq2yg2sl"; depends=[doParallel foreach magrittr]; }; - psyosphere = derive2 { name="psyosphere"; version="0.1.4"; sha256="0z3qnbybpf5zk07zny2mq8ax8lr0m4n7gwp899km0lixb10z4ysf"; depends=[geosphere ggmap ggplot2 lubridate plyr rgdal RgoogleMaps SDMTools sp]; }; + psyosphere = derive2 { name="psyosphere"; version="0.1.5"; sha256="14xnni31p2dh4wfnr2cmr3ymz5phx4506cq2n7ymy4k1587w25g6"; depends=[geosphere ggmap ggplot2 Hmisc lubridate plyr rgdal RgoogleMaps sp]; }; psyphy = derive2 { name="psyphy"; version="0.1-9"; sha256="1ndc6sy662wj2qfx7r97crlqjd8fdkfvfy59qmf34bcbzbg33riz"; depends=[]; }; + psyverse = derive2 { name="psyverse"; version="0.1.0"; sha256="0q402z884fwnd812bs44xqbsank89risli13v3njhjc337lj29wx"; depends=[yaml yum]; }; pterrace = derive2 { name="pterrace"; version="1.0"; sha256="15k5149jqjy20cck5121zsv2mk63amn5b8qgdlacivri9dpxjns1"; depends=[doParallel foreach plotly TDA viridis]; }; ptest = derive2 { name="ptest"; version="1.0-8"; sha256="1d30a23yknf7xgqj8adgr36pnh9dpffl1v5fq682f26fk3ss30qp"; depends=[quantreg]; }; ptinpoly = derive2 { name="ptinpoly"; version="2.4"; sha256="1jbj8z7lqg7w1mqdh230qjaydx2yb6ffgkc39k7dx8xl30g00i5b"; depends=[misc3d]; }; - ptmixed = derive2 { name="ptmixed"; version="0.4.2"; sha256="02cyifia87zqgxcg1an5aq73clvkk39lamb9cdvj41145kdnz9ph"; depends=[aod GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv tweeDEseq]; }; - pts2polys = derive2 { name="pts2polys"; version="0.1.1"; sha256="1pnh8ajh95c8xzfa4bvd2w41fi7h0jcg003rsji6xsasly3q34vr"; depends=[Rcpp]; }; + ptmixed = derive2 { name="ptmixed"; version="0.5.2"; sha256="1vi9xh5kv9389hdfq1f3j32ymycsdy6w21lv0h4gg3giwvxwkz3p"; depends=[aod GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv tweeDEseq]; }; + pts2polys = derive2 { name="pts2polys"; version="0.1.3"; sha256="0rmgryv0vds20npvaqvvwrhrx0grfcz9qwdy2w3bx945r0chhw39"; depends=[Rcpp]; }; ptstem = derive2 { name="ptstem"; version="0.0.4"; sha256="0dx677c7qh7rbalsys1n3xv4hjdhd6qypjd1mrggfwz1bd4vig4j"; depends=[dplyr hunspell magrittr rslp SnowballC stringr tidyr tokenizers]; }; ptsuite = derive2 { name="ptsuite"; version="1.0.0"; sha256="1df273p8v6zvhy2jj6imhjigwj77grx6sxqmg0sidxwqny5d1d9c"; depends=[Rcpp]; }; ptw = derive2 { name="ptw"; version="1.9-15"; sha256="0ikvzc5vfcs50jl5n49mhk39pcijyfdxd26adgs01h0b50zh1yi2"; depends=[nloptr]; }; ptwikiwords = derive2 { name="ptwikiwords"; version="0.0.3"; sha256="129dad1vy52sf97dqrkwa49vjhv2kvs4pmd5zvq8pxd51hqm6wy9"; depends=[]; }; ptycho = derive2 { name="ptycho"; version="1.1-4"; sha256="1llk3rpk0lf80vwvs23d6dqhgyic3a6sfjc393csj69hh01nrdvc"; depends=[coda plyr reshape2]; }; pubchunks = derive2 { name="pubchunks"; version="0.2.0"; sha256="119ihi6xi9k3p5lv2qkch2jc2fqmf8h0wi7mqh57asg7n6f0qb6r"; depends=[data_table rcrossref xml2]; }; - pubh = derive2 { name="pubh"; version="1.1.3"; sha256="0wr54x88ja4d0bpid1blz235q5kdlpyprha9nzrmwsr30s3c060n"; depends=[car dplyr emmeans Epi epiR epitools ggformula ggplot2 Hmisc lmtest magrittr sandwich sjlabelled sjPlot survival]; }; + pubh = derive2 { name="pubh"; version="1.1.6"; sha256="0788h08nmqxihymb8l46xwjs9j00vmxyim031p29392i8zbqkhc5"; depends=[car dplyr emmeans Epi epiR epitools finalfit ggformula ggplot2 Hmisc lmtest magrittr sandwich sjlabelled sjPlot survival]; }; publipha = derive2 { name="publipha"; version="0.1.1"; sha256="0ssmkz4bbrp5yvqb2da0i6shzm59ydw2sqkmqkid039782sibjch"; depends=[BH loo Rcpp RcppEigen rstan rstantools StanHeaders truncnorm]; }; pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.16"; sha256="1dcviy347lypbzwwz506d37wy5swla2vjgyqijwc37daic71bnih"; depends=[boot R2HTML RCurl XML]; }; + pubmedR = derive2 { name="pubmedR"; version="0.0.2"; sha256="03ff0n6qrxglclnpd8kz35wn95fghiqahc7qbq2r3xmp7q0xk3zz"; depends=[rentrez XML]; }; pubtatordb = derive2 { name="pubtatordb"; version="0.1.4"; sha256="0i5azbf75bwxxzpsr5fc2hh22pbwix00hz9dcdpn5jgp2957f7wx"; depends=[assertthat DBI dplyr R_utils readr RSQLite]; }; pullword = derive2 { name="pullword"; version="0.2"; sha256="14rln0nbd4k2cvf18iwvc56776b9g3m3cs67i7fgzabfrgj8y6db"; depends=[RCurl]; }; pulsar = derive2 { name="pulsar"; version="0.3.6"; sha256="0r1myng3wmirlp1ixqkkzlgv5i0my37irligah3wwfh0cprip1dm"; depends=[Matrix]; }; @@ -12022,7 +12183,7 @@ in with self; { puniform = derive2 { name="puniform"; version="0.2.1"; sha256="0pizpq3v0jlvl41pqypk5i5ghyg2na8mysf2pcvihx4ha7415i51"; depends=[ADGofTest metafor Rcpp]; }; purge = derive2 { name="purge"; version="0.2.1"; sha256="1faf8mkaxsnj63wnig5rs50hd3j6vzaj0xkdz8kn0j7y2vvshp9p"; depends=[]; }; purging = derive2 { name="purging"; version="1.0.0"; sha256="1b8f87jn6wyh4fp6b1660bd484wcf7xiajdg9dz2594aj1r94qsr"; depends=[MASS]; }; - purrr = derive2 { name="purrr"; version="0.3.3"; sha256="17lyys7dxjrwsfkq7a7hw65iy3qn3pp1sn70srdy64jf8adahc8g"; depends=[magrittr rlang]; }; + purrr = derive2 { name="purrr"; version="0.3.4"; sha256="1cj091rsjdj2xz16qhynyw72gh5cyhznifcfbrbygndfr4xwksr3"; depends=[magrittr rlang]; }; purrrlyr = derive2 { name="purrrlyr"; version="0.0.5"; sha256="0rcamyf7d01rpd9izh8xp66j130aqarfbc24p898dqhghb6q1ryq"; depends=[BH dplyr magrittr purrr Rcpp]; }; purrrogress = derive2 { name="purrrogress"; version="0.1.1"; sha256="1l7wr7jjpang9gx61pfw9qiapsviwpp13kbylmxvw7lz7q0khzcz"; depends=[assertthat glue hms pkgcond purrr R6 rlang testextra]; }; pushbar = derive2 { name="pushbar"; version="0.1.0"; sha256="1gxarv6x32y6ssrhsq3pyihzcvpnnj7bg0jf2cpcr99da78n1d9b"; depends=[jsonlite shiny]; }; @@ -12033,7 +12194,7 @@ in with self; { pvclass = derive2 { name="pvclass"; version="1.4"; sha256="1g6x75qz3xybq1xnik0hzi7mcs0gzzqd3f0iwfkzi5d1zcddnw13"; depends=[Matrix]; }; pvclust = derive2 { name="pvclust"; version="2.2-0"; sha256="0082icm54k2yq60k06qpr92a626k39j2jr0046lva4ylmhxqb4kq"; depends=[]; }; pvsR = derive2 { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[httr nnet XML]; }; - pwr = derive2 { name="pwr"; version="1.2-2"; sha256="0r5g781lr677vp3zyhgmi7r68c87l8gd05l1s3ffnxgn5wf043sm"; depends=[]; }; + pwr = derive2 { name="pwr"; version="1.3-0"; sha256="1kfzy73v3z6ipc3kdfkcjrp4b4p5k54nwk796gqi36srm93hgc2v"; depends=[]; }; pwr2 = derive2 { name="pwr2"; version="1.0"; sha256="0zfv7z5yymw310r1sqm8ivsc2pv6dgk2k4b1axmm92gsaj53cn7p"; depends=[]; }; pwr2ppl = derive2 { name="pwr2ppl"; version="0.1.1"; sha256="1n34cmsnia6gskwqh5l1czi4cx8vi96nzs100am3vkcxx1xlq7ss"; depends=[afex car dplyr ez lavaan MASS MBESS nlme phia tidyr]; }; pwrAB = derive2 { name="pwrAB"; version="0.1.0"; sha256="0ifyw40m9gsijw3vm9qb8qk4yydmdixfdpdp45x2hk93j8v61jm1"; depends=[]; }; @@ -12044,7 +12205,7 @@ in with self; { pwt9 = derive2 { name="pwt9"; version="9.1-0"; sha256="0m2df89lali9945avcv4gdjpxch9in7vdd042nx0q8nv0alb4ijd"; depends=[]; }; pxR = derive2 { name="pxR"; version="0.42.2"; sha256="1q1xwsrs1ch1a1d1clz6sl7vnsyz5wjqivczk5n5d772y4w60bz5"; depends=[plyr reshape2 RJSONIO stringr]; }; pxweb = derive2 { name="pxweb"; version="0.9.1"; sha256="00xp7idhsirmpl970yxnxp6xn128jm5kwsmdwhys32wlbd9kzspc"; depends=[checkmate httr jsonlite]; }; - pyMTurkR = derive2 { name="pyMTurkR"; version="1.1"; sha256="0pvv8fgg40vv36mf3cc8ysrjj3gk9hnmzyvwix2ndxvc1nlzzahc"; depends=[curl reticulate XML]; }; + pyMTurkR = derive2 { name="pyMTurkR"; version="1.1.4"; sha256="1dv8v01gd79jvqr54rb7k9x8i7v279f82slbmpvsd5r0k9zg2bfq"; depends=[curl reticulate XML]; }; pycno = derive2 { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[maptools rgeos sp]; }; pyinit = derive2 { name="pyinit"; version="1.0.3"; sha256="0sj7r52a53x57ff8b34s6p2y638b85fin0cxrndhpsk392sds0ki"; depends=[robustbase]; }; pyramid = derive2 { name="pyramid"; version="1.5"; sha256="0lakn9knmhqvhrp98sc3hhwd4bilpplxbr5j9bv8w6li0qd3d04a"; depends=[]; }; @@ -12053,68 +12214,66 @@ in with self; { qCBA = derive2 { name="qCBA"; version="0.4"; sha256="1230sh9riazx1shhgbkkxfrks7klypj2x1vc173q09hq8bkam2ha"; depends=[arc arules rJava]; }; qGaussian = derive2 { name="qGaussian"; version="0.1.8"; sha256="02xy35xg4swr1ldnsbywnz2h0ga1pbsivnj0aqmpll7kvwl9qz4c"; depends=[Rcpp robustbase zipfR]; }; qLearn = derive2 { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; }; + qMRI = derive2 { name="qMRI"; version="1.2"; sha256="10x59g8awxjib5j5mc1yd5wsibk3z6ki6zifxsg8azl0zblxbscf"; depends=[adimpro aws awsMethods oro_nifti stringr]; }; qVarSel = derive2 { name="qVarSel"; version="1.0"; sha256="13x2hnqjsm0ifzmqkkl9ilhykrh80q04lhlkkp06hkysmh5w9rkx"; depends=[lpSolveAPI Rcpp]; }; - qad = derive2 { name="qad"; version="0.1.1"; sha256="11v291swfl4llgzfffm786xqp9cn82vl8xlqjlma5wah7ig73rgh"; depends=[copula data_table doParallel foreach ggplot2 plyr viridis]; }; + qad = derive2 { name="qad"; version="0.1.2"; sha256="0xpzv1cliilrc1v4w6k848lphvdamr9ps63zh27bs3gkwncr47qa"; depends=[copula data_table doParallel foreach ggplot2 plyr viridis]; }; qap = derive2 { name="qap"; version="0.1-1"; sha256="0d2d1ni1camixyi45lfy00f4pn3p063k7bsi8gj5scp6n15mdgb0"; depends=[]; }; qat = derive2 { name="qat"; version="0.74"; sha256="04n1jnbkf9dzafjh1n5d4q9p7hvyhnr63nmgl51jqxcf3nan5rlx"; depends=[boot fields gdata gplots moments ncdf4 XML]; }; qboxplot = derive2 { name="qboxplot"; version="0.2"; sha256="07f05n7zxgwyxg2r5fz691ra64m218w9v874xfzjx6671c40y1q2"; depends=[]; }; qcQpcr = derive2 { name="qcQpcr"; version="1.5"; sha256="1298zla8z5w9z4idc07v3ca9rc1afx853y7iz3jmqnqnv8mr0s48"; depends=[ggplot2]; }; + qcapower = derive2 { name="qcapower"; version="0.1.0"; sha256="14vszidjvyi8namwv5k0hpgdw1dpns5ilvxfwa920ivdg35709ki"; depends=[devtools ggforce ggplot2]; }; qcc = derive2 { name="qcc"; version="2.7"; sha256="0lc26w7p3d023lfr8v6v75m2vwqg9vi9pdipap19l4vbdq29l4zz"; depends=[MASS]; }; qccrs = derive2 { name="qccrs"; version="0.1.0"; sha256="0lwrmf2809zzdj5f25bb1psh57ibyw90ra41fy2i9vjmgph9wgiq"; depends=[dplyr magrittr purrr tibble]; }; - qcr = derive2 { name="qcr"; version="1.0"; sha256="1251naica44kccmikyzdi3ncxfmvyqbc4qspfqnc0w54cqpsy5rw"; depends=[fda_usc MASS mvtnorm qcc qualityTools]; }; + qcr = derive2 { name="qcr"; version="1.2"; sha256="10770a1rijhl2mhri8vgcdp9k17vbn93z0kiv1fsdd8z48ywbwx4"; depends=[fda_usc MASS mvtnorm qcc qualityTools]; }; qcv = derive2 { name="qcv"; version="1.0"; sha256="0hf02l9c1cpzs02mfn9swfc8l635qsvh6xrhj21g19h5rxaf8jwg"; depends=[]; }; - qdap = derive2 { name="qdap"; version="2.3.6"; sha256="1j9s5gfq2hz7vkh8j682ykfqvl11kjqa16nbmgyhv33l8wb79skf"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reports reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; }; + qdap = derive2 { name="qdap"; version="2.4.1"; sha256="136vmcsnclcc1bgvfrsxq5f7vqpsf3590bx8j9770xfw9gx27ynw"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; }; qdapDictionaries = derive2 { name="qdapDictionaries"; version="1.0.7"; sha256="0jdx7bxmvc4p41jb4fhaagg5jsbsi7gva870cmyia72li52grhyn"; depends=[]; }; qdapRegex = derive2 { name="qdapRegex"; version="0.7.2"; sha256="1xa8q1way3gjadrjh3mv3xr4c6b4h16nd2c6lgl969difplpfz9p"; depends=[stringi]; }; - qdapTools = derive2 { name="qdapTools"; version="1.3.3"; sha256="0a28jn57d2fas3009cm10z07fq77ql3ffcrhcxsiimb57179wj0n"; depends=[chron data_table RCurl XML]; }; + qdapTools = derive2 { name="qdapTools"; version="1.3.5"; sha256="09byvv39qmdcavlykpcvk248l2f7sw0pq64ynq2xffmnga3ji24c"; depends=[chron data_table RCurl XML]; }; qdm = derive2 { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; }; - qfasar = derive2 { name="qfasar"; version="1.2.0"; sha256="067wnwwz8s0yxig13wrjq37w62kf8p5pa8my5lfpc1ik1b7iysby"; depends=[Rsolnp]; }; - qgam = derive2 { name="qgam"; version="1.3.0"; sha256="0i0irz2jqi73d97zyy8xz2yi95y93kw3sr9xf4hmrjdd4k15l0wk"; depends=[doParallel mgcv plyr shiny]; }; - qgcomp = derive2 { name="qgcomp"; version="2.0.0"; sha256="0q2mz5yynri26yfscicw344bjar7ygjmmy7hspjvqgg10mj8sla7"; depends=[arm future future_apply ggplot2 gridExtra pscl survival]; }; - qgg = derive2 { name="qgg"; version="1.0.2"; sha256="1bxm6gg52ja8n2b54i8zhd4wp3711dq94ch7sr2lqrr6kd7w033s"; depends=[data_table MASS MCMCpack statmod]; }; - qgraph = derive2 { name="qgraph"; version="1.6.4"; sha256="1glg814h7fwl1jfm6dw1d9i80bilmj5jcjjrfln15byrdh4mm1j3"; depends=[abind BDgraph colorspace corpcor d3Network dplyr fdrtool ggm ggplot2 ggraph glasso gtools Hmisc huge igraph jpeg lavaan Matrix pbapply plyr png psych Rcpp reshape2 tidygraph]; }; + qfasar = derive2 { name="qfasar"; version="1.2.1"; sha256="14370bmq4qx5j02va13wz52m2lgl4vb992p9587z9v2sxl1v4jjg"; depends=[Rsolnp]; }; + qgam = derive2 { name="qgam"; version="1.3.2"; sha256="0lks2cj0p7irp1i01756v1l7i26d7alax1fbkc20qd6wpz840fi7"; depends=[doParallel mgcv plyr shiny]; }; + qgcomp = derive2 { name="qgcomp"; version="2.3.0"; sha256="1ik81vj0brwnzvaij25jq4jchhqqjayckihdjh1l1zy3vfphla5m"; depends=[arm future future_apply generics ggplot2 gridExtra pscl survival tibble]; }; + qgg = derive2 { name="qgg"; version="1.0.3"; sha256="0ylpsvhvkznw1b280im026mlwa5bydh3gdki72a7rr2vpjnbgxm2"; depends=[data_table MASS MCMCpack statmod]; }; + qgraph = derive2 { name="qgraph"; version="1.6.5"; sha256="0pwys9irxvp0ap158drplyypkplbmwqinv0fmlsblk7q875cr592"; depends=[abind BDgraph colorspace corpcor d3Network dplyr fdrtool ggplot2 ggraph glasso gtools Hmisc huge igraph jpeg lavaan Matrix pbapply plyr png psych Rcpp reshape2 tidygraph]; }; qgtools = derive2 { name="qgtools"; version="2.0"; sha256="1gj7vbam53yr2rnxzfxng1p107bjcyjmyj47cxyzaiv19pznkbmw"; depends=[]; }; qha = derive2 { name="qha"; version="0.0.8"; sha256="0sdf6g6884wn73i237xkwszg2mq8xddhvyy225qzpplh5za4pnhl"; depends=[ade4 FactoClass FactoMineR]; }; qicharts = derive2 { name="qicharts"; version="0.5.5"; sha256="0bl1f64b5n8q9jhzh3rqfyh9613qiy9mhcy2xsn16jyrj4hmj0jd"; depends=[ggplot2 lattice latticeExtra scales]; }; - qicharts2 = derive2 { name="qicharts2"; version="0.6.0"; sha256="0310xczb8zzl8xl0l2fn1mw58cbkgs0xpsp3q061psv1achapxbr"; depends=[dplyr ggplot2 scales]; }; + qicharts2 = derive2 { name="qicharts2"; version="0.6.1"; sha256="14s8fji9hmsi3675n6nsy0mh1myj54bm18fssax2h0s96742lz79"; depends=[ggplot2 scales]; }; qif = derive2 { name="qif"; version="1.5"; sha256="12azs7c0anpd71d5663y1jrhirry6cr78wislp4fk64hmsbx7sx4"; depends=[MASS]; }; qiitr = derive2 { name="qiitr"; version="0.1.0"; sha256="1p0mcwgzvbib20l05wrnshkqx99vwr69dgy15dfwp75skyy5l797"; depends=[httr jsonlite purrr rstudioapi]; }; qkerntool = derive2 { name="qkerntool"; version="1.19"; sha256="14inry2hqvkmy0y2y3cl75ri4vri0hirv98gw2rymny69lia5x0s"; depends=[class]; }; - qlcData = derive2 { name="qlcData"; version="0.2.1"; sha256="0n1r7462zmyzkyi7mp3hf7pn7bgw1m1zs9flm3n199kjm8f6yyzy"; depends=[ape data_tree docopt phytools shiny stringi yaml]; }; qlcMatrix = derive2 { name="qlcMatrix"; version="0.9.7"; sha256="0iqkcvvy8rxlk0s83sjq57dd6fadb18p5z31lzy0gnzv1hsy1x8y"; depends=[docopt Matrix slam sparsesvd]; }; qmap = derive2 { name="qmap"; version="1.0-4"; sha256="02xvq1mw83gln7phacbi3vhkvb100crggbldv13mhwq3wjnmg5k2"; depends=[fitdistrplus]; }; - qmethod = derive2 { name="qmethod"; version="1.5.4"; sha256="1c64b7jy9llz5dhfnk75yamjva043213gd08dsr27pyjkmbyqms1"; depends=[digest GPArotation knitr psych xtable]; }; + qmethod = derive2 { name="qmethod"; version="1.5.5"; sha256="1s787big5f1m91n9s7yhxpsfx0161l7pyihlvfp9406k8qxs3jnl"; depends=[digest GPArotation knitr psych xtable]; }; qmix = derive2 { name="qmix"; version="0.1.2.0"; sha256="172lhvj7adphxq9gws2i9lysc9bj1wpk60f4hf2h5sisnli15v0x"; depends=[BH Formula Rcpp RcppEigen rstan StanHeaders]; }; qmrparser = derive2 { name="qmrparser"; version="0.1.5"; sha256="0sl9n42j0dx9jqz5vv029ra6dyrg9v7mvdlya8ps3vyd6fjhwh0z"; depends=[]; }; qoma_smuggler = derive2 { name="qoma.smuggler"; version="0.0.1"; sha256="03p9i0kr6i3adpb9lcszcmdr9p26nfy7f8hw2sbydazglaw4hscr"; depends=[lubridate rhli tibble]; }; qpcR = derive2 { name="qpcR"; version="1.4-1"; sha256="1r01q7jv3w59yx1gc0qw91rq7rvdhqsi8y57sqqkmwyqfw2x2vsv"; depends=[MASS Matrix minpack_lm rgl robustbase]; }; qpdf = derive2 { name="qpdf"; version="1.1"; sha256="03lnfncw8qd1fwfyqh1mjvnsjr3b63wxbah0wp5g7z7gba90dwbi"; depends=[askpass curl Rcpp]; }; - qqid = derive2 { name="qqid"; version="1.0.3"; sha256="1j2s5zilz97x4kl10g85qr3rxg022p9i601r6gvkaa57xcx6smw1"; depends=[qrandom]; }; qqman = derive2 { name="qqman"; version="0.1.4"; sha256="1v9s9ag1hfb47py87wb2nad4mbsfx35832hdmrh5kxrb2f11zl1s"; depends=[calibrate]; }; - qqplotr = derive2 { name="qqplotr"; version="0.0.3"; sha256="0qijdgma702ryi0q2ii2sa04jpz12i8c7xnh9a9zngi9n630a0f2"; depends=[dplyr ggplot2 knitr MASS purrr rmarkdown robustbase]; }; - qqtest = derive2 { name="qqtest"; version="1.1.1"; sha256="08vfpbrgvyhv1w0gqmys9zkhfxh85sk74ig5fn12ma2p87zv7r5l"; depends=[robust]; }; + qqplotr = derive2 { name="qqplotr"; version="0.0.4"; sha256="1zy7mlnll0infr2las5c28vi5da04rm869dpccwcws1467mhys3k"; depends=[dplyr ggplot2 knitr MASS robustbase]; }; + qqtest = derive2 { name="qqtest"; version="1.2.0"; sha256="1v0qbbp2dpqflpg7yif7hipwdbz27isfyfwcia1ln7z0nnvkjm8c"; depends=[]; }; qqvases = derive2 { name="qqvases"; version="1.0.0"; sha256="1fli4v1slmnwcmzmmfw84sa4mx3xzv3im1q0plb8811sbsgmwdvl"; depends=[shiny shinythemes]; }; - qrLMM = derive2 { name="qrLMM"; version="2.0"; sha256="0ci4679kfif1sk4009v89yfm5p6nyk7nhvikgd00rhrbqi9qaqy4"; depends=[ald lqr mvtnorm psych quantreg]; }; + qrLMM = derive2 { name="qrLMM"; version="2.1"; sha256="1viyllsd08dwgd5z930ml1nrcc9saaa18i5sx0bska8b0s7qh414"; depends=[ald lqr mvtnorm psych quantreg]; }; qrNLMM = derive2 { name="qrNLMM"; version="2.0"; sha256="0j69zhs1v4546xrkwra9c2q3kmhf593vi05yjn3b3s5nzh2k0i1x"; depends=[ald lqr mvtnorm psych quantreg]; }; qrage = derive2 { name="qrage"; version="1.0"; sha256="00j74bnkcpp0h8v44jwzj67q9aaw47ajc2fvgr6dckj9rymydinl"; depends=[htmlwidgets]; }; qrandom = derive2 { name="qrandom"; version="1.2.2"; sha256="1s0frb3qjaraigx79g0sm60dj216jrmp1lgzcvjk3rh7xdjhjrkn"; depends=[curl jsonlite Rmpfr]; }; - qrcm = derive2 { name="qrcm"; version="2.1"; sha256="0wp6ynckh66gxi569wbvn5szwih4g0c21zrrpz3zfavhqwk7srgf"; depends=[pch survival]; }; - qrcmNP = derive2 { name="qrcmNP"; version="0.1.2"; sha256="0psgnz2fdj530wjj14pv5x2889yzphnlsg10lry9i6dvmxd8m47k"; depends=[qrcm survival]; }; + qrcm = derive2 { name="qrcm"; version="2.2"; sha256="04cd78vqqp7pprrfpcza03g4pcffgl42qsax1285fbmxjqhb3yks"; depends=[pch survival]; }; qrcode = derive2 { name="qrcode"; version="0.1.1"; sha256="12j0db8vidlgkp0dcjyrw5mhhvazl7v7gpn9wsf2m0qnz1rm4igq"; depends=[R_utils stringr]; }; qrencoder = derive2 { name="qrencoder"; version="0.1.0"; sha256="1lg60lg2fiqdw0m228i8pln2p0kqp9f21qmrx6r6rwxifvwlfhv8"; depends=[base64enc png raster Rcpp]; }; qrjoint = derive2 { name="qrjoint"; version="2.0-3"; sha256="1ymnq8mbvxfdi63f4554mjlix5n864v2nask27pkf3yfxmkr346k"; depends=[coda kernlab Matrix quantreg]; }; qrmdata = derive2 { name="qrmdata"; version="2019-12-03-1"; sha256="0738wiac0dgani0yy61kvpra7zj8qj5ak627i8cjd42zf1yjziz5"; depends=[xts]; }; qrmix = derive2 { name="qrmix"; version="0.9.0"; sha256="1r695d9bmmngvblh9jj0rnjymdaln9w0jywz51wla0bdssssf845"; depends=[MASS quantreg]; }; - qrmtools = derive2 { name="qrmtools"; version="0.0-12"; sha256="1gbnc8cl0iv5snkrz5vrg3k6c5zz74amrb6yxwnlhh69yh63zxhi"; depends=[ADGofTest lattice Quandl quantmod rugarch xts zoo]; }; + qrmtools = derive2 { name="qrmtools"; version="0.0-13"; sha256="1pr0q0wh3xjy3y59nkbpqfkakagbank3b31150rlxy72hkf52g1y"; depends=[ADGofTest lattice Quandl quantmod rugarch xts zoo]; }; qrng = derive2 { name="qrng"; version="0.0-7"; sha256="1dw1qqajxavlnfyh6xn58069fpfza28x1xjzd3diqlcxxlb4hjaf"; depends=[copula randtoolbox]; }; qrnn = derive2 { name="qrnn"; version="2.0.5"; sha256="0ligz67kbfg5cmvacnb7y0ms1v0c7mbvbcfsxyfiz543ppl3xn1v"; depends=[]; }; - qrsvm = derive2 { name="qrsvm"; version="0.2.1"; sha256="0qpj3c8qwrwr2asvp921av0mbdba1ayz0pdq4a52i1waqng4fgis"; depends=[doParallel foreach kernlab Matrix quadprog]; }; - qs = derive2 { name="qs"; version="0.20.2"; sha256="12iqfa5rmcvw8dhprg4w8xvk2qd5796rmdsl9bsj59ijzr7zwg82"; depends=[RApiSerialize Rcpp]; }; + qs = derive2 { name="qs"; version="0.21.2"; sha256="1i4xrm9vz8ffl4mbw1qmgwkcm3j6ajw25ilj08n87ghy798pyab3"; depends=[RApiSerialize Rcpp]; }; qsort = derive2 { name="qsort"; version="0.2.3"; sha256="1xvp29dijfa2207wyw3z09rmffn61fngfy0f00qjk284n1jnnvrg"; depends=[cowplot ggplot2 gridExtra purrr]; }; qsub = derive2 { name="qsub"; version="1.1.0"; sha256="0i52bibc782k09f5hp3ic9ll14fsrwjnkdxlb0mhkjvsqm7m5hc5"; depends=[dplyr glue pbapply processx purrr random readr ssh stringr tidyr]; }; qtbase = derive2 { name="qtbase"; version="1.0.14"; sha256="1pcgjycq61x9h52sqr6fz83qjnlpbawvpavnn9hyw2b7jlv3nwfd"; depends=[]; }; qte = derive2 { name="qte"; version="1.3.0"; sha256="0x65n2qyq1py0nrachxkqd273mywkw433ai5x6ni3ak4ckbp3g66"; depends=[BMisc formula_tools ggplot2 Hmisc knitr msm pbapply quantreg texreg]; }; - qtl = derive2 { name="qtl"; version="1.44-9"; sha256="03lmvydln8b7666b6w46qbryhf83vsd11d4y2v95rfgvqgq66l1i"; depends=[]; }; + qtl = derive2 { name="qtl"; version="1.46-2"; sha256="0rbwcnvyy96gq1dsgpxx03pv423qya26h6ws5y0blj3blfdmj83a"; depends=[]; }; qtl2pleio = derive2 { name="qtl2pleio"; version="1.2.3"; sha256="0ihlp6glsw4pk97vpqlcbd6zmg0qww3i19c1b76vx1wkazjg6pd8"; depends=[dplyr gemma2 ggplot2 magrittr MASS Matrix Rcpp RcppEigen rlang stringr testthat tibble]; }; qtlDesign = derive2 { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; }; qtlbook = derive2 { name="qtlbook"; version="0.18-8"; sha256="1c849xy2ki7niddajv5wnsm0zdp5381w8zm9lc8rvkdbs2v6rhf4"; depends=[]; }; @@ -12122,12 +12281,12 @@ in with self; { qtlcharts = derive2 { name="qtlcharts"; version="0.11-6"; sha256="114h19d741abyz7c0w0lir7m7816hw92lnd4shb3d9m94a9dwxqp"; depends=[htmlwidgets qtl]; }; qtlhot = derive2 { name="qtlhot"; version="1.0.4"; sha256="0gf0fsq91g830vqg5kz01zznm40qpjncy964ccvmms3i6d3hxd9m"; depends=[corpcor mnormt qtl]; }; qtlmt = derive2 { name="qtlmt"; version="0.1-6"; sha256="023h60z8d05832l2g7mg776hfjb0i7xpvhz3i899rc3h5pgjd94c"; depends=[]; }; - qtlnet = derive2 { name="qtlnet"; version="1.4.4"; sha256="1r9r6wp71i36ffcdxiljvh2c8nva868x2dx6bkinbaq8cixww2cx"; depends=[graph igraph pcalg qtl sem]; }; + qtlnet = derive2 { name="qtlnet"; version="1.5.4"; sha256="0jdf3hyzas0lyv2v4gqai9mhh7218a1mvm0nlwv9hfdbij0hi84v"; depends=[graph igraph pcalg qtl sem]; }; qtpaint = derive2 { name="qtpaint"; version="0.9.1"; sha256="08x7qcxwkaclwv1p4s9a5k95x35hzp69whiihkakjv5blm83m3g9"; depends=[qtbase]; }; quRan = derive2 { name="quRan"; version="0.1.0"; sha256="108d797l9ggggc5b61pl7f6avzknmnnib2ys5vrg385zfbx9srvw"; depends=[]; }; quad = derive2 { name="quad"; version="1.0"; sha256="0fak12l19f260k0ygh6zimx8dabzsv7a9i2njw8hnfcs3ndffhv5"; depends=[PearsonDS]; }; quadmatrix = derive2 { name="quadmatrix"; version="0.1.0"; sha256="0nngrvvbalmrr6g9bq9f5qrllvwfq5p1b9yhs4zb098s3wga8jms"; depends=[geigen matrixcalc]; }; - quadmesh = derive2 { name="quadmesh"; version="0.4.0"; sha256="196p1qiis1hbs8yxd5570cqln0zcp3ngbajf3rsc0rwgjzqgm3wv"; depends=[geometry gridBase png raster reproj scales sp viridis]; }; + quadmesh = derive2 { name="quadmesh"; version="0.4.5"; sha256="0wppxi8g3dq7x4f6dsv7843fhdb43rx45lky4aanqa2im81qa7l8"; depends=[geometry gridBase png raster reproj scales sp viridis]; }; quadprog = derive2 { name="quadprog"; version="1.5-8"; sha256="1ka9g8zak8sg4y2xbz93dfrldznlk9qpd4pq9z21cdcdn3b8s4i2"; depends=[]; }; quadprogXT = derive2 { name="quadprogXT"; version="0.0.5"; sha256="1yna2kx9pr58vyy6f4mwx4a6avjz84wwhcary88v1k0ihhv9swcz"; depends=[quadprog]; }; quadrupen = derive2 { name="quadrupen"; version="0.2-7"; sha256="05yn9cnnc1481k8yqc6dg5hcv0ll4v3h2yw3qyaarwhgyxiips11"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; }; @@ -12136,22 +12295,24 @@ in with self; { qualityTools = derive2 { name="qualityTools"; version="1.55"; sha256="1c2p78dhwqvzb2k01dvwb41a6hlr2iwpw6fv91036x30rphjzb88"; depends=[MASS Rsolnp]; }; qualmap = derive2 { name="qualmap"; version="0.1.1"; sha256="1z085zyqxnizpx4y1891shhijs2a9gg5ap800ryvfxncg6gk35wa"; depends=[dplyr glue leaflet purrr rlang sf]; }; qualpalr = derive2 { name="qualpalr"; version="0.4.3"; sha256="1hlssqj2129796d00gnip3ih5b705qasw0hkj25xfz7xak0vdbkm"; depends=[assertthat randtoolbox Rcpp RcppArmadillo RcppParallel]; }; - qualtRics = derive2 { name="qualtRics"; version="3.1.1"; sha256="092f8d59g5b5619q6v4vkpjw8za5rrmhv805xg95m3z0xcscg1rl"; depends=[assertthat dplyr httr jsonlite purrr readr rlang sjlabelled stringr tibble yaml]; }; + qualtRics = derive2 { name="qualtRics"; version="3.1.2"; sha256="18pl7ni5m0xb1rkpw118cxcbhbwqqvq4cm4wx1jddknn4kx7cjbx"; depends=[assertthat dplyr httr jsonlite purrr readr rlang sjlabelled stringr tibble]; }; qualvar = derive2 { name="qualvar"; version="0.2.0"; sha256="1c7b7lcyq2l46sslk185r6xfh5fb35z9qihrhnh294sw1k52bffa"; depends=[]; }; qualypsoss = derive2 { name="qualypsoss"; version="1.0.0"; sha256="1pvf9b9yw8317wnh1x1jkmwl4cl0r9q7npfw0xzgbs8mfpl9j2ah"; depends=[doParallel foreach MASS mvtnorm]; }; quantable = derive2 { name="quantable"; version="0.3.6"; sha256="15q4phc2j7aihl8f4qzpdwxcvshq2cfzkfcxc8k4qypsxk9a00sb"; depends=[caret dplyr e1071 ggplot2 ggrepel gplots Matrix plyr pROC RColorBrewer readr reshape2 rlang scales stringr tibble tidyr]; }; - quanteda = derive2 { name="quanteda"; version="1.5.2"; sha256="0iv25rpx5cl9ansazjs0qb97pniajrxf4mqsnb5q98y2hil9ipd3"; depends=[data_table extrafont fastmatch ggplot2 ggrepel lubridate magrittr Matrix network proxyC Rcpp RcppArmadillo RcppParallel RSpectra sna SnowballC spacyr stopwords stringi xml2 yaml]; }; + quanteda = derive2 { name="quanteda"; version="2.0.1"; sha256="0pym6vdzqbkyj87m3pla229092xvvx4j830x67qflxzzdmc9dzhz"; depends=[data_table extrafont fastmatch ggplot2 ggrepel jsonlite magrittr Matrix network proxyC Rcpp RcppArmadillo RcppParallel sna SnowballC stopwords stringi xml2 yaml]; }; + quanteda_textmodels = derive2 { name="quanteda.textmodels"; version="0.9.1"; sha256="04c43hk6yx06m11s01aw0sqjd2yip7l7wzlbif600hvwxgs74knn"; depends=[ggplot2 LiblineaR Matrix quanteda Rcpp RcppArmadillo RcppParallel RSpectra RSSL SparseM stringi]; }; quantification = derive2 { name="quantification"; version="0.2.0"; sha256="116cp88q9cmizxc2a8lsysa1vwyp1y86457fx5qkq5dcm4g721g8"; depends=[car]; }; quantileDA = derive2 { name="quantileDA"; version="1.1"; sha256="0jbklxsy33j7clcw97qq4ijwkrb94v2m11gjcfa38vplfxm9913q"; depends=[]; }; quantities = derive2 { name="quantities"; version="0.1.3"; sha256="0crcwcr53bpqj07q5hvqkpq1sg9ikwz3nig2ifshqq5g2a3m57qs"; depends=[errors Rcpp units]; }; - quantmod = derive2 { name="quantmod"; version="0.4-15"; sha256="0lyzaf5ypk93v6zj9gdghy05cc7cxgn9yasv1apx5r6qsjcfgwky"; depends=[curl TTR xts zoo]; }; + quantkriging = derive2 { name="quantkriging"; version="0.1.0"; sha256="0v6kckgzhgsn3158sc06xszdhmk8sfny10j1qyppxsl2hk89n8jf"; depends=[ggplot2 hetGP Matrix reshape2]; }; + quantmod = derive2 { name="quantmod"; version="0.4.17"; sha256="1ss441rwlr88kz212m0wgx0hwgwi41rhy1jncg2lgqzqfvr5dzqa"; depends=[curl TTR xts zoo]; }; quantoptr = derive2 { name="quantoptr"; version="0.1.3"; sha256="0f9vy9yhya4wpya8n345s6n7a5sb29chdkl5fz6dwa31lp1mvvj3"; depends=[quantreg Rdpack rgenoud stringr]; }; - quantreg = derive2 { name="quantreg"; version="5.54"; sha256="19nh79qrkb75q348nk148l8wqjwnq5jgq29wpzqym5cfv1kjqfvh"; depends=[Matrix MatrixModels SparseM]; }; + quantreg = derive2 { name="quantreg"; version="5.55"; sha256="1zjc8p95kb0ypxa6nxp0lkdq8armkjmmhf8484m25n5f14a59qfb"; depends=[Matrix MatrixModels SparseM]; }; quantreg_nonpar = derive2 { name="quantreg.nonpar"; version="1.0"; sha256="1f9120awnkwsgdiqg98lg7xs5l4y80930869x6k9q76595r5m92k"; depends=[fda mnormt quantreg Rearrangement]; }; quantregForest = derive2 { name="quantregForest"; version="1.3-7"; sha256="0lk7r02i6zpx9sdl2rp0r7fc3a84s8qhg49nh2x7k3vxwa095pjz"; depends=[randomForest RColorBrewer]; }; quantregGrowth = derive2 { name="quantregGrowth"; version="0.4-3"; sha256="0q2yk51hcn7jnvh14nxa7szfj4pr9grh5rdfwazaziilbwqdmw4f"; depends=[quantreg]; }; quantregRanger = derive2 { name="quantregRanger"; version="1.0"; sha256="1a9q2prr790bpw6s0y5ni5ppd3vqkjr0v4nqp6ywcj5n3sk69pvx"; depends=[ranger Rcpp]; }; - quantspec = derive2 { name="quantspec"; version="1.2-1"; sha256="0kvwifdwy3big0lls5h3wcb48v3jvlfp1l0zjd07jnvj43zj3ysd"; depends=[abind quantreg Rcpp snowfall zoo]; }; + quantspec = derive2 { name="quantspec"; version="1.2-2"; sha256="1mn5r575hdffy1znd98njrms2pz84z8k4bv6qmbwgqwvh8pn10rg"; depends=[abind quantreg Rcpp snowfall zoo]; }; quarrint = derive2 { name="quarrint"; version="1.0.0"; sha256="13fdmmrgn23xd9vpywmcl7pf729gmcxjfl1wxs30axsbp4h1s6rk"; depends=[neuralnet]; }; queryparser = derive2 { name="queryparser"; version="0.2.0"; sha256="1fsp64rm4jch2jjw7czw9qmwb4f3s46avbf3z3gpvcfdq4aw65kb"; depends=[]; }; questionr = derive2 { name="questionr"; version="0.7.0"; sha256="1cschww3g2jhrfh87bxcaaig84yr0zcj0virmpx033yal606hmn4"; depends=[classInt highr htmltools labelled miniUI rstudioapi shiny]; }; @@ -12171,17 +12332,18 @@ in with self; { quokar = derive2 { name="quokar"; version="0.1.0"; sha256="1qnl3x1aa665xpyb3ac07xrnnjdwbmj645p103144k5is5b8likc"; depends=[ald ALDqr bayesQR dplyr ggplot2 GIGrvg gridExtra knitr magrittr MCMCpack purrr quantreg robustbase tidyr]; }; quotedargs = derive2 { name="quotedargs"; version="0.1.3"; sha256="11cswg9bmddsl1axxcdz11flq46p1zkpv022526f2vgl4qsprwbm"; depends=[]; }; qut = derive2 { name="qut"; version="2.1"; sha256="1wkk4c4f10a1whrspr5yalp7flcxckzxlx187ymmpnz7qcncz619"; depends=[flare glmnet lars Matrix]; }; - qvcalc = derive2 { name="qvcalc"; version="1.0.1"; sha256="1wr5zivnfwscrzhw9myc5llpac0xjkz51s6hravjhflmp8s8lm7k"; depends=[]; }; + qvcalc = derive2 { name="qvcalc"; version="1.0.2"; sha256="0banzv78kb53ybfbh1hmgx7kxvpbbdxzg4dsn7vrwhmxs72srkch"; depends=[]; }; qwraps2 = derive2 { name="qwraps2"; version="0.4.2"; sha256="14h9xwv6x5lci17hg048a6n0cp3d2rif4v0g7dr05w504h157kw9"; depends=[dplyr ggplot2 knitr magrittr Rcpp RcppArmadillo rlang tidyr]; }; r_blip = derive2 { name="r.blip"; version="1.1"; sha256="1p33g6i6fq9c27d5ix9nd8prv90i4hrf91x34bldlw8041sjqxm0"; depends=[bnlearn foreign]; }; - r_jive = derive2 { name="r.jive"; version="2.1"; sha256="0l0bhhp6bdc84pzxi7gnsxx3scycw0zahrnc496wx3j43np9hlsg"; depends=[abind gplots SpatioTemporal]; }; r2d2 = derive2 { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; }; r2d3 = derive2 { name="r2d3"; version="0.2.3"; sha256="0v612mbzdjr8cq1ffall9hagbwxfv7fh963x8f0w5r84v1m3y2bl"; depends=[htmltools htmlwidgets jsonlite rstudioapi]; }; r2dRue = derive2 { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[matrixStats rgdal sp]; }; + r2dii_data = derive2 { name="r2dii.data"; version="0.0.3"; sha256="0vsl1kpprvy0q6yr0ky132qnjdgc8j6pjkwzy8r4g5igqbp07d4d"; depends=[]; }; + r2dii_match = derive2 { name="r2dii.match"; version="0.0.1"; sha256="0qk0yxqhyw4xxllbm62ayzphh6zg0gswyzm2wn6y4qqds9k70v3r"; depends=[dplyr glue magrittr purrr r2dii_data rlang stringdist stringi tibble tidyr tidyselect]; }; r2glmm = derive2 { name="r2glmm"; version="0.1.2"; sha256="0iim92blpa59vgz97c2pi05yhbjjmaffdbkbmk5kplfb2vmazgiy"; depends=[afex data_table dplyr ggplot2 gridExtra lmerTest MASS Matrix mgcv pbkrtest]; }; - r2pmml = derive2 { name="r2pmml"; version="0.23.0"; sha256="1md7fzx7yc6b3plflcq4c109v2plhvb1a6dg628bhyiicjs1s83c"; depends=[]; }; - r2stl = derive2 { name="r2stl"; version="1.0.0"; sha256="18lvnxr40cm450s8qh09c3cnkl1hg83jhmv1gzsv6nkjrq4mj5wh"; depends=[]; }; - r2sundials = derive2 { name="r2sundials"; version="5.0.0-4"; sha256="1zwwrphix4smvxmb93ni1lb1vz0j9r3j3fr3n0b29y8z6lvk1q9k"; depends=[Rcpp RcppArmadillo rmumps]; }; + r2pmml = derive2 { name="r2pmml"; version="0.24.0"; sha256="0fl2kh1b7rvghschadsdp12za0r16xpak29f0w7dh38i5sw5scrk"; depends=[]; }; + r2rtf = derive2 { name="r2rtf"; version="0.1.1"; sha256="04612jnmqrdl3ps66zxj515fbnvaxzcw8bl9dg2gjqh7lr23a0dj"; depends=[stringr]; }; + r2sundials = derive2 { name="r2sundials"; version="5.0.0-7"; sha256="11l8z7h0gm71yqns2blrd26p084gcdc4x1xwv0knp8830xqjdsmw"; depends=[Rcpp RcppArmadillo rmumps]; }; r4lineups = derive2 { name="r4lineups"; version="0.1.1"; sha256="1p0dnrp21zx1l9lqx01jnq54d5ppb8siibv47i4gsp7c7db9ymxc"; depends=[boot dplyr ggplot2 ggrepel here magick magrittr pROC psych purrr]; }; r4ss = derive2 { name="r4ss"; version="1.36.1"; sha256="03xin7avdbg5ayrcdbw5rx9sh6ingjq2kv3405h01vqf1jhkfsxk"; depends=[coda corpcor gdata gplots gtools kableExtra pso truncnorm]; }; r511 = derive2 { name="r511"; version="0.1.1"; sha256="1njsnjf0746cv6x7fznq4cg556fczqcfawwb869r3w9zv0zj1iy9"; depends=[assertthat dplyr httr tibble xml2]; }; @@ -12197,21 +12359,18 @@ in with self; { rCBA = derive2 { name="rCBA"; version="0.4.3"; sha256="10rc08gwsf15f4lci8bbgwpwj8n7k1m23hxk633v68g9amla5nvx"; depends=[arules R_utils rJava TunePareto]; }; rCMA = derive2 { name="rCMA"; version="1.1"; sha256="0dswshg80hbgcib5x9w791sh71q5s4435q8sm9dh170v4ngbax0w"; depends=[]; }; rCRM = derive2 { name="rCRM"; version="0.1"; sha256="01xxkrwd0iwhmq8dshgbn84qi6kky757y01alqrk0pkq2n8ghms4"; depends=[Rcpp RcppEigen]; }; - rCUR = derive2 { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[lattice MASS Matrix]; }; - rCarto = derive2 { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[classInt maptools RColorBrewer]; }; rChoiceDialogs = derive2 { name="rChoiceDialogs"; version="1.0.6"; sha256="0lp8amdalirpsba44aa3r31xnhmi36qb9qf8f8gdxxbarpgprsbi"; depends=[rJava]; }; rClinicalCodes = derive2 { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[RCurl rjson stringr tm XML]; }; - rDEA = derive2 { name="rDEA"; version="1.2-5"; sha256="1wsi2dkq9izvbhdqmd4qk8i277r1j38dk59fcmnxnwqvk6ar6nrb"; depends=[maxLik slam truncnorm truncreg]; }; + rDEA = derive2 { name="rDEA"; version="1.2-6"; sha256="0045crn7azsy3ggzr28vw5jd4f5aw5nj16cjnjxy2md3skfbc3zw"; depends=[maxLik slam truncnorm truncreg]; }; rDNAse = derive2 { name="rDNAse"; version="1.1-1"; sha256="0cl51q61kwvdsm5f49cjjbzggqam1fnr6gp15cmy6m2yahyxg1lk"; depends=[]; }; rDecode = derive2 { name="rDecode"; version="0.1.0"; sha256="1d0rrhycw9anhvx6czz7axkzhzqprdgi9sqfglmc962zf1x3hmn2"; depends=[]; }; rDotNet = derive2 { name="rDotNet"; version="0.9.1"; sha256="18cd5373pdfi1x958llb4cgjqdi1fb7h7m5nkdwcd4xw9hxhinzd"; depends=[Rcpp testthat]; }; rEMM = derive2 { name="rEMM"; version="1.0-11"; sha256="0ynjn10gcmxs8qnh6idb34ppmki91l8sl720x70xkzcqpahy0nic"; depends=[cluster clusterGeneration igraph MASS proxy]; }; rENA = derive2 { name="rENA"; version="0.2.0.1"; sha256="0sljnrhc710xbcdbsjx1rqrivbklgcnh7l4nqpnxdknvrxz6ky5y"; depends=[data_table doParallel foreach magrittr plotly R6 Rcpp RcppArmadillo scales]; }; - rERR = derive2 { name="rERR"; version="0.1"; sha256="1ymf0v3r2sv9m72c19csk38fy5kmld3i18jh06rir5kxkb5l245p"; depends=[dplyr ggplot2 numDeriv plyr reshape2 survival]; }; rFDSN = derive2 { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; }; - rFIA = derive2 { name="rFIA"; version="0.2.0"; sha256="092h380z1rjwyf3s070icpcw10xnsjk6hk3phpbl7kxhx215bdjb"; depends=[bit64 data_table dplyr gganimate ggplot2 progress sf sp stringr tidyr]; }; - rFSA = derive2 { name="rFSA"; version="0.9.1"; sha256="14qpxmzy4vy1fydn8yqh1001mqrgv1i67ai42w61dkk0d4m75z60"; depends=[hashmap tibble]; }; + rFIA = derive2 { name="rFIA"; version="0.2.1"; sha256="1jg44m2m04s5pk5nkqk0hkz2rn96b8ys9j8dzby3qj0f1bx2bixs"; depends=[bit64 data_table dplyr gganimate ggplot2 progress sf sp stringr tidyr]; }; rFerns = derive2 { name="rFerns"; version="3.0.0"; sha256="0z12201y1b9d3rd02k4y64hpnlrgkg7pi1jpzsh1br4pchdf7rrm"; depends=[]; }; + rGEDI = derive2 { name="rGEDI"; version="0.1.6"; sha256="0w046fszs8738h378rp2wnm9jk9q5w1grwkhv9s9hfvs7phciypz"; depends=[bit64 curl data_table fs getPass ggplot2 hdf5r jsonlite lazyeval raster RColorBrewer sp]; }; rGammaGamma = derive2 { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; }; rGoodData = derive2 { name="rGoodData"; version="0.1.1"; sha256="092sgy6y3dkyr32hrir4jvjwh7n6gfvv9z7i631fipg59255g0zy"; depends=[data_table httr jsonlite]; }; rGroovy = derive2 { name="rGroovy"; version="1.3"; sha256="172vm4diygzi4ipmw8bl03k0x3aps0h1vkvwvw539kamy7xb5w98"; depends=[rJava]; }; @@ -12221,8 +12380,7 @@ in with self; { rIntervalTree = derive2 { name="rIntervalTree"; version="0.1.0"; sha256="0xd6wcra4zvphfgnz1rnnslx96p840zlgms367370xm4hyg6d37x"; depends=[]; }; rIsing = derive2 { name="rIsing"; version="0.1.0"; sha256="1208lwfk9j8gghj8xf6i8v6s18h89ydqsd4jq3r88n403yzbzzck"; depends=[data_table Rcpp RcppEigen]; }; rJPSGCS = derive2 { name="rJPSGCS"; version="0.2-10"; sha256="0a00s10yp22fkvk67dkq43sbphcqla65x9j4qpv076bmdchn7arw"; depends=[chopsticks rJava]; }; - rJST = derive2 { name="rJST"; version="1.1"; sha256="1a3rpj66sncawwa0hi0w6066h188hl5ssdqqgn1jnn4l7bax156j"; depends=[magrittr quanteda Rcpp RcppArmadillo RcppProgress reshape2 SnowballC]; }; - rJava = derive2 { name="rJava"; version="0.9-11"; sha256="0s9cjy1wh7snmbqwznh8f1r4ipylr7mgda4a979z963a8lqy32n2"; depends=[]; }; + rJava = derive2 { name="rJava"; version="0.9-12"; sha256="03vv0pj6san03c51iyqsyb1rwh3097dfpl2s8iswzzmc7k3shj12"; depends=[]; }; rJython = derive2 { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; }; rKIN = derive2 { name="rKIN"; version="0.1"; sha256="1j6fdi5h869q4d1hq6ha6qyhisa0zk2qmhjrc4ahl9991d680dyn"; depends=[ggplot2 maptools MASS rgeos sp]; }; rLDCP = derive2 { name="rLDCP"; version="1.0.2"; sha256="0k7zc1xyqmcl7070hhpqw1d2k1ij6bd4wjym8cw263pds2n7nx21"; depends=[XML]; }; @@ -12232,68 +12390,66 @@ in with self; { rLindo = derive2 { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; }; rMEA = derive2 { name="rMEA"; version="1.1.0"; sha256="1aarnik0qjxg6h55xpskx1dwkp78nfdyrwpy9r6ffyxhz9jbplnj"; depends=[]; }; rMR = derive2 { name="rMR"; version="1.1.0"; sha256="0da1hclfnnlkp9by6zf2p079643p8nimplr9p3ipbjdy739j344z"; depends=[biglm]; }; - rMVP = derive2 { name="rMVP"; version="0.99.17"; sha256="1ddnvpi5m3z52z0prcsi9bd2cp2axgl7nry50rmgxjfv7nal61bl"; depends=[BH bigmemory MASS Rcpp RcppArmadillo RcppEigen RcppProgress]; }; - rMouse = derive2 { name="rMouse"; version="0.1"; sha256="0pzxasap5kwxqq36mb4zi139jllsl4vk06dw2pv9xnwdxiszr3gp"; depends=[rJava]; }; + rModeling = derive2 { name="rModeling"; version="0.0.3"; sha256="0xrjxayp59f31wwcqqkzs5my2j2lpbv1f4pp709fmqxz02vbdzhv"; depends=[caret e1071 MASS]; }; rNMF = derive2 { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[knitr nnls]; }; - rNOMADS = derive2 { name="rNOMADS"; version="2.4.1"; sha256="0qag0riwkrzgybwfbhpkapjcf7ccqrqa4j8zqh3xx0548k8mm37l"; depends=[fields GEOmap MBA RCurl rvest stringr uuid XML]; }; + rNOMADS = derive2 { name="rNOMADS"; version="2.4.2"; sha256="0mir7b2693s27gll5j6fsgy7wq0fg48ddx6h78j7cgg7md75756f"; depends=[fields GEOmap MBA RCurl rvest stringr uuid XML]; }; + rNeighborGWAS = derive2 { name="rNeighborGWAS"; version="1.0.0"; sha256="13yhc279w5ds908bjplpqxf63db7hlp2dgnj8307ds4wkw6w1mbk"; depends=[gaston Matrix RcppParallel]; }; rODE = derive2 { name="rODE"; version="0.99.6"; sha256="0l518ghfw6283kckqcbh45a35vd73njy05v3dwghhhjdj7v3km8b"; depends=[data_table]; }; rPACI = derive2 { name="rPACI"; version="0.1.1"; sha256="0skpv7h91vfr8xkx0ic8yz7hcj1bbwd1f80sa9p9jn2rpfpzalv9"; depends=[]; }; rPAex = derive2 { name="rPAex"; version="1.0.1"; sha256="1v85qy8fg6vf1fqqqawzw4i9sfaihdqzbs0h91hpqbzkc4v7n2bb"; depends=[agricolae raster]; }; rPackedBar = derive2 { name="rPackedBar"; version="0.2.2"; sha256="1nh0kvj4bqkinczj8llcgy63ibsnk9vgsvm0vqg8g526x0vffdma"; depends=[data_table plotly scales shiny]; }; rPowerSampleSize = derive2 { name="rPowerSampleSize"; version="1.0.2"; sha256="1insdfvcn1pirsnf7nwfia0kzgsmh2zpghgfj2yc35ld1r9j2hp2"; depends=[mvtnorm ssanv]; }; - rPraat = derive2 { name="rPraat"; version="1.3"; sha256="1ngd8q6jpzrn09042w68662hkx238ai96z9bfy0danvdii3xplyh"; depends=[dplyr dygraphs readr stringr tuneR]; }; + rPraat = derive2 { name="rPraat"; version="1.3.1"; sha256="01bz0ja35k8q3ncj9jaqbfh42sf5s73yrb6gsj11lapmfb3g8scf"; depends=[dplyr dygraphs readr stringr tuneR]; }; rPref = derive2 { name="rPref"; version="1.3"; sha256="0vlzhxhf2x6gw015sjfw2638wv6hckg068rpbzncp7wprn9msa6y"; depends=[dplyr igraph lazyeval Rcpp RcppParallel]; }; - rPython = derive2 { name="rPython"; version="0.0-6"; sha256="1aw9jn45mw891cskr51yil60i55xv5x6akjvfdsbb9nwgdwwrqdp"; depends=[RJSONIO]; }; - rQCC = derive2 { name="rQCC"; version="0.19.8.2"; sha256="091c53jggq3k9sf48pnds8s4kkqia6x268lbkb2fx88b408i0iny"; depends=[]; }; + rQCC = derive2 { name="rQCC"; version="1.20.3"; sha256="01gi447qwm6j682s7ka034g28k74l3fr9ijam6l9n0f228q930gp"; depends=[]; }; rRAP = derive2 { name="rRAP"; version="1.1"; sha256="1nzvs8bjkbjraa33azxf9mrxsxh87qhh3qlldrcs5y4fq4ancyqb"; depends=[lars lassoshooting MASS]; }; - rSEA = derive2 { name="rSEA"; version="2.1.0"; sha256="0zym2kg7vzi61xiglwr3dw5kvavjqcgjj56219aqyclkqrnf67rc"; depends=[hommel]; }; + rSCA = derive2 { name="rSCA"; version="3.1"; sha256="0dhd5325x05cbnw34mlipndw5xnncl9kj7kppb2s5bx2gllcdqqd"; depends=[]; }; + rSEA = derive2 { name="rSEA"; version="2.1.1"; sha256="18108ds65ykxygbw1s4i5rb1ngzwymv1x3dhcv1lcwkmqplnaar9"; depends=[ggplot2 hommel]; }; rSFA = derive2 { name="rSFA"; version="1.04"; sha256="0gd6ji1ynbb04rfv8jfdmp7dqnyz8pxcl5636fypd9a81fggl0gs"; depends=[MASS]; }; rSHAPE = derive2 { name="rSHAPE"; version="0.3.2"; sha256="0z6dizsxlkmaymbd24b1m1i8kmndcf21nxxnyfzq6gvdii7bal4h"; depends=[abind DBI doParallel evd foreach RSQLite sn VGAM]; }; - rSPARCS = derive2 { name="rSPARCS"; version="0.0.7"; sha256="0z9l7d03r5qxnnl9as2dl1z8r8a28qbwp8n69sxrnd7rffcwm17l"; depends=[data_table geosphere plyr raster sp spatialEco tigris]; }; - rSPDE = derive2 { name="rSPDE"; version="0.4.6"; sha256="1fdk7mhrkp5r7lr9rn9wz1rbxinrr8yvfcss9ky8namp7f65vwa1"; depends=[Matrix]; }; + rSPDE = derive2 { name="rSPDE"; version="0.4.8"; sha256="1m8ys6k3f1jy9iiby36sw0gvz282bhpzgnwa801hv59k411wrh2g"; depends=[Matrix]; }; rSQM = derive2 { name="rSQM"; version="1.3.14"; sha256="0m69n2pnfv2085dln6p149a5gw0gif9xk00xmad5s9j68hwjdmym"; depends=[dplyr EcoHydRology ggplot2 gsubfn mise ncdf4 qmap reshape2 stringr yaml zoo]; }; rSymPy = derive2 { name="rSymPy"; version="0.2-1.2"; sha256="0jdl8ss3dbgjqrmmppb0ix1gqk9g28pbh6w5sybil046ic83s13i"; depends=[rJython]; }; - rSymbiota = derive2 { name="rSymbiota"; version="1.0.0"; sha256="0dld8li5b8ylhdmll6iz5pk4pxh2dk37hbx0458jn0zhd4fl1cm7"; depends=[crayon dplyr ggplot2 Hmisc httr knitr magick maps mapview RCurl RSelenium rvest rworldmap sf sp stringr sys treemap XML xml2]; }; rTRNG = derive2 { name="rTRNG"; version="4.20-1"; sha256="0l0gs65rbl080f1l67xiygz551q5lj0q48nz8m6gsjfq5ias5gn6"; depends=[Rcpp RcppParallel]; }; rTableICC = derive2 { name="rTableICC"; version="1.0.7"; sha256="1z896675kmm9p5dnmcnsz2205ynf05laqcxvlc9y0g5i0x8rf8v6"; depends=[aster partitions]; }; - rTensor = derive2 { name="rTensor"; version="1.4"; sha256="08i94vvk5i25j40dwn497svgrmz90iwzp6qgiir37wgvx355xwzr"; depends=[]; }; + rTensor = derive2 { name="rTensor"; version="1.4.1"; sha256="1ir2zqs3bvcfi9xwhj1l29qhnh5qvagz9cpw99lb2w73i28x47vz"; depends=[]; }; rTephra = derive2 { name="rTephra"; version="0.1"; sha256="045f2sp2j4hiwa9k1vs6cxr59x1yr34jq1z2crasxflsxbwa3xz8"; depends=[]; }; rTorch = derive2 { name="rTorch"; version="0.0.3"; sha256="1v7zvjkbllcjria7slv958bpwv1r0p3li2i8wq55hgm7g7iyfz1j"; depends=[data_table jsonlite logging R6 reticulate rstudioapi]; }; rUnemploymentData = derive2 { name="rUnemploymentData"; version="1.1.0"; sha256="0p5hba8iv060szp23s05hvpmwan518ykakm6vqzdcki0inxw0hyv"; depends=[choroplethr rvest stringr]; }; rWBclimate = derive2 { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr jsonlite plyr reshape2 rgdal sp]; }; - rWind = derive2 { name="rWind"; version="1.1.3"; sha256="1q9f7mrjks7nb9lgkmi6w774dz479d2hhzhns0v0mrllmv9nck1s"; depends=[gdistance lubridate Matrix raster]; }; + rWind = derive2 { name="rWind"; version="1.1.5"; sha256="1fdnbh6yprgbysv6j6i108q9z6b7r17kb2hg4i4sa97c2jlcb39s"; depends=[gdistance lubridate Matrix raster]; }; rWishart = derive2 { name="rWishart"; version="0.1.2"; sha256="0wzijc454mrvmggb7a5jqwjbmk0kzr4bmy0iwniz5cn343pr1rri"; depends=[lazyeval MASS Matrix]; }; rYoutheria = derive2 { name="rYoutheria"; version="1.0.3"; sha256="1r63ggy4knwzxnpjkmsn7zwmwfaznm8mmxl7r9ph10wz4sblgygl"; depends=[plyr RCurl reshape2 RJSONIO]; }; - rabhit = derive2 { name="rabhit"; version="0.1.1"; sha256="010ayd8hyk02gwpnpa06n2rymxl1hy3j4jm5cn4x2xl3mj2kzg8h"; depends=[alakazam cowplot data_table dendextend dplyr ggdendro ggplot2 gridExtra gtable gtools htmlwidgets plotly RColorBrewer reshape2 rlang stringi tidyr tigger]; }; + rabhit = derive2 { name="rabhit"; version="0.1.4"; sha256="1r02brl2ca33ccd2b3dhf1zfx9zg0vqsvnqlbvd68mqgl74xqlbl"; depends=[alakazam cowplot data_table dendextend dplyr fastmatch ggdendro ggplot2 gridExtra gtable gtools htmlwidgets plotly RColorBrewer reshape2 rlang splitstackshape stringi tidyr tigger]; }; rabi = derive2 { name="rabi"; version="1.0.2"; sha256="0jndx1gvsnsv1xrx3ismgvjp7d4kj3436zcawvw32c5klvxx0y4j"; depends=[numbers polynom shiny stringdist]; }; - raceland = derive2 { name="raceland"; version="1.0.3"; sha256="0gd5x3k1mdk6s1svgv9vgy2bzml6qg74rfr6p009g2bkbxpcjydy"; depends=[comat fasterize plotwidgets raster Rcpp RcppArmadillo sf]; }; + raceland = derive2 { name="raceland"; version="1.0.8"; sha256="0f12z0g27wrk9mq3vh0qqcjp4qh882853h6ps1iaspwajkb22f3k"; depends=[comat fasterize plotwidgets raster Rcpp RcppArmadillo rgdal sf]; }; radar = derive2 { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; }; radarBoxplot = derive2 { name="radarBoxplot"; version="1.0.0"; sha256="16s38yy984mb1hmsdw17z4nk2z4xg03xi0yrp7445yqv3fs1fghl"; depends=[]; }; radarchart = derive2 { name="radarchart"; version="0.3.1"; sha256="0gcxnbgj8ja1m4wzhbjy67m6zphf0c5ni9yx7sr7f0abm03ry753"; depends=[htmltools htmlwidgets]; }; - radiant = derive2 { name="radiant"; version="0.9.9.1"; sha256="18zj6lbs04vqslm4zgga6fvm868a0m55sk45kj5vl46jadb6a52f"; depends=[r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; }; - radiant_basics = derive2 { name="radiant.basics"; version="1.0.0"; sha256="188dzsr8lwbam9hvvwqgcf08aj4ja04fvfcw315g4jy1nbhbvg33"; depends=[dplyr ggplot2 gridExtra magrittr psych r_import radiant_data scales shiny tidyr]; }; - radiant_data = derive2 { name="radiant.data"; version="1.0.6"; sha256="08x7zasxf429m021482p86lx3zc6dqz2mih0id8s34isg4gafapg"; depends=[base64enc broom car curl dplyr DT ggplot2 glue gridExtra jsonlite knitr lubridate magrittr markdown plotly psych r_import readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce shinyFiles stringi tibble tidyr writexl]; }; - radiant_design = derive2 { name="radiant.design"; version="0.9.9"; sha256="1d5ds24b7mp8xad5pgzvjr17akr7p8m6w0ryd5fkwylnfgnhznrb"; depends=[AlgDesign dplyr mvtnorm polycor pwr r_import radiant_data shiny]; }; - radiant_model = derive2 { name="radiant.model"; version="1.0.0"; sha256="14zk2yl40694kyri5wr7czc2ymwqa68n7jzk6j1a28l7cbgs8xfx"; depends=[car data_tree DiagrammeR dplyr e1071 ggplot2 gridExtra lubridate magrittr NeuralNetTools nnet psych r_import radiant_basics radiant_data rlang rpart sandwich shiny stringr tidyr yaml]; }; - radiant_multivariate = derive2 { name="radiant.multivariate"; version="0.9.9.1"; sha256="154q06vbj13y15rz2apvy521gda8jh66yhr87kqvlv9mh2k9ws2h"; depends=[car dplyr ggplot2 ggrepel Gmedian GPArotation gridExtra magrittr MASS psych r_import radiant_data radiant_model rlang scales shiny]; }; + radiant = derive2 { name="radiant"; version="1.3.2"; sha256="02qc7s64ryfn0l88kfj61kdnrg8gl6dmrxzscgqh85fc1yaipjcf"; depends=[r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; }; + radiant_basics = derive2 { name="radiant.basics"; version="1.3.4"; sha256="0y4s3zhphkaxlgwmiz96nwxq1s87i2i1mnph062xghlm7x92bwc3"; depends=[dplyr ggplot2 lubridate magrittr patchwork polycor psych r_import radiant_data scales shiny tidyr]; }; + radiant_data = derive2 { name="radiant.data"; version="1.3.4"; sha256="19sjjb49inrfl7jzq4zpwhdslni0zrp30bl58pisin29ka3ylpzs"; depends=[base64enc broom car curl dplyr DT ggplot2 glue jsonlite knitr lubridate magrittr markdown MASS patchwork plotly psych r_import randomizr readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce shinyFiles stringi tibble tidyr writexl]; }; + radiant_design = derive2 { name="radiant.design"; version="1.3.5"; sha256="1514s21jybyvpi2sx06xsxfrzgg07x7xxhwsazc61v3w1mllj2xw"; depends=[AlgDesign dplyr magrittr mvtnorm polycor pwr r_import radiant_data randomizr shiny]; }; + radiant_model = derive2 { name="radiant.model"; version="1.3.10"; sha256="1i9l819n8xlx9dzw9hdrpl9bfar22ly5dpqlywciffi4p08p3lrl"; depends=[broom car data_tree DiagrammeR dplyr e1071 ggplot2 ggrepel lubridate magrittr NeuralNetTools nnet patchwork pdp psych r_import radiant_basics radiant_data ranger rlang rpart sandwich shiny stringr tidyr xgboost yaml]; }; + radiant_multivariate = derive2 { name="radiant.multivariate"; version="1.3.5"; sha256="1khgy3zj0q155dyky1bd2wfdj6r8jgw8aa6a2nj0rbnwa5zam913"; depends=[car clustMixType dplyr ggplot2 ggrepel gower GPArotation lubridate magrittr MASS patchwork polycor psych r_import radiant_data radiant_model rlang scales shiny]; }; radiomics = derive2 { name="radiomics"; version="0.1.3"; sha256="1ra94yaqw88slznhyv70kbfricxi44m4pnx1zh4ijghm491rphr5"; depends=[Rcpp reshape2 spatstat]; }; radir = derive2 { name="radir"; version="1.0.4"; sha256="12a99ig3n6kp5wa5rjp2w1nal4qqjs6vq05d3lrqcyl3bind6lqb"; depends=[hermite]; }; radix = derive2 { name="radix"; version="0.6"; sha256="0290n0yax8649srdjbq4439h0d9f6jsmxayyhp86igcnszcxilnb"; depends=[base64enc bookdown digest downloader htmltools jsonlite knitr lubridate mime png progress rmarkdown rprojroot rstudioapi stringr whisker xfun xml2 yaml]; }; - radjust = derive2 { name="radjust"; version="0.1.0"; sha256="0krryhqid16a6jfb007n0k6rc8r7c808h859a9pjid2jbkg0bm7l"; depends=[]; }; radlibs = derive2 { name="radlibs"; version="0.1.0"; sha256="1yyd63shc35mdixkz8gigwqb9g2l1baxgmzijhshpqavixdhazmk"; depends=[data_table lexicon stringr]; }; radmixture = derive2 { name="radmixture"; version="0.0.1"; sha256="0rs60xjd43lg5c9972qhpg6bsqfg2578qvrz7gz3bdip10jb1ryj"; depends=[magrittr MCMCpack plyr quadprog]; }; - radsafer = derive2 { name="radsafer"; version="2.1.0"; sha256="01xsrl39rv8jjm7rkqy24q6p92i4axyia6gn4d174c18kavz1rj1"; depends=[dplyr ggplot2 magrittr RadData readr rlang stringr]; }; + radsafer = derive2 { name="radsafer"; version="2.2.0"; sha256="0xkmyxw2lslgy22rnb1ll4zw4h06p4ldvaavvwnzy8l7mzqlr6in"; depends=[dplyr ggplot2 ggthemes magrittr RadData readr rlang stringr]; }; rafalib = derive2 { name="rafalib"; version="1.0.0"; sha256="1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k"; depends=[RColorBrewer]; }; - ragg = derive2 { name="ragg"; version="0.1.3"; sha256="116dmzy81y3r4jpbv7gqx76y33rgrsdzklr0vhblzsph52a59i7m"; depends=[systemfonts]; }; + ragg = derive2 { name="ragg"; version="0.1.5"; sha256="1fqklwwmaf3vyj87kir46bpa9cv1fwyw3amgayh0zcdjfrk6flww"; depends=[systemfonts]; }; rags2ridges = derive2 { name="rags2ridges"; version="2.2.2"; sha256="1xayfj9ac1czl6pipfnr3a3r0jrdfvsqiksf9w4blavpp9xv9dbp"; depends=[expm fdrtool ggplot2 graph gRbase Hmisc igraph RBGL Rcpp RcppArmadillo reshape RSpectra sfsmisc snowfall]; }; - ragt2ridges = derive2 { name="ragt2ridges"; version="0.3.3"; sha256="1vk1pvfbf0b59wkvwj33y80wlvvqmqc0k6l64li7avig1im3n088"; depends=[abind expm fdrtool igraph MASS Matrix mvtnorm rags2ridges Rcpp RcppArmadillo]; }; - ragtop = derive2 { name="ragtop"; version="1.1.0"; sha256="1gz4hdfb4yxjqcmclxw2yacpk0km29n3gfpqkcj48wr1s6vv7djb"; depends=[futile_logger limSolve]; }; + ragt2ridges = derive2 { name="ragt2ridges"; version="0.3.4"; sha256="17i3z0p3a4dqa0bch5l1r830w5nlxhdg71y82jipp6cfiwli588z"; depends=[abind Biobase CGHbase expm fdrtool igraph MASS Matrix mvtnorm rags2ridges Rcpp RcppArmadillo]; }; + ragtop = derive2 { name="ragtop"; version="1.1.1"; sha256="0vgc2q71g8ysccq19kbk9a4swxgd5qj91xm4bshfgdg5chxqnb50"; depends=[futile_logger limSolve]; }; rai = derive2 { name="rai"; version="1.0.0"; sha256="0qimfzchbrarkwmv3mxxbdgvqzk16sc8m1h140zm0cnfgr2pvi5p"; depends=[dplyr ggplot2 readr rlang]; }; rainbow = derive2 { name="rainbow"; version="3.6"; sha256="11vfcck17d2xjc049ci5i8l1nqv345anmd110gdz7654i1pj9lb3"; depends=[cluster colorspace hdrcde ks MASS pcaPP]; }; - raincpc = derive2 { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rarjh0ncm5dhm0mmpsf2ycqlvp0qld10i"; depends=[SDMTools]; }; + raincpc = derive2 { name="raincpc"; version="1.1.0"; sha256="1f59z989q0ipwnkxwiwqj9m6v37qli6c5f1ks5kml5ndpmjxf1h1"; depends=[raster]; }; + rainette = derive2 { name="rainette"; version="0.1"; sha256="0rchm02bzahmwa11riyypfgb72dz5003y9zsyfknin0ckvqycysv"; depends=[dendextend dplyr formatR future future_apply ggplot2 ggwordcloud gridExtra highr miniUI progressr purrr quanteda RColorBrewer Rcpp rlang RSpectra shiny stringr tidyr]; }; rainfarmr = derive2 { name="rainfarmr"; version="0.1"; sha256="1gasnmyjnis6vv0krx6299ck2a6v9v1fgqajzqdpjaz2fsxn245i"; depends=[]; }; rakeR = derive2 { name="rakeR"; version="0.2.1"; sha256="0cd89q6k0y9z1qk9k06iw56lhj4c52ckr0g4qv6q95lkyrbi3qg8"; depends=[ipfp wrswoR]; }; - ralger = derive2 { name="ralger"; version="1.0.0"; sha256="069cnlxj7kclw84wsx9mcrs7zhxzsg1983vi78c0zksii6q8lbqa"; depends=[dplyr magrittr rvest stringr testthat tidyr xml2]; }; + ralger = derive2 { name="ralger"; version="2.0.0"; sha256="05hcrly7wf5bmfi14ji791vbix8q4fsl13la6yi7zjzwh1hd55sd"; depends=[crayon dplyr magrittr purrr robotstxt rvest stringr testthat tidyr xml2]; }; ramchoice = derive2 { name="ramchoice"; version="1.1"; sha256="1im9r95109919hfmici6avdqxh3a375wmg2lfy75z1gjivvcygbr"; depends=[MASS]; }; ramcmc = derive2 { name="ramcmc"; version="0.1.0-1"; sha256="0x8q0bah8fcyqlwap9iw52xhl6b989va5c144kgmfimh2b4yinc7"; depends=[Rcpp RcppArmadillo]; }; ramify = derive2 { name="ramify"; version="0.3.3"; sha256="0cxmkxhshg0vrcxai2gbm4iih04f44liv5nh5jiq85hjz8qbhdi2"; depends=[]; }; @@ -12323,40 +12479,41 @@ in with self; { randquotes = derive2 { name="randquotes"; version="0.1.1"; sha256="0fj9vx0c4059511wka7ip30yz87y144pz7ny840gp72qm73pp8li"; depends=[curl httr jsonlite xml2]; }; randstr = derive2 { name="randstr"; version="0.2.0"; sha256="17593lbk6r089yasafd21i3v90ya9n92rflpzl0qicd2kqqk2gdh"; depends=[random stringi truncnorm]; }; randtests = derive2 { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; }; - randtoolbox = derive2 { name="randtoolbox"; version="1.30.0"; sha256="141p13ajgzmb2s89rlac7zrra92mi1izvpfrngb4kqzlf3igdsqd"; depends=[rngWELL]; }; + randtoolbox = derive2 { name="randtoolbox"; version="1.30.1"; sha256="0qg20ar6qns858jdzqhmfq7yji81czhr6cim257958gqpj66sn95"; depends=[rngWELL]; }; rangeBuilder = derive2 { name="rangeBuilder"; version="1.5"; sha256="17wyf9ljgdbpxgl9gy6f1279h88k0rjfcarw7kgp145bm3c36jwf"; depends=[alphahull cleangeo pbapply raster Rcpp rgdal rgeos sp stringi]; }; rangeMapper = derive2 { name="rangeMapper"; version="0.3-7"; sha256="0b457qxlhwcnsw9x60mccvivq7a5cg7lkyfmsfva7qaipnjixcmh"; depends=[classInt data_table doFuture foreach future future_apply ggplot2 gridExtra lattice magrittr maptools raster RColorBrewer rgdal rgeos RSQLite sp]; }; - rangeModelMetadata = derive2 { name="rangeModelMetadata"; version="0.1.2"; sha256="1d31nz2izppkj0zsm6iq74py5s7zg4w3vvjjxzbzprnj2x6r9zlw"; depends=[biomod2 dismo dplyr ecospat ENMeval googlesheets jsonlite MASS raster rgbif rgdal rgeos shiny sp spatstat spocc spThin]; }; - rangemodelR = derive2 { name="rangemodelR"; version="1.0.4"; sha256="0y8hdqi04n3pc3iwz82gikn61h42bmfi7iccwgbglk8wkrkg4gy0"; depends=[]; }; + rangeModelMetadata = derive2 { name="rangeModelMetadata"; version="0.1.3"; sha256="028q6lxz1ljna38cz5647yv0vzjw3jpsqwqhzf5rshmvfi8c0vv2"; depends=[dplyr jsonlite MASS raster rgbif rgdal rgeos shiny sp spatstat spocc spThin]; }; ranger = derive2 { name="ranger"; version="0.12.1"; sha256="1vr5akgh388iivrxi0g4pl2npq9dc4cim3ljk4kjf637q058wc7w"; depends=[Matrix Rcpp RcppEigen]; }; - rankFD = derive2 { name="rankFD"; version="0.0.3"; sha256="0cqvr01hbq3cz2zxmysl2k88wfckyvnlsdk8ypdxdkap4gavnvqv"; depends=[coin lattice MASS Matrix]; }; + rankFD = derive2 { name="rankFD"; version="0.0.5"; sha256="0988fr18faahb9z0514pljmby6pxmn3b0ynb6ymmi3n4vpzzj4ki"; depends=[coin lattice MASS Matrix]; }; rankdist = derive2 { name="rankdist"; version="1.1.4"; sha256="1xqrkss8d5vv3blqpvrvdczsygphbx259hy9j7w9b2ahssw8cjr5"; depends=[hash optimx permute Rcpp]; }; rankhazard = derive2 { name="rankhazard"; version="1.1.0"; sha256="0kljn9b74alrd22b5pwfnamdbaqi2wa2z6yzpmgpfs3x0hv72fw7"; depends=[survival]; }; rapbase = derive2 { name="rapbase"; version="1.10.0"; sha256="0x1xr0qw5qq9rsas3ysxlvmim3jhkf5za4lxr6f15vx4rjfx77wv"; depends=[DBI devtools digest gistr httr knitr magrittr readr RJDBC RMariaDB sendmailR shiny yaml]; }; rapiclient = derive2 { name="rapiclient"; version="0.1.3"; sha256="1pm4kdga2nz1cpmchdb0ad8gr3bqfm84b1kl32cyc0x3x5rr2syz"; depends=[httr jsonlite yaml]; }; - rapidjsonr = derive2 { name="rapidjsonr"; version="1.1"; sha256="0h4phjjhykbb45rg5b1xn48vqxdcvcngbm0416ds8in7j469wbwd"; depends=[]; }; + rapidjsonr = derive2 { name="rapidjsonr"; version="1.2.0"; sha256="07zdirhbzmvq3cp4xn8ngk1lgxbbabzays315zxbs3sxrz6lzjb2"; depends=[]; }; rapidxmlr = derive2 { name="rapidxmlr"; version="0.1.0"; sha256="14pa08yp8xmbqk8wwinz1xsphx75xq6vg8zgzcxc5zgmcf0ja5if"; depends=[]; }; rappdirs = derive2 { name="rappdirs"; version="0.3.1"; sha256="0ji6sg3bdn5gazkq14xmmcq7jnbsyxw4lzmmbgv6526j2vn93n1g"; depends=[]; }; rapport = derive2 { name="rapport"; version="1.0"; sha256="1i1zawar5yxw23km74mrvaxnc9hr06kqjvbm046c09cqi6pw0hjh"; depends=[pander rapportools stringr yaml]; }; rapportools = derive2 { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12arh5dc3263kjsz3dzg06qihfmrqyax94mv2d01b"; depends=[pander plyr reshape]; }; - raptr = derive2 { name="raptr"; version="0.1.4"; sha256="0vh28js06rzf9d7j4ijkfjxn9ppk12705mr8xh4147xnxi1ivn7k"; depends=[adehabitatHR assertthat BH boot doParallel gdalUtils ggplot2 hypervolume ks Matrix mvtnorm PBSmapping plyr RandomFields raster RColorBrewer Rcpp RcppEigen rgdal rgeos RgoogleMaps scales shape sp]; }; + raptr = derive2 { name="raptr"; version="0.1.6"; sha256="0jx3g04c1yzvk42hiwkmbb8hf2lmg909lvjhka2f528wbg80lh1r"; depends=[adehabitatHR assertthat BH boot doParallel gdalUtils ggplot2 hypervolume ks Matrix mvtnorm PBSmapping plyr RandomFields raster RColorBrewer Rcpp RcppEigen rgdal rgeos RgoogleMaps scales shape sp]; }; rare = derive2 { name="rare"; version="0.1.1"; sha256="0j78ilswiaxdp9107psiw8ibxncd7i81z2njhfqf0n7532pbvjss"; depends=[glmnet Matrix Rcpp RcppArmadillo]; }; rareGE = derive2 { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; }; rareNMtests = derive2 { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; }; rarms = derive2 { name="rarms"; version="1.0.0"; sha256="11wjxd3pxvjv1j2nz26l8f0kykk9w6lf08izhivfngp63dk2akns"; depends=[jsonlite]; }; - rasciidoc = derive2 { name="rasciidoc"; version="2.0.1"; sha256="0mj3qn048ppxddq2ml06hvccixxg7kvb9rsx9iy9mn4rr2caw67v"; depends=[document highr knitr]; }; + rasciidoc = derive2 { name="rasciidoc"; version="2.1.1"; sha256="05zlp14hiimf5p8l7381wvqzi28pbp7ig9a3i6n79zkrqz7hsab0"; depends=[document git2r highr knitr xfun]; }; rasclass = derive2 { name="rasclass"; version="0.2.2"; sha256="1lsmv8kh519mz3szb4k9s17fz1480cw0i4qk12givhhm2rpzjy50"; depends=[car e1071 nnet randomForest RSNNS]; }; rase = derive2 { name="rase"; version="0.3-3"; sha256="03jqf5y5vj354m9psp81wzw6d7dfqr76bfjqv9kannsakkj587sy"; depends=[ape mvtnorm polyCub rgl sm spatstat]; }; - raster = derive2 { name="raster"; version="3.0-7"; sha256="0faxv71hlxkblvbi3ps1vfzm3wwi0brwzmpsr5114bddcqyiqkvn"; depends=[Rcpp sp]; }; + raster = derive2 { name="raster"; version="3.1-5"; sha256="010sq00ijpmwac280ip9rryw0pxk0al8g675v2lc9rdrbgaj4rnv"; depends=[Rcpp sp]; }; + rasterDT = derive2 { name="rasterDT"; version="0.3.1"; sha256="1dl083jm4x0shl7lq4in2alksgi63hp1p7j2cnsvkmwjaxygzm9v"; depends=[data_table fasterize raster sf]; }; rasterImage = derive2 { name="rasterImage"; version="0.4.0"; sha256="191m5k1rbbwziznmxbsq4g55afkw8gb5011i70f3wx3dscr3phxz"; depends=[plotrix]; }; rasterKernelEstimates = derive2 { name="rasterKernelEstimates"; version="1.0.1"; sha256="1733ic1hxym3gyibk2ysy5zzq7s9rbf6jx63x7irnrcavq151f8s"; depends=[raster]; }; rasterList = derive2 { name="rasterList"; version="0.5.8"; sha256="0q7apglxzpah04463z07cpkzyd6l6dbbdhm601brzh6yk75z20vh"; depends=[raster]; }; rasterVis = derive2 { name="rasterVis"; version="0.47"; sha256="1lsi3vk7s3bzw07vn57s6748flmbrj5s3n349cxbmhlm123vwghj"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; }; + rasterdiv = derive2 { name="rasterdiv"; version="0.1-0"; sha256="19cz25wwv7h7h9c374mgci8ic1425g5rmsfhyv0bwaqhhn3wz93q"; depends=[doParallel foreach proxy raster svMisc]; }; rasterize = derive2 { name="rasterize"; version="0.1"; sha256="18nrhmq1qmi05rkyr86xsyc8nz0fbdpf2d45h62bbfzbfynqd4qy"; depends=[png]; }; rasterly = derive2 { name="rasterly"; version="0.1.0"; sha256="128699nc1y2parfwqfx31afdy3f91z5iarpx8q1v5qfmbmb12ppx"; depends=[data_table ggplot2 magrittr plotly Rcpp rlang]; }; rasterpdf = derive2 { name="rasterpdf"; version="0.1.1"; sha256="0zi54nifbb4dzb29i8rskynblw3z42vzaykwbq30ia5zs9q1bvm5"; depends=[png]; }; ratelimitr = derive2 { name="ratelimitr"; version="0.4.1"; sha256="06x759jxr5zcnvg9q120n5bpipkb16piw15kxrpk7i918mby889b"; depends=[assertthat]; }; - ratematrix = derive2 { name="ratematrix"; version="1.2.1"; sha256="0hbwfgwkkd5a83f3nqk5gdyiqbpzsgshvcjcslaz73si05zsrkgs"; depends=[ape coda corpcor ellipse geiger MASS mvMORPH phylolm Rcpp RcppArmadillo readr]; }; + ratematrix = derive2 { name="ratematrix"; version="1.2.2"; sha256="08zc3yacgmd7y50nykbdqwq655jn3gz4x1ywrhvz8fymsdhdd39g"; depends=[ape coda corpcor ellipse geiger MASS mvMORPH phylolm Rcpp RcppArmadillo readr]; }; rateratio_test = derive2 { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; }; raters = derive2 { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; }; ratesci = derive2 { name="ratesci"; version="0.3-0"; sha256="1mdx47xpgjrjbb3lybajdmxb87dqr6cvv3fsvwfx0n629mjbih4z"; depends=[]; }; @@ -12365,37 +12522,40 @@ in with self; { rattle = derive2 { name="rattle"; version="5.3.0"; sha256="1siwnmh5yna63354jd8aypffk1naicvvnjykv5cssqyjdldcwp37"; depends=[dplyr ggplot2 magrittr rpart_plot stringi stringr tidyr XML]; }; rattle_data = derive2 { name="rattle.data"; version="1.0.2"; sha256="0cnmyzvy23jc4vz521c3jg0w4165waycvy5014l5773fy19zq75c"; depends=[]; }; raustats = derive2 { name="raustats"; version="0.15.0"; sha256="047vs3wvakwkh7c98rgswhj73m43d6ryax2jblbdp5199knn5cm5"; depends=[dplyr httr jsonlite lubridate readxl rvest tidyr xml2]; }; + ravelRy = derive2 { name="ravelRy"; version="0.1.0"; sha256="07mywv57rw2b309i2qisbpx1x3sb3z6n2b5gia9bdmb2m4hhpdai"; depends=[dplyr httr jsonlite purrr tibble tidyr]; }; raw = derive2 { name="raw"; version="0.1.6"; sha256="0hnqwa9pwj3k2y0bs6hxrvbwksjyq0q6m73c9hhlafg8g3lkyxnf"; depends=[]; }; + rawKS = derive2 { name="rawKS"; version="0.1.0"; sha256="1yiw9imhgij49qbm9hk6psb73zngqmxxwnaxq144ydwb7fbk6j0z"; depends=[dplyr ggplot2 magrittr ROCR tidyr]; }; rawr = derive2 { name="rawr"; version="0.1.0"; sha256="1a8r1vyvki3z2ms4miqv6wq9pzympgifsjx0pzzs6f4b40m083lq"; depends=[dplyr jsonlite rvest xml2]; }; raws_profile = derive2 { name="raws.profile"; version="0.1.0"; sha256="04f7wk7x9j3rb6nn3zqss9vw0h9a4vpcjyilc2vqy0fm2by41xkg"; depends=[stringr tibble withr]; }; - rayrender = derive2 { name="rayrender"; version="0.4.2"; sha256="070h6p7dmai0rrdiyghr97i3jn9yj86ak74zvw019b6g50rid6h6"; depends=[assertthat magrittr png progress purrr raster Rcpp RcppThread tibble]; }; - rayshader = derive2 { name="rayshader"; version="0.13.7"; sha256="0mlygrsbg0nzz8hhz0q28hizqh3ck4vdi67i9cvgpkrrnm13jyqx"; depends=[doParallel foreach ggplot2 magrittr png progress raster rayrender Rcpp RcppArmadillo rgl scales]; }; - rbacon = derive2 { name="rbacon"; version="2.3.9.1"; sha256="0gnvi0aaw4yyg1cvrdyps2590gx1lwcjl21y4q9zn3k00mnwmc12"; depends=[coda Rcpp]; }; + rayimage = derive2 { name="rayimage"; version="0.2.7"; sha256="075ms29ra354ygcxwazj3d217f94jq93hay4g6vl7g6sa0vnirrl"; depends=[jpeg magrittr png progress raster Rcpp RcppArmadillo]; }; + rayrender = derive2 { name="rayrender"; version="0.9.1"; sha256="1r2cpxlibkqmah1x3xdjzajz0kshbrmd575y8wngp44ihhajdzsd"; depends=[assertthat decido magrittr png progress purrr raster rayimage Rcpp RcppThread tibble]; }; + rayshader = derive2 { name="rayshader"; version="0.15.1"; sha256="0ppjjr2yawzr10jfrwlm4ih366sn5p7l6ql61k2yxwzc0516hsng"; depends=[doParallel foreach magrittr png progress raster Rcpp RcppArmadillo rgl scales]; }; + rbacon = derive2 { name="rbacon"; version="2.4.2"; sha256="0y6vsr2fyy059v10fdh8viwb7361pnh97k8zzh8105da9n6ymhrc"; depends=[coda Rcpp]; }; rbart = derive2 { name="rbart"; version="1.0"; sha256="1byfm1ycw9nfhdblqklyn8pxn6b9q5fa3inbgfpynqpsid97ig35"; depends=[Rcpp]; }; rbefdata = derive2 { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[RColorBrewer RCurl rjson rtematres wordcloud XML]; }; rbenchmark = derive2 { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; }; - rbgm = derive2 { name="rbgm"; version="0.0.5"; sha256="1gz9hxlwmj2ch1ds6mx1nlkwy4fm811jkz5fz3cl6675n11bjdpg"; depends=[dplyr geosphere raster readr rlang sp stringr tibble]; }; - rbhl = derive2 { name="rbhl"; version="0.8.0"; sha256="1avx36as99za19acjh7adb72ckdn69rmiwzcrrqxskzny56vxf0d"; depends=[crul jsonlite plyr tibble xml2]; }; - rbi = derive2 { name="rbi"; version="0.10.2"; sha256="158yi9d8pxgb5b1x1qpjzrfnq673vmsbmgm00w0dbk03akcvlfzc"; depends=[data_table ncdf4 processx reshape2]; }; - rbi_helpers = derive2 { name="rbi.helpers"; version="0.3.1"; sha256="0hngqbdydvvp4zmicvnnmwz3fw6pjvgdxp7h80zk1qczid2yg4x5"; depends=[data_table lubridate Matrix rbi reshape2]; }; - rbin = derive2 { name="rbin"; version="0.1.1"; sha256="1rbwm5xc61sva1m3n5hd9vsh7gm4hamswny35zm7j0fyc4v4bzxz"; depends=[DescTools dplyr forcats ggplot2 glue magrittr miniUI purrr recipes rlang rstudioapi shiny tibble]; }; + rbgm = derive2 { name="rbgm"; version="0.1.0"; sha256="0jw7p6l0il0fz5rq7ra731xzj06aqqvm9s1r0hwa4rd74lkg198n"; depends=[dplyr geosphere raster reproj rlang sfheaders sp]; }; + rbhl = derive2 { name="rbhl"; version="0.9.0"; sha256="0n9jxyrpq1s0yq13ylkhm0qcjlm8b25p19vpxv2s4wxan758zypd"; depends=[crul jsonlite plyr tibble xml2]; }; + rbi = derive2 { name="rbi"; version="0.10.3"; sha256="09hqv235fry60nqvd1is8n7szkq96w160xpw2pdxqdxvlh52cf2r"; depends=[data_table ncdf4 processx reshape2]; }; + rbin = derive2 { name="rbin"; version="0.1.2"; sha256="0kiad4l0qplzxqx6zx5fp48lq5g6l80qgydfri0vh3giadzcmsp7"; depends=[DescTools dplyr forcats ggplot2 magrittr miniUI recipes rlang rstudioapi shiny tibble]; }; rbiouml = derive2 { name="rbiouml"; version="1.9"; sha256="01ysjq49nhawp0r2by7b15s4b7bzsbn2xhdcyyrh38vrl04rpf57"; depends=[RCurl RJSONIO]; }; rbison = derive2 { name="rbison"; version="0.8.0"; sha256="0x2yiq1wvm6mzmhfa3ds8mmhidv91hxi14nhz4nib6nmna3c9al2"; depends=[crul data_table dplyr ggplot2 jsonlite mapproj plyr sp]; }; rbit = derive2 { name="rbit"; version="1.0.0"; sha256="09ywr711gv0vgfims2vfcxk3rnd0iadzlksil0q9159yarapfc59"; depends=[R6]; }; rbitcoinchartsapi = derive2 { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RCurl RJSONIO]; }; rblt = derive2 { name="rblt"; version="0.2.4.5"; sha256="1pfg8sgm532czz3lhpx7dmg5zik3bc0p4vdq9s0qk5zgq7nnm9sj"; depends=[data_table dygraphs hdf5r shiny xts]; }; - rbmn = derive2 { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293fylf1ylmp8w8krkmzkmyfa80f2"; depends=[MASS]; }; + rbmn = derive2 { name="rbmn"; version="0.9-3"; sha256="08rcxvxi1wav2ysnp5ydkyinykcjw3vwb56g8zdx9ziqbd7cwkgv"; depends=[MASS]; }; rbokeh = derive2 { name="rbokeh"; version="0.5.0"; sha256="1lpbph6bhh9rf5rs0ivp8dchx8i8ylz5nr7xc2xv9bnwlwj35729"; depends=[digest ggplot2 gistr hexbin htmlwidgets jsonlite lazyeval magrittr maps pryr scales]; }; rbounds = derive2 { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; }; - rbraries = derive2 { name="rbraries"; version="0.1.0"; sha256="12vdci4rzjvd419nxh99hpkhjlx86nsmrbjca0am5q0rkc68dgmj"; depends=[crul data_table fauxpas jsonlite tibble]; }; - rbridge = derive2 { name="rbridge"; version="1.0"; sha256="1ggak2rp20vs3zzpl86yaa9dkxxwmnznbzxcy4wzdgsllmfij628"; depends=[dplyr Matrix Rcpp RcppArmadillo]; }; + rbraries = derive2 { name="rbraries"; version="0.2.0"; sha256="00fl1vr8m1lalib1j35d7g0ybm4wv6qvy0gzl37ij2cc844ij6jd"; depends=[crul data_table fauxpas jsonlite tibble]; }; + rbridge = derive2 { name="rbridge"; version="1.0.2"; sha256="0m4c61rdrhq1jw3rwq2ld29g5dchbk4sfpnq0wmwbvzhdjq76plc"; depends=[dplyr Matrix Rcpp RcppArmadillo]; }; rbtc = derive2 { name="rbtc"; version="0.1-6"; sha256="1z5p1jn5b0hzwcbdpiwj224h45x01bbsgkskllir5j13l416561p"; depends=[gmp httr openssl rjson]; }; rbtt = derive2 { name="rbtt"; version="0.1.0"; sha256="1gbsb0vmqxcl28c5nn0rz95bxrvl7i0b17lq90cj5ahbk6x9jblz"; depends=[data_table]; }; rbundler = derive2 { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; }; rbvs = derive2 { name="rbvs"; version="1.0.2"; sha256="1wzxz2ca8f1phhbqr9p7c8sk09cyrdq5jc45g4ddrqvi2q29k28y"; depends=[]; }; + rbw = derive2 { name="rbw"; version="0.2.0"; sha256="01y33gbljb6bvbdsr42vgfi75sywhwn313y5jv1y4kkc4iqzag1r"; depends=[rlang]; }; rcane = derive2 { name="rcane"; version="1.0"; sha256="0p2mgkq6fh0n289n2h19c52lnqxl05wvpmd6nwvgnjqwa4wwpa7r"; depends=[]; }; rcanvec = derive2 { name="rcanvec"; version="0.2.1"; sha256="0gsk2cfiysxjw2lrnpl2l524lvhh9nhnyyh79n8p7vykyqj711yn"; depends=[rgdal sp]; }; - rcarbon = derive2 { name="rcarbon"; version="1.3.0"; sha256="1g17hdqs64hpnq77hxy0krpl1nl89g8433dn67bycfzbpih8xnr6"; depends=[doParallel foreach knitr sp spatstat]; }; + rcarbon = derive2 { name="rcarbon"; version="1.3.1"; sha256="1qdmbvp758758ny2d4y0xi5gdhzvjmwvxh6yjhmavhb454fys0yi"; depends=[doParallel foreach knitr sp spatstat]; }; rcartocolor = derive2 { name="rcartocolor"; version="2.0.0"; sha256="08ljaag2mnhz2671zvwji1sp003z94lz30vjidmybm9fp8piqw5g"; depends=[ggplot2 scales]; }; rcbalance = derive2 { name="rcbalance"; version="1.8.5"; sha256="15qlk3cqwsvixl17l1fxcajrabmz4y7q5gz0a1pd66f6i1xskcqq"; depends=[MASS plyr]; }; rcbsubset = derive2 { name="rcbsubset"; version="1.1.4"; sha256="0sfsmnxs4c8blzg0bb2ffb2xcsjv7pp39arnda988f7b2aas59wj"; depends=[MASS plyr]; }; @@ -12403,10 +12563,10 @@ in with self; { rccdates = derive2 { name="rccdates"; version="1.0.0"; sha256="1f87qlw62am2qy1zzrz91vmsn8axhld44gak61xa7046675hm98s"; depends=[rccmisc]; }; rccmisc = derive2 { name="rccmisc"; version="0.3.7"; sha256="171s2ll759xjdnx0z24ih5ix2vcp4qnmf1nf107gij6wv8k450ab"; depends=[dplyr]; }; rcdd = derive2 { name="rcdd"; version="1.2-2"; sha256="0pzpbqnlgzr240iici70278py5wnbbxkzlgn112f9wv5ga3riric"; depends=[]; }; - rcdk = derive2 { name="rcdk"; version="3.4.7.2"; sha256="0fnbv8gjzl77c5s1byw8xn16dxxpd7phcyqzd284x7n010fmdyq6"; depends=[fingerprint iterators itertools png rcdklibs rJava]; }; - rcdklibs = derive2 { name="rcdklibs"; version="2.0"; sha256="05g0y00bw1bqykfbwn4q42krwcfl50jcavaw7yyw9a5m34hvw0l8"; depends=[rJava]; }; + rcdk = derive2 { name="rcdk"; version="3.5.0"; sha256="05bz2pnvfci8sd9l4i0jay8rwvfnw87r9xqzvq5306mfbhik20fy"; depends=[fingerprint iterators itertools png rcdklibs rJava]; }; + rcdklibs = derive2 { name="rcdklibs"; version="2.3"; sha256="16ijvzsc1irpz1z2xd82i2saafsvpn0x5lr54c5gx9bfb35gacyp"; depends=[rJava]; }; rchallenge = derive2 { name="rchallenge"; version="1.3.2"; sha256="1qib09vlajw62zdhx8gkmmhlgc8k0dqdxx8ai8zdwxhfff253glc"; depends=[knitr rmarkdown]; }; - rcheology = derive2 { name="rcheology"; version="3.6.2.0"; sha256="19llfyvaqiv5dzmw4lkfaia28hi4n1s66iazh8yw7nqql16s4nj8"; depends=[]; }; + rcheology = derive2 { name="rcheology"; version="3.6.3.0"; sha256="16ci41541by8plw87wl754clqn241fhpzc6658jsvz2yvnhkx0wf"; depends=[]; }; rchess = derive2 { name="rchess"; version="0.1"; sha256="0qnvvvwcl02rmqra9m7qnhy40cbavswbq6i0jm47x6njmr1gpfhy"; depends=[assertthat dplyr ggplot2 htmlwidgets plyr R6 V8]; }; rchie = derive2 { name="rchie"; version="1.0.2"; sha256="1m89mwq5f81yr2vc3wvnxkpm04bad11sx5fllcd3yy8ilghmbfp6"; depends=[jsonlite V8]; }; rcicr = derive2 { name="rcicr"; version="0.3.4.1"; sha256="1sa13sbhx64cf8szr2811iq4a1asb8d3k0igxw6fbssij2lwbxzp"; depends=[aspace dplyr jpeg matlab scales]; }; @@ -12414,34 +12574,32 @@ in with self; { rcitoid = derive2 { name="rcitoid"; version="0.1.0"; sha256="11iqdj1q983w28fh17rqvmhs41ks09b24p408nl7hz4iqg9c7lpi"; depends=[crul curl fauxpas jsonlite]; }; rclipboard = derive2 { name="rclipboard"; version="0.1.2"; sha256="04vkxz2wqb3q3igjqgaaim3sb71h046c2b8rhvg51hkp1win8s5w"; depends=[shiny]; }; rcmdcheck = derive2 { name="rcmdcheck"; version="1.3.3"; sha256="1d4kzgfqy72r6b7bn1j4znyksrycgypx1jjvpv9lrmvn37mpkdhs"; depends=[callr cli crayon desc digest pkgbuild prettyunits R6 rprojroot sessioninfo withr xopen]; }; - rcompanion = derive2 { name="rcompanion"; version="2.3.21"; sha256="01mvgs3q43mx630c54pc7i1kxljaliyxyv38pa6hgp4arh75aj7f"; depends=[boot coin DescTools EMT lmtest multcompView nortest plyr]; }; + rco = derive2 { name="rco"; version="1.0.1"; sha256="0sjfgblvrnd1jmvqgxc9xm94c46kmr9syxynx9zdd9gsqcwc6hza"; depends=[]; }; + rcompanion = derive2 { name="rcompanion"; version="2.3.25"; sha256="10x2ps110a849qgr7pggdz5436a2bzzfv774xic34fnpki32zvzs"; depends=[boot coin DescTools EMT lmtest multcompView nortest plyr]; }; rcoreoa = derive2 { name="rcoreoa"; version="0.3.0"; sha256="0z9kllhk1j7c4sgnd88ngxv7xvr396azg9vr9p6i72ficr7flr64"; depends=[crul hoardr jsonlite pdftools]; }; rcorpora = derive2 { name="rcorpora"; version="2.0.0"; sha256="1b8xa81mn3afadz77576vda9b0d99f1k096drxrpqd989g993aqy"; depends=[jsonlite]; }; - rcosmo = derive2 { name="rcosmo"; version="1.1.1"; sha256="195cxjgkcgz9qx51hsg9bd2y7c96dk69c8yvy9s2w59jy9iy5i7y"; depends=[cli entropy FITSio geoR mmap nnls Rcpp rgl tibble]; }; + rcosmo = derive2 { name="rcosmo"; version="1.1.2"; sha256="01a8g81ld0dy2bn0mqmpdz2bpd7g52jn67136hhvpxndnnlh384k"; depends=[cli entropy FITSio geoR mmap nnls Rcpp rgl tibble]; }; rcreds = derive2 { name="rcreds"; version="0.6.6"; sha256="1sdrdgn53kgcdnxfjs8jh0h538vb3b9ixz74lbnp54yp09jpqsri"; depends=[collectArgs digest jsonlite magrittr]; }; - rcrimeanalysis = derive2 { name="rcrimeanalysis"; version="0.1.0"; sha256="17s5k0p24vgy34gp213sxy7d7fd3fl8zyhiibszm2z81aknpszz8"; depends=[dplyr forecast ggmap htmltools igraph KernSmooth leaflet lubridate raster rgdal sp]; }; - rcrossref = derive2 { name="rcrossref"; version="0.9.2"; sha256="1383xlwy3vj08hhghx5zsy0890zsm402x9hdqzs5x5q7mxkqdwjq"; depends=[bibtex crul dplyr DT jsonlite miniUI plyr R6 shiny stringr xml2]; }; + rcrimeanalysis = derive2 { name="rcrimeanalysis"; version="0.4.1"; sha256="1nm6hsazjg9qg41067gn3qwlrbqf8awgwb2yczkzdm2106a0rm34"; depends=[dplyr forecast ggmap htmltools igraph KernSmooth leaflet leafsync lubridate pals raster Rcpp rgdal sp]; }; + rcrossref = derive2 { name="rcrossref"; version="1.0.0"; sha256="1743qy5q0n2ij7x88nkk99w59vnl7g9fwpkwgb3a3s235f6lb4df"; depends=[bibtex crul dplyr DT jsonlite miniUI plyr R6 shiny stringr xml2]; }; rcrtan = derive2 { name="rcrtan"; version="0.1.1"; sha256="0kcp3gnjmp00i1hsjagpp0dlr6zgpc4y5ihpx93hm4m3fnzcmn7x"; depends=[dplyr magrittr purrrlyr tibble tidyr]; }; rcrypt = derive2 { name="rcrypt"; version="0.1.1"; sha256="002r5wr0bmqbj014iz8wacj883j6gqcxc786m6p9a7zdrjpx2pqi"; depends=[]; }; - rcss = derive2 { name="rcss"; version="1.8"; sha256="0c2i1zqjgl81i91b3bv70v54iib1d7hbsd1h63nip1al6lwnya4c"; depends=[nabor Rcpp RcppArmadillo]; }; rcube = derive2 { name="rcube"; version="0.5"; sha256="1162y7fs3fsbb5jj66g9kvxxhggprlifrabqbb9lqm8rrdwhz3r9"; depends=[magrittr]; }; - rcure = derive2 { name="rcure"; version="0.1.0"; sha256="1pcdc168bwn0b90xy8sdwrm2yvhj26xj11wm8z84m48sxy56j4v8"; depends=[arm MASS plyr smcure survival]; }; rcv = derive2 { name="rcv"; version="0.2.1"; sha256="0i5z3a918ykl56dv3dvzwwcv550gvjjdg5kfh63jlpaxn9ybmv3f"; depends=[dplyr readr stringr tibble tidyr]; }; - rdatacite = derive2 { name="rdatacite"; version="0.5.0"; sha256="15db4p8scx0b3br0vrxyxc0k8pfiki057vkfka3qjv1gbj1ab2d8"; depends=[crul jsonlite tibble]; }; + rdatacite = derive2 { name="rdatacite"; version="0.5.2"; sha256="07zbxr89fxx9nlp5w7n60rjm3prck08h0fjrq0pnpkbnnkx9cv9a"; depends=[crul jsonlite tibble]; }; rdataretriever = derive2 { name="rdataretriever"; version="2.0.0"; sha256="0gnvvxvlfh6j887y5w83q5kg6lqqcb0c54lfcx9qp3r28hpdlxkz"; depends=[reticulate]; }; - rdbnomics = derive2 { name="rdbnomics"; version="0.5.1"; sha256="0m55k92a74lnwfsxz6z102mvqvz6lkhwq38m000hbs5z2k27h620"; depends=[curl data_table jsonlite]; }; + rdbnomics = derive2 { name="rdbnomics"; version="0.6.1"; sha256="1jvgmfa0qc3l2bp2896827vxpavc32bzby8x9z2wbyfmkk6pm985"; depends=[curl data_table jsonlite]; }; rdd = derive2 { name="rdd"; version="0.57"; sha256="1lpkzcjd18x51wzr4d1prdjfsw5978z6zap65psfs02nszy69nqp"; depends=[AER Formula lmtest sandwich]; }; - rddapp = derive2 { name="rddapp"; version="1.1.0"; sha256="0zdm54hlxqp7r21fwdka33syjsrf6flrvwqm86hpwhg95880ixkk"; depends=[AER Formula lmtest R_utils sandwich shiny]; }; rddensity = derive2 { name="rddensity"; version="1.0"; sha256="0v94izsghy35b33dq5b28p2lqs1fw1snyipdf9vgjz5s3qkzjkd8"; depends=[ggplot2 lpdensity]; }; - rddtools = derive2 { name="rddtools"; version="0.4.0"; sha256="1z9sl9fwsq8zs1ygmnjnh3p6h9hjkikbm4z7cdkxw66y0hxgn96s"; depends=[AER Formula ggplot2 KernSmooth lmtest locpol np rdd sandwich]; }; rde = derive2 { name="rde"; version="0.1.0"; sha256="1zw9gdh90hl0wc5c0xwl5x7566r611wk73sbqdmpzpswjyyl9aqm"; depends=[clipr]; }; + rdefra = derive2 { name="rdefra"; version="0.3.8"; sha256="00wgcc0mzjvinvj767mzrx8idq8w7b7bi4d82hvldbki9hadjh7d"; depends=[dplyr httr lubridate rgdal sp tibble xml2]; }; rdetools = derive2 { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; }; rdflib = derive2 { name="rdflib"; version="0.2.3"; sha256="1hc6a0spmbd42lf7zjkwjv4glagfzsdilv5hm8c76cj36incg6qg"; depends=[dplyr jsonld readr redland stringi tidyr]; }; rdfp = derive2 { name="rdfp"; version="0.1.4"; sha256="1490227hhfjjscfmd8p897v1ijs61pk5sc0a2vr9yjnfmsnxpqrl"; depends=[curl data_table dplyr httr lubridate plyr purrr readr XML xml2]; }; rdhs = derive2 { name="rdhs"; version="0.6.3"; sha256="01pjb9wjad22rv85z0rxrh06wyzksy0xgd656xd3lck0ixpr88hx"; depends=[digest foreign getPass haven httr iotools jsonlite magrittr qdapRegex R6 rappdirs rgdal storr xml2]; }; rdi = derive2 { name="rdi"; version="1.0.0"; sha256="1c49mkxfyxhqz8fc155kgy1k5by0y2c1ahy8k6pn9k8l1j4m4m2q"; depends=[beanplot gplots pdist stringr]; }; rdian = derive2 { name="rdian"; version="0.1.1"; sha256="0i4ljcqhmrwrqbhi321iffypxj4kndx47ssljnixr3fx2lmqh0q1"; depends=[curl httr]; }; - rdist = derive2 { name="rdist"; version="0.0.3"; sha256="1jp3s4293h973dpz0waq9abpd8ibp4gxdyk3bwn7a32zfpk4kjza"; depends=[Rcpp RcppArmadillo]; }; + rdist = derive2 { name="rdist"; version="0.0.4"; sha256="058i2cxav96ipb1a1q3ffak0mjgyrvvcz8ivlap4qbrnn3x13jzl"; depends=[Rcpp RcppArmadillo]; }; rdiversity = derive2 { name="rdiversity"; version="1.2.1"; sha256="0j67b9mnq2xfbi2hrn1x9vgdv63779d0rcbzndljh37b1x5zlr22"; depends=[ape ggplot2 ggthemes phangorn phytools plyr reshape2 tibble tidyr]; }; rdlocrand = derive2 { name="rdlocrand"; version="0.5"; sha256="1dadb3yazk9kn051rswq3568m77x44485l2268ahm0im6bj2i7al"; depends=[AER sandwich]; }; rdmulti = derive2 { name="rdmulti"; version="0.4"; sha256="11qh5sdnxmpk1bhkcb4bq7qmj0hvvc9p4hq0pwnkgq4vfj6gsi2d"; depends=[rdrobust]; }; @@ -12449,17 +12607,16 @@ in with self; { rdoc = derive2 { name="rdoc"; version="0.1.0"; sha256="0ac6413jyrr7m25z30n3bpiafsvjx38ik6rrjzsiqxrfp41j6l9x"; depends=[cli crayon prettycode R6]; }; rdoxygen = derive2 { name="rdoxygen"; version="1.0.0"; sha256="16907969w66xvy62k45rw10qfv4x8z6jkkc6i97vppkgnlvf4d4b"; depends=[devtools]; }; rdpla = derive2 { name="rdpla"; version="0.2.0"; sha256="0d32bp68z1agymcmjwnds4fkblhjrcx8i2q6f5b7sl4kdfdbjchf"; depends=[crul data_table hoardr jsonlite tibble]; }; - rdpower = derive2 { name="rdpower"; version="0.4"; sha256="050yy1zwkxniqails24nmmaglcmlx50niqqqw5sgqfyn64yxndk1"; depends=[rdrobust]; }; - rdrobust = derive2 { name="rdrobust"; version="0.99.5"; sha256="139c6z2n7s8j1pmc6afad7f1lgxgi09wj4wgi5j49w7xhyd8yc7r"; depends=[ggplot2]; }; + rdpower = derive2 { name="rdpower"; version="0.5"; sha256="1kqfxh2g9dar130d0wld64iyd6iq51s2zrsjrprg1s3ssgi9xmb6"; depends=[rdrobust]; }; + rdrobust = derive2 { name="rdrobust"; version="0.99.7"; sha256="07v7cllcwmjgn8iscgm8lmxp1m6c9v6ikph4g3r4d4prbap7p556"; depends=[ggplot2]; }; rdrop2 = derive2 { name="rdrop2"; version="0.8.1"; sha256="1f4ysck58dm40k4wn9nfjaxym0mbgfkm146iidfkz7agmd1x0xyl"; depends=[assertive digest dplyr httr jsonlite magrittr purrr]; }; rdryad = derive2 { name="rdryad"; version="0.4.0"; sha256="19ca618hymvpk5byrrglc6iidsgm6wn43fypspssa7b3r1c4xhdc"; depends=[crul curl data_table oai solrium tibble xml2]; }; rdtLite = derive2 { name="rdtLite"; version="1.2.1"; sha256="0mm2psp8j1dfvah5d68a721kl3klins038nwgbv4s6x38a9amvq6"; depends=[curl digest ggplot2 gtools jsonlite knitr provSummarizeR provViz rmarkdown sessioninfo stringi XML]; }; - rdwd = derive2 { name="rdwd"; version="1.2.0"; sha256="1vcw5pcvcw1rx6dwwwh9j9g2pb1m81g812abd5h8zq5n7plkd2jk"; depends=[berryFunctions pbapply]; }; + rdwd = derive2 { name="rdwd"; version="1.3.1"; sha256="0pz2574rbsvg79n98ndvmhxxpk76qlq9qyv052y74871mj6dkzff"; depends=[berryFunctions pbapply]; }; rdwplus = derive2 { name="rdwplus"; version="0.1.0"; sha256="1y4dnm2bb0w6pim4h79mv2km88s78vhsn5fhs7z45m0564hgk0x2"; depends=[raster rgrass7]; }; - re2r = derive2 { name="re2r"; version="0.2.0"; sha256="0xv355h4bps4a0picxmi6i15niq4knlail80fp9xvszyn72pm8gq"; depends=[htmlwidgets Rcpp RcppParallel stringi]; }; reReg = derive2 { name="reReg"; version="1.2.1"; sha256="0nfi02wlmb1n8j134qgv3p03z2j200kkrwhvd5i17ybhzpwfndri"; depends=[BB ggplot2 MASS nleqslv reda scam SQUAREM survival]; }; reactR = derive2 { name="reactR"; version="0.4.2"; sha256="11rahxskch0r5hlqs7iy285dlhrmzm4vl18kbakx4jggwjqh61f5"; depends=[htmltools]; }; - reactable = derive2 { name="reactable"; version="0.1.0"; sha256="00ydsx8g27a40qwnkp593dd9pn62r32riry9ayhv3nzqa6mwzb4d"; depends=[digest htmltools htmlwidgets jsonlite reactR]; }; + reactable = derive2 { name="reactable"; version="0.1.0.1"; sha256="0pd9l1dnkglbncr2blbrrz6np69y75rj8fsb6zcw7qm95h579nm3"; depends=[digest htmltools htmlwidgets jsonlite reactR]; }; reactlog = derive2 { name="reactlog"; version="1.0.0"; sha256="1pajxd9k208s06sava2gqip22pzwlyslnfvkbkfw47mp4wb7zmk9"; depends=[jsonlite]; }; read_dbc = derive2 { name="read.dbc"; version="1.0.5"; sha256="1vrvxkcrk3iw5am9rsadxzf0wsr7z2mdpa5wb0v9jbhda710b4yf"; depends=[foreign]; }; read_gb = derive2 { name="read.gb"; version="1.6"; sha256="17py6al9cwq4jmab7k2164f7hi8943gi8a50d8zpn1xms9l2cnld"; depends=[]; }; @@ -12479,14 +12636,15 @@ in with self; { readmnist = derive2 { name="readmnist"; version="1.0.6"; sha256="0f2kp5r04k47gpvbj8x13c47zsis3bw3y8f5f37sh6jggblqr004"; depends=[]; }; readobj = derive2 { name="readobj"; version="0.3.2"; sha256="0n25n02f5kn8zv90n2xzdasjnrqisl4n5szb667jw57v40b726cw"; depends=[Rcpp]; }; readr = derive2 { name="readr"; version="1.3.1"; sha256="1wz496rw0ah433p755n3xac8gh7yzid4xgdjzd1a7wmpkgilvy9k"; depends=[BH clipr crayon hms R6 Rcpp tibble]; }; - readroper = derive2 { name="readroper"; version="0.9.1"; sha256="153iy144c4yxcs2cwr73czy69b4fj4q1g77rb8qmvp6blfwdcd71"; depends=[readr]; }; + readroper = derive2 { name="readroper"; version="0.9.3"; sha256="00l731hryx0igj0x7knljs9xq4gaczmsgw2hh05ngrl9y5s528dc"; depends=[readr]; }; readsdmx = derive2 { name="readsdmx"; version="0.3.0"; sha256="188yzkjblbjly032312w0fazj7k7j4ynqfc69xpblnw4gs708sx0"; depends=[Rcpp]; }; readstata13 = derive2 { name="readstata13"; version="0.9.2"; sha256="02mqwpzn7n3pqjxivnd1vlfc47xkyiywfz594x0f6vd2dym8rdwd"; depends=[Rcpp]; }; - readtext = derive2 { name="readtext"; version="0.75"; sha256="0xbl4q3y4kzigr6rgqb04sq1xqddfzqivkjmbd0v5sfammrhla8n"; depends=[antiword data_table digest httr jsonlite pdftools readODS readxl streamR stringi striprtf tibble xml2]; }; + readtext = derive2 { name="readtext"; version="0.76"; sha256="1k79db2aay15gdb52cqd87wnwk0pn27y45c65741rk8rgddk7lwj"; depends=[antiword data_table digest httr jsonlite pdftools readODS readxl streamR stringi striprtf tibble xml2]; }; + readtextgrid = derive2 { name="readtextgrid"; version="0.1.1"; sha256="03qrbmlpbjwx4ia0ydv6m9lwzalsas9pdhds82mg5f8ir0cd0qi6"; depends=[magrittr plyr purrr readr stringr tibble]; }; readthat = derive2 { name="readthat"; version="0.0.1"; sha256="04vnpvfa8in3gxi6nv3si59hr8hj17wq3a5n8rnpiaczg46qr1dr"; depends=[curl Rcpp]; }; - readwritesqlite = derive2 { name="readwritesqlite"; version="0.0.2"; sha256="064imgjl197avdsjhqvlg9yzgsp4p4yisvk62l6arcnkixwlz086"; depends=[checkr DBI dttr2 err hms RSQLite sf tibble units]; }; + readwritesqlite = derive2 { name="readwritesqlite"; version="0.1.1"; sha256="1s0av5ijnsan9lr3szdf91hf0xwyy9m0qidp8dxh2zpm5md4ipkr"; depends=[chk DBI hms lifecycle RSQLite tibble]; }; readxl = derive2 { name="readxl"; version="1.3.1"; sha256="15mambxr8c7k2ikdfsl1w3vxvm54dsnk0cl1qvks6iig7rql3d14"; depends=[cellranger progress Rcpp tibble]; }; - readxlsb = derive2 { name="readxlsb"; version="0.1.2"; sha256="0vm1hl8rjmcly6wkq06x9q5yswcdxasdc66xgpvhvw8mf0q6rlkd"; depends=[cellranger Rcpp xml2]; }; + readxlsb = derive2 { name="readxlsb"; version="0.1.3"; sha256="1n3j2g18n908z7n275mjjha9l358z1dvyg3p8gpymb66vaz55ims"; depends=[cellranger Rcpp xml2]; }; reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; }; rebird = derive2 { name="rebird"; version="1.1.0"; sha256="0l1wignhs4hsy0yshr9gh9mwy8h794injkl5f7flkl1m4c39rz8w"; depends=[assertthat dplyr httr jsonlite]; }; rebmix = derive2 { name="rebmix"; version="2.11.0"; sha256="1rmpgzxpxk3dr0c625j5g37kvxvlqwprkixk7lwjwn4lviin3cwq"; depends=[mvtnorm]; }; @@ -12497,10 +12655,10 @@ in with self; { rebus_unicode = derive2 { name="rebus.unicode"; version="0.0-2"; sha256="185313wh4zpp6addfdr78pjhxzazlfwgsddwk02zrzblf4iwzjdm"; depends=[rebus_base]; }; recexcavAAR = derive2 { name="recexcavAAR"; version="0.3.0"; sha256="0b91jbgqzkgzvk658ckk639yyz1daa0xql3qgl0kzgqg68d53x20"; depends=[kriging Rcpp]; }; rechonest = derive2 { name="rechonest"; version="1.2"; sha256="0vpff8q5p6in7vjyl62bx3wmksravcg4mpx20qlgy5ia47vyhqp2"; depends=[httr jsonlite RCurl]; }; - recipes = derive2 { name="recipes"; version="0.1.9"; sha256="1fmnka583sqm6v5bhxbllb4cd5xfqbf268aij2xgxiwckv3c0ynm"; depends=[dplyr generics glue gower ipred lubridate magrittr Matrix purrr rlang tibble tidyr tidyselect timeDate withr]; }; + recipes = derive2 { name="recipes"; version="0.1.10"; sha256="11f96aanrzi2v6cn49fhvf9y4cmhra63wcy6nvpv6hcfaqqmwd2g"; depends=[dplyr generics glue gower ipred lubridate magrittr Matrix purrr rlang tibble tidyr tidyselect timeDate withr]; }; reclin = derive2 { name="reclin"; version="0.1.1"; sha256="15qrdgjmclffivnljgmmipws9ks41fj4q40wnq0fk14mbv2045g2"; depends=[dplyr ldat lpSolve lvec Rcpp stringdist]; }; recluster = derive2 { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; }; - recmap = derive2 { name="recmap"; version="1.0.5"; sha256="1xl2j6zjk1vyf2zz8zcl4532k0c1jkrjqhp3vndnl5ynqr5nqlph"; depends=[GA Rcpp sp]; }; + recmap = derive2 { name="recmap"; version="1.0.7"; sha256="14mqc6kzwhcsbnkpl4hy2592rxgwpcpxwawq4x0kakbdjcskbfv8"; depends=[GA Rcpp sp]; }; recoder = derive2 { name="recoder"; version="0.1"; sha256="0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd"; depends=[stringr]; }; recombinator = derive2 { name="recombinator"; version="1.0.1"; sha256="1dbsqig2jjp3zypcqxf9c2brb09pv6xikmh6fhz5vgxy5wkyivks"; depends=[crayon]; }; recommenderlab = derive2 { name="recommenderlab"; version="0.2-5"; sha256="1mhs7yniabpbjpq7w04jfrzng3apz2lcg5izjk8hjnl5pww684hk"; depends=[arules irlba Matrix proxy recosystem registry]; }; @@ -12513,15 +12671,14 @@ in with self; { red = derive2 { name="red"; version="1.4.0"; sha256="1z8ja8qbwgpbmy4ira9q6x482nw5rm4bksm82y0vc4gwpdxls5z3"; depends=[BAT dismo geosphere jsonlite maptools raster rgdal rgeos sp]; }; redR = derive2 { name="redR"; version="1.0.1"; sha256="0bd1jzjip6p449m9ysi4kybxqljh2wj8z9mrgyk1cy08bjivd1cd"; depends=[imager]; }; reda = derive2 { name="reda"; version="0.5.0"; sha256="05lbhamd8z0bhc7cvpd24nmgsc5lfzidjynbi0dzbvkn2gphpdzs"; depends=[ggplot2 Rcpp RcppArmadillo splines2]; }; - redcapAPI = derive2 { name="redcapAPI"; version="2.2"; sha256="0bszw9px7ddcwnc1p3zpd8426mwym5369hglz3qm5x92va1j4036"; depends=[checkmate chron DBI httr labelVector lubridate readr stringr tidyr]; }; + redcapAPI = derive2 { name="redcapAPI"; version="2.3"; sha256="1myycwdrlw1405fxc82zd8ps8bhdvf2ffsb91pia5ijf6952v8pf"; depends=[checkmate chron DBI httr labelVector lubridate readr stringr tidyr]; }; reddPrec = derive2 { name="reddPrec"; version="0.4.0"; sha256="0zmkaiivvjq8mcaz310zgjjc7y0wgsqv29bf8nhli5qawaczvb9a"; depends=[fields snowfall]; }; redist = derive2 { name="redist"; version="1.3-3"; sha256="18asjam8hvayvnfysyjzbazjn27ds7163qhdq0p9aqlx03v89aa9"; depends=[coda doParallel foreach Rcpp RcppArmadillo sp spdep]; }; redland = derive2 { name="redland"; version="1.0.17-11"; sha256="1xbzz6iv4yal1gwplnb9d4z0xzrv25hnqmr6ima2aq9mirwr1l5b"; depends=[roxygen2]; }; redlistr = derive2 { name="redlistr"; version="1.0.3"; sha256="003jxfmj1gryw77vnrvaxmpvjbshlq53wgcrj02mcywfcqzg4jcr"; depends=[plyr raster rgeos sp]; }; - redshiftTools = derive2 { name="redshiftTools"; version="1.0.1"; sha256="0rg9s9i7cdy2qm45bpm50d7859pqx1kmk4m8gpazkp0kgr7alb7l"; depends=[aws_s3 DBI progress purrr]; }; redux = derive2 { name="redux"; version="1.1.0"; sha256="0a551w7fph338mqzxda6y21lsad19dway7w18jw9cv1rgvcp9nvc"; depends=[R6 storr]; }; ref_ICAR = derive2 { name="ref.ICAR"; version="1.0"; sha256="0k6czsbjclgmi7vp5hl50jghkzm573s50993iz3dcv55mv662251"; depends=[coda MCMCglmm mvtnorm Rdpack rgdal spdep]; }; - referenceIntervals = derive2 { name="referenceIntervals"; version="1.1.1"; sha256="04199nxh216msaghkp66zsi96h76a7c42ldml0fm66v2vamcslg8"; depends=[boot car extremevalues outliers]; }; + referenceIntervals = derive2 { name="referenceIntervals"; version="1.2.0"; sha256="0wf8c71z7gq2f91q60dyy7mrxsnhq7x3wdllmzn2lpabgv2wrm85"; depends=[boot car extremevalues outliers]; }; refinr = derive2 { name="refinr"; version="0.3.1"; sha256="0q76sr050pg3ahwzcxj08mjig0k2jq8yh7nv6d914pwg3dhq05sn"; depends=[Rcpp stringdist stringi]; }; refnr = derive2 { name="refnr"; version="0.1.0"; sha256="1gjjzxpyxm1kf1pqk99bd7f2j85rzmww3r1268bccivf19rs881i"; depends=[]; }; refset = derive2 { name="refset"; version="0.1.1"; sha256="1xbwvm9066g3f7pd34z5jh04vph4ddy2lkcgmf4kiwa1k5czpwg1"; depends=[]; }; @@ -12529,31 +12686,31 @@ in with self; { refund = derive2 { name="refund"; version="0.1-21"; sha256="09lbiyr642c3mgdgcy0j5j64s8k7nai4x7grzlh93apkaj8yrm44"; depends=[boot fda gamm4 ggplot2 grpreg lattice lme4 magic MASS Matrix mgcv nlme pbs RLRsim]; }; refund_shiny = derive2 { name="refund.shiny"; version="0.3.0"; sha256="0r2xrm4wz35wn9zg4vvw2ysl7zzbz9i080vnbrlp4yrhhlkhpkm1"; depends=[dplyr ggplot2 gridExtra lme4 plotly refund reshape2 shiny tidyr]; }; regRSM = derive2 { name="regRSM"; version="0.5"; sha256="0nbp3yjk9r7qvwm7wla39155rmqnvpdb720iq3b0hcy1bbsxbk9s"; depends=[doParallel foreach Rmpi]; }; - regclass = derive2 { name="regclass"; version="1.5"; sha256="0kha9b5ki55ggwh8cmlphg1alf1dq8if5dknisfbvd3f2x4dqf02"; depends=[bestglm leaps randomForest rpart rpart_plot VGAM]; }; + regclass = derive2 { name="regclass"; version="1.6"; sha256="0m974k3yhf0dgv5f1qjs8c53mam0cll3cjn35ywfrmlfla0wlhf5"; depends=[bestglm leaps randomForest rpart rpart_plot VGAM]; }; regexPipes = derive2 { name="regexPipes"; version="0.0.1"; sha256="1hk0rhvmgzcyf5cyl8hjznl3ll25kpasqikfr6nxd6ian2slvmmb"; depends=[]; }; regexSelect = derive2 { name="regexSelect"; version="1.0.0"; sha256="0xnb9qa8l63ang4r40ky4qhlrs5mbzvmj98dgij26j3mq1ys1pa7"; depends=[shiny shinyjs]; }; - reghelper = derive2 { name="reghelper"; version="0.3.4"; sha256="03ddpa8dhvdsqv0fnbaai4rvblqcr8x6r9z42ljm166pnx5h0spk"; depends=[ggplot2 lme4 nlme]; }; + reghelper = derive2 { name="reghelper"; version="0.3.6"; sha256="0m90q6iq2y5fjdwwplvpjymzhc8kr2cdfb2gghfrzfzxnd3m4fg7"; depends=[ggplot2 lme4 nlme]; }; + registr = derive2 { name="registr"; version="1.0.0"; sha256="1ysj2ab69w6g71d1kpcwyq0py71w6h7lfhk4nzgn2dhh6k8whwbn"; depends=[dplyr ggplot2 gridExtra magrittr Rcpp RcppArmadillo tidyr]; }; registry = derive2 { name="registry"; version="0.5-1"; sha256="1k3j6dx350awamr0dwwgkhfs46vsnj4nf08iw5byq0x7n3nkdsnz"; depends=[]; }; reglogit = derive2 { name="reglogit"; version="1.2-6"; sha256="1nnn8n5sqhbd3nzmwnpmcsmaxxxaqwbna7xm7q9vk4cqz9cm9b9s"; depends=[boot Matrix mvtnorm]; }; regnet = derive2 { name="regnet"; version="0.4.0"; sha256="0qb7sp464fyxn0bslkapjni3pzk7l6fdgabfbzja08flsr63r4mh"; depends=[glmnet Rcpp RcppArmadillo]; }; - regplot = derive2 { name="regplot"; version="0.2"; sha256="0j2mra5fqcixyl4wqwpzfng98rdh4xnl79ka7ilfi0jvz2jix84x"; depends=[beanplot sm survival vioplot]; }; + regplot = derive2 { name="regplot"; version="1.0"; sha256="0v24qg6nhzxxsdgrj0s14djmmhjdbl0bd0aqb5vklvmvf3r76li4"; depends=[beanplot lme4 sm survival vioplot]; }; regpro = derive2 { name="regpro"; version="0.1.1"; sha256="02axbq63hsqwg3q2ixr0lpsdai9q6wj57s5k1343q9m0pw90vr73"; depends=[denpro]; }; - regress = derive2 { name="regress"; version="1.3-15"; sha256="1cgr0r49cmr8nzs2lr2cm8lli1i8azyas0lbnf1681kyab15c0r7"; depends=[]; }; regressoR = derive2 { name="regressoR"; version="1.1.8"; sha256="1a8whcr32sjv6lncch8y1n7xs44djm3nx90lpvh8z8r5ggc8bw21"; depends=[colourpicker corrplot dplyr DT e1071 flexdashboard gbm ggplot2 glmnet htmltools kknn neuralnet pls randomForest rattle ROCR rpart shiny shinyAce shinydashboardPlus shinyjs shinyWidgets xgboost zip]; }; - regrrr = derive2 { name="regrrr"; version="0.1.0"; sha256="0h9vag1ypf5ycvz5fbfvw4nh4l8dgn2kmsgzq9kmn7hw2qsjwbbl"; depends=[dplyr ggplot2 magrittr MuMIn purrr rlang robustbase scales spatstat stringr tidyr usdm]; }; - regsem = derive2 { name="regsem"; version="1.3.9"; sha256="1klml4bp76mplipxaca7fk653cjxgdmmiciksxgiglxkzmf2bdps"; depends=[lavaan Rcpp RcppArmadillo Rsolnp]; }; + regrrr = derive2 { name="regrrr"; version="0.1.1"; sha256="1ibmfxw0akkrz4r0fipfqbbw4153cghj8k2xsy73lgw799ybylfk"; depends=[dplyr ggplot2 lspline magrittr MuMIn purrr robustbase scales stringr tidyr usdm]; }; + regsem = derive2 { name="regsem"; version="1.5.2"; sha256="0ch057010xfsw0nqcsarzakdbiplvxaldyqlbbacspqs65ax1yk7"; depends=[lavaan Rcpp RcppArmadillo Rsolnp]; }; regspec = derive2 { name="regspec"; version="2.4"; sha256="18i6k2wqaddrc0dz7v8x3s9205dcfwanqhpnxa9hkpyqzbb17pd3"; depends=[]; }; regsubseq = derive2 { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; }; regtest = derive2 { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; }; regtools = derive2 { name="regtools"; version="1.1.0"; sha256="1kia4h4bwjjfq7jm57ihdgspbqfn683ssbzngp5r069ki931h3nb"; depends=[dummies FNN mvtnorm sandwich]; }; - rehh = derive2 { name="rehh"; version="3.0.1"; sha256="061nk9xmlbllisszpscfpa95653745v645jm3qls1cp42d73rz6k"; depends=[rehh_data]; }; + rehh = derive2 { name="rehh"; version="3.1.0"; sha256="0lxy45cwq98kijzvp8dwf8khwcpqjvp6mjbim9hjzhwvm5jklji4"; depends=[rehh_data]; }; rehh_data = derive2 { name="rehh.data"; version="1.0.0"; sha256="1jkvwmnnmfa7iyvrabgcfzw3vfzx0dlgq47s6yf4zayi437v4di0"; depends=[]; }; rehydratoR = derive2 { name="rehydratoR"; version="0.5.2"; sha256="1d94m9hv1l72l9lph2vzbq4qqbfcgyhv2qk82p9vb8l2ckavjzvv"; depends=[dplyr jsonlite rtweet tibble]; }; reinforcedPred = derive2 { name="reinforcedPred"; version="0.1.1"; sha256="0lf3lznzvckqg04446pvq35p31fv9ix93rxwv51zq9azk0sx42vs"; depends=[glmnet MASS refund]; }; reinforcelearn = derive2 { name="reinforcelearn"; version="0.2.1"; sha256="176z2q69p24i29a8sh19xxn2zl3h1z2ixdssr5i6m4yvkvdrvv3b"; depends=[checkmate nnet purrr R6]; }; reinstallr = derive2 { name="reinstallr"; version="0.1.4"; sha256="1fcmy2cyqy4zwh815j2jbmziaiq6kypwsnj5bx0f10dlq3522m5q"; depends=[]; }; reinsureR = derive2 { name="reinsureR"; version="0.1.0"; sha256="19ayikzcq6z4i7xrlby76yy2nwvrsv6xdfrmvzyr7rz934flh8kd"; depends=[data_table dplyr ggplot2 viridis viridisLite]; }; - rel = derive2 { name="rel"; version="1.4.0"; sha256="1aswhbb5rfda1bfrasxjj5z6f9fxl7x9m9xcg0x3nvnj4qbfamfp"; depends=[]; }; + rel = derive2 { name="rel"; version="1.4.2"; sha256="0h0146b8pnd7ai17y58agsk9kaym7fhiagl34gggaak0j1qa32wh"; depends=[]; }; relMix = derive2 { name="relMix"; version="1.3"; sha256="0saa4gz4mghg15cbbx5y933vp41j94cdzvgkc112632dbp20bqd9"; depends=[Familias gWidgets gWidgetstcltk tkrplot]; }; relSim = derive2 { name="relSim"; version="0.3-1"; sha256="1d6yihapfyjlfw87l370wyfyby7ivvykx04qljffdv3hi801gn7f"; depends=[multicool Rcpp rvest stringr xml2 xtable]; }; rela = derive2 { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; }; @@ -12572,44 +12729,42 @@ in with self; { rem = derive2 { name="rem"; version="1.3.1"; sha256="1q4p26irhhl1lvc0ydv9wmng1y635zm16szpl7gwq1kyn2p90rai"; depends=[doParallel foreach Rcpp]; }; remMap = derive2 { name="remMap"; version="0.2-0"; sha256="1k2niiaq2lr4inrx443clff9cqqvyiiwd45k7yqjd8ixnbaa3mrk"; depends=[]; }; rematch = derive2 { name="rematch"; version="1.0.1"; sha256="0y3mshvpvz9csmq8hk8jbabx4nxlv5sckvfzvm6920ndg34xw2d4"; depends=[]; }; - rematch2 = derive2 { name="rematch2"; version="2.1.0"; sha256="00cznm6rk33b53w7zybkz7549bnydc66znpi5mb0xd24pmqp0rvq"; depends=[tibble]; }; + rematch2 = derive2 { name="rematch2"; version="2.1.1"; sha256="13siaa8s2ji9q6hykhb2r34ag76335ypmbqr90xaqilbir0klhnh"; depends=[tibble]; }; remedy = derive2 { name="remedy"; version="0.1.0"; sha256="1lsa5az9jwy4ngjmfzcb7qj4wm8phsgajlnp5kwa4nav0g1dhb4s"; depends=[knitr rematch2 rstudioapi]; }; remindR = derive2 { name="remindR"; version="0.0.1"; sha256="0b27v2qm3z8l9vcng8f0rkphjidxkw5n017ysflx180qjizqq632"; depends=[assertthat]; }; remote = derive2 { name="remote"; version="1.2.1"; sha256="1ihzjxbvas7396cwsi9am4pl94naxa9dnhbnh8k0l5p4a50mk33w"; depends=[gridExtra latticeExtra mapdata raster Rcpp scales]; }; remoter = derive2 { name="remoter"; version="0.4-0"; sha256="1a7m63l8phv5jnazvdqdrqkaqjwqzaac5y4jm2jn0ypy4n8jvkfl"; depends=[argon2 getPass pbdZMQ png]; }; - remotes = derive2 { name="remotes"; version="2.1.0"; sha256="19v8dmnk9l4i9m64p7zgmj7y1vhnnwhi5kyn0k5d034zzkvchi49"; depends=[]; }; + remotes = derive2 { name="remotes"; version="2.1.1"; sha256="12qinl7jv54f2524ri13gcrv6d523rg1harpi500j676zi30fnaf"; depends=[]; }; remss = derive2 { name="remss"; version="1.0.0"; sha256="0dl7iqg65qgafq7s1srcymqzvplkpzplpn6g68lb1mqirqzvgpqw"; depends=[survival]; }; renpow = derive2 { name="renpow"; version="0.1-1"; sha256="0kbfpzr17fvf5zzxpzdhvfmrqmlkba2w3rzxl5q5ac1w3h75gfhc"; depends=[]; }; rentrez = derive2 { name="rentrez"; version="1.2.2"; sha256="0ghrvh1czf2kbz7p5fh5c20wiwppg6x6fdns247fvlh6zmjl5jz5"; depends=[httr jsonlite XML]; }; - renv = derive2 { name="renv"; version="0.9.2"; sha256="1jwnabryn77s29ybwdfzlnd7c8m05xmi69kp5qbvdxy2gjwjzcdr"; depends=[]; }; + renv = derive2 { name="renv"; version="0.9.3"; sha256="02ayfgbpw4b58148dcxz31anaxncwczmxs1zzkskwj0rzhb2x60r"; depends=[]; }; repeated = derive2 { name="repeated"; version="1.1.2"; sha256="19kcsj96i1zpnwfan3gz5vrzc2gqlah0wrdr9vb4vvacz45wcdfq"; depends=[rmutil]; }; repec = derive2 { name="repec"; version="0.1.0"; sha256="0alr9fbmfxmnnnn1qymy65crcycynwz435jj0vangbb4p0qhv8pm"; depends=[jsonlite]; }; repfdr = derive2 { name="repfdr"; version="1.2.3"; sha256="0jpk44arg1jib0h2w90h851bs5cd1ss32fab9bfvf9iir2jk8985"; depends=[Rcpp]; }; - replicateBE = derive2 { name="replicateBE"; version="1.0.13"; sha256="1r5c4gwbwcdkcp1by8n3l4fn54vaxhp9fc5zbmgn43rpwbz1nsma"; depends=[lmerTest nlme pbkrtest PowerTOST readxl]; }; + replicateBE = derive2 { name="replicateBE"; version="1.0.14"; sha256="1x71wpmg1mb53jv150k8cb319rqqwnsbns05ac95hlpnkqp9jcf9"; depends=[lmerTest nlme pbkrtest PowerTOST readxl]; }; replicatedpp2w = derive2 { name="replicatedpp2w"; version="0.1-2"; sha256="0nskwkqm9z2aphpim6pvykhc3fphlsbap3r49nghkwjpngd0qzj8"; depends=[spatstat spatstat_utils]; }; replicationInterval = derive2 { name="replicationInterval"; version="2.0.1"; sha256="1jyvyqr8r2fs1cmbz7zjcc8p116bnkslvx27pqi92y5pxgqvsqvr"; depends=[ggplot2 MASS MBESS pbapply]; }; repmis = derive2 { name="repmis"; version="0.5"; sha256="0z5mjbsl24yjbl0aawr35grcal44rf2xbwv1hy7bdkms94ix79b5"; depends=[data_table digest httr plyr R_cache]; }; - repo = derive2 { name="repo"; version="2.1.4"; sha256="0492jh20aknabjlw6k32bq11vc6gvypahplxmg6slpgfi15zkqg5"; depends=[digest]; }; + repo = derive2 { name="repo"; version="2.1.5"; sha256="13gdka37kbs4mp16pf65bh28f0dkyalrcrdik6lc67jw8r9h94f9"; depends=[digest]; }; repolr = derive2 { name="repolr"; version="3.4"; sha256="13kmy09c7lk8p1mkdss0krcsfb6d7zcnqpwnl38zkanvh8q3fqhm"; depends=[Matrix Rcpp RcppArmadillo]; }; reportROC = derive2 { name="reportROC"; version="3.4"; sha256="1gcck5ids0prrrbv4hqi76swxjhbx796p4qlxbf63ys3gvdzanxr"; depends=[pROC]; }; reportReg = derive2 { name="reportReg"; version="0.3.0"; sha256="0qwrpn61x69hmgln5fpc58dqfa3pba0lgjjyj0f3fh96wc9jyhq1"; depends=[nlme]; }; - reportRx = derive2 { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[aod cmprsk geoR reshape stringr survival xtable]; }; reportr = derive2 { name="reportr"; version="1.3.0"; sha256="0zynplxqvbmf23cm2rsz3wz2jx6mv55z94mn1k44ny3lx625cnpw"; depends=[ore]; }; - reports = derive2 { name="reports"; version="0.1.4"; sha256="0r74fjmdqax2x5fhbkdxb8gsvzi6v794fh81x4la9davz6w1fnxh"; depends=[]; }; reporttools = derive2 { name="reporttools"; version="1.1.2"; sha256="1i87xmp7zchcb8w8g7nypid06l2439qyrvpwsjz6qny954w6fa2b"; depends=[xtable]; }; - repr = derive2 { name="repr"; version="1.0.2"; sha256="0wn9fdddqjgn0bdfl75x89rcxahbgqs324bhg0pfq6va5q2mlbbw"; depends=[base64enc htmltools jsonlite pillar]; }; + repr = derive2 { name="repr"; version="1.1.0"; sha256="15jz780w4nd9qjd1g3gq8f5lkh60p2v3ig3hm5kl1rg3z4cf0gvl"; depends=[base64enc htmltools jsonlite pillar]; }; represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; }; represtools = derive2 { name="represtools"; version="0.1.3"; sha256="00hnvzkkcl9d3k115i5l9gs0wah5d11amn7q62m1j158lkqlcfza"; depends=[whisker]; }; reprex = derive2 { name="reprex"; version="0.3.0"; sha256="0v7vxzs8alwz8y1cjicpimp5yimf1g9gb8x5wy3zhvrz6kk2lg10"; depends=[callr clipr fs rlang rmarkdown whisker withr]; }; reproducer = derive2 { name="reproducer"; version="0.3.1"; sha256="0clgbwfv24fjx6hj0km1nwy508dqbga8q8lyzqg801yrr8gidizd"; depends=[dplyr GetoptLong ggplot2 gridExtra httr jsonlite lme4 MASS metafor openxlsx readr reshape stringr tibble tidyr xtable]; }; - reproducible = derive2 { name="reproducible"; version="0.2.11"; sha256="08pjmhhcgcrnrr8w6sdc3phz2ymp2b7gml0848f384blqkg9wavj"; depends=[archivist backports crayon data_table digest dplyr fastdigest fasterize fpCompare gdalUtils git2r googledrive httr magrittr memoise quickPlot R_utils raster RCurl remotes rgdal rgeos rlang sf sp testthat versions]; }; - reproj = derive2 { name="reproj"; version="0.4.0"; sha256="0liwv4sgxdm42vyykjyc3jihcxk3b5q0d7cwgai8349nn1ah0wdh"; depends=[proj4 tibble]; }; + reproducible = derive2 { name="reproducible"; version="1.0.0"; sha256="1zcxdvh3x1h0jcxcv62syl0midj2kk264vkanjj2bfhn4jbbbymi"; depends=[backports crayon data_table DBI digest fastdigest fpCompare gdalUtils glue googledrive httr magrittr memoise qs quickPlot R_utils raster remotes rgdal rlang RSQLite sf sp testthat versions]; }; + reproj = derive2 { name="reproj"; version="0.4.2"; sha256="0lxd1vsxcf0r96jkl5jrh3kyklf90wcs4a27cs6ck93x1cxjnnni"; depends=[crsmeta PROJ proj4]; }; repurrrsive = derive2 { name="repurrrsive"; version="1.0.0"; sha256="1nmy88h2bfv2bad282kbrmnkjx9d8klgzv4mm8nspm049s09ydmz"; depends=[tibble]; }; reqres = derive2 { name="reqres"; version="0.2.3"; sha256="0dly09h8dpjlmvrd1wfg1gqcqhm03ax97qr0nd1p0fg9y0pdapya"; depends=[assertthat brotli jsonlite R6 stringi urltools webutils xml2]; }; request = derive2 { name="request"; version="0.1.0"; sha256="1q7zd6q00gdqmgq7s7nq1ixmns8zn2amr5zah9rwnsn8dkllj9yh"; depends=[curl httr jsonlite lazyeval magrittr R6 whisker]; }; requireR = derive2 { name="requireR"; version="1.0.0.1"; sha256="192l7i3q7s2a6n737an3fn258agjsdzh0q2w0vc8jbz7v4f3i92d"; depends=[]; }; rerddap = derive2 { name="rerddap"; version="0.6.5"; sha256="1pmpf9jdgp71ganzslwlp5qhkxhy7snaxgbrrym7swx6v2jnwhmv"; depends=[crul data_table digest dplyr hoardr jsonlite ncdf4 tibble xml2]; }; - rerddapXtracto = derive2 { name="rerddapXtracto"; version="0.4.6"; sha256="0akqprias7lxkg927yjdwcs7311rqjgnn5286g9r9rw813slc7vk"; depends=[abind dplyr ggplot2 httr maps ncdf4 parsedate plotdap readr rerddap sf sp]; }; + rerddapXtracto = derive2 { name="rerddapXtracto"; version="0.4.7"; sha256="0k4yfiyn16cf7msiy6lhfbf4s5fkfl8ddxgpi72w2kj61p6phcfv"; depends=[abind dplyr ggplot2 httr maps ncdf4 parsedate plotdap readr rerddap sf sp]; }; rerf = derive2 { name="rerf"; version="2.0.4"; sha256="0ykgxdmkqapdpk5zwi8h1cbsvjv6jpscqpr5cjmdzdan22m09l6k"; depends=[dummies mclust Rcpp RcppArmadillo RcppZiggurat]; }; resample = derive2 { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; }; resampledata = derive2 { name="resampledata"; version="0.3.1"; sha256="1nxjqvxxvycccmh1n7lpc4k8zmwnciicfr5rzfid1icij5fzw3ak"; depends=[]; }; @@ -12617,24 +12772,26 @@ in with self; { resemble = derive2 { name="resemble"; version="1.2.2"; sha256="189a6b1y720w9ff8cyqazd2d3v1msbfw8zdqr5rmilxvxmnspccs"; depends=[foreach iterators Rcpp RcppArmadillo]; }; reservoir = derive2 { name="reservoir"; version="1.1.5"; sha256="1qvjq8j2gxp6b8m3k3822f9na8a1kbwzzsmq70m763dcq293rgiz"; depends=[gtools]; }; reshape = derive2 { name="reshape"; version="0.8.8"; sha256="0s6i0sqxg1vldxs6miv8mi0zydxbqzgpmzfiwkj8y7jix3yrfmad"; depends=[plyr]; }; - reshape2 = derive2 { name="reshape2"; version="1.4.3"; sha256="03ki5ka1dj208fc0dclbm0b4xp9d769pah2j9cs34l776p4r9zwa"; depends=[plyr Rcpp stringr]; }; + reshape2 = derive2 { name="reshape2"; version="1.4.4"; sha256="1n0jrajpvc8hjkh9z4g8bwq63qy5vy5cgl2pzjardyih4ngcz3fq"; depends=[plyr Rcpp stringr]; }; reshapeGUI = derive2 { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[gWidgets gWidgetsRGtk2 plyr reshape2]; }; + resourcer = derive2 { name="resourcer"; version="1.0.0"; sha256="11abgyk0xs0sb3cw0fn6nh9wzbqnijja1mhj3hsdvz9n8k196b08"; depends=[httr R6]; }; respirometry = derive2 { name="respirometry"; version="1.0.2"; sha256="10dfy1xx2214x4lk0nxxi8c2h8j47gd8w004ic016j3m7a1vp3jd"; depends=[birk lubridate marelac measurements minpack_lm PKNCA seacarb segmented]; }; - restatapi = derive2 { name="restatapi"; version="0.6.2"; sha256="0mp5bd867w669w6219296ymzqn35nd306yfjb5pbi03sirqmk4lr"; depends=[data_table rjson xml2]; }; + restatapi = derive2 { name="restatapi"; version="0.7.5"; sha256="0a55k96qf807z9l8zgbpb849nm8c5iv42q7a6xm8sf2495p2jlr5"; depends=[data_table rjson xml2]; }; restfulr = derive2 { name="restfulr"; version="0.0.13"; sha256="1dk45mzrr6ka92yjz7hfhkj12kpx1wg4szv1h1mg80mgga4ganbv"; depends=[RCurl rjson S4Vectors XML yaml]; }; restimizeapi = derive2 { name="restimizeapi"; version="1.0.0"; sha256="1ss6fng5pmqg6cafc256g9ddz8f660c68ysxfan6mn4gdaigz7lb"; depends=[RCurl RJSONIO]; }; restlos = derive2 { name="restlos"; version="0.2-2"; sha256="083w1ldax8bnf3w4119damma2nz75c3ki187b0275i1mqxqrixp7"; depends=[geometry igraph limSolve rgl som]; }; restorepoint = derive2 { name="restorepoint"; version="0.2"; sha256="0pjp5dvycvfg75hhj8lrr2lrjn6n6bqj0ziwyd87lyi15b9j8w4s"; depends=[]; }; restrictedMVN = derive2 { name="restrictedMVN"; version="1.0"; sha256="0qynkg244gzq0yjb0716w7g1sxdq66i11ss8jij86h2mz3ykj137"; depends=[MASS]; }; - restriktor = derive2 { name="restriktor"; version="0.2-500"; sha256="14p66ckr8lyjl905y0wkqz6s8a0gsy7z6ndkpigwbzssq27jn0am"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; }; + restriktor = derive2 { name="restriktor"; version="0.2-800"; sha256="0v7304912xhjz5bsngndvwi0y1qnk55xk9ariw2wi9msah1nm4d9"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; }; resumer = derive2 { name="resumer"; version="0.0.3"; sha256="0ilya3v75989zqm16x69w4599ax2s5j2n6f16bmhwydrmzxs1g48"; depends=[dplyr rmarkdown useful]; }; rethinker = derive2 { name="rethinker"; version="1.1.0"; sha256="02zfx08s5xisv1v4y16iqbddi9kb3fcr249b3414fzvs4nm5as94"; depends=[rjson]; }; - reticulate = derive2 { name="reticulate"; version="1.14"; sha256="0icb9zl9zlx75njv7y1dr450k0yw2n3q2jkr4nicnphdyfn69gkn"; depends=[jsonlite Matrix rappdirs Rcpp]; }; + reticulate = derive2 { name="reticulate"; version="1.15"; sha256="03dmnx9jhxx6vfbv2i5n6sln38kb9zkshz982pg3l9i4jjf3xns7"; depends=[jsonlite Matrix rappdirs Rcpp]; }; retimes = derive2 { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; }; - retistruct = derive2 { name="retistruct"; version="0.6.2"; sha256="191kpd3fwgv48i4a048lgrir3lcvyjvaj41hxifxgkkg1g0gv3f0"; depends=[foreign geometry png R_matlab R6 rgl RImageJROI RTriangle sp ttutils]; }; + retistruct = derive2 { name="retistruct"; version="0.6.3"; sha256="1zij37n2ja3yx6n1agdkb3lj42p01parcg6djv60bng9c2qq0wsl"; depends=[foreign geometry png R_matlab R6 rgl RImageJROI RTriangle sp ttutils]; }; retractcheck = derive2 { name="retractcheck"; version="1.0.0"; sha256="1c4p8afh9g359s560sswcys3manc0lqvk0aqgvd09p4rpzls2dm7"; depends=[httr plyr textreadr]; }; retrodesign = derive2 { name="retrodesign"; version="0.1.0"; sha256="173jrpzasimplv8vbm8gzpl8aibnsjkgvhz1hd75is0b2l8gnbxy"; depends=[]; }; - retrosheet = derive2 { name="retrosheet"; version="1.1.0"; sha256="1k0qnq9a3ixk91qmmp5wxwv8l0878yx5h32a458w5a4h4ip434jx"; depends=[data_table httr rvest stringi stringr xml2]; }; + retrosheet = derive2 { name="retrosheet"; version="1.1.1"; sha256="1x9gh9zjb4r1nyfbcb79c656a8hzrfasdir8p968inqmr08b57v0"; depends=[data_table httr lubridate purrr readr rvest stringi stringr tibble xml2]; }; + retry = derive2 { name="retry"; version="0.1.0"; sha256="1yfcfvszfjnvvnjcywgchyiyj3jk9nmvk3h40g6bc24xapfkfl2p"; depends=[later rlang]; }; reutils = derive2 { name="reutils"; version="0.2.3"; sha256="09dhf4s7wz3anrkzqi16abx64gk8ck2142kfd8pv71mjy3x548l7"; depends=[assertthat jsonlite RCurl tibble XML]; }; reval = derive2 { name="reval"; version="2.0.0"; sha256="1yxkyc6wdp5h3cp8i42a9cf0b1cwr4nmpd7svlp7bpfxlcnqqa0d"; depends=[doParallel foreach]; }; revdbayes = derive2 { name="revdbayes"; version="1.3.6"; sha256="15nrmnl3g4l8yn6x1xvbfjn4fznryvgkvaqyxjr929v05rrf3fl0"; depends=[bayesplot Rcpp RcppArmadillo rust]; }; @@ -12645,13 +12802,12 @@ in with self; { revgeo = derive2 { name="revgeo"; version="0.15"; sha256="1ns7d1817475lriss6wwgvdm6lj760p40yxqaifla13c2xb73a55"; depends=[RCurl RJSONIO]; }; revtools = derive2 { name="revtools"; version="0.4.1"; sha256="0nms7rwpdzf3xq2incraxppha4c830gcygpbnhwjs92c836hh2f0"; depends=[ade4 modeltools ngram plotly shiny shinydashboard slam SnowballC stringdist tm topicmodels viridisLite]; }; reweight = derive2 { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; }; - rex = derive2 { name="rex"; version="1.1.2"; sha256="0alsadgjgass3wr8y5d247j12qqzg454sc84vpskclrkmz778g5x"; depends=[lazyeval magrittr]; }; + rex = derive2 { name="rex"; version="1.2.0"; sha256="0m7bq8db3m5dhf01rw7xc7xy1ciq3m7dfgsl80p8cy4h8vqr3d06"; depends=[lazyeval]; }; rexpokit = derive2 { name="rexpokit"; version="0.26.6.6"; sha256="13dxra3s68i499g21z9i93mbn6n8s4xay5zmvslafaccbq3q1ray"; depends=[Rcpp]; }; - rfPermute = derive2 { name="rfPermute"; version="2.1.7"; sha256="0dhgxm9b2djgadr1wnwgd0gbqv7751y0ln4jis32p0qmwi30v76d"; depends=[abind dplyr ggplot2 gridExtra magrittr plyr randomForest reshape2 rlang scales swfscMisc tibble tidyr]; }; + rfPermute = derive2 { name="rfPermute"; version="2.1.81"; sha256="0mak4r3j5vbjjkcsbxj0yg2xrbipq4rz873b02drkb769nh3d16a"; depends=[abind dplyr ggplot2 gridExtra magrittr randomForest rlang scales swfscMisc tibble tidyr]; }; rfUtilities = derive2 { name="rfUtilities"; version="2.1-5"; sha256="1anwvmxn3xrc1aqxl75rzlk4wby8l54rmkp0bgi8dgbz2l223xr0"; depends=[cluster randomForest]; }; rfVarImpOOB = derive2 { name="rfVarImpOOB"; version="1.0"; sha256="1341bicd65qw3pz1j8d6c9baj9d6s70ljdaaf87xvx8pjnajrfsw"; depends=[binaryLogic dplyr ggplot2 ggpubr magrittr prob randomForest titanic]; }; - rfacebookstat = derive2 { name="rfacebookstat"; version="2.0.0"; sha256="07mchcma7ab3wvz6rp1zmcfqn7bnd6w1w3jrsq22v851nzvw39jk"; depends=[dplyr httr jsonlite purrr stringr tidyr tidyselect]; }; - rfbCNPJ = derive2 { name="rfbCNPJ"; version="0.1.1"; sha256="0zvpazxi184ia2wql0120kw7665dn9cs8a2kv91n79pncabb4xfg"; depends=[fs glue httr magrittr progress purrr readr stringr tibble xml2]; }; + rfacebookstat = derive2 { name="rfacebookstat"; version="2.0.2"; sha256="0szzrlszjxapn86mk29f1nn39fmkfwjslbbcmqqj2harlnccafr7"; depends=[dplyr httr jsonlite purrr stringr tidyr tidyselect]; }; rfigshare = derive2 { name="rfigshare"; version="0.3.7"; sha256="1qgzn0mpjy4czy0pnbi395fxxx84arkg8r7rk8aidmd34584gjiq"; depends=[ggplot2 httpuv httr plyr RJSONIO XML yaml]; }; rfinterval = derive2 { name="rfinterval"; version="1.0.0"; sha256="1z7v0sbql6g2h3fr1268nj79rbx1d33hjfaraxhbikrjgb8mbp0w"; depends=[MASS ranger]; }; rfishbase = derive2 { name="rfishbase"; version="3.0.4"; sha256="1km3xjbf3l81sfmmjs55criq4xw6l3xa74f8g1rxsbr5bci9xlia"; depends=[dplyr gh magrittr memoise purrr readr rlang stringr]; }; @@ -12659,27 +12815,29 @@ in with self; { rfishnet2 = derive2 { name="rfishnet2"; version="0.1.0"; sha256="054cdgffy56yf5i0wy6kkyc68lim3zlk9czi6k5cy87lfjzcjqs9"; depends=[ggplot2 pracma sf]; }; rflexscan = derive2 { name="rflexscan"; version="0.2.0"; sha256="008xpbdqix18lwdqcx0mixwhv8v47kzpkblr53igp5766l04nfyj"; depends=[igraph Rcpp rgdal sp]; }; rflights = derive2 { name="rflights"; version="0.1.103"; sha256="1gxfsc3dhlzy6bpqjdxk5x309jmjgvxr8d9amnhrjdygzj6icf18"; depends=[httr]; }; - rfm = derive2 { name="rfm"; version="0.2.0"; sha256="1d07bms5ykfkw0ynfl21fhs9s6yvs44fn570vzi2dj8h5ywbsz15"; depends=[assertthat dplyr forcats ggplot2 ggthemes lubridate magrittr purrr RColorBrewer rlang tidyr xplorerr]; }; + rfm = derive2 { name="rfm"; version="0.2.1"; sha256="0p3y5pkxlm59jxwzyf6c5x9g8vbgvyn5d8j793szd075m11gk099"; depends=[dplyr ggplot2 ggthemes lubridate magrittr RColorBrewer rlang tibble tidyr xplorerr]; }; rfml = derive2 { name="rfml"; version="0.1.0"; sha256="133adpfjpp14m47841k6ybq9lrvby9bxgr5zs4i3akjr2575nq1j"; depends=[httr jsonlite PKI XML]; }; rfoaas = derive2 { name="rfoaas"; version="2.1.0"; sha256="0w6m3lvfb60a2zfvyc0ksnfllb2ndy45b301vk9f3nr27lxdz6dm"; depends=[httr]; }; rfordummies = derive2 { name="rfordummies"; version="0.1.4"; sha256="03y4kzf18xwk41dm1nzqqqk0aflwh1mcgfnh0lbr0r7hnsy3a77x"; depends=[openxlsx]; }; rforensicbatwing = derive2 { name="rforensicbatwing"; version="1.3.1"; sha256="1i521h2nmlkhcxfxqir8jfjv0llwr6cz0ck5w6hzplk48044bn16"; depends=[Rcpp]; }; rfviz = derive2 { name="rfviz"; version="1.0.0"; sha256="0rzyy7r2ybqjnp1g5bbkxydpa93h8q4r71kdaj77r475m2i4kb6b"; depends=[loon randomForest]; }; rgabriel = derive2 { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; }; - rgbif = derive2 { name="rgbif"; version="1.4.0"; sha256="00ik9aab13zq6n5r7sa8199nczrxb77xcf9j5bn2v8x0b7kyj4l9"; depends=[crul data_table geoaxe ggplot2 jsonlite lazyeval magrittr oai tibble whisker wicket xml2]; }; + rgbif = derive2 { name="rgbif"; version="2.2.0"; sha256="143ais0zviz015yzqax3jx47g277h9kfybwsaapgzadhap7paaja"; depends=[crul data_table geoaxe ggplot2 jsonlite lazyeval magrittr oai tibble whisker wicket xml2]; }; rgdal = derive2 { name="rgdal"; version="1.4-8"; sha256="1jd691amf3ghznq5im15gvhl6v6k25klpl75m4ngrqf9xlxaa3as"; depends=[sp]; }; rgdax = derive2 { name="rgdax"; version="1.0.0"; sha256="16ph6n1nyl2v2w51ih6wzkpw0j0hfa3f60q1g6p9zis59j0rh7d9"; depends=[digest httr jsonlite RCurl]; }; rgen = derive2 { name="rgen"; version="0.0.1"; sha256="0gl82v09q1ha58wd1014s46wzkx1yf348bc7jkl6s4qdc6c4vsb8"; depends=[]; }; rgenoud = derive2 { name="rgenoud"; version="5.8-3.0"; sha256="0p93wf6ghgz2nifxbscb6bhahh5jd2ba7nh1c2mb6fmbxnsi3swv"; depends=[]; }; - rgeolocate = derive2 { name="rgeolocate"; version="1.0.1"; sha256="1v9kd71wpxna1war0rbp91pc5wdqlganmj2c2fc5m5176dnxd2v3"; depends=[httr Rcpp]; }; - rgeopat2 = derive2 { name="rgeopat2"; version="0.2.6"; sha256="04r8q3mig7sp38f3m9g20xlb0h046c04hhrzg4n06b5wkn7298s5"; depends=[readr sf stringr]; }; + rgeolocate = derive2 { name="rgeolocate"; version="1.2.0"; sha256="0v83ldn6jh0jg6vnx3i8fc2nxp00vj63bkywr3dhpd11dj9l22hn"; depends=[httr Rcpp]; }; + rgeopat2 = derive2 { name="rgeopat2"; version="0.3.9"; sha256="0l0sqkvjkzp4lmyk55l7zc02y04sa43cps47005gq8c38kyks45k"; depends=[readr sf stringr]; }; rgeoprofile = derive2 { name="rgeoprofile"; version="0.1.1"; sha256="0frpipmmhywbahcyj5rhypp9qxqkp6xkdj6sn8w1ipw6gv02zp7b"; depends=[aspace geosphere leaflet pals RANN raster sp splancs]; }; rgeos = derive2 { name="rgeos"; version="0.5-2"; sha256="0ajrrxfwfp184c6rnby3dq54hzp3rrx3px72dn7gbdn6c4li2bqz"; depends=[sp]; }; + rgexf = derive2 { name="rgexf"; version="0.16.0"; sha256="1vj5ha1qx0xzflchxf25ycys6clfn9y32m1717afzkvhmkwisrra"; depends=[igraph servr XML]; }; rggobi = derive2 { name="rggobi"; version="2.1.22"; sha256="1g7k4xais9xkjlbvrkadr5d6c5rw4jp9c0gljhm71pa1fc9fcqff"; depends=[RGtk2]; }; - rgl = derive2 { name="rgl"; version="0.100.30"; sha256="0rzqzskcwf2ah4yr62x5rjwf7yh90d43h39gk7jmfc5lc08zaxc5"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; }; + rgho = derive2 { name="rgho"; version="2.0.0"; sha256="18vsd40wrzm8h8xv7mngyndw18wasb5b868ihczvzrqfnf5bq758"; depends=[curl dplyr httr jsonlite lazyeval magrittr memoise readr tibble tidyr]; }; + rgl = derive2 { name="rgl"; version="0.100.54"; sha256="1mgs2d8igmcdzzymfwbqdrypmaidd4pra5n5gnhsn9pm6pqzidqp"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; }; rglobi = derive2 { name="rglobi"; version="0.2.21"; sha256="12v6g1ja4rrw0vcrrzgd1llxfk64g9z4f0c90rkbd9cknvnn0id9"; depends=[curl RCurl readr rjson]; }; rglwidget = derive2 { name="rglwidget"; version="0.2.1"; sha256="0siqxn3gyl98i84p0yha821b4rdrp2i0942mkx819wnf7qwrpqcv"; depends=[rgl]; }; - rgoogleslides = derive2 { name="rgoogleslides"; version="0.3.1"; sha256="06i1ljrib0ap87bxlbpnvx5fr05pwzcmza48gbicvg7fwhz9hs05"; depends=[assertthat httr jsonlite R6]; }; + rgoogleslides = derive2 { name="rgoogleslides"; version="0.3.2"; sha256="0h9gws1vcf0zdd21d8b65c2yz9kxppp3218h5lhd5iz879ajwa2i"; depends=[assertthat httr jsonlite R6]; }; rgr = derive2 { name="rgr"; version="1.1.15"; sha256="1mrnmbh2crhkwdi37q59hx76afvkhgzgaacg3688q7jp23d58z6x"; depends=[fastICA MASS]; }; rgrass7 = derive2 { name="rgrass7"; version="0.2-1"; sha256="0rhizda58hmglgr4aq6sr5y11y615w0pwpgdk3mylm9pjgj5i5vn"; depends=[XML]; }; rgsp = derive2 { name="rgsp"; version="0.2.0"; sha256="1fk0k479srfr0f4a5abyzcrzwy9hr1v5xf0jgs36fbim9bh7njlc"; depends=[dplyr magrittr tibble]; }; @@ -12696,11 +12854,13 @@ in with self; { rhymer = derive2 { name="rhymer"; version="1.0.0"; sha256="1k15sd5q6a1ijayl585vc54d1zs4nyrxsfck9bn4nlfdiwc5arwf"; depends=[httr jsonlite]; }; ri = derive2 { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; }; ri2 = derive2 { name="ri2"; version="0.1.2"; sha256="0z6mbhrda7fh7a4y2kx3mf1zc1p0k4d76phw3187w50kwvkpb737"; depends=[estimatr generics ggplot2 pbapply randomizr]; }; - ribd = derive2 { name="ribd"; version="1.0.0"; sha256="1r3w8zfihs5i1al0g136319zaj2dr0x52s3spxrcvd0irq9r4v8b"; depends=[glue kinship2 pedtools slam]; }; - riceidconverter = derive2 { name="riceidconverter"; version="1.0.6"; sha256="1p3dzlvsbf51igmq3m3m9vy023l9ybi81zdqbcqmbpa581zlg52x"; depends=[dplyr]; }; + ribd = derive2 { name="ribd"; version="1.0.1"; sha256="0q1i2bs219iwqg2hlabbwmpcnsjfx1i0y31dy7pgirl5264w24xz"; depends=[glue kinship2 pedtools slam]; }; + ribiosUtils = derive2 { name="ribiosUtils"; version="1.5-6"; sha256="1cfkzqbscj01pjqw7yjqf8gnvjacb13y8fc7nax4cb7gnk4fadc2"; depends=[]; }; + ricegeneann = derive2 { name="ricegeneann"; version="1.0.2"; sha256="0wxqp4pfdhvq4mwzjrqi3m9jiayk5bp1ha222mpm4qz1pl41cy9w"; depends=[riceidconverter]; }; + riceidconverter = derive2 { name="riceidconverter"; version="1.1.1"; sha256="143f76v3k2q9ddcxf2nzvd04pjgy7p120ln0zkmxpal20c81dwq6"; depends=[dplyr]; }; riceware = derive2 { name="riceware"; version="0.4"; sha256="0pky0bwf10qcdgg9fgysafr35xbmnr9q0jbh56fawj99nbyj3m70"; depends=[random]; }; rich = derive2 { name="rich"; version="1.0.1"; sha256="0kasr9gb85qhngfayqy3fvrsr0a066krwxsx21nsxcnss0mrqygr"; depends=[boot vegan]; }; - ridge = derive2 { name="ridge"; version="2.4"; sha256="18a16653k850sfxw9rmk4spy44hn93i97b2a0jfx41qh43hmkgqy"; depends=[]; }; + ridge = derive2 { name="ridge"; version="2.5"; sha256="0v84glz2436a1n6wqrc46x2lya2f3vn94b83cv0rqlvqygqhyz8r"; depends=[]; }; ridigbio = derive2 { name="ridigbio"; version="0.3.5"; sha256="0526nscxynl3857zybpms1wr3230qby29kxglm919pcdvpjb5kz5"; depends=[httr jsonlite plyr]; }; ridittools = derive2 { name="ridittools"; version="0.1"; sha256="1m9xbwxb277l4cd85qxmpw66gyavpwamgwr8kyf8vqarzfbwiilr"; depends=[]; }; riem = derive2 { name="riem"; version="0.1.1"; sha256="0lwhsxb4pm26kb65hs8pa63bsbrgy0zchqm4i6pq9f2r9h8vsm1m"; depends=[httr jsonlite lubridate tibble]; }; @@ -12717,35 +12877,36 @@ in with self; { riskParityPortfolio = derive2 { name="riskParityPortfolio"; version="0.2.1"; sha256="0l51spflm7wwwz5yrkw1i5534d1840wyyh2w3mz8apaxac76l0xz"; depends=[alabama Matrix nloptr quadprog Rcpp RcppEigen]; }; riskPredictClustData = derive2 { name="riskPredictClustData"; version="0.2.6"; sha256="0mvy9299pg374gvvqs9lmj2j0f3bzyy279kjpz7jq35hkgz5wif3"; depends=[gee Hmisc MASS mvtnorm]; }; riskR = derive2 { name="riskR"; version="1.1"; sha256="1qadfyb07idfw0bs006kb3917rzda83di6jmsr22941gv78z1wyv"; depends=[]; }; - riskRegression = derive2 { name="riskRegression"; version="2019.11.03"; sha256="15mz89cdzd6pjrlf61qs6vlcwx10rqxmz8ggpynyclhm9327skbb"; depends=[cmprsk data_table doParallel foreach ggplot2 lattice lava plotrix prodlim ranger Rcpp RcppArmadillo rms survival timereg]; }; + riskRegression = derive2 { name="riskRegression"; version="2020.02.05"; sha256="1m02aap91hn1gaaadc9qk3ij33l613b03biw52l79dp32yfwzdmm"; depends=[cmprsk data_table doParallel foreach ggplot2 lattice lava plotrix prodlim Publish ranger Rcpp RcppArmadillo rms survival timereg]; }; riskSimul = derive2 { name="riskSimul"; version="0.1"; sha256="0s2a1mn6g11m96gqscb916caj2aykcs3rkacpqcdnlyzryk1gsnb"; depends=[Runuran]; }; riskclustr = derive2 { name="riskclustr"; version="0.2"; sha256="0j5gcm9a57yrg5ppqmacdjr16b9d8rwqkhq1mawy1fjpf18d2max"; depends=[aod gtools Matrix mlogit stringr]; }; risksetROC = derive2 { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[MASS survival]; }; riskyr = derive2 { name="riskyr"; version="0.2.0"; sha256="0zq5qybqisbh9k7i57s8yw9xcm7yckcjk17h4ybcx4p8788gg5m3"; depends=[]; }; - ritis = derive2 { name="ritis"; version="0.8.0"; sha256="1ggcchavhxcd3pawcf631ca8w1y4v0ygm1hflvkmzhk4k9ci3g13"; depends=[crul data_table jsonlite solrium tibble]; }; + ritis = derive2 { name="ritis"; version="0.9.0"; sha256="0v0g7zbdx21ia98lb126cq2d1fwx24prng2p2r8lcgpxc34fdfsa"; depends=[crul data_table jsonlite solrium tibble]; }; riv = derive2 { name="riv"; version="2.0-5"; sha256="0n19jlrs12iysq45xyi3zvghkircg0ww5vbsfpnqkw5b22zsv30s"; depends=[MASS quantreg rrcov]; }; riverdist = derive2 { name="riverdist"; version="0.15.0"; sha256="145mvqnhv12dcvss54wdycgb3wwk95phl4kx5z0jnh3kmm1zsdl4"; depends=[rgdal sp]; }; - rivernet = derive2 { name="rivernet"; version="1.2"; sha256="0lvl7m1y779g7jsbbc2gh1h6giy1m293j0ky9759c0w17fm454fd"; depends=[]; }; + rivernet = derive2 { name="rivernet"; version="1.2.1"; sha256="0p8jyigbxipwds9pdw2gzv3ql5yikg1ik4vbk4drylbp5xhmvyja"; depends=[]; }; riverplot = derive2 { name="riverplot"; version="0.6"; sha256="0q1icpny8nkxyjhawyjzwrw8qlz0ayn2xyrsqrm4vkxyv6c9xk8z"; depends=[]; }; rivervis = derive2 { name="rivervis"; version="0.46.0"; sha256="19jsl5g46jcbc0kg47bsif1wrw9z9brgvwdcxqjc89shnx3hzzfv"; depends=[]; }; - rivr = derive2 { name="rivr"; version="1.2-1"; sha256="17kh5kin2id8imarvwkjikrmz266x2ldja6b7xpj34s35dzap682"; depends=[Rcpp]; }; + rivr = derive2 { name="rivr"; version="1.2-2"; sha256="0xnkhglj5ky3ly73xif9kf400av2hwys8iq8yqhxwfdgy0jx7g6y"; depends=[Rcpp]; }; rjade = derive2 { name="rjade"; version="0.1"; sha256="0f1jljj6m1almz0na984n0g314y0rl6a0mx04rbrpipgfgz1h37c"; depends=[V8]; }; rjags = derive2 { name="rjags"; version="4-10"; sha256="1nhaim84ww8fd6m8xlpmngqcnp2qpql29ahc38366fxja3ghngmx"; depends=[coda]; }; rjazz = derive2 { name="rjazz"; version="0.1.7"; sha256="0wmqlpgcr98dvapfmdcph5mdv202rzzsvb06iy5sqvpizpg7pbsz"; depends=[RCurl]; }; rjdqa = derive2 { name="rjdqa"; version="0.1.0"; sha256="07qvvy3i0ak7p717wf68gx8d1m9l4lhibf0ynmc0jny58i56fiw8"; depends=[plotrix RJDemetra]; }; - rje = derive2 { name="rje"; version="1.10.13"; sha256="08s8pw0v49z504y529yhyhp3gj1836fpxmbfhb01ka7kbj8v6swk"; depends=[knitr]; }; + rje = derive2 { name="rje"; version="1.10.15"; sha256="0z6df1sc33nz7rhgrr13q03ymraz5wfjbwqqdq6pmyff8mxkzqvj"; depends=[knitr]; }; rjmcmc = derive2 { name="rjmcmc"; version="0.4.5"; sha256="14rzvp6z5avlcnmlmvb6w4gvlh6v4ncbcai3v4c4svnjv555vz45"; depends=[coda madness mvtnorm]; }; rjson = derive2 { name="rjson"; version="0.2.20"; sha256="0v1zvdd3svnavklh7y5xbwrrkbvx6053r4c5hgnk7hz7bqg7qa1s"; depends=[]; }; rjsonapi = derive2 { name="rjsonapi"; version="0.1.0"; sha256="0qshll0y8b6lbfrqmp69w9kc9hgfrz94dk68nddshk9ilg14lx4d"; depends=[crul jsonlite plumber R6]; }; - rjstat = derive2 { name="rjstat"; version="0.3.0"; sha256="0r772p0a0x6g96k6r26vb6vjxa68mzjslwg71r0wysa9kqhvypm4"; depends=[checkmate jsonlite]; }; + rjstat = derive2 { name="rjstat"; version="0.4.1"; sha256="0kqnl4wizmain70ady982aldhscf24870shvf3sviknplshhgk8j"; depends=[checkmate jsonlite]; }; rjwsacruncher = derive2 { name="rjwsacruncher"; version="0.1.0"; sha256="0pbf3yl7cnx8vv07x9nwgrglv5h8r135fc840pxvapi099nr7ijl"; depends=[XML]; }; rkafka = derive2 { name="rkafka"; version="1.1"; sha256="0c0hszsmmd876jcfamjcfb7bxw7869zgy99j4i6ksb8za232nmmw"; depends=[rJava rkafkajars RUnit]; }; rkafkajars = derive2 { name="rkafkajars"; version="1.1"; sha256="121qnzxhipgv145lhmr6h356jpdd6knsx7f21cv9a8r5r009d42z"; depends=[rJava RUnit]; }; + rkeops = derive2 { name="rkeops"; version="1.4"; sha256="1wwca6ym32a7l0w85sgysyvyjqy43hly76gm28s4bklx58ap7l1y"; depends=[openssl Rcpp RcppEigen stringr]; }; rknn = derive2 { name="rknn"; version="1.2-1"; sha256="1x9r01314q0wgqwqzd7d13ycjzb4jzghzd3whgjvm2rsmnabai95"; depends=[gmp]; }; rkt = derive2 { name="rkt"; version="1.5"; sha256="1rgf7dnk4d1b46rns2mb2s1ilxq7hqrh057vrrl00324r4h8bs1k"; depends=[]; }; rkvo = derive2 { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; }; - rlang = derive2 { name="rlang"; version="0.4.3"; sha256="0qsqfikbsj55x5brghnkzzp7pz0japr4xnzm993f668mlls3f6i4"; depends=[]; }; - rlas = derive2 { name="rlas"; version="1.3.4"; sha256="0ccdbg634ibdjh1c7bri4l6achfrb4agy4iilr4z1pc1yzgsnk6r"; depends=[BH data_table Rcpp]; }; + rlang = derive2 { name="rlang"; version="0.4.5"; sha256="1a0h3dr519p3jj6aygbhwi9f2zwlan6d07f1gkh2db56y5vaq7yd"; depends=[]; }; + rlas = derive2 { name="rlas"; version="1.3.5"; sha256="01ncx3rckr7fwl6fqlj1rn0k6563kp4dfn3yhxqzd49rwhvclkcf"; depends=[BH data_table Rcpp]; }; rlc = derive2 { name="rlc"; version="0.2.0"; sha256="083pkajxshckk3hqg7q87jdmiqg9a1jp5lwar6f5r4nqna4kf3xa"; depends=[hwriter jrc jsonlite plyr R6 stringr]; }; rld = derive2 { name="rld"; version="1.0"; sha256="1glv4q25z14hcwifwg623h77p4awpsn3nk843pnph4sb3p5qbmn3"; depends=[emdbook MASS survival]; }; rleafmap = derive2 { name="rleafmap"; version="0.2"; sha256="1i2qczipg7lr6fl35lcl896r54jia7libxx83darrfzc1hd9sdcq"; depends=[knitr raster sp]; }; @@ -12756,41 +12917,40 @@ in with self; { rlm = derive2 { name="rlm"; version="1.2"; sha256="18y735z05k9pms6iv1739qg3q12w099qhs42icxhqs5gcdhz92fm"; depends=[]; }; rlmDataDriven = derive2 { name="rlmDataDriven"; version="0.4.0"; sha256="1fhh2siafpqmvpxi2piccxvvn5n38s5d6as6iyn43rgpsslswc8g"; depends=[MASS tseries]; }; rlme = derive2 { name="rlme"; version="0.5"; sha256="0p26mw4g12l279lh80vqcjs3pvjr759ap2m622490k1i2ralxzif"; depends=[magic MASS mgcv nlme quantreg Rcpp robustbase stringr]; }; - rlo = derive2 { name="rlo"; version="0.3.2"; sha256="0abq42dhapzmh6hvmildbn8zya29c6p1aqbv8avc03g014dwbrd0"; depends=[PythonInR]; }; rly = derive2 { name="rly"; version="1.6.2"; sha256="1bb55g3rip524dccaxvahjxsi2cimxqvzc897pxplv3bb10pm0r2"; depends=[futile_logger R6]; }; rmRNAseq = derive2 { name="rmRNAseq"; version="0.1.0"; sha256="0hh44bn7z7945aw722haazw8dx7fwzym67jismkygzhnksh59wqi"; depends=[AUC Biobase DESeq2 edgeR limma MASS Matrix nlme reshape rlang splineTimeR statmod]; }; rma_exact = derive2 { name="rma.exact"; version="0.1.0"; sha256="1igs92la79akyqj84ah23lpcay7i33k7zgzcwm7sii782fhirivx"; depends=[abind metafor]; }; rmaf = derive2 { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; }; rmake = derive2 { name="rmake"; version="1.1.0"; sha256="00qlki2vps505nxzmfykf1iyq4b0y20nb75hbfcj63ap46z7zk3c"; depends=[assertthat pryr rmarkdown visNetwork]; }; rmangal = derive2 { name="rmangal"; version="2.0.0"; sha256="0vn5i6hwi64kzi481m3y696cqdxz6frv1n7xxm72a3vbz1jsqcrf"; depends=[httr igraph jsonlite memoise purrr]; }; - rmapshaper = derive2 { name="rmapshaper"; version="0.4.2"; sha256="1m0zb5vh4mph5lz5c5rdjl3clk7rih0ipf31a91cv308fvxhlrvi"; depends=[geojsonio geojsonlint jsonlite readr sf sp V8]; }; + rmapshaper = derive2 { name="rmapshaper"; version="0.4.4"; sha256="11diajgz8jkfa2d725n0iy0psiw3x4d7kbdvdrd1prwdjsyh7i5d"; depends=[geojsonio geojsonlint jsonlite readr sf sp V8]; }; rmapzen = derive2 { name="rmapzen"; version="0.4.2"; sha256="1vybg3lmrqghvd23jwpfmypvqz2b65bc0m2pwbpizwkkg35iza70"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; }; rmargint = derive2 { name="rmargint"; version="1.0.2"; sha256="1hl2nxmgknw74jvmc05wz6zkf7i151xl7h7hdpcivvm60yizlx8i"; depends=[]; }; rmarkdown = derive2 { name="rmarkdown"; version="2.1"; sha256="0pa5xs0vzwn9vsgysjqbks9v5lbqphxh5agciskllibc40hhwigg"; depends=[base64enc evaluate htmltools jsonlite knitr mime stringr tinytex xfun yaml]; }; rmatio = derive2 { name="rmatio"; version="0.14.0"; sha256="072fxg81r4rsc71qrf5p6lr5s3gchbgvxhyzwlx3wxw7y2px6w7y"; depends=[Matrix]; }; rmcfs = derive2 { name="rmcfs"; version="1.3.1"; sha256="1y59r4n2ywinfpkb7zn7gygl97w6p0rvr90sjqy4vdhi60ka16kf"; depends=[data_table dplyr ggplot2 gridExtra igraph reshape2 rJava stringi yaml]; }; rmcorr = derive2 { name="rmcorr"; version="0.3.0"; sha256="1p05ln653yrd02wmn8wfzawiw6a924d8an0568fcbgl1pdna43b1"; depends=[psych RColorBrewer]; }; + rmd = derive2 { name="rmd"; version="0.1.5"; sha256="00fsssd4hnk00wsrials4lwxrjnr84ppnk7094bfswpfc0iawc3z"; depends=[blogdown bookdown bookdownplus citr cli crayon curl devtools dplyr DT magrittr mindr miniUI pagedown purrr rappdirs rmarkdown rstudioapi rticles rvest shiny shinyjs tibble tinytex xaringan xml2]; }; rmdHelpers = derive2 { name="rmdHelpers"; version="1.2"; sha256="1ahzbs8z7wvh1dwbq1kq8wrjrknxi2gck63k70gj0swjvgk0ih5r"; depends=[dplyr knitr]; }; rmda = derive2 { name="rmda"; version="1.6"; sha256="1m7j79jwii9la47w34ka3yl1n7nql8pfn32if0aycn4yw5sy8dmc"; depends=[caret MASS pander reshape]; }; rmdcev = derive2 { name="rmdcev"; version="1.1.1"; sha256="0pz60hzd3gvmrzcb29h0h4zb4lr5sdyw3nsa84hixsph00cf4lm0"; depends=[BH dplyr Formula purrr Rcpp RcppEigen rlang rstan rstantools StanHeaders stringr tibble tidyr tidyselect tmvtnorm]; }; rmdfiltr = derive2 { name="rmdfiltr"; version="0.1.2"; sha256="1hj4lhwyz47hznyqjgghp852fkzhk5k7dfp7cxabg8h49qzswcgx"; depends=[assertthat rmarkdown]; }; - rmdformats = derive2 { name="rmdformats"; version="0.3.6"; sha256="157811frmm1f7d7r27wr7f71frggm664w1diymw1kd88wgw3z89r"; depends=[bookdown htmltools knitr rmarkdown]; }; + rmdformats = derive2 { name="rmdformats"; version="0.3.7"; sha256="1pwd4z175dmz4fpg094rba48gq6sir8ys7ln7pfdsnwmgf79sj9k"; depends=[bookdown htmltools knitr rmarkdown]; }; rmdplugr = derive2 { name="rmdplugr"; version="0.4.1"; sha256="16wmrya8wdipqcrh34k4v4iq05aqd0jwf7rg6w1wsvx2i9211xg6"; depends=[bookdown rmarkdown]; }; rmdshower = derive2 { name="rmdshower"; version="2.1.1"; sha256="1sjpi5ils31adii51gaa8ly7x93l9ganp6in8rsln6si4jc2ppg9"; depends=[rmarkdown]; }; rmeta = derive2 { name="rmeta"; version="3.0"; sha256="0vkbnxp579v8zmcv1isdbzj5swpr6fq17zwparxcvzswjc2x9ydr"; depends=[]; }; - rmetalog = derive2 { name="rmetalog"; version="1.0.0"; sha256="1ndw8drzhf74sjx31zfhhx9q1l6pdn4yx2i8l7klp38d5bsc27xm"; depends=[ggplot2 lpSolve]; }; - rmetasim = derive2 { name="rmetasim"; version="3.1.7"; sha256="0sz4mdprdi6sgkfwfdvh2hr9nxiwq17sw0vggq3cvs7lzb0i6m9r"; depends=[ade4 adegenet gtools pegas]; }; + rmetalog = derive2 { name="rmetalog"; version="1.0.2"; sha256="00ln3wl23ybjgs44h9x388p56x8jymd54vbcfpzidbhz2im1ilbf"; depends=[ggplot2 lpSolve]; }; + rmetasim = derive2 { name="rmetasim"; version="3.1.14"; sha256="0rdkhfgyr97r2d1kd9g8ipb2pn563qxm1y4m9z678q0kqan2ddl0"; depends=[ade4 adegenet gtools pegas]; }; rmgarch = derive2 { name="rmgarch"; version="1.3-7"; sha256="108wrbqj4c02c9cyv5m5xlswb1mlfdrhggb005sixr2dcqghb163"; depends=[Bessel corpcor ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; }; rmi = derive2 { name="rmi"; version="0.1.1"; sha256="1y0395l9lhskdrk3x9ps2dmv0sznsba0n6a9fmma33dc9dhywgf9"; depends=[BH Rcpp RcppArmadillo]; }; - rminer = derive2 { name="rminer"; version="1.4.3"; sha256="0x9lzzhhy5zld8fajf4aq1msvck2kg3hvkpaiw4lx7w14znda7kd"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; }; + rminer = derive2 { name="rminer"; version="1.4.5"; sha256="0xwlayzmn4z6g9l93mj0vjsh31mhpxcmccvjm0dr802cjiv3phjj"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; }; rmio = derive2 { name="rmio"; version="0.1.3"; sha256="0zd8kki9wmh4xnabf7nwjw66wb4x5wngn0073pzqcj84ggxgnwqc"; depends=[]; }; - rmonad = derive2 { name="rmonad"; version="0.5.0"; sha256="0m7hhmn87rfh49hxrjlcxcq6q36niyxlh3w2frld68jkbks71jn5"; depends=[digest glue igraph magrittr pryr]; }; + rmonad = derive2 { name="rmonad"; version="0.7.0"; sha256="1vjx8kk57xk7c2a05c6kn75n17842ya7j41hqj3wmgq8yvaxrngx"; depends=[digest glue igraph magrittr pryr]; }; rmpw = derive2 { name="rmpw"; version="0.0.4"; sha256="1a49rvdwvmccv4gfir48fw0b9jyrpc2q9zfyk5j9b7nxsx6x7abl"; depends=[gtools MASS]; }; rms = derive2 { name="rms"; version="5.1-4"; sha256="19knh1sw0icw6jh9wfb2hq5jf49i2qfvp9myvqm5paa495689x9q"; depends=[ggplot2 Hmisc htmlTable htmltools lattice multcomp nlme polspline quantreg rpart SparseM survival]; }; rms_gof = derive2 { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; }; rmsfact = derive2 { name="rmsfact"; version="0.0.3"; sha256="05s23rfs9prr2ia3h4h9y614xhv91lbgppgf3mrrssxkwz220kd5"; depends=[]; }; - rmsfuns = derive2 { name="rmsfuns"; version="0.0.0.3"; sha256="0dn39d8kjkk808zjhb6npl7igmbp3j5q15z70f59g9j6xwm9dvnz"; depends=[dplyr magrittr PerformanceAnalytics purrr readr tbl2xts xts zoo]; }; - rmumps = derive2 { name="rmumps"; version="5.2.1-7"; sha256="0gnsynhlxh6pbhi1gr3zdi5y1gbbhbcp50z7y9b97px4j3hwignf"; depends=[Rcpp]; }; + rmumps = derive2 { name="rmumps"; version="5.2.1-12"; sha256="142f8kf6qydh7qrdhs12836zri137f0b3vaq8kqmcvya07pviyr9"; depends=[Rcpp]; }; rmutil = derive2 { name="rmutil"; version="1.1.3"; sha256="1nl20nyahnm55z41d096ni9iqhn19ab98i9c13ja1i6ik4gg9fks"; depends=[]; }; rmweather = derive2 { name="rmweather"; version="0.1.3"; sha256="1qdf511vmpffrdfcxlll54km2s0pf6pdswj8401k4ymv5iif91hl"; depends=[dplyr ggplot2 lubridate magrittr pdp purrr ranger stringr strucchange tibble viridis]; }; rmytarget = derive2 { name="rmytarget"; version="2.1.8"; sha256="1sn1pncxnv2jgxhmbm4zlq6zyi8nsz90x8b7697qlqf2la837v96"; depends=[dplyr httr lubridate purrr stringr]; }; @@ -12799,38 +12959,37 @@ in with self; { rnaturalearth = derive2 { name="rnaturalearth"; version="0.1.0"; sha256="193b31a7n9jhc607mhwxbpx5gr0fpj3qasm9dbi6kcc7vac3ilgm"; depends=[sf sp]; }; rnaturalearthdata = derive2 { name="rnaturalearthdata"; version="0.1.0"; sha256="1z32j5lz2lb8xgpkr73majw22k0b49iazj6jjc7j4w9k4zxxa102"; depends=[sp]; }; rnbp = derive2 { name="rnbp"; version="0.1.0"; sha256="01hx9r7ai42kcj8l7bmqrma8w3l1f9bmg2ingpqxirimxkfwv2k8"; depends=[curl httr jsonlite]; }; - rncl = derive2 { name="rncl"; version="0.8.3"; sha256="03c8sizm32rdilbvf67gsw81w7i623pajn9blrrkq8rq8j3zdbns"; depends=[progress Rcpp]; }; - rneos = derive2 { name="rneos"; version="0.3-2"; sha256="0m5mmhwnrk9ifv91s5ngmlvqqd7bw1n7glzkgk5i72cw0siiwmh0"; depends=[RCurl XML]; }; + rncl = derive2 { name="rncl"; version="0.8.4"; sha256="0ss9jqrvv7bhvl5j74cjrp8r866d9dlavrbbfscwz3mhkgfx06bb"; depends=[progress Rcpp]; }; + rneos = derive2 { name="rneos"; version="0.4-0"; sha256="07b3vb0h36ilwb8iylgppl8wpi84f583frmscpj236s1aihqwrmx"; depends=[RCurl XML]; }; rnetcarto = derive2 { name="rnetcarto"; version="0.2.4"; sha256="0fk5rym6zp049bl1f7bkl2231mjh3pgnxn0nhvmzpsah08rh4rr6"; depends=[]; }; rngSetSeed = derive2 { name="rngSetSeed"; version="0.3-2"; sha256="00mqjjkhbnvxqkf1kz16gipsf98q62vmhx9v8140qs7c4ljbhc3a"; depends=[]; }; rngWELL = derive2 { name="rngWELL"; version="0.10-6"; sha256="0pjjcs9pqj7mf0mhb2cwd0aanqpwnm65bm86hk6mi2vw8rgnj2vv"; depends=[]; }; rngtools = derive2 { name="rngtools"; version="1.5"; sha256="0xgmg3qb6insc157as47mcm9sdjdpy9jirh7w06bxb7pfcxqfx42"; depends=[digest]; }; rngwell19937 = derive2 { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; }; rnn = derive2 { name="rnn"; version="0.9.8"; sha256="1f1h7x9vff0jrdkv1gpxlmlr5v1c81gsfxy4z83rq3v0drpxahnv"; depends=[shiny sigmoid]; }; - rnoaa = derive2 { name="rnoaa"; version="0.9.5"; sha256="123gzgycv8lnx9dikkqjn2fhnpzlwgxdmzkvdvf3kgwl1gw9170b"; depends=[crul dplyr geonames ggplot2 gridExtra hoardr isdparser jsonlite lubridate rappdirs scales tibble tidyr tidyselect XML xml2]; }; + rnoaa = derive2 { name="rnoaa"; version="0.9.6"; sha256="073w2jadpih9amamwm3arw1d168p69dfhz98gvvmqay3k7dmwg0z"; depends=[crul dplyr geonames ggplot2 gridExtra hoardr isdparser jsonlite lubridate rappdirs scales tibble tidyr tidyselect XML xml2]; }; rnpn = derive2 { name="rnpn"; version="0.1.0"; sha256="10xx8fxgdknv71ks42xxvf38xsmjy6s87y67wi21673v0n07fxb5"; depends=[data_table httr jsonlite plyr]; }; rnr = derive2 { name="rnr"; version="0.2.1"; sha256="1z9bab3qmq8d79bcvjzldbxlah2w8mqp2ifd0cn1348dafwa0dhi"; depends=[assertthat purrr]; }; - rnrfa = derive2 { name="rnrfa"; version="2.0.1"; sha256="1p7wc3czp0i6il16nc1syp51i5gnb1hjx32j35ms8v20ficyb1zp"; depends=[curl dplyr ggmap ggplot2 httr jsonlite lubridate rgdal sp tibble xts]; }; + rnrfa = derive2 { name="rnrfa"; version="2.0.2"; sha256="0sjg04y1s7wfvimwv19ay5qhldsvncy34j0r79ddys7pmzql1aic"; depends=[curl dplyr ggmap ggplot2 httr jsonlite lubridate rgdal sp tibble zoo]; }; roadoi = derive2 { name="roadoi"; version="0.6"; sha256="1mlf63018qpgyqma51fas1nvags7qcrsw11hm6c1idnxjh0sz82z"; depends=[dplyr httr jsonlite miniUI plyr purrr shiny tibble tidyr]; }; - roahd = derive2 { name="roahd"; version="1.4.1"; sha256="0d89d21s32bsjkm8bdiqrbccd3m9badh87vrsb1laawhl4hr3dn9"; depends=[dplyr magrittr robustbase scales]; }; - robCompositions = derive2 { name="robCompositions"; version="2.2.0"; sha256="093lg17i8f94prai6mzwl70w3iy40hda6311mq9sirspr77nz3ni"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp RcppEigen reshape2 robustbase rrcov sROC tidyr VIM zCompositions]; }; + robCompositions = derive2 { name="robCompositions"; version="2.2.1"; sha256="18p0rb04fzmwqsxcap5mxhhmhav6qs05icdaq3msmbp0n9iwrpz6"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp RcppEigen reshape2 robustbase rrcov sROC tidyr VIM zCompositions]; }; robFitConGraph = derive2 { name="robFitConGraph"; version="0.1.0"; sha256="092nc0xnjs2zxd9ij0dl1xggb8mwl8nly284yjhhygmwlwsvhzxm"; depends=[MASS mvtnorm Rcpp]; }; robcbi = derive2 { name="robcbi"; version="1.1-3"; sha256="0rj732qdd0wd9d9pxldnsw5rif5d7wz327iydvxcf5x8lgvk42jd"; depends=[robeth]; }; robcor = derive2 { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; }; robcp = derive2 { name="robcp"; version="0.2.5"; sha256="023g9w26bxia873qblscdcf50r7qv5hknwdx45dqbr3r778ls8bn"; depends=[]; }; - robeth = derive2 { name="robeth"; version="2.7-5"; sha256="0jz3ivck9ma8x03sz41zkln3qh70ckfm5c2l57nlxi0ci5h0dfh2"; depends=[]; }; + robeth = derive2 { name="robeth"; version="2.7-6"; sha256="1x0hzgq7jwl83wwmy581ia8009v0j95aksnr5ywpflnqm76rj6v2"; depends=[]; }; robets = derive2 { name="robets"; version="1.4"; sha256="0lvzfpv6569pjysblhadd05sglx0qvyr9wipb9cpiya4a1992n61"; depends=[forecast Rcpp]; }; robfilter = derive2 { name="robfilter"; version="4.1.2"; sha256="0mvpaf6g694b7175bl3yr6lxbwla4pwp7g4y34qb4klgl5n3nw03"; depends=[lattice MASS robustbase]; }; - robin = derive2 { name="robin"; version="0.99.1"; sha256="0ghlfkpcfnywfb8psszbkzrljlissw11y4n52hhgm9ivk2ds4lk5"; depends=[DescTools fdatest ggplot2 gprege igraph networkD3]; }; + robin = derive2 { name="robin"; version="1.0.0"; sha256="0g0dzk20z98ygbxs3f8ylfjryxpdz5112jvdiax4iyj890yjp93c"; depends=[DescTools fdatest ggplot2 gprege igraph networkD3]; }; robis = derive2 { name="robis"; version="2.1.8"; sha256="1qi6ay0v3vc2gz5xalgj8vfx7zaiz5726mkkgwawxfj35gmdq0mk"; depends=[dplyr ggplot2 httr jsonlite leaflet]; }; - robmed = derive2 { name="robmed"; version="0.5.0"; sha256="02kavd5vllp3mf2gir66kf00n1ppc19k47zg4agfm2rhcn8whz9s"; depends=[boot ggplot2 quantreg robustbase shiny]; }; - robmixglm = derive2 { name="robmixglm"; version="1.0-2"; sha256="0z23frjv9yscw0q33s5vlrmisg9an5hksyhcrgcnlan6x63r91kq"; depends=[actuar bbmle boot fastGHQuad MASS numDeriv Rcpp VGAM]; }; + robmed = derive2 { name="robmed"; version="0.6.0"; sha256="1rlfn85nq6dpwwlp3z567vq23i233iwsjb0jss4ahfbnayydq2ir"; depends=[boot ggplot2 quantreg robustbase shiny]; }; + robmixglm = derive2 { name="robmixglm"; version="1.0-4"; sha256="03h79s63wy5mik3ijqqikxczhklrhd50ih9800hpy5h2yy59rlhn"; depends=[actuar bbmle boot fastGHQuad MASS numDeriv Rcpp VGAM]; }; robotstxt = derive2 { name="robotstxt"; version="0.6.2"; sha256="1c1rhiwkdzvbspwa5km6gp3sjhzmb60ljibb2pf26s931lkr5b6l"; depends=[future future_apply httr magrittr spiderbar stringr]; }; robreg3S = derive2 { name="robreg3S"; version="0.3"; sha256="0rv8qh98wws1f40d1kmysyy9qin0ngsvwq63cnxbwi290wsnrvls"; depends=[GSE MASS robustbase]; }; robregcc = derive2 { name="robregcc"; version="1.0"; sha256="159ms69jqjkf8bhi4hkm929hpwqi8qbcfyaahcjlkyximv7qnqaz"; depends=[magrittr MASS Rcpp RcppArmadillo]; }; robsurvey = derive2 { name="robsurvey"; version="0.1.1"; sha256="0rf2sd7maz565hlgpyhvkswqyck01hif4mg5isbnnky9n3nc98pi"; depends=[survey]; }; robumeta = derive2 { name="robumeta"; version="2.0"; sha256="1ynlfxlzh442jd1cf02j0f948m16d536a30gb4bf7208baqri1vg"; depends=[]; }; - robust = derive2 { name="robust"; version="0.4-18.2"; sha256="02x7d6dgx3skiadvx5m3c44b4bhz37ycpfhc25dhhv50y1db6l3k"; depends=[fit_models lattice MASS robustbase rrcov]; }; + robust = derive2 { name="robust"; version="0.5-0.0"; sha256="1ks5scp8bnicl9j1r8yrmz668fjs6ifdmi540zw6d2ck500bbw42"; depends=[fit_models lattice MASS robustbase rrcov]; }; robustBLME = derive2 { name="robustBLME"; version="0.1.3"; sha256="18wx116l1riy4wn4083kxl637mkyyi9wbwnmvhkgqw3vb36s4vxd"; depends=[doParallel foreach iterators lme4 mvtnorm numDeriv Rcpp RcppArmadillo]; }; robustDA = derive2 { name="robustDA"; version="1.1"; sha256="1yys6adkyms5r4sw887y78gnh97qqr7sbi5lxv5l9bnc4ggcfiz6"; depends=[MASS mclust Rsolnp]; }; robustETM = derive2 { name="robustETM"; version="1.0"; sha256="1dlj79v08bls500lb81rya6vwx58h97rpq1sy9zwd3mfl9b6awp9"; depends=[]; }; @@ -12838,7 +12997,7 @@ in with self; { robustSingleCell = derive2 { name="robustSingleCell"; version="0.1.1"; sha256="1rxjw5rwp20ssjgq26ajrbipqfjblmsgf87jgx7xa41mgmhwaq51"; depends=[biomaRt cccd dplyr GGally ggplot2 ggpubr ggrepel gplots igraph limma Matrix RANN RColorBrewer Rcpp reshape2 rslurm Rtsne scales]; }; robustX = derive2 { name="robustX"; version="1.2-4"; sha256="02476pl6gnv1sgp5qywlm79gkaxlghms2c1arj4b16r0gz0g230r"; depends=[robustbase]; }; robustarima = derive2 { name="robustarima"; version="0.2.5"; sha256="0mqlp4xmma74rgwb6rihbzs5nillcnddl6smlxmm8lq1wba27jdj"; depends=[splusTimeDate splusTimeSeries]; }; - robustbase = derive2 { name="robustbase"; version="0.93-5"; sha256="0mkzbsjl5nihyj7mzks14p6kr3spp44xvygjz4ran11gspdn9rdx"; depends=[DEoptimR]; }; + robustbase = derive2 { name="robustbase"; version="0.93-6"; sha256="1cr478xi4n9jwsdpbq182a7ig47rpb413q28dz6d1am08sk6657a"; depends=[DEoptimR]; }; robustfa = derive2 { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; }; robustgam = derive2 { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[mgcv Rcpp RcppArmadillo robustbase]; }; robustlmm = derive2 { name="robustlmm"; version="2.3"; sha256="1rfiz29wy20srwd24ja42fh51ng9vyqrkjbb2dzvsqf663hsf1q0"; depends=[cubature fastGHQuad ggplot2 lattice lme4 Matrix nlme Rcpp RcppEigen robustbase xtable]; }; @@ -12871,38 +13030,37 @@ in with self; { rootWishart = derive2 { name="rootWishart"; version="0.4.1"; sha256="1l9pr3i20hi5k02qnlb3blxhlvp2j0njn74xslw3gcjvyzjlr12j"; depends=[BH Rcpp RcppEigen]; }; roots = derive2 { name="roots"; version="1.0"; sha256="1ssmmmrg18xmqxs6f7dqv07357iwcvk21j1gxsl8s9njbj2plxai"; depends=[animation igraph rARPACK]; }; rope = derive2 { name="rope"; version="1.0"; sha256="06qp6h8cjnz0yacm4r39k99hrw74iyq16h5mqfcki7sf3zqbfm7r"; depends=[]; }; - ropenaq = derive2 { name="ropenaq"; version="0.2.7"; sha256="161yc2d82iivxaqpl5kzvxcmcqjpv6s5jj9pa304vj8cz0rnxgfr"; depends=[crul dplyr jsonlite lazyeval lubridate tidyr]; }; - ropenblas = derive2 { name="ropenblas"; version="0.2.0"; sha256="0bz0q4qw1ivr7l37vsrcimrndgww3ay9dbk2ga3fxhnz50yq6kxr"; depends=[cli fs getPass git2r glue magrittr RCurl rstudioapi stringr XML]; }; + ropenaq = derive2 { name="ropenaq"; version="0.2.9"; sha256="0lrm5nncybvcl0k4k8pwrdg3115wsi0zcspqscfyw1rd3w2h2yjg"; depends=[crul dplyr jsonlite lubridate magrittr rlang tidyr]; }; + ropenblas = derive2 { name="ropenblas"; version="0.2.4"; sha256="1in91cgm94mdifxgajf4rh1ilj33pgy6cdp63x2wack9ynkpkj4h"; depends=[cli fs getPass git2r glue magrittr pingr RCurl rstudioapi stringr XML]; }; ropendata = derive2 { name="ropendata"; version="0.1.0"; sha256="1bv6y241abs6pb4wq5ybx9x4zh72kf8ffs3vlcgdsmhw4jwrsxdl"; depends=[httr jsonlite]; }; ropensecretsapi = derive2 { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RCurl RJSONIO]; }; roperators = derive2 { name="roperators"; version="1.1.0"; sha256="0klmk1jmh1iysgf345qa6qyjmn1pkz072ha254k90flprgicg7c6"; depends=[]; }; ropercenter = derive2 { name="ropercenter"; version="0.2.0"; sha256="1ghn666jhwmkxwrr8pc398nhzvg4y4097pa19m4b08d9mkg9iqlj"; depends=[dplyr foreign haven httr readr rvest stringr tibble tidyr xml2]; }; roprov = derive2 { name="roprov"; version="0.1.2"; sha256="16w9i7svlkn2wbv35890f1zpcxilj0ar28d2xrdvmx7ni9vrz61q"; depends=[CodeDepends fastdigest igraph]; }; - roptim = derive2 { name="roptim"; version="0.1.2"; sha256="0kamdhyc7s1i7mbgzf6zbdbcs2qjjq4wgl1v181xzhq6gpv7fhy6"; depends=[Rcpp RcppArmadillo]; }; - rorcid = derive2 { name="rorcid"; version="0.5.0"; sha256="0508dc3av593bqylrq5zysav56p9243hg35gs8vhnbqjngfm1pib"; depends=[crul data_table fauxpas httr jsonlite tibble xml2]; }; + roptim = derive2 { name="roptim"; version="0.1.4"; sha256="18iwmfij9whg5rvdza607hf41acahmi35c6yj9hj6p2jkcr0xdpm"; depends=[Rcpp RcppArmadillo]; }; + rorcid = derive2 { name="rorcid"; version="0.6.4"; sha256="0v8h1d5dwx5aafw1dq64b8clhzc0ksnqpy5pfbid9c1f290xk907"; depends=[crul data_table fauxpas httr jsonlite tibble xml2]; }; + rorqual_morpho = derive2 { name="rorqual.morpho"; version="0.1.1"; sha256="1475yhb5qwj4zpsc4gqqpzs7qvyddxwc63i1f4rhnv6id2hi4msp"; depends=[dplyr magrittr]; }; rorutadis = derive2 { name="rorutadis"; version="0.4.2"; sha256="13a7xj4qw1nd8xgrqhrki3php960lgy9gy38sg4kpvs4j2rwijzc"; depends=[ggplot2 gridExtra hitandrun Rglpk]; }; rosetta = derive2 { name="rosetta"; version="0.2.0"; sha256="0b5xcy9gzw8d71m2pyx1m71mnbdggckhd42c7pzhkivkl79n5wdz"; depends=[car ggplot2 ggrepel gridExtra lavaan lme4 multcompView pander plyr psych pwr rio ufs]; }; rosetteApi = derive2 { name="rosetteApi"; version="1.14.3"; sha256="1fq5wg2rgcqv4x5045zgccpawgi6ac47hykfam9waqjnqy7r4y1a"; depends=[httr jsonlite]; }; rosm = derive2 { name="rosm"; version="0.2.5"; sha256="10n3yzhk29i3mzbcg6nkjqgvwc9n53ax0d7imn9l4a9msa06as07"; depends=[abind curl jpeg plyr png prettymapr rgdal rjson sp]; }; rospca = derive2 { name="rospca"; version="1.0.4"; sha256="1pxm34xsc2610n0i6dwcm4rhn016yqb03f8vrm93r7285c04n4q7"; depends=[elasticnet mrfDepth mvtnorm pcaPP pracma robustbase rrcov rrcovHD]; }; rosqp = derive2 { name="rosqp"; version="0.1.0"; sha256="0975g7p75bq238g7lr200svsqm9i11z7l331r0igm5ycahljrlsm"; depends=[Matrix R6 Rcpp]; }; - rotasym = derive2 { name="rotasym"; version="1.0-6"; sha256="134gpkcryqy4kwnm89d0ihzx4s7m7bs1wypq6mp2ajdnn8qh6zv1"; depends=[Rcpp RcppArmadillo]; }; + rotasym = derive2 { name="rotasym"; version="1.0.7"; sha256="19m47cs96frqavgx8rhr4xjdf1yzd6fm3a7dpskicxgmdis1yxii"; depends=[Rcpp RcppArmadillo]; }; rotationForest = derive2 { name="rotationForest"; version="0.1.3"; sha256="1z2wk3mcs5hrahsxralidbc0dd8gxdbwjpr2f71g4g3isfx1ic8d"; depends=[rpart]; }; - rotations = derive2 { name="rotations"; version="1.5"; sha256="1zksh6hyxdkm0lvvrld6dgkmhszn6wsjrjzr2xbn3af3gsvsydaa"; depends=[ggplot2 Rcpp RcppArmadillo rgl sphereplot]; }; + rotations = derive2 { name="rotations"; version="1.6.1"; sha256="175bbwj1bf58gwsw3721dsh8lsika5aqv787kfyjx041m4lar4zv"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo rgl sphereplot]; }; rotl = derive2 { name="rotl"; version="3.0.10"; sha256="0fh7fmaylv9490yhw6sknv03xmx5isp29mlr0xypyh6mwagngd1q"; depends=[ape assertthat httr jsonlite rentrez rncl]; }; rotor = derive2 { name="rotor"; version="0.2.4"; sha256="0m947mihnxjzsb64p5dgi4v1y1g3c172xlhdg08nzb2z21qg4r73"; depends=[dint R6]; }; - roughrf = derive2 { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[mice nnet randomForest]; }; round = derive2 { name="round"; version="0.12-1"; sha256="0smvyszxvq5c5p1mhkpcjphnmijjxn05n70xvg5syij200gn60fm"; depends=[]; }; roundhouse = derive2 { name="roundhouse"; version="0.0.1"; sha256="142dw9ky6fyp5n8zf5lymx083gi56q6wxj4jm0m8cjb0khiqw2lq"; depends=[httr jsonlite]; }; routr = derive2 { name="routr"; version="0.4.0"; sha256="1vswq7vm80nwb50grr4cs290kbq5lx9b19dq0c2wlp9d2dxk50si"; depends=[assertthat digest httpuv R6 reqres stringi uuid]; }; - rowr = derive2 { name="rowr"; version="1.1.3"; sha256="1f93c2yni956flwnxgphn340pc7p6yagr5xnmhinjgk9kvsd07yh"; depends=[]; }; - roxygen2 = derive2 { name="roxygen2"; version="7.0.2"; sha256="162xag27hwwyadfwm5zpyy15nxwhw2vbhwapx3jmi9cfyryr68sq"; depends=[brew commonmark desc digest pkgload purrr R6 Rcpp rlang stringi stringr xml2]; }; + roxygen2 = derive2 { name="roxygen2"; version="7.1.0"; sha256="00s1wzx5960k8pzgpz4kikjf4k061hyhnd278y65q6n0wzv3d6vy"; depends=[brew commonmark desc digest knitr pkgload purrr R6 Rcpp rlang stringi stringr xml2]; }; roxygen2md = derive2 { name="roxygen2md"; version="1.0.0"; sha256="1gvrfy0sk5qi8d93zxj5f7xgnnw0w38zyxdik4ckf0pkk0zdm27a"; depends=[desc devtools enc rex rlang tibble usethis withr]; }; royston = derive2 { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[moments nortest]; }; rpact = derive2 { name="rpact"; version="2.0.6"; sha256="09ikjcvz6jisbl387j5idypwxqn2ir55cq8f19klwc0p0d113wg4"; depends=[Rcpp]; }; rpanel = derive2 { name="rpanel"; version="1.1-4"; sha256="0yzasb4k5jcx3wfsll9k9alyrwc0l1x6pk91nj7cqrdiapw8j519"; depends=[]; }; rpart = derive2 { name="rpart"; version="4.1-15"; sha256="0p5frya963ppn476p5dxs2mnarsalksr6gw9zzmjsn8ikq7bx3ib"; depends=[]; }; - rpart_LAD = derive2 { name="rpart.LAD"; version="0.1.0"; sha256="07mp3gi15h3d5vs27nx2d5nawms3fly2mcqvkr2vb8aq6m377p3b"; depends=[Rcpp rpart]; }; + rpart_LAD = derive2 { name="rpart.LAD"; version="0.1.1"; sha256="08gmfpp7dllqyhxbls7bahrsz0jw4dnqd02j9l23lfs4fvwgb3w8"; depends=[Rcpp rpart]; }; rpart_plot = derive2 { name="rpart.plot"; version="3.0.8"; sha256="0y8054jw44jkjg8ijp3p2grsqwrmsdfzk8vps9ksgm7mgfq5732d"; depends=[rpart]; }; rpart_utils = derive2 { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; }; rpartScore = derive2 { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; }; @@ -12910,16 +13068,16 @@ in with self; { rpatrec = derive2 { name="rpatrec"; version="1.0.1"; sha256="0zj461frf6n5s97zq7r52q0blsn2xq2759impgz6v4pr87gmq0si"; depends=[np]; }; rpca = derive2 { name="rpca"; version="0.2.3"; sha256="135q3g8jmn9rwamrc9ss45cnbfyw8kxcbrf0kinw8asz70fihj9z"; depends=[]; }; rpcdsearch = derive2 { name="rpcdsearch"; version="1.0"; sha256="17g3x15qgv2hamlj451sb88i83n8svw5vnmjpijp5cnn5d1jx0d6"; depends=[assertthat combinat dplyr stringr xlsx]; }; - rpdo = derive2 { name="rpdo"; version="0.2.5"; sha256="1504f1i4aldnasnkc596pfpyqcmpvk6p20k46s27j8ld5470w3hn"; depends=[checkr err]; }; - rpf = derive2 { name="rpf"; version="0.62"; sha256="1vgqhwi676bi9jjxljnxblw65b5szjwbp87wnsabc11vfjzc9wki"; depends=[mvtnorm RcppEigen]; }; + rpdo = derive2 { name="rpdo"; version="0.3.0"; sha256="1l3rrkcpfgs6wgir6ls34385ihb179xbpxrbpkf7cnpwy8hc7amk"; depends=[chk]; }; + rpf = derive2 { name="rpf"; version="1.0.3"; sha256="1i2kqd7nx55nn35qnw89xmnqk23x9c8xhkh736c2xg7k2ai84ybl"; depends=[lifecycle mvtnorm Rcpp RcppEigen]; }; rpg = derive2 { name="rpg"; version="1.6"; sha256="1vn5cswrkmw98z1dr0f0yjkz3n8kwvjb4zknqg81fzqsagfc89yx"; depends=[getPass RApiSerialize Rcpp uuid]; }; - rphast = derive2 { name="rphast"; version="1.6.9"; sha256="111m824z7z0lqdj4kk4cp1yfjhx7d5d9463k892dyvgjvkagvi9g"; depends=[]; }; rphylopic = derive2 { name="rphylopic"; version="0.2.0"; sha256="0wmdvdz75bbwhn3qk8ic5lj256ik27d7vxrq9hg8c9rqzygj8wh3"; depends=[crul ggplot2 gridBase jsonlite png]; }; rpicosat = derive2 { name="rpicosat"; version="1.0.1"; sha256="1zj2d6jairmvya91vhv9kpkf34zmzl9vlha5yvfjj0j0apmqc0li"; depends=[]; }; rpinterest = derive2 { name="rpinterest"; version="0.3.1"; sha256="0kkf73byhgzqxw85wda3nh7qsq81pc035vi6z3fhnvb9ssszwakc"; depends=[httr magrittr rjson]; }; rpivotTable = derive2 { name="rpivotTable"; version="0.3.0"; sha256="0ndhsw4nnz6wf0v8dh4sz8867m01jjkzw6aq7f490z1ypa3d9fv5"; depends=[htmlwidgets]; }; - rplos = derive2 { name="rplos"; version="0.8.6"; sha256="1i5dzlv57bpddf9qsnq0azc0fsbmzqz9bkrijabp2qwxg0w76mcx"; depends=[crul dplyr ggplot2 jsonlite lubridate plyr reshape2 solrium whisker]; }; + rplos = derive2 { name="rplos"; version="0.9.0"; sha256="104vwyf9lz2d07dlxpg1ivvp8q6bqq4jszrhdsy0y2qbi97424br"; depends=[crul dplyr ggplot2 jsonlite lubridate plyr reshape2 solrium whisker]; }; rplotengine = derive2 { name="rplotengine"; version="1.0-7"; sha256="1bbciq84l0h6g4qajlcqg3v66g2rspflv6k7x5h5qzwlcb4p4dps"; depends=[xtable]; }; + rpls = derive2 { name="rpls"; version="0.4.0"; sha256="1dhnm8z6cn316p7mnnpc7l3acs2rq0bwc29amqg0fy4wyy54nrgc"; depends=[pcaPP robustbase]; }; rpmodel = derive2 { name="rpmodel"; version="1.0.4"; sha256="1rbygxk6dbi3pqxri5myc7f3y04haa0slpiaa330malg3dw5a9gc"; depends=[rlang]; }; rpms = derive2 { name="rpms"; version="0.4.0"; sha256="10zw0xln0vjrzrilyn67nnw13aadnskzca1930fvb483c691bm36"; depends=[Rcpp RcppArmadillo]; }; rpnf = derive2 { name="rpnf"; version="1.0.5"; sha256="07byg0ym4d2cr6fp74z379jhsaw4c0xrwf622dvhwa4frn4anl60"; depends=[]; }; @@ -12927,7 +13085,8 @@ in with self; { rpostgis = derive2 { name="rpostgis"; version="1.4.3"; sha256="04x5qdz0kznxnp9kygp0m2rjxyhqfz3mc81mcr4aw6cy5p4zp9aq"; depends=[DBI raster rgeos RPostgreSQL sp]; }; rpostgisLT = derive2 { name="rpostgisLT"; version="0.6.0"; sha256="1adwpkfndm6n3s9xcx8zrwnj6bmgvq4nzs072fnl5i6kjy6ngjm6"; depends=[adehabitatLT DBI htmltools leaflet lubridate magrittr mapview rpostgis RPostgreSQL sf shiny shinyWidgets sp]; }; rpql = derive2 { name="rpql"; version="0.7"; sha256="18llgwk1jfwf3y1dabpc508kfb1k4yh4cr4k76azkziv11arbh0c"; depends=[gamlss_dist lme4 MASS Matrix mvtnorm Rcpp RcppArmadillo]; }; - rprev = derive2 { name="rprev"; version="1.0.3"; sha256="14jc0bszb3cqfqqx5sdvfb3bddrxsifmf97x7cj1lg6pm85wdpvi"; depends=[data_table dplyr ggplot2 lazyeval lubridate magrittr survival tidyr]; }; + rpredictit = derive2 { name="rpredictit"; version="0.0.2"; sha256="1gsfcs5l83p4x0glhnq5hidh5rxwipklsj0nzkxaim65w9kqgx30"; depends=[dplyr DT dygraphs httr jsonlite magrittr quantmod shiny stringr xts]; }; + rprev = derive2 { name="rprev"; version="1.0.4"; sha256="1dzqbvfx3fcgfz3b18wwaaprvp0szjfshm8dgmj3r4vyzx71v9lv"; depends=[data_table dplyr ggplot2 lazyeval lubridate magrittr survival tidyr]; }; rprime = derive2 { name="rprime"; version="0.1.0"; sha256="1v6n1qi0i7x8xgizbyvp1mnwc316lsan4rvam44fgjj45fcd79gd"; depends=[assertthat plyr stringi stringr]; }; rprintf = derive2 { name="rprintf"; version="0.2.1"; sha256="0rwqpln0igxb4m6d6jyp7h3shfb8sbp0kj7cgkffjp88hn9qm4h3"; depends=[stringi]; }; rprojroot = derive2 { name="rprojroot"; version="1.3-2"; sha256="12r3fdxmi2pmwn6ic3rhg0b20ll5z420m0d8fziv1n21961namnz"; depends=[backports]; }; @@ -12936,14 +13095,14 @@ in with self; { rpsychi = derive2 { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j22zhav3yyfbbhqahs1whwjkksnam4w"; depends=[gtools]; }; rptR = derive2 { name="rptR"; version="0.9.22"; sha256="0vvjc6qiq71d5wckl77z606q1fp43mgrfzp1bxcab96n5whb2r9k"; depends=[lme4 pbapply]; }; rpubchem = derive2 { name="rpubchem"; version="1.5.10"; sha256="06j9ir65ykky5hdbyv74fnddwqd39jxvr6jig0kjqisc75k4spjz"; depends=[base64enc car data_table fingerprint iterators itertools RCurl RJSONIO stringr XML]; }; - rqPen = derive2 { name="rqPen"; version="2.2"; sha256="0zfsrxavyd65x35vg8vwv0fy07b1byf189avxidwfypxm0vr1x8y"; depends=[quantreg regpro]; }; - rqdatatable = derive2 { name="rqdatatable"; version="1.2.5"; sha256="1w4ljwz5lzgry1sn2wgbzccm0d5v49dwdljqw4kamynw1nqi7pby"; depends=[data_table rquery wrapr]; }; - rquery = derive2 { name="rquery"; version="1.4.2"; sha256="0l4747d2kcalq9c5ks18np0qsg7qbvqz0x7nrgh2mi2m9k0jb2rb"; depends=[wrapr]; }; + rpubs = derive2 { name="rpubs"; version="0.2.2"; sha256="18cnzhcvm7gx4k01ysqay53smrf8xqlbaszq41mny5c7qqh1fvpz"; depends=[rvest xml2]; }; + rqPen = derive2 { name="rqPen"; version="2.2.2"; sha256="077kdvfdyp5h8630k8jigbz8mfyby8vkjiqxpqv0wfi6cqcjlaf2"; depends=[quantreg regpro]; }; + rqdatatable = derive2 { name="rqdatatable"; version="1.2.7"; sha256="1p41nc54h4fq57ps1ilm3sq3qr3xhi0bxxhl80ylai0qmb445jd4"; depends=[data_table rquery wrapr]; }; + rquery = derive2 { name="rquery"; version="1.4.4"; sha256="1ccy9pmgbm4q3kljgx1pjhg2059pnb6jbnxq63z1fhnb59rm4nya"; depends=[wrapr]; }; rr = derive2 { name="rr"; version="1.4"; sha256="1c2h6ibjfwrjfqh1if3c90pdh0g2rf3p71j4p9w23xbbrx2l80pl"; depends=[arm coda magic MASS]; }; rr2 = derive2 { name="rr2"; version="1.0.2"; sha256="099vjg91ni2bnxlra18pvgsvzrl28zrj639cdjrh3wkpqv99d04q"; depends=[ape lme4 Matrix nlme phylolm]; }; rrBLUP = derive2 { name="rrBLUP"; version="4.6.1"; sha256="1ny48ra25rzx3k69pmzpd31ka2zhqyqiq1v7ann862j3ris0w8z9"; depends=[]; }; rrat = derive2 { name="rrat"; version="1.0.0"; sha256="1j1jd32pgggn5cqv66l63sw5p4hblgpznf33wd0zdbfapwy8rx4r"; depends=[quantreg]; }; - rray = derive2 { name="rray"; version="0.1.0"; sha256="0x4wavvjsiy8b9bhgxddisx82k6q52qhngr2am50bf38d3x2n58h"; depends=[glue Rcpp rlang vctrs xtensor]; }; rrcov = derive2 { name="rrcov"; version="1.5-2"; sha256="0m62k58nabw7hjz1qyyf9a0d6lvcz5vcvpksjnq93zcfra9inr57"; depends=[lattice mvtnorm pcaPP robustbase]; }; rrcov3way = derive2 { name="rrcov3way"; version="0.1-18"; sha256="1gpjmmdca2waqks0qykj59p50v6pf1zgl81m5lhbrhpcr4rdr63l"; depends=[nnls robustbase rrcov]; }; rrcovHD = derive2 { name="rrcovHD"; version="0.2-6"; sha256="03dr42np7a0yl3hi2iz4xp5b6yrazx6vlsjrby6fcn9r8y1fmac9"; depends=[pcaPP pls Rcpp robustbase robustHD rrcov spls]; }; @@ -12951,38 +13110,36 @@ in with self; { rrd = derive2 { name="rrd"; version="0.2.2"; sha256="104iz2y49vzm92a8nrvgzrjyljxl467mp1hjnjmzl4rhf9kl809y"; depends=[assertthat tibble]; }; rrecsys = derive2 { name="rrecsys"; version="0.9.7.3.1"; sha256="1qnjriv1xq4gjjhzz8jxrbk88mw5xddl2l2i4bmfhnxhi51d2rk3"; depends=[ggplot2 knitr MASS Rcpp registry]; }; rredis = derive2 { name="rredis"; version="1.7.0"; sha256="0wzamwpmx20did8xj8x9dllri2ps83viyqjic18ari7i4h1bpixv"; depends=[]; }; - rredlist = derive2 { name="rredlist"; version="0.5.0"; sha256="12dqilcwyxad5yjz8gh29ycwj2rbm1g0hxfsqkl7zsjaz5lbcka0"; depends=[crul jsonlite]; }; + rredlist = derive2 { name="rredlist"; version="0.6.0"; sha256="0cl3wbhx96a118f7yld7jf2jq8wimqqvd1apglshyvz3yj03dlxy"; depends=[crul jsonlite]; }; rrefine = derive2 { name="rrefine"; version="1.0"; sha256="1lh3vddrp5k9bhz5spv93w0qm9z5lskpdgxfksys0l3275hzx1lm"; depends=[httr readr rlist]; }; rreg = derive2 { name="rreg"; version="0.2.1"; sha256="05c2yj58zn43zkmqp4iyblsixsq76hsjkchffl5rkqynvgxi0qzi"; depends=[directlabels ggplot2]; }; - rrepast = derive2 { name="rrepast"; version="0.7.0"; sha256="1s596sk993aam5rsb4as2y3n5wcgjlnb25b29l59z0xks1v04mnc"; depends=[digest doParallel foreach ggplot2 gridExtra lhs rJava sensitivity xlsx]; }; + rrepast = derive2 { name="rrepast"; version="0.8.0"; sha256="1x8xda9cndxri2hhd2ihxmjjy0x74r0dh3953dfh7gvj4slaf0rl"; depends=[digest doSNOW foreach ggplot2 gridExtra lhs rJava sensitivity xlsx]; }; rres = derive2 { name="rres"; version="1.1"; sha256="138m26ya119805b1akwski0hf1ypiqsqjlkrm9p0l2x22zrv1n60"; depends=[kernlab Rcpp]; }; rriskDistributions = derive2 { name="rriskDistributions"; version="2.1.2"; sha256="1d9dwgw8la8wwq9cdnl7qibkzbdl4cj0qvf05x7w13ip973dwpaq"; depends=[eha mc2d msm tkrplot]; }; rrlda = derive2 { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[glasso matrixcalc mvoutlier pcaPP]; }; rroad = derive2 { name="rroad"; version="0.0.5"; sha256="09q5r9wq3vm5wy5aigx9wffv7m0njlp3sma1djm6cp7hhwgss0nj"; depends=[]; }; - rromeo = derive2 { name="rromeo"; version="0.1.0"; sha256="0dab3gcdpc5w9nxjw02348vj8cbrr8324aw982kjlrwkpjnvmfv5"; depends=[httr xml2]; }; + rromeo = derive2 { name="rromeo"; version="0.1.1"; sha256="1jjk5b41qg22a0zpjha2p2mfcb5q00gicqlxhkahjbj49q0c3mn9"; depends=[httr xml2]; }; rrpack = derive2 { name="rrpack"; version="0.1-11"; sha256="1bchha6dbkgc1raiks22cjmqzsias0c0frz8il67napkgmwlqk6d"; depends=[ggplot2 glmnet lassoshooting MASS Rcpp RcppArmadillo]; }; rrr = derive2 { name="rrr"; version="1.0.0"; sha256="0sv6k70mv325yjm8yjy4dw8cqc0xc071iiv94fk1l1yfz0n67prz"; depends=[dplyr GGally ggplot2 magrittr MASS plotly Rcpp]; }; rrscale = derive2 { name="rrscale"; version="0.1.3"; sha256="0pf5pac883f1p6gidy2k1nrbrygi1va8r5h785449dhphx806bf5"; depends=[abind DEoptim doParallel foreach]; }; - rrtable = derive2 { name="rrtable"; version="0.1.0"; sha256="1rvqb32fr63dkm5kz291pxzli8yi10k76v0lm1qdn28cx1l6ff3y"; depends=[devEMF editData flextable ggplot2 magrittr moonBook officer purrr readr rmarkdown rvg shiny stringr ztable]; }; + rrtable = derive2 { name="rrtable"; version="0.2.1"; sha256="1hblrxn7vixcp32j3cij0xrkzvk31agi9dqgxrimcrzs7gjcd1j5"; depends=[devEMF editData flextable ggplot2 ggpubr magrittr moonBook officer purrr readr rlang rmarkdown rvg shiny shinyWidgets stringr ztable]; }; rrum = derive2 { name="rrum"; version="0.2.0"; sha256="0w0f2n14if2b8x7n6v8y8q2vghd8j7xm1xhpxnvy3z50flinwgm7"; depends=[Rcpp RcppArmadillo rgen simcdm]; }; rsMove = derive2 { name="rsMove"; version="0.2.7"; sha256="0an5kknfap7hrg62gvdvrylx79p6fjdmbryhzlrj60i8n7cnc1c1"; depends=[caret ggplot2 lubridate plyr pryr raster Rcpp RCurl sp]; }; rsae = derive2 { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; }; - rsample = derive2 { name="rsample"; version="0.0.5"; sha256="0lkwhydb8csg24zkpsblyykzfsjqr930h46kbpm2wk9kgygkfspd"; depends=[dplyr furrr generics purrr rlang tibble tidyr tidyselect]; }; + rsample = derive2 { name="rsample"; version="0.0.6"; sha256="1va9zr2bbx7yld7am141d3xjhzcndlgng9pyq6i2bc8kqbxvw6kj"; depends=[dplyr furrr generics purrr rlang tibble tidyr tidyselect]; }; rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; }; - rscala = derive2 { name="rscala"; version="3.2.16"; sha256="0c07lq3qhg4h5n0g0s1i11q5jrlijvidrdy3h1ln262mn2wqn8az"; depends=[]; }; - rscielo = derive2 { name="rscielo"; version="1.0.0"; sha256="005nmi18831a2krl2xhj74ya9mfjq8zzccjafnfxha89x8ygxsa3"; depends=[dplyr httr magrittr purrr rvest stringr tibble xml2]; }; + rscala = derive2 { name="rscala"; version="3.2.19"; sha256="1wq0wrdbh0gi0bx4m9526qlbjm7nxxqgc17ikdx5mrhcy2f61hjk"; depends=[]; }; rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; }; rsconnect = derive2 { name="rsconnect"; version="0.8.16"; sha256="05ii0p0p7xpf8z0c1594s5q7wpwcs7lmlddrd67s5p2ka5m8qwiz"; depends=[curl digest jsonlite openssl packrat rstudioapi yaml]; }; - rscontract = derive2 { name="rscontract"; version="0.1.0"; sha256="0hhhndvrk9z6izdq4vh95bi9879k0svgpmhajrnm20xc5sb136jf"; depends=[]; }; + rscontract = derive2 { name="rscontract"; version="0.1.1"; sha256="1s19p9cga0qm1diblqf3rmcbm3agiimq4lhfgk004cg7rhaa1lyh"; depends=[]; }; rscopus = derive2 { name="rscopus"; version="0.6.6"; sha256="0kl6rv0j2396b8izvy0lp1f588il6w3yhq6d4swv8x8z14rsgcpw"; depends=[dplyr glue httr jsonlite plyr tidyr]; }; - rscorecard = derive2 { name="rscorecard"; version="0.14.0"; sha256="0r951j0n841ihlig2aw76vxdd31zbx98k4sz92nmi8zb69669d5w"; depends=[dplyr httr jsonlite lazyeval magrittr purrr tidyr tidyselect]; }; + rscorecard = derive2 { name="rscorecard"; version="0.15.0"; sha256="1pjzgsd9g0prbzkhm99bbd5kbqbygvxpr3flcdn8dj3fmgh21m1y"; depends=[dplyr httr jsonlite lazyeval magrittr purrr tidyr tidyselect]; }; rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; }; - rsdmx = derive2 { name="rsdmx"; version="0.5-13"; sha256="1lgy5nbrl4frfn805lghyx1gl2h8lkvgk07365jyvb8rzfcl43av"; depends=[plyr RCurl XML]; }; + rsdmx = derive2 { name="rsdmx"; version="0.5-14"; sha256="1b4x87h8kfw8yhmfsjf9l1i0afr7bgvyp5a369m5gn6m07dvlbp9"; depends=[plyr RCurl XML]; }; rseedcalc = derive2 { name="rseedcalc"; version="1.3"; sha256="18zmpjv6g8f7pmvqlp6khxyys9kdnq5x4zxwb6gwybsh4jxrymkp"; depends=[]; }; - rsem = derive2 { name="rsem"; version="0.4.6"; sha256="16nsbp4s20396h2in0zymbpmsn24gqlbik0vgv86zhy1yg1rz9ia"; depends=[lavaan MASS]; }; - rsf = derive2 { name="rsf"; version="0.2.0"; sha256="0p9h61nvr5p42c7cjqgsvv45ycircw8jd4h3075rly08jbp02nim"; depends=[bookdown knitr magrittr rlang usethis yaml ymlthis]; }; - rsgcc = derive2 { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene snowfall stringr]; }; - rsimsum = derive2 { name="rsimsum"; version="0.7.0"; sha256="1c63nzvyrnjva99hh3ikijpgsmnks8y8qsqxshxn9s1gjix7il5p"; depends=[checkmate ggplot2 ggridges rlang scales]; }; + rsem = derive2 { name="rsem"; version="0.5.0"; sha256="1xlk83ivmk8wm6mdmmwvv2z39r6scswgmsmy6dd4qbc3kiqn8cqm"; depends=[lavaan MASS]; }; + rsf = derive2 { name="rsf"; version="0.2.2"; sha256="016q6yly2vl6q9mkff2krri2rmzsm9gc9gippd8l38h5c8ri6cdl"; depends=[bookdown knitr magrittr rlang usethis yaml ymlthis]; }; + rsimsum = derive2 { name="rsimsum"; version="0.9.0"; sha256="02bnb6rr5dzvbywp88sp81lb6ibxlfqiba5vsgp5manx1zmbgjy0"; depends=[checkmate ggplot2 ggridges knitr rlang scales]; }; rsinaica = derive2 { name="rsinaica"; version="0.6.1"; sha256="1ba19b2fgnnl50qp6hgjppgxbadghq68qap9f0m51k2k3ijgfiwn"; depends=[dplyr httr jsonlite lubridate stringr]; }; rskey = derive2 { name="rskey"; version="0.4.1"; sha256="0l9z5zbii4wi7da6cl9mr62zn72pc3dgfhk6dp8sjx4jbzpa94s3"; depends=[berryFunctions miniUI rstudioapi shiny]; }; rsleep = derive2 { name="rsleep"; version="1.0.1"; sha256="0kjb5sgv1y50cqg54dy5cx9ngr64hx2bhfav314vm2alnxsk19jh"; depends=[edfReader ggplot2 jsonlite phonTools signal]; }; @@ -12990,96 +13147,98 @@ in with self; { rslurm = derive2 { name="rslurm"; version="0.5.0"; sha256="0dpxglcsqa2k0nak10515ga13c46rb4mrbpbr3gv7xckg6347zqg"; depends=[whisker]; }; rsm = derive2 { name="rsm"; version="2.10"; sha256="0a6bxrb0qad40lnigqjv2pnwwzcwi1rcmh9gb1a1b00k1n3mnmlc"; depends=[estimability]; }; rsnps = derive2 { name="rsnps"; version="0.3.0"; sha256="1ym58gqpvn708228pbkq1klvl60a60bwxwm0arzzad3wh1wansxj"; depends=[crul data_table jsonlite plyr stringr XML xml2]; }; - rsoi = derive2 { name="rsoi"; version="0.5.1"; sha256="17b78m3m0n191xbds70zvpwk27xw70phm66p6i26smc1zwg94y89"; depends=[curl memoise]; }; + rsoi = derive2 { name="rsoi"; version="0.5.2"; sha256="1dzmxsabldak6qmivxmfq98vcd7720xagnqrnxdksavgixp6w54h"; depends=[curl memoise]; }; rsolr = derive2 { name="rsolr"; version="0.0.9"; sha256="1mxvzb7wvm1agv35r82pr1hxa3fimixcwf36j98qjlxj9p7valrw"; depends=[BiocGenerics graph RCurl restfulr rjson S4Vectors XML]; }; rspa = derive2 { name="rspa"; version="0.2.5"; sha256="0jvrr3jaw66zqi5pal9dycpac24dn9v7lf2m63q01wmd8m3mlnv9"; depends=[lintools validate]; }; - rsparkling = derive2 { name="rsparkling"; version="0.2.18"; sha256="0lhq9jxxib2krl298hy3sglh5lm5lyibknigpbxx68pn71jwp1hm"; depends=[h2o sparklyr]; }; - rsparse = derive2 { name="rsparse"; version="0.3.3.4"; sha256="1n4h33vrbgia9pm04clji3qgvnamn53v334mj7z1ksx121avli38"; depends=[data_table float lgr Matrix mlapi Rcpp RcppArmadillo RhpcBLASctl]; }; + rsparkling = derive2 { name="rsparkling"; version="0.2.19"; sha256="1rb43lslhlg8jpniirzch8gnl86x6d3shcfp9fpxm0qd3fqrlm6z"; depends=[h2o sparklyr]; }; + rsparse = derive2 { name="rsparse"; version="0.4.0"; sha256="1blg59gsidh0sn6yy761pisz2phml0hzgqc24s5s8q9q903rddr9"; depends=[data_table float lgr Matrix Rcpp RcppArmadillo RhpcBLASctl]; }; + rspiro = derive2 { name="rspiro"; version="0.2"; sha256="1gjil39ib9p86a7r3i03h01x2dsc9y283rnp65xvavrzmmgz87b4"; depends=[]; }; rsppfp = derive2 { name="rsppfp"; version="1.0.4"; sha256="123yv54i58xj4wx9n08qp50mm4l271fm1zhzimrxx22wn2bg8zy5"; depends=[doParallel dplyr foreach igraph stringr tidyr]; }; rsq = derive2 { name="rsq"; version="1.1"; sha256="0pvnyf875jybid16mg1y3dmnlrk1vahckhr5zaai1a0k4i6mh4jf"; depends=[MASS]; }; rstack = derive2 { name="rstack"; version="1.0.0"; sha256="19vbfmkd6ymadah1y1w5rn52f4hviddccyc6qj2cv5viqwbwws2z"; depends=[R6]; }; rstackdeque = derive2 { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; }; - rstan = derive2 { name="rstan"; version="2.19.2"; sha256="1nh8sm97ck1fwmqj5ia70p5w8alcagx7y2956a3n5k97qfwwxr1i"; depends=[BH ggplot2 gridExtra inline loo pkgbuild Rcpp RcppEigen StanHeaders]; }; - rstanarm = derive2 { name="rstanarm"; version="2.19.2"; sha256="1k4sal4pmyyfb0n9k0x6n7kd04xq75scr6j357vpryaz8dfn46iz"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders survival]; }; + rstan = derive2 { name="rstan"; version="2.19.3"; sha256="128ndwjrhf8b1qvvqz4bl13qlm8718z9qs5ryc6gsdr3vk65s0np"; depends=[BH ggplot2 gridExtra inline loo pkgbuild Rcpp RcppEigen StanHeaders]; }; + rstanarm = derive2 { name="rstanarm"; version="2.19.3"; sha256="0gxjq8bdlvdd8kn3dhp12xlymdab036r7n12lzmd3xlkl4cnxq3s"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen RcppParallel rstan rstantools shinystan StanHeaders survival]; }; rstanemax = derive2 { name="rstanemax"; version="0.1.1"; sha256="0yvinnz0ybrarl1p36ibaiflava1hhdnh4avjgc5iq0b3nr6x42g"; depends=[BH dplyr ggplot2 magrittr purrr Rcpp RcppEigen rstan rstantools StanHeaders tidyr]; }; rstantools = derive2 { name="rstantools"; version="2.0.0"; sha256="1il0pn4ksbdkska5fmhvgaicvwnnc6cs08g6ags9fj1xkjiqmrsa"; depends=[desc Rcpp]; }; rstap = derive2 { name="rstap"; version="1.0.3"; sha256="176z39k54l5r60md6wziz828c46alv2pmqivvmhvb358crrb8x7n"; depends=[abind bayesplot BH dplyr ggplot2 lme4 loo Matrix nlme pracma Rcpp RcppEigen rstan rstantools StanHeaders]; }; - rstatix = derive2 { name="rstatix"; version="0.3.1"; sha256="0iiv0l3rm5b2y018hm65n4385iq9ixwj4qgf1n4f71y0hl36bg91"; depends=[broom car corrplot dplyr magrittr purrr rlang tibble tidyr tidyselect]; }; + rstatix = derive2 { name="rstatix"; version="0.4.0"; sha256="099kaldzlkyxg7af4wrhpqp07d3ha1bm9zk4fcdkgqw9nknbp00z"; depends=[broom car corrplot dplyr magrittr purrr rlang tibble tidyr tidyselect]; }; rstatscn = derive2 { name="rstatscn"; version="1.1.3"; sha256="07w7ixq1faq7mif2ksxcgl8n6ali9h0wx0nb2yz4kbdgvz68r7b9"; depends=[httr jsonlite]; }; rstiefel = derive2 { name="rstiefel"; version="1.0.0"; sha256="0g09fpp3432v78gqgn0hiva6zqr8yqn379wz4428wanmiskqr3f0"; depends=[]; }; rstpm2 = derive2 { name="rstpm2"; version="1.5.1"; sha256="0p1zqqjss8i5wca4qvr56d6p9ak20ki4cfbxja1wrhkp4kii29r6"; depends=[bbmle deSolve fastGHQuad mgcv Rcpp RcppArmadillo survival]; }; - rstream = derive2 { name="rstream"; version="1.3.5"; sha256="1wprsnwl63cc4a6j5h18r09wlh32bq5z6hj6r5klp7rkpjchsplp"; depends=[]; }; - rstudioapi = derive2 { name="rstudioapi"; version="0.10"; sha256="15mbw607ncdf53mgga76n3va5zzdcjqz14nb0jcn9axwccqamic0"; depends=[]; }; - rsubgroup = derive2 { name="rsubgroup"; version="0.6"; sha256="1hz8rnbsl97ch6sjwxdicn2sjyn6cajg2zwmfp03idzpb3ixlk7l"; depends=[foreign rJava]; }; + rstream = derive2 { name="rstream"; version="1.3.6"; sha256="1mr869hff5wdpw6a7x71366y8dxf9vljbb11fssfkhcf7hm2ipnj"; depends=[]; }; + rstudioapi = derive2 { name="rstudioapi"; version="0.11"; sha256="0srh0m4mw4k6s7spwb84l4cx4xnn04cp5cjxi0fwza7bwavpzq0k"; depends=[]; }; + rsubgroup = derive2 { name="rsubgroup"; version="1.0"; sha256="1151w8lzsj3w7k56gdry44g9a8a1iqh5m0srd6mydzdxaj90q2pc"; depends=[foreign rJava]; }; rsurface = derive2 { name="rsurface"; version="1.1.0"; sha256="1pymbgvr72nqd66wap5wrcizzx2k9bfr6vkxv6dkvjmi8q7jl2gv"; depends=[plotly rsm]; }; rsurfer = derive2 { name="rsurfer"; version="0.2"; sha256="14zd8fhak12yha6miwb84085722v5ipk8lagijhc6af291kp70i9"; depends=[gdata stringr]; }; - rsvd = derive2 { name="rsvd"; version="1.0.2"; sha256="0fia77y5fxnhwkcxlgp98ygb8fdfraky75x80hkf7kvvpwc5rzn8"; depends=[Matrix]; }; + rsvd = derive2 { name="rsvd"; version="1.0.3"; sha256="1fvrw46fl5xb2akaa4mp8nja4h7nn4bdhnjdrk22fsdfqc7hwmhk"; depends=[Matrix]; }; rsvg = derive2 { name="rsvg"; version="1.3"; sha256="11mccgf6hfskg45wqc114sx3qy2r494y6axdf73z6xwhs1wpm97g"; depends=[]; }; rsyslog = derive2 { name="rsyslog"; version="1.0.1"; sha256="1i33bpv894jk7cixsvn85h1g532zj39f8dfqq8cyzgsav9wba2y4"; depends=[]; }; rt_test = derive2 { name="rt.test"; version="1.18.7.9"; sha256="0ywkdjvfzmrmmsfkz4jbhwzbzv7wivx80xy8wr92dch1862h6ias"; depends=[]; }; rt3 = derive2 { name="rt3"; version="0.1.2"; sha256="1fqbymkz4csavkxrs26glzrh0kw3qy9x5smgddgda9a1dxh9ljkm"; depends=[]; }; rtape = derive2 { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5qig2nnq5mgak1wbpimhl7z3wm7"; depends=[]; }; - rtdists = derive2 { name="rtdists"; version="0.10-0"; sha256="0dm4nx94xfg6bs7v2m4makk4qx4zw1xh49nihpsaj8vx1ng4lp89"; depends=[evd gsl msm Rcpp]; }; + rtdists = derive2 { name="rtdists"; version="0.11-2"; sha256="0fap15bkxn2azd5a4j3q9mxpif5ff3y2vb8rm4xnh8l0sl1lw7cs"; depends=[evd gsl msm Rcpp]; }; rtematres = derive2 { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[gdata plyr RCurl XML]; }; + rtemps = derive2 { name="rtemps"; version="0.4.0"; sha256="04ipklqsx4c7h95zj76g55h5kq33mabkydzr9lcvsfrc7ms7jjmi"; depends=[bookdown DT ggplot2 knitr rmarkdown xfun]; }; rtext = derive2 { name="rtext"; version="0.1.21"; sha256="0j2jfz0mz9552dwa78d527lxipmj5ql8q8np8qq5jw4ka6wj5lbs"; depends=[digest hellno magrittr R6 Rcpp RSQLite stringb]; }; - rtf = derive2 { name="rtf"; version="0.4-14"; sha256="1v4vb2ijqlbqcjqdhf85kfzs67whkhm6ygp5cw8xa6qw179vkgd5"; depends=[R_methodsS3 R_oo]; }; - rtfbs = derive2 { name="rtfbs"; version="0.3.15"; sha256="1447wjdjcc18sj6ngh22zfc50jk8zshdgkwp1d7ba4n5qsj7b2fl"; depends=[rphast]; }; - rticles = derive2 { name="rticles"; version="0.13"; sha256="0di9vdvz4kcdzahghbc77wpgb00c8lb3fjdsn1jrnr4whznl5fiq"; depends=[knitr rmarkdown tinytex xfun yaml]; }; - rtide = derive2 { name="rtide"; version="0.0.5"; sha256="0ns79xkkl141bbns8zlvx3gf48k4a03qa21pjyhnhgkm9lsihwfc"; depends=[abind checkr lubridate]; }; + rtf = derive2 { name="rtf"; version="0.4-14.1"; sha256="032ff0yavqmd2d9svgwkmvxwh0cxjbac6pj48v4cshi898f02rhh"; depends=[R_methodsS3 R_oo]; }; + rticles = derive2 { name="rticles"; version="0.14"; sha256="1377fib4asazhhki4aajvld0wa35vd3zjvyl3lf2hjm2qk3vyak7"; depends=[knitr rmarkdown tinytex xfun yaml]; }; + rtide = derive2 { name="rtide"; version="0.0.7"; sha256="1l2fradbknlbgsm6nj89k9bhg7fxdrh0wcnar0mdgqqcr8qzs8hk"; depends=[abind chk dttr2 tibble]; }; rtiff = derive2 { name="rtiff"; version="1.4.7"; sha256="0l0chjbn8kipnhi37zshphxmxga6id39rm5gzz5gjrv8bnaaxxqb"; depends=[pixmap]; }; rtika = derive2 { name="rtika"; version="1.23"; sha256="0m27vv4jb39lqnv0cnx6wznn3h8ia2if0np670wf1345v9i4ygyh"; depends=[curl digest rappdirs sys]; }; rtimicropem = derive2 { name="rtimicropem"; version="1.4.0"; sha256="0z6bnzks8mcb871m3z5b3cd883hj1i17swjgly005hvwbvi9h61f"; depends=[changepoint dplyr fs ggplot2 knitr lazyeval lubridate R6 rbokeh readr stringr tibble tidyr]; }; rtip = derive2 { name="rtip"; version="1.1.1"; sha256="0lfny8nvgnf90xsmgmr32nzjbw8117m4vw7d0bc3xm4pzpnymjdq"; depends=[boot ggplot2 mvtnorm plyr rootSolve]; }; + rtist = derive2 { name="rtist"; version="1.0.0"; sha256="0p4jlz0z0nbvmixdrym6nqagz2i28zbsijcj785rd6wiy72d2hg5"; depends=[]; }; rtk = derive2 { name="rtk"; version="0.2.5.8"; sha256="1ybppi5h86gb324hlkx91m2kk2dw7hi5k5l2fh5h1xnlqjv55n0b"; depends=[Rcpp]; }; rtkore = derive2 { name="rtkore"; version="1.5.5"; sha256="0srk0ih4gbmhb1pl6zf8sjwrkdmgws9cl1397fcqv6l3bc376622"; depends=[inline Rcpp]; }; - rtmpt = derive2 { name="rtmpt"; version="0.1-17"; sha256="0hp4hia8fp9kbs25hgbjv2nr3h0lkn4v4b0j0c4a9bfm2mrvy0l9"; depends=[coda data_table LaplacesDemon loo stringr truncnorm]; }; + rtmpt = derive2 { name="rtmpt"; version="0.1-19"; sha256="1cpakgy0rmy27b14krmgdrf1fi0mar4k5rklnvmphivid8150gzn"; depends=[coda data_table loo matrixcalc stringr truncnorm]; }; rtop = derive2 { name="rtop"; version="0.5-14"; sha256="1wwllckginnzisapbklpsizy47db24r83xahq4qsd8zhqvv9yj33"; depends=[gstat sp]; }; rtrek = derive2 { name="rtrek"; version="0.3.0"; sha256="0nfkmcyrb1gbgjjy62ffjlg6x93zy4s4qg6ii98gjbn0jp6pcj1j"; depends=[downloader dplyr ggplot2 jpeg jsonlite magrittr memoise purrr rvest tibble tidyr xml2]; }; rtrends = derive2 { name="rtrends"; version="0.1.0"; sha256="04xdggf36m294drb9z8khdjr6fgsg4bwkb4mmbbvqfzjpq4mq4y1"; depends=[dplyr lubridate tidyr]; }; - rtrim = derive2 { name="rtrim"; version="2.0.6"; sha256="18fvi8zbf9dqwi5x0sgy2aay5565ldvqpispqqb5gx2lwb9qra2r"; depends=[]; }; + rtrim = derive2 { name="rtrim"; version="2.1.1"; sha256="1l2ijkm4p3nd7n4q1b4y9pdyafgyf76zizpi7hhzw1rr9zkxhff2"; depends=[]; }; rts = derive2 { name="rts"; version="1.0-49"; sha256="086zlmcjsv7a38k1jfzq2vhlmx7nivhffcz83i57hl6wbkjl7gv2"; depends=[raster RCurl sp xts zoo]; }; rtsdata = derive2 { name="rtsdata"; version="0.1.2"; sha256="0h0zk8vy21xh0n6pcipgml0b0f4pfi94q6hjdqkxd3xsa6a5scra"; depends=[alfred anytime brotli curl data_table mongolite Quandl quantmod xts zoo]; }; rtson = derive2 { name="rtson"; version="1.3"; sha256="1gwvk7nmq9bz90jy1zh7lhr735iw804pmwxykdpaigcsnxk7zx03"; depends=[R6]; }; - rtsplot = derive2 { name="rtsplot"; version="0.1.2"; sha256="1y2is2n2r0xz71ajvxqc22qg8dzidrzq475a7nc7xjgfriayx535"; depends=[quantmod RColorBrewer xts zoo]; }; + rtsplot = derive2 { name="rtsplot"; version="0.1.3"; sha256="0va6ir0bmpnw4ibvfh2j4z01flg72dpxn7q10sdsdj304hb0g4in"; depends=[quantmod RColorBrewer xts zoo]; }; rtweet = derive2 { name="rtweet"; version="0.7.0"; sha256="05pbvxm2vmf6935b9s6663k3aifnkr3m52wh2jvnplmrwyrfpn9n"; depends=[httpuv httr jsonlite magrittr progress Rcpp tibble]; }; rtype = derive2 { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; }; - rtypeform = derive2 { name="rtypeform"; version="2.0.0"; sha256="00as49l9plncc25bn93x36hpxnxachsh382ivhq6k9d9gi8424c0"; depends=[dplyr glue httr jsonlite lubridate purrr tibble tidyr]; }; - rubias = derive2 { name="rubias"; version="0.3.0"; sha256="18sivq5ilq14mqs62vh6l24fcayvd7ffdbva94ir6n0gx9axmm22"; depends=[dplyr gtools magrittr Rcpp RcppParallel readr rlang stringr tibble tidyr]; }; + rtypeform = derive2 { name="rtypeform"; version="2.0.1"; sha256="09lcfdkwk274zxkbvg4l1v62xcb9p98qix6rg8ksniz35230f6f0"; depends=[assertthat dplyr glue httr jsonlite lubridate purrr tibble tidyr]; }; + rubias = derive2 { name="rubias"; version="0.3.1"; sha256="1x7h38lsdq03cd72ffawr8mpnf1c1a16sxgmz3c52fn3b9n28jxm"; depends=[dplyr gtools magrittr Rcpp RcppParallel readr rlang stringr tibble tidyr]; }; rucm = derive2 { name="rucm"; version="0.6"; sha256="1n6axmxss08f2jf5impvyamyhpbha13lvrk7pplxl0mrrrl5g0n8"; depends=[KFAS]; }; - rucrdtw = derive2 { name="rucrdtw"; version="0.1.3"; sha256="0wbh9zbgqf5bk1ix5qry18lhgdqk90pn5xnv401268gldjy4z777"; depends=[Rcpp]; }; - rugarch = derive2 { name="rugarch"; version="1.4-1"; sha256="05dlzrv9ahfwqq5bmd9vk13zvzwgf1zyq65kp3qf94v9sp5xr5kx"; depends=[chron expm ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; }; + rucrdtw = derive2 { name="rucrdtw"; version="0.1.4"; sha256="0865x8i2n63xjbq0pzalm4gd6rpg72yrcsm4rw40a3kzy2svvnlm"; depends=[Rcpp]; }; + rugarch = derive2 { name="rugarch"; version="1.4-2"; sha256="12rrxdj5am3qjg1iya6g8a3ak167dd4sqgfmpa4ims588gj5szkm"; depends=[chron expm ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; }; ruimtehol = derive2 { name="ruimtehol"; version="0.2.3"; sha256="073qb7g9j6zkk6hxf78y7ymnmc1s4hbjxxlymjhxpvjfbg4xpslw"; depends=[BH Rcpp]; }; ruin = derive2 { name="ruin"; version="0.1.1"; sha256="124xs1c2mjfy6z0bp83rwkqw2y73g77xwn3q4yd2xw0v2frnpvpz"; depends=[ggplot2]; }; - ruler = derive2 { name="ruler"; version="0.2.1"; sha256="01b5qn6b69hhl9df6sr187w16z5hj6vxb8yi77y2rghkcrnm12i9"; depends=[dplyr keyholder rlang tibble tidyr]; }; + ruler = derive2 { name="ruler"; version="0.2.2"; sha256="190yvz6hpqmcjydcjy69fr6jya3la325fpz1a5g38xhrj6a9v4kn"; depends=[dplyr keyholder rlang tibble tidyr]; }; + runes = derive2 { name="runes"; version="0.0.1"; sha256="0aq4wlxwc00a39lgfvr2pyhh7hcrb3n19mm83qvr8kyz30dhghx9"; depends=[]; }; runittotestthat = derive2 { name="runittotestthat"; version="0.0-2"; sha256="15zdcvqkr5ivq6wk6dw8k6diginc6z7mdc18pswim90d99j2g9sm"; depends=[assertive RUnit]; }; runjags = derive2 { name="runjags"; version="2.0.4-6"; sha256="0w97s1j5v05fn4nclqwg56hl9vz6vi2l6sp042r6iyh024fsyg22"; depends=[coda lattice]; }; - runner = derive2 { name="runner"; version="0.3.1"; sha256="0dxg4s5cldh112bk65ymj2ir2zi7n47rs72zcwr9abp65hlg32gf"; depends=[Rcpp]; }; + runner = derive2 { name="runner"; version="0.3.5"; sha256="0x73bza6dgi52f33hy94pqbbwwy1pmw8dzifrsfkz3kca2hgprzr"; depends=[Rcpp]; }; runstats = derive2 { name="runstats"; version="1.1.0"; sha256="0n9348af60j8a2mwgbafabspb4nm45ry92zlzmynja06zyx8lb2d"; depends=[fftwtools]; }; rusda = derive2 { name="rusda"; version="1.0.8"; sha256="0xx72jjf1pyixwpnvvgx5n2vc5gl46bam1caav043iqki68wb338"; depends=[foreach httr plyr RCurl stringr taxize testthat XML]; }; rusk = derive2 { name="rusk"; version="0.1.1"; sha256="0a6vbcnfzlfq9fmibiy0cwcfix65qhxq4f7wc7d53riga82s00lk"; depends=[dplyr ggforce ggplot2 reshape2 shiny tidyr]; }; rust = derive2 { name="rust"; version="1.3.8"; sha256="05xqvbkjckwxmhgcl9dqb7y20jq8b6f2fad5dikvbq5l8pwfygxj"; depends=[Rcpp RcppArmadillo]; }; ruta = derive2 { name="ruta"; version="1.1.0"; sha256="1qr2ryz55h2j3wlwg0535lhmk2ydm0idfxl07rlfxq1pi32cjms1"; depends=[keras purrr R_utils]; }; + rutifier = derive2 { name="rutifier"; version="1.0.4"; sha256="045pr8apd105azs1glpwqrbamglqddxfpml9yrfrlaivz3fjd9l8"; depends=[R_utils]; }; ruv = derive2 { name="ruv"; version="0.9.7.1"; sha256="1n4q9mrp9f644spbns6bbnzmlabrg90hwkdfg3hnm3rxp9b4xid0"; depends=[ggplot2 gridExtra scales]; }; - rv = derive2 { name="rv"; version="2.3.3"; sha256="1h5lhy87v88b70a7pbq5xirskm6ih9fk90n6mzp1nmkr7w1d3zai"; depends=[]; }; + rv = derive2 { name="rv"; version="2.3.4"; sha256="0kn56agxv6p861r247yhwfkp8pj33bghy5444a6f3y22yyzc8ngz"; depends=[]; }; rvHPDT = derive2 { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; }; rvTDT = derive2 { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; }; rvalues = derive2 { name="rvalues"; version="0.6.3"; sha256="1bsdvwcijb75f27c8padjx8663as667axc4skwa6xgv5y423kbd0"; depends=[]; }; - rvcheck = derive2 { name="rvcheck"; version="0.1.7"; sha256="1a3xlzi4n1rqiapfa180aif7n7nws8pbg8k3nk7ccaczvmni38aw"; depends=[BiocManager rlang]; }; + rvcheck = derive2 { name="rvcheck"; version="0.1.8"; sha256="0627bc8qmhxmd63yh6f90qni3qw1zwdpxjln2qbychzmzd4am9ac"; depends=[BiocManager rlang]; }; rversions = derive2 { name="rversions"; version="2.0.1"; sha256="1ic6sxnyya24d5xsxjg3fba73fhya9fhs0kaf66yha6nwxj1zv2i"; depends=[curl xml2]; }; - rvertnet = derive2 { name="rvertnet"; version="0.7.0"; sha256="01z3ij5z21v901hz4l9173r4pa9jz2nl7bx086ka1bxvcy0dgqgj"; depends=[crul dplyr ggplot2 jsonlite maps]; }; + rvertnet = derive2 { name="rvertnet"; version="0.8.0"; sha256="1j8kgyzcn14yl44lnxc8f83wpmgpdzx5aiw91zjbjkajj6bgzrpn"; depends=[crul dplyr ggplot2 jsonlite maps]; }; rvest = derive2 { name="rvest"; version="0.3.5"; sha256="0r0a5jic09xw5pk0x42pr99r3zab5m9s4x85ymx1sl769jz42zqf"; depends=[httr magrittr selectr xml2]; }; - rvg = derive2 { name="rvg"; version="0.2.3"; sha256="1psqjwn80vqfvfl9hyx0rabqrrlqp34hrwrbg8ghsd65f0f1ncgm"; depends=[gdtools officer Rcpp rlang xml2]; }; + rvg = derive2 { name="rvg"; version="0.2.4"; sha256="12ghjppq5igic2mw8k3p5cnywm26c615ll3j3a9fasyyzkxx6i05"; depends=[gdtools officer Rcpp rlang xml2]; }; rvgtest = derive2 { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; }; - rviewgraph = derive2 { name="rviewgraph"; version="1.2"; sha256="0qw1fdfwg2763a1k1qmryblw5rpagsi5p70rs7fj256zfcjvwrz8"; depends=[rJava]; }; rvinecopulib = derive2 { name="rvinecopulib"; version="0.5.1.1.0"; sha256="1616xqchjyqqf2nmgx5rlpnw8g4696lvlpmrx7jav2cnvkff7s2i"; depends=[assertthat BH kde1d lattice Rcpp RcppEigen RcppThread wdm]; }; rvkstat = derive2 { name="rvkstat"; version="2.6.3"; sha256="0vh5gsvfs01f7mw0cl1wap1w1nsgr4fyv9fdays8b8ad3gc17a2r"; depends=[httr jsonlite RCurl tidyr]; }; - rwalkr = derive2 { name="rwalkr"; version="0.5.1"; sha256="1436qdwx1i8868wj45xdrr79bvsf9qaf5msjc778qlmvyyyswxh7"; depends=[dplyr hms httr tidyr]; }; - rwars = derive2 { name="rwars"; version="1.0.0"; sha256="0kmwpr6gn3xsf0pqx153vblpjbhc34mzlgyv8xb2nw78nf8znfij"; depends=[httr]; }; + rwalkr = derive2 { name="rwalkr"; version="0.5.2"; sha256="1661vg5mdizgynlniq6pibmhn0spnh3d4w6bh08nyjwwchkagrxi"; depends=[dplyr hms httr tidyr]; }; rwavelet = derive2 { name="rwavelet"; version="0.4.0"; sha256="0wb3kd97inyh985q1hspnzwxfawfdps43r3zzdpw0jd8sgd7zqxp"; depends=[signal]; }; rwc = derive2 { name="rwc"; version="1.11"; sha256="1qhgkbkp4nz0wq5c4x8232xiszpiyzcdklfgvpnx4cbp3bbfdi4g"; depends=[MASS Matrix mvtnorm raster]; }; - rwebstat = derive2 { name="rwebstat"; version="1.0.2"; sha256="14mzqs4qjb3qgpci1a1c4sj803mjnzv9j910zmhkg5l8bx9nj5xw"; depends=[dplyr getPass httr readr]; }; + rwebstat = derive2 { name="rwebstat"; version="1.1.0"; sha256="106dkhlr33ii17q45c1hrmbslwsj1qlmx325skch2q71mv7ii0lj"; depends=[dplyr getPass htmltools httr jsonlite readr stringr]; }; rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; }; - rwhatsapp = derive2 { name="rwhatsapp"; version="0.2.1"; sha256="1lwa8x2a2k7vspll4k8g7l09cvpxxnpv2476x50fzvn126881g5i"; depends=[stringi tibble]; }; + rwhatsapp = derive2 { name="rwhatsapp"; version="0.2.2"; sha256="00cgczgim3ls5jjaklpwfyf24794zhpdjj9pl9fkw20fxhz91bpd"; depends=[stringi tibble]; }; rworldmap = derive2 { name="rworldmap"; version="1.3-6"; sha256="1q1h0n9qr0m5pdx10swrh9ddsvdj8kv5nqngrf3lnx9rg9iwivjk"; depends=[fields maptools sp]; }; rworldxtra = derive2 { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; }; rwstats = derive2 { name="rwstats"; version="0.1"; sha256="10jj2lkilysz7mmysblj6l4jjc560rqsps0ivkvyr7caj8gfhdlb"; depends=[]; }; @@ -13093,16 +13252,16 @@ in with self; { ryouready = derive2 { name="ryouready"; version="0.4"; sha256="1d9z3paxcrkwsgn5g83x57jwz2iqarks30x0bwg48i5ispw6xbr3"; depends=[car ggplot2 stringr]; }; rysgran = derive2 { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[lattice soiltexture]; }; rzeit2 = derive2 { name="rzeit2"; version="0.2.3"; sha256="0fvkpc6l57s64m0zx8fzazvyhpn5wxa1cb185h20x8hjf069i5lf"; depends=[anytime httr jsonlite openssl rvest stringr xml2]; }; - rzmq = derive2 { name="rzmq"; version="0.9.6"; sha256="05j34fwwqlzq9nfkaafl39aqc0nvljf22pndqhj151gpnrpgr8w0"; depends=[]; }; + rzmq = derive2 { name="rzmq"; version="0.9.7"; sha256="0iasjaka3gx616l5bxyg2k0fi33hldaplvs0h03j6jpxfmxvcisz"; depends=[]; }; s2 = derive2 { name="s2"; version="0.4-2"; sha256="17r3xn2ldlz7qpdwrp0mdm7pfrdfwibyv8biaxq4b6qx0p7wvw6n"; depends=[Rcpp]; }; s20x = derive2 { name="s20x"; version="3.1-28"; sha256="1fx5206gy7cq4n0xrdxcvnd913i08yjjz39ldjm3a98sfz6xj636"; depends=[]; }; + s2dv = derive2 { name="s2dv"; version="0.0.1"; sha256="06jn9f8fpkpi1qz0g7pjyszdwckg6llb2lnf0micj8v1js7phym8"; depends=[abind bigmemory ClimProjDiags GEOmap geomapdata mapproj maps multiApply ncdf4 plyr]; }; s2dverification = derive2 { name="s2dverification"; version="2.8.6"; sha256="1nvmc3mpdqrcnv17vk8rjd7mh55pj68y2ffiia09lc8h84r3zxil"; depends=[abind bigmemory GEOmap geomapdata mapproj maps NbClust ncdf4 plyr SpecsVerification]; }; s2net = derive2 { name="s2net"; version="1.0.1"; sha256="1f6lc8azx8lax7jc5ggzirwnp5d9ka2plimfkg70vx783xf56zaw"; depends=[MASS Rcpp RcppArmadillo]; }; s4vd = derive2 { name="s4vd"; version="1.1-1"; sha256="1rp3z42nxmrvb942h3c5cl544lngzx7nrnnr4zjw7dq495bym7yp"; depends=[biclust foreach irlba]; }; sAIC = derive2 { name="sAIC"; version="1.0"; sha256="1ih63cfs98kb61gwbmrx2yq7iacb5qa1qrh1a264041qd27r5pj5"; depends=[]; }; sBF = derive2 { name="sBF"; version="1.1.1"; sha256="0dankakl4rwl9apl46hk57ps4mvn2l1crw4gdqds26fc8w6f6rab"; depends=[]; }; sBIC = derive2 { name="sBIC"; version="0.2.0"; sha256="1fx17c9w7v6wi02i293vjdahwxx4b5a118r655cl12gsd5qwqj11"; depends=[combinat flexmix hash igraph mclust poLCA R_methodsS3 R_oo Rcpp]; }; - sEparaTe = derive2 { name="sEparaTe"; version="0.2.1"; sha256="0k1c0wa052f1fprc9jn0i3g2cawxfhkan998jlhkr4iy986jynw9"; depends=[]; }; sFFLHD = derive2 { name="sFFLHD"; version="0.1.2"; sha256="014gy3nj6gr740z4apw82jh4n7s57zmnr95bm3g9xxnwnb224npq"; depends=[conf_design DoE_base R6]; }; sGMRFmix = derive2 { name="sGMRFmix"; version="0.3.0"; sha256="183i3159k2cxpanm09zcy2y1vvjd6185gjjf81c3284prw3aky2c"; depends=[ggplot2 glasso mvtnorm tidyr zoo]; }; sNPLS = derive2 { name="sNPLS"; version="0.3.31"; sha256="0ja2f4n000r7cvf0jj2qypa5mfkikig47hfpqwh4611sl70qgx2y"; depends=[car ggplot2 ks MASS Matrix pbapply plotrix rgl]; }; @@ -13117,8 +13276,8 @@ in with self; { saccades = derive2 { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; }; sadists = derive2 { name="sadists"; version="0.2.3"; sha256="17jlzx5h5l1w7riz0rs99w31n6lxnnxwzbzqn2z5r292j2nxvmkw"; depends=[hypergeo orthopolynom PDQutils]; }; sads = derive2 { name="sads"; version="0.4.2"; sha256="1j6vdjvpnbqp4kwbvhcl8p51ln29mmk9n150718wsqlifb8d1lw9"; depends=[bbmle GUILDS MASS poilog VGAM]; }; - sae = derive2 { name="sae"; version="1.2"; sha256="1fai9lkyyssnkkdrjrrx7vzj88nglmd4bkzan3hdhrc49abclp59"; depends=[lme4 MASS]; }; - sae2 = derive2 { name="sae2"; version="1.0-1"; sha256="0cnqlacglwyx4cdm3wl3j3g2xv2sx3921mnzk2v0bk704i9y7qq3"; depends=[MASS survey]; }; + sae = derive2 { name="sae"; version="1.3"; sha256="1ncrlzgnga9pfa2j8x1y6axl2665rp08aff98zrim6gq6n6yap8z"; depends=[lme4 MASS]; }; + saeME = derive2 { name="saeME"; version="1.0.1"; sha256="1w77ncha9xs5p3pzfd3y38q8kz2wjzh35zyn4cby0yp2cyw4xxd9"; depends=[expm MASS]; }; saeRobust = derive2 { name="saeRobust"; version="0.2.0"; sha256="1bdfrsm59xwkga0kxl3r5n83mhhkyzj7gplrgx26gyflashyd1zc"; depends=[aoos assertthat ggplot2 magrittr MASS Matrix memoise modules pbapply Rcpp RcppArmadillo spdep]; }; saeSim = derive2 { name="saeSim"; version="0.10.0"; sha256="0nh8x2v0g8i0rjq4s5q0ayhyxhl5p0126plmd4vnnhaifm6pn0q3"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; }; saemix = derive2 { name="saemix"; version="2.3"; sha256="08n1syv8wkf1nqz8i1n3ippyp63g56xf8xqgczxm630r6802yqab"; depends=[]; }; @@ -13128,11 +13287,11 @@ in with self; { safetyGraphics = derive2 { name="safetyGraphics"; version="1.1.0"; sha256="1s8xwx014nihn13v6rpwy11sb3yzfyj3alb88y47wp1kh39d7f0q"; depends=[dplyr DT haven htmlwidgets jsonlite magrittr purrr rlang rmarkdown shiny shinybusy shinyjs shinyWidgets stringr tibble tidyr]; }; sail = derive2 { name="sail"; version="0.1.0"; sha256="1wrh2dam5lblascqd8gl76jks72ys1amz84c6p08y8ykdmn2saq1"; depends=[gglasso glmnet]; }; salesforcer = derive2 { name="salesforcer"; version="0.1.3"; sha256="1nhw7l6bg375dqqcaxjfvhjm9sb1jsil5wayhffdxc9lqdxrd5a2"; depends=[data_table dplyr httr jsonlite lubridate purrr readr XML xml2]; }; - salso = derive2 { name="salso"; version="0.1.11"; sha256="1rxfnh575hl3zpsm3r0mscfr0hy9v2kss142ggzrz49a4kskpa1x"; depends=[]; }; + salso = derive2 { name="salso"; version="0.1.16"; sha256="1xvzvy0s1718n9p71a6gb4dzg281drzzmpyda5j3b729aijni6bh"; depends=[]; }; salty = derive2 { name="salty"; version="0.1.0"; sha256="1dxq62yrkv416fy09l03slc7ci6mnwiyvjlsxhbqnj8yjy3kbhr6"; depends=[assertthat purrr stringr]; }; sambia = derive2 { name="sambia"; version="0.1.0"; sha256="15yz5lrjav5bs8m52crg3l43xmi4gf7wydji76p181ssyg43z2ln"; depends=[dplyr e1071 FNN mvtnorm pROC ranger smotefamily]; }; samc = derive2 { name="samc"; version="1.0.4"; sha256="03n49p2cjs1r3grmg4cw4pxn4lddx5084j4j8dj0g6l9sjzj64hz"; depends=[gdistance Matrix raster Rcpp RcppEigen]; }; - sampSurf = derive2 { name="sampSurf"; version="0.7-4"; sha256="0azs8d1d4cp5vzrlzpn2lbqmbha6rxq109apg6hr2hf7i81g19d7"; depends=[boot lattice latticeExtra raster rasterVis sp]; }; + sampSurf = derive2 { name="sampSurf"; version="0.7-5"; sha256="0ks95d1w5dvxz4vb850hb5v0w8xg6sil0gvddmd1mrrjkjqkk96f"; depends=[boot lattice latticeExtra raster rasterVis sp]; }; sampleSelection = derive2 { name="sampleSelection"; version="1.2-6"; sha256="1ph26v78sy8341d9iir6243vmvnrnan7gj5mr31913kpgkblcwfj"; depends=[Formula maxLik miscTools mvtnorm systemfit VGAM]; }; sampler = derive2 { name="sampler"; version="0.2.4"; sha256="12jjx3ci1yss8dj64bjdmz73cyjfkwb7b9zk4zm48lqv78k6wlv7"; depends=[dplyr purrr reshape tidyr]; }; samplesize = derive2 { name="samplesize"; version="0.2-4"; sha256="0n6z7jmf665lbj3g1mjy87a9fh53z85546bhrkmkgsysb0r9q6iq"; depends=[]; }; @@ -13149,6 +13308,7 @@ in with self; { sand = derive2 { name="sand"; version="1.0.3"; sha256="0h7djria9v75gqcygjcfznpchqgxjqc6b43arvq9ni1xjrq8sszf"; depends=[igraph igraphdata]; }; sandwich = derive2 { name="sandwich"; version="2.5-1"; sha256="1mk685b9wq7k566pbml52rj96i5h6b3vf215k9picgmq296nzvyv"; depends=[zoo]; }; sanitizers = derive2 { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; }; + sanityTracker = derive2 { name="sanityTracker"; version="0.1.0"; sha256="0y041x840sg5c05ksljb1y4xag1cib19q5ygp443k13ryfbcgs9k"; depends=[checkmate data_table]; }; sankey = derive2 { name="sankey"; version="1.0.2"; sha256="0jvcr2bn69aklfbgj4hbsrc047mymrx0jmsg26m0g6w7n1igqvcw"; depends=[simplegraph]; }; sankeywheel = derive2 { name="sankeywheel"; version="0.1.0"; sha256="1sigj4jz13qj4s8vxk0dl2xsddqgyfxabj8yggkasawm7pryvbyy"; depends=[htmlwidgets]; }; santaR = derive2 { name="santaR"; version="1.0"; sha256="10g4z951mpxw9d21s5f6zwfch5xs9vx812fb0wyrbw9s8drmlbkh"; depends=[doParallel foreach ggplot2 gridExtra iterators pcaMethods plyr reshape2 shiny shinythemes]; }; @@ -13158,11 +13318,14 @@ in with self; { sapa = derive2 { name="sapa"; version="2.0-2"; sha256="056xlh14dnzq4x7sbp7ff2k61jxy7110a742b502vz549qfrr5ds"; depends=[ifultools splus2R]; }; sapfluxnetr = derive2 { name="sapfluxnetr"; version="0.0.7"; sha256="0lnhg4apsvvyzyz89x778nhxjp4y0mycgajxjyb57wcwgn16gygm"; depends=[assertthat dplyr furrr ggplot2 glue lubridate magrittr purrr rlang stringr tibble tidyr]; }; saqgetr = derive2 { name="saqgetr"; version="0.1.19"; sha256="0sl0kngcsadgnx1lwhgbn9w4885dv0ih3c5vkvmz0bkvhdcjih9j"; depends=[curl dplyr fs lubridate magrittr purrr readr stringr tidyr]; }; - sarima = derive2 { name="sarima"; version="0.8.1"; sha256="03261mqv4l8wkan0phg7085qsy9q1vhhyx6bfnygjva7vvxafvpc"; depends=[dplyr FitAR FitARMA Formula KFAS lagged ltsa numDeriv PolynomF Rcpp RcppArmadillo Rdpack]; }; + sara4r = derive2 { name="sara4r"; version="0.0.7"; sha256="1la02rq16c3hvfg4dygz6himvs88nmry8616fzgnsbxzpddl5aw3"; depends=[raster rgdal RGtk2 sp]; }; + sarima = derive2 { name="sarima"; version="0.8.2"; sha256="0fyfba017p35g16b8xp9zvqp9dalhlgr7x5hpk10y29qh7k12z69"; depends=[dplyr FitAR FitARMA FKF Formula KFAS lagged ltsa numDeriv PolynomF Rcpp RcppArmadillo Rdpack]; }; sars = derive2 { name="sars"; version="1.2.1"; sha256="10j2cz66qpdicarxy2mx2hlmkvby3j83qrjm2irmfnwmscafg5f4"; depends=[cli crayon dplyr nortest numDeriv]; }; sas7bdat = derive2 { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; }; + sasLM = derive2 { name="sasLM"; version="0.1.2"; sha256="0d7vklzqsdfg7rg8d3186ka0iqggyhksj0xlzd3rdm8wjd6h5839"; depends=[]; }; sasMap = derive2 { name="sasMap"; version="1.0.0"; sha256="11vhhxhakqm1gsb3p4s4966sapmrqfyw79zfppbx5lnqi3xr0ngn"; depends=[readr stringi stringr]; }; - sass = derive2 { name="sass"; version="0.1.2.1"; sha256="02a5n0l8wya5v1iq2rb4hvc0gm23790jnjl7i3pzw2b5vkqd3l7s"; depends=[digest]; }; + sass = derive2 { name="sass"; version="0.2.0"; sha256="0qzrncsnp0zd8jyp4whss92m7llqsfccmp9p9r3gdc7hlq1amp3z"; depends=[digest fs htmltools rlang]; }; + sate = derive2 { name="sate"; version="1.1.0"; sha256="0d1b0gp5abh5g7a25ff40xdnncrl2afjnlcc56dbhqkk43gjah17"; depends=[MASS]; }; satellite = derive2 { name="satellite"; version="1.0.2"; sha256="1ib9g4cplksf9ymp8hcv843lv5bpar31w8h4wnmya5hjsdmlfiv4"; depends=[plyr raster Rcpp]; }; satscanMapper = derive2 { name="satscanMapper"; version="1.0.1"; sha256="1qr7xz7qp39nylkrx3smzga7rvi2z9yws8kbpmfk13avixr4asvy"; depends=[foreign RColorBrewer SeerMapper sp stringr]; }; saturnin = derive2 { name="saturnin"; version="1.1.1"; sha256="0cjp4h1s9ivn17v8ar48mxflaj9vgv92c8p9l2k5bc9yqx9mcs36"; depends=[Rcpp RcppEigen]; }; @@ -13176,19 +13339,20 @@ in with self; { sbmSDP = derive2 { name="sbmSDP"; version="0.2"; sha256="1sl46lqi6w0s7ghv4bywhic56cm2vib3kawprga760m6igargx4y"; depends=[Rcpp RcppArmadillo]; }; sboost = derive2 { name="sboost"; version="0.1.1"; sha256="126rqvpqwvwjxvsg1v04nkmd6af55j7sgx43jg2vnggyrlli9j9q"; depends=[dplyr Rcpp rlang]; }; sbpiper = derive2 { name="sbpiper"; version="1.9.0"; sha256="0pjq88ixk494wlz4nh5anbsn59mmh9wg564qh3vzwwqgxf1k61cg"; depends=[colorRamps data_table factoextra FactoMineR ggplot2 Hmisc reshape2 scales stringr]; }; - sbrl = derive2 { name="sbrl"; version="1.2"; sha256="1d0f2mlzzcghhvqagrr954qa69b5v47milw3iazxihh8q1qlird2"; depends=[arules Rcpp]; }; - sbtools = derive2 { name="sbtools"; version="1.1.9"; sha256="0azk4sa2h60yyfnskcicpiaqb3wrw0x64drb2z38y5k4jrrjbmlq"; depends=[curl httr jsonlite stringr]; }; + sbtools = derive2 { name="sbtools"; version="1.1.11"; sha256="06b27cxrfqps0lfgjcwxcal36dkf05y2lcmwrzjrm333zgnvcy6g"; depends=[curl httr jsonlite stringr]; }; sbw = derive2 { name="sbw"; version="1.0"; sha256="07lr2sh681q0wvyaf7ixif5riw9kfxv4hraxj8hzqaxcsip743vq"; depends=[MASS Matrix quadprog slam spatstat]; }; scBio = derive2 { name="scBio"; version="0.1.5"; sha256="12wch9dp7n9vigv7rp7i5b5sckn9vvckpclylinnbi1mhawxprv9"; depends=[doSNOW fields foreach LiblineaR limma raster sp]; }; + scMappR = derive2 { name="scMappR"; version="0.1.1"; sha256="1mfbjv7gpj63q5gwqcajjrnbhr918nvl41hk8ggk1l30wqg4k4r1"; depends=[downloader ggplot2 gProfileR gprofiler2 GSVA limSolve pcaMethods pheatmap Seurat]; }; scModels = derive2 { name="scModels"; version="1.0.1"; sha256="0n2sc2l3wy08i0xq7jwigkr42wz9gyhlirmjmma9plnmkbrx0rp4"; depends=[Rcpp]; }; scPDSI = derive2 { name="scPDSI"; version="0.1.3"; sha256="00z5qk14c1ndrd63rhvknkp3dn3ad8z8mf00p9sb8wbsi908md44"; depends=[Rcpp]; }; scRNAtools = derive2 { name="scRNAtools"; version="1.0"; sha256="0x0lniqhq6q87y08kkkyvmk1g5b8i73hm3h86ba8rcv0v0n7ap9a"; depends=[ALL ConsensusClusterPlus corrplot edgeR foreach ggplot2 ggthemes Hmisc igraph lattice limma PerformanceAnalytics plyr reshape2 Rmisc Rtsne scatterplot3d survival TPEA]; }; - scTenifoldNet = derive2 { name="scTenifoldNet"; version="1.1.0"; sha256="1qfmrrpvrxpj9mmhyhr8f99iiz3y1l8iz2hff3wgl9jx80nnhr67"; depends=[MASS Matrix pbapply reticulate RSpectra rTensor]; }; + scTenifoldNet = derive2 { name="scTenifoldNet"; version="1.2.1"; sha256="091fczz5vjj8cq53dik229vrscsj68p6vpaqr8gdknjgc9nsc1ka"; depends=[MASS Matrix pbapply RSpectra]; }; scaRabee = derive2 { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[deSolve lattice neldermead]; }; + scaffolder = derive2 { name="scaffolder"; version="0.0.1"; sha256="1va1mlhqv5qn0hm81ypdir9llr68222qxjp3jink69zpaskfbdib"; depends=[reticulate]; }; scagnostics = derive2 { name="scagnostics"; version="0.2-4.1"; sha256="1azg1xlid63l9mcyns9yyl3a3hykbl0sl0h5jhyvzjzahfyanq53"; depends=[rJava]; }; scaleboot = derive2 { name="scaleboot"; version="1.0-1"; sha256="1q0bs5f1vgja5gj3id1ny6raja8ljgd8dk50fs1wn90f6080afy7"; depends=[mvtnorm pvclust]; }; scales = derive2 { name="scales"; version="1.1.0"; sha256="00rdbfj5mwc3kr8pskidn3n2zkp4ms6cx36xazz54pxw3pysdr0y"; depends=[farver labeling lifecycle munsell R6 RColorBrewer viridisLite]; }; - scalpel = derive2 { name="scalpel"; version="1.0.1"; sha256="18mapg96xl9a1g85h5xhqsz1333hkc28z0ivfjaff933p1kc6sng"; depends=[gam igraph Matrix protoclust R_matlab SDMTools]; }; + scalpel = derive2 { name="scalpel"; version="1.0.2"; sha256="1rwa1h24b0bzsiasjgj84rd5k5wpw6pnp463qaj624sra9wp9pw9"; depends=[gam igraph Matrix protoclust R_matlab]; }; scalreg = derive2 { name="scalreg"; version="1.0.1"; sha256="0kfcgl9cpp6g1qx23s1yrjzn0hi74vmrw567vy9wpsmhk04a5bkx"; depends=[lars]; }; scam = derive2 { name="scam"; version="1.2-5"; sha256="0c8pp2cr3khaibpv3m8kkw73q2pdx6931kh8w64s38wgvjv293fp"; depends=[Matrix mgcv]; }; scan = derive2 { name="scan"; version="0.40"; sha256="1khmg05dzs1va66bm26wxx440nlkl0r70wbh814fdlmij3py7m54"; depends=[car kableExtra knitr MASS mblm nlme readxl]; }; @@ -13196,42 +13360,43 @@ in with self; { scape = derive2 { name="scape"; version="2.3-2"; sha256="1i3k37r7lisrj1pblni5xn76kf6py52s4yd51fm78c3286yfaasf"; depends=[coda Hmisc lattice]; }; scar = derive2 { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; }; scatr = derive2 { name="scatr"; version="1.0.1"; sha256="1c2z722i7d7qflh4mzb8kkix5i22wph98kwz2p98x2mhaml8802d"; depends=[cowplot ggplot2 ggridges ggstance jmvcore R6]; }; - scatterD3 = derive2 { name="scatterD3"; version="0.9"; sha256="0miadn406viqzw1sc27fl3xb1l0vvachrfiv72jl9r7qgk2ga5jv"; depends=[digest ellipse htmlwidgets]; }; + scatterD3 = derive2 { name="scatterD3"; version="0.9.1"; sha256="0nlsy4z9m4kzm5m577nhysc17z9f3hc5anmig992x7mq4vnjnwxh"; depends=[digest ellipse htmlwidgets]; }; + scattermore = derive2 { name="scattermore"; version="0.6"; sha256="0wa7vnw935320333ivr1k5kr1qxbxppy9ncsf2hp2a2gw885scn8"; depends=[ggplot2]; }; scatterpie = derive2 { name="scatterpie"; version="0.1.4"; sha256="0g5sn0iv6c1q7y51j4gbbbnil5089dgk1w4q94c7h5y3x7wfrzqb"; depends=[ggforce ggplot2 rlang rvcheck tidyr]; }; scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-41"; sha256="152xqz9c70qab86mpgng049gxsg5f4fpf1m8dh93fb9v1avjd0sc"; depends=[]; }; scbursts = derive2 { name="scbursts"; version="1.6"; sha256="09yxnq6m35xmp0priavjnh0bdcwkr5hhy7j33cz13xwkrd1cgw5j"; depends=[readxl tibble]; }; scclust = derive2 { name="scclust"; version="0.2.2"; sha256="0w0qwz8wfdprs2bgv1cjvd2yb6g12jylad21a9rr3w5bkgxprcrp"; depends=[distances]; }; sccr = derive2 { name="sccr"; version="2.0"; sha256="1r5hmkij73l0z19smq080gr66nnlqk4v5sq0wcmidbxxsjpzwb45"; depends=[dplyr]; }; scdensity = derive2 { name="scdensity"; version="1.0.2"; sha256="173xm3bf8vxl30zk4n451al7m003byg9q4d1l1pfyfa4xnv8qdg9"; depends=[lpSolve quadprog]; }; - scdhlm = derive2 { name="scdhlm"; version="0.3.1"; sha256="1b5x4kqvmkpb8wbgfhnwqakisw6hfnvama2bsnd8kvw4alfanxhm"; depends=[nlme]; }; + scdhlm = derive2 { name="scdhlm"; version="0.3.2"; sha256="1im2z8bfslvrk3y8hqk4snf42fb2iw6yh6nrhijih8qx3jmpwlmb"; depends=[nlme]; }; scenario = derive2 { name="scenario"; version="1.0"; sha256="0v1b00kiny21yx4qkk2x51cy1zqibdnd68z76qia7h5py28yhxsi"; depends=[]; }; scgwr = derive2 { name="scgwr"; version="0.1.0"; sha256="1pyq6qnfhnzbkla1yp49sfkx5y4g26ccgi803axivyjyp5zvwc1b"; depends=[dplyr FNN spData]; }; schoRsch = derive2 { name="schoRsch"; version="1.7"; sha256="19h721v4a7rb1dlkbpb9s24x87fvz3q449ndi0rn0yc0m6mhmcvi"; depends=[]; }; schoenberg = derive2 { name="schoenberg"; version="2.0.2"; sha256="17pbw9266r9lv9blygmvq9285kcrcy07jaqrj3zfa2pg0zyvhjvm"; depends=[crayon]; }; scholar = derive2 { name="scholar"; version="0.1.7"; sha256="142iwrips1589fa0g1178a6s1cz4dfcv9b0qs570q6b6ccfjxi6r"; depends=[dplyr ggplot2 ggraph httr R_cache rvest stringr tidygraph xml2]; }; schoolmath = derive2 { name="schoolmath"; version="0.4"; sha256="06gcmm294d0bs5whvknrq48sk7li961lzy4bcncjg052zbbpn67x"; depends=[]; }; - schrute = derive2 { name="schrute"; version="0.1.1"; sha256="1mwlxmwc8bnjihz4l30vkzx1lm36x0dfgzx0j64kfdp1xdbbq3ma"; depends=[dplyr ggplot2 magrittr stringi stringr tibble tidyr tidytext]; }; + schrute = derive2 { name="schrute"; version="0.2.1"; sha256="0dyn4lwbx5mhhl1kk3iashz81n4mgwmdd0cnzf219s8rjq5jwxbk"; depends=[dplyr ggplot2 magrittr stringi stringr tibble tidyr tidytext]; }; schumaker = derive2 { name="schumaker"; version="1.2"; sha256="1whfmnjmib7lh72src7cnbw3mswzaxq8vd50x5x9cv0031n0y6l7"; depends=[]; }; scico = derive2 { name="scico"; version="1.1.0"; sha256="0c52a4mhsd9y5vhz3h6f7j2fa5cq0lkks5qa449w6kra5cqpbx34"; depends=[]; }; scidb = derive2 { name="scidb"; version="2.0.0"; sha256="079akdsxxjnca5jsv0grw1c2nd3dl368xhy4mzm94mh5j6ghi57l"; depends=[bit64 curl data_table digest openssl]; }; scientoText = derive2 { name="scientoText"; version="0.1"; sha256="0f18hg9s50lbbgl0fqjv45yhynpnsxj8wwm07g126snzr68gbd21"; depends=[stringr tm]; }; scifigure = derive2 { name="scifigure"; version="0.2"; sha256="1zc88r1lnb0cws130hq4rjc34rrp6zkmi8yhkwsm3vkznbhi4iba"; depends=[]; }; - scio = derive2 { name="scio"; version="0.6.1"; sha256="0h15sscv7k3j7qyr70h00n58i5f44k96qg263mxcdjk9mwqr0y65"; depends=[]; }; - sciplot = derive2 { name="sciplot"; version="1.1-1"; sha256="1ydwx9kh778z3x7s3i6gqinqi6bmsf6bslaf0mgszj0nrgcmj6y3"; depends=[]; }; + scio = derive2 { name="scio"; version="0.9.0"; sha256="0xj9iiqjz2k1llq09k2l3g7zn5zw2ayifhqsdm8fc2j9r4m1nrn2"; depends=[glasso QUIC]; }; + sciplot = derive2 { name="sciplot"; version="1.2-0"; sha256="097zcgjsv54f6wd8fjwh2xb406j6yrw94v9pcxa0zln1q7fs93vk"; depends=[]; }; sclero = derive2 { name="sclero"; version="0.2"; sha256="1vqysby822s958msnwcqmz78193vrgmpf6si1jnfb9cj90hh7wgg"; depends=[plyr RImageJROI spatstat]; }; - sclr = derive2 { name="sclr"; version="0.3.0"; sha256="1qm9jds7kxaz1g6v71z2vfmih2sr4c2n26xxjs6ic9hr9dd15y9y"; depends=[broom dplyr rlang tibble]; }; + sclr = derive2 { name="sclr"; version="0.3.1"; sha256="10pihx35889w509ijbyq5hzslk9n7kakjnfscg7p0dq198nbpyca"; depends=[broom dplyr purrr rlang tibble]; }; scmamp = derive2 { name="scmamp"; version="0.2.55"; sha256="17qhj9l1akxachaimy9d5rls8adph8aalj3qr6ckip29a8ma9gf7"; depends=[ggplot2 graph reshape2 Rgraphviz]; }; scoper = derive2 { name="scoper"; version="0.2.0"; sha256="1b4kyrml5yk46fw9hrp21i6w6ylck5qs64y0mzkbqr2wf1x4ncvs"; depends=[alakazam data_table doParallel dplyr foreach ggplot2 Rcpp rlang seqinr shazam stringi stringr]; }; scopr = derive2 { name="scopr"; version="0.3.3"; sha256="1j45l5zcrpc4dnb6ik1v0jlqizpkijl0p656s869jhhvv55r6v2i"; depends=[behavr data_table memoise readr RSQLite stringr]; }; score = derive2 { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; }; - scorecard = derive2 { name="scorecard"; version="0.2.8.1"; sha256="0h10glghqlk4nihpy41h89rm9db3lwq1pwdyg8vrx508n9k1bv7r"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx]; }; + scorecard = derive2 { name="scorecard"; version="0.3.0"; sha256="08zf99xxvl27lin5xqf781l3lr4cjlr8gyw5vw4ps1fnsn844c63"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx stringi]; }; scorecardModelUtils = derive2 { name="scorecardModelUtils"; version="0.0.1.0"; sha256="09znaxrv14m58hsk5pac458xbpcsidc6ygcsw4q9j0p4yd80qbvl"; depends=[car e1071 gbm ggplot2 partykit randomForest reshape2 sqldf stringr]; }; scorepeak = derive2 { name="scorepeak"; version="0.1.2"; sha256="1g9n7kjqb9qk5b7hw8ysrc069w9dzc4z29ay6z1kbm0v4kkzp7bi"; depends=[checkmate Rcpp]; }; scorer = derive2 { name="scorer"; version="0.2.0"; sha256="1mc4hxcrqzh4dmz5fy40740bnrp4fxia81fj3cdw9382p67ivhim"; depends=[Rcpp]; }; scoring = derive2 { name="scoring"; version="0.6"; sha256="114jlpbnm15fdan5lr40adxdzwajy3yhdw6dm4kvkvky6qhcx7q5"; depends=[]; }; scoringRules = derive2 { name="scoringRules"; version="1.0.0"; sha256="1jksv22hy8kazqwy6yjdjl32k7i558vcn7i13wc7fmary7v500km"; depends=[knitr MASS Rcpp RcppArmadillo]; }; scout = derive2 { name="scout"; version="1.0.4"; sha256="0vr497g7g1xhf75cwjbjsns2fvdzy86iibbf5w0g2xylw82s4lh2"; depends=[glasso]; }; - scpm = derive2 { name="scpm"; version="1.0-2"; sha256="0jrr90lcalchfqmq5c8ja7ws88rpri3gjdc5z4jfpazn2vznx26n"; depends=[geoR interp lattice MASS Matrix mvtnorm RandomFields rgl]; }; + scpm = derive2 { name="scpm"; version="2.0.0"; sha256="1ib46m3i50annp90n2ih4qdxabxik4ngg9j0a5hgspsvk1i4hrvp"; depends=[interp lattice MASS Matrix mvtnorm RandomFields rgl]; }; scraEP = derive2 { name="scraEP"; version="1.1"; sha256="0dimvdjlgaymjmd3gf60hxcavpr58bpffrfhlksnrfzbb7an65dd"; depends=[data_table RCurl XML]; }; scrapeR = derive2 { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[RCurl XML]; }; scrime = derive2 { name="scrime"; version="1.3.5"; sha256="0y2mh9fsffjf3i15bafpasa17z99c1s75r8g6h4hgcwfgpjx75sx"; depends=[]; }; @@ -13240,8 +13405,8 @@ in with self; { scriptexec = derive2 { name="scriptexec"; version="0.3.1"; sha256="0k10x0npdga1nmchzz9xxv0qijnq2n9pb49z1g06bmva1z8wb4wg"; depends=[]; }; scriptuRs = derive2 { name="scriptuRs"; version="0.1.0"; sha256="1wbvfqcc0raazhdc6pyp93q859ilxfz9rz338p3sb7fjyxvparbl"; depends=[]; }; scrm = derive2 { name="scrm"; version="1.7.3-1"; sha256="090gsa23l9s4x92q4n7ggp491fc8ghgnjw5p7j67gd1i1iwr55n8"; depends=[Rcpp]; }; - scrobbler = derive2 { name="scrobbler"; version="0.2.12"; sha256="0zqz5hpq9kabcz2q0zdmbygwj9xgdvs9mmv5k6h4gdbfjbzl4fiy"; depends=[anytime httr jsonlite]; }; - scrubr = derive2 { name="scrubr"; version="0.1.1"; sha256="0dqsk6vvc79qmjcr1gdksqzbd064nkyqfj2mxg6z7aifqgxs8zzz"; depends=[lazyeval magrittr Matrix qlcMatrix]; }; + scrobbler = derive2 { name="scrobbler"; version="0.2.15"; sha256="079ms94q2h8ciqi9b4w9i1md57x844jz464hk7rr564n9wcfp4gj"; depends=[httr jsonlite]; }; + scrubr = derive2 { name="scrubr"; version="0.3.2"; sha256="1grh6gljxad2iig6vldv2j0wk83cj6v1pdqsldb6gp4kqyzbikq9"; depends=[crul curl data_table fastmatch hoardr jsonlite lazyeval magrittr Matrix qlcMatrix tibble]; }; scrypt = derive2 { name="scrypt"; version="0.1.3"; sha256="14iblgbp9v2by8fjbrpsd59iknp5babcz7j3yv1yxxzcwyb6wrrm"; depends=[Rcpp]; }; scs = derive2 { name="scs"; version="1.3-2"; sha256="10z5619gbnnygk8pkdx2qji56jlv1q6c1z4581pdkd9sfnhg1yp3"; depends=[]; }; sctransform = derive2 { name="sctransform"; version="0.2.1"; sha256="07v3lzccsrkh1glfxd1q20r8f8gl9ls5az0s1dvxm4vcls0hlhyn"; depends=[future_apply ggplot2 gridExtra MASS Matrix Rcpp RcppEigen reshape2]; }; @@ -13249,48 +13414,51 @@ in with self; { sdPrior = derive2 { name="sdPrior"; version="1.0-0"; sha256="0g4crlasnvxz752n3az5jc681jvvj2g87c3a8s2h1i2vh64p5h37"; depends=[doParallel GB2 MASS mgcv mvtnorm pscl]; }; sdStaf = derive2 { name="sdStaf"; version="1.0.2"; sha256="0r7lqj30r3f0b18kpahi63zsdizcw2zjf1vvvs04s4cg1djjbcp3"; depends=[dismo dplyr ggplot2 raster rasterVis rgdal rgeos sp tidyr]; }; sda = derive2 { name="sda"; version="1.3.7"; sha256="1v0kp6pnjhazr8brz1k9lypchz8k8gdaby8sqpqzjsj8klghlcjp"; depends=[corpcor entropy fdrtool]; }; + sdafilter = derive2 { name="sdafilter"; version="1.0.0"; sha256="0y692j25pln46dp6xvaq17fkym0461yqfa6rv5avfw2b240k8jiq"; depends=[glasso glmnet huge POET]; }; sdat = derive2 { name="sdat"; version="1.1"; sha256="1mxijw2yfblqjvqqb2xrzhfn9c872i1q9ggw24xicvr2fk4lvjw6"; depends=[]; }; sdcHierarchies = derive2 { name="sdcHierarchies"; version="0.18.2"; sha256="09f9b6padx6jsjhh0d7qa7qs99rar4j9fbmyp9569ywc9ld7z7mm"; depends=[cli data_table jsonlite rlang shiny shinyjs shinythemes shinyTree]; }; - sdcMicro = derive2 { name="sdcMicro"; version="5.5.0"; sha256="0qskj65994kmv1s0rpz1a4dvlji1s4sn3y6lfqsh1zdf6lfdvhpn"; depends=[car carData cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase shiny shinyBS VIM xtable]; }; + sdcMicro = derive2 { name="sdcMicro"; version="5.5.1"; sha256="1jabihj878w9wk7lmbnjh9v14jdb14w6ir10ram2bprlxah0bn07"; depends=[car carData cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase shiny shinyBS VIM xtable]; }; sdcSpatial = derive2 { name="sdcSpatial"; version="0.1.1"; sha256="1szv2nb758k3x5scxml2ns11fi99rlmd11r3fhzy3dgylf0m0xnm"; depends=[raster]; }; - sdcTable = derive2 { name="sdcTable"; version="0.30"; sha256="1sbdnm2na36jx76hcpfks3kr5milid5sn0cpzjky90ldfii2pqf9"; depends=[data_table knitr lpSolveAPI Rcpp Rglpk rlang sdcHierarchies slam stringr]; }; + sdcTable = derive2 { name="sdcTable"; version="0.31"; sha256="064aippj8p4mc1zazvkzcjz59hlfybsz6wz1ppwj6d9638ha1a96"; depends=[data_table knitr lpSolveAPI Rcpp Rglpk rlang sdcHierarchies slam stringr]; }; sdcTarget = derive2 { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[doParallel foreach magic tuple]; }; sddpack = derive2 { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; }; sde = derive2 { name="sde"; version="2.0.15"; sha256="0gxyhq9lafd62y68h7fd746a3jz3jdsm0shgwm2ylmp4a2f5cdmm"; depends=[fda MASS zoo]; }; sdef = derive2 { name="sdef"; version="1.7"; sha256="0x2b8shp02ik0dd11wi3jcrl9h9m963fnkfy47fwwhav9x6jg0jf"; depends=[]; }; - sdm = derive2 { name="sdm"; version="1.0-81"; sha256="1fig0vsz4l7kgrdil9jzln1vaff18xx08i5069j40ra04rzadfdi"; depends=[raster sp]; }; + sdm = derive2 { name="sdm"; version="1.0-82"; sha256="0ipzpn5npdb8jdpmih7n5z07q9wpcaxrmggbxm1hhj57m3sp7xc0"; depends=[raster sp]; }; sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.8"; sha256="18374f2bnhh3nb62xf1h6fbqgpimlnkc2vbx5xkg5gyfylydz0v9"; depends=[R_utils raster rgdal]; }; sdmvspecies = derive2 { name="sdmvspecies"; version="0.3.2"; sha256="19avkag13ij1k65vqhmvcy8j50j8vrgw4mjc49x8i63w3d4z1wxh"; depends=[psych raster]; }; - sdnet = derive2 { name="sdnet"; version="2.4.1"; sha256="0z0wqc4hcmxqbavj9zma9j3dkg978l8dxcbyh9mlsbpfi4d1zph8"; depends=[]; }; sdols = derive2 { name="sdols"; version="2.0.0"; sha256="0rwdfb34g1l58ad02jf7wxidgqlccqvijdsvdxqdq8f5p15cl30m"; depends=[salso]; }; sdprisk = derive2 { name="sdprisk"; version="1.1-6"; sha256="061x78irryc5phd8bv9cs2mfgiajgwmr85ryp1r47anadydb2haa"; depends=[numDeriv PolynomF rootSolve]; }; sdpt3r = derive2 { name="sdpt3r"; version="0.3"; sha256="02qv889mkzcilxzszzqcqgn9z5zmki0093mdriradbl1y8a27bp5"; depends=[Matrix]; }; sdtoolkit = derive2 { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; }; - sdwd = derive2 { name="sdwd"; version="1.0.2"; sha256="0l0w4jn2p9b7acp8gmlv4w8n662l397kbrm4glslik0vnmjv151w"; depends=[Matrix]; }; - seaaroundus = derive2 { name="seaaroundus"; version="1.2.0"; sha256="09nyypzylb0y04ssd9ak2cw8wpy6a3nmabg9p7jrc8qz54wl6z4q"; depends=[crul ggplot2 jsonlite maps rgdal scales sp wicket]; }; - seacarb = derive2 { name="seacarb"; version="3.2.12"; sha256="1gb7ma2qpw8vnwfblwhalagar1cjqfd4la61bw652kk28v98y9bs"; depends=[gsw oce]; }; - seagull = derive2 { name="seagull"; version="1.0.3"; sha256="1hvww1x8pyfg7raylh7qgqzhm5jzn3lzjm89af2kzdiaynyw2703"; depends=[Rcpp RcppArmadillo]; }; + sdwd = derive2 { name="sdwd"; version="1.0.3"; sha256="0bwjpwmhg2d78pchcka6bypiypd9x07cpbaz68ww5z1f7lhxzd2m"; depends=[Matrix]; }; + seacarb = derive2 { name="seacarb"; version="3.2.13"; sha256="0ahnjz02px41q2xz3azqfs17wj5dx7ncnzsrlc89wvqngmyn2k1n"; depends=[gsw oce]; }; + seagull = derive2 { name="seagull"; version="1.0.6"; sha256="0bmmlxk2v82zhlxm8hj6p67capj4f4v6pdwlh09j75ca63jx36ry"; depends=[Rcpp RcppArmadillo]; }; sealasso = derive2 { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; }; searchConsoleR = derive2 { name="searchConsoleR"; version="0.4.0"; sha256="1ffg5359pbwylw265wbahwl3hy1b0qqv4al71v5r8lgfircibn0j"; depends=[googleAuthR stringr]; }; searchable = derive2 { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; }; - searcher = derive2 { name="searcher"; version="0.0.4"; sha256="0xxawwa95vfcbq8gg61ylnsg1qg6q1ng9iq4r1a1ai9440p5mvh3"; depends=[]; }; + searcher = derive2 { name="searcher"; version="0.0.5"; sha256="1q12il35pfy34n669jzkjciln1ca8by7l1d8zkzv4297547i1qln"; depends=[]; }; seas = derive2 { name="seas"; version="0.5-2"; sha256="0hn4d5dc01zyycd7l3vj1sx6bq668n7fzffw9ypaa5l20fizs0ay"; depends=[MASS]; }; - season = derive2 { name="season"; version="0.3.8"; sha256="0kw3gvy7rv0rms0zj1rvqlfdn3yxr9r9ldm21zl2xrpx9cy04d2d"; depends=[ggplot2 MASS survival]; }; + season = derive2 { name="season"; version="0.3.10"; sha256="1gkn333k2ga545gkm6k9nky2n22yh1jgm58g7w693rsq3h3m0j5w"; depends=[ggplot2 MASS survival]; }; seasonal = derive2 { name="seasonal"; version="1.7.0"; sha256="1mna8w1haj5h2rhiw7jkhprr6cc9qr0n8x73d10v0l732kx41n31"; depends=[x13binary]; }; seasonalview = derive2 { name="seasonalview"; version="0.3"; sha256="1l705yc7ssldsfckbgnvd95sh3zzhpkmf1rr6ar2s60s3wsyly4n"; depends=[dygraphs htmlwidgets openxlsx seasonal shiny shinydashboard xtable xts zoo]; }; seastests = derive2 { name="seastests"; version="0.14.2"; sha256="04kx4sijnpsarq4iaclxvckgr5y0gmz5a0fmkkqjmfi3hm1kvw3d"; depends=[forecast xts zoo]; }; seawaveQ = derive2 { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[lubridate NADA survival]; }; - secr = derive2 { name="secr"; version="4.1.0"; sha256="1ylwiw33siaqs8yd3pbpxx6lpipsf1rj474bs8yqiv5ihpxqfyga"; depends=[abind MASS mgcv nlme raster Rcpp RcppEigen RcppNumerical RcppParallel sp stringr]; }; - secrdesign = derive2 { name="secrdesign"; version="2.5.7"; sha256="064c9vwcn0pn0hd461j60fzzc21k22gqlm5zcsz2qqvv5c64ynic"; depends=[abind openCR secr]; }; + secr = derive2 { name="secr"; version="4.2.2"; sha256="09wf6dzssmcaa51s3c61k2n3z1xs5q981apzv03kbq6v0gbmisil"; depends=[abind MASS mgcv nlme raster Rcpp RcppEigen RcppNumerical RcppParallel sp stringr]; }; + secrdesign = derive2 { name="secrdesign"; version="2.5.11"; sha256="02fysbx6w1iw2ig54f9sgr74c40wfjwiwpdmxdjymsaynqnm9anl"; depends=[abind openCR secr]; }; secret = derive2 { name="secret"; version="1.0.0"; sha256="09b28f7ndc167bbanbdydralykq718fixnrgs5xr9d3fbdhz1vdl"; depends=[assertthat curl jsonlite openssl rprojroot]; }; + secrettext = derive2 { name="secrettext"; version="0.1.0"; sha256="129v524yyb464mcij7hvzv05cxliaz5nm7v30g9g9ppskcdqhsx2"; depends=[dplyr magrittr rlang stringr testthat tidyr]; }; secrlinear = derive2 { name="secrlinear"; version="1.1.1"; sha256="0jcvraypkss1gphh4cjb0b4v9460fj4dw80yd057ah11p9942ggs"; depends=[igraph maptools MASS rgdal secr sp]; }; secsse = derive2 { name="secsse"; version="2.0.0"; sha256="0qsbn56vc6y19hmc94bimv1mf86ayxa8rj38qvvsxjfm9czmw2ac"; depends=[ape apTreeshape DDD deSolve doParallel foreach geiger phylobase]; }; + secuTrialR = derive2 { name="secuTrialR"; version="1.0.3"; sha256="06lmm3hpspi3vd5wvzpj9skay823z4km5jbxg11sv4xqh16sh4qh"; depends=[dplyr haven igraph lubridate magrittr purrr readr readxl rlang stringr tibble tidyr]; }; secure = derive2 { name="secure"; version="0.5"; sha256="16pv5m7rrcs8hcjj3kylq7smyzf2qk8rkg9m1b421w0ac7lg04x1"; depends=[MASS Rcpp RcppArmadillo]; }; securitytxt = derive2 { name="securitytxt"; version="0.1.1"; sha256="0yrydcc68qcsq5wrdfgwfi347pdd0zc8hp2ikmw3iz31anm3b4yw"; depends=[Rcpp]; }; - see = derive2 { name="see"; version="0.4.0"; sha256="1qnmd43ljrdfwf8ks7a89j7wrhpmibs7r0yyidgchmja4scqyp61"; depends=[bayestestR dplyr effectsize ggplot2 ggridges gridExtra insight magrittr parameters rlang scales]; }; + see = derive2 { name="see"; version="0.4.1"; sha256="0w32jqs9b7bqm27ld21pmlwxsbhwpwwa5bv6w15p1lx56gzi5smi"; depends=[bayestestR dplyr effectsize ggplot2 ggridges insight magrittr parameters rlang]; }; seeclickfixr = derive2 { name="seeclickfixr"; version="1.1.0"; sha256="1agsqq2msrqrssffc6liyjjs6nqm90xy2inlcjbkdac5dhinjc4n"; depends=[jsonlite RCurl]; }; - seedCCA = derive2 { name="seedCCA"; version="1.0"; sha256="1grs6ykiyp8p5gh93hgb4niggppbh2wzwl6yx0l1qs9fkcz5zvy7"; depends=[CCA corpcor]; }; + seedCCA = derive2 { name="seedCCA"; version="3.0"; sha256="076pkv083dp71m6ifjzx9spfwmc1625r9d72spf0vhf8pwwsha4v"; depends=[CCA corpcor]; }; + seeds = derive2 { name="seeds"; version="0.9.0"; sha256="18yyiwv00vxfxdrw88hqilcv2307h93wlq1wkg4kqf6s3jsf40l0"; depends=[callr coda Deriv deSolve dplyr ggplot2 Hmisc MASS matrixStats mvtnorm pracma R_utils Ryacas statmod tidyr]; }; seedwater = derive2 { name="seedwater"; version="1.0"; sha256="0qqhjax16lnyriv6q9n89g93bs1zy8xwx9jp0xbilba7djzjh33g"; depends=[rpanel tkrplot]; }; + seer = derive2 { name="seer"; version="1.1.4"; sha256="02vv9vrnp8rj44qpn9yiigg95n7bg5v89pjdmrl5y8y1n8ax86xn"; depends=[dplyr ForeCA forecast forecTheta furrr future magrittr Mcomp purrr randomForest repmis stringr tibble tsfeatures urca]; }; seewave = derive2 { name="seewave"; version="2.1.5"; sha256="1qg8f5gik9pw6f9mcxqmrc9x3003s8vdm6g01pjjpyc9qaqiz2vi"; depends=[tuneR]; }; seg = derive2 { name="seg"; version="0.5-7"; sha256="165hl55vzyf3jqlykqji37p2syzhc8dxdjxd4wwr562qnlymzszx"; depends=[sp splancs]; }; segMGarch = derive2 { name="segMGarch"; version="1.2"; sha256="0chw41h25jka9wa3rf3d8dq2ym47379jflv33q6qxaak8xy1kmd9"; depends=[corpcor doParallel fGarch foreach iterators mvtnorm Rcpp RcppArmadillo]; }; @@ -13306,7 +13474,7 @@ in with self; { sejmRP = derive2 { name="sejmRP"; version="1.3.4"; sha256="1j3sadbp12fip3n96s0hx1sg4kzwx8z01p1c905kv8gffhkz9bh0"; depends=[cluster DBI dplyr factoextra RPostgreSQL rvest stringi tidyr XML xml2]; }; selac = derive2 { name="selac"; version="1.7.0"; sha256="0zj5l3q0apn8z0bxna7z7rraq89dq9qfqfclx9ybazr4saq8zk5w"; depends=[ape data_table deSolve expm MASS Matrix nloptr nnet phangorn RColorBrewer seqinr statmod zoo]; }; selectMeta = derive2 { name="selectMeta"; version="1.0.8"; sha256="0i0wzx5ggd60y26lnn4qk4n8h27ahll9732026ppks1djx14cdy0"; depends=[DEoptim]; }; - selectapref = derive2 { name="selectapref"; version="0.1.1"; sha256="0pn0s8dxbshwmv0qdrf670cjk3inf5w7jgac3fq29gmcx4f3fhl2"; depends=[]; }; + selectapref = derive2 { name="selectapref"; version="0.1.2"; sha256="0njibljh3hiqdn4wdb031bdg1bh3xpixgczbi5i01gaavybsq4cc"; depends=[]; }; selectiongain = derive2 { name="selectiongain"; version="2.0.591"; sha256="11gd9xdn3jl3mg3c9ykw8bqvcxhihn19iqsy8dl8bacijjv84bva"; depends=[mvtnorm]; }; selectiveInference = derive2 { name="selectiveInference"; version="1.2.5"; sha256="07kzpvdmflca1sriqfzn20f84fx2b9kwwiqm91lqjpx854bsx5kh"; depends=[adaptMCMC glmnet intervals MASS Rcpp survival]; }; selectr = derive2 { name="selectr"; version="0.4-2"; sha256="09y1n3iy297g49xlpl7xrjpwgnm57pskx5991lyfcpizbz8ax22m"; depends=[R6 stringr]; }; @@ -13315,13 +13483,13 @@ in with self; { selfea = derive2 { name="selfea"; version="1.0.1"; sha256="0zyxbd5vg8nhigill3ndcvavzbb9sbh5bz6yrdsvzy8i5gzpspvx"; depends=[ggplot2 MASS plyr pwr]; }; selfingTree = derive2 { name="selfingTree"; version="0.2"; sha256="18ylxmg2ms4ccgm4ahzfl65x614wiq5id7zazjjz5y75h8gs7gzj"; depends=[foreach]; }; sem = derive2 { name="sem"; version="3.1-9"; sha256="1f9c6g6pfx66gd2pappcsqh484ah6a0x4z47hpd46rah0817hcsa"; depends=[boot MASS matrixcalc mi]; }; - semEff = derive2 { name="semEff"; version="0.2.1"; sha256="0437pgr6hidscgvfhb9xaryanb1mrbcgb5x1afprc4amw0pjzjrs"; depends=[boot lme4]; }; + semEff = derive2 { name="semEff"; version="0.3.0"; sha256="18wmxkk0wmk7y3g1r7fwif7f6mhcgrsb60iv20d8f7bkhwkvfnx4"; depends=[boot lme4]; }; semPLS = derive2 { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; }; semPlot = derive2 { name="semPlot"; version="1.1.2"; sha256="0l1v9yi1pv59iwfknw4dh9qskk5y8r347jq1vq13gnfd3bmd71xr"; depends=[colorspace corpcor igraph lavaan lisrelToR OpenMx plyr qgraph regsem rockchalk sem XML]; }; semPower = derive2 { name="semPower"; version="1.0.0"; sha256="0wciz5qrd40q4mxq96pibnya11ac42n37c9xhjd4zfhznhjz06bb"; depends=[]; }; - semTable = derive2 { name="semTable"; version="1.6"; sha256="125dhdyy4idyxnn8j2ijbj9ikvz78hymr3m3x122ydsln89phsy1"; depends=[kutils lavaan plyr stationery xtable]; }; + semTable = derive2 { name="semTable"; version="1.7"; sha256="1zrp4iqdv9hlqicy5mqlvjrd6w9q8542hvdxs95l951xm2n4jp3z"; depends=[kutils lavaan plyr stationery xtable]; }; semTools = derive2 { name="semTools"; version="0.5-2"; sha256="1zj841pszfsikzp82cmh463qyc4xhdrqjqcnhc2r8mcflv12irv6"; depends=[lavaan]; }; - semantic_dashboard = derive2 { name="semantic.dashboard"; version="0.1.1"; sha256="0fd5qnw5jcmf5akkv59z1zjizsczwlmnpkfd8bfminhpa89sgp1y"; depends=[shiny shiny_semantic]; }; + semantic_dashboard = derive2 { name="semantic.dashboard"; version="0.1.5"; sha256="0bazaznmxmks11zgb9npvkblhy0ym554fnvgqsa02rlxxzzzljib"; depends=[glue htmltools shiny shiny_semantic]; }; semdiag = derive2 { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; }; semdrw = derive2 { name="semdrw"; version="0.1.0"; sha256="16hm1ifgspnxnlf3rfg5ylmql2fq91ig8nc5953ggyhfrjwbqx15"; depends=[dplyr lavaan psych semPlot semTools shiny shinyAce]; }; semds = derive2 { name="semds"; version="0.9-6"; sha256="10kvcmcy6qa2r5sram6azqgzl528rghfxgw2f2bq2fvhhq127dzq"; depends=[minpack_lm pracma]; }; @@ -13331,14 +13499,15 @@ in with self; { semsfa = derive2 { name="semsfa"; version="1.1"; sha256="1k6i1m4r9y7j85rlrsgfjm8w15ax4xgf70xyvqwsszmf9950ldxx"; depends=[doParallel foreach gamlss iterators mgcv moments np]; }; semtree = derive2 { name="semtree"; version="0.9.14"; sha256="1gyjrvqvqmm0dcbddjq90v3gsniiz9rl66nxiayvfbkhs4pih39z"; depends=[bitops cluster digest expm ggplot2 MASS matrixcalc matrixStats mvtnorm OpenMx plotrix rpart rpart_plot sets stringr tidyr]; }; semver = derive2 { name="semver"; version="0.2.0"; sha256="10wpkyms2cix3bsin2q0qhkbl445pwwpa5gm2s4jjw1989namkxy"; depends=[assertthat Rcpp]; }; - sen2r = derive2 { name="sen2r"; version="1.2.1"; sha256="19rzh7xxq6b9rbiqmmk4rwh5x0w3h8p8yk7c3111fggm67jy62dv"; depends=[data_table doParallel foreach geojsonio httr jsonlite leaflet leaflet_extras magrittr mapedit raster reticulate sf shiny shinydashboard shinyFiles shinyjs shinyWidgets stars units XML]; }; + semverutils = derive2 { name="semverutils"; version="0.1.0"; sha256="0y3zh8n8bgs3ag8yy9cnp0i0xrn0iqflcbrya70glyb40148w9sw"; depends=[foreach R6]; }; + sen2r = derive2 { name="sen2r"; version="1.3.4"; sha256="0cbrw7cjj555gclvhrf3ghz7i5qy6prba205pw6k8zf8fd8r8f0v"; depends=[data_table doParallel foreach geojsonio httr jsonlite leaflet leaflet_extras mapedit raster RcppTOML rgdal sf shiny shinydashboard shinyFiles shinyjs shinyWidgets stars XML]; }; sendmailR = derive2 { name="sendmailR"; version="1.2-1"; sha256="0z7ipywnzgkhfvl4zb2fjwl1xq7b5wib296vn9c9qgbndj6b1zh4"; depends=[base64enc]; }; sendplot = derive2 { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; }; - sensR = derive2 { name="sensR"; version="1.5-1"; sha256="0hqnk6gvlkl9harz7rh5ikbp0s0vjwi63gxixqjfhkyk02ilaa3z"; depends=[MASS multcomp numDeriv]; }; + sensR = derive2 { name="sensR"; version="1.5-2"; sha256="073za0z6dawba2nd45hs20m0143kckxn3iglkyqz9vdfqwyv7wlq"; depends=[MASS multcomp numDeriv]; }; sensemakr = derive2 { name="sensemakr"; version="0.1.2"; sha256="0p5rh511fymbh8vkfwdv62xxwflkmrqwas1b16m0hlzjwyzdn03m"; depends=[]; }; - sensiPhy = derive2 { name="sensiPhy"; version="0.8.4"; sha256="1h225gdnvf3bdw7491h3dcpmdwm8bkqgkqmw9584rmjj8dj24xz1"; depends=[ape caper geiger ggplot2 phylolm phytools]; }; + sensiPhy = derive2 { name="sensiPhy"; version="0.8.5"; sha256="1kjkdklva5wzmw071gbn1v9g5cf0wzmvwgy5y0dgi530v6byaw8j"; depends=[ape caper geiger ggplot2 phylolm phytools]; }; sensibo_sky = derive2 { name="sensibo.sky"; version="1.0.0"; sha256="0s8gbj7qrcbcnflp7v0s93ykh2xgk7jwpyvzndj1f90hjy20x3bc"; depends=[glue httr jsonlite]; }; - sensitivity = derive2 { name="sensitivity"; version="1.17.0"; sha256="149hl1li8gqhlwc99z7q01vgdncyd54bf490pjmdj6gznkk35i02"; depends=[boot ggplot2]; }; + sensitivity = derive2 { name="sensitivity"; version="1.18.1"; sha256="1dad2c2ckvb86izb1xsa12298sx9ywnpvb3h25x67y4jygcnhzjg"; depends=[boot ggplot2]; }; sensitivity2x2xk = derive2 { name="sensitivity2x2xk"; version="1.01"; sha256="1r829k939zzmi0j4chdaniajchcflmmjrl3a9hwnkg0wkfnjbvdl"; depends=[BiasedUrn mvtnorm]; }; sensitivityCalibration = derive2 { name="sensitivityCalibration"; version="0.0.1"; sha256="1fn07dra7dhpsg6f1yn1ayfpmvwaxma8cps94070nrpfwmdvi04g"; depends=[ggplot2 ggrepel plotly relaimpo splitstackshape stringi]; }; sensitivityPStrat = derive2 { name="sensitivityPStrat"; version="1.0-6"; sha256="0rfzvkpz7dll3173gll6np65dyb40zms63fkvaiwn0lk4aryinlh"; depends=[survival]; }; @@ -13347,12 +13516,12 @@ in with self; { sensitivitymv = derive2 { name="sensitivitymv"; version="1.4.3"; sha256="1ga8mf92niiv1z3g3kv5ha5xdd1089aaqp19dz68kv8a396vhy1j"; depends=[]; }; sensitivitymw = derive2 { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqgmchabcjdfikm37sn5k41ar8lpnjw58i8qh7yzq237i"; depends=[]; }; sensmediation = derive2 { name="sensmediation"; version="0.3.0"; sha256="0pmhlc5aqz1vwl4fpn38nkqy63pbq6q62fk9xjja4khrq35zh9yb"; depends=[maxLik mvtnorm]; }; - sensobol = derive2 { name="sensobol"; version="0.2.1"; sha256="0m6iqr4wylqgg2r3nqylbzblg2sxa3j4b1rakk99l1giqxlql8nc"; depends=[boot data_table ggplot2 magrittr matrixStats randtoolbox Rdpack rlang scales stringr]; }; - sensors4plumes = derive2 { name="sensors4plumes"; version="0.9.3"; sha256="1r9sddnlxpjck7rhm2w7z8jak7wmrxg3d62dydc5dqcqhgp54r6p"; depends=[automap conf_design emdist FNN genalg gstat lattice raster rgdal sp]; }; + sensobol = derive2 { name="sensobol"; version="0.2.2"; sha256="0j5nn5zmz7xfiv2zkik6k12w962p7m60czni9hsfndvvpvwiy2i5"; depends=[boot data_table ggplot2 magrittr matrixStats randtoolbox Rdpack rlang scales stringr]; }; sensory = derive2 { name="sensory"; version="1.1"; sha256="1zd0ajrymxi6gygcq9fqgwgy0g6c3cqz53x0k5m0ihbmh11rc7s7"; depends=[gtools MASS Matrix]; }; senstrat = derive2 { name="senstrat"; version="1.0.3"; sha256="0j6mb55v5ivqvk8nn8fjlzrbdgj6csa58yc6gy1g07m7gk2qz2np"; depends=[BiasedUrn MASS]; }; sentimentr = derive2 { name="sentimentr"; version="2.7.1"; sha256="13myh7w9pynmgvqspsxpnj8mz8jz8nwkwjyax4hahvwb9707hf2s"; depends=[data_table ggplot2 lexicon stringi syuzhet textclean textshape]; }; - sentometrics = derive2 { name="sentometrics"; version="0.8.0"; sha256="1aaam2hc25332clicnw00nw5mbflq37myjm0sfr5gn9qjq43qafd"; depends=[caret data_table foreach ggplot2 glmnet ISOweek quanteda Rcpp RcppArmadillo RcppParallel RcppRoll stringi]; }; + sentometrics = derive2 { name="sentometrics"; version="0.8.1"; sha256="1kfip67fiplkwcsj35vhkihgnaczx2fj6cvv0mha2pm5c2n5j8l0"; depends=[caret data_table foreach ggplot2 glmnet ISOweek quanteda Rcpp RcppArmadillo RcppParallel RcppRoll stringi]; }; + sentryR = derive2 { name="sentryR"; version="1.1.0"; sha256="0kz81dbxg4zyns829cjhjm2g88pxzaaxdk7c8qabvl0zgqys2chy"; depends=[httr jsonlite stringr tibble uuid]; }; separationplot = derive2 { name="separationplot"; version="1.3"; sha256="0ggyr4asp86hvdp4bwdkljz9b2gzdxm2y9nbz2srlgh3m4hlz2cs"; depends=[foreign Hmisc MASS RColorBrewer]; }; seplyr = derive2 { name="seplyr"; version="0.8.5"; sha256="0cccnggnix5w2a31prvnsp2hl6x8k4rm4nchik9aiqwj2x5kz3hq"; depends=[dplyr rlang tidyr wrapr]; }; seqCBS = derive2 { name="seqCBS"; version="1.2.1"; sha256="176ggpdcgmpsjixmz0ldknyd0vw120kjyrid3bq2bn4cgkwzb74z"; depends=[clue]; }; @@ -13361,45 +13530,44 @@ in with self; { seqICP = derive2 { name="seqICP"; version="1.1"; sha256="1dfhl7g47icjw38p9c0hyvnn3pwzw7pndywk22vgcyfhiz23xjcp"; depends=[dHSIC mgcv]; }; seqMeta = derive2 { name="seqMeta"; version="1.6.7"; sha256="11dscdrlnk5jzg0q2g59qis4xjr4xs86bi463jmhq53n9gsb4i1l"; depends=[CompQuadForm coxme Matrix survival]; }; seqRFLP = derive2 { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; }; - seqgendiff = derive2 { name="seqgendiff"; version="1.1.1"; sha256="0kj36zbrc96zjha57qx2f2n7wq6fay7c8x49n0jpnmjs66daaxlh"; depends=[assertthat cate clue irlba matchingR pdist sva]; }; + seqgendiff = derive2 { name="seqgendiff"; version="1.2.1"; sha256="1xidf5dqd7vbs6vl73q5ja1hfhlqsc3d212c0si2wm8f8fsb1bw3"; depends=[assertthat cate clue irlba matchingR pdist sva]; }; seqinr = derive2 { name="seqinr"; version="3.6-1"; sha256="0j30za6kji6y3v09cvcydiacnp65pv6ig8aw7cydl47l5s9chky4"; depends=[ade4 segmented]; }; seqmagick = derive2 { name="seqmagick"; version="0.1.3"; sha256="0983k7fbcv4ai42cxxi4f854b9mqx68rgyvy0mjhpb6md7ba59jy"; depends=[Biostrings magrittr]; }; - seqminer = derive2 { name="seqminer"; version="7.1"; sha256="1jydcpkw4rwfp983j83kipvsvr10as9pb49zzn3c2v09k1gh3ymy"; depends=[]; }; + seqminer = derive2 { name="seqminer"; version="8.0"; sha256="00jzj8mwb0zaiwlifd41b26mrq9mzigj18nc29dydi0r42hxg16i"; depends=[]; }; seqmon = derive2 { name="seqmon"; version="2.3"; sha256="0lvjb3mx1h5nbbn3kmjwviy9gzsv9k1bs57jdfc09kid7kisaqmn"; depends=[]; }; seqtest = derive2 { name="seqtest"; version="0.1-0"; sha256="1bdfww9szh7h278id5xpfc39mxkcix3yvsdwc68wx3q3x0wxhqhq"; depends=[]; }; + sequence = derive2 { name="sequence"; version="2.0"; sha256="0r5h96gcp18lwgrl2pjlr71xqspkf6qmm1m0xjq5vadalfa7y294"; depends=[]; }; sequences = derive2 { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp]; }; sequenza = derive2 { name="sequenza"; version="3.0.0"; sha256="13l16lacdcf7fn96yj3xqxap0l19ma9ppkxxx5qk9f5abbvdk303"; depends=[copynumber iotools pbapply readr seqminer squash]; }; - sequoia = derive2 { name="sequoia"; version="1.3.3"; sha256="0k0vl7rz9jylry80w8lbqyg3ws3bhkg8axpzy0rrd8xw1lxbpf93"; depends=[plyr]; }; sergeant = derive2 { name="sergeant"; version="0.5.2"; sha256="02chkyvmwd4nimw62v82rfbid1xqw5b1335na44pdi675g904250"; depends=[DBI dbplyr dplyr htmltools httr jsonlite purrr readr scales]; }; serial = derive2 { name="serial"; version="2.1.4"; sha256="1wvs3aa9h1dff2jrxszqwrfv2b281zap1dj2mhlx2w4k8hnggas0"; depends=[]; }; seriation = derive2 { name="seriation"; version="1.2-8"; sha256="1zbdxq0s5rc5v307b69fw9k52m0654ls7pf22lh35ggirig6lwsk"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; }; serieslcb = derive2 { name="serieslcb"; version="0.4.0"; sha256="1ip4k2xzg06hwsni62ai1whs1zzhwlf94507inpfpqz3jmmafrhq"; depends=[gplots shiny]; }; seroincidence = derive2 { name="seroincidence"; version="2.0.0"; sha256="0sam4y7w6prswz0izkm1a9v2k5rv7z22g1ajy15n9xix9aml5ms4"; depends=[]; }; serpstatr = derive2 { name="serpstatr"; version="0.0.1"; sha256="05nl61i1ida6pj6nqx7yvn6wz4ww43ix63pvqa7539r8lr6n3mpf"; depends=[httr]; }; - serrsBayes = derive2 { name="serrsBayes"; version="0.4-0"; sha256="060zs1n5h9ns9dd004f69qmbwbbqla97bhbldm8narhm84f8pf6i"; depends=[Matrix Rcpp RcppEigen truncnorm]; }; + serrsBayes = derive2 { name="serrsBayes"; version="0.4-1"; sha256="0618415n2izdgv85cnmlnpwy0lz7rnimspq8986w5w1ywhw2xpbm"; depends=[Matrix Rcpp RcppEigen truncnorm]; }; servosphereR = derive2 { name="servosphereR"; version="0.1.1"; sha256="0m1fjd3f1s2ss54xmcrm3p0c33hhi2dj0vim790g4y0mw2aicc8l"; depends=[data_table dplyr magrittr purrr rlang]; }; - servr = derive2 { name="servr"; version="0.15"; sha256="199k9aghwk9rf1rm8pjg60xacqww25cza259h5dfj1ixil0m6dxi"; depends=[httpuv jsonlite mime xfun]; }; + servr = derive2 { name="servr"; version="0.16"; sha256="106skz04iq4dkblr17idxsxfcfqic6rcaz8mahydkwjjppnhp5fc"; depends=[httpuv jsonlite mime xfun]; }; sesem = derive2 { name="sesem"; version="1.0.2"; sha256="0b1xzv38wpkhhlq87xrvlh45b8ksbi8bg4ar5hrf8gxa19r9rmi5"; depends=[gplots lavaan mgcv]; }; session = derive2 { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; }; sessioninfo = derive2 { name="sessioninfo"; version="1.1.1"; sha256="0j5f3l58fynxx3v0w62vqpii7miabszgljpja36xx9s8hikh8sqn"; depends=[cli withr]; }; - set = derive2 { name="set"; version="1.0"; sha256="0v17pfrrlncb55n1ag8q9qg9q4c9bq535ax0m0m7jdlpaprnwnf5"; depends=[do]; }; - set6 = derive2 { name="set6"; version="0.1.0"; sha256="1vvafhnl3dvl2iw3lnx0lsjb9vwkad017fri63yslikdhgrfjbqa"; depends=[checkmate R6]; }; + set = derive2 { name="set"; version="1.1"; sha256="0b6qzy3mqf2gfc5gjrn1k6k7ymprjzs2i948zsgcqdkgr8acasbm"; depends=[do]; }; + set6 = derive2 { name="set6"; version="0.1.3"; sha256="0l39zf3mkw810pzgd9s3vwqp4bajls86prnfmwfcknna0wfxk8ka"; depends=[checkmate R6]; }; setRNG = derive2 { name="setRNG"; version="2013.9-1"; sha256="02198cikj769yc32v8m2qrv5c01l2fxmx61l77m5ysm0hab3j6hs"; depends=[]; }; sets = derive2 { name="sets"; version="1.0-18"; sha256="16v7650p47khqrbbw0z98llmwmmhswqmhri0n7nrfhdqwmby1lbl"; depends=[]; }; setter = derive2 { name="setter"; version="0.0-1"; sha256="10fwrx8yysp99rrkbnn3rbz79vyzr2h3p7zxxlqapw1k2lllp0r5"; depends=[assertive_base]; }; settings = derive2 { name="settings"; version="0.2.4"; sha256="092sv6nccm6p2d695l9w0zfi2xgymk12c8p8lhl9nb86mxrb3nry"; depends=[]; }; severity = derive2 { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; }; - sf = derive2 { name="sf"; version="0.8-0"; sha256="05dyq0vcz2f1fl03hk3v1a4nz4s84yyqw4rc9w9cwfq71gvm9qwf"; depends=[classInt DBI magrittr Rcpp units]; }; + sf = derive2 { name="sf"; version="0.9-2"; sha256="01xplgy5nlwy3ajfch4h1ssa1xhm7q0jzscpz04dmvgqfzwhhdfh"; depends=[classInt DBI magrittr Rcpp units]; }; sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; }; sfadv = derive2 { name="sfadv"; version="1.0.1"; sha256="1rfpm6km5pckwhqgpvidm6qsj5sjdaqqj5b0sgvpslivfa4c80cr"; depends=[gmm minpack_lm]; }; sfc = derive2 { name="sfc"; version="0.1.0"; sha256="0cm4mfcfd9bhf2j5fppsihzrfipnldb6q3xradd88z9pwgrkfx2a"; depends=[dplyr sna tidyr triangle zoo]; }; sfdct = derive2 { name="sfdct"; version="0.0.6"; sha256="0ilh89mfwp1yqn44yn80vz1a6g65hryk6w87ngzvak3pd6jxq6aa"; depends=[dplyr RTriangle sf sp tibble]; }; - sfheaders = derive2 { name="sfheaders"; version="0.1.0"; sha256="1bbiqym7kvhyq7d39gmqyvivh5pa7q4d75vya2wrg6m930ihmvqw"; depends=[Rcpp]; }; + sfheaders = derive2 { name="sfheaders"; version="0.2.1"; sha256="0rkx7z10mrkqglxpyjz20y32hbidwpaws2k4hbx2g6a3by1qwddf"; depends=[Rcpp]; }; sfinx = derive2 { name="sfinx"; version="1.7.99"; sha256="14v47y00qwvc2s0vzjw19hwn85nzj8lna539c75qq6zkn6kir6va"; depends=[]; }; - sfsmisc = derive2 { name="sfsmisc"; version="1.1-4"; sha256="0zaw617zarmwir8l60riky0z6r1j3mwfnm1f32vqcbljb74akdj4"; depends=[]; }; + sfsmisc = derive2 { name="sfsmisc"; version="1.1-6"; sha256="04fvjdab6vyyghyqy0abxvfbyr1myz6yib7ibwiyjw9yf7fjrcjp"; depends=[]; }; sft = derive2 { name="sft"; version="2.2-1"; sha256="0fxz64ba58n6ghfqsgq64n1c7qkvi8c3lsa86732mil9w71yxw33"; depends=[fda SuppDists]; }; sgPLS = derive2 { name="sgPLS"; version="1.7"; sha256="1jk2j1zn5vq82rcjflnk7g6y2q0v5jl14k804dmigqg013gbykql"; depends=[mixOmics mvtnorm]; }; - sgRSEA = derive2 { name="sgRSEA"; version="0.1"; sha256="0vyypnq81l36x0j44q2l9wbf3x4krz4fzypi7vyqhaq97mkzaw5j"; depends=[]; }; sgd = derive2 { name="sgd"; version="1.1.1"; sha256="055khw3jr7kr8la3jpzq1q25gk0qcclkv7g0q1sylhyqq2qdriwb"; depends=[BH bigmemory ggplot2 MASS Rcpp RcppArmadillo]; }; sgee = derive2 { name="sgee"; version="0.6-0"; sha256="055iydainzywb1s5id5rl9i94dj5arr9b6qz15p8wps49vm2mlp3"; depends=[copula mvtnorm]; }; sgeostat = derive2 { name="sgeostat"; version="1.0-27"; sha256="1iq9p2jk8bpv1h853a1l91d5c5dxnhkk3cmkd01siqqvj04hv4vb"; depends=[]; }; @@ -13408,14 +13576,14 @@ in with self; { sglg = derive2 { name="sglg"; version="0.1.5"; sha256="0b2lksn887h92y8l1gjmhm2pxzfn6kk0rjvyh9k2b1j4plkvp73b"; depends=[AdequacyModel Formula ggplot2 gridExtra moments robustloggamma ssym survival]; }; sglr = derive2 { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; }; sgmcmc = derive2 { name="sgmcmc"; version="0.2.5"; sha256="0lq79c7i6bklh8c63wx3k6h9mk8s1abbr0hc41drcm96bbbg0aal"; depends=[reticulate tensorflow]; }; - sgmodel = derive2 { name="sgmodel"; version="0.1.0"; sha256="03s9z7n7w3pys5dp1z5x91bszgv3q1sax5z591dz9rvmn5glp2lj"; depends=[ggplot2 ramify Rtauchen tidyverse]; }; + sgmodel = derive2 { name="sgmodel"; version="0.1.1"; sha256="1i13vp91i8s61ylsyg0iij1sfclwif7v91slr2srl8ddz6lm23nx"; depends=[ggplot2 ramify Rtauchen]; }; sgof = derive2 { name="sgof"; version="2.3.2"; sha256="020kc6h9iw4qhb9pdi7wk8vcy54dp10x0z3nlq3gwwbj1l9izc44"; depends=[poibin]; }; sgr = derive2 { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; }; sgt = derive2 { name="sgt"; version="2.0"; sha256="0qb3maj5idwafs40fpdfrwzkadnh5yg8fvfzfs51p9yy69kbmlkx"; depends=[numDeriv optimx]; }; shades = derive2 { name="shades"; version="1.4.0"; sha256="1zg95sjhrfvbdlfc387g9p0vnb8nb6agdk1mb3wq3kwkm2da0bqj"; depends=[]; }; - shadow = derive2 { name="shadow"; version="0.6.3"; sha256="0xm3d3x02z2lk1n9z5ny7cdybyvxxznwrfn76nk1jx5dshqhrwpr"; depends=[plyr raster rgeos sp]; }; + shadow = derive2 { name="shadow"; version="0.6.4.1"; sha256="1v04v9g6slcr6iagqy6xk061dilxcvmrxv9n7r8z5ag3cbivl9ab"; depends=[plyr raster rgeos sp]; }; shadowtext = derive2 { name="shadowtext"; version="0.0.7"; sha256="1s1ip8zfr684a3ld7hvf524bhn2j31k6d1wbhh1ni0flsggv2ckf"; depends=[ggplot2 scales]; }; - shallot = derive2 { name="shallot"; version="0.4.7"; sha256="0lvvnia3yngywp7gm68kdwgfmvag4llhzim8nqcbl6iq52lvlj2g"; depends=[commonsMath rscala salso]; }; + shallot = derive2 { name="shallot"; version="0.4.9"; sha256="0zmai0h3xgdi1fmmfh7jcvzl5ibmj5c86p9rzfh3wdlyqrc3hz1a"; depends=[commonsMath rscala salso]; }; shape = derive2 { name="shape"; version="1.4.4"; sha256="0hadk3mapkhbh8xjkiz52vxdagmmgvm15xwpzb90ikw4giyipjzl"; depends=[]; }; shapeR = derive2 { name="shapeR"; version="0.1-5"; sha256="17fq4gsdvyniq7n4x1xdvb5kk50184i7why3pdf1djjhknym087j"; depends=[gplots jpeg MASS pixmap vegan wavethresh]; }; shapefiles = derive2 { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; }; @@ -13423,40 +13591,46 @@ in with self; { shapper = derive2 { name="shapper"; version="0.1.2"; sha256="0z2ad0hk1gwxbr4kqbk26lzl25hrcifcp92i3am5j6y0ys71dwsx"; depends=[ggplot2 reticulate]; }; shar = derive2 { name="shar"; version="1.1"; sha256="157b1pia21qygb7pqb97v8b3bklnfq40xf8y7wg6p2ixkab0ws6c"; depends=[classInt raster Rcpp spatstat]; }; sharpData = derive2 { name="sharpData"; version="1.2"; sha256="0pvaq8i1vrra3d0wf6yyqkbin0zgsd1kvdzh4bfnyps6pzn5k789"; depends=[KernSmooth quadprog]; }; - sharpeRratio = derive2 { name="sharpeRratio"; version="1.2"; sha256="0jn8i8vvqahraw78cw6w05v03x49m62l7m1iz81c6hwg05ld36jy"; depends=[ghyp Rcpp]; }; + sharpeRratio = derive2 { name="sharpeRratio"; version="1.3"; sha256="1x8vskx0hgdkxwdsfpc82amhj2089g1wj0qsj6nkd0n4k78wv21x"; depends=[ghyp Rcpp]; }; sharpr2 = derive2 { name="sharpr2"; version="1.1.1.0"; sha256="1r7anfr296l5sbhgry6rb15hlca6mpcm24qssdzz9bckavyfvqgi"; depends=[Matrix mvtnorm]; }; + sharpshootR = derive2 { name="sharpshootR"; version="1.6"; sha256="1kzgxg1w5ajirsif6pgdqyal4aidj6y0q29zhikds4pr9x5sqcs4"; depends=[ape aqp circular cluster curl digest e1071 Hmisc igraph lattice plyr RColorBrewer reshape2 scales soilDB sp stringi vegan]; }; sharx = derive2 { name="sharx"; version="1.0-5"; sha256="10sfjg6946jfk4051da0w1v89503av40wckqaabr12syf8kn0aw8"; depends=[dclone dcmle Formula]; }; - shazam = derive2 { name="shazam"; version="0.2.2"; sha256="1qa9jfbiv40x2dnvfkgcmp0vikv8k1migffqqn8v96zyisndvj8k"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress rlang scales SDMTools seqinr stringi tidyr]; }; + shazam = derive2 { name="shazam"; version="0.2.3"; sha256="1c466yl596vra4bg03spkhz7ybsymaz2yg04amqnal06cwnp32hz"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress rlang scales seqinr stringi tidyr]; }; shelltrace = derive2 { name="shelltrace"; version="3.5.1"; sha256="1xgbavaa26185i6q3907ds3bzq4xrw027x1sw5vsybqrxdz04jiz"; depends=[bmp tiff xlsx]; }; shiftR = derive2 { name="shiftR"; version="1.5"; sha256="18y2qzqx8hd6yph1wnsq4ygm16pcdszynh174xsrxrhvx2h9mi4x"; depends=[]; }; - shiny = derive2 { name="shiny"; version="1.4.0"; sha256="0jvcxs0vdxdlbriahxjzzcmg8v8if21k3xvdgk59iskw71ch81qc"; depends=[crayon digest fastmap htmltools httpuv jsonlite later mime promises R6 rlang sourcetools xtable]; }; + shiny = derive2 { name="shiny"; version="1.4.0.2"; sha256="0r70ynic4wi9cxizk2gg097mfjps3a17ngi763cs6rijs21sr9nw"; depends=[crayon digest fastmap htmltools httpuv jsonlite later mime promises R6 rlang sourcetools xtable]; }; shiny_i18n = derive2 { name="shiny.i18n"; version="0.1.0"; sha256="15llwr4yrx6rlk32b92wcq3dn360y5cvy4mh2aqkza9ikcvlhcvv"; depends=[jsonlite yaml]; }; + shiny_info = derive2 { name="shiny.info"; version="0.2.0"; sha256="162wvb02z5h1y7xgsyl6wv88zlfmbm1jlnz48f56fyybs54baw41"; depends=[git2r glue shiny]; }; shiny_router = derive2 { name="shiny.router"; version="0.1.1"; sha256="0biwni6bk39qafvsh8w32crlgm4hf8r9kwkmnlc3w5za2x2fja4c"; depends=[magrittr shiny]; }; - shiny_semantic = derive2 { name="shiny.semantic"; version="0.2.1"; sha256="0m0f22qlmf7f2cf33myn72dm48yslqyx4kwzb96i78a3yz6a2awp"; depends=[htmltools htmlwidgets jsonlite magrittr purrr shiny]; }; + shiny_semantic = derive2 { name="shiny.semantic"; version="0.3.0"; sha256="0kcwkl0rjll8b73g43hk2fclwchr6pl71p632b302zz44vbnvg15"; depends=[htmltools htmlwidgets jsonlite magrittr purrr shiny]; }; shinyAce = derive2 { name="shinyAce"; version="0.4.1"; sha256="1m33dfm2kjirvgix7ybv1kbzgjkicdpv411g9c0q3fw6rnyhfxxn"; depends=[jsonlite shiny]; }; shinyBS = derive2 { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[htmltools shiny]; }; + shinyCyJS = derive2 { name="shinyCyJS"; version="0.0.11"; sha256="1wvrv5hdr74d2a68iwy76ffawmy4mpw0swrngw41zqpjd6hjiyxd"; depends=[htmlwidgets]; }; shinyDND = derive2 { name="shinyDND"; version="0.1.0"; sha256="0nkvz4hmjzmxlzj4vkjrdy8xlbxapg1amk180irgvwicqldi4jpm"; depends=[htmltools shiny]; }; shinyEffects = derive2 { name="shinyEffects"; version="0.1.0"; sha256="03fm2i1ydlp90w299nvz7dqs9724g0m2f0bc44ni8m2gz9cfpccs"; depends=[htmltools shiny shinydashboard]; }; shinyEventLogger = derive2 { name="shinyEventLogger"; version="0.1.1"; sha256="1piycfg9j0dg3fgq9f88gs7zvhldmrzn7ggy2ijbh6r7iwipwgdm"; depends=[bupaR jsonlite mongolite purrr R_utils shiny stringr]; }; shinyFeedback = derive2 { name="shinyFeedback"; version="0.1.0"; sha256="01qp75c5dsvc4xs1id1yhn81gmjl0hnjz8msf8mkvf4ifqal563f"; depends=[digest shiny]; }; - shinyFiles = derive2 { name="shinyFiles"; version="0.7.5"; sha256="1143m941hma9hc77c3xcw26c0ygfhn9ii2sbp9wrydxv4gc7mr8a"; depends=[fs htmltools jsonlite shiny tibble]; }; - shinyHeatmaply = derive2 { name="shinyHeatmaply"; version="0.1.0"; sha256="1vl80vp7yslnh0dvcrpysfn5rndjavphy31y15546q7ax7d0fn6v"; depends=[dplyr DT heatmaply htmltools htmlwidgets jsonlite plotly RColorBrewer readxl shiny viridis xtable]; }; + shinyFiles = derive2 { name="shinyFiles"; version="0.8.0"; sha256="0gwyx37f2r86cldsyknws9pafpj8g5mg3mchlyl9ymgnk5f4b88w"; depends=[fs htmltools jsonlite shiny tibble]; }; + shinyHeatmaply = derive2 { name="shinyHeatmaply"; version="0.2.0"; sha256="1n7c7dvvb9kqay2phcf0bkwi990x1cjl7js6pq05xx7rli5bc5h4"; depends=[dplyr heatmaply htmltools plotly readxl rmarkdown shiny xtable]; }; shinyKGode = derive2 { name="shinyKGode"; version="1.0.5"; sha256="004zwz4kqfijzvvwkq8v1gi25w1wrdlg8230g93w36gbi6cl2vk1"; depends=[ggplot2 gridExtra KGode mvtnorm pracma pspline reshape2 shiny shinyjs XML]; }; + shinyKnobs = derive2 { name="shinyKnobs"; version="0.1.3"; sha256="1rxlvq4vr87krf7d6mpx0y53hyz8q1jnx6nv7mlhc1ck13q6fgac"; depends=[htmltools shiny]; }; shinyLP = derive2 { name="shinyLP"; version="1.1.2"; sha256="1sjcll10ciq6pj9h8c6ybjqp8763wc423hddlalcblxxpajf6avz"; depends=[shiny]; }; shinyML = derive2 { name="shinyML"; version="0.2.0"; sha256="1x7fshfq85cbaydhhqx1lcfybv6qlrc6rmajsbcvvnbnbp1m5ysb"; depends=[data_table dplyr DT dygraphs ggplot2 h2o plotly shiny shinycssloaders shinydashboard shinyWidgets sparklyr tidyr]; }; shinyMatrix = derive2 { name="shinyMatrix"; version="0.3.0"; sha256="0gakbwfrqyxbm946rgxk3xc4qh4i3631hg8q37058ji63bxqzadc"; depends=[jsonlite shiny]; }; shinyMobile = derive2 { name="shinyMobile"; version="0.1.0"; sha256="1jk4dpg78qxpsqnj44ia3z668bhf8mfziiz8v4zp7mmpp7x5447b"; depends=[htmltools jsonlite magrittr shiny]; }; shinyMolBio = derive2 { name="shinyMolBio"; version="0.2"; sha256="09lq5pvis450il1agcq5n9cilnq84rfv08w2dz1d0bbq1qgrgnvg"; depends=[checkmate dplyr plotly purrr RColorBrewer RDML shiny stringr whisker]; }; + shinyNotes = derive2 { name="shinyNotes"; version="0.0.1"; sha256="1l0nw6xac410109jrr88a62a5fhv6h6xaql19bp0h8qxyc2fppjh"; depends=[DBI dbplyr dplyr magrittr RSQLite shiny shinyjs shinyWidgets stringr]; }; shinyRGL = derive2 { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; }; - shinySIR = derive2 { name="shinySIR"; version="0.1.0"; sha256="1khl6p7256cy6iqg8wyracdyz08iysak91r79hf0xhh2gbb8fs49"; depends=[deSolve dplyr ggplot2 shiny tidyr]; }; + shinySIR = derive2 { name="shinySIR"; version="0.1.1"; sha256="0m8ff5535hy5b363l4xkrdsm3m7mnfdb23h2wgqmysdv4af1gm2i"; depends=[deSolve dplyr ggplot2 shiny tidyr]; }; shinyShortcut = derive2 { name="shinyShortcut"; version="0.1.0"; sha256="101wz9s4rk7fbaqgm0r2v3v8za20vdxwq4vhkz8xr7y5pr65sxiq"; depends=[]; }; shinyTime = derive2 { name="shinyTime"; version="1.0.1"; sha256="1d830wf7d5ki7frbr1vgy9d0vllyfcylq7pfkspjkz64b2xfhah3"; depends=[htmltools shiny]; }; shinyTree = derive2 { name="shinyTree"; version="0.2.7"; sha256="0jfx2capckv7hf2yx3fn8i4rcmhi222ah91jnmhg497x8wgz31s3"; depends=[htmlwidgets jsonlite promises shiny stringr]; }; - shinyWidgets = derive2 { name="shinyWidgets"; version="0.5.0"; sha256="111w6f23m16w6zb5bg85brg90gsyw50rad6c4qqm1y5k3ny1gzgb"; depends=[htmltools jsonlite scales shiny]; }; + shinyWidgets = derive2 { name="shinyWidgets"; version="0.5.1"; sha256="1p56qfgj5y0rzyqj889hmbl7k6gwyxc58rzss9y2vav9d3jgsrr8"; depends=[htmltools jsonlite scales shiny]; }; shinyaframe = derive2 { name="shinyaframe"; version="1.0.1"; sha256="1flhgsm4q7p5acb41v73pf8ni92y9dwdppxjb9czlz1sxwf03p1s"; depends=[htmltools htmlwidgets shiny]; }; shinyalert = derive2 { name="shinyalert"; version="1.0"; sha256="0ngmpbzw6fw1gs6sv9m3xv2c9bmrxg0bs6lnvxn8hm8cwr4440xi"; depends=[digest shiny]; }; shinyanimate = derive2 { name="shinyanimate"; version="0.3.0"; sha256="0vshid5mfq006cprjj61d0g7ajyc3plc66x55c5jjmijwbp6pw7a"; depends=[shiny]; }; shinybootstrap2 = derive2 { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; }; + shinybrms = derive2 { name="shinybrms"; version="1.0.1"; sha256="1ngm8ryfppmdk7l46iv4a6gvz35l5z1rrv89dlg1cknam4zgyvc1"; depends=[brms shiny]; }; shinybusy = derive2 { name="shinybusy"; version="0.2.0"; sha256="1zhi4nfnwwxn25r47fa8c5dq0wfvxmmdzrr8vfiq3qjj46bi1alf"; depends=[htmltools htmlwidgets jsonlite shiny]; }; shinycssloaders = derive2 { name="shinycssloaders"; version="0.3"; sha256="1gzq1lhcnhqd145ys3ixf0l13l560fiqr2sc3m2nrijwxlgcw54d"; depends=[digest glue shiny]; }; shinycustomloader = derive2 { name="shinycustomloader"; version="0.9.0"; sha256="1klx71vr26g0gjf6hbiia1qidqii5d467i1sdjvlrg1hxdcggqff"; depends=[glue shiny]; }; @@ -13465,25 +13639,28 @@ in with self; { shinyglide = derive2 { name="shinyglide"; version="0.1.2"; sha256="0i98k3gl83kfzp3vs1his05idhwj1n0bw98ik7d62cgn4rqi6ar4"; depends=[htmltools shiny]; }; shinyhelper = derive2 { name="shinyhelper"; version="0.3.2"; sha256="1c4hvf19j3yyh8r12nx85ldkxs89g98q74csnqs5ml5l79a65vgp"; depends=[markdown shiny]; }; shinyhttr = derive2 { name="shinyhttr"; version="1.0.0"; sha256="1l02g0qgvycwpfr6wl7svnms128fhlzbn9p7i4mr7ghgsd5qr58a"; depends=[shinyWidgets]; }; - shinyjqui = derive2 { name="shinyjqui"; version="0.3.2"; sha256="1a73vsq1wc3xf14y64hkgnk5jgxj98b8aj3g0fs7mgayar3an5g0"; depends=[htmltools htmlwidgets jsonlite shiny]; }; + shinyjqui = derive2 { name="shinyjqui"; version="0.3.3"; sha256="0n4ijxmkp8x6dwrsxwvx0zgd8b5129cmn6q6rrav38v1q5k8889x"; depends=[htmltools htmlwidgets jsonlite shiny]; }; shinyjs = derive2 { name="shinyjs"; version="1.1"; sha256="14k8y313ppj23m9rhlk8jc94x6sbn3qrsnx6xrijiyv8m8dii1l9"; depends=[digest htmltools jsonlite shiny]; }; shinyloadtest = derive2 { name="shinyloadtest"; version="1.0.1"; sha256="0k9b57wm2cv78qf9qryqr1s0p7gsncn8axd285f6rrayg4czb40l"; depends=[curl dplyr getPass ggplot2 glue gtable htmltools httpuv jsonlite lubridate magrittr progress R6 readr rlang rmarkdown scales stringr svglite tibble websocket xml2]; }; shinylogs = derive2 { name="shinylogs"; version="0.1.7"; sha256="1b4p0g1vf9wn643rybf382mw6mrrl49qsykh7npa3agcarwznmgr"; depends=[anytime bit64 data_table DBI digest htmltools jsonlite nanotime RSQLite shiny]; }; - shinymanager = derive2 { name="shinymanager"; version="1.0.100"; sha256="1ls5qg4zmqvapxcbkp4jk8r8rqmd223mb9s2hqq022hbyglclhxk"; depends=[billboarder DBI DT htmltools openssl R_utils R6 RSQLite shiny]; }; - shinymaterial = derive2 { name="shinymaterial"; version="1.0.0"; sha256="1mgvxhk2ky3612ci9f1zz8x7z37r176kw1j0b4bs2843gmnxjfga"; depends=[jsonlite shiny]; }; + shinymanager = derive2 { name="shinymanager"; version="1.0.200"; sha256="00dvzcpba4awmdgy8wcn8h7qdc8mdrfaq3kp28h509xn3gax02wn"; depends=[billboarder DBI DT htmltools openssl R_utils R6 RSQLite shiny]; }; + shinymaterial = derive2 { name="shinymaterial"; version="1.0.1"; sha256="1vmbc5g55d3nsz18r2s2z5wgm2yrxygnyarsfhkqf3vyj8vndglw"; depends=[jsonlite shiny]; }; shinypanels = derive2 { name="shinypanels"; version="0.5.0"; sha256="1rslz9wl3gx11dm6il77j4k5swxvcfy5mf0zffbs4zk8xjgpzzj6"; depends=[glue htmltools shiny shinyjs]; }; + shinyr = derive2 { name="shinyr"; version="0.2.6"; sha256="16bknhab23by0h1b6c9q6rzyzyqnrcjhpsgw0gv427jycap9b0vv"; depends=[caret corrplot DMwR dplyr e1071 knitr nnet plotly randomForest RColorBrewer shiny shinydashboard tm wordcloud]; }; shinyrecap = derive2 { name="shinyrecap"; version="0.1.0"; sha256="1mic7azxz2in67g3a2ir550w8psh6kc75p6hja6m62a0yy7j2n92"; depends=[CARE1 coda conting dga future ggplot2 ipc LCMCR promises Rcapture reshape shiny shinycssloaders testthat]; }; shinystan = derive2 { name="shinystan"; version="2.5.0"; sha256="18alf5kiqw7y2l6m5nxxizwc2znsf9frxfsqhvgcad8hld9cbya5"; depends=[bayesplot colourpicker DT dygraphs ggplot2 gridExtra gtools markdown reshape2 rsconnect rstan shiny shinyjs shinythemes threejs xtable xts]; }; shinytest = derive2 { name="shinytest"; version="1.3.1"; sha256="1qn46kgqxfbfimghy5d200rmxpmbp7ckl7dm82m4bnrsf9ivzlgg"; depends=[assertthat callr crayon debugme digest htmlwidgets httpuv httr jsonlite parsedate pingr R6 rematch rstudioapi shiny testthat webdriver withr]; }; shinythemes = derive2 { name="shinythemes"; version="1.1.2"; sha256="12miz44n2zxfswnia7p8dirxj3miw0aqn4pkx2111ikz67ax84rf"; depends=[shiny]; }; shinytoastr = derive2 { name="shinytoastr"; version="2.1.1"; sha256="01j2z4gf1wxblrjayykwxdr2s8394i7k930x8g4hmrj7c9pv264n"; depends=[shiny]; }; - shipunov = derive2 { name="shipunov"; version="1.4"; sha256="0a2rd8qr9493gq74rqjaxjn9cxygikhy87jf1yqaxa6b9djwdqzc"; depends=[]; }; + shinyypr = derive2 { name="shinyypr"; version="0.0.2"; sha256="1k6jsw6gnpwk90hkpa9grki0b68cab57vbd0h6ldjqr11giwcz8z"; depends=[bsplus chk dplyr DT ggplot2 lifecycle magrittr purrr readr shiny shinyjs waiter ypr]; }; + shipunov = derive2 { name="shipunov"; version="1.7"; sha256="0sq2xk1dsw0jca9lg0j8qypfzxzzw8lfn3ldgcpyn3wmhyg2w1xc"; depends=[]; }; shock = derive2 { name="shock"; version="1.0"; sha256="11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp"; depends=[capushe GGMselect glasso igraph mvtnorm]; }; shopifyr = derive2 { name="shopifyr"; version="1.0.0"; sha256="05hih1v5vvr7vmwarizsdx8517g74s96fdsz3klcz3g12idx1nqn"; depends=[curl jsonlite R6]; }; shortcuts = derive2 { name="shortcuts"; version="1.4.0"; sha256="0y77napfz1v3s667cmyn8357xg5lncbw1hc3hm5kra6nalhq1jps"; depends=[rstudioapi]; }; + shorts = derive2 { name="shorts"; version="0.0.1"; sha256="17dsdf5byby0whpfv14dq22q51q1icfcdc4ww6hfjvbkfw23vy71"; depends=[LambertW nlme]; }; shotGroups = derive2 { name="shotGroups"; version="0.7.5.1"; sha256="0il6hlv2hnfx5rmj3vk3q9p24xqii77z6hdz5fsgyh4i3kgcyrjy"; depends=[boot coin CompQuadForm KernSmooth robustbase]; }; showimage = derive2 { name="showimage"; version="1.0.0"; sha256="1c0x3iqjdjsz3cdhc02b3qm2pwxjr1q2k87jwvxj9lnzzw81f1pl"; depends=[png]; }; - showtext = derive2 { name="showtext"; version="0.7"; sha256="1ihgqzfia36b0n9aa41p1w98wxxvs1lxh1zz0570hbfqmph1sk73"; depends=[showtextdb sysfonts]; }; + showtext = derive2 { name="showtext"; version="0.7-1"; sha256="0a5gg72bfrc7wm0phj1aflj1wc08kfi81ac32na6ya9s2ivyimw5"; depends=[showtextdb sysfonts]; }; showtextdb = derive2 { name="showtextdb"; version="2.0"; sha256="1qwwj9x2jvadvwn60h75k99c9xi7yhqjsgaakahz5paxgj583bsh"; depends=[sysfonts]; }; shp2graph = derive2 { name="shp2graph"; version="0-5"; sha256="1l9mg98hkb0bvr5dzd2p26g8mw5hqjxrym2gmbm10kyapvccfk56"; depends=[igraph maptools sp]; }; shrink = derive2 { name="shrink"; version="1.2.1"; sha256="0pd967wsys8fd7gyvr9y08km118yamfk5c1a1i2k8nr2ifpqmy0w"; depends=[MASS mfp rms survival]; }; @@ -13495,7 +13672,7 @@ in with self; { sicegar = derive2 { name="sicegar"; version="0.2.3"; sha256="0q0sp3aqvd4jh8ncfnls194iqikyxyk28zsyq65jkqd8z26s2dq4"; depends=[dplyr fBasics ggplot2 minpack_lm]; }; sideChannelAttack = derive2 { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[ade4 corpcor infotheo MASS mmap]; }; sidier = derive2 { name="sidier"; version="4.0.3"; sha256="0pfzx0a5f597iqigq9xidm9b9xv18zaiqa35yp4xlk1y7gv0nj6c"; depends=[ape ggmap ggplot2 gridBase igraph network]; }; - sidrar = derive2 { name="sidrar"; version="0.2.4"; sha256="1zwxafc4xaa4386a9jdg3gwflpdxql3f33bkqx1l2yl30x3517rw"; depends=[dplyr magrittr RCurl rjson rvest stringr tidyr xml2]; }; + sidrar = derive2 { name="sidrar"; version="0.2.5"; sha256="04i061kfzk2qpdz8z7igj0i53387rj3xv6q7xzdyginkn67mrj5m"; depends=[magrittr RCurl rjson rvest stringr xml2]; }; siebanxicor = derive2 { name="siebanxicor"; version="1.0.0"; sha256="0bnpqqhqvqq9kxvzljzp4d5aw9drh78cwyxyqzdvshijl7mmqjwc"; depends=[httr jsonlite]; }; sievePH = derive2 { name="sievePH"; version="1.0.1"; sha256="1hdccfq39sw3jsakv8lrnjp8mmc431l6ka1g9r53ihrz18s6c39v"; depends=[survival]; }; sievetest = derive2 { name="sievetest"; version="1.2.3"; sha256="17qrm7axvlr2yzp8brbibp26f8qdpqm85hc2kjzxm5zqwfvd6dfs"; depends=[]; }; @@ -13505,18 +13682,19 @@ in with self; { sigclust = derive2 { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; }; sigmaNet = derive2 { name="sigmaNet"; version="1.1.0"; sha256="1i0xikwad9kiyrqxi1klkc4h4hyqfkxr388sw4mrx9pswfpbv3xr"; depends=[htmlwidgets igraph jsonlite RColorBrewer]; }; sigmajs = derive2 { name="sigmajs"; version="0.1.3"; sha256="017cpdxymh4n8is10akkbpdhakc1jdc1j5lw0pgg2jj5s3bl1rav"; depends=[crosstalk dplyr htmltools htmlwidgets igraph jsonlite magrittr purrr scales shiny]; }; - sigminer = derive2 { name="sigminer"; version="0.1.11"; sha256="0lp53bllr8lm337azc3gr5f8s6s9bnm5yyq98lymg9pn2j3imd51"; depends=[cluster corrplot cowplot data_table doParallel dplyr flexmix foreach ggplot2 maftools magrittr NMF purrr RColorBrewer tidyr]; }; + sigminer = derive2 { name="sigminer"; version="1.0.0"; sha256="1c2cckb7l87jp30c3j4c23yifaly9fqb58d00v9myjcbsrc9xhrx"; depends=[circlize cluster cowplot data_table doFuture dplyr flexmix foreach furrr future GenomicRanges ggalluvial ggplot2 ggplotify ggpubr IRanges lsei maftools magrittr NMF patchwork purrr RColorBrewer rlang tibble tidyr]; }; sigmoid = derive2 { name="sigmoid"; version="0.3.0"; sha256="1sa6nmip3fizdk3r47pvx0h3qldn267arpmid0wa1pb7k5j2g682"; depends=[]; }; signal = derive2 { name="signal"; version="0.7-6"; sha256="1vsxramz5qd9q9s3vlqzmfdpmwl2rhlb2n904zw6f0fg0xxjfq3b"; depends=[MASS]; }; signalHsmm = derive2 { name="signalHsmm"; version="1.5"; sha256="1d4v6cbvcbi8pb5zmn58s01h3jb0kv7yr7qvcnx4p2v82knvhik7"; depends=[Rcpp seqinr shiny]; }; signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; }; - signnet = derive2 { name="signnet"; version="0.5.0"; sha256="0m3bb1m1zqvfn1ym4nfp9364bfgryz2clqi7ls5bnwpkn2vznyqq"; depends=[igraph Matrix Rcpp RcppArmadillo]; }; + signnet = derive2 { name="signnet"; version="0.5.2"; sha256="0lhxp87m7c898xvdhzca6lm625cnh3rvbqbbz42f1lv388ik4sw2"; depends=[igraph Matrix Rcpp RcppArmadillo]; }; signs = derive2 { name="signs"; version="0.1.2"; sha256="0dzf5pydvs93rvj6idw9l2asv1bxwz20df7qis2db84hfww2kc6m"; depends=[rlang scales]; }; sigora = derive2 { name="sigora"; version="3.0.5"; sha256="1240q42kpb4l1idanywzal7c85kp3ncdl5m2irh8qs5xrs02gdc7"; depends=[]; }; sigr = derive2 { name="sigr"; version="1.0.6"; sha256="01crx8r9bcq1kwlq66vypnv1r48fp3hbl06ykd8g2k5zm06w0yyi"; depends=[wrapr]; }; - siland = derive2 { name="siland"; version="1.4.6"; sha256="0alnyd3phjv9kg21px96daw21613wjgp1ypqh8b4h0djcjd9xn17"; depends=[fasterize ggforce ggplot2 lme4 raster reshape2 sf sp]; }; - silicate = derive2 { name="silicate"; version="0.2.0"; sha256="19386cd46jil4fhs6340wbk96igi9jlfgghbm88c0j5ff4ah1bsj"; depends=[decido dplyr geometry gibble gridBase magrittr purrr rlang tibble tidyr unjoin]; }; + siland = derive2 { name="siland"; version="2.0"; sha256="0g06adzydvrw7vq2a78m4lw1vc2k28mp2pj5q20629yknpv54ffr"; depends=[fasterize ggforce ggplot2 lme4 raster reshape2 sf sp]; }; + silicate = derive2 { name="silicate"; version="0.4.0"; sha256="1bvwdrmnrcnyq21sz50g9aksqhd5xkcqhd305mr606mgm183x5rn"; depends=[crsmeta decido dplyr gibble gridBase magrittr purrr rlang tibble unjoin]; }; sim1000G = derive2 { name="sim1000G"; version="1.40"; sha256="1avq6xfc34izavvp9vb5ccc2b9nc4m7cwr06ygnsmpgwi5nswbb8"; depends=[hapsim MASS readr stringr]; }; + sim2Dpredictr = derive2 { name="sim2Dpredictr"; version="0.1.0"; sha256="0q1l75h1dcxnd60lcmf4sny1ywidfmm0yv9ylkb3yc13v469167i"; depends=[car dplyr ggplot2 magrittr MASS matrixcalc Rdpack spam tibble tidyverse]; }; simEd = derive2 { name="simEd"; version="1.0.3"; sha256="1yq0qblrz0zddx682rzwdaa0k0r223i123la7wbp73spnn38g4br"; depends=[rstream]; }; simExam = derive2 { name="simExam"; version="1.0.0"; sha256="10p3y67cli5is2gj23cjy8y7zpbnn2jbxmfiq01ls0hc1jind82w"; depends=[Matrix msm]; }; simFrame = derive2 { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[lattice Rcpp]; }; @@ -13525,14 +13703,13 @@ in with self; { simMP = derive2 { name="simMP"; version="0.17.3"; sha256="1pzg79dd08ds3pfzxnk9h95gaibicv00mnm0jb4i8v5is4gzrdhr"; depends=[Biostrings BSgenome doParallel foreach GenomeInfoDb GenomicRanges IRanges XVector]; }; simMSM = derive2 { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[mvna survival]; }; simPATHy = derive2 { name="simPATHy"; version="0.4"; sha256="1blvgaadp7iz0mcgax2xc8wa7aa9f82q09qym1wl8xdv01m29b80"; depends=[ggm graph gRbase htmlwidgets igraph mvtnorm qpgraph R_utils shiny shinydashboard]; }; - simPH = derive2 { name="simPH"; version="1.3.10"; sha256="0br32m28ynmhr4xal69bsv925rlmih898rk5bskn1s6bhsshalqq"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; }; + simPH = derive2 { name="simPH"; version="1.3.11"; sha256="0dlig46jggw39siigblvm2qn9gds5yzm2rv8sdcga75157d7wh1r"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; }; simPop = derive2 { name="simPop"; version="1.2.0"; sha256="05f1azdz202bap4pkqxiacj7wqkbmw3naw6p7xgmvx8nlh5xl40h"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp RcppArmadillo vcd VIM wrswoR]; }; simSummary = derive2 { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind gdata svUnit]; }; - simTargetCov = derive2 { name="simTargetCov"; version="1.0"; sha256="0r34jkrkq382a7afy4nqrw1ci9yh8aq3mfixw11asxjb7m16c1j2"; depends=[MASS]; }; - simTool = derive2 { name="simTool"; version="1.1.4"; sha256="1jb5r32kwyfv38vij236f3mb2ijqm48iz427zya27dyhps8i305s"; depends=[dplyr plyr purrr reshape tibble tidyr]; }; + simTargetCov = derive2 { name="simTargetCov"; version="1.0.1"; sha256="0gdqqwg9i2hga6l4s5x7wbbsm20b3sgwrci1g6hc04x1h9aawiw2"; depends=[MASS]; }; + simTool = derive2 { name="simTool"; version="1.1.5"; sha256="09pvrcjqkgrrvr1qdkc9s1s880x5zmmcfj7wrl22lanpfkng5x6f"; depends=[dplyr purrr tibble tidyr]; }; simba = derive2 { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; }; simboot = derive2 { name="simboot"; version="0.2-6"; sha256="0bgibrqb9j62p1chldi1lvdsgc6sgsr7afyq4lvyrc2h861f3j9d"; depends=[boot mvtnorm]; }; - simcausal = derive2 { name="simcausal"; version="0.5.5"; sha256="0k1dbg10bmpxc37nq9vk849qsdi09whc8r85rj08pbcfaac8cgfv"; depends=[assertthat data_table igraph Matrix R6 stringr]; }; simcdm = derive2 { name="simcdm"; version="0.1.1"; sha256="1qzxxpz3nvqf9801k6zgphv6vd8alf2sf6cvzggk7cz6x5jc3w1r"; depends=[Rcpp RcppArmadillo]; }; simctest = derive2 { name="simctest"; version="2.6"; sha256="0igwn82zfx6ajv42gpyx6969aldygldkpdc9ik6601511sscvf2a"; depends=[]; }; simdistr = derive2 { name="simdistr"; version="1.0.1"; sha256="16fsj42zr627i57q1q72l1nhin7g6rxq9hfy487hf1ywd6rvns18"; depends=[]; }; @@ -13540,31 +13717,34 @@ in with self; { simest = derive2 { name="simest"; version="0.4"; sha256="1wp08dkbshn5parq69d7iizp4g16qzpdim37kcg09pgsc3aghwaj"; depends=[cobs nnls]; }; simex = derive2 { name="simex"; version="1.8"; sha256="1849wayygyqv0fh1i2qva7ggh2yah2nn0sgbcy9pldxrjq8q9iw0"; depends=[]; }; simexaft = derive2 { name="simexaft"; version="1.0.7.1"; sha256="0n3n2g07pnpcqhbrjf78lbvqvc136g7jxlx6q27vnk96kwizh3f1"; depends=[mvtnorm survival]; }; - simfinR = derive2 { name="simfinR"; version="0.1.0"; sha256="0g86mci5fjdxj46i1lff51fdzbwzwr3f4vsq74s4mlwl6g093bqy"; depends=[dplyr jsonlite lubridate magrittr memoise purrr]; }; + simfinR = derive2 { name="simfinR"; version="0.2.1"; sha256="1png4cz92vnql2j2b5dlji8b6662ildj05lj1y1bw8xawv9i1i9b"; depends=[crayon dplyr jsonlite lubridate magrittr memoise purrr]; }; simglm = derive2 { name="simglm"; version="0.7.4"; sha256="0lgzbcfqqw94jib6vxl2cv8xcnjjikvdy8qlhq874g0h8spg0l5i"; depends=[broom dplyr future_apply Matrix purrr rlang]; }; - simmer = derive2 { name="simmer"; version="4.4.0"; sha256="0kq13ly33hgnwcd53mm372cqcd8glpgdb1jn4q22gd6pbk6j7cjg"; depends=[BH codetools magrittr Rcpp]; }; + simhelpers = derive2 { name="simhelpers"; version="0.1.0"; sha256="0imrp8zqdpyl466fywkjr4g3h9jzxfk96xrw8prlsvw1xlg6qrmm"; depends=[dplyr furrr future magrittr purrr Rdpack rlang rstudioapi tibble tidyr]; }; + simmer = derive2 { name="simmer"; version="4.4.1"; sha256="1w7mzs7z0pczfdwn4xn3rq5jvymbhhz6sv1rdhcq71m3qymicdi2"; depends=[BH codetools magrittr Rcpp]; }; simmer_bricks = derive2 { name="simmer.bricks"; version="0.2.1"; sha256="1s73mfmpjz91n932kjk50aai5j3p1sjibq73yxrjdhlyhiy4d8lp"; depends=[simmer]; }; simmer_plot = derive2 { name="simmer.plot"; version="0.1.15"; sha256="0g13d6qw6cl7bzmpkckiswvg9n4mrrdbs195r3pyljaw5c5bmvhp"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; }; simml = derive2 { name="simml"; version="0.1.0"; sha256="0j3vv3kp8rl4an6r0vzzn6syzi9h058v9040pshz0hldkhi21pby"; depends=[mgcv plyr]; }; simmr = derive2 { name="simmr"; version="0.4.1"; sha256="0903fh8vhl7r9cspanzkrn23kq68dkxhn01bjhyhf3c8wc9zfdy5"; depends=[bayesplot boot compositions ggplot2 MASS R2jags reshape2 viridis]; }; - simode = derive2 { name="simode"; version="1.1.8"; sha256="19l4xwbc7n53sgjbirpssppz5ps6alghxia4asv239fm2251r2jx"; depends=[deSolve pracma quadprog]; }; simone = derive2 { name="simone"; version="1.0-4"; sha256="09d8kdg2wxpmjgcn4dk6yqr6nmf7mzqqi6x1rz3fv7qknja6l1xi"; depends=[blockmodels]; }; simpleCache = derive2 { name="simpleCache"; version="0.4.1"; sha256="1prhahphyb4dg9qv813ahpwfngmr9blirb97pvypc5npzvahj5lv"; depends=[]; }; - simpleNeural = derive2 { name="simpleNeural"; version="0.1.1"; sha256="0rm6kvz1mppvgcvwsgg3nz6ci37l95ins64g0jh4rw6lfmy0grjc"; depends=[]; }; + simpleNeural = derive2 { name="simpleNeural"; version="0.1.3"; sha256="01q04807qws870x1qhvlr3bp0dawy8q4bh00psakhln9j9dl1ljm"; depends=[]; }; simplePHENOTYPES = derive2 { name="simplePHENOTYPES"; version="1.0.5"; sha256="02cr7yk379yilf53rv9s36g2gg1z5cq2qigy7lq31wcpb7vhjig3"; depends=[data_table gdsfmt lqmm mvtnorm SNPRelate]; }; simpleRCache = derive2 { name="simpleRCache"; version="0.3.2"; sha256="0ldmxa5rw1kcb24swnk8s471ww11jfbscynaahnnsi0zzqmhwirk"; depends=[digest]; }; simpleSetup = derive2 { name="simpleSetup"; version="0.1.0"; sha256="0rbzmixk76b3lgi9m7ijhcl6dha7wbbxfgwdhnp2y338zny6c6rm"; depends=[]; }; simpleboot = derive2 { name="simpleboot"; version="1.1-7"; sha256="0769dmrk8rw5v9598p7xlpawybwsdxnrqkxhavqpzy1vwg885575"; depends=[boot]; }; + simplecolors = derive2 { name="simplecolors"; version="0.1.0"; sha256="08xsha7v9k55fqi9f49j2sh2yz8dm5g99rqcjfd1yrlw2mkcrq6a"; depends=[colorspace dplyr forcats ggplot2 magrittr stringr]; }; simplegraph = derive2 { name="simplegraph"; version="1.0.0"; sha256="1gcpbljp1fgaprxnmq23izf1h2x3p5dnxlylwqsnlcj50bvm46gq"; depends=[]; }; + simplevis = derive2 { name="simplevis"; version="1.1.0"; sha256="1kwsxa2w74z92z4a7a82nkc62jna9y9z718kasvp91h5f40mz0zr"; depends=[dplyr DT forcats ggplot2 janitor leaflet leaflet_extras leafpop lubridate magrittr plotly readr rgdal rlang rmarkdown scales sf shiny shinycssloaders stars stringr tibble tidyr viridis]; }; + simplexdesign = derive2 { name="simplexdesign"; version="0.1.0"; sha256="139c1c2vpn2rf0q7ldciii3x18f5r62x0l7i6hdk25qwr9sp08k8"; depends=[DiceDesign GGally ggplot2 progress Rfast]; }; simplexreg = derive2 { name="simplexreg"; version="1.3"; sha256="1zkh00xbddhgz0qn0a5pj12n0hpx4f5kihpfj71x92pmxpzglcxh"; depends=[Formula plotrix]; }; - simputation = derive2 { name="simputation"; version="0.2.3"; sha256="1s34b3bm21z2b024cvjy013lzwppp48jn9isq1786d3176r1jk5p"; depends=[gower MASS rpart]; }; + simputation = derive2 { name="simputation"; version="0.2.4"; sha256="16adh97hfszvf934lf8mvwxvx71s7gwhzzhsbqz24zqik20pd6fq"; depends=[gower MASS rpart]; }; simr = derive2 { name="simr"; version="1.0.5"; sha256="1j5w93iliykfnpxl9kzh1rp6d3iy26ksj3j7yjl348yvplh0iyjl"; depends=[binom car iterators lme4 pbkrtest plotrix plyr RLRsim stringr]; }; simrel = derive2 { name="simrel"; version="2.0"; sha256="1wshbnmq9yqh01f9mjvfhhr3d76dshkxmqchxk11v4yx4apd8b4z"; depends=[FrF2 ggplot2 gridExtra jsonlite magrittr miniUI purrr reshape2 rlang rstudioapi scales sfsmisc shiny testthat tibble tidyr]; }; simsalapar = derive2 { name="simsalapar"; version="1.0-10"; sha256="1q7kh44xl7q48vpqbyrp85my6x97l4fqq36bry8vg3k5riihirzf"; depends=[colorspace gridBase sfsmisc]; }; - simsem = derive2 { name="simsem"; version="0.5-14"; sha256="1sg1zmngpviqpbsy8kxnw4f4x93gy3gh02ykmcw8j9falfnd7g6i"; depends=[lavaan]; }; + simsem = derive2 { name="simsem"; version="0.5-15"; sha256="183l6pysssxyhgw3s5gd0319snmvh439cy4xwfdjdwpavb8rrj06"; depends=[lavaan]; }; simsl = derive2 { name="simsl"; version="0.1.0"; sha256="09d6k61c2m0n03xpqvig7310bpgddxl8vzfjgn6wbr21s73b9xis"; depends=[mgcv]; }; simstandard = derive2 { name="simstandard"; version="0.3.0"; sha256="0fg5y6n5ydn6qxbd5sdbxh3aqj4i7qk7h9c28i3s5z4s9rxgycdj"; depends=[lavaan magrittr mvtnorm purrr rlang tibble]; }; - simstudy = derive2 { name="simstudy"; version="0.1.15"; sha256="14jynqvxfp8lc7vxa3lc5cfwmvxkg9ssrh78nq0x80rj7lwx8916"; depends=[data_table mvnfast mvtnorm Rcpp]; }; + simstudy = derive2 { name="simstudy"; version="0.1.16"; sha256="0ykwkkhnywqhpnsw4vggxcaqmg2zk8m521p00az7vyavwjgw9289"; depends=[data_table mvnfast mvtnorm Rcpp]; }; simsurv = derive2 { name="simsurv"; version="0.2.3"; sha256="0jlacjgrnnlmcl6k83clfkdfb1kr2xbyz2zcmq1f3xg2z0zwypjq"; depends=[]; }; simtimer = derive2 { name="simtimer"; version="4.0.0"; sha256="1c5017xmh4767d75k4rs1pssyn7p5w41bcsjjmwk4c9g6w1jgx1w"; depends=[]; }; simts = derive2 { name="simts"; version="0.1.1"; sha256="1b76grf7c14pgyhphplnil4lkzbwn3dih4pv4xdy721ih9n9llby"; depends=[broom dplyr magrittr purrr Rcpp RcppArmadillo robcor scales tidyr]; }; @@ -13577,58 +13757,56 @@ in with self; { sinib = derive2 { name="sinib"; version="1.0.0"; sha256="08x2a5hn41vcsai3r36w1kgzka4ks53pkp6dxn90bsqh40ydb0db"; depends=[]; }; siplab = derive2 { name="siplab"; version="1.4"; sha256="1kayskawq9dqwwmk17akl68xw9kwllkmh4i251gdqkfcz61j3bb4"; depends=[spatstat]; }; sirad = derive2 { name="sirad"; version="2.3-3"; sha256="0vhmk2fmq4797gj6c8803zw1ipmdxfvdfgi2bygzxbn5bqd4da2n"; depends=[raster zoo]; }; - sirt = derive2 { name="sirt"; version="3.7-40"; sha256="18adv3gnk1cg9i3jrv6mxfdn68gpdak8451jpwkagz7n9hr0x6dj"; depends=[CDM pbv Rcpp RcppArmadillo TAM]; }; + sirt = derive2 { name="sirt"; version="3.9-4"; sha256="1myj1dpmqzcyxhkyyvva3xwy1aq5d6l37zg9vhfnc3q4h1psc5hm"; depends=[CDM pbv Rcpp RcppArmadillo TAM]; }; sirus = derive2 { name="sirus"; version="0.2.1"; sha256="04ln1i017qb94gz22in9w36b808a0gxbdildwyfzchf2c92wp5cp"; depends=[ggplot2 glmnet Matrix Rcpp ROCR]; }; sisVIVE = derive2 { name="sisVIVE"; version="1.4"; sha256="1vh53irxgk8ahw52cdqbbm89dvmzyf54izg4lm8a3v92k5p6nzwz"; depends=[lars]; }; - sisal = derive2 { name="sisal"; version="0.46"; sha256="00szc3l69i0cksxmd0lyrs4p6plf05sl4vxs3nl4gkbja5y4lvpc"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; }; - sismonr = derive2 { name="sismonr"; version="2.0.0"; sha256="1irsnsmph8hpmglx7y7293z38yfa9vzq1823pcp393iiyip1n8d0"; depends=[dplyr ggplot2 ggpubr igraph jsonlite magrittr rlang scales stringr tictoc tidyr truncnorm XR XRJulia]; }; - sitar = derive2 { name="sitar"; version="1.1.1"; sha256="1klnfp54sq0jgsyaha6k4i5fv313icjmri5khfsdg1q1zzqxw1f8"; depends=[dplyr glue nlme purrr quantreg rlang rsample tibble tidyr]; }; + sisal = derive2 { name="sisal"; version="0.48"; sha256="1fh35ndra58dryw222ng7ys3gx1izyk5789k30lyd4n8wqy6sjjd"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; }; + sismonr = derive2 { name="sismonr"; version="2.1.0"; sha256="1v4vfz6zc4f70fay8r9vaxj62pcp8gqnh4aczbqpym9874330vi9"; depends=[dplyr ggplot2 ggpubr igraph jsonlite magrittr rlang scales stringr tictoc tidyr truncnorm XR XRJulia]; }; + sitar = derive2 { name="sitar"; version="1.1.2"; sha256="0njnsamb9mrds3rjlwwv6sn980jl744mdp0b9d36sqws7wgnxrfq"; depends=[dplyr glue nlme purrr rlang rsample tibble tidyr]; }; sitmo = derive2 { name="sitmo"; version="2.0.1"; sha256="0apdhwy3kxs39agsbvx5vn3xsgb22bf3jrwmr2cmqk9kmxbx740c"; depends=[Rcpp]; }; sitools = derive2 { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; }; sitree = derive2 { name="sitree"; version="0.1-7"; sha256="08yamivn2vxgrizh5gvvr9cn3cn1657r0p2nrkwbqljqrhmzi7qd"; depends=[data_table lattice latticeExtra]; }; sitreeE = derive2 { name="sitreeE"; version="0.0-5"; sha256="16m8w0rxb40pimzd06znqskz74jk4rrki4gjy8nk24r1zih2cjq1"; depends=[data_table sitree]; }; - sizeMat = derive2 { name="sizeMat"; version="1.1.0"; sha256="1pxb99gd0zfrpbq2ndmhciv2bc8xdfgm0q1y771f6ji5665qxgfw"; depends=[MASS matrixStats MCMCpack]; }; - sjPlot = derive2 { name="sjPlot"; version="2.8.2"; sha256="16721a5006q0gv45zjcwnkykxhjkzpq5n35vhik0g0ixgm3a2vci"; depends=[bayestestR dplyr effectsize forcats ggeffects ggplot2 insight knitr MASS parameters performance purrr rlang scales sjlabelled sjmisc sjstats tidyr]; }; + sizeMat = derive2 { name="sizeMat"; version="1.1.1"; sha256="1afkc5mcih4zva70fifx65wjm5ndi80hvlq23dvfrmhk4z94nnlx"; depends=[MASS matrixStats MCMCpack]; }; + sjPlot = derive2 { name="sjPlot"; version="2.8.3"; sha256="0ip1rkjlhyf3axlc8qqss1qq1f0xrda890c1jmcbhm98wwjw264f"; depends=[bayestestR dplyr effectsize ggeffects ggplot2 insight knitr MASS parameters performance purrr rlang scales sjlabelled sjmisc sjstats tidyr]; }; sjdbc = derive2 { name="sjdbc"; version="1.6.0"; sha256="17ncgj2s2pjn3w3c1dgxv8g7y17h4p78iic86gsj2ahn0xpsmkcc"; depends=[rJava]; }; - sjlabelled = derive2 { name="sjlabelled"; version="1.1.2"; sha256="1vnx067mxnvz4jzhmpiarda8ln6habzj02qikvkix5piiy85sqcw"; depends=[haven insight]; }; - sjmisc = derive2 { name="sjmisc"; version="2.8.3"; sha256="0w8l9grmp4q775jrf4q6rxx36ld5daz9b0gdxyyh42xfihk6m62h"; depends=[dplyr insight magrittr purrr rlang sjlabelled tidyselect]; }; - sjstats = derive2 { name="sjstats"; version="0.17.8"; sha256="0gagqbcmimlvxhpjkmd3s17mbrz5n937qksca1hvm6kj4rk37hzb"; depends=[bayestestR broom dplyr effectsize emmeans insight lme4 magrittr MASS modelr parameters performance purrr rlang sjlabelled sjmisc tidyr]; }; + sjlabelled = derive2 { name="sjlabelled"; version="1.1.3"; sha256="1amq7i9sxf0pkxhskqc53xq5wvc9rdxm7cxyb4b6xh6qsskjnlsj"; depends=[haven insight]; }; + sjmisc = derive2 { name="sjmisc"; version="2.8.4"; sha256="1ad7ca71w0v9ja4wb47aygczc987zz1lnjljhh2n497nzrpzzv64"; depends=[dplyr insight magrittr purrr rlang sjlabelled tidyselect]; }; + sjstats = derive2 { name="sjstats"; version="0.17.9"; sha256="0938ac6ixvkif07azd2msa8g3qnn9rabj6jg17almbysl83kg4nm"; depends=[bayestestR broom dplyr effectsize emmeans insight lme4 magrittr MASS modelr parameters performance purrr rlang sjlabelled sjmisc tidyr]; }; skda = derive2 { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; }; skedastic = derive2 { name="skedastic"; version="0.1.0"; sha256="19jfsir1z7lv7h3085by9b638jzqgc9753aya21x3rvzq7hb3pr3"; depends=[broom car gmp het_test lmtest lubridate magrittr matrixcalc pracma Rdpack Rmpfr tibble tseries]; }; - skeleSim = derive2 { name="skeleSim"; version="0.9.8"; sha256="1wxdl30cy8vr1cd0wcjxyklp6crw4bv8r77ma2dkzmxm2ma5jw92"; depends=[adegenet ape hierfstat igraph markdown pegas reshape2 rmetasim shiny shinyFiles strataG swfscMisc]; }; skeletor = derive2 { name="skeletor"; version="1.0.4"; sha256="1jfbfbkjx8mdwamsrkhvcnyn470in702vgcyw3g2dbgs84gl29q8"; depends=[]; }; skellam = derive2 { name="skellam"; version="0.2.0"; sha256="0r5wbs5h7xc3k2vjxd4axwnxr9cmwm008fcyj1vyixkg8fa680gx"; depends=[]; }; + skewlmm = derive2 { name="skewlmm"; version="0.1.0"; sha256="158nxycjg8bmx653nc57gdw02hf5szqbl2hgcb10yrmpssk15qbs"; depends=[dplyr ggplot2 moments mvtnorm nlme numDeriv purrr]; }; skewt = derive2 { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; }; - skimr = derive2 { name="skimr"; version="2.0.2"; sha256="1310fgmg1mzgy1xw6rbnr0v5habzi0v18383cpwkgir38ild9llk"; depends=[cli crayon dplyr knitr magrittr purrr repr rlang stringr tibble tidyr tidyselect]; }; - sklarsomega = derive2 { name="sklarsomega"; version="2.0"; sha256="05ar391bsaixv83dah3qzfi50avsjhn85niyq5n05sb8d5943z9h"; depends=[extraDistr hash LaplacesDemon Matrix mcmcse numDeriv spam]; }; + skimr = derive2 { name="skimr"; version="2.1.1"; sha256="0p2syjaz5f5p5d684j8kpv8hqhp9xcffjqqlblzgvj6n56h5h1sh"; depends=[cli crayon dplyr knitr magrittr purrr repr rlang stringr tibble tidyr tidyselect vctrs withr]; }; skm = derive2 { name="skm"; version="0.1.5.4"; sha256="06g3bdncq2r56d8k3dr87gqnibypbsps0gj4jxkw9q1sq1yaff3v"; depends=[data_table magrittr plyr Rcpp RcppArmadillo RcppParallel]; }; skmeans = derive2 { name="skmeans"; version="0.2-11"; sha256="1a8nwlym6pf0z13nnw1id2wls9lq788860yhjaqd56c3slzfsymn"; depends=[clue cluster slam]; }; - skpr = derive2 { name="skpr"; version="0.62.0"; sha256="07i6k3dzhwy7yblja3dpds0mihnzy9m9hip00p9n5plw65hywi2n"; depends=[car doParallel doRNG foreach future iterators kableExtra knitr lazyeval lme4 lmerTest magrittr nlme promises Rcpp RcppEigen rintrojs shiny shinyjs shinythemes survival viridis]; }; + skpr = derive2 { name="skpr"; version="0.64.2"; sha256="07fchgv0aqgw0hvcav08zzfzqg8nbw8ibbpd3bd11jx1fikx4vyr"; depends=[base64enc car crayon doParallel doRNG foreach future iterators kableExtra knitr lazyeval lme4 lmerTest magrittr nlme promises Rcpp RcppEigen rintrojs shiny shinyjs shinythemes survival viridis]; }; skynet = derive2 { name="skynet"; version="1.3.0"; sha256="02kkgrqcrg1x61fip47w6vzi8nya12rxg47qjhn4lw4czaympqpx"; depends=[data_table dplyr ggplot2 ggrepel httr igraph maps stringr]; }; - skyscapeR = derive2 { name="skyscapeR"; version="0.2.2"; sha256="08h3vvn9zglw3xrl0xpyj95r1n3v6lk835a4nbanxdvi21mgpi77"; depends=[astrolibR doParallel foreach MESS numDeriv oce plotrix png pracma RColorBrewer rootSolve]; }; slackr = derive2 { name="slackr"; version="1.4.2"; sha256="1vm2h5fzcss3xx1annx68wrvv6c0s6h2ci0bipxmdl9amdaqw85w"; depends=[dplyr ggplot2 httr jsonlite]; }; slam = derive2 { name="slam"; version="0.1-47"; sha256="12fggw2c7hz3bpvsaqm24g3r6lbpq6jgli24g7x5j859iak5cqv9"; depends=[]; }; sld = derive2 { name="sld"; version="0.3.2"; sha256="0za5pw7ki419ni9pqqzddb10d16nvv5rh5jrkl4f77j0ps2ajylp"; depends=[lmom]; }; sleekts = derive2 { name="sleekts"; version="1.0.2"; sha256="0syk244xrsv8hz5sxm7wizk0kyn1nc6z4c63c8xn57fz130zj75k"; depends=[]; }; sleepr = derive2 { name="sleepr"; version="0.3.0"; sha256="1ka4pl6a09d1qga5svcirc5ywmzz9pcml09053745lz3p1v8fnn3"; depends=[behavr data_table]; }; - sleepwalk = derive2 { name="sleepwalk"; version="0.2.1"; sha256="0ddjkqfh9jlafmbif1yr5gfnv1g8fq459rkmxf0v6p8w01a3d867"; depends=[cowplot ggplot2 httpuv jrc jsonlite scales]; }; - slfm = derive2 { name="slfm"; version="1.0.0"; sha256="1q4hm1lp498fqcnwr59agg08l1rh5gd8jqrjgkk4mh89zp3x5vaw"; depends=[coda lattice Rcpp RcppArmadillo]; }; - slga = derive2 { name="slga"; version="1.1.0"; sha256="09jrwwms9x9pqbpf9g2gm09nla31m5n1x23czhghj6ih0vp7804r"; depends=[httr raster sf xml2]; }; - slickR = derive2 { name="slickR"; version="0.4.4"; sha256="0b2d68kmjcrjv0ivp73abrfnvlfg178zx0xdbqb0ilb35ja92ai7"; depends=[base64enc htmltools htmlwidgets lifecycle magick xml2]; }; + sleepwalk = derive2 { name="sleepwalk"; version="0.3.0"; sha256="00w5c7a1nzy6v0irpskkqyldknq9vdq97r9im1h042zm6lnxxrr6"; depends=[cowplot ggplot2 httpuv jrc jsonlite scales]; }; + slfm = derive2 { name="slfm"; version="1.0.1"; sha256="0s7fdvr4fvsb4789f9ly2x820g4xvabl04wk7k6i8pd5ckj2xjhy"; depends=[coda lattice Rcpp RcppArmadillo]; }; + slga = derive2 { name="slga"; version="1.1.1"; sha256="0l8jfqmpc51fq4xil03lvgxxyqv08a5m4drfvrihfd6f1jkv6xkf"; depends=[httr raster sf xml2]; }; + slickR = derive2 { name="slickR"; version="0.4.9"; sha256="1smlzl0gq01vhv4qqwgikzdwg0z9k5mjf956sf64ps8py1b8d5ry"; depends=[base64enc htmltools htmlwidgets lifecycle xml2]; }; + slider = derive2 { name="slider"; version="0.1.2"; sha256="0h3hvqhdgpsp2n03dmrvqf5zpmpd1f16rscnsmbhpjhn1s09c2zq"; depends=[glue rlang vctrs warp]; }; slideview = derive2 { name="slideview"; version="0.1.0"; sha256="0zq5s6qdxn6ri88pp0wf2kg2k4byrrsfvwh0ai892p4szqbc3w4v"; depends=[htmltools htmlwidgets lattice raster viridisLite]; }; slim = derive2 { name="slim"; version="0.1.1"; sha256="0x9bk6w6lmw15s85gw9g8d1wlb57kkvnmx1wsyasn93x9llkjva1"; depends=[data_table MASS]; }; slimrec = derive2 { name="slimrec"; version="0.1.0"; sha256="1qzcvk7z8y11hwmybvppk1gf8di596zxy7qs22fclp6h6y18s377"; depends=[assertthat bigmemory glmnet Matrix pbapply]; }; slippymath = derive2 { name="slippymath"; version="0.3.1"; sha256="0dqnv089mcfxvpsc1px7mblim6m77n59xpcysz75jrvpc5q4lsrg"; depends=[png purrr raster]; }; slm = derive2 { name="slm"; version="1.1.0"; sha256="1y9pw9lgxp2xz6smbhg0rayjszm83kxf2an9rk9pdhlmx6670bbf"; depends=[capushe expm ltsa sandwich]; }; sloop = derive2 { name="sloop"; version="1.0.1"; sha256="00fk5fr5zsk2qxc1kfhmshhjxgnamm3401089sx8m2l529zd6r8j"; depends=[codetools crayon purrr rlang tibble]; }; - slouch = derive2 { name="slouch"; version="2.1.2"; sha256="0xf2saf4q0ywmng3avl6hjd2wjjzfpbwlnagggvs8ri41jyk7gma"; depends=[ape memoise]; }; + slouch = derive2 { name="slouch"; version="2.1.4"; sha256="09ffx657hs913prv0rifhsz60h39lk0h4z28myx6yzxcfdk4f48d"; depends=[ape crayon memoise]; }; slowraker = derive2 { name="slowraker"; version="0.1.1"; sha256="0glc3ldvbqkvzfvhs4s5mzx1kfz05px4k7rx5jfp9dm9d0gfpvsx"; depends=[NLP openNLP SnowballC]; }; slp = derive2 { name="slp"; version="1.0-5"; sha256="0i9iv0s1wdp9cyzr8qixh6c7qvrj025vll13gyf8dfbidrp6hryl"; depends=[mgcv]; }; - slurmR = derive2 { name="slurmR"; version="0.3-0"; sha256="0301h8fzkghk41afkfprkbf3nia07apgjly0njan07vhk144k0qr"; depends=[]; }; + slurmR = derive2 { name="slurmR"; version="0.4-1"; sha256="00ihaq2f86spl4ra41lyszrgn52vgpfw0bv0px23gc6qngxzxd6y"; depends=[]; }; sm = derive2 { name="sm"; version="2.2-5.6"; sha256="0c4whcx879gb4lwvqnzxl5n9xgpcqh2c54ip9ami3mwfprzcv45q"; depends=[]; }; smaa = derive2 { name="smaa"; version="0.3-0"; sha256="0y7j4q147fdk7fffyinc803mfzzsmcdfx8bp695w3wkq1wwy9kyl"; depends=[]; }; - smac = derive2 { name="smac"; version="1.0"; sha256="1inn7i5k0q5vln24kazh3gl3szf6lxwnjr2rw70jcyn9dr9iy952"; depends=[]; }; - smacof = derive2 { name="smacof"; version="2.0-0"; sha256="06gx24arv1md32vsj17lbq42vxpvds7qxwap4x12hj5nyxv4n7yy"; depends=[candisc colorspace doParallel ellipse foreach Hmisc MASS nnls plotrix polynom weights wordcloud]; }; + smacof = derive2 { name="smacof"; version="2.1-0"; sha256="0bylwa9dwr0q8saifh4fag0srs84g6chvfmslhs8vx42alkq94pz"; depends=[candisc colorspace doParallel e1071 ellipse foreach Hmisc MASS nnls plotrix polynom weights wordcloud]; }; smacpod = derive2 { name="smacpod"; version="2.0.4"; sha256="0dh8n3rxrffr09a8q7vdlin9hq5f2v0hjjjqsmzgwf7ln1b9wcr1"; depends=[abind pbapply plotrix sp spatstat]; }; smallarea = derive2 { name="smallarea"; version="0.1"; sha256="0jcv0xbh8v4g6zxxs4yyd0divwzk9d2w7g01r4s65khxvy3av7yx"; depends=[MASS]; }; smam = derive2 { name="smam"; version="0.5.3"; sha256="0hns3w6sm06fwxy3aybaz21j8bii5m5ps932ldilh0dj7rsqii6a"; depends=[doParallel doSNOW EnvStats foreach Matrix nloptr numDeriv Rcpp RcppGSL RcppParallel]; }; @@ -13638,11 +13816,10 @@ in with self; { smartsizer = derive2 { name="smartsizer"; version="1.0.2"; sha256="1w2vf6q3f7bywkvazgxn9gh7f2bqy4rg74mm4r6izw4gx7r81ls6"; depends=[MASS]; }; smatr = derive2 { name="smatr"; version="3.4-8"; sha256="0qqqbg65flxh48sw7x90zvgzbpcfzb1811h0pz3zlhdw9a7khs9n"; depends=[]; }; smbinning = derive2 { name="smbinning"; version="0.9"; sha256="1sr0nsqqzxdf402g9qx1ycigbh330idl9n2cyli4x4zxj1nqm3yv"; depends=[Formula gsubfn partykit sqldf]; }; - smcfcs = derive2 { name="smcfcs"; version="1.4.0"; sha256="0dlk2i2g8scbqy573drpf5252g0aa2i1v63172jswjmy5hl28byf"; depends=[MASS survival VGAM]; }; + smcfcs = derive2 { name="smcfcs"; version="1.4.1"; sha256="0q5kg0yrmbw80097j66mp08pmqrw1s0wf8g377379s62p1f6sjwv"; depends=[MASS survival VGAM]; }; smco = derive2 { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh5xl4vw08hsa8kfcxhh2r0s99"; depends=[]; }; smcure = derive2 { name="smcure"; version="2.0"; sha256="1j7fxnb0sx57a0l929c3haz4f1y829ymlq0cvdh0cia4qp6ydv60"; depends=[survival]; }; smdata = derive2 { name="smdata"; version="1.2"; sha256="1p26b46kg4hmhs2fl9h9vchar00llqv58ylx438bjgzz4f229qvr"; depends=[]; }; - smdc = derive2 { name="smdc"; version="0.0.2"; sha256="1j6xnzjbmmakbmk3lyjck3bsy8w8hyd9d8h04s4gbddhci283mqm"; depends=[proxy tm]; }; smds = derive2 { name="smds"; version="1.0"; sha256="0aqf3wfn6mlsl8a32gaf9qdpyxwsx19g6mma8qzgaysdmk6vhbpd"; depends=[MASS]; }; smerc = derive2 { name="smerc"; version="1.1"; sha256="0kbjb1335wcljwj2nyxipxndzrsrrrims90zbplpdlz3h6afshii"; depends=[maps matrixStats pbapply randtoolbox smacpod sp]; }; smfsb = derive2 { name="smfsb"; version="1.3"; sha256="1328w7zpwd3nam6ha4bh14g919jjl87v323ijmbp1j71gc64nn2i"; depends=[abind]; }; @@ -13651,12 +13828,13 @@ in with self; { smnet = derive2 { name="smnet"; version="2.1.1"; sha256="0fa47zgm7jxvs3jfai54wsc6qa9ycqw4f3yr941fvkczwzh4ch02"; depends=[DBI RSQLite spam SSN]; }; smog = derive2 { name="smog"; version="2.0"; sha256="1nrvh51kvh290w9wdyil5isx5xfz2yw8nmhm6f32hajipgn9j5fl"; depends=[doParallel foreach Rcpp RcppArmadillo Rdpack tidyr]; }; smoke = derive2 { name="smoke"; version="2.0.0"; sha256="1jdl5swg66vqryd40rrqpsnkczmsiaf5x6vlfv774vbnrc6q2v2g"; depends=[Rdpack]; }; - smoof = derive2 { name="smoof"; version="1.6.0"; sha256="0xkwj01pgzvxr6cxxmml0f4375s2s8kni69immcpw66avs2ljw5m"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo RJSONIO]; }; - smooth = derive2 { name="smooth"; version="2.5.4"; sha256="0apjjqzb36z71500lyccm9jdss7h7736g8lrs3rfz5f6d2k5yqf6"; depends=[forecast greybox nloptr Rcpp RcppArmadillo zoo]; }; + smoof = derive2 { name="smoof"; version="1.6.0.2"; sha256="14zwrsyhbrwggwiaq8vxps8cgkp6glb14b2cp2ph1ppa0abvlbfq"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo RJSONIO]; }; + smooth = derive2 { name="smooth"; version="2.5.6"; sha256="0wnb6d1h0l4frri6k5hpshb1bqqq7x2hqz591qbzj47h1fxrnpwq"; depends=[forecast greybox nloptr Rcpp RcppArmadillo zoo]; }; smoothAPC = derive2 { name="smoothAPC"; version="0.3"; sha256="11f34qqdm8m0hmy9jf29q439slchvmqgdfrmak7vcdhfnjcylr5r"; depends=[colorspace lmtest quantreg rgl SparseM]; }; smoothHR = derive2 { name="smoothHR"; version="1.0.2"; sha256="0l33xg3p9pyfrp4rhavz8m1jakk4wr8i14g6jjiizb03rpxdpzqy"; depends=[survival]; }; smoothROCtime = derive2 { name="smoothROCtime"; version="0.1.0"; sha256="03iihjxb5xdaf74cm9cajqqjli754mdmv5v1y4hla9vv23017ca1"; depends=[ks]; }; - smoothSurv = derive2 { name="smoothSurv"; version="2.0.1"; sha256="0srb6ms1ag3mllkf2rh0pnji9zp8c11mh8i5zgb6zh1nx2s86x93"; depends=[survival]; }; + smoothSurv = derive2 { name="smoothSurv"; version="2.1"; sha256="1y6mjkvy6fi2j2gy7n8lslpxj2mqzs2wsi10cvlmgkx33mvhvkff"; depends=[survival]; }; + smoothedLasso = derive2 { name="smoothedLasso"; version="1.0"; sha256="1lhwhglhcsj3ilsa5vyizfw82sngg1yngrbh0xicfq72wqmmkwfa"; depends=[Rdpack]; }; smoother = derive2 { name="smoother"; version="1.1"; sha256="0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci"; depends=[TTR]; }; smoothie = derive2 { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; }; smoothmest = derive2 { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; }; @@ -13668,19 +13846,19 @@ in with self; { smpic = derive2 { name="smpic"; version="0.1.0"; sha256="0ff2146gjcrc6nvrbf4779jh076abhb843zzlk2zvqir13qfap61"; depends=[ggplot2 imager stringr]; }; sms = derive2 { name="sms"; version="2.3.1"; sha256="0vr5jy8bxbczaqr9kg0fnanxhv9nj51yzgacrb63k33cs85p981m"; depends=[doParallel foreach iterators]; }; smss = derive2 { name="smss"; version="1.0-2"; sha256="04lgfdcvnzpnpplyl62fy7slyiy8wkqpjjrzmclgqis3c9zkkncp"; depends=[]; }; - smurf = derive2 { name="smurf"; version="1.0.2"; sha256="08k64y0wb9da7ji94zra411zwcvssi0lb1drh98p6w9pwvn552rf"; depends=[catdata glmnet MASS Matrix mgcv RColorBrewer Rcpp RcppArmadillo speedglm]; }; - sn = derive2 { name="sn"; version="1.5-4"; sha256="0x46gxkplxbnhaqbpiav1r4xlv4ib7n57kxmca7scqwj22y7wrs6"; depends=[mnormt numDeriv]; }; + smurf = derive2 { name="smurf"; version="1.0.5"; sha256="1ay19ggrhm7jzazcky9r9g0qq3p8jhqr209iqsc22qqwzx6bl1l6"; depends=[catdata glmnet MASS Matrix mgcv RColorBrewer Rcpp RcppArmadillo speedglm]; }; + sn = derive2 { name="sn"; version="1.6-1"; sha256="0snri2k8qslb7478c5jz4a5xxmmb1ipmp8x1jizi8mhj2cjic1w0"; depends=[mnormt numDeriv quantreg]; }; sna = derive2 { name="sna"; version="2.5"; sha256="1j3i6300m686qqfmyvadim377cd3mplzgj6mandygw8brg50id8k"; depends=[network statnet_common]; }; - snahelper = derive2 { name="snahelper"; version="1.0.0"; sha256="15x7qp36lzs61ll3gqyjmxix0pqnyf2rz799mxzkzxzwqsp0srwi"; depends=[colourpicker formatR ggplot2 ggraph graphlayouts igraph miniUI rstudioapi shiny]; }; + snahelper = derive2 { name="snahelper"; version="1.1.0"; sha256="0fc1xilbc7dr5gsrhlp8zgbjppxi44lifsj79kh79783w8nyfqm1"; depends=[colourpicker DT formatR ggplot2 ggraph graphlayouts igraph miniUI rstudioapi shiny]; }; snakecase = derive2 { name="snakecase"; version="0.11.0"; sha256="1ky1x2cp5rd0ffd9m1fji9sq4z4jsrpxzg30brw8bb4ihfjj114r"; depends=[stringi stringr]; }; snappier = derive2 { name="snappier"; version="0.1.0"; sha256="0334zwhqdl3lfw7rg8ql7z10qj8jjrm17yi9mgdcxnzaf3f1p859"; depends=[]; }; snapshot = derive2 { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; }; + snem = derive2 { name="snem"; version="0.1.1"; sha256="1r8l7cs1y82fh7bdfl18ilw4fria1cabghqddnfr34vfp85cndk9"; depends=[mvtnorm]; }; snfa = derive2 { name="snfa"; version="0.0.1"; sha256="01k2nw8b8mwsd07jijfqk3rj88l9m36c5jai7qma56fjxx23s3wb"; depends=[abind ggplot2 prodlim quadprog Rdpack rootSolve]; }; snht = derive2 { name="snht"; version="1.0.5"; sha256="0k8w1118b2qrf5zfi902gm6zf7b1mwv7py7wg57vsibh2r2ra8ah"; depends=[ggplot2 gridExtra mgcv plyr reshape2 zoo]; }; snipEM = derive2 { name="snipEM"; version="1.0.1"; sha256="1ls3c9f47lgrnja8p34iz2md2mf5jva9rn5n1h3a43zs29g019v8"; depends=[MASS mvtnorm Rcpp RcppArmadillo]; }; snn = derive2 { name="snn"; version="1.1"; sha256="0yywn3v1iz9xizwli3gmzprkx66b5a813mbp8hq2vsj8n4lfj8r5"; depends=[]; }; snnR = derive2 { name="snnR"; version="1.0"; sha256="0qrl5ivpmipibszx8k9fvd8g462zzdcmzbjj1hb8apv4z79gzima"; depends=[]; }; - snotelr = derive2 { name="snotelr"; version="1.0.1"; sha256="04kazyq5hhiznh0g1qd5l6yh82kjkvd1n4hslisdwas2v3wr2h82"; depends=[httr magrittr memoise RSelenium rvest shiny wdman xml2]; }; snow = derive2 { name="snow"; version="0.4-3"; sha256="1n3n8pva9s34fvlw32yng0x416lmbv7q1fsd0ywa4kikmxym64l5"; depends=[]; }; snowFT = derive2 { name="snowFT"; version="1.6-0"; sha256="00rq2xibzhx7441v9jg138a4fkmx28hifs4yyj3pwi8najf0df4n"; depends=[rlecuyer snow]; }; snowboot = derive2 { name="snowboot"; version="1.0.1"; sha256="0mkmmycfkl100fnmj2hs246bra4fvdr2sas1axw8z1w0ajdab1vy"; depends=[igraph Rcpp Rdpack VGAM]; }; @@ -13699,14 +13877,15 @@ in with self; { socceR = derive2 { name="socceR"; version="0.1.1"; sha256="1vd0r3vixavg1br2q3kfn3nvl7dw854vkcfwcvyw411k84ivb13y"; depends=[Rcpp]; }; social = derive2 { name="social"; version="1.0"; sha256="0ny81bhj80rlwwa6cgbkdz2rxz6bp0f3nvjr1sqxr4s8l8rnf4ic"; depends=[Rcpp]; }; socialmixr = derive2 { name="socialmixr"; version="0.1.6"; sha256="0hrkylasyaalsh4gsazgfz5vyqvwnq5n4lzqmzjs2njlrkgwwf5y"; depends=[countrycode curl data_table httr jsonlite lubridate oai stringr wpp2015 XML]; }; - sociome = derive2 { name="sociome"; version="1.3.0"; sha256="0anynmpb6i8hwp5b0axkmfwsdyfzwd28g26ril2i3mlcivkgjyg4"; depends=[censusapi dplyr magrittr mice psych purrr rlang stringr tidycensus tidyr]; }; - socviz = derive2 { name="socviz"; version="1.0.0"; sha256="14713g5saa167c5wk06i9v5708cj60znc8a7c3a2wpk0h2idfjlb"; depends=[dplyr fs magrittr rlang tibble]; }; + sociome = derive2 { name="sociome"; version="1.4.0"; sha256="0700xpslbi5f3b32pfqmxrwzymhxmpzl8jzxhvgpbm885f07n41j"; depends=[censusapi dplyr magrittr mice psych purrr rlang stringr tidycensus tidyr]; }; + socviz = derive2 { name="socviz"; version="1.1"; sha256="19naaiqxbqh8vmjx2ijd012lbxam3750zni491vp6aidwaqjznfw"; depends=[dplyr fs magrittr rlang tibble]; }; sodavis = derive2 { name="sodavis"; version="1.2"; sha256="1jf5sml51qxlpgv5b1rvyig4dm4ijw2hpnk85zf790jp22xm64jw"; depends=[MASS mvtnorm nnet]; }; sodium = derive2 { name="sodium"; version="1.1"; sha256="1zxzi8xvxnhgcd5qrylf08nz1cdq3aslrswjas440qg63ypmbf6w"; depends=[]; }; sofa = derive2 { name="sofa"; version="0.3.0"; sha256="10f01a23bq6a30f95cilfan588dg0bg36y7g14q46rmcz15cqbrx"; depends=[crul jsonlite mime R6]; }; softImpute = derive2 { name="softImpute"; version="1.4"; sha256="07cxbzkl08q58m1455i139952rmryjlic4s2f2hscl5zxxmfdxcq"; depends=[Matrix]; }; softclassval = derive2 { name="softclassval"; version="1.0-20160527"; sha256="1f5qj5sajy3dg0mgss6f9w6v5a2prcypld9jcv457bd4n4a409kr"; depends=[arrayhelpers svUnit]; }; softmaxreg = derive2 { name="softmaxreg"; version="1.2"; sha256="0y1r4n83sv2744lpli65aip0c0cq823asb8gw9yy9yjjc9sbyr9s"; depends=[]; }; + soilDB = derive2 { name="soilDB"; version="2.5"; sha256="10jb49yiqvvcvl84r7xys5gyr710ypvai7fn5sp6nvcm1bqgrwkq"; depends=[aqp curl lattice plyr raster reshape2 sp xml2]; }; soilassessment = derive2 { name="soilassessment"; version="0.1.1"; sha256="0vxw0wzc2fw1asasnkfc7mzz616l243dh27vn2fqm8sw7d3509ji"; depends=[arm caret Cubist e1071 FuzzyAHP Hmisc kernlab maptools nnet randomForest raster rgdal rpart soiltexture sp]; }; soilcarbon = derive2 { name="soilcarbon"; version="1.2.0"; sha256="1gxq7np5xh3jcqbsf8xva4b82rv6rab2j23mbkc4pjs6nbnzvzba"; depends=[devtools ggplot2 openxlsx shiny]; }; soilphysics = derive2 { name="soilphysics"; version="3.1"; sha256="11c094bqbwhggh0n3hdva1321gqzz2k1b7v3767wyyk1xpgzg98r"; depends=[boot MASS rpanel tkrplot]; }; @@ -13715,7 +13894,6 @@ in with self; { sokoban = derive2 { name="sokoban"; version="0.1.0"; sha256="07r2zv9rynvw06fpncrz3rsmkdy6z2pcvmm559bhs428kmnq2xib"; depends=[]; }; solaR = derive2 { name="solaR"; version="0.45"; sha256="1vxpwaizjxy27r54anhf48pf97lm4ck750m0p4kmh716irmhp319"; depends=[lattice latticeExtra RColorBrewer zoo]; }; solarPos = derive2 { name="solarPos"; version="1.0"; sha256="0004da7vqpq14q5lhs8vyvjl99j8gzxd5wrlw5d1vwfns3ica0q5"; depends=[]; }; - solarius = derive2 { name="solarius"; version="0.3.0.2"; sha256="17c765nxq81xshyyl4lfhqjmgvmhn9xyzc6x4qd33wvhh4148f38"; depends=[data_table ggplot2 plyr]; }; solartime = derive2 { name="solartime"; version="0.0.1"; sha256="0q6la6d281zgf1kxhrdvi3b91na60szknq0fvldvlnszlqb5vkgs"; depends=[lubridate]; }; solitude = derive2 { name="solitude"; version="0.2.1"; sha256="0n4f59bjdcqfclagpjric965zsl1jfl8p194p64viainb9w11xz4"; depends=[data_table future_apply igraph R6 ranger]; }; solrad = derive2 { name="solrad"; version="1.0.0"; sha256="13ybllvmig1yqsy4md4kazs83hxb9lrlwy64yw1wwr1w6sxpbnp6"; depends=[]; }; @@ -13727,70 +13905,67 @@ in with self; { someKfwer = derive2 { name="someKfwer"; version="1.2"; sha256="0widny5l04ja91fy16x4giwrabwqhx0fs3yl48pv9xh4zj6sx563"; depends=[]; }; someMTP = derive2 { name="someMTP"; version="1.4.1"; sha256="19bsn8rny1vv9343bvk8xzhh82sskl0zg0f5r59g9k812q5llchn"; depends=[]; }; somebm = derive2 { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4chc4wg0iy4v2f99cs4jasrsimb4p8"; depends=[]; }; - sommer = derive2 { name="sommer"; version="4.0.8"; sha256="0czizds24y2dj2w3611kydcs40lcg71pa9v2v7j4z73vks2p17mc"; depends=[crayon lattice MASS Matrix Rcpp RcppArmadillo]; }; + sommer = derive2 { name="sommer"; version="4.0.9"; sha256="0nrfra6n2rmgh1kxvsyxxxdy4fy6b2092lfmy5551l3l3hq5q3a2"; depends=[crayon lattice MASS Matrix Rcpp RcppArmadillo]; }; somplot = derive2 { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; }; - somspace = derive2 { name="somspace"; version="1.0.0"; sha256="1cp7mprapidzfphis697r3jipm1ig5198580mmdygvbajxcjib75"; depends=[data_table ggplot2 kohonen maps]; }; sonar = derive2 { name="sonar"; version="1.0.2"; sha256="1f0f5iqi3y9vnxyym14nm8dqxw0vcpnxmvvkx4sm612i4fclg1f9"; depends=[]; }; sonicLength = derive2 { name="sonicLength"; version="1.4.6"; sha256="0jh9zk908afqxacccsph6477cc8sbcc1vxbv7jz8ppgc20imw932"; depends=[]; }; sonicscrewdriver = derive2 { name="sonicscrewdriver"; version="0.0.1"; sha256="03v53blb8f67ybhqys4n0zxf7pk9g024ncq0g9rnj9qpr740zclb"; depends=[ggplot2 seewave tuneR]; }; sonify = derive2 { name="sonify"; version="0.0-1"; sha256="1wkqqgf8fhhaz1dmri2zzr8cdwmx3cgrxbprrz3yily5r1m17d15"; depends=[tuneR]; }; + soobench = derive2 { name="soobench"; version="1.9.18"; sha256="06wzlxdw0l6jc1zqsgkn120ibprfalwqd38xh7dpi30vdqiqskcc"; depends=[]; }; soptdmaeA = derive2 { name="soptdmaeA"; version="1.0.0"; sha256="03n1y82myq0rz14awjnx9nx1dz3dxqq58m13cw7a7ncap7fmw9r5"; depends=[igraph MASS Matrix]; }; soql = derive2 { name="soql"; version="0.1.1"; sha256="12wvbxy9xx140b7mga4ma7hkg4q6kv549gkq15fnf4dn8q43x8nf"; depends=[]; }; + sorocs = derive2 { name="sorocs"; version="0.1.0"; sha256="0gy23rldhnlz6jmf9rdzl4mmfkn5gjcavq2jfcz6dgjafl3v9vgl"; depends=[MASS MCMCpack mvtnorm]; }; sortable = derive2 { name="sortable"; version="0.4.2"; sha256="08v78r0vibr0lk09lxm0s0vfkzpp03asqnqpl8jqa6rxcb484fri"; depends=[assertthat ellipsis htmltools htmlwidgets jsonlite learnr shiny]; }; sorvi = derive2 { name="sorvi"; version="0.7.26"; sha256="19lfrc4bdiljs437w3a2bpf7abnkv0934dh929bbj2w1w8rzghjn"; depends=[dplyr ggplot2 RColorBrewer reshape2]; }; sos = derive2 { name="sos"; version="2.0-0"; sha256="0fwv76m0iihzy60kglsdjnlp6800qsll6h0v2435a50lcr53jj8g"; depends=[brew]; }; sotkanet = derive2 { name="sotkanet"; version="0.9.48"; sha256="1jw9agj92zzgad5kk9z6smjacimwinci6aaqlzmshivb8g8rv8zp"; depends=[RCurl rjson]; }; sotu = derive2 { name="sotu"; version="1.0.2"; sha256="0aqwkawaydsm91hz13msjg1a5llg7xmv6hxmfmsaganrl7iaym3c"; depends=[]; }; sound = derive2 { name="sound"; version="1.4.5"; sha256="1kbbb614d0fmj9l0yjiwf5yqnl7sby4xklp7qwp6rwjvq9bnm0ab"; depends=[]; }; - soundcorrs = derive2 { name="soundcorrs"; version="0.1.0"; sha256="1q02ll4yw7dlz3cmxb7i1svhpjmhxqglsswv1drlkzm8i3gfp9dk"; depends=[]; }; + soundcorrs = derive2 { name="soundcorrs"; version="0.1.1"; sha256="06d57ici4538mfw804vnqaf59n2zglqlxhdlmn9694v9q1xw24p6"; depends=[]; }; soundecology = derive2 { name="soundecology"; version="1.3.3"; sha256="16h6gbdlyav7wbfisdv1f2zsqhr45liidgj7qqk8giwjxgan8q97"; depends=[ineq oce pracma seewave tuneR vegan]; }; - soundgen = derive2 { name="soundgen"; version="1.6.1"; sha256="1mbxgl7mf4gyr13xf8i5hachlmv1l3khyjwzawb3rm5wl5k7pr81"; depends=[dtw mvtnorm phonTools reshape2 seewave shiny shinyBS shinyjs tuneR zoo]; }; + soundgen = derive2 { name="soundgen"; version="1.6.2"; sha256="093i8v2i3np1gny0dsnw3i20n5x67w312sslgabgmibak66cdb37"; depends=[dtw mvtnorm phonTools reshape2 seewave shiny shinyBS shinyjs tuneR zoo]; }; source_gist = derive2 { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; }; - sourceR = derive2 { name="sourceR"; version="1.0.1"; sha256="01qxa44s9szaxl0rdcx4p0wn4vby17hdzdjzpsbls3prsnr0jaad"; depends=[assertthat cluster dplyr gplots gtools hashmap R6 reshape2 SPIn tensorA]; }; sourcetools = derive2 { name="sourcetools"; version="0.1.7"; sha256="1jnjir0q2dj724f1mjm6p5h77yzyx6xcqy9r2g7gmcxkxw349627"; depends=[]; }; - sp = derive2 { name="sp"; version="1.3-2"; sha256="0kpjsqh3lzqp1m0avsvm54lazlgwfx3hyf0av3mvbyslsanj42ll"; depends=[lattice]; }; + sp = derive2 { name="sp"; version="1.4-1"; sha256="0fbh865r4py89g6ln8bslig2vbxxwa642p5k5g02rskyhajg35lg"; depends=[lattice]; }; sp23design = derive2 { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; }; - spANOVA = derive2 { name="spANOVA"; version="0.99.1"; sha256="0dsi1cj0i5gm3b1wlrb2r5nbw1zmnqiwvgz41s0wmm7wwjsbva3x"; depends=[ape car DT geoR gtools knitr MASS Matrix multcomp multcompView mvtnorm rmarkdown ScottKnott shiny shinyBS shinycssloaders shinythemes spatialreg spdep xtable]; }; + spANOVA = derive2 { name="spANOVA"; version="0.99.2"; sha256="0dlx9wwccq67g4yni3gbrv43f5pgm3mg715q2v8f09r1akhfg5by"; depends=[ape car DT geoR gtools knitr MASS Matrix multcomp multcompView mvtnorm rmarkdown ScottKnott shiny shinyBS shinycssloaders shinythemes spatialreg spdep xtable]; }; spAddins = derive2 { name="spAddins"; version="0.2.0"; sha256="19wbcghcf0f9qvqy92jhsdcpmd9b4lkhxndvr71cyhzga539lh1n"; depends=[magrittr purrr rstudioapi stringr]; }; spBFA = derive2 { name="spBFA"; version="1.0"; sha256="0w50zzizh8ki0ngwjaj92g0lcj79ssllv75a1b4i37hiy4qh4z1m"; depends=[msm mvtnorm pgdraw Rcpp RcppArmadillo]; }; - spBayes = derive2 { name="spBayes"; version="0.4-2"; sha256="0qmh8sdawhssr1jmx9dc56mxxwsgya8spsss88jgg0npvmpl5khb"; depends=[abind coda Formula magic Matrix]; }; - spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.3"; sha256="0syb4x05j878jhcql8prfw1aqxmpi1idxk1d4xl52j32wngkpn8b"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; }; + spBayes = derive2 { name="spBayes"; version="0.4-3"; sha256="0hllm70dly1niigp9r5645as97phlkba46dp9brcr34080m6w1w9"; depends=[coda Formula magic Matrix sp]; }; + spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.4"; sha256="0mf5ql9a45dkq0dw1l0h03gcnhm6if10faj72jrhgrlcrgzzdfyn"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; }; spCP = derive2 { name="spCP"; version="1.2"; sha256="0y00k96p96jgp84wbdhqfwsq2fg8c68gc5310rnzpiv3clws27fb"; depends=[msm mvtnorm Rcpp RcppArmadillo]; }; - spData = derive2 { name="spData"; version="0.3.2"; sha256="190msrrpn226x27pcnck4ac34f9k4xcn26cyz2apdri2nzkr6zbw"; depends=[]; }; + spData = derive2 { name="spData"; version="0.3.5"; sha256="09l9j1vjbfyc8mikb8kliqmdjkg4xigq3zhdx98mv51flh5q87lh"; depends=[raster sp]; }; spFSR = derive2 { name="spFSR"; version="1.0.0"; sha256="0094plnjlyhnnjqw3i4an5q95bw6hjy1gzc7zr6wy77faivqsbms"; depends=[class ggplot2 mlbench mlr parallelMap tictoc]; }; - spGARCH = derive2 { name="spGARCH"; version="0.2.0"; sha256="03jn5v5szq2nfihwvv3v966bv48wng2bahyaxlkvik2firdl8j9y"; depends=[Matrix nleqslv Rcpp RcppEigen Rsolnp spdep truncnorm]; }; + spGARCH = derive2 { name="spGARCH"; version="0.2.1"; sha256="0bncjav7ph178phrcpx05lrb0c5fhn0xbhs9bbmrw856ngx4j0s2"; depends=[Matrix nleqslv Rcpp RcppEigen Rsolnp spdep truncnorm]; }; spMC = derive2 { name="spMC"; version="0.3.10"; sha256="0p0s6w7sif02b91b73a0zb2i4i95a8m86dkqmgx6w1jk9h2mgqaz"; depends=[]; }; spMaps = derive2 { name="spMaps"; version="0.4.0"; sha256="0n9693aam7gsclfhijq7cy61l0w4mm5vf3rjaz5w0jrz77lrkprh"; depends=[raster rgeos sp]; }; - spNNGP = derive2 { name="spNNGP"; version="0.1.2"; sha256="0zr2lfvrjlpi6j3xswi974spvhmkbf1ddfb6d8f2zddkfhppfg00"; depends=[coda Formula RANN]; }; + spNNGP = derive2 { name="spNNGP"; version="0.1.4"; sha256="14mz5cgxm9ka7q7f7qs80hqrgbk2mjphyc28ih73lkhcknl2v1lp"; depends=[coda Formula RANN]; }; spTDyn = derive2 { name="spTDyn"; version="2.0"; sha256="0wandd5iqyqb474096lky04rrgj31gnyqnlmgw8ypxsypd0gqdy0"; depends=[coda sp spacetime spTimer]; }; spThin = derive2 { name="spThin"; version="0.2.0"; sha256="0j10j1cbbwp3baqm3b59rxlnd643mkx1mirlxpnr1ad2g7xpm69f"; depends=[fields knitr spam]; }; spTimer = derive2 { name="spTimer"; version="3.3"; sha256="0vzqig9dq4k6p5s2gbm5arqiih28ghzjx0fs7ml70vx2f181jrxi"; depends=[coda extraDistr sp spacetime]; }; - spaMM = derive2 { name="spaMM"; version="3.0.0"; sha256="1rwgwh4lvpgbplbzrxi08cdmay9q44dv0szcdfnz74wdsgmpxjjs"; depends=[MASS Matrix nlme nloptr pbapply proxy Rcpp RcppEigen]; }; + spaMM = derive2 { name="spaMM"; version="3.2.0"; sha256="1699zx097i20asf0yy7p7w45fbh4fqg8wj0ym8xz6fa85kalmma0"; depends=[crayon gmp MASS Matrix minqa nlme nloptr pbapply proxy Rcpp RcppEigen ROI ROI_plugin_glpk]; }; spaa = derive2 { name="spaa"; version="0.2.2"; sha256="163iipz1knxx1lzby9a3n1f014yqkf25z1wpwwy4gbx7sia499d5"; depends=[]; }; space = derive2 { name="space"; version="0.1-1.1"; sha256="09dpksbda4lg5hax47a9h9shjmggza6583slvdj0fldblykpyxck"; depends=[]; }; spaceNet = derive2 { name="spaceNet"; version="1.2"; sha256="1s2672icxs0qvdhl52xhllgvh1i9mjfrn5j3icyw6h61ljbnhy11"; depends=[MASS mclust permute RcppTN Rfast sna vegan]; }; - spacejam = derive2 { name="spacejam"; version="1.1"; sha256="1mdxmfa1aifh3h279cklm4inin0cx3h0z2lm738bai34j6hpvar7"; depends=[igraph Matrix]; }; spacesRGB = derive2 { name="spacesRGB"; version="1.3-0"; sha256="1flnvrmq0hdrhxmn5djbhc6fanqhmr1i3q5ik7qcxsb0jvnyincd"; depends=[]; }; - spacesXYZ = derive2 { name="spacesXYZ"; version="1.0-4"; sha256="04387yrz9kmr4y10d6dg2z0nn56qafgi1v08jfw5wcwq12cm7052"; depends=[]; }; + spacesXYZ = derive2 { name="spacesXYZ"; version="1.1-1"; sha256="1jxwhpnfbqa2nz86l8sdxxj3qmasw1wmbii7wr8sqp2819jr5lnd"; depends=[]; }; spacetime = derive2 { name="spacetime"; version="1.2-3"; sha256="0nxjp78vdnr8m2nn9czf1rp7b61md4fjfnyqdlgp982x5nb0nz6a"; depends=[intervals lattice sp xts zoo]; }; - spacodiR = derive2 { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[colorspace picante Rcpp]; }; - spacom = derive2 { name="spacom"; version="1.0-5"; sha256="0b6yh4q9f0ibwlwyckwaya9m645j22x6bdz9mz3chass8qza6bls"; depends=[foreach iterators lme4 Matrix nlme spdep]; }; - spacyr = derive2 { name="spacyr"; version="1.2"; sha256="1xsiz6zx89vs6ykrkkp011d8fz4ksdgnf5nyaq5ynjr6zv865vks"; depends=[data_table reticulate]; }; + spacey = derive2 { name="spacey"; version="0.1.1"; sha256="1p8kx3d08q9kz1wb286m3d8ckwkhfm5n42m65m4w5gz5kpfx0xfz"; depends=[httr jsonlite magrittr png raster rayshader rgdal]; }; + spacyr = derive2 { name="spacyr"; version="1.2.1"; sha256="1b2ccgwsiqkvp7w37x8k7699c676q16vfrybkrfvyczyhki4s6nw"; depends=[data_table reticulate]; }; spaero = derive2 { name="spaero"; version="0.5.0"; sha256="1r3rgvmkcrkzm6ikbbmnm4rfdrnwgmn4wq21mxgjs2bzg2r72mw6"; depends=[]; }; spagmix = derive2 { name="spagmix"; version="0.3-1"; sha256="0xfrm4i28sy490g5324bc43dxlrgcnzxg27gsd5b81mqi03sry9j"; depends=[abind mvtnorm RandomFields sparr spatstat]; }; spam = derive2 { name="spam"; version="2.5-1"; sha256="0ry0a76cljlmilrzcriiizcidxyhq1i7i9bqhvl1qda81ld8hifi"; depends=[dotCall64]; }; spam64 = derive2 { name="spam64"; version="2.5-1"; sha256="0fni9lwn51n0ax4qk1l1wslhbkfl44ryp5hgjprkql5a26nmv0nq"; depends=[]; }; spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; }; spanish = derive2 { name="spanish"; version="0.4.2"; sha256="15drc11lh0qxpww50p0smi8qxfbln82bx0yd74jqf71irhk5jxyp"; depends=[magrittr xml2]; }; - spant = derive2 { name="spant"; version="0.19.0"; sha256="1am4xvvrg71w2151gsidcbhfbchgb6q76zghn7qgv3xlihfvxgzc"; depends=[abind complexplus fields foreach magrittr MASS matrixcalc miniUI minpack_lm mmand nnls oro_dicom plyr pracma ptw readr RNifti RNiftyReg shiny signal smoother stringr svd tibble viridisLite]; }; + spant = derive2 { name="spant"; version="1.4.0"; sha256="0376ynqpjl2g4caskkrw0z1mcd495fiyalpb30fvhh1k0zwg2a8s"; depends=[abind complexplus fields foreach irlba lsei magrittr MASS matrixcalc miniUI minpack_lm mmand nloptr nnls numDeriv oro_dicom plyr pracma ptw readr RNifti RNiftyReg shiny signal smoother stringr tibble viridisLite]; }; sparcl = derive2 { name="sparcl"; version="1.0.4"; sha256="138krflvfdlx4hlh90mswds51i8aw2vv00gm5lgkfsvxj4w324jg"; depends=[]; }; spark_sas7bdat = derive2 { name="spark.sas7bdat"; version="1.2"; sha256="1kvzfjhf1q5jzlq5d04s7d96j63vnvqqrh8s03rwkl79h1dhqhhp"; depends=[sparklyr]; }; - sparkTable = derive2 { name="sparkTable"; version="1.3.0"; sha256="1fc2nihxfrjpmxm9g9296mz5czd3ydvi1v37g8qgb20j7b73c64h"; depends=[boot Cairo ggplot2 gridExtra pixmap Rglpk RGraphics shiny StatMatch xtable]; }; sparkavro = derive2 { name="sparkavro"; version="0.3.0"; sha256="0g6ac9msfbx8f8j8rj0hvlxjsn317zyam207q7i8kf0hshs1r58f"; depends=[DBI dplyr sparklyr]; }; sparkbq = derive2 { name="sparkbq"; version="0.1.1"; sha256="0gccm8q5a45k9zm8f90r7fhcmriq8d038p022k7cikbr6rqsrmyh"; depends=[sparklyr]; }; sparkhail = derive2 { name="sparkhail"; version="0.1.1"; sha256="1a9p9i7fs6l9rx5ha6akjjl7qhfak01xsjg28ysv0imikmwp6hy7"; depends=[dplyr sparklyr sparklyr_nested]; }; sparkline = derive2 { name="sparkline"; version="2.0"; sha256="0lrr1lm7603di7x3mf53cp13d9ssjh9gmb43wa6z9yqapis2djm2"; depends=[htmltools htmlwidgets]; }; - sparklyr = derive2 { name="sparklyr"; version="1.1.0"; sha256="19dgfj76nammj1di9bsn7s6k82ksj46jpqd6c309axxlly6grhj0"; depends=[assertthat base64enc config DBI dbplyr digest dplyr ellipsis forge generics httr jsonlite openssl purrr r2d3 rappdirs rlang rprojroot rstudioapi tibble tidyr withr xml2]; }; + sparklyr = derive2 { name="sparklyr"; version="1.2.0"; sha256="1bj9ndyz6nb7mw1pq0gksmw3xpwfjrj0mfmiiazzs3rvp91ap47c"; depends=[assertthat base64enc config DBI dbplyr digest dplyr ellipsis forge generics globals httr jsonlite openssl purrr r2d3 rappdirs rjson rlang rprojroot rstudioapi tibble tidyr withr xml2]; }; sparklyr_nested = derive2 { name="sparklyr.nested"; version="0.0.3"; sha256="0lva7fbjp253kxq3970h52cr8s52xycbi03d5shsyna8grhkbczj"; depends=[dplyr jsonlite listviewer purrr rlang sparklyr]; }; sparktex = derive2 { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; }; sparktf = derive2 { name="sparktf"; version="0.1.0"; sha256="0jd018n7553q0ldv6whxbj2s38myig0m8zq4fbp8fsv34q5wnsx4"; depends=[sparklyr]; }; @@ -13821,29 +13996,30 @@ in with self; { sparsio = derive2 { name="sparsio"; version="1.0.1"; sha256="181kzs9x3h497c7shfalbzrjz05bkj7mmjh9nyphxyi2jjrr6y1q"; depends=[Matrix Rcpp]; }; spate = derive2 { name="spate"; version="1.7"; sha256="1cr5jjrycfj9larsqgzfakk4qgfz8m5djg4ddzk6s3lg2iw06y43"; depends=[mvtnorm truncnorm]; }; spatgraphs = derive2 { name="spatgraphs"; version="3.2-1"; sha256="0n7f3r4ahv1w5mwx5mnib3g4263kz73rh1fcfk5wb12y52x8n1iz"; depends=[Matrix Rcpp]; }; + spathial = derive2 { name="spathial"; version="0.1.2"; sha256="1vwzcwpmx8kwv821vjf940qd5am3k0shf1s14jva71mgxs70ddmb"; depends=[class igraph irlba knitr MASS matrixStats pracma rmarkdown Rtsne]; }; spatial = derive2 { name="spatial"; version="7.3-11"; sha256="04aw8j533sn63ybyrf4hyhrqm4058vfcb7yhjy07kq92mk94hi32"; depends=[]; }; - spatial_tools = derive2 { name="spatial.tools"; version="1.6.0"; sha256="1jh9psc2im0mp52mmz596x5h64m6w1d8hibnm7x52di5j2jp29vz"; depends=[abind doParallel foreach iterators mmap raster rgdal sp]; }; + spatial_tools = derive2 { name="spatial.tools"; version="1.6.2"; sha256="18x935ly2jpnah2dik44nsbin1wyy9v27galyf176bzmjhm029bb"; depends=[abind doParallel foreach iterators mmap raster rgdal sp]; }; spatialClust = derive2 { name="spatialClust"; version="1.1.1"; sha256="042yrmh1rb0hxynxlbdpcissgy9zazs5aqx7vj388ibynzijck3r"; depends=[ggplot2 maptools rgeos sp]; }; spatialCovariance = derive2 { name="spatialCovariance"; version="0.6-9"; sha256="1m86s9a059spp97y37dcirrgjshcqzpdj11cq92vji624w4nrhlb"; depends=[]; }; - spatialEco = derive2 { name="spatialEco"; version="1.3-0"; sha256="1l6ig6cw5hlm5g9ihah7ky5z82dcccnzr0ih4h5x7givrdrrd86g"; depends=[cluster dplyr EnvStats fasterize maptools MASS RANN raster RCurl readr rgeos rms sf sp SpatialPack spatstat spdep velox yaImpute]; }; + spatialEco = derive2 { name="spatialEco"; version="1.3-1"; sha256="075z9ggbm7kdl8aslpq5x0bniklnbmv9jb3ipx7r7xxvq5nf44pz"; depends=[cluster dplyr EnvStats exactextractr maptools MASS mgcv RANN raster RCurl readr rgeos rms sf sp SpatialPack spatstat spdep yaImpute]; }; spatialfil = derive2 { name="spatialfil"; version="0.15"; sha256="01fbn9zblz7rjsgqy3ikdqpf0p0idvb6m96mf7m7qi2ps5f48vzj"; depends=[abind fields]; }; - spatialfusion = derive2 { name="spatialfusion"; version="0.6"; sha256="13bpiw1f847nlrsvg6bpgb62pfgm5j47v7cy7x4bqxh497ci263b"; depends=[fields geoR Rcpp rstan SDraw sp]; }; - spatialkernel = derive2 { name="spatialkernel"; version="0.4-23"; sha256="0kvhirh7afk2gfy21pa6117yk6kzbaf2dxfkr1ax3b554rnrv4p0"; depends=[spatstat]; }; + spatialfusion = derive2 { name="spatialfusion"; version="0.6-2"; sha256="1vqv4424m8rnmyg463mvnk26q7dis4wd47swyyc8f8r4qd85agnz"; depends=[fields Rcpp rstan SDraw sp]; }; spatialnbda = derive2 { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[mvtnorm SocialNetworks]; }; spatialprobit = derive2 { name="spatialprobit"; version="0.9-11"; sha256="1cpxxylc0pm7h9m83m2cklrh4jni5x79r5m5gibxi6viahwxn9kc"; depends=[Matrix mvtnorm spdep tmvtnorm]; }; spatialreg = derive2 { name="spatialreg"; version="1.1-5"; sha256="0zdj67rvfvssjch5hwyi4gvyr7pjgfjrkbhnc4q9psfjp9rhggyx"; depends=[boot coda expm gmodels LearnBayes MASS Matrix nlme spData spdep]; }; - spatialrisk = derive2 { name="spatialrisk"; version="0.6.5"; sha256="0qgy4imk1p35vglj8ahfaf8gy7ixqzdwp75nf1q2y22gjq45d1xa"; depends=[automap classInt dplyr fs ggplot2 gstat lubridate mgcv Rcpp RcppProgress sf sp tmap viridis vroom]; }; + spatialrisk = derive2 { name="spatialrisk"; version="0.6.7"; sha256="1vd90v55wy7b1aqhlr2b6x445nwghn94qyz39439pcmp5y9n8zb8"; depends=[automap classInt dplyr fs ggplot2 gstat lubridate mgcv Rcpp RcppProgress sf sp tmap viridis vroom]; }; spatialsegregation = derive2 { name="spatialsegregation"; version="2.45"; sha256="04ibvk6shs15b8piln2lcnlj8s5gy6r7wraz6591dbc31grzaa36"; depends=[spatstat]; }; spatialwarnings = derive2 { name="spatialwarnings"; version="1.3.1"; sha256="139m6jaw6f5gglwqrd4f5mzr4vkqk2r1a069971y7ap2klzzbhns"; depends=[ggplot2 plyr Rcpp RcppArmadillo reshape2 tidyr VGAM]; }; - spatialwidget = derive2 { name="spatialwidget"; version="0.2"; sha256="105pgsv4dq3pmk9bylb3fxzvp44frfp6xcvq5d01ja4gnwmb35p2"; depends=[BH colourvalues geojsonsf jsonify rapidjsonr Rcpp]; }; - spatsoc = derive2 { name="spatsoc"; version="0.1.9"; sha256="1s7vhn3ywsdp91z4psx7nairxcfhblzyvx44v4an4rwhvvhvys3c"; depends=[adehabitatHR data_table igraph rgeos sp]; }; - spatstat = derive2 { name="spatstat"; version="1.63-0"; sha256="0sda6gj4w06fcsamvxwvvwnxhj90ridj16v7mp8diiv463v8rca3"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; }; + spatialwidget = derive2 { name="spatialwidget"; version="0.2.2"; sha256="082w44i9is0cn4kgbqlnzclyp4fj2is0r5kla29nvm4m2y83bdjj"; depends=[BH colourvalues geojsonsf jsonify rapidjsonr Rcpp sfheaders]; }; + spatsoc = derive2 { name="spatsoc"; version="0.1.13"; sha256="1b5wvkm39ij08fjd2fsnnvaz5l43izpmqxsngzs1kvb8gl45v0bp"; depends=[adehabitatHR data_table igraph rgeos sp]; }; + spatstat = derive2 { name="spatstat"; version="1.63-3"; sha256="0a2mavlvk6faqag3xpm38z85ljlgb64xg7bp657r94bwnfhs3d07"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; }; spatstat_Knet = derive2 { name="spatstat.Knet"; version="1.11-2"; sha256="0jkpj4m44cqid5jdn7fwg3cl15lsmc0dp3bzp6759spivsx1yzq1"; depends=[Matrix spatstat spatstat_utils]; }; spatstat_data = derive2 { name="spatstat.data"; version="1.4-3"; sha256="18lfj5vkwxgf5w9qz0g5al3zy8y2yi3bnd13w24hszfc82nbcmc9"; depends=[Matrix spatstat_utils]; }; + spatstat_gui = derive2 { name="spatstat.gui"; version="1.0-2"; sha256="07lk3xrg5cyvgvw2xwvi77s4ma8qbnmy4whsvm1wdfvw40c0mfrz"; depends=[rpanel spatstat spatstat_utils]; }; spatstat_local = derive2 { name="spatstat.local"; version="3.6-0"; sha256="19kv85smy8jp2bx1mgppav50k07xm8zvmf7snzj29rrspiws7sig"; depends=[spatstat spatstat_utils tensor]; }; - spatstat_utils = derive2 { name="spatstat.utils"; version="1.15-0"; sha256="031ar9yycg8kwknn0aa0pn12qjw722payff9jdzz8fb91drpvq4h"; depends=[]; }; - spatsurv = derive2 { name="spatsurv"; version="1.2"; sha256="0acg6n5qs3z9c7y2n3amla61dm3z1p16njkx0h52dlgdbj5v1nhn"; depends=[fields geostatsp iterators lubridate Matrix OpenStreetMap RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; }; - spbabel = derive2 { name="spbabel"; version="0.5.0"; sha256="0jwv3mirm5wkfqja0nwy25nfndis8px4awpjh4hk9bi77dfy14bf"; depends=[dplyr sp tibble]; }; + spatstat_utils = derive2 { name="spatstat.utils"; version="1.17-0"; sha256="08h9kzkkxvlnngxnv5mdylfali5jj4yhgbr8kvf8l7glswz6ik9r"; depends=[]; }; + spatsurv = derive2 { name="spatsurv"; version="1.4"; sha256="0sw5a532p3bbbh3pxvscmmmg6jw126ncpihxiv01bpwmf85ld4z2"; depends=[fields geostatsp iterators lubridate Matrix RandomFields raster RColorBrewer rgeos sp spatstat stringr survival]; }; + spbabel = derive2 { name="spbabel"; version="0.5.1"; sha256="1q4y5has7yrsn1hv5nzm4imciv5sw5ycsvy5mpikrs1i670rbp6b"; depends=[dplyr rlang sp tibble]; }; spc = derive2 { name="spc"; version="0.6.3"; sha256="0ik5qmf0f0l77rbg78rp8v606h0d1qp4kccl6j3vqfb2hjsqb7r0"; depends=[]; }; spc4sts = derive2 { name="spc4sts"; version="0.5.2"; sha256="039z6dnry5c2brmh7jsnb6cvb7a8nig1rrf4d4i5bpifi2x1hf06"; depends=[gridExtra LS2Wstat rpart]; }; spcadjust = derive2 { name="spcadjust"; version="1.1"; sha256="016i3zaaq800x4niz4fixa57nfj1m10sz5xskff4vq4v9fjn2sl0"; depends=[]; }; @@ -13862,13 +14038,14 @@ in with self; { spec = derive2 { name="spec"; version="0.1.7"; sha256="0zgs9yki11wysvjnx88gl8iv0mcsbrasg29sbasp0855x5l8cg8k"; depends=[csv encode magrittr]; }; speccalt = derive2 { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; }; specklestar = derive2 { name="specklestar"; version="0.0.1.7"; sha256="04vm989yi31vqnf5rs6cdyikm4jzfd9njxh0ls3dvjrg19ipsnmn"; depends=[Rcpp]; }; - spectacles = derive2 { name="spectacles"; version="0.5-0"; sha256="0i1kzp0fpljcvkws15w3iwgpjig2llhlrfs5blk562kgb7vwshqm"; depends=[baseline epiR ggplot2 plyr reshape2 signal stringr]; }; + specr = derive2 { name="specr"; version="0.2.1"; sha256="17bc7f644g40zsfxv3sw542piqgg09w3m3q14jgrifc8sw0ljvdf"; depends=[broom cowplot dplyr ggplot2 ggraph glue igraph lme4 magrittr purrr rlang tibble tidyr]; }; + spectacles = derive2 { name="spectacles"; version="0.5-2-2"; sha256="0nr2s6mnnir7jwrv80s2vk8wffqd7dl7xj82ss1idshqxk0dliz3"; depends=[baseline epiR ggplot2 plyr reshape2 signal stringr]; }; spectral = derive2 { name="spectral"; version="1.3"; sha256="1x5fskivs08wh1ka63i40m1mzsgq1vl25dglzbk9qywxxphvfdmn"; depends=[lattice rasterImage]; }; spectral_methods = derive2 { name="spectral.methods"; version="0.7.2.133"; sha256="0k8kpk94d2qzqdk3fnf6h9jmwdyp8h3klr0ilm5siwq5wkcz339l"; depends=[abind DistributionUtils foreach JBTools ncdf_tools nnet raster RColorBrewer RNetCDF Rssa]; }; spectralAnalysis = derive2 { name="spectralAnalysis"; version="3.12.0"; sha256="0mz01hx86qi65k6vzz9k1j9q7gi10dh14cqvrlfy93f3kmi52q0x"; depends=[baseline BiocGenerics data_table ggplot2 hNMF jsonlite magrittr NMF nnls plotly plyr RColorBrewer signal viridis]; }; spectralGP = derive2 { name="spectralGP"; version="1.3.3"; sha256="1jf09nsil4r90vdj7n1k6ma9dzzx3bwv0fa7svil9pxrd2zlbkbs"; depends=[]; }; spectralGraphTopology = derive2 { name="spectralGraphTopology"; version="0.2.0"; sha256="02j374zsz4ba8ldy52x43rih1p77b56cv5xlbycj5wmkzny2gzx1"; depends=[MASS Matrix progress Rcpp RcppArmadillo RcppEigen rlist]; }; - spectrolab = derive2 { name="spectrolab"; version="0.0.8"; sha256="1hjvi9na94f7n7yr64p0bvh0mzckwmfh36d6zxisrxr08zxwyxzz"; depends=[devtools prospectr RColorBrewer shiny shinyjs usethis]; }; + sped = derive2 { name="sped"; version="0.2-1"; sha256="05igpk8szdcs6kjhpmd9dmjvqdg199pz3hi0rwkhdjglxivvjzjn"; depends=[pooh]; }; speech = derive2 { name="speech"; version="0.1.0"; sha256="007s32w8qr45x1n40xdh85a329cgmm3809bi62ghnxzfny9vjb07"; depends=[dplyr lubridate magrittr pdftools purrr stringr tabulizer tibble tidyr tm]; }; speedglm = derive2 { name="speedglm"; version="0.3-2"; sha256="1b25zimk0z7ad62yacqdg0zk0qs0jja4i918ym942xfw4j1z3jjz"; depends=[MASS Matrix]; }; spef = derive2 { name="spef"; version="1.0.8"; sha256="1c4hpm19zqh869z8qbixkfbidnygc3fy91d0m2l4bp2s6bq1wdnz"; depends=[BB ggplot2 nleqslv plyr sm SQUAREM survival]; }; @@ -13876,14 +14053,15 @@ in with self; { spellcheckr = derive2 { name="spellcheckr"; version="0.1.2"; sha256="09snc1ymzr4njnr3w502b84dqwjjd414higjxqi48jvh27br5k1l"; depends=[data_table dplyr stringr]; }; spelling = derive2 { name="spelling"; version="2.1"; sha256="1j92brq29za3di1723xhmx240ya2v351dvcg0r1xr5yclw1kh3jp"; depends=[commonmark hunspell knitr xml2]; }; spemd = derive2 { name="spemd"; version="0.1-1"; sha256="1aw8dg2fm8qd95bgim2kjwp7ax4b2g78521llsxv7fhdj9hl7rgw"; depends=[MBA sp spdep]; }; - sperich = derive2 { name="sperich"; version="1.5-7"; sha256="1apgq5nsl6nw674dy7bc7r7z962wcmqsia5n67a8n6c5lcgcif3f"; depends=[foreach rgdal SDMTools sp]; }; - sperrorest = derive2 { name="sperrorest"; version="2.1.5"; sha256="126vwk3bxs27gblakc5nplj0k90a21gks9d0kbyanlxc2ihsy243"; depends=[doFuture foreach future future_apply gdata glue magrittr pbapply pbmcapply purrr ROCR rpart stringr]; }; + sperich = derive2 { name="sperich"; version="1.5-8"; sha256="0v4mnv9nl0dvmmfx10w03k02pwjjnip9526m3j1kpgn6c4wk1h93"; depends=[foreach rgdal sp]; }; + sperrorest = derive2 { name="sperrorest"; version="3.0.0"; sha256="0hhab72aqhjcznsghhxwnlxhmqr4wpnrndmy12b2cp5zbb0ca6q5"; depends=[future future_apply ROCR stringr]; }; spex = derive2 { name="spex"; version="0.6.0"; sha256="1m56vmp1zacipr8kw4pwh0rpc0jhi8a59351g9c6gpx48ysj9sbk"; depends=[quadmesh raster reproj sp]; }; spfrontier = derive2 { name="spfrontier"; version="0.2.5"; sha256="1vnvwcjbhvbmyn5rp4760amzy8k3y156q629fjymw9rw6zy45pbf"; depends=[ezsim moments mvtnorm numDeriv optimx spdep tmvtnorm]; }; spftir = derive2 { name="spftir"; version="0.1.0"; sha256="07vw8igy698jx671cj6hmf6ll9xvaq81fb6la7j95pqbd6jl284z"; depends=[pracma]; }; spgrass6 = derive2 { name="spgrass6"; version="0.8-9"; sha256="05xvdhisad0d7c69mvahzg6pvgvmb6dph50r34981palykic7qhn"; depends=[sp XML]; }; spgs = derive2 { name="spgs"; version="1.0-3"; sha256="0a7zqih8q4imi49in8d2j9wa82savp7d2g4xy4wlwblwf6f2ggsh"; depends=[]; }; - spgwr = derive2 { name="spgwr"; version="0.6-32"; sha256="0xdv0yy6md9kv1aay6xxj1k3x59apflip0qpfvyk2aa2wbn1sx2v"; depends=[sp spData]; }; + spgwr = derive2 { name="spgwr"; version="0.6-33"; sha256="1nbg4jacc4iimn79b60c6q9qf09j35yxa2nmlwwijmixa15gmqyd"; depends=[sp spData]; }; + spherepc = derive2 { name="spherepc"; version="0.1.4"; sha256="0jyaanwb78gv3cb1ig86h8cjaw35pxwx7hq53kc9iwjfhkrmc2j3"; depends=[geosphere rgl sphereplot]; }; sphereplot = derive2 { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; }; sphet = derive2 { name="sphet"; version="1.7"; sha256="0savvqz3v5awsr7kcghg6yzkqdpm01kwp7jrg9ajfb3146gg8mlq"; depends=[Matrix nlme sp spdep]; }; spi = derive2 { name="spi"; version="1.1"; sha256="0gc504f7sji5x0kmsidnwfm7l5g4b1asl3jkn2jzsf2nvjnplx1z"; depends=[]; }; @@ -13891,7 +14069,7 @@ in with self; { spider = derive2 { name="spider"; version="1.5.0"; sha256="1y034v42jxjl3vj87iz5kaizq7fwppmn56z7yyvrrmk5ps4nqr1j"; depends=[ape pegas]; }; spiderbar = derive2 { name="spiderbar"; version="0.2.2"; sha256="1ardf7i0s17k8psch7vv29xnvrhw427id5hx3b8jca5cbz1l2ylb"; depends=[Rcpp]; }; spiders = derive2 { name="spiders"; version="1.2"; sha256="1qklm178bgkgpvrjf024jphsdh9can8300sf0702l4h0rk2daqbq"; depends=[plyr]; }; - spikeSlabGAM = derive2 { name="spikeSlabGAM"; version="1.1-14"; sha256="1ha2ngs5jkrcd3ay26vynrd31fqf9pva5r0p954dyfbpbinizxgf"; depends=[akima cluster coda ggplot2 gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; }; + spikeSlabGAM = derive2 { name="spikeSlabGAM"; version="1.1-15"; sha256="1kg1vqx9zvn8jqh8ygjifpyd00npqz3ljbs7r3zgh28bclhfywai"; depends=[akima cluster coda ggplot2 gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; }; spikes = derive2 { name="spikes"; version="1.1"; sha256="080sna0sgii61kai5sirs6cijnvk1012djwfw705di9y2lvk1hqk"; depends=[emdbook]; }; spikeslab = derive2 { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; }; spinBayes = derive2 { name="spinBayes"; version="0.1.0"; sha256="1qgqxxk4n17wj3q07irm2qj6lwc5188iwwbdkf588hvfy86lwpj8"; depends=[glmnet MASS Rcpp RcppArmadillo]; }; @@ -13905,9 +14083,10 @@ in with self; { splines2 = derive2 { name="splines2"; version="0.2.8"; sha256="0ygzqq0swhcss5v8bn7qg98fpvp3wibbnbzkbpw4nvfd8bg51m1v"; depends=[]; }; splinetree = derive2 { name="splinetree"; version="0.2.0"; sha256="0gqb3kwca42crrx6fj42ryl5pkxvankhp1chdlvi5lgg8mzmqsnl"; depends=[ggplot2 mclust mosaic nlme rpart treeClust]; }; splitFeas = derive2 { name="splitFeas"; version="0.1.0"; sha256="1cfiis32h5kkp8r1mndmj4xss9gw96vdzk7q68q3jhbwqiaxp9rp"; depends=[corpcor matrixStats]; }; - splitTools = derive2 { name="splitTools"; version="0.1.0"; sha256="0xb9hxqm9s9f2pqfz4rs4agmrmyc77ci2agyzvpm2x05vxy39yxi"; depends=[]; }; + splitSelect = derive2 { name="splitSelect"; version="1.0.0"; sha256="044pmsdq1kvs3qjglrdpwq5kxvxfybpaqmqhnmwpw4xlql4afvyc"; depends=[caret doParallel foreach glmnet multicool mvnfast]; }; + splitTools = derive2 { name="splitTools"; version="0.2.1"; sha256="09dpkrdfkhh7hqgf0r4c5qx74aghs2gqy47dyakkb19fbx66glhl"; depends=[]; }; splitfngr = derive2 { name="splitfngr"; version="0.1.2"; sha256="0cf9y68m72j890a732m0n784nr12ydljr6s8i80f0in6q8lmw8ls"; depends=[lbfgs]; }; - splithalf = derive2 { name="splithalf"; version="0.5.2"; sha256="16ydqj1mjsii18zllm5v24qw8na88sa3ml2s1b0xlc72fvy76646"; depends=[dplyr Rcpp robustbase tidyr]; }; + splithalf = derive2 { name="splithalf"; version="0.7.1"; sha256="0mpg6i6zh4s9sz10gs0h3y1cc1zva7vs805sb3qkghx857psgyw3"; depends=[dplyr ggplot2 patchwork plyr Rcpp robustbase tidyr]; }; splithalfr = derive2 { name="splithalfr"; version="1.0.10"; sha256="08gl60dbjb4nq6ab0w7yj7ac0gnj0zxbvzlg3rkqczvx4r3gwkip"; depends=[dplyr rlang]; }; splitstackshape = derive2 { name="splitstackshape"; version="1.4.8"; sha256="0mpyf2kkfdl69pdc6brl1r6101vyc6pgr7z17s55ppg3y71k4q35"; depends=[data_table]; }; splm = derive2 { name="splm"; version="1.4-11"; sha256="15app94mxs6xlmqqhpa0q041skc4n4l2wfi6pmmhwinrgcqgncln"; depends=[bdsmatrix ibdreg MASS Matrix maxLik nlme plm spam spdep]; }; @@ -13921,9 +14100,10 @@ in with self; { spmoran = derive2 { name="spmoran"; version="0.1.7.2"; sha256="0gqpnam9z6rni7sswdy3il3z5sdal8dlwm1lpzascdg709qgvdd8"; depends=[doParallel fields foreach ggplot2 Matrix rARPACK spdep vegan]; }; spnet = derive2 { name="spnet"; version="0.9.1-0"; sha256="1fy0fpgz2k985brfqyza1l49y0w2j9z308n542pgmkzqsnsdscpw"; depends=[shape sp]; }; spnn = derive2 { name="spnn"; version="1.2.1"; sha256="1yj89j7nynfyw1ikm6q5kdwdgiiwxx0aa6kgnri5wfnb4l0356l7"; depends=[MASS Rcpp RcppArmadillo]; }; - spocc = derive2 { name="spocc"; version="1.0.2"; sha256="1mglkbbr2zhy884ilhxy2dkcjlr4aq16z08vs9gc44258i59kzy0"; depends=[crul data_table jsonlite lubridate rbison rebird rgbif ridigbio rvertnet tibble whisker wicket]; }; + spocc = derive2 { name="spocc"; version="1.0.8"; sha256="05x9gax8zwpcp4014ffcml8whclkz0yydhb6jgw4wlljnrz8s92r"; depends=[crul data_table jsonlite lubridate rbison rebird rgbif ridigbio rvertnet tibble whisker wicket]; }; spongebob = derive2 { name="spongebob"; version="0.4.0"; sha256="1ar5173fwx1am5rgjlnczfla6b49g0azl0h9vn89ipw7f71rr5j7"; depends=[]; }; spongecake = derive2 { name="spongecake"; version="0.1.2"; sha256="13fxizbfjvqkhkmxk5bwv2fj2xyjkbxrxicpdgwpg0wsk4dhj3s8"; depends=[ggplot2 jpeg magrittr plyr]; }; + spork = derive2 { name="spork"; version="0.1.6"; sha256="0yih4cl118fkx19l4nbc6bicnpk9nkyfjnmq4ynda5bh8mbybdwm"; depends=[ggplot2 latexpdf png]; }; sporm = derive2 { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; }; sport = derive2 { name="sport"; version="0.2.0"; sha256="1wb28iaa35naf5aczijb5g0l41yf098f7c20mjmkcd5w04l1mmks"; depends=[data_table ggplot2 Rcpp]; }; spotGUI = derive2 { name="spotGUI"; version="0.2.1"; sha256="1z664ricdsn8c29ks6hslm89f0qq6ls94pz4k256427cs95pk3ay"; depends=[gridExtra httpuv plotly rclipboard rhandsontable shiny shinyBS shinydashboard shinyjs smoof SPOT XML]; }; @@ -13939,12 +14119,12 @@ in with self; { sprsmdl = derive2 { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; }; spsann = derive2 { name="spsann"; version="2.2.0"; sha256="00nlrwk50ch128brzvfxld0pcpq1syks9rvwdrcf1i2pcxnva7d0"; depends=[pedometrics Rcpp sp SpatialTools]; }; spselect = derive2 { name="spselect"; version="0.0.1"; sha256="02aiml4dh40n6yl52ypramn4847ykdi4y5lhsmchnnp4nnnqycsn"; depends=[magic pracma tester]; }; - spsh = derive2 { name="spsh"; version="1.0.4"; sha256="11xfbhj9g8c99npzs76y30j829gfvhi9zrq2dn97c1idd08200c9"; depends=[DEoptim FME lhs pracma]; }; + spsh = derive2 { name="spsh"; version="1.1.0"; sha256="1rmsgp0mrb4153v5f5xby7r3izvgz1a0vi63g5p9q5jd6z0gd2i1"; depends=[DEoptim FME hypergeo lhs pracma Rdpack]; }; spsi = derive2 { name="spsi"; version="0.1"; sha256="0q995hdp7knic6nca0kf5yzkvv8rsskisbzpkh9pijxjmp1wnjrx"; depends=[plot3D]; }; - spsur = derive2 { name="spsur"; version="1.0.0.4"; sha256="0av0bay2dyfavsckqzjqr490k05fwfncr0yk1wxv741w35ww9mpx"; depends=[Formula MASS Matrix minqa numDeriv sparseMVN spdep]; }; - spsurvey = derive2 { name="spsurvey"; version="4.1.1"; sha256="0ckr2lciqax391g6q6zqsq1bmjbcpp1k8ndzr754vslqn5cibffj"; depends=[crossdes deldir foreign Hmisc MASS rgeos sf sp]; }; + spsur = derive2 { name="spsur"; version="1.0.1.3"; sha256="0zhgj5vlc52j1mr1dkh08gfy0l2s9lqrqjraqsyx6p94gc4by1hv"; depends=[Formula gmodels MASS Matrix minqa numDeriv sparseMVN spatialreg spdep]; }; + spsurv = derive2 { name="spsurv"; version="1.0.0"; sha256="11jlbzvzxv3d1d0nwpbii46ddvphglrxv25rw7pvxbybcx2i7k6x"; depends=[BH coda loo MASS Rcpp RcppEigen rstan rstantools StanHeaders survival]; }; + spsurvey = derive2 { name="spsurvey"; version="4.1.2"; sha256="1lijys90x2s7xxx16bm6h9320kbldgpb1hnyij6s4fkrmqksk8mh"; depends=[crossdes deldir foreign Hmisc MASS rgeos sf sp]; }; spt = derive2 { name="spt"; version="2.5.1"; sha256="04j38d2b35p4798znnc49vqrg8r8bygwi07vybfj3nzimlp2mkrn"; depends=[]; }; - sptemExp = derive2 { name="sptemExp"; version="0.1.4"; sha256="16rp20l65id6jiqify7hii0xpgkiyhgp9xg89b002n0jsy10pgph"; depends=[automap BayesX BayesXsrc bcv deldir doParallel foreach limSolve ncdf4 plyr R2BayesX raster Rcpp RcppEigen rgdal rgeos sp SpatioTemporal]; }; sptm = derive2 { name="sptm"; version="2019.11-25"; sha256="1hdymzngdppmh56dqh0k88n9hg68pbx9rgmimbz4ihnfx2plvadh"; depends=[kyotil survey survival]; }; spuRs = derive2 { name="spuRs"; version="2.0.2"; sha256="00c0hnyrcbkbj269czxbfgmgi88y0vxzm79sxclllkzr9rdd1p53"; depends=[lattice MASS]; }; sqldf = derive2 { name="sqldf"; version="0.4-11"; sha256="0q12vsb53p2wchgp8wfz5bk08wfnm0jxjrakclj4jyy6x3a7ksff"; depends=[chron DBI gsubfn proto RSQLite]; }; @@ -13952,21 +14132,21 @@ in with self; { sqlparseR = derive2 { name="sqlparseR"; version="0.1.0"; sha256="0zcna9y61v1qklpnhrwgv1djg4hyx3k5an32caapszi8qm9nq3x8"; depends=[reticulate]; }; sqlscore = derive2 { name="sqlscore"; version="0.1.4"; sha256="1wvjiy7g0rxfy10vssdrv5li5sbvrin9wjy0ai0nxk503kw7g74k"; depends=[dbplyr]; }; sqlutils = derive2 { name="sqlutils"; version="1.2"; sha256="0dq4idg8i4hv9xg8jllllizqf3s75pdfm1wgncdjj52xhxh169pf"; depends=[DBI roxygen2 stringr]; }; - squash = derive2 { name="squash"; version="1.0.8"; sha256="1x1rw0ny2kas0x8y5vv9czyqmwml7s5d2c8a33vqap0x8q52r4z6"; depends=[]; }; + sqp = derive2 { name="sqp"; version="0.5"; sha256="0l01zwcryv5bmzmd98gj0m5ip8nvr8lziq1awvfif1bzwvvd2kzx"; depends=[Matrix Rcpp RcppArmadillo RcppEigen Rdpack]; }; + squash = derive2 { name="squash"; version="1.0.9"; sha256="1x66iamj5pir6l9aqx4x7xylxxjpjrw8vcix9rbhfd0y0y2iqf7z"; depends=[]; }; squid = derive2 { name="squid"; version="0.1.2"; sha256="1sf7q9pp68inr4ikaxm51f31gwxq9ixrsismrnnsby3agq6nsmkb"; depends=[arm data_table ggplot2 lme4 MASS shiny]; }; - sra = derive2 { name="sra"; version="0.1.1"; sha256="03nqjcydl58ld0wq1f9f5p666qnvdfxb5vhd584sdilw1b730ykd"; depends=[]; }; + sra = derive2 { name="sra"; version="0.1.3"; sha256="0bdxgsz177szfqmvffidgkhl0lrdd7c1nzdvh7ijx99zmi5ww71n"; depends=[]; }; srm = derive2 { name="srm"; version="0.3-6"; sha256="0mc97pv1hsmia4v2wyb8yi37i3v1xypfv9xmhjb989xnnysf1lm3"; depends=[Rcpp RcppArmadillo]; }; srp = derive2 { name="srp"; version="1.2.0"; sha256="0xdzfvi7z78xmyxwd8fha3lr86jwmgjba1w8hhn4sv3v5gc9vlkh"; depends=[fda mgcv]; }; - srvyr = derive2 { name="srvyr"; version="0.3.7"; sha256="0mj2s98qlvy9jqsnfhv4l9d35wvk89wi5iygc7s7i8m50ph22glv"; depends=[dplyr magrittr rlang survey tibble tidyselect]; }; + srvyr = derive2 { name="srvyr"; version="0.3.8"; sha256="06fj9z7l7jl75sr2nqj1kp5wks5d7a8ca2d2b6vd3i0y9c4ljkxc"; depends=[dplyr magrittr rlang survey tibble tidyselect]; }; ss3sim = derive2 { name="ss3sim"; version="1.0.3"; sha256="0s2yajlhi07fvqc0rr4msd9g2jrswb83dx55wsxnw925vikqa5kz"; depends=[bbmle foreach ggplot2 gtools r4ss]; }; ssMousetrack = derive2 { name="ssMousetrack"; version="1.1.5"; sha256="069jsp2l63jp4fv2hwadqxpkp89aqmbh439zy66rx55kws75b556"; depends=[BH CircStats cowplot dtw ggplot2 Rcpp RcppEigen rstan rstantools StanHeaders]; }; - ssa = derive2 { name="ssa"; version="1.3.0"; sha256="0lbwvw8f88wvlhzd469fww0av0nbi6l76vmmxbps0ifw2q87l00d"; depends=[iterators]; }; ssanv = derive2 { name="ssanv"; version="1.1"; sha256="17a4a5azxm5h2vxia16frcwdyd36phpfm7fi40q6mnnrwbpkzsjd"; depends=[]; }; ssc = derive2 { name="ssc"; version="2.1-0"; sha256="1lq71p8hbjfg4a52009810k5dmhak9ddk1dywvhy7v2gjmxqnadw"; depends=[proxy]; }; sscor = derive2 { name="sscor"; version="0.2"; sha256="1kcrr90cxg6k4qkc3pidhkwf4dsnlgbxczxigr2afwpd9cpf104c"; depends=[mvtnorm pcaPP robustbase]; }; ssd = derive2 { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13jsb4k4575b7c424ci2p6gy"; depends=[]; }; - ssdtools = derive2 { name="ssdtools"; version="0.1.1"; sha256="1vamc0b325i1jmzkqyjp7hym3x66pj9yflvplqa64m5nxr3q1anz"; depends=[abind actuar chk fitdistrplus ggplot2 lifecycle scales VGAM]; }; - sse = derive2 { name="sse"; version="0.7-15"; sha256="1g1hxw1k8wnlzy7qif6334ncp4dxznkf2anhvzcha9iwy56byn1n"; depends=[lattice]; }; + ssdtools = derive2 { name="ssdtools"; version="0.2.0"; sha256="1nyym23q1f4v71g3rb5p59vdzylg8n90z2x2hkb7d6dycxjsyc8k"; depends=[abind actuar chk fitdistrplus ggplot2 lifecycle scales tibble VGAM]; }; + sse = derive2 { name="sse"; version="0.7-16"; sha256="1kxdgbskw7v48jnif4dpmwxpsdznfx8d9q5nkf3ynw9xl38rzv23"; depends=[lattice]; }; ssev = derive2 { name="ssev"; version="0.1.0"; sha256="1iw07gw9vhg073s5kkxh5f1si6p998rc1i2zglnpk5c3pi3l55wp"; depends=[MESS pwr]; }; ssfa = derive2 { name="ssfa"; version="1.1"; sha256="0fkyalhsjmx2sf8xxkppf4vd272n99nbkxh1scidrsgp4jk6z7fx"; depends=[Matrix maxLik sp spdep]; }; ssfit = derive2 { name="ssfit"; version="1.1"; sha256="1fais0msi2ppgfp0vbx3qri7s9zs51i7n90w36xkwwac4f46bq5y"; depends=[survey]; }; @@ -13976,7 +14156,7 @@ in with self; { ssize_fdr = derive2 { name="ssize.fdr"; version="1.2"; sha256="0y723lwsnmk3rxbhlsrny9hiy07a5p255ygy9qkj6mri64gk1hby"; depends=[]; }; ssizeRNA = derive2 { name="ssizeRNA"; version="1.3.2"; sha256="1qw10yswzpg28fhvr6rsq0gh7xivfapw64gxc0hakb1nc31jf8ky"; depends=[Biobase edgeR limma MASS qvalue ssize_fdr]; }; ssmn = derive2 { name="ssmn"; version="1.1"; sha256="1rab9yjb05g5rphqlhwvdwmsyqlv1f4m0rqxfv8c5pbh170nbwbc"; depends=[mnormt moments sn truncdist]; }; - ssmrob = derive2 { name="ssmrob"; version="0.7"; sha256="0asf0r83rzar96lcjm38i85qscbs9gbsrwbd1nfwzz9yl08mh07k"; depends=[MASS robustbase sampleSelection]; }; + ssmrob = derive2 { name="ssmrob"; version="0.8"; sha256="1y5a02xqj931gyfxqp7i87nkinbm4wan0pq08f111q05zg1j8wmj"; depends=[MASS robustbase sampleSelection]; }; ssmsn = derive2 { name="ssmsn"; version="0.2.0"; sha256="0fzqdkqhj5hh8pzcwh7i0rglgdq22a5mriyis8r1vhlkdc7n5m39"; depends=[MCMCpack]; }; sspline = derive2 { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; }; sspse = derive2 { name="sspse"; version="0.6"; sha256="1296893wgg0s6z5bv9a3k39gbxazvljl4dxiv4ma1s73nhz0xan9"; depends=[coda RDS scam]; }; @@ -13990,60 +14170,62 @@ in with self; { st = derive2 { name="st"; version="1.2.5"; sha256="0dnyfjcz37gjjv87nrabb11gw2dlkqhq3mrxdpkzahx0w0g0q0pb"; depends=[corpcor fdrtool sda]; }; stR = derive2 { name="stR"; version="0.4"; sha256="120k8k1l8cfy8x746808jym7lnaplgh4s3lycgyq2wia2c35r0rc"; depends=[foreach forecast Matrix quantreg rgl SparseM]; }; stUPscales = derive2 { name="stUPscales"; version="1.0.3.4"; sha256="0a6b38lhi1p0n2hjq2j8aw2vkasdv50cpgllxfxla7ddwbhbk3nk"; depends=[data_table doParallel EmiStatR foreach ggplot2 hydroGOF lattice lmom mAr moments msm xts zoo]; }; - staRdom = derive2 { name="staRdom"; version="1.1.1"; sha256="089fks6qik8wplsfibdvj7r6m89329n3grlm7sdhg4m0m7x2z8yc"; depends=[cdom data_table doParallel dplyr drc eemR foreach GGally ggplot2 gtools matrixStats MBA multiway pracma R_matlab readr stringr tibble tidyr zoo]; }; + staRdom = derive2 { name="staRdom"; version="1.1.11"; sha256="071irc8bam5rk72db0s7si2mmzq29245qk63q78fdn3ll2lb6gpf"; depends=[cdom data_table doParallel dplyr drc eemR foreach GGally ggplot2 gtools matrixStats MBA multiway pracma R_matlab readr stringr tibble tidyr zoo]; }; staTools = derive2 { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[magicaxis Rcpp VGAM]; }; stability = derive2 { name="stability"; version="0.5.0"; sha256="0mz7ikfhpfbdcp72klq7fi4zfmx2w18gz46yhwywcc4dyi277m11"; depends=[dplyr ggfortify ggplot2 lme4 magrittr matrixStats reshape2 rlang scales tibble tidyr]; }; stable = derive2 { name="stable"; version="1.1.4"; sha256="01azqg4yi5wl6wfdpjq57w41x5z2b4dsp5n3vpkz24b9avk6rm8s"; depends=[rmutil stabledist]; }; + stableGR = derive2 { name="stableGR"; version="1.0"; sha256="1glxrxqd3gr7npwlzcr2nmsmakydyxg7hswvb85gz1jvc6c6254f"; depends=[mcmcse mvtnorm]; }; stabledist = derive2 { name="stabledist"; version="0.7-1"; sha256="0scar396wiq6wkbkvwp4qrxqc1m075y56p37i6iry5rw796p1i86"; depends=[]; }; - stablelearner = derive2 { name="stablelearner"; version="0.1-1"; sha256="19mvk6dzg8zg0nj1q4sraqg6h3zj8xvnfc0jql1xiqas9wcypx7d"; depends=[e1071 MASS partykit]; }; + stablelearner = derive2 { name="stablelearner"; version="0.1-2"; sha256="18yrx2h71b857j0xyh68pj80p2xk6yhbfzhd3mdhiqw0irmc5755"; depends=[e1071 MASS party partykit randomForest ranger]; }; stablespec = derive2 { name="stablespec"; version="0.3.0"; sha256="0m143cq0baj2lyakhr31mqk2lg78jzpdlpv2bhwz6bzzip7mqi22"; depends=[foreach ggm graph matrixcalc nsga2R polycor Rgraphviz sem]; }; - stabm = derive2 { name="stabm"; version="1.1.0"; sha256="17vd3dgfxd1y5f797l8in2sj4hd9fg3s1xdvqjw2x4pgjz0i9w61"; depends=[BBmisc checkmate Matrix]; }; + stabm = derive2 { name="stabm"; version="1.1.2"; sha256="01fg6zn6i710xfa9g15q4ca7vfgkfrk0iz6fvn8qp6y3dfrpm1sj"; depends=[BBmisc checkmate Matrix]; }; stabreg = derive2 { name="stabreg"; version="0.1.2"; sha256="1jrxyv0d33vd9vdlj1cv1a2qdz8iqgr726f54dgazwsz3cpyy2ia"; depends=[numDeriv]; }; stabs = derive2 { name="stabs"; version="0.6-3"; sha256="17sa0sjxf6h7gx1ga1pxhv17yrz3qisaivbf5cbc3asvshhswqg9"; depends=[]; }; stackoverflow = derive2 { name="stackoverflow"; version="0.7.0"; sha256="0zv8bxzw4pgaa5ra8wsb9p7g8bwffdhc6gqsfrcs61zva7v9izc2"; depends=[]; }; - stacomiR = derive2 { name="stacomiR"; version="0.5.4.2"; sha256="0dhf91wmv3mz120g9bwspgq9qs6d8sk1a2vxd7xl0jibgx6fk22x"; depends=[dplyr ggplot2 gWidgets gWidgetsRGtk2 Hmisc intervals lattice lubridate magrittr mgcv RColorBrewer reshape2 RGtk2 RODBC RPostgreSQL sqldf stacomirtools stringr xtable]; }; + stacomiR = derive2 { name="stacomiR"; version="0.5.4.3"; sha256="0x3b8hp789ahxvd28jk01iyf2fn0mlfj16sx2w2x99jbqpfxqxkd"; depends=[dplyr ggplot2 gWidgets gWidgetsRGtk2 Hmisc intervals lattice lubridate magrittr mgcv RColorBrewer reshape2 RGtk2 rlang RODBC RPostgreSQL sqldf stacomirtools stringr xtable]; }; stacomirtools = derive2 { name="stacomirtools"; version="0.5.3"; sha256="00zpsfrw0gcjbjr3xdxf2wacrr1zfw6wq7a2ycq32pbh2smbkz4k"; depends=[RODBC xtable]; }; stagePop = derive2 { name="stagePop"; version="1.1-1"; sha256="0949r5ibl3sb10sr5xsswxap3wd824riglrylk7fx43ynsv5hzpy"; depends=[deSolve PBSddesolve]; }; - stagedtrees = derive2 { name="stagedtrees"; version="1.0.1"; sha256="0ycv4gban5nb1c26riwamvbz5jk740ixhm4f6cmqa0qyyd6nvm9k"; depends=[]; }; + stagedtrees = derive2 { name="stagedtrees"; version="1.0.2"; sha256="11s09r4bp3fd9nbfqmwbdkvlgkryf3n9awbffyk2rsd9cdva2lch"; depends=[]; }; stam = derive2 { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; }; stampr = derive2 { name="stampr"; version="0.2"; sha256="10mc71kgnw5712q2gvzd4bmjaw1879r7s599hfsjap21idqb2k2m"; depends=[deldir maptools raster rgdal rgeos sp spdep]; }; standardize = derive2 { name="standardize"; version="0.2.1"; sha256="0ijyqy09fl478cvqnqwv7fpdmf2yvihw18abkkmgwdnm2v3xqphp"; depends=[lme4 MASS stringr]; }; stapler = derive2 { name="stapler"; version="0.7.1"; sha256="1bzhahn72fzm2bjpis76hphv8whnkp2jq8bm1qldadhng4z1nsak"; depends=[matrixStats RNifti]; }; staplr = derive2 { name="staplr"; version="2.9.0"; sha256="1m1rikd1ijw9svdfm7nn9fnc9pycymbnnv2dq7ygs40jkq2mr4zp"; depends=[assertthat glue stringr]; }; stargazer = derive2 { name="stargazer"; version="5.2.2"; sha256="1pij76r60hkjlvxw6zw1v7gkib81smiqmjq7mwszn6xclq9lmsvh"; depends=[]; }; + starm = derive2 { name="starm"; version="0.1.0"; sha256="0y580c6inmfix6agwd5nr340l3hjk2xxs95s468j5pghpjpb8rmv"; depends=[Matrix]; }; starma = derive2 { name="starma"; version="1.3"; sha256="07r0kyabhgbm2v39fcrw0qhxcxj9a9cb45g9chzcnn9qmvramcwx"; depends=[ggplot2 Rcpp RcppArmadillo scales]; }; - starmie = derive2 { name="starmie"; version="0.1.2"; sha256="06cvl8gk78c55kcf4rd27d4gfzh2lcg7ldynvx4hclvbw7ak9zdq"; depends=[combinat data_table ggdendro ggplot2 ggrepel gridExtra iterpc label_switching MCL MCMCpack proxy purrr readr stringr tidyr]; }; - stars = derive2 { name="stars"; version="0.4-0"; sha256="1wby9mkqybq17aakplhz22xp3xkpih9y5b2kc5mhgsl7s07glh42"; depends=[abind classInt lwgeom rlang sf units]; }; + stars = derive2 { name="stars"; version="0.4-1"; sha256="14f0qky7578g61rqjdvpkpr4393pxgqbmh5hycxrxcq0mc2aiqq3"; depends=[abind classInt lwgeom rlang sf units]; }; + starsExtra = derive2 { name="starsExtra"; version="0.0.3"; sha256="0zcz6jjs57k3vq2rdqf91ngcsl0qmdswpisp9zfj9af7f9i7bmm5"; depends=[mgcv nngeo sf stars units]; }; startR = derive2 { name="startR"; version="0.0.1"; sha256="12y57n3yip5rz4rln41896a15zv5b4c67k164282fh1p6ww9gr3r"; depends=[abind bigmemory future]; }; - startup = derive2 { name="startup"; version="0.14.0"; sha256="1s1h0mvb7wxp6scl2l8lrdlgfw85g67xsrihgad4c89ndis9px6l"; depends=[]; }; + startup = derive2 { name="startup"; version="0.14.1"; sha256="0nvmhfar53yi3wsvhv4idx849psdj46qhkvkxjn52fa7yflkrwz8"; depends=[]; }; startupmsg = derive2 { name="startupmsg"; version="0.9.6"; sha256="0vkqxir4ady4dn9s70dfg1fxck2xg8vnmrmxjzvk01i6pc9zyq0x"; depends=[]; }; statGraph = derive2 { name="statGraph"; version="0.3.0"; sha256="1xc10pkv3dq7x98xjqkg7ily89qj2r637y5qlnfvk08n6mzhn8w0"; depends=[igraph MASS]; }; - statVisual = derive2 { name="statVisual"; version="1.1.9"; sha256="1wf0hgvfynw85zqh4wcmjnysmj8701lxm31bnqyf1kawxjqdxyn4"; depends=[Biobase dplyr factoextra forestplot gbm GGally ggdendro ggfortify ggplot2 ggrepel glmnet gplots gridExtra knitr limma magrittr multigroup pheatmap pROC pvca randomForest RColorBrewer reshape2 rmarkdown rpart_plot tibble tidyverse]; }; + statVisual = derive2 { name="statVisual"; version="1.2.1"; sha256="1cc9p9g8lzn0lgh793r977yhqbk89l74m443gnznjlfml69bfb21"; depends=[Biobase dplyr factoextra forestplot gbm GGally ggdendro ggfortify ggplot2 ggrepel glmnet gridExtra knitr limma magrittr pheatmap pROC pvca randomForest RColorBrewer reshape2 rmarkdown rpart_plot tibble tidyverse]; }; statar = derive2 { name="statar"; version="0.7.1"; sha256="0gxchf3mnjvxcp7dg8f1dxbm16hx4ks92z0h0ig7m9l6k6f8adkv"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang stringr tidyr tidyselect]; }; - statarepl = derive2 { name="statarepl"; version="0.1.0"; sha256="0byx14mvvigmshd53cxk5wzmfjcky39ywx2km21d2b74s86cb4g5"; depends=[attempt cli crayon jsonlite knitr R6 rlang rstudioapi subprocess]; }; statcanR = derive2 { name="statcanR"; version="0.1.0"; sha256="1pyax5lixbpdg99n525w9z44s0zp5xda6ad605c3id0arki9c8xq"; depends=[curl data_table]; }; statcheck = derive2 { name="statcheck"; version="1.3.0"; sha256="0ivybdcrymlsfv6pg6p5bv70qdvgxf2vgp0kf4r0pf2fcvav1mcp"; depends=[ggplot2 plyr rmarkdown]; }; statcomp = derive2 { name="statcomp"; version="0.1.0"; sha256="0793k14rxiwq98zlrbsmbbkjn5z2ny5c90pia7cx3s77a3wdc96l"; depends=[Matrix zoo]; }; statebins = derive2 { name="statebins"; version="1.2.2"; sha256="0qfs796dk5x983qah32w3npv9mxzljp3g7kffdd0ansn3z7i1zbb"; depends=[ggplot2 gridExtra RColorBrewer scales]; }; states = derive2 { name="states"; version="0.2.2"; sha256="1lw1gljmkn8i8fd4ng5c3jpqrwr0gkiyazppy19dp8xl94m1xa4b"; depends=[dplyr]; }; - statgenGWAS = derive2 { name="statgenGWAS"; version="1.0.2"; sha256="04j3f6604psxr7b5fsb8hq6rzqxqydpizhhz2g014apwjzjfd1vc"; depends=[data_table ggplot2 Rcpp RcppArmadillo sommer]; }; - statgenSTA = derive2 { name="statgenSTA"; version="1.0.2"; sha256="0dm80xx7rqnxnql5x76601i0yy57flfp7ayzm3ia2mwl8h00x02m"; depends=[emmeans ggplot2 ggrepel gridExtra knitr lme4 mapproj maps qtl reshape2 scales SpATS xtable]; }; + statgenGWAS = derive2 { name="statgenGWAS"; version="1.0.4"; sha256="0hmxjm6phgysdkv467nbdmkxfnz55ilaii4hmslsn5p6dl37mqp3"; depends=[data_table ggplot2 Rcpp RcppArmadillo sommer]; }; + statgenSTA = derive2 { name="statgenSTA"; version="1.0.4"; sha256="0iry8gad5kvayvrrnfnhz5gz941wf4v23psqdaxy4ciha468nhlx"; depends=[emmeans ggplot2 ggrepel gridExtra knitr lme4 mapproj maps qtl scales SpATS xtable]; }; stationaRy = derive2 { name="stationaRy"; version="0.5.1"; sha256="1620fdlybn3hr96yngnp802imr9b7n90835lyyd86r2wn6psdzvl"; depends=[downloader dplyr lubridate lutz magrittr progress readr stringr tidyr]; }; stationery = derive2 { name="stationery"; version="0.98.24"; sha256="06qn3ck2cgcyrx8l27ka1y5dq8hyf01wq3hky6876a5g65b1wax2"; depends=[knitr kutils rmarkdown]; }; statip = derive2 { name="statip"; version="0.2.3"; sha256="0kymc3ds1nx0h11ffmm3vmqr1w34gd0k788vf72x2v45h8c1ma2n"; depends=[clue rpart]; }; - statmod = derive2 { name="statmod"; version="1.4.33"; sha256="1fbi5m4c0lingm2vvi0g6jf8f2mg1h01xwyz5rnymrq7gs0ibiks"; depends=[]; }; + statmod = derive2 { name="statmod"; version="1.4.34"; sha256="0yklg64aw5y8kfq5piafnrj1v3jv563iwzzl75g3kllrw23c508s"; depends=[]; }; statnet = derive2 { name="statnet"; version="2019.6"; sha256="17dj6vjnjyqrfhzjq1lys5b29j942kd15zffb69jidni3slf20q9"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm tsna]; }; statnet_common = derive2 { name="statnet.common"; version="4.3.0"; sha256="0ng90i0wm9wlyhjbnmnylc1bbqw396p1dr7f402dyry9x9ck6jl3"; depends=[coda]; }; statnetWeb = derive2 { name="statnetWeb"; version="0.5.5"; sha256="1v2zgbfl975gqhkhxvgdfhgbw7yf9y3p6kqqxldr9zskhmrn7p1x"; depends=[ergm lattice latticeExtra network RColorBrewer shiny sna]; }; + statnipokladna = derive2 { name="statnipokladna"; version="0.5.7"; sha256="0mj2dxianpd78127ggn0cml5nwwf6l26sds36qvfwbicaj7bk5jg"; depends=[curl dplyr httr jsonlite lifecycle lubridate magrittr purrr readr rlang stringi stringr tibble tidyr usethis xml2]; }; statprograms = derive2 { name="statprograms"; version="0.2.0"; sha256="0m7px7fmpz2zzlfdi7rbllcjvcjp8iy94f6fa1w4xinh7vz3y6vq"; depends=[]; }; statquotes = derive2 { name="statquotes"; version="0.2.2"; sha256="1xzc3ndddjrlyld0p4zcwwxkj7i3m3adj7c78x9l4lhlw9mxbbqg"; depends=[stringr tidytext wordcloud]; }; - stats19 = derive2 { name="stats19"; version="1.1.0"; sha256="163v39dvy0gahw2ra0pvri21k02iv9waqb8pv6j55nicvpvha7jm"; depends=[readr sf]; }; - statsExpressions = derive2 { name="statsExpressions"; version="0.2.1"; sha256="009hal1944mnpcc4k1p36p66v04dfzxk75ap119mpp1akdf2s14g"; depends=[BayesFactor boot broomExtra crayon dplyr ez groupedstats metaBMA metafor metaplus psych purrr rcompanion rlang tibble tidyr WRS2 zeallot]; }; + stats19 = derive2 { name="stats19"; version="1.2.0"; sha256="0956s8z8qrkij52fq15ydl15zi3kg5czcx7kjcg20nmby5dqmd34"; depends=[readr sf]; }; + statsExpressions = derive2 { name="statsExpressions"; version="0.4.1"; sha256="0pzxl1w1ibcwcrzc4p8rc439s30hmcf8xwq7d9hq31vkf6kywpin"; depends=[boot broomExtra correlation dplyr effectsize ez ipmisc metafor metaplus purrr rcompanion rlang tidyBF tidyr WRS2]; }; statsguRu = derive2 { name="statsguRu"; version="0.1.0"; sha256="0pqz0la86mk6zp65zzbfwhxyrqqx040p8mrm2j9wqb53r8fbnmqc"; depends=[devtools htmltab plotrix]; }; statsr = derive2 { name="statsr"; version="0.1-0"; sha256="1z0wfj1jxz02x7vl6sr651v85k88wg8rx0k2kkrwzc4ynim8shms"; depends=[BayesFactor broom cubature dplyr ggplot2 gridExtra knitr rmarkdown shiny tidyr]; }; stcos = derive2 { name="stcos"; version="0.2.1"; sha256="1vjz7x9jign82h5kwqcy4jxqjdnhrsgf00dj5m51f6hvvzh3wv5s"; depends=[dplyr Matrix R6 Rcpp RcppArmadillo sf]; }; stcov = derive2 { name="stcov"; version="0.1.0"; sha256="166w929sgd7nanw1zjhzwv50hd5vqhgsrgxnsga4dzrcvndalw70"; depends=[]; }; - stdReg = derive2 { name="stdReg"; version="3.3.0"; sha256="0m907dcgqprnasq17z3wyx7fampsqhwjvg2r0nji5bg9gzag4253"; depends=[data_table drgee numDeriv survival]; }; + stdReg = derive2 { name="stdReg"; version="3.4.0"; sha256="003lp8yshjdql475hdpickwr0fngzn9qps1dzvx8zfy4x51xy8xl"; depends=[data_table drgee numDeriv survival]; }; stddiff = derive2 { name="stddiff"; version="3.0"; sha256="1z6rdchf46aaq0z9bp4dlc4h3swrgyjfdvg40f4lkyg5sgs4sliy"; depends=[]; }; stdvectors = derive2 { name="stdvectors"; version="0.0.5"; sha256="0gxylknr146qyg9aj22md076cdhrsz75dg25a1hx8525cm71nwd6"; depends=[Rcpp]; }; steadyICA = derive2 { name="steadyICA"; version="1.0"; sha256="0mcalbsgajdpk45k9vpyavn079063hw4ihkw72n9wcy5nb0da14g"; depends=[clue combinat MASS Rcpp]; }; @@ -14055,15 +14237,14 @@ in with self; { stepPlr = derive2 { name="stepPlr"; version="0.93"; sha256="1i54nyz8z5vq3mzfh6h2vd1q0hsdazc4mhrj9ad0zdvn0qnz61lv"; depends=[]; }; stepR = derive2 { name="stepR"; version="2.0-4"; sha256="1jv2mv1glzap7nsyxwzil9wif3q3p4y9q0c3kphz49hwwrg20k79"; depends=[digest R_cache Rcpp]; }; stepp = derive2 { name="stepp"; version="3.2.0.0"; sha256="0fnjqbncadscv6ryvqyqf8qqgpfzh2hka5ld2zvw39mjqzy5gadi"; depends=[car survival]; }; - steps = derive2 { name="steps"; version="1.0.0"; sha256="03f43fbm7k1i3cgyxzfscjxykjnbyy3d9zyc6kqisghlxgkshnkk"; depends=[future future_apply memuse raster rasterVis Rcpp viridisLite]; }; - stepwise = derive2 { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; }; + steps = derive2 { name="steps"; version="1.1.0"; sha256="1p01cmvh5rbgwaz0r73iry60jq0f8rp3z8ql57vhmnd9kyrzf53m"; depends=[future future_apply memuse raster rasterVis Rcpp viridisLite]; }; stevedore = derive2 { name="stevedore"; version="0.9.3"; sha256="00zs2bl5h40rwbhnynjw2jbxlixjnk14rxn9chypqg5zgx9pqg2s"; depends=[crayon curl jsonlite yaml]; }; - stheoreme = derive2 { name="stheoreme"; version="1.2"; sha256="14w3jcbs8y8cz44xlq8yybr2jwgk3w7s2msgjhlp1vazy8959s65"; depends=[]; }; - sticky = derive2 { name="sticky"; version="0.5.2"; sha256="0yib9llvlxyzcwam3qd3wxz91mdacvh4v888ifxwjhhjihffqvbj"; depends=[]; }; + sticky = derive2 { name="sticky"; version="0.5.6.1"; sha256="1szfpay9cpdwq6v5fmnjyr00r4zhz6zd2rrl3h88v9l5xpfafi4w"; depends=[]; }; stilt = derive2 { name="stilt"; version="1.3.0"; sha256="0b1bs849hw2wcvaldybxk8h8wgwl6p7x4i7winncvngmhplgrvx4"; depends=[fields]; }; stima = derive2 { name="stima"; version="1.2.1"; sha256="091pjjr2pvd93l01szyj5gr9ixv1h90yd18h678nhpn0fncimszv"; depends=[rpart]; }; stinepack = derive2 { name="stinepack"; version="1.4"; sha256="0crl77gr4x2bz2zp0a0lqiw5iqlrcx7vj67igkbzg64d1fxai85d"; depends=[]; }; stlcsb = derive2 { name="stlcsb"; version="0.1.2"; sha256="08pnj1yb4xcbhnrp2wny8lq9rvcvmsgaza07k4358csfksvmcira"; depends=[dplyr lubridate purrr readr readxl rlang rvest sf stringr tibble xml2]; }; + stlnpp = derive2 { name="stlnpp"; version="0.3.5"; sha256="0n2qbqlh81ql0pqglalvkf9hl8jdz3nkkh7362w9b4qizk9azkzi"; depends=[spatstat]; }; stlplus = derive2 { name="stlplus"; version="0.5.1"; sha256="14728xsm982z9sg4rbqg307pbwqlsiyzj8z3sr9wr6fi0dayf6z5"; depends=[lattice Rcpp yaImpute]; }; stm = derive2 { name="stm"; version="1.3.5"; sha256="1yyfxaxqc6yq0yq68zhdnhpwpvsyp71dlmivn7zxixfmp932s6cn"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; }; stmCorrViz = derive2 { name="stmCorrViz"; version="1.3"; sha256="1a4pckrbzsihyf1bqvw3cl0hxrc4yq1pnkgxgf4b8jday6zkxwcv"; depends=[jsonlite SnowballC stm tm]; }; @@ -14073,25 +14254,25 @@ in with self; { stoRy = derive2 { name="stoRy"; version="0.1.3"; sha256="146xs8as5f8ig2xpj9k2san4bllqxddsnlflnhl0sy6132vshyr1"; depends=[data_tree R6]; }; stocc = derive2 { name="stocc"; version="1.30"; sha256="0xpf9101094l5l75p9lr64gwh2b8jh4saw6z6m2nbn197la3acpw"; depends=[coda fields Matrix rARPACK truncnorm]; }; stochQN = derive2 { name="stochQN"; version="0.1.2"; sha256="1zwxw95jrpkqgbgwhwdy907v9gqmvn5as4v35a75wvy3nhawka9a"; depends=[]; }; - stochprofML = derive2 { name="stochprofML"; version="2.0.0"; sha256="1101jshd1k3b1gy6fqdirnc17qa2fgjg48rlf8kc3jklmx4n1hfs"; depends=[MASS numDeriv]; }; + stochprofML = derive2 { name="stochprofML"; version="2.0.1"; sha256="0dcg3akrqxs49jr40kzv1lh598l1hgzrvmsi0zsfjm9466rlp1b0"; depends=[MASS numDeriv]; }; stochvol = derive2 { name="stochvol"; version="2.0.4"; sha256="1hb2fgnyn8zxq1j74x00msq3j807y70yxx2s3fq4csrb1935vr85"; depends=[coda Rcpp RcppArmadillo]; }; - stockR = derive2 { name="stockR"; version="1.0.68"; sha256="0pgyxh19csv21vgji1sjpqaaqb1wwz62mnsf85a97ba9aph9lxwb"; depends=[gtools]; }; + stockR = derive2 { name="stockR"; version="1.0.74"; sha256="002i0bhyskwyjjczfa752ghn19hvqhdyzdfkpvci3hb66rh94x65"; depends=[gtools RColorBrewer]; }; stocks = derive2 { name="stocks"; version="1.1.4"; sha256="0b6rl7pfkgzbpwnv7zzkr36hs5f1zb60d16ijslf7g9m25vvcyg6"; depends=[dvmisc Hmisc lubridate quantmod rbenchmark RColorBrewer Rcpp TTR zoo]; }; stoichcalc = derive2 { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; }; - stopwords = derive2 { name="stopwords"; version="1.0"; sha256="1nmi0bpd0c238g5b8ch1v034m5ng9llhs519cgxdrj3sh9fplwlv"; depends=[ISOcodes]; }; - stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.2"; sha256="08f16a68kmw0r1acs82sha83m04d81b7zdpxjw5g424zbvagwdj4"; depends=[dplyr ggplot2 lubridate maps plyr rlang stringr tidyr weathermetrics]; }; + stokes = derive2 { name="stokes"; version="1.0-5"; sha256="0xbjkrm9g7r2xnj629i5cfmmqkw60iq4k6lk3skmkj3xh20lcd5x"; depends=[magrittr partitions permutations spray]; }; + stopwords = derive2 { name="stopwords"; version="2.0"; sha256="155g00ansyqfpp1mzd2q6mn0k214xinf78nww2368h24kz761jjw"; depends=[desc ISOcodes usethis]; }; + stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.3"; sha256="0bh2avblcai49kz8v2i1awqvmzd8gpmla342xdb0siwfpd0caid3"; depends=[dplyr ggplot2 lubridate maps plyr rlang stringr tidyr weathermetrics]; }; storr = derive2 { name="storr"; version="1.2.1"; sha256="0409gb6wji3cjxkdcd0wc3jvsx61h3rxd8a3nr018y8rh1rpsaj6"; depends=[digest R6]; }; stosim = derive2 { name="stosim"; version="0.0.14"; sha256="10k8j7manskjsrjc1l44yhy682b1qh0k2jx3cs5k69j2z42mnhmk"; depends=[Rcpp]; }; - stplanr = derive2 { name="stplanr"; version="0.5.0"; sha256="16jyk9n9gvhrqrm6s1m4m3m5jpkdy0wxamfqcbjw91gkjg07caxd"; depends=[curl dplyr geosphere httr igraph jsonlite lwgeom magrittr maptools nabor raster Rcpp RcppArmadillo rgeos rlang sf sp stringr]; }; + stplanr = derive2 { name="stplanr"; version="0.5.2"; sha256="10cwfkln0xzwxllry9kmsmiq92agdkh7cfvpzbs3zgkm5ilvr1az"; depends=[curl dplyr geosphere httr igraph jsonlite lwgeom magrittr maptools nabor raster Rcpp RcppArmadillo rgeos rlang sf sp stringr]; }; stpm = derive2 { name="stpm"; version="1.7.7"; sha256="1l40zb9qwshg7saqmgi7c49a3jd93ycrbvmysgzs0q8pl94vgcfs"; depends=[knitcitations MASS nloptr Rcpp RcppArmadillo sas7bdat survival]; }; - stpp = derive2 { name="stpp"; version="2.0-3"; sha256="18icnfrlrcibrpw7vqkrhzfx880ak24xk6llwgiqw18r929mq1hw"; depends=[ggplot2 gridExtra KernSmooth plot3D rgl rpanel spatstat splancs]; }; - strandCet = derive2 { name="strandCet"; version="1.0"; sha256="019cacj0g9f6i8v03rq7qyph7f14d8n0qw0axvczijvnk99q602a"; depends=[boot corpcor MASS minpack_lm mvtnorm numDeriv]; }; + stpp = derive2 { name="stpp"; version="2.0-4"; sha256="0y6k33qaqycw01288w36q82iq73nlsc2vkkaiamr3v312ja6gbxg"; depends=[ggplot2 gridExtra KernSmooth plot3D rgl rpanel spatstat splancs]; }; strap = derive2 { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; }; strapgod = derive2 { name="strapgod"; version="0.0.4"; sha256="19v4g2wny21lb76crais5wxqkgq4hjh7gn961pr2w10kf4ll1vvx"; depends=[dplyr lifecycle rlang tibble tidyr]; }; strat = derive2 { name="strat"; version="0.1"; sha256="1axxrp750kjzcgxjdqfscjmryv1mkv4l23zk8k23z8l4ymhd2f5w"; depends=[Hmisc Rcpp RcppArmadillo]; }; stratEst = derive2 { name="stratEst"; version="0.1.2"; sha256="045wmvkv9jxmazvy0p2dkf3200vy5gf124cv78132ysrnh2vcd4v"; depends=[Rcpp RcppArmadillo]; }; - strataG = derive2 { name="strataG"; version="2.0.2"; sha256="1rf1xf07yb0dzasgig9sfm4i9ggdkjgy5iiysqgdapk3sxs26c8r"; depends=[adegenet ape apex copula data_table DT ggplot2 gridExtra Hmisc pegas phangorn RColorBrewer Rcpp shiny shinyFiles survival swfscMisc]; }; - stratamatch = derive2 { name="stratamatch"; version="0.1.3"; sha256="0mhdxaf2r5aziv9ws01qc15wwwwjjcq7zmlswar9h809vzgpavyi"; depends=[dplyr Hmisc magrittr rlang survival]; }; + strataG = derive2 { name="strataG"; version="2.4.905"; sha256="0mxhrnqqdgwmv2lqs2sgwa95lq5v4dl6vdqyasknbbfd8vddf393"; depends=[adegenet ape apex copula data_table dplyr DT genepop ggplot2 gridExtra Hmisc magrittr pegas phangorn purrr RColorBrewer Rcpp readr rlang rmetasim stringi swfscMisc tibble tidyr]; }; + stratamatch = derive2 { name="stratamatch"; version="0.1.5"; sha256="12yk738acsdgn8n7brgl2pnha7ii91mzrksihv2rgks820rdjxip"; depends=[dplyr Hmisc magrittr rlang survival]; }; stratbr = derive2 { name="stratbr"; version="1.2"; sha256="15vkymmc61yz9szhfhc5663hfyqvh499ahwhr9mv1lhv5bikk0kb"; depends=[Rglpk snowfall stratification]; }; strategicplayers = derive2 { name="strategicplayers"; version="1.0"; sha256="19vijrlzawd701vvk9ig7yhzbirh39dxxcwfz8ywwvxxiaky5x55"; depends=[sna]; }; stratification = derive2 { name="stratification"; version="2.2-6"; sha256="1jlks3g8wpqlpci6v0ryyv93agiabdiklmk6ij0pc5icrfiynbhw"; depends=[]; }; @@ -14100,62 +14281,59 @@ in with self; { straweib = derive2 { name="straweib"; version="1.1"; sha256="0hi59p580yg6rj72grq4jx6grv7lmpi2cimp0rbxhkjpj6i1hav9"; depends=[]; }; stray = derive2 { name="stray"; version="0.1.0"; sha256="1pqixk21z1h76672vx5yx9xs6bfacm51fcsgw3911al09zsid6aw"; depends=[colorspace FNN ggplot2 ks pcaPP]; }; stream = derive2 { name="stream"; version="1.3-1"; sha256="09f26m0fajaw77mb6pk9qkinzkhxpghagd1qhc3nkvcki3vwlcxa"; depends=[BH clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; }; - streamDepletr = derive2 { name="streamDepletr"; version="0.1.0"; sha256="0a8cihwjr5bzw5dw07x2kisi4qycwmxpj5hhv9b4pjvfghdwq4b8"; depends=[dplyr magrittr Rmpfr]; }; + streamDepletr = derive2 { name="streamDepletr"; version="0.1.1"; sha256="0x7663xz9az8lq852923hr7chaif1iml8drb6ljg83rg55plmwir"; depends=[dplyr magrittr Rmpfr sp]; }; streamMOA = derive2 { name="streamMOA"; version="1.2-2"; sha256="1zm7bcdsyazqksizir5rqibgw6w1bz85gdga0ncirh2s1z0dhi79"; depends=[rJava stream]; }; streamR = derive2 { name="streamR"; version="0.4.5"; sha256="1clx3b0j2515r1nmnl6ki7qw5n54q3x2jvqv3zrc00kq71mlj7ix"; depends=[ndjson RCurl rjson]; }; streambugs = derive2 { name="streambugs"; version="1.1"; sha256="1r0fnvpmj2z34j3w2nbdvxlw9jnz8y3x1xx9ih3vxna50ldrg2z2"; depends=[deSolve]; }; stressr = derive2 { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[lattice latticeExtra XML xts]; }; strex = derive2 { name="strex"; version="1.2.0"; sha256="1vshbq83szgig93ljhnwqwdsdskayszdzwk85n1n650clriv0b85"; depends=[checkmate glue magrittr matrixStats ore processx Rcpp rlang stringi stringr tibble]; }; strider = derive2 { name="strider"; version="1.2"; sha256="0kfwanz80ki41yr5m0xw4nbbqgzl6zfvwqx906bxywlqiqi47cb6"; depends=[BH Rcpp]; }; - stringb = derive2 { name="stringb"; version="0.1.13"; sha256="004bp75yhrgr480v9774kfq7z5l9z0761cnrwj4yk7fxygk89a1x"; depends=[backports]; }; + stringb = derive2 { name="stringb"; version="0.1.14"; sha256="0hhqqsc3fif14dy623h6y3gxjg8lhff9wlglkygccs5iyhdjyl12"; depends=[backports]; }; stringdist = derive2 { name="stringdist"; version="0.9.5.5"; sha256="1dqfakclzaf878x7mhwmqrcpcql2h9cv19fz5f3ygpajf3si5kqi"; depends=[]; }; stringformattr = derive2 { name="stringformattr"; version="0.1.2"; sha256="0x56k30clj5ajk0qg5sr8b9l0asz6ldivwr1ddy1vp1djliih1fx"; depends=[stringr]; }; - stringi = derive2 { name="stringi"; version="1.4.5"; sha256="0gdmdf4i3ik8rcs7af1vlsfnilcmw3z28jx4278rpq2asigps89k"; depends=[]; }; + stringi = derive2 { name="stringi"; version="1.4.6"; sha256="1mkgxzf000zdgbbbvg2vf4md4l501n5lfksffq8vdg6pbgd6fgv3"; depends=[]; }; stringr = derive2 { name="stringr"; version="1.4.0"; sha256="1p9ip7p87gbbg4s6d3d392svvzz2b5dqdq2c8ilgvn4s78nlsq47"; depends=[glue magrittr stringi]; }; strip = derive2 { name="strip"; version="1.0.0"; sha256="1j3kq6w8k66z45rpd1cgxplpnldzbyqklgs4bnbv906pyd8wk9ak"; depends=[rlist]; }; stripless = derive2 { name="stripless"; version="1.0-3"; sha256="08mdp7kq6r5bk77j09477d1dnn7iwa346pr24b5bqsxwnbknyrsr"; depends=[lattice]; }; striprtf = derive2 { name="striprtf"; version="0.5.2"; sha256="1ra6aalalig6drsj26z9s24lmb10zssagqrvgqqi4358zbm8gwcd"; depends=[magrittr Rcpp stringr]; }; strucchange = derive2 { name="strucchange"; version="1.5-2"; sha256="1y022363a4pp0mnji91sjh1qiyspkh09sybqwj03r9pmwrd7q93x"; depends=[sandwich zoo]; }; - structSSI = derive2 { name="structSSI"; version="1.1.1"; sha256="06rwmrgqc4qy4x0bhlshjdsjxfmp5fr9d1wjglhlb1gbp72fmkdv"; depends=[ggplot2 igraph multtest reshape2 rjson]; }; structree = derive2 { name="structree"; version="1.1.6"; sha256="0d3ww07grprp908i3h1xaz3jw92g0g0s3gjdnb63wl10yqqsq2vj"; depends=[lme4 mgcv penalized]; }; - strum = derive2 { name="strum"; version="0.6.2"; sha256="0f5cb7cfvqhmnv4sjfr58lns4fclmr8iyka595zddy9f6dv5rqp1"; depends=[graph MASS Matrix pedigree Rcpp RcppArmadillo Rgraphviz]; }; strvalidator = derive2 { name="strvalidator"; version="2.2.0"; sha256="0pfc6bj5sdik6a3qxsxshd6n3jp27kzap3hp6zlldknwybsavrl3"; depends=[data_table ggplot2 gridExtra gtable gWidgets2 gWidgets2tcltk MASS plyr scales]; }; stsm = derive2 { name="stsm"; version="1.9"; sha256="18ypmkd7l7m7qkahb0nqf8f1m8g4irxlw48v2ms0dq1bsnhbzx7j"; depends=[KFKSDS]; }; stsm_class = derive2 { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; }; stuart = derive2 { name="stuart"; version="0.8.0"; sha256="1hcb1jybra0cpibxc1k31nr6xciwd2chxjfdnir4kfzxn2bd2cxd"; depends=[]; }; stubthat = derive2 { name="stubthat"; version="1.2.1"; sha256="130naxzvswcyadwcgldvwnxxdxbfwx5vljac7901vn3ahjp75d8z"; depends=[testthat]; }; studentlife = derive2 { name="studentlife"; version="1.0.0"; sha256="1snrsaapjwvcifa91hg5xcbg7n70aqcdyyq69gg20168qg8abkws"; depends=[crayon dplyr ggplot2 jsonlite purrr R_utils readr skimr tibble tidyr visdat]; }; - styler = derive2 { name="styler"; version="1.2.0"; sha256="0rdbz60x8bymis6r6188ia1y0ip3nhf5y363i4cmakr618irjab9"; depends=[backports cli magrittr purrr rematch2 rlang rprojroot tibble withr xfun]; }; + studyStrap = derive2 { name="studyStrap"; version="1.0.0"; sha256="0lvzqnq40j0xn74qrj0pqhr8zz34mbhfd7dg8bnadscsvj5ffm4c"; depends=[caret CCA dplyr MatrixCorrelation nnls pls tibble tidyverse]; }; + styler = derive2 { name="styler"; version="1.3.2"; sha256="1waglhsy2c53qjgd2qhlzda3z0lbzbwx9fkrfhac41y6h91mgkrz"; depends=[backports cli magrittr purrr R_cache rematch2 rlang rprojroot tibble withr xfun]; }; stylest = derive2 { name="stylest"; version="0.1.0"; sha256="0dr7j9fh8kp6wsqql38s3rk596xl6m9nx0w1l5v25hv2bphidxzr"; depends=[corpus Matrix]; }; - stylo = derive2 { name="stylo"; version="0.7.1"; sha256="0l7z4d8q4kp9m0di0hch2zpbxmf7im4h0n95mrylqw93w768z76s"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; }; + stylo = derive2 { name="stylo"; version="0.7.2"; sha256="0s49das1f9svg3grw6faivfxc33y3679z7qiib68fm8ckma94mj9"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; }; suRtex = derive2 { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; }; subcopem2D = derive2 { name="subcopem2D"; version="1.3"; sha256="06wwd847g9pxd0z2a8494h3nc9s280a3s1510bir24m3z7w1pqf3"; depends=[]; }; subdetect = derive2 { name="subdetect"; version="1.1"; sha256="1bcc13avs5w9vmwyf71cnjd2kwmcavmzpwyv8gvsn61n7b4j8wlk"; depends=[]; }; subformula = derive2 { name="subformula"; version="0.1.0"; sha256="0nsl0nzj79z6aib12b5qijyab0yxlljfssiq9p8xgcgbxy4a7syy"; depends=[]; }; subgroup = derive2 { name="subgroup"; version="1.1"; sha256="1n3qw7vih1rngmp4fwjbs050ngby840frj28i8x7d7aa52ha2syf"; depends=[]; }; - subgroup_discovery = derive2 { name="subgroup.discovery"; version="0.2.1"; sha256="15yvkymcig19y9h8362izap0qbv1igmd0s0yxdgv0n0l1xgfsywj"; depends=[]; }; subgxe = derive2 { name="subgxe"; version="0.9.0"; sha256="0faww87ncylqixb640hc2axvn4i50d2r2ggngmd7s9wazbb6sd55"; depends=[]; }; sublime = derive2 { name="sublime"; version="1.3"; sha256="0455fppc68azxknxjvxci4kjpcj6c1jkp9adbxqrn3qnnywaj5v2"; depends=[AnalyzeFMRI downloader oro_nifti]; }; submax = derive2 { name="submax"; version="1.1.1"; sha256="0b9x55gqzw20smr3hx9izvyr0i8zv0h03hadn4c7ks7w8ga5i0kj"; depends=[mvtnorm sensitivityfull]; }; - subniche = derive2 { name="subniche"; version="0.9.7"; sha256="1jsdcaf6d38j7c0ppjyilj0jd2dbpdldw6w4prmsbmx8mh7lplww"; depends=[ade4]; }; - subplex = derive2 { name="subplex"; version="1.5-4"; sha256="10cbgbx1bgsax5z7gz6716g360xpq4mvq19cf4qqrxv02mmwz57z"; depends=[]; }; - subprocess = derive2 { name="subprocess"; version="0.8.3"; sha256="00720hj685449vhjqm9q6rrsn5jyxnxwq3pgxpbsnrhmwa697w89"; depends=[]; }; + subniche = derive2 { name="subniche"; version="1.2"; sha256="1qmryjgwgz43zym7f7p1bw0l8sxqivhksiv8a03r3y51d766gmkn"; depends=[ade4 polyclip siar wordcloud]; }; + subplex = derive2 { name="subplex"; version="1.6"; sha256="1yfbfjvpbhgky7vihw3f4jl41pxpqb39z4nc045d5z7z48bdl18d"; depends=[]; }; subrank = derive2 { name="subrank"; version="0.9.9.1"; sha256="19lgw7248jq6b34i17c7vw208wsvmppni7njswd02i9xdgyjn95z"; depends=[]; }; subsamp = derive2 { name="subsamp"; version="0.1.0"; sha256="1bfz2z2qy1war3id8qr1asygwvwxgf2hhlh075hr6bjdkxz0j0nd"; depends=[]; }; subscore = derive2 { name="subscore"; version="3.1"; sha256="1hb4ci62hxffz09sz0i27jfw7xn0pca87kiq6damz5zi418csa4v"; depends=[boot cocor CTT irtoys ltm sirt]; }; subscreen = derive2 { name="subscreen"; version="2.0.1"; sha256="0w1y60fzwf59ykcmk6yvdi4awqm8azpm0b288rjx1p0vzwl3i8hj"; depends=[bsplus colourpicker data_table dplyr DT jsonlite plyr randomForestSRC shiny shinyjs V8]; }; - subselect = derive2 { name="subselect"; version="0.14"; sha256="03sfnpj219a0ma92c2z953bh2y6s7w2c84lf2shnghmmxmg7jq9l"; depends=[corpcor ISwR MASS]; }; + subselect = derive2 { name="subselect"; version="0.15.2"; sha256="0ggpm5bq4ncx4302855s8x1nj0afjizmi81cg6b7xc7rvpirw0fq"; depends=[corpcor ISwR MASS]; }; subspace = derive2 { name="subspace"; version="1.0.4"; sha256="0p2j0lnwj3ym1v4xla6r97zjikb8alnibdc690xn9c0z21hmv43v"; depends=[colorspace ggvis rJava stringr]; }; subtee = derive2 { name="subtee"; version="0.3-5"; sha256="14pvfghsd17n9qkznik4vdalqfv5ykgqrhk2g33idl8chi9q7jjn"; depends=[ggplot2 MASS matrixStats survival]; }; subtype = derive2 { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; }; - suddengains = derive2 { name="suddengains"; version="0.4.0"; sha256="1606lj9x4qlkg5sm7i7xgp8bd2ivzngz0phc7bs06akwd7xbbnra"; depends=[dplyr ggplot2 ggrepel magrittr psych readr rlang stringr tibble tidyr]; }; + suddengains = derive2 { name="suddengains"; version="0.4.3"; sha256="1y6lan63q8jyyy37s4nq5kzrah63ycbwd1id7f6rb4rizb1sg0vn"; depends=[dplyr ggplot2 ggrepel magrittr psych readr rlang stringr tibble tidyr]; }; sudoku = derive2 { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; }; sudokuAlt = derive2 { name="sudokuAlt"; version="0.2-1"; sha256="1y3li64xqag2ia8dg7q49jmlb1awl92rz6xa9zsbf0s9jman9wj9"; depends=[magrittr]; }; sugarbag = derive2 { name="sugarbag"; version="0.1.2"; sha256="0aikbcdnwvrwvhcchjic9x1r4xh00z8hzq7dc93ykg4wlggs5rx7"; depends=[dplyr geosphere lwgeom purrr rlang rmapshaper sf tibble tidyr]; }; - sugrrants = derive2 { name="sugrrants"; version="0.2.4"; sha256="04qfa3falpkbdnjks5vd0izjpp5pmc3wf4bkv0ha89ya556306jv"; depends=[dplyr ggplot2 gtable lubridate rlang]; }; + sugrrants = derive2 { name="sugrrants"; version="0.2.7"; sha256="1clad4pafj3cf9ra48zf4bm6vvgb3ys7jg4m4qp5k3w4v81qdrnj"; depends=[dplyr ggplot2 gtable lubridate rlang]; }; sumFREGAT = derive2 { name="sumFREGAT"; version="1.1.0"; sha256="1ycdnf5ghrv3czi4lh5yc8n8690m3b8i85s46k7lya2k0rasvac4"; depends=[GBJ Matrix seqminer]; }; - summariser = derive2 { name="summariser"; version="0.1.0"; sha256="0a6wyb0r1i0cynld002q96ylr58jz76n5jqjz8gm6a3csjn9qss7"; depends=[dplyr ggplot2 lazyeval plotrix]; }; - summarytools = derive2 { name="summarytools"; version="0.9.4"; sha256="1n695baz56mg4f13xjjadfq0xalw5xsn6xicil0yap5hgi8fsr3a"; depends=[checkmate dplyr htmltools lubridate magick matrixStats pander pryr rapportools RCurl tibble tidyr]; }; + summariser = derive2 { name="summariser"; version="2.3.0"; sha256="0zliqy8dlcr2yy4ky8k68qn256xvpla8fcv7via19y40bmla37ic"; depends=[dplyr]; }; + summarytools = derive2 { name="summarytools"; version="0.9.6"; sha256="03pcb2ild1rb9f15yq8b68p9bg10z5wk2x7ahgyzkwdh5f81vbq2"; depends=[base64enc checkmate dplyr htmltools lubridate magick matrixStats pander pryr rapportools tibble tidyr]; }; sunburstR = derive2 { name="sunburstR"; version="2.1.3"; sha256="1zxy1zyi8sp26vicxjh7jx167qwnmvj1h6hpyj6398cbzcx7dvy7"; depends=[d3r dplyr htmltools htmlwidgets]; }; suncalc = derive2 { name="suncalc"; version="0.5.0"; sha256="1chkl297km313m89h9mbp7vnpz188fhzz5dn8x5cjkqy0mm6c0qc"; depends=[data_table lubridate magrittr]; }; sundialr = derive2 { name="sundialr"; version="0.1.3"; sha256="1bpqfxbg187g113nzsgk5pnfw9ldg9v7x52frrw8wjjs8b3c0v8z"; depends=[Rcpp]; }; @@ -14166,21 +14344,18 @@ in with self; { superbiclust = derive2 { name="superbiclust"; version="1.1"; sha256="1gzjbzbl8y1nzdfhyd6dlrwjq8mwj43a26qav84s1bdzwx6dra48"; depends=[biclust fabia Matrix]; }; superdiag = derive2 { name="superdiag"; version="1.1"; sha256="0pa3mv74riabpm7j4587zww2364fszzlw48ijj1apcgz8y6pyqbw"; depends=[boa coda]; }; superheat = derive2 { name="superheat"; version="0.1.0"; sha256="01v8s6px1k5fajlm6py3ksr1i853kwwlky1yryzhy3p1cxhwgg83"; depends=[dplyr ggdendro ggplot2 gtable magrittr plyr scales]; }; - superml = derive2 { name="superml"; version="0.5.0"; sha256="1h5jpafriw5drkmwyyk42fn33qq9qvc19wmi13mfnpkhc67xmlyp"; depends=[assertthat data_table doParallel Metrics R6]; }; + superml = derive2 { name="superml"; version="0.5.2"; sha256="1852s89yy4nv4aq1wi2ccj1yyvc0xq43ggxgjrr0ynjbvl209b7x"; depends=[assertthat BH data_table doParallel Metrics R6 Rcpp]; }; supernova = derive2 { name="supernova"; version="2.1.1"; sha256="1vjx0mfnqksgvcgn8hfvpx8j3q8791yifdsaqjqkhc7h56r9gcc5"; depends=[magrittr stringr]; }; superpc = derive2 { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; }; supervisedPRIM = derive2 { name="supervisedPRIM"; version="2.0.0"; sha256="1j5gsy119pvrhkkg048lyk6hjvn9x1bhmfy5g824gj3k1w5slrib"; depends=[prim]; }; suppdata = derive2 { name="suppdata"; version="1.1-1"; sha256="1sysd5w59y9hkm1ab8m9i1d976dv6cxchssc86s27bsibhsj2blc"; depends=[httr jsonlite rcrossref xml2]; }; - support = derive2 { name="support"; version="0.1.4"; sha256="1yahhb9l2f3129av4cj4q77q1s0nfszzd6z7dqkfpnjvvk8gzdq7"; depends=[BH MHadaptive randtoolbox Rcpp RcppArmadillo]; }; - support_BWS = derive2 { name="support.BWS"; version="0.3-0"; sha256="1mylc1jys8j56qciscy8ra4dv0ig0swh2gyf3wv5q00v85n1wf92"; depends=[]; }; + support_BWS = derive2 { name="support.BWS"; version="0.4-1"; sha256="0lfjcwgq74zmgrzybrxj4prvdy2qjlflxsqli7kslymfc653g5qa"; depends=[]; }; support_BWS2 = derive2 { name="support.BWS2"; version="0.3-0"; sha256="0k9yvg0n4lzsq43r53r9f70hq1q3zfljjafj9ds2p3c6qzgs9chi"; depends=[]; }; support_BWS3 = derive2 { name="support.BWS3"; version="0.2-0"; sha256="012kcvscz7m2is92r71731zc7xnp7pwyx30vivwjazrigp9bq1kl"; depends=[]; }; support_CEs = derive2 { name="support.CEs"; version="0.4-1"; sha256="1rbyl7v6m07dsp08kkk9020bh39rhx89q7d05rc5kxb6f7y66jyz"; depends=[DoE_base MASS RCurl simex XML]; }; supportInt = derive2 { name="supportInt"; version="1.1"; sha256="14fh75sds05c06xkcfbijd8my3sa9kpnczzh96xx0gwj1193yya9"; depends=[ProfileLikelihood]; }; sur = derive2 { name="sur"; version="1.0.2"; sha256="13mkn153x9sgkmj2vchma5qz1zggxw5vf28v8sfbg0n77f4wjc1p"; depends=[learnr]; }; sure = derive2 { name="sure"; version="0.2.0"; sha256="0gwr2j321i2vq98rin5b1m4sl123dm1nih1ghcmj0zd1wd6x5x54"; depends=[ggplot2 goftest gridExtra]; }; - surface = derive2 { name="surface"; version="0.4-1"; sha256="0z7fh09hjmxfmqzi588gjwqqlpj1a475aixrnvy911lkx3zfk146"; depends=[ape geiger MASS ouch]; }; - suropt = derive2 { name="suropt"; version="0.1.1"; sha256="0fm3vq3d0r4ahjgdmxm06yyakngssryzvdd1w0my34m0nvk6cbq4"; depends=[DiceKriging DiceOptim dplyr emoa GenSA ggplot2 GPareto lhs mco pso purrr rgenoud tibble tidyr]; }; surrosurv = derive2 { name="surrosurv"; version="1.1.25"; sha256="05s1skjp1vzwai2nfw65ff4q2qhbj596lhfvzd1gdrbs39r90hxh"; depends=[copula eha lme4 MASS Matrix msm mvmeta optextras optimx parfm SurvCorr survival]; }; surrosurvROC = derive2 { name="surrosurvROC"; version="0.1.0"; sha256="1dpqr9dqzckgvdfrb2ndxazra0lbp6db9wbjch4vig3kyz6nyw4y"; depends=[survival]; }; surv2sampleComp = derive2 { name="surv2sampleComp"; version="1.0-5"; sha256="0pk70q33il9clz0ikzx1cypg5ygnsqp5hgk67xczzbidksjzs4dn"; depends=[flexsurv plotrix survival]; }; @@ -14188,6 +14363,7 @@ in with self; { survAWKMT2 = derive2 { name="survAWKMT2"; version="1.0.0"; sha256="1cv39rf1ia4nwrri9d9izy6lxndnfwqy2vzrb9rrxga2qplxl79k"; depends=[survival]; }; survBootOutliers = derive2 { name="survBootOutliers"; version="1.0"; sha256="1gfh2n1kd1m4bpd1j7islm5ar1qmzycnmfpb8zl8ghv0z5rf5f09"; depends=[survival]; }; survC1 = derive2 { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afngip7pp6c9c7q0m6ww7h7i2vg505l7v"; depends=[survival]; }; + survCurve = derive2 { name="survCurve"; version="1.0"; sha256="0zspyxzn99ljiqp1111202714rqs4vg6j2rv66qv8ilxajvdxxas"; depends=[survival]; }; survELtest = derive2 { name="survELtest"; version="2.0.1"; sha256="03jnj88z45iw9v1628bz99608q2jwbqw6cfsvqal2jj4392fz428"; depends=[Iso nloptr plyr survival]; }; survHE = derive2 { name="survHE"; version="1.0.65"; sha256="0phhcn3gm5l2q8q4j7v8x7bsbk5a8ivqjvyxh45vgh5lrg6zpqg1"; depends=[BH flexsurv Rcpp RcppEigen rms rstan StanHeaders xlsx]; }; survIDINRI = derive2 { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survC1 survival]; }; @@ -14195,30 +14371,28 @@ in with self; { survJamda_data = derive2 { name="survJamda.data"; version="1.0.2"; sha256="0a010v2ar48i5m0jiqjvdyqm93ckfgfmcmym9a02h0rclnizd75r"; depends=[]; }; survMisc = derive2 { name="survMisc"; version="0.5.5"; sha256="00nvvl8gz4477ab24rd0xvfksm8msv8h021b9ld5c9cizc41n2bm"; depends=[data_table ggplot2 gridExtra km_ci KMsurv knitr survival xtable zoo]; }; survParamSim = derive2 { name="survParamSim"; version="0.1.0"; sha256="11rp49wrqw9z4cy2iwm0gn92hi88a0n3jy34b29yj5f9waz0andf"; depends=[dplyr forcats ggplot2 magrittr mvtnorm purrr rlang survival tibble tidyr]; }; - survPen = derive2 { name="survPen"; version="1.2.0"; sha256="0x030p6ihw769mjwjxzprmv3nbza0564mh1zfymwn8s94v86ybkl"; depends=[statmod]; }; + survPen = derive2 { name="survPen"; version="1.3.0"; sha256="1yvsns9md9g94932q79y0icwd5xvnjx4a5fs01vxi5mfqm1drsmm"; depends=[Rcpp RcppEigen statmod]; }; survPresmooth = derive2 { name="survPresmooth"; version="1.1-10"; sha256="0m1037v857g140lypck5zq2zf52rkdxzaqlj9kjn7h7lp6gif6ia"; depends=[]; }; survRM2 = derive2 { name="survRM2"; version="1.0-2"; sha256="0pvp65c1kkbkcci4l3cvq4a5krmv58jwb9abz5225ql6jyawzlsw"; depends=[survival]; }; survRM2adapt = derive2 { name="survRM2adapt"; version="1.0-1"; sha256="1r3jvjbc2sb7b00s95b3sdx4d99rmrnd573fx1n4914ydiggi9nn"; depends=[survival]; }; survSNP = derive2 { name="survSNP"; version="0.24"; sha256="0mzwcp8zfqvsiapa446si9qb6wyymnw5zj6acj6f2cfjpyi76k4w"; depends=[foreach lattice Rcpp survival xtable]; }; - surveillance = derive2 { name="surveillance"; version="1.17.3"; sha256="11hzjr85vpmrv11n3prhj9jgjfwvz1fg8xbfz9ql0rrrmycq4jii"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat xtable]; }; + surveillance = derive2 { name="surveillance"; version="1.18.0"; sha256="01iy6dlkd5w9191vr3agm3fgl3vbh2yaan5rsgn0ki741gf2zdag"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat xtable]; }; survexp_fr = derive2 { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; }; - survey = derive2 { name="survey"; version="3.37"; sha256="1f31dvh48gzzan13pdrwh84ls35x9116095i7mdrcbrhz809r8dy"; depends=[lattice Matrix minqa mitools numDeriv survival]; }; + survey = derive2 { name="survey"; version="4.0"; sha256="1q9x0s86s72gl43zj49gypg6jj2b78xjvxr4lmy5147s9h7z8lxh"; depends=[lattice Matrix minqa mitools numDeriv survival]; }; surveybootstrap = derive2 { name="surveybootstrap"; version="0.0.1"; sha256="13rp6gj1dgdzcjbi2403pldygp1dyqx8zj0r1nvyghpi06x5gpb7"; depends=[dplyr functional plyr Rcpp RcppArmadillo stringr]; }; - surveydata = derive2 { name="surveydata"; version="0.2.3"; sha256="0krwzfhjkkjxrpj1xzyaj400xdgbvczi86vjwx4r9g8ys90nvm09"; depends=[assertthat dplyr DT ggplot2 magrittr plyr purrr rlang scales stringr tidyr]; }; + surveydata = derive2 { name="surveydata"; version="0.2.5"; sha256="07k54282y69sl4z85v0in6v4f3dpk3i807n5ysyb54p6j1gy95al"; depends=[assertthat dplyr DT ggplot2 magrittr purrr rlang scales tidyr]; }; surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; }; surveyoutliers = derive2 { name="surveyoutliers"; version="0.1"; sha256="03nqw0zir3x57gg23hgsr2s99pv958kfsygqfwly96rvfdhr5p3v"; depends=[]; }; surveyplanning = derive2 { name="surveyplanning"; version="3.0"; sha256="1wnjizd5n5lyp8nw6srplrw7swrrivmbcphdvgaa9q1y8lkpq5w0"; depends=[data_table laeken]; }; - surveysd = derive2 { name="surveysd"; version="1.1.0"; sha256="0ab1f3z86idv3cy9nycqh4nnkcwachlm27pynlrn6g4jmcvcbj9b"; depends=[data_table dplyr ggplot2 laeken matrixStats Rcpp]; }; + surveysd = derive2 { name="surveysd"; version="1.2.0"; sha256="1w4cd52gdl65p16rza50n7pk2xfx3kxd1k16pr67j0pnyl7h2fqk"; depends=[data_table dplyr ggplot2 laeken matrixStats Rcpp]; }; survidm = derive2 { name="survidm"; version="1.2.0"; sha256="0dgcxhf8x1aavr4n4aqanfc23zd62dyk3h05sa04611h6n9l8j9c"; depends=[doParallel doRNG foreach KernSmooth np survival TPmsm]; }; - survivALL = derive2 { name="survivALL"; version="0.9.3"; sha256="0lnvs7b097sl21gvnfafdprzvh197p1q4nzzagkdf4xm1xw8pj0h"; depends=[cowplot desiR ggplot2 ggthemes survcomp survival viridis]; }; - survival = derive2 { name="survival"; version="3.1-8"; sha256="15fj4y8c107bwq22amx88r5hw7qndlcbr9sapzrpkpr7iqz3kkyf"; depends=[Matrix]; }; - survivalAnalysis = derive2 { name="survivalAnalysis"; version="0.1.1"; sha256="0y4hgskc36jrriy6577bnkvg1gmxs0x3pxiv3lma38a9lj71ivwf"; depends=[cowplot dplyr forcats ggplot2 gridExtra magrittr purrr rlang scales stringr survival survminer tibble tidyr tidytidbits]; }; + survival = derive2 { name="survival"; version="3.1-12"; sha256="07zj3gpwncw89hbiwjb6ih9axv5zwdqnbgz9yw9xzws6nrpdcbmn"; depends=[Matrix]; }; + survivalAnalysis = derive2 { name="survivalAnalysis"; version="0.1.2"; sha256="17pywrb10ql4li2jb3y3j0wy0x7wicq1x395a6igxy257kmblw18"; depends=[cowplot dplyr forcats ggplot2 gridExtra magrittr purrr rlang scales stringr survival survminer tibble tidyr tidytidbits]; }; survivalMPL = derive2 { name="survivalMPL"; version="0.2"; sha256="05bfa9fx841kh9g2jcs1dimsxkjnf4bxgamcnjpisx3a644c1gkn"; depends=[MASS survival]; }; survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; }; survivalsvm = derive2 { name="survivalsvm"; version="0.0.5"; sha256="1b4hrdrqq1z0kfn8vpdwg54388m25df2s6w9i574x3mkxkmkjkga"; depends=[Hmisc kernlab Matrix pracma quadprog survival]; }; survminer = derive2 { name="survminer"; version="0.4.6"; sha256="0c5q5pp78wsv00rrbhbfl1yrdng8n7z1mgqlrqzgb0pswlvv2w3z"; depends=[broom dplyr ggplot2 ggpubr gridExtra magrittr maxstat purrr scales survival survMisc tibble tidyr]; }; survsim = derive2 { name="survsim"; version="1.1.5"; sha256="0194w1h3v4p546wibp3xyhy2r84w3p9r6ggzhlf11v8467mjy0l9"; depends=[eha statmod]; }; - survsup = derive2 { name="survsup"; version="0.0.2"; sha256="0q41hn8iqib2w6gkz2mll4h46vr9ca25jrg0g5jr9wgrzsnf5jci"; depends=[broom colorspace dplyr ggplot2 gridExtra survival]; }; survtmle = derive2 { name="survtmle"; version="1.1.1"; sha256="1l13rvwq4915ij2a55fxdj3b3wkgjca1fbqzcgkjlpzkcn97k1nj"; depends=[dplyr ggplot2 ggsci Matrix plyr speedglm stringr SuperLearner tidyr]; }; survutils = derive2 { name="survutils"; version="1.0.2"; sha256="1ws4r5chz0cbf6vjmlj2xv9hmr968xyw8dc5g3j937xpbz40i75h"; depends=[broom dplyr ggplot2 glue lazyeval magrittr purrr survC1 survival]; }; survxai = derive2 { name="survxai"; version="0.2.0"; sha256="09sk7i0bsk5ql8dibqyykyv95i945bf43xpr4gv22w73zwc0n8hh"; depends=[breakDown ggplot2 pec prodlim scales survival survminer]; }; @@ -14233,7 +14407,7 @@ in with self; { svSocket = derive2 { name="svSocket"; version="0.9-57"; sha256="0id93b500iybza6sbn60ybm91mkh5cjpvhypqs4f3dv13m6blb9j"; depends=[svMisc]; }; svSweave = derive2 { name="svSweave"; version="0.9-8"; sha256="0zkng8lwdpjdbic9f6jnk2ndxbch2kjyz71ds1bksvd3kmk03lks"; depends=[knitr]; }; svTools = derive2 { name="svTools"; version="0.9-5"; sha256="040wr8cr2p35x6pr515bprmsw8ysajx4df5f2njz3ily61xf9szi"; depends=[codetools svMisc]; }; - svUnit = derive2 { name="svUnit"; version="0.7-12"; sha256="16iiryj3v34zbnk1x05g30paza7al1frqx52fkw8ka61icizsrf5"; depends=[]; }; + svUnit = derive2 { name="svUnit"; version="1.0.3"; sha256="0awz9ks0y1n98y9nq6rq65yj7y22z5q4a5w5qhkszkgc9669q1dw"; depends=[]; }; svWidgets = derive2 { name="svWidgets"; version="0.9-45"; sha256="08cpsy4abypjnv33arsgxk5i0gpdvdzj60wa1b22ca1n7d35mc80"; depends=[svMisc]; }; svapls = derive2 { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22zmsnachsydr5vlz38s664d2lplbg"; depends=[class pls]; }; svars = derive2 { name="svars"; version="1.3.3"; sha256="1npjnxbxpidcpifgh2k6xs7drhc075cnzd7mb7wnxi9yz0v10fmr"; depends=[clue copula DEoptim expm ggplot2 pbapply Rcpp RcppArmadillo reshape2 steadyICA strucchange vars zoo]; }; @@ -14241,14 +14415,13 @@ in with self; { svd = derive2 { name="svd"; version="0.5"; sha256="18bi42pgml9i8jflfk29ws0bfblkj3f69z9p9mkd0m8kcx4d8hnh"; depends=[]; }; svdvisual = derive2 { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; }; svenssonm = derive2 { name="svenssonm"; version="0.1.0"; sha256="0pvay9vfrcafaq270pq6glp2b74zdfgldksl13cwdb0wk7qx7731"; depends=[]; }; - svgPanZoom = derive2 { name="svgPanZoom"; version="0.3.3"; sha256="09gfa2943bvmjpnhnc2nr85wddkv662k30pxsqvvvq1va64rzpkc"; depends=[htmlwidgets]; }; + svgPanZoom = derive2 { name="svgPanZoom"; version="0.3.4"; sha256="1iglgwbyxf5q4716h9ba2cfmxh1qq16zwy54krnawg4580v8ydh2"; depends=[htmlwidgets]; }; svgViewR = derive2 { name="svgViewR"; version="1.4"; sha256="00nm2sdgil2kw6f19sy03m8452zia47bv1bkynxw3q7vck3vb3vx"; depends=[Rcpp rjson Rook]; }; - svglite = derive2 { name="svglite"; version="1.2.2"; sha256="1gwv51wqp6pgm2f9gavsiq65njs77fr49n8y6y9ax60k3a4vvg14"; depends=[BH gdtools Rcpp]; }; - svmadmm = derive2 { name="svmadmm"; version="0.3"; sha256="15ccda1r9cc6v30j37i052rdwxgw0wg37hwyn2vp8c7bkr0ybgkm"; depends=[kernlab]; }; + svglite = derive2 { name="svglite"; version="1.2.3"; sha256="1zivykbi1pxdxhrkc1if1ihdn5p27j0nai2q0abca1dwry3wg2yl"; depends=[BH gdtools Rcpp]; }; svmpath = derive2 { name="svmpath"; version="0.955"; sha256="02j5xs4gg8k16imnwk6aram168cv1dqdrky3bszyc98l7xd0nlrj"; depends=[]; }; svmplus = derive2 { name="svmplus"; version="1.0.1"; sha256="08cfywrbaxyacqd3l75lysb23ahqbs80959iqkjbb125aafmhvni"; depends=[MASS Matrix quadprog]; }; svrpath = derive2 { name="svrpath"; version="0.1.2"; sha256="18h40555jmqpbsnhlwkvc5fl7d0r2bgscdv8amjvhjxmx9y952a2"; depends=[quadprog svmpath]; }; - svs = derive2 { name="svs"; version="1.1.0"; sha256="0575msaxg04ck76mbr815m29y895qvg8b9qg4y0ggv6b1lvwp5p6"; depends=[gtools]; }; + svs = derive2 { name="svs"; version="2.0.0"; sha256="1kcrdgg0pw5ypjgl59wn66c3ipinamcnd4752hjnfrf62pkc6fgw"; depends=[gtools Matrix]; }; svyPVpack = derive2 { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; }; svydiags = derive2 { name="svydiags"; version="0.3"; sha256="0xgizswdqs8cjac200sqv3ygvrnbcy74h92kgx4r6nv1fhlcljl3"; depends=[MASS Matrix survey]; }; swCRTdesign = derive2 { name="swCRTdesign"; version="3.1"; sha256="18ln02fnxkpjqi8a36wr2qr427hxrghkhfjx0384grmdg1mmkbf5"; depends=[]; }; @@ -14259,23 +14432,23 @@ in with self; { swatches = derive2 { name="swatches"; version="0.5.0"; sha256="1kivscgka8gn44rjj0s5sjan1s04znnyn0nd37a74zaik0hm8zs0"; depends=[colorspace httr pack stringr xml2]; }; swdft = derive2 { name="swdft"; version="1.0.0"; sha256="0529rw8nsl48hwiy741alvrzg5d5q1nhnjshrsfwchm5kdv0igva"; depends=[]; }; sweep = derive2 { name="sweep"; version="0.2.2"; sha256="12mbkkinvv11s96bn61vww79xjivjshhg9m3lmza5y0512zm89k5"; depends=[broom dplyr forecast lazyeval lubridate tibble tidyr timetk]; }; - sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.1"; sha256="014zbp6a66gv7b0f2gmzvifllz266zrc14ihawksvyp1mcxz2ipg"; depends=[lubridate stringr]; }; + sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.2"; sha256="0zzjvwd60w9b5ybsb72aqa42sx6al4ymr591j3zryxgpl6rms5rh"; depends=[checkmate lubridate stringr]; }; swephR = derive2 { name="swephR"; version="0.3.0"; sha256="0fk5wih3i5vpkcc9y1n30xwc1hyqgfgnad9jkdgdx0m31pn1y9j5"; depends=[Rcpp]; }; - swfscMisc = derive2 { name="swfscMisc"; version="1.2"; sha256="08p2crsx8zi6qprs14mhdyq9x5sjlp3a46c1zzvp6741an4fy640"; depends=[ggplot2 mapdata maps reshape2 spatstat]; }; + swfscMisc = derive2 { name="swfscMisc"; version="1.3"; sha256="03wzjricpgf55yfwmj4vjcvz59yxcipfp4bsjddzw65glasa9d1s"; depends=[dplyr ggplot2 ggrepel magrittr mapdata maps reshape2 rlang spatstat tibble tidyr]; }; swgee = derive2 { name="swgee"; version="1.4"; sha256="1a6zr4nkpj52b0rk01qbwzi8y0c798wlxzw69wyyv576k148rgfq"; depends=[gee geepack mvtnorm]; }; swirl = derive2 { name="swirl"; version="2.4.5"; sha256="0cqyn2rnqfkb2wza4zdr1kcms5l0igbq79xh5i7765agdday2z9w"; depends=[digest httr RCurl stringr testthat yaml]; }; swirlify = derive2 { name="swirlify"; version="0.5.3"; sha256="1bpg6yz2adgspjlwsf2q83j1bq0iyvp9938smgc41861nsclngwr"; depends=[base64enc readr rmarkdown shiny shinyAce stringr swirl whisker yaml]; }; swissMrP = derive2 { name="swissMrP"; version="0.62"; sha256="1vy6h6c4v49zlsli77ilj4df8cfh67rqmki71v6j1aqw6kf3b649"; depends=[arm blme lme4 maptools sp]; }; - swissdd = derive2 { name="swissdd"; version="1.0.2"; sha256="13qzkp73djvdd672na1bjj23yldslyg9z840dblsz0qdkp53d4qz"; depends=[curl dplyr jsonlite magrittr purrr tibble tidyr]; }; - swissparl = derive2 { name="swissparl"; version="0.2.0"; sha256="1blpaj8mbhnyb4bajh9h91h7pc2zz8gmzdag5faqfqr4rfnk0582"; depends=[crayon dplyr ggplot2 httr jsonlite lubridate magrittr purrr stringr tibble tidyr]; }; + swissparl = derive2 { name="swissparl"; version="0.2.1"; sha256="0181ls1gw68kfz3yqf8m2nwhah87i9m164rlbycy1kxq9adi93cs"; depends=[crayon dplyr ggplot2 httr jsonlite lubridate magrittr purrr stringr tibble tidyr]; }; switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; }; - switchr = derive2 { name="switchr"; version="0.14.2"; sha256="1a1yq12h5km42gp7gki7p215rnbwrs87xa2p0qndwqpvnaxgv6a4"; depends=[RCurl RJSONIO]; }; - swmmr = derive2 { name="swmmr"; version="0.9.0"; sha256="1iv9dmgpjfl7yzjlph42bamnwchjdic6n0lgs33z0incvgsv3m3g"; depends=[dplyr purrr Rcpp readr tibble tidyr xts zoo]; }; + switchr = derive2 { name="switchr"; version="0.14.3"; sha256="1aw9n6hh62qvggl1flpxfyqgp4sj6vj1mlfqfhx923hl53c7cr31"; depends=[RCurl RJSONIO]; }; + swmmr = derive2 { name="swmmr"; version="0.9.1"; sha256="140sx0y00ngxsyn7n1l0aay7vk2jk8hf81aiwh46k761cpc5y28d"; depends=[dplyr purrr Rcpp readr tibble tidyr xts zoo]; }; sybil = derive2 { name="sybil"; version="2.1.5"; sha256="1biy1cc87g7adfglzp2mq6ca5sfp1ljq087id0xqdmrwz0650maq"; depends=[lattice Matrix]; }; sybilDynFBA = derive2 { name="sybilDynFBA"; version="1.0.1"; sha256="1zyhvlzkcwnq3sh6gvi0v1crq94mr16bc5jnh0g9c8rbdl4v8r4x"; depends=[sybil]; }; + sybilSBML = derive2 { name="sybilSBML"; version="3.1.2"; sha256="1qvv6fr0zslfwlzx1zbd7rszh5x7zv3svvqrr8896inxh122mhzs"; depends=[Matrix sybil]; }; sybilccFBA = derive2 { name="sybilccFBA"; version="3.0.1"; sha256="1y94d6ajf0l492nrd8wsz3b6x724zcyhipasgyx65nx3sgha6yp8"; depends=[Matrix sybil]; }; sybilcycleFreeFlux = derive2 { name="sybilcycleFreeFlux"; version="2.0.1"; sha256="0j1qmf5apb6k0ga5ki7wxbbq1k8x7kv8wcnf85zcx0117fjkxfng"; depends=[MASS Matrix sybil]; }; - sylcount = derive2 { name="sylcount"; version="0.2-1"; sha256="0a5762cy2h4vhy35z88l9i4ny30zpj5bvmmw3n5xzz275hsd3piw"; depends=[]; }; + sylcount = derive2 { name="sylcount"; version="0.2-2"; sha256="0cncj0nszfw98i94sb3sqdzdxdqjs523kmbqxz6cvvph1s77aama"; depends=[]; }; syllabifyr = derive2 { name="syllabifyr"; version="0.1.0"; sha256="1pd5zjgcmpxg7xqhcljxck80pjs84ihhkr5bl4i8h2mc6xqmy1kf"; depends=[dplyr purrr stringr tibble tidyr]; }; sylly = derive2 { name="sylly"; version="0.1-5"; sha256="01c7mpsk32kcsjyzzv52bn8bj28lqbmyhhfa1cwhphva5c5nkqwx"; depends=[]; }; sylly_en = derive2 { name="sylly.en"; version="0.1-3"; sha256="0jw48qin172vv7skcpvcpi9wzgav5l9afzb09hhgcxvivbz6dl93"; depends=[sylly]; }; @@ -14283,49 +14456,46 @@ in with self; { symDMatrix = derive2 { name="symDMatrix"; version="2.0.2"; sha256="1lf0yhid47107c2vnr4g7xz4hrjb2cgr5zpgik4xf5gypli6xh6x"; depends=[bit ff LinkedMatrix]; }; symbolicDA = derive2 { name="symbolicDA"; version="0.6-2"; sha256="0fd36dndzs0n0xwz38px5182gc6ng174n433rgch1s1g6bh8dn4s"; depends=[ade4 cluster clusterSim e1071 rgl RSDA shapes XML]; }; symbols = derive2 { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; }; - symmetry = derive2 { name="symmetry"; version="0.1.1"; sha256="1f4l058sdrdg7jl1rklyd0a3ik9lnnsf2imgaymr56iaxn7y0m79"; depends=[Rcpp RcppArmadillo Rdpack]; }; - symmoments = derive2 { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[combinat cubature multipol mvtnorm]; }; + symmetry = derive2 { name="symmetry"; version="0.2.1"; sha256="041vxbva5kaywpn4y7kjwlc2cj56iyvd51iv5198dv280jfcnjv9"; depends=[Rcpp RcppArmadillo Rdpack]; }; + symmoments = derive2 { name="symmoments"; version="1.2.1"; sha256="0wl68nsvydfhlbyaj54alj31dphqigyp1s4h2xdapxj4zvwf2sws"; depends=[combinat cubature multipol mvtnorm]; }; syn = derive2 { name="syn"; version="0.1.0"; sha256="12apdjbsazwfxizsw4dj0y3vkdjmki8dzpyv3bi9gnhpysdd1jzx"; depends=[]; }; synRNASeqNet = derive2 { name="synRNASeqNet"; version="1.0"; sha256="05ncwbv8kvvhqqrxa8qq7s0jc6krs5a56ph04z50iwgd91rzyi7x"; depends=[GenKern igraph KernSmooth parmigene]; }; - synbreed = derive2 { name="synbreed"; version="0.12-9"; sha256="0h85z9bhzgsr783qx3zjqyi461a0q52wbqifwm3gc1kapl5irxhd"; depends=[abind BGLR doBy doParallel foreach igraph lattice LDheatmap MASS qtl regress]; }; - synbreedData = derive2 { name="synbreedData"; version="1.5"; sha256="16wv9r7p0n8726qv0jlizmkvnrqwjj1q4xaxvfmj9611rm47vckx"; depends=[]; }; synchronicity = derive2 { name="synchronicity"; version="1.3.5"; sha256="1kgsk64aifjm3mfj102y3va7x1abypq2zi0cqbnjhl8fqyzp69hx"; depends=[BH bigmemory_sri Rcpp uuid]; }; synchrony = derive2 { name="synchrony"; version="0.3.8"; sha256="1zpxg4dkxnvafiyp0j00wig5ymj10bzfg2376x56rzpnabhg57hi"; depends=[]; }; synlik = derive2 { name="synlik"; version="0.1.2"; sha256="1pscfqg5x7wpq3vp1i7fy29dwa7cw5g3kzxinanwrwbcznv9nyms"; depends=[Matrix Rcpp RcppArmadillo]; }; - synoptReg = derive2 { name="synoptReg"; version="0.2.2"; sha256="0s3m7basw71gliy22c599ysj5s068ki20i8031yrrbdhif8zhbqg"; depends=[ncdf4 raster zoo]; }; + synoptReg = derive2 { name="synoptReg"; version="1.0.1"; sha256="16ncbxdyqyd0jrsshllv14pgdlkli1ymwjkh4sijnhzk9yhrbb28"; depends=[dplyr ggplot2 lubridate magrittr metR raster RNCEP stringr tibble tidyr]; }; syntaxr = derive2 { name="syntaxr"; version="0.8.0"; sha256="1iik9b3x9jx7w31j7hyi3sixg30l5a6w40svhqj1xlchsk60yykn"; depends=[magrittr]; }; - synthACS = derive2 { name="synthACS"; version="1.5.3"; sha256="1fpaqjxyrgmzsxpd2wqpabpzj6fsp88wac0kaf21nc9k5b8lf0gk"; depends=[acs data_table Rcpp]; }; + synthACS = derive2 { name="synthACS"; version="1.5.6"; sha256="02pxvsrg15xsys7iwp1np93yzxr6b00i8y7z0cxq29605n3p6sba"; depends=[acs data_table Rcpp]; }; synthpop = derive2 { name="synthpop"; version="1.5-1"; sha256="0cd9g0aa4598l3gyqpywalmkmvibhqkxhkm2qkln11rkwv12lcyv"; depends=[classInt foreign ggplot2 lattice MASS mipfp nnet party plyr polspline proto randomForest rpart]; }; sys = derive2 { name="sys"; version="3.3"; sha256="14wvy46i2iz9jn7lj3cvifmps932s3395wq681hniva0f8m7q8d6"; depends=[]; }; sysfonts = derive2 { name="sysfonts"; version="0.8"; sha256="0wng902plryf2d8fc7k7m3jx11acz51kb2d91cqbyhq7xpk06z43"; depends=[]; }; sysid = derive2 { name="sysid"; version="1.0.4"; sha256="0fr9gf5yjin3zvz850z4r4pqc1r4mwx8d46sl64i4csdm9qnqagy"; depends=[bitops ggplot2 polynom reshape2 signal tframe zoo]; }; syslognet = derive2 { name="syslognet"; version="0.1.2.1"; sha256="0nwni2mn7w43pfasqa2dwy1l6r0ymlkwlsyd5q47fajdr8v1ir0q"; depends=[]; }; systemfit = derive2 { name="systemfit"; version="1.1-24"; sha256="180ah91i98gjswpbkkdjgnc2c9rz3pl5bw035iks92nd5vl6w5wz"; depends=[car lmtest MASS Matrix sandwich]; }; - systemfonts = derive2 { name="systemfonts"; version="0.1.1"; sha256="0m0ljid683xcam2f14x7k2zv1yx4npac38a3gfv11vhxfbnpgp0z"; depends=[]; }; + systemfonts = derive2 { name="systemfonts"; version="0.2.0"; sha256="1aba07djvxqdmnsdbwvzcsbm2fddnhrssa54xyrlviiwsv2c1qsd"; depends=[]; }; systemicrisk = derive2 { name="systemicrisk"; version="0.4.2"; sha256="021ypw9fag5kmk2q041pj2jfzgfg640yda7wvh0yzdmg73p6fvsw"; depends=[lpSolve Rcpp]; }; syt = derive2 { name="syt"; version="0.1.0"; sha256="1qagd67wznyc6sfvs22lw2lwnwap1hlpf92i0ck5aif514ysi886"; depends=[Matrix partitions]; }; syuzhet = derive2 { name="syuzhet"; version="1.0.4"; sha256="0wf4rls7v7h7zkq2k550d16aqvaij27iim85cwif7dkbinajfngi"; depends=[dplyr dtt NLP textshape tidyr zoo]; }; tRophicPosition = derive2 { name="tRophicPosition"; version="0.7.7"; sha256="1j06rc5s6jpz8i116m98ygc75sx6lk8jd9gw6fb8q342mbbmqh8h"; depends=[coda data_table ggplot2 gridExtra hdrcde MCMCglmm plyr rjags]; }; - taRifx = derive2 { name="taRifx"; version="1.0.6.1"; sha256="1qnp2562irhb516jfapmpg4260172ckc8jc3vxfkjsj7dnr35j6l"; depends=[plyr reshape2]; }; + taRifx = derive2 { name="taRifx"; version="1.0.6.2"; sha256="05cvjsi65fvy9hg2v3fldzwn1yd2kfirl3ffg9yfajm903dk3l49"; depends=[plyr reshape2]; }; tab = derive2 { name="tab"; version="4.1.1"; sha256="0ds8n6gncidb66in7hlqkcmil5yfsf7ihqvmls789hrm2iz9xlfm"; depends=[dplyr gee knitr MASS survey survival xtable]; }; taber = derive2 { name="taber"; version="0.1.0"; sha256="07a18kn65b4cxxf1z568n7adp6y3qx96nrff3a3714x241sd5p6i"; depends=[dplyr magrittr]; }; - tabit = derive2 { name="tabit"; version="0.1.1"; sha256="0fk670ws7df77sxf89kp8h608z5400gaia79zj3w9jv3jmfyj1i0"; depends=[]; }; + tabit = derive2 { name="tabit"; version="0.2.1"; sha256="0jy95jpbzj4rgaxmm6ki9wr0cl1w13pygq3yavdccjr82mayfpvc"; depends=[]; }; tablaxlsx = derive2 { name="tablaxlsx"; version="1.2.2"; sha256="1q7ap1dmymf3aj5g860794jfn9zrn3qiwwcdzl95lsbpkhgyspmz"; depends=[openxlsx]; }; table_express = derive2 { name="table.express"; version="0.3.1"; sha256="00f5xi2dkx1h0mv8ld3ds15w30d9vgvmjrldg43z7zskprshqsxx"; depends=[data_table dplyr magrittr R6 rlang tidyselect]; }; - table1 = derive2 { name="table1"; version="1.1"; sha256="01r6zlhv3d0ggniv6aaszmzqbappy9zycayiwwlknbwrgiwkp58z"; depends=[Formula htmltools knitr]; }; + table1 = derive2 { name="table1"; version="1.2"; sha256="1ggf3qkm7zwfdn1y1mhf8ydbg41aiy26p6g9iskryrxg7hgs3ynb"; depends=[Formula htmltools knitr yaml]; }; table1xls = derive2 { name="table1xls"; version="0.4.0"; sha256="0ixbshbp9hkcg12hj32vgb5bp0pj4rbc3i6g1xdg2zhqp7zanics"; depends=[XLConnect]; }; tableHTML = derive2 { name="tableHTML"; version="2.0.0"; sha256="19sa5sda4v5dr449ip9z9ah5hdph9q6vb6zbs93jn4rpkvyijny3"; depends=[htmltools jpeg magrittr png shiny webshot]; }; tableMatrix = derive2 { name="tableMatrix"; version="0.82.0"; sha256="1sskijhbqakamrk2rv7v5zpjsdi8jw0jl2z96l0vhsvsiq0cz1c8"; depends=[data_table]; }; - tableone = derive2 { name="tableone"; version="0.10.0"; sha256="166amb76acrw3dgvllc46kgblp82f46zvlgig2prg92xnid1zaws"; depends=[e1071 gmodels labelled lmerTest MASS nlme survey zoo]; }; + tableone = derive2 { name="tableone"; version="0.11.1"; sha256="15cpi3255234hc51jcvjijx3yiq086ggbj087bh5hw227gzc3sw9"; depends=[e1071 gmodels labelled lmerTest MASS nlme survey zoo]; }; tableplot = derive2 { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; }; tablerDash = derive2 { name="tablerDash"; version="0.1.0"; sha256="1mnp6lxa7d669r325aynq1n3f35r9sy4v1fvdh4cymbf33s8mkmm"; depends=[htmltools knitr shiny]; }; tables = derive2 { name="tables"; version="0.8.8"; sha256="1cgfwrnmgi1jhv9kj918mv0ib75hvprqjg0nb7ppih73kqpaw5m2"; depends=[Hmisc knitr]; }; - tableschema_r = derive2 { name="tableschema.r"; version="1.1.0"; sha256="0ny683p9kaidj5bayz77hyvsaqg3jk87pb95271znk8hzhl2jlcj"; depends=[config future httr iterators jsonlite jsonvalidate lubridate purrr R6 RCurl rlist stringr urltools]; }; - tabplot = derive2 { name="tabplot"; version="1.3-3"; sha256="0gv27igixcy5vqrk71ckyhlk4yhcprm8r2a2l0lgmn4rbsm20c6h"; depends=[bit ff ffbase]; }; - tabr = derive2 { name="tabr"; version="0.4.0"; sha256="08f9v7mk9b9x2nk8n3nqgwikkay6ip14awljvgjl30nifbbswxsv"; depends=[crayon dplyr ggplot2 magrittr purrr tibble tidyr]; }; + tableschema_r = derive2 { name="tableschema.r"; version="1.1.1"; sha256="14cnbijxdhf7qbsiqbk8p516mfh9bgdbcg32vn5pycsp30k78b2h"; depends=[config future httr iterators jsonlite jsonvalidate lubridate purrr R6 RCurl rlist stringr urltools]; }; + tabr = derive2 { name="tabr"; version="0.4.2"; sha256="0c3814dnz1vzgbmm3vp0icnzyaqs1kimqnsp4n8id7zn8vlmp21p"; depends=[crayon dplyr ggplot2 magrittr purrr tibble tidyr]; }; tabuSearch = derive2 { name="tabuSearch"; version="1.1.1"; sha256="0396a8hla508na1hmyyhfbl8w10dbg810cln2xyhhvxi7rr223dj"; depends=[]; }; - tabula = derive2 { name="tabula"; version="1.5.0"; sha256="0ijamh5lhgaa202ka1kp78i583616rc9w4zay8gx7c3gkjppfpdx"; depends=[arkhe ca ggplot2 rlang]; }; - tabularaster = derive2 { name="tabularaster"; version="0.5.0"; sha256="0cqax6hq0pbxmqls3cs21cc86662wdzjyx4lkxw42dbw4v13f728"; depends=[dplyr fasterize gibble magrittr raster rlang sp spatstat spbabel spex tibble viridis]; }; + tabula = derive2 { name="tabula"; version="1.5.1"; sha256="0mm08rgqdhc3b68xh9hk4rw4i69gb2c45679zni9kkv48pbxvrh7"; depends=[arkhe ca ggplot2 rlang]; }; + tabularaster = derive2 { name="tabularaster"; version="0.6.0"; sha256="0yaadc4774jwrp38ri6mfnw2x94yhb9kq50bf25naw05g5z6b1d0"; depends=[dplyr fasterize gibble magrittr raster rlang silicate spatstat tibble]; }; tabulizer = derive2 { name="tabulizer"; version="0.2.2"; sha256="0zd5cfqwgirqchw1mvziscxvzl8pb1y6rbfywkn9i9pxfydkm5vi"; depends=[png rJava tabulizerjars]; }; tabulizerjars = derive2 { name="tabulizerjars"; version="1.0.1"; sha256="005n2gyzzmq8h0mpj8xs6ri6llzwag7nqzpm4vnzp81vwy8kmf92"; depends=[rJava]; }; tabulog = derive2 { name="tabulog"; version="0.1.1"; sha256="0n6qjd7kmvxx5na71f358pw3bbwa69vh8qjkrs5mkb3izxabcq67"; depends=[yaml]; }; @@ -14337,31 +14507,30 @@ in with self; { tailr = derive2 { name="tailr"; version="0.1.3"; sha256="0agm83zwj6f3bpicbn2pcwira05v2pbv0g7myc1x06jxbw1qbfwp"; depends=[foolbox glue rlang]; }; taipan = derive2 { name="taipan"; version="0.1.2"; sha256="192sy5pgq74vs31p7jfn6svdzf9mk9ybppzhp1rlki1bagmm5f1r"; depends=[shiny]; }; takos = derive2 { name="takos"; version="0.1.0"; sha256="0a26jmxccpyk36sah9nz7pqpkc1rd9kbwrvwh0r0zp7lwvxbjb8w"; depends=[baseline broom colorRamps data_table devEMF MASS minpack_lm pracma segmented sfsmisc smoother]; }; - tanaka = derive2 { name="tanaka"; version="0.1.1"; sha256="0d7kqgl4kdmgvc8an0h1jqh8h4qw7mgdqmghxs49ssw3db6ir6lh"; depends=[isoband lwgeom raster sf]; }; + tanaka = derive2 { name="tanaka"; version="0.1.3"; sha256="1x5czib9vqpxbr61if1rnlyrld6gx2zf22jz5rcagb8x3bxmd5g6"; depends=[isoband raster sf]; }; tangles = derive2 { name="tangles"; version="0.8.1"; sha256="06a5hn5hkvgr6pcjz3n0vi1zwmv00wypi5f62agqh8mas80v44vh"; depends=[digest raster sp]; }; - tangram = derive2 { name="tangram"; version="0.4"; sha256="1yj5vwc8jkiic4zjag9k7w3j6dibqw5zsi78q6gssshsi9z0zbgy"; depends=[base64enc digest htmltools magrittr R6 stringi stringr]; }; tapkee = derive2 { name="tapkee"; version="1.1"; sha256="1s8710m4drhnycfv27bv1w7vqc99dvbcn8zxkahq0lrsx7q8i5mz"; depends=[]; }; tashu = derive2 { name="tashu"; version="0.1.0"; sha256="04xvmbcwi84zg1pqw21nmrbnkyx184wc200vl1vhmwxggq1i60np"; depends=[dplyr drat ggplot2 lubridate plyr randomForest RColorBrewer reshape2]; }; tatest = derive2 { name="tatest"; version="1.0"; sha256="1yd9pdpdhxwpllnj5wxa7ly29qiw8qywx9lx0w3nizczlx35fgjy"; depends=[]; }; tatoo = derive2 { name="tatoo"; version="1.1.1"; sha256="0w9rm6cnc1mpfyklb8njzjwph2c38niinzxiflrqjqfdp7nd8281"; depends=[assertthat colt crayon data_table magrittr openxlsx stringi withr]; }; tau = derive2 { name="tau"; version="0.0-21"; sha256="08wfl0pv865clpcvzmzb3rw3hl76f16n3j61fbmrzi50xf2diyx7"; depends=[]; }; tauturri = derive2 { name="tauturri"; version="0.3.0"; sha256="014301f5mzy6vblqzb61bxjv46kdynmmrxjpxyvk01w1k8wkwfcn"; depends=[httr magrittr plyr purrr tibble]; }; - tawny = derive2 { name="tawny"; version="2.1.7"; sha256="1b2v0cgkmhzxy36dcdn6hnbqk6l5ac5c3myvwryf7wlp19xi786d"; depends=[futile_logger futile_matrix lambda_r lambda_tools PerformanceAnalytics quantmod tawny_types xts zoo]; }; - tawny_types = derive2 { name="tawny.types"; version="1.1.5"; sha256="1vg0hv91dif6cfqfzrf7m1qbk57fp8v97fp88whwmvs83yd521hq"; depends=[futile_logger futile_options lambda_r lambda_tools quantmod xts zoo]; }; - taxa = derive2 { name="taxa"; version="0.3.2"; sha256="1kiffyfpgapap6m2k3wx7p89kzpdyk48nwbmqvfa883kvg0ddzcy"; depends=[crayon dplyr jsonlite knitr lazyeval magrittr R6 rlang stringr taxize tibble tidyr]; }; - taxize = derive2 { name="taxize"; version="0.9.91"; sha256="0ncglmj0nzk60dvmngzskr2psn0bi2wj8jr628kczln2qz2hagff"; depends=[ape bold cli crayon crul data_table foreach jsonlite natserv phangorn plyr R6 reshape2 ritis rotl rredlist stringr tibble wikitaxa worrms xml2 zoo]; }; + taxa = derive2 { name="taxa"; version="0.3.3"; sha256="11x28mxpza0cckj9cf4zizrsz87h48vlxxan8kn8lwzdpy1xn8j8"; depends=[crayon dplyr jsonlite knitr lazyeval magrittr R6 rlang stringr taxize tibble tidyr]; }; + taxadb = derive2 { name="taxadb"; version="0.1.0"; sha256="0nns9jpjawla90f12gi90562llb2j0pdhwlvy62mgcg0ghr39fgr"; depends=[arkdb curl DBI dbplyr dplyr jsonlite magrittr memoise progress rappdirs readr rlang RSQLite stringi tibble]; }; + taxize = derive2 { name="taxize"; version="0.9.94"; sha256="0ig8x3pkfawjk7x3hkrm4n94askhqk71sa5bbbp2l6dirqbfmism"; depends=[ape bold cli crayon crul data_table foreach jsonlite natserv phangorn R6 ritis rotl rredlist tibble wikitaxa worrms xml2 zoo]; }; taxizedb = derive2 { name="taxizedb"; version="0.1.4"; sha256="15gj9i18ysd83v9fidrrvw938dah04i10ahi3wh5dgjs5fd5ch2s"; depends=[curl DBI dbplyr dplyr hoardr magrittr RMySQL RPostgreSQL RSQLite]; }; taxlist = derive2 { name="taxlist"; version="0.1.7"; sha256="0a91hdw3n46p851662lx82znbw9hf9akg8mm4yslllwffrkhdn8g"; depends=[foreign stringdist taxa taxize vegdata]; }; taxonomizr = derive2 { name="taxonomizr"; version="0.5.3"; sha256="0hxvcbyr5b3sxqy5kw1q17qx7c2q90a6x79r9bmjn6c2lnrqn83i"; depends=[data_table R_utils RSQLite]; }; - taxotools = derive2 { name="taxotools"; version="0.0.35"; sha256="10rf071sarr94q5g174y97sl9qjlla7jgn4hplllv6s1wh10ag7c"; depends=[plyr sqldf taxize wikitaxa]; }; + taxotools = derive2 { name="taxotools"; version="0.0.43"; sha256="0msaqkvyhb292bsv84bw55xxmxhs5nyk31ikjz229q3xhv0zmnzw"; depends=[plyr sqldf taxize wikitaxa]; }; tbart = derive2 { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp]; }; tbd = derive2 { name="tbd"; version="0.1.0"; sha256="1wmfy3p82gckhfsslxzapryfygmircii7x24j6ysfyx52gy8iwf5"; depends=[numDeriv]; }; tbdiag = derive2 { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; }; tbl2xts = derive2 { name="tbl2xts"; version="0.1.3"; sha256="0yy0cpsflwx7fbql3vh0l87cvqgn0ghdqal4m7l9aplqhzdwxs3r"; depends=[dplyr lazyeval PerformanceAnalytics xts zoo]; }; - tbm = derive2 { name="tbm"; version="0.3-2"; sha256="0kaqbyrazkl8gv0jl5n14zdlc4csmj1llmwgp068k79m2bacjmkq"; depends=[basefun coneproj mboost mlt sandwich variables]; }; - tbrf = derive2 { name="tbrf"; version="0.1.3"; sha256="1g6ll9vqhszas3czpnvvxhrih4b1h10dhn40ljh4206m27mzl8v9"; depends=[boot dplyr lubridate purrr rlang tibble tidyr]; }; - tcR = derive2 { name="tcR"; version="2.2.4"; sha256="17g26cq6zpcmg9kv32v0rvyqmml5wkbwra7p8f1cdzyc0zajbvn2"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; }; - tcensReg = derive2 { name="tcensReg"; version="0.1.5"; sha256="0sk884pxgr7m46c1lbpji4hr6ch3ia6vygg1z988c21q219is76j"; depends=[maxLik]; }; + tbm = derive2 { name="tbm"; version="0.3-2.1"; sha256="0srdcla6m5vlid27i793yynm3r2fg3nzr7zn6j923fcmnpdg2jcg"; depends=[basefun coneproj mboost mlt sandwich variables]; }; + tbma = derive2 { name="tbma"; version="0.1.0"; sha256="066p3szfayyimwblghm1lipjf21xgscq1fzbzpqz16lqjpb99ni1"; depends=[data_table ranger RcppRoll zoo]; }; + tbrf = derive2 { name="tbrf"; version="0.1.5"; sha256="1mxfvgb18a62igdh3af4m8x6fl69s25j4x7isd70w744w6jvch3h"; depends=[boot dplyr lubridate purrr rlang tibble tidyr]; }; + tcR = derive2 { name="tcR"; version="2.2.4.1"; sha256="1m68wxbxwhiadav4mfcidsa1hgwy7k9x60gfbs4zn6az9ix827m6"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; }; + tcensReg = derive2 { name="tcensReg"; version="0.1.6"; sha256="052mlmkxxyqg2xm484srx2dx02bl69s6fqffwyn7758s34jwbcxl"; depends=[maxLik Rdpack]; }; tcgsaseq = derive2 { name="tcgsaseq"; version="1.8.1"; sha256="1v5b3qghygb81lqc2h1fijgw856b1778xndppq7r4b0zhhvb81ac"; depends=[CompQuadForm ggplot2 GSA KernSmooth statmod]; }; tcl = derive2 { name="tcl"; version="0.1.0"; sha256="1ssqx50ii6j2y5n2nxn5ndp20nrjss0xf0fqp8aiwlgnm3d1zggn"; depends=[eRm lattice MASS Matrix numDeriv]; }; tcltk2 = derive2 { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; }; @@ -14372,19 +14541,19 @@ in with self; { tdr = derive2 { name="tdr"; version="0.13"; sha256="0i0hnb3fc4d1mbbxcpzmyfh1w2rahfjabg5iyxym3yjd6377al15"; depends=[ggplot2 lattice RColorBrewer]; }; tdsc = derive2 { name="tdsc"; version="1.0.3"; sha256="1h46cflxj27i9bkl7iqxn7kzccl9b8r3fa9f5ska3a9p57algfyv"; depends=[data_table moments]; }; tdthap = derive2 { name="tdthap"; version="1.1-11"; sha256="15qlj2bivvz3pizd8dq34wczbkbxhzqh3cqp1ixkdkprlyvcxj5k"; depends=[]; }; - tea = derive2 { name="tea"; version="1.0"; sha256="03wxhbgx17hl9bbzbfjmfa30q4fqszhs5y9imbp768fmzwbppn24"; depends=[eva]; }; + tea = derive2 { name="tea"; version="1.1"; sha256="0ql7lrxk0ihm49kqsvz79ig8i54rwiy9nxav4v9hy72j9kj5bgjn"; depends=[Matrix]; }; teachingApps = derive2 { name="teachingApps"; version="1.0.4"; sha256="0wi25wdpkz7kh8r1s42wa9kiky8ilmcg8kgw0j1caygwg0bml2fa"; depends=[actuar BH d3heatmap data_table devtools diagram DiagrammeR dplyr DT dygraphs ggplot2 knitr leaflet magrittr markdown metricsgraphics miniUI networkD3 pacman plotly radarchart Rcpp RcppEigen RcppNumerical rprojroot scales shiny shinyAce shinydashboard shinythemes threejs tidyr visNetwork yaml]; }; tealeaves = derive2 { name="tealeaves"; version="1.0.0"; sha256="0hzih93h8c9gqvsmfaldq9jaw8hgvd4kmrlqlaqr6xhi6zhjqhf1"; depends=[crayon dplyr furrr future ggplot2 glue magrittr purrr rlang stringr tidyr units]; }; teamcolors = derive2 { name="teamcolors"; version="0.0.4"; sha256="0mqrjnkpxzv7armgbl9nwz42pjb9l94yml5lp41rhjj9414b2729"; depends=[dplyr ggplot2 tibble tidyr]; }; teamr = derive2 { name="teamr"; version="0.0.1"; sha256="01gngws8lf093598wlzrv4ls74avsli6ij33v1plqgc0znyaw4s2"; depends=[httr jsonlite R6]; }; teda = derive2 { name="teda"; version="0.1.1"; sha256="0yx469jbkw9cgx73zi5mkykrdn16kn01zh524x9411314aa32avx"; depends=[]; }; teigen = derive2 { name="teigen"; version="2.2.2"; sha256="1k5k3lj6av5pyx130w1j7avd0jdmm12ryc71mi5mq49sp95ndl4v"; depends=[]; }; - telefit = derive2 { name="telefit"; version="1.0.2"; sha256="0z4dg0am0b6h20vbjzggw2jyzmi0mf9hvj48f883wkg2p7m6d67m"; depends=[abind coda cowplot doRNG dplyr fields foreach ggplot2 gtable itertools mvtnorm raster Rcpp RcppArmadillo RcppEigen reshape2 scales scoringRules SDMTools sp stringr]; }; + telefit = derive2 { name="telefit"; version="1.0.3"; sha256="0z6dr4ni00dyagbkzr3c7l4h2g23w3bfj99a9755vmrzyy6r45iq"; depends=[abind coda cowplot dplyr fields foreach ggplot2 gtable itertools mvtnorm raster Rcpp RcppArmadillo RcppEigen reshape2 scales scoringRules sp stringr]; }; telegram = derive2 { name="telegram"; version="0.6.0"; sha256="02wwa115f0vz2d9y4nf01397hjkpc3cv2gdl47snrajrm41gji7y"; depends=[curl httr jsonlite R6]; }; telegram_bot = derive2 { name="telegram.bot"; version="2.4.0"; sha256="1bvfnr6k0zxdawrf63yh8wj9hcgq1xvy791xbqhiy0isaa86yfw9"; depends=[curl httr jsonlite R6]; }; tempR = derive2 { name="tempR"; version="0.9.9.16"; sha256="0kwrjpfij36dl98j5x09hp7bzf5v17zxdjzqhjd2sn3xsdf0z5a1"; depends=[]; }; tempcyclesdata = derive2 { name="tempcyclesdata"; version="1.0.1"; sha256="0hciachv59kjpjs119r4z24jskzgnassi1yjg3cgl2r0hyglxxc3"; depends=[]; }; - tempdisagg = derive2 { name="tempdisagg"; version="0.25.0"; sha256="0zi11jqb3i5kd2z1bbkz8y7g16kmkcn3xpkwj2brv0s86wxwsny7"; depends=[]; }; + tempdisagg = derive2 { name="tempdisagg"; version="1.0"; sha256="1n1ng7xki4syy305gsclz7wrqb48vkjw3la0vxs975apv1mc4pzr"; depends=[]; }; temperatureresponse = derive2 { name="temperatureresponse"; version="0.2"; sha256="1id3wjzfs132hj8cm7gpf105qaay9dff07ixah9rmn5sk6si0zmq"; depends=[AICcmodavg broom dplyr minpack_lm numDeriv rootSolve]; }; templates = derive2 { name="templates"; version="0.3.0"; sha256="0xnzj3cvhw1r7zfqaijbfdyclka61jwixcdh05a5z9qwgv0076sh"; depends=[dat magrittr stringr]; }; tempoR = derive2 { name="tempoR"; version="1.0.4.4"; sha256="0gn16j496833pvbjaf6wx26z9ilwssjp947mcyk6n2jb33x93rr2"; depends=[doParallel foreach pls]; }; @@ -14392,50 +14561,54 @@ in with self; { tensor = derive2 { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; }; tensorA = derive2 { name="tensorA"; version="0.36.1"; sha256="176hjy3bvg3in62r97wxbhq187sjz6c1gwy9x6spaxl6k4my3zy7"; depends=[]; }; tensorBF = derive2 { name="tensorBF"; version="1.0.2"; sha256="1dw1a6xqcsl4isbzbfiplgqq5nak5n9ffzm23mzzmkh1r1a8kl1y"; depends=[tensor]; }; - tensorBSS = derive2 { name="tensorBSS"; version="0.3.5"; sha256="1m4g9jr2s37xys2q4gv6rqknrznd4nrppa7qrgygqywwlmnyid44"; depends=[ggplot2 ICtest JADE Rcpp RcppArmadillo tensor tsBSS]; }; + tensorBSS = derive2 { name="tensorBSS"; version="0.3.6"; sha256="1ja4h5x1i4rqgq9k15zjy524ki2z2636fg0jcp352jzj87wl3443"; depends=[ggplot2 ICtest JADE Rcpp RcppArmadillo tensor tsBSS]; }; tensorflow = derive2 { name="tensorflow"; version="2.0.0"; sha256="1cz0l6blr8wan47lslq4lx0aafk61gjxwm6b3nn8zwgx849nqyr4"; depends=[config jsonlite processx reticulate rstudioapi tfruns yaml]; }; + tensorordinal = derive2 { name="tensorordinal"; version="0.1.0"; sha256="0c54ppnxgmr7m9a3dr1a9i3z2vh5nnqp361lhaf081iib8shrxxv"; depends=[MASS pracma rTensor]; }; tensorr = derive2 { name="tensorr"; version="0.1.1"; sha256="18xdvp328h96jn8y1iayxh7cyz2s8j5nn43nq18pyaxq271hkfyh"; depends=[assertive_base assertive_properties assertive_types Matrix purrr]; }; - tensorregress = derive2 { name="tensorregress"; version="1.0"; sha256="0gx2skh175gs2cmihqaklwadnp777xcfimd66w3wh18qiz66ggaz"; depends=[MASS pracma rTensor speedglm]; }; - tensorsparse = derive2 { name="tensorsparse"; version="1.0"; sha256="1qy6s58nkqq4spg7sapq3jafmxda0mx0j0cqjaj9pd34qqxifglf"; depends=[clues fields glasso glmnet HDCI mvtnorm RColorBrewer reshape rgl rTensor viridis]; }; + tensorregress = derive2 { name="tensorregress"; version="2.0"; sha256="0whw57rj2jfh4wh30lv7n05ddymzsnxv6137f03s8aa9dh89fiqy"; depends=[MASS pracma speedglm]; }; + tensorsparse = derive2 { name="tensorsparse"; version="2.0"; sha256="0midaw95q2gmk7hdlh6zdbm8nx0lm9m3y5liq6xrb3ajlq76ncqw"; depends=[fields glmnet HDCI mvtnorm RColorBrewer reshape rgl viridis]; }; tensr = derive2 { name="tensr"; version="1.0.1"; sha256="1z6b3ra7fgn88mxbhsq65x3frj5j7p17n119s9kbw7sg9y633vfx"; depends=[assertthat]; }; tergm = derive2 { name="tergm"; version="3.6.1"; sha256="03yd4l317airz84jfjyczjx43wi6sraid58lmxivm29xjk52xpi1"; depends=[coda ergm MASS network networkDynamic nlme robustbase statnet_common]; }; + tergmLite = derive2 { name="tergmLite"; version="2.1.7"; sha256="0djf7k0svdq4bnc84zxmxjns2fqggf0bs4h59jcl0yc36ka9k94n"; depends=[ergm network Rcpp statnet_common tergm]; }; term = derive2 { name="term"; version="0.1.0"; sha256="16nphv6kysjjd523ypwdsw6f7l4zvqa6z62012lv71wdkhkfvgnr"; depends=[chk lifecycle]; }; ternvis = derive2 { name="ternvis"; version="1.2"; sha256="057i6i3ygxrin0npc18gsg3dpdldzafyb5sr6lix5mhy6b09lkxf"; depends=[dichromat maps quadprog]; }; + terra = derive2 { name="terra"; version="0.5-8"; sha256="0m2bfbjs4gz9mqzrris15b2p8mnb5skr96mpha7jkz3h9ybyzxm9"; depends=[raster Rcpp]; }; tesseract = derive2 { name="tesseract"; version="4.1"; sha256="1a7cf48n7hdd6inqz23ifqhq6kx6wxri34a79ns2vxaj6f4llxf0"; depends=[curl digest pdftools rappdirs Rcpp]; }; test2norm = derive2 { name="test2norm"; version="0.1.1"; sha256="11by5a1j6613akxj1nc16r07jfwxr1izkpvymr9yycnddiqyp42c"; depends=[mfp]; }; testDriveR = derive2 { name="testDriveR"; version="0.5.1"; sha256="0wjdqvsyv33fsg1lljp9m0bhz38mpfgpgickgj4zdspc9x6lbnv6"; depends=[]; }; testassay = derive2 { name="testassay"; version="0.1.0"; sha256="06gks3k04m45kn946i525261v33ymwxpvgdy84kc7sp01xxx4rfv"; depends=[]; }; + testcorr = derive2 { name="testcorr"; version="0.1.2"; sha256="0vwbmvhdmimwhn9gyki5khsvk2yw9ik9kjgxhbr4vy3mm3ly4zqb"; depends=[assertthat forcats ggplot2 knitr reshape2 scales]; }; testequavar = derive2 { name="testequavar"; version="0.1.2"; sha256="12qfy53rkrasxphcfmch5bmdlvlybd27jfg3azsi3fg4zk4qgdw2"; depends=[]; }; tester = derive2 { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; }; testextra = derive2 { name="testextra"; version="0.1.0.1"; sha256="166lg012hgk5n4zp92dagx01bjhpkjgc5i40x9fc9nfjby0wrc0s"; depends=[assertthat parsetools pkgcond postlogic purrr rlang stringi testthat]; }; testforDEP = derive2 { name="testforDEP"; version="0.2.0"; sha256="1mgzhj8b35r5cm4bl0nnyxj0h7rwd28d17qvgvaky2kvm2r83cf9"; depends=[Hmisc minerva Rcpp]; }; testit = derive2 { name="testit"; version="0.11"; sha256="13iq4p8xzng88miizf04yv6z8vk7zhg1c8kd2h6swcmhqzq29yqj"; depends=[]; }; - testthat = derive2 { name="testthat"; version="2.3.1"; sha256="0m8xchdpgn9iwj6gb2qw46zr85v9zf1gkbr9nnahmy5sp1s9bbky"; depends=[cli crayon digest ellipsis evaluate magrittr pkgload praise R6 rlang withr]; }; - testthis = derive2 { name="testthis"; version="1.1.0"; sha256="1ci7q25f8lq7mvigdj48gvpi75j08s0kll72kwa88xyfx9q8m3yl"; depends=[assertthat devtools fs magrittr pkgload rprojroot stringi testthat usethis]; }; + testthat = derive2 { name="testthat"; version="2.3.2"; sha256="0v70v2fs0f2ir962z9csbjlj8snrq9mbjfyhhb9dhz3zy26qs9hs"; depends=[cli crayon digest ellipsis evaluate magrittr pkgload praise R6 rlang withr]; }; + testthis = derive2 { name="testthis"; version="1.1.1"; sha256="0csragn695698dpkr9d3md0g81bzpy5mybd0jik669q9cs8sdzh2"; depends=[assertthat devtools fs magrittr pkgload rprojroot stringi testthat usethis]; }; tetraclasse = derive2 { name="tetraclasse"; version="0.1.21"; sha256="1cl2cah0xi6x3rvvdy56iszai6rkbxc1w3x13v0l1z1nryff7c6a"; depends=[dplyr FactoMineR ggplot2 ggrepel magrittr reshape2 tibble tidyr]; }; - texPreview = derive2 { name="texPreview"; version="1.4.3"; sha256="19qnfjdbm6iakbls4hyrjscl7m7dc7z0fhimf71gwdbq3nqx2zl1"; depends=[base64enc fs htmltools knitr lifecycle magick magrittr rematch2 rstudioapi svgPanZoom whisker xml2]; }; - texmex = derive2 { name="texmex"; version="2.4.2"; sha256="01qx4f5f0gf0xz85lzxxv79fp7syd7x484iw711rbnv0nw3aqwa2"; depends=[ggplot2 mvtnorm Rcpp]; }; + texPreview = derive2 { name="texPreview"; version="1.4.4"; sha256="1a80ld5j7419nqxvg1nq0kiv7ls262n6bk6pkj3cyqjq6z2y01j0"; depends=[base64enc details fs htmltools knitr lifecycle magick magrittr rematch2 rstudioapi svgPanZoom whisker xml2]; }; + texmex = derive2 { name="texmex"; version="2.4.5"; sha256="13wsrp418cgvma7a7hfhbs6ywp3j1j2sig7x60zh8v29pjcxic2n"; depends=[ggplot2 mvtnorm Rcpp]; }; texreg = derive2 { name="texreg"; version="1.36.23"; sha256="0yxaqimd7cyfrfpia6fnqm15lgs0bf5zyjzmnfm1v4qmf8kj8x6v"; depends=[]; }; - text2speech = derive2 { name="text2speech"; version="0.2.9"; sha256="1gcyrq3faq3zsfr7bvwhqk1l93289gzx70bg6xdyagw99jz5k5wn"; depends=[aws_signature dplyr googleAuthR googleLanguageR httr knitr magrittr mscstts tuneR]; }; - text2vec = derive2 { name="text2vec"; version="0.5.1"; sha256="0vcp50mgpgxbf534vd8l56m8006i3sh8a4v9nrf9vxkq2pv7xygc"; depends=[data_table digest foreach futile_logger irlba Matrix mlapi R6 Rcpp RcppParallel sparsepp stringi]; }; + text_alignment = derive2 { name="text.alignment"; version="0.1.1"; sha256="0gf4rpk6l77v9fl7pbmyzq1jmb9kmzzdrpr8bsq05n9vv5lhaqqf"; depends=[Rcpp]; }; + text2speech = derive2 { name="text2speech"; version="0.2.10"; sha256="08sg17avqdb7wl68hc6caljwsv4wziw7w0csc8ga4k7bh7r53h8l"; depends=[aws_signature dplyr googleAuthR googleLanguageR httr knitr magrittr mscstts tuneR]; }; + text2vec = derive2 { name="text2vec"; version="0.6"; sha256="0r75cv77x2zm1z66s95hic71dpbqmybz39n48q6mz7gfd3m7312y"; depends=[data_table digest lgr Matrix mlapi R6 Rcpp rsparse stringi]; }; textTinyR = derive2 { name="textTinyR"; version="1.1.3"; sha256="0z9k978yk54zxrrjajcb0nanfhfpxm2bq2vbmk6w5s194da6y3xl"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; }; textcat = derive2 { name="textcat"; version="1.0-6"; sha256="0639b1qbi8779lskk5ms0sbbnmy2s73b3w96abbr70mrh0s2f9rw"; depends=[slam tau]; }; textclean = derive2 { name="textclean"; version="0.9.3"; sha256="0kgjh6c4f14qkjc4fds7q7rpf4nkma3p0igm54fplmm3p853nvrz"; depends=[data_table english glue lexicon mgsub qdapRegex stringi textshape]; }; - textdata = derive2 { name="textdata"; version="0.3.0"; sha256="0khf3j9hwl5jz3mzwzsmisrqchlf19phl4r3x8sk2cdhkb1qf3ix"; depends=[fs rappdirs readr tibble]; }; + textdata = derive2 { name="textdata"; version="0.4.0"; sha256="0admyznyy02rxn3r0n1icyslfv4qky2b7mwzmc0g0251awnnx55a"; depends=[fs rappdirs readr tibble]; }; texteffect = derive2 { name="texteffect"; version="0.3"; sha256="1qcbr18h3vakh6ymw4axzqcqrpss6z68a592xl879b82l2nlq8a7"; depends=[boot ggplot2 MASS]; }; textfeatures = derive2 { name="textfeatures"; version="0.3.3"; sha256="0x67kms7ipsadymc9jwja7wymav8y9kc5sbmp2vw4n4l89n32raa"; depends=[dplyr purrr rlang text2vec tfse tibble tokenizers]; }; textgRid = derive2 { name="textgRid"; version="1.0.1"; sha256="1wi5vq5f7ixhz39l5hqi2jlmjjacx4lyrs4h8xfbd47pj6g16lc6"; depends=[]; }; textile = derive2 { name="textile"; version="0.1.2"; sha256="067zli6sl7bp9843spgx47hmw55aq61yinqw1lqifmrpk7b0ywk5"; depends=[]; }; textir = derive2 { name="textir"; version="2.0-5"; sha256="0ban5qiinlxizqpcgafv4b5gwxlil6jdfarjd6l1m48awxh3mlnb"; depends=[distrom gamlr Matrix]; }; textmineR = derive2 { name="textmineR"; version="3.0.4"; sha256="1388blqxziqzjipys6icdifnnzgxvm0w3yr9jihl32ldd701rvvw"; depends=[gtools magrittr Matrix Rcpp RcppArmadillo RcppProgress RSpectra stopwords stringr text2vec]; }; - textmining = derive2 { name="textmining"; version="0.0.1"; sha256="16wiykhrjs4djwa7q2wm4g8b3mrhh6hq9d9876w1j7c2s6zx69gd"; depends=[caret dplyr koRpus mallet networkD3 NLP rJava slam SnowballC stylo tm topicmodels wordcloud]; }; textometry = derive2 { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; }; textrank = derive2 { name="textrank"; version="0.3.0"; sha256="1sjzllz3ixxr043hbmbvwkwvj5wzh3m08x9z7h6hvy8ld8nzmn74"; depends=[data_table digest igraph]; }; textreadr = derive2 { name="textreadr"; version="0.9.0"; sha256="04nyjrfxgwq8g3bdj12nnkia2xn2zngk1rprlkpyicrisgq36agk"; depends=[antiword curl data_table pdftools readxl rvest striprtf textshape xml2]; }; - textrecipes = derive2 { name="textrecipes"; version="0.0.2"; sha256="1wks8z8wggx318haplyw4km2nh1vrl805gvyckb79n569f8ks9ah"; depends=[dplyr generics lifecycle magrittr purrr recipes rlang SnowballC stopwords stringr text2vec textfeatures tibble tokenizers]; }; + textrecipes = derive2 { name="textrecipes"; version="0.2.0"; sha256="1wibykc1ix2l6wimczqi30z63cidvpq2b5hfj6irf2myhbz5cyv2"; depends=[dials dplyr generics magrittr Matrix modeldata purrr Rcpp recipes rlang SnowballC stopwords stringr tibble tidyr tokenizers vctrs]; }; textreg = derive2 { name="textreg"; version="0.1.5"; sha256="0h44z5hyndnvzd9axix7gpmhbdx347dfgxw9r8w38kyw6dklbjy6"; depends=[NLP Rcpp tm]; }; textreuse = derive2 { name="textreuse"; version="0.1.4"; sha256="0qfp7ffzb5p3k3wiw8i1zjskni8f38rzkjnss97j9f3vhhb8j4r7"; depends=[assertthat BH digest dplyr NLP Rcpp RcppProgress stringr tidyr]; }; - textshape = derive2 { name="textshape"; version="1.6.0"; sha256="1pl85wjq5rl25gdlh4cp0l14hn76rrmpl7l1fn7kq9lwj9yfpcs8"; depends=[data_table slam stringi]; }; + textshape = derive2 { name="textshape"; version="1.7.1"; sha256="02111kj3kka84mpx7s19bjna9cas8diw5fxz51v5ggz0ldswa5pa"; depends=[data_table slam stringi]; }; textstem = derive2 { name="textstem"; version="0.1.4"; sha256="1pbhi5ia3w16vsix2x3if51zd2v9bcv0j4lj9hfikgq1yz9zxmw2"; depends=[dplyr hunspell koRpus koRpus_lang_en lexicon quanteda SnowballC stringi textclean textshape]; }; textutils = derive2 { name="textutils"; version="0.2-0"; sha256="06w0d12l7g4z3m278x5ap0jxm2y1h6ssj4igfcxk7j8k5hy89l80"; depends=[]; }; tfCox = derive2 { name="tfCox"; version="0.1.0"; sha256="06mbiz1jwp8mv5dbwyvdvy1wpp8s3xp9hhsm94vrbvjaxg680g28"; depends=[Rcpp survival]; }; @@ -14447,7 +14620,7 @@ in with self; { tfhub = derive2 { name="tfhub"; version="0.7.0"; sha256="1a4iasasfbd44hljxkf2a76j1nb6l6jmijw8f52h5m00m8arfh2i"; depends=[magrittr reticulate rstudioapi tensorflow]; }; tfio = derive2 { name="tfio"; version="0.4.1"; sha256="089vh0k12z0ymk4v585hfnl5yqp28rgzqgy633m874h6fqzhhxvp"; depends=[forge magrittr reticulate tensorflow tfdatasets]; }; tfplot = derive2 { name="tfplot"; version="2015.12-1"; sha256="1x007j6ibbzfr0kncvsr4c7295jv3c4amg2dpyjvdir9h665nc23"; depends=[tframe]; }; - tfprobability = derive2 { name="tfprobability"; version="0.8.0.0"; sha256="1h32r15yxxzmvqp0gs2k5m2c6z1jkgfwj757sl6pfhwpr7av9zqp"; depends=[keras magrittr reticulate tensorflow]; }; + tfprobability = derive2 { name="tfprobability"; version="0.9.0.0"; sha256="1idvz3ph0fjaa1bd4zgwsvqhdf604sl76r4g4askmww42hycvpqp"; depends=[keras magrittr reticulate tensorflow]; }; tframe = derive2 { name="tframe"; version="2015.12-1.1"; sha256="1yff22jzh1mp73zbz2mav6z8m42lylfjhb8dgxj4337fv3if3i13"; depends=[]; }; tframePlus = derive2 { name="tframePlus"; version="2016.7-1"; sha256="12xi2xw4pr78n3cppfknpxmjp2263pb4kqj9v412yxwp82rgb6yk"; depends=[tframe timeSeries]; }; tfruns = derive2 { name="tfruns"; version="1.4"; sha256="1mqv5m13qm1dqz0622jd5ayb3nk76lfa657y2hyqv261flxizhvg"; depends=[base64enc config jsonlite magrittr reticulate rlang rstudioapi tidyselect whisker yaml]; }; @@ -14459,11 +14632,11 @@ in with self; { thankr = derive2 { name="thankr"; version="1.0.0"; sha256="089ikp85d5ia6a1qzmw8dkgcmz628cibmwfzcpk7m3ii8acxq91w"; depends=[]; }; thectar = derive2 { name="thectar"; version="1.0.0"; sha256="1qh0qzg0ybb38kzm56xxlvhm201pdjm16aky5f1fdflcsszgy8mx"; depends=[proxy smacof]; }; theiaR = derive2 { name="theiaR"; version="0.3.0"; sha256="0z3i6dgf2mv954llb6vk6g09gdk1hi0fjygk09jp8p9cygn7r941"; depends=[askpass httr R6 raster XML]; }; + themetagenomics = derive2 { name="themetagenomics"; version="1.0.1"; sha256="09hr351s5qqmiyv77fbf71yp2jx7b00s1j2afss3rbrvmcznkdma"; depends=[ggplot2 lda lme4 Matrix plotly Rcpp rstan scales shiny stm]; }; themis = derive2 { name="themis"; version="0.1.0"; sha256="1hsrm8z9fh8smzw9yda8j32zq9warnpy6rihyni0zwchgp3iyawq"; depends=[dials dplyr generics purrr RANN recipes rlang ROSE tibble tidyselect unbalanced withr]; }; thermocouple = derive2 { name="thermocouple"; version="1.0.2"; sha256="1rlvhw3i83iq1vibli84gj67d98whvgkxafwpmisva1m4s1bmij4"; depends=[]; }; - theseus = derive2 { name="theseus"; version="0.1.0"; sha256="1f6vl0m8fcchafn78vrfw610d0sp9rf8kd3q5n7b0zd2yby10dq0"; depends=[dplyr ggplot2 gridExtra magrittr phyloseq ShortRead splancs tidyr tidyverse vegan viridis]; }; thgenetics = derive2 { name="thgenetics"; version="0.4-2"; sha256="1314gry3xs9v4jy13g08q16qy4ax3s0bc7d74gi0wbpkgdrk3lql"; depends=[]; }; - thickmatch = derive2 { name="thickmatch"; version="0.3.0"; sha256="0j5wajrc0ngmal01hnfw6vbqvmnqfrgii68ws8ypig934h2kv05g"; depends=[DiPs liqueueR mvnfast plyr rcbalance]; }; + thickmatch = derive2 { name="thickmatch"; version="0.3.1"; sha256="0q7wpilbk8jm3q7m5hb114jpbv4ri1745v9sbdf222l6ymds6pia"; depends=[DiPs MASS plyr rcbalance]; }; thief = derive2 { name="thief"; version="0.3"; sha256="12ymkkisg5p0g1gmvlczhp4dc7mirjg55fqqmz2d90673vlg6rfq"; depends=[forecast ggplot2 hts]; }; thinkr = derive2 { name="thinkr"; version="0.13"; sha256="1j43mjznriq8d5ki50rb41vgmzj2gq8sahvhj11742ggxd0bzvdb"; depends=[assertthat devtools dplyr ggplot2 lazyeval lubridate magrittr officer rvg stringi stringr tidyr]; }; thor = derive2 { name="thor"; version="1.1.1"; sha256="1hkv7xd633qqcgfm16ws6hn26ab0mv5gqs6n8g7cq1qv57dsqjmm"; depends=[R6 storr]; }; @@ -14477,53 +14650,59 @@ in with self; { thriftr = derive2 { name="thriftr"; version="1.1.5"; sha256="1s8fn0imja6gh5bb0h2g1pmvkwk5v0dmpml9yvcd5dhz9lxy6vdj"; depends=[R6 rly stringi]; }; thsls = derive2 { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; }; thurstonianIRT = derive2 { name="thurstonianIRT"; version="0.9.0"; sha256="0jjrdx5f581h8vh0fw4p85mlqfym467azp7cln48wzi1s28m9mn2"; depends=[BH dplyr lavaan magrittr MplusAutomation mvtnorm Rcpp RcppEigen rlang rstan rstantools StanHeaders tibble tidyr]; }; - tibble = derive2 { name="tibble"; version="2.1.3"; sha256="06jfayiip8j8ibdhw3fvxn4n8aqbqhwanrszpzlsf92xdfgfm34s"; depends=[cli crayon fansi pillar pkgconfig rlang]; }; - tibbleOne = derive2 { name="tibbleOne"; version="0.1.0"; sha256="01v3jqxps0d27hg50d38zzh8lypr5735xsdggpc6zmqd39cbnjsp"; depends=[dplyr flextable forcats glue kableExtra knitr labelled lifecycle magrittr officer purrr rlang stringr tibble tidyr tidyselect vctrs]; }; + tibble = derive2 { name="tibble"; version="3.0.1"; sha256="17m7xvn423snq9dmr0bhx42j5rbc53w1viizxx4bvq37nz7m4i8m"; depends=[cli crayon ellipsis fansi lifecycle magrittr pillar pkgconfig rlang vctrs]; }; tibbletime = derive2 { name="tibbletime"; version="0.1.3"; sha256="0p42g73cmw460v372317as50ijvsg49avg9cf222ypf1v0ls3ig1"; depends=[assertthat dplyr glue hms lifecycle lubridate purrr Rcpp rlang tibble tidyselect vctrs zoo]; }; tibbrConnector = derive2 { name="tibbrConnector"; version="1.5.1"; sha256="1r58myi7x4hqqvyrphxy4ppa1lnad6x2ginfq2j52ax53zr07ajp"; depends=[RCurl rjson]; }; tictactoe = derive2 { name="tictactoe"; version="0.2.2"; sha256="1fx8plj5zr04xwk5hfj3zqhcknidxlzya2q14cf0m3y33a86lx42"; depends=[hash]; }; tictoc = derive2 { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; }; - tidyLPA = derive2 { name="tidyLPA"; version="1.0.4"; sha256="154jikhm1dnriwdib5ncmkjixlihs3b74ilpi225h8ijq84n31ai"; depends=[dplyr ggplot2 mclust mix MplusAutomation tibble]; }; - tidyREDCap = derive2 { name="tidyREDCap"; version="0.1.0"; sha256="177jrkd415rl7cz0vyank2bxiqkywcrva8xi8j2hyi6j6hkf0m6a"; depends=[magrittr purrr stringr tibble]; }; - tidyRSS = derive2 { name="tidyRSS"; version="1.2.11"; sha256="0ikizs24frvv888zxris6j41lfcvy7hrp5z3h3mk5vxdlqi3rag7"; depends=[dplyr httr jsonlite lubridate magrittr purrr sf stringr testthat tibble xml2]; }; - tidyUSDA = derive2 { name="tidyUSDA"; version="0.2.6"; sha256="02vrjpg0b651w5mvwhj60isy79q0nid6vyn2bhkddfaffs823lq0"; depends=[crayon curl dplyr fuzzyjoin ggplot2 jsonlite keyring magrittr nlme rgdal sf stringi tigris usethis]; }; - tidybayes = derive2 { name="tidybayes"; version="1.1.0"; sha256="1mq6gqr66pqrwdmnk3fmfi508ds086k7jnlazi5mczn4r6pdyzd7"; depends=[arrayhelpers coda dplyr forcats ggplot2 ggstance HDInterval magrittr plyr purrr rlang tibble tidyr tidyselect]; }; + tidyBF = derive2 { name="tidyBF"; version="0.2.0"; sha256="0pl5h7zqs7gap4pzch0f7m58lgwdvgp0zlp6l328j3z9h46amh9y"; depends=[BayesFactor dplyr ipmisc metaBMA rlang tidyr]; }; + tidyHeatmap = derive2 { name="tidyHeatmap"; version="0.99.9"; sha256="04vx1ck1s6v4fzxxd4cpm5z3f0dzx3b9262xabnq75swng90w03r"; depends=[circlize ComplexHeatmap dplyr magrittr purrr RColorBrewer rlang tidyr viridis]; }; + tidyLPA = derive2 { name="tidyLPA"; version="1.0.6"; sha256="1c3v7zljs6isbxzmyqx065pb31hl15sma00wh7pv3wgzacibbgmx"; depends=[dplyr ggplot2 gtable mclust mix MplusAutomation tibble]; }; + tidyMicro = derive2 { name="tidyMicro"; version="1.43"; sha256="1y399khg85979lh9s528y5qab711qybd1vfw5kvyy7253ikmcb3p"; depends=[ade4 broom car cowplot dplyr Evomorph factoextra ggplot2 ggrepel gridExtra latex2exp lme4 lsr magrittr MASS Matrix plotly plyr png purrr rlang scales scatterplot3d shapes stringr ThreeWay tibble tidyr tidyverse vegan VGAM]; }; + tidyREDCap = derive2 { name="tidyREDCap"; version="0.2.0"; sha256="03kx91avw6zbmrcxvhkb7i3syw3ajkv9ypvgn2iq3ki887vbiwzw"; depends=[dplyr janitor magrittr purrr rlang stringr tibble tidyr]; }; + tidyRSS = derive2 { name="tidyRSS"; version="2.0.1"; sha256="06pqhvgiibf1s72abd0rq3fv55plkd4481b3jhvxm3cd2isa3gbw"; depends=[anytime dplyr httr jsonlite magrittr purrr rlang tibble xml2]; }; + tidyUSDA = derive2 { name="tidyUSDA"; version="0.2.7"; sha256="1qyy0908ll4xr7496wsxg2vqhrlqrs1wh3nypw96djldk61bdziq"; depends=[crayon curl dplyr fuzzyjoin ggplot2 jsonlite keyring magrittr nlme rgdal sf stringi tigris usethis]; }; + tidybayes = derive2 { name="tidybayes"; version="2.0.3"; sha256="0grg53m0b0nhpadl5c7qcshqinzwx5whinvdgycpl9g7582512hr"; depends=[arrayhelpers coda dplyr forcats ggplot2 HDInterval magrittr plyr purrr rlang scales tibble tidyr tidyselect]; }; tidyboot = derive2 { name="tidyboot"; version="0.1.1"; sha256="0nss1ci763g9p5f33g163ppamx72axc8xhrils0cql3ka8439pmn"; depends=[dplyr modelr purrr rlang tidyr]; }; tidycells = derive2 { name="tidycells"; version="0.2.2"; sha256="1h1g2kw4q0qgakj716gzd8jcn0hgsy5l1cypk35s6arz73xrxf0r"; depends=[dplyr ggplot2 magrittr purrr rlang stringr tibble tidyr unpivotr]; }; - tidycensus = derive2 { name="tidycensus"; version="0.9.6"; sha256="16lcldbs1h8y1ajsj7lv04h0gq93hfcd0mbws2wb5pgx0jr187yk"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; }; + tidycensus = derive2 { name="tidycensus"; version="0.9.9.2"; sha256="1m9i19b3z8nzbcly9a8nk75msy6d8bkchvyv6izdiy1mlqxrc6fh"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; }; tidycode = derive2 { name="tidycode"; version="0.1.1"; sha256="0ahjhn1ar93xnd1snxnivdl43d1b6ica0pc30rgh8jpha87zbsay"; depends=[glue matahari pryr purrr rlang tibble]; }; tidycomm = derive2 { name="tidycomm"; version="0.1.0"; sha256="0xas6nr7fy612r0b5h8ncvirxhzy099zvhdzxbnskm3sa21046ni"; depends=[broom dplyr forcats glue magrittr MBESS purrr rlang stringr tibble tidyr]; }; tidycwl = derive2 { name="tidycwl"; version="1.0.4"; sha256="1f3lrdl73lx0a0y6kz33i6s8nkcwdjdmc6mvnkqp3n8r851q46lg"; depends=[dplyr htmlwidgets jsonlite magrittr visNetwork webshot yaml]; }; tidydice = derive2 { name="tidydice"; version="0.0.6"; sha256="1g0x426gri1s0fyn2srl7ni0zvrnx1wvg5zcr19fxgdw9m8rxxp2"; depends=[assertthat dplyr ggplot2 magrittr purrr tibble]; }; - tidygapminder = derive2 { name="tidygapminder"; version="0.1.0"; sha256="1fr4yrq7hzzllkclf7cwicfjwg5gcf5la0chc8mah7690lkdi39b"; depends=[data_table dplyr readxl tidyr]; }; + tidyfast = derive2 { name="tidyfast"; version="0.2.1"; sha256="1bfs2wma705nx1lpndq75ama5dr9kkg8hwpklb20csnccnfrlvf6"; depends=[data_table Rcpp]; }; + tidyfst = derive2 { name="tidyfst"; version="0.9.5"; sha256="0dl7s04s1vgssvay05sjlp4z2ccivzjspqd7wvv50ncv5zrnlw8s"; depends=[data_table fst stringr]; }; + tidyft = derive2 { name="tidyft"; version="0.4.5"; sha256="0l6ixaqj356q319ms0bf655f530cgiia9saqdx9lryaf0b6i2hxb"; depends=[data_table fst stringr]; }; + tidygapminder = derive2 { name="tidygapminder"; version="0.1.1"; sha256="1m6bynwnw1msrzvdmy12w3ympinqpd8j3may3rwmg9941nndjv2d"; depends=[data_table dplyr readxl tidyr]; }; tidygenomics = derive2 { name="tidygenomics"; version="0.1.2"; sha256="1cnwmmmzp9kg4k7iy2kgb22bdllpnz257pv1ahy3l11zy6bl48fc"; depends=[dplyr fuzzyjoin IRanges purrr Rcpp rlang tidyr]; }; - tidygeocoder = derive2 { name="tidygeocoder"; version="0.2.4"; sha256="0r37s3hfyqz4zqs7cwp72dhc6f1y7zfc22v9b0705bdbqnfllahn"; depends=[dplyr httr jsonlite purrr rlang stringr tibble tidyr tmaptools]; }; + tidygeocoder = derive2 { name="tidygeocoder"; version="0.2.5"; sha256="03zrl7zvwpcir44a5f2mixyd35rcyx8fpq7fjybb5z0bky068ir4"; depends=[dplyr httr jsonlite purrr rlang stringr tibble tidyr tmaptools]; }; tidygraph = derive2 { name="tidygraph"; version="1.1.2"; sha256="1zpsarm74afbc7p5dlyb0whc09670qdcddw1ckb25cfc9hfh0hjn"; depends=[dplyr igraph magrittr pillar R6 Rcpp rlang tibble tidyr]; }; tidyhydat = derive2 { name="tidyhydat"; version="0.5.0"; sha256="0bf8rnk0yhdjjs79d4s833z9j165cwvg3xdmqg3kc5yzc31m4hsg"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr rlang RSQLite tidyr]; }; - tidyimpute = derive2 { name="tidyimpute"; version="0.1.0"; sha256="03b475nn206hxq3i0n7j1qws82rwwk5vqivmdg5mff44dvz4gl5s"; depends=[dplyr na_tools rlang]; }; tidyjson = derive2 { name="tidyjson"; version="0.2.4"; sha256="1nbg7wg8r38ydvcp3kbxmmnayxrdkl3p7x0fjxny3bj9a0fp99y7"; depends=[assertthat dplyr jsonlite magrittr purrr tibble tidyr]; }; - tidylog = derive2 { name="tidylog"; version="1.0.0"; sha256="12civvsgj9d7ligc84sqii6a8q3ll12b8xs99f6rqp4nhzhpavv3"; depends=[clisymbols dplyr glue tidyr]; }; - tidymodels = derive2 { name="tidymodels"; version="0.0.3"; sha256="07l33slvh38lpycz2v4slwz06v33ni9jqr5wv672gzcgirw5xy7p"; depends=[broom cli crayon dials dplyr ggplot2 infer magrittr parsnip pillar purrr recipes rlang rsample rstudioapi tibble tidyposterior tidypredict tidytext yardstick]; }; + tidylog = derive2 { name="tidylog"; version="1.0.1"; sha256="1plhzspwbc1p8hh1a3nkil63mfp740zvlsrfpdq5db3ja2jqz680"; depends=[clisymbols dplyr glue tidyr]; }; + tidymodels = derive2 { name="tidymodels"; version="0.1.0"; sha256="1bi5vh80f6f2ibhyaapgnl7q1mkkx8425vj6ci0ml5rb7l8jhjm8"; depends=[broom cli crayon dials dplyr ggplot2 infer magrittr parsnip pillar purrr recipes rlang rsample rstudioapi tibble tidyposterior tidypredict tidytext tune workflows yardstick]; }; tidymv = derive2 { name="tidymv"; version="2.2.0"; sha256="0g550b0frgk4wy3sicsqqinffrlbqzghhcnvh3snci6xd7j37hmm"; depends=[dplyr ggplot2 itsadug magrittr mgcv rlang tibble tidyr]; }; tidync = derive2 { name="tidync"; version="0.2.3"; sha256="1wjw3fmyj8f95f94zai58h8b6h0vqqlrw4c629jjgg8ayy7aay9p"; depends=[dplyr forcats magrittr ncdf4 ncmeta purrr rlang RNetCDF tibble tidyr]; }; tidypmc = derive2 { name="tidypmc"; version="1.7"; sha256="1fijlvdiw4vwm34wizm4xlm0x10vvpkldzk7rrla44apq7y2w3yq"; depends=[dplyr readr stringr tibble tokenizers xml2]; }; tidyposterior = derive2 { name="tidyposterior"; version="0.0.2"; sha256="1sdbar3ycnjqyjy664zyhr9xks48l6g6mw8p5scp31x3gdh352rs"; depends=[dplyr generics ggplot2 purrr rlang rsample rstanarm tibble tidyr]; }; - tidypredict = derive2 { name="tidypredict"; version="0.4.3"; sha256="1mn14rd33irgcfrhm9d3zd71jdwdjay5z5xsmas8d9zmf05g0bcr"; depends=[dplyr generics knitr purrr rlang tibble]; }; - tidyquant = derive2 { name="tidyquant"; version="0.5.9"; sha256="013yxg3wqvrl7ybda8lxil7cvzzlllb9f2l107867c7af9fbf7vy"; depends=[cli crayon dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod rlang rstudioapi stringr tibble tidyr timetk TTR xml2 xts]; }; + tidypredict = derive2 { name="tidypredict"; version="0.4.5"; sha256="1i6zl6wjz6wbpkmkc9z9ikp8zgck3qh38lar0r6q2jzl8fxpimg4"; depends=[dplyr generics knitr purrr rlang tibble]; }; + tidyquant = derive2 { name="tidyquant"; version="1.0.0"; sha256="0d84wln98afa23z4sfxpr1xp7p3kjqvnidl69v3l65wi2lkxc87b"; depends=[alphavantager cli crayon dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod riingo rlang rstudioapi stringr tibble tidyr tidyselect timeDate timetk TTR xml2 xts]; }; tidyquery = derive2 { name="tidyquery"; version="0.2.0"; sha256="1qhiqaijw71lqv2lffsisk53mvxckr7jj6qxvg9l3wygmhskzkvw"; depends=[dplyr lubridate queryparser rlang stringr]; }; tidyqwi = derive2 { name="tidyqwi"; version="0.1.1"; sha256="0qrwclaz6cf2wg3rkg2nqjygflj0a1mx4cfbv5lx4r194km2dmr9"; depends=[dplyr furrr future httr jsonlite labelled magrittr purrr stringr tidyr xml2]; }; tidyr = derive2 { name="tidyr"; version="1.0.2"; sha256="0safj8bcf8libwr0jx4059bmarngvhfddrcv8k5iw39m9lpxs0r4"; depends=[dplyr ellipsis glue lifecycle magrittr purrr Rcpp rlang stringi tibble tidyselect vctrs]; }; - tidyrules = derive2 { name="tidyrules"; version="0.1.0"; sha256="1pwbgk48rrxcxwjnqfjg4718fw059h4qh3vfni8psgd5snfbsjql"; depends=[assertthat magrittr partykit purrr stringr tibble]; }; - tidyselect = derive2 { name="tidyselect"; version="0.2.5"; sha256="0x3cp36byhfjajikr1lwffjm85ayw3bcs7d7kb0cydgs61ifiqjw"; depends=[glue purrr Rcpp rlang]; }; + tidyrules = derive2 { name="tidyrules"; version="0.1.3"; sha256="09alqz7rsd98qach8hi28143xgbjapk4m9l47dvk0vpx3mfnkzq3"; depends=[assertthat magrittr partykit purrr stringr tibble]; }; + tidyselect = derive2 { name="tidyselect"; version="1.0.0"; sha256="1bwwsljkg1bxh7xnqxv7n0n1s9y8x407i6lsv826vy1ss1k1fxpy"; depends=[ellipsis glue purrr rlang vctrs]; }; tidystats = derive2 { name="tidystats"; version="0.4"; sha256="1jxn8la5s3mdh9kbkbvlc5icwa7ymingaxrl0q49ykifrsnbpd4a"; depends=[dplyr jsonlite purrr readr stringr tibble tidyr]; }; tidystopwords = derive2 { name="tidystopwords"; version="0.9.0"; sha256="1zw6rz8fs8mynaqhrxidrar8vyiq73i8hl4h2lrfz83rxrihbq39"; depends=[dplyr stringr]; }; tidystringdist = derive2 { name="tidystringdist"; version="0.1.4"; sha256="1srxh5gyspcghzvnmpyq36ky608ipf71vv0s1jg01mgf2i5pdkf4"; depends=[attempt rlang stringdist tibble]; }; - tidytext = derive2 { name="tidytext"; version="0.2.2"; sha256="1h1fpy86fha3jidb1xz0n3mfn7110mmf3dz9hpyfczqpyd62k3qq"; depends=[dplyr generics hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; }; - tidytidbits = derive2 { name="tidytidbits"; version="0.2.1"; sha256="1hyqk8p4w1mjk9f497f2lh8hlic6fs37jnawqpfmrl39ylx4z6r7"; depends=[dplyr extrafont forcats magrittr purrr rlang stringr tibble tidyr tidyselect]; }; - tidytransit = derive2 { name="tidytransit"; version="0.6.1"; sha256="0gm33d73k5rygdk6waaqlknkm65gg5xc6w85m3qhllch2akphh1j"; depends=[assertthat data_table digest dplyr hms httr lubridate magrittr readr rlang sf tibble tidyr zip]; }; - tidytree = derive2 { name="tidytree"; version="0.3.1"; sha256="1bnzs62z2l8ck2h9gabmxvayizv4nfn8dmyzry83fv0cspjbyiv7"; depends=[ape dplyr lazyeval magrittr rlang tibble]; }; + tidytable = derive2 { name="tidytable"; version="0.4.0"; sha256="16svngicns9xwkp1i16c1sd34p1w4np3nfd71pbz1b9w69pzc077"; depends=[data_table magrittr rlang]; }; + tidytext = derive2 { name="tidytext"; version="0.2.4"; sha256="0gck3f039qkpkwn92jlyfan76w0xydg17bh6nsg9qlba7c35kzs6"; depends=[dplyr generics hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; }; + tidytidbits = derive2 { name="tidytidbits"; version="0.2.2"; sha256="1wy1bnfz7jkp357a2d916dmiw36jdqfnkvdg1fa19w8r7zzgrz7d"; depends=[dplyr extrafont forcats magrittr purrr rlang stringr tibble tidyr tidyselect]; }; + tidytransit = derive2 { name="tidytransit"; version="0.7.1"; sha256="1n1m67yvlk6fnls5hah43ycvwqvw3c4v6xhmmx06zr92r3lr7xql"; depends=[assertthat data_table digest dplyr hms httr lubridate readr rlang sf tibble tidyr zip]; }; + tidytree = derive2 { name="tidytree"; version="0.3.3"; sha256="05b53dap0f784kl6s1wgck6m7brwmy6ifqp7v5l06s1spfspagl6"; depends=[ape dplyr lazyeval magrittr rlang tibble]; }; tidyverse = derive2 { name="tidyverse"; version="1.3.0"; sha256="02gyys08qv2v4cl2d66gml4d31ipxay0iyfwwksvxyclx60wp2kd"; depends=[broom cli crayon dbplyr dplyr forcats ggplot2 haven hms httr jsonlite lubridate magrittr modelr pillar purrr readr readxl reprex rlang rstudioapi rvest stringr tibble tidyr xml2]; }; - tidyxl = derive2 { name="tidyxl"; version="1.0.4"; sha256="19kcm9lfbkf61z0whfkn69b8m36qd1rvyhyk5y0cqbzkxvq8f70i"; depends=[piton Rcpp]; }; + tidyvpc = derive2 { name="tidyvpc"; version="1.0.0"; sha256="1f5ca0cbb3fwsdmb4zvgf8aglajmvks9jqidnx28ppy5w9qv1skc"; depends=[data_table magrittr quantreg rlang]; }; + tidyxl = derive2 { name="tidyxl"; version="1.0.5"; sha256="1ndhlch34aav2ji1adcvljcsy8l388h5vyjby9fvipq7ysa0yxzh"; depends=[piton Rcpp]; }; tiff = derive2 { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; }; tiger = derive2 { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin klaR lattice qualV som]; }; tigerhitteR = derive2 { name="tigerhitteR"; version="1.1.0"; sha256="0inyi12lf8bn7nbklf2rjixk6wrgrjcp8njv7knai4dgvv7v0rfa"; depends=[Hmisc magrittr openxlsx zoo]; }; @@ -14531,7 +14710,7 @@ in with self; { tigger = derive2 { name="tigger"; version="0.4.0"; sha256="1ns4shv4aaxlgahy9vy3wxxrnrz4zb0w40fcsldmh5jrvbxhhsb6"; depends=[alakazam doParallel dplyr foreach ggplot2 gridExtra gtools iterators lazyeval rlang shazam stringi tidyr]; }; tightClust = derive2 { name="tightClust"; version="1.1"; sha256="0vqkp2g6z8y3b6dhzglmacjhf2qi1sg80kb941mwfafin2k40zbm"; depends=[]; }; tigreBrowserWriter = derive2 { name="tigreBrowserWriter"; version="0.1.5"; sha256="0izgx1khci6qc6pz85dxj75kzxvpr30l0vhcv9476jrcbwqs4k8m"; depends=[DBI RSQLite]; }; - tigris = derive2 { name="tigris"; version="0.9.1"; sha256="1vwnxw4pg15pn87cz6f3ncfn1f145svikn8y2sphyvp0x7cid53x"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; }; + tigris = derive2 { name="tigris"; version="0.9.4"; sha256="1q98zh9zndimpl8zv35r40c8mhr8ncp3bmyxlvhnwvkpc073z90p"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; }; tikzDevice = derive2 { name="tikzDevice"; version="0.12.3"; sha256="1d8cxb3srmfv54c61c25myiknkm43ysl69lqjknhaj682x0nyz2r"; depends=[filehash png]; }; tilegramsR = derive2 { name="tilegramsR"; version="0.2.0"; sha256="11cnyvlghg8z7lr9ahzsjpyjrqnxqs77wdcydqvavrsqj745xvi2"; depends=[sf sp]; }; tiler = derive2 { name="tiler"; version="0.2.4"; sha256="1j1952vp0gnx0pnhqydipj4qw3cm05im502jc77wb2r1vklwimgb"; depends=[png raster rgdal sp]; }; @@ -14548,11 +14727,11 @@ in with self; { timelineR = derive2 { name="timelineR"; version="1.0.0"; sha256="01bb4201p18l1l5yp622ml9zd8spc978hvhw1s7j57qki5rw4kdf"; depends=[dplyr futile_logger ggplot2 gtable lubridate mtconnectR rlang stringr]; }; timelineS = derive2 { name="timelineS"; version="0.1.1"; sha256="076w8ckzzl59bc1gnwjgdwynnz86320hyfmzb0k26hl3k13jlmxs"; depends=[dplyr ggplot2 lubridate magrittr]; }; timeordered = derive2 { name="timeordered"; version="0.9.9"; sha256="0rfga5i6kckmlz2dzqb1pp634dl93wxp7v3kisxlbjl7mgnbck3k"; depends=[igraph plyr]; }; - timeperiodsR = derive2 { name="timeperiodsR"; version="0.6.1"; sha256="11dm8qp0887p8fnr12qvmidhk6wibqg2gszn73j9825d3csh2x9g"; depends=[lubridate]; }; + timeperiodsR = derive2 { name="timeperiodsR"; version="0.6.2"; sha256="09vwp04j7n176xs1lbdmbyi557byx6fdvqyjay1785hkb9ivws5q"; depends=[lubridate]; }; timereg = derive2 { name="timereg"; version="1.9.4"; sha256="0jxm3h2sjc83klxdry5r1wgliadk6967cmiifycfpz282vpfxx7v"; depends=[lava numDeriv survival]; }; timesboot = derive2 { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; }; timeseriesdb = derive2 { name="timeseriesdb"; version="0.4.1"; sha256="1ghb3lg63fs9zx34l5qczv39mdccnmqzlc74l1zhb8qmsg8sm1g2"; depends=[data_table DBI jsonlite openxlsx RPostgreSQL shiny xtable xts zoo]; }; - timetk = derive2 { name="timetk"; version="0.1.2"; sha256="0dp7pjydqcdi2nn4q73nqr4i4d9n4md9vb5y3znrlf1m8m9m4k4a"; depends=[dplyr lazyeval lubridate padr purrr readr stringi tibble tidyr xts zoo]; }; + timetk = derive2 { name="timetk"; version="1.0.0"; sha256="1q8832jhzr5kan1mz1khdaw9p0yd5rii8lnibb02b3zgl2nmn8pk"; depends=[assertthat broom dplyr forcats forecast ggplot2 hms lazyeval lubridate padr plotly purrr readr recipes rlang rsample slider stringi stringr tibble tidyr timeDate xts zoo]; }; timetools = derive2 { name="timetools"; version="1.14"; sha256="13jchgd9fc8hxj74wm1kg4rwcng4yxblkq04i33djsqghgb5f9mj"; depends=[]; }; timetree = derive2 { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkfflvqxn52y2041zl09rxrms28ybbd5f84c0"; depends=[phangorn XML]; }; timevis = derive2 { name="timevis"; version="0.5"; sha256="1psmnl6pkbizi2kjpaz9w32z2dkxlh4r229mfxsfqnjvf9sc34kj"; depends=[htmltools htmlwidgets jsonlite lubridate magrittr rmarkdown shiny]; }; @@ -14560,26 +14739,26 @@ in with self; { timsac = derive2 { name="timsac"; version="1.3.6"; sha256="186919qka9j3kfpdw2gbh16n48d6xgz9lfqgk4b17f1d7l72iplg"; depends=[]; }; tinsel = derive2 { name="tinsel"; version="0.0.1"; sha256="0n1x0cf4x6cq1yks0444nxd9snga4m6inc5lfvb7k96fzjb3xgbp"; depends=[]; }; tint = derive2 { name="tint"; version="0.1.2"; sha256="0afqlyi6d72x30pzzvmznz1l5pq4n30qiqa9ncbf0wjvqji7a182"; depends=[htmltools knitr rmarkdown]; }; - tinter = derive2 { name="tinter"; version="0.0.1"; sha256="1zw5a79mryqighf8b6gidsi30001749sllpwqwbck26cyal6m8y6"; depends=[checkr]; }; + tinter = derive2 { name="tinter"; version="0.1.0"; sha256="02hfw2720qn70x0piahm8cy2ajsb5bqapr4vyvknm4v1yka1wmw3"; depends=[chk]; }; tinyProject = derive2 { name="tinyProject"; version="0.6.1"; sha256="0cflnfp5mib3j1y3n5yvi867h5a7z6xr6163gq9y9b6nrl2skxfk"; depends=[brew R_utils]; }; tinytest = derive2 { name="tinytest"; version="1.1.0"; sha256="1y3f0x56xagf9m5wr2b26qahww13p8i2s66yr51xy9pqxdyjh2yl"; depends=[]; }; - tinytex = derive2 { name="tinytex"; version="0.19"; sha256="0jlcrvcqcbkimg7w40z5vhlnakb829vfgqpspm3pfl8karwzgqp6"; depends=[xfun]; }; + tinytex = derive2 { name="tinytex"; version="0.22"; sha256="0s9f62v3ps5f8903ar6kxlf1z3b4v78vlw1nb05bq55dgj8brg3b"; depends=[xfun]; }; tiobeindexr = derive2 { name="tiobeindexr"; version="0.1.1"; sha256="09vw83hkf7lgd3xyhbmqkyv57g3dz856230xkf8630jiicfvcg3b"; depends=[rvest xml2]; }; tipom = derive2 { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; }; tippy = derive2 { name="tippy"; version="0.0.1"; sha256="0kkyi4s4ffpyjyfl89cd5y788ab1p253rx179k422y3y1z6w1md7"; depends=[htmltools htmlwidgets jsonlite shiny]; }; tipr = derive2 { name="tipr"; version="0.1.1"; sha256="138xmkfad0xjrmr9v3ladbwsyknyad27wxcav03n6f72plhxmxb6"; depends=[broom purrr tibble]; }; - tis = derive2 { name="tis"; version="1.37.1"; sha256="0xg0fcavvny4h8c3ivhccvlb81l1pkgfvfj09658l2qvgi1iyxln"; depends=[]; }; + tis = derive2 { name="tis"; version="1.38"; sha256="0mqnvjfncfr8zc5rz1qq8jr1kv63p7sva7fvr3adbs7lgjza0yvm"; depends=[]; }; titan = derive2 { name="titan"; version="1.0-16"; sha256="0x30a877vj99z3fh3cw9762j5ci56964j2466xfbwcywhn9njz5r"; depends=[boot lattice MASS]; }; titanic = derive2 { name="titanic"; version="0.1.0"; sha256="0mdmh0ciwfig00847bmvp50cyvj8pra6q4i4vdg7md19z5rjlx3j"; depends=[]; }; titeIR = derive2 { name="titeIR"; version="0.1.0"; sha256="047vidn3zydbjijwgz6qm2d9j2ny8ng2sv5jzm8zb300y7k2426c"; depends=[Iso]; }; titrationCurves = derive2 { name="titrationCurves"; version="0.1.0"; sha256="0z127sihd262mdik46sq9vcf05s7jsqmkpm3p4d779viw74bl768"; depends=[]; }; tkRplotR = derive2 { name="tkRplotR"; version="0.1.2"; sha256="146jqjnbxqsph804ysd2jrcmm5qvqa7yi4f41sq0myjlkqvd6ndk"; depends=[]; }; - tkrgl = derive2 { name="tkrgl"; version="0.8"; sha256="1c5jiahqpf3nfybkzmks785dlkchjdisvknxkb0biv3xj9nzgz14"; depends=[rgl]; }; + tkrgl = derive2 { name="tkrgl"; version="0.9"; sha256="00767mxsaqkp7wsazznx6pr9dw75xmnijjqncbpavqf67g0cjinp"; depends=[rgl]; }; tkrplot = derive2 { name="tkrplot"; version="0.0-24"; sha256="04gk48vm8ilj1n3b3ir66pcfv504ra4rlgc0ll4ixbnp6w566wr8"; depends=[]; }; tlemix = derive2 { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx4c27hwxlb3c5ps65ipm6gi8v8r6spj"; depends=[]; }; tlm = derive2 { name="tlm"; version="0.1.5"; sha256="1iw08pa70nb25fnv64834s5c8vl456a2rcng7x6v9vs5q37610g6"; depends=[boot]; }; tlmec = derive2 { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7bm8hgav1x3h14k2ra7236v82rqbw7"; depends=[mvtnorm]; }; - tlrmvnmvt = derive2 { name="tlrmvnmvt"; version="1.0.1"; sha256="18xjzqh9zr5lfmwmcqiq4zn9k7b8q75z76im5qy6av7r2qz1n75m"; depends=[BH Rcpp RcppEigen]; }; + tlrmvnmvt = derive2 { name="tlrmvnmvt"; version="1.1.0"; sha256="0mi1261659qg0ym4nqk0w6gw68wx37fq43s899szyyx08dj46mbb"; depends=[BH Rcpp RcppEigen]; }; tls = derive2 { name="tls"; version="0.1.0"; sha256="183b5m70s2whlgp9s1gb4xnylhlp4hnh3lw6b8f2vx4kahaid763"; depends=[]; }; tm = derive2 { name="tm"; version="0.7-7"; sha256="0pyics8j7a4wkh5gzin46l0qars5vgbb1886xqpdqjs1z0gy9nyh"; depends=[BH NLP Rcpp slam xml2]; }; tm_plugin_alceste = derive2 { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; }; @@ -14589,9 +14768,9 @@ in with self; { tm_plugin_lexisnexis = derive2 { name="tm.plugin.lexisnexis"; version="1.4.1"; sha256="0c094z83mcq8blc8w7kvy91d28qqcx6f6193p3frpviznlaq21xk"; depends=[ISOcodes NLP tm xml2]; }; tm_plugin_mail = derive2 { name="tm.plugin.mail"; version="0.2-1"; sha256="0rn8jqv622qmc0zkz534ka5qnbca2rlabxm3vjbqplr6fh1ahwb1"; depends=[NLP tm]; }; tm_plugin_webmining = derive2 { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; }; - tm1r = derive2 { name="tm1r"; version="1.1.3"; sha256="1r1va052aaya70pvvn950833w0q0sbd67yyg3m2qdikgniq3dn6z"; depends=[httr jsonlite]; }; - tmap = derive2 { name="tmap"; version="2.3-2"; sha256="01v4z73xpxpg87daka2vcy1gj170qjg7qdl44vrfjrxib46cn2fa"; depends=[classInt htmltools htmlwidgets leaflet leafsync lwgeom raster RColorBrewer sf tmaptools units viridisLite]; }; - tmaptools = derive2 { name="tmaptools"; version="2.0-2"; sha256="1n8m4c3q7i60p8r2xfhw8rfqmflyaicf8y1bkfkmx74afz6hv184"; depends=[classInt dichromat KernSmooth lwgeom magrittr raster RColorBrewer rgdal rgeos sf sp units viridisLite XML]; }; + tm1r = derive2 { name="tm1r"; version="1.1.4"; sha256="165yn07nxywyxdd52g917rmzqyjpv6ai11fhl9g6dj163l4vcn5a"; depends=[httr jsonlite]; }; + tmap = derive2 { name="tmap"; version="3.0"; sha256="0xd8kdrn1hvc9r73rjg6cjrvyprqkkriqf2fxnr8mkxv31zmmcg3"; depends=[classInt htmltools htmlwidgets leafem leaflet leafsync RColorBrewer sf stars tmaptools units viridisLite]; }; + tmaptools = derive2 { name="tmaptools"; version="3.0"; sha256="0d36rv9275m32rqx259azqg55f1vpjihydhhic2bh4sjwxrbp58i"; depends=[classInt dichromat KernSmooth lwgeom magrittr raster RColorBrewer sf stars units viridisLite XML]; }; tmbstan = derive2 { name="tmbstan"; version="1.0.2"; sha256="1g4b415k36wij028xz15kwpv8hmx92kznsp231bnrprzw2vrninr"; depends=[BH Rcpp RcppEigen rstan StanHeaders TMB]; }; tmcn = derive2 { name="tmcn"; version="0.2-13"; sha256="0rf8mz6kdm83pm85kzfyzb8kd3iwaxv5bgphjpxlnq6z32m9yds7"; depends=[]; }; tmg = derive2 { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp RcppEigen]; }; @@ -14603,26 +14782,24 @@ in with self; { tmvmixnorm = derive2 { name="tmvmixnorm"; version="1.0.2"; sha256="04bjdlrz82v9skirap2fmngi2sv9xakkgmkgpwdv3qshszvx3wz4"; depends=[]; }; tmvnsim = derive2 { name="tmvnsim"; version="1.0-2"; sha256="03xsvsg9bqvgl98ywid3h91mmlhax5s6wvmypp3hq91vmc5kvxlp"; depends=[]; }; tmvtnorm = derive2 { name="tmvtnorm"; version="1.4-10"; sha256="1w3kmpx25l7rb80vpclqq4pbbv12qgysyqxjq3lp55l9nklkb7qs"; depends=[gmm Matrix mvtnorm]; }; - tnam = derive2 { name="tnam"; version="1.6.5"; sha256="0jbwnsnn6875yprmh6y2i0bvr875hfsg7wfsj6ydmjpr5cpqqk56"; depends=[igraph lme4 network Rcpp sna vegan xergm_common]; }; - tnet = derive2 { name="tnet"; version="3.0.14.1"; sha256="1fvczx1lc8a7w4mbg1yzsiayfg5qwyjvg02s4r631vcml6vkznsf"; depends=[igraph survival]; }; + tnet = derive2 { name="tnet"; version="3.0.16"; sha256="0922y9zb64zazl2irwfxxbghkgcwi2q57gylpiaxgmj4q6lc62l9"; depends=[igraph survival]; }; toOrdinal = derive2 { name="toOrdinal"; version="1.1-0.0"; sha256="0zg4zk7jx8s57g8nb0jw7r7gss00349jmkglf6sz26p7jldpgmff"; depends=[crayon testthat]; }; - todor = derive2 { name="todor"; version="0.0.5"; sha256="1zv6bky5v14csq3pmyy7qzmy680pg3qrj1zghqixsf54aqm7h96q"; depends=[rex rstudioapi stringr]; }; + todor = derive2 { name="todor"; version="0.1.0"; sha256="0xgw2mz0b96adycwfyga17r5s9k47q5bgvnsxmqm4h6mx7d1fzzx"; depends=[rex rstudioapi stringr]; }; togglr = derive2 { name="togglr"; version="0.1.33"; sha256="105c9vxa67bqccj31ksk5myfd0v7v0wbz6qqjhxqndlg7v6ggfzc"; depends=[assertthat dplyr getPass glue httr jsonlite keyring lubridate magrittr parsedate prettyunits purrr rstudioapi]; }; - tokenbrowser = derive2 { name="tokenbrowser"; version="0.1.1"; sha256="0sslli1m4lrg8bf5rzjndvf9hsw3c6mqwj8cp27mgn8ibxckrjd2"; depends=[Rcpp stringi]; }; + tokenbrowser = derive2 { name="tokenbrowser"; version="0.1.4"; sha256="09bhwqqw2nr5c985ml8d6ik19r8jvxcj1l7v4xhb3y6n9k6dqxwr"; depends=[Rcpp stringi]; }; tokenizers = derive2 { name="tokenizers"; version="0.2.1"; sha256="006xf1vdrmp9skhpss9ldhmk4cwqk512cjp1pxm2gxfybpf7qq98"; depends=[Rcpp SnowballC stringi]; }; tokenizers_bpe = derive2 { name="tokenizers.bpe"; version="0.1.0"; sha256="1pwgjrzdcsafpv9rlyly6fckcjiymz0xcjm9byavj069kc4c69mi"; depends=[Rcpp]; }; - tolBasis = derive2 { name="tolBasis"; version="1.0"; sha256="0g4jdwklx92dffrz38kpm1sjzmvhdqzv6mj6hslsjii6sawiyibh"; depends=[lubridate polynom]; }; - tolerance = derive2 { name="tolerance"; version="1.3.0"; sha256="17qh4ad1f3fbcpwlxxqh8qr9bnwjcl4yxk0l3fkbr6b2l4rc5p86"; depends=[rgl]; }; + tolerance = derive2 { name="tolerance"; version="2.0.0"; sha256="001snzr2ipag3zprynydlbi9prkjzrllc054qh7m0qwkb3r19jjd"; depends=[MASS rgl]; }; toolmaRk = derive2 { name="toolmaRk"; version="0.0.1"; sha256="0pdr8lq4c11ia03v68lbfq38p3qp770mbj0nsbjsgbqi0pv9i1vx"; depends=[dplyr ggplot2 plyr reshape2]; }; tools4uplift = derive2 { name="tools4uplift"; version="0.1-1"; sha256="0difrjqgj8amc49mwh059ca9mr0z1fzy0g43vk43alsyl8lvajc4"; depends=[dplyr glmnet]; }; topicdoc = derive2 { name="topicdoc"; version="0.1.0"; sha256="0qliy6y8l09nblch1swlywam2awzwjl5xx0w8c3kiz48jxfysw0j"; depends=[slam topicmodels]; }; - topicmodels = derive2 { name="topicmodels"; version="0.2-9"; sha256="1757r5x8bsl4dk106xg6481mvdkdz9vwg87n7rpbvdkavsvhyxs0"; depends=[modeltools slam tm]; }; + topicmodels = derive2 { name="topicmodels"; version="0.2-11"; sha256="0jmp6wva99y0w40cfw7b0faylndhjam097x36ilc4vmyczcv89lw"; depends=[modeltools slam tm]; }; topmodel = derive2 { name="topmodel"; version="0.7.3"; sha256="15w9id90d6l0i0ji3ln3sxnpispb6pgabk4waysqn0nh6y4lfdgb"; depends=[]; }; topoDistance = derive2 { name="topoDistance"; version="1.0.1"; sha256="055z3gvqlb8nyy58ix89w7miav9gj3h43a4wcfc3kagd97xc3222"; depends=[gdistance igraph plotly raster RColorBrewer scales sp]; }; topologyGSA = derive2 { name="topologyGSA"; version="1.4.6"; sha256="0vas7qab5a86jb277ql63qjvfvx7iqqbcrwky7iyr0s8p8p794ia"; depends=[fields graph gRbase qpgraph]; }; topsis = derive2 { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; }; - tor = derive2 { name="tor"; version="1.1.1"; sha256="0vibnjm0q8rn73c5xdbfw5z4pk4ja1m1mx9c6p423pz72znwrcpw"; depends=[fs readr rlang tibble]; }; - tosca = derive2 { name="tosca"; version="0.1-4"; sha256="1c7x89b2vh2xl5bc1xgclmnk2gajqalxmz4ipqlwp9axz91w85gs"; depends=[data_table htmltools lda lubridate quanteda RColorBrewer stringr tm WikipediR]; }; + tor = derive2 { name="tor"; version="1.1.2"; sha256="1s34hzw3a4cm9gk85fcxgxwmn2xc7njs1iw1snd91id3gdl6vppx"; depends=[fs readr rlang tibble]; }; + tosca = derive2 { name="tosca"; version="0.2-0"; sha256="0sq6libv2vi5q3738fksjxabfhv63zc7nldgb4nh6k57yxqzwf3z"; depends=[data_table htmltools lda lubridate quanteda RColorBrewer stringr tm WikipediR]; }; tosls = derive2 { name="tosls"; version="1.0"; sha256="03nqwahap504yvcksvxdhykplbzmf5wdwgpzm7svn8bymdc472v2"; depends=[Formula]; }; totalcensus = derive2 { name="totalcensus"; version="0.6.3"; sha256="0489bzc8y4zgs4rpd52xbc2hm7g0y46j40f5bmqp5h56aq259jsa"; depends=[data_table magrittr purrr stringr]; }; touch = derive2 { name="touch"; version="0.1-5"; sha256="0dan4mlvc5lg9v4zj9w6gk3c4cy64kaa984y495xpc1bzmv5c6jd"; depends=[Rcpp]; }; @@ -14637,37 +14814,39 @@ in with self; { tracerer = derive2 { name="tracerer"; version="2.0.2"; sha256="0xh95qrd63s04zs69fcrmvwscn153qlpw2xlkzn8h6jwsd92amv9"; depends=[jsonlite Rcpp testit]; }; tracheideR = derive2 { name="tracheideR"; version="0.1.1"; sha256="1x1jwzgs2aqb3k17mm9mhfhnbwcmilhkjaz9rl40rcg84xjqdrpl"; depends=[tgram]; }; track = derive2 { name="track"; version="1.1.9"; sha256="1d0hab7xyayyhyyrbv8nvpka1kzry4yx10fg8aqwkca3nm7n2q3c"; depends=[]; }; - trackdem = derive2 { name="trackdem"; version="0.5.1"; sha256="06vhgm5sqafx90isfxq71gz82zznyjvl63rqyg5rx22syqsh4mbi"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo shiny]; }; + trackdem = derive2 { name="trackdem"; version="0.5.2"; sha256="1kax2fr252rd0pqdf7ndgl8pb492fs1scn8xyasxxjdnlghdkk0d"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo shiny]; }; trackdf = derive2 { name="trackdf"; version="0.2.1"; sha256="18kiwbrfalj19gjp2v3yhxlmc6liw5scfnwx2svq5f5h3h54a7iz"; depends=[data_table lubridate rgdal sp tibble]; }; trackeR = derive2 { name="trackeR"; version="1.5.2"; sha256="1f3giz6naxxyicgy9v0391ang43srwhy9zbiv4zmlc8i9v05b57i"; depends=[fda foreach ggmap ggplot2 ggridges gridExtra gtable jsonlite leaflet raster RSQLite scam sp xml2 zoo]; }; trackeRapp = derive2 { name="trackeRapp"; version="1.0"; sha256="05r012kcf86j45q00y6ynz9srd0by45w41bpx9mf7q4h8m5nm0jn"; depends=[changepoint colorspace DT foreach mapdeck mgcv plotly sf shiny shinydashboard shinyjs shinyWidgets trackeR V8 zoo]; }; - trackr = derive2 { name="trackr"; version="0.10.5"; sha256="0cngwszax3i9p0095kxrz7w4rnryc0lmylckixzrmhx80qkxcaw1"; depends=[CodeDepends fastdigest ggplot2 gridGraphics histry htmltools lattice miniUI RJSONIO rlang rmarkdown roprov rsolr shiny]; }; + trackr = derive2 { name="trackr"; version="0.10.6"; sha256="0p7i4cj5z1qis2a1mqqz3wrgwhhbcggyyfwj3zycm3xcig9f6d9b"; depends=[CodeDepends fastdigest ggplot2 gridGraphics histry htmltools lattice miniUI RJSONIO rlang rmarkdown roprov rsolr shiny]; }; tractor_base = derive2 { name="tractor.base"; version="3.3.2"; sha256="0y5gm0y4chl30f5qqq8qiiw4j8g32s4i9xrvyp3cwg902kf2p86i"; depends=[ore reportr RNifti shades]; }; - trade = derive2 { name="trade"; version="0.5.4"; sha256="05skmm2j826wjhmxdvkln50y0mjy74qcl2hay2l1322qqs7phin6"; depends=[antitrust]; }; - tradestatistics = derive2 { name="tradestatistics"; version="0.2.7"; sha256="1pl8qrzf4dx1pcyrhf2rzp5wrfdgv6azlpi83wy5w078ckm2hly3"; depends=[crul dplyr jsonlite magrittr purrr rlang stringr]; }; + tradestatistics = derive2 { name="tradestatistics"; version="1.0"; sha256="09zbgf971gb1m5d1jfwkdrj78ckj3gq5i03p9wfxbljb7rqby6la"; depends=[crul data_table digest jsonlite memoise]; }; trafo = derive2 { name="trafo"; version="1.0.1"; sha256="0gq3snjpkw0ncny7pkfi686qkgdhd8id73jxjk3chhqf5mzrrsbc"; depends=[FNN lmtest moments pryr]; }; traineR = derive2 { name="traineR"; version="1.0.0"; sha256="0m0k9hxdpx8dzxdy8i0k2rqmibm78fkw8fykkm5r56g7zjh3b7g0"; depends=[ada dplyr dummies e1071 kknn neuralnet nnet randomForest rpart stringr xgboost]; }; traipse = derive2 { name="traipse"; version="0.1.0"; sha256="0174rxc3p3s848s9ynkkw32f33dq9gnq7zd14i3b9xnp8zr9jnph"; depends=[geodist geosphere magrittr]; }; - traitdataform = derive2 { name="traitdataform"; version="0.5.6"; sha256="0wp3z9l9vpniaa2b53qq6a77ya0my9cvkqd8i831zsxyj63vaabl"; depends=[data_table getPass plyr RCurl reshape2 taxize units XML]; }; + traitdataform = derive2 { name="traitdataform"; version="0.5.7"; sha256="1h01hkxx3xz1kaliq3arx8hb82k9jx19s755y6xbyji6jp6hwy3h"; depends=[data_table getPass plyr RCurl reshape2 taxize units XML]; }; traitr = derive2 { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest gWidgets proto]; }; traits = derive2 { name="traits"; version="0.4.2"; sha256="1aiy7mdwji72rrmf8gwmnpkhfbqbqbblffxghniw5pfpv55j6mib"; depends=[crul data_table hoardr httr jsonlite readr rvest taxize tibble xml2]; }; traj = derive2 { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster GPArotation NbClust pastecs psych]; }; trajectories = derive2 { name="trajectories"; version="0.2-1"; sha256="0sw1gcwmz2d27ck8gm5xa9bmmpgpy483brdyi74wccchwb3nfw2m"; depends=[lattice sp spacetime zoo]; }; trajr = derive2 { name="trajr"; version="1.3.0"; sha256="1p092kqvwg3ncbk9hh8dij2grl1hfs3j5j64cqn227nr5b3xn1rc"; depends=[plotrix signal]; }; tram = derive2 { name="tram"; version="0.3-2"; sha256="043j8f2vhbm4alr47bv0ghv4358ckvd74hnlq8516b6is3ll1h72"; depends=[basefun Formula Matrix mlt multcomp sandwich survival variables]; }; + tramME = derive2 { name="tramME"; version="0.0.2"; sha256="1khzxjk1wp3gbhjxjlq07rmqr1rydjdbkl03fd6ld1dh1knl4bwp"; depends=[alabama basefun lme4 Matrix mlt nlme RcppEigen TMB tram variables]; }; + tramnet = derive2 { name="tramnet"; version="0.0-2"; sha256="0q57cs9y0ssks7c9bbnhkvndl1yz6bsrpmcmml1nlvq2gs9rv9wg"; depends=[basefun CVXR lhs mlr mlrMBO mlt ParamHelpers sandwich smoof tram]; }; tranSurv = derive2 { name="tranSurv"; version="1.2.0"; sha256="0r698s2yg7ypyzid52a46p0bhl3xi4rh50bfnx0pacc65rigjr6f"; depends=[SQUAREM survival]; }; transcribeR = derive2 { name="transcribeR"; version="0.0.0"; sha256="0y2kxg2da71i962fhsjxsr2ic3b31fmffhj3gg97b0nykfpcviib"; depends=[httr]; }; transformr = derive2 { name="transformr"; version="0.1.1"; sha256="186n789zzf2p9ggw9j7gmd4knfq051jhl35x1585jgll2karyn2c"; depends=[lpSolve Rcpp rlang sf tweenr]; }; translate = derive2 { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; }; translateR = derive2 { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; }; translation_ko = derive2 { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; }; - transplantr = derive2 { name="transplantr"; version="0.1.0"; sha256="0gzx4xmps1n8363q1y34gjgh48rnzh2ww19d6qg7q12mli2biz92"; depends=[]; }; - transport = derive2 { name="transport"; version="0.12-1"; sha256="04ds3i372ri0w3qy1nn6gjrhip89978zbpvi9c5dlsbh8wwk583l"; depends=[data_table Rcpp RcppEigen]; }; + transmem = derive2 { name="transmem"; version="0.1.0"; sha256="1rx83cwx8mg2iyqqq2bb4yp8bpa6n6pxm6af7jkyp1gafnv7dvci"; depends=[cmna ggformula ggplot2 plot3D]; }; + transplantr = derive2 { name="transplantr"; version="0.2.0"; sha256="1kzi8rvswsmibxqnhqd1j42y848si6cxd8hpvwi55y8s4hcylw0y"; depends=[]; }; + transport = derive2 { name="transport"; version="0.12-2"; sha256="1d49gm5lwih7b7rav3c42brcp6xi3y55xw11r9n8illjwjayfcxd"; depends=[data_table Rcpp RcppEigen]; }; trapezoid = derive2 { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; }; trawl = derive2 { name="trawl"; version="0.2.1"; sha256="1ns4nk8zdnl2z9clc2q38sbb1ijkj86lcifxq7d111mcwsmpb6fi"; depends=[DEoptim MASS rootSolve Runuran squash TSA]; }; tree = derive2 { name="tree"; version="1.0-40"; sha256="1rr6ws62j9h36f3nl713f8h3ndkh95mv46l055jvgmby5lw1dazz"; depends=[]; }; tree_bins = derive2 { name="tree.bins"; version="0.1.1"; sha256="1flrkhdqimsn8dxn97xzl1fykx916i1dis1bfany44yk0cjmd85g"; depends=[data_table dplyr rpart rpart_utils]; }; - tree_interpreter = derive2 { name="tree.interpreter"; version="0.1.0"; sha256="17yci49zsz05ydjzs0zbz8xg2vdjmh8xq6cfxchrq488kvjyjzsz"; depends=[Rcpp RcppArmadillo]; }; + tree_interpreter = derive2 { name="tree.interpreter"; version="0.1.1"; sha256="18p1x53q1hhhagglgsq2axnr9l5rpa08vxjayqqmb6rsjrkygn78"; depends=[Rcpp RcppArmadillo]; }; treeClust = derive2 { name="treeClust"; version="1.1-7"; sha256="1s7kh6q0bkixsygrip95zf1bi10ihddsa5lq9dfxd68yh8rsby6z"; depends=[cluster rpart]; }; treeDA = derive2 { name="treeDA"; version="0.0.4"; sha256="0zhzb21lvxk278ysl275g39y2r8dlgqdix5rfg2pwv3nzj2531rc"; depends=[ggplot2 gtable Matrix mvtnorm phyloseq reshape2 sparseLDA]; }; treeHMM = derive2 { name="treeHMM"; version="0.1.1"; sha256="1chg1y26x4nm2wm2nsqw51lx2w8b89wdq8ywh1l03xhw8lgdsv47"; depends=[future gtools Matrix matrixStats PRROC]; }; @@ -14675,25 +14854,25 @@ in with self; { treeclim = derive2 { name="treeclim"; version="2.0.3"; sha256="03d734zxz4vjrx7xw9r8y8lcsacn0p92q09n05vqfx4p7wvpwp26"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; }; treecm = derive2 { name="treecm"; version="1.2.2"; sha256="0vrawg4vvy270dn20gb2k99xi4q89l4mjz0mm7ikpz8wxqypzq2l"; depends=[plyr]; }; treedater = derive2 { name="treedater"; version="0.5.0"; sha256="007rdrbv3v1z3qbyasla22rck105sqlqh93yfmxklihdydl7smfd"; depends=[ape limSolve]; }; + treefit = derive2 { name="treefit"; version="1.0.0"; sha256="10yf4bm26vgiy3ra0c5lpflp0xdijw9zwl4aq9bz89qhszzji1fa"; depends=[ggplot2 igraph patchwork pracma]; }; treelet = derive2 { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; }; - treeman = derive2 { name="treeman"; version="1.1.3"; sha256="0xvazizpi3dbdgjd48ff4kg4dhsi2yzbnkk43pgyi21zii673yyn"; depends=[ape bigmemory plyr RJSONIO stringr]; }; treemap = derive2 { name="treemap"; version="2.4-2"; sha256="15bdgkdwryb55v82b3hpcx4ykfg5z7zf10h0wwknf6kl1kn34v90"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; }; treemapify = derive2 { name="treemapify"; version="2.5.3"; sha256="1y6fyzxk542fp4h975xfgajz7cjym3rjs6asal9arv94a9cqra33"; depends=[ggfittext ggplot2]; }; - treenomial = derive2 { name="treenomial"; version="1.1.1"; sha256="13dsls2x3nlsdqs8whr7yq8gkacw3rzrvcbj47vkwqcpbgk2xwi8"; depends=[ape Rcpp RcppArmadillo RcppThread]; }; + treenomial = derive2 { name="treenomial"; version="1.1.2"; sha256="0nn5vd23nxfpk8wm68m6sxnx495nb6bkgx2w9lgjy4s66sbnddp0"; depends=[ape Rcpp RcppArmadillo RcppThread]; }; treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; }; treeplyr = derive2 { name="treeplyr"; version="0.1.7"; sha256="11y15dslalwifarz79zyc5vxszyajkjyzm98p0w1n8gfr6lrq9yy"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; }; treespace = derive2 { name="treespace"; version="1.1.3.2"; sha256="18xqvqpcknvwdvl84jskcwmsw3alcwns0d35a8paalwjkix03175"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn phytools Rcpp rgl RLumShiny scatterD3 shiny shinyBS]; }; treestartr = derive2 { name="treestartr"; version="0.1.0"; sha256="05rxy9lmb77ng4266871sd881mlp4rd5qalvsd7ps2x2j4plaqf4"; depends=[ape phytools]; }; - treethresh = derive2 { name="treethresh"; version="0.1-11"; sha256="1fksyn9mycr6dpw1yh5b3fa7fk7ndz7q39174daplm55jbrz1dr5"; depends=[EbayesThresh wavethresh]; }; + treestructure = derive2 { name="treestructure"; version="0.1.0"; sha256="0514q53bdwv9fwd58srhr6lzw1j56fcd64hml8w4rv4wzcd6c01m"; depends=[ape Rcpp]; }; trekcolors = derive2 { name="trekcolors"; version="0.1.1"; sha256="1fw2wgkkky79vy9sc3cn42vmfcdnsjsnhb81wvalwi6ww64fzrkh"; depends=[ggplot2]; }; trekfont = derive2 { name="trekfont"; version="0.9.3"; sha256="15p1r5q36fbajhwidjhhvvldckvz5js08w4cnj47gqr4lpmmpbx7"; depends=[]; }; - trelliscopejs = derive2 { name="trelliscopejs"; version="0.1.18"; sha256="1i13l3a74cxppkffzbpnyh2faqdwj3gy55s4s0fck1fwpvlkn5zr"; depends=[autocogs base64enc digest DistributionUtils dplyr ggplot2 gtable htmltools htmlwidgets jsonlite knitr progress purrr rlang tidyr webshot]; }; + trelliscopejs = derive2 { name="trelliscopejs"; version="0.2.4"; sha256="0dx4r31v1611yimqx9jh5ikrrk6ipz6dpqci7wxy3lbrcdsz0acq"; depends=[autocogs base64enc digest DistributionUtils dplyr ggplot2 gtable htmltools htmlwidgets jsonlite knitr progress purrr rlang tidyr webshot]; }; trelloR = derive2 { name="trelloR"; version="0.1.0"; sha256="0d549yw9pfxs8a3q716z08fzg68bkm5l09cv5iqqkm4gyasrxsf4"; depends=[dplyr httr jsonlite]; }; trend = derive2 { name="trend"; version="1.1.2"; sha256="09b6ycyfgs4xlhx6kn6qm5rl2acp58hzhv8qclzn3kb1wjjyvxy5"; depends=[extraDistr]; }; trendchange = derive2 { name="trendchange"; version="1.1"; sha256="19r0kmwsim78ynssyh6j0zd99cz96cacy3hmyrjabwwvz0f8sk3h"; depends=[]; }; trendsegmentR = derive2 { name="trendsegmentR"; version="1.0.0"; sha256="0zgm5nbm5azmz6x0xg4aphc80q6x1cvijry9pznyi0mg14743g86"; depends=[]; }; trendyy = derive2 { name="trendyy"; version="0.1.1"; sha256="03n7qdfc197hds8bdwl20b0nn62nqnz9r35v1q315nm3ccdifl1p"; depends=[crayon dplyr gtrendsR magrittr purrr stringr tibble]; }; - trialr = derive2 { name="trialr"; version="0.1.3"; sha256="15330qsihq71x78pxv2k6pb1xfhp5qgdq0p4jibcjn1q114rp2ph"; depends=[BH binom coda dplyr ggplot2 gtools magrittr MASS purrr Rcpp RcppEigen rlang rstan rstantools StanHeaders stringr tibble tidybayes tidyr]; }; + trialr = derive2 { name="trialr"; version="0.1.4"; sha256="1gd438j0r2x15xl8nbszz7kms20zw9s8j9nl1xf0vgkqwfcblkvg"; depends=[BH binom coda dplyr ggplot2 gtools magrittr MASS purrr Rcpp RcppEigen rlang rstan rstantools StanHeaders stringr tibble tidybayes tidyr]; }; triangle = derive2 { name="triangle"; version="0.12"; sha256="1cv3l97myhkyl0c4xjympqghlk0av8xfk00av8kj93ndgkv5bfj7"; depends=[]; }; triangulation = derive2 { name="triangulation"; version="0.5.0"; sha256="1zp09g0s0qpqgz2k6jx32pswh2zqyyd0b62lf1dx1p46m28dafkn"; depends=[]; }; tribe = derive2 { name="tribe"; version="0.1.8"; sha256="01z1b9k3j4xi5fp9pkpr991yr7x8vk8vysipy7iwdmdr7xg4w4p0"; depends=[dplyr lazyeval magrittr rlang rstudioapi]; }; @@ -14701,21 +14880,21 @@ in with self; { triebeard = derive2 { name="triebeard"; version="0.3.0"; sha256="1hqyz57gph02c9fdc07lxz113bbklif3g18sw8jan6pakhhdc7dz"; depends=[Rcpp]; }; trigpoints = derive2 { name="trigpoints"; version="1.0.0"; sha256="1hckjh2gb0fvd2c8x6mj0idpk3im7b831y7mbli1hqhry6qqdw15"; depends=[sf tibble]; }; trimTrees = derive2 { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[mlbench randomForest]; }; - trimcluster = derive2 { name="trimcluster"; version="0.1-2.1"; sha256="0013bpyq6mkvjn38qsmwnsxfiwxgwngnqxycxvgpgmiadhm8fjmn"; depends=[]; }; + trimcluster = derive2 { name="trimcluster"; version="0.1-5"; sha256="12siv8yx8dcavsz8jk96lwscbj257ar8jpaxksl2zb06987g4fcj"; depends=[]; }; trimmer = derive2 { name="trimmer"; version="0.8.1"; sha256="0hn5pignj5clg7wb3xd0mh9jqc480wqxxymzaas68lxzi6p5mng9"; depends=[cli crayon data_table pryr]; }; trimr = derive2 { name="trimr"; version="1.0.1"; sha256="0gcn18nwxmax9c35is0nldyh74cw8rg3gj60cixzs9qjnpb9xx3d"; depends=[]; }; trinROC = derive2 { name="trinROC"; version="0.4"; sha256="02civ3r14hr6gbw6bdh77y00kiki6cdcv85hxk5g6n2nfspdr67r"; depends=[ggplot2 gridExtra rgl]; }; trioGxE = derive2 { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[gtools mgcv msm]; }; trip = derive2 { name="trip"; version="1.6.0"; sha256="089wwdbf3mqz2gxskr9pwi124qbmjf6s9gq7vfrjyhcbp4xx8hwp"; depends=[geodist glue maptools MASS raster sp spatstat viridis]; }; tripEstimation = derive2 { name="tripEstimation"; version="0.0-44"; sha256="1ylpyzlqr6l5haxq4icnlxw6vgvc2lsfz5sm2wqqm4m6h3p0i6s6"; depends=[lattice mgcv rgdal sp zoo]; }; - tripack = derive2 { name="tripack"; version="1.3-8"; sha256="0pf707z6xysxvcs508nadga3mglpvmfk6r061qda8acn58ll1cvb"; depends=[]; }; + tripack = derive2 { name="tripack"; version="1.3-9"; sha256="044cda8vg1mz9zlkhlxxz258qwmlr912zyrndbl14jw94c66fh1b"; depends=[]; }; tripsAndDipR = derive2 { name="tripsAndDipR"; version="0.1.0"; sha256="1gm96fxgql9y08w177nyxw0bahyafcs75maz743a9hfb0gjixvy2"; depends=[]; }; triversity = derive2 { name="triversity"; version="1.0"; sha256="1bar2bpy8jvj91jmzzdwy6rlvirsbxrzqnx4r825irqhc69gc53r"; depends=[data_tree Matrix]; }; tropAlgebra = derive2 { name="tropAlgebra"; version="0.1.1"; sha256="1idvhxhw2f6z8iq0nfdj6jmzy8913vid84rvln6rx2dkzw3s9wnl"; depends=[]; }; tropicalSparse = derive2 { name="tropicalSparse"; version="0.1.0"; sha256="1ay6i3pzz5lpvznxqln31mijp86p6z0df7rvp0gm4lxvn294m7f8"; depends=[]; }; trotter = derive2 { name="trotter"; version="0.6"; sha256="0i8r2f2klkkfnjm7jhvga3gx6m7r97pd73d88004jzlm9ficspgy"; depends=[]; }; trread = derive2 { name="trread"; version="0.2.7"; sha256="158mwnwkmwjvir8caz42jqc599xn9qkqx6bsi76m8l6szf09s0sl"; depends=[assertthat data_table dplyr here hms htmltools httr lubridate magrittr readr rlang scales stringr tibble tidyr zip]; }; - trtf = derive2 { name="trtf"; version="0.3-6"; sha256="1h90d3bpfq3nr2c44lynan1scz650nbzjry5i687wxa1c348lvb6"; depends=[Formula libcoin mlt partykit sandwich variables]; }; + trtf = derive2 { name="trtf"; version="0.3-7"; sha256="11fq119x59adls2r0af2p19zwbk5ykn5brdzqbqxy8ngmpncmzxr"; depends=[Formula libcoin mlt partykit sandwich variables]; }; truelies = derive2 { name="truelies"; version="0.2.0"; sha256="1qxzw7x7xgp9x6klnq6jv0fl8al2l24br2sd59r5gq076gkqc47k"; depends=[hdrcde]; }; trueskill = derive2 { name="trueskill"; version="0.1"; sha256="0mqvm64fcsxjlh789lqdk6l28q31yhh6jjirwjlgbpxxb90c5107"; depends=[]; }; truncSP = derive2 { name="truncSP"; version="1.2.2"; sha256="1hdi518j3sg9273g01l1jqlmqya3ppim82ma7zakwqpmsjmzw18q"; depends=[boot truncreg]; }; @@ -14728,17 +14907,17 @@ in with self; { trustedtimestamping = derive2 { name="trustedtimestamping"; version="0.2.6"; sha256="1rx7ypy331mq5ni5hxhqcfnicvwdgg9j2pm3aj097a5hhigibdrq"; depends=[digest httr jsonlite]; }; tryCatchLog = derive2 { name="tryCatchLog"; version="1.1.6"; sha256="0ik2y2ac771z9r0wb4av2xhr3xv36n4wcv8cqx0vid3wcmbl6prc"; depends=[]; }; tsBSS = derive2 { name="tsBSS"; version="0.5.5"; sha256="19i9raw3wiig66a84msqqwwxd9br4ayk108v7d9j78d0ynm6ki84"; depends=[boot forecast ICtest JADE Rcpp RcppArmadillo xts zoo]; }; - tsDyn = derive2 { name="tsDyn"; version="10-1.1"; sha256="1d79kjb63z63yddjmb2gs8ngjr3pdvrgla8pzdq9p06q041yvkhj"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; }; + tsDyn = derive2 { name="tsDyn"; version="10-1.2"; sha256="0wwp18qaxljdy1zqww1qw9fa9ycvgwcf6j52cpx3v2f2177x7snc"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; }; tsModel = derive2 { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; }; tsPI = derive2 { name="tsPI"; version="1.0.3"; sha256="00p7275iq8qn6c6dpqjr5s9fzc0a6njqqi9gvqnh5s9lfx9mbk1v"; depends=[KFAS]; }; tsSelect = derive2 { name="tsSelect"; version="0.1.8"; sha256="0ysijzhhwaj5n7h50jacshnla6d0h61q0f6lj19ic0lwvlz4yazy"; depends=[forecast]; }; tsallisqexp = derive2 { name="tsallisqexp"; version="0.9-3"; sha256="0mzqplsj2w4a7jnav43afyk8ymy6p444j7km6kc8c2g4aifpgxcb"; depends=[]; }; + tsapp = derive2 { name="tsapp"; version="1.0.0"; sha256="0dakmzm65y6w3idfynnigcmyw0n28scfgklmmg7lg8ycsxh0x76l"; depends=[fftwtools Matrix vars]; }; tsbox = derive2 { name="tsbox"; version="0.2.0"; sha256="0kyw276qi20801ps3kd61k1s4vs0znsyzzy8mwjq312cbjisg6mc"; depends=[anytime data_table]; }; tsc = derive2 { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw6f14zvcsjhrmmdfd4bmwh36y"; depends=[]; }; - tscount = derive2 { name="tscount"; version="1.4.1"; sha256="0bnzv06wxc1kzjlysljndsjimjsn3g8v6s1vbics1cwcs5jkjwr4"; depends=[ltsa]; }; + tscount = derive2 { name="tscount"; version="1.4.2"; sha256="15lvrglv4lq17g425s9lkcb3f04bk0322yl32648ysf7gp7lmdx5"; depends=[ltsa]; }; tsdb = derive2 { name="tsdb"; version="0.7-1"; sha256="0ngy897fmf48c7k54zq8lx2fyv45c0kzn3bxm5054ay2lkv02idz"; depends=[datetimeutils fastmatch zoo]; }; tsdecomp = derive2 { name="tsdecomp"; version="0.2"; sha256="1wy37gjp49dr60s4zhwv19iv3mzr1fjz5yilqmqgy78j5d45ns15"; depends=[]; }; - tsdf = derive2 { name="tsdf"; version="1.1-7"; sha256="1c6fmvbpwvzy654c7hs56nxdp27wy9vyb521rdw33mgxvnyjbjqn"; depends=[]; }; tsdisagg2 = derive2 { name="tsdisagg2"; version="0.1.0"; sha256="1vjypf9d4rdprpgxfsgpccn412kvar59v341ridq2hcdp7hfb70s"; depends=[]; }; tseries = derive2 { name="tseries"; version="0.10-47"; sha256="0yzvc9djp3angvxdxqi60wi726y76ablsb71q88ycvw0avgpf8r0"; depends=[quadprog quantmod zoo]; }; tseriesChaos = derive2 { name="tseriesChaos"; version="0.1-13.1"; sha256="0qfrrzd0h8n9zp7wj5fl88wkiv22fs5zy8x509g316j0avm5zjr3"; depends=[deSolve]; }; @@ -14749,17 +14928,18 @@ in with self; { tsfknn = derive2 { name="tsfknn"; version="0.3.0"; sha256="0h44s8bvnd68nhl0rbwvs0sycsjlmpnni0nr2169429a9y3f91f1"; depends=[ggplot2]; }; tsgui = derive2 { name="tsgui"; version="0.0.3"; sha256="16cx68gq2f63wx7mhbv0aq6pr71wfbc035kjbjjsfrbagaq4ib13"; depends=[RandomFieldsUtils tcltk2 tkrplot]; }; tsiR = derive2 { name="tsiR"; version="0.4.2"; sha256="1yc9kcyj8yg7zsdkqsxkr7czv3i5gf2146z5h89qfqifrrzmjifa"; depends=[ggplot2 kernlab reshape2]; }; - tsibble = derive2 { name="tsibble"; version="0.8.5"; sha256="1xm5zwx0p101gr4qf4yc1p33fhck44ppdk104pcwbhxwbza6mh3y"; depends=[anytime dplyr lifecycle lubridate purrr rlang tibble tidyselect vctrs]; }; + tsibble = derive2 { name="tsibble"; version="0.8.6"; sha256="1vm4rwfflrc87xj6sn8xa0lqdvs1k4hviar0glm9v0dhbk81bbbj"; depends=[anytime dplyr lifecycle lubridate purrr rlang tibble tidyselect vctrs]; }; tsibbledata = derive2 { name="tsibbledata"; version="0.1.0"; sha256="17qvjfkppg1z4pxgax37ikx2x28ib39syps5vhppc1y3yn8441vq"; depends=[tsibble]; }; tsintermittent = derive2 { name="tsintermittent"; version="1.9"; sha256="1mrb6yrsjwj6j40n97sgg42ddvwhjnaiq9k7ka249bbq01gf2975"; depends=[MAPA]; }; - tsmp = derive2 { name="tsmp"; version="0.3.5"; sha256="1gilzxxgaa1qqsk56s7ynlqhz6bssxrpc1h7fxkjp0z9amajvb5h"; depends=[audio doSNOW foreach magrittr progress]; }; + tsmp = derive2 { name="tsmp"; version="0.4.14"; sha256="1ahqdizygbs49xbgn35fdb5drxwyx2z9ima4fm83aqwaan7wrrja"; depends=[audio checkmate doSNOW foreach magrittr progress Rcpp RcppParallel RJSONIO]; }; tsna = derive2 { name="tsna"; version="0.3.1"; sha256="15dx5inmlk05asakjv3jzlycid307xjpy4x2h52phix69ghbb95v"; depends=[network networkDynamic statnet_common]; }; tsne = derive2 { name="tsne"; version="0.1-3"; sha256="0s8cv2pndkddq62rzlgzgfdjp1vjv5hz5i5957sllnb97vbzbzb6"; depends=[]; }; + tsnetwork = derive2 { name="tsnetwork"; version="1.2"; sha256="14rx2idlmsdik17fbzmdkgpj5jyrirga6cklhxflrbk9zjmlii00"; depends=[igraph longitudinal QUIC]; }; tsoutliers = derive2 { name="tsoutliers"; version="0.6-8"; sha256="02qd7ky416yp2l4cfl2yl7ckr2aidkps9cxkk03r9r7c5247c6zh"; depends=[forecast]; }; tspmeta = derive2 { name="tspmeta"; version="1.2"; sha256="028jbbd0pwpbjq4r6jcc1h0p7c4djcb9d2mvgzw1rmpphaxjvrkd"; depends=[BBmisc checkmate fpc ggplot2 MASS splancs stringr TSP vegan]; }; tsqn = derive2 { name="tsqn"; version="1.0.0"; sha256="1iv1wwa6a9824dbgfk5a609szppc3a8j250z74hb8csjvwwx9qq9"; depends=[fracdiff MASS robustbase]; }; tstools = derive2 { name="tstools"; version="0.3.8"; sha256="0daxrp91hxc367hlzla0s7x5dddnx462239jcq0ickx6awkk753g"; depends=[data_table jsonlite xts zoo]; }; - tsutils = derive2 { name="tsutils"; version="0.9.0"; sha256="09xv5iv6icjbj5rhcsspbs8n2rl9k9gml0iizq8rd5a01153zlsm"; depends=[forecast MAPA RColorBrewer]; }; + tsutils = derive2 { name="tsutils"; version="0.9.2"; sha256="0gp8f0a9dn3h4lv38xiw04j832igwhfralzc5vd74r952x7b6hbx"; depends=[forecast MAPA plotrix RColorBrewer]; }; tsviz = derive2 { name="tsviz"; version="0.1.0"; sha256="099ga750kr9hrkd8vaxhz6h4gha6zfr9jzqwrmgms2h2h1a7jxr7"; depends=[dplyr forecast ggplot2 lubridate magrittr miniUI plotly shiny shinyhelper]; }; tsvr = derive2 { name="tsvr"; version="1.0.1"; sha256="1lkb6lj3lsx25d671gb804brbv74isrjbj9pd09q84qp7jgrpgyd"; depends=[]; }; tswge = derive2 { name="tswge"; version="1.0.0"; sha256="0wj0kyb1dcwfn8wjp7skgcflc48cr4va0i0jg8x970658if7z6fz"; depends=[astsa MASS PolynomF signal waveslim]; }; @@ -14770,7 +14950,7 @@ in with self; { ttbbeer = derive2 { name="ttbbeer"; version="1.1.0"; sha256="1azffcizm3460kxvrxxkilc6qxspyi247x8drrw5ywfichwhmdhc"; depends=[]; }; ttdo = derive2 { name="ttdo"; version="0.0.4"; sha256="1hq1s2rsngx496mhrf9pnpvp25805f17pfj7l0dm5g7lmiq24rr8"; depends=[diffobj tinytest]; }; ttestshiny = derive2 { name="ttestshiny"; version="0.1.0"; sha256="186569p9h3597z9lxyzm7fj8k6bzgm2kw757dcv2qhhf2k7nfch9"; depends=[dplyr shiny shinyAce shinyjs]; }; - tth = derive2 { name="tth"; version="4.3-2-1"; sha256="19rvmyprl1nk9mmngk6dax8rnli10msfvm3vzp86pbdjxnsh3hjc"; depends=[]; }; + tth = derive2 { name="tth"; version="4.12-0"; sha256="0bwn8xxswkilv0gagh54fiw90pvjzpz6w6ky4prc3mm070plqf4b"; depends=[]; }; tttplot = derive2 { name="tttplot"; version="1.1.1"; sha256="0rmgp1888y07w0h8kwq1azpr6bysjq4pyjf6ygpra75jj4563wx9"; depends=[]; }; ttutils = derive2 { name="ttutils"; version="1.0-1"; sha256="18mk30070mcplybg320vjbk9v5flxnbqi5gx0yyr1z6ymjmnrxbc"; depends=[]; }; ttwa = derive2 { name="ttwa"; version="0.8.5.1"; sha256="1lhypcwssq0dspizvln3w4dg16ad6mz8cj4w34c5vsrayqid7fyn"; depends=[data_table]; }; @@ -14779,9 +14959,10 @@ in with self; { tuckerR_mmgg = derive2 { name="tuckerR.mmgg"; version="1.5.1"; sha256="0lrylh0np0kbl4xx3gmlvid0g11fh0ad39wdwbz6hrmf5pzsjdjq"; depends=[]; }; tufte = derive2 { name="tufte"; version="0.5"; sha256="0d3imnnrk4yq8la9n8sy2rlq30na8nbhfq2n5cc2k0pc2dg97jvj"; depends=[htmltools knitr rmarkdown xfun]; }; tufterhandout = derive2 { name="tufterhandout"; version="1.2.1"; sha256="04fvvbx69a28nk7i4wz5ynamz1yvsa2ibz542r1xaq1ikk0ywqbw"; depends=[knitr rmarkdown]; }; - tukeytrend = derive2 { name="tukeytrend"; version="0.6"; sha256="0lsxfpkim4fkrm2lrjhn3w55c0p694vbkal3mjqk6vnmnycg9d71"; depends=[lme4 Matrix mgcv multcomp nlme pbkrtest]; }; - tumblR = derive2 { name="tumblR"; version="1.1"; sha256="0gl6q6rff9bp21gvi3bz8kmwbhimxqrv1mmzwshl1ys9r7d4dvps"; depends=[httr RCurl RJSONIO stringr]; }; + tukeytrend = derive2 { name="tukeytrend"; version="0.7"; sha256="15j7g0drb92rpxq7d0jl9h0hxpi9pbgpvfcxaicrcgypxap3721q"; depends=[lme4 Matrix mgcv multcomp nlme pbkrtest]; }; + tumblR = derive2 { name="tumblR"; version="1.2"; sha256="1qili2c9wb6hpjjf7m0gyvdymzls5w4pghjkyi3sbp0q7ayhbh12"; depends=[httr RCurl RJSONIO stringr]; }; tumgr = derive2 { name="tumgr"; version="0.0.4"; sha256="1ylfmrsg177g75l2scjpgw6v4dpz62r7cy89pql9zd5zqy167xqj"; depends=[minpack_lm]; }; + tune = derive2 { name="tune"; version="0.1.0"; sha256="0xiidzkl0hbd0f7jh1v2kkg26wdgy33w74c9bmpjgy317ckhsz8h"; depends=[cli crayon dials dplyr foreach ggplot2 glue GPfit hardhat lifecycle parsnip purrr recipes rlang rsample tibble tidyr workflows yardstick]; }; tuneR = derive2 { name="tuneR"; version="1.3.3"; sha256="0av978m4h2iqazyfq6n2cgkh4wpllihh7s29lah2nb8ngc0w5hxx"; depends=[signal]; }; tuneRanger = derive2 { name="tuneRanger"; version="0.5"; sha256="1xf78q8f7sq6w2jjwcw8vz88bmbp8yivydmqygjag58abnhd0356"; depends=[BBmisc DiceKriging lhs lubridate mlr mlrMBO ParamHelpers ranger smoof]; }; tuple = derive2 { name="tuple"; version="0.4-02"; sha256="0fm8fsdfiwknjpc20ivi5m5b19r9scdxhzij70l8qi3ixw1f0rnk"; depends=[]; }; @@ -14791,12 +14972,12 @@ in with self; { tutorial = derive2 { name="tutorial"; version="0.4.3"; sha256="0sxdlpw0w4azlaxdlk36ycrric6pbj2zi4nyv26pgsp0cr1hrx6r"; depends=[base64enc knitr markdown rjson]; }; tuts = derive2 { name="tuts"; version="0.1.1"; sha256="0mwc6lsnhxww041wh3020wz7w812asp1d6djv4n9pl7jil0kvkry"; depends=[coda doParallel foreach lomb mcmcplots rjags truncnorm]; }; tvR = derive2 { name="tvR"; version="0.3.1"; sha256="056a241m3c1jhf8idly1bm4xja349cg5yzz19l45zyggml82snin"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; }; - tvReg = derive2 { name="tvReg"; version="0.4.2"; sha256="1ma6jiqlj5jlsyk37vcddyv427xi8980cbplb40ppync18f7psmp"; depends=[bvarsv MASS Matrix systemfit vars]; }; + tvReg = derive2 { name="tvReg"; version="0.5.1"; sha256="18jif10pm1lsc9dwrb81cd55n6c6hdbhp01bk7q511lkzdx403hc"; depends=[bvarsv MASS Matrix plm systemfit vars]; }; tvd = derive2 { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp]; }; tvgeom = derive2 { name="tvgeom"; version="1.0.1"; sha256="1lr2vqgj5jfhzavwd43wcchhbicmf4dqjvyf66rvnjkw3jaig8dm"; depends=[]; }; tvm = derive2 { name="tvm"; version="0.4.0"; sha256="0v5b9s35q08a4z2ccph7g9q211w04x99sh72lrfby43fgl2jwyd1"; depends=[ggplot2 reshape2]; }; tvthemes = derive2 { name="tvthemes"; version="1.1.0"; sha256="0bc9li8vgmm4r6dshm52ll2d69gcynv1xrv8n7jhbyn7xmx3q3kz"; depends=[extrafont ggplot2 glue magick scales]; }; - twang = derive2 { name="twang"; version="1.5"; sha256="1sp1vb6l0mwpy9b9my5d3spc0q0zs7xg4dkmi4cl7hy7m9xy1dbk"; depends=[gbm lattice latticeExtra survey xtable]; }; + twang = derive2 { name="twang"; version="1.6"; sha256="0d190420igm1ai3gv9fjqxw6z1g7zrc4q3yidkn083mj42asxn4v"; depends=[gbm lattice latticeExtra survey xtable]; }; tweedie = derive2 { name="tweedie"; version="2.3.2"; sha256="10fv998qjxsyx0h94fi0xbh6xbf24nwgh254n9zfnmix9vk2cqls"; depends=[]; }; tweenr = derive2 { name="tweenr"; version="1.0.1"; sha256="0sq90pbln6lkc2q3zflhkxxwpqdw5dd7igrxhdnlynkdrmi83mpg"; depends=[farver magrittr Rcpp rlang]; }; tweet2r = derive2 { name="tweet2r"; version="1.1"; sha256="1ivzc05af3fbdxn99lcphm74qs64lz8577zzi6r52r9xjpsqpqzi"; depends=[ggmap ggplot2 maptools plyr rgdal ROAuth RPostgreSQL RSQLite sp spacetime spatstat splancs streamR]; }; @@ -14809,18 +14990,17 @@ in with self; { twosamples = derive2 { name="twosamples"; version="1.0.0"; sha256="0i8k157ph2whll72a590rnafgjx767k8vxy5d8x9dq7s4baiw1cx"; depends=[Rcpp]; }; twostageTE = derive2 { name="twostageTE"; version="1.3"; sha256="0mkxs3lmzja51zdrf5himhwcdygpj6czhdd2bydakm26kvw7znwr"; depends=[isotone]; }; twoway = derive2 { name="twoway"; version="0.6.2"; sha256="0q053jvb2sa762bjnpzkxzdcq1wk82ynp4rjl4j6qncqccvqq0c3"; depends=[]; }; - txtplot = derive2 { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; }; + txtplot = derive2 { name="txtplot"; version="1.0-4"; sha256="00sriml48y70j18jz235dsfm5x3a81bnzskfp3hnv6cbjwwsmca4"; depends=[]; }; txtq = derive2 { name="txtq"; version="0.2.0"; sha256="1w4dmws2l0r5bbx2n2g79dfrpa8dz4hlg8raphgh8mimf1skfb3h"; depends=[base64url filelock R6]; }; types = derive2 { name="types"; version="1.0.0"; sha256="01shcin8wjbhbmzl979fj3008xqxssw90g3bjg42cnjxkmnaql59"; depends=[]; }; uCAREChemSuiteCLI = derive2 { name="uCAREChemSuiteCLI"; version="0.2.0"; sha256="1nccgkxv57inhgvgmhwm4fr8cp28sj8n83za5gam9xx1f42mzsqk"; depends=[ChemmineR usethis]; }; - uGMAR = derive2 { name="uGMAR"; version="3.2.2"; sha256="0p8n4wpqc7xqlsmr3gxspshfpfzh7zjrshqlnflszhrnngffgkif"; depends=[Brobdingnag pbapply]; }; + uFTIR = derive2 { name="uFTIR"; version="0.1.1"; sha256="0lpp768x87czdcb6gdgsp454faakx0gdmk9mh1zzh5ljzkxdvbxv"; depends=[raster Rcpp RcppArmadillo rgdal sp]; }; + uGMAR = derive2 { name="uGMAR"; version="3.2.5"; sha256="0dxi261qbnaqryqmbmja56wkj2h9nn5yk5pmz8axdyakbqgasfwp"; depends=[Brobdingnag pbapply]; }; uHMM = derive2 { name="uHMM"; version="1.0"; sha256="1516ipadxi7rc1dbinr5rva2fbcr5i2zg3rlli5wy7r6naf8fzzl"; depends=[chron class cluster clValid corrplot FactoMineR HMM tcltk2 tkrplot]; }; - uaparserjs = derive2 { name="uaparserjs"; version="0.1.0"; sha256="1zhz39jrvi64sj0wvwkm4y8gakfp6kz1knw4wn08kk4fa9ymyjvq"; depends=[dplyr purrr V8]; }; + uaparserjs = derive2 { name="uaparserjs"; version="0.3.1"; sha256="0pmdkc108rvk1bsq0b7pmvvhp2ghm728d34rmz20abpmcy5hiwlw"; depends=[progress V8]; }; uavRmp = derive2 { name="uavRmp"; version="0.5.4"; sha256="0djx6z9489pr03bf01y2d79ar840q4ffj39j72c8phz27yz40y04"; depends=[brew data_table devtools gdalUtils geosphere htmltools htmlwidgets log4r maptools raster rgdal rgeos roxygen2 sf sp spatial_tools stringr zoo]; }; - uavRst = derive2 { name="uavRst"; version="0.5-4"; sha256="0dd83xbzssvmqy0g053lzlkjpa7cpqiijsyi06qsk2krq4wp94ml"; depends=[foreach raster Rcpp]; }; ubiquity = derive2 { name="ubiquity"; version="1.0.1"; sha256="1aachql6k1fldfliv8gkny91rxca5h60is4cj98mizipc9cal7jz"; depends=[deSolve digest doParallel flextable foreach gdata ggplot2 gridExtra knitr MASS officer optimx PKNCA pso rhandsontable rmarkdown rstudioapi shiny stringr]; }; ucbthesis = derive2 { name="ucbthesis"; version="1.0"; sha256="0l855if3a7862lxlnkbx52qa617mby634sbb2gkprj21rwd7lcbp"; depends=[knitr stringr]; }; - uchardet = derive2 { name="uchardet"; version="1.0.2"; sha256="1cyywm42ic2laal9clc0w6z2a8k4j21iz1vj903bxhxs940dv9n4"; depends=[Rcpp]; }; uclust = derive2 { name="uclust"; version="0.2.0"; sha256="1hvyrkah0yfia5wwr42q6axja56qwnils84pg25znq39fjly6hjf"; depends=[dendextend robcor]; }; ucminf = derive2 { name="ucminf"; version="1.1-4"; sha256="01vggwg1w71k98qs6fhb0x1843vi322mf4g3hbclks94kcpkisx2"; depends=[]; }; udapi = derive2 { name="udapi"; version="0.1.3"; sha256="0qyn6fdh8ia913hn2dl0x99xsm20ps8zm52snswlyb00prinm668"; depends=[curl httr]; }; @@ -14832,12 +15012,12 @@ in with self; { ukbabynames = derive2 { name="ukbabynames"; version="0.1.1"; sha256="0vrwcf3hixd40ag6kb289anq2ys2k6vdhhsrjbizvndkyn8sr0r0"; depends=[]; }; ukbtools = derive2 { name="ukbtools"; version="0.11.3"; sha256="1j5p9ypn3s781582all64kvywih1ry0lqsh1zirr35g7r46fy783"; depends=[data_table doParallel dplyr foreach ggplot2 magrittr purrr readr scales stringr tibble tidyr XML]; }; ukgasapi = derive2 { name="ukgasapi"; version="0.17"; sha256="1jly1bzisvvx8pcsw0fb35xxvjgq7ydpxianf3dbxa88msdjr02d"; depends=[RCurl XML]; }; - uklr = derive2 { name="uklr"; version="1.0.0"; sha256="1c1r7d76rjh9ki2fwhv8chmhc2j5kzv3d9lv7qvr1cxyfsbxrsfb"; depends=[httr jsonlite tibble]; }; - ukpolice = derive2 { name="ukpolice"; version="0.1.2"; sha256="0jwc57360cr9fkqzs5j2jmnfagci86jzi6p5d5mpm35drsrzm1ca"; depends=[jsonlite purrr tibble]; }; + uklr = derive2 { name="uklr"; version="1.0.1"; sha256="0pr0qyf8zr8z1hzv8wziw9wddajja5dggs9cc9dw91v0kq5g5ris"; depends=[curl httr jsonlite tibble]; }; + ukpolice = derive2 { name="ukpolice"; version="0.1.4"; sha256="1ffrdl39fi5h68r1wm54q2y883ygz5lybd3jpmyd959zsj452559"; depends=[jsonlite purrr tibble]; }; ulid = derive2 { name="ulid"; version="0.3.0"; sha256="0xxkqrnlz3pkb3s1gacfzqav54w97gc0w8rh0fn1qy5rkmg2bplv"; depends=[Rcpp]; }; - umap = derive2 { name="umap"; version="0.2.4.1"; sha256="1pnh3hv8ihiz2nszqp797lkrdhhna2a6mzpizbsk0s9m8cj4wxva"; depends=[openssl Rcpp reticulate RSpectra]; }; + umap = derive2 { name="umap"; version="0.2.5.0"; sha256="0qp8zbh6fn8kn6q2h2lyjgmq3pr6gqwsd8ymqx25px13zjhxch9d"; depends=[openssl Rcpp reticulate RSpectra]; }; ump = derive2 { name="ump"; version="0.5-8"; sha256="1sg226caq9y41cwl7wr5s9z3bpq2j5p6rj6fy2pasbzimgzw0byx"; depends=[]; }; - umx = derive2 { name="umx"; version="3.0.5"; sha256="1xyv9xfqa5q5bzrrnqc07xi3y0kdlw9c1dy6dciqdcmynwkvidh2"; depends=[cowplot DiagrammeR ggplot2 knitr lavaan MASS Matrix MuMIn mvtnorm nlme numDeriv OpenMx polycor R2HTML RCurl sfsmisc xtable]; }; + umx = derive2 { name="umx"; version="3.0.6"; sha256="0jbwmn8mj4ff2wzv3pwqf6ddhvbrm21n20ilj5h9fyjafcspfq9w"; depends=[cowplot DiagrammeR ggplot2 knitr lavaan MASS Matrix MuMIn mvtnorm nlme OpenMx polycor R2HTML RCurl xtable]; }; unbalanced = derive2 { name="unbalanced"; version="2.0"; sha256="18hy9nnq42s1viij0a5i9wzrrfmmbf7y3yzjzymz2wnrx4f2pqwv"; depends=[doParallel FNN foreach mlr RANN]; }; unbalhaar = derive2 { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv49s0jnccl9d6vdslbi1a7kfvmr5dgy760hs"; depends=[]; }; uncertainty = derive2 { name="uncertainty"; version="0.2.0"; sha256="1mq14ny7l3gy3wjsqijnm37azavyapxszjnckd861h4hgcpdcdjz"; depends=[mvtnorm triangle]; }; @@ -14846,6 +15026,7 @@ in with self; { unfoldr = derive2 { name="unfoldr"; version="0.7"; sha256="18qjsmlbqy9nhwyv288r9n3plv22fgb4g73jpyjyzy3hzfamcb17"; depends=[]; }; unglue = derive2 { name="unglue"; version="0.0.1"; sha256="0avk5d4dgbmqvmqlr5kbhg3qsyg5rxmw9icadivaahzf4znav5x4"; depends=[]; }; ungroup = derive2 { name="ungroup"; version="1.1.5"; sha256="0247mzicghdy2s41dsf1f2yx9j0j4qnahmh1bjaiwl4q1541k3l0"; depends=[MortalitySmooth pbapply Rcpp RcppEigen Rdpack rgl]; }; + unheadr = derive2 { name="unheadr"; version="0.2.1"; sha256="0pglf4sxq7f5rf1a87zz0nzjd4npdymazg4zpmmfiwc07lh8g7pr"; depends=[dplyr forcats magrittr readxl rlang stringr tibble tidyr tidyxl]; }; uniReg = derive2 { name="uniReg"; version="1.1"; sha256="0wjc7pgaisvk26j7grxp2ypsabb5my9wg6c9i5w9zhh5jdx1fdab"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; }; uniah = derive2 { name="uniah"; version="1.0"; sha256="19zwy33gwa749i81mi9h05k8k3l4xbbln3k6q70fa7ic5lqbbdzj"; depends=[ahaz Iso survival]; }; unifDAG = derive2 { name="unifDAG"; version="1.0.3"; sha256="052qjrnj04imhj6i62k8jdx9rs8r70n0qrmd2z45x4fimn5py6j5"; depends=[gmp graph]; }; @@ -14855,60 +15036,59 @@ in with self; { unikn = derive2 { name="unikn"; version="0.2.0"; sha256="1lw3wn93bb8y76phnqwhvgn14zrs68rq8xx9hl2wbngispvwpwn1"; depends=[ggplot2]; }; unine = derive2 { name="unine"; version="0.2.0"; sha256="051dk8fss19h4d9815a7994krr1s3n5q0pxq9gir6zns0vvn05pw"; depends=[Rcpp]; }; uniqtag = derive2 { name="uniqtag"; version="1.0"; sha256="025q71mzdv3n1jw1fa37bbw8116msnfzcia01p1864si04ch5358"; depends=[]; }; + unisensR = derive2 { name="unisensR"; version="0.3.2"; sha256="0scqkbjlnln6vc9i0i3hpsx5mw6c8w22pc3dhy8bwyrjndcd54yy"; depends=[XML]; }; unitedR = derive2 { name="unitedR"; version="0.3.1"; sha256="06plbhjbn1gflpxarn21knhiwfr02vxprak9qcghl30fkkymd02r"; depends=[plyr]; }; - unitizer = derive2 { name="unitizer"; version="1.4.8"; sha256="1q2l32lkxv87vaih5wqfn6n2a2q6mlaw83mgrn4g5ircp5z3r98j"; depends=[crayon diffobj]; }; - units = derive2 { name="units"; version="0.6-5"; sha256="02nls8m0r1r7kljs4x35naz3szq62hyqyd5vracf1xwi1kz5kdsh"; depends=[Rcpp]; }; + unitizer = derive2 { name="unitizer"; version="1.4.9"; sha256="1p5isrc9vszfkx9z4fg02ag9cgw0qa8zwh20h7kwn0j1i40gdzzp"; depends=[crayon diffobj]; }; + units = derive2 { name="units"; version="0.6-6"; sha256="11x6xz1fbml28xmrhgn4sii9vfyj3gyfc1dfxahdg9cszdmcgdnh"; depends=[Rcpp]; }; unittest = derive2 { name="unittest"; version="1.4-0"; sha256="1wyiikccnkw8fzrjrb2a80lw2xyiii4zb0hrbzfszy2bd6prqxx4"; depends=[]; }; univOutl = derive2 { name="univOutl"; version="0.1-5"; sha256="193wrpkvgmlrx43nag8w3ivrlqm37nm6g86wcvd3bgw3hchs70gi"; depends=[Hmisc robustbase]; }; unival = derive2 { name="unival"; version="1.0.2"; sha256="1sw0z7dmicmka3znrc1c5v0s9g8cpqapacdjzl5i4k5ak2qq35qp"; depends=[optimbase psych]; }; univariateML = derive2 { name="univariateML"; version="1.0.0"; sha256="1l8b9fll93nhspbhrap94sdgdmligb49qlzvlm0x4msqmh085ib4"; depends=[actuar assertthat extraDistr logitnorm nakagami tibble]; }; - unix = derive2 { name="unix"; version="1.5"; sha256="0sgm1gzfkfilrsgmv567ld79azmfk076xl998sv139kh9dvwgsyx"; depends=[]; }; - unjoin = derive2 { name="unjoin"; version="0.0.3"; sha256="08vjgl4dnh9kycrvdq5ngf57fy61n0nc582bi4znv06pq696rkwp"; depends=[dplyr rlang tibble]; }; - unmarked = derive2 { name="unmarked"; version="0.13-1"; sha256="1qg71jgdg9psbca8ki933x8g7r48rbbybq2ys8nj8pyhz89hgbkr"; depends=[lattice MASS Matrix plyr raster Rcpp RcppArmadillo reshape2]; }; + unix = derive2 { name="unix"; version="1.5.1"; sha256="0kb54lgzqnp1nwl8lw2531qj3858szsv7wz17g6lqxkfxsww5vv8"; depends=[]; }; + unjoin = derive2 { name="unjoin"; version="0.0.4"; sha256="094hpb0w6j4l0kmqh9wgfpsya5ldjxm3fms7px4pvj8nqx29ga80"; depends=[dplyr rlang tibble]; }; + unmarked = derive2 { name="unmarked"; version="0.13-2"; sha256="07i0fiz155vs6cbhpg5gx77syf9phswhpz7vg3xxr16i0qdnh3h2"; depends=[lattice MASS Matrix plyr raster Rcpp RcppArmadillo]; }; unpivotr = derive2 { name="unpivotr"; version="0.5.1"; sha256="0j2q98xm3gg3mscn9ckl4pcihwc4p5gn4sk5sr1nqi4ghc047qaf"; depends=[cellranger dplyr forcats magrittr pillar purrr rlang tibble tidyr tidyselect xml2]; }; unrepx = derive2 { name="unrepx"; version="1.0"; sha256="1dzvwpza60y9p7kz1f0bm20wid5jyxx9pma4w41az9shq5kkr0aj"; depends=[]; }; unrtf = derive2 { name="unrtf"; version="1.4"; sha256="0ri68vfhc0acizjsk62v4l1g6l773y955yhcbqgks0vbrk01yfxg"; depends=[sys]; }; unsystation = derive2 { name="unsystation"; version="0.2.0"; sha256="02da7wzzk5bwd475i67v5x04ay2bn5yd5xffl1asqcqxcc5sy0m8"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; }; untb = derive2 { name="untb"; version="1.7-4"; sha256="1i7m4vfslsix98dwx4jlrsldm7fhhfp25gr7aapcxqxms7ryaby6"; depends=[Brobdingnag partitions polynom]; }; unvotes = derive2 { name="unvotes"; version="0.2.0"; sha256="0wanvivwm1nmqadq2vapg27kasnjnr0a4np2kw54wj9pg21izqic"; depends=[]; }; - updog = derive2 { name="updog"; version="1.1.3"; sha256="0dnvf205x39sb236652rsa2c9wlb8a6c93i8ldr2f9mhrhwndzbp"; depends=[assertthat doParallel foreach ggplot2 ggthemes Rcpp RcppArmadillo stringr]; }; + updog = derive2 { name="updog"; version="1.2.0"; sha256="0q55h4rgr0hqn2fkcnd0pwmrawzcjmffvysps1cr061jd5yrzla4"; depends=[assertthat doParallel foreach ggplot2 ggthemes Rcpp RcppArmadillo reshape2 stringr]; }; uplift = derive2 { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; }; uplifteval = derive2 { name="uplifteval"; version="0.1.0"; sha256="1gnn40c47rpx40j210bz6fb48d70p6spv3drr8hd5b3vzfz6686c"; depends=[dplyr ggplot2 gridExtra whisker]; }; - upmfit = derive2 { name="upmfit"; version="0.1.0"; sha256="0f0rk606v17abgw3mwlwihl6fsxprp44h2xbhv1675i18i36vbgx"; depends=[mcmcplots R2jags]; }; uptasticsearch = derive2 { name="uptasticsearch"; version="0.4.0"; sha256="19sf3zdj424pz4ms0xg4asplf2bczvhl8p22y13jna1g51xyv92a"; depends=[assertthat data_table futile_logger httr jsonlite purrr stringr uuid]; }; uptimeRobot = derive2 { name="uptimeRobot"; version="1.0.0"; sha256="1sbr0vs6jqcyxjbs7q45bsfdnp3bc59phw0h3fwajqq1cxjgzdww"; depends=[plyr RCurl rjson]; }; - upwaver = derive2 { name="upwaver"; version="1.2.1"; sha256="02yx4ijww084cxsjbf68l5zv0pf1hsqwqq8rgbc6rm3qp00v18a5"; depends=[assertthat httr rjson XLConnect xlsx]; }; uqr = derive2 { name="uqr"; version="1.0.0"; sha256="0f7isjfb5almp1zypxzw3lfkygkcixmg0xdsw0zznf61r6qhbqyr"; depends=[gtools Hmisc]; }; - urbin = derive2 { name="urbin"; version="0.1-8"; sha256="0nbcs4rjqdqmyq046kx3nnvaxxzi0rxcxjma11lpn4ws1wdm6bng"; depends=[]; }; urca = derive2 { name="urca"; version="1.3-0"; sha256="1akaqwf3fvvvx4sgfn641fd4sj51s0701pvfl6s5hnz2k0iwh732"; depends=[nlme]; }; urlshorteneR = derive2 { name="urlshorteneR"; version="1.1.2"; sha256="1gxyc9a81lsn72x7c29lz6k9k5ylqd0j65yhy2qj8lslnmg869vz"; depends=[assertthat httr jsonlite lubridate stringr]; }; urltools = derive2 { name="urltools"; version="1.7.3"; sha256="04x3my655dd287cbsszbnf75q0swmjlxxrblcsay7a8n3df3a830"; depends=[Rcpp triebeard]; }; uroot = derive2 { name="uroot"; version="2.1-0"; sha256="1hhq7ns2pyiziwx6sx7sb6445p3nynv7l04rksjngai2vpdaj0iw"; depends=[]; }; + ursa = derive2 { name="ursa"; version="3.8.19"; sha256="1q2y834nkh7mjq03xp8v3kxlwgk9gn558dk9lz78213qjx2762h8"; depends=[jpeg png rgdal]; }; + usa = derive2 { name="usa"; version="0.1.0"; sha256="0scdrd6b48n019f7qp77rrkqgmapnrknalq0hml1cy7m43llqf6d"; depends=[tibble]; }; usdarnass = derive2 { name="usdarnass"; version="0.1.0"; sha256="10fh9anpmbb7i70q3hjxbplrkqa1q86zgh8nldsf2i526p62hpm1"; depends=[httr jsonlite readr]; }; usdm = derive2 { name="usdm"; version="1.1-18"; sha256="1sis47fri2lrbx2ll5ps7bvycjqhncnia800izf11szgayim5lrv"; depends=[raster sp]; }; - usedist = derive2 { name="usedist"; version="0.3.0"; sha256="11bklq2fzmk49rnmlrpjlf9qn4lzdzx52722wy0mfd3qsg9mpcbm"; depends=[]; }; + usedist = derive2 { name="usedist"; version="0.4.0"; sha256="0ddf1zcalbrn293qmr9kdzz3x16fzc4k1bwb1pjmwnspisqfi8kj"; depends=[]; }; useful = derive2 { name="useful"; version="1.2.6"; sha256="0n50v1q75k518sq23id14jphwla35q4sasahrnrnllwrachl67v1"; depends=[assertthat dplyr ggplot2 magrittr Matrix plyr purrr scales]; }; - usefun = derive2 { name="usefun"; version="0.4.1"; sha256="1fv10s73hk0xnwrigri9713bxa03jhrf8lafc110syihdj7d5kvx"; depends=[]; }; + usefun = derive2 { name="usefun"; version="0.4.5"; sha256="11cvsx5rip4r7mcv3n711vylh0lzh3d6lnlcdjvfsg1sa1dbspp8"; depends=[dplyr]; }; userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.7.2"; sha256="17arxxha8qr876nrf9szpymgamxlvacj3lfbmpiv973kyi3hr7m4"; depends=[BiasedUrn car data_tree DiagrammeR digest diptest GGally ggplot2 ggrepel ggridges GPArotation gridExtra gtable knitr lavaan lme4 MASS MBESS minpack_lm pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists ufs viridis XML xtable]; }; - usethis = derive2 { name="usethis"; version="1.5.1"; sha256="07an5wbikilg7cb3q6x5aykw8dfqnjrc3wpfb7gjmy0d9fh20fcy"; depends=[clipr clisymbols crayon curl desc fs gh git2r glue purrr rlang rprojroot rstudioapi whisker withr yaml]; }; + usethis = derive2 { name="usethis"; version="1.6.0"; sha256="12iyimqyza752anj29wpfisl8nz5r25kfcqbssybg24nb4wyy146"; depends=[cli clipr crayon curl desc fs gh git2r glue purrr rematch2 rlang rprojroot rstudioapi whisker withr yaml]; }; usfertilizer = derive2 { name="usfertilizer"; version="0.1.5"; sha256="05zjn39hqjjzzp4v4b1zbqq59205s7k0kikms951h57kbyvjz6vk"; depends=[tidyverse]; }; - ushr = derive2 { name="ushr"; version="0.2.0"; sha256="1jgkq87a90xg6dwrgv78flcprxw7na847ig8m4rkcnc084pyxv8w"; depends=[dplyr ggplot2 tidyr]; }; + ushr = derive2 { name="ushr"; version="0.2.3"; sha256="1ygyqgxw849165lpk81f114kgx9015b9a9dngavjy3ffqzrbb41k"; depends=[dplyr ggplot2 tidyr]; }; uskewFactors = derive2 { name="uskewFactors"; version="2.0"; sha256="0ndi5987ak8sa7krgiglsibfg0k7z9j8fg47hg1m8ar0sq4r1yj6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; }; - usl = derive2 { name="usl"; version="2.0.0"; sha256="1bdbscz4mbmrdnfvvgncjsshmry9hab2jz09gqc2hdzcxnfvmsp0"; depends=[nlsr]; }; + usl = derive2 { name="usl"; version="3.0.0"; sha256="1ahry485kpzfc0pzi4zm039d5mpv1jycmhdpn0n0zn0drcrlhw0g"; depends=[nlsr]; }; usmap = derive2 { name="usmap"; version="0.5.0"; sha256="0fjmmw8xhba31gv8mx9k55881yb94z518csbqas3bvssq5s7048f"; depends=[]; }; ustyc = derive2 { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; }; utc = derive2 { name="utc"; version="0.1.5"; sha256="1lhm5rhr78cxp3cz5n6j2zkhjphj7csk026xvvhkjqdi39rrq6i4"; depends=[]; }; utf8 = derive2 { name="utf8"; version="1.1.4"; sha256="0m0ywg8k3blfiahxvh1i4zn9dksrlc937d2lbza5fc38zjnrrnpn"; depends=[]; }; utile_tables = derive2 { name="utile.tables"; version="0.1.8"; sha256="0zxy5y8d34lssg5jr7hzqkwf92k3yy52p1qjd505zrp90sgz9cjj"; depends=[dplyr purrr rlang survival tibble utile_tools]; }; - utile_tools = derive2 { name="utile.tools"; version="0.2.3"; sha256="0jlyrd7a96gpvs6i62smg4mcds9660y65lykqjs0dvm42c1j0823"; depends=[dplyr lubridate purrr rlang stringr tibble]; }; + utile_tools = derive2 { name="utile.tools"; version="0.2.4"; sha256="1k82wra9c6f8m58sk1m33fv0gqjnxnv5wal8rjx6knnvfl36kjvn"; depends=[dplyr lubridate purrr rlang stringr tibble]; }; utile_visuals = derive2 { name="utile.visuals"; version="0.2.3"; sha256="1748nbj2vzigw0q97z9c6pgxa9x8h9rllh8asaahdybachwal7kh"; depends=[dplyr ggplot2 gridExtra purrr utile_tools]; }; - utility = derive2 { name="utility"; version="1.4.4"; sha256="18ariimhlmh4gi01jdywidk3gwfcm2yhl4d0dbr8ymdxlg1f1w8g"; depends=[]; }; + utility = derive2 { name="utility"; version="1.4.5"; sha256="0a11bxyg8la6yvxr04qbhay05jb2ihd7calc1zcisgj43kq6k7xd"; depends=[]; }; utilsIPEA = derive2 { name="utilsIPEA"; version="0.0.6"; sha256="07avc0j6qkzqmznbydn0zdg743g7g7kn2bcx5n03m3wg0fqyggr7"; depends=[data_table dplyr RCurl stringdist stringr]; }; - utiml = derive2 { name="utiml"; version="0.1.5"; sha256="02wxsg1gg2y83cii5ly7r8lk376kas261f9qyl03z55p5m72w9zy"; depends=[mldr ROCR]; }; - uuid = derive2 { name="uuid"; version="0.1-2"; sha256="1gmisd630fc8ybg845hbg13wmm3pk3npaamrh5wqbc1nqd6p0wfx"; depends=[]; }; - uwIntroStats = derive2 { name="uwIntroStats"; version="0.0.7"; sha256="0lihcjd79sqnw64bd2d4p02rl7fmzpyykrdi7b5dsnnwjhr0ks6r"; depends=[Exact geepack plyr sandwich survival]; }; - uwot = derive2 { name="uwot"; version="0.1.5"; sha256="0pz9wa89xq4d119q86lskrznf979m0r1db8iaprcz7kxbi6b8lrj"; depends=[dqrng FNN irlba Matrix Rcpp RcppAnnoy RcppParallel RcppProgress RSpectra]; }; - vMask = derive2 { name="vMask"; version="1.0"; sha256="14zfmgidlvlmm9anjcz3wvz4crc24ysq7jj1j1078fp7px5vvr8z"; depends=[]; }; + utiml = derive2 { name="utiml"; version="0.1.6"; sha256="1djagxmsni685ps0nhbvwgncxj883qck0wfcwhrl5h714zq39a0j"; depends=[mldr ROCR]; }; + uuid = derive2 { name="uuid"; version="0.1-4"; sha256="0gm9ii7ncvllxbvyk6srsiinjmqyj7lmh84w43x4nhqpvafj9q4q"; depends=[]; }; + uwot = derive2 { name="uwot"; version="0.1.8"; sha256="1jzh8r1h6f7pw7pb1fr32vn6ai9g10s56ahkq0vi77iznihy1rpd"; depends=[dqrng FNN irlba Matrix Rcpp RcppAnnoy RcppProgress RSpectra]; }; + vader = derive2 { name="vader"; version="0.0.1"; sha256="0zcggr7hpkx43bjrhyq6b3rgd6nmyljd5i8vky2jz6xn44gykhmw"; depends=[tm]; }; vaersNDvax = derive2 { name="vaersNDvax"; version="1.0.4"; sha256="0hvw7vbxs87c9xkdv3617fkjwz2dbawscbd7dgaixhdhcr3k823a"; depends=[]; }; vaersvax = derive2 { name="vaersvax"; version="1.0.5"; sha256="0bfbpdjnykvb9r0p28bz8lrqxksy4jvwnd28y6gdlprpisiipiic"; depends=[]; }; vagalumeR = derive2 { name="vagalumeR"; version="0.1.6"; sha256="0zakpg5p9kif61d35as08f2dac3wncyvhpc83rqjp96g99wjf701"; depends=[dplyr httr jsonlite magrittr purrr stringr]; }; @@ -14919,18 +15099,17 @@ in with self; { validann = derive2 { name="validann"; version="1.2.1"; sha256="00c0hkjiv8n7mksx6sknb4xkkivxr1ml31k697csv4imwrk09dy5"; depends=[moments]; }; validate = derive2 { name="validate"; version="0.9.3"; sha256="0ckr4i75w503jxwghkmc7mi9b9z54gjipxl6limz4sry0py3lyl4"; depends=[settings yaml]; }; validateRS = derive2 { name="validateRS"; version="1.0.0"; sha256="1ivw9ddr6z2wrsqvhbn87p5pikhkxlz8p45pb5nq13dvs359vkww"; depends=[data_table reshape2 triangle truncnorm]; }; - validatejsonr = derive2 { name="validatejsonr"; version="1.0.4"; sha256="1n8jf7j3hvz47z1x3gqz5yj5wxfjzz0zgzkgckdvy1nbsqf7w3cr"; depends=[Rcpp]; }; - validatetools = derive2 { name="validatetools"; version="0.4.7"; sha256="0pqy76gpn0z20f6bpbnv0ryjb8p4x5j821a46ld19r9lvp7a9rrr"; depends=[lpSolveAPI validate]; }; + validatetools = derive2 { name="validatetools"; version="0.5.0"; sha256="10wardp2c70zx5ii940sjql3xh5p3vqxv4ayyifhhlr8vzvr5cj0"; depends=[lpSolveAPI validate]; }; valorate = derive2 { name="valorate"; version="1.0-1"; sha256="06vczszpkipsxfs7h6ld33vvxb5ci62rwg3cglwy3lcfifhbnsfi"; depends=[survival]; }; valottery = derive2 { name="valottery"; version="0.0.1"; sha256="0rlv8agm9ng4jcb9ixqifh7kjczvkx7047brq8yf9kg7rb8mzgpz"; depends=[]; }; valr = derive2 { name="valr"; version="0.5.0"; sha256="14jhrwkiwmha3vlmm7b50n2xxyizj6ddmy89gb20mpzq7qhz1ika"; depends=[broom dplyr ggplot2 Rcpp readr rlang stringr tibble]; }; valueEQ5D = derive2 { name="valueEQ5D"; version="0.5.1"; sha256="0njarifqj7mfnc5bqaq7zpx0z7sx9rmz88755s7426dyypx8v0lv"; depends=[rstudioapi testthat]; }; valuer = derive2 { name="valuer"; version="1.1.2"; sha256="0mbwzsvy34ppngyxdzpd9w1r4f00cik4maqab9kpiflrrv9xdp78"; depends=[ggplot2 orthopolynom R6 Rcpp RcppEigen timeDate yuima]; }; - vamc = derive2 { name="vamc"; version="0.1.1"; sha256="0mpn7vp7kc19zbnviah18r972vpw2q5l884xvjkyn23gsib1scvg"; depends=[Rdpack]; }; - vampyr = derive2 { name="vampyr"; version="1.0.5"; sha256="0hnxgl2cp3scnazr7fnjgzfz5ihfzs5gwbsb6jlq569d6il9jjl7"; depends=[corpcor EFA_MRFA fungible GPArotation lavaan moments optimbase PCovR psych]; }; + vamc = derive2 { name="vamc"; version="0.2.1"; sha256="04kkli4xzf3gzvs215lzch8bl877cdq3awh3mz1k321zhsa1d0jn"; depends=[Rdpack]; }; + vampyr = derive2 { name="vampyr"; version="1.0.6"; sha256="1iqlb948wvwxf69588qz0hmc1fsmbqp058qbvrzx817w3mhjcs63"; depends=[corpcor EFA_MRFA fungible GPArotation lavaan moments optimbase PCovR psych semPlot]; }; vanddraabe = derive2 { name="vanddraabe"; version="1.1.1"; sha256="094kd72slq0n3pk0p6zps241aszb9yql49h4mr007zf0kn8wlf8v"; depends=[bio3d cowplot fastcluster ggplot2 openxlsx reshape2 scales]; }; vanquish = derive2 { name="vanquish"; version="1.0.0"; sha256="01di1j36npl7vnyhgsagvyf6j8bxcw867dwf9dgi7l1328s7lf0l"; depends=[changepoint e1071 ggplot2 VGAM]; }; - vapour = derive2 { name="vapour"; version="0.4.0"; sha256="0vv8vd5gkhf7vjicm1r3c6liibgvdfnm030b1p7fm71jb7ycg49p"; depends=[Rcpp]; }; + vapour = derive2 { name="vapour"; version="0.5.0"; sha256="06rjqvriz64f7w5b5xwn3n5xk27l3p2l1sgipzjkk04gs24m6nfh"; depends=[Rcpp]; }; varEst = derive2 { name="varEst"; version="0.1.0"; sha256="0i6nsxl5w4zipzrmdvx8plmxr33n405w2qhks3s7zzs3kcys32v6"; depends=[caret glmnet lm_beta SAM]; }; varImp = derive2 { name="varImp"; version="0.3"; sha256="08kqnqv29bmw2lqnsyffnbwr3a0f97mf593pkwzak6wy0mkqrm5z"; depends=[measures party]; }; varSel = derive2 { name="varSel"; version="0.1"; sha256="0ddj3swfxzchs75kfi6h25h3c33hpapnd5kcwcijnqhlh902b1r0"; depends=[]; }; @@ -14942,27 +15121,29 @@ in with self; { varclust = derive2 { name="varclust"; version="0.9.4"; sha256="0knmfq3pn38j8p29j6sqapdv3g5335si3gwiw932ml5z49a8ga5m"; depends=[doParallel doRNG foreach pesel RcppEigen]; }; vardiag = derive2 { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; }; vardpoor = derive2 { name="vardpoor"; version="0.16.0"; sha256="09dy1q1lx3b53an7qdszqzl5r4aswddy3046cvz997k1f692mwda"; depends=[data_table foreach ggplot2 laeken MASS plyr pracma stringr surveyplanning]; }; - varhandle = derive2 { name="varhandle"; version="2.0.4"; sha256="17hvn991268xdfmxx9a03k04zy9gbd4jihyl0750pm3flsldarrl"; depends=[]; }; - variables = derive2 { name="variables"; version="1.0-2"; sha256="02q1fyd7r0xclvwbiqz07dr6y5g2sqfjj1qv5hvvhs0vmx93w7f9"; depends=[]; }; + varhandle = derive2 { name="varhandle"; version="2.0.5"; sha256="1l42d0s6fbjjc9l28a2m3myxkrx2c0p0b9yj8wjjjgilw19yc3lv"; depends=[]; }; + variables = derive2 { name="variables"; version="1.0-3"; sha256="1x4w6pqrl6lw5dalii7kiq5f7jbfj1mlwdq2f6bvyfpx8byrvkqc"; depends=[]; }; varian = derive2 { name="varian"; version="0.2.2"; sha256="0jyw46qx2w19h02mrwv3w3n8qc1n4b3ckm38qly1y4a4w9ib6c2i"; depends=[Formula ggplot2 gridExtra MASS rstan]; }; variantspark = derive2 { name="variantspark"; version="0.1.1"; sha256="13hkp6l64hi7xlll09gin7kdlkqrkn0lggrw8147zy9ivhknhk59"; depends=[sparklyr]; }; - variosig = derive2 { name="variosig"; version="0.3"; sha256="0pffkhxkxp1bmyqdvwixfw8kqdvf0p4c9ff44cbhnc8lcyv5qpj2"; depends=[geoR gstat sp testthat]; }; - varjmcm = derive2 { name="varjmcm"; version="0.1.0"; sha256="02l0d896faakh9pdq2rzl2psmrj7l2pvacz7nk3r6552glsk7h18"; depends=[expm jmcm MASS Matrix]; }; - varrank = derive2 { name="varrank"; version="0.2"; sha256="19c40wwiadyqwn4z7nd22ynpa4wxr2anr2487mllmpg1d7wz3y38"; depends=[FNN]; }; + variosig = derive2 { name="variosig"; version="0.3-1"; sha256="09cxigii0sj78yqd18p4mm9jjqvd1k2cgjy43pxpmqdhia0q2pmv"; depends=[gstat sp testthat]; }; + varitas = derive2 { name="varitas"; version="0.0.1"; sha256="1xndg2hj4g3c7r4pzvjg7phrr1absa4xkpjc7gqfq45ymb3kadxz"; depends=[assertthat doParallel dplyr foreach magrittr openxlsx stringr tidyr VennDiagram yaml]; }; + varjmcm = derive2 { name="varjmcm"; version="0.1.1"; sha256="1xgy3n57pxhv6wrsw9h4dranxbw6hdpm1f9ra3kwlzrpz5c3289x"; depends=[expm jmcm MASS Matrix]; }; + varrank = derive2 { name="varrank"; version="0.3"; sha256="0k7hz61ymxf7w2hh1v2yfb6qdjn68a8ckjfiw0jqqhjx4wh5crn7"; depends=[FNN]; }; vars = derive2 { name="vars"; version="1.5-3"; sha256="0zc6v827ll19n088n31afgjf65zqwvyzmmj4q3ab1xhqzxfsgbw6"; depends=[lmtest MASS sandwich strucchange urca]; }; varsExplore = derive2 { name="varsExplore"; version="0.1.0"; sha256="1sscz565i288nmk7sv03kj2xysfppvil4nl2lxxbvp3y4mrkz09b"; depends=[dplyr DT glue magrittr purrr rio rstudioapi stringr tidyr]; }; - varycoef = derive2 { name="varycoef"; version="0.2.9"; sha256="1hc6w5bmmp98bnly7wyb10ljdsfl40xy2i60lmrask93zk80br7f"; depends=[fields RandomFields sp spam]; }; + varycoef = derive2 { name="varycoef"; version="0.2.11"; sha256="13ccgc5dyac8224kpl5f1n6yw77m2f32amcr0h2c0z74sjwcxn54"; depends=[fields optimParallel RandomFields sp spam]; }; vaultr = derive2 { name="vaultr"; version="1.0.2"; sha256="1b7g0jplp5dw1img7d6wm75gaycb3z8a8mzc6s0iwvhbfl8vf574"; depends=[getPass httr jsonlite R6]; }; vbdm = derive2 { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; }; vbsr = derive2 { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; }; - vcd = derive2 { name="vcd"; version="1.4-5"; sha256="0pqf1sdp0d60aqc7721hy2zfcp57902by0i28jqbn683dd50c21a"; depends=[colorspace lmtest MASS]; }; + vcd = derive2 { name="vcd"; version="1.4-7"; sha256="16aj688nhlcvdxzfsqh4s375v8f8vl8997dl8h1xg29b42nv52gc"; depends=[colorspace lmtest MASS]; }; vcdExtra = derive2 { name="vcdExtra"; version="0.7-1"; sha256="163x9hhvhgdmrqbcig7b120lk63svy0y652scbrcb11f85zrgb0c"; depends=[ca gnm MASS vcd]; }; - vcfR = derive2 { name="vcfR"; version="1.9.0"; sha256="0rz25ldy475m43mc5rmvy8yvgspf3pwb154h4jbk2nlk12473d0x"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tibble vegan viridisLite]; }; + vcfR = derive2 { name="vcfR"; version="1.10.0"; sha256="13dfg42c7z0129difxd7phw8gbnck8gq4xd218r626wq7jrch6cy"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tibble vegan viridisLite]; }; vcov = derive2 { name="vcov"; version="0.0.1"; sha256="1w89mr8dk6436bxap28rszajgm9k7sjfqsr1i4p68dlhw8zk4yq1"; depends=[]; }; - vcr = derive2 { name="vcr"; version="0.4.0"; sha256="1fy48j5ky271x5a41xrba290nqbzhpqizbl8lg8sxhlr8l30pi62"; depends=[base64enc crul httr lazyeval R6 urltools webmockr yaml]; }; - vcrpart = derive2 { name="vcrpart"; version="1.0-2"; sha256="1xfvsxgyf39d2qxnm40nzkqp7q12y8nbpn9h154n876zxxfs7gh1"; depends=[formula_tools nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; }; - vctrs = derive2 { name="vctrs"; version="0.2.2"; sha256="008xjmlj5a5vm303wxac7bliamqwaj7mcj0jv6n9ibc8p8h93aqd"; depends=[digest ellipsis glue rlang]; }; + vcr = derive2 { name="vcr"; version="0.5.4"; sha256="1wilihibpvy9pvf50wi9r5sh1lfdz9ddfxxslcl3lz7g2b0hyxkv"; depends=[base64enc crul httr lazyeval R6 urltools webmockr yaml]; }; + vcrpart = derive2 { name="vcrpart"; version="1.0-3"; sha256="10898qp3sh2cjcfz4ac2q98f3z2wmwd3zvhhcdlxw7xy5a1x8gib"; depends=[formula_tools nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; }; + vctrs = derive2 { name="vctrs"; version="0.2.4"; sha256="15sgzs6afvmhssk6jcg41rn3bvmzmbm4sgca6f6x8lfrsazvdj6w"; depends=[digest ellipsis glue rlang]; }; vcvComp = derive2 { name="vcvComp"; version="1.0.1"; sha256="1103hjzd29f8gpsfbagdryq52m6fkhhh9dbqhbmhixxlimc7sd03"; depends=[]; }; + vdar = derive2 { name="vdar"; version="0.1.2-1"; sha256="1ia3211ah4m2dapdldgpvphk6zjfmx550dn9zz7im5v46b9dk9a0"; depends=[compositions]; }; vdg = derive2 { name="vdg"; version="1.2.0"; sha256="1hi5d14nh9q784sbdk018awrawh9f1aix0wl26x7n0xb4707rcmy"; depends=[ggplot2 gridExtra proxy quantreg]; }; vdiffr = derive2 { name="vdiffr"; version="0.3.1"; sha256="1l0vzh7nnwr64cq0nixnr4m0iya4mdpqvh45g2wf1hja51mcvw0a"; depends=[BH devtools diffobj fontquiver freetypeharfbuzz gdtools glue htmltools htmlwidgets purrr R6 Rcpp rlang shiny testthat usethis xml2]; }; vec2dtransf = derive2 { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; }; @@ -14978,9 +15159,8 @@ in with self; { vegetarian = derive2 { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; }; vegperiod = derive2 { name="vegperiod"; version="0.2.6"; sha256="0v8bpxaa0xp8ywnycxs3613scncrhv8g7p99j6n5hs26m4h1km49"; depends=[]; }; vegtable = derive2 { name="vegtable"; version="0.1.5"; sha256="04q1dl4p12r4a05nhrlpzy4f5jw6i49ydaq5xrd84x1n6cc5qar9"; depends=[foreign plotKML qdapRegex sp stringi taxlist vegdata]; }; - vein = derive2 { name="vein"; version="0.8.5"; sha256="17a81x2c9mv9df1l4znw5rmjlb17qaicprkirfpgr5n1m6mnlx6s"; depends=[data_table eixport sf sp units]; }; + vein = derive2 { name="vein"; version="0.8.8"; sha256="1d1aszmfz0g6vd80v1rf0lh7v84g0kh9g86jns7ryjjfqn13yl9y"; depends=[data_table sf units]; }; velociraptr = derive2 { name="velociraptr"; version="1.1.0"; sha256="0a67vmv05cxc9f27aqzr6nkgy2mj3fhykwj5nb23qwfqa669a5hi"; depends=[sf]; }; - velox = derive2 { name="velox"; version="0.2.0"; sha256="1jrarfsfflvpc0dqh5gnw92fk8zic222n7pr7hd0lhr5d389k6d0"; depends=[BH raster Rcpp rgdal rgeos sf sp]; }; vembedr = derive2 { name="vembedr"; version="0.1.3"; sha256="0zg6j0g9l7j36ifwabhxrin5z0dics66bqkc7x6rqijmizk1xpba"; depends=[htmltools httr magrittr stringr]; }; venn = derive2 { name="venn"; version="1.9"; sha256="0d2vwjc932q8n9hww8krj7nixg1dfkmcw1k1cry2d0xdvbbnrj8r"; depends=[admisc]; }; venneuler = derive2 { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; }; @@ -14990,26 +15170,28 @@ in with self; { vertexenum = derive2 { name="vertexenum"; version="1.0.2"; sha256="16ywz3z1kzhb3knhhi2i5igm3djdaaxyyrw69wkc5saa7ayhdb4y"; depends=[numbers]; }; vesselr = derive2 { name="vesselr"; version="0.2.1"; sha256="1wzprnpiv04gxhqgki36gp1a0xj9l3mchllphwkfsdja4axq3prk"; depends=[oro_nifti pbapply pbmcapply]; }; vetools = derive2 { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[lubridate maptools plyr scales sp stringr tis xts]; }; - vetr = derive2 { name="vetr"; version="0.2.8"; sha256="069vq4ysywakbnpa0cx711a7w6bhc4k3hr7rnsx8y4ji552ysji1"; depends=[]; }; + vetr = derive2 { name="vetr"; version="0.2.9"; sha256="1dqlv1ks3bfqz6hrl3q913i7sbf9430ix5pjjyl7db0452lhny3a"; depends=[]; }; vfcp = derive2 { name="vfcp"; version="1.4.0"; sha256="0zj1ihqdx5x1695al1xyi8k001yw8x7gdss72myxlnh7b4flnp9m"; depends=[copula extraDistr stringr]; }; vfprogression = derive2 { name="vfprogression"; version="0.7.1"; sha256="0kgw1jx0rl9v8qy8qg7zjzdgvwqdi7k1lsvsx3lnpw4sfpkzsq23"; depends=[]; }; vhcub = derive2 { name="vhcub"; version="1.0.0"; sha256="04a8hdm4pxl8fzwy9q2wqc9q0dl5r49xwbid70yj9qlflh683id0"; depends=[Biostrings coRdon ggplot2 seqinr stringr]; }; - vhica = derive2 { name="vhica"; version="0.2.4"; sha256="0km49lrzn9rm3wxadwxc290dvx3bsblbmna7f9lnkq6g1z5jdqwg"; depends=[]; }; - viafr = derive2 { name="viafr"; version="0.1.0"; sha256="14y5k1vskfzxfpzjkk9602p8mvvyfrf3qpr517zdb714wv3gwk3h"; depends=[assertthat crul dplyr jsonlite magrittr purrr rlang stringr tibble tidyr utf8]; }; + vhica = derive2 { name="vhica"; version="0.2.7"; sha256="0zz4sffhrvh9raxygxma5a2jijq8nw8wqg8bc486sd2ahlv8g3s8"; depends=[]; }; + viafr = derive2 { name="viafr"; version="0.2.0"; sha256="08hvylrv4c8p5vazalagbkv3vhqmr9halbxkf05kfn74ssw8lljz"; depends=[assertthat crul dplyr jsonlite magrittr purrr rlang stringr tibble tidyr utf8]; }; vici = derive2 { name="vici"; version="0.5.2"; sha256="0qad8ab04ndd29kcmd388piiymablfc7xlv6iml4sxkid7z5kgby"; depends=[cowplot DT ggplot2 ggpubr nlme shiny tidyr]; }; vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; }; viewshed3d = derive2 { name="viewshed3d"; version="3.0.0"; sha256="0yx271xx4nfxjlvrg0c5x77n6zcahmj9kvz6qpzdg3ysg4ydyika"; depends=[data_table lidR nabor pracma raster rgl sp TreeLS viridis]; }; - vimp = derive2 { name="vimp"; version="1.1.6"; sha256="1jczlg8sa62f9skn32gbc094lbm41w5hp65w1k1imqxcvb43n8ql"; depends=[SuperLearner]; }; + vimp = derive2 { name="vimp"; version="2.0.1"; sha256="0bwc4rdzdqvmhshk4l8d9x76fvd5f7g2jja182lsiz28v1jh8ga3"; depends=[dplyr magrittr rlang ROCR SuperLearner tibble]; }; vinereg = derive2 { name="vinereg"; version="0.7.0"; sha256="1fviqzs879n7rin3b0jks8dfvcxiay8jssqy7salslghpj7rkm84"; depends=[assertthat BH kde1d Rcpp RcppEigen RcppThread rvinecopulib wdm]; }; vines = derive2 { name="vines"; version="1.1.5"; sha256="057d2fdh03cq9kh4vz94arqscahmz14xbr2g59l0vn205lnyilf1"; depends=[ADGofTest copula cubature TSP]; }; violinmplot = derive2 { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; }; + violinplotter = derive2 { name="violinplotter"; version="1.0.1"; sha256="16kcz99w9avx99y5cnc5rn3dx367v1fmc8mlavjvfp8sy7m9x3lp"; depends=[]; }; vioplot = derive2 { name="vioplot"; version="0.3.4"; sha256="1fsklymilspzz5fzlj7666x09aglaw0v4x0yfjjzy4vr5qpjc529"; depends=[sm zoo]; }; viopoints = derive2 { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; }; - vip = derive2 { name="vip"; version="0.2.1"; sha256="1z3h4rjy15zvf0510ic1p1zxamhc4da74py6zy56c44y9yy1nvp5"; depends=[ggplot2 gridExtra magrittr plyr tibble]; }; + vip = derive2 { name="vip"; version="0.2.2"; sha256="14wvadkpzismszqc4qi15jaky1qlf1l4g33cbvpnzdqxmhi61x4g"; depends=[ggplot2 gridExtra magrittr plyr tibble]; }; vipor = derive2 { name="vipor"; version="0.4.5"; sha256="112gc0d7f8iavgf56pnzfxb7hy75yhd0zlyjzshdcfbnqcd2a6bx"; depends=[]; }; viridis = derive2 { name="viridis"; version="0.5.1"; sha256="060rf1jn29dq53y3nhb0hykvcap6rqsk04rq544ypiiqb18ngwnx"; depends=[ggplot2 gridExtra viridisLite]; }; viridisLite = derive2 { name="viridisLite"; version="0.3.0"; sha256="1by2l05f0yabwvv64lhnv7bbhx0w683s3wr9j2xda920ghpa23kq"; depends=[]; }; viromeBrowser = derive2 { name="viromeBrowser"; version="1.0.0"; sha256="0adyf6ssi0ph7x880inj1vfmpjfbsaavjavjnrpr9cb6p0qdmvyc"; depends=[Biostrings data_table DT ggplot2 markdown plyr rbokeh reshape Rsamtools shiny shinycssloaders shinydashboard shinyWidgets stringr]; }; + virtualNicheR = derive2 { name="virtualNicheR"; version="1.0"; sha256="1ya1nd30vm7kjc4468ra8fjyxdwq2i1l1lmajhqjvw0nsj0mh1bl"; depends=[devtools diptest]; }; virtualPollen = derive2 { name="virtualPollen"; version="1.0.0"; sha256="16q1smwh3ryids3pa7lb4i4pxmjjyl449w6fikkrm9ybj1k8gfcf"; depends=[cowplot ggplot2 mgcv plyr tidyr viridis]; }; virtualspecies = derive2 { name="virtualspecies"; version="1.5.1"; sha256="0l86awcjq6i1lqax596xy5qfmzwiz3cwp2rczvgg37fdrym97cm3"; depends=[ade4 raster rworldmap sp]; }; virustotal = derive2 { name="virustotal"; version="0.2.1"; sha256="0lky75al8zcvmfgx7a2s3bij8ya4avdsnv046lk7564zfd8rbymw"; depends=[httr plyr]; }; @@ -15017,8 +15199,8 @@ in with self; { visTree = derive2 { name="visTree"; version="0.8.1"; sha256="1l07zfr2hagjpdxfw5290wa3ki4bl7iqxrrhda0d1bp3wmwfz0ai"; depends=[colorspace partykit rpart]; }; visdat = derive2 { name="visdat"; version="0.5.3"; sha256="1ikqp29nncbw1xlwyb9dqqgcdk9q0bs3wxhnhnjpb11vcjv7cz2j"; depends=[dplyr ggplot2 glue magrittr purrr readr tibble tidyr]; }; visit = derive2 { name="visit"; version="2.1"; sha256="0kkspih7m18g5pqlwrxpgjdwqxpp23c3xyvcnvv247abl9aq81rd"; depends=[BH Rcpp RcppEigen rstan sqldf StanHeaders]; }; - visreg = derive2 { name="visreg"; version="2.6-0"; sha256="0an58wrgn8qxmigc3nvykvglh41asdz8bn4zrzpg34dxiqykqb4b"; depends=[lattice]; }; - vistime = derive2 { name="vistime"; version="0.9.0"; sha256="1apyjapxqm05mlr4bx7s2x5v9ji8z8jb3spkrwcs0fibd6bq1dbb"; depends=[assertive plotly RColorBrewer]; }; + visreg = derive2 { name="visreg"; version="2.6.1"; sha256="01k44nxxilz7yrw5rihsg4r49yqjmz4zxmafcq89zbygap1d68ay"; depends=[lattice]; }; + vistime = derive2 { name="vistime"; version="1.0.0"; sha256="0114qgfq5ns02sgxh81cf68jx7pk74na9g10f23d6lm8jxcwdsrz"; depends=[assertive ggplot2 plotly RColorBrewer]; }; vistributions = derive2 { name="vistributions"; version="0.1.1"; sha256="1s68dpcy55v6yw7ivh2xpshz6qc0qaifjd15h7rjg3zl1cx81mh3"; depends=[ggplot2 magrittr shiny]; }; visualFields = derive2 { name="visualFields"; version="0.6"; sha256="1w6wkyzjakj6ss9nv4gzkgva4m21jbsz10c2jy660bjb25rf59ih"; depends=[deldir flip gtools Hmisc matrixStats spatstat]; }; visualize = derive2 { name="visualize"; version="4.4.0"; sha256="1k3jpvj1yysxc4g1a1w3m1y91104aqxqv8jh9qdd23gwy7a29525"; depends=[]; }; @@ -15026,7 +15208,7 @@ in with self; { vita = derive2 { name="vita"; version="1.0.0"; sha256="114p2lzcr8rn68f0z4kmjdnragqlmi18axda9ma4sbqh8mrmjs9v"; depends=[randomForest Rcpp]; }; vitae = derive2 { name="vitae"; version="0.2.1"; sha256="053dy7c5zlrdb3hcbbdndx61ahkd2xwgl0i3ivcxwladyrkksyz3"; depends=[bookdown dplyr glue knitr RefManageR rlang rmarkdown xfun]; }; vitality = derive2 { name="vitality"; version="1.3"; sha256="17micfmlksnw167vavvhlk431fm20k74y5ggs47pgz5fwpm854zp"; depends=[]; }; - vivo = derive2 { name="vivo"; version="0.1.1"; sha256="0qqzlf1hhalbblx6qsl1i9s4l7hybdpd5xpwjwcv4zgjizvzgbpx"; depends=[DALEX dplyr ggplot2 ingredients]; }; + vivo = derive2 { name="vivo"; version="0.1.2"; sha256="1wd38vkb0qw8hcv9x4vsb0dg0dbqcnzfgpdzzanfbsn9hg1gswd7"; depends=[DALEX dplyr ggplot2 ingredients]; }; vkR = derive2 { name="vkR"; version="0.1"; sha256="0rb66am3y009wli8ykl58i02kzm6cdqz5v5d4vvzlbngz8crdkyy"; depends=[httr jsonlite XML]; }; vlad = derive2 { name="vlad"; version="0.2.0"; sha256="0bq91n51f9cnvbqskk0vg6xn559z3a33csbvyhvcvhyjcws2yahp"; depends=[Rcpp RcppArmadillo]; }; vmd = derive2 { name="vmd"; version="0.1.0"; sha256="17c06a9l6i90ivpvf3rgv6yrsqv36qmywmmy92y5b81zqhgmh907"; depends=[ggplot2 magrittr R6 Rcpp reshape2 scales]; }; @@ -15035,10 +15217,10 @@ in with self; { volesti = derive2 { name="volesti"; version="1.0.3"; sha256="099c49dy9iqrvmrmcm6h8af4q50q6b0ymnkk0s2bzaqczbpkwibj"; depends=[BH Rcpp RcppEigen]; }; volleystat = derive2 { name="volleystat"; version="0.2.0"; sha256="0n1r0bvvmba21cs3qgpnw9jxpgl2n82fhxa40sa1w2gav5rch5i6"; depends=[]; }; voronoiTreemap = derive2 { name="voronoiTreemap"; version="0.2.0"; sha256="1wvnqdrvba4ss4f3k8gzb720irdq2brv2aaq16ywifv8fnjf02r3"; depends=[data_tree DT htmlwidgets rlang shiny shinyjs]; }; - vortexR = derive2 { name="vortexR"; version="1.1.6"; sha256="113ndhf2f3hlhmgbg6gh5fq1az6d314fwl872dwypj2zsvfm7x03"; depends=[betareg data_table GGally ggplot2 glmulti gtools irr plyr R_utils stringr vortexRdata]; }; + vortexR = derive2 { name="vortexR"; version="1.1.7"; sha256="06i2rqbc3h2kv8jjrdlrg03xrzb3yiyzpnv2rvlkjcnn46f84bgf"; depends=[betareg data_table GGally ggplot2 glmulti gtools irr plyr R_utils stringr vortexRdata]; }; vortexRdata = derive2 { name="vortexRdata"; version="1.0.5"; sha256="0b47q3aslz4110a1bfaa103i098y2ngzrjh01rwasq3gd6xbif9n"; depends=[]; }; vosonSML = derive2 { name="vosonSML"; version="0.29.4"; sha256="0ngipwg83xw832ikaaqbyh2zxkwwwxalp6xrb60dk96z2r7qgj2r"; depends=[data_table dplyr Hmisc httpuv httr igraph magrittr purrr RCurl RedditExtractoR rlang rtweet stringr textutils tibble tictoc tm]; }; - vote = derive2 { name="vote"; version="1.1-0"; sha256="1kxbv4062g4x9vn4gh74c6zwdshysw5n7vx9qljhq2wrdnqzjpyg"; depends=[formattable knitr]; }; + vote = derive2 { name="vote"; version="1.2-1"; sha256="14bqmamndq5l7mfij8kfzk2lyrn0b52jgafgy9qb93qvk1fr5raz"; depends=[formattable knitr]; }; voteogram = derive2 { name="voteogram"; version="0.3.1"; sha256="12xv0c3g4vr23c8adkk8z7m7sx31w5mjvdg9h4qbvaimb99p2r7z"; depends=[dplyr ggplot2 jsonlite scales]; }; votesys = derive2 { name="votesys"; version="0.1.1"; sha256="1z7cx3rj3bfrkb6jkmf1m1wad5ff46zrab5vhk69wf3jbwd9h920"; depends=[data_table gtools Matrix]; }; vottrans = derive2 { name="vottrans"; version="1.0"; sha256="1fp7jrw072ws39bqsg88bm2qndcv68aa2vdqwgnza58p1dfq3x9f"; depends=[quadprog]; }; @@ -15055,8 +15237,8 @@ in with self; { vscc = derive2 { name="vscc"; version="0.2"; sha256="1p14v8vd8kckd44g4dvzh51gdkd8jvsc4bkd2i4csx8vjiwrni5w"; depends=[mclust teigen]; }; vsgoftest = derive2 { name="vsgoftest"; version="0.3-2"; sha256="020kghcfv8h0i7fzq3p2grhhbwvqmc9ya9r7lc1kiqg1bfgljg91"; depends=[fitdistrplus Rcpp]; }; vstsr = derive2 { name="vstsr"; version="1.0.0"; sha256="0flsw5yw1vmj5x866klxmjqz5aimkvjiwl1zdciz63p9zffmb4gz"; depends=[httr jsonlite magrittr R6 RCurl xml2]; }; - vtable = derive2 { name="vtable"; version="0.6.0"; sha256="13kj9fanrj1xk3n1fc55lv48l2hrysp9b4fmkws7l8qfai4y53gl"; depends=[rstudioapi sjlabelled]; }; - vtreat = derive2 { name="vtreat"; version="1.5.1"; sha256="0d755r84cpw5fglj8afrazhqvswa6xkp4xwa1jdcmpiaw4f0mhdx"; depends=[digest wrapr]; }; + vtable = derive2 { name="vtable"; version="1.0.1"; sha256="0zj7xx4qk6gdia8q4jjsa3wcpcszn3lxv9afy892n9w6nigpfrmq"; depends=[haven rstudioapi sjlabelled]; }; + vtreat = derive2 { name="vtreat"; version="1.6.0"; sha256="1qldqdc0k5ifzqy53fmh24cdxl4xxil9s3l8kff23fdvm3fmvk3n"; depends=[digest wrapr]; }; vtree = derive2 { name="vtree"; version="4.0.0"; sha256="0i88ab7pjbj5s5xvykx47xxhqlk1vw3anra30wvhy6cr9774x8bg"; depends=[DiagrammeR DiagrammeRsvg htmlwidgets rsvg shiny]; }; vudc = derive2 { name="vudc"; version="1.1"; sha256="0zxz6n3ixa3xjzcinky8ymqjx9w8y8z65mz8d84dl00mxzkmkz4h"; depends=[]; }; vwline = derive2 { name="vwline"; version="0.2-2"; sha256="1hilr996xn5wh8kfyab55w2i1c02a8x909h4ahag5q6s7603qng5"; depends=[gridBezier polyclip]; }; @@ -15075,15 +15257,15 @@ in with self; { wahc = derive2 { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; }; waiter = derive2 { name="waiter"; version="0.1.0"; sha256="13csg6iy6fzr5fkz3wvmj1fvi0csijbgmvz262jnrq1c75srirmb"; depends=[magrittr R6 shiny]; }; wakefield = derive2 { name="wakefield"; version="0.3.3"; sha256="05z9a6g1cdavalp50wss7klnlcdbv3y1jvz1v8ry1x2bziy216y2"; depends=[chron dplyr ggplot2 stringi]; }; - walkalytics = derive2 { name="walkalytics"; version="0.1.0"; sha256="1kl6kwwnl67d45akna01xp389wjxsxlc84l0bcpadbipsqyb3kd1"; depends=[base64enc dplyr httr purrr sp stringr tibble]; }; + waldo = derive2 { name="waldo"; version="0.1.0"; sha256="12405hc65mhwg69fp6m4g96zn8imx2jb9vl1pv6im0wmrqff3ay6"; depends=[cli diffobj fansi glue rematch2 rlang tibble]; }; walker = derive2 { name="walker"; version="0.3.1-1"; sha256="135x32ar8m4m4zxdz94c7wrddsb0ps58nywh2k2gh3kqjbbzxx7a"; depends=[bayesplot BH dplyr ggplot2 KFAS Rcpp RcppArmadillo RcppEigen rstan StanHeaders]; }; walkscoreAPI = derive2 { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; }; - wallace = derive2 { name="wallace"; version="1.0.6"; sha256="0pnkwdfmimnvyygbz1iz1b9fhcdi7k53wjw44kmnr2b7ln9pbcl2"; depends=[dismo dplyr DT ENMeval leaflet leaflet_extras magrittr maptools raster RColorBrewer rgdal rgeos rmarkdown shiny shinyjs shinythemes spocc spThin XML zip]; }; + wallace = derive2 { name="wallace"; version="1.0.6.2"; sha256="0qhy1m9imwqmb6lzgx25xqqyrlja13g4l96c6q9mn008kmljpn0n"; depends=[dismo dplyr DT ENMeval leaflet leaflet_extras magrittr maptools raster RColorBrewer rgdal rgeos rmarkdown shiny shinyjs shinythemes spocc spThin testthat XML zip]; }; wally = derive2 { name="wally"; version="1.0.10"; sha256="1d03vxn6q7v0nsrkd7dxkkv3siysgicv6c13fkvwmypln9vsl6sl"; depends=[data_table prodlim riskRegression]; }; walmartAPI = derive2 { name="walmartAPI"; version="0.1.5"; sha256="1nng8izncj2nmmpywn1ggpzvjh8q7y3q6260qhy9kbmvrrl26spf"; depends=[dplyr glue httr magrittr purrr stringr tibble]; }; walrus = derive2 { name="walrus"; version="1.0.3"; sha256="1nk2glcvy4hyksl5ipq2mz8jy4fss90hx6cq98m3w96kzjni6jjj"; depends=[ggplot2 jmvcore R6 WRS2]; }; wand = derive2 { name="wand"; version="0.5.0"; sha256="0y9xmh9a93lnadg83i223j2nf77jazz8m1ck1bmdf5jwj4vyzaqa"; depends=[]; }; - warbleR = derive2 { name="warbleR"; version="1.1.20"; sha256="0xk7n98h80larhh1mvs8d9ji17hvq699gcy22m5xaqqh8xi4y1h0"; depends=[dtw fftw maps monitoR NatureSounds pbapply pracma RCurl rjson seewave Sim_DiffProc tuneR]; }; + warbleR = derive2 { name="warbleR"; version="1.1.23"; sha256="0qvi2kfp6fvi45kh21fcrj9b0wdk67mm67v16fvgbjk9dvwi67kv"; depends=[dtw fftw maps monitoR NatureSounds pbapply pracma RCurl rjson seewave Sim_DiffProc tuneR]; }; warp = derive2 { name="warp"; version="0.1.0"; sha256="16bmym91h0sbbh4iqasqs0f4kp3jqlm3sqgc356mznhxwnsm8dm2"; depends=[]; }; warpMix = derive2 { name="warpMix"; version="0.1.0"; sha256="13zbl4aifhg7j5b3vpwgzgs09hr7yblz0rckmj5qh40s78j8cpfn"; depends=[fda fields lme4 MASS nlme reshape2]; }; washdata = derive2 { name="washdata"; version="0.1.2"; sha256="01cnlhymh3qg9c7fda8s6lvm4j2vklmb72dfk17sn4p0kkikf9m8"; depends=[]; }; @@ -15098,28 +15280,27 @@ in with self; { wavScalogram = derive2 { name="wavScalogram"; version="1.0.0"; sha256="0j3dj32rxqsrc4gwssj7n224j7q4c4pahixw8b0p9xakx93q54id"; depends=[abind colorRamps fields Matrix zoo]; }; waveband = derive2 { name="waveband"; version="4.7"; sha256="0b57g7jwvqgqjzd7x1pd4nqpx22rmiskvf8wjwrgplqzx4daxny2"; depends=[wavethresh]; }; waved = derive2 { name="waved"; version="1.2"; sha256="0zv4rgazk9s295pggzfa7sc062zv68dgds1ngxcz7vg1fx0qkgxg"; depends=[]; }; - waveformlidar = derive2 { name="waveformlidar"; version="1.1.0"; sha256="01ynxgk0cf7w1h5j5dic4yayvnilgdx4ih0icwnldyhpik1wc2wx"; depends=[caTools data_table flux minpack_lm raster reshape2 rgdal rgeos sp splitstackshape sqldf]; }; wavefunction = derive2 { name="wavefunction"; version="1.0.0"; sha256="1g0g9i0s93lcpcx7icqn15bvkmd79slkgimspvvwp2bxdsc5nnf2"; depends=[]; }; - wavelets = derive2 { name="wavelets"; version="0.3-0.1"; sha256="13gaqhc2aqp5vcqa9gb4zilggnhszkz0zyk0whfj0s72yjvxxl27"; depends=[]; }; + wavelets = derive2 { name="wavelets"; version="0.3-0.2"; sha256="07706rsjdmzj46ib2kfm5lfk4bnm2wfw7rby0ixs6x0myyzxdl92"; depends=[]; }; wavemulcor = derive2 { name="wavemulcor"; version="2.2.1"; sha256="0150ybf8lwxc93zhcrsmh4gp6wbib3s14j95jlg6dlsckixyi3iw"; depends=[waveslim]; }; waver = derive2 { name="waver"; version="0.2.1"; sha256="1kl14cd96fwrqvk35sqbgi8bf31gc2ccxxy5d1v46scwyqkb0g5l"; depends=[geosphere rgdal rgeos sp]; }; - waveslim = derive2 { name="waveslim"; version="1.7.5.1"; sha256="0mky0nb4xxp8rybp87mxw2f1q6k400wpxv01zr4injv7ja6028xk"; depends=[]; }; + waveslim = derive2 { name="waveslim"; version="1.8.2"; sha256="0ibivnhz0l06sss5rrrcvyiwg3qpbyk3qn4vx4pp90kj09x4yg0k"; depends=[]; }; wavethresh = derive2 { name="wavethresh"; version="4.6.8"; sha256="1nz74bm7pgck1i9c28svxnic8wkwkm5dhc8bhrxiih5wxb36kcwk"; depends=[MASS]; }; wbs = derive2 { name="wbs"; version="1.4"; sha256="0ibrf30riavy6shaxgiznwh4gmnkx92260gsl0d74jkys98mlxdj"; depends=[]; }; wbstats = derive2 { name="wbstats"; version="0.2"; sha256="0rfc9c6892jq7y17dwp6vsn62ggnac964xndmxq3mip6k2pk8yi0"; depends=[httr jsonlite tidyr]; }; wbsts = derive2 { name="wbsts"; version="2.0"; sha256="12k68nsrrxglrm9ik53rm8160xvjlsgzi7v4wp78jhmh2slmyxw3"; depends=[mvtnorm Rcpp wmtsa]; }; wdm = derive2 { name="wdm"; version="0.2.1"; sha256="05yc366g2lii305ljrhh9939gf8sf517alw5xcr2sdclr00qxal4"; depends=[Rcpp]; }; - wdman = derive2 { name="wdman"; version="0.2.4"; sha256="00q9qk8qgz7fjbd9j8pxknrw8lk1ardifg8w4agyrk8r4q56b1a0"; depends=[assertthat binman semver subprocess yaml]; }; - wdpar = derive2 { name="wdpar"; version="1.0.0"; sha256="1039pf3hz5nym2y00wqwj027dc8m5ny2a1pqavbybn6cxbq0m2r1"; depends=[assertthat cli countrycode curl httr lwgeom progress rappdirs RSelenium sf sp wdman xml2]; }; + wdman = derive2 { name="wdman"; version="0.2.5"; sha256="1yf41lsrr9dbf5n4f5hv9mlmzl736fhnp9gxkm2g9apws6gsig02"; depends=[assertthat binman processx semver yaml]; }; + wdpar = derive2 { name="wdpar"; version="1.0.2"; sha256="0ybslv1vbvqskmr5s8b9ama6g30g8bjr74hir3mxdwsr4kf668sm"; depends=[assertthat cli countrycode curl httr lwgeom progress rappdirs RSelenium sf sp tibble wdman xml2]; }; + weathercan = derive2 { name="weathercan"; version="0.3.4"; sha256="1nglfmlwb3l1rlp7vgm2d77yx4fn39i8ps54v6jvsbs0p57s5xhi"; depends=[dplyr httr lubridate purrr rlang rvest stringi stringr tidyr tidyselect xml2]; }; weathermetrics = derive2 { name="weathermetrics"; version="1.2.2"; sha256="1hjhgsy3v8328hv4czxxz7kp68sxc10sy10f3dv5j8f6pka6qlsp"; depends=[]; }; weatherr = derive2 { name="weatherr"; version="0.1.2"; sha256="11sb5bmqccqkvlabsw4siy9n6ivsrvxavywvaffgrs3blmnygql9"; depends=[ggmap lubridate RJSONIO XML]; }; webTRISr = derive2 { name="webTRISr"; version="0.2.0"; sha256="10xj8qvibhnywsxd1yb4laz6b38qwn483a7bflizsndsgrbzdi5n"; depends=[dplyr httr jsonlite lubridate magrittr purrr readr sf stringr]; }; - webchem = derive2 { name="webchem"; version="0.4.0"; sha256="032bsfnkn7s33y42fyf8yradsh8jhms4ryjkh0r76hqnx3j00ph0"; depends=[httr jsonlite RCurl rvest stringr xml2]; }; - webddx = derive2 { name="webddx"; version="0.1.0"; sha256="0w72pp0f77glq460mjagm30y3nd9dmhjkbb0w06ycsjdqvr8qji7"; depends=[jsonlite]; }; + webchem = derive2 { name="webchem"; version="0.5.0"; sha256="06vnwvh054cj1hflip108h99ps0cb57cq4f8ydrjcxgpplbx0v4w"; depends=[dplyr httr jsonlite purrr RCurl rvest stringr xml2]; }; webdriver = derive2 { name="webdriver"; version="1.0.5"; sha256="0l3nz7gf62jlkvkn5sfxfvn0prxz3ds7nlpfb1yhnmdljhbzrgzf"; depends=[base64enc callr curl debugme httr jsonlite R6 showimage withr]; }; webex = derive2 { name="webex"; version="0.9.1"; sha256="0z85cfnjicy3q1n77ilrh43h6xh6bpr1f1iinzfk1r64031h90yl"; depends=[jsonlite knitr rmarkdown]; }; webglobe = derive2 { name="webglobe"; version="1.0.2"; sha256="1277d6fkgrgixlhikfwf0r6z8g5b7mah905xi219qsfycxmifgn9"; depends=[geojsonio httpuv jsonlite]; }; - webmockr = derive2 { name="webmockr"; version="0.5.0"; sha256="0x4hrhmxqm4291babkkdpv25f36kvz879q3ff2j4n6hk4maqvkki"; depends=[crul curl fauxpas jsonlite magrittr R6 urltools]; }; + webmockr = derive2 { name="webmockr"; version="0.6.2"; sha256="1mf0f1pb5dkk63m7a63k7pscax6dywz97d2ihsg10qkv0svn2sm6"; depends=[crul curl fauxpas jsonlite magrittr R6 urltools]; }; webp = derive2 { name="webp"; version="1.0"; sha256="1h17g2zaq6ipsb1w6ix9m68ddmp7dspmaqflqkskylh2n8jhk8cd"; depends=[]; }; webr = derive2 { name="webr"; version="0.1.5"; sha256="03yhlla74i71nphrfhr5sd57ykj7rjanh2a8nw3cq22rg9g668jk"; depends=[dplyr flextable ggforce ggplot2 magrittr moonBook psych purrr rlang rrtable scales shiny sjlabelled stringr tibble tidyr tidyselect vcd ztable]; }; webreadr = derive2 { name="webreadr"; version="0.4.0"; sha256="0l3l5g4zj5faxqi1kqwx9lq91gbj40z2q3csrsmpal08qnwkxs90"; depends=[Rcpp readr]; }; @@ -15134,9 +15315,9 @@ in with self; { weibullness = derive2 { name="weibullness"; version="1.19.8"; sha256="19s44mxxcnhngifxshsyjr3a9zvbwywmqgby5dxd73yid1p2k9mr"; depends=[]; }; weibulltools = derive2 { name="weibulltools"; version="1.0.1"; sha256="06blip2dqaz2f3wnghp8yj0qj23s242k3r7bfcka1n52msc58xjz"; depends=[dplyr LearnBayes magrittr plotly Rcpp RcppArmadillo sandwich segmented SPREDA survival]; }; weightQuant = derive2 { name="weightQuant"; version="1.0"; sha256="1ngz51wr5qpnb98lfbddwvipcra86dq5whm6z8c4xd921anb15bx"; depends=[doParallel foreach quantreg]; }; - weightTAPSPACK = derive2 { name="weightTAPSPACK"; version="0.1"; sha256="0kpfw477qka5qrc6sh73had38xbrwrqp1yv0dj2qiihkiyrp67ks"; depends=[HotDeckImputation mice plyr survey]; }; + weightedScores = derive2 { name="weightedScores"; version="0.9.5.3"; sha256="1wf01z94snwbqp22waz7qays3ymg5lsxpfpafdarad2b6mg5j2g8"; depends=[mvtnorm rootSolve]; }; weightr = derive2 { name="weightr"; version="2.0.2"; sha256="1qsyak91kdgv48wf6qhpfbiirlg4ba9w6rw8ynjcsnqqdvmly1lb"; depends=[ggplot2 scales]; }; - weights = derive2 { name="weights"; version="1.0"; sha256="0186bfpkhxngrshac6bpg37alp6slwhwd43inrm8hqg0vhpfgc4c"; depends=[gdata Hmisc mice]; }; + weights = derive2 { name="weights"; version="1.0.1"; sha256="1ka2kvzg464vn80qziqy4mrciy9wwd3jfasgq0d33wbiblhmxkj5"; depends=[gdata Hmisc mice]; }; weirs = derive2 { name="weirs"; version="0.25"; sha256="17a0ppi7ghikrwn39zvhg2cvhmnr3w0qi7r9lj22x65ii9nzadd7"; depends=[]; }; welchADF = derive2 { name="welchADF"; version="0.3.2"; sha256="02a8w1dhc2nd74hml4z3cdlx0d2a9rcx47v341kgav620i8bn88g"; depends=[lme4]; }; wellknown = derive2 { name="wellknown"; version="0.6.0"; sha256="156kffa421d6k9wnab4pr22h4c9gnkw3i2fbk5jg03jl2rff090w"; depends=[jsonlite V8]; }; @@ -15145,8 +15326,10 @@ in with self; { wfe = derive2 { name="wfe"; version="1.9.1"; sha256="0lcg7hzdll1wqdwydkk96m4n715h8sjn3qwhabm245m0hqhdf7is"; depends=[arm MASS Matrix]; }; wfg = derive2 { name="wfg"; version="0.1"; sha256="1r6wb8v42mpapjfhmkmghm9fq21c3s4zmdxy8nlh31nsja71c37d"; depends=[igraph]; }; wfindr = derive2 { name="wfindr"; version="0.1.0"; sha256="0m5xj50hqdjj4lpbgx1kp3my4njr0nz09hd63rf4qf1ls8r7zil9"; depends=[dplyr magrittr]; }; + wflo = derive2 { name="wflo"; version="1.5"; sha256="1k9iyyr15hzbsram1246zb415hgwg8kr15zp78q9b6yf3yr46kmb"; depends=[]; }; wgaim = derive2 { name="wgaim"; version="2.0-1"; sha256="1qiyfkpsbzjr9xsq5kqq6rlqpndngkn2irdfh3gyi45h6hn118j4"; depends=[ggplot2 qtl]; }; wgeesel = derive2 { name="wgeesel"; version="1.5"; sha256="0lybvsq5168cjybzv2dbyx2z8aakcx7i7ivm8zc90haiispm9n5x"; depends=[bindata CRTgeeDR geepack MASS PoisNor]; }; + whatr = derive2 { name="whatr"; version="1.0.0"; sha256="0l9yvbqib2pf93dlslj5268c8l9zzywmy4kwijlvink6fasllrcn"; depends=[dplyr ggplot2 httr magrittr purrr rlang rvest scales stringr tibble tidyr xml2]; }; wheatmap = derive2 { name="wheatmap"; version="0.1.0"; sha256="1c1xvzy194vw3idkwkqp9kyrfldzczj30cl15jw1bbnw87zcwdzy"; depends=[colorspace RColorBrewer]; }; whereami = derive2 { name="whereami"; version="0.1.9"; sha256="0mjq9haacsf0zkgh7xxx8dr67hnw5ijjdhaz8c69mfjmd2zfzfwq"; depends=[cli jsonlite rstudioapi]; }; whereport = derive2 { name="whereport"; version="0.1"; sha256="1gdqzr2hrnpxbwl7cfps4m3xja8wkgwfs50i2nailybympvdnxm4"; depends=[dplyr]; }; @@ -15159,8 +15342,8 @@ in with self; { wicket = derive2 { name="wicket"; version="0.4.0"; sha256="1lizzmj69bswzlk18fv2v4yxxc6dynvmkymdiafznzcyyz4a8xnf"; depends=[BH Rcpp]; }; widals = derive2 { name="widals"; version="0.6.1"; sha256="1094yaaq2xb0ykvc1j3hs87j1p4h7zgf8mkn4han8iw5fmr9zncy"; depends=[snowfall]; }; widgetframe = derive2 { name="widgetframe"; version="0.3.1"; sha256="0j0d73m72nzfc1wyrgsqr99ldx72adis6pd57mpim55hz0n9l224"; depends=[htmltools htmlwidgets magrittr purrr]; }; - widyr = derive2 { name="widyr"; version="0.1.2"; sha256="0mqj9w5sy8m2vqhjxmjrf68bfixbvmkigrsdzfnwvxp18hhfw5mj"; depends=[broom dplyr Matrix purrr reshape2 tidyr tidytext]; }; - wiesbaden = derive2 { name="wiesbaden"; version="1.2.1"; sha256="0ilqqv4xp4ngjq3snhzwdc8qzp3zr31kq2r4lqiv2arj5ggb1350"; depends=[httr jsonlite keyring readr stringi stringr xml2]; }; + widyr = derive2 { name="widyr"; version="0.1.3"; sha256="1mkgkn5lf3q9i3fhkz6v9lxl68kwhjn6bwxi3ks1v3njbsacnkay"; depends=[broom dplyr Matrix purrr reshape2 rlang tidyr tidytext]; }; + wiesbaden = derive2 { name="wiesbaden"; version="1.2.2"; sha256="0zxz2cnxgx0p66ls1x2pz5i9iiv67ajm30a2n8m1alljnza6qigf"; depends=[httr jsonlite keyring readr stringi stringr xml2]; }; wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; }; wikifacts = derive2 { name="wikifacts"; version="0.1.0"; sha256="01mwzqign59lh7wvf8q8kwkgnfxi9nkk6n0qwfh27q64fajw8clg"; depends=[magrittr rvest xml2]; }; wikilake = derive2 { name="wikilake"; version="0.4"; sha256="0pm0brzkf2k6aknwl4b3fba5ly7mhah8qfb0h94fckiaqbnpyx9v"; depends=[maps rvest selectr sp stringi stringr units WikipediR xml2]; }; @@ -15172,14 +15355,14 @@ in with self; { wildpoker = derive2 { name="wildpoker"; version="1.1"; sha256="1302ain55spz34irmq49sp9b1pvrn2nxmzmqs8m9wdk6g82h3s27"; depends=[]; }; wilson = derive2 { name="wilson"; version="2.3.1"; sha256="040hq68l2ja37gx8g6q1nrr9b15v4gmc2l23c772vr4gq9k97977"; depends=[circlize colourpicker ComplexHeatmap data_table DESeq2 DT factoextra FactoMineR ggplot2 ggrepel gplots heatmaply log4r magrittr openssl plotly plyr R6 RColorBrewer reshape rintrojs rje rjson RJSONIO scales shiny shinycssloaders shinydashboard shinyjs viridis zip]; }; winRatioAnalysis = derive2 { name="winRatioAnalysis"; version="0.1.0"; sha256="1msvc06bfzw9clinxbvr5fdw38dff0c0xii46182nwnk5kj0libr"; depends=[data_table JM Matrix MLEcens mvtnorm nlme plyr pssm survival]; }; - windAC = derive2 { name="windAC"; version="1.2.0"; sha256="1dwnj0spxq9n73vg938j5jn0vvzvlqnfb4j0slzxp6lvkkyd2sc4"; depends=[mvtnorm sf]; }; + windAC = derive2 { name="windAC"; version="1.2.1"; sha256="0irm0bh9j0x72nq37lwycv6f30bb5xqm736rj6z0g6bnfd16rrmk"; depends=[mvtnorm sf]; }; windex = derive2 { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; }; windfarmGA = derive2 { name="windfarmGA"; version="2.2.3"; sha256="13jdh0c8lkc3043mnqx23s06xxkf6dvk7w9kfvwhib58rlgy0p2n"; depends=[calibrate doParallel foreach ggplot2 gstat leaflet magrittr raster RColorBrewer Rcpp rgdal rworldmap sf sp spatstat]; }; wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; }; - wiod = derive2 { name="wiod"; version="0.3.0"; sha256="1f151xmc6bm5d28w5123nm0hv7j1v8hay4jk5fk8pwn6yljl1pah"; depends=[decompr gvc]; }; wiqid = derive2 { name="wiqid"; version="0.2.3"; sha256="166d9cdrj8vz2m5n1yxhckhs9nmd3sv13c3jcifzjixl45f8f2aa"; depends=[coda HDInterval MASS truncnorm]; }; wiseR = derive2 { name="wiseR"; version="1.0.1"; sha256="187ylwhk06957x9zm5r0m6w9wg08im83myz3s4gr927ig8yv3b5f"; depends=[arules bnlearn DescTools dplyr DT graph HydeNet igraph linkcomm missRanger psych RBGL Rgraphviz rhandsontable rintrojs shiny shinyalert shinyBS shinycssloaders shinydashboard shinyWidgets visNetwork]; }; - withr = derive2 { name="withr"; version="2.1.2"; sha256="11j6zykklxnvp4xqsr6a2xib665i38m3khdspp887nwagmvnydj1"; depends=[]; }; + withr = derive2 { name="withr"; version="2.2.0"; sha256="10mmfffjbnb2zq5x0kqhhb4z6va4micc6pjzvlfji34gyhffa8ac"; depends=[]; }; + wkNNMI = derive2 { name="wkNNMI"; version="1.0.0"; sha256="0qpl1b2134kz9mjl38w93lp3g6kpv9ygv9hygpssm845k02hkw7c"; depends=[foreach infotheo]; }; wkb = derive2 { name="wkb"; version="0.4-0"; sha256="0mah538345npkb06bcj18mb6qnnx8nn7bdqmvqqpbawallh546a9"; depends=[sp]; }; wktmo = derive2 { name="wktmo"; version="1.0.5"; sha256="05pjyk0xsdazbi1x7xfmg097ybybd60zmzzm7sch1ikp05hzn0wb"; depends=[]; }; wmlf = derive2 { name="wmlf"; version="0.1.2"; sha256="0zxw84l5v12r15hpyd1kbajjz3cbkn5g884kmj72y7yi0yi1b6d6"; depends=[waveslim]; }; @@ -15200,9 +15383,9 @@ in with self; { wordmatch = derive2 { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; }; wordnet = derive2 { name="wordnet"; version="0.1-14"; sha256="12a21zlc7h973gi1632gngbk8b09vhp3sldh1mh9b5n6h18ga25p"; depends=[rJava]; }; wordspace = derive2 { name="wordspace"; version="0.2-6"; sha256="11y57mzd12klwd2xzr38nvlrxg9jsi33mxd8nnvc96hgrjsgwakl"; depends=[cluster iotools MASS Matrix Rcpp sparsesvd]; }; - workflowr = derive2 { name="workflowr"; version="1.6.0"; sha256="0q1rmaqf6v7zv8jfj7mzmdl4s87841lb3x0q34al9sgz8shwp36p"; depends=[callr fs getPass git2r glue httpuv httr knitr rmarkdown rprojroot rstudioapi stringr whisker yaml]; }; - workflows = derive2 { name="workflows"; version="0.1.0"; sha256="1vmjlfyjavvz0677832cvn296xwk5rkv0jr4cncganadh2yjqa1d"; depends=[cli ellipsis generics glue hardhat parsnip rlang]; }; - worldmet = derive2 { name="worldmet"; version="0.8.7"; sha256="1hhh3a28xxi5265053gclsbihv41372f64isz9xc5sjdjnpcv6g4"; depends=[doParallel dplyr foreach leaflet openair readr zoo]; }; + workflowr = derive2 { name="workflowr"; version="1.6.1"; sha256="15am5qcscwfcg2b80ky3c72mkqmlibp49b76468q4x8pmkr3prwi"; depends=[callr fs getPass git2r glue httpuv httr knitr rmarkdown rprojroot rstudioapi stringr whisker yaml]; }; + workflows = derive2 { name="workflows"; version="0.1.1"; sha256="14lzbszz7ybfzqa5zw1hfh81b8rbwwyza6x8nhpnknl6x4adqfql"; depends=[cli ellipsis generics glue hardhat parsnip rlang]; }; + worldmet = derive2 { name="worldmet"; version="0.8.8"; sha256="0zanjlb2h10v4hss8w0p234k5yy3rnd1plzr9smiwn06fbmvy5zy"; depends=[doParallel dplyr foreach leaflet openair readr zoo]; }; worms = derive2 { name="worms"; version="0.2.2"; sha256="183chjdi5qvsmdznvc9igcxaz769a37rwh5nzgvf5zf012a85wir"; depends=[httr plyr]; }; worrms = derive2 { name="worrms"; version="0.4.0"; sha256="0nb02k0aimf6z1fw4y5qzja4xwgwff7gdzh364w2lrhj8imcb044"; depends=[crul data_table jsonlite tibble]; }; wosr = derive2 { name="wosr"; version="0.3.0"; sha256="0fl9mizrjg3r7n7gslsxgaw3k2v63scqmvnv6341q8sq7018hzln"; depends=[httr jsonlite pbapply xml2]; }; @@ -15210,22 +15393,23 @@ in with self; { wpp2010 = derive2 { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; }; wpp2012 = derive2 { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; }; wpp2015 = derive2 { name="wpp2015"; version="1.1-2"; sha256="07bnbmrshlqnlpca5djpq5crnpsmz228wmbpv1ah7ywnjvks6fyx"; depends=[plyr]; }; - wpp2017 = derive2 { name="wpp2017"; version="1.2-1"; sha256="1hg3fj92ja93kw226crfxjvnjb7p0svdbi6pr3sqkg9w5zpwfwp1"; depends=[]; }; - wpp2019 = derive2 { name="wpp2019"; version="1.1-0"; sha256="0gx8rgz9lg6crn6ss76sg4xj8dsiwj08fkq5f67slvx4c0cjfhc5"; depends=[]; }; - wppExplorer = derive2 { name="wppExplorer"; version="2.3-3"; sha256="0sz31xsdlk9p52sl5dik7g0qmkrjb7ydkknd154c988kqb5gbp0w"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny shinyjs shinythemes wpp2019]; }; + wpp2017 = derive2 { name="wpp2017"; version="1.2-3"; sha256="1w7cg31larvgaah16ch6z11jjq02i5f20hfwg63wvw5p6fyafivz"; depends=[data_table]; }; + wpp2019 = derive2 { name="wpp2019"; version="1.1-1"; sha256="03c0ybk1m8lr6dxckm1950h617yhphgxsg01qj5ywbcm7rpvw1a0"; depends=[data_table]; }; + wppExplorer = derive2 { name="wppExplorer"; version="2.3-4"; sha256="1pbmjg6y543aih8mxf9njfwpm090virhgqf8w0a5yx0jdfjwmz04"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny shinyjs shinythemes wpp2019]; }; wql = derive2 { name="wql"; version="0.4.9"; sha256="0m16l807mhcjkbqhlzhc24pw4hl78fjyykiszlg337x3qs803fg2"; depends=[ggplot2 reshape2 zoo]; }; wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; }; - wrMisc = derive2 { name="wrMisc"; version="1.1.0"; sha256="10cg4l963aabynic25m6k3sp69d6amhkpqv5x5m38nidy4855jzb"; depends=[MASS]; }; + wrMisc = derive2 { name="wrMisc"; version="1.2.0"; sha256="1fv4bmzi00492s8mln79dsyil7phrrhkd028nc6zi050ssy9ggsi"; depends=[MASS]; }; wrProteo = derive2 { name="wrProteo"; version="1.0.0"; sha256="110rpwac6hccv8i55fdw3mzd500jip1ldzmqw4196igq61cd9m20"; depends=[limma wrMisc]; }; wrangle = derive2 { name="wrangle"; version="0.5.2"; sha256="1b6qgwdjvwbrarp9ylgkb5ia1p5a5g7ws0jyqrwc6hii8z5yj2qb"; depends=[dplyr lazyeval magrittr rlang tidyr]; }; - wrapr = derive2 { name="wrapr"; version="1.9.6"; sha256="0kpwjasnsskk6l2najydcxqwa0ms2mf7v0y286hv8gipqfq48z03"; depends=[]; }; - wrassp = derive2 { name="wrassp"; version="0.1.8"; sha256="052x0lxpchr6f97yfj3vmhh8gc8qg5pp1m91h5akrav4yfawbs7k"; depends=[]; }; + wrapr = derive2 { name="wrapr"; version="2.0.0"; sha256="15171m6bljlmbzds24sy5z8spx8la5ahg1i49i8yghymkp6vvslw"; depends=[]; }; + wrassp = derive2 { name="wrassp"; version="0.1.9"; sha256="09z8s0g6l9z4rwnf36w4bd734agd471swz3f24178b4j6m05kqhm"; depends=[tibble]; }; write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; }; writexl = derive2 { name="writexl"; version="1.2"; sha256="09fhdip6igcg97fjx4c7727cx2lb49l4d74l4i8rg2bag2s5lrj3"; depends=[]; }; wrswoR = derive2 { name="wrswoR"; version="1.1"; sha256="0jnb818xz841bx2i03k3hhy4hxcwpxblskg9nrc8kgbc22rxx4lz"; depends=[logging Rcpp]; }; wrswoR_benchmark = derive2 { name="wrswoR.benchmark"; version="0.2"; sha256="0vzs2lqq48kzk63xz2k9b7qcy0ph5yyvih6z98jfz36kpdfhdps9"; depends=[curl lazyeval]; }; wru = derive2 { name="wru"; version="0.1-9"; sha256="0xrm3f1khggcvdzzk65mnbfcyji3kjz8hrk9d2n4y15nhpbw8p8h"; depends=[devtools]; }; - wskm = derive2 { name="wskm"; version="1.4.28"; sha256="0d9hcriakg6fxzc8wjsahc4zkyjza31mb9dv2h4xcf8298xa96i4"; depends=[clv lattice latticeExtra]; }; + wsbackfit = derive2 { name="wsbackfit"; version="1.0-2"; sha256="0whid2c5lzq4ahciky35mdbgkbp75gsdbf5fps954h5am3dlglhz"; depends=[]; }; + wskm = derive2 { name="wskm"; version="1.4.40"; sha256="0x5nc3bwqawx0k95v088dsx83dm7lw5lkryjvq6bl57bgrcn7n0l"; depends=[fpc lattice latticeExtra]; }; wsrf = derive2 { name="wsrf"; version="1.7.17"; sha256="0gmlvfcy2iqa5sqhwps3hx0hl9fir8nf5xq62f25sn8i3llw752z"; depends=[Rcpp]; }; wsyn = derive2 { name="wsyn"; version="1.0.2"; sha256="0jl0wnw11yrbiygcpcnl1yi8xf5dd3sbh0c2yic8dc0p64k6iass"; depends=[fields MASS]; }; wtest = derive2 { name="wtest"; version="3.2"; sha256="063ax9mbb2dy33l1cl533mjzpvhf2akw3613pklfjg6bhprlniz7"; depends=[]; }; @@ -15233,57 +15417,58 @@ in with self; { wv = derive2 { name="wv"; version="0.1.1"; sha256="06xf3c97pjhln1v31waj8rmp4r0y2kp6v2x10pbpvi8m0nf5zfs1"; depends=[coda Rcpp RcppArmadillo simts]; }; wvtool = derive2 { name="wvtool"; version="1.0"; sha256="0x9awj6g5lzqp2lhwgh9ib7jmfdzyhwazrjvw1vwacqqfhbz8qxv"; depends=[]; }; wwntests = derive2 { name="wwntests"; version="1.0.0"; sha256="1wsqbhsnzkishqwxz5kjcb5xawafizi3ip4yzxj05p9rx9wja1yc"; depends=[ftsa MASS rainbow sde]; }; - wyz_code_metaTesting = derive2 { name="wyz.code.metaTesting"; version="1.1.4"; sha256="0npk9axsg6x8pgf3f19y2544jlrzf88269604cfdynp724l2dwb9"; depends=[crayon data_table lubridate tidyr wyz_code_offensiveProgramming]; }; - wyz_code_offensiveProgramming = derive2 { name="wyz.code.offensiveProgramming"; version="1.1.16"; sha256="1hsm6mb6cz58f0xgl8330gd40kbqplg3d4r133ncg0r43qb528xj"; depends=[crayon data_table lubridate R6 stringr tidyr]; }; - wyz_code_rdoc = derive2 { name="wyz.code.rdoc"; version="1.1.7"; sha256="0rravk8hl2pbr3blsx96xas2zi7c9d83mpzhrqqqna66hg88zq5q"; depends=[data_table lubridate R6 tidyr wyz_code_offensiveProgramming]; }; - wyz_code_testthat = derive2 { name="wyz.code.testthat"; version="1.1.9"; sha256="0i4jmww0sg5w8ffvk4302jdi3m5bfrbywbx5756r4dijfhv9n2kq"; depends=[data_table lubridate R6 tidyr wyz_code_offensiveProgramming]; }; + wyz_code_metaTesting = derive2 { name="wyz.code.metaTesting"; version="1.1.12"; sha256="17fmbym4kxxnygn91da2crxsq8kqh6sj5pzm197l202av0r9pvjd"; depends=[crayon data_table lubridate tidyr wyz_code_offensiveProgramming]; }; + wyz_code_offensiveProgramming = derive2 { name="wyz.code.offensiveProgramming"; version="1.1.18"; sha256="14wk0hjysz8ravwsmiki7dyllkbygq0l5mg516rbbf0wfq5zl7nl"; depends=[crayon data_table lubridate R6 stringr tidyr]; }; + wyz_code_rdoc = derive2 { name="wyz.code.rdoc"; version="1.1.16"; sha256="1f8yd1pkk9aamsx2x59jpa5jgq03hnbf9zrs1ah010sn3l51v1yr"; depends=[crayon data_table digest R6 stringr tidyr wyz_code_offensiveProgramming]; }; + wyz_code_testthat = derive2 { name="wyz.code.testthat"; version="1.1.17"; sha256="1hl6gqxpxa3fyzc01i37g9il4vc6z339iir4228yz7ky1x85xjna"; depends=[data_table lubridate R6 tidyr wyz_code_offensiveProgramming]; }; x_ent = derive2 { name="x.ent"; version="1.1.7"; sha256="15qra77dqhj27g3qx92gram4mq4n9fdidygdpvxfmcx7ww3vc6yh"; depends=[ggplot2 jsonlite statmod stringr xtable]; }; x12 = derive2 { name="x12"; version="1.9.0"; sha256="0hrcw1d52yp5rr4r120lcnfxw2rgs95njg37m28blcnfbq2flfc2"; depends=[stringr x13binary]; }; x12GUI = derive2 { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[cairoDevice Hmisc lattice RGtk2 stringr x12]; }; x13binary = derive2 { name="x13binary"; version="1.1.39-2"; sha256="1if8yayvn6rr98gwp0ypmlk3d9fjf0b9kxir2iwha506aslq70xp"; depends=[]; }; x3ptools = derive2 { name="x3ptools"; version="0.0.2"; sha256="1a3vdljd51kvd70mq9cr84r536zmby7vkd36a02z2sxabq03cl9s"; depends=[assertthat digest png rgl xml2 zoo]; }; xLLiM = derive2 { name="xLLiM"; version="2.1"; sha256="1q6ryw9z5wi0amv5f4drz14p36zy8gc2a0s59q10jixhhyas7ycl"; depends=[abind capushe corpcor igraph MASS Matrix]; }; - xROI = derive2 { name="xROI"; version="0.9.13"; sha256="0687cg113ykslsky1lln2mf097flzjkpyw0hvgzd9dzqc14vpzki"; depends=[colourpicker data_table jpeg lubridate moments plotly raster RCurl rgdal rjson shiny shinyAce shinyBS shinydashboard shinyFiles shinyjs shinythemes shinyTime sp stringr tiff]; }; xRing = derive2 { name="xRing"; version="0.1.0"; sha256="17f1jif8yw2508k86p8mjgw1h20ml5wzaff04ix9xq96plqzi8ma"; depends=[dplR imager tcltk2 tkRplotR]; }; xSub = derive2 { name="xSub"; version="2.0.2"; sha256="00mahp8fi6iskjaf5nwka67a7hqb3i08j8yrd4d2av39zfs268h2"; depends=[countrycode haven RCurl]; }; xVA = derive2 { name="xVA"; version="0.8.1"; sha256="0wr4i37sya5gg6v63ka16g9077gxbhvjqyqfaahhban8skzl2adf"; depends=[SACCR Trading]; }; - xaringan = derive2 { name="xaringan"; version="0.14"; sha256="16c20bkhizw65nnp2lyc6kjd461abj794qh4d00y8fglyj6wjjky"; depends=[htmltools knitr rmarkdown servr xfun]; }; + xaringan = derive2 { name="xaringan"; version="0.16"; sha256="1jdj8qkadb09x7kvf93h4mp8gxk6lda8aspldhdki9qqpdc78gc8"; depends=[htmltools knitr rmarkdown servr xfun]; }; xbreed = derive2 { name="xbreed"; version="1.0.1.1"; sha256="032i04ginyf9dyabfkygnhrkq7lqdvvyw7s41vjimy2kvjrnkkkx"; depends=[BGLR]; }; xdcclarge = derive2 { name="xdcclarge"; version="0.1.0"; sha256="1j8wsidwmfjygqlwavxinv4bqc6rddy42jdmlknsjfrrs49yj8kn"; depends=[nlshrink Rcpp RcppArmadillo]; }; - xergm = derive2 { name="xergm"; version="1.8.3"; sha256="155469550rsdwszrhw7vdgwz2h0d72a8f4hirrb6hny7f1q63ykk"; depends=[btergm GERGM rem tnam xergm_common]; }; - xergm_common = derive2 { name="xergm.common"; version="1.7.7"; sha256="0nfls8a1knmnjjrrw0q93qsfrrb9p3yqsm5dxp13z0780vrzxvcj"; depends=[ergm network]; }; + xergm_common = derive2 { name="xergm.common"; version="1.7.8"; sha256="03mjpafwfkmyj5ba84jydap9rp0i602izjlbd511xbxcw6dx2k0b"; depends=[ergm network]; }; xesreadR = derive2 { name="xesreadR"; version="0.2.3"; sha256="1pvdx0mxg2f885bhy4hb3kqzcgva4q7hzzaipkfzyi5lnjdsbc81"; depends=[bupaR data_table dplyr lubridate purrr stringr tidyr XML xml2]; }; - xfun = derive2 { name="xfun"; version="0.12"; sha256="0sgh8kafi9x1glmmcp1ly827pm8q7fsfngbplr41fbb4nc9363df"; depends=[]; }; + xfun = derive2 { name="xfun"; version="0.13"; sha256="03iyqgx9mmdbd3qih70qzijjqcdg7k7ps5r1y6q8praanx9qvnm3"; depends=[]; }; xgb2sql = derive2 { name="xgb2sql"; version="0.1.2"; sha256="1gw5dw0ck5hip8mv347zaswrggk395bg2hgn02bvqs0d31jhmgvi"; depends=[data_table xgboost]; }; - xgboost = derive2 { name="xgboost"; version="0.90.0.2"; sha256="1gy9rzg43mjpfis893vf15drmbigfn0481zrzss9ajnmnk0q8194"; depends=[data_table magrittr Matrix stringi]; }; + xgboost = derive2 { name="xgboost"; version="1.0.0.2"; sha256="1ld2w51c5fy3bl0kvjn1iplffc4lmin9s9zz5xx7xsm44d6j6kzd"; depends=[data_table magrittr Matrix stringi]; }; xgobi = derive2 { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; }; - xgxr = derive2 { name="xgxr"; version="1.0.7"; sha256="1hl2xblq06mgy0a1apfvdinyr8sqqmvqqi42xmcyl9di5x9kb0qx"; depends=[assertthat binom dplyr ggplot2 labeling magrittr pander png scales tibble]; }; + xgxr = derive2 { name="xgxr"; version="1.0.9"; sha256="1hci16ly4wzrjyfa7chwn6nnwlfnq77ix2w3gwrvlgfcjisbcsq1"; depends=[assertthat binom dplyr ggplot2 labeling magrittr pander png scales tibble]; }; xhmmScripts = derive2 { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; }; xkcd = derive2 { name="xkcd"; version="0.0.6"; sha256="1z2y0ihn68ppay7xkglhw7djki5654g6z4bbpyy41if57z9q554f"; depends=[extrafont ggplot2 Hmisc]; }; xkcdcolors = derive2 { name="xkcdcolors"; version="1.0"; sha256="07fnjv01r3b951dqca2zs9b9f6hsgbpbpsrggvb8rps53kpid0i7"; depends=[FNN]; }; xlink = derive2 { name="xlink"; version="1.0.1"; sha256="02ahgjampy92gcwhv269px5w8651a7j50dn1295zwqxj44lk4g9q"; depends=[survival]; }; - xlsx = derive2 { name="xlsx"; version="0.6.1"; sha256="1d58qlzdj4vrk4vnlyzri600ix7z3wnc30gnbcc1qz27nlbbv055"; depends=[rJava xlsxjars]; }; + xlsx = derive2 { name="xlsx"; version="0.6.3"; sha256="0ph3bqngczm2h46s159s6cpxjkcrsi1di8a325x2wl5ls7mbiag5"; depends=[rJava xlsxjars]; }; xlsx2dfs = derive2 { name="xlsx2dfs"; version="0.1.0"; sha256="0bdawr80grks91sy221d33fsk75g20zh3wjg6gvd0zj0m1zvvwvd"; depends=[openxlsx]; }; xlsxjars = derive2 { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; }; xltabr = derive2 { name="xltabr"; version="0.1.2"; sha256="0pwbpcdiqkhvzxsi6yxly4zza12bw7zc7ji8cvhldw4yl5sxkz1l"; depends=[magrittr openxlsx]; }; xlutils3 = derive2 { name="xlutils3"; version="0.1.0"; sha256="1cxishi62bd36zlsy5qhzix1p68akdf9kpjg9gfm9aqpcijzccb9"; depends=[magrittr readxl]; }; xmeta = derive2 { name="xmeta"; version="1.1-5"; sha256="1r2mqrrcl7vmbyydw3kzpskinkiqr919bxgq69i1y6pbfim7jzag"; depends=[aod glmmML metafor mvmeta numDeriv]; }; - xml2 = derive2 { name="xml2"; version="1.2.2"; sha256="1x3q3a0xv8j0nx3hs4d3pfjm5g9nvaxmfrapba9f4nrkqi3z2l1h"; depends=[Rcpp]; }; + xml2 = derive2 { name="xml2"; version="1.3.2"; sha256="1kx400v62xkd5xal7rzz7jcarz94ac8g1sh4i2dqr78qwgkzj8nz"; depends=[]; }; xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.3"; sha256="0gjr3l5z5dp276lchr2649as1rkj56d2mlvbr66yg393zzw50lsh"; depends=[]; }; xmlrpc2 = derive2 { name="xmlrpc2"; version="1.1"; sha256="13rfw0civp3hzi4hn31x1idliid1qb73495x4c31z5msd35lzxrs"; depends=[base64enc curl xml2]; }; xmrr = derive2 { name="xmrr"; version="1.0.36"; sha256="0xxi8z9sp156508y5a7f4ax8yry7lg4qmn0hyk04dn1xr7syd4gs"; depends=[dplyr ggplot2 tidyr]; }; - xnet = derive2 { name="xnet"; version="0.1.10"; sha256="1jjnj35j8wwnlc1w31m3l95kmgxm58rfbfkidrjhq6l96npprgn4"; depends=[]; }; - xoi = derive2 { name="xoi"; version="0.68-3"; sha256="0swi9zilghkfm17b39sdn7im4pcxcw7fk77jqxwib29q7x6574bk"; depends=[qtl]; }; + xnet = derive2 { name="xnet"; version="0.1.11"; sha256="18lda1gv53awsbkk5p4bzrbilndgybdz8xc6lhl6wy647fw9q9hv"; depends=[]; }; + xoi = derive2 { name="xoi"; version="0.69-2"; sha256="1582flnh76fmqx5v1rzf021hlrcg53f2fdax1a8ad1nrcjpbj18r"; depends=[qtl]; }; xopen = derive2 { name="xopen"; version="1.0.0"; sha256="1vrvgdika1d63dwygynbv2wmd87ll8dji5dy89hj576n8hw601z2"; depends=[processx]; }; + xpectr = derive2 { name="xpectr"; version="0.3.0"; sha256="1v3hhih99f0bckjr0jv6pwp0iil4996981ix7nr1b5p4j7pf69ac"; depends=[checkmate clipr dplyr lifecycle plyr rlang rstudioapi testthat tibble withr]; }; xplain = derive2 { name="xplain"; version="0.2.1"; sha256="01hl9dxiqqxzdixqccga0sywlhv97pi1l51r9sr7v106s7q11jxn"; depends=[RCurl readr XML]; }; xplorerr = derive2 { name="xplorerr"; version="0.1.1"; sha256="17h8z9rmqkmm6lm9gipa33mr7zxpzd5xbjk251592mwr79lwsh8n"; depends=[magrittr shiny]; }; - xpose = derive2 { name="xpose"; version="0.4.6"; sha256="0y3fcy2g8qnb5nzfwimrx87c2h3k26im9h64fmv834zba7chkc47"; depends=[dplyr ggforce ggplot2 purrr readr rlang stringr tibble tidyr vpc]; }; - xpose4 = derive2 { name="xpose4"; version="4.6.1"; sha256="1722ai8r94dmy4d2r728iir0hl2b2gmym8xjsqscfc6jw070734i"; depends=[dplyr gam Hmisc lattice lazyeval readr survival]; }; - xptr = derive2 { name="xptr"; version="1.1.2"; sha256="19zmzawp4mprwbcq2ajwwmmnf8vgnrkn86m246gz5f7rxzqz0vk3"; depends=[]; }; + xpose = derive2 { name="xpose"; version="0.4.8"; sha256="0dc9ywkkb98fyp4j1gak4jrnmgcvx9hpf5ixspxaqb4aqqgqnjcs"; depends=[dplyr ggforce ggplot2 purrr readr rlang stringr tibble tidyr vpc]; }; + xpose_nlmixr = derive2 { name="xpose.nlmixr"; version="0.1.5"; sha256="05fb453ayzrscha0153gx8axdqgml3zq5cacp440f9a66nv2dwfi"; depends=[crayon dplyr ggplot2 magrittr nlme nlmixr stringr tibble tidyr vpc xpose]; }; + xpose4 = derive2 { name="xpose4"; version="4.7.0"; sha256="0lpbk85d17spg6vwf7acqaz7fv2l0rv6qkczbgm4fw28qiaykci6"; depends=[dplyr gam Hmisc lattice lazyeval readr survival]; }; + xptr = derive2 { name="xptr"; version="1.1.3"; sha256="0352vs8dz61hgpwnf3r9r9haz3adg2wk9qxzrv313p1fcyfjz91v"; depends=[]; }; xray = derive2 { name="xray"; version="0.2"; sha256="1ibj92ljlj8a5rmbrci691yhpd4kwrfyl944nzl2dcbf58l01dzq"; depends=[dplyr foreach ggplot2 lubridate scales]; }; xrf = derive2 { name="xrf"; version="0.1.2"; sha256="0mcyjw75f2w3hvx1r6lhc4yidmih2z6dfmkxvywm499whk2pcqhv"; depends=[dplyr fuzzyjoin glmnet Matrix rlang xgboost]; }; + xrnet = derive2 { name="xrnet"; version="0.1.7"; sha256="136aadrvsdg9hizjg4q12h56ih0s3w88j3jpfb54ajgdmqw3pldi"; depends=[BH bigmemory foreach Rcpp RcppEigen]; }; xseq = derive2 { name="xseq"; version="0.2.1"; sha256="0bsakbfvkfv39q2ch2g21b17g84470sq4v73355cljlshsi6404i"; depends=[e1071 gptk impute preprocessCore RColorBrewer sfsmisc]; }; - xslt = derive2 { name="xslt"; version="1.3"; sha256="0giqzmdby9ax8gwx9b7xqka28k3hgymv4289k8p8dvg26d683p3l"; depends=[Rcpp xml2]; }; + xslt = derive2 { name="xslt"; version="1.4.1"; sha256="1gpqap5i2xabr9yrrkyr8kzzgqzpk6d6mgp4rqbkjdn77hs24krd"; depends=[Rcpp xml2]; }; xsp = derive2 { name="xsp"; version="0.1.2"; sha256="1jbmxa234v52qji8sz4bkg24c2n65b0zh9py1wyyfzw9n1wx5w0r"; depends=[ggplot2 reshape2]; }; xspliner = derive2 { name="xspliner"; version="0.0.4"; sha256="1j3wlw39r3ahhdfq3rks1zhnlmz14f4wk7bl7gf94yffasqg6k2r"; depends=[dplyr ggplot2 magrittr mgcv pdp pROC purrr tidyr]; }; xtable = derive2 { name="xtable"; version="1.8-4"; sha256="077xfm0gphvhsay75amd9v90zk57kjgrrlgih04fyrbqqblc1gjs"; depends=[]; }; @@ -15292,48 +15477,48 @@ in with self; { xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; }; xts = derive2 { name="xts"; version="0.12-0"; sha256="0q4cc8ynp7ndmgll1jj3lxyl6wmgg89ad3wq09kjc2ngszdfc4fz"; depends=[zoo]; }; xtune = derive2 { name="xtune"; version="0.1.0"; sha256="0bpf1cx7v7q0a1jip04xd0bjg9ilagrf7wg7a9y0m6wgw7s2b9jn"; depends=[glmnet selectiveInference]; }; - xwf = derive2 { name="xwf"; version="0.2-2"; sha256="1psryam65pg7flfa20smm6lx184f76dhjv1lig8sy7y9hphfv3s1"; depends=[mgcv]; }; + xwf = derive2 { name="xwf"; version="0.2-3"; sha256="1byj6vjk2abm9j919107xsa3nd40zbsvxaldvv4ml3c47k1fg3kc"; depends=[mgcv]; }; xxIRT = derive2 { name="xxIRT"; version="2.1.2"; sha256="0b8yv8ixmcjiv9hlvpfdknx815smy7df7f2ixifnvhxxafgf1fwq"; depends=[ggplot2 glpkAPI lpSolveAPI reshape2]; }; - xyloplot = derive2 { name="xyloplot"; version="1.6"; sha256="0d1dv3syfjwcp9fil9bl1my19d0kdyz1qrp1yf7ykrk8aq91762v"; depends=[]; }; + xyloplot = derive2 { name="xyloplot"; version="2.0"; sha256="0d400wfcqb68nihrf84s6rr3ibnb50py93hmb50zhmbs307lh31x"; depends=[]; }; xyz = derive2 { name="xyz"; version="0.2"; sha256="13w4sb4pvgciwr8wsz785dafj2k2kpx7znz46r5d32wx88vkycp4"; depends=[Rcpp]; }; - yaImpute = derive2 { name="yaImpute"; version="1.0-31"; sha256="0088i9rlpkxb42xp11cr0h2ql9k581qvnz4ppldrnqci8c1qdpff"; depends=[]; }; + yaImpute = derive2 { name="yaImpute"; version="1.0-32"; sha256="1zvkrmlj48ahg9jq0fkbn7j603fmmld57yc0gjfas2mqa7cfbvh8"; depends=[]; }; yacca = derive2 { name="yacca"; version="1.1.1"; sha256="1hxgkyxipk27p74vdkiy8a3wjymhcsc6ad3y9mf15qsl2xim6wwl"; depends=[]; }; yager = derive2 { name="yager"; version="0.1.0"; sha256="01gxpaf4wvii056xn84m9gkq46m7hxqgg5f2frakhgnlpm3afgfb"; depends=[lhs MLmetrics randtoolbox]; }; yakmoR = derive2 { name="yakmoR"; version="0.1.1"; sha256="09aklz79s0911p2wnpd7gc6vrbr9lmiskhkahsc63pdigggmq9f7"; depends=[BBmisc checkmate Rcpp]; }; - yaml = derive2 { name="yaml"; version="2.2.0"; sha256="0in562nd0i23cg91a8kdbqgim656fgscykwi0icsnq53xj3srg2m"; depends=[]; }; - yamlet = derive2 { name="yamlet"; version="0.3.3"; sha256="181kz8xnkgm7k9ff6iw7jydfl69717b19bwwwxpyy8p9pxzmr94q"; depends=[csv dplyr encode ggplot2 knitr rlang yaml]; }; + yaml = derive2 { name="yaml"; version="2.2.1"; sha256="10r7g26x73am45niigm3k466030nymnr3v3fjljafzrr5aybf58i"; depends=[]; }; + yamlet = derive2 { name="yamlet"; version="0.4.6"; sha256="1113iid1iiz7rnsz7v5r95rdwnq9zdiwa8q4805vb3sjjk531kqq"; depends=[csv dplyr encode ggplot2 rlang spork units xtable yaml]; }; yap = derive2 { name="yap"; version="0.1.0"; sha256="12cagxisky7aq04ab9ycd4mp7xfs7z0v3rc2sczcngn2pc8pdjm7"; depends=[lhs randtoolbox]; }; - yardstick = derive2 { name="yardstick"; version="0.0.5"; sha256="0gmfq1jx8lp6b24clxyj5r1976q3znlchbqa6jk87lyd5fn43f7b"; depends=[dplyr generics pROC Rcpp rlang tidyselect]; }; + yardstick = derive2 { name="yardstick"; version="0.0.6"; sha256="1qkvbvc0cnwl5mkk47swnd8by84zz0qpy1996fziapn35qxvx9qa"; depends=[dplyr generics pROC Rcpp rlang tidyselect]; }; yarr = derive2 { name="yarr"; version="0.1.2"; sha256="16q109jrydckz7s1rkmr2sh8q92cgr1c534fvpbh3h0bc3fvvf8g"; depends=[]; }; yarrr = derive2 { name="yarrr"; version="0.1.5"; sha256="1258bj7x4icaxfabnnd3fgwydnqbzxkih7zw0sdlwdax3q8fw5c5"; depends=[BayesFactor circlize jpeg]; }; yasp = derive2 { name="yasp"; version="0.2.0"; sha256="0fza8h9y1wmarsmjcvw4r970d6j4ii795pd2h4xh9nlsirv50adi"; depends=[]; }; - yatah = derive2 { name="yatah"; version="0.0.1"; sha256="1w76a34k3jyiv1ql2bkyh1d77p1lqsyvy2p0ip3sdrsi043a5s4y"; depends=[ape purrr stringr]; }; + yatah = derive2 { name="yatah"; version="0.1.0"; sha256="0ayy0h399g3csn106vvq6j4h6w0sgzw33b7gj1hk05nc8hdzrmna"; depends=[ape purrr stringr]; }; ycinterextra = derive2 { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; }; - yesno = derive2 { name="yesno"; version="0.1.0"; sha256="0l3v51kghbq9s00s736s4jvl8a0yhbgb908mjvhw6k5nqb2cgh8a"; depends=[]; }; + yesno = derive2 { name="yesno"; version="0.1.1"; sha256="10saf2s3argpxgny2av5mm021nx09302rvr29887a7mvm5662kl2"; depends=[]; }; yhat = derive2 { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[boot miscTools plotrix yacca]; }; yhatr = derive2 { name="yhatr"; version="0.15.1"; sha256="18g2cr1kjxnfw6cwzl62ynppfv1zz732kbx18zq8918l85kx6wbw"; depends=[httr jsonlite stringr]; }; ykmeans = derive2 { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; }; yll = derive2 { name="yll"; version="1.0.0"; sha256="0lf3cd6pfzki29nk2iy0vd6v4dw6zlsbrjh2839zq5vlpiimsvck"; depends=[]; }; - ymlthis = derive2 { name="ymlthis"; version="0.1.1"; sha256="04vf722n0yk50bclv25m11rfvqjja5kjzkn9bbdf8pw3kw83brqa"; depends=[crayon fs glue magrittr miniUI purrr rlang rmarkdown rstudioapi shiny shinyBS stringr usethis whoami withr yaml]; }; + ymlthis = derive2 { name="ymlthis"; version="0.1.2"; sha256="01jfkf9ymj8p0gvcd491i7rfaw3mj101jqbkbxmwhv7rl4r2vmql"; depends=[crayon fs glue magrittr miniUI purrr rlang rmarkdown rstudioapi shiny shinyBS stringr usethis whoami withr yaml]; }; yonder = derive2 { name="yonder"; version="0.2.0"; sha256="1ilzn17w6skd0dhwxyrgnfzyazafp8hsi8q6pfxz6k16cd668mc0"; depends=[htmltools magrittr shiny]; }; yorkr = derive2 { name="yorkr"; version="0.0.7"; sha256="035pmvignq4lip3y5670kxj1n70ff04yy2jwi4837pimr9d0qjhv"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; }; youtubecaption = derive2 { name="youtubecaption"; version="0.1.3"; sha256="03xndrs28qlbr9bywbxxx110gsp0n36wqvf98ys7ypmlj6vki4ya"; depends=[dplyr magrittr purrr reticulate stringr tibble writexl]; }; - ypr = derive2 { name="ypr"; version="0.4.0"; sha256="15cjfghpamyfa9zkjrpvxbh487acg8yd21dn6z3r73nc9zmlnb2a"; depends=[chk ggplot2 lifecycle purrr scales yesno]; }; - yuima = derive2 { name="yuima"; version="1.8.1"; sha256="1jzk3623c1cpw9j8d9b96x6n0jwz8h2izzhrdp01cwwskbnv3hq2"; depends=[boot cubature expm mvtnorm Rcpp RcppArmadillo zoo]; }; + ypr = derive2 { name="ypr"; version="0.5.0"; sha256="1as8i61sc6xasjb36kcfhpac4180558qqyg862qxh5f1i4b77jm7"; depends=[chk ggplot2 lifecycle purrr scales yesno]; }; + yuima = derive2 { name="yuima"; version="1.9.6"; sha256="1iqcv6m2lbdnpkcmgbmjhdn233pq3b2g6s9naiq3ks0fyv04zpar"; depends=[boot cubature expm glassoFast mvtnorm Rcpp RcppArmadillo zoo]; }; yuimaGUI = derive2 { name="yuimaGUI"; version="1.3.0"; sha256="1znwfkhnmv9m32izikziqpgxx8gpw50786r81va808x7q058cp5n"; depends=[DT ggplot2 ghyp plotly quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; }; yum = derive2 { name="yum"; version="0.0.1"; sha256="1q8yxn18nia7jh6g2016hxm81d2jak8pwylr6nai9kfynv9wri0g"; depends=[yaml]; }; yummlyr = derive2 { name="yummlyr"; version="0.1.1"; sha256="0xrk6g58laksz92d8mxck923sk4j92g55szrkxk123wjp5kg9vx6"; depends=[httr jsonlite]; }; - zCompositions = derive2 { name="zCompositions"; version="1.3.3-1"; sha256="0cad8dwl9by3f696rxqp2liqy00nczx9z21s1vbn2hq6xngd3i5p"; depends=[MASS NADA truncnorm]; }; + zCompositions = derive2 { name="zCompositions"; version="1.3.4"; sha256="15cfqk1vzamz66y9idnrwxlrp2sirkp44gwkcmia4s13x5pwh8mf"; depends=[MASS NADA truncnorm]; }; zFactor = derive2 { name="zFactor"; version="0.1.9"; sha256="1x0cfcmnmpb8dq6wn6538ghlz9cm00grv54dj91hvb09i96cp95x"; depends=[covr data_table dplyr ggplot2 knitcitations logging rootSolve tibble tidyr]; }; zTree = derive2 { name="zTree"; version="1.0.6"; sha256="1mywxrx6bw7dzhrdwyxbjzc8ikgvw423zycyji0jjr69cfhpmywv"; depends=[plyr]; }; + zalpha = derive2 { name="zalpha"; version="0.1.0"; sha256="12bzdsgjcpg2fqgygx0y6hyygd4yww2c7vpnxksgkgr0gscilksg"; depends=[]; }; zbank = derive2 { name="zbank"; version="0.1.0"; sha256="0vzvlri3sncvbz2cdg8wzlpskm1lq9ji0jrfy5cx4ib19m6gxhpc"; depends=[crul jsonlite tibble]; }; + zcurve = derive2 { name="zcurve"; version="1.0.0"; sha256="14a07yn4wjj29kx33g7mnlsky0jg8zj1hs9r9hn0i0yv4jfdl5jl"; depends=[evmix nleqslv Rcpp Rdpack]; }; zeallot = derive2 { name="zeallot"; version="0.1.0"; sha256="1sd1igcfnv27pa3bqxlbyxchi562h7grnjg1l7wxx3bwr49i57s3"; depends=[]; }; zebu = derive2 { name="zebu"; version="0.1.2"; sha256="0f9fsb4z8s7k5jnz2ayd52dzri0z46kjbm0gi5rfqjlmk13bhgk4"; depends=[foreach ggplot2 iterators plyr reshape2]; }; zeitgebr = derive2 { name="zeitgebr"; version="0.3.3"; sha256="1g2bqc1xx42q54i6ck0ihpxkzw3hmxqn3cvv416afjc0cm45zw8d"; depends=[behavr data_table lomb pracma]; }; - zeligverse = derive2 { name="zeligverse"; version="0.1.1"; sha256="1hf3hbgzdlhhyy2gvg984dwp8d0qm0ziyn8i9h5x00gwf74vn9dr"; depends=[Amelia dplyr MatchIt purrr rstudioapi tibble WhatIf Zelig ZeligChoice ZeligEI]; }; zen4R = derive2 { name="zen4R"; version="0.3"; sha256="029wjw0bay9p4fgd4rnmqzhrpn5q2azx0w9fvlr4mcsnwzjk9kib"; depends=[httr jsonlite R6 rvest xml2]; }; zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; }; - zenplots = derive2 { name="zenplots"; version="1.0.0"; sha256="0jz7b52caymsw010dbls5rbakkilmkl6jnnhwbizybllnf2dg578"; depends=[graph loon MASS PairViz]; }; zeroEQpart = derive2 { name="zeroEQpart"; version="0.1.0"; sha256="1n24nqyl0irpyspwx4b73xy228a84aa8zsn9fcf2lrlni5vyzmm0"; depends=[MASS ppcor]; }; zetadiv = derive2 { name="zetadiv"; version="1.1.1"; sha256="0laxp2pd5s0s9wcnvs1r4shid2gi8ap4y9py6gpl207ywq6cxmgz"; depends=[car glm2 Imap mgcv nnls scam vegan]; }; zfa = derive2 { name="zfa"; version="1.0"; sha256="0lddwpifkzggzvy56ans5pfknfr8laxcg264f3ph2z150gw1plsh"; depends=[SKAT]; }; @@ -15346,17 +15531,17 @@ in with self; { ziphsmm = derive2 { name="ziphsmm"; version="2.0.6"; sha256="0lm6m2g9jd1v7gxv4viych8c59phbvz1yly1ydgajl8q251d8n87"; depends=[pracma Rcpp RcppArmadillo]; }; zoeppritz = derive2 { name="zoeppritz"; version="1.0-7"; sha256="14j9jl2g7gn94nzs96mwsgwlxnfbr1crjfmfwbi3rk367xi197jb"; depends=[]; }; zoib = derive2 { name="zoib"; version="1.5.4"; sha256="10hv5li1l9gm1bl3k3c9qcmzkqa4ri0kccrsgw1mn8ddn11g9m0a"; depends=[abind coda Formula matrixcalc rjags]; }; - zoltr = derive2 { name="zoltr"; version="0.2.2"; sha256="0nxg37h6vlj5g6rxmgzy060h3lwfgjxvcf5gfpsgpg1mjg9h4k3f"; depends=[base64url httr jsonlite mockery readr webmockr]; }; + zoltr = derive2 { name="zoltr"; version="0.5.1"; sha256="12zh7y3pwidclscgvd0b0iaqq9j5y8mc8xd6pz4vs0jy5qs3ahar"; depends=[base64url dplyr httr jsonlite magrittr MMWRweek mockery readr rlang webmockr]; }; zoo = derive2 { name="zoo"; version="1.8-7"; sha256="1w4542zs53bm261g95086a60576v334g1jrhnbgdqni4izf2s1wy"; depends=[lattice]; }; zooaRch = derive2 { name="zooaRch"; version="1.2"; sha256="0grc378xppv0303sf4flfqz5002vq5a23nzbq4bsff41rww7dihc"; depends=[ggplot2]; }; zooaRchGUI = derive2 { name="zooaRchGUI"; version="1.0.2"; sha256="0snggx0d69ajz6xxwnv03l12jpjrjkpy2dgf4lrpm2l8rspd27i4"; depends=[car coda foreign geomorph ggplot2 MASS pgirmess raster readxl rjags sp spdep splancs tcltk2 tkrplot vegan]; }; zoocat = derive2 { name="zoocat"; version="0.2.0.1"; sha256="0rdjgf1gvnixqwxrnvzswb53yzcvjgvfkrms6d38bhfyw320kgdp"; depends=[plyr reshape2 scales zoo]; }; zooimage = derive2 { name="zooimage"; version="5.5.2"; sha256="0ck8w0zb9l1n9xvjwqshq9q9l8pigy3yslq2hnfbgcwk17kk9mp8"; depends=[digest DT filehash jpeg MASS mda mlearning png shiny svDialogs svMisc tiff]; }; zoom = derive2 { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; }; - zoomgrid = derive2 { name="zoomgrid"; version="1.0.0"; sha256="1bjm2b1ll5ikym21ia7k6gfiw1bcplcn4p6fls2298nf20q63kaa"; depends=[]; }; - zoon = derive2 { name="zoon"; version="0.6.4"; sha256="1pdhsglp5w2y2pm4irnp849389iakvp03942hhgl9dzc93ad2k14"; depends=[dismo plyr randomForest raster RCurl rfigshare rgdal roxygen2 rworldmap SDMTools sp testthat]; }; + zoon = derive2 { name="zoon"; version="0.6.5"; sha256="02y29vr2yn8al69km8faiqrwjrc1r3hsvw3dg8lwjr65cxw1krip"; depends=[dismo plyr randomForest raster RCurl rfigshare rgdal roxygen2 rworldmap sp testthat]; }; zscorer = derive2 { name="zscorer"; version="0.3.1"; sha256="0aijhs0fyird5gq68x4dxchb02mxa7ijk10k9zjhngghxbjj7iqn"; depends=[shiny]; }; ztable = derive2 { name="ztable"; version="0.2.0"; sha256="0g7khk5ifsdh9p31wlwh2l5mn1hzxzpv6qcn1wh34vsfjdmijjwy"; depends=[flextable magrittr moonBook officer RColorBrewer scales stringr]; }; ztype = derive2 { name="ztype"; version="0.1.0"; sha256="0brbq2rgkl4mhjbb70kkfv47lzs66k9ppfs2klavcbripirxn5fx"; depends=[assertthat dplyr ggplot2 lubridate magrittr rvest stringr]; }; zyp = derive2 { name="zyp"; version="0.10-1.1"; sha256="03cxpkfbhrx1fy8l0dl9a13ghz93cqq6877wa8rig09ksdiivaw9"; depends=[Kendall]; }; + zzlite = derive2 { name="zzlite"; version="0.1.2"; sha256="0vi1slx2s4r5zf82lazqv0c3m12xq73wlgsbz6af4y00h0bkr3ps"; depends=[httr jsonlite]; }; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index d340f3c46365e..da42a5dd82009 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -252,11 +252,10 @@ let data_table = [pkgs.zlib.dev] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; devEMF = [ pkgs.xorg.libXft.dev pkgs.x11 ]; diversitree = [ pkgs.gsl_1 pkgs.fftw ]; - EMCluster = [ pkgs.liblapack ]; + EMCluster = [ pkgs.lapack ]; fftw = [ pkgs.fftw.dev ]; fftwtools = [ pkgs.fftw.dev ]; Formula = [ pkgs.gmp ]; - geoCount = [ pkgs.gsl_1 ]; gdtools = [ pkgs.cairo.dev pkgs.fontconfig.lib pkgs.freetype.dev ]; git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev pkgs.libgit2 pkgs.pkgconfig ]; GLAD = [ pkgs.gsl_1 ]; @@ -323,19 +322,15 @@ let Rmpi = [ pkgs.openmpi ]; RMySQL = [ pkgs.zlib pkgs.libmysqlclient pkgs.openssl.dev ]; RNetCDF = [ pkgs.netcdf pkgs.udunits ]; - RODBCext = [ pkgs.libiodbc ]; RODBC = [ pkgs.libiodbc ]; rpanel = [ pkgs.bwidget ]; rpg = [ pkgs.postgresql ]; - rphast = [ pkgs.pcre.dev pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ]; Rpoppler = [ pkgs.poppler ]; RPostgreSQL = [ pkgs.postgresql pkgs.postgresql ]; RProtoBuf = [ pkgs.protobuf ]; - rPython = [ pkgs.python ]; RSclient = [ pkgs.openssl.dev ]; Rserve = [ pkgs.openssl ]; Rssa = [ pkgs.fftw.dev ]; - rtfbs = [ pkgs.zlib pkgs.pcre.dev pkgs.bzip2 pkgs.gzip pkgs.readline ]; rtiff = [ pkgs.libtiff.dev ]; runjags = [ pkgs.jags ]; RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ]; @@ -364,7 +359,6 @@ let udunits2 = [ pkgs.udunits pkgs.expat ]; units = [ pkgs.udunits ]; V8 = [ pkgs.v8 ]; - WhopGenome = [ pkgs.zlib.dev ]; XBRL = [ pkgs.zlib pkgs.libxml2.dev ]; xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ]; XML = [ pkgs.libtool pkgs.libxml2.dev pkgs.xmlsec pkgs.libxslt ]; @@ -411,7 +405,6 @@ let cairoDevice = [ pkgs.pkgconfig ]; chebpol = [ pkgs.pkgconfig ]; fftw = [ pkgs.pkgconfig ]; - geoCount = [ pkgs.pkgconfig ]; gdtools = [ pkgs.pkgconfig ]; jqr = [ pkgs.jq.lib ]; kza = [ pkgs.pkgconfig ]; @@ -431,7 +424,6 @@ let Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ]; tcltk2 = [ pkgs.tcl pkgs.tk ]; tikzDevice = [ pkgs.which pkgs.texlive.combined.scheme-medium ]; - rPython = [ pkgs.which ]; gridGraphics = [ pkgs.which ]; adimpro = [ pkgs.which pkgs.xorg.xdpyinfo ]; mzR = [ pkgs.netcdf ]; @@ -452,6 +444,8 @@ let sundialr = [ pkgs.libiconv ]; ucminf = [ pkgs.libiconv ]; glmnet = [ pkgs.libiconv ]; + mvtnorm = [ pkgs.libiconv ]; + statmod = [ pkgs.libiconv ]; }; packagesRequireingX = [ @@ -463,14 +457,11 @@ let "AnnotLists" "AnthropMMD" "aplpack" - "aqfig" - "arf3DS4" "asbio" "AtelieR" "BAT" "bayesDem" "BCA" - "BEQI2" "betapart" "BiodiversityR" "bio_infer" @@ -523,7 +514,6 @@ let "gcmr" "geomorph" "geoR" - "geoRglm" "georob" "GGEBiplotGUI" "gnm" @@ -561,7 +551,6 @@ let "miniGUI" "MissingDataGUI" "mixsep" - "mlDNA" "MplusAutomation" "mpmcorrelogram" "mritc" @@ -628,7 +617,6 @@ let "recluster" "relimp" "RenextGUI" - "reportRx" "reshapeGUI" "rgl" "RHRV" @@ -636,7 +624,6 @@ let "RNCEP" "RQDA" "RSDA" - "rsgcc" "RSurvey" "RunuranGUI" "simba" @@ -644,7 +631,6 @@ let "SimpleTable" "SOLOMON" "soundecology" - "spacodiR" "spatsurv" "sqldf" "SRRS" @@ -676,10 +662,8 @@ let "vegan" "vegan3d" "vegclust" - "VIMGUI" "WMCapacity" "x12GUI" - "xergm" ]; packagesToSkipCheck = [ @@ -824,11 +808,11 @@ let }); slfm = old.slfm.overrideDerivation (attrs: { - PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas"; + PKG_LIBS = "-L${pkgs.blas}/lib -lblas -L${pkgs.lapack}/lib -llapack"; }); SamplerCompare = old.SamplerCompare.overrideDerivation (attrs: { - PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas"; + PKG_LIBS = "-L${pkgs.blas}/lib -lblas -L${pkgs.lapack}/lib -llapack"; }); EMCluster = old.EMCluster.overrideDerivation (attrs: { diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix index 353adbcea6ff0..34114ad9a4f17 100644 --- a/pkgs/development/ruby-modules/bundix/default.nix +++ b/pkgs/development/ruby-modules/bundix/default.nix @@ -36,7 +36,7 @@ buildRubyGem rec { The output is then usable by the bundlerEnv derivation to list all the dependencies of a ruby package. ''; - homepage = https://github.com/manveru/bundix; + homepage = "https://github.com/manveru/bundix"; license = "MIT"; maintainers = with lib.maintainers; [ manveru qyliss zimbatm ]; platforms = lib.platforms.all; diff --git a/pkgs/development/ruby-modules/solargraph/default.nix b/pkgs/development/ruby-modules/solargraph/default.nix index ff9b1bac321c7..60c1aee5a00fe 100644 --- a/pkgs/development/ruby-modules/solargraph/default.nix +++ b/pkgs/development/ruby-modules/solargraph/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "IDE tools for the Ruby language"; - homepage = http://www.github.com/castwide/solargraph; + homepage = "http://www.github.com/castwide/solargraph"; license = licenses.mit; maintainers = with maintainers; [ worldofpeace nicknovitski angristan ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index 01706bd9b6810..ed91df066c3aa 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -41,8 +41,8 @@ let generic = { major, version, src }: finds structures that satisfy them. Structures are displayed graphically, and their appearance can be customized for the domain at hand. ''; - homepage = http://alloytools.org/; - downloadPage = http://alloytools.org/download.html; + homepage = "http://alloytools.org/"; + downloadPage = "http://alloytools.org/download.html"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ notbandali ]; diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix index 2f3ebcbed0a61..a2d829f85c28d 100644 --- a/pkgs/development/tools/ameba/default.nix +++ b/pkgs/development/tools/ameba/default.nix @@ -1,38 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, crystal, shards }: +{ stdenv, lib, fetchFromGitHub, crystal }: -stdenv.mkDerivation rec { +crystal.buildCrystalPackage rec { pname = "ameba"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { - owner = "crystal-ameba"; - repo = "ameba"; - rev = "v${version}"; - sha256 = "0g68yijbm2j4ig536fwq49d1z7x2iv9kp4g3gjklf5zn1sbqhm12"; + owner = "crystal-ameba"; + repo = "ameba"; + rev = "v${version}"; + sha256 = "0c2j2qki0czkpsqxv75qg95pk9f0w4rqa5ln07rs4bj9dk2lrr3l"; }; - nativeBuildInputs = [ crystal shards ]; - - buildPhase = '' - runHook preBuild - shards build --release - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -Dm755 -t $out/bin bin/ameba - runHook postInstall - ''; - - doCheck = true; - - checkPhase = '' - runHook preCheck - crystal spec - runHook postCheck - ''; - meta = with stdenv.lib; { description = "A static code analysis tool for Crystal"; homepage = "https://crystal-ameba.github.io"; diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 743ebeef0a847..271869bd7c4ea 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { with a lot of ergonomic improvements and configurability that may be familiar to people coming from IDEs or other REPLs such as IPython or Zsh. ''; - homepage = http://www.lihaoyi.com/Ammonite/; + homepage = "http://www.lihaoyi.com/Ammonite/"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.nequissimus ]; diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix index 7ae563c058bf8..ca095faa97f60 100644 --- a/pkgs/development/tools/analysis/autoflake/default.nix +++ b/pkgs/development/tools/analysis/autoflake/default.nix @@ -15,7 +15,7 @@ buildPythonApplication rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://github.com/myint/autoflake; + homepage = "https://github.com/myint/autoflake"; description = "A simple program which removes unused imports and unused variables as reported by pyflakes"; license = licenses.mit; maintainers = with maintainers; [ yuriaisaka ]; diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix new file mode 100644 index 0000000000000..1d880f04dd34c --- /dev/null +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -0,0 +1,30 @@ +{ lib, pkgconfig, rustPlatform, fetchFromGitHub, openssl }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-tarpaulin"; + version = "0.12.4"; + + src = fetchFromGitHub { + owner = "xd009642"; + repo = "tarpaulin"; + rev = "${version}"; + sha256 = "0y58800n61s8wmpcpgw5vpywznwwbp0d30fz2z0kjx4mpwmva4g4"; + }; + + nativeBuildInputs = [ + pkgconfig + ]; + buildInputs = [ openssl ]; + + cargoSha256 = "12hkzq2xn4g5k94kjirjnnz4dddqg7akxnp3qyfkz092vvp25k9z"; + #checkFlags = [ "--test-threads" "1" ]; + doCheck = false; + + meta = with lib; { + description = "A code coverage tool for Rust projects"; + homepage = "https://github.com/xd009642/tarpaulin"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ hugoreeves ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/analysis/cccc/default.nix b/pkgs/development/tools/analysis/cccc/default.nix index a46d7f9d9536c..374331f3ac87d 100644 --- a/pkgs/development/tools/analysis/cccc/default.nix +++ b/pkgs/development/tools/analysis/cccc/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { on various metrics of the code. Metrics supported include lines of code, McCabe's complexity and metrics proposed by Chidamber&Kemerer and Henry&Kafura. ''; - homepage = http://cccc.sourceforge.net/; + homepage = "http://cccc.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.linquize ]; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 539c2f7d1910d..3367588bb3b99 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.31"; + version = "8.32"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "03dn07lissr2dkhi44wlkrbsby4zfvwai8gykc3xjgs46jy05rf8"; + sha256 = "18ahdphxfcfi2vghl11kmj089hyh9iawll3cwxrqsdqak0748ijs"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index 951c46e2166fd..4c6e9f1a078ca 100644 --- a/pkgs/development/tools/analysis/coan/default.nix +++ b/pkgs/development/tools/analysis/coan/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { respect to a specified configuration. Dead code removal is an application of this sort. ''; - homepage = http://coan2.sourceforge.net/; + homepage = "http://coan2.sourceforge.net/"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index f722a155086f6..f930bb6e578f7 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.1.0"; + version = "2.1.3"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "1vp4f5kwmxc4j59cdzwj0jh0n4c05hkvssvv9ii6w88phzblzpjk"; + sha256 = "1b0hqc8zs6v47w9sjk40sbj1fw5x5bxg7kw9s84y6s60yr897376"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 0f3e810ec42ae..76a038ca81991 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "1.90"; + version = "2.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "10qqyvx44llbchwqjyipra0nzqqkb9majpp582ac55imc5b8sxa3"; + sha256 = "0gssnb50cndr77xva4nar4a82ii0vfqy96dlm27gb7pd6xmd6xsz"; }; buildInputs = [ pcre ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { Check C/C++ code for memory leaks, mismatching allocation-deallocation, buffer overruns and more. ''; - homepage = http://cppcheck.sourceforge.net/; + homepage = "http://cppcheck.sourceforge.net/"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ joachifm ]; diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix index 8b4a68adba300..577a09e8de995 100644 --- a/pkgs/development/tools/analysis/cpplint/default.nix +++ b/pkgs/development/tools/analysis/cpplint/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/cpplint/cpplint; + homepage = "https://github.com/cpplint/cpplint"; description = "Static code checker for C++"; maintainers = [ maintainers.bhipple ]; license = [ licenses.bsd3 ]; diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix index 6259756794df2..080b19bf163b9 100644 --- a/pkgs/development/tools/analysis/egypt/default.nix +++ b/pkgs/development/tools/analysis/egypt/default.nix @@ -25,7 +25,7 @@ perlPackages.buildPerlPackage rec { Egypt is simply a very small Perl script that glues these existing tools together. ''; - homepage = http://www.gson.org/egypt/; + homepage = "http://www.gson.org/egypt/"; license = with licenses; [ artistic1 gpl1Plus ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix index 1bd24b4785d03..3cc16c07ec598 100644 --- a/pkgs/development/tools/analysis/emma/default.nix +++ b/pkgs/development/tools/analysis/emma/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "emma-2.0.5312"; src = fetchurl { - url = mirror://sourceforge/emma/emma-2.0.5312.zip; + url = "mirror://sourceforge/emma/emma-2.0.5312.zip"; sha256 = "0xxy39s2lvgs56vicjzpcz936l1vjaplliwa0dm7v3iyvw6jn7vj"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://emma.sourceforge.net/; + homepage = "http://emma.sourceforge.net/"; description = "A code coverage tool for Java"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.cpl10; diff --git a/pkgs/development/tools/analysis/eresi/default.nix b/pkgs/development/tools/analysis/eresi/default.nix index b84eeae15dcaf..c8c0d0c696016 100644 --- a/pkgs/development/tools/analysis/eresi/default.nix +++ b/pkgs/development/tools/analysis/eresi/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = { description = "The ERESI Reverse Engineering Software Interface"; license = lib.licenses.gpl2; - homepage = http://www.eresi-project.org/; + homepage = "http://www.eresi-project.org/"; maintainers = [ lib.maintainers.aszlig ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix index c250f442a0ebf..64a1c3173930b 100644 --- a/pkgs/development/tools/analysis/evmdis/default.nix +++ b/pkgs/development/tools/analysis/evmdis/default.nix @@ -13,7 +13,7 @@ buildGoPackage { }; meta = with stdenv.lib; { - homepage = https://github.com/Arachnid/evmdis; + homepage = "https://github.com/Arachnid/evmdis"; description = "Ethereum EVM disassembler"; license = [ licenses.asl20 ]; maintainers = with maintainers; [ asymmetric ]; diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix index 7f2df62008f00..d522b2b942272 100644 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ b/pkgs/development/tools/analysis/findbugs/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A static analysis tool to find bugs in Java programs automatically"; - homepage = http://findbugs.sourceforge.net/; + homepage = "http://findbugs.sourceforge.net/"; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; license = licenses.lgpl3; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 014c7dea11b7d..8cd0246c62f56 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.122.0"; + version = "0.125.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "0a1pcrp0r7l0c8cyrg1qc1qz5dnj0mzd60v9nixgm419a7rrmp93"; + sha256 = "0c6ai2fcssys8xd445xxc0zdn3jz6kcy85mac1p89mnlqd1r1xk4"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 7d24bf5e0d57e..c7ac2986fd6c5 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = { description = "An extensible and collaborative platform dedicated to source-code analysis of C software"; - homepage = http://frama-c.com/; + homepage = "http://frama-c.com/"; license = stdenv.lib.licenses.lgpl21; maintainers = with stdenv.lib.maintainers; [ thoughtpolice amiddelk ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix index f96f7e9b66bd0..d0221e80b9bc9 100644 --- a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix +++ b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Automatically generate all types of basic memory management operations and write into trace files"; - homepage = https://github.com/GarCoSim; + homepage = "https://github.com/GarCoSim"; maintainers = [ maintainers.cmcdragonkai ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix index 557fa83847462..7a6f3481d53fd 100644 --- a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix +++ b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Ease the analysis of existing memory management techniques, as well as the prototyping of new memory management techniques."; - homepage = https://github.com/GarCoSim; + homepage = "https://github.com/GarCoSim"; maintainers = [ maintainers.cmcdragonkai ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index 4fbf986e41a12..8a265d89849d5 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "hopper"; - version = "4.5.22"; + version = "4.5.27"; rev = "v${lib.versions.major version}"; src = fetchurl { url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz"; - sha256 = "1321i9ls5k677diwfccrjinzzb5586ygdgax7ryyha3ccdj1ikda"; + sha256 = "1c0lyj20kvb6ljf7zk6hzs70bl5fwnmyiv6w3hhr079bgn4fq4m0"; }; sourceRoot = "."; diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix index fc7cd2ffe193a..23ca35b3717e9 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -59,7 +59,7 @@ mkDerivation rec { It takes a perf.data file, parses and evaluates its contents and then displays the result in a graphical way. ''; - homepage = https://github.com/KDAB/hotspot; + homepage = "https://github.com/KDAB/hotspot"; license = with stdenv.lib.licenses; [ gpl2 gpl3 ]; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ nh2 ]; diff --git a/pkgs/development/tools/analysis/ikos/default.nix b/pkgs/development/tools/analysis/ikos/default.nix index a882d158f32d9..a7b7677484d2e 100644 --- a/pkgs/development/tools/analysis/ikos/default.nix +++ b/pkgs/development/tools/analysis/ikos/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postBuild = "make doc"; meta = with lib; { - homepage = https://github.com/NASA-SW-VnV/ikos; + homepage = "https://github.com/NASA-SW-VnV/ikos"; description = "Static analyzer for C/C++ based on the theory of Abstract Interpretation"; license = licenses.nasa13; maintainers = with maintainers; [ atnnn ]; diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 424d83822e873..6e19d89702ac3 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { actually needed for this file (for both .cc and .h files), and by replacing #includes with forward-declares when possible. ''; - homepage = https://include-what-you-use.org; + homepage = "https://include-what-you-use.org"; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index b5bc31ad5e9f4..bbea8a1dd65de 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { applications. ''; - homepage = http://simonkagstrom.github.io/kcov/index.html; + homepage = "http://simonkagstrom.github.io/kcov/index.html"; license = licenses.gpl2; maintainers = with maintainers; [ gal_bolle ekleog ]; diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 50bb85eae0d45..6ac778180b77b 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://github.com/linux-test-project/lcov/commit/ebfeb3e179e450c69c3532f98cd5ea1fbf6ccba7.patch; + url = "https://github.com/linux-test-project/lcov/commit/ebfeb3e179e450c69c3532f98cd5ea1fbf6ccba7.patch"; sha256 = "0dalkqbjb6a4vp1lcsxd39dpn5fzdf7ihsjbiviq285s15nxdj1j"; }) (fetchpatch { - url = https://github.com/linux-test-project/lcov/commit/75fbae1cfc5027f818a0bb865bf6f96fab3202da.patch; + url = "https://github.com/linux-test-project/lcov/commit/75fbae1cfc5027f818a0bb865bf6f96fab3202da.patch"; sha256 = "0v1hn0511dxqbf50ppwasc6vmg0m6rns7ydbdy2rdbn0j7gxw30x"; }) ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { HTML output. ''; - homepage = http://ltp.sourceforge.net/coverage/lcov.php; + homepage = "http://ltp.sourceforge.net/coverage/lcov.php"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with maintainers; [ dezgeg ]; diff --git a/pkgs/development/tools/analysis/oclgrind/default.nix b/pkgs/development/tools/analysis/oclgrind/default.nix index f5e649d0354c7..8cc0477ca5928 100644 --- a/pkgs/development/tools/analysis/oclgrind/default.nix +++ b/pkgs/development/tools/analysis/oclgrind/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OpenCL device simulator and debugger"; - homepage = https://github.com/jrprice/oclgrind; + homepage = "https://github.com/jrprice/oclgrind"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ athas ]; diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix index e64f39a496097..3f90e5f73436a 100644 --- a/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/pkgs/development/tools/analysis/radare2/cutter.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "radare2-cutter"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "1icv56gxpzdjqn37pk3g99vgpljdc77i6k0x601iw2885s7s01n6"; + sha256 = "0qj8jyij02nif4jpirl09ygwnv8a9zi3vkb5sf5s8mg7qwlpnvyk"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 37dc9e51beabd..f77ea1602f4f6 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub , buildPackages , pkgconfig -, libusb, readline, libewf, perl, zlib, openssl +, libusb-compat-0_1, readline, libewf, perl, zlib, openssl , libuv, file, libzip, xxHash , gtk2 ? null, vte ? null, gtkdialog ? null , python3 ? null @@ -84,7 +84,7 @@ let depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ file readline libusb libewf perl zlib openssl libuv ] + buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ] ++ optional useX11 [ gtkdialog vte gtk2 ] ++ optional rubyBindings [ ruby ] ++ optional pythonBindings [ python3 ] @@ -110,22 +110,22 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "24088"; - gittap = "4.3.1"; - gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; - rev = "4.3.1"; - version = "4.3.1"; - sha256 = "0fiy6aj8xf9anpkk2vpkx8x0m2f26rhjb92nmg61xj13dmhchh30"; + version_commit = "24545"; + gittap = "4.4.0"; + gittip = "9ea0b7ce566cfdcfb3513f407c4056915204294a"; + rev = "4.4.0"; + version = "4.4.0"; + sha256 = "0gwdnrnk7wdgkajp2qwg4fyplh7nsbmf01bzx07px6xmiscd9z2s"; cs_ver = "4.0.1"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; r2-for-cutter = generic { - version_commit = "24088"; - gittap = "4.3.1"; - gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; - rev = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; - version = "2020-03-05"; - sha256 = "0fiy6aj8xf9anpkk2vpkx8x0m2f26rhjb92nmg61xj13dmhchh30"; + version_commit = "24605"; + gittap = "4.4.0"; + gittip = "9ea0b7ce566cfdcfb3513f407c4056915204294a"; + rev = "9ea0b7ce566cfdcfb3513f407c4056915204294a"; + version = "2020-04-14"; + sha256 = "0gwdnrnk7wdgkajp2qwg4fyplh7nsbmf01bzx07px6xmiscd9z2s"; cs_ver = "4.0.1"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix index 848dfca5ce6d7..55c077f932d92 100644 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -187,12 +187,12 @@ in stdenv.mkDerivation rec { patches = [ # 2.1.2 -> 2.2.1 (fetchpatch { - url = https://github.com/avast-tl/retdec/commit/c9d23da1c6e23c149ed684c6becd3f3828fb4a55.patch; + url = "https://github.com/avast-tl/retdec/commit/c9d23da1c6e23c149ed684c6becd3f3828fb4a55.patch"; sha256 = "0hdq634f72fihdy10nx2ajbps561w03dfdsy5r35afv9fapla6mv"; }) # 2.2.1 -> 2.2.2 (fetchpatch { - url = https://github.com/avast-tl/retdec/commit/fb85f00754b5d13b781385651db557741679721e.patch; + url = "https://github.com/avast-tl/retdec/commit/fb85f00754b5d13b781385651db557741679721e.patch"; sha256 = "0a8mwmwb39pr5ag3q11nv81ncdk51shndqrkm92shqrmdq14va52"; }) ]; @@ -228,7 +228,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A retargetable machine-code decompiler based on LLVM"; - homepage = https://retdec.com; + homepage = "https://retdec.com"; license = licenses.mit; maintainers = with maintainers; [ dtzWill timokau ]; platforms = ["x86_64-linux" "i686-linux"]; diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 8ca6dff9f5db1..47832c5ae2a36 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { preCheck = "export HOME=$TMPDIR"; meta = { - homepage = https://rr-project.org/; + homepage = "https://rr-project.org/"; description = "Records nondeterministic executions and debugs them deterministically"; longDescription = '' rr aspires to be your primary debugging tool, replacing -- well, diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index 9dc1e2db8c090..1443c31192df3 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { name = "smatch-20120924"; src = fetchgit { - url = git://repo.or.cz/smatch.git; + url = "git://repo.or.cz/smatch.git"; rev = "23656e3e578b700cbf96d043f039e6341a3ba5b9"; sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { description = "A semantic analysis tool for C"; - homepage = http://smatch.sourceforge.net/; + homepage = "http://smatch.sourceforge.net/"; license = stdenv.lib.licenses.free; /* OSL, see http://www.opensource.org */ platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 26598bb36cd04..73e88f9811c35 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Formal verification tool for distributed software systems"; - homepage = http://spinroot.com/; + homepage = "http://spinroot.com/"; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/tools/analysis/splint/default.nix b/pkgs/development/tools/analysis/splint/default.nix index 57a83e54d7056..4dc93897e869a 100644 --- a/pkgs/development/tools/analysis/splint/default.nix +++ b/pkgs/development/tools/analysis/splint/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://www.splint.org/; + homepage = "http://www.splint.org/"; description = "Annotation-assisted lightweight static analyzer for C"; longDescription = '' diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix index 922a73a4be094..03f218546ebf8 100644 --- a/pkgs/development/tools/analysis/swarm/default.nix +++ b/pkgs/development/tools/analysis/swarm/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Verification script generator for Spin"; - homepage = http://spinroot.com/; + homepage = "http://spinroot.com/"; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 200df98c0a20f..189365008aa10 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.15.4"; + version = "0.16.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1z98zy04dj4hj94k9c9r1sfw167s3ywpxnjbylj7nsyxdlvwj37j"; + sha256 = "1sh34zrk90sfi3x48d583izzw2bijnpsv6yqslzjpvsgkg8d96vz"; }; - modSha256 = "1j6vflvg2k544r0kkdiw64n6v467c0kr7l2m39h8yjbyjbmwl5xz"; + vendorSha256 = "0xgv4jsrh8rfas7577xqv609pac05rvyshfm8vjx0kv38rnx3hfv"; subPackages = [ "." ]; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 8e2db5caab1b0..9d8e999c385ca 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.valgrind.org/; + homepage = "http://www.valgrind.org/"; description = "Debugging and profiling tool suite"; longDescription = '' diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix index 1ecdd9f32ce5c..1c571fe6be0fc 100644 --- a/pkgs/development/tools/analysis/valkyrie/default.nix +++ b/pkgs/development/tools/analysis/valkyrie/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake4Hook ]; meta = with stdenv.lib; { - homepage = http://www.valgrind.org/; + homepage = "http://www.valgrind.org/"; description = "Qt4-based GUI for the Valgrind 3.6.x series"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 76037f98e1b5b..529f705e1012e 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for reverse engineering Android apk files"; - homepage = https://ibotpeaches.github.io/Apktool/; + homepage = "https://ibotpeaches.github.io/Apktool/"; license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = with platforms; unix; diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix index 04cb6f808df2f..c93b864b70f8f 100644 --- a/pkgs/development/tools/asmfmt/default.nix +++ b/pkgs/development/tools/asmfmt/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "asmfmt"; - version = "1.1"; + version = "1.2.1"; goPackagePath = "github.com/klauspost/asmfmt"; @@ -14,22 +14,18 @@ buildGoPackage rec { owner = "klauspost"; repo = "asmfmt"; rev = "v${version}"; - sha256 = "08mybfizcvck460axakycz9ndzcgwqilp5mmgm4bl8hfrn36mskw"; + sha256 = "0qwxb4yx12yl817vgbhs7acaj98lgk27dh50mb8sm9ccw1f43h9i"; }; - patches = [ - (fetchpatch { - excludes = ["README.md"]; - url = "https://github.com/klauspost/asmfmt/commit/39a37c8aed8095e0fdfb07f78fc8acbd465d9627.patch"; - sha256 = "18bc77l87mf0yvqc3adlakxz6wflyqfsc2wrmh9q0nlqghlmnw5k"; - }) - ]; - goDeps = ./deps.nix; + # This package comes with its own version of goimports, gofmt and goreturns + # but these binaries are outdated and are offered by other packages. + subPackages = [ "cmd/asmfmt" ]; + meta = with lib; { description = "Go Assembler Formatter"; - homepage = https://github.com/klauspost/asmfmt; + homepage = "https://github.com/klauspost/asmfmt"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix index d429a926f8ae9..68a0c0f6073e6 100644 --- a/pkgs/development/tools/asn2quickder/default.nix +++ b/pkgs/development/tools/asn2quickder/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "An ASN.1 compiler with a backend for Quick DER"; - homepage = https://github.com/vanrein/asn2quickder; + homepage = "https://github.com/vanrein/asn2quickder"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix index 6b51e2c482cf2..c337afa5a6d95 100644 --- a/pkgs/development/tools/avro-tools/default.nix +++ b/pkgs/development/tools/avro-tools/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://avro.apache.org/; + homepage = "https://avro.apache.org/"; description = "Avro command-line tools and utilities"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.nequissimus ]; diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 94ca01faef2c9..d3b917b0d5d57 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -72,7 +72,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/awslabs/aws-sam-cli; + homepage = "https://github.com/awslabs/aws-sam-cli"; description = "CLI tool for local development and testing of Serverless applications"; license = licenses.asl20; maintainers = with maintainers; [ andreabedini lo1tuma ]; diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 328092feafc52..903245deb31e2 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.3.4"; + version = "10.4.3"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = version; - sha256 = "16pdvcgy1d5dfqk3as23j45rkwfrv232n384cj5wfz9qwijkcy5g"; + sha256 = "0yl7iznjyng1i3d994qrryllni702gga7h45sx8i3sgpy8544yjf"; }; subPackages = [ "." ]; - modSha256 = "07cy2zi7m2pkbfdcy659x4k5j2w60cmjy8kxv1dcii3dc6ls4bvb"; + vendorSha256 = "1276k2hpyr7bqp6hdi576xcdcd2c8vz100jpls663z7vb2rbpvxf"; postInstall = '' ln -rs "$out/bin/azure-storage-azcopy" "$out/bin/azcopy" @@ -24,4 +24,4 @@ buildGoModule rec { license = licenses.mit; description = "The new Azure Storage data transfer utility - AzCopy v10"; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 831ed1e97acef..b1671b098b32c 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -42,7 +42,7 @@ buildPythonApplication rec { meta = with lib; { description = "Command-line tool for accessing the Backblaze B2 storage service"; - homepage = https://github.com/Backblaze/B2_Command_Line_Tool; + homepage = "https://github.com/Backblaze/B2_Command_Line_Tool"; license = licenses.mit; maintainers = with maintainers; [ hrdinka kevincox ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/bazel-gazelle/default.nix b/pkgs/development/tools/bazel-gazelle/default.nix index db150b2eef172..ff019e785100a 100644 --- a/pkgs/development/tools/bazel-gazelle/default.nix +++ b/pkgs/development/tools/bazel-gazelle/default.nix @@ -14,12 +14,12 @@ buildGoModule rec { sha256 = "1rw9zq8rmc0zr91kk70xl67dl6jx4dswwisv3bd1f16yncqgv2a1"; }; - modSha256 = "0bfhy0ig8apxb5qzxjdj6q7jr2i6rdq0ffby0pha8viadah8v2rm"; + vendorSha256 = null; subPackages = [ "cmd/gazelle" ]; meta = with lib; { - homepage = https://github.com/bazelbuild/bazel-gazelle; + homepage = "https://github.com/bazelbuild/bazel-gazelle"; description = '' Gazelle is a Bazel build file generator for Bazel projects. It natively supports Go and protobuf, and it may be extended to support new languages @@ -28,4 +28,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ kalbasit ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 29276fb6bfba2..2d9b99a35f86f 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -5,35 +5,29 @@ , go , python , stdenv +, iana-etc +, mailcap +, tzdata }: let patches = [ ./use-go-in-path.patch - - # update rules_go to fix the build. Remove these when updating past 0.10.3 - (fetchpatch { - url = "https://github.com/bazelbuild/bazel-watcher/commit/686130f50cea274f7453f6abc8c5249654047462.patch"; - sha256 = "0rzs01sfiinl5d3dq9sx1bhl8kkzppdwh964fr7bzafqcxv5llmb"; - }) - (fetchpatch { - url = "https://github.com/bazelbuild/bazel-watcher/commit/18bdb44832ccc533e0ab3923ef80060eeb24582d.patch"; - sha256 = "0k5hvlxlg4n092d53cbfxqqhzc6f1jv4licdhhi1dhckkhb4sdk6"; - }) ]; in buildBazelPackage rec { name = "bazel-watcher-${version}"; - version = "0.10.3"; + version = "0.13.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${version}"; - sha256 = "17z4nqqsdrainbh8fmhf6sgrxwf7aknadmn94z1yqpxa7kb9x33v"; + sha256 = "1fc3sp79znbbq1yjap56lham72n7cap8yfghpzrzmpl5brybjkvm"; }; nativeBuildInputs = [ go git python ]; + removeRulesCC = false; bazelTarget = "//ibazel"; @@ -55,6 +49,10 @@ buildBazelPackage rec { rm -rf $bazelOut/external/{go_sdk,\@go_sdk.marker} sed -e '/^FILE:@go_sdk.*/d' -i $bazelOut/external/\@*.marker + # Retains go build input markers + chmod -R 755 $bazelOut/external/{bazel_gazelle_go_repository_cache,@\bazel_gazelle_go_repository_cache.marker} + rm -rf $bazelOut/external/{bazel_gazelle_go_repository_cache,@\bazel_gazelle_go_repository_cache.marker} + # Remove the gazelle tools, they contain go binaries that are built # non-deterministically. As long as the gazelle version matches the tools # should be equivalent. @@ -62,7 +60,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "0cmj186n2y1g9kkdhcivmh2qvigvpnbp03m575b7hgsxi1cp3ssj"; + sha256 = "0ili0123xcl0mjcrn4r1r1q9d7a8a3bbh9r3zhlshl39awfm4r2d"; }; buildAttrs = { @@ -78,7 +76,7 @@ buildBazelPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/bazelbuild/bazel-watcher; + homepage = "https://github.com/bazelbuild/bazel-watcher"; description = "Tools for building Bazel targets when source files change."; license = licenses.asl20; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 5780cf4382a7d..d59e409b5ddf0 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,16 +2,20 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.3.0"; + version = "1.4.0"; + + patches = [ ./gomod.patch ]; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "15h4mbsfjwby4wq57rdj4dzsf595qjfgi3v5zw62yycn3m2w922p"; + sha256 = "14zp0bi0p1rfbx1pxi5y28ndxwbqbvfx0pvy3jh1mnx5qsii1gcq"; }; - modSha256 = "1w8k659ifapcxbbim0nf7wd7w10bhlagc33q08izh84gcgsh0yyz"; + vendorSha256 = "10156k90ky3znb9rxhy7zasskxmlcs5cn9f3xk25ana1c66vxszr"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.BazeliskVersion=${version}" ]; meta = with stdenv.lib; { description = "A user-friendly launcher for Bazel"; @@ -22,4 +26,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ elasticdog ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/bazelisk/gomod.patch b/pkgs/development/tools/bazelisk/gomod.patch new file mode 100644 index 0000000000000..e5ff46bfa7bf5 --- /dev/null +++ b/pkgs/development/tools/bazelisk/gomod.patch @@ -0,0 +1,12 @@ +diff --git a/go.mod b/go.mod +index 8eef134..54382cb 100644 +--- a/go.mod ++++ b/go.mod +@@ -3,6 +3,7 @@ module github.com/bazelbuild/bazelisk + go 1.14 + + require ( ++ github.com/bazelbuild/rules_go v0.22.4 + github.com/hashicorp/go-version v1.2.0 + github.com/mitchellh/go-homedir v1.1.0 + ) diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index 9a12a7afc625b..8d3472a4a3859 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "a size profiler for binaries"; - homepage = https://github.com/google/bloaty; + homepage = "https://github.com/google/bloaty"; license = licenses.asl20; platforms = platforms.unix; maintainers = [ maintainers.dtzWill ]; diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index 821e51ac60582..bec5357691f27 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = https://github.com/BoomerangDecompiler/boomerang; + homepage = "https://github.com/BoomerangDecompiler/boomerang"; license = licenses.bsd3; description = "A general, open source, retargetable decompiler"; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix index f392475f61874..8ce475c893d5f 100644 --- a/pkgs/development/tools/boost-build/default.nix +++ b/pkgs/development/tools/boost-build/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.boost.org/boost-build2/; + homepage = "http://www.boost.org/boost-build2/"; license = stdenv.lib.licenses.boost; platforms = platforms.unix; maintainers = with maintainers; [ ivan-tkatchev ]; diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix index 661e16d83e820..3f43cad17c4bf 100644 --- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix +++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; contrib = fetchurl { - url = mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2; + url = "mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2"; sha256 = "96effcca2581c1ab42a4828c770b48d54852edf9e71cefc9ed2ffd6590571ad1"; }; @@ -81,7 +81,7 @@ stdenv.mkDerivation { ''; # */ meta = { - homepage = http://ant.apache.org/; + homepage = "http://ant.apache.org/"; description = "A Java-based build tool"; longDescription = '' diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index 28e86e2917550..f06467867ce23 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; contrib = fetchurl { - url = mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2; + url = "mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2"; sha256 = "96effcca2581c1ab42a4828c770b48d54852edf9e71cefc9ed2ffd6590571ad1"; }; @@ -81,7 +81,7 @@ stdenv.mkDerivation { ''; # */ meta = { - homepage = http://ant.apache.org/; + homepage = "http://ant.apache.org/"; description = "A Java-based build tool"; longDescription = '' diff --git a/pkgs/development/tools/build-managers/apache-maven/builder.sh b/pkgs/development/tools/build-managers/apache-maven/builder.sh index 2760bb95fcf53..dcc38b9ec74a1 100644 --- a/pkgs/development/tools/build-managers/apache-maven/builder.sh +++ b/pkgs/development/tools/build-managers/apache-maven/builder.sh @@ -6,6 +6,7 @@ mkdir -p $out/maven cp -r $name/* $out/maven makeWrapper $out/maven/bin/mvn $out/bin/mvn --set-default JAVA_HOME "$jdk" +makeWrapper $out/maven/bin/mvnDebug $out/bin/mvnDebug --set-default JAVA_HOME "$jdk" # Add the maven-axis and JIRA plugin by default when using maven 1.x if [ -e $out/maven/bin/maven ] diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index 9194eda336167..83260cbc18607 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Build automation tool (used primarily for Java projects)"; - homepage = http://maven.apache.org/; + homepage = "http://maven.apache.org/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ cko ]; diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 3222406c15d7d..6b8269584bd25 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -64,7 +64,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "141kw2zpr612xdcrg6x9kslg4d5b3fbpzx0vgp3lqwdihfj3sc1l"; + sha256 = "1hzb84zxav68ysdwkimaaz0b9rq95k3bgifw01m644v7idabrz50"; }; buildAttrs = { @@ -81,7 +81,7 @@ buildBazelPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/buchgr/bazel-remote; + homepage = "https://github.com/buchgr/bazel-remote"; description = "A remote HTTP/1.1 cache for Bazel."; license = licenses.asl20; maintainers = [ maintainers.uri-canva ]; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index e1d5b66998242..004d0f732ffae 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "bazel-buildtools"; - version = "1.0.0"; + version = "2.2.1"; goPackagePath = "github.com/bazelbuild/buildtools"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "bazelbuild"; repo = "buildtools"; rev = version; - sha256 = "1rgz1bpg2db6z4q04z061h5b9qjk8padi71xyjcwqfchwqpl7hiv"; + sha256 = "165jvn7r7bxivb8mpvp6dni5a5ns9a3vm6y5clyxdbjhfkll8wra"; }; goDeps = ./deps.nix; @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps."; - homepage = https://github.com/bazelbuild/buildtools; + homepage = "https://github.com/bazelbuild/buildtools"; license = licenses.asl20; maintainers = with maintainers; [ elasticdog uri-canva marsam ]; platforms = platforms.all; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix index 38be0dedc3719..a64f96d2c072d 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "d23c5127dc24889085f8ccea5c9d560a57a879d8"; - sha256 = "1cyyr52yhj3fzrily3rmsbqyj8va4ld75lmry0857m39rgpv8sy1"; + rev = "84668698ea25b64748563aa20726db66a6b8d299"; + sha256 = "1gkd1942vk9n8kfzdwy1iil6wgvlwjq7a3y5jc49ck4lz9rhmgkq"; }; } { diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 9e2fb13b0e7a9..bc7bb46cd5b9d 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { e.g. for YouCompleteMe. You just enter your development nix-shell and run `bear make`. It's not perfect, but it gets a long way. ''; - homepage = https://github.com/rizsotto/Bear; + homepage = "https://github.com/rizsotto/Bear"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.babariviere ]; diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index ce656d4d78ff5..51ca62d052022 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://scalacenter.github.io/bloop/; + homepage = "https://scalacenter.github.io/bloop/"; license = licenses.asl20; description = "Bloop is a Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way."; maintainers = with maintainers; [ tomahna ]; diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index 944bbd9d4bb39..499ef7a19b315 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bmake"; - version = "20200318"; + version = "20200506"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "10rcgv0hd5axm2b41a5xaig6iqbpyqfp2q7llr7zc3mnbacwaz35"; + sha256 = "1qiq6lvlg2hqiq03slv4vzv3bn4cr3w95r3i6m5fa4hgn2dkrhqa"; }; nativeBuildInputs = [ getopt ]; diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix index 3f086c912c18d..09c1eada54b5a 100644 --- a/pkgs/development/tools/build-managers/boot/default.nix +++ b/pkgs/development/tools/build-managers/boot/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Build tooling for Clojure"; - homepage = https://boot-clj.com/; + homepage = "https://boot-clj.com/"; license = licenses.epl10; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ragge ]; diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index 88ebc5ebfaed4..804bdd76f6730 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = https://cmake.org; + homepage = "https://cmake.org"; description = "Cross-Platform Makefile Generator"; platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ xfix ]; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 0a6335a3eb722..05c7a55b9d2b1 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.16.5"; + version = "3.17.2"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "1z4bb8z6b4dvq5hrvajrf1hyybqay3xybyimf71w1jgcp180nxjz"; + sha256 = "199srp8yfai51pcbpmfyc4s8vzrmh2dm91bp582hj2l29x634xzw"; }; patches = [ @@ -71,6 +71,11 @@ stdenv.mkDerivation rec { "--docdir=share/doc/${pname}${version}" ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup ++ lib.optional (useQt4 || withQt5) "--qt-gui" + # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568 + ++ lib.optionals stdenv.hostPlatform.is32bit [ + "CFLAGS=-D_FILE_OFFSET_BITS=64" + "CXXFLAGS=-D_FILE_OFFSET_BITS=64" + ] ++ [ "--" # We should set the proper `CMAKE_SYSTEM_NAME`. diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix index f14aa4eea6e29..99ed58324afbb 100644 --- a/pkgs/development/tools/build-managers/colormake/default.nix +++ b/pkgs/development/tools/build-managers/colormake/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { buildInputs = [perl]; src = fetchgit { - url = https://github.com/pagekite/Colormake.git; + url = "https://github.com/pagekite/Colormake.git"; rev = "66544f40d"; sha256 = "8e714c5540305d169989d9387dbac47b8b9fb2cfb424af7bcd412bfe684dc6d7"; }; diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 114cdc634c8e7..d7aec3527b3b5 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,7 +1,7 @@ { lib, python3, git, pkgconfig }: # Note: -# Conan has specific dependency demanands; check +# Conan has specific dependency demands; check # https://github.com/conan-io/conan/blob/master/conans/requirements.txt # https://github.com/conan-io/conan/blob/master/conans/requirements_server.txt # on the release branch/commit we're packaging. @@ -39,12 +39,12 @@ let newPython = python3.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.24.0"; + version = "1.25.0"; pname = "conan"; src = newPython.pkgs.fetchPypi { inherit pname version; - sha256 = "0nkh4f6plamijwcfw536ydm0i04y74qmkh5l1nanyb8p0c3z3x0y"; + sha256 = "1wgmx6s4h5m6zixb3wlaicy56rsqcy2srzmvii80xdx9g5wvi9pv"; }; propagatedBuildInputs = with newPython.pkgs; [ @@ -90,11 +90,12 @@ in newPython.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace conans/requirements.txt \ - --replace "PyYAML>=3.11, <3.14.0" "PyYAML" + --replace "PyYAML>=3.11, <3.14.0" "PyYAML" \ + --replace "deprecation>=2.0, <2.1" "deprecation" ''; meta = with lib; { - homepage = https://conan.io; + homepage = "https://conan.io"; description = "Decentralized and portable C/C++ package manager"; license = licenses.mit; maintainers = with maintainers; [ HaoZeke ]; diff --git a/pkgs/development/tools/build-managers/doit/default.nix b/pkgs/development/tools/build-managers/doit/default.nix index 8fd2514c4a068..b906d64f0af95 100644 --- a/pkgs/development/tools/build-managers/doit/default.nix +++ b/pkgs/development/tools/build-managers/doit/default.nix @@ -25,7 +25,7 @@ in python3Packages.buildPythonApplication { checkPhase = "py.test"; meta = with stdenv.lib; { - homepage = https://pydoit.org/; + homepage = "https://pydoit.org/"; description = "A task management & automation tool"; license = licenses.mit; longDescription = '' diff --git a/pkgs/development/tools/build-managers/drake/default.nix b/pkgs/development/tools/build-managers/drake/default.nix index 15fc682a315ca..2f753c82521e2 100644 --- a/pkgs/development/tools/build-managers/drake/default.nix +++ b/pkgs/development/tools/build-managers/drake/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A branch of Rake supporting automatic parallelizing of tasks"; - homepage = http://quix.github.io/rake/; + homepage = "http://quix.github.io/rake/"; maintainers = with maintainers; [ romildo manveru nicknovitski ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 37467f225eabe..a83281c4e961f 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { outputs = [ "out" "man" "info" ]; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/make/; + homepage = "https://www.gnu.org/software/make/"; description = "A tool to control the generation of non-source files from sources"; license = licenses.gpl3Plus; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index f6fa53cfab05d..b5215611c0c33 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -45,7 +45,7 @@ rec { between the flexibility of Ant and the convenience of a build-by-convention behavior. ''; - homepage = http://www.gradle.org/; + homepage = "http://www.gradle.org/"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index 7135790c1bdca..89e2b8d0cc6e6 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A program maintenance (make) utility using a C-like grammar"; - homepage = https://fbb-git.gitlab.io/icmake/; + homepage = "https://fbb-git.gitlab.io/icmake/"; license = licenses.gpl3; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index 2d94b48ba5471..7d7502fad4b73 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://www.perforce.com/resources/documentation/jam; + homepage = "https://www.perforce.com/resources/documentation/jam"; license = licenses.free; description = "Just Another Make"; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/tools/build-managers/kati/default.nix b/pkgs/development/tools/build-managers/kati/default.nix index 05834565f9310..a7fced4482bed 100644 --- a/pkgs/development/tools/build-managers/kati/default.nix +++ b/pkgs/development/tools/build-managers/kati/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An experimental GNU make clone"; - homepage = https://github.com/google/kati; + homepage = "https://github.com/google/kati"; platforms = platforms.all; license = licenses.asl20; maintainers = with maintainers; [ danielfullmer ]; diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 9538171474d67..713f499ce2b2a 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -44,10 +44,9 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://leiningen.org/; + homepage = "https://leiningen.org/"; description = "Project automation for Clojure"; license = stdenv.lib.licenses.epl10; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/tools/build-managers/mage/default.nix b/pkgs/development/tools/build-managers/mage/default.nix index 37cea6adb1a52..ed145d38c7f74 100644 --- a/pkgs/development/tools/build-managers/mage/default.nix +++ b/pkgs/development/tools/build-managers/mage/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0lazf4r5ps1s04pvz608qaxbrbc6dv0j99n39iv42zwxxh0mbd0p"; }; - modSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; buildFlagsArray = [ "-ldflags=" @@ -27,4 +27,4 @@ buildGoModule rec { maintainers = with maintainers; [ swdunlop ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch index 591927c152852..bd81efd520852 100644 --- a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch +++ b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch @@ -1,25 +1,19 @@ --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py -@@ -375,18 +375,13 @@ - ''' - if option.endswith('dir') and os.path.isabs(value) and \ +@@ -483,7 +483,6 @@ class CoreData: + return value + if option.endswith('dir') and value.is_absolute() and \ option not in builtin_dir_noprefix_options: - # Value must be a subdir of the prefix # commonpath will always return a path in the native format, so we # must use pathlib.PurePath to do the same conversion before # comparing. -- if os.path.commonpath([value, prefix]) != str(PurePath(prefix)): -- m = 'The value of the {!r} option is {!r} which must be a ' \ -- 'subdir of the prefix {!r}.\nNote that if you pass a ' \ -- 'relative path, it is assumed to be a subdir of prefix.' -- raise MesonException(m.format(option, value, prefix)) -- # Convert path to be relative to prefix -- skip = len(prefix) + 1 -- value = value[skip:] -+ if os.path.commonpath([value, prefix]) == str(PurePath(prefix)): -+ # Convert path to be relative to prefix -+ skip = len(prefix) + 1 -+ value = value[skip:] - return value - - def init_builtins(self): +@@ -495,7 +494,7 @@ class CoreData: + try: + value = value.relative_to(prefix) + except ValueError: +- raise MesonException(msg.format(option, value, prefix)) ++ pass + if '..' in str(value): + raise MesonException(msg.format(option, value, prefix)) + return value.as_posix() diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 2930cc79374b3..a2dc1424d65f6 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -3,27 +3,16 @@ , stdenv , writeTextDir , substituteAll -, targetPackages +, pkgsHostHost }: -let - # See https://mesonbuild.com/Reference-tables.html#cpu-families - cpuFamilies = { - aarch64 = "aarch64"; - armv5tel = "arm"; - armv6l = "arm"; - armv7l = "arm"; - i686 = "x86"; - x86_64 = "x86_64"; - }; -in python3Packages.buildPythonApplication rec { pname = "meson"; - version = "0.53.2"; + version = "0.54.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "Po+DDzMYQ5fC6wtlHsUCrbY97LKJeL3ISzVY1xKEwh8="; + sha256 = "L3b7RXJ2K+E+5HkpJhAJG0UJr1eIvM6zkf4iK80Cltw="; }; postFixup = '' @@ -45,6 +34,11 @@ python3Packages.buildPythonApplication rec { # We remove the check so multiple outputs can work sanely. ./allow-dirs-outside-of-prefix.patch + # Meson is currently inspecting fewer variables than autoconf does, which + # makes it harder for us to use setup hooks, etc. Taken from + # https://github.com/mesonbuild/meson/pull/6827 + ./more-env-vars.patch + # Unlike libtool, vanilla Meson does not pass any information # about the path library will be installed to to g-ir-scanner, # breaking the GIR when path other than ${!outputLib}/lib is used. @@ -65,40 +59,20 @@ python3Packages.buildPythonApplication rec { setupHook = ./setup-hook.sh; - crossFile = writeTextDir "cross-file.conf" '' - [binaries] - c = '${targetPackages.stdenv.cc.targetPrefix}cc' - cpp = '${targetPackages.stdenv.cc.targetPrefix}c++' - ar = '${targetPackages.stdenv.cc.bintools.targetPrefix}ar' - strip = '${targetPackages.stdenv.cc.bintools.targetPrefix}strip' - pkgconfig = 'pkg-config' - ld = '${targetPackages.stdenv.cc.targetPrefix}ld' - objcopy = '${targetPackages.stdenv.cc.targetPrefix}objcopy' - - [properties] - needs_exe_wrapper = true - - [host_machine] - system = '${targetPackages.stdenv.targetPlatform.parsed.kernel.name}' - cpu_family = '${cpuFamilies.${targetPackages.stdenv.targetPlatform.parsed.cpu.name}}' - cpu = '${targetPackages.stdenv.targetPlatform.parsed.cpu.name}' - endian = ${if targetPackages.stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} - ''; + # Ensure there will always be a native C compiler when meson is used, as a + # workaround until https://github.com/mesonbuild/meson/pull/6512 lands. + depsHostHostPropagated = [ pkgsHostHost.stdenv.cc ]; # 0.45 update enabled tests but they are failing doCheck = false; # checkInputs = [ ninja pkgconfig ]; # checkPhase = "python ./run_project_tests.py"; - inherit (stdenv) cc; - - isCross = stdenv.targetPlatform != stdenv.hostPlatform; - meta = with lib; { - homepage = https://mesonbuild.com; + homepage = "https://mesonbuild.com"; description = "SCons-like build system that use python as a front-end language and Ninja as a building backend"; license = licenses.asl20; - maintainers = with maintainers; [ jtojnar mbe rasendubi ]; + maintainers = with maintainers; [ jtojnar mbe ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/meson/more-env-vars.patch b/pkgs/development/tools/build-managers/meson/more-env-vars.patch new file mode 100644 index 0000000000000..a8f860f03cc79 --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/more-env-vars.patch @@ -0,0 +1,16 @@ +diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py +index ac13a710..e0d07c51 100644 +--- a/mesonbuild/envconfig.py ++++ b/mesonbuild/envconfig.py +@@ -119,9 +119,9 @@ def get_env_var_pair(for_machine: MachineChoice, + # compiling we fall back on the unprefixed host version. This + # allows native builds to never need to worry about the 'BUILD_*' + # ones. +- ([var_name + '_FOR_BUILD'] if is_cross else [var_name]), ++ [var_name + '_FOR_BUILD'] + ([] if is_cross else [var_name]), + # Always just the unprefixed host verions +- ([] if is_cross else [var_name]), ++ [var_name], + )[for_machine] + for var in candidates: + value = os.environ.get(var) diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh index 8d76ecdaf32ba..3d946fcffd522 100644 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh @@ -5,11 +5,6 @@ mesonConfigurePhase() { mesonFlags="--prefix=$prefix $mesonFlags" fi - # Build release by default. - if [ -n "@isCross@" ]; then - crossMesonFlags="--cross-file=@crossFile@/cross-file.conf" - fi - # See multiple-outputs.sh and meson’s coredata.py mesonFlags="\ --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \ @@ -25,7 +20,7 @@ mesonConfigurePhase() { echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}" - CC=@cc@/bin/cc CXX=@cc@/bin/c++ meson build $mesonFlags "${mesonFlagsArray[@]}" + meson build $mesonFlags "${mesonFlagsArray[@]}" cd build if ! [[ -v enableParallelBuilding ]]; then diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 8444426113271..0e7a4f3d9798e 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "1blar5dxhmxlwxhmq8wv0xvhy200qks6xj12n54qx9d5qp300ncw"; + sha256 = "1s2ndry0mpjs8hy8rrxnyarkzqjz7zzh5h541v3fkzgc9rsd6ifb"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/mk/default.nix b/pkgs/development/tools/build-managers/mk/default.nix index f510752d385aa..09028789daa6f 100644 --- a/pkgs/development/tools/build-managers/mk/default.nix +++ b/pkgs/development/tools/build-managers/mk/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "mk-2006-01-31"; src = fetchurl { - url = http://tarballs.nixos.org/mk-20060131.tar.gz; + url = "http://tarballs.nixos.org/mk-20060131.tar.gz"; sha256 = "0za8dp1211bdp4584xb59liqpww7w1ql0cmlv34p9y928nibcxsr"; }; builder = ./builder.sh; diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix index e9bb3c27df9fa..aea215cc927dd 100644 --- a/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/pkgs/development/tools/build-managers/msbuild/default.nix @@ -124,7 +124,7 @@ EOF meta = with stdenv.lib; { description = "Mono version of Microsoft Build Engine, the build platform for .NET, and Visual Studio"; - homepage = https://github.com/mono/msbuild; + homepage = "https://github.com/mono/msbuild"; license = licenses.mit; maintainers = with maintainers; [ jdanek ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index 9702a1979030e..efe9a49549471 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { input files generated by a higher-level build system, and it is designed to run builds as fast as possible. ''; - homepage = https://ninja-build.org/; + homepage = "https://ninja-build.org/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice bjornfor orivej ]; diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 0649cd7c59572..d4f94c1aed974 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "qbs"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "qbs"; repo = "qbs"; rev = "v${version}"; - sha256 = "0hq2lx5w5lsiy9c69bcps4wyn2sa9s88hj0bq95p93sfiwq6mxlr"; + sha256 = "1kg11s3figpkvgd85p0zk416s57gnvlzrz1isbc2lv13adidf041"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/tools/build-managers/rake/default.nix b/pkgs/development/tools/build-managers/rake/default.nix index 2ce65b28fae58..d2f0a264ba74c 100644 --- a/pkgs/development/tools/build-managers/rake/default.nix +++ b/pkgs/development/tools/build-managers/rake/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A software task management and build automation tool"; - homepage = https://github.com/ruby/rake; + homepage = "https://github.com/ruby/rake"; license = with licenses; mit; maintainers = with maintainers; [ manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix index 6178a7368fc55..1c5996c6b1cf2 100644 --- a/pkgs/development/tools/build-managers/rebar/default.nix +++ b/pkgs/development/tools/build-managers/rebar/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/rebar/rebar; + homepage = "https://github.com/rebar/rebar"; description = "Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases"; longDescription = '' @@ -36,7 +36,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.the-kenny ]; license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 792daba791bb2..5c0fff134a7e5 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/rebar/rebar3; + homepage = "https://github.com/rebar/rebar3"; description = "Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases"; longDescription = '' diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix index ab6f505bff374..79707fc64db55 100644 --- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix +++ b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix @@ -57,7 +57,7 @@ meta = with lib; { description = "Smaller, easier, more powerful, and more reliable than make. An implementation of djb's redo."; - homepage = https://github.com/apenwarr/redo; + homepage = "https://github.com/apenwarr/redo"; maintainers = with maintainers; [ andrewchambers ck3d diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix index 19ce0b44bf72e..d8c6cdf188880 100644 --- a/pkgs/development/tools/build-managers/redo-sh/default.nix +++ b/pkgs/development/tools/build-managers/redo-sh/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Redo implementation in Bourne Shell"; - homepage = http://news.dieweltistgarnichtso.net/bin/redo-sh.html; + homepage = "http://news.dieweltistgarnichtso.net/bin/redo-sh.html"; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ sternenseemann ]; diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/pkgs/development/tools/build-managers/redo/default.nix index 97b82d204ad26..a735a05dc5b80 100644 --- a/pkgs/development/tools/build-managers/redo/default.nix +++ b/pkgs/development/tools/build-managers/redo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://jdebp.eu./Softwares/redo/; + homepage = "https://jdebp.eu./Softwares/redo/"; description = "A system for building target files from source files"; license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.vrthra ]; diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix index 4d43812ebe651..7d44bc74df8a7 100644 --- a/pkgs/development/tools/build-managers/remake/default.nix +++ b/pkgs/development/tools/build-managers/remake/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline ]; meta = { - homepage = http://bashdb.sourceforge.net/remake/; + homepage = "http://bashdb.sourceforge.net/remake/"; license = stdenv.lib.licenses.gpl3; description = "GNU Make with comprehensible tracing and a debugger"; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index 33e8e7cad5d8b..105012d1c8ffc 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = { description = "A more featureful runner for sbt, the simple/scala/standard build tool"; - homepage = https://github.com/paulp/sbt-extras; + homepage = "https://github.com/paulp/sbt-extras"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 2336900bf8561..64a2cedd1c975 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.3.9"; + version = "1.3.10"; src = fetchurl { urls = [ "https://piccolo.link/sbt-${version}.tgz" "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" ]; - sha256 = "06k4dyb5gjnqx70akjfb65hiafh683800bncbq33kmq77arfkm7c"; + sha256 = "1023qcbdbwl40l7mgyd3j0ggr6paz1zs2q787ym52dhrcibhcq1h"; }; patchPhase = '' diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix index 7f0cc8100ac04..53bc057fc131d 100644 --- a/pkgs/development/tools/build-managers/shards/default.nix +++ b/pkgs/development/tools/build-managers/shards/default.nix @@ -1,31 +1,29 @@ -{ stdenv, fetchFromGitHub, crystal, pcre, libyaml, which }: +{ stdenv, fetchFromGitHub, crystal }: -stdenv.mkDerivation rec { +crystal.buildCrystalPackage rec { pname = "shards"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { - owner = "crystal-lang"; - repo = "shards"; - rev = "v${version}"; - sha256 = "19q0xww4v0h5ln9gz8d8zv0c9ig761ik7gw8y31yxynzgzihwpf4"; + owner = "crystal-lang"; + repo = "shards"; + rev = "v${version}"; + sha256 = "1bjy3hcdqq8769bx73f3pwn26rnkj23dngyfbw4iv32bw23x1d49"; }; - buildInputs = [ crystal libyaml pcre which ]; + # we cannot use `make` here as it would introduce a dependency on itself + format = "crystal"; - buildFlags = [ "CRFLAGS=--release" ]; + shardsFile = ./shards.nix; - installPhase = '' - runHook preInstall + crystalBinaries.shards.src = "./src/shards.cr"; - install -Dm755 bin/shards $out/bin/shards - - runHook postInstall - ''; + # tries to execute git which fails spectacularly + doCheck = false; meta = with stdenv.lib; { description = "Dependency manager for the Crystal language"; - license = licenses.asl20; + license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; inherit (crystal.meta) homepage platforms; }; diff --git a/pkgs/development/tools/build-managers/shards/shards.nix b/pkgs/development/tools/build-managers/shards/shards.nix new file mode 100644 index 0000000000000..901b7f6e47d17 --- /dev/null +++ b/pkgs/development/tools/build-managers/shards/shards.nix @@ -0,0 +1,8 @@ +{ + molinillo = { + owner = "crystal-lang"; + repo = "crystal-molinillo"; + rev = "v0.1.0"; + sha256 = "0rs0w59m6ccsgkdxfy3xv6alxsziy9sy9smz71cz0dnyvlzlnaxj"; + }; +} diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index 9b44b30d7775f..709528b2ad30a 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { algorithms to avoid doing unnecessary work. This means you can stay focused on your project rather than on your build system. ''; - homepage = http://gittup.org/tup/; + homepage = "http://gittup.org/tup/"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 4c8fa3f234be4..49aae7c30140f 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "waf"; - version = "2.0.19"; + version = "2.0.20"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; rev = "${pname}-${version}"; - sha256 = "1ydmx20blr776qnmnqp0whyiy81a3glln49m9fva2cmampmandpb"; + sha256 = "1xbd1lmchq9pdrplkr2db28xqafyw753qbhnrfn8pxdg3inxxqvq"; }; buildInputs = [ python ensureNewerSourcesForZipFilesHook ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Meta build system"; - homepage = https://waf.io; + homepage = "https://waf.io"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 7fbb21ffb120a..d033fe52e6c2c 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -1,36 +1,51 @@ -{ stdenv, buildGoPackage, fetchFromGitHub -, gpgme, libgpgerror, lvm2, btrfs-progs, pkg-config, libselinux, libseccomp +{ stdenv +, buildGoModule +, fetchFromGitHub +, installShellFiles +, pkg-config +, gpgme +, lvm2 +, btrfs-progs +, libapparmor +, libselinux +, libseccomp }: -buildGoPackage rec { +buildGoModule rec { pname = "buildah"; - version = "1.14.8"; + version = "1.14.9"; src = fetchFromGitHub { - owner = "containers"; - repo = "buildah"; - rev = "v${version}"; - sha256 = "187cvb3i5cwm7cwxmzpl2ca7900yb6v6b6cybyz5mnd5ccy5ff1q"; + owner = "containers"; + repo = "buildah"; + rev = "v${version}"; + sha256 = "1vp59xp374wr7sbx89aikz4rv8fdg0a40v06saryxww9iqyvk8wp"; }; - outputs = [ "bin" "man" "out" ]; + outputs = [ "out" "man" ]; - goPackagePath = "github.com/containers/buildah"; - excludedPackages = [ "tests" ]; + vendorSha256 = null; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs libselinux libseccomp ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; - patches = [ ./disable-go-module-mode.patch ]; + buildInputs = [ + btrfs-progs + gpgme + libapparmor + libseccomp + libselinux + lvm2 + ]; buildPhase = '' - pushd go/src/${goPackagePath} + patchShebangs . make GIT_COMMIT="unknown" - install -Dm755 buildah $bin/bin/buildah - install -Dm444 contrib/completions/bash/buildah $bin/share/bash-completion/completions/buildah + make -C docs ''; - postBuild = '' + installPhase = '' + install -Dm755 buildah $out/bin/buildah + installShellCompletion --bash contrib/completions/bash/buildah make -C docs install PREFIX="$man" ''; @@ -40,5 +55,6 @@ buildGoPackage rec { changelog = "https://github.com/containers/buildah/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ Profpatsch ] ++ teams.podman.members; + platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/buildah/disable-go-module-mode.patch b/pkgs/development/tools/buildah/disable-go-module-mode.patch deleted file mode 100644 index 86ca9132529f8..0000000000000 --- a/pkgs/development/tools/buildah/disable-go-module-mode.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e2d12e52b3638a320a8d69ea4b392b60f44ea57f Mon Sep 17 00:00:00 2001 -From: Mario Rodas <marsam@users.noreply.github.com> -Date: Wed, 4 Dec 2019 21:07:33 -0500 -Subject: [PATCH] Do not check Go module-mode availability - -Since buildah vendorizes its dependencies we use buildGoPackage which -does not uses Go module-mode. The module-mode check will be true -because nixpkgs uses Go 1.13 by default, and building go modules with -buildGoPackage may lead to inconsistencies. ---- - Makefile | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/Makefile b/Makefile -index 07724ce4..6383646e 100644 ---- a/Makefile -+++ b/Makefile -@@ -15,14 +15,8 @@ BUILDAH := buildah - GO := go - GO110 := 1.10 - GOVERSION := $(findstring $(GO110),$(shell go version)) --# test for go module support --ifeq ($(shell go help mod >/dev/null 2>&1 && echo true), true) --export GO_BUILD=GO111MODULE=on $(GO) build -mod=vendor --export GO_TEST=GO111MODULE=on $(GO) test -mod=vendor --else - export GO_BUILD=$(GO) build - export GO_TEST=$(GO) test --endif - - GIT_COMMIT ?= $(if $(shell git rev-parse --short HEAD),$(shell git rev-parse --short HEAD),$(error "git failed")) - SOURCE_DATE_EPOCH ?= $(if $(shell date +%s),$(shell date +%s),$(error "date failed")) diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix new file mode 100644 index 0000000000000..bdc48bd6b1f7e --- /dev/null +++ b/pkgs/development/tools/buildah/wrapper.nix @@ -0,0 +1,52 @@ +{ buildah-unwrapped +, runCommand +, makeWrapper +, lib +, extraPackages ? [] +, buildah +, runc # Default container runtime +, crun # Container runtime (default with cgroups v2 for podman/buildah) +, conmon # Container runtime monitor +, slirp4netns # User-mode networking for unprivileged namespaces +, fuse-overlayfs # CoW for images, much faster than default vfs +, utillinux # nsenter +, cni-plugins # not added to path +, iptables +}: + +let + buildah = buildah-unwrapped; + + binPath = lib.makeBinPath ([ + runc + crun + conmon + slirp4netns + fuse-overlayfs + utillinux + iptables + ] ++ extraPackages); + +in runCommand buildah.name { + name = "${buildah.pname}-wrapper-${buildah.version}"; + inherit (buildah) pname version; + + meta = builtins.removeAttrs buildah.meta [ "outputsToInstall" ]; + + outputs = [ + "out" + "man" + ]; + + nativeBuildInputs = [ + makeWrapper + ]; + +} '' + ln -s ${buildah.man} $man + + mkdir -p $out/bin + ln -s ${buildah-unwrapped}/share $out/share + makeWrapper ${buildah-unwrapped}/bin/buildah $out/bin/buildah \ + --prefix PATH : ${binPath} +'' diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 5d8d22fbfbb6c..2626ae7194207 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "buildkit"; - version = "0.6.3"; + version = "0.7.1"; goPackagePath = "github.com/moby/buildkit"; subPackages = [ "cmd/buildctl" ] ++ stdenv.lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; @@ -11,14 +11,14 @@ buildGoPackage rec { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "032jq74n9mkw22s4ba9blfmi0hqvk587m5v23xz3sxx2rkg0wlbn"; + sha256 = "048h69ffgmpir2ix9ldi6zrzlwxa5yz3idg5ajspz2dihmzmnwws"; }; buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version}" ]; meta = with stdenv.lib; { description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit"; - homepage = https://github.com/moby/buildkit; + homepage = "https://github.com/moby/buildkit"; license = licenses.asl20; maintainers = with maintainers; [ vdemeester marsam ]; }; diff --git a/pkgs/development/tools/cadre/default.nix b/pkgs/development/tools/cadre/default.nix index 77b49107e165b..17b505bf2a9d1 100644 --- a/pkgs/development/tools/cadre/default.nix +++ b/pkgs/development/tools/cadre/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Toolkit to add Ruby development - in-editor coverage, libnotify of test runs"; - homepage = https://github.com/nyarly/cadre; + homepage = "https://github.com/nyarly/cadre"; license = licenses.mit; maintainers = with maintainers; [ nyarly nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/cargo-flamegraph/default.nix b/pkgs/development/tools/cargo-flamegraph/default.nix index 51cdbcef324bb..08b248dd0f689 100644 --- a/pkgs/development/tools/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/cargo-flamegraph/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-flamegraph"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "flamegraph-rs"; repo = "flamegraph"; rev = "v${version}"; - sha256 = "1avjq36wnm0gd5zkkv1c8hj8j51ah1prlifadjhpaf788rsng9w1"; + sha256 = "0d6k2qr76p93na39j4zbcpc9kaswd806wrqhcwisqxdrcxrjbwhk"; }; - cargoSha256 = "10cw3qgc39id8rzziamvgm5s3yf8vgqrnx9v15dw9miapz88amcy"; + cargoSha256 = "1qz4a1b58j3bv3akqvc3bcgvqq4bi8cbm3gzws6a52dz7ycrgq46"; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; buildInputs = lib.optionals stdenv.isDarwin [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Easy flamegraphs for Rust projects and everything else, without Perl or pipes <3"; - homepage = https://github.com/ferrous-systems/flamegraph; + homepage = "https://github.com/ferrous-systems/flamegraph"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ killercup ]; platforms = platforms.all; diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix index 5b1e91dda2a1b..4e6f8fbc71a7f 100644 --- a/pkgs/development/tools/cargo-web/default.nix +++ b/pkgs/development/tools/cargo-web/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A Cargo subcommand for the client-side Web"; - homepage = https://github.com/koute/cargo-web; + homepage = "https://github.com/koute/cargo-web"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ kevincox ]; platforms = platforms.all; diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix index 8a1d81acaaa79..80786a10f5f19 100644 --- a/pkgs/development/tools/casperjs/default.nix +++ b/pkgs/development/tools/casperjs/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation { syntactic sugar for doing common tasks. ''; - homepage = http://casperjs.org; + homepage = "http://casperjs.org"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; diff --git a/pkgs/development/tools/cbor-diag/default.nix b/pkgs/development/tools/cbor-diag/default.nix index 7942ff526456b..118197af2d1fd 100644 --- a/pkgs/development/tools/cbor-diag/default.nix +++ b/pkgs/development/tools/cbor-diag/default.nix @@ -23,7 +23,7 @@ bundlerApp { meta = with lib; { description = "CBOR diagnostic utilities"; - homepage = https://github.com/cabo/cbor-diag; + homepage = "https://github.com/cabo/cbor-diag"; license = with licenses; asl20; maintainers = with maintainers; [ fdns nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/ccloud-cli/default.nix b/pkgs/development/tools/ccloud-cli/default.nix index 7fa5302977228..abf5845b7e9db 100644 --- a/pkgs/development/tools/ccloud-cli/default.nix +++ b/pkgs/development/tools/ccloud-cli/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Confluent Cloud CLI"; - homepage = https://docs.confluent.io/current/cloud/cli/index.html; + homepage = "https://docs.confluent.io/current/cloud/cli/index.html"; license = licenses.unfree; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/cddl/default.nix b/pkgs/development/tools/cddl/default.nix index 60e7edc752007..8fdae4b1c441b 100644 --- a/pkgs/development/tools/cddl/default.nix +++ b/pkgs/development/tools/cddl/default.nix @@ -10,7 +10,7 @@ bundlerApp { meta = with lib; { description = "A parser, generator, and validator for CDDL"; - homepage = https://rubygems.org/gems/cddl; + homepage = "https://rubygems.org/gems/cddl"; license = with licenses; mit; maintainers = with maintainers; [ fdns nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/check/default.nix b/pkgs/development/tools/check/default.nix index 9ae1026c8583f..107b8b58024ab 100644 --- a/pkgs/development/tools/check/default.nix +++ b/pkgs/development/tools/check/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { meta = with lib; { description = "A set of utilities for checking Go sources."; - homepage = https://gitlab.com/opennota/check; + homepage = "https://gitlab.com/opennota/check"; license = licenses.gpl3; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index 7f52dec229a29..1a5f6c8626ade 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -12,7 +12,7 @@ bundlerEnv { meta = with lib; { description = "A streamlined development and deployment workflow for Chef platform"; - homepage = https://downloads.chef.io/chef-dk/; + homepage = "https://downloads.chef.io/chef-dk/"; license = licenses.asl20; maintainers = with maintainers; [ offline nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix index 9859739a1dfd2..c7a8483719fbd 100644 --- a/pkgs/development/tools/chit/default.nix +++ b/pkgs/development/tools/chit/default.nix @@ -36,7 +36,7 @@ buildRustPackage rec { * Should i use this crate? * How mature is it? ''; - homepage = https://github.com/peterheesterman/chit; + homepage = "https://github.com/peterheesterman/chit"; license = licenses.mit; maintainers = [ maintainers.lilyball ]; platforms = platforms.all; diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 163bfeb688a10..b809d550097ee 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec{ pname = "clj-kondo"; - version = "2020.03.20"; + version = "2020.04.05"; reflectionJson = fetchurl { name = "reflection.json"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec{ src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "05z80cdzk8aw3j0nxfynzwpb9hhpbl54bbrv18dpqj5dj893mbgm"; + sha256 = "0k9samcqkpkdgzbzr2bpixf75987lsabh97101v1fg12qvjhf187"; }; dontUnpack = true; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec{ meta = with lib; { description = "A linter for Clojure code that sparks joy."; - homepage = https://github.com/borkdude/clj-kondo; + homepage = "https://github.com/borkdude/clj-kondo"; license = licenses.epl10; platforms = graalvm8.meta.platforms; maintainers = with maintainers; [ jlesquembre bandresen ]; diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index 23c0fc06b6ace..6d843ead24e02 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/pkgs/development/tools/clog-cli/default.nix @@ -17,7 +17,7 @@ buildRustPackage rec { meta = { description = "Generate changelogs from local git metadata"; - homepage = https://github.com/clog-tool/clog-cli; + homepage = "https://github.com/clog-tool/clog-cli"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [stdenv.lib.maintainers.nthorne]; diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index f452b24cf079c..6e070f3cc5f26 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "cloud-nuke"; - version = "0.1.7"; + version = "0.1.18"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "054z6v13x55x9l5xnixxxszj8k2wa09b5ld2wq4gm4hc273s2m4k"; + sha256 = "1amk9bjrc9svvgllif2vr6xx7kc3xmwjbyb8prnm5zp82hymk5f1"; }; goPackagePath = "github.com/gruntwork-io/cloud-nuke"; diff --git a/pkgs/development/tools/cloud-nuke/deps.nix b/pkgs/development/tools/cloud-nuke/deps.nix index ffd50762ee2ed..c354bd985fd33 100644 --- a/pkgs/development/tools/cloud-nuke/deps.nix +++ b/pkgs/development/tools/cloud-nuke/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "180cc10e5ff368b86dee226b034af7d1672baec6"; - sha256 = "0xphkjqhcn8zq7gali0v32kq2xpbnnw1g7r5vr5p763q2z5c436w"; + rev = "1f4898f67806740d2a91c9dfe9a8be8a61523eb4"; + sha256 = "1znjv4irzqxwizdp3dxgb5w9x06xjs79a3s68afzrblz97kf94kc"; }; } { @@ -19,6 +19,15 @@ }; } { + goPackagePath = "github.com/boombuler/barcode"; + fetch = { + type = "git"; + url = "https://github.com/boombuler/barcode"; + rev = "3cfea5ab600ae37946be2b763b8ec2c1cf2d272d"; + sha256 = "1fzb8wz1ny2sc78g9rm0bcm80pgwvkm2k6lmim2sb4jgm1j3sajd"; + }; + } + { goPackagePath = "github.com/davecgh/go-spew"; fetch = { type = "git"; @@ -46,6 +55,33 @@ }; } { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "72cd26f257d44c1114970e19afddcd812016007e"; + sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; + }; + } + { + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "b48cb6623c04dae64c28537143aca42d16561daf"; + sha256 = "1zb4n285mv85dh3y2f8fqbs30h2dhzw7vbczr6z0zg2gqr6vzg0q"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "064e2069ce9c359c118179501254f67d7d37ba24"; + sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb"; + }; + } + { goPackagePath = "github.com/gruntwork-io/gruntwork-cli"; fetch = { type = "git"; @@ -55,12 +91,21 @@ }; } { + goPackagePath = "github.com/gruntwork-io/terratest"; + fetch = { + type = "git"; + url = "https://github.com/gruntwork-io/terratest"; + rev = "bd5fdfc1564ec40a149a6e579d6ca20ebf2eaca4"; + sha256 = "1vbipykcwhmzs2qxfxdnq3gdi3i5ds6pykjjxqw3f1llad2dihby"; + }; + } + { goPackagePath = "github.com/jmespath/go-jmespath"; fetch = { type = "git"; url = "https://github.com/jmespath/go-jmespath"; - rev = "0b12d6b5"; - sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + rev = "c2b33e84"; + sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; }; } { @@ -91,6 +136,15 @@ }; } { + goPackagePath = "github.com/pquerna/otp"; + fetch = { + type = "git"; + url = "https://github.com/pquerna/otp"; + rev = "43bebefda392017900e7a7b237b4c914c6a55b50"; + sha256 = "088njs8i7b0syyz20hzd3lcjxy61chc518d71lvykw2g9c9wsc7l"; + }; + } + { goPackagePath = "github.com/sirupsen/logrus"; fetch = { type = "git"; @@ -104,8 +158,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c"; - sha256 = "178xyfgsbs40jq406aqj0r67ik1b81gdc28z45nbcw6hfhz82rvl"; + rev = "3ebf1ddaeb260c4b1ae502a01c7844fa8c1fa0e9"; + sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; }; } { @@ -127,6 +181,15 @@ }; } { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "ca1201d0de80cfde86cb01aea620983605dfe99b"; + sha256 = "16j9xyby1vfl4ch6wqzafxxxnxvcp8vhzknpchwabci1f2zcsn6i"; + }; + } + { goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; @@ -135,4 +198,22 @@ sha256 = "0gj9nwryyzf9rn33gl3zm6rxvg1zhrhwi36akipqj37x4g86h3gz"; }; } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880"; + sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "53403b58ad1b561927d19068c655246f2db79d48"; + sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; + }; + } ] \ No newline at end of file diff --git a/pkgs/development/tools/cloudflare-wrangler/default.nix b/pkgs/development/tools/cloudflare-wrangler/default.nix index 5a05b7ca7c0a7..623afc3e7431b 100644 --- a/pkgs/development/tools/cloudflare-wrangler/default.nix +++ b/pkgs/development/tools/cloudflare-wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cloudflare-wrangler"; - version = "1.8.4"; + version = "1.9.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "wrangler"; rev = "v${version}"; - sha256 = "1lllam0zgr26fbg04hnw1sy35grwrs4br8cx4r9vqjf113cyr80x"; + sha256 = "09rq6lnv9993ah49jxqaqqhv5xxj51gxlqdi99wkj217cxp9gqqn"; }; - cargoSha256 = "0yvnqp15iqv142vcgsmcad07r5nnp417c0iqa9qgyzn39ssgpn0r"; + cargoSha256 = "0vlb1g4pki84n2zf6w3bisa7jpv0ws8nb3lgr0bkjrirf60a9xsk"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix index be39f6e36677e..1fa45a32c05fe 100644 --- a/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "cloudfoundry-cli"; @@ -15,6 +15,8 @@ buildGoPackage rec { sha256 = "0dqrkimwhw016icgyf4cyipzy6vdz5jgickm33xxd9018dh3ibwq"; }; + nativeBuildInputs = [ installShellFiles ]; + makeTarget = let hps = stdenv.hostPlatform.system; in if hps == "x86_64-darwin" then "out/cf-cli_osx" @@ -32,13 +34,13 @@ buildGoPackage rec { ''; installPhase = '' - install -Dm555 out/cf "$bin/bin/cf" - install -Dm444 -t "$bin/share/bash-completion/completions/" "$src/ci/installers/completion/cf" + install -Dm555 out/cf "$out/bin/cf" + installShellCompletion --bash "$src/ci/installers/completion/cf" ''; meta = with stdenv.lib; { description = "The official command line client for Cloud Foundry"; - homepage = https://github.com/cloudfoundry/cli; + homepage = "https://github.com/cloudfoundry/cli"; maintainers = with maintainers; [ ris ]; license = licenses.asl20; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/tools/cmake-format/default.nix b/pkgs/development/tools/cmake-format/default.nix index cdf15f3ad7070..394dc7b2f514d 100644 --- a/pkgs/development/tools/cmake-format/default.nix +++ b/pkgs/development/tools/cmake-format/default.nix @@ -10,12 +10,12 @@ buildPythonApplication rec { pname = "cmake-format"; - version = "0.6.9"; + version = "0.6.10"; src = fetchPypi { inherit version; pname = "cmake_format"; - sha256 = "082d7949gsk5v72ap7k4p3vgmc126a0bfm195xpi4lb6khpbzy5j"; + sha256 = "14ypplkjah4hcb1ad8978xip4vvzxy1nkysvyi1wn9b24cbfzw42"; }; propagatedBuildInputs = [ autopep8 flake8 jinja2 pylint pyyaml ]; diff --git a/pkgs/development/tools/compass/default.nix b/pkgs/development/tools/compass/default.nix index 516900c206766..f8a2aad14f45e 100644 --- a/pkgs/development/tools/compass/default.nix +++ b/pkgs/development/tools/compass/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Stylesheet Authoring Environment that makes your website design simpler to implement and easier to maintain"; - homepage = https://github.com/Compass/compass; + homepage = "https://github.com/Compass/compass"; license = with licenses; mit; maintainers = with maintainers; [ offline manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 133526c569a08..eb55bf5dd4c4f 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "conftest"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "instrumenta"; repo = "conftest"; rev = "v${version}"; - sha256 = "0ial1zs5aqcwza813ny6zqn9ybq6ibrqjmaccwbbam1k9f5rplqv"; + sha256 = "15xzldcmnpfg1hd5zr5i7x2zjrgkwnp4nylxbn9kfic2dpjp1a38"; }; - modSha256 = "17j5fhgwfpyg9r7a5g9rmvkaz510xx9s4mbl1cmyzysvddc6f5wp"; + vendorSha256 = "1kay7b5rxypj4i0d2iwdlb1mj0qq3zvlrjp34zzv5kywz5gy4144"; buildFlagsArray = '' -ldflags= @@ -25,4 +25,4 @@ buildGoModule rec { maintainers = with maintainers; [ yurrriq ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix index 9aaf886ef0672..005c5d55b79db 100644 --- a/pkgs/development/tools/container-linux-config-transpiler/default.nix +++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix @@ -20,14 +20,14 @@ buildGoPackage rec { ''; postInstall = '' - mv $bin/bin/{internal,ct} - rm $bin/bin/tools + mv $out/bin/{internal,ct} + rm $out/bin/tools ''; meta = { description = "Convert a Container Linux Config into Ignition"; license = licenses.asl20; - homepage = https://github.com/coreos/container-linux-config-transpiler; + homepage = "https://github.com/coreos/container-linux-config-transpiler"; maintainers = with maintainers; [elijahcaine]; platforms = with platforms; unix; }; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 7e86c93b9bd6e..ceaa704b565c6 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -24,10 +24,10 @@ buildGoPackage rec { postInstall = '' # Fix binary name - mv $bin/bin/{agent,buildkite-agent} + mv $out/bin/{agent,buildkite-agent} # These are runtime dependencies - wrapProgram $bin/bin/buildkite-agent \ + wrapProgram $out/bin/buildkite-agent \ --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' ''; @@ -40,7 +40,7 @@ buildGoPackage rec { build jobs, reporting back the status code and output log of the job, and uploading the job's artifacts. ''; - homepage = https://buildkite.com/docs/agent; + homepage = "https://buildkite.com/docs/agent"; license = licenses.mit; maintainers = with maintainers; [ pawelpacana zimbatm rvl ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix index d9f7237d28975..3917820145612 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix @@ -15,17 +15,17 @@ buildGoPackage { postInstall = '' ${stdenv.lib.optionalString hasBootstrapScript '' # Install bootstrap.sh - mkdir -p $bin/libexec/buildkite-agent - cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $bin/libexec/buildkite-agent - sed -e "s|#!/bin/bash|#!${bash}/bin/bash|g" -i $bin/libexec/buildkite-agent/bootstrap.sh + mkdir -p $out/libexec/buildkite-agent + cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $out/libexec/buildkite-agent + sed -e "s|#!/bin/bash|#!${bash}/bin/bash|g" -i $out/libexec/buildkite-agent/bootstrap.sh ''} # Fix binary name - mv $bin/bin/{agent,buildkite-agent} + mv $out/bin/{agent,buildkite-agent} # These are runtime dependencies - wrapProgram $bin/bin/buildkite-agent \ - ${stdenv.lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $bin/libexec/buildkite-agent/bootstrap.sh"} \ + wrapProgram $out/bin/buildkite-agent \ + ${stdenv.lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $out/libexec/buildkite-agent/bootstrap.sh"} \ --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' ''; @@ -38,7 +38,7 @@ buildGoPackage { build jobs, reporting back the status code and output log of the job, and uploading the job's artifacts. ''; - homepage = https://buildkite.com/docs/agent; + homepage = "https://buildkite.com/docs/agent"; license = licenses.mit; maintainers = with maintainers; [ pawelpacana zimbatm rvl ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index a3df81d260532..bbd2c2f193586 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -7,7 +7,7 @@ in buildGoModule rec { revision = "v${version}"; goPackagePath = "github.com/drone/drone-cli"; - modSha256 = "0g0vq4vm2hy00r2gjsrhg57xv9sldlqix3wzimiqdli085bcz46b"; + vendorSha256 = "1zzx5yy0pp0c8pias4sfxfvdzhhrff9f8j51qf6dkif99xwdq3hb"; preBuild = '' buildFlagsArray+=("-ldflags" "-X main.version=${version}") @@ -25,4 +25,4 @@ in buildGoModule rec { license = licenses.asl20; description = "Command line client for the Drone continuous integration server."; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 05257f65af520..54b801da0756f 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { version = "1.6.5"; goPackagePath = "github.com/drone/drone"; - modSha256 = "1fyb9218s52w8c6c3v6rgivbyzy5hz4q4z8r75ng2yrmjmmiv2gr"; + vendorSha256 = "1dvf8vz3jr9smki3jql0kvd8z8rwdq93y7blbr2yjjfsdvx6lxl1"; src = fetchFromGitHub { owner = "drone"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; description = "Continuous Integration platform built on container technology"; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 483b8e6b30c49..3bf48084bbd8d 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -1,17 +1,17 @@ -{ buildGoModule, fetchFromGitHub, lib, writeText }: +{ buildGoModule, fetchFromGitHub, stdenv, lib, writeText }: buildGoModule rec { pname = "fly"; - version = "6.0.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "0chavwymyh5kv4fkvdjvf3p5jjx4yn9aavq66333xnsl5pn7q9dq"; + sha256 = "14sm3xwhm6pfln18i9f9dyj7s2wcri43rxj4s1cja7nwqr5sqb3x"; }; - modSha256 = "1wiyfii4rmj3rp8ls0ill0sjpnpjz7l3q5fzrscm8ap1qn90gvzg"; + vendorSha256 = "1c099sn5rrvj805va1lyjlbv7i2g1z5bxyaisv5l9365z0lv1cwm"; subPackages = [ "fly" ]; @@ -20,12 +20,10 @@ buildGoModule rec { -X github.com/concourse/concourse.Version=${version} ''; - # The fly.bash file included with this derivation can be replaced by a - # call to `fly completion bash` once the `completion` subcommand has - # made it into a release. Similarly, `fly completion zsh` will provide - # zsh completions. https://github.com/concourse/concourse/pull/4012 - postInstall = '' - install -D -m 444 ${./fly.bash} $out/share/bash-completion/completions/fly + postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + mkdir -p $out/share/{bash-completion/completions,zsh/site-functions} + $out/bin/fly completion --shell bash > $out/share/bash-completion/completions/fly + $out/bin/fly completion --shell zsh > $out/share/zsh/site-functions/_fly ''; meta = with lib; { diff --git a/pkgs/development/tools/continuous-integration/fly/fly.bash b/pkgs/development/tools/continuous-integration/fly/fly.bash deleted file mode 100644 index a9acc5f70a400..0000000000000 --- a/pkgs/development/tools/continuous-integration/fly/fly.bash +++ /dev/null @@ -1,10 +0,0 @@ -# credits: -# https://godoc.org/github.com/jessevdk/go-flags#hdr-Completion -# https://github.com/concourse/concourse/issues/1309#issuecomment-452893900 -_fly_compl() { - args=("${COMP_WORDS[@]:1:$COMP_CWORD}") - local IFS=$'\n' - COMPREPLY=($(GO_FLAGS_COMPLETION=1 ${COMP_WORDS[0]} "${args[@]}")) - return 0 -} -complete -F _fly_compl fly diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index df1cef6f3f84f..4aadb98108152 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "12.9.0"; + version = "12.10.2"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0kd4zc9rgzsl6imk9vi2yqpaxrgy8ywcz2vvpsfzrhhmm2yx3qh0"; + sha256 = "1lw0f3svzsvcw1rkc8z60nrl2jqjj8ciqlw5icazf6ikqbqmf660"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "13xwcvw6m3p5ffas5mr55jkqks9s3f7qg1b928vcxkx57j06kb22"; + sha256 = "1hawdihnwk9p06fa3ym5q6b4sv6pp9095nimdy5myi6y88yj1rv2"; }; in buildGoPackage rec { @@ -29,22 +29,22 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0p9i4z0xsq5rl6gkqjpwpz6hb57vi6wl969gncrsfskjjc1kcifq"; + sha256 = "1r82xj4krdd51540bhr2wjhp6sdr5c2favnnw8nl26vnmwiqpd3k"; }; patches = [ ./fix-shell-path.patch ]; postInstall = '' - touch $bin/bin/hello - install -d $bin/bin/helper-images - ln -sf ${docker_x86_64} $bin/bin/helper-images/prebuilt-x86_64.tar.xz - ln -sf ${docker_arm} $bin/bin/helper-images/prebuilt-arm.tar.xz + touch $out/bin/hello + install -d $out/bin/helper-images + ln -sf ${docker_x86_64} $out/bin/helper-images/prebuilt-x86_64.tar.xz + ln -sf ${docker_arm} $out/bin/helper-images/prebuilt-arm.tar.xz ''; meta = with lib; { description = "GitLab Runner the continuous integration executor of GitLab"; license = licenses.mit; - homepage = https://about.gitlab.com/gitlab-ci/; + homepage = "https://about.gitlab.com/gitlab-ci/"; platforms = platforms.unix ++ platforms.darwin; maintainers = with maintainers; [ bachp zimbatm globin ]; }; diff --git a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix index adee52d967eab..7cefd896f4816 100644 --- a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { description = "A continuous delivery server specializing in advanced workflow modeling and visualization"; - homepage = http://www.go.cd; + homepage = "http://www.go.cd"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ grahamc swarren83 ]; diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/development/tools/continuous-integration/gocd-server/default.nix index c0fabdeb5a166..d23bc9d8d8e9e 100644 --- a/pkgs/development/tools/continuous-integration/gocd-server/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-server/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A continuous delivery server specializing in advanced workflow modeling and visualization"; - homepage = http://www.go.cd; + homepage = "http://www.go.cd"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ grahamc swarren83 ]; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index ec02cb26b8e35..c40572a4f2aab 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.222.1"; + version = "2.222.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0glmx8xi99mbfr84hi4sn36qkxw00rfn8wlz5n674ygbdj1vnv2s"; + sha256 = "1087rih5cb4ici538rcgkrfhcqckbs9i2mpzd59zcx4yw91dca8m"; }; buildCommand = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An extendable open source continuous integration server"; - homepage = https://jenkins-ci.org; + homepage = "https://jenkins-ci.org"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ coconnor fpletz earldouglas ]; diff --git a/pkgs/development/tools/corgi/default.nix b/pkgs/development/tools/corgi/default.nix index b7772dd659fa6..2dcc68a09f2e0 100644 --- a/pkgs/development/tools/corgi/default.nix +++ b/pkgs/development/tools/corgi/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { longDescription = '' Corgi is a command-line tool that helps with your repetitive command usages by organizing them into reusable snippet. ''; - homepage = https://github.com/DrakeW/corgi; + homepage = "https://github.com/DrakeW/corgi"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/development/tools/corundum/default.nix b/pkgs/development/tools/corundum/default.nix index 0d1c69856631f..3497f7099642a 100644 --- a/pkgs/development/tools/corundum/default.nix +++ b/pkgs/development/tools/corundum/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Tool and libraries for maintaining Ruby gems."; - homepage = https://github.com/nyarly/corundum; + homepage = "https://github.com/nyarly/corundum"; license = licenses.mit; maintainers = with maintainers; [ nyarly nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 41303439d76b3..b54a831e9556a 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.0.0-RC6-4"; + version = "2.0.0-RC6-18"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "0i8jvs5l7f2xzkdlxk784mx5h86hq7xh5ffzb4zalczw9bzmmds1"; + sha256 = "0vym99fyn0g8l5y2zvhf73ww17wywrh503wg5aw4nilj8w1ncvn2"; }; nativeBuildInputs = [ makeWrapper ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://get-coursier.io/; + homepage = "https://get-coursier.io/"; description = "A Scala library to fetch dependencies from Maven / Ivy repositories"; license = licenses.asl20; maintainers = with maintainers; [ adelbertc nequissimus ]; diff --git a/pkgs/development/tools/cppclean/default.nix b/pkgs/development/tools/cppclean/default.nix index 85d49667a9af5..283d9845dfaaf 100644 --- a/pkgs/development/tools/cppclean/default.nix +++ b/pkgs/development/tools/cppclean/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Finds problems in C++ source that slow development of large code bases"; - homepage = https://github.com/myint/cppclean; + homepage = "https://github.com/myint/cppclean"; license = licenses.asl20; maintainers = with maintainers; [ nthorne ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/cucumber/default.nix b/pkgs/development/tools/cucumber/default.nix index 15db6013debca..fdd77be07f7fc 100644 --- a/pkgs/development/tools/cucumber/default.nix +++ b/pkgs/development/tools/cucumber/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A tool for executable specifications"; - homepage = https://cucumber.io/; + homepage = "https://cucumber.io/"; license = with licenses; mit; maintainers = with maintainers; [ manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 98bf5249b6263..d106ca3ef4497 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cue"; - version = "0.0.15"; + version = "0.1.2"; src = fetchgit { url = "https://cue.googlesource.com/cue"; rev = "v${version}"; - sha256 = "0mipzci2zjp6yh4lxg9jrdxn03ska188zg3jl6g1zr8rn0ry274h"; + sha256 = "0pmw7gnh4z5sbri8464rpwp3hbrz23zwig82nk9wdjkg1qahyy13"; }; - modSha256 = "04dapx75zwi8cv1pj3c6266znrhwihv3df4izm3gjk34r2i07q6s"; + vendorSha256 = "12w2rxp0s3i1ck0qvp2dkg9kk6pyymycdfnfxggcyg4fjshh8afg"; subPackages = [ "cmd/cue" ]; diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index efc20b6972be2..ccf7a699dae85 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -2,22 +2,22 @@ buildGoModule rec { pname = "dbmate"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "0jvizj616rsh3aw9z3bijk7ixpbnqmm3xqmdxznjzqd46avr54c3"; + sha256 = "16grd03r41n0vj5fs7j6jk395zs2q0i878p9nh1ycicy64nzmxky"; }; - modSha256 = "12x3m5bjyx3blh5i51pd99phv73m96pmm6i3ir4vf2kms3viif9i"; + vendorSha256 = "1915h1hi2y2sx5jvx84c1j281zaz100gbhyalvg5jqjr1van5s4d"; meta = with stdenv.lib; { description = "Database migration tool"; - homepage = https://github.com/amacneil/dbmate; + homepage = "https://github.com/amacneil/dbmate"; license = licenses.mit; maintainers = [ maintainers.manveru ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/development/tools/database/ephemeralpg/default.nix index ae511824569e8..53f3c1df628d3 100644 --- a/pkgs/development/tools/database/ephemeralpg/default.nix +++ b/pkgs/development/tools/database/ephemeralpg/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, postgresql, getopt, makeWrapper }: stdenv.mkDerivation rec { pname = "ephemeralpg"; - version = "2.9"; + version = "3.0"; src = fetchurl { url = "http://ephemeralpg.org/code/${pname}-${version}.tar.gz"; - sha256 = "1ghp3kya4lxvfwz3c022cx9vqf55jbf9sjw60bxjcb5sszklyc89"; + sha256 = "1j0g7g114ma7y7sadbng5p1ss1zsm9zpicm77qspym6565733vvh"; }; buildInputs = [ makeWrapper ]; installPhase = '' @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''Run tests on an isolated, temporary PostgreSQL database.''; license = licenses.isc; - homepage = http://ephemeralpg.org/; + homepage = "http://ephemeralpg.org/"; platforms = platforms.all; maintainers = with maintainers; [ hrdinka ]; }; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index d66d54ef45bbd..a92c96684a48c 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.8.8"; + version = "3.9.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1pl9wgnwykvbnis0ndym0lbsj6a7lvpghrc98cw2hdnp5dglxjjl"; + sha256 = "0qasiggaxix3gmmvax00k83q4pd1c1b5wx8ayyplaszkgr9advb8"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix index fada7fd1e074f..17f7e2c7e4928 100644 --- a/pkgs/development/tools/database/litecli/default.nix +++ b/pkgs/development/tools/database/litecli/default.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec { longDescription = '' A command-line client for SQLite databases that has auto-completion and syntax highlighting. ''; - homepage = https://litecli.com; + homepage = "https://litecli.com"; license = licenses.bsd3; maintainers = with maintainers; [ Scriptkiddi ]; }; diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index 4038ad7010f6f..b6d7f65896e87 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "pgcli"; - version = "2.2.0"; + version = "3.0.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "54138a31e6736a34c63b84a6d134c9292c9a73543cc0f66e80a0aaf79259d39b"; + sha256 = "10j01bd031fys1vcihibsi5rrfd8w1kgahpcsbk4l07871c24829"; }; propagatedBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonApplication rec { Rich command-line interface for PostgreSQL with auto-completion and syntax highlighting. ''; - homepage = https://pgcli.com; + homepage = "https://pgcli.com"; license = licenses.bsd3; maintainers = with maintainers; [ dywedir ]; }; diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix index a83b5a2194401..c86a0f6df8bd1 100644 --- a/pkgs/development/tools/database/pyrseas/default.nix +++ b/pkgs/development/tools/database/pyrseas/default.nix @@ -38,7 +38,7 @@ pythonPackages.buildPythonApplication { ]; meta = { description = "A declarative language to describe PostgreSQL databases"; - homepage = https://perseas.github.io/; + homepage = "https://perseas.github.io/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ pmeunier ]; }; diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 38be9089559f5..1e40bc52b4f7c 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -76,7 +76,7 @@ in a reports interface, a complete data modeling solution, and a migration platform for moving your 3rd party databases to Oracle. ''; - homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/; + homepage = "http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ ardumont ma27 ]; diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 3a4425d436a6e..f8a8ee70e9d63 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { meta = with lib; { description = "DB Browser for SQLite"; - homepage = https://sqlitebrowser.org/; + homepage = "https://sqlitebrowser.org/"; license = licenses.gpl3; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index 717dc2d795199..924a82bfd85ea 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -5,14 +5,14 @@ , drivers ? [] }: let - version = "4.0.0"; + version = "4.1.0"; in stdenv.mkDerivation rec { pname = "squirrel-sql"; inherit version; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "06njdp2248zxm7zlcpyawx1s7j6hffp5a9mwam3cb53gsmzcz126"; + sha256 = "0ni7cva0acrin5bkcfkiiv28sf58dzz7xsbl3y4536hmph0g68k6"; }; nativeBuildInputs = [ makeWrapper unzip ]; @@ -71,7 +71,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Universal SQL Client"; - homepage = http://squirrel-sql.sourceforge.net/; + homepage = "http://squirrel-sql.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ khumba ]; diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix index 3c9f9c54dd396..166cda52a3d9b 100644 --- a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix +++ b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Bulk, parallel insert of CSV records into PostgreSQL"; - homepage = https://github.com/timescale/timescaledb-parallel-copy; + homepage = "https://github.com/timescale/timescaledb-parallel-copy"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix index 9dd923173733c..da5ba3fea64db 100644 --- a/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A tool for tuning your TimescaleDB for better performance"; - homepage = https://github.com/timescale/timescaledb-tune; + homepage = "https://github.com/timescale/timescaledb-tune"; license = licenses.asl20; maintainers = with maintainers; [ marsam ]; }; diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/development/tools/dcadec/default.nix index 685b9d2f13d5a..55f888056cf72 100644 --- a/pkgs/development/tools/dcadec/default.nix +++ b/pkgs/development/tools/dcadec/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "DTS Coherent Acoustics decoder with support for HD extensions"; maintainers = with maintainers; [ edwtjo ]; - homepage = https://github.com/foo86/dcadec; + homepage = "https://github.com/foo86/dcadec"; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/deadcode/default.nix b/pkgs/development/tools/deadcode/default.nix index 7d106e5a2516f..44c824b2c1e92 100644 --- a/pkgs/development/tools/deadcode/default.nix +++ b/pkgs/development/tools/deadcode/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { meta = with lib; { description = "deadcode is a very simple utility which detects unused declarations in a Go package."; - homepage = https://github.com/remyoudompheng/go-misc/tree/master/deadcode; + homepage = "https://github.com/remyoudompheng/go-misc/tree/master/deadcode"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index db232561add08..9e45d5988cc3f 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -9,8 +9,8 @@ buildGoPackage rec { subPackages = [ "client" ]; postInstall = '' - if [ -f "$bin/bin/client" ]; then - mv "$bin/bin/client" "$bin/bin/deis" + if [ -f "$out/bin/client" ]; then + mv "$out/bin/client" "$out/bin/deis" fi ''; @@ -26,7 +26,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - homepage = https://deis.io; + homepage = "https://deis.io"; description = "A command line utility used to interact with the Deis open source PaaS."; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/tools/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix index a344bcf91d833..057a8b87a0f6b 100644 --- a/pkgs/development/tools/deisctl/default.nix +++ b/pkgs/development/tools/deisctl/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - homepage = https://deis.io; + homepage = "https://deis.io"; description = "A command-line utility used to provision and operate a Deis cluster."; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index fc38f3edb47ac..33eda13b6044a 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "debugger for the Go programming language"; - homepage = https://github.com/derekparker/delve; + homepage = "https://github.com/derekparker/delve"; maintainers = with maintainers; [ vdemeester ]; license = licenses.mit; platforms = [ "x86_64-linux" ] ++ platforms.darwin; diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix index d807e79f9edf9..8d7f3b213caf5 100644 --- a/pkgs/development/tools/dep/default.nix +++ b/pkgs/development/tools/dep/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}"); meta = with stdenv.lib; { - homepage = https://github.com/golang/dep; + homepage = "https://github.com/golang/dep"; description = "Go dependency management tool"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/tools/dep2nix/default.nix b/pkgs/development/tools/dep2nix/default.nix index dcdb1053cf72d..9d14f7c1c1e33 100644 --- a/pkgs/development/tools/dep2nix/default.nix +++ b/pkgs/development/tools/dep2nix/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { ]; postFixup = '' - wrapProgram $bin/bin/dep2nix \ + wrapProgram $out/bin/dep2nix \ --prefix PATH : ${nix-prefetch-scripts}/bin ''; @@ -28,7 +28,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Convert `Gopkg.lock` files from golang dep into `deps.nix`"; license = licenses.bsd3; - homepage = https://github.com/nixcloud/dep2nix; + homepage = "https://github.com/nixcloud/dep2nix"; maintainers = [ maintainers.mic92 ]; }; } diff --git a/pkgs/development/tools/detect-secrets/default.nix b/pkgs/development/tools/detect-secrets/default.nix index 6e9e1596b131f..1e42a32f7caaa 100644 --- a/pkgs/development/tools/detect-secrets/default.nix +++ b/pkgs/development/tools/detect-secrets/default.nix @@ -27,7 +27,7 @@ buildPythonApplication rec { meta = with lib; { description = "An enterprise friendly way of detecting and preventing secrets in code"; - homepage = https://github.com/Yelp/detect-secrets; + homepage = "https://github.com/Yelp/detect-secrets"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/tools/devd/default.nix b/pkgs/development/tools/devd/default.nix index f3e63c5378974..1e48ecde7638a 100644 --- a/pkgs/development/tools/devd/default.nix +++ b/pkgs/development/tools/devd/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { description = "A local webserver for developers"; - homepage = https://github.com/cortesi/devd; + homepage = "https://github.com/cortesi/devd"; license = licenses.mit; maintainers = with maintainers; [ brianhicks ]; platforms = platforms.all; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index dc105a846876d..50cc41cd50ffb 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -62,7 +62,7 @@ buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; meta = with stdenv.lib; { - homepage = http://doc.devpi.net; + homepage = "http://doc.devpi.net"; description = "Client for devpi, a pypi index server and packaging meta tool"; license = licenses.mit; maintainers = with maintainers; [ lewo makefu ]; diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 4c8d0276d1ad5..59a4a6d003005 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with stdenv.lib;{ - homepage = http://doc.devpi.net; + homepage = "http://doc.devpi.net"; description = "Github-style pypi index server and packaging meta tool"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/development/tools/devtodo/default.nix index 4396f2953405e..f4a974da34762 100644 --- a/pkgs/development/tools/devtodo/default.nix +++ b/pkgs/development/tools/devtodo/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://swapoff.org/devtodo1.html; + homepage = "https://swapoff.org/devtodo1.html"; description = "A hierarchical command-line task manager"; license = licenses.gpl2; maintainers = [ maintainers.woffs ]; diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index 5c59703af3e70..6eac1af512b31 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -69,7 +69,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Database tool for working with Rust projects that use Diesel"; - homepage = https://github.com/diesel-rs/diesel/tree/master/diesel_cli; + homepage = "https://github.com/diesel-rs/diesel/tree/master/diesel_cli"; license = with licenses; [ mit asl20 ]; platforms = platforms.all; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index 5d4de99ffdbfb..b48d7425b1400 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/pkgs/development/tools/dive/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1v69xbkjmyzm5g4wi9amjk65fs4qgxkqc0dvq55vqjigzrranp22"; }; - modSha256 = "1y8mqxlzbizra2m9aayp6w07s39gddvm5igdaw9kwxwjwvd1dbfc"; + vendorSha256 = "0219q9zjc0i6fbdngqh0wjpmq8wj5bjiz5dls0c1aam0lh4vwkhc"; nativeBuildInputs = [ pkg-config ]; @@ -21,8 +21,8 @@ buildGoModule rec { meta = with stdenv.lib; { description = "A tool for exploring each layer in a docker image"; - homepage = https://github.com/wagoodman/dive; + homepage = "https://github.com/wagoodman/dive"; license = licenses.mit; maintainers = with maintainers; [ marsam spacekookie ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 2aead3940ad8f..9bbeb3c24a3e8 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -1,34 +1,43 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "doctl"; - version = "${major}.${minor}.${patch}"; - major = "1"; - minor = "35"; - patch = "0"; - goPackagePath = "github.com/digitalocean/doctl"; - - excludedPackages = ''\(doctl-gen-doc\|install-doctl\|release-doctl\)''; - buildFlagsArray = let t = goPackagePath; in '' - -ldflags= - -X ${t}.Major=${major} - -X ${t}.Minor=${minor} - -X ${t}.Patch=${patch} - -X ${t}.Label=release - ''; + version = "1.43.0"; + + vendorSha256 = null; + + subPackages = [ "cmd/doctl" ]; + + buildFlagsArray = let t = "github.com/digitalocean/doctl"; in '' + -ldflags= + -X ${t}.Major=${lib.versions.major version} + -X ${t}.Minor=${lib.versions.minor version} + -X ${t}.Patch=${lib.versions.patch version} + -X ${t}.Label=release + ''; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + export HOME=$(mktemp -d) # attempts to write to /homeless-shelter + for shell in bash fish zsh; do + $out/bin/doctl completion $shell > doctl.$shell + installShellCompletion doctl.$shell + done + ''; src = fetchFromGitHub { - owner = "digitalocean"; - repo = "doctl"; - rev = "v${version}"; - sha256 = "1blg4xd01vvr8smpii60jlk7rg1cg64115azixw9q022f7cnfiyw"; + owner = "digitalocean"; + repo = "doctl"; + rev = "v${version}"; + sha256 = "1x8rr3707mmbfnjn3ck0953xkkrfq5r8zflbxpkqlfz9k978z835"; }; - meta = { + meta = with lib; { description = "A command line tool for DigitalOcean services"; - homepage = https://github.com/digitalocean/doctl; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.siddharthist ]; + homepage = "https://github.com/digitalocean/doctl"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.siddharthist ]; }; } diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 9152230e38886..a8e5f17991611 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - name = "doxygen-1.8.17"; + name = "doxygen-1.8.18"; src = fetchurl { urls = [ "mirror://sourceforge/doxygen/${name}.src.tar.gz" # faster, with https, etc. "http://doxygen.nl/files/${name}.src.tar.gz" ]; - sha256 = "16dmv0gm1x8rvbm82fmjvi213q8fxqxinm75pcf595flya59ific"; + sha256 = "0mh6s1ri1fs5yb27m0avnjsbcxpchgb9aaprq4bd3lj6vjg3s5qq"; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.gpl2Plus; - homepage = http://doxygen.nl/; + homepage = "http://doxygen.nl/"; description = "Source code documentation generator tool"; longDescription = '' diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix index 7e21019ea3f3b..e5d9143f61c02 100644 --- a/pkgs/development/tools/documentation/mdsh/default.nix +++ b/pkgs/development/tools/documentation/mdsh/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdsh"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "zimbatm"; repo = "mdsh"; rev = "v${version}"; - sha256 = "0y0k6rsspvpia4lssals4c3rdz9fgvlrhwd8gw38say02hn5b7ip"; + sha256 = "sha256-VF6GZxWZbrJNixE3wItF4CtVpj9NuKjdotNXrYujugs="; }; - cargoSha256 = "07f2ajg9jpp666915cwsjn5clmi9ghkw25qfqj0lj3kfj79n5ash"; + cargoSha256 = "sha256-b8xXaWACDJ143i8UV3DJDjqu8HiXdO4fe6YDR/GcHoU="; meta = with stdenv.lib; { description = "Markdown shell pre-processor"; diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix index 605bb3f18c61c..8d4480945bda3 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -44,7 +44,7 @@ buildPythonApplication rec { MkDocs can also be used to generate general-purpose Websites. ''; - homepage = http://mkdocs.org/; + homepage = "http://mkdocs.org/"; license = lib.licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.rkoe ]; diff --git a/pkgs/development/tools/drip/default.nix b/pkgs/development/tools/drip/default.nix index 1b559df8ef6cd..2a7d2c6626bef 100644 --- a/pkgs/development/tools/drip/default.nix +++ b/pkgs/development/tools/drip/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A launcher for the Java Virtual Machine intended to be a drop-in replacement for the java command, only faster"; license = licenses.epl10; - homepage = https://github.com/ninjudd/drip; + homepage = "https://github.com/ninjudd/drip"; platforms = platforms.linux; maintainers = [ maintainers.rybern ]; }; diff --git a/pkgs/development/tools/drm_info/default.nix b/pkgs/development/tools/drm_info/default.nix index a97526f853818..9243bbb161bfd 100644 --- a/pkgs/development/tools/drm_info/default.nix +++ b/pkgs/development/tools/drm_info/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchFromGitHub -, libdrm, json_c +, libdrm, json_c, pciutils , meson, ninja, pkgconfig }: stdenv.mkDerivation rec { pname = "drm_info"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "ascent12"; repo = "drm_info"; rev = "v${version}"; - sha256 = "1i5bzkgqxjjw34jpj1x1gfdl3sz0sl6i7s787a6mjjslsc5g422l"; + sha256 = "0s4zp8xz21zcpinbcwdvg48rf0xr7rs0dqri28q093vfmllsk36f"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; - buildInputs = [ libdrm json_c ]; + buildInputs = [ libdrm json_c pciutils ]; meta = with stdenv.lib; { description = "Small utility to dump info about DRM devices."; diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index 5f359757eac4b..5efa579ec5a10 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ancillary tools for the D programming language compiler"; - homepage = https://github.com/dlang/tools; + homepage = "https://github.com/dlang/tools"; license = lib.licenses.boost; maintainers = with maintainers; [ ThomasMader ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/ejson/default.nix b/pkgs/development/tools/ejson/default.nix index bc46f0776a6df..a9481cbb306e5 100644 --- a/pkgs/development/tools/ejson/default.nix +++ b/pkgs/development/tools/ejson/default.nix @@ -39,7 +39,7 @@ in buildGoPackage rec { meta = with lib; { description = "A small library to manage encrypted secrets using asymmetric encryption."; license = licenses.mit; - homepage = https://github.com/Shopify/ejson; + homepage = "https://github.com/Shopify/ejson"; platforms = platforms.unix; maintainers = [ maintainers.manveru ]; }; diff --git a/pkgs/development/tools/electron/3.x.nix b/pkgs/development/tools/electron/3.x.nix index f66d1a57a0478..ee4b69ddca3c8 100644 --- a/pkgs/development/tools/electron/3.x.nix +++ b/pkgs/development/tools/electron/3.x.nix @@ -8,7 +8,7 @@ let meta = with stdenv.lib; { description = "Cross platform desktop application shell"; - homepage = https://github.com/electron/electron; + homepage = "https://github.com/electron/electron"; license = licenses.mit; maintainers = with maintainers; [ travisbhartwell manveru ]; platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index d23c5a663e628..3d0c9afd33e90 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,4 +1,4 @@ -{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core }@args: +{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, glib, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core }@args: let mkElectron = import ./generic.nix args; @@ -20,27 +20,27 @@ in aarch64-linux = "01f0fd313b060fb28a1022d68fb224d415fa22986e2a8f4aded6424b65e35add"; }; - electron_6 = mkElectron "6.1.7" { - x86_64-linux = "7fe94fc1edebe2f5645056a4300fc642c04155e55da8dd4ee058a0c0ef835ae8"; - x86_64-darwin = "1c790a4cbda05f1c136d18fa6a09bdb09a1941f521207466756a3e95e343c485"; - i686-linux = "1afd8ea79acb2b4782fb459e084549ed4cd4ead779764829b1d862148359eae5"; - armv7l-linux = "14f2ea0459f0dda8c566b0fa4a2fe755f4220bbae313ea0c453861ac2f803196"; - aarch64-linux = "80e05c1a0b51c335483666e959c1631a089246986b7fc3a4f9ee1288a57a602a"; + electron_6 = mkElectron "6.1.12" { + x86_64-linux = "dc628216588a896e72991d46071d06ef11aed2cdeca18d11d472c29cfbf12349"; + x86_64-darwin = "6c7244319fdfb90899a48ffd0f426e36dba7c3fc5e29b28a4d29fdca7fb924d3"; + i686-linux = "4e61dc4aed1c1b933b233e02833948f3b17f81f3444f02e9108a78c0540159ab"; + armv7l-linux = "06071b4dc59a6773ff604550ed9e7a7ae8722b5343cbb5d4b94942fe537211dc"; + aarch64-linux = "4ae23b75be821044f7e5878fe8e56ab3109cbd403ecd88221effa6abf850260b"; }; - electron_7 = mkElectron "7.1.10" { - x86_64-linux = "296f034ac9a00afa4dc99ed145410c015af3f59cd7e9becc7709d70a4f8a9ebf"; - x86_64-darwin = "10eb453c2b19948777a6f404fbdbdd48464a4cd63db16bd3ce66b60dda016724"; - i686-linux = "681b6440d4f0f7ffa29a34610ef41103d72937d6e524d81fd2d0fa8d9eb67936"; - armv7l-linux = "2c09e9a77f1da152d766dc2e43719e2852b70f917229466a2ac457416d1374f7"; - aarch64-linux = "1dad780b872bbc069eb1cac9ff4ec8f0b8d200153ab7f51397e27219094db1f0"; + electron_7 = mkElectron "7.3.0" { + x86_64-linux = "5841d2dae8633ddec654574507689a61983acd774e6cdc8774a64b26eb41b5d4"; + x86_64-darwin = "dfe6aeda73b71aa016fb87f5fdbf87f7d8e574f1cf318fc2a5543399b4e975ae"; + i686-linux = "fdcedc8fda7c3580dadfa50d2ffcf9ebde4d7a01b0a36fb799703510e3a7811f"; + armv7l-linux = "b2989bab1be05230364c058fbadf9967b23873d24e24ac3f7c8d013c11ed73e4"; + aarch64-linux = "15a70ae79aabbf6bb9ee8a107fd08ddc1021c534679899f88e1fcc8d4de980fe"; }; - electron_8 = mkElectron "8.0.0" { - x86_64-linux = "b457a2ece83bb8a2efea42e75403740cbba051a64e325288760046b8999dd1c9"; - x86_64-darwin = "3f96dfa1d4e0313d11b9e5c66e2df161cfdb30685ee9dadcc779bcad2fb3876e"; - i686-linux = "0633ac2b6b6d00302e0e5df224d0e808e4ea9ecc14643e8534027e49b20436fb"; - armv7l-linux = "8d1f3daa86c77e7aceb8c8e4491c094e789951c7d475fc536b85fe7d279794bf"; - aarch64-linux = "484c04204478e8594d66f8bd332529c0c5eecfd71ee1705cc0478fa59c6818ee"; + electron_8 = mkElectron "8.3.0" { + x86_64-linux = "e69d8e36d2f842c7e741794f71952dc8bc5fbaa46ff22bb82ffd71fcf16e2302"; + x86_64-darwin = "582c9f9b53e8752885aa14d829f9318283f1d56eeb12982a03051d795a23e535"; + i686-linux = "2cf7fc55a74427d96ebe67fb601ece2f27802deb95a5bae3d7b427afe71d272c"; + armv7l-linux = "14b67e8a41ce8882442816a2db0eee69fac141e359911704002beb7063aa0eff"; + aarch64-linux = "1d89a75fff3b690efe1295fe6f91225c4fa64f3c22c6acddec895d54e1040b4d"; }; } diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index a06989ad2545a..d5d257ae64448 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core}: +{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, glib, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core}: version: hashes: let @@ -6,9 +6,9 @@ let meta = with stdenv.lib; { description = "Cross platform desktop application shell"; - homepage = https://github.com/electron/electron; + homepage = "https://github.com/electron/electron"; license = licenses.mit; - maintainers = with maintainers; [ travisbhartwell manveru ]; + maintainers = with maintainers; [ travisbhartwell manveru prusnak ]; platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; }; @@ -34,7 +34,7 @@ let }; linux = { - buildInputs = [ gtk3 ]; + buildInputs = [ glib gtk3 ]; nativeBuildInputs = [ unzip @@ -44,13 +44,16 @@ let dontWrapGApps = true; # electron is in lib, we need to wrap it manually - buildCommand = '' + dontUnpack = true; + dontBuild = true; + + installPhase = '' mkdir -p $out/lib/electron $out/bin unzip -d $out/lib/electron $src ln -s $out/lib/electron/electron $out/bin + ''; - fixupPhase - + postFixup = '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libuuid at-spi2-atk at-spi2-core ]}:$out/lib/electron" \ diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix index dccf4a558317e..f9d63cc86d8de 100644 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "A concolic testing tool for the Erlang functional programming language"; license = stdenv.lib.licenses.gpl3; - homepage = https://github.com/aggelgian/cuter; + homepage = "https://github.com/aggelgian/cuter"; maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; platforms = with stdenv.lib.platforms; unix; }; diff --git a/pkgs/development/tools/errcheck/default.nix b/pkgs/development/tools/errcheck/default.nix index f65dfe6565bcf..d288ff4dfec79 100644 --- a/pkgs/development/tools/errcheck/default.nix +++ b/pkgs/development/tools/errcheck/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with lib; { description = "errcheck is a program for checking for unchecked errors in go programs."; - homepage = https://github.com/kisielk/errcheck; + homepage = "https://github.com/kisielk/errcheck"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix index 331c86ad88c56..6a23f84f2366c 100644 --- a/pkgs/development/tools/fac/default.nix +++ b/pkgs/development/tools/fac/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram $bin/bin/fac \ + wrapProgram $out/bin/fac \ --prefix PATH : ${git}/bin # Install man page, not installed by default diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 731eb80b261bd..b83070296aaad 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -49,7 +49,7 @@ python.pkgs.buildPythonApplication rec { ]; meta = with lib; { - homepage = https://f-droid.org; + homepage = "https://f-droid.org"; description = "Server and tools for F-Droid, the Free Software repository system for Android"; license = licenses.agpl3; maintainers = [ lib.maintainers.pmiddend ]; diff --git a/pkgs/development/tools/fedpkg/default.nix b/pkgs/development/tools/fedpkg/default.nix index f257ae8adbf6c..4fbecc2d58d0e 100644 --- a/pkgs/development/tools/fedpkg/default.nix +++ b/pkgs/development/tools/fedpkg/default.nix @@ -28,7 +28,7 @@ in buildPythonApplication rec { meta = with stdenv.lib; { description = "Subclass of the rpkg project for dealing with rpm packaging"; - homepage = https://pagure.io/fedpkg; + homepage = "https://pagure.io/fedpkg"; license = licenses.gpl2; maintainers = with maintainers; [ ]; broken = true; diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index e400051e2c661..85b68cff20d81 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -15,7 +15,7 @@ , xmlto , acl -, bazaar +, breezy , binutils , bzip2 , coreutils @@ -29,7 +29,6 @@ , gnumake , gnupg , gnutar -, p7zip , json-glib , libcap , libdwarf @@ -90,7 +89,7 @@ in stdenv.mkDerivation rec { ./respect-xml-catalog-files-var.patch (substituteAll { src = ./fix-paths.patch; - bzr = "${bazaar}/bin/bzr"; + bzr = "${breezy}/bin/bzr"; cp = "${coreutils}/bin/cp"; patch = "${patch}/bin/patch"; tar = "${gnutar}/bin/tar"; @@ -99,7 +98,6 @@ in stdenv.mkDerivation rec { cpio = "${cpio}/bin/cpio"; git = "${gitMinimal}/bin/git"; rofilesfuse = "${ostree}/bin/rofiles-fuse"; - sevenz = "${p7zip}/bin/7z"; strip = "${binutils}/bin/strip"; eustrip = "${elfutils}/bin/eu-strip"; euelfcompress = "${elfutils}/bin/eu-elfcompress"; diff --git a/pkgs/development/tools/flatpak-builder/fix-paths.patch b/pkgs/development/tools/flatpak-builder/fix-paths.patch index cc7d9e82b0aff..e24fade68669b 100644 --- a/pkgs/development/tools/flatpak-builder/fix-paths.patch +++ b/pkgs/development/tools/flatpak-builder/fix-paths.patch @@ -49,15 +49,6 @@ va_end (ap); return res; -@@ -470,7 +470,7 @@ un7z (GFile *dir, - GError **error) - { - gboolean res; -- const gchar *argv[] = { "7z", "x", sevenz_path, NULL }; -+ const gchar *argv[] = { "@sevenz@", "x", sevenz_path, NULL }; - - res = flatpak_spawnv (dir, NULL, 0, error, argv); - @@ -483,7 +483,7 @@ unrpm (GFile *dir, GError **error) { diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 746d66c2dbe87..6018d63067450 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.3.2"; + version = "6.4.2"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "1av1q7znphpsi1iz4dbh0fgh3jsx9prz980b25yk5r89h518s76q"; + sha256 = "1m5i7mw3ml2iaqy09h8nmykn602rwkjfgh2mrmc1gss9q3klj1r8"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/development/tools/fusee-launcher/default.nix index 4fb05da306783..077dc8b87f997 100644 --- a/pkgs/development/tools/fusee-launcher/default.nix +++ b/pkgs/development/tools/fusee-launcher/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { pythonPath = with python3Packages; [ pyusb ]; meta = with stdenv.lib; { - homepage = https://github.com/Cease-and-DeSwitch/fusee-launcher; + homepage = "https://github.com/Cease-and-DeSwitch/fusee-launcher"; description = "Work-in-progress launcher for one of the Tegra X1 bootROM exploits"; license = licenses.gpl2; maintainers = with maintainers; [ pneumaticat ]; diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix index 15129bbebffc6..89d6b700018db 100644 --- a/pkgs/development/tools/galen/default.nix +++ b/pkgs/development/tools/galen/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://galenframework.com; + homepage = "http://galenframework.com"; description = "Automated layout testing for websites"; license = licenses.asl20; maintainers = [ ]; diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index b284b7e7a040c..c9df63cabb786 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Light weight cross-platform test automation"; - homepage = https://gauge.org; + homepage = "https://gauge.org"; license = licenses.gpl3; maintainers = [ maintainers.vdemeester ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/gdm/default.nix b/pkgs/development/tools/gdm/default.nix index 9cfa2f02c6e6e..284579fd362aa 100644 --- a/pkgs/development/tools/gdm/default.nix +++ b/pkgs/development/tools/gdm/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Minimalist dependency manager for Go written in Go."; - homepage = https://github.com/sparrc/gdm; + homepage = "https://github.com/sparrc/gdm"; license = licenses.unlicense; platforms = platforms.all; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix index 44e98d8d1860b..7cc43f14baeb6 100644 --- a/pkgs/development/tools/geckodriver/default.nix +++ b/pkgs/development/tools/geckodriver/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage { meta = with lib; { description = "Proxy for using W3C WebDriver-compatible clients to interact with Gecko-based browsers"; - homepage = https://github.com/mozilla/geckodriver; + homepage = "https://github.com/mozilla/geckodriver"; license = licenses.mpl20; maintainers = with maintainers; [ jraygauthier ]; }; diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/development/tools/gir/default.nix index 8cfcbf26dcd64..49e1e6bbe8b85 100644 --- a/pkgs/development/tools/gir/default.nix +++ b/pkgs/development/tools/gir/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Tool to generate rust bindings and user API for glib-based libraries"; - homepage = https://github.com/gtk-rs/gir/; + homepage = "https://github.com/gtk-rs/gir/"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ekleog ]; platforms = platforms.all; diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix index c0001774252ba..7e62a93d56483 100644 --- a/pkgs/development/tools/git-ftp/default.nix +++ b/pkgs/development/tools/git-ftp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Git powered FTP client written as shell script."; - homepage = https://git-ftp.github.io/; + homepage = "https://git-ftp.github.io/"; license = licenses.gpl3; maintainers = with maintainers; [ tweber ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix index 2681b2705ef4d..1c5811f7b5ab9 100644 --- a/pkgs/development/tools/git-quick-stats/default.nix +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.0.15"; + version = "2.1.1"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "1m8b0bskhpwjbs0qjp0rdzrjj613639pn92isv1cg0srj8grjcai"; + sha256 = "1mdja838jxhcasi251fsc3yig3s5vmfqab1wpm34xinr8blii90f"; }; PREFIX = builtins.placeholder "out"; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 4a09e2225beaa..3507131082e8b 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -50,7 +50,7 @@ buildRustPackage rec { series also tracks a cover letter for the patch series, formats the series for email, and prepares pull requests. ''; - homepage = https://github.com/git-series/git-series; + homepage = "https://github.com/git-series/git-series"; license = licenses.mit; maintainers = with maintainers; [ edef vmandela ]; diff --git a/pkgs/development/tools/github-changelog-generator/default.nix b/pkgs/development/tools/github-changelog-generator/default.nix index 9a14cc7f6e218..0239259a0c81e 100644 --- a/pkgs/development/tools/github-changelog-generator/default.nix +++ b/pkgs/development/tools/github-changelog-generator/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Fully automated changelog generation - This gem generates a changelog file based on tags, issues and merged pull requests"; - homepage = https://github.com/github-changelog-generator/github-changelog-generator; + homepage = "https://github.com/github-changelog-generator/github-changelog-generator"; license = licenses.mit; maintainers = with maintainers; [ Scriptkiddi nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix index 1bad76b246acd..5eb65dc4fbdf1 100644 --- a/pkgs/development/tools/github/cligh/default.nix +++ b/pkgs/development/tools/github/cligh/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyxdg PyGithub ]; meta = with stdenv.lib; { - homepage = http://the-brannons.com/software/cligh.html; + homepage = "http://the-brannons.com/software/cligh.html"; description = "A simple command-line interface to the facilities of Github"; longDescription = '' Cligh is a simple command-line interface to the facilities of GitHub. diff --git a/pkgs/development/tools/github/github-release/default.nix b/pkgs/development/tools/github/github-release/default.nix index be268fa6de3c1..8b68426d4b5e5 100644 --- a/pkgs/development/tools/github/github-release/default.nix +++ b/pkgs/development/tools/github/github-release/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { ''; license = licenses.mit; - homepage = https://github.com/aktau/github-release; + homepage = "https://github.com/aktau/github-release"; maintainers = with maintainers; [ ardumont ]; platforms = with platforms; unix; }; diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix new file mode 100644 index 0000000000000..4d86fc2acd008 --- /dev/null +++ b/pkgs/development/tools/glade/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, gettext +, fetchurl +, python3 +, pkg-config +, gtk3 +, glib +, gobject-introspection +, wrapGAppsHook +, itstool +, libxml2 +, docbook-xsl-nons +, gnome3 +, gdk-pixbuf +, libxslt +, gsettings-desktop-schemas +}: + +stdenv.mkDerivation rec { + pname = "glade"; + version = "3.36.0"; + + src = fetchurl { + url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "GbVGtSfMRiE8z8gCLUnsV+YY/iyqmqUdstKGIjPqbwg="; + }; + + nativeBuildInputs = [ + pkg-config + gettext + itstool + wrapGAppsHook + docbook-xsl-nons + libxslt + libxml2 + gobject-introspection + ]; + + buildInputs = [ + gtk3 + glib + libxml2 + python3 + python3.pkgs.pygobject3 + gsettings-desktop-schemas + gdk-pixbuf + gnome3.adwaita-icon-theme + ]; + + enableParallelBuilding = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + homepage = "https://wiki.gnome.org/Apps/Glade"; + description = "User interface designer for GTK applications"; + maintainers = teams.gnome.members; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix index 913c021255995..4f511813ad0b4 100644 --- a/pkgs/development/tools/glide/default.nix +++ b/pkgs/development/tools/glide/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://glide.sh; + homepage = "https://glide.sh"; description = "Package management for Go"; license = licenses.mit; maintainers = [ maintainers.rushmorem ]; diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index dfc5ed843e752..c0c3989263524 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/SRI-CSL/gllvm; + homepage = "https://github.com/SRI-CSL/gllvm"; description = "Whole Program LLVM: wllvm ported to go"; license = licenses.bsd3; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index 74a88caeb7c08..a9fb671f4a3b1 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { The executable requires the PC/SC daemon running for correct execution. If you run NixOS, it can be enabled with `services.pcscd.enable = true;`. ''; - homepage = https://github.com/martinpaljak/GlobalPlatformPro; + homepage = "https://github.com/martinpaljak/GlobalPlatformPro"; license = with licenses; [ lgpl3 ]; maintainers = with maintainers; [ ekleog ]; platforms = platforms.all; diff --git a/pkgs/development/tools/glock/default.nix b/pkgs/development/tools/glock/default.nix index d0e9cc9e2d359..0ffa521f38ffe 100644 --- a/pkgs/development/tools/glock/default.nix +++ b/pkgs/development/tools/glock/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/robfig/glock; + homepage = "https://github.com/robfig/glock"; description = "A command-line tool to lock Go dependencies to specific revisions"; license = licenses.mit; maintainers = [ maintainers.rushmorem ]; diff --git a/pkgs/development/tools/glpaper/default.nix b/pkgs/development/tools/glpaper/default.nix new file mode 100644 index 0000000000000..94d140552a10d --- /dev/null +++ b/pkgs/development/tools/glpaper/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchhg, meson, ninja, pkg-config, wlroots, wayland, wayland-protocols +, libX11, libGL }: + +stdenv.mkDerivation { + name = "glpaper"; + version = "unstable-2020-03-30"; + + src = fetchhg { + url = "https://hg.sr.ht/~scoopta/glpaper"; + rev = "a95db77088dfb5636a87f3743fc9b5eca70c1ae2"; + sha256 = "04y12910wvhy4aqx2sa63dy9l6nbs7b77yqpdhc96x2b3mgzgjfs"; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ + wayland + libX11 # required by libglvnd + libGL + ]; + + meta = with stdenv.lib; { + description = + "Wallpaper program for wlroots based Wayland compositors such as sway that allows you to render glsl shaders as your wallpaper"; + homepage = "https://hg.sr.ht/~scoopta/glpaper"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ccellado ]; + }; +} diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index fd22295540d0b..b9e46ca41e176 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Live GLSL coding renderer"; - homepage = http://patriciogonzalezvivo.com/2015/glslViewer/; + homepage = "http://patriciogonzalezvivo.com/2015/glslViewer/"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.hodapp ]; diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index 368a1520ca00e..81e4d87937523 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "20200223"; src = fetchgit { - url = https://git.savannah.gnu.org/r/gnulib.git; + url = "https://git.savannah.gnu.org/r/gnulib.git"; rev = "292fd5d6ff5ecce81ec3c648f353732a9ece83c0"; sha256 = "0hkg3nql8nsll0vrqk4ifda0v4kpi67xz42r8daqsql6c4rciqnw"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.gnu.org/software/gnulib/; + homepage = "https://www.gnu.org/software/gnulib/"; description = "Central location for code to be shared among GNU packages"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/go-langserver/default.nix b/pkgs/development/tools/go-langserver/default.nix index ec0e565eabd62..c6a0dcc0d9da5 100644 --- a/pkgs/development/tools/go-langserver/default.nix +++ b/pkgs/development/tools/go-langserver/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A Go language server protocol server"; - homepage = https://github.com/sourcegraph/go-langserver; + homepage = "https://github.com/sourcegraph/go-langserver"; license = licenses.mit; maintainers = with maintainers; [ johnchildren ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/go-motion/default.nix b/pkgs/development/tools/go-motion/default.nix index 52b2962a23d89..824668055b1d8 100644 --- a/pkgs/development/tools/go-motion/default.nix +++ b/pkgs/development/tools/go-motion/default.nix @@ -30,7 +30,7 @@ buildGoPackage rec { It's optimized and created to work with vim-go, but it's designed to work with any editor. It's currently work in progress and open to change. ''; - homepage = https://github.com/fatih/motion; + homepage = "https://github.com/fatih/motion"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix index 5f6088363f1fb..3df1d5cae25fc 100644 --- a/pkgs/development/tools/go-outline/default.nix +++ b/pkgs/development/tools/go-outline/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = { description = "Utility to extract JSON representation of declarations from a Go source file."; - homepage = https://github.com/ramya-rao-a/go-outline; + homepage = "https://github.com/ramya-rao-a/go-outline"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.mit; }; diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index febf71657eb4c..43731b72a55a3 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; }; - modSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; meta = with stdenv.lib; { homepage = "https://github.com/golang/protobuf"; @@ -20,4 +20,4 @@ buildGoModule rec { license = licenses.bsd3; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix index e774ed7166474..bdee5e4b25ab1 100644 --- a/pkgs/development/tools/go-symbols/default.nix +++ b/pkgs/development/tools/go-symbols/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = { description = "A utility for extracting a JSON representation of the package symbols from a go source tree."; - homepage = https://github.com/acroca/go-symbols; + homepage = "https://github.com/acroca/go-symbols"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.mit; }; diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index 1fd17060bd4f8..8362d1db02c7a 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -5,23 +5,21 @@ buildGoModule rec { pname = "go-tools"; - version = "2020.1.3"; - - excludedPackages = ''\(simple\|ssa\|ssa/ssautil\|lint\|staticcheck\|stylecheck\|unused\)/testdata''; + version = "2020.1.4"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf"; + sha256 = "182j3zzx1bj4j4jiamqn49v9nd3vcrx727f7i9zgcrgmiscvw3mh"; }; - modSha256 = "03560xjr2531xj87paskfx2zs364fz6y4kpsid8x08s1syq9nq7p"; + vendorSha256 = "0nbbngsphklzhcmqafrw1im2l1vnfcma9sb4vskdpdrsadv5ss5r"; meta = with lib; { description = "A collection of tools and libraries for working with Go code, including linters and static analysis"; - homepage = https://staticcheck.io; + homepage = "https://staticcheck.io"; license = licenses.mit; maintainers = with maintainers; [ rvolosatovs kalbasit ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index adf0977c67d45..300f82ee5486d 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -17,14 +17,14 @@ buildGoPackage rec { goDeps = ./deps.nix; - outputs = [ "bin" "out" "man" ]; + outputs = [ "out" "man" ]; nativeBuildInputs = [ go-bindata gotools makeWrapper ]; preBuild = ''go generate ./...''; postInstall = '' - wrapProgram $bin/bin/go2nix \ + wrapProgram $out/bin/go2nix \ --prefix PATH : ${nix-prefetch-git}/bin \ --prefix PATH : ${git}/bin @@ -38,7 +38,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Go apps packaging for Nix"; - homepage = https://github.com/kamilchm/go2nix; + homepage = "https://github.com/kamilchm/go2nix"; license = licenses.mit; maintainers = with maintainers; [ kamilchm ]; }; diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 24a21c8279cfe..6a373099a01b0 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://goa.design; + homepage = "https://goa.design"; description = "A framework for building microservices in Go using a unique design-first approach"; license = licenses.mit; maintainers = [ maintainers.rushmorem ]; diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index 1524984756fcc..603568236e66e 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { goDeps = ./deps.nix; postInstall = '' - mv $bin/bin/gocode $bin/bin/gocode-gomod + mv $out/bin/gocode $out/bin/gocode-gomod ''; meta = with stdenv.lib; { @@ -42,7 +42,7 @@ buildGoPackage rec { Typical autocompletion time with warm cache is 30ms, which is barely noticeable. ''; - homepage = https://github.com/stamblerre/gocode; + homepage = "https://github.com/stamblerre/gocode"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ kalbasit rvolosatovs ]; diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index b67f8929e48df..b4e9a8d43cb7a 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { pname = "gocode-unstable"; - version = "2018-11-05"; - rev = "0af7a86943a6e0237c90f8aeb74a882e1862c898"; + version = "2020-04-06"; + rev = "4acdcbdea79de6b3dee1c637eca5cbea0fdbe37c"; goPackagePath = "github.com/mdempsky/gocode"; excludedPackages = ''internal/suggest/testdata''; @@ -18,7 +18,7 @@ buildGoPackage rec { owner = "mdempsky"; repo = "gocode"; - sha256 = "0fxqn0v6dbwarn444lc1xrx5vfkcidi73f4ba7l4clsb9qdqgyam"; + sha256 = "0i1hc089gb6a4mcgg56vn5l0q96wrlza2n08l4349s3dc2j559fb"; }; goDeps = ./deps.nix; @@ -37,7 +37,7 @@ buildGoPackage rec { Typical autocompletion time with warm cache is 30ms, which is barely noticeable. ''; - homepage = https://github.com/mdempsky/gocode; + homepage = "https://github.com/mdempsky/gocode"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/development/tools/gocode/deps.nix b/pkgs/development/tools/gocode/deps.nix index ac96626970634..b2518109171a9 100644 --- a/pkgs/development/tools/gocode/deps.nix +++ b/pkgs/development/tools/gocode/deps.nix @@ -1,11 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { goPackagePath = "golang.org/x/tools"; fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "78dc5bac0cacea7969e98b79c3b86597e0aa4e25"; - sha256 = "16jg2x1sfm39kz4rchn0gxyq99fnkxw6v51wxriqbs76a2wrznp9"; + rev = "72e4a01eba4315301fd9ce00c8c2f492580ded8a"; + sha256 = "0a8c7j4w784w441j3j3bh640vy1g6g214641qv485wyi0xj49anf"; }; } ] diff --git a/pkgs/development/tools/goconst/default.nix b/pkgs/development/tools/goconst/default.nix index 0ee889d02654f..91a53830cbef7 100644 --- a/pkgs/development/tools/goconst/default.nix +++ b/pkgs/development/tools/goconst/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = with lib; { description = "Find in Go repeated strings that could be replaced by a constant"; - homepage = https://github.com/jgautheron/goconst; + homepage = "https://github.com/jgautheron/goconst"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix index 1df94147ba4a6..4c4d651ce6090 100644 --- a/pkgs/development/tools/goconvey/default.nix +++ b/pkgs/development/tools/goconvey/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = { description = "Go testing in the browser. Integrates with `go test`. Write behavioral tests in Go."; - homepage = https://github.com/smartystreets/goconvey; + homepage = "https://github.com/smartystreets/goconvey"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.mit; }; diff --git a/pkgs/development/tools/gocyclo/default.nix b/pkgs/development/tools/gocyclo/default.nix index f446b7289085b..4ce97349fd77d 100644 --- a/pkgs/development/tools/gocyclo/default.nix +++ b/pkgs/development/tools/gocyclo/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { meta = with lib; { description = "Calculate cyclomatic complexities of functions in Go source code."; - homepage = https://github.com/alecthomas/gocyclo; + homepage = "https://github.com/alecthomas/gocyclo"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index ce6c77b2cc3fa..a1dfac9b79be7 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -1,24 +1,26 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "godef"; - version = "1.1.1"; + version = "1.1.2"; rev = "v${version}"; goPackagePath = "github.com/rogpeppe/godef"; subPackages = [ "." ]; + vendorSha256 = null; + src = fetchFromGitHub { inherit rev; owner = "rogpeppe"; repo = "godef"; - sha256 = "1bpzqnb9fsk1pjjap3gm94pqch1jz02rfah9hg8iqbfm0dzpy31b"; + sha256 = "0rhhg73kzai6qzhw31yxw3nhpsijn849qai2v9am955svmnckvf4"; }; meta = { description = "Print where symbols are defined in Go source code"; - homepage = https://github.com/rogpeppe/godef/; + homepage = "https://github.com/rogpeppe/godef/"; maintainers = with stdenv.lib.maintainers; [ vdemeester rvolosatovs ]; license = stdenv.lib.licenses.bsd3; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix index 5ca0d6cb1e034..adb2ef463f7a9 100644 --- a/pkgs/development/tools/gofumpt/default.nix +++ b/pkgs/development/tools/gofumpt/default.nix @@ -11,12 +11,12 @@ buildGoModule rec { sha256 = "1cw9mmavxz8gxzzwsllvf5lwb2wwi19jbc7hcwxsi4ywp7a84gh0"; }; - modSha256 = "1ladpxhr90awnms2qmlm2lz91wyh92fl3rqbfr54qngrkpkpbhr2"; + vendorSha256 = "14a3p163xy861xb6x160wy15hzjc75n36jdyzaxl877i17shba8z"; meta = with lib; { description = "A stricter gofmt"; - homepage = https://github.com/mvdan/gofumpt; + homepage = "https://github.com/mvdan/gofumpt"; license = licenses.bsd3; maintainers = with maintainers; [ rvolosatovs ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/gogetdoc/default.nix b/pkgs/development/tools/gogetdoc/default.nix index 61d0e7a73dbac..5d360f4572ab9 100644 --- a/pkgs/development/tools/gogetdoc/default.nix +++ b/pkgs/development/tools/gogetdoc/default.nix @@ -1,12 +1,14 @@ -{ buildGoPackage +{ buildGoModule , lib , fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gogetdoc-unstable"; - version = "2018-10-25"; - rev = "9098cf5fc236a5e25060730544af2ba6d65cd968"; + version = "2019-02-28"; + rev = "b37376c5da6aeb900611837098f40f81972e63e4"; + + vendorSha256 = null; goPackagePath = "github.com/zmb3/gogetdoc"; excludedPackages = "\\(testdata\\)"; @@ -16,16 +18,16 @@ buildGoPackage rec { owner = "zmb3"; repo = "gogetdoc"; - sha256 = "159dgkd2lz07kimbpzminli5p539l4ry0dr93r46iz3lk5q76znl"; + sha256 = "1v74zd0x2xh10603p8raazssacv3y0x0lr9apkpsdk0bfp5jj0lr"; }; goDeps = ./deps.nix; meta = with lib; { description = "Gets documentation for items in Go source code"; - homepage = https://github.com/zmb3/gogetdoc; + homepage = "https://github.com/zmb3/gogetdoc"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 14311b0c7a511..256e534155677 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.24.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "0m7mcppbgpx2kyl5f9nk61x521v49h18az5l4ads1f3jkkyiya6s"; + sha256 = "1capiw8af4wmx3wpfslb30xivfyh72x5kj12f8p5pwhl6id31931"; }; - modSha256 = "0ab1s8pqkpss15rd9brin39lzx2fqkvq2v3nhk8kfrgpari2addk"; + vendorSha256 = "16wr8ixicbvdpg5mg6q07sa1b03ydpwdbvbjl3r9qihdqkhhzlr1"; subPackages = [ "cmd/golangci-lint" ]; meta = with lib; { diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index bd66f35e47109..b0b53f7699c29 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://golang.org; + homepage = "https://golang.org"; description = "Linter for Go source code"; license = licenses.bsd3; maintainers = with maintainers; [ jhillyerd ]; diff --git a/pkgs/development/tools/gometalinter/default.nix b/pkgs/development/tools/gometalinter/default.nix deleted file mode 100644 index c2f2a8a597a10..0000000000000 --- a/pkgs/development/tools/gometalinter/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ buildGoPackage -, deadcode -, errcheck -, fetchFromGitHub -, go -, go-check -, go-tools -, goconst -, gocyclo -, golint -, gosec -, gotools -, ineffassign -, maligned -, interfacer -, lib -, makeWrapper -, unconvert -}: - -with lib; - -let - runtimeDeps = [ - deadcode - errcheck - go - go-check - go-tools - goconst - gocyclo - golint - gosec - gotools - ineffassign - interfacer - maligned - unconvert - ]; - -in buildGoPackage rec { - pname = "gometalinter"; - version = "3.0.0"; - - goPackagePath = "github.com/alecthomas/gometalinter"; - excludedPackages = "\\(regressiontests\\)"; - - src = fetchFromGitHub { - owner = "alecthomas"; - repo = "gometalinter"; - rev = "v${version}"; - sha256 = "06dd60531qp0hxfwnxnyi36d6div1j781jvcb99ykhgrg0kwmzq9"; - }; - - postInstall = '' - wrapProgram $bin/bin/gometalinter --prefix PATH : "${makeBinPath runtimeDeps}" - ''; - - buildInputs = [ makeWrapper ]; - - allowGoReference = true; - - meta = with lib; { - description = "Concurrently run Go lint tools and normalise their output"; - homepage = https://github.com/alecthomas/gometalinter; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit rvolosatovs ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix index 4d97415bc565e..e90844167dd20 100644 --- a/pkgs/development/tools/gomodifytags/default.nix +++ b/pkgs/development/tools/gomodifytags/default.nix @@ -1,23 +1,24 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - pname = "gomodifytags-unstable"; - version = "2018-09-14"; - rev = "141225bf62b6e5c9c0c9554a2e993e8c30aebb1d"; +buildGoModule rec { + pname = "gomodifytags"; + version = "1.6.0"; + + vendorSha256 = null; goPackagePath = "github.com/fatih/gomodifytags"; src = fetchFromGitHub { - inherit rev; owner = "fatih"; repo = "gomodifytags"; - sha256 = "16qbp594l90qpvf388wlv0kf6wvqj1vz2mqq0g3qcz6dkrc4cjqa"; + rev = "v${version}"; + sha256 = "1wmzl5sk5mc46njzn86007sqyyv6han058ppiw536qyhk88rzazq"; }; meta = { description = "Go tool to modify struct field tags."; - homepage = https://github.com/fatih/gomodifytags; + homepage = "https://github.com/fatih/gomodifytags"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.bsd3; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix index df3310893a4df..001edf5c038e9 100644 --- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix +++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Google App Engine SDK for Go"; version = version; - homepage = https://cloud.google.com/appengine/docs/go/; + homepage = "https://cloud.google.com/appengine/docs/go/"; license = licenses.asl20; platforms = ["x86_64-linux" "x86_64-darwin"]; maintainers = with maintainers; [ lufia ]; diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix index 778ed562637ed..c1773333b5d26 100644 --- a/pkgs/development/tools/gopkgs/default.nix +++ b/pkgs/development/tools/gopkgs/default.nix @@ -1,23 +1,26 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gopkgs"; - version = "2.0.1"; + version = "2.1.2"; goPackagePath = "github.com/uudashr/gopkgs"; - goDeps = ./deps.nix; + + subPackages = [ "cmd/gopkgs" ]; src = fetchFromGitHub { rev = "v${version}"; owner = "uudashr"; repo = "gopkgs"; - sha256 = "03zfwkmzwx2knkghky3irb2r78lbc1ccszjcg9y445b4pbqkn6w4"; + sha256 = "1jak1bg6k5iasscw68ra875k59k3iqhka2ykabsd427k1j3mypln"; }; + vendorSha256 = "1pwsc488ldw039by8nqpni801zry7dnf0rx4hhd73xpv2w7s8n2r"; + meta = { description = "Tool to get list available Go packages."; - homepage = https://github.com/uudashr/gopkgs; + homepage = "https://github.com/uudashr/gopkgs"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.mit; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix new file mode 100644 index 0000000000000..a77f9fa8ddd3a --- /dev/null +++ b/pkgs/development/tools/gopls/default.nix @@ -0,0 +1,22 @@ +{ stdenv, go, buildGoModule, fetchgit }: + +buildGoModule rec { + pname = "gopls"; + version = "0.4.1"; + + src = fetchgit { + rev = "gopls/v${version}"; + url = "https://go.googlesource.com/tools"; + sha256 = "18migk7arxm8ysfzidl7mdr069fxym9bfi6zisj7dliczw0qnkzv"; + }; + + modRoot = "gopls"; + vendorSha256 = "1jaav6c5vybgks5hc164is0i7h097c5l75s7w3wi5a3zyzkbiyny"; + + meta = with stdenv.lib; { + description = "Official language server for the Go language"; + homepage = "https://github.com/golang/tools/tree/master/gopls"; + license = licenses.bsd3; + maintainers = with maintainers; [ mic92 ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 1b6b3aed4e88a..2600d13cab937 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with lib; { description = "Golang security checker"; - homepage = https://github.com/securego/gosec; + homepage = "https://github.com/securego/gosec"; license = licenses.asl20 ; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix index e74b6c27b2b25..13d3c700ce9e2 100644 --- a/pkgs/development/tools/gotests/default.nix +++ b/pkgs/development/tools/gotests/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = { description = "Generate Go tests from your source code."; - homepage = https://github.com/cweill/gotests; + homepage = "https://github.com/cweill/gotests"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index 45629338d9ea7..fba4585155ed6 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotestsum"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "1wllcmc2c8ch2ggknhxwgdm6g70ppmxr492kbxvlbwif9p6ms0ci"; + sha256 = "0zifha3mj7386q2accrdmd8qniingadxz1v8vg4mciwi723msr44"; }; - modSha256 = "08vil1jb7dpkld59b6qhsfh9cx450vbgfaji7777immzsd1azf4m"; + vendorSha256 = "0d45i8wm35m2cdbk48razkdr49a3hfwnp84inlz7hj054cq6vimi"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -22,4 +22,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ endocrimes ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index d46c9a9fb3118..a7858474a4269 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -1,18 +1,16 @@ -{ stdenv, go, buildGoModule, fetchgit, Security }: +{ stdenv, go, buildGoModule, fetchgit }: buildGoModule rec { pname = "gotools-unstable"; - version = "2019-11-14"; - rev = "4191b8cbba092238a318a71cdff48b20b4e1e5d8"; + version = "2020-04-21"; + rev = "72e4a01eba4315301fd9ce00c8c2f492580ded8a"; src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "16m62m303j4wqfjr1401xpqpb9m11bs6qc2dhf6x2za2d9pycish"; + sha256 = "0a8c7j4w784w441j3j3bh640vy1g6g214641qv485wyi0xj49anf"; }; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; - # Build of golang.org/x/tools/gopls fails with: # can't load package: package golang.org/x/tools/gopls: unknown import path "golang.org/x/tools/gopls": cannot find module providing package golang.org/x/tools/gopls # That is most probably caused by golang.org/x/tools/gopls containing a separate Go module. @@ -23,7 +21,7 @@ buildGoModule rec { rm -rf gopls ''; - modSha256 = "16cfzmfr9jv8wz0whl433xdm614dk63fzjxv6l1xvkagjmki49iy"; + vendorSha256 = "0pplmqxrnc8qnr5708igx4dm7rb0hicvhg6lh5hj8zkx38nb19s0"; postConfigure = '' # Make the builtin tools available here @@ -49,4 +47,4 @@ buildGoModule rec { # Do not copy this without a good reason for enabling # In this case tools is heavily coupled with go itself and embeds paths. allowGoReference = true; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 6caa32c16f2bf..7c800df0a6bad 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -1,25 +1,22 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage { +buildGoPackage rec { pname = "gox"; - version = "20181025"; + version = "1.0.1"; goPackagePath = "github.com/mitchellh/gox"; src = fetchFromGitHub { owner = "mitchellh"; repo = "gox"; - rev = "9cc487598128d0963ff9dcc51176e722788ec645"; - sha256 = "18indkdwq2m1wy95d71lgbf46jxxrfc5km1fys5laapz993h77v6"; + rev = "v${version}"; + sha256 = "0mkh81hd7kn45dz7b6yhzqsg2mvg1g6pwx89jjigxrnqhyg9vrl7"; }; - goDeps = ./deps.nix; - meta = with stdenv.lib; { - homepage = https://github.com/mitchellh/gox; + homepage = "https://github.com/mitchellh/gox"; description = "A dead simple, no frills Go cross compile tool"; platforms = platforms.all; license = licenses.mpl20; }; - } diff --git a/pkgs/development/tools/gox/deps.nix b/pkgs/development/tools/gox/deps.nix deleted file mode 100644 index c4991e38ff026..0000000000000 --- a/pkgs/development/tools/gox/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "github.com/mitchellh/iochan"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/iochan"; - rev = "87b45ffd0e9581375c491fef3d32130bb15c5bd7"; - sha256 = "1435kdcx3j1xgr6mm5c7w7hjx015jb20yfqlkp93q143hspf02fx"; - }; - } -] diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/pkgs/development/tools/gtk-mac-bundler/default.nix index 02d5ad87dc476..df21f414ecb84 100644 --- a/pkgs/development/tools/gtk-mac-bundler/default.nix +++ b/pkgs/development/tools/gtk-mac-bundler/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "a helper script that creates application bundles form GTK executables for macOS"; maintainers = [ maintainers.matthewbauer ]; platforms = platforms.darwin; - homepage = https://wiki.gnome.org/Projects/GTK/OSX/Bundling; + homepage = "https://wiki.gnome.org/Projects/GTK/OSX/Bundling"; license = licenses.gpl2; }; } diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 477a476dfe782..ee7ed4766228c 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hcloud"; - version = "1.16.1"; + version = "1.16.2"; goPackagePath = "github.com/hetznercloud/cli"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "1d6qa21sq79hr84nnn3j7w0776mnq58g8g1krpnh4d6bv3kc3lq7"; + sha256 = "0cxh92df8gdl4bmr22pdvdxdkdjyfy0jv48y0k6awy1xz61r94ap"; }; - modSha256 = "1zy41hi2qzrdmih3pkpng8im576lhkr64zm66w73p7jyvy0kf9sx"; + vendorSha256 = "1iiqmdnjnrsqgjisb5j5casa2hmqmafn79157skl5zxawndvc2rj"; buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; @@ -37,4 +37,4 @@ buildGoModule rec { platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.zauberpony ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 1867f33bfa8b1..a78a74a3d0c25 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "heroku"; - version = "7.39.0"; + version = "7.39.2"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "0jj5n1jw61scpli1a0115zyp8zsa3mmljzd72bm1n5c86ppdh8pa"; + sha256 = "13bbqxklpwmh84a1dc6inphqg1nm2l0b7vqs3x9lrjm4bg7c8kjr"; }; nativeBuildInputs = [ makeWrapper ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://cli.heroku.com"; description = "Everything you need to get started using Heroku"; - maintainers = with lib.maintainers; [ aflatter mirdhyn peterhoeg ]; + maintainers = with lib.maintainers; [ aflatter mirdhyn peterhoeg marsam ]; license = lib.licenses.mit; platforms = with lib.platforms; unix; }; diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix index c97e35583b639..116e7c3a5ced0 100644 --- a/pkgs/development/tools/hexio/default.nix +++ b/pkgs/development/tools/hexio/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Low-level I/O helpers for hexadecimal, tty/serial devices and so on"; - homepage = https://github.com/vanrein/hexio; + homepage = "https://github.com/vanrein/hexio"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/development/tools/hobbes/default.nix b/pkgs/development/tools/hobbes/default.nix index b56afc0a4351d..5fd9d314c5e05 100644 --- a/pkgs/development/tools/hobbes/default.nix +++ b/pkgs/development/tools/hobbes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { name = "hobbes"; - version = "unstable-2020-03-10"; + version = "unstable-2020-05-19"; src = fetchFromGitHub { owner = "morgan-stanley"; repo = "hobbes"; - rev = "ae956df9da3f3b24630bc1757dfaa2a8952db07a"; - sha256 = "1a0lb87vb0qcp5wy6swk4jcc88l7vhy6iflsk7zplw547mbjhjsy"; + rev = "3d80a46b44a362a97a6b963a2bf788fd1f67ade1"; + sha256 = "03m915g3283z2nfdr03dj5k76wn917knfqxb0xj3qinbl4cka2p1"; }; nativeBuildInputs = [ @@ -33,8 +33,7 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/Morgan-Stanley/hobbes"; license = licenses.asl20; - maintainers = [ maintainers.thmzlt ]; + maintainers = with maintainers; [ kthielen thmzlt ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix index b2c764c5a8566..f36e2e48fdfb8 100644 --- a/pkgs/development/tools/iaca/2.1.nix +++ b/pkgs/development/tools/iaca/2.1.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { postFixup = ''wrapProgram $out/bin/iaca --set LD_LIBRARY_PATH $out/lib''; meta = { description = "Intel Architecture Code Analyzer"; - homepage = https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/; + homepage = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kazcw ]; diff --git a/pkgs/development/tools/iaca/3.0.nix b/pkgs/development/tools/iaca/3.0.nix index 34b9e1df19064..f03f53544223c 100644 --- a/pkgs/development/tools/iaca/3.0.nix +++ b/pkgs/development/tools/iaca/3.0.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = { description = "Intel Architecture Code Analyzer"; - homepage = https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/; + homepage = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kazcw ]; diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index 58ccb5d4cef4d..607e2ffe4a964 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { FPGAs and providing simple tools for analyzing and creating bitstream files. ''; - homepage = http://www.clifford.at/icestorm/; + homepage = "http://www.clifford.at/icestorm/"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice emily ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix index 3a39d0ddf6bd7..50a349d8ff716 100644 --- a/pkgs/development/tools/icr/default.nix +++ b/pkgs/development/tools/icr/default.nix @@ -1,28 +1,30 @@ -{ stdenv, fetchFromGitHub, crystal, shards, which -, openssl, readline, libyaml }: +{ stdenv, lib, fetchFromGitHub, crystal, shards, makeWrapper, pkgconfig, which +, openssl, readline, libyaml, zlib }: -stdenv.mkDerivation rec { +crystal.buildCrystalPackage rec { pname = "icr"; - version = "0.6.0"; + version = "0.8.0"; src = fetchFromGitHub { - owner = "crystal-community"; - repo = pname; - rev = "v${version}"; - sha256 = "0kkdqrxk4f4bqbb84mgjrk9r0fz1hsz95apvjsc49gav4c8xx3mb"; + owner = "crystal-community"; + repo = pname; + rev = "v${version}"; + sha256 = "1bz2bhs6csyg2rhrlknlvaiilq3vq8plxjh1hdxmbrfi3n6c7k5a"; }; - postPatch = '' - substituteInPlace Makefile \ - --replace /usr/local $out - ''; + shardsFile = ./shards.nix; + + buildInputs = [ libyaml openssl readline zlib ]; - buildInputs = [ crystal libyaml openssl readline ]; + nativeBuildInputs = [ makeWrapper pkgconfig which ]; - nativeBuildInputs = [ shards which ]; + # tests are failing due to our sandbox + doCheck = false; - doCheck = true; - checkTarget = "test"; + postFixup = '' + wrapProgram $out/bin/icr \ + --prefix PATH : ${lib.makeBinPath [ crystal shards makeWrapper which ]} + ''; meta = with stdenv.lib; { description = "Interactive console for the Crystal programming language"; diff --git a/pkgs/development/tools/icr/shards.nix b/pkgs/development/tools/icr/shards.nix new file mode 100644 index 0000000000000..1dddd5a42c393 --- /dev/null +++ b/pkgs/development/tools/icr/shards.nix @@ -0,0 +1,8 @@ +{ + readline = { + owner = "crystal-lang"; + repo = "crystal-readline"; + rev = "0fb7d186da8e1b157998d98d1c96e99699b791eb"; + sha256 = "1rk27vw3ssldgnfgprwvz2gag02v4g6d6yg56b3sk9w3fn8jyyi8"; + }; +} diff --git a/pkgs/development/tools/iferr/default.nix b/pkgs/development/tools/iferr/default.nix index 5874d1eeed383..0e8f797f77ce2 100644 --- a/pkgs/development/tools/iferr/default.nix +++ b/pkgs/development/tools/iferr/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { meta = with lib; { description = ''Generate "if err != nil {" block''; - homepage = https://github.com/koron/iferr; + homepage = "https://github.com/koron/iferr"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix index c4d290bf96711..edba0d686dbb2 100644 --- a/pkgs/development/tools/imatix_gsl/default.nix +++ b/pkgs/development/tools/imatix_gsl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { license = licenses.gpl3Plus; - homepage = https://github.com/imatix/gsl/; + homepage = "https://github.com/imatix/gsl/"; description = "A universal code generator"; platforms = platforms.unix; maintainers = [ maintainers.moosingin3space ]; diff --git a/pkgs/development/tools/impl/default.nix b/pkgs/development/tools/impl/default.nix index 8d368ba528a91..88b8abd842f2b 100644 --- a/pkgs/development/tools/impl/default.nix +++ b/pkgs/development/tools/impl/default.nix @@ -5,24 +5,23 @@ buildGoPackage rec { pname = "impl-unstable"; - version = "2018-02-27"; - rev = "3d0f908298c49598b6aa84f101c69670e15d1d03"; + version = "2019-11-19"; + rev = "6b9658ad00c7fbd61a7b50c195754413f6c4142c"; goPackagePath = "github.com/josharian/impl"; src = fetchFromGitHub { inherit rev; - owner = "josharian"; repo = "impl"; - sha256 = "0xpip20x5vclrl0by1760lg73v6lj6nmkbiazlskyvpkw44h8a7c"; + sha256 = "1d4fvj7fgiykznx1z4fmcc06x5hsqp9wn62m5qm1ds8m0rjqaxwi"; }; goDeps = ./deps.nix; meta = with lib; { description = "impl generates method stubs for implementing an interface."; - homepage = https://github.com/josharian/impl; + homepage = "https://github.com/josharian/impl"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/impl/deps.nix b/pkgs/development/tools/impl/deps.nix index 3477aaed6075e..f028df3be2d8e 100644 --- a/pkgs/development/tools/impl/deps.nix +++ b/pkgs/development/tools/impl/deps.nix @@ -1,11 +1,30 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { + goPackagePath = "golang.org/x/mod"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mod"; + rev = "2addee1ccfb22349ab47953a3046338e461eb4d1"; + sha256 = "1r0drcji290nlq9czibcfynpwxyqx8a5p4b7lam6wblbh2lasfb6"; + }; + } + { goPackagePath = "golang.org/x/tools"; fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "96e9e165b75e735822645eff82850b08c377be36"; - sha256 = "1zj9ck5sg9b0pphxybmvxf64hhcap7v7j37fx3v5aknf18crjjdg"; + rev = "72e4a01eba4315301fd9ce00c8c2f492580ded8a"; + sha256 = "0a8c7j4w784w441j3j3bh640vy1g6g214641qv485wyi0xj49anf"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "9bdfabe68543c54f90421aeb9a60ef8061b5b544"; + sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; }; } ] diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix index 06831e3a43c2c..2be22301cdbb8 100644 --- a/pkgs/development/tools/ineffassign/default.nix +++ b/pkgs/development/tools/ineffassign/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with lib; { description = "Detect ineffectual assignments in Go code."; - homepage = https://github.com/gordonklaus/ineffassign; + homepage = "https://github.com/gordonklaus/ineffassign"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/interfacer/default.nix b/pkgs/development/tools/interfacer/default.nix index 2f505ef1c6789..ff59ce5048264 100644 --- a/pkgs/development/tools/interfacer/default.nix +++ b/pkgs/development/tools/interfacer/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { meta = with lib; { description = "A linter that suggests interface types."; - homepage = https://github.com/mvdan/interfacer; + homepage = "https://github.com/mvdan/interfacer"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index 09684ea9986e0..ce1501fa4dd57 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cfr"; - version = "0.149"; + version = "0.150"; src = fetchurl { url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "1jksjr1345wj42nfad7k6skvpg5qsm4xgjdwzb90zhn27ddkns6v"; + sha256 = "09lq21phnhr374wb8gj355jsqj8c4m5m818r3pbr8f8zpaamjxfj"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix index 9791cd56ea1ae..04fe7c2f46df5 100644 --- a/pkgs/development/tools/java/fastjar/default.nix +++ b/pkgs/development/tools/java/fastjar/default.nix @@ -23,7 +23,7 @@ let version = "0.98"; in the stock `jar' program running without a JIT. ''; - homepage = https://savannah.nongnu.org/projects/fastjar/; + homepage = "https://savannah.nongnu.org/projects/fastjar/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/development/tools/java/jhiccup/default.nix index dae3945349592..1b235e354855b 100644 --- a/pkgs/development/tools/java/jhiccup/default.nix +++ b/pkgs/development/tools/java/jhiccup/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Measure JVM application stalls and GC pauses"; - homepage = https://www.azul.com/jhiccup/; + homepage = "https://www.azul.com/jhiccup/"; license = stdenv.lib.licenses.cc0; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/tools/jazzy/Gemfile.lock b/pkgs/development/tools/jazzy/Gemfile.lock index f703cb707e623..bed539369ac3c 100644 --- a/pkgs/development/tools/jazzy/Gemfile.lock +++ b/pkgs/development/tools/jazzy/Gemfile.lock @@ -12,10 +12,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.8.4) + cocoapods (1.9.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.8.4) + cocoapods-core (= 1.9.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -30,13 +30,15 @@ GEM molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.11.1, < 2.0) - cocoapods-core (1.8.4) + xcodeproj (>= 1.14.0, < 2.0) + cocoapods-core (1.9.1) activesupport (>= 4.0.2, < 6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) + netrc (~> 0.11) + typhoeus (~> 1.0) cocoapods-deintegrate (1.0.4) cocoapods-downloader (1.3.0) cocoapods-plugins (1.0.0) @@ -46,18 +48,20 @@ GEM cocoapods-trunk (1.4.1) nap (>= 0.8, < 2.0) netrc (~> 0.11) - cocoapods-try (1.1.0) + cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) escape (0.0.4) - ffi (1.11.3) + ethon (0.12.0) + ffi (>= 1.3.0) + ffi (1.12.2) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - jazzy (0.13.1) + jazzy (0.13.3) cocoapods (~> 1.5) mustache (~> 1.1) open4 @@ -68,7 +72,7 @@ GEM xcinvoke (~> 0.3.0) json (2.3.0) liferaft (0.0.6) - minitest (5.13.0) + minitest (5.14.0) molinillo (0.6.6) mustache (1.1.1) nanaimo (0.2.6) @@ -76,17 +80,19 @@ GEM netrc (0.11.0) open4 (1.3.4) redcarpet (3.5.0) - rouge (3.14.0) + rouge (3.18.0) ruby-macho (1.4.0) - sassc (2.2.1) + sassc (2.3.0) ffi (~> 1.9) sqlite3 (1.4.2) thread_safe (0.3.6) - tzinfo (1.2.6) + typhoeus (1.3.1) + ethon (>= 0.9.0) + tzinfo (1.2.7) thread_safe (~> 0.1) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.14.0) + xcodeproj (1.16.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/tools/jazzy/default.nix b/pkgs/development/tools/jazzy/default.nix index a6cb7a92b6398..a0561040704cf 100644 --- a/pkgs/development/tools/jazzy/default.nix +++ b/pkgs/development/tools/jazzy/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A command-line utility that generates documentation for Swift or Objective-C"; - homepage = https://github.com/realm/jazzy; + homepage = "https://github.com/realm/jazzy"; license = licenses.mit; platforms = platforms.darwin; maintainers = with maintainers; [ diff --git a/pkgs/development/tools/jazzy/gemset.nix b/pkgs/development/tools/jazzy/gemset.nix index 872b629678661..f4f9c8104d4de 100644 --- a/pkgs/development/tools/jazzy/gemset.nix +++ b/pkgs/development/tools/jazzy/gemset.nix @@ -57,21 +57,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "007ssx75588ji2d8l8s6c95dng1c7b6yacng8nngpy7maijzjgzc"; + sha256 = "0wxr81qy4jsbxl066nlfp8zlqk31i6fsmd7f01xmi9bv04990hrs"; type = "gem"; }; - version = "1.8.4"; + version = "1.9.1"; }; cocoapods-core = { - dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap"]; + dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zcisqb404828n5d3lbk9y2yyx8v2yr6rk1l8y9a4i1hp743fiad"; + sha256 = "0c1679fkyp06dwsh93r0ldzly9vc74g0br4jdngwvdl4g0j4fyzc"; type = "gem"; }; - version = "1.8.4"; + version = "1.9.1"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -132,12 +132,14 @@ version = "1.4.1"; }; cocoapods-try = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gf2zjmcjhh9psq15yfy82wz5jnlihf5bcw79f8hlv4cnqyspncj"; + sha256 = "1znyp625rql37ivb5rk9fk9564cmax8icxfr041ysivpdrn98nql"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; colored2 = { source = { @@ -152,10 +154,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; type = "gem"; }; - version = "1.1.5"; + version = "1.1.6"; }; escape = { source = { @@ -165,15 +167,26 @@ }; version = "0.0.4"; }; + ethon = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"; + type = "gem"; + }; + version = "0.12.0"; + }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10ay35dm0lkcqprsiya6q2kwvyid884102ryipr4vrk790yfp8kd"; + sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; type = "gem"; }; - version = "1.11.3"; + version = "1.12.2"; }; fourflusher = { groups = ["default"]; @@ -230,10 +243,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0917v3dk9ks0apr0srk9sm6agk47iyh5bzfxqpkhd4dfgb4vpvjx"; + sha256 = "1iv98hfmxf1vib63bq8l0wgx5n8kw2kmsj55y2vs04f2kcav3n4n"; type = "gem"; }; - version = "0.13.1"; + version = "0.13.3"; }; json = { groups = ["default"]; @@ -258,10 +271,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w16p7cvslh3hxd3cia8jg4pd85z7rz7xqb16vh42gj4rijn8rmi"; + sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; type = "gem"; }; - version = "5.13.0"; + version = "5.14.0"; }; molinillo = { groups = ["default"]; @@ -332,10 +345,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k5jrp0qc9p61mfcwyn1a7dajmkw04z6y76wa8a0axh1v2wrw8ld"; + sha256 = "1n9h0ls2a2zq0bcsw31wxci1wdxb8s3vglfadxpcs6b04vkf6nqq"; type = "gem"; }; - version = "3.14.0"; + version = "3.18.0"; }; ruby-macho = { groups = ["default"]; @@ -353,10 +366,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bnid7r5z5hcin5hykvpvv8xig27wbbckxwis60z2aaxq4j9siz"; + sha256 = "1qzfnvb8khvc6w2sn3k91mndc2w50xxx5c84jkr6xdxlmaq1a3kg"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.0"; }; sqlite3 = { groups = ["default"]; @@ -376,16 +389,27 @@ }; version = "0.3.6"; }; + typhoeus = { + dependencies = ["ethon"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5"; + type = "gem"; + }; + version = "1.3.1"; + }; tzinfo = { dependencies = ["thread_safe"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; xcinvoke = { dependencies = ["liferaft"]; @@ -402,9 +426,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h9iba53mrb663qdqzpfbdwkwzqv7hndd0df71yr2kj2hzwjmkvb"; + sha256 = "1bkk8y6lzd86w9yx72hd1nil3fkk5f0v3il9vm554gzpl6dhc2bi"; type = "gem"; }; - version = "1.14.0"; + version = "1.16.0"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix index 79054c7f667ba..ad127b94960f7 100644 --- a/pkgs/development/tools/jbake/default.nix +++ b/pkgs/development/tools/jbake/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "2.6.4"; + version = "2.6.5"; pname = "jbake"; src = fetchzip { url = "https://dl.bintray.com/jbake/binary/${pname}-${version}-bin.zip"; - sha256 = "0zgp0wwxxmi13v5q5jvr610igx2vxg0bwck9j1imnn9ciakg1aaw"; + sha256 = "0ripayv1vf4f4ylxr7h9kad2xhy3y98ca8s4p38z7dn8l47zg0qw"; }; buildInputs = [ makeWrapper jre ]; diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix index 0fc8b85d8f427..e031159d37c59 100644 --- a/pkgs/development/tools/jid/default.nix +++ b/pkgs/development/tools/jid/default.nix @@ -2,22 +2,22 @@ buildGoPackage rec { pname = "jid"; - version = "0.7.2"; + version = "0.7.6"; goPackagePath = "github.com/simeji/jid"; src = fetchFromGitHub { owner = "simeji"; repo = "jid"; - rev = version; - sha256 = "0p4srp85ilcafrn9d36rzpzg5k5jd7is93p68hamgxqyiiw6a8fi"; + rev = "v${version}"; + sha256 = "15fgi7cpq5bg2lnpr7rip359xwj2kvlj6j2qzi837c26adnw973x"; }; goDeps = ./deps.nix; meta = { description = "A command-line tool to incrementally drill down JSON"; - homepage = https://github.com/simeji/jid; + homepage = "https://github.com/simeji/jid"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ stesie ]; diff --git a/pkgs/development/tools/jid/deps.nix b/pkgs/development/tools/jid/deps.nix index a027902d2df2c..6e2d5514a838b 100644 --- a/pkgs/development/tools/jid/deps.nix +++ b/pkgs/development/tools/jid/deps.nix @@ -1,12 +1,12 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { goPackagePath = "github.com/bitly/go-simplejson"; fetch = { type = "git"; url = "https://github.com/bitly/go-simplejson"; - rev = "9db4a59bd4d803ae0c173a7d8a538e056cd59d57"; - sha256 = "0cbnjzjq55jnzk07zdk7nb96yzgpyawm1r6km3xignn8ih4bnn6g"; + rev = "v0.5.0"; + sha256 = "0n9f9dz1jn1jx86d48569nznpjn9fmq3knn7r65xpy7jhih284jj"; }; } { @@ -14,8 +14,26 @@ fetch = { type = "git"; url = "https://github.com/fatih/color"; - rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; - sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.0.9"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; }; } { @@ -23,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "c88d7e5f2e24de48a200a2655ac8a0910be9a0f7"; - sha256 = "14prmzjlv9z31n6caaaq1kwi4p0mp3x4pv5r7d0575lcampa41jw"; + rev = "v0.0.4"; + sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; }; } { @@ -32,7 +50,7 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "60ab7e3d12ed91bc1b2486559c4b3a6b62297577"; + rev = "60ab7e3d12ed"; sha256 = "040064fh7wzdmv8flw6svi007hiqs1cjk1a3k3gpg7gii3npifsl"; }; } @@ -41,7 +59,7 @@ fetch = { type = "git"; url = "https://github.com/nwidger/jsoncolor"; - rev = "75a6de4340e59be95f0884b9cebdda246e0fdf40"; + rev = "75a6de4340e5"; sha256 = "0aiv42xijrqgrxfx6pfyrndpwqv8i1qwsk190jdczyjxlnki2nki"; }; } @@ -50,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "059132a15dd08d6704c67711dae0cf35ab991756"; - sha256 = "0bxkbh2rq40kdk8i05am5np77cnskx3571v2k300j5mmj1rl1ijg"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; }; } ] diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix index 8722d49eb32ee..19d6fa392dd2e 100644 --- a/pkgs/development/tools/jira_cli/default.nix +++ b/pkgs/development/tools/jira_cli/default.nix @@ -25,7 +25,7 @@ in meta = with stdenv.lib; { description = "A command line interface to Jira"; - homepage = https://github.com/alisaifee/jira-cli; + homepage = "https://github.com/alisaifee/jira-cli"; maintainers = with maintainers; [ nyarly ]; license = licenses.mit; }; diff --git a/pkgs/development/tools/jl/default.nix b/pkgs/development/tools/jl/default.nix index 0d9ce143a8345..9a1314a608358 100644 --- a/pkgs/development/tools/jl/default.nix +++ b/pkgs/development/tools/jl/default.nix @@ -15,7 +15,7 @@ mkDerivation rec { patches = [ # MonadFail compatibility patch. Should be removed with the next release (fetchpatch { - url = https://github.com/chrisdone/jl/commit/6d40308811cbc22a96b47ebe69ec308b4e9fd356.patch; + url = "https://github.com/chrisdone/jl/commit/6d40308811cbc22a96b47ebe69ec308b4e9fd356.patch"; sha256 = "1pg92ffkg8kim5r8rz8js6fjqyjisg1266sf7p9jyxjgsskwpa4g"; }) ]; @@ -33,5 +33,5 @@ mkDerivation rec { license = stdenv.lib.licenses.bsd3; description = "Functional sed for JSON"; maintainers = with stdenv.lib.maintainers; [ fgaz ]; - homepage = https://github.com/chrisdone/jl; + homepage = "https://github.com/chrisdone/jl"; } diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix index b12be2a9567f5..5414c51a00c71 100644 --- a/pkgs/development/tools/jmespath/default.nix +++ b/pkgs/development/tools/jmespath/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { description = "A JMESPath implementation in Go"; - homepage = https://github.com/jmespath/go-jmespath; + homepage = "https://github.com/jmespath/go-jmespath"; maintainers = with maintainers; [ cransom ]; license = licenses.asl20; }; diff --git a/pkgs/development/tools/jo/default.nix b/pkgs/development/tools/jo/default.nix index 9e5d29a6bb23f..0dcd02eb61888 100644 --- a/pkgs/development/tools/jo/default.nix +++ b/pkgs/development/tools/jo/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small utility to create JSON objects"; - homepage = https://github.com/jpmens/jo; + homepage = "https://github.com/jpmens/jo"; license = licenses.gpl2Plus; maintainers = [maintainers.markus1189]; platforms = platforms.all; diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix index 3ebdc881dcb34..1e7d1023edfad 100644 --- a/pkgs/development/tools/jp/default.nix +++ b/pkgs/development/tools/jp/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { description = "A command line interface to the JMESPath expression language for JSON"; - homepage = https://github.com/jmespath/jp; + homepage = "https://github.com/jmespath/jp"; maintainers = with maintainers; [ cransom ]; license = licenses.asl20; }; diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/development/tools/jsduck/default.nix index 0b6098e5ee93e..8748fb8e512d3 100644 --- a/pkgs/development/tools/jsduck/default.nix +++ b/pkgs/development/tools/jsduck/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple JavaScript Duckumentation generator."; - homepage = https://github.com/senchalabs/jsduck; + homepage = "https://github.com/senchalabs/jsduck"; license = with licenses; gpl3; maintainers = with maintainers; [ periklis nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index b0b73d03d10c7..5fa2b12e9c39a 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -1,26 +1,27 @@ -{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, dash }: +{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, dash +, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.5.10"; + version = "0.5.11"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "0s8np28glzn3kmh59dwk86yc9fb2lm9fq2325kzmy7rkb5jsdcl1"; + sha256 = "0li5lspxfrim8gymqzzd5djjfbfi7jh1m234qlzy5vkx2q9qg0xv"; }; - cargoSha256 = "05mrzav3aydvwac9jjckdmlxvxnlcncmkfsdb9z7zvxia4k89w1l"; + cargoSha256 = "1sp8xrh3gmgmphh1bv050p1ybjybk9x8kswyxz2rd93q3zb5hpzz"; - postInstall = '' - # generate completion scripts for just + nativeBuildInputs = [ installShellFiles ]; - mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} + postInstall = '' + installManPage man/just.1 - $out/bin/just --completions bash > "$out/share/bash-completion/completions/just" - $out/bin/just --completions fish > "$out/share/fish/vendor_completions.d/just.fish" - $out/bin/just --completions zsh > "$out/share/zsh/site-functions/_just" + installShellCompletion --bash --name just.bash completions/just.bash + installShellCompletion --fish --name just.fish completions/just.fish + installShellCompletion --zsh --name _just completions/just.zsh ''; checkInputs = [ coreutils bash dash ]; @@ -53,7 +54,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A handy way to save and run project-specific commands"; - homepage = https://github.com/casey/just; + homepage = "https://github.com/casey/just"; license = licenses.cc0; maintainers = with maintainers; [ xrelkd ]; platforms = platforms.all; diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index b8071bf1ac26e..9b1b49262703f 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { subPackages = [ "./" ]; meta = with stdenv.lib; { - homepage = https://k6.io/; + homepage = "https://k6.io/"; description = "A modern load testing tool, using Go and JavaScript"; license = licenses.agpl3Plus; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix index 7de5cd6340add..5b67d4ddbc57a 100644 --- a/pkgs/development/tools/kafkacat/default.nix +++ b/pkgs/development/tools/kafkacat/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A generic non-JVM producer and consumer for Apache Kafka"; - homepage = https://github.com/edenhill/kafkacat; + homepage = "https://github.com/edenhill/kafkacat"; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ nyarly ]; diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix index bbcb10a354cfe..fece8c17ceadb 100644 --- a/pkgs/development/tools/kcli/default.nix +++ b/pkgs/development/tools/kcli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0whijr2r2j5bvfy8jgmpxsa0zvwk5kfjlpnkw4za5k35q7bjffls"; }; - modSha256 = "1wcqh3306q9wxb6pnl8cpk73vmy36bjv2gil03j7j4pajs1f2lwn"; + vendorSha256 = "0whqrms5mc7v14p2h1jfvkawm30xaylivijlsghrsaq468qcgg15"; subPackages = [ "." ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ cswank ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index 94a0ff87982e0..f58303cae6f2a 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -1,32 +1,33 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: with stdenv.lib; -buildGoPackage rec { +buildGoModule rec { pname = "kind"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - sha256 = "0hvb0rbi1m0d1flk15l3wws96kmmjhsy6islkhy5h7jalc4k0nx4"; + sha256 = "0r301nqvycik8fwlghq0cymmq4rm7xp8haj39i2nynxyw8zk6zym"; }; - goDeps = ./deps.nix; + vendorSha256 = "1qvbm8v8yah6r6cw1cvdw79yiwxb2amzdkkzvzbwigy0j4bvn9mi"; goPackagePath = "sigs.k8s.io/kind"; subPackages = [ "." ]; nativeBuildInputs = [ installShellFiles ]; postInstall = '' - $bin/bin/kind completion bash > kind.bash - $bin/bin/kind completion zsh > kind.zsh - installShellCompletion kind.{bash,zsh} + for shell in bash zsh; do + $out/bin/kind completion $shell > kind.$shell + installShellCompletion kind.$shell + done ''; meta = { description = "Kubernetes IN Docker - local clusters for testing Kubernetes"; - homepage = https://github.com/kubernetes-sigs/kind; + homepage = "https://github.com/kubernetes-sigs/kind"; maintainers = with maintainers; [ offline rawkode ]; license = stdenv.lib.licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/tools/kind/deps.nix b/pkgs/development/tools/kind/deps.nix deleted file mode 100644 index 1706406c45663..0000000000000 --- a/pkgs/development/tools/kind/deps.nix +++ /dev/null @@ -1,741 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/NYTimes/gziphandler"; - fetch = { - type = "git"; - url = "https://github.com/NYTimes/gziphandler"; - rev = "56545f4a5d46"; - sha256 = "1fwk9wz6vrvq72f2gq8jhvd1nvv6grqgwrjq66vjpm0726pxar72"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/purell"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/purell"; - rev = "v1.0.0"; - sha256 = "1qhsy1nm96b9kb63svkvkqmmw15xg6irwcysisxdgzk64adfwqv1"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/urlesc"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/urlesc"; - rev = "5bd2802263f2"; - sha256 = "15y5r3asvm7196m3nza5xvdvlc2k11p6lfs6hi917hl7r9vgi6mp"; - }; - } - { - goPackagePath = "github.com/alessio/shellescape"; - fetch = { - type = "git"; - url = "https://github.com/alessio/shellescape"; - rev = "b115ca0f9053"; - sha256 = "0z4jq94yn0jjj56bzrpdazb3pv1jg0r7z0ikq3gjaa51h423wk4z"; - }; - } - { - goPackagePath = "github.com/armon/consul-api"; - fetch = { - type = "git"; - url = "https://github.com/armon/consul-api"; - rev = "eb2c6b5be1b6"; - sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; - }; - } - { - goPackagePath = "github.com/coreos/etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/etcd"; - rev = "v3.3.10"; - sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; - }; - } - { - goPackagePath = "github.com/coreos/go-etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-etcd"; - rev = "v2.0.0"; - sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; - }; - } - { - goPackagePath = "github.com/coreos/go-semver"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-semver"; - rev = "v0.2.0"; - sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "v1.0.10"; - sha256 = "1bqkf2bvy1dns9zd24k81mh2p1zxsx2nhq5cj8dz2vgkv1xkh60i"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/docker/spdystream"; - fetch = { - type = "git"; - url = "https://github.com/docker/spdystream"; - rev = "449fdfce4d96"; - sha256 = "1412cpiis971iq1kxrirzirhj2708ispjh0x0dh879b66x8507sl"; - }; - } - { - goPackagePath = "github.com/elazarl/goproxy"; - fetch = { - type = "git"; - url = "https://github.com/elazarl/goproxy"; - rev = "c4fc26588b6e"; - sha256 = "1s3v02px61a3hmvb47rqk598z5visayxq46k3c8dcrayhhngv2fw"; - }; - } - { - goPackagePath = "github.com/emicklei/go-restful"; - fetch = { - type = "git"; - url = "https://github.com/emicklei/go-restful"; - rev = "ff4f55a20633"; - sha256 = "1v5lj5142abz3gvbygp6xghpdx4ps2lwswl8559ivaidahwnc21c"; - }; - } - { - goPackagePath = "github.com/evanphx/json-patch"; - fetch = { - type = "git"; - url = "https://github.com/evanphx/json-patch"; - rev = "v4.5.0"; - sha256 = "144mk2v9q37l1qjf8498nff4hhz96mlkl7ls7ihixbmrji4lmch4"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "73d445a93680"; - sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7"; - }; - } - { - goPackagePath = "github.com/go-logr/logr"; - fetch = { - type = "git"; - url = "https://github.com/go-logr/logr"; - rev = "v0.1.0"; - sha256 = "0fhijjhxz4n2j5i24ckzv8r9kri3v44jdyklgbqjfq0xm7izqg14"; - }; - } - { - goPackagePath = "github.com/go-openapi/jsonpointer"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/jsonpointer"; - rev = "46af16f9f7b1"; - sha256 = "0w0fphmdycjzbsm1vppdcjc9aqinkcdzcq3pxikdvdqh5p791gsc"; - }; - } - { - goPackagePath = "github.com/go-openapi/jsonreference"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/jsonreference"; - rev = "13c6e3589ad9"; - sha256 = "1fh4xcl9ijww4bdq656sx981d57w2c9zx5148jsxlsg4bsvxmwis"; - }; - } - { - goPackagePath = "github.com/go-openapi/spec"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/spec"; - rev = "6aced65f8501"; - sha256 = "0yf0nw7167yjpiqrikns5djarjpf2r07q6xnq9xb1cfsc4m7ynm4"; - }; - } - { - goPackagePath = "github.com/go-openapi/swag"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/swag"; - rev = "1d0bd113de87"; - sha256 = "0fmk42chj20679n87n6sig3czs25lavyj6w208000n6kccv1ns3c"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "65acae22fc9d"; - sha256 = "0700alky9z0g9akhrzn20wf4jr1600d0clhs32sm8chnlbvidy46"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "02826c3e7903"; - sha256 = "0w46bsllddfij66nrg8jbfjsr54birvfww8a2fj9fmgyig5syn2x"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.2"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.3.0"; - sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "v1.0.0"; - sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "v1.1.1"; - sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; - }; - } - { - goPackagePath = "github.com/googleapis/gnostic"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gnostic"; - rev = "0c5108395e2d"; - sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "v0.5.1"; - sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "v1.0.0"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - { - goPackagePath = "github.com/hpcloud/tail"; - fetch = { - type = "git"; - url = "https://github.com/hpcloud/tail"; - rev = "v1.0.0"; - sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "v1.1.8"; - sha256 = "1kbp9fj6fxfql0ir59zb6v68l4bpwlmk76xm8vaikw1hp6y9bcss"; - }; - } - { - goPackagePath = "github.com/kisielk/errcheck"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/errcheck"; - rev = "v1.2.0"; - sha256 = "0am6g10ipdxw84byscm7shda654882wjcbinq5c4696m6mhi2qrd"; - }; - } - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "v1.8.0"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "d5b7844b561a"; - sha256 = "1g84l4wns28xjpn6nl1g33dcj3sfgxlkqqsa6w8fbq2kwyd50xka"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.11"; - sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.1.0"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "v1.1.2"; - sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "v1.0.1"; - sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; - }; - } - { - goPackagePath = "github.com/munnerz/goautoneg"; - fetch = { - type = "git"; - url = "https://github.com/munnerz/goautoneg"; - rev = "a547fc61f48d"; - sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; - }; - } - { - goPackagePath = "github.com/mxk/go-flowrate"; - fetch = { - type = "git"; - url = "https://github.com/mxk/go-flowrate"; - rev = "cca7078d478f"; - sha256 = "0zqs39923ja0yypdmiqk6x8pgmfs3ms5x5sl1dqv9z6zyx2xy541"; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "v1.10.1"; - sha256 = "033a42h1wzmji57p86igg9whvsbp6nvfdsypskw738ys903n3z4d"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "v1.7.0"; - sha256 = "09j6wq425wgzzsbwm9ckhfgl2capv3yyqbrf45qyrjwkzm49i02y"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "v1.6.0"; - sha256 = "0l2830pi64fg0bdsyd5afkbw0p7879pppzdqqk3c7vjrjfmi5xbq"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.9.0"; - sha256 = "1hlivqlcnm9wrj0v7h43gamw7mvg6svz9sm31fx28zn4ll25ablh"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "v1.5.2"; - sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "v1.1.2"; - sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "v1.3.0"; - sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "v0.0.5"; - sha256 = "0z4x8js65mhwg1gf6sa865pdxfgn45c3av9xlcc1l3xjvcnx32v2"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "v1.0.0"; - sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.5"; - sha256 = "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "v1.3.2"; - sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.0"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.4.0"; - sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "d75b2dcb6bc8"; - sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; - }; - } - { - goPackagePath = "github.com/xordataexchange/crypt"; - fetch = { - type = "git"; - url = "https://github.com/xordataexchange/crypt"; - rev = "b2862e3d0a77"; - sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "13f9640d40b9"; - sha256 = "1ba2767lvklnmfvb9jkwvd4m7z6326gaiz3rgylh795g88hy34g1"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6f"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "86b910548bc1"; - sha256 = "1z8l2wp27q0bd4nc46j31lc7cr6kiw52zi6ix3i121pd3rcyrw44"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "6c7e314b6563"; - sha256 = "1m1n6r8v6mrlh0yvlz3qxz4s7jc7nis0zf3dfl1i6hqh5xblkwnw"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/inf.v0"; - fetch = { - type = "git"; - url = "https://gopkg.in/inf.v0"; - rev = "v0.9.1"; - sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/tomb.v1"; - rev = "dd632973f1e7"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.7"; - sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v3"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v3"; - rev = "4206685974f2"; - sha256 = "1ff5fd8x45cay9100ds63hxd32s7czsrric0ql6a1jrxczsgqk1g"; - }; - } - { - goPackagePath = "k8s.io/apimachinery"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apimachinery"; - rev = "v0.17.0"; - sha256 = "1418y3p2fx7zsf1anpwcma1fqnaymal12d6x33j600jf1y0j9g8i"; - }; - } - { - goPackagePath = "k8s.io/gengo"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/gengo"; - rev = "0689ccc1d7d6"; - sha256 = "10c0kbm07pzxwdxpsmcgqkcxqxaijyywvwj1rciw6ssfcgx7kdc5"; - }; - } - { - goPackagePath = "k8s.io/klog"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/klog"; - rev = "v1.0.0"; - sha256 = "1cgannfmldcrcksb2wqdn2b5qabqyxl9r25w9y4qbljw24hhnlvn"; - }; - } - { - goPackagePath = "k8s.io/kube-openapi"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/kube-openapi"; - rev = "30be4d16710a"; - sha256 = "13pksn2xzyhrz569zihqy78y9ckn4sf4f4x31w1czfwbs87n00gf"; - }; - } - { - goPackagePath = "sigs.k8s.io/structured-merge-diff"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes-sigs/structured-merge-diff"; - rev = "15d366b2352e"; - sha256 = "1anrx09ksgrwjwmbrcrk3hx8wyzjaakzmmn36nd23if36nv1xg11"; - }; - } - { - goPackagePath = "sigs.k8s.io/yaml"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes-sigs/yaml"; - rev = "v1.1.0"; - sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb"; - }; - } -] diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 0c55dc9fdb18f..e2897135cd084 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An anti-bikeshedding Kotlin linter with built-in formatter"; - homepage = https://ktlint.github.io/; + homepage = "https://ktlint.github.io/"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ tadfisher ]; diff --git a/pkgs/development/tools/kube-aws/default.nix b/pkgs/development/tools/kube-aws/default.nix index 6083c03ebc9f7..0e96683b06e8b 100644 --- a/pkgs/development/tools/kube-aws/default.nix +++ b/pkgs/development/tools/kube-aws/default.nix @@ -29,7 +29,7 @@ buildGoPackage rec { meta = { description = "Tool for deploying kubernetes on aws using coreos"; license = licenses.asl20; - homepage = https://github.com/coreos/coreos-kubernetes; + homepage = "https://github.com/coreos/coreos-kubernetes"; maintainers = with maintainers; [offline]; platforms = with platforms; unix; }; diff --git a/pkgs/development/tools/kube-prompt/default.nix b/pkgs/development/tools/kube-prompt/default.nix index 8e6ca8e221e21..1a7bd6e828927 100644 --- a/pkgs/development/tools/kube-prompt/default.nix +++ b/pkgs/development/tools/kube-prompt/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { meta = { description = "An interactive kubernetes client featuring auto-complete using go-prompt"; license = lib.licenses.mit; - homepage = https://github.com/c-bata/kube-prompt; + homepage = "https://github.com/c-bata/kube-prompt"; maintainers = [ lib.maintainers.vdemeester ]; }; } diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index 87807355413b5..8b980dc7e31ea 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubectx"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "ahmetb"; repo = pname; rev = "v${version}"; - sha256 = "1wkvmic29mkzfs6619wjs3mya8ffigwv9n1w9y7zkfvpi8gxa0a6"; + sha256 = "1b22jk8zl944w5zn3s7ybkkbmzp9519x32pfqwd1malfly7dzf55"; }; buildInputs = [ makeWrapper ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = { description = "Fast way to switch between clusters and namespaces in kubectl!"; license = licenses.asl20; - homepage = https://github.com/ahmetb/kubectx; + homepage = "https://github.com/ahmetb/kubectx"; maintainers = with maintainers; [ periklis ]; platforms = with platforms; unix; }; diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/development/tools/kubeprompt/default.nix index 7c6f3f3396cf3..bac22169edf25 100644 --- a/pkgs/development/tools/kubeprompt/default.nix +++ b/pkgs/development/tools/kubeprompt/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { ''; goPackagePath = "github.com/jlesquembre/kubeprompt"; - modSha256 = "0rbpdk2dixywn3wcdgz48f3xw3b7fk8xh7mrlx27wz7fq5wj9v8f"; + vendorSha256 = "089lfkvyf00f05kkmr935jbrddf2c0v7m2356whqnz7ad6a2whsi"; meta = with stdenv.lib; { description = "Kubernetes prompt"; @@ -28,4 +28,4 @@ buildGoModule rec { maintainers = with maintainers; [ jlesquembre ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/kubicorn/default.nix b/pkgs/development/tools/kubicorn/default.nix index 104b11c1ce1db..67e170f6e25c6 100644 --- a/pkgs/development/tools/kubicorn/default.nix +++ b/pkgs/development/tools/kubicorn/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = { description = "Simple, cloud native infrastructure for Kubernetes"; - homepage = http://kubicorn.io/; + homepage = "http://kubicorn.io/"; maintainers = with stdenv.lib.maintainers; [ offline ]; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index c1fc313fbc109..1895cd0786dda 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -1,26 +1,30 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, Security }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.7.3"; + version = "0.9.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "186h5fng16gwqhsy2nxswbrrxsx0ysqrb4pqznyygbiz5cd9bgxp"; + sha256 = "0q1dxry10iaf7zx6vyr0da4ihqx7l8dlyhlqm8qqfz913h2wam8c"; }; - cargoSha256 = "1yllpi8dp1fy39z4zmhyf1hdjpl62vwh8b8qlj0g778qsdrm9p98"; + cargoSha256 = "13zs2xz3s4732zxsimg7b22d9707ln4gpscznxi13cjkf5as9gbz"; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + postInstall = '' + installShellCompletion completion/kubie.bash + ''; meta = with stdenv.lib; { - description = - "Shell independent context and namespace switcher for kubectl"; + description = "Shell independent context and namespace switcher for kubectl"; homepage = "https://github.com/sbstp/kubie"; license = with licenses; [ zlib ]; maintainers = with maintainers; [ illiusdope ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index e60181e9bc4c5..e35cc1c8fbd51 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { # avoid finding test and development commands sourceRoot = "source/kustomize"; - modSha256 = "1bas6al14ck0d2ccb4235426a5hldqsm0nf8vi76chz4nahzb71g"; + vendorSha256 = "06mf5zvxn10g5rqjpqv3afvhj9xmijbj8ag8pqcg1996s4rp4p7a"; meta = with lib; { description = "Customization of kubernetes YAML configurations"; @@ -32,8 +32,8 @@ buildGoModule rec { multiple purposes, leaving the original YAML untouched and usable as is. ''; - homepage = https://github.com/kubernetes-sigs/kustomize; + homepage = "https://github.com/kubernetes-sigs/kustomize"; license = licenses.asl20; maintainers = with maintainers; [ carlosdagos vdemeester periklis zaninime ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/kythe/default.nix b/pkgs/development/tools/kythe/default.nix index c2bba7b325426..e9748d6e45e90 100644 --- a/pkgs/development/tools/kythe/default.nix +++ b/pkgs/development/tools/kythe/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { source code — including build systems, compilers, interpreters, static analyses, editors, code-review applications, and more — to share information with each other smoothly. ''; - homepage = https://kythe.io/; + homepage = "https://kythe.io/"; license = licenses.asl20; platforms = platforms.linux; maintainers = [ maintainers.mpickering ]; diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 4b99cfb10e0de..d08c9057c0fe4 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "lazygit"; - version = "0.18"; + version = "0.20.3"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "1zc6y386w111ygyng5s74zg49iajzs77dbrcdy33igj0hbnkwq2x"; + sha256 = "1p05lfm74g28ci5575vr22q5db50h19fcvc3lzddp0vyiw570isl"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index a2a35c7fd1d70..569ad6eb3cfe2 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = { description = "A pair programming tool and library written in Golang"; - homepage = https://github.com/jeffail/leaps/; + homepage = "https://github.com/jeffail/leaps/"; license = "MIT"; maintainers = with stdenv.lib.maintainers; [ qknight ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index a80b638625e5c..4e104a79d5d23 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Core library of the sigrok signal analysis software suite"; - homepage = https://sigrok.org/; + homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index b9c149af531d7..e78afc1a86147 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Protocol decoding library for the sigrok signal analysis software suite"; - homepage = https://sigrok.org/; + homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix index 035374d3e9006..c418c16b67045 100644 --- a/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/pkgs/development/tools/literate-programming/Literate/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A literate programming tool for any language"; - homepage = http://literate.zbyedidia.webfactional.com/; + homepage = "http://literate.zbyedidia.webfactional.com/"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/literate-programming/eweb/default.nix b/pkgs/development/tools/literate-programming/eweb/default.nix index 17a7731896eeb..53964c0e98bb8 100644 --- a/pkgs/development/tools/literate-programming/eweb/default.nix +++ b/pkgs/development/tools/literate-programming/eweb/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { version = "9.10" ; - homepage = http://eweb.sf.net; + homepage = "http://eweb.sf.net"; description = "An Asciidoc-based literate programming tool, written in Python"; platforms = platforms.linux; license = licenses.gpl3Plus; diff --git a/pkgs/development/tools/literate-programming/funnelweb/default.nix b/pkgs/development/tools/literate-programming/funnelweb/default.nix index 66b44d1fc835d..9d27351f15d48 100644 --- a/pkgs/development/tools/literate-programming/funnelweb/default.nix +++ b/pkgs/development/tools/literate-programming/funnelweb/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "funnelweb-${meta.version}"; src = fetchurl { - url = http://www.ross.net/funnelweb/download/funnelweb_v320/funnelweb_v320_source.tar.gz; + url = "http://www.ross.net/funnelweb/download/funnelweb_v320/funnelweb_v320_source.tar.gz"; sha256 = "0zqhys0j9gabrd12mnk8ibblpc8dal4kbl8vnhxmdlplsdpwn4wg"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { version = "3.20"; description = "A simple, reliable literate-programming macro preprocessor"; - homepage = http://www.ross.net/funnelweb/; + homepage = "http://www.ross.net/funnelweb/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index 11ff500167859..52586939c1dfe 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/pkgs/development/tools/literate-programming/noweb/default.nix @@ -72,7 +72,7 @@ let noweb = stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple, extensible literate-programming tool"; - homepage = https://www.cs.tufts.edu/~nr/noweb; + homepage = "https://www.cs.tufts.edu/~nr/noweb"; license = licenses.bsd2; maintainers = with maintainers; [ yurrriq ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/tools/literate-programming/nuweb/default.nix b/pkgs/development/tools/literate-programming/nuweb/default.nix index 30eb28fc698c6..4885081bc5bf8 100644 --- a/pkgs/development/tools/literate-programming/nuweb/default.nix +++ b/pkgs/development/tools/literate-programming/nuweb/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { description = "A simple literate programming tool"; - homepage = http://nuweb.sourceforge.net; + homepage = "http://nuweb.sourceforge.net"; license = licenses.free; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/makerpm/default.nix b/pkgs/development/tools/makerpm/default.nix index 24e5a6b6e191d..a05615a22d9ed 100644 --- a/pkgs/development/tools/makerpm/default.nix +++ b/pkgs/development/tools/makerpm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/ivan-tkatchev/makerpm/; + homepage = "https://github.com/ivan-tkatchev/makerpm/"; description = "A clean, simple RPM packager reimplemented completely from scratch"; license = licenses.free; platforms = platforms.all; diff --git a/pkgs/development/tools/maligned/default.nix b/pkgs/development/tools/maligned/default.nix index 3029ee385188e..15d14df3ff70c 100644 --- a/pkgs/development/tools/maligned/default.nix +++ b/pkgs/development/tools/maligned/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { meta = with lib; { description = "Tool to detect Go structs that would take less memory if their fields were sorted."; - homepage = https://github.com/mdempsky/maligned; + homepage = "https://github.com/mdempsky/maligned"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/manul/default.nix b/pkgs/development/tools/manul/default.nix index f921e900e56bb..b789a99578dd0 100644 --- a/pkgs/development/tools/manul/default.nix +++ b/pkgs/development/tools/manul/default.nix @@ -17,7 +17,7 @@ buildGoPackage { meta = with stdenv.lib; { description = "The madness vendoring utility for Golang programs"; - homepage = https://github.com/kovetskiy/manul; + homepage = "https://github.com/kovetskiy/manul"; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/tools/mbed-cli/default.nix b/pkgs/development/tools/mbed-cli/default.nix index cd80a5ad9e6fc..127fa1bef863f 100644 --- a/pkgs/development/tools/mbed-cli/default.nix +++ b/pkgs/development/tools/mbed-cli/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/ARMmbed/mbed-cli; + homepage = "https://github.com/ARMmbed/mbed-cli"; description = "Arm Mbed Command Line Interface"; license = licenses.asl20; maintainers = with maintainers; [ rvolosatovs ]; diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix index 27f0063e24bef..2a0b18806011f 100644 --- a/pkgs/development/tools/mdk/default.nix +++ b/pkgs/development/tools/mdk/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "gnu-mdk-1.2.10"; src = fetchurl { - url = https://ftp.gnu.org/gnu/mdk/v1.2.10/mdk-1.2.10.tar.gz; + url = "https://ftp.gnu.org/gnu/mdk/v1.2.10/mdk-1.2.10.tar.gz"; sha256 = "1rwcq2b5vvv7318j92nxc5dayj27dpfhzc4rjiv4ccvsc0x35x5h"; }; nativeBuildInputs = [ pkgconfig ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "GNU MIX Development Kit (MDK)"; - homepage = https://www.gnu.org/software/mdk/; + homepage = "https://www.gnu.org/software/mdk/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 85a27fd9150b5..cf9ce2bd265ed 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ let baseName = "metals"; - version = "0.8.3"; + version = "0.9.0"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -15,7 +15,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1l196glr7rbsvrqmq6i7iw532jkz8d1w5m9nh0kh5z12visc7bkk"; + outputHash = "116q2jzqlmdhkqvjg31b9ib8w1k7rlr8gmjcr7z32idpn16hqg59"; }; in stdenv.mkDerivation rec { @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://scalameta.org/metals/; + homepage = "https://scalameta.org/metals/"; license = licenses.asl20; description = "Work-in-progress language server for Scala"; maintainers = with maintainers; [ ceedubs tomahna ]; diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 6466f1c4a281f..36df02ff71265 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "1.3.2"; + version = "1.3.4"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "0jwvbymwaz4whw08n9scz6vk57sx7l3qddh4m5dlv2cxishwf7n3"; + sha256 = "0mddr6jw7bl8k4iqfq3sfpxq8fffm2spi9xwdr4cskkw4qdgrrpz"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 53e2920c68d64..6dfe0f570f93f 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = https://www.minizinc.org/; + homepage = "https://www.minizinc.org/"; description = "MiniZinc is a medium-level constraint modelling language."; longDescription = '' diff --git a/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/pkgs/development/tools/misc/abi-compliance-checker/default.nix index 37d49b1f35bfd..c95a340181c0e 100644 --- a/pkgs/development/tools/misc/abi-compliance-checker/default.nix +++ b/pkgs/development/tools/misc/abi-compliance-checker/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = https://lvc.github.io/abi-compliance-checker; + homepage = "https://lvc.github.io/abi-compliance-checker"; description = "A tool for checking backward API/ABI compatibility of a C/C++ library"; license = licenses.lgpl21; maintainers = [ maintainers.bhipple ]; diff --git a/pkgs/development/tools/misc/abi-dumper/default.nix b/pkgs/development/tools/misc/abi-dumper/default.nix index ca59bf28b1ec3..3d11d25560dcb 100644 --- a/pkgs/development/tools/misc/abi-dumper/default.nix +++ b/pkgs/development/tools/misc/abi-dumper/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/lvc/abi-dumper; + homepage = "https://github.com/lvc/abi-dumper"; description = "Dump ABI of an ELF object containing DWARF debug info"; license = licenses.lgpl21; maintainers = [ maintainers.bhipple ]; diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 885cef99111c4..e7234c0492d4b 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.7"; + version = "0.2.8"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "0qx3vwsynmil1h3d2dzvqz0jzshfyy3vin14zjfmd353d915hf06"; + sha256 = "14ird8z8f467spa0kdzjf6lq7pipq7rwxrdk6ppv7y1fxw96qm9x"; }; - modSha256 = "0276dngh29kzgm95d23r8ajjrrkss0v0f0wfq1ribgsxh17v0y5n"; + vendorSha256 = "0ns20vvrj0j921wsx227dxbpga6kll7pxglfqhl53xckrh85yyd8"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ filalex77 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 5eeae0ece5cd6..a6265ba89d035 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -42,10 +42,12 @@ stdenv.mkDerivation { mkdir -p $out/bin $out/libexec cp -R libphutil $out/libexec/libphutil cp -R arcanist $out/libexec/arcanist - - ln -s $out/libexec/arcanist/bin/arc $out/bin - wrapProgram $out/bin/arc \ - --prefix PATH : "${php}/bin" + ${if stdenv.isDarwin then '' + echo "#! $shell -e" > $out/bin/arc + echo "exec ${php}/bin/php $out/libexec/arcanist/scripts/arcanist.php "'"$@"' >> $out/bin/arc + chmod +x $out/bin/arc'' + else '' + ln -s $out/libexec/arcanist/scripts/arcanist.php $out/bin/arc''} ''; meta = { diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index 8f425a929590f..05afa379f99a4 100644 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ b/pkgs/development/tools/misc/autobuild/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { summary of the build status, after reading the manual. ''; - homepage = https://josefsson.org/autobuild/; + homepage = "https://josefsson.org/autobuild/"; license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index 9901e46d57872..f002346c99496 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Archive of autoconf m4 macros"; - homepage = https://www.gnu.org/software/autoconf-archive/; + homepage = "https://www.gnu.org/software/autoconf-archive/"; license = licenses.gpl3; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index 9e777e53cf62e..424dff8541bc5 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/pkgs/development/tools/misc/autoconf/2.13.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { postInstall = ''ln -s autoconf "$out"/bin/autoconf-2.13''; meta = { - homepage = https://www.gnu.org/software/autoconf/; + homepage = "https://www.gnu.org/software/autoconf/"; description = "Part of the GNU Build System"; branch = "2.13"; diff --git a/pkgs/development/tools/misc/autoconf/2.64.nix b/pkgs/development/tools/misc/autoconf/2.64.nix index 98b55e31f60b0..1fd18bcb12afd 100644 --- a/pkgs/development/tools/misc/autoconf/2.64.nix +++ b/pkgs/development/tools/misc/autoconf/2.64.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { doInstallCheck = false; # fails meta = { - homepage = https://www.gnu.org/software/autoconf/; + homepage = "https://www.gnu.org/software/autoconf/"; description = "Part of the GNU Build System"; longDescription = '' diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 304b4fddf0d53..500d80d4bb8f4 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { doInstallCheck = false; # fails meta = { - homepage = https://www.gnu.org/software/autoconf/; + homepage = "https://www.gnu.org/software/autoconf/"; description = "Part of the GNU Build System"; longDescription = '' diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index dc7197897192e..6b9e8db2f2aad 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Automated text and program generation tool"; license = with licenses; [ gpl3Plus lgpl3Plus ]; - homepage = https://www.gnu.org/software/autogen/; + homepage = "https://www.gnu.org/software/autogen/"; platforms = platforms.all; maintainers = [ ]; }; diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index a5aa44abcdefc..b79f304788907 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { branch = "1.11"; - homepage = https://www.gnu.org/software/automake/; + homepage = "https://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; longDescription = '' diff --git a/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/pkgs/development/tools/misc/automake/automake-1.15.x.nix index f1a4864461703..858cb9a4f223f 100644 --- a/pkgs/development/tools/misc/automake/automake-1.15.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.15.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { branch = "1.15"; - homepage = https://www.gnu.org/software/automake/; + homepage = "https://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index 1e432a6e149bc..d6353fc0b9cfd 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, autoconf }: stdenv.mkDerivation rec { - name = "automake-1.16.1"; + name = "automake-1.16.2"; src = fetchurl { url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "08g979ficj18i1w6w5219bgmns7czr03iadf20mk3lrzl8wbn1ax"; + sha256 = "1l7dkqbsmbf94ax29jj1jf6a0r6ikc8jybg1p5m0c3ki7pg5ki6c"; }; nativeBuildInputs = [ autoconf perl ]; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; meta = { - branch = "1.15"; - homepage = https://www.gnu.org/software/automake/; + branch = "1.16"; + homepage = "https://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/tools/misc/automoc4/default.nix b/pkgs/development/tools/misc/automoc4/default.nix index c2bf7e0a831c3..1cabb1f0223e3 100644 --- a/pkgs/development/tools/misc/automoc4/default.nix +++ b/pkgs/development/tools/misc/automoc4/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake qt4 ]; meta = with stdenv.lib; { - homepage = https://techbase.kde.org/Development/Tools/Automoc4; + homepage = "https://techbase.kde.org/Development/Tools/Automoc4"; description = "KDE Meta Object Compiler"; license = licenses.bsd2; maintainers = [ maintainers.sander ]; diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index 39f98ae002843..bb0520cf28efb 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, yacc, flex, libusb, libelf, libftdi1, readline +{ stdenv, fetchurl, yacc, flex, libusb-compat-0_1, libelf, libftdi1, readline # docSupport is a big dependency, disabled by default , docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionals docSupport "--enable-doc"; - buildInputs = [ yacc flex libusb libelf libftdi1 readline ] + buildInputs = [ yacc flex libusb-compat-0_1 libelf libftdi1 readline ] ++ stdenv.lib.optionals docSupport [ texLive texinfo texi2html ]; meta = with stdenv.lib; { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers using the in-system programming technique (ISP). ''; - homepage = https://www.nongnu.org/avrdude/; + homepage = "https://www.nongnu.org/avrdude/"; license = licenses.gpl2Plus; platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/awf/default.nix b/pkgs/development/tools/misc/awf/default.nix index 8892142ad779d..b1e627e7aa8c2 100644 --- a/pkgs/development/tools/misc/awf/default.nix +++ b/pkgs/development/tools/misc/awf/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { in a single window allowing to see the visual effect of the applied theme. ''; - homepage = https://github.com/valr/awf; + homepage = "https://github.com/valr/awf"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ michalrus ]; diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index d9350d5f020e6..03539eb2cc84b 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line tool and library to read and convert LTTng tracefiles"; - homepage = https://www.efficios.com/babeltrace; + homepage = "https://www.efficios.com/babeltrace"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/bashdb/default.nix b/pkgs/development/tools/misc/bashdb/default.nix index 72848d049303c..0897960f6aa9c 100644 --- a/pkgs/development/tools/misc/bashdb/default.nix +++ b/pkgs/development/tools/misc/bashdb/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Bash script debugger"; - homepage = http://bashdb.sourceforge.net/; + homepage = "http://bashdb.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix index c246ddb9d9055..8fc809f0f0cfc 100644 --- a/pkgs/development/tools/misc/bin_replace_string/default.nix +++ b/pkgs/development/tools/misc/bin_replace_string/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation { binaries, bin_replace_string may only replace a given C-string with a shorter C-string. ''; - homepage = http://ohnopub.net/~ohnobinki/bin_replace_string/; - downloadPage = ftp://ohnopub.net/mirror/; + homepage = "http://ohnopub.net/~ohnobinki/bin_replace_string/"; + downloadPage = "ftp://ohnopub.net/mirror/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 82365d986b8a3..cd05ea354ca2b 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -155,7 +155,7 @@ stdenv.mkDerivation { They also include the BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc. ''; - homepage = https://www.gnu.org/software/binutils/; + homepage = "https://www.gnu.org/software/binutils/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ericson2314 ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix index 29aa99d3a15b8..6e733cfe28abe 100644 --- a/pkgs/development/tools/misc/blackmagic/default.nix +++ b/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, gcc-arm-embedded, libftdi1, libusb, pkgconfig +, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkgconfig , python, pythonPackages }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ libftdi1 - libusb + libusb-compat-0_1 python pythonPackages.intelhex ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { directory. It also places the FTDI version of the blackmagic executable in the bin directory. ''; - homepage = https://github.com/blacksphere/blackmagic; + homepage = "https://github.com/blacksphere/blackmagic"; license = licenses.gpl3Plus; maintainers = with maintainers; [ pjones emily sorki ]; # fails on darwin with diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix index 6548e9643971a..38cc2867650c2 100644 --- a/pkgs/development/tools/misc/bossa/default.nix +++ b/pkgs/development/tools/misc/bossa/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { name = "bossa-1.8"; src = fetchgit { - url = https://github.com/shumatech/BOSSA; + url = "https://github.com/shumatech/BOSSA"; rev = "3be622ca0aa6214a2fc51c1ec682c4a58a423d62"; sha256 = "19ik86qbffcb04cgmi4mnascbkck4ynfj87ha65qdk6fmp5q35vm"; }; @@ -45,7 +45,7 @@ stdenv.mkDerivation { Atmel's SAM-BA software. BOSSA is an acronym for Basic Open Source SAM-BA Application to reflect that goal. ''; - homepage = http://www.shumatech.com/web/products/bossa; + homepage = "http://www.shumatech.com/web/products/bossa"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix index dd84e3830c411..35406c4853463 100644 --- a/pkgs/development/tools/misc/bsdbuild/default.nix +++ b/pkgs/development/tools/misc/bsdbuild/default.nix @@ -48,7 +48,7 @@ EOF ]; meta = { - homepage = http://bsdbuild.hypertriton.com; + homepage = "http://bsdbuild.hypertriton.com"; description = "A cross-platform build system."; longDescription = '' diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix index 6519f349bfc8a..f3ba4b3a70d75 100644 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ b/pkgs/development/tools/misc/cbrowser/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - homepage = https://sourceforge.net/projects/cbrowser/; + homepage = "https://sourceforge.net/projects/cbrowser/"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 4eeb61a7edd9c..61ed3825bd93c 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -71,8 +71,8 @@ let ccache = stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compiler cache for fast recompilation of C/C++ code"; - homepage = http://ccache.samba.org/; - downloadPage = https://ccache.samba.org/download.html; + homepage = "http://ccache.samba.org/"; + downloadPage = "https://ccache.samba.org/download.html"; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix index f442c16e35161..ba57ef561f3e0 100644 --- a/pkgs/development/tools/misc/ccls/default.nix +++ b/pkgs/development/tools/misc/ccls/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ccls"; - version = "0.20190823.5"; + version = "0.20190823.6"; src = fetchFromGitHub { owner = "MaskRay"; repo = "ccls"; rev = version; - sha256 = "0b2pkpzn576b92zcxpwchpkyw2fww6s69818rx4g9z34kzm35zy5"; + sha256 = "11h5nwk4qqshf3i8yr4bxpnvmidrhkzd0zxhf1xqv8cv6r08k47f"; }; nativeBuildInputs = [ cmake ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A c/c++ language server powered by clang"; - homepage = https://github.com/MaskRay/ccls; + homepage = "https://github.com/MaskRay/ccls"; license = licenses.asl20; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ mic92 tobim ]; diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index ed4886305e3c9..1215c29c47769 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; - homepage = https://www.gnu.org/software/cflow/; + homepage = "https://www.gnu.org/software/cflow/"; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index f823519fb34a3..a863cec1d4c54 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A curses interface to gdb"; - homepage = https://cgdb.github.io/; + homepage = "https://cgdb.github.io/"; - repositories.git = git://github.com/cgdb/cgdb.git; + repositories.git = "git://github.com/cgdb/cgdb.git"; license = licenses.gpl2Plus; diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 887a0f16ec1a6..86ac37ee49139 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://sourceforge.net/projects/checkbaskisms/; + homepage = "https://sourceforge.net/projects/checkbaskisms/"; description = "Check shell scripts for non-portable syntax"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/misc/chrpath/default.nix b/pkgs/development/tools/misc/chrpath/default.nix index 3cae6aa2ae6b0..7e08157d7bd4b 100644 --- a/pkgs/development/tools/misc/chrpath/default.nix +++ b/pkgs/development/tools/misc/chrpath/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { binary. The rpath, or runpath if it is present, is where the runtime linker should look for the libraries needed for a program. ''; - homepage = https://tracker.debian.org/pkg/chrpath; + homepage = "https://tracker.debian.org/pkg/chrpath"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix index 1aac0bd651c7f..bcc0687f55b60 100644 --- a/pkgs/development/tools/misc/chruby/default.nix +++ b/pkgs/development/tools/misc/chruby/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Changes the current Ruby"; - homepage = https://github.com/postmodern/chruby; + homepage = "https://github.com/postmodern/chruby"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index fde1c68d34d08..7144c2bd0ae57 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.6949"; + version = "0.1.7868"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "0r64m4lcm9w0rzi61rsi3sm719ydwiv5axxnikwhzmvkdz0rd7dq"; + sha256 = "1a9gnqrkvifrwr8wpv5f6zv8xs8myzbzlhn5w72xxzh2gxdaflwg"; }; - modSha256 = "199ai38knp50mjjhddjd70qfwx63c69rf7ddw4hpzgx5cm5a04q2"; + vendorSha256 = "0y35ps2pw9z7gi4z50byd1py87bf2jdvj7l7w2gxpppmhi83myc9"; buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" ]; @@ -34,4 +34,4 @@ buildGoModule rec { license = licenses.mit; homepage = "https://circleci.com/"; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix index 53356e53a78a9..f6a4a4d9f6a48 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CLI11 is a command line parser for C++11"; - homepage = https://github.com/CLIUtils/CLI11; + homepage = "https://github.com/CLIUtils/CLI11"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nand0p ]; license = licenses.unfreeRedistributable; diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index c12d0319386cf..487c979c70924 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "20200314T202821"; + version = "20200514T134144"; src = fetchurl { url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}"; - sha256 = "1phfy4cw8pdx2ylfqc4gkniawlz5qn1bih64cx0hsc5i8n0v6qjz"; + sha256 = "1c56k9zxi71gjlrmjk2risx04dzr460vql42pfjwm1cv543kij9r"; }; dontUnpack = true; diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 861a6eff1640b..f8cad56f09958 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { and others) for finding and fixing bugs in systems code. ''; - homepage = http://coccinelle.lip6.fr/; + homepage = "http://coccinelle.lip6.fr/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index a2a39b810553a..71ed762df040a 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/pkgs/development/tools/misc/complexity/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/complexity/; + homepage = "https://www.gnu.org/software/complexity/"; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index e4d123dece1d9..8de7391b9ec66 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/pkgs/development/tools/misc/cppi/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = https://savannah.gnu.org/projects/cppi/; + homepage = "https://savannah.gnu.org/projects/cppi/"; description = "A C preprocessor directive indenter"; diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix index 973caee64e85b..8b4317a453863 100644 --- a/pkgs/development/tools/misc/cproto/default.nix +++ b/pkgs/development/tools/misc/cproto/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool to generate C function prototypes from C source code"; - homepage = https://invisible-island.net/cproto/; + homepage = "https://invisible-island.net/cproto/"; license = licenses.publicDomain; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix index 87b3cbb7121e2..33a8bf1df61d3 100644 --- a/pkgs/development/tools/misc/cquery/default.nix +++ b/pkgs/development/tools/misc/cquery/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A c/c++ language server powered by libclang"; - homepage = https://github.com/cquery-project/cquery; + homepage = "https://github.com/cquery-project/cquery"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.tobim ]; diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index 1aa17bac750c6..943adf0e469b7 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C program reducer"; - homepage = https://embed.cs.utah.edu/creduce; + homepage = "https://embed.cs.utah.edu/creduce"; # Officially, the license is: https://github.com/csmith-project/creduce/blob/master/COPYING license = licenses.ncsa; longDescription = '' diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 67cd321cfd53e..31d4e83663be4 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { license = "BSD-style"; - homepage = http://cscope.sourceforge.net/; + homepage = "http://cscope.sourceforge.net/"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix index 34cbadb38afbd..253dd4065e40c 100644 --- a/pkgs/development/tools/misc/csmith/default.nix +++ b/pkgs/development/tools/misc/csmith/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A random generator of C programs"; - homepage = https://embed.cs.utah.edu/csmith; + homepage = "https://embed.cs.utah.edu/csmith"; # Officially, the license is this: https://github.com/csmith-project/csmith/blob/master/COPYING license = licenses.bsd2; longDescription = '' diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix index 86136084d8404..3adca34a5bbce 100644 --- a/pkgs/development/tools/misc/ctags/default.nix +++ b/pkgs/development/tools/misc/ctags/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { revision = "816"; src = fetchsvn { - url = https://svn.code.sf.net/p/ctags/code/trunk; + url = "https://svn.code.sf.net/p/ctags/code/trunk"; rev = revision; sha256 = "0jmbkrmscbl64j71qffcc39x005jrmphx8kirs1g2ws44wil39hf"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { alternatively, the index entry created for that object). Many programming languages are supported. ''; - homepage = http://ctags.sourceforge.net/; + homepage = "http://ctags.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix index 3a54a17a93afb..0b89156d71aa5 100644 --- a/pkgs/development/tools/misc/cwebbin/default.nix +++ b/pkgs/development/tools/misc/cwebbin/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; cweb = fetchurl { - url = https://www.ctan.org/tex-archive/web/c_cpp/cweb/cweb-3.64ah.tgz; + url = "https://www.ctan.org/tex-archive/web/c_cpp/cweb/cweb-3.64ah.tgz"; sha256 = "1hdzxfzaibnjxjzgp6d2zay8nsarnfy9hfq55hz1bxzzl23n35aj"; }; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index cc256bc23bdfe..53ba94c7e81e6 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -74,7 +74,7 @@ python3.pkgs.buildPythonApplication rec { D-Feet can be used to inspect D-Bus interfaces of running programs and invoke methods on those interfaces. ''; - homepage = https://wiki.gnome.org/Apps/DFeet; + homepage = "https://wiki.gnome.org/Apps/DFeet"; platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ ktosiek ]; diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix index 5bccea9ced882..ad46534fcfaaa 100644 --- a/pkgs/development/tools/misc/dbench/default.nix +++ b/pkgs/development/tools/misc/dbench/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "dbench-2013-01-01"; src = fetchgit { - url = git://git.samba.org/sahlberg/dbench.git; + url = "git://git.samba.org/sahlberg/dbench.git"; rev = "65b19870ed8d25bff14cafa1c30beb33f1fb6597"; sha256 = "16lcbwmmx8z5i73k3dnf54yffrpx7ql3y9k3cpkss9dcyxb1p83i"; }; @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Filesystem benchmark tool based on load patterns"; - homepage = https://dbench.samba.org/; + homepage = "https://dbench.samba.org/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index 1ff9691876683..174168b7db7d8 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fpermissive"; meta = { - homepage = https://www.gnu.org/software/ddd; + homepage = "https://www.gnu.org/software/ddd"; description = "Graphical front-end for command-line debuggers"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 693c791875bea..73e2ab8ef92de 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { Tool command language. ''; - homepage = https://www.gnu.org/software/dejagnu/; + homepage = "https://www.gnu.org/software/dejagnu/"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix index 1dd53f62cec67..1aaf113d0b958 100644 --- a/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb }: +{ stdenv, fetchurl, libusb-compat-0_1 }: let version = "0.7.2"; in @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "dfu-programmer"; inherit version; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; src = fetchurl { url = "mirror://sourceforge/dfu-programmer/${pname}-${version}.tar.gz"; @@ -18,8 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.gpl2; description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader"; - homepage = http://dfu-programmer.sourceforge.net/; - maintainers = [ maintainers.the-kenny ]; + homepage = "http://dfu-programmer.sourceforge.net/"; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix index bf1effbe71a22..ecd40f20fd4ca 100644 --- a/pkgs/development/tools/misc/dfu-util/default.nix +++ b/pkgs/development/tools/misc/dfu-util/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { phones. With dfu-util you are able to download firmware to your device or upload firmware from it. ''; - homepage = http://dfu-util.sourceforge.net; + homepage = "http://dfu-util.sourceforge.net"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.fpletz ]; diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix index b82429cdac5f0..ead105779788c 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { installTargets = [ "install${stdenv.lib.optionalString withLibrary "-full"}" ]; meta = { - homepage = https://invisible-island.net/dialog/dialog.html; + homepage = "https://invisible-island.net/dialog/dialog.html"; description = "Display dialog boxes from shell"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.spacefrogg ]; diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 9891726c66330..3894ed58728d7 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -73,7 +73,7 @@ let meta = { description = "A fast, free distributed C/C++ compiler"; - homepage = http://distcc.org; + homepage = "http://distcc.org"; license = "GPL"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix index fe86a22b7f492..3c6fa76616fcc 100644 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "doclifter-2.19"; src = fetchurl { - url = http://www.catb.org/~esr/doclifter/doclifter-2.19.tar.gz; + url = "http://www.catb.org/~esr/doclifter/doclifter-2.19.tar.gz"; sha256 = "1as6z7mdjrrkw2kism41q5ybvyzvwcmj9qzla2fz98v9f4jbj2s2"; }; buildInputs = [ python ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Lift documents in nroff markups to XML-DocBook"; - homepage = http://www.catb.org/esr/doclifter; + homepage = "http://www.catb.org/esr/doclifter"; license = "BSD"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix index e0f85c45f290b..d5c345d9d22b3 100644 --- a/pkgs/development/tools/misc/drush/default.nix +++ b/pkgs/development/tools/misc/drush/default.nix @@ -5,19 +5,19 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line shell and Unix scripting interface for Drupal"; - homepage = https://github.com/drush-ops/drush; + homepage = "https://github.com/drush-ops/drush"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; }; src = fetchurl { - url = https://github.com/drush-ops/drush/archive/6.1.0.tar.gz; + url = "https://github.com/drush-ops/drush/archive/6.1.0.tar.gz"; sha256 = "1jgnc4jjyapyn04iczvcz92ic0vq8d1w8xi55ismqyy5cxhqj6bp"; }; consoleTable = fetchurl { - url = http://download.pear.php.net/package/Console_Table-1.1.3.tgz; + url = "http://download.pear.php.net/package/Console_Table-1.1.3.tgz"; sha256 = "07gbjd7m1fj5dmavr0z20vkqwx1cz2522sj9022p257jifj1yl76"; }; diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index 88c43a8c42a58..131c38df2f7a9 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -1,17 +1,25 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "editorconfig-checker"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; rev = "${version}"; - sha256 = "1gn7q6wg7byhr1l5ly60rbb700xrww9slbq7gbxbw5c1fl0pp3yk"; + sha256 = "1y90yz8da0iqig3m0kbjcicwblkirbbx0s3agpmz2pdca6y2ijwi"; }; - modSha256 = "1iiv12ginb3ky739z7v8wf4z5lv24gmghbybs3lzay0kqn449n4x"; + vendorSha256 = "1lyrqrm3pyfv470dmymbkb3vpvp0i2zsndp7qw34fbhp2gnay5kh"; + + nativeBuildInputs = [ installShellFiles ]; + + buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; + + postInstall = '' + installManPage docs/editorconfig-checker.1 + ''; meta = with lib; { description = "A tool to verify that your files are in harmony with your .editorconfig"; diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix index 2eda1f044ce84..e563ff203a23f 100644 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = with stdenv.lib; { - homepage = https://editorconfig.org/; + homepage = "https://editorconfig.org/"; description = "EditorConfig core library written in C"; longDescription = '' EditorConfig makes it easy to maintain the correct coding style when @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { by those editors. For information on the file format and supported text editors, see the EditorConfig website. ''; - downloadPage = https://github.com/editorconfig/editorconfig-core-c; + downloadPage = "https://github.com/editorconfig/editorconfig-core-c"; license = with licenses; [ bsd2 bsd3 ]; version = "0.12.1"; maintainers = with maintainers; [ dochang ]; diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index 7c7e534043430..d1211c9fcecde 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus dbus-glib ]; meta = with stdenv.lib; { - homepage = https://hal.freedesktop.org/releases/; + homepage = "https://hal.freedesktop.org/releases/"; description = "D-Bus bindings for GObject"; platforms = platforms.linux; license = licenses.lgpl2; diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix index 8628990d5313c..bd8a9fecee675 100644 --- a/pkgs/development/tools/misc/elfinfo/default.nix +++ b/pkgs/development/tools/misc/elfinfo/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Small utility for showing information about ELF files"; - homepage = https://elfinfo.roboticoverlords.org/; + homepage = "https://elfinfo.roboticoverlords.org/"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix index 288e8bf969985..e8992b62665f3 100644 --- a/pkgs/development/tools/misc/elfkickers/default.nix +++ b/pkgs/development/tools/misc/elfkickers/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.muppetlabs.com/~breadbox/software/elfkickers.html; + homepage = "http://www.muppetlabs.com/~breadbox/software/elfkickers.html"; description = "A collection of programs that access and manipulate ELF files"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 7d6f3758fd5b9..56bfe26ec0690 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { doInstallCheck = false; # fails 70 out of 174 tests meta = { - homepage = https://sourceware.org/elfutils/; + homepage = "https://sourceware.org/elfutils/"; description = "A set of utilities to handle ELF objects"; platforms = lib.platforms.linux; license = lib.licenses.gpl3; diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix index b449c0a2d0106..8caa33c20d1be 100644 --- a/pkgs/development/tools/misc/epm/default.nix +++ b/pkgs/development/tools/misc/epm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The ESP Package Manager generates distribution archives for a variety of platforms"; - homepage = https://www.msweet.org/projects.php?Z2; + homepage = "https://www.msweet.org/projects.php?Z2"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/findnewest/default.nix b/pkgs/development/tools/misc/findnewest/default.nix index 6dd7e90f8f77d..b289c16b7a6e2 100644 --- a/pkgs/development/tools/misc/findnewest/default.nix +++ b/pkgs/development/tools/misc/findnewest/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = https://github.com/0-wiz-0/findnewest; + homepage = "https://github.com/0-wiz-0/findnewest"; description = "Recursively find newest file in a hierarchy and print its timestamp"; license = licenses.bsd2; maintainers = with maintainers; [ bhipple ]; diff --git a/pkgs/development/tools/misc/fsatrace/default.nix b/pkgs/development/tools/misc/fsatrace/default.nix index b8202f94ce9ba..69d7c6b3919f5 100644 --- a/pkgs/development/tools/misc/fsatrace/default.nix +++ b/pkgs/development/tools/misc/fsatrace/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/jacereda/fsatrace; + homepage = "https://github.com/jacereda/fsatrace"; description = "filesystem access tracer"; license = licenses.isc; maintainers = [ maintainers.peti ]; diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index a5c32bd3dc1ba..a1ea1d8903b04 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A cross-platform file change monitor with multiple backends"; - homepage = https://github.com/emcrisostomo/fswatch; + homepage = "https://github.com/emcrisostomo/fswatch"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index baaba6245701c..f6a001e488c30 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { program was doing at the moment it crashed. ''; - homepage = https://www.gnu.org/software/gdb/; + homepage = "https://www.gnu.org/software/gdb/"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 0965f9fcddc31..b27c3a515bbee 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { meta = with lib; { description = "Graphical frontend (GUI) to GDB"; - homepage = http://gede.acidron.com; + homepage = "http://gede.acidron.com"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ juliendehos ]; diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix index a1a02632478c9..114a7530f2714 100644 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ b/pkgs/development/tools/misc/gengetopt/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { fills a struct ''; - homepage = https://www.gnu.org/software/gengetopt/; + homepage = "https://www.gnu.org/software/gengetopt/"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index edcca88c71d4f..6f24fc7251e56 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { independence of any editor. It runs on a UNIX (POSIX) compatible operating system like GNU and BSD. ''; - homepage = https://www.gnu.org/software/global/; + homepage = "https://www.gnu.org/software/global/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index b01f85bb4a7af..b301324e95617 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ++ stdenv.lib.optional stdenv.isDarwin ./darwin-secure-format.patch; meta = { - homepage = https://www.gnu.org/software/m4/; + homepage = "https://www.gnu.org/software/m4/"; description = "GNU M4, a macro processor"; longDescription = '' diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/development/tools/misc/go-license-detector/default.nix index 6675f7ed3e252..22b85a1fa3340 100644 --- a/pkgs/development/tools/misc/go-license-detector/default.nix +++ b/pkgs/development/tools/misc/go-license-detector/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0ln1z3y9q5igf9djkxw05ql2hb1ijcvvz0mrbwz11cdv9xrsa4z4"; }; - modSha256 = "163f1kiy7kqrnaazb8ydaaiz57lv30jyjkvv6i7pczvcg9yfhmdb"; + vendorSha256 = "0gan5l7vsq0hixxcymhhs8p07v92w60r0lhgvrr9a99nic12vmia"; meta = with lib; { description = "Reliable project licenses detector"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ dtzWill ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/misc/gperf/3.0.x.nix b/pkgs/development/tools/misc/gperf/3.0.x.nix index 4a8b2e8daaba3..e013428a6f7fe 100644 --- a/pkgs/development/tools/misc/gperf/3.0.x.nix +++ b/pkgs/development/tools/misc/gperf/3.0.x.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/gperf/; + homepage = "https://www.gnu.org/software/gperf/"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix index cd0854d2beb80..bf85cd91380e5 100644 --- a/pkgs/development/tools/misc/gperf/default.nix +++ b/pkgs/development/tools/misc/gperf/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/gperf/; + homepage = "https://www.gnu.org/software/gperf/"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix index 108d6190cb7da..182d28375b610 100644 --- a/pkgs/development/tools/misc/gpshell/default.nix +++ b/pkgs/development/tools/misc/gpshell/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; + homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/"; description = "Smartcard management application"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index efb61c4730fda..6cdcce77ffdca 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ gtk2 ]; meta = { - homepage = https://code.google.com/archive/p/gtkdialog/; + homepage = "https://code.google.com/archive/p/gtkdialog/"; # community links: http://murga-linux.com/puppy/viewtopic.php?t=111923 -> https://github.com/01micko/gtkdialog description = "Small utility for fast and easy GUI building from many scripted and compiled languages"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix index 5b47ce0bc2479..82ee291727782 100644 --- a/pkgs/development/tools/misc/gtkperf/default.nix +++ b/pkgs/development/tools/misc/gtkperf/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Application designed to test GTK performance"; - homepage = http://gtkperf.sourceforge.net/; + homepage = "http://gtkperf.sourceforge.net/"; license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 88a6a52d5e8c3..e23ccf27323c0 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perlPackages, gettext }: stdenv.mkDerivation rec { - name = "help2man-1.47.12"; + name = "help2man-1.47.15"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "0q5ixbxz1v7wqnpg4bq7k7nbv9ssnmcvdbqsq5ycjvniz56ac2vx"; + sha256 = "076dvc0z0qp73rpmg0c8bkpfh969h4gzzc442hv1bcyf1srkann2"; }; nativeBuildInputs = [ gettext perlPackages.LocaleGettext ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ‘--version’ output of other commands. ''; - homepage = https://www.gnu.org/software/help2man/; + homepage = "https://www.gnu.org/software/help2man/"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index d3afbbc1bc761..2d7431f9e8b08 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { postInstall = with stdenv; let binPath = lib.makeBinPath [ mercurial git ]; in '' - wrapProgram $bin/bin/houndd --prefix PATH : ${binPath} + wrapProgram $out/bin/houndd --prefix PATH : ${binPath} ''; meta = { diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index 52a91db67582c..4e9daab9bf1c5 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -1,10 +1,11 @@ { stdenv, nix, perlPackages, buildEnv, fetchFromGitHub , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx -, gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt +, gitAndTools, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt , guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null , migration ? false, patches ? [] +, tests ? {} }: with stdenv; @@ -78,7 +79,7 @@ in stdenv.mkDerivation rec { buildInputs = [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx - gitAndTools.top-git mercurial /*darcs*/ subversion bazaar openssl bzip2 libxslt + gitAndTools.top-git mercurial /*darcs*/ subversion breezy openssl bzip2 libxslt perlDeps perl nix postgresql # for running the tests nlohmann_json @@ -87,7 +88,7 @@ in stdenv.mkDerivation rec { hydraPath = lib.makeBinPath ( [ sqlite subversion openssh nix coreutils findutils pixz - gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial /*darcs*/ gnused bazaar + gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial /*darcs*/ gnused breezy ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -124,7 +125,7 @@ in stdenv.mkDerivation rec { dontStrip = true; - passthru = { inherit perlDeps migration; }; + passthru = { inherit perlDeps migration tests; }; meta = with stdenv.lib; { description = "Nix-based continuous build system"; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 9e14e16dbaaf5..f9a50dd0ea0ee 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, nixStable, callPackage, nixFlakes, fetchpatch }: +{ fetchFromGitHub, nixStable, callPackage, nixFlakes, fetchpatch, nixosTests }: { # Package for phase-1 of the db migration for Hydra. @@ -13,26 +13,28 @@ }; nix = nixStable; migration = true; + + tests = { + db-migration = nixosTests.hydra-db-migration.mig; + basic = nixosTests.hydra.hydra-migration; + }; }; # Hydra from latest master branch. Contains breaking changes, # so when having an older version, `pkgs.hydra-migration` should be deployed first. hydra-unstable = callPackage ./common.nix { - version = "2020-04-07"; + version = "2020-04-16"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "4cabb37ebdeade1435ad8ebf1913cdd603b9c452"; - sha256 = "1ccy639x6yyrqqqqli7vlqm6pcvcq5dx1w3ckba77rl8pd5h31f7"; + rev = "87837f1d82904bf48e11b5641258b6be2f663c3b"; + sha256 = "1vs3lyfyafsl7wbpmycv7c3n9n2rkrswp65msb6q1iskgpvr96d5"; }; - patches = [ - # https://github.com/NixOS/hydra/pull/732 - (fetchpatch { - url = "https://github.com/NixOS/hydra/commit/2f9d422172235297759f2b224fe0636cad07b6fb.patch"; - sha256 = "0152nsqqc5d85qdygmwrsk88i9y6nk1b639fj2n042pjvr0kpz6k"; - }) - ]; nix = nixFlakes; + tests = { + db-migration = nixosTests.hydra-db-migration.mig; + basic = nixosTests.hydra.hydra-unstable; + }; }; } diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/pkgs/development/tools/misc/icon-naming-utils/default.nix index d7b2cd36492e2..0905ce484634f 100644 --- a/pkgs/development/tools/misc/icon-naming-utils/default.nix +++ b/pkgs/development/tools/misc/icon-naming-utils/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://tango.freedesktop.org/Standard_Icon_Naming_Specification; + homepage = "http://tango.freedesktop.org/Standard_Icon_Naming_Specification"; platforms = with platforms; linux ++ darwin; license = licenses.gpl2; }; diff --git a/pkgs/development/tools/misc/igprof/default.nix b/pkgs/development/tools/misc/igprof/default.nix index 996dda4ca9416..0780672cc0202 100644 --- a/pkgs/development/tools/misc/igprof/default.nix +++ b/pkgs/development/tools/misc/igprof/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; - homepage = https://igprof.org/; + homepage = "https://igprof.org/"; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ ktf ]; }; diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index ead13e340d5e4..a9d642f48f0ff 100644 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/pkgs/development/tools/misc/inotify-tools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = https://github.com/rvoicilas/inotify-tools/wiki; + homepage = "https://github.com/rvoicilas/inotify-tools/wiki"; license = licenses.gpl2; maintainers = with maintainers; [ marcweber pSub ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index c837728f72ddd..0a04e5786f59a 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -12,8 +12,10 @@ stdenv.mkDerivation rec { # fix "unescaped left brace" errors when using intltool in some cases patches = [(fetchpatch { name = "perl5.26-regex-fixes.patch"; - url = "https://sources.debian.org/data/main/i/intltool/0.51.0-5" - + "/debian/patches/perl5.26-regex-fixes.patch"; + url = [ + "https://sources.debian.org/data/main/i/intltool/0.51.0-5/debian/patches/perl5.26-regex-fixes.patch" + "https://src.fedoraproject.org/rpms/intltool/raw/d8d2ef29fb122a42a6b6678eb1ec97ae56902af2/f/intltool-perl5.26-regex-fixes.patch" + ]; sha256 = "12q2140867r5d0dysly72khi7b0mm2gd7nlm1k81iyg7fxgnyz45"; })]; @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Translation helper tool"; - homepage = https://launchpad.net/intltool/; + homepage = "https://launchpad.net/intltool/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/iozone/default.nix b/pkgs/development/tools/misc/iozone/default.nix index 1d5da65df7e04..e6beeca1d727e 100644 --- a/pkgs/development/tools/misc/iozone/default.nix +++ b/pkgs/development/tools/misc/iozone/default.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { name = "iozone-3.471"; src = fetchurl { - url = http://www.iozone.org/src/current/iozone3_471.tar; + url = "http://www.iozone.org/src/current/iozone3_471.tar"; sha256 = "0w63b3d4ws1sm52lpdd08sl7n4ay438dl3wy0q9la12iq81rglid"; }; license = fetchurl { - url = http://www.iozone.org/docs/Iozone_License.txt; + url = "http://www.iozone.org/docs/Iozone_License.txt"; sha256 = "1309sl1rqm8p9gll3z8zfygr2pmbcvzw5byf5ba8y12avk735zrv"; }; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { description = "IOzone Filesystem Benchmark"; - homepage = http://www.iozone.org/; + homepage = "http://www.iozone.org/"; license = stdenv.lib.licenses.unfreeRedistributable; platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; maintainers = with stdenv.lib.maintainers; [ Baughn makefu ]; diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix index a5c3623b699cc..d46256f039aa4 100644 --- a/pkgs/development/tools/misc/itstool/default.nix +++ b/pkgs/development/tools/misc/itstool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3 }: +{ stdenv, lib, fetchurl, python3 }: stdenv.mkDerivation rec { name = "itstool-2.0.6"; @@ -8,10 +8,16 @@ stdenv.mkDerivation rec { sha256 = "1acjgf8zlyk7qckdk19iqaca4jcmywd7vxjbcs1mm6kaf8icqcv2"; }; - buildInputs = [ (python3.withPackages(ps: with ps; [ libxml2 ])) ]; + pythonPath = [ python3.pkgs.libxml2 ]; + buildInputs = [ python3 python3.pkgs.libxml2 ]; + nativeBuildInputs = [ python3.pkgs.wrapPython ]; + + postFixup = '' + wrapPythonPrograms + ''; meta = { - homepage = http://itstool.org/; + homepage = "http://itstool.org/"; description = "XML to PO and back again"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix index af660561ee178..6ed66c8d3cc0f 100644 --- a/pkgs/development/tools/misc/jscoverage/default.nix +++ b/pkgs/development/tools/misc/jscoverage/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { GNU/Linux. ''; - homepage = http://siliconforks.com/jscoverage/; + homepage = "http://siliconforks.com/jscoverage/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix index e33259b416fa6..fa413511dc01b 100644 --- a/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { types, simple organization of options, and direct and reverse dependencies. ''; - homepage = http://ymorin.is-a-geek.org/projects/kconfig-frontends; + homepage = "http://ymorin.is-a-geek.org/projects/kconfig-frontends"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ mbe ]; diff --git a/pkgs/development/tools/misc/kdbg/default.nix b/pkgs/development/tools/misc/kdbg/default.nix index 29bf1333aa05f..472e9c5857b55 100644 --- a/pkgs/development/tools/misc/kdbg/default.nix +++ b/pkgs/development/tools/misc/kdbg/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.kdbg.org/; + homepage = "http://www.kdbg.org/"; description = '' A graphical user interface to gdb, the GNU debugger. It provides an intuitive interface for setting breakpoints, inspecting variables, and diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index 9605a035be67f..354f77d0fb974 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { meta = { description = "Visualize logs and time-stamped data"; - homepage = http://www.elasticsearch.org/overview/kibana; + homepage = "http://www.elasticsearch.org/overview/kibana"; license = if enableUnfree then licenses.elastic else licenses.asl20; maintainers = with maintainers; [ offline basvandijk ]; platforms = with platforms; unix; diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index a0f2f8f546aa0..dc3beb9866c0c 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { meta = { description = "Visualize logs and time-stamped data"; - homepage = http://www.elasticsearch.org/overview/kibana; + homepage = "http://www.elasticsearch.org/overview/kibana"; license = if enableUnfree then licenses.elastic else licenses.asl20; maintainers = with maintainers; [ offline basvandijk ]; platforms = with platforms; unix; diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index f56a59c42704f..debc4107882b3 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { documentation for details. ''; - homepage = https://www.gnu.org/software/libtool/; + homepage = "https://www.gnu.org/software/libtool/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 0424b9012519e..4bf637c0eba89 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { your Makefile, Makefile.in, or Makefile.am. See the documentation for details. ''; - homepage = https://www.gnu.org/software/libtool/; + homepage = "https://www.gnu.org/software/libtool/"; license = licenses.gpl2Plus; maintainers = [ ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/libwhich/default.nix b/pkgs/development/tools/misc/libwhich/default.nix index c751c27555871..59bbb99bd46e7 100644 --- a/pkgs/development/tools/misc/libwhich/default.nix +++ b/pkgs/development/tools/misc/libwhich/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Like `which`, for dynamic libraries"; - homepage = https://github.com/vtjnash/libwhich; + homepage = "https://github.com/vtjnash/libwhich"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index 5dd6f422713ba..4fe7740cadf4a 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { meta = with lib; { description = "A toolkit for building secure, portable and lean operating systems for containers"; license = licenses.asl20; - homepage = https://github.com/linuxkit/linuxkit; + homepage = "https://github.com/linuxkit/linuxkit"; maintainers = [ maintainers.nicknovitski ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index b8fa02306c4d3..d88d9d7a7be5c 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ltrace-0.7.3"; src = fetchurl { - url = mirror://debian/pool/main/l/ltrace/ltrace_0.7.3.orig.tar.bz2; + url = "mirror://debian/pool/main/l/ltrace/ltrace_0.7.3.orig.tar.bz2"; sha256 = "00wmbdghqbz6x95m1mcdd3wd46l6hgcr4wggdp049dbifh3qqvqf"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { prePatch = let debian = fetchurl { - url = mirror://debian/pool/main/l/ltrace/ltrace_0.7.3-6.debian.tar.xz; + url = "mirror://debian/pool/main/l/ltrace/ltrace_0.7.3-6.debian.tar.xz"; sha256 = "0xc4pfd8qw53crvdxr29iwl8na53zmknca082kziwpvlzsick4kp"; }; in '' @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Library call tracer"; - homepage = https://www.ltrace.org/; + homepage = "https://www.ltrace.org/"; platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.gpl2; }; diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 815d5aac4069f..03e370aeeb4ba 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tracing tools (kernel + user space) for Linux"; - homepage = https://lttng.org/; + homepage = "https://lttng.org/"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 4b0be0f0fa454..1b59045c6fd2e 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LTTng Userspace Tracer libraries"; - homepage = https://lttng.org/; + homepage = "https://lttng.org/"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix index 36a89726e81cd..abcc476d59471 100644 --- a/pkgs/development/tools/misc/lttv/default.nix +++ b/pkgs/development/tools/misc/lttv/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical trace viewer for LTTng trace files"; - homepage = https://lttng.org/; + homepage = "https://lttng.org/"; # liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1. # The rest of the LTTV package is distributed under the GNU GPL v2. license = with licenses; [ gpl2 lgpl21 ]; diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix index 518d128890a93..103c534dfa3d7 100644 --- a/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { this with a single command on the teminal! It will also work if your program uses plug-ins that have dependencies too. ''; - homepage = https://github.com/auriamg/macdylibbundler; + homepage = "https://github.com/auriamg/macdylibbundler"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.nomeata ]; diff --git a/pkgs/development/tools/misc/md2man/default.nix b/pkgs/development/tools/misc/md2man/default.nix index 7cbd924608176..7db3c902c7cfd 100644 --- a/pkgs/development/tools/misc/md2man/default.nix +++ b/pkgs/development/tools/misc/md2man/default.nix @@ -1,10 +1,8 @@ { lib, buildGoPackage, fetchFromGitHub }: -with lib; - buildGoPackage rec { pname = "go-md2man"; - version = "1.0.6"; + version = "2.0.0"; goPackagePath = "github.com/cpuguy83/go-md2man"; @@ -12,13 +10,13 @@ buildGoPackage rec { rev = "v${version}"; owner = "cpuguy83"; repo = "go-md2man"; - sha256 = "1rm3zjrmfpzy0l3qp02xmd5pqzl77pdql9pbxhl0k1qw2vfzrjv6"; + sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv"; }; - meta = { + meta = with lib; { description = "Go tool to convert markdown to man pages"; license = licenses.mit; - homepage = https://github.com/cpuguy83/go-md2man; + homepage = "https://github.com/cpuguy83/go-md2man"; maintainers = with maintainers; [offline]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/mdl/default.nix b/pkgs/development/tools/misc/mdl/default.nix index eda2fabd9c675..ada686f2498a3 100644 --- a/pkgs/development/tools/misc/mdl/default.nix +++ b/pkgs/development/tools/misc/mdl/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A tool to check markdown files and flag style issues"; - homepage = https://github.com/markdownlint/markdownlint; + homepage = "https://github.com/markdownlint/markdownlint"; license = licenses.mit; maintainers = with maintainers; [ gerschtli manveru nicknovitski ]; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/micronucleus/default.nix b/pkgs/development/tools/misc/micronucleus/default.nix index 9fbafebb10c55..890439adc6e9e 100644 --- a/pkgs/development/tools/misc/micronucleus/default.nix +++ b/pkgs/development/tools/misc/micronucleus/default.nix @@ -1,7 +1,7 @@ { pkgs , stdenv -, libusb +, libusb-compat-0_1 , fetchFromGitHub , lib }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; installPhase = '' diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix index ae0a4a6dfe21c..218473aee78de 100644 --- a/pkgs/development/tools/misc/mkcert/default.nix +++ b/pkgs/development/tools/misc/mkcert/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0w1ji96hbd3anzsz82xjcafsqhgyz7c7n41rsq60yrllwbj5946f"; }; - modSha256 = "13a3snhcqq3a9lfy9zfr2rx10mf2ymvhmds1bg8n4m7lbwnzm4fg"; + vendorSha256 = "0b8ggdpbyxx5n2myhchhlwmm5nndwpykp1ylnzdyw12mdskfvn9h"; goPackagePath = "github.com/FiloSottile/mkcert"; buildFlagsArray = '' @@ -20,9 +20,9 @@ buildGoModule rec { ''; meta = with lib; { - homepage = https://github.com/FiloSottile/mkcert; + homepage = "https://github.com/FiloSottile/mkcert"; description = "A simple tool for making locally-trusted development certificates"; license = licenses.bsd3; maintainers = [ maintainers.marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index 5c2b0ad0ee33d..0e28f729fe9df 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of programs to inspect and build Windows Installer (.MSI) files"; - homepage = https://wiki.gnome.org/msitools; + homepage = "https://wiki.gnome.org/msitools"; license = [ licenses.gpl2 licenses.lgpl21 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix index 8af1217079866..e683bef7b0606 100644 --- a/pkgs/development/tools/misc/ninka/default.nix +++ b/pkgs/development/tools/misc/ninka/default.nix @@ -28,7 +28,7 @@ perlPackages.buildPerlPackage { meta = with stdenv.lib; { description = "A sentence based license detector"; - homepage = http://ninka.turingmachine.org/; + homepage = "http://ninka.turingmachine.org/"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/nix-build-uncached/default.nix b/pkgs/development/tools/misc/nix-build-uncached/default.nix new file mode 100644 index 0000000000000..11833816ec828 --- /dev/null +++ b/pkgs/development/tools/misc/nix-build-uncached/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub, nix, makeWrapper }: + +buildGoModule rec { + pname = "nix-build-uncached"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = "nix-build-uncached"; + rev = "v${version}"; + sha256 = "0jkpg3ab56lg2kdms9w9ka9ba89py3ajksjsi1rd3iqi74zz2mmh"; + }; + + goPackagePath = "github.com/Mic92/nix-build-uncached"; + vendorSha256 = null; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/nix-build-uncached \ + --prefix PATH ":" ${lib.makeBinPath [ nix ]} + ''; + + meta = with lib; { + description = "A CI friendly wrapper around nix-build"; + license = licenses.mit; + homepage = "https://github.com/Mic92/nix-build-uncached"; + maintainers = [ maintainers.mic92 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/misc/nixbang/default.nix b/pkgs/development/tools/misc/nixbang/default.nix index 164e0e80b60cf..468623241bfdd 100644 --- a/pkgs/development/tools/misc/nixbang/default.nix +++ b/pkgs/development/tools/misc/nixbang/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication { }; meta = { - homepage = https://github.com/madjar/nixbang; + homepage = "https://github.com/madjar/nixbang"; description = "A special shebang to run scripts in a nix-shell"; maintainers = [ lib.maintainers.madjar ]; platforms = lib.platforms.all; diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix index dea6256824df2..9fdaca52ca8ac 100644 --- a/pkgs/development/tools/misc/objconv/default.nix +++ b/pkgs/development/tools/misc/objconv/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Object and executable file converter, modifier and disassembler"; - homepage = https://www.agner.org/optimize/; + homepage = "https://www.agner.org/optimize/"; license = licenses.gpl2; maintainers = with maintainers; [ orivej vrthra ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/one_gadget/default.nix b/pkgs/development/tools/misc/one_gadget/default.nix index 1c2cbe35439d4..c3d0a6b57b454 100644 --- a/pkgs/development/tools/misc/one_gadget/default.nix +++ b/pkgs/development/tools/misc/one_gadget/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "The best tool for finding one gadget RCE in libc.so.6"; - homepage = https://github.com/david942j/one_gadget; + homepage = "https://github.com/david942j/one_gadget"; license = licenses.mit; maintainers = with maintainers; [ artemist nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index 21e825ac0bf05..79fa383300e11 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Source code search and cross reference engine"; - homepage = https://opengrok.github.io/OpenGrok/; + homepage = "https://opengrok.github.io/OpenGrok/"; license = licenses.cddl; maintainers = [ maintainers.lethalman ]; }; diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 7ebf4a1e0651e..0d6bcd959ebdd 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { "remote target" for source-level debugging of embedded systems using the GNU GDB program. ''; - homepage = http://openocd.sourceforge.net/; + homepage = "http://openocd.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix index 015fc534f6b3f..8541c7a307a24 100644 --- a/pkgs/development/tools/misc/pahole/default.nix +++ b/pkgs/development/tools/misc/pahole/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "pahole"; version = "1.16"; src = fetchgit { - url = https://git.kernel.org/pub/scm/devel/pahole/pahole.git; + url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git"; rev = "v${version}"; sha256 = "1gfc9v4dgs811v1zjk0d9hsgmizllw2hibc83ykmakzysimaxsy3"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-D__LIB=lib" ]; meta = with stdenv.lib; { - homepage = https://git.kernel.org/cgit/devel/pahole/pahole.git/; + homepage = "https://git.kernel.org/cgit/devel/pahole/pahole.git/"; description = "Pahole and other DWARF utils"; license = licenses.gpl2; diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index 778d307947163..ad09cdc6eb333 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6 meta = with stdenv.lib; { - homepage = https://github.com/NixOS/patchelf/blob/master/README; + homepage = "https://github.com/NixOS/patchelf/blob/master/README"; license = licenses.gpl3; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 349c6a4e1eba1..05d39ed565342 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; meta = with stdenv.lib; { - homepage = https://github.com/NixOS/patchelf/blob/master/README; + homepage = "https://github.com/NixOS/patchelf/blob/master/README"; license = licenses.gpl3; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index 13855eb4e7422..494b8d893d42c 100644 --- a/pkgs/development/tools/misc/pkg-config/default.nix +++ b/pkgs/development/tools/misc/pkg-config/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool that allows packages to find out information about other packages"; - homepage = http://pkg-config.freedesktop.org/wiki/; + homepage = "http://pkg-config.freedesktop.org/wiki/"; platforms = platforms.all; license = licenses.gpl2Plus; }; diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/development/tools/misc/pkgconf/default.nix index e4a6416129e83..02b7ff5fcd3d7 100644 --- a/pkgs/development/tools/misc/pkgconf/default.nix +++ b/pkgs/development/tools/misc/pkgconf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Package compiler and linker metadata toolkit"; - homepage = https://git.dereferenced.org/pkgconf/pkgconf; + homepage = "https://git.dereferenced.org/pkgconf/pkgconf"; platforms = platforms.all; license = licenses.isc; maintainers = with maintainers; [ zaninime ]; diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/development/tools/misc/pmccabe/default.nix index 0b91953a7c7f9..81a88f20ad204 100644 --- a/pkgs/development/tools/misc/pmccabe/default.nix +++ b/pkgs/development/tools/misc/pmccabe/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "McCabe-style function complexity and line counting for C and C++"; - homepage = https://people.debian.org/~bame/pmccabe/; + homepage = "https://people.debian.org/~bame/pmccabe/"; license = licenses.gpl2Plus; longDescription = '' diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix index 7bfff6328269d..5d7ca75de3222 100644 --- a/pkgs/development/tools/misc/prelink/default.nix +++ b/pkgs/development/tools/misc/prelink/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { }; meta = { - homepage = https://people.redhat.com/jakub/prelink/; + homepage = "https://people.redhat.com/jakub/prelink/"; license = "GPL"; description = "ELF prelinking utility to speed up dynamic linking"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/misc/premake/3.nix b/pkgs/development/tools/misc/premake/3.nix index a94614af79677..a630c0ced9e76 100644 --- a/pkgs/development/tools/misc/premake/3.nix +++ b/pkgs/development/tools/misc/premake/3.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; meta = { - homepage = http://industriousone.com/premake; + homepage = "http://industriousone.com/premake"; description = "A simple build configuration and project generation tool using lua"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix index d9d28580210bc..5e8606833d312 100644 --- a/pkgs/development/tools/misc/premake/5.nix +++ b/pkgs/development/tools/misc/premake/5.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = { - homepage = https://premake.github.io; + homepage = "https://premake.github.io"; description = "A simple build configuration and project generation tool using lua"; license = stdenv.lib.licenses.bsd3; platforms = platforms.darwin ++ platforms.linux; diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix index 99bf8cac81fa8..92445abbba9b2 100644 --- a/pkgs/development/tools/misc/premake/default.nix +++ b/pkgs/development/tools/misc/premake/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; meta = with stdenv.lib; { - homepage = http://industriousone.com/premake; + homepage = "http://industriousone.com/premake"; description = "A simple build configuration and project generation tool using lua"; license = stdenv.lib.licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/ptags/default.nix b/pkgs/development/tools/misc/ptags/default.nix new file mode 100644 index 0000000000000..93014af3f6209 --- /dev/null +++ b/pkgs/development/tools/misc/ptags/default.nix @@ -0,0 +1,32 @@ +{ fetchFromGitHub +, cargo +, lib +, rustPlatform +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "ptags"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "dalance"; + repo = "ptags"; + rev = "v${version}"; + sha256 = "1xr1szh4dfrcmi6s6dj791k1ix2zbv75rqkqbyb1lmh5548kywkg"; + }; + + cargoSha256 = "1rsnb4kzfb577xw7jk0939n42sv94vvspvbz783bmpy9vl53i38k"; + + # Sanity check. + checkPhase = '' + $releaseDir/ptags --help > /dev/null + ''; + + meta = with stdenv.lib; { + description = "A parallel universal-ctags wrapper for git repository"; + homepage = "https://github.com/dalance/ptags"; + maintainers = with maintainers; [ pamplemousse ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix b/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix new file mode 100644 index 0000000000000..412830369b9e6 --- /dev/null +++ b/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, libarchive, python3, file }: + +stdenv.mkDerivation rec { + pname = "remarkable-toolchain"; + version = "1.8-23.9.2019"; + + src = fetchurl { + url = "https://remarkable.engineering/oecore-x86_64-cortexa9hf-neon-toolchain-zero-gravitas-${version}.sh"; + sha256 = "6299955721bcd9bef92a87ad3cfe4d31df8e2da95b0c4b2cdded4431aa6748b0"; + }; + + nativeBuildInputs = [ + libarchive + python3 + file + ]; + + unpackCmd = "mkdir src; install $curSrc src/install-toolchain.sh"; + + dontBuild = true; + + installPhase = '' + patchShebangs install-toolchain.sh + sed -i -e '3,9d' install-toolchain.sh # breaks PATH + sed -i 's|PYTHON=.*$|PYTHON=${python3}/bin/python|' install-toolchain.sh + ./install-toolchain.sh -D -y -d $out + ''; + + meta = with stdenv.lib; { + description = "A toolchain for cross-compiling to reMarkable tablets"; + homepage = "https://remarkable.engineering/"; + license = licenses.gpl2; + maintainers = [ maintainers.nickhu ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index 9af294716ff3d..9e4dbcac5b802 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.9.17"; + version = "0.10.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0fm7avkc8izs0a9lqshibzpl08g4l3w38ayw7g521p23aq90q3c9"; + sha256 = "1ag55n3gfwcp6v8v3hha8bdqxw9r4bmz97p00vyqla9gjzn5ka9w"; }; - modSha256 = "1jf08g0xr4wknh9x15igq73y02cy2faqjdjs2v842ii4p3n4p9dw"; + vendorSha256 = "0lann22hjdcrwyab76hinvbbmg3rf7y3knrxlfg0164gl3y5xb5g"; subPackages = [ "cmd/reviewdog" ]; diff --git a/pkgs/development/tools/misc/rman/default.nix b/pkgs/development/tools/misc/rman/default.nix index 8093846780d22..09769d5c5912c 100644 --- a/pkgs/development/tools/misc/rman/default.nix +++ b/pkgs/development/tools/misc/rman/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "rman-3.2"; src = fetchurl { - url = mirror://sourceforge/polyglotman/3.2/rman-3.2.tar.gz; + url = "mirror://sourceforge/polyglotman/3.2/rman-3.2.tar.gz"; sha256 = "0prdld6nbkdlkcgc2r1zp13h2fh8r0mlwxx423dnc695ddlk18b8"; }; diff --git a/pkgs/development/tools/misc/rolespec/default.nix b/pkgs/development/tools/misc/rolespec/default.nix index 1e85e87c53786..6eb13bb242da3 100644 --- a/pkgs/development/tools/misc/rolespec/default.nix +++ b/pkgs/development/tools/misc/rolespec/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - homepage = https://github.com/nickjj/rolespec; + homepage = "https://github.com/nickjj/rolespec"; description = "A test library for testing Ansible roles"; longDescription = '' A shell based test library for Ansible that works both locally and over diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index ffb537abfbaa7..a7e197f9d7e9d 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Software for Saleae logic analyzers"; - homepage = https://www.saleae.com/; + homepage = "https://www.saleae.com/"; license = licenses.unfree; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/scc/default.nix b/pkgs/development/tools/misc/scc/default.nix index 7a6a060464e18..47596789de7a2 100644 --- a/pkgs/development/tools/misc/scc/default.nix +++ b/pkgs/development/tools/misc/scc/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "scc"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "boyter"; repo = "scc"; rev = "v${version}"; - sha256 = "1wk6s9ga9rkywgqys960s6fz4agwzh3ac2l6cpcr7kca4379s28k"; + sha256 = "0hbcq5qn97kr9d4q9m2p1mj3ijn8zmwycrs5bgf1kfiwr09wg2yh"; }; goPackagePath = "github.com/boyter/scc"; diff --git a/pkgs/development/tools/misc/semver-tool/default.nix b/pkgs/development/tools/misc/semver-tool/default.nix index 879346a2b796c..0c1bb8ede1b86 100644 --- a/pkgs/development/tools/misc/semver-tool/default.nix +++ b/pkgs/development/tools/misc/semver-tool/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://github.com/fsaintjacques/semver-tool; + homepage = "https://github.com/fsaintjacques/semver-tool"; description = "semver bash implementation"; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix index eec1f32b4df84..610e66a2b9cc7 100644 --- a/pkgs/development/tools/misc/sipp/default.nix +++ b/pkgs/development/tools/misc/sipp/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ncurses libpcap]; meta = with stdenv.lib; { - homepage = http://sipp.sf.net; + homepage = "http://sipp.sf.net"; description = "The SIPp testing tool"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 4d63e2c6a15a0..b2b83aa79b16e 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - homepage = https://www.dwheeler.com/sloccount/; + homepage = "https://www.dwheeler.com/sloccount/"; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix index fd8105552967f..f978d4d4e120a 100644 --- a/pkgs/development/tools/misc/srecord/default.nix +++ b/pkgs/development/tools/misc/srecord/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Collection of powerful tools for manipulating EPROM load files"; - homepage = http://srecord.sourceforge.net/; + homepage = "http://srecord.sourceforge.net/"; license = licenses.gpl3Plus; maintainers = [ maintainers.bjornfor ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index c59847b1e0f74..7793d9185e754 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -1,9 +1,13 @@ { stdenv, fetchFromGitHub, cmake, libusb1 }: -# IMPORTANT: You need permissions to access the stlink usb devices. +let + # The Darwin build of stlink explicitly refers to static libusb. + libusb1' = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1; + +# IMPORTANT: You need permissions to access the stlink usb devices. # Add services.udev.pkgs = [ pkgs.stlink ] to your configuration.nix -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "stlink"; version = "1.6.0"; @@ -14,7 +18,8 @@ stdenv.mkDerivation rec { sha256 = "1mlkrxjxg538335g59hjb0zc739dx4mhbspb26z5gz3lf7d4xv6x"; }; - buildInputs = [ cmake libusb1 ]; + buildInputs = [ libusb1' ]; + nativeBuildInputs = [ cmake ]; patchPhase = '' sed -i 's@/etc/udev/rules.d@$ENV{out}/etc/udev/rules.d@' CMakeLists.txt sed -i 's@/etc/modprobe.d@$ENV{out}/etc/modprobe.d@' CMakeLists.txt diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index 553ded815ef83..0c2cb96a9d6c8 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source flash program for the STM32 ARM processors using the ST bootloader"; - homepage = https://sourceforge.net/projects/stm32flash/; + homepage = "https://sourceforge.net/projects/stm32flash/"; license = stdenv.lib.licenses.gpl2; platforms = platforms.all; # Should work on all platforms - maintainers = with maintainers; [ the-kenny elitak ]; + maintainers = with maintainers; [ elitak ]; }; } diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 80852274102e4..75a960c80c50a 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "5.5"; + version = "5.6"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "1zrhpzjlgfwfl8dd53llswmmharm5rbi0zch7lln5sjris69an4z"; + sha256 = "008v3xacgv8hw2gpqibacxs47j23161mmibf2qh9xv86mvp6i68q"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional libunwind.supportsHost libunwind; # support -k + postPatch = "patchShebangs strace-graph"; + configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check"; # fails 1 out of 523 tests with diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix index 80cfdc8b196d0..745cc9a2e7836 100644 --- a/pkgs/development/tools/misc/swig/2.x.nix +++ b/pkgs/development/tools/misc/swig/2.x.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - homepage = http://swig.org/; + homepage = "http://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 262afe4f18911..75b0113b49779 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - homepage = http://swig.org/; + homepage = "http://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/tools/misc/swig/4.nix b/pkgs/development/tools/misc/swig/4.nix index 079c5e7ef3cd9..a35a9a35281dd 100644 --- a/pkgs/development/tools/misc/swig/4.nix +++ b/pkgs/development/tools/misc/swig/4.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - homepage = http://swig.org/; + homepage = "http://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index e74b2898498c2..cf0880855db61 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - homepage = http://swig.org/; + homepage = "http://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index dbb8057292b35..616a1cbc3fbd0 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "sysbench"; - version = "1.0.19"; + version = "1.0.20"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libmysqlclient libaio ]; @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { owner = "akopytov"; repo = pname; rev = version; - sha256 = "1zgqb9cr7ld3vw4a3jhq1mlszhcyjlpr0c8q1jcp1d27l9dcvd1w"; + sha256 = "1sanvl2a52ff4shj62nw395zzgdgywplqvwip74ky8q7s6qjf5qy"; }; enableParallelBuilding = true; meta = { description = "Modular, cross-platform and multi-threaded benchmark tool"; - homepage = https://github.com/akopytov/sysbench; + homepage = "https://github.com/akopytov/sysbench"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index e03320f84295a..40f3921ec705d 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb }: +{ stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb-compat-0_1 }: stdenv.mkDerivation rec { pname = "teensy-loader-cli"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1yx8vsh6b29pqr4zb6sx47429i9x51hj9psn8zksfz75j5ivfd5i"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; nativeBuildInputs = [ go-md2man installShellFiles ]; @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { description = "Firmware uploader for the Teensy microcontroller boards"; homepage = "https://www.pjrc.com/teensy/"; license = licenses.gpl3; - maintainers = with maintainers; [ the-kenny ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index e533b065f4118..70b07dd71cd5f 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0ib0p361sxh2qzxccg32pcml4by4mk45abhljwmljwybs34wh5rh"; }; - modSha256 = "1cbhm3jwv0z9fh1q8mva56nbsp9rfyjcs03yxrc8ffkvif0gapps"; + vendorSha256 = "0q772i49nyxzs51jrh45n14ljh7qj5wygkn2x32pxi6ykw6la4x8"; subPackages = [ "." ]; @@ -23,4 +23,4 @@ buildGoModule rec { license = licenses.mit; maintainers = [ maintainers.marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix index fb38d096ab436..acc42d61423bf 100644 --- a/pkgs/development/tools/misc/tet/default.nix +++ b/pkgs/development/tools/misc/tet/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation ({ pname = "tet"; src = fetchurl { - url = http://tetworks.opengroup.org/downloads/38/software/Sources/3.8/tet3.8-src.tar.gz ; + url = "http://tetworks.opengroup.org/downloads/38/software/Sources/3.8/tet3.8-src.tar.gz"; sha256 = "1j57hv56df38w249l595b8rsgmsyvjkbysai03a9724gax5jl9av" ; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation ({ meta = { description = "The Test Environment Toolkit is used in test applications like The Open Group's UNIX Certification program and the Free Standards Group's LSB Certification program"; - homepage = http://tetworks.opengroup.org/Products/tet.htm ; + homepage = "http://tetworks.opengroup.org/Products/tet.htm"; license = stdenv.lib.licenses.artistic1; platforms = stdenv.lib.platforms.unix; maintainers = [ ]; diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix index 247733b81bafc..755bfcd7274ba 100644 --- a/pkgs/development/tools/misc/texi2html/default.nix +++ b/pkgs/development/tools/misc/texi2html/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Perl script which converts Texinfo source files to HTML output"; - homepage = https://www.nongnu.org/texi2html/; + homepage = "https://www.nongnu.org/texi2html/"; license = licenses.gpl2; maintainers = [ maintainers.marcweber ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 56ae48b71337a..1fb8a6b2f0d77 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { && !stdenv.isSunOS; # flaky meta = { - homepage = https://www.gnu.org/software/texinfo/; + homepage = "https://www.gnu.org/software/texinfo/"; description = "The GNU documentation system"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index be3a6d47a1596..0076884e2edcf 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -6,22 +6,22 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "1.10.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - sha256 = "12zfcvbihirh38xxzc8fbx293m4vsrhq6kh0qnhnhlrx75m09l9i"; + sha256 = "0cmciadiknw6w573v71spzf5ydaz2xxm2snv3n1hks732nahlr56"; }; - cargoSha256 = "08fi0c4s0d1p2rqxvj1y82zg6xl3n0ikgyhgrjwh6xay8f0121f0"; + cargoSha256 = "0dhbbni8ia0dkwjacx5jlr5rj7173nsbivm9gjsx9j8ais0f0hff"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; meta = with stdenv.lib; { description = "An implementation of the Language Server Protocol for LaTeX"; - homepage = https://texlab.netlify.com/; + homepage = "https://texlab.netlify.com/"; license = licenses.mit; maintainers = with maintainers; [ doronbehar metadark ]; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/tie/default.nix b/pkgs/development/tools/misc/tie/default.nix index 5e40152df8dfe..074523309b67f 100644 --- a/pkgs/development/tools/misc/tie/default.nix +++ b/pkgs/development/tools/misc/tie/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.ctan.org/tex-archive/web/tie; + homepage = "https://www.ctan.org/tex-archive/web/tie"; description = "Allow multiple web change files"; platforms = with platforms; unix; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/tools/misc/tinyprog/default.nix b/pkgs/development/tools/misc/tinyprog/default.nix index 65d2ce37814c0..4618906038eb5 100644 --- a/pkgs/development/tools/misc/tinyprog/default.nix +++ b/pkgs/development/tools/misc/tinyprog/default.nix @@ -35,7 +35,7 @@ with python3Packages; buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/tinyfpga/TinyFPGA-Bootloader/tree/master/programmer; + homepage = "https://github.com/tinyfpga/TinyFPGA-Bootloader/tree/master/programmer"; description = "Programmer for FPGA boards using the TinyFPGA USB Bootloader"; maintainers = with maintainers; [ emily ]; license = licenses.asl20; diff --git a/pkgs/development/tools/misc/tockloader/default.nix b/pkgs/development/tools/misc/tockloader/default.nix new file mode 100644 index 0000000000000..18c5393a6b7b2 --- /dev/null +++ b/pkgs/development/tools/misc/tockloader/default.nix @@ -0,0 +1,27 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "tockloader"; + version = "1.4.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0l8mvlqzyq2bfb6g5zhgv2ndgyyrmpww2l7f2snbli73g6x5j2g2"; + }; + + propagatedBuildInputs = with python3Packages; [ + argcomplete + colorama + crcmod + pytoml + pyserial + ]; + + meta = with lib; { + homepage = "https://github.com/tock/tockloader"; + license = licenses.mit; + description = "Tool for programming Tock onto hardware boards."; + maintainers = with maintainers; [ hexa ]; + }; +} + diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index a06bf4f248ac8..ca07a1d726760 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tokei"; - version = "11.0.0"; + version = "11.2.0"; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = pname; rev = "v${version}"; - sha256 = "0as3knld6vlni2s347wgh4g1fg531ky23pg7wx5fzzy6gxl4rgi1"; + sha256 = "1nyv73bawmshzzp8hkbcac5bgq0yf8f51ps5hycdw0c5qhrsjwns"; }; - cargoSha256 = "1f385gjym3mm1vsjvss3yq21ixnbjkrx705hp3spyhghffxi00q1"; + cargoSha256 = "18a0rg3hgisjd6zh4dk6rflaipmrxxszpigqg8fa816rg0f4bdc7"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { longDescription = '' Tokei is a program that displays statistics about your code. Tokei will show number of files, total lines within those files and code, comments, and blanks grouped by language. ''; - homepage = https://github.com/XAMPPRocky/tokei; + homepage = "https://github.com/XAMPPRocky/tokei"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ gebner lilyball ]; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/travis/default.nix b/pkgs/development/tools/misc/travis/default.nix index 9020766fd8650..0be7721fe0809 100644 --- a/pkgs/development/tools/misc/travis/default.nix +++ b/pkgs/development/tools/misc/travis/default.nix @@ -9,7 +9,7 @@ bundlerEnv { meta = with lib; { description = "CLI and Ruby client library for Travis CI"; - homepage = https://github.com/travis-ci/travis.rb; + homepage = "https://github.com/travis-ci/travis.rb"; license = licenses.mit; maintainers = with maintainers; [ zimbatm nicknovitski ]; }; diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix index 1727f772006e4..ca51e08973377 100644 --- a/pkgs/development/tools/misc/uisp/default.nix +++ b/pkgs/development/tools/misc/uisp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "uisp-20050207"; src = fetchurl { - url = http://mirror.switch.ch/mirror/gentoo/distfiles/uisp-20050207.tar.gz; + url = "http://mirror.switch.ch/mirror/gentoo/distfiles/uisp-20050207.tar.gz"; sha256 = "1bncxp5yxh9r1yrp04vvhfiva8livi1pwic7v8xj99q09zrwahvw"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers"; license = stdenv.lib.licenses.gpl2; - homepage = https://savannah.nongnu.org/projects/uisp; + homepage = "https://savannah.nongnu.org/projects/uisp"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 01ed660301883..587896fce6802 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "uncrustify"; - version = "0.70.1"; + version = "0.71.0"; src = fetchFromGitHub { owner = product; repo = product; rev = name; - sha256 = "0zr3vxhd947zdvwccw3cj0vsriaawcpfjq3x94v9887hsi8fk87b"; + sha256 = "1wyhkhn000yad94fnjj61h7lyvan6hig8wh7jxlnyp5wxdwki0pj"; }; nativeBuildInputs = [ cmake python ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; - homepage = http://uncrustify.sourceforge.net/; + homepage = "http://uncrustify.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/development/tools/misc/unifdef/default.nix index 8fc268423505d..19dd907b73b98 100644 --- a/pkgs/development/tools/misc/unifdef/default.nix +++ b/pkgs/development/tools/misc/unifdef/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://dotat.at/prog/unifdef/; + homepage = "http://dotat.at/prog/unifdef/"; description = "Selectively remove C preprocessor conditionals"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index c104adc78cc3a..0bf902eccff8d 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A maintained ctags implementation"; - homepage = https://ctags.io/; + homepage = "https://ctags.io/"; license = licenses.gpl2Plus; platforms = platforms.unix; # universal-ctags is preferred over emacs's ctags diff --git a/pkgs/development/tools/misc/vtable-dumper/default.nix b/pkgs/development/tools/misc/vtable-dumper/default.nix index 2b6e349b9fdeb..a44140c1445fb 100644 --- a/pkgs/development/tools/misc/vtable-dumper/default.nix +++ b/pkgs/development/tools/misc/vtable-dumper/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/lvc/vtable-dumper; + homepage = "https://github.com/lvc/vtable-dumper"; description = "A tool to list content of virtual tables in a C++ shared library"; license = licenses.lgpl21; maintainers = [ maintainers.bhipple ]; diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix index 4d73e106b2f5f..81f5430371a00 100644 --- a/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/pkgs/development/tools/misc/watson-ruby/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An inline issue manager"; - homepage = https://goosecode.com/watson/; + homepage = "https://goosecode.com/watson/"; license = with licenses; mit; maintainers = with maintainers; [ robertodr nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/wishbone-tool/default.nix b/pkgs/development/tools/misc/wishbone-tool/default.nix index 8c2e27d645078..d900d14e33c28 100644 --- a/pkgs/development/tools/misc/wishbone-tool/default.nix +++ b/pkgs/development/tools/misc/wishbone-tool/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, libusb }: +{ lib, fetchFromGitHub, rustPlatform, libusb-compat-0_1 }: let version = "0.6.9"; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { ''; cargoSha256 = "0d5kcwy0cgxqfxf2xysw65ng84q4knhp4fgvh6dwqhf0nsca9gvs"; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; meta = with lib; { description = "Manipulate a Wishbone device over some sort of bridge"; diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix index 68897105f5c74..1ccd6c2ec4f24 100644 --- a/pkgs/development/tools/misc/xc3sprog/default.nix +++ b/pkgs/development/tools/misc/xc3sprog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, cmake, libusb, libftdi }: +{ stdenv, fetchsvn, cmake, libusb-compat-0_1, libftdi }: # The xc3sprog project doesn't seem to make proper releases, they only put out # prebuilt binary subversion snapshots on sourceforge. @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { rev = version; }; - buildInputs = [ cmake libusb libftdi ]; + buildInputs = [ cmake libusb-compat-0_1 libftdi ]; meta = with stdenv.lib; { description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG"; - homepage = http://xc3sprog.sourceforge.net/; + homepage = "http://xc3sprog.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 7befc0fef2d72..02298d93b8afe 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -2,6 +2,7 @@ , gocode ? null , godef ? null , gotools ? null +, nodePackages ? null , rustracerd ? null , fixDarwinDylibNames, Cocoa ? null }: @@ -69,6 +70,9 @@ stdenv.mkDerivation { TARGET=$out/lib/ycmd/third_party/go/src/golang.org/x/tools/cmd/gopls mkdir -p $TARGET ln -sf ${gotools}/bin/gopls $TARGET + '' + lib.optionalString (nodePackages != null) '' + TARGET=$out/lib/ycmd/third_party/tsserver + ln -sf ${nodePackages.typescript} $TARGET '' + lib.optionalString (rustracerd != null) '' TARGET=$out/lib/ycmd/third_party/racerd/target/release mkdir -p $TARGET @@ -87,7 +91,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A code-completion and comprehension server"; - homepage = https://github.com/Valloric/ycmd; + homepage = "https://github.com/Valloric/ycmd"; license = licenses.gpl3; maintainers = with maintainers; [ rasendubi cstrahan lnl7 ]; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 38a92bc548202..758bebb57df87 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A package that implements a pre-document language and tools to process it"; - homepage = https://fbb-git.gitlab.io/yodl/; + homepage = "https://fbb-git.gitlab.io/yodl/"; license = licenses.gpl3; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix index 3261c8af2024f..839594f4cc803 100644 --- a/pkgs/development/tools/mod/default.nix +++ b/pkgs/development/tools/mod/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mod"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "marwan-at-work"; repo = "mod"; rev = "v${version}"; - sha256 = "1kcsdi9qls9kgklj96ycyrq5fsz5m2qj3ij63d2rwqjggqk0cab6"; + sha256 = "1n0pipbq4fjban8hsxhyl5w8xrl4ai1pvgd02i1j1awmm2l3ykzl"; }; - modSha256 = "0famjypv5qg9lgzw4pz2kz70l50cn6n6nbjyk7jrzmd6bjzd0ypl"; + vendorSha256 = "032s62rjjq7bqiz5fg17yfkq4j4dsbl6vhvs1wf2sg8jvbqmvdwn"; subPackages = [ "cmd/mod" ]; @@ -26,4 +26,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/modd/default.nix b/pkgs/development/tools/modd/default.nix index 47beb1a22418b..106f23ac3f11e 100644 --- a/pkgs/development/tools/modd/default.nix +++ b/pkgs/development/tools/modd/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { description = "A flexible developer tool that runs processes and responds to filesystem changes"; - homepage = https://github.com/cortesi/modd; + homepage = "https://github.com/cortesi/modd"; license = licenses.mit; maintainers = with maintainers; [ kierdavis ]; platforms = platforms.all; diff --git a/pkgs/development/tools/mpfshell/default.nix b/pkgs/development/tools/mpfshell/default.nix index b44e52aa2bf50..69048acb5baf2 100644 --- a/pkgs/development/tools/mpfshell/default.nix +++ b/pkgs/development/tools/mpfshell/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/wendlers/mpfshell; + homepage = "https://github.com/wendlers/mpfshell"; description = "A simple shell based file explorer for ESP8266 Micropython based devices"; license = licenses.mit; }; diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/development/tools/msgpack-tools/default.nix index 1d7784ae1cc78..65bc8feab6b43 100644 --- a/pkgs/development/tools/msgpack-tools/default.nix +++ b/pkgs/development/tools/msgpack-tools/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line tools for converting between MessagePack and JSON"; - homepage = https://github.com/ludocode/msgpack-tools; + homepage = "https://github.com/ludocode/msgpack-tools"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ alibabzo ]; diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix index 41e74bc120f13..2f3d21f9c82d3 100644 --- a/pkgs/development/tools/mustache-go/default.nix +++ b/pkgs/development/tools/mustache-go/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/cbroglie/mustache; + homepage = "https://github.com/cbroglie/mustache"; description = "The mustache template language in Go"; license = [ licenses.mit ]; maintainers = [ maintainers.Zimmi48 ]; diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index 6e0014b377325..84e5a6b1d9fc6 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Client, protocol, and server for running Java programs from the command line without incurring the JVM startup overhead"; - homepage = http://www.martiansoftware.com/nailgun/; + homepage = "http://www.martiansoftware.com/nailgun/"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ volth ]; diff --git a/pkgs/development/tools/nemiver/default.nix b/pkgs/development/tools/nemiver/default.nix index 1f3556fc90473..8890ceca9d39d 100644 --- a/pkgs/development/tools/nemiver/default.nix +++ b/pkgs/development/tools/nemiver/default.nix @@ -54,15 +54,15 @@ stdenv.mkDerivation rec { patches = [ # build fixes (fetchpatch { - url = https://gitlab.gnome.org/GNOME/nemiver/commit/e0e42221ceb77d88be64fac1c09792dc5c9e2f43.patch; + url = "https://gitlab.gnome.org/GNOME/nemiver/commit/e0e42221ceb77d88be64fac1c09792dc5c9e2f43.patch"; sha256 = "1g0ixll6yqfj6ysf50p0c7nmh3lgmb6ds15703q7ibnw7dyidvj8"; }) (fetchpatch { - url = https://gitlab.gnome.org/GNOME/nemiver/commit/7005393a8c4d914eac9705e7f47818d0f4de3578.patch; + url = "https://gitlab.gnome.org/GNOME/nemiver/commit/7005393a8c4d914eac9705e7f47818d0f4de3578.patch"; sha256 = "1mxb1sdqdj7dm204gja8cdygx8579bjriqqbb7cna9rj0m9c8pjg"; }) (fetchpatch { - url = https://gitlab.gnome.org/GNOME/nemiver/commit/262cf9657f9c2727a816972b348692adcc666008.patch; + url = "https://gitlab.gnome.org/GNOME/nemiver/commit/262cf9657f9c2727a816972b348692adcc666008.patch"; sha256 = "03jv6z54b8nzvplplapk4aj206zl1gvnv6iz0mad19g6yvfbw7a7"; }) ]; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Nemiver; + homepage = "https://wiki.gnome.org/Apps/Nemiver"; description = "Easy to use standalone C/C++ debugger"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix index b07ab21fdf102..be772f60492aa 100644 --- a/pkgs/development/tools/neoload/default.nix +++ b/pkgs/development/tools/neoload/default.nix @@ -35,10 +35,10 @@ in stdenv.mkDerivation { src = fetchurl ( if stdenv.hostPlatform.system == "x86_64-linux" then - { url = http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x64.sh; + { url = "http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x64.sh"; sha256 = "199jcf5a0nwfm8wfld2rcjgq64g91vvz2bkmki8dxfzf1yasifcd"; } else - { url = http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x86.sh; + { url = "http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x86.sh"; sha256 = "1z66jiwcxixsqqwa0f4q8m2p5kna4knq6lic8y8l74dgv25mw912"; } ); buildInputs = [ makeWrapper ]; @@ -84,7 +84,7 @@ in stdenv.mkDerivation { meta = { description = "Load testing software for Web applications to realistically simulate user activity and analyze server behavior"; - homepage = https://www.neotys.com/product/overview-neoload.html; + homepage = "https://www.neotys.com/product/overview-neoload.html"; # https://www.neotys.com/documents/legal/eula/neoload/eula_en.html license = stdenv.lib.licenses.unfree; diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index e052b7244392e..307e123bf77db 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An app runtime based on Chromium and node.js"; - homepage = https://nwjs.io/; + homepage = "https://nwjs.io/"; platforms = ["i686-linux" "x86_64-linux"]; maintainers = [ maintainers.offline ]; license = licenses.bsd3; diff --git a/pkgs/development/tools/nrpl/default.nix b/pkgs/development/tools/nrpl/default.nix index d8dab6b035878..a1c9bfd53e332 100644 --- a/pkgs/development/tools/nrpl/default.nix +++ b/pkgs/development/tools/nrpl/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { patches = [ (fetchpatch { - url = https://patch-diff.githubusercontent.com/raw/wheineman/nrpl/pull/12.patch; + url = "https://patch-diff.githubusercontent.com/raw/wheineman/nrpl/pull/12.patch"; name = "update_for_new_nim.patch"; sha256 = "1zff7inhn3l1jnxcnidy705lzi3wqib1chf4rayh1g9i23an7wg1"; }) @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "REPL for the Nim programming language"; - homepage = https://github.com/wheineman/nrpl; + homepage = "https://github.com/wheineman/nrpl"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix index ea6203e57c310..5b9e7434a8dec 100644 --- a/pkgs/development/tools/nsis/default.nix +++ b/pkgs/development/tools/nsis/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "NSIS is a free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge"; - homepage = https://nsis.sourceforge.io/; + homepage = "https://nsis.sourceforge.io/"; license = licenses.zlib; platforms = platforms.linux; maintainers = with maintainers; [ pombeirp ]; diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 30f531d7db20f..463642988a8f5 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -87,7 +87,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An app runtime based on Chromium and node.js"; - homepage = https://nwjs.io/; + homepage = "https://nwjs.io/"; platforms = ["i686-linux" "x86_64-linux"]; maintainers = [ maintainers.offline ]; license = licenses.bsd3; diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index de5da5674a2cb..ea1b396509805 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A software system for writing extensible parsers for programming languages"; - homepage = https://github.com/ocaml/camlp4; + homepage = "https://github.com/ocaml/camlp4"; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index e0bd0e4ac6768..9a69f88c8043f 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { Camlp5 is a preprocessor and pretty-printer for OCaml programs. It also provides parsing and printing tools. ''; - homepage = https://camlp5.github.io/; + homepage = "https://camlp5.github.io/"; license = licenses.bsd3; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 510dd183f00d6..37f277686702c 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "1nnpg0fvmp4vf5mk203xk83pkkm953pgip3yhs1x2g8pkcdndhcw"; + sha256 = "0az5ih18wadsp3ljagvws1i7vf0vpg24h75ariy0v3i0gyld6xwg"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 9db5ed10c842d..1354e158a8e6b 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://projects.camlcity.org/projects/findlib.html; + homepage = "http://projects.camlcity.org/projects/findlib.html"; description = "O'Caml library manager"; license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index e535ba29aeb44..7f6426c9610db 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = http://ocsigen.org/js_of_ocaml/; + homepage = "http://ocsigen.org/js_of_ocaml/"; description = "Compiler of OCaml bytecode to Javascript. It makes it possible to run Ocaml programs in a Web browser"; license = licenses.lgpl2; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index ed3d5efc789db..fa78e47951f37 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "merlin"; - version = "3.3.3"; + version = "3.3.4"; minimumOCamlVersion = "4.02.1"; src = fetchurl { url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; - sha256 = "05dfkbpbb7nvs4g6y0iw7a9f73ygvhs9l45l2g56y7zagvs9x43j"; + sha256 = "12wxric6n3rmsn0w16xm8vjd8p5aw24cj76zw2x87qfwwgmy1kdd"; }; buildInputs = [ yojson ]; diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index b13d98acd0dfc..a0932d919c08f 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { # You must manually update the url, not just the version. OCamlforge keys off # the number after download.php, not the filename. src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1694/oasis-0.4.10.tar.gz; + url = "https://forge.ocamlcore.org/frs/download.php/1694/oasis-0.4.10.tar.gz"; sha256 = "13ah03pbcvrjv5lmx971hvkm9rvbvimska5wmjfvgvd20ca0gn8w"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { installPhase = "ocaml setup.ml -install"; meta = with stdenv.lib; { - homepage = http://oasis.forge.ocamlcore.org/; + homepage = "http://oasis.forge.ocamlcore.org/"; description = "Configure, build and install system for OCaml projects"; license = licenses.lgpl21; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix index 61e8e77f384b5..5e851a93205b8 100644 --- a/pkgs/development/tools/ocaml/obuild/default.nix +++ b/pkgs/development/tools/ocaml/obuild/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/ocaml-obuild/obuild; + homepage = "https://github.com/ocaml-obuild/obuild"; platforms = ocaml.meta.platforms or []; description = "Simple package build system for OCaml"; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index 3ceb9b1622c10..a9b4218224ee8 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -17,7 +17,7 @@ with ocamlPackages; buildDunePackage rec { ''; meta = { - homepage = https://www.typerex.org/ocaml-top.html; + homepage = "https://www.typerex.org/ocaml-top.html"; license = lib.licenses.gpl3; description = "A simple cross-platform OCaml code editor built for top-level evaluation"; maintainers = with lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index ec9ff6f4ba90c..7270386972de0 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/ocaml/ocamlbuild/; + homepage = "https://github.com/ocaml/ocamlbuild/"; description = "A build system with builtin rules to easily build most OCaml projects"; license = licenses.lgpl2; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index da134562e32ba..c79f65b47a804 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -2,7 +2,7 @@ with ocamlPackages; buildDunePackage rec { pname = "ocamlformat"; - version = "0.14.0"; + version = "0.14.2"; minimumOCamlVersion = "4.06"; @@ -10,7 +10,7 @@ with ocamlPackages; buildDunePackage rec { src = fetchurl { url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}.tbz"; - sha256 = "070c0x6z5y0lyls56zm34g8lyc093wkr0jfp50dvrkr9fk1sx2wi"; + sha256 = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz"; }; buildInputs = [ diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix index 5465e9dcb6f5a..42faa33fbe1cf 100644 --- a/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ocamlify-0.0.2"; src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/1209/ocamlify-0.0.2.tar.gz; + url = "http://forge.ocamlcore.org/frs/download.php/1209/ocamlify-0.0.2.tar.gz"; sha256 = "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { dontStrip = true; meta = { - homepage = http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod; + homepage = "http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod"; description = "Generate OCaml modules from source files"; platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index 522cb7c199dc3..46a87dc3ffeda 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { dontStrip = true; meta = { - homepage = http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod; + homepage = "http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod"; description = "Generate OCaml modules from source files"; platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix index 33b729f938df5..2172c7f6161ac 100644 --- a/pkgs/development/tools/ocaml/ocamlscript/default.nix +++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "ocamlscript-2.0.3"; src = fetchurl { - url = http://mjambon.com/releases/ocamlscript/ocamlscript-2.0.3.tar.gz; + url = "http://mjambon.com/releases/ocamlscript/ocamlscript-2.0.3.tar.gz"; sha256 = "1v1i24gijxwris8w4hi95r9swld6dm7jbry0zp72767a3g5ivlrd"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = http://martin.jambon.free.fr/ocamlscript.html; + homepage = "http://martin.jambon.free.fr/ocamlscript.html"; license = licenses.boost; platforms = ocaml.meta.platforms or []; description = "Natively-compiled OCaml scripts"; diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index ca74a701315af..4ebea6766211c 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.typerex.org/ocp-build.html; + homepage = "https://www.typerex.org/ocp-build.html"; description = "A build tool for OCaml"; longDescription = '' ocp-build is a build system for OCaml application, based on simple diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index 6f8d80df564e7..729985f87fd67 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { buildInputs = [ cmdliner ]; meta = with lib; { - homepage = http://typerex.ocamlpro.com/ocp-indent.html; + homepage = "http://typerex.ocamlpro.com/ocp-indent.html"; description = "A customizable tool to indent OCaml code"; license = licenses.gpl3; maintainers = [ maintainers.jirkamarsik ]; diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index cf2be985b143d..b9404016b4e04 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ocp-indent ]; meta = { - homepage = http://typerex.ocamlpro.com/ocp-index.html; + homepage = "http://typerex.ocamlpro.com/ocp-index.html"; description = "A simple and light-weight documentation extractor for OCaml"; license = lib.licenses.lgpl3; maintainers = with lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index 5144af97f759c..476c98ce5bc64 100644 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec }; meta = { - homepage = https://github.com/besport/ocsigen-i18n; + homepage = "https://github.com/besport/ocsigen-i18n"; description = "I18n made easy for web sites written with eliom"; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index da7a5b439ab16..2afe0d1e9f52d 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/pkgs/development/tools/ocaml/omake/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "A build system designed for scalability and portability"; - homepage = http://projects.camlcity.org/projects/omake.html; + homepage = "http://projects.camlcity.org/projects/omake.html"; license = with stdenv.lib.licenses; [ mit /* scripts */ gpl2 /* program */ diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix index 53482598f1341..e6c08b97aca4a 100644 --- a/pkgs/development/tools/ocaml/opam/1.2.2.nix +++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix @@ -84,7 +84,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A package manager for OCaml"; - homepage = http://opam.ocamlpro.com/; + homepage = "http://opam.ocamlpro.com/"; maintainers = [ maintainers.henrytill ]; platforms = platforms.all; license = licenses.lgpl21Plus; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index f1028208dae9a..9e95db79dd0b7 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -55,13 +55,13 @@ let sha256 = "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/2.0.6.zip"; - sha256 = "076070qwf7rqp5bh0mmgc5b3vyihgp4qpkd6fscxzya4in66bzf8"; + url = "https://github.com/ocaml/opam/archive/2.0.7.zip"; + sha256 = "03yxj4hw9p5dh34b1yzl3xd0l1v2l2az0n7ix453yjrkn0wn0xic"; }; }; in stdenv.mkDerivation { pname = "opam"; - version = "2.0.6"; + version = "2.0.7"; buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; @@ -113,8 +113,8 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A package manager for OCaml"; homepage = "https://opam.ocaml.org/"; - maintainers = [ maintainers.henrytill ]; + maintainers = [ maintainers.henrytill maintainers.marsam ]; platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.0.6 -p opam-shebangs.patch +# Generated by: ./opam.nix.pl -v 2.0.7 -p opam-shebangs.patch diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index 605d0c41cae9b..828e209fac61a 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -123,7 +123,7 @@ print <<'EOF'; meta = with stdenv.lib; { description = "A package manager for OCaml"; homepage = "https://opam.ocaml.org/"; - maintainers = [ maintainers.henrytill ]; + maintainers = [ maintainers.henrytill maintainers.marsam ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index f3092a696b168..ac7cd4f4dbbcf 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -67,7 +67,7 @@ buildDunePackage rec { It integrates with the tuareg mode in Emacs. ''; - homepage = https://github.com/diml/utop; + homepage = "https://github.com/diml/utop"; license = stdenv.lib.licenses.bsd3; platforms = ocaml.meta.platforms or []; maintainers = [ diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix index af295eb242f6d..350407098a418 100644 --- a/pkgs/development/tools/omniorb/default.nix +++ b/pkgs/development/tools/omniorb/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "omniorb"; - version = "4.2.3"; + version = "4.2.4"; src = fetchurl { url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; - sha256 = "1jlb0wps6311dmhnphn64gv46z0bl8grch4fd9dcx5dlib02lh96"; + sha256 = "0vvsvi5nx4k7kk4qh1pkf3f5fpz7wv4rsdna4hayihbnvz81rh18"; }; buildInputs = [ python2 ]; diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 5daeb384cc51f..973f777d8cb9e 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.34.15"; - + version = "1.35.1"; + src = fetchurl { url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; - sha256 = "16wjp89lzg33cap99jv1vgqvdx0y0xvb892fpihwg62iafh10b8m"; + sha256 = "0gx87qc9r3lhqn6q95y74z67sjcxnazkkdi9zswmaqyvjn8x7vf4"; }; nativeBuildInputs = [ makeWrapper ]; @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OmniSharp based on roslyn workspaces"; + homepage = "https://github.com/OmniSharp/omnisharp-roslyn"; platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ tesq0 ]; diff --git a/pkgs/development/tools/oq/default.nix b/pkgs/development/tools/oq/default.nix new file mode 100644 index 0000000000000..ca9c648adfbd8 --- /dev/null +++ b/pkgs/development/tools/oq/default.nix @@ -0,0 +1,37 @@ +{ lib, fetchFromGitHub, crystal, jq, libxml2, makeWrapper }: + +crystal.buildCrystalPackage rec { + pname = "oq"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "Blacksmoke16"; + repo = pname; + rev = "v${version}"; + sha256 = "1zg4kxpfi3sap4cwp42zg46j5dv0nf926qdqm7k22ncm6jdrgpgw"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jq libxml2 ]; + + format = "crystal"; + crystalBinaries.oq.src = "src/oq_cli.cr"; + + preCheck = '' + mkdir bin + cp oq bin/oq + ''; + + postInstall = '' + wrapProgram "$out/bin/oq" \ + --prefix PATH : "${lib.makeBinPath [ jq ]}" + ''; + + meta = with lib; { + description = "A performant, and portable jq wrapper"; + homepage = "https://blacksmoke16.github.io/oq/"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix index 725694063a3f8..434f0186d8911 100644 --- a/pkgs/development/tools/out-of-tree/default.nix +++ b/pkgs/development/tools/out-of-tree/default.nix @@ -17,13 +17,13 @@ buildGoPackage rec { goDeps = ./deps.nix; postFixup = '' - wrapProgram $bin/bin/out-of-tree \ + wrapProgram $out/bin/out-of-tree \ --prefix PATH : "${stdenv.lib.makeBinPath [ qemu docker which ]}" ''; meta = with stdenv.lib; { description = "kernel {module, exploit} development tool"; - homepage = https://out-of-tree.io; + homepage = "https://out-of-tree.io"; maintainers = [ maintainers.dump_stack ]; license = licenses.agpl3Plus; }; diff --git a/pkgs/development/tools/overcommit/default.nix b/pkgs/development/tools/overcommit/default.nix index 84529ca4b6fe1..5fa3dfa0f03ad 100644 --- a/pkgs/development/tools/overcommit/default.nix +++ b/pkgs/development/tools/overcommit/default.nix @@ -7,7 +7,7 @@ bundlerApp { meta = with lib; { description = "Tool to manage and configure Git hooks"; - homepage = https://github.com/sds/overcommit; + homepage = "https://github.com/sds/overcommit"; license = licenses.mit; maintainers = with maintainers; [ filalex77 ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 1430f0fc2a34a..32ac95cff6a44 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packer"; - version = "1.5.4"; + version = "1.5.6"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,12 +11,12 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "06320crk5dldh7w3yi4pkx7hn3s0l8q1h9fqyzf56iw8sx7983g5"; + sha256 = "0pwygrh6pjmx8a1jc12929x0slj7w3b8p3pzswnbk7klyhj4jkp8"; }; meta = with stdenv.lib; { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; - homepage = https://www.packer.io; + homepage = "https://www.packer.io"; license = licenses.mpl20; maintainers = with maintainers; [ cstrahan zimbatm ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/packet-cli/default.nix b/pkgs/development/tools/packet-cli/default.nix new file mode 100644 index 0000000000000..a484098f0c60d --- /dev/null +++ b/pkgs/development/tools/packet-cli/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "packet-cli"; + version = "0.0.6"; + + src = fetchFromGitHub { + owner = "packethost"; + repo = pname; + rev = version; + sha256 = "17f3ax7pjm5k93cxj7fd8hwr4id1lbzz9pkl2xflpxydi89bwdfz"; + }; + + vendorSha256 = "10praxaiscxq4v3zknrabldxl7rpklkr5wdlwa5lxsx0if8mrvp7"; + + meta = with stdenv.lib; { + description = "Official Packet CLI"; + homepage = "https://github.com/packethost/packet-cli"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + platforms = platforms.all; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix index 54100dfdee9e9..9bca1ec75b67c 100644 --- a/pkgs/development/tools/packet/default.nix +++ b/pkgs/development/tools/packet/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = { description = "a CLI tool to manage packet.net services"; - homepage = https://github.com/ebsarr/packet; + homepage = "https://github.com/ebsarr/packet"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.grahamc ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/development/tools/pandoc/default.nix new file mode 100644 index 0000000000000..ce7132b0007b7 --- /dev/null +++ b/pkgs/development/tools/pandoc/default.nix @@ -0,0 +1,29 @@ +{ haskellPackages, haskell, removeReferencesTo }: + +let + static = haskell.lib.justStaticExecutables haskellPackages.pandoc; + +in + (haskell.lib.overrideCabal static (drv: { + configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; + buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; + buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ]; + })).overrideAttrs (drv: { + + # These libraries are still referenced, because pandoc references + # their `Paths_*` module for figuring out their version. + # The `Paths_*` module is generated by Cabal, and contains the + # version, but also paths to e.g. the data directories, which + # lead to a transitive runtime dependency on the whole GHC distribution. + # This should ideally be fixed in haskellPackages (or even Cabal), + # but a minimal pandoc is important enough to patch it manually. + disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.HTTP ]; + postInstall = '' + remove-references-to \ + -t ${haskellPackages.pandoc-types} \ + $out/bin/pandoc + remove-references-to \ + -t ${haskellPackages.HTTP} \ + $out/bin/pandoc + ''; + }) diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index a054bc82d45d7..55800a8009848 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees. ''; - homepage = https://www.antlr.org/; + homepage = "https://www.antlr.org/"; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix index 9e86a29cf9343..1263e7934be7f 100644 --- a/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/pkgs/development/tools/parsing/antlr/3.4.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees. ''; - homepage = https://www.antlr.org/; + homepage = "https://www.antlr.org/"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix index 05f08e5f06088..23267bf243137 100644 --- a/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/pkgs/development/tools/parsing/antlr/4.7.nix @@ -28,7 +28,7 @@ let meta = with stdenv.lib; { description = "C++ target for ANTLR 4"; - homepage = https://www.antlr.org/; + homepage = "https://www.antlr.org/"; license = licenses.bsd3; platforms = platforms.unix; }; @@ -76,7 +76,7 @@ let frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees. ''; - homepage = https://www.antlr.org/; + homepage = "https://www.antlr.org/"; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index 41d28173da357..c9758fe21e31f 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/pkgs/development/tools/parsing/bison/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.5.1"; + version = "3.5.4"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "09bg544pavpsivwh175ghgm7y3mkvdxfbwq41lfbwlb7v4i27vsc"; + sha256 = "0a2cbrqh7mgx2dwf5qm10v68iakv1i0dqh9di4x5aqxsz96ibpf0"; }; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doInstallCheck = false; # fails meta = { - homepage = https://www.gnu.org/software/bison/; + homepage = "https://www.gnu.org/software/bison/"; description = "Yacc-compatible parser generator"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 79e171d5fd73f..be526085b757c 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "byacc"; - version = "20191125"; + version = "20200330"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" ]; - sha256 = "1phw8410ly3msv03dmjfi8xkmrl1lrrk928fp1489amg6sz2w707"; + sha256 = "1c0zyn6v286i09jlc8gx6jyaa5438qyy985rqsd76kb8ibfy56g0"; }; configureFlags = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Berkeley YACC"; - homepage = https://invisible-island.net/byacc/byacc.html; + homepage = "https://invisible-island.net/byacc/byacc.html"; license = licenses.publicDomain; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix index e555f1d598547..504e5b090497d 100644 --- a/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "flex-2.5.35"; src = fetchurl { - url = https://github.com/westes/flex/archive/flex-2-5-35.tar.gz; + url = "https://github.com/westes/flex/archive/flex-2-5-35.tar.gz"; sha256 = "0wh06nix8bd4w1aq4k2fbbkdq5i30a9lxz3xczf3ff28yy0kfwzm"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { branch = "2.5.35"; - homepage = http://flex.sourceforge.net/; + homepage = "http://flex.sourceforge.net/"; description = "A fast lexical analyser generator"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/pkgs/development/tools/parsing/flex/2.6.1.nix index fc2c769958393..2562b3c26134d 100644 --- a/pkgs/development/tools/parsing/flex/2.6.1.nix +++ b/pkgs/development/tools/parsing/flex/2.6.1.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/westes/flex; + homepage = "https://github.com/westes/flex"; description = "A fast lexical analyser generator"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index e46a494de76c2..51373f4a4fd7f 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { dontDisableStatic = stdenv.buildPlatform != stdenv.hostPlatform; meta = with stdenv.lib; { - homepage = https://github.com/westes/flex; + homepage = "https://github.com/westes/flex"; description = "A fast lexical analyser generator"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix index 93f1d1ee649fa..a9482f9fd4939 100644 --- a/pkgs/development/tools/parsing/flexc++/default.nix +++ b/pkgs/development/tools/parsing/flexc++/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { and requires simpler specification files than offered by flex's C++ option. ''; - homepage = https://fbb-git.github.io/flexcpp/; + homepage = "https://fbb-git.github.io/flexcpp/"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index e10fe49b1e45d..d36dfa9219d42 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { character-oriented, making it ideal for parsing binary data such as images, network packets, audio, and executables. ''; - homepage = https://github.com/UpstandingHackers/hammer; + homepage = "https://github.com/UpstandingHackers/hammer"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/pkgs/development/tools/parsing/jikespg/default.nix index 6f0eb3735ffbb..18dd531e4b14a 100644 --- a/pkgs/development/tools/parsing/jikespg/default.nix +++ b/pkgs/development/tools/parsing/jikespg/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://jikes.sourceforge.net/; + homepage = "http://jikes.sourceforge.net/"; description = "The Jikes Parser Generator"; platforms = platforms.linux; license = licenses.ipl10; diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/development/tools/parsing/jshon/default.nix index 359daad2d517c..04a1a637207d2 100644 --- a/pkgs/development/tools/parsing/jshon/default.nix +++ b/pkgs/development/tools/parsing/jshon/default.nix @@ -1,29 +1,27 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, jansson }: stdenv.mkDerivation rec { - name = "jshon-20160111.2"; - - rev = "a61d7f2f85f4627bc3facdf951746f0fd62334b7"; - sha256 = "1053w7jbl90q3p5y34pi4i8an1ddsjzwaib5cfji75ivamc5wdmh"; + pname = "jshon"; + version = "20170302"; src = fetchFromGitHub { - inherit rev sha256; owner = "keenerd"; repo = "jshon"; + rev = "d919aeaece37962251dbe6c1ee50f0028a5c90e4"; + sha256 = "1x4zfmsjq0l2y994bxkhx3mn5vzjxxr39iib213zjchi9h6yxvnc"; }; + buildInputs = [ jansson ]; + patches = [ - # Fix null termination in read_stream. - # https://github.com/keenerd/jshon/issues/53 (fetchpatch { - url = https://github.com/mbrock/jshon/commit/32288dd186573ceb58164f30be1782d4580466d8.patch; - sha256 = "04rss2nprl9nqblc7smq0477n54hm801xgnnmvyzni313i1n6vhl"; + # https://github.com/keenerd/jshon/pull/62 + url = "https://github.com/keenerd/jshon/commit/96b4e9dbf578be7b31f29740b608aa7b34df3318.patch"; + sha256 = "0kwbn3xb37iqb5y1n8vhzjiwlbg5jmki3f38pzakc24kzc5ksmaa"; }) ]; - buildInputs = [ jansson ]; - - patchPhase = + postPatch = '' substituteInPlace Makefile --replace "/usr/" "/" ''; @@ -34,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = http://kmkeen.com/jshon; + homepage = "http://kmkeen.com/jshon"; description = "JSON parser designed for maximum convenience within the shell"; license = licenses.free; platforms = platforms.all; diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/development/tools/parsing/lemon/default.nix index 009ebe8e2ff0c..b10e989095171 100644 --- a/pkgs/development/tools/parsing/lemon/default.nix +++ b/pkgs/development/tools/parsing/lemon/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation { file using that grammar. Lemon is similar to the much more famous programs "yacc" and "bison", but is not compatible with either. ''; - homepage = http://www.hwaci.com/sw/lemon/; + homepage = "http://www.hwaci.com/sw/lemon/"; license = licenses.publicDomain; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 12c9b9d57f8fc..dddddba129c93 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -26,7 +26,7 @@ let doCheck = true; meta = with stdenv.lib; { - homepage = https://www.colm.net/open-source/ragel/; + homepage = "https://www.colm.net/open-source/ragel/"; description = "State machine compiler"; inherit license; platforms = platforms.unix; diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index dddd407d0da2a..482beeff12219 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -1,16 +1,24 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "re2c"; - version = "1.2.1"; + version = "1.3"; src = fetchFromGitHub { owner = "skvadrik"; repo = "re2c"; rev = version; - sha256 = "1qj0ck9msb9h8g9qb1lr57jmlj8x68ini3y3ccdifjjahhhr0hd4"; + sha256 = "0aqlf2h6i2m3dq11dkq89p4w4c9kp4x66s5rhp84gmpz5xqv1x5h"; }; + patches = [ + (fetchpatch { + name = "CVE-2020-11958.patch"; + url = "https://github.com/skvadrik/re2c/commit/c4603ba5ce229db83a2a4fb93e6d4b4e3ec3776a.patch"; + sha256 = "1d95ahxk92g7k87sda9gxgmr3blyfzwd2y7h9jxj8zkd74knd9zh"; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; doCheck = true; diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index aa83a1b8e1b6b..72516fb7d17f4 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -10,7 +10,7 @@ buildRustPackage rec { longDescription = '' The fastest JavaScript bundler in the galaxy. Fully supports ECMAScript module syntax (import/export) in addition to CommonJS require(<string>). ''; - homepage = https://github.com/nathan/pax; + homepage = "https://github.com/nathan/pax"; license = licenses.mit; maintainers = [ maintainers.klntsky ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix index e7f4fce3c4d4c..d37c529ecf9b4 100644 --- a/pkgs/development/tools/pet/default.nix +++ b/pkgs/development/tools/pet/default.nix @@ -11,15 +11,15 @@ buildGoModule rec { sha256 = "1na3az7vicjq1rxd3ybid47yrblsdazgli0dchkbwh8zchwhqj33"; }; - modSha256 = "06ham8lsx5c1vk5jkwp1aa9g4q4g7sfq7gxz2gkffa98x2vlawyf"; + vendorSha256 = "0pnd89iqdj3f719xf4iy5r04n51d0rrrf0qb2zjirpw7vh7g82i9"; subPackages = [ "." ]; meta = with lib; { description = "Simple command-line snippet manager, written in Go"; - homepage = https://github.com/knqyf263/pet; + homepage = "https://github.com/knqyf263/pet"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index 2c37d71e75ce6..f042aa35b6f6b 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { - Network Monitoring ''; - homepage = https://phantomjs.org/; + homepage = "https://phantomjs.org/"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.bluescreen303 ]; diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index b18bd0104ce6c..d565a70798ae5 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -37,27 +37,27 @@ in stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-hardening.patch; + url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-hardening.patch"; sha256 = "1qs1r76w90qgpw742i7lf0y3b7m9zh5wxcbrhrak6mq1kqaphqb5"; }) (fetchpatch { - url = https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt-components.patch; + url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt-components.patch"; sha256 = "1fw2q59aqcks3abvwkqg9903yif6aivdsznc0h6frhhjvpp19vsb"; }) (fetchpatch { - url = https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-evaluateJavaScript.patch; + url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-evaluateJavaScript.patch"; sha256 = "1avig9cfny8kv3s4mf3mdzvf3xlzgyh351yzwc4bkpnjvzv4fmq6"; }) (fetchpatch { - url = https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-no-websecurity.patch; + url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-no-websecurity.patch"; sha256 = "1nykqpxa7lcf9iarz5lywgg3v3b1h19iwvjdg4kgq0ai6idhcab8"; }) (fetchpatch { - url = https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-print.patch; + url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-print.patch"; sha256 = "1fydmdjxnplglpbd3ypaih5l237jkxjirpdhzz92mcpy29yla6jw"; }) (fetchpatch { - url = https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/unlock-qt.patch; + url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/unlock-qt.patch"; sha256 = "13bwz4iw17d6hq5pwkbpcckqyw7fhc6648lvs26m39pp31zwyp03"; }) ./system-qtbase.patch @@ -109,7 +109,7 @@ in stdenv.mkDerivation rec { - Network Monitoring ''; - homepage = https://phantomjs.org/; + homepage = "https://phantomjs.org/"; license = licenses.bsd3; maintainers = [ maintainers.aflatter ]; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix b/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix index fbcee749b7cd2..b96316e59d83a 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix @@ -1,4 +1,4 @@ -{ pkgs ? import <nixpkgs> {} +{ pkgs ? import <nixpkgs> { } , lib ? pkgs.lib , version }: @@ -33,8 +33,8 @@ pkgs.stdenv.mkDerivation { mv poetry2nix $out/bin wrapProgram $out/bin/poetry2nix --prefix PATH ":" ${lib.makeBinPath [ - pkgs.nix-prefetch-git - ]} + pkgs.nix-prefetch-git + ]} runHook postInstall ''; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index e7f718519a594..a7fb382c7553f 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -1,22 +1,20 @@ -{ pkgs ? import <nixpkgs> {} +{ pkgs ? import <nixpkgs> { } , lib ? pkgs.lib , poetry ? null , poetryLib ? import ./lib.nix { inherit lib pkgs; } }: let - inherit (poetryLib) isCompatible readTOML; + inherit (poetryLib) isCompatible readTOML moduleName; # Poetry2nix version - version = "1.7.1"; + version = "1.8.0"; /* The default list of poetry2nix override overlays */ defaultPoetryOverrides = (import ./overrides.nix { inherit pkgs lib; }); - mkEvalPep508 = import ./pep508.nix { inherit lib poetryLib; stdenv = pkgs.stdenv; }; - getFunctorFn = fn: if builtins.typeOf fn == "set" then fn.__functor else fn; # Map SPDX identifiers to license names @@ -34,95 +32,99 @@ let , overrides ? [ defaultPoetryOverrides ] , python ? pkgs.python3 , pwd ? projectDir + , preferWheels ? false }@attrs: - let - poetryPkg = poetry.override { inherit python; }; - - pyProject = readTOML pyproject; - poetryLock = readTOML poetrylock; - lockFiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock; - - specialAttrs = [ - "overrides" - "poetrylock" - "projectDir" - "pwd" - ]; - passedAttrs = builtins.removeAttrs attrs specialAttrs; - - evalPep508 = mkEvalPep508 python; - - # Filter packages by their PEP508 markers & pyproject interpreter version - partitions = let + let + poetryPkg = poetry.override { inherit python; }; + pyProject = readTOML pyproject; + poetryLock = readTOML poetrylock; + lockFiles = + let + lockfiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock; + in + lib.listToAttrs (lib.mapAttrsToList (n: v: { name = moduleName n; value = v; }) lockfiles); + specialAttrs = [ + "overrides" + "poetrylock" + "projectDir" + "pwd" + "preferWheels" + ]; + passedAttrs = builtins.removeAttrs attrs specialAttrs; + evalPep508 = mkEvalPep508 python; + + # Filter packages by their PEP508 markers & pyproject interpreter version + partitions = + let supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true; in - lib.partition supportsPythonVersion poetryLock.package; - - compatible = partitions.right; - incompatible = partitions.wrong; - - # Create an overriden version of pythonPackages - # - # We need to avoid mixing multiple versions of pythonPackages in the same - # closure as python can only ever have one version of a dependency - baseOverlay = self: super: - let - getDep = depName: self.${depName}; - - lockPkgs = builtins.listToAttrs ( - builtins.map ( - pkgMeta: rec { - name = pkgMeta.name; - value = self.mkPoetryDep ( - pkgMeta // { - inherit pwd; - source = pkgMeta.source or null; - files = lockFiles.${name}; - pythonPackages = self; - sourceSpec = pyProject.tool.poetry.dependencies.${name} or pyProject.tool.poetry.dev-dependencies.${name}; - } - ); - } - ) compatible + lib.partition supportsPythonVersion poetryLock.package; + compatible = partitions.right; + incompatible = partitions.wrong; + + # Create an overriden version of pythonPackages + # + # We need to avoid mixing multiple versions of pythonPackages in the same + # closure as python can only ever have one version of a dependency + baseOverlay = self: super: + let + getDep = depName: self.${depName}; + lockPkgs = builtins.listToAttrs + ( + builtins.map + ( + pkgMeta: rec { + name = moduleName pkgMeta.name; + value = self.mkPoetryDep + ( + pkgMeta // { + inherit pwd preferWheels; + source = pkgMeta.source or null; + files = lockFiles.${name}; + pythonPackages = self; + sourceSpec = pyProject.tool.poetry.dependencies.${name} or pyProject.tool.poetry.dev-dependencies.${name}; + } + ); + } + ) compatible ); - in - lockPkgs; - overlays = builtins.map getFunctorFn ( + in + lockPkgs; + overlays = builtins.map getFunctorFn + ( [ ( self: super: let - hooks = self.callPackage ./hooks {}; + hooks = self.callPackage ./hooks { }; in - { - mkPoetryDep = self.callPackage ./mk-poetry-dep.nix { - inherit pkgs lib python poetryLib; - }; - poetry = poetryPkg; - # The canonical name is setuptools-scm - setuptools-scm = super.setuptools_scm; - - inherit (hooks) removePathDependenciesHook poetry2nixFixupHook; - } + { + mkPoetryDep = self.callPackage ./mk-poetry-dep.nix { + inherit pkgs lib python poetryLib; + }; + poetry = poetryPkg; + # The canonical name is setuptools-scm + setuptools-scm = super.setuptools_scm; + + inherit (hooks) pipBuildHook removePathDependenciesHook poetry2nixFixupHook; + } ) # Null out any filtered packages, we don't want python.pkgs from nixpkgs - (self: super: builtins.listToAttrs (builtins.map (x: { name = x.name; value = null; }) incompatible)) + (self: super: builtins.listToAttrs (builtins.map (x: { name = moduleName x.name; value = null; }) incompatible)) # Create poetry2nix layer baseOverlay ] ++ # User provided overrides overrides ); - - packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) overlays; - - py = python.override { inherit packageOverrides; self = py; }; - in - { - python = py; - poetryPackages = map (pkg: py.pkgs.${pkg.name}) compatible; - poetryLock = poetryLock; - inherit pyProject; - }; + packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) overlays; + py = python.override { inherit packageOverrides; self = py; }; + in + { + python = py; + poetryPackages = map (pkg: py.pkgs.${moduleName pkg.name}) compatible; + poetryLock = poetryLock; + inherit pyProject; + }; /* Returns a package with a python interpreter and all packages specified in the poetry.lock lock file. @@ -136,15 +138,17 @@ let , overrides ? [ defaultPoetryOverrides ] , pwd ? projectDir , python ? pkgs.python3 + , preferWheels ? false }: - let - py = mkPoetryPackages ( + let + py = mkPoetryPackages + ( { - inherit pyproject poetrylock overrides python pwd; + inherit pyproject poetrylock overrides python pwd preferWheels; } ); - in - py.python.withPackages (_: py.poetryPackages); + in + py.python.withPackages (_: py.poetryPackages); /* Creates a Python application from pyproject.toml and poetry.lock */ mkPoetryApplication = @@ -153,79 +157,79 @@ let , pyproject ? projectDir + "/pyproject.toml" , poetrylock ? projectDir + "/poetry.lock" , overrides ? [ defaultPoetryOverrides ] - , meta ? {} + , meta ? { } , python ? pkgs.python3 , pwd ? projectDir + , preferWheels ? false , ... }@attrs: - let - poetryPython = mkPoetryPackages { - inherit pyproject poetrylock overrides python pwd; - }; - py = poetryPython.python; - - inherit (poetryPython) pyProject; - - specialAttrs = [ - "overrides" - "poetrylock" - "projectDir" - "pwd" - "pyproject" - ]; - passedAttrs = builtins.removeAttrs attrs specialAttrs; - - # Get dependencies and filter out depending on interpreter version - getDeps = depAttr: - let - compat = isCompatible py.pythonVersion; - deps = pyProject.tool.poetry.${depAttr} or {}; - depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps); - in - builtins.map ( - dep: - let - pkg = py.pkgs."${dep}"; - constraints = deps.${dep}.python or ""; - isCompat = compat constraints; - in - if isCompat then pkg else null - ) depAttrs; - - getInputs = attr: attrs.${attr} or []; - mkInput = attr: extraInputs: getInputs attr ++ extraInputs; - - buildSystemPkgs = poetryLib.getBuildSystemPkgs { - inherit pyProject; - pythonPackages = py.pkgs; - }; - in - py.pkgs.buildPythonApplication ( - passedAttrs // { - pname = pyProject.tool.poetry.name; - version = pyProject.tool.poetry.version; - - inherit src; - - format = "pyproject"; - - buildInputs = mkInput "buildInputs" buildSystemPkgs; - propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]); - nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj py.pkgs.removePathDependenciesHook ]; - checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies"); - - passthru = { - python = py; - }; - - meta = meta // { - inherit (pyProject.tool.poetry) description homepage; - inherit (py.meta) platforms; - license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown"); - }; - - } - ); + let + poetryPython = mkPoetryPackages { + inherit pyproject poetrylock overrides python pwd preferWheels; + }; + py = poetryPython.python; + + inherit (poetryPython) pyProject; + specialAttrs = [ + "overrides" + "poetrylock" + "projectDir" + "pwd" + "pyproject" + "preferWheels" + ]; + passedAttrs = builtins.removeAttrs attrs specialAttrs; + + # Get dependencies and filter out depending on interpreter version + getDeps = depAttr: + let + compat = isCompatible (poetryLib.getPythonVersion py); + deps = pyProject.tool.poetry.${depAttr} or { }; + depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps); + in + builtins.map + ( + dep: + let + pkg = py.pkgs."${dep}"; + constraints = deps.${dep}.python or ""; + isCompat = compat constraints; + in if isCompat then pkg else null + ) depAttrs; + getInputs = attr: attrs.${attr} or [ ]; + mkInput = attr: extraInputs: getInputs attr ++ extraInputs; + buildSystemPkgs = poetryLib.getBuildSystemPkgs { + inherit pyProject; + pythonPackages = py.pkgs; + }; + in + py.pkgs.buildPythonApplication + ( + passedAttrs // { + pname = moduleName pyProject.tool.poetry.name; + version = pyProject.tool.poetry.version; + + inherit src; + + format = "pyproject"; + + buildInputs = mkInput "buildInputs" buildSystemPkgs; + propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]); + nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj py.pkgs.removePathDependenciesHook ]; + checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies"); + + passthru = { + python = py; + }; + + meta = meta // { + inherit (pyProject.tool.poetry) description homepage; + inherit (py.meta) platforms; + license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown"); + }; + + } + ); /* Poetry2nix CLI used to supplement SHA-256 hashes for git dependencies */ cli = import ./cli.nix { inherit pkgs lib version; }; @@ -247,7 +251,7 @@ in defaultSet = defaultPoetryOverrides self super; customSet = fn self super; in - defaultSet // customSet; + defaultSet // customSet; }; /* diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/fetch-wheel.sh b/pkgs/development/tools/poetry2nix/poetry2nix/fetch-wheel.sh new file mode 100644 index 0000000000000..97f54b23416de --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/fetch-wheel.sh @@ -0,0 +1,24 @@ +source $stdenv/setup +set -euo pipefail + +curl="curl \ + --location \ + --max-redirs 20 \ + --retry 2 \ + --disable-epsv \ + --cookie-jar cookies \ + --insecure \ + --speed-time 5 \ + -# \ + --fail \ + $curlOpts \ + $NIX_CURL_FLAGS" + +echo "Trying to fetch wheel with predicted URL: $predictedURL" + +$curl $predictedURL --output $out && exit 0 + +echo "Predicted URL '$predictedURL' failed, querying pypi.org" +$curl "https://pypi.org/pypi/$pname/json" | jq -r ".releases.\"$version\"[] | select(.filename == \"$file\") | .url" > url +url=$(cat url) +$curl -k $url --output $out diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix index 12d2bc962065e..ae5867b83372e 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix @@ -2,31 +2,48 @@ , callPackage , makeSetupHook , yj +, wheel +, pip }: let pythonInterpreter = python.pythonForBuild.interpreter; + pythonSitePackages = python.sitePackages; in { - removePathDependenciesHook = callPackage ( - {}: + removePathDependenciesHook = callPackage + ( + {}: makeSetupHook { name = "remove-path-dependencies.sh"; - deps = []; + deps = [ ]; substitutions = { inherit pythonInterpreter; yj = "${yj}/bin/yj"; pyprojectPatchScript = "${./pyproject-without-path.py}"; }; } ./remove-path-dependencies.sh - ) {}; + ) { }; - poetry2nixFixupHook = callPackage ( - {}: + pipBuildHook = callPackage + ( + { pip, wheel }: + makeSetupHook { + name = "pip-build-hook.sh"; + deps = [ pip wheel ]; + substitutions = { + inherit pythonInterpreter pythonSitePackages; + }; + } ./pip-build-hook.sh + ) { }; + + poetry2nixFixupHook = callPackage + ( + {}: makeSetupHook { name = "fixup-hook.sh"; - deps = []; + deps = [ ]; } ./fixup-hook.sh - ) {}; + ) { }; } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh new file mode 100644 index 0000000000000..fa7b698fb5101 --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh @@ -0,0 +1,50 @@ +# Setup hook to use for pip projects +echo "Sourcing pip-build-hook" + +pipBuildPhase() { + echo "Executing pipBuildPhase" + runHook preBuild + + # Prefer using setup.py to avoid build-system dependencies if we have a setup.py + if [ -z "${dontPreferSetupPy-}" ]; then + if test -e setup.py && test -e pyproject.toml; then + echo "Removing pyproject.toml..." + rm -f pyproject.toml + fi + fi + + mkdir -p dist + echo "Creating a wheel..." + @pythonInterpreter@ -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist . + echo "Finished creating a wheel..." + + runHook postBuild + echo "Finished executing pipBuildPhase" +} + +pipShellHook() { + echo "Executing pipShellHook" + runHook preShellHook + + # Long-term setup.py should be dropped. + if [ -e pyproject.toml ]; then + tmp_path=$(mktemp -d) + export PATH="$tmp_path/bin:$PATH" + export PYTHONPATH="$tmp_path/@pythonSitePackages@:$PYTHONPATH" + mkdir -p "$tmp_path/@pythonSitePackages@" + @pythonInterpreter@ -m pip install -e . --prefix "$tmp_path" >&2 + fi + + runHook postShellHook + echo "Finished executing pipShellHook" +} + +if [ -z "${dontUsePipBuild-}" ] && [ -z "${buildPhase-}" ]; then + echo "Using pipBuildPhase" + buildPhase=pipBuildPhase +fi + +if [ -z "${shellHook-}" ]; then + echo "Using pipShellHook" + shellHook=pipShellHook +fi diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py index bb61e4a5cb4be..5d8fbcfe6b4d7 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py @@ -6,7 +6,14 @@ import sys data = json.load(sys.stdin) -for dep in data['tool']['poetry']['dependencies'].values(): + +def get_deep(o, path): + for p in path.split('.'): + o = o.get(p, {}) + return o + + +for dep in get_deep(data, 'tool.poetry.dependencies').values(): if isinstance(dep, dict): try: del dep['path']; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index f4497afb8bc9a..ed47837ee4393 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix @@ -8,6 +8,20 @@ let genList (i: if i == idx then value else (builtins.elemAt list i)) (length list) ); + # Do some canonicalisation of module names + moduleName = name: lib.toLower (lib.replaceStrings [ "_" "." ] [ "-" "-" ] name); + + # Get a full semver pythonVersion from a python derivation + getPythonVersion = python: + let + pyVer = lib.splitVersion python.pythonVersion ++ [ "0" ]; + ver = lib.splitVersion python.version; + major = l: lib.elemAt l 0; + minor = l: lib.elemAt l 1; + joinVersion = v: lib.concatStringsSep "." v; + in + joinVersion ( if major pyVer == major ver && minor pyVer == minor ver then ver else pyVer); + # Compare a semver expression with a version isCompatible = version: let @@ -18,41 +32,41 @@ let }; splitRe = "(" + (builtins.concatStringsSep "|" (builtins.map (x: lib.replaceStrings [ "|" ] [ "\\|" ] x) (lib.attrNames operators))) + ")"; in - expr: + expr: + let + tokens = builtins.filter (x: x != "") (builtins.split splitRe expr); + combine = acc: v: let - tokens = builtins.filter (x: x != "") (builtins.split splitRe expr); - combine = acc: v: - let - isOperator = builtins.typeOf v == "list"; - operator = if isOperator then (builtins.elemAt v 0) else acc.operator; - in - if isOperator then (acc // { inherit operator; }) else { - inherit operator; - state = operators."${operator}" acc.state (satisfiesSemver version v); - }; - initial = { operator = "&&"; state = true; }; + isOperator = builtins.typeOf v == "list"; + operator = if isOperator then (builtins.elemAt v 0) else acc.operator; in - if expr == "" then true else (builtins.foldl' combine initial tokens).state; - + if isOperator then (acc // { inherit operator; }) else { + inherit operator; + state = operators."${operator}" acc.state (satisfiesSemver version v); + }; + initial = { operator = "&&"; state = true; }; + in if expr == "" then true else (builtins.foldl' combine initial tokens).state; fromTOML = builtins.fromTOML or ( - toml: builtins.fromJSON ( - builtins.readFile ( - pkgs.runCommand "from-toml" - { - inherit toml; - allowSubstitutes = false; - preferLocalBuild = true; - } - '' - ${pkgs.remarshal}/bin/remarshal \ - -if toml \ - -i <(echo "$toml") \ - -of json \ - -o $out - '' + toml: builtins.fromJSON + ( + builtins.readFile + ( + pkgs.runCommand "from-toml" + { + inherit toml; + allowSubstitutes = false; + preferLocalBuild = true; + } + '' + ${pkgs.remarshal}/bin/remarshal \ + -if toml \ + -i <(echo "$toml") \ + -of json \ + -o $out + '' + ) ) - ) ); readTOML = path: fromTOML (builtins.readFile path); @@ -63,10 +77,61 @@ let let ml = pkgs.pythonManylinuxPackages; in - if lib.strings.hasInfix "manylinux1" f then { pkg = [ ml.manylinux1 ]; str = "1"; } - else if lib.strings.hasInfix "manylinux2010" f then { pkg = [ ml.manylinux2010 ]; str = "2010"; } - else if lib.strings.hasInfix "manylinux2014" f then { pkg = [ ml.manylinux2014 ]; str = "2014"; } - else { pkg = []; str = null; }; + if lib.strings.hasInfix "manylinux1" f then { pkg = [ ml.manylinux1 ]; str = "1"; } + else if lib.strings.hasInfix "manylinux2010" f then { pkg = [ ml.manylinux2010 ]; str = "2010"; } + else if lib.strings.hasInfix "manylinux2014" f then { pkg = [ ml.manylinux2014 ]; str = "2014"; } + else { pkg = [ ]; str = null; }; + + # Predict URL from the PyPI index. + # Args: + # pname: package name + # file: filename including extension + # hash: SRI hash + # kind: Language implementation and version tag + predictURLFromPypi = lib.makeOverridable + ( + { pname, file, hash, kind }: + "https://files.pythonhosted.org/packages/${kind}/${lib.toLower (builtins.substring 0 1 file)}/${pname}/${file}" + ); + + + # Fetch the wheels from the PyPI index. + # We need to first get the proper URL to the wheel. + # Args: + # pname: package name + # file: filename including extension + # hash: SRI hash + # kind: Language implementation and version tag + fetchWheelFromPypi = lib.makeOverridable + ( + { pname, file, hash, kind, curlOpts ? "" }: + let + version = builtins.elemAt (builtins.split "-" file) 2; + in + (pkgs.stdenvNoCC.mkDerivation { + name = file; + nativeBuildInputs = [ + pkgs.curl + pkgs.jq + ]; + isWheel = true; + system = "builtin"; + + preferLocalBuild = true; + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ + "NIX_CURL_FLAGS" + ]; + + predictedURL = predictURLFromPypi { inherit pname file hash kind; }; + inherit pname file version curlOpts; + + builder = ./fetch-wheel.sh; + + outputHashMode = "flat"; + outputHashAlgo = "sha256"; + outputHash = hash; + }) + ); # Fetch the artifacts from the PyPI index. Since we get all # info we need from the lock file we don't use nixpkgs' fetchPyPi @@ -78,25 +143,27 @@ let # file: filename including extension # hash: SRI hash # kind: Language implementation and version tag https://www.python.org/dev/peps/pep-0427/#file-name-convention - fetchFromPypi = lib.makeOverridable ( - { pname, file, hash, kind }: - pkgs.fetchurl { - url = "https://files.pythonhosted.org/packages/${kind}/${lib.toLower (builtins.substring 0 1 file)}/${pname}/${file}"; - inherit hash; - } - ); - + fetchFromPypi = lib.makeOverridable + ( + { pname, file, hash, kind }: + if lib.strings.hasSuffix "whl" file then fetchWheelFromPypi { inherit pname file hash kind; } + else + pkgs.fetchurl { + url = predictURLFromPypi { inherit pname file hash kind; }; + inherit hash; + } + ); getBuildSystemPkgs = { pythonPackages , pyProject }: - let - buildSystem = lib.getAttrFromPath [ "build-system" "build-backend" ] pyProject; - drvAttr = builtins.elemAt (builtins.split "\\.|:" buildSystem) 0; - in - if buildSystem == "" then [] else ( - [ pythonPackages.${drvAttr} or (throw "unsupported build system ${buildSystem}") ] - ); + let + buildSystem = lib.attrByPath [ "build-system" "build-backend" ] "" pyProject; + drvAttr = moduleName (builtins.elemAt (builtins.split "\\.|:" buildSystem) 0); + in + if buildSystem == "" then [ ] else ( + [ pythonPackages.${drvAttr} or (throw "unsupported build system ${buildSystem}") ] + ); # Find gitignore files recursively in parent directory stopping with .git findGitIgnores = path: @@ -105,9 +172,9 @@ let gitIgnore = path + "/.gitignore"; isGitRoot = builtins.pathExists (path + "/.git"); hasGitIgnore = builtins.pathExists gitIgnore; - gitIgnores = if hasGitIgnore then [ gitIgnore ] else []; + gitIgnores = if hasGitIgnore then [ gitIgnore ] else [ ]; in - lib.optionals (builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores; + lib.optionals (builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores; /* Provides a source filtering mechanism that: @@ -124,22 +191,25 @@ let || (type == "regular" && ! lib.strings.hasSuffix ".pyc" name) ; in - lib.cleanSourceWith { - filter = lib.cleanSourceFilter; - src = lib.cleanSourceWith { - filter = pkgs.nix-gitignore.gitignoreFilterPure pycacheFilter gitIgnores src; - inherit src; - }; + lib.cleanSourceWith { + filter = lib.cleanSourceFilter; + src = lib.cleanSourceWith { + filter = pkgs.nix-gitignore.gitignoreFilterPure pycacheFilter gitIgnores src; + inherit src; }; + }; in { inherit fetchFromPypi + fetchWheelFromPypi getManyLinuxDeps isCompatible readTOML getBuildSystemPkgs satisfiesSemver cleanPythonSources + moduleName + getPythonVersion ; } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 5e71190d28fe8..2467dad31e1af 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -10,74 +10,68 @@ , version , files , source -, dependencies ? {} +, dependencies ? { } , pythonPackages , python-versions , pwd , sourceSpec , supportedExtensions ? lib.importJSON ./extensions.json +, preferWheels ? false , ... }: -pythonPackages.callPackage ( - { preferWheel ? false - , ... - }@args: +pythonPackages.callPackage + ( + { preferWheel ? preferWheels + , ... + }@args: let - inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi; + inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi moduleName; inherit (import ./pep425.nix { inherit lib python; inherit (pkgs) stdenv; }) selectWheel ; - - fileCandidates = let - supportedRegex = ("^.*?(" + builtins.concatStringsSep "|" supportedExtensions + ")"); - matchesVersion = fname: builtins.match ("^.*" + builtins.replaceStrings [ "." ] [ "\\." ] version + ".*$") fname != null; - hasSupportedExtension = fname: builtins.match supportedRegex fname != null; - isCompatibleEgg = fname: ! lib.strings.hasSuffix ".egg" fname || lib.strings.hasSuffix "py${python.pythonVersion}.egg" fname; - in + fileCandidates = + let + supportedRegex = ("^.*?(" + builtins.concatStringsSep "|" supportedExtensions + ")"); + matchesVersion = fname: builtins.match ("^.*" + builtins.replaceStrings [ "." ] [ "\\." ] version + ".*$") fname != null; + hasSupportedExtension = fname: builtins.match supportedRegex fname != null; + isCompatibleEgg = fname: ! lib.strings.hasSuffix ".egg" fname || lib.strings.hasSuffix "py${python.pythonVersion}.egg" fname; + in builtins.filter (f: matchesVersion f.file && hasSupportedExtension f.file && isCompatibleEgg f.file) files; - toPath = s: pwd + "/${s}"; - isSource = source != null; isGit = isSource && source.type == "git"; isLocal = isSource && source.type == "directory"; - localDepPath = toPath source.url; pyProject = poetryLib.readTOML (localDepPath + "/pyproject.toml"); - buildSystemPkgs = poetryLib.getBuildSystemPkgs { inherit pythonPackages pyProject; }; - - fileInfo = let - isBdist = f: lib.strings.hasSuffix "whl" f.file; - isSdist = f: ! isBdist f && ! isEgg f; - isEgg = f: lib.strings.hasSuffix ".egg" f.file; - - binaryDist = selectWheel fileCandidates; - sourceDist = builtins.filter isSdist fileCandidates; - eggs = builtins.filter isEgg fileCandidates; - - entries = (if preferWheel then binaryDist ++ sourceDist else sourceDist ++ binaryDist) ++ eggs; - - lockFileEntry = builtins.head entries; - - _isEgg = isEgg lockFileEntry; - in + fileInfo = + let + isBdist = f: lib.strings.hasSuffix "whl" f.file; + isSdist = f: ! isBdist f && ! isEgg f; + isEgg = f: lib.strings.hasSuffix ".egg" f.file; + binaryDist = selectWheel fileCandidates; + sourceDist = builtins.filter isSdist fileCandidates; + eggs = builtins.filter isEgg fileCandidates; + entries = ( if preferWheel then binaryDist ++ sourceDist else sourceDist ++ binaryDist) ++ eggs; + lockFileEntry = builtins.head entries; + _isEgg = isEgg lockFileEntry; + in rec { inherit (lockFileEntry) file hash; name = file; format = if _isEgg then "egg" else if lib.strings.hasSuffix ".whl" name then "wheel" - else "setuptools"; + else "pyproject"; kind = if _isEgg then python.pythonVersion - else if format == "setuptools" then "source" + else if format == "pyproject" then "source" else (builtins.elemAt (lib.strings.splitString "-" name) 2); }; @@ -88,63 +82,65 @@ pythonPackages.callPackage ( "toml" # Toml is an extra for setuptools-scm ]; baseBuildInputs = lib.optional (! lib.elem name skipSetupToolsSCM) pythonPackages.setuptools-scm; - - format = if isLocal then "pyproject" else if isGit then "setuptools" else fileInfo.format; + format = if isLocal then "pyproject" else if isGit then "pyproject" else fileInfo.format; in - - buildPythonPackage { - pname = name; - version = version; - - inherit format; - - doCheck = false; # We never get development deps - - # Stripping pre-built wheels lead to `ELF load command address/offset not properly aligned` - dontStrip = format == "wheel"; - - nativeBuildInputs = [ - pythonPackages.poetry2nixFixupHook - ] - ++ lib.optional (!isSource && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook - ++ lib.optional (format == "pyproject") pythonPackages.removePathDependenciesHook - ; - - buildInputs = ( - baseBuildInputs - ++ lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg - ++ lib.optional isLocal buildSystemPkgs - ); - - propagatedBuildInputs = let - compat = isCompatible python.pythonVersion; - deps = lib.filterAttrs (n: v: v) ( - lib.mapAttrs ( - n: v: - let - constraints = v.python or ""; - in - compat constraints - ) dependencies - ); + buildPythonPackage { + pname = moduleName name; + version = version; + + inherit format; + + doCheck = false; # We never get development deps + + # Stripping pre-built wheels lead to `ELF load command address/offset not properly aligned` + dontStrip = format == "wheel"; + + nativeBuildInputs = [ + pythonPackages.poetry2nixFixupHook + ] + ++ lib.optional (!isSource && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook + ++ lib.optional (format == "pyproject") pythonPackages.removePathDependenciesHook + ; + + buildInputs = ( + baseBuildInputs + ++ lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg + ++ lib.optional isLocal buildSystemPkgs + ); + + propagatedBuildInputs = + let + compat = isCompatible (poetryLib.getPythonVersion python); + deps = lib.filterAttrs (n: v: v) + ( + lib.mapAttrs + ( + n: v: + let + constraints = v.python or ""; + in + compat constraints + ) dependencies + ); depAttrs = lib.attrNames deps; in - builtins.map (n: pythonPackages.${lib.toLower n}) depAttrs; + builtins.map (n: pythonPackages.${moduleName n}) depAttrs; - meta = { - broken = ! isCompatible python.pythonVersion python-versions; - license = []; - inherit (python.meta) platforms; - }; + meta = { + broken = ! isCompatible (poetryLib.getPythonVersion python) python-versions; + license = [ ]; + inherit (python.meta) platforms; + }; - passthru = { - inherit args; - }; + passthru = { + inherit args; + }; - # We need to retrieve kind from the interpreter and the filename of the package - # Interpreters should declare what wheel types they're compatible with (python type + ABI) - # Here we can then choose a file based on that info. - src = if isGit then ( + # We need to retrieve kind from the interpreter and the filename of the package + # Interpreters should declare what wheel types they're compatible with (python type + ABI) + # Here we can then choose a file based on that info. + src = + if isGit then ( builtins.fetchGit { inherit (source) url; rev = source.reference; @@ -154,6 +150,5 @@ pythonPackages.callPackage ( pname = name; inherit (fileInfo) file hash kind; }; - } - -) {} + } + ) { } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 8301dcd49b835..d18e6b8293f36 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -1,4 +1,4 @@ -{ pkgs ? import <nixpkgs> {} +{ pkgs ? import <nixpkgs> { } , lib ? pkgs.lib , stdenv ? pkgs.stdenv }: @@ -6,202 +6,256 @@ self: super: { - astroid = super.astroid.overridePythonAttrs ( - old: rec { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - doCheck = false; - } - ); + astroid = super.astroid.overridePythonAttrs + ( + old: rec { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); - av = super.av.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig - ]; - buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; - } - ); + av = super.av.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.pkgconfig + ]; + buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; + } + ); - bcrypt = super.bcrypt.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ pkgs.libffi ]; - } - ); + bcrypt = super.bcrypt.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ pkgs.libffi ]; + } + ); cffi = # cffi is bundled with pypy if self.python.implementation == "pypy" then null else ( - super.cffi.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ pkgs.libffi ]; - } - ) + super.cffi.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ pkgs.libffi ]; + } + ) ); - cftime = super.cftime.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ - self.cython - ]; - } - ); + cftime = super.cftime.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + self.cython + ]; + } + ); - cryptography = super.cryptography.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ pkgs.openssl ]; - } - ); + configparser = super.configparser.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + self.toml + ]; - django = ( - super.django.overridePythonAttrs ( + postPatch = '' + substituteInPlace setup.py --replace 'setuptools.setup()' 'setuptools.setup(version="${old.version}")' + ''; + } + ); + + cryptography = super.cryptography.overridePythonAttrs + ( old: { - propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or []) - ++ [ pkgs.gettext ]; + buildInputs = old.buildInputs ++ [ pkgs.openssl ]; } - ) - ); + ); - django-bakery = super.django-bakery.overridePythonAttrs ( - old: { - configurePhase = '' - if ! test -e LICENSE; then - touch LICENSE - fi - '' + (old.configurePhase or ""); - } + django = ( + super.django.overridePythonAttrs + ( + old: { + propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or [ ]) + ++ [ pkgs.gettext ]; + } + ) ); - dlib = super.dlib.overridePythonAttrs ( - old: { - # Parallel building enabled - inherit (pkgs.python.pkgs.dlib) patches; + django-bakery = super.django-bakery.overridePythonAttrs + ( + old: { + configurePhase = '' + if ! test -e LICENSE; then + touch LICENSE + fi + '' + (old.configurePhase or ""); + } + ); + + dlib = super.dlib.overridePythonAttrs + ( + old: { + # Parallel building enabled + inherit (pkgs.python.pkgs.dlib) patches; - enableParallelBuilding = true; - dontUseCmakeConfigure = true; + enableParallelBuilding = true; + dontUseCmakeConfigure = true; - nativeBuildInputs = old.nativeBuildInputs ++ pkgs.dlib.nativeBuildInputs; - buildInputs = old.buildInputs ++ pkgs.dlib.buildInputs; - } - ); + nativeBuildInputs = old.nativeBuildInputs ++ pkgs.dlib.nativeBuildInputs; + buildInputs = old.buildInputs ++ pkgs.dlib.buildInputs; + } + ); # Environment markers are not always included (depending on how a dep was defined) enum34 = if self.pythonAtLeast "3.4" then null else super.enum34; - faker = super.faker.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - doCheck = false; - } - ); + faker = super.faker.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); - fancycompleter = super.fancycompleter.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace setup.py \ - --replace 'setup_requires="setupmeta"' 'setup_requires=[]' \ - --replace 'versioning="devcommit"' 'version="${old.version}"' - ''; - } - ); + fancycompleter = super.fancycompleter.overridePythonAttrs + ( + old: { + postPatch = '' + substituteInPlace setup.py \ + --replace 'setup_requires="setupmeta"' 'setup_requires=[]' \ + --replace 'versioning="devcommit"' 'version="${old.version}"' + ''; + } + ); - fastparquet = super.fastparquet.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - } - ); + fastparquet = super.fastparquet.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + } + ); - grandalf = super.grandalf.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - doCheck = false; - } - ); + grandalf = super.grandalf.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); - h5py = super.h5py.overridePythonAttrs ( - old: rec { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; - configure_flags = "--hdf5=${pkgs.hdf5}"; - postConfigure = '' - ${self.python.executable} setup.py configure ${configure_flags} - ''; - } - ); + h5py = super.h5py.overridePythonAttrs + ( + old: + if old.format != "wheel" then rec { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; + configure_flags = "--hdf5=${pkgs.hdf5}"; + postConfigure = '' + ${self.python.executable} setup.py configure ${configure_flags} + ''; + } else old + ); - horovod = super.horovod.overridePythonAttrs ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ]; - } - ); + horovod = super.horovod.overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ]; + } + ); # importlib-metadata has an incomplete dependency specification - importlib-metadata = super.importlib-metadata.overridePythonAttrs ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2; - } - ); + importlib-metadata = super.importlib-metadata.overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2; + } + ); - jupyter = super.jupyter.overridePythonAttrs ( - old: rec { - # jupyter is a meta-package. Everything relevant comes from the - # dependencies. It does however have a jupyter.py file that conflicts - # with jupyter-core so this meta solves this conflict. - meta.priority = 100; - } - ); + isort = super.isort.overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; + } + ); - lap = super.lap.overridePythonAttrs ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - self.numpy - ]; - } - ); + jupyter = super.jupyter.overridePythonAttrs + ( + old: rec { + # jupyter is a meta-package. Everything relevant comes from the + # dependencies. It does however have a jupyter.py file that conflicts + # with jupyter-core so this meta solves this conflict. + meta.priority = 100; + } + ); - llvmlite = super.llvmlite.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ]; + kiwisolver = super.kiwisolver.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + # cppy is at the time of writing not in nixpkgs + (self.cppy or null) + ]; + } + ); - # Disable static linking - # https://github.com/numba/llvmlite/issues/93 - postPatch = '' - substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" + lap = super.lap.overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.numpy + ]; + } + ); - substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" - ''; + llvmlite = super.llvmlite.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ]; - # Set directory containing llvm-config binary - preConfigure = '' - export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config - ''; + # Disable static linking + # https://github.com/numba/llvmlite/issues/93 + postPatch = '' + substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" - __impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; + substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" + ''; - passthru = old.passthru // { llvm = pkgs.llvm; }; - } - ); + # Set directory containing llvm-config binary + preConfigure = '' + export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config + ''; - lockfile = super.lockfile.overridePythonAttrs ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pbr ]; - } - ); + __impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; - lxml = super.lxml.overridePythonAttrs ( - old: { - nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ]; - buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; - } - ); + passthru = old.passthru // { llvm = pkgs.llvm; }; + } + ); - markupsafe = super.markupsafe.overridePythonAttrs ( - old: { - src = old.src.override { pname = builtins.replaceStrings [ "markupsafe" ] [ "MarkupSafe" ] old.pname; }; - } - ); + lockfile = super.lockfile.overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pbr ]; + } + ); + + lxml = super.lxml.overridePythonAttrs + ( + old: { + nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ]; + buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; + } + ); + + markupsafe = super.markupsafe.overridePythonAttrs + ( + old: { + src = old.src.override { pname = builtins.replaceStrings [ "markupsafe" ] [ "MarkupSafe" ] old.pname; }; + } + ); - matplotlib = super.matplotlib.overridePythonAttrs ( - old: + matplotlib = super.matplotlib.overridePythonAttrs + ( + old: let enableGhostscript = old.passthru.enableGhostscript or false; enableGtk3 = old.passthru.enableTk or false; @@ -210,76 +264,79 @@ self: super: inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; in - { - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; + { + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; - XDG_RUNTIME_DIR = "/tmp"; + XDG_RUNTIME_DIR = "/tmp"; - buildInputs = old.buildInputs + buildInputs = old.buildInputs ++ lib.optional enableGhostscript pkgs.ghostscript ++ lib.optional stdenv.isDarwin [ Cocoa ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig - ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.pkgconfig + ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - pkgs.libpng - pkgs.freetype - ] + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + pkgs.libpng + pkgs.freetype + ] ++ stdenv.lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ] ++ stdenv.lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ] ++ stdenv.lib.optionals enableQt [ self.pyqt5 ] - ; + ; - inherit (super.matplotlib) patches; - } - ); + inherit (super.matplotlib) patches; + } + ); # Calls Cargo at build time for source builds and is really tricky to package maturin = super.maturin.override { preferWheel = true; }; - mccabe = super.mccabe.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - doCheck = false; - } - ); + mccabe = super.mccabe.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); - netcdf4 = super.netcdf4.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ - self.cython - ]; - - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - pkgs.zlib - pkgs.netcdf - pkgs.hdf5 - pkgs.curl - pkgs.libjpeg - ]; - - # Variables used to configure the build process - USE_NCCONFIG = "0"; - HDF5_DIR = lib.getDev pkgs.hdf5; - NETCDF4_DIR = pkgs.netcdf; - CURL_DIR = pkgs.curl.dev; - JPEG_DIR = pkgs.libjpeg.dev; - } - ); + netcdf4 = super.netcdf4.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + self.cython + ]; - numpy = super.numpy.overridePythonAttrs ( - old: + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + pkgs.zlib + pkgs.netcdf + pkgs.hdf5 + pkgs.curl + pkgs.libjpeg + ]; + + # Variables used to configure the build process + USE_NCCONFIG = "0"; + HDF5_DIR = lib.getDev pkgs.hdf5; + NETCDF4_DIR = pkgs.netcdf; + CURL_DIR = pkgs.curl.dev; + JPEG_DIR = pkgs.libjpeg.dev; + } + ); + + numpy = super.numpy.overridePythonAttrs + ( + old: let blas = old.passthru.args.blas or pkgs.openblasCompat; blasImplementation = lib.nameFromURL blas.name "-"; cfg = pkgs.writeTextFile { name = "site.cfg"; text = ( - lib.generators.toINI {} { + lib.generators.toINI { } { ${blasImplementation} = { include_dirs = "${blas}/include"; library_dirs = "${blas}/lib"; @@ -291,408 +348,499 @@ self: super: ); }; in - { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; - buildInputs = old.buildInputs ++ [ blas self.cython ]; - enableParallelBuilding = true; - preBuild = '' - ln -s ${cfg} site.cfg - ''; - passthru = old.passthru // { - blas = blas; - inherit blasImplementation cfg; - }; - } - ); + { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; + buildInputs = old.buildInputs ++ [ blas self.cython ]; + enableParallelBuilding = true; + preBuild = '' + ln -s ${cfg} site.cfg + ''; + passthru = old.passthru // { + blas = blas; + inherit blasImplementation cfg; + }; + } + ); - openexr = super.openexr.overridePythonAttrs ( - old: rec { - buildInputs = old.buildInputs ++ [ pkgs.openexr pkgs.ilmbase ]; - NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ]; - } - ); + openexr = super.openexr.overridePythonAttrs + ( + old: rec { + buildInputs = old.buildInputs ++ [ pkgs.openexr pkgs.ilmbase ]; + NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ]; + } + ); - peewee = super.peewee.overridePythonAttrs ( - old: + peewee = super.peewee.overridePythonAttrs + ( + old: let withPostgres = old.passthru.withPostgres or false; withMysql = old.passthru.withMysql or false; in - { - buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ]; - propagatedBuildInputs = old.propagatedBuildInputs + { + buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ]; + propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional withPostgres self.psycopg2 ++ lib.optional withMysql self.mysql-connector; - } - ); + } + ); - pillow = super.pillow.overridePythonAttrs ( - old: { - nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs; - buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; - } - ); + pillow = super.pillow.overridePythonAttrs + ( + old: { + nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs; + buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; + } + ); - psycopg2 = super.psycopg2.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; - } - ); + psycopg2 = super.psycopg2.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; + } + ); - psycopg2-binary = super.psycopg2-binary.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; - } - ); + psycopg2-binary = super.psycopg2-binary.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; + } + ); - pyarrow = super.pyarrow.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ - self.cython - ]; - } - ); + pyarrow = + if lib.versionAtLeast super.pyarrow.version "0.16.0" then super.pyarrow.overridePythonAttrs + ( + old: + let + parseMinor = drv: lib.concatStringsSep "." (lib.take 2 (lib.splitVersion drv.version)); + _arrow-cpp = pkgs.arrow-cpp.override { inherit (self) python; }; + ARROW_HOME = _arrow-cpp; + arrowCppVersion = parseMinor pkgs.arrow-cpp; + pyArrowVersion = parseMinor super.pyarrow; + errorMessage = "arrow-cpp version (${arrowCppVersion}) mismatches pyarrow version (${pyArrowVersion})"; + in + if arrowCppVersion != pyArrowVersion then throw errorMessage else { - pycairo = ( - drv: ( - drv.overridePythonAttrs ( - _: { - format = "other"; - } - ) - ).overridePythonAttrs ( - old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + self.cython + pkgs.pkgconfig + pkgs.cmake + ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.meson - pkgs.ninja - pkgs.pkgconfig - ]; + preBuild = '' + export PYARROW_PARALLEL=$NIX_BUILD_CORES + ''; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - pkgs.cairo - pkgs.xlibsWrapper - ]; + PARQUET_HOME = _arrow-cpp; + inherit ARROW_HOME; - mesonFlags = [ "-Dpython=${if self.isPy3k then "python3" else "python"}" ]; - } - ) - ) super.pycairo; + buildInputs = old.buildInputs ++ [ + pkgs.arrow-cpp + ]; - pycocotools = super.pycocotools.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ - self.cython - self.numpy - ]; - } - ); + PYARROW_BUILD_TYPE = "release"; + PYARROW_WITH_PARQUET = true; + PYARROW_CMAKE_OPTIONS = [ + "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" - pygobject = super.pygobject.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; - } - ); + # This doesn't use setup hook to call cmake so we need to workaround #54606 + # ourselves + "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" + ]; - pylint = super.pylint.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - doCheck = false; - } - ); + dontUseCmakeConfigure = true; + } + ) else super.pyarrow.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + self.cython + ]; + } + ); - pyopenssl = super.pyopenssl.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ pkgs.openssl ]; - } - ); + pycairo = + ( + drv: ( + drv.overridePythonAttrs + ( + _: { + format = "other"; + } + ) + ).overridePythonAttrs + ( + old: { - pyqt5 = let - drv = super.pyqt5; - withConnectivity = drv.passthru.args.withConnectivity or false; - withMultimedia = drv.passthru.args.withMultimedia or false; - withWebKit = drv.passthru.args.withWebKit or false; - withWebSockets = drv.passthru.args.withWebSockets or false; - in - super.pyqt5.overridePythonAttrs ( - old: { - format = "other"; + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.meson + pkgs.ninja + pkgs.pkgconfig + ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig - pkgs.qt5.qmake - pkgs.xorg.lndir - pkgs.qt5.qtbase - pkgs.qt5.qtsvg - pkgs.qt5.qtdeclarative - pkgs.qt5.qtwebchannel - # self.pyqt5-sip - self.sip - ] - ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity - ++ lib.optional withMultimedia pkgs.qt5.qtmultimedia - ++ lib.optional withWebKit pkgs.qt5.qtwebkit - ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets - ; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + pkgs.cairo + pkgs.xlibsWrapper + ]; - buildInputs = old.buildInputs ++ [ - pkgs.dbus - pkgs.qt5.qtbase - pkgs.qt5.qtsvg - pkgs.qt5.qtdeclarative - self.sip - ] - ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity - ++ lib.optional withWebKit pkgs.qt5.qtwebkit - ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets - ; + mesonFlags = [ "-Dpython=${ if self.isPy3k then "python3" else "python"}" ]; + } + ) + ) super.pycairo; - # Fix dbus mainloop - patches = pkgs.python3.pkgs.pyqt5.patches or []; + pycocotools = super.pycocotools.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + self.cython + self.numpy + ]; + } + ); - configurePhase = '' - runHook preConfigure + pygobject = super.pygobject.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; + } + ); - export PYTHONPATH=$PYTHONPATH:$out/${self.python.sitePackages} + pylint = super.pylint.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); - mkdir -p $out/${self.python.sitePackages}/dbus/mainloop - ${self.python.executable} configure.py -w \ - --confirm-license \ - --no-qml-plugin \ - --bindir=$out/bin \ - --destdir=$out/${self.python.sitePackages} \ - --stubsdir=$out/${self.python.sitePackages}/PyQt5 \ - --sipdir=$out/share/sip/PyQt5 \ - --designer-plugindir=$out/plugins/designer + pyopenssl = super.pyopenssl.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ pkgs.openssl ]; + } + ); - runHook postConfigure - ''; + pyqt5 = + let + drv = super.pyqt5; + withConnectivity = drv.passthru.args.withConnectivity or false; + withMultimedia = drv.passthru.args.withMultimedia or false; + withWebKit = drv.passthru.args.withWebKit or false; + withWebSockets = drv.passthru.args.withWebSockets or false; + in + super.pyqt5.overridePythonAttrs + ( + old: { + format = "other"; - postInstall = '' - ln -s ${self.pyqt5-sip}/${self.python.sitePackages}/PyQt5/sip.* $out/${self.python.sitePackages}/PyQt5/ - for i in $out/bin/*; do - wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" - done - - # Let's make it a namespace package - cat << EOF > $out/${self.python.sitePackages}/PyQt5/__init__.py - from pkgutil import extend_path - __path__ = extend_path(__path__, __name__) - EOF - ''; + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.pkgconfig + pkgs.qt5.qmake + pkgs.xorg.lndir + pkgs.qt5.qtbase + pkgs.qt5.qtsvg + pkgs.qt5.qtdeclarative + pkgs.qt5.qtwebchannel + # self.pyqt5-sip + self.sip + ] + ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity + ++ lib.optional withMultimedia pkgs.qt5.qtmultimedia + ++ lib.optional withWebKit pkgs.qt5.qtwebkit + ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets + ; - installCheckPhase = let - modules = [ - "PyQt5" - "PyQt5.QtCore" - "PyQt5.QtQml" - "PyQt5.QtWidgets" - "PyQt5.QtGui" + buildInputs = old.buildInputs ++ [ + pkgs.dbus + pkgs.qt5.qtbase + pkgs.qt5.qtsvg + pkgs.qt5.qtdeclarative + self.sip ] - ++ lib.optional withWebSockets "PyQt5.QtWebSockets" - ++ lib.optional withWebKit "PyQt5.QtWebKit" - ++ lib.optional withMultimedia "PyQt5.QtMultimedia" - ++ lib.optional withConnectivity "PyQt5.QtConnectivity" + ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity + ++ lib.optional withWebKit pkgs.qt5.qtwebkit + ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets ; - imports = lib.concatMapStrings (module: "import ${module};") modules; - in - '' - echo "Checking whether modules can be imported..." - ${self.python.interpreter} -c "${imports}" + # Fix dbus mainloop + patches = pkgs.python3.pkgs.pyqt5.patches or [ ]; + + configurePhase = '' + runHook preConfigure + + export PYTHONPATH=$PYTHONPATH:$out/${self.python.sitePackages} + + mkdir -p $out/${self.python.sitePackages}/dbus/mainloop + ${self.python.executable} configure.py -w \ + --confirm-license \ + --no-qml-plugin \ + --bindir=$out/bin \ + --destdir=$out/${self.python.sitePackages} \ + --stubsdir=$out/${self.python.sitePackages}/PyQt5 \ + --sipdir=$out/share/sip/PyQt5 \ + --designer-plugindir=$out/plugins/designer + + runHook postConfigure ''; - doCheck = true; + postInstall = '' + ln -s ${self.pyqt5-sip}/${self.python.sitePackages}/PyQt5/sip.* $out/${self.python.sitePackages}/PyQt5/ + for i in $out/bin/*; do + wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" + done + + # Let's make it a namespace package + cat << EOF > $out/${self.python.sitePackages}/PyQt5/__init__.py + from pkgutil import extend_path + __path__ = extend_path(__path__, __name__) + EOF + ''; - enableParallelBuilding = true; + installCheckPhase = + let + modules = [ + "PyQt5" + "PyQt5.QtCore" + "PyQt5.QtQml" + "PyQt5.QtWidgets" + "PyQt5.QtGui" + ] + ++ lib.optional withWebSockets "PyQt5.QtWebSockets" + ++ lib.optional withWebKit "PyQt5.QtWebKit" + ++ lib.optional withMultimedia "PyQt5.QtMultimedia" + ++ lib.optional withConnectivity "PyQt5.QtConnectivity" + ; + imports = lib.concatMapStrings (module: "import ${module};") modules; + in + '' + echo "Checking whether modules can be imported..." + ${self.python.interpreter} -c "${imports}" + ''; + + doCheck = true; + + enableParallelBuilding = true; + } + ); + + pytest-datadir = super.pytest-datadir.overridePythonAttrs + ( + old: { + postInstall = '' + rm -f $out/LICENSE + ''; } ); - pytest-datadir = super.pytest-datadir.overridePythonAttrs ( - old: { - postInstall = '' - rm -f $out/LICENSE - ''; - } - ); - - pytest = super.pytest.overridePythonAttrs ( - old: { - doCheck = false; - } - ); + pytest = super.pytest.overridePythonAttrs + ( + old: { + doCheck = false; + } + ); pytest-runner = super.pytest-runner or super.pytestrunner; - python-prctl = super.python-prctl.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ - pkgs.libcap - ]; - } - ); + python-jose = super.python-jose.overridePythonAttrs + ( + old: { + postPath = '' + substituteInPlace setup.py --replace "'pytest-runner'," "" + substituteInPlace setup.py --replace "'pytest-runner'" "" + ''; + } + ); - pyzmq = super.pyzmq.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; - } - ); + python-prctl = super.python-prctl.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + pkgs.libcap + ]; + } + ); - rockset = super.rockset.overridePythonAttrs ( - old: rec { - postPatch = '' - cp ./setup_rockset.py ./setup.py - ''; - } - ); + pyzmq = super.pyzmq.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; + } + ); - scaleapi = super.scaleapi.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace setup.py --replace "install_requires = ['requests>=2.4.2', 'enum34']" "install_requires = ['requests>=2.4.2']" || true - ''; - } - ); + rockset = super.rockset.overridePythonAttrs + ( + old: rec { + postPatch = '' + cp ./setup_rockset.py ./setup.py + ''; + } + ); - pandas = super.pandas.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ]; - } - ); + scaleapi = super.scaleapi.overridePythonAttrs + ( + old: { + postPatch = '' + substituteInPlace setup.py --replace "install_requires = ['requests>=2.4.2', 'enum34']" "install_requires = ['requests>=2.4.2']" || true + ''; + } + ); + + pandas = super.pandas.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ]; + } + ); # Pybind11 is an undeclared dependency of scipy that we need to pick from nixpkgs # Make it not fail with infinite recursion - pybind11 = super.pybind11.overridePythonAttrs ( - old: { - cmakeFlags = (old.cmakeFlags or []) ++ [ - "-DPYBIND11_TEST=off" - ]; - doCheck = false; # Circular test dependency - } - ); - - scipy = super.scipy.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ]; - setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; - enableParallelBuilding = true; - buildInputs = old.buildInputs ++ [ self.numpy.blas ]; - preConfigure = '' - sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py - export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES - ''; - preBuild = '' - ln -s ${self.numpy.cfg} site.cfg - ''; - } - ); + pybind11 = super.pybind11.overridePythonAttrs + ( + old: { + cmakeFlags = (old.cmakeFlags or [ ]) ++ [ + "-DPYBIND11_TEST=off" + ]; + doCheck = false; # Circular test dependency + } + ); - scikit-learn = super.scikit-learn.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ - pkgs.gfortran - pkgs.glibcLocales - ] ++ lib.optionals stdenv.cc.isClang [ - pkgs.llvmPackages.openmp - ]; + scipy = super.scipy.overridePythonAttrs + ( + old: + if old.format != "wheel" then { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ]; + setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; + enableParallelBuilding = true; + buildInputs = old.buildInputs ++ [ self.numpy.blas ]; + preConfigure = '' + sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py + export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES + ''; + preBuild = '' + ln -s ${self.numpy.cfg} site.cfg + ''; + } else old + ); - nativeBuildInputs = old.nativeBuildInputs ++ [ - self.cython - ]; + scikit-learn = super.scikit-learn.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + pkgs.gfortran + pkgs.glibcLocales + ] ++ lib.optionals stdenv.cc.isClang [ + pkgs.llvmPackages.openmp + ]; - enableParallelBuilding = true; - } - ); + nativeBuildInputs = old.nativeBuildInputs ++ [ + self.cython + ]; - shapely = super.shapely.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ]; - inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH; - } - ); + enableParallelBuilding = true; + } + ); - shellingham = if lib.versionAtLeast super.shellingham.version "1.3.2" then ( - super.shellingham.overridePythonAttrs ( + shapely = super.shapely.overridePythonAttrs + ( old: { - format = "pyproject"; + buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ]; + inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH; } - ) - ) else super.shellingham; + ); - tables = super.tables.overridePythonAttrs ( - old: { - HDF5_DIR = "${pkgs.hdf5}"; - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ]; - } - ); + shellingham = + if lib.versionAtLeast super.shellingham.version "1.3.2" then ( + super.shellingham.overridePythonAttrs + ( + old: { + format = "pyproject"; + } + ) + ) else super.shellingham; - tensorpack = super.tensorpack.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace setup.cfg --replace "# will call find_packages()" "" - ''; - } - ); + tables = super.tables.overridePythonAttrs + ( + old: { + HDF5_DIR = "${pkgs.hdf5}"; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ]; + } + ); - urwidtrees = super.urwidtrees.overridePythonAttrs ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - self.urwid - ]; - } - ); + tensorpack = super.tensorpack.overridePythonAttrs + ( + old: { + postPatch = '' + substituteInPlace setup.cfg --replace "# will call find_packages()" "" + ''; + } + ); - vose-alias-method = super.vose-alias-method.overridePythonAttrs ( - old: { - postInstall = '' - rm -f $out/LICENSE - ''; - } - ); + urwidtrees = super.urwidtrees.overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.urwid + ]; + } + ); - uvloop = super.uvloop.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [ - pkgs.darwin.apple_sdk.frameworks.ApplicationServices - pkgs.darwin.apple_sdk.frameworks.CoreServices - ]; - } - ); + vose-alias-method = super.vose-alias-method.overridePythonAttrs + ( + old: { + postInstall = '' + rm -f $out/LICENSE + ''; + } + ); + + uvloop = super.uvloop.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [ + pkgs.darwin.apple_sdk.frameworks.ApplicationServices + pkgs.darwin.apple_sdk.frameworks.CoreServices + ]; + } + ); # Stop infinite recursion by using bootstrapped pkg from nixpkgs wheel = ( pkgs.python3.pkgs.override { python = self.python; } - ).wheel.overridePythonAttrs ( - _: { - inherit (super.wheel) pname name version src; - } - ); + ).wheel.overridePythonAttrs + ( + old: + if old.format == "other" then old else { + inherit (super.wheel) pname name version src; + } + ); zipp = ( if lib.versionAtLeast super.zipp.version "2.0.0" then ( - super.zipp.overridePythonAttrs ( - old: { - prePatch = '' - substituteInPlace setup.py --replace \ - 'setuptools.setup()' \ - 'setuptools.setup(version="${super.zipp.version}")' - ''; - } - ) + super.zipp.overridePythonAttrs + ( + old: { + prePatch = '' + substituteInPlace setup.py --replace \ + 'setuptools.setup()' \ + 'setuptools.setup(version="${super.zipp.version}")' + ''; + } + ) ) else super.zipp - ).overridePythonAttrs ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - self.toml - ]; - } - ); + ).overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.toml + ]; + } + ); } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix index cda4e8c78d4d5..496c4ff158187 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix @@ -12,8 +12,7 @@ let major = builtins.elemAt ver 0; minor = builtins.elemAt ver 1; in - "cp${major}${minor}"; - + "cp${major}${minor}"; abiTag = "${pythonTag}m"; # @@ -24,13 +23,13 @@ let entries = splitString "-" str; p = removeSuffix ".whl" (builtins.elemAt entries 4); in - { - pkgName = builtins.elemAt entries 0; - pkgVer = builtins.elemAt entries 1; - pyVer = builtins.elemAt entries 2; - abi = builtins.elemAt entries 3; - platform = p; - }; + { + pkgName = builtins.elemAt entries 0; + pkgVer = builtins.elemAt entries 1; + pyVer = builtins.elemAt entries 2; + abi = builtins.elemAt entries 3; + platform = p; + }; # # Builds list of acceptable osx wheel files @@ -42,9 +41,9 @@ let v = lib.lists.head versions; vs = lib.lists.tail versions; in - if (builtins.length versions == 0) - then [] - else (builtins.filter (x: hasInfix v x.file) candidates) ++ (findBestMatches vs candidates); + if (builtins.length versions == 0) + then [ ] + else (builtins.filter (x: hasInfix v x.file) candidates) ++ (findBestMatches vs candidates); # pyver = "cpXX" # x = "cpXX" | "py2" | "py3" | "py2.py3" @@ -53,7 +52,7 @@ let normalize = y: ''cp${lib.strings.removePrefix "cp" (lib.strings.removePrefix "py" y)}''; isCompat = p: x: lib.strings.hasPrefix (normalize x) p; in - lib.lists.any (isCompat pyver) (lib.strings.splitString "." x); + lib.lists.any (isCompat pyver) (lib.strings.splitString "." x); # # Selects the best matching wheel file from a list of files @@ -61,42 +60,37 @@ let selectWheel = files: let filesWithoutSources = (builtins.filter (x: hasSuffix ".whl" x.file) files); - isPyAbiCompatible = pyabi: x: x == "none" || pyabi == x; - withPython = ver: abi: x: (isPyVersionCompatible ver x.pyVer) && (isPyAbiCompatible abi x.abi); - - withPlatform = if isLinux - then ( - x: x.platform == "manylinux1_${stdenv.platform.kernelArch}" - || x.platform == "manylinux2010_${stdenv.platform.kernelArch}" - || x.platform == "manylinux2014_${stdenv.platform.kernelArch}" - || x.platform == "any" - ) - else (x: hasInfix "macosx" x.platform || x.platform == "any"); - + withPlatform = + if isLinux + then ( + x: x.platform == "manylinux1_${stdenv.platform.kernelArch}" + || x.platform == "manylinux2010_${stdenv.platform.kernelArch}" + || x.platform == "manylinux2014_${stdenv.platform.kernelArch}" + || x.platform == "any" + ) + else (x: hasInfix "macosx" x.platform || x.platform == "any"); filterWheel = x: let f = toWheelAttrs x.file; in - (withPython pythonTag abiTag f) && (withPlatform f); - + (withPython pythonTag abiTag f) && (withPlatform f); filtered = builtins.filter filterWheel filesWithoutSources; - choose = files: let osxMatches = [ "10_12" "10_11" "10_10" "10_9" "any" ]; linuxMatches = [ "manylinux1_" "manylinux2010_" "manylinux2014_" "any" ]; - chooseLinux = x: lib.singleton (builtins.head (findBestMatches linuxMatches x)); - chooseOSX = x: lib.singleton (builtins.head (findBestMatches osxMatches x)); + chooseLinux = x: lib.take 1 (findBestMatches linuxMatches x); + chooseOSX = x: lib.take 1 (findBestMatches osxMatches x); in - if isLinux - then chooseLinux files - else chooseOSX files; + if isLinux + then chooseLinux files + else chooseOSX files; in - if (builtins.length filtered == 0) - then [] - else choose (filtered); + if (builtins.length filtered == 0) + then [ ] + else choose (filtered); in { inherit selectWheel toWheelAttrs isPyVersionCompatible; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix index 67ffdddb4bd86..773e0a60e0934 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix @@ -7,7 +7,6 @@ let # Strip leading/trailing whitespace from string stripStr = s: lib.elemAt (builtins.split "^ *" (lib.elemAt (builtins.split " *$" s) 0)) 2; - findSubExpressionsFun = acc: c: ( if c == "(" then ( let @@ -15,23 +14,23 @@ let isOpen = acc.openP == 0; startPos = if isOpen then posNew else acc.startPos; in - acc // { - inherit startPos; - exprs = acc.exprs ++ [ (substr acc.exprPos (acc.pos - 1) acc.expr) ]; - pos = posNew; - openP = acc.openP + 1; - } + acc // { + inherit startPos; + exprs = acc.exprs ++ [ (substr acc.exprPos (acc.pos - 1) acc.expr) ]; + pos = posNew; + openP = acc.openP + 1; + } ) else if c == ")" then ( let openP = acc.openP - 1; exprs = findSubExpressions (substr acc.startPos acc.pos acc.expr); in - acc // { - inherit openP; - pos = acc.pos + 1; - exprs = if openP == 0 then acc.exprs ++ [ exprs ] else acc.exprs; - exprPos = if openP == 0 then acc.pos + 1 else acc.exprPos; - } + acc // { + inherit openP; + pos = acc.pos + 1; + exprs = if openP == 0 then acc.exprs ++ [ exprs ] else acc.exprs; + exprPos = if openP == 0 then acc.pos + 1 else acc.exprPos; + } ) else acc // { pos = acc.pos + 1; } ); @@ -39,7 +38,7 @@ let findSubExpressions = expr: let acc = builtins.foldl' findSubExpressionsFun { - exprs = []; + exprs = [ ]; expr = expr; pos = 0; openP = 0; @@ -47,18 +46,16 @@ let startPos = 0; } (lib.stringToCharacters expr); tailExpr = (substr acc.exprPos acc.pos expr); - tailExprs = if tailExpr != "" then [ tailExpr ] else []; + tailExprs = if tailExpr != "" then [ tailExpr ] else [ ]; in - acc.exprs ++ tailExprs; - + acc.exprs ++ tailExprs; parseExpressions = exprs: let splitCond = ( s: builtins.map - (x: stripStr (if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x)) + (x: stripStr ( if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x)) (builtins.split " (and|or) " (s + " ")) ); - mapfn = expr: ( if (builtins.match "^ ?$" expr != null) then null # Filter empty else if (builtins.elem expr [ "and" "or" ]) then { @@ -70,14 +67,12 @@ let value = expr; } ); - parse = expr: builtins.filter (x: x != null) (builtins.map mapfn (splitCond expr)); in - builtins.foldl' ( - acc: v: acc ++ ( - if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ] - ) - ) [] exprs; + builtins.foldl' + ( + acc: v: acc ++ ( if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ]) + ) [ ] exprs; # Transform individual expressions to structured expressions # This function also performs variable substitution, replacing environment markers with their explicit values @@ -94,9 +89,10 @@ let else throw "Unsupported platform" ); platform_machine = stdenv.platform.kernelArch; - platform_python_implementation = let - impl = python.passthru.implementation; - in + platform_python_implementation = + let + impl = python.passthru.implementation; + in ( if impl == "cpython" then "CPython" else if impl == "pypy" then "PyPy" @@ -115,34 +111,32 @@ let implementation_version = python.version; extra = ""; }; - substituteVar = value: if builtins.hasAttr value variables then (builtins.toJSON variables."${value}") else value; - processVar = value: builtins.foldl' (acc: v: v acc) value [ stripStr substituteVar ]; in - if builtins.typeOf exprs == "set" then ( - if exprs.type == "expr" then ( - let - mVal = ''[a-zA-Z0-9\'"_\. ]+''; - mOp = "in|[!=<>]+"; - e = stripStr exprs.value; - m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e); - in - { - type = "expr"; - value = { - op = builtins.elemAt m 1; - values = [ - (processVar (builtins.elemAt m 0)) - (processVar (builtins.elemAt m 2)) - ]; - }; - } - ) else exprs - ) else builtins.map transformExpressions exprs; + if builtins.typeOf exprs == "set" then ( + if exprs.type == "expr" then ( + let + mVal = ''[a-zA-Z0-9\'"_\. ]+''; + mOp = "in|[!=<>]+"; + e = stripStr exprs.value; + m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e); + in + { + type = "expr"; + value = { + op = builtins.elemAt m 1; + values = [ + (processVar (builtins.elemAt m 0)) + (processVar (builtins.elemAt m 2)) + ]; + }; + } + ) else exprs + ) else builtins.map transformExpressions exprs; # Recursively eval all expressions evalExpressions = exprs: @@ -165,32 +159,33 @@ let let parts = builtins.splitVersion c; pruned = lib.take ((builtins.length parts) - 1) parts; - upper = builtins.toString ( - (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 - ); + upper = builtins.toString + ( + (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 + ); upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned); in - op.">=" v c && op."<" v upperConstraint; + op.">=" v c && op."<" v upperConstraint; "===" = x: y: x == y; "in" = x: y: let values = builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " (unmarshal y)); in - builtins.elem (unmarshal x) values; + builtins.elem (unmarshal x) values; }; in - if builtins.typeOf exprs == "set" then ( - if exprs.type == "expr" then ( - let - expr = exprs; - result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1); - in - { - type = "value"; - value = result; - } - ) else exprs - ) else builtins.map evalExpressions exprs; + if builtins.typeOf exprs == "set" then ( + if exprs.type == "expr" then ( + let + expr = exprs; + result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1); + in + { + type = "value"; + value = result; + } + ) else exprs + ) else builtins.map evalExpressions exprs; # Now that we have performed an eval all that's left to do is to concat the graph into a single bool reduceExpressions = exprs: @@ -217,18 +212,18 @@ let cond = "and"; } v; in - acc // { - value = cond."${acc.cond}" acc.value ret.value; - } + acc // { + value = cond."${acc.cond}" acc.value ret.value; + } ) else throw "Unsupported type" ); in - ( - builtins.foldl' reduceExpressionsFun { - value = true; - cond = "and"; - } exprs - ).value; + ( + builtins.foldl' reduceExpressionsFun { + value = true; + cond = "and"; + } exprs + ).value; in e: builtins.foldl' (acc: v: v acc) e [ findSubExpressions diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix index 07dcbbc5eacb3..e86b1d3ac660f 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix @@ -1,28 +1,28 @@ { lib, ireplace }: let inherit (builtins) elemAt match; - - operators = let - matchWildCard = s: match "([^\*])(\.[\*])" s; - mkComparison = ret: version: v: builtins.compareVersions version v == ret; - mkIdxComparison = idx: version: v: - let - ver = builtins.splitVersion v; - minor = builtins.toString (lib.toInt (elemAt ver idx) + 1); - upper = builtins.concatStringsSep "." (ireplace idx minor ver); - in + operators = + let + matchWildCard = s: match "([^\*])(\.[\*])" s; + mkComparison = ret: version: v: builtins.compareVersions version v == ret; + mkIdxComparison = idx: version: v: + let + ver = builtins.splitVersion v; + minor = builtins.toString (lib.toInt (elemAt ver idx) + 1); + upper = builtins.concatStringsSep "." (ireplace idx minor ver); + in operators.">=" version v && operators."<" version upper; - dropWildcardPrecision = f: version: constraint: - let - m = matchWildCard constraint; - hasWildcard = m != null; - c = if hasWildcard then (elemAt m 0) else constraint; - v = - if hasWildcard then (builtins.substring 0 (builtins.stringLength c) version) - else version; - in + dropWildcardPrecision = f: version: constraint: + let + m = matchWildCard constraint; + hasWildcard = m != null; + c = if hasWildcard then (elemAt m 0) else constraint; + v = + if hasWildcard then (builtins.substring 0 (builtins.stringLength c) version) + else version; + in f v c; - in + in { # Prefix operators "==" = dropWildcardPrecision (mkComparison 0); @@ -39,24 +39,23 @@ let # Prune constraint parts = builtins.splitVersion c; pruned = lib.take ((builtins.length parts) - 1) parts; - upper = builtins.toString ( - (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 - ); + upper = builtins.toString + ( + (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 + ); upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned); in - operators.">=" v c && operators."<" v upperConstraint; + operators.">=" v c && operators."<" v upperConstraint; # Infix operators "-" = version: v: operators.">=" version v.vl && operators."<=" version v.vu; # Arbitrary equality clause, just run simple comparison "===" = v: c: v == c; # }; - re = { operators = "([=><!~\^]+)"; version = "([0-9\.\*x]+)"; }; - parseConstraint = constraint: let constraintStr = builtins.replaceStrings [ " " ] [ "" ] constraint; @@ -65,26 +64,24 @@ let # There is also an infix operator to match ranges mIn = match "${re.version} *(-) *${re.version}" constraintStr; in - ( - if mPre != null then { - op = elemAt mPre 0; - v = elemAt mPre 1; - } - # Infix operators are range matches - else if mIn != null then { - op = elemAt mIn 1; - v = { - vl = (elemAt mIn 0); - vu = (elemAt mIn 2); - }; - } - else throw "Constraint \"${constraintStr}\" could not be parsed" - ); - + ( + if mPre != null then { + op = elemAt mPre 0; + v = elemAt mPre 1; + } + # Infix operators are range matches + else if mIn != null then { + op = elemAt mIn 1; + v = { + vl = (elemAt mIn 0); + vu = (elemAt mIn 2); + }; + } + else throw "Constraint \"${constraintStr}\" could not be parsed" + ); satisfiesSemver = version: constraint: let inherit (parseConstraint constraint) op v; - in - if constraint == "*" then true else operators."${op}" version v; + in if constraint == "*" then true else operators."${op}" version v; in { inherit satisfiesSemver; } diff --git a/pkgs/development/tools/poetry2nix/update b/pkgs/development/tools/poetry2nix/update index 4840c23c3b813..5bea272f8a9a2 100755 --- a/pkgs/development/tools/poetry2nix/update +++ b/pkgs/development/tools/poetry2nix/update @@ -14,7 +14,7 @@ curl -L -s https://github.com/nix-community/poetry2nix/archive/master.tar.gz | t mv poetry2nix-master/* . mkdir build -cp *.nix *.json *.py build/ +cp *.* build/ cp -r hooks bin build/ rm build/shell.nix build/generate.py build/overlay.nix build/flake.nix diff --git a/pkgs/development/tools/postiats-utilities/default.nix b/pkgs/development/tools/postiats-utilities/default.nix index 40cd133032fb0..4b6d230becd64 100644 --- a/pkgs/development/tools/postiats-utilities/default.nix +++ b/pkgs/development/tools/postiats-utilities/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = https://github.com/Hibou57/PostiATS-Utilities; + homepage = "https://github.com/Hibou57/PostiATS-Utilities"; license = licenses.bsd2; platforms = platforms.linux; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix index 1e52c0e95c0ac..817bb11717116 100644 --- a/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/pkgs/development/tools/profiling/heaptrack/default.nix @@ -23,7 +23,7 @@ mkDerivation rec { meta = with lib; { description = "Heap memory profiler for Linux"; - homepage = https://github.com/KDE/heaptrack; + homepage = "https://github.com/KDE/heaptrack"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ gebner ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index 0b2b497176450..6e6cb9fc4cf42 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { modules, the kernel, shared libraries, and applications. ''; license = stdenv.lib.licenses.gpl2; - homepage = http://oprofile.sourceforge.net/; + homepage = "http://oprofile.sourceforge.net/"; platforms = stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/development/tools/profiling/pprof/default.nix index 120fd89377b39..2618dd3ef1ecc 100644 --- a/pkgs/development/tools/profiling/pprof/default.nix +++ b/pkgs/development/tools/profiling/pprof/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A tool for visualization and analysis of profiling data"; - homepage = https://github.com/google/pprof; + homepage = "https://github.com/google/pprof"; license = licenses.asl20; longDescription = '' pprof reads a collection of profiling samples in profile.proto format and generates reports to visualize and help analyze the data. It can generate both text and graphical reports (through the use of the dot visualization package). diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index da2043c5bd708..fc4e51801df5a 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "System-wide profiler for Linux"; - homepage = https://wiki.gnome.org/Apps/Sysprof; + homepage = "https://wiki.gnome.org/Apps/Sysprof"; longDescription = '' Sysprof is a sampling CPU profiler for Linux that uses the perf_event_open system call to profile the entire system, not just a single @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { be restarted. ''; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 3f0b37a7175e0..c1f38a6241843 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -4,7 +4,7 @@ let ## fetchgit info - url = git://sourceware.org/git/systemtap.git; + url = "git://sourceware.org/git/systemtap.git"; rev = "release-${version}"; sha256 = "0mmpiq7bsrwhp7z07a1pwka4q6d2fbmdx5wp83nxj31rvdxhqwnw"; version = "4.1"; @@ -40,7 +40,7 @@ in runCommand "systemtap-${kernel.version}-${version}" { inherit stapBuild kernelBuildDir; buildInputs = [ makeWrapper ]; meta = { - homepage = https://sourceware.org/systemtap/; + homepage = "https://sourceware.org/systemtap/"; repositories.git = url; description = "Provides a scripting language for instrumentation on a live kernel plus user-space"; license = lib.licenses.gpl2; diff --git a/pkgs/development/tools/proto-contrib/default.nix b/pkgs/development/tools/proto-contrib/default.nix index 8366838955653..90253ed57048e 100644 --- a/pkgs/development/tools/proto-contrib/default.nix +++ b/pkgs/development/tools/proto-contrib/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { sha256 = "0ksxic7cypv9gg8q5lkl5bla1n9i65z7b03cx9lwq6252glmf2jk"; }; - modSha256 = "19cqz13jd95d5vibd10420gg69ldgf6afc51mkglhafgmmif56b0"; + vendorSha256 = "1ivvq5ch9grdrwqq29flv9821kyb16k0cj6wgj5v0dyn63w420aw"; meta = with lib; { description = "Contributed tools and other packages on top of the Go proto package"; - homepage = https://github.com/emicklei/proto-contrib; + homepage = "https://github.com/emicklei/proto-contrib"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/development/tools/protoc-gen-doc/default.nix index 77c1df6f43e3e..5579d006e97b0 100644 --- a/pkgs/development/tools/protoc-gen-doc/default.nix +++ b/pkgs/development/tools/protoc-gen-doc/default.nix @@ -11,7 +11,7 @@ buildGoModule { sha256 = "004axh2gqc4f115mdxxg59d19hph3rr0bq9d08n3nyl315f590kj"; }; - modSha256 = "1952ycdkgl00q2s3qmhislhhim15nn6nmlkwbfdvrsfzznqj47rd"; + vendorSha256 = "17qdpsff8jk7ks5v6ix1rb966x3yvq03vk5bs2zbnxfdra7bv3n6"; meta = with lib; { description = "Documentation generator plugin for Google Protocol Buffers"; @@ -27,4 +27,4 @@ buildGoModule { license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/prototool/default.nix b/pkgs/development/tools/prototool/default.nix index 37b0f1fdf8db0..a5cf91b70d1d3 100644 --- a/pkgs/development/tools/prototool/default.nix +++ b/pkgs/development/tools/prototool/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "prototool"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "uber"; repo = pname; rev = "v${version}"; - sha256 = "1ssgvhcnqffhhdx8hnk4lmklip2f6g9i7ifblywfjylb08y7iqgd"; + sha256 = "02ih9pqnziwl2k4z6c59w1p4bxmb3xki5y33pdfkxqn2467s792g"; }; nativeBuildInputs = [ makeWrapper ]; - modSha256 = "1gc8kc9mbi3mlh48zx4lcgpsrf8z879f1qj9wfyr66s7wd1ljazg"; + vendorSha256 = "0gyj0yrri2j4yxmyn4d4vdhaxf2p08srpjcxg9zpaxwv5rrvipav"; postInstall = '' wrapProgram "$out/bin/prototool" \ diff --git a/pkgs/development/tools/pry/default.nix b/pkgs/development/tools/pry/default.nix index 974b61617fbe5..c39af508591fa 100644 --- a/pkgs/development/tools/pry/default.nix +++ b/pkgs/development/tools/pry/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A Ruby runtime developer console and IRB alternative"; - homepage = https://pryrepl.org; + homepage = "https://pryrepl.org"; license = licenses.mit; maintainers = [ maintainers.tckmn ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index adf019eef5729..254a7bc97e439 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -7,15 +7,15 @@ , prettyprinter, process, QuickCheck, retry, rio, rio-orphans, safe , semver-range, stdenv, stm, tar, template-haskell, temporary, text , time, transformers, turtle, unliftio, unordered-containers -, vector, versions, zlib +, vector, versions, with-utf8, zlib }: mkDerivation { pname = "spago"; - version = "0.14.0"; + version = "0.15.1"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "12i1430prqspy73nwfxc17zf51yprhrxxcnhw4rks6jhkgwxf4a4"; - rev = "7a99343e4876a465600eaa64b0697a9f0b2a49a9"; + sha256 = "09ypbm03ap8xfhq803ra3cc01dxcavckn7nis6hi80dk2xxlhc3d"; + rev = "d5d206ff0f5c686f8b609fb4bc2e866959cc0144"; fetchSubmodules = true; }; isLibrary = true; @@ -25,17 +25,13 @@ mkDerivation { bytestring Cabal containers dhall directory either exceptions file-embed filepath foldl fsnotify github Glob http-client http-conduit lens-family-core megaparsec mtl network-uri - open-browser prettyprinter process retry rio rio-orphans safe - semver-range stm tar template-haskell temporary text time - transformers turtle unliftio unordered-containers vector versions - zlib + open-browser optparse-applicative prettyprinter process retry rio + rio-orphans safe semver-range stm tar template-haskell temporary + text time transformers turtle unliftio unordered-containers vector + versions with-utf8 zlib ]; libraryToolDepends = [ hpack ]; - executableHaskellDepends = [ - aeson-pretty async-pool base bytestring containers dhall filepath - github lens-family-core megaparsec optparse-applicative process - retry stm temporary text time turtle vector - ]; + executableHaskellDepends = [ base text turtle with-utf8 ]; testHaskellDepends = [ base containers directory extra hspec hspec-megaparsec megaparsec process QuickCheck temporary text turtle versions diff --git a/pkgs/development/tools/pxview/default.nix b/pkgs/development/tools/pxview/default.nix new file mode 100644 index 0000000000000..6b11071b6fa3b --- /dev/null +++ b/pkgs/development/tools/pxview/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, perl, perlPackages, pxlib }: + +stdenv.mkDerivation rec { + pname = "pxview"; + version = "0.2.5"; + src = fetchurl { + url = "mirror://sourceforge/pxlib/${pname}_${version}.orig.tar.gz"; + sha256 = "1kpdqs6lvnyj02v9fbz1s427yqhgrxp7zw63rzfgiwd4iqp75139"; + }; + + buildInputs = [ pxlib perl ] ++ (with perlPackages; [ libxml_perl ]); + nativeBuildInputs = [ pkgconfig ]; + + configureFlags = [ "--with-pxlib=${pxlib.out}" ]; + + # https://sourceforge.net/p/pxlib/bugs/12/ + LDFLAGS = "-lm"; + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + description = "Program to convert Paradox databases"; + homepage = "http://pxlib.sourceforge.net/pxview/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.winpat ]; + }; +} diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix index e174184835a44..67e7a879d883f 100644 --- a/pkgs/development/tools/pydb/default.nix +++ b/pkgs/development/tools/pydb/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Python debugger with GDB-like commands and Emacs bindings"; - homepage = http://bashdb.sourceforge.net/pydb/; + homepage = "http://bashdb.sourceforge.net/pydb/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 9e9ec6f0d3daf..a750a21c1b4c7 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -88,7 +88,7 @@ mkDerivation rec { tailored to the needs of Qt developers. It includes features such as an advanced code editor, a visual debugger and a GUI designer. ''; - homepage = https://wiki.qt.io/Category:Tools::QtCreator; + homepage = "https://wiki.qt.io/Category:Tools::QtCreator"; license = "LGPL"; maintainers = [ maintainers.akaWolf ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix index d5059aa6b93bb..dece0a7b44ba5 100644 --- a/pkgs/development/tools/quilt/default.nix +++ b/pkgs/development/tools/quilt/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://savannah.nongnu.org/projects/quilt; + homepage = "https://savannah.nongnu.org/projects/quilt"; description = "Easily manage large numbers of patches"; longDescription = '' diff --git a/pkgs/development/tools/rdbtools/default.nix b/pkgs/development/tools/rdbtools/default.nix index 5a81ae757ea7f..050c4ff04a279 100644 --- a/pkgs/development/tools/rdbtools/default.nix +++ b/pkgs/development/tools/rdbtools/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Parse Redis dump.rdb files, Analyze Memory, and Export Data to JSON"; - homepage = https://github.com/sripathikrishnan/redis-rdb-tools; + homepage = "https://github.com/sripathikrishnan/redis-rdb-tools"; license = licenses.mit; maintainers = with maintainers; [ offline ]; }; diff --git a/pkgs/development/tools/rdocker/default.nix b/pkgs/development/tools/rdocker/default.nix index d92003a575e15..60df0df10031e 100644 --- a/pkgs/development/tools/rdocker/default.nix +++ b/pkgs/development/tools/rdocker/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Securely control a remote docker daemon CLI using ssh forwarding, no SSL setup needed"; - homepage = https://github.com/dvddarias/rdocker; + homepage = "https://github.com/dvddarias/rdocker"; maintainers = [ stdenv.lib.maintainers.pneumaticat ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index 15c61da13c073..f4cf500c2f9cf 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/jhen0409/react-native-debugger; + homepage = "https://github.com/jhen0409/react-native-debugger"; license = licenses.mit; description = "The standalone app based on official debugger of React Native, and includes React Inspector / Redux DevTools"; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/tools/redis-dump/default.nix b/pkgs/development/tools/redis-dump/default.nix index 646d04c266f51..2d4acd724d39b 100644 --- a/pkgs/development/tools/redis-dump/default.nix +++ b/pkgs/development/tools/redis-dump/default.nix @@ -3,13 +3,13 @@ bundlerApp { pname = "redis-dump"; gemdir = ./.; - exes = [ "redis-dump" ]; + exes = [ "redis-dump" "redis-load" ]; passthru.updateScript = bundlerUpdateScript "redis-dump"; meta = with lib; { description = "Backup and restore your Redis data to and from JSON"; - homepage = http://delanotes.com/redis-dump/; + homepage = "http://delanotes.com/redis-dump/"; license = licenses.mit; maintainers = with maintainers; [ offline manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/reflex/default.nix b/pkgs/development/tools/reflex/default.nix index b82c0694fec81..86576869a9752 100644 --- a/pkgs/development/tools/reflex/default.nix +++ b/pkgs/development/tools/reflex/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with lib; { description = "A small tool to watch a directory and rerun a command when certain files change"; - homepage = https://github.com/cespare/reflex; + homepage = "https://github.com/cespare/reflex"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ nicknovitski ]; diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/development/tools/reftools/default.nix index 2d5346f2112a4..7f8d1be1a52b0 100644 --- a/pkgs/development/tools/reftools/default.nix +++ b/pkgs/development/tools/reftools/default.nix @@ -1,12 +1,14 @@ -{ buildGoPackage +{ buildGoModule , lib , fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "reftools-unstable"; - version = "2018-09-14"; - rev = "654d0ba4f96d62286ca33cd46f7674b84f76d399"; + version = "2019-12-21"; + rev = "65925cf013156409e591f7a1be4df96f640d02f4"; + + vendorSha256 = null; goPackagePath = "github.com/davidrjenni/reftools"; excludedPackages = "\\(cmd/fillswitch/test-fixtures\\)"; @@ -16,14 +18,14 @@ buildGoPackage rec { owner = "davidrjenni"; repo = "reftools"; - sha256 = "12y2h1h15xadc8pa3xsj11hpdxz5dss6k7xaa4h1ifkvnasjp5w2"; + sha256 = "18jg13skqi2v2vh2k6jvazv6ymhhybangjd23xn2asfk9g6cvnjs"; }; meta = with lib; { description = "reftools - refactoring tools for Go"; - homepage = https://github.com/davidrjenni/reftools; + homepage = "https://github.com/davidrjenni/reftools"; license = licenses.bsd2; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index eb70a7b326d37..141b70c689ce3 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Convert between TOML, YAML and JSON"; license = licenses.mit; - homepage = https://github.com/dbohdan/remarshal; + homepage = "https://github.com/dbohdan/remarshal"; maintainers = with maintainers; [ offline ]; }; } diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/development/tools/renderizer/default.nix index 93634f935d1dd..877fdeea8f2b3 100644 --- a/pkgs/development/tools/renderizer/default.nix +++ b/pkgs/development/tools/renderizer/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1bip12pcn8bqgph7vd7bzzadwbyqh80fx7gqciv9fchycwsj04rf"; }; - modSha256 = "0ss5l2n1sl1i2hvxsdzy6p61mnnxmm6h256jvv0p0ajynx8g538q"; + vendorSha256 = "13z357ww4j5bmmy8ag6d6gd5b2dib8kby73q8317pqnqzaxrrbcj"; meta = with stdenv.lib; { description = "CLI to render Go template text files"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.gpl3; maintainers = with maintainers; [ yurrriq ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix index 80c64a65083f0..2b082d03b5f34 100644 --- a/pkgs/development/tools/reno/default.nix +++ b/pkgs/development/tools/reno/default.nix @@ -20,7 +20,7 @@ with pythonPackages; buildPythonApplication rec { meta = with stdenv.lib; { description = "Release Notes Manager"; - homepage = http://docs.openstack.org/developer/reno/; + homepage = "http://docs.openstack.org/developer/reno/"; license = licenses.asl20; maintainers = with maintainers; [ guillaumekoenig ]; }; diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index 82dca2289cf42..247227411844d 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Repository manager for binary software components"; - homepage = http://www.sonatype.org/nexus; + homepage = "http://www.sonatype.org/nexus"; license = licenses.epl10; platforms = platforms.all; maintainers = with maintainers; [ aespinosa ironpinguin zaninime ]; diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix index 871ea0dc67a29..4fc4d4abc618d 100644 --- a/pkgs/development/tools/richgo/default.nix +++ b/pkgs/development/tools/richgo/default.nix @@ -11,14 +11,14 @@ buildGoModule rec { sha256 = "07ipa54c4mzm6yizgvkm6x5yim1xgv3f0xdxg35qziacdfcwd6m4"; }; - modSha256 = "12wbjfqy6qnapm3f2pz1ci1gvc0y8kzr8c99kihyh1jv9r3zy1wz"; + vendorSha256 = "1nvk3akjwfcbvif1w4cglsqplcajlwq3mnvk9b75nmn9qaqfbfjf"; subPackages = [ "." ]; meta = with stdenv.lib; { description = "Enrich `go test` outputs with text decorations."; - homepage = https://github.com/kyoh86/richgo; + homepage = "https://github.com/kyoh86/richgo"; license = licenses.mit; maintainers = with maintainers; [ rvolosatovs ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/development/tools/ronn/default.nix index e4762796c18a8..9e4ac0b58ebee 100644 --- a/pkgs/development/tools/ronn/default.nix +++ b/pkgs/development/tools/ronn/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "markdown-based tool for building manpages"; - homepage = https://rtomayko.github.io/ronn/; + homepage = "https://rtomayko.github.io/ronn/"; license = licenses.mit; maintainers = with maintainers; [ zimbatm nicknovitski ]; platforms = env.ruby.meta.platforms; diff --git a/pkgs/development/tools/rshell/default.nix b/pkgs/development/tools/rshell/default.nix index 5087b811ac013..4e3e12a8eeb15 100644 --- a/pkgs/development/tools/rshell/default.nix +++ b/pkgs/development/tools/rshell/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "rshell"; - version = "0.0.27"; + version = "0.0.28"; src = fetchPypi { inherit pname version; - sha256 = "15pm60jfmr5nms43nrh5jlpz4lxxfhaahznfcys6nc4g80r2fwr2"; + sha256 = "1crnlv0khplpibl9mj3flrgp877pnr1xz6hnnsi6hk3kfbc6p3nj"; }; propagatedBuildInputs = [ pyserial pyudev ]; diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index c35018f4cc731..18efcb913532a 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "C/C++ client-server indexer based on clang"; - homepage = https://github.com/andersbakken/rtags; + homepage = "https://github.com/andersbakken/rtags"; license = stdenv.lib.licenses.gpl3; platforms = with stdenv.lib.platforms; x86_64 ++ aarch64; }; diff --git a/pkgs/development/tools/rucksack/default.nix b/pkgs/development/tools/rucksack/default.nix index 9eb568040ffbd..2734cdd3596e7 100644 --- a/pkgs/development/tools/rucksack/default.nix +++ b/pkgs/development/tools/rucksack/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Texture packer and resource bundler"; platforms = [ "i686-linux" "x86_64-linux" ]; # fails on Darwin and AArch64 - homepage = https://github.com/andrewrk/rucksack; + homepage = "https://github.com/andrewrk/rucksack"; license = licenses.mit; maintainers = [ maintainers.andrewrk ]; }; diff --git a/pkgs/development/tools/run/default.nix b/pkgs/development/tools/run/default.nix index 4dcfed96056ee..518cc3e2557f1 100644 --- a/pkgs/development/tools/run/default.nix +++ b/pkgs/development/tools/run/default.nix @@ -1,22 +1,22 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "run"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "TekWizely"; repo = "run"; rev = "v${version}"; - sha256 = "0q9f8lzrzybdablqph5wihqhfbfzb3bbnnxvhy7g5ccg1kzy7mgp"; + sha256 = "17n11lqhywq4z62w2rakdq80v7mxf83rgln19vj4v4nxpwd2hjjw"; }; - modSha256 = "0s2lw9q5jskj41jqr8bv5w45pkrp2s0yfd2hgjgsd0q4ifm07k7s"; + vendorSha256 = "1g5rmiiwqpm8gky9yr5f2a7zsjjmm9i12r7yxj9cz7y3rmw9sw8c"; meta = with stdenv.lib; { description = "Easily manage and invoke small scripts and wrappers"; - homepage = https://github.com/TekWizely/run; + homepage = "https://github.com/TekWizely/run"; license = licenses.mit; maintainers = with maintainers; [ rawkode filalex77 ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/rund/default.nix b/pkgs/development/tools/rund/default.nix index a2433da2997bc..9a7ac0b63244a 100644 --- a/pkgs/development/tools/rund/default.nix +++ b/pkgs/development/tools/rund/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A compiler-wrapper that runs and caches D programs"; - homepage = https://github.com/dragon-lang/rund; + homepage = "https://github.com/dragon-lang/rund"; license = lib.licenses.boost; maintainers = with maintainers; [ jonathanmarler ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix index 7c1361f6d2703..d8aca4045bff0 100644 --- a/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-asm/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Display the assembly or LLVM-IR generated for Rust source code"; - homepage = https://github.com/gnzlbg/cargo-asm; + homepage = "https://github.com/gnzlbg/cargo-asm"; license = licenses.mit; maintainers = [ maintainers.danieldk ]; platforms = platforms.all; diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix new file mode 100644 index 0000000000000..deba6cc674c1e --- /dev/null +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +, perl, pkgconfig, openssl, Security, libiconv, curl +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-deny"; + version = "0.6.7"; + + src = fetchFromGitHub { + owner = "EmbarkStudios"; + repo = pname; + rev = version; + sha256 = "1d7zd2wpvfz1vq5ik67m6s1mscivh8b3kz4bfckw3cazk68vn9q1"; + }; + + cargoSha256 = "0jy10yfd9d5r0ildyxszs1ppzyd4ninl7lihdnwjqm6qifr1m5rp"; + + nativeBuildInputs = [ perl pkgconfig ]; + + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + + meta = with lib; { + description = "Cargo plugin to generate list of all licenses for a crate"; + homepage = "https://github.com/EmbarkStudios/cargo-deny"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} + diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 73dcb96201edc..ebe23e19737fe 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -1,25 +1,21 @@ -{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, darwin }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.4.19"; + version = "0.6.0"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "15izqd6nbpxjjymdmcpzjmaiygs1vdrpg9cw1nzmrkb8fc4h5ch5"; + sha256 = "1xinaxxdsyhy8jl6albw8q9nl12iq11xny6a6a55niqzhvy1sdmp"; }; - cargoSha256 = "0sbpymxhhwxg13w9821b17nda6p3ycqr81i7bj4fxil0n3sb910h"; + cargoSha256 = "0i326vny4gygalsimsgkqsvlq09av8pv9a7a0yxcbk170a7zyxb0"; - buildInputs = [ llvmPackages.libclang ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; - - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - - meta = with stdenv.lib; { - description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; + meta = with lib; { + description = + "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; homepage = "https://github.com/dtolnay/cargo-expand"; license = with licenses; [ mit asl20 ]; platforms = platforms.all; diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index a31bcab82d4b1..7379fbffe5eb1 100644 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Command line helpers for fuzzing"; - homepage = https://github.com/rust-fuzz/cargo-fuzz; + homepage = "https://github.com/rust-fuzz/cargo-fuzz"; license = with licenses; [ mit asl20 ]; maintainers = [ maintainers.ekleog ]; platforms = platforms.all; diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index 7678db0a3866e..09956976fb690 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Detects usage of unsafe Rust in a Rust crate and its dependencies."; - homepage = https://github.com/rust-secure-code/cargo-geiger; + homepage = "https://github.com/rust-secure-code/cargo-geiger"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ evanjs ]; platforms = platforms.all; diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index a5337e94087a2..360cb469e6cd4 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "cargo, make me a project"; - homepage = https://github.com/ashleygwilliams/cargo-generate; + homepage = "https://github.com/ashleygwilliams/cargo-generate"; license = licenses.asl20; maintainers = [ maintainers.turbomack ]; platforms = platforms.all; diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix index 34d45ac83c72d..f16a5d5727a10 100644 --- a/pkgs/development/tools/rust/cargo-inspect/default.nix +++ b/pkgs/development/tools/rust/cargo-inspect/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "See what Rust is doing behind the curtains"; - homepage = https://github.com/mre/cargo-inspect; + homepage = "https://github.com/mre/cargo-inspect"; license = with licenses; [ mit asl20 ]; platforms = platforms.all; maintainers = with maintainers; [ minijackson ]; diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock index f5ad1b413ca62..05868a4e1c2d1 100644 --- a/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock @@ -4,1052 +4,1086 @@ name = "adler32" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" [[package]] name = "aho-corasick" -version = "0.7.6" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" dependencies = [ - "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr", ] [[package]] name = "ansi_term" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi", ] [[package]] name = "arrayref" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" [[package]] name = "arrayvec" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" [[package]] name = "attohttpc" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5db1932a9d70d5091139d6b0e04ec6a4d9f9184041c15d71a5ef954cb3c5312" dependencies = [ - "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2", + "http", + "log", + "native-tls", + "openssl", + "url", ] [[package]] name = "atty" version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "hermit-abi", + "libc", + "winapi", ] [[package]] name = "autocfg" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "autocfg" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" [[package]] name = "base64" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" [[package]] name = "base64" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d1ccbaf7d9ec9537465a97bf19edc1a4e158ecb49fc16178202238c569cc42" [[package]] name = "bitflags" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "blake2b_simd" version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" dependencies = [ - "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "arrayref", + "arrayvec", + "constant_time_eq", ] [[package]] name = "bytes" version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "c2-chacha" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -] +checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" [[package]] name = "cargo-make" -version = "0.30.4" -dependencies = [ - "ci_info 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "duckscript 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "duckscriptsdk 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "fern 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "run_script 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", - "shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", +version = "0.30.7" +dependencies = [ + "ci_info", + "clap", + "colored", + "dirs", + "duckscript", + "duckscriptsdk", + "envmnt", + "fern", + "fsio", + "git_info", + "glob", + "home", + "indexmap", + "log", + "run_script", + "rust_info", + "rusty-hook", + "semver", + "serde", + "serde_derive", + "serde_json", + "shell2batch", + "toml", ] [[package]] name = "cc" -version = "1.0.50" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d" [[package]] name = "cfg-if" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "ci_info" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19c5f9baeac8a1176ca7fc58a0cc1abadd84d360365a93d1dd31e926f3f502b" dependencies = [ - "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "envmnt", ] [[package]] name = "clap" version = "2.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" dependencies = [ - "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", ] [[package]] name = "colored" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" dependencies = [ - "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "atty", + "lazy_static", + "winapi", ] [[package]] name = "constant_time_eq" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "core-foundation" -version = "0.6.4" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" dependencies = [ - "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys", + "libc", ] [[package]] name = "core-foundation-sys" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" [[package]] name = "crc32fast" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", ] [[package]] name = "crossbeam-utils" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg", + "cfg-if", + "lazy_static", ] [[package]] name = "dirs" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "dirs-sys", ] [[package]] name = "dirs-sys" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "libc", + "redox_users", + "winapi", ] [[package]] name = "duckscript" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b666b2baf849932922921c2ff4bdb30e49835468626561d18fda4949751b55" dependencies = [ - "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "fsio", ] [[package]] name = "duckscriptsdk" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc9026058fdb6382c5fc62bc7a789d18b796236ddf48bee5a01332f576c1c109" dependencies = [ - "attohttpc 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "duckscript 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "uname 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "whoami 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "attohttpc", + "base64 0.12.1", + "cfg-if", + "duckscript", + "fs_extra", + "fsio", + "glob", + "home", + "java-properties", + "meval", + "num_cpus", + "rand", + "uname", + "walkdir", + "which", + "whoami", ] [[package]] name = "encoding" version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" dependencies = [ - "encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", - "encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", - "encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", - "encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", - "encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", + "encoding-index-japanese", + "encoding-index-korean", + "encoding-index-simpchinese", + "encoding-index-singlebyte", + "encoding-index-tradchinese", ] [[package]] name = "encoding-index-japanese" version = "1.20141219.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" dependencies = [ - "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "encoding_index_tests", ] [[package]] name = "encoding-index-korean" version = "1.20141219.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" dependencies = [ - "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "encoding_index_tests", ] [[package]] name = "encoding-index-simpchinese" version = "1.20141219.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" dependencies = [ - "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "encoding_index_tests", ] [[package]] name = "encoding-index-singlebyte" version = "1.20141219.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" dependencies = [ - "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "encoding_index_tests", ] [[package]] name = "encoding-index-tradchinese" version = "1.20141219.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" dependencies = [ - "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "encoding_index_tests", ] [[package]] name = "encoding_index_tests" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[package]] name = "envmnt" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fba7e7d8c007e12db7b3bd6f04b8e47e206c9173d9c75413a042ccc941723c8" dependencies = [ - "indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "fsio", + "indexmap", ] [[package]] name = "fern" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9a4820f0ccc8a7afd67c39a0f1a0f4b07ca1725164271a64939d7aeb9af065" dependencies = [ - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "log", ] [[package]] name = "flate2" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cfff41391129e0a856d6d822600b8d71179d46879e310417eb9c762eb178b42" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "crc32fast", + "libc", + "miniz_oxide", ] [[package]] name = "fnv" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" [[package]] name = "foreign-types" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "foreign-types-shared", ] [[package]] name = "foreign-types-shared" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fs_extra" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" [[package]] name = "fsio" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2131cb03096f67334dfba2f0bc46afc5564b08a919d042c6e217e2665741fc54" dependencies = [ - "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand", + "users", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", ] [[package]] name = "getrandom" version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "libc", + "wasi", ] [[package]] name = "git_info" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "641b847f0375f4b2c595438eefc17a9c0fbf47b400cbdd1ad9332bf1e16b779d" [[package]] name = "glob" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "hermit-abi" -version = "0.1.6" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4" dependencies = [ - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", ] [[package]] name = "home" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi", ] [[package]] name = "http" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" dependencies = [ - "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", - "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes", + "fnv", + "itoa", ] [[package]] name = "idna" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" dependencies = [ - "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "matches", + "unicode-bidi", + "unicode-normalization", ] [[package]] name = "indexmap" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292" dependencies = [ - "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg", + "serde", ] [[package]] name = "itoa" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" [[package]] name = "java-properties" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caf4418ade5bde22a283a7f2fb537ea397ec102718f259f2630714e7a5b389fa" dependencies = [ - "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "encoding", + "regex", ] [[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.66" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" [[package]] name = "log" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", ] [[package]] name = "matches" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" [[package]] name = "memchr" -version = "2.3.0" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" [[package]] name = "meval" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79496a5651c8d57cd033c5add8ca7ee4e3d5f7587a4777484640d9cb60392d9" dependencies = [ - "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv", + "nom", ] [[package]] name = "miniz_oxide" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5" dependencies = [ - "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "adler32", ] [[package]] name = "native-tls" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" dependencies = [ - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", - "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", ] [[package]] +name = "nias" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab250442c86f1850815b5d268639dff018c0627022bc1940eb2d642ca1ce12f0" + +[[package]] name = "nom" version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce" + +[[package]] +name = "num_cpus" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ + "hermit-abi", + "libc", +] [[package]] name = "openssl" -version = "0.10.26" +version = "0.10.29" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "cfg-if", + "foreign-types", + "lazy_static", + "libc", + "openssl-sys", ] [[package]] name = "openssl-probe" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" [[package]] name = "openssl-sys" -version = "0.9.53" +version = "0.9.55" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7717097d810a0f2e2323f9e5d11e71608355e24828410b55b9d4f18aa5f9a5d8" dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", - "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg", + "cc", + "libc", + "pkg-config", + "vcpkg", ] [[package]] name = "percent-encoding" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "pkg-config" version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" [[package]] name = "ppv-lite86" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" [[package]] name = "proc-macro2" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8872cf6f48eee44265156c111456a700ab3483686b3f96df4cf5481c89157319" dependencies = [ - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid", ] [[package]] name = "quote" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c1f4b0efa5fc5e8ceb705136bfee52cfdb6a4e3509f770b478cd6ed434232a7" dependencies = [ - "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", ] [[package]] name = "rand" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ - "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom", + "libc", + "rand_chacha", + "rand_core", + "rand_hc", ] [[package]] name = "rand_chacha" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" dependencies = [ - "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ppv-lite86", + "rand_core", ] [[package]] name = "rand_core" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom", ] [[package]] name = "rand_hc" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" dependencies = [ - "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core", ] [[package]] name = "redox_syscall" version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" [[package]] name = "redox_users" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" dependencies = [ - "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom", + "redox_syscall", + "rust-argon2", ] [[package]] name = "regex" -version = "1.3.3" +version = "1.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692" dependencies = [ - "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "aho-corasick", + "memchr", + "regex-syntax", + "thread_local", ] [[package]] name = "regex-syntax" -version = "0.6.13" +version = "0.6.17" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" [[package]] name = "remove_dir_all" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi", ] [[package]] name = "run_script" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9527b8b68ef929243a3e8ad7471a2d80f6ac23b810aafd3df4a2e5212d8dacc1" dependencies = [ - "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "fsio", ] [[package]] name = "rust-argon2" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" dependencies = [ - "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", - "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.11.0", + "blake2b_simd", + "constant_time_eq", + "crossbeam-utils", ] [[package]] name = "rust_info" -version = "0.3.0" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b506bd796703b88d74a3edb529acde6c71d81bb078c392eecd60a745cb1d2f" + +[[package]] +name = "rusty-hook" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27138b73a8ce63ae918707a5e3b57f9b0c0842a57b82f0e43474cf4e3aaf0ff4" +dependencies = [ + "ci_info", + "getopts", + "nias", + "toml", +] [[package]] name = "ryu" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1" [[package]] name = "same-file" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" dependencies = [ - "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-util", ] [[package]] name = "schannel" -version = "0.1.16" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "039c25b130bd8c1321ee2d7de7fde2659fa9c2744e4bb29711cfc852ea53cd19" dependencies = [ - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static", + "winapi", ] [[package]] name = "security-framework" -version = "0.3.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f331b9025654145cd425b9ded0caf8f5ae0df80d418b326e2dc1c3dc5eb0620" dependencies = [ - "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", ] [[package]] name = "security-framework-sys" -version = "0.3.3" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" dependencies = [ - "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys", + "libc", ] [[package]] name = "semver" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "semver-parser", ] [[package]] name = "semver-parser" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.104" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399" [[package]] name = "serde_derive" -version = "1.0.104" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c" dependencies = [ - "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "serde_json" -version = "1.0.48" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7894c8ed05b7a3a279aeb79025fdec1d3158080b75b98a08faf2806bb799edd" dependencies = [ - "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa", + "ryu", + "serde", ] [[package]] name = "shell2batch" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "185a52ee351c1001753c9e3b2eb48c525ff7f51803a4f2cef4365b5c3b743f65" dependencies = [ - "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "regex", ] [[package]] name = "smallvec" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" [[package]] name = "strsim" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "syn" -version = "1.0.14" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8e5aa70697bb26ee62214ae3288465ecec0000f05182f039b477001f08f5ae7" dependencies = [ - "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "unicode-xid", ] [[package]] name = "tempfile" version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "libc", + "rand", + "redox_syscall", + "remove_dir_all", + "winapi", ] [[package]] name = "textwrap" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" dependencies = [ - "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width", ] [[package]] name = "thread_local" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" dependencies = [ - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static", ] [[package]] name = "toml" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" dependencies = [ - "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "serde", ] [[package]] name = "uname" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" dependencies = [ - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", ] [[package]] name = "unicode-bidi" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" dependencies = [ - "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "matches", ] [[package]] name = "unicode-normalization" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" dependencies = [ - "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec", ] [[package]] name = "unicode-width" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" [[package]] name = "unicode-xid" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" [[package]] name = "url" version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" dependencies = [ - "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "idna", + "matches", + "percent-encoding", ] [[package]] name = "users" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c72f4267aea0c3ec6d07eaabea6ead7c5ddacfafc5e22bcf8d186706851fb4cf" dependencies = [ - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", ] [[package]] name = "vcpkg" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" [[package]] name = "vec_map" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "walkdir" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" dependencies = [ - "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "same-file", + "winapi", + "winapi-util", ] [[package]] name = "wasi" version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "which" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" +dependencies = [ + "libc", +] [[package]] name = "whoami" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08eb844b158ea881e81b94556eede7f7e306e4c7b976aad88f49e6e36dec391" [[package]] name = "winapi" version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" dependencies = [ - "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", ] [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi", ] [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" - -[metadata] -"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" -"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" -"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" -"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" -"checksum attohttpc 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de33d017f0add8b019c6d98c3132c82c8815ca96bbed8e8006e7402c840562b3" -"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" -"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" -"checksum base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d5ca2cd0adc3f48f9e9ea5a6bbdf9ccc0bfade884847e484d452414c7ccffb3" -"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" -"checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" -"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" -"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" -"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -"checksum ci_info 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b407009a4a51ae109dbdfcd7b6e4de38d148f37fad512b8c4623c642c4045e68" -"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -"checksum colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8815e2ab78f3a59928fc32e141fbeece88320a240e43f47b2fd64ea3a88a5b3d" -"checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" -"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" -"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" -"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" -"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" -"checksum duckscript 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aa4a338912dce0ada9929b9aa81c3b279e51b101583da13541339efaee46dfa9" -"checksum duckscriptsdk 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cc45d92450a257a4fbf28126086983c88010dbe2f99f3559d0073a6ed440046" -"checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" -"checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" -"checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" -"checksum encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" -"checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" -"checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" -"checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" -"checksum envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db101f16134ca37f91a6e30c32d9df5bbfcbe8d926f0c1f03602baf2fc2f7352" -"checksum fern 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8c9a4820f0ccc8a7afd67c39a0f1a0f4b07ca1725164271a64939d7aeb9af065" -"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f" -"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" -"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -"checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" -"checksum fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2131cb03096f67334dfba2f0bc46afc5564b08a919d042c6e217e2665741fc54" -"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -"checksum git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "add3a9c3c08c8905a2165ff06891dd1c3bb32d81b2a32d79528abc9793dfb06f" -"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" -"checksum home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" -"checksum http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b" -"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" -"checksum indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b54058f0a6ff80b6803da8faf8997cde53872b38f4023728f6830b06cd3c0dc" -"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" -"checksum java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "caf4418ade5bde22a283a7f2fb537ea397ec102718f259f2630714e7a5b389fa" -"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" -"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223" -"checksum meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f79496a5651c8d57cd033c5add8ca7ee4e3d5f7587a4777484640d9cb60392d9" -"checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625" -"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" -"checksum nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce" -"checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585" -"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" -"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" -"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" -"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548" -"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" -"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -"checksum redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" -"checksum regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b5508c1941e4e7cb19965abef075d35a9a8b5cdf0846f30b4050e9b55dc55e87" -"checksum regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e734e891f5b408a29efbf8309e656876276f49ab6a6ac208600b4419bd893d90" -"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -"checksum run_script 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2dfbbb48b9c7ee71baadd968640f81ca4bc930c1a2029441eede96a6933275ac" -"checksum rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" -"checksum rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be941f2b996df7ffaf093366039c9dc182b3ca2e00f3e81df44e08c3611e773d" -"checksum ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76" -"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" -"checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df" -"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895" -"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" -"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" -"checksum serde_json 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "9371ade75d4c2d6cb154141b9752cf3781ec9c05e0e5cf35060e1e70ee7b9c25" -"checksum shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "185a52ee351c1001753c9e3b2eb48c525ff7f51803a4f2cef4365b5c3b743f65" -"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4" -"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5" -"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -"checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" -"checksum uname 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" -"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -"checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" -"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" -"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" -"checksum users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c72f4267aea0c3ec6d07eaabea6ead7c5ddacfafc5e22bcf8d186706851fb4cf" -"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" -"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" -"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -"checksum whoami 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a08eb844b158ea881e81b94556eede7f7e306e4c7b976aad88f49e6e36dec391" -"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80" -"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 04e7d17503b3f..98f21b23d48e9 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.30.4"; + version = "0.30.7"; src = let @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "14sl7kcr1n3xb912vd3445pwf3v1kp74lgxlwqybnwiyh1dxihvg"; + sha256 = "0i8jf3161qqazp8cy3kzn2cw7zrcv1ijf2w3s8d8l0y2i2b25cv1"; }; in runCommand "source" {} '' @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "06i1z5jjqyadmvjgwxjlxcj2mmb0g83byibl3ap9qffahn0vhf7x"; + cargoSha256 = "08mn1ckvyffys9wqnvva7w1qzvarqvmnkpliv118vnnr072jnc6y"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix index f892263dd6907..96b4cd078bc7c 100644 --- a/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/pkgs/development/tools/rust/cargo-raze/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Generate Bazel BUILD files from Cargo dependencies"; - homepage = https://github.com/google/cargo-raze; + homepage = "https://github.com/google/cargo-raze"; license = licenses.asl20; maintainers = with maintainers; [ elasticdog ]; platforms = platforms.all; diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix index 8bebaf24d4782..2dfbfeeb17940 100644 --- a/pkgs/development/tools/rust/cargo-sweep/default.nix +++ b/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A Cargo subcommand for cleaning up unused build files generated by Cargo"; - homepage = https://github.com/holmgr/cargo-sweep; + homepage = "https://github.com/holmgr/cargo-sweep"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ xrelkd ]; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index ca347ca22deed..a6089ffeac2d0 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "1xmlpn4j5lhbzd9icb3nga5irfknmxfml9sn677d9z6fwfjfpa0l"; + sha256 = "1drz0slv33p4spm52sb5lnmpb83q8l7k3cvp0zcsinbjv8glvvnv"; }; - cargoSha256 = "1si95pdhbi6pa94gh9vip95n37im6kcfsgslpnibck2157pg4la6"; + cargoSha256 = "13ynab3s563n2xwkls7nmksis0ngx5klw9wc9bpnxgc5na9k84ll"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index d092274cf3677..35c0b9530eba0 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A Cargo subcommand for watching over Cargo project's source"; - homepage = https://github.com/passcod/cargo-watch; + homepage = "https://github.com/passcod/cargo-watch"; license = licenses.cc0; platforms = platforms.all; maintainers = with maintainers; [ xrelkd ivan ]; diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix index 4ae2b55f015fd..6af944e9c5d61 100644 --- a/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; - version = "0.5.28"; + version = "0.5.29"; src = fetchFromGitHub { owner = "rust-osdev"; repo = pname; rev = "v${version}"; - sha256 = "1rczflf6fllxkag5nah195shwqvqmlna9a1gkcwp9ljlgxlr9zvq"; + sha256 = "05wg1xx2mcwb9cplmrpg13jimddlzmv7hf5g3vjppjp8kz2gb7zj"; }; - cargoSha256 = "0xr8wpcw3x0343hm6clygsbikhrp6gcqb8vh7g7h9nijjrbnzxxb"; + cargoSha256 = "1s2xsfld29shvjzyp16y263hnbqxrq8i2557y0g09xmfm5x0jhix"; meta = with stdenv.lib; { description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc"; diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 87e8e081a9312..bc0ae5d33fe2a 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.13.2"; + version = "0.14.2"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "100ls8p8w6jwcjh3ligly5alg8fzp21aj7b1qbndn9fm0y1nmjam"; + sha256 = "15mk7q89rs723c7i9wwq4rrvakwh834wvrsmsnayji5k1kwaj351"; }; - cargoSha256 = "0d9sz46yzh01dx973q10xzw4k7r7ylvg82s5pkp3zpwcin8smaiw"; + cargoSha256 = "03irndd48ck62chm4vmlcnfm98gwd86xm1ssq9glw3b3y0n6x845"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/rust/maturin/Cargo.lock.patch b/pkgs/development/tools/rust/maturin/Cargo.lock.patch new file mode 100644 index 0000000000000..9f7d46d4901f9 --- /dev/null +++ b/pkgs/development/tools/rust/maturin/Cargo.lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 09ecb81..c37c646 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -733,7 +733,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "maturin" +-version = "0.8.0-beta.1" ++version = "0.8.0" + dependencies = [ + "base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 70c424ee0084e..e4ee97d024276 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -5,16 +5,21 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "maturin-${version}"; - version = "0.7.9"; + version = "0.8.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "1l8i1mz97zsc8kayvryv6xznwpby9k9jxy7lsx45acs5yksqchrv"; + sha256 = "1fjai0c0j8zzaj4c186dkbvx6cpj0vi3sc1qbjbgn2cm8azsd6m6"; }; - cargoSha256 = "0ly0f64acn1hxnj7vg1m860xpl06rklwqh545c386nnxaj839b0r"; + # The maturin 0.8.0 lockfile has an incorrect version for maturin + # itself. The upstream lockfiles are normally correct, so this + # should be removed post-0.8.0. + cargoPatches = [ ./Cargo.lock.patch ]; + + cargoSha256 = "01sh523fi46k5xwdslhnmjz128jkdw47gp9bd8gim3ay13zkcn1i"; nativeBuildInputs = [ pkgconfig ]; @@ -27,7 +32,7 @@ in rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Build and publish crates with pyo3 bindings as python packages"; - homepage = https://github.com/PyO3/maturin; + homepage = "https://github.com/PyO3/maturin"; license = licenses.mit; maintainers = [ maintainers.danieldk ]; platforms = platforms.all; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 82b415bc8a3f7..0a29577e0cdd3 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A utility intended to provide Rust code completion for editors and IDEs"; - homepage = https://github.com/racer-rust/racer; + homepage = "https://github.com/racer-rust/racer"; license = licenses.mit; maintainers = with maintainers; [ jagajaga ma27 ]; platforms = platforms.all; diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index 02b32c6485e6e..72588b37415a2 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { installPhase = '' mkdir -p $out/bin - cp -p target/release/racerd $out/bin/ + cp -p $releaseDir/racerd $out/bin/ wrapProgram $out/bin/racerd --set-default RUST_SRC_PATH "$RUST_SRC_PATH" ''; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix new file mode 100644 index 0000000000000..7eccf4d0c3782 --- /dev/null +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -0,0 +1,14 @@ +{ pkgs, callPackage }: + +{ + rust-analyzer-unwrapped = callPackage ./generic.nix rec { + rev = "2020-04-20"; + version = "unstable-${rev}"; + sha256 = "00v8b6pbm5fry6bfkrfd7phn0ps8annqrw9k71m3pd26sxnn1q5f"; + cargoSha256 = "0nd86gwlfjwdkcphpk8zvs95xxdm8p74wl7vcrx8fnvvfxnkpwmc"; + }; + + rust-analyzer = callPackage ./wrapper.nix {} { + unwrapped = pkgs.rust-analyzer-unwrapped; + }; +} diff --git a/pkgs/development/tools/rust/rust-analyzer/generic.nix b/pkgs/development/tools/rust/rust-analyzer/generic.nix new file mode 100644 index 0000000000000..de755ec17ff52 --- /dev/null +++ b/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin +, useJemalloc ? false +, doCheck ? true + +# Version specific args +, rev, version, sha256, cargoSha256 }: + +rustPlatform.buildRustPackage { + pname = "rust-analyzer-unwrapped"; + inherit version cargoSha256; + + src = fetchFromGitHub { + owner = "rust-analyzer"; + repo = "rust-analyzer"; + inherit rev sha256; + }; + + preBuild = "pushd crates/rust-analyzer"; + # Do not checking other crates in checkPhase. + preInstall = "popd"; + + cargoBuildFlags = lib.optional useJemalloc "--features=jemalloc"; + + nativeBuildInputs = lib.optionals doCheck [ rustPlatform.rustcSrc ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin + [ darwin.apple_sdk.frameworks.CoreServices ]; + + inherit doCheck; + # Skip tests running `rustup` for `cargo fmt`. + preCheck = '' + fakeRustup=$(mktemp -d) + ln -s $(command -v true) $fakeRustup/rustup + export PATH=$PATH''${PATH:+:}$fakeRustup + export RUST_SRC_PATH=${rustPlatform.rustcSrc} + ''; + + meta = with stdenv.lib; { + description = "An experimental modular compiler frontend for the Rust language"; + homepage = "https://github.com/rust-analyzer/rust-analyzer"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ oxalica ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/rust/rust-analyzer/update.sh b/pkgs/development/tools/rust/rust-analyzer/update.sh new file mode 100755 index 0000000000000..9291125425960 --- /dev/null +++ b/pkgs/development/tools/rust/rust-analyzer/update.sh @@ -0,0 +1,61 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq nix-prefetch +set -euo pipefail +cd "$(dirname "$0")" +owner=rust-analyzer +repo=rust-analyzer +nixpkgs=../../../../.. + +# Update lsp + +rev=$( + curl -s "https://api.github.com/repos/$owner/$repo/releases" | + jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output +) +old_rev=$(sed -nE 's/.*\brev = "(.*)".*/\1/p' ./default.nix) +if grep -q 'cargoSha256 = ""' ./default.nix; then + old_rev='broken' +fi +if [[ "$rev" == "$old_rev" ]]; then + echo "Up to date: $rev" + exit +fi +echo "$old_rev -> $rev" + +sha256=$(nix-prefetch -f "$nixpkgs" rust-analyzer-unwrapped.src --rev "$rev") +# Clear cargoSha256 to avoid inconsistency. +sed -e "s/rev = \".*\"/rev = \"$rev\"/" \ + -e "s/sha256 = \".*\"/sha256 = \"$sha256\"/" \ + -e "s/cargoSha256 = \".*\"/cargoSha256 = \"\"/" \ + --in-place ./default.nix +node_src="$(nix-build "$nixpkgs" -A rust-analyzer.src --no-out-link)/editors/code" + +# Check vscode compatibility +req_vscode_ver="$(jq '.engines.vscode' "$node_src/package.json" --raw-output)" +req_vscode_ver="${req_vscode_ver#^}" +cur_vscode_ver="$(nix eval --raw -f "$nixpkgs" vscode.version)" +if [[ "$(nix eval "(builtins.compareVersions \"$req_vscode_ver\" \"$cur_vscode_ver\")")" -gt 0 ]]; then + echo "vscode $cur_vscode_ver is incompatible with the extension requiring ^$req_vscode_ver" + exit 1 +fi + +echo "Prebuilding for cargoSha256" +cargo_sha256=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).rust-analyzer-unwrapped.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") +sed "s/cargoSha256 = \".*\"/cargoSha256 = \"$cargo_sha256\"/" \ + --in-place ./default.nix + +# Update vscode extension + +build_deps="../../../../misc/vscode-extensions/rust-analyzer/build-deps" +# We need devDependencies to build vsix. +jq '{ name, version, dependencies: (.dependencies + .devDependencies) }' "$node_src/package.json" \ + >"$build_deps/package.json" + +# FIXME: Lock the version of @type/vscode, the latest one (1.43.0) will cause build failure. +vscode_lock_ver="$(jq '.dependencies."@types/vscode".version' --raw-output "$node_src/package-lock.json")" +jq '.dependencies."@types/vscode" = "'$vscode_lock_ver'"' "$build_deps/package.json" >"$build_deps/package.json.new" +mv "$build_deps"/package.json{.new,} + +pushd "../../../node-packages" +./generate.sh +popd diff --git a/pkgs/development/tools/rust/rust-analyzer/wrapper.nix b/pkgs/development/tools/rust/rust-analyzer/wrapper.nix new file mode 100644 index 0000000000000..8ca3ff1a6d202 --- /dev/null +++ b/pkgs/development/tools/rust/rust-analyzer/wrapper.nix @@ -0,0 +1,16 @@ +{ lib, rustPlatform, runCommandNoCC, makeWrapper }: + +lib.makeOverridable ({ + unwrapped, + pname ? "rust-analyzer", + version ? unwrapped.version, + rustcSrc ? rustPlatform.rustcSrc, +}: runCommandNoCC "${pname}-${version}" { + inherit pname version; + inherit (unwrapped) src meta; + nativeBuildInputs = [ makeWrapper ]; +} '' + mkdir -p $out/bin + makeWrapper ${unwrapped}/bin/rust-analyzer $out/bin/rust-analyzer \ + --set-default RUST_SRC_PATH "${rustcSrc}" +'') diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 5d4e4fbeb8d9b..959eb6875ce3c 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "The Rust toolchain installer"; - homepage = https://www.rustup.rs/; + homepage = "https://www.rustup.rs/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.mic92 ]; platforms = platforms.all; diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index ecc7537267a99..733504435ec9c 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -21,7 +21,7 @@ buildRustPackage rec { meta = with stdenv.lib; { description = "Generate Rust register maps (`struct`s) from SVD files"; - homepage = https://github.com/rust-embedded/svd2rust; + homepage = "https://github.com/rust-embedded/svd2rust"; license = with licenses; [ mit asl20 ]; platforms = platforms.all; }; diff --git a/pkgs/development/tools/sass/default.nix b/pkgs/development/tools/sass/default.nix index 6d9a7f1c0805d..8c76ac4e017b9 100644 --- a/pkgs/development/tools/sass/default.nix +++ b/pkgs/development/tools/sass/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Tools and Ruby libraries for the CSS3 extension languages: Sass and SCSS"; - homepage = https://sass-lang.com; + homepage = "https://sass-lang.com"; license = licenses.mit; maintainers = with maintainers; [ romildo manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix index 07f1581e34185..373a7ea66658b 100644 --- a/pkgs/development/tools/sassc/default.nix +++ b/pkgs/development/tools/sassc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A front-end for libsass"; - homepage = https://github.com/sass/sassc/; + homepage = "https://github.com/sass/sassc/"; license = licenses.mit; maintainers = with maintainers; [ codyopel pjones ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index 4cd8b328353b3..9560d45d68153 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "A secure tunneling app for executing tests securely when testing behind firewalls"; license = licenses.unfree; - homepage = https://docs.saucelabs.com/reference/sauce-connect/; + homepage = "https://docs.saucelabs.com/reference/sauce-connect/"; maintainers = with maintainers; [offline]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/tools/scalafix/default.nix b/pkgs/development/tools/scalafix/default.nix index ab70552c2e8c5..aa3a6cfb0dcf3 100644 --- a/pkgs/development/tools/scalafix/default.nix +++ b/pkgs/development/tools/scalafix/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Refactoring and linting tool for Scala"; - homepage = https://scalacenter.github.io/scalafix/; + homepage = "https://scalacenter.github.io/scalafix/"; license = licenses.bsd3; maintainers = [ maintainers.tomahna ]; }; diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 0c2b94807c0c5..0905c27d4c1cc 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "2.4.2"; + version = "2.5.2"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0axinxfyycnmxg561n80s90swr6d0pgsw669gvpsk557nhmcclja"; + outputHash = "14sfpzhd7r8srl9qyrdfqwmgrircqsgrr5hwvg8h1vaiwakq7m00"; }; in stdenv.mkDerivation { @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Opinionated code formatter for Scala"; - homepage = http://scalameta.org/scalafmt; + homepage = "http://scalameta.org/scalafmt"; license = licenses.asl20; maintainers = [ maintainers.markus1189 ]; }; diff --git a/pkgs/development/tools/scry/default.nix b/pkgs/development/tools/scry/default.nix index 7bd3fa38332da..ed823896ad0fc 100644 --- a/pkgs/development/tools/scry/default.nix +++ b/pkgs/development/tools/scry/default.nix @@ -1,6 +1,8 @@ -{ lib, fetchFromGitHub, crystal }: +{ lib, fetchFromGitHub, crystal_0_31, coreutils, shards, makeWrapper, which }: -crystal.buildCrystalPackage rec { +let crystal = crystal_0_31; + +in crystal.buildCrystalPackage rec { pname = "scry"; version = "0.8.1"; @@ -11,9 +13,27 @@ crystal.buildCrystalPackage rec { sha256 = "0ii4k9l3dgm1c9lllc8ni9dar59lrxik0v9iz7gk3d6v62wwnq79"; }; + # we are already testing for this, so we can ignore the failures + postPatch = '' + rm spec/scry/executable_spec.cr + ''; + + format = "crystal"; + + nativeBuildInputs = [ makeWrapper ]; + shardsFile = ./shards.nix; + crystalBinaries.scry.src = "src/scry.cr"; + postFixup = '' + wrapProgram $out/bin/scry \ + --prefix PATH : ${lib.makeBinPath [ crystal coreutils ]} + ''; + + # the binary doesn't take any arguments, so this will hang + doInstallCheck = false; + meta = with lib; { description = "Code analysis server for the Crystal programming language"; homepage = "https://github.com/crystal-lang-tools/scry"; diff --git a/pkgs/development/tools/scss-lint/default.nix b/pkgs/development/tools/scss-lint/default.nix index 8d17969b55e52..866a860905c9a 100644 --- a/pkgs/development/tools/scss-lint/default.nix +++ b/pkgs/development/tools/scss-lint/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A tool to help keep your SCSS files clean and readable"; - homepage = https://github.com/brigade/scss-lint; + homepage = "https://github.com/brigade/scss-lint"; license = licenses.mit; maintainers = with maintainers; [ lovek323 nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 435588953db20..8aad3230003ee 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -6,12 +6,12 @@ let allSpecs = { x86_64-linux = { system = "linux64"; - sha256 = "0cx6x5akmawyzm5dmd3xvj9a2vg4dnai1qs1v9p4acw9hai559c8"; + sha256 = "149p43zaz45malmff1274r2bwjcyjwsdickivk3pd0mvnjbfid2r"; }; x86_64-darwin = { system = "mac64"; - sha256 = "1nh7h2wpljpblwqr0km7nzg3ky5xw6cxqmgdmgvw6qia8bryw1lj"; + sha256 = "1xpyqxpsz3r653ls67s6alv4g2vr4lxf29gyxc162ikywyrx80nr"; }; }; @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { pname = "chromedriver"; - version = "80.0.3987.16"; + version = "83.0.4103.39"; src = fetchurl { url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sites.google.com/a/chromium.org/chromedriver; + homepage = "https://sites.google.com/a/chromium.org/chromedriver"; description = "A WebDriver server for running Selenium tests on Chrome"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu maintainers.marsam ]; diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/development/tools/selenium/htmlunit-driver/default.nix index 3f4b8a22d648a..400cf24012a98 100644 --- a/pkgs/development/tools/selenium/htmlunit-driver/default.nix +++ b/pkgs/development/tools/selenium/htmlunit-driver/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = "install -D $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar"; meta = { - homepage = https://github.com/SeleniumHQ/htmlunit-driver; + homepage = "https://github.com/SeleniumHQ/htmlunit-driver"; description = "A WebDriver server for running Selenium tests on the HtmlUnit headless browser"; maintainers = with maintainers; [ coconnor offline ]; platforms = platforms.all; diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index 27e87d212e68b..bf9eabec53c03 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://selendroid.io/; + homepage = "http://selendroid.io/"; description = "Test automation for native or hybrid Android apps and the mobile web"; maintainers = with maintainers; [ offline ]; platforms = platforms.all; diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index d3a8efaadb6a8..a93275f6e2ed4 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.seleniumhq.org/; + homepage = "http://www.seleniumhq.org/"; description = "Selenium Server for remote WebDriver"; maintainers = with maintainers; [ coconnor offline ]; platforms = platforms.all; diff --git a/pkgs/development/tools/setupcfg2nix/default.nix b/pkgs/development/tools/setupcfg2nix/default.nix index 96aefe55a9533..9762862cf6180 100644 --- a/pkgs/development/tools/setupcfg2nix/default.nix +++ b/pkgs/development/tools/setupcfg2nix/default.nix @@ -11,7 +11,7 @@ buildSetupcfg rec { application = true; meta = { description = "Generate nix expressions from setup.cfg for a python package."; - homepage = https://github.com/target/setupcfg2nix; + homepage = "https://github.com/target/setupcfg2nix"; license = lib.licenses.mit; platforms = lib.platforms.all; maintainers = [ lib.maintainers.shlevy ]; diff --git a/pkgs/development/tools/shellcheck/default.nix b/pkgs/development/tools/shellcheck/default.nix index ca3e801e3ed10..568b9e1e1dddc 100644 --- a/pkgs/development/tools/shellcheck/default.nix +++ b/pkgs/development/tools/shellcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, haskellPackages, haskell }: +{ stdenv, lib, haskellPackages, haskell, pandoc }: # this wraps around the haskell package # and puts the documentation into place @@ -16,17 +16,22 @@ let in drv' // { meta = meta' // overrideFn meta'; }; bin = haskell.lib.justStaticExecutables haskellPackages.ShellCheck; - src = haskellPackages.ShellCheck.src; shellcheck = stdenv.mkDerivation { pname = "shellcheck"; version = bin.version; - inherit src; + inherit (haskellPackages.ShellCheck) meta src; + + nativeBuildInputs = [ pandoc ]; outputs = [ "bin" "man" "doc" "out" ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; + + buildPhase = '' + pandoc -s -f markdown-smart -t man shellcheck.1.md -o shellcheck.1 + ''; installPhase = '' install -Dm755 ${bin}/bin/shellcheck $bin/bin/shellcheck @@ -34,10 +39,6 @@ let install -Dm644 shellcheck.1 $man/share/man/man1/shellcheck.1 mkdir $out ''; - - # just some file copying - preferLocalBuild = true; - allowSubstitutes = false; }; in diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix index f5b1399df091e..b71e9fb3a99cb 100644 --- a/pkgs/development/tools/sigrok-cli/default.nix +++ b/pkgs/development/tools/sigrok-cli/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line frontend for the sigrok signal analysis software suite"; - homepage = https://sigrok.org/; + homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index a455f9e5fc764..83ae00ce7b665 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A lean and mean Atmel AVR simulator"; - homepage = https://github.com/buserror/simavr; + homepage = "https://github.com/buserror/simavr"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ goodrone ]; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index d1d1200344f85..7c673dea21bac 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.6.0"; + version = "1.9.1"; # rev is the ${version} commit, mainly for skaffold version command output - rev = "4cc0be23e41e37d8b1bca1464516538b2cc1bba0"; + rev = "7bac6a150c9618465f5ad38cc0a5dbc4677c39ba"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,13 +20,13 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "0wz9x3p0hfajrkm1qrhl4kw7l7r3n6xv16chl4dxigaix8ga068h"; + sha256 = "0l0x89xv5brinafrvbz6hgs5kvmpl4ajcrsjdjh3myf7i0mvh3gm"; }; nativeBuildInputs = [ installShellFiles ]; postInstall = '' for shell in bash zsh; do - $bin/bin/skaffold completion $shell > skaffold.$shell + $out/bin/skaffold completion $shell > skaffold.$shell installShellCompletion skaffold.$shell done ''; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 4425640828cc9..45b6867197ef6 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,64 +1,56 @@ { stdenv -, lib -, buildGoPackage +, buildGoModule , fetchFromGitHub , runCommand , gpgme -, libgpgerror , lvm2 , btrfs-progs , pkg-config -, libselinux , go-md2man +, installShellFiles +, makeWrapper +, fuse-overlayfs +, nixosTests }: -with stdenv.lib; - -let - version = "0.2.0"; +buildGoModule rec { + pname = "skopeo"; + version = "1.0.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "09zqzrw6f1s6kaknnj3hra3xz4nq6y86vmw5vk8p4f6g7cwakg1x"; + sha256 = "1zg0agf8x7fa8zdzfzgncm64j363lmxrqjhdzsx6mlig87k17p05"; }; - defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out"; - - goPackagePath = "github.com/containers/skopeo"; - -in -buildGoPackage { - pname = "skopeo"; - inherit version; - inherit src goPackagePath; + outputs = [ "out" "man" ]; - outputs = [ "bin" "man" "out" ]; + vendorSha256 = null; - excludedPackages = "integration"; + nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ]; - nativeBuildInputs = [ pkg-config (lib.getBin go-md2man) ]; - buildInputs = [ gpgme ] ++ lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs libselinux ]; + buildInputs = [ gpgme ] + ++ stdenv.lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; - buildFlagsArray = '' - -ldflags= - -X github.com/containers/skopeo/vendor/github.com/containers/image/v5/signature.systemDefaultPolicyPath=${defaultPolicyFile} - -X github.com/containers/skopeo/vendor/github.com/containers/image/v5/internal/tmpdir.unixTempDirForBigFiles=/tmp + buildPhase = '' + patchShebangs . + make binary-local ''; - preBuild = '' - export CGO_CFLAGS="$CFLAGS" - export CGO_LDFLAGS="$LDFLAGS" + installPhase = '' + make install-binary PREFIX=$out + make install-docs MANINSTALLDIR="$man/share/man" + installShellCompletion --bash completions/bash/skopeo ''; - postBuild = '' - # depends on buildGoPackage not changing … - pushd ./go/src/${goPackagePath} - make install-docs MANINSTALLDIR="$man/share/man" - popd + postInstall = stdenv.lib.optionals stdenv.isLinux '' + wrapProgram $out/bin/skopeo \ + --prefix PATH : ${stdenv.lib.makeBinPath [ fuse-overlayfs ]} ''; + passthru.tests.docker-tools = nixosTests.docker-tools; + meta = with stdenv.lib; { description = "A command line utility for various operations on container images and image repositories"; homepage = "https://github.com/containers/skopeo"; diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix index e0a078415eb52..7dcde72fc4b09 100644 --- a/pkgs/development/tools/solarus-quest-editor/default.nix +++ b/pkgs/development/tools/solarus-quest-editor/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { Many full-fledged games have been writen for the engine. Games can be created easily using the editor. ''; - homepage = http://www.solarus-games.org; + homepage = "http://www.solarus-games.org"; license = licenses.gpl3; maintainers = [ maintainers.Nate-Devv ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix index 3d068b06f4070..9e41f209cfd6e 100644 --- a/pkgs/development/tools/sourcetrail/default.nix +++ b/pkgs/development/tools/sourcetrail/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.sourcetrail.com; + homepage = "https://www.sourcetrail.com"; description = "A cross-platform source explorer for C/C++ and Java"; platforms = [ "x86_64-linux" ]; license = licenses.unfree; diff --git a/pkgs/development/tools/spring-boot/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix index 9e0e2b5dee483..b59ef341dffe5 100644 --- a/pkgs/development/tools/spring-boot/default.nix +++ b/pkgs/development/tools/spring-boot-cli/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchzip, jdk, makeWrapper, installShellFiles }: +{ stdenv, fetchzip, jdk, makeWrapper, installShellFiles, coreutils }: stdenv.mkDerivation rec { - pname = "spring-boot"; - version = "2.1.9"; + pname = "spring-boot-cli"; + version = "2.3.0"; src = fetchzip { - url = "https://repo.spring.io/release/org/springframework/boot/${pname}-cli/${version}.RELEASE/${pname}-cli-${version}.RELEASE-bin.zip"; - sha256 = "03iphh5l9w9sizksidkv217qnqx3nh1zpw6kdjnn40j3mlabfb7j"; + url = "https://repo.spring.io/release/org/springframework/boot/${pname}/${version}.RELEASE/${pname}-${version}.RELEASE-bin.zip"; + sha256 = "1zjbgs1qx75jgxc46x9380iqh8pfgacih38ad3qxd0106a8lcp5h"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { rm -r shell-completion cp -r . $out wrapProgram $out/bin/spring \ - --prefix JAVA_HOME : ${jdk} + --set JAVA_HOME ${jdk} \ + --set PATH /bin:${coreutils}/bin:${jdk}/bin runHook postInstall ''; @@ -28,17 +29,17 @@ stdenv.mkDerivation rec { CLI which makes it easy to create spring-based applications ''; longDescription = '' - Spring Boot makes it easy to create stand-alone, production-grade - Spring-based Applications that you can run. We take an opinionated view - of the Spring platform and third-party libraries, so that you can get - started with minimum fuss. Most Spring Boot applications need very + Spring Boot makes it easy to create stand-alone, production-grade + Spring-based Applications that you can run. We take an opinionated view + of the Spring platform and third-party libraries, so that you can get + started with minimum fuss. Most Spring Boot applications need very little Spring configuration. - You can use Spring Boot to create Java applications that can be started - by using java -jar or more traditional war deployments. We also provide + You can use Spring Boot to create Java applications that can be started + by using java -jar or more traditional war deployments. We also provide a command line tool that runs “spring scripts”. ''; - homepage = https://spring.io/projects/spring-boot; + homepage = "https://spring.io/projects/spring-boot"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ moaxcp ]; diff --git a/pkgs/development/tools/sqlint/default.nix b/pkgs/development/tools/sqlint/default.nix index d7ff9199460f9..f9c535cc2baf1 100644 --- a/pkgs/development/tools/sqlint/default.nix +++ b/pkgs/development/tools/sqlint/default.nix @@ -27,7 +27,7 @@ in bundlerApp { meta = with lib; { description = "Simple SQL linter"; - homepage = https://github.com/purcell/sqlint; + homepage = "https://github.com/purcell/sqlint"; license = licenses.mit; maintainers = with maintainers; [ ariutta nicknovitski ]; platforms = with platforms; [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix index 52c33f3e444c0..d6087cd02244f 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { by Sybase. ''; license = licenses.gpl2; - homepage = https://sourceforge.net/projects/sqsh/; + homepage = "https://sourceforge.net/projects/sqsh/"; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix index d3875ae8a6909..a6d1ce55fdb72 100644 --- a/pkgs/development/tools/sslmate/default.nix +++ b/pkgs/development/tools/sslmate/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sslmate.com; + homepage = "https://sslmate.com"; maintainers = [ maintainers.domenkozar ]; description = "Easy to buy, deploy, and manage your SSL certs"; platforms = platforms.unix; diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix index 8f4ee7ce6e53c..dacee9aa78e15 100644 --- a/pkgs/development/tools/stagit/default.nix +++ b/pkgs/development/tools/stagit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.9.1"; src = fetchgit { - url = git://git.codemadness.org/stagit; + url = "git://git.codemadness.org/stagit"; rev = version; sha256 = "0gh28spkry9wbmdj0hmvz3680fvbyzab9cifhj1p76f4fz27rnv9"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "git static site generator"; - homepage = https://git.codemadness.org/stagit/; + homepage = "https://git.codemadness.org/stagit/"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ jb55 ]; diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix index b9fc3e2d514cd..5a530c6e9f18c 100644 --- a/pkgs/development/tools/sunxi-tools/default.nix +++ b/pkgs/development/tools/sunxi-tools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tools for Allwinner SoC devices"; - homepage = http://linux-sunxi.org/; + homepage = "http://linux-sunxi.org/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ elitak ]; diff --git a/pkgs/development/tools/systemfd/Cargo.nix b/pkgs/development/tools/systemfd/Cargo.nix new file mode 100644 index 0000000000000..b6687f1e929a8 --- /dev/null +++ b/pkgs/development/tools/systemfd/Cargo.nix @@ -0,0 +1,215 @@ +# Generated by carnix 0.10.0: carnix generate-nix +{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }: +with buildRustCrateHelpers; +let inherit (lib.lists) fold; + inherit (lib.attrsets) recursiveUpdate; +in +rec { + crates = cratesIO; + systemfd = crates.crates.systemfd."0.3.0" deps; + __all = [ (systemfd {}) ]; + deps.aho_corasick."0.6.4" = { + memchr = "2.0.1"; + }; + deps.ansi_term."0.11.0" = { + winapi = "0.3.4"; + }; + deps.atty."0.2.10" = { + termion = "1.5.1"; + libc = "0.2.40"; + winapi = "0.3.4"; + }; + deps.backtrace."0.3.7" = { + cfg_if = "0.1.3"; + rustc_demangle = "0.1.8"; + backtrace_sys = "0.1.16"; + libc = "0.2.40"; + winapi = "0.3.4"; + }; + deps.backtrace_sys."0.1.16" = { + libc = "0.2.40"; + cc = "1.0.15"; + }; + deps.bitflags."1.0.3" = {}; + deps.byteorder."1.2.3" = {}; + deps.bytes."0.4.7" = { + byteorder = "1.2.3"; + iovec = "0.1.2"; + }; + deps.cc."1.0.15" = {}; + deps.cfg_if."0.1.3" = {}; + deps.clap."2.31.2" = { + atty = "0.2.10"; + bitflags = "1.0.3"; + strsim = "0.7.0"; + textwrap = "0.9.0"; + unicode_width = "0.1.4"; + vec_map = "0.8.1"; + ansi_term = "0.11.0"; + }; + deps.clicolors_control."0.2.0" = { + lazy_static = "0.2.11"; + libc = "0.2.40"; + kernel32_sys = "0.2.2"; + winapi = "0.3.4"; + }; + deps.console."0.6.1" = { + clicolors_control = "0.2.0"; + lazy_static = "0.2.11"; + libc = "0.2.40"; + parking_lot = "0.5.5"; + regex = "0.2.11"; + unicode_width = "0.1.4"; + termios = "0.2.2"; + winapi = "0.3.4"; + }; + deps.failure."0.1.1" = { + backtrace = "0.3.7"; + failure_derive = "0.1.1"; + }; + deps.failure_derive."0.1.1" = { + quote = "0.3.15"; + syn = "0.11.11"; + synstructure = "0.6.1"; + }; + deps.fuchsia_zircon."0.3.3" = { + bitflags = "1.0.3"; + fuchsia_zircon_sys = "0.3.3"; + }; + deps.fuchsia_zircon_sys."0.3.3" = {}; + deps.gcc."0.3.54" = {}; + deps.iovec."0.1.2" = { + libc = "0.2.40"; + winapi = "0.2.8"; + }; + deps.kernel32_sys."0.2.2" = { + winapi = "0.2.8"; + winapi_build = "0.1.1"; + }; + deps.lazy_static."0.2.11" = {}; + deps.lazy_static."1.0.0" = {}; + deps.libc."0.2.40" = {}; + deps.memchr."2.0.1" = { + libc = "0.2.40"; + }; + deps.nix."0.10.0" = { + bitflags = "1.0.3"; + bytes = "0.4.7"; + cfg_if = "0.1.3"; + libc = "0.2.40"; + void = "1.0.2"; + }; + deps.owning_ref."0.3.3" = { + stable_deref_trait = "1.0.0"; + }; + deps.parking_lot."0.5.5" = { + owning_ref = "0.3.3"; + parking_lot_core = "0.2.14"; + }; + deps.parking_lot_core."0.2.14" = { + rand = "0.4.2"; + smallvec = "0.6.1"; + libc = "0.2.40"; + winapi = "0.3.4"; + }; + deps.quote."0.3.15" = {}; + deps.rand."0.4.2" = { + fuchsia_zircon = "0.3.3"; + libc = "0.2.40"; + winapi = "0.3.4"; + }; + deps.redox_syscall."0.1.37" = {}; + deps.redox_termios."0.1.1" = { + redox_syscall = "0.1.37"; + }; + deps.regex."0.2.11" = { + aho_corasick = "0.6.4"; + memchr = "2.0.1"; + regex_syntax = "0.5.6"; + thread_local = "0.3.5"; + utf8_ranges = "1.0.0"; + }; + deps.regex."1.0.0" = { + aho_corasick = "0.6.4"; + memchr = "2.0.1"; + regex_syntax = "0.6.0"; + thread_local = "0.3.5"; + utf8_ranges = "1.0.0"; + }; + deps.regex_syntax."0.5.6" = { + ucd_util = "0.1.1"; + }; + deps.regex_syntax."0.6.0" = { + ucd_util = "0.1.1"; + }; + deps.rustc_demangle."0.1.8" = {}; + deps.smallvec."0.6.1" = {}; + deps.socket2."0.3.5" = { + cfg_if = "0.1.3"; + libc = "0.2.40"; + winapi = "0.3.4"; + }; + deps.stable_deref_trait."1.0.0" = {}; + deps.strsim."0.7.0" = {}; + deps.syn."0.11.11" = { + quote = "0.3.15"; + synom = "0.11.3"; + unicode_xid = "0.0.4"; + }; + deps.synom."0.11.3" = { + unicode_xid = "0.0.4"; + }; + deps.synstructure."0.6.1" = { + quote = "0.3.15"; + syn = "0.11.11"; + }; + deps.systemfd."0.3.0" = { + clap = "2.31.2"; + console = "0.6.1"; + failure = "0.1.1"; + failure_derive = "0.1.1"; + lazy_static = "1.0.0"; + libc = "0.2.40"; + regex = "1.0.0"; + nix = "0.10.0"; + socket2 = "0.3.5"; + uuid = "0.6.3"; + winapi = "0.3.4"; + }; + deps.termion."1.5.1" = { + libc = "0.2.40"; + redox_syscall = "0.1.37"; + redox_termios = "0.1.1"; + }; + deps.termios."0.2.2" = { + libc = "0.2.40"; + }; + deps.textwrap."0.9.0" = { + unicode_width = "0.1.4"; + }; + deps.thread_local."0.3.5" = { + lazy_static = "1.0.0"; + unreachable = "1.0.0"; + }; + deps.ucd_util."0.1.1" = {}; + deps.unicode_width."0.1.4" = {}; + deps.unicode_xid."0.0.4" = {}; + deps.unreachable."1.0.0" = { + void = "1.0.2"; + }; + deps.utf8_ranges."1.0.0" = {}; + deps.uuid."0.6.3" = { + cfg_if = "0.1.3"; + rand = "0.4.2"; + }; + deps.vec_map."0.8.1" = {}; + deps.void."1.0.2" = {}; + deps.winapi."0.2.8" = {}; + deps.winapi."0.3.4" = { + winapi_i686_pc_windows_gnu = "0.4.0"; + winapi_x86_64_pc_windows_gnu = "0.4.0"; + }; + deps.winapi_build."0.1.1" = {}; + deps.winapi_i686_pc_windows_gnu."0.4.0" = {}; + deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {}; +} diff --git a/pkgs/development/tools/systemfd/crates-io.list b/pkgs/development/tools/systemfd/crates-io.list new file mode 100644 index 0000000000000..0b8371f68a1e2 --- /dev/null +++ b/pkgs/development/tools/systemfd/crates-io.list @@ -0,0 +1,62 @@ +aho-corasick-0.6.4 +ansi_term-0.11.0 +atty-0.2.10 +backtrace-0.3.7 +backtrace-sys-0.1.16 +bitflags-1.0.3 +byteorder-1.2.3 +bytes-0.4.7 +cc-1.0.15 +cfg-if-0.1.3 +clap-2.31.2 +clicolors-control-0.2.0 +console-0.6.1 +failure-0.1.1 +failure_derive-0.1.1 +fuchsia-zircon-0.3.3 +fuchsia-zircon-sys-0.3.3 +gcc-0.3.54 +iovec-0.1.2 +kernel32-sys-0.2.2 +lazy_static-0.2.11 +lazy_static-1.0.0 +libc-0.2.40 +memchr-2.0.1 +nix-0.10.0 +owning_ref-0.3.3 +parking_lot-0.5.5 +parking_lot_core-0.2.14 +quote-0.3.15 +rand-0.4.2 +redox_syscall-0.1.37 +redox_termios-0.1.1 +regex-0.2.11 +regex-1.0.0 +regex-syntax-0.5.6 +regex-syntax-0.6.0 +rustc-demangle-0.1.8 +smallvec-0.6.1 +socket2-0.3.5 +stable_deref_trait-1.0.0 +strsim-0.7.0 +syn-0.11.11 +synom-0.11.3 +synstructure-0.6.1 +systemfd-0.3.0 +termion-1.5.1 +termios-0.2.2 +textwrap-0.9.0 +thread_local-0.3.5 +ucd-util-0.1.1 +unicode-width-0.1.4 +unicode-xid-0.0.4 +unreachable-1.0.0 +utf8-ranges-1.0.0 +uuid-0.6.3 +vec_map-0.8.1 +void-1.0.2 +winapi-0.2.8 +winapi-0.3.4 +winapi-build-0.1.1 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-x86_64-pc-windows-gnu-0.4.0 diff --git a/pkgs/development/tools/systemfd/crates-io.nix b/pkgs/development/tools/systemfd/crates-io.nix new file mode 100644 index 0000000000000..7e7b737b8c878 --- /dev/null +++ b/pkgs/development/tools/systemfd/crates-io.nix @@ -0,0 +1,1890 @@ +{ lib, buildRustCrate, buildRustCrateHelpers }: +with buildRustCrateHelpers; +let inherit (lib.lists) fold; + inherit (lib.attrsets) recursiveUpdate; +in +rec { + +# aho-corasick-0.6.4 + + crates.aho_corasick."0.6.4" = deps: { features?(features_.aho_corasick."0.6.4" deps {}) }: buildRustCrate { + crateName = "aho-corasick"; + version = "0.6.4"; + description = "Fast multiple substring searching with finite state machines."; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "189v919mp6rzzgjp1khpn4zlq8ls81gh43x1lmc8kbkagdlpq888"; + libName = "aho_corasick"; + crateBin = + [{ name = "aho-corasick-dot"; }]; + dependencies = mapFeatures features ([ + (crates."memchr"."${deps."aho_corasick"."0.6.4"."memchr"}" deps) + ]); + }; + features_.aho_corasick."0.6.4" = deps: f: updateFeatures f (rec { + aho_corasick."0.6.4".default = (f.aho_corasick."0.6.4".default or true); + memchr."${deps.aho_corasick."0.6.4".memchr}".default = true; + }) [ + (features_.memchr."${deps."aho_corasick"."0.6.4"."memchr"}" deps) + ]; + + +# end +# ansi_term-0.11.0 + + crates.ansi_term."0.11.0" = deps: { features?(features_.ansi_term."0.11.0" deps {}) }: buildRustCrate { + crateName = "ansi_term"; + version = "0.11.0"; + description = "Library for ANSI terminal colours and styles (bold, underline)"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" "Josh Triplett <josh@joshtriplett.org>" ]; + sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v"; + dependencies = (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."ansi_term"."0.11.0"."winapi"}" deps) + ]) else []); + }; + features_.ansi_term."0.11.0" = deps: f: updateFeatures f (rec { + ansi_term."0.11.0".default = (f.ansi_term."0.11.0".default or true); + winapi = fold recursiveUpdate {} [ + { "${deps.ansi_term."0.11.0".winapi}"."consoleapi" = true; } + { "${deps.ansi_term."0.11.0".winapi}"."errhandlingapi" = true; } + { "${deps.ansi_term."0.11.0".winapi}"."processenv" = true; } + { "${deps.ansi_term."0.11.0".winapi}".default = true; } + ]; + }) [ + (features_.winapi."${deps."ansi_term"."0.11.0"."winapi"}" deps) + ]; + + +# end +# atty-0.2.10 + + crates.atty."0.2.10" = deps: { features?(features_.atty."0.2.10" deps {}) }: buildRustCrate { + crateName = "atty"; + version = "0.2.10"; + description = "A simple interface for querying atty"; + authors = [ "softprops <d.tangren@gmail.com>" ]; + sha256 = "1h26lssj8rwaz0xhwwm5a645r49yly211amfmd243m3m0jl49i2c"; + dependencies = (if kernel == "redox" then mapFeatures features ([ + (crates."termion"."${deps."atty"."0.2.10"."termion"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."atty"."0.2.10"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."atty"."0.2.10"."winapi"}" deps) + ]) else []); + }; + features_.atty."0.2.10" = deps: f: updateFeatures f (rec { + atty."0.2.10".default = (f.atty."0.2.10".default or true); + libc."${deps.atty."0.2.10".libc}".default = (f.libc."${deps.atty."0.2.10".libc}".default or false); + termion."${deps.atty."0.2.10".termion}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.atty."0.2.10".winapi}"."consoleapi" = true; } + { "${deps.atty."0.2.10".winapi}"."minwinbase" = true; } + { "${deps.atty."0.2.10".winapi}"."minwindef" = true; } + { "${deps.atty."0.2.10".winapi}"."processenv" = true; } + { "${deps.atty."0.2.10".winapi}"."winbase" = true; } + { "${deps.atty."0.2.10".winapi}".default = true; } + ]; + }) [ + (features_.termion."${deps."atty"."0.2.10"."termion"}" deps) + (features_.libc."${deps."atty"."0.2.10"."libc"}" deps) + (features_.winapi."${deps."atty"."0.2.10"."winapi"}" deps) + ]; + + +# end +# backtrace-0.3.7 + + crates.backtrace."0.3.7" = deps: { features?(features_.backtrace."0.3.7" deps {}) }: buildRustCrate { + crateName = "backtrace"; + version = "0.3.7"; + description = "A library to acquire a stack trace (backtrace) at runtime in a Rust program.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" "The Rust Project Developers" ]; + sha256 = "00zzcgacv516dlhxkrdw4c8vsx3bwkkdrrzi5pnxrhpd87ambjwn"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."backtrace"."0.3.7"."cfg_if"}" deps) + (crates."rustc_demangle"."${deps."backtrace"."0.3.7"."rustc_demangle"}" deps) + ]) + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ + ] + ++ (if features.backtrace."0.3.7".backtrace-sys or false then [ (crates.backtrace_sys."${deps."backtrace"."0.3.7".backtrace_sys}" deps) ] else [])) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."backtrace"."0.3.7"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + ] + ++ (if features.backtrace."0.3.7".winapi or false then [ (crates.winapi."${deps."backtrace"."0.3.7".winapi}" deps) ] else [])) else []); + features = mkFeatures (features."backtrace"."0.3.7" or {}); + }; + features_.backtrace."0.3.7" = deps: f: updateFeatures f (rec { + backtrace = fold recursiveUpdate {} [ + { "0.3.7"."addr2line" = + (f.backtrace."0.3.7"."addr2line" or false) || + (f.backtrace."0.3.7".gimli-symbolize or false) || + (backtrace."0.3.7"."gimli-symbolize" or false); } + { "0.3.7"."backtrace-sys" = + (f.backtrace."0.3.7"."backtrace-sys" or false) || + (f.backtrace."0.3.7".libbacktrace or false) || + (backtrace."0.3.7"."libbacktrace" or false); } + { "0.3.7"."coresymbolication" = + (f.backtrace."0.3.7"."coresymbolication" or false) || + (f.backtrace."0.3.7".default or false) || + (backtrace."0.3.7"."default" or false); } + { "0.3.7"."dbghelp" = + (f.backtrace."0.3.7"."dbghelp" or false) || + (f.backtrace."0.3.7".default or false) || + (backtrace."0.3.7"."default" or false); } + { "0.3.7"."dladdr" = + (f.backtrace."0.3.7"."dladdr" or false) || + (f.backtrace."0.3.7".default or false) || + (backtrace."0.3.7"."default" or false); } + { "0.3.7"."findshlibs" = + (f.backtrace."0.3.7"."findshlibs" or false) || + (f.backtrace."0.3.7".gimli-symbolize or false) || + (backtrace."0.3.7"."gimli-symbolize" or false); } + { "0.3.7"."gimli" = + (f.backtrace."0.3.7"."gimli" or false) || + (f.backtrace."0.3.7".gimli-symbolize or false) || + (backtrace."0.3.7"."gimli-symbolize" or false); } + { "0.3.7"."libbacktrace" = + (f.backtrace."0.3.7"."libbacktrace" or false) || + (f.backtrace."0.3.7".default or false) || + (backtrace."0.3.7"."default" or false); } + { "0.3.7"."libunwind" = + (f.backtrace."0.3.7"."libunwind" or false) || + (f.backtrace."0.3.7".default or false) || + (backtrace."0.3.7"."default" or false); } + { "0.3.7"."memmap" = + (f.backtrace."0.3.7"."memmap" or false) || + (f.backtrace."0.3.7".gimli-symbolize or false) || + (backtrace."0.3.7"."gimli-symbolize" or false); } + { "0.3.7"."object" = + (f.backtrace."0.3.7"."object" or false) || + (f.backtrace."0.3.7".gimli-symbolize or false) || + (backtrace."0.3.7"."gimli-symbolize" or false); } + { "0.3.7"."rustc-serialize" = + (f.backtrace."0.3.7"."rustc-serialize" or false) || + (f.backtrace."0.3.7".serialize-rustc or false) || + (backtrace."0.3.7"."serialize-rustc" or false); } + { "0.3.7"."serde" = + (f.backtrace."0.3.7"."serde" or false) || + (f.backtrace."0.3.7".serialize-serde or false) || + (backtrace."0.3.7"."serialize-serde" or false); } + { "0.3.7"."serde_derive" = + (f.backtrace."0.3.7"."serde_derive" or false) || + (f.backtrace."0.3.7".serialize-serde or false) || + (backtrace."0.3.7"."serialize-serde" or false); } + { "0.3.7"."winapi" = + (f.backtrace."0.3.7"."winapi" or false) || + (f.backtrace."0.3.7".dbghelp or false) || + (backtrace."0.3.7"."dbghelp" or false); } + { "0.3.7".default = (f.backtrace."0.3.7".default or true); } + ]; + backtrace_sys."${deps.backtrace."0.3.7".backtrace_sys}".default = true; + cfg_if."${deps.backtrace."0.3.7".cfg_if}".default = true; + libc."${deps.backtrace."0.3.7".libc}".default = true; + rustc_demangle."${deps.backtrace."0.3.7".rustc_demangle}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.backtrace."0.3.7".winapi}"."dbghelp" = true; } + { "${deps.backtrace."0.3.7".winapi}"."minwindef" = true; } + { "${deps.backtrace."0.3.7".winapi}"."processthreadsapi" = true; } + { "${deps.backtrace."0.3.7".winapi}"."std" = true; } + { "${deps.backtrace."0.3.7".winapi}"."winnt" = true; } + { "${deps.backtrace."0.3.7".winapi}".default = true; } + ]; + }) [ + (features_.cfg_if."${deps."backtrace"."0.3.7"."cfg_if"}" deps) + (features_.rustc_demangle."${deps."backtrace"."0.3.7"."rustc_demangle"}" deps) + (features_.backtrace_sys."${deps."backtrace"."0.3.7"."backtrace_sys"}" deps) + (features_.libc."${deps."backtrace"."0.3.7"."libc"}" deps) + (features_.winapi."${deps."backtrace"."0.3.7"."winapi"}" deps) + ]; + + +# end +# backtrace-sys-0.1.16 + + crates.backtrace_sys."0.1.16" = deps: { features?(features_.backtrace_sys."0.1.16" deps {}) }: buildRustCrate { + crateName = "backtrace-sys"; + version = "0.1.16"; + description = "Bindings to the libbacktrace gcc library\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "1cn2c8q3dn06crmnk0p62czkngam4l8nf57wy33nz1y5g25pszwy"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."backtrace_sys"."0.1.16"."libc"}" deps) + ]); + + buildDependencies = mapFeatures features ([ + (crates."cc"."${deps."backtrace_sys"."0.1.16"."cc"}" deps) + ]); + }; + features_.backtrace_sys."0.1.16" = deps: f: updateFeatures f (rec { + backtrace_sys."0.1.16".default = (f.backtrace_sys."0.1.16".default or true); + cc."${deps.backtrace_sys."0.1.16".cc}".default = true; + libc."${deps.backtrace_sys."0.1.16".libc}".default = true; + }) [ + (features_.libc."${deps."backtrace_sys"."0.1.16"."libc"}" deps) + (features_.cc."${deps."backtrace_sys"."0.1.16"."cc"}" deps) + ]; + + +# end +# bitflags-1.0.3 + + crates.bitflags."1.0.3" = deps: { features?(features_.bitflags."1.0.3" deps {}) }: buildRustCrate { + crateName = "bitflags"; + version = "1.0.3"; + description = "A macro to generate structures which behave like bitflags.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "162p4w4h1ad76awq6b5yivmls3d50m9cl27d8g588lsps6g8s5rw"; + features = mkFeatures (features."bitflags"."1.0.3" or {}); + }; + features_.bitflags."1.0.3" = deps: f: updateFeatures f (rec { + bitflags."1.0.3".default = (f.bitflags."1.0.3".default or true); + }) []; + + +# end +# byteorder-1.2.3 + + crates.byteorder."1.2.3" = deps: { features?(features_.byteorder."1.2.3" deps {}) }: buildRustCrate { + crateName = "byteorder"; + version = "1.2.3"; + description = "Library for reading/writing numbers in big-endian and little-endian."; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "1xghv5f5rydzsam8lnfqhfk090i8a1knb77ikbs0ik44bvrw2ij3"; + features = mkFeatures (features."byteorder"."1.2.3" or {}); + }; + features_.byteorder."1.2.3" = deps: f: updateFeatures f (rec { + byteorder = fold recursiveUpdate {} [ + { "1.2.3"."std" = + (f.byteorder."1.2.3"."std" or false) || + (f.byteorder."1.2.3".default or false) || + (byteorder."1.2.3"."default" or false); } + { "1.2.3".default = (f.byteorder."1.2.3".default or true); } + ]; + }) []; + + +# end +# bytes-0.4.7 + + crates.bytes."0.4.7" = deps: { features?(features_.bytes."0.4.7" deps {}) }: buildRustCrate { + crateName = "bytes"; + version = "0.4.7"; + description = "Types and traits for working with bytes"; + authors = [ "Carl Lerche <me@carllerche.com>" ]; + sha256 = "1icr74r099d0c0a2q1pz51182z7911g92h2j60al351kz78dzv3f"; + dependencies = mapFeatures features ([ + (crates."byteorder"."${deps."bytes"."0.4.7"."byteorder"}" deps) + (crates."iovec"."${deps."bytes"."0.4.7"."iovec"}" deps) + ]); + }; + features_.bytes."0.4.7" = deps: f: updateFeatures f (rec { + byteorder."${deps.bytes."0.4.7".byteorder}".default = true; + bytes."0.4.7".default = (f.bytes."0.4.7".default or true); + iovec."${deps.bytes."0.4.7".iovec}".default = true; + }) [ + (features_.byteorder."${deps."bytes"."0.4.7"."byteorder"}" deps) + (features_.iovec."${deps."bytes"."0.4.7"."iovec"}" deps) + ]; + + +# end +# cc-1.0.15 + + crates.cc."1.0.15" = deps: { features?(features_.cc."1.0.15" deps {}) }: buildRustCrate { + crateName = "cc"; + version = "1.0.15"; + description = "A build-time dependency for Cargo build scripts to assist in invoking the native\nC compiler to compile native C code into a static archive to be linked into Rust\ncode.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "1zmcv4zf888byhay2qakqlc9b8snhy5ccfs35zb6flywmlj8f2c0"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."cc"."1.0.15" or {}); + }; + features_.cc."1.0.15" = deps: f: updateFeatures f (rec { + cc = fold recursiveUpdate {} [ + { "1.0.15"."rayon" = + (f.cc."1.0.15"."rayon" or false) || + (f.cc."1.0.15".parallel or false) || + (cc."1.0.15"."parallel" or false); } + { "1.0.15".default = (f.cc."1.0.15".default or true); } + ]; + }) []; + + +# end +# cfg-if-0.1.3 + + crates.cfg_if."0.1.3" = deps: { features?(features_.cfg_if."0.1.3" deps {}) }: buildRustCrate { + crateName = "cfg-if"; + version = "0.1.3"; + description = "A macro to ergonomically define an item depending on a large number of #[cfg]\nparameters. Structured like an if-else chain, the first matching branch is the\nitem that gets emitted.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "0hphfz5qg40gr5p18gmgy2rzkqj019lii3n0dy3s0a6lnl9106k6"; + }; + features_.cfg_if."0.1.3" = deps: f: updateFeatures f (rec { + cfg_if."0.1.3".default = (f.cfg_if."0.1.3".default or true); + }) []; + + +# end +# clap-2.31.2 + + crates.clap."2.31.2" = deps: { features?(features_.clap."2.31.2" deps {}) }: buildRustCrate { + crateName = "clap"; + version = "2.31.2"; + description = "A simple to use, efficient, and full featured Command Line Argument Parser\n"; + authors = [ "Kevin K. <kbknapp@gmail.com>" ]; + sha256 = "0r24ziw85a8y1sf2l21y4mvv5qan3rjafcshpyfsjfadqfxsij72"; + dependencies = mapFeatures features ([ + (crates."bitflags"."${deps."clap"."2.31.2"."bitflags"}" deps) + (crates."textwrap"."${deps."clap"."2.31.2"."textwrap"}" deps) + (crates."unicode_width"."${deps."clap"."2.31.2"."unicode_width"}" deps) + ] + ++ (if features.clap."2.31.2".atty or false then [ (crates.atty."${deps."clap"."2.31.2".atty}" deps) ] else []) + ++ (if features.clap."2.31.2".strsim or false then [ (crates.strsim."${deps."clap"."2.31.2".strsim}" deps) ] else []) + ++ (if features.clap."2.31.2".vec_map or false then [ (crates.vec_map."${deps."clap"."2.31.2".vec_map}" deps) ] else [])) + ++ (if !(kernel == "windows") then mapFeatures features ([ + ] + ++ (if features.clap."2.31.2".ansi_term or false then [ (crates.ansi_term."${deps."clap"."2.31.2".ansi_term}" deps) ] else [])) else []); + features = mkFeatures (features."clap"."2.31.2" or {}); + }; + features_.clap."2.31.2" = deps: f: updateFeatures f (rec { + ansi_term."${deps.clap."2.31.2".ansi_term}".default = true; + atty."${deps.clap."2.31.2".atty}".default = true; + bitflags."${deps.clap."2.31.2".bitflags}".default = true; + clap = fold recursiveUpdate {} [ + { "2.31.2"."ansi_term" = + (f.clap."2.31.2"."ansi_term" or false) || + (f.clap."2.31.2".color or false) || + (clap."2.31.2"."color" or false); } + { "2.31.2"."atty" = + (f.clap."2.31.2"."atty" or false) || + (f.clap."2.31.2".color or false) || + (clap."2.31.2"."color" or false); } + { "2.31.2"."clippy" = + (f.clap."2.31.2"."clippy" or false) || + (f.clap."2.31.2".lints or false) || + (clap."2.31.2"."lints" or false); } + { "2.31.2"."color" = + (f.clap."2.31.2"."color" or false) || + (f.clap."2.31.2".default or false) || + (clap."2.31.2"."default" or false); } + { "2.31.2"."strsim" = + (f.clap."2.31.2"."strsim" or false) || + (f.clap."2.31.2".suggestions or false) || + (clap."2.31.2"."suggestions" or false); } + { "2.31.2"."suggestions" = + (f.clap."2.31.2"."suggestions" or false) || + (f.clap."2.31.2".default or false) || + (clap."2.31.2"."default" or false); } + { "2.31.2"."term_size" = + (f.clap."2.31.2"."term_size" or false) || + (f.clap."2.31.2".wrap_help or false) || + (clap."2.31.2"."wrap_help" or false); } + { "2.31.2"."vec_map" = + (f.clap."2.31.2"."vec_map" or false) || + (f.clap."2.31.2".default or false) || + (clap."2.31.2"."default" or false); } + { "2.31.2"."yaml" = + (f.clap."2.31.2"."yaml" or false) || + (f.clap."2.31.2".doc or false) || + (clap."2.31.2"."doc" or false); } + { "2.31.2"."yaml-rust" = + (f.clap."2.31.2"."yaml-rust" or false) || + (f.clap."2.31.2".yaml or false) || + (clap."2.31.2"."yaml" or false); } + { "2.31.2".default = (f.clap."2.31.2".default or true); } + ]; + strsim."${deps.clap."2.31.2".strsim}".default = true; + textwrap = fold recursiveUpdate {} [ + { "${deps.clap."2.31.2".textwrap}"."term_size" = + (f.textwrap."${deps.clap."2.31.2".textwrap}"."term_size" or false) || + (clap."2.31.2"."wrap_help" or false) || + (f."clap"."2.31.2"."wrap_help" or false); } + { "${deps.clap."2.31.2".textwrap}".default = true; } + ]; + unicode_width."${deps.clap."2.31.2".unicode_width}".default = true; + vec_map."${deps.clap."2.31.2".vec_map}".default = true; + }) [ + (features_.atty."${deps."clap"."2.31.2"."atty"}" deps) + (features_.bitflags."${deps."clap"."2.31.2"."bitflags"}" deps) + (features_.strsim."${deps."clap"."2.31.2"."strsim"}" deps) + (features_.textwrap."${deps."clap"."2.31.2"."textwrap"}" deps) + (features_.unicode_width."${deps."clap"."2.31.2"."unicode_width"}" deps) + (features_.vec_map."${deps."clap"."2.31.2"."vec_map"}" deps) + (features_.ansi_term."${deps."clap"."2.31.2"."ansi_term"}" deps) + ]; + + +# end +# clicolors-control-0.2.0 + + crates.clicolors_control."0.2.0" = deps: { features?(features_.clicolors_control."0.2.0" deps {}) }: buildRustCrate { + crateName = "clicolors-control"; + version = "0.2.0"; + description = "A common utility library to control CLI colorization"; + authors = [ "Armin Ronacher <armin.ronacher@active-4.com>" ]; + sha256 = "0p1fbs7k70h58ycahmin7b87c0xn6lc94xmh9jw4gxi40mnrvdkp"; + dependencies = mapFeatures features ([ + (crates."lazy_static"."${deps."clicolors_control"."0.2.0"."lazy_static"}" deps) + ]) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."clicolors_control"."0.2.0"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."kernel32_sys"."${deps."clicolors_control"."0.2.0"."kernel32_sys"}" deps) + (crates."winapi"."${deps."clicolors_control"."0.2.0"."winapi"}" deps) + ]) else []); + features = mkFeatures (features."clicolors_control"."0.2.0" or {}); + }; + features_.clicolors_control."0.2.0" = deps: f: updateFeatures f (rec { + clicolors_control = fold recursiveUpdate {} [ + { "0.2.0"."terminal_autoconfig" = + (f.clicolors_control."0.2.0"."terminal_autoconfig" or false) || + (f.clicolors_control."0.2.0".default or false) || + (clicolors_control."0.2.0"."default" or false); } + { "0.2.0".default = (f.clicolors_control."0.2.0".default or true); } + ]; + kernel32_sys."${deps.clicolors_control."0.2.0".kernel32_sys}".default = true; + lazy_static."${deps.clicolors_control."0.2.0".lazy_static}".default = true; + libc."${deps.clicolors_control."0.2.0".libc}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.clicolors_control."0.2.0".winapi}"."consoleapi" = true; } + { "${deps.clicolors_control."0.2.0".winapi}"."handleapi" = true; } + { "${deps.clicolors_control."0.2.0".winapi}"."processenv" = true; } + { "${deps.clicolors_control."0.2.0".winapi}"."winbase" = true; } + { "${deps.clicolors_control."0.2.0".winapi}".default = true; } + ]; + }) [ + (features_.lazy_static."${deps."clicolors_control"."0.2.0"."lazy_static"}" deps) + (features_.libc."${deps."clicolors_control"."0.2.0"."libc"}" deps) + (features_.kernel32_sys."${deps."clicolors_control"."0.2.0"."kernel32_sys"}" deps) + (features_.winapi."${deps."clicolors_control"."0.2.0"."winapi"}" deps) + ]; + + +# end +# console-0.6.1 + + crates.console."0.6.1" = deps: { features?(features_.console."0.6.1" deps {}) }: buildRustCrate { + crateName = "console"; + version = "0.6.1"; + description = "A terminal and console abstraction for Rust"; + authors = [ "Armin Ronacher <armin.ronacher@active-4.com>" ]; + sha256 = "0h46m3nlx7m2pmc1ia2nlbl8d1vp46kqh2c82hx9ckjag68g4zdl"; + dependencies = mapFeatures features ([ + (crates."clicolors_control"."${deps."console"."0.6.1"."clicolors_control"}" deps) + (crates."lazy_static"."${deps."console"."0.6.1"."lazy_static"}" deps) + (crates."libc"."${deps."console"."0.6.1"."libc"}" deps) + (crates."parking_lot"."${deps."console"."0.6.1"."parking_lot"}" deps) + (crates."regex"."${deps."console"."0.6.1"."regex"}" deps) + (crates."unicode_width"."${deps."console"."0.6.1"."unicode_width"}" deps) + ]) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."termios"."${deps."console"."0.6.1"."termios"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."console"."0.6.1"."winapi"}" deps) + ]) else []); + }; + features_.console."0.6.1" = deps: f: updateFeatures f (rec { + clicolors_control."${deps.console."0.6.1".clicolors_control}".default = true; + console."0.6.1".default = (f.console."0.6.1".default or true); + lazy_static."${deps.console."0.6.1".lazy_static}".default = true; + libc."${deps.console."0.6.1".libc}".default = true; + parking_lot."${deps.console."0.6.1".parking_lot}".default = true; + regex."${deps.console."0.6.1".regex}".default = true; + termios."${deps.console."0.6.1".termios}".default = true; + unicode_width."${deps.console."0.6.1".unicode_width}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.console."0.6.1".winapi}"."consoleapi" = true; } + { "${deps.console."0.6.1".winapi}"."processenv" = true; } + { "${deps.console."0.6.1".winapi}"."winbase" = true; } + { "${deps.console."0.6.1".winapi}"."wincon" = true; } + { "${deps.console."0.6.1".winapi}"."winuser" = true; } + { "${deps.console."0.6.1".winapi}".default = true; } + ]; + }) [ + (features_.clicolors_control."${deps."console"."0.6.1"."clicolors_control"}" deps) + (features_.lazy_static."${deps."console"."0.6.1"."lazy_static"}" deps) + (features_.libc."${deps."console"."0.6.1"."libc"}" deps) + (features_.parking_lot."${deps."console"."0.6.1"."parking_lot"}" deps) + (features_.regex."${deps."console"."0.6.1"."regex"}" deps) + (features_.unicode_width."${deps."console"."0.6.1"."unicode_width"}" deps) + (features_.termios."${deps."console"."0.6.1"."termios"}" deps) + (features_.winapi."${deps."console"."0.6.1"."winapi"}" deps) + ]; + + +# end +# failure-0.1.1 + + crates.failure."0.1.1" = deps: { features?(features_.failure."0.1.1" deps {}) }: buildRustCrate { + crateName = "failure"; + version = "0.1.1"; + description = "Experimental error handling abstraction."; + authors = [ "Without Boats <boats@mozilla.com>" ]; + sha256 = "0gf9cmkm9kc163sszgjksqp5pcgj689lnf2104nn4h4is18nhigk"; + dependencies = mapFeatures features ([ + ] + ++ (if features.failure."0.1.1".backtrace or false then [ (crates.backtrace."${deps."failure"."0.1.1".backtrace}" deps) ] else []) + ++ (if features.failure."0.1.1".failure_derive or false then [ (crates.failure_derive."${deps."failure"."0.1.1".failure_derive}" deps) ] else [])); + features = mkFeatures (features."failure"."0.1.1" or {}); + }; + features_.failure."0.1.1" = deps: f: updateFeatures f (rec { + backtrace."${deps.failure."0.1.1".backtrace}".default = true; + failure = fold recursiveUpdate {} [ + { "0.1.1"."backtrace" = + (f.failure."0.1.1"."backtrace" or false) || + (f.failure."0.1.1".std or false) || + (failure."0.1.1"."std" or false); } + { "0.1.1"."derive" = + (f.failure."0.1.1"."derive" or false) || + (f.failure."0.1.1".default or false) || + (failure."0.1.1"."default" or false); } + { "0.1.1"."failure_derive" = + (f.failure."0.1.1"."failure_derive" or false) || + (f.failure."0.1.1".derive or false) || + (failure."0.1.1"."derive" or false); } + { "0.1.1"."std" = + (f.failure."0.1.1"."std" or false) || + (f.failure."0.1.1".default or false) || + (failure."0.1.1"."default" or false); } + { "0.1.1".default = (f.failure."0.1.1".default or true); } + ]; + failure_derive."${deps.failure."0.1.1".failure_derive}".default = true; + }) [ + (features_.backtrace."${deps."failure"."0.1.1"."backtrace"}" deps) + (features_.failure_derive."${deps."failure"."0.1.1"."failure_derive"}" deps) + ]; + + +# end +# failure_derive-0.1.1 + + crates.failure_derive."0.1.1" = deps: { features?(features_.failure_derive."0.1.1" deps {}) }: buildRustCrate { + crateName = "failure_derive"; + version = "0.1.1"; + description = "derives for the failure crate"; + authors = [ "Without Boats <woboats@gmail.com>" ]; + sha256 = "1w895q4pbyx3rwnhgjwfcayk9ghbi166wc1c3553qh8zkbz52k8i"; + procMacro = true; + dependencies = mapFeatures features ([ + (crates."quote"."${deps."failure_derive"."0.1.1"."quote"}" deps) + (crates."syn"."${deps."failure_derive"."0.1.1"."syn"}" deps) + (crates."synstructure"."${deps."failure_derive"."0.1.1"."synstructure"}" deps) + ]); + features = mkFeatures (features."failure_derive"."0.1.1" or {}); + }; + features_.failure_derive."0.1.1" = deps: f: updateFeatures f (rec { + failure_derive = fold recursiveUpdate {} [ + { "0.1.1"."std" = + (f.failure_derive."0.1.1"."std" or false) || + (f.failure_derive."0.1.1".default or false) || + (failure_derive."0.1.1"."default" or false); } + { "0.1.1".default = (f.failure_derive."0.1.1".default or true); } + ]; + quote."${deps.failure_derive."0.1.1".quote}".default = true; + syn."${deps.failure_derive."0.1.1".syn}".default = true; + synstructure."${deps.failure_derive."0.1.1".synstructure}".default = true; + }) [ + (features_.quote."${deps."failure_derive"."0.1.1"."quote"}" deps) + (features_.syn."${deps."failure_derive"."0.1.1"."syn"}" deps) + (features_.synstructure."${deps."failure_derive"."0.1.1"."synstructure"}" deps) + ]; + + +# end +# fuchsia-zircon-0.3.3 + + crates.fuchsia_zircon."0.3.3" = deps: { features?(features_.fuchsia_zircon."0.3.3" deps {}) }: buildRustCrate { + crateName = "fuchsia-zircon"; + version = "0.3.3"; + description = "Rust bindings for the Zircon kernel"; + authors = [ "Raph Levien <raph@google.com>" ]; + sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk"; + dependencies = mapFeatures features ([ + (crates."bitflags"."${deps."fuchsia_zircon"."0.3.3"."bitflags"}" deps) + (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) + ]); + }; + features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec { + bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true; + fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true); + fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true; + }) [ + (features_.bitflags."${deps."fuchsia_zircon"."0.3.3"."bitflags"}" deps) + (features_.fuchsia_zircon_sys."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) + ]; + + +# end +# fuchsia-zircon-sys-0.3.3 + + crates.fuchsia_zircon_sys."0.3.3" = deps: { features?(features_.fuchsia_zircon_sys."0.3.3" deps {}) }: buildRustCrate { + crateName = "fuchsia-zircon-sys"; + version = "0.3.3"; + description = "Low-level Rust bindings for the Zircon kernel"; + authors = [ "Raph Levien <raph@google.com>" ]; + sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; + }; + features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec { + fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true); + }) []; + + +# end +# gcc-0.3.54 + + crates.gcc."0.3.54" = deps: { features?(features_.gcc."0.3.54" deps {}) }: buildRustCrate { + crateName = "gcc"; + version = "0.3.54"; + description = "A build-time dependency for Cargo build scripts to assist in invoking the native\nC compiler to compile native C code into a static archive to be linked into Rust\ncode.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "07a5i47r8achc6gxsba3ga17h9gnh4b9a2cak8vjg4hx62aajkr4"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."gcc"."0.3.54" or {}); + }; + features_.gcc."0.3.54" = deps: f: updateFeatures f (rec { + gcc = fold recursiveUpdate {} [ + { "0.3.54"."rayon" = + (f.gcc."0.3.54"."rayon" or false) || + (f.gcc."0.3.54".parallel or false) || + (gcc."0.3.54"."parallel" or false); } + { "0.3.54".default = (f.gcc."0.3.54".default or true); } + ]; + }) []; + + +# end +# iovec-0.1.2 + + crates.iovec."0.1.2" = deps: { features?(features_.iovec."0.1.2" deps {}) }: buildRustCrate { + crateName = "iovec"; + version = "0.1.2"; + description = "Portable buffer type for scatter/gather I/O operations\n"; + authors = [ "Carl Lerche <me@carllerche.com>" ]; + sha256 = "0vjymmb7wj4v4kza5jjn48fcdb85j3k37y7msjl3ifz0p9yiyp2r"; + dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."iovec"."0.1.2"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."iovec"."0.1.2"."winapi"}" deps) + ]) else []); + }; + features_.iovec."0.1.2" = deps: f: updateFeatures f (rec { + iovec."0.1.2".default = (f.iovec."0.1.2".default or true); + libc."${deps.iovec."0.1.2".libc}".default = true; + winapi."${deps.iovec."0.1.2".winapi}".default = true; + }) [ + (features_.libc."${deps."iovec"."0.1.2"."libc"}" deps) + (features_.winapi."${deps."iovec"."0.1.2"."winapi"}" deps) + ]; + + +# end +# kernel32-sys-0.2.2 + + crates.kernel32_sys."0.2.2" = deps: { features?(features_.kernel32_sys."0.2.2" deps {}) }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + description = "Contains function definitions for the Windows API library kernel32. See winapi for types and constants."; + authors = [ "Peter Atashian <retep998@gmail.com>" ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."winapi"."${deps."kernel32_sys"."0.2.2"."winapi"}" deps) + ]); + + buildDependencies = mapFeatures features ([ + (crates."winapi_build"."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps) + ]); + }; + features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f (rec { + kernel32_sys."0.2.2".default = (f.kernel32_sys."0.2.2".default or true); + winapi."${deps.kernel32_sys."0.2.2".winapi}".default = true; + winapi_build."${deps.kernel32_sys."0.2.2".winapi_build}".default = true; + }) [ + (features_.winapi."${deps."kernel32_sys"."0.2.2"."winapi"}" deps) + (features_.winapi_build."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps) + ]; + + +# end +# lazy_static-0.2.11 + + crates.lazy_static."0.2.11" = deps: { features?(features_.lazy_static."0.2.11" deps {}) }: buildRustCrate { + crateName = "lazy_static"; + version = "0.2.11"; + description = "A macro for declaring lazily evaluated statics in Rust."; + authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; + sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."lazy_static"."0.2.11" or {}); + }; + features_.lazy_static."0.2.11" = deps: f: updateFeatures f (rec { + lazy_static = fold recursiveUpdate {} [ + { "0.2.11"."compiletest_rs" = + (f.lazy_static."0.2.11"."compiletest_rs" or false) || + (f.lazy_static."0.2.11".compiletest or false) || + (lazy_static."0.2.11"."compiletest" or false); } + { "0.2.11"."nightly" = + (f.lazy_static."0.2.11"."nightly" or false) || + (f.lazy_static."0.2.11".spin_no_std or false) || + (lazy_static."0.2.11"."spin_no_std" or false); } + { "0.2.11"."spin" = + (f.lazy_static."0.2.11"."spin" or false) || + (f.lazy_static."0.2.11".spin_no_std or false) || + (lazy_static."0.2.11"."spin_no_std" or false); } + { "0.2.11".default = (f.lazy_static."0.2.11".default or true); } + ]; + }) []; + + +# end +# lazy_static-1.0.0 + + crates.lazy_static."1.0.0" = deps: { features?(features_.lazy_static."1.0.0" deps {}) }: buildRustCrate { + crateName = "lazy_static"; + version = "1.0.0"; + description = "A macro for declaring lazily evaluated statics in Rust."; + authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; + sha256 = "0wfvqyr2nvx2mbsrscg5y7gfa9skhb8p72ayanl8vl49pw24v4fh"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."lazy_static"."1.0.0" or {}); + }; + features_.lazy_static."1.0.0" = deps: f: updateFeatures f (rec { + lazy_static = fold recursiveUpdate {} [ + { "1.0.0"."compiletest_rs" = + (f.lazy_static."1.0.0"."compiletest_rs" or false) || + (f.lazy_static."1.0.0".compiletest or false) || + (lazy_static."1.0.0"."compiletest" or false); } + { "1.0.0"."nightly" = + (f.lazy_static."1.0.0"."nightly" or false) || + (f.lazy_static."1.0.0".spin_no_std or false) || + (lazy_static."1.0.0"."spin_no_std" or false); } + { "1.0.0"."spin" = + (f.lazy_static."1.0.0"."spin" or false) || + (f.lazy_static."1.0.0".spin_no_std or false) || + (lazy_static."1.0.0"."spin_no_std" or false); } + { "1.0.0".default = (f.lazy_static."1.0.0".default or true); } + ]; + }) []; + + +# end +# libc-0.2.40 + + crates.libc."0.2.40" = deps: { features?(features_.libc."0.2.40" deps {}) }: buildRustCrate { + crateName = "libc"; + version = "0.2.40"; + description = "A library for types and bindings to native C functions often found in libc or\nother common platform libraries.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1xfc39237ldzgr8x8wcflgdr8zssi3wif7g2zxc02d94gzkjsw83"; + features = mkFeatures (features."libc"."0.2.40" or {}); + }; + features_.libc."0.2.40" = deps: f: updateFeatures f (rec { + libc = fold recursiveUpdate {} [ + { "0.2.40"."use_std" = + (f.libc."0.2.40"."use_std" or false) || + (f.libc."0.2.40".default or false) || + (libc."0.2.40"."default" or false); } + { "0.2.40".default = (f.libc."0.2.40".default or true); } + ]; + }) []; + + +# end +# memchr-2.0.1 + + crates.memchr."2.0.1" = deps: { features?(features_.memchr."2.0.1" deps {}) }: buildRustCrate { + crateName = "memchr"; + version = "2.0.1"; + description = "Safe interface to memchr."; + authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ]; + sha256 = "0ls2y47rjwapjdax6bp974gdp06ggm1v8d1h69wyydmh1nhgm5gr"; + dependencies = mapFeatures features ([ + ] + ++ (if features.memchr."2.0.1".libc or false then [ (crates.libc."${deps."memchr"."2.0.1".libc}" deps) ] else [])); + features = mkFeatures (features."memchr"."2.0.1" or {}); + }; + features_.memchr."2.0.1" = deps: f: updateFeatures f (rec { + libc = fold recursiveUpdate {} [ + { "${deps.memchr."2.0.1".libc}"."use_std" = + (f.libc."${deps.memchr."2.0.1".libc}"."use_std" or false) || + (memchr."2.0.1"."use_std" or false) || + (f."memchr"."2.0.1"."use_std" or false); } + { "${deps.memchr."2.0.1".libc}".default = (f.libc."${deps.memchr."2.0.1".libc}".default or false); } + ]; + memchr = fold recursiveUpdate {} [ + { "2.0.1"."libc" = + (f.memchr."2.0.1"."libc" or false) || + (f.memchr."2.0.1".default or false) || + (memchr."2.0.1"."default" or false) || + (f.memchr."2.0.1".use_std or false) || + (memchr."2.0.1"."use_std" or false); } + { "2.0.1"."use_std" = + (f.memchr."2.0.1"."use_std" or false) || + (f.memchr."2.0.1".default or false) || + (memchr."2.0.1"."default" or false); } + { "2.0.1".default = (f.memchr."2.0.1".default or true); } + ]; + }) [ + (features_.libc."${deps."memchr"."2.0.1"."libc"}" deps) + ]; + + +# end +# nix-0.10.0 + + crates.nix."0.10.0" = deps: { features?(features_.nix."0.10.0" deps {}) }: buildRustCrate { + crateName = "nix"; + version = "0.10.0"; + description = "Rust friendly bindings to *nix APIs"; + authors = [ "The nix-rust Project Developers" ]; + sha256 = "0ghrbjlc1l21pmldwaz5b5m72xs0m05y1zq5ljlnymn61vbzxsny"; + dependencies = mapFeatures features ([ + (crates."bitflags"."${deps."nix"."0.10.0"."bitflags"}" deps) + (crates."bytes"."${deps."nix"."0.10.0"."bytes"}" deps) + (crates."cfg_if"."${deps."nix"."0.10.0"."cfg_if"}" deps) + (crates."libc"."${deps."nix"."0.10.0"."libc"}" deps) + (crates."void"."${deps."nix"."0.10.0"."void"}" deps) + ]) + ++ (if kernel == "dragonfly" then mapFeatures features ([ +]) else []); + }; + features_.nix."0.10.0" = deps: f: updateFeatures f (rec { + bitflags."${deps.nix."0.10.0".bitflags}".default = true; + bytes."${deps.nix."0.10.0".bytes}".default = (f.bytes."${deps.nix."0.10.0".bytes}".default or false); + cfg_if."${deps.nix."0.10.0".cfg_if}".default = true; + libc."${deps.nix."0.10.0".libc}".default = true; + nix."0.10.0".default = (f.nix."0.10.0".default or true); + void."${deps.nix."0.10.0".void}".default = true; + }) [ + (features_.bitflags."${deps."nix"."0.10.0"."bitflags"}" deps) + (features_.bytes."${deps."nix"."0.10.0"."bytes"}" deps) + (features_.cfg_if."${deps."nix"."0.10.0"."cfg_if"}" deps) + (features_.libc."${deps."nix"."0.10.0"."libc"}" deps) + (features_.void."${deps."nix"."0.10.0"."void"}" deps) + ]; + + +# end +# owning_ref-0.3.3 + + crates.owning_ref."0.3.3" = deps: { features?(features_.owning_ref."0.3.3" deps {}) }: buildRustCrate { + crateName = "owning_ref"; + version = "0.3.3"; + description = "A library for creating references that carry their owner with them."; + authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; + sha256 = "13ivn0ydc0hf957ix0f5si9nnplzzykbr70hni1qz9m19i9kvmrh"; + dependencies = mapFeatures features ([ + (crates."stable_deref_trait"."${deps."owning_ref"."0.3.3"."stable_deref_trait"}" deps) + ]); + }; + features_.owning_ref."0.3.3" = deps: f: updateFeatures f (rec { + owning_ref."0.3.3".default = (f.owning_ref."0.3.3".default or true); + stable_deref_trait."${deps.owning_ref."0.3.3".stable_deref_trait}".default = true; + }) [ + (features_.stable_deref_trait."${deps."owning_ref"."0.3.3"."stable_deref_trait"}" deps) + ]; + + +# end +# parking_lot-0.5.5 + + crates.parking_lot."0.5.5" = deps: { features?(features_.parking_lot."0.5.5" deps {}) }: buildRustCrate { + crateName = "parking_lot"; + version = "0.5.5"; + description = "More compact and efficient implementations of the standard synchronization primitives."; + authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; + sha256 = "0balxl593apy0l70z6dzk6c0r9707hgw2c9yav5asjc87dj6fx7l"; + dependencies = mapFeatures features ([ + (crates."parking_lot_core"."${deps."parking_lot"."0.5.5"."parking_lot_core"}" deps) + ] + ++ (if features.parking_lot."0.5.5".owning_ref or false then [ (crates.owning_ref."${deps."parking_lot"."0.5.5".owning_ref}" deps) ] else [])); + features = mkFeatures (features."parking_lot"."0.5.5" or {}); + }; + features_.parking_lot."0.5.5" = deps: f: updateFeatures f (rec { + owning_ref."${deps.parking_lot."0.5.5".owning_ref}".default = true; + parking_lot = fold recursiveUpdate {} [ + { "0.5.5"."owning_ref" = + (f.parking_lot."0.5.5"."owning_ref" or false) || + (f.parking_lot."0.5.5".default or false) || + (parking_lot."0.5.5"."default" or false); } + { "0.5.5".default = (f.parking_lot."0.5.5".default or true); } + ]; + parking_lot_core = fold recursiveUpdate {} [ + { "${deps.parking_lot."0.5.5".parking_lot_core}"."deadlock_detection" = + (f.parking_lot_core."${deps.parking_lot."0.5.5".parking_lot_core}"."deadlock_detection" or false) || + (parking_lot."0.5.5"."deadlock_detection" or false) || + (f."parking_lot"."0.5.5"."deadlock_detection" or false); } + { "${deps.parking_lot."0.5.5".parking_lot_core}"."nightly" = + (f.parking_lot_core."${deps.parking_lot."0.5.5".parking_lot_core}"."nightly" or false) || + (parking_lot."0.5.5"."nightly" or false) || + (f."parking_lot"."0.5.5"."nightly" or false); } + { "${deps.parking_lot."0.5.5".parking_lot_core}".default = true; } + ]; + }) [ + (features_.owning_ref."${deps."parking_lot"."0.5.5"."owning_ref"}" deps) + (features_.parking_lot_core."${deps."parking_lot"."0.5.5"."parking_lot_core"}" deps) + ]; + + +# end +# parking_lot_core-0.2.14 + + crates.parking_lot_core."0.2.14" = deps: { features?(features_.parking_lot_core."0.2.14" deps {}) }: buildRustCrate { + crateName = "parking_lot_core"; + version = "0.2.14"; + description = "An advanced API for creating custom synchronization primitives."; + authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; + sha256 = "0giypb8ckkpi34p14nfk4b19c7przj4jxs95gs7x2v5ncmi0y286"; + dependencies = mapFeatures features ([ + (crates."rand"."${deps."parking_lot_core"."0.2.14"."rand"}" deps) + (crates."smallvec"."${deps."parking_lot_core"."0.2.14"."smallvec"}" deps) + ]) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."parking_lot_core"."0.2.14"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."parking_lot_core"."0.2.14"."winapi"}" deps) + ]) else []); + features = mkFeatures (features."parking_lot_core"."0.2.14" or {}); + }; + features_.parking_lot_core."0.2.14" = deps: f: updateFeatures f (rec { + libc."${deps.parking_lot_core."0.2.14".libc}".default = true; + parking_lot_core = fold recursiveUpdate {} [ + { "0.2.14"."backtrace" = + (f.parking_lot_core."0.2.14"."backtrace" or false) || + (f.parking_lot_core."0.2.14".deadlock_detection or false) || + (parking_lot_core."0.2.14"."deadlock_detection" or false); } + { "0.2.14"."petgraph" = + (f.parking_lot_core."0.2.14"."petgraph" or false) || + (f.parking_lot_core."0.2.14".deadlock_detection or false) || + (parking_lot_core."0.2.14"."deadlock_detection" or false); } + { "0.2.14"."thread-id" = + (f.parking_lot_core."0.2.14"."thread-id" or false) || + (f.parking_lot_core."0.2.14".deadlock_detection or false) || + (parking_lot_core."0.2.14"."deadlock_detection" or false); } + { "0.2.14".default = (f.parking_lot_core."0.2.14".default or true); } + ]; + rand."${deps.parking_lot_core."0.2.14".rand}".default = true; + smallvec."${deps.parking_lot_core."0.2.14".smallvec}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.parking_lot_core."0.2.14".winapi}"."errhandlingapi" = true; } + { "${deps.parking_lot_core."0.2.14".winapi}"."handleapi" = true; } + { "${deps.parking_lot_core."0.2.14".winapi}"."minwindef" = true; } + { "${deps.parking_lot_core."0.2.14".winapi}"."ntstatus" = true; } + { "${deps.parking_lot_core."0.2.14".winapi}"."winbase" = true; } + { "${deps.parking_lot_core."0.2.14".winapi}"."winerror" = true; } + { "${deps.parking_lot_core."0.2.14".winapi}"."winnt" = true; } + { "${deps.parking_lot_core."0.2.14".winapi}".default = true; } + ]; + }) [ + (features_.rand."${deps."parking_lot_core"."0.2.14"."rand"}" deps) + (features_.smallvec."${deps."parking_lot_core"."0.2.14"."smallvec"}" deps) + (features_.libc."${deps."parking_lot_core"."0.2.14"."libc"}" deps) + (features_.winapi."${deps."parking_lot_core"."0.2.14"."winapi"}" deps) + ]; + + +# end +# quote-0.3.15 + + crates.quote."0.3.15" = deps: { features?(features_.quote."0.3.15" deps {}) }: buildRustCrate { + crateName = "quote"; + version = "0.3.15"; + description = "Quasi-quoting macro quote!(...)"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg"; + }; + features_.quote."0.3.15" = deps: f: updateFeatures f (rec { + quote."0.3.15".default = (f.quote."0.3.15".default or true); + }) []; + + +# end +# rand-0.4.2 + + crates.rand."0.4.2" = deps: { features?(features_.rand."0.4.2" deps {}) }: buildRustCrate { + crateName = "rand"; + version = "0.4.2"; + description = "Random number generators and other randomness functionality.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm"; + dependencies = (if kernel == "fuchsia" then mapFeatures features ([ + (crates."fuchsia_zircon"."${deps."rand"."0.4.2"."fuchsia_zircon"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + ] + ++ (if features.rand."0.4.2".libc or false then [ (crates.libc."${deps."rand"."0.4.2".libc}" deps) ] else [])) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."rand"."0.4.2"."winapi"}" deps) + ]) else []); + features = mkFeatures (features."rand"."0.4.2" or {}); + }; + features_.rand."0.4.2" = deps: f: updateFeatures f (rec { + fuchsia_zircon."${deps.rand."0.4.2".fuchsia_zircon}".default = true; + libc."${deps.rand."0.4.2".libc}".default = true; + rand = fold recursiveUpdate {} [ + { "0.4.2"."i128_support" = + (f.rand."0.4.2"."i128_support" or false) || + (f.rand."0.4.2".nightly or false) || + (rand."0.4.2"."nightly" or false); } + { "0.4.2"."libc" = + (f.rand."0.4.2"."libc" or false) || + (f.rand."0.4.2".std or false) || + (rand."0.4.2"."std" or false); } + { "0.4.2"."std" = + (f.rand."0.4.2"."std" or false) || + (f.rand."0.4.2".default or false) || + (rand."0.4.2"."default" or false); } + { "0.4.2".default = (f.rand."0.4.2".default or true); } + ]; + winapi = fold recursiveUpdate {} [ + { "${deps.rand."0.4.2".winapi}"."minwindef" = true; } + { "${deps.rand."0.4.2".winapi}"."ntsecapi" = true; } + { "${deps.rand."0.4.2".winapi}"."profileapi" = true; } + { "${deps.rand."0.4.2".winapi}"."winnt" = true; } + { "${deps.rand."0.4.2".winapi}".default = true; } + ]; + }) [ + (features_.fuchsia_zircon."${deps."rand"."0.4.2"."fuchsia_zircon"}" deps) + (features_.libc."${deps."rand"."0.4.2"."libc"}" deps) + (features_.winapi."${deps."rand"."0.4.2"."winapi"}" deps) + ]; + + +# end +# redox_syscall-0.1.37 + + crates.redox_syscall."0.1.37" = deps: { features?(features_.redox_syscall."0.1.37" deps {}) }: buildRustCrate { + crateName = "redox_syscall"; + version = "0.1.37"; + description = "A Rust library to access raw Redox system calls"; + authors = [ "Jeremy Soller <jackpot51@gmail.com>" ]; + sha256 = "0qa0jl9cr3qp80an8vshp2mcn8rzvwiavs1398hq1vsjw7pc3h2v"; + libName = "syscall"; + }; + features_.redox_syscall."0.1.37" = deps: f: updateFeatures f (rec { + redox_syscall."0.1.37".default = (f.redox_syscall."0.1.37".default or true); + }) []; + + +# end +# redox_termios-0.1.1 + + crates.redox_termios."0.1.1" = deps: { features?(features_.redox_termios."0.1.1" deps {}) }: buildRustCrate { + crateName = "redox_termios"; + version = "0.1.1"; + description = "A Rust library to access Redox termios functions"; + authors = [ "Jeremy Soller <jackpot51@gmail.com>" ]; + sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; + libPath = "src/lib.rs"; + dependencies = mapFeatures features ([ + (crates."redox_syscall"."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps) + ]); + }; + features_.redox_termios."0.1.1" = deps: f: updateFeatures f (rec { + redox_syscall."${deps.redox_termios."0.1.1".redox_syscall}".default = true; + redox_termios."0.1.1".default = (f.redox_termios."0.1.1".default or true); + }) [ + (features_.redox_syscall."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps) + ]; + + +# end +# regex-0.2.11 + + crates.regex."0.2.11" = deps: { features?(features_.regex."0.2.11" deps {}) }: buildRustCrate { + crateName = "regex"; + version = "0.2.11"; + description = "An implementation of regular expressions for Rust. This implementation uses\nfinite automata and guarantees linear time matching on all inputs.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0r50cymxdqp0fv1dxd22mjr6y32q450nwacd279p9s7lh0cafijj"; + dependencies = mapFeatures features ([ + (crates."aho_corasick"."${deps."regex"."0.2.11"."aho_corasick"}" deps) + (crates."memchr"."${deps."regex"."0.2.11"."memchr"}" deps) + (crates."regex_syntax"."${deps."regex"."0.2.11"."regex_syntax"}" deps) + (crates."thread_local"."${deps."regex"."0.2.11"."thread_local"}" deps) + (crates."utf8_ranges"."${deps."regex"."0.2.11"."utf8_ranges"}" deps) + ]); + features = mkFeatures (features."regex"."0.2.11" or {}); + }; + features_.regex."0.2.11" = deps: f: updateFeatures f (rec { + aho_corasick."${deps.regex."0.2.11".aho_corasick}".default = true; + memchr."${deps.regex."0.2.11".memchr}".default = true; + regex = fold recursiveUpdate {} [ + { "0.2.11"."pattern" = + (f.regex."0.2.11"."pattern" or false) || + (f.regex."0.2.11".unstable or false) || + (regex."0.2.11"."unstable" or false); } + { "0.2.11".default = (f.regex."0.2.11".default or true); } + ]; + regex_syntax."${deps.regex."0.2.11".regex_syntax}".default = true; + thread_local."${deps.regex."0.2.11".thread_local}".default = true; + utf8_ranges."${deps.regex."0.2.11".utf8_ranges}".default = true; + }) [ + (features_.aho_corasick."${deps."regex"."0.2.11"."aho_corasick"}" deps) + (features_.memchr."${deps."regex"."0.2.11"."memchr"}" deps) + (features_.regex_syntax."${deps."regex"."0.2.11"."regex_syntax"}" deps) + (features_.thread_local."${deps."regex"."0.2.11"."thread_local"}" deps) + (features_.utf8_ranges."${deps."regex"."0.2.11"."utf8_ranges"}" deps) + ]; + + +# end +# regex-1.0.0 + + crates.regex."1.0.0" = deps: { features?(features_.regex."1.0.0" deps {}) }: buildRustCrate { + crateName = "regex"; + version = "1.0.0"; + description = "An implementation of regular expressions for Rust. This implementation uses\nfinite automata and guarantees linear time matching on all inputs.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1wynl7jmf6l2fnsayw1bzfh7km4wwqnqfpi8anj7wbhdk17i6j6b"; + dependencies = mapFeatures features ([ + (crates."aho_corasick"."${deps."regex"."1.0.0"."aho_corasick"}" deps) + (crates."memchr"."${deps."regex"."1.0.0"."memchr"}" deps) + (crates."regex_syntax"."${deps."regex"."1.0.0"."regex_syntax"}" deps) + (crates."thread_local"."${deps."regex"."1.0.0"."thread_local"}" deps) + (crates."utf8_ranges"."${deps."regex"."1.0.0"."utf8_ranges"}" deps) + ]); + features = mkFeatures (features."regex"."1.0.0" or {}); + }; + features_.regex."1.0.0" = deps: f: updateFeatures f (rec { + aho_corasick."${deps.regex."1.0.0".aho_corasick}".default = true; + memchr."${deps.regex."1.0.0".memchr}".default = true; + regex = fold recursiveUpdate {} [ + { "1.0.0"."pattern" = + (f.regex."1.0.0"."pattern" or false) || + (f.regex."1.0.0".unstable or false) || + (regex."1.0.0"."unstable" or false); } + { "1.0.0"."use_std" = + (f.regex."1.0.0"."use_std" or false) || + (f.regex."1.0.0".default or false) || + (regex."1.0.0"."default" or false); } + { "1.0.0".default = (f.regex."1.0.0".default or true); } + ]; + regex_syntax."${deps.regex."1.0.0".regex_syntax}".default = true; + thread_local."${deps.regex."1.0.0".thread_local}".default = true; + utf8_ranges."${deps.regex."1.0.0".utf8_ranges}".default = true; + }) [ + (features_.aho_corasick."${deps."regex"."1.0.0"."aho_corasick"}" deps) + (features_.memchr."${deps."regex"."1.0.0"."memchr"}" deps) + (features_.regex_syntax."${deps."regex"."1.0.0"."regex_syntax"}" deps) + (features_.thread_local."${deps."regex"."1.0.0"."thread_local"}" deps) + (features_.utf8_ranges."${deps."regex"."1.0.0"."utf8_ranges"}" deps) + ]; + + +# end +# regex-syntax-0.5.6 + + crates.regex_syntax."0.5.6" = deps: { features?(features_.regex_syntax."0.5.6" deps {}) }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.5.6"; + description = "A regular expression parser."; + authors = [ "The Rust Project Developers" ]; + sha256 = "10vf3r34bgjnbrnqd5aszn35bjvm8insw498l1vjy8zx5yms3427"; + dependencies = mapFeatures features ([ + (crates."ucd_util"."${deps."regex_syntax"."0.5.6"."ucd_util"}" deps) + ]); + }; + features_.regex_syntax."0.5.6" = deps: f: updateFeatures f (rec { + regex_syntax."0.5.6".default = (f.regex_syntax."0.5.6".default or true); + ucd_util."${deps.regex_syntax."0.5.6".ucd_util}".default = true; + }) [ + (features_.ucd_util."${deps."regex_syntax"."0.5.6"."ucd_util"}" deps) + ]; + + +# end +# regex-syntax-0.6.0 + + crates.regex_syntax."0.6.0" = deps: { features?(features_.regex_syntax."0.6.0" deps {}) }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.6.0"; + description = "A regular expression parser."; + authors = [ "The Rust Project Developers" ]; + sha256 = "1zlaq3y1zbiqilxbh0471bizcs4p14b58nqr815w3ssyam169cy6"; + dependencies = mapFeatures features ([ + (crates."ucd_util"."${deps."regex_syntax"."0.6.0"."ucd_util"}" deps) + ]); + }; + features_.regex_syntax."0.6.0" = deps: f: updateFeatures f (rec { + regex_syntax."0.6.0".default = (f.regex_syntax."0.6.0".default or true); + ucd_util."${deps.regex_syntax."0.6.0".ucd_util}".default = true; + }) [ + (features_.ucd_util."${deps."regex_syntax"."0.6.0"."ucd_util"}" deps) + ]; + + +# end +# rustc-demangle-0.1.8 + + crates.rustc_demangle."0.1.8" = deps: { features?(features_.rustc_demangle."0.1.8" deps {}) }: buildRustCrate { + crateName = "rustc-demangle"; + version = "0.1.8"; + description = "Rust compiler symbol demangling.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "0xn5l86qfwngmdsjbglj30wh37zplvch96jl9raysl3k06gkkv3c"; + }; + features_.rustc_demangle."0.1.8" = deps: f: updateFeatures f (rec { + rustc_demangle."0.1.8".default = (f.rustc_demangle."0.1.8".default or true); + }) []; + + +# end +# smallvec-0.6.1 + + crates.smallvec."0.6.1" = deps: { features?(features_.smallvec."0.6.1" deps {}) }: buildRustCrate { + crateName = "smallvec"; + version = "0.6.1"; + description = "'Small vector' optimization: store up to a small number of items on the stack"; + authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]; + sha256 = "16m07xh67xcdpwjkbzbv9d7visxmz4fb4a8jfcrsrf333w7vkl1g"; + libPath = "lib.rs"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."smallvec"."0.6.1" or {}); + }; + features_.smallvec."0.6.1" = deps: f: updateFeatures f (rec { + smallvec = fold recursiveUpdate {} [ + { "0.6.1"."std" = + (f.smallvec."0.6.1"."std" or false) || + (f.smallvec."0.6.1".default or false) || + (smallvec."0.6.1"."default" or false); } + { "0.6.1".default = (f.smallvec."0.6.1".default or true); } + ]; + }) []; + + +# end +# socket2-0.3.5 + + crates.socket2."0.3.5" = deps: { features?(features_.socket2."0.3.5" deps {}) }: buildRustCrate { + crateName = "socket2"; + version = "0.3.5"; + description = "Utilities for handling networking sockets with a maximal amount of configuration\npossible intended.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "0bi6z6qvra16rwm3lk7xz4aakvcmmak6fpdmra1v7ccp40bss0kf"; + dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."cfg_if"."${deps."socket2"."0.3.5"."cfg_if"}" deps) + (crates."libc"."${deps."socket2"."0.3.5"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."socket2"."0.3.5"."winapi"}" deps) + ]) else []); + features = mkFeatures (features."socket2"."0.3.5" or {}); + }; + features_.socket2."0.3.5" = deps: f: updateFeatures f (rec { + cfg_if."${deps.socket2."0.3.5".cfg_if}".default = true; + libc."${deps.socket2."0.3.5".libc}".default = true; + socket2."0.3.5".default = (f.socket2."0.3.5".default or true); + winapi = fold recursiveUpdate {} [ + { "${deps.socket2."0.3.5".winapi}"."handleapi" = true; } + { "${deps.socket2."0.3.5".winapi}"."minwindef" = true; } + { "${deps.socket2."0.3.5".winapi}"."ws2def" = true; } + { "${deps.socket2."0.3.5".winapi}"."ws2ipdef" = true; } + { "${deps.socket2."0.3.5".winapi}"."ws2tcpip" = true; } + { "${deps.socket2."0.3.5".winapi}".default = true; } + ]; + }) [ + (features_.cfg_if."${deps."socket2"."0.3.5"."cfg_if"}" deps) + (features_.libc."${deps."socket2"."0.3.5"."libc"}" deps) + (features_.winapi."${deps."socket2"."0.3.5"."winapi"}" deps) + ]; + + +# end +# stable_deref_trait-1.0.0 + + crates.stable_deref_trait."1.0.0" = deps: { features?(features_.stable_deref_trait."1.0.0" deps {}) }: buildRustCrate { + crateName = "stable_deref_trait"; + version = "1.0.0"; + description = "An unsafe marker trait for types like Box and Rc that dereference to a stable address even when moved, and hence can be used with libraries such as owning_ref and rental.\n"; + authors = [ "Robert Grosse <n210241048576@gmail.com>" ]; + sha256 = "0ya5fms9qdwkd52d3a111w4vcz18j4rbfx4p88z44116cqd6cczr"; + features = mkFeatures (features."stable_deref_trait"."1.0.0" or {}); + }; + features_.stable_deref_trait."1.0.0" = deps: f: updateFeatures f (rec { + stable_deref_trait = fold recursiveUpdate {} [ + { "1.0.0"."std" = + (f.stable_deref_trait."1.0.0"."std" or false) || + (f.stable_deref_trait."1.0.0".default or false) || + (stable_deref_trait."1.0.0"."default" or false); } + { "1.0.0".default = (f.stable_deref_trait."1.0.0".default or true); } + ]; + }) []; + + +# end +# strsim-0.7.0 + + crates.strsim."0.7.0" = deps: { features?(features_.strsim."0.7.0" deps {}) }: buildRustCrate { + crateName = "strsim"; + version = "0.7.0"; + description = "Implementations of string similarity metrics.\nIncludes Hamming, Levenshtein, OSA, Damerau-Levenshtein, Jaro, and Jaro-Winkler.\n"; + authors = [ "Danny Guo <dannyguo91@gmail.com>" ]; + sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv"; + }; + features_.strsim."0.7.0" = deps: f: updateFeatures f (rec { + strsim."0.7.0".default = (f.strsim."0.7.0".default or true); + }) []; + + +# end +# syn-0.11.11 + + crates.syn."0.11.11" = deps: { features?(features_.syn."0.11.11" deps {}) }: buildRustCrate { + crateName = "syn"; + version = "0.11.11"; + description = "Nom parser for Rust source code"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502"; + dependencies = mapFeatures features ([ + ] + ++ (if features.syn."0.11.11".quote or false then [ (crates.quote."${deps."syn"."0.11.11".quote}" deps) ] else []) + ++ (if features.syn."0.11.11".synom or false then [ (crates.synom."${deps."syn"."0.11.11".synom}" deps) ] else []) + ++ (if features.syn."0.11.11".unicode-xid or false then [ (crates.unicode_xid."${deps."syn"."0.11.11".unicode_xid}" deps) ] else [])); + features = mkFeatures (features."syn"."0.11.11" or {}); + }; + features_.syn."0.11.11" = deps: f: updateFeatures f (rec { + quote."${deps.syn."0.11.11".quote}".default = true; + syn = fold recursiveUpdate {} [ + { "0.11.11"."parsing" = + (f.syn."0.11.11"."parsing" or false) || + (f.syn."0.11.11".default or false) || + (syn."0.11.11"."default" or false); } + { "0.11.11"."printing" = + (f.syn."0.11.11"."printing" or false) || + (f.syn."0.11.11".default or false) || + (syn."0.11.11"."default" or false); } + { "0.11.11"."quote" = + (f.syn."0.11.11"."quote" or false) || + (f.syn."0.11.11".printing or false) || + (syn."0.11.11"."printing" or false); } + { "0.11.11"."synom" = + (f.syn."0.11.11"."synom" or false) || + (f.syn."0.11.11".parsing or false) || + (syn."0.11.11"."parsing" or false); } + { "0.11.11"."unicode-xid" = + (f.syn."0.11.11"."unicode-xid" or false) || + (f.syn."0.11.11".parsing or false) || + (syn."0.11.11"."parsing" or false); } + { "0.11.11".default = (f.syn."0.11.11".default or true); } + ]; + synom."${deps.syn."0.11.11".synom}".default = true; + unicode_xid."${deps.syn."0.11.11".unicode_xid}".default = true; + }) [ + (features_.quote."${deps."syn"."0.11.11"."quote"}" deps) + (features_.synom."${deps."syn"."0.11.11"."synom"}" deps) + (features_.unicode_xid."${deps."syn"."0.11.11"."unicode_xid"}" deps) + ]; + + +# end +# synom-0.11.3 + + crates.synom."0.11.3" = deps: { features?(features_.synom."0.11.3" deps {}) }: buildRustCrate { + crateName = "synom"; + version = "0.11.3"; + description = "Stripped-down Nom parser used by Syn"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc"; + dependencies = mapFeatures features ([ + (crates."unicode_xid"."${deps."synom"."0.11.3"."unicode_xid"}" deps) + ]); + }; + features_.synom."0.11.3" = deps: f: updateFeatures f (rec { + synom."0.11.3".default = (f.synom."0.11.3".default or true); + unicode_xid."${deps.synom."0.11.3".unicode_xid}".default = true; + }) [ + (features_.unicode_xid."${deps."synom"."0.11.3"."unicode_xid"}" deps) + ]; + + +# end +# synstructure-0.6.1 + + crates.synstructure."0.6.1" = deps: { features?(features_.synstructure."0.6.1" deps {}) }: buildRustCrate { + crateName = "synstructure"; + version = "0.6.1"; + description = "expand_substructure-like helpers for syn macros 1.1 derive macros"; + authors = [ "Michael Layzell <michael@thelayzells.com>" ]; + sha256 = "1xnyw58va9zcqi4vvpnmpllacdj2a0mvy0cbd698izmr4qs92xlk"; + dependencies = mapFeatures features ([ + (crates."quote"."${deps."synstructure"."0.6.1"."quote"}" deps) + (crates."syn"."${deps."synstructure"."0.6.1"."syn"}" deps) + ]); + features = mkFeatures (features."synstructure"."0.6.1" or {}); + }; + features_.synstructure."0.6.1" = deps: f: updateFeatures f (rec { + quote."${deps.synstructure."0.6.1".quote}".default = true; + syn = fold recursiveUpdate {} [ + { "${deps.synstructure."0.6.1".syn}"."visit" = true; } + { "${deps.synstructure."0.6.1".syn}".default = true; } + ]; + synstructure."0.6.1".default = (f.synstructure."0.6.1".default or true); + }) [ + (features_.quote."${deps."synstructure"."0.6.1"."quote"}" deps) + (features_.syn."${deps."synstructure"."0.6.1"."syn"}" deps) + ]; + + +# end +# systemfd-0.3.0 + + crates.systemfd."0.3.0" = deps: { features?(features_.systemfd."0.3.0" deps {}) }: buildRustCrate { + crateName = "systemfd"; + version = "0.3.0"; + description = "A convenient helper for passing sockets into another process. Best to be combined with listenfd and cargo-watch."; + authors = [ "Armin Ronacher <armin.ronacher@active-4.com>" ]; + sha256 = "0dpckgb0afyzhbv8lccgzmw5yczpfcdsdlqsfncn1vcxvcf0yb5i"; + dependencies = mapFeatures features ([ + (crates."clap"."${deps."systemfd"."0.3.0"."clap"}" deps) + (crates."console"."${deps."systemfd"."0.3.0"."console"}" deps) + (crates."failure"."${deps."systemfd"."0.3.0"."failure"}" deps) + (crates."failure_derive"."${deps."systemfd"."0.3.0"."failure_derive"}" deps) + (crates."lazy_static"."${deps."systemfd"."0.3.0"."lazy_static"}" deps) + (crates."libc"."${deps."systemfd"."0.3.0"."libc"}" deps) + (crates."regex"."${deps."systemfd"."0.3.0"."regex"}" deps) + ]) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."nix"."${deps."systemfd"."0.3.0"."nix"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."socket2"."${deps."systemfd"."0.3.0"."socket2"}" deps) + (crates."uuid"."${deps."systemfd"."0.3.0"."uuid"}" deps) + (crates."winapi"."${deps."systemfd"."0.3.0"."winapi"}" deps) + ]) else []); + }; + features_.systemfd."0.3.0" = deps: f: updateFeatures f (rec { + clap."${deps.systemfd."0.3.0".clap}".default = true; + console."${deps.systemfd."0.3.0".console}".default = true; + failure."${deps.systemfd."0.3.0".failure}".default = true; + failure_derive."${deps.systemfd."0.3.0".failure_derive}".default = true; + lazy_static."${deps.systemfd."0.3.0".lazy_static}".default = true; + libc."${deps.systemfd."0.3.0".libc}".default = true; + nix."${deps.systemfd."0.3.0".nix}".default = true; + regex."${deps.systemfd."0.3.0".regex}".default = true; + socket2."${deps.systemfd."0.3.0".socket2}".default = true; + systemfd."0.3.0".default = (f.systemfd."0.3.0".default or true); + uuid = fold recursiveUpdate {} [ + { "${deps.systemfd."0.3.0".uuid}"."v4" = true; } + { "${deps.systemfd."0.3.0".uuid}".default = true; } + ]; + winapi = fold recursiveUpdate {} [ + { "${deps.systemfd."0.3.0".winapi}"."winsock2" = true; } + { "${deps.systemfd."0.3.0".winapi}".default = true; } + ]; + }) [ + (features_.clap."${deps."systemfd"."0.3.0"."clap"}" deps) + (features_.console."${deps."systemfd"."0.3.0"."console"}" deps) + (features_.failure."${deps."systemfd"."0.3.0"."failure"}" deps) + (features_.failure_derive."${deps."systemfd"."0.3.0"."failure_derive"}" deps) + (features_.lazy_static."${deps."systemfd"."0.3.0"."lazy_static"}" deps) + (features_.libc."${deps."systemfd"."0.3.0"."libc"}" deps) + (features_.regex."${deps."systemfd"."0.3.0"."regex"}" deps) + (features_.nix."${deps."systemfd"."0.3.0"."nix"}" deps) + (features_.socket2."${deps."systemfd"."0.3.0"."socket2"}" deps) + (features_.uuid."${deps."systemfd"."0.3.0"."uuid"}" deps) + (features_.winapi."${deps."systemfd"."0.3.0"."winapi"}" deps) + ]; + + +# end +# termion-1.5.1 + + crates.termion."1.5.1" = deps: { features?(features_.termion."1.5.1" deps {}) }: buildRustCrate { + crateName = "termion"; + version = "1.5.1"; + description = "A bindless library for manipulating terminals."; + authors = [ "ticki <Ticki@users.noreply.github.com>" "gycos <alexandre.bury@gmail.com>" "IGI-111 <igi-111@protonmail.com>" ]; + sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; + dependencies = (if !(kernel == "redox") then mapFeatures features ([ + (crates."libc"."${deps."termion"."1.5.1"."libc"}" deps) + ]) else []) + ++ (if kernel == "redox" then mapFeatures features ([ + (crates."redox_syscall"."${deps."termion"."1.5.1"."redox_syscall"}" deps) + (crates."redox_termios"."${deps."termion"."1.5.1"."redox_termios"}" deps) + ]) else []); + }; + features_.termion."1.5.1" = deps: f: updateFeatures f (rec { + libc."${deps.termion."1.5.1".libc}".default = true; + redox_syscall."${deps.termion."1.5.1".redox_syscall}".default = true; + redox_termios."${deps.termion."1.5.1".redox_termios}".default = true; + termion."1.5.1".default = (f.termion."1.5.1".default or true); + }) [ + (features_.libc."${deps."termion"."1.5.1"."libc"}" deps) + (features_.redox_syscall."${deps."termion"."1.5.1"."redox_syscall"}" deps) + (features_.redox_termios."${deps."termion"."1.5.1"."redox_termios"}" deps) + ]; + + +# end +# termios-0.2.2 + + crates.termios."0.2.2" = deps: { features?(features_.termios."0.2.2" deps {}) }: buildRustCrate { + crateName = "termios"; + version = "0.2.2"; + description = "Safe bindings for the termios library."; + authors = [ "David Cuddeback <david.cuddeback@gmail.com>" ]; + sha256 = "0hjy4idvcapx9i6qbhf5536aqnf6rqk2aaj424sfwy7qhv6xmcx3"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."termios"."0.2.2"."libc"}" deps) + ]); + }; + features_.termios."0.2.2" = deps: f: updateFeatures f (rec { + libc."${deps.termios."0.2.2".libc}".default = true; + termios."0.2.2".default = (f.termios."0.2.2".default or true); + }) [ + (features_.libc."${deps."termios"."0.2.2"."libc"}" deps) + ]; + + +# end +# textwrap-0.9.0 + + crates.textwrap."0.9.0" = deps: { features?(features_.textwrap."0.9.0" deps {}) }: buildRustCrate { + crateName = "textwrap"; + version = "0.9.0"; + description = "Textwrap is a small library for word wrapping, indenting, and\ndedenting strings.\n\nYou can use it to format strings (such as help and error messages) for\ndisplay in commandline applications. It is designed to be efficient\nand handle Unicode characters correctly.\n"; + authors = [ "Martin Geisler <martin@geisler.net>" ]; + sha256 = "18jg79ndjlwndz01mlbh82kkr2arqm658yn5kwp65l5n1hz8w4yb"; + dependencies = mapFeatures features ([ + (crates."unicode_width"."${deps."textwrap"."0.9.0"."unicode_width"}" deps) + ]); + }; + features_.textwrap."0.9.0" = deps: f: updateFeatures f (rec { + textwrap."0.9.0".default = (f.textwrap."0.9.0".default or true); + unicode_width."${deps.textwrap."0.9.0".unicode_width}".default = true; + }) [ + (features_.unicode_width."${deps."textwrap"."0.9.0"."unicode_width"}" deps) + ]; + + +# end +# thread_local-0.3.5 + + crates.thread_local."0.3.5" = deps: { features?(features_.thread_local."0.3.5" deps {}) }: buildRustCrate { + crateName = "thread_local"; + version = "0.3.5"; + description = "Per-object thread-local storage"; + authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; + sha256 = "0mkp0sp91aqsk7brgygai4igv751r1754rsxn37mig3ag5rx8np6"; + dependencies = mapFeatures features ([ + (crates."lazy_static"."${deps."thread_local"."0.3.5"."lazy_static"}" deps) + (crates."unreachable"."${deps."thread_local"."0.3.5"."unreachable"}" deps) + ]); + }; + features_.thread_local."0.3.5" = deps: f: updateFeatures f (rec { + lazy_static."${deps.thread_local."0.3.5".lazy_static}".default = true; + thread_local."0.3.5".default = (f.thread_local."0.3.5".default or true); + unreachable."${deps.thread_local."0.3.5".unreachable}".default = true; + }) [ + (features_.lazy_static."${deps."thread_local"."0.3.5"."lazy_static"}" deps) + (features_.unreachable."${deps."thread_local"."0.3.5"."unreachable"}" deps) + ]; + + +# end +# ucd-util-0.1.1 + + crates.ucd_util."0.1.1" = deps: { features?(features_.ucd_util."0.1.1" deps {}) }: buildRustCrate { + crateName = "ucd-util"; + version = "0.1.1"; + description = "A small utility library for working with the Unicode character database.\n"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0"; + }; + features_.ucd_util."0.1.1" = deps: f: updateFeatures f (rec { + ucd_util."0.1.1".default = (f.ucd_util."0.1.1".default or true); + }) []; + + +# end +# unicode-width-0.1.4 + + crates.unicode_width."0.1.4" = deps: { features?(features_.unicode_width."0.1.4" deps {}) }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.4"; + description = "Determine displayed width of `char` and `str` types\naccording to Unicode Standard Annex #11 rules.\n"; + authors = [ "kwantam <kwantam@gmail.com>" ]; + sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; + features = mkFeatures (features."unicode_width"."0.1.4" or {}); + }; + features_.unicode_width."0.1.4" = deps: f: updateFeatures f (rec { + unicode_width."0.1.4".default = (f.unicode_width."0.1.4".default or true); + }) []; + + +# end +# unicode-xid-0.0.4 + + crates.unicode_xid."0.0.4" = deps: { features?(features_.unicode_xid."0.0.4" deps {}) }: buildRustCrate { + crateName = "unicode-xid"; + version = "0.0.4"; + description = "Determine whether characters have the XID_Start\nor XID_Continue properties according to\nUnicode Standard Annex #31.\n"; + authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" ]; + sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v"; + features = mkFeatures (features."unicode_xid"."0.0.4" or {}); + }; + features_.unicode_xid."0.0.4" = deps: f: updateFeatures f (rec { + unicode_xid."0.0.4".default = (f.unicode_xid."0.0.4".default or true); + }) []; + + +# end +# unreachable-1.0.0 + + crates.unreachable."1.0.0" = deps: { features?(features_.unreachable."1.0.0" deps {}) }: buildRustCrate { + crateName = "unreachable"; + version = "1.0.0"; + description = "An unreachable code optimization hint in stable rust."; + authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ]; + sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf"; + dependencies = mapFeatures features ([ + (crates."void"."${deps."unreachable"."1.0.0"."void"}" deps) + ]); + }; + features_.unreachable."1.0.0" = deps: f: updateFeatures f (rec { + unreachable."1.0.0".default = (f.unreachable."1.0.0".default or true); + void."${deps.unreachable."1.0.0".void}".default = (f.void."${deps.unreachable."1.0.0".void}".default or false); + }) [ + (features_.void."${deps."unreachable"."1.0.0"."void"}" deps) + ]; + + +# end +# utf8-ranges-1.0.0 + + crates.utf8_ranges."1.0.0" = deps: { features?(features_.utf8_ranges."1.0.0" deps {}) }: buildRustCrate { + crateName = "utf8-ranges"; + version = "1.0.0"; + description = "Convert ranges of Unicode codepoints to UTF-8 byte ranges."; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0"; + }; + features_.utf8_ranges."1.0.0" = deps: f: updateFeatures f (rec { + utf8_ranges."1.0.0".default = (f.utf8_ranges."1.0.0".default or true); + }) []; + + +# end +# uuid-0.6.3 + + crates.uuid."0.6.3" = deps: { features?(features_.uuid."0.6.3" deps {}) }: buildRustCrate { + crateName = "uuid"; + version = "0.6.3"; + description = "A library to generate and parse UUIDs.\n"; + authors = [ "Ashley Mannix<ashleymannix@live.com.au>" "Christopher Armstrong" "Dylan DPC<dylan.dpc@gmail.com>" "Hunar Roop Kahlon<hunar.roop@gmail.com>" ]; + sha256 = "1kjp5xglhab4saaikn95zn3mr4zja7484pv307cb5bxm2sawb8p6"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."uuid"."0.6.3"."cfg_if"}" deps) + ] + ++ (if features.uuid."0.6.3".rand or false then [ (crates.rand."${deps."uuid"."0.6.3".rand}" deps) ] else [])); + features = mkFeatures (features."uuid"."0.6.3" or {}); + }; + features_.uuid."0.6.3" = deps: f: updateFeatures f (rec { + cfg_if."${deps.uuid."0.6.3".cfg_if}".default = true; + rand."${deps.uuid."0.6.3".rand}".default = true; + uuid = fold recursiveUpdate {} [ + { "0.6.3"."md5" = + (f.uuid."0.6.3"."md5" or false) || + (f.uuid."0.6.3".v3 or false) || + (uuid."0.6.3"."v3" or false); } + { "0.6.3"."rand" = + (f.uuid."0.6.3"."rand" or false) || + (f.uuid."0.6.3".v3 or false) || + (uuid."0.6.3"."v3" or false) || + (f.uuid."0.6.3".v4 or false) || + (uuid."0.6.3"."v4" or false) || + (f.uuid."0.6.3".v5 or false) || + (uuid."0.6.3"."v5" or false); } + { "0.6.3"."serde" = + (f.uuid."0.6.3"."serde" or false) || + (f.uuid."0.6.3".playground or false) || + (uuid."0.6.3"."playground" or false); } + { "0.6.3"."sha1" = + (f.uuid."0.6.3"."sha1" or false) || + (f.uuid."0.6.3".v5 or false) || + (uuid."0.6.3"."v5" or false); } + { "0.6.3"."std" = + (f.uuid."0.6.3"."std" or false) || + (f.uuid."0.6.3".default or false) || + (uuid."0.6.3"."default" or false) || + (f.uuid."0.6.3".use_std or false) || + (uuid."0.6.3"."use_std" or false); } + { "0.6.3"."v1" = + (f.uuid."0.6.3"."v1" or false) || + (f.uuid."0.6.3".playground or false) || + (uuid."0.6.3"."playground" or false); } + { "0.6.3"."v3" = + (f.uuid."0.6.3"."v3" or false) || + (f.uuid."0.6.3".playground or false) || + (uuid."0.6.3"."playground" or false); } + { "0.6.3"."v4" = + (f.uuid."0.6.3"."v4" or false) || + (f.uuid."0.6.3".playground or false) || + (uuid."0.6.3"."playground" or false); } + { "0.6.3"."v5" = + (f.uuid."0.6.3"."v5" or false) || + (f.uuid."0.6.3".playground or false) || + (uuid."0.6.3"."playground" or false); } + { "0.6.3".default = (f.uuid."0.6.3".default or true); } + ]; + }) [ + (features_.cfg_if."${deps."uuid"."0.6.3"."cfg_if"}" deps) + (features_.rand."${deps."uuid"."0.6.3"."rand"}" deps) + ]; + + +# end +# vec_map-0.8.1 + + crates.vec_map."0.8.1" = deps: { features?(features_.vec_map."0.8.1" deps {}) }: buildRustCrate { + crateName = "vec_map"; + version = "0.8.1"; + description = "A simple map based on a vector for small integer keys"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" "Jorge Aparicio <japaricious@gmail.com>" "Alexis Beingessner <a.beingessner@gmail.com>" "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon <aturon@mozilla.com>" "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood <csouth3@illinois.edu>" "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens <markus@m-siemens.de>" "Josh Branchaud <jbranchaud@gmail.com>" "Huon Wilson <dbau.pp@gmail.com>" "Corey Farwell <coref@rwell.org>" "Aaron Liblong <>" "Nick Cameron <nrc@ncameron.org>" "Patrick Walton <pcwalton@mimiga.net>" "Felix S Klock II <>" "Andrew Paseltiner <apaseltiner@gmail.com>" "Sean McArthur <sean.monstar@gmail.com>" "Vadim Petrochenkov <>" ]; + sha256 = "1jj2nrg8h3l53d43rwkpkikq5a5x15ms4rf1rw92hp5lrqhi8mpi"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."vec_map"."0.8.1" or {}); + }; + features_.vec_map."0.8.1" = deps: f: updateFeatures f (rec { + vec_map = fold recursiveUpdate {} [ + { "0.8.1"."serde" = + (f.vec_map."0.8.1"."serde" or false) || + (f.vec_map."0.8.1".eders or false) || + (vec_map."0.8.1"."eders" or false); } + { "0.8.1".default = (f.vec_map."0.8.1".default or true); } + ]; + }) []; + + +# end +# void-1.0.2 + + crates.void."1.0.2" = deps: { features?(features_.void."1.0.2" deps {}) }: buildRustCrate { + crateName = "void"; + version = "1.0.2"; + description = "The uninhabited void type for use in statically impossible cases."; + authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ]; + sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; + features = mkFeatures (features."void"."1.0.2" or {}); + }; + features_.void."1.0.2" = deps: f: updateFeatures f (rec { + void = fold recursiveUpdate {} [ + { "1.0.2"."std" = + (f.void."1.0.2"."std" or false) || + (f.void."1.0.2".default or false) || + (void."1.0.2"."default" or false); } + { "1.0.2".default = (f.void."1.0.2".default or true); } + ]; + }) []; + + +# end +# winapi-0.2.8 + + crates.winapi."0.2.8" = deps: { features?(features_.winapi."0.2.8" deps {}) }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + description = "Types and constants for WinAPI bindings. See README for list of crates providing function bindings."; + authors = [ "Peter Atashian <retep998@gmail.com>" ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + }; + features_.winapi."0.2.8" = deps: f: updateFeatures f (rec { + winapi."0.2.8".default = (f.winapi."0.2.8".default or true); + }) []; + + +# end +# winapi-0.3.4 + + crates.winapi."0.3.4" = deps: { features?(features_.winapi."0.3.4" deps {}) }: buildRustCrate { + crateName = "winapi"; + version = "0.3.4"; + description = "Raw FFI bindings for all of Windows API."; + authors = [ "Peter Atashian <retep998@gmail.com>" ]; + sha256 = "1qbrf5dcnd8j36cawby5d9r5vx07r0l4ryf672pfncnp8895k9lx"; + build = "build.rs"; + dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ + (crates."winapi_i686_pc_windows_gnu"."${deps."winapi"."0.3.4"."winapi_i686_pc_windows_gnu"}" deps) + ]) else []) + ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ + (crates."winapi_x86_64_pc_windows_gnu"."${deps."winapi"."0.3.4"."winapi_x86_64_pc_windows_gnu"}" deps) + ]) else []); + features = mkFeatures (features."winapi"."0.3.4" or {}); + }; + features_.winapi."0.3.4" = deps: f: updateFeatures f (rec { + winapi."0.3.4".default = (f.winapi."0.3.4".default or true); + winapi_i686_pc_windows_gnu."${deps.winapi."0.3.4".winapi_i686_pc_windows_gnu}".default = true; + winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.4".winapi_x86_64_pc_windows_gnu}".default = true; + }) [ + (features_.winapi_i686_pc_windows_gnu."${deps."winapi"."0.3.4"."winapi_i686_pc_windows_gnu"}" deps) + (features_.winapi_x86_64_pc_windows_gnu."${deps."winapi"."0.3.4"."winapi_x86_64_pc_windows_gnu"}" deps) + ]; + + +# end +# winapi-build-0.1.1 + + crates.winapi_build."0.1.1" = deps: { features?(features_.winapi_build."0.1.1" deps {}) }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + description = "Common code for build.rs in WinAPI -sys crates."; + authors = [ "Peter Atashian <retep998@gmail.com>" ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + }; + features_.winapi_build."0.1.1" = deps: f: updateFeatures f (rec { + winapi_build."0.1.1".default = (f.winapi_build."0.1.1".default or true); + }) []; + + +# end +# winapi-i686-pc-windows-gnu-0.4.0 + + crates.winapi_i686_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_i686_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate { + crateName = "winapi-i686-pc-windows-gnu"; + version = "0.4.0"; + description = "Import libraries for the i686-pc-windows-gnu target. Please don't use this crate directly, depend on winapi instead."; + authors = [ "Peter Atashian <retep998@gmail.com>" ]; + sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; + build = "build.rs"; + }; + features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true); + }) []; + + +# end +# winapi-x86_64-pc-windows-gnu-0.4.0 + + crates.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_x86_64_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate { + crateName = "winapi-x86_64-pc-windows-gnu"; + version = "0.4.0"; + description = "Import libraries for the x86_64-pc-windows-gnu target. Please don't use this crate directly, depend on winapi instead."; + authors = [ "Peter Atashian <retep998@gmail.com>" ]; + sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; + build = "build.rs"; + }; + features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true); + }) []; + + +# end +} diff --git a/pkgs/development/tools/systemfd/default.nix b/pkgs/development/tools/systemfd/default.nix new file mode 100644 index 0000000000000..a0037050b65d0 --- /dev/null +++ b/pkgs/development/tools/systemfd/default.nix @@ -0,0 +1,18 @@ +{ stdenv, lib, fetchgit, darwin, buildPlatform +, buildRustCrate, buildRustCrateHelpers, defaultCrateOverrides }: + +((import ./Cargo.nix { + inherit lib buildPlatform buildRustCrate buildRustCrateHelpers fetchgit; + cratesIO = import ./crates-io.nix { inherit lib buildRustCrate buildRustCrateHelpers; }; +}).systemfd {}).override { + crateOverrides = defaultCrateOverrides // { + systemfd = attrs: { + meta = { + description = "A convenient helper for passing sockets into another process."; + homepage = "https://github.com/mitsuhiko/systemfd"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.adisbladis ]; + }; + }; + }; +} diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index cc865e2bd5288..4cdb5b8dd1634 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Execute SQL against structured text like CSV or TSV"; - homepage = https://github.com/dinedal/textql; + homepage = "https://github.com/dinedal/textql"; license = licenses.mit; maintainers = with maintainers; [ vrthra ]; }; diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index 50c34dc39edfe..a0bc39f2816d7 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Chromium-based cross-platform / cross-language application framework"; - homepage = https://github.com/breach/thrust; + homepage = "https://github.com/breach/thrust"; license = licenses.mit; maintainers = [ maintainers.osener ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index aab1c49a537b1..8f4e66703478b 100644 --- a/pkgs/development/tools/toluapp/default.nix +++ b/pkgs/development/tools/toluapp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool to integrate C/Cpp code with Lua"; - homepage = http://www.codenix.com/~tolua/; + homepage = "http://www.codenix.com/~tolua/"; license = licenses.mit; maintainers = with maintainers; [ vrthra ]; platforms = with platforms; unix; diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix index a5c13e2266e91..3587454b84b2b 100644 --- a/pkgs/development/tools/toxiproxy/default.nix +++ b/pkgs/development/tools/toxiproxy/default.nix @@ -2,12 +2,12 @@ buildGoPackage rec { pname = "toxiproxy"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "Shopify"; repo = "toxiproxy"; rev = "v${version}"; - sha256 = "1a7yry846iwi9cs9xam2vjbw73fjy45agjrwk214k0n1ziaawz2f"; + sha256 = "07yhsvscdv1qjfc2fyyh9qsrrdwrrw04wadk5gaq4qddcway7vig"; }; goPackagePath = "github.com/Shopify/toxiproxy"; @@ -15,8 +15,8 @@ buildGoPackage rec { buildFlagsArray = "-ldflags=-X github.com/Shopify/toxiproxy.Version=v${version}"; postInstall = '' - mv $bin/bin/cli $bin/bin/toxiproxy-cli - mv $bin/bin/cmd $bin/bin/toxiproxy-cmd + mv $out/bin/cli $out/bin/toxiproxy-cli + mv $out/bin/cmd $out/bin/toxiproxy-cmd ''; meta = { diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/development/tools/tradcpp/default.nix index 7f395174bb411..ddcdc38a4fb97 100644 --- a/pkgs/development/tools/tradcpp/default.nix +++ b/pkgs/development/tools/tradcpp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "tradcpp-0.5.2"; src = fetchurl { - url = https://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-0.5.2.tar.gz; + url = "https://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-0.5.2.tar.gz"; sha256 = "1h2bwxwc13rz3g2236l89hm47f72hn3m4h7wjir3j532kq0m68bc"; }; diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index d297105ea91e8..132492735649d 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { to provide sufficient information to develop a free and open Verilog to bitstream toolchain for these devices. ''; - homepage = https://github.com/SymbiFlow/prjtrellis; + homepage = "https://github.com/SymbiFlow/prjtrellis"; license = stdenv.lib.licenses.isc; maintainers = with maintainers; [ q3k thoughtpolice emily ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/tychus/default.nix b/pkgs/development/tools/tychus/default.nix index 5908ceb0f80d9..82dce7f81e780 100644 --- a/pkgs/development/tools/tychus/default.nix +++ b/pkgs/development/tools/tychus/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = { description = "Command line utility to live-reload your application."; - homepage = https://github.com/devlocker/tychus; + homepage = "https://github.com/devlocker/tychus"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix index a364f2eed0c72..2fbf736653826 100644 --- a/pkgs/development/tools/uftrace/default.nix +++ b/pkgs/development/tools/uftrace/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Function (graph) tracer for user-space"; - homepage = https://github.com/namhyung/uftrace; + homepage = "https://github.com/namhyung/uftrace"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [stdenv.lib.maintainers.nthorne]; diff --git a/pkgs/development/tools/unconvert/default.nix b/pkgs/development/tools/unconvert/default.nix index a6c087d7be722..d3372ec1b6e33 100644 --- a/pkgs/development/tools/unconvert/default.nix +++ b/pkgs/development/tools/unconvert/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { meta = with lib; { description = "Remove unnecessary type conversions from Go source"; - homepage = https://github.com/mdempsky/unconvert; + homepage = "https://github.com/mdempsky/unconvert"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 895cedd70108a..13ab61b556759 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -127,7 +127,7 @@ in stdenv.mkDerivation { dontPatchELF = true; meta = with stdenv.lib; { - homepage = https://unity3d.com/; + homepage = "https://unity3d.com/"; description = "Game development tool"; longDescription = '' Popular development platform for creating 2D and 3D multiplatform games diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 2939df0ba20dc..bb84584e836eb 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: -appimageTools.wrapType2 rec { +let + version = "2.3.1"; +in appimageTools.wrapType2 rec { name = "unityhub"; extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk_pixbuf glib libGL libGLU nss nspr @@ -16,8 +18,9 @@ appimageTools.wrapType2 rec { ''; src = fetchurl { - url = "https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage"; - sha256 = "05p5kqbwgqyk2aw2lix5dk1ql16aj6iczxrc63a1l0vj8wrha7z4"; + # mirror of https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage + url = "https://archive.org/download/unity-hub-${version}/UnityHub.AppImage"; + sha256 = "09nrgjlknl3hgrrl7rc79bmbrq6r6sl49dw0cmvs37vjqnvlr8ny"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 677fddd0f60aa..32e205a6f8d3a 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -5,9 +5,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.2.7"; + version = "2.2.8"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "1z31y1nqiyj6rml9lz8gcbr29myhs5wcap8jsvgm3pb7p9p9y8m9"; + sha256 = "0nvxda0dyhncgcl9qs34l4rj0jbdbg65a3ii5765p4899z6gzx95"; deps = bundlerEnv rec { name = "${pname}-${version}"; @@ -116,7 +116,7 @@ in buildRubyGem rec { meta = with lib; { description = "A tool for building complete development environments"; - homepage = https://www.vagrantup.com/; + homepage = "https://www.vagrantup.com/"; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix index 64f24f8270db0..f5d70b912df5e 100644 --- a/pkgs/development/tools/vagrant/gemset.nix +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -20,25 +20,24 @@ version = "3.2.4"; }; childprocess = { - dependencies = ["ffi"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p3f43scdzx9zxmy2kw5zsc3az6v46nq4brwcxmnscjy4w4racbv"; + sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5"; type = "gem"; }; - version = "0.6.3"; + version = "3.0.0"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; type = "gem"; }; - version = "1.1.5"; + version = "1.1.6"; }; domain_name = { dependencies = ["unf"]; @@ -213,10 +212,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18x61fc36951vw7f74gq8cyybdpxvyg5d0azvqhrs82ddw3v16xh"; + sha256 = "1zin0q26wc5p7zb7glpwary7ms60s676vcq987yv22jgm6hnlwlh"; type = "gem"; }; - version = "3.2019.1009"; + version = "3.2020.0425"; }; multi_json = { groups = ["default"]; @@ -255,10 +254,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jglf8rxvlw6is5019r6kwsdhw38zm3z39jbghdbj449r6h7h77n"; + sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40"; type = "gem"; }; - version = "5.1.0"; + version = "5.2.0"; }; netrc = { groups = ["default"]; @@ -285,10 +284,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; + sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87"; type = "gem"; }; - version = "0.10.3"; + version = "0.10.4"; }; rb-inotify = { dependencies = ["ffi"]; @@ -348,10 +347,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qxc2zxwwipm6kviiar4gfhcakpx1jdcs89v6lvzivn5hq1xk78l"; + sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; type = "gem"; }; - version = "1.3.0"; + version = "2.3.0"; }; unf = { dependencies = ["unf_ext"]; @@ -369,10 +368,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf"; + sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; type = "gem"; }; - version = "0.0.7.6"; + version = "0.0.7.7"; }; vagrant_cloud = { dependencies = ["rest-client"]; @@ -412,10 +411,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12fzg9liydl244xq6r7x0wy06zn1n4czdbnjavy3150c3qsnv71a"; + sha256 = "1yawwrs3pnvbbm9xn0nbzvyl92kgf1jr439qfbqx0mb8zzkyi2dv"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.1"; }; winrm-fs = { dependencies = ["erubi" "logging" "rubyzip" "winrm"]; @@ -423,9 +422,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0phhzliw47hmpi3ddygs500kfxa7il5yzmp7dw4ix2dvhrxrj7s6"; + sha256 = "093f698l9b9cx6vcqwjc9hi5hbd86ynp1g5c7g9k18y6h7fxjk43"; type = "gem"; }; - version = "1.3.3"; + version = "1.3.4"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix index 92fb6ebcc682c..199f1626c8912 100644 --- a/pkgs/development/tools/vala-lint/default.nix +++ b/pkgs/development/tools/vala-lint/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/vala-lang/vala-lint; + homepage = "https://github.com/vala-lang/vala-lint"; description = "Check Vala code files for code-style errors"; longDescription = '' Small command line tool and library for checking Vala code files for code-style errors. diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index bab3ebd57573f..c4a1cf7398701 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -1,5 +1,5 @@ { stdenv, python3Packages -, git, bazaar, subversion }: +, git, breezy, subversion }: with python3Packages; @@ -14,7 +14,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyyaml setuptools ]; - makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ git bazaar subversion ])]; + makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ git breezy subversion ])]; doCheck = false; # requires network diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix index df0c360f75c37..880703383d11a 100644 --- a/pkgs/development/tools/vgo2nix/default.nix +++ b/pkgs/development/tools/vgo2nix/default.nix @@ -9,16 +9,16 @@ buildGoPackage { pname = "vgo2nix"; - version = "unstable-2019-02-06"; + version = "unstable-2020-05-05"; goPackagePath = "github.com/adisbladis/vgo2nix"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { - owner = "adisbladis"; + owner = "nix-community"; repo = "vgo2nix"; - rev = "f2694cd352830f0561bc00bbcaa08cefb2e36439"; - sha256 = "10cwi67cyhqjq1pwhry2n1v8z7wybl4cawzmjmfgs5mbsvqp0h78"; + rev = "71e59bf268d5257a0f89b2f59cd20fd468c8c6ac"; + sha256 = "1pcdkknq2v7nrs0siqcvvq2x0qqz5snwdz2lpjnad8i33rwhmayh"; }; goDeps = ./deps.nix; @@ -28,12 +28,12 @@ buildGoPackage { postInstall = with stdenv; let binPath = lib.makeBinPath [ nix-prefetch-git go ]; in '' - wrapProgram $bin/bin/vgo2nix --prefix PATH : ${binPath} + wrapProgram $out/bin/vgo2nix --prefix PATH : ${binPath} ''; meta = with stdenv.lib; { description = "Convert go.mod files to nixpkgs buildGoPackage compatible deps.nix files"; - homepage = https://github.com/adisbladis/vgo2nix; + homepage = "https://github.com/nix-community/vgo2nix"; license = licenses.mit; maintainers = with maintainers; [ adisbladis ]; }; diff --git a/pkgs/development/tools/vgo2nix/deps.nix b/pkgs/development/tools/vgo2nix/deps.nix index 4f8506794d36d..2d9a130e43e3a 100644 --- a/pkgs/development/tools/vgo2nix/deps.nix +++ b/pkgs/development/tools/vgo2nix/deps.nix @@ -127,12 +127,66 @@ }; } { + goPackagePath = "github.com/yuin/goldmark"; + fetch = { + type = "git"; + url = "https://github.com/yuin/goldmark"; + rev = "v1.1.27"; + sha256 = "1872cqnii0kwiqcy81yin0idvjy5mdy4zlzz0csb319lcjs3b923"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "87dc89f01550"; + sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g"; + }; + } + { + goPackagePath = "golang.org/x/mod"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mod"; + rev = "v0.2.0"; + sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "0de0cce0169b"; + sha256 = "1db7s5kbzyh2zd5lpv05n7hp8wbwdvgk0wpiwrlnig94mkr0y5aq"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "cd5d95a43a6e"; + sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; + }; + } + { goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "d99a578cf41b"; - sha256 = "10q9xx4pmnq92qn6ff4xp7n1hx766wvw2rf7pqcd6rx5plgwz8cm"; + rev = "97732733099d"; + sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; }; } { @@ -140,8 +194,17 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "ded554d0681e"; - sha256 = "04rlq9hc3ccww9sbsrl48fl6wbjprb136rqxyr7dmgfj444aml56"; + rev = "0c9eba77bc32"; + sha256 = "1xz0jyxdmibkams6vd61va5cw963l25jjf3i9r33m0i739qwg4lj"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "9bdfabe68543"; + sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; }; } ] diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index 382871ff6af4b..fcab1f952f2b8 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { meta = with lib; { description = "Fast and Highly Extensible Vim script Language Lint implemented by Python"; - homepage = https://github.com/Kuniwak/vint; + homepage = "https://github.com/Kuniwak/vint"; license = licenses.mit; maintainers = with maintainers; [ andsild ]; platforms = platforms.all; diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix index 197f48dbbfb5e..82f0018ce6995 100644 --- a/pkgs/development/tools/vndr/default.nix +++ b/pkgs/development/tools/vndr/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = { description = "Stupid golang vendoring tool, inspired by docker vendor script"; - homepage = https://github.com/LK4D4/vndr; + homepage = "https://github.com/LK4D4/vndr"; maintainers = with lib.maintainers; [ vdemeester ]; license = lib.licenses.asl20; }; diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix index 266024d323de6..7821c34bb1720 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.nix @@ -48,7 +48,7 @@ mkDerivation { meta = with lib; { description = "OpenGL capture / playback debugger."; - homepage = https://github.com/ValveSoftware/vogl; + homepage = "https://github.com/ValveSoftware/vogl"; license = licenses.mit; maintainers = [ maintainers.deepfire ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 5d807d13a9eac..06a1e4025e1c0 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LunarG Vulkan loader"; - homepage = https://www.lunarg.com; + homepage = "https://www.lunarg.com"; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix new file mode 100644 index 0000000000000..acd26b638c923 --- /dev/null +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "vultr-cli"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "vultr"; + repo = pname; + rev = "v${version}"; + sha256 = "1z3vbcpchrf3bak08p72c96c2l39hdp196fqc5wvsqar3mzrrz7s"; + }; + + vendorSha256 = null; + + meta = with stdenv.lib; { + description = "Official command line tool for Vultr services"; + homepage = "https://github.com/vultr/vultr-cli"; + license = licenses.asl20; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix index 23fd684b412bf..8bd8a55bce8d9 100644 --- a/pkgs/development/tools/vultr/default.nix +++ b/pkgs/development/tools/vultr/default.nix @@ -2,19 +2,19 @@ buildGoPackage rec { pname = "vultr"; - version = "1.15.0"; + version = "2.0.1"; goPackagePath = "github.com/JamesClonk/vultr"; src = fetchFromGitHub { owner = "JamesClonk"; repo = "vultr"; - rev = version; - sha256 = "1bx2x17aa6wfn4qy9lxk8sh7shs3x5ppz2z49s0xm8qq0rs1qi92"; + rev = "v${version}"; + sha256 = "16wlncf0wax5jhpbfif5k16knigxy89vcby0b821klv6hlm6cc58"; }; meta = { description = "A command line tool for Vultr services, a provider for cloud virtual private servers"; - homepage = https://github.com/JamesClonk/vultr; + homepage = "https://github.com/JamesClonk/vultr"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.zauberpony ]; diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index b3be6c4552dd6..11c9875bf9df8 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -1,26 +1,25 @@ -{ stdenv, fetchFromGitHub, cmake, python3, substituteAll }: +{ stdenv, fetchpatch, fetchFromGitHub, cmake, python3, substituteAll }: stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.13"; + version = "1.0.16"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "07x8m5sf4c7zjq1flypycw1d15ylqdp38l81vn961ds089ngvpgg"; + sha256 = "1zzc46d6m7l5lil423417crdda2cqb396p2idcla2ps161hwq3qp"; fetchSubmodules = true; }; - patches = [ - (substituteAll { - src = ./version.patch; - inherit version; - }) - ]; + # https://github.com/WebAssembly/wabt/pull/1408 + patches = [ (fetchpatch { + url = "https://github.com/WebAssembly/wabt/pull/1408/commits/28505f4db6e4561cf6840af5c304a9aa900c4987.patch"; + sha256 = "1nh1ddsak6w51np17xf2r7i0czxrjslz1i4impmmp88h5bp2yjba"; + }) ]; nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; + cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCMAKE_PROJECT_VERSION=${version}" ]; buildInputs = [ python3 ]; meta = with stdenv.lib; { @@ -40,7 +39,7 @@ stdenv.mkDerivation rec { format * wasm2c: convert a WebAssembly binary file to a C source and header ''; - homepage = https://github.com/WebAssembly/wabt; + homepage = "https://github.com/WebAssembly/wabt"; license = licenses.asl20; maintainers = with maintainers; [ ekleog ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/wabt/version.patch b/pkgs/development/tools/wabt/version.patch deleted file mode 100644 index a49cd0bc1552a..0000000000000 --- a/pkgs/development/tools/wabt/version.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 363a5660..ad3300ed 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -68,22 +68,7 @@ endif () - include(CheckTypeSize) - check_type_size(ssize_t SSIZE_T) - check_type_size(size_t SIZEOF_SIZE_T) -- --FIND_PACKAGE(Git QUIET REQUIRED) --EXECUTE_PROCESS(COMMAND -- "${GIT_EXECUTABLE}" --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git describe --tags -- RESULT_VARIABLE -- GIT_HASH_RESULT -- OUTPUT_VARIABLE -- GIT_HASH -- OUTPUT_STRIP_TRAILING_WHITESPACE) -- --IF(${GIT_HASH_RESULT} EQUAL 0) -- SET(WABT_VERSION_INFO "${GIT_HASH}") --ELSE() -- MESSAGE(WARNING "Error running git describe to determine version") -- SET(WABT_VERSION_INFO "(unable to determine version)") --ENDIF() -+SET(WABT_VERSION_INFO "@version@") - - configure_file( - ${WABT_SOURCE_DIR}/src/config.h.in diff --git a/pkgs/development/tools/wally-cli/default.nix b/pkgs/development/tools/wally-cli/default.nix index 6020d6fe8765d..ca8b40c4d53bc 100644 --- a/pkgs/development/tools/wally-cli/default.nix +++ b/pkgs/development/tools/wally-cli/default.nix @@ -19,14 +19,14 @@ buildGoPackage rec { }; postInstall = '' - mv $bin/bin/cli $bin/bin/wally + mv $out/bin/cli $out/bin/wally ''; goDeps = ./deps.nix; meta = with lib; { description = "A tool to flash firmware to mechanical keyboards"; - homepage = https://ergodox-ez.com/pages/wally-planck; + homepage = "https://ergodox-ez.com/pages/wally-planck"; license = licenses.mit; maintainers = [ maintainers.spacekookie ]; }; diff --git a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch index 29886fccd5f13..86fbb81de0540 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch +++ b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch @@ -1,6 +1,6 @@ -From 786cd8df9e9fa245c4dbab1bfd21b7949b8a5300 Mon Sep 17 00:00:00 2001 +From a13aff157f899a6388b3c9e621680049f329a028 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> -Date: Thu, 26 Mar 2020 01:54:11 +0100 +Date: Fri, 1 May 2020 23:44:08 +0200 Subject: [PATCH] Add cargo.lock --- @@ -10,7 +10,7 @@ Subject: [PATCH] Add cargo.lock diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 00000000..976ea6d4 +index 00000000..4822cea1 --- /dev/null +++ b/Cargo.lock @@ -0,0 +1,2527 @@ @@ -49,9 +49,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "anyhow" -+version = "1.0.27" ++version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "013a6e0a2cbe3d20f9c60b65458f7a7f7a5e636c5d0f45a5a6aee5d4b1f01785" ++checksum = "d9a60d744a80c30fcb657dfe2c1b22bcb3e814c1a1e3674f32bf5820b570fbff" + +[[package]] +name = "arrayref" @@ -213,9 +213,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "cc" -+version = "1.0.50" ++version = "1.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" ++checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d" + +[[package]] +name = "cfg-if" @@ -359,9 +359,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "curl" -+version = "0.4.28" ++version = "0.4.29" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eda1c0c03cacf3365d84818a40293f0e3f3953db8759c9c565a3b434edf0b52e" ++checksum = "762e34611d2d5233a506a79072be944fddd057db2f18e04c0d6fa79e3fd466fd" +dependencies = [ + "curl-sys", + "libc", @@ -374,9 +374,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "curl-sys" -+version = "0.4.30+curl-7.69.1" ++version = "0.4.31+curl-7.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "923b38e423a8f47a4058e96f2a1fa2865a6231097ee860debd678d244277d50c" ++checksum = "dcd62757cc4f5ab9404bc6ca9f0ae447e729a1403948ce5106bd588ceac6a3b0" +dependencies = [ + "cc", + "libc", @@ -494,9 +494,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "filetime" -+version = "0.2.8" ++version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d" ++checksum = "f59efc38004c988e4201d11d263b8171f49a2e7ec0bdbb71773433f271504a5e" +dependencies = [ + "cfg-if", + "libc", @@ -604,9 +604,9 @@ index 00000000..976ea6d4 +checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7" +dependencies = [ + "proc-macro-hack", -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", -+ "syn 1.0.17", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", ++ "syn 1.0.18", +] + +[[package]] @@ -692,9 +692,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "hermit-abi" -+version = "0.1.8" ++version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8" ++checksum = "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4" +dependencies = [ + "libc", +] @@ -772,9 +772,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "jpeg-decoder" -+version = "0.1.18" ++version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0256f0aec7352539102a9efbcb75543227b7ab1117e0f95450023af730128451" ++checksum = "5b47b4c4e017b01abdc5bcc126d2d1002e5a75bbe3ce73f9f4f311a916363704" +dependencies = [ + "byteorder", + "rayon", @@ -782,7 +782,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "js-sys" -+version = "0.3.37" ++version = "0.3.39" +dependencies = [ + "wasm-bindgen", + "wasm-bindgen-futures", @@ -811,9 +811,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "libc" -+version = "0.2.68" ++version = "0.2.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" ++checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" + +[[package]] +name = "libz-sys" @@ -1001,9 +1001,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "num_cpus" -+version = "1.12.0" ++version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ + "hermit-abi", + "libc", @@ -1011,9 +1011,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "openssl" -+version = "0.10.28" ++version = "0.10.29" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "973293749822d7dd6370d6da1e523b0d1db19f06c459134c658b2a4261378b52" ++checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd" +dependencies = [ + "bitflags 1.2.1", + "cfg-if", @@ -1031,18 +1031,18 @@ index 00000000..976ea6d4 + +[[package]] +name = "openssl-src" -+version = "111.7.0+1.1.1e" ++version = "111.9.0+1.1.1g" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6fde5a8c01ef8aa31ff8d0aaf9bae248581ed8840fca0b66e51cc9f294a8cb2c" ++checksum = "a2dbe10ddd1eb335aba3780eb2eaa13e1b7b441d2562fd962398740927f39ec4" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" -+version = "0.9.54" ++version = "0.9.55" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986" ++checksum = "7717097d810a0f2e2323f9e5d11e71608355e24828410b55b9d4f18aa5f9a5d8" +dependencies = [ + "autocfg 1.0.0", + "cc", @@ -1108,9 +1108,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "pin-utils" -+version = "0.1.0-alpha.4" ++version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587" ++checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" @@ -1167,35 +1167,35 @@ index 00000000..976ea6d4 + +[[package]] +name = "proc-macro-error" -+version = "0.4.12" ++version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7" ++checksum = "98e9e4b82e0ef281812565ea4751049f1bdcdfccda7d3f459f2e138a40c08678" +dependencies = [ + "proc-macro-error-attr", -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", -+ "syn 1.0.17", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", ++ "syn 1.0.18", + "version_check 0.9.1", +] + +[[package]] +name = "proc-macro-error-attr" -+version = "0.4.12" ++version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de" ++checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53" +dependencies = [ -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", -+ "syn 1.0.17", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", ++ "syn 1.0.18", + "syn-mid", + "version_check 0.9.1", +] + +[[package]] +name = "proc-macro-hack" -+version = "0.5.14" ++version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fcfdefadc3d57ca21cf17990a28ef4c0f7c61383a28cb7604cf4a18e6ede1420" ++checksum = "0d659fe7c6d27f25e9d80a1a094c223f5246f6a6596453e09d7229bf42750b63" + +[[package]] +name = "proc-macro-nested" @@ -1214,9 +1214,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "proc-macro2" -+version = "1.0.9" ++version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435" ++checksum = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3" +dependencies = [ + "unicode-xid 0.2.0", +] @@ -1238,11 +1238,11 @@ index 00000000..976ea6d4 + +[[package]] +name = "quote" -+version = "1.0.3" ++version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f" ++checksum = "4c1f4b0efa5fc5e8ceb705136bfee52cfdb6a4e3509f770b478cd6ed434232a7" +dependencies = [ -+ "proc-macro2 1.0.9", ++ "proc-macro2 1.0.10", +] + +[[package]] @@ -1495,9 +1495,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "regex" -+version = "1.3.6" ++version = "1.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7f6946991529684867e47d86474e3a6d0c0ab9b82d5821e314b1ede31fa3a4b3" ++checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692" +dependencies = [ + "aho-corasick", + "memchr", @@ -1578,9 +1578,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "ryu" -+version = "1.0.3" ++version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76" ++checksum = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1" + +[[package]] +name = "safemem" @@ -1628,29 +1628,29 @@ index 00000000..976ea6d4 + +[[package]] +name = "serde" -+version = "1.0.105" ++version = "1.0.106" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e707fbbf255b8fc8c3b99abb91e7257a622caeb20a9818cbadbeeede4e0932ff" ++checksum = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" -+version = "1.0.105" ++version = "1.0.106" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac5d00fc561ba2724df6758a17de23df5914f20e41cb00f94d5b7ae42fffaff8" ++checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c" +dependencies = [ -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", -+ "syn 1.0.17", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", ++ "syn 1.0.18", +] + +[[package]] +name = "serde_json" -+version = "1.0.48" ++version = "1.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9371ade75d4c2d6cb154141b9752cf3781ec9c05e0e5cf35060e1e70ee7b9c25" ++checksum = "a7894c8ed05b7a3a279aeb79025fdec1d3158080b75b98a08faf2806bb799edd" +dependencies = [ + "itoa", + "ryu", @@ -1677,15 +1677,15 @@ index 00000000..976ea6d4 + +[[package]] +name = "smallvec" -+version = "1.2.0" ++version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc" ++checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" + +[[package]] +name = "socket2" -+version = "0.3.11" ++version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" ++checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" +dependencies = [ + "cfg-if", + "libc", @@ -1713,9 +1713,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "structopt" -+version = "0.3.12" ++version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c8faa2719539bbe9d77869bfb15d4ee769f99525e707931452c97b693b3f159d" ++checksum = "863246aaf5ddd0d6928dfeb1a9ca65f505599e4e1b399935ef7e75107516b4ef" +dependencies = [ + "clap", + "lazy_static", @@ -1724,15 +1724,15 @@ index 00000000..976ea6d4 + +[[package]] +name = "structopt-derive" -+version = "0.4.5" ++version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f88b8e18c69496aad6f9ddf4630dd7d585bcaf765786cb415b9aec2fe5a0430" ++checksum = "d239ca4b13aee7a2142e6795cbd69e457665ff8037aed33b3effdc430d2f927a" +dependencies = [ + "heck", + "proc-macro-error", -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", -+ "syn 1.0.17", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", ++ "syn 1.0.18", +] + +[[package]] @@ -1748,12 +1748,12 @@ index 00000000..976ea6d4 + +[[package]] +name = "syn" -+version = "1.0.17" ++version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03" ++checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213" +dependencies = [ -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", + "unicode-xid 0.2.0", +] + @@ -1763,9 +1763,9 @@ index 00000000..976ea6d4 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" +dependencies = [ -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", -+ "syn 1.0.17", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", ++ "syn 1.0.18", +] + +[[package]] @@ -1832,21 +1832,20 @@ index 00000000..976ea6d4 + +[[package]] +name = "threadpool" -+version = "1.7.1" ++version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865" ++checksum = "e8dae184447c15d5a6916d973c642aec485105a13cd238192a6927ae3e077d66" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "time" -+version = "0.1.42" ++version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" ++checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +dependencies = [ + "libc", -+ "redox_syscall", + "winapi", +] + @@ -1900,9 +1899,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "trybuild" -+version = "1.0.24" ++version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "24b4e093c5ed1a60b22557090120aa14f90ca801549c0949d775ea07c1407720" ++checksum = "4e5696e4fd793743fbcc29943fe965ea3993b6c3d2a6a3a35c6680d926fd3a49" +dependencies = [ + "glob", + "lazy_static", @@ -2038,9 +2037,9 @@ index 00000000..976ea6d4 +checksum = "2bc16925d405153a91e01cdac2a5549aa25ca9148b5176e25e601f6536344d94" +dependencies = [ + "heck", -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", -+ "syn 1.0.17", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", ++ "syn 1.0.18", +] + +[[package]] @@ -2051,7 +2050,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ + "cfg-if", + "js-sys", @@ -2067,7 +2066,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-anyref-xform" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ + "anyhow", + "rayon", @@ -2079,14 +2078,14 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-backend" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ + "bumpalo", + "lazy_static", + "log 0.4.8", -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", -+ "syn 1.0.17", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", ++ "syn 1.0.18", + "wasm-bindgen-shared", +] + @@ -2100,7 +2099,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-cli" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ + "anyhow", + "assert_cmd", @@ -2128,7 +2127,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-cli-support" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ + "anyhow", + "base64 0.9.3", @@ -2150,7 +2149,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-futures" -+version = "0.4.10" ++version = "0.4.12" +dependencies = [ + "cfg-if", + "futures-channel-preview", @@ -2162,9 +2161,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-macro" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ -+ "quote 1.0.3", ++ "quote 1.0.4", + "trybuild", + "wasm-bindgen", + "wasm-bindgen-futures", @@ -2173,18 +2172,18 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-macro-support" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", -+ "syn 1.0.17", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", ++ "syn 1.0.18", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-multi-value-xform" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ + "anyhow", + "rayon", @@ -2205,11 +2204,11 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-shared" -+version = "0.2.60" ++version = "0.2.62" + +[[package]] +name = "wasm-bindgen-test" -+version = "0.3.10" ++version = "0.3.12" +dependencies = [ + "console_error_panic_hook", + "js-sys", @@ -2235,15 +2234,15 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-test-macro" -+version = "0.3.10" ++version = "0.3.12" +dependencies = [ -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", +] + +[[package]] +name = "wasm-bindgen-threads-xform" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ + "anyhow", + "walrus", @@ -2252,7 +2251,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-wasm-conventions" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ + "anyhow", + "walrus", @@ -2260,7 +2259,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-wasm-interpreter" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ + "anyhow", + "log 0.4.8", @@ -2271,18 +2270,18 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-webidl" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ + "anyhow", + "env_logger", + "heck", + "lazy_static", + "log 0.4.8", -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", + "sourcefile", + "structopt", -+ "syn 1.0.17", ++ "syn 1.0.18", + "wasm-bindgen-backend", + "weedle", +] @@ -2336,25 +2335,25 @@ index 00000000..976ea6d4 + +[[package]] +name = "wast" -+version = "11.0.0" ++version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df4d67ba9266f4fcaf2e8a1afadc5e2a959e51aecc07b1ecbdf85a6ddaf08bde" ++checksum = "47b11c94c63d5365a76ea287f8e6e5b6050233fae4b2423aea2a1e126a385e17" +dependencies = [ + "leb128", +] + +[[package]] +name = "wat" -+version = "1.0.12" ++version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a9400dc1c8512087b2d974b1b9b0a6c4e6e26e7e8acf629e3e351165a1ed301" ++checksum = "03db18bc33cff3859c296efbefdcc00763a644539feeadca3415a1cee8a2835d" +dependencies = [ -+ "wast 11.0.0", ++ "wast 14.0.0", +] + +[[package]] +name = "web-sys" -+version = "0.3.37" ++version = "0.3.39" +dependencies = [ + "js-sys", + "wasm-bindgen", @@ -2393,6 +2392,7 @@ index 00000000..976ea6d4 +name = "websockets" +version = "0.1.0" +dependencies = [ ++ "js-sys", + "wasm-bindgen", + "web-sys", +] @@ -2437,9 +2437,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "winapi-util" -+version = "0.1.3" ++version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] @@ -2542,5 +2542,5 @@ index 00000000..976ea6d4 + "web-sys", +] -- -2.25.0 +2.25.4 diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index ee9a6ead7fa17..9adabeb573fd1 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -2,24 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.60"; + version = "0.2.62"; src = fetchFromGitHub { owner = "rustwasm"; repo = "wasm-bindgen"; rev = version; - sha256 = "1jr4v5y9hbkyg8gjkr3qc2qxwhyagfs8q3y3z248mr1919mcas8h"; + sha256 = "0d3ph3g220nvzwxa71rch03j5c0w06v8z4lmlyp5kky6p86r37hz"; }; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkgconfig ]; - cargoSha256 = "08g110qahipgm1qyyihgqwnkr23w0gk1gp63ici5dj2qsxnc4mxv"; + cargoSha256 = "13lj2yx2bcwac1b4gpwcgiwqvy178zis6r1pidn4pgwqv7zxa7p2"; cargoPatches = [ ./0001-Add-cargo.lock.patch ]; cargoBuildFlags = [ "-p" pname ]; meta = with lib; { - homepage = https://rustwasm.github.io/docs/wasm-bindgen/; + homepage = "https://rustwasm.github.io/docs/wasm-bindgen/"; license = licenses.asl20; description = "Facilitating high-level interactions between wasm modules and JavaScript"; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index 77920dfeeed9d..e36e811ea564e 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A utility that builds rust-generated WebAssembly package"; - homepage = https://github.com/rustwasm/wasm-pack; + homepage = "https://github.com/rustwasm/wasm-pack"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.dhkl ]; platforms = platforms.all; diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index 3a58e1088ea2c..63f2b0e4933d1 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Watches files and takes action when they change"; - homepage = https://facebook.github.io/watchman; + homepage = "https://facebook.github.io/watchman"; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; linux ++ darwin; license = licenses.asl20; diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix index f1edd52eca2ec..b89d36273f86a 100644 --- a/pkgs/development/tools/wiggle/default.nix +++ b/pkgs/development/tools/wiggle/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://blog.neil.brown.name/category/wiggle/; + homepage = "http://blog.neil.brown.name/category/wiggle/"; description = "Tool for applying patches with conflicts"; longDescription = '' diff --git a/pkgs/development/tools/wiiload/default.nix b/pkgs/development/tools/wiiload/default.nix index 95f54050184d4..37d909461d078 100644 --- a/pkgs/development/tools/wiiload/default.nix +++ b/pkgs/development/tools/wiiload/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Load homebrew apps over network/usbgecko to your Wii"; - homepage = https://wiibrew.org/wiki/Wiiload; + homepage = "https://wiibrew.org/wiki/Wiiload"; license = licenses.gpl2; maintainers = with maintainers; [ tomsmeets ]; }; diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix index e0c897499d2a3..500fde0ef4791 100644 --- a/pkgs/development/tools/winpdb/default.nix +++ b/pkgs/development/tools/winpdb/default.nix @@ -43,7 +43,7 @@ pythonPackages.buildPythonApplication rec { multiple threads, namespace modification, embedded debugging, encrypted communication and is up to 20 times faster than pdb. ''; - homepage = http://winpdb.org/; + homepage = "http://winpdb.org/"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix index da1b493b0d2a2..9525389564850 100644 --- a/pkgs/development/tools/ws/default.nix +++ b/pkgs/development/tools/ws/default.nix @@ -18,9 +18,8 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "websocket command line tool"; - homepage = https://github.com/hashrocket/ws; + homepage = "https://github.com/hashrocket/ws"; license = licenses.mit; - maintainers = [ maintainers.the-kenny ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index 8090aca5ff303..cb2e6edd0e10f 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Xcode-compatible build tool"; - homepage = https://github.com/facebook/xcbuild; + homepage = "https://github.com/facebook/xcbuild"; platforms = platforms.unix; maintainers = with maintainers; [ copumpkin matthewbauer ]; license = with licenses; [ bsd2 bsd3 ]; diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index cd7b861636679..861ef0fc84736 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -110,11 +110,15 @@ runCommand "xcodebuild-${xcbuild.version}" { mkdir -p $out/Applications/Xcode.app/Contents ln -s $out $out/Applications/Xcode.app/Contents/Developer + # The native xcodebuild command supports an invocation like "xcodebuild -version -sdk" without specifying the specific SDK, so we simulate this by + # detecting this case and simulating the output; printing the header and appending the normal output via appending the sdk version to the positional + # arguments we pass through to the wrapped xcodebuild. makeWrapper ${xcbuild}/bin/xcodebuild $out/bin/xcodebuild \ --add-flags "-xcconfig ${xcconfig}" \ --add-flags "DERIVED_DATA_DIR=." \ --set DEVELOPER_DIR "$out" \ --set SDKROOT ${sdkName} \ + --run '[ "$#" -eq 2 ] && [ "$1" = "-version" ] && [ "$2" = "-sdk" ] && echo ${sdkName}.sdk - macOS ${sdkVer} \(macosx${sdkVer}\) && set -- "$@" "${sdkName}"' \ --run '[ "$1" = "-version" ] && [ "$#" -eq 1 ] && (echo Xcode ${xcodeVer}; echo Build version ${sdkBuildVersion}) && exit 0' \ --run '[ "$1" = "-license" ] && exit 0' diff --git a/pkgs/development/tools/xcpretty/default.nix b/pkgs/development/tools/xcpretty/default.nix index 84a6798afe33c..9c24b98100505 100644 --- a/pkgs/development/tools/xcpretty/default.nix +++ b/pkgs/development/tools/xcpretty/default.nix @@ -12,7 +12,7 @@ bundlerApp { meta = with lib; { description = "Flexible and fast xcodebuild formatter"; - homepage = https://github.com/supermarin/xcpretty; + homepage = "https://github.com/supermarin/xcpretty"; license = licenses.mit; maintainers = with maintainers; [ nicknovitski diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix index f31a119bb657a..e1427476dd8c8 100644 --- a/pkgs/development/tools/yaml2json/default.nix +++ b/pkgs/development/tools/yaml2json/default.nix @@ -16,7 +16,7 @@ buildGoPackage { }; meta = with stdenv.lib; { - homepage = https://github.com/bronze1man/yaml2json; + homepage = "https://github.com/bronze1man/yaml2json"; description = "Convert yaml to json"; license = with licenses; [ mit ]; maintainers = [ maintainers.adisbladis ]; diff --git a/pkgs/development/tools/ydiff/default.nix b/pkgs/development/tools/ydiff/default.nix index c2f72138db5fc..f3ecbb451f655 100644 --- a/pkgs/development/tools/ydiff/default.nix +++ b/pkgs/development/tools/ydiff/default.nix @@ -31,7 +31,7 @@ buildPythonApplication rec { checkTarget = if isPy3k then "test3" else "test"; meta = { - homepage = https://github.com/ymattw/ydiff; + homepage = "https://github.com/ymattw/ydiff"; description = "View colored, incremental diff in workspace or from stdin"; longDescription = '' Term based tool to view colored, incremental diff in a version diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 9041667a0fc78..882199a82a93b 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "mikefarah"; rev = version; repo = "yq"; - sha256 = "1n20m1zizbkgzag4676fvf16h6f8vll6pniblj7haqdwvnza8zwd"; + sha256 = "1jll5nmskvs61031h3sizhv3scv8znrr9apyc4qlxcp4jiv7xpmp"; }; - modSha256 = "0hbazc6hf3zrni25lpbyi36sbxyabbrpi591gkqwxgr9hdbdpcg9"; + vendorSha256 = "0rlvbyhl53x1bhwr7f7zs4swa580saak19z3d3g58srq3jyw6zlc"; meta = with lib; { description = "Portable command-line YAML processor"; @@ -19,4 +19,4 @@ buildGoModule rec { license = [ licenses.mit ]; maintainers = [ maintainers.lewo ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix index e9b54e67f5e2e..c15fad0159901 100644 --- a/pkgs/development/tools/yq/default.nix +++ b/pkgs/development/tools/yq/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { meta = with lib; { description = "Command-line YAML processor - jq wrapper for YAML documents."; - homepage = https://github.com/kislyuk/yq; + homepage = "https://github.com/kislyuk/yq"; license = [ licenses.asl20 ]; maintainers = [ maintainers.womfoo ]; }; diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix index 82fac9f6be794..70160c1ce6649 100644 --- a/pkgs/development/tools/yuicompressor/default.nix +++ b/pkgs/development/tools/yuicompressor/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A JavaScript and CSS minifier"; - homepage = http://yui.github.io/yuicompressor/; + homepage = "http://yui.github.io/yuicompressor/"; license = licenses.bsd3; maintainers = with maintainers; [ jwiegley ]; platforms = platforms.all; diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix index 4db0da4f418b7..a1c656fb766e2 100644 --- a/pkgs/development/web/csslint/default.nix +++ b/pkgs/development/web/csslint/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { rules to the code that look for problematic patterns or signs of inefficiency. The rules are all pluggable, so you can easily write your own or omit ones you don't want. ''; - homepage = https://nodejs.org; + homepage = "https://nodejs.org"; license = licenses.bsd2; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 2b6449d9dd4d4..10701f6b445d3 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec{ pname = "cypress"; - version = "4.2.0"; + version = "4.5.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "0ksa7c0bpq13xxgk0qizg3kfyjihcqan5wm6f45v7kgz3wwxc4nz"; + sha256 = "0pr9b36s63xplmyjgjdifw5pgas7bxwbnsckjix7djyln0j5ja3q"; }; # don't remove runtime deps diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix new file mode 100644 index 0000000000000..629c1eeb41a13 --- /dev/null +++ b/pkgs/development/web/deno/default.nix @@ -0,0 +1,139 @@ +{ stdenv +, fetchurl +, fetchFromGitHub +, rust +, rustPlatform +, python27 +, installShellFiles +, Security +, CoreServices +}: +let + pname = "deno"; + version = "1.0.0"; + + denoSrc = fetchFromGitHub { + owner = "denoland"; + repo = pname; + rev = "v${version}"; + sha256 = "0k8mqy1hf9hkp60jhd0x4z814y36g51083b3r7prc69ih2523hd1"; + + fetchSubmodules = true; + }; + cargoSha256 = "1fjl07qqvl1f20qazcqxh32xmdfh80jni7i3jzvz6vgsfw1g5cmk"; + + rustyV8Lib = fetchlib "rusty_v8" "0.4.2" { + x86_64-linux = "1ac6kv3kv087df6kdgfd7kbh24187cg9z7xhbz6rw6jjv4ci2zbi"; + aarch64-linux = "06iyjx4p4vp2i81wdy0vxai2k18pki972ff7k0scjqrgmnav1p8k"; + x86_64-darwin = "02hwbpsqdzb9mvfndgykvv44f1jig3w3a26l0h26hs5shsrp47jv"; + }; + + arch = rust.toRustTarget stdenv.hostPlatform; + fetchlib = name: version: sha256: fetchurl { + url = "https://github.com/denoland/${name}/releases/download/v${version}/librusty_v8_release_${arch}.a"; + sha256 = sha256."${stdenv.hostPlatform.system}"; + meta = { inherit version; }; + }; +in +rustPlatform.buildRustPackage rec { + inherit pname version cargoSha256; + + src = denoSrc; + + nativeBuildInputs = [ + # chromium/V8 requires python 2.7, we're not building V8 from source + # but as a result rusty_v8's download script also uses python 2.7 + # tracking issue: https://bugs.chromium.org/p/chromium/issues/detail?id=942720 + python27 + + # Install completions post-install + installShellFiles + ]; + + buildInputs = with stdenv.lib; [ ] + ++ optionals stdenv.isDarwin [ Security CoreServices ]; + + # The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem + # To avoid this we pre-download the file and place it in the locations it will require it in advance + preBuild = '' + # Check the rusty_v8 lib downloaded matches the Cargo.lock file + rusty_v8_ver="$(grep 'name = "rusty_v8"' -A 1 Cargo.lock | grep "version =" | cut -d\" -f2)" + if [ "${rustyV8Lib.meta.version}" != "$rusty_v8_ver" ]; then + printf "%s\n" >&2 \ + "version mismatch between 'rusty_v8' in Cargo.lock and downloaded library:" \ + " wanted: ${rustyV8Lib.meta.version}" \ + " got: $rusty_v8_ver" + exit 1 + fi; + + _rusty_v8_setup() { + for v in "$@"; do + dir="target/$v/gn_out/obj" + mkdir -p "$dir" && cp "${rustyV8Lib}" "$dir/librusty_v8.a" + done + } + + # Copy over the `librusty_v8.a` file inside target/XYZ/gn_out/obj, symlink not allowed + _rusty_v8_setup "debug" "release" "${arch}/release" + ''; + + # Set home to existing env var TMP dir so tests that write there work correctly + preCheck = '' + export HOME="$TMPDIR" + ''; + + checkFlags = [ + # Strace not allowed on hydra + "--skip benchmark_test" + + # Tests that try to write to `/build/source/target/debug` + "--skip _017_import_redirect" + "--skip https_import" + "--skip js_unit_tests" + "--skip lock_write_fetch" + + # Cargo test runs a deno test on the std lib with sub-benchmarking-tests, + # The sub-sub-tests that are failing: + # forAwaitFetchDenolandX10, promiseAllFetchDenolandX10is + # Trying to access https://deno.land/ on build's limited network access + "--skip std_tests" + + # Fails on aarch64 machines + # tracking issue: https://github.com/denoland/deno/issues/5324 + "--skip run_v8_flags" + + # Skip for multiple reasons: + # downloads x86_64 binary on aarch64 machines + # tracking issue: https://github.com/denoland/deno/pull/5402 + # downloads a binary that needs ELF patching & tries to run imediately + # upgrade will likely never work with nix as it tries to replace itself + # code: https://github.com/denoland/deno/blob/v1.0.0/cli/upgrade.rs#L211 + "--skip upgrade_in_tmpdir" + "--skip upgrade_with_version_in_tmpdir" + ]; + + # TODO: Move to enhanced installShellCompletion when merged: PR #83630 + postInstall = '' + $out/bin/deno completions bash > deno.bash + $out/bin/deno completions fish > deno.fish + $out/bin/deno completions zsh > _deno + installShellCompletion deno.{bash,fish} --zsh _deno + ''; + + meta = with stdenv.lib; { + homepage = "https://deno.land/"; + description = "A secure runtime for JavaScript and TypeScript"; + longDescription = '' + Deno aims to be a productive and secure scripting environment for the modern programmer. + Deno will always be distributed as a single executable. + Given a URL to a Deno program, it is runnable with nothing more than the ~15 megabyte zipped executable. + Deno explicitly takes on the role of both runtime and package manager. + It uses a standard browser-compatible protocol for loading modules: URLs. + Among other things, Deno is a great replacement for utility scripts that may have been historically written with + bash or python. + ''; + license = licenses.mit; + maintainers = with maintainers; [ jk ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 965a53dcdbda6..3392860159178 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,25 +2,24 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.110"; + version = "0.0.123"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "1fvvanyzrai41fq98msjwzgwsidxbaly6f6knma6lwmicv4f9svg"; + sha256 = "1gs796n2cw8kpfsqr21zqxzp8dmnhhmjfy7vnpi838566i5ql9q3"; }; preBuild = '' go generate ./... ''; - preFixup = '' - rm $out/bin/doc - rm $out/bin/helpgen - ''; + subPackages = [ "." ]; + + vendorSha256 = "10wcyxzkwvbhf86dq1rh852zgdg28draay0515zp459z34vv4zna"; - modSha256 = "0lnk2g5msqhhshh99s32sqd793rdlzmp7vhqdb1fd6qafrrrxm5w"; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/superfly/flyctl/flyctl.Version=${version} -X github.com/superfly/flyctl/flyctl.Commit=${src.rev} -X github.com/superfly/flyctl/flyctl.BuildDate=1970-01-01T00:00:00+0000 -X github.com/superfly/flyctl/flyctl.Environment=production" ]; meta = with lib; { description = "Command line tools for fly.io services"; @@ -28,5 +27,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ aaronjanse ]; }; -} - +} \ No newline at end of file diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix index ec1ec527c5ef3..0ba764ddbfda7 100644 --- a/pkgs/development/web/kcgi/default.nix +++ b/pkgs/development/web/kcgi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { - homepage = https://kristaps.bsd.lv/kcgi; + homepage = "https://kristaps.bsd.lv/kcgi"; description = "Minimal CGI and FastCGI library for C/C++"; license = licenses.isc; platforms = platforms.all; diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix index a59db6d4d1ae1..9cf74354f6edc 100644 --- a/pkgs/development/web/kore/default.nix +++ b/pkgs/development/web/kore/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An easy to use web application framework for C"; - homepage = https://kore.io; + homepage = "https://kore.io"; license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ johnmh ]; diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/development/web/lucky-cli/default.nix new file mode 100644 index 0000000000000..76f40de4ed13f --- /dev/null +++ b/pkgs/development/web/lucky-cli/default.nix @@ -0,0 +1,42 @@ +{ lib, fetchFromGitHub, crystal, makeWrapper, openssl }: + +crystal.buildCrystalPackage rec { + pname = "lucky-cli"; + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "luckyframework"; + repo = "lucky_cli"; + rev = "v${version}"; + sha256 = "0n7fgnsivf39bkxpf7xgg9dqkam08axdn1j45wl1n0r4qmfkjs94"; + }; + + # the integration tests will try to clone a remote repos + postPatch = '' + rm -rf spec/integration + ''; + + format = "crystal"; + + lockFile = ./shard.lock; + shardsFile = ./shards.nix; + + crystalBinaries.lucky.src = "src/lucky.cr"; + + buildInputs = [ openssl ]; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/lucky \ + --prefix PATH : ${lib.makeBinPath [ crystal ]} + ''; + + meta = with lib; { + description = + "A Crystal library for creating and running tasks. Also generates Lucky projects"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/web/lucky-cli/shard.lock b/pkgs/development/web/lucky-cli/shard.lock new file mode 100644 index 0000000000000..6564e86624f7a --- /dev/null +++ b/pkgs/development/web/lucky-cli/shard.lock @@ -0,0 +1,5 @@ +version: 1.0 +shards: + teeplate: + github: luckyframework/teeplate + version: 0.8.1 diff --git a/pkgs/development/web/lucky-cli/shards.nix b/pkgs/development/web/lucky-cli/shards.nix new file mode 100644 index 0000000000000..0fa5aec9e06da --- /dev/null +++ b/pkgs/development/web/lucky-cli/shards.nix @@ -0,0 +1,8 @@ +{ + teeplate = { + owner = "luckyframework"; + repo = "teeplate"; + rev = "v0.8.1"; + sha256 = "022jmmg3d2wq2xnhc63afldm9vrcr8xqn43s9i39d7qflrzrfc7v"; + }; +} diff --git a/pkgs/development/web/mailcatcher/default.nix b/pkgs/development/web/mailcatcher/default.nix index f960fe1927804..8be3c7ebb932b 100644 --- a/pkgs/development/web/mailcatcher/default.nix +++ b/pkgs/development/web/mailcatcher/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "SMTP server and web interface to locally test outbound emails"; - homepage = https://mailcatcher.me/; + homepage = "https://mailcatcher.me/"; license = licenses.mit; maintainers = with maintainers; [ zarelit nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index 3752519d06098..b813e87b54308 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minify"; - version = "2.7.3"; + version = "2.7.4"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - sha256 = "12jns7m9liyjg9wy8ynvji2d2g4k2z1ymp6k3610mivmvg159sy4"; + sha256 = "06xzb681g4lfrpqa1rhpq5mm83vpik8qp6gjxqm2n21bfph88jm2"; }; - modSha256 = "09jk3mxf7n9wf1cgyiw9mhsr55fb12k399dmzhnib3vhd9xav15i"; + vendorSha256 = "120d3nzk8cr5496cxp5p6ydlzw9mmpg7dllqhv1kpgwlbxmd8vr3"; buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; @@ -20,4 +20,4 @@ buildGoModule rec { license = licenses.mit; homepage = "https://go.tacodewolff.nl/minify"; }; -} +} \ No newline at end of file diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index dce8479d219e2..5eeed80007bf1 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, python2, zlib, libuv, utillinux, http-parser +{ stdenv, fetchurl, openssl, python, zlib, libuv, utillinux, http-parser , pkgconfig, which # Updater dependencies , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell @@ -55,7 +55,7 @@ in buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ] ++ [ zlib libuv openssl http-parser icu ]; - nativeBuildInputs = [ which utillinux pkgconfig python2 ] + nativeBuildInputs = [ which utillinux pkgconfig python ] ++ optionals stdenv.isDarwin [ xcbuild ]; configureFlags = let @@ -139,11 +139,11 @@ in meta = { description = "Event-driven I/O framework for the V8 JavaScript engine"; - homepage = https://nodejs.org; + homepage = "https://nodejs.org"; license = licenses.mit; maintainers = with maintainers; [ goibhniu gilligan cko ]; platforms = platforms.linux ++ platforms.darwin; }; - passthru.python = python2; # to ensure nodeEnv uses the same version + passthru.python = python; # to ensure nodeEnv uses the same version } diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 9a50d5fbd3550..612cccbe8776f 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -1,10 +1,13 @@ -{ callPackage, openssl, enableNpm ? true }: +{ callPackage, openssl, icu, python2, enableNpm ? true }: let - buildNodejs = callPackage ./nodejs.nix { inherit openssl; }; + buildNodejs = callPackage ./nodejs.nix { + inherit openssl icu; + python = python2; + }; in buildNodejs { inherit enableNpm; - version = "10.20.0"; - sha256 = "0cvjwnl0wkcsyw3kannbdv01s235wrnp11n2s6swzjx95gpichfi"; + version = "10.20.1"; + sha256 = "14pljmfr0dkj6y63j0qzj173kdpbbs4v1g4v56hyv2k09jh8h7zf"; } diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 6d7f213536a61..af8595b5641d8 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -1,10 +1,13 @@ -{ callPackage, openssl, icu, enableNpm ? true }: +{ callPackage, openssl, icu, python2, enableNpm ? true }: let - buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; }; + buildNodejs = callPackage ./nodejs.nix { + inherit openssl icu; + python = python2; + }; in buildNodejs { inherit enableNpm; - version = "12.16.2"; - sha256 = "0y5yd6h13fr34byi7h5xdjaivgcxiz0ykcmpk9nm5ra01b54fp2m"; + version = "12.16.3"; + sha256 = "18srfcv9zi39960szdnd4rgfj9w295z1agjvpw8arwn75449nmgh"; } diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix index 8676214b50b25..f157269b63643 100644 --- a/pkgs/development/web/nodejs/v13.nix +++ b/pkgs/development/web/nodejs/v13.nix @@ -1,10 +1,13 @@ -{ callPackage, openssl, icu, enableNpm ? true }: +{ callPackage, openssl, icu, python3, enableNpm ? true }: let - buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; }; + buildNodejs = callPackage ./nodejs.nix { + inherit openssl icu; + python = python3; + }; in buildNodejs { inherit enableNpm; - version = "13.12.0"; - sha256 = "199qcvzikdzw0h25v9dws77fff6hbvr8dj50lyzlnkya1dd6fzhd"; + version = "13.14.0"; + sha256 = "1gi9nl99wsiqpwm266jdsa8g6rmjw4wqwgrkx9f2qk1y3hjcs0vf"; } diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix new file mode 100644 index 0000000000000..da7bf09e9fdd4 --- /dev/null +++ b/pkgs/development/web/nodejs/v14.nix @@ -0,0 +1,14 @@ +{ callPackage, openssl, icu66, python3, enableNpm ? true }: + +let + buildNodejs = callPackage ./nodejs.nix { + inherit openssl; + icu = icu66; + python = python3; + }; +in + buildNodejs { + inherit enableNpm; + version = "14.3.0"; + sha256 = "0xqs9z0pxx8m5dk9gm1r9pxfk9vdmpvfsj94mfdkqar578nfm8gi"; + } diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix index eb3254dcd3abb..3016ba4cb84b1 100644 --- a/pkgs/development/web/now-cli/default.nix +++ b/pkgs/development/web/now-cli/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { - homepage = https://zeit.co/now; + homepage = "https://zeit.co/now"; description = "The Command Line Interface for Now - Global Serverless Deployments"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index ba304972d9a1b..e56ab1bbba799 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "7.21.2"; + version = "7.24.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "18lb8csfmy5j97zdg3c5l23aaw9hjg04qhfc1sz9pgi7xhwz5g1b"; + sha256 = "0wriyj58icgljmghghyxi1mnjr1vh5jyp8lzwcf6lcsdvsh0ccmw"; name = "${pname}.tar.gz"; }; diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix index d56819be0195c..d9cc433fd8470 100644 --- a/pkgs/development/web/remarkjs/default.nix +++ b/pkgs/development/web/remarkjs/default.nix @@ -6,7 +6,7 @@ let # highlight.js is a git submodule of remark highlightjs = fetchgit { - url = https://github.com/isagalaev/highlight.js; + url = "https://github.com/isagalaev/highlight.js"; rev = "10b9500b67983f0a9c42d8ce8bf8e8c469f7078c"; sha256 = "1yy8by15kfklw8lwh17z1swpj067q0skjjih12yawbryraig41m0"; }; @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = http://remarkjs.com; + homepage = "https://remarkjs.com"; description = "A simple, in-browser, markdown-driven slideshow tool"; maintainers = []; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix index 796f73dd68362..3910aedb338d2 100644 --- a/pkgs/development/web/remarkjs/node-packages.nix +++ b/pkgs/development/web/remarkjs/node-packages.nix @@ -3267,7 +3267,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A markdown parser built for speed"; - homepage = https://marked.js.org/; + homepage = "https://marked.js.org/"; license = "MIT"; }; production = true; @@ -3550,7 +3550,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Leaner CSS"; - homepage = http://lesscss.org/; + homepage = "http://lesscss.org/"; license = "Apache-2.0"; }; production = true; @@ -3688,7 +3688,7 @@ in buildInputs = globalBuildInputs; meta = { description = "simple, flexible, fun test framework"; - homepage = https://mochajs.org/; + homepage = "https://mochajs.org/"; license = "MIT"; }; production = true; @@ -3784,7 +3784,7 @@ in buildInputs = globalBuildInputs; meta = { description = "test framework agnostic BDD-style assertions"; - homepage = https://github.com/shouldjs/should.js; + homepage = "https://github.com/shouldjs/should.js"; license = "MIT"; }; production = true; @@ -3818,7 +3818,7 @@ in buildInputs = globalBuildInputs; meta = { description = "JavaScript test spies, stubs and mocks."; - homepage = https://sinonjs.org/; + homepage = "https://sinonjs.org/"; license = "BSD-3-Clause"; }; production = true; @@ -3871,7 +3871,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; - homepage = http://jshint.com/; + homepage = "http://jshint.com/"; license = "(MIT AND JSON)"; }; production = true; @@ -3906,11 +3906,11 @@ in buildInputs = globalBuildInputs; meta = { description = "Portable Unix shell commands for Node.js"; - homepage = http://github.com/shelljs/shelljs; + homepage = "http://github.com/shelljs/shelljs"; license = "BSD-3-Clause"; }; production = true; bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/web/shopify-themekit/default.nix b/pkgs/development/web/shopify-themekit/default.nix new file mode 100644 index 0000000000000..b8bc3deaca18e --- /dev/null +++ b/pkgs/development/web/shopify-themekit/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "shopify-themekit"; + version = "1.0.3"; + + goPackagePath = "github.com/Shopify/themekit/"; + + goDeps = ./shopify-themekit_deps.nix; + + src = fetchFromGitHub { + owner = "Shopify"; + repo = "themekit"; + rev = "v${version}"; + sha256 = "1780h33mf2h2lv6mr4xx3shfvsabr7w138yb59vvdgvjng9wjkg0"; + }; + + meta = with stdenv.lib; { + description = "A command line tool for shopify themes"; + homepage = "https://shopify.github.io/themekit/"; + license = licenses.mit; + maintainers = with maintainers; [ maintainers."1000101" ]; + platforms = platforms.all; + }; +} \ No newline at end of file diff --git a/pkgs/development/web/shopify-themekit/shopify-themekit_deps.nix b/pkgs/development/web/shopify-themekit/shopify-themekit_deps.nix new file mode 100644 index 0000000000000..8a70c7cecd92f --- /dev/null +++ b/pkgs/development/web/shopify-themekit/shopify-themekit_deps.nix @@ -0,0 +1,300 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/VividCortex/ewma"; + fetch = { + type = "git"; + url = "https://github.com/VividCortex/ewma"; + rev = "v1.1.1"; + sha256 = "14v2dy5gqchjn7k0sd6cx59ms42v681r6xz7cb1kspp4b28a74rw"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "1c16cd01d785"; + sha256 = "129iizv2rny2frg36057hayynpsdav53nhj41dia3mi2r6zyalny"; + }; + } + { + goPackagePath = "github.com/caarlos0/env"; + fetch = { + type = "git"; + url = "https://github.com/caarlos0/env"; + rev = "d0de832ed2fb"; + sha256 = "013shh38rs2jv4a2hsbix0hlanjr2a539akmkqkwwg0il9h3qmq2"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "v1.25.4"; + sha256 = "0b6cql5ripbiyrm18d6bfd1rfjnwcbskppw3d0vb80l0wy72d0c6"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-version"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-version"; + rev = "270f2f71b1ee"; + sha256 = "1d43wlp932nqbwkca4bhw8l4x6cg25jyh8l1s3814vddscfpfz2v"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "v0.3.6"; + sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; + }; + } + { + goPackagePath = "github.com/inconshreveable/go-update"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/go-update"; + rev = "8152e7eb6ccf"; + sha256 = "07czhspakpi7al004rm669cmf4h5l0vnygsm11280nkfn2zxqdi3"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "0b12d6b521d8"; + sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + }; + } + { + goPackagePath = "github.com/joho/godotenv"; + fetch = { + type = "git"; + url = "https://github.com/joho/godotenv"; + rev = "v1.3.0"; + sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "efa589957cd0"; + sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/radovskyb/watcher"; + fetch = { + type = "git"; + url = "https://github.com/radovskyb/watcher"; + rev = "v1.0.6"; + sha256 = "1xlbrfgm6ha161szdjq2rab53plkdhmh5h86lpbk5g7fmq881945"; + }; + } + { + goPackagePath = "github.com/ryanuber/go-glob"; + fetch = { + type = "git"; + url = "https://github.com/ryanuber/go-glob"; + rev = "572520ed46db"; + sha256 = "0dzbpqp1h7gjmlm4irnh6lpbfz5zjc721jidibyvmxj7xcx3wp5d"; + }; + } + { + goPackagePath = "github.com/shibukawa/configdir"; + fetch = { + type = "git"; + url = "https://github.com/shibukawa/configdir"; + rev = "e180dbdc8da0"; + sha256 = "0vbma9jkwh0ifz8dk2ssgmy7aiaify63lpa0lah7i4dkkxr94c9z"; + }; + } + { + goPackagePath = "github.com/skratchdot/open-golang"; + fetch = { + type = "git"; + url = "https://github.com/skratchdot/open-golang"; + rev = "75fb7ed4208c"; + sha256 = "1b67imqbsdvg19vif1q1dfmapxy3v2anagacbql95fwnnw0v8jga"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "7c4570c3ebeb"; + sha256 = "16amh0prlzqrrbg5j629sg0f688nfzfgn9sair8jyybqampr3wc7"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.2"; + sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "github.com/vbauerster/mpb"; + fetch = { + type = "git"; + url = "https://github.com/vbauerster/mpb"; + rev = "v3.3.2"; + sha256 = "18m66b80iv9z768c15dqsx5mnjq6iaa6b5lckpdqnynqzkkvw8kk"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "a1f597ede03a"; + sha256 = "0yiczljll72ip2vkxgd6052rhpaba37a68vf6si3v8s8s3g870lc"; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "d0100b6bd8b3"; + sha256 = "0b0amr9x4ji66iv9ayfx7zrfx52k1m5g66qfcxkgj80qrb1y2yn7"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "1272bf9dcd53"; + sha256 = "1500gryd7jli7yjn4c927ppyllry8lxcmnsmpn7zxfd1k14q7nyv"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "1d60e4601c6f"; + sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "6c81ef8f67ca"; + sha256 = "1iqrral339vxb635ip5jjzn84aa86kb629kbp1w29qwyfzbs0yqi"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "3f1ed9edd1b4"; + sha256 = "00d2h0df03gv57valad4wr3g2rc8dcn8w3ci783x9wzzc86y4giw"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v1"; + rev = "9f9df34309c0"; + sha256 = "1r8d346szqa9x8q03wiycik5qy3d6w8qq4hs99z1p64q5lm0g7gm"; + }; + } +] diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index d0de36d426a8e..87a25ef0bf9b3 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bootstrap"; - version = "4.4.1"; + version = "4.5.0"; src = fetchurl { url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip"; - sha256 = "1gdzp54f2xyvbw9hnyjlj4s69jvxkxr3hqclq1c8ajmx39s7rymz"; + sha256 = "0wnz7112qfar5qaadxbsp2qpcjaqn0mmzi4j0v4z6rx6lyvar5mb"; }; buildInputs = [ unzip ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Front-end framework for faster and easier web development"; - homepage = https://getbootstrap.com/; + homepage = "https://getbootstrap.com/"; license = stdenv.lib.licenses.mit; }; diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index c48d16fcae9ce..e4407b9f556bf 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib vala ctpl libgee libsoup fcgi ]; meta = with stdenv.lib; { - homepage = https://github.com/valum-framework/valum; + homepage = "https://github.com/valum-framework/valum"; description = "Web micro-framework written in Vala"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/development/web/xmlindent/default.nix b/pkgs/development/web/xmlindent/default.nix index b9b0ccf7272c2..4d316410365a3 100644 --- a/pkgs/development/web/xmlindent/default.nix +++ b/pkgs/development/web/xmlindent/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "XML stream reformatter"; - homepage = http://xmlindent.sourceforge.net/; + homepage = "http://xmlindent.sourceforge.net/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.ocharles ]; diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 42464f71ae33d..4c9ad7068878e 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # Fixes build with spidermonkey-38.8.0, includes the minor version check: # https://src.fedoraproject.org/rpms/0ad/c/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b (fetchurl { - url = https://src.fedoraproject.org/rpms/0ad/raw/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b/f/0ad-mozjs-incompatible.patch; + url = "https://src.fedoraproject.org/rpms/0ad/raw/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b/f/0ad-mozjs-incompatible.patch"; sha256 = "1rzpaalcrzihsgvlk3nqd87n2kxjldlwvb3qp5fcd5ffzr6k90wa"; }) ]; diff --git a/pkgs/games/20kly/default.nix b/pkgs/games/20kly/default.nix index 37cb96f2cfdb0..8c81b8b2360e6 100644 --- a/pkgs/games/20kly/default.nix +++ b/pkgs/games/20kly/default.nix @@ -32,7 +32,7 @@ python.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "A steampunk-themed strategy game where you have to manage a steam supply network"; - homepage = http://jwhitham.org.uk/20kly/; + homepage = "http://jwhitham.org.uk/20kly/"; license = licenses.gpl2; maintainers = with maintainers; [ fgaz ]; }; diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix index f7de15604fdc3..334a7f873bb84 100644 --- a/pkgs/games/90secondportraits/default.nix +++ b/pkgs/games/90secondportraits/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; license = licenses.free; - downloadPage = http://tangramgames.dk/games/90secondportraits; + downloadPage = "http://tangramgames.dk/games/90secondportraits"; }; } diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index 2d3be1880de9d..055959fff2d06 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A rogue-like game with nice graphical interface"; - homepage = http://adom.de/; + homepage = "http://adom.de/"; license = licenses.unfreeRedistributable; maintainers = [maintainers.smironov]; diff --git a/pkgs/games/airstrike/default.nix b/pkgs/games/airstrike/default.nix index 408f2817854a3..10dfc7501fb74 100644 --- a/pkgs/games/airstrike/default.nix +++ b/pkgs/games/airstrike/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A 2d dogfighting game"; - homepage = https://icculus.org/airstrike/; + homepage = "https://icculus.org/airstrike/"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/games/alephone/default.nix b/pkgs/games/alephone/default.nix index d45bb98454795..879571df7a134 100644 --- a/pkgs/games/alephone/default.nix +++ b/pkgs/games/alephone/default.nix @@ -90,7 +90,9 @@ in self // { --add-flags $out/data/$pname ''; - } // extraArgs) // { - meta = alephone.meta // meta; - }; + meta = alephone.meta // { + license = stdenv.lib.licenses.free; + hydraPlatforms = [ ]; + } // meta; + }); } diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index 5c27e3426fd7c..a28cf2508e282 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { with a retro alien theme, while adding tons of original ideas to make the game quite unique. ''; - homepage = http://red.planetarena.org; + homepage = "http://red.planetarena.org"; # Engine is under GPLv2, everything else is under license = licenses.unfreeRedistributable; maintainers = with maintainers; [ astsmtl ]; diff --git a/pkgs/games/amoeba/data.nix b/pkgs/games/amoeba/data.nix index fcde2d591f13a..f86ee71aa424f 100644 --- a/pkgs/games/amoeba/data.nix +++ b/pkgs/games/amoeba/data.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast-paced, polished OpenGL demonstration by Excess (data files)"; - homepage = https://packages.qa.debian.org/a/amoeba-data.html; + homepage = "https://packages.qa.debian.org/a/amoeba-data.html"; license = licenses.unfree; maintainers = [ maintainers.dezgeg ]; platforms = platforms.all; diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix index 491b20d996908..0475a6b50b5a2 100644 --- a/pkgs/games/amoeba/default.nix +++ b/pkgs/games/amoeba/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast-paced, polished OpenGL demonstration by Excess"; - homepage = https://packages.qa.debian.org/a/amoeba.html; + homepage = "https://packages.qa.debian.org/a/amoeba.html"; license = licenses.gpl2; # Engine is GPLv2, data files in amoeba-data nonfree maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index 943f9eb881c52..84c1f545a3833 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation { And Yet It Moves is an award-winning physics-based platform game in which players rotate the game world at will to solve challenging puzzles. Tilting the world turns walls into floors, slides into platforms, and stacks of rocks into dangerous hazards. ''; - homepage = http://www.andyetitmoves.net/; + homepage = "http://www.andyetitmoves.net/"; license = stdenv.lib.licenses.unfree; diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index 309ea244d713b..e7681a4b7f842 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installFlags = [ "bindir=$(out)/bin" ]; meta = with stdenv.lib; { - homepage = http://rephial.org/; + homepage = "http://rephial.org/"; description = "A single-player roguelike dungeon exploration game"; maintainers = [ maintainers.chattered ]; license = licenses.gpl2; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index c1ba8851f5c4f..1548a9de63af7 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -195,6 +195,6 @@ buildPythonApplication rec { license = licenses.agpl3Plus; broken = stdenv.hostPlatform.isAarch64; platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ oxij the-kenny Profpatsch enzime ]; + maintainers = with maintainers; [ oxij Profpatsch enzime ]; }; } diff --git a/pkgs/games/arena/default.nix b/pkgs/games/arena/default.nix index a2a5f7b723a31..a8e147b6a7e3d 100644 --- a/pkgs/games/arena/default.nix +++ b/pkgs/games/arena/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { name = "arena-1.1"; src = fetchurl { - url = http://www.playwitharena.de/downloads/arenalinux_64bit_1.1.tar.gz; + url = "http://www.playwitharena.de/downloads/arenalinux_64bit_1.1.tar.gz"; sha256 = "1sh71v5ymzwflq8ycx9j9kl0jhqllgs6z24h4h8j5z8pwdh528v6"; }; diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index 354787e0f074d..8b2cf83e50993 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { first-person role-playing game / dungeon crawler developed by Arkane Studios. ''; - homepage = https://arx-libertatis.org/; + homepage = "https://arx-libertatis.org/"; license = licenses.gpl3; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index c8f5deef92406..28b144a4e864d 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { currently available for Windows and Linux. ''; - homepage = http://www.asc-hq.org/; + homepage = "http://www.asc-hq.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix index 7d83d3a7cdb7d..f40e2ecf2209f 100644 --- a/pkgs/games/assaultcube/default.nix +++ b/pkgs/games/assaultcube/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = { description = "Fast and fun first-person-shooter based on the Cube fps"; - homepage = https://assault.cubers.net; + homepage = "https://assault.cubers.net"; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; # should work on darwin with a little effort. license = stdenv.lib.licenses.zlib; diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index 191428f66dbc7..7f1ca325746fb 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Hardcore 3D space shooter with spaceship upgrade possibilities"; - homepage = https://www.viewizard.com/; + homepage = "https://www.viewizard.com/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix index b11a177e04554..bb11acf38664e 100644 --- a/pkgs/games/atanks/default.nix +++ b/pkgs/games/atanks/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Atomic Tanks ballistics game"; - homepage = http://atanks.sourceforge.net/; + homepage = "http://atanks.sourceforge.net/"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/games/azimuth/default.nix b/pkgs/games/azimuth/default.nix index 8cb583e07d2b5..67bbd8558c3ad 100644 --- a/pkgs/games/azimuth/default.nix +++ b/pkgs/games/azimuth/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl3Plus; - homepage = https://mdsteele.games/azimuth/index.html; + homepage = "https://mdsteele.games/azimuth/index.html"; maintainers = with stdenv.lib.maintainers; [ marius851000 ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix index a8b5f9fea4d61..862905efd3bb3 100644 --- a/pkgs/games/ball-and-paddle/default.nix +++ b/pkgs/games/ball-and-paddle/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/ballandpaddle/; + homepage = "https://www.gnu.org/software/ballandpaddle/"; maintainers = [ ]; diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix index 5699dbb72700c..6da8e1bf9bf80 100644 --- a/pkgs/games/banner/default.nix +++ b/pkgs/games/banner/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://software.cedar-solutions.com/utilities.html; + homepage = "http://software.cedar-solutions.com/utilities.html"; description = "Print large banners to ASCII terminals"; license = licenses.gpl2; diff --git a/pkgs/games/bastet/default.nix b/pkgs/games/bastet/default.nix index 85b6fcefdd28c..d68a05137b431 100644 --- a/pkgs/games/bastet/default.nix +++ b/pkgs/games/bastet/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tetris clone with 'bastard' block-choosing AI"; - homepage = http://fph.altervista.org/prog/bastet.html; + homepage = "http://fph.altervista.org/prog/bastet.html"; license = licenses.gpl3; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix index 81bdbed46e94f..f640e2c6aefa4 100644 --- a/pkgs/games/beret/default.nix +++ b/pkgs/games/beret/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = https://gitorious.org/beret/beret/archive-tarball/ae029777; + url = "https://gitorious.org/beret/beret/archive-tarball/ae029777"; name = "beret-1.2.0.tar.gz"; sha256 = "1rx9z72id1810fgv8mizk8qxwd1kh5xi07fdhmjc62mh3fn38szc"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A 2D puzzle-platformer game about a scientist with telekinetic abilities"; - homepage = http://kiwisauce.com/beret/; + homepage = "http://kiwisauce.com/beret/"; license = licenses.lgpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; diff --git a/pkgs/games/bitsnbots/default.nix b/pkgs/games/bitsnbots/default.nix index c6c5176ecdf8b..52286b32f90f2 100644 --- a/pkgs/games/bitsnbots/default.nix +++ b/pkgs/games/bitsnbots/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "bitsnbots-20111230"; src = fetchurl { - url = http://moikmellah.org/downloads/bitsnbots/bitsnbots.source.tgz; + url = "http://moikmellah.org/downloads/bitsnbots/bitsnbots.source.tgz"; sha256 = "1iiclm6bfpp2p6d692hpnw25xyr48ki1xkcxa7fvh5b7m1519gsp"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple puzzle game with moving robots"; - homepage = http://moikmellah.org/blog/?page_id=19; + homepage = "http://moikmellah.org/blog/?page_id=19"; license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index 608b32764bb95..e47e430d84c9f 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "blackshades-svn-110"; src = fetchsvn { - url = svn://svn.icculus.org/blackshades/trunk; + url = "svn://svn.icculus.org/blackshades/trunk"; rev = "110"; sha256 = "0kbrh1dympk8scjxr6av24qs2bffz44l8qmw2m5gyqf4g3rxf6ra"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://icculus.org/blackshades/; + homepage = "http://icculus.org/blackshades/"; description = "Protect the VIP"; license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index 938d767c3d85a..ea8bddfa16d40 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; - homepage = http://blobby.sourceforge.net/; + homepage = "http://blobby.sourceforge.net/"; downloadPage = "https://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/"; inherit version; }; diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix index 3dcfe201d2c11..3ca8ee4693a3e 100644 --- a/pkgs/games/boohu/default.nix +++ b/pkgs/games/boohu/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - postInstall = "mv $bin/bin/boohu.git $bin/bin/boohu"; + postInstall = "mv $out/bin/boohu.git $out/bin/boohu"; meta = with stdenv.lib; { description = "A new coffee-break roguelike game"; diff --git a/pkgs/games/braincurses/default.nix b/pkgs/games/braincurses/default.nix index deb542e3a86f9..86a8f865442b4 100644 --- a/pkgs/games/braincurses/default.nix +++ b/pkgs/games/braincurses/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/bderrly/braincurses; + homepage = "https://github.com/bderrly/braincurses"; description = "A version of the classic game Mastermind"; license = licenses.gpl2; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix index e34dfc383a1a4..1662f847bfa95 100644 --- a/pkgs/games/brogue/default.nix +++ b/pkgs/games/brogue/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A roguelike game"; - homepage = https://sites.google.com/site/broguegame/; + homepage = "https://sites.google.com/site/broguegame/"; license = licenses.agpl3; maintainers = [ maintainers.skeidel ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix index ef30a3d350c99..41414a573a662 100644 --- a/pkgs/games/bsdgames/default.nix +++ b/pkgs/games/bsdgames/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "bsd-games-2.17"; src = fetchurl { - url = ftp://metalab.unc.edu/pub/Linux/games/bsd-games-2.17.tar.gz; + url = "ftp://metalab.unc.edu/pub/Linux/games/bsd-games-2.17.tar.gz"; sha256 = "0q7zdyyfvn15y0w4g54kq3gza89h61py727m8slmw73cxx594vq6"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { patches = [ (fetchurl { - url = http://svn.exactcode.de/t2/trunk/package/games/bsd-games/dm-noutmpx.patch; + url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/dm-noutmpx.patch"; sha256 = "1k3qp3jj0dksjr4dnppv6dvkwslrgk9c7p2n9vipqildpxgqp7w2"; }) ]; @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.t2-project.org/packages/bsd-games.html; + homepage = "http://www.t2-project.org/packages/bsd-games.html"; description = "Ports of all the games from NetBSD-current that are free"; license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index d07088a30a3eb..1ec24e02be05d 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bzflag"; - version = "2.4.18"; + version = "2.4.20"; src = fetchurl { url = "https://download.bzflag.org/${pname}/source/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1gmz31wmn3f8zq1bfilkgbf4qmi4fa0c93cs76mhg8h978pm23cx"; + sha256 = "16brxqmfiyz4j4lb8ihzjcbwqmpsms6vm3ijbp34lnw0blbwdjb2"; }; nativeBuildInputs = [ pkgconfig ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Multiplayer 3D Tank game"; - homepage = https://bzflag.org/; + homepage = "https://bzflag.org/"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index 3a7b410a04bdb..f904a3c0f3541 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -69,7 +69,7 @@ let substances or radiation, now more closely resemble insects, birds or fish than their original form. ''; - homepage = https://cataclysmdda.org/; + homepage = "https://cataclysmdda.org/"; license = licenses.cc-by-sa-30; maintainers = with maintainers; [ mnacamura ]; platforms = platforms.unix; diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index ced19bffb31a0..ad1a9c409d572 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lua, CoreFoundation +{ stdenv, callPackage, CoreFoundation , tiles ? true, Cocoa , debug ? false }: @@ -9,28 +9,16 @@ let in stdenv.mkDerivation (common // rec { - version = "0.D"; + version = "0.E"; name = "cataclysm-dda-${version}"; src = fetchFromCleverRaven { rev = version; - sha256 = "00zzhx1mh1qjq668cga5nbrxp2qk6b82j5ak65skhgnlr6ii4ysc"; + sha256 = "0pbi0fw37zimzdklfj58s1ql0wlqq7dy6idkcsib3hn910ajaxan"; }; - buildInputs = common.buildInputs ++ [ lua ]; - patches = [ ./patches/fix_locale_dir.patch ]; - postPatch = common.postPatch + '' - substituteInPlace lua/autoexec.lua --replace "/usr/share" "$out/share" - ''; - - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy"; - - makeFlags = common.makeFlags ++ [ - "LUA=1" - ]; - meta = with stdenv.lib.maintainers; common.meta // { maintainers = common.meta.maintainers ++ [ skeidel ]; }; diff --git a/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch b/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch index 60a3dc457453a..5bfff892d2af0 100644 --- a/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch +++ b/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch @@ -1,15 +1,13 @@ -diff --git a/src/translations.cpp b/src/translations.cpp -index 2585b7ec56..7bb005823c 100644 --- a/src/translations.cpp +++ b/src/translations.cpp -@@ -195,14 +195,12 @@ void set_language() +@@ -212,14 +212,12 @@ void set_language() auto env = getenv( "LANGUAGE" ); - locale_dir = std::string( FILENAMES["base_path"] + "lang/mo/" + ( env ? env : "none" ) + + locale_dir = std::string( PATH_INFO::base_path() + "lang/mo/" + ( env ? env : "none" ) + "/LC_MESSAGES/cataclysm-dda.mo" ); --#elif (defined __linux__ || (defined MACOSX && !defined TILES)) +-#elif (defined(__linux__) || (defined(MACOSX) && !defined(TILES))) +#else - if( !FILENAMES["base_path"].empty() ) { - locale_dir = FILENAMES["base_path"] + "share/locale"; + if( !PATH_INFO::base_path().empty() ) { + locale_dir = PATH_INFO::base_path() + "share/locale"; } else { locale_dir = "lang/mo"; } diff --git a/pkgs/games/chessdb/default.nix b/pkgs/games/chessdb/default.nix index 28cea5e0c7791..76862c4bffe1e 100644 --- a/pkgs/games/chessdb/default.nix +++ b/pkgs/games/chessdb/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "chessdb-3.6.19-beta-1"; src = fetchurl { - url = mirror://sourceforge/chessdb/ChessDB-3.6.19-beta-1.tar.gz; + url = "mirror://sourceforge/chessdb/ChessDB-3.6.19-beta-1.tar.gz"; sha256 = "0brc3wln3bxp979iqj2w1zxpfd0pch8zzazhdmwf7acww4hrsz62"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://chessdb.sourceforge.net/; + homepage = "http://chessdb.sourceforge.net/"; description = "A free chess database"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index f0b04489edac6..0ff05556cdbba 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -47,7 +47,7 @@ mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://chessx.sourceforge.net/; + homepage = "http://chessx.sourceforge.net/"; description = "ChessX allows you to browse and analyse chess games"; license = licenses.gpl2; maintainers = [ maintainers.luispedro ]; diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix index 7a9ac7d381c10..0d0bab2c4ebef 100644 --- a/pkgs/games/chiaki/default.nix +++ b/pkgs/games/chiaki/default.nix @@ -4,14 +4,14 @@ mkDerivation rec { pname = "chiaki"; - version = "1.0.3"; + version = "1.1.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "thestr4ng3r"; repo = "chiaki"; fetchSubmodules = true; - sha256 = "09c6izprqqvhn1vbr2897ql05w5c7iqakm6jn795a5faghjm1mah"; + sha256 = "12cb4wpibh077san9rpsmavihf0xy9iqc9zl7y0aagrkl50h19kr"; }; nativeBuildInputs = [ diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index 56a926e63f6d0..1c2a24de01dd2 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -1,21 +1,26 @@ -{ stdenv, autoreconfHook, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }: +{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "chocolate-doom-2.3.0"; - src = fetchurl { - url = "https://github.com/chocolate-doom/chocolate-doom/archive/${name}.tar.gz"; - sha256 = "0i57smxmbhxj0wgvxq845ba9zsn5nx5wmzkl71rdchyd4q5jmida"; + pname = "chocolate-doom"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "chocolate-doom"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "0ajzb767wyj8vzhjpsmgslw42b0155ji4alk26shxl7k5ijbzn0j"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ SDL SDL_mixer SDL_net ]; - patchPhase = '' + + postPatch = '' sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am ''; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; enableParallelBuilding = true; meta = { - homepage = http://chocolate-doom.org/; + homepage = "http://chocolate-doom.org/"; description = "A Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix index 81f1ee0cd153a..a13ff8d66faf6 100644 --- a/pkgs/games/ckan/default.nix +++ b/pkgs/games/ckan/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Mod manager for Kerbal Space Program"; - homepage = https://github.com/KSP-CKAN/CKAN; + homepage = "https://github.com/KSP-CKAN/CKAN"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.Baughn ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index 56164cfc017f0..251ea852cf18d 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { made for it. All of the original data files are required to do so ''; - homepage = https://github.com/gerstrong/Commander-Genius; + homepage = "https://github.com/gerstrong/Commander-Genius"; maintainers = with maintainers; [ hce ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 5c74b5962794a..815c2f3fab40f 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Masses and springs simulation game"; - homepage = http://fs.fsf.org/construo/; + homepage = "http://fs.fsf.org/construo/"; license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index 4741ac7bb6846..05c829441ad9a 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "crack-attack-1.1.14"; src = fetchurl { - url = mirror://savannah/crack-attack/crack-attack-1.1.14.tar.gz; + url = "mirror://savannah/crack-attack/crack-attack-1.1.14.tar.gz"; sha256 = "1sakj9a2q05brpd7lkqxi8q30bccycdzd96ns00s6jbxrzjlijkm"; }; @@ -13,7 +13,11 @@ stdenv.mkDerivation { ./crack-attack-1.1.14-glut.patch ]; - configureFlags = [ "--enable-sound=yes" ]; + configureFlags = [ + "--enable-sound=yes" + "--prefix=${placeholder "out"}" + "--datadir=${placeholder "out"}/share" + ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk2 freeglut SDL SDL_mixer libGLU libGL libXi libXmu ]; @@ -23,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "A fast-paced puzzle game inspired by the classic Super NES title Tetris Attack!"; - homepage = https://www.nongnu.org/crack-attack/; + homepage = "https://www.nongnu.org/crack-attack/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.piotr ]; diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix index c9dcd2d9d400a..191baa7e59238 100644 --- a/pkgs/games/crafty/default.nix +++ b/pkgs/games/crafty/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { }; bookBin = fetchurl { - url = http://www.craftychess.com/downloads/book/book.bin; + url = "http://www.craftychess.com/downloads/book/book.bin"; sha256 = "10rrgkr3hxm7pxdbc2jq8b5g74gfhzk4smahks3k8am1cmyq4p7r"; }; startPgn = fetchurl { - url = http://craftychess.com/downloads/book/start.pgn.gz; + url = "http://craftychess.com/downloads/book/start.pgn.gz"; sha256 = "12g70mgfifwssfvndzq94pin34dizlixhsga75vgj7dakysi2p7f"; }; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.craftychess.com/; + homepage = "http://www.craftychess.com/"; description = "Chess program developed by Dr. Robert M. Hyatt"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index c10e79418be4c..ea7c3c6e47847 100644 --- a/pkgs/games/crispy-doom/default.nix +++ b/pkgs/games/crispy-doom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "crispy-doom"; - version = "5.7.2"; + version = "5.8.0"; src = fetchFromGitHub { owner = "fabiangreffrath"; repo = pname; rev = "${pname}-${version}"; - sha256 = "002aqbgsksrgzqridwdlkrjincaxh0dkvwlrbb8d2f3kwk7lj4fq"; + sha256 = "1b6gn0dysv631jynh769whww9xcss1gms78sz3nrn855q1dsvcb4"; }; postPatch = '' diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix index 75ff970a16a8f..e57d6bcab0664 100644 --- a/pkgs/games/crrcsim/default.nix +++ b/pkgs/games/crrcsim/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A model-airplane flight simulator"; - maintainers = with stdenv.lib.maintainers; [ raskin the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = [ "i686-linux" "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix index 24077697218db..a293989d5e6a0 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/pkgs/games/cutemaze/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "cutemaze"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { url = "https://gottcode.org/cutemaze/${pname}-${version}-src.tar.bz2"; - sha256 = "1xrjv3h1bpbji1dl9hkcvmp6qk4j618saffl41455vhrzn170lrj"; + sha256 = "0pw31j2i3ifndikhz9w684ia00r8zvcgnb66ign9w4lgs1zjgcrw"; }; nativeBuildInputs = [ qmake qttools ]; @@ -19,7 +19,7 @@ mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://gottcode.org/cutemaze/; + homepage = "https://gottcode.org/cutemaze/"; description = "Simple, top-down game in which mazes are randomly generated"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/games/cuyo/default.nix b/pkgs/games/cuyo/default.nix index 24e45719f516f..72c55fc181126 100644 --- a/pkgs/games/cuyo/default.nix +++ b/pkgs/games/cuyo/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation { version = "2.1.0"; src = fetchurl { - url = https://download.savannah.gnu.org/releases/cuyo/cuyo-2.1.0.tar.gz; + url = "https://download.savannah.gnu.org/releases/cuyo/cuyo-2.1.0.tar.gz"; sha256 = "17yqv924x7yvwix7yz9jdhgyar8lzdhqvmpvv0any8rdkajhj23c"; }; buildInputs = [ SDL SDL_mixer zlib ]; meta = { - homepage = http://karimmi.de/cuyo; + homepage = "http://karimmi.de/cuyo"; description = "Stacking blocks game, with different rules for each level"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index fd9729376403a..1735c4380f266 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = https://github.com/dhewm/dhewm3; + homepage = "https://github.com/dhewm/dhewm3"; description = "Doom 3 port to SDL"; license = stdenv.lib.licenses.gpl3; maintainers = with maintainers; [ MP2E ]; diff --git a/pkgs/games/duckmarines/default.nix b/pkgs/games/duckmarines/default.nix index 7f73e047fd758..7af31c606a938 100644 --- a/pkgs/games/duckmarines/default.nix +++ b/pkgs/games/duckmarines/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; hydraPlatforms = []; license = licenses.free; - downloadPage = http://tangramgames.dk/games/duckmarines; + downloadPage = "http://tangramgames.dk/games/duckmarines"; }; } diff --git a/pkgs/games/dwarf-fortress/df_permission b/pkgs/games/dwarf-fortress/df_permission index b0121bb3fa37e..dc1c0c151e0b2 100644 --- a/pkgs/games/dwarf-fortress/df_permission +++ b/pkgs/games/dwarf-fortress/df_permission @@ -12,7 +12,7 @@ Tarn On Fri, Oct 29, 2010 at 6:56 AM, <roconnor@theorem.ca> wrote: > I'd like to distribute a *slightly* modified version of Dwarf Fortress which > is needed to run it under the NixOS distribution of Linux (see -> <http://nixos.org/> +> <https://nixos.org/> > > Modification: The interpreter location /lib/ld-linux.so.2 in > lib/Dwarf_Fortress is replaced with the location of ld-linux.so.2 under the diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 2467053cc1a6f..bd37f6180b143 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -140,7 +140,7 @@ buildEnv { meta = with stdenv.lib; { description = "Memory hacking library for Dwarf Fortress and a set of tools that use it"; - homepage = https://github.com/DFHack/dfhack/; + homepage = "https://github.com/DFHack/dfhack/"; license = licenses.zlib; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ robbinch a1russell abbradar numinit ]; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 4485b3ae784aa..f5c093e1f16c4 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool to manage dwarves in a running game of Dwarf Fortress"; - maintainers = with maintainers; [ the-kenny abbradar bendlas numinit jonringer ]; + maintainers = with maintainers; [ abbradar bendlas numinit jonringer ]; license = licenses.mit; platforms = platforms.unix; homepage = "https://github.com/Dwarf-Therapist/Dwarf-Therapist"; diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index e3a66a508ea1b..9200d01aa985b 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -12,7 +12,7 @@ with lib; let libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ]; - homepage = http://www.bay12games.com/dwarves/; + homepage = "http://www.bay12games.com/dwarves/"; # Map Dwarf Fortress platform names to Nixpkgs platform names. # Other srcs are avilable like 32-bit mac & win, but I have only @@ -96,6 +96,6 @@ stdenv.mkDerivation { inherit homepage; license = licenses.unfreeRedistributable; platforms = attrNames platforms; - maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar numinit shazow ]; + maintainers = with maintainers; [ a1russell robbinch roconnor abbradar numinit shazow ]; }; } diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix index 5f0328cba02d0..03aa5d54304f9 100644 --- a/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -16,6 +16,7 @@ , enableTruetype ? true , enableFPS ? false , enableTextMode ? false +, enableSound ? true }: with lib; @@ -32,7 +33,7 @@ buildEnv { paths = [ (dwarf-fortress.override { inherit enableDFHack enableTWBT enableSoundSense enableStoneSense theme - enableIntro enableTruetype enableFPS enableTextMode; + enableIntro enableTruetype enableFPS enableTextMode enableSound; })] ++ lib.optional enableDwarfTherapist dwarf-therapist ++ lib.optional enableLegendsBrowser legends-browser; @@ -42,6 +43,6 @@ buildEnv { maintainers = with maintainers; [ Baughn numinit ]; license = licenses.mit; platforms = platforms.all; - homepage = https://github.com/NixOS/nixpkgs/; + homepage = "https://github.com/NixOS/nixpkgs/"; }; } diff --git a/pkgs/games/dwarf-fortress/legends-browser/default.nix b/pkgs/games/dwarf-fortress/legends-browser/default.nix index 3bc4fa9c4bb58..b11060025151d 100644 --- a/pkgs/games/dwarf-fortress/legends-browser/default.nix +++ b/pkgs/games/dwarf-fortress/legends-browser/default.nix @@ -31,6 +31,6 @@ buildEnv { maintainers = with maintainers; [ Baughn ]; license = licenses.mit; platforms = platforms.all; - homepage = https://github.com/robertjanetzko/LegendsBrowser; + homepage = "https://github.com/robertjanetzko/LegendsBrowser"; }; } diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix index 011284bcff5d4..b5bff0e9b7a8c 100644 --- a/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/pkgs/games/dwarf-fortress/twbt/default.nix @@ -80,6 +80,6 @@ stdenvNoCC.mkDerivation rec { maintainers = with maintainers; [ Baughn numinit ]; license = licenses.mit; platforms = platforms.linux; - homepage = https://github.com/mifki/df-twbt; + homepage = "https://github.com/mifki/df-twbt"; }; } diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index ccf44ee5ca13f..533649131f5a7 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Unfucked multimedia layer for Dwarf Fortress"; - homepage = https://github.com/svenstaro/dwarf_fortress_unfuck; + homepage = "https://github.com/svenstaro/dwarf_fortress_unfuck"; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ abbradar numinit ]; diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 31b21c5a43511..79b63e3ce9ee0 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -12,6 +12,7 @@ , enableTruetype ? true , enableFPS ? false , enableTextMode ? false +, enableSound ? true }: let @@ -67,7 +68,8 @@ let substituteInPlace $out/data/init/init.txt \ --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \ --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \ - --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]' + --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]' \ + --replace '[SOUND:YES]' '[SOUND:${unBool enableSound}]' '')); env = buildEnv { diff --git a/pkgs/games/dxx-rebirth/assets.nix b/pkgs/games/dxx-rebirth/assets.nix index 682d1e05069af..47a8222cd6a9d 100644 --- a/pkgs/games/dxx-rebirth/assets.nix +++ b/pkgs/games/dxx-rebirth/assets.nix @@ -42,7 +42,7 @@ let meta = with stdenv.lib; { description = "Descent ${toString ver} assets from GOG"; - homepage = https://www.dxx-rebirth.com/; + homepage = "https://www.dxx-rebirth.com/"; license = licenses.unfree; maintainers = with maintainers; [ peterhoeg ]; hydraPlatforms = []; diff --git a/pkgs/games/dxx-rebirth/full.nix b/pkgs/games/dxx-rebirth/full.nix index 7a1e690c39df4..782a2d21112c3 100644 --- a/pkgs/games/dxx-rebirth/full.nix +++ b/pkgs/games/dxx-rebirth/full.nix @@ -16,7 +16,7 @@ let meta = with stdenv.lib; { description = "Descent ${toString ver} using the DXX-Rebirth project engine and game assets from GOG"; - homepage = https://www.dxx-rebirth.com/; + homepage = "https://www.dxx-rebirth.com/"; license = with licenses; [ free unfree ]; maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix index af6bc4be39361..b11cc90d11f19 100644 --- a/pkgs/games/eboard/default.nix +++ b/pkgs/games/eboard/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "eboard-1.1.1"; src = fetchurl { - url = mirror://sourceforge/eboard/eboard-1.1.1.tar.bz2; + url = "mirror://sourceforge/eboard/eboard-1.1.1.tar.bz2"; sha256 = "0vm25j1s2zg1lipwjv9qrcm877ikfmk1yh34i8f5l3bwd63115xd"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-ldl"; meta = { - homepage = http://www.bergo.eng.br/eboard/; + homepage = "http://www.bergo.eng.br/eboard/"; description = "Chess interface for Unix-like systems"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 242e0930db3be..60abe29646769 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Enhanched port of Duke Nukem 3D for various platforms"; - homepage = http://eduke32.com; + homepage = "http://eduke32.com"; license = licenses.gpl2Plus; maintainers = with maintainers; [ sander ]; # Darwin is untested (supported by upstream) diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index c8a5f380900a0..138ad8a757f18 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "3D dungeon crawling adventure"; - homepage = http://www.freedink.org/; + homepage = "http://www.freedink.org/"; license = stdenv.lib.licenses.gpl2Plus; # I take it out of hydra as it does not work as well as I'd like diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix index fc71c288b987f..73d42c65008e3 100644 --- a/pkgs/games/empty-epsilon/default.nix +++ b/pkgs/games/empty-epsilon/default.nix @@ -3,8 +3,8 @@ let major = "2020"; - minor = "03"; - patch = "22"; + minor = "04"; + patch = "09"; version = "${major}.${minor}.${patch}"; @@ -16,7 +16,7 @@ let owner = "daid"; repo = "SeriousProton"; rev = "EE-${version}"; - sha256 = "15dk2aij571sdrmpp3p0z1njb60lz0d95x0jgqdxz2q3wqnp5p61"; + sha256 = "0blqsii8pgxajargd1idry2zakhnvl7j309yjmddarpvafg73blj"; }; nativeBuildInputs = [ cmake ]; @@ -24,7 +24,7 @@ let meta = with lib; { description = "C++ game engine coded on top of SFML used for EmptyEpsilon"; - homepage = https://github.com/daid/SeriousProton; + homepage = "https://github.com/daid/SeriousProton"; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; @@ -42,7 +42,7 @@ stdenv.mkDerivation { owner = "daid"; repo = "EmptyEpsilon"; rev = "EE-${version}"; - sha256 = "0idapy266mfrmi6dq3si5a8n12m1vvxr6ywbs0fs6sdkbabglc0c"; + sha256 = "1hdni8m6m7bgx11scqqqzhcjrmrl0jsxb6cr6rvjbqnahzi23slr"; }; nativeBuildInputs = [ cmake ]; @@ -58,7 +58,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Open source bridge simulator based on Artemis"; - homepage = https://daid.github.io/EmptyEpsilon/; + homepage = "https://daid.github.io/EmptyEpsilon/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fpletz lheckemann ma27 ]; platforms = platforms.linux; diff --git a/pkgs/games/endgame-singularity/default.nix b/pkgs/games/endgame-singularity/default.nix index 8b259bad88d72..46f21629ca364 100644 --- a/pkgs/games/endgame-singularity/default.nix +++ b/pkgs/games/endgame-singularity/default.nix @@ -44,7 +44,7 @@ python2.pkgs.buildPythonApplication rec { ''; meta = { - homepage = http://www.emhsoft.com/singularity/; + homepage = "http://www.emhsoft.com/singularity/"; description = "A simulation game about strong AI"; longDescription = '' A simulation of a true AI. Go from computer to computer, pursued by the diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix index f0950cf4d3497..76ab6542a7f33 100644 --- a/pkgs/games/endless-sky/default.nix +++ b/pkgs/games/endless-sky/default.nix @@ -3,7 +3,7 @@ }: let - version = "0.9.11"; + version = "0.9.12"; in stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { owner = "endless-sky"; repo = "endless-sky"; rev = "v${version}"; - sha256 = "0f4svg448bg8qx49f8fr8l4yzks7an6673jwgva15p3zzfxy6w03"; + sha256 = "1hly68ljm7yv01jfxyr7g6jivhj0igg6xx7vi92zqymick0hlh7a"; }; enableParallelBuilding = true; diff --git a/pkgs/games/enyo-doom/default.nix b/pkgs/games/enyo-doom/default.nix index af002a690e4dd..ba07b50a1e756 100644 --- a/pkgs/games/enyo-doom/default.nix +++ b/pkgs/games/enyo-doom/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitLab, cmake, qtbase }: +{ mkDerivation, stdenv, fetchFromGitLab, cmake, qtbase }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "enyo-doom"; version = "1.06.9"; diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix index 49339e5619db2..c170c0b9c189a 100644 --- a/pkgs/games/eternity-engine/default.nix +++ b/pkgs/games/eternity-engine/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://doomworld.com/eternity; + homepage = "http://doomworld.com/eternity"; description = "New school Doom port by James Haley"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 07f84d7a151af..e735c9c581723 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -5,7 +5,7 @@ let # Digital recordings of the music on an original Roland MT-32. So # we don't need actual MIDI playback capability. audio = fetchurl { - url = mirror://sourceforge/exult/exult_audio.zip; + url = "mirror://sourceforge/exult/exult_audio.zip"; sha256 = "0s5wvgy9qja06v38g0qwzpaw76ff96vzd6gb1i3lb9k4hvx0xqbj"; }; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; # */ meta = { - homepage = http://exult.sourceforge.net/; + homepage = "http://exult.sourceforge.net/"; description = "A reimplementation of the Ultima VII game engine"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix index 86db4a3209e88..83dadb7192cbf 100644 --- a/pkgs/games/ezquake/default.nix +++ b/pkgs/games/ezquake/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ezquake"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "ezQuake"; repo = pname + "-source"; rev = version; - sha256 = "0375jndynhkl59m80fhmq12v5g24zy16c7ly08h004cmjzqsikn4"; + sha256 = "11kyrqpc8w393kvfz2p2h2m7k8rm4w644m86w733b8w157f2fsk0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 43ec92719c21e..19ed6ccab372e 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper , alsaLib, libpulseaudio, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL -, factorio-utils +, libSM, libICE, libXext, factorio-utils , releaseType , mods ? [] , username ? "", token ? "" # get/reset token at https://factorio.com/profile @@ -53,11 +53,11 @@ let x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { stable = bdist { sha256 = "1fg2wnia6anzya4m53jf2xqwwspvwskz3awdb3j0v3fzijps94wc"; version = "0.17.79"; withAuth = true; }; - experimental = bdist { sha256 = "1fg2wnia6anzya4m53jf2xqwwspvwskz3awdb3j0v3fzijps94wc"; version = "0.17.79"; withAuth = true; }; + experimental = bdist { sha256 = "1ypq9qxry2b9a74p2i20f1yl20yf37xr4kvflbg1cn5nb8vvznxq"; version = "0.18.26"; withAuth = true; }; }; headless = { stable = bdist { sha256 = "1pr39nm23fj83jy272798gbl9003rgi4vgsi33f2iw3dk3x15kls"; version = "0.17.79"; }; - experimental = bdist { sha256 = "1pr39nm23fj83jy272798gbl9003rgi4vgsi33f2iw3dk3x15kls"; version = "0.17.79"; }; + experimental = bdist { sha256 = "1srlzncwp1gcdy6ih8cc1ml5ggvg6xkw5jc2q95qjb9gpjv29mnl"; version = "0.18.26"; }; }; demo = { stable = bdist { sha256 = "07qknasaqvzl9vy1fglm7xmdi7ynhmslrb0a209fhbfs0s7qqlgi"; version = "0.17.79"; }; @@ -164,9 +164,9 @@ let Factorio has been in development since spring of 2012 and it is currently in late alpha. ''; - homepage = https://www.factorio.com/; + homepage = "https://www.factorio.com/"; license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ Baughn elitak ]; + maintainers = with stdenv.lib.maintainers; [ Baughn elitak erictapen ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; }; @@ -186,6 +186,9 @@ let libXrandr libXi libGL + libSM + libICE + libXext ]; installPhase = base.installPhase + '' diff --git a/pkgs/games/factorio/mods.nix b/pkgs/games/factorio/mods.nix index 501665494ebf2..5c9b4f0628a24 100644 --- a/pkgs/games/factorio/mods.nix +++ b/pkgs/games/factorio/mods.nix @@ -16,7 +16,7 @@ rec { bobassembly = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobassembly_0.13.0.zip + "https://f.xor.us/factorio-mods/bobassembly_0.13.0.zip" ]; sha256 = "0c0m7sb45r37g882x0aq8mc82yhfh9j9h8g018d4s5pf93vzr6d1"; }; @@ -28,7 +28,7 @@ rec { bobconfig = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobconfig_0.13.1.zip + "https://f.xor.us/factorio-mods/bobconfig_0.13.1.zip" ]; sha256 = "0z4kmggm1slbr3qiy5xahc9nhdffllp21n9nv5gh1zbzv72sb1rp"; }; @@ -37,7 +37,7 @@ rec { bobelectronics = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobelectronics_0.13.1.zip + "https://f.xor.us/factorio-mods/bobelectronics_0.13.1.zip" ]; sha256 = "16sn5w33s0ckiwqxx7b2pcsqmhxbxjm2w4h4vd99hwpvdpjyav52"; }; @@ -49,7 +49,7 @@ rec { bobenemies = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobenemies_0.13.1.zip + "https://f.xor.us/factorio-mods/bobenemies_0.13.1.zip" ]; sha256 = "1wnb5wsvh9aa3i9mj17f36ybbd13qima3iwshw60i6xkzzqfk44d"; }; @@ -59,7 +59,7 @@ rec { bobgreenhouse = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobgreenhouse_0.13.2.zip + "https://f.xor.us/factorio-mods/bobgreenhouse_0.13.2.zip" ]; sha256 = "1ql26875dvz2lqln289jg1w6yjzsd0x0pqmd570jffwi5m320rrw"; }; @@ -71,7 +71,7 @@ rec { bobinserters = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobinserters_0.13.3.zip + "https://f.xor.us/factorio-mods/bobinserters_0.13.3.zip" ]; sha256 = "0nys9zhaw0v3w2xzrhawr8g2hcxkzdmyqd4s8xm5bnbrgrq86g9z"; }; @@ -83,7 +83,7 @@ rec { boblibrary = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/boblibrary_0.13.1.zip + "https://f.xor.us/factorio-mods/boblibrary_0.13.1.zip" ]; sha256 = "04fybs626lzxf0p21jl8kakh2mddah7l9m57srk7a87jw5bj1zx8"; }; @@ -92,7 +92,7 @@ rec { boblogistics = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/boblogistics_0.13.7.zip + "https://f.xor.us/factorio-mods/boblogistics_0.13.7.zip" ]; sha256 = "0c91zmyxwsmyv6vm6gp498vb7flqlcyzkbp9s5q1651hpyd378hx"; }; @@ -104,7 +104,7 @@ rec { bobmining = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobmining_0.13.1.zip + "https://f.xor.us/factorio-mods/bobmining_0.13.1.zip" ]; sha256 = "1l7k3v4aizihppgi802fr5b8zbnq2h05c2bbsk5hds239qgxy80m"; }; @@ -115,7 +115,7 @@ rec { bobmodules = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobmodules_0.13.0.zip + "https://f.xor.us/factorio-mods/bobmodules_0.13.0.zip" ]; sha256 = "0ggd2gc4s5sbld7gyncbzdgq8gc00mvxjcfv7i2dchcrdzrlr556"; }; @@ -127,7 +127,7 @@ rec { bobores = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobores_0.13.1.zip + "https://f.xor.us/factorio-mods/bobores_0.13.1.zip" ]; sha256 = "1rri70655kj77sdr3zgp56whmcl0gfjmw90jm7lj1jp8l1pdfzb9"; }; @@ -138,7 +138,7 @@ rec { bobplates = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobplates_0.13.2.zip + "https://f.xor.us/factorio-mods/bobplates_0.13.2.zip" ]; sha256 = "0iczpa26hflj17k84p4n6wz0pwhbbrfk86dgac4bfz28kqg58nj1"; }; @@ -150,7 +150,7 @@ rec { bobpower = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobpower_0.13.1.zip + "https://f.xor.us/factorio-mods/bobpower_0.13.1.zip" ]; sha256 = "18sblnlvprrm2vzlczlki09yj9lr4y64808zrwmcasf7470skar3"; }; @@ -162,7 +162,7 @@ rec { bobrevamp = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobrevamp_0.13.0.zip + "https://f.xor.us/factorio-mods/bobrevamp_0.13.0.zip" ]; sha256 = "0rkyf61clh8fjg72z9i7r4skvdzgd49ky6s0486xxljhbil4nxb7"; }; @@ -172,7 +172,7 @@ rec { bobtech = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobtech_0.13.0.zip + "https://f.xor.us/factorio-mods/bobtech_0.13.0.zip" ]; sha256 = "0arc9kilxzdpapn3gh5h8269ssgsjxib4ny0qissq2sg95gxlsn0"; }; @@ -183,7 +183,7 @@ rec { bobtechsave = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobtechsave_0.13.0.zip + "https://f.xor.us/factorio-mods/bobtechsave_0.13.0.zip" ]; sha256 = "1vlv4sgdfd9ldjm8y79n95ms5k6x2i7khjc422lp9080m03v1hcl"; }; @@ -192,7 +192,7 @@ rec { bobwarfare = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobwarfare_0.13.4.zip + "https://f.xor.us/factorio-mods/bobwarfare_0.13.4.zip" ]; sha256 = "07wzn16i4r0qjm41wfyl17rrhry2vrph08a0kq8w5iy6qcbqqfd3"; }; @@ -204,7 +204,7 @@ rec { clock = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/clock_0.13.0.zip + "https://f.xor.us/factorio-mods/clock_0.13.0.zip" ]; sha256 = "0nflywbj6p2kz2w9wff78vskzljrzaf32ib56k3z456d9y8mlxfd"; }; diff --git a/pkgs/games/fairymax/default.nix b/pkgs/games/fairymax/default.nix index 44ed91da16851..b5e3afa9e3b7b 100644 --- a/pkgs/games/fairymax/default.nix +++ b/pkgs/games/fairymax/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.free ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = http://home.hccnet.nl/h.g.muller/dwnldpage.html; + homepage = "http://home.hccnet.nl/h.g.muller/dwnldpage.html"; }; } diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/games/fish-fillets-ng/default.nix index 47f72c52c1f03..638bf59fc781b 100644 --- a/pkgs/games/fish-fillets-ng/default.nix +++ b/pkgs/games/fish-fillets-ng/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = http://fillets.sourceforge.net/; + homepage = "http://fillets.sourceforge.net/"; }; } diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index d3c3271710a0e..c16c33666f314 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flight simulator"; - maintainers = with maintainers; [ raskin the-kenny ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; hydraPlatforms = []; # disabled from hydra because it's so big license = licenses.gpl2; diff --git a/pkgs/games/fltrator/default.nix b/pkgs/games/fltrator/default.nix index 957452aa1629e..7cf16e0783e5f 100644 --- a/pkgs/games/fltrator/default.nix +++ b/pkgs/games/fltrator/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "A simple retro style arcade side-scroller game."; longDescription = '' FLTrator is a simple retro style arcade side-scroller game in which you steer a spaceship through a landscape with hostile rockets and other obstacles. It has ten different levels and a level editor to create new levels or modify the existing.''; # from https://libregamewiki.org/FLTrator - homepage = http://fltrator.sourceforge.net/; + homepage = "http://fltrator.sourceforge.net/"; platforms = platforms.linux; maintainers = [ maintainers.marius851000 ]; license = licenses.gpl3; diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix index 3ba383c74273e..f574f25395585 100644 --- a/pkgs/games/freecell-solver/default.nix +++ b/pkgs/games/freecell-solver/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec{ Off, Forecell, and Seahaven Towers, as well as Simple Simon boards. ''; - homepage = https://fc-solve.shlomifish.org/; + homepage = "https://fc-solve.shlomifish.org/"; license = licenses.mit; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 9fc260e740625..3f64d92f07f6a 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkgconfig, python +{ stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkgconfig, python3 , zlib, bzip2, curl, lzma, gettext, libiconv , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth , gtkClient ? false, gtk3 @@ -12,19 +12,19 @@ let in stdenv.mkDerivation rec { pname = "freeciv"; - version = "2.6.0"; + version = "2.6.2"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "1b3q5k9wpv7z24svz01ybw8d8wlzkkdr6ia5hgp6cxk6vq67n67s"; + sha256 = "023slffi06j52amrnmd8n12rmf778cngxx6xg4hbsgckj2nyfmg9"; }; postPatch = '' for f in {common,utility}/*.py; do substituteInPlace $f \ - --replace '/usr/bin/env python' ${python.interpreter} + --replace '/usr/bin/env python3' ${python3.interpreter} done ''; @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { to the space age... ''; - homepage = http://www.freeciv.org; # http only + homepage = "http://www.freeciv.org"; # http only license = licenses.gpl2; maintainers = with maintainers; [ pierron ]; diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index 3b8bc1288efce..735a49bee622b 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { with close compatibility, under multiple platforms. ''; - homepage = http://www.freedink.org/; + homepage = "http://www.freedink.org/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix index 281691d283d7d..443d60b9d672f 100644 --- a/pkgs/games/freedroidrpg/default.nix +++ b/pkgs/games/freedroidrpg/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation { </para> ''; - homepage = http://www.freedroid.org/; + homepage = "http://www.freedroid.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index e32943fa8be8c..27be32071c187 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open source, turn-based space empire and galactic conquest (4X) computer game"; - homepage = http://www.freeorion.org; + homepage = "http://www.freeorion.org"; license = with licenses; [ gpl2 cc-by-sa-30 ]; platforms = platforms.linux; maintainers = with maintainers; [ tex ]; diff --git a/pkgs/games/freesweep/default.nix b/pkgs/games/freesweep/default.nix index 94efe1b650a7f..fdaaadbe42f03 100644 --- a/pkgs/games/freesweep/default.nix +++ b/pkgs/games/freesweep/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A console minesweeper-style game written in C for Unix-like systems"; - homepage = https://github.com/rwestlund/freesweep; + homepage = "https://github.com/rwestlund/freesweep"; license = licenses.gpl2; maintainers = with maintainers; [ kierdavis ]; platforms = platforms.unix; diff --git a/pkgs/games/frogatto/data.nix b/pkgs/games/frogatto/data.nix index 6531d407d2197..ab5bbe2dd9fb0 100644 --- a/pkgs/games/frogatto/data.nix +++ b/pkgs/games/frogatto/data.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/frogatto/frogatto; + homepage = "https://github.com/frogatto/frogatto"; description = "Data files to the frogatto game"; license = with licenses; [ cc-by-30 unfree ]; maintainers = with maintainers; [ astro ]; diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix index 4c5f1af8a9be6..35ff97061125c 100644 --- a/pkgs/games/frogatto/default.nix +++ b/pkgs/games/frogatto/default.nix @@ -34,7 +34,7 @@ in buildEnv { ''; meta = with stdenv.lib; { - homepage = https://frogatto.com; + homepage = "https://frogatto.com"; description = description; license = with licenses; [ cc-by-30 unfree ]; platforms = platforms.linux; diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix index 5254ff25b025d..d51cfcb8f2052 100644 --- a/pkgs/games/frogatto/engine.nix +++ b/pkgs/games/frogatto/engine.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/anura-engine/anura; + homepage = "https://github.com/anura-engine/anura"; description = "Game engine used by Frogatto"; license = licenses.zlib; platforms = platforms.linux; diff --git a/pkgs/games/frotz/default.nix b/pkgs/games/frotz/default.nix index 788280fd82088..40b6748693d19 100644 --- a/pkgs/games/frotz/default.nix +++ b/pkgs/games/frotz/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; meta = with stdenv.lib; { - homepage = http://frotz.sourceforge.net/; + homepage = "http://frotz.sourceforge.net/"; description = "A z-machine interpreter for Infocom games and other interactive fiction."; platforms = platforms.unix; maintainers = [ maintainers.nicknovitski ]; diff --git a/pkgs/games/galaxis/default.nix b/pkgs/games/galaxis/default.nix index f5089b6395f47..1bbbc5ead949a 100644 --- a/pkgs/games/galaxis/default.nix +++ b/pkgs/games/galaxis/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec{ interface of the original, but compensates by automating away some of the game's simpler deductions. ''; - homepage = http://catb.org/~esr/galaxis/; + homepage = "http://catb.org/~esr/galaxis/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/games/gambatte/default.nix b/pkgs/games/gambatte/default.nix index 6d8d14d8de0d9..ac099e21d56ff 100644 --- a/pkgs/games/gambatte/default.nix +++ b/pkgs/games/gambatte/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Portable, open-source Game Boy Color emulator"; - homepage = https://github.com/sinamas/gambatte; + homepage = "https://github.com/sinamas/gambatte"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix index 4c57538e234e3..fde573cecd854 100644 --- a/pkgs/games/garden-of-coloured-lights/default.nix +++ b/pkgs/games/garden-of-coloured-lights/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Old-school vertical shoot-em-up / bullet hell"; - homepage = http://garden.sourceforge.net/drupal/; + homepage = "http://garden.sourceforge.net/drupal/"; maintainers = with maintainers; [ Profpatsch ]; license = licenses.gpl3; }; diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index 83a567fa57822..8c5675407d0b5 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://ccxvii.net/gargoyle/; + homepage = "http://ccxvii.net/gargoyle/"; license = licenses.gpl2Plus; description = "Interactive fiction interpreter GUI"; platforms = platforms.unix; diff --git a/pkgs/games/gav/default.nix b/pkgs/games/gav/default.nix index 20e3f69152c6d..e42afefb8308a 100644 --- a/pkgs/games/gav/default.nix +++ b/pkgs/games/gav/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Remake of AV Arcade Volleyball"; - homepage = http://gav.sourceforge.net/; + homepage = "http://gav.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/gcs/default.nix b/pkgs/games/gcs/default.nix index f1230b739bb1b..9c0b479304a6e 100644 --- a/pkgs/games/gcs/default.nix +++ b/pkgs/games/gcs/default.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A stand-alone, interactive, character sheet editor for the GURPS 4th Edition roleplaying game system"; - homepage = https://gurpscharactersheet.com/; + homepage = "https://gurpscharactersheet.com/"; license = licenses.mpl20; platforms = platforms.all; maintainers = with maintainers; []; diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index 7a18f15ffa9c9..4f7d1cb37503f 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { support pseudo-3D role playing games based on the Dungeons & Dragons ruleset (Baldur's Gate and Icewind Dale series, Planescape: Torment). ''; - homepage = http://gemrb.org/; + homepage = "http://gemrb.org/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/games/gl-117/default.nix b/pkgs/games/gl-117/default.nix index 09a472f4dac83..f76f761189c1b 100644 --- a/pkgs/games/gl-117/default.nix +++ b/pkgs/games/gl-117/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An air combat simulator"; - homepage = https://sourceforge.net/projects/gl-117; + homepage = "https://sourceforge.net/projects/gl-117"; maintainers = with maintainers; [ raskin ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index 45c5013705f3f..e0e4b876f3ec7 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patches = [ ./header-order.patch ./public-buildproject.patch (fetchpatch { - url = https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw; + url = "https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw"; sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k"; }) ]; diff --git a/pkgs/games/gltron/default.nix b/pkgs/games/gltron/default.nix index 0e70096ab53f1..f6d74b6e9b75a 100644 --- a/pkgs/games/gltron/default.nix +++ b/pkgs/games/gltron/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL libGLU libGL zlib libpng libvorbis libmikmod SDL_sound ]; meta = { - homepage = http://www.gltron.org/; + homepage = "http://www.gltron.org/"; description = "Game based on the movie Tron"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/games/gmad/default.nix b/pkgs/games/gmad/default.nix index e51c326da195e..aad53a7915a5b 100644 --- a/pkgs/games/gmad/default.nix +++ b/pkgs/games/gmad/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { meta = { description = "Garry's Mod Addon Creator and Extractor"; - homepage = https://github.com/garrynewman/gmad; + homepage = "https://github.com/garrynewman/gmad"; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.abigailbuccaneer ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix index ff09a70e932e5..edfde5ea3e948 100644 --- a/pkgs/games/gnubg/default.nix +++ b/pkgs/games/gnubg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "World class backgammon application"; - homepage = http://www.gnubg.org/; + homepage = "http://www.gnubg.org/"; license = licenses.gpl3; maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index 43c60c6673050..478da6dc32a12 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, flex}: +{stdenv, fetchurl, flex, makeWrapper}: let s = # Generated upstream information rec { baseName="gnuchess"; - version="6.2.5"; + version="6.2.6"; name="${baseName}-${version}"; url="mirror://gnu/chess/${name}.tar.gz"; - sha256="00j8s0npgfdi41a0mr5w9qbdxagdk2v41lcr42rwl1jp6miyk6cs"; + sha256="0kxhdv01ia91v2y0cmzbll391ns2vbmn65jjrv37h4s1srszh5yn"; }; buildInputs = [ flex @@ -18,6 +18,13 @@ stdenv.mkDerivation { inherit (s) url sha256; }; inherit buildInputs; + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/gnuchessx --set PATH "$out/bin" + wrapProgram $out/bin/gnuchessu --set PATH "$out/bin" + ''; + meta = { inherit (s) version; description = "GNU Chess engine"; diff --git a/pkgs/games/gnugo/default.nix b/pkgs/games/gnugo/default.nix index fa8d59c05030a..069d14756e332 100644 --- a/pkgs/games/gnugo/default.nix +++ b/pkgs/games/gnugo/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU Go - A computer go player"; - homepage = https://www.gnu.org/software/gnugo/; + homepage = "https://www.gnu.org/software/gnugo/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/games/gnujump/default.nix b/pkgs/games/gnujump/default.nix index af2e924960a1e..8af7b84db26ef 100644 --- a/pkgs/games/gnujump/default.nix +++ b/pkgs/games/gnujump/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lm"; meta = with stdenv.lib; { - homepage = https://jump.gnu.sinusoid.es/index.php?title=Main_Page; + homepage = "https://jump.gnu.sinusoid.es/index.php?title=Main_Page"; description = "A clone of the simple yet addictive game Xjump"; longDescription = '' The goal in this game is to jump to the next floor trying not to fall diff --git a/pkgs/games/gnushogi/default.nix b/pkgs/games/gnushogi/default.nix index 381b4fd59593a..01c08fbf3dcbf 100644 --- a/pkgs/games/gnushogi/default.nix +++ b/pkgs/games/gnushogi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNU implementation of Shogi, also known as Japanese Chess"; - homepage = https://www.gnu.org/software/gnushogi/; + homepage = "https://www.gnu.org/software/gnushogi/"; license = licenses.gpl3; maintainers = [ maintainers.ciil ]; platforms = platforms.unix; diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix index f9ae137bb626d..b13a145ff5e80 100644 --- a/pkgs/games/gogui/default.nix +++ b/pkgs/games/gogui/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { meta = { maintainers = [ stdenv.lib.maintainers.cleverca22 ]; description = "A graphical user interface to programs that play the board game Go and support the Go Text Protocol such as GNU Go"; - homepage = http://gogui.sourceforge.net/; + homepage = "http://gogui.sourceforge.net/"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix index 7e89704324f3a..307c09dfa1b3a 100644 --- a/pkgs/games/gscrabble/default.nix +++ b/pkgs/games/gscrabble/default.nix @@ -32,7 +32,7 @@ buildPythonApplication { meta = with stdenv.lib; { description = "Golden Scrabble crossword puzzle game"; - homepage = https://github.com/RaaH/gscrabble/; + homepage = "https://github.com/RaaH/gscrabble/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.genesis ]; diff --git a/pkgs/games/gshogi/default.nix b/pkgs/games/gshogi/default.nix index d3fff64ada6da..9004bd3d0423a 100644 --- a/pkgs/games/gshogi/default.nix +++ b/pkgs/games/gshogi/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "A graphical implementation of the Shogi board game, also known as Japanese Chess"; - homepage = http://johncheetham.com/projects/gshogi/; + homepage = "http://johncheetham.com/projects/gshogi/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.ciil ]; diff --git a/pkgs/games/gtetrinet/default.nix b/pkgs/games/gtetrinet/default.nix index f1c24ba4de8bf..824e7afd73450 100644 --- a/pkgs/games/gtetrinet/default.nix +++ b/pkgs/games/gtetrinet/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { GTetrinet is a client program for Tetrinet, a multiplayer tetris game that is played over the internet. ''; - homepage = http://gtetrinet.sourceforge.net/; + homepage = "http://gtetrinet.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.chris-martin ]; diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix index 6031762d1d6b3..ae12c325306b3 100644 --- a/pkgs/games/gtypist/default.nix +++ b/pkgs/games/gtypist/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/gtypist; + homepage = "https://www.gnu.org/software/gtypist"; description = "Universal typing tutor"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 15d2ff5d57e93..e6f27eedbb9af 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/coelckers/gzdoom; + homepage = "https://github.com/coelckers/gzdoom"; description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features"; license = licenses.gpl3; platforms = ["x86_64-linux"]; diff --git a/pkgs/games/harmonist/default.nix b/pkgs/games/harmonist/default.nix index 19074a309ddaa..fb9e1cf661765 100644 --- a/pkgs/games/harmonist/default.nix +++ b/pkgs/games/harmonist/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - postInstall = "mv $bin/bin/harmonist.git $bin/bin/harmonist"; + postInstall = "mv $out/bin/harmonist.git $out/bin/harmonist"; meta = with stdenv.lib; { description = "A stealth coffee-break roguelike game"; diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix index a770e452ae4c8..8198453099277 100644 --- a/pkgs/games/hawkthorne/default.nix +++ b/pkgs/games/hawkthorne/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { to bring to life the video game used to determine the winner of Pierce Hawthorne's inheritance. ''; - homepage = https://www.reddit.com/r/hawkthorne; + homepage = "https://www.reddit.com/r/hawkthorne"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ campadrenalin ]; broken = true; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index dffeb2ac556d7..771554192d806 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -6,8 +6,9 @@ }: let + # gameServer/hedgewars-server.cabal depends on network < 3 ghc = ghcWithPackages (pkgs: with pkgs; [ - SHA bytestring entropy hslogger network pkgs.zlib random + SHA bytestring entropy hslogger network_2_6_3_1 pkgs.zlib random regex-tdfa sandi utf8-string vector ]); @@ -40,6 +41,15 @@ mkDerivation rec { "-DNOSERVER=${if withServer then "OFF" else "ON"}" ]; + + # hslogger brings network-3 and network-bsd which conflict with + # network-2.6.3.1 + preConfigure = '' + substituteInPlace gameServer/CMakeLists.txt \ + --replace "haskell_flags}" \ + "haskell_flags} -package network-2.6.3.1 -hide-package network-bsd" + ''; + NIX_LDFLAGS = lib.concatMapStringsSep " " (e: "-rpath ${e}/lib") [ SDL2.out SDL2_image diff --git a/pkgs/games/holdingnuts/default.nix b/pkgs/games/holdingnuts/default.nix index c20cce723c26a..d0cee8d76cfe4 100644 --- a/pkgs/games/holdingnuts/default.nix +++ b/pkgs/games/holdingnuts/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { buildInputs = [ cmake SDL qt4 ]; meta = with stdenv.lib; { - homepage = http://www.holdingnuts.net/; + homepage = "http://www.holdingnuts.net/"; description = "Open Source Poker client and server"; license = licenses.gpl3; maintainers = with maintainers; [ obadz ]; diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index fdf8324cd4888..1ef0fd147d873 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "11.3f"; + version = "11.3l"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "0i6dksxx33xga4pq41qsfllqras1hzk14ffqhnk11aj5lrfg98rm"; + sha256 = "0fniyaf9mgg99s03wbdc36zg909kshpdfk9pn8pkai0x99lghkwb"; }; CPPFLAGS = "-I${SDL.dev}/include/SDL"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.roguetemple.com/z/hyper/; + homepage = "http://www.roguetemple.com/z/hyper/"; description = "A roguelike game set in hyperbolic geometry"; maintainers = with maintainers; [ rardiol ]; license = licenses.gpl2; diff --git a/pkgs/games/icbm3d/default.nix b/pkgs/games/icbm3d/default.nix index ba9173c04921b..71ecfacb37ec8 100644 --- a/pkgs/games/icbm3d/default.nix +++ b/pkgs/games/icbm3d/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "icbm3d-0.4"; src = fetchurl { - url = ftp://ftp.tuxpaint.org/unix/x/icbm3d/icbm3d.0.4.tar.gz; + url = "ftp://ftp.tuxpaint.org/unix/x/icbm3d/icbm3d.0.4.tar.gz"; sha256 = "1z9q01mj0v9qbwby5cajjc9wpvdw2ma5v1r639vraxpl9qairm4s"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.newbreedsoftware.com/icbm3d/; + homepage = "http://www.newbreedsoftware.com/icbm3d/"; description = "3D vector-based clone of the atari game Missile Command"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/instead-launcher/default.nix b/pkgs/games/instead-launcher/default.nix index 10d29657d7cf3..84e3474225ad5 100644 --- a/pkgs/games/instead-launcher/default.nix +++ b/pkgs/games/instead-launcher/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; meta = with stdenv.lib; { - homepage = https://instead.syscall.ru/wiki/en/instead-launcher; + homepage = "https://instead.syscall.ru/wiki/en/instead-launcher"; description = "Install and play games from INSTEAD repository"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index fff15b5c5b0c1..f131b920990c4 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -6,23 +6,23 @@ let # I took several games at random from http://instead.syscall.ru/games/ games = [ (fetchurl { - url = http://instead-games.googlecode.com/files/instead-apple-day-1.2.zip; + url = "http://instead-games.googlecode.com/files/instead-apple-day-1.2.zip"; sha256 = "0d4m554hiqmgl4xl0jp0b3bqjl35879768hqznh9y57y04sygd2a"; }) (fetchurl { - url = http://instead-games.googlecode.com/files/instead-cat_en-1.2.zip; + url = "http://instead-games.googlecode.com/files/instead-cat_en-1.2.zip"; sha256 = "0jlm3ssqlka16dm0rg6qfjh6xdh3pv7lj2s4ib4mqwj2vfy0v6sg"; }) (fetchurl { - url = http://instead-games.googlecode.com/files/instead-vinny-0.1.zip; + url = "http://instead-games.googlecode.com/files/instead-vinny-0.1.zip"; sha256 = "15qdbg82zp3a8vz4qxminr0xbzbdpnsciliy2wm3raz4hnadawg1"; }) (fetchurl { - url = http://instead-games.googlecode.com/files/instead-toilet3in1-1.2.zip; + url = "http://instead-games.googlecode.com/files/instead-toilet3in1-1.2.zip"; sha256 = "0wz4bljbg67m84qwpaqpzs934a5pcbhpgh39fvbbbfvnnlm4lirl"; }) (fetchurl { - url = http://instead-games.googlecode.com/files/instead-kayleth-0.4.1.zip; + url = "http://instead-games.googlecode.com/files/instead-kayleth-0.4.1.zip"; sha256 = "0xmn9inys0kbcdd02qaqp8gazqs67xq3fq7hvcy2qb9jbq85j8b2"; }) ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple text adventure interpreter for Unix and Windows"; - homepage = http://instead.syscall.ru/; + homepage = "http://instead.syscall.ru/"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index 4e8dc5bbbe9fa..c5a93939a0f94 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_mixer, alsaLib, libpng -, pcre, graphicsmagick, makeDesktopItem }: +, pcre, makeDesktopItem }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "04jzs8wad2b3g9hvnijr4r89iiw6b1i44zdzkg0dy447lrw6l6xc"; }; - nativeBuildInputs = [ cmake pkgconfig graphicsmagick ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ SDL2 SDL2_mixer alsaLib libpng pcre ]; @@ -36,12 +36,19 @@ stdenv.mkDerivation rec { comment = meta.description; }; - # Create appropriate directories. Convert "Icon.bmp" to "ivan.png", then copy - # it and "ivan.desktop" to these directories. + # Create appropriate directories. Copy icons and desktop item to these directories. postInstall = '' mkdir -p $out/share/applications + mkdir -p $out/share/icons/hicolor/16x16/apps mkdir -p $out/share/icons/hicolor/32x32/apps - gm convert $src/Graphics/Icon.bmp $out/share/icons/hicolor/32x32/apps/ivan.png + mkdir -p $out/share/icons/hicolor/128x128/apps + mkdir -p $out/share/icons/hicolor/256x256/apps + mkdir -p $out/share/icons/hicolor/512x512/apps + cp $src/Graphics/icons/shadowless.iconset/icon_16x16.png $out/share/icons/hicolor/16x16/apps/ivan.png + cp $src/Graphics/icons/shadowless.iconset/icon_32x32.png $out/share/icons/hicolor/32x32/apps/ivan.png + cp $src/Graphics/icons/shadowless.iconset/icon_128x128.png $out/share/icons/hicolor/128x128/apps/ivan.png + cp $src/Graphics/icons/shadowless.iconset/icon_256x256.png $out/share/icons/hicolor/256x256/apps/ivan.png + cp $src/Graphics/icons/shadowless.iconset/icon_512x512.png $out/share/icons/hicolor/512x512/apps/ivan.png cp ${ivanDesktop}/share/applications/* $out/share/applications ''; diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index cbbdb538513cf..0a9ebd9e3eb40 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -6,6 +6,7 @@ , cmake , makeWrapper , fetchFromGitHub +, fetchpatch , cudnn ? null , cudatoolkit ? null , libGL_driver ? null @@ -34,15 +35,30 @@ let in env.mkDerivation rec { pname = "katago"; - version = "1.3.5"; + version = "1.4.2"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; rev = "v${version}"; - sha256 = "1625s3fh0xc2ldgyl6sjdjmpliyys7rzzkcys6h9x6k828g8n0lq"; + sha256 = "0qdc9hgbzd175b2xkjs62dy6gyybcn9lf1mifiyhjbzjpgv192h4"; }; + # To workaround CMake 3.17.0's new buggy behavior wrt CUDA Compiler testing + # See the following tracking issues: + # KataGo: + # - Issue #225: https://github.com/lightvector/KataGo/issues/225 + # - PR #227: https://github.com/lightvector/KataGo/pull/227 + # CMake: + # - Issue #20708: https://gitlab.kitware.com/cmake/cmake/-/issues/20708 + patches = [ + (fetchpatch { + name = "227.patch"; + url = "https://patch-diff.githubusercontent.com/raw/lightvector/KataGo/pull/227.patch"; + sha256 = "03f1vmdjhb79mpj95sijcwla8acy32clrjgrn4xqw5h90zdgj511"; + }) + ]; + nativeBuildInputs = [ cmake makeWrapper diff --git a/pkgs/games/keen4/default.nix b/pkgs/games/keen4/default.nix index 64522e568db6d..c91cc486118f3 100644 --- a/pkgs/games/keen4/default.nix +++ b/pkgs/games/keen4/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; dist = fetchurl { - url = http://tarballs.nixos.org/keen4.zip; + url = "http://tarballs.nixos.org/keen4.zip"; sha256 = "12rnc9ksl7v6l8wsxvr26ylkafzq80dbsa7yafzw9pqc8pafkhx1"; }; diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index f58f86cd8fba4..e62c5a182339d 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Just another free touch typing tutor program"; - homepage = http://klavaro.sourceforge.net/; + homepage = "http://klavaro.sourceforge.net/"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = [stdenv.lib.maintainers.mimame]; diff --git a/pkgs/games/kobodeluxe/default.nix b/pkgs/games/kobodeluxe/default.nix index 38eff4f2fceb0..5620cee185d8e 100644 --- a/pkgs/games/kobodeluxe/default.nix +++ b/pkgs/games/kobodeluxe/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "kobodeluxe-0.5.1"; src = fetchurl { - url = http://olofson.net/kobodl/download/KoboDeluxe-0.5.1.tar.bz2; + url = "http://olofson.net/kobodl/download/KoboDeluxe-0.5.1.tar.bz2"; sha256 = "0f7b910a399d985437564af8c5d81d6dcf22b96b26b01488d72baa6a6fdb5c2c"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { patches = [ ./glibc29.patch ]; meta = { - homepage = http://olofson.net/kobodl/; + homepage = "http://olofson.net/kobodl/"; description = "Enhanced version of Akira Higuchi's game XKobo for Un*x systems with X11"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix index 0e6941a8acd5a..ddd7e454efbad 100644 --- a/pkgs/games/lbreakout2/default.nix +++ b/pkgs/games/lbreakout2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Breakout clone from the LGames series"; - homepage = http://lgames.sourceforge.net/LBreakout2/; + homepage = "http://lgames.sourceforge.net/LBreakout2/"; license = licenses.gpl2; maintainers = [ maintainers.ciil ]; platforms = platforms.unix; diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/games/leela-zero/default.nix index d4621682cc679..7ade06393bb60 100644 --- a/pkgs/games/leela-zero/default.nix +++ b/pkgs/games/leela-zero/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Go engine modeled after AlphaGo Zero"; - homepage = https://github.com/gcp/leela-zero; + homepage = "https://github.com/gcp/leela-zero"; license = licenses.gpl3; maintainers = [ maintainers.averelld maintainers.omnipotententity ]; platforms = platforms.linux; diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index dc6ebd396ed9c..69200bd184fc4 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = https://github.com/Sude-/lgogdownloader; + homepage = "https://github.com/Sude-/lgogdownloader"; description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader"; license = stdenv.lib.licenses.wtfpl; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/liberal-crime-squad/default.nix b/pkgs/games/liberal-crime-squad/default.nix index 0811c01aa7912..25d8bf3eae53b 100644 --- a/pkgs/games/liberal-crime-squad/default.nix +++ b/pkgs/games/liberal-crime-squad/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { longDescription = '' Welcome to Liberal Crime Squad! The Conservatives have taken the Executive, Legislative, and Judicial branches of government. Over time, the Liberal laws of this nation will erode and turn the country into a BACKWOODS YET CORPORATE NIGHTMARE. To prevent this from happening, the Liberal Crime Squad was established. The mood of the country is shifting, and we need to turn things around. Go out on the streets and indoctrinate Conservative automatons. That is, let them see their True Liberal Nature. Then arm them and send them forth to Stop Evil. ''; - homepage = https://github.com/Kamal-Sadek/Liberal-Crime-Squad; + homepage = "https://github.com/Kamal-Sadek/Liberal-Crime-Squad"; maintainers = [ maintainers.rardiol ]; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix index fb98b1a3811b7..574b8ead0950a 100644 --- a/pkgs/games/lincity/default.nix +++ b/pkgs/games/lincity/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "City simulation game"; license = licenses.gpl2Plus; - homepage = https://sourceforge.net/projects/lincity; + homepage = "https://sourceforge.net/projects/lincity"; }; } diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix deleted file mode 100644 index a3c9599e7b1d5..0000000000000 --- a/pkgs/games/linux-steam-integration/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, git, gtk, gettext, - gcc_multi, libressl, gnome3, steam }: - -let - version = "0.7.3"; - -in stdenv.mkDerivation { - pname = "linux-steam-integration"; - inherit version; - - src = fetchFromGitHub { - owner = "clearlinux"; - repo = "linux-steam-integration"; - rev = "v${version}"; - sha256 = "0brv3swx8h170ycxksb31sf5jvj85csfpx7gjlf6yrfz7jw2j6vp"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ meson ninja pkgconfig git gettext gcc_multi ]; - buildInputs = [ gtk libressl ]; - - # Patch lib paths (AUDIT_PATH and REDIRECT_PATH) in shim.c - # Patch path to lsi-steam in lsi-steam.desktop - # Patch path to zenity in lsi.c - postPatch = '' - substituteInPlace src/shim/shim.c --replace "/usr/" $out - substituteInPlace data/lsi-steam.desktop --replace "/usr/" $out - substituteInPlace src/lsi/lsi.c --replace zenity ${gnome3.zenity}/bin/zenity - substituteInPlace data/lsi-settings.desktop.in \ - --replace "Name=Linux Steam Integration" "Name=Linux Steam Integration Settings" - ''; - - configurePhase = '' - # Configure 64bit things - meson build \ - -Dwith-shim=co-exist \ - -Dwith-frontend=true \ - -Dwith-steam-binary=${steam}/bin/steam \ - -Dwith-new-libcxx-abi=true \ - -Dwith-libressl-mode=native \ - --prefix / \ - --libexecdir lib \ - --libdir lib \ - --bindir bin - - # Configure 32bit things - CC="gcc -m32" CXX="g++ -m32" meson build32 \ - -Dwith-shim=none \ - -Dwith-libressl-mode=native \ - --prefix / \ - --libexecdir lib32 \ - --libdir lib32 - ''; - - buildPhase = '' - # Build 64bit things - ninja -C build - - # Build 32bit things - ninja -C build32 - ''; - - installPhase = '' - DESTDIR="$out" ninja -C build install - DESTDIR="$out" ninja -C build32 install - ''; - - meta = with stdenv.lib; { - description = "Steam wrapper to improve compability and performance"; - longDescription = '' - Linux Steam Integration is a helper system to make the Steam Client and - Steam games run better on Linux. In a nutshell, LSI automatically applies - various workarounds to get games working, and fixes long standing bugs in - both games and the client - ''; - homepage = https://github.com/clearlinux/linux-steam-integration; - license = licenses.lgpl21; - maintainers = [ maintainers.etu ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index 800ac0fc4c7a7..341d077879c28 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Quick tactics game"; - homepage = https://www.gnu.org/software/liquidwar6/; + homepage = "https://www.gnu.org/software/liquidwar6/"; maintainers = [ maintainers.raskin ]; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/games/ltris/default.nix b/pkgs/games/ltris/default.nix index d580d7586ff94..0ea4143bc3d23 100644 --- a/pkgs/games/ltris/default.nix +++ b/pkgs/games/ltris/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tetris clone from the LGames series"; - homepage = http://lgames.sourceforge.net/LBreakout2/; + homepage = "http://lgames.sourceforge.net/LBreakout2/"; license = licenses.gpl2; maintainers = [ maintainers.ciil ]; platforms = platforms.linux; diff --git a/pkgs/games/lugaru/default.nix b/pkgs/games/lugaru/default.nix index cad98650c24e1..6620074418d16 100644 --- a/pkgs/games/lugaru/default.nix +++ b/pkgs/games/lugaru/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Lugaru HD: Third person ninja rabbit fighting game"; - homepage = https://osslugaru.gitlab.io; + homepage = "https://osslugaru.gitlab.io"; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/games/macopix/default.nix b/pkgs/games/macopix/default.nix index 7879b68c857db..f88b763aaf861 100644 --- a/pkgs/games/macopix/default.nix +++ b/pkgs/games/macopix/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Mascot Constructive Pilot for X"; - homepage = http://rosegray.sakura.ne.jp/macopix/index-e.html; + homepage = "http://rosegray.sakura.ne.jp/macopix/index-e.html"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix index ed0b2be0d9782..9fe99bff2f92f 100644 --- a/pkgs/games/mar1d/default.nix +++ b/pkgs/games/mar1d/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { original, however, the game still takes place in a two dimensional world. You must view the world as mario does, as a one dimensional line. ''; - homepage = https://github.com/olynch/fp_mario; + homepage = "https://github.com/olynch/fp_mario"; license = licenses.agpl3; maintainers = with maintainers; [ taeer ]; platforms = platforms.linux; diff --git a/pkgs/games/mari0/default.nix b/pkgs/games/mari0/default.nix new file mode 100644 index 0000000000000..b8c4ea281dfd2 --- /dev/null +++ b/pkgs/games/mari0/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, zip, love_11, lua, makeWrapper, makeDesktopItem }: + +let + pname = "mari0"; + version = "1.6.2"; + + desktopItem = makeDesktopItem { + name = "mari0"; + exec = pname; + comment = "Crossover between Super Mario Bros. and Portal"; + desktopName = "mari0"; + genericName = "mari0"; + categories = "Game"; + }; + +in + +stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "Stabyourself"; + repo = pname; + rev = "${version}"; + sha256 = "1zqaq4w599scsjvy1rsb21fd2r8j3srx9vym4ir9bh666dp36gxa"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ lua love_11 zip ]; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = + '' + mkdir -p $out/bin $out/share/games/lovegames $out/share/applications + zip -9 -r ${pname}.love ./* + mv ${pname}.love $out/share/games/lovegames/${pname}.love + makeWrapper ${love_11}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love + ln -s ${desktopItem}/share/applications/* $out/share/applications/ + chmod +x $out/bin/${pname} + ''; + + meta = with stdenv.lib; { + description = "Crossover between Super Mario Bros. and Portal"; + platforms = platforms.linux; + license = licenses.mit; + downloadPage = "https://stabyourself.net/mari0/"; + }; + +} diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix index ed926461db21b..53ffb4e4b2d09 100644 --- a/pkgs/games/mars/default.nix +++ b/pkgs/games/mars/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { chmod +x "$out/bin/mars" ''; meta = with stdenv.lib; { - homepage = http://mars-game.sourceforge.net/; + homepage = "http://mars-game.sourceforge.net/"; description = "A game about fighting with ships in a 2D space setting"; license = licenses.gpl3Plus; maintainers = [ maintainers.astsmtl ]; diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 14e0d881e0952..d5129818cb23a 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { meta = { description = "MegaGlest is an entertaining free (freeware and free software) and open source cross-platform 3D real-time strategy (RTS) game"; license = stdenv.lib.licenses.gpl3; - homepage = http://megaglest.org/; + homepage = "http://megaglest.org/"; maintainers = [ stdenv.lib.maintainers.matejc ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/meritous/default.nix b/pkgs/games/meritous/default.nix index 4a37fc8f6767a..2958c6a9210fc 100644 --- a/pkgs/games/meritous/default.nix +++ b/pkgs/games/meritous/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Action-adventure dungeon crawl game"; - homepage = http://www.asceai.net/meritous/; + homepage = "http://www.asceai.net/meritous/"; license = licenses.gpl3; maintainers = [ maintainers.alexvorobiev ]; platforms = platforms.linux; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 03c1cb5cc4abe..db36b43ea2999 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -61,7 +61,7 @@ let ''; meta = with stdenv.lib; { - homepage = http://minetest.net/; + homepage = "http://minetest.net/"; description = "Infinite-world block sandbox game"; license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; @@ -76,9 +76,9 @@ let }; v5 = { - version = "5.1.1"; - sha256 = "0cjj63333b7j4ydfq0h9yc6d2jvmyjd7n7zbd08yrf0rcibrj2k0"; - dataSha256 = "1r9fxz2j24q74a9injvbxbf2xk67fzabv616i676zw2cvgv9hn39"; + version = "5.2.0"; + sha256 = "0pj9hkxwc1vzng2khbixi79557sbawf6mqkzl589jciyqa7jqkv1"; + dataSha256 = "1kjz7x3xiqqnpyrd6339a139pbdxx31c4qpg8pmns410hsm8i358"; }; in { diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 38763073ac8f3..44bd396e9fab4 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -12,18 +12,19 @@ python.pkgs.buildPythonApplication rec { sha256 = "0dhvg9cxc6m6kzk75h363h1g0bl80cqz11cijh0zpz9f4w6lnqsq"; }; - nativeBuildInputs = with python.pkgs; [ wrapPython pyqtwebengine.wrapQtAppsHook ]; + nativeBuildInputs = with python.pkgs; [ pyqtwebengine.wrapQtAppsHook ]; buildInputs = [ anki ]; propagatedBuildInputs = with python.pkgs; [ + cheroot + cherrypy googletrans gtts - pyqtwebengine - pyqt5 matplotlib - cherrypy - cheroot + pyopengl + pyqt5 + pyqtwebengine webob ]; @@ -36,16 +37,17 @@ python.pkgs.buildPythonApplication rec { doCheck = false; postInstall = '' - mkdir -p $out/share + mkdir -p $out/share/applications mv $out/${python.sitePackages}/$out/share/locale $out/share + mv mnemosyne.desktop $out/share/applications rm -r $out/${python.sitePackages}/nix ''; dontWrapQtApps = true; - preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") - ''; + makeWrapperArgs = [ + "\${qtWrapperArgs[@]}" + ]; meta = { homepage = "https://mnemosyne-proj.org/"; diff --git a/pkgs/games/moon-buggy/default.nix b/pkgs/games/moon-buggy/default.nix index d0c07b71e2ea5..9de24c1ae9dcf 100644 --- a/pkgs/games/moon-buggy/default.nix +++ b/pkgs/games/moon-buggy/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.rybern]; platforms = stdenv.lib.platforms.linux; - homepage = https://www.seehuhn.de/pages/moon-buggy; + homepage = "https://www.seehuhn.de/pages/moon-buggy"; }; } diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index e8138f8123228..367a7a5c5e614 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ ]; platforms = platforms.linux; license = licenses.zlib; - downloadPage = http://tangramgames.dk/games/mrrescue; + downloadPage = "http://tangramgames.dk/games/mrrescue"; }; } diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index a402587ed8b4f..75d16586a39f1 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Crossplatform mud client"; - homepage = http://mudlet.org/; + homepage = "http://mudlet.org/"; maintainers = [ maintainers.wyvie maintainers.pstn ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index e6fa064f387ca..bcdd950de4ad9 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -4,12 +4,12 @@ let libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; in mkDerivation rec { pname = "multimc"; - version = "0.6.7"; + version = "0.6.11"; src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; rev = version; - sha256 = "1i160rmsdvrcnvlr6m2qjwkfx0lqnzrcifjkaklw96ina6z6cg2n"; + sha256 = "1jkbmb4sgfk8d93f5l1vd9pkpvhq9sxacc61w0rvf5xmz0wnszmz"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake file makeWrapper ]; diff --git a/pkgs/games/n2048/default.nix b/pkgs/games/n2048/default.nix index ae086af184c60..f5ff0b4690e9f 100644 --- a/pkgs/games/n2048/default.nix +++ b/pkgs/games/n2048/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.bsd2; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = http://www.dettus.net/n2048/; + homepage = "http://www.dettus.net/n2048/"; }; } diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index a1b525ff093b9..c328199b377c1 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { description = "2D action/rpg space game"; - homepage = http://www.naev.org; + homepage = "http://www.naev.org"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index 280ca090d60eb..1b082537148b8 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -143,7 +143,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Rogue-like game"; - homepage = http://nethack.org/; + homepage = "http://nethack.org/"; license = "nethack"; platforms = if x11Mode then platforms.linux else platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/netris/default.nix b/pkgs/games/netris/default.nix new file mode 100644 index 0000000000000..994db4e67f8ab --- /dev/null +++ b/pkgs/games/netris/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, ncurses }: + +stdenv.mkDerivation { + pname = "netris"; + version = "0.52"; + + src = fetchFromGitHub { + owner = "naclander"; + repo = "netris"; + rev = "6773c9b2d39a70481a5d6eb5368e9ced6229ad2b"; + sha256 = "0gmxbpn50pnffidwjchkzph9rh2jm4wfq7hj8msp5vhdq5h0z9hm"; + }; + + buildInputs = [ + ncurses + ]; + + configureScript = "./Configure"; + dontAddPrefix = true; + + installPhase = '' + mkdir -p $out/bin + cp ./netris $out/bin + ''; + + meta = with stdenv.lib; { + description = "A free networked version of T*tris"; + license = licenses.gpl2; + maintainers = with maintainers; [ patryk27 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix index daba54ce810e5..99ce818d04d1d 100644 --- a/pkgs/games/neverball/default.nix +++ b/pkgs/games/neverball/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://neverball.org/; + homepage = "https://neverball.org/"; description = "Tilt the floor to roll a ball"; license = "GPL"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix index 9f8d228e71677..e055e27d2cdb8 100644 --- a/pkgs/games/nexuiz/default.nix +++ b/pkgs/games/nexuiz/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation { meta = { description = "A free fast-paced first-person shooter"; - homepage = http://www.alientrap.org/games/nexuiz; + homepage = "http://www.alientrap.org/games/nexuiz"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/njam/default.nix b/pkgs/games/njam/default.nix index 6f700ad32045f..5022a92a7cd19 100644 --- a/pkgs/games/njam/default.nix +++ b/pkgs/games/njam/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "njam-1.25"; src = fetchurl { - url = mirror://sourceforge/njam/njam-1.25-src.tar.gz; + url = "mirror://sourceforge/njam/njam-1.25-src.tar.gz"; sha256 = "0ysvqw017xkvddj957pdfmbmji7qi20nyr7f0zxvcvm6c7d3cc7s"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { patches = [ ./logfile.patch ]; meta = { - homepage = http://trackballs.sourceforge.net/; + homepage = "http://trackballs.sourceforge.net/"; description = "Cross-platform pacman-like game"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/nottetris2/default.nix b/pkgs/games/nottetris2/default.nix new file mode 100644 index 0000000000000..dde35e4fe3204 --- /dev/null +++ b/pkgs/games/nottetris2/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchFromGitHub, zip, love_0_7, makeWrapper, makeDesktopItem }: + +let + pname = "nottetris2"; + version = "2.0"; + + desktopItem = makeDesktopItem { + name = "nottetris2"; + exec = pname; + comment = "It's like tetris, but it's not"; + desktopName = "nottetris2"; + genericName = "nottetris2"; + categories = "Game"; + }; + +in + +stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "Stabyourself"; + repo = pname; + rev = "v${version}"; + sha256 = "17iabh6rr8jim70n96rbhif4xq02g2kppscm8l339yqx6mhb64hs"; + }; + + nativeBuildInputs = [ zip ]; + buildInputs = [ love_0_7 makeWrapper ]; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = + '' + mkdir -p $out/bin $out/share/games/lovegames $out/share/applications + zip -9 -r ${pname}.love ./* + mv ${pname}.love $out/share/games/lovegames/${pname}.love + makeWrapper ${love_0_7}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love + ln -s ${desktopItem}/share/applications/* $out/share/applications/ + chmod +x $out/bin/${pname} + ''; + + meta = with stdenv.lib; { + description = "It's like Tetris, but it's not"; + platforms = platforms.linux; + license = licenses.wtfpl; + maintainers = with maintainers; [ yorickvp ]; + downloadPage = "https://stabyourself.net/nottetris2/"; + }; + +} diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index 1d56d86f53018..6a05a566524dd 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation { combines the strategic challenge of a classical RTS with the sheer fun of Tower Defense. ''; - homepage = http://oilrush-game.com/; + homepage = "http://oilrush-game.com/"; license = stdenv.lib.licenses.unfree; #maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix index 2ad23a72368b5..ebcf755780d30 100644 --- a/pkgs/games/onscripter-en/default.nix +++ b/pkgs/games/onscripter-en/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Japanese visual novel scripting engine"; - homepage = http://unclemion.com/onscripter/; + homepage = "http://unclemion.com/onscripter/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix index 1e839c46f0fec..577eafb6a8ca0 100644 --- a/pkgs/games/openarena/default.nix +++ b/pkgs/games/openarena/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "Crossplatform openarena client"; - homepage = http://openarena.ws/; + homepage = "http://openarena.ws/"; maintainers = [ stdenv.lib.maintainers.wyvie ]; platforms = [ "i386-linux" "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix index cce643e9f7db8..18147c896bf44 100644 --- a/pkgs/games/openclonk/default.nix +++ b/pkgs/games/openclonk/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free multiplayer action game in which you control clonks, small but witty and nimble humanoid beings"; - homepage = https://www.openclonk.org; + homepage = "https://www.openclonk.org"; license = if enableSoundtrack then licenses.unfreeRedistributable else licenses.isc; maintainers = with maintainers; [ lheckemann ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix index 751eb6d5933e9..591bea12297dd 100644 --- a/pkgs/games/opendune/default.nix +++ b/pkgs/games/opendune/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Dune, Reinvented"; - homepage = https://github.com/OpenDUNE/OpenDUNE; + homepage = "https://github.com/OpenDUNE/OpenDUNE"; license = licenses.gpl2; maintainers = with maintainers; [ nand0p ]; }; diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix index f6841abb1d07a..467c782211f89 100644 --- a/pkgs/games/opendungeons/default.nix +++ b/pkgs/games/opendungeons/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius."; - homepage = https://opendungeons.github.io; + homepage = "https://opendungeons.github.io"; license = [ licenses.gpl3Plus licenses.zlib licenses.mit licenses.cc-by-sa-30 licenses.cc0 licenses.ofl licenses.cc-by-30 ]; platforms = platforms.linux; }; diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index 07dd2a00c2305..2d08a1da99986 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -56,7 +56,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "An open-source engine for Star Wars Jedi Academy game"; - homepage = https://github.com/JACoders/OpenJK; + homepage = "https://github.com/JACoders/OpenJK"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ gnidorah ]; diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix index 4b1385f3e10d1..66c9420591d52 100644 --- a/pkgs/games/openlierox/default.nix +++ b/pkgs/games/openlierox/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { pkgconfig curl cmake libzip ]; meta = { - homepage = http://openlierox.net; + homepage = "http://openlierox.net"; description = "Real-time game with Worms-like shooting"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index a7e386398d233..a9047de704162 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -32,7 +32,7 @@ in mkDerivationWith stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An unofficial open source engine reimplementation of the game Morrowind"; - homepage = http://openmw.org; + homepage = "http://openmw.org"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 3d14fb0487c77..59bdc69010787 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -50,6 +50,12 @@ in openmw.overrideAttrs (oldAttrs: rec { "-DRakNet_LIBRARY_DEBUG=${rakNetLibrary}/lib/libRakNetLibStatic.a" ]; + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95175 + patches = [ + ./tes3mp.patch + ]; + NIX_CFLAGS_COMPILE = "-fpermissive"; + preConfigure = '' substituteInPlace files/version.in \ --subst-var-by OPENMW_VERSION_COMMITHASH ${compatHash} @@ -69,7 +75,7 @@ in openmw.overrideAttrs (oldAttrs: rec { meta = with stdenv.lib; { description = "Multiplayer for TES3:Morrowind based on OpenMW"; - homepage = https://tes3mp.com/; + homepage = "https://tes3mp.com/"; license = licenses.gpl3; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ gnidorah ]; diff --git a/pkgs/games/openmw/tes3mp.patch b/pkgs/games/openmw/tes3mp.patch new file mode 100644 index 0000000000000..c2a78f9db9b02 --- /dev/null +++ b/pkgs/games/openmw/tes3mp.patch @@ -0,0 +1,13 @@ +diff --git a/apps/openmw-mp/Script/Types.hpp b/apps/openmw-mp/Script/Types.hpp +index be365cfb8..204dcdc7b 100644 +--- a/apps/openmw-mp/Script/Types.hpp ++++ b/apps/openmw-mp/Script/Types.hpp +@@ -105,7 +105,7 @@ struct ScriptFunctionPointer : public ScriptIdentity + void *addr; + #if (!defined(__clang__) && defined(__GNUC__)) + template<typename R, typename... Types> +- constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr((void*)(addr)) {} ++ constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr(addr) {} + #else + template<typename R, typename... Types> + constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr(addr) {} diff --git a/pkgs/games/openra/engines.nix b/pkgs/games/openra/engines.nix index 1c3d2308d9722..933f8411f75a0 100644 --- a/pkgs/games/openra/engines.nix +++ b/pkgs/games/openra/engines.nix @@ -4,7 +4,7 @@ let buildUpstreamOpenRAEngine = { version, rev, sha256 }: name: (buildOpenRAEngine { inherit version; description = "Open-source re-implementation of Westwood Studios' 2D Command and Conquer games"; - homepage = https://www.openra.net/; + homepage = "https://www.openra.net/"; mods = [ "cnc" "d2k" "ra" "ts" ]; src = fetchFromGitHub { owner = "OpenRA"; diff --git a/pkgs/games/openra/mods.nix b/pkgs/games/openra/mods.nix index a045e365eceb6..4a79125dc1817 100644 --- a/pkgs/games/openra/mods.nix +++ b/pkgs/games/openra/mods.nix @@ -10,7 +10,7 @@ in { version = "96.git.fc3cf0b"; title = "Combined Arms"; description = "A game that combines units from the official OpenRA Red Alert and Tiberian Dawn mods"; - homepage = https://github.com/Inq8/CAmod; + homepage = "https://github.com/Inq8/CAmod"; src = fetchFromGitHub { owner = "Inq8"; repo = "CAmod"; @@ -34,7 +34,7 @@ in { version = "134.git.69a4aa7"; title = "Dune II"; description = "A modernization of the original ${title} game"; - homepage = https://github.com/OpenRA/d2; + homepage = "https://github.com/OpenRA/d2"; src = fetchFromGitHub { owner = "OpenRA"; repo = "d2"; @@ -63,7 +63,7 @@ in { version = "324.git.ffcd6ba"; title = "Dark Reign"; description = "A re-imagination of the original Command & Conquer: ${title} game"; - homepage = https://github.com/drogoganor/DarkReign; + homepage = "https://github.com/drogoganor/DarkReign"; src = fetchFromGitHub { owner = "drogoganor"; repo = "DarkReign"; @@ -87,7 +87,7 @@ in { version = "1157.git.4f5e11d"; title = "Generals Alpha"; description = "Re-imagination of the original Command & Conquer: Generals game"; - homepage = https://github.com/MustaphaTR/Generals-Alpha; + homepage = "https://github.com/MustaphaTR/Generals-Alpha"; src = fetchFromGitHub { owner = "MustaphaTR"; repo = "Generals-Alpha"; @@ -111,7 +111,7 @@ in { inherit version; title = "Krush, Kill 'n' Destroy"; description = "Re-imagination of the original ${title} game"; - homepage = https://kknd-game.com/; + homepage = "https://kknd-game.com/"; src = fetchFromGitHub { owner = "IceReaper"; repo = "KKnD"; @@ -140,7 +140,7 @@ in { version = "257.git.c9be8f2"; title = "Medieval Warfare"; description = "A re-imagination of the original Command & Conquer: ${title} game"; - homepage = https://github.com/CombinE88/Medieval-Warfare; + homepage = "https://github.com/CombinE88/Medieval-Warfare"; src = fetchFromGitHub { owner = "CombinE88"; repo = "Medieval-Warfare"; @@ -164,7 +164,7 @@ in { version = "903.git.2f7c700"; title = "Red Alert 2"; description = "Re-imagination of the original Command & Conquer: ${title} game"; - homepage = https://github.com/OpenRA/ra2; + homepage = "https://github.com/OpenRA/ra2"; src = fetchFromGitHub { owner = "OpenRA"; repo = "ra2"; @@ -192,7 +192,7 @@ in { version = "183.git.c76c13e"; title = "Red Alert Classic"; description = "A modernization of the original Command & Conquer: Red Alert game"; - homepage = https://github.com/OpenRA/raclassic; + homepage = "https://github.com/OpenRA/raclassic"; src = fetchFromGitHub { owner = "OpenRA"; repo = "raclassic"; @@ -216,7 +216,7 @@ in { version = "1330.git.9230e6f"; title = "Romanov's Vengeance"; description = "Re-imagination of the original Command & Conquer: Red Alert 2 game"; - homepage = https://github.com/MustaphaTR/Romanovs-Vengeance; + homepage = "https://github.com/MustaphaTR/Romanovs-Vengeance"; src = fetchFromGitHub { owner = "MustaphaTR"; repo = "Romanovs-Vengeance"; @@ -245,7 +245,7 @@ in { version = "221.git.ac000cc"; title = "Shattered Paradise"; description = "Re-imagination of the original Command & Conquer: Tiberian Sun game"; - homepage = https://github.com/ABrandau/OpenRAModSDK; + homepage = "https://github.com/ABrandau/OpenRAModSDK"; src = fetchFromGitHub { owner = "ABrandau"; repo = "OpenRAModSDK"; @@ -270,7 +270,7 @@ in { version = "77.git.23e1f3e"; title = "Sole Survivor"; description = "A re-imagination of the original Command & Conquer: ${title} game"; - homepage = https://github.com/MustaphaTR/sole-survivor; + homepage = "https://github.com/MustaphaTR/sole-survivor"; src = fetchFromGitHub { owner = "MustaphaTR"; repo = "sole-survivor"; @@ -294,7 +294,7 @@ in { version = "431.git.128dc53"; title = "Red Alert Unplugged"; description = "Re-imagination of the original Command & Conquer: Red Alert game"; - homepage = http://redalertunplugged.com/; + homepage = "http://redalertunplugged.com/"; src = fetchFromGitHub { owner = "RAunplugged"; repo = "uRA"; @@ -316,7 +316,7 @@ in { yr = unsafeBuildOpenRAMod rec { version = "199.git.5b8b952"; - homepage = https://github.com/cookgreen/yr; + homepage = "https://github.com/cookgreen/yr"; title = "Yuri's Revenge"; description = "Re-imagination of the original Command & Conquer: ${title} game"; src = fetchFromGitHub { diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 1dbb14c949747..b519e0c7e9258 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -4,21 +4,20 @@ }: let - name = "openrct2-${version}"; - version = "0.2.4"; + version = "0.2.6"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${version}"; - sha256 = "1rlw3w20llg36sj3bk50g661qw766ng8ma3p42sdkj8br9dw800h"; + sha256 = "1vikbkg3wh5ngzdfilb6irbh6nqinf138qpdz8wz9izlvl8s36k4"; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; - rev = "v1.0.12"; - sha256 = "0vfhyldc8nfvkg4d9kry669haxz2165walbxzgza7pqpnd7aqgrf"; + rev = "v1.0.14"; + sha256 = "1bqbia5y73v4r0sv5cvi5729jh2ns7cxn557blh715yxswk91590"; }; title-sequences-src = fetchFromGitHub { @@ -29,7 +28,8 @@ let }; in stdenv.mkDerivation { - inherit name; + inherit version; + pname = "openrct2"; src = openrct2-src; @@ -61,18 +61,17 @@ stdenv.mkDerivation { ''; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO" "-DDOWNLOAD_OBJECTS=OFF" "-DDOWNLOAD_TITLE_SEQUENCES=OFF" ]; - makeFlags = ["all" "g2"]; + enableParallelBuilding = true; preFixup = "ln -s $out/share/openrct2 $out/bin/data"; meta = with stdenv.lib; { description = "An open source re-implementation of RollerCoaster Tycoon 2 (original game required)"; - homepage = https://openrct2.io/; + homepage = "https://openrct2.io/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ geistesk ]; diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index 04d8afd2786b9..c2bb5cfa20ce8 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Unofficial open source recreation of the classic Grand Theft Auto III game executable"; - homepage = https://github.com/rwengine/openrw; + homepage = "https://github.com/rwengine/openrw"; license = licenses.gpl3; longDescription = '' OpenRW is an open source re-implementation of Rockstar Games' Grand Theft diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index b0f70775bfdd3..43376322cc77a 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchzip, pkgconfig, SDL, libpng, zlib, xz, freetype, fontconfig +{ stdenv, fetchurl, fetchzip, pkgconfig, SDL2, libpng, zlib, xz, freetype, fontconfig , withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true , withFluidSynth ? true, audioDriver ? "alsa", fluidsynth, soundfont-fluid, procps , writeScriptBin, makeWrapper, runtimeShell @@ -29,15 +29,15 @@ let in stdenv.mkDerivation rec { pname = "openttd"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; - sha256 = "0lz2y2rjc23k0d97y65cqhy2splw9cmrbvhgz0iqps8xkan1m8hv"; + sha256 = "0d22a3c50f7a321f4f211594f4987ac16c381e8e3e40f116848e63e91e7fbb9b"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ SDL libpng xz zlib freetype fontconfig ] + buildInputs = [ SDL2 libpng xz zlib freetype fontconfig ] ++ stdenv.lib.optionals withFluidSynth [ fluidsynth soundfont-fluid ]; prefixKey = "--prefix-dir="; @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { homepage = "https://www.openttd.org/"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ jcumming the-kenny fpletz ]; + maintainers = with maintainers; [ jcumming fpletz ]; }; } diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix index 2dae58df9765e..9872a3ee05f12 100644 --- a/pkgs/games/opentyrian/default.nix +++ b/pkgs/games/opentyrian/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; data = fetchzip { - url = http://sites.google.com/a/camanis.net/opentyrian/tyrian/tyrian21.zip; + url = "http://sites.google.com/a/camanis.net/opentyrian/tyrian/tyrian21.zip"; sha256 = "1biz6hf6s7qrwn8ky0g6p8w7yg715w7yklpn6258bkks1s15hpdb"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = ''Open source port of the game "Tyrian"''; - homepage = https://bitbucket.org/opentyrian/opentyrian; + homepage = "https://bitbucket.org/opentyrian/opentyrian"; # This does not account of Tyrian data. # license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index a77b8f2ba4c81..3ec1864005415 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation { meta = { description = "Open source clone of UFO: Enemy Unknown"; - homepage = https://openxcom.org; - repositories.git = https://github.com/SupSuper/OpenXcom.git; + homepage = "https://openxcom.org"; + repositories.git = "https://github.com/SupSuper/OpenXcom.git"; maintainers = [ stdenv.lib.maintainers.cpages ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index c115833d848b8..9e38852a02a57 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { description = "X-Ray Engine 1.6 expansion. Original version was used in S.T.A.L.K.E.R.: Call of Pripyat"; homepage = src.meta.homepage; license = licenses.unfree // { - url = https://github.com/OpenXRay/xray-16/blob/xd_dev/License.txt; + url = "https://github.com/OpenXRay/xray-16/blob/xd_dev/License.txt"; }; maintainers = [ maintainers.gnidorah ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix index 97fb3ebd19faf..a2a66f6838bcc 100644 --- a/pkgs/games/orthorobot/default.nix +++ b/pkgs/games/orthorobot/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; license = licenses.free; - downloadPage = http://stabyourself.net/orthorobot/; + downloadPage = "http://stabyourself.net/orthorobot/"; }; } diff --git a/pkgs/games/pentobi/default.nix b/pkgs/games/pentobi/default.nix index 2dc196c33cc35..61be5e834a7b6 100644 --- a/pkgs/games/pentobi/default.nix +++ b/pkgs/games/pentobi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "A computer opponent for the board game Blokus"; - homepage = https://pentobi.sourceforge.io; + homepage = "https://pentobi.sourceforge.io"; license = licenses.gpl3; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index e96e1a6a6e065..6ffc38f6700f5 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { pname = "pingus"; version = "unstable-0.7.6.0.20191104"; - nativeBuildInputs = [ pkgconfig git ]; - buildInputs = [ cmake SDL2 SDL2_image boost libpng SDL2_mixer libGLU libGL jsoncpp ]; + nativeBuildInputs = [ cmake pkgconfig git ]; + buildInputs = [ SDL2 SDL2_image boost libpng SDL2_mixer libGLU libGL jsoncpp ]; src = fetchgit { url = "https://gitlab.com/pingus/pingus/"; rev = "709546d9b9c4d6d5f45fc9112b45ac10c7f9417d"; diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index 46190daa3d3bc..3f3a2dd363d46 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A space adventure game set in the Milky Way galaxy at the turn of the 31st century"; - homepage = https://pioneerspacesim.net; + homepage = "https://pioneerspacesim.net"; license = with licenses; [ gpl3 cc-by-sa-30 ]; diff --git a/pkgs/games/pioneers/default.nix b/pkgs/games/pioneers/default.nix index 53de9fa29e2d0..a3a80d896c15d 100644 --- a/pkgs/games/pioneers/default.nix +++ b/pkgs/games/pioneers/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 ]; meta = { - homepage = http://pio.sourceforge.net/; + homepage = "http://pio.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; description = "Addicting game based on The Settlers of Catan"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 74e3b897a03ce..a42eb672e62e5 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.uberent.com/pa/; + homepage = "http://www.uberent.com/pa/"; description = "Next-generation RTS that takes the genre to a planetary scale"; license = stdenv.lib.licenses.unfree; platforms = platforms.linux; diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index 2e4ce270b8281..00b1f68e1371e 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase +{ mkDerivation, stdenv, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase , SDL, SDL_mixer, boost, curl, gsasl, libgcrypt, libircclient, protobuf, sqlite +, wrapQtAppsHook , tinyxml2, target ? "client" }: with stdenv.lib; let hiDPI = fetchpatch { - url = https://github.com/pokerth/pokerth/commit/ad8c9cabfb85d8293720d0f14840278d38b5feeb.patch; + url = "https://github.com/pokerth/pokerth/commit/ad8c9cabfb85d8293720d0f14840278d38b5feeb.patch"; sha256 = "192x3lqvd1fanasb95shdygn997qfrpk1k62k1f4j3s5chkwvjig"; }; @@ -15,7 +16,7 @@ let ''; in -stdenv.mkDerivation rec { +mkDerivation rec { name = "pokerth-${target}-${version}"; version = "1.1.2"; @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake wrapQtAppsHook ]; buildInputs = [ SDL @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://www.pokerth.net; + homepage = "https://www.pokerth.net"; description = "Poker game ${target}"; license = licenses.gpl3; maintainers = with maintainers; [ obadz yegortimoshenko ]; diff --git a/pkgs/games/pong3d/default.nix b/pkgs/games/pong3d/default.nix index 74e5e50b4e854..c7817041f7a85 100644 --- a/pkgs/games/pong3d/default.nix +++ b/pkgs/games/pong3d/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "3dpong-0.5"; src = fetchurl { - url = ftp://ftp.tuxpaint.org/unix/x/3dpong/src/3dpong-0.5.tar.gz; + url = "ftp://ftp.tuxpaint.org/unix/x/3dpong/src/3dpong-0.5.tar.gz"; sha256 = "1ibb79sbzlbn4ra3n0qk22gqr6fg7q0jy6cm0wg2qj4z64c7hmdi"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.newbreedsoftware.com/3dpong/; + homepage = "http://www.newbreedsoftware.com/3dpong/"; description = "One or two player 3d sports game based on Pong from Atari"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/prboom/default.nix b/pkgs/games/prboom/default.nix index ea6f8b01c71d9..278aa8a93eaa9 100644 --- a/pkgs/games/prboom/default.nix +++ b/pkgs/games/prboom/default.nix @@ -9,7 +9,7 @@ assert useOpenGL -> libGL != null && libGLU != null; stdenv.mkDerivation rec { name = "prboom-2.5.0"; src = fetchurl { - url = mirror://sourceforge/prboom/prboom-2.5.0.tar.gz; + url = "mirror://sourceforge/prboom/prboom-2.5.0.tar.gz"; sha256 = "1bjb04q8dk232956k30qlpq6q0hxb904yh1nflr87jcc1x3iqv12"; }; diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index 607458f379868..9fd90945ebad6 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://privateer.sourceforge.net/; + homepage = "http://privateer.sourceforge.net/"; description = "Adventure space flight simulation computer game"; license = licenses.gpl2Plus; # and a special license for art data # https://sourceforge.net/p/privateer/code/HEAD/tree/privgold/trunk/data/art-license.txt diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/games/pro-office-calculator/default.nix index 4cfd7de6a55fe..7a0e3bec78d43 100644 --- a/pkgs/games/pro-office-calculator/default.nix +++ b/pkgs/games/pro-office-calculator/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }: -stdenv.mkDerivation rec { +{ mkDerivation, stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }: +mkDerivation rec { version = "1.0.13"; pname = "pro-office-calculator"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Just an ordinary calculator. Nothing to see here..."; - homepage = https://proofficecalculator.com/; + homepage = "https://proofficecalculator.com/"; maintainers = [ maintainers.pmiddend ]; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/games/pysolfc/default.nix index 48c06c0eab638..5689edf4f4c4f 100644 --- a/pkgs/games/pysolfc/default.nix +++ b/pkgs/games/pysolfc/default.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "A collection of more than 1000 solitaire card games"; - homepage = https://pysolfc.sourceforge.io; + homepage = "https://pysolfc.sourceforge.io"; license = licenses.gpl3; maintainers = with maintainers; [ kierdavis genesis ]; }; diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix index 17441d14e7c7e..ea8c8aaeac87d 100644 --- a/pkgs/games/qgo/default.nix +++ b/pkgs/games/qgo/default.nix @@ -25,7 +25,7 @@ mkDerivation { Go is an ancient Chinese board game. It's called "圍棋(Wei Qi)" in Chinese, "囲碁(Yi Go)" in Japanese, "바둑(Baduk)" in Korean. ''; - homepage = https://github.com/pzorin/qgo; + homepage = "https://github.com/pzorin/qgo"; license = licenses.gpl2; maintainers = with maintainers; [ zalakain ]; }; diff --git a/pkgs/games/qqwing/default.nix b/pkgs/games/qqwing/default.nix index f161f53bfe1e6..43fa45ca4325c 100644 --- a/pkgs/games/qqwing/default.nix +++ b/pkgs/games/qqwing/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" "tgz" ]; meta = with stdenv.lib; { - homepage = https://qqwing.com; + homepage = "https://qqwing.com"; description = "Sudoku generating and solving software"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/games/qtads/default.nix b/pkgs/games/qtads/default.nix index f36581776cb2f..140cba2e9aeaa 100644 --- a/pkgs/games/qtads/default.nix +++ b/pkgs/games/qtads/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { buildInputs = [ SDL2 fluidsynth libsndfile libvorbis mpg123 qtbase ]; meta = with lib; { - homepage = https://realnc.github.io/qtads/; + homepage = "https://realnc.github.io/qtads/"; description = "Multimedia interpreter for TADS games"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index a592455486b2e..285fb7e688403 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://ioquake3.org/; + homepage = "https://ioquake3.org/"; description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/games/quake3/quake3e/default.nix index 7d6ac0afe45d1..0e3e74ae7a739 100644 --- a/pkgs/games/quake3/quake3e/default.nix +++ b/pkgs/games/quake3/quake3e/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "Quake3e"; - version = "2020-01-23"; + version = "2020-04-04"; src = fetchFromGitHub { owner = "ec-"; repo = pname; rev = version; - sha256 = "0crqn32nkqhlagamkp5nr0vl474ad4wx5ms7yr85s6zybpsk5jnz"; + sha256 = "1jvk8qd0mi0x8lslknhkfd8h6ridwca34c6qahsbmmpcgsvdv16s"; }; buildInputs = [ curl libGL libX11 libXxf86dga alsaLib libXrandr libXxf86vm libXext ]; @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ec-/Quake3e; + homepage = "https://github.com/ec-/Quake3e"; description = "Improved Quake III Arena engine"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pmiddend ]; badPlatforms = [ platforms.aarch64 ]; - }; + }; } diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index a8d740ea51286..1e8de1a18f0c7 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "An engine for iD software's Quake"; - homepage = http://quakespasm.sourceforge.net/; + homepage = "http://quakespasm.sourceforge.net/"; longDescription = '' QuakeSpasm is a modern, cross-platform Quake 1 engine based on FitzQuake. It includes support for 64 bit CPUs and custom music playback, a new sound driver, diff --git a/pkgs/games/racer/default.nix b/pkgs/games/racer/default.nix index 1347f88cc2cb2..a5d9a911afaf0 100644 --- a/pkgs/games/racer/default.nix +++ b/pkgs/games/racer/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation { name = "racer-1.1"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = http://hippo.nipax.cz/src/racer-1.1.tar.gz; + url = "http://hippo.nipax.cz/src/racer-1.1.tar.gz"; sha256 = "0fll1qkqfcjq87k0jzsilcw701z92lfxn2y5ga1n038772lymxl9"; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = https://hippo.nipax.cz/src/racer-1.1.64.tar.gz; + url = "https://hippo.nipax.cz/src/racer-1.1.64.tar.gz"; sha256 = "0rjy3gmlhwfkb9zs58j0mc0dar0livwpbc19r6zw5r2k6r7xdan0"; } else throw "System not supported"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Car racing game"; - homepage = http://hippo.nipax.cz/download.en.php; + homepage = "http://hippo.nipax.cz/download.en.php"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index 9b0cfaa3b50d8..da003c3190fff 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "Interpreter for LucasArts' Lua-based 3D adventure games"; - homepage = http://residualvm.org/; - repositories.git = https://github.com/residualvm/residualvm.git; + homepage = "http://residualvm.org/"; + repositories.git = "https://github.com/residualvm/residualvm.git"; license = licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/rftg/default.nix b/pkgs/games/rftg/default.nix index 9ab63553053fa..966f903888bee 100644 --- a/pkgs/games/rftg/default.nix +++ b/pkgs/games/rftg/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2.dev ]; meta = { - homepage = http://keldon.net/rftg/; + homepage = "http://keldon.net/rftg/"; description = "Implementation of the card game Race for the Galaxy, including an AI"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.falsifian ]; diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 00faee7b92895..9aa51bf344ee8 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "3D simulator game where you can drive, fly and sail various vehicles"; - homepage = http://rigsofrods.sourceforge.net/; + homepage = "http://rigsofrods.sourceforge.net/"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/riko4/default.nix b/pkgs/games/riko4/default.nix index 1ddca346fbb7c..5ea9b8f541621 100644 --- a/pkgs/games/riko4/default.nix +++ b/pkgs/games/riko4/default.nix @@ -18,7 +18,7 @@ let enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/grimfang4/sdl-gpu; + homepage = "https://github.com/grimfang4/sdl-gpu"; description = "A library for high-performance, modern 2D graphics with SDL written in C"; license = licenses.mit; maintainers = with maintainers; [ CrazedProgrammer ]; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/incinirate/Riko4; + homepage = "https://github.com/incinirate/Riko4"; description = "Fantasy console for pixel art game development"; license = licenses.mit; maintainers = with maintainers; [ CrazedProgrammer ]; diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index df89f9dc743d1..0b7fa118f80eb 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ri_li-2.0.1"; src = fetchurl { - url = mirror://sourceforge/ri-li/Ri-li-2.0.1.tar.bz2; + url = "mirror://sourceforge/ri-li/Ri-li-2.0.1.tar.bz2"; sha256 = "f71ccc20c37c601358d963e087ac0d524de8c68e96df09c3aac1ae65edd38dbd"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ SDL SDL_mixer ]; meta = { - homepage = http://ri-li.sourceforge.net; + homepage = "http://ri-li.sourceforge.net"; license = stdenv.lib.licenses.gpl2Plus; description = "A children's train game"; longDescription = '' diff --git a/pkgs/games/rimshot/default.nix b/pkgs/games/rimshot/default.nix index c940c90b88418..2e5087319f0c0 100644 --- a/pkgs/games/rimshot/default.nix +++ b/pkgs/games/rimshot/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; license = licenses.free; - downloadPage = http://stabyourself.net/rimshot/; + downloadPage = "http://stabyourself.net/rimshot/"; }; } diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix index c0b07814aa577..ebced6467d2aa 100644 --- a/pkgs/games/rocksndiamonds/default.nix +++ b/pkgs/games/rocksndiamonds/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Scrolling tile-based arcade style puzzle game"; - homepage = https://www.artsoft.org/rocksndiamonds/; + homepage = "https://www.artsoft.org/rocksndiamonds/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix index 1e27d67eb03e5..592f897f20f18 100644 --- a/pkgs/games/rogue/default.nix +++ b/pkgs/games/rogue/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS=1"; meta = with stdenv.lib; { - homepage = http://rogue.rogueforge.net/rogue-5-4/; + homepage = "http://rogue.rogueforge.net/rogue-5-4/"; description = "The final version of the original Rogue game developed for the UNIX operating system"; platforms = platforms.all; license = licenses.bsd3; diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix index c043815305282..1ff0a0dc728be 100644 --- a/pkgs/games/scid-vs-pc/default.nix +++ b/pkgs/games/scid-vs-pc/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Chess database with play and training functionality"; - homepage = http://scidvspc.sourceforge.net/; + homepage = "http://scidvspc.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.paraseba ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix index 048a8fdc09b4d..b3d22d4c0f9e3 100644 --- a/pkgs/games/scid/default.nix +++ b/pkgs/games/scid/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { meta = { description = "Chess database with play and training functionality"; - homepage = http://scid.sourceforge.net/; + homepage = "http://scid.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index c86df396ff159..b7f448e119a5b 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lopenal"; meta = with stdenv.lib; { - homepage = http://scorched3d.co.uk/; + homepage = "http://scorched3d.co.uk/"; description = "3D Clone of the classic Scorched Earth"; license = licenses.gpl2Plus; platforms = platforms.linux; # maybe more diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index b8bf4efcf0aa7..a435a240edefc 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { meta = { description = "A strategy collectible card game"; - homepage = https://scrolls.com/; + homepage = "https://scrolls.com/"; # http://www.reddit.com/r/Scrolls/comments/2j3pxw/linux_client_experimental/ platforms = [ "x86_64-linux" ]; diff --git a/pkgs/games/scummvm/games.nix b/pkgs/games/scummvm/games.nix index 3cfb87a090a6d..0165a797c3a6e 100644 --- a/pkgs/games/scummvm/games.nix +++ b/pkgs/games/scummvm/games.nix @@ -52,7 +52,7 @@ let ''; meta = with stdenv.lib; { - homepage = https://www.scummvm.org; + homepage = "https://www.scummvm.org"; license = licenses.free; # refer to the readme for exact wording maintainers = with maintainers; [ peterhoeg ]; inherit description; diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index f138e1d049131..c17439b5e3e87 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.raskin maintainers.genesis ]; platforms = platforms.linux; - homepage = https://www.chiark.greenend.org.uk/~sgtatham/puzzles/; + homepage = "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"; }; } diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix index ed6ac781cae11..bedd446e34cca 100644 --- a/pkgs/games/sienna/default.nix +++ b/pkgs/games/sienna/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; license = licenses.free; - downloadPage = http://tangramgames.dk/games/sienna; + downloadPage = "http://tangramgames.dk/games/sienna"; }; } diff --git a/pkgs/games/sil/default.nix b/pkgs/games/sil/default.nix index a998a86370d92..208a14dc1c57b 100644 --- a/pkgs/games/sil/default.nix +++ b/pkgs/games/sil/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { Walk the dark halls of Angband. Slay creatures black and fell. Wrest a shining Silmaril from Morgoth’s iron crown. ''; - homepage = http://www.amirrorclear.net/flowers/game/sil/index.html; + homepage = "http://www.amirrorclear.net/flowers/game/sil/index.html"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.michaelpj ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 50be7b55203d6..b75b67e0528ec 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -12,14 +12,14 @@ let ); ver1 = "120"; - ver2 = "2"; - ver3 = "2"; + ver2 = "4"; + ver3 = "1"; version = "${ver1}.${ver2}.${ver3}"; ver_dash = "${ver1}-${ver2}-${ver3}"; binary_src = fetchurl { url = "mirror://sourceforge/simutrans/simutrans/${ver_dash}/simutrans-src-${ver_dash}.zip"; - sha256 = "1yi6rwbrnfd65qfz63cncw2n56pbypvg6cllwh71mgvs6x2c28kz"; + sha256 = "0yw7vjvmczp022mgk35swwhpbiszpz91mwsgicxglwivgc30vvic"; }; @@ -28,8 +28,8 @@ let (pakName: attrs: mkPak (attrs // {inherit pakName;})) { pak64 = { - srcPath = "120-2/simupak64-120-2"; - sha256 = "1s310pssar4s1nf6gi9cizbx4m75avqm2qk039ha5rk8jk4lzkmk"; + srcPath = "121-0/simupak64-121-0"; + sha256 = "1k335kh8dhm1hdn5iwn3sdgnrlpk0rqxmmgqgqcwsi09cmw45m5c"; }; "pak64.japan" = { # No release for 120.2 yet! @@ -38,12 +38,12 @@ let }; pak128 = { - srcPath = "pak128%20for%20ST%20120.2.2%20%282.7%2C%20minor%20changes%29/pak128"; - sha256 = "1x6g6yfv1hvjyh3ciccly1i2k2n2b63dw694gdg4j90a543rmclg"; + srcPath = "pak128%20for%20ST%20120.4.1%20%282.8.1%2C%20priority%20signals%20%2B%20bugfix%29/pak128"; + sha256 = "0z01y7r0rz7q79vr17bbnkgcbjjrimphy1dwb1pgbiv4klz7j5xw"; }; "pak128.britain" = { - srcPath = "pak128.Britain%20for%20120-1/pak128.Britain.1.17-120-1"; - sha256 = "1nviwqizvch9n3n826nmmi7c707dxv0727m7lhc1n2zsrrxcxlr5"; + srcPath = "pak128.Britain%20for%20120-1/pak128.Britain.1.18-120-3"; + sha256 = "1kyb0s54kysvdr0zdln9106yx75d71j4lbw3v87k3i440cj3r1d3"; }; "pak128.cs" = { # note: it needs pak128 to work url = "mirror://sourceforge/simutrans/Pak128.CS/pak128.cz_v.0.2.1.zip"; @@ -51,8 +51,8 @@ let }; "pak128.german" = { url = "mirror://sourceforge/simutrans/PAK128.german/" - + "PAK128.german_0.10.x_for_ST_120.x/PAK128.german_0.10.3_for_ST_120.x.zip"; - sha256 = "1379zcviyf3v0wsli33sqa509k6zlw6fkk57vahc44mrnhka5fpb"; + + "pak128.german_1.2_for_ST_121.0/PAK128.german_1.2_for_ST_121-0.zip"; + sha256 = "1jxjckz4b02yv1mv1zc3pmajpq740dfnlvhr0x762lbrybymvagi"; }; /* This release contains accented filenames that prevent unzipping. @@ -83,6 +83,7 @@ let toStrip=`find . -iname '*.pak' | head -n 1 | sed 's|\./\(.*\)/[^/]*$|\1|'` echo "Detected path '$toStrip' to strip" mv ./"$toStrip"/* . + rm -f "$toStrip/.directory" #pak128.german had this rmdir -p "$toStrip" ''; }; @@ -114,7 +115,7 @@ let sourceRoot = "."; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib libpng bzip2 SDL SDL_mixer unzip ]; configurePhase = let @@ -160,11 +161,10 @@ let places. Simutrans is an open source remake of Transport Tycoon. ''; - homepage = http://www.simutrans.com/; + homepage = "http://www.simutrans.com/"; license = with licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ kkallio vcunat phile314 ]; platforms = with platforms; linux; # TODO: ++ darwin; - broken = true; }; }; diff --git a/pkgs/games/snake4/default.nix b/pkgs/games/snake4/default.nix index b3a74d0f4fbe8..4c4161d5049a4 100644 --- a/pkgs/games/snake4/default.nix +++ b/pkgs/games/snake4/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A game starring a fruit-eating snake"; - homepage = https://shh.thathost.com/pub-unix/html/snake4.html; + homepage = "https://shh.thathost.com/pub-unix/html/snake4.html"; license = licenses.artistic1; platforms = platforms.linux; }; diff --git a/pkgs/games/snipes/default.nix b/pkgs/games/snipes/default.nix index e035bc436cc12..37993e32a5d1e 100644 --- a/pkgs/games/snipes/default.nix +++ b/pkgs/games/snipes/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Modern port of the classic 1982 text-mode game Snipes"; - homepage = https://www.vogons.org/viewtopic.php?f=7&t=49073; + homepage = "https://www.vogons.org/viewtopic.php?f=7&t=49073"; license = licenses.free; # This reverse-engineered source code is released with the original authors' permission. maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix index 7179c4f48b51b..0e4722cebb1ad 100644 --- a/pkgs/games/soi/default.nix +++ b/pkgs/games/soi/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = licenses.free; - downloadPage = https://sourceforge.net/projects/soi/files/; + downloadPage = "https://sourceforge.net/projects/soi/files/"; }; } diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix index 68d0f642aefcb..c0daa99c15a69 100644 --- a/pkgs/games/solarus/default.nix +++ b/pkgs/games/solarus/default.nix @@ -27,7 +27,7 @@ mkDerivation rec { Solarus is a game engine for Zelda-like ARPG games written in lua. Many full-fledged games have been writen for the engine. ''; - homepage = http://www.solarus-games.org; + homepage = "http://www.solarus-games.org"; license = licenses.gpl3; maintainers = [ maintainers.Nate-Devv ]; platforms = platforms.linux; diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index ae09cdf639b66..b130a7b5f77e1 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -8,17 +8,17 @@ stdenv.mkDerivation rec { pname = "spring"; version = "104.0.1-${buildId}-g${shortRev}"; - # usually the latest in https://github.com/spring/spring/commits/maintenance - rev = "8ecf38a784ed3c4e3d67bc8d59839a77e0f0b83e"; + # usually the latest in https://github.com/spring/spring/commits/maintenance + rev = "f266c8107b3e5dda5a78061ef00ca0ed8736d6f2"; shortRev = builtins.substring 0 7 rev; - buildId = "1477"; + buildId = "1486"; # taken from https://github.com/spring/spring/commits/maintenance src = fetchFromGitHub { owner = "spring"; repo = "spring"; inherit rev; - sha256 = "0iai1wnd7msabgw2979cp2k54sgcfvidfmymhnck31jwbfa6y021"; + sha256 = "1nx68d894yfmqc6df72hmk75ph26fqdvlmmq58cca0vbwpz9hf5v"; fetchSubmodules = true; }; @@ -56,10 +56,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://springrts.com/; + homepage = "https://springrts.com/"; description = "A powerful real-time strategy (RTS) game engine"; license = licenses.gpl2; - maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar ]; + maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar maintainers.sorki ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index f872d21723750..e627575df9409 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://springlobby.info/; - repositories.git = git://github.com/springlobby/springlobby.git; + homepage = "https://springlobby.info/"; + repositories.git = "git://github.com/springlobby/springlobby.git"; description = "Cross-platform lobby client for the Spring RTS project"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom qknight domenkozar ]; diff --git a/pkgs/games/steam/fonts.nix b/pkgs/games/steam/fonts.nix index dab393a86fb3d..44dde01a8a83c 100644 --- a/pkgs/games/steam/fonts.nix +++ b/pkgs/games/steam/fonts.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "steam-fonts-1"; src = fetchurl { - url = https://support.steampowered.com/downloads/1974-YFKL-4947/SteamFonts.zip; + url = "https://support.steampowered.com/downloads/1974-YFKL-4947/SteamFonts.zip"; sha256 = "1cgygmwich5f1jhhbmbkkpnzasjl8gy36xln76n6r2gjh6awqfx0"; }; diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix index 36f16b6155ba9..2f9fc517790e5 100644 --- a/pkgs/games/steam/runtime-generated.nix +++ b/pkgs/games/steam/runtime-generated.nix @@ -130,6 +130,15 @@ }; } rec { + name = "libatomic1_5.4.0-7.really.6+steamrt1.2+srt2_amd64"; + sha256 = "8dd843d4497f66c1af07551d8cc636e63ffff692187b51d0a01191c96bc0049a"; + url = "mirror://steamrt/pool/main/g/gcc-5/libatomic1_5.4.0-7.really.6+steamrt1.2+srt2_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libatomic1.deb"; + }; + } + rec { name = "libattr1_2.4.46-5ubuntu1+steamrt1.1+srt2_amd64"; sha256 = "d33b00c3e19337f3abbb070f646adda7420f171f5487dca5e253b68b63a4d8fc"; url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+steamrt1.1+srt2_amd64.deb"; @@ -247,6 +256,15 @@ }; } rec { + name = "libcapsule-tools-relocatable_0.20190926.0-0co1+srt1_amd64"; + sha256 = "9ddaac17a0f812eec785e34eefccb8ea24a4abf0fa6ad008d03b26d5493ea010"; + url = "mirror://steamrt/pool/main/libc/libcapsule/libcapsule-tools-relocatable_0.20190926.0-0co1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libcapsule-tools-relocatable.deb"; + }; + } + rec { name = "libcg_3.0.0016-0ubuntu1+srt6_amd64"; sha256 = "6e627aa3ff1724ec8759431f3ead530f4c1511eb2b881d168a1929c8eac2e196"; url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt6_amd64.deb"; @@ -670,6 +688,15 @@ }; } rec { + name = "libitm1_5.4.0-7.really.6+steamrt1.2+srt2_amd64"; + sha256 = "3c01841997e77fe1616b16936394c86383dc76e875f70e6d96ed016e4b945050"; + url = "mirror://steamrt/pool/main/g/gcc-5/libitm1_5.4.0-7.really.6+steamrt1.2+srt2_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libitm1.deb"; + }; + } + rec { name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt5_amd64"; sha256 = "9a419baf1b88386cf643ca64965de607321e5d27f13c5bd68be0eb1a803fd7a9"; url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt5_amd64.deb"; @@ -994,6 +1021,15 @@ }; } rec { + name = "libquadmath0_5.4.0-7.really.6+steamrt1.2+srt2_amd64"; + sha256 = "12523138b2f21cd6d824b5c778ee49789ef0129ba6207cf03d3cf6b4138b1a1b"; + url = "mirror://steamrt/pool/main/g/gcc-5/libquadmath0_5.4.0-7.really.6+steamrt1.2+srt2_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libquadmath0.deb"; + }; + } + rec { name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; sha256 = "e55b129066b92ab99f518d2f857b54e8754c3c873b5fb603270e3c4c36564a7b"; url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64.deb"; @@ -1192,27 +1228,27 @@ }; } rec { - name = "libsteam-runtime-tools-0-0_0.20200109.0-0+steamrt1.1+srt1_amd64"; - sha256 = "680a2855b601ecccc81179df162722081ad0c7f4d1689e25bbce9d19de1a3eb6"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-0_0.20200109.0-0+steamrt1.1+srt1_amd64.deb"; + name = "libsteam-runtime-tools-0-0_0.20200415.0+srt1_amd64"; + sha256 = "0db05ccf5ca6705a6001d2c43ae5163cc289ef60126381bf886014e2344b4190"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-0_0.20200415.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsteam-runtime-tools-0-0.deb"; }; } rec { - name = "libsteam-runtime-tools-0-helpers_0.20200109.0-0+steamrt1.1+srt1_amd64"; - sha256 = "b33f5c1217c7927057428b54faa4d0fcdddda1b5b18d708f755e96893ed6e108"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-helpers_0.20200109.0-0+steamrt1.1+srt1_amd64.deb"; + name = "libsteam-runtime-tools-0-helpers_0.20200415.0+srt1_amd64"; + sha256 = "c568548d3c73df1c61efe06574e4ab17c2250059e9659690dec6c43db8695ce8"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-helpers_0.20200415.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsteam-runtime-tools-0-helpers.deb"; }; } rec { - name = "libsteam-runtime-tools-0-relocatable-libs_0.20200109.0-0+steamrt1.1+srt1_amd64"; - sha256 = "4f2ddb4dd6f48636f95bb301541a023ba8235672e1e053be8da9961787958d18"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-relocatable-libs_0.20200109.0-0+steamrt1.1+srt1_amd64.deb"; + name = "libsteam-runtime-tools-0-relocatable-libs_0.20200415.0+srt1_amd64"; + sha256 = "450c03778f4901e8b54f5dc879b071a84d18f4fc65e6308b91eebf40c77ef093"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-relocatable-libs_0.20200415.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsteam-runtime-tools-0-relocatable-libs.deb"; @@ -1444,18 +1480,18 @@ }; } rec { - name = "libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_amd64"; - sha256 = "99b0d38e6a2240dbea57c3ebee18de7013ee5d346c82bc82243c18e66bc50ae4"; - url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_amd64.deb"; + name = "libvulkan1_1.2.135.0-1~steamrt1.1+srt1_amd64"; + sha256 = "fa3dfb44b47c35e8a16de3c8240accdca131b70dd59a84f6e38cc6824219fa28"; + url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.2.135.0-1~steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvulkan1.deb"; }; } rec { - name = "libwaffle-1-0_1.6.0-2~steamrt1.3+srt1_amd64"; - sha256 = "40ebf5f91707d0f183841ab8673f7bdd6d77540f090fc97cb69be54381c382be"; - url = "mirror://steamrt/pool/main/w/waffle/libwaffle-1-0_1.6.0-2~steamrt1.3+srt1_amd64.deb"; + name = "libwaffle-1-0_1.6.1-0+steamrt1.1+srt1_amd64"; + sha256 = "a2a73515ddef193da5de918190df27fce75cf27c3081662c2f6fc5d227c96cc4"; + url = "mirror://steamrt/pool/main/w/waffle/libwaffle-1-0_1.6.1-0+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libwaffle-1-0.deb"; @@ -1912,27 +1948,27 @@ }; } rec { - name = "steam-runtime-tools-bin_0.20200109.0-0+steamrt1.1+srt1_amd64"; - sha256 = "b5fcefb31c79a4ac085ef1050cdb2770507fbcf04eae713f9f16fdc3a483a85d"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/steam-runtime-tools-bin_0.20200109.0-0+steamrt1.1+srt1_amd64.deb"; + name = "steam-runtime-tools-bin_0.20200415.0+srt1_amd64"; + sha256 = "e21848eb4cf02402600a952f5ca8bafbd95db9f5b3bb8d5af746721c5ac4ebc3"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/steam-runtime-tools-bin_0.20200415.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "steam-runtime-tools-bin.deb"; }; } rec { - name = "steamrt-legacy_1.20200128.0+srt1_amd64"; - sha256 = "16a8adf316032424fa5cd53f498c53472c45a66b572e8c60adb2ff3ae7556eed"; - url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20200128.0+srt1_amd64.deb"; + name = "steamrt-legacy_1.20200421.0+srt1_amd64"; + sha256 = "9ee2744dbefc6c8055d3f496ad8e7ab8df01049a5571b9558c23b15001218fa6"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20200421.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "steamrt-legacy.deb"; }; } rec { - name = "steamrt-libs_1.20200128.0+srt1_amd64"; - sha256 = "18247c8534f8d67f63f4ece884b15276e0eecf540d0758ed6d5ae8b6a6ba510b"; - url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20200128.0+srt1_amd64.deb"; + name = "steamrt-libs_1.20200421.0+srt1_amd64"; + sha256 = "52ffad4cdca3f7f1c8091474a1a978941512c993e52d15fadab49165e248603b"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20200421.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "steamrt-libs.deb"; @@ -1975,72 +2011,54 @@ }; } rec { - name = "vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64"; - sha256 = "b5c0c3fd9f5329f2aff54ce73f9281e3e61156556e1ee50c697b37f2144b1531"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64.deb"; + name = "vulkan-tools_1.2.135.0+dfsg1-1~steamrt1.1+srt1_amd64"; + sha256 = "bb70e1a31fe204319ea24292fe0ee7a9073f1b8f79e66ffb1ab192e500f8452b"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools_1.2.135.0+dfsg1-1~steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "vulkan-tools.deb"; }; } rec { - name = "vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64"; - sha256 = "33b03b9413ec308f5ee5b8699e9f9ad939b501b602eea185fdcaa69863deb70c"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64.deb"; + name = "vulkan-tools-multiarch_1.2.135.0+dfsg1-1~steamrt1.1+srt1_amd64"; + sha256 = "8e8aa0bf8fe147dd52e442a88e57a16f86b3a807201175585d47c64531865822"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools-multiarch_1.2.135.0+dfsg1-1~steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "vulkan-tools-multiarch.deb"; }; } rec { - name = "vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all"; - sha256 = "f10004e20ed5fc93edf035f8f34bb9f8307eb34974a3ed5aae9ba87f00a2c468"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all.deb"; - source = fetchurl { - inherit url sha256; - name = "vulkan-utils.deb"; - }; - } - rec { - name = "vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64"; - sha256 = "a1e9387bb5cb7effb23c5994dd2724614cfed7a447ec9c449ee4effcab58fd4c"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64.deb"; - source = fetchurl { - inherit url sha256; - name = "vulkan-utils-multiarch.deb"; - }; - } - rec { - name = "waffle-utils_1.6.0-2~steamrt1.3+srt1_amd64"; - sha256 = "b465d2c357b0376f355a99ac99830e78974747859ec4ca9084bdeff9891920d6"; - url = "mirror://steamrt/pool/main/w/waffle/waffle-utils_1.6.0-2~steamrt1.3+srt1_amd64.deb"; + name = "waffle-utils_1.6.1-0+steamrt1.1+srt1_amd64"; + sha256 = "ad14f1e2dcc6b9ed7b036989cf5f18efb683879927a4b474692bbe1d7ddbe94c"; + url = "mirror://steamrt/pool/main/w/waffle/waffle-utils_1.6.1-0+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "waffle-utils.deb"; }; } rec { - name = "waffle-utils-multiarch_1.6.0-2~steamrt1.3+srt1_amd64"; - sha256 = "de563095affd9fd5a4ec2941b72481bbd6176bdc210dad587372bab3cec406c1"; - url = "mirror://steamrt/pool/main/w/waffle/waffle-utils-multiarch_1.6.0-2~steamrt1.3+srt1_amd64.deb"; + name = "waffle-utils-multiarch_1.6.1-0+steamrt1.1+srt1_amd64"; + sha256 = "cf66bcb711bee45fb722d4125d37d8001fe7f3691f81ac224b62f849af0b4fba"; + url = "mirror://steamrt/pool/main/w/waffle/waffle-utils-multiarch_1.6.1-0+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "waffle-utils-multiarch.deb"; }; } rec { - name = "zenity_3.4.0-0ubuntu4+steamrt2+srt6_amd64"; - sha256 = "5eb59aa8d2211153c780aab2304e8694d7eb0204f284193ff2a037dc9e1274db"; - url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt6_amd64.deb"; + name = "zenity_3.4.0-0ubuntu4+steamrt3+srt1_amd64"; + sha256 = "c31a99f8d47cba157db251ea97cd14074d99c622969dd4d4173f76494feb7723"; + url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt3+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "zenity.deb"; }; } rec { - name = "zenity-common_3.4.0-0ubuntu4+steamrt2+srt6_all"; - sha256 = "bc8f0b80672833be72c6dd87d406b5fc0ef92e51f91e3a461678fc97844649bc"; - url = "mirror://steamrt/pool/main/z/zenity/zenity-common_3.4.0-0ubuntu4+steamrt2+srt6_all.deb"; + name = "zenity-common_3.4.0-0ubuntu4+steamrt3+srt1_all"; + sha256 = "7ec603c8b00c5573e88e1df9785af4baef93b54e377e697515eb939b7c119cdc"; + url = "mirror://steamrt/pool/main/z/zenity/zenity-common_3.4.0-0ubuntu4+steamrt3+srt1_all.deb"; source = fetchurl { inherit url sha256; name = "zenity-common.deb"; @@ -2184,6 +2202,15 @@ }; } rec { + name = "libatomic1_5.4.0-7.really.6+steamrt1.2+srt2_i386"; + sha256 = "aafd5b3b573f22562e3f93bfa449ca374e2788fb14d555193c5c57e996def8fb"; + url = "mirror://steamrt/pool/main/g/gcc-5/libatomic1_5.4.0-7.really.6+steamrt1.2+srt2_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libatomic1.deb"; + }; + } + rec { name = "libattr1_2.4.46-5ubuntu1+steamrt1.1+srt2_i386"; sha256 = "bcea5d6f2743c617dac44c4d836b6937a64816f3c288a56b656ee4adbf63714a"; url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+steamrt1.1+srt2_i386.deb"; @@ -2301,6 +2328,15 @@ }; } rec { + name = "libcapsule-tools-relocatable_0.20190926.0-0co1+srt1_i386"; + sha256 = "5ce9e11e0204db54cecb59b59b1c6fc6bd5e4aefe73a327dbb85283b08591428"; + url = "mirror://steamrt/pool/main/libc/libcapsule/libcapsule-tools-relocatable_0.20190926.0-0co1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libcapsule-tools-relocatable.deb"; + }; + } + rec { name = "libcg_3.0.0016-0ubuntu1+srt6_i386"; sha256 = "a21ba20d03f43163c1222fbc6a570c20783a1d504dcf92306ab029c437fd0df9"; url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt6_i386.deb"; @@ -2724,6 +2760,15 @@ }; } rec { + name = "libitm1_5.4.0-7.really.6+steamrt1.2+srt2_i386"; + sha256 = "188591aec152ece7b33b765079593a110a005046977d15794d5cc3be5b3381c7"; + url = "mirror://steamrt/pool/main/g/gcc-5/libitm1_5.4.0-7.really.6+steamrt1.2+srt2_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libitm1.deb"; + }; + } + rec { name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt5_i386"; sha256 = "a59a4de570335899d10f36b4b9552ee894fc0bb21c4ee4e06ed689f3fa55c2e6"; url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt5_i386.deb"; @@ -3048,6 +3093,15 @@ }; } rec { + name = "libquadmath0_5.4.0-7.really.6+steamrt1.2+srt2_i386"; + sha256 = "58f646279972a537cf838fc935f9f37285e5255604d7b5c1e034644e77d3e25b"; + url = "mirror://steamrt/pool/main/g/gcc-5/libquadmath0_5.4.0-7.really.6+steamrt1.2+srt2_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libquadmath0.deb"; + }; + } + rec { name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; sha256 = "8827d782d8fedf7fe0285bbab14914e61d2ac5fe5e7ea297fbff916c7fd73939"; url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386.deb"; @@ -3246,27 +3300,27 @@ }; } rec { - name = "libsteam-runtime-tools-0-0_0.20200109.0-0+steamrt1.1+srt1_i386"; - sha256 = "dfd80854857cdbc764f799f34acd7f37a4c3e773c4ba5c7c81394071148a140f"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-0_0.20200109.0-0+steamrt1.1+srt1_i386.deb"; + name = "libsteam-runtime-tools-0-0_0.20200415.0+srt1_i386"; + sha256 = "7da98a9a206829dbf5cc95570049502d1cf8dd2a2234a981787f14cc098c1739"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-0_0.20200415.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsteam-runtime-tools-0-0.deb"; }; } rec { - name = "libsteam-runtime-tools-0-helpers_0.20200109.0-0+steamrt1.1+srt1_i386"; - sha256 = "f2c5fc6abcc3a938e2a0b27e8682b56944a2a61416e8d0edb5878af2e16c98cb"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-helpers_0.20200109.0-0+steamrt1.1+srt1_i386.deb"; + name = "libsteam-runtime-tools-0-helpers_0.20200415.0+srt1_i386"; + sha256 = "bf06ad0ef0d5c80ddff53c58e4397c87fd655e1913ecf48a29560d27719b4d71"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-helpers_0.20200415.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsteam-runtime-tools-0-helpers.deb"; }; } rec { - name = "libsteam-runtime-tools-0-relocatable-libs_0.20200109.0-0+steamrt1.1+srt1_i386"; - sha256 = "c06ea7ec21d2114925c09d5245e87482c81cc4e1928ed31827ab58cb094721ae"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-relocatable-libs_0.20200109.0-0+steamrt1.1+srt1_i386.deb"; + name = "libsteam-runtime-tools-0-relocatable-libs_0.20200415.0+srt1_i386"; + sha256 = "79e3b5b5a2904daccb17f5f54e3a87842dd9408fe04a8fee8d4ee83c3a3c0bcf"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-relocatable-libs_0.20200415.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsteam-runtime-tools-0-relocatable-libs.deb"; @@ -3498,18 +3552,18 @@ }; } rec { - name = "libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_i386"; - sha256 = "ac161149e1106247de706788a7ea29dbe5e3c17c2b8aedf97ec892b311abbb75"; - url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_i386.deb"; + name = "libvulkan1_1.2.135.0-1~steamrt1.1+srt1_i386"; + sha256 = "dd6167b259a8ec4c927f3fa710d01456321b3ff40f6daa3383ec353866615aaa"; + url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.2.135.0-1~steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libvulkan1.deb"; }; } rec { - name = "libwaffle-1-0_1.6.0-2~steamrt1.3+srt1_i386"; - sha256 = "875ebdcc60fd8be86b6e83a2155bea69aa3ef7442d60eef277bcdf814c663452"; - url = "mirror://steamrt/pool/main/w/waffle/libwaffle-1-0_1.6.0-2~steamrt1.3+srt1_i386.deb"; + name = "libwaffle-1-0_1.6.1-0+steamrt1.1+srt1_i386"; + sha256 = "06f22a35ca49969e44f1bdaca82a1d085e69211bf3b39915d77d80f414ea8668"; + url = "mirror://steamrt/pool/main/w/waffle/libwaffle-1-0_1.6.1-0+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libwaffle-1-0.deb"; @@ -3966,27 +4020,27 @@ }; } rec { - name = "steam-runtime-tools-bin_0.20200109.0-0+steamrt1.1+srt1_i386"; - sha256 = "52e587b75463b08e0e903e30cd4b836bd4e39ead8d556807e5628eff36fdc477"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/steam-runtime-tools-bin_0.20200109.0-0+steamrt1.1+srt1_i386.deb"; + name = "steam-runtime-tools-bin_0.20200415.0+srt1_i386"; + sha256 = "3ea27a32f19f6e5133385fe4072f3d9a027c4f83604355baa34cf3ae5e346db5"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/steam-runtime-tools-bin_0.20200415.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "steam-runtime-tools-bin.deb"; }; } rec { - name = "steamrt-legacy_1.20200128.0+srt1_i386"; - sha256 = "3adf8b89ac83f12eeb431785bd18a569b1174bc81aa24d5c562687b823704f28"; - url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20200128.0+srt1_i386.deb"; + name = "steamrt-legacy_1.20200421.0+srt1_i386"; + sha256 = "08371f2a03aacd50f578b7aca4e6934fc60b9db1927e9eb3c8f1a5f6421e79e5"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20200421.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "steamrt-legacy.deb"; }; } rec { - name = "steamrt-libs_1.20200128.0+srt1_i386"; - sha256 = "8ad6092d1b4d257883ca4f3fac8ee5b9a71413c8bdbc149a9bec843047867311"; - url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20200128.0+srt1_i386.deb"; + name = "steamrt-libs_1.20200421.0+srt1_i386"; + sha256 = "0f84ef7ebea603df58d4549a8368a51ceb3989d136174870bfd4c2ed50a13195"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20200421.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "steamrt-libs.deb"; @@ -4029,72 +4083,54 @@ }; } rec { - name = "vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386"; - sha256 = "6a8576cc6fadc4d18c97b100dc24bad1906f6f56cab024997787355025695df4"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386.deb"; + name = "vulkan-tools_1.2.135.0+dfsg1-1~steamrt1.1+srt1_i386"; + sha256 = "1a252f79e90034726d80e49ab892ddfd504fa32dfef93887ed2c6e6e83e77248"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools_1.2.135.0+dfsg1-1~steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "vulkan-tools.deb"; }; } rec { - name = "vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386"; - sha256 = "fae0430f540c71bd8f6ab3099f8aa132d2eda858b66facf3d8a586ab38cffde6"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386.deb"; + name = "vulkan-tools-multiarch_1.2.135.0+dfsg1-1~steamrt1.1+srt1_i386"; + sha256 = "f7f68aefcb4f45f855949ad84463c68071595568db27480d3df3ed9be5683b5f"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools-multiarch_1.2.135.0+dfsg1-1~steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "vulkan-tools-multiarch.deb"; }; } rec { - name = "vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all"; - sha256 = "f10004e20ed5fc93edf035f8f34bb9f8307eb34974a3ed5aae9ba87f00a2c468"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all.deb"; - source = fetchurl { - inherit url sha256; - name = "vulkan-utils.deb"; - }; - } - rec { - name = "vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386"; - sha256 = "f81b81ef14f11662d2d5e5a7f688c2ef4f9ad9625ec5e59de91aab3f1ad45406"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386.deb"; - source = fetchurl { - inherit url sha256; - name = "vulkan-utils-multiarch.deb"; - }; - } - rec { - name = "waffle-utils_1.6.0-2~steamrt1.3+srt1_i386"; - sha256 = "37df214d4f0fd1c5e9afce405756fc1615f2d5cba468b34569b13f3e8a08a2a5"; - url = "mirror://steamrt/pool/main/w/waffle/waffle-utils_1.6.0-2~steamrt1.3+srt1_i386.deb"; + name = "waffle-utils_1.6.1-0+steamrt1.1+srt1_i386"; + sha256 = "c88c88a12f5a9486a20275624c45ab7ac2170e846ea1368d1180e7b39c9d586f"; + url = "mirror://steamrt/pool/main/w/waffle/waffle-utils_1.6.1-0+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "waffle-utils.deb"; }; } rec { - name = "waffle-utils-multiarch_1.6.0-2~steamrt1.3+srt1_i386"; - sha256 = "5866f8bf43b6c19608670a8c565ce8f0dac9db9c943e65ac25e9cb4f951997a4"; - url = "mirror://steamrt/pool/main/w/waffle/waffle-utils-multiarch_1.6.0-2~steamrt1.3+srt1_i386.deb"; + name = "waffle-utils-multiarch_1.6.1-0+steamrt1.1+srt1_i386"; + sha256 = "9aa2ee8c466c343dda5c8db9465238eb5f4cb55b5cfcfca8a3c109ba1d6c6d65"; + url = "mirror://steamrt/pool/main/w/waffle/waffle-utils-multiarch_1.6.1-0+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "waffle-utils-multiarch.deb"; }; } rec { - name = "zenity_3.4.0-0ubuntu4+steamrt2+srt6_i386"; - sha256 = "1c772d4f96424d204ab4913efcafbe43518257ca5032ca7b23d6c6ab76439117"; - url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt6_i386.deb"; + name = "zenity_3.4.0-0ubuntu4+steamrt3+srt1_i386"; + sha256 = "b8b0d0781ed2e59ac22af8006e61323a5f1f5be44d47e0fea0ca32e8c575528d"; + url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt3+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "zenity.deb"; }; } rec { - name = "zenity-common_3.4.0-0ubuntu4+steamrt2+srt6_all"; - sha256 = "bc8f0b80672833be72c6dd87d406b5fc0ef92e51f91e3a461678fc97844649bc"; - url = "mirror://steamrt/pool/main/z/zenity/zenity-common_3.4.0-0ubuntu4+steamrt2+srt6_all.deb"; + name = "zenity-common_3.4.0-0ubuntu4+steamrt3+srt1_all"; + sha256 = "7ec603c8b00c5573e88e1df9785af4baef93b54e377e697515eb939b7c119cdc"; + url = "mirror://steamrt/pool/main/z/zenity/zenity-common_3.4.0-0ubuntu4+steamrt3+srt1_all.deb"; source = fetchurl { inherit url sha256; name = "zenity-common.deb"; diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index 1fa17c32d6c70..ff7a0077f1e90 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "The official runtime used by Steam"; - homepage = https://github.com/ValveSoftware/steam-runtime; + homepage = "https://github.com/ValveSoftware/steam-runtime"; license = licenses.unfreeRedistributable; # Includes NVIDIA CG toolkit maintainers = with maintainers; [ hrdinka abbradar ]; }; diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index 0276122655fe0..830c97b2fb7d6 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A digital distribution platform"; - homepage = http://store.steampowered.com/; + homepage = "http://store.steampowered.com/"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ jagajaga ]; }; diff --git a/pkgs/games/steam/steamcmd.nix b/pkgs/games/steam/steamcmd.nix index a38122702f25b..223dff332a705 100644 --- a/pkgs/games/steam/steamcmd.nix +++ b/pkgs/games/steam/steamcmd.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { version = "20180104"; # According to steamcmd_linux.tar.gz mtime src = fetchurl { - url = https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz; + url = "https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz"; sha256 = "0z0y0zqvhydmfc9y9vg5am0vz7m3gbj4l2dwlrfz936hpx301gyf"; }; diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 71524c244eea9..f6cfb873709cc 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = https://www.stepmania.com/; + homepage = "https://www.stepmania.com/"; description = "Free dance and rhythm game for Windows, Mac, and Linux"; platforms = platforms.linux; license = licenses.mit; # expat version diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index 1919383048e58..5e8429f0336a0 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://stockfishchess.org/; + homepage = "https://stockfishchess.org/"; description = "Strong open source chess engine"; longDescription = '' Stockfish is one of the strongest chess engines in the world. It is also diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 6b3da08b70c7f..98a3ca883178e 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stunt Rally game with Track Editor, based on VDrift and OGRE"; - homepage = http://stuntrally.tuxfamily.org/; + homepage = "http://stuntrally.tuxfamily.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 96444897cc946..70c5657508bd3 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,9 +1,15 @@ -{ stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig +{ stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig, makeWrapper , openal, freealut, libGLU, libGL, libvorbis, libogg, gettext, curl, freetype , fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr, enet, harfbuzz }: let dir = "stk-code"; + assets = fetchsvn { + url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; + rev = "18212"; + sha256 = "1dyj8r5rfifhnhayga8w8irkpa99vw57xjmy74cp8xz8g7zvdzqf"; + name = "stk-assets"; + }; in stdenv.mkDerivation rec { pname = "supertuxkart"; @@ -17,15 +23,9 @@ in stdenv.mkDerivation rec { sha256 = "01vxxl94583ixswzmi4caz8dk64r56pn3zxh7v63zml60yfvxbvp"; name = dir; }) - (fetchsvn { - url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; - rev = "18212"; - sha256 = "1dyj8r5rfifhnhayga8w8irkpa99vw57xjmy74cp8xz8g7zvdzqf"; - name = "stk-assets"; - }) ]; - nativeBuildInputs = [ cmake gettext libtool pkgconfig ]; + nativeBuildInputs = [ cmake gettext libtool pkgconfig makeWrapper ]; buildInputs = [ libX11 libXrandr @@ -38,8 +38,14 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs "-DUSE_SYSTEM_ANGELSCRIPT=OFF" # doesn't work with 2.31.2 or 2.32.0 + "-DCHECK_ASSETS=OFF" ]; + # Obtain the assets directly from the fetched store path, to avoid duplicating assets across multiple engine builds + preFixup = '' + wrapProgram $out/bin/supertuxkart --set-default SUPERTUXKART_ASSETS_DIR "${assets}" + ''; + sourceRoot = dir; meta = with stdenv.lib; { @@ -49,7 +55,7 @@ in stdenv.mkDerivation rec { characters and items for you to try, similar in spirit to Mario Kart. ''; - homepage = https://supertuxkart.net/; + homepage = "https://supertuxkart.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pyrolagus peterhoeg ]; platforms = with platforms; linux; diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix index 3b33296892f50..68b49fd551724 100644 --- a/pkgs/games/supertux/default.nix +++ b/pkgs/games/supertux/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "supertux"; - version = "0.6.1.1"; + version = "0.6.2"; src = fetchurl { url = "https://github.com/SuperTux/supertux/releases/download/v${version}/SuperTux-v${version}-Source.tar.gz"; - sha256 = "0n36qxwjlkdlksximz4s729az6pry2sdjavwgm7m65vfgdiz139f"; + sha256 = "167m3z4m8n76dvbv42m1fnvabpbpsxvr28zk9641916jl9pfba96"; }; nativeBuildInputs = [ pkgconfig cmake ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Classic 2D jump'n run sidescroller game"; - homepage = http://supertux.github.io/; + homepage = "http://supertux.github.io/"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; diff --git a/pkgs/games/system-syzygy/default.nix b/pkgs/games/system-syzygy/default.nix index 2e417e2a3cfc0..4343a27fb499b 100644 --- a/pkgs/games/system-syzygy/default.nix +++ b/pkgs/games/system-syzygy/default.nix @@ -3,7 +3,7 @@ let desktopFile = makeDesktopItem { name = "system-syzygy"; - exec = "%out%/bin/syzygy"; + exec = "@out@/bin/syzygy"; comment = "A puzzle game"; desktopName = "System Syzygy"; categories = "Game;"; diff --git a/pkgs/games/t4kcommon/default.nix b/pkgs/games/t4kcommon/default.nix index f576403b70b2e..f2e226cb57051 100644 --- a/pkgs/games/t4kcommon/default.nix +++ b/pkgs/games/t4kcommon/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library of code shared between tuxmath and tuxtype."; - homepage = https://github.com/tux4kids/t4kcommon; + homepage = "https://github.com/tux4kids/t4kcommon"; license = licenses.gpl3Plus; maintainers = [ maintainers.aanderse ]; platforms = platforms.linux; diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index 57e7217fcdbd2..765c50149ace1 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "tcl2048-0.4.0"; src = fetchurl { - url = https://raw.githubusercontent.com/dbohdan/2048.tcl/v0.4.0/2048.tcl; + url = "https://raw.githubusercontent.com/dbohdan/2048.tcl/v0.4.0/2048.tcl"; sha256 = "53f5503efd7f029b2614b0f9b1e3aac6c0342735a3c9b811d74a5135fee3e89e"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/dbohdan/2048.tcl; + homepage = "https://github.com/dbohdan/2048.tcl"; description = "The game of 2048 implemented in Tcl"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/games/teetertorture/default.nix b/pkgs/games/teetertorture/default.nix index 7933ef2f06951..a568fd79085a0 100644 --- a/pkgs/games/teetertorture/default.nix +++ b/pkgs/games/teetertorture/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "teeter-torture-20051018"; src = fetchurl { - url = ftp://ftp.tuxpaint.org/unix/x/teetertorture/source/teetertorture-2005-10-18.tar.gz; + url = "ftp://ftp.tuxpaint.org/unix/x/teetertorture/source/teetertorture-2005-10-18.tar.gz"; sha256 = "175gdbkx3m82icyzvwpyzs4v2fd69c695k5n8ca0lnjv81wnw2hr"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.newbreedsoftware.com/teetertorture/; + homepage = "http://www.newbreedsoftware.com/teetertorture/"; description = "Simple shooting game with your cannon is sitting atop a teeter totter"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 13918d2f7a520..3035c02e26237 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "teeworlds"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "teeworlds"; repo = "teeworlds"; rev = version; - sha256 = "1llrzcc9p8pswk58rj4qh4g67nlji8q2kw3hxh3qpli85jvkdmyx"; + sha256 = "1l19ksmimg6b8zzjy0skyhh7z11ql7n5gvilkv7ay5x2b9ndbqwz"; fetchSubmodules = true; }; diff --git a/pkgs/games/tennix/default.nix b/pkgs/games/tennix/default.nix index 283d8ad21d7ef..56ac0a2faf4e7 100644 --- a/pkgs/games/tennix/default.nix +++ b/pkgs/games/tennix/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://icculus.org/tennix/; + homepage = "http://icculus.org/tennix/"; description = "Classic Championship Tour 2011"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 5432824ce6c03..d3198e2b35c0a 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -1,36 +1,30 @@ -{ stdenv, lib, file, fetchurl, unzip }: +{ stdenv, lib, file, fetchurl, autoPatchelfHook, unzip }: stdenv.mkDerivation rec { pname = "terraria-server"; - version = "1.3.5.3"; - urlVersion = lib.replaceChars ["."] [""] version; + version = "1.4.0.4"; + urlVersion = lib.replaceChars [ "." ] [ "" ] version; src = fetchurl { - url = "https://terraria.org/server/terraria-server-${urlVersion}.zip"; - sha256 = "0l7j2n6ip4hxph7dfal7kzdm3dqnm1wba6zc94gafkh97wr35ck3"; + url = "https://terraria.org/system/dedicated_servers/archives/000/000/038/original/terraria-server-${urlVersion}.zip"; + sha256 = "09zkadjd04gbx1yvwpqmm89viydwxqgixbqhbqncb94qb2z5gfxk"; }; buildInputs = [ file unzip ]; + nativeBuildInputs = [ autoPatchelfHook ]; installPhase = '' mkdir -p $out/bin cp -r Linux $out/ chmod +x "$out/Linux/TerrariaServer.bin.x86_64" ln -s "$out/Linux/TerrariaServer.bin.x86_64" $out/bin/TerrariaServer - # Fix "/lib64/ld-linux-x86-64.so.2" like references in ELF executables. - find "$out" | while read filepath; do - if file "$filepath" | grep -q "ELF.*executable"; then - echo "setting interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) in $filepath" - patchelf --set-interpreter "$(cat "$NIX_CC"/nix-support/dynamic-linker)" "$filepath" - test $? -eq 0 || { echo "patchelf failed to process $filepath"; exit 1; } - fi - done ''; meta = with lib; { - homepage = http://terraria.org; - description = "Dedicated server for Terraria, a 2D action-adventure sandbox"; - platforms = ["x86_64-linux"]; + homepage = "https://terraria.org"; + description = + "Dedicated server for Terraria, a 2D action-adventure sandbox"; + platforms = [ "x86_64-linux" ]; license = licenses.unfree; }; } diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index 9cc3bf7149ffa..14d51ee87bd13 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, qt5, box2d, which, cmake, gettext }: +{ stdenv, mkDerivation, fetchgit, qt5, box2d, which, cmake, gettext }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "tbe"; version = "0.9.3.1"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A physics-based game vaguely similar to Incredible Machine"; - homepage = http://the-butterfly-effect.org/; + homepage = "http://the-butterfly-effect.org/"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index b0901fcb9a0f3..72b4bf20383a6 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free 2D physics sandbox game"; - homepage = http://powdertoy.co.uk/; + homepage = "http://powdertoy.co.uk/"; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index 1482b58a7b02d..b8c2c3f3cf430 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "tibia-10.90"; src = fetchurl { - url = http://static.tibia.com/download/tibia1090.tgz; + url = "http://static.tibia.com/download/tibia1090.tgz"; sha256 = "11mkh2dynmbpay51yfaxm5dmcys3rnpk579s9ypfkhblsrchbkhx"; }; @@ -49,7 +49,7 @@ stdenv.mkDerivation { meta = { description = "Top-down MMORPG set in a fantasy world"; - homepage = http://tibia.com; + homepage = "http://tibia.com"; license = stdenv.lib.licenses.unfree; platforms = ["i686-linux"]; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index fbf4b1beecfd7..7291f5b4bd218 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free MUD client for macOS, Linux and Windows"; - homepage = http://tintin.sourceforge.net; + homepage = "http://tintin.sourceforge.net"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/games/tinyfugue/default.nix b/pkgs/games/tinyfugue/default.nix index fb3ebf36db3b6..fb706d38e1895 100644 --- a/pkgs/games/tinyfugue/default.nix +++ b/pkgs/games/tinyfugue/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ++ optional sslSupport openssl; meta = { - homepage = http://tinyfugue.sourceforge.net/; + homepage = "http://tinyfugue.sourceforge.net/"; description = "A terminal UI, screen-oriented MUD client"; longDescription = '' TinyFugue, aka "tf", is a flexible, screen-oriented MUD client, for use diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 67d7f82457f9b..136578924a0dc 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game"; - homepage = http://torcs.sourceforge.net/; + homepage = "http://torcs.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index b778579c9d78d..ec607758bd6d6 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU libGL ]; meta = { - homepage = https://trackballs.github.io/; + homepage = "https://trackballs.github.io/"; description = "3D Marble Madness clone"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index 7ea83f80fefa5..cab77b23ee911 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { after death. Other structures provide automated base defense (to some degree), healing functions and much more... ''; - homepage = http://www.tremulous.net; + homepage = "http://www.tremulous.net"; license = with licenses; [ gpl2 cc-by-sa-25 /* media */ diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index 34ae0762beaae..c6f31922bb6d9 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Rally"; - homepage = http://trigger-rally.sourceforge.net/; + homepage = "http://trigger-rally.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix index 603fb3ef491b7..b9d7f1b8c2864 100644 --- a/pkgs/games/tuxpaint/default.nix +++ b/pkgs/games/tuxpaint/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "Open Source Drawing Software for Children"; - homepage = http://www.tuxpaint.org/; + homepage = "http://www.tuxpaint.org/"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ woffs ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/tuxtype/default.nix b/pkgs/games/tuxtype/default.nix index 6b2fb8178eac4..9d04440a1672c 100644 --- a/pkgs/games/tuxtype/default.nix +++ b/pkgs/games/tuxtype/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An Educational Typing Tutor Game Starring Tux, the Linux Penguin"; - homepage = https://github.com/tux4kids/tuxtype; + homepage = "https://github.com/tux4kids/tuxtype"; license = licenses.gpl3Plus; maintainers = [ maintainers.aanderse ]; platforms = platforms.linux; diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix index 6f0afc359ab44..9da67cbd1ea1e 100644 --- a/pkgs/games/typespeed/default.nix +++ b/pkgs/games/typespeed/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "typespeed-0.6.5"; buildInputs = [ ncurses ]; src = fetchurl { - url = http://typespeed.sourceforge.net/typespeed-0.6.5.tar.gz; + url = "http://typespeed.sourceforge.net/typespeed-0.6.5.tar.gz"; sha256 = "5c860385ceed8a60f13217cc0192c4c2b4705c3e80f9866f7d72ff306eb72961"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A curses based typing game"; - homepage = http://typespeed.sourceforge.net/; + homepage = "http://typespeed.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.auntie ]; diff --git a/pkgs/games/ue4/cdn-deps.nix b/pkgs/games/ue4/cdn-deps.nix index 76c11c6baa70e..4b7fa8765ca96 100644 --- a/pkgs/games/ue4/cdn-deps.nix +++ b/pkgs/games/ue4/cdn-deps.nix @@ -2,7027 +2,7027 @@ { "0049fd8a61e04257b6dcb37217d4d603cd74cc6b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0049fd8a61e04257b6dcb37217d4d603cd74cc6b; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0049fd8a61e04257b6dcb37217d4d603cd74cc6b"; sha256 = "1dcyxixgqsw4lcwg9066q39yghhppfp85yyi4r4drq5j5rg3dgb1"; }; "0055e020f7505cf021eb66b73e3a8fa3cc308b05" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/0055e020f7505cf021eb66b73e3a8fa3cc308b05; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/0055e020f7505cf021eb66b73e3a8fa3cc308b05"; sha256 = "1i2ff0hzrs2kdqv860wjnddyp80asanx5zzispsbzm95iljfby70"; }; "007491dae0c56c74ca78a46639d8e41243bde83f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/007491dae0c56c74ca78a46639d8e41243bde83f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/007491dae0c56c74ca78a46639d8e41243bde83f"; sha256 = "14q664k5dgyc4f30mc6f2537w9mxw9407nba3023xss9vfijldgv"; }; "00927d42baa3e7f8fb204e62ea43ff39384f8679" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/00927d42baa3e7f8fb204e62ea43ff39384f8679; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/00927d42baa3e7f8fb204e62ea43ff39384f8679"; sha256 = "1jpzh24r1xkn8vifqyqljfbb9jbmcl7syigaq2lkjjxfl9nzwqqv"; }; "0092dbc71c6b4bd985a697ac3d1f1597c0bc82f6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/0092dbc71c6b4bd985a697ac3d1f1597c0bc82f6; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/0092dbc71c6b4bd985a697ac3d1f1597c0bc82f6"; sha256 = "17cdmr5p4vyq04m0njv4b82l6gnp0dpxs22y5466ksnksckh9xwz"; }; "009f9921fd444183569a1057648f0c3573688f98" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/009f9921fd444183569a1057648f0c3573688f98; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/009f9921fd444183569a1057648f0c3573688f98"; sha256 = "0pc107dgkg8v51gy4083myp01lby8xfvlkx5xplsq55lxifkxcqy"; }; "00ab55311f402e65385f797ea5e1c4ab4663553e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/00ab55311f402e65385f797ea5e1c4ab4663553e; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/00ab55311f402e65385f797ea5e1c4ab4663553e"; sha256 = "1d2hwgd2zk4alxb6fb4fzkxcpkl3gp95v39jd0g77frj5ajnf5yc"; }; "00add27414f59890b092ab4b03bbbc585cedb847" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/00add27414f59890b092ab4b03bbbc585cedb847; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/00add27414f59890b092ab4b03bbbc585cedb847"; sha256 = "0jmbay34rl6srpkylamsy409a2rpqb9jwhyxfph34bazsp3jv04k"; }; "00b98d4aec7a1f350c0fdd8186841aa96c0cce53" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/00b98d4aec7a1f350c0fdd8186841aa96c0cce53; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/00b98d4aec7a1f350c0fdd8186841aa96c0cce53"; sha256 = "0lh9rdgg9nr2mxvgx0rdg0zk4q5gsza4yacxp933bm41vvdwr3kq"; }; "00c4eb5dc59035a15405197341b6b925473708db" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/00c4eb5dc59035a15405197341b6b925473708db; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/00c4eb5dc59035a15405197341b6b925473708db"; sha256 = "00xl95hd2qcnzylvqc77pv758frws8z8anf4kb5vhz3lcv8c1n9n"; }; "00f460c11eef99d9e125c11687a40d39f7b74873" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/00f460c11eef99d9e125c11687a40d39f7b74873; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/00f460c11eef99d9e125c11687a40d39f7b74873"; sha256 = "1zp0qrc4nrv2cy7mc0z7chm75pa6ffzzz7yr32lw9ijzv5rbcjml"; }; "0104416c142ca7b3174660267c22f049db573bdb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/0104416c142ca7b3174660267c22f049db573bdb; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/0104416c142ca7b3174660267c22f049db573bdb"; sha256 = "0lzg75w1cnbm9yll32la7gcq5wv7wr8ckx3kxv4adhkkaz53bail"; }; "01687bd36252e9a263022192524ca8835ae9552b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/01687bd36252e9a263022192524ca8835ae9552b; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/01687bd36252e9a263022192524ca8835ae9552b"; sha256 = "0cdql0x9nppg7lh4rlnc1k4cj4pv404881z02miqlr99a05rwzpv"; }; "01a1b60633d0e13df7952058973ca4979a5389e2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/01a1b60633d0e13df7952058973ca4979a5389e2; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/01a1b60633d0e13df7952058973ca4979a5389e2"; sha256 = "127llh0ybq7f6fnsmh1hrh4xh46ap0x3za9xxqfmj0qhfbz5nanr"; }; "01b5b6310231646e87a0bfefaebfee7f0c9e1929" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/01b5b6310231646e87a0bfefaebfee7f0c9e1929; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/01b5b6310231646e87a0bfefaebfee7f0c9e1929"; sha256 = "0agyb9fy1vpnc06073c8j1k3d9n475pznf5chaxpcqpppcqi8j55"; }; "01d26cddb178f064c3cd74a09430970bf6cc12b7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/01d26cddb178f064c3cd74a09430970bf6cc12b7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/01d26cddb178f064c3cd74a09430970bf6cc12b7"; sha256 = "1lxb8g2hd2jdswinzgnr4dqknh1c6nm6xh3fwbkvniglglrr7w9z"; }; "01e6c01a96b3cbe860204f191d1b9153509a9dee" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/01e6c01a96b3cbe860204f191d1b9153509a9dee; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/01e6c01a96b3cbe860204f191d1b9153509a9dee"; sha256 = "1ll3kahg1bvrw1djm855fan0yhfv385qaqbvsx11h4f7nsk1y8l1"; }; "0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0255260ee4d81de161e877cdcc3af4d7fcf8d0e3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0255260ee4d81de161e877cdcc3af4d7fcf8d0e3"; sha256 = "1b35v17pkpxjak9nslgmqik0779yqpfmrqhxih85fw38cx883y9k"; }; "0287d808513bc8ab41d3a122437451b3505e5a06" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0287d808513bc8ab41d3a122437451b3505e5a06; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0287d808513bc8ab41d3a122437451b3505e5a06"; sha256 = "0kjqvqs537kjji645wj9c7g0vm49saz7844gmsvaxbxa7j6qpv8r"; }; "0294cec564dabb2b74767382fed8bf1d85c3dd6a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0294cec564dabb2b74767382fed8bf1d85c3dd6a; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0294cec564dabb2b74767382fed8bf1d85c3dd6a"; sha256 = "1bc87j7aqh55c08r95iqhjy7yqyvjfrhnl5p9nvd9rmsywlcdpy6"; }; "02b79c9e934ba5d5df21ca904400f6921b0e919c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/02b79c9e934ba5d5df21ca904400f6921b0e919c; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/02b79c9e934ba5d5df21ca904400f6921b0e919c"; sha256 = "0ky6wm47c5nly14jj171nvr1hyx9qn027jpxzhffmdj1zd0ab1n2"; }; "02db54285fbdc7bcbc5072716c06102dadbe73a3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/02db54285fbdc7bcbc5072716c06102dadbe73a3; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/02db54285fbdc7bcbc5072716c06102dadbe73a3"; sha256 = "08j35dhpj1wpsjck57w6sncy9vciqmhpnzsmrb8a698alb4nq4la"; }; "02e23f8b72f230a371e141cf422d6339edc7f136" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/02e23f8b72f230a371e141cf422d6339edc7f136; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/02e23f8b72f230a371e141cf422d6339edc7f136"; sha256 = "0lgfl91hyy4isy03jp1lprlr6p6vq95vs408rr620xrrx8v9g1xj"; }; "02e31aefb786970a757120d82ef7e57d99598e2a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/02e31aefb786970a757120d82ef7e57d99598e2a; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/02e31aefb786970a757120d82ef7e57d99598e2a"; sha256 = "0kzp6hvpclqgm6ik46ifsb7q8cnyc1jpmn9hablz3bbcgz1ja1v6"; }; "02e3996085d4a6eadcc0403adb002e453626ad38" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/02e3996085d4a6eadcc0403adb002e453626ad38; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/02e3996085d4a6eadcc0403adb002e453626ad38"; sha256 = "1av0m7l2yb9k74482i60gbshpbiay25j6272p78vzzky55gfvvkq"; }; "02f911003167be7b08c3fbf9bdababa124958f48" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2489400-f6cf8f7e3aa44b46b137c223b0724bd6/02f911003167be7b08c3fbf9bdababa124958f48; + url = "http://cdn.unrealengine.com/dependencies/2489400-f6cf8f7e3aa44b46b137c223b0724bd6/02f911003167be7b08c3fbf9bdababa124958f48"; sha256 = "1a63d9d3ca0fhzniqwksxfs1q9fzxa8wz8mmcavnhmh2hcdf8l7s"; }; "037becd787cf315691a800ac53fc1ace30efc22f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/037becd787cf315691a800ac53fc1ace30efc22f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/037becd787cf315691a800ac53fc1ace30efc22f"; sha256 = "19jwdg0gi8axng2jc52i39bahzyhsksmza8ich6xbga7vzmcslic"; }; "038a65feb0c32e0a8997e4798012f90e380a5fa4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/038a65feb0c32e0a8997e4798012f90e380a5fa4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/038a65feb0c32e0a8997e4798012f90e380a5fa4"; sha256 = "11c1sk31f1wv2by7fvmwjlw0bf2khjh1gn7sx5iib6bx10mfk6zg"; }; "03bb65f1dc5e3bf35f5d6d5d6068a10aed0cf4a8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/03bb65f1dc5e3bf35f5d6d5d6068a10aed0cf4a8; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/03bb65f1dc5e3bf35f5d6d5d6068a10aed0cf4a8"; sha256 = "1akwa8n1h491r45w8z4396bpg53szq42ac081ra087a92x699h59"; }; "03eac14bed108c28a0a4450fa4f534d145c12179" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/03eac14bed108c28a0a4450fa4f534d145c12179; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/03eac14bed108c28a0a4450fa4f534d145c12179"; sha256 = "1y2gwhynvyr499kj3l4w5wj55q938n6swb8wbzily46r24g8d6g6"; }; "0419d8143ae34750eb7de7c51c4d3cd231bbce51" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0419d8143ae34750eb7de7c51c4d3cd231bbce51; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0419d8143ae34750eb7de7c51c4d3cd231bbce51"; sha256 = "1nr22bs71msfzp0ndi5hm7y4blv51039dpcv05a0xv4s939y16bl"; }; "041d9b9407ae8d58c7c3a7110af093916fee573e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/041d9b9407ae8d58c7c3a7110af093916fee573e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/041d9b9407ae8d58c7c3a7110af093916fee573e"; sha256 = "14syxk0bgc8khzabliibvm82asc692pyxa8m78f3jii47gy6vwcn"; }; "042de486169ab637609e1b035138f64893e04ad5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/042de486169ab637609e1b035138f64893e04ad5; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/042de486169ab637609e1b035138f64893e04ad5"; sha256 = "0j5p0bid72xs8r63nbkyx77w89fy6d1kbx6axph5w6nnkr2flvy6"; }; "049aaeab9a2e4405e946d0097d1a3e824c128df6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/049aaeab9a2e4405e946d0097d1a3e824c128df6; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/049aaeab9a2e4405e946d0097d1a3e824c128df6"; sha256 = "0d56izrz5cbgib0mxzd5zj6yzvfln4rglpvxi1h05l5xrd9rcc9s"; }; "04b9a9091bba671b960e607283c6434625072697" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/04b9a9091bba671b960e607283c6434625072697; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/04b9a9091bba671b960e607283c6434625072697"; sha256 = "1sbhvy7dyir4gk6ignmbssmmhjkqm34rpzri9jv50k59lhdzrmz4"; }; "04e55b081d4e6680ca0da096eab39443e53aeb2a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621793-1958bfdd4e3b49f3a0ca6a4c08a60a0a/04e55b081d4e6680ca0da096eab39443e53aeb2a; + url = "http://cdn.unrealengine.com/dependencies/2621793-1958bfdd4e3b49f3a0ca6a4c08a60a0a/04e55b081d4e6680ca0da096eab39443e53aeb2a"; sha256 = "1f4mypy8nv0m4xzljlj9d5h13670r78lmp1nrzkyj6pkjaiz9l1h"; }; "04ec121ce824aec5caca1ddb70eaa21e0191a5b4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/04ec121ce824aec5caca1ddb70eaa21e0191a5b4; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/04ec121ce824aec5caca1ddb70eaa21e0191a5b4"; sha256 = "0a32ss082pizm8qybmpsl91mc60290wj192rlgbp7q7rvn85j5yi"; }; "04f2ae9278db23034ee3cb0bbbe67db49b5881fc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/04f2ae9278db23034ee3cb0bbbe67db49b5881fc; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/04f2ae9278db23034ee3cb0bbbe67db49b5881fc"; sha256 = "1d0l0kjscdgwm5sb454hd7n5vn0x61v78b7zklhjrfzmfsqxxijz"; }; "052ad62516b7d63eaf4c6410cd2dca0264734665" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/052ad62516b7d63eaf4c6410cd2dca0264734665; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/052ad62516b7d63eaf4c6410cd2dca0264734665"; sha256 = "1a70f5mk7z053i0xl949gngkysdg3kc810mm88mirzn501xc6rq3"; }; "05be3410a78afea71327d64933707b9f7550d2f6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/05be3410a78afea71327d64933707b9f7550d2f6; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/05be3410a78afea71327d64933707b9f7550d2f6"; sha256 = "1vb8vsjx7h1k9vdikm02lzwjpyfm409kh8q8bv94d0plh9cpg03l"; }; "061b4fb485e75b96f3266aff9a762a28b2d77616" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/061b4fb485e75b96f3266aff9a762a28b2d77616; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/061b4fb485e75b96f3266aff9a762a28b2d77616"; sha256 = "0f4nbrgdpb6dy6z0brk7fidx97svxljqcwng4skqg0rww9275hh2"; }; "0625d1c6055de9cf9025b2e61299912a56f88ccb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/0625d1c6055de9cf9025b2e61299912a56f88ccb; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/0625d1c6055de9cf9025b2e61299912a56f88ccb"; sha256 = "150c0n1n1fa6f89pxv3rp8yxfcvkca3ygp7fwia0s8zcakn02ail"; }; "0668d99201136f1b598c5795fa3e58050020e8b1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0668d99201136f1b598c5795fa3e58050020e8b1; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0668d99201136f1b598c5795fa3e58050020e8b1"; sha256 = "0cmd3ix5b39bakyrra0p9847lq14kb7jkvcl3hw30v8kww4m056w"; }; "067baa5f7a564bf867b5b337369950ad00e13e99" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/067baa5f7a564bf867b5b337369950ad00e13e99; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/067baa5f7a564bf867b5b337369950ad00e13e99"; sha256 = "1jmdc1hpl7hgn22ws8357lg0v98a51d3qa1fqhq3bbvhcssgls62"; }; "06ebb79f97706bad4850ce9077a9e7e90185e324" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/06ebb79f97706bad4850ce9077a9e7e90185e324; + url = "http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/06ebb79f97706bad4850ce9077a9e7e90185e324"; sha256 = "18ykxqm31gd1ij30a9vf8saygjk162k2jqmpybx00vqawqwbbcx5"; }; "06f561a38764b8e9c4087a97ed512c995363927c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/06f561a38764b8e9c4087a97ed512c995363927c; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/06f561a38764b8e9c4087a97ed512c995363927c"; sha256 = "1wassg3y5yd5i5jqsd528ddb8j9f65r4k5g981z6l70spk5l0v34"; }; "0702299294e21ac823c34d43de2a89140288143d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/0702299294e21ac823c34d43de2a89140288143d; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/0702299294e21ac823c34d43de2a89140288143d"; sha256 = "08wjf4zk7pba5ac5s2d26zlrq7ld12bd7l35xn2pz9lsd1j4qwry"; }; "070b80d72403fb102b91c2c7c1eababab6aec2f7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/070b80d72403fb102b91c2c7c1eababab6aec2f7; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/070b80d72403fb102b91c2c7c1eababab6aec2f7"; sha256 = "0jv0j6qp1k1zwww3qvrckisa5cdj39xq9aw3ljsvdfsp10x4i4a3"; }; "07a88f4f32dff82062e33545b17b0011c4f3242b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/07a88f4f32dff82062e33545b17b0011c4f3242b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/07a88f4f32dff82062e33545b17b0011c4f3242b"; sha256 = "139xl7bzcab78s1ma42vl2yqxflxrpgl8qglnwbfdlq1nxbj8yiq"; }; "07bac5d4a23c9a7bc1695e030017c8694d72a735" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/07bac5d4a23c9a7bc1695e030017c8694d72a735; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/07bac5d4a23c9a7bc1695e030017c8694d72a735"; sha256 = "0f6pjix0slzd06yqgd7vfsdssc3qkqi3av6kvfmjcn22xryq2qn6"; }; "0818124e55b7ae14e580ada76b6fca5656c05836" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0818124e55b7ae14e580ada76b6fca5656c05836; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0818124e55b7ae14e580ada76b6fca5656c05836"; sha256 = "0a3frk5viy0pv4ac7jv50j74d985hgq2dnjq6vgkrdcrir7zbz0m"; }; "084e5de210ff35e876901668dd00537a3a019ac5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/084e5de210ff35e876901668dd00537a3a019ac5; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/084e5de210ff35e876901668dd00537a3a019ac5"; sha256 = "08v9q7796r1nab02ghyvbdsip8bmw07cab6w079vvrqwkrg2ajcm"; }; "0898f76e0b61476b01184a79f59737933332711f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0898f76e0b61476b01184a79f59737933332711f; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0898f76e0b61476b01184a79f59737933332711f"; sha256 = "1qrz8ld9a5lv5pxs34icsic6c8fy1ydjx79zf35hvzdaqkds22jc"; }; "08aafc6b5bf5f6834032ea41a414bf57378e9d6e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/08aafc6b5bf5f6834032ea41a414bf57378e9d6e; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/08aafc6b5bf5f6834032ea41a414bf57378e9d6e"; sha256 = "10v3b2bsx240fa9xvarh5r4klz2gnqg9ljf2h34j8pqs1fq6dvc2"; }; "09007b1cd8b9f90a5ab85549323903759f18b852" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/09007b1cd8b9f90a5ab85549323903759f18b852; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/09007b1cd8b9f90a5ab85549323903759f18b852"; sha256 = "0vx3k63svxh9iyzy69vwkm6i9kays9jdkc8fzyd71k9wspq4ynvr"; }; "09510670263d739c9271c8d43047c1e427873509" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2702576-55d4c00170ec40c8a92540c9aee72a96/09510670263d739c9271c8d43047c1e427873509; + url = "http://cdn.unrealengine.com/dependencies/2702576-55d4c00170ec40c8a92540c9aee72a96/09510670263d739c9271c8d43047c1e427873509"; sha256 = "1wzb6gsxrvc3l1yhlaj533k1ha8c6s5bpnivs0jcqflnc3lfcza7"; }; "095aae7dd171f8fa10295657651b0889b387ad68" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/095aae7dd171f8fa10295657651b0889b387ad68; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/095aae7dd171f8fa10295657651b0889b387ad68"; sha256 = "0fig4i1afa9y27hhq3dkc5j36hwi5m1h2yviwv2kv60g9k01rsil"; }; "09601c1491f5d27c2533b4e7c9fb26a2e5eaa4d3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/09601c1491f5d27c2533b4e7c9fb26a2e5eaa4d3; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/09601c1491f5d27c2533b4e7c9fb26a2e5eaa4d3"; sha256 = "1b99ms4v6shf8ld7faxlckgmz8c8ii5avkhk88809ry6v4mhm2qx"; }; "09732d6bf762ba4d866616248b46adff0e12d76b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/09732d6bf762ba4d866616248b46adff0e12d76b; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/09732d6bf762ba4d866616248b46adff0e12d76b"; sha256 = "0g096y34r6a3f270n7gkh96ybrjl4afgscpzwbk860dik4xkzvnj"; }; "09b220dceaa8205e3a32a877c58c678dfdb8555f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/09b220dceaa8205e3a32a877c58c678dfdb8555f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/09b220dceaa8205e3a32a877c58c678dfdb8555f"; sha256 = "1a108nfspg6v2mfgj7g310cxvgq1b3b9i8l0sll8p7dcwdqk5077"; }; "0a17d50561c9bf1d85e82416f97726243726fe8e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/0a17d50561c9bf1d85e82416f97726243726fe8e; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/0a17d50561c9bf1d85e82416f97726243726fe8e"; sha256 = "1ibf6hr9zkrvj7x4mlmmvi552is75p60rgbcrr2bxjnk5vd5kixn"; }; "0a85e36f224c350b058936fdb88cb656864411c4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0a85e36f224c350b058936fdb88cb656864411c4; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0a85e36f224c350b058936fdb88cb656864411c4"; sha256 = "1wdrvm3s4asra41zgr309y5rwlw0nng1m4cd8p4gcch8q8vybl1z"; }; "0adcf8b7399354848f3b1659ae1bdfebe7c5fb54" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0adcf8b7399354848f3b1659ae1bdfebe7c5fb54; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0adcf8b7399354848f3b1659ae1bdfebe7c5fb54"; sha256 = "0f3zipklkp21qmsi5y9bm5539pgjn9h85w3r7qxhsa7arq4bfv9y"; }; "0ae58afa6b821d9172b327831297925b165ba540" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0ae58afa6b821d9172b327831297925b165ba540; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0ae58afa6b821d9172b327831297925b165ba540"; sha256 = "0xi644mlx97vyfzcp4zg2xy4d7xl6bpsqbyrja8vc02ddcqrz8ws"; }; "0b0c49fd66d2a1e20b9c3dfbaf57920646259399" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0b0c49fd66d2a1e20b9c3dfbaf57920646259399; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0b0c49fd66d2a1e20b9c3dfbaf57920646259399"; sha256 = "1862n366gcqqkf5apc19qg6w6vmyap3hz5f91lskhd3i28zmzcr6"; }; "0b19af7719665b5651dfb183e0f462030575539c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0b19af7719665b5651dfb183e0f462030575539c; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0b19af7719665b5651dfb183e0f462030575539c"; sha256 = "02015jsy2mzf4hkir3f11xxg2z21vrz5qnwyias322jr3g3k4x8n"; }; "0b2364f6696f39626a964e4370380b3fc8768b43" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/0b2364f6696f39626a964e4370380b3fc8768b43; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/0b2364f6696f39626a964e4370380b3fc8768b43"; sha256 = "0nfz5g0wp7l4kbdjg3qvl0p2nzcravivw0bhbwb7zppmmrsz08b9"; }; "0b2cd11ad11c170163c7958e24f339bf66609001" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2620227-83084f9091244f6c9bba34d6d2a0fc20/0b2cd11ad11c170163c7958e24f339bf66609001; + url = "http://cdn.unrealengine.com/dependencies/2620227-83084f9091244f6c9bba34d6d2a0fc20/0b2cd11ad11c170163c7958e24f339bf66609001"; sha256 = "0qhsp71xk2pj9dq3al2pghnh5w1zsvfwgg4ykm2czn8dqpr6v2fm"; }; "0b41a5fe69764ca460a102d4569d5cf0a96262dc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0b41a5fe69764ca460a102d4569d5cf0a96262dc; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0b41a5fe69764ca460a102d4569d5cf0a96262dc"; sha256 = "1w56h4m41178dyi9swrqjbl6jk6hz36i1ax27gmbvlmn71bd25sr"; }; "0b650b20c8c8aba9b4ffbfff4555352296b8026d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0b650b20c8c8aba9b4ffbfff4555352296b8026d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0b650b20c8c8aba9b4ffbfff4555352296b8026d"; sha256 = "0z46pi0np99l1dd63b8c7wlpzn9aqgfs8m90i8shkb8rr83yvqrd"; }; "0b65847315b6c2c97cf1cb6e6d159e22233c8251" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0b65847315b6c2c97cf1cb6e6d159e22233c8251; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0b65847315b6c2c97cf1cb6e6d159e22233c8251"; sha256 = "14pcxkamnwscpdq1gw0jdmpxsvilq8wdgpzlgsifdmwhrbzq9dhw"; }; "0b6608a97e2540ea5f17c2efa77ffe1ee1b3c533" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0b6608a97e2540ea5f17c2efa77ffe1ee1b3c533; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0b6608a97e2540ea5f17c2efa77ffe1ee1b3c533"; sha256 = "03j28mjv9qhw3inkj2sq9ri7vbajkfg4yq4fydqgas8zxiy7p5sa"; }; "0bbfc90e364f03102506acd5ad039a28e02cadf7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2618399-180c811b4d074c95af323aa82cdccb34/0bbfc90e364f03102506acd5ad039a28e02cadf7; + url = "http://cdn.unrealengine.com/dependencies/2618399-180c811b4d074c95af323aa82cdccb34/0bbfc90e364f03102506acd5ad039a28e02cadf7"; sha256 = "1p276i1gcj0hm4y3n46mz7inc0dh5naz2kj85aa07dy734qmnayf"; }; "0bcc47e413bef8dae40e79c9757941b0db15f97a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0bcc47e413bef8dae40e79c9757941b0db15f97a; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0bcc47e413bef8dae40e79c9757941b0db15f97a"; sha256 = "0h6qjxy1p9x7yfyawygb44bhlmdli96riclq9jbw9dypgpywmff3"; }; "0be87d25f74713be10bd98e1e966d795cfe4e5dc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0be87d25f74713be10bd98e1e966d795cfe4e5dc; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0be87d25f74713be10bd98e1e966d795cfe4e5dc"; sha256 = "0pd540vl2hs57fsbjrxj0vzsilr8mqx5ad47kmcpsk3nckrq6p1w"; }; "0c8fc2ef1a59d232fd4f22a022e20d492f6e2a84" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/0c8fc2ef1a59d232fd4f22a022e20d492f6e2a84; + url = "http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/0c8fc2ef1a59d232fd4f22a022e20d492f6e2a84"; sha256 = "0knhyb5y0fmbjds7qjhgxq5cvicv925qbp5pkdsa4bqab8vgzjaq"; }; "0c95d970796b73f6699b10dc55a5f23caeb0e7b6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0c95d970796b73f6699b10dc55a5f23caeb0e7b6; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0c95d970796b73f6699b10dc55a5f23caeb0e7b6"; sha256 = "157klpl089j437v12ngyfy20jipwdb252khg84dhz54dnmsl30l7"; }; "0cad2c40463fe8795e6ba38765dd8c775689eca4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/0cad2c40463fe8795e6ba38765dd8c775689eca4; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/0cad2c40463fe8795e6ba38765dd8c775689eca4"; sha256 = "1h85ix8ilw61jqiihm4xgkhknsqwfmkhw6zmyc1b3h5iczwa56m4"; }; "0cb75afcdc3e2acc810f4eaab1c4d0e47b71e66e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0cb75afcdc3e2acc810f4eaab1c4d0e47b71e66e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0cb75afcdc3e2acc810f4eaab1c4d0e47b71e66e"; sha256 = "1w1h8gj1sln0h4vsbqljnbdwmvfii0iykf9p8pfi616pi1rk0zrz"; }; "0cec09dea442a96d2db56d5f25830c204faf9c73" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0cec09dea442a96d2db56d5f25830c204faf9c73; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0cec09dea442a96d2db56d5f25830c204faf9c73"; sha256 = "1lik501r5m0jgnrlkimbwanwdd9j5j81xlwcksiyfaf4mx4jfd5q"; }; "0d1962bd98cbfd172126e306fff8cf75b8796bc7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0d1962bd98cbfd172126e306fff8cf75b8796bc7; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0d1962bd98cbfd172126e306fff8cf75b8796bc7"; sha256 = "1vjgl25j9v7qnv9829jprsgdlgagsh9rzv22fpq9yyiclxavhza2"; }; "0d5caa5b5d94abc659bf759feee88b37f4cf4618" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0d5caa5b5d94abc659bf759feee88b37f4cf4618; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0d5caa5b5d94abc659bf759feee88b37f4cf4618"; sha256 = "0660nyachjcvccrdkrarqwwalp5whg7ja998la6vqbpfq3m4x9dx"; }; "0dcd2138b0d77e84dd01b019736eefc97445f806" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0dcd2138b0d77e84dd01b019736eefc97445f806; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0dcd2138b0d77e84dd01b019736eefc97445f806"; sha256 = "0a5693qjs5ap9m3idqiadaym0k6j4saan6jd7mi1db9y66r4czsk"; }; "0e1315e453e0b243c9c0afc4965bc9042f5eadfa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0e1315e453e0b243c9c0afc4965bc9042f5eadfa; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0e1315e453e0b243c9c0afc4965bc9042f5eadfa"; sha256 = "1gjk3jjcnns9pcab7q7b8i46k8lsn5sjmp9vh0cswkl23v3qqwwg"; }; "0e1a08f56c646fa8ce394a0e41b8cab5a658268d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/0e1a08f56c646fa8ce394a0e41b8cab5a658268d; + url = "http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/0e1a08f56c646fa8ce394a0e41b8cab5a658268d"; sha256 = "1905j12lxpla20xiv6f2cjmnp100mzzp8076n8j295fdn7vbrb9v"; }; "0e26168a7254c7ba26bf4c06b28033e8387c689c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/0e26168a7254c7ba26bf4c06b28033e8387c689c; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/0e26168a7254c7ba26bf4c06b28033e8387c689c"; sha256 = "026w09ixxqzfgp0kbf60h7qwixd2gnx4v13kb9l3nn0g9p73slzk"; }; "0e4c8e5cf7fcfddf545be976ecd6d676331d54c9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613635-9840736c5f9647ffa600ff7b7e36f4ea/0e4c8e5cf7fcfddf545be976ecd6d676331d54c9; + url = "http://cdn.unrealengine.com/dependencies/2613635-9840736c5f9647ffa600ff7b7e36f4ea/0e4c8e5cf7fcfddf545be976ecd6d676331d54c9"; sha256 = "0r42n43jnwi8w8z0z08p6pzha973qxy3km94w3n0ywn7f1b20wbp"; }; "0e6c43d516af17c6766c4b204af1a1358451d364" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2748421-cc8960341ac147a18a63389f5fd32945/0e6c43d516af17c6766c4b204af1a1358451d364; + url = "http://cdn.unrealengine.com/dependencies/2748421-cc8960341ac147a18a63389f5fd32945/0e6c43d516af17c6766c4b204af1a1358451d364"; sha256 = "1n4n643zzh11k77vwvcsqsz10s8pks5729qbh9wq9ccrs2b5k2kd"; }; "0e934ae8f346ea8f7834da572917c93731ee3e71" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/0e934ae8f346ea8f7834da572917c93731ee3e71; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/0e934ae8f346ea8f7834da572917c93731ee3e71"; sha256 = "0n6czxwf531phc7l9d1daymylsvlhspfa6byx73nj2piifrnzcm3"; }; "0ed7e089f52f2e816998664ec165b776a056ee6e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0ed7e089f52f2e816998664ec165b776a056ee6e; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0ed7e089f52f2e816998664ec165b776a056ee6e"; sha256 = "0nl7j84np4v6109dnvslal6p6w8ycx8ai9nnagkg8bcsq9a4ramz"; }; "0ee5f371d8dffa94c5df7c2c1337d8a7029c022c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0ee5f371d8dffa94c5df7c2c1337d8a7029c022c; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0ee5f371d8dffa94c5df7c2c1337d8a7029c022c"; sha256 = "0jh51nbdqcd7bz5sqj112q4y3iqr47lnp725f32s5ad9ywa2jrpv"; }; "0ef3349a6ee43e03e0390d117749207582bd62fb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/0ef3349a6ee43e03e0390d117749207582bd62fb; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/0ef3349a6ee43e03e0390d117749207582bd62fb"; sha256 = "14qi1p9fxb0mgvhnriqf1qx716ap18vfsjp7kdcmn295fqzkxl8x"; }; "0f5530749f1eb9cd579c611a2c19eb675d225841" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/0f5530749f1eb9cd579c611a2c19eb675d225841; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/0f5530749f1eb9cd579c611a2c19eb675d225841"; sha256 = "1i3ngjajjhv2yamk2hcza399iylja42ygjbp7kwqx6qxvc2vh02p"; }; "0f74ff9d91cbb2b2061d50909d5d7f093b845a72" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0f74ff9d91cbb2b2061d50909d5d7f093b845a72; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0f74ff9d91cbb2b2061d50909d5d7f093b845a72"; sha256 = "06a5r840iksqmzch0l6hkngd2rv2s7dbwlp7dw1gwfd1ql9vm3c1"; }; "1015366202732d5b428dc71ad9ec5fa99ca1b874" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1015366202732d5b428dc71ad9ec5fa99ca1b874; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1015366202732d5b428dc71ad9ec5fa99ca1b874"; sha256 = "1s4q8bzbxypj650pwrbb6mqr9yqskavdrcj8kw03hj5fz29d9szy"; }; "1016254965add7631ca2982903c6d0169b0d45b2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1016254965add7631ca2982903c6d0169b0d45b2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1016254965add7631ca2982903c6d0169b0d45b2"; sha256 = "17rp6pixbs3qi9xyzh0w7kq1hcywckayd1q2db77m48rg36gvg6s"; }; "1028eaded56f0e46a92e7188a0e4dae970bc77c8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1028eaded56f0e46a92e7188a0e4dae970bc77c8; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1028eaded56f0e46a92e7188a0e4dae970bc77c8"; sha256 = "0867qswbqmmlam1l1a2d2ynzb1p5fwwp92mfb19n1ippgy6d128g"; }; "104b55382829a7351cea26478445bfa8e601d755" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/104b55382829a7351cea26478445bfa8e601d755; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/104b55382829a7351cea26478445bfa8e601d755"; sha256 = "0sr5c506zphmxclrzbq9b23jc8bcvwx58hpqzqg07d94qw9p4rsb"; }; "104eb620cbaf2629b13d4f5dc9edc9a888ff2e33" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/104eb620cbaf2629b13d4f5dc9edc9a888ff2e33; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/104eb620cbaf2629b13d4f5dc9edc9a888ff2e33"; sha256 = "01z335z3ddkvsx4z96m9w96hbksg29miqyn6wmvgpbsvgbp1wmgp"; }; "106f60f7c4e09a6444df98f226b3b925941480d8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/106f60f7c4e09a6444df98f226b3b925941480d8; + url = "http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/106f60f7c4e09a6444df98f226b3b925941480d8"; sha256 = "18xzn1iphddc7hyniyhrlsv36cijij7724psb9nq2dz5dpclg3db"; }; "10723922ccc14914c163a9546c40f01779891869" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/10723922ccc14914c163a9546c40f01779891869; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/10723922ccc14914c163a9546c40f01779891869"; sha256 = "0pi4s4r7pk6adb8v5f1g9bs3jb028yqsg4d82nd7p99qw4q4q20x"; }; "1077e9c2c6e2f36520c08a148ce3709a6e10a8ab" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1077e9c2c6e2f36520c08a148ce3709a6e10a8ab; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1077e9c2c6e2f36520c08a148ce3709a6e10a8ab"; sha256 = "1ms7r8pkbrsrb7brbcralbmxl20lhb8a77zhiad3b9xbwyil4p67"; }; "109ac2799187c1e94076a2db14922c275e94adbb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/109ac2799187c1e94076a2db14922c275e94adbb; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/109ac2799187c1e94076a2db14922c275e94adbb"; sha256 = "1viw9fa3gd8sc4qdfxh5x5b9pz8712xa15sfgjr16h6mb9h5y4yy"; }; "10bc8f77ff0fe6245b5ecf2b32ffcee97d4d42d4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/10bc8f77ff0fe6245b5ecf2b32ffcee97d4d42d4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/10bc8f77ff0fe6245b5ecf2b32ffcee97d4d42d4"; sha256 = "0f7i36149z2g7i4j8z7d5d3xnw476d3raiij87y0siixw0fl0js1"; }; "10d7ee1bc39b827fc0238870cf1aebbee7ed2b0b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/10d7ee1bc39b827fc0238870cf1aebbee7ed2b0b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/10d7ee1bc39b827fc0238870cf1aebbee7ed2b0b"; sha256 = "1088hkj96l5kxx3mww39nmkv2mzvc97syx2a9w6yys89n5y166qg"; }; "1142cb9f18f922166ae87d131c1fd09dce63f6d9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1142cb9f18f922166ae87d131c1fd09dce63f6d9; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1142cb9f18f922166ae87d131c1fd09dce63f6d9"; sha256 = "1frmz1rbhzfinz06lg14pcz7mbr1sddl6v9n53p2dq64lkrpcsw6"; }; "11485b16ed1b0a1f37aef0aec2e8a7afbf490e75" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/11485b16ed1b0a1f37aef0aec2e8a7afbf490e75; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/11485b16ed1b0a1f37aef0aec2e8a7afbf490e75"; sha256 = "1i1619cvimdj4a6786prdr1c76ga37blckyx6zzqkarq4idl3k9y"; }; "11beb714095ff4a699b6f0a3543c8c2b82cf1a0d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/11beb714095ff4a699b6f0a3543c8c2b82cf1a0d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/11beb714095ff4a699b6f0a3543c8c2b82cf1a0d"; sha256 = "1iyb0g8rbhhjs87z8iadjddk254z3jn6g9c80v93i6vgw8k9bcbf"; }; "11fad551f44760406d524cb0e1892580b9be77bc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/11fad551f44760406d524cb0e1892580b9be77bc; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/11fad551f44760406d524cb0e1892580b9be77bc"; sha256 = "00bj5pkychks7kaipf1dqkw7bhf0597g4qlh6rbm8qn4zd5f2747"; }; "12468bf1be869d88d9a8104ffde7c4887839843d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/12468bf1be869d88d9a8104ffde7c4887839843d; + url = "http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/12468bf1be869d88d9a8104ffde7c4887839843d"; sha256 = "0h5a4gfvj1hjxv4lj0m4bzavfh8akwbz6wg027q0mjnr143k0pr9"; }; "12d1a73c1c063a416ba2a70fa0cb25ebee04cedf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/12d1a73c1c063a416ba2a70fa0cb25ebee04cedf; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/12d1a73c1c063a416ba2a70fa0cb25ebee04cedf"; sha256 = "0wkrw8jwjwhk3zvrs883xhrwcrppg8j3plnvxb109d67k7c1pd1h"; }; "12d213957fbfe643a97d5072b1f6ae30aeebcbb7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/12d213957fbfe643a97d5072b1f6ae30aeebcbb7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/12d213957fbfe643a97d5072b1f6ae30aeebcbb7"; sha256 = "0p4pzcn3fmqnkz93wk023zzs1f12c1xpsx7fkz2hv8i4jm8mrkb4"; }; "12eb0444499ce41f101b1b5f9dd6b87894949511" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/12eb0444499ce41f101b1b5f9dd6b87894949511; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/12eb0444499ce41f101b1b5f9dd6b87894949511"; sha256 = "19nggqdvkq6rap0sqnpkyrwsc882dzy1cg2lbsbd88s2nn6lrc3q"; }; "131d64c4948a0370d99897b2ad5a968b160e4300" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/131d64c4948a0370d99897b2ad5a968b160e4300; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/131d64c4948a0370d99897b2ad5a968b160e4300"; sha256 = "1g0wf836rpmy7g291wyf0xwyr8g196cb0val8lzg5pa5qxivpr1g"; }; "132e734bba8f24cfaecbe6e03b85b76158a57d1f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/132e734bba8f24cfaecbe6e03b85b76158a57d1f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/132e734bba8f24cfaecbe6e03b85b76158a57d1f"; sha256 = "0g7qw0y8006hmmfpmrz80628l35380960j54iqrp88jbqlqsd1p9"; }; "139f335e517878be52106907638e80140951abaa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/139f335e517878be52106907638e80140951abaa; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/139f335e517878be52106907638e80140951abaa"; sha256 = "1xdwmml0i40dvdi148fzk7xp0wcpx4vfp488159xl09p88ad9zk3"; }; "13b3c6250566821e05b35dd3296b5686aae3f325" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/13b3c6250566821e05b35dd3296b5686aae3f325; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/13b3c6250566821e05b35dd3296b5686aae3f325"; sha256 = "0dcis8x0fpq6k33bxfhnh0j0bywr084l8nla6jkx6pfvwirq06cy"; }; "13c7b27a977c4bf9c4e07a19ffb106c1128995bd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/13c7b27a977c4bf9c4e07a19ffb106c1128995bd; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/13c7b27a977c4bf9c4e07a19ffb106c1128995bd"; sha256 = "1387mczy66xavzg995734s7vg45nn895pm3pp8n2yrgzhd1qfzjz"; }; "13f0a72b4826430335caa709e76f92079ca53b13" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/13f0a72b4826430335caa709e76f92079ca53b13; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/13f0a72b4826430335caa709e76f92079ca53b13"; sha256 = "1w7wbwifr9896ndbmpxmx85md5hb1v8amd8paryn8jb573hjl28d"; }; "1411432bb3fedd8dc4b429d4f6929746ef0e0a2e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2622402-86d1483fa60742b6be9fd5a0b0b946e0/1411432bb3fedd8dc4b429d4f6929746ef0e0a2e; + url = "http://cdn.unrealengine.com/dependencies/2622402-86d1483fa60742b6be9fd5a0b0b946e0/1411432bb3fedd8dc4b429d4f6929746ef0e0a2e"; sha256 = "07586dvm3qmccm5i0894lwcc8zfjx95c8vvdp619vip6xg825g5x"; }; "142674e220c8509ae1f8b001af30a95d6b08951c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/142674e220c8509ae1f8b001af30a95d6b08951c; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/142674e220c8509ae1f8b001af30a95d6b08951c"; sha256 = "0bzlrpir8fw10360kzi422zbhaal8sqdpl77qx3fk3gxhvj26r2h"; }; "145ca8052bc6fccd7bf7af21f36664fc217f2f70" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/145ca8052bc6fccd7bf7af21f36664fc217f2f70; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/145ca8052bc6fccd7bf7af21f36664fc217f2f70"; sha256 = "1ip6wspykfvmxidbwfhflfzbcnqzfmmmhgax5nxg5pla2yn71kdk"; }; "1463ec95f086a9205c1ab27df290f232964381a3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1463ec95f086a9205c1ab27df290f232964381a3; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1463ec95f086a9205c1ab27df290f232964381a3"; sha256 = "186vk4bdmrd6ggyxz2db5713i3zkqzph0lyr3aivgj0a4ha8gfkn"; }; "1467cb6b7644671f3127567be26cf07d20b6da7e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/1467cb6b7644671f3127567be26cf07d20b6da7e; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/1467cb6b7644671f3127567be26cf07d20b6da7e"; sha256 = "0laxdgvsskc4gzbfnbal80ab7pd81v31qg8rcp9pjw1np5zpb63j"; }; "146b3768fb0d7880b8c751140d38a1177906de0f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/146b3768fb0d7880b8c751140d38a1177906de0f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/146b3768fb0d7880b8c751140d38a1177906de0f"; sha256 = "15v9nwb7m1746zrwfrgfgf8va5x88by8chsa3ivgraa5j6if1px4"; }; "1471837617ec5898ca2e49cf20ad5e0795687b7b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/1471837617ec5898ca2e49cf20ad5e0795687b7b; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/1471837617ec5898ca2e49cf20ad5e0795687b7b"; sha256 = "0gycs7mhhq9y3c5dd014ggbbg3609kds5vzj3v45kkydkylqm0l2"; }; "148131344e6fe6a2249ce840916527aca52dbc35" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/148131344e6fe6a2249ce840916527aca52dbc35; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/148131344e6fe6a2249ce840916527aca52dbc35"; sha256 = "0y5h5v8vlr8jr8yyy529yrjg5rw75jpxz4fa7jmbpr6syai2bdwx"; }; "149605f77f4487d4f238f2439c46df83708b08f8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/149605f77f4487d4f238f2439c46df83708b08f8; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/149605f77f4487d4f238f2439c46df83708b08f8"; sha256 = "04rqssi1ndhgps7wsq1zxd2sk5p6michbfn1hi9g072gc0qp5c8a"; }; "14b7da233b40c5199352d0ad87f5c2ef529fbfc2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/14b7da233b40c5199352d0ad87f5c2ef529fbfc2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/14b7da233b40c5199352d0ad87f5c2ef529fbfc2"; sha256 = "1akz1k4wh5hz1w8zd6hvkmvc6w6hadw2psrr4rwpvdnkvhmnh3yh"; }; "14d50f80e32417f2f524ef471610a343fd6eb8b3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/14d50f80e32417f2f524ef471610a343fd6eb8b3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/14d50f80e32417f2f524ef471610a343fd6eb8b3"; sha256 = "18db45x0zfwxd9v0x1jmid7lklp3ib565d98sqjzbyzfvmq8q6f3"; }; "15299d434cd85410167be0405f54ccdeeaa3f831" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/15299d434cd85410167be0405f54ccdeeaa3f831; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/15299d434cd85410167be0405f54ccdeeaa3f831"; sha256 = "0ivkh9ysa6nx4dw5bgqb00nynjzbn9gb1ihj43nccxskj0rynz7a"; }; "154306df1d2a4877cbc22db8224277c856f1b6b2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/154306df1d2a4877cbc22db8224277c856f1b6b2; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/154306df1d2a4877cbc22db8224277c856f1b6b2"; sha256 = "0jys95p7vg6gjxsphg1widz471ap8hw3y4vz1msw85clkgxh9szl"; }; "1567a031ece4d70d2c360767b32f084b40eeef63" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1567a031ece4d70d2c360767b32f084b40eeef63; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1567a031ece4d70d2c360767b32f084b40eeef63"; sha256 = "04gzs1apaimrmkgsc76qlccqh4z7y7d221fxfaszdlvjaz9k7njs"; }; "157c6388b0a3c7a95bc29c5ae0f8e920a39dd7dc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/157c6388b0a3c7a95bc29c5ae0f8e920a39dd7dc; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/157c6388b0a3c7a95bc29c5ae0f8e920a39dd7dc"; sha256 = "10sx2ac6w30jbf40l8gixwv8zx4rkdpi5n8a0nfgbpay72rymi2k"; }; "15a502cd7ed28b9a7f8bb3e95ed15009b0e9a29e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/15a502cd7ed28b9a7f8bb3e95ed15009b0e9a29e; + url = "http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/15a502cd7ed28b9a7f8bb3e95ed15009b0e9a29e"; sha256 = "14zkdf9f592y3ivk49by1dpydv9rrpzggwm5997ykxz7ws04i1lp"; }; "15a50c3fc6a68c2b5fc5d130da66af83529e7ed2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2709658-e5f367f730d84b618e9cbc16aceb91ca/15a50c3fc6a68c2b5fc5d130da66af83529e7ed2; + url = "http://cdn.unrealengine.com/dependencies/2709658-e5f367f730d84b618e9cbc16aceb91ca/15a50c3fc6a68c2b5fc5d130da66af83529e7ed2"; sha256 = "00021z0mfhlx9pkfn04cv07k4xlzywj4nd19mydqppm9r0vw5fwy"; }; "15eddf9d2c822c3f5a608ff772c24ca1c2928c60" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/15eddf9d2c822c3f5a608ff772c24ca1c2928c60; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/15eddf9d2c822c3f5a608ff772c24ca1c2928c60"; sha256 = "0jnslw7j2msim71pgjv2w8jd2xq48ipjw0iryw9i8vibgb30ri90"; }; "160a1829963e541ea0fc69e090047543f0c547a2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/160a1829963e541ea0fc69e090047543f0c547a2; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/160a1829963e541ea0fc69e090047543f0c547a2"; sha256 = "0lshw7xhf4z4jzanbrr6q8hmq8xir8w9syl6akfbpjdc25yab0jy"; }; "1623d3a181ce7eddf10a90c3c235075fe55bca69" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/1623d3a181ce7eddf10a90c3c235075fe55bca69; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/1623d3a181ce7eddf10a90c3c235075fe55bca69"; sha256 = "0r8plai0830ywnqpmrikzr7y1hw34qbfgiigagrr04z97g775l4k"; }; "1627ab02a99a1389c8f3330ff31a92d4994ef631" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/1627ab02a99a1389c8f3330ff31a92d4994ef631; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/1627ab02a99a1389c8f3330ff31a92d4994ef631"; sha256 = "042si54d7qxziwy6d23fqkcdifqjpqf8j1gs9s5w2csaqy1bjyvl"; }; "162be3e52c290eda8052be126f9b1b9f19a5e182" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/162be3e52c290eda8052be126f9b1b9f19a5e182; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/162be3e52c290eda8052be126f9b1b9f19a5e182"; sha256 = "01g1bj3sld338a22ian9f0mnim418l6j3n7zy23sk6a5qip4h726"; }; "16311b83711df9620e3ea0adad878eb4547e2dc8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/16311b83711df9620e3ea0adad878eb4547e2dc8; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/16311b83711df9620e3ea0adad878eb4547e2dc8"; sha256 = "084iaizc503s24cmximifd4gadlksslras2dv4l46ngik7mmwkzw"; }; "163784cb855cf579aa85c8d84241ac308c31d9c6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/163784cb855cf579aa85c8d84241ac308c31d9c6; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/163784cb855cf579aa85c8d84241ac308c31d9c6"; sha256 = "185fjh744ynh1s45z7ikyhw0mml2vwfa2db4byv8zv122x10844h"; }; "1679ff7ab2527671a6c79835501cd4447f769d26" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1679ff7ab2527671a6c79835501cd4447f769d26; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1679ff7ab2527671a6c79835501cd4447f769d26"; sha256 = "1rdlg3y9ihvhi2lf1isabj58y6f8lj24x6yb4xh9jqm8fgdjbn5x"; }; "167a3b509221baa789dd8c568b74ddcaf7c4a7c5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/167a3b509221baa789dd8c568b74ddcaf7c4a7c5; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/167a3b509221baa789dd8c568b74ddcaf7c4a7c5"; sha256 = "143g5h823i5pcbqb30419i1k6mq2s3mhmcgcfn8v0jm83lwar4i9"; }; "16e421c9204b08586edd8de93b93b19fb10644ea" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/16e421c9204b08586edd8de93b93b19fb10644ea; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/16e421c9204b08586edd8de93b93b19fb10644ea"; sha256 = "0b9ki8rj1xmy9zaa52d3zbq7jk95mjv8b17qyb0zrpirl51g46gg"; }; "16ff1b3c00e3fef8b809b49a5b63be510b23dc97" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/16ff1b3c00e3fef8b809b49a5b63be510b23dc97; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/16ff1b3c00e3fef8b809b49a5b63be510b23dc97"; sha256 = "1fa3b7wri025cgjkd4f4v7pmi13qkza4i1f9zpmcpwfiwvvi8dgx"; }; "17a98e6cd0892c88290f9dd9e9cb3fde84e8798f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/17a98e6cd0892c88290f9dd9e9cb3fde84e8798f; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/17a98e6cd0892c88290f9dd9e9cb3fde84e8798f"; sha256 = "0yhrwdwjn7fszj38ihq9cac1gk44xinnrh506rglmcw81iwz4j39"; }; "17b2ed6bd21c462973aa928a668bafd1f8ebcfbb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/17b2ed6bd21c462973aa928a668bafd1f8ebcfbb; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/17b2ed6bd21c462973aa928a668bafd1f8ebcfbb"; sha256 = "1pw6irhilhicr1xkxf5pvv1ylkckxr8180nvsdnfigrzyk5732sc"; }; "17f24542b619ed66aa29fe28eb716b4dd4c33d84" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/17f24542b619ed66aa29fe28eb716b4dd4c33d84; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/17f24542b619ed66aa29fe28eb716b4dd4c33d84"; sha256 = "15ssnahf78zv5is9n69cd4hyn55iij0zcdqzg446bzpslpd2y1vr"; }; "1802e0cd4e93677f9da0d094475296d070a0a167" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1802e0cd4e93677f9da0d094475296d070a0a167; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1802e0cd4e93677f9da0d094475296d070a0a167"; sha256 = "195dqkx2pwmymd6agn5k72rs6plp6nvap7gk7h5wk9yip51lkmh4"; }; "1819e4a555e0b22457eb52ec088f2d106697434b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1819e4a555e0b22457eb52ec088f2d106697434b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1819e4a555e0b22457eb52ec088f2d106697434b"; sha256 = "1pmz470s77fsl1d2sqf2kdspb8k08xw6hw3f3y1wk9w3w10mcqfd"; }; "184edcd2f9fc791ab8f0ecbb980e124e1622311d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/184edcd2f9fc791ab8f0ecbb980e124e1622311d; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/184edcd2f9fc791ab8f0ecbb980e124e1622311d"; sha256 = "0zcc4qhgzg56hayaiqxjp63bxa0jkf8ws95kfm9x3b4va4qzg907"; }; "185535353a9576cb4f9e4a7fa3c1fe649d00f26b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/185535353a9576cb4f9e4a7fa3c1fe649d00f26b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/185535353a9576cb4f9e4a7fa3c1fe649d00f26b"; sha256 = "0llsp8z8av08d6dp442abpp4pwvc7l5flh9nd29q7l156dxz5nq9"; }; "185908a865ebe7f6ee31701211aad217de343c7f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/185908a865ebe7f6ee31701211aad217de343c7f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/185908a865ebe7f6ee31701211aad217de343c7f"; sha256 = "1xmi888fc5hwcvgyw73g6f7gwwhwpybi8sl41dbrj5pjcvrj2clg"; }; "187cc49caa5b9c37b965dc6d5ae486c963873c47" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/187cc49caa5b9c37b965dc6d5ae486c963873c47; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/187cc49caa5b9c37b965dc6d5ae486c963873c47"; sha256 = "1ghn25c2pxibw2wnr5c7wyk8hfdvchm27bqncnxi0vby0bwdis6n"; }; "18943d114a03b9994e64f86843cbfbea2c18fc60" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/18943d114a03b9994e64f86843cbfbea2c18fc60; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/18943d114a03b9994e64f86843cbfbea2c18fc60"; sha256 = "00dgywg4p8502rm5b8ykm5xqfb8i98nqip3z96vpbwqlqllxz2fq"; }; "18d1e1adb711eb56d874c79f49ae68b3e26fb044" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/18d1e1adb711eb56d874c79f49ae68b3e26fb044; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/18d1e1adb711eb56d874c79f49ae68b3e26fb044"; sha256 = "1zmdhkcbb8bsciycigj8x7ijc7wxcg5hj21588jimfl4i48zqw78"; }; "1916cbea932d8ec4cbe73743294b2456b6f82f4d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1916cbea932d8ec4cbe73743294b2456b6f82f4d; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1916cbea932d8ec4cbe73743294b2456b6f82f4d"; sha256 = "1a0dqqqmk6aj2j90qgf6qz91i37azisqjbrr9srxs42x8q8mhx2s"; }; "1919f737357402ffd6035ef99089bf4492ef39ce" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1919f737357402ffd6035ef99089bf4492ef39ce; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1919f737357402ffd6035ef99089bf4492ef39ce"; sha256 = "1qnry1aa0hhi4cr279293y35ywl57llrkdgrmhpwi6cvamyfpyrb"; }; "196a7cd92cd85833aa987ab46cc84abad637e671" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/196a7cd92cd85833aa987ab46cc84abad637e671; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/196a7cd92cd85833aa987ab46cc84abad637e671"; sha256 = "1xfbv83r1920v5lv4fpklmv21mmhfykkrfar0cm0yky3nyl93wi3"; }; "19bf552b5636cd53f93b288b3393447e0a9fa015" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/19bf552b5636cd53f93b288b3393447e0a9fa015; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/19bf552b5636cd53f93b288b3393447e0a9fa015"; sha256 = "02cxv7wmy2frhl6kc93y8r98ccpq9cdjji5pdyxniwmwjvnbd152"; }; "19c8ede828d4e84d3023a8cad20c4118e92c51f6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/19c8ede828d4e84d3023a8cad20c4118e92c51f6; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/19c8ede828d4e84d3023a8cad20c4118e92c51f6"; sha256 = "1br3pqv9fwrfcrxmxai88qa0wbi56ik5v66x4pzwp2k20ihahmny"; }; "19eb01d07ed61f10eba97cb487040edf44235d88" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/19eb01d07ed61f10eba97cb487040edf44235d88; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/19eb01d07ed61f10eba97cb487040edf44235d88"; sha256 = "13pyc8jpln5a5d3nxbbgjkqrl8v3vngg0lzsgkjaf0ddk6jr0vjv"; }; "1a2a4f3777f219966c172ba8de9cb16dc214645a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1a2a4f3777f219966c172ba8de9cb16dc214645a; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1a2a4f3777f219966c172ba8de9cb16dc214645a"; sha256 = "0ghw873w98wx4xv0qwfqa0yshfyf6l58yymf64yw5gignay2jzf1"; }; "1a42be4a1a8f42a72c27e99abb9741fb826a99e9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1a42be4a1a8f42a72c27e99abb9741fb826a99e9; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1a42be4a1a8f42a72c27e99abb9741fb826a99e9"; sha256 = "15ph4vwd1r4gcv25ib0y93jvcxd4nihs32c5j1f5jvr8xgrgrn7f"; }; "1a546bb1c6ba2765dbc10b34126650d033464bf8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1a546bb1c6ba2765dbc10b34126650d033464bf8; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1a546bb1c6ba2765dbc10b34126650d033464bf8"; sha256 = "089h0npcbvxh3nisns5p4ld9pfyk18f16gm9zf90jjcq4r528dqh"; }; "1a5ecbad3eddb57b522f4873840b8a716d98b2b9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1a5ecbad3eddb57b522f4873840b8a716d98b2b9; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1a5ecbad3eddb57b522f4873840b8a716d98b2b9"; sha256 = "04yfwjcj5w7iwyghhzbqfj4vymy9lfvc9ncxk9z0ll75f2sf0kil"; }; "1a81e6c5fd4cc760a6589fa20070d26a9cb6e53a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/1a81e6c5fd4cc760a6589fa20070d26a9cb6e53a; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/1a81e6c5fd4cc760a6589fa20070d26a9cb6e53a"; sha256 = "0gyx0sq7k9cilcbcl2z49icf5jbknc1qcix2156nar2f8v5mqxmz"; }; "1aad9a745382e917c890acd98a988a1536087fe2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/1aad9a745382e917c890acd98a988a1536087fe2; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/1aad9a745382e917c890acd98a988a1536087fe2"; sha256 = "1hjxm0jz4bwllb08ix354i6cy78dy9vwklw9rpspdxqqkis8jxs9"; }; "1acfcb65de4dc96785b1705ca6c0029e5e4cea95" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1acfcb65de4dc96785b1705ca6c0029e5e4cea95; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1acfcb65de4dc96785b1705ca6c0029e5e4cea95"; sha256 = "169xwg1jrwclx20qyci8az8rffmfn22z1x2zvib9dsmi3451mk3i"; }; "1af0a9938323c32bfd00373e1eeec3f0eb7267f4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1af0a9938323c32bfd00373e1eeec3f0eb7267f4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1af0a9938323c32bfd00373e1eeec3f0eb7267f4"; sha256 = "1a70ajr3s1msvsmyjmyg6vq8jh8ba5xc1f0k2afjycj3vzjrlgmr"; }; "1af8c3dcef0a363b208600f3db2ab066d1c407b0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738476-1eae05647f894f068d67ed64f86505f8/1af8c3dcef0a363b208600f3db2ab066d1c407b0; + url = "http://cdn.unrealengine.com/dependencies/2738476-1eae05647f894f068d67ed64f86505f8/1af8c3dcef0a363b208600f3db2ab066d1c407b0"; sha256 = "13q98b90nhzqm9mz24nhdahz1i1gvja5gkab5p5mxsqbkm15r6vn"; }; "1b6ac4ad1dd42a8d52a6cb4a24b64cd86c92cc83" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1b6ac4ad1dd42a8d52a6cb4a24b64cd86c92cc83; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1b6ac4ad1dd42a8d52a6cb4a24b64cd86c92cc83"; sha256 = "03nfc20m6av56gqsg20h2jzc28crmvxs8ychxg0k7cmx7bzz1r23"; }; "1b6e2211b6ef64b74fd226f74bb7fdf14f384868" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/1b6e2211b6ef64b74fd226f74bb7fdf14f384868; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/1b6e2211b6ef64b74fd226f74bb7fdf14f384868"; sha256 = "0fnzj5qxrmgc1mly6my307g9if6mr3pq8mnsdhz7sdpglvqx9745"; }; "1b929d889ec58a690a9fb4fe5c7e74eb60c339a5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1b929d889ec58a690a9fb4fe5c7e74eb60c339a5; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1b929d889ec58a690a9fb4fe5c7e74eb60c339a5"; sha256 = "1mrvhvp5r3mhq490w4ymjdf4f7ymp56ic8waxdd6ms8xgkrq9cpa"; }; "1bc440e5f448e7dec6f97dbb519814d6c4b17b0e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1bc440e5f448e7dec6f97dbb519814d6c4b17b0e; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1bc440e5f448e7dec6f97dbb519814d6c4b17b0e"; sha256 = "1vriwq47ck2inw22jl3vy4hn82sphlkdp22jzsxl9wg1bjkp7phf"; }; "1be30bac2f567e402ae48b89e8355a4b4e609b8a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621166-706a1811c2684ac5bae65fafa17839c2/1be30bac2f567e402ae48b89e8355a4b4e609b8a; + url = "http://cdn.unrealengine.com/dependencies/2621166-706a1811c2684ac5bae65fafa17839c2/1be30bac2f567e402ae48b89e8355a4b4e609b8a"; sha256 = "145nr5766qs6nhakskrh03b13m650n499q3q1pcj2yzb8qcmr8ml"; }; "1bfd97f204592ed48706e423bb6ab7a6128cad7d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1bfd97f204592ed48706e423bb6ab7a6128cad7d; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1bfd97f204592ed48706e423bb6ab7a6128cad7d"; sha256 = "1702mbcd7a2y4hsqmqy7cdr23h628f31spyj6wyajrixqb0xgr24"; }; "1c70d51c5e2d2a9ebdb87dc176b3cbe48c275309" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621163-719903f8599f48949652ccefc2a2d5be/1c70d51c5e2d2a9ebdb87dc176b3cbe48c275309; + url = "http://cdn.unrealengine.com/dependencies/2621163-719903f8599f48949652ccefc2a2d5be/1c70d51c5e2d2a9ebdb87dc176b3cbe48c275309"; sha256 = "0rzwsxpr3bwsgfpwci3mmy9wvwjkf1p6jam19rnnqz1h88w7ijxx"; }; "1c803eb30ed3570e150cffbce8729d1cc54e8fc3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/1c803eb30ed3570e150cffbce8729d1cc54e8fc3; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/1c803eb30ed3570e150cffbce8729d1cc54e8fc3"; sha256 = "0p9iyll322a8cfdy0h1briv01hxw0iafbq43w5k7sy8kysv5ffl0"; }; "1c8d955be9265f85641ccaa5c0c9abacc66115f7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1c8d955be9265f85641ccaa5c0c9abacc66115f7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1c8d955be9265f85641ccaa5c0c9abacc66115f7"; sha256 = "0x7f04mypvy01v78xqjf2q9psw5f0fhhyyf2q4hww70s23xl3j2s"; }; "1cbf6a11e17024243825f5ea454051bf5b1e7d3f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1cbf6a11e17024243825f5ea454051bf5b1e7d3f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1cbf6a11e17024243825f5ea454051bf5b1e7d3f"; sha256 = "0xhgb9grcd2nca9yn495n5d0c0higjqcglhc2ra5kp57fsqmf9vx"; }; "1ce933b4731d07d18548a668fca861035354bbf2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1ce933b4731d07d18548a668fca861035354bbf2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1ce933b4731d07d18548a668fca861035354bbf2"; sha256 = "1bww5rid4w5zjn40701x1509qgn44wfhp9mz723axmdykp5ak6kc"; }; "1cf61777b0744f76064a8cb5a1d0bc1bb2d3165b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1cf61777b0744f76064a8cb5a1d0bc1bb2d3165b; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1cf61777b0744f76064a8cb5a1d0bc1bb2d3165b"; sha256 = "1x3jww0rzkrx2ybx85ncq0d4zwa60x6h05sjm4r0gps8vmjalnl9"; }; "1d09bb4f8ba502cef13de6d570839e6790bf3542" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1d09bb4f8ba502cef13de6d570839e6790bf3542; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1d09bb4f8ba502cef13de6d570839e6790bf3542"; sha256 = "1xfdfyf3pkazb1583qjgv6planywm5ajhqpjndhwn0wkim6lakmb"; }; "1d5c9571ce51f244f1e0158e0cd49bd36f16bfc5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/1d5c9571ce51f244f1e0158e0cd49bd36f16bfc5; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/1d5c9571ce51f244f1e0158e0cd49bd36f16bfc5"; sha256 = "040f2qb2g7jf9hzc48xkszy5adbwnbxy22jmp8v6q9h9qkfvm7w4"; }; "1d81bb3fd4494d2d93359f0cbecd2e9e20e67a09" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2532063-ce5a2c068f9844c8bb5d0e603da092af/1d81bb3fd4494d2d93359f0cbecd2e9e20e67a09; + url = "http://cdn.unrealengine.com/dependencies/2532063-ce5a2c068f9844c8bb5d0e603da092af/1d81bb3fd4494d2d93359f0cbecd2e9e20e67a09"; sha256 = "16xman4991dvi5m50rmplp18xb89181261g5rczkjznkf7q2973a"; }; "1d82f1e693e8f317ca408dc5159b1a6afd317016" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1d82f1e693e8f317ca408dc5159b1a6afd317016; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1d82f1e693e8f317ca408dc5159b1a6afd317016"; sha256 = "1ng1h62id2a1h3kd9mhakbfr568wkm2whbn2lv2x4l1q3ahrw9ix"; }; "1dc7018f35ab6ebe2908608910fbaf9214506ecd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/1dc7018f35ab6ebe2908608910fbaf9214506ecd; + url = "http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/1dc7018f35ab6ebe2908608910fbaf9214506ecd"; sha256 = "118xrnwqmjfqndg3shn1iw90jnjvxbmr6y9ws0zrn4bas0bsn9bj"; }; "1e0c495e2e2fc0f9ab567761cfeec0d8659f6572" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1e0c495e2e2fc0f9ab567761cfeec0d8659f6572; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1e0c495e2e2fc0f9ab567761cfeec0d8659f6572"; sha256 = "0423h6jq38k03zcfrnh1kkz3dsplpyij4ysrqqyyagni3l0wpwad"; }; "1e8e90fc8fbee70866085a1fbd7ee5585941dc31" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/1e8e90fc8fbee70866085a1fbd7ee5585941dc31; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/1e8e90fc8fbee70866085a1fbd7ee5585941dc31"; sha256 = "1qdm6qkkmxxcml9bi121dvg36j55qzzzy7hslzg5ap8c65vcd00x"; }; "1ef5c21107774059ed6c5010dd2d5f3373c81445" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1ef5c21107774059ed6c5010dd2d5f3373c81445; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1ef5c21107774059ed6c5010dd2d5f3373c81445"; sha256 = "14lmgyagsk3sszh04w9r4gnyi99vhqkccy9408fypxs33l3g2n3a"; }; "1f10b8e0a3d6f6fdfe5b451508626eda10e3e771" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1f10b8e0a3d6f6fdfe5b451508626eda10e3e771; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1f10b8e0a3d6f6fdfe5b451508626eda10e3e771"; sha256 = "1plprfagzg8izyrr3dy5wnmlp0sm76kg0w36001j105accnqkn7l"; }; "1f3815ccc8afbd78900f57993ac9ee538ad3a776" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716370-1fe4be93d0274863a43a7797419557e3/1f3815ccc8afbd78900f57993ac9ee538ad3a776; + url = "http://cdn.unrealengine.com/dependencies/2716370-1fe4be93d0274863a43a7797419557e3/1f3815ccc8afbd78900f57993ac9ee538ad3a776"; sha256 = "11i9z6hzviapkp8llkn96m5nb9xmlkbxiv8196zkmqxp759a2917"; }; "1f8e075fc05cbc97e7fd21ab40e0ceeb595c741a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/1f8e075fc05cbc97e7fd21ab40e0ceeb595c741a; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/1f8e075fc05cbc97e7fd21ab40e0ceeb595c741a"; sha256 = "11g2rvmdj5dv5r2kfrw5ccmgl8cbkkhjmbaqpdmhiw306fd9fq5a"; }; "1fe2947f6b39cef244fd00698c7cb7adcee1d927" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1fe2947f6b39cef244fd00698c7cb7adcee1d927; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1fe2947f6b39cef244fd00698c7cb7adcee1d927"; sha256 = "0kviyyjr9hqnibzk36fxnbk7ad8fb2a7gf3hdmlb88jq3ymd4bm2"; }; "1ff18f725dd963421e618df72bf8a01bbb35d02b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/1ff18f725dd963421e618df72bf8a01bbb35d02b; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/1ff18f725dd963421e618df72bf8a01bbb35d02b"; sha256 = "1ki17xws01fvhk796f1qf7yshwgv1a9xnmg25iq2ikm47gjjx9bi"; }; "2061aaa6e57d72cbc697076a3bfff9ede7a0a405" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/2061aaa6e57d72cbc697076a3bfff9ede7a0a405; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/2061aaa6e57d72cbc697076a3bfff9ede7a0a405"; sha256 = "1siplly88g11327ync8771kzpbdc9g75645fai37rvawip526cln"; }; "2099a8b27bb01df580dca27c74682abb819d7424" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/2099a8b27bb01df580dca27c74682abb819d7424; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/2099a8b27bb01df580dca27c74682abb819d7424"; sha256 = "1jjcpc1nqk10xhk5y53qv0xwzh34wjcvn2cykjxn5g10n1vs5iqx"; }; "20b2c00511aaf3fb29dfe2ad61683427686bdb7e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/20b2c00511aaf3fb29dfe2ad61683427686bdb7e; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/20b2c00511aaf3fb29dfe2ad61683427686bdb7e"; sha256 = "1dkbivkv0vz5rdwaanjzvc47k1yczdgjb9w0qllxwrdgixacnbv4"; }; "20ce1ae8d2c0f8a6cc946c302b619dfa82a8d0be" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/20ce1ae8d2c0f8a6cc946c302b619dfa82a8d0be; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/20ce1ae8d2c0f8a6cc946c302b619dfa82a8d0be"; sha256 = "0jba3b03d4gb62a7zj758j856mgw5l16zw99xdcgp8qd17nwlksp"; }; "20f22f8b8176717ac951ccdc7e6f5f56806df59d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/20f22f8b8176717ac951ccdc7e6f5f56806df59d; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/20f22f8b8176717ac951ccdc7e6f5f56806df59d"; sha256 = "1fndrfy6azyh1ckzmq4261cs1mpq393abl1mc2k3cxgn67s4ymcn"; }; "211fe5f3ea5194f89c18a81f99259151734b4118" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/211fe5f3ea5194f89c18a81f99259151734b4118; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/211fe5f3ea5194f89c18a81f99259151734b4118"; sha256 = "121q1z4mj75vmcvbvyzb6i05xl8s7nkn700fd156z65g7ywn1dfd"; }; "2130d3a7a6cb4b7985001c43cece413b95605a04" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2130d3a7a6cb4b7985001c43cece413b95605a04; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2130d3a7a6cb4b7985001c43cece413b95605a04"; sha256 = "0bx84arn6w9iic3q5xwd9v20qlpgashanm12qwrxy9dpvixb6z0l"; }; "215f16be383b3e37f6ab866a94263c078729c9ef" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/215f16be383b3e37f6ab866a94263c078729c9ef; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/215f16be383b3e37f6ab866a94263c078729c9ef"; sha256 = "1k9dqr8ll66yp75mv2rx7if4zknrb02yb927xkwb2vvf8smy84x3"; }; "218b41b249f8b8cc60c48cdfe5f9f3139acec694" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605020-6cb4e3cef2f14bbc9f4e8bd763c3120d/218b41b249f8b8cc60c48cdfe5f9f3139acec694; + url = "http://cdn.unrealengine.com/dependencies/2605020-6cb4e3cef2f14bbc9f4e8bd763c3120d/218b41b249f8b8cc60c48cdfe5f9f3139acec694"; sha256 = "09iqnxhngdhsysdvlr05nvz261x7y320b66pgl3m5q5nm1b4vxc4"; }; "21907541d849646ca7b37552024a6bcbab11cce0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/21907541d849646ca7b37552024a6bcbab11cce0; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/21907541d849646ca7b37552024a6bcbab11cce0"; sha256 = "1dscgs1k5p0nsxkfhmwiw29vik2zs317gks9hb6hlkcl62852snl"; }; "219229e93fb1bf7a335603340498ba0d7dded08a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/219229e93fb1bf7a335603340498ba0d7dded08a; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/219229e93fb1bf7a335603340498ba0d7dded08a"; sha256 = "19wwpdx566x9bj3ygiyni23z7q2qdj9nxvzl9wb5nym3nfk75zq5"; }; "21fa784bbf679195e305e3c41f0638cd402f6834" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/21fa784bbf679195e305e3c41f0638cd402f6834; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/21fa784bbf679195e305e3c41f0638cd402f6834"; sha256 = "0iga4d8n471pvk1jfzkg0mvz37lp3b3908dmqfls0lvrqivyi68b"; }; "220e020f8e3d2a2de2da4e1a95e72d0a2efe26bd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/220e020f8e3d2a2de2da4e1a95e72d0a2efe26bd; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/220e020f8e3d2a2de2da4e1a95e72d0a2efe26bd"; sha256 = "0jiva87bjrriz0jyx153p6ddisckqam6wl7vzxlxwg9bhc9yadww"; }; "22118798b30814806475890a25dbd3082cf56d24" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/22118798b30814806475890a25dbd3082cf56d24; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/22118798b30814806475890a25dbd3082cf56d24"; sha256 = "1sdlqrj1k5adb1z19mjikbm8cdg12h2kvaprnh6pc4bhs9l8210b"; }; "222160b66bde04349f00f790676a49a8bd3f2aac" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/222160b66bde04349f00f790676a49a8bd3f2aac; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/222160b66bde04349f00f790676a49a8bd3f2aac"; sha256 = "0nyd9x389a3bk22kpgmispq6a62y8p5gbjbzdchcznvfjvbg8mdk"; }; "2265f48eeeda05a6393f1268fedaea74e5d989d4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/2265f48eeeda05a6393f1268fedaea74e5d989d4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/2265f48eeeda05a6393f1268fedaea74e5d989d4"; sha256 = "11wk6krf02vqza7mxxdfm22bl19dfsdb79fd23m56yq3i154z65b"; }; "22b3cc937fab3025d3abf8d725b2cb3b1d12ef3c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/22b3cc937fab3025d3abf8d725b2cb3b1d12ef3c; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/22b3cc937fab3025d3abf8d725b2cb3b1d12ef3c"; sha256 = "17blrcaa86q8my9b4c1gnp804w7csbrxw92pa5jcag1h68vb2dir"; }; "22c962e9607d75b5917d731e9a66bd74fd15f2a2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2458551-07195e4b171247cfbc0f6645046eda02/22c962e9607d75b5917d731e9a66bd74fd15f2a2; + url = "http://cdn.unrealengine.com/dependencies/2458551-07195e4b171247cfbc0f6645046eda02/22c962e9607d75b5917d731e9a66bd74fd15f2a2"; sha256 = "1vzg92pqixpi093rjb8mvnmxd94dplhwpwwm2wkip9asis0wamcb"; }; "22f8914859f73cc332699e1c40e17cd44d700b87" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2597566-6e859699948f4adda2592656e3924b32/22f8914859f73cc332699e1c40e17cd44d700b87; + url = "http://cdn.unrealengine.com/dependencies/2597566-6e859699948f4adda2592656e3924b32/22f8914859f73cc332699e1c40e17cd44d700b87"; sha256 = "019zcs7safk4pldr47v9qn710q4d5cw20v8i26frwwqimnjdgjka"; }; "232d603ed060bcff36c5d452ec42caf19d74ec9e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/232d603ed060bcff36c5d452ec42caf19d74ec9e; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/232d603ed060bcff36c5d452ec42caf19d74ec9e"; sha256 = "0y9jplgh3dcf6p3n6vsrs7shz60jj8kx8ccz8yldm9wy7sjqhkzj"; }; "232eab324de501a6a4db9e0af2922875e7b6303f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2597177-394deee1ae174b2db1462326aa83252a/232eab324de501a6a4db9e0af2922875e7b6303f; + url = "http://cdn.unrealengine.com/dependencies/2597177-394deee1ae174b2db1462326aa83252a/232eab324de501a6a4db9e0af2922875e7b6303f"; sha256 = "0dvnfwqnf1hwnbg3y0az2hc0zib18fizdska9w64xjni6zq3fy2y"; }; "2339c1d3bfb2db1621ef01225df981c1bcc32f49" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2339c1d3bfb2db1621ef01225df981c1bcc32f49; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2339c1d3bfb2db1621ef01225df981c1bcc32f49"; sha256 = "17wks3c6nz4qxlz6qwgnbp14v4wda2ss5b8mhdiisc6zhsn2sn4f"; }; "23563ae9b7815c9196c9ea7c27b2c1b78c2e3b77" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/23563ae9b7815c9196c9ea7c27b2c1b78c2e3b77; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/23563ae9b7815c9196c9ea7c27b2c1b78c2e3b77"; sha256 = "0v1pafnd21lss6pf6af5r3h5n3minzl45ckmxa1v4rmx3c3j8xnb"; }; "235cc68a11ea8011ea5ca0d1326a488fd48ee713" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/235cc68a11ea8011ea5ca0d1326a488fd48ee713; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/235cc68a11ea8011ea5ca0d1326a488fd48ee713"; sha256 = "0xcpafbrys5hkxqd76fx12cxjbf7i80b9206iz69hfprh0hsa2h6"; }; "236633a6e0745c5413ea190b0e07deb9e9b9d409" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/236633a6e0745c5413ea190b0e07deb9e9b9d409; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/236633a6e0745c5413ea190b0e07deb9e9b9d409"; sha256 = "0ffj6q65nwwpr67pah2h3nzkp7m549zzb47pkbxsk54d06b9q1lq"; }; "23b01ee08bbe595a4dcb1a72014151b82e5e76ff" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/23b01ee08bbe595a4dcb1a72014151b82e5e76ff; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/23b01ee08bbe595a4dcb1a72014151b82e5e76ff"; sha256 = "00fml6x864bvh4prq3bkpqn3q6ca4zwif7zxhnsx3ksia8kj9845"; }; "23cc3f11d38de5312fd5798024de0d232bbf2e68" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/23cc3f11d38de5312fd5798024de0d232bbf2e68; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/23cc3f11d38de5312fd5798024de0d232bbf2e68"; sha256 = "1w0nr2hvcl0h8fkivrxval1l2vw4546rh9vpkwhybfwjh2g06q1y"; }; "2408381821f1ad904404880379feec1a2eeb2ad4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/2408381821f1ad904404880379feec1a2eeb2ad4; + url = "http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/2408381821f1ad904404880379feec1a2eeb2ad4"; sha256 = "159g6gb74b6nrmi7rln4mpk1yj3kzsf6bppx53i2sa9wcp0vzqyv"; }; "249d8cdb69fcbdd5f0dfef3a752eb2b7daaf01f4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/249d8cdb69fcbdd5f0dfef3a752eb2b7daaf01f4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/249d8cdb69fcbdd5f0dfef3a752eb2b7daaf01f4"; sha256 = "1jgr54z0ic0gaby8zml5kj7iyx60v1spf4a1wqiqq61frbkm4qgr"; }; "24f19b36203cb12aa6892d2d4399df0a679189f7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/24f19b36203cb12aa6892d2d4399df0a679189f7; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/24f19b36203cb12aa6892d2d4399df0a679189f7"; sha256 = "0drx0nv2249nfdbmlhc24isigf0bxv2n0vyjr62hpddb6xjqikq2"; }; "252915e59bf956eba7b4eb84256f1eb9c08c16e6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/252915e59bf956eba7b4eb84256f1eb9c08c16e6; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/252915e59bf956eba7b4eb84256f1eb9c08c16e6"; sha256 = "0qkvmqhirgdq9wlv0zkkqqa1gl45bw3i19711vfv487n37d2acmf"; }; "254bdc731ce0a3bef83fa6dd6c76771cadefeab5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/254bdc731ce0a3bef83fa6dd6c76771cadefeab5; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/254bdc731ce0a3bef83fa6dd6c76771cadefeab5"; sha256 = "0pr4zh0kf2j52msqfwaailrgm5i091msf7s72nk9j5p4zjmcy4qw"; }; "2573361ce50bbcbed674e108ea4cbb055cd0f2ec" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2573361ce50bbcbed674e108ea4cbb055cd0f2ec; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2573361ce50bbcbed674e108ea4cbb055cd0f2ec"; sha256 = "1ms3v0avlbwf3p8g2zw9w5d90hmyf7ba5d3ya7w4mv9sc3a8h5v2"; }; "25a0a89eda2d7c97ae3a37ba14f151b4682617e9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/25a0a89eda2d7c97ae3a37ba14f151b4682617e9; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/25a0a89eda2d7c97ae3a37ba14f151b4682617e9"; sha256 = "1656qa6wxbw19kcihb0rl0ssyhrr7pklhflrbwz7f9nsanw6zjmf"; }; "25a1ae1b60746c8e36e21531648e67b4c330d30d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/25a1ae1b60746c8e36e21531648e67b4c330d30d; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/25a1ae1b60746c8e36e21531648e67b4c330d30d"; sha256 = "04wb1hkil0khgk7qsndar970wgky73f93ng3kgp4c9sgck46gkqz"; }; "25b04d770d7a50481f9276487a5ed9834119dabd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2602350-38e0d307a57a47baa00ee5f892c9ced6/25b04d770d7a50481f9276487a5ed9834119dabd; + url = "http://cdn.unrealengine.com/dependencies/2602350-38e0d307a57a47baa00ee5f892c9ced6/25b04d770d7a50481f9276487a5ed9834119dabd"; sha256 = "1pxvxdxjidk0qsxr0j04jsmjxbjz8havi7ngqfx9dfl6w9nxc0vn"; }; "25d67f4de95951cb969435a84594979cd05c4091" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/25d67f4de95951cb969435a84594979cd05c4091; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/25d67f4de95951cb969435a84594979cd05c4091"; sha256 = "0rjmj5395cbcg275yd47gmd8gjgq1nip77k8vy8nn4k2cqpn2rlh"; }; "260381a0277c560f8c2006d8bfd4f7069cd5640d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/260381a0277c560f8c2006d8bfd4f7069cd5640d; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/260381a0277c560f8c2006d8bfd4f7069cd5640d"; sha256 = "03v2nzwhbb0f728qyd60l68w2nvpadfz8sppzr3y1zbz75rd2k3r"; }; "2616e3cfebab7a82dd81c3bfee37a62f3317e357" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2616e3cfebab7a82dd81c3bfee37a62f3317e357; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2616e3cfebab7a82dd81c3bfee37a62f3317e357"; sha256 = "1m01ldgxq49rpr4bvrqppkfk9l8ajrw0401704hgnz06xs3sczql"; }; "26407337ede0c844ad2b9b9e4eec2286431b0fc9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/26407337ede0c844ad2b9b9e4eec2286431b0fc9; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/26407337ede0c844ad2b9b9e4eec2286431b0fc9"; sha256 = "0kwhdyyg2wqy9z0x9v4rprvy84a1l65777fp9nlq5kqmkhl5qhaa"; }; "267f7ab24d96a8949db4cbc89f50cb9aa755e5e7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/267f7ab24d96a8949db4cbc89f50cb9aa755e5e7; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/267f7ab24d96a8949db4cbc89f50cb9aa755e5e7"; sha256 = "1m26i9cxxy8dbfgnmcpar7a19jr7kz57nxqnim3vbkycvfj0i75q"; }; "269c797991f91dddf54acd99a214152e8f155f8f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/269c797991f91dddf54acd99a214152e8f155f8f; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/269c797991f91dddf54acd99a214152e8f155f8f"; sha256 = "0k61nipciisz9q6riyd08n7zi78nnm5b454zg4rnpv4fxkxwrmkh"; }; "27098f36979ec3e79f5f7d7145dae3cfedf9b0a9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/27098f36979ec3e79f5f7d7145dae3cfedf9b0a9; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/27098f36979ec3e79f5f7d7145dae3cfedf9b0a9"; sha256 = "0ygswmzmb89m4mpl2zansjppn1r83dkwxg5r68ssk4isrr8dha8m"; }; "279afe349fb3fbd2a845d8f650df0bf1dbb73c45" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/279afe349fb3fbd2a845d8f650df0bf1dbb73c45; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/279afe349fb3fbd2a845d8f650df0bf1dbb73c45"; sha256 = "1rcww7wpbygq82zlpnh6gh79yw9w7rb7zjlx9dpdkys3v81rkzr0"; }; "27ab355d7817d1ffb8eb77e96879aab84b9ad7de" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2599004-dd46a4b56e3e4811a26bcf6c9cddf877/27ab355d7817d1ffb8eb77e96879aab84b9ad7de; + url = "http://cdn.unrealengine.com/dependencies/2599004-dd46a4b56e3e4811a26bcf6c9cddf877/27ab355d7817d1ffb8eb77e96879aab84b9ad7de"; sha256 = "104zskbv7ii90incdrl8gwqx60bgfghyl8si1rmnvch2ppnb9cmx"; }; "27e4175b9bbb4b175f9daaa9a824638a178a6d76" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2393838-48fca459a31f4f83a05d71c733f01d7a/27e4175b9bbb4b175f9daaa9a824638a178a6d76; + url = "http://cdn.unrealengine.com/dependencies/2393838-48fca459a31f4f83a05d71c733f01d7a/27e4175b9bbb4b175f9daaa9a824638a178a6d76"; sha256 = "0845rjmqick7mmymkprd4bjpszldxrqcgg56kndy4x0qrmdmh5lc"; }; "2827f79a76e04e6ba05b6cd3cc73e4dfce1ca961" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/2827f79a76e04e6ba05b6cd3cc73e4dfce1ca961; + url = "http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/2827f79a76e04e6ba05b6cd3cc73e4dfce1ca961"; sha256 = "18y83fxfr8r6fya771s8wn3fpwd0f0kpdd3bvnr5f0dqqqa84g1d"; }; "28438bc19c11df6c698e30491b3413fed60b2f0e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/28438bc19c11df6c698e30491b3413fed60b2f0e; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/28438bc19c11df6c698e30491b3413fed60b2f0e"; sha256 = "0vp18h36h5wdy17a31mwl2mf049kk2mkg09ldjidn25qfd4cdjm4"; }; "28783f63ac21ccc8c6ba68949502795e3a63f569" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/28783f63ac21ccc8c6ba68949502795e3a63f569; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/28783f63ac21ccc8c6ba68949502795e3a63f569"; sha256 = "19cd3p7gsd9ka8gmpzrabcya7pzmsmmjr3djmvj5nmraf4qxprd1"; }; "288cc5ec4da8903ba6077e259a8d9f1a0e5360c5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/288cc5ec4da8903ba6077e259a8d9f1a0e5360c5; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/288cc5ec4da8903ba6077e259a8d9f1a0e5360c5"; sha256 = "0ypv6mj46hibaa5hbi1i8a44gjmbp1y7qlvk4xywrqsj9fiadjyj"; }; "288d0122b6bf19ad09a81fb7a631a19113ae96f1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/288d0122b6bf19ad09a81fb7a631a19113ae96f1; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/288d0122b6bf19ad09a81fb7a631a19113ae96f1"; sha256 = "0araqg4vmbmpfbda1m1pj7b62rh1nd8pqs3smha0jpmfx1gj75xb"; }; "28926b6102371746bf5dd7c493c2353392ba76f7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/28926b6102371746bf5dd7c493c2353392ba76f7; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/28926b6102371746bf5dd7c493c2353392ba76f7"; sha256 = "0b24j3l4ln2rjkc6bfczdyzpgzmc0kbai26di8afz2lsklsmpjdn"; }; "289a1b921105ce48ba09d95a245cd2daa77b05bb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/289a1b921105ce48ba09d95a245cd2daa77b05bb; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/289a1b921105ce48ba09d95a245cd2daa77b05bb"; sha256 = "0p903d63x9zxqlfs23c48v52gmvja3p71z8bcc2qbryrcv7w50bl"; }; "289c460fd7eac93f2aa4548c3c805ce6f69f32ce" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/289c460fd7eac93f2aa4548c3c805ce6f69f32ce; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/289c460fd7eac93f2aa4548c3c805ce6f69f32ce"; sha256 = "123pwgcmmyv03b1i9i6q6ks457hsipwbkvap8jfjvn2rppy4cr1b"; }; "28a656853baebf8714c795ebceb8ac04f687f67f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/28a656853baebf8714c795ebceb8ac04f687f67f; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/28a656853baebf8714c795ebceb8ac04f687f67f"; sha256 = "0g4w1nkwi27mbh523511qwsdpjzi5lz9awcaha94031krjayfn69"; }; "28f2170447e86afc17f7c14affde7f2dd410c256" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/28f2170447e86afc17f7c14affde7f2dd410c256; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/28f2170447e86afc17f7c14affde7f2dd410c256"; sha256 = "07y161rsf1j7s6pna2nsjm9jvzr9ai8i5hxwxd2q64labz0403z5"; }; "28f89206861167b3d68bb1c6d131985c152b757d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/28f89206861167b3d68bb1c6d131985c152b757d; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/28f89206861167b3d68bb1c6d131985c152b757d"; sha256 = "0rfkf21snlq5rsq39sfz9ala1qf4d85ns9qfy9k8sf274sr0z1sh"; }; "2914f32cdeac7870819661e0fe54b4833a9962c0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2914f32cdeac7870819661e0fe54b4833a9962c0; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2914f32cdeac7870819661e0fe54b4833a9962c0"; sha256 = "1rkl3b1j864x9j1rbw7h7hhnhdb9m4r7b17py9kqvy6mfhacjanr"; }; "292a8fbb5a1aff92533e52ded470f85af5ffd6c4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/292a8fbb5a1aff92533e52ded470f85af5ffd6c4; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/292a8fbb5a1aff92533e52ded470f85af5ffd6c4"; sha256 = "0flbsvx3d2x5qlxfj5fk9nsd6b2x9nn8mx65dqlwws2pvkw6ah8s"; }; "2944a0052b881a644f04844186daa4ae54aad523" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2944a0052b881a644f04844186daa4ae54aad523; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2944a0052b881a644f04844186daa4ae54aad523"; sha256 = "1fzmcs75y6q3fmlldrp6yk10bfw7vxmlg2swz995i9ry1avmjmq1"; }; "295f41723355e152d24716ed3125507d5155eccc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/295f41723355e152d24716ed3125507d5155eccc; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/295f41723355e152d24716ed3125507d5155eccc"; sha256 = "1gzxs53jhaskdwkiqw5kxvhfh02b9vcyql1v1kzii23f3vv1kvx3"; }; "29681ec614276ed188ccfff2342d818c3503f114" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/29681ec614276ed188ccfff2342d818c3503f114; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/29681ec614276ed188ccfff2342d818c3503f114"; sha256 = "1f10r2iv2xq3zcl4bpcapzab9rkfscpxm83g23hszbp8yjs2bvi8"; }; "29ba225936b8addec463e591b235407a300ecaca" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/29ba225936b8addec463e591b235407a300ecaca; + url = "http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/29ba225936b8addec463e591b235407a300ecaca"; sha256 = "1rvhh8hxxy6dv23m8qhn1bvy409szfxj7yz73dv6bzj4kf8xhm05"; }; "29eae01c452b3ae340b64ad4266ea1152b4e6729" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/29eae01c452b3ae340b64ad4266ea1152b4e6729; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/29eae01c452b3ae340b64ad4266ea1152b4e6729"; sha256 = "1y4cmksxajljfgr8vmh7rvn7dlf43z2rw4hxfnxhri3bl55y5cg8"; }; "2a26f841843dd2551c447764a346353954884612" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/2a26f841843dd2551c447764a346353954884612; + url = "http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/2a26f841843dd2551c447764a346353954884612"; sha256 = "0zn93s7bwy5z1cscs79bd27qxyjgdj6ry9j1nwkcvd9irw2ca14k"; }; "2aa18a35f72b72172e9b2c30c8ef7dbe2031303c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2aa18a35f72b72172e9b2c30c8ef7dbe2031303c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2aa18a35f72b72172e9b2c30c8ef7dbe2031303c"; sha256 = "0jj1cjhj4y50hjbsslxhrjc8byjngvcg4fllc6fysd01hdbzx267"; }; "2acb20ce30a8d1a5aa3f7506c94c9f8a93297c8d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2acb20ce30a8d1a5aa3f7506c94c9f8a93297c8d; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2acb20ce30a8d1a5aa3f7506c94c9f8a93297c8d"; sha256 = "07pr5hm5pv8s1qw3lmgasg8ppsga50h6dhpbm7z5lcnc70nd5fkm"; }; "2b1ea22d749ba6df5bafa9119fe8a0c0d4ba68c1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/2b1ea22d749ba6df5bafa9119fe8a0c0d4ba68c1; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/2b1ea22d749ba6df5bafa9119fe8a0c0d4ba68c1"; sha256 = "1i5cvjjm2sjx77qahmk4p26gm30rri50fdm1jfypp45y0hqa34wn"; }; "2b2f6a55cc19d94c0130e833f2e70c29e8bfa2e4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/2b2f6a55cc19d94c0130e833f2e70c29e8bfa2e4; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/2b2f6a55cc19d94c0130e833f2e70c29e8bfa2e4"; sha256 = "0z3vk2yn1afbkx5lni2pwii3v9by37rixz1brws112h79a2mnbd4"; }; "2b83155ddf092ccd8d8baeb9898fe084b587e82d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2488287-03e6f1d9f826475c81f3125cbcc669d9/2b83155ddf092ccd8d8baeb9898fe084b587e82d; + url = "http://cdn.unrealengine.com/dependencies/2488287-03e6f1d9f826475c81f3125cbcc669d9/2b83155ddf092ccd8d8baeb9898fe084b587e82d"; sha256 = "1jg06zvfzbz1s34wfnvcnkpjhad8kmlcf0byf61dyfacjw0rpfr0"; }; "2bac5c303baf3d4800852e359ebe06398d185cd9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2bac5c303baf3d4800852e359ebe06398d185cd9; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2bac5c303baf3d4800852e359ebe06398d185cd9"; sha256 = "1wg72mlyh82ah0p7fxkj83wkllx6r8ya0x9adizvlaf8mw7ymhvj"; }; "2bc488cec0bae3f273fcf9d172b61b9a12489423" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2622232-9cbce5f5f69743598cf4bcb212040bd6/2bc488cec0bae3f273fcf9d172b61b9a12489423; + url = "http://cdn.unrealengine.com/dependencies/2622232-9cbce5f5f69743598cf4bcb212040bd6/2bc488cec0bae3f273fcf9d172b61b9a12489423"; sha256 = "10bqvkyzynfi9k4s697i6qzpfc3p5dyw77k3wqsdm686kaaa035x"; }; "2c391f34048aae95fed7d9649088e50dc62d614a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2c391f34048aae95fed7d9649088e50dc62d614a; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2c391f34048aae95fed7d9649088e50dc62d614a"; sha256 = "0k6vzh8kkfvgb8km5jd6qn3fw84snm9xz0fmx3jffc7g5n1jywsz"; }; "2c42aecf4d302508d97a42889f9c616197b1bd9d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2c42aecf4d302508d97a42889f9c616197b1bd9d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2c42aecf4d302508d97a42889f9c616197b1bd9d"; sha256 = "0f7h2w6pppdi7gp8h50528xf25d382fkf1mckckzfilvs3xvsqrn"; }; "2c6a334523bb0b39b337ae9f3754d787d930b6ce" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/2c6a334523bb0b39b337ae9f3754d787d930b6ce; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/2c6a334523bb0b39b337ae9f3754d787d930b6ce"; sha256 = "1537cbvm3byiz5yifw43236yv2ffr1h9xn5kn1m3x031q1lkrvj7"; }; "2c8420f6e48f529d116aafee46759cdf99e8a724" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2748148-aeba26080cd64d52aecc49d22cba05f4/2c8420f6e48f529d116aafee46759cdf99e8a724; + url = "http://cdn.unrealengine.com/dependencies/2748148-aeba26080cd64d52aecc49d22cba05f4/2c8420f6e48f529d116aafee46759cdf99e8a724"; sha256 = "01bc98a4q8h02f3iclrd99sg215jpznqr5dviakrhakvyg2qifm5"; }; "2ccd26d6297607f50e2fd8c1b54cde1f6e6509a5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/2ccd26d6297607f50e2fd8c1b54cde1f6e6509a5; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/2ccd26d6297607f50e2fd8c1b54cde1f6e6509a5"; sha256 = "12w39ljrf6nrvixky4dzx8q4izwba17a8bc65f561wp49305rq8j"; }; "2cd1739a082210f13445cb6acb076e89cb209759" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/2cd1739a082210f13445cb6acb076e89cb209759; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/2cd1739a082210f13445cb6acb076e89cb209759"; sha256 = "1g8miwfg84c0z6hxm2j7lqk7khbvk80jkzavb0fwygyml9xlwgfv"; }; "2cf7b40136915c48e206e1052021eb226c0050ca" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2495503-7390cc25898b4ab0a4f9f846f2fd7754/2cf7b40136915c48e206e1052021eb226c0050ca; + url = "http://cdn.unrealengine.com/dependencies/2495503-7390cc25898b4ab0a4f9f846f2fd7754/2cf7b40136915c48e206e1052021eb226c0050ca"; sha256 = "0gs5ylym2j8sk1jg4b6217nchv10d9bigl1nd94amzss2d4aq86j"; }; "2d54103141e313b63ef5cf774325a15054e9ff39" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/2d54103141e313b63ef5cf774325a15054e9ff39; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/2d54103141e313b63ef5cf774325a15054e9ff39"; sha256 = "109gvy1i6g2bk3cj0q833gc2rc2mg5w34q6j4jx6ff956dvl9drb"; }; "2d883815049fa9361c8c5c425fbea36dcd903c7a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/2d883815049fa9361c8c5c425fbea36dcd903c7a; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/2d883815049fa9361c8c5c425fbea36dcd903c7a"; sha256 = "0g2ld1zbwck746j2i2gl61xplp4rg54vw7yk9rc81w60889z7zbh"; }; "2dc37c85bc4dd351cd3d177f7e6f986d186bd1f2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/2dc37c85bc4dd351cd3d177f7e6f986d186bd1f2; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/2dc37c85bc4dd351cd3d177f7e6f986d186bd1f2"; sha256 = "1nf42p4lzwz88g91wc9i4vcawsdnskjf4s93sha70mx38xbk82fd"; }; "2de8f1186afad5e4c4f23315078e4d2bf6df4264" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2653899-1a26143a64884f27a8bfc418cb1e75f0/2de8f1186afad5e4c4f23315078e4d2bf6df4264; + url = "http://cdn.unrealengine.com/dependencies/2653899-1a26143a64884f27a8bfc418cb1e75f0/2de8f1186afad5e4c4f23315078e4d2bf6df4264"; sha256 = "1hcpcss34rv1q9cw8g3lnqfxhmd4gqb52zll1g44biid1ybhjyqj"; }; "2e01332dbabb9d7f2325d7f297f41fcd48933c46" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/2e01332dbabb9d7f2325d7f297f41fcd48933c46; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/2e01332dbabb9d7f2325d7f297f41fcd48933c46"; sha256 = "07j0r50lbva8dzkpp1cym72995p9lsbc3hxkczhdydaff2cxkbpp"; }; "2e09a8e7ade5fdf179f0918bc2abac9c18e85901" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/2e09a8e7ade5fdf179f0918bc2abac9c18e85901; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/2e09a8e7ade5fdf179f0918bc2abac9c18e85901"; sha256 = "1sh9srrwzs9fzy1ds452h8dzangi8q2kvnn9sq39b8cpgffjy1qc"; }; "2e601894255189d2db25a10b7d612d09c725aba7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2e601894255189d2db25a10b7d612d09c725aba7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2e601894255189d2db25a10b7d612d09c725aba7"; sha256 = "1y0pfngnbfzc7zlwalf7w1f97fx6aclrkhzl91axjdgnkwcnnp2f"; }; "2e6729373c277fcfd3a59532e1e7738523370fb8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/2e6729373c277fcfd3a59532e1e7738523370fb8; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/2e6729373c277fcfd3a59532e1e7738523370fb8"; sha256 = "12farscg3s037w3mylb5s7xnv4gzriqpbgadg7jxpl4znpdafdy2"; }; "2e6b877018994d97122a9b698eba651b59cbe02d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2e6b877018994d97122a9b698eba651b59cbe02d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2e6b877018994d97122a9b698eba651b59cbe02d"; sha256 = "1pgfa4bx7sy8x7dq1zy0jifkaj2jmw12v0fnd4wdcnkraw9wh25y"; }; "2e8c5279ef8b2e93ab8c738c3e9b8689fc63b839" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2e8c5279ef8b2e93ab8c738c3e9b8689fc63b839; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2e8c5279ef8b2e93ab8c738c3e9b8689fc63b839"; sha256 = "10hff6yk8q7kwn3557s4fbx7gbhwxsk44j7h8xqn26qzm6xbwd34"; }; "2ecfd27e7e8beaa971269c4d29040f148b7fdf07" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2ecfd27e7e8beaa971269c4d29040f148b7fdf07; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2ecfd27e7e8beaa971269c4d29040f148b7fdf07"; sha256 = "128y3l95zg1qxz9bwf3wzjb8hr89d3v74dix0c4qiv4srk300d1c"; }; "2eddeeafbb16203bad1207fe3c70aaf2e165ebea" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/2eddeeafbb16203bad1207fe3c70aaf2e165ebea; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/2eddeeafbb16203bad1207fe3c70aaf2e165ebea"; sha256 = "1gr063b3z1q7d7q9ygvyj7qh1z922r8c2mh5aw2wq0s15sxjqq7p"; }; "2eebb65cf7012650afcab43c7f2f559c86b2f3a3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2eebb65cf7012650afcab43c7f2f559c86b2f3a3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2eebb65cf7012650afcab43c7f2f559c86b2f3a3"; sha256 = "1v1kwg15r7fns0gash84zff9r25amphma6jfpzl2yr2qcydyqkdn"; }; "2efd964b62d457693b93d311acd7d54dc4e7f177" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/2efd964b62d457693b93d311acd7d54dc4e7f177; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/2efd964b62d457693b93d311acd7d54dc4e7f177"; sha256 = "1kd99v2l23ming81m799zz666pyk7pvzlykd9iqd9a1b8xi8q80l"; }; "2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2f143d8520d94bbf2cb250b35a8f79e3d3e8572c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2f143d8520d94bbf2cb250b35a8f79e3d3e8572c"; sha256 = "1wrzkwv1vl3r7hczgmyxw4gv2nlwjivds8x1myicrb3wqz85b2wr"; }; "2f3b66c8bc4bc7ba4a38982c19f7aea56a40fa44" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/2f3b66c8bc4bc7ba4a38982c19f7aea56a40fa44; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/2f3b66c8bc4bc7ba4a38982c19f7aea56a40fa44"; sha256 = "1bz12dwy7yyg4niq822jqv7vi5g7mmfiscsdbay08184niw1a2fc"; }; "2f4b14734a09e63c0347c348f77cd0da3c72b561" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/2f4b14734a09e63c0347c348f77cd0da3c72b561; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/2f4b14734a09e63c0347c348f77cd0da3c72b561"; sha256 = "0ypvfnnsl2q15qmqkq9qs1mfmyk63jjxhr2w54v7xcxv40l2d0ah"; }; "2f8b4043d609acb0eee65a86210c9881d1e4a9b5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/2f8b4043d609acb0eee65a86210c9881d1e4a9b5; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/2f8b4043d609acb0eee65a86210c9881d1e4a9b5"; sha256 = "0yqildrca6fx0gvhb08s3m4dwfkrzbyq877nkcykzid687q6f2h6"; }; "2fb0ce94e7960b83e88bc4d2687ba07c94e9d96f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/2fb0ce94e7960b83e88bc4d2687ba07c94e9d96f; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/2fb0ce94e7960b83e88bc4d2687ba07c94e9d96f"; sha256 = "0jlakpvdmqscxgdwlgyrx69bdpfpx9bxinz56hwrfdqlsl13d6zp"; }; "2fbbb90552e28dbaf47f41fa63652c11c7b99c78" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/2fbbb90552e28dbaf47f41fa63652c11c7b99c78; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/2fbbb90552e28dbaf47f41fa63652c11c7b99c78"; sha256 = "1w8zvb659f0xd5fa0bhclmrkavb82nj8xwwcan1rwys38vvghl6h"; }; "2fda5ea89a82d953d04583ab86b387b1b3f3dd6f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/2fda5ea89a82d953d04583ab86b387b1b3f3dd6f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/2fda5ea89a82d953d04583ab86b387b1b3f3dd6f"; sha256 = "1l8slfjrais377xrpj9lm0058y2r4qb24yvh30fpxmw3alvw5wg2"; }; "2fdbf124501fb7d04dae2e4dea0e796f8a098f36" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2fdbf124501fb7d04dae2e4dea0e796f8a098f36; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2fdbf124501fb7d04dae2e4dea0e796f8a098f36"; sha256 = "1b4id5wcrfjl6b0qp5c1y1dq62g8sn7ln8j1idvi5ffwwrmsx8j3"; }; "2fe1fb9f98af4a68ceb9adee909fe7b67917ea81" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621991-64978bb873e64559b7c143597fba3856/2fe1fb9f98af4a68ceb9adee909fe7b67917ea81; + url = "http://cdn.unrealengine.com/dependencies/2621991-64978bb873e64559b7c143597fba3856/2fe1fb9f98af4a68ceb9adee909fe7b67917ea81"; sha256 = "0n35g4sb7wymb0k22n0frapdhw6zz1aiiv5xynjk8c99pivdnism"; }; "2ff8709ada5b8bbfe994f55ce697983225440813" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2ff8709ada5b8bbfe994f55ce697983225440813; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2ff8709ada5b8bbfe994f55ce697983225440813"; sha256 = "1h57h9z44acyrw5klcslbg9g7zxgxaz26d3ab18q2mp17mrw3wk3"; }; "3012eb0c18cf3faab0fd1a8290905b902456192c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/3012eb0c18cf3faab0fd1a8290905b902456192c; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/3012eb0c18cf3faab0fd1a8290905b902456192c"; sha256 = "1halwqjmiprn659fqcdfw5g3ffanx34j0ri8n00xmbwv4hhkvsvh"; }; "307b166459a0b56cda3d5d3235e3c39b37b2e2e7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/307b166459a0b56cda3d5d3235e3c39b37b2e2e7; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/307b166459a0b56cda3d5d3235e3c39b37b2e2e7"; sha256 = "0hmc67ngk3s4by9k2kcl5kqi8vmkrqp0vaphd0v88z162vax44pk"; }; "30bf523aff5cc60cdbb2da5ca9b51226e6aefc9b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/30bf523aff5cc60cdbb2da5ca9b51226e6aefc9b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/30bf523aff5cc60cdbb2da5ca9b51226e6aefc9b"; sha256 = "0cvfn3vv6jhhpimc8s9q37k041c3qc8rrh1fkab89y1d1g430mil"; }; "30e4e0e87aa3c6ed5b9d99e89c3e3986727405b4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/30e4e0e87aa3c6ed5b9d99e89c3e3986727405b4; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/30e4e0e87aa3c6ed5b9d99e89c3e3986727405b4"; sha256 = "0gpvcs6q6cprbirwndirz8a75d5xrsxdzplh9j2zknqkybwbdsyg"; }; "31513973d4d5ca51b8bb4b0b965dd53bed0284bf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/31513973d4d5ca51b8bb4b0b965dd53bed0284bf; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/31513973d4d5ca51b8bb4b0b965dd53bed0284bf"; sha256 = "1y1lnwvzs2v6yibnxb5lxcc74gn2pgarqdqhs26501hf35cw400m"; }; "31a9943db56acc38a4a6083517d5981accfd7b0f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/31a9943db56acc38a4a6083517d5981accfd7b0f; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/31a9943db56acc38a4a6083517d5981accfd7b0f"; sha256 = "0i6n6hhcjg2ccqxmajmb3nhwbfx2bkfszxycs1k4ip34yhb7fbcd"; }; "31b00e20c26ba53e1e4071f88ae88e478dddc667" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/31b00e20c26ba53e1e4071f88ae88e478dddc667; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/31b00e20c26ba53e1e4071f88ae88e478dddc667"; sha256 = "0n9fwvmp1r5h3z9sbqx1ywr1azm0ckrgk4j2557n06l4f539bah5"; }; "31d76d0dbcad8d9f1b4242247389a533fb8e3ca1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/31d76d0dbcad8d9f1b4242247389a533fb8e3ca1; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/31d76d0dbcad8d9f1b4242247389a533fb8e3ca1"; sha256 = "1iwqppypjqvq32csylhbrq7kjcm1533fdaq4m6pdnb8cf3q0haa3"; }; "31dc2af99e1bb1eecb4ddcb3b2983a0563cde9f6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/31dc2af99e1bb1eecb4ddcb3b2983a0563cde9f6; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/31dc2af99e1bb1eecb4ddcb3b2983a0563cde9f6"; sha256 = "03awckc4gh0ypdkglzhy4fg79fik904nczmwpf4vwrd83xin7dp7"; }; "3227bc9c7feb2325ecd2c4144ae0feae8ddc8b90" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/3227bc9c7feb2325ecd2c4144ae0feae8ddc8b90; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/3227bc9c7feb2325ecd2c4144ae0feae8ddc8b90"; sha256 = "1k11sd1jsbbcgr71jn67vq4zjwxa96y8qknl4b9p3333skixvhmy"; }; "32860f0809372d37c40310daf0184877322fc636" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/32860f0809372d37c40310daf0184877322fc636; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/32860f0809372d37c40310daf0184877322fc636"; sha256 = "0dg7hjwhpbfbqxwn4dgclpfrbbrjn5l8xbdpx9n3fvsrr861zdxg"; }; "32bb97834c48d10d8115a0167b8372bca6b8b179" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/32bb97834c48d10d8115a0167b8372bca6b8b179; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/32bb97834c48d10d8115a0167b8372bca6b8b179"; sha256 = "04z8ppim2mh792m2fqw2xws7j1m6xrd1jp1pcn7lgfaiz98yxvr1"; }; "32d809d2943a46adfb06d390602d4be87fa510ba" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/32d809d2943a46adfb06d390602d4be87fa510ba; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/32d809d2943a46adfb06d390602d4be87fa510ba"; sha256 = "04fn639135gmvmrq4i7jq0s6k8rfd3jj4a11740avbpbynw9gr25"; }; "32f81135ef65d05728ba2f1c5b5f3935a52334d7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/32f81135ef65d05728ba2f1c5b5f3935a52334d7; + url = "http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/32f81135ef65d05728ba2f1c5b5f3935a52334d7"; sha256 = "0sczgfd4kksl69gw3zazx7r046vb3dxgbpb6njzv52yj5q13ha4f"; }; "330afd81b039c963aa95ebf7fcb5e01b8ce9ee3f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2620227-83084f9091244f6c9bba34d6d2a0fc20/330afd81b039c963aa95ebf7fcb5e01b8ce9ee3f; + url = "http://cdn.unrealengine.com/dependencies/2620227-83084f9091244f6c9bba34d6d2a0fc20/330afd81b039c963aa95ebf7fcb5e01b8ce9ee3f"; sha256 = "0fv2jyajl8p8v9vini5iqmj6gnzzccjvmgzk121vmnhnm4090p1m"; }; "330e7d22693575d7c1e3bc8598676d1ad936a018" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/330e7d22693575d7c1e3bc8598676d1ad936a018; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/330e7d22693575d7c1e3bc8598676d1ad936a018"; sha256 = "08s5fpxn14xppyif4yx6w1sgrxb74q2aw4ar126b9pc1ihlw2c0h"; }; "33450e05fddd79d7692866accaff42adf9cb9a97" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/33450e05fddd79d7692866accaff42adf9cb9a97; + url = "http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/33450e05fddd79d7692866accaff42adf9cb9a97"; sha256 = "0yg8i2hg1mrx6mppwm1xs3hwpdv9m20l5881vbncyvgpy9a37kgb"; }; "3347d72ae38994059c896549688eac5a145b35fe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3347d72ae38994059c896549688eac5a145b35fe; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3347d72ae38994059c896549688eac5a145b35fe"; sha256 = "1pxfsdbmrhal911bb5pjmkk0j70nik0m5kc1b9i675v4h4ysfk3x"; }; "33870814a45b700847bc8d18c59c18d1daa72623" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/33870814a45b700847bc8d18c59c18d1daa72623; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/33870814a45b700847bc8d18c59c18d1daa72623"; sha256 = "015v4x2gkkcpnz7jf35gbq0z1x3b0drcyp21ignx3xz7w6cxz97m"; }; "33902cc01c7eda10161025651275a129da5ead6e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/33902cc01c7eda10161025651275a129da5ead6e; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/33902cc01c7eda10161025651275a129da5ead6e"; sha256 = "1g3i1zx14zg5dmbs6pcrrg0xw1rpsqavvbrxd79m5r09c90y6kbh"; }; "33d0a2949662b327b35a881192e85107ecafc8ac" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/33d0a2949662b327b35a881192e85107ecafc8ac; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/33d0a2949662b327b35a881192e85107ecafc8ac"; sha256 = "1x60d939njwsak5r3mga01bkv2c2ggvq28hvqnx6s0z7icch7vib"; }; "342f323d0582f6c4897956e82b4549bbf9c47973" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/342f323d0582f6c4897956e82b4549bbf9c47973; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/342f323d0582f6c4897956e82b4549bbf9c47973"; sha256 = "1l6wr3rbkg5hs0wda43c1dk2gfg2a9r53rki2yls0i9xirhfmkd7"; }; "345fb7a468fc7c5315a11b86b2c600ac91955213" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/345fb7a468fc7c5315a11b86b2c600ac91955213; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/345fb7a468fc7c5315a11b86b2c600ac91955213"; sha256 = "1jw46pcrndls655pyx57acdj44v4kr3jg7b04ibmxc31j0mn1955"; }; "34901ceb8b3afa22d4a75f06c3c465a3292592d3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/34901ceb8b3afa22d4a75f06c3c465a3292592d3; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/34901ceb8b3afa22d4a75f06c3c465a3292592d3"; sha256 = "1lmnfbi5l6fk6p4iaa30dpali392xm8r1fz1nd0jil0zr7d3kcll"; }; "349fb1419c99f4b260e3bb7b3a7cb5273c5b88dc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/349fb1419c99f4b260e3bb7b3a7cb5273c5b88dc; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/349fb1419c99f4b260e3bb7b3a7cb5273c5b88dc"; sha256 = "0xdrf7zqci1ffn6w0pw8hq4ijbppbka72fb2lgrqjiawzmhh1i5h"; }; "34a9c86849d93a7f932667ae0e2d9fc3f4aceeb7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/34a9c86849d93a7f932667ae0e2d9fc3f4aceeb7; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/34a9c86849d93a7f932667ae0e2d9fc3f4aceeb7"; sha256 = "0fvrksn1668yxx9fbpchawvnah6n4zpicc865djhfqq1h5vfndfv"; }; "34b38730a025a0c75cff4caa03512a0054d0695c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/34b38730a025a0c75cff4caa03512a0054d0695c; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/34b38730a025a0c75cff4caa03512a0054d0695c"; sha256 = "03m8rvh9hrz1rp0004vav5gdkj2c79j2h3adhjlbgcx8llr3z3p4"; }; "34da962d8bda23fc14978d82c2c5fb761acc5815" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/34da962d8bda23fc14978d82c2c5fb761acc5815; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/34da962d8bda23fc14978d82c2c5fb761acc5815"; sha256 = "13xv0nb13z4f57xf9rvnnd73ssf8cx26mvagjmikzsi7chvbpbwn"; }; "34f9df3c5cbc087be9cf8b8b2084287fb9f3b2e2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/34f9df3c5cbc087be9cf8b8b2084287fb9f3b2e2; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/34f9df3c5cbc087be9cf8b8b2084287fb9f3b2e2"; sha256 = "0dywks9jrd72xlmxzvcgd5blphf89r98g5h6k76grmc9k2mswwv3"; }; "351da091078402bf85cff8964a50e1ecaf81e7ce" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/351da091078402bf85cff8964a50e1ecaf81e7ce; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/351da091078402bf85cff8964a50e1ecaf81e7ce"; sha256 = "1qx85bsc094gzng5x426d6gcbhfjnqhahly3s0dq3g3vw915jl2s"; }; "353076c56a6ecfb890a7ab5f30c881a73e09d508" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/353076c56a6ecfb890a7ab5f30c881a73e09d508; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/353076c56a6ecfb890a7ab5f30c881a73e09d508"; sha256 = "17lbpk2zkm36l67lfbrmf0wc8x47ywkji127592q707wc4zgh397"; }; "3579a812b187dc0ebafb13d5914b27deab2c4367" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3579a812b187dc0ebafb13d5914b27deab2c4367; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3579a812b187dc0ebafb13d5914b27deab2c4367"; sha256 = "0pnppnyx0nk9grvn2sqha2wmfky42f92mvnxs7scavg913zxi3sg"; }; "357fc4cd09e4eea77faa70a271346bfd5d0b8417" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/357fc4cd09e4eea77faa70a271346bfd5d0b8417; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/357fc4cd09e4eea77faa70a271346bfd5d0b8417"; sha256 = "05xfhmc9y3q31nrjsfnifx709l5yrss0qkilbw19da4lhxqknb6i"; }; "35b0e5ed5cbf20a0b47af4bb9ca6ffef4d3e5d8e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2602350-38e0d307a57a47baa00ee5f892c9ced6/35b0e5ed5cbf20a0b47af4bb9ca6ffef4d3e5d8e; + url = "http://cdn.unrealengine.com/dependencies/2602350-38e0d307a57a47baa00ee5f892c9ced6/35b0e5ed5cbf20a0b47af4bb9ca6ffef4d3e5d8e"; sha256 = "1i88krwy1kxphjcl4l5bxfp4z8dyl4lgj9nrw09dvj8k7azzjvlx"; }; "35e0d2f1b5d56bea19aa9443dd5c41b4ef095b4e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/35e0d2f1b5d56bea19aa9443dd5c41b4ef095b4e; + url = "http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/35e0d2f1b5d56bea19aa9443dd5c41b4ef095b4e"; sha256 = "16k5gkkwmwldbaf29yfshhawqxxq5ccpwylw8wklc56705ib3x96"; }; "35f95404a8393dcd6374b594b1c2bb5acce427ed" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/35f95404a8393dcd6374b594b1c2bb5acce427ed; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/35f95404a8393dcd6374b594b1c2bb5acce427ed"; sha256 = "0qvh62961qhp0j46p18iiyv3fw783lrcljlxzr3vv3zszpvnqyhv"; }; "3639943c4bf99c8f284de9f812bf2cd6eff5d49b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2456855-d820875aa14148d6807c08cda631b764/3639943c4bf99c8f284de9f812bf2cd6eff5d49b; + url = "http://cdn.unrealengine.com/dependencies/2456855-d820875aa14148d6807c08cda631b764/3639943c4bf99c8f284de9f812bf2cd6eff5d49b"; sha256 = "00rdh4lcfb7mwlkqxzrpqd9g88znfajm1cbcd83zxdyc2jkipi18"; }; "363bd76bc4fa81ad344802f2fb8610153a5ca75f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/363bd76bc4fa81ad344802f2fb8610153a5ca75f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/363bd76bc4fa81ad344802f2fb8610153a5ca75f"; sha256 = "0sllg3pgm9jqq73i89l1smrl2y35cgd8667q05v1x9ilhlxpb2zs"; }; "36922d450606299836b10b930c0c66af1f780347" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/36922d450606299836b10b930c0c66af1f780347; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/36922d450606299836b10b930c0c66af1f780347"; sha256 = "0ribsanhwk7m3qvqydpkhvhi00js7n9wabi3c3l0jib6knndphsh"; }; "36923d3780cea992eb61b86d48b1a61297b44536" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/36923d3780cea992eb61b86d48b1a61297b44536; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/36923d3780cea992eb61b86d48b1a61297b44536"; sha256 = "0i4av37slygbl1xynai7h6cb7dsg773zgafdmy10jmc2bb8dp4ky"; }; "36af7f5290dd60c07f83b8a398eb9721c24a6154" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/36af7f5290dd60c07f83b8a398eb9721c24a6154; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/36af7f5290dd60c07f83b8a398eb9721c24a6154"; sha256 = "0rwi5y9sra4pnxdw5l8ykf6s26dg5clflr76f66vdppvipd38rf0"; }; "372698b3d3b17da23c0c53958fefda69c1198f54" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/372698b3d3b17da23c0c53958fefda69c1198f54; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/372698b3d3b17da23c0c53958fefda69c1198f54"; sha256 = "1824igxlj2yc3b2li4gapwlgzgx9gd3kw2gnlkcxdsw1m2h79npd"; }; "374b33734d17be020f3eec73cf16a100e905a8c5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/374b33734d17be020f3eec73cf16a100e905a8c5; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/374b33734d17be020f3eec73cf16a100e905a8c5"; sha256 = "0d3ax4shw2y8bivqajmfgzmf3bg1syz6i91pk8jbl38i1007h4l1"; }; "376fa7bdb1a776f7100bfaa29f24a9b81bb5a97a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2701146-722550daa90f4e4996a6cdd478880969/376fa7bdb1a776f7100bfaa29f24a9b81bb5a97a; + url = "http://cdn.unrealengine.com/dependencies/2701146-722550daa90f4e4996a6cdd478880969/376fa7bdb1a776f7100bfaa29f24a9b81bb5a97a"; sha256 = "1znfn4asyx1spinx8jpc5r479a30n5cnbb4pvlas6sb3hy8q68hd"; }; "3779adbbb84b7918fcaa4bc8df4b64a45e50aa88" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3779adbbb84b7918fcaa4bc8df4b64a45e50aa88; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3779adbbb84b7918fcaa4bc8df4b64a45e50aa88"; sha256 = "0g3gww1rq1z7lrnxw6gw3i33h799fbmh717qm599w47pq73xmffl"; }; "37a47bf076c47063d031b82f827412bf05a5f500" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2550873-dbd5ea4331fc461794c4770d56863ff2/37a47bf076c47063d031b82f827412bf05a5f500; + url = "http://cdn.unrealengine.com/dependencies/2550873-dbd5ea4331fc461794c4770d56863ff2/37a47bf076c47063d031b82f827412bf05a5f500"; sha256 = "0v71m3c03xv44f17rznw6jbn5k7vac2g3547wsvin7y1vr7jhy11"; }; "37d805efe0d2358727b0deeb9f5c56b3b68a8478" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2653899-1a26143a64884f27a8bfc418cb1e75f0/37d805efe0d2358727b0deeb9f5c56b3b68a8478; + url = "http://cdn.unrealengine.com/dependencies/2653899-1a26143a64884f27a8bfc418cb1e75f0/37d805efe0d2358727b0deeb9f5c56b3b68a8478"; sha256 = "0chznyg2xnyx3zz2q9q6i9cdk26m6chcp6pjzm8lnvc4k7p2mbls"; }; "37f1c844684794da07d9c537b175855f8266fdbb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/37f1c844684794da07d9c537b175855f8266fdbb; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/37f1c844684794da07d9c537b175855f8266fdbb"; sha256 = "07ypy820rrps4d4icdv0bklaa6kyn50gyyaq5yspmwkn07rp5hbv"; }; "37ff9ca732f3611a92185cfbfd25e6eb7d3d2fde" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/37ff9ca732f3611a92185cfbfd25e6eb7d3d2fde; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/37ff9ca732f3611a92185cfbfd25e6eb7d3d2fde"; sha256 = "0lj5ajjx53k7d7m770hdm0mfanfi0kj7vhnfi7x5h75gpzihi6g6"; }; "3811b277d1080f2314e9ffd524da841aefd84ce0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/3811b277d1080f2314e9ffd524da841aefd84ce0; + url = "http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/3811b277d1080f2314e9ffd524da841aefd84ce0"; sha256 = "1m9hjjiskwc6xnfkyzbg52mx2alxl8qh19cawykr1dnd1qs2ngz6"; }; "38c9a6c68be0ce7a36d83391a637010447ad3301" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/38c9a6c68be0ce7a36d83391a637010447ad3301; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/38c9a6c68be0ce7a36d83391a637010447ad3301"; sha256 = "08j52b49p3ps6i78v9h04gwxzcbibg41i5dcxqi47vq9ihhb1nsa"; }; "38e0e2e02bc165327038c973058790e3962d6079" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2686985-76325fadec474557a67995f00383ea6d/38e0e2e02bc165327038c973058790e3962d6079; + url = "http://cdn.unrealengine.com/dependencies/2686985-76325fadec474557a67995f00383ea6d/38e0e2e02bc165327038c973058790e3962d6079"; sha256 = "0yb69a7b63sjcjha8lh1l86jlfxln1gz5y7gplqbj0m0c4qrg72v"; }; "38e6833dfb6b74f5acf23d984bb9ad01086e1f39" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/38e6833dfb6b74f5acf23d984bb9ad01086e1f39; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/38e6833dfb6b74f5acf23d984bb9ad01086e1f39"; sha256 = "10ln9haj9317g49zmi5jc4dq56qs0b4qr8g1g6rypiw8ndlm00rq"; }; "38e79fc7612d6ebd7278e23e7d0a9df3b95155d5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2739939-d1b07735d39c4b8c8427e05b6d9e3571/38e79fc7612d6ebd7278e23e7d0a9df3b95155d5; + url = "http://cdn.unrealengine.com/dependencies/2739939-d1b07735d39c4b8c8427e05b6d9e3571/38e79fc7612d6ebd7278e23e7d0a9df3b95155d5"; sha256 = "0w1lwm9dfrprxa3dcaln774c3l5b4ai2sssww81f8adjafbvzr7l"; }; "392d5e0536abeb83ccfc28ba9fb96e9d1d6507f3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/392d5e0536abeb83ccfc28ba9fb96e9d1d6507f3; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/392d5e0536abeb83ccfc28ba9fb96e9d1d6507f3"; sha256 = "1b9a86drlml4cflilwa188i5ay69ydhpc3q477947vs5gbgc7ln7"; }; "3965204d2b18ccd0b4d2191500d373ac064180df" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3965204d2b18ccd0b4d2191500d373ac064180df; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3965204d2b18ccd0b4d2191500d373ac064180df"; sha256 = "0k801x11n4zmfshdmb6sby0k29bjcd83hzcbwp0hg7vnnxqsmfm9"; }; "39935e746b413e3c60c9a519e893cd19db5425ed" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/39935e746b413e3c60c9a519e893cd19db5425ed; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/39935e746b413e3c60c9a519e893cd19db5425ed"; sha256 = "1cr5666m83v6xkpwr2j51sf1c3a0q5kahh3j8ygrd74alm9v4wqd"; }; "3994a8a3195661395d89f209755bbab5ce1861c1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3994a8a3195661395d89f209755bbab5ce1861c1; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3994a8a3195661395d89f209755bbab5ce1861c1"; sha256 = "1jybg0wg5n99rsmzd4i3a1bs1p78gngzar0qan131scdywcv8384"; }; "39e7e3f8feb9564c8b90f2f6d630bb8ba96f2eb9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/39e7e3f8feb9564c8b90f2f6d630bb8ba96f2eb9; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/39e7e3f8feb9564c8b90f2f6d630bb8ba96f2eb9"; sha256 = "098vn5ps7qv0qjs6fvrzyx9qiq9qw7pslnhy4djm4xzamxs0n49n"; }; "3a6db69d4f8128addbe24660128ecd2ed9fd6dd0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3a6db69d4f8128addbe24660128ecd2ed9fd6dd0; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3a6db69d4f8128addbe24660128ecd2ed9fd6dd0"; sha256 = "04kx57syka9vpvgh5mjlmc1gg8d2ng5snrv36vmw4gq3pm0dpfi5"; }; "3a7f7a47aca5ad86176f1ceafd77139a06b89e11" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/3a7f7a47aca5ad86176f1ceafd77139a06b89e11; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/3a7f7a47aca5ad86176f1ceafd77139a06b89e11"; sha256 = "06vrb7nwi09vdkv8b143g2wz0wvn1qbp0l3l95g9frp4xkd6j8cf"; }; "3ab17699ce95c427b0c0f3466b4226e2e30b92d0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3ab17699ce95c427b0c0f3466b4226e2e30b92d0; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3ab17699ce95c427b0c0f3466b4226e2e30b92d0"; sha256 = "0vl7np8bpwcylsgdlvy8hmkzapj1a8pqywy0n01vk7q0fi0wxmc8"; }; "3b07d6bb5a24bb96557c48982e8b3389df33cfef" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/3b07d6bb5a24bb96557c48982e8b3389df33cfef; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/3b07d6bb5a24bb96557c48982e8b3389df33cfef"; sha256 = "1fgkqm5f66x937nlmbsz2qx2lnd276f7rjhcyf073prv9hwhi2vh"; }; "3b14a44c8ac4cda934824f4a48fdf11ae6dc27fc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/3b14a44c8ac4cda934824f4a48fdf11ae6dc27fc; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/3b14a44c8ac4cda934824f4a48fdf11ae6dc27fc"; sha256 = "16y6n3nlpkccpafcbavp8qhcc9adyjfyw75wjafkaw5ixd7c89ag"; }; "3b1f533104a3f316e188203a3b20770df4580018" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/3b1f533104a3f316e188203a3b20770df4580018; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/3b1f533104a3f316e188203a3b20770df4580018"; sha256 = "1wmryvw8i7zvkcb2z2ajafsngnj66cls3918n91d2lqihsjp5x6c"; }; "3b5ec1d1c8209489d78b2eabab46ec59ea1f65b2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3b5ec1d1c8209489d78b2eabab46ec59ea1f65b2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3b5ec1d1c8209489d78b2eabab46ec59ea1f65b2"; sha256 = "1qvjpm5sy6544wfvnlgd5qa2sw9q0nd3dvxqdqsvbjfzf1da6min"; }; "3b5feab7a5f46b3129c78ca6512692588d73eb8a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3b5feab7a5f46b3129c78ca6512692588d73eb8a; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3b5feab7a5f46b3129c78ca6512692588d73eb8a"; sha256 = "1q0is2ciaxcan8fzlf57pbwj096d1lhnym8653ifxbxii9jm7ng3"; }; "3b8d4ffa1666bbdbcc426ba6232275bc853755ea" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/3b8d4ffa1666bbdbcc426ba6232275bc853755ea; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/3b8d4ffa1666bbdbcc426ba6232275bc853755ea"; sha256 = "0mws36ydilcpavzhc32jzxllwgkxsk7d5yhrfa51j1b894wn60qp"; }; "3b9f2ea7dea75e5b70ff3776eb46e114725fed92" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3b9f2ea7dea75e5b70ff3776eb46e114725fed92; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3b9f2ea7dea75e5b70ff3776eb46e114725fed92"; sha256 = "054gxl8l03zzib7awcq2va0gh0xisl7yzz2x4rdpiv97zm0hlzx7"; }; "3ba6f94d6907237623e86c589cc6e9a1399e5a2e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/3ba6f94d6907237623e86c589cc6e9a1399e5a2e; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/3ba6f94d6907237623e86c589cc6e9a1399e5a2e"; sha256 = "022lj7l1w267kw44flfjpbsq9qj99xinw5qqxk352h8py2nddm2a"; }; "3bbd878e5357ee3dc1e752b07819ba87b7230ef4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3bbd878e5357ee3dc1e752b07819ba87b7230ef4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3bbd878e5357ee3dc1e752b07819ba87b7230ef4"; sha256 = "146g6zzaiwj2lcfazn6ap8ldqxs16cfdm6larc93g3yys16c87y9"; }; "3bc0fb4bdfdd1b6c1c684583efe02591afadb98e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3bc0fb4bdfdd1b6c1c684583efe02591afadb98e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3bc0fb4bdfdd1b6c1c684583efe02591afadb98e"; sha256 = "1diniwvlf76vcfxb3cqxx2xdkwsvd486qwkdgfvwyx3np2kypk8b"; }; "3c01d8c58f5ec428fdb8057af5387b8bca2816eb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3c01d8c58f5ec428fdb8057af5387b8bca2816eb; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3c01d8c58f5ec428fdb8057af5387b8bca2816eb"; sha256 = "0mrfagcmk325vzrhw1zb96ka5b0a37xm7g1k2b4s62xcl641qk55"; }; "3c048c63475cdefe078376d2fc1ab8294de64e58" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3c048c63475cdefe078376d2fc1ab8294de64e58; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3c048c63475cdefe078376d2fc1ab8294de64e58"; sha256 = "1gkh00i117krs57p2xwpi4s3vwby5na98nni0n5xf3aglqwa9anz"; }; "3c262ad594e83bd32b0d3a0f794b737101eb2874" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3c262ad594e83bd32b0d3a0f794b737101eb2874; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3c262ad594e83bd32b0d3a0f794b737101eb2874"; sha256 = "065r44gb0jsfz4m6zfvlj3w6wgh4fdmr52f353r5z1gxqqzqszr2"; }; "3c3769be5270bdf2ff4215c9f2f6c15d0ae05b7e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/3c3769be5270bdf2ff4215c9f2f6c15d0ae05b7e; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/3c3769be5270bdf2ff4215c9f2f6c15d0ae05b7e"; sha256 = "0ia41s3fvywhfgb2riqxq9mhhzy477yjix2v1bzq034g19bp4s1i"; }; "3c3a62993361bbb928b7f5c0407be6bee08da734" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3c3a62993361bbb928b7f5c0407be6bee08da734; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3c3a62993361bbb928b7f5c0407be6bee08da734"; sha256 = "0qn8mkxlll5rg4vr22xlwr6dmbsmvvyniry3jv7d3cj3bajqgavp"; }; "3c477e2e63d3533e62d654e63f012e59da5a3edc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/3c477e2e63d3533e62d654e63f012e59da5a3edc; + url = "http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/3c477e2e63d3533e62d654e63f012e59da5a3edc"; sha256 = "1f625rs8277bqv7wb6cpxpv1ry7zcy4an9q5gq5iz0f56qs3hyxc"; }; "3c65149be3cd5e4689b4eda6bf5569d16b149f6e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/3c65149be3cd5e4689b4eda6bf5569d16b149f6e; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/3c65149be3cd5e4689b4eda6bf5569d16b149f6e"; sha256 = "1zs20c26z86jwjx18zsppkra3d147vynyigibx0klrp0g2lfkpdr"; }; "3c6fd2f94e3497924851a5d8254666518d47a633" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3c6fd2f94e3497924851a5d8254666518d47a633; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3c6fd2f94e3497924851a5d8254666518d47a633"; sha256 = "00rh0skjjx7b8pd8mmnd2v35vhmsly1f0pnrvwyr9d5pfzsnxb6j"; }; "3c70f43afffaaed52bb87c78f1ecf8de846ce76d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/3c70f43afffaaed52bb87c78f1ecf8de846ce76d; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/3c70f43afffaaed52bb87c78f1ecf8de846ce76d"; sha256 = "106bj18q36wr5f1k2fjfish63q6phzwavcl5fh6sq1vzlh6gggz4"; }; "3c8149ddaa7dec626f08fd4fc2d852a4536ddabc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621991-64978bb873e64559b7c143597fba3856/3c8149ddaa7dec626f08fd4fc2d852a4536ddabc; + url = "http://cdn.unrealengine.com/dependencies/2621991-64978bb873e64559b7c143597fba3856/3c8149ddaa7dec626f08fd4fc2d852a4536ddabc"; sha256 = "1zl5kv0d37dhvkrhzzs9xn5qx1zpfa5nzy3cc4dvmfhsp74bgf7y"; }; "3c9ccdfb5da6f595a26f2e1f746cfc9f639e57dd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2625762-5759dd47f697403cb15f8e48090b1010/3c9ccdfb5da6f595a26f2e1f746cfc9f639e57dd; + url = "http://cdn.unrealengine.com/dependencies/2625762-5759dd47f697403cb15f8e48090b1010/3c9ccdfb5da6f595a26f2e1f746cfc9f639e57dd"; sha256 = "17wp0p9miy3yll9wyl5kggdg8x1rlbjwpw1w8gyinbvlp87y41md"; }; "3cc84281c7db62939c39b08c06b3174dc52ae63f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3cc84281c7db62939c39b08c06b3174dc52ae63f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3cc84281c7db62939c39b08c06b3174dc52ae63f"; sha256 = "06da44vi1v0gcrq4q3aanrqbpywqjrcm12w6i38kkwa8w2m7fq9d"; }; "3cd0df317d9f5715cd35c147537107dc3a588008" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3cd0df317d9f5715cd35c147537107dc3a588008; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3cd0df317d9f5715cd35c147537107dc3a588008"; sha256 = "0ic2xh8327zzgrpgrcggdq10cx906sidv55ys6bn37yqcm86ihyr"; }; "3ce154ee1488f62d7804205c87d8e37504733e7a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3ce154ee1488f62d7804205c87d8e37504733e7a; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3ce154ee1488f62d7804205c87d8e37504733e7a"; sha256 = "1gn1lmmnz00cbrm054q8wf3hxb2i7dhi7vb38dmgy4zwk67qdf3y"; }; "3ce4d40ab5c9c0141c6b805ed0eaa638cacc0e8f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3ce4d40ab5c9c0141c6b805ed0eaa638cacc0e8f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3ce4d40ab5c9c0141c6b805ed0eaa638cacc0e8f"; sha256 = "1zv992b5bndxizgvcmxwdl1mrahg0xpn356s8y4xnbvf4ysimpiv"; }; "3d0b21a35355415e71e8fb7ea0012b306e2a037e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/3d0b21a35355415e71e8fb7ea0012b306e2a037e; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/3d0b21a35355415e71e8fb7ea0012b306e2a037e"; sha256 = "1zwykg73i0rnga0y6cal2x4jlz69n3c6iq3g7c1c7d7a4hsgpy76"; }; "3d2991e772cfa979508e25de5935a89210973591" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3d2991e772cfa979508e25de5935a89210973591; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3d2991e772cfa979508e25de5935a89210973591"; sha256 = "1cacv6pd0p5wmxmfxfp56v4qd3chz6r27c6kbax3p325b6cjf9kz"; }; "3d3ffa0f6b5db075797d9657c491f1cec7434474" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3d3ffa0f6b5db075797d9657c491f1cec7434474; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3d3ffa0f6b5db075797d9657c491f1cec7434474"; sha256 = "0gzfpaw0v6xxbwrj14k1hl6dzn3g532war2h0mbpk5x2zgf05ppw"; }; "3dae84206c49a13a781a04f072560fdaae772628" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2542875-37bf4143b09d4d7a88bd89c6cbba110c/3dae84206c49a13a781a04f072560fdaae772628; + url = "http://cdn.unrealengine.com/dependencies/2542875-37bf4143b09d4d7a88bd89c6cbba110c/3dae84206c49a13a781a04f072560fdaae772628"; sha256 = "027xmslcmb490svay10k7xhj8rsjlmqv13igafnrqw082fz2crvi"; }; "3e2b9f360e17b90289d6aa8e07f64f8bec445375" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/3e2b9f360e17b90289d6aa8e07f64f8bec445375; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/3e2b9f360e17b90289d6aa8e07f64f8bec445375"; sha256 = "0hpm43hbn6wj8gv2hr47cnbfky2732pbqpmhjd33lgd5zjm17ki5"; }; "3edebf50b702f5e5d08876bdea65dbffa3d1e98f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/3edebf50b702f5e5d08876bdea65dbffa3d1e98f; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/3edebf50b702f5e5d08876bdea65dbffa3d1e98f"; sha256 = "196mmj2w2dzp9d9gyllpivnmik2kg54kk1qini5c7va9v0iifh7l"; }; "3eeb2f03152b2114d56a8804fb8d634405321569" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3eeb2f03152b2114d56a8804fb8d634405321569; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3eeb2f03152b2114d56a8804fb8d634405321569"; sha256 = "1mr55cjp8l7jmql2lj146lw2rqgyxb7wff71nm2i8b5mp6w7fa5i"; }; "3ef09650cc8541a72fb0c287cf9008a6ed209a58" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3ef09650cc8541a72fb0c287cf9008a6ed209a58; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3ef09650cc8541a72fb0c287cf9008a6ed209a58"; sha256 = "0wmf0hxsyxqzbzj8r1d7f2pfrqjqwa56wj4i2nnp6cccb7z8vdh1"; }; "3f4cbf00af0438c956f74f514929e02e3e8d43bc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/3f4cbf00af0438c956f74f514929e02e3e8d43bc; + url = "http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/3f4cbf00af0438c956f74f514929e02e3e8d43bc"; sha256 = "0294prdqycf6w77hb88jxirl7jgm00sjgc4nzwkznpf6q32jc1if"; }; "3f75f49ccfcf87ae2a3bcc2a68cf49fb510ada09" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3f75f49ccfcf87ae2a3bcc2a68cf49fb510ada09; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3f75f49ccfcf87ae2a3bcc2a68cf49fb510ada09"; sha256 = "1yq7yamysw27k0znsji1p850gk56vq07lbhxs837x0j9mp2qbfml"; }; "3f77d7050ec7beb565e4f6d6ad5f1291b2a066e4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3f77d7050ec7beb565e4f6d6ad5f1291b2a066e4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3f77d7050ec7beb565e4f6d6ad5f1291b2a066e4"; sha256 = "1ibs8qdbh8vp9ba04qs3bziwss5hbqknylqsydafqzmsvg0qgm5k"; }; "3fb53e132dfce0a5c72b3b10fb63fd6b5b89b16d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3fb53e132dfce0a5c72b3b10fb63fd6b5b89b16d; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3fb53e132dfce0a5c72b3b10fb63fd6b5b89b16d"; sha256 = "0lrs4n23klz5jqvchpzpflk3hyva9rr335qx3psd34q64hnkxs89"; }; "401dde870b0593ea8eb48a00e180d088dd331d41" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/401dde870b0593ea8eb48a00e180d088dd331d41; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/401dde870b0593ea8eb48a00e180d088dd331d41"; sha256 = "0ijdkqiymih4nm75gky9h6yycd496hjg60kimjnz73bdadanq4g5"; }; "4022d82d143e72ccce04e7825d3328a7b02fc901" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4022d82d143e72ccce04e7825d3328a7b02fc901; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4022d82d143e72ccce04e7825d3328a7b02fc901"; sha256 = "0f69a35zcjw4l68gd1qv21xnxhlwgx5fxi2msxfa5blg9i45vkvv"; }; "402bb37cf56e4ae0f047b4de8eed748f259c6a15" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/402bb37cf56e4ae0f047b4de8eed748f259c6a15; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/402bb37cf56e4ae0f047b4de8eed748f259c6a15"; sha256 = "0l3sgilafh4ri0mjz6jlx59bz82qbd6q119alb9wjpvlwgk19s9d"; }; "402bd33734002ac97efc2300bb3bcf9d2cad7bac" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2514362-4164223ab78d4e529a0f07d941c2c537/402bd33734002ac97efc2300bb3bcf9d2cad7bac; + url = "http://cdn.unrealengine.com/dependencies/2514362-4164223ab78d4e529a0f07d941c2c537/402bd33734002ac97efc2300bb3bcf9d2cad7bac"; sha256 = "18p16j0jpavsdyv2mgif0s7xcqhw9574vfi95qs7q4pb4lpd89pq"; }; "402fa9c093561a043e89a83d3b0553126fdf2bb7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/402fa9c093561a043e89a83d3b0553126fdf2bb7; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/402fa9c093561a043e89a83d3b0553126fdf2bb7"; sha256 = "1ga2xj4v20a28fj6n8byq7082psawipfr00f54mx33wr2flb6c7n"; }; "403c4174a81ed034269a740a7bb9739dd07b91da" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/403c4174a81ed034269a740a7bb9739dd07b91da; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/403c4174a81ed034269a740a7bb9739dd07b91da"; sha256 = "157xba3mjgw37m6i29chdk2l4jg4jmlp4fkmfsanl9g66z7aw4hg"; }; "4041329918332581cd573d410c6a163dcf7b7495" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/4041329918332581cd573d410c6a163dcf7b7495; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/4041329918332581cd573d410c6a163dcf7b7495"; sha256 = "1gvjy14zqhnyx4nnlcbj6649d2aw3vwaxhrls3ngrkw5jw74ckxj"; }; "409e09bd60df0765b85577118bd3da12988d97d9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613445-f4cf430b68ba4dbf80d97361d7c5dd6e/409e09bd60df0765b85577118bd3da12988d97d9; + url = "http://cdn.unrealengine.com/dependencies/2613445-f4cf430b68ba4dbf80d97361d7c5dd6e/409e09bd60df0765b85577118bd3da12988d97d9"; sha256 = "0lq5lril4ylw3xg46djxzlkbvv109lpa4l0l7ag0q555yzhfcnp8"; }; "40b467567f62e9c6d0bf5cba7d2ff43cb9a687b3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2599079-89300969452d4a5eaefe1ab4af976839/40b467567f62e9c6d0bf5cba7d2ff43cb9a687b3; + url = "http://cdn.unrealengine.com/dependencies/2599079-89300969452d4a5eaefe1ab4af976839/40b467567f62e9c6d0bf5cba7d2ff43cb9a687b3"; sha256 = "02qslivwbnycygypvqicgv8syrsrdw9cv7bmz4zxp9ghbkmasx5g"; }; "40ddad780beeb95a141365c9ee5c50502ecf9a3f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/40ddad780beeb95a141365c9ee5c50502ecf9a3f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/40ddad780beeb95a141365c9ee5c50502ecf9a3f"; sha256 = "0bd531adivbi47mb1nqmwm23plhsh6hbj54wrpnkyzbkciq24jd8"; }; "40f7222800bd5c3a14980a0f6e706ce2b8a6dc8a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/40f7222800bd5c3a14980a0f6e706ce2b8a6dc8a; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/40f7222800bd5c3a14980a0f6e706ce2b8a6dc8a"; sha256 = "13rzkw224mz4qfsz7f3pywdl2nkly5k28jvrzqqhksrrddf4y78g"; }; "410e46447d67d73c00b681403bff72bd1c8db3e1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/410e46447d67d73c00b681403bff72bd1c8db3e1; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/410e46447d67d73c00b681403bff72bd1c8db3e1"; sha256 = "0dahfv97qdxza2yjp60mkflmf541s99c8j0m119vigv5795nrp2l"; }; "4138035f335e8ef4c9bd7d4700011e8ce6bc06dc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4138035f335e8ef4c9bd7d4700011e8ce6bc06dc; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4138035f335e8ef4c9bd7d4700011e8ce6bc06dc"; sha256 = "1fn99hdnba0zza6w416xkqj6vajgk57s5qphqbn2jsrf024kaal4"; }; "41478e3ee1bd4eb5b22ccbef4265d78586e0a9d3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/41478e3ee1bd4eb5b22ccbef4265d78586e0a9d3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/41478e3ee1bd4eb5b22ccbef4265d78586e0a9d3"; sha256 = "0k259kbgvw1zm8dcs0mp21lh88zvkxzy1v2zyj8yb8hp94gdwp1r"; }; "416a2ef9e1d85c9801e1c11b5b75e6647f40b196" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/416a2ef9e1d85c9801e1c11b5b75e6647f40b196; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/416a2ef9e1d85c9801e1c11b5b75e6647f40b196"; sha256 = "1zxg97c2211hspph0d9jzaqlvrfd8cx49d40k5halnz3h682cl2d"; }; "416d80d6a7cfb22bb899d4a75a80c78ddd81ffbf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/416d80d6a7cfb22bb899d4a75a80c78ddd81ffbf; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/416d80d6a7cfb22bb899d4a75a80c78ddd81ffbf"; sha256 = "16xfnicsjfvhzcnzpf1rpbb9q42dq67kbxi84mb4gvdrqigkvmg5"; }; "4179740ad0fac203ef6afbed2ade36619667a9f2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4179740ad0fac203ef6afbed2ade36619667a9f2; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4179740ad0fac203ef6afbed2ade36619667a9f2"; sha256 = "02kg5bp115via7359bkr3vgbk1nvylhzjc9szzqjbff3mb2fxgdn"; }; "418d45c49afe937049dd1f731516162b1f716dda" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/418d45c49afe937049dd1f731516162b1f716dda; + url = "http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/418d45c49afe937049dd1f731516162b1f716dda"; sha256 = "05fqszk0lv9ynzpf6lr44jddhm5lr476naxiiqsvwj4g62i8nv6i"; }; "41b5b5efc87e1d57447016f701ab6688ba9bed94" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/41b5b5efc87e1d57447016f701ab6688ba9bed94; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/41b5b5efc87e1d57447016f701ab6688ba9bed94"; sha256 = "0gcfhbzh8hqhv5xzyfz20j01haxgyirilv8nphg74ky961y2sj2g"; }; "41d5dc73ef01e6cc21c028fba64a655a4f2d3d52" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/41d5dc73ef01e6cc21c028fba64a655a4f2d3d52; + url = "http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/41d5dc73ef01e6cc21c028fba64a655a4f2d3d52"; sha256 = "13sdr479wysfckxv8lx7p3kh0mc9ajdyknkvzgklaxcxpl591y67"; }; "41e03d2c0ea9b66441ae01c7aa831107fba3ffed" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/41e03d2c0ea9b66441ae01c7aa831107fba3ffed; + url = "http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/41e03d2c0ea9b66441ae01c7aa831107fba3ffed"; sha256 = "0zfmpa24cl54f7zlpcmc6ki6kqh0qnv6g5kfi9jv51m9l2cg0x5g"; }; "41e5224b15d09a7227b36b443d5ad87d74e45b50" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/41e5224b15d09a7227b36b443d5ad87d74e45b50; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/41e5224b15d09a7227b36b443d5ad87d74e45b50"; sha256 = "1mpq5lifwddv3mg2lxh3973nz3k3j9bs6r0ma3zknc9pjzvhr6z4"; }; "41fd3f7a3fb916297e3f478f49ee73a7ef8b0eea" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/41fd3f7a3fb916297e3f478f49ee73a7ef8b0eea; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/41fd3f7a3fb916297e3f478f49ee73a7ef8b0eea"; sha256 = "1m0san717x975926nnbinwbq8wchxbrj8w9pddq72s9k3h57a51q"; }; "41fddcc984061641cb8c27aba4b296bd158bb7b6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2622402-86d1483fa60742b6be9fd5a0b0b946e0/41fddcc984061641cb8c27aba4b296bd158bb7b6; + url = "http://cdn.unrealengine.com/dependencies/2622402-86d1483fa60742b6be9fd5a0b0b946e0/41fddcc984061641cb8c27aba4b296bd158bb7b6"; sha256 = "0pq8gl1n7anxky03fy135mwcp76y6270i5jjq7il985mhqa9n3xs"; }; "42325aa5f02bc9fc9310d7edd42e4e731ef6896a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/42325aa5f02bc9fc9310d7edd42e4e731ef6896a; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/42325aa5f02bc9fc9310d7edd42e4e731ef6896a"; sha256 = "1r6fhxi4341408ibhgq92yw8hih2nq7m9klax7hsfmdr4di537hg"; }; "4245e1d2e7ad643f66f744a3ed38052789489640" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4245e1d2e7ad643f66f744a3ed38052789489640; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4245e1d2e7ad643f66f744a3ed38052789489640"; sha256 = "08fnw7apzsdwx44q2bc66r6gb24z5df5573zsf0fibnflz457zj0"; }; "427e2d72759a41c12424a8f41db8c46c533e7aad" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/427e2d72759a41c12424a8f41db8c46c533e7aad; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/427e2d72759a41c12424a8f41db8c46c533e7aad"; sha256 = "1anhhx1xifzqa7lifb63jgrfdx0j5j3ngr7pd9acbwhf1fnz1xan"; }; "4287f776bff018fbd5847a483885c62661d3e8b7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/4287f776bff018fbd5847a483885c62661d3e8b7; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/4287f776bff018fbd5847a483885c62661d3e8b7"; sha256 = "0ka3mm4icsf0rvlq84s0zc2pyyymwfl7vidvhp6gphi9wb0gg0si"; }; "429bcf5d037539b13d24742b82d8b2e4dfc310a2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/429bcf5d037539b13d24742b82d8b2e4dfc310a2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/429bcf5d037539b13d24742b82d8b2e4dfc310a2"; sha256 = "15609z8zkg3xf0374ccr3qw4c0y4l6via1c8vpn1g3n3aclgrcvr"; }; "42a2da181f0e0c22a37f4fd84ebb8992f5801a40" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/42a2da181f0e0c22a37f4fd84ebb8992f5801a40; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/42a2da181f0e0c22a37f4fd84ebb8992f5801a40"; sha256 = "134cik312f2mc2cm6syz3khm11j4z5mki1ajis11plp9yc4awlrb"; }; "42a53ede1b023f8c062f8cdda02e206b50d9b706" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/42a53ede1b023f8c062f8cdda02e206b50d9b706; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/42a53ede1b023f8c062f8cdda02e206b50d9b706"; sha256 = "0bf6waiwj827d6q4jlk84iz194gkrwyq62iqbh5k7via2xwq8j1w"; }; "42d3f4d56675451d30b582bc5dbd45fd3782d471" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/42d3f4d56675451d30b582bc5dbd45fd3782d471; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/42d3f4d56675451d30b582bc5dbd45fd3782d471"; sha256 = "1k865pqjyn2i29kypga3m3g705pclw082zcr50yx4pzb4gyx81ss"; }; "43024ccccfd7e2f51ab71730d53234756da7f75e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/43024ccccfd7e2f51ab71730d53234756da7f75e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/43024ccccfd7e2f51ab71730d53234756da7f75e"; sha256 = "0qiafmz9hg9g936y32jfi81whv6ijsbxi3wq2vjygwvw12z3pp7k"; }; "4325240311aaa4a187fdea78519062e5a4d7269b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4325240311aaa4a187fdea78519062e5a4d7269b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4325240311aaa4a187fdea78519062e5a4d7269b"; sha256 = "13im2y96y8wlfq6i85dw6rpbrzqypvzhbb5f6272zi8mg0vl68c4"; }; "434d698cf6b167859c6903ad11759566d8f57b0e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/434d698cf6b167859c6903ad11759566d8f57b0e; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/434d698cf6b167859c6903ad11759566d8f57b0e"; sha256 = "1p1mx0lffkz0lb4ryrjv8nbvmb3vzr1yhd6bar6mgn9j26x68nhd"; }; "4358d2bea62c66562030e8970bcc999a9f049cd9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2565979-eaaf2006b54843b69b5280979c12ed6d/4358d2bea62c66562030e8970bcc999a9f049cd9; + url = "http://cdn.unrealengine.com/dependencies/2565979-eaaf2006b54843b69b5280979c12ed6d/4358d2bea62c66562030e8970bcc999a9f049cd9"; sha256 = "10g40dfpwcmwid6x2zj4jsr8wlfaj19wncimrj64ma84x9asid6l"; }; "439b6b4397b03135c193062962f4e04f7efb2f97" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/439b6b4397b03135c193062962f4e04f7efb2f97; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/439b6b4397b03135c193062962f4e04f7efb2f97"; sha256 = "0fxgi0m96lz8vsig99mi43bmkxj4zqhdrmcin3s15qgqv5fnpp0i"; }; "43af1512f9c03f740a4b1e5e5d430bc184358f2c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2482391-24fb529bc09847ca8c3576d69ba36285/43af1512f9c03f740a4b1e5e5d430bc184358f2c; + url = "http://cdn.unrealengine.com/dependencies/2482391-24fb529bc09847ca8c3576d69ba36285/43af1512f9c03f740a4b1e5e5d430bc184358f2c"; sha256 = "0rllprr8x2wylsymvmwjbfxm5wc81q6hxz9xqz7ps99wnaa376vj"; }; "43ce938e9264c991f07b4ab978d5801d8b385c7f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/43ce938e9264c991f07b4ab978d5801d8b385c7f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/43ce938e9264c991f07b4ab978d5801d8b385c7f"; sha256 = "1xlk578ab6r0jia0ipsznr8kb0r95ljzqxhlxbp2gizyad80rbvw"; }; "43d2fd6b8e568774d422003e4f1d8cbd90c8ad09" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/43d2fd6b8e568774d422003e4f1d8cbd90c8ad09; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/43d2fd6b8e568774d422003e4f1d8cbd90c8ad09"; sha256 = "1gz46rhfy3w67945dwrbj5364z3r5vfkq7kcsdvlam8sn31mban6"; }; "43d5b1f0c816ddc1a75dc7c9eba7e3861bfac93b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/43d5b1f0c816ddc1a75dc7c9eba7e3861bfac93b; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/43d5b1f0c816ddc1a75dc7c9eba7e3861bfac93b"; sha256 = "05x9b14mm65v3kg0w3vknv0las5669dxqi863pj283gykai5y5j8"; }; "44550fffb2c3c4bd3e389a62349314f917149551" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/44550fffb2c3c4bd3e389a62349314f917149551; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/44550fffb2c3c4bd3e389a62349314f917149551"; sha256 = "0gwbyp4cz93dhp4lvlzb16ylkdkl1861q5sc9x8lzcfhrdlzbbqx"; }; "44988d061edf9fe35e6423243372b984f7bbc8ce" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/44988d061edf9fe35e6423243372b984f7bbc8ce; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/44988d061edf9fe35e6423243372b984f7bbc8ce"; sha256 = "1ijy29lal9bg8kwbjgzvzjc57f1vls2g073hvlgvha84a32qhd5f"; }; "44aea7fc4f0d356841e342fce80616815268e97c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/44aea7fc4f0d356841e342fce80616815268e97c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/44aea7fc4f0d356841e342fce80616815268e97c"; sha256 = "1xspkr7cq8whhk66z695yvgf0z1z4w6rck41n9jxr9c2xkycafvs"; }; "44bfee33fde62aa26954c1ac4481489a0997550f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/44bfee33fde62aa26954c1ac4481489a0997550f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/44bfee33fde62aa26954c1ac4481489a0997550f"; sha256 = "1r6zdd24m7m0rykn7qbl1bkbxmiwh2jmkkqva5nw0zyc33rhy6dz"; }; "44e185cd6baca3dd0931a5b2c536c61efdb62652" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/44e185cd6baca3dd0931a5b2c536c61efdb62652; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/44e185cd6baca3dd0931a5b2c536c61efdb62652"; sha256 = "10ji73zvb3wjsr9283r2may7kwjwrch0zdkw5qi845q1xdsy03qn"; }; "44f209fa07e3956ffbde948b34a35bca08039bf4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/44f209fa07e3956ffbde948b34a35bca08039bf4; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/44f209fa07e3956ffbde948b34a35bca08039bf4"; sha256 = "19h5cpf1n828wxy77sa7ajfiy3pfg2hjnaprml3wl7g607zsb2wi"; }; "450752e8befdc19f8af240d074de7cfdff240ff6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/450752e8befdc19f8af240d074de7cfdff240ff6; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/450752e8befdc19f8af240d074de7cfdff240ff6"; sha256 = "03f7fvkqvbxi8xfqc5x6zzwa141rzjrvxfn4npcqifzv543zlwfl"; }; "451249045a83162ab51a602006391035d937b4fe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/451249045a83162ab51a602006391035d937b4fe; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/451249045a83162ab51a602006391035d937b4fe"; sha256 = "1f594dpxyb2vln0bjj10yzxmxim88d27asaxb05b7msj8s4if4qz"; }; "457e4cce8cc3af1d0237efdf32e01dd8149d1366" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/457e4cce8cc3af1d0237efdf32e01dd8149d1366; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/457e4cce8cc3af1d0237efdf32e01dd8149d1366"; sha256 = "0ipki4pq2irfhy10sapsah9frp3nx6j33sjdi5a82sz5hc00czvy"; }; "458ce5eadcec7db6c79cc7c4785864957159d82d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2649176-0ea78bc522e047c6b5b5e477faaaf0eb/458ce5eadcec7db6c79cc7c4785864957159d82d; + url = "http://cdn.unrealengine.com/dependencies/2649176-0ea78bc522e047c6b5b5e477faaaf0eb/458ce5eadcec7db6c79cc7c4785864957159d82d"; sha256 = "0xlz9ag4xxqza8c1bbx4aj73nphngqnqmb2g2kx4wzrsf60balqk"; }; "45b816b4d0f405c95179b48d4aef89b863be886b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/45b816b4d0f405c95179b48d4aef89b863be886b; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/45b816b4d0f405c95179b48d4aef89b863be886b"; sha256 = "1b6n8l0xwxfpxysljvqgh2pccqxsv7hhsgvigk7bc7bfvm4f2bc5"; }; "45b8181ade7c5f9416382db55ebb9ff006a860ae" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/45b8181ade7c5f9416382db55ebb9ff006a860ae; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/45b8181ade7c5f9416382db55ebb9ff006a860ae"; sha256 = "0mns61vw4kv3v6pjmkqzad95x9sqlvkazr2qcxlp2pjl41h349jw"; }; "45b97a83e7de5add19253c91c6f9c3fca6133a0b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2515854-a6b06d306d9743a78268eae33a3084ae/45b97a83e7de5add19253c91c6f9c3fca6133a0b; + url = "http://cdn.unrealengine.com/dependencies/2515854-a6b06d306d9743a78268eae33a3084ae/45b97a83e7de5add19253c91c6f9c3fca6133a0b"; sha256 = "0bymag4rf1gnyc3yfn4xjmi1n22zkfqzqdpg09wbnrmghld92rhx"; }; "45c2f6d67121c2498bd3723b899243959da6e017" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/45c2f6d67121c2498bd3723b899243959da6e017; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/45c2f6d67121c2498bd3723b899243959da6e017"; sha256 = "1z8ks07y1q8ifi8mbb2n1igfa6a6dpmmzscn14mr860a8lh9lp1v"; }; "4653f71982a36f99d16331bbaebded3036eff50f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4653f71982a36f99d16331bbaebded3036eff50f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4653f71982a36f99d16331bbaebded3036eff50f"; sha256 = "05n5s7vhiiisamy7n1c31s68yy7iplfsr8q7qkjwijp6svpz3w4r"; }; "46cacf33335ca2ec60df0c71cc36af0602ca8bfb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/46cacf33335ca2ec60df0c71cc36af0602ca8bfb; + url = "http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/46cacf33335ca2ec60df0c71cc36af0602ca8bfb"; sha256 = "117j7ps781wbi14cc9r5v0n64xsl7p8yr2ism8i4n8ij3i106cf7"; }; "46cea2f0ed5abe44ea23ba16c356889ae16636e3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/46cea2f0ed5abe44ea23ba16c356889ae16636e3; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/46cea2f0ed5abe44ea23ba16c356889ae16636e3"; sha256 = "1rsy2lac1ck6flh60jh5b640kns104f40qr5ffsf7mxj3zzc9h3w"; }; "46e1d0fc2b1da401fb554e93a9e7f69ba5b9857e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/46e1d0fc2b1da401fb554e93a9e7f69ba5b9857e; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/46e1d0fc2b1da401fb554e93a9e7f69ba5b9857e"; sha256 = "18vcpjb9qvy9xswrk2zna7g2xmj0dycpsnnpddydlby8mrda1vd0"; }; "47057afb3b675c9635a3a671c05a32525083c8c4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/47057afb3b675c9635a3a671c05a32525083c8c4; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/47057afb3b675c9635a3a671c05a32525083c8c4"; sha256 = "120gd17dy4m36r4y36ivjkmn9vvfgycfw0jna7vx85qys7f2qslx"; }; "471521a96267727393067d510fa208a9f090ee56" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/471521a96267727393067d510fa208a9f090ee56; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/471521a96267727393067d510fa208a9f090ee56"; sha256 = "043gl3chcbcyh3na9wcv26kag7hixk31yh8synihybml4bf30am1"; }; "4733ca75068a23a29a578352ecc8dddc16d714e6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4733ca75068a23a29a578352ecc8dddc16d714e6; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4733ca75068a23a29a578352ecc8dddc16d714e6"; sha256 = "11g301j3gim04xisk1pzdsxv5ygj6mf39rkxw9hfrbzky4y5zfb5"; }; "476436af18523fd743894ca8676ceb74f5d392f4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/476436af18523fd743894ca8676ceb74f5d392f4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/476436af18523fd743894ca8676ceb74f5d392f4"; sha256 = "1qld1qqnmmn6bcw8gxs8fi0227w5d2pwyk9hxqqwfvqazmbmrdra"; }; "4782725e3bb079fa03e2bc6e6d6ca44c9352c9ce" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4782725e3bb079fa03e2bc6e6d6ca44c9352c9ce; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4782725e3bb079fa03e2bc6e6d6ca44c9352c9ce"; sha256 = "002qq97afjmvpwa5vhpzyknywxfg4f6hm8f9z6vhcbc487j24dfx"; }; "47c3dd6d524f1923aa08644c2e4083ced4d481a0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/47c3dd6d524f1923aa08644c2e4083ced4d481a0; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/47c3dd6d524f1923aa08644c2e4083ced4d481a0"; sha256 = "093zcfgvnr9x6b50zi4dcvp0qp6dsp4y9z438gzf8cz41ilmk2mq"; }; "47cb5394541c26f3bab3e60fab36b8acba1d8907" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/47cb5394541c26f3bab3e60fab36b8acba1d8907; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/47cb5394541c26f3bab3e60fab36b8acba1d8907"; sha256 = "0aqwpc5krlqi81g2wcbq2591kbnnv01cgiq4qdyd9jlkfpk79ra3"; }; "485fd4e8653da37ae3302212c1ff6c808f2e1e7a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/485fd4e8653da37ae3302212c1ff6c808f2e1e7a; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/485fd4e8653da37ae3302212c1ff6c808f2e1e7a"; sha256 = "10k9s21042a9gi2k03d9r5lg8h2gx07sa39wx8zrfs697g0g9082"; }; "486e59fe184e878bc399bc95f1f81b94c3e84237" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/486e59fe184e878bc399bc95f1f81b94c3e84237; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/486e59fe184e878bc399bc95f1f81b94c3e84237"; sha256 = "19ck4wmlzfj43w9b1l54na3ql62n0jx0h7ffb0ghizswnb36nvcv"; }; "487d06c15e88caec9f131b002ba4ced31ca8ea46" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/487d06c15e88caec9f131b002ba4ced31ca8ea46; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/487d06c15e88caec9f131b002ba4ced31ca8ea46"; sha256 = "1mfvbd2p8508f07dhh1dfqaq1a9n7c4l5dsfajzhcdndlzawrbbc"; }; "488efa1da7ed78314cdd0c95ad874f812853fcd7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/488efa1da7ed78314cdd0c95ad874f812853fcd7; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/488efa1da7ed78314cdd0c95ad874f812853fcd7"; sha256 = "09jjzzvszqv7f7a70i8gib9x04h6967by6cs8dfqfb8ysfrx426n"; }; "489e5e0492743ad3dbfd8599a5d00f284d4b13d3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/489e5e0492743ad3dbfd8599a5d00f284d4b13d3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/489e5e0492743ad3dbfd8599a5d00f284d4b13d3"; sha256 = "1szgnqakysr4r59zqi8i1sjqbpykjb7flvmw8p00mx0zqpw2qi6y"; }; "48a51059aeb73ec544e6c1ace7303ebc6143b782" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/48a51059aeb73ec544e6c1ace7303ebc6143b782; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/48a51059aeb73ec544e6c1ace7303ebc6143b782"; sha256 = "0w212ajaypf69mx8hc94kz61l1f64dvh99rpmzrycwllxk17il1w"; }; "48becdab8fce5451f3de26a98ad8c4b41c51c09e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/48becdab8fce5451f3de26a98ad8c4b41c51c09e; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/48becdab8fce5451f3de26a98ad8c4b41c51c09e"; sha256 = "1pb09gl5ji1c71nhg2bv6i3wknx11vnxcjjyfvlzgpfsw7mi9c99"; }; "48e9d691a3bd11810596fcf32aef9faa872a8fc3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/48e9d691a3bd11810596fcf32aef9faa872a8fc3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/48e9d691a3bd11810596fcf32aef9faa872a8fc3"; sha256 = "0anv20icv51j79f4vzzh7q1a9jwpk65zzs0brsylyfkylskd9wz7"; }; "4905bf362dac5be04631d1ce552b8184a6f9eb7f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4905bf362dac5be04631d1ce552b8184a6f9eb7f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4905bf362dac5be04631d1ce552b8184a6f9eb7f"; sha256 = "0yf7x9wc9zwdpdpqh6x8kcrphmc63ij9xcb6ggfbihjhhfkq9m2y"; }; "493b6e580a2441b91435c406da869b799e031da2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/493b6e580a2441b91435c406da869b799e031da2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/493b6e580a2441b91435c406da869b799e031da2"; sha256 = "0ic4h663s8yyckvzrkbbhg8ih888igvcswsnnh66zwrl3h5wjshd"; }; "497e1a2128ecd56307d393c59ed4962de200412c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621802-1efd555e661e4948aa22f3883712aa6c/497e1a2128ecd56307d393c59ed4962de200412c; + url = "http://cdn.unrealengine.com/dependencies/2621802-1efd555e661e4948aa22f3883712aa6c/497e1a2128ecd56307d393c59ed4962de200412c"; sha256 = "0860mkkg6k4c2fjzq573xpf13cvcmn276z45hi146y0llsb9hpwf"; }; "49d7eaf76b4f243057c59f3fda3310c655144a0e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/49d7eaf76b4f243057c59f3fda3310c655144a0e; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/49d7eaf76b4f243057c59f3fda3310c655144a0e"; sha256 = "07sn2y8bzh0flhrkkw12x7rc9p78mmsx0dphsm0mxb9nkkznygq0"; }; "49e02b1078a769deaf14989f1731daeb927f2192" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2787088-b587684669f0414288401564922cf5d8/49e02b1078a769deaf14989f1731daeb927f2192; + url = "http://cdn.unrealengine.com/dependencies/2787088-b587684669f0414288401564922cf5d8/49e02b1078a769deaf14989f1731daeb927f2192"; sha256 = "180yvr32wnhgivkz5i00l88wkw4l5v9d5vgmdxhjvndzv52ij00p"; }; "49ffdfd5801c4c8c2b51be4b2e51108595a340f7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/49ffdfd5801c4c8c2b51be4b2e51108595a340f7; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/49ffdfd5801c4c8c2b51be4b2e51108595a340f7"; sha256 = "0m0qv1wyslkdg75ymbba0ppp35ir9wmm51jqsaac3wxjacgwp85f"; }; "4a3c35cce04ee67dd38baa7ef7703dbd6fa6b14f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/4a3c35cce04ee67dd38baa7ef7703dbd6fa6b14f; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/4a3c35cce04ee67dd38baa7ef7703dbd6fa6b14f"; sha256 = "02kqv01gjhj6402i18cq5ihp9nbcl4ij7hanb2l6k3mw2f3h9202"; }; "4a6de8866429da8f1baf5ddaf3973c381e507f9f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4a6de8866429da8f1baf5ddaf3973c381e507f9f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4a6de8866429da8f1baf5ddaf3973c381e507f9f"; sha256 = "113qadrkv6calsid2bbb0lswimr3qasf0mzyvbxcg888q934dirp"; }; "4a996ed0676c92d061e923599186c0d592b8c180" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4a996ed0676c92d061e923599186c0d592b8c180; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4a996ed0676c92d061e923599186c0d592b8c180"; sha256 = "0gfmg2si5wmv99d0f3z82qdpcnkb377hvd9mjn29npvmzcxdk8xl"; }; "4aac38fbf89541859c14c7fbf320b1f9deb410f4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4aac38fbf89541859c14c7fbf320b1f9deb410f4; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4aac38fbf89541859c14c7fbf320b1f9deb410f4"; sha256 = "1snz21gw73zi27bha2jq2099j4hgk03xrn382rgc9l0j6zx1hcld"; }; "4ac1a3a1641db0a7d533dc58b147c50ee5e61f2d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2495503-7390cc25898b4ab0a4f9f846f2fd7754/4ac1a3a1641db0a7d533dc58b147c50ee5e61f2d; + url = "http://cdn.unrealengine.com/dependencies/2495503-7390cc25898b4ab0a4f9f846f2fd7754/4ac1a3a1641db0a7d533dc58b147c50ee5e61f2d"; sha256 = "1b0wz0gz103l9vvg2g9xbds3nc65x3bv7nb4rw8k1lafnpypxvx4"; }; "4ac1a96d979c84bea010254903c746d8f0192931" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/4ac1a96d979c84bea010254903c746d8f0192931; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/4ac1a96d979c84bea010254903c746d8f0192931"; sha256 = "0p4zjrik6jbp25vsahv7g8jkpvydkh19winqiswiz91xfjzi7wfl"; }; "4adb6983f2858294dd67959dbb107cb141c93c74" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4adb6983f2858294dd67959dbb107cb141c93c74; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4adb6983f2858294dd67959dbb107cb141c93c74"; sha256 = "07fbgdm1d6ymv6m046pmjh0af4syin13f3g36kyh19gbsf81gn51"; }; "4b0a3157b647ecf945962c64e6c1f2a4b0841404" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4b0a3157b647ecf945962c64e6c1f2a4b0841404; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4b0a3157b647ecf945962c64e6c1f2a4b0841404"; sha256 = "0qh7irvdj2ak0ixbq8mvgnyak9l378463ffgvh8a76rvajlmfw01"; }; "4b6a1631906e490aad98097955aaed303b835e4c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/4b6a1631906e490aad98097955aaed303b835e4c; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/4b6a1631906e490aad98097955aaed303b835e4c"; sha256 = "1c8mzirs8qbk2532ai7sj6gx98lhzl2r8c5w78p2zhxc44qds6cy"; }; "4b6f876e200503f43b0378c2bff4e3371dede19d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/4b6f876e200503f43b0378c2bff4e3371dede19d; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/4b6f876e200503f43b0378c2bff4e3371dede19d"; sha256 = "1wxz4zscc57j0h8jrdxiy7qjx5gyz5wv552hkx9swzl8zv1c4vxi"; }; "4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9"; sha256 = "10mgd6mhyp147v70vrjs2pni99f10wvjzzxgv4s1yb0kb1f3rx7m"; }; "4ba9e150400597410bcc2038b890c5ebfab59f97" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4ba9e150400597410bcc2038b890c5ebfab59f97; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4ba9e150400597410bcc2038b890c5ebfab59f97"; sha256 = "11gnqjjjdjjlxnzsx2p2j08xjjpr28zy5g0y5ba2q9fzz1pmi0xd"; }; "4bb876b638318dcb891581ef5c5b60ab49f84a14" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4bb876b638318dcb891581ef5c5b60ab49f84a14; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4bb876b638318dcb891581ef5c5b60ab49f84a14"; sha256 = "0kabkyrgb8jbp90hbmksmh03r5bbfk9rk61rix4krk2dlcb0dazi"; }; "4bc5d5526880f85cc76aa4910df1d4cb262afea4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/4bc5d5526880f85cc76aa4910df1d4cb262afea4; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/4bc5d5526880f85cc76aa4910df1d4cb262afea4"; sha256 = "18g5sk5ck5yv7bm84c3hm4q1b05kwm4vv5dq5l54a0pkgp59grqv"; }; "4bdc7380f8fb8cd1f70702e4b5dd2f4ea262d125" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4bdc7380f8fb8cd1f70702e4b5dd2f4ea262d125; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4bdc7380f8fb8cd1f70702e4b5dd2f4ea262d125"; sha256 = "0j924pcmddwqap395nsygs3jzcsfp3f225waypzjzwzf0dqdwvdm"; }; "4be9c06ad3f3ec9e3ab2f093677c38c9a57609fd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4be9c06ad3f3ec9e3ab2f093677c38c9a57609fd; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4be9c06ad3f3ec9e3ab2f093677c38c9a57609fd"; sha256 = "0inyckyvag3cjbjw7yir3ga8qx6kly82xhi4ibrqs5anmlbvg6wn"; }; "4bf3ad76dabf85f8e9a2caef2ec4cc44035c1748" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2557508-14de7cde62764f07a29f3058b3db36e8/4bf3ad76dabf85f8e9a2caef2ec4cc44035c1748; + url = "http://cdn.unrealengine.com/dependencies/2557508-14de7cde62764f07a29f3058b3db36e8/4bf3ad76dabf85f8e9a2caef2ec4cc44035c1748"; sha256 = "0d9igj7ncm9bgx4z8sybfw5qa0vsslfp155wgycj77sqbk4vxw6f"; }; "4ca619b184d0aecc977846b5cb89a7789844736d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/4ca619b184d0aecc977846b5cb89a7789844736d; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/4ca619b184d0aecc977846b5cb89a7789844736d"; sha256 = "0x6km34gk5wmd1p3i2b9a8bhv32337dxmilaq2x9zg12g5j0ab76"; }; "4ca7aeb41838db40fce0bd1181781152f3273c85" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4ca7aeb41838db40fce0bd1181781152f3273c85; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4ca7aeb41838db40fce0bd1181781152f3273c85"; sha256 = "1c47j2as7c67aa4y21gkli9qxzik75aq0abdvjln2mw2yidd9f6q"; }; "4cdfababde3088412ac7195d034c19f4f7e873cc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4cdfababde3088412ac7195d034c19f4f7e873cc; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4cdfababde3088412ac7195d034c19f4f7e873cc"; sha256 = "0mqq1vbh9ikcrplnr5sa0lz73p45kl8wc1py3ylmycifymjcb7jk"; }; "4cf428f5e7b38cea3b24dce0380c776e1a06ecaf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2787088-b587684669f0414288401564922cf5d8/4cf428f5e7b38cea3b24dce0380c776e1a06ecaf; + url = "http://cdn.unrealengine.com/dependencies/2787088-b587684669f0414288401564922cf5d8/4cf428f5e7b38cea3b24dce0380c776e1a06ecaf"; sha256 = "078yzqnwidsx5xqa5p9jvl4qqvhdmx5i2rv31azjc1s9bbyihnyg"; }; "4d0630a1e99d1c060c8dd45b809b2e6c5e6bde7a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4d0630a1e99d1c060c8dd45b809b2e6c5e6bde7a; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4d0630a1e99d1c060c8dd45b809b2e6c5e6bde7a"; sha256 = "0hrpqrb934z5qjxmvp2hpjqkbr80xwqrd8bxj63pdcz11axnk1c1"; }; "4d1f805d1ce7a7c6f0eb46295359f5ef01297c17" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/4d1f805d1ce7a7c6f0eb46295359f5ef01297c17; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/4d1f805d1ce7a7c6f0eb46295359f5ef01297c17"; sha256 = "1fh46cz761wk4cy6xskjs07a58sb2im6n56gk20mmslw2iv8y1z2"; }; "4d65a777c9a440e869ef25b04b71a9d9a6ff7190" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2593226-b511ed7dda124055acab1a4474628222/4d65a777c9a440e869ef25b04b71a9d9a6ff7190; + url = "http://cdn.unrealengine.com/dependencies/2593226-b511ed7dda124055acab1a4474628222/4d65a777c9a440e869ef25b04b71a9d9a6ff7190"; sha256 = "0jv2bpb77dshi3kj0wlgzl0y7f5b1g0jr0h47fyraxk2mg10ry5q"; }; "4d6f9c6d7a261e35898225b1fade32da175cb530" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4d6f9c6d7a261e35898225b1fade32da175cb530; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4d6f9c6d7a261e35898225b1fade32da175cb530"; sha256 = "1kn5zg25rwl37vskaggw7hlb2yxxambk0lhaa4i0mlgj8050m2n6"; }; "4db41bf84756d686fc71e275d2c94c5c2299de97" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4db41bf84756d686fc71e275d2c94c5c2299de97; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4db41bf84756d686fc71e275d2c94c5c2299de97"; sha256 = "17rijjf8k5fa827szbj2adz8ix8z6h607xpa0mg69hrl9jxbi7jp"; }; "4dbf88901817044507142dfafe605a1b527a5733" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2416381-a1125fd46e044645898de0a3f7870b3d/4dbf88901817044507142dfafe605a1b527a5733; + url = "http://cdn.unrealengine.com/dependencies/2416381-a1125fd46e044645898de0a3f7870b3d/4dbf88901817044507142dfafe605a1b527a5733"; sha256 = "0bsykmshh4677rlkgd7qx2j0alcskw8krkvfzardcq481zkv3i7n"; }; "4de19ef682be73fd5616348eafabda7e5b5c2614" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4de19ef682be73fd5616348eafabda7e5b5c2614; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4de19ef682be73fd5616348eafabda7e5b5c2614"; sha256 = "0m3phx8581x615y7dg98kg0bdkka07897pjcd759dxjfbvvy2fyl"; }; "4e0bab5bde5138bbeb03c118ed5450afb6087c8f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4e0bab5bde5138bbeb03c118ed5450afb6087c8f; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4e0bab5bde5138bbeb03c118ed5450afb6087c8f"; sha256 = "1afci1zkw3skyih5ij2ld2z75xp3vf2q4ssdb39xgjw84hagxybl"; }; "4e10a129d42108f8b10039ca6b879fd30bfeb431" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/4e10a129d42108f8b10039ca6b879fd30bfeb431; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/4e10a129d42108f8b10039ca6b879fd30bfeb431"; sha256 = "0qyadw0q43aj15c699minvb2xbd6hlarwjy7gfsym9vbrv55fhjh"; }; "4e6e5e7b59b428c37f77a90e081f121a450cb039" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/4e6e5e7b59b428c37f77a90e081f121a450cb039; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/4e6e5e7b59b428c37f77a90e081f121a450cb039"; sha256 = "0vpr0k1mf4zg5k90jkx8jxm11dl0ky8jlyq17zcdl4v0ricadw57"; }; "4e7e810806daa53af602a84d64ae8277b20e8884" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/4e7e810806daa53af602a84d64ae8277b20e8884; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/4e7e810806daa53af602a84d64ae8277b20e8884"; sha256 = "1j4ms2b2g34d3hr2cwbimwlljpm9a08vwv6d644ryib170kiv8z2"; }; "4e98b65102ae8ae6833a82df09b1c4926070f680" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/4e98b65102ae8ae6833a82df09b1c4926070f680; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/4e98b65102ae8ae6833a82df09b1c4926070f680"; sha256 = "12np9i6rrfb72pzb53wqs9i2pi54gfd95sq5g1b5appj3qqvl5cw"; }; "4eacf8ae62800ea91a75533032d4a4abad00c1dc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/4eacf8ae62800ea91a75533032d4a4abad00c1dc; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/4eacf8ae62800ea91a75533032d4a4abad00c1dc"; sha256 = "1i23518c07q9q9npwrbmxl1dxx0sxyviv4l9892s8kjj2gamf4kn"; }; "4ee7da06ece4e65e4b1f6c4f3f60b4f183a6b0cc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4ee7da06ece4e65e4b1f6c4f3f60b4f183a6b0cc; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4ee7da06ece4e65e4b1f6c4f3f60b4f183a6b0cc"; sha256 = "1pliz4710qi465vhy2z90w9br02jx6k3r192izn96njsnd02mm4x"; }; "4efa7b4c022fb3147eafad578190d50881927acd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/4efa7b4c022fb3147eafad578190d50881927acd; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/4efa7b4c022fb3147eafad578190d50881927acd"; sha256 = "1pic400nbygcarkrkzcdvhb00pq25iipn3bwlgcng38ihfay7wjm"; }; "4f65d69acee548a54f8329d2457356d425bee4a7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4f65d69acee548a54f8329d2457356d425bee4a7; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4f65d69acee548a54f8329d2457356d425bee4a7"; sha256 = "1bl8arab79mh10qclam0gmf0bf7rqj4zbas3bsz2jq6mnw7hz7py"; }; "4f6a87f4bf05f150a09c25735784bc3739871dfb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/4f6a87f4bf05f150a09c25735784bc3739871dfb; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/4f6a87f4bf05f150a09c25735784bc3739871dfb"; sha256 = "0kal7sz290wjq3p8v76kyhj9l783h8br06cfyd8vr93xnrmxj18s"; }; "4f81cd7206cb477f1b15d71433f87035b8ef4b61" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4f81cd7206cb477f1b15d71433f87035b8ef4b61; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4f81cd7206cb477f1b15d71433f87035b8ef4b61"; sha256 = "0dkad05vjbxqvdhx3594j7vx7qjjckpzcsnbwmlb6jvlp7ki4qal"; }; "4f9629d19fa7928aaae10e4bb7c79195fb4f2436" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4f9629d19fa7928aaae10e4bb7c79195fb4f2436; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4f9629d19fa7928aaae10e4bb7c79195fb4f2436"; sha256 = "0w26dm0npmlbdg73j89rmbxpkr64i80wdm4zzgsafrh3vmaqs38n"; }; "4fb2c8f58c15b33818735ef8f75ba170a1b1f65d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4fb2c8f58c15b33818735ef8f75ba170a1b1f65d; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4fb2c8f58c15b33818735ef8f75ba170a1b1f65d"; sha256 = "111hbfbikwl85iscj37k3wn35s47cd6qzpcsir1ylaxcb9q350j7"; }; "4fbda194b6083d60ec1a9e281eb6caad5716cf1e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2489751-c4626d8ec02a40d3817d364f1bc426a5/4fbda194b6083d60ec1a9e281eb6caad5716cf1e; + url = "http://cdn.unrealengine.com/dependencies/2489751-c4626d8ec02a40d3817d364f1bc426a5/4fbda194b6083d60ec1a9e281eb6caad5716cf1e"; sha256 = "0nfihbl3pwni0gpfrpcdi4xggdkr0m9d4lq788w9hfb4phfppkjh"; }; "4fe88f539e62bf77da44db73cb91ffe913569e34" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/4fe88f539e62bf77da44db73cb91ffe913569e34; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/4fe88f539e62bf77da44db73cb91ffe913569e34"; sha256 = "0vl7g23l199imd5n0ll78bf6bk5spx33r1sdzwbwyf439xd53zn5"; }; "4fecd0bf8aca3391671cf59243a551e7b58f745f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2787088-b587684669f0414288401564922cf5d8/4fecd0bf8aca3391671cf59243a551e7b58f745f; + url = "http://cdn.unrealengine.com/dependencies/2787088-b587684669f0414288401564922cf5d8/4fecd0bf8aca3391671cf59243a551e7b58f745f"; sha256 = "0yzh9i84lm4gh8wsljsa66bg9g6p0xbff3vq5rk1nha0zwg0i7x1"; }; "502e3c3b4dcae339b71743fc346f2398f2d7a218" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/502e3c3b4dcae339b71743fc346f2398f2d7a218; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/502e3c3b4dcae339b71743fc346f2398f2d7a218"; sha256 = "1qirpjwv6cmx2g74dlswhd5haaqff9km47xv79m6rd3c4q5xn0xs"; }; "50606bde1b8f7f906c86dad14730c53cab06b477" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/50606bde1b8f7f906c86dad14730c53cab06b477; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/50606bde1b8f7f906c86dad14730c53cab06b477"; sha256 = "1kfvwbxhl69f08ryfh39105xda14vz06r6zhvi18d3cy50znamw4"; }; "508797aad17ea00c10d3c50bebc98d3981dd7bb9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/508797aad17ea00c10d3c50bebc98d3981dd7bb9; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/508797aad17ea00c10d3c50bebc98d3981dd7bb9"; sha256 = "1r9csvlr703whm8dk759xnn89glrp1gbdxs60ahspls48yxj1syg"; }; "5098f795311987869f91ed638f4c0a395312211a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/5098f795311987869f91ed638f4c0a395312211a; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/5098f795311987869f91ed638f4c0a395312211a"; sha256 = "1j3k1vixg49ilcmvd9k82dq7lj0dlmf8iaz8zvsgzgril9azd3nw"; }; "50eea30641c70b731a2069bd514ef5f1709825de" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/50eea30641c70b731a2069bd514ef5f1709825de; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/50eea30641c70b731a2069bd514ef5f1709825de"; sha256 = "0p9k5jhmhv26i18c7axi9yvr29d4wzq4zr08875m1hcwhij3wyxg"; }; "51298934386bbe2da528af9262277810d6653396" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/51298934386bbe2da528af9262277810d6653396; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/51298934386bbe2da528af9262277810d6653396"; sha256 = "1yygwd8i6cp67rgz59g192x1klh3rxgsyzpmxcinj4b0iwihglvc"; }; "512f28040301a00935d7f1ded68e709b048d7f1d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/512f28040301a00935d7f1ded68e709b048d7f1d; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/512f28040301a00935d7f1ded68e709b048d7f1d"; sha256 = "075szic2vp5f6c3kmy432xn8r81pb6c82dwhpigmyvjl0hjqqcf5"; }; "51413e0814803560ea68a0cdfa59ae901551ad14" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/51413e0814803560ea68a0cdfa59ae901551ad14; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/51413e0814803560ea68a0cdfa59ae901551ad14"; sha256 = "1cbb5a1drx313zi7llrbwsj7yqshinxs3i1q86y63vrjh9yimsb6"; }; "514684d898b2ab6135a63ae87054e6af91cac2ae" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/514684d898b2ab6135a63ae87054e6af91cac2ae; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/514684d898b2ab6135a63ae87054e6af91cac2ae"; sha256 = "0xha9la702szpf8nqrm9kril6qdfl3vxpl18npm8d3rxgsbrrj1p"; }; "5147927b8b7ebed2923c8d3ae6b0e1f716b5fb61" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610954-bd0fcbe6f0c748508fe9438073c40b27/5147927b8b7ebed2923c8d3ae6b0e1f716b5fb61; + url = "http://cdn.unrealengine.com/dependencies/2610954-bd0fcbe6f0c748508fe9438073c40b27/5147927b8b7ebed2923c8d3ae6b0e1f716b5fb61"; sha256 = "18p404kg10mqfh5d2rcwalxrgr5ihw0lp14rm5xf1aiw303mlf61"; }; "5152492459f57a1bb4d120be68d29ed666c87c33" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5152492459f57a1bb4d120be68d29ed666c87c33; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5152492459f57a1bb4d120be68d29ed666c87c33"; sha256 = "17nfafsnk349q31cyrppz4w50z8c5n0ff2v6n5s3z8vzx4pj1zhg"; }; "519dd66ccb831a904959a155fd43639be5a97863" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2686985-76325fadec474557a67995f00383ea6d/519dd66ccb831a904959a155fd43639be5a97863; + url = "http://cdn.unrealengine.com/dependencies/2686985-76325fadec474557a67995f00383ea6d/519dd66ccb831a904959a155fd43639be5a97863"; sha256 = "01rd9jvys40vi6xqpyf2r1dqj4r3gg61w58madq8wq7q0x4wvvcg"; }; "519e03a04b64bc3d14eefb416e21ae15c6f0121e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/519e03a04b64bc3d14eefb416e21ae15c6f0121e; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/519e03a04b64bc3d14eefb416e21ae15c6f0121e"; sha256 = "15gfg5klklnhbfbsx0jqy33zamc32l0aiji064mjbkliwv1hm51b"; }; "51f74fd271b725c13ee25b2dae5d9b5250116180" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/51f74fd271b725c13ee25b2dae5d9b5250116180; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/51f74fd271b725c13ee25b2dae5d9b5250116180"; sha256 = "1zn2lm64icq0bjnayczrl7a6d66jyxbv46cgnixlnvpa0dq1bx5m"; }; "51fd67fd01d7f93ebe372aa67ec66496e9ccf3b1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/51fd67fd01d7f93ebe372aa67ec66496e9ccf3b1; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/51fd67fd01d7f93ebe372aa67ec66496e9ccf3b1"; sha256 = "0xzjsdcfbzl41lwbblq00hy4w3kmjsbl8ai85xa5qdkzc8d8krsk"; }; "525da4df29fa810fe46aef9432572bbb5743b36f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/525da4df29fa810fe46aef9432572bbb5743b36f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/525da4df29fa810fe46aef9432572bbb5743b36f"; sha256 = "0y445vx9i0572y6cj5jbzl9gkcxgs8kn1qpc3zjzhn61ckdijc4s"; }; "5270c6b547cfda7e26cad076321fd7be0e5a061d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2602350-38e0d307a57a47baa00ee5f892c9ced6/5270c6b547cfda7e26cad076321fd7be0e5a061d; + url = "http://cdn.unrealengine.com/dependencies/2602350-38e0d307a57a47baa00ee5f892c9ced6/5270c6b547cfda7e26cad076321fd7be0e5a061d"; sha256 = "14r1vw9hw6nlndj1iplwk0qfnr2y8b880g6fgnzwd31p0dbcim8s"; }; "52ad7360b0e7a95cc19aa7de2f2433ca955eac9b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/52ad7360b0e7a95cc19aa7de2f2433ca955eac9b; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/52ad7360b0e7a95cc19aa7de2f2433ca955eac9b"; sha256 = "0z164smiksv7hka7cj4d68cj5nmy4marwipq48nan3365g9j0r37"; }; "530b33d367b237887fd7f3666822b40a696806f3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/530b33d367b237887fd7f3666822b40a696806f3; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/530b33d367b237887fd7f3666822b40a696806f3"; sha256 = "0vj4bax08c5iq035kqihrpksprrkh0nj6hyfswx5qqsca0znh4br"; }; "53190479c1e53af3a2670f6eeb1f4bda0ebd5a80" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/53190479c1e53af3a2670f6eeb1f4bda0ebd5a80; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/53190479c1e53af3a2670f6eeb1f4bda0ebd5a80"; sha256 = "0gncl86d1j8228hcrfckn6ap632ljkxfbkya8wpqq8cspr5xbb0k"; }; "536b4cf746322581a3abe99533df6307e7a9c2c7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/536b4cf746322581a3abe99533df6307e7a9c2c7; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/536b4cf746322581a3abe99533df6307e7a9c2c7"; sha256 = "08d2hxd3v469b39ra57cb13shkzv4dxk44ksy92dw3m5wnwpq6w8"; }; "53738d12a38995c76f4de6f5f064a567f0ff3ac8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/53738d12a38995c76f4de6f5f064a567f0ff3ac8; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/53738d12a38995c76f4de6f5f064a567f0ff3ac8"; sha256 = "1ba1ygd5xwwgciy93pvl8ibd79glh8h7z8mxd32c301n1g7zyh42"; }; "541bb03057456219ae8a2ab97be5603923921739" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/541bb03057456219ae8a2ab97be5603923921739; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/541bb03057456219ae8a2ab97be5603923921739"; sha256 = "0fc4a7yw1psd4qlbc95gkanynyl5jmwdg3ddz3w93i02cd4l3y42"; }; "541d949e247ee005e6e55562dc29055d6159fb64" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/541d949e247ee005e6e55562dc29055d6159fb64; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/541d949e247ee005e6e55562dc29055d6159fb64"; sha256 = "11bws26a0j9wa8amwmpq632glrwmcwkfc5pzapwrhkd3s4snc5x8"; }; "5435cf07dad1155ea3ddbd5178f3dd6013a507d8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/5435cf07dad1155ea3ddbd5178f3dd6013a507d8; + url = "http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/5435cf07dad1155ea3ddbd5178f3dd6013a507d8"; sha256 = "1mkhn4q4rrf7pdi49fd1968hrikham7s4wx6ch22psfinn5ysda6"; }; "543ebe1dfdaff4a1590fbd156175d836ae2beb0f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/543ebe1dfdaff4a1590fbd156175d836ae2beb0f; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/543ebe1dfdaff4a1590fbd156175d836ae2beb0f"; sha256 = "1mdp47id04fc4gb247k0g40byv4nidrjnmyavpgq977yljfpzwip"; }; "544dffe0e2da98dba3a519141a740f849c5ca7ee" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/544dffe0e2da98dba3a519141a740f849c5ca7ee; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/544dffe0e2da98dba3a519141a740f849c5ca7ee"; sha256 = "1kain6a7p6y533wl1075adfzh8733sdac87iq886hjqr89k5jdyx"; }; "5495c21514ee03fd9e7736742077960a79934c74" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5495c21514ee03fd9e7736742077960a79934c74; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5495c21514ee03fd9e7736742077960a79934c74"; sha256 = "0n9cg673wa58r1xzspyxb4h3qa73jpw4sk9gc8d4dgl6z3q6lsji"; }; "54be461a1c72b36e4f01f2db78849473477d73dd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/54be461a1c72b36e4f01f2db78849473477d73dd; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/54be461a1c72b36e4f01f2db78849473477d73dd"; sha256 = "0zlp7nhdl0b9yhlbclx3d3r2g4cymppwaa5w168chd4gym8qnv44"; }; "551654d82bdacbe12dfe0a27ff7948b6ad1894b5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/551654d82bdacbe12dfe0a27ff7948b6ad1894b5; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/551654d82bdacbe12dfe0a27ff7948b6ad1894b5"; sha256 = "1d1bxj880nyrap1vrxfp9fn1b3pz5dbz6f50ccw6bvfwjg4fwkv1"; }; "5525223a6059a69ca58ad0617598cac64d8659b8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2620872-38314c216e7741359375cb68452fb2b2/5525223a6059a69ca58ad0617598cac64d8659b8; + url = "http://cdn.unrealengine.com/dependencies/2620872-38314c216e7741359375cb68452fb2b2/5525223a6059a69ca58ad0617598cac64d8659b8"; sha256 = "1rvg2sgkbcnymrvp38847rw828ijr3mxl1zsa5706ndly6gysygb"; }; "553aa77e78f9ac7693e56c9b2ae642c4141aed66" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/553aa77e78f9ac7693e56c9b2ae642c4141aed66; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/553aa77e78f9ac7693e56c9b2ae642c4141aed66"; sha256 = "0nr6gsba11kk96l0r1hk08bbn2iy5z41hah14f85dcidcdfn8q3j"; }; "55575c3f7cb2cd14356f9dd1836e4beeb057941b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/55575c3f7cb2cd14356f9dd1836e4beeb057941b; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/55575c3f7cb2cd14356f9dd1836e4beeb057941b"; sha256 = "0g2x108hmsnfp3cgzxcdj91ikz3x3x4br6rl9vlry03dfvhzwvf3"; }; "5559dc18c6a3a435b34446daa5b51264cf9971fc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/5559dc18c6a3a435b34446daa5b51264cf9971fc; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/5559dc18c6a3a435b34446daa5b51264cf9971fc"; sha256 = "10dvc0spvjp7r6lsvhr0f9r6nxm29053pr4q712akak7jnqh6nrd"; }; "55d527b168c8ad85340fae2fb9b238e7a568f338" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/55d527b168c8ad85340fae2fb9b238e7a568f338; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/55d527b168c8ad85340fae2fb9b238e7a568f338"; sha256 = "1dcjnifabnbk2v3pwkmk1hn07svavjqsck694dh8ybqcxbkf4sbq"; }; "561af5c6ee4445a0c380bce19a7f5ee82b3fe756" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/561af5c6ee4445a0c380bce19a7f5ee82b3fe756; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/561af5c6ee4445a0c380bce19a7f5ee82b3fe756"; sha256 = "0r5p7rb865yrjag2wn1p8ps76ap6pa83c0lbq7fmsn4xr2m9aq8c"; }; "562c6d13b647a43c555b040ce69507c475089c24" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/562c6d13b647a43c555b040ce69507c475089c24; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/562c6d13b647a43c555b040ce69507c475089c24"; sha256 = "1lq7cl1rbh2xyg52p6260gbqd2l6n58cm0g1ny0fwgkaskbsbvwx"; }; "567807ac295099a07a6c59a7bff568f21dd14860" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2534734-323cf099317f457e9467fda2d086db9a/567807ac295099a07a6c59a7bff568f21dd14860; + url = "http://cdn.unrealengine.com/dependencies/2534734-323cf099317f457e9467fda2d086db9a/567807ac295099a07a6c59a7bff568f21dd14860"; sha256 = "1cimyysd3z3miz0zwvnmqc60s2cc5ymb2dj4dy88iw3zw1a75hsk"; }; "568dc16559220cee02d71db824805edd0d74a3d4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621991-64978bb873e64559b7c143597fba3856/568dc16559220cee02d71db824805edd0d74a3d4; + url = "http://cdn.unrealengine.com/dependencies/2621991-64978bb873e64559b7c143597fba3856/568dc16559220cee02d71db824805edd0d74a3d4"; sha256 = "1gmfb8106wb12757plw73g6znwqazya41dygzlpmc6zfc5sfd9kw"; }; "56b3ac7ff0cfd2d96ea21ec3d48bce76e2720807" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/56b3ac7ff0cfd2d96ea21ec3d48bce76e2720807; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/56b3ac7ff0cfd2d96ea21ec3d48bce76e2720807"; sha256 = "0vf7hh0cav351qrpkvf897pwdlwnzwjhgfwr8dly6pjf0pqm4c3f"; }; "56d72a0ee05d644fc991dfc250a1534fdacb5b3e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/56d72a0ee05d644fc991dfc250a1534fdacb5b3e; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/56d72a0ee05d644fc991dfc250a1534fdacb5b3e"; sha256 = "0r2kc6cnijar4z50xbsdf6ma4zfjqs9mzklbdamjy3niyzjy5s32"; }; "5725149f4c8e211494463fc9280b6c10907ea321" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/5725149f4c8e211494463fc9280b6c10907ea321; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/5725149f4c8e211494463fc9280b6c10907ea321"; sha256 = "0ifxhhl3rrcaqcxy1izy0abpmii9jzgs55kd537ifmnspi02674i"; }; "57518e7a38c99e38c3bb12baa69c5124f3780152" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/57518e7a38c99e38c3bb12baa69c5124f3780152; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/57518e7a38c99e38c3bb12baa69c5124f3780152"; sha256 = "1fya8iyfyjnqs0vgqsh3zkdb85z8s9snc188qnwypmyfpy8mpwp5"; }; "57a803d869d2db9788911933ffa0282320e75170" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/57a803d869d2db9788911933ffa0282320e75170; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/57a803d869d2db9788911933ffa0282320e75170"; sha256 = "1gy1dyjmpr6qap6irs2mzfpzmkjhkrci2r4ak1855ggycvy98d12"; }; "57be8202d1bdd44a6b6686351edba4e653af9f01" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/57be8202d1bdd44a6b6686351edba4e653af9f01; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/57be8202d1bdd44a6b6686351edba4e653af9f01"; sha256 = "167dndrfslwss276i0m1dwavg8kk27rhhalj200wk5ywb7dm6xg5"; }; "57d629f9fb09a65be5be7697a5d33a20c2b557a4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/57d629f9fb09a65be5be7697a5d33a20c2b557a4; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/57d629f9fb09a65be5be7697a5d33a20c2b557a4"; sha256 = "0xq600178i6hih6ap7aydgp0xpmmgz56ix21acrawikj89ykv5aq"; }; "57ffba4219a312d7e7daab46237a0f61ddb3ad28" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/57ffba4219a312d7e7daab46237a0f61ddb3ad28; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/57ffba4219a312d7e7daab46237a0f61ddb3ad28"; sha256 = "1qnw6qn7ywd96pv9bi9g006lnib6c60p312dlhyclphsykbn0lzf"; }; "58031ce6c4634d8b348854a1ad4bc1c74d022c7b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/58031ce6c4634d8b348854a1ad4bc1c74d022c7b; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/58031ce6c4634d8b348854a1ad4bc1c74d022c7b"; sha256 = "0lz5wd4qzy64c2sr841ky129z46ha3mxx2xx0l9icxmcxczgaxq7"; }; "5828edda3a662171a3c8e304b857dc7a745b85e4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/5828edda3a662171a3c8e304b857dc7a745b85e4; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/5828edda3a662171a3c8e304b857dc7a745b85e4"; sha256 = "0m3p8iz4n03nw97v6iia6cdgniqp5f9zqr0mqxziwss5hhvwhaf6"; }; "5890d07428ec2ee9086c9f8d07792db118a1b57b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/5890d07428ec2ee9086c9f8d07792db118a1b57b; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/5890d07428ec2ee9086c9f8d07792db118a1b57b"; sha256 = "1x5bqq655j50zfn31kxbrl0zbvf3zjvfgkgsp2w816lg01bkbr97"; }; "58b4bdbc8f5686d4ece9cb4a18f6367d8222f073" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/58b4bdbc8f5686d4ece9cb4a18f6367d8222f073; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/58b4bdbc8f5686d4ece9cb4a18f6367d8222f073"; sha256 = "0cw0gw0ky6gal0zjlxqbivhsxb1ys7whjfgjbcph9wfmws0n9cnv"; }; "58c296582abb3dba4bc073aa6708c81bc8798ff7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/58c296582abb3dba4bc073aa6708c81bc8798ff7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/58c296582abb3dba4bc073aa6708c81bc8798ff7"; sha256 = "1197ridzhpvih14rs5gxhvpnbpaz1l52x3cpxnfs5hd80qk212l6"; }; "58c56183f54227469e3aba4fe40c8fc227c66e55" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/58c56183f54227469e3aba4fe40c8fc227c66e55; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/58c56183f54227469e3aba4fe40c8fc227c66e55"; sha256 = "1nz8qyfhd6a7chs3a44aa8da1y0p7ikgd45y9w09k1wlmjgzby5i"; }; "58cf115d701dba2092d2e4a3f0ed075cc6fe3069" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/58cf115d701dba2092d2e4a3f0ed075cc6fe3069; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/58cf115d701dba2092d2e4a3f0ed075cc6fe3069"; sha256 = "17h20ivmf3ks276vd96xc0z1ashyk3prk7f0p1w8z5vj7kv1y6wa"; }; "58db59892f8758da63e7b9c465b5615f6318634b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/58db59892f8758da63e7b9c465b5615f6318634b; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/58db59892f8758da63e7b9c465b5615f6318634b"; sha256 = "151qdvx1kk3r2hisn32g63jpcz5ji5n65ql000wxmav75m25dl9s"; }; "58e46f1625d6b6603897665bac292c5a3566d565" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/58e46f1625d6b6603897665bac292c5a3566d565; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/58e46f1625d6b6603897665bac292c5a3566d565"; sha256 = "0hh2kg1qz3xvcp0gmfky73gm8v2in7593hm59rqcwzk18q9pzwcs"; }; "58e4e03689103981844fc3f19413c5d3eebe2489" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/58e4e03689103981844fc3f19413c5d3eebe2489; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/58e4e03689103981844fc3f19413c5d3eebe2489"; sha256 = "0h7qlwy4agc9130wb8j5a51pdy2ndvm6lbz1p55a3rjzxpmi7idf"; }; "58f1a93515f38b967b50196a9be74684efbca7b7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/58f1a93515f38b967b50196a9be74684efbca7b7; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/58f1a93515f38b967b50196a9be74684efbca7b7"; sha256 = "1bwlqqs4pp20vzxvhs0cqpj3108bxbqk505q93rbgyvlif0kyidy"; }; "58f5f621564cce6f1eb3c9099a1645a0369ece56" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/58f5f621564cce6f1eb3c9099a1645a0369ece56; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/58f5f621564cce6f1eb3c9099a1645a0369ece56"; sha256 = "04finlmybwqzb146rkqmgyfrq34ql2ih5gmxhalfwn2lvlzkykgd"; }; "58f7288e0fe3a5997003f6a117a30579d15f5973" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/58f7288e0fe3a5997003f6a117a30579d15f5973; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/58f7288e0fe3a5997003f6a117a30579d15f5973"; sha256 = "00a351ajzmfjpc6pbj80dbm677mqrdnx1b7dsjhx91gcarxq8q26"; }; "5906155140815aedc94241abd916f56c6ab4564b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5906155140815aedc94241abd916f56c6ab4564b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5906155140815aedc94241abd916f56c6ab4564b"; sha256 = "12ywwixraayk1hvfq4i2hr5dgykv693sxv6vk6nigxq8kbg0rnqk"; }; "5925a9b0f257cc9517f224bec3dee7ecf883aa08" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/5925a9b0f257cc9517f224bec3dee7ecf883aa08; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/5925a9b0f257cc9517f224bec3dee7ecf883aa08"; sha256 = "0vglai3jkbls46qvss4l28h4b21ph5x79271hln3ypd2j4chswlx"; }; "59717f7d7697f047103bbfbca63b68088e7172bd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/59717f7d7697f047103bbfbca63b68088e7172bd; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/59717f7d7697f047103bbfbca63b68088e7172bd"; sha256 = "1gfm6b9cypdsvndc4id9idainvddjb0zrsa601acy62h97b9gjpm"; }; "5977705c2272d0c3385b70ffc3e5f0a2983e986c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5977705c2272d0c3385b70ffc3e5f0a2983e986c; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5977705c2272d0c3385b70ffc3e5f0a2983e986c"; sha256 = "08zlxija7h63j10nhchjnh7mclsfqny6lr6ay8rwcxcgfqz3kr0z"; }; "5983c069abdec3469db5b5874ac27c17341e3f27" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5983c069abdec3469db5b5874ac27c17341e3f27; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5983c069abdec3469db5b5874ac27c17341e3f27"; sha256 = "0f8y8vikn7a6f1rkqkp9y1vyvnx5g8y4pmc0gyvw5lj6hi0ph83w"; }; "598492be84474143365fa6267a0e73936ce8a248" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/598492be84474143365fa6267a0e73936ce8a248; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/598492be84474143365fa6267a0e73936ce8a248"; sha256 = "1s6cvk6p6m8j0w1g45gg2hdnjiwa1sf8zsaf8xvlr10jcwlnc802"; }; "59c4bec5e2957d30ef37c5198c4b90381f3ba20f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/59c4bec5e2957d30ef37c5198c4b90381f3ba20f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/59c4bec5e2957d30ef37c5198c4b90381f3ba20f"; sha256 = "1pxdkbji2wqh6dp648ikn4367zzxfxa8g0lbvdrvbq0a6s5px02r"; }; "59d5809fb3d0b096e7104e798b12b06dc68c750e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/59d5809fb3d0b096e7104e798b12b06dc68c750e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/59d5809fb3d0b096e7104e798b12b06dc68c750e"; sha256 = "1i9mqv3jngvibkby1bfxqjrhib4a1w63sjp4y68cc52gqkv02c22"; }; "5a001646d2ea8b208174c4b954cf99309889bac0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/5a001646d2ea8b208174c4b954cf99309889bac0; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/5a001646d2ea8b208174c4b954cf99309889bac0"; sha256 = "01gxymd2h4bm1b76yn6jpjpxnyw2ixax3rccmn7f36j8zjbnmcm0"; }; "5a2a13ad5533dc3b2172eb552b404c7c458983ac" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5a2a13ad5533dc3b2172eb552b404c7c458983ac; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5a2a13ad5533dc3b2172eb552b404c7c458983ac"; sha256 = "1k2kjhx4y1zgz5sfnjsfdrqvjbr8vdqzg9q425ncd6zr198p5pl1"; }; "5a4c5b85fb81b291e8fb6f7c37c0b152f8aeb1bb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/5a4c5b85fb81b291e8fb6f7c37c0b152f8aeb1bb; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/5a4c5b85fb81b291e8fb6f7c37c0b152f8aeb1bb"; sha256 = "1s2nlmd81bnk6a884hpmpkgbznnwvilmbbkmx74r8wxwnsnsq3fc"; }; "5a668ab8aef15368ff281ed35e8f730cc8ec5c7f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/5a668ab8aef15368ff281ed35e8f730cc8ec5c7f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/5a668ab8aef15368ff281ed35e8f730cc8ec5c7f"; sha256 = "0ha9h8ghv84byrxy7f0jqqq6gzw777vk73sh9n9kxk994a7r2dc2"; }; "5ab07520be55c428c36c959bcc9d4738bcc55daf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/5ab07520be55c428c36c959bcc9d4738bcc55daf; + url = "http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/5ab07520be55c428c36c959bcc9d4738bcc55daf"; sha256 = "029p4hajh92z6qf433kr6a4ahprqjj4cgbfqabf636q2d3cjwmxy"; }; "5b00e89032246f6937f2093a0f6510beb7eab715" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5b00e89032246f6937f2093a0f6510beb7eab715; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5b00e89032246f6937f2093a0f6510beb7eab715"; sha256 = "1svvf9jmhhjr36dwlw2lq6y1kl09vnhwcj2m2i8z5fbs2pa724bq"; }; "5b0c314a325c53eec5d98afdb50067ad99c6e99a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/5b0c314a325c53eec5d98afdb50067ad99c6e99a; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/5b0c314a325c53eec5d98afdb50067ad99c6e99a"; sha256 = "0g7yxicms3pkn4y90r14rf7m076fnf2vwq8rbb3wldqjl1yxmjik"; }; "5b37da6b06afe4b358305eda6827bea44e782b44" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/5b37da6b06afe4b358305eda6827bea44e782b44; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/5b37da6b06afe4b358305eda6827bea44e782b44"; sha256 = "0d4k8ramsgvir0689dqxj79flqa1vls9lnjidhkwl8k7an5jf9p8"; }; "5b81c9f201693bb927130d9d31a3768f7143dfde" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/5b81c9f201693bb927130d9d31a3768f7143dfde; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/5b81c9f201693bb927130d9d31a3768f7143dfde"; sha256 = "1nk5jan996kb09v2cr1invjq8x3zlh4zmli57hik378x282isszz"; }; "5bbeebcd7d784670bb16f73b0bf59374d12e300d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5bbeebcd7d784670bb16f73b0bf59374d12e300d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5bbeebcd7d784670bb16f73b0bf59374d12e300d"; sha256 = "1i4xck1p3269fqa1p69pr7j5r5ssi4hf8p1iq988hhi10wnb74mn"; }; "5bd038cfe2a2f12f6753e85dee691c08d4fcb6e3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/5bd038cfe2a2f12f6753e85dee691c08d4fcb6e3; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/5bd038cfe2a2f12f6753e85dee691c08d4fcb6e3"; sha256 = "184pccfp59sq2sg5wk7i20l2qxswv524nym06dpabm1fv9hi8v0m"; }; "5c42920f6f44c053dcf7e87f29ccef27b326822c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5c42920f6f44c053dcf7e87f29ccef27b326822c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5c42920f6f44c053dcf7e87f29ccef27b326822c"; sha256 = "1z5ii5hslidbijzjqbx66f8h087vn7aidw02m1840pas9dqj9mwc"; }; "5c4dd9ea4a964b483b1e90c4c6a70cedc63ac70b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/5c4dd9ea4a964b483b1e90c4c6a70cedc63ac70b; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/5c4dd9ea4a964b483b1e90c4c6a70cedc63ac70b"; sha256 = "08d1f17f7prkw4c64xalywss6r0f3ab0q46hpamj5cb6xs4igccz"; }; "5c517712601cff542ae326efa6bdc3a7734755c9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5c517712601cff542ae326efa6bdc3a7734755c9; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5c517712601cff542ae326efa6bdc3a7734755c9"; sha256 = "0szgq7q7pf5chr81b1a021r6p2rlb30cyhyjazgq4snprx3f0ih2"; }; "5c53d41540d89216421c6738a2b0b389ab94ea8a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/5c53d41540d89216421c6738a2b0b389ab94ea8a; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/5c53d41540d89216421c6738a2b0b389ab94ea8a"; sha256 = "0hcz2dj3aansxbyqcrhygsvksa3xlc156c4692rqgcfdawyz1yz2"; }; "5c65fc01f0d8703654412f609c5e78a363870079" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/5c65fc01f0d8703654412f609c5e78a363870079; + url = "http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/5c65fc01f0d8703654412f609c5e78a363870079"; sha256 = "1v6vgkp5vvjb4zfipyy7a5y5fqafpckb2636fx0bcfqd2ggbqwqd"; }; "5c8363a3b4c54cf612de94a0521b30e565085fc8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5c8363a3b4c54cf612de94a0521b30e565085fc8; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5c8363a3b4c54cf612de94a0521b30e565085fc8"; sha256 = "19fq6zfwiazkgra4dvpawh0fsk0c9278kl3jzanjlyxms9isncsf"; }; "5c9dc79aa298468ccc506369dd777f36e980e71e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/5c9dc79aa298468ccc506369dd777f36e980e71e; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/5c9dc79aa298468ccc506369dd777f36e980e71e"; sha256 = "0wxn9pw1h2ailgsvkpykrrjdffjdrhswhvznny0l49g7jy39asa2"; }; "5ca8bb4804169df408781649b3ef8a3d6dd2f414" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/5ca8bb4804169df408781649b3ef8a3d6dd2f414; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/5ca8bb4804169df408781649b3ef8a3d6dd2f414"; sha256 = "1nimfzwxc0nfyrp0avf0nhi7n8z21pgsr9321sk21rfv3ln74bab"; }; "5cf160a27902278f941572aa592a11cf80ac6972" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/5cf160a27902278f941572aa592a11cf80ac6972; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/5cf160a27902278f941572aa592a11cf80ac6972"; sha256 = "0x9ljwsb5jy434kpf0gkk6v1grsmksk691gv9ypn98r20rj1yix3"; }; "5d09c96c7e23adaab207052fa2fe12dea14e6a44" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5d09c96c7e23adaab207052fa2fe12dea14e6a44; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5d09c96c7e23adaab207052fa2fe12dea14e6a44"; sha256 = "052z4i5naspmnvqlrnz13rvsgfm0qx6yiwq0w3lxwgp09ix612av"; }; "5d2198866f1b1047bb8a047bbeb38cc0622a4cfb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/5d2198866f1b1047bb8a047bbeb38cc0622a4cfb; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/5d2198866f1b1047bb8a047bbeb38cc0622a4cfb"; sha256 = "1qw4i3v9hfs04r9ys85074j0rdxadzmmjaf3fl6pvrqfprxl0x0x"; }; "5d8e7a77ae12035781174084d8cb9a4e1bcbfb0b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5d8e7a77ae12035781174084d8cb9a4e1bcbfb0b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5d8e7a77ae12035781174084d8cb9a4e1bcbfb0b"; sha256 = "0xwnanfz1rxb8jkh27sirf7iv6dkb99i51q7my15amv5a6r9svrh"; }; "5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2489162-8b935a4b34ed4b3586d7fe3f6ce28b34/5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64; + url = "http://cdn.unrealengine.com/dependencies/2489162-8b935a4b34ed4b3586d7fe3f6ce28b34/5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64"; sha256 = "0kl73ymnq3w0wi630i3kdm2b0j60i708i5938qipq340cwjw4m7c"; }; "5e2314065445393471dbf0e9d3f2755a491d1bba" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/5e2314065445393471dbf0e9d3f2755a491d1bba; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/5e2314065445393471dbf0e9d3f2755a491d1bba"; sha256 = "1i9v4q0r13jd9x4n4inkin8p2936qzlx9bkm6wl0ab9fy0bzl0lm"; }; "5e58fbb85b49d5886aa35ed06da2fc6788db1320" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2596395-e8e15c40b8f2449b881e17834a75d9f8/5e58fbb85b49d5886aa35ed06da2fc6788db1320; + url = "http://cdn.unrealengine.com/dependencies/2596395-e8e15c40b8f2449b881e17834a75d9f8/5e58fbb85b49d5886aa35ed06da2fc6788db1320"; sha256 = "05051mjf0ywp7h94g4sxcxdplm3vfq5nc2l52y08gyz4348s66a5"; }; "5e7d96af5e5b1cafa670bd77ae918457a118f7a5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5e7d96af5e5b1cafa670bd77ae918457a118f7a5; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5e7d96af5e5b1cafa670bd77ae918457a118f7a5"; sha256 = "1p9phbl68bq2q7h0afa2q429pbyb0m2wprym4v1ydlz7c50mpkp9"; }; "5e9b459db24eeba207710184e58445974e211543" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5e9b459db24eeba207710184e58445974e211543; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5e9b459db24eeba207710184e58445974e211543"; sha256 = "0r3vxr2hi86v8fhpcr3n4hacaisqn92a9ayh84fym4y964zg5c2d"; }; "5ec11a04eda7f0d96f115e200ac8029b95d4115d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5ec11a04eda7f0d96f115e200ac8029b95d4115d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5ec11a04eda7f0d96f115e200ac8029b95d4115d"; sha256 = "06jfn17h59jc4d0f81s09yfjl2a12r7d9b5p4pn08h50zjkwwhac"; }; "5ef88b8b3029a7aa2ddaaaf702ab09e6f18a9ab1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/5ef88b8b3029a7aa2ddaaaf702ab09e6f18a9ab1; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/5ef88b8b3029a7aa2ddaaaf702ab09e6f18a9ab1"; sha256 = "18zs81swncyyff3a26dlc9c87gvq75b9c0sscwhqak2m18jz1xqs"; }; "5f026e163284ef4d1dd49f3e7ab1ddb74e2e8dbf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/5f026e163284ef4d1dd49f3e7ab1ddb74e2e8dbf; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/5f026e163284ef4d1dd49f3e7ab1ddb74e2e8dbf"; sha256 = "0rnhwgizkbxn5xdf63kbacsf9s54hzxl3zz6m72jzmlr0i3z17hh"; }; "5f116087ea09d4cd18e565462f0cb21da53cad86" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2407513-a097e3fe93574082b279540eec49fa58/5f116087ea09d4cd18e565462f0cb21da53cad86; + url = "http://cdn.unrealengine.com/dependencies/2407513-a097e3fe93574082b279540eec49fa58/5f116087ea09d4cd18e565462f0cb21da53cad86"; sha256 = "10blnrsjd5f90bkd48k4bqbz69xa0dd41yvkf4v21ffl4sdj184b"; }; "5f239795752cebffb0bd14bc3d14db541d74b95f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5f239795752cebffb0bd14bc3d14db541d74b95f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5f239795752cebffb0bd14bc3d14db541d74b95f"; sha256 = "17wnf2ps8abp04i6mkqz9wmfm58vwjy355pqqs216ap3bq7l7iw7"; }; "5f29467ca4107002987a75eafe3c02d49c0d3fc8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5f29467ca4107002987a75eafe3c02d49c0d3fc8; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5f29467ca4107002987a75eafe3c02d49c0d3fc8"; sha256 = "1irzs3c6qwh0xl7dhpyk24iwbdxyrmpn9qdly7zshgqqzgz26caj"; }; "5fa26a7a3b2978df4bee466d4c76c7b95497e4a4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/5fa26a7a3b2978df4bee466d4c76c7b95497e4a4; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/5fa26a7a3b2978df4bee466d4c76c7b95497e4a4"; sha256 = "03d8366sam4f1xjf7jg2awir5hd3h7hgggif3nisbpvg91nip0vb"; }; "5fe5595a5a46eab069dcd2d6813c1b68cd9ade4f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5fe5595a5a46eab069dcd2d6813c1b68cd9ade4f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5fe5595a5a46eab069dcd2d6813c1b68cd9ade4f"; sha256 = "0s3a3w3xd7w1c7x19nljmkp68xq2b1m2klx60i739y5lb2g7x0lv"; }; "6028c6247770e169982f50ed839356448f3d93f5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6028c6247770e169982f50ed839356448f3d93f5; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6028c6247770e169982f50ed839356448f3d93f5"; sha256 = "0fcg2pm4l5cg2vah26s2p0p5ljy3hk0vssc0f1f18pvw5zicv3g9"; }; "604e9fc9dd1c1b397add8f900213a87a9964ee51" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/604e9fc9dd1c1b397add8f900213a87a9964ee51; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/604e9fc9dd1c1b397add8f900213a87a9964ee51"; sha256 = "0xsns5k5165s37f4q2qy12958zz112487313n6mlgny6zrp1azf9"; }; "607c94b25b7e4fd2ad13dfdf210e43eca3abf392" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/607c94b25b7e4fd2ad13dfdf210e43eca3abf392; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/607c94b25b7e4fd2ad13dfdf210e43eca3abf392"; sha256 = "169603qzhzfnpmik6vaz14zggkvad57s3d46xlnc63hcq7ambj4a"; }; "60864e331c9e60034c81b9544ca30a14688574a3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/60864e331c9e60034c81b9544ca30a14688574a3; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/60864e331c9e60034c81b9544ca30a14688574a3"; sha256 = "1hqyxcf0nfwx83qb94534y5idxb0a3554nncbrxx9s4vigm4pdb7"; }; "6093beca3b21ddf0d2d599e6a841ea070ac01fae" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/6093beca3b21ddf0d2d599e6a841ea070ac01fae; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/6093beca3b21ddf0d2d599e6a841ea070ac01fae"; sha256 = "1hxgib9wc4d9s8n0b4y8vaisxqpbhxa699ls5358nz4gdw8zr0q8"; }; "60c5bb5120f6c73b23af87c97dd5179f0ade011f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/60c5bb5120f6c73b23af87c97dd5179f0ade011f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/60c5bb5120f6c73b23af87c97dd5179f0ade011f"; sha256 = "0lcnjvklsxhfzcda286wkwjqdczyb7w0k8v9yybl0cj3ls1ikgnb"; }; "60d58acfdcf8d83f8a76a00017b7b2e18671b5a9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716370-1fe4be93d0274863a43a7797419557e3/60d58acfdcf8d83f8a76a00017b7b2e18671b5a9; + url = "http://cdn.unrealengine.com/dependencies/2716370-1fe4be93d0274863a43a7797419557e3/60d58acfdcf8d83f8a76a00017b7b2e18671b5a9"; sha256 = "1gfl59bmrkvg038xw90xi2g1vmz6wzh84wmsk5g6mm8klpd57aw9"; }; "60f481b9e0149933c045fafa2e119c902e698d0e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/60f481b9e0149933c045fafa2e119c902e698d0e; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/60f481b9e0149933c045fafa2e119c902e698d0e"; sha256 = "0l9rq8fh7mmkj363gzl673rknaacjv32276y0b52vxxg0m8fylfc"; }; "6110e8d90324f6bac6bd3173bc69f6c58d459d08" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/6110e8d90324f6bac6bd3173bc69f6c58d459d08; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/6110e8d90324f6bac6bd3173bc69f6c58d459d08"; sha256 = "15rqyi5w0nklw3v2r7fagaa0v6am1p1rgvq7fpk0x98axp7nvx71"; }; "61402aec078bfe9e6535f5a6ae537710fa5e79b0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/61402aec078bfe9e6535f5a6ae537710fa5e79b0; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/61402aec078bfe9e6535f5a6ae537710fa5e79b0"; sha256 = "0f9yjkz2myf9qnnk21n2alsb4ibznl96hh9i57d1y9w425jg4a2x"; }; "61588d85e249c225350c50ef50608fa8b9f4941a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/61588d85e249c225350c50ef50608fa8b9f4941a; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/61588d85e249c225350c50ef50608fa8b9f4941a"; sha256 = "0daalrsynapmicj8bbv2cvg4kijm3x0c8zkayjjzixw5qy8sada9"; }; "618449250b93c28bb8f15751ff6bb653143e5ff0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/618449250b93c28bb8f15751ff6bb653143e5ff0; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/618449250b93c28bb8f15751ff6bb653143e5ff0"; sha256 = "0zkpxgpqcmkfd1a8rsivfrw5qxkqlcw9apa2jkf46417m1k5w2k1"; }; "61a4313e93aab82bab5da58a1b601aad41ecbd60" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/61a4313e93aab82bab5da58a1b601aad41ecbd60; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/61a4313e93aab82bab5da58a1b601aad41ecbd60"; sha256 = "1gf7d5hxdl8hyfs30b2y9f1h6d3b17jfb65jlrx8fbcg70brad42"; }; "61edd2f04c73c5c3eca0bfae13c92213516504e3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/61edd2f04c73c5c3eca0bfae13c92213516504e3; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/61edd2f04c73c5c3eca0bfae13c92213516504e3"; sha256 = "1aslzizrnnibzn5ynspirz9zz7667mzpz4gfvqb8k0x6zk46j5xz"; }; "61ff058a4cd1eab2481a48a115063c62660b78ca" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/61ff058a4cd1eab2481a48a115063c62660b78ca; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/61ff058a4cd1eab2481a48a115063c62660b78ca"; sha256 = "08m4b9c2dyld2hr7c8mxpfgvxxdaxj7svaspdfsg91ghq42mscdd"; }; "622d9c355d2344266a6a9065ae16e911791d9ac2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/622d9c355d2344266a6a9065ae16e911791d9ac2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/622d9c355d2344266a6a9065ae16e911791d9ac2"; sha256 = "1i51r1bwfx7fsrykfbj5ylm1yjcp2q9a305vx070rig8m33qygla"; }; "6253baddbb265d8bcab9334e1bb48fee69c0a14c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6253baddbb265d8bcab9334e1bb48fee69c0a14c; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6253baddbb265d8bcab9334e1bb48fee69c0a14c"; sha256 = "0xfz545zngq5jnji3zxr8wlwjf8y7c8wd6bmmwkkjf1a2pipywiy"; }; "62cfaf0ed5a8437e74ef0b7331f28a86942cc8c8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/62cfaf0ed5a8437e74ef0b7331f28a86942cc8c8; + url = "http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/62cfaf0ed5a8437e74ef0b7331f28a86942cc8c8"; sha256 = "1asb6h92cnh2xmwnggn6kk9qly4pzw43aax3v07zhs69d3jbhg2x"; }; "62d297add5bd88f5ea16b2ba6b97664dd888eef8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/62d297add5bd88f5ea16b2ba6b97664dd888eef8; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/62d297add5bd88f5ea16b2ba6b97664dd888eef8"; sha256 = "1ajrnfsz53imm4hcsnjznbq087yvbj87s30v948x2vxy7ja17hi2"; }; "62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e"; sha256 = "0jirs3ij917vqznqffqh5bisx4bvqfhbhr56fmlfyykckqwmq7i8"; }; "62e5d1e864e96e11f84e99dcab8cd16345641f43" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/62e5d1e864e96e11f84e99dcab8cd16345641f43; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/62e5d1e864e96e11f84e99dcab8cd16345641f43"; sha256 = "1s7k9h8vpg5j5jq9mc4mgnrb1lyp3y3lvgc7n7l76djm61amqchz"; }; "63574e974c45ae3f0e8fbfcc9d896c53798dd161" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/63574e974c45ae3f0e8fbfcc9d896c53798dd161; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/63574e974c45ae3f0e8fbfcc9d896c53798dd161"; sha256 = "181s6b5j1zqv1hf905paxxgl4j4k20s7ypnv1h7f05qp4sq6wia2"; }; "6359e2376de35d2b27246726788d28d678796a20" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/6359e2376de35d2b27246726788d28d678796a20; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/6359e2376de35d2b27246726788d28d678796a20"; sha256 = "006mdqfgkxgppxcx8fdfza7z9f80rq27gjncnqpgk3wawb9033r6"; }; "6372acc1b0c4c85801bbd2b0fc9bd17a043c1b67" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6372acc1b0c4c85801bbd2b0fc9bd17a043c1b67; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6372acc1b0c4c85801bbd2b0fc9bd17a043c1b67"; sha256 = "0c8fgaqy17nvsqx4lsiy4fd9z563rbf69sac18bkwyvw0wb4w1s6"; }; "637e6e050e0e294f4e7191f12ad96c9be75aa747" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/637e6e050e0e294f4e7191f12ad96c9be75aa747; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/637e6e050e0e294f4e7191f12ad96c9be75aa747"; sha256 = "1s1vx86pp7c7kabvi0jpvqqykjb5127qwf6ljz8r6awmx9k32yly"; }; "6393b6f72772149473aacbdd6425bc77b7146697" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/6393b6f72772149473aacbdd6425bc77b7146697; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/6393b6f72772149473aacbdd6425bc77b7146697"; sha256 = "0jpjsh7r1m4isbhmmijlysv7jmnf01f3rj9q8z3v6fdmbi6v0d68"; }; "6393ed28494cd0c7bbfc3d90ee14a3c4fb5ffe2e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/6393ed28494cd0c7bbfc3d90ee14a3c4fb5ffe2e; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/6393ed28494cd0c7bbfc3d90ee14a3c4fb5ffe2e"; sha256 = "0972073k9di5s980ypdn4dww5y0drc1fsn7q5bk71ylz6pdx7ijh"; }; "639844a81c2400a43810b5674c144824ce23f3db" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2653253-b6a14aed15124b4891aa1fe8706033fb/639844a81c2400a43810b5674c144824ce23f3db; + url = "http://cdn.unrealengine.com/dependencies/2653253-b6a14aed15124b4891aa1fe8706033fb/639844a81c2400a43810b5674c144824ce23f3db"; sha256 = "0rflhgn3nxl5msfd7f8xmz56msgkqhadyh5n7b120lk34wa7bvw3"; }; "63b510d13c94072e9005674901d2b32ec9853167" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/63b510d13c94072e9005674901d2b32ec9853167; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/63b510d13c94072e9005674901d2b32ec9853167"; sha256 = "1j10rlxqrdy1zv5fpx0zk4hy73fbi93zk7qsq59cfgpbgsd9n79g"; }; "63ceab8331229d4e03c85aa9b5f4671eda2643f1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/63ceab8331229d4e03c85aa9b5f4671eda2643f1; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/63ceab8331229d4e03c85aa9b5f4671eda2643f1"; sha256 = "05jv83mc7abw5zyad8wccnnh7q8f5ba82hq10w7d589gasdbj9s8"; }; "63fb6b15f90b5647d4e46169447beceac52a5dff" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/63fb6b15f90b5647d4e46169447beceac52a5dff; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/63fb6b15f90b5647d4e46169447beceac52a5dff"; sha256 = "1bhljn5pai17hw9znr22kv87p0fl01sx8h231v4mb96f8d1037q3"; }; "645a1e3bcfcb7345c6416a0ed520fae63329b8b3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2622232-9cbce5f5f69743598cf4bcb212040bd6/645a1e3bcfcb7345c6416a0ed520fae63329b8b3; + url = "http://cdn.unrealengine.com/dependencies/2622232-9cbce5f5f69743598cf4bcb212040bd6/645a1e3bcfcb7345c6416a0ed520fae63329b8b3"; sha256 = "1mdx70n7hv42j7ychalbn2rwq8irm1nl1s0i5rgnbvsxb0z445pn"; }; "64e87def5324af1f8687a977b1aeca68f9ecf0a6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/64e87def5324af1f8687a977b1aeca68f9ecf0a6; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/64e87def5324af1f8687a977b1aeca68f9ecf0a6"; sha256 = "1alslkmk8i0vmg4v5bd8lizm1b51bp1mcy5bmwy03dfnpv9hd8yk"; }; "64f0b7d72766b49356b5948a55695a43f845be22" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/64f0b7d72766b49356b5948a55695a43f845be22; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/64f0b7d72766b49356b5948a55695a43f845be22"; sha256 = "0x7rh3sw20czicj5pb9p0z4xdhd7vc32562wlcwf5c9k0vdyddri"; }; "6522f3b24668a2691bee084b8ee44262dc6cc644" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6522f3b24668a2691bee084b8ee44262dc6cc644; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6522f3b24668a2691bee084b8ee44262dc6cc644"; sha256 = "0brl515h4axh92dypzyrcx5gjf3lzakmn48nn2aapk25l8lzw7fm"; }; "65578de12deaee566474c4d151d51dfbd4c073c9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/65578de12deaee566474c4d151d51dfbd4c073c9; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/65578de12deaee566474c4d151d51dfbd4c073c9"; sha256 = "0n1rhn916zqr83fxzb6slwd3sj7xbxyi4j5371pndfq1ah8yynkr"; }; "6580420e45c35e3175f7714b91aa918b46c45984" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6580420e45c35e3175f7714b91aa918b46c45984; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6580420e45c35e3175f7714b91aa918b46c45984"; sha256 = "1xsyvsp7gr58v19k3b5d33ayhz38amckz6kcabv2jaj22d1m4zwv"; }; "658fa72e61b1133bc866dc68b7317dda0c190d51" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372492-7eda6cf2d68f471699ac1d302230bcd3/658fa72e61b1133bc866dc68b7317dda0c190d51; + url = "http://cdn.unrealengine.com/dependencies/2372492-7eda6cf2d68f471699ac1d302230bcd3/658fa72e61b1133bc866dc68b7317dda0c190d51"; sha256 = "0am1lpxk2jxhf015siabscd3b8i2p43xgg8p5bp0r0sxrcbxwy2j"; }; "65a719d77d9dbaa46e24a210a17ef22399982d13" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/65a719d77d9dbaa46e24a210a17ef22399982d13; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/65a719d77d9dbaa46e24a210a17ef22399982d13"; sha256 = "15wh8wv0fj30xy5lhz1vhw5a7d6fqk8pjpcivzmlc9qp48jaa9jr"; }; "65b78b6ca4fcbc234e459578f687f0a5f21ff467" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/65b78b6ca4fcbc234e459578f687f0a5f21ff467; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/65b78b6ca4fcbc234e459578f687f0a5f21ff467"; sha256 = "1xpkj42dfkpqa0bq1fvwwy8n4286h2xlwz0fm2m4yk3p7qs2yyn5"; }; "65c815431a222281ca4027a3409714aca969c404" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/65c815431a222281ca4027a3409714aca969c404; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/65c815431a222281ca4027a3409714aca969c404"; sha256 = "11n5ra9mwj06zlilmn58xwhqr081ml58f8jd57sz994f3ci78kf4"; }; "65f992d64db107757f6c8186765571a2f85d60d1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/65f992d64db107757f6c8186765571a2f85d60d1; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/65f992d64db107757f6c8186765571a2f85d60d1"; sha256 = "1jfrsagmfvvjxji32w4p7qq6b2vyqfmn52d1xinxn11v575cmrxw"; }; "663723ac5cff1d4ea06e07da58676eda31ded8b7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/663723ac5cff1d4ea06e07da58676eda31ded8b7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/663723ac5cff1d4ea06e07da58676eda31ded8b7"; sha256 = "0yc5wmplmj4nqfzlydrf3gcphnym0vdy5l8xsb6l6gjm1rzn3w61"; }; "66b5c49c095c24e8ff5576638e6f43f40b60e398" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/66b5c49c095c24e8ff5576638e6f43f40b60e398; + url = "http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/66b5c49c095c24e8ff5576638e6f43f40b60e398"; sha256 = "1r4cq5hz5ciak42xy5h6jk8r55cy4a2am2x7nsm8n40pn1m86xg3"; }; "66e6d819829e7f036392ae108ecdedd0068b3fed" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/66e6d819829e7f036392ae108ecdedd0068b3fed; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/66e6d819829e7f036392ae108ecdedd0068b3fed"; sha256 = "00h32jp49052x7fms634savpk88976q973s1ixnkcl4q10y3ygc3"; }; "675414213a5992bda8f4bf33aa2feac7508eadb9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/675414213a5992bda8f4bf33aa2feac7508eadb9; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/675414213a5992bda8f4bf33aa2feac7508eadb9"; sha256 = "0b20idjyc0m9dqrnpzxxdshw29l7nlj1g7fi5zhf9y0hh77v1ji3"; }; "6758891f27f3f1b33f508442151c2d1d4244cacf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/6758891f27f3f1b33f508442151c2d1d4244cacf; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/6758891f27f3f1b33f508442151c2d1d4244cacf"; sha256 = "0ixakp9gxjjn5c19mir7qxjh7ywx6n2pncqiv37mbhj5c9z5r7mb"; }; "676f25261064cf478cd211dd584b7a391376f599" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/676f25261064cf478cd211dd584b7a391376f599; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/676f25261064cf478cd211dd584b7a391376f599"; sha256 = "0f0ix6vbx89pa9bpvnf87kwhbnf7q34mxf8ycw6md4brrjps21js"; }; "677b668be4a2ec5fa834fa988bf502390ca975d1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2703853-c90e6f22156c41b6b1968b2a029d291e/677b668be4a2ec5fa834fa988bf502390ca975d1; + url = "http://cdn.unrealengine.com/dependencies/2703853-c90e6f22156c41b6b1968b2a029d291e/677b668be4a2ec5fa834fa988bf502390ca975d1"; sha256 = "16ppk310afb40np5slr1b7qy6ksq16d0pl2zavd4wrxr626c0yjb"; }; "67ebcec99338fbc806e98fe5ddcc80abd7cfe885" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/67ebcec99338fbc806e98fe5ddcc80abd7cfe885; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/67ebcec99338fbc806e98fe5ddcc80abd7cfe885"; sha256 = "1rhm5ziiax99nlnyz1y3gqai9wkkvi0lwmsjn64xsqhp2cm93sag"; }; "67f9a57842391bca1072e56b907d2adde02d2d34" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2609785-e83ceb61e76a4e4bb9b4dc17c52d07b1/67f9a57842391bca1072e56b907d2adde02d2d34; + url = "http://cdn.unrealengine.com/dependencies/2609785-e83ceb61e76a4e4bb9b4dc17c52d07b1/67f9a57842391bca1072e56b907d2adde02d2d34"; sha256 = "1i8aa40i83zlzydfdbf3k023329mlvlh32kwln6q9pg9998k5hr0"; }; "68290cfc4aa5f88785b355b66e5efa7ae2451f3f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/68290cfc4aa5f88785b355b66e5efa7ae2451f3f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/68290cfc4aa5f88785b355b66e5efa7ae2451f3f"; sha256 = "1s6m4qakr8bzyhak2v7d6b7h3g75iy4wfxplbz0r1bk79mlzh8ch"; }; "682beb667137b4be322732642ec6bd7a7fb77a67" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2474673-cc4b4abcf8d5453d9c14a5ad304063e3/682beb667137b4be322732642ec6bd7a7fb77a67; + url = "http://cdn.unrealengine.com/dependencies/2474673-cc4b4abcf8d5453d9c14a5ad304063e3/682beb667137b4be322732642ec6bd7a7fb77a67"; sha256 = "1sap6ri29l2cd8yw5g5g8axy9nz8gy4lhrkvp1fnnf5c68cqqhm4"; }; "684a26e9ee9814c8e55834710a5e5395db2acbf6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/684a26e9ee9814c8e55834710a5e5395db2acbf6; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/684a26e9ee9814c8e55834710a5e5395db2acbf6"; sha256 = "1g8alym478k5mla106h38zmspr1gvgbyckhc0hbjk950kffwg537"; }; "69435a1a9c544a85003dac3e715da698388e8cfe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/69435a1a9c544a85003dac3e715da698388e8cfe; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/69435a1a9c544a85003dac3e715da698388e8cfe"; sha256 = "1wb8slsppm2cz2g5qlccjgjayv3q8bl0p5hybz3gpicnjyhla1c0"; }; "694d6d6d33e802bd013aa60c6ceef225f1769a21" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/694d6d6d33e802bd013aa60c6ceef225f1769a21; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/694d6d6d33e802bd013aa60c6ceef225f1769a21"; sha256 = "100b3c46qf5nhw3758203khsqjk5jq9hi3s7hsjsjrrz03p2fclp"; }; "696aa11a029bfeebe1885750c0a1219698f45667" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/696aa11a029bfeebe1885750c0a1219698f45667; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/696aa11a029bfeebe1885750c0a1219698f45667"; sha256 = "0nbr429yjr1xi2zlqz0k33p62d4mq4pcc49xshkdjbqm8j76yg9r"; }; "69fc2b97ab8ad300bd86bdb295b868f7e2bce67e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/69fc2b97ab8ad300bd86bdb295b868f7e2bce67e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/69fc2b97ab8ad300bd86bdb295b868f7e2bce67e"; sha256 = "0538b6klq4k379vp6miha7y73sz3lbgj093hxhzl4jb7fqnrwpdr"; }; "6a0ea024e2030b5079a2b9e20aa262fcb1a4a4b3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/6a0ea024e2030b5079a2b9e20aa262fcb1a4a4b3; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/6a0ea024e2030b5079a2b9e20aa262fcb1a4a4b3"; sha256 = "1i6rijsnpwq58ngwdak1kx0kv53w2bqgl0jfwww2mpm9nwr34dgk"; }; "6a12e8d5c57226c69cfd4eea779767ef39cc7040" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/6a12e8d5c57226c69cfd4eea779767ef39cc7040; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/6a12e8d5c57226c69cfd4eea779767ef39cc7040"; sha256 = "0fpbgjzi79f8y2k8dmj596kndbjrpkaqvld1mpfd8mfxjg435psd"; }; "6a471e2c9660b457b6c96bac1a80ff31694ca135" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2602350-38e0d307a57a47baa00ee5f892c9ced6/6a471e2c9660b457b6c96bac1a80ff31694ca135; + url = "http://cdn.unrealengine.com/dependencies/2602350-38e0d307a57a47baa00ee5f892c9ced6/6a471e2c9660b457b6c96bac1a80ff31694ca135"; sha256 = "0ifvzqzrjf1ich2m8r75czl46kyr0y2aagsb6h5mqnxmqbznwkq0"; }; "6a50182277880d3cdd4488457883c08e6765df35" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2587672-91bd78b10f504d6789cdb334ed27eda0/6a50182277880d3cdd4488457883c08e6765df35; + url = "http://cdn.unrealengine.com/dependencies/2587672-91bd78b10f504d6789cdb334ed27eda0/6a50182277880d3cdd4488457883c08e6765df35"; sha256 = "1pr0sfpya1izpppfdpypkpyqsalr02v0azcxyn2p8jibnzkg4qqa"; }; "6a67f7a815e887377e17dc82a86617bcbfd74f12" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/6a67f7a815e887377e17dc82a86617bcbfd74f12; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/6a67f7a815e887377e17dc82a86617bcbfd74f12"; sha256 = "1wqf8h7wlwzwiv2syrs3c69lbiqr7505kkbfckrscj8ym2rgmqxl"; }; "6a6962c3f79f9f08e1b48bdf76659d8d0ac02e20" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/6a6962c3f79f9f08e1b48bdf76659d8d0ac02e20; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/6a6962c3f79f9f08e1b48bdf76659d8d0ac02e20"; sha256 = "01dlplk4r00san6hbw5mclppb0kapx51w4mv2piihx6vcdq2dv2w"; }; "6a8708499175f48f9ac6e36dcde1684f5908e594" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6a8708499175f48f9ac6e36dcde1684f5908e594; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6a8708499175f48f9ac6e36dcde1684f5908e594"; sha256 = "0v67h7q7wz0xa66l8m8kk7adrf7mr9arns5w5rdv3m6dq9730cz1"; }; "6a9c5875310b65c3a8a12766aa12d23c75256911" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/6a9c5875310b65c3a8a12766aa12d23c75256911; + url = "http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/6a9c5875310b65c3a8a12766aa12d23c75256911"; sha256 = "1x5q67kq3jrxhcvnc4xj2ic28ssmiyld4yp3y612vl71z02rsaji"; }; "6b3a9a128f40523d7b4663b4aff1259e204dc2fa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/6b3a9a128f40523d7b4663b4aff1259e204dc2fa; + url = "http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/6b3a9a128f40523d7b4663b4aff1259e204dc2fa"; sha256 = "1nhpvs47s221k07ix1i5sp4ba8mia36zmqfz66dz2x9yx87xm3gj"; }; "6b44b6d36ae3887d630357d09ac1f4655e43ca7b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6b44b6d36ae3887d630357d09ac1f4655e43ca7b; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6b44b6d36ae3887d630357d09ac1f4655e43ca7b"; sha256 = "0rmj38k1zz4q2ckwngs38jn6z5w9kaxrghckqv60ajjpn47dk008"; }; "6b67c4b93edd66dc6876acdfaf991559f2387756" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/6b67c4b93edd66dc6876acdfaf991559f2387756; + url = "http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/6b67c4b93edd66dc6876acdfaf991559f2387756"; sha256 = "0mq7wi48fck0c8i1f08mkya5fjr5a2sip3g9lzzi4my3k6g0jdlc"; }; "6b6ea1539e3e10b995b117a201cd14188d7361cf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2528357-44d3814edbb84d09a5279fe4fd30ba86/6b6ea1539e3e10b995b117a201cd14188d7361cf; + url = "http://cdn.unrealengine.com/dependencies/2528357-44d3814edbb84d09a5279fe4fd30ba86/6b6ea1539e3e10b995b117a201cd14188d7361cf"; sha256 = "1y7r4z90rp10b9pqp54awmnxqibx8pr2924l52z2abm3hza7h6da"; }; "6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd"; sha256 = "1mwmkci1q5lk8vrqgcrng5p8vdg2y2k18g5x5csgfa0j0harwr20"; }; "6ba54736caaad91cbe96699871e5e369c615d477" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2528371-50b896349a4f4b48b4cce5ef240b0c45/6ba54736caaad91cbe96699871e5e369c615d477; + url = "http://cdn.unrealengine.com/dependencies/2528371-50b896349a4f4b48b4cce5ef240b0c45/6ba54736caaad91cbe96699871e5e369c615d477"; sha256 = "093pf4kdkisr2k3xkz7qx88503mr70y3crx4170lblax8mji89ib"; }; "6be690bb0e769b3f7e8d0ea9dc261b06f0496249" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6be690bb0e769b3f7e8d0ea9dc261b06f0496249; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6be690bb0e769b3f7e8d0ea9dc261b06f0496249"; sha256 = "18cidvs8cv9air0l9g65s0010a677qpj3rjdx1z1p19mcr7w9ddz"; }; "6c0977b3790d44b85c497cbd724ffa4f744bd6b6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/6c0977b3790d44b85c497cbd724ffa4f744bd6b6; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/6c0977b3790d44b85c497cbd724ffa4f744bd6b6"; sha256 = "0wcypa2p4wx0si460677y544hjp38vf81im61z5kq4scr5l4kwxs"; }; "6c431edb06befc6eec62ca59cc72f45697da876b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6c431edb06befc6eec62ca59cc72f45697da876b; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6c431edb06befc6eec62ca59cc72f45697da876b"; sha256 = "0bm4r49wzm0bx5wa0xdpmld8y0cv6jin9wl3djlp7kwg0nix2fv8"; }; "6cac0ce67fc25ab9057de053ed68e469376a951a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/6cac0ce67fc25ab9057de053ed68e469376a951a; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/6cac0ce67fc25ab9057de053ed68e469376a951a"; sha256 = "04kbpf0pwsc1a5kz2yhg1azp0ng2zc4ff8dyhc58n543nyla68v2"; }; "6cb6768eacda17fd4b9089b3667e49c91b543347" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6cb6768eacda17fd4b9089b3667e49c91b543347; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6cb6768eacda17fd4b9089b3667e49c91b543347"; sha256 = "1wj29bzdnf3s0w5vymnj599jq926m5whdrllfx6869z32q8xasms"; }; "6d0a3530ef64aa77b0e3b1121ab3e5148367b843" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/6d0a3530ef64aa77b0e3b1121ab3e5148367b843; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/6d0a3530ef64aa77b0e3b1121ab3e5148367b843"; sha256 = "16brrbwwhh9ddjs22ijqkaxrz56n4bmzfbkshipmc74p6ildw05n"; }; "6d10bf18bc8be763d3e8f14a5f604b8bbc8ba92b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6d10bf18bc8be763d3e8f14a5f604b8bbc8ba92b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6d10bf18bc8be763d3e8f14a5f604b8bbc8ba92b"; sha256 = "12mw32xsaa1j0lcj5nbir2m7m3bp9sgvjf2022l5rxzs196kncdy"; }; "6d17b68e3ef2ba04421c03ad37c21c1871a7291b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2468685-6ced80b1c43d4f92b6c325ead32ec577/6d17b68e3ef2ba04421c03ad37c21c1871a7291b; + url = "http://cdn.unrealengine.com/dependencies/2468685-6ced80b1c43d4f92b6c325ead32ec577/6d17b68e3ef2ba04421c03ad37c21c1871a7291b"; sha256 = "0lb1q5wp4px4kh5lkfbva078jk0jj2nli6nqf6501yq1gbq80q5v"; }; "6d2192770af113f0d25717171721654f92522bc7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6d2192770af113f0d25717171721654f92522bc7; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6d2192770af113f0d25717171721654f92522bc7"; sha256 = "0x9ayw21alzjqp5xwlj291klnxdkhqqgbz1wvppklmnw3yrqbha2"; }; "6d263531086a2ac8abcd381816ca4bbebeb2bb89" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6d263531086a2ac8abcd381816ca4bbebeb2bb89; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6d263531086a2ac8abcd381816ca4bbebeb2bb89"; sha256 = "10wihlpfq2ilg2a3rj6hdj2109rwsvsnjfs4x9l8pmr0imn6w4pz"; }; "6d2b2990842e4e124fa1767f5e6fb10dc1c8f0bd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/6d2b2990842e4e124fa1767f5e6fb10dc1c8f0bd; + url = "http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/6d2b2990842e4e124fa1767f5e6fb10dc1c8f0bd"; sha256 = "1jvcscijpcpl4g17wl8h39p6jwngh8qys423najf9hxqxvx9l9w1"; }; "6d7357dd4987e9a687f666583450e9650b6bec3b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/6d7357dd4987e9a687f666583450e9650b6bec3b; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/6d7357dd4987e9a687f666583450e9650b6bec3b"; sha256 = "0xzzdsb63zb9771lxm845390d23hihgax7ksyrlhjmvj30kxxkhk"; }; "6d8bf7bc3f485cc58257d2f301a88e430fe47518" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6d8bf7bc3f485cc58257d2f301a88e430fe47518; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6d8bf7bc3f485cc58257d2f301a88e430fe47518"; sha256 = "1pvs3fl5qschq6gk12ig84wd4568sgmv4gv05kdvda44pnz3fbnd"; }; "6d9e988311499cbfde8b162b1b772f3ab0826cfa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6d9e988311499cbfde8b162b1b772f3ab0826cfa; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6d9e988311499cbfde8b162b1b772f3ab0826cfa"; sha256 = "0bp2gbl6b2dimw4izmsa9cpsw2650g1a1apq5pv1j0a0ihahwfjn"; }; "6dbc1369cf4eb542c999ef1a7dc17798e967968e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/6dbc1369cf4eb542c999ef1a7dc17798e967968e; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/6dbc1369cf4eb542c999ef1a7dc17798e967968e"; sha256 = "15vl7c83w4l3jd366lxljgpjyh2dxi22s11sk83bkca9ig8p9rlb"; }; "6e12c754b5531592e7583c0ddf5ea9f617bc4393" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/6e12c754b5531592e7583c0ddf5ea9f617bc4393; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/6e12c754b5531592e7583c0ddf5ea9f617bc4393"; sha256 = "095hbf0bx9iwcyrljr23zg1dwd3n382s4pxgpvalpb6flk346i9l"; }; "6e4f2760b5d09171b1caf834191e8eff91e09092" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6e4f2760b5d09171b1caf834191e8eff91e09092; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6e4f2760b5d09171b1caf834191e8eff91e09092"; sha256 = "042615c1ssd8jd0swn6qxl55v619ilz3y5549qqaj2qbs2rxgda6"; }; "6e59a6401cd7e9537de8df24d6923df4897465b2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6e59a6401cd7e9537de8df24d6923df4897465b2; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6e59a6401cd7e9537de8df24d6923df4897465b2"; sha256 = "1pbk0lxx24w1bblnjnl2zvljy2pg4c8pad7xyfp5gwinz9ns045w"; }; "6e5a4c88769060bd4e1cc4b17dc6944cd5f3d5cf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/6e5a4c88769060bd4e1cc4b17dc6944cd5f3d5cf; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/6e5a4c88769060bd4e1cc4b17dc6944cd5f3d5cf"; sha256 = "0y08zj57v9n6a1hp9rgrvx5zcj63kq3363xi2vfl5g0fl3n0rfn4"; }; "6e730e7ead3a2958afb3beeffb7961d98b372ba4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6e730e7ead3a2958afb3beeffb7961d98b372ba4; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6e730e7ead3a2958afb3beeffb7961d98b372ba4"; sha256 = "1d5rkr6qa8h4kxqcxarmvwfmn49k1rnfljvrm4b72yscl3x89pri"; }; "6e81558b9e889ebb9d8f50cf1f1d5c4ab32617ce" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6e81558b9e889ebb9d8f50cf1f1d5c4ab32617ce; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6e81558b9e889ebb9d8f50cf1f1d5c4ab32617ce"; sha256 = "1ljwpklbqah13l6mvrgfbn4xxwpxqycb4cr2ibh90aigjyjbijni"; }; "6ebcf68520fb80c14bda307947650ecbe5ed0335" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6ebcf68520fb80c14bda307947650ecbe5ed0335; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6ebcf68520fb80c14bda307947650ecbe5ed0335"; sha256 = "1xq7g59xy3a25qiib3dv30in8yqg8667wpq940z64gapbsvjk106"; }; "6efaf9b48d52aee2c7a89e9fb7c8face3a1dab34" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/6efaf9b48d52aee2c7a89e9fb7c8face3a1dab34; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/6efaf9b48d52aee2c7a89e9fb7c8face3a1dab34"; sha256 = "10iv45b9g9l3krxqs8cqkgad5zhvy64n84q94ghkyn86ilg6pmqb"; }; "6f05a4518d46fff2a081dfff843f2af3e163a983" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6f05a4518d46fff2a081dfff843f2af3e163a983; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6f05a4518d46fff2a081dfff843f2af3e163a983"; sha256 = "07qkvg5g4dnzwjv9s38gqjc5mzsa13xmv0g2d9wii4vwm9ray2sw"; }; "6f0e8b5effca878a55ca98bb70c7fc5b9c33a7ca" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6f0e8b5effca878a55ca98bb70c7fc5b9c33a7ca; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6f0e8b5effca878a55ca98bb70c7fc5b9c33a7ca"; sha256 = "1whaajzna61zci7cjpw0p3j7z1y3wiqz98qkn5s3lpl0j37l3pql"; }; "6f3fed4aa88e43e6ccbf7498ff502f8440e1d8b4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/6f3fed4aa88e43e6ccbf7498ff502f8440e1d8b4; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/6f3fed4aa88e43e6ccbf7498ff502f8440e1d8b4"; sha256 = "0hcsv3588k6ra0cd5l1f64m5r35fl6wbs9a8p9j29nigy3vdmbvv"; }; "6f51406032cee2275e7da1c749608e097223bcb1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/6f51406032cee2275e7da1c749608e097223bcb1; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/6f51406032cee2275e7da1c749608e097223bcb1"; sha256 = "1lcaxdjbkx2nklln244ljdfyhi4b246zvk7pl6hg29kbjaxh3grw"; }; "6f7d171cf322dcfd650c55aad7573fb99f926026" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6f7d171cf322dcfd650c55aad7573fb99f926026; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6f7d171cf322dcfd650c55aad7573fb99f926026"; sha256 = "06yn4cdz4rrvh1h483fj06n6n0jamngx2z24mjc1raf63slidb07"; }; "6f920a415787627f9dc4c1ef92a2a039a21976a6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6f920a415787627f9dc4c1ef92a2a039a21976a6; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6f920a415787627f9dc4c1ef92a2a039a21976a6"; sha256 = "12szpcgm9mgddiyyf6yhs8rf6hlwa0kw0m9wzs9xdq1phxwwcvy6"; }; "701e08162a99eeb25b55b6133dfee51bf36e08d3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/701e08162a99eeb25b55b6133dfee51bf36e08d3; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/701e08162a99eeb25b55b6133dfee51bf36e08d3"; sha256 = "1mffiwbv7qbwadrj6jkm1n4hzkjl5m3fc4dgxdijz7i79d8pgyk1"; }; "7054b730a39f0d762ba1602fbca946a38a8811cf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2565979-eaaf2006b54843b69b5280979c12ed6d/7054b730a39f0d762ba1602fbca946a38a8811cf; + url = "http://cdn.unrealengine.com/dependencies/2565979-eaaf2006b54843b69b5280979c12ed6d/7054b730a39f0d762ba1602fbca946a38a8811cf"; sha256 = "1vmx4g2jyv97k5pbv6rayn8a0qd29dwmvbl60v266m2ld25mv59r"; }; "705da00d6ddc859d91abda6fb8299b957eb0d99f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/705da00d6ddc859d91abda6fb8299b957eb0d99f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/705da00d6ddc859d91abda6fb8299b957eb0d99f"; sha256 = "0sizr4r95pddbynh4kns28id4n99hb7cz5dxx5pj5ma8n3w5295f"; }; "7077b313799ab4557f8c8d9aa345313eb3c6fbae" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2622232-9cbce5f5f69743598cf4bcb212040bd6/7077b313799ab4557f8c8d9aa345313eb3c6fbae; + url = "http://cdn.unrealengine.com/dependencies/2622232-9cbce5f5f69743598cf4bcb212040bd6/7077b313799ab4557f8c8d9aa345313eb3c6fbae"; sha256 = "0mhm5c9z63i6v24bfkhci6zdzjzqwaimkd77p5whrnqrfw44iqz2"; }; "70bb4371a8b8f7a2118ee2f0a7604496b68eef9b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/70bb4371a8b8f7a2118ee2f0a7604496b68eef9b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/70bb4371a8b8f7a2118ee2f0a7604496b68eef9b"; sha256 = "1sjrdhycvh0dy9c1b2abkpar8bjmm57xqpfp2qznah918mp43jds"; }; "70bd0e0e4dbec19c4cffb718ebb1ac84e037940e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/70bd0e0e4dbec19c4cffb718ebb1ac84e037940e; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/70bd0e0e4dbec19c4cffb718ebb1ac84e037940e"; sha256 = "0banm0bvf6rsz8jpkx7ivghf47ds8wf6dbcfg17f7nbbcnjg125d"; }; "70f50e9df2d8e0011bf9748ea4c1df4c8c8c2202" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/70f50e9df2d8e0011bf9748ea4c1df4c8c8c2202; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/70f50e9df2d8e0011bf9748ea4c1df4c8c8c2202"; sha256 = "1cw8ykv8nzrvwc1rdr45ilr2cyl8f6crby374n8049dyx1bd2mmx"; }; "71031e888d4b28104016a406b7ab6e993322d9c8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/71031e888d4b28104016a406b7ab6e993322d9c8; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/71031e888d4b28104016a406b7ab6e993322d9c8"; sha256 = "1ixxwv77kbnz8y8z64v0radxx3q7azbakcpq9nl84k8b93lzmp3z"; }; "716adbc60694f3f72ef5e25a38f3fb973fdc7a2e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/716adbc60694f3f72ef5e25a38f3fb973fdc7a2e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/716adbc60694f3f72ef5e25a38f3fb973fdc7a2e"; sha256 = "1c8w4k96i6fgkd0jc9vwpmw31p4bcfw88x09c6781ri64qw1asl6"; }; "71a6745bfe2208e7c0eea0718fc3a06d9ebf12cf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/71a6745bfe2208e7c0eea0718fc3a06d9ebf12cf; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/71a6745bfe2208e7c0eea0718fc3a06d9ebf12cf"; sha256 = "1q9ymfkjvbwv1bwvq5m5c31yb3kcvfwvgrsr803wqa6qm4s40zdd"; }; "71a806e6c281e55c56f6e0feb65e35d553d03b68" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/71a806e6c281e55c56f6e0feb65e35d553d03b68; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/71a806e6c281e55c56f6e0feb65e35d553d03b68"; sha256 = "05065h1wgxihrmih7yc291vxgpyimcj2kgbqn4j8mly43llylp5f"; }; "71b05376f1ca6f9ebfddddb4cb2258620d57951f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/71b05376f1ca6f9ebfddddb4cb2258620d57951f; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/71b05376f1ca6f9ebfddddb4cb2258620d57951f"; sha256 = "09ccxpvjjs3yjc45ygjd6phff9ax7xa0lhr5sb5jzswfnblkb04i"; }; "71f91c9ee187d974e3f5da3d91a352d568c260a8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/71f91c9ee187d974e3f5da3d91a352d568c260a8; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/71f91c9ee187d974e3f5da3d91a352d568c260a8"; sha256 = "1j2jk0qb9wdczxww1wl3rm07rhz1q3b4n6z23jja3r1fqsn8w50v"; }; "7210d2acb28ac3185e52b3c854c02db46878b00b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2499790-9469133ca7fa466794728dd13190004c/7210d2acb28ac3185e52b3c854c02db46878b00b; + url = "http://cdn.unrealengine.com/dependencies/2499790-9469133ca7fa466794728dd13190004c/7210d2acb28ac3185e52b3c854c02db46878b00b"; sha256 = "15llgg0n7w2awbbkb0lvb90g8sjip1zj7knca21lyxgb86p4nfbq"; }; "7214bfbc3129849a9681c342e1873b66020b0420" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621802-1efd555e661e4948aa22f3883712aa6c/7214bfbc3129849a9681c342e1873b66020b0420; + url = "http://cdn.unrealengine.com/dependencies/2621802-1efd555e661e4948aa22f3883712aa6c/7214bfbc3129849a9681c342e1873b66020b0420"; sha256 = "0qpkvfjnmmf8bcvd8qddfyyf3hglkp3870z8rhpxcpyqbv5q644x"; }; "7221d90f16cb54cc4f5be63f68865da103cd4f5a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/7221d90f16cb54cc4f5be63f68865da103cd4f5a; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/7221d90f16cb54cc4f5be63f68865da103cd4f5a"; sha256 = "0xzcfz1npvnf3qidc2yffx5xqs587spjmrxsnsra8fqmghy7y513"; }; "7228172fbb398b4f9cca6ca9b5db85d1a6644b4a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/7228172fbb398b4f9cca6ca9b5db85d1a6644b4a; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/7228172fbb398b4f9cca6ca9b5db85d1a6644b4a"; sha256 = "1d62b5vw3l58667k2nf2dvladpkwpaaa0ai9x58bh46x1gazfdyq"; }; "725d0cc30e3c4b6a9e3dfac3f320a6c9904dd8a9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/725d0cc30e3c4b6a9e3dfac3f320a6c9904dd8a9; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/725d0cc30e3c4b6a9e3dfac3f320a6c9904dd8a9"; sha256 = "1lq5pdjpa6jgrywfzx92vczlkqp8ggr6mqlnly772c6a4p507xvi"; }; "72e906fb126222e8269f7d46e2d9f1ac603baa5e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/72e906fb126222e8269f7d46e2d9f1ac603baa5e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/72e906fb126222e8269f7d46e2d9f1ac603baa5e"; sha256 = "0by17bnb94wwv35bqbb7gxn64xppf6m88m50lm6dxyblclizk1sx"; }; "72e922640673b6171e86c8c7fcdfa148004c1301" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/72e922640673b6171e86c8c7fcdfa148004c1301; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/72e922640673b6171e86c8c7fcdfa148004c1301"; sha256 = "0xbd7jd9pj1g3yf4252dy84w1x7czlqa1gxalk6p6awn1n1va815"; }; "72fc2150939a11815cfa929001ecb00ad565ce7e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/72fc2150939a11815cfa929001ecb00ad565ce7e; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/72fc2150939a11815cfa929001ecb00ad565ce7e"; sha256 = "1jbhd6mcrxk21dbjavkz6mf610zdql9srkd6c4flb794kfxx0gir"; }; "72fee8305071d508698fa86e4a89c80f5ee236b3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/72fee8305071d508698fa86e4a89c80f5ee236b3; + url = "http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/72fee8305071d508698fa86e4a89c80f5ee236b3"; sha256 = "1dkbhigrqnbdpp7ixm8fwhn4x294n7zi33xijw9vngysc7kngx7g"; }; "7305d73041a77bded642dbf6567625ac3c0208fe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2466157-4ecb0085873048178dd6d2b8872eea79/7305d73041a77bded642dbf6567625ac3c0208fe; + url = "http://cdn.unrealengine.com/dependencies/2466157-4ecb0085873048178dd6d2b8872eea79/7305d73041a77bded642dbf6567625ac3c0208fe"; sha256 = "17l3s1kn54kzjg7ajxhx7rvmw6rsvk1ad748dp9mqi5qd80096bp"; }; "730822767c19d479de3afc2e926cfd7438e23852" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/730822767c19d479de3afc2e926cfd7438e23852; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/730822767c19d479de3afc2e926cfd7438e23852"; sha256 = "1hgcf7mzjamjjrs2636zdkz47knwy8hbvf1l4rm4slzi1mr2zrk1"; }; "7320897f4f1584c0e42fd2546557d85ca8f513db" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/7320897f4f1584c0e42fd2546557d85ca8f513db; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/7320897f4f1584c0e42fd2546557d85ca8f513db"; sha256 = "0r77s64pcx4585g5s3gbjksfsggbmp552fsipqzs4fv7qmanym5r"; }; "736ccee7ee45e606201ef7b7c643498cfa13d70e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/736ccee7ee45e606201ef7b7c643498cfa13d70e; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/736ccee7ee45e606201ef7b7c643498cfa13d70e"; sha256 = "0p69pgkm72g46s76k1v8m2k77hh08sb0amx6lsszkipn86kx7ff4"; }; "73bae428e969b828d72a1c4b71208bd855b67233" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/73bae428e969b828d72a1c4b71208bd855b67233; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/73bae428e969b828d72a1c4b71208bd855b67233"; sha256 = "1x3ikd5ymqixs0zsny0lp6la3jhxay54iajw2m99w4bzfscqdkz5"; }; "73ee6ef047e32991fff9aeb313c0e8c7faf673dc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/73ee6ef047e32991fff9aeb313c0e8c7faf673dc; + url = "http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/73ee6ef047e32991fff9aeb313c0e8c7faf673dc"; sha256 = "06xm65k8i87crf0dq2iyj6mxwbyp0spmjwqha3n93fv63sgg3zrf"; }; "73ffe57844e03a4cafc0e9aa8819694c90e1522b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/73ffe57844e03a4cafc0e9aa8819694c90e1522b; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/73ffe57844e03a4cafc0e9aa8819694c90e1522b"; sha256 = "0j5ysqydqi51y5yv984wzs4q2y5d2d2cdrraw001yda5ghiidp4d"; }; "746b744c6a42c0f8af6feef784581873bde794e1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/746b744c6a42c0f8af6feef784581873bde794e1; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/746b744c6a42c0f8af6feef784581873bde794e1"; sha256 = "1wsmy3wazhzjk50yd2n3g9zrivzfwqvl2r5blcv7zvvqwyfhnpax"; }; "7491079d020d11f40f14eb94536fe09006ff2c16" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7491079d020d11f40f14eb94536fe09006ff2c16; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7491079d020d11f40f14eb94536fe09006ff2c16"; sha256 = "03aqvnhvbw15kh30384pyg01s4nixjqz22780yjja4hj51frxps3"; }; "749a111a54b3257ccd4600b6ece1fd86a57efe58" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/749a111a54b3257ccd4600b6ece1fd86a57efe58; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/749a111a54b3257ccd4600b6ece1fd86a57efe58"; sha256 = "09lf0sslsikg4jks8yzb6b9k3y9d0dbig5j45kfk58yjx90mgfhv"; }; "74a5411261270860b0b2d315c8398df07f956fa0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/74a5411261270860b0b2d315c8398df07f956fa0; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/74a5411261270860b0b2d315c8398df07f956fa0"; sha256 = "1c8zc6kryl6nn9bv77fim2ccd5ikqjnj5n0b75dii63znm8hlp2i"; }; "74bdfe7b7c5448f6b002b747a29ddf4eb214dc0a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/74bdfe7b7c5448f6b002b747a29ddf4eb214dc0a; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/74bdfe7b7c5448f6b002b747a29ddf4eb214dc0a"; sha256 = "10kq66r73gc8ghb3b5jgahbgs9rnv2s3kbvd72vjbdbyz58wacrx"; }; "74c4761d61aabc4f7e227da3ff18fc3af1ea7f5f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/74c4761d61aabc4f7e227da3ff18fc3af1ea7f5f; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/74c4761d61aabc4f7e227da3ff18fc3af1ea7f5f"; sha256 = "176b4fv2dmppcs9zyci4yilvj0kmn92cxybbwjllp2cr9x2ard91"; }; "74df4c8f82ff3081bd49648cee83a06677495bd4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/74df4c8f82ff3081bd49648cee83a06677495bd4; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/74df4c8f82ff3081bd49648cee83a06677495bd4"; sha256 = "12brl8hsdyv0gf4hggi7mf9j5q2r19w3najivicrq86rg0f2km1y"; }; "74f904f20ed3e1cd02cc9d0e07a2778948328274" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/74f904f20ed3e1cd02cc9d0e07a2778948328274; + url = "http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/74f904f20ed3e1cd02cc9d0e07a2778948328274"; sha256 = "0169jszrsidkhbhz906yc8a10ffkcnp2kxz193r46j9qpv69dk2q"; }; "75124406de34db23633265523d08e569d7889164" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/75124406de34db23633265523d08e569d7889164; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/75124406de34db23633265523d08e569d7889164"; sha256 = "0709ach7hq7qn6452xd7n6jlqx6j5b597yyvzvmcfsbnp5nmn39k"; }; "751d2649bc4cf19cea075804463f00cf0ae61ed7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/751d2649bc4cf19cea075804463f00cf0ae61ed7; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/751d2649bc4cf19cea075804463f00cf0ae61ed7"; sha256 = "1a5g17mvwa7f8ydwikgc0f4hf8wp8w491fhhzvnn4m4i6jam6hwn"; }; "753eb938736a4b412147164d4077e991f9c89950" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2618214-623983ec05b34939b08acd26ecfb4f92/753eb938736a4b412147164d4077e991f9c89950; + url = "http://cdn.unrealengine.com/dependencies/2618214-623983ec05b34939b08acd26ecfb4f92/753eb938736a4b412147164d4077e991f9c89950"; sha256 = "18zkl0jsx165akaxgxxzf3619jmclxc18nggcbyb1iwqmxrxpcak"; }; "759eb0a64477d1269a2089f229e3f0a2276fb531" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/759eb0a64477d1269a2089f229e3f0a2276fb531; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/759eb0a64477d1269a2089f229e3f0a2276fb531"; sha256 = "1v0wgzzv2d6mxmkb0s96q7jb9d5knnh2p0ja261kmqhyc6dlzlqr"; }; "75e0842c76b2e55a861da42ea1d7c4636ab53833" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/75e0842c76b2e55a861da42ea1d7c4636ab53833; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/75e0842c76b2e55a861da42ea1d7c4636ab53833"; sha256 = "05a3azlaw3y38ysr9rdrjk8mcrzm46q39k9xy75jxg52qpbdxmzi"; }; "76b0c3828b07ab86d995f91647a8fddeda00981a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/76b0c3828b07ab86d995f91647a8fddeda00981a; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/76b0c3828b07ab86d995f91647a8fddeda00981a"; sha256 = "1jybpkydwa8ry4197hxb43f6lgszv6sl9fnpbd335mipn5gs9das"; }; "76df9b164d66551812ce65dddef45a44604b8c8c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2736314-83d0b2c86e6940798eae7a6b4a7a011b/76df9b164d66551812ce65dddef45a44604b8c8c; + url = "http://cdn.unrealengine.com/dependencies/2736314-83d0b2c86e6940798eae7a6b4a7a011b/76df9b164d66551812ce65dddef45a44604b8c8c"; sha256 = "1knls10cjd66hr0z4988gw5p782q7f7lyagpx9f63zxbqjn0l3v3"; }; "7725a79a9a5f662ca2adf8ae2efb114d32ff45a2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7725a79a9a5f662ca2adf8ae2efb114d32ff45a2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7725a79a9a5f662ca2adf8ae2efb114d32ff45a2"; sha256 = "1vszgcnacspqzz1fj0y38gjj54qavksbwswbz2cmyml0m77h8qfr"; }; "77352bcc40b2053c8db752c49772dbf0d158af62" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/77352bcc40b2053c8db752c49772dbf0d158af62; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/77352bcc40b2053c8db752c49772dbf0d158af62"; sha256 = "1pgz55g9wk1z146f00r6kbij5qkng7cb7ni22jgr6x3inblq28da"; }; "77464fb66258632d2799ac5491f4316d35cc346c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/77464fb66258632d2799ac5491f4316d35cc346c; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/77464fb66258632d2799ac5491f4316d35cc346c"; sha256 = "0iixcb51kdjnl8llbqiib1dkcv421d8pi9hly1r00clds5b5bpf0"; }; "7756f8e0698993a2efb94e15819a1d1a22edd9aa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7756f8e0698993a2efb94e15819a1d1a22edd9aa; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7756f8e0698993a2efb94e15819a1d1a22edd9aa"; sha256 = "0pm34hr3jm8nsvaypl68nacmbpzi2ynfnxm02rkn589f03778sni"; }; "777419bfd692da1795221b0711a3b11467f5e4ad" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/777419bfd692da1795221b0711a3b11467f5e4ad; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/777419bfd692da1795221b0711a3b11467f5e4ad"; sha256 = "1g2rl7j740zhf4y8pcbcdhpzxzw9hcp0vb82zm72nhfw8hp9z212"; }; "777fe4089b0a02f749411d577a2a17adf635dec1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/777fe4089b0a02f749411d577a2a17adf635dec1; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/777fe4089b0a02f749411d577a2a17adf635dec1"; sha256 = "1lvj3lvc20rh4yvwbyafw270chkl16jlardv8pqavil085qz332f"; }; "77ab57479dfe164e72b8298375e3b9b577e6640d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/77ab57479dfe164e72b8298375e3b9b577e6640d; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/77ab57479dfe164e72b8298375e3b9b577e6640d"; sha256 = "18qjd9d7d66qjk087xg246d6gssbiiv08y3rq2v1d7cddbsbbzda"; }; "785a36aff000132218d273b16e36412342def12d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/785a36aff000132218d273b16e36412342def12d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/785a36aff000132218d273b16e36412342def12d"; sha256 = "0235bgb8hzg5x5fhk8a5iasdjfbj5xzh0ccxx3iaadmadcn3xgxj"; }; "786040422666da11604af7280dd6eed639de30d4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/786040422666da11604af7280dd6eed639de30d4; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/786040422666da11604af7280dd6eed639de30d4"; sha256 = "0na97fbmlgwl7kfp5asvj41llyrk6srn11argjq20vwrpzj9c0h4"; }; "788022e3bc41bf23e517d88df0ca24f715b1cad4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/788022e3bc41bf23e517d88df0ca24f715b1cad4; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/788022e3bc41bf23e517d88df0ca24f715b1cad4"; sha256 = "1hhilba17whyl3iycd906nh0c4v9mia51pb8cgy7kqjiawypcp6k"; }; "788b132136ad4d08c5f03e4078824ec04b1ac0b9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2622232-9cbce5f5f69743598cf4bcb212040bd6/788b132136ad4d08c5f03e4078824ec04b1ac0b9; + url = "http://cdn.unrealengine.com/dependencies/2622232-9cbce5f5f69743598cf4bcb212040bd6/788b132136ad4d08c5f03e4078824ec04b1ac0b9"; sha256 = "1wf1kizj5s4nkkmyhc1xs1mqzzwc1b2vdybbnx3g7rn9p9rq3jgc"; }; "789b2bc3606dc2558b7cab5dbb62e8e76f20ef74" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/789b2bc3606dc2558b7cab5dbb62e8e76f20ef74; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/789b2bc3606dc2558b7cab5dbb62e8e76f20ef74"; sha256 = "10pzb9ylqbsls482sa1frmk7r8ra7b6y0fjb7x97v482pdskh64r"; }; "79042a16d0ef7feeccc76315246c5ee6f36dfafe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/79042a16d0ef7feeccc76315246c5ee6f36dfafe; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/79042a16d0ef7feeccc76315246c5ee6f36dfafe"; sha256 = "1wn397vwkkakm5q0r2kk1axq3zxfrc1f65cbwqlixzfgpz8lybil"; }; "7927b5a5a5c57b3801e7d0d4a42fcb142f267b78" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2653252-2bb04ebcdd0e406596c1b14273fe0c06/7927b5a5a5c57b3801e7d0d4a42fcb142f267b78; + url = "http://cdn.unrealengine.com/dependencies/2653252-2bb04ebcdd0e406596c1b14273fe0c06/7927b5a5a5c57b3801e7d0d4a42fcb142f267b78"; sha256 = "14w4h37fsmj9mjsfa53hc4ymx9j6b9dfia3n4gwkwmbw5sj8l9gp"; }; "792a616c0f78fa0b294f67b56549092efbbbeff6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/792a616c0f78fa0b294f67b56549092efbbbeff6; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/792a616c0f78fa0b294f67b56549092efbbbeff6"; sha256 = "1875sind4si5lwmbypjn3ssbdxn1w5a5wv61kllqw9a8iz76pc0x"; }; "79477f2a4147dd648f89b314306f5f0346278735" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/79477f2a4147dd648f89b314306f5f0346278735; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/79477f2a4147dd648f89b314306f5f0346278735"; sha256 = "180qwmv30vf5fx724mn44l8p9j6ipaqqs83fsiwyaifa1zn4kaf8"; }; "796f0c398bb010288b3688e6743420cfb681a4b8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/796f0c398bb010288b3688e6743420cfb681a4b8; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/796f0c398bb010288b3688e6743420cfb681a4b8"; sha256 = "07mj9nfb7ganiv6pc4yz30zsbfbhqpap2x21nrq93f7r75jckssw"; }; "7983882382ee0785a3619bfda754358f8d6cd5c9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/7983882382ee0785a3619bfda754358f8d6cd5c9; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/7983882382ee0785a3619bfda754358f8d6cd5c9"; sha256 = "0z3jwzxdmsdwx623fbhzp5jif0yv8v31br3ipbv6d3d8kv0cw90w"; }; "7996e8351b085aa99ee962c9a0abbbe9b077e23c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/7996e8351b085aa99ee962c9a0abbbe9b077e23c; + url = "http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/7996e8351b085aa99ee962c9a0abbbe9b077e23c"; sha256 = "1wsg1f8y22m01m1x8ryxzbyqzgrk0v8wssvpzcdg95ld4n46z6ps"; }; "79cbc648416e750ee538d57d6b608e3b7bd7717d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/79cbc648416e750ee538d57d6b608e3b7bd7717d; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/79cbc648416e750ee538d57d6b608e3b7bd7717d"; sha256 = "1z5ibq34jhlyszxxllfn1ffmp8b0y7w7cqmxridnq78b1zirsj65"; }; "7a02f98f23ebb4382454f2813a70cbb932fb9e13" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/7a02f98f23ebb4382454f2813a70cbb932fb9e13; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/7a02f98f23ebb4382454f2813a70cbb932fb9e13"; sha256 = "0k8ayk7rh6kkxf8bk9hqy4wa7zh1m5gzbxfds6cc0zd4kr150sqg"; }; "7a7d7497e9f19ef7a2e4e35a37308b21cec9f982" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/7a7d7497e9f19ef7a2e4e35a37308b21cec9f982; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/7a7d7497e9f19ef7a2e4e35a37308b21cec9f982"; sha256 = "0ba05lnjy3ghs3jy519pcjyav5r75lpall461qns2bppzpm4a076"; }; "7a8446207acdf4eaf9676898ddacf9bdbf595de9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7a8446207acdf4eaf9676898ddacf9bdbf595de9; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7a8446207acdf4eaf9676898ddacf9bdbf595de9"; sha256 = "1lndbrl5sp0gj7fasrzsc2yz4vmcr8q29yvp8cva2b9691q8gj4i"; }; "7ac1ecd1bdbc99aa980807c5645a78ae48ea9577" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604998-3c15fbba3f5f4174942b1436c2db55e8/7ac1ecd1bdbc99aa980807c5645a78ae48ea9577; + url = "http://cdn.unrealengine.com/dependencies/2604998-3c15fbba3f5f4174942b1436c2db55e8/7ac1ecd1bdbc99aa980807c5645a78ae48ea9577"; sha256 = "04m1a8g9w4hyclfx1nc6prd02kicjdsnzg4spwk63rgv3lamjqd0"; }; "7ad6959d0c1c635355409e72473d108d90869dab" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/7ad6959d0c1c635355409e72473d108d90869dab; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/7ad6959d0c1c635355409e72473d108d90869dab"; sha256 = "19nr57sy463g1m2fbrdhpb8p5yd5dls64gw9zq2zb4jyjj7y8fia"; }; "7adad32ec30d0be94dcf1a19012e273b9971057e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/7adad32ec30d0be94dcf1a19012e273b9971057e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/7adad32ec30d0be94dcf1a19012e273b9971057e"; sha256 = "13f8c98an8ycv27kglnc46jl6abgyvnq6dm8xpzzlh28fj88gbjk"; }; "7ae477712090513005fe5af06c6026b245d3c946" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/7ae477712090513005fe5af06c6026b245d3c946; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/7ae477712090513005fe5af06c6026b245d3c946"; sha256 = "1w1ihg63ks2ba8x4m04yblbc7d8ycgbczsjz2lp28j5dy7b10i48"; }; "7b091ff0e3269cd3b11fb00a394f82b1604095c7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/7b091ff0e3269cd3b11fb00a394f82b1604095c7; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/7b091ff0e3269cd3b11fb00a394f82b1604095c7"; sha256 = "10cysl5b6iagx699w1kw5xfa51flr433g4wl55bjz9bdjw4ln51r"; }; "7b6219b2124e3663a1f4383de616fd63676c9693" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/7b6219b2124e3663a1f4383de616fd63676c9693; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/7b6219b2124e3663a1f4383de616fd63676c9693"; sha256 = "0260b4p3ng5jdjb8z22cpp2376wahvh4gihjxcghlk3bal5k743c"; }; "7b7d2e469aa46e6b7a1550e355690591e4ac54fa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7b7d2e469aa46e6b7a1550e355690591e4ac54fa; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7b7d2e469aa46e6b7a1550e355690591e4ac54fa"; sha256 = "1nyx2fjbcpdfrlbqb966x2zd1rbk7kx9x61knrfhhz7r5kb1z5bm"; }; "7b83af4328df75db5202d9e02c057d139ca1a9dc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/7b83af4328df75db5202d9e02c057d139ca1a9dc; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/7b83af4328df75db5202d9e02c057d139ca1a9dc"; sha256 = "1igfygl9hk0q3ndjiji6bfgb4p77038bbk31kgrdy4gvky3qz21l"; }; "7ba89ad415dac138be18aeefe3423e3ebd56c0ee" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2448689-7792f1b8be254cc19b4c3379509684cc/7ba89ad415dac138be18aeefe3423e3ebd56c0ee; + url = "http://cdn.unrealengine.com/dependencies/2448689-7792f1b8be254cc19b4c3379509684cc/7ba89ad415dac138be18aeefe3423e3ebd56c0ee"; sha256 = "10yn9d19andj61gj8x771yyrl2y7l0rgqg22mm53hkbdkfghml8h"; }; "7bc9f224a762158a310d9dd9c355f21bc20cf5fb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/7bc9f224a762158a310d9dd9c355f21bc20cf5fb; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/7bc9f224a762158a310d9dd9c355f21bc20cf5fb"; sha256 = "1rxd81p9gd5rwqz9krv48bl5qzdqdb08xlc3ikn85mk847n6riyq"; }; "7bd4669f05c73f4cc2d165c712eeb0cca6711e7c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7bd4669f05c73f4cc2d165c712eeb0cca6711e7c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7bd4669f05c73f4cc2d165c712eeb0cca6711e7c"; sha256 = "1ps1j2vywaxxcprmxbyzi3nzvks9gxviqjcvha4wv8p4igm7p861"; }; "7be14b1c31f9c742d61528f894b5a0faafdca608" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7be14b1c31f9c742d61528f894b5a0faafdca608; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7be14b1c31f9c742d61528f894b5a0faafdca608"; sha256 = "01snf2y4scl2vhbbmzs4hjayjp7hkydr7a2kbjgwc1kb41vcvvmg"; }; "7c8c84dac9bcec95152cac9aa9acac67f7702d08" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2639799-4ac82b5356a9467b8556f714f8dd9e00/7c8c84dac9bcec95152cac9aa9acac67f7702d08; + url = "http://cdn.unrealengine.com/dependencies/2639799-4ac82b5356a9467b8556f714f8dd9e00/7c8c84dac9bcec95152cac9aa9acac67f7702d08"; sha256 = "0w0ry83bxhw07l0y2zw3s1szx6gbhh2zbvwnjnd3qhjdic8abvzy"; }; "7c963542515f21d8db5b961bee100b6412d597d1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2377358-53c9e09a80d741708f589736e8974c22/7c963542515f21d8db5b961bee100b6412d597d1; + url = "http://cdn.unrealengine.com/dependencies/2377358-53c9e09a80d741708f589736e8974c22/7c963542515f21d8db5b961bee100b6412d597d1"; sha256 = "0y6186f5l3glsnnqv23npj6b1m23jxy18j6mg30g38g4lr2vk0ad"; }; "7cc355b9c369e318b838b18f749c24e2afd259c4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/7cc355b9c369e318b838b18f749c24e2afd259c4; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/7cc355b9c369e318b838b18f749c24e2afd259c4"; sha256 = "1jiz1n0wy6mqnv2m7v8mksrh3v6vwliqc8v6jjv7rxz1x4zclinz"; }; "7d8e31de63a57ce9a9e79c5263a63d5d46615baa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/7d8e31de63a57ce9a9e79c5263a63d5d46615baa; + url = "http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/7d8e31de63a57ce9a9e79c5263a63d5d46615baa"; sha256 = "1iz5vbwxajss32yvjwdss1hfczp3viz8nfl9xsk35bh5q5az0mfx"; }; "7d9e9a2f89c7bbc7404f79811bf83f4076b5bc32" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/7d9e9a2f89c7bbc7404f79811bf83f4076b5bc32; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/7d9e9a2f89c7bbc7404f79811bf83f4076b5bc32"; sha256 = "1p37wspipadj5qicv6bs3rg3vqiqx49jkd6q3pgkb40bp0gs70ld"; }; "7db350110118d3076728f890e80db47042b1c9c4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/7db350110118d3076728f890e80db47042b1c9c4; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/7db350110118d3076728f890e80db47042b1c9c4"; sha256 = "1x5j73m7lvz6dacd7cl1g6x0206pmh394l650aidzmmywnmpni5y"; }; "7db51b6372a7e6ccd911890e40586056b5c3bf70" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/7db51b6372a7e6ccd911890e40586056b5c3bf70; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/7db51b6372a7e6ccd911890e40586056b5c3bf70"; sha256 = "003dg3cglf6dbljyfdamahznka718qcpsfbkvsk1kbysa6nz0kcd"; }; "7dc9a4ae40e2c039f47bfa781f706c6ba93f5e77" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/7dc9a4ae40e2c039f47bfa781f706c6ba93f5e77; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/7dc9a4ae40e2c039f47bfa781f706c6ba93f5e77"; sha256 = "11bjnjh99mdh9fqcrnddnhgjr1znlhi11rbqajc1wjwk4zrs7h51"; }; "7ddc7ee608268e6d717f879cf6b6b7305f636cd2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/7ddc7ee608268e6d717f879cf6b6b7305f636cd2; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/7ddc7ee608268e6d717f879cf6b6b7305f636cd2"; sha256 = "16cz1bvq3za22myf04p2al6im72x6al6a2y5sv5mgz7nvnhi0q4d"; }; "7de52ed6339fe756210b171c838332e276370e70" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2619995-d5e097f793bd479d8592679759fb98be/7de52ed6339fe756210b171c838332e276370e70; + url = "http://cdn.unrealengine.com/dependencies/2619995-d5e097f793bd479d8592679759fb98be/7de52ed6339fe756210b171c838332e276370e70"; sha256 = "076p1hj2bjysj1yk45ywrahrz9d9k8q0cvw52g0141985g9av8fs"; }; "7df9510763997f0e8873568712dd0de573058bf3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/7df9510763997f0e8873568712dd0de573058bf3; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/7df9510763997f0e8873568712dd0de573058bf3"; sha256 = "0iy45rddw5cq5w9qm6vd6lxjnf2b4hm4abnna0ay7qnmdkcxy0zp"; }; "7e1d5652590c12db0c440eac59f69a777425f9bf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/7e1d5652590c12db0c440eac59f69a777425f9bf; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/7e1d5652590c12db0c440eac59f69a777425f9bf"; sha256 = "0j3f2saflmsylyi4i2w4z56kwzpdvimi9na49m3nfd16d5m50fnz"; }; "7e6ab4f547b9d8bf5f8a35a74d335d500588d8d9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2431986-5a8dd079cf514ebd8b20693fadfa5a4e/7e6ab4f547b9d8bf5f8a35a74d335d500588d8d9; + url = "http://cdn.unrealengine.com/dependencies/2431986-5a8dd079cf514ebd8b20693fadfa5a4e/7e6ab4f547b9d8bf5f8a35a74d335d500588d8d9"; sha256 = "0m45dhadisgl1n32vbj71vhj1avn9mcl3gx7dsrgd5pyj2cm0v2v"; }; "7e741bb7378733b67fd4bf594a5798fdbbf4c06b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7e741bb7378733b67fd4bf594a5798fdbbf4c06b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7e741bb7378733b67fd4bf594a5798fdbbf4c06b"; sha256 = "0090i1z4ggh0rjka4lk2nyh8vz6w5kbxrf5y8sb4lyhbggshypz4"; }; "7e74577c3774e9eb2328f96f667ae7df976b62e7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/7e74577c3774e9eb2328f96f667ae7df976b62e7; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/7e74577c3774e9eb2328f96f667ae7df976b62e7"; sha256 = "03p73gsai1gzazyhi0s409d88b0vlnvap2dy5qas5xazhsj3s32v"; }; "7e929e26670125eb017b7f33f7906adcbf8cdbe9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/7e929e26670125eb017b7f33f7906adcbf8cdbe9; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/7e929e26670125eb017b7f33f7906adcbf8cdbe9"; sha256 = "04dx7sqs1s3h8msjfah395hjx4a2x51k0innh4np11zr0chw4rf0"; }; "7eab47f1da799465d08b68e26c7ae336a7b07a47" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/7eab47f1da799465d08b68e26c7ae336a7b07a47; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/7eab47f1da799465d08b68e26c7ae336a7b07a47"; sha256 = "1nkgnvif8ysz26rwhxmr3kfk5xajr7z5nbbx4givpv16fmr67hp1"; }; "7f0b7231a2a6fd1df206769a4acb8cb861b09f02" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/7f0b7231a2a6fd1df206769a4acb8cb861b09f02; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/7f0b7231a2a6fd1df206769a4acb8cb861b09f02"; sha256 = "0fbsqakyam8jacxw9kmifddmgilr1rlvcxp0dskvdlb31pfzzlx7"; }; "7f5b42e091a41c16eb4bfdfb2de3a36670854201" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/7f5b42e091a41c16eb4bfdfb2de3a36670854201; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/7f5b42e091a41c16eb4bfdfb2de3a36670854201"; sha256 = "1qbwixy33i07qcicgc2xra46nhb9jklal25pw0wrc0r7migxv9f9"; }; "7f8b724b75c6f29c33f33a1f310cb495e079aaa1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/7f8b724b75c6f29c33f33a1f310cb495e079aaa1; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/7f8b724b75c6f29c33f33a1f310cb495e079aaa1"; sha256 = "0clv70849r47m9y7l5515xn9z2qn4vazkkpfpwdrgmbh8wjb0xnl"; }; "7fe64241b07105e31272f224ac763156f8b8296c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7fe64241b07105e31272f224ac763156f8b8296c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7fe64241b07105e31272f224ac763156f8b8296c"; sha256 = "1h4b430rjv86bv4vcrj6hrza71b5hrrivllxn7an78yi7rigc761"; }; "801295549915c66473e6cd436dc1623ad50a6868" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/801295549915c66473e6cd436dc1623ad50a6868; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/801295549915c66473e6cd436dc1623ad50a6868"; sha256 = "0d889wz1r7l3801gdcmdchnij3z3ch8adw0rn5rc613r3nz613hh"; }; "806cb366cb892bd749bb1e697026060f9943b794" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/806cb366cb892bd749bb1e697026060f9943b794; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/806cb366cb892bd749bb1e697026060f9943b794"; sha256 = "0k470mdbdk4r7ryrm7b2m2mnmiwg9bqn6xrm9f426vj6409sh3bp"; }; "8083297580223f34923e3ed275ba2082cb6ff1b6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2639799-4ac82b5356a9467b8556f714f8dd9e00/8083297580223f34923e3ed275ba2082cb6ff1b6; + url = "http://cdn.unrealengine.com/dependencies/2639799-4ac82b5356a9467b8556f714f8dd9e00/8083297580223f34923e3ed275ba2082cb6ff1b6"; sha256 = "0rl4vw9nnarpbg9in4kj08yjran73yk821q03kggxjs9kd3m6p9a"; }; "80cd8c5c566432905a991761c25be7e43613ea68" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/80cd8c5c566432905a991761c25be7e43613ea68; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/80cd8c5c566432905a991761c25be7e43613ea68"; sha256 = "08d0cchndgs7z1m1iw78ri9b740z06daclbb1krnd9jbjbr72540"; }; "80cf2aada6b342c76be1c6617a893008f7a2e992" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/80cf2aada6b342c76be1c6617a893008f7a2e992; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/80cf2aada6b342c76be1c6617a893008f7a2e992"; sha256 = "1is1wl3m8l1gnfnhadnig3h4p3lg2dbrhx0j18zl01s5y5l5dz72"; }; "80fbbdd5d2b95966d99e270b260593880769871c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/80fbbdd5d2b95966d99e270b260593880769871c; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/80fbbdd5d2b95966d99e270b260593880769871c"; sha256 = "1dcag3ris9wpm0vfk296902arm6xph496gi13xr1lv2ic0ay4ajh"; }; "8113584b3d880586f19985a5103712b5251a347d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8113584b3d880586f19985a5103712b5251a347d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8113584b3d880586f19985a5103712b5251a347d"; sha256 = "0qgsp5kjlbzmp2v979wnc30isn10mv8w42riynpkia2waqq1yypf"; }; "81306b38538d7e69e278eb4d4a1acb25c2d44dfc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2505717-ca6614fe3fb64e47b28005ce3736302b/81306b38538d7e69e278eb4d4a1acb25c2d44dfc; + url = "http://cdn.unrealengine.com/dependencies/2505717-ca6614fe3fb64e47b28005ce3736302b/81306b38538d7e69e278eb4d4a1acb25c2d44dfc"; sha256 = "1b3hfip5h2ra2cj3c80v87fyn5g52kfl8hi7l9ynx6rbh45jd7cp"; }; "81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2466157-4ecb0085873048178dd6d2b8872eea79/81594c92fcec0b95d7d0b47ad36aef8d2605c8b8; + url = "http://cdn.unrealengine.com/dependencies/2466157-4ecb0085873048178dd6d2b8872eea79/81594c92fcec0b95d7d0b47ad36aef8d2605c8b8"; sha256 = "0cj2l82yi6yp8x2rsv5ga7cl5jrmnl7wv68608ymrdimnrg1l19j"; }; "815c7f4ed8653c23f02829438b553e4e310c1185" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/815c7f4ed8653c23f02829438b553e4e310c1185; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/815c7f4ed8653c23f02829438b553e4e310c1185"; sha256 = "1bd8y1165dgw5naxwzh92plkx24v468fz8i0afaxk8cpqvjcn4b4"; }; "815ceaba7a67e678c4a7187990c7367805ed6d7c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/815ceaba7a67e678c4a7187990c7367805ed6d7c; + url = "http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/815ceaba7a67e678c4a7187990c7367805ed6d7c"; sha256 = "0zrlxcqp7arscfbjsffganmr8ykjy9kavkq6r0sjv33nf2wahcxw"; }; "81bce187e69fb02baaecaa20027bd477eb1f990b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/81bce187e69fb02baaecaa20027bd477eb1f990b; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/81bce187e69fb02baaecaa20027bd477eb1f990b"; sha256 = "1pmpm2dppzr71qvrfb8h5837mxgl654hiihymh2aw12bh1hl84dk"; }; "820a14581d58bc24e04e70e2d050e8568367b29f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/820a14581d58bc24e04e70e2d050e8568367b29f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/820a14581d58bc24e04e70e2d050e8568367b29f"; sha256 = "0h5kl259s20bv2y8k0pklvl5lpv4qc2y742nfyph04d8gh44i11r"; }; "823786b849304f4f046e804e4c7a9578b0e7dc4d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/823786b849304f4f046e804e4c7a9578b0e7dc4d; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/823786b849304f4f046e804e4c7a9578b0e7dc4d"; sha256 = "1nxcnkv4p6m57rwr4wj4pz19z579sf9mqay6x64ddbnlc0d8ijfv"; }; "82752934d29486bef3008fe2e7e9953dacd3a238" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/82752934d29486bef3008fe2e7e9953dacd3a238; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/82752934d29486bef3008fe2e7e9953dacd3a238"; sha256 = "0i7l4yw0qrp29ax36lp3sgyqbqshv5v0y2y4jp9g8b996rr42ypp"; }; "82896a288bed5637b5e537aff3c81d9a146cad8b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/82896a288bed5637b5e537aff3c81d9a146cad8b; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/82896a288bed5637b5e537aff3c81d9a146cad8b"; sha256 = "0g2nh96n0k2mv4fdaw6sqlav9diclhmljsixvfbp0550p44i3dhf"; }; "82921dd1135940696b085da4d09cdd25eb6b740d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/82921dd1135940696b085da4d09cdd25eb6b740d; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/82921dd1135940696b085da4d09cdd25eb6b740d"; sha256 = "0i7yiz8d1qqiy7i6yy389b44v29i3zl479jarss0x77m7nzlpi7v"; }; "82b74cc467fe5e422dffc6ccdaa2746b68a52fde" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/82b74cc467fe5e422dffc6ccdaa2746b68a52fde; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/82b74cc467fe5e422dffc6ccdaa2746b68a52fde"; sha256 = "057npy7g6dvcqkj4yw89cpci8cizg636gah9qq82h00684215jsj"; }; "82db6fcd53c153656a49118fc20771a50c406e2c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/82db6fcd53c153656a49118fc20771a50c406e2c; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/82db6fcd53c153656a49118fc20771a50c406e2c"; sha256 = "0wmb1vn704srn9w5a61bs7mb3rp3azgv5bh6rl4hi7wa9wffwmbi"; }; "8305a66fae9404fe58331fbef287d0215d05f2b3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8305a66fae9404fe58331fbef287d0215d05f2b3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8305a66fae9404fe58331fbef287d0215d05f2b3"; sha256 = "196zwpsd8fz1s6gkd35psacb4v6bik4zjgbaqy6ff2118bg3l19y"; }; "83080f6144d571a9ef0996315476290d9c3fff68" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/83080f6144d571a9ef0996315476290d9c3fff68; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/83080f6144d571a9ef0996315476290d9c3fff68"; sha256 = "0rmk1xzs86dvr9k971mb3d5d9q0nbyxr6lh753pf5bqkjsrwirp8"; }; "83095c9481a4bebd25dad78e6ae747bd3674e086" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/83095c9481a4bebd25dad78e6ae747bd3674e086; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/83095c9481a4bebd25dad78e6ae747bd3674e086"; sha256 = "1r2p3xp0rv19i9dyrf0chc5n8f736d90w5paq90fdxvfzzzx562f"; }; "8309626bf9429a32adfd8e1526f7dcbfb250ca49" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2640065-e0e714c2e4584d65837eabf6f55a41ba/8309626bf9429a32adfd8e1526f7dcbfb250ca49; + url = "http://cdn.unrealengine.com/dependencies/2640065-e0e714c2e4584d65837eabf6f55a41ba/8309626bf9429a32adfd8e1526f7dcbfb250ca49"; sha256 = "02n8g65lp6zbqprxswz598076syxav2vy350yq2gvq6s2p1ad12y"; }; "831c19b0009bccd44d4c2837f3c8ba6e08753be0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2579917-73d6be760fd9486fbc9abe582732eb6e/831c19b0009bccd44d4c2837f3c8ba6e08753be0; + url = "http://cdn.unrealengine.com/dependencies/2579917-73d6be760fd9486fbc9abe582732eb6e/831c19b0009bccd44d4c2837f3c8ba6e08753be0"; sha256 = "1b0gsmrzb0bh8mrjfmmxlp55867x5fhqm18wacqvzx2g62zmm0f3"; }; "8336cdf6f693aca7ab55371790ccf0bd5043c224" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/8336cdf6f693aca7ab55371790ccf0bd5043c224; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/8336cdf6f693aca7ab55371790ccf0bd5043c224"; sha256 = "0bqsgbzhsd8dfjlfafs1yx833gwa8pm9jhgq72ymnk83kijhj01x"; }; "835db4359138adfe88490eae6e8d8c90b322dba7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/835db4359138adfe88490eae6e8d8c90b322dba7; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/835db4359138adfe88490eae6e8d8c90b322dba7"; sha256 = "1wbs8pnhyyx84bb60ck5l18fljc37fma5131ijzmjqms84k34rqf"; }; "836ee88c57cc1b5617f36a2b9fb19db420285b69" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/836ee88c57cc1b5617f36a2b9fb19db420285b69; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/836ee88c57cc1b5617f36a2b9fb19db420285b69"; sha256 = "1yiypr57ik8wpq2w7x5yqib411j2qphk6mnpgpraqydfc22qypca"; }; "83960dda908738b13095ce2b7d9b31fde2baf36a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/83960dda908738b13095ce2b7d9b31fde2baf36a; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/83960dda908738b13095ce2b7d9b31fde2baf36a"; sha256 = "0dld18rdn6yjmqzpy3fg36ih3dzr63jma237skjb2nz2d554nkvp"; }; "83b8a24a4c385e1b384d645d948485842fc3cc76" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2426077-b850b68463b841e5964d120c64b8bf13/83b8a24a4c385e1b384d645d948485842fc3cc76; + url = "http://cdn.unrealengine.com/dependencies/2426077-b850b68463b841e5964d120c64b8bf13/83b8a24a4c385e1b384d645d948485842fc3cc76"; sha256 = "1z2a60b2h039a99ipx5gs299s5dbrmy23dgwpw4nrqksh0szzrhx"; }; "83c26e75614987b0816315db03de7aca670aae61" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/83c26e75614987b0816315db03de7aca670aae61; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/83c26e75614987b0816315db03de7aca670aae61"; sha256 = "0vsvf3yhc3gv4vcif0qlsakzmxdrziqjv575xpzbx421pk2sg809"; }; "83cf82ec1c25f57a747c78a0c0ee954463d3aaf8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/83cf82ec1c25f57a747c78a0c0ee954463d3aaf8; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/83cf82ec1c25f57a747c78a0c0ee954463d3aaf8"; sha256 = "180f440v26v4bmj6hbm162jj06vw9sd4kyvarnrazyiq4vmbx3wb"; }; "83d99abd11bcb8782d32661775471266e6254ae4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/83d99abd11bcb8782d32661775471266e6254ae4; + url = "http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/83d99abd11bcb8782d32661775471266e6254ae4"; sha256 = "0h49cfl1ybxvxgg9p5jq0nb93rqjlqbjabhsjkdzhb4pv9gm1fcf"; }; "83da0ef16746ffdc1151ecbda04a0b161e3f119e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/83da0ef16746ffdc1151ecbda04a0b161e3f119e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/83da0ef16746ffdc1151ecbda04a0b161e3f119e"; sha256 = "0d4bximz6dkr5q5bbyzlnl2py330qij4i0w5pvgc76asyxl11s3n"; }; "83dc459b2d9c7905eb6f80c6ffd7c0c912a4b007" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/83dc459b2d9c7905eb6f80c6ffd7c0c912a4b007; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/83dc459b2d9c7905eb6f80c6ffd7c0c912a4b007"; sha256 = "1xshwv0v6bzkn2px64jy5kzbwsh9mqmc9salvqdhw7c594gi1lki"; }; "83e36792413d3e3b767aae667cc67fd3b02ee133" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/83e36792413d3e3b767aae667cc67fd3b02ee133; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/83e36792413d3e3b767aae667cc67fd3b02ee133"; sha256 = "1vpvk4r3bxrb54ibpjffrj3wg37zp44xf8mz9fk3cn4gz8v18g1n"; }; "83eae7ee8ccb30a23878582ea6466cd8487f17f3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/83eae7ee8ccb30a23878582ea6466cd8487f17f3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/83eae7ee8ccb30a23878582ea6466cd8487f17f3"; sha256 = "1s011h62ql0w95lkwwa0pwk2x4d086apijgw0zgmh7cmlzknppvk"; }; "83fd339d2e91415631d3bbe960361fef5a8a1d1b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738476-1eae05647f894f068d67ed64f86505f8/83fd339d2e91415631d3bbe960361fef5a8a1d1b; + url = "http://cdn.unrealengine.com/dependencies/2738476-1eae05647f894f068d67ed64f86505f8/83fd339d2e91415631d3bbe960361fef5a8a1d1b"; sha256 = "06zcfs55vhpy9jh8330b1zrmsmf0j2f8w92kpxvgd8zi6xz5y9bs"; }; "841906d093cebbe152a1ae20fbab8decbd282e19" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/841906d093cebbe152a1ae20fbab8decbd282e19; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/841906d093cebbe152a1ae20fbab8decbd282e19"; sha256 = "1zjl5jvq80cgr8lb03k687slrq9l336dryn2dwvwsrfc32rnpynl"; }; "841af4efd38ead50b821af773faa68345269e26f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/841af4efd38ead50b821af773faa68345269e26f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/841af4efd38ead50b821af773faa68345269e26f"; sha256 = "0zrv8difxrfkkhhzni7qc91s1k30dwp6462c99iaxds8ly117p89"; }; "8460d3dfed9655b4e8ce53fc3cb879c8905b05f4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/8460d3dfed9655b4e8ce53fc3cb879c8905b05f4; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/8460d3dfed9655b4e8ce53fc3cb879c8905b05f4"; sha256 = "07cgvrc4yhakjs4p2sbkx5c3mch26krvvdx6ag0ijm85mx0gdl8l"; }; "8463cbaaa73774638635ddfac40864bed92f3c29" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/8463cbaaa73774638635ddfac40864bed92f3c29; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/8463cbaaa73774638635ddfac40864bed92f3c29"; sha256 = "1si653ab54yh0fxfxh1wfwfzdq3v8wsxq2vzppl2l2wj96zc8cdr"; }; "848145830d667120c6b744edf11f9f6c7e2f8b7a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/848145830d667120c6b744edf11f9f6c7e2f8b7a; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/848145830d667120c6b744edf11f9f6c7e2f8b7a"; sha256 = "0vvbpaksh7qdgiwcahdm9h9skp51qxiipzg3gdadam8v10a1g1xx"; }; "84a55e9bd6ceea8c4b1ef30457675290b8de8b27" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/84a55e9bd6ceea8c4b1ef30457675290b8de8b27; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/84a55e9bd6ceea8c4b1ef30457675290b8de8b27"; sha256 = "16zjckcf8851kf9cnzij7mz6iwcvld7g7gxrs750gdp01i5wjpbn"; }; "84b6f854fbee939820a32e6dc3d2b219b84bd6a1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/84b6f854fbee939820a32e6dc3d2b219b84bd6a1; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/84b6f854fbee939820a32e6dc3d2b219b84bd6a1"; sha256 = "1xd3hcs0nshn7c21kr1jhaskrslb6z91rp5rrlsq3pzclx740ssm"; }; "85317d647433d1e73e61ca6fe79b44f9b3abca42" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/85317d647433d1e73e61ca6fe79b44f9b3abca42; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/85317d647433d1e73e61ca6fe79b44f9b3abca42"; sha256 = "0ix9vagi91lpqgn224qfxb4h1wvjc6jf3yz5zx4asv6c1bdx7x8l"; }; "85393f1f0730c3ae240238686b47d7643899d34d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/85393f1f0730c3ae240238686b47d7643899d34d; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/85393f1f0730c3ae240238686b47d7643899d34d"; sha256 = "0yy91726kxdpifa3pfhf987m1yya025q6ybh8c3650i0h9z2hzsw"; }; "853b10bea00eac17238cb14c6b39474e5d2d1518" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/853b10bea00eac17238cb14c6b39474e5d2d1518; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/853b10bea00eac17238cb14c6b39474e5d2d1518"; sha256 = "0lhld9bb134mphx4g83abrxf9syz5dx2hmjm701dnx7dsayfl5i9"; }; "858f8eae96cc6e3a7d1fc624e44ef972c47011b1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/858f8eae96cc6e3a7d1fc624e44ef972c47011b1; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/858f8eae96cc6e3a7d1fc624e44ef972c47011b1"; sha256 = "0j9h3ysp390psxrc3g71029qsfy21j9jlyqqxgdsns465q0fb031"; }; "85b191ae1844ad6da93fa57876c8850de342b4ca" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/85b191ae1844ad6da93fa57876c8850de342b4ca; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/85b191ae1844ad6da93fa57876c8850de342b4ca"; sha256 = "0v5i8fznarbq8zdgi9kvg8hl8kb2293vfj6504a3km1my7frww96"; }; "85ba3d3276f5f01cc86df8c39d7cd730ed3b9a4d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/85ba3d3276f5f01cc86df8c39d7cd730ed3b9a4d; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/85ba3d3276f5f01cc86df8c39d7cd730ed3b9a4d"; sha256 = "1i53nv4v3wyy8vpgaglj865d8krmfd2yc8my9wq2yyyyiq9zvr3y"; }; "85ead6085f10e657e1a91326f3704d60b31164b3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/85ead6085f10e657e1a91326f3704d60b31164b3; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/85ead6085f10e657e1a91326f3704d60b31164b3"; sha256 = "1xqzxrys82qxihz27s1p811gqhhswqjalzgdfafk490diah527ss"; }; "85f7ee1e6e05e198cbb99f56c5a3a9d81b41276c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605823-fed77bb1e455453286ca4bfc444c86ac/85f7ee1e6e05e198cbb99f56c5a3a9d81b41276c; + url = "http://cdn.unrealengine.com/dependencies/2605823-fed77bb1e455453286ca4bfc444c86ac/85f7ee1e6e05e198cbb99f56c5a3a9d81b41276c"; sha256 = "03qfjg299d6dx0xzgm822js1mwqs8n9v8hvw9mjc883y77piasgb"; }; "864bfa01d63681c131168385b66aa9d3e6b7e23b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/864bfa01d63681c131168385b66aa9d3e6b7e23b; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/864bfa01d63681c131168385b66aa9d3e6b7e23b"; sha256 = "0lfc8a5f5skbdx263jh5m55fqnslva2pkx3yvifnzsgf396872bk"; }; "86a3ef300ab5182d7d6f3c7e1dec1ab017621176" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/86a3ef300ab5182d7d6f3c7e1dec1ab017621176; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/86a3ef300ab5182d7d6f3c7e1dec1ab017621176"; sha256 = "1b8a7pm5bxf6gcrrx8d4ld19qgck19gd2nhp01dyjm7vqc8cl201"; }; "86ad290cb6e4e954f3e8ad5203151d7614279554" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2515854-a6b06d306d9743a78268eae33a3084ae/86ad290cb6e4e954f3e8ad5203151d7614279554; + url = "http://cdn.unrealengine.com/dependencies/2515854-a6b06d306d9743a78268eae33a3084ae/86ad290cb6e4e954f3e8ad5203151d7614279554"; sha256 = "1spwcj4yb5hc94m0f2hx13yfjrzsvkhcvgbmlj10ak9bvpkyx96m"; }; "86c299a2f4f573039b2558718ba45d95ff08ade1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/86c299a2f4f573039b2558718ba45d95ff08ade1; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/86c299a2f4f573039b2558718ba45d95ff08ade1"; sha256 = "18qmy1kl7x4jvyj0d9rsyiaq9gszjpx2v0983vbgdqszbgics4ax"; }; "86cf1c73f3f607e472fa7ae7be4709c191878044" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605596-b0ea63cedf984da9bdd8cabc290cfcc0/86cf1c73f3f607e472fa7ae7be4709c191878044; + url = "http://cdn.unrealengine.com/dependencies/2605596-b0ea63cedf984da9bdd8cabc290cfcc0/86cf1c73f3f607e472fa7ae7be4709c191878044"; sha256 = "0avis11c8p42c28k8pdvfns3m397mraj21kk2bnbaw9hmv5difzv"; }; "86fca9c30e8dbd28a791714c1385aea7dc583091" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/86fca9c30e8dbd28a791714c1385aea7dc583091; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/86fca9c30e8dbd28a791714c1385aea7dc583091"; sha256 = "1a91dlqcfrqck0q5285cljzdr9zi14g5dgbzy9772gabc49c01fq"; }; "8741e3f2519f1221c2f8bdb966cfa4504f3ba5a7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/8741e3f2519f1221c2f8bdb966cfa4504f3ba5a7; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/8741e3f2519f1221c2f8bdb966cfa4504f3ba5a7"; sha256 = "028fhjrjcqnrjqx9i0v17mib24l20pd1bcpl8sc1bipa8yc0lk81"; }; "87758c549dbc2d3ff96e0ee0b82d6d99f20c0ab1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/87758c549dbc2d3ff96e0ee0b82d6d99f20c0ab1; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/87758c549dbc2d3ff96e0ee0b82d6d99f20c0ab1"; sha256 = "1jl52dabxi8rqhfadkwwrq68yiqxfvc2n82f9qvmc6viydjdrmpz"; }; "87925181e3a8b737757401a6114a8acf82625a49" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/87925181e3a8b737757401a6114a8acf82625a49; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/87925181e3a8b737757401a6114a8acf82625a49"; sha256 = "1xkykqs3fzvkwf7hm0qxrbhjx1cibyns81cm4lcpad2b4f4a29nd"; }; "879da85ee7839263b362a6d69f41f3d4477d2263" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/879da85ee7839263b362a6d69f41f3d4477d2263; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/879da85ee7839263b362a6d69f41f3d4477d2263"; sha256 = "1d89w13vkl8wjp0x22fsnz9yf7ln4jiadb3mfxfzykix884jr79w"; }; "8817e4ce5e9049b3ef1374d0f56fa509fa491f73" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8817e4ce5e9049b3ef1374d0f56fa509fa491f73; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8817e4ce5e9049b3ef1374d0f56fa509fa491f73"; sha256 = "1ip08vk00921qgz5q70v60zsykyapjjxg7hghn2lbw54ylfy755r"; }; "88192934143593f3b9bdf82185f4ac7a7373da7b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/88192934143593f3b9bdf82185f4ac7a7373da7b; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/88192934143593f3b9bdf82185f4ac7a7373da7b"; sha256 = "0p4y1fi48k2jh288d2axriffynn4w824ngh0vfcd1wlrf988gcvp"; }; "883890e30ce2c617da8433831db3b480780ce910" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/883890e30ce2c617da8433831db3b480780ce910; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/883890e30ce2c617da8433831db3b480780ce910"; sha256 = "04knac1hybywc9rmd7cq11scg8hc3qn4yszf7hbak6z807j0abd0"; }; "885b477d70802077c49ab7c32a784bacd55ad24b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/885b477d70802077c49ab7c32a784bacd55ad24b; + url = "http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/885b477d70802077c49ab7c32a784bacd55ad24b"; sha256 = "0acf1z7q9wyvshacv9mfgc55kkl1fa4c7a3gv94jmk0jccmf6lkd"; }; "888feb5c0fbff7928f650be69fab3ac123ebaa26" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/888feb5c0fbff7928f650be69fab3ac123ebaa26; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/888feb5c0fbff7928f650be69fab3ac123ebaa26"; sha256 = "1rj3434znf64z0cgi0dwx3pz5dhziqgm7gpcrx5ag2chkzixl7b0"; }; "88ea146643258d378d159b9f928c783774ea9c53" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/88ea146643258d378d159b9f928c783774ea9c53; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/88ea146643258d378d159b9f928c783774ea9c53"; sha256 = "1wh8zfcswfp5ms94lgvl8yn0qjkbrznh95wln2hi9civ7594j3zs"; }; "88fb7a15bfd879a0c14ff7a16e321cc2b8896c38" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/88fb7a15bfd879a0c14ff7a16e321cc2b8896c38; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/88fb7a15bfd879a0c14ff7a16e321cc2b8896c38"; sha256 = "107xs4qhzjn2305hd84cbp2xnymba6sr8axd5snwwa9dzl39yaaz"; }; "8901801fb587b12a9aa6263540cdd95b46710f9c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8901801fb587b12a9aa6263540cdd95b46710f9c; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8901801fb587b12a9aa6263540cdd95b46710f9c"; sha256 = "1msg49v9hyvfy5ms00lyq9x322qwvw6akzpz1v6kylrakri8nwvr"; }; "8906ef4c42cb5d492b620e5d8dc2118dd976ea12" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/8906ef4c42cb5d492b620e5d8dc2118dd976ea12; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/8906ef4c42cb5d492b620e5d8dc2118dd976ea12"; sha256 = "1xibvx905vvfvs0cdyjqbjy7wb3pvimzazd9ii5rwyvci6gj1vb8"; }; "89080b8cfede13b245eaadefec0b89e901ff8646" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/89080b8cfede13b245eaadefec0b89e901ff8646; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/89080b8cfede13b245eaadefec0b89e901ff8646"; sha256 = "1103qvaxr40xq97p20x8zfv32hkz3nnv53lc8624qkjyhnqwni8c"; }; "890adf51623c1e158f5c9f34db7f7f686e7005b7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/890adf51623c1e158f5c9f34db7f7f686e7005b7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/890adf51623c1e158f5c9f34db7f7f686e7005b7"; sha256 = "00cb7r13zpgiw9x0ahiimx915ynikicv4ixlxgxrfyfvqvkb2w7b"; }; "890f859d20731989f0ce0e2ccc89da28cf0f8dbe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/890f859d20731989f0ce0e2ccc89da28cf0f8dbe; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/890f859d20731989f0ce0e2ccc89da28cf0f8dbe"; sha256 = "1sfsps751hwql9akgqvsxvbfp0hzzlgcxg4pf9wzv0fmsm5zk910"; }; "89550f66a2a48a9f1b9089703e9b33eb14a23ae5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/89550f66a2a48a9f1b9089703e9b33eb14a23ae5; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/89550f66a2a48a9f1b9089703e9b33eb14a23ae5"; sha256 = "16bbs2r4i3bl6i0qp7snlifjh9s3gy33pdfjjpvnv0357wzama9g"; }; "89a680846da64558e5147c08cdce03270f11e7a4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/89a680846da64558e5147c08cdce03270f11e7a4; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/89a680846da64558e5147c08cdce03270f11e7a4"; sha256 = "119sjc3c9nqc1g8jij70kaa2rj2q4q6nd8dm4m4xmk32l9vf98rg"; }; "89be40342b7a93b0b11a6d495aa56ff3b8aebdbe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/89be40342b7a93b0b11a6d495aa56ff3b8aebdbe; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/89be40342b7a93b0b11a6d495aa56ff3b8aebdbe"; sha256 = "0lbq80772si922f6s3qahsx89hdyzvd8351j2pqr019pnasgpic6"; }; "89cf6e0f862a93ef9e543780d100517db3f3327b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605642-f320d1a5ef22435181fcba597b91c63e/89cf6e0f862a93ef9e543780d100517db3f3327b; + url = "http://cdn.unrealengine.com/dependencies/2605642-f320d1a5ef22435181fcba597b91c63e/89cf6e0f862a93ef9e543780d100517db3f3327b"; sha256 = "0b5p8gphgwx322ddyizq83mlwx318m8ndw8b6d10pvh6kfzf5ry8"; }; "89d28cf4154268be0856af7d9417e5f4018f65b9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/89d28cf4154268be0856af7d9417e5f4018f65b9; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/89d28cf4154268be0856af7d9417e5f4018f65b9"; sha256 = "1mksxkj5hx9wbnswb3dal0qqijlnrcrxprc7ashz0cgs8svhvkj2"; }; "89e79ac4565d509ccc57badb152f9d534469f4e6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/89e79ac4565d509ccc57badb152f9d534469f4e6; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/89e79ac4565d509ccc57badb152f9d534469f4e6"; sha256 = "1vinxn36cb93zpri4zk8jxhbjnb11drb13fw7dxvjbivqdzakahl"; }; "8a1ff4c3dc8b96b41c8fca1325ddf964f3768446" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8a1ff4c3dc8b96b41c8fca1325ddf964f3768446; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8a1ff4c3dc8b96b41c8fca1325ddf964f3768446"; sha256 = "06gan1mbhj26z6flw0p1mw2qijv0nc8hpxl5q9dvwdmv5j1s937z"; }; "8a251169614945698a2c1990c0898641d380b289" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/8a251169614945698a2c1990c0898641d380b289; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/8a251169614945698a2c1990c0898641d380b289"; sha256 = "1bd15y5ka1pzmj0y0i19w5r4pvgx36py84sfq097gvsbffx3ik56"; }; "8a7c6b0f9cc883870556fb456f20715ed40367c5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/8a7c6b0f9cc883870556fb456f20715ed40367c5; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/8a7c6b0f9cc883870556fb456f20715ed40367c5"; sha256 = "1gd8mxmr9874577fzyhl5cl6rrx0sl4g8c7j8is3jp97zcng853g"; }; "8a933dd63dadc44c26fb7afa83573b5ab52aaf33" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8a933dd63dadc44c26fb7afa83573b5ab52aaf33; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8a933dd63dadc44c26fb7afa83573b5ab52aaf33"; sha256 = "19fjz78gjlp50xq490wfvkjzpay9rrf78jnv0x0gs6kpnyd56x35"; }; "8abd833e1a283680a6e19d7896cda23b4f559012" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8abd833e1a283680a6e19d7896cda23b4f559012; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8abd833e1a283680a6e19d7896cda23b4f559012"; sha256 = "0xq3c1hcmlki59g6y36zpfq6pm6cryg88sy364rayihlzgbc2dra"; }; "8ad5dea631af368fec9f5f42b6f235997a8131e9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/8ad5dea631af368fec9f5f42b6f235997a8131e9; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/8ad5dea631af368fec9f5f42b6f235997a8131e9"; sha256 = "1hwnldwf0g7k34wg19yvzfz6939qc9kw9758fq7dsi0737cxykqc"; }; "8ad8c126595c03e31b971166788c82bdc9cf0544" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8ad8c126595c03e31b971166788c82bdc9cf0544; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8ad8c126595c03e31b971166788c82bdc9cf0544"; sha256 = "17vvcdpba4mijzlpi97xx7d022knpdw918npwq40vcmswmn758vg"; }; "8ae41d0c7d8fe2a00251726554c48ce1dec9ca04" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8ae41d0c7d8fe2a00251726554c48ce1dec9ca04; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8ae41d0c7d8fe2a00251726554c48ce1dec9ca04"; sha256 = "04dmv62qlczyj67rrfjnm790ksbpfwdgzl05zgqgi9lyrrsq3m8c"; }; "8af47f724bed2b5bd921d98f1d04d577d07ad781" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/8af47f724bed2b5bd921d98f1d04d577d07ad781; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/8af47f724bed2b5bd921d98f1d04d577d07ad781"; sha256 = "0jy4dvz4fdf50283w6mcycq1hd7rvc3nawv9zylvb0pgxs6bvlnm"; }; "8b025a64e2081e1caa1c37427ec0e6194ec0275a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2517611-d0c4506b0eb74bb5b22fcaa18bed9682/8b025a64e2081e1caa1c37427ec0e6194ec0275a; + url = "http://cdn.unrealengine.com/dependencies/2517611-d0c4506b0eb74bb5b22fcaa18bed9682/8b025a64e2081e1caa1c37427ec0e6194ec0275a"; sha256 = "1pm6inqkiqwjf1yjc38ncky6ibm22ha1pj9r84mpwxc1c7f9js6x"; }; "8b0519b8991a39be23e66177b1f881b62f967cb0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/8b0519b8991a39be23e66177b1f881b62f967cb0; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/8b0519b8991a39be23e66177b1f881b62f967cb0"; sha256 = "1x5zmgn9h2hxnjsrip75mvj8qs5q5mws8zb72v6rlw8iy7hjf8vh"; }; "8b3162447aae7621530652ee14ce8da1c287d6b0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8b3162447aae7621530652ee14ce8da1c287d6b0; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8b3162447aae7621530652ee14ce8da1c287d6b0"; sha256 = "0r2377k0a3jjn73x5fn1g4ppnjdywzkfxgdf801wk06zdkn41gpk"; }; "8b8340f444f8bcbe6806d7f4b2a6d3894354baf5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8b8340f444f8bcbe6806d7f4b2a6d3894354baf5; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8b8340f444f8bcbe6806d7f4b2a6d3894354baf5"; sha256 = "0yqm3ib77952dsydjvw5dmw7fw94iny0zj1y4kkl8wpbcj414kk0"; }; "8bb26a65444fea08370321879198f39f86ba188c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/8bb26a65444fea08370321879198f39f86ba188c; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/8bb26a65444fea08370321879198f39f86ba188c"; sha256 = "09912hlzrsgd7pickg9kgrc4rag393h1xkxybm5vnr3iyhd20wk7"; }; "8bcf71af2f119d1ff9d3b09fe4ddcb08fc1a7d95" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2700683-67efb93bd15f484599a98be1ae830afc/8bcf71af2f119d1ff9d3b09fe4ddcb08fc1a7d95; + url = "http://cdn.unrealengine.com/dependencies/2700683-67efb93bd15f484599a98be1ae830afc/8bcf71af2f119d1ff9d3b09fe4ddcb08fc1a7d95"; sha256 = "1zs71smgc45hh3sr3f22l98ch9k5f1z6hppx0dbs2lgg2s8bgkfn"; }; "8bdaed33beb2fa505dd0ba8f7d9ca94208ec44a9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/8bdaed33beb2fa505dd0ba8f7d9ca94208ec44a9; + url = "http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/8bdaed33beb2fa505dd0ba8f7d9ca94208ec44a9"; sha256 = "09x8k8apm7kly0kb04ladywwzyy90nzjvnd6hh476ir9mss1mjj0"; }; "8c062ee2e53c0fdeef88071aad2ed5ca1787cc1e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8c062ee2e53c0fdeef88071aad2ed5ca1787cc1e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8c062ee2e53c0fdeef88071aad2ed5ca1787cc1e"; sha256 = "1ymf1zl36xfsc0wmipsps3l90jx04qgz8ri7hmwpy4831hc7r594"; }; "8c220042a37dc4cc1b8b05afb13afadab972b12d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/8c220042a37dc4cc1b8b05afb13afadab972b12d; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/8c220042a37dc4cc1b8b05afb13afadab972b12d"; sha256 = "1hjg7wwfb217dansimncjya4ll7lsxshi0yvnyi2f2f9bm7jijd9"; }; "8c9f2e92d67f683596da321c8af36ece1d8ac774" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8c9f2e92d67f683596da321c8af36ece1d8ac774; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8c9f2e92d67f683596da321c8af36ece1d8ac774"; sha256 = "0hiq4c2w47msrn5fiqggb7gf6fn59rk708xxl92jid8wa4h6xipa"; }; "8ca8fc4f81c127e4c748fcb899af430506bd0b01" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/8ca8fc4f81c127e4c748fcb899af430506bd0b01; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/8ca8fc4f81c127e4c748fcb899af430506bd0b01"; sha256 = "0y551cnm9r4jm05iqiwi8ysglkny6c78mwxrmxssabknlh0v15vv"; }; "8cd8b767b771e6d10c8f1f0b54ab812881f22fcd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604000-fac6782aa4fd45888363b062a8353761/8cd8b767b771e6d10c8f1f0b54ab812881f22fcd; + url = "http://cdn.unrealengine.com/dependencies/2604000-fac6782aa4fd45888363b062a8353761/8cd8b767b771e6d10c8f1f0b54ab812881f22fcd"; sha256 = "1wp04cwi17h2y01is0wvv02nhcn8nyb1f8c28hcm7dqswyw738j5"; }; "8d5fa95a3df6eb36318fcf2a135f464a76257cc5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8d5fa95a3df6eb36318fcf2a135f464a76257cc5; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8d5fa95a3df6eb36318fcf2a135f464a76257cc5"; sha256 = "0axx62bip7rfrm0gbvdszdx1ik4mhxqxvi4ybmlbfhf2c1b26grg"; }; "8d8a695159bf666e16ab7b3558bb1d5e4e3b4698" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/8d8a695159bf666e16ab7b3558bb1d5e4e3b4698; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/8d8a695159bf666e16ab7b3558bb1d5e4e3b4698"; sha256 = "07c4p0dsl575zxamvvwh12hin7qnhk9lcd4aivnbbmrlhlrb23cf"; }; "8da60707e5826860752528702f9a7256a5d2ef81" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8da60707e5826860752528702f9a7256a5d2ef81; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8da60707e5826860752528702f9a7256a5d2ef81"; sha256 = "1701n4r1713crfxkaa0n2id346j1mf5nfg93givnr3c2qqlqz5yq"; }; "8db9bb91759363ec605c3d44273194136ce7dc1f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/8db9bb91759363ec605c3d44273194136ce7dc1f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/8db9bb91759363ec605c3d44273194136ce7dc1f"; sha256 = "06xajy55psab26x65cvxyji5bm4cxyh4qb1kcg9a9qpfjip7wfjg"; }; "8dbbbdecc05ee43425e31b4f4eafb33b90db30ac" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8dbbbdecc05ee43425e31b4f4eafb33b90db30ac; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8dbbbdecc05ee43425e31b4f4eafb33b90db30ac"; sha256 = "1zch7l01gxhwwkm4i9a9dwa577rrp37vr6nkn1mkhakrjfirfams"; }; "8dd3bfc182e5277d4408943dba3520659e2928f4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8dd3bfc182e5277d4408943dba3520659e2928f4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8dd3bfc182e5277d4408943dba3520659e2928f4"; sha256 = "02f3h1lsn8vkrixyb1lx1cbwffvby3i74ym71a05higvhw61mxaj"; }; "8ddadc13864ca20375d4b0f4ea443c123c3df3b7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8ddadc13864ca20375d4b0f4ea443c123c3df3b7; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8ddadc13864ca20375d4b0f4ea443c123c3df3b7"; sha256 = "10vbj0h5k6s3ka3dqzfwz796cpx1ic5dxbaipcwyc45k2vj6ni4x"; }; "8e039420fc01a77f694997d93310f9ae83f1b6cb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/8e039420fc01a77f694997d93310f9ae83f1b6cb; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/8e039420fc01a77f694997d93310f9ae83f1b6cb"; sha256 = "0jpxci1p47inn5qyp0jjh69ja0s7m5k07jhqvkpyvhy7pgdk0m56"; }; "8ec6e7ee9b649b9774e5429add4c5058fe492fd1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/8ec6e7ee9b649b9774e5429add4c5058fe492fd1; + url = "http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/8ec6e7ee9b649b9774e5429add4c5058fe492fd1"; sha256 = "1b29i8b6fh4siq5h8s48d97s0az2761l77z8vzykb4h0psxpzmy1"; }; "8f4c0d2091f953f5c7ea8154eaa6e6d04add923a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/8f4c0d2091f953f5c7ea8154eaa6e6d04add923a; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/8f4c0d2091f953f5c7ea8154eaa6e6d04add923a"; sha256 = "0sc09156h0vjc6jc67q1sp0khpzzkkvy9c8bh62rg7rbzlldlgiv"; }; "8f92c27e6fe54071ccf92649c25ae44991ea42c8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/8f92c27e6fe54071ccf92649c25ae44991ea42c8; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/8f92c27e6fe54071ccf92649c25ae44991ea42c8"; sha256 = "1ndfkv2zcamf377pbg67f257c4rqxh7ri06r4x2xqc4a5q0s60zl"; }; "8fb54a6908a0bea0b6a901eb32dd120dd2360fe2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2611810-c0cf8ef9a734410da79e56e1df15e175/8fb54a6908a0bea0b6a901eb32dd120dd2360fe2; + url = "http://cdn.unrealengine.com/dependencies/2611810-c0cf8ef9a734410da79e56e1df15e175/8fb54a6908a0bea0b6a901eb32dd120dd2360fe2"; sha256 = "07dgqsshhamlgi79884dllr4253yr29ni84dhnrcfn540vpxbs5k"; }; "8fbbdcccea26e1c7cbd56a84637ec3564aec691b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8fbbdcccea26e1c7cbd56a84637ec3564aec691b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8fbbdcccea26e1c7cbd56a84637ec3564aec691b"; sha256 = "1vnpb1d239wp1nyrvwiv57rr7qwr2rplws6zcxfnl3rxmmfhkman"; }; "8fc77c86e05ff31bec85d8974938b0b5aa12fd1a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/8fc77c86e05ff31bec85d8974938b0b5aa12fd1a; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/8fc77c86e05ff31bec85d8974938b0b5aa12fd1a"; sha256 = "1v92ggrafax000jrdc6yhysyr8mridvdcss8zjc8ib5bwism9sdm"; }; "8ff23362f6d2fe2b1e7f422a3f52c13797ef128e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/8ff23362f6d2fe2b1e7f422a3f52c13797ef128e; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/8ff23362f6d2fe2b1e7f422a3f52c13797ef128e"; sha256 = "0faigq1s7yjji1khqm2g5bi6fm6217lm7lk5gy61ddwxqz1jkf6k"; }; "901760156bc3f4720396fcb487ad396709e18d9b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/901760156bc3f4720396fcb487ad396709e18d9b; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/901760156bc3f4720396fcb487ad396709e18d9b"; sha256 = "0sgp780bfy2gri238s8fsnbh7vbdrg5mdxla39j15nllfr1ybxfj"; }; "904a3b18b20eee856202f89aa46a20df12388dc1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/904a3b18b20eee856202f89aa46a20df12388dc1; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/904a3b18b20eee856202f89aa46a20df12388dc1"; sha256 = "0ncm73g11s6x5lp5pz5b4xm2kfn7254hp4nzdfxwd841l96b4b7s"; }; "90874ee4cf89c6b1658479cf16716dd6d9f3391f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/90874ee4cf89c6b1658479cf16716dd6d9f3391f; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/90874ee4cf89c6b1658479cf16716dd6d9f3391f"; sha256 = "0hjrsp0jq1qgm9v31kdh7l67z9w54415a9f73lznsb1zmw1phz22"; }; "90d2bac8a115eb18639fab5f7840138c63cf9b8d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/90d2bac8a115eb18639fab5f7840138c63cf9b8d; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/90d2bac8a115eb18639fab5f7840138c63cf9b8d"; sha256 = "0ifayjg539ki273zzxx7b5jpjzdy50pyvb8d2a3r84216anww3qn"; }; "91475080ede727f0185da20abde65457b43d5476" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/91475080ede727f0185da20abde65457b43d5476; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/91475080ede727f0185da20abde65457b43d5476"; sha256 = "0z6ql3zfvpiay87g3h14pfv5dyjx6d4r7n7ks0pvx829yb2h0n4c"; }; "9148d7be7b0930b397ef995a2e8cfdc6c7e2617f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/9148d7be7b0930b397ef995a2e8cfdc6c7e2617f; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/9148d7be7b0930b397ef995a2e8cfdc6c7e2617f"; sha256 = "13cw8rzvf6rm9dvj1d7q86l5r3bs4q23z588yd6imlvpf2pp7f5m"; }; "914d43c1dd28877dfe0d8b3b2fe4dca1ea17a575" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/914d43c1dd28877dfe0d8b3b2fe4dca1ea17a575; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/914d43c1dd28877dfe0d8b3b2fe4dca1ea17a575"; sha256 = "1m7y3m9b1vvvvdw05g6hcs2hv9jh0947l9gjhr5zdj9adqf3aa72"; }; "9157e95d94d3ff3b40e3e507ef12528e8574f8d7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9157e95d94d3ff3b40e3e507ef12528e8574f8d7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9157e95d94d3ff3b40e3e507ef12528e8574f8d7"; sha256 = "0n825h58ygdqv93naavg0xm7p3ncxlyzp2c89dlfzzq4cs7mnvaz"; }; "91639ede60c084c481daea6546adf05ba88aeb17" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2618867-a941974a307a4d11a35487de88a65fbe/91639ede60c084c481daea6546adf05ba88aeb17; + url = "http://cdn.unrealengine.com/dependencies/2618867-a941974a307a4d11a35487de88a65fbe/91639ede60c084c481daea6546adf05ba88aeb17"; sha256 = "0r2s4k616aj3y5q4cc6wmg1im4sd9qbi477kk4av2yxf1db078vg"; }; "919773af16fc549ebf79e9b9629c8d0c79d37927" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/919773af16fc549ebf79e9b9629c8d0c79d37927; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/919773af16fc549ebf79e9b9629c8d0c79d37927"; sha256 = "01xmmimdnzywvlnp3j9417iszkqmprjsb07gkh2rb6pqbabbjh3g"; }; "919cacfafb5826d92667b345276a3637499d8eac" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/919cacfafb5826d92667b345276a3637499d8eac; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/919cacfafb5826d92667b345276a3637499d8eac"; sha256 = "00yyly9c0ggpl793mkzsa8dlbsh4drdagdhhv8vwdkldq666jizy"; }; "91eb46476dcb659fc2275fc18c2061796b561bed" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/91eb46476dcb659fc2275fc18c2061796b561bed; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/91eb46476dcb659fc2275fc18c2061796b561bed"; sha256 = "020wajrnlvqk2c4pjpxf7562acryacxk1535fib0f6250wjhmh8r"; }; "91f1332208a164cfc7739215d515dc4574548eb4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/91f1332208a164cfc7739215d515dc4574548eb4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/91f1332208a164cfc7739215d515dc4574548eb4"; sha256 = "1mxhnjf7vda1cxny35rw3ib4kp9i3h09a5lv0r70pazqj1ir23zi"; }; "91f5cdeaacc7b2be3fe926cfc1b9d3a054e143f2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/91f5cdeaacc7b2be3fe926cfc1b9d3a054e143f2; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/91f5cdeaacc7b2be3fe926cfc1b9d3a054e143f2"; sha256 = "0cvqrr7wvlgyvhh5bz61laigv9dy7ra65hdszi3sg467zy35b1dy"; }; "920bbd06b0082189854b0b43390a039f451bf843" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604998-3c15fbba3f5f4174942b1436c2db55e8/920bbd06b0082189854b0b43390a039f451bf843; + url = "http://cdn.unrealengine.com/dependencies/2604998-3c15fbba3f5f4174942b1436c2db55e8/920bbd06b0082189854b0b43390a039f451bf843"; sha256 = "0r4wh2iswm4w1zgnjbmw8x4jpgd9zr2c1azy2nvgwg2rcja73adw"; }; "922b2bdba29589b9fa7f0b9dd3668e5703e9c88c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/922b2bdba29589b9fa7f0b9dd3668e5703e9c88c; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/922b2bdba29589b9fa7f0b9dd3668e5703e9c88c"; sha256 = "1af3n4b4h1yd92y4w660kslpz0nkvpsvinfs3p9l5yv1jfrz2lxi"; }; "9230b9bb873b7a7cfc1fd2410d1749427c7c3499" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/9230b9bb873b7a7cfc1fd2410d1749427c7c3499; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/9230b9bb873b7a7cfc1fd2410d1749427c7c3499"; sha256 = "0c6c6rahp2x4n5vahs2csgx8gyzgqzajvzwx0dii1p44crb4cc2h"; }; "9241f4cc15ce04da3b203bb3ef60aa2a71cb19c4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9241f4cc15ce04da3b203bb3ef60aa2a71cb19c4; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9241f4cc15ce04da3b203bb3ef60aa2a71cb19c4"; sha256 = "0v7xa1wzsd2rif4dikbm7dzzzw2k7c70vr6rp7l0wv3d978p9fr1"; }; "925f53a8ddf5e922520fc19cf6a17b00419817e7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/925f53a8ddf5e922520fc19cf6a17b00419817e7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/925f53a8ddf5e922520fc19cf6a17b00419817e7"; sha256 = "0p4l1r57w29bkir2k9y3pl50ycr5q3436ldrrm0dzzqb8ag5bkfd"; }; "926540c5a0b84439444ce2305aa3737763bb95a3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/926540c5a0b84439444ce2305aa3737763bb95a3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/926540c5a0b84439444ce2305aa3737763bb95a3"; sha256 = "1m1bsgri6xi5ijpyhpybrir760qrqy2hmwrsbifw0j5yxwxlvyrz"; }; "9285328e0b04faaf9fdc22bd27b76ef259020492" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9285328e0b04faaf9fdc22bd27b76ef259020492; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9285328e0b04faaf9fdc22bd27b76ef259020492"; sha256 = "0c2jz4pjf5f62ga9nlac4m3q92n9wgccjcwbyvr2scangawjh7sq"; }; "92abcde8582abb2913e4531cf3ea720b0e8c7d33" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/92abcde8582abb2913e4531cf3ea720b0e8c7d33; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/92abcde8582abb2913e4531cf3ea720b0e8c7d33"; sha256 = "1h66p5sp1j2l1jm4d6pjg34ng9k0d1796mns38gkcily554v4v6n"; }; "93423a9a78f3eaad42d062f8d2ff25e901ff455d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/93423a9a78f3eaad42d062f8d2ff25e901ff455d; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/93423a9a78f3eaad42d062f8d2ff25e901ff455d"; sha256 = "1hc5hwd0pazkcscicn8dpyyy9dc0aysbz9z95fwjfqsz1l7hg9k2"; }; "935837a33fa46d5ef7713fd4a123c61845ce49e5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/935837a33fa46d5ef7713fd4a123c61845ce49e5; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/935837a33fa46d5ef7713fd4a123c61845ce49e5"; sha256 = "01dchcyd4z8a6vhk2j071a5rw3hv529cz5fhjkasplfqvl1dri7y"; }; "937a8d559bb1eaa790bd343ce8439885289660ad" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/937a8d559bb1eaa790bd343ce8439885289660ad; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/937a8d559bb1eaa790bd343ce8439885289660ad"; sha256 = "17050dmx7pmsvxv4agmphln7xcy5bq058pmi47pqwlsf2njqskgm"; }; "93992b5277a20ed987f224c8f23f713677e0e25a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2546088-6cf476c573f0461594db3f64f59ec9cc/93992b5277a20ed987f224c8f23f713677e0e25a; + url = "http://cdn.unrealengine.com/dependencies/2546088-6cf476c573f0461594db3f64f59ec9cc/93992b5277a20ed987f224c8f23f713677e0e25a"; sha256 = "0v60rm9bh086p2agj0hl924lhmzsdbk6akycra97vvjf8riaznmd"; }; "93d5d44b151da63343cd4f052e5efab5039f13f8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/93d5d44b151da63343cd4f052e5efab5039f13f8; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/93d5d44b151da63343cd4f052e5efab5039f13f8"; sha256 = "0zq57rg4pw8ly7vr8wjshq5zjp93n4zgzzjqkwgh1lz542w8jrli"; }; "9402187f503c2f391c471ecb84988e49b0cac918" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2603097-3140b87e2cb94286beb08198353da9a9/9402187f503c2f391c471ecb84988e49b0cac918; + url = "http://cdn.unrealengine.com/dependencies/2603097-3140b87e2cb94286beb08198353da9a9/9402187f503c2f391c471ecb84988e49b0cac918"; sha256 = "0qvxgvjr3fk8v4i5fcsz8vlxzw07hdyy0q94psngzjpvp0f9943d"; }; "941fcfee8a4d9b5b95af5e64593a01405ed864b8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605823-fed77bb1e455453286ca4bfc444c86ac/941fcfee8a4d9b5b95af5e64593a01405ed864b8; + url = "http://cdn.unrealengine.com/dependencies/2605823-fed77bb1e455453286ca4bfc444c86ac/941fcfee8a4d9b5b95af5e64593a01405ed864b8"; sha256 = "0ipyq7ycmysav0p4n285w49394nxrq4nqqpdmlmd6gcjppv2hsd2"; }; "9480aeff10931a3129abfc074e9d75dc46fb60b1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9480aeff10931a3129abfc074e9d75dc46fb60b1; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9480aeff10931a3129abfc074e9d75dc46fb60b1"; sha256 = "1mjpiaf4jh4fh8bld18gh97bnwhflyqyqb8zmawngbd0f686jhr6"; }; "948831f2786e73219fac5ebfe8a92939c3ea637f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/948831f2786e73219fac5ebfe8a92939c3ea637f; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/948831f2786e73219fac5ebfe8a92939c3ea637f"; sha256 = "0z6gh9j67d0as8x8v62n07w5xj2gj6x6k2pgynx01jp6z6k9x4dz"; }; "94ab4be561c4e5ce07253ce94aa3794090a44428" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/94ab4be561c4e5ce07253ce94aa3794090a44428; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/94ab4be561c4e5ce07253ce94aa3794090a44428"; sha256 = "0j0nwdwk46yskmmgx3y84wcr50ak801zdfj4mxwlai3bvb04f38n"; }; "94b9d86dc4aef7c178c2f9b2cd5360412b13b2df" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/94b9d86dc4aef7c178c2f9b2cd5360412b13b2df; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/94b9d86dc4aef7c178c2f9b2cd5360412b13b2df"; sha256 = "0fmkvvqy0v4wsd58hqlgrcpvm4a4qsrasfy5fy5h5b7j8z5q3vcl"; }; "94cfed4a88c4801ef537b65413db4cc3326b0a89" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/94cfed4a88c4801ef537b65413db4cc3326b0a89; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/94cfed4a88c4801ef537b65413db4cc3326b0a89"; sha256 = "0smaxw3d54i6yymcil00mkdc5mp5yw95p18gc65sx0ir0yycviyc"; }; "954237c72446f3cdf8886043123658ca943e6a89" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/954237c72446f3cdf8886043123658ca943e6a89; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/954237c72446f3cdf8886043123658ca943e6a89"; sha256 = "11rrbx70dmjyd97sk964lzjbpcyjg07zjfjnvn25z6v9bv3a49xb"; }; "957337ec86f032a91c82dfc2f859843e3a1c1e88" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/957337ec86f032a91c82dfc2f859843e3a1c1e88; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/957337ec86f032a91c82dfc2f859843e3a1c1e88"; sha256 = "0gz05g4nh8645h4zdvrhmkpw9m3jlddk8ggd2h203h4zx51l3aav"; }; "95b668ea9989cc5ca54f2f7db9aafc7ae8277fb8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/95b668ea9989cc5ca54f2f7db9aafc7ae8277fb8; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/95b668ea9989cc5ca54f2f7db9aafc7ae8277fb8"; sha256 = "1rprhq2rjgd5s4r8jn5f5nz6w20yckr79sh9mwmsfkx7zxkwda1b"; }; "95e4d7dc9cb01e3491442f9370e98e0d6361f556" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/95e4d7dc9cb01e3491442f9370e98e0d6361f556; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/95e4d7dc9cb01e3491442f9370e98e0d6361f556"; sha256 = "0w86a2dcdm4r0yqdy1ibdrmgmnb122znhacx9cz7jm2bsjb81nh6"; }; "95f7b61131b0b7361bd6b788845382016a65618d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/95f7b61131b0b7361bd6b788845382016a65618d; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/95f7b61131b0b7361bd6b788845382016a65618d"; sha256 = "1li07rkzvnasm9qc4qza2y6vyw7xhx33wmjzqbc2gwmawxjpl6an"; }; "960e4509e3bf35c6ecf5e52ebd53c18379354b18" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2634249-f2b4469cf0774eac818e7cb4565f1224/960e4509e3bf35c6ecf5e52ebd53c18379354b18; + url = "http://cdn.unrealengine.com/dependencies/2634249-f2b4469cf0774eac818e7cb4565f1224/960e4509e3bf35c6ecf5e52ebd53c18379354b18"; sha256 = "16y0ffz0kn1k723xmr4vmna8giqsl6pqgp83a7w1hp8slmg1z1xs"; }; "960f838a00eaece74604333768e1901f77dc91e7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2597177-394deee1ae174b2db1462326aa83252a/960f838a00eaece74604333768e1901f77dc91e7; + url = "http://cdn.unrealengine.com/dependencies/2597177-394deee1ae174b2db1462326aa83252a/960f838a00eaece74604333768e1901f77dc91e7"; sha256 = "08v86w4b8jx5af5agv2cyhxwc3a3w9xzr69lfvdljms51991qmkv"; }; "963f0fd12da9d6cf7d35a71dce090f7d5271d802" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/963f0fd12da9d6cf7d35a71dce090f7d5271d802; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/963f0fd12da9d6cf7d35a71dce090f7d5271d802"; sha256 = "133mrcxjpqhrffjbhiviwn91h3x5csqpk1fhhzlmc0spyf9bnswa"; }; "96421d48a3164d2d4259c4c9500dfbf44d9b90fb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2483157-ef88c8fb9abd408b8fe496d060749077/96421d48a3164d2d4259c4c9500dfbf44d9b90fb; + url = "http://cdn.unrealengine.com/dependencies/2483157-ef88c8fb9abd408b8fe496d060749077/96421d48a3164d2d4259c4c9500dfbf44d9b90fb"; sha256 = "0kvplc4pwnjv7j240d2bcggwibrws3afamx6wh32lap5pps67d81"; }; "9653a9d2aef2e0fff14e4e16ca9058b38f172dd0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9653a9d2aef2e0fff14e4e16ca9058b38f172dd0; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9653a9d2aef2e0fff14e4e16ca9058b38f172dd0"; sha256 = "0d2z11fpnvx15yncyf840n7ww4vaaypyn4r7cg2ddscg8llp7056"; }; "9690133f46e7a766b46b38365897102baf062020" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/9690133f46e7a766b46b38365897102baf062020; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/9690133f46e7a766b46b38365897102baf062020"; sha256 = "1jim7i5ih76c4wjm06y75iqw9ldcmc5wr0gs5vichdhgdj1y0ay6"; }; "96a0e755dc47a57b85791e7d748fe25e7258173e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/96a0e755dc47a57b85791e7d748fe25e7258173e; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/96a0e755dc47a57b85791e7d748fe25e7258173e"; sha256 = "1ibam8hh271ci3fp18baiw3jsll89i1w1q8z87gmi7y5qdasar02"; }; "96e618ee3726b5d13ee509923aeff0bb6272498c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/96e618ee3726b5d13ee509923aeff0bb6272498c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/96e618ee3726b5d13ee509923aeff0bb6272498c"; sha256 = "13xa397xfya40cypwl20j332bp0rcljyj66z8vwdc10vxwwrdqv1"; }; "96ec8bc282d262d4764767c1478400c10994bf5e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/96ec8bc282d262d4764767c1478400c10994bf5e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/96ec8bc282d262d4764767c1478400c10994bf5e"; sha256 = "00x67b5sd3230k6q08z8n0ad95ia3fxzk0mssz6lmbi0zqqsvvbl"; }; "973fb0c29b2e3a44d2d370a545ef1a38a81ed07f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/973fb0c29b2e3a44d2d370a545ef1a38a81ed07f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/973fb0c29b2e3a44d2d370a545ef1a38a81ed07f"; sha256 = "1n7kvxc135za5a2lzmrp18kpyka2gc2dynr30fpn1m1lfa09985b"; }; "97772a52cd613920ec0a84f0c8b57d0c8e88b1b6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/97772a52cd613920ec0a84f0c8b57d0c8e88b1b6; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/97772a52cd613920ec0a84f0c8b57d0c8e88b1b6"; sha256 = "1l262n4qq78fbvgrd6qilmp70rx4x5ciw444nw6qdjvbxag2va6g"; }; "9788909a70709303adf419bf0340b73ab037600b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9788909a70709303adf419bf0340b73ab037600b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9788909a70709303adf419bf0340b73ab037600b"; sha256 = "1vw1a4nlwq6arcddbfiid9lmkfv8ylaakpggzb706hgr9jj1qi7h"; }; "980f3e90adc8557d71bfbef57bc146374612493f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/980f3e90adc8557d71bfbef57bc146374612493f; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/980f3e90adc8557d71bfbef57bc146374612493f"; sha256 = "1xvybmljiw3p3rwy91fi1dk7fmcpdys8b1c13yw4sij7ym0dqjkf"; }; "9851cf052473a71589aa7577f62e6b82f0298832" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/9851cf052473a71589aa7577f62e6b82f0298832; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/9851cf052473a71589aa7577f62e6b82f0298832"; sha256 = "0kd2bcr3n9l3qjxjij06gm0rgv5dhvrq3mdv6sqwmv3f28q1r8bq"; }; "985271d1e9b876cc6b98ce871d8efed7b2b3cbeb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/985271d1e9b876cc6b98ce871d8efed7b2b3cbeb; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/985271d1e9b876cc6b98ce871d8efed7b2b3cbeb"; sha256 = "1mh8jr05wk2wg1830bv1yq30ifxngjrb8nnilw2hwl1g6dmss3g9"; }; "985fcff275609870f5fa9ace4a4e31fcdef7eb1f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/985fcff275609870f5fa9ace4a4e31fcdef7eb1f; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/985fcff275609870f5fa9ace4a4e31fcdef7eb1f"; sha256 = "03jw2kr34vxh4rpjq58rq00h0vv7mlbi3pc63aq6914yqwzvv36v"; }; "986472c357451eab93419161f5ccadfefcbdb41e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/986472c357451eab93419161f5ccadfefcbdb41e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/986472c357451eab93419161f5ccadfefcbdb41e"; sha256 = "05arp7raj4ins0azci930klihg54zmj2b0ykhmnp91z6mdqw3nx0"; }; "98bce6b328014cb7a038cf71a5c84a03c88f3b63" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605596-b0ea63cedf984da9bdd8cabc290cfcc0/98bce6b328014cb7a038cf71a5c84a03c88f3b63; + url = "http://cdn.unrealengine.com/dependencies/2605596-b0ea63cedf984da9bdd8cabc290cfcc0/98bce6b328014cb7a038cf71a5c84a03c88f3b63"; sha256 = "1b50jfk9cz2x13378pbyd8lcg0m9jahhjwc1a9zfg68y6pf08rbm"; }; "98d4e369b78b0733da5369ef5d9a3d0821224bd8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/98d4e369b78b0733da5369ef5d9a3d0821224bd8; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/98d4e369b78b0733da5369ef5d9a3d0821224bd8"; sha256 = "1mdsmf24lwsbybjy687lsqhifg0d1za7vc6vaggba2x4gbb2rh2s"; }; "98dd7a062fbe1436797395825aec70ab45a9e01f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/98dd7a062fbe1436797395825aec70ab45a9e01f; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/98dd7a062fbe1436797395825aec70ab45a9e01f"; sha256 = "05xrlniqxkkw7c08r8m5ph88pmwsz1jbp0y437nrh4lz7z8xk6i8"; }; "98eaec4f30d9a8b65a6d9865fe0b1e5b7df1e740" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/98eaec4f30d9a8b65a6d9865fe0b1e5b7df1e740; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/98eaec4f30d9a8b65a6d9865fe0b1e5b7df1e740"; sha256 = "0kkzj77y0n39diqyfzx29rdi47ayg0f5cr6yi2syyimbq9i8vmb2"; }; "98f6aead047382d81ea82cfcf7d678c3d279b6ad" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/98f6aead047382d81ea82cfcf7d678c3d279b6ad; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/98f6aead047382d81ea82cfcf7d678c3d279b6ad"; sha256 = "0n6v34qn2v5cvqgzv1agp68hllcm9qjdl6928llln8mx56byr1y4"; }; "9905967a7ecb273ea4c135e170605bb12051e395" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/9905967a7ecb273ea4c135e170605bb12051e395; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/9905967a7ecb273ea4c135e170605bb12051e395"; sha256 = "1yn3gqiqdbbmxn1yn36d0cyf7cb8c74r0kq586fa9kyfq1kp6hcj"; }; "99408ec397e6f41cef3cc1118a42007c42240b73" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2483157-ef88c8fb9abd408b8fe496d060749077/99408ec397e6f41cef3cc1118a42007c42240b73; + url = "http://cdn.unrealengine.com/dependencies/2483157-ef88c8fb9abd408b8fe496d060749077/99408ec397e6f41cef3cc1118a42007c42240b73"; sha256 = "07cx908z756kf2b7cbihipabh21zln8d58jaj0vh11fi7znwln7q"; }; "9960c14a54da2eea43d72be9aefeeb85b8cd4e7c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9960c14a54da2eea43d72be9aefeeb85b8cd4e7c; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9960c14a54da2eea43d72be9aefeeb85b8cd4e7c"; sha256 = "1wslww24dria8ka5d6a6by0ix81yg74783b2l8k59afjry3d4gn7"; }; "9974452a9032d4ef1911e1347776b088bf0f03df" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2579446-f2ba68e6c4fe40608f55a21e4d359a29/9974452a9032d4ef1911e1347776b088bf0f03df; + url = "http://cdn.unrealengine.com/dependencies/2579446-f2ba68e6c4fe40608f55a21e4d359a29/9974452a9032d4ef1911e1347776b088bf0f03df"; sha256 = "1kvgca25l2bbp416cqqw7ghrjq9mmwgy33qhbmkd665kyi3xcx02"; }; "998f25b9ce65d4cd484598d5f49cfdb023205ace" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/998f25b9ce65d4cd484598d5f49cfdb023205ace; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/998f25b9ce65d4cd484598d5f49cfdb023205ace"; sha256 = "11m90pb307bpkd1cplzjavhbz76j8ywfwc1lrdp4zl5yb42avj7p"; }; "99985696491968b007dbff31cfeb9439637ad92d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/99985696491968b007dbff31cfeb9439637ad92d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/99985696491968b007dbff31cfeb9439637ad92d"; sha256 = "1n1rgz44hairjjvjc3937pin9rhxxa44sssi87z82965kbhqwmq3"; }; "9a10248ffa6ef2de0ff39750b0126e7d0b1557b6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9a10248ffa6ef2de0ff39750b0126e7d0b1557b6; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9a10248ffa6ef2de0ff39750b0126e7d0b1557b6"; sha256 = "1j4m3dg8l69iyxhy9gz915rinaas4a5mflj9a70lwciq01py9fad"; }; "9a27b682ddf08347ffdd2673c005febde327223b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/9a27b682ddf08347ffdd2673c005febde327223b; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/9a27b682ddf08347ffdd2673c005febde327223b"; sha256 = "050ywwrsm40br2mnqckg3jrgc2q31j8xf4h0za2l5ih2h3vq2ymn"; }; "9a6f36fd2204a5938bfaa23310ac94f3eac70d91" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/9a6f36fd2204a5938bfaa23310ac94f3eac70d91; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/9a6f36fd2204a5938bfaa23310ac94f3eac70d91"; sha256 = "0ybib9bi9lfdxfb9ql3jip9fbfglzczyp8r9fsycfbwin33nqn6s"; }; "9a709e39d73f4dd05adc8a171c9e771ca1facd83" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9a709e39d73f4dd05adc8a171c9e771ca1facd83; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9a709e39d73f4dd05adc8a171c9e771ca1facd83"; sha256 = "1qrv0r9srbrqqwzw96ndirkn54my1ypyinsd1vdfvrwd19amwdpa"; }; "9abf05827a71d1c0a15a65473fe44db0a9c8676b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9abf05827a71d1c0a15a65473fe44db0a9c8676b; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9abf05827a71d1c0a15a65473fe44db0a9c8676b"; sha256 = "0x3kjyy72v9hx55bfj5yy5bhzip3i7fkpd0q6kgqi408wvz8345j"; }; "9ace33ad3d9ba29d499d254c077206230291f79a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9ace33ad3d9ba29d499d254c077206230291f79a; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9ace33ad3d9ba29d499d254c077206230291f79a"; sha256 = "0jw0d0ck3p5h727apyp7190dm21q2mvf4kcipbaaa0rwdkynq70b"; }; "9ad3062b35efb39cfe52f02269e5e28c03df86f5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9ad3062b35efb39cfe52f02269e5e28c03df86f5; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9ad3062b35efb39cfe52f02269e5e28c03df86f5"; sha256 = "16lg92frzz8jqnvdw2r9w6a3fjlgvmndr7m1jlhq66k034d7jwia"; }; "9aec8735040beb57da24cffa27ef5d254408275f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9aec8735040beb57da24cffa27ef5d254408275f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9aec8735040beb57da24cffa27ef5d254408275f"; sha256 = "1qgbkjhvhrsy7iy0r0gvs41m88har7i8m3ys03y5lrbmdazgb3q9"; }; "9b2025a39ed5dc7d0f745fd5f484fa5bd2f9b319" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2514423-e0ca01e1f08b4e2480fb868bca2e338b/9b2025a39ed5dc7d0f745fd5f484fa5bd2f9b319; + url = "http://cdn.unrealengine.com/dependencies/2514423-e0ca01e1f08b4e2480fb868bca2e338b/9b2025a39ed5dc7d0f745fd5f484fa5bd2f9b319"; sha256 = "1jnlw9ifq8iyfvz8yn2jigfdq5qmhviy48vh461kfpx3isl1wvq3"; }; "9b367562030fc7238553c6aebec57181c96d88fa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9b367562030fc7238553c6aebec57181c96d88fa; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9b367562030fc7238553c6aebec57181c96d88fa"; sha256 = "1jdr332ks1d1gqi9ygxdmjyr3lingzzb1pdgrnxkg7jbl9i7y4l7"; }; "9b622139c6c9738ed9a9c4bca74a20d18bea5a75" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2700727-ab54589e54a547ecb0e365d946b4351f/9b622139c6c9738ed9a9c4bca74a20d18bea5a75; + url = "http://cdn.unrealengine.com/dependencies/2700727-ab54589e54a547ecb0e365d946b4351f/9b622139c6c9738ed9a9c4bca74a20d18bea5a75"; sha256 = "11i6g22ncsjn50yq3fmhv2mm6inxw6zhi0zznv0y7gwdyjrisasy"; }; "9b6f3a80dd242ad667ee7c33f54385d4fa791086" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/9b6f3a80dd242ad667ee7c33f54385d4fa791086; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/9b6f3a80dd242ad667ee7c33f54385d4fa791086"; sha256 = "0lb42d3a79q1k35jfa3b1c1z8n774nxkcr918cp9bay4saifvfzw"; }; "9b85c2fa156837a820c7e7ae27d2ade465850441" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9b85c2fa156837a820c7e7ae27d2ade465850441; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9b85c2fa156837a820c7e7ae27d2ade465850441"; sha256 = "1klwhr444j1pqn44fnjyq2nvlaiaib04n0dwykx181bz2nkjqdqv"; }; "9b8fbaeb9433a52f4f65397b66bc6da378e067b7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9b8fbaeb9433a52f4f65397b66bc6da378e067b7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9b8fbaeb9433a52f4f65397b66bc6da378e067b7"; sha256 = "1l4x5r8ghf70ddfyz1q6wpqlhrc10l41h33gmfhkjwm45fkvkxdh"; }; "9b97586a3c9bf005cab1870015b75587e39f94da" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/9b97586a3c9bf005cab1870015b75587e39f94da; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/9b97586a3c9bf005cab1870015b75587e39f94da"; sha256 = "0a2nw9ibdv51n2b7a9x0jnx8cqxilknm79x210pr3h8p3fjdzlb7"; }; "9bb171f0382c86c213e8f4d3ffafe1e676490b21" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2718426-3062c3938efa4be7b8cd7493e66818c4/9bb171f0382c86c213e8f4d3ffafe1e676490b21; + url = "http://cdn.unrealengine.com/dependencies/2718426-3062c3938efa4be7b8cd7493e66818c4/9bb171f0382c86c213e8f4d3ffafe1e676490b21"; sha256 = "1hgfyfwn19k47y6garrdfy4jlhis0mi1h7zfnab8x43w7pqjgjpv"; }; "9bb63a05f1dd1d7171eeb8018c29c90d81773605" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/9bb63a05f1dd1d7171eeb8018c29c90d81773605; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/9bb63a05f1dd1d7171eeb8018c29c90d81773605"; sha256 = "18cfpjnyamzwnrmz4i06iwir58dx6657gy4i8jgk8ga736j31vxr"; }; "9bdd5448dfc6229ba9d0261514a078236c882986" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/9bdd5448dfc6229ba9d0261514a078236c882986; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/9bdd5448dfc6229ba9d0261514a078236c882986"; sha256 = "129pclb41yip44m87pr8l1rhdajhgnzcarh84j5w2kgqqmma9h8r"; }; "9be02ac4f895d7559b0cba2d4b65f8ffb5626236" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/9be02ac4f895d7559b0cba2d4b65f8ffb5626236; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/9be02ac4f895d7559b0cba2d4b65f8ffb5626236"; sha256 = "0dh8vcf5dm36j4pjyc7m0i9f4947mk3r91ldbj6mhxfi90c6sn0j"; }; "9bfa76eaf50a585e99981b54ef5628fd89b397e7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2499980-1bec026979484bddb8aa39afef8358b9/9bfa76eaf50a585e99981b54ef5628fd89b397e7; + url = "http://cdn.unrealengine.com/dependencies/2499980-1bec026979484bddb8aa39afef8358b9/9bfa76eaf50a585e99981b54ef5628fd89b397e7"; sha256 = "0rmv4ibakmvpllmq5cs1ihfkpvy1brkn8l42kmls66zlz478115l"; }; "9c2836065510901f9ba07928e4c7e319dd33b670" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/9c2836065510901f9ba07928e4c7e319dd33b670; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/9c2836065510901f9ba07928e4c7e319dd33b670"; sha256 = "1b6igbp0mn78hvjgg33xyi6v7gd7nqvl3f4hgq5wfr8dzghx5gky"; }; "9c2b99ebfed2e931067e8842161b2811d04206eb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9c2b99ebfed2e931067e8842161b2811d04206eb; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9c2b99ebfed2e931067e8842161b2811d04206eb"; sha256 = "0j0p40hjbc1v0ld3halwhic0573n1z58sgpy112rqb1m667q87q6"; }; "9c45f6155855d24fbb8f12e7a40895df1e55b205" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9c45f6155855d24fbb8f12e7a40895df1e55b205; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9c45f6155855d24fbb8f12e7a40895df1e55b205"; sha256 = "08rpzwbnxwpk5gvybxv7q0s9k25gn8vcm77k7s69r5wva0p8hl9r"; }; "9c46b9b756ef22a0a9aad7d5efcf7e670cf46b3c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9c46b9b756ef22a0a9aad7d5efcf7e670cf46b3c; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9c46b9b756ef22a0a9aad7d5efcf7e670cf46b3c"; sha256 = "17jc44fj6vs0kqxk568vn6vjapyc1r7k9b88pc5l96m53bdkn7cm"; }; "9c8dc173e3087266551343fc43db0a118e573cd5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/9c8dc173e3087266551343fc43db0a118e573cd5; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/9c8dc173e3087266551343fc43db0a118e573cd5"; sha256 = "1np5grzkj4cib5mzwxksqh3crbfllwgsk3ss7jz03s5hgh8jk2fa"; }; "9cb4e1d5ca0e7935f8d937f678a9245ca0a8baf1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9cb4e1d5ca0e7935f8d937f678a9245ca0a8baf1; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9cb4e1d5ca0e7935f8d937f678a9245ca0a8baf1"; sha256 = "0wpqjvls8rdi6g47w8xzs71ynfg1aiw7jw1g160wxk11qvn17rid"; }; "9cdfcaa36a081486e8c591d1b0de339f20e19712" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9cdfcaa36a081486e8c591d1b0de339f20e19712; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9cdfcaa36a081486e8c591d1b0de339f20e19712"; sha256 = "0y7h2ass8kgfabkvdwr3jcdi4znc6mcg4zklvw4yr3420d5h16x3"; }; "9cf547b1a8d0349c6997827cf3b1c76934a8f7e1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2714108-1287c19490104fa7a8ca7bc71daf7ae8/9cf547b1a8d0349c6997827cf3b1c76934a8f7e1; + url = "http://cdn.unrealengine.com/dependencies/2714108-1287c19490104fa7a8ca7bc71daf7ae8/9cf547b1a8d0349c6997827cf3b1c76934a8f7e1"; sha256 = "1hh19pkjsnhjcsd8vj7d8l5nlk01iyp4kxf5hn2ymf0j1df0xns0"; }; "9d0629861bfc4948fc177763e87dc1ea3ac042ba" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/9d0629861bfc4948fc177763e87dc1ea3ac042ba; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/9d0629861bfc4948fc177763e87dc1ea3ac042ba"; sha256 = "0bal97q5lyz4s5z39jnxbabhll2agydcdw3mx0sikwr666aa8hac"; }; "9d238c0aed4cd73464dbba5fbf034030858fe441" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/9d238c0aed4cd73464dbba5fbf034030858fe441; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/9d238c0aed4cd73464dbba5fbf034030858fe441"; sha256 = "1n3fj5dsc4b9i8jwb1nzlnk1vbjnzlva3ljwkd16z8xfcdq3aqjd"; }; "9d2a8629491c47d32fd852ad683ba3be0f91dca2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9d2a8629491c47d32fd852ad683ba3be0f91dca2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9d2a8629491c47d32fd852ad683ba3be0f91dca2"; sha256 = "0csiwyx12frg2bzyp72is2h6fi2vv961byc23k30p0yz22cybr6c"; }; "9d4088ad171c93938ed41b2c224a98da2eb8e600" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9d4088ad171c93938ed41b2c224a98da2eb8e600; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9d4088ad171c93938ed41b2c224a98da2eb8e600"; sha256 = "02z4578c3939zq6m6l9ckjf0kiyf9biq98yqb6dmp93lanr9sahc"; }; "9d48d62d8894986890f0f871523b546e25618a96" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9d48d62d8894986890f0f871523b546e25618a96; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9d48d62d8894986890f0f871523b546e25618a96"; sha256 = "12j6p2l09n1yv388h0ynxl0p1bply6217600ix7d8mpm4jjri9sa"; }; "9d6293584ce78fd938acc5ddf91597dead7b8ff0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/9d6293584ce78fd938acc5ddf91597dead7b8ff0; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/9d6293584ce78fd938acc5ddf91597dead7b8ff0"; sha256 = "1qxm6h3nl2aawl9z04gn1kzlaiaajccyh0b9gr85d6x8x2dwxjpg"; }; "9d8150632d85b43bd2be46924eb71dd19d5b444b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9d8150632d85b43bd2be46924eb71dd19d5b444b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9d8150632d85b43bd2be46924eb71dd19d5b444b"; sha256 = "14yw0xbyg1rq18xyfydfy3z0gnvkzr27f2vscsgiw1xmps0fsa6h"; }; "9d835adb6f30382cec8e1701c61f3a305fe5ebe5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/9d835adb6f30382cec8e1701c61f3a305fe5ebe5; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/9d835adb6f30382cec8e1701c61f3a305fe5ebe5"; sha256 = "0vq311bgcj0zcicb05l5d1pl5jw1vqbblfzmzk3h6nf0hgn2db24"; }; "9d8f4ef5363610f4b47829299c0824147fa3c486" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9d8f4ef5363610f4b47829299c0824147fa3c486; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9d8f4ef5363610f4b47829299c0824147fa3c486"; sha256 = "0p5kp49clxg0ws3l3dslff5j54gi11bdpbsks2nh9081pfddla5z"; }; "9da60f5683310aa2ed53d90b2a9a246879223099" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9da60f5683310aa2ed53d90b2a9a246879223099; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9da60f5683310aa2ed53d90b2a9a246879223099"; sha256 = "0zgiz6m2g1i5884izczyigh42bfw0xbkvf1r6jmavays26r83lb5"; }; "9dd86d52ca2bc2688244bec708a9054313d175c5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9dd86d52ca2bc2688244bec708a9054313d175c5; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9dd86d52ca2bc2688244bec708a9054313d175c5"; sha256 = "0viis6zccnxasxwfbi34xpqf4rnzr0w439qsskx7mbhg3zi8p0hz"; }; "9ddf004692c477b60fed575d57551fabdb00997c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9ddf004692c477b60fed575d57551fabdb00997c; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9ddf004692c477b60fed575d57551fabdb00997c"; sha256 = "1ij1pdln5llxl6cxsiz6kbfzsgqmk901mrgbzsdki3ibs75dzr1m"; }; "9de93e74f384195b52fb90f9e7767ece5fd84570" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9de93e74f384195b52fb90f9e7767ece5fd84570; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9de93e74f384195b52fb90f9e7767ece5fd84570"; sha256 = "1mj2syhcxq5qg23li9rh3814wiws421yasjw83j7b63yvpqbnyvl"; }; "9ded54d67930bcf5c3e95a10d2176c6106f2a3f8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9ded54d67930bcf5c3e95a10d2176c6106f2a3f8; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9ded54d67930bcf5c3e95a10d2176c6106f2a3f8"; sha256 = "0csk1i20kwp4rd1j6lci9v4wmc9jx3ji1i1m051iik0dy0553z3p"; }; "9e3075eea5e5e885d9aa9e6b2952ebe61a8b60a1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9e3075eea5e5e885d9aa9e6b2952ebe61a8b60a1; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9e3075eea5e5e885d9aa9e6b2952ebe61a8b60a1"; sha256 = "10gxi4n3k6fjsigv12603xsjp097b09bl6lli308xngjkiz55syp"; }; "9e397995b47d5acc37d38c9fa4935abec922ba48" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/9e397995b47d5acc37d38c9fa4935abec922ba48; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/9e397995b47d5acc37d38c9fa4935abec922ba48"; sha256 = "0cqayf9ag0snn0fab83fz3l5fqbjhllv86ik3vzx09zmg4i0d7n5"; }; "9e728c35e842f7af53a3e822acd469326d7cd52f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2677283-a70890a1537c42869136794b62c332a4/9e728c35e842f7af53a3e822acd469326d7cd52f; + url = "http://cdn.unrealengine.com/dependencies/2677283-a70890a1537c42869136794b62c332a4/9e728c35e842f7af53a3e822acd469326d7cd52f"; sha256 = "1brpgrvcshwcrignfc257zg2jchav13kaz94n06i6i4fvd4la6ix"; }; "9e804a449e34aea4d5227c2a0cb3d96352a82de2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621793-1958bfdd4e3b49f3a0ca6a4c08a60a0a/9e804a449e34aea4d5227c2a0cb3d96352a82de2; + url = "http://cdn.unrealengine.com/dependencies/2621793-1958bfdd4e3b49f3a0ca6a4c08a60a0a/9e804a449e34aea4d5227c2a0cb3d96352a82de2"; sha256 = "1rfn257jpdl61g0qf92lqybhj9j81gxq7h8igb7x5kwswa74c7ws"; }; "9e9a678ef5fe8d87a10fc7621ae8dd3c501e6236" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9e9a678ef5fe8d87a10fc7621ae8dd3c501e6236; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9e9a678ef5fe8d87a10fc7621ae8dd3c501e6236"; sha256 = "1mijmzfvnxnii8z805a5hnhbiwwh3j16p8i7i0rhrmvkw5gnd68r"; }; "9ef14ed15fba71337b14c1e33972d9cd36fa9278" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9ef14ed15fba71337b14c1e33972d9cd36fa9278; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9ef14ed15fba71337b14c1e33972d9cd36fa9278"; sha256 = "157dz7i640q6scfpzqjw24i8qwlwjvrbdxqi60sx9hgkax1xw0n7"; }; "9ef93659a347d11fc1e9478c37043a0236e34ba5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/9ef93659a347d11fc1e9478c37043a0236e34ba5; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/9ef93659a347d11fc1e9478c37043a0236e34ba5"; sha256 = "0qn4vd5pyjrsaa75n5avy0ri1s71nwnnkgn66qcdc2x5fckq6p3j"; }; "9f07f59f3c436bdfae1916ca914e86d02a7239eb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9f07f59f3c436bdfae1916ca914e86d02a7239eb; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9f07f59f3c436bdfae1916ca914e86d02a7239eb"; sha256 = "14qyjvd23zqc5dhv15z8sp9yl324fsfzy9p7x2nl35x14j667l8j"; }; "9f3ea83f4797ad2eb48a62d176d4849ab3b11b4e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/9f3ea83f4797ad2eb48a62d176d4849ab3b11b4e; + url = "http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/9f3ea83f4797ad2eb48a62d176d4849ab3b11b4e"; sha256 = "1fiah07i0wyvya8dwnlkfyq6csg9f0yly1x51j9s6jazy45xffrb"; }; "9f67c39f021b4b42e5fa8aec0f0be533c8341cac" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/9f67c39f021b4b42e5fa8aec0f0be533c8341cac; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/9f67c39f021b4b42e5fa8aec0f0be533c8341cac"; sha256 = "0p4a43z84i8qjpnpich9rdxg0gsycblmif3slsad8ydabj094vkp"; }; "9fb4a9e94f7c935385fd64a3d3c2f58144e7118a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9fb4a9e94f7c935385fd64a3d3c2f58144e7118a; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9fb4a9e94f7c935385fd64a3d3c2f58144e7118a"; sha256 = "03hyf8kladlf5hwc1rija042pqcyzlbmla0c3pysrla33h4ca5qc"; }; "9fc2d2e4632111eca96621a257b4547fddf03746" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/9fc2d2e4632111eca96621a257b4547fddf03746; + url = "http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/9fc2d2e4632111eca96621a257b4547fddf03746"; sha256 = "0bmg6jvpwq02azazsh98mdh0x716lxslqai6g2b8icwxxi84p20s"; }; "a003e87a1243a65a9d38ce8666ba05cf9dff34df" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2634249-f2b4469cf0774eac818e7cb4565f1224/a003e87a1243a65a9d38ce8666ba05cf9dff34df; + url = "http://cdn.unrealengine.com/dependencies/2634249-f2b4469cf0774eac818e7cb4565f1224/a003e87a1243a65a9d38ce8666ba05cf9dff34df"; sha256 = "08cbncxgcr83mld0qv6zc6mzjc00jjx8za0ii2v8r7a5jhr7hcr7"; }; "a00af92cb7dfede2f60df7468c841462cd3ef7bd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a00af92cb7dfede2f60df7468c841462cd3ef7bd; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a00af92cb7dfede2f60df7468c841462cd3ef7bd"; sha256 = "13arcphd636ahrdbxlxwb6yrximqgm9ixl745yqp83aihk2wwls1"; }; "a037040fb7bcc432add0b7d65dc1d3b078b6f143" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a037040fb7bcc432add0b7d65dc1d3b078b6f143; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a037040fb7bcc432add0b7d65dc1d3b078b6f143"; sha256 = "1jjcbw831yijkabzavbi4vmw3ba8vk248dnaqsjm5gkcajgwagxp"; }; "a04dbee3efc3178e3a175b2fb572cc36210ba9ce" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2599079-89300969452d4a5eaefe1ab4af976839/a04dbee3efc3178e3a175b2fb572cc36210ba9ce; + url = "http://cdn.unrealengine.com/dependencies/2599079-89300969452d4a5eaefe1ab4af976839/a04dbee3efc3178e3a175b2fb572cc36210ba9ce"; sha256 = "0xwqk4czfy62r9dh5yyan4kggijy5hgvbq084zbz3fc53cxrj3kc"; }; "a05558cf2d18454f06cd9c1a5b610a654ec0294d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a05558cf2d18454f06cd9c1a5b610a654ec0294d; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a05558cf2d18454f06cd9c1a5b610a654ec0294d"; sha256 = "0m9pngd6gnndqbww5xnwcfdf1gnkyipccixi6w4msps20s2bbkfr"; }; "a056afc246a9cdce5d7321930c97ccf0b9f19f15" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/a056afc246a9cdce5d7321930c97ccf0b9f19f15; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/a056afc246a9cdce5d7321930c97ccf0b9f19f15"; sha256 = "1y41y758jn47y9zy46f0inxlzl0h8wrdj4fm9937ypd2fyfw6nmg"; }; "a09bd78594e737689115679ea7f6a09ed557d18e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a09bd78594e737689115679ea7f6a09ed557d18e; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a09bd78594e737689115679ea7f6a09ed557d18e"; sha256 = "1b1kivdj0qz5cr5igqmzbcyrmhbygvdavmfrqlqlrs1775411b7x"; }; "a0d83db11d6b2a64fdb82cc496d07a03ccaa142f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a0d83db11d6b2a64fdb82cc496d07a03ccaa142f; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a0d83db11d6b2a64fdb82cc496d07a03ccaa142f"; sha256 = "1qqrpmmdc0zg13x6qvjzi6zk6wvq0khiml4ksrhbn60si3gr8li0"; }; "a0de04466a75125d3528739deb44e12686e7a970" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a0de04466a75125d3528739deb44e12686e7a970; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a0de04466a75125d3528739deb44e12686e7a970"; sha256 = "1k6ivx8bi63yivbw36lrpz8sv8gc2gzslb6pq2hq19jacl4v7xwy"; }; "a0f7010e4bf1452ec48d287d971a48198a78da69" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a0f7010e4bf1452ec48d287d971a48198a78da69; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a0f7010e4bf1452ec48d287d971a48198a78da69"; sha256 = "06s4hiwd7vr3n18p5pg34h1irzvq575n2pw9l2sskz6fj82m2fv8"; }; "a12df808dfee07a06515eabdd6c1b0124a7385d0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2619995-d5e097f793bd479d8592679759fb98be/a12df808dfee07a06515eabdd6c1b0124a7385d0; + url = "http://cdn.unrealengine.com/dependencies/2619995-d5e097f793bd479d8592679759fb98be/a12df808dfee07a06515eabdd6c1b0124a7385d0"; sha256 = "1xnjwnfzaja205cm6c54nc53m3nbjfqk28ggi7h2rxg9cdjcv59y"; }; "a1820034a04f046e5f0c74444f653ee4869647c6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/a1820034a04f046e5f0c74444f653ee4869647c6; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/a1820034a04f046e5f0c74444f653ee4869647c6"; sha256 = "1mi6z4s5wz9j4y097b27xp9038nar7nn2gmc1x7yaw97kh2z76n8"; }; "a18cebf9d16dc2e5a99da03353e404d64bce3ae6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/a18cebf9d16dc2e5a99da03353e404d64bce3ae6; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/a18cebf9d16dc2e5a99da03353e404d64bce3ae6"; sha256 = "1g0arlnn0f4zhhj9lwmj3mjlwjwvj0gw8m8fbr2jw6rylmfag4av"; }; "a1c1fcef149d29408d496f35628d18dd9bd2e6df" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a1c1fcef149d29408d496f35628d18dd9bd2e6df; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a1c1fcef149d29408d496f35628d18dd9bd2e6df"; sha256 = "1b66dsbjjvz4gm7vm4vaapykhv7ni2y5rkycbfahzcigi5kasf57"; }; "a1f9df46b4e95588043a59820ba65fc28a8eea7f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a1f9df46b4e95588043a59820ba65fc28a8eea7f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a1f9df46b4e95588043a59820ba65fc28a8eea7f"; sha256 = "0fbzj0bkkbm7rxdi6lva7g2qhgqmj4y2mhg72z1iw842bikr4l2f"; }; "a1fc05440064b28d5deb42b383bf1960ca27cb3b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/a1fc05440064b28d5deb42b383bf1960ca27cb3b; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/a1fc05440064b28d5deb42b383bf1960ca27cb3b"; sha256 = "1b0xagh5f596ww8g6yng6frrvkrs8vrhzzbnl59ab1cpbq3xn7dw"; }; "a21a78f021d580176e09c67d0643b83e80ca2744" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/a21a78f021d580176e09c67d0643b83e80ca2744; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/a21a78f021d580176e09c67d0643b83e80ca2744"; sha256 = "1xjclk357lm9rydmhzvznq8rd4yysr2jzh5y1bvrbpvxpx4hc3if"; }; "a243a00aa61675be8ae46cdba7db99c8e8195984" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/a243a00aa61675be8ae46cdba7db99c8e8195984; + url = "http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/a243a00aa61675be8ae46cdba7db99c8e8195984"; sha256 = "1lvmwf0ajkjsdz68n22dhiihddv4ric0nch46ixvqg8di50fanj2"; }; "a24d76c382036592b023a22d61abbe88d52cb526" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a24d76c382036592b023a22d61abbe88d52cb526; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a24d76c382036592b023a22d61abbe88d52cb526"; sha256 = "0brdmg3xp6jgfhralw483pkyvgd305g3m4bcqcpg9vazsrwawypm"; }; "a2587b8104dccd8347dc49a52bb5643842856a16" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a2587b8104dccd8347dc49a52bb5643842856a16; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a2587b8104dccd8347dc49a52bb5643842856a16"; sha256 = "0j8pwamzj2icivglw0ylpvbx76c0xyys79l049l7lpirp95y0hb0"; }; "a260cd8d85a752caa55d8857af979f5ae8a68d97" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2597174-0975f975d1f0463f931b68ea4b0ef6d0/a260cd8d85a752caa55d8857af979f5ae8a68d97; + url = "http://cdn.unrealengine.com/dependencies/2597174-0975f975d1f0463f931b68ea4b0ef6d0/a260cd8d85a752caa55d8857af979f5ae8a68d97"; sha256 = "19fijnc4j8pr726j3v3c0x35k8mnswk8jfjjzmgxdn6s95c6q9pm"; }; "a2731fbc3c50dde19f92ac5706a3b73a2fb50c05" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2761703-4d21a69f627145d58d1b542fa90eeb3e/a2731fbc3c50dde19f92ac5706a3b73a2fb50c05; + url = "http://cdn.unrealengine.com/dependencies/2761703-4d21a69f627145d58d1b542fa90eeb3e/a2731fbc3c50dde19f92ac5706a3b73a2fb50c05"; sha256 = "1adi6x27znln5qqkcl1x281csw27v5xd981n0az5wxqxfpssxriq"; }; "a2b0d085248240cde57087bc35816b078511c856" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a2b0d085248240cde57087bc35816b078511c856; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a2b0d085248240cde57087bc35816b078511c856"; sha256 = "0ksv63yssyqhphll4glyrizrsylkk2p82l2n653sw0jjrrbp5m20"; }; "a2b1b97c80248fb89a7ce7322cc399a4fdf3173c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a2b1b97c80248fb89a7ce7322cc399a4fdf3173c; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a2b1b97c80248fb89a7ce7322cc399a4fdf3173c"; sha256 = "1908grxgwb9sy4rd02jzc4zyi543dkxhynx0wkc0imfw4x2l9ixa"; }; "a2ce002a2a6a420e4c746eae8f553665e409a116" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/a2ce002a2a6a420e4c746eae8f553665e409a116; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/a2ce002a2a6a420e4c746eae8f553665e409a116"; sha256 = "021q59y3gi3f6ygddr736l75japm8zky3lz21z4bzik7kmirxq98"; }; "a2d4c282439a7d50a9b7005e9c3feb136cc093e8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/a2d4c282439a7d50a9b7005e9c3feb136cc093e8; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/a2d4c282439a7d50a9b7005e9c3feb136cc093e8"; sha256 = "1wbn5yxpmfq5r20j9h27kpyc1v66a78dil39b83cpp4j7jkv687c"; }; "a333e2129a0a7518d47d81753d193ceecc5b881a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a333e2129a0a7518d47d81753d193ceecc5b881a; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a333e2129a0a7518d47d81753d193ceecc5b881a"; sha256 = "1ih9hbcsslfslb9wr1i5f2vk9746zczygn54lac2m108kf6y0jk4"; }; "a353e5dd34009fcbd0a5f9eced792d02ffd2cb97" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2710757-d76358e2c5474af8a7d14e3262b517a4/a353e5dd34009fcbd0a5f9eced792d02ffd2cb97; + url = "http://cdn.unrealengine.com/dependencies/2710757-d76358e2c5474af8a7d14e3262b517a4/a353e5dd34009fcbd0a5f9eced792d02ffd2cb97"; sha256 = "1wf8zzpyp45c9bq2zwfcy5j33yj2gzf73zbfqcppxz89knyakic7"; }; "a36932c96e52dc3b154313d65c128fc6efa79367" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a36932c96e52dc3b154313d65c128fc6efa79367; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a36932c96e52dc3b154313d65c128fc6efa79367"; sha256 = "1j2qd8j6sp3vj2rm8cxbli2d0l741i786widws427bddp1ma805y"; }; "a37744cecf38c8c2ca371eb33120654f8a53b5a3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/a37744cecf38c8c2ca371eb33120654f8a53b5a3; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/a37744cecf38c8c2ca371eb33120654f8a53b5a3"; sha256 = "1gi17xrvy9hl31z1bsxdq6awy93hllizvc4hbdc74xmpxdgnnqkx"; }; "a3891b8c154921b18b27b3c7915a8bab0b886565" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/a3891b8c154921b18b27b3c7915a8bab0b886565; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/a3891b8c154921b18b27b3c7915a8bab0b886565"; sha256 = "1ak3n4yyxpj34v9cjlglgpy0q292xrh7363p26xbkln39il8h51w"; }; "a3ea753b468f54a0a4c306c03130572f0ec0eee4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/a3ea753b468f54a0a4c306c03130572f0ec0eee4; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/a3ea753b468f54a0a4c306c03130572f0ec0eee4"; sha256 = "0fc6xv7d20c1nvzvw8dc1mwh1c51447y9fgl6z93c6xabvijc2q5"; }; "a3edc07dfea80da6d7d09067737fc4630c4bb81a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/a3edc07dfea80da6d7d09067737fc4630c4bb81a; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/a3edc07dfea80da6d7d09067737fc4630c4bb81a"; sha256 = "11wh3glqpficz5wj9cgif1kjpmcbziapza719gzadkcrjc1vasbl"; }; "a41d00077f02fab1c6a05e4607094b4eea3b6ad0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/a41d00077f02fab1c6a05e4607094b4eea3b6ad0; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/a41d00077f02fab1c6a05e4607094b4eea3b6ad0"; sha256 = "1xrf0szqj7wxwqcw7lw43fpzqjq9lh3rr04jyfmnddasxd6qzfwz"; }; "a456f0111a1d9a6fb8045d0e5e9450b7c36f9374" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a456f0111a1d9a6fb8045d0e5e9450b7c36f9374; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a456f0111a1d9a6fb8045d0e5e9450b7c36f9374"; sha256 = "1p9bhg7sjvc70jsansrf9qa2wnxwk9dn4ic5k9jai9alcr48bjan"; }; "a46938a8170197df7ac0c8d9ca3c7e5aca696271" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a46938a8170197df7ac0c8d9ca3c7e5aca696271; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a46938a8170197df7ac0c8d9ca3c7e5aca696271"; sha256 = "01ipp4xnpgnnhlkqh1hpman6ifj77jij5b9mrra87dkcy83wd7j2"; }; "a4d7e28c74a63f10107957b9b6af00486f1e7358" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a4d7e28c74a63f10107957b9b6af00486f1e7358; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a4d7e28c74a63f10107957b9b6af00486f1e7358"; sha256 = "19ldb1kdwiji7bwjz6fx8rak2dk8gpnvib5b3s3ywl0dxa85yv13"; }; "a507276db67feeb197bacced284be29d92bfb2b7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a507276db67feeb197bacced284be29d92bfb2b7; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a507276db67feeb197bacced284be29d92bfb2b7"; sha256 = "1a46d8km3ci1jy1hgq7mxcq0bhkd2n8bqrdd7x1nyybvh5r7hjn7"; }; "a561c854b1abb49bc710438edd6a17feb5370e73" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a561c854b1abb49bc710438edd6a17feb5370e73; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a561c854b1abb49bc710438edd6a17feb5370e73"; sha256 = "0s9sw7kx3gj4xrckivfl2w2dvw2criwwm0bibh6dmajsj058pl84"; }; "a5a4b35f662228caee7476ddab2567611de6c35c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/a5a4b35f662228caee7476ddab2567611de6c35c; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/a5a4b35f662228caee7476ddab2567611de6c35c"; sha256 = "0580qlzrvf1vw8rfncc50vyy9y5g79rwcvj8rjaxvdwmg1n4dpw0"; }; "a6287affa4b828301aafa84f7bd9ce71935997b1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/a6287affa4b828301aafa84f7bd9ce71935997b1; + url = "http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/a6287affa4b828301aafa84f7bd9ce71935997b1"; sha256 = "06kdx9x2a4230k1c1b60cwkadarg62rnsbycgbqzhgbp6h4j8awn"; }; "a717434c111c75d501e35d8a5f4de2b75e299566" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/a717434c111c75d501e35d8a5f4de2b75e299566; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/a717434c111c75d501e35d8a5f4de2b75e299566"; sha256 = "1410w7shpi913irx8b48mk7004vdsf0xa3hrh21bvd70askxn4ci"; }; "a74403ad656c7c68733bf1d09d994d0e8dccd94e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/a74403ad656c7c68733bf1d09d994d0e8dccd94e; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/a74403ad656c7c68733bf1d09d994d0e8dccd94e"; sha256 = "0b8kcrdcd4jmn2anxgd0x04szkf2k1gkqkl8srkbf4f5hh7aj27x"; }; "a744790bed001ed939d533b58c7d7132d8599ee6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/a744790bed001ed939d533b58c7d7132d8599ee6; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/a744790bed001ed939d533b58c7d7132d8599ee6"; sha256 = "15gxpbd7p0pj67b1dwgnsq841zdfmzw27qvpzpg15nbdsm4bqknq"; }; "a7460f75270bd4946c7e856b9cba426bfd756474" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/a7460f75270bd4946c7e856b9cba426bfd756474; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/a7460f75270bd4946c7e856b9cba426bfd756474"; sha256 = "1xl68yyf67zr08390y11p8il1g99crr9j71m7bqkps4sr236iv1l"; }; "a75892ec39777f5deec95c7ab34ac829e42f61f7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/a75892ec39777f5deec95c7ab34ac829e42f61f7; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/a75892ec39777f5deec95c7ab34ac829e42f61f7"; sha256 = "1x83zbrnqx9856s515lqix9na8ir8991whgszbx84xjzs7507wag"; }; "a7675f8de766ef5fa71fd6c904b6000b880a463d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a7675f8de766ef5fa71fd6c904b6000b880a463d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a7675f8de766ef5fa71fd6c904b6000b880a463d"; sha256 = "0jmc22yiaw09cqx0wanyzbh46iblxpjzs9v1bl8hhicv360rq1ya"; }; "a7c85f34f7555c16973a534e2c21b5d0bf278e29" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a7c85f34f7555c16973a534e2c21b5d0bf278e29; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a7c85f34f7555c16973a534e2c21b5d0bf278e29"; sha256 = "1a7zbrmj2gdq61q2gw6jr6j3848mg85snj8hghmajndww1wspjlp"; }; "a8278a17fc9fa29308c59351a8c53b8330d33e88" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/a8278a17fc9fa29308c59351a8c53b8330d33e88; + url = "http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/a8278a17fc9fa29308c59351a8c53b8330d33e88"; sha256 = "0d391bz9b9c73xdnkxm3l8zyz1zjb6nv0vn5m3ihpgb7hkdgfxgz"; }; "a82d5d8a7e63a42fa0e2414ad66c400a3beb640a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2498161-1c427a8c10084d53ae743a11e6148406/a82d5d8a7e63a42fa0e2414ad66c400a3beb640a; + url = "http://cdn.unrealengine.com/dependencies/2498161-1c427a8c10084d53ae743a11e6148406/a82d5d8a7e63a42fa0e2414ad66c400a3beb640a"; sha256 = "1cr9k5zlj9kl24ph9inczwm84rbch1vkvrkycs22yhqblgwf5zid"; }; "a84e9f4455088def00bab0652ca92a80ecce5e57" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a84e9f4455088def00bab0652ca92a80ecce5e57; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a84e9f4455088def00bab0652ca92a80ecce5e57"; sha256 = "1ks51i2490lymg2whdj1807z9asyl6gpsgbshw4bgdxd903aka1l"; }; "a8e8deae490071080b69408bf16c09b087801323" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/a8e8deae490071080b69408bf16c09b087801323; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/a8e8deae490071080b69408bf16c09b087801323"; sha256 = "1v0aaimfzl3f52cajgzv9v6wzjn4jpf95y40kalqbj2w7qvyzz4i"; }; "a980d01787b472fb299cc01e49a8a9da740ce81d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a980d01787b472fb299cc01e49a8a9da740ce81d; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a980d01787b472fb299cc01e49a8a9da740ce81d"; sha256 = "1laqjx21ik77p2xggii4pbcj7np9a6bpn8wlhivzk23zg0jnp0xz"; }; "a98192f145db4e2a545f79bc9d595f8f5c7fda34" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/a98192f145db4e2a545f79bc9d595f8f5c7fda34; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/a98192f145db4e2a545f79bc9d595f8f5c7fda34"; sha256 = "0kwb4jawlfvql1n1fbw04kqik33gmlzci7zc236gyhz4mhb86xd1"; }; "a98819bf37317dabf20f86b0fd6800a911717698" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a98819bf37317dabf20f86b0fd6800a911717698; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a98819bf37317dabf20f86b0fd6800a911717698"; sha256 = "0lh1288ab45p06082lb1a4cjh1k3gqmpxnbsilq5cgic98x7fwr9"; }; "a99daa4bfd46db4b416f47b4fc1972b221ea57e7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a99daa4bfd46db4b416f47b4fc1972b221ea57e7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a99daa4bfd46db4b416f47b4fc1972b221ea57e7"; sha256 = "1mk3s8g5vgjpmhw6pb14akvipbm31il3887f4qqgfxcdfgkj261h"; }; "a9c62ffacb1508452705b057c5f796573d47c78d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a9c62ffacb1508452705b057c5f796573d47c78d; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a9c62ffacb1508452705b057c5f796573d47c78d"; sha256 = "0c0gm8yqkwbzbdlx625bng0hwg9l8fnwf02fkm7mai8qg2xbb76z"; }; "a9c93107f208faee20ff396148c3b9954b33aa06" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/a9c93107f208faee20ff396148c3b9954b33aa06; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/a9c93107f208faee20ff396148c3b9954b33aa06"; sha256 = "0qrg2k8rf3ic7z9y0pv0mainwbqmhn4p5q6jajf08wndz2k3plr3"; }; "a9dfe0dbd869009eeca3fb67d49ce2c691877dc8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a9dfe0dbd869009eeca3fb67d49ce2c691877dc8; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a9dfe0dbd869009eeca3fb67d49ce2c691877dc8"; sha256 = "0i84q4qa7jp3yils2hi8qd9mp0xpazdmnr93739sqhd8wrvi3isi"; }; "a9f9260691fe2d9ade072d9589f478dbce491a25" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/a9f9260691fe2d9ade072d9589f478dbce491a25; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/a9f9260691fe2d9ade072d9589f478dbce491a25"; sha256 = "1bkkfvnxxxscv1rglxn9174h7zfa093j0ilq3wpc682hlihg1c7s"; }; "aa0999ac4a6e388aa9547c455a6ea08c98d7036a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/aa0999ac4a6e388aa9547c455a6ea08c98d7036a; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/aa0999ac4a6e388aa9547c455a6ea08c98d7036a"; sha256 = "004gm6cfkrv1hccsqwd9qzby37rjjb5cmhz8z8a4wyr52vcccp6f"; }; "aa212839e3606b3a1bbb68c9c1353c627853d8d5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/aa212839e3606b3a1bbb68c9c1353c627853d8d5; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/aa212839e3606b3a1bbb68c9c1353c627853d8d5"; sha256 = "166y3z7h9ncjz34g9ljbch4knqgi8syhsyl1gkh5wnqwkhsdkyjl"; }; "aa40eee6849fd0b67b4a01d245e14e6f9cb562fe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2481391-2b0dc74bc6d44dd4917420631716dc19/aa40eee6849fd0b67b4a01d245e14e6f9cb562fe; + url = "http://cdn.unrealengine.com/dependencies/2481391-2b0dc74bc6d44dd4917420631716dc19/aa40eee6849fd0b67b4a01d245e14e6f9cb562fe"; sha256 = "1zhfxhr1ngxkigy2kbr0x19qa6bfh5jqh2kb04x6b5c5cl2rxnx0"; }; "aa7f77e42dedc93399b370b494f11d5cafe3ac1b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/aa7f77e42dedc93399b370b494f11d5cafe3ac1b; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/aa7f77e42dedc93399b370b494f11d5cafe3ac1b"; sha256 = "0zj2dqfl1zc15i511n89g5gbjkxgr7ivsvjjnyxdw6pdcbx3820c"; }; "aa92bb8c104afa015ba28312d3eb02c006426dc4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/aa92bb8c104afa015ba28312d3eb02c006426dc4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/aa92bb8c104afa015ba28312d3eb02c006426dc4"; sha256 = "0xw13lfrl0nbhjr1haz9k5yf6vra4h2q72mf213h5aar0h2sfivl"; }; "aab7c2855fd330fbd2d86fae15fb7fc38e8117a4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/aab7c2855fd330fbd2d86fae15fb7fc38e8117a4; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/aab7c2855fd330fbd2d86fae15fb7fc38e8117a4"; sha256 = "1g615imqp4nvryqr7fzdg2xd62nv6nkq0n6a9s4vfl8di3hfywaz"; }; "aad648813ec7c3909fab2cba04e54a790f99d97d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/aad648813ec7c3909fab2cba04e54a790f99d97d; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/aad648813ec7c3909fab2cba04e54a790f99d97d"; sha256 = "1056xhjfdpyg3x778w33wmydzacgv24p9mrcsb0h1n09lkxbab5p"; }; "aadaaad6c3a74db06ec29a860e4cbdb518a7e965" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/aadaaad6c3a74db06ec29a860e4cbdb518a7e965; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/aadaaad6c3a74db06ec29a860e4cbdb518a7e965"; sha256 = "1xyx0sr4vgbkyizvmjsykn3lg7mg0rgs3ha8xcvkn4m4wzhciwxs"; }; "aaf3a012f48b24c193628af42ef3302d96784c3f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/aaf3a012f48b24c193628af42ef3302d96784c3f; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/aaf3a012f48b24c193628af42ef3302d96784c3f"; sha256 = "1idl0rsr7waqbgydsbnlq7bl26s202arhzv5bzmcghy2jlzgavj1"; }; "aafb65596f063aac27c03ad64646b10e9cbd9e5f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/aafb65596f063aac27c03ad64646b10e9cbd9e5f; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/aafb65596f063aac27c03ad64646b10e9cbd9e5f"; sha256 = "0gmi9sd9sgzb1bmwgyaghslz2rxyba96qyvzn9mdxnh661cwnwsk"; }; "aaff771bff40e67acec754ff6a73103840091d71" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/aaff771bff40e67acec754ff6a73103840091d71; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/aaff771bff40e67acec754ff6a73103840091d71"; sha256 = "15f92i5jph2hiihknkbyssif2gwlcm59vkqwj155c164g6fghdsc"; }; "ab091055311fa9bc429f0aacec0cc24290af3166" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ab091055311fa9bc429f0aacec0cc24290af3166; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ab091055311fa9bc429f0aacec0cc24290af3166"; sha256 = "124wr5mfd3n11k6rdd60177hfjbjicyn57fccwzn2sxhq3rdxl7p"; }; "ab0a48b5c47c246a0d31750e9ae6b073ad35963e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/ab0a48b5c47c246a0d31750e9ae6b073ad35963e; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/ab0a48b5c47c246a0d31750e9ae6b073ad35963e"; sha256 = "0ldkcyzq6jsjkb1w8qgrjjjz9sgpfa7syvmfnr4micv2jna867vc"; }; "ab0accca4b2e0942f55d408ed30bb84183371d99" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/ab0accca4b2e0942f55d408ed30bb84183371d99; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/ab0accca4b2e0942f55d408ed30bb84183371d99"; sha256 = "0j2pc8bpm3ikwzlkssgmbk1wcqskkbv9akyb07742vl034vzzc5z"; }; "ab199653d5f9dea6b89095016907a7ada2eea972" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ab199653d5f9dea6b89095016907a7ada2eea972; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ab199653d5f9dea6b89095016907a7ada2eea972"; sha256 = "0fk560jgq4avnlqvrj6y3qbd9r1zcyjxpvvpdcbwr57kqxqgki5d"; }; "ab1c1bb528f1ce09f2cd32ba886bdf658ee6ef6e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ab1c1bb528f1ce09f2cd32ba886bdf658ee6ef6e; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ab1c1bb528f1ce09f2cd32ba886bdf658ee6ef6e"; sha256 = "0jkdyzxqffi9zyfhi8pmh5z57z5cs4inn5cw92gbgh1fx760shx6"; }; "ab56f3655c7511b5ce622c56fc8f769b82720a77" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/ab56f3655c7511b5ce622c56fc8f769b82720a77; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/ab56f3655c7511b5ce622c56fc8f769b82720a77"; sha256 = "10f5kb8yswwd8178104jz5ph7s5j3hzmicfggfsdmviw4760iplm"; }; "ab5d351cc1959e213540cc41dbe93cea75dda4d9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ab5d351cc1959e213540cc41dbe93cea75dda4d9; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ab5d351cc1959e213540cc41dbe93cea75dda4d9"; sha256 = "1br599a6lsg7cq8a1zy7wicpjjmg1pvdmd9wph6xd4a4i5r5msh9"; }; "ab6ec6af0e90d693b32e063348193dfc34a5d608" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/ab6ec6af0e90d693b32e063348193dfc34a5d608; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/ab6ec6af0e90d693b32e063348193dfc34a5d608"; sha256 = "1saj3cr67jik0xfak36j394irs648w4ws8yg1bzb2i4kxl4x4qjf"; }; "ab9668aa1cb36fe03fd80ec800264850f247911e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/ab9668aa1cb36fe03fd80ec800264850f247911e; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/ab9668aa1cb36fe03fd80ec800264850f247911e"; sha256 = "1z3sq5jnxannf084xrd5sgm64d54n5w4vhh2jcrch53vylkkf771"; }; "abcd992f6c90c47b9150148778b5e5dd0be366f5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/abcd992f6c90c47b9150148778b5e5dd0be366f5; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/abcd992f6c90c47b9150148778b5e5dd0be366f5"; sha256 = "0sxcxwpz4xpxjnr5026xpp7m9jagvqb4ff0073r46a9jzp0y0nwh"; }; "abd31f5aa1a5bc7ad21bd97551365c4785a30537" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/abd31f5aa1a5bc7ad21bd97551365c4785a30537; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/abd31f5aa1a5bc7ad21bd97551365c4785a30537"; sha256 = "1si98cl159fdlqpqaagk3bsf8295nwbyf1x12fps78fw8svshhps"; }; "ac32cbcbb8641f87ce0f4e5e8ea11cdb33568e98" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2700710-7fab47bfec3142a7b4fa395fdd001748/ac32cbcbb8641f87ce0f4e5e8ea11cdb33568e98; + url = "http://cdn.unrealengine.com/dependencies/2700710-7fab47bfec3142a7b4fa395fdd001748/ac32cbcbb8641f87ce0f4e5e8ea11cdb33568e98"; sha256 = "0vvxrykslg2klrfmg8nczaxb2picf30fiz19vnwrmkc2hdx8ipj5"; }; "ac90a77a8f7a8cffa48d869e60f393981eeb2ff1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2620418-84d187e8202a426594ec7cac6eeb85a1/ac90a77a8f7a8cffa48d869e60f393981eeb2ff1; + url = "http://cdn.unrealengine.com/dependencies/2620418-84d187e8202a426594ec7cac6eeb85a1/ac90a77a8f7a8cffa48d869e60f393981eeb2ff1"; sha256 = "093cl6yhppbc6xqgfiy46rm2wip3cpvnkzxgff0k7bbb8chxp3al"; }; "ac98ab61a879076754296cafc03b793203fb6701" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ac98ab61a879076754296cafc03b793203fb6701; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ac98ab61a879076754296cafc03b793203fb6701"; sha256 = "1jcm9grs9s7prn4qxhpaw5np56g6s6k0z2xa8ky64i1c9rq0dyx4"; }; "ace785dacecc7b1203d5fd7ca358003149131381" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/ace785dacecc7b1203d5fd7ca358003149131381; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/ace785dacecc7b1203d5fd7ca358003149131381"; sha256 = "1i5aiksqi4hvjyzlrflh9v3dw9n4n4f38aw62flr92psnfy0ahr0"; }; "acf6558b1e3950d55a31da4e8614e4a357aa653c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/acf6558b1e3950d55a31da4e8614e4a357aa653c; + url = "http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/acf6558b1e3950d55a31da4e8614e4a357aa653c"; sha256 = "1gsdlhcwdd5dzl5qm8hsrgyg9bjmp0iyaa863fa4h40ammj0kg7a"; }; "ad4246832e88a45f0bdd6f9cafffd383ed378120" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/ad4246832e88a45f0bdd6f9cafffd383ed378120; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/ad4246832e88a45f0bdd6f9cafffd383ed378120"; sha256 = "00g2y2p4aavw5bfc116k4qj49qkw2gprg4cxv2mnp1ldj9jh81fc"; }; "ad48b0d39c84ad3a23ee670e06d009fd1ef406ae" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ad48b0d39c84ad3a23ee670e06d009fd1ef406ae; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ad48b0d39c84ad3a23ee670e06d009fd1ef406ae"; sha256 = "0a396fmil6q217fh2vr6wwm63wyq74j495dxj7y509swjsjf6zsc"; }; "ad735ce413f80f79900a87098c112c355b2269b9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ad735ce413f80f79900a87098c112c355b2269b9; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ad735ce413f80f79900a87098c112c355b2269b9"; sha256 = "1qgccwwrhkljak4xks9qnf0zq4j4q36n4134xs3nvmzbma9l6xw2"; }; "ad8485d0661bcc3b36bc884373baac7c82c1db1a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/ad8485d0661bcc3b36bc884373baac7c82c1db1a; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/ad8485d0661bcc3b36bc884373baac7c82c1db1a"; sha256 = "1w441r581slp32qhpnrpm2hacy3db8y7v5by2z0xycl2nfz25n1l"; }; "ada3dc17e0a699e9f0888f167ab43c95b9d087c9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610954-bd0fcbe6f0c748508fe9438073c40b27/ada3dc17e0a699e9f0888f167ab43c95b9d087c9; + url = "http://cdn.unrealengine.com/dependencies/2610954-bd0fcbe6f0c748508fe9438073c40b27/ada3dc17e0a699e9f0888f167ab43c95b9d087c9"; sha256 = "0zzk3laz8wv0sd4gqc54p5hw86wvbjmy8vrdlq5hpfhg6z046cch"; }; "ada964ecffeda8e2a6db59b92272ea1e22dd17b5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/ada964ecffeda8e2a6db59b92272ea1e22dd17b5; + url = "http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/ada964ecffeda8e2a6db59b92272ea1e22dd17b5"; sha256 = "0s23ag4qfdy2h7cz7184i2vzbbb3bm3j3655vs8yb8gfjj1rbiyx"; }; "adb1f445a4a127969356b6635da51f637f54a0ac" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/adb1f445a4a127969356b6635da51f637f54a0ac; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/adb1f445a4a127969356b6635da51f637f54a0ac"; sha256 = "1h5siwqpjjgqi695gsmbkdj4qx9cd3w4378i7w59dxv512zgkgrz"; }; "ade00d1c90e8988488643bcf563040510c4be517" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ade00d1c90e8988488643bcf563040510c4be517; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ade00d1c90e8988488643bcf563040510c4be517"; sha256 = "07wc8b6i06hqp5mas7jjhs71ag0lb00z3w5gs25zrmz36ly898hl"; }; "adeb881928e136d07bc7684746ce44d02956f822" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/adeb881928e136d07bc7684746ce44d02956f822; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/adeb881928e136d07bc7684746ce44d02956f822"; sha256 = "1bs2z2aw2pqiygq6ykznncfd029v483za1ii6sxbxdg59am4brii"; }; "ae2770ddebf925141015b1cd4b1bb15fe7ece06c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2659695-e878a65d22304b68a9e6878b07b5db24/ae2770ddebf925141015b1cd4b1bb15fe7ece06c; + url = "http://cdn.unrealengine.com/dependencies/2659695-e878a65d22304b68a9e6878b07b5db24/ae2770ddebf925141015b1cd4b1bb15fe7ece06c"; sha256 = "074dv8w0rkv95qcjxrwsbr6imx41w5ywfx7vcd73l3llzdgfk46l"; }; "ae70c01ba3575e5558b7bde673a82e53494df34b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ae70c01ba3575e5558b7bde673a82e53494df34b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ae70c01ba3575e5558b7bde673a82e53494df34b"; sha256 = "14qd1wbnp3zkfb2ni0dghjbgca4w6c8mnh90f0ijfxwnywk1myba"; }; "ae8089d30509415ded81477eb41b29f55a431272" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ae8089d30509415ded81477eb41b29f55a431272; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ae8089d30509415ded81477eb41b29f55a431272"; sha256 = "10y28v1pfxz5vdjxvb5kah2756lsl70z9grmda57l5wd4s9qmy91"; }; "ae874d3eb1af9a5081c94361a989f0b77e0ecf1b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ae874d3eb1af9a5081c94361a989f0b77e0ecf1b; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ae874d3eb1af9a5081c94361a989f0b77e0ecf1b"; sha256 = "1r3a0qndxy43pgwsjcc7ia3njip4zvh0419wbm502006amj07yrl"; }; "ae901fb15f84f70cf6979dafda0d8f5dbcc5c269" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ae901fb15f84f70cf6979dafda0d8f5dbcc5c269; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ae901fb15f84f70cf6979dafda0d8f5dbcc5c269"; sha256 = "1jipsy7d39z9qmz27ib75yixmgp0qqfazljgmisiw7kyii1m5fpp"; }; "aecbc01c44a31c0809a43e68b99e44ed1a66bd00" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/aecbc01c44a31c0809a43e68b99e44ed1a66bd00; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/aecbc01c44a31c0809a43e68b99e44ed1a66bd00"; sha256 = "0vxvjjpr0hvivfsszf94ii8xl67xnb262mxfwm5xmml7472xzhsn"; }; "aeeedf07121752bb79af7caf8438e5c3d612cd7f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/aeeedf07121752bb79af7caf8438e5c3d612cd7f; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/aeeedf07121752bb79af7caf8438e5c3d612cd7f"; sha256 = "1dk4xvniy7cr3xss4s9nrbjgbmibbsb9s7plw20hlg0gzcyg24pn"; }; "af0b9f348ea115df7f34f8c6a13da31e75e76e16" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/af0b9f348ea115df7f34f8c6a13da31e75e76e16; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/af0b9f348ea115df7f34f8c6a13da31e75e76e16"; sha256 = "00y3h6bw7ljrnvy1d9fxff6ncsvgpqaj3hyp44q41w3xlwilsyq7"; }; "af0da89763358318771d8aefcb742e3416f57423" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/af0da89763358318771d8aefcb742e3416f57423; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/af0da89763358318771d8aefcb742e3416f57423"; sha256 = "18xak3xnl38n8mbqa5rv3m70595y36yy2l5rwlhy1k9g66lfvwf8"; }; "af313d299a6ace9cd07fe010e73680f12b0b5147" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/af313d299a6ace9cd07fe010e73680f12b0b5147; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/af313d299a6ace9cd07fe010e73680f12b0b5147"; sha256 = "151bsqly7rqy1isklgjvy39bnbxqd3vyjbqaf60lgs6h81ggj5fn"; }; "af32114b8b970d1d65271ed99052f0de3d4651eb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/af32114b8b970d1d65271ed99052f0de3d4651eb; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/af32114b8b970d1d65271ed99052f0de3d4651eb"; sha256 = "1pg0r81c1rg9r6m80k3907s77j9mqh8xy2zaym734r3zvjamwf54"; }; "af412e3bcac064293cc367941ad02eddcc3e5a44" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/af412e3bcac064293cc367941ad02eddcc3e5a44; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/af412e3bcac064293cc367941ad02eddcc3e5a44"; sha256 = "1gzy8vni5d61pp6v5ns1ykmg2xcgcrm6gd2w90bxgjn7fjxbm6y0"; }; "af915ecf45e7ce1cfbc694f16a90c5131e953240" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/af915ecf45e7ce1cfbc694f16a90c5131e953240; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/af915ecf45e7ce1cfbc694f16a90c5131e953240"; sha256 = "192x7nbj1mkzvwcjmhaw65wpq0gkjsyx709dh4mkcrm6djw2si6v"; }; "afb2a10bcf6c13c0cfc4506cce58b6a4e8a8741d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/afb2a10bcf6c13c0cfc4506cce58b6a4e8a8741d; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/afb2a10bcf6c13c0cfc4506cce58b6a4e8a8741d"; sha256 = "0zqjqww51znppvgkgqinxa91zpwva3jwc8rd7x78f319f3wpka24"; }; "afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753"; sha256 = "0z2c3ac6ja8r82wr7fgbh6j9gpma7p1wxrwgqxdwysgys39z7dvr"; }; "afc1c36f600c80efcf810f3f49289880b32ab502" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/afc1c36f600c80efcf810f3f49289880b32ab502; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/afc1c36f600c80efcf810f3f49289880b32ab502"; sha256 = "1clkj01cmpgx51zlqbypjdarm1anispwmch98y87gsmhpbgmgm7l"; }; "afd3591b1c847bb2dca52c7bab74b7f00043a210" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621658-dcc28ef36e554dd28b121fd140f310e9/afd3591b1c847bb2dca52c7bab74b7f00043a210; + url = "http://cdn.unrealengine.com/dependencies/2621658-dcc28ef36e554dd28b121fd140f310e9/afd3591b1c847bb2dca52c7bab74b7f00043a210"; sha256 = "1ymdczzqabd5alr8j3gmisrljfvdlncb79d8n62dkxkgp0f894ix"; }; "aff26a6b13744512c90c853c58676ace9431b24a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/aff26a6b13744512c90c853c58676ace9431b24a; + url = "http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/aff26a6b13744512c90c853c58676ace9431b24a"; sha256 = "0g66byknihd0fkcd7h1bb7vbgzz8rsyjnkgf61sxbidxdis9v722"; }; "affb2ac1292b281f85114871becaf2e7a7adfa7e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/affb2ac1292b281f85114871becaf2e7a7adfa7e; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/affb2ac1292b281f85114871becaf2e7a7adfa7e"; sha256 = "0s90sfpjphy4zs3ccwfhhxjh9irr0x4sijjg1k9r5ixzn19klb77"; }; "b05b1e539b6610459cb8b45e8d0b48d4de00fa44" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/b05b1e539b6610459cb8b45e8d0b48d4de00fa44; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/b05b1e539b6610459cb8b45e8d0b48d4de00fa44"; sha256 = "0ac90aqnhkm3dvcm5ql5wg959v8y7pyjibppgran58sf0jph91v8"; }; "b08e33bfe04cad899bb61fb3d822e79b9203df59" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b08e33bfe04cad899bb61fb3d822e79b9203df59; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b08e33bfe04cad899bb61fb3d822e79b9203df59"; sha256 = "126xswxfgsv1yp33hvpxjfk4m22j3dvs4dhr83rpwqvyw139bxc8"; }; "b0ad17ab6dad98419386251c9553b4a5d0a73fad" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2597177-394deee1ae174b2db1462326aa83252a/b0ad17ab6dad98419386251c9553b4a5d0a73fad; + url = "http://cdn.unrealengine.com/dependencies/2597177-394deee1ae174b2db1462326aa83252a/b0ad17ab6dad98419386251c9553b4a5d0a73fad"; sha256 = "08rnn13hqbz2j70ldigc3ksa99jmc8gg9x5a2am545s5qw6p5myr"; }; "b0b3d44fba913897d01ea2ef6e8089c64f988ac6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b0b3d44fba913897d01ea2ef6e8089c64f988ac6; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b0b3d44fba913897d01ea2ef6e8089c64f988ac6"; sha256 = "0lq9vbdkw3cqn0w7zd78n1wpnldxkr3azp02786gqrcx3lgwxffr"; }; "b0f0802f90e19b137dfc3482c478ce06deda9019" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b0f0802f90e19b137dfc3482c478ce06deda9019; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b0f0802f90e19b137dfc3482c478ce06deda9019"; sha256 = "0ivpnd7z9pl4pkdxsmfn0qnxh5ny19zxh2jvsdkwzj6qk49r7w8x"; }; "b10f9ee97120ca6711610befa4e7fab7977b88e9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/b10f9ee97120ca6711610befa4e7fab7977b88e9; + url = "http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/b10f9ee97120ca6711610befa4e7fab7977b88e9"; sha256 = "0mf5w54jw7vsk1l8x613zhq9060cd6xj03cjk93pbmkizvy0hxc1"; }; "b1554d1196eebddea596b1a7274981d7a2670be4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b1554d1196eebddea596b1a7274981d7a2670be4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b1554d1196eebddea596b1a7274981d7a2670be4"; sha256 = "0rsf740756cc4samd688c81y49fsw1bkiipvahpj1h4kpqys8w4v"; }; "b16036ff8aa037d50175f1e65bd5504964b26e9a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b16036ff8aa037d50175f1e65bd5504964b26e9a; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b16036ff8aa037d50175f1e65bd5504964b26e9a"; sha256 = "034rljnxdmy11xhr3rpgzv4sdab87z3ybbrww0gvl0av3chmga5g"; }; "b176340bbc5d5b5bac78f855162c5a3ff0ba19ce" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/b176340bbc5d5b5bac78f855162c5a3ff0ba19ce; + url = "http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/b176340bbc5d5b5bac78f855162c5a3ff0ba19ce"; sha256 = "1ckgycqh4s28c0yq593d8405cz1g7pnmjpnnfvn3y8gn0yh8qb56"; }; "b176ee25e0ebb7afdb44613dac3f4254dc99ce2a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b176ee25e0ebb7afdb44613dac3f4254dc99ce2a; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b176ee25e0ebb7afdb44613dac3f4254dc99ce2a"; sha256 = "0jb1vsabmj29s03ghc2g48r9sjz2h4s96lvhkf6xgfgqi26nx0vq"; }; "b17f3e987930d01e04a825ded615a345c7af5ef7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/b17f3e987930d01e04a825ded615a345c7af5ef7; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/b17f3e987930d01e04a825ded615a345c7af5ef7"; sha256 = "1d4ibb02h26i5za5z7a9sj2cirvz8y93h2jxrb0llq9hfazzzgpv"; }; "b1bc628c3ffbbceef6e1ef0dfb467b793da712dc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b1bc628c3ffbbceef6e1ef0dfb467b793da712dc; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b1bc628c3ffbbceef6e1ef0dfb467b793da712dc"; sha256 = "1li9rf71003ixz42k3gcavfnnjjfgbp69qzxmddv7w8iykas5vli"; }; "b1cdfd2a0b486252f482eca80d3408be44b15168" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/b1cdfd2a0b486252f482eca80d3408be44b15168; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/b1cdfd2a0b486252f482eca80d3408be44b15168"; sha256 = "03ipjskn7j0ar4hz9n9w8r6m1wp3ag35n21sx3v594b332ma25cg"; }; "b1dfb94e146a98148e1f9ba9a56d7114a84628a8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/b1dfb94e146a98148e1f9ba9a56d7114a84628a8; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/b1dfb94e146a98148e1f9ba9a56d7114a84628a8"; sha256 = "09imd5nsrina53my95vsd4jm9400qz0kc7vik3aafga9648h5nj6"; }; "b1f44610d6ce19e42537f436c4bfc70e275b432a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/b1f44610d6ce19e42537f436c4bfc70e275b432a; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/b1f44610d6ce19e42537f436c4bfc70e275b432a"; sha256 = "1bfgybl30pgmjzvxiisy0bm6anh2nif2gc67a43ij0gxmbiigwyd"; }; "b20c27d04963b4b8e0c5dcfd81e51dfc59e30db2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b20c27d04963b4b8e0c5dcfd81e51dfc59e30db2; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b20c27d04963b4b8e0c5dcfd81e51dfc59e30db2"; sha256 = "1sfrx4dnqmp5d7j7xid8p0iv6fglbv7zsas1d1ig0knda2gc5c05"; }; "b24bbd337d9a9cf1085d4cd1df1e43e928749b90" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/b24bbd337d9a9cf1085d4cd1df1e43e928749b90; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/b24bbd337d9a9cf1085d4cd1df1e43e928749b90"; sha256 = "0qsi9g0vn6q49w8xkfghkrjhb32jczinnjiyp5isyb19802zc6vm"; }; "b2b40485507860ae0f1ba756693b78123347a60b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b2b40485507860ae0f1ba756693b78123347a60b; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b2b40485507860ae0f1ba756693b78123347a60b"; sha256 = "1y9i6ly60x5cyqf429ay00sy3f796ha65wcinjvsmixpgsqivm8h"; }; "b33175575bd5fbb07b2308fa24fbf8f548763435" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b33175575bd5fbb07b2308fa24fbf8f548763435; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b33175575bd5fbb07b2308fa24fbf8f548763435"; sha256 = "120489jn9bnsj3v4v6icl3pvcpzm27g3900l3k8f263b8qz52jpy"; }; "b33dbe936d08959ce00d8d551c9861052b05a0e3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/b33dbe936d08959ce00d8d551c9861052b05a0e3; + url = "http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/b33dbe936d08959ce00d8d551c9861052b05a0e3"; sha256 = "13l63iipsscfz4iqm9jsp68y0w1l2pmmg2skv5mnmlfm4ryq5dc5"; }; "b3643e64562cf8928fe74794820c500f305fac17" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/b3643e64562cf8928fe74794820c500f305fac17; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/b3643e64562cf8928fe74794820c500f305fac17"; sha256 = "1gy3p72p0v67psb8n5gqmw6skxavcamq7c5i3mgc5pmys2jmspqd"; }; "b386d93988dde07a87de09757eacd3a2ecfd6202" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b386d93988dde07a87de09757eacd3a2ecfd6202; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b386d93988dde07a87de09757eacd3a2ecfd6202"; sha256 = "1nmsqsm0g8zz3x4x5h3m2nf5ii5cqpr5x3kpcs5x9dpcsz1z5q9f"; }; "b3a267c43c45f392523e300a6f61318f4ae52d99" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/b3a267c43c45f392523e300a6f61318f4ae52d99; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/b3a267c43c45f392523e300a6f61318f4ae52d99"; sha256 = "1grivshi7cgmin5cab447s30byjlapnlcg010assxx36vgkhpihp"; }; "b3ba54dd3b4a9c7c235223aca9ad7d6007559484" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b3ba54dd3b4a9c7c235223aca9ad7d6007559484; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b3ba54dd3b4a9c7c235223aca9ad7d6007559484"; sha256 = "15as68yknbf35zv5638qfc8j4pwry8zbmhn8k0ycjzyi7c5gqqpv"; }; "b3df044bb928c0123e3067b6ca07bc8db2c7c93c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610298-3f4939c916b54d799ac5de807895697f/b3df044bb928c0123e3067b6ca07bc8db2c7c93c; + url = "http://cdn.unrealengine.com/dependencies/2610298-3f4939c916b54d799ac5de807895697f/b3df044bb928c0123e3067b6ca07bc8db2c7c93c"; sha256 = "1zcc27kh9mwhawpkfxishqhkngwp0ixasw091g0ydxvsawq7wikb"; }; "b4179284c669b70deca0e515159443b89dced17a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b4179284c669b70deca0e515159443b89dced17a; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b4179284c669b70deca0e515159443b89dced17a"; sha256 = "1yi9jlqh5chhq5zrsi6581d20hy4wva56dwvik7p5azcwkv7jh2i"; }; "b4411a92ba0b237e9dee0988897930e64daca1a7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b4411a92ba0b237e9dee0988897930e64daca1a7; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b4411a92ba0b237e9dee0988897930e64daca1a7"; sha256 = "17ffzs8zmcwf3znbc8jzja6db4kcgj4mnzf90g061k6bx29rrnxi"; }; "b44f92d2adf2245433cfea594b8718a8a1d0935a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b44f92d2adf2245433cfea594b8718a8a1d0935a; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b44f92d2adf2245433cfea594b8718a8a1d0935a"; sha256 = "0r5mqhyn811cbwspbi6l9yssx2w8pg6brv52g8qhwjiapr70p6xf"; }; "b453a1dc5c79a3ef309710fa63d80177fdb4c947" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b453a1dc5c79a3ef309710fa63d80177fdb4c947; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b453a1dc5c79a3ef309710fa63d80177fdb4c947"; sha256 = "0c331fw0hzzh15b0s1i0x52bmdlwwzyjxr9gj1rflm9i0h83xqk6"; }; "b4815536b7d3c4f5a1a07bf7a0a85f780d0a9a8f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/b4815536b7d3c4f5a1a07bf7a0a85f780d0a9a8f; + url = "http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/b4815536b7d3c4f5a1a07bf7a0a85f780d0a9a8f"; sha256 = "18r4lblc3zg86sfj27izlbgjdap2aw1hhx64s9aykj32k0slhq3k"; }; "b49270a6fb0733c3b9a3e6627fdc96c5b2b400f7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b49270a6fb0733c3b9a3e6627fdc96c5b2b400f7; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b49270a6fb0733c3b9a3e6627fdc96c5b2b400f7"; sha256 = "11v6h8xgr5lj7x8aakirdny73fsdidshg9ijhck7lq25sqrpg681"; }; "b49ba6bcffb62e7245700758aeb276ae404637e1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/b49ba6bcffb62e7245700758aeb276ae404637e1; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/b49ba6bcffb62e7245700758aeb276ae404637e1"; sha256 = "083hj8s2ihr85gb1lpy6zy2xfd7ilr3yr46jvv62i2v8v551y2ri"; }; "b4a7011b1f4b663e34e08b5caa1fe927463eb914" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2615623-07d97909df1d48be99bb54a411313382/b4a7011b1f4b663e34e08b5caa1fe927463eb914; + url = "http://cdn.unrealengine.com/dependencies/2615623-07d97909df1d48be99bb54a411313382/b4a7011b1f4b663e34e08b5caa1fe927463eb914"; sha256 = "1442aqg7ds4xxq80jsk7y2bhj2dgnm4bk8ma0kcdhy8qnmhwwvz3"; }; "b4b01b3870e9301073475bb924e5463d76e87c0f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b4b01b3870e9301073475bb924e5463d76e87c0f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b4b01b3870e9301073475bb924e5463d76e87c0f"; sha256 = "0720v8f1mgqrkxgdk85w3bj68kai90xy6i5gc5b9sbg3dgw1giss"; }; "b5b76e5c16852517072b42a8cb51945d692252b7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b5b76e5c16852517072b42a8cb51945d692252b7; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b5b76e5c16852517072b42a8cb51945d692252b7"; sha256 = "0cxz5vh3j0mf2vfr94v535zl3aa41m0ynydw3phmi45nws9rqck1"; }; "b5d004587689d2ebd79e34905d174a376e575f5f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b5d004587689d2ebd79e34905d174a376e575f5f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b5d004587689d2ebd79e34905d174a376e575f5f"; sha256 = "0gj82721n05pymy3fpghics0v2pi5ck1liqv0d6976y89anz7vlj"; }; "b63ccd1617b08574d0129948ec7ad1e48f94a220" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b63ccd1617b08574d0129948ec7ad1e48f94a220; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b63ccd1617b08574d0129948ec7ad1e48f94a220"; sha256 = "1i1l5aq5da080145qxraaj8mh5hpjwk3l6cdl1k3acn3y8rdyb27"; }; "b66bb0fd25eed1110f4b97f5f4c3cccd294cb884" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b66bb0fd25eed1110f4b97f5f4c3cccd294cb884; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b66bb0fd25eed1110f4b97f5f4c3cccd294cb884"; sha256 = "166m1j21yq89qpf3g8h7rdkcdzcnhcj6aps29n5yx1zgay6kq9sd"; }; "b66faabd2faed41ddcfaa83fbc45e1c038712800" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b66faabd2faed41ddcfaa83fbc45e1c038712800; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b66faabd2faed41ddcfaa83fbc45e1c038712800"; sha256 = "0lg35984x9q9y0binxrkdwnj4c910nj8wj41bsggwsmfdxz3vi1b"; }; "b6774cdd5b050cfcaac3143c0a8f89705c6bde71" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/b6774cdd5b050cfcaac3143c0a8f89705c6bde71; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/b6774cdd5b050cfcaac3143c0a8f89705c6bde71"; sha256 = "0xllvgabdrafyy0gh1plqnzbr9lwxw5xn357dc4bpz7a8nllnzpl"; }; "b6aa88050eb1fb1e9317e28c1342c6ea4ab7dbad" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/b6aa88050eb1fb1e9317e28c1342c6ea4ab7dbad; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/b6aa88050eb1fb1e9317e28c1342c6ea4ab7dbad"; sha256 = "1yxxvjhrj20m6jj26y53azikjw1jmdb1sc0l5876bkmwadl7rkyh"; }; "b6e51c5ce4619cf24deb50699e19457246a65fde" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/b6e51c5ce4619cf24deb50699e19457246a65fde; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/b6e51c5ce4619cf24deb50699e19457246a65fde"; sha256 = "00q6pplg3rq5wy73nj9gi0h14dvcnvsi0b51xbbbsvd6qnpgf9in"; }; "b751385c56ed5ce096df337d0a736bdb517071c0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/b751385c56ed5ce096df337d0a736bdb517071c0; + url = "http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/b751385c56ed5ce096df337d0a736bdb517071c0"; sha256 = "134snqqpd11yd05jgw199fpv41pnw94kh8fig3gmkv2rc0ppdrqc"; }; "b76100c79e2052b6a9156a3a3b44dc46b73ba80b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/b76100c79e2052b6a9156a3a3b44dc46b73ba80b; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/b76100c79e2052b6a9156a3a3b44dc46b73ba80b"; sha256 = "02igaa6r8rs8qk7235jvbryycz2v3cl4pd08ifwhg471w65zrwz9"; }; "b774b3a6af176fe17e8988b8ce8aae6fac0081c8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/b774b3a6af176fe17e8988b8ce8aae6fac0081c8; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/b774b3a6af176fe17e8988b8ce8aae6fac0081c8"; sha256 = "1vjz9m66hfr3anm75vfb815i0al393rq0y0w0nbi8l5nxayl2fr4"; }; "b792f771ba89b6e97aa0da38cab7975e31240901" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/b792f771ba89b6e97aa0da38cab7975e31240901; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/b792f771ba89b6e97aa0da38cab7975e31240901"; sha256 = "0wjqqiaj00ngyl6mzxqqpk4jbb4xngk6zcahs9jgiiwvr0fs31gr"; }; "b7cac0682cd1b758954a6990731d98ac60e931f4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/b7cac0682cd1b758954a6990731d98ac60e931f4; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/b7cac0682cd1b758954a6990731d98ac60e931f4"; sha256 = "1sjhah3cj62frm38rqs3v3mm0jmab39qx0ys39kgq15wl4gyhrs3"; }; "b7d98916d7231a6cc8fa4b5ba6d9a123af873b7c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/b7d98916d7231a6cc8fa4b5ba6d9a123af873b7c; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/b7d98916d7231a6cc8fa4b5ba6d9a123af873b7c"; sha256 = "1y0iwjm5hkwqxz17b69xfvl200nsyf86i2fdm4kcyf8wq99a905r"; }; "b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2386906-35f20c2d3732491bab9f172643aaf695/b7e5e66ec2b311c32f25563c90d3883eaf9d7f01; + url = "http://cdn.unrealengine.com/dependencies/2386906-35f20c2d3732491bab9f172643aaf695/b7e5e66ec2b311c32f25563c90d3883eaf9d7f01"; sha256 = "02c5s02nj5zab4w019bawz9xf3z253w2kjwsnxx0pjzcgzn5dsic"; }; "b8063b5f31f092324c94ccf41e3dbbca020714c6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b8063b5f31f092324c94ccf41e3dbbca020714c6; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b8063b5f31f092324c94ccf41e3dbbca020714c6"; sha256 = "0sx6wmnjqmka3838541dwi668lxdyf4z8ddyy3x94qcg7xr67hx8"; }; "b8147ae4f4e48c66013e2ce160e307bdbf8bb643" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b8147ae4f4e48c66013e2ce160e307bdbf8bb643; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b8147ae4f4e48c66013e2ce160e307bdbf8bb643"; sha256 = "0p9sv64h64pjq8g2p2wb7yvmfma1d3dyp1p26vq9pxyx5vaj6c0h"; }; "b8280b60d889420165c4849a608f2f77a636a96e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/b8280b60d889420165c4849a608f2f77a636a96e; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/b8280b60d889420165c4849a608f2f77a636a96e"; sha256 = "0vqj80qdwi1dfxgijzjgk9wwfkvf07khgyjjw05801vkkjj75nyb"; }; "b832b94004977756477412eec3019f6cb37e62d1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/b832b94004977756477412eec3019f6cb37e62d1; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/b832b94004977756477412eec3019f6cb37e62d1"; sha256 = "1vja9zxjlil78d20bmwq1cnzb99q2k3g2g75bpz51v6g5smnwwzm"; }; "b8394a23db9e6efd8594d13cde39d95e60a2b46d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b8394a23db9e6efd8594d13cde39d95e60a2b46d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b8394a23db9e6efd8594d13cde39d95e60a2b46d"; sha256 = "199qs2a3ii5353ijcg7vrd2qjz1ig0zs58qpywjkqq5gcx1h3d3a"; }; "b8692885cc79308225c50faa58244e7006dadf91" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/b8692885cc79308225c50faa58244e7006dadf91; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/b8692885cc79308225c50faa58244e7006dadf91"; sha256 = "0dmjw6wr6mb0y6ika02fnqngk9lghkm4hdwl2khlhzp25hn2ki6f"; }; "b88c8f32e5693eade30c534bf94f295df40e1d87" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2474673-cc4b4abcf8d5453d9c14a5ad304063e3/b88c8f32e5693eade30c534bf94f295df40e1d87; + url = "http://cdn.unrealengine.com/dependencies/2474673-cc4b4abcf8d5453d9c14a5ad304063e3/b88c8f32e5693eade30c534bf94f295df40e1d87"; sha256 = "0br9zqlnczmdcnay2lja9j6wahsi13182jvd823q0c5rz8r7y9ha"; }; "b8b07927a65a87a42232ceb51c98a8b5d6893348" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b8b07927a65a87a42232ceb51c98a8b5d6893348; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b8b07927a65a87a42232ceb51c98a8b5d6893348"; sha256 = "03kgb1qbibsrhf1h1xx6zlm0dckjymxbjkd0rr3r896xg10rgr5i"; }; "b8ddc52b5bf66003c85e7e259287f4741bfe8119" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b8ddc52b5bf66003c85e7e259287f4741bfe8119; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b8ddc52b5bf66003c85e7e259287f4741bfe8119"; sha256 = "1207ryz0lz26nw1vjnhicxn94xzf6i55h312xqgl3w1mz3l6m4pw"; }; "b8e153475935a408d91ca55c8e98030d5cc99ceb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2435859-13d694fe2b4f4b1b838326ec956dab4d/b8e153475935a408d91ca55c8e98030d5cc99ceb; + url = "http://cdn.unrealengine.com/dependencies/2435859-13d694fe2b4f4b1b838326ec956dab4d/b8e153475935a408d91ca55c8e98030d5cc99ceb"; sha256 = "1rv2kj03nacyhh3bddn2vsvh98ld3f1rizx71hg5q5qx5ikihabp"; }; "b8e9ff6bec00725cf169b237001ce72af9342600" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b8e9ff6bec00725cf169b237001ce72af9342600; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b8e9ff6bec00725cf169b237001ce72af9342600"; sha256 = "19cv6afmrykdhfwci6532yx560pc1l6a4z9k7fjh2y9zcgz5v38h"; }; "b8fd57460311ef331feabf98c510f76f80053855" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/b8fd57460311ef331feabf98c510f76f80053855; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/b8fd57460311ef331feabf98c510f76f80053855"; sha256 = "0xki6y0slv4g5wg8z323pa09z2s0v14pkmkas9h7j1z8jh2wczwi"; }; "b94c9f0d77457d47a979c48f936f9be3c11930e0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b94c9f0d77457d47a979c48f936f9be3c11930e0; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b94c9f0d77457d47a979c48f936f9be3c11930e0"; sha256 = "1nlg8bv50idaxxhawrxnwdr9s2cq31ac46s383lqmnxmbiyinx9q"; }; "b955f5ba1db0d7a6f27b22a2a79e008593d687e4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/b955f5ba1db0d7a6f27b22a2a79e008593d687e4; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/b955f5ba1db0d7a6f27b22a2a79e008593d687e4"; sha256 = "0ywsp3g116w2cbavbm6hiv6sm60zm74lix5j1ipliq9nlkkjfd6a"; }; "b9e5928d9d628a4f6a0795a3f4947e59fd82874e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/b9e5928d9d628a4f6a0795a3f4947e59fd82874e; + url = "http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/b9e5928d9d628a4f6a0795a3f4947e59fd82874e"; sha256 = "1p3sb9hzqi7isqpw3a4mzra1a56qrzvhrsc483qb8dpj85a134cr"; }; "ba2567e2e68ba6bc101c3614005d68fd1d0ac2c0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2624272-fa13935f6af5491e88fc623f350f6d60/ba2567e2e68ba6bc101c3614005d68fd1d0ac2c0; + url = "http://cdn.unrealengine.com/dependencies/2624272-fa13935f6af5491e88fc623f350f6d60/ba2567e2e68ba6bc101c3614005d68fd1d0ac2c0"; sha256 = "055hiysma8dhw6fxclbc87s8r24sqrs8hddri0alc3x3ckgx1xvr"; }; "ba59a62dae63fc2d143e0cf4c7c65185055b6cfc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ba59a62dae63fc2d143e0cf4c7c65185055b6cfc; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ba59a62dae63fc2d143e0cf4c7c65185055b6cfc"; sha256 = "0ds72np4k5a83wdianr988wl3l83ml4mmrv7xhq7knmxga11zgww"; }; "ba6332a94c99ed09c2a9e428e54763da5b1576f9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ba6332a94c99ed09c2a9e428e54763da5b1576f9; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ba6332a94c99ed09c2a9e428e54763da5b1576f9"; sha256 = "0hq06wfzqwddzmji8iwl93gn1h7bsrm5wydfhd2jdkvbchdjrng9"; }; "ba6a5b201e1374856d563e960e0a5f7a935cf37d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ba6a5b201e1374856d563e960e0a5f7a935cf37d; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ba6a5b201e1374856d563e960e0a5f7a935cf37d"; sha256 = "0i3lsazrz4d5y8k4569jc9qyr45r5mkp1bkm705ah2ykli1mwvgn"; }; "ba8f3a342d5ba472b330c322376f9f3d7921dcd3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/ba8f3a342d5ba472b330c322376f9f3d7921dcd3; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/ba8f3a342d5ba472b330c322376f9f3d7921dcd3"; sha256 = "1m04gn311csvzbn4qmass7v0zpwgc6gb9bh76xk1nqirzm1sqjjx"; }; "bad3d27e656261f89d7bfe9409032b1623077a17" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bad3d27e656261f89d7bfe9409032b1623077a17; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bad3d27e656261f89d7bfe9409032b1623077a17"; sha256 = "0j6q8pjr2iazpk2ljdxaa0f4m4nsw1bvgpqbnl3l7s8514r98yj5"; }; "bb049becabe678eba91b10ef8dceac666811ba85" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bb049becabe678eba91b10ef8dceac666811ba85; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bb049becabe678eba91b10ef8dceac666811ba85"; sha256 = "1gzd6j43gq4w5zrib4ww8ipdhkh8zmzfkiq55wwmfk6jpqqxyaxv"; }; "bb258d693db2159bec8923eb69e53769e0082936" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/bb258d693db2159bec8923eb69e53769e0082936; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/bb258d693db2159bec8923eb69e53769e0082936"; sha256 = "0pgvj37zvrrxrpkd3a3iwp7d2kyd5c854vsbksq24cpjbdmdiazf"; }; "bb2be5134bddeb480f0a728bd702988afdd4811f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/bb2be5134bddeb480f0a728bd702988afdd4811f; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/bb2be5134bddeb480f0a728bd702988afdd4811f"; sha256 = "0z85frk7i22ql1flrnyipp5vwlyy2j5fw6nyx04pjhv8i0d86ims"; }; "bb5ab39ad700a8ef35bb3bbd27b4c382839c69ea" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/bb5ab39ad700a8ef35bb3bbd27b4c382839c69ea; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/bb5ab39ad700a8ef35bb3bbd27b4c382839c69ea"; sha256 = "1p8q27cjb4mxn8y3x4l61z880bxs0swn6a8zgrmyzdmcxxnrkbck"; }; "bb77f99554309b937e1c3bc3c0569d3ef0568a00" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/bb77f99554309b937e1c3bc3c0569d3ef0568a00; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/bb77f99554309b937e1c3bc3c0569d3ef0568a00"; sha256 = "12kyhxb2sxk0n0j7xnsqccrmf6svsblpmg9hgx5p84qr1wwi3l8g"; }; "bbb17328cc23f4bf942377d41807a13a7b852229" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bbb17328cc23f4bf942377d41807a13a7b852229; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bbb17328cc23f4bf942377d41807a13a7b852229"; sha256 = "13nj59zrhss1z8czcahqsljdgjbpcrn7ajyz2v0nvhlxv5zvqk56"; }; "bbcf231dbaac1a61eba6aa76798c72923c7ddc56" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/bbcf231dbaac1a61eba6aa76798c72923c7ddc56; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/bbcf231dbaac1a61eba6aa76798c72923c7ddc56"; sha256 = "1zqi6x73wj86nzsnq3gc19f25s0hzjc72zhhn3k2mmmzg6c5rk06"; }; "bbd3ed12cac3a5812ed814525f0d0018011bcd2f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/bbd3ed12cac3a5812ed814525f0d0018011bcd2f; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/bbd3ed12cac3a5812ed814525f0d0018011bcd2f"; sha256 = "13k4nj6cls0bm9fbfznanlpaxi6rf5cl96fjzdh5knakhr5pg4vb"; }; "bbdc2b6ed549549505ee1860ea5068ae5bfc7db2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/bbdc2b6ed549549505ee1860ea5068ae5bfc7db2; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/bbdc2b6ed549549505ee1860ea5068ae5bfc7db2"; sha256 = "04vf62h854l2bby4a101c4wcngvzh04n0agv8kckjbxd4484kqkh"; }; "bc249eda4e4d0e13fd0e6a660e8cb471ace80c0a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/bc249eda4e4d0e13fd0e6a660e8cb471ace80c0a; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/bc249eda4e4d0e13fd0e6a660e8cb471ace80c0a"; sha256 = "01saqqwf52fg5cv3cbf7kx80pa5lp6n70wjc1vzkx322sz1d37wc"; }; "bc927fee31049f8467d1a02704ac805cef57cb71" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/bc927fee31049f8467d1a02704ac805cef57cb71; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/bc927fee31049f8467d1a02704ac805cef57cb71"; sha256 = "03zny0fk95qr83wrdhhnb6knygc8m4y4z1b45m89gvxjz3s7qz9g"; }; "bca8b698f2e07aaa627a4e94587fdef669602b23" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716370-1fe4be93d0274863a43a7797419557e3/bca8b698f2e07aaa627a4e94587fdef669602b23; + url = "http://cdn.unrealengine.com/dependencies/2716370-1fe4be93d0274863a43a7797419557e3/bca8b698f2e07aaa627a4e94587fdef669602b23"; sha256 = "1rdpv3fci2l9q3802wajkr1b8as0g17g1mnzyzndsr68jwafn4sf"; }; "bcb92df46de5890dc5538dd7f0256a6504653c01" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bcb92df46de5890dc5538dd7f0256a6504653c01; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bcb92df46de5890dc5538dd7f0256a6504653c01"; sha256 = "1rfdcc2ap488hr67sbpdafc3g4kpxhqv49yjqm9aygj9pb237amw"; }; "bcc1b9fa37b696e2b1e09da24ada79401007ef3b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bcc1b9fa37b696e2b1e09da24ada79401007ef3b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bcc1b9fa37b696e2b1e09da24ada79401007ef3b"; sha256 = "1g113bj35nm7nm0xabfdsrbx5p02cqynp2xr5m656k3iln0q57fg"; }; "bcc352fe44e93b30ce97deea8345406542f840d7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/bcc352fe44e93b30ce97deea8345406542f840d7; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/bcc352fe44e93b30ce97deea8345406542f840d7"; sha256 = "0m5vf9x58s47bm4x1vrrs0hrv4pjiy1a6qxx36qrsrqfv6shb6k0"; }; "bcd0cabdfbee7db486a249459af2c96bbe597c9b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/bcd0cabdfbee7db486a249459af2c96bbe597c9b; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/bcd0cabdfbee7db486a249459af2c96bbe597c9b"; sha256 = "1gl16fgzp7ljwablwn7n7l6d27m2vfiwycwpqag3nmvcqmsa236c"; }; "bd11c74bd2655f16eff2974a9ea3299f642a52cf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bd11c74bd2655f16eff2974a9ea3299f642a52cf; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bd11c74bd2655f16eff2974a9ea3299f642a52cf"; sha256 = "168rzxjij3dpqjymrqyqqgablffs3mgqfhmi4fnd31mpq1cmx7lf"; }; "bd969e12b2d210ce0b8817860e18034a3a30c510" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bd969e12b2d210ce0b8817860e18034a3a30c510; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bd969e12b2d210ce0b8817860e18034a3a30c510"; sha256 = "0yal1m4cpkd4nqfarccf5z7szaz46k1cflv9v0797dlk81zgrwjh"; }; "bdd022a7d16d25b6d56f693ab8ddb909273da156" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/bdd022a7d16d25b6d56f693ab8ddb909273da156; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/bdd022a7d16d25b6d56f693ab8ddb909273da156"; sha256 = "1zqrs5nan5ipaxf392f25ynyppxfc5zq9nafq15ic4z7a5az2nz7"; }; "be2367fa9ac1bcb508f247e19ea18ae92e277583" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/be2367fa9ac1bcb508f247e19ea18ae92e277583; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/be2367fa9ac1bcb508f247e19ea18ae92e277583"; sha256 = "1pffz2clg1ql5d14an4y6g6i148vxiai2kq2hzkbvv23hgmhczlz"; }; "be250ea55f51ad2bfa64247db8ab7f7ba22bcc99" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/be250ea55f51ad2bfa64247db8ab7f7ba22bcc99; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/be250ea55f51ad2bfa64247db8ab7f7ba22bcc99"; sha256 = "1hrj2ggi584mlc8nxpniczsyj4xcgygf3adi7xql5vmmb5h8gvim"; }; "be6492e4410913060da03bbab7fc0ce412e8bb38" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/be6492e4410913060da03bbab7fc0ce412e8bb38; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/be6492e4410913060da03bbab7fc0ce412e8bb38"; sha256 = "0mpw68bffg01n0g5706nllhck685n32fy1fbg4fs6hk199ddz252"; }; "be6c1ac56f7b742b9f733b29f46549c5b46f7644" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/be6c1ac56f7b742b9f733b29f46549c5b46f7644; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/be6c1ac56f7b742b9f733b29f46549c5b46f7644"; sha256 = "1m4kszd8nqb7xwgmbf14d5ndfpjf1li2w7wsg00km3d5plsl1458"; }; "be8aba4af0c0804bb17d6ce660ccc3973fb6c35d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/be8aba4af0c0804bb17d6ce660ccc3973fb6c35d; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/be8aba4af0c0804bb17d6ce660ccc3973fb6c35d"; sha256 = "0y77nmzw5hg874iw4y69qmyiz5xg0kr685gprs4nhx09ia4j0c91"; }; "bee8e68740f8d36a56d9f09e880ff29b5adf0496" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/bee8e68740f8d36a56d9f09e880ff29b5adf0496; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/bee8e68740f8d36a56d9f09e880ff29b5adf0496"; sha256 = "1xkdq0792shkjmgf48j4cy4pf3d710zx91g2xmbjfax892n5k1lc"; }; "bf03069e8d65f6b224763824352cf754ebcbc339" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bf03069e8d65f6b224763824352cf754ebcbc339; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bf03069e8d65f6b224763824352cf754ebcbc339"; sha256 = "1kv8kfwh0bki0zdfimhkrhib56p2bj02by25dmhqvg39r480rs36"; }; "bf03cada636a04cf211c2e10d586f47b2dda7902" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/bf03cada636a04cf211c2e10d586f47b2dda7902; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/bf03cada636a04cf211c2e10d586f47b2dda7902"; sha256 = "085zw12vjkdg9r3lki1wnzm8981d7mlzvsgihb7v34zh77idy2vd"; }; "bf30590744b68cebf21b6124ffdccdf6964f7163" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bf30590744b68cebf21b6124ffdccdf6964f7163; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bf30590744b68cebf21b6124ffdccdf6964f7163"; sha256 = "08dd0mg3p60gmzqh0dyfj65icyaa7q44daidqwdbd62h9yxxf9c3"; }; "bf49c9dd965903acaa8c00eba5613c4de5fe0250" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bf49c9dd965903acaa8c00eba5613c4de5fe0250; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bf49c9dd965903acaa8c00eba5613c4de5fe0250"; sha256 = "08ga8yhh586h0yc0i2n3a28wmwbzlhz57va40rq269dx93gap3mn"; }; "bf4dda70b776a7efb6c3302f7abb3d24e90652d7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2579917-73d6be760fd9486fbc9abe582732eb6e/bf4dda70b776a7efb6c3302f7abb3d24e90652d7; + url = "http://cdn.unrealengine.com/dependencies/2579917-73d6be760fd9486fbc9abe582732eb6e/bf4dda70b776a7efb6c3302f7abb3d24e90652d7"; sha256 = "0m11crr85b0315yvb4n4pwvzg24zdwgqzw0c5yf1kvjdzkm1z8w7"; }; "bf920c60bfd2a78e29432783f56c62f419515f85" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/bf920c60bfd2a78e29432783f56c62f419515f85; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/bf920c60bfd2a78e29432783f56c62f419515f85"; sha256 = "1rvkpgzckmwrn4bndlq6zc38kc0wj4y6lv0xv26harw3z467fzbp"; }; "bfed7e9e92de3969ace22aefdf5d85a45b2068c5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/bfed7e9e92de3969ace22aefdf5d85a45b2068c5; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/bfed7e9e92de3969ace22aefdf5d85a45b2068c5"; sha256 = "0srdb9aahfik14g4s2b7j6ff73g139iqx36fnm86nalf09digdnp"; }; "bff70448477367ce462c3ee06f051b1f047549ad" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613445-f4cf430b68ba4dbf80d97361d7c5dd6e/bff70448477367ce462c3ee06f051b1f047549ad; + url = "http://cdn.unrealengine.com/dependencies/2613445-f4cf430b68ba4dbf80d97361d7c5dd6e/bff70448477367ce462c3ee06f051b1f047549ad"; sha256 = "1z2jva1iph244fay5f84srg2wpji4gyfv6qss3130i0yzwlbkpqd"; }; "c0078092106c7019d3c1a17afb492202a59101b2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/c0078092106c7019d3c1a17afb492202a59101b2; + url = "http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/c0078092106c7019d3c1a17afb492202a59101b2"; sha256 = "0k2i5d1lylbjq7wzi7hzazq5hhyiav9yjpc5y26dz5d2l06nc43i"; }; "c007855aa7a0479a01364a56f831920abf69f840" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/c007855aa7a0479a01364a56f831920abf69f840; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/c007855aa7a0479a01364a56f831920abf69f840"; sha256 = "1cjd5amlgpgqr7fm98g515qd3hl169mw4lg7i7hv9h4d6jrynxrh"; }; "c02b5a7580fbfb67eb000c6b641d7431e90ce87f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/c02b5a7580fbfb67eb000c6b641d7431e90ce87f; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/c02b5a7580fbfb67eb000c6b641d7431e90ce87f"; sha256 = "1iri4r9nrv07sd060d1iy31pp584svm3470rxb0a82wdifh592k5"; }; "c0476a6a0442712d3245a0babbf62c40e8e75b95" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/c0476a6a0442712d3245a0babbf62c40e8e75b95; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/c0476a6a0442712d3245a0babbf62c40e8e75b95"; sha256 = "134j96dp2yy1n19mbh15cdbwwfi5kfi37bb36vc3jbpbispgbiw7"; }; "c05811bfedda9e7307a79810ed22e36c9b1e3639" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2728442-495b054ed4db444082c281db65b26f74/c05811bfedda9e7307a79810ed22e36c9b1e3639; + url = "http://cdn.unrealengine.com/dependencies/2728442-495b054ed4db444082c281db65b26f74/c05811bfedda9e7307a79810ed22e36c9b1e3639"; sha256 = "11jrzgkzjhnvzl26rq4cg64rn1w354fivkp0kmpn4l323ih89hlw"; }; "c059220dd6a95113a01bfba79f5ed3d5e1766535" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c059220dd6a95113a01bfba79f5ed3d5e1766535; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c059220dd6a95113a01bfba79f5ed3d5e1766535"; sha256 = "1hlhsmrqkmivz7cgsj1r7g041fkgjqvff5dcafm6zfh9invjminv"; }; "c0890e191c0abbf571bc8e71dd0996ecee557a66" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c0890e191c0abbf571bc8e71dd0996ecee557a66; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c0890e191c0abbf571bc8e71dd0996ecee557a66"; sha256 = "0gnmkajymhhvkygd35qbqbdfza3msjpsziwapr4l7fkzwn9nw4b6"; }; "c0c041729c29323273ff25722a4fde1aa90a2b9a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2388509-1346da53605048a5b86087c481124153/c0c041729c29323273ff25722a4fde1aa90a2b9a; + url = "http://cdn.unrealengine.com/dependencies/2388509-1346da53605048a5b86087c481124153/c0c041729c29323273ff25722a4fde1aa90a2b9a"; sha256 = "1kg32w0qqnsz45fpwj9vqcnnvn03f6m7ngswi5gni3asg3xxnlfa"; }; "c0c56d20bbce88d3e626d132185502535d37ae8c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c0c56d20bbce88d3e626d132185502535d37ae8c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c0c56d20bbce88d3e626d132185502535d37ae8c"; sha256 = "1zijd325z8zvmz78qi34vn7bwc6glw0bv07av8kyxxl3q08yyi5y"; }; "c1023e403c67693d0cda4a7067f08cc4868b331f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/c1023e403c67693d0cda4a7067f08cc4868b331f; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/c1023e403c67693d0cda4a7067f08cc4868b331f"; sha256 = "1z1ridxkw4v62r7wpy8p3a2pvbbk5s6fvnb3pj6risyd2nalnx84"; }; "c1348ebfc2f62edbbaf065a9987835d16f3faebe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c1348ebfc2f62edbbaf065a9987835d16f3faebe; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c1348ebfc2f62edbbaf065a9987835d16f3faebe"; sha256 = "1rbz1jawc4rga0r0153w48n10b5gvamv0356iw79pjag6naylb2z"; }; "c1621ab3068dbffadc595d03ef2ca486f7a5d484" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c1621ab3068dbffadc595d03ef2ca486f7a5d484; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c1621ab3068dbffadc595d03ef2ca486f7a5d484"; sha256 = "005d8nk35149kqw2jy0bmfkgs036ymj6khdpgyhybafyqns3kxl5"; }; "c16c7518b7bf0b8838fb4ec5d024020f7d7dcd2c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c16c7518b7bf0b8838fb4ec5d024020f7d7dcd2c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c16c7518b7bf0b8838fb4ec5d024020f7d7dcd2c"; sha256 = "0v3frxr6pb15y1m6lvkblhhy08k67vbcnjxb0r6pldqqgr10w74d"; }; "c18d93c3fb088e46dc560285a889e191b2350e3b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c18d93c3fb088e46dc560285a889e191b2350e3b; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c18d93c3fb088e46dc560285a889e191b2350e3b"; sha256 = "1gpivr38hx21v5vclbgrbzjdg0ly1ksrdx03vnkjzm2f2564qany"; }; "c1aea1c747a9068d40e613d94eaf43b511d8008c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/c1aea1c747a9068d40e613d94eaf43b511d8008c; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/c1aea1c747a9068d40e613d94eaf43b511d8008c"; sha256 = "0b7vs9yh0hl73zn5q7lxgwj898rh3qmphsmrab9b2byfbj4mk76k"; }; "c1d09face93090ba4fb6700351d2c5202a35a2f7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c1d09face93090ba4fb6700351d2c5202a35a2f7; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c1d09face93090ba4fb6700351d2c5202a35a2f7"; sha256 = "117cl93bgd91lpp7xd6sr87xcr1j8bsam637khgdcw8mj5k3npqz"; }; "c25bec168e93ab9183b4187a3172187d41e8b094" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/c25bec168e93ab9183b4187a3172187d41e8b094; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/c25bec168e93ab9183b4187a3172187d41e8b094"; sha256 = "0pgzkljpjj8r7l7b6bqqrvqhqcv67r4drbdlq0fqw1cgpspvk9zi"; }; "c260984388b36733a83e5c5a2d1bddf9202de51e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c260984388b36733a83e5c5a2d1bddf9202de51e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c260984388b36733a83e5c5a2d1bddf9202de51e"; sha256 = "1qd8vzscnfygqbmwxf61df75j565jr052igscsrq2jy79ls6gndz"; }; "c28e42653d329ca15b9b65ef130aa7e18df44da4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716370-1fe4be93d0274863a43a7797419557e3/c28e42653d329ca15b9b65ef130aa7e18df44da4; + url = "http://cdn.unrealengine.com/dependencies/2716370-1fe4be93d0274863a43a7797419557e3/c28e42653d329ca15b9b65ef130aa7e18df44da4"; sha256 = "0bsbd40nwyx5592fs2clf6bf7am52fswa68lkpqdimq5srabwcyf"; }; "c299da387c827b828bdc3e81fb617c8992d1ffbe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c299da387c827b828bdc3e81fb617c8992d1ffbe; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c299da387c827b828bdc3e81fb617c8992d1ffbe"; sha256 = "1lfv6s7cjfibbyn89pwc15xfmz0ismcsd8hjna9a9isbi9bfqf8r"; }; "c2b5d2cc4aa67357f3ee15def8c1d137016f723e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/c2b5d2cc4aa67357f3ee15def8c1d137016f723e; + url = "http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/c2b5d2cc4aa67357f3ee15def8c1d137016f723e"; sha256 = "0y15qbgnfx0av2qlnff4xj0n1njnq00agxlr7sr0xwqabkkzlm9y"; }; "c2c0e9b8e4352e01ad72f4a6d2ce4e6c0c26878e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c2c0e9b8e4352e01ad72f4a6d2ce4e6c0c26878e; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c2c0e9b8e4352e01ad72f4a6d2ce4e6c0c26878e"; sha256 = "1b50br0m1ff7haidcqhnn3ggxa0jf57bsnzq1h90320ciszkk3rj"; }; "c2d1aa057a438fe3a8996316005b4f584d087df7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/c2d1aa057a438fe3a8996316005b4f584d087df7; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/c2d1aa057a438fe3a8996316005b4f584d087df7"; sha256 = "1fdgibvi2aiy9xd3xjvv6fm5qvz2bsmax9v648sb8gdlvp1a2s1i"; }; "c3390a1d1d84fd03f5aa0a105422b669c9f6ab91" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/c3390a1d1d84fd03f5aa0a105422b669c9f6ab91; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/c3390a1d1d84fd03f5aa0a105422b669c9f6ab91"; sha256 = "16gmb4j6ky53h7lzyccd59aidqxyvjiq9bh43m326jwvbnmcr7lg"; }; "c3a4ce7861427e417e289e118620ba02ecec6995" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c3a4ce7861427e417e289e118620ba02ecec6995; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c3a4ce7861427e417e289e118620ba02ecec6995"; sha256 = "03qqa0w3p8isci9243jsivlrzzw0scf5w6371jfs4h109fw0qg6b"; }; "c40ca2cfe00fdc980844d0a02dfb2571b7fe48c3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c40ca2cfe00fdc980844d0a02dfb2571b7fe48c3; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c40ca2cfe00fdc980844d0a02dfb2571b7fe48c3"; sha256 = "0cxr3qncsx37g69labw8lz622yn9rjxybagd6wrf1bgvacg9f8kv"; }; "c430a47ee45e5afb9a0831bf2ea38b466b497549" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c430a47ee45e5afb9a0831bf2ea38b466b497549; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c430a47ee45e5afb9a0831bf2ea38b466b497549"; sha256 = "1bz6j9s06jn1nwyiczama8axg707vd5ny6p44i905z7z2r46s5nj"; }; "c431002fc0e408cf00a8650910c2f4bb3b85df53" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/c431002fc0e408cf00a8650910c2f4bb3b85df53; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/c431002fc0e408cf00a8650910c2f4bb3b85df53"; sha256 = "01dc7m14cdf4dmc389d3wng39chqj7wiisxzzm83knbjdihrhfrp"; }; "c461017451f8ce7d5833a200e5d6fa969138fc0f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/c461017451f8ce7d5833a200e5d6fa969138fc0f; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/c461017451f8ce7d5833a200e5d6fa969138fc0f"; sha256 = "1bm0alxlmrkzrrv23s2qab55wxccl3vkhq2srzcw2fnvi407gzif"; }; "c467b9d4b67580014c04e62e822a99d7cd7a6dbb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c467b9d4b67580014c04e62e822a99d7cd7a6dbb; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c467b9d4b67580014c04e62e822a99d7cd7a6dbb"; sha256 = "0jw6ppirc57wqn41x1c4c9x6i8xrxy8yjwk999rz0swf4dwambx0"; }; "c4ac8e5f2224886f32727c69401d26eaf54e6d17" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c4ac8e5f2224886f32727c69401d26eaf54e6d17; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c4ac8e5f2224886f32727c69401d26eaf54e6d17"; sha256 = "05lsv3lpg7sa57q6vm98iskxmmza487nppahzqnc4g7h16k7x0v9"; }; "c4d70abc45c0067c48d200a7195e87cb07990867" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c4d70abc45c0067c48d200a7195e87cb07990867; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c4d70abc45c0067c48d200a7195e87cb07990867"; sha256 = "12lbg924x6g1zq6bq0ah54k1vgj5bplayizb4ihrn28sgfmc9y29"; }; "c54921d21c20e7c27fee9dadcf212291b32f32de" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c54921d21c20e7c27fee9dadcf212291b32f32de; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c54921d21c20e7c27fee9dadcf212291b32f32de"; sha256 = "0yb7amg4pnaz7fjqwmjsydz6wig9rqig5wv74zpmc9yalxyfym5k"; }; "c57259f627108af7691176d6a5ab0a8bdb504fe8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c57259f627108af7691176d6a5ab0a8bdb504fe8; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c57259f627108af7691176d6a5ab0a8bdb504fe8"; sha256 = "0426ssgyxinyvqq69hcah4ddl249ic412bdvlgwfx10m636h7nk4"; }; "c58fa62bd83bf317b52d835b43fe31cb0a5fed9c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c58fa62bd83bf317b52d835b43fe31cb0a5fed9c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c58fa62bd83bf317b52d835b43fe31cb0a5fed9c"; sha256 = "0s66g3ggy0zz70p6vs4qwkwgv3jnk2b2y3a7rh58385gg3dk4ccm"; }; "c596e1a5af08148c69666476cb7a935d5b860e04" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c596e1a5af08148c69666476cb7a935d5b860e04; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c596e1a5af08148c69666476cb7a935d5b860e04"; sha256 = "0sglq3myrvkw38gah4pgpslrsfrx7j1h9dxbx8dbykzjzprf3i0j"; }; "c620a0e05618810252d4b0f8e82fe97a677dde26" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c620a0e05618810252d4b0f8e82fe97a677dde26; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c620a0e05618810252d4b0f8e82fe97a677dde26"; sha256 = "1i95wlgkq1d3m7k4qdfm5h6vs2m0f45d6hpcg3dj8jxy5zvqsgmq"; }; "c63b8b65198dbac3e3764c69e57b85f011332ea1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c63b8b65198dbac3e3764c69e57b85f011332ea1; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c63b8b65198dbac3e3764c69e57b85f011332ea1"; sha256 = "0ybhwi57ic2c0xshlj2jw9y0rmmnn9yy22dff4c51mj08g9xqjr0"; }; "c64839804e94445b7c1ac409d5d0f8f1ea36e54c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c64839804e94445b7c1ac409d5d0f8f1ea36e54c; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c64839804e94445b7c1ac409d5d0f8f1ea36e54c"; sha256 = "00s8l1sr0cfkchqyhfvp0ix3fpf10a2smj93xibimkh9lfaz6i35"; }; "c650d7a313cf559c35793ae4885bfb7ab7e24cd2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2597174-0975f975d1f0463f931b68ea4b0ef6d0/c650d7a313cf559c35793ae4885bfb7ab7e24cd2; + url = "http://cdn.unrealengine.com/dependencies/2597174-0975f975d1f0463f931b68ea4b0ef6d0/c650d7a313cf559c35793ae4885bfb7ab7e24cd2"; sha256 = "1j9rkf1zys5sygijb650s5si25s95hfh6v5z2ahii1gylkrn7lh5"; }; "c653b9ebfd67dfad854b519e55534735d82f73f2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c653b9ebfd67dfad854b519e55534735d82f73f2; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c653b9ebfd67dfad854b519e55534735d82f73f2"; sha256 = "0s2fq88ay1080qqf3qlvh7g0sddbbs8a0jvb6992wbbb0y23839a"; }; "c705af8ab47f089acd3efa03df30ad116079209c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c705af8ab47f089acd3efa03df30ad116079209c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c705af8ab47f089acd3efa03df30ad116079209c"; sha256 = "0dmpf4agrq74ga9sgp8qlb4wsps3fg33jiv0x8mj82d9h064y4li"; }; "c77e5ef4d0349554ba75af77135182db3577571a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/c77e5ef4d0349554ba75af77135182db3577571a; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/c77e5ef4d0349554ba75af77135182db3577571a"; sha256 = "03gir460iljc089y523fqlxvbp7sq1n9v6ldi6ij52fpm6wvzid1"; }; "c78d32aaf4ea80b2746ac7ad1692b021b1b548b7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c78d32aaf4ea80b2746ac7ad1692b021b1b548b7; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c78d32aaf4ea80b2746ac7ad1692b021b1b548b7"; sha256 = "1gwakfigb6bxjjr2scx753kjjvxy32npc5s5l3jqiidw27mbwrjh"; }; "c7945d9532844fa35363f33da23f208a629dbe28" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c7945d9532844fa35363f33da23f208a629dbe28; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c7945d9532844fa35363f33da23f208a629dbe28"; sha256 = "1g43sj9v065rvg73jynaycnp3jlw9cngbzr0lv4jyiip8ycd9m7z"; }; "c7a7c3acf3dd7cd611ae94f5c86473ecd3a2955b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c7a7c3acf3dd7cd611ae94f5c86473ecd3a2955b; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c7a7c3acf3dd7cd611ae94f5c86473ecd3a2955b"; sha256 = "1nh8drrb4sk4sid00m2l41pwz01n752jxn7xcxdjfgf1qri7gmfp"; }; "c7d451a7ac00e4726f44c4fb551c45dfd4614302" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/c7d451a7ac00e4726f44c4fb551c45dfd4614302; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/c7d451a7ac00e4726f44c4fb551c45dfd4614302"; sha256 = "0fmsf826chnq5lsfqgp8ndys4aa6v9gpsq3jcwwak3kl8vni21x8"; }; "c7ea7e43fc1d7ff54a1a54b74c3962098d7851bb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c7ea7e43fc1d7ff54a1a54b74c3962098d7851bb; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c7ea7e43fc1d7ff54a1a54b74c3962098d7851bb"; sha256 = "0gxk8c51f6hsx98sx6f4laqmcc3ln3sslr8848blqwvnhwy3fqfn"; }; "c7fb09c7cbdf7c014549eb2b9c1345a0f2ac3770" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2714108-1287c19490104fa7a8ca7bc71daf7ae8/c7fb09c7cbdf7c014549eb2b9c1345a0f2ac3770; + url = "http://cdn.unrealengine.com/dependencies/2714108-1287c19490104fa7a8ca7bc71daf7ae8/c7fb09c7cbdf7c014549eb2b9c1345a0f2ac3770"; sha256 = "1c51kddffr04xf65sykxy8lmx25066gcrz881m7iwx20l5rnlc1m"; }; "c840da0835818272e18eacdd15f50e802453c69c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c840da0835818272e18eacdd15f50e802453c69c; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c840da0835818272e18eacdd15f50e802453c69c"; sha256 = "137193jraim288jy64k6sinwg4pqhc6cchspxjzzn8h7dzfbmyjr"; }; "c874ee18eb2aefe1e6d4345996da6c6ce2087d43" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/c874ee18eb2aefe1e6d4345996da6c6ce2087d43; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/c874ee18eb2aefe1e6d4345996da6c6ce2087d43"; sha256 = "09i5kmida7s8zw8az2b1wxnsradjfv47hiy20fkrdqhpz0ra8lh7"; }; "c884f0dbf617ea1c10f5b347fd4f19d3d87befb2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c884f0dbf617ea1c10f5b347fd4f19d3d87befb2; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c884f0dbf617ea1c10f5b347fd4f19d3d87befb2"; sha256 = "1nhrhkzlvfdb4lp0v2syiwpd13sjx0z390wh404197p31xjwjvyq"; }; "c88fb38c74260fca80491abeaa7a26fd116fba25" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c88fb38c74260fca80491abeaa7a26fd116fba25; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c88fb38c74260fca80491abeaa7a26fd116fba25"; sha256 = "0bk6g0fns1g08zghm5nf2wipbcxzwprcg106d9rifgsq4w1bxk7i"; }; "c8fcf9a784756d66ad119b3e642423161380add6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2572690-84e70917b1c64a80b248151191ccd58a/c8fcf9a784756d66ad119b3e642423161380add6; + url = "http://cdn.unrealengine.com/dependencies/2572690-84e70917b1c64a80b248151191ccd58a/c8fcf9a784756d66ad119b3e642423161380add6"; sha256 = "1ixadgvvl3w9wirikl6fsj3g7lkbji4pa67pplys3fxd3rwflzqg"; }; "c939abca16161626114a6afa440cfb71ae87dc6d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/c939abca16161626114a6afa440cfb71ae87dc6d; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/c939abca16161626114a6afa440cfb71ae87dc6d"; sha256 = "1mqhplp4zkxr2qzcl4xdqgh8ng5yhgrmjqsm5g04zlyn1xb46ghi"; }; "c93c98cb950c9d8f504bea894ad865f29b9991ec" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2528371-50b896349a4f4b48b4cce5ef240b0c45/c93c98cb950c9d8f504bea894ad865f29b9991ec; + url = "http://cdn.unrealengine.com/dependencies/2528371-50b896349a4f4b48b4cce5ef240b0c45/c93c98cb950c9d8f504bea894ad865f29b9991ec"; sha256 = "006lrid8py6qhn21gi6n80nfd4y7v29xpjz8c80q8a4p1klayvkr"; }; "c93f0a56e40373b70b8f6cfcd57796df6e3e5d64" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c93f0a56e40373b70b8f6cfcd57796df6e3e5d64; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c93f0a56e40373b70b8f6cfcd57796df6e3e5d64"; sha256 = "0s7dgwc50q78b20l33ra8wrlxkqf0666ldxqb4isx6bk973yf7kv"; }; "c9440b326c43f4ba6af0b71b1ca029ae223ecabb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c9440b326c43f4ba6af0b71b1ca029ae223ecabb; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c9440b326c43f4ba6af0b71b1ca029ae223ecabb"; sha256 = "1wzfk57gnly1qafvjcy7jxa5nbq3fm89fjna9h7xfaf382kwviwm"; }; "c946526ac2560a1cf84cb7a63c24bc9994fed050" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/c946526ac2560a1cf84cb7a63c24bc9994fed050; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/c946526ac2560a1cf84cb7a63c24bc9994fed050"; sha256 = "117i8fkym78xq4ssk9hvhfw51myx69xnxm9zxd8mvsa7yrfd3420"; }; "c95cdaed781fb020898a671e373b60aa382404ff" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c95cdaed781fb020898a671e373b60aa382404ff; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c95cdaed781fb020898a671e373b60aa382404ff"; sha256 = "19626mhx070k3myam8g2s9dvqqx82pv7jbrdnnkbiz3kc0i65xzm"; }; "c96e9cd94a86b222bed132142b65c1d90314445d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2441582-104388acf6d34237af496ee648a9c7db/c96e9cd94a86b222bed132142b65c1d90314445d; + url = "http://cdn.unrealengine.com/dependencies/2441582-104388acf6d34237af496ee648a9c7db/c96e9cd94a86b222bed132142b65c1d90314445d"; sha256 = "1vp5lzll11hhn6qwn21qnidhlr6md2mm4cnafpbgsj7ci5jy9i8v"; }; "c9b2fa52f0b68b4de48806e71af562ddd9ab8363" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2501204-f81f6b4f13824670853a18474a99a9e4/c9b2fa52f0b68b4de48806e71af562ddd9ab8363; + url = "http://cdn.unrealengine.com/dependencies/2501204-f81f6b4f13824670853a18474a99a9e4/c9b2fa52f0b68b4de48806e71af562ddd9ab8363"; sha256 = "1lhr1k6qj5v1j3h4g6q4cwmswpk96l3v26gbq5hj2alab6r5chvs"; }; "c9f7bd390be6e2f50469fcf024ace928b624a38d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c9f7bd390be6e2f50469fcf024ace928b624a38d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c9f7bd390be6e2f50469fcf024ace928b624a38d"; sha256 = "1rsbwbgiqgvck30gd86p2sh53gykb68sfgyfpflqng9psffzxfja"; }; "ca146ad3bcc63037df80affd27568080de042fd2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ca146ad3bcc63037df80affd27568080de042fd2; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ca146ad3bcc63037df80affd27568080de042fd2"; sha256 = "0dd3piwj2g5zfiidysy219xvcdypdmdqfccwv0ib4ddb6yxa0csd"; }; "ca3317bb9d7ae47177c0d9362f17d53c865d8b92" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/ca3317bb9d7ae47177c0d9362f17d53c865d8b92; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/ca3317bb9d7ae47177c0d9362f17d53c865d8b92"; sha256 = "17vb8vrkc7y3rspnbd6nw34v58ifi8dr206kcf2ah8zpfbpqqkcd"; }; "ca72923ffc518f8f79ad2bb67a376e8c4e51c3ff" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/ca72923ffc518f8f79ad2bb67a376e8c4e51c3ff; + url = "http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/ca72923ffc518f8f79ad2bb67a376e8c4e51c3ff"; sha256 = "0zk6xryzk7d8g0f148n4n2zk92jspi71v530bp50nqpjzclv4j7f"; }; "ca83db39ca850bdf08a4e3bda07b207534365c24" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ca83db39ca850bdf08a4e3bda07b207534365c24; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ca83db39ca850bdf08a4e3bda07b207534365c24"; sha256 = "10a9vl982ni45wj3mnky56n2yljvha2xic4mf2n3vrmrr1aqxrah"; }; "caafa6d602fb6dfd386f6eb601ff8ed2b2e74234" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2622402-86d1483fa60742b6be9fd5a0b0b946e0/caafa6d602fb6dfd386f6eb601ff8ed2b2e74234; + url = "http://cdn.unrealengine.com/dependencies/2622402-86d1483fa60742b6be9fd5a0b0b946e0/caafa6d602fb6dfd386f6eb601ff8ed2b2e74234"; sha256 = "1r4vjwkkckaj25ajhw3csn351lppwgb46dc6im023dy8lj5fvc5d"; }; "cad827e1f1025fed382fad69988e6878edf449bc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/cad827e1f1025fed382fad69988e6878edf449bc; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/cad827e1f1025fed382fad69988e6878edf449bc"; sha256 = "0fz5m8ab4xa5zm8n9w8a4yrzhzjfq7wald118r8s50r4fwsnm517"; }; "cb540e992bfeed51b40d2faa7209ebc16384c2cc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/cb540e992bfeed51b40d2faa7209ebc16384c2cc; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/cb540e992bfeed51b40d2faa7209ebc16384c2cc"; sha256 = "145pgs42bmwr56r4fkjf40l24j9imhcf1f004k2bbmjn8518h4nb"; }; "cb5e9b0f8eb95171fa01852fb15eabf2845a79f5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/cb5e9b0f8eb95171fa01852fb15eabf2845a79f5; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/cb5e9b0f8eb95171fa01852fb15eabf2845a79f5"; sha256 = "0yy29b05a07h2zk1zy298i1ydlh3vr9mmjawqb34fgff18m1xy3w"; }; "cb73a430e097bac42d93ec902203b7888ed0b681" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/cb73a430e097bac42d93ec902203b7888ed0b681; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/cb73a430e097bac42d93ec902203b7888ed0b681"; sha256 = "1nysj9pxf2kwsh7v8iqz305slwy2s6ysmg9ra76ysmns7rh9rvap"; }; "cb81a778a0190199a4c52ec5e9e3f749c532fdf8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/cb81a778a0190199a4c52ec5e9e3f749c532fdf8; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/cb81a778a0190199a4c52ec5e9e3f749c532fdf8"; sha256 = "1hl7yhy7ysg35vrq5y4ngq4aiqfkb5h74zd6x7qay1k588k3af7g"; }; "cbafcbe19329c889151577a995439d8c09b69f61" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/cbafcbe19329c889151577a995439d8c09b69f61; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/cbafcbe19329c889151577a995439d8c09b69f61"; sha256 = "194zad942iv7rr5fngyk0kpckafip987mhgl1bk2fflvxvs5nckg"; }; "cbe9427bf8fe34234353780bf7d7188dbd5673af" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/cbe9427bf8fe34234353780bf7d7188dbd5673af; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/cbe9427bf8fe34234353780bf7d7188dbd5673af"; sha256 = "18ri7fwgvyp6p3qm4qn32dyiiwl2vw3f4j5g0dgv4k8p29cpx7d3"; }; "cc2764b781992363c5941eb2399962b3dc251c9a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/cc2764b781992363c5941eb2399962b3dc251c9a; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/cc2764b781992363c5941eb2399962b3dc251c9a"; sha256 = "0sxvjqbyz3bvppf090vpwggb0f758mxh16m0f5lf3z6xv917vbqw"; }; "cc6c17f5d19462048695c62e88e553ff08996aea" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/cc6c17f5d19462048695c62e88e553ff08996aea; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/cc6c17f5d19462048695c62e88e553ff08996aea"; sha256 = "0mi2m0f6j89dj3qbm43clcih8d06z943iv585ni8rp8dpvm733xn"; }; "ccb1bc3ca1edbf4177b3c0d1784bfcb61f87daae" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ccb1bc3ca1edbf4177b3c0d1784bfcb61f87daae; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ccb1bc3ca1edbf4177b3c0d1784bfcb61f87daae"; sha256 = "0lxc3imyakyqxphhyw7xxjlinyvvhpq050xwnydks6bja2nqjrvx"; }; "ccbf9e16dbb06aba05b68b87bd827f67b8eac84b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ccbf9e16dbb06aba05b68b87bd827f67b8eac84b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ccbf9e16dbb06aba05b68b87bd827f67b8eac84b"; sha256 = "1v65rdr6f3a5l8k9pa6aqnarv279ik4g82m3arnndlhs8d1fwry4"; }; "cd0d52d3a393b848c4524f8d20e9c3d772779d50" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/cd0d52d3a393b848c4524f8d20e9c3d772779d50; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/cd0d52d3a393b848c4524f8d20e9c3d772779d50"; sha256 = "1b1vccn5jhy79k1h1ilj572j0nkrv6imb3m3fk9zy897fp8phm86"; }; "cd136c8c017886023a62be7a07da35d0a4af997e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/cd136c8c017886023a62be7a07da35d0a4af997e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/cd136c8c017886023a62be7a07da35d0a4af997e"; sha256 = "0aw9ipcqp0iq706nw26rriqn1jvsczypwj46yk3sjxmcp7bzf0rg"; }; "cd20dd95dc2f4e182bbf98e7f0d6a7cd87f10df6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/cd20dd95dc2f4e182bbf98e7f0d6a7cd87f10df6; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/cd20dd95dc2f4e182bbf98e7f0d6a7cd87f10df6"; sha256 = "06ba9m6rcvia5rr1pghi1x4z7xjvw1rj9p9hpd7yvzbn02vx58y1"; }; "cd28a4a14b5471b45eae79e893b8acbc4f7e1f94" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/cd28a4a14b5471b45eae79e893b8acbc4f7e1f94; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/cd28a4a14b5471b45eae79e893b8acbc4f7e1f94"; sha256 = "110936dirzdy78nxcplpnz8z2hnqpcwdbgb6yfsg9w7a9x0290pd"; }; "cd31abaa21b8f9ec03052817bf36f6c16178f5e5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2597174-0975f975d1f0463f931b68ea4b0ef6d0/cd31abaa21b8f9ec03052817bf36f6c16178f5e5; + url = "http://cdn.unrealengine.com/dependencies/2597174-0975f975d1f0463f931b68ea4b0ef6d0/cd31abaa21b8f9ec03052817bf36f6c16178f5e5"; sha256 = "0imni7w08al0d35nis2xz501zl5qz1dmc4myhhabvm0l6cf3x4ig"; }; "cd5ab248342e1a8cf9bd3f635151bfdd3d41ad3b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/cd5ab248342e1a8cf9bd3f635151bfdd3d41ad3b; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/cd5ab248342e1a8cf9bd3f635151bfdd3d41ad3b"; sha256 = "173d24jramz5i4h5pvm4v22jiqnw87b4g1bg0y2v79n313k4p87g"; }; "ce44b880be5cb6a25056be3c177c866b85aee1d5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/ce44b880be5cb6a25056be3c177c866b85aee1d5; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/ce44b880be5cb6a25056be3c177c866b85aee1d5"; sha256 = "0gcvwwwzyl8s91fxvzaqnxvkz9kpw08643gra8acmbvplx2r92sj"; }; "ce8de3d894102a4bb85d1eaaa271f605239a2fd1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ce8de3d894102a4bb85d1eaaa271f605239a2fd1; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ce8de3d894102a4bb85d1eaaa271f605239a2fd1"; sha256 = "1m385wpp8zv140c51yq0bybpja4j7rgy837myqb7xsi3cmwsmrdz"; }; "ced0e06e0c817a6519c5a995d3ba2743df02ecdf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ced0e06e0c817a6519c5a995d3ba2743df02ecdf; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ced0e06e0c817a6519c5a995d3ba2743df02ecdf"; sha256 = "0hfxs8i2cjifry6sbyqhw5f54ngbl3dnhzmikvhci0mz1np1blah"; }; "ced6c6d11883cd80b95d5f522d9526e6467945e5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ced6c6d11883cd80b95d5f522d9526e6467945e5; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ced6c6d11883cd80b95d5f522d9526e6467945e5"; sha256 = "0ii9010n609i4i4zip2mgjqnhpfb7imfxviqi8kbax35mkfv38ci"; }; "ceefcb84598a9a4c5ce8d34e749d52d7511a8013" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/ceefcb84598a9a4c5ce8d34e749d52d7511a8013; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/ceefcb84598a9a4c5ce8d34e749d52d7511a8013"; sha256 = "0rynh9y2scir13ffmgwqcdvcm21p2n0q4i3di1aval7r690b0wz1"; }; "cefd87d67f6688e869ab62068aa16c5f02113c8c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2597174-0975f975d1f0463f931b68ea4b0ef6d0/cefd87d67f6688e869ab62068aa16c5f02113c8c; + url = "http://cdn.unrealengine.com/dependencies/2597174-0975f975d1f0463f931b68ea4b0ef6d0/cefd87d67f6688e869ab62068aa16c5f02113c8c"; sha256 = "0nli07f78bpmjk6bxaa2x32m1l7ds6d4rh8iycciywm8fwbw0ak6"; }; "cf4a635ba3a4c070a83394e45c5bae8ef8651afe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621163-719903f8599f48949652ccefc2a2d5be/cf4a635ba3a4c070a83394e45c5bae8ef8651afe; + url = "http://cdn.unrealengine.com/dependencies/2621163-719903f8599f48949652ccefc2a2d5be/cf4a635ba3a4c070a83394e45c5bae8ef8651afe"; sha256 = "0pb38cbss34md3pn9j1rzhwanq1dwqw2jpaygsb9fzxnrgypismr"; }; "cf5e1ce959a11e3674cc1a7c352dc878022c2eff" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/cf5e1ce959a11e3674cc1a7c352dc878022c2eff; + url = "http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/cf5e1ce959a11e3674cc1a7c352dc878022c2eff"; sha256 = "0lyp1iavwk61iv47nlaw7s3bdfr469in0d9rngp7mr9w1b367szx"; }; "cf784788aae211d789405fe0a7308e059e15627c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/cf784788aae211d789405fe0a7308e059e15627c; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/cf784788aae211d789405fe0a7308e059e15627c"; sha256 = "02cl56q4232l8y34ajl04s0zxq8mdbvbx7bad1q4f2fcx6g395x7"; }; "cfaa6e2212f937f340e867175482030d495675ed" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2448689-7792f1b8be254cc19b4c3379509684cc/cfaa6e2212f937f340e867175482030d495675ed; + url = "http://cdn.unrealengine.com/dependencies/2448689-7792f1b8be254cc19b4c3379509684cc/cfaa6e2212f937f340e867175482030d495675ed"; sha256 = "0wdpkcnlnkj6bwv1q4g3i3yn2j7rv98h6l58y323h4bn2hn8f90y"; }; "cfc8c6e323848f57580a531e48fc4b81cdd17efd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2458551-07195e4b171247cfbc0f6645046eda02/cfc8c6e323848f57580a531e48fc4b81cdd17efd; + url = "http://cdn.unrealengine.com/dependencies/2458551-07195e4b171247cfbc0f6645046eda02/cfc8c6e323848f57580a531e48fc4b81cdd17efd"; sha256 = "1bjsd26ckak6212lvb706653raz8sn8b380n5dp653frbsagnmgw"; }; "cff332b0fe6e7874406db49746b5a2be18f822f5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/cff332b0fe6e7874406db49746b5a2be18f822f5; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/cff332b0fe6e7874406db49746b5a2be18f822f5"; sha256 = "15w6kfv1pxzswr71knkkyw8zc7i1ibk9rapgp7s9ybkfkdfwrfjn"; }; "cffe52e7d9b8a547c321247c96a680a061a7c077" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/cffe52e7d9b8a547c321247c96a680a061a7c077; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/cffe52e7d9b8a547c321247c96a680a061a7c077"; sha256 = "1ha9z55y46lm88zai4dh9404gab7kfkcl95fm0ch22mv3ps94a86"; }; "d00340b56c80a33987bae91b824e43fa883353b9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/d00340b56c80a33987bae91b824e43fa883353b9; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/d00340b56c80a33987bae91b824e43fa883353b9"; sha256 = "1f9nz3vjw21gvg9s4ycmjcjp3kb79q0inirjnbp0wbxmmd0w102i"; }; "d01535f7276e94b02b13cc27f3966f8867e79101" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/d01535f7276e94b02b13cc27f3966f8867e79101; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/d01535f7276e94b02b13cc27f3966f8867e79101"; sha256 = "05mzb8x5rhs4z9cdfsgv43ggigvpnhkq6jfd5apvsqqyzsrxpn48"; }; "d04d874a8a5abeb10db060dd59e268c16687663b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d04d874a8a5abeb10db060dd59e268c16687663b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d04d874a8a5abeb10db060dd59e268c16687663b"; sha256 = "1qaspy0c182xnbpplw4bmnahd52l47g3gmws77gic0ls9dlm98b2"; }; "d0566c823351a86a79411b3b8d001317aa356284" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d0566c823351a86a79411b3b8d001317aa356284; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d0566c823351a86a79411b3b8d001317aa356284"; sha256 = "1i2fxmzs90wjsaxrc26jjmy045gq08p8a3k7z8p9lxkk9xnvvq49"; }; "d0916b22915dc03f3e2bae8097e2ad696e7c8f4e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2620197-1c557d2f91dd4277b16fd1ed8715aab3/d0916b22915dc03f3e2bae8097e2ad696e7c8f4e; + url = "http://cdn.unrealengine.com/dependencies/2620197-1c557d2f91dd4277b16fd1ed8715aab3/d0916b22915dc03f3e2bae8097e2ad696e7c8f4e"; sha256 = "06fl6qfyax8nkccimh3r771l6a36q9rkihdqhn13ax0klab27cmv"; }; "d0ac4798d087f4f67f533a8d8cc04a7685a380aa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/d0ac4798d087f4f67f533a8d8cc04a7685a380aa; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/d0ac4798d087f4f67f533a8d8cc04a7685a380aa"; sha256 = "1fbzjkmizabaxrjipsfx5y4qlsd0vddb0b20cwxx8q74q2m2ai63"; }; "d110f2213c54503001102b5f9a81fc0743ba32c0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d110f2213c54503001102b5f9a81fc0743ba32c0; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d110f2213c54503001102b5f9a81fc0743ba32c0"; sha256 = "12l3jzkrlqfkxrq9nk7ksyzy4ffawci9hlbfnrcwrckiz107360z"; }; "d111d246a5dff2d0eed94cb2592bfe277ad9e0ea" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d111d246a5dff2d0eed94cb2592bfe277ad9e0ea; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d111d246a5dff2d0eed94cb2592bfe277ad9e0ea"; sha256 = "0qjagdpy4wx39jg31ib87dh1gfyyhd06aa1g044jnc9zjdx47n7a"; }; "d1450a3f59e35f9d62efa518fa3ecc4e3ce0b0ef" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d1450a3f59e35f9d62efa518fa3ecc4e3ce0b0ef; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d1450a3f59e35f9d62efa518fa3ecc4e3ce0b0ef"; sha256 = "0i7hjlykmzasgyxpw5sx7nrcpi6nmqj3ckcr1ayaym7j2d2dljpw"; }; "d165f29f588eae8d8a55d377f73b67973713c670" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/d165f29f588eae8d8a55d377f73b67973713c670; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/d165f29f588eae8d8a55d377f73b67973713c670"; sha256 = "0gqsm4h2bzvp7pm77z3alrm21pf8vp4m4ihlc9qqwv2jm98gmfi6"; }; "d1a31fc8df90aed8358e255ead086de9df9b8eea" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2622268-4534504e79af46a28b290d0661d1cc42/d1a31fc8df90aed8358e255ead086de9df9b8eea; + url = "http://cdn.unrealengine.com/dependencies/2622268-4534504e79af46a28b290d0661d1cc42/d1a31fc8df90aed8358e255ead086de9df9b8eea"; sha256 = "0gfbvm7l4skz5snpbk39hr9ccmja5fxkvnrr5278l9ways2d2ilg"; }; "d1cc40fc311b1fe882b059047a6c7f53925c9827" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d1cc40fc311b1fe882b059047a6c7f53925c9827; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d1cc40fc311b1fe882b059047a6c7f53925c9827"; sha256 = "0lxfzdv2gwjscqmxsdhdli5sg1mr08djq7ik8a26h96mvxwqna4j"; }; "d1e8035d7cb1c18606f75bf22a42e813f926497a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d1e8035d7cb1c18606f75bf22a42e813f926497a; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d1e8035d7cb1c18606f75bf22a42e813f926497a"; sha256 = "0il1fg83apcy0hvr78gfginpw3y522vqky8523wkbvrbipzqps1g"; }; "d25faf54b177d399192ede835440a8eb4948ab59" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d25faf54b177d399192ede835440a8eb4948ab59; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d25faf54b177d399192ede835440a8eb4948ab59"; sha256 = "1fwd7slxj50zh75lcj8i17mijsah1gqnid4mvhvyh33fmgbmwc10"; }; "d27c0f6b2f82d4e0112056dc4963a251ad84b3c5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2482054-e6ea3bde29504ce5b51935e2939eefee/d27c0f6b2f82d4e0112056dc4963a251ad84b3c5; + url = "http://cdn.unrealengine.com/dependencies/2482054-e6ea3bde29504ce5b51935e2939eefee/d27c0f6b2f82d4e0112056dc4963a251ad84b3c5"; sha256 = "1f6h8h1aaffy0hn17mlzynfaammkm8whsbjlbb31czgpiq445h9w"; }; "d27cda6ec1c697039954ff45ad0d4bc809382324" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d27cda6ec1c697039954ff45ad0d4bc809382324; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d27cda6ec1c697039954ff45ad0d4bc809382324"; sha256 = "119vqrcws2yfw532n7gykqbgh4p0jhx8vfyc7vkzfrj0ynrda9m6"; }; "d280f17be242e85379048663a32b3f86bfcd6625" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2629494-07ea5ec481884143ac3af33e276b7492/d280f17be242e85379048663a32b3f86bfcd6625; + url = "http://cdn.unrealengine.com/dependencies/2629494-07ea5ec481884143ac3af33e276b7492/d280f17be242e85379048663a32b3f86bfcd6625"; sha256 = "1lfm6gjsz8y3z90ix3prmvpmx0ps8g4rpzflwd8p1wk8h8kqr4jy"; }; "d28b2e8946d305dc75d30be04ee1c9bfec7bf72a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d28b2e8946d305dc75d30be04ee1c9bfec7bf72a; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d28b2e8946d305dc75d30be04ee1c9bfec7bf72a"; sha256 = "15yjgzhi621bj13nz1wrs9m7jy2v0mjgx3w59fyv5vgf94mj6nyq"; }; "d292729e71bdf7b0dfe9367148d16b19fa7a5da7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/d292729e71bdf7b0dfe9367148d16b19fa7a5da7; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/d292729e71bdf7b0dfe9367148d16b19fa7a5da7"; sha256 = "0g7z09z0rxrjf82y9m30qc2a2gbz34gf0hvwxyb3pwzgfbsapxh1"; }; "d2a00e055f1285c1fa4a975781d66bcdc44da301" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d2a00e055f1285c1fa4a975781d66bcdc44da301; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d2a00e055f1285c1fa4a975781d66bcdc44da301"; sha256 = "0ndhbjbcr9mhjzzvfqxx38a84ch7jpb4vik096i71kji8pbby5my"; }; "d2dbfcbb4a4a5cb2324c962101ba1ae4ebedc502" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d2dbfcbb4a4a5cb2324c962101ba1ae4ebedc502; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d2dbfcbb4a4a5cb2324c962101ba1ae4ebedc502"; sha256 = "0ywl10w2xkcm1nc7zcwzsz1q3j25w37hhyrkkvhg41vqjdnibx2p"; }; "d2dc1c9128c24c0a330a534ae29cc6ae6beaffc0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d2dc1c9128c24c0a330a534ae29cc6ae6beaffc0; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d2dc1c9128c24c0a330a534ae29cc6ae6beaffc0"; sha256 = "16d5d8n5m1srr2iddf0hvigpaybpyiwr3w2850sgn1qskbx5n2gb"; }; "d324c1434b20b5ef66a2937ab08337f78c5646a0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d324c1434b20b5ef66a2937ab08337f78c5646a0; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d324c1434b20b5ef66a2937ab08337f78c5646a0"; sha256 = "0xnx3clcsxg0b5hmq22dz8wplhfvmckiz921arnl1hbwgfgjiwis"; }; "d338b1e7e6160d0f539aa12687e23db81cce61c4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2623227-c4b8ee6a09664c9dac75b68f4d1629d4/d338b1e7e6160d0f539aa12687e23db81cce61c4; + url = "http://cdn.unrealengine.com/dependencies/2623227-c4b8ee6a09664c9dac75b68f4d1629d4/d338b1e7e6160d0f539aa12687e23db81cce61c4"; sha256 = "1zpbqrzxnmiq1wsvxr5gxv2gyf1kip08d8zpgfz6952bxh2ql2d2"; }; "d347f6ee6f9955b5ddb428582f0a5694be416663" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d347f6ee6f9955b5ddb428582f0a5694be416663; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d347f6ee6f9955b5ddb428582f0a5694be416663"; sha256 = "0a67s7r0gnpnb11p4dlz61zqmrk6jm3s2q6n6vz3sak9q046wiz6"; }; "d3603561d5e25d4f17d441b894b6b532ac8ca892" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745458-2d2488161ce24ccca70e5ce98643ad1d/d3603561d5e25d4f17d441b894b6b532ac8ca892; + url = "http://cdn.unrealengine.com/dependencies/2745458-2d2488161ce24ccca70e5ce98643ad1d/d3603561d5e25d4f17d441b894b6b532ac8ca892"; sha256 = "1farglicxvs0xvrlkp8vhj8zad9c2zm7m7bwwgs35nbmk7ii3hvv"; }; "d3c4fc80dcded70862e182185119d810e694728f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d3c4fc80dcded70862e182185119d810e694728f; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d3c4fc80dcded70862e182185119d810e694728f"; sha256 = "1g15fbqvwz35hy6czvwb23wv3hv8z62c2hzgnh6wpyliz8hvwvsm"; }; "d3fa6eb331487a41362af20fc809e610469ecc14" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d3fa6eb331487a41362af20fc809e610469ecc14; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d3fa6eb331487a41362af20fc809e610469ecc14"; sha256 = "1n15651kjzdp4nhxv8rl331gqa9drj2h2lz590ldcqngc27gdm7r"; }; "d40c0edc4a86159f31ffdeb1c868655892857c27" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/d40c0edc4a86159f31ffdeb1c868655892857c27; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/d40c0edc4a86159f31ffdeb1c868655892857c27"; sha256 = "08k3m19bgb2l0c7r1680gg3rhprinr9gr1qnmqw9vkpaclkbmhya"; }; "d43babee559c0a43f3cdfe93ac68d127740c7c60" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/d43babee559c0a43f3cdfe93ac68d127740c7c60; + url = "http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/d43babee559c0a43f3cdfe93ac68d127740c7c60"; sha256 = "16by5ci4078gbm4qq84np3z1gl6p9g1988nqzwavb1gmcd5l39lp"; }; "d48b4b394816bf765766cfb0de720c2fcf3dbe91" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d48b4b394816bf765766cfb0de720c2fcf3dbe91; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d48b4b394816bf765766cfb0de720c2fcf3dbe91"; sha256 = "03r22czm4w4l1cz5i9dl5v5nbij3zs4bkh5kgxbq9jd4vqkg15n0"; }; "d570076bdc206ebe525e4fdc41a05520d5f706fd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/d570076bdc206ebe525e4fdc41a05520d5f706fd; + url = "http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/d570076bdc206ebe525e4fdc41a05520d5f706fd"; sha256 = "1bs1j3rya8w5xlmpws006dyzl6ma498qmjpbvy46588zv6id0h9d"; }; "d59bfb566ff92e983f4a66e10ce13ac21e90924d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2649176-0ea78bc522e047c6b5b5e477faaaf0eb/d59bfb566ff92e983f4a66e10ce13ac21e90924d; + url = "http://cdn.unrealengine.com/dependencies/2649176-0ea78bc522e047c6b5b5e477faaaf0eb/d59bfb566ff92e983f4a66e10ce13ac21e90924d"; sha256 = "0wgw0q5ln0cz34jc1pn2pqk49b2cbkxljw1c7cyixw81mq0750z3"; }; "d5cc1b80671cb302ce39ef82a91478483444777a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/d5cc1b80671cb302ce39ef82a91478483444777a; + url = "http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/d5cc1b80671cb302ce39ef82a91478483444777a"; sha256 = "1klyngm5zxnswi2cxj5sd6lcnxmxmj894mpzkbj5fc9l5k9zzh4f"; }; "d5f5f1dab637b46122ba0000804b82a3466d4f57" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d5f5f1dab637b46122ba0000804b82a3466d4f57; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d5f5f1dab637b46122ba0000804b82a3466d4f57"; sha256 = "0wzzk0xm9q17myvgk7mbv21gnyjgms4cr397gxkdjfjljbb78n9b"; }; "d613d9e9dacb47de3549938a8e516310c73c64bc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/d613d9e9dacb47de3549938a8e516310c73c64bc; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/d613d9e9dacb47de3549938a8e516310c73c64bc"; sha256 = "17rskdgxjwdlq1v17l756z7fj1l0r96fkzpbagsp7w4h7lxkr3ii"; }; "d63c4c238a195e3f8e062b2a9cf0757f0ed55587" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d63c4c238a195e3f8e062b2a9cf0757f0ed55587; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d63c4c238a195e3f8e062b2a9cf0757f0ed55587"; sha256 = "0waid6qlkmm5avzmd63j7dapq2c5kad6727aalc66kf3bxqqk628"; }; "d65a42fdc8154793ead3cde82b7ec619bd249478" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d65a42fdc8154793ead3cde82b7ec619bd249478; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d65a42fdc8154793ead3cde82b7ec619bd249478"; sha256 = "097124ah7iynh2xq14wlarnqj5kqay45mcsfzy57fkr49kl9q31x"; }; "d6c884c9dad1608090dcb5009a5146b5e2cb307d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d6c884c9dad1608090dcb5009a5146b5e2cb307d; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d6c884c9dad1608090dcb5009a5146b5e2cb307d"; sha256 = "1z0nixzhmi07w3nfn2zb81qlq3hgc8x1n42rdafq7m4ddgaccp5b"; }; "d717fddace1fd0e9b4a4b2c78118ebb0c354e35a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2620878-145fecd6dbcb4cf59f55c309f12ff608/d717fddace1fd0e9b4a4b2c78118ebb0c354e35a; + url = "http://cdn.unrealengine.com/dependencies/2620878-145fecd6dbcb4cf59f55c309f12ff608/d717fddace1fd0e9b4a4b2c78118ebb0c354e35a"; sha256 = "0a25mfvkjyycc6ybffg5a453vvzgs0lxs11iwgbd366p1q1a9fc5"; }; "d777e45fe21ea823174bd647cf6817128035cf2d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d777e45fe21ea823174bd647cf6817128035cf2d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d777e45fe21ea823174bd647cf6817128035cf2d"; sha256 = "1p363fd1fdl04md3cwpl8sk4n8vs1kbzlvf1m5hfjwjpwf4nrflr"; }; "d79b515a8ffc174a508593ce109108ecb9e44813" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d79b515a8ffc174a508593ce109108ecb9e44813; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d79b515a8ffc174a508593ce109108ecb9e44813"; sha256 = "0wxp8x8f1s961vxlrr507rmngqqwaikj3i09zwzzif54gip02g2x"; }; "d7a56916778ad1fa03472f47ec92e8a9eed66219" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2482391-24fb529bc09847ca8c3576d69ba36285/d7a56916778ad1fa03472f47ec92e8a9eed66219; + url = "http://cdn.unrealengine.com/dependencies/2482391-24fb529bc09847ca8c3576d69ba36285/d7a56916778ad1fa03472f47ec92e8a9eed66219"; sha256 = "06w8nb6bzpc98brswfk1ciikgghvx575w6il3l3p7yjx87093vbx"; }; "d7ae2a94509bb8a9d5e77006c5538cd11b721439" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/d7ae2a94509bb8a9d5e77006c5538cd11b721439; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/d7ae2a94509bb8a9d5e77006c5538cd11b721439"; sha256 = "12cwb2ajb3ikrr2pnk9djd9c4cyh2prigfy7x3q2kdni28dw4v9i"; }; "d7cd467675e181dbeba3cf24443590ebb76f9515" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d7cd467675e181dbeba3cf24443590ebb76f9515; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d7cd467675e181dbeba3cf24443590ebb76f9515"; sha256 = "0d6s9lk446ixhiivxxrxv3s8l6xxlxqljkcj1ynyxcfcm9q6d29r"; }; "d7df186da35e7874ec3096cafd37119085cf5ce5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/d7df186da35e7874ec3096cafd37119085cf5ce5; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/d7df186da35e7874ec3096cafd37119085cf5ce5"; sha256 = "0l553fq2pmm2jpv9kag039kg8mjspnqaf9ja2g6ylgbkclm8sc60"; }; "d7eaad8d8e27e59910b9a915de128b42dda290db" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d7eaad8d8e27e59910b9a915de128b42dda290db; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d7eaad8d8e27e59910b9a915de128b42dda290db"; sha256 = "1l641nqdiyp8wvpiydmanb1i32da6naad7fiwggjk8y9dd035j3z"; }; "d814756dd80360682458cdbeed8859d522418bd2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d814756dd80360682458cdbeed8859d522418bd2; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d814756dd80360682458cdbeed8859d522418bd2"; sha256 = "0lmvilkzvcipf1favy33khkfdg285l6cvfykzprljyff1jgqb16w"; }; "d82a48c7d5dec9cc59dfa1a8ee7298c7e787cee7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2627198-ce999b21af1d474180ef48e136faa3d2/d82a48c7d5dec9cc59dfa1a8ee7298c7e787cee7; + url = "http://cdn.unrealengine.com/dependencies/2627198-ce999b21af1d474180ef48e136faa3d2/d82a48c7d5dec9cc59dfa1a8ee7298c7e787cee7"; sha256 = "1lvp57nm4y0xfc09wqckfd6736qf994sgdwhvzd3a39xnjcm1zcf"; }; "d841bdc828b7ed9f4a76d474d455264dcaadbe38" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d841bdc828b7ed9f4a76d474d455264dcaadbe38; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d841bdc828b7ed9f4a76d474d455264dcaadbe38"; sha256 = "0vi449pj78607r89y2zbx2dm5qdk0njdnws55cmx6wv7p13wiwq4"; }; "d852eca7663f1c36dab87cbd527dbfac895faf97" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d852eca7663f1c36dab87cbd527dbfac895faf97; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d852eca7663f1c36dab87cbd527dbfac895faf97"; sha256 = "09y0jdcsxnj6wmb1q60a79dfpn0qq9laxsh20glpgw00a302917z"; }; "d87a6dc2de5d3e0f991324f8edf80b016f15f204" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d87a6dc2de5d3e0f991324f8edf80b016f15f204; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d87a6dc2de5d3e0f991324f8edf80b016f15f204"; sha256 = "08bmfkq48m62gahq3c9gjkjvwg1f7986kiq82xzr0vd15742l3vh"; }; "d889e4d65d962a36e5839fedc6a70a00ac10fafd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d889e4d65d962a36e5839fedc6a70a00ac10fafd; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d889e4d65d962a36e5839fedc6a70a00ac10fafd"; sha256 = "15f3gbgqfjhcnmqqcbklp5qh5l4jrcb0mfg0gf4njaprb479274r"; }; "d8a13d14cf5b0d5bd31f2b05c3b53dbffdedc49c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/d8a13d14cf5b0d5bd31f2b05c3b53dbffdedc49c; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/d8a13d14cf5b0d5bd31f2b05c3b53dbffdedc49c"; sha256 = "13hipnkqpzlxkx87yy49303fxs8mpna2947yaf06nyjwphy9y554"; }; "d8abbf7642437f66197d216a0eceef1ccce557c9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d8abbf7642437f66197d216a0eceef1ccce557c9; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d8abbf7642437f66197d216a0eceef1ccce557c9"; sha256 = "0jdfxmw3bqp1nws33hrch9j7irnln19ac5cf21bnzavsvkvfrwhv"; }; "d8f99844942adf5e16059b6743f25804288ee4ca" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/d8f99844942adf5e16059b6743f25804288ee4ca; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/d8f99844942adf5e16059b6743f25804288ee4ca"; sha256 = "14fihk8cpbsdf26vfvhfx5finmvz6ckbxmhbkm7qh34wi6h10v6r"; }; "d904eb14d805f07ce46163d3b8b20c434fe0db0b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/d904eb14d805f07ce46163d3b8b20c434fe0db0b; + url = "http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/d904eb14d805f07ce46163d3b8b20c434fe0db0b"; sha256 = "0pwnpnmca2s8qg2k27malnw6d20si50dp3rlqcciaihn6dbjn8qh"; }; "d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d92734f6a18a11d0dfbf8c9e12f63f2180c5225d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d92734f6a18a11d0dfbf8c9e12f63f2180c5225d"; sha256 = "1m8yai075pib0imrh5dlwifdgbzsijk0vcgz8n8yzgq4j7k6rk16"; }; "d9a9e14ffd76c4ec3dd9ed97fe543c3169480ecb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d9a9e14ffd76c4ec3dd9ed97fe543c3169480ecb; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d9a9e14ffd76c4ec3dd9ed97fe543c3169480ecb"; sha256 = "009fzivb39c6wx2mv4z6kjkfqr51fhkx6w08h8d9g0z0kin4hffl"; }; "d9b01b6ec88b6bdfbdb3493b4881158a6b4c8d81" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d9b01b6ec88b6bdfbdb3493b4881158a6b4c8d81; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d9b01b6ec88b6bdfbdb3493b4881158a6b4c8d81"; sha256 = "1nnk36bh320bblcnd8zvhfvgd9q456a007zwk8l11akx4yd645pj"; }; "d9eb718a9365d9af9b6cc77b440a8da1ea6c1bc1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/d9eb718a9365d9af9b6cc77b440a8da1ea6c1bc1; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/d9eb718a9365d9af9b6cc77b440a8da1ea6c1bc1"; sha256 = "15z0bl57iixqyghm5ac3gy8czvx03spwbm5m6i13nk48dvlfyh8w"; }; "d9edee7f1f74e5386558b4a961fca4552e02ed53" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/d9edee7f1f74e5386558b4a961fca4552e02ed53; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/d9edee7f1f74e5386558b4a961fca4552e02ed53"; sha256 = "17gkslrvbvdkkdapsqpck8q3rczk4cam00c9yhyi137j7n1lkpyk"; }; "da1a0a91f4e47865a8becf9da734feefa1851a0e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/da1a0a91f4e47865a8becf9da734feefa1851a0e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/da1a0a91f4e47865a8becf9da734feefa1851a0e"; sha256 = "0lz6gkyn0vcwpgd3ln60cm4nnsz01g20h7qz00pgjczpa4j2qas4"; }; "da7b12758710d9e2c5869e221e94cef9c9eedfc1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/da7b12758710d9e2c5869e221e94cef9c9eedfc1; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/da7b12758710d9e2c5869e221e94cef9c9eedfc1"; sha256 = "03pxq5gncfxllslif2vsfacwxv3wpfgajsgdx0s62slsqrfgrm1h"; }; "da7ba6ca87d1fd789d7ec8278b87f5eb53200dae" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/da7ba6ca87d1fd789d7ec8278b87f5eb53200dae; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/da7ba6ca87d1fd789d7ec8278b87f5eb53200dae"; sha256 = "1xx0kk0n7lmd7llildsw03a7zbfd3dr3jcjjm2ljb3x2zxksapwz"; }; "da8b24eeab7203c68fbffbc306797cd5a0ad0a21" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2622247-8eee96f5d21944c4aceb4b5731ec49c7/da8b24eeab7203c68fbffbc306797cd5a0ad0a21; + url = "http://cdn.unrealengine.com/dependencies/2622247-8eee96f5d21944c4aceb4b5731ec49c7/da8b24eeab7203c68fbffbc306797cd5a0ad0a21"; sha256 = "0h522mjxnb25w077j7vfd7vw588w2wj3lhvb740hmzs8hg50grbf"; }; "db0072b27b24bda3fd51a10fdc7e99e0cd839029" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621850-a9425aa00359454986fe050ca270f1f8/db0072b27b24bda3fd51a10fdc7e99e0cd839029; + url = "http://cdn.unrealengine.com/dependencies/2621850-a9425aa00359454986fe050ca270f1f8/db0072b27b24bda3fd51a10fdc7e99e0cd839029"; sha256 = "16py0ri5wzfyxi5yv673wwx4cvqdgibgf8g5gndwkvbxdk1901i1"; }; "db0399e0ca29f1327956d92769300c29b37b2b11" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/db0399e0ca29f1327956d92769300c29b37b2b11; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/db0399e0ca29f1327956d92769300c29b37b2b11"; sha256 = "1rn19ggfrq07xpwv7hxlqsq01rz4s5aw8jyyk9jpgwm8951mdk0m"; }; "db1ce685def3bdbdaa34985a4bcc7f9397fe18c5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/db1ce685def3bdbdaa34985a4bcc7f9397fe18c5; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/db1ce685def3bdbdaa34985a4bcc7f9397fe18c5"; sha256 = "1jvh0j9208qp3msz14gg2dliasys859zfkwagwgcpwzz8r9750dg"; }; "db49a1753cbbba64d471588023c076a11c7f8ed0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2515540-18724700a05d4a0c889f39065edf2969/db49a1753cbbba64d471588023c076a11c7f8ed0; + url = "http://cdn.unrealengine.com/dependencies/2515540-18724700a05d4a0c889f39065edf2969/db49a1753cbbba64d471588023c076a11c7f8ed0"; sha256 = "19jb6xz05mnypcs43ld8lf2jvybkj8xr2mmbrhkpvwbxj0gz9mgq"; }; "dbaad381a8fe78e42dee5bc0259045658757985f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/dbaad381a8fe78e42dee5bc0259045658757985f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/dbaad381a8fe78e42dee5bc0259045658757985f"; sha256 = "10g36av438yi4gif8c1r35z2jfpqynkqw65nyhy3pnxhwph92hk8"; }; "dbd67380af0391a17ceebc816f623b42e665cd2d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/dbd67380af0391a17ceebc816f623b42e665cd2d; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/dbd67380af0391a17ceebc816f623b42e665cd2d"; sha256 = "11cdb6rm97vvmfhnf50sl1bcyrg3zki3v5vdhm3w4bzazmvw4d6b"; }; "dbe75239cd713a39f272a0de6cac2dfb95039ebb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/dbe75239cd713a39f272a0de6cac2dfb95039ebb; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/dbe75239cd713a39f272a0de6cac2dfb95039ebb"; sha256 = "0sy95z08ps7hmkzyg0ym20q9b2f2d1mfs8wp9zbcqixlbkgna90l"; }; "dc103daa4b0245c15f666e3b82ee1ca395c26e15" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/dc103daa4b0245c15f666e3b82ee1ca395c26e15; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/dc103daa4b0245c15f666e3b82ee1ca395c26e15"; sha256 = "1xy9yz8nrk8b1l64x0jq6cgdk10xjf1mmm4g62fqg6sn0zcl5ai0"; }; "dc8af4beee95a25b1c0cab56a5b11a66babc6a87" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/dc8af4beee95a25b1c0cab56a5b11a66babc6a87; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/dc8af4beee95a25b1c0cab56a5b11a66babc6a87"; sha256 = "1shf8pf5xyqsjqslnj9m7a93xm9f6lydsf35vhq81p2sll5786kr"; }; "dc999c480c689209d1072c9b4435243a1121150a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/dc999c480c689209d1072c9b4435243a1121150a; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/dc999c480c689209d1072c9b4435243a1121150a"; sha256 = "0lg507q9kwc16hn0f9dapahd0iymywswrn2iqd26lx7g6lvnckd0"; }; "dccb30d618cfef75cf0ac5c9e91b08be0183d1c6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/dccb30d618cfef75cf0ac5c9e91b08be0183d1c6; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/dccb30d618cfef75cf0ac5c9e91b08be0183d1c6"; sha256 = "1z6qy8hsnznrdfx3k6fqnnb8flv8s894ljrglppmr0f0sdbrvavk"; }; "dcd771e85d726f704215a4feaa632c6ad6472de7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/dcd771e85d726f704215a4feaa632c6ad6472de7; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/dcd771e85d726f704215a4feaa632c6ad6472de7"; sha256 = "0yqwa73qvwi1rmv4qlgwcn4fp88yqwijd4qw510abfljqgvkwnh5"; }; "dd2d043a6fefc80a25ca78d62c7e8ac26e471cc5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/dd2d043a6fefc80a25ca78d62c7e8ac26e471cc5; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/dd2d043a6fefc80a25ca78d62c7e8ac26e471cc5"; sha256 = "10i0f74cgc3n0yiv88vggiwpsf8jjxg0jvqnqfcmpapd8m6f9s99"; }; "dd37156cd306b8d31089c3a93edede1ffb0d3293" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/dd37156cd306b8d31089c3a93edede1ffb0d3293; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/dd37156cd306b8d31089c3a93edede1ffb0d3293"; sha256 = "0qldw0lnwx6qnlis7gxpgzdag2sk9cyg2myy8phmmd0407a4l6pl"; }; "dd67559046c4cec3957fcc155765827a5c36dfb2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/dd67559046c4cec3957fcc155765827a5c36dfb2; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/dd67559046c4cec3957fcc155765827a5c36dfb2"; sha256 = "1fxk257fjj23k4vx0p6fydbg0kmqd8lx0fbn0fiy94binwym6aiq"; }; "dd6aa88361efd8c13bc630db41c40d185f94dafa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/dd6aa88361efd8c13bc630db41c40d185f94dafa; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/dd6aa88361efd8c13bc630db41c40d185f94dafa"; sha256 = "1cd1knbxhzzjddavdnd996n53km3nrq0183nrvh7kmy7jp51b6i7"; }; "dd765b2a31ae5ecdd886e1550b3a93dbc11a74ae" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/dd765b2a31ae5ecdd886e1550b3a93dbc11a74ae; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/dd765b2a31ae5ecdd886e1550b3a93dbc11a74ae"; sha256 = "1vlzi62gws4dby85aan2aw96gd9n1frrwvkym5jw9cn7m3rp7di3"; }; "dd8ef40e0195694f7f018da7e80a520807402c9b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/dd8ef40e0195694f7f018da7e80a520807402c9b; + url = "http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/dd8ef40e0195694f7f018da7e80a520807402c9b"; sha256 = "030hfr8vk0rn374h9gav0j3x8mvm5r8ggq37h666q4fswazqa2cv"; }; "ddad05592e192eebafd8842ac556d92572eef1aa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/ddad05592e192eebafd8842ac556d92572eef1aa; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/ddad05592e192eebafd8842ac556d92572eef1aa"; sha256 = "000r1d5nifky1yczl7p2fdygrl8yn9n5ajqbxmx2ccmavxr2wqjz"; }; "ddc5b08945cb44c8aa6434129c3f898bd87a41af" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ddc5b08945cb44c8aa6434129c3f898bd87a41af; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ddc5b08945cb44c8aa6434129c3f898bd87a41af"; sha256 = "0gr5ra1izhksappm1k4s4n632dyzfxdlxv1ilnmfmcs4vhjphpg6"; }; "ddcc2181537ebf3c5cf4ba351f0960b885372aa9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ddcc2181537ebf3c5cf4ba351f0960b885372aa9; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ddcc2181537ebf3c5cf4ba351f0960b885372aa9"; sha256 = "0hp5d6xj8dh033801j5bl07wji2489v4ci6fl0jljhsfwh9r9zcf"; }; "ddef4f0acf5f073d28dd6a38c4fa58630d3a68f8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/ddef4f0acf5f073d28dd6a38c4fa58630d3a68f8; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/ddef4f0acf5f073d28dd6a38c4fa58630d3a68f8"; sha256 = "1p8ag7dgnrnpj2cj7l94ic98gghhs5xc1qsmwmr5m5v6ra6mkm3s"; }; "ddffea76154050032a408a3890c07633f1ba3b0b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/ddffea76154050032a408a3890c07633f1ba3b0b; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/ddffea76154050032a408a3890c07633f1ba3b0b"; sha256 = "1bfwfwg9hn4sh5nqwpd8nfjbqkkyp5nzns2cw47cqvrrz9m645hw"; }; "de0049c6936b76d5da37bb69dd25ac91e83514c3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/de0049c6936b76d5da37bb69dd25ac91e83514c3; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/de0049c6936b76d5da37bb69dd25ac91e83514c3"; sha256 = "1abk2d6mp27rya7yp3dhvgwr18z7yny9l024l9wv2dzgfhw4mlmr"; }; "de01c69dad3bc654ab534e5eedcd2b8374f2a2e0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/de01c69dad3bc654ab534e5eedcd2b8374f2a2e0; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/de01c69dad3bc654ab534e5eedcd2b8374f2a2e0"; sha256 = "1dggg7qwqsfzcnr296qcw0k5k7bisg2nlxic185qydca0y844khg"; }; "de04f7b02c49aa87b2b6da18c62a5ff36858352c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/de04f7b02c49aa87b2b6da18c62a5ff36858352c; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/de04f7b02c49aa87b2b6da18c62a5ff36858352c"; sha256 = "1fljk9j3l64v4yf4by4n22pfdxa63frilac93wbw663nb7w5hrw6"; }; "de2d73029d96c42d88f7765a10be8b6af0007eb8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2701057-ddd66ac9b77f4863be4b1dc8e90d0e10/de2d73029d96c42d88f7765a10be8b6af0007eb8; + url = "http://cdn.unrealengine.com/dependencies/2701057-ddd66ac9b77f4863be4b1dc8e90d0e10/de2d73029d96c42d88f7765a10be8b6af0007eb8"; sha256 = "10hc364qj9mav9nqa8jvkiwmmrmx24xqpn8gknra4iw7nqhp43c8"; }; "de40a1a3ef4f09ae9523868d74d8cc9af2745ec8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/de40a1a3ef4f09ae9523868d74d8cc9af2745ec8; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/de40a1a3ef4f09ae9523868d74d8cc9af2745ec8"; sha256 = "16jhqdx31vid1knbfldhwf3d4vlap6p815q6ri64fb5g0drny9zn"; }; "de7be9bd446cca2c3d817d2f1d7042e9a6f27378" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/de7be9bd446cca2c3d817d2f1d7042e9a6f27378; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/de7be9bd446cca2c3d817d2f1d7042e9a6f27378"; sha256 = "139pvk98m51s0i31s4621x83cdx81459fw5jj7sr1kby3g900adh"; }; "dea23be7b0f4c3aec67d1c95e616bc04d4e99100" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/dea23be7b0f4c3aec67d1c95e616bc04d4e99100; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/dea23be7b0f4c3aec67d1c95e616bc04d4e99100"; sha256 = "09z1az90fg35rp8rfsnlqh5bhgrw1pdw14lkavnhz1kcpxzg429h"; }; "debdde2d089368f9ec40b6d50aed4cab14a4e785" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2533444-8b800f9092dc4a4c822daa186a0dd399/debdde2d089368f9ec40b6d50aed4cab14a4e785; + url = "http://cdn.unrealengine.com/dependencies/2533444-8b800f9092dc4a4c822daa186a0dd399/debdde2d089368f9ec40b6d50aed4cab14a4e785"; sha256 = "1gvk274y842is0k67pancjpbw7s0yqv1lqz36ar2l84b7mky9ncq"; }; "debfd2113b48ed4529163d952262d80fe8cc11f1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/debfd2113b48ed4529163d952262d80fe8cc11f1; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/debfd2113b48ed4529163d952262d80fe8cc11f1"; sha256 = "0ijv1i1xdsj15b63dvj1j248bcqylbp62cncza464jzpf1mgmjl1"; }; "df2925eb96fbc24fb45e29b8553772c650ff8c53" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/df2925eb96fbc24fb45e29b8553772c650ff8c53; + url = "http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/df2925eb96fbc24fb45e29b8553772c650ff8c53"; sha256 = "1msa6jm9c3x8150sci2bbs47l424xchjfgg5ixr388q5fiqjwv50"; }; "df3e6640f45ebf0909095b9ae74a7cb7404e447d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/df3e6640f45ebf0909095b9ae74a7cb7404e447d; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/df3e6640f45ebf0909095b9ae74a7cb7404e447d"; sha256 = "1rg63nvywdrzwvslzpq8z53wkhfm3fgw8x7lzxkqay58v3npdz44"; }; "df4ccc222a9b196a9484691be86f2d14462b2357" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/df4ccc222a9b196a9484691be86f2d14462b2357; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/df4ccc222a9b196a9484691be86f2d14462b2357"; sha256 = "17gf45g193ind6i7m49ckwxrfffryi1xp3dl8gkgfj8q9yvlh01n"; }; "df5437931a8964c846c6c9377f381c0213082e22" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/df5437931a8964c846c6c9377f381c0213082e22; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/df5437931a8964c846c6c9377f381c0213082e22"; sha256 = "0hllda7r7v1nvffb504djzc2l6l6bg1ldl3fgn5dz152jgvylq95"; }; "df54fb21975e218c1da9d209d52b225e78430abf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/df54fb21975e218c1da9d209d52b225e78430abf; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/df54fb21975e218c1da9d209d52b225e78430abf"; sha256 = "0cdj50yxdl4lfpmhydkymzc5p1zb07z86cgqmsyqs3b4xp7a410n"; }; "df6d4711f83f1c570af30ec97dd418f0664398b5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/df6d4711f83f1c570af30ec97dd418f0664398b5; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/df6d4711f83f1c570af30ec97dd418f0664398b5"; sha256 = "03vr4pvvr03nwwf4jp3q0fps1kaybk327z6r80cf934q8dq1hmam"; }; "df7074a5b6e12f2c024e07d5dd9fdcd863f0553a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2574758-8fd9f8c50854489f98b3664933c83100/df7074a5b6e12f2c024e07d5dd9fdcd863f0553a; + url = "http://cdn.unrealengine.com/dependencies/2574758-8fd9f8c50854489f98b3664933c83100/df7074a5b6e12f2c024e07d5dd9fdcd863f0553a"; sha256 = "0m9mk7mr9i2i0rly7jb9vbz000rpxmpgrlawa1isvgpp98nq9jx9"; }; "df877ce5674ccd5af752d839ce7729c724750815" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/df877ce5674ccd5af752d839ce7729c724750815; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/df877ce5674ccd5af752d839ce7729c724750815"; sha256 = "087wfyc54y7ay8bh5ml8g46402pk42mmimzvlpskq6vz6hwqbwg1"; }; "dfd7ec76ea282f899f489dcf84e86c17e2d5176b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/dfd7ec76ea282f899f489dcf84e86c17e2d5176b; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/dfd7ec76ea282f899f489dcf84e86c17e2d5176b"; sha256 = "0yhnv54lb22ksa1b9rd12jwrpbfia6v46j60qszgp3wfzh927b7p"; }; "dfdacbcbdca178e9cf577d37637399e02c80c006" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/dfdacbcbdca178e9cf577d37637399e02c80c006; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/dfdacbcbdca178e9cf577d37637399e02c80c006"; sha256 = "1k16n6jf7jv3ja47faf27vkbhcwn99y6rgfzk5d9m5r18326m6is"; }; "e002d0958c673752ae43a0801b444a2ce1624b4a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/e002d0958c673752ae43a0801b444a2ce1624b4a; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/e002d0958c673752ae43a0801b444a2ce1624b4a"; sha256 = "14wkqdp6bwy7i9dx9lb7fxrhwsspxwn9hpsxc3qqd43gbff6vmg0"; }; "e02e3dbebd645b7ffc82cb42b41d79fd60a268cd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2634392-be4d7ed7261341cdaeeca1438154a993/e02e3dbebd645b7ffc82cb42b41d79fd60a268cd; + url = "http://cdn.unrealengine.com/dependencies/2634392-be4d7ed7261341cdaeeca1438154a993/e02e3dbebd645b7ffc82cb42b41d79fd60a268cd"; sha256 = "1gj5921y97f0f64iqf566hpsmm8gf39p0x51ps67r5hk89k52gj8"; }; "e03589b69f1b5cdf2431809897f2a1287d4d1db2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/e03589b69f1b5cdf2431809897f2a1287d4d1db2; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/e03589b69f1b5cdf2431809897f2a1287d4d1db2"; sha256 = "0bwr0lf8b523kwgrakm6cj2rpcaw1ql213xsa4gmaxbqjxmhjwn9"; }; "e0a2c1da63edd46fd58df91cebed0a6ba9d4e2ba" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e0a2c1da63edd46fd58df91cebed0a6ba9d4e2ba; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e0a2c1da63edd46fd58df91cebed0a6ba9d4e2ba"; sha256 = "1wlxk5v5jabmdg4i6nm91kqgx4lak68455chgyyzw83n3921cwc6"; }; "e0b52177b69db23587e60178455553700fca7a3e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e0b52177b69db23587e60178455553700fca7a3e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e0b52177b69db23587e60178455553700fca7a3e"; sha256 = "1dpp1ixnl806d5b7ag0chzd771nrlqpr0vp0xg6sqz77y9f64jdc"; }; "e0da56b57fd7c9eadf21a0c6bcaa75267e6eddd0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/e0da56b57fd7c9eadf21a0c6bcaa75267e6eddd0; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/e0da56b57fd7c9eadf21a0c6bcaa75267e6eddd0"; sha256 = "05phccb0fvx9li9yr689l2wxbana6hvzljwsn1a2113rkh794gql"; }; "e10e19c255056c096d6105cfbff767f6749ffeea" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/e10e19c255056c096d6105cfbff767f6749ffeea; + url = "http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/e10e19c255056c096d6105cfbff767f6749ffeea"; sha256 = "0356fyglgynnlm1myic04f0g9c1yz12zz8z4vi7j8plypnsanqs8"; }; "e119a785ae743089d9760220e95431e5b5a828c3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e119a785ae743089d9760220e95431e5b5a828c3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e119a785ae743089d9760220e95431e5b5a828c3"; sha256 = "1vqrm60v9jgd3xdvdwkavxfapl1424pcwm0w9zn4gypbkwfigs8g"; }; "e1a0aba6fa5c1c2bd71eb9f8b6fa3b6bd0c08378" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/e1a0aba6fa5c1c2bd71eb9f8b6fa3b6bd0c08378; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/e1a0aba6fa5c1c2bd71eb9f8b6fa3b6bd0c08378"; sha256 = "1qvnscdxnyyps3sm2625hjvb2glkcaxj3kd4qhcpaw99p22cp61z"; }; "e1a2109b7b2cea0b5a275ee93d3ec4dd15bda288" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e1a2109b7b2cea0b5a275ee93d3ec4dd15bda288; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e1a2109b7b2cea0b5a275ee93d3ec4dd15bda288"; sha256 = "0b1namzxfx0pshfcixvzwpm19d29ma70wbsb5v37jx79bwplxvly"; }; "e1fb2b61f5ab2e0ded49292c3ba53d25ee0e31d4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e1fb2b61f5ab2e0ded49292c3ba53d25ee0e31d4; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e1fb2b61f5ab2e0ded49292c3ba53d25ee0e31d4"; sha256 = "04xd0vdrqrlnakxg94racp4q4rqq8z383n6jyg798g386gd2nkyw"; }; "e214f8d9834372bc3a68863ed9b25f6d3468aab6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e214f8d9834372bc3a68863ed9b25f6d3468aab6; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e214f8d9834372bc3a68863ed9b25f6d3468aab6"; sha256 = "1x8alx8qywjysqs8fznf7f2rgz47ryi02711fj2vdifhiazl81z6"; }; "e2e2347e195fcb6908121d1d8252b675c0225733" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e2e2347e195fcb6908121d1d8252b675c0225733; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e2e2347e195fcb6908121d1d8252b675c0225733"; sha256 = "0am2g2w1p9gbdc4r75gib8kadfkzxk0pl93bkggrvbc04gaajq0y"; }; "e2f498b239aa783a65b663c31fbe397e04857c5f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e2f498b239aa783a65b663c31fbe397e04857c5f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e2f498b239aa783a65b663c31fbe397e04857c5f"; sha256 = "1abyxjalrqhvinl4agkhc5mwyvi18hip7v6rjvvzxi6c6jvlfbsf"; }; "e2f8447f74d7ae894d6ebc37fd1de2b774b15bb2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/e2f8447f74d7ae894d6ebc37fd1de2b774b15bb2; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/e2f8447f74d7ae894d6ebc37fd1de2b774b15bb2"; sha256 = "08j2hxs3grsfk5y3xfq4ch1z4hd9rwgn5yfzd2h31ldrpyx4r39y"; }; "e2ff2a15b3b4f835c8275051591b9d4de07df86b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/e2ff2a15b3b4f835c8275051591b9d4de07df86b; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/e2ff2a15b3b4f835c8275051591b9d4de07df86b"; sha256 = "0q77kjwr6xi1drxv0kqxc4kbm93r42ygsyxfyk2rqjfa30v72496"; }; "e3adc0e94fdc76e94c4297ae60dc8b7678ff6d13" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/e3adc0e94fdc76e94c4297ae60dc8b7678ff6d13; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/e3adc0e94fdc76e94c4297ae60dc8b7678ff6d13"; sha256 = "1cihl2vayvhqd8g2jvnzirfv2a2c7dadyvg2cmkd8rdcf7ry7r7m"; }; "e3e99323ec9693b9c6beafc30a7c439d27d51019" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/e3e99323ec9693b9c6beafc30a7c439d27d51019; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/e3e99323ec9693b9c6beafc30a7c439d27d51019"; sha256 = "1dw27yqsfdh6d8p4d9afwn9pz8dhd1lw1y72vw6vj15ns1m1hsj3"; }; "e3f2410485eaec849a562752ca8348217b12f390" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2611810-c0cf8ef9a734410da79e56e1df15e175/e3f2410485eaec849a562752ca8348217b12f390; + url = "http://cdn.unrealengine.com/dependencies/2611810-c0cf8ef9a734410da79e56e1df15e175/e3f2410485eaec849a562752ca8348217b12f390"; sha256 = "17n58ay2q59xc7d02dxzx4lxcqf1fm92pyz07w6fjlwiqlr30pz6"; }; "e412f545b4a58b60e62cd1dcf57ca25871356b05" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2515174-63b13cf90d1f431ebc611d28340ef4ba/e412f545b4a58b60e62cd1dcf57ca25871356b05; + url = "http://cdn.unrealengine.com/dependencies/2515174-63b13cf90d1f431ebc611d28340ef4ba/e412f545b4a58b60e62cd1dcf57ca25871356b05"; sha256 = "19vbfalid5jpg1x9dbxip4fbdvpvyrhdjz8wfk9ysiw8nbk1xyj2"; }; "e4328c9505893ca9157deacf1baf1aea7d01f8d4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e4328c9505893ca9157deacf1baf1aea7d01f8d4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e4328c9505893ca9157deacf1baf1aea7d01f8d4"; sha256 = "0ksgc1abgwmhgz9j557l6kj6awdfzivm08dfk0n4bspc8dmdp728"; }; "e458507f455e3bac9232d632426fc4b75f29841d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e458507f455e3bac9232d632426fc4b75f29841d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e458507f455e3bac9232d632426fc4b75f29841d"; sha256 = "1y3w5h0ss3iq6sv0pmzw8n62s3asp616j6n3fqy8vja3bm6s57hr"; }; "e465c13305ee8aa9186e587aed90d1007e5b31e7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e465c13305ee8aa9186e587aed90d1007e5b31e7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e465c13305ee8aa9186e587aed90d1007e5b31e7"; sha256 = "04ig4zfzv4g24yr882hfrx4570jvhd3abvpig9mc1d7x6hg2vnn3"; }; "e4770351a3cb31df020fd6bff26ce03237621428" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e4770351a3cb31df020fd6bff26ce03237621428; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e4770351a3cb31df020fd6bff26ce03237621428"; sha256 = "1sza989jj7mhwv60ridbqpypskddsyx97vrlpflwq4i8xk8f0qhn"; }; "e4db89beb65b004392150dc83a65a28ea62cb155" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/e4db89beb65b004392150dc83a65a28ea62cb155; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/e4db89beb65b004392150dc83a65a28ea62cb155"; sha256 = "14b951ymdf4difjjrcc9n6kg5ib5wks26kdagrr04bdb0qpv6m5s"; }; "e4e9b76a89d03aea789e6df7b7dcbc13cc7ca8cf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/e4e9b76a89d03aea789e6df7b7dcbc13cc7ca8cf; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/e4e9b76a89d03aea789e6df7b7dcbc13cc7ca8cf"; sha256 = "1v9ldnkaq65zym2d439zbqvybfvpwj30hj6mdhwny84mf71kimmi"; }; "e4fa82ded20830726a04678904111f9fa6f26954" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621793-1958bfdd4e3b49f3a0ca6a4c08a60a0a/e4fa82ded20830726a04678904111f9fa6f26954; + url = "http://cdn.unrealengine.com/dependencies/2621793-1958bfdd4e3b49f3a0ca6a4c08a60a0a/e4fa82ded20830726a04678904111f9fa6f26954"; sha256 = "0r22snlddx333vbz83h776njmycshb8kmx2biw7hs4qfyvj99y0j"; }; "e50119c064462a0e056574db4e21f359f7f0c159" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e50119c064462a0e056574db4e21f359f7f0c159; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e50119c064462a0e056574db4e21f359f7f0c159"; sha256 = "0gb1rbclzkxs1c63ylabam1il1nw85xvrd7n3s3gjb7s7dq5mmwb"; }; "e5146f66274a1f5409227f94447af2a1f4bfafd9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/e5146f66274a1f5409227f94447af2a1f4bfafd9; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/e5146f66274a1f5409227f94447af2a1f4bfafd9"; sha256 = "0vcn9fr140kvc5z65ra6qjymfzc4dmgmds4mnzg7n29bfkvmsxff"; }; "e55d8897009789617d8b961ae3c6c1d00a845bb3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/e55d8897009789617d8b961ae3c6c1d00a845bb3; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/e55d8897009789617d8b961ae3c6c1d00a845bb3"; sha256 = "1rc7xs76q551a7vcy9642jrgvbl97y98gkdqkrb62ibpv3c2g4ps"; }; "e5e8a89007ed0e73685f9b0366b1eedf31f4c1e8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/e5e8a89007ed0e73685f9b0366b1eedf31f4c1e8; + url = "http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/e5e8a89007ed0e73685f9b0366b1eedf31f4c1e8"; sha256 = "19w1q3wxbskznn1yiyzmds6dsnnb5ik31lhdqsxzqzjm0hl01m1w"; }; "e62a73c1c93258f0b94c3cc46e35318469afe84e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e62a73c1c93258f0b94c3cc46e35318469afe84e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e62a73c1c93258f0b94c3cc46e35318469afe84e"; sha256 = "1yrwbvldncip3xpcxq2n9q707z21zg85yxhgvp37j24nqagm6wfi"; }; "e65191a9b59946c7f04782468840b7352ab5c96b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/e65191a9b59946c7f04782468840b7352ab5c96b; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/e65191a9b59946c7f04782468840b7352ab5c96b"; sha256 = "0q8qnncfb723n9ljzfsyi7v44q2301v37c2yjcaqdvs6vaij517x"; }; "e67a9dfa527d0eeb0ed24ef9d5e22b41baa25251" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e67a9dfa527d0eeb0ed24ef9d5e22b41baa25251; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e67a9dfa527d0eeb0ed24ef9d5e22b41baa25251"; sha256 = "0vplmbsk6zpr416x96fdshakjymwa631y78c0sr24gqd853w88b4"; }; "e6a8b07d1017a517555ae184a3ce22fa2b948c72" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/e6a8b07d1017a517555ae184a3ce22fa2b948c72; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/e6a8b07d1017a517555ae184a3ce22fa2b948c72"; sha256 = "0wvi5d9ndis8zrbxgy62m6hmr3bvgygfw4hmq6gqay12z78rvchy"; }; "e6b8c05e76abc49f7a2264f2b95199b825fa851c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e6b8c05e76abc49f7a2264f2b95199b825fa851c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e6b8c05e76abc49f7a2264f2b95199b825fa851c"; sha256 = "0m4dwy0mmyr0f1vjk8grqiapwc1q36cj3ischp2gf2ibj1xxiixa"; }; "e6fda4b3f8fe12c3bbe8ccf91bdcc8d759ea1ea2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e6fda4b3f8fe12c3bbe8ccf91bdcc8d759ea1ea2; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e6fda4b3f8fe12c3bbe8ccf91bdcc8d759ea1ea2"; sha256 = "0ggsvrwnfp10h4ns5vadpxnxm6m0nf5i0zr3i57k2h2kxx7vn192"; }; "e70061ffc85b6027a648cac0b1c8c6ef7d4e3106" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/e70061ffc85b6027a648cac0b1c8c6ef7d4e3106; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/e70061ffc85b6027a648cac0b1c8c6ef7d4e3106"; sha256 = "0y2lka9gippprgffs4w1p6yh3kvj8m3d749ysbc8lwjvijhh0dyg"; }; "e70429fd818fe983008a06e931d39724ea7a382c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e70429fd818fe983008a06e931d39724ea7a382c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e70429fd818fe983008a06e931d39724ea7a382c"; sha256 = "0vhfpdbbv46z7kdl1dlnn7mlcpvygn4k6fb8wdgykavp0phzhj4j"; }; "e76c34cb7cbdb14d92e415c4af5ccdc344c4c58d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e76c34cb7cbdb14d92e415c4af5ccdc344c4c58d; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e76c34cb7cbdb14d92e415c4af5ccdc344c4c58d"; sha256 = "0jkx8w6p77l53233cac8gzbwdmbbs3znkw588g8mcvwzkpszwbxi"; }; "e77064e9ba8339459d66bc680e55880bbcc5991f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/e77064e9ba8339459d66bc680e55880bbcc5991f; + url = "http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/e77064e9ba8339459d66bc680e55880bbcc5991f"; sha256 = "1fc9jnqb7l5v20asz6cqyrp8vr0617n35k41wrqdcsy0qib9alkn"; }; "e7808a43acaf99637e43857c76760d74f77d6ae5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e7808a43acaf99637e43857c76760d74f77d6ae5; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e7808a43acaf99637e43857c76760d74f77d6ae5"; sha256 = "0s88msrsnmcqnjyzk7afzf6wikwyajjlybq7jsjyfaax4vaj1cbv"; }; "e7a4ddc64af2a43bf5c7d439244636d60a7dae07" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2500002-69b23dcf7a2d4165b2b432780845acb0/e7a4ddc64af2a43bf5c7d439244636d60a7dae07; + url = "http://cdn.unrealengine.com/dependencies/2500002-69b23dcf7a2d4165b2b432780845acb0/e7a4ddc64af2a43bf5c7d439244636d60a7dae07"; sha256 = "13i3cnkrkk0z01bf0prl77wmx4qbnckihgbxjv34lizv3mhd1yzg"; }; "e7fdcefcd4a8853ab010e1eb4f2d88b5bd9726a9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e7fdcefcd4a8853ab010e1eb4f2d88b5bd9726a9; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e7fdcefcd4a8853ab010e1eb4f2d88b5bd9726a9"; sha256 = "1v4yq5b9rng7p1jsvhlnqvcxpnfd1iwmnmd9ygq25prxirlklx8z"; }; "e85ad2ef6896adbbc28a46b023af6b64deb29b88" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e85ad2ef6896adbbc28a46b023af6b64deb29b88; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e85ad2ef6896adbbc28a46b023af6b64deb29b88"; sha256 = "1albg4m9z0g6rv7bqd3mzb8k6r07n6hin3s05gzhl21qqiarwf95"; }; "e902a543218c50ffc9cd9a41bd8d53d0df1939c2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/e902a543218c50ffc9cd9a41bd8d53d0df1939c2; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/e902a543218c50ffc9cd9a41bd8d53d0df1939c2"; sha256 = "17b3c4kp6a9kbs2k473zygn7w2xmmb19z3sk08alcp658isby3l4"; }; "e997f5bba3b4d4b283427ec3ca644a876f6dee7d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e997f5bba3b4d4b283427ec3ca644a876f6dee7d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e997f5bba3b4d4b283427ec3ca644a876f6dee7d"; sha256 = "1gc2rzz40ipkjy17fz6qiwsv2wxi4qmblmp0rbvafg8mgrhs2jnf"; }; "e9a64dd557215b53134c33355716c8a4bd1e22f7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2622402-86d1483fa60742b6be9fd5a0b0b946e0/e9a64dd557215b53134c33355716c8a4bd1e22f7; + url = "http://cdn.unrealengine.com/dependencies/2622402-86d1483fa60742b6be9fd5a0b0b946e0/e9a64dd557215b53134c33355716c8a4bd1e22f7"; sha256 = "1kjvf0spvmp1r8yh75n39a64w3xp1qiw17w8fv6lip3df8dbjywi"; }; "e9b508ed95c44a9c9e0d979b1ae02f7dcd5590a6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e9b508ed95c44a9c9e0d979b1ae02f7dcd5590a6; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e9b508ed95c44a9c9e0d979b1ae02f7dcd5590a6"; sha256 = "01dl9z60593mizz76sg55zhc949sgxcdp60vkfhrdkhl1l212sga"; }; "e9c7b3390ef65a90310c9cd4a97594bff007303c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/e9c7b3390ef65a90310c9cd4a97594bff007303c; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/e9c7b3390ef65a90310c9cd4a97594bff007303c"; sha256 = "0jnx4b7pkycly81dka9vn01ky96j0xnzxg0f4z5fpfl8z8al3cgh"; }; "e9cec016ae177e586ef08f408aec2f7c4de9afdc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/e9cec016ae177e586ef08f408aec2f7c4de9afdc; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/e9cec016ae177e586ef08f408aec2f7c4de9afdc"; sha256 = "0k193y1kbmjq6yjxdgv59w1dn9f1b8i7yr2dbzwi2cr57wx3h483"; }; "e9d6f32dcb7a670874503cb3cb5d73fd9cb09cb2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e9d6f32dcb7a670874503cb3cb5d73fd9cb09cb2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e9d6f32dcb7a670874503cb3cb5d73fd9cb09cb2"; sha256 = "0k3rw21ngsf677m8q4n1zil9fmbsdd97sxss3jv6hkyjq5r6djxl"; }; "e9f10cc1fed35407864f324f08f3c9fcb5a2847f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e9f10cc1fed35407864f324f08f3c9fcb5a2847f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e9f10cc1fed35407864f324f08f3c9fcb5a2847f"; sha256 = "1fz73zsa0f4dma3v47s0dcgdzz8aniryvmpx9rpx955rckrrawsg"; }; "ea58f8314459f7bf1d36a672ccc1f2c60c4e0eba" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ea58f8314459f7bf1d36a672ccc1f2c60c4e0eba; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ea58f8314459f7bf1d36a672ccc1f2c60c4e0eba"; sha256 = "1xlyfkxpk86w2ik8ppx6czlx6b5jfvz33k6in9y0zvpi1mvkvam3"; }; "ea7cb20f21cb971f2f7da29210e7bba16e97a53f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ea7cb20f21cb971f2f7da29210e7bba16e97a53f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ea7cb20f21cb971f2f7da29210e7bba16e97a53f"; sha256 = "1vl4hy09jqhb9h43gn6ymnq2027yc7cfvwh5bn860mj5syayjznl"; }; "eaceaa2d359d151c5394522df962ce393938a21b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/eaceaa2d359d151c5394522df962ce393938a21b; + url = "http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/eaceaa2d359d151c5394522df962ce393938a21b"; sha256 = "124s81bi0y3sx8r6f4qp7mb5294bivjickw7izg0qym3r35vpvy8"; }; "eaea434c65e3ccf8cec643ea1ec391bdddbc6fac" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/eaea434c65e3ccf8cec643ea1ec391bdddbc6fac; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/eaea434c65e3ccf8cec643ea1ec391bdddbc6fac"; sha256 = "0mdxz6820gcwgzaaipg8k0psddp4i5k0kgl4771kp3my736zsdp1"; }; "eb24d02e3515e1a1c0df3b6323b5ba9b795e16e3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/eb24d02e3515e1a1c0df3b6323b5ba9b795e16e3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/eb24d02e3515e1a1c0df3b6323b5ba9b795e16e3"; sha256 = "02768h2a16rzwn5d1qrcbxydi0nijyaf301aac32ngsp92y24ycg"; }; "eb942c482591c680356ad05c627b9153756a5c8a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/eb942c482591c680356ad05c627b9153756a5c8a; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/eb942c482591c680356ad05c627b9153756a5c8a"; sha256 = "05vpd0hwalasgjskblzqba8xadmrj10mjsvqis7chdq0am7g66r9"; }; "ebb51925dec18058068c3d6ba8d32c6bd5d8f5a8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ebb51925dec18058068c3d6ba8d32c6bd5d8f5a8; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ebb51925dec18058068c3d6ba8d32c6bd5d8f5a8"; sha256 = "0k1w16kh1fbk255qg9lhnbb192lifjskv5mqkd95rmzacpk1vypi"; }; "ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74"; sha256 = "0iqxilmibqdpcl0k2qvcipw1nphvxykqi0b04si2mls71lawrklz"; }; "ebf62a48af4d0a972019aca5d8365670d7260bdd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ebf62a48af4d0a972019aca5d8365670d7260bdd; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ebf62a48af4d0a972019aca5d8365670d7260bdd"; sha256 = "14gfqpfqr5nnj8q26vxa10c5p793zkf57j60563bk5ijm2rxrmgp"; }; "ebf8732591def396954f78bf472667f690877f95" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ebf8732591def396954f78bf472667f690877f95; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ebf8732591def396954f78bf472667f690877f95"; sha256 = "13p11mvlnanlc64ap1xmq69m0gqgcks2jvh0f3j546dgw9x36yvc"; }; "ec13b2ec5777dbbd7c22e1e2bdcb3e127496b370" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621793-1958bfdd4e3b49f3a0ca6a4c08a60a0a/ec13b2ec5777dbbd7c22e1e2bdcb3e127496b370; + url = "http://cdn.unrealengine.com/dependencies/2621793-1958bfdd4e3b49f3a0ca6a4c08a60a0a/ec13b2ec5777dbbd7c22e1e2bdcb3e127496b370"; sha256 = "0fqy9izbfficxmzf1pbw9w4yasvs55dawm0186afpkg7gcc8rqvd"; }; "ec35da884d7ee63a6b73a14153ebc0ef84e83072" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ec35da884d7ee63a6b73a14153ebc0ef84e83072; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ec35da884d7ee63a6b73a14153ebc0ef84e83072"; sha256 = "0vg8qmf8v73d2zg51yixzhsrgd92d03s5lfviympplshychims77"; }; "ec59e3143dfd3d4c018548a31a6481bc3f9e1137" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2431986-5a8dd079cf514ebd8b20693fadfa5a4e/ec59e3143dfd3d4c018548a31a6481bc3f9e1137; + url = "http://cdn.unrealengine.com/dependencies/2431986-5a8dd079cf514ebd8b20693fadfa5a4e/ec59e3143dfd3d4c018548a31a6481bc3f9e1137"; sha256 = "1qfg4cmvb07q61rkj8ca6wzly9zzfaqbx77jlvy5gc0yn4mpijfy"; }; "ec5de1727c79fc933c910e364d19af5e7ebcbf99" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ec5de1727c79fc933c910e364d19af5e7ebcbf99; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ec5de1727c79fc933c910e364d19af5e7ebcbf99"; sha256 = "1cppbmy26118b0gxz6j4zk0zi9rlnd2v1pcbkj1ba86mh6b2d1bh"; }; "ec6d576df884aeea2ed37256df7caa8cc8040d6e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ec6d576df884aeea2ed37256df7caa8cc8040d6e; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ec6d576df884aeea2ed37256df7caa8cc8040d6e"; sha256 = "1139k9957gbripd65125gp72lg303z10j7yzkfafpbkkixbsi4n1"; }; "eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77"; sha256 = "1xd4y3y13qw8nm29d7w55k2cdy50j3jsndm7yhay2ciwwl9jqlhp"; }; "ed023b655c8dbac838b64bf7e6103b7e9d563ad0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/ed023b655c8dbac838b64bf7e6103b7e9d563ad0; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/ed023b655c8dbac838b64bf7e6103b7e9d563ad0"; sha256 = "0d53hk0wkgrr8nwa74326ni3z00fmwvifq1i1fj4wca0n3qlgq3j"; }; "ed23ade7aa2af09963a993ee53ab33389aae2e80" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ed23ade7aa2af09963a993ee53ab33389aae2e80; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ed23ade7aa2af09963a993ee53ab33389aae2e80"; sha256 = "1215la804zb4hnc6ily5vjzyrvzb0npyjfjl19kb8qrmcyiymfpz"; }; "ed2c9b990f683ecb84050df89e925e9f65e3883f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/ed2c9b990f683ecb84050df89e925e9f65e3883f; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/ed2c9b990f683ecb84050df89e925e9f65e3883f"; sha256 = "1aixypsgvv780pyy8ncizmmysfx1hjym9rbb3m0h4xiizcl4q5ym"; }; "ed384e6a16f79979d70b9926060a68eeb610de53" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/ed384e6a16f79979d70b9926060a68eeb610de53; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/ed384e6a16f79979d70b9926060a68eeb610de53"; sha256 = "0bx62ijccnfyrknqrcw3ymvzvdjgc0qpllzaqn9vhnygxsjy4w2f"; }; "ed8d4fee989f83055b4947da8ddd5639f8168782" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ed8d4fee989f83055b4947da8ddd5639f8168782; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ed8d4fee989f83055b4947da8ddd5639f8168782"; sha256 = "1gf587b6qa3n3m3abshiw26nypr4wnzzj4i9qycfr33aasasgckg"; }; "edcad0b0c2862c776fa60784960b9a3a8b3ce6ef" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/edcad0b0c2862c776fa60784960b9a3a8b3ce6ef; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/edcad0b0c2862c776fa60784960b9a3a8b3ce6ef"; sha256 = "10ffm3i1lbyx05ffl8mksp58kagfwdh8kqfgplyxnlxpn2qxf48f"; }; "edd66f69f77a99b2383d34436d6be71565769a43" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/edd66f69f77a99b2383d34436d6be71565769a43; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/edd66f69f77a99b2383d34436d6be71565769a43"; sha256 = "0h7giabjphgikhdrc6r662xb0ahw4spr89jhckzgplr4l8z8nzz5"; }; "ee33cb45be04ea08ab507a4058d81bcdd1da7746" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2761703-4d21a69f627145d58d1b542fa90eeb3e/ee33cb45be04ea08ab507a4058d81bcdd1da7746; + url = "http://cdn.unrealengine.com/dependencies/2761703-4d21a69f627145d58d1b542fa90eeb3e/ee33cb45be04ea08ab507a4058d81bcdd1da7746"; sha256 = "0n99fhb5qng2x0y5rxp4x88jsdcyqliqi1z078lj6qhsjd8dmqlh"; }; "ee8662030dbca92bd70af3ba1550ece5c275d13e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ee8662030dbca92bd70af3ba1550ece5c275d13e; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ee8662030dbca92bd70af3ba1550ece5c275d13e"; sha256 = "00hfl5h4yk3mc8dhxrlk0zg8nyfgrnmzzhglk0vgzi3mkcvc7jv1"; }; "eeaa24c1e61cc4b0806496b256349c44f84c02bc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/eeaa24c1e61cc4b0806496b256349c44f84c02bc; + url = "http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/eeaa24c1e61cc4b0806496b256349c44f84c02bc"; sha256 = "10kzf6q01v3xd9s7d594biwjy4zzq4wgnqq0ib50ii62rsvli112"; }; "eef24b0bf5f818f43c64498f50e0a79f5b683883" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/eef24b0bf5f818f43c64498f50e0a79f5b683883; + url = "http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/eef24b0bf5f818f43c64498f50e0a79f5b683883"; sha256 = "0sg9nyp4gvcqmxdx842nr9szfk1fmi4nrwxmmyvqhs774xavxw4d"; }; "ef8182b6df585c7dd91f05618e06fd8ee15be5f3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/ef8182b6df585c7dd91f05618e06fd8ee15be5f3; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/ef8182b6df585c7dd91f05618e06fd8ee15be5f3"; sha256 = "1xrjsspjnfapf26k3ppjx3fzlfcq7qdnxwhvfhn4669spw0a8zgi"; }; "ef923ee8da67064c7a03f02651b14c309db14a3c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ef923ee8da67064c7a03f02651b14c309db14a3c; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ef923ee8da67064c7a03f02651b14c309db14a3c"; sha256 = "1rc0v251migvcrhvxc7cmv3c5qp1a51fzff6whl7h1qqbzc82ick"; }; "efd4413cfd5173a82811ede79b4a13bad5f6a450" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/efd4413cfd5173a82811ede79b4a13bad5f6a450; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/efd4413cfd5173a82811ede79b4a13bad5f6a450"; sha256 = "1f76f939x8xkp5z2k8p0i70ig6i2m4ryj9lrc3x393sjlj26nqaa"; }; "efd812740856e722b88087211add0e268de83d7a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/efd812740856e722b88087211add0e268de83d7a; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/efd812740856e722b88087211add0e268de83d7a"; sha256 = "0yj404y245zicyqgwg2bs9l14gr9vlaakrawk3hdrr24m4lczyz9"; }; "efe81a03fc4e327388573f361faff5b233243834" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/efe81a03fc4e327388573f361faff5b233243834; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/efe81a03fc4e327388573f361faff5b233243834"; sha256 = "1hd7zv4pv604pfbvfya15g3rba9ip6pbzqm6vazi7q7znigzxyql"; }; "eff7dae5ebb303e1c5f823e0de1accf1075e8402" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/eff7dae5ebb303e1c5f823e0de1accf1075e8402; + url = "http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/eff7dae5ebb303e1c5f823e0de1accf1075e8402"; sha256 = "0fa1ikjab52kxkrxb5lnajvwa2ims8d5sm7mi52sx1f67gb3dnb3"; }; "f0263ddc2018e02536d900df1e275809633e73a5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/f0263ddc2018e02536d900df1e275809633e73a5; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/f0263ddc2018e02536d900df1e275809633e73a5"; sha256 = "0likfdcz1k5acs9w9gxb4r7236ws01cwllrq8qnz3sc2ym111bm1"; }; "f04bb0803c834328c048cff05056081b1d0e8120" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f04bb0803c834328c048cff05056081b1d0e8120; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f04bb0803c834328c048cff05056081b1d0e8120"; sha256 = "0rncg0q01swbkl9pwr7jia19vgpx2yyl1bmyf6l9gz9sfmin1a1i"; }; "f0887df1b56e17573badb6af33d52f7ec6fb6138" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/f0887df1b56e17573badb6af33d52f7ec6fb6138; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/f0887df1b56e17573badb6af33d52f7ec6fb6138"; sha256 = "1n0gg5af4i0bm854fbv7bvinwgjqda7fbr12q4zm0wqw41r19l3s"; }; "f0ae004e1cc9e390958b1988391d02b9c74849c3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f0ae004e1cc9e390958b1988391d02b9c74849c3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f0ae004e1cc9e390958b1988391d02b9c74849c3"; sha256 = "1k3gdybbilnkpsd2qf14gn6a0klb8ggdahmlp6wa373pvxf71vz6"; }; "f0d6a898c18d4750e572c04c2dc290f0628f238c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/f0d6a898c18d4750e572c04c2dc290f0628f238c; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/f0d6a898c18d4750e572c04c2dc290f0628f238c"; sha256 = "1a3ymsi7x4aw0dgb5i1yfq517x9i9fs01mb51irxaamiavxw2zdq"; }; "f13495e23590f813c800280c335b159a2f568a9d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f13495e23590f813c800280c335b159a2f568a9d; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f13495e23590f813c800280c335b159a2f568a9d"; sha256 = "14d25nmaic3j24dl6viy09alqi63q8vw71wzi7yxyhvgzy51ajv9"; }; "f1372e2ede9021ff61444ea132b18024ee271b60" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/f1372e2ede9021ff61444ea132b18024ee271b60; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/f1372e2ede9021ff61444ea132b18024ee271b60"; sha256 = "113m23b78k218ag72040ggm73846xdyyyfqjc83pzx5g7gfzswyk"; }; "f13adaffef53d65d806c3eb02f96c6c7f0ac7272" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f13adaffef53d65d806c3eb02f96c6c7f0ac7272; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f13adaffef53d65d806c3eb02f96c6c7f0ac7272"; sha256 = "1i7kv84qdf1srg0828yl4a984pc0c5gh6iqlh2wngxrk79vpvrmh"; }; "f14abb295c0159f6c8c07119ef3cd201b5062479" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/f14abb295c0159f6c8c07119ef3cd201b5062479; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/f14abb295c0159f6c8c07119ef3cd201b5062479"; sha256 = "05vakydf2xgpc07262dgv8h0761jswjcpz5z4gp6kan550zx46z4"; }; "f18da05b89b485f1870ff2b88125f3c1511f8805" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f18da05b89b485f1870ff2b88125f3c1511f8805; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f18da05b89b485f1870ff2b88125f3c1511f8805"; sha256 = "1xp77cwjj0iav25hk3w7n25mzchsbxbbkqhlicvqh41y4q489sxd"; }; "f199d69df437b77400f96b6d2d4f02360535404c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f199d69df437b77400f96b6d2d4f02360535404c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f199d69df437b77400f96b6d2d4f02360535404c"; sha256 = "1cm14f0i1k92l4flbc00gwvqnvpiwhyyx0g0rf4ssnyp2is9jhy3"; }; "f1e035fa0d8b44b2b3aeb9958e9dea3862744d82" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f1e035fa0d8b44b2b3aeb9958e9dea3862744d82; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f1e035fa0d8b44b2b3aeb9958e9dea3862744d82"; sha256 = "10k3dhgg4h26kjxrvqbvzx6vxq5v9qyi4iwk2csjpyp6xpwzb74q"; }; "f2374c3116e4d1fae6b4cbd246c9033e282a6c10" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/f2374c3116e4d1fae6b4cbd246c9033e282a6c10; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/f2374c3116e4d1fae6b4cbd246c9033e282a6c10"; sha256 = "07bjgb6ip8gzyckhsjwi1nlby9059givw8i7gxx09j9xmq6s6n15"; }; "f24d05b616e3f50a24367e32f8c42d68d40797a3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/f24d05b616e3f50a24367e32f8c42d68d40797a3; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/f24d05b616e3f50a24367e32f8c42d68d40797a3"; sha256 = "01an1abvb6w7id44avc3fp35919avvqspmgl24ygp872xz6g5glh"; }; "f268daf62521a638834ffec5779bd359e0ffe63d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/f268daf62521a638834ffec5779bd359e0ffe63d; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/f268daf62521a638834ffec5779bd359e0ffe63d"; sha256 = "0z4zbyjm9vlzk14r80j9ka8hdinylnbmf43mpna4rva27rqwsprh"; }; "f279ae70e30f66de7b592409e9ed96993301657f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f279ae70e30f66de7b592409e9ed96993301657f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f279ae70e30f66de7b592409e9ed96993301657f"; sha256 = "057dpl4pgjd8p98vik95gwdj2z42al9ibr210h1j92jdvyjxg99z"; }; "f286035c2605a855fb9dda2fc06bb71648b1dbe6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/f286035c2605a855fb9dda2fc06bb71648b1dbe6; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/f286035c2605a855fb9dda2fc06bb71648b1dbe6"; sha256 = "10vsqbadg5y58skq4p79vdxlkwqqfvac5v91kq4dflgcs4h05960"; }; "f288cbb85cc9eecfcf90abe6376c32c54435f879" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f288cbb85cc9eecfcf90abe6376c32c54435f879; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f288cbb85cc9eecfcf90abe6376c32c54435f879"; sha256 = "077rd0cqcpl629niwgs2qldrh4ld2xyiskg5x32m9igfwkq8dxyv"; }; "f2c0ebdd94707b207218226a42b19201386b9713" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2634249-f2b4469cf0774eac818e7cb4565f1224/f2c0ebdd94707b207218226a42b19201386b9713; + url = "http://cdn.unrealengine.com/dependencies/2634249-f2b4469cf0774eac818e7cb4565f1224/f2c0ebdd94707b207218226a42b19201386b9713"; sha256 = "126bhrrj1q7b04wpbiyk1c8j9dpnkinfmm47z330jwis5mblrzzy"; }; "f2cc42adcfafd68a62e7d1b7e6af4e4968c0be10" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2572690-84e70917b1c64a80b248151191ccd58a/f2cc42adcfafd68a62e7d1b7e6af4e4968c0be10; + url = "http://cdn.unrealengine.com/dependencies/2572690-84e70917b1c64a80b248151191ccd58a/f2cc42adcfafd68a62e7d1b7e6af4e4968c0be10"; sha256 = "0kqv0iiy4fmcnbizc17kl3h8jv1knvn0h687fdjk68jhpkfh1fmv"; }; "f2dfdcb3b2d9423b17c83e2bf5fea37b9bee4681" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/f2dfdcb3b2d9423b17c83e2bf5fea37b9bee4681; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/f2dfdcb3b2d9423b17c83e2bf5fea37b9bee4681"; sha256 = "1p8dafdpjr058agppmhm2b5flsgk43f7rzisiplhw3qbmxn8s98x"; }; "f2e462f932cdcf953218a6d7c9cf6aeebf7dbfe4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613635-9840736c5f9647ffa600ff7b7e36f4ea/f2e462f932cdcf953218a6d7c9cf6aeebf7dbfe4; + url = "http://cdn.unrealengine.com/dependencies/2613635-9840736c5f9647ffa600ff7b7e36f4ea/f2e462f932cdcf953218a6d7c9cf6aeebf7dbfe4"; sha256 = "07ypkcwj25x76055p99z54qramz975wlk3px6wy827i79zpgfx7s"; }; "f3543f8286961b827b3ed3afa8f7663b98d38b90" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2787088-b587684669f0414288401564922cf5d8/f3543f8286961b827b3ed3afa8f7663b98d38b90; + url = "http://cdn.unrealengine.com/dependencies/2787088-b587684669f0414288401564922cf5d8/f3543f8286961b827b3ed3afa8f7663b98d38b90"; sha256 = "09lc3lpn3d0hqpldqld38l7lgdj9xscnnsamly8bxcajm3y3d9vr"; }; "f355e6bd836583380c61a5ed5a0c5d6150fe7542" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/f355e6bd836583380c61a5ed5a0c5d6150fe7542; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/f355e6bd836583380c61a5ed5a0c5d6150fe7542"; sha256 = "1pblr5r97iwmyv1j54hgsisdp4f7vp3l8mwj8zkiggk7nih7yi03"; }; "f380b2adccc3afba7a9a9a501560525a8359a651" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/f380b2adccc3afba7a9a9a501560525a8359a651; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/f380b2adccc3afba7a9a9a501560525a8359a651"; sha256 = "0dh4k513j0q3h4ja144825fcc4cib1pfzjcpsr79kaj0villfp6i"; }; "f38889741341129aaa57f66f2c36e093673c46ea" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/f38889741341129aaa57f66f2c36e093673c46ea; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/f38889741341129aaa57f66f2c36e093673c46ea"; sha256 = "0nazhgzcmmrkkdjfqp29q2m01ca09cg2wwa23nvrjxra1bx394p4"; }; "f3a58411dee61c2a7993eb792fffd09b343e42eb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f3a58411dee61c2a7993eb792fffd09b343e42eb; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f3a58411dee61c2a7993eb792fffd09b343e42eb"; sha256 = "1xffc2cbd8ccs1sw7yy8vvqy9pvngg5jwlp4g8hnyvvf2jpd0532"; }; "f441f0d4f281e728c3ca0c5b5f0e5838637eefba" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/f441f0d4f281e728c3ca0c5b5f0e5838637eefba; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/f441f0d4f281e728c3ca0c5b5f0e5838637eefba"; sha256 = "122bsyzki9w8b2yz5l68k6yz9r4w7zs1949ii0ccy2d5dd707zzk"; }; "f44c1c4d05656c9a8e943d8738705031cef49e0b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/f44c1c4d05656c9a8e943d8738705031cef49e0b; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/f44c1c4d05656c9a8e943d8738705031cef49e0b"; sha256 = "0piwkmqxqgp7i6r5z39xv1yqwx4v7k01yy2l4j70fbqa8zcvikdw"; }; "f4569ad2ff2b2fc1e09a93d172caa5084bdfe887" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f4569ad2ff2b2fc1e09a93d172caa5084bdfe887; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f4569ad2ff2b2fc1e09a93d172caa5084bdfe887"; sha256 = "0hnzdxvy9l3jwp6mp9hfvgks9mikpbhkdnv9dc3ydyw46f8d8m6f"; }; "f49df27b644738c41a183cbea4451a65d6ed937d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f49df27b644738c41a183cbea4451a65d6ed937d; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f49df27b644738c41a183cbea4451a65d6ed937d"; sha256 = "1j2y6x1yilb35snqpsfz4d253hry23zbc2i1cas05yz7j06d248a"; }; "f4ac5ca56e38b43436485f6d2a480e5bc47d1e3c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/f4ac5ca56e38b43436485f6d2a480e5bc47d1e3c; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/f4ac5ca56e38b43436485f6d2a480e5bc47d1e3c"; sha256 = "1cpdciik3mh3nh4z255yja75fpvsq1bfiwd5zlia95ypvfvvabyf"; }; "f4b57562abffd4d02b186411d743d78de996f9c1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2528371-50b896349a4f4b48b4cce5ef240b0c45/f4b57562abffd4d02b186411d743d78de996f9c1; + url = "http://cdn.unrealengine.com/dependencies/2528371-50b896349a4f4b48b4cce5ef240b0c45/f4b57562abffd4d02b186411d743d78de996f9c1"; sha256 = "0lih22kxxnrnq7bg6hgmcszrjqidh89z6kz38c607wfgqks3f3fm"; }; "f4e5c321293ab07639b720b5f3c43e81d2476f5d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/f4e5c321293ab07639b720b5f3c43e81d2476f5d; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/f4e5c321293ab07639b720b5f3c43e81d2476f5d"; sha256 = "1rrzw4yms3rfdxb51sz6lfzh7w34v79fb6nlmqhs7zgjqg7nj5rq"; }; "f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74"; sha256 = "1ynp6x1zwx4kahvjp7c3k62f5kimg37l28v1jxrk42c6c590a9k1"; }; "f4f52945149f9b540099572fcd29c911f8f8fc18" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f4f52945149f9b540099572fcd29c911f8f8fc18; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f4f52945149f9b540099572fcd29c911f8f8fc18"; sha256 = "05jp9y3bsm2a5vyr6azbgn6isiw00wld1vbyw8f5sc7j4rbr2c8c"; }; "f51cdb5d1eca4ab02befd826a9ff14a8d168ba9d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f51cdb5d1eca4ab02befd826a9ff14a8d168ba9d; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f51cdb5d1eca4ab02befd826a9ff14a8d168ba9d"; sha256 = "0089lky37w6yfm4xlwqdlrdj3jj6k3bkyhw3nbhprlf94r8h8s5s"; }; "f56a72b63003eb41d4300d8b2b39b21f53acfc8c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/f56a72b63003eb41d4300d8b2b39b21f53acfc8c; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/f56a72b63003eb41d4300d8b2b39b21f53acfc8c"; sha256 = "0a0f4vfpncifw87j6h0ajnzwhk9d0s35l5s5dad6rp0ijh6d5axv"; }; "f56edcc07a586e9b6792c219e9e8eca444362bfa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f56edcc07a586e9b6792c219e9e8eca444362bfa; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f56edcc07a586e9b6792c219e9e8eca444362bfa"; sha256 = "1nk5jxlgscmsv9hnjqprsbkvc2g3wcdqx04xhnzcr992b4xr7p9a"; }; "f5a791771dabe2848c00de5551dea8e2ec534cc5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f5a791771dabe2848c00de5551dea8e2ec534cc5; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f5a791771dabe2848c00de5551dea8e2ec534cc5"; sha256 = "0wrs36vv55lzbzn2ixqyjnf15mf41xzbw7fvfgzcdxcmpscc76cy"; }; "f5a8823af793b1af1d0d25d57df351ef32bf3d40" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f5a8823af793b1af1d0d25d57df351ef32bf3d40; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f5a8823af793b1af1d0d25d57df351ef32bf3d40"; sha256 = "171lmzp6i9l2inwhpcif35v8j00dg44ipfkq1fxay58iinqjk9x1"; }; "f5d3ceb33b27c7cfc4a8e4689a6b49f594aea8e3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/f5d3ceb33b27c7cfc4a8e4689a6b49f594aea8e3; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/f5d3ceb33b27c7cfc4a8e4689a6b49f594aea8e3"; sha256 = "0pfplb9yqmhzxzkafhi8j5c8s7y9wqywrzxs7av8hnrhxxj0nasa"; }; "f602c209a799d0cc6814312718f806f70e09062b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f602c209a799d0cc6814312718f806f70e09062b; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f602c209a799d0cc6814312718f806f70e09062b"; sha256 = "1kjb7vbq5xqz9wdbcwsyayr6mrl5r6zczqb7pjpgavwx7kfk5xw8"; }; "f65aee70832fe31db72589b465574d372fa46ea9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/f65aee70832fe31db72589b465574d372fa46ea9; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/f65aee70832fe31db72589b465574d372fa46ea9"; sha256 = "14vany0873b0hsa28g724fj1zrk2ls4jwjrhs379wxmddhllrrfv"; }; "f6fadd3d388c12b5d7246b025244646c62920fdc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f6fadd3d388c12b5d7246b025244646c62920fdc; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f6fadd3d388c12b5d7246b025244646c62920fdc"; sha256 = "1qx4xdscnfg5aha11sfvkqrp5w7db2idwhak9vph9fd5r2kg9anx"; }; "f6fdc33805bc89e2eaff8003a996f6bf8f880789" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f6fdc33805bc89e2eaff8003a996f6bf8f880789; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f6fdc33805bc89e2eaff8003a996f6bf8f880789"; sha256 = "1r5hx97nasmk8m37pw490im1fq85q35khjpm5kq36byly3f6nvph"; }; "f7301b809afdfc0f640f1ae1c5683ff024e82766" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f7301b809afdfc0f640f1ae1c5683ff024e82766; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f7301b809afdfc0f640f1ae1c5683ff024e82766"; sha256 = "1bnbh14kj5ywifry0xnbzz1j9shnxizwamvi94ddjxidxacg8byh"; }; "f7543772618d958884a94ad5d6a90a39de6049c2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/f7543772618d958884a94ad5d6a90a39de6049c2; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/f7543772618d958884a94ad5d6a90a39de6049c2"; sha256 = "1hl95yhmxgs6qwrg4fjlk1klqdf7wdssid60ysm7dyqcaf0pxq1s"; }; "f7a44be87cd8b2cc22a5c6580998902cd597ffac" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/f7a44be87cd8b2cc22a5c6580998902cd597ffac; + url = "http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/f7a44be87cd8b2cc22a5c6580998902cd597ffac"; sha256 = "0zcdg0hyrb57wl3hy3w5mh1jibd31k9lcj3sa1bqx1wvgy3axs35"; }; "f7f52ad80e2bfa86c133febe8231fb1c1f321c68" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/f7f52ad80e2bfa86c133febe8231fb1c1f321c68; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/f7f52ad80e2bfa86c133febe8231fb1c1f321c68"; sha256 = "1wmasx8b2vjprs16iz2mm6djd0f9j5j2jp9mii9s55hqlc2x3zlv"; }; "f7ff067e31d48918ce41494b39f2f30c48890e55" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f7ff067e31d48918ce41494b39f2f30c48890e55; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f7ff067e31d48918ce41494b39f2f30c48890e55"; sha256 = "1xz599vrazq3gk6jcdnsrvg20dy6dfsjacm71fgi61ja9mb85kbx"; }; "f859df604a7deb221be8fb75f5eabac9a4518834" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/f859df604a7deb221be8fb75f5eabac9a4518834; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/f859df604a7deb221be8fb75f5eabac9a4518834"; sha256 = "1mh460676fcx2557fjkfkvwl2ahxwadqyfa5axaf07fss3dnj865"; }; "f859fcf20b1d5912f1dd1fba6f9bd4393a014968" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f859fcf20b1d5912f1dd1fba6f9bd4393a014968; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f859fcf20b1d5912f1dd1fba6f9bd4393a014968"; sha256 = "0nqg6j8kxhs5qrriaycj0ihv5hwwj8h5w4a9zjs2c23982cxgd6y"; }; "f8a7fca733ca940a07647121bde451787b5afb66" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f8a7fca733ca940a07647121bde451787b5afb66; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f8a7fca733ca940a07647121bde451787b5afb66"; sha256 = "18kg4v54a769z22py9zzm4llz6r8kf38nm1i54704mkm5py2h35l"; }; "f8deb83eeba474abd3c4332328d32de585f40d2e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f8deb83eeba474abd3c4332328d32de585f40d2e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f8deb83eeba474abd3c4332328d32de585f40d2e"; sha256 = "0ra7znx005gdyzybn66246bwjdkx3bwmzi99k0wqc8h3np0x3vh4"; }; "f938e9fb108c5df460b316ad63f8e4d43de264a9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f938e9fb108c5df460b316ad63f8e4d43de264a9; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f938e9fb108c5df460b316ad63f8e4d43de264a9"; sha256 = "0xy3y79i0arjb3qcmq1psd3xbync91zbdfyxg2w542iviwcqx8b9"; }; "f9b69d517e1417f8099af43fbb448801dd00c40d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2539301-e5e4001afc404628b562e71e48fbe47f/f9b69d517e1417f8099af43fbb448801dd00c40d; + url = "http://cdn.unrealengine.com/dependencies/2539301-e5e4001afc404628b562e71e48fbe47f/f9b69d517e1417f8099af43fbb448801dd00c40d"; sha256 = "1813v1a3aaxpsa8fwfkwc5ik9fks5fcs1xy1spdag422iqg7752r"; }; "f9c0960de898d46640b7767a29c2119310539a4c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/f9c0960de898d46640b7767a29c2119310539a4c; + url = "http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/f9c0960de898d46640b7767a29c2119310539a4c"; sha256 = "0vj3giryjmh9g43bngrimn0qm7lv41hsgwd034db6n341q2dcpsc"; }; "fa0f4ef2e4265e7a8b79791ead562e32bf436c05" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2431986-5a8dd079cf514ebd8b20693fadfa5a4e/fa0f4ef2e4265e7a8b79791ead562e32bf436c05; + url = "http://cdn.unrealengine.com/dependencies/2431986-5a8dd079cf514ebd8b20693fadfa5a4e/fa0f4ef2e4265e7a8b79791ead562e32bf436c05"; sha256 = "1570238pvmaj2id29whvch7hn8914b2d8adf0gy6mcckgrjlx8d9"; }; "fa392f24144f8018b8a29676f4cae4fe188e7a7b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/fa392f24144f8018b8a29676f4cae4fe188e7a7b; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/fa392f24144f8018b8a29676f4cae4fe188e7a7b"; sha256 = "024xcvz6jh5zvx65rrip7wwrixpzdc3ww1kp6711w15qdv5nsqhk"; }; "fa3c3cf43525a5cf7e63f9b4de6d7441a0e826af" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/fa3c3cf43525a5cf7e63f9b4de6d7441a0e826af; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/fa3c3cf43525a5cf7e63f9b4de6d7441a0e826af"; sha256 = "172birg7k18453hdz4smcr28n1dg3pvb8p3w8knjqmmg8kgy6lqv"; }; "fab186b2b42815a73845c32093d591f8d4623f0a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/fab186b2b42815a73845c32093d591f8d4623f0a; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/fab186b2b42815a73845c32093d591f8d4623f0a"; sha256 = "1h55af59wbw1rq5gxrca12k1f9n65kxrqnp5bczvlmcm1nb3gi1h"; }; "fab30d459fc6efe51b656ac70e86c70a8772e5ae" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2528371-50b896349a4f4b48b4cce5ef240b0c45/fab30d459fc6efe51b656ac70e86c70a8772e5ae; + url = "http://cdn.unrealengine.com/dependencies/2528371-50b896349a4f4b48b4cce5ef240b0c45/fab30d459fc6efe51b656ac70e86c70a8772e5ae"; sha256 = "0zfymfssbgb22ixpqsiylyzygs331w5dnkjwqs1i6nwi5i2i83ds"; }; "fac6370a5441886d40a7aa7b4494da0c3304b397" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/fac6370a5441886d40a7aa7b4494da0c3304b397; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/fac6370a5441886d40a7aa7b4494da0c3304b397"; sha256 = "1y3b4rs1ca5v0imxx7iijr9lzxawf4brjdm62haxv6wadaqd27qm"; }; "fb092729cca1243487ce2f17b83e612ee2e645f0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fb092729cca1243487ce2f17b83e612ee2e645f0; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fb092729cca1243487ce2f17b83e612ee2e645f0"; sha256 = "136ddzazdpyzk4178g7c88adh50c91bcnv993z87fny2yzc71rh8"; }; "fb175aabdcfafb6d77b5b7bad0de2c37cbabac81" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/fb175aabdcfafb6d77b5b7bad0de2c37cbabac81; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/fb175aabdcfafb6d77b5b7bad0de2c37cbabac81"; sha256 = "06hxp3g03bk3dvwnif9f5yhl6fc4dah722x5sabhi9pphq0z3ckc"; }; "fb4d3c4309ce988d3ebc299d517c232e83fdfe7b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/fb4d3c4309ce988d3ebc299d517c232e83fdfe7b; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/fb4d3c4309ce988d3ebc299d517c232e83fdfe7b"; sha256 = "1qkg8zi3czwsija16npjjgfkb2k15q6zrrp3f6nz6mn6443248my"; }; "fb634cba7663cb05cb4751272114071ba34cc677" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fb634cba7663cb05cb4751272114071ba34cc677; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fb634cba7663cb05cb4751272114071ba34cc677"; sha256 = "0qd9raqdaw6ayza6ii6hs79ah97pb957bb22azvijmk6p2a81krz"; }; "fb807fd862137423f4c6611e8ee553e2b04a62e7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/fb807fd862137423f4c6611e8ee553e2b04a62e7; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/fb807fd862137423f4c6611e8ee553e2b04a62e7"; sha256 = "14b8pbm93xd7nrb7spwb1wpsiyrqksb25y4mfn2inaismakzxq8p"; }; "fb8b95b64656d46eb01aeb66dc7607697828e39f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fb8b95b64656d46eb01aeb66dc7607697828e39f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fb8b95b64656d46eb01aeb66dc7607697828e39f"; sha256 = "1bznalkd43vbl6x5p0mwpnjmjvs91l2v0nscling0csxkkkrna1w"; }; "fbc4c9072ed5c93f777e5f6fe6f43486862fa0b8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613671-efa8cb7212aa45139aff99785a99f6c2/fbc4c9072ed5c93f777e5f6fe6f43486862fa0b8; + url = "http://cdn.unrealengine.com/dependencies/2613671-efa8cb7212aa45139aff99785a99f6c2/fbc4c9072ed5c93f777e5f6fe6f43486862fa0b8"; sha256 = "0kxdjzwk81ixnxxfp4wmn19qq2lbdgv1xic01mpdp00naxzw6s68"; }; "fc571a1d0a7202a062ecd269c06a2308ab378cb4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc571a1d0a7202a062ecd269c06a2308ab378cb4; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc571a1d0a7202a062ecd269c06a2308ab378cb4"; sha256 = "1zfdsd060m1njrkx2hlw7bcwpff23pggyklza2hpdj9k6h3jmdn2"; }; "fc71358f88c1a01c32f496b064386dba3145a36a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc71358f88c1a01c32f496b064386dba3145a36a; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc71358f88c1a01c32f496b064386dba3145a36a"; sha256 = "1sq6f7zpmbqq9b27irf4xx8zg9p906xfpgsdxyrzgwf15vqc3cxc"; }; "fc72803a9439e161de25108be11e5429ed900f77" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc72803a9439e161de25108be11e5429ed900f77; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc72803a9439e161de25108be11e5429ed900f77"; sha256 = "1nhbsry6l2wb1w8rv4lkzp42r0iqfhd5r21ckxz10gsngf9v8d5z"; }; "fc7b29cbf72c69bffecb661d7345ac5be329c14d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/fc7b29cbf72c69bffecb661d7345ac5be329c14d; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/fc7b29cbf72c69bffecb661d7345ac5be329c14d"; sha256 = "0gqb44kivk31lyrmvnfff65sb0llaqi04vc3270366x5h4sii9n9"; }; "fc97754c9af277910c57351443a42a210b2eb8a2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc97754c9af277910c57351443a42a210b2eb8a2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc97754c9af277910c57351443a42a210b2eb8a2"; sha256 = "047psrjpddw50plbk1al6wgapzcdhzs8a7g0h2pypwiknxkw09cy"; }; "fc9d37a2c0ab6854c6b039c509d86b9459982472" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc9d37a2c0ab6854c6b039c509d86b9459982472; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc9d37a2c0ab6854c6b039c509d86b9459982472"; sha256 = "1p8j4q0blxpi9lblbyvix6w0vnds1yxn7ydq4z3qqaxmnixv9kvf"; }; "fcaba3584b9391b167f49dfe53afe253623ada36" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/fcaba3584b9391b167f49dfe53afe253623ada36; + url = "http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/fcaba3584b9391b167f49dfe53afe253623ada36"; sha256 = "11dfccim0y3z9pw8hy0z0pqam8wcs3pn5sdr3yjd3g097hz2firp"; }; "fd441937ce92861563e4bd9e3619d5d9cdf73a55" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/fd441937ce92861563e4bd9e3619d5d9cdf73a55; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/fd441937ce92861563e4bd9e3619d5d9cdf73a55"; sha256 = "0fbyr6sax9j9mxfa86waw8v499yzb3sk4pqfsykcamy9dvzav6hm"; }; "fd44fdad76da5efbaf3bced1a5d2bf12eb028b35" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fd44fdad76da5efbaf3bced1a5d2bf12eb028b35; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fd44fdad76da5efbaf3bced1a5d2bf12eb028b35"; sha256 = "141rnzqcg3p51saqqd54bl5nj7f5kkm6ysvbcmlcpd5qmxg0swqb"; }; "fd521968de6928ff3ba9e7a3568d3190fc56573a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fd521968de6928ff3ba9e7a3568d3190fc56573a; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fd521968de6928ff3ba9e7a3568d3190fc56573a"; sha256 = "0gxwqdk6d6lg3akvn5ydvr2jr2ywq4w38ql0ck1xxj8p5jnwh90m"; }; "fd5c39fee72ecaed24e8e462a4a71a69c06e4509" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/fd5c39fee72ecaed24e8e462a4a71a69c06e4509; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/fd5c39fee72ecaed24e8e462a4a71a69c06e4509"; sha256 = "0jfdv5cbgqczza53gd35qgxykxa1660rj5r7p57kbyfhhn116785"; }; "fd621bb2eef661c744d767a89b7b835495af2a90" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/fd621bb2eef661c744d767a89b7b835495af2a90; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/fd621bb2eef661c744d767a89b7b835495af2a90"; sha256 = "14pfnxzc77k809m22l6arqpi2rzdm8f5s07hkqn7ikvddyh55snq"; }; "fd63513879784b9901479056b82fc51c57ba8666" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/fd63513879784b9901479056b82fc51c57ba8666; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/fd63513879784b9901479056b82fc51c57ba8666"; sha256 = "0qcxd2x5lhj2vkpc99y8yh0knsx0cnbr6h6zpv35ympybxffdm9r"; }; "fd9f084abed9009fd3d7585637980961e5ac37c9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/fd9f084abed9009fd3d7585637980961e5ac37c9; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/fd9f084abed9009fd3d7585637980961e5ac37c9"; sha256 = "1q21jh1pnq2hnc5pyx2bvjivly9d83mf3kh5xsvxgz73sviqr42h"; }; "fdb6c138bd7f73ccfc7a2324408b8199fe18c5c8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fdb6c138bd7f73ccfc7a2324408b8199fe18c5c8; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fdb6c138bd7f73ccfc7a2324408b8199fe18c5c8"; sha256 = "1sapx3lsi13mz76vljdiwddq5say5ing9jpckjpsg9vvzwpmd03k"; }; "fdddaa298c770236e8e0ae3fa46d56ab464ff590" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fdddaa298c770236e8e0ae3fa46d56ab464ff590; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fdddaa298c770236e8e0ae3fa46d56ab464ff590"; sha256 = "0psr2i314z03ispws9cr2wfk6vq9l0fwcw1vz65rcns7i24l4bii"; }; "fdea9eb5b7adc1f8cdca84ff533afa9978bc74e2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fdea9eb5b7adc1f8cdca84ff533afa9978bc74e2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fdea9eb5b7adc1f8cdca84ff533afa9978bc74e2"; sha256 = "17pnggfb9aj0lahbbs0blfiywdz53bszbrh4bx0n86viyls5g36r"; }; "fe108abb775ce219aed6c508fa1d8d9ec9710c50" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/fe108abb775ce219aed6c508fa1d8d9ec9710c50; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/fe108abb775ce219aed6c508fa1d8d9ec9710c50"; sha256 = "0qknlj971xn147z7992idp3hbwif2fqy02ml8jbxah4v82d1ssdk"; }; "fe26cc5b44599296ab8cca48bf52350d32f5ccf3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/fe26cc5b44599296ab8cca48bf52350d32f5ccf3; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/fe26cc5b44599296ab8cca48bf52350d32f5ccf3"; sha256 = "154jg46kbbfn7ipjap4s8bgfjhzazj3pd2n7yd009drw2l1ald1q"; }; "fe2fd0043d9dceb3bd974fd46a7f657222f0068f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/fe2fd0043d9dceb3bd974fd46a7f657222f0068f; + url = "http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/fe2fd0043d9dceb3bd974fd46a7f657222f0068f"; sha256 = "0rq7hnir60k0ncfk0qzin2fk8w2m9l9259qzx7cryf9hvssy1vxq"; }; "fe34956f65e0611aa1584ca611b7843e22e3e29f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/fe34956f65e0611aa1584ca611b7843e22e3e29f; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/fe34956f65e0611aa1584ca611b7843e22e3e29f"; sha256 = "1hnasgpz4ml4095nnr1936jfx09vfajib3g9szrwdy0bf9rcrdh8"; }; "fe39e5851d68399087d05d9c22da12a1fdd7b6de" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/fe39e5851d68399087d05d9c22da12a1fdd7b6de; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/fe39e5851d68399087d05d9c22da12a1fdd7b6de"; sha256 = "1rfaalg6rbc1w45b5iipb81n6y0mdqkf1ylfphzbchpqliipl5ba"; }; "fe79883294e7b730b4ea0e6e72c662ced28e999b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2500002-69b23dcf7a2d4165b2b432780845acb0/fe79883294e7b730b4ea0e6e72c662ced28e999b; + url = "http://cdn.unrealengine.com/dependencies/2500002-69b23dcf7a2d4165b2b432780845acb0/fe79883294e7b730b4ea0e6e72c662ced28e999b"; sha256 = "0rc7vagcgn74cg4vkzhkhy0jyv5wphacb3kd8kfxzidb1v92k4br"; }; "fe94f39680410922eeef278b013e20b5ee27e7fe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/fe94f39680410922eeef278b013e20b5ee27e7fe; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/fe94f39680410922eeef278b013e20b5ee27e7fe"; sha256 = "0wllmwfggykl56kwb92jdz8rcfvrn4hxvj9mav19sc9fg2dibfzf"; }; "fecddbf47598e42c13644ce42253e7ca8178eb29" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/fecddbf47598e42c13644ce42253e7ca8178eb29; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/fecddbf47598e42c13644ce42253e7ca8178eb29"; sha256 = "0xwi7xa1jm012lmxhz3al7yhwwv33qz332bqvwamcza63ir6zpw9"; }; "fed2a12f5d40235d6295fed1092707889ff01b08" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/fed2a12f5d40235d6295fed1092707889ff01b08; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/fed2a12f5d40235d6295fed1092707889ff01b08"; sha256 = "08cyqg80grwpmv9fkm7nldz8p12nzssg08cyijc4d5afx6xddym4"; }; "ff38188923ffc7c35c9b2e533f2ce6f3a9aa3a3d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ff38188923ffc7c35c9b2e533f2ce6f3a9aa3a3d; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ff38188923ffc7c35c9b2e533f2ce6f3a9aa3a3d"; sha256 = "03vknw5a43n6kl3llyk7czg5a0w4fkic29b6d8i0q71jxknizf50"; }; "ff61432b09f3c5882ed0f5f932a0537f38cde5cf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ff61432b09f3c5882ed0f5f932a0537f38cde5cf; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ff61432b09f3c5882ed0f5f932a0537f38cde5cf"; sha256 = "08qcnz8qrxqrrhsll0n9k49cp6fqiacl85n0jhq53jsh805hlw2b"; }; "ff66ba394c099b33decda558509ec6f4fdb43892" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/ff66ba394c099b33decda558509ec6f4fdb43892; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/ff66ba394c099b33decda558509ec6f4fdb43892"; sha256 = "12qmiff7fynifhpaivsyg23v6jm89i903dhqqs2xiihbd77ln8lb"; }; "ffd25a14ee418633d47a558d3a953c501f56e2f3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/ffd25a14ee418633d47a558d3a953c501f56e2f3; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/ffd25a14ee418633d47a558d3a953c501f56e2f3"; sha256 = "0kclig15z3ywc7mb0xyv5pvijkzzj4llimij5hqagwwdgi31rirg"; }; "ffe1832c9002fb490bd976e6906fe43792e2e487" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ffe1832c9002fb490bd976e6906fe43792e2e487; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ffe1832c9002fb490bd976e6906fe43792e2e487"; sha256 = "1n5q3v765kblvn9z74jdgxj1f1qdqpnypx1i00xf8ni5if5w183d"; }; "ffe4b29f6febe2e6345b292bd341aefed751ae1d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2565979-eaaf2006b54843b69b5280979c12ed6d/ffe4b29f6febe2e6345b292bd341aefed751ae1d; + url = "http://cdn.unrealengine.com/dependencies/2565979-eaaf2006b54843b69b5280979c12ed6d/ffe4b29f6febe2e6345b292bd341aefed751ae1d"; sha256 = "159bff8wiz2smjl34l7d581wyy9ihxr576s4blq8hdqkm1wl0va9"; }; "025037991170960704b2d2a49e7bf37cebf06b85" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/025037991170960704b2d2a49e7bf37cebf06b85; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/025037991170960704b2d2a49e7bf37cebf06b85"; sha256 = "05p86qn4g7qg9wzz62piksf2xi599hyim2bqi38158qrmfmqigdw"; }; "091a839006f281b7b12ee0d1bd0fff225f0ac73a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/091a839006f281b7b12ee0d1bd0fff225f0ac73a; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/091a839006f281b7b12ee0d1bd0fff225f0ac73a"; sha256 = "0m79g350p4gv3yb13i5921gbcc7bx852p5lmivfpwx3wqvghd5pz"; }; "09dbd9ce439ba4adad23922f5b9002fa4e759bd1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/09dbd9ce439ba4adad23922f5b9002fa4e759bd1; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/09dbd9ce439ba4adad23922f5b9002fa4e759bd1"; sha256 = "188f2j0ik5c2cmw5ck386diabc24p57yhqrb4c7303d13dnqr1mm"; }; "0c416ae48c3e2ad2be1333ccc20f6992ce982aa4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/0c416ae48c3e2ad2be1333ccc20f6992ce982aa4; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/0c416ae48c3e2ad2be1333ccc20f6992ce982aa4"; sha256 = "1bm210fw20prl3k51dr9gai3asdg3kq30diln70lgm9wyk18kiv4"; }; "117189ccfc8241744b0cde19d866507341334ea0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/117189ccfc8241744b0cde19d866507341334ea0; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/117189ccfc8241744b0cde19d866507341334ea0"; sha256 = "1nv2s6g8i7scqgwbqgsyicys2cwaf3mkvcqqvpc807ag2ad3rxl6"; }; "12164f23f40b93eb0a4cf6f0acb58596becc8f2f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/12164f23f40b93eb0a4cf6f0acb58596becc8f2f; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/12164f23f40b93eb0a4cf6f0acb58596becc8f2f"; sha256 = "0px9qidckfldj9b9znxg31alsqrzzgpfjixr003lv410hbn099ir"; }; "1580d9078ae389f2cea6d568fc4ea0b0ebd5d183" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/1580d9078ae389f2cea6d568fc4ea0b0ebd5d183; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/1580d9078ae389f2cea6d568fc4ea0b0ebd5d183"; sha256 = "1xffqr3bhd4x5h36vk4dnz0hmc64gjg273ysnn68x9k2zdqgdmj0"; }; "1c44fa7c763743e619fef130346733eb5f107049" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/1c44fa7c763743e619fef130346733eb5f107049; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/1c44fa7c763743e619fef130346733eb5f107049"; sha256 = "05nms6yrclw38v6180b4bqswwdmlb7l2l388wj4f7i0zi9cc0z1d"; }; "1f209ff22ef667820d2143b0bef1783612c2dc33" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/1f209ff22ef667820d2143b0bef1783612c2dc33; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/1f209ff22ef667820d2143b0bef1783612c2dc33"; sha256 = "1w6prwjci9fbp4jln2dl0pdjjiis30r982cjk261jb7ryrzm1bc6"; }; "2a13498d62f2897b95a2fde8f9117caf2213369d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/2a13498d62f2897b95a2fde8f9117caf2213369d; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/2a13498d62f2897b95a2fde8f9117caf2213369d"; sha256 = "11khy0pbyqbchzksfp51ihw8ahgpf9kvby6jp2spwf4cqglr4yzj"; }; "2c0a73c42dae723ea6ada9f3a83b520b4094655f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/2c0a73c42dae723ea6ada9f3a83b520b4094655f; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/2c0a73c42dae723ea6ada9f3a83b520b4094655f"; sha256 = "1gm11rsybfsdsbzbyrfwvp1wpy9x84plgwayv59qmn4j15hz7hya"; }; "2ea89fc7cf11ce2e9f8bd6df71dd99eff85bcc15" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/2ea89fc7cf11ce2e9f8bd6df71dd99eff85bcc15; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/2ea89fc7cf11ce2e9f8bd6df71dd99eff85bcc15"; sha256 = "1zn4b57cf0w74m125iihbn2yjba95v22pn8gxq49qrfg5aci928r"; }; "2f7a26433cf0506c014fcc5694c194b28a811006" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/2f7a26433cf0506c014fcc5694c194b28a811006; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/2f7a26433cf0506c014fcc5694c194b28a811006"; sha256 = "0ikgmmv133lamgmm5dah5sy50pr5g1125bw8rx4l27mgbz5yq276"; }; "316245a9c9d050b2bce9f47deafb0baa66af6347" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/316245a9c9d050b2bce9f47deafb0baa66af6347; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/316245a9c9d050b2bce9f47deafb0baa66af6347"; sha256 = "1389lmbg8dby7g14yq8jphvzdzswnwhkpm8aqa3h74ivnpabnpni"; }; "3536f544f9e91433e6939163fb611c524a5f468f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/3536f544f9e91433e6939163fb611c524a5f468f; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/3536f544f9e91433e6939163fb611c524a5f468f"; sha256 = "0wm2djjaksndivynjdz0f2c56a792r6q13vi19baipm0hglbaq3w"; }; "3663f96dbca6fd930e000a6617a3bb214a6ee0f0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/3663f96dbca6fd930e000a6617a3bb214a6ee0f0; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/3663f96dbca6fd930e000a6617a3bb214a6ee0f0"; sha256 = "0qhpfkja24fxnzgl6vihwz2ilvz0jsdk04g5jn5r08iv90klj5c8"; }; "3d32ebca9fef4352a99f2e0636ac45e9d3b35d03" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/3d32ebca9fef4352a99f2e0636ac45e9d3b35d03; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/3d32ebca9fef4352a99f2e0636ac45e9d3b35d03"; sha256 = "02dsfahlg3fcvzb9aqxiycwd5vcb0q205gbzrh3x5m989flyrs1y"; }; "44c8dbacafb32300e6af2a0cf5897e5145c2b7f4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/44c8dbacafb32300e6af2a0cf5897e5145c2b7f4; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/44c8dbacafb32300e6af2a0cf5897e5145c2b7f4"; sha256 = "1vjyvp13qbfmv5jgdbicikhjq6wm9216ikqk23w1qsz0xzbn9wb9"; }; "4511815cd4297243a8afd7a2e799c60880a6ea95" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/4511815cd4297243a8afd7a2e799c60880a6ea95; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/4511815cd4297243a8afd7a2e799c60880a6ea95"; sha256 = "1rw6h3sc30ypr6304mjg6pzh841wmn5gjd4a3xv4y681nqys30li"; }; "4d9e2249062c1ccd50913501cbc7ea2fdb8cc94c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/4d9e2249062c1ccd50913501cbc7ea2fdb8cc94c; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/4d9e2249062c1ccd50913501cbc7ea2fdb8cc94c"; sha256 = "0z86cczszfk05fmcd7dwfahnv0cm1wj7xq0yr0i332a7jr0g5s6d"; }; "4e3bb620861aa7c3d996fd8ee7cd3a40c2096bb0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/4e3bb620861aa7c3d996fd8ee7cd3a40c2096bb0; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/4e3bb620861aa7c3d996fd8ee7cd3a40c2096bb0"; sha256 = "0l9bfkanklr3zywkyn4lb5lzfpqkhr4c4n6kvw9gi4nzg063ifnh"; }; "574e359a11791294117e7f4ad4f677a99424170a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/574e359a11791294117e7f4ad4f677a99424170a; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/574e359a11791294117e7f4ad4f677a99424170a"; sha256 = "1vhnylasbla79d2syx41804pshyd7w8ph1y88yyjp5w9g8zbcy0g"; }; "5756967d4a6019de75418949a564995c64fd81b1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/5756967d4a6019de75418949a564995c64fd81b1; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/5756967d4a6019de75418949a564995c64fd81b1"; sha256 = "1fy2h21myp9yzc60545appg75in12f13rslhr7bpmsssgjrrz2fg"; }; "5c884c59ad7491166618894713300acc03499f45" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/5c884c59ad7491166618894713300acc03499f45; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/5c884c59ad7491166618894713300acc03499f45"; sha256 = "19zrbvfnmhivs7gy0bm92kn04fqyc8179mkir5v4wycx7q24w938"; }; "5ea84c79c69cb4f20a2cbde31b1e9655f352f1c8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/5ea84c79c69cb4f20a2cbde31b1e9655f352f1c8; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/5ea84c79c69cb4f20a2cbde31b1e9655f352f1c8"; sha256 = "02rhs442s9y67kb8gympr42yl3xxx3d34iwqz926gr5721if0gh0"; }; "60be604621599e16ffec1f76e08339b6f9d89f8d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/60be604621599e16ffec1f76e08339b6f9d89f8d; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/60be604621599e16ffec1f76e08339b6f9d89f8d"; sha256 = "1nyll0lj0fmdphmah4zd5n6bn2zgy2sgff6mnwch2mm6bvxmgzlm"; }; "659b18633abf461608be32b8b565f4b70725ee20" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/659b18633abf461608be32b8b565f4b70725ee20; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/659b18633abf461608be32b8b565f4b70725ee20"; sha256 = "00jywmppclqm62q0zq3b1dww6f27blblc633kcskyxc9f2i8p3qs"; }; "6f25ee59e861b5697b41d487ab19360684b2079b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/6f25ee59e861b5697b41d487ab19360684b2079b; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/6f25ee59e861b5697b41d487ab19360684b2079b"; sha256 = "0y3fiwflj6qfmmpgpyi3xkyn6dls620iwcwq5cdpz4jhzhz5vbqm"; }; "723429357fc93c212749453abdecffa83625ce63" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/723429357fc93c212749453abdecffa83625ce63; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/723429357fc93c212749453abdecffa83625ce63"; sha256 = "126ncm0szxkskfgwfbx5mhnbdpxl395gn62dv3rdg7xm4wjg3s07"; }; "73163f4d3a1f9f7015cad45b8b2fe49ee716aed2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/73163f4d3a1f9f7015cad45b8b2fe49ee716aed2; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/73163f4d3a1f9f7015cad45b8b2fe49ee716aed2"; sha256 = "1lkd1i92yc8lyfpnxp9gkgrklmxfj0p3zj1j0png50a4v6qyw55d"; }; "74ee06b2cb0a84dec755ca05d0b832517a58db9a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/74ee06b2cb0a84dec755ca05d0b832517a58db9a; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/74ee06b2cb0a84dec755ca05d0b832517a58db9a"; sha256 = "10xp24ija0l7dn3xd690dk6a342ma4iafmcywinvh111xcwkvvql"; }; "77c1ef425fc9a747ed3815f78a2616fee747fd12" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/77c1ef425fc9a747ed3815f78a2616fee747fd12; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/77c1ef425fc9a747ed3815f78a2616fee747fd12"; sha256 = "0gspscdvrnvj0ps5z2ckga2ji00y8m9kj3zaqpl06kywyz5p1q1l"; }; "77cf0dabcf5441932f1317ec4ee4e28bf2039a85" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/77cf0dabcf5441932f1317ec4ee4e28bf2039a85; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/77cf0dabcf5441932f1317ec4ee4e28bf2039a85"; sha256 = "1mdngkvkss3ia9g6kjiybvqj4w7q39iif1kqfjxzr1gs098q23ng"; }; "80d27f0c38fd20a082015a2b069457560f523b57" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/80d27f0c38fd20a082015a2b069457560f523b57; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/80d27f0c38fd20a082015a2b069457560f523b57"; sha256 = "1s2cxkgwnzisbj9r55ciwkv42m423cq7nhkywd7d80hy2wrpir5p"; }; "817fe5e5ddfde58d79455a8b2cf70079f0642770" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/817fe5e5ddfde58d79455a8b2cf70079f0642770; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/817fe5e5ddfde58d79455a8b2cf70079f0642770"; sha256 = "03dh02fjc2ksdhifwx92qfvcaymvkhc5cf4m8jlg9v3lkz1dxa2z"; }; "81cf86d27a982faf7f6331f91b6b5634cfaa00d0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/81cf86d27a982faf7f6331f91b6b5634cfaa00d0; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/81cf86d27a982faf7f6331f91b6b5634cfaa00d0"; sha256 = "0n9ra5ynq4kqpd5gsdx72qk8nn8nh9bffbqvyp1jwkbc7vbf6rn1"; }; "82368148bbcf9a6d07bead1e678bfee5f8631cfb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/82368148bbcf9a6d07bead1e678bfee5f8631cfb; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/82368148bbcf9a6d07bead1e678bfee5f8631cfb"; sha256 = "06f7ysl5zxx15x2mc0yl2qxdfydnaclr7zwffip03s1szjfdf078"; }; "85df0b8a16e3e1c2b99bd8d8703a8c00f80c4ffd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/85df0b8a16e3e1c2b99bd8d8703a8c00f80c4ffd; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/85df0b8a16e3e1c2b99bd8d8703a8c00f80c4ffd"; sha256 = "0gl18m1fqb2gyd0fnf5bvq77bqvlyngqvqbjikdr1vhj78jp8l2p"; }; "8a73223e8d37b2fb9151a753a24139f37818e434" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8a73223e8d37b2fb9151a753a24139f37818e434; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8a73223e8d37b2fb9151a753a24139f37818e434"; sha256 = "0sk5l8ijfjrys0l3mj6ypgx4araw0hnxz0cjzm9bk8y605331znx"; }; "8ab79f2416da3c5f785bf291971680dbfdb62e26" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8ab79f2416da3c5f785bf291971680dbfdb62e26; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8ab79f2416da3c5f785bf291971680dbfdb62e26"; sha256 = "1xlnzpljknkmbw85xz35a48h2fdv9c2ijf0nm7cdc489699v9gfv"; }; "8c09c7e57e2bc1a99df552e75f3bc3033364bbd1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8c09c7e57e2bc1a99df552e75f3bc3033364bbd1; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8c09c7e57e2bc1a99df552e75f3bc3033364bbd1"; sha256 = "168yb57ri0wibsy1gr940y8sxdc9s2vcniizkk4dykpnkay0izl1"; }; "8e02b6fe5eaaad154d3b7677458a9f52c538129f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8e02b6fe5eaaad154d3b7677458a9f52c538129f; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8e02b6fe5eaaad154d3b7677458a9f52c538129f"; sha256 = "0zlz81qm00klwfmnc1133c8q1jgxn1w6b5fajs8jigmhwqahi806"; }; "8ef45e913784e24ac5b05d020bb1c90e5e1f65b4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8ef45e913784e24ac5b05d020bb1c90e5e1f65b4; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8ef45e913784e24ac5b05d020bb1c90e5e1f65b4"; sha256 = "13rd7mvzc3vxgz7zpa89rdfidflvaxzlv60m1ngcsjigwank5a52"; }; "8f31c3a2ca87728958356ef279d797c21ff800d2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8f31c3a2ca87728958356ef279d797c21ff800d2; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8f31c3a2ca87728958356ef279d797c21ff800d2"; sha256 = "10vqrm360csnbncrhkyy45nnl9md88jl0f9lmvlav19m60cdxazi"; }; "90647a14bfb8f6e8cbcc8d8ecce7d8e2500818b9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/90647a14bfb8f6e8cbcc8d8ecce7d8e2500818b9; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/90647a14bfb8f6e8cbcc8d8ecce7d8e2500818b9"; sha256 = "0hlknlph7dw2c74pmg99apbhdfd844vq77navnynxm890nrjzqs0"; }; "a0032cd8280294edff61604e9bf0312230cfd79b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a0032cd8280294edff61604e9bf0312230cfd79b; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a0032cd8280294edff61604e9bf0312230cfd79b"; sha256 = "026b18ka0nsb1ri7wk0iqnjz60fsnr11c22lvhq2wiqh9jqsl9f6"; }; "a038a78206b6b0572fa3a86e5a96e3fee0d32b04" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a038a78206b6b0572fa3a86e5a96e3fee0d32b04; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a038a78206b6b0572fa3a86e5a96e3fee0d32b04"; sha256 = "0ahhkyb4h23apy04jjif0ys6nqjjrzf27w7h3xvw93mzasc4x515"; }; "a27eb78abbdabe194ad5b4c1bfe56dfca38e43b0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a27eb78abbdabe194ad5b4c1bfe56dfca38e43b0; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a27eb78abbdabe194ad5b4c1bfe56dfca38e43b0"; sha256 = "0bba6vpl4lk376yhjjlgxc81m20i9qq9b7kr2bf7lg76fx485ydq"; }; "a2e5471c647ec896793c1df59ec6c214756b7644" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a2e5471c647ec896793c1df59ec6c214756b7644; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a2e5471c647ec896793c1df59ec6c214756b7644"; sha256 = "05n7fnxpg01xg4b8k323h0lbhlqxq2b432454rg5lj5ydd71w9vd"; }; "a6f1cf388c274ffbbbf5ee9f678d2fd2c982ac9d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a6f1cf388c274ffbbbf5ee9f678d2fd2c982ac9d; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a6f1cf388c274ffbbbf5ee9f678d2fd2c982ac9d"; sha256 = "0l0fdmypq1h5whfnk1132z77sbnmgwqhizss8pgjwi9k0qgahgcc"; }; "afad2bca0d8075378f5239206210c90bc449f66d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/afad2bca0d8075378f5239206210c90bc449f66d; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/afad2bca0d8075378f5239206210c90bc449f66d"; sha256 = "13944ai93z6md86wq4ghjhlgnw3xd5xf64ski1n0imxy3xnclki9"; }; "b49b4db86170da54d36c9f77345132f501569443" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/b49b4db86170da54d36c9f77345132f501569443; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/b49b4db86170da54d36c9f77345132f501569443"; sha256 = "1dm4ln3cky50hzwpfb8hyzj3wyiwnjzpwybmri7sp51yhfjbssh4"; }; "b928e6544636d28eb1f1fad8cbfb3a508d6b523b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/b928e6544636d28eb1f1fad8cbfb3a508d6b523b; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/b928e6544636d28eb1f1fad8cbfb3a508d6b523b"; sha256 = "0a2lgynlylx99aj6jlzkbid6sq8sc1y9sblr3vjdc0rxpzyr7saf"; }; "bac3a42148c64a342e3a138e254acfc37baf7f7c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/bac3a42148c64a342e3a138e254acfc37baf7f7c; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/bac3a42148c64a342e3a138e254acfc37baf7f7c"; sha256 = "0z3vq7qnjjihk5h7rr4sjgiyqvqvm64ivra2bdb89hklycawz6c5"; }; "bf6954d37d21ccd063ce7829bdbf17a34a5972f6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/bf6954d37d21ccd063ce7829bdbf17a34a5972f6; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/bf6954d37d21ccd063ce7829bdbf17a34a5972f6"; sha256 = "1wmm2rhf0c1351y9mjdyi4dxq2jmsl893ijm99f4zr64nqgxh76b"; }; "c48ea333ebc4208f44ca53ccec1b4a9224234423" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/c48ea333ebc4208f44ca53ccec1b4a9224234423; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/c48ea333ebc4208f44ca53ccec1b4a9224234423"; sha256 = "0q536yk3rncy3gf6ch5mmsvjizq1n5lkk8nfhg1lrvg7mhxsd257"; }; "c4ab35a8f3c52c8999804559d5a506f4a4ea28d6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/c4ab35a8f3c52c8999804559d5a506f4a4ea28d6; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/c4ab35a8f3c52c8999804559d5a506f4a4ea28d6"; sha256 = "03id4awm9lnrrk92d9vdzlwy5g6bai9ig4i5lsk90f814vhz11nq"; }; "c5f44e9ae34828343c5c6eb3e73c2c451120da78" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/c5f44e9ae34828343c5c6eb3e73c2c451120da78; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/c5f44e9ae34828343c5c6eb3e73c2c451120da78"; sha256 = "15qbc27xc2gp431i3hhslwbgsgg3az37swvc37rarqw8jaayfdzw"; }; "c97e1a685bb16bacc741e943d668230b044da28b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/c97e1a685bb16bacc741e943d668230b044da28b; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/c97e1a685bb16bacc741e943d668230b044da28b"; sha256 = "1an5cdb74lspq3v15xdksjld444saw7b62nx8c9vy8hq0qkxmyg0"; }; "ceed10f922981467ca264e2f3c1ba9a6834ee9fb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/ceed10f922981467ca264e2f3c1ba9a6834ee9fb; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/ceed10f922981467ca264e2f3c1ba9a6834ee9fb"; sha256 = "0lsghjsy1dxr94crqd4z28vgl1fzwbw2q02k7yh2hzq3p5w5n08s"; }; "d657a675c488b3ceece090f664b8b3890c0f72c7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/d657a675c488b3ceece090f664b8b3890c0f72c7; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/d657a675c488b3ceece090f664b8b3890c0f72c7"; sha256 = "1ddbjh67h2iz3pm0sfj77yc907zcfrzmn0bzyaa4rkz234zzp6hl"; }; "d80b9d2bef36dbe0669cfea717fe30315568ba9a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/d80b9d2bef36dbe0669cfea717fe30315568ba9a; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/d80b9d2bef36dbe0669cfea717fe30315568ba9a"; sha256 = "11p1dbc3zrakwhmw7xi2wdshsbm6azdix8gy81gf8icy55ggg8ma"; }; "d87b8c33d15b51b773c6f091853c54f865561e64" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/d87b8c33d15b51b773c6f091853c54f865561e64; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/d87b8c33d15b51b773c6f091853c54f865561e64"; sha256 = "0qx0pb86fw6v50nl1p59d375bmc3x35cwd0qvbsbszr5w0wla0w2"; }; "d995c76652895e51297226aedf32dd0c715582e3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/d995c76652895e51297226aedf32dd0c715582e3; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/d995c76652895e51297226aedf32dd0c715582e3"; sha256 = "0pgwg8w2svxvnw1p7cp233p866f4kpmfsgaw1ids8z37dw8qa7h0"; }; "de6a3578fbc96909e587a897c860f56738c9a027" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/de6a3578fbc96909e587a897c860f56738c9a027; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/de6a3578fbc96909e587a897c860f56738c9a027"; sha256 = "1vpm2s3ndg9nqnady3kswfh4bwcrmx1x37m79kcvbpaalbb1w7cr"; }; "e0a272e2ea952c9c27d010098f6ed3be34d70023" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/e0a272e2ea952c9c27d010098f6ed3be34d70023; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/e0a272e2ea952c9c27d010098f6ed3be34d70023"; sha256 = "1cw0bn4lrk11nynab2s56i982fljd39ibczp92lwv6f9crpbxqqd"; }; "e18cf443cf050171be2dafbb7847b1eef470d743" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/e18cf443cf050171be2dafbb7847b1eef470d743; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/e18cf443cf050171be2dafbb7847b1eef470d743"; sha256 = "10pf020vhki6wv2a8ja4gx5lr4l8fc6fhbyvkmjw6fszf4qkmgzd"; }; "e89e8d979ec25d6a66f7a72b8390aaa876cb54b2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/e89e8d979ec25d6a66f7a72b8390aaa876cb54b2; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/e89e8d979ec25d6a66f7a72b8390aaa876cb54b2"; sha256 = "0x7mcg0rfx0nvr9356yk4lzilz5x732bhir53qis4z7rfjhdi3fn"; }; "ecee7a937781e9f7f6528b7bf03dd4cdc12bbd1a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/ecee7a937781e9f7f6528b7bf03dd4cdc12bbd1a; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/ecee7a937781e9f7f6528b7bf03dd4cdc12bbd1a"; sha256 = "16l5vasgq7iykpgrhr2q5x5rp780fy5nhzg459varwpr2ixlj640"; }; "eef376599acf8af872a7ecceb89b8afc1dc53cca" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/eef376599acf8af872a7ecceb89b8afc1dc53cca; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/eef376599acf8af872a7ecceb89b8afc1dc53cca"; sha256 = "10kjixb4gsdy2m0zj0v4sd38qqjbxcy4wmiwvpbpj95nyckf4695"; }; "f32b43ead099376849798c829e67335923b6f5df" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/f32b43ead099376849798c829e67335923b6f5df; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/f32b43ead099376849798c829e67335923b6f5df"; sha256 = "0bzabjvzamnadzx2idzviiyzhv3nkbp7w2wcq20lpzmszk0lxdn5"; }; "f6efa02b7fe9e154763f4e74a2d13e6016651478" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/f6efa02b7fe9e154763f4e74a2d13e6016651478; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/f6efa02b7fe9e154763f4e74a2d13e6016651478"; sha256 = "1qwgrh9pdhp5rsiimwm6v0hvmi9v3fbijx4pkdgklm6c7mxfmh6g"; }; "f82d0258fa61f3050a7ec0c48a72a14882f4f9ff" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/f82d0258fa61f3050a7ec0c48a72a14882f4f9ff; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/f82d0258fa61f3050a7ec0c48a72a14882f4f9ff"; sha256 = "10yqzj12sma2xqcxvqdh3s24dl5pwk9wlplxiaplkwm802fn95sw"; }; "fd8eb71773dfc69f5da73a588a9487e8155eb7d9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/fd8eb71773dfc69f5da73a588a9487e8155eb7d9; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/fd8eb71773dfc69f5da73a588a9487e8155eb7d9"; sha256 = "1xfvsj2rsbmnhmgv67j7xkc41n3c61ikvmlglj47iyqxlrcp15hs"; }; "fe7abbfa12319d22b0735b908af92eafc25d27a2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/fe7abbfa12319d22b0735b908af92eafc25d27a2; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/fe7abbfa12319d22b0735b908af92eafc25d27a2"; sha256 = "0f6cvhhba05slb5wxyymx46syb7v1ggbgcvisifiaf8wnivh46f9"; }; "ff648984dc86f826cc03f174f5a1b26e33268529" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/ff648984dc86f826cc03f174f5a1b26e33268529; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/ff648984dc86f826cc03f174f5a1b26e33268529"; sha256 = "0l2p41n9w4iap9nixxivn6vlzbl5bb3x47pkr250lgd3s81slhg5"; }; "ffcb54fe4e2f0e1ee2f22f84cff4ddc49da010f1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/ffcb54fe4e2f0e1ee2f22f84cff4ddc49da010f1; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/ffcb54fe4e2f0e1ee2f22f84cff4ddc49da010f1"; sha256 = "1irjabajfblyl5s36lasq5rclxagc1finwb7y68wsj3w5195gihg"; }; } diff --git a/pkgs/games/ue4/default.nix b/pkgs/games/ue4/default.nix index 5eb97e991892b..643779cf5fd8f 100644 --- a/pkgs/games/ue4/default.nix +++ b/pkgs/games/ue4/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { meta = { description = "A suite of integrated tools for game developers to design and build games, simulations, and visualizations"; - homepage = https://www.unrealengine.com/what-is-unreal-engine-4; + homepage = "https://www.unrealengine.com/what-is-unreal-engine-4"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.puffnfresh ]; diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix index 2020066ee651c..24c98f7d774fb 100644 --- a/pkgs/games/ue4demos/default.nix +++ b/pkgs/games/ue4demos/default.nix @@ -50,7 +50,7 @@ let meta = { description = "Unreal Engine 4 Linux demos"; - homepage = https://wiki.unrealengine.com/Linux_Demos; + homepage = "https://wiki.unrealengine.com/Linux_Demos"; platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.unfree; }; diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index beff8ada96b40..94a12774a4304 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_LINK = "-lgcc_s"; # to avoid occasional runtime error in finding libgcc_s.so.1 meta = { - homepage = http://ufoai.org; + homepage = "http://ufoai.org"; description = "A squad-based tactical strategy game in the tradition of X-Com"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/games/ultimatestunts/default.nix index df80b3a555fbd..6eb4725897ffa 100644 --- a/pkgs/games/ultimatestunts/default.nix +++ b/pkgs/games/ultimatestunts/default.nix @@ -4,7 +4,7 @@ pkgconfig}: stdenv.mkDerivation { name = "ultimate-stunts-0.7.6.1"; src = fetchurl { - url = mirror://sourceforge/ultimatestunts/ultimatestunts-srcdata-0761.tar.gz; + url = "mirror://sourceforge/ultimatestunts/ultimatestunts-srcdata-0761.tar.gz"; sha256 = "0rd565ml6l927gyq158klhni7myw8mgllhv0xl1fg9m8hlzssgrv"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.ultimatestunts.nl/; + homepage = "http://www.ultimatestunts.nl/"; description = "Remake of the popular racing DOS-game Stunts"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index feaf6cabf32ab..3e17dfdf644ff 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { dontPatchELF = true; meta = with stdenv.lib; { - homepage = http://ultrastardx.sourceforge.net/; + homepage = "http://ultrastardx.sourceforge.net/"; description = "Free and open source karaoke game"; license = licenses.gpl2Plus; maintainers = with maintainers; [ Profpatsch ]; diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix index ee3890aeea5b1..1ac87c1d41b23 100644 --- a/pkgs/games/unnethack/default.nix +++ b/pkgs/games/unnethack/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fork of NetHack"; - homepage = https://unnethack.wordpress.com/; + homepage = "https://unnethack.wordpress.com/"; license = "nethack"; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 3944050e9836d..523ae354b7600 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -99,7 +99,7 @@ in stdenv.mkDerivation rec { - to adapt the code so that people can more easily make their own spin-offs, thereby making zillions more people happy! ''; - homepage = http://sc2.sourceforge.net/; + homepage = "http://sc2.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = with lib.maintainers; [ jcumming aszlig ]; platforms = with lib.platforms; linux; diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 98ef32b0472a5..ccc20281302b2 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { tactical shooter; somewhat realism based, but the motto is "fun over realism". This results in a very unique, enjoyable and addictive game. ''; - homepage = http://www.urbanterror.info; + homepage = "http://www.urbanterror.info"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ astsmtl fpletz ]; platforms = platforms.linux; diff --git a/pkgs/games/ut2004/demo.nix b/pkgs/games/ut2004/demo.nix index 1790f08306383..cb7c0208f1059 100644 --- a/pkgs/games/ut2004/demo.nix +++ b/pkgs/games/ut2004/demo.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A first-person shooter video game developed by Epic Games and Digital Extreme -- demo version"; - homepage = http://www.unrealtournament2004.com; + homepage = "http://www.unrealtournament2004.com"; license = licenses.unfree; maintainers = with maintainers; [ abbradar ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/games/vapor/default.nix b/pkgs/games/vapor/default.nix index 2e4fdf1af96cf..a8d345151d64d 100644 --- a/pkgs/games/vapor/default.nix +++ b/pkgs/games/vapor/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { platforms = platforms.linux; license = licenses.zlib; maintainers = with maintainers; [ leenaars ]; - downloadPage = http://vapor.love2d.org/; + downloadPage = "http://vapor.love2d.org/"; }; } diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 84984fcbb587d..55848d91fab5e 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open-source boardgame engine"; - homepage = http://www.vassalengine.org/; + homepage = "http://www.vassalengine.org/"; license = licenses.lgpl21; maintainers = with maintainers; [ tvestelind ]; platforms = platforms.linux; diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 3685d24c972c4..99475af49e1f2 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -34,7 +34,7 @@ let meta = { description = "Car racing game"; - homepage = http://vdrift.net/; + homepage = "http://vdrift.net/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/vectoroids/default.nix b/pkgs/games/vectoroids/default.nix index f1e9c13f86b06..01e787b8d911c 100644 --- a/pkgs/games/vectoroids/default.nix +++ b/pkgs/games/vectoroids/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "vectoroids-1.1.0"; src = fetchurl { - url = ftp://ftp.tuxpaint.org/unix/x/vectoroids/src/vectoroids-1.1.0.tar.gz; + url = "ftp://ftp.tuxpaint.org/unix/x/vectoroids/src/vectoroids-1.1.0.tar.gz"; sha256 = "0bkvd4a1v496w0vlvqyi1a6p25ssgpkchxxxi8899sb72wlds54d"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.newbreedsoftware.com/vectoroids/; + homepage = "http://www.newbreedsoftware.com/vectoroids/"; description = "Clone of the classic arcade game Asteroids by Atari"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index 483912bab45e9..4e0337fa1b47f 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { causing. Vessel is a game about a man with the power to bring ordinary matter to life, and all the consequences that ensue. ''; - homepage = http://www.strangeloopgames.com; + homepage = "http://www.strangeloopgames.com"; license = licenses.unfree; maintainers = with maintainers; [ jcumming ]; }; diff --git a/pkgs/games/vitetris/default.nix b/pkgs/games/vitetris/default.nix index fdc28d3a53909..2b9c77cd46792 100644 --- a/pkgs/games/vitetris/default.nix +++ b/pkgs/games/vitetris/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Terminal-based Tetris clone by Victor Nilsson"; - homepage = http://www.victornils.net/tetris/; + homepage = "http://www.victornils.net/tetris/"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ siers ]; diff --git a/pkgs/games/vms-empire/default.nix b/pkgs/games/vms-empire/default.nix index 33e342de3b46c..d0920b0c68d5f 100644 --- a/pkgs/games/vms-empire/default.nix +++ b/pkgs/games/vms-empire/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec{ expand/explore/exploit/exterminate games, including Civilization and Master of Orion. ''; - homepage = http://catb.org/~esr/vms-empire/; + homepage = "http://catb.org/~esr/vms-empire/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix index d8c16c9b7ced9..93f7e9bffa676 100644 --- a/pkgs/games/voxelands/default.nix +++ b/pkgs/games/voxelands/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://voxelands.com/; + homepage = "http://voxelands.com/"; description = "Infinite-world block sandbox game based on Minetest"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix index c3896f6cf71eb..dc8b53d09ad6a 100644 --- a/pkgs/games/warmux/default.nix +++ b/pkgs/games/warmux/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = with licenses; [ gpl2 ufl ]; - homepage = https://github.com/fluxer/warmux; + homepage = "https://github.com/fluxer/warmux"; }; } diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index 6282658fc1522..4c2cd1b5a2885 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { completely free fast-paced first-person shooter (FPS) for Windows, Linux and macOS. ''; - homepage = http://www.warsow.net; + homepage = "http://www.warsow.net"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ astsmtl abbradar ]; platforms = warsow-engine.meta.platforms; diff --git a/pkgs/games/warsow/engine.nix b/pkgs/games/warsow/engine.nix index c42aa31982591..19c368671e646 100644 --- a/pkgs/games/warsow/engine.nix +++ b/pkgs/games/warsow/engine.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation (libs // rec { meta = with stdenv.lib; { description = "Multiplayer FPS game designed for competitive gaming (engine only)"; - homepage = http://www.warsow.net; + homepage = "http://www.warsow.net"; license = licenses.gpl2; maintainers = with maintainers; [ astsmtl abbradar ]; platforms = platforms.linux; diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index d99a7c44240e8..3d7be936f1bc6 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -60,7 +60,7 @@ mkDerivation rec { technologies, combined with the unit design system, allows for a wide variety of possible units and tactics. ''; - homepage = http://wz2100.net; + homepage = "http://wz2100.net"; license = licenses.gpl2Plus; maintainers = [ maintainers.astsmtl ]; platforms = platforms.linux; diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index 0889e52d8f86c..81540fa4d9624 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -1,71 +1,64 @@ -{ stdenv, requireFile -, libX11, libXext, libXau, libxcb, libXdmcp , SDL, SDL_mixer, libvorbis, libGLU, libGL -, runtimeShell -, demo ? false }: +{ stdenv, requireFile, unzip, makeDesktopItem, SDL2, SDL2_mixer, libogg, libvorbis }: + +let + arch = if stdenv.system == "x86_64-linux" + then "x86_64" + else "x86"; + + desktopItem = makeDesktopItem { + desktopName = "World of Goo"; + genericName = "World of Goo"; + categories = "Game;"; + exec = "WorldOfGoo.bin.${arch}"; + icon = "2dboy-worldofgoo"; + name = "worldofgoo"; + type = "Application"; + }; -# TODO: add i686 support +in stdenv.mkDerivation rec { - name = if demo - then "WorldOfGooDemo-1.41" - else "WorldofGoo-1.41"; - - arch = if stdenv.hostPlatform.system == "x86_64-linux" then "supported" - else throw "Sorry. World of Goo only is only supported on x86_64 now."; + pname = "WorldOfGoo"; + version = "1.53"; - goBuyItNow = '' + helpMsg = '' We cannot download the full version automatically, as you require a license. - Once you bought a license, you need to add your downloaded version to the nix store. - You can do this by using "nix-prefetch-url file://\$PWD/WorldOfGooSetup.1.41.tar.gz" in the - directory where you saved it. - - Or you can install the demo version: 'nix-env -i -A pkgs.worldofgoo_demo'. + Once you have bought a license, you need to add your downloaded version to the nix store. + You can do this by using "nix-prefetch-url file://\$PWD/${pname}.Linux${version}.sh" + in the directory where you saved it. ''; - getTheDemo = '' - We cannot download the demo version automatically. Please go to - http://worldofgoo.com/dl2.php?lk=demo, then add it to your nix store. - You can do this by using "nix-prefetch-url file://\$PWD/WorldOfGooDemo.1.41.tar.gz" in the - directory where you saved it. - ''; + src = requireFile { + message = helpMsg; + name = "WorldOfGoo.Linux.1.53.sh"; + sha256 = "175e4b0499a765f1564942da4bd65029f8aae1de8231749c56bec672187d53ee"; + }; - src = if demo - then - requireFile { - message = getTheDemo; - name = "WorldOfGooDemo.1.41.tar.gz"; - sha256 = "0ndcix1ckvcj47sgndncr3hxjcg402cbd8r16rhq4cc43ibbaxri"; - } - else - requireFile { - message = goBuyItNow; - name = "WorldOfGooSetup.1.41.tar.gz"; - sha256 = "0rj5asx4a2x41ncwdby26762my1lk1gaqar2rl8dijfnpq8qlnk7"; - }; + buildInputs = [ unzip ]; + sourceRoot = pname; + phases = [ "unpackPhase installPhase" ]; - phases = "unpackPhase installPhase"; + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.cc.libc SDL2 SDL2_mixer + libogg libvorbis ]; - # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64 - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] - + ":" + stdenv.lib.makeLibraryPath [libX11 libXext libXau libxcb libXdmcp SDL SDL_mixer libvorbis libGLU libGL ] - + ":" + stdenv.cc.cc + "/lib64"; + unpackPhase = '' + # The game is distributed as a shell script, with a tar of mojosetup, and a + # zip archive attached to the end. Therefore a simple unzip does the job. + # However, to avoid unzip errors, we need to strip those out first. + tail -c +421887 ${src} > ${src}.zip + unzip -q ${src}.zip -d ${pname} + ''; installPhase = '' - mkdir -p $out/libexec/2dboy/WorldOfGoo/ - mkdir -p $out/bin - - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath $libPath ./WorldOfGoo.bin64 + mkdir -p $out/bin $out/share/applications $out/share/icons/hicolor/256x256/apps - cp -r * $out/libexec/2dboy/WorldOfGoo/ + install -t $out/bin -m755 data/${arch}/WorldOfGoo.bin.${arch} + cp -R data/noarch/* $out/bin + cp data/noarch/game/gooicon.png $out/share/icons/hicolor/256x256/apps/2dboy-worldofgoo.png + cp ${desktopItem}/share/applications/worldofgoo.desktop \ + $out/share/applications/worldofgoo.desktop - #makeWrapper doesn't do cd. :( - - cat > $out/bin/WorldofGoo << EOF - #!${runtimeShell} - cd $out/libexec/2dboy/WorldOfGoo - exec ./WorldOfGoo.bin64 - EOF - chmod +x $out/bin/WorldofGoo + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath $libPath $out/bin/WorldOfGoo.bin.${arch} ''; meta = with stdenv.lib; { @@ -75,9 +68,9 @@ stdenv.mkDerivation rec { Balls who live in the beautiful World of Goo don't know that they are in a game, or that they are extremely delicious. ''; - homepage = http://worldofgoo.com; + homepage = "http://worldofgoo.com"; license = licenses.unfree; - maintainers = with maintainers; [ jcumming ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ jcumming maxeaubrey ]; }; - } diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix index 4a8e7188ce898..9f3303578da63 100644 --- a/pkgs/games/xboard/default.nix +++ b/pkgs/games/xboard/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''GUI for chess engines''; - homepage = https://www.gnu.org/software/xboard/; + homepage = "https://www.gnu.org/software/xboard/"; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/games/xbomb/default.nix b/pkgs/games/xbomb/default.nix index 54d6c320f1872..0754905ce50d7 100644 --- a/pkgs/games/xbomb/default.nix +++ b/pkgs/games/xbomb/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.gedanken.org.uk/software/xbomb/; + homepage = "http://www.gedanken.org.uk/software/xbomb/"; description = "Minesweeper for X11 with various grid sizes and shapes"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index 34c9bf1f06d14..d49998a68d73e 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -17,11 +17,16 @@ stdenv.mkDerivation rec { lua5 ode libxdg_basedir libxml2 ]; - CXXFLAGS = [ "-fpermissive" ]; + CXXFLAGS = [ + "-fpermissive" + # Build using the old C++ ABI to fix issue with missing text; the issue + # should be fixed in the next stable release (if that ever does happen) + "-D_GLIBCXX_USE_CXX11_ABI=0" + ]; meta = with stdenv.lib; { description = "Obstacled race game"; - homepage = http://xmoto.tuxfamily.org; + homepage = "http://xmoto.tuxfamily.org"; maintainers = with maintainers; [ raskin pSub ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 5f36ab4fb9f85..ab6ac022b6c25 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -48,7 +48,7 @@ let exec = "$out/bin/xonotic"; comment = meta.description; desktopName = "Xonotic"; - categories = "Game;"; + categories = "Game;Shooter;"; icon = "xonotic"; startupNotify = "false"; }; @@ -84,7 +84,10 @@ let enableParallelBuilding = true; installPhase = '' - install -Dm644 ../../misc/logos/icons_png/xonotic_128.png $out/share/pixmaps/xonotic.png + for size in 16x16 24x24 32x32 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512 1024x1024 scalable; do + install -Dm644 ../../misc/logos/xonotic_icon.svg \ + $out/share/icons/hicolor/$size/xonotic.svg + done '' + lib.optionalString withDedicated '' install -Dm755 darkplaces-dedicated "$out/bin/xonotic-dedicated" '' + lib.optionalString withGLX '' @@ -147,7 +150,7 @@ in rec { ln -sf $out/bin/xonotic-sdl $out/bin/xonotic '' + lib.optionalString (withSDL || withGLX) '' mkdir -p $out/share - ln -s ${xonotic-unwrapped}/share/pixmaps $out/share/pixmaps + ln -s ${xonotic-unwrapped}/share/icons $out/share/icons ${desktopItem.buildCommand} '' + '' for binary in $out/bin/xonotic-*; do diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix index 4a1c25ee12e0c..4de27b1f18dab 100644 --- a/pkgs/games/xpilot/bloodspilot-client.nix +++ b/pkgs/games/xpilot/bloodspilot-client.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = ''A multiplayer space combat game (client part)''; - homepage = http://bloodspilot.sf.net/; + homepage = "http://bloodspilot.sf.net/"; license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/xpilot/bloodspilot-server.nix b/pkgs/games/xpilot/bloodspilot-server.nix index 2f37680bbaab6..6b0a0603af51a 100644 --- a/pkgs/games/xpilot/bloodspilot-server.nix +++ b/pkgs/games/xpilot/bloodspilot-server.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A multiplayer X11 space combat game (server part)"; - homepage = http://bloodspilot.sf.net/; + homepage = "http://bloodspilot.sf.net/"; license = licenses.gpl2Plus ; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix index 7d83dece333ec..8803806547bfe 100644 --- a/pkgs/games/xpilot/default.nix +++ b/pkgs/games/xpilot/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { description = "A multiplayer X11 space combat game"; - homepage = http://xpilot.sf.net/; + homepage = "http://xpilot.sf.net/"; license = licenses.gpl2Plus; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index 086aaded9aa29..5fa91a0395c14 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.free; longDescription = ''Play the german card game Skat against the AI or over IRC.''; - homepage = http://www.xskat.de/; + homepage = "http://www.xskat.de/"; }; } diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix index b3011fbce77ae..c64d8bf568fd4 100644 --- a/pkgs/games/xsnow/default.nix +++ b/pkgs/games/xsnow/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "An X-windows application that will let it snow on the root, in between and on windows"; - homepage = http://janswaal.home.xs4all.nl/Xsnow/; + homepage = "http://janswaal.home.xs4all.nl/Xsnow/"; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.robberer ]; }; diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix index 62cdaccc29750..30579e399b82d 100644 --- a/pkgs/games/xsok/default.nix +++ b/pkgs/games/xsok/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; - homepage = https://tracker.debian.org/pkg/xsok; + homepage = "https://tracker.debian.org/pkg/xsok"; }; } diff --git a/pkgs/games/xtris/default.nix b/pkgs/games/xtris/default.nix index 8f5f832058cc1..c9421b23a821a 100644 --- a/pkgs/games/xtris/default.nix +++ b/pkgs/games/xtris/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A multi-player version of the classical game of Tetris, for the X Window system"; - homepage = https://web.archive.org/web/20120315061213/http://www.iagora.com/~espel/xtris/xtris.html; + homepage = "https://web.archive.org/web/20120315061213/http://www.iagora.com/~espel/xtris/xtris.html"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix index 3f1ebb6961882..e7200ff22e951 100644 --- a/pkgs/games/zandronum/default.nix +++ b/pkgs/games/zandronum/default.nix @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://zandronum.com/; + homepage = "https://zandronum.com/"; description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software"; maintainers = with maintainers; [ lassulus MP2E ]; license = licenses.unfreeRedistributable; diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/zandronum/fmod.nix index 3d5160bb591c8..5eebcd4a38e7c 100644 --- a/pkgs/games/zandronum/fmod.nix +++ b/pkgs/games/zandronum/fmod.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Programming library and toolkit for the creation and playback of interactive audio"; - homepage = http://www.fmod.org/; + homepage = "http://www.fmod.org/"; license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; maintainers = [ maintainers.lassulus ]; diff --git a/pkgs/games/zandronum/sqlite.nix b/pkgs/games/zandronum/sqlite.nix index 3d60dab6fe006..7f4556c875110 100644 --- a/pkgs/games/zandronum/sqlite.nix +++ b/pkgs/games/zandronum/sqlite.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.sqlite.org/; + homepage = "http://www.sqlite.org/"; description = "A single C code file, named sqlite3.c, that contains all C code for the core SQLite library and the FTS3 and RTREE extensions"; platforms = stdenv.lib.platforms.unix; maintainers = [ lib.maintainers.lassulus ]; diff --git a/pkgs/games/zdoom/bcc-git.nix b/pkgs/games/zdoom/bcc-git.nix index 2a1219e66ea03..ae7a4ae6f426f 100644 --- a/pkgs/games/zdoom/bcc-git.nix +++ b/pkgs/games/zdoom/bcc-git.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Compiler for Doom/Hexen scripts (ACS, BCS)"; - homepage = https://github.com/wormt/bcc; + homepage = "https://github.com/wormt/bcc"; license = licenses.mit; maintainers = with maintainers; [ertes]; }; diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix index f6fde241129b1..646021eb2fccd 100644 --- a/pkgs/games/zdoom/default.nix +++ b/pkgs/games/zdoom/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://zdoom.org/; + homepage = "http://zdoom.org/"; description = "Enhanced port of the official DOOM source code"; # Doom source license, MAME license license = licenses.unfreeRedistributable; diff --git a/pkgs/games/zdoom/zdbsp.nix b/pkgs/games/zdoom/zdbsp.nix index 430d5269a68e8..e86ebd6dbc224 100644 --- a/pkgs/games/zdoom/zdbsp.nix +++ b/pkgs/games/zdoom/zdbsp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ZDoom's internal node builder for DOOM maps"; - homepage = https://zdoom.org/wiki/ZDBSP; + homepage = "https://zdoom.org/wiki/ZDBSP"; license = licenses.gpl2Plus; maintainers = with maintainers; [ertes]; platforms = platforms.linux; diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index 888b7bd3d6aab..d50218af2416c 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = { description = "Multiplayer remake of ZED"; - homepage = http://zod.sourceforge.net/; + homepage = "http://zod.sourceforge.net/"; license = stdenv.lib.licenses.gpl3Plus; /* Says the web */ }; } diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index 273e358184d38..33ba0bf867617 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -5,13 +5,13 @@ let oz = x: if x then "1" else "0"; in stdenv.mkDerivation rec { pname = "apulse"; - version = "0.1.12"; + version = "0.1.13"; src = fetchFromGitHub { owner = "i-rinat"; repo = pname; rev = "v${version}"; - sha256 = "0yk9vgb4aws8xnkhdhgpxp5c0rri8yq61yxk85j99j8ax806i3r8"; + sha256 = "1p6fh6ah5v3qz7dxhcsixx38bxg44ypbim4m03bxk3ls5i9xslmn"; }; enableParallelBuilding = true; diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index ead87f6fab43d..596f5e90e3495 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -6,7 +6,7 @@ let , platform ? null , extraMakeFlags ? [] , extraMeta ? {} - , version ? "2.2" + , version ? "2.3" , ... } @ args: stdenv.mkDerivation ({ @@ -16,8 +16,8 @@ let src = fetchFromGitHub { owner = "ARM-software"; repo = "arm-trusted-firmware"; - rev = "refs/tags/v${version}"; - sha256 = "03fjl5hy1bqlya6fg553bqz7jrvilzrzpbs87cv6jd04v8qrvry8"; + rev = "v${version}"; + sha256 = "113mcf1hwwl0i90cqh08lywxs1bfbg0nwqibay9wlkmx1a5v0bnj"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -48,10 +48,10 @@ let enableParallelBuilding = false; meta = with lib; { - homepage = https://github.com/ARM-software/arm-trusted-firmware; + homepage = "https://github.com/ARM-software/arm-trusted-firmware"; description = "A reference implementation of secure world software for ARMv8-A"; license = licenses.bsd3; - maintainers = [ maintainers.lopsided98 ]; + maintainers = with maintainers; [ lopsided98 ]; } // extraMeta; } // builtins.removeAttrs args [ "extraMeta" ]); diff --git a/pkgs/misc/base16-shell-preview/default.nix b/pkgs/misc/base16-shell-preview/default.nix index 72b7de3b9a27e..15e0596e4103a 100644 --- a/pkgs/misc/base16-shell-preview/default.nix +++ b/pkgs/misc/base16-shell-preview/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Browse and preview Base16 Shell themes in your terminal"; - homepage = https://github.com/nvllsvm/base16-shell-preview; + homepage = "https://github.com/nvllsvm/base16-shell-preview"; license = licenses.mit; maintainers = [ maintainers.rencire ]; }; diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix index b98560992e33c..40a8849ba3f18 100644 --- a/pkgs/misc/beep/default.nix +++ b/pkgs/misc/beep/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "beep-1.3"; src = fetchurl { - url = http://www.johnath.com/beep/beep-1.3.tar.gz; + url = "http://www.johnath.com/beep/beep-1.3.tar.gz"; sha256 = "0bgch6jq5cahakk3kbr9549iysf2dik09afixxy5brbxk1xfzb2r"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = { description = "The advanced PC speaker beeper"; - homepage = http://www.johnath.com/beep/; + homepage = "http://www.johnath.com/beep/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/misc/calaos/installer/default.nix b/pkgs/misc/calaos/installer/default.nix index 618bc6d85059c..6254c9c24f4b1 100644 --- a/pkgs/misc/calaos/installer/default.nix +++ b/pkgs/misc/calaos/installer/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qmake, qttools, qtbase }: +{ mkDerivation, stdenv, fetchFromGitHub, qmake, qttools, qtbase }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "calaos_installer-3.1"; version = "3.1"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Calaos Installer, a tool to create calaos configuration"; - homepage = https://www.calaos.fr/; + homepage = "https://www.calaos.fr/"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ tiramiseb ]; diff --git a/pkgs/misc/cbeams/default.nix b/pkgs/misc/cbeams/default.nix new file mode 100644 index 0000000000000..ec045ebf3efdf --- /dev/null +++ b/pkgs/misc/cbeams/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonApplication, fetchPypi, isPy3k, blessings, docopt }: + +buildPythonApplication rec { + pname = "cbeams"; + version = "1.0.3"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1agcjg6kmcyvk834xd2j60mi349qi9iw3dc2vwpd7pqwq1daq3gi"; + }; + + propagatedBuildInputs = [ blessings docopt ]; + + meta = with lib; { + homepage = "https://github.com/tartley/cbeams"; + description = "Command-line program to draw animated colored circles in the terminal"; + license = licenses.bsd3; + maintainers = with maintainers; [ geistesk ]; + }; +} diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix index 6534d300e8244..3151bace5587d 100644 --- a/pkgs/misc/cups/cups-pk-helper.nix +++ b/pkgs/misc/cups/cups-pk-helper.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PolicyKit helper to configure cups with fine-grained privileges"; - homepage = http://www.freedesktop.org/wiki/Software/cups-pk-helper/; + homepage = "http://www.freedesktop.org/wiki/Software/cups-pk-helper/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 6786623fee3eb..8736edd0e61b3 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -13,7 +13,7 @@ , acl , gmp , darwin -, libusb ? null +, libusb1 ? null , gnutls ? null , avahi ? null , libpaper ? null @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "cups"; # After 2.2.6, CUPS requires headers only available in macOS 10.12+ - version = if stdenv.isDarwin then "2.2.6" else "2.3.1"; + version = if stdenv.isDarwin then "2.2.6" else "2.3.3"; passthru = { inherit version; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; sha256 = if version == "2.2.6" then "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20" - else "1kkpmj17205j8w9hdff2bfpk6lwdmr3gx0j4r35nhgvya24rvjhv"; + else "1vpk0b2vq830f8fvf9z8qjsm5k141i7pi8djbinpnr78pi4dj7r6"; }; outputs = [ "out" "lib" "dev" "man" ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig removeReferencesTo ]; - buildInputs = [ zlib libjpeg libpng libtiff libusb gnutls libpaper ] + buildInputs = [ zlib libjpeg libpng libtiff libusb1 gnutls libpaper ] ++ optionals stdenv.isLinux [ avahi pam dbus ] ++ optional enableSystemd systemd # Separate from above only to not modify order, to avoid mass rebuilds; merge this with the above at next big change. @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { "--enable-dbus" "--enable-pam" "--with-dbusdir=${placeholder "out"}/share/dbus-1" - ] ++ optional (libusb != null) "--enable-libusb" + ] ++ optional (libusb1 != null) "--enable-libusb" ++ optional (gnutls != null) "--enable-ssl" ++ optional (avahi != null) "--enable-avahi" ++ optional (libpaper != null) "--enable-libpaper" @@ -151,7 +151,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://cups.org/; + homepage = "https://cups.org/"; description = "A standards-based printing system for UNIX"; license = licenses.gpl2; # actually LGPL for the library and GPL for the rest maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix index 4464b5ba11b31..5faf6a2198b6e 100644 --- a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother BrGenML1 CUPS wrapper driver"; - homepage = http://www.brother.com; + homepage = "http://www.brother.com"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; diff --git a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix index 2df3cfe67334e..985de63637c6f 100644 --- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother BrGenML1 LPR driver"; - homepage = http://www.brother.com; + homepage = "http://www.brother.com"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.unfreeRedistributable; maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix index bf0f4ef827990..141e3f9e6123f 100644 --- a/pkgs/misc/cups/drivers/brlaser/default.nix +++ b/pkgs/misc/cups/drivers/brlaser/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "brlaser"; - version = "5"; + version = "6"; src = fetchFromGitHub { owner = "pdewacht"; repo = "brlaser"; rev = "v${version}"; - sha256 = "133fx49wkg1v8r4kcishd035hlsscv8kc2q4jnln5qmyhpyygjyy"; + sha256 = "1995s69ksq1fz0vb34v0ndiqncrinbrlpmp70rkl6az7kag99s80"; }; nativeBuildInputs = [ cmake ]; @@ -34,13 +34,19 @@ stdenv.mkDerivation rec { Brother DCP-7065DN Brother DCP-7080 Brother DCP-L2500D + Brother DCP-L2520D Brother DCP-L2540DW - Brother HL-1110 series - Brother HL-1200 series - Brother HL-L2300D series - Brother HL-L2320D series - Brother HL-L2340D series - Brother HL-L2360D series + Brother HL-1110 + Brother HL-1200 + Brother HL-2030 + Brother HL-2140 + Brother HL-2220 + Brother HL-2270DW + Brother HL-5030 + Brother HL-L2300D + Brother HL-L2320D + Brother HL-L2340D + Brother HL-L2360D Brother MFC-1910W Brother MFC-7240 Brother MFC-7360N @@ -49,7 +55,7 @@ stdenv.mkDerivation rec { Brother MFC-L2710DW Lenovo M7605D ''; - homepage = https://github.com/pdewacht/brlaser; + homepage = "https://github.com/pdewacht/brlaser"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ StijnDW ]; diff --git a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix b/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix index f101ffef95b5c..de93a5a7f8bb9 100644 --- a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix +++ b/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix @@ -47,7 +47,7 @@ in rec { meta = { description = "Brother ${lib.strings.toUpper model} driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.steveej ]; @@ -79,7 +79,7 @@ in rec { meta = { description = "Brother ${lib.strings.toUpper model} CUPS wrapper driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.steveej ]; diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index adc4ead94b791..dbc6390ef4985 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -216,7 +216,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "CUPS Linux drivers for Canon printers"; - homepage = http://www.canon.com/; + homepage = "http://www.canon.com/"; license = licenses.unfree; maintainers = with maintainers; [ kylesferrazza diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index 364a7336bf309..b04ef89d215cd 100644 --- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb, libtool +{ stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb1, libtool , withDebug ? false }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; buildInputs = [ - cups automake autoconf glib libxml2 libusb libtool + cups automake autoconf glib libxml2 libusb1 libtool ]; # lgmon3's --enable-libdir flag is used soley for specifying in which @@ -37,7 +37,7 @@ stdenv.mkDerivation { cd lgmon3 substituteInPlace src/Makefile.am \ --replace /usr/include/libusb-1.0 \ - ${libusb.dev}/include/libusb-1.0 + ${libusb1.dev}/include/libusb-1.0 ./autogen.sh --prefix=$out --enable-progpath=$out/bin \ --datadir=$out/share \ --enable-libdir=/var/cache/cups @@ -115,7 +115,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Canon InkJet printer drivers for the MG7500, MG6700, MG6600, MG5600, MG2900, MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490, E480, MG7700, MG6900, MG6800, MG5700, MG3600, and G3000 series."; - homepage = http://support-th.canon-asia.com/contents/TH/EN/0100712901.html; + homepage = "http://support-th.canon-asia.com/contents/TH/EN/0100712901.html"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix index a09311a8292d7..2cb3fe01ddb60 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Canon InkJet printer drivers for the iP5400, MP520, MP210, MP140, iP3500, and MP610 series. (MP520 drivers also work for MX700.)"; - homepage = http://support-asia.canon-asia.com/content/EN/0100084101.html; + homepage = "http://support-asia.canon-asia.com/content/EN/0100084101.html"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ jerith666 ]; diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix index 8866b425ca8f5..9b328c20b7134 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, autoconf, automake, libtool, cups, popt, libtiff, libpng, - ghostscript, glib, libusb, libxml2 }: + ghostscript, glib, libusb1, libxml2 }: /* this derivation is basically just a transcription of the rpm .spec file included in the tarball */ -let arch = +let arch = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else if stdenv.hostPlatform.system == "i686-linux" then "32" else throw "Unsupported system ${stdenv.hostPlatform.system}"; @@ -32,7 +32,7 @@ in stdenv.mkDerivation { buildInputs = [ autoconf libtool automake cups popt libtiff libpng - ghostscript glib libusb libxml2 ]; + ghostscript glib libusb1 libxml2 ]; # patches from https://github.com/tokiclover/bar-overlay/tree/master/net-print/cnijfilter patches = [ @@ -53,10 +53,10 @@ in stdenv.mkDerivation { configurePhase = '' cd libs - ./autogen.sh --prefix=$out + ./autogen.sh --prefix=$out cd ../bscc2sts - ./autogen.sh + ./autogen.sh cd ../cnijnpr ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib @@ -68,25 +68,25 @@ in stdenv.mkDerivation { ./autogen.sh --prefix=$out --enable-progpath=$out/bin cd ../pstocanonij - ./autogen.sh --prefix=$out --enable-progpath=$out/bin + ./autogen.sh --prefix=$out --enable-progpath=$out/bin cd ../backend ./autogen.sh --prefix=$out cd ../backendnet - ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin + ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin cd ../cmdtocanonij ./autogen.sh --prefix=$out --datadir=$out/share cd ../cnijbe - ./autogen.sh --prefix=$out --enable-progpath=$out/bin + ./autogen.sh --prefix=$out --enable-progpath=$out/bin cd ../lgmon2 substituteInPlace src/Makefile.am \ --replace /usr/include/libusb-1.0 \ - ${libusb.dev}/include/libusb-1.0 - ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin + ${libusb1.dev}/include/libusb-1.0 + ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin cd ..; @@ -142,7 +142,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Canon InkJet printer drivers for the MG2400 MG2500 MG3500 MG5500 MG6400 MG6500 MG7100 and P200 series."; - homepage = https://www.canon-europe.com/support/consumer_products/products/fax__multifunctionals/inkjet/pixma_mg_series/pixma_mg5550.aspx?type=drivers&driverdetailid=tcm:13-1094072; + homepage = "https://www.canon-europe.com/support/consumer_products/products/fax__multifunctionals/inkjet/pixma_mg_series/pixma_mg5550.aspx?type=drivers&driverdetailid=tcm:13-1094072"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ chpatrick ]; diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix index 0c91b782117dd..e9fac1c73e2f2 100644 --- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { BJNP protocol. This back-end allows Cups to print over the network to a Canon printer. The design is based on reverse engineering of the protocol. ''; - homepage = http://cups-bjnp.sourceforge.net; + homepage = "http://cups-bjnp.sourceforge.net"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix index c2b912007d88e..eccbae6010436 100644 --- a/pkgs/misc/cups/drivers/dymo/default.nix +++ b/pkgs/misc/cups/drivers/dymo/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "CUPS Linux drivers and SDK for DYMO printers"; - homepage = http://www.dymo.com/; + homepage = "http://www.dymo.com/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ makefu ]; }; diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/misc/cups/drivers/estudio/default.nix index ad8b0089a8710..9aaae31488d39 100644 --- a/pkgs/misc/cups/drivers/estudio/default.nix +++ b/pkgs/misc/cups/drivers/estudio/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "7.89"; src = fetchurl { - url = http://business.toshiba.com/downloads/KB/f1Ulds/15178/TOSHIBA_ColorMFP_CUPS.tar; + url = "http://business.toshiba.com/downloads/KB/f1Ulds/15178/TOSHIBA_ColorMFP_CUPS.tar"; sha256 = "0qz4r7q55i0adf4fv3aqnfqgi2pz3jb1jixkqm9x6nk4vanyjf4r"; }; @@ -47,7 +47,7 @@ stdenv.mkDerivation { TOSHIBA e-STUDIO6540C, TOSHIBA e-STUDIO6550C, TOSHIBA e-STUDIO6560C, TOSHIBA e-STUDIO6570C and TOSHIBA e-STUDIO7506AC. ''; - homepage = http://business.toshiba.com/support/downloads/index.html; + homepage = "http://business.toshiba.com/support/downloads/index.html"; license = licenses.unfree; maintainers = [ maintainers.jpotier ]; }; diff --git a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix index 23651a57df8c1..30d7378710476 100644 --- a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix +++ b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { DocuCentre-VI C2271/C3370/C3371/C4471/C5571/C6671/C7771 DocuPrint 3205 d/3208 d/3505 d/3508 d/4405 d/4408 d ''; - homepage = https://onlinesupport.fujixerox.com; + homepage = "https://onlinesupport.fujixerox.com"; license = licenses.unfree; maintainers = with maintainers; [ delan ]; platforms = platforms.linux; diff --git a/pkgs/misc/cups/drivers/googlecloudprint/default.nix b/pkgs/misc/cups/drivers/googlecloudprint/default.nix index 0dcd518de8421..9b612c43a0007 100644 --- a/pkgs/misc/cups/drivers/googlecloudprint/default.nix +++ b/pkgs/misc/cups/drivers/googlecloudprint/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Google Cloud Print driver for CUPS, allows printing to printers hosted on Google Cloud Print"; - homepage = http://ccp.niftiestsoftware.com; + homepage = "http://ccp.niftiestsoftware.com"; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/misc/cups/drivers/hl1110/default.nix b/pkgs/misc/cups/drivers/hl1110/default.nix index 701d4b6a1002f..194ef6cc32721 100644 --- a/pkgs/misc/cups/drivers/hl1110/default.nix +++ b/pkgs/misc/cups/drivers/hl1110/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother HL1110 printer driver"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/cups/drivers/hl3140cw/default.nix b/pkgs/misc/cups/drivers/hl3140cw/default.nix index 001a3c1eac091..9dabf053fd668 100644 --- a/pkgs/misc/cups/drivers/hl3140cw/default.nix +++ b/pkgs/misc/cups/drivers/hl3140cw/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother hl3140cw printer driver"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/cups/drivers/hll2340dw/default.nix b/pkgs/misc/cups/drivers/hll2340dw/default.nix index 653f72a0b6104..a291f16628834 100644 --- a/pkgs/misc/cups/drivers/hll2340dw/default.nix +++ b/pkgs/misc/cups/drivers/hll2340dw/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother hl-l2340dw printer driver"; license = licenses.unfree; platforms = platforms.linux; diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix index 90f9a8e943ab3..0a55ee0c8bbf4 100644 --- a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix +++ b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix @@ -60,11 +60,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother HL-L2390DW combined print driver"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us_ot&lang=en&prod=hll2390dw_us&os=128; + downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us_ot&lang=en&prod=hll2390dw_us&os=128"; maintainers = [ maintainers.samueldr ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix index c7484e6d30b01..23ee927a3bfc0 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother MFC-J470DW CUPS wrapper driver"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128; + downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128"; maintainers = [ stdenv.lib.maintainers.yochai ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix index befafd855bcf2..31b5c1dbd3705 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother MFC-J470DW LPR driver"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; - downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128; + downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128"; maintainers = [ stdenv.lib.maintainers.yochai ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix index 4ec9e3fc6c8eb..8a5c9644512ed 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother MFC-J6510DW CUPS wrapper driver"; license = with licenses; gpl2; platforms = with platforms; linux; - downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128; + downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128"; maintainers = with maintainers; [ ramkromberg ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index b12ef18e46c41..46ce7abb28e6e 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -80,8 +80,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Brother MFC-J6510DW LPR driver"; - downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128; - homepage = http://www.brother.com/; + downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128"; + homepage = "http://www.brother.com/"; license = with licenses; unfree; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; linux; diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix index 1673c2d5c5c8c..27cb40a9e4fc6 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2700DN CUPS wrapper driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.tv ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix index 91110104bc968..24d3e5cab7fd5 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2700DN LPR driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.tv ]; platforms = [ "i686-linux" ]; diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix index b58e7b4faa447..8a2ce7edf26b5 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2720DW CUPS wrapper driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.xeji ]; diff --git a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix index b4b16563610a3..0dc9eed2ac00b 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2720DW lpr driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.xeji ]; diff --git a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix index f2303a45a2f37..f2143df321cf8 100644 --- a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2740DW CUPS wrapper driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.enzime ]; diff --git a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix index c2209806724ad..74571611b441b 100644 --- a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2740DW lpr driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.enzime ]; diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix index 50f3b583e42f7..d82c0ad9a86ab 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L8690CDW CUPS wrapper driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.fuzzy-id ]; diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix index 0e088401c0a0c..9e3c529e89881 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L8690CDW LPR printer driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.fuzzy-id ]; platforms = [ "i686-linux" ]; diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix index 8c906db642e18..4088ce700de25 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, libusb, libxml2, perl }: +{ stdenv, fetchurl, cups, libusb-compat-0_1, libxml2, perl }: let @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { buildInputs = [ cups - libusb + libusb-compat-0_1 libxml2 perl ]; @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { done patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so" - patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" + patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ ''; @@ -104,8 +104,8 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Unified Linux Driver for Samsung printers and scanners"; - homepage = http://www.bchemnet.com/suldr; - downloadPage = http://www.bchemnet.com/suldr/driver/; + homepage = "http://www.bchemnet.com/suldr"; + downloadPage = "http://www.bchemnet.com/suldr/driver/"; license = licenses.unfree; # Tested on linux-x86_64. Might work on linux-i386. diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix index 9135441a6e7dd..c205560706f65 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.37.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.37.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, libusb, libxml2 }: +{ stdenv, fetchurl, cups, libusb-compat-0_1, libxml2 }: let @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { buildInputs = [ cups - libusb + libusb-compat-0_1 libxml2 ]; @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { done patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so" - patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" + patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ ''; @@ -87,8 +87,8 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Unified Linux Driver for Samsung printers and scanners"; - homepage = http://www.bchemnet.com/suldr; - downloadPage = http://www.bchemnet.com/suldr/driver/; + homepage = "http://www.bchemnet.com/suldr"; + downloadPage = "http://www.bchemnet.com/suldr/driver/"; license = licenses.unfree; # Tested on linux-x86_64. Might work on linux-i386. diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix index 5dc3979307066..c3c3613bbda89 100644 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix +++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Samsung's Linux printing drivers; includes binaries without source code"; - homepage = http://www.samsung.com/; + homepage = "http://www.samsung.com/"; license = licenses.unfree; platforms = platforms.linux; broken = true; # libscmssc.so and libmfp.so can't find their library dependencies at run-time diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index f81fa27503fd0..5de93b20cb803 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -11,14 +11,14 @@ # } # (This advice was tested on the 1st November 2016.) -{ stdenv, fetchurl, cups, libusb }: +{ stdenv, fetchurl, cups, libusb-compat-0_1 }: # Do not bump lightly! Visit <http://www.bchemnet.com/suldr/supported.html> # to see what will break when upgrading. Consider a new versioned attribute. let installationPath = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "i386"; appendPath = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else ""; - libPath = stdenv.lib.makeLibraryPath [ cups libusb ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; + libPath = stdenv.lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; in stdenv.mkDerivation rec { pname = "samsung-UnifiedLinuxDriver"; version = "4.01.17"; @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Samsung's Linux printing drivers; includes binaries without source code"; - homepage = http://www.samsung.com/; + homepage = "http://www.samsung.com/"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ joko ]; diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index e227de086de6d..c65ca401d60f2 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CUPS drivers for SPL (Samsung Printer Language) printers"; - homepage = http://splix.ap2c.org; + homepage = "http://splix.ap2c.org"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau peti ]; diff --git a/pkgs/misc/cups/drivers/zj-58/default.nix b/pkgs/misc/cups/drivers/zj-58/default.nix index 87a023af1ca76..67df20df4911d 100644 --- a/pkgs/misc/cups/drivers/zj-58/default.nix +++ b/pkgs/misc/cups/drivers/zj-58/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "CUPS filter for thermal printer Zjiang ZJ-58"; - homepage = https://github.com/klirichek/zj-58; + homepage = "https://github.com/klirichek/zj-58"; platforms = platforms.linux; maintainers = with maintainers; [ makefu ]; license = licenses.bsd2; diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 76f68e507506d..217f0c7f0da37 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { doCheck = false; # fails 4 out of 6 tests meta = { - homepage = http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters; + homepage = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters"; description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/doge/default.nix b/pkgs/misc/doge/default.nix index 37acfbf4a8ab1..37a3b4be70637 100644 --- a/pkgs/misc/doge/default.nix +++ b/pkgs/misc/doge/default.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/thiderman/doge; + homepage = "https://github.com/thiderman/doge"; description = "wow very terminal doge"; license = licenses.mit; maintainers = with maintainers; [ Gonzih ]; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index ecf79a953fe3d..9724e68a04dfb 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -3,7 +3,7 @@ pkgconfig, libtool, gtk2, libxml2, libxslt, -libusb, +libusb-compat-0_1, sane-backends, rpm, cpio, getopt, @@ -263,7 +263,7 @@ stdenv.mkDerivation rec { gtk2 libxml2 libtool - libusb + libusb-compat-0_1 sane-backends makeWrapper ]; diff --git a/pkgs/misc/drivers/epson-201106w/default.nix b/pkgs/misc/drivers/epson-201106w/default.nix index 448bac92ae80a..95eb59f7167c3 100644 --- a/pkgs/misc/drivers/epson-201106w/default.nix +++ b/pkgs/misc/drivers/epson-201106w/default.nix @@ -49,7 +49,7 @@ in ''; meta = with stdenv.lib; { - homepage = https://www.openprinting.org/driver/epson-201106w; + homepage = "https://www.openprinting.org/driver/epson-201106w"; description = "Epson printer driver (BX535WD, BX630FW, BX635FWD, ME940FW, NX530, NX635, NX635, SX535WD, WorkForce 545, WorkForce 645"; longDescription = '' This software is a filter program used with the Common UNIX Printing diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 4edc08a3571bf..94b840776207d 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.1"; + version = "1.1.12"; src = fetchurl { # To find new versions, visit @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { # version. # NOTE: Don't forget to update the webarchive link too! urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/09/72/04/c6d928e83e558c4ba1e7e8bcb5c1fe080b8095eb/epson-inkjet-printer-escpr2-1.1.1-1lsb3.2.src.rpm" - "https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/09/72/04/c6d928e83e558c4ba1e7e8bcb5c1fe080b8095eb/epson-inkjet-printer-escpr2-1.1.1-1lsb3.2.src.rpm" + "https://download3.ebz.epson.net/dsc/f/03/00/11/12/33/f7e44f924a4f479e4c74f8f587e07c57de3abd85/epson-inkjet-printer-escpr2-1.1.12-1lsb3.2.src.rpm" + "https://web.archive.org/web/20200523220202if_/https://download3.ebz.epson.net/dsc/f/03/00/11/12/33/f7e44f924a4f479e4c74f8f587e07c57de3abd85/epson-inkjet-printer-escpr2-1.1.12-1lsb3.2.src.rpm" ]; - sha256 = "02vdlhvinsx6vsjq172b2c1vrfzkg0w9j5lbsnjvj6yq3yqz5b5q"; + sha256 = "07sq5xlmidqiycv0qwvpk2xf22vbkbk4fclnjlnx7s08d2jl75kv"; }; patches = [ ./cups-filter-ppd-dirs.patch ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { Refer to the description of epson-escpr for usage. ''; license = licenses.gpl2; - maintainers = with maintainers; [ ma9e ]; + maintainers = with maintainers; [ ma9e ma27 ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix b/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix index 0cc5537180bdc..e06a0c9116242 100644 --- a/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix +++ b/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix @@ -94,7 +94,7 @@ in stdenv.mkDerivation rec { drivers = [ pkgs.${name} ]; }; ''; - downloadPage = https://download.ebz.epson.net/dsc/du/02/DriverDownloadInfo.do?LG2=EN&CN2=&DSCMI=16857&DSCCHK=4334d3487503d7f916ccf5d58071b05b7687294f; + downloadPage = "https://download.ebz.epson.net/dsc/du/02/DriverDownloadInfo.do?LG2=EN&CN2=&DSCMI=16857&DSCCHK=4334d3487503d7f916ccf5d58071b05b7687294f"; license = with lib.licenses; [ lgpl21 epson ]; maintainers = [ lib.maintainers.jorsn ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/misc/drivers/epson_201207w/default.nix b/pkgs/misc/drivers/epson_201207w/default.nix index fc854c007962c..6a9782715d219 100644 --- a/pkgs/misc/drivers/epson_201207w/default.nix +++ b/pkgs/misc/drivers/epson_201207w/default.nix @@ -47,7 +47,7 @@ in ''; meta = with stdenv.lib; { - homepage = https://www.openprinting.org/driver/epson-201207w; + homepage = "https://www.openprinting.org/driver/epson-201207w"; description = "Epson printer driver (L110, L210, L300, L350, L355, L550, L555)"; longDescription = '' This software is a filter program used with the Common UNIX Printing diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index 9bee05bfb254c..3ca64e0e8f8fe 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ perl cups dbus enscript ]; patches = [ - # for CVE-2015-8327 & CVE-2015-8560 (fetchpatch { + name = "CVE-2015-8327+CVE-2015-8560.patch"; url = "https://salsa.debian.org/debian/foomatic-filters/raw/a3abbef2d2f8c7e62d2fe64f64afe294563fdf8f/debian/patches/0500-r7406_also_consider_the_back_tick_as_an_illegal_shell_escape_character.patch"; sha256 = "055nwi3sjf578nk40bqsch3wx8m2h65hdih0wmxflb6l0hwkq4p4"; }) diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix index 6cf754192f865..4adb96e1299e5 100644 --- a/pkgs/misc/drivers/gutenprint/bin.nix +++ b/pkgs/misc/drivers/gutenprint/bin.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { name = "cups-gutenprint-binary-5.0.1"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = https://www.openprinting.org/download/printdriver/debian/dists/lsb3.1/main/binary-amd64/gutenprint_5.0.1-1lsb3.1_amd64.deb; + url = "https://www.openprinting.org/download/printdriver/debian/dists/lsb3.1/main/binary-amd64/gutenprint_5.0.1-1lsb3.1_amd64.deb"; sha256 = "0an5gba6r6v54r53s2gj2fjk8fzpl4lrksjas2333528b0k8gbbc"; } else throw "TODO"; # get from openprint.com -> drivers -> gutenprint diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 7c8750905d9c3..9946f499329c9 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -2,7 +2,7 @@ { stdenv, lib, fetchurl, makeWrapper, pkgconfig , ijs, zlib , gimp2Support ? false, gimp -, cupsSupport ? true, cups, libusb, perl +, cupsSupport ? true, cups, libusb-compat-0_1, perl }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ ijs zlib ] ++ lib.optionals gimp2Support [ gimp.gtk gimp ] - ++ lib.optionals cupsSupport [ cups libusb perl ]; + ++ lib.optionals cupsSupport [ cups libusb-compat-0_1 perl ]; configureFlags = lib.optionals cupsSupport [ "--disable-static-genppd" # should be harmless on NixOS @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ghostscript and cups printer drivers"; - homepage = https://sourceforge.net/projects/gimp-print/; + homepage = "https://sourceforge.net/projects/gimp-print/"; license = licenses.gpl2; platforms = platforms.linux; isGutenprint = true; diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index 3b03c300db3f3..452c2c425c1d7 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -181,8 +181,8 @@ python2Packages.buildPythonApplication { meta = with stdenv.lib; { description = "Print, scan and fax HP drivers for Linux"; - homepage = http://hplipopensource.com/; - downloadPage = https://sourceforge.net/projects/hplip/files/hplip/; + homepage = "http://hplipopensource.com/"; + downloadPage = "https://sourceforge.net/projects/hplip/files/hplip/"; license = if withPlugin then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix index ab1794c12514e..80cd39b92334b 100644 --- a/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/pkgs/misc/drivers/hplip/3.18.5.nix @@ -213,8 +213,8 @@ python2Packages.buildPythonApplication { meta = with stdenv.lib; { description = "Print, scan and fax HP drivers for Linux"; - homepage = https://developers.hp.com/hp-linux-imaging-and-printing; - downloadPage = https://sourceforge.net/projects/hplip/files/hplip/; + homepage = "https://developers.hp.com/hp-linux-imaging-and-printing"; + downloadPage = "https://sourceforge.net/projects/hplip/files/hplip/"; license = if withPlugin then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 4678442abd991..b1853e28589cd 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -220,8 +220,8 @@ python3Packages.buildPythonApplication { meta = with stdenv.lib; { description = "Print, scan and fax HP drivers for Linux"; - homepage = https://developers.hp.com/hp-linux-imaging-and-printing; - downloadPage = https://sourceforge.net/projects/hplip/files/hplip/; + homepage = "https://developers.hp.com/hp-linux-imaging-and-printing"; + downloadPage = "https://sourceforge.net/projects/hplip/files/hplip/"; license = if withPlugin then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix index 492488f675f2d..cb78bd3498a96 100644 --- a/pkgs/misc/drivers/m33-linux/default.nix +++ b/pkgs/misc/drivers/m33-linux/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/donovan6000/M3D-Linux; + homepage = "https://github.com/donovan6000/M3D-Linux"; description = "A Linux program that can communicate with the Micro 3D printer"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/misc/drivers/moltengamepad/default.nix index 2dd32a93219d3..e5b3b5bab2289 100644 --- a/pkgs/misc/drivers/moltengamepad/default.nix +++ b/pkgs/misc/drivers/moltengamepad/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/jgeumlek/MoltenGamepad; + homepage = "https://github.com/jgeumlek/MoltenGamepad"; description = "Flexible Linux input device translator, geared for gamepads"; license = licenses.mit; maintainers = [ maintainers.ebzzry ]; diff --git a/pkgs/misc/drivers/pentablet-driver/default.nix b/pkgs/misc/drivers/pentablet-driver/default.nix new file mode 100644 index 0000000000000..2f46d950d584b --- /dev/null +++ b/pkgs/misc/drivers/pentablet-driver/default.nix @@ -0,0 +1,38 @@ +{ stdenv, mkDerivation, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, libglvnd }: + +mkDerivation rec { + pname = "pentablet-driver"; + version = "1.2.13.1"; + + src = fetchzip { + url = "https://download01.xp-pen.com/file/2020/04/Linux_Pentablet_V${version}.tar.gz(20200428).zip"; + sha256 = "1r423hcpi26v82pzl59br1zw5vablikclqsy6mcqi0v5p84hfrdd"; + } + /Linux_Pentablet_V1.2.13.1.tar.gz; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + libusb1 + libX11 + libXtst + qtbase + libglvnd + stdenv.cc.cc.lib + ]; + + installPhase = '' + mkdir -p $out/bin + cp Pentablet_Driver $out/bin/pentablet-driver + cp config.xml $out/bin/config.xml + ''; + + meta = with stdenv.lib; { + homepage = "https://www.xp-pen.com/download-46.html"; + description = "Driver for XP-PEN Pentablet drawing tablets"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ ivar ]; + }; +} diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix index cd322bf8fdb70..74b7c68d38e7f 100644 --- a/pkgs/misc/drivers/postscript-lexmark/default.nix +++ b/pkgs/misc/drivers/postscript-lexmark/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.openprinting.org/driver/Postscript-Lexmark/; + homepage = "http://www.openprinting.org/driver/Postscript-Lexmark/"; description = "Lexmark Postscript Drivers"; platforms = platforms.linux; }; diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index b977b2c0c15e9..4de6e54cd5fb4 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -53,7 +53,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/kozec/sc-controller; + homepage = "https://github.com/kozec/sc-controller"; # donations: https://www.patreon.com/kozec description = "User-mode driver and GUI for Steam Controller and other controllers"; license = licenses.gpl2; diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix index 4b19932450eca..ca5607b530720 100644 --- a/pkgs/misc/drivers/steamcontroller/default.nix +++ b/pkgs/misc/drivers/steamcontroller/default.nix @@ -27,7 +27,7 @@ buildPythonApplication { meta = with stdenv.lib; { description = "A standalone Steam controller driver"; - homepage = https://github.com/ynsta/steamcontroller; + homepage = "https://github.com/ynsta/steamcontroller"; license = licenses.mit; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix index 5b1641a098dfa..b94a09782845a 100644 --- a/pkgs/misc/drivers/sundtek/default.nix +++ b/pkgs/misc/drivers/sundtek/default.nix @@ -46,6 +46,6 @@ in maintainers = [ maintainers.simonvandel ]; platforms = platforms.unix; license = licenses.unfree; - homepage = https://support.sundtek.com/index.php/topic,1573.0.html; + homepage = "https://support.sundtek.com/index.php/topic,1573.0.html"; }; } diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index 8b51060acd026..eb0511b0c4ecd 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation { dontUseSconsInstall = true; meta = with stdenv.lib; { - homepage = https://pingus.seul.org/~grumbel/xboxdrv/; + homepage = "https://pingus.seul.org/~grumbel/xboxdrv/"; description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace"; license = licenses.gpl3Plus; maintainers = [ ]; diff --git a/pkgs/misc/drivers/xp-pen-g430/default.nix b/pkgs/misc/drivers/xp-pen-g430/default.nix deleted file mode 100644 index c382239f26a62..0000000000000 --- a/pkgs/misc/drivers/xp-pen-g430/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, wrapQtAppsHook, libglvnd }: -stdenv.mkDerivation rec { - pname = "xp-pen-G430"; - version = "20190820"; - - src = fetchzip { - url = "https://download01.xp-pen.com/file/2019/08/Linux%20Beta%20Driver(${version}).zip"; - sha256 = "091kfqxxj90pdmwncgfl8ldi70pdhwryh3cls30654983m8cgnby"; - } + /Linux_Pentablet_V1.3.0.0.tar.gz; - - nativeBuildInputs = [ - autoPatchelfHook - wrapQtAppsHook - ]; - - buildInputs = [ - libusb1 - libX11 - libXtst - qtbase - libglvnd - stdenv.cc.cc.lib - ]; - - installPhase = '' - mkdir -p $out/bin - cp {Pentablet_Driver,config.xml} "$out"/bin - ''; - - meta = with stdenv.lib; { - homepage = "https://www.xp-pen.com/download-46.html"; - description = "Driver for the XP-PEN G430 drawing tablet"; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = with maintainers; [ ivar ]; - }; -} diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix index a21584afa4c29..3b7b42990af41 100644 --- a/pkgs/misc/drivers/xwiimote/default.nix +++ b/pkgs/misc/drivers/xwiimote/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-doxygen=no" ]; meta = { - homepage = http://dvdhrm.github.io/xwiimote; + homepage = "http://dvdhrm.github.io/xwiimote"; description = "Userspace utilities to control connected Nintendo Wii Remotes"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix index 2e6ccd0a49189..80765f458f803 100644 --- a/pkgs/misc/emulators/atari++/default.nix +++ b/pkgs/misc/emulators/atari++/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, libSM, libX11, libICE, SDL, alsaLib, gcc-unwrapped, libXext }: -with stdenv.lib; stdenv.mkDerivation rec{ pname = "atari++"; - version = "1.81"; + version = "1.83"; src = fetchurl { - url = "http://www.xl-project.com/download/atari++_${version}.tar.gz"; - sha256 = "1sv268dsjddirhx47zaqgqiahy6zjxj7xaiiksd1gjvs4lvf3cdg"; + url = "http://www.xl-project.com/download/${pname}_${version}.tar.gz"; + sha256 = "04fm2ic2qi4a52mi72wcaxyrpll4k8vvchx3qrik8rhg3jrxgm47"; }; buildInputs = [ libSM libX11 SDL libICE alsaLib gcc-unwrapped libXext ]; @@ -16,8 +15,8 @@ stdenv.mkDerivation rec{ patchelf --set-rpath ${stdenv.lib.makeLibraryPath buildInputs} "$out/bin/atari++" ''; - meta = { - homepage = http://www.xl-project.com/; + meta = with stdenv.lib; { + homepage = "http://www.xl-project.com/"; description = "An enhanced, cycle-accurated Atari emulator"; longDescription = '' The Atari++ Emulator is a Unix based emulator of the Atari eight diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix index 6c47109fb65c8..18c78c84d6cfe 100644 --- a/pkgs/misc/emulators/attract-mode/default.nix +++ b/pkgs/misc/emulators/attract-mode/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A frontend for arcade cabinets and media PCs"; - homepage = http://attractmode.org; + homepage = "http://attractmode.org"; license = licenses.gpl3Plus; maintainers = with maintainers; [ hrdinka ]; platforms = with platforms; linux; diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix index 0d4c7ab7216a2..f4cef93141da7 100644 --- a/pkgs/misc/emulators/blastem/default.nix +++ b/pkgs/misc/emulators/blastem/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.retrodev.com/blastem/; + homepage = "https://www.retrodev.com/blastem/"; description = "The fast and accurate Genesis emulator"; maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/misc/emulators/bsod/default.nix b/pkgs/misc/emulators/bsod/default.nix index 8575d654febf5..56b85227cda4e 100644 --- a/pkgs/misc/emulators/bsod/default.nix +++ b/pkgs/misc/emulators/bsod/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "bsod-0.1"; src = fetchurl { - url = https://www.vanheusden.com/bsod/bsod-0.1.tgz; + url = "https://www.vanheusden.com/bsod/bsod-0.1.tgz"; sha256 = "0hqwacazyq5rhc04j8w8w0j0dgb6ca8k66c9lxf6bsyi6wvbhvmd"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { microsoft windows experience. Bsod displays the famous windows xp blue screen of death on the console. Errors and drivers causing the error are selected randomly from a large set of examples."; - homepage = http://www.vanheusden.com/bsod/; + homepage = "http://www.vanheusden.com/bsod/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.antono ]; diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/misc/emulators/ccemux/default.nix index 1277703287077..fc5d4c8138823 100644 --- a/pkgs/misc/emulators/ccemux/default.nix +++ b/pkgs/misc/emulators/ccemux/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A modular ComputerCraft emulator"; - homepage = https://github.com/CCEmuX/CCEmuX; + homepage = "https://github.com/CCEmuX/CCEmuX"; license = licenses.mit; maintainers = with maintainers; [ CrazedProgrammer ]; }; diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix index e587151d3e72f..f493faaac54f1 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation ({ Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed. ''; - homepage = http://cdemu.sourceforge.net/; + homepage = "http://cdemu.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with stdenv.lib.maintainers; [ bendlas ]; diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index df25fb96eb1cd..9723e53a8fdbb 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Provides a Virtual (SCSI) HBA"; - homepage = http://cdemu.sourceforge.net/about/vhba/; + homepage = "http://cdemu.sourceforge.net/about/vhba/"; platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ bendlas ]; diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index ca6ad37b5aae6..efe4770a7b00e 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: +{ stdenv, mkDerivation, lib, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: -stdenv.mkDerivation { +mkDerivation { pname = "citra"; - version = "2019-10-05"; + version = "2020-03-21"; # Submodules src = fetchgit { url = "https://github.com/citra-emu/citra"; - rev = "35690e3ac7a340d941d3bf56080cf5aa6187c5c3"; - sha256 = "11a4mdjabn3qrh0nn4pjl5fxs9nhf1k27wd486csfx88q2q9jvq8"; + rev = "8722b970c52f2c0d8e82561477edb62a53ae9dbb"; + sha256 = "0c1zn1f84h4f6n6p0aqz905yvv5qpdmkj2z58yla6bfgbzabfyrj"; }; enableParallelBuilding = true; diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/misc/emulators/darcnes/default.nix index bdec34e396f7a..3ea98c571e8d3 100644 --- a/pkgs/misc/emulators/darcnes/default.nix +++ b/pkgs/misc/emulators/darcnes/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installPhase = "install -Dt $out/bin darcnes"; meta = { - homepage = https://web.archive.org/web/20130502171725/http://www.dridus.com/~nyef/darcnes/; + homepage = "https://web.archive.org/web/20130502171725/http://www.dridus.com/~nyef/darcnes/"; description = "Sega Master System, Game Gear, SG-1000, NES, ColecoVision and Apple II emulator"; # Prohibited commercial use, credit required. license = stdenv.lib.licenses.free; diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index d5d63cc269440..27c1a2cb9c312 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/misc/emulators/desmume/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { roms. DeSmuME is also able to emulate nearly all of the commercial nds rom titles which other DS Emulators aren't. ''; - homepage = http://www.desmume.com ; + homepage = "http://www.desmume.com"; license = licenses.gpl1Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/misc/emulators/dlx/default.nix index ad111a6151422..215f2ee46f9cb 100644 --- a/pkgs/misc/emulators/dlx/default.nix +++ b/pkgs/misc/emulators/dlx/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.davidviner.com/dlx.php; + homepage = "http://www.davidviner.com/dlx.php"; description = "DLX Simulator"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index 5b770a6471ab5..b70f0e058c07d 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = http://www.dosbox.com/; + homepage = "http://www.dosbox.com/"; description = "A DOS emulator"; platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 722f6b25429a5..af83d4b9f34b1 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = { description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes"; - homepage = https://emulationstation.org; + homepage = "https://emulationstation.org"; maintainers = [ stdenv.lib.maintainers.edwtjo ]; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix index 81202008db19c..493cf4c262874 100644 --- a/pkgs/misc/emulators/epsxe/default.nix +++ b/pkgs/misc/emulators/epsxe/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://epsxe.com/; + homepage = "http://epsxe.com/"; description = "Enhanced PSX (PlayStation 1) emulator"; license = licenses.unfree; maintainers = with maintainers; [ yegortimoshenko ]; diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/misc/emulators/fakenes/default.nix index 704cef52e5e44..d7c8a185a0905 100644 --- a/pkgs/misc/emulators/fakenes/default.nix +++ b/pkgs/misc/emulators/fakenes/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "fakenes-0.5.9b3"; src = fetchurl { - url = mirror://sourceforge/fakenes/fakenes-0.5.9-beta3.tar.gz; + url = "mirror://sourceforge/fakenes/fakenes-0.5.9-beta3.tar.gz"; sha256 = "026h67s4pzc1vma59pmzk02iy379255qbai2q74wln9bxqcpniy4"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { patches = [ ./build.patch ]; meta = { - homepage = http://fakenes.sourceforge.net/; + homepage = "http://fakenes.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; description = "Portable Open Source NES Emulator"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix index 58a6a1dd44223..0d4b4cd357628 100644 --- a/pkgs/misc/emulators/fceux/default.nix +++ b/pkgs/misc/emulators/fceux/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { description = "A Nintendo Entertainment System (NES) Emulator"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.scubed2 ]; - homepage = http://www.fceux.com/; + homepage = "http://www.fceux.com/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/misc/emulators/firebird-emu/default.nix index 079af05e794d4..888cfea0204e8 100644 --- a/pkgs/misc/emulators/firebird-emu/default.nix +++ b/pkgs/misc/emulators/firebird-emu/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }: +{ mkDerivation, stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "firebird-emu"; version = "1.4"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/nspire-emus/firebird; + homepage = "https://github.com/nspire-emus/firebird"; description = "Third-party multi-platform emulator of the ARM-based TI-Nspire™ calculators"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ pneumaticat ]; diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 38730ec752ba7..214c1e6e75b80 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "fs-uae"; - version = "3.0.3"; + version = "3.0.5"; src = fetchurl { url = "https://fs-uae.net/stable/${version}/${pname}-${version}.tar.gz"; - sha256 = "0v5c8ns00bam4myj7454hpkrnm9i81jwdzrp5nl7gaa18qb60hjq"; + sha256 = "1qwzhp34wy7bnd3c0plv11rg9fs5m92rh3ffnr9pn6ng0cpc8vpj"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/misc/emulators/fuse-emulator/default.nix b/pkgs/misc/emulators/fuse-emulator/default.nix index a3a379eb2cfd3..e2334a62a134e 100644 --- a/pkgs/misc/emulators/fuse-emulator/default.nix +++ b/pkgs/misc/emulators/fuse-emulator/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = http://fuse-emulator.sourceforge.net/; + homepage = "http://fuse-emulator.sourceforge.net/"; description = "ZX Spectrum emulator"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index 4120ec7ba6aa1..a9449808d5272 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gens-gs-7"; src = fetchurl { - url = http://retrocdn.net/images/6/6d/Gens-gs-r7.tar.gz; + url = "http://retrocdn.net/images/6/6d/Gens-gs-r7.tar.gz"; sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE"; meta = with stdenv.lib; { - homepage = https://segaretro.org/Gens/GS; + homepage = "https://segaretro.org/Gens/GS"; description = "A Genesis/Mega Drive emulator"; platforms = [ "i686-linux" ]; license = licenses.gpl2Plus; diff --git a/pkgs/misc/emulators/gxemul/default.nix b/pkgs/misc/emulators/gxemul/default.nix index 04c5b441f013c..e742fde90ac99 100644 --- a/pkgs/misc/emulators/gxemul/default.nix +++ b/pkgs/misc/emulators/gxemul/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { and serial controllers. The emulation is working well enough to allow several unmodified "guest" operating systems to run. ''; - homepage = http://gxemul.sourceforge.net/; + homepage = "http://gxemul.sourceforge.net/"; }; } diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix index 278d8d8dc5f3a..db1a6664c542a 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/misc/emulators/hatari/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib SDL cmake ]; meta = { - homepage = http://hatari.tuxfamily.org/; + homepage = "http://hatari.tuxfamily.org/"; description = "Atari ST/STE/TT/Falcon emulator"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/emulators/higan/0001-change-flags.diff b/pkgs/misc/emulators/higan/0001-change-flags.diff index 5821a9c130b0a..745bba5d518da 100644 --- a/pkgs/misc/emulators/higan/0001-change-flags.diff +++ b/pkgs/misc/emulators/higan/0001-change-flags.diff @@ -1,26 +1,25 @@ -diff -Naur higan_v105-source.old/higan/GNUmakefile higan_v105-source.new/higan/GNUmakefile ---- higan_v105-source.old/higan/GNUmakefile 2017-10-07 01:34:22.000000000 -0300 -+++ higan_v105-source.new/higan/GNUmakefile 2017-10-17 00:02:40.580957396 -0200 -@@ -26,7 +26,7 @@ - flags += -fopenmp - link += -fopenmp - ifeq ($(binary),application) -- flags += -march=native -+ flags += - link += -Wl,-export-dynamic - link += -lX11 -lXext - else ifeq ($(binary),library) -diff -Naur higan_v105-source.old/nall/GNUmakefile higan_v105-source.new/nall/GNUmakefile ---- higan_v105-source.old/nall/GNUmakefile 2017-09-23 18:34:22.000000000 -0300 -+++ higan_v105-source.new/nall/GNUmakefile 2017-10-17 00:03:33.568916550 -0200 -@@ -40,8 +40,8 @@ - objcflags := -x objective-c -std=c11 - cppflags := -x c++ -std=c++14 - objcppflags := -x objective-c++ -std=c++14 --flags := --link := -+flags := $(CXXFLAGS) -+link := $(LDFLAGS) +diff -Naur higan-110-old/higan/GNUmakefile higan-110-new/higan/GNUmakefile +--- higan-110-old/higan/GNUmakefile 2020-04-15 11:06:00.279935557 -0300 ++++ higan-110-new/higan/GNUmakefile 2020-04-15 11:08:32.982417291 -0300 +@@ -11,7 +11,7 @@ + include $(nall.path)/GNUmakefile - # compiler detection - ifeq ($(compiler),) + ifeq ($(platform),local) +- flags += -march=native ++ flags += + endif + + ifeq ($(platform),windows) +diff -Naur higan-110-old/nall/GNUmakefile higan-110-new/nall/GNUmakefile +--- higan-110-old/nall/GNUmakefile 2020-04-15 11:06:00.396935154 -0300 ++++ higan-110-new/nall/GNUmakefile 2020-04-15 11:10:37.738011488 -0300 +@@ -127,7 +127,8 @@ + + # linux settings + ifeq ($(platform),linux) +- options += -ldl ++ flags += $(CXXFLAGS) ++ options += $(LDFLAGS) -ldl + endif + + # bsd settings diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 63a7e1c43db3d..e735bdb38eed4 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -1,108 +1,135 @@ -{ stdenv, fetchurl -, p7zip, pkgconfig, libicns +{ stdenv, fetchFromGitHub +, pkgconfig , libX11, libXv , udev -, libGLU, libGL, SDL -, Carbon, Cocoa, OpenGL, OpenAL +, libGLU, libGL, SDL2 , libao, openal, libpulseaudio +, alsaLib , gtk2, gtksourceview -, runtimeShell }: +, runtimeShell +# Darwin dependencies +, libicns, Carbon, Cocoa, OpenGL, OpenAL}: -with stdenv.lib; +let + inherit (stdenv.lib) optionals; +in stdenv.mkDerivation rec { pname = "higan"; - version = "106"; - sourceName = "higan_v${version}-source"; + version = "110"; - src = fetchurl { - urls = [ "https://download.byuu.org/${sourceName}.7z" ]; - sha256 = "063dzp9wrdnbvagraxi31xg0154y2gf67rrd0mnc8h104cgzjr35"; - curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick... + src = fetchFromGitHub { + owner = "higan-emu"; + repo = "higan"; + rev = "v${version}"; + sha256 = "11rvm53c3p2f6zk8xbyv2j51xp8zmqnch7zravhj3fk590qrjrr2"; }; patches = [ ./0001-change-flags.diff ]; postPatch = '' sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp - for file in icarus/GNUmakefile higan/target-tomoko/GNUmakefile; do + for file in icarus/GNUmakefile higan/target-higan/GNUmakefile; do substituteInPlace "$file" \ --replace 'sips -s format icns data/$(name).png --out out/$(name).app/Contents/Resources/$(name).icns' \ 'png2icns out/$(name).app/Contents/Resources/$(name).icns data/$(name).png' done ''; - nativeBuildInputs = [ p7zip pkgconfig ] - ++ optional stdenv.isDarwin [ libicns ]; + nativeBuildInputs = [ pkgconfig ] + ++ optionals stdenv.isDarwin [ libicns ]; - buildInputs = - [ SDL libao ] - ++ optionals stdenv.isLinux [ openal libpulseaudio udev libX11 libXv libGLU libGL gtk2 gtksourceview ] - ++ optionals stdenv.isDarwin [ Carbon Cocoa OpenGL OpenAL ] - ; - - unpackPhase = '' - 7z x $src - sourceRoot=${sourceName} - ''; + buildInputs = [ SDL2 libao ] + ++ optionals stdenv.isLinux [ alsaLib udev libpulseaudio openal + gtk2 gtksourceview libX11 libXv + libGLU libGL ] + ++ optionals stdenv.isDarwin [ Carbon Cocoa OpenGL OpenAL ]; buildPhase = '' - make compiler=c++ -C icarus - make compiler=c++ -C higan + make compiler=c++ -C higan openmp=true target=higan + make compiler=c++ -C genius openmp=true + make compiler=c++ -C icarus openmp=true ''; - # Now the cheats file will be distributed separately - installPhase = (if !stdenv.isDarwin then '' - mkdir -p "$out"/bin "$out"/share/applications "$out"/share/pixmaps - install -m 755 icarus/out/icarus "$out"/bin/ - install -m 755 higan/out/higan "$out"/bin/ - install -m 644 higan/data/higan.desktop "$out"/share/applications/ - install -m 644 higan/data/higan.png "$out"/share/pixmaps/higan-icon.png - install -m 644 higan/resource/logo/higan.png "$out"/share/pixmaps/higan-logo.png - '' else '' + installPhase = (if stdenv.isDarwin then '' mkdir "$out" mv higan/out/higan.app "$out"/ mv icarus/out/icarus.app "$out"/ + mv genius/out/genius.app "$out"/ + '' else '' + install -dm 755 "$out"/bin "$out"/share/applications "$out"/share/pixmaps + + install -m 755 higan/out/higan -t "$out"/bin/ + install -m 644 higan/target-higan/resource/higan.desktop \ + -t $out/share/applications/ + install -m 644 higan/target-higan/resource/higan.svg \ + $out/share/pixmaps/higan-icon.svg + install -m 644 higan/target-higan/resource/higan.png \ + $out/share/pixmaps/higan-icon.png + + install -m 755 icarus/out/icarus -t "$out"/bin/ + install -m 644 icarus/data/icarus.desktop -t $out/share/applications/ + install -m 644 icarus/data/icarus.svg $out/share/pixmaps/icarus-icon.svg + install -m 644 icarus/data/icarus.png $out/share/pixmaps/icarus-icon.png + + install -m 755 genius/out/genius -t "$out"/bin/ + install -m 644 genius/data/genius.desktop -t $out/share/applications/ + install -m 644 genius/data/genius.svg $out/share/pixmaps/genius-icon.svg + install -m 644 genius/data/genius.png $out/share/pixmaps/genius-icon.png '') + '' - mkdir -p "$out"/share/higan + mkdir -p "$out"/share/higan "$out"/share/icarus + cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \ + higan/System/ "$out"/share/higan/ cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \ - higan/systems/* "$out"/share/higan/ + icarus/Database icarus/Firmware $out/share/icarus/ ''; fixupPhase = let - dest = if !stdenv.isDarwin then "\\$HOME/.local/share/higan" else "\\$HOME/Library/Application Support/higan"; + dest = if stdenv.isDarwin + then "\\$HOME/Library/Application Support/higan" + else "\\$HOME/higan"; in '' # A dirty workaround, suggested by @cpages: # we create a first-run script to populate - # the local $HOME with all the auxiliary - # stuff needed by higan at runtime + # $HOME with all the stuff needed at runtime mkdir -p "$out"/bin cat <<EOF > $out/bin/higan-init.sh #!${runtimeShell} - cp --recursive --update $out/share/higan/*.sys "${dest}"/ + cp --recursive --update $out/share/higan/System/ "${dest}"/ EOF chmod +x $out/bin/higan-init.sh ''; - meta = { - description = "An open-source, cycle-accurate Nintendo multi-system emulator"; + meta = with stdenv.lib; { + description = "An open-source, cycle-accurate multi-system emulator"; longDescription = '' - higan (formerly bsnes) is a multi-system game console emulator. + higan is a multi-system game console emulator. The purpose of higan is to + serve as hardware documentation in source code form: it is meant to be as + accurate and complete as possible, with code that is easy to read and + understand. + It currently supports the following systems: - - Nintendo's Famicom, Super Famicom (with subsystems: - Super Game Boy, BS-X Satellaview, Sufami Turbo); - Game Boy, Game Boy Color, Game Boy Advance; - - Sega's Master System, Game Gear, Mega Drive; - - NEC's PC Engine, SuperGrafx; - - Bandai's WonderSwan, WonderSwan Color. + - Famicom + Famicom Disk System + - Super Famicom + Super Game Boy + - Game Boy + Game Boy Color + - Game Boy Advance + Game Boy Player + - SG-1000 + SC-3000 + - Master System + Game Gear + - Mega Drive + Mega CD + - PC Engine + SuperGrafx + - MSX + MSX2 + - ColecoVision + - Neo Geo Pocket + Neo Geo Pocket Color + - WonderSwan + WonderSwan Color + SwanCrystal + Pocket Challenge V2 ''; - homepage = https://byuu.org/emulation/higan/; + homepage = "https://byuu.org/higan/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + platforms = platforms.unix; }; } +# TODO: Qt and GTK3+ support diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix index da6a7c8bf2f30..0b6fb0dea54dd 100644 --- a/pkgs/misc/emulators/kega-fusion/default.nix +++ b/pkgs/misc/emulators/kega-fusion/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Sega SG1000, SC3000, SF7000, Master System, Game Gear, Genesis/Megadrive, SVP, Pico, SegaCD/MegaCD and 32X emulator"; - homepage = https://www.carpeludum.com/kega-fusion/; + homepage = "https://www.carpeludum.com/kega-fusion/"; maintainers = with maintainers; [ abbradar ]; license = licenses.unfreeRedistributable; platforms = [ "i686-linux" ]; diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/misc/emulators/libdsk/default.nix index cb64c30be4958..6a2f94e77e6ce 100644 --- a/pkgs/misc/emulators/libdsk/default.nix +++ b/pkgs/misc/emulators/libdsk/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for accessing discs and disc image files"; - homepage = http://www.seasip.info/Unix/LibDsk/; + homepage = "http://www.seasip.info/Unix/LibDsk/"; license = licenses.gpl2Plus; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index 2b05a921590f2..d72af71f66348 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -7,7 +7,7 @@ with stdenv; let majorVersion = "0"; - minorVersion = "219"; + minorVersion = "221"; desktopItem = makeDesktopItem { name = "MAME"; @@ -26,7 +26,7 @@ in mkDerivation { owner = "mamedev"; repo = "mame"; rev = "mame${majorVersion}${minorVersion}"; - sha256 = "048ar1j2vsrvqqc3spy9qcch2lbxn0ycd9lv4ig5wfnvjkdjdvgr"; + sha256 = "1pqwa5qcrk0wgbyns6fkv7j3pn7byf216cixc3phhhgvfidgr8ww"; }; hardeningDisable = [ "fortify" ]; @@ -77,7 +77,7 @@ in mkDerivation { meta = with lib; { description = "Is a multi-purpose emulation framework"; - homepage = https://www.mamedev.org/; + homepage = "https://www.mamedev.org/"; license = with licenses; [ bsd3 gpl2Plus ]; platforms = platforms.unix; # makefile needs fixes for install target diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index feedfc2603e7b..e356e636c5a2c 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, freeglut, libGLU, libGL, libcdio, libjack2 -, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib }: +, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib, alsaLib }: stdenv.mkDerivation rec { pname = "mednafen"; - version = "1.24.1"; + version = "1.24.3"; src = fetchurl { url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz"; - sha256 = "1rszcy5lgfrw0f9b62sd69kgz1xziki3d55vpqh6k9jdmwzxyym4"; + sha256 = "03zplcfvmnnv7grhacmr1zy789pb2wda36wylmzmar23g0zqbsix"; }; nativeBuildInputs = [ pkgconfig ]; @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { libGLU libGL libcdio libjack2 + alsaLib libsamplerate libsndfile libX11 diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 5977376466157..5611b344cb1c6 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://mgba.io; + homepage = "https://mgba.io"; description = "A modern GBA emulator with a focus on accuracy"; longDescription = '' diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index ee3aab1834abb..621559627a75d 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Nintendo 64 Emulator"; license = licenses.gpl2Plus; - homepage = http://www.mupen64plus.org/; + homepage = "http://www.mupen64plus.org/"; maintainers = [ maintainers.sander ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index 20c7c39312a5a..5050df007f6a3 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://0ldsk00l.ca/nestopia/; + homepage = "http://0ldsk00l.ca/nestopia/"; description = "NES emulator with a focus on accuracy"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 6f28c5777ca17..3faba2ee467cc 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "pcsx2"; - version = "unstable-2020-01-05"; + version = "1.6.0-rc"; src = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2"; - rev = "9c12937351c51b921e1f28d44b019bc52e747c51"; - sha256 = "0y1f5v99a6njmf6hyvl4z5xnrm7351rkyw2fn4f09hqn92r7zmi5"; + rev = "v${version}"; + sha256 = "1mdv1dgwawb4k6bs1jh6j2jaaxg168fbssm1lwnlk5di0gz31h23"; }; postPatch = "sed '1i#include \"x86intrin.h\"' -i common/src/x86emitter/cpudetect.cpp"; diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix index 1035061d0570c..ae608f5631285 100644 --- a/pkgs/misc/emulators/pcsxr/default.nix +++ b/pkgs/misc/emulators/pcsxr/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Playstation 1 emulator"; - homepage = https://pcsxr.codeplex.com/; + homepage = "https://pcsxr.codeplex.com/"; maintainers = with maintainers; [ rardiol ]; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index b976c1e8c27db..b2aa81124dae3 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -16,14 +16,14 @@ mkDerivation rec { pname = "ppsspp"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "17sym0vk72lzbh9a1501mhw98c78x1gq7k1fpy69nvvb119j37wa"; + sha256 = "0ivi0dcfxwa4nz19amki80qacnjhqr42f0ihyby1scxafl3nq55c"; }; postPatch = '' diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix index 660eba5fd03c3..1242a1ef11acf 100644 --- a/pkgs/misc/emulators/qmc2/default.nix +++ b/pkgs/misc/emulators/qmc2/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Qt frontend for MAME/MESS"; - homepage = https://qmc2.batcom-it.net; + homepage = "https://qmc2.batcom-it.net"; license = licenses.gpl2; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 3b935bb2b4476..0ebd2b82a9a9a 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -51,7 +51,7 @@ let meta = with stdenv.lib; { inherit (a) description license; broken = a.broken or false; - homepage = https://www.libretro.com/; + homepage = "https://www.libretro.com/"; maintainers = with maintainers; [ edwtjo hrdinka MP2E ]; platforms = platforms.unix; }; diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 02d0986543219..28a641ec97015 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -15,6 +15,8 @@ , enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null , withVulkan ? stdenv.isLinux, vulkan-loader ? null , fetchurl +, wayland +, libxkbcommon }: with stdenv.lib; @@ -30,7 +32,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; }; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkgconfig wayland ] ++ optional withVulkan makeWrapper; buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ] @@ -38,7 +40,11 @@ stdenv.mkDerivation rec { ++ optional withVulkan vulkan-loader ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ] ++ optionals stdenv.isLinux [ alsaLib libdrm libpulseaudio libv4l libX11 - libXdmcp libXext libXxf86vm mesa udev ]; + libXdmcp libXext libXxf86vm mesa udev + wayland libxkbcommon ]; + + # we use prefix-less pkg-config + PKG_CONF_PATH = "pkg-config"; enableParallelBuilding = true; @@ -51,7 +57,7 @@ stdenv.mkDerivation rec { preFixup = "rm $out/bin/retroarch-cg2glsl"; meta = { - homepage = https://libretro.com; + homepage = "https://libretro.com"; description = "Multi-platform emulator frontend for libretro cores"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix index 44571de3489d8..d2c904723b1ed 100644 --- a/pkgs/misc/emulators/retrofe/default.nix +++ b/pkgs/misc/emulators/retrofe/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { version = "0.6.169"; src = fetchhg { - url = https://bitbucket.org/teamretro/retrofe; + url = "https://bitbucket.org/teamretro/retrofe"; rev = "8793e03"; sha256 = "0cvsg07ff0fdqh5zgiv2fs7s6c98hn150kpxmpw5fn6jilaszwkm"; }; @@ -70,7 +70,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A frontend for arcade cabinets and media PCs"; - homepage = http://retrofe.com; + homepage = "http://retrofe.com"; license = licenses.gpl3Plus; maintainers = with maintainers; [ hrdinka ]; platforms = with platforms; linux; diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index 0ae92121cab1c..6560024b19e0e 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,25 +1,22 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, wrapGAppsHook, intltool, pkgconfig -, SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, portaudio }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig +, SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, pulseaudio, portaudio }: stdenv.mkDerivation rec { pname = "snes9x-gtk"; - version = "1.57"; + version = "1.60"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; rev = version; - sha256 = "1jcvj2l03b98iz6aq4x747vfz7i6h6j339z4brj4vz71s11vn31a"; + sha256 = "12hpn7zcdvp30ldpw2zf115yjqv55n1ldjbids7vx0lvbpr06dm1"; }; enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook wrapGAppsHook intltool pkgconfig ]; - buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip portaudio ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip pulseaudio portaudio ]; - preAutoreconf = '' - cd gtk - intltoolize - ''; + preConfigure = "cd gtk"; meta = with stdenv.lib; { homepage = "http://www.snes9x.com"; diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index 72dc48c1f4d0a..14189e5b38715 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "stella"; - version = "6.1.1"; + version = "6.1.2"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; rev = version; - sha256 = "1iwhslrkq887v035j68lhblybww8r792515rp2m5qzmdgnjzsvbb"; + sha256 = "0m4vdgn7gqhga7hamy4djnlkfgz78gfkmg8by3mai5lw0cps7hr1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index 313b61b393e4e..7b52430aa0151 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Ultimate/Unix/Unusable Amiga Emulator"; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://web.archive.org/web/20130901222855/http://www.amigaemulator.org/; + homepage = "http://web.archive.org/web/20130901222855/http://www.amigaemulator.org/"; maintainers = [ stdenv.lib.maintainers.sander ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index cb083c0aa0d81..ca3149785a4d9 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "vice-3.1"; src = fetchurl { - url = mirror://sourceforge/vice-emu/vice-3.1.tar.gz; + url = "mirror://sourceforge/vice-emu/vice-3.1.tar.gz"; sha256 = "0h0jbml02s2a36hr78dxv1zshmfhxp1wadpcdl09aq416fb1bf1y"; }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { description = "Commodore 64, 128 and other emulators"; - homepage = http://www.viceteam.org; + homepage = "http://www.viceteam.org"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 727eb2700671e..368e2845ca406 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -9,7 +9,6 @@ { lib, stdenv, callPackage, wineRelease ? "stable", wineBuild ? if stdenv.hostPlatform.system == "x86_64-linux" then "wineWow" else "wine32", - libtxc_dxtn_Name ? "libtxc_dxtn_s2tc", pngSupport ? false, jpegSupport ? false, tiffSupport ? false, @@ -63,7 +62,6 @@ let wine-build = build: release: in if wineRelease == "staging" then callPackage ./staging.nix { - inherit libtxc_dxtn_Name; wineUnstable = wine-build wineBuild "unstable"; } else diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 0e3eb2ce6986e..964e08674ca69 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -56,8 +56,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20191224"; - sha256 = "07q3zh2i3xqzpg46ljarhq3a4ha9zwpc6jqzvly0kfglkh3b3v66"; + version = "20200412"; + sha256 = "0ccr8wdmhkhbccxs5hvn44ppl969n8j0c3rnnir5v6akjcb2nzzv"; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index df979c68a47fe..5c2469f8f44e0 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, wineUnstable, libtxc_dxtn_Name }: +{ stdenv, callPackage, wineUnstable }: with callPackage ./util.nix {}; @@ -8,7 +8,7 @@ let patch = (callPackage ./sources.nix {}).staging; in assert stdenv.lib.getVersion wineUnstable == patch.version; stdenv.lib.overrideDerivation wineUnstable (self: { - buildInputs = build-inputs [ "perl" "utillinux" "autoconf" libtxc_dxtn_Name ] self.buildInputs; + buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs; name = "${self.name}-staging"; diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index 76606edf53c3b..ab183dfd38eec 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -25,8 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to install DLLs needed to work around problems in Wine"; license = stdenv.lib.licenses.lgpl21; - homepage = https://github.com/Winetricks/winetricks; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + homepage = "https://github.com/Winetricks/winetricks"; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index 2416ddd65b7ae..4e90a524aa7ae 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { description = "GUI for the Mupen64Plus 2.0 emulator"; license = stdenv.lib.licenses.gpl2Plus; - homepage = https://bitbucket.org/auria/wxmupen64plus/wiki/Home; + homepage = "https://bitbucket.org/auria/wxmupen64plus/wiki/Home"; }; } diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index abceb752b2f8b..584a7b47dc700 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU, libGL +{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU, libGL , freeglut ? null, openal ? null, SDL2 ? null }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "yabause"; version = "0.9.15"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open-source Sega Saturn emulator"; - homepage = https://yabause.org/; + homepage = "https://yabause.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index 55fe49895c9f6..142a49b8d1817 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation { description = "A Super Nintendo Entertainment System Emulator"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; - homepage = http://www.zsnes.com; + homepage = "http://www.zsnes.com"; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch b/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch new file mode 100644 index 0000000000000..c914634f579c0 --- /dev/null +++ b/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch @@ -0,0 +1,862 @@ +From 9f56e78d111d726ca95a59b2d64e5c3298451505 Mon Sep 17 00:00:00 2001 +From: Chris Liddell <chris.liddell@artifex.com> +Date: Mon, 27 Apr 2020 11:04:57 +0100 +Subject: [PATCH] Bug 702364: Fix missing echogs dependencies + +Rebased version of http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c +to fix parallel build +--- + contrib/contrib.mak | 281 ++++++++++++++++++++++---------------------- + 1 file changed, 143 insertions(+), 138 deletions(-) + +diff --git a/contrib/contrib.mak b/contrib/contrib.mak +index 5411ae902..7dd9822a9 100644 +--- a/contrib/contrib.mak ++++ b/contrib/contrib.mak +@@ -22,6 +22,10 @@ + CONTRIB_MAK=$(CONTRIBDIR)$(D)contrib.mak $(TOP_MAKEFILES) + CONTRIBSRC=$(CONTRIBDIR)$(D) + ++# Almost all device drivers depend on the following: ++CONTDEVH=$(gserrors_h) $(gx_h) $(gxdevice_h) ++CONTDEV=$(AK) $(ECHOGS_XE) $(GDEVH) ++ + ###### --------------------------- Catalog -------------------------- ###### + + # The following drivers are user-contributed, and maintained (if at all) by +@@ -161,19 +165,19 @@ $(DEVOBJ)gdevbjca.$(OBJ) : $(CONTRIBSRC)gdevbjca.c $(PDEVH) $(bjc_h) \ + $(DEVCC) $(DEVO_)gdevbjca.$(OBJ) $(C_) $(CONTRIBSRC)gdevbjca.c + + $(DD)bjcmono.dev : $(bjc_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bjcmono $(bjc_) + + $(DD)bjcgray.dev : $(bjc_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bjcgray $(bjc_) + + $(DD)bjccmyk.dev : $(bjc_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bjccmyk $(bjc_) + + $(DD)bjccolor.dev : $(bjc_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bjccolor $(bjc_) + + +@@ -184,25 +188,25 @@ cdeskjet8_=$(DEVOBJ)gdevcd8.$(OBJ) $(HPPCL) + # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de) + # Printer: HP 670 + $(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj670 $(cdeskjet8_) + + # Author: Uli Wortmann (uliw@erdw.ethz.ch) + # Printer: HP 850 + $(DD)cdj850.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj850 $(cdeskjet8_) + + # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de) + # Printer: HP 890 + $(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj890 $(cdeskjet8_) + + # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de) + # Printer: HP 1600 + $(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_) + + $(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\ +@@ -220,7 +224,8 @@ $(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\ + + # Author: Matthew Gelhaus (mgelhaus@proaxis.com) + # Printer: HP 880c +-$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev ++$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev $(CONTDEV) \ ++ $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj880 $(cdeskjet8_) + + +@@ -231,7 +236,7 @@ cdeskjet9_=$(DEVOBJ)gdevdj9.$(OBJ) $(HPPCL) + # Author: Rene Harsch (rene@harsch.net) + # Printer: HP 970Cxi + $(DD)cdj970.dev : $(cdeskjet9_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj970 $(cdeskjet9_) + + $(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h)\ +@@ -244,7 +249,7 @@ $(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h + ### NOTE: Same as chp2200 (some PJL and CRD changes). + + $(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdnj500 $(cdeskjet8_) + + +@@ -253,7 +258,7 @@ $(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev \ + ### NOTE: Depends on the presence of the cdj850 section. + + $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)chp2200 $(cdeskjet8_) + + +@@ -264,11 +269,11 @@ $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev \ + GDIMONO=$(DEVOBJ)gdevgdi.$(OBJ) $(HPPCL) + + $(DD)gdi.dev : $(GDIMONO) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)gdi $(GDIMONO) + + $(DD)samsunggdi.dev : $(GDIMONO) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)samsunggdi $(GDIMONO) + + $(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) \ +@@ -282,17 +287,17 @@ $(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) \ + + hl1250_=$(DEVOBJ)gdevhl12.$(OBJ) $(HPDLJM) + $(DD)hl1250.dev : $(hl1250_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hl1250 $(hl1250_) + + $(DD)hl1240.dev : $(hl1250_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hl1240 $(hl1250_) + + # Author: Marek Michalkiewicz <marekm@linux.org.pl> + # Printer: Brother HL-1250 (may work with some other models too) + $(DEVOBJ)gdevhl12.$(OBJ) : $(CONTRIBSRC)gdevhl12.c $(PDEVH) $(gdevdljm_h) \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(DEVCC) $(DEVO_)gdevhl12.$(OBJ) $(C_) $(CONTRIBSRC)gdevhl12.c + + +@@ -303,37 +308,37 @@ ln03_=$(DEVOBJ)gdevln03.$(OBJ) + # Author: Ulrich Mueller (ulm@vsnhd1.cern.ch) + # Printer: DEC LN03 + $(DD)ln03.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)ln03 $(ln03_) + + # Author: Nick Brown (nick.brown@coe.int) + # Printer: DEClaser 2100 + $(DD)dl2100.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)dl2100 $(ln03_) + + # Author: Ian MacPhedran (macphed@dvinci.USask.CA) + # Printer: DEC LA50 + $(DD)la50.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)la50 $(ln03_) + + # Author: Bruce Lowekamp (lowekamp@csugrad.cs.vt.edu) + # Printer: DEC LA70 + $(DD)la70.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)la70 $(ln03_) + + # Author: Ian MacPhedran (macphed@dvinci.USask.CA) + # Printer: DEC LA75 + $(DD)la75.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)la75 $(ln03_) + + # Author: Andre' Beck (Andre_Beck@IRS.Inf.TU-Dresden.de) + # Printer: DEC LA75plus + $(DD)la75plus.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)la75plus $(ln03_) + + $(DEVOBJ)gdevln03.$(OBJ) : $(CONTRIBSRC)gdevln03.c $(PDEVH) \ +@@ -356,27 +361,27 @@ $(DEVOBJ)gdevescv.$(OBJ) : $(ESCV_SRC)gdevescv.c $(ESCV_SRC)gdevescv.h $(PDEVH) + $(DEVCC) -DA4 $(DEVO_)gdevescv.$(OBJ) $(C_) $(escv_opts) $(ESCV_SRC)gdevescv.c + + $(DD)alc1900.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc1900 $(escv_) + + $(DD)alc2000.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc2000 $(escv_) + + $(DD)alc4000.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc4000 $(escv_) + + $(DD)alc4100.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc4100 $(escv_) + + $(DD)alc8500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc8500 $(escv_) + + $(DD)alc8600.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc8600 $(escv_) + + $(DD)alc9100.dev : $(escv_) $(DD)page.dev \ +@@ -384,11 +389,11 @@ $(DD)alc9100.dev : $(escv_) $(DD)page.dev \ + $(SETPDEV) $(DD)alc9100 $(escv_) + + $(DD)lp3000c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp3000c $(escv_) + + $(DD)lp8000c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8000c $(escv_) + + $(DD)lp8200c.dev : $(escv_) $(DD)page.dev \ +@@ -396,15 +401,15 @@ $(DD)lp8200c.dev : $(escv_) $(DD)page.dev \ + $(SETPDEV) $(DD)lp8200c $(escv_) + + $(DD)lp8300c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8300c $(escv_) + + $(DD)lp8500c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8500c $(escv_) + + $(DD)lp8800c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8800c $(escv_) + + $(DD)lp9000c.dev : $(escv_) $(DD)page.dev \ +@@ -412,177 +417,177 @@ $(DD)lp9000c.dev : $(escv_) $(DD)page.dev \ + $(SETPDEV) $(DD)lp9000c $(escv_) + + $(DD)lp9200c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9200c $(escv_) + + $(DD)lp9500c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9500c $(escv_) + + $(DD)lp9800c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9800c $(escv_) + + $(DD)lps6500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lps6500 $(escv_) + + $(DD)epl2050.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl2050 $(escv_) + + $(DD)epl2050p.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl2050p $(escv_) + + $(DD)epl2120.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl2120 $(escv_) + + $(DD)epl2500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl2500 $(escv_) + + $(DD)epl2750.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl2750 $(escv_) + + $(DD)epl5800.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl5800 $(escv_) + + $(DD)epl5900.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl5900 $(escv_) + + $(DD)epl6100.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl6100 $(escv_) + + $(DD)epl6200.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl6200 $(escv_) + + $(DD)lp1800.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp1800 $(escv_) + + $(DD)lp1900.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp1900 $(escv_) + + $(DD)lp2200.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp2200 $(escv_) + + $(DD)lp2400.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp2400 $(escv_) + + $(DD)lp2500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp2500 $(escv_) + + $(DD)lp7500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp7500 $(escv_) + + $(DD)lp7700.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp7700 $(escv_) + + $(DD)lp7900.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp7900 $(escv_) + + $(DD)lp8100.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8100 $(escv_) + + $(DD)lp8300f.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8300f $(escv_) + + $(DD)lp8400f.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8400f $(escv_) + + $(DD)lp8600.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8600 $(escv_) + + $(DD)lp8600f.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8600f $(escv_) + + $(DD)lp8700.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8700 $(escv_) + + $(DD)lp8900.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8900 $(escv_) + + $(DD)lp9000b.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9000b $(escv_) + + $(DD)lp9100.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9100 $(escv_) + + $(DD)lp9200b.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9200b $(escv_) + + $(DD)lp9300.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9300 $(escv_) + + $(DD)lp9400.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9400 $(escv_) + + $(DD)lp9600.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9600 $(escv_) + + $(DD)lp9600s.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9600s $(escv_) + + $(DD)lps4500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lps4500 $(escv_) + + $(DD)eplcolor.dev: $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)eplcolor $(escv_) + + $(DD)eplmono.dev: $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)eplmono $(escv_) + + # ------ The Lexmark 5700 and 7000 devices ------ # + + lex7000_=$(DEVOBJ)gdevlx7.$(OBJ) + $(DD)lex7000.dev : $(lex7000_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lex7000 $(lex7000_) + + lex5700_=$(DEVOBJ)gdevlx7.$(OBJ) + $(DD)lex5700.dev : $(lex5700_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lex5700 $(lex5700_) + + lex3200_=$(DEVOBJ)gdevlx7.$(OBJ) + $(DD)lex3200.dev : $(lex3200_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lex3200 $(lex3200_) + + lex2050_=$(DEVOBJ)gdevlx7.$(OBJ) + $(DD)lex2050.dev : $(lex2050_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lex2050 $(lex2050_) + + $(DEVOBJ)gdevlx7.$(OBJ) : $(CONTRIBSRC)gdevlx7.c $(PDEVH) \ +@@ -599,7 +604,7 @@ $(DEVOBJ)gdevlx32.$(OBJ) : $(CONTRIBSRC)gdevlx32.c $(PDEVH) $(gsparam_h) \ + $(DEVCC) $(DEVO_)gdevlx32.$(OBJ) $(C_) $(CONTRIBSRC)gdevlx32.c + + $(DD)lxm3200.dev : $(lxm3200_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lxm3200 $(lxm3200_) + + +@@ -625,13 +630,13 @@ $(DEVOBJ)gdevlips.$(OBJ) : $(GX) $(LIPS_SRC)gdevlips.c $(std_h) \ + $(DEVCC) $(DEVO_)gdevlips.$(OBJ) $(LIPS_OPT) $(C_) $(LIPS_SRC)gdevlips.c + + $(DD)lips4.dev : $(lipsr_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lips4 $(lipsr_) + + lipsv_=$(DEVOBJ)gdevl4v.$(OBJ) $(DEVOBJ)gdevlips.$(OBJ) + + $(DD)lips4v.dev : $(ECHOGS_XE) $(lipsv_) $(DD)vector.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETDEV) $(DD)lips4v $(lipsv_) + $(ADDMOD) $(DD)lips4v -include $(GLD)vector + +@@ -644,11 +649,11 @@ $(DEVOBJ)gdevl4v.$(OBJ) : $(LIPS_SRC)gdevl4v.c $(LIPS_SRC)gdevlips.h $(GDEV)\ + ### --------------- Some extra devices: lips2p, bjc880j ---------------- ### + + $(DD)lips2p.dev : $(lipsr_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lips2p $(lipsr_) + + $(DD)bjc880j.dev : $(lipsr_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bjc880j $(lipsr_) + + +@@ -657,15 +662,15 @@ $(DD)bjc880j.dev : $(lipsr_) $(DD)page.dev \ + md2k_=$(DEVOBJ)gdevmd2k.$(OBJ) + + $(DD)md2k.dev : $(md2k_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)md2k $(md2k_) + + $(DD)md5k.dev : $(md2k_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)md5k $(md2k_) + + $(DEVOBJ)gdevmd2k.$(OBJ) : $(CONTRIBSRC)gdevmd2k.c $(PDEVH) $(gsparam_h) \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(DEVCC) $(DEVO_)gdevmd2k.$(OBJ) $(C_) $(CONTRIBSRC)gdevmd2k.c + + +@@ -673,7 +678,7 @@ $(DEVOBJ)gdevmd2k.$(OBJ) : $(CONTRIBSRC)gdevmd2k.c $(PDEVH) $(gsparam_h) \ + + oki4w_=$(DEVOBJ)gdevop4w.$(OBJ) + $(DD)oki4w.dev : $(oki4w_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)oki4w $(oki4w_) + + # Author: Ivan Schreter (ivan@shadow.sk) +@@ -696,11 +701,11 @@ $(DEVOBJ)gdevopvp.$(OBJ) : $(OPVP_SRC)gdevopvp.c $(OPVP_SRC)opvp_common.h\ + $(DEVCC) $(DEVO_)gdevopvp.$(OBJ) $(OPVP_OPT) $(C_) $(OPVP_SRC)gdevopvp.c + + $(DD)opvp.dev : $(opvp_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)opvp $(opvp_) + + $(DD)oprp.dev : $(opvp_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)oprp $(opvp_) + + +@@ -877,78 +882,78 @@ $(DEVOBJ)pclcomp.$(OBJ) : $(pcl3_src)pclcomp.c $(pcl3_src)pclgen.h \ + + # The generic pcl3 device with selectable subdevices + $(DD)pcl3.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)pcl3 $(pcl3_) + + # Fixed devices for specific printers + $(DD)hpdjplus.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdjplus $(pcl3_) + $(DD)hpdjportable.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdjportable $(pcl3_) + $(DD)hpdj310.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj310 $(pcl3_) + $(DD)hpdj320.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj320 $(pcl3_) + $(DD)hpdj340.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj340 $(pcl3_) + $(DD)hpdj400.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj400 $(pcl3_) + $(DD)hpdj500.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj500 $(pcl3_) + $(DD)hpdj500c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj500c $(pcl3_) + $(DD)hpdj510.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj510 $(pcl3_) + $(DD)hpdj520.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj520 $(pcl3_) + $(DD)hpdj540.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj540 $(pcl3_) + $(DD)hpdj550c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj550c $(pcl3_) + $(DD)hpdj560c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj560c $(pcl3_) + $(DD)hpdj600.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj600 $(pcl3_) + $(DD)hpdj660c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj660c $(pcl3_) + $(DD)hpdj670c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj670c $(pcl3_) + $(DD)hpdj680c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj680c $(pcl3_) + $(DD)hpdj690c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj690c $(pcl3_) + $(DD)hpdj850c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj850c $(pcl3_) + $(DD)hpdj855c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj855c $(pcl3_) + $(DD)hpdj870c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj870c $(pcl3_) + $(DD)hpdj890c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj890c $(pcl3_) + $(DD)hpdj1120c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj1120c $(pcl3_) + + #------------------------------------------------------------------------------ +@@ -985,7 +990,7 @@ pcl3-install: + + xes_=$(DEVOBJ)gdevxes.$(OBJ) + $(DD)xes.dev : $(xes_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)xes $(xes_) + + # Author: Peter Flass (flass@lbdrscs.bitnet) +@@ -1005,16 +1010,16 @@ JAPSRC=$(JAPDIR)$(D) + + pr201_=$(DEVOBJ)gdevp201.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + +-$(DD)pr201.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) ++$(DD)pr201.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)pr201 $(pr201_) + +-$(DD)pr150.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) ++$(DD)pr150.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)pr150 $(pr201_) + +-$(DD)pr1000.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) ++$(DD)pr1000.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)pr1000 $(pr201_) + +-$(DD)pr1000_4.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) ++$(DD)pr1000_4.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)pr1000_4 $(pr201_) + + $(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH) \ +@@ -1025,7 +1030,7 @@ $(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH) \ + + jj100_=$(DEVOBJ)gdevj100.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + +-$(DD)jj100.dev : $(jj100_) $(CONTRIB_MAK) $(MAKEDIRS) ++$(DD)jj100.dev : $(jj100_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)jj100 $(jj100_) + + $(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH) \ +@@ -1037,11 +1042,11 @@ $(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH) \ + bj10v_=$(DEVOBJ)gdev10v.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + + $(DD)bj10v.dev : $(bj10v_) \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bj10v $(bj10v_) + + $(DD)bj10vh.dev : $(bj10v_) \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bj10vh $(bj10v_) + + # Uncomment the following line if you are using MS-DOS on PC9801 series. +@@ -1056,7 +1061,7 @@ $(DEVOBJ)gdev10v.$(OBJ) : $(JAPSRC)gdev10v.c $(PDEVH) \ + dmprt_=$(DEVOBJ)gdevdmpr.$(OBJ) $(DEVOBJ)dviprlib.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + + $(DD)dmprt.dev : $(dmprt_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETDEV) $(DD)dmprt $(dmprt_) + $(ADDMOD) $(DD)dmprt -ps dmp_init + +@@ -1086,19 +1091,19 @@ $(DEVOBJ)gdevmjc.$(OBJ) : $(JAPSRC)gdevmjc.c $(JAPSRC)gdevmjc.h $(PDEVH) $(gdevp + $(DEVCC) -DA4 $(DEVO_)gdevmjc.$(OBJ) $(C_) $(JAPSRC)gdevmjc.c + + $(DD)mj700v2c.dev : $(mj700v2c_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)mj700v2c $(mj700v2c_) + + $(DD)mj500c.dev : $(mj700v2c_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)mj500c $(mj700v2c_) + + $(DD)mj6000c.dev : $(mj700v2c_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)mj6000c $(mj700v2c_) + + $(DD)mj8000c.dev : $(mj700v2c_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)mj8000c $(mj700v2c_) + + ### ----------------- The Fujitsu FMPR printer device ----------------- ### +@@ -1106,7 +1111,7 @@ $(DD)mj8000c.dev : $(mj700v2c_) $(DD)page.dev \ + fmpr_=$(DEVOBJ)gdevfmpr.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + + $(DD)fmpr.dev : $(fmpr_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)fmpr $(fmpr_) + + $(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH) \ +@@ -1118,7 +1123,7 @@ $(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH) \ + fmlbp_=$(DEVOBJ)gdevfmlbp.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + + $(DD)fmlbp.dev : $(fmlbp_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)fmlbp $(fmlbp_) + + $(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH) \ +@@ -1135,7 +1140,7 @@ $(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH) \ + ml6_=$(DEVOBJ)gdevml6.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + + $(DD)ml600.dev : $(ml6_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)ml600 $(ml6_) + + $(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH) \ +@@ -1148,11 +1153,11 @@ $(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH) \ + lbp3x0_=$(DEVOBJ)gdevlbp3.$(OBJ) + + $(DD)lbp310.dev :$(lbp3x0_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lbp310 $(lbp3x0_) + + $(DD)lbp320.dev :$(lbp3x0_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lbp320 $(lbp3x0_) + + $(DEVOBJ)gdevlbp3.$(OBJ) : $(JAPSRC)gdevlbp3.c $(PDEVH) +@@ -1167,7 +1172,7 @@ $(DEVOBJ)gdevnpdl.$(OBJ) : $(JAPSRC)gdevnpdl.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \ + $(DEVCC) -DA4 $(DEVO_)gdevnpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevnpdl.c + + $(DD)npdl.dev : $(npdl_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)npdl $(npdl_) + + ### ------- EPSON ESC/Page printer device ----------------- ### +@@ -1179,11 +1184,11 @@ $(DEVOBJ)gdevespg.$(OBJ) : $(JAPSRC)gdevespg.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \ + $(DEVCC) -DA4 $(DEVO_)gdevespg.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevespg.c + + $(DD)escpage.dev : $(escpage_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)escpage $(escpage_) + + $(DD)lp2000.dev : $(escpage_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp2000 $(escpage_) + + ### --- The RICOH RPDL language printer device ------ ### +@@ -1194,7 +1199,7 @@ $(DEVOBJ)gdevrpdl.$(OBJ) : $(JAPSRC)gdevrpdl.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \ + $(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevrpdl.c + + $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)rpdl $(rpdl_) + + ### ---------- RICOH RPDL IV(600dpi) printer devices ---------- ### +@@ -1204,11 +1209,11 @@ $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \ + # $(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(C_) $(JAPSRC)gdevrpdl.c + # + #$(DD)nx100f.dev : $(rpdl_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + # $(SETPDEV2) $(DD)nx100f $(rpdl_) + # + #$(DD)nx100v.dev : $(rpdl_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + # $(SETPDEV2) $(DD)nx100v $(rpdl_) + + ### ------------ The ALPS Micro Dry printer devices ------------ ### +@@ -1216,15 +1221,15 @@ $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \ + alps_=$(DEVOBJ)gdevalps.$(OBJ) + + $(DD)md50Mono.dev : $(alps_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)md50Mono $(alps_) + + $(DD)md50Eco.dev : $(alps_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)md50Eco $(alps_) + + $(DD)md1xMono.dev : $(alps_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)md1xMono $(alps_) + + $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \ +-- +2.26.2 + diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 37974e41080fa..7f6766cf4624f 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -52,6 +52,9 @@ stdenv.mkDerivation rec { url = "https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=485904772c5f0aa1140032746e5a0abfc40f4cef"; sha256 = "0z5gnvgpp0dlzgvpw9a1yan7qyycv3mf88l93fvb1kyay893rshp"; }) + # rebased version of upstream http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c, + # Remove on update to version > 9.52 + ./0001-Bug-702364-Fix-missing-echogs-dependencies.patch ]; outputs = [ "out" "man" "doc" ]; @@ -118,7 +121,7 @@ stdenv.mkDerivation rec { passthru = { inherit version; }; meta = { - homepage = https://www.ghostscript.com/; + homepage = "https://www.ghostscript.com/"; description = "PostScript interpreter (mainline version)"; longDescription = '' diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix index 56dfe2f19f87c..5a4eb1e7f3313 100644 --- a/pkgs/misc/gnash/default.nix +++ b/pkgs/misc/gnash/default.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = https://savannah.gnu.org/projects/gnash; + homepage = "https://savannah.gnu.org/projects/gnash"; description = "A flash (SWF) player and browser plugin"; license = licenses.gpl3; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/misc/gnuk/generic.nix b/pkgs/misc/gnuk/generic.nix index e592b945a408a..c7bbb3b530d77 100644 --- a/pkgs/misc/gnuk/generic.nix +++ b/pkgs/misc/gnuk/generic.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.fsij.org/pages/gnuk; + homepage = "http://www.fsij.org/pages/gnuk"; description = "An implementation of USB cryptographic token for gpg"; license = licenses.gpl3; platforms = with platforms; linux; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index f6eaa553bb26e..d500756076278 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = { description = "JACK audio connection kit, version 2 with jackdbus"; - homepage = https://jackaudio.org; + homepage = "https://jackaudio.org"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 39c0d7d50c78e..2b5d0d960caf1 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "JACK audio connection kit"; - homepage = https://jackaudio.org; + homepage = "https://jackaudio.org"; license = with licenses; [ gpl2 lgpl21 ]; platforms = platforms.unix; }; diff --git a/pkgs/misc/lguf-brightness/default.nix b/pkgs/misc/lguf-brightness/default.nix index 297ca955e86df..02ce011c59dfb 100644 --- a/pkgs/misc/lguf-brightness/default.nix +++ b/pkgs/misc/lguf-brightness/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Adjust brightness for LG UltraFine 4K display (cross platform)"; - homepage = https://github.com/periklis/lguf-brightness; + homepage = "https://github.com/periklis/lguf-brightness"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ periklis ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index a0a29f95ababb..c3bca18a9a44e 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -16,7 +16,7 @@ let beat = package : extraArgs : buildGoPackage (rec { subPackages = [ package ]; meta = with stdenv.lib; { - homepage = https://www.elastic.co/products/beats; + homepage = "https://www.elastic.co/products/beats"; license = licenses.asl20; maintainers = with maintainers; [ fadenb basvandijk ]; platforms = platforms.linux; @@ -47,7 +47,7 @@ in { ''; buildInputs = [ systemd.dev ]; postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' - patchelf --set-rpath ${libPath} "$bin/bin/journalbeat" + patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; } diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index adcbdddfc3ad0..61c89339fe703 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -16,7 +16,7 @@ let beat = package : extraArgs : buildGoPackage (rec { subPackages = [ package ]; meta = with stdenv.lib; { - homepage = https://www.elastic.co/products/beats; + homepage = "https://www.elastic.co/products/beats"; license = licenses.asl20; maintainers = with maintainers; [ fadenb basvandijk ]; platforms = platforms.linux; @@ -46,7 +46,7 @@ in { ''; buildInputs = [ systemd.dev ]; postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' - patchelf --set-rpath ${libPath} "$bin/bin/journalbeat" + patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; } diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/misc/long-shebang/default.nix index 5af75be690cbb..753e1f490bb4a 100644 --- a/pkgs/misc/long-shebang/default.nix +++ b/pkgs/misc/long-shebang/default.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation { meta = { description = "A tool for #! scripts with more than one argument"; - homepage = https://github.com/shlevy/long-shebang; + homepage = "https://github.com/shlevy/long-shebang"; license = stdenv.lib.licenses.mit; diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix index d701bd654d212..a5a621435ee3e 100644 --- a/pkgs/misc/mxt-app/default.nix +++ b/pkgs/misc/mxt-app/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { description = "Command line utility for Atmel maXTouch devices"; - homepage = https://github.com/atmel-maxtouch/mxt-app; + homepage = "https://github.com/atmel-maxtouch/mxt-app"; license = licenses.bsd2; maintainers = [ maintainers.colemickens ]; platforms = platforms.linux; diff --git a/pkgs/misc/riscv-pk/default.nix b/pkgs/misc/riscv-pk/default.nix index e724869b235c2..3e1f63e5e300e 100644 --- a/pkgs/misc/riscv-pk/default.nix +++ b/pkgs/misc/riscv-pk/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation { meta = { description = "RISC-V Proxy Kernel and Bootloader."; - homepage = https://github.com/riscv/riscv-pk; + homepage = "https://github.com/riscv/riscv-pk"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.riscv; maintainers = [ stdenv.lib.maintainers.shlevy ]; diff --git a/pkgs/misc/rkdeveloptool/default.nix b/pkgs/misc/rkdeveloptool/default.nix index 2e3b456cc9c5e..8ce4fd8e14c70 100644 --- a/pkgs/misc/rkdeveloptool/default.nix +++ b/pkgs/misc/rkdeveloptool/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ libusb1 ]; meta = with stdenv.lib; { - homepage = https://github.com/rockchip-linux/rkdeveloptool; + homepage = "https://github.com/rockchip-linux/rkdeveloptool"; description = "A tool from Rockchip to communicate with Rockusb devices"; license = licenses.gpl2; maintainers = [ maintainers.lopsided98 ]; diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/misc/sailsd/default.nix index 49d86491aa014..0dca07010980a 100644 --- a/pkgs/misc/sailsd/default.nix +++ b/pkgs/misc/sailsd/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simulator daemon for autonomous sailing boats"; - homepage = https://github.com/sails-simulator/sailsd; + homepage = "https://github.com/sails-simulator/sailsd"; license = licenses.gpl3; longDescription = '' Sails is a simulator designed to test the AI of autonomous sailing diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index 6e5822b5a6fff..a93f7e6aeafcc 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -10,10 +10,10 @@ }: let - version = "1.12.1"; + version = "1.13"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "1sk6hbbnf4g6q58fspwlh8bn16j73j3i8hlcshqxzhfhl746krb3"; + sha256 = "11gqsl2x18hgwdjajag9q8qdxqvdqr9m67zka22z7hnd3k569vjz"; }; in stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "16zi0d2jjm2nlrwkwvsxzfpgy45ami45wfh67wq7na2h2ywfmgcp"; + sha256 = "1zc73l5vm4hca8niaa3y76kpk7i9vj89wv4gbxmf1yjmixb71hby"; }; # postPatch: @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Display and control Android devices over USB or TCP/IP"; - homepage = https://github.com/Genymobile/scrcpy; + homepage = "https://github.com/Genymobile/scrcpy"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ deltaevo lukeadams ]; diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index 59d5a146e165e..c9340b2503e8f 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "alock-${date}"; src = fetchgit { - url = https://github.com/Arkq/alock; + url = "https://github.com/Arkq/alock"; rev = "2035e1d4a2293432f5503e82d10f899232eb0f38"; sha256 = "1by954fjn0ryqda89zlmq3gclakg3gz7zy1wjrbgw4lzsk538va6"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/Arkq/alock; + homepage = "https://github.com/Arkq/alock"; description = "Simple screen lock application for X server"; longDescription = '' alock locks the X server until the user enters a password diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index d25f253bd0059..36f8981957036 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Betterlockscreen is a simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed."; - homepage = https://github.com/pavanjadhaw/betterlockscreen; + homepage = "https://github.com/pavanjadhaw/betterlockscreen"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ eyjhb ]; diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index b36f8bf98def6..71a248bcfa12d 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Electric Sheep, a distributed screen saver for evolving artificial organisms"; - homepage = https://electricsheep.org/; + homepage = "https://electricsheep.org/"; maintainers = with maintainers; [ nand0p fpletz ]; platforms = platforms.linux; license = licenses.gpl1; diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix index ae61291b08791..5ffe5f722651f 100644 --- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix +++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple i3lock helper which pixels a screenshot by scaling it down and up to get a pixeled version of the screen when the lock is active."; - homepage = https://gitlab.com/Ma27/i3lock-pixeled; + homepage = "https://gitlab.com/Ma27/i3lock-pixeled"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index 9763949cf9828..4d257650338c0 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/the-cavalry/light-locker; + homepage = "https://github.com/the-cavalry/light-locker"; description = "A simple session-locker for LightDM"; longDescription = '' A simple locker (forked from gnome-screensaver) that aims to diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index fb80f9922ce90..211b7614f3b81 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pipeseroni/pipes.sh; + homepage = "https://github.com/pipeseroni/pipes.sh"; description = "Animated pipes terminal screensaver"; license = licenses.mit; maintainers = [ maintainers.matthiasbeyer ]; diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 9dadd085067d7..7df635c10c7ae 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://tools.suckless.org/slock; + homepage = "https://tools.suckless.org/slock"; description = "Simple X display locker"; longDescription = '' Simple X display locker. This is the simplest X screen locker. diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix index ae89bbd53cc66..83d82e2b3b34c 100644 --- a/pkgs/misc/screensavers/vlock/default.nix +++ b/pkgs/misc/screensavers/vlock/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "vlock-2.2.2"; src = fetchurl { - url = mirror://debian/pool/main/v/vlock/vlock_2.2.2.orig.tar.gz; + url = "mirror://debian/pool/main/v/vlock/vlock_2.2.2.orig.tar.gz"; sha256 = "1b9gv7hmlb8swda5bn40lp1yki8b8wv29vdnhcjqfl6ir98551za"; }; diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index f18099d3840ea..2c39ed599e28c 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Screen locker for the X Window System"; - homepage = http://sillycycle.com/xlockmore.html; + homepage = "http://sillycycle.com/xlockmore.html"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/misc/screensavers/xssproxy/default.nix b/pkgs/misc/screensavers/xssproxy/default.nix index a278e6dc949f6..cff03f3bed04b 100644 --- a/pkgs/misc/screensavers/xssproxy/default.nix +++ b/pkgs/misc/screensavers/xssproxy/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Forward freedesktop.org Idle Inhibition Service calls to Xss"; - homepage = https://github.com/timakro/xssproxy; + homepage = "https://github.com/timakro/xssproxy"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ benley ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index 1aa1f347ab455..ca4623e30687f 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/aanatoly/xtrlock-pam; + homepage = "https://github.com/aanatoly/xtrlock-pam"; description = "PAM based X11 screen locker"; license = "unknown"; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 3277abbb77b97..7546c7626ed8d 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "7.0.6"; + version = "7.0.7"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "0pc6xbwxljpj7h37za63kspdi90ap58x6x5b7hsmlhahblvlw0b8"; + sha256 = "0vgzb923x2q2w1zgbc56d50a5qj9xm77lg7czfzg3va7vd921gy8"; }; nativeBuildInputs = [ diff --git a/pkgs/misc/solfege/css.patch b/pkgs/misc/solfege/css.patch new file mode 100644 index 0000000000000..40273df0132b4 --- /dev/null +++ b/pkgs/misc/solfege/css.patch @@ -0,0 +1,33 @@ +Fix theme parsing errors: https://savannah.gnu.org/bugs/index.php?53107 + +--- a/solfege.css ++++ b/solfege.css +@@ -7,19 +7,19 @@ +-#ProgressionNameLabel, #Feedback { font: "Sans 18" } +-#ProgressionLabelNumber { font: "Sans 12" } +-#BoldText { font: Bold } ++#ProgressionNameLabel, #Feedback { font: 18px Sans } ++#ProgressionLabelNumber { font: 12px Sans } ++#BoldText { font: 12px Sans Bold } + +-#StatisticsH1, #Heading1 { font: Sans 18 } +-#StatisticsH2, #Heading2 { font: Sans 14 } ++#StatisticsH1, #Heading1 { font: 18px Sans } ++#StatisticsH2, #Heading2 { font: 14px Sans } + +-#BpmInactiveLabel { font: Sans 12 } +-#BpmActiveLabel { font: Sans Bold 12 } ++#BpmInactiveLabel { font: 12px Sans } ++#BpmActiveLabel { font: 12px Sans Bold } + + #DIALOGWARNING2 { background: red; } + #DIALOGWARNING { background: yellow; } + + #DEBUGWARNING { + background: red; +- font: Sans Bold 24; ++ font: 24px Sans Bold; + } + +-#FlashBarLabel { font: Sans 16 } ++#FlashBarLabel { font: 16px Sans } diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index 08397c8406f60..05e13f3c9aaee 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -1,20 +1,26 @@ -{ stdenv, fetchurl, pkgconfig, pythonPackages, gettext, texinfo -, ghostscript, librsvg, gdk-pixbuf, txt2man, timidity, mpg123 -, alsaUtils, vorbis-tools, csound, lilypond -, wrapGAppsHook +{ lib, fetchurl, gettext, pkgconfig, texinfo, wrapGAppsHook +, buildPythonApplication, pycairo, pygobject3 +, gobject-introspection, gtk3, librsvg +, alsaUtils, timidity, mpg123, vorbis-tools, csound, lilypond }: -pythonPackages.buildPythonApplication rec { - name = "solfege-3.22.2"; +buildPythonApplication rec { + name = "solfege-3.23.4"; src = fetchurl { url = "mirror://sourceforge/solfege/${name}.tar.gz"; - sha256 = "1r4g93ka7i8jh5glii5nza0zq0wy4sw0gfzpvkcrhj9yr1h0jsp4"; + sha256 = "0sc17vf4xz6gy0s0z9ghi68yskikdmyb4gdaxx6imrm40734k8mp"; }; - nativeBuildInputs = [ gettext texinfo pkgconfig wrapGAppsHook ]; - buildInputs = [ librsvg ]; - propagatedBuildInputs = [ pythonPackages.pygtk ]; + patches = [ + ./css.patch + ./menubar.patch + ./webbrowser.patch + ]; + + nativeBuildInputs = [ gettext pkgconfig texinfo wrapGAppsHook ]; + buildInputs = [ gobject-introspection gtk3 librsvg ]; + propagatedBuildInputs = [ pycairo pygobject3 ]; preBuild = '' sed -i -e 's|wav_player=.*|wav_player=${alsaUtils}/bin/aplay|' \ @@ -30,11 +36,11 @@ pythonPackages.buildPythonApplication rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Ear training program"; - homepage = http://www.solfege.org/; + homepage = "http://www.solfege.org/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor orivej ]; }; } diff --git a/pkgs/misc/solfege/menubar.patch b/pkgs/misc/solfege/menubar.patch new file mode 100644 index 0000000000000..36d3944af61d2 --- /dev/null +++ b/pkgs/misc/solfege/menubar.patch @@ -0,0 +1,7 @@ +Fix https://savannah.gnu.org/bugs/index.php?53109 + +--- a/solfege/mainwin.py ++++ b/solfege/mainwin.py +@@ -270,1 +270,1 @@ +- hdlbox = Gtk.HandleBox() ++ hdlbox = Gtk.HBox() diff --git a/pkgs/misc/solfege/webbrowser.patch b/pkgs/misc/solfege/webbrowser.patch new file mode 100644 index 0000000000000..2c9b77d0b8eb7 --- /dev/null +++ b/pkgs/misc/solfege/webbrowser.patch @@ -0,0 +1,8 @@ +Fix startup. + +--- a/solfege/mainwin.py ++++ b/solfege/mainwin.py +@@ -27,2 +27,3 @@ import textwrap + try: ++ webbrowser.register_standard_browsers() + i = webbrowser._tryorder.index("x-www-browser") diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix index 1072bac7816a8..07e50c8379e52 100644 --- a/pkgs/misc/sound-of-sorting/default.nix +++ b/pkgs/misc/sound-of-sorting/default.nix @@ -1,28 +1,27 @@ -{ stdenv, fetchgit -, SDL2, wxGTK }: +{ stdenv, fetchFromGitHub, SDL2, wxGTK } : -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "sound-of-sorting"; - version = "unstable-2015-07-21"; + version = "2017-12-23"; - src = fetchgit { - url = "https://github.com/bingmann/sound-of-sorting.git"; - rev = "05db428c796a7006d63efdbe314f976e0aa881d6"; - sha256 = "0m2f1dym3hcar7784sjzkbf940b28r02ajhkjgyyw7715psifb8l"; - fetchSubmodules = true; + src = fetchFromGitHub { + owner = "bingmann"; + repo = "sound-of-sorting"; + rev = "5884a357af5775fb57d89eb028d4bf150760db75"; + sha256 = "01bpzn38cwn9zlydzvnfz9k7mxdnjnvgnbcpx7i4al8fha7x9lw8"; }; - buildInputs = with stdenv.lib; + buildInputs = [ wxGTK SDL2 ]; preConfigure = '' export SDL_CONFIG=${SDL2.dev}/bin/sdl2-config ''; - meta = with stdenv.lib;{ + meta = with stdenv.lib; { description = "Audibilization and Visualization of Sorting Algorithms"; - homepage = http://panthema.net/2013/sound-of-sorting/; + homepage = "http://panthema.net/2013/sound-of-sorting/"; license = with licenses; gpl3; maintainers = with maintainers; [ AndersonTorres ]; }; diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix index d0d3fbdf2d73f..17ef047ede733 100644 --- a/pkgs/misc/stabber/default.nix +++ b/pkgs/misc/stabber/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Stubbed XMPP Server"; - homepage = https://github.com/boothj5/stabber; + homepage = "https://github.com/boothj5/stabber"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ hschaeidt ]; diff --git a/pkgs/misc/talkfilters/default.nix b/pkgs/misc/talkfilters/default.nix index 8154e417e0655..a622eca7795b9 100644 --- a/pkgs/misc/talkfilters/default.nix +++ b/pkgs/misc/talkfilters/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Converts English text into text that mimics a stereotyped or humorous dialect"; - homepage = http://www.hyperrealm.com/talkfilters/talkfilters.html; + homepage = "http://www.hyperrealm.com/talkfilters/talkfilters.html"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ikervagyok ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 29dfb6558a9f9..321891892b7b8 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -1,15 +1,27 @@ -{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bc, bison, dtc, flex -, openssl, swig, meson-tools, armTrustedFirmwareAllwinner -, armTrustedFirmwareRK3328, armTrustedFirmwareRK3399 +{ stdenv +, lib +, fetchurl +, fetchpatch +, fetchFromGitHub +, bc +, bison +, dtc +, flex +, openssl +, swig +, meson-tools +, armTrustedFirmwareAllwinner +, armTrustedFirmwareRK3328 +, armTrustedFirmwareRK3399 , armTrustedFirmwareS905 , buildPackages }: let - defaultVersion = "2020.01"; + defaultVersion = "2020.04"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - sha256 = "1w9ml4jl15q6ixpdqzspxjnl7d3rgxd7f99ms1xv5c8869h3qida"; + sha256 = "0wjkasnz87q86hx93inspdjfjsinmxi87bcvj30c773x0fpjlwzy"; }; buildUBoot = { version ? null @@ -80,7 +92,7 @@ let dontStrip = true; meta = with lib; { - homepage = http://www.denx.de/wiki/U-Boot/; + homepage = "http://www.denx.de/wiki/U-Boot/"; description = "Boot loader for embedded systems"; license = licenses.gpl2; maintainers = with maintainers; [ dezgeg samueldr lopsided98 ]; diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index a0b6be3a418c1..031b65a1ef613 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An operating function"; - homepage = https://urbit.org; + homepage = "https://urbit.org"; license = licenses.mit; maintainers = with maintainers; [ mudri ]; platforms = with platforms; linux; diff --git a/pkgs/misc/vim-plugins/deprecated.json b/pkgs/misc/vim-plugins/deprecated.json index 2af94f5df3ddc..218a1ab622fd1 100644 --- a/pkgs/misc/vim-plugins/deprecated.json +++ b/pkgs/misc/vim-plugins/deprecated.json @@ -15,4 +15,4 @@ "date": "2020-03-27", "new": "YouCompleteMe" } -} +} \ No newline at end of file diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 68d2aae23ce4d..3094a3244c085 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1,6 +1,5 @@ # This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit! { lib, buildVimPluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: - let packages = ( self: { @@ -13,6 +12,7 @@ let rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885"; sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa"; }; + meta.homepage = "https://github.com/vim-scripts/a.vim/"; }; ack-vim = buildVimPluginFrom2Nix { @@ -24,6 +24,7 @@ let rev = "36e40f9ec91bdbf6f1adf408522a73a6925c3042"; sha256 = "0yppr89hd1jyp0pj56hxdjbn32sr7pj3mihd18wxispvl5dqd6fm"; }; + meta.homepage = "https://github.com/mileszs/ack.vim/"; }; acp = buildVimPluginFrom2Nix { @@ -35,39 +36,43 @@ let rev = "5c627cec37d0d3b1670cb250d84e176e8b0c644e"; sha256 = "0h7s4nvxin7m2caka7g1hhlxj1bbiwsvw8s2lqwlh7nq43v23ghg"; }; + meta.homepage = "https://github.com/eikenb/acp/"; }; agda-vim = buildVimPluginFrom2Nix { pname = "agda-vim"; - version = "2020-01-03"; + version = "2020-04-06"; src = fetchFromGitHub { owner = "derekelkins"; repo = "agda-vim"; - rev = "e5bd3f1439f95a33cb8692f1d49f570eb626c70a"; - sha256 = "0i1h1syk008xwwph5kz0jg8rn0b6l1jmdx6hlxq6nr32r5kifhni"; + rev = "3643fa185ebe3bf35cf690a4b3b90d36e36405b0"; + sha256 = "09lpg223l1s8zpsmbg1r18cnr7r3np32nsv185qgcv889mlildqn"; }; + meta.homepage = "https://github.com/derekelkins/agda-vim/"; }; alchemist-vim = buildVimPluginFrom2Nix { pname = "alchemist-vim"; - version = "2020-01-10"; + version = "2020-04-08"; src = fetchFromGitHub { owner = "slashmili"; repo = "alchemist.vim"; - rev = "a5158d2e731afe3bca25a6a76eb706ff34e155b0"; - sha256 = "0r1xiw0f46if7whxan2asi1klyijlyaf61p0xg5v81nnh64w6lhs"; + rev = "9fc2594deea196897997c31e68056b7977f13495"; + sha256 = "1mnghdw3yhqh1lzjqfrmwrvnx391dkayfzkgcpx7sx01hnvqc9ib"; }; + meta.homepage = "https://github.com/slashmili/alchemist.vim/"; }; ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-03-11"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "bbe5153fcb36dec9860ced33ae8ff0b5d76ac02a"; - sha256 = "1xvmh66lgii98z6f4lk1mjs73ysrvs55xdlcmf224k3as822jmw0"; + rev = "36e5337e30095afb10d02ef2ae362c8d6055e70d"; + sha256 = "0mcc2d0a4fiv2a1q8z778jzjj7i71v64m2zswsvpdym062b65fk3"; }; + meta.homepage = "https://github.com/dense-analysis/ale/"; }; align = buildVimPluginFrom2Nix { @@ -79,17 +84,19 @@ let rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77"; sha256 = "0acacr572kfh7jvavbw61q5pkwrpi1albgancma063rpax1pddgp"; }; + meta.homepage = "https://github.com/vim-scripts/align/"; }; ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2020-02-09"; + version = "2020-04-08"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "8da127b946b519a271a73dc6f337e97190a958c9"; - sha256 = "0df6nhc39xnxll2smxyj6fxqvkq7v2s44cs2n4zzdg80w1wswkgd"; + rev = "ad76abd6bccfa1a5195d20f7964c6393fe1a9524"; + sha256 = "098jnybc11cxv2q8396hx9r814i5793y7a9kdl4ambpbvhm86vad"; }; + meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; antonys-macro-repeater = buildVimPluginFrom2Nix { @@ -101,6 +108,7 @@ let rev = "61784d86b2654f3e261b9cc33360c5197704e266"; sha256 = "1cq5r091qbxjs9s12f7bb2fdm43gxwpnnh2l8nhj0n69jfk7gblw"; }; + meta.homepage = "https://github.com/ckarnell/antonys-macro-repeater/"; }; arcanist-vim = buildVimPluginFrom2Nix { @@ -112,6 +120,7 @@ let rev = "bd59e799e838c8d946d33142104b2db625dc15d6"; sha256 = "11v7gqa5rnv28q0i3d02g9sw22gkjn10afvjx7bg352d91knxn9m"; }; + meta.homepage = "https://github.com/solarnz/arcanist.vim/"; }; argtextobj-vim = buildVimPluginFrom2Nix { @@ -123,17 +132,19 @@ let rev = "f3fbe427f7b4ec436416a5816d714dc917dc530b"; sha256 = "1l4jh5hdmky1qj5z26jpnk49a6djjcvzyyr6pknrrgb8rzkiln48"; }; + meta.homepage = "https://github.com/vim-scripts/argtextobj.vim/"; }; ats-vim = buildVimPluginFrom2Nix { pname = "ats-vim"; - version = "2020-03-03"; + version = "2020-03-24"; src = fetchFromGitHub { owner = "vmchale"; repo = "ats-vim"; - rev = "045fa53f1e0699e980c5c7cd85ecf237ae527ff0"; - sha256 = "1rpqy40kw0cn2h02ly71syvwz5j77xfmrs4mijkn7k0dxgamhy5s"; + rev = "a17576687217a2e8066356cc211afb99b5de65e8"; + sha256 = "0dv60za39v2w5d9mbk1r263fqpv11bdfyqp39b0snw40f0kh92z0"; }; + meta.homepage = "https://github.com/vmchale/ats-vim/"; }; auto-git-diff = buildVimPluginFrom2Nix { @@ -145,6 +156,7 @@ let rev = "a14d52b7ed7e7fb69bf1de9d363f3abdd3410b3a"; sha256 = "0i0bnlxclh8pzanrxj428728mdx4wdy19fx499kiin87qr4r2hbn"; }; + meta.homepage = "https://github.com/hotwatermorning/auto-git-diff/"; }; auto-pairs = buildVimPluginFrom2Nix { @@ -156,6 +168,7 @@ let rev = "39f06b873a8449af8ff6a3eee716d3da14d63a76"; sha256 = "1hxf155cmavpxpbsxx6zk23hgl9grl6yrh165kp9bjvld9ng08ng"; }; + meta.homepage = "https://github.com/jiangmiao/auto-pairs/"; }; autoload_cscope-vim = buildVimPluginFrom2Nix { @@ -167,28 +180,31 @@ let rev = "26f428f400d96d25a9d633e6314f6e1760923db1"; sha256 = "150h6k4nd1msa21c0zxl68nwwq3qdmqi0d8h4as98rrz0b0lghn7"; }; + meta.homepage = "https://github.com/vim-scripts/autoload_cscope.vim/"; }; awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2020-03-13"; + version = "2020-03-26"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "fa05cbe493224dc132eb623025e94a5e29fdcccd"; - sha256 = "062pi6dqxg3dfbb4qw5fg9d9jh6zpbrznkg1sim2j1c8g67mlpfl"; + rev = "4ad0ce02b8efa3c6e014e224a34b67b927d31c88"; + sha256 = "0crg0gph8wmb412yvknh6ic42i3p5hd8c736rv61v52b2g0dgwxm"; }; + meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; ayu-vim = buildVimPluginFrom2Nix { pname = "ayu-vim"; - version = "2019-09-21"; + version = "2020-04-13"; src = fetchFromGitHub { owner = "ayu-theme"; repo = "ayu-vim"; - rev = "9dab20b38335ed06738f251e92e3817182063759"; - sha256 = "0m914bnrnv7gy49qzfdp1zl3a1h7zpicvh2xqdfqhp7h96psxwmx"; + rev = "a3a2d2a4ce36e0f681236b3ab15043c0b09460b1"; + sha256 = "06lhfwh8z178bgbbcz4mxjpk6zajz19x1jhaahbsqg3641y5pj0p"; }; + meta.homepage = "https://github.com/ayu-theme/ayu-vim/"; }; base16-vim = buildVimPluginFrom2Nix { @@ -200,6 +216,7 @@ let rev = "6191622d5806d4448fa2285047936bdcee57a098"; sha256 = "1qz21jizcy533mqk9wff1wqchhixkcfkysqcqs0x35wwpbri6nz8"; }; + meta.homepage = "https://github.com/chriskempson/base16-vim/"; }; bats-vim = buildVimPluginFrom2Nix { @@ -211,6 +228,7 @@ let rev = "3c283f594ff8bc7fb0c25cd07ebef0f17385f94a"; sha256 = "06f3hdf7y5gpwmc6inrhk938qmn7cr6mbk00amrnl1qjvk09givx"; }; + meta.homepage = "https://github.com/vim-scripts/bats.vim/"; }; bclose-vim = buildVimPluginFrom2Nix { @@ -222,6 +240,7 @@ let rev = "99018b4a2dd18aea1cbd3aa23565b01a0f8c5b73"; sha256 = "09a7g0nxn8cbnfz6za8q1p46kb5zbvxl80077hrjpnx4xc82xn2h"; }; + meta.homepage = "https://github.com/rbgrouleff/bclose.vim/"; }; bufexplorer = buildVimPluginFrom2Nix { @@ -233,6 +252,7 @@ let rev = "29258f58357acc10c672585a9efe8913d756734d"; sha256 = "00wjwk9yzfclrbd4p59b5wpl21s2vjs4ahn30xhpza93bk513wnq"; }; + meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; BufOnly-vim = buildVimPluginFrom2Nix { @@ -244,6 +264,7 @@ let rev = "43dd92303979bdb234a3cb2f5662847f7a3affe7"; sha256 = "1gvpaqvvxjma0dl1zai68bpv42608api4054appwkw9pgczkkcdl"; }; + meta.homepage = "https://github.com/vim-scripts/BufOnly.vim/"; }; calendar-vim = buildVimPluginFrom2Nix { @@ -255,6 +276,7 @@ let rev = "55d0495ff03260d82a5c80365cb754871ce35460"; sha256 = "0xi2g6x5lf8r36c5ld8pvz5c7n7jx3d6whwbk4gibmz6hlfrslwr"; }; + meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; camelcasemotion = buildVimPluginFrom2Nix { @@ -266,17 +288,19 @@ let rev = "de439d7c06cffd0839a29045a103fe4b44b15cdc"; sha256 = "0yfsb0d9ly8abmc95nqcmr8r8ylif80zdjppib7g1qj1wapdhc69"; }; + meta.homepage = "https://github.com/bkad/camelcasemotion/"; }; caw-vim = buildVimPluginFrom2Nix { pname = "caw-vim"; - version = "2020-01-27"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "tyru"; repo = "caw.vim"; - rev = "364e803cfae22a9ef6d7543631495ba8644f3cce"; - sha256 = "0rfy490584qrqa01p3yp7wzgqxn69vbdg37fydj43ah8i1vj3w76"; + rev = "3c6b7d2448bd32bf998ae403c9c15d06ea641b36"; + sha256 = "06ym0qhcvd9ajlj6cd4y391bgfiwclzhb3cvrbv723j8amdv1y1q"; }; + meta.homepage = "https://github.com/tyru/caw.vim/"; }; changeColorScheme-vim = buildVimPluginFrom2Nix { @@ -288,6 +312,7 @@ let rev = "b041d49f828629d72f2232531a230d1ec5de2405"; sha256 = "0pybhsg9k9252d4ifdc4gsar8lkmfzbvs6xkzqq1m6f35l9wqk09"; }; + meta.homepage = "https://github.com/vim-scripts/changeColorScheme.vim/"; }; CheckAttach = buildVimPluginFrom2Nix { @@ -299,6 +324,7 @@ let rev = "8f0b1350431d1d34655a147e6f1cfe6cb5dda5f7"; sha256 = "1z9a40nbdjd3pnp28nfsi2bijsbaiphc0ia816f5flkchn07gmmj"; }; + meta.homepage = "https://github.com/chrisbra/CheckAttach/"; }; clang_complete = buildVimPluginFrom2Nix { @@ -310,6 +336,7 @@ let rev = "0b98d7533ad967aac3fc4c1a5b0508dafa8a676f"; sha256 = "04mdhc1kbv66blkn6qn98iyj659dac4z49nmpf3anglz8dgcxjgc"; }; + meta.homepage = "https://github.com/xavierd/clang_complete/"; }; clighter8 = buildVimPluginFrom2Nix { @@ -321,28 +348,31 @@ let rev = "839993b60dc4a19a58e4c7e7db1df04d911bb181"; sha256 = "01r92idbym2p1hiqszrprrl1hrqzz2yhzv8n08m8gycd7m227cwg"; }; + meta.homepage = "https://github.com/bbchung/clighter8/"; }; coc-css = buildVimPluginFrom2Nix { pname = "coc-css"; - version = "2019-06-25"; + version = "2020-04-15"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-css"; - rev = "235009ac2a92172cdae66987b172264230c04f74"; - sha256 = "1i7bhiibcr2k5c0l79ddsfxirkhxs3cp9x83b4ys1zy2yaxljlw6"; + rev = "41fe3122753b62c4416eb5e4ca4bef1cb3d3ebd2"; + sha256 = "13xg0v2iwf8nrd1bba5nmwgav37fb8q4fqr5bsg3qxlbghpw0bbl"; }; + meta.homepage = "https://github.com/neoclide/coc-css/"; }; coc-denite = buildVimPluginFrom2Nix { pname = "coc-denite"; - version = "2019-10-13"; + version = "2020-04-17"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-denite"; - rev = "803f8a2388fcf90881c13ff17da4eec01184401d"; - sha256 = "1gxj2jdii6icgdmkhhsxshi02xbsad0697cixklf3wsqlxrj3px5"; + rev = "50a573af21a9563f331f2711f3fd7a568c33907f"; + sha256 = "06h3if5sn5sqgrq1ql1j7g5xy658mwywd7ri1hajzi8s3mb5lanq"; }; + meta.homepage = "https://github.com/neoclide/coc-denite/"; }; coc-emmet = buildVimPluginFrom2Nix { @@ -354,6 +384,7 @@ let rev = "1e65237f65b94bd5f9376023f557a26c14c9d35a"; sha256 = "16f3gdnprxw939zwdy7lzksj1qwlwfs174vk0nzf1d8yb04a7y2g"; }; + meta.homepage = "https://github.com/neoclide/coc-emmet/"; }; coc-eslint = buildVimPluginFrom2Nix { @@ -365,17 +396,31 @@ let rev = "2f9de5cf232223f886b5e9711b0e9a5260f65db9"; sha256 = "0q1sizzj6ac6gzfp4s7ka600pa9f2dhr17v14j98cdlmyp6pyfhz"; }; + meta.homepage = "https://github.com/neoclide/coc-eslint/"; + }; + + coc-fzf = buildVimPluginFrom2Nix { + pname = "coc-fzf"; + version = "2020-04-19"; + src = fetchFromGitHub { + owner = "antoinemadec"; + repo = "coc-fzf"; + rev = "82e846d193856660be716c8b89e668aead06d665"; + sha256 = "0rpxjxw51mks6jq6akw5sgl77px038gdgqa4yhpmlpidb679apg2"; + }; + meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2020-03-11"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "8a8517c44589cef8c7061e6d352f77627b5a79b4"; - sha256 = "1qg3mk43wl8shx66nydykdr1vsfx4n5lmgngndwnjjkf1csppg9q"; + rev = "623a5351c8eca639e3cffee38f941426f2df2422"; + sha256 = "1v5q9775602drj7dr1dhshd22jbz6kxmkacqhbnddjpw2drdfzv1"; }; + meta.homepage = "https://github.com/neoclide/coc-git/"; }; coc-go = buildVimPluginFrom2Nix { @@ -387,17 +432,7 @@ let rev = "587501a4445c1edb5d5e10927c5f8274f0e0ea52"; sha256 = "16cgdxn93zf0q5d80xb9c6khzgx02qvsjdaw3kf07qqsmdjvy4gj"; }; - }; - - coc-fzf = buildVimPluginFrom2Nix { - pname = "coc-fzf"; - version = "2020-03-06"; - src = fetchFromGitHub { - owner = "antoinemadec"; - repo = "coc-fzf"; - rev = "ca394b48ac9c78ce95d6cdf3807927a7b6bcfcbe"; - sha256 = "1nsqdp2zma7rlzynm58z43vk5hyrcz8kn7ak32979p4a3fvdyj5c"; - }; + meta.homepage = "https://github.com/josa42/coc-go/"; }; coc-highlight = buildVimPluginFrom2Nix { @@ -409,17 +444,19 @@ let rev = "b4e82ebd5fe855d004dd481e2ecf2fa88faed284"; sha256 = "06h64jq8cgj5hc19inidns046kkb76750179jsw7xv5zbp93ygap"; }; + meta.homepage = "https://github.com/neoclide/coc-highlight/"; }; coc-html = buildVimPluginFrom2Nix { pname = "coc-html"; - version = "2020-02-10"; + version = "2020-03-30"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-html"; - rev = "2221768187a1bb87af44715bce563bc7fc6917ab"; - sha256 = "04rial5fvyq68qj66ys33sgw7020r81jjsxsycm6y0shn8pjd33y"; + rev = "8ae5d2832761b5868f69c67f33ce26f9edb26c65"; + sha256 = "1rf9qfimnbxjr5s55pzm8npixan5cz2v17g4j34f18i9ky6yyk0b"; }; + meta.homepage = "https://github.com/neoclide/coc-html/"; }; coc-imselect = buildVimPluginFrom2Nix { @@ -431,28 +468,31 @@ let rev = "01442d2fb7d344122e59755f59782a0e1bf7d294"; sha256 = "1vqx9yna66njdw1my15ac6djr3yvnb6das96nx12mpingnw85kky"; }; + meta.homepage = "https://github.com/neoclide/coc-imselect/"; }; coc-java = buildVimPluginFrom2Nix { pname = "coc-java"; - version = "2020-02-27"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-java"; - rev = "4c5124b38f1b2a252bf4713cce67a1bb0cf04b5d"; - sha256 = "1ygr4dpbjgy3872fc9kaivgbplkyc9l9wmifxkapp9s9ll11c7l0"; + rev = "3c914c2b9e154889361d2631cd2188cf7e5fa020"; + sha256 = "0q7q2z7k2sxqgi6nyj669iq2p4h3962i8hv3gzg2mpi0p73xs98k"; }; + meta.homepage = "https://github.com/neoclide/coc-java/"; }; coc-jest = buildVimPluginFrom2Nix { pname = "coc-jest"; - version = "2019-06-17"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-jest"; - rev = "a893464148ab205ef717f543e205c0ae6cb05009"; - sha256 = "0d83cmpiq2x0v7bbnyka30pp1rl33idb6zfisahc25ycnkh32212"; + rev = "3fac1864ef1af87ee096f0ab6514a4b890363231"; + sha256 = "1z2sbzr84gh935553g6bfkpx7s4i37s200a1s9dqay9cq92jh7hy"; }; + meta.homepage = "https://github.com/neoclide/coc-jest/"; }; coc-json = buildVimPluginFrom2Nix { @@ -464,39 +504,43 @@ let rev = "33ca64c00ee5c0d759a6f537b23971476b85f8e3"; sha256 = "07mblxxvl95kfy0wwm5r75j6y3v8fvyh6cwiza5rg1z9dlw1xddw"; }; + meta.homepage = "https://github.com/neoclide/coc-json/"; }; coc-lists = buildVimPluginFrom2Nix { pname = "coc-lists"; - version = "2020-03-03"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "21761f5e9a48baf3dbb6540ff180f6071c1ed8c6"; - sha256 = "101n3cmhvm4hxznk5w4n7lbk552cwsyf28axa1d5rr838r3zg5wi"; + rev = "f68a09974d8bd9a4474bfc7845c2e628919bb619"; + sha256 = "1fcz7m1pbf69gnys9j777w77pxwsiwi1jdlcnb61c57xdrdcqr5d"; }; + meta.homepage = "https://github.com/neoclide/coc-lists/"; }; coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-03-20"; + version = "2020-04-22"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "a4a82cd0ea5fb71399ca02c03456e9862a54eec8"; - sha256 = "1cj05rzzwacf0c2gk0zhb5ln6pywyc35p2walna80ncpyniyk6k2"; + rev = "b35bb16122d8771c9936f1203d0c712d45017f13"; + sha256 = "1w9vgxai421j3qbzbm42hq3fyzwf2a9n89y10vj9vhir0q0j8az0"; }; + meta.homepage = "https://github.com/ckipp01/coc-metals/"; }; coc-neco = buildVimPluginFrom2Nix { pname = "coc-neco"; - version = "2020-01-11"; + version = "2020-04-07"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-neco"; - rev = "e203327ff80c56fc51d85f73df9049455edf1a56"; - sha256 = "1snfb92pahdfkch0cwhd0pcmia35al518351np2hq8dhbs7fc02n"; + rev = "fe130c2c3b883f8b58f70f15bf36c73923faa3d9"; + sha256 = "1yzh3p1xx6k6rnr9skdvy5lsb7hz4kh2y537ill8a7770y936vn8"; }; + meta.homepage = "https://github.com/neoclide/coc-neco/"; }; coc-pairs = buildVimPluginFrom2Nix { @@ -508,28 +552,31 @@ let rev = "79deeaabdc4f091c22f3dd67d439a0a336e8aa7e"; sha256 = "1w6p2dk7yj8ldxg1qxh9zpn9ypm6gn66gi0vbax33wf5c0dmp0v9"; }; + meta.homepage = "https://github.com/neoclide/coc-pairs/"; }; coc-prettier = buildVimPluginFrom2Nix { pname = "coc-prettier"; - version = "2019-11-29"; + version = "2020-04-13"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-prettier"; - rev = "f2c5959b0e8a5658017c9dcb57f03d86c3a7c484"; - sha256 = "1c2vvjvji5wkmxlm5mi5q4px2x9fslkqsw4vii3kjc7cz2w4fnhk"; + rev = "771bb16700e8123d7a114ff9c02a8c3ba1641108"; + sha256 = "09srgkg1sqdh01ix767ssi4mp4p76g9am4pg8fzqdj3pdjyr2yk2"; }; + meta.homepage = "https://github.com/neoclide/coc-prettier/"; }; coc-python = buildVimPluginFrom2Nix { pname = "coc-python"; - version = "2020-02-21"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-python"; - rev = "6a5104d18ae5ebf7d9b84af7c4a34c6ced62aee8"; - sha256 = "0l8zrb2bhv1apx2vp8gswqh7v64dxfd8124cggxfkkzdqyxr10w0"; + rev = "968aec39f74c6f80e6c9c3c0fed51b6113a1a35a"; + sha256 = "135z48idr8r7604ymiqdsml9z6d3swaja89697znszigpy05nz11"; }; + meta.homepage = "https://github.com/neoclide/coc-python/"; }; coc-r-lsp = buildVimPluginFrom2Nix { @@ -541,16 +588,29 @@ let rev = "a1b97e36c601975a8d730b6965f25592b1ecd1e7"; sha256 = "04g1kbgm8p0asrsibmg4w6wj8i2xzwc70g7rkcs2bj3pakbkvws6"; }; + meta.homepage = "https://github.com/neoclide/coc-r-lsp/"; }; coc-rls = buildVimPluginFrom2Nix { pname = "coc-rls"; - version = "2019-12-07"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-rls"; - rev = "c899418e8fae4a8c3eb15fee48513ae050b11d60"; - sha256 = "0sipvs8r8i239l2334k4qnhwpaijwd524q598rp4ma34ry42c2xl"; + rev = "142353e2f71cb6c1b235db0cf430ca53e211613b"; + sha256 = "07gkspvh5l25vyny5waiw0y3fm5a8qbrml13r7llgp4lqzzh96bd"; + }; + meta.homepage = "https://github.com/neoclide/coc-rls/"; + }; + + coc-rust-analyzer = buildVimPluginFrom2Nix { + pname = "coc-rust-analyzer"; + version = "2020-04-24"; + src = fetchFromGitHub { + owner = "fannheyward"; + repo = "coc-rust-analyzer"; + rev = "1dcdf6768520bff29921c50ef904478cbdfe0fb8"; + sha256 = "1p6hyixx9bjpyy42g2w4bnxwv9hafs5ppsx1fq8gndnq3nsjcyl3"; }; }; @@ -563,17 +623,19 @@ let rev = "d40714eab8e5fe26fac492ffd30e98cd1bfbdec5"; sha256 = "0kfrq5hk8zn24cl7fiy48nyvd30a2dva93c61079axkdg9912yd7"; }; + meta.homepage = "https://github.com/neoclide/coc-smartf/"; }; coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2020-03-17"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "881de16a72440c2db7ecc0a68ae0d32a2e5e6864"; - sha256 = "12dwr6r30b78rhj2b19x2l48ri7qzvl2ggr9x6189fhbz4h25rs5"; + rev = "cad80795d4abcbbd2aa6da462af1087e9134b4eb"; + sha256 = "04wk7x148dcw3rx4fh3c7c80qillq0bf9vfdkc9l8xaglk0xh73h"; }; + meta.homepage = "https://github.com/neoclide/coc-snippets/"; }; coc-solargraph = buildVimPluginFrom2Nix { @@ -585,6 +647,7 @@ let rev = "231447aae26a0e88aa6d9e207a7354c4ca37d564"; sha256 = "0amcx519r9j8jr6ckglywsjlyph3m5jq4qvbfwyir8ihxhxa4b0d"; }; + meta.homepage = "https://github.com/neoclide/coc-solargraph/"; }; coc-spell-checker = buildVimPluginFrom2Nix { @@ -596,6 +659,7 @@ let rev = "4a8195f5f22d9d7b42998b7e3b846aa2aef7de52"; sha256 = "1w8b9icwdam8ljprc8avs5pwdiwmx3j1jxsg03d1lvis9w5xm0cd"; }; + meta.homepage = "https://github.com/iamcco/coc-spell-checker/"; }; coc-stylelint = buildVimPluginFrom2Nix { @@ -607,6 +671,7 @@ let rev = "288a372261cbc23ae4a6e26b1621c6e3218d00ad"; sha256 = "1qir8diqnv1a78lzw9p3jsbni52gdg38rx1lj5i4iyff9282ir2x"; }; + meta.homepage = "https://github.com/neoclide/coc-stylelint/"; }; coc-tabnine = buildVimPluginFrom2Nix { @@ -618,6 +683,7 @@ let rev = "442c829185ecab2268d1b9fd076c5286bbd39562"; sha256 = "0as4b33nnp7anqbxkkja8lp37y4a74b3507zyk3gmmna0my1ca3r"; }; + meta.homepage = "https://github.com/neoclide/coc-tabnine/"; }; coc-tslint = buildVimPluginFrom2Nix { @@ -629,6 +695,7 @@ let rev = "6128761577806d7047fa05d1a527945490d6316c"; sha256 = "1vi4vrawknkd5wjyb0j143jbfis9vaanl219a7argirwjs057vpd"; }; + meta.homepage = "https://github.com/neoclide/coc-tslint/"; }; coc-tslint-plugin = buildVimPluginFrom2Nix { @@ -640,39 +707,43 @@ let rev = "acc1356253a5088f630d9910b5fc13dc5d108bbc"; sha256 = "1cjgimqgd70x5zhw641z6g4hc54vrkg3r4sscg092gkrdpkq3969"; }; + meta.homepage = "https://github.com/neoclide/coc-tslint-plugin/"; }; coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2020-03-21"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "54bea1ec1ab44802a155f876a4d1cc2c44b2bc42"; - sha256 = "0npjc7c3x9mdqc6asav1f2wwv4p6lb5hk7c1p9b7m3vjg21w0k22"; + rev = "1f46ed360e0cae124add5ff9c4a0718fccb66acb"; + sha256 = "1fccyar9qmydj1ii7ixiwcnfrpsvk0q0xz3q4vr3mz34lmcj74rw"; }; + meta.homepage = "https://github.com/neoclide/coc-tsserver/"; }; coc-vetur = buildVimPluginFrom2Nix { pname = "coc-vetur"; - version = "2020-03-17"; + version = "2020-03-27"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-vetur"; - rev = "8072352a371261a922f30a89a6b5c6b07123da84"; - sha256 = "1nb33ndl0pzxw30ibs6p4qaa781cni93ffgypcc69wg4b2r4341a"; + rev = "314df846b6bc2be9b7c808ed949a1fd693bba402"; + sha256 = "14fmyrfmyk66wbfnbb2iwy7azjk10d8gyrv5p950aagmv8shif52"; }; + meta.homepage = "https://github.com/neoclide/coc-vetur/"; }; coc-vimtex = buildVimPluginFrom2Nix { pname = "coc-vimtex"; - version = "2019-06-20"; + version = "2020-03-27"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-vimtex"; - rev = "842b37bb4078863ca5f070731e21effad14f5d58"; - sha256 = "07w1rp6jxn7q99p6gb28azgial71frjpx06ciz49yib8816rzim9"; + rev = "0a4f8ee29afc4e1dcfdc8846f116a1db32fa9867"; + sha256 = "0z9kxm40kr8a5sa06vkg7xaai2n54y21xfkrsx774zzdkcrrkizk"; }; + meta.homepage = "https://github.com/neoclide/coc-vimtex/"; }; coc-wxml = buildVimPluginFrom2Nix { @@ -684,6 +755,7 @@ let rev = "f02550939d33a0175c34186904c376bbae878e60"; sha256 = "1448019dzdy55j4plhzlnp2qkfzk0zkqqs7kn94ndn60hn1x889m"; }; + meta.homepage = "https://github.com/neoclide/coc-wxml/"; }; coc-yaml = buildVimPluginFrom2Nix { @@ -695,6 +767,7 @@ let rev = "338192a2434b96b139fb8c07d260da00b3100997"; sha256 = "020jpsm9ss2v3x1g43m920w2yamv8khl7mg7wm4sx6qsl3rlfq4g"; }; + meta.homepage = "https://github.com/neoclide/coc-yaml/"; }; coc-yank = buildVimPluginFrom2Nix { @@ -706,6 +779,19 @@ let rev = "6cb8bc7f2d41b9fb75c797c5805444badeff3dd9"; sha256 = "0s28684531ihczg5nf2m3f8z1vx9fw4yllfq7jz8g7ifw922ddxb"; }; + meta.homepage = "https://github.com/neoclide/coc-yank/"; + }; + + coc-nvim = buildVimPluginFrom2Nix { + pname = "coc-nvim"; + version = "2020-04-23"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc.nvim"; + rev = "0d4f02555e5aaecbd8efef47a70ba2f2c6412d1f"; + sha256 = "0129gr3hsagr1lzngvbgs4bnvj92izxavval0zyxgh68w3vlak42"; + }; + meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; colorizer = buildVimPluginFrom2Nix { @@ -717,6 +803,7 @@ let rev = "afc1491e5b9c36305ce710bdad2b48f069141183"; sha256 = "1dpiv9z8h6196acncyjhzd1qa56y17468fpxbfzrx5q2266sajc7"; }; + meta.homepage = "https://github.com/lilydjwg/colorizer/"; }; Colour-Sampler-Pack = buildVimPluginFrom2Nix { @@ -728,6 +815,7 @@ let rev = "05cded87b2ef29aaa9e930230bb88e23abff4441"; sha256 = "03v2r18sfgs0xbgy9p56pxfdg0lsk6m7wyr5hw63wm1nzpwiipg3"; }; + meta.homepage = "https://github.com/vim-scripts/Colour-Sampler-Pack/"; }; command-t = buildVimPluginFrom2Nix { @@ -740,6 +828,7 @@ let sha256 = "0iim0lhib6fiainyb48ibl2qzgv8cmn9yinmd1k6i2y5y26wlhfy"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/wincent/command-t/"; }; committia-vim = buildVimPluginFrom2Nix { @@ -751,6 +840,7 @@ let rev = "d367190c7ffe95f4ac5d30b2e9da4cd9898579b9"; sha256 = "1yqsdy1mxc775qcrcl1yi930m2q6364mgjdj06vwnph1rg98w0ql"; }; + meta.homepage = "https://github.com/rhysd/committia.vim/"; }; concealedyank-vim = buildVimPluginFrom2Nix { @@ -762,6 +852,7 @@ let rev = "e7e65a395e0e6a266f3a808bc07441aa7d03ebbd"; sha256 = "0z7i8dmwfjh6mcrmgrxv3j86ic867617fas9mv4gqsrhhvrrkzsb"; }; + meta.homepage = "https://github.com/chikatoike/concealedyank.vim/"; }; context_filetype-vim = buildVimPluginFrom2Nix { @@ -773,6 +864,7 @@ let rev = "f200fe69939089da9e61bd9a3ff75b4ef7adc708"; sha256 = "06pclan83yww5qf26fmqhby8iks0rzlxgpk254vxmkihbypvpa51"; }; + meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; cosco-vim = buildVimPluginFrom2Nix { @@ -784,6 +876,7 @@ let rev = "5752622192d9b27b3a5a274a5455613b56df6386"; sha256 = "01byd7j4gl7zb1bh61p839ka04x2sm0rgwvbb126az7dr6gpclyf"; }; + meta.homepage = "https://github.com/lfilho/cosco.vim/"; }; cpsm = buildVimPluginFrom2Nix { @@ -795,6 +888,7 @@ let rev = "900023c56dfdd200841d5c2f2f7000f332d2614f"; sha256 = "1p1ry11f39fcz32i3b3p0p8n99qrnvrx4d7p0123123dj7wbxk3p"; }; + meta.homepage = "https://github.com/nixprime/cpsm/"; }; csapprox = buildVimPluginFrom2Nix { @@ -806,17 +900,19 @@ let rev = "7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd"; sha256 = "08g4x6nnd6hkgm2daa5ihhz75pcdx3jzzv8rfjls80qajlhx5rf6"; }; + meta.homepage = "https://github.com/godlygeek/csapprox/"; }; csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2020-03-10"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "e7fb581122df54fe9770cc5e565bef450e7d2478"; - sha256 = "1h15n1pdci34idks218r4kpwna1zb25hk8prsqzvjkj8mc6ch67y"; + rev = "22e07247161c72adc029497b77d1b5d91b6b184b"; + sha256 = "1p6zsqgbs9qr7dznq8nls8n405jjd0bsyzjrns9h8jxk6sf7n56j"; }; + meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; ctrlp-cmatcher = buildVimPluginFrom2Nix { @@ -828,6 +924,7 @@ let rev = "6c36334f106b6fd981d23e724e9a618734cab43a"; sha256 = "1573kd6xf3n8sxlz2j4zadai4rnc7k3s9c54648yfzickwn57d8q"; }; + meta.homepage = "https://github.com/JazzCore/ctrlp-cmatcher/"; }; ctrlp-py-matcher = buildVimPluginFrom2Nix { @@ -839,6 +936,7 @@ let rev = "cf63fd546f1e80dd4db3db96afbeaad301d21f13"; sha256 = "0hs829x3vxv12y78hz5g4a5qpw05xf42dk0hxxk3ind77mnl1ir1"; }; + meta.homepage = "https://github.com/FelikZ/ctrlp-py-matcher/"; }; ctrlp-z = buildVimPluginFrom2Nix { @@ -850,6 +948,7 @@ let rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026"; sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl"; }; + meta.homepage = "https://github.com/amiorin/ctrlp-z/"; }; ctrlp-vim = buildVimPluginFrom2Nix { @@ -861,17 +960,19 @@ let rev = "585143acbe15f362852d78bd050baff3c12902d7"; sha256 = "0ijkzlb08sc47cax4f328hlk68nscx5wdzhihpj106vrnfyrpyx3"; }; + meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2020-03-07"; + version = "2020-03-31"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "c16efc107e8bccd927f71bc2815d48f3bf94f1b8"; - sha256 = "133yivm5wp4m7sx62mcjr0vy7br6gcrh0k25nszy3vpdnnyc1mh6"; + rev = "4375ab9cc1fe0077c36a9aba5dd7145ce4a2fa6f"; + sha256 = "03cl55s4f2qa8hwag2w38gfc7mpp6jhy0vx7qsmkn24cqk1jvv2k"; }; + meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; defx-git = buildVimPluginFrom2Nix { @@ -883,6 +984,7 @@ let rev = "b5d0b842064ddb7a7af0e790f4648cb1909ed43f"; sha256 = "0i8vi6zhnv088qc3f3wa5h4b17xnpvmr603srhg44zx2clcjblnr"; }; + meta.homepage = "https://github.com/kristijanhusak/defx-git/"; }; defx-icons = buildVimPluginFrom2Nix { @@ -894,17 +996,19 @@ let rev = "2e4df3b6302da537ac7df28fbc0e0991c6c1aa0e"; sha256 = "0wkn02z75pvfl0xrhgq80sw0qfidjg5s0zm5mij632pq3dm7axiq"; }; + meta.homepage = "https://github.com/kristijanhusak/defx-icons/"; }; defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-02-27"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "f962b9908f48f823b817b7fd61ce9d706bbb41fd"; - sha256 = "1sv2g6sx9ap71937ky8iysck9q32mracmanc0vnyvffvqy7jwksf"; + rev = "1fb1d5f9b09ff6da815dfcdf3dfcb277605b9650"; + sha256 = "0vih85hb4igy200lml7gvaiifkgydjqqjlh7ymcvg3sx5l6psapy"; }; + meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; delimitMate = buildVimPluginFrom2Nix { @@ -916,6 +1020,7 @@ let rev = "728b57a6564c1d2bdfb9b9e0f2f8c5ba3d7e0c5c"; sha256 = "0fskm9gz81dk8arcidrm71mv72a7isng1clssqkqn5wnygbiimsn"; }; + meta.homepage = "https://github.com/Raimondi/delimitMate/"; }; denite-extra = buildVimPluginFrom2Nix { @@ -927,6 +1032,7 @@ let rev = "af18257544027ce89269dba70c12aba1f5b9e23c"; sha256 = "0bmq9yhylfd3v6bfwvakw3pbsz5kk8wlmmql0yllqayp6410w25a"; }; + meta.homepage = "https://github.com/neoclide/denite-extra/"; }; denite-git = buildVimPluginFrom2Nix { @@ -938,28 +1044,31 @@ let rev = "88b5323a6fc0ace197eed5205215d80f3b613f91"; sha256 = "0b687i64hr8hll7pv7r1xz906b46cl2q62zm18ipikhkpva6iv13"; }; + meta.homepage = "https://github.com/neoclide/denite-git/"; }; denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-03-21"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "c3206a06508a197650ee4e1d85da39ff24e3a56b"; - sha256 = "1yy6j5zpja8jr1j8sghwc1l0fkb47r8cvv36ckf75x9x5gpylb5m"; + rev = "609c85797a5f6acc2e2357cf56e7f6c78c561145"; + sha256 = "0rx0nvsyzj1wl7p30g769cidspkq3xpvzpdhz94qfsczdm68yhi0"; }; + meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2020-03-08"; + version = "2020-04-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "cb0e2fdb75a2d37e75972933c25dd2781d8e6ebb"; - sha256 = "13miw4z14fj11afs8x5yxcbpn4an8vhvx8k3rl3xrvn1hq5jhwqx"; + rev = "d438a6f550910a5688481ff0251771ac7dd09245"; + sha256 = "0p6kvl1pgf5d5rnag297dhjzzplmawvmi2j1r2m6p0732ls4qxrw"; }; + meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; deoplete-clang = buildVimPluginFrom2Nix { @@ -972,6 +1081,7 @@ let sha256 = "1wvk61f8ph2vpl6llzmir3qs3zwaw3lrphs16d1j7ljkdl3bk49k"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/deoplete-plugins/deoplete-clang/"; }; deoplete-dictionary = buildVimPluginFrom2Nix { @@ -983,6 +1093,7 @@ let rev = "e0879df5dce25b96d6a2a6f52a1a5e41d12b5992"; sha256 = "05p707b15fzhf0laqy3q0hi34vxpljy86cd5qvpjzx5h0ry32p09"; }; + meta.homepage = "https://github.com/deoplete-plugins/deoplete-dictionary/"; }; deoplete-emoji = buildVimPluginFrom2Nix { @@ -994,17 +1105,19 @@ let rev = "1dfa2da6ae3ee146ddfbfdba48cf45f0c1d57d7d"; sha256 = "0drqbdmy8igq6rv7s2qlxsp391pydcynlr9gkaadzrg7pk4nlgsb"; }; + meta.homepage = "https://github.com/fszymanski/deoplete-emoji/"; }; deoplete-fish = buildVimPluginFrom2Nix { pname = "deoplete-fish"; - version = "2020-01-02"; + version = "2020-04-04"; src = fetchFromGitHub { owner = "ponko2"; repo = "deoplete-fish"; - rev = "4d27bfeff0269ae66e88645613a2b18ffae7a969"; - sha256 = "1l84dywfvgxclhicwdkdcqr0hicmish44c456g7vcdfqq97qvzp1"; + rev = "c4cfb934bb6ec69d7f1aff9d376b7d436bba5c93"; + sha256 = "19a6j4qsqljz1pmrn4fx8v1bhlfpqdq821fc2ibjd9h98f6dzi5p"; }; + meta.homepage = "https://github.com/ponko2/deoplete-fish/"; }; deoplete-github = buildVimPluginFrom2Nix { @@ -1016,6 +1129,7 @@ let rev = "8e30256e50b3914a7e57ea4d5976b6a499fb936f"; sha256 = "11n15nqi417sdcqgb6gkk6z4wrrdd8vdbd7wzqpg41140c73v5gm"; }; + meta.homepage = "https://github.com/SevereOverfl0w/deoplete-github/"; }; deoplete-go = buildVimPluginFrom2Nix { @@ -1028,6 +1142,7 @@ let sha256 = "0zmx98kz6pxfpakizr8xm1nrv1rjr0frz19pkik29mk6aj2b2l08"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/deoplete-plugins/deoplete-go/"; }; deoplete-greek = buildVimPluginFrom2Nix { @@ -1039,18 +1154,20 @@ let rev = "aecf3b2f8acfab20c93a6dc88d55260a0df04cbf"; sha256 = "086qjbqps05zb2vnyb5q7a67i7al8mxxi86n0h5nsqdd0ws6qqhx"; }; + meta.homepage = "https://github.com/Inazuma110/deoplete-greek/"; }; deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2020-03-10"; + version = "2020-04-13"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-jedi"; - rev = "29187f9d71ea415afa71e9e416ffcf32619aa65f"; - sha256 = "1xlgfngaahbnwk6bfnmzv63jdz70w0lvqzpa5zbsyb5p52p4a58i"; + rev = "42f4c24a951b0fb5e76a70e5234f16193a8a746d"; + sha256 = "1incjz7xsh4cfxw06ff07830ywn0p99b1zmml8pkapbnh3x2bjgc"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/deoplete-plugins/deoplete-jedi/"; }; deoplete-julia = buildVimPluginFrom2Nix { @@ -1062,6 +1179,7 @@ let rev = "d60b976910685c99ca773c974e91c44eeda03a19"; sha256 = "0x5cc9g1g1w9myr6p1ahb9gpn2abpbggjdk2bc903f62pkrapvjf"; }; + meta.homepage = "https://github.com/JuliaEditorSupport/deoplete-julia/"; }; deoplete-khard = buildVimPluginFrom2Nix { @@ -1073,6 +1191,7 @@ let rev = "27221723a3bb8e480ff8cbe7f4be9ff38c076bf7"; sha256 = "0g7sysm5lb8fpgagfg4565fz4rn16djdc4m2213ryq1s3crx40gw"; }; + meta.homepage = "https://github.com/nicoe/deoplete-khard/"; }; deoplete-lsp = buildVimPluginFrom2Nix { @@ -1084,6 +1203,7 @@ let rev = "6aa2bfd73a181fa6b55021264c4a8a83237ce558"; sha256 = "1bcvfbv046fk34vnc1ly8civ3sibqlzli8vm2548dfxc55wcwsys"; }; + meta.homepage = "https://github.com/Shougo/deoplete-lsp/"; }; deoplete-notmuch = buildVimPluginFrom2Nix { @@ -1095,6 +1215,7 @@ let rev = "828b5acf1924f9869614e93855a0d8cc94f1a74d"; sha256 = "1l2pfazhpkz26zwbjdafvhgvjj533kncm7dywlandsf3cibm8mv9"; }; + meta.homepage = "https://github.com/Valodim/deoplete-notmuch/"; }; deoplete-phpactor = buildVimPluginFrom2Nix { @@ -1106,6 +1227,7 @@ let rev = "53e239effb8ff20fc0a192206e96d98d4f9001ad"; sha256 = "14097r9fmyp9zxfgv0fj2s52qd1v5cxdckfg4zph7lg3yri1hx9p"; }; + meta.homepage = "https://github.com/kristijanhusak/deoplete-phpactor/"; }; deoplete-rust = buildVimPluginFrom2Nix { @@ -1117,17 +1239,19 @@ let rev = "0a86e502113910c33448b337c4d50cabea120d25"; sha256 = "0wsck83jns40ny3740vwjhc8g5bh6zl71hkirbjxy6n4xgixa54h"; }; + meta.homepage = "https://github.com/sebastianmarkow/deoplete-rust/"; }; deoplete-tabnine = buildVimPluginFrom2Nix { pname = "deoplete-tabnine"; - version = "2019-10-16"; + version = "2020-03-29"; src = fetchFromGitHub { owner = "tbodt"; repo = "deoplete-tabnine"; - rev = "a05c97b966b78a9d5cb97b9c2d7e1ec2d6962160"; - sha256 = "1ni16151rknkq66967bwy82xs4pr9xgl5zb7dv447lhl8m3f096g"; + rev = "eef0e2340e19aea05fe5759b7da3b13cadd375c4"; + sha256 = "0q10zcjhjgak3w365pagd4ym5mmj3yd1lfsxv0d4wr4lp9a51sd7"; }; + meta.homepage = "https://github.com/tbodt/deoplete-tabnine/"; }; deoplete-ternjs = buildVimPluginFrom2Nix { @@ -1139,6 +1263,7 @@ let rev = "5405e84a44fc4ab5234c9a253ad4aa2b161e5897"; sha256 = "0684f9ci0y4wihf04z9r8x55cir02al4wp911dz0zg678z8w0yha"; }; + meta.homepage = "https://github.com/carlitux/deoplete-ternjs/"; }; deoplete-zsh = buildVimPluginFrom2Nix { @@ -1150,17 +1275,19 @@ let rev = "92b7afc3804dd17a849b207e184359558ab8f444"; sha256 = "0zsbkl82kny1vmfv06iz576xsclbik0xr7ndzpb0ddhw5nfnicfx"; }; + meta.homepage = "https://github.com/deoplete-plugins/deoplete-zsh/"; }; deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-03-21"; + version = "2020-04-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "1439c621dc94016c504e1732ce8270081a42768f"; - sha256 = "1c8qx839zmf52cfazlbbnlhxw6cvnsr3ds0rclawgycbl4s1qy8f"; + rev = "bbec852adee45a1500fa817a3c17889dc328cad0"; + sha256 = "159ki94lb3n1kkmnd4cbmyc96xbpni45p7fgsml8x314j6iiihgk"; }; + meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; dhall-vim = buildVimPluginFrom2Nix { @@ -1172,6 +1299,7 @@ let rev = "607958520f8bd4308fe52937e211f6db4ad84cf3"; sha256 = "0rnkmfrzsm4hg6ln8g8qj9ff8z2sk7cnf4gqrswychqhhkg1f817"; }; + meta.homepage = "https://github.com/vmchale/dhall-vim/"; }; direnv-vim = buildVimPluginFrom2Nix { @@ -1183,6 +1311,7 @@ let rev = "5e75084465ad37dd0a4d4b1198b5ffa8978ae4e1"; sha256 = "0vabsv98vwdjns3dliplg7x8ssyrin44af9jl248kdzkqw5fx445"; }; + meta.homepage = "https://github.com/direnv/direnv.vim/"; }; DoxygenToolkit-vim = buildVimPluginFrom2Nix { @@ -1194,29 +1323,32 @@ let rev = "afd8663d36d2ec19d26befdb10e89e912d26bbd3"; sha256 = "1za8li02j4nhqjjsyxg4p78638h5af4izim37zc0p1x55zr3i85r"; }; + meta.homepage = "https://github.com/vim-scripts/DoxygenToolkit.vim/"; }; echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2020-03-06"; + version = "2020-04-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "cd9beff92b52990d991a0b6a0f4d20aa600e570c"; - sha256 = "14z9di1x0zbq1d4vvpn8pvnp3fscdv7iqyymaiavw096nvj3d1cc"; + rev = "31533d9c6c2723dfb4cf5691c83f330a3a0ccddd"; + sha256 = "1ygm4g90zv009iqv8k8n4930a7gpij5jxbz7dqq2dfyj4jn37rkf"; }; + meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2020-03-15"; + version = "2020-04-07"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "c5804257c6b38c5537b71ac91ed051c70eaeb5e5"; - sha256 = "147cqfwzaxwc1fzvynwdvx1cvx6zziamcayrvacqxs7vzjnz8lx7"; + rev = "8aff78a03357bf573abcec407a543762f281b7d3"; + sha256 = "015sfz2j0mfnfpm6zf8jnh0lm8943cpccjlbj7ks1dsvs36m056i"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; }; elm-vim = buildVimPluginFrom2Nix { @@ -1228,6 +1360,7 @@ let rev = "165107a9fd2b20c8f050fc4f977b4e41c790b1e7"; sha256 = "0gf7b49by0ybx3ndz7sz5dwcfnps4sz6wsr02lyarj8f8116ysy5"; }; + meta.homepage = "https://github.com/elmcast/elm-vim/"; }; emmet-vim = buildVimPluginFrom2Nix { @@ -1240,6 +1373,7 @@ let sha256 = "0wjxx648lp11nqzgrdcbqikjs85knpvk594b9l25hadhd5awgahv"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/mattn/emmet-vim/"; }; emodeline = buildVimPluginFrom2Nix { @@ -1251,6 +1385,7 @@ let rev = "19550795743876c2256021530209d83592f5924a"; sha256 = "0x9y7rzbk6g8cq6jkn37wi95wzhq0abban6w10652v4kdmjrxrr0"; }; + meta.homepage = "https://github.com/vim-scripts/emodeline/"; }; ensime-vim = buildVimPluginFrom2Nix { @@ -1262,17 +1397,19 @@ let rev = "caa734e84f002b25446c615706283a74edd4ecfe"; sha256 = "190qq8r2zs7xzmsag7ygk6dvpav3cnzlc40lc3fvwmkfwgci5zg0"; }; + meta.homepage = "https://github.com/ensime/ensime-vim/"; }; falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2020-03-02"; + version = "2020-04-16"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "b7ef5d0e1b15ce007ecf6adb94270c0d3468d90e"; - sha256 = "1dcf6ic74r1lg0a3zqhfp1wk2f7j8nsykfvrk2d0j7waj2xsni4v"; + rev = "da3468536410eb1ea59a0dd3054edf28d4577d8c"; + sha256 = "1cvw3n8ysxnm3w0rvk1rks815ha5grca1p3c7bkas6klrplfhlsc"; }; + meta.homepage = "https://github.com/fenetikm/falcon/"; }; far-vim = buildVimPluginFrom2Nix { @@ -1284,17 +1421,19 @@ let rev = "2a8a9c22237d224f2c24680901b61b6f9bffb061"; sha256 = "0hk2p10cx36dz6vf22v4hx3shkkhqhkmxp6s1l517kkchh98m4bg"; }; + meta.homepage = "https://github.com/brooth/far.vim/"; }; fastfold = buildVimPluginFrom2Nix { pname = "fastfold"; - version = "2020-02-02"; + version = "2020-03-23"; src = fetchFromGitHub { owner = "konfekt"; repo = "fastfold"; - rev = "4bc15cb4db274ed2b10bbdde414d2b2ab1f7cb00"; - sha256 = "1y4yfw15g1l7f1v3kynr7ynga8g30rvwmy80dnfpg7v4a5jaf4f1"; + rev = "5872cbe9d921eb3ec79dce14a1f492f44c1cbaaf"; + sha256 = "07mls0yczg2cmia2jn0s2rvgwl07yxlm4hyvjd941p1knvn88x8q"; }; + meta.homepage = "https://github.com/konfekt/fastfold/"; }; ferret = buildVimPluginFrom2Nix { @@ -1306,6 +1445,7 @@ let rev = "24633d3047eb93013743b28b0ea735783c7850d9"; sha256 = "06c3x3fqks30rzkj7z28qsgx9fcghz86ajc0cx3aai69xhgdipb5"; }; + meta.homepage = "https://github.com/wincent/ferret/"; }; file-line = buildVimPluginFrom2Nix { @@ -1317,6 +1457,7 @@ let rev = "559088afaf10124ea663ee0f4f73b1de48fb1632"; sha256 = "1w183g0hj8jvzm6m1jw7m6xz3x1dld8n8342vnycsh6hyzdcg3mg"; }; + meta.homepage = "https://github.com/bogado/file-line/"; }; flake8-vim = buildVimPluginFrom2Nix { @@ -1329,17 +1470,19 @@ let sha256 = "14rv0p1vx4njlplkc72gz7r8sy9vc6n8x9l00zc777x5zzrhgz3g"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/andviro/flake8-vim/"; }; float-preview-nvim = buildVimPluginFrom2Nix { pname = "float-preview-nvim"; - version = "2020-02-29"; + version = "2020-04-19"; src = fetchFromGitHub { owner = "ncm2"; repo = "float-preview.nvim"; - rev = "cbc23a28e8ea92d7c8dc22e727a62d42ef65086a"; - sha256 = "1qv05qv89sbh1cafl2597lj95yv8yxpxm3sxbbclrls1962f7hgy"; + rev = "3c2e230a3fe34b3a5fb74519797c29daa5a6a69a"; + sha256 = "1i5wj1hqimzrw3bwsf76w8l8yp654pdn8f61kp0v98xdgkab007d"; }; + meta.homepage = "https://github.com/ncm2/float-preview.nvim/"; }; floobits-neovim = buildVimPluginFrom2Nix { @@ -1351,6 +1494,7 @@ let rev = "29ab2ed4bd5c879df0bd6df313a776155eb98ad8"; sha256 = "0bnncn3waw9birpd51j27hrzlriz8dk4naxdajmbwznwcnbkkgwx"; }; + meta.homepage = "https://github.com/floobits/floobits-neovim/"; }; forms = buildVimPluginFrom2Nix { @@ -1362,6 +1506,7 @@ let rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75"; sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74"; }; + meta.homepage = "https://github.com/megaannum/forms/"; }; fugitive-gitlab-vim = buildVimPluginFrom2Nix { @@ -1373,17 +1518,19 @@ let rev = "f3e56ff60fe3fb5ebc891cbe5fd12cd8c59ae6ef"; sha256 = "0cx3zd7f09prxjfrj201139j00wsw66fx5crw6dhblf4z6mfpgnx"; }; + meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-03-17"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "d4d36b412bdc53e8bdaf0e2714a2227f51781d68"; - sha256 = "0wbq8ckgzw867qqwjzm48jnbgp7yjl1vim7nsyk1wjm2d8z0xjm9"; + rev = "f86ef1bce602713fe0b5b68f4bdca8c6943ecb59"; + sha256 = "0h3mlc4lvnlzg7pfrr09vrfn93lglzfp5ca6bl4jhsi63xw7x3ad"; }; + meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; gen_tags-vim = buildVimPluginFrom2Nix { @@ -1395,6 +1542,7 @@ let rev = "208cd0490547bc8f7615eea1b26e4635d2e60a96"; sha256 = "00s1kxi1bsvz06z7x78kls0k6ncnbqdyz14fvdxxq82f6s1kdvdw"; }; + meta.homepage = "https://github.com/jsfaint/gen_tags.vim/"; }; gentoo-syntax = buildVimPluginFrom2Nix { @@ -1406,17 +1554,19 @@ let rev = "42163237b57c56de9a24fe6549e46c805fab2bb3"; sha256 = "1bg3ismjlp99drsfyrkjb137ypxmp0qpy8pp9ry9i8ljmnffbgal"; }; + meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2020-03-20"; + version = "2020-04-13"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "63b7813cac0e67cba1ace94b42ef1af291e35e47"; - sha256 = "1p4blbngaxdlacmrqiyxw8y4d0jiws104np68d31mfnvqghylcdy"; + rev = "bcbb1c9182fc1940d5e55bb716dc7621ab7c36bc"; + sha256 = "1my9khiq1ssqkp0nixrzly0xlyla6bzdl3x9ky6687848cpriaz0"; }; + meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; ghcmod-vim = buildVimPluginFrom2Nix { @@ -1428,6 +1578,7 @@ let rev = "1d192d13d68ab59f9f46497a0909bf24a7b7dfff"; sha256 = "0bzahgzagnf0a9zv86jhdf8nc3p0yfz9izv5n3lc8gc12cp47d0a"; }; + meta.homepage = "https://github.com/eagletmt/ghcmod-vim/"; }; gitignore-vim = buildVimPluginFrom2Nix { @@ -1439,6 +1590,7 @@ let rev = "3ad6a15768945fd4fc1b013cec5d8c8e62c7bb87"; sha256 = "0fg36hrkwqb3accqm7ihw1cjs64fxf73zk06gickdkzq0zn4yl8x"; }; + meta.homepage = "https://github.com/vim-scripts/gitignore.vim/"; }; gitv = buildVimPluginFrom2Nix { @@ -1450,6 +1602,7 @@ let rev = "a73599c34202709eaa7da78f4fe32b97c6ef83f8"; sha256 = "0hhamv2q3z8cy4n9yzxq0jvs2x8qx4wx6c2qpsk82jsnghmzipd6"; }; + meta.homepage = "https://github.com/gregsexton/gitv/"; }; goyo-vim = buildVimPluginFrom2Nix { @@ -1461,6 +1614,7 @@ let rev = "6b6ed2734084fdbb6315357ddcaecf9c8e6f143d"; sha256 = "1ywlz1hn54kxyp5q0angriaarimq7ys7m6sk6l4x8jr1g2yh0afz"; }; + meta.homepage = "https://github.com/junegunn/goyo.vim/"; }; gruvbox = buildVimPluginFrom2Nix { @@ -1472,6 +1626,7 @@ let rev = "040138616bec342d5ea94d4db296f8ddca17007a"; sha256 = "0qk2mqs04qlxkc1ldgjbiv1yisi2xl2b8svmjz0hdp9y2l5vfccw"; }; + meta.homepage = "https://github.com/morhetz/gruvbox/"; }; gruvbox-community = buildVimPluginFrom2Nix { @@ -1483,6 +1638,7 @@ let rev = "f5711c15480b83378bde13306fa997057c0c81cd"; sha256 = "0vx289a7av31dxm58c6kmfdnsrwnq1rzj5rwci2pqjdac8ds2qm0"; }; + meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; gundo-vim = buildVimPluginFrom2Nix { @@ -1494,6 +1650,7 @@ let rev = "99e6240340d9ba07b66c544daf44fa7caffbf7e7"; sha256 = "0py35mmwnfl581isnbh33j3bjgghq17jnamdi1bg3akwyn1jyhqb"; }; + meta.homepage = "https://github.com/sjl/gundo.vim/"; }; gv-vim = buildVimPluginFrom2Nix { @@ -1505,6 +1662,7 @@ let rev = "72dc64df998355b41a75ebfa32adfd08ed5c5819"; sha256 = "01g4rnsh2n691n9a6gqhyzivr4mzlgz3i2mwb7vxpkp61yf755bb"; }; + meta.homepage = "https://github.com/junegunn/gv.vim/"; }; haskell-vim = buildVimPluginFrom2Nix { @@ -1516,6 +1674,7 @@ let rev = "b1ac46807835423c4a4dd063df6d5b613d89c731"; sha256 = "1vqj3r2v8skffywwgv4093ww7fm540437j5qz7n8q8787bs5w0br"; }; + meta.homepage = "https://github.com/neovimhaskell/haskell-vim/"; }; hasksyn = buildVimPluginFrom2Nix { @@ -1527,6 +1686,7 @@ let rev = "c434040bf13a17ca20a551223021b3ace7e453b9"; sha256 = "09998lnfcshqis5m062wlag6y476imq9jday9gp4ayjjl1cp3cwx"; }; + meta.homepage = "https://github.com/travitch/hasksyn/"; }; hlint-refactor-vim = buildVimPluginFrom2Nix { @@ -1538,17 +1698,19 @@ let rev = "fffb044ecef854a82c5c2efda252e09044ba03e0"; sha256 = "0z8d31arfy9aidg1dwj5msnnx799d9r7njkgh51z695w6ayxn6p8"; }; + meta.homepage = "https://github.com/mpickering/hlint-refactor-vim/"; }; iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg-vim"; - version = "2020-03-06"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "1740235846c92666fe521e550a27fa47ebe5f5a3"; - sha256 = "13zf899kgwjhrksznz2212ywml7nnqwq2dyam39nzywf8msg8va6"; + rev = "acf6696e14fd8cfa2ed338076a7c3a68fad42486"; + sha256 = "1hy9n37nkkax6qdcg23a522bz26r8b23w9kj570qml9v3ck4ihqm"; }; + meta.homepage = "https://github.com/cocopon/iceberg.vim/"; }; idris-vim = buildVimPluginFrom2Nix { @@ -1560,6 +1722,7 @@ let rev = "091ed6b267749927777423160eeab520109dd9c1"; sha256 = "1zibar2vxcmai0k37ricwnimfdv1adxfbbvz871rc4l6h3q85if1"; }; + meta.homepage = "https://github.com/idris-hackers/idris-vim/"; }; Improved-AnsiEsc = buildVimPluginFrom2Nix { @@ -1571,6 +1734,7 @@ let rev = "e1c59a8e9203fab6b9150721f30548916da73351"; sha256 = "1smjs4kz2kmzprzp9az4957675nakb43146hshbby39j5xz4jsbz"; }; + meta.homepage = "https://github.com/vim-scripts/Improved-AnsiEsc/"; }; increment-activator = buildVimPluginFrom2Nix { @@ -1582,6 +1746,7 @@ let rev = "bff5516da9103fb093ffc0dc993b8d535eacbceb"; sha256 = "1swlv1mrck9s3n7fdg10c2nmlasf2fx8yfk01x3vii7l4aaa9w2y"; }; + meta.homepage = "https://github.com/nishigori/increment-activator/"; }; incsearch-easymotion-vim = buildVimPluginFrom2Nix { @@ -1593,6 +1758,7 @@ let rev = "fcdd3aee6f4c0eef1a515727199ece8d6c6041b5"; sha256 = "1bscr3xs1zggm9qzk1mb88fkc8qj6yrnkxmqwwyr75sf1xzy74mk"; }; + meta.homepage = "https://github.com/haya14busa/incsearch-easymotion.vim/"; }; incsearch-vim = buildVimPluginFrom2Nix { @@ -1604,6 +1770,7 @@ let rev = "25e2547fb0566460f5999024f7a0de7b3775201f"; sha256 = "05v0d9b5sm4d1bvhb01jk6s7brlli2xc16hvzr6gik1nm1ks6ai1"; }; + meta.homepage = "https://github.com/haya14busa/incsearch.vim/"; }; indentLine = buildVimPluginFrom2Nix { @@ -1615,6 +1782,7 @@ let rev = "15aceda8c4eea621b66faa8673fca0b9fbe2f457"; sha256 = "1icb1h811lp86hg4w8y8mmmsfm4c80n7m8r1wi58lnm60mjasas4"; }; + meta.homepage = "https://github.com/Yggdroot/indentLine/"; }; intero-neovim = buildVimPluginFrom2Nix { @@ -1626,6 +1794,7 @@ let rev = "4ce2d154379f8c95b3819512a9b67ead5204ffd0"; sha256 = "1na61qb31z80973jfi7ziw2zv6y73rm0bpfb6iqxjppmg4iqgl3i"; }; + meta.homepage = "https://github.com/parsonsmatt/intero-neovim/"; }; iosvkem = buildVimPluginFrom2Nix { @@ -1637,6 +1806,7 @@ let rev = "08e36b649c83eece7edbd2e04e42e077aebc78eb"; sha256 = "0jawl7fs6wl3ny9vsmzqv5pnkv5nn6wj1nx7hzgdl41183958pni"; }; + meta.homepage = "https://github.com/neutaaaaan/iosvkem/"; }; ir_black = buildVimPluginFrom2Nix { @@ -1648,6 +1818,7 @@ let rev = "4e45f1cbcc9c04cf32c8681c6b3b4534a33610ed"; sha256 = "13g9nqlqsjsxnrq37y33ldh41dw9q9dw07spfi7qwrskiwa0ayk7"; }; + meta.homepage = "https://github.com/twerth/ir_black/"; }; jdaddy-vim = buildVimPluginFrom2Nix { @@ -1659,6 +1830,7 @@ let rev = "3e44c2e6d22e2d6fc94863379b5b4f5424537321"; sha256 = "1ch12bffrs3gqqzdj9vh0i2azhc5d06i5vwds4rqcx797lqh7pzb"; }; + meta.homepage = "https://github.com/vim-scripts/jdaddy.vim/"; }; jedi-vim = buildVimPluginFrom2Nix { @@ -1671,6 +1843,7 @@ let sha256 = "0yj1bsfn43crmfn0ylyzyz41z0vmvapl5cgm7k1rnbj96i7vifx7"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/davidhalter/jedi-vim/"; }; jellybeans-vim = buildVimPluginFrom2Nix { @@ -1682,6 +1855,7 @@ let rev = "ef83bf4dc8b3eacffc97bf5c96ab2581b415c9fa"; sha256 = "1zy3gjz5bna3l5a7k2ddqa0w7x8wbndy2vc9gmqfdsxdbhrgpvaz"; }; + meta.homepage = "https://github.com/nanotech/jellybeans.vim/"; }; Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { @@ -1693,6 +1867,7 @@ let rev = "164b457d87b65c6ca9e5998b69c6cd24248f62ac"; sha256 = "14s26hlsdqys7br84l9wiyvhcy17s6966mhgr9n6sdqmhz6lc4nm"; }; + meta.homepage = "https://github.com/martinda/Jenkinsfile-vim-syntax/"; }; jq-vim = buildVimPluginFrom2Nix { @@ -1704,17 +1879,19 @@ let rev = "6e056fa297ce58d45500b0937b8214400e9a50fa"; sha256 = "0dfsym34xiza9221bdsr51jykcxmz8bnkzi846bqxxjxiw0p3yk1"; }; + meta.homepage = "https://github.com/vito-c/jq.vim/"; }; julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2020-03-11"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "8ea33c2e5c3dd5cc82b2a86a9f7c97b8219aeb9c"; - sha256 = "0i7n5fs0a717il71yny8dsrvyyskj9cahg1wnx8nrkyn3x06myhh"; + rev = "c97e5cfb6ef20b725f859af694bec9c6a3a44145"; + sha256 = "1349v5lhc4dg7ir42jj157jyf29bm7pj73h64n2501ddqdkb1zqd"; }; + meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; kotlin-vim = buildVimPluginFrom2Nix { @@ -1726,6 +1903,7 @@ let rev = "b9fa728701a0aa0b9a2ffe92f10880348fc27a8f"; sha256 = "1yqzxabhpc4jbdlzhsysp0vi1ayqg0vnpysvx4ynd9961q2fk3sz"; }; + meta.homepage = "https://github.com/udalov/kotlin-vim/"; }; lalrpop-vim = buildVimPluginFrom2Nix { @@ -1737,6 +1915,7 @@ let rev = "7073eec8efdeff37cacd4bca378c28dad02c3c14"; sha256 = "1xx6hlgrdbnk3d6rsn4jzbaqwankvnnmj4iilakaazddfaa0l6rr"; }; + meta.homepage = "https://github.com/qnighy/lalrpop.vim/"; }; LanguageClient-neovim = buildVimPluginFrom2Nix { @@ -1748,6 +1927,7 @@ let rev = "dd45e31449511152f2127fe862d955237caa130f"; sha256 = "1i1c98r9fg1mzyl15b3grk6v7s7frwadh86rr1ggz7aq1gwfy7dq"; }; + meta.homepage = "https://github.com/autozimu/LanguageClient-neovim/"; }; last256 = buildVimPluginFrom2Nix { @@ -1759,6 +1939,7 @@ let rev = "d29320c1fe715b47edaa1be068201ea5a54ab0c0"; sha256 = "16njh0p1j166dnf92110vlrj7gmrbsfkbkd8k6s9gfqjzbgd25jv"; }; + meta.homepage = "https://github.com/sk1418/last256/"; }; latex-box = buildVimPluginFrom2Nix { @@ -1770,6 +1951,7 @@ let rev = "3c2901e12cb78bfb2be58ba4c62a488612550fe1"; sha256 = "1z4mdy47cpwcdhvy8mr72vhlybxn1y59yd3ixf6ids1bzpkrd7zl"; }; + meta.homepage = "https://github.com/latex-box-team/latex-box/"; }; lean-vim = buildVimPluginFrom2Nix { @@ -1781,6 +1963,7 @@ let rev = "2ace010eb32603a65af7921954a0594a02523c6b"; sha256 = "0wq2lw4xx2qhz1xii9g7i6wz0y43b2icqrm6ypr9jmaac1rhiq7c"; }; + meta.homepage = "https://github.com/leanprover/lean.vim/"; }; lessspace-vim = buildVimPluginFrom2Nix { @@ -1792,6 +1975,7 @@ let rev = "dc05cf6c3b67e3f8c87da2e565c5524872526316"; sha256 = "154x6i2ncmcbc3snkzdcggq5m5zvlbjyry5lvr6n4qcvf65z5z44"; }; + meta.homepage = "https://github.com/thirtythreeforty/lessspace.vim/"; }; lexima-vim = buildVimPluginFrom2Nix { @@ -1803,17 +1987,19 @@ let rev = "aa32e972b69230625989daa09ee5fd74a2d877ef"; sha256 = "15cc09vb0yrasz76qkcqxhj95y1m6yrsx3wsn6khx39kp1bas0jd"; }; + meta.homepage = "https://github.com/cohama/lexima.vim/"; }; lf-vim = buildVimPluginFrom2Nix { pname = "lf-vim"; - version = "2019-10-11"; + version = "2020-04-13"; src = fetchFromGitHub { owner = "ptzz"; repo = "lf.vim"; - rev = "8ffbae128b8887283b2d4b3a660e5be0de58ea0c"; - sha256 = "0gzj9h31f4synjqfv8dhqihr6fgi3ar06xqjjl5fb4269p9964lb"; + rev = "505b5b6350671e978f8e7392e9b0dadbd98752a7"; + sha256 = "18g4hpdkhj747r7ga153nk8qc5rbnxx1avx1n2h1xsj5m75fdhjx"; }; + meta.homepage = "https://github.com/ptzz/lf.vim/"; }; lh-brackets = buildVimPluginFrom2Nix { @@ -1825,6 +2011,7 @@ let rev = "dc91bb1e8ef45a0810d9c1ad412863977c8c4baf"; sha256 = "1yjmykn92i54cajr5wrj7m0wvaigy106c3hm8ks30xn4zm970x03"; }; + meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; lh-vim-lib = buildVimPluginFrom2Nix { @@ -1836,6 +2023,7 @@ let rev = "3a8383f2efbd7496c17a70bf4593773f6149435f"; sha256 = "0c6gnksyjyvsxqbp13q8bp9j4cg9x9m0kzrkx01p9k6wq297kpd9"; }; + meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; lightline-ale = buildVimPluginFrom2Nix { @@ -1847,6 +2035,7 @@ let rev = "a1931d473d6600ccf7e426158b79c9df29463dda"; sha256 = "1zmwi4b8sbl3zpzp8hlz7j3gg4p9628s0174pcd2n6mdkfh235g5"; }; + meta.homepage = "https://github.com/maximbaz/lightline-ale/"; }; lightline-bufferline = buildVimPluginFrom2Nix { @@ -1858,17 +2047,19 @@ let rev = "17683bc5802de7f295f2583a15461e2bc662f98b"; sha256 = "1rlamxwk2gm9pyxl9vym9w6rhgimzqa2hjghy3qdqwvif6w8ir6l"; }; + meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-03-16"; + version = "2020-04-06"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "893bd90787abfec52a2543074e444fc6a9e0cf78"; - sha256 = "0cgzkyhpr1p184yc9b3m259i5mnwdyj5zg80idywvv2gh8phw2y7"; + rev = "b8976d2e549b417e5d1c1594fb9034b749976cc0"; + sha256 = "1w86bg63qvigdva1g8w4lba63ghlsxfbjb0rqsxyxg6w7m9k6lhd"; }; + meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; limelight-vim = buildVimPluginFrom2Nix { @@ -1880,6 +2071,7 @@ let rev = "26e913a2e061195245bc62d24009ab67143a3c32"; sha256 = "0bxmihv9i96k6pl37pzgri03vbvjwlp34rl4gkj8w2ajhhi6nsnn"; }; + meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; lushtags = buildVimPluginFrom2Nix { @@ -1891,6 +2083,7 @@ let rev = "fd7fa5a0162d9aa159559880d5ba4731e180eeaf"; sha256 = "03saw1w5pybj6yywzi8hinciv18znimm7k0h34k4pqp5gi1jfaql"; }; + meta.homepage = "https://github.com/mkasa/lushtags/"; }; matchit-zip = buildVimPluginFrom2Nix { @@ -1902,6 +2095,7 @@ let rev = "ced6c409c9beeb0b4142d21906606bd194411d1d"; sha256 = "1s9c4lnsmbfm97bp22jrmcp5lga5ihx23lzqqncvv7rcizkvr3dm"; }; + meta.homepage = "https://github.com/vim-scripts/matchit.zip/"; }; mattn-calendar-vim = buildVimPluginFrom2Nix { @@ -1913,6 +2107,7 @@ let rev = "de499b9525490b10edbd28fb8f0c4e81c6a6f20c"; sha256 = "0xvvkq9zckmv9pnzvxg71fblly8lksfi736brbcwcvnszqif4b69"; }; + meta.homepage = "https://github.com/mattn/calendar-vim/"; }; mayansmoke = buildVimPluginFrom2Nix { @@ -1924,6 +2119,7 @@ let rev = "168883af7aec05f139af251f47eadd5dfb802c9d"; sha256 = "1xxcky7i6sx7f1q8xka4gd2xg78w6sqjvqrdwgrdzv93fhf82rpd"; }; + meta.homepage = "https://github.com/vim-scripts/mayansmoke/"; }; molokai = buildVimPluginFrom2Nix { @@ -1935,6 +2131,7 @@ let rev = "c67bdfcdb31415aa0ade7f8c003261700a885476"; sha256 = "1piszjr5kyw43ac1f0jh9z88g824xknshrkchbys9qxlz7pd831s"; }; + meta.homepage = "https://github.com/tomasr/molokai/"; }; ncm2 = buildVimPluginFrom2Nix { @@ -1946,6 +2143,7 @@ let rev = "6596df4631ee1ee17351a78f382d4efd0b82c05e"; sha256 = "16276cjviij92ypqj9148828k4dhiywam0dz07v3rikknak11cra"; }; + meta.homepage = "https://github.com/ncm2/ncm2/"; }; ncm2-bufword = buildVimPluginFrom2Nix { @@ -1957,6 +2155,7 @@ let rev = "1d42750114e47a31286268880affcd66c6ae48d5"; sha256 = "14q76n5c70wvi48wm1alyckba71rp5300i35091ga197nkgphyaz"; }; + meta.homepage = "https://github.com/ncm2/ncm2-bufword/"; }; ncm2-jedi = buildVimPluginFrom2Nix { @@ -1968,6 +2167,7 @@ let rev = "b28bf6d054051cc1c7a6b148323d3adb9baa4ed5"; sha256 = "07pq8akzvlb8hzksgxx1c50j09ia0xnszq1f83x75kqsjg5f6nhy"; }; + meta.homepage = "https://github.com/ncm2/ncm2-jedi/"; }; ncm2-path = buildVimPluginFrom2Nix { @@ -1979,6 +2179,7 @@ let rev = "84b1e6b5f28ced2245ff08e6694101f029fdfca8"; sha256 = "0yqga8d423k2j6iknkyx1qs1shddpshi4sx78992sa15dax9d394"; }; + meta.homepage = "https://github.com/ncm2/ncm2-path/"; }; ncm2-tmux = buildVimPluginFrom2Nix { @@ -1990,6 +2191,7 @@ let rev = "17fa16ac1211af3d8e671f1591939d6f37bdd3bd"; sha256 = "1g99vbrdz06i36gpa95crwixj61my7c9miy7mbpfbiy4zykf2wl2"; }; + meta.homepage = "https://github.com/ncm2/ncm2-tmux/"; }; ncm2-ultisnips = buildVimPluginFrom2Nix { @@ -2001,6 +2203,7 @@ let rev = "a7462f3b7036dce045a472d8ec9d8fb9fb090212"; sha256 = "0f3qp33s5nh9nha9cgxggcmh7c1a5yrwvyyrszlh0x8nrzm1v1ma"; }; + meta.homepage = "https://github.com/ncm2/ncm2-ultisnips/"; }; neco-ghc = buildVimPluginFrom2Nix { @@ -2012,6 +2215,7 @@ let rev = "682869aca5dd0bde71a09ba952acb59c543adf7d"; sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h"; }; + meta.homepage = "https://github.com/eagletmt/neco-ghc/"; }; neco-look = buildVimPluginFrom2Nix { @@ -2023,6 +2227,7 @@ let rev = "4d7f1fd7e406c302fba2a1358017c5a76d0f9fc1"; sha256 = "1brvzg15ni5j60wncpvxhs5k36wz83lhvfcnvja2l9yrngcgh6vr"; }; + meta.homepage = "https://github.com/ujihisa/neco-look/"; }; neco-syntax = buildVimPluginFrom2Nix { @@ -2034,17 +2239,19 @@ let rev = "6c3862ac82d2c917fa8b4126832de7d3a909f1fe"; sha256 = "1kmzlz6c5bs7f4dxgrdn4azwh55k6ghhyzy8jjdgj0wsb309y92k"; }; + meta.homepage = "https://github.com/Shougo/neco-syntax/"; }; neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2019-11-18"; + version = "2020-04-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "5be295ef60f0e3234164ef822a7471389a7035c5"; - sha256 = "1y73hyb82vs3wcbv02k9n4krvmyn1yhp1mh88jslhcniql2nnj2a"; + rev = "4fbc3f5f3a2b2d5299c388e2f1ffef04fcaf87ba"; + sha256 = "0lk5p2aihalcarsjnvn1yidgv0xqp1bk29wywsbp8ni964s0si39"; }; + meta.homepage = "https://github.com/Shougo/neco-vim/"; }; neocomplete-vim = buildVimPluginFrom2Nix { @@ -2056,6 +2263,7 @@ let rev = "0f83788cb67e0743a3a9c8d3a3a6e52a01bdc6c2"; sha256 = "1ydnb576qbdbij7ipciw0m46wbj45gj7xirpmqxazgp9y6b13isf"; }; + meta.homepage = "https://github.com/Shougo/neocomplete.vim/"; }; neodark-vim = buildVimPluginFrom2Nix { @@ -2067,17 +2275,19 @@ let rev = "44919aa0bebfa60e93e653fdd2a81d1c75c2e721"; sha256 = "1wz9ygfdg59jwi19l9njcxknf77azlx5nkf5q0ghk6zyv1mqwvc1"; }; + meta.homepage = "https://github.com/KeitaNakamura/neodark.vim/"; }; neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-03-20"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "d02b169e70bd6d2b2365bf6cda721967616a30bf"; - sha256 = "1cya26wfqc7l7dqy854m4kwrq3w66knmn2cgviqh9cnsjzhwxs0d"; + rev = "7af08e5a80c095a836d3f6762b991c6f9c4f2f2f"; + sha256 = "17llh2jh2igkbjmnbii54g4x9g57y6xflh8d40wim980pb3jr57s"; }; + meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neoinclude-vim = buildVimPluginFrom2Nix { @@ -2089,17 +2299,19 @@ let rev = "5125e73de0a8b4f2c399e4896e21be1b8f7b3d39"; sha256 = "0qw63xyvrxvdzx01k5nnsv3p8zmnd77cwbkk24pikqrscxw3ypsz"; }; + meta.homepage = "https://github.com/Shougo/neoinclude.vim/"; }; neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2020-03-08"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "1fe306e5feeb9423fd5c78b8623e38998bb149ae"; - sha256 = "1bixsgdraf3kzn8h3fv4a4jw58kd5r09binhjsx8622sla3j3pzy"; + rev = "d10e53956161176c7f8a1ef2899880d5384f47b0"; + sha256 = "0zv27bln0n687s0xm19nrk16i58hmxdhy26jmjh335zji0ydx27v"; }; + meta.homepage = "https://github.com/neomake/neomake/"; }; neomru-vim = buildVimPluginFrom2Nix { @@ -2111,28 +2323,31 @@ let rev = "d9b92f73f7d9158e803d72f2baeb7da9ea30040e"; sha256 = "04fic8s4g19kgml1pb5fd6yzhsscq8yrpwbmg8sb0lqjas2qpakv"; }; + meta.homepage = "https://github.com/Shougo/neomru.vim/"; }; neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2020-02-24"; + version = "2020-03-25"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "aed6074642363d0c97da5cd86e1b23027479df84"; - sha256 = "1smfyghn7sxdqx867145xyjranvrjaa8s9fp1wvyzb3s3jfwh3mk"; + rev = "2e72985f712f0d5cb707beba151555a1f0003630"; + sha256 = "1lvm37q9zq4a077f2zm9dfp8zfg5d3853bmlih6sc8d6i477kcmb"; }; + meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2020-03-07"; + version = "2020-04-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "8870feb5ab31e1acf8d80a3619f4ce47abf51a54"; - sha256 = "1q7sb4adpxkzdzyx7rlmkqzi612nsjkcs489m16j2jc20wsc2d9a"; + rev = "3aaf5e763410f57916227da407fd90726e19a612"; + sha256 = "0zkw2q2s7756p4xgf49v4lj8lrzw35x81h1wzia7d9k92d7ivwca"; }; + meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; NeoSolarized = buildVimPluginFrom2Nix { @@ -2144,17 +2359,19 @@ let rev = "70609c44215c8d2c43ad8c631296caae08a9c8d4"; sha256 = "0bxrm2vm3z1y37sm6m2hdn72g2sw31dx1xhmjvd0ng72cnp84d9k"; }; + meta.homepage = "https://github.com/icymind/NeoSolarized/"; }; neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-03-16"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "ee8bba435bed2ecadafb97ff00c2b7b07eedc1b4"; - sha256 = "190k2b0nzkkpakkfwbhmnh5q0b9vj882lvvnzw6dyiq5w5z59pxb"; + rev = "48900bd6a008120aeb33e3807f1d2c18985ad210"; + sha256 = "1x788nrrxaa12cqsdi2gdx2haxji3v4rahpxjq309kd5s40m9z2j"; }; + meta.homepage = "https://github.com/kassio/neoterm/"; }; neovim-fuzzy = buildVimPluginFrom2Nix { @@ -2166,6 +2383,7 @@ let rev = "53383395befafce802c902c21b54847074454491"; sha256 = "064qi6zv2hrzn91pvr31b9zj2q0k9vbkk5csdhw5y52q26p1gakq"; }; + meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/"; }; neovim-sensible = buildVimPluginFrom2Nix { @@ -2177,6 +2395,7 @@ let rev = "e7ab7544f15e59de2d9a1b42f58e590938e496e7"; sha256 = "06whnfvmzfdsx9gvkd2nxhx29939gjzibr2xadh54sj8ns646w58"; }; + meta.homepage = "https://github.com/jeffkreeftmeijer/neovim-sensible/"; }; neoyank-vim = buildVimPluginFrom2Nix { @@ -2188,6 +2407,7 @@ let rev = "1829c6e426f829edea46660d0db08d4488010fcd"; sha256 = "1y6fvxqpj3rwf1fmjib177lqzh3z7syp7bccn79g1j8177m515w6"; }; + meta.homepage = "https://github.com/Shougo/neoyank.vim/"; }; nerdcommenter = buildVimPluginFrom2Nix { @@ -2199,17 +2419,19 @@ let rev = "c62e618a1ab5a50a4028e3296500ba29d9b033d8"; sha256 = "0w4bxj423dxxkcxnfmipf8x5jfm058rq4g3m98wzcz5zbambv3qs"; }; + meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2020-02-20"; + version = "2020-04-15"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "e67324fdea7a192c7ce1b4c6b3c3b9f82f11eee7"; - sha256 = "0y7hd69k0i21cqgs11n80ljv6cl0gfcjjwa0dvdywpd8mmn1ad4k"; + rev = "29a321d061032df5b2ec347b6b4b778f665305a6"; + sha256 = "08gfmpikxz6j9hymf64fbxd1630x3gvkq72d2dmdfr9an2xxh6zm"; }; + meta.homepage = "https://github.com/preservim/nerdtree/"; }; nerdtree-git-plugin = buildVimPluginFrom2Nix { @@ -2221,6 +2443,7 @@ let rev = "95e20577cd442ad6256aff9bb2e9c80db05c13f0"; sha256 = "15i66mxvygs6xa2jvk7bqdagxx1lcvynmyb9g75whgbv7is80qn7"; }; + meta.homepage = "https://github.com/albfan/nerdtree-git-plugin/"; }; nim-vim = buildVimPluginFrom2Nix { @@ -2232,6 +2455,7 @@ let rev = "88f5e708a739fb26be6364ab2fabadf9fffb8d7b"; sha256 = "0ja8qx9c5g7k4phllvk3vz6s62iwpwsn40w6c32sybjs98jkrw7y"; }; + meta.homepage = "https://github.com/zah/nim.vim/"; }; nord-vim = buildVimPluginFrom2Nix { @@ -2243,17 +2467,19 @@ let rev = "f06189a4c054fe8c22e46aca4d451e03456f2283"; sha256 = "0gk4zq0gz3nnwfkldswg9bjpk0gf6d6mgfzcgvj0pnlbja6ass81"; }; + meta.homepage = "https://github.com/arcticicestudio/nord-vim/"; }; NrrwRgn = buildVimPluginFrom2Nix { pname = "NrrwRgn"; - version = "2019-12-12"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "chrisbra"; repo = "NrrwRgn"; - rev = "8a2930141ada6719aae6c53bf4e4a8dfc3f8dbed"; - sha256 = "0mns43i7jj0kragylfhpawbkd9wwky8fbyvwx33406193ymyn3y3"; + rev = "a558325a2d0cca810520ed2b62e0c0e543e97bf6"; + sha256 = "1ngwyga0pslkw1d5qwz98zz8axfwc0mvxig5yp59gra9awgk6nw8"; }; + meta.homepage = "https://github.com/chrisbra/NrrwRgn/"; }; nvim-cm-racer = buildVimPluginFrom2Nix { @@ -2265,6 +2491,7 @@ let rev = "2a8a4a49fa58c5dac9e0bed9511f6928930cacd2"; sha256 = "1yljxwypgn91084yyicbc2qprn31ld7s4drvnddzczyhzq5m2gpx"; }; + meta.homepage = "https://github.com/roxma/nvim-cm-racer/"; }; nvim-completion-manager = buildVimPluginFrom2Nix { @@ -2276,6 +2503,7 @@ let rev = "45a026afb8b309b3b80f2c1b5910f72a54a9b563"; sha256 = "0znwgry4ill0nxm096hc8s9vf20rf9xcq3dz8y8h7xlqzzsycl7a"; }; + meta.homepage = "https://github.com/roxma/nvim-completion-manager/"; }; nvim-gdb = buildVimPluginFrom2Nix { @@ -2287,6 +2515,7 @@ let rev = "9ea1cd2cd110a8efa40dc893036596b39f979a7a"; sha256 = "10qcs59r27fkzk0pg90gywbrz7y7b4hvavbws5kx6fjx3h2mbfsh"; }; + meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-hs-vim = buildVimPluginFrom2Nix { @@ -2298,17 +2527,19 @@ let rev = "5bc177a87c9575c4995df90a098d330fe6e02f75"; sha256 = "14jgvkvakpy36md5si2a3rf2w869snb65inriq68xbk32bg5pg8q"; }; + meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/"; }; nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-03-21"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "4fe58ec4e1fa3500c7ef98464174bf6c4cb8ce67"; - sha256 = "1xyqbr0f2pgvbbk0cpg92pswavff910hy8rjkm05grhqw43vkzcg"; + rev = "d1507239df1d9f2758f1ad75634046c4d024cfd8"; + sha256 = "00smhjk73xwzmxqjwqi1srmfbirl065gii65gj1lhfi6vha7h9k1"; }; + meta.homepage = "https://github.com/neovim/nvim-lsp/"; }; nvim-terminal-lua = buildVimPluginFrom2Nix { @@ -2320,17 +2551,19 @@ let rev = "095f98aaa7265628a72cd2706350c091544b5602"; sha256 = "09hass19v3wrqgxjcr3b59w462lp2nw533zwb1nnmiz99gx1znpx"; }; + meta.homepage = "https://github.com/norcalli/nvim-terminal.lua/"; }; nvim-yarp = buildVimPluginFrom2Nix { pname = "nvim-yarp"; - version = "2019-11-25"; + version = "2020-04-08"; src = fetchFromGitHub { owner = "roxma"; repo = "nvim-yarp"; - rev = "83c6f4e61aa73e2a53796ea6690fb7e5e64db50a"; - sha256 = "0yswx77gwxsac4aw2hkx0krjz4jh7pj5bgpvshynj5dlp34ip0m0"; + rev = "b710bf4daccb603a423754794fb446e5fbb59576"; + sha256 = "16ma42niwsc066s991idfbwvm0dvwqwdr2zfkc3av10hyimxnzbb"; }; + meta.homepage = "https://github.com/roxma/nvim-yarp/"; }; nvimdev-nvim = buildVimPluginFrom2Nix { @@ -2342,6 +2575,7 @@ let rev = "994ff5daf571ad02cc96436002411b4fb235c91f"; sha256 = "07dx6qkxqpakl1hrqwhfjgdzcnl4j3j9qih0l20qn8p6askj3b2j"; }; + meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; onehalf = buildVimPluginFrom2Nix { @@ -2353,6 +2587,7 @@ let rev = "fdcbffe3175c29bb78d19dcaf9b2a456482fcf1e"; sha256 = "0zbmh3cf2lnn3mcqbz4s992v6kaddq9nj4xb1wxvgyqp7kjkpwql"; }; + meta.homepage = "https://github.com/sonph/onehalf/"; }; open-browser-github-vim = buildVimPluginFrom2Nix { @@ -2364,6 +2599,7 @@ let rev = "db483ae17f02a8561e85b2071b90359a9a3bd18d"; sha256 = "09x9lfyi9gfhy4m1vp6z1kxpvi31rr8dnlqhh6fgskkziiqch3jw"; }; + meta.homepage = "https://github.com/tyru/open-browser-github.vim/"; }; open-browser-vim = buildVimPluginFrom2Nix { @@ -2375,6 +2611,7 @@ let rev = "57b894d0aa5f800220d25fdeeccf28d8a7f6ac89"; sha256 = "0q87hna0irl431kmd4knblzkahrmw3mrnvw1cq19indfky85516v"; }; + meta.homepage = "https://github.com/tyru/open-browser.vim/"; }; palenight-vim = buildVimPluginFrom2Nix { @@ -2386,6 +2623,7 @@ let rev = "f332f9efe73227a47c18bade892ac55682641733"; sha256 = "0nd2hqvxnjnbsp17x666nwyy0s9j9b6igyfhl44p7lkci6560gwp"; }; + meta.homepage = "https://github.com/drewtempelmeyer/palenight.vim/"; }; papercolor-theme = buildVimPluginFrom2Nix { @@ -2397,6 +2635,7 @@ let rev = "ddd09867ed4e020b3ba2eb47dc3ef365da5b0fed"; sha256 = "1dhbnd99xs6l5alqhn9m1nynmr9sbvrqj2137l23ysisprl3rgmr"; }; + meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; pear-tree = buildVimPluginFrom2Nix { @@ -2408,6 +2647,7 @@ let rev = "3bb209d9637d6bd7506040b2fcd158c9a7917db3"; sha256 = "0n70rzw34lsnnprqna90ssqrka33qx3z0n2kj19ps8yp3j6lsxvk"; }; + meta.homepage = "https://github.com/tmsvg/pear-tree/"; }; peskcolor-vim = buildVimPluginFrom2Nix { @@ -2419,6 +2659,7 @@ let rev = "cba4fc739bbebacd503158f6509d9c226651f363"; sha256 = "15hw3casr5y3ckgcn6aq8vhk6g2hym41w51nvgf34hbj9fx1nvkq"; }; + meta.homepage = "https://github.com/andsild/peskcolor.vim/"; }; pig-vim = buildVimPluginFrom2Nix { @@ -2430,17 +2671,19 @@ let rev = "60d8a0883d3e474e61af46b581a5ce3af65e9bb5"; sha256 = "0az48a3slpzljb69d60cpahkshmdbss0snc8lmvf4yrc1gx8yncv"; }; + meta.homepage = "https://github.com/motus/pig.vim/"; }; plantuml-syntax = buildVimPluginFrom2Nix { pname = "plantuml-syntax"; - version = "2019-11-06"; + version = "2020-03-30"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "82ff416ce99cc9f69b1af54b8832eaf6cdbeaea6"; - sha256 = "1297h9jipfx2xw5dqh1286g2syv5c18g15644lqn11s62skqxd16"; + rev = "25070c47cae8c7a9d62c8c09a1339e761448fbc4"; + sha256 = "1x2a1wnxs2qmv2zqgq2bmwskdp1i4ga0yjxjyziyr96p48m7dcjp"; }; + meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; pony-vim-syntax = buildVimPluginFrom2Nix { @@ -2452,6 +2695,7 @@ let rev = "caa34b3d7a15d9bfbfbb2f5944c85eb1eddcfafc"; sha256 = "0r2lv99hkm95dv8wy9rkrkcwz5wkmwggfwi5vakgw497l3a9jskr"; }; + meta.homepage = "https://github.com/dleonard0/pony-vim-syntax/"; }; PreserveNoEOL = buildVimPluginFrom2Nix { @@ -2463,6 +2707,7 @@ let rev = "940e3ce90e54d8680bec1135a21dcfbd6c9bfb62"; sha256 = "1726jpr2zf6jrb00pp082ikbx4mll3a877pnzs6i18f9fgpaqqgd"; }; + meta.homepage = "https://github.com/vim-scripts/PreserveNoEOL/"; }; prev_indent = buildVimPluginFrom2Nix { @@ -2474,6 +2719,7 @@ let rev = "79e9b1b9a6895bfd15463c45595ca599987a4b23"; sha256 = "03xqdwfkc7a84742ldsggi7ix99c7dhpmg6j13gkasyfk487ryh6"; }; + meta.homepage = "https://github.com/vim-scripts/prev_indent/"; }; psc-ide-vim = buildVimPluginFrom2Nix { @@ -2485,6 +2731,7 @@ let rev = "5fb4e329e5c0c7d80f0356ab4028eee9c8bd3465"; sha256 = "0gzbxsq6wh8d9z9vyrff4hdpc66yg9y8hnxq4kjrz9qrccc75c1f"; }; + meta.homepage = "https://github.com/frigoeu/psc-ide-vim/"; }; purescript-vim = buildVimPluginFrom2Nix { @@ -2496,6 +2743,7 @@ let rev = "67ca4dc4a0291e5d8c8da48bffc0f3d2c9739e7f"; sha256 = "1insh39hzbynr6qxb215qxhpifl5m8i5i0d09a3b6v679i7s11i8"; }; + meta.homepage = "https://github.com/purescript-contrib/purescript-vim/"; }; python-mode = buildVimPluginFrom2Nix { @@ -2507,17 +2755,19 @@ let rev = "f94b0d7b21714f950f5878b430fbfde21c3b7ad9"; sha256 = "0zxsa1agigzb9adrwq54pdyl984drdqzz3kkixaijkq77kkdvj0n"; }; + meta.homepage = "https://github.com/python-mode/python-mode/"; }; quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; - version = "2020-03-17"; + version = "2020-04-04"; src = fetchFromGitHub { owner = "unblevable"; repo = "quick-scope"; - rev = "49b00ee08176636384c98690a4719565372f68b9"; - sha256 = "0lsmrmjrhyi1rm4sp3hs9lhs8v8ff50zc1gy4bg6gsxw4c1ghl3q"; + rev = "ac80025b868bb6e52b9dda893246ee5f992612de"; + sha256 = "1pvw8d53dgm580r9n2qcx0w56g4kanvd00ny6c6l71hxw9lixnlb"; }; + meta.homepage = "https://github.com/unblevable/quick-scope/"; }; quickfix-reflector-vim = buildVimPluginFrom2Nix { @@ -2529,6 +2779,7 @@ let rev = "8e9c05a110b80ab66fc8bc3d5fe9e6fa168aada6"; sha256 = "1i8453z3s0xmbmbzk3kpxwvd42ar9v2m2gjqic9k7njpxw87czvs"; }; + meta.homepage = "https://github.com/stefandtw/quickfix-reflector.vim/"; }; quickfixstatus = buildVimPluginFrom2Nix { @@ -2540,6 +2791,7 @@ let rev = "fd3875b914fc51bbefefa8c4995588c088163053"; sha256 = "16vxhvyxq51y7wnx0c1fmdi2yb6kfr1pxijq65gxj8qwvbak2s3v"; }; + meta.homepage = "https://github.com/dannyob/quickfixstatus/"; }; rainbow = buildVimPluginFrom2Nix { @@ -2551,6 +2803,7 @@ let rev = "c876f4bc6e737241d53669415f88cb5f2afd8ad9"; sha256 = "1kmgm91q507qv9bvg37dn0lddzb8gwkmslajampnfjyfhbs0shgz"; }; + meta.homepage = "https://github.com/luochen1990/rainbow/"; }; rainbow_parentheses-vim = buildVimPluginFrom2Nix { @@ -2562,6 +2815,7 @@ let rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; sha256 = "1qw84imlhq4654mxazj7j3sp5g1j3yjxi496i08iix06dm15m5s7"; }; + meta.homepage = "https://github.com/kien/rainbow_parentheses.vim/"; }; random-vim = buildVimPluginFrom2Nix { @@ -2573,6 +2827,7 @@ let rev = "b2d85eb24a38074eab37a5acf2a295e1f2ad8989"; sha256 = "1lzy2cq4jcrsqyxlnbnd0y6j4mabm09bi7q22lf6vinqlb84w7sp"; }; + meta.homepage = "https://github.com/vim-scripts/random.vim/"; }; ranger-vim = buildVimPluginFrom2Nix { @@ -2584,6 +2839,7 @@ let rev = "6def86f4293d170480ce62cc41f15448075d7835"; sha256 = "0890rbmdw3p25cww6vsji7xrndcxsisfyv5przahpclk9fc9sxs8"; }; + meta.homepage = "https://github.com/rafaqz/ranger.vim/"; }; readline-vim = buildVimPluginFrom2Nix { @@ -2595,17 +2851,19 @@ let rev = "48f04c651728e8a7a8352eec697801aa32348564"; sha256 = "1vs91lkm9gwvp0bahx80ag6lw03r5x6kyih70l4sq8q0kydp5f13"; }; + meta.homepage = "https://github.com/ryvnf/readline.vim/"; }; Recover-vim = buildVimPluginFrom2Nix { pname = "Recover-vim"; - version = "2019-06-04"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "chrisbra"; repo = "Recover.vim"; - rev = "491c7bab1632029318d682df927d62b298856db5"; - sha256 = "18bdsa6y9cdf92qafp4mlc2f6ny3qx8wl8p3i9x7q46i89bn7cxc"; + rev = "c84f07260f1e839bc7bfc2ab69bf4f3f4aaa423d"; + sha256 = "1q87n2xz6p879ihijvhxs1iv9iyrqcbx7z8dkql0ivbf572q9iwh"; }; + meta.homepage = "https://github.com/chrisbra/Recover.vim/"; }; Rename = buildVimPluginFrom2Nix { @@ -2617,6 +2875,7 @@ let rev = "b240f28d2ede65fa77cd99fe045efe79202f7a34"; sha256 = "1d1myg4zyc281zcc1ba9idbgcgxndb4a0jwqr4yqxhhzdgszw46r"; }; + meta.homepage = "https://github.com/vim-scripts/Rename/"; }; ReplaceWithRegister = buildVimPluginFrom2Nix { @@ -2628,17 +2887,19 @@ let rev = "832efc23111d19591d495dc72286de2fb0b09345"; sha256 = "0mb0sx85j1k59b1zz95r4vkq4kxlb4krhncq70mq7fxrs5bnhq8g"; }; + meta.homepage = "https://github.com/vim-scripts/ReplaceWithRegister/"; }; riv-vim = buildVimPluginFrom2Nix { pname = "riv-vim"; - version = "2020-02-17"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "gu-fan"; repo = "riv.vim"; - rev = "d52844691ca2f139e4b634db65aa49c57a0fc2b3"; - sha256 = "0s4jvqwlnmmh2zw9v9rlwynwx44ypdrzhhyfb20sippxg9g6z0c5"; + rev = "e26c3e8dce4c1332e802cde84f83e61ec8a13986"; + sha256 = "1da3iwrpy08rayrsf8v0ml4khlp9j5i4cffpv9j3iyalcbhk2m9g"; }; + meta.homepage = "https://github.com/gu-fan/riv.vim/"; }; robotframework-vim = buildVimPluginFrom2Nix { @@ -2650,6 +2911,7 @@ let rev = "75d5b371a4da2a090a2872d55bd0dead013f334e"; sha256 = "091ac5rq6f1a7j2q3dy9rc00vckv21m4wd29ijj63jannr02v5ad"; }; + meta.homepage = "https://github.com/mfukar/robotframework-vim/"; }; rtorrent-syntax-file = buildVimPluginFrom2Nix { @@ -2661,17 +2923,19 @@ let rev = "885ca182c02bbbed4b62a3fcfe6fe62fa5b419ca"; sha256 = "1vhvmwnwi6862cckl8dqr8pgy0inrr0c31lic89826yv7mfl9mbz"; }; + meta.homepage = "https://github.com/ccarpita/rtorrent-syntax-file/"; }; rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2020-03-06"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "255a81f091a08786e004f215651227a2fef3a64c"; - sha256 = "0kn0yhh2cmd6h5wwz5y8v9j3mqb8ywmzzmdhglr6wmdlr7bkk75g"; + rev = "2b916c8c8b3975988c13460918b46115f6a06802"; + sha256 = "06a9liz3a7fyjcd7phpfzrpqnjjzm5ai3bb41wh4hdc5ic8lgrij"; }; + meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; salt-vim = buildVimPluginFrom2Nix { @@ -2683,6 +2947,7 @@ let rev = "6ca9e3500cc39dd417b411435d58a1b720b331cc"; sha256 = "0r79bpl98xcsmkw6dg83cf1ghn89rzsr011zirk3v1wfxclri2c4"; }; + meta.homepage = "https://github.com/saltstack/salt-vim/"; }; self = buildVimPluginFrom2Nix { @@ -2694,6 +2959,7 @@ let rev = "2ed666b547eddee6ae1fcc63babca4ba0b66a59f"; sha256 = "1gcwn6i5i3msg7hrlzsnv1bs6pm4jz9cff8ppaz2xdj8xv9qy6fn"; }; + meta.homepage = "https://github.com/megaannum/self/"; }; semshi = buildVimPluginFrom2Nix { @@ -2705,6 +2971,7 @@ let rev = "801d0c971d3d7291cf2fc22d74ac69155a71a279"; sha256 = "0adq1qxlxd53ps5byjvqmzk266f3wbvqmw74dkx6vd41zqw38wfx"; }; + meta.homepage = "https://github.com/numirias/semshi/"; }; seoul256-vim = buildVimPluginFrom2Nix { @@ -2716,6 +2983,7 @@ let rev = "cfc0167e546a40eb26ec2a0a0f1c141a8c1bcaf1"; sha256 = "1z980hsmf6gcvd16ja67az131mrgv5fv6v0ivsh0ga8hwc4f9l6q"; }; + meta.homepage = "https://github.com/junegunn/seoul256.vim/"; }; shabadou-vim = buildVimPluginFrom2Nix { @@ -2727,6 +2995,7 @@ let rev = "7d4bfed1ea8985ae125df3d1403cc19e252443e1"; sha256 = "1kvik1yf7yjg9jdmdw38yhkksxg0n3nry02banwik7wgjnpvg870"; }; + meta.homepage = "https://github.com/osyo-manga/shabadou.vim/"; }; ShowMultiBase = buildVimPluginFrom2Nix { @@ -2738,6 +3007,7 @@ let rev = "85a39fd12668ce973d3d9282263912b2b8f0d338"; sha256 = "0hg5352ahzgh2kwqha5v8ai024fld93xag93hb53wjf5b8nzsz8i"; }; + meta.homepage = "https://github.com/vim-scripts/ShowMultiBase/"; }; SimpylFold = buildVimPluginFrom2Nix { @@ -2749,6 +3019,7 @@ let rev = "aa0371d9d708388f3ba385ccc67a7504586a20d9"; sha256 = "1gjv78x2cgh79a04l411kdhkm53f93czs54p07kadpa9659z93ss"; }; + meta.homepage = "https://github.com/tmhedberg/SimpylFold/"; }; sky-color-clock-vim = buildVimPluginFrom2Nix { @@ -2760,6 +3031,7 @@ let rev = "9d4232cc249083f3c5d2eb4e2848e491b52df4ca"; sha256 = "1ln50rahb177vilzr4zc7v9znm8xfid1v8gddl83gr9srdbn2bbz"; }; + meta.homepage = "https://github.com/mopp/sky-color-clock.vim/"; }; smartpairs-vim = buildVimPluginFrom2Nix { @@ -2771,6 +3043,7 @@ let rev = "dc754c29509b1a942552b3cfa348e4aae209322c"; sha256 = "1pyynwz7wfbgccdxsyggzl0301qjj3wgyymah5spx8b3s42a6slj"; }; + meta.homepage = "https://github.com/gorkunov/smartpairs.vim/"; }; sourcemap-vim = buildVimPluginFrom2Nix { @@ -2782,17 +3055,19 @@ let rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; sha256 = "1gcgnynallz420911fdfm0ccbv3zs78p69nnh2ls1r4vlfp7g350"; }; + meta.homepage = "https://github.com/chikatoike/sourcemap.vim/"; }; SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2020-03-06"; + version = "2020-03-31"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "17b7f8cba9cc83ee684f72cc6f354f0677c0acf5"; - sha256 = "0rb9dx0lvqvfqyiizfjf812zi0ladjiq5hxjc15rgiw13ivxix0d"; + rev = "58fc865f83b600ee8906fe35d02749dec6659607"; + sha256 = "0rv9a6gzn5q2ajsyfvsrybn7hyskckfa7wad4jr8xaylccn5r7x7"; }; + meta.homepage = "https://github.com/jaredgorski/SpaceCamp/"; }; Spacegray-vim = buildVimPluginFrom2Nix { @@ -2804,6 +3079,7 @@ let rev = "69e8fefce04e2aff6a01cc4c295493359b0e4fa1"; sha256 = "0ks5yd1vmpjw8ml7hqd2zz2d8mqkqhfw2ya73y1igf6as70za896"; }; + meta.homepage = "https://github.com/ajh17/Spacegray.vim/"; }; spacevim = buildVimPluginFrom2Nix { @@ -2815,6 +3091,7 @@ let rev = "30142a518ba77feb22791b5cb2387d88b70c58f2"; sha256 = "0m389cnpg17ca8s7vb9yrs40sxb56zg32lcpilnd63zfi7awgscg"; }; + meta.homepage = "https://github.com/ctjhoa/spacevim/"; }; sparkup = buildVimPluginFrom2Nix { @@ -2826,6 +3103,7 @@ let rev = "6fbfceef890e705c47b42b27be743ffed6f9296e"; sha256 = "17jgpvl879ik53rr3razfnbpfx63mzpp1rlvxxjsvvrk4g45dssm"; }; + meta.homepage = "https://github.com/chrisgeo/sparkup/"; }; splice-vim = buildVimPluginFrom2Nix { @@ -2837,6 +3115,7 @@ let rev = "815a28e687fdf78b67e9b9cd4c21277bbe658873"; sha256 = "0bh1gr2h6w872ql72rdlzpk5znl4lz01x6lgyf330sickizz5mvb"; }; + meta.homepage = "https://github.com/sjl/splice.vim/"; }; split-term-vim = buildVimPluginFrom2Nix { @@ -2848,17 +3127,19 @@ let rev = "a4e28cab77ad07fc8a0ebb62a982768c02eb287c"; sha256 = "12vrmbq1r8d6sgyxjwi0s856n1v4vjhrf8wpwq6l4ydmk1bnvjkb"; }; + meta.homepage = "https://github.com/vimlab/split-term.vim/"; }; splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2020-03-10"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "fef5079e9dee55c2cf879ce2a4412fb5dcb40808"; - sha256 = "1v6cm86klzbmzx2grzxprpxci3001yjfbnwdd1891rfggjlm4wj9"; + rev = "62d42e1ac5dcf8f3c70bd344d31300ee39d0e580"; + sha256 = "1d0ik668lhkrd972brh99lizrfl249srj6y8i1ag4ykr99nmydqg"; }; + meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; }; starsearch-vim = buildVimPluginFrom2Nix { @@ -2870,6 +3151,7 @@ let rev = "9b8cda1e628160c83846db5a30899a1a1ba5c1c9"; sha256 = "1i1ygdqwhz4jqmz9lzjnx1a7s5chdqjsvgkmnd9x0s8ixqa41bpr"; }; + meta.homepage = "https://github.com/darfink/starsearch.vim/"; }; supertab = buildVimPluginFrom2Nix { @@ -2881,6 +3163,7 @@ let rev = "40fe711e088e2ab346738233dd5adbb1be355172"; sha256 = "0l5labq68kyprv63k1q35hz5ly0dd06mf2z202mccnix4mlxf0db"; }; + meta.homepage = "https://github.com/ervandew/supertab/"; }; sved = buildVimPluginFrom2Nix { @@ -2892,6 +3175,7 @@ let rev = "3362db72447e8ac812c7299c15ecfc9f41341713"; sha256 = "1r2nv069d6r2q6gbiz795x94mfjm9hnv05zka085hhq9a3yf1pgx"; }; + meta.homepage = "https://github.com/peterbjorgensen/sved/"; }; swift-vim = buildVimPluginFrom2Nix { @@ -2903,17 +3187,19 @@ let rev = "c4053da88208cef5a32a5862694d36b73f6ce310"; sha256 = "0awz0pf3awrwhay40wngfllpmmh24zwm02ra530x4n1hk74iwf2v"; }; + meta.homepage = "https://github.com/keith/swift.vim/"; }; syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2020-01-29"; + version = "2020-04-19"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "f3766538720116f099a8b1517f76ae2f094afd20"; - sha256 = "1bzjav87fcibwlp8siqnx6x8wv8w3mwrrqrd5w19ny9scr5x2a65"; + rev = "b3e2d8470fddc7f2b598f09023ebc5045a3fb1fd"; + sha256 = "1ljsh0npbcv9g6l23z4jpba0bk1k5n13ix0p0rr22cipgzlxsbvh"; }; + meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; tabmerge = buildVimPluginFrom2Nix { @@ -2925,6 +3211,7 @@ let rev = "074e5f06f26e7108a0570071a0f938a821768c06"; sha256 = "0prkyza1n49cdaslcr57w8zv15vw78mlqbzib2xipmawzjq02idq"; }; + meta.homepage = "https://github.com/vim-scripts/tabmerge/"; }; tabpagebuffer-vim = buildVimPluginFrom2Nix { @@ -2936,6 +3223,7 @@ let rev = "4d95c3e6fa5ad887498f4cbe486c11e39d4a1fbc"; sha256 = "1z6zlpzkhwy1p2pmx9qrwb91dp9v4yi8jrdvm1if2k79ij4sl08f"; }; + meta.homepage = "https://github.com/Shougo/tabpagebuffer.vim/"; }; tabular = buildVimPluginFrom2Nix { @@ -2947,17 +3235,19 @@ let rev = "339091ac4dd1f17e225fe7d57b48aff55f99b23a"; sha256 = "0jq91770wsp2waw7pywxjqx59v0vg54gfzirgcd85pg61w22bfla"; }; + meta.homepage = "https://github.com/godlygeek/tabular/"; }; tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-01-23"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "majutsushi"; repo = "tagbar"; - rev = "679a9d9ac9579bd18225409d85ed4870fb6c9c62"; - sha256 = "1s4736104vfaj7rfcdzcnmgbnxxi0ngs07km0p2fi1m2zc68602l"; + rev = "1e50ea85361b7144acad459eb091973089b780f6"; + sha256 = "09w7vwzacny6kbf9s2ihan8k682qljp8zad1dh5ds0738a3nwxpl"; }; + meta.homepage = "https://github.com/majutsushi/tagbar/"; }; taglist-vim = buildVimPluginFrom2Nix { @@ -2969,6 +3259,7 @@ let rev = "53041fbc45398a9af631a20657e109707a455339"; sha256 = "07aa2gfc73lznyi7w7cybzanspza3p67cv5hxr21g43zhs5k9izd"; }; + meta.homepage = "https://github.com/vim-scripts/taglist.vim/"; }; targets-vim = buildVimPluginFrom2Nix { @@ -2980,28 +3271,31 @@ let rev = "8d6ff2984cdfaebe5b7a6eee8f226a6dd1226f2d"; sha256 = "192wq3x64x11nm2jhs4yrc627b0lh002dfnj72xrc7jak9vbdps9"; }; + meta.homepage = "https://github.com/wellle/targets.vim/"; }; tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2020-03-15"; + version = "2020-04-13"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "b9a075e36e9d8817b15e2edcdb8b6bf51a8d479c"; - sha256 = "1vyg2n7s8981km05zpfhzcvb1adwc26l034w9w1bjil72fywdad0"; + rev = "a20a34b0e3129314a820419234d8707a7cc9b872"; + sha256 = "1ms3yy1b1mpjckqfam4bdz2yllxvzac3dfbs213c0hz6l6y20y4n"; }; + meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; tender-vim = buildVimPluginFrom2Nix { pname = "tender-vim"; - version = "2020-02-18"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "jacoborus"; repo = "tender.vim"; - rev = "f93b2f373cc21826524c94fbd1f3b3a4c55173d2"; - sha256 = "0bfns5vsbyh1s01s295hbf8h04n21cfkfp8b2r3cfr8mcvazpmpq"; + rev = "44d04bc9ecb0188e7b1a3e6b6715b9a63dc8f3e1"; + sha256 = "059my5q6gqjdkaf7qn842h92c6y7lp5z8wpwsi2ww6anzy85506z"; }; + meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; tern_for_vim = buildVimPluginFrom2Nix { @@ -3013,6 +3307,7 @@ let rev = "994ffbe783da36d67786b6c66a4bf784c5eab300"; sha256 = "0vpi5lqlyf6kcc0ha8hf3ch2h8v3awidgpwbrv9f3bqvyg4yhdcd"; }; + meta.homepage = "https://github.com/ternjs/tern_for_vim/"; }; thesaurus_query-vim = buildVimPluginFrom2Nix { @@ -3024,6 +3319,7 @@ let rev = "830a20ec77780ebfe8d2a7e8c740ca4abb079f89"; sha256 = "0kfqpjwashwf084cbz6dmhirk42a4n8d1zj17i086by17nx7qn1g"; }; + meta.homepage = "https://github.com/ron89/thesaurus_query.vim/"; }; thumbnail-vim = buildVimPluginFrom2Nix { @@ -3035,6 +3331,7 @@ let rev = "7d65524dddaeed5629e6b9c8926c56ef8dd0c553"; sha256 = "02707pl5dqfgkxx2i4wcfxx2zdpm86g5l4n4wn1dms35bcn2c8l8"; }; + meta.homepage = "https://github.com/itchyny/thumbnail.vim/"; }; tlib_vim = buildVimPluginFrom2Nix { @@ -3046,6 +3343,7 @@ let rev = "a071b6d41b20069a3520e0d101194a752968973b"; sha256 = "05swfvjyai32cbdpg10m3k2frkv017i1avf0nzilqavskvg04vi3"; }; + meta.homepage = "https://github.com/tomtom/tlib_vim/"; }; tmux-complete-vim = buildVimPluginFrom2Nix { @@ -3057,6 +3355,7 @@ let rev = "7237d8d8d60af7916e3b546a9f4f396df95a1b21"; sha256 = "05ypjahaf7gk4vjc8hhglmw7y8vyjxyhxq8sm0s3np05aw0gdbsc"; }; + meta.homepage = "https://github.com/wellle/tmux-complete.vim/"; }; todo-txt-vim = buildVimPluginFrom2Nix { @@ -3069,6 +3368,7 @@ let sha256 = "08m9q5f2pz6gjp0vkmm7glfsrbnldxi1j59dm5d7any6y96xxd6v"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/freitass/todo.txt-vim/"; }; traces-vim = buildVimPluginFrom2Nix { @@ -3080,6 +3380,7 @@ let rev = "4d3858eb060a1fd2213b075a707d39cbb118ae3e"; sha256 = "0qny9z459x7hp5y43iivws2m312clacysdy1nnb3cr1fyhw9pflx"; }; + meta.homepage = "https://github.com/markonm/traces.vim/"; }; tslime-vim = buildVimPluginFrom2Nix { @@ -3091,6 +3392,7 @@ let rev = "28e9eba642a791c6a6b044433dce8e5451b26fb0"; sha256 = "1y5xikryv6851d0rjk9c64agawshp5208mwym6ma9ngs7s3s1l4x"; }; + meta.homepage = "https://github.com/jgdavey/tslime.vim/"; }; tsuquyomi = buildVimPluginFrom2Nix { @@ -3102,6 +3404,7 @@ let rev = "85fffd5939c8fc5750b35a937b965af2ad5b0b15"; sha256 = "1j5wdh0xa5yld4fy2msyjf1qvj8zx0iccc1bw63zzbrcl6rs30gx"; }; + meta.homepage = "https://github.com/Quramy/tsuquyomi/"; }; typescript-vim = buildVimPluginFrom2Nix { @@ -3113,6 +3416,7 @@ let rev = "17d85d8051ba21283e62a9101734981e10b732fd"; sha256 = "17z8ygns97wlnm4vq7kgkx3ymnbb2f6imxn02fc0iywkrhdqv7mj"; }; + meta.homepage = "https://github.com/leafgarland/typescript-vim/"; }; ultisnips = buildVimPluginFrom2Nix { @@ -3124,6 +3428,7 @@ let rev = "ee31ea1c7d08ced8577120b4c1d55c5a05351a75"; sha256 = "01nm3d95qjd2v3j9ln7w52i8bn2fgi5zms9078832w1x4iyb1mwn"; }; + meta.homepage = "https://github.com/SirVer/ultisnips/"; }; undotree = buildVimPluginFrom2Nix { @@ -3135,17 +3440,19 @@ let rev = "be23eacb2a63380bd79e207a738c728214ecc9d3"; sha256 = "00zyvff32zp7pyjzkq8da9xhr378mlpi8gj717yfr9wbwwarwfd7"; }; + meta.homepage = "https://github.com/mbbill/undotree/"; }; unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2020-03-18"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "fc2e986f34dc6b21e80d54845a7b538003129feb"; - sha256 = "0h76726rnqrdvmm9bpgnrli66rg18b2snw077wz0zvcz7g0l9a24"; + rev = "ce061819e4304a9ff2f82779e12e5a30363ab47c"; + sha256 = "0k9gmf2rdvnlfqqhjlk206wimlh5di3smmrr9cgz0djq5pd3r5jz"; }; + meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; unite-vim = buildVimPluginFrom2Nix { @@ -3157,6 +3464,7 @@ let rev = "5addeca429f64130d74d2f7cb8255afdb9e309d2"; sha256 = "03bqljjc1h43qimm81mv8ywkx5388kd6clm2f7887diiww0fgvfi"; }; + meta.homepage = "https://github.com/Shougo/unite.vim/"; }; utl-vim = buildVimPluginFrom2Nix { @@ -3168,6 +3476,7 @@ let rev = "67a6506a7a8a3847d00d3af3e2ed9707460d5ce5"; sha256 = "0ax68nmzlka9193n2h82qzvhzv4dv6lm7rg3b1vhj2pn1r6ci6p4"; }; + meta.homepage = "https://github.com/vim-scripts/utl.vim/"; }; vader-vim = buildVimPluginFrom2Nix { @@ -3179,6 +3488,7 @@ let rev = "6fff477431ac3191c69a3a5e5f187925466e275a"; sha256 = "153cr1mrf5w5lyr8374brwx1z5yl9h0cnijxnd3xikh3yi3pbmwk"; }; + meta.homepage = "https://github.com/junegunn/vader.vim/"; }; vCoolor-vim = buildVimPluginFrom2Nix { @@ -3190,28 +3500,31 @@ let rev = "8fc037e453f4c2274f590bde4f9fb56167b14e57"; sha256 = "193cjxfha5xcpfjqqpyfa6xidys1zmmmwlcj7w2cxbr5j5bdnybm"; }; + meta.homepage = "https://github.com/KabbAmine/vCoolor.vim/"; }; verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog-vim"; - version = "2019-10-27"; + version = "2020-04-01"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "22b3d81f9b7146ddf1bd05c1b2f9407af14d3ed7"; - sha256 = "12z5a4zkrajzdyf31a5l7hlyif5ywj8pab25x98hwqjs38x8lklf"; + rev = "c6f7ca14554196ae15a5fef9e568d69f04b9ff56"; + sha256 = "1hx9rgx44dhc449r0j6azkp1bm20n9c3fyb112w277a2jvf0a2c5"; }; + meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2020-03-03"; + version = "2020-04-22"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "ed490ae07168ecd1636b9fe0998baeb770b87cd9"; - sha256 = "0b23r37az36kzlzr3k483r1yy142nmz09hc9wkwchs2zns30bqky"; + rev = "043518d3a9c48049bc0ae0af72dcbb239bf1d36d"; + sha256 = "0v25yk0d4488yn1yvzkpcqh8ldx51q4hbfn678vkr9ga5i0nkkwp"; }; + meta.homepage = "https://github.com/dracula/vim/"; }; vim-abolish = buildVimPluginFrom2Nix { @@ -3223,6 +3536,7 @@ let rev = "7e4da6e78002344d499af9b6d8d5d6fcd7c92125"; sha256 = "1n35igng3a6d5y4nh5pyb09s6khgcwbr3v0lnh33qb51cv4cnjh4"; }; + meta.homepage = "https://github.com/tpope/vim-abolish/"; }; vim-addon-actions = buildVimPluginFrom2Nix { @@ -3234,6 +3548,7 @@ let rev = "540cae09832ba6abf9fc63c55781bf86584c33ac"; sha256 = "011w5k09i01r9x64j20qj0f7d057m9wki2m8l2wds47l57hr3vz6"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-actions/"; }; vim-addon-async = buildVimPluginFrom2Nix { @@ -3245,6 +3560,7 @@ let rev = "eca316a4480f68c2cb62128f3187dc7b2002afde"; sha256 = "1lk8ma51dd0syi73vq5r4qk9cpy6cq3llizvh94hmxblfjpvrs7q"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-async/"; }; vim-addon-background-cmd = buildVimPluginFrom2Nix { @@ -3256,6 +3572,7 @@ let rev = "abf2abf339652d2bc79da81f9d131edfe2755f5a"; sha256 = "0csy68x686l3x5ancidxb5b6prg9k7ikybqzq3klx0gs5rmksfy4"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-background-cmd/"; }; vim-addon-commenting = buildVimPluginFrom2Nix { @@ -3267,6 +3584,7 @@ let rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; sha256 = "0alak8h33vada2ckb0v06y82qlib5mhyc2yswlv1rqh8ypzhq3mc"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-commenting/"; }; vim-addon-completion = buildVimPluginFrom2Nix { @@ -3278,6 +3596,7 @@ let rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75"; sha256 = "1ld059y2qwlc5bdfjm2p314s1qh31lxs54g944pw49r46s5nlslr"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-completion/"; }; vim-addon-errorformats = buildVimPluginFrom2Nix { @@ -3289,6 +3608,7 @@ let rev = "bb83675cb0b8cc377fb0a79ba492ba2445674ba6"; sha256 = "09cds33lb5gm69wv5plgidprm8nf52vvg9qdzpq9mihvinvj5qv7"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-errorformats/"; }; vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { @@ -3300,6 +3620,7 @@ let rev = "44f0cba27013cfc1f4e46697ba6de30b2a128cf7"; sha256 = "1s9021qnn95bzl8r7nx818j1kmjfjzg8xg07s071ic96lv40bcqp"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-goto-thing-at-cursor/"; }; vim-addon-local-vimrc = buildVimPluginFrom2Nix { @@ -3311,6 +3632,7 @@ let rev = "6a27f95b35befa70cd0d049329cd0920566c764b"; sha256 = "0n8lwl1gyak149p7jpgm0qbmfj8hcg8hirx3dxdhizw0yc47ws7h"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-local-vimrc/"; }; vim-addon-manager = buildVimPluginFrom2Nix { @@ -3322,6 +3644,7 @@ let rev = "d9e865f3c2de5d9b7eabbc976f606cf1b89e29ea"; sha256 = "0mgm2dqw8js9gajkrvm5n3k9m1grjxcrfc9xdzb3jxw1c0njdhcy"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-manager/"; }; vim-addon-mru = buildVimPluginFrom2Nix { @@ -3333,6 +3656,7 @@ let rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; sha256 = "0q6rxr9nrp63kidr3m3c2z5sda4g813pzshg0scxkjr8dxwhzdqm"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-mru/"; }; vim-addon-mw-utils = buildVimPluginFrom2Nix { @@ -3344,6 +3668,7 @@ let rev = "6aaf4fee472db7cbec6d2c8eea69fdf3a8f8a75d"; sha256 = "1w99r6ck6gqg6b0fk9qj07q0b7p2qxav0ar6x294g34wsqij6xj5"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-mw-utils/"; }; vim-addon-nix = buildVimPluginFrom2Nix { @@ -3355,6 +3680,7 @@ let rev = "3001a9db5f816dd7af11384f15415bddd146ef86"; sha256 = "195z2yz09wirpqjpsha8x7qcr9is1q8qph4j0svws6qbqrkh8ryy"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-nix/"; }; vim-addon-other = buildVimPluginFrom2Nix { @@ -3366,6 +3692,7 @@ let rev = "7a395970b8817296c11e1de8310194c4ae6e1f89"; sha256 = "0sding7rc11imf5k9ki4h426wjiz8ywxa81v74xj3m23zm6l77sa"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-other/"; }; vim-addon-php-manual = buildVimPluginFrom2Nix { @@ -3377,6 +3704,7 @@ let rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff"; sha256 = "1kc67f12wccqdza069b75lpcbqp4kv4r23i4mfz0ihwif5mfnhir"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-php-manual/"; }; vim-addon-signs = buildVimPluginFrom2Nix { @@ -3388,6 +3716,7 @@ let rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; sha256 = "0i4gfp30hmw1vqjl6zxjrgkca3ikdkcnjmma2mncjmcr6f59kjzy"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-signs/"; }; vim-addon-sql = buildVimPluginFrom2Nix { @@ -3399,6 +3728,7 @@ let rev = "048a139af36829fce670c8ff80d3aad927557ee6"; sha256 = "0ihm157sby6csdwsnw2gwh3jmm3prm1mxwgkx2hsfwlmpb1vwwm3"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-sql/"; }; vim-addon-syntax-checker = buildVimPluginFrom2Nix { @@ -3410,6 +3740,7 @@ let rev = "739e5719b77c6aea3299c27fc1f4238ac54a8344"; sha256 = "1rcn1ps06156nyglvxg6m7pn3vhvmnv5ad6kidp59hggyr5332i9"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-syntax-checker/"; }; vim-addon-toggle-buffer = buildVimPluginFrom2Nix { @@ -3421,6 +3752,7 @@ let rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; sha256 = "1xq38kfdm36c34ln66znw841q797w5gm8bpq1x64bsf2h6n3ml03"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-toggle-buffer/"; }; vim-addon-xdebug = buildVimPluginFrom2Nix { @@ -3432,39 +3764,43 @@ let rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; sha256 = "1i64ppdfp2qqq7vw1jf160mj4ikc04v39iazdab83xmiqjsh8ixw"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-xdebug/"; }; vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-03-20"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "119477060d55bb5de173b28f310d430af5593618"; - sha256 = "0hgq13iigpk8cy0lyamaz135019qbxc5nckgv0363ilhk4k5ilrd"; + rev = "ff3f66ed30fbab70af1f37c8532327bd9617f7c7"; + sha256 = "1gppy9lk9vyxrqyb9lxvvl8nl31ha5mjwvhlang8g69j2vqpxikr"; }; + meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-02-17"; + version = "2020-04-01"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "9772475fcc24bee50c884aba20161465211520c8"; - sha256 = "1nbwwaky9j4w9qjsbgg2a9zl3f2i9zjqqbh1lmz4z9m1mixj6djp"; + rev = "3fb676b8729a98817f561ef1554c0ad1a514c96a"; + sha256 = "18bfw09ywmw10jiv37iw2ijf46jhj2yw5wndqdgn7k42gy1wk7p6"; }; + meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2019-12-17"; + version = "2020-04-17"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "0849bcb6523d17a753fcaff8d40cbeed2d09cf65"; - sha256 = "1z3x72aprp950chk754h0qpf5lxh2svzk39flks5fanxaggkpkng"; + rev = "237827115523a1c39e3aed9f83bffb009b82a3c2"; + sha256 = "06padj0r3h2lhrf17vlq8ky4q2z7a1jppfb9gjms0sddvjcis5fc"; }; + meta.homepage = "https://github.com/hsanson/vim-android/"; }; vim-anzu = buildVimPluginFrom2Nix { @@ -3476,6 +3812,7 @@ let rev = "45b60d37cb9de90f6c89f7ddeacb7ae430ebcae2"; sha256 = "1p5lh4xsv9xsl8kx0h1bg6iy0if4a69hvairq69p50ffka83pv00"; }; + meta.homepage = "https://github.com/osyo-manga/vim-anzu/"; }; vim-asterisk = buildVimPluginFrom2Nix { @@ -3487,6 +3824,7 @@ let rev = "77e97061d6691637a034258cc415d98670698459"; sha256 = "1bm99j4vskbgzfn09567qi0462dvjrpdkifc4hg24bi02bx9hjrj"; }; + meta.homepage = "https://github.com/haya14busa/vim-asterisk/"; }; vim-auto-save = buildVimPluginFrom2Nix { @@ -3498,17 +3836,19 @@ let rev = "8c1d5dc919030aa712ad7201074ffb60961e9dda"; sha256 = "0dj45g56n0q4advc9sgch11ghb2h5ahk601gndwy02a0937axjh2"; }; + meta.homepage = "https://github.com/907th/vim-auto-save/"; }; vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2020-03-18"; + version = "2020-04-03"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "80bda05d0f5383af0a09b9ca4a2918a23d372f60"; - sha256 = "1dgqz73cprn2s3xpdfpyjq7bmwjpdrz8b3kf6mwkajgxjl89sv7m"; + rev = "555c956db3bdd8ae6f1aa5af1c5fd37eac749e6a"; + sha256 = "0dhxa9jrhahqs1wh41115w8r3xcczbjpvnj65ldzs7q9vc4n12xq"; }; + meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; }; vim-automkdir = buildVimPluginFrom2Nix { @@ -3520,6 +3860,7 @@ let rev = "dec143a8d9b266f73a42c63ede85bfc26280f79d"; sha256 = "00ix0y1ijbis8pj7pf6gv2g5z2s7kxwlr0viybwrs0li5acym6jp"; }; + meta.homepage = "https://github.com/benizi/vim-automkdir/"; }; vim-bazel = buildVimPluginFrom2Nix { @@ -3531,6 +3872,7 @@ let rev = "7c4987b4266d117a9f1d4c7fe7f4dfba33dfc8c8"; sha256 = "182w8ibr34z86nmx6byabkah0q9fgrzml8m2ardaqzqjqr2ya5yg"; }; + meta.homepage = "https://github.com/bazelbuild/vim-bazel/"; }; vim-beancount = buildVimPluginFrom2Nix { @@ -3542,17 +3884,19 @@ let rev = "8054352c43168ece62094dfc8ec510e347e19e3c"; sha256 = "0fd4fbdmhapdhjr3f9bhd4lqxzpdwwvpf64vyqwahkqn8hrrbc4m"; }; + meta.homepage = "https://github.com/nathangrigg/vim-beancount/"; }; vim-better-whitespace = buildVimPluginFrom2Nix { pname = "vim-better-whitespace"; - version = "2020-02-09"; + version = "2020-03-24"; src = fetchFromGitHub { owner = "ntpeters"; repo = "vim-better-whitespace"; - rev = "4afbd45238da56898013546c609d72818fc97a1b"; - sha256 = "0gfqd927pxqszafbycns9f08sw6kl3z6xijvw2l0hgb5zrvfc5lg"; + rev = "8cf4b2175dd61416c2fe7d3234324a6c59d678de"; + sha256 = "1iga1xdzygnr9rhv0kw01nr3vahl2d486p06slmri2vy8ngzym0q"; }; + meta.homepage = "https://github.com/ntpeters/vim-better-whitespace/"; }; vim-buffergator = buildVimPluginFrom2Nix { @@ -3564,6 +3908,7 @@ let rev = "947b60dca4d4fc6a041a6ec84b17ca6736d1b916"; sha256 = "0g7ymflzfdsj5793s32gc83bidqys5dxmw455viwpqgmgjxnar5c"; }; + meta.homepage = "https://github.com/jeetsukumaran/vim-buffergator/"; }; vim-bufferline = buildVimPluginFrom2Nix { @@ -3575,6 +3920,7 @@ let rev = "651fd010aa9613a4b8636a4af8a2db0d22800262"; sha256 = "0zls47a3v8dv3h63drbak1mxf3j2x3scvclk7bjwzlk2yp447das"; }; + meta.homepage = "https://github.com/bling/vim-bufferline/"; }; vim-bufkill = buildVimPluginFrom2Nix { @@ -3586,6 +3932,7 @@ let rev = "795dd38f3cff69d0d8fe9e71847907e200860959"; sha256 = "1nji86vjjbfjw4xy52yazq53hrlsr7v30xkx2awgiakz7ih0bdxa"; }; + meta.homepage = "https://github.com/qpkorr/vim-bufkill/"; }; vim-choosewin = buildVimPluginFrom2Nix { @@ -3597,6 +3944,7 @@ let rev = "f91cdb9be92ce3bb9bccba16e8c659d5e8d7454f"; sha256 = "1nq1vpwv6h5sc849y26nzkrmr9w3aj6w32apyih9kx0jh4ybv0xs"; }; + meta.homepage = "https://github.com/t9md/vim-choosewin/"; }; vim-clojure-highlight = buildVimPluginFrom2Nix { @@ -3608,6 +3956,7 @@ let rev = "9ac6cb8fef04b2c243377adb671324a60952aee0"; sha256 = "0fg3faj0fq7b8pqr0i33qdg2xfd5966lrjl1wkq6jcgvdqamhz0y"; }; + meta.homepage = "https://github.com/guns/vim-clojure-highlight/"; }; vim-clojure-static = buildVimPluginFrom2Nix { @@ -3619,28 +3968,31 @@ let rev = "fae5710a0b79555fe3296145be4f85148266771a"; sha256 = "0s98qrhv7xh7bvh8bm1vaxpw3n2mcxayay3k90ibgjrv1jpyvzx7"; }; + meta.homepage = "https://github.com/guns/vim-clojure-static/"; }; vim-closetag = buildVimPluginFrom2Nix { pname = "vim-closetag"; - version = "2019-02-14"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "alvan"; repo = "vim-closetag"; - rev = "9f13011738e11d6f926a641d774635fa415f1b6e"; - sha256 = "0fm9h1i5jfyq3hkl41jsr2hvcskwh7hhg5m0yxbl57bnigapcz3p"; + rev = "90cf416c03ed841ad7f3d44f4d6f3192f216176a"; + sha256 = "0kxba7s0s66m2k4j1v8iwq6m5j9843ha67br03dg7d9ya4qiyyw9"; }; + meta.homepage = "https://github.com/alvan/vim-closetag/"; }; vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2020-03-20"; + version = "2020-04-01"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "d6676620f7a85fa49e8893cad041df59497fd845"; - sha256 = "01wrlq9h2wzngi8qna0zrwycrp0iqp7qsijyby287zbckrs25rnd"; + rev = "d3d8b8b6d73da3e1b19089f98a85901f0b652e2f"; + sha256 = "0r20cl6i4k7r2y5d8i3dbrxmn01mlnww2qgvjgmafa8nqd16gl57"; }; + meta.homepage = "https://github.com/google/vim-codefmt/"; }; vim-coffee-script = buildVimPluginFrom2Nix { @@ -3652,6 +4004,7 @@ let rev = "9e3b4de2a476caeb6ff21b5da20966d7c67a98bb"; sha256 = "1yzhyi12r508r2yjkzbcnddv3q4whjf3kchp23xs0snhwd9b981x"; }; + meta.homepage = "https://github.com/kchmck/vim-coffee-script/"; }; vim-colemak = buildVimPluginFrom2Nix { @@ -3663,6 +4016,7 @@ let rev = "6ac1c0bf362845355c65dfeab9a9987c1b4dc7ec"; sha256 = "1li7yc5vglrhf7w7i7gs2i7ihdb1bhx85basmpgqlf7790lv1599"; }; + meta.homepage = "https://github.com/kalbasit/vim-colemak/"; }; vim-colors-solarized = buildVimPluginFrom2Nix { @@ -3674,6 +4028,7 @@ let rev = "528a59f26d12278698bb946f8fb82a63711eec21"; sha256 = "05d3lmd1shyagvr3jygqghxd3k8a4vp32723fvxdm57fdrlyzcm1"; }; + meta.homepage = "https://github.com/altercation/vim-colors-solarized/"; }; vim-colorschemes = buildVimPluginFrom2Nix { @@ -3685,6 +4040,7 @@ let rev = "9e7ab1cfec5d3db85aa1c4e87329fd869ecf94e9"; sha256 = "0w9q41rl9g319xw2xs2yf34h3pdkq8a2pmh4gf9gb72v2k5z0dbm"; }; + meta.homepage = "https://github.com/flazz/vim-colorschemes/"; }; vim-colorstepper = buildVimPluginFrom2Nix { @@ -3696,6 +4052,7 @@ let rev = "f23ba0d995d41508a2dc9471cf31d3d01a4b5f05"; sha256 = "05ykxn0gmh8liz0zv5hb8df1ajggxp88izq3825m0yb3ma3k1jqs"; }; + meta.homepage = "https://github.com/jonbri/vim-colorstepper/"; }; vim-commentary = buildVimPluginFrom2Nix { @@ -3707,17 +4064,19 @@ let rev = "f8238d70f873969fb41bf6a6b07ca63a4c0b82b1"; sha256 = "09d81q9na7pvvrmxxqy09ffdzsx5v5dikinb704c9wm4ys2bidr9"; }; + meta.homepage = "https://github.com/tpope/vim-commentary/"; }; vim-cool = buildVimPluginFrom2Nix { pname = "vim-cool"; - version = "2018-01-11"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "romainl"; repo = "vim-cool"; - rev = "06918c36b3396af0bec1e87e748a5dba55be87b9"; - sha256 = "099sbjdk944bnivqgqgbjplczfm3k84583ryrmpqf3lgrq6pl8wr"; + rev = "27ad4ecf7532b750fadca9f36e1c5498fc225af2"; + sha256 = "1in44gf7hs978nc9328zh1kj3jh04kcinw0m8spcbgj079782sg8"; }; + meta.homepage = "https://github.com/romainl/vim-cool/"; }; vim-cpp-enhanced-highlight = buildVimPluginFrom2Nix { @@ -3729,6 +4088,7 @@ let rev = "27e0ffc215b81fa5aa87eca396acd4421d36c060"; sha256 = "15nyd4yssswyi4brkch09rca0qh7p77li4xyrivmiapkr4a60vwb"; }; + meta.homepage = "https://github.com/octol/vim-cpp-enhanced-highlight/"; }; vim-csharp = buildVimPluginFrom2Nix { @@ -3740,17 +4100,19 @@ let rev = "b5982fc69bba7d507638a308d6875b031054280d"; sha256 = "16sf3yqvd36b4rkrh6w7jskvlkrgymwa13xcvh586lmlc7g6ilcx"; }; + meta.homepage = "https://github.com/OrangeT/vim-csharp/"; }; vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2019-08-28"; + version = "2020-04-16"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "1f9fe5c1f9e0a6bfc41b14d070f4d878d445ae96"; - sha256 = "0h0hdv492kw0gs8kn62gyvs29pjwvvg8gbsisx4wpw6qa6w457hn"; + rev = "741dd18a35e251ededc0687eea9b8d100d3b83b8"; + sha256 = "1mjwyznprhhfmwi1djyjgxkqv9bwima1ysxa9782rk198j2n87vs"; }; + meta.homepage = "https://github.com/ap/vim-css-color/"; }; vim-cue = buildVimPluginFrom2Nix { @@ -3762,6 +4124,7 @@ let rev = "482f0b1df03f59bbd1bf4bca99314770289a7f35"; sha256 = "05c9amxpn4zyb8hvcnzrzq43r70hzs32rhn5rjaf5jflgmwaph0q"; }; + meta.homepage = "https://github.com/jjo/vim-cue/"; }; vim-cursorword = buildVimPluginFrom2Nix { @@ -3773,6 +4136,7 @@ let rev = "b5f8a4b148b566626210d0c1f6b63036b62322bb"; sha256 = "0a4gznfxmg7a62xwk4mmjcxykcgmm7mh5vv7n5hskxjczdrvl400"; }; + meta.homepage = "https://github.com/itchyny/vim-cursorword/"; }; vim-cute-python = buildVimPluginFrom2Nix { @@ -3784,28 +4148,43 @@ let rev = "d7a6163f794500447242df2bedbe20bd751b92da"; sha256 = "1jrfd6z84cdzn3yxdfp0xfxygscq7s8kbzxk37hf9cf5pl9ln0qf"; }; + meta.homepage = "https://github.com/ehamberg/vim-cute-python/"; }; vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2020-01-02"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "59cc0a16970b92afa1c99182c60e35e01cdaa409"; - sha256 = "0v3jhp33058cl7raqp59704m5ljsibpi9vs1hsiwwxf2pgdjii3f"; + rev = "62646c502fac1455318933b9ea13ec5899ba7c84"; + sha256 = "0qpgx81xpwr3ab3ardp820aqifvxh2jsk1qw94p26q6iiab7kdcv"; + }; + meta.homepage = "https://github.com/tpope/vim-dadbod/"; + }; + + vim-dasht = buildVimPluginFrom2Nix { + pname = "vim-dasht"; + version = "2019-09-29"; + src = fetchFromGitHub { + owner = "sunaku"; + repo = "vim-dasht"; + rev = "9c7484eaea26b8dd1edd8af21a38cee6c4ef4f49"; + sha256 = "1rjckipy7b4ygwvc1hbc24da1x3pwklbkfljrz16znlcm2y5q72k"; }; + meta.homepage = "https://github.com/sunaku/vim-dasht/"; }; vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-03-08"; + version = "2020-04-11"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "ebaf80de4b4e12cc8ee068ad2f134f0b23ea039d"; - sha256 = "1lq2fqhca2dm55pa0rlq9l7acfif8vlkjd04hagxjbpa9ja348kl"; + rev = "58e57b6eeb407dba7ff6e607342c08c32b6fd398"; + sha256 = "0czkkhj2s9vjis5h4gajvnqc1nraxyqhyvzk2ndffhnzxvylhd5w"; }; + meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; vim-diminactive = buildVimPluginFrom2Nix { @@ -3817,17 +4196,19 @@ let rev = "6f2e14e6ff6a038285937c378ec3685e6ff7ee36"; sha256 = "14jf5hh3v2f5wb10v09ygx15pxbwziv20pwv0fqkakxwf0vqwd50"; }; + meta.homepage = "https://github.com/blueyed/vim-diminactive/"; }; vim-dirdiff = buildVimPluginFrom2Nix { pname = "vim-dirdiff"; - version = "2019-05-14"; + version = "2020-03-31"; src = fetchFromGitHub { owner = "will133"; repo = "vim-dirdiff"; - rev = "7049f5061ee48301fc00ea69f2473325d43bf5cb"; - sha256 = "1x65adb2xfscbyx8w3wl1av9c0jqlch0kpch49jxyvcbmxdlgf65"; + rev = "5bf29d8a41b4ec93e6c04b9d4a6c626b408c27c5"; + sha256 = "0nvhsj12gsjgncpmvg8b1qz675ghfcsib5gj22p7j4l4brih563r"; }; + meta.homepage = "https://github.com/will133/vim-dirdiff/"; }; vim-dirvish = buildVimPluginFrom2Nix { @@ -3839,17 +4220,19 @@ let rev = "0a53fadc22ab6df6aed9cc580c9e498715870522"; sha256 = "09q5xpc4xbskzxppp66ypzd5mnic5bcwxahmhb259ch9xs8qmrc6"; }; + meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2020-02-10"; + version = "2020-04-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "3757ddad87073a6ded8c34dfabb28c325acf6c02"; - sha256 = "0vnkwn896v9dsqf329nvdik60bm6f0m0n32x3fqmzazqgqlx055j"; + rev = "fe6a34322829e466a7e8ce710a6ac5eabddff9fd"; + sha256 = "1m0dfm8r3d8zph6i4ln3jqfzs8hxbkq9rvxpij1m2vvk2hgy2nf5"; }; + meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; vim-docbk = buildVimPluginFrom2Nix { @@ -3861,6 +4244,7 @@ let rev = "6ac0346ce96dbefe982b9e765a81c072997f2e9e"; sha256 = "1jnx39m152hf9j620ygagaydg6h8m8gxkr1fmxj6kgqf71jr0n9d"; }; + meta.homepage = "https://github.com/jhradilek/vim-docbk/"; }; vim-docbk-snippets = buildVimPluginFrom2Nix { @@ -3872,6 +4256,7 @@ let rev = "b8604893f46f6c570a55efff733f0371ac8a805d"; sha256 = "1qz3azgzv9718s2a6h8xw5nrvs4j776csmzsn9chvykdpx8rwim1"; }; + meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; vim-easy-align = buildVimPluginFrom2Nix { @@ -3883,6 +4268,7 @@ let rev = "12dd6316974f71ce333e360c0260b4e1f81169c3"; sha256 = "0gpfdla8shaf5ykgakrsf0h0w6ygvwcv3lfpnki24l790xhdi606"; }; + meta.homepage = "https://github.com/junegunn/vim-easy-align/"; }; vim-easygit = buildVimPluginFrom2Nix { @@ -3894,6 +4280,7 @@ let rev = "9770370a35838f70eda91d0c3006d0563ccc8d2a"; sha256 = "1a42s0nymakz20rjrpwmiqpnlndrkdakzbm53aclzcs61i9zq2k8"; }; + meta.homepage = "https://github.com/neoclide/vim-easygit/"; }; vim-easymotion = buildVimPluginFrom2Nix { @@ -3905,6 +4292,7 @@ let rev = "dd7b4b526775bc8553e16bc402020573b04a948c"; sha256 = "1dhhq1y6xa3q26irclad6254q89xpnxglfd92v3bq01l4p41zcqf"; }; + meta.homepage = "https://github.com/easymotion/vim-easymotion/"; }; vim-easytags = buildVimPluginFrom2Nix { @@ -3916,6 +4304,7 @@ let rev = "72a8753b5d0a951e547c51b13633f680a95b5483"; sha256 = "0i8ha1fa5d860b1mi0xp8kwsgb0b9vbzcg1bldzv6s5xd9yyi12i"; }; + meta.homepage = "https://github.com/xolox/vim-easytags/"; }; vim-eighties = buildVimPluginFrom2Nix { @@ -3927,17 +4316,19 @@ let rev = "1a6ea42ead1e31524ec94cfefb6afc1d8dacd170"; sha256 = "1yh1kny28c7f5qm52y7xd5aj4mycksfb0x1zvcb37c73ycdxc1v2"; }; + meta.homepage = "https://github.com/justincampbell/vim-eighties/"; }; vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2020-03-11"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "088cfc407460dea7b81c10b29db23843f85e7919"; - sha256 = "1w9w4arzlbjhd5kcvyv5fykq9djc4n4j1nc75qqlzsfggbjjwhbk"; + rev = "80f0dae8da035d60a094fd1b04bd5b803790ac2b"; + sha256 = "0gdsrbdj6nciivm4vaiq6kppky622r0wxjk4wb0q92j2dzadwsk9"; }; + meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; vim-elm-syntax = buildVimPluginFrom2Nix { @@ -3949,17 +4340,19 @@ let rev = "846a5929bff5795256fbca96707e451dbc755e36"; sha256 = "05jkx4dbkb646wy0igqpwc55iamm0a030dswhirg6nyl3x6qzgym"; }; + meta.homepage = "https://github.com/andys8/vim-elm-syntax/"; }; vim-endwise = buildVimPluginFrom2Nix { pname = "vim-endwise"; - version = "2019-11-13"; + version = "2020-04-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-endwise"; - rev = "bf90d8be447de667f4532b934d1a70881be56dd8"; - sha256 = "1czx891via5783yk222mhki94wvq75hxxp1xk1d5m90vwqb3azfn"; + rev = "97180a73ad26e1dcc1eebe8de201f7189eb08344"; + sha256 = "1f9nwp9qiip4alkpacwaq2nzsrx80a4cdwyrvajs6lrk48dv4hbw"; }; + meta.homepage = "https://github.com/tpope/vim-endwise/"; }; vim-eunuch = buildVimPluginFrom2Nix { @@ -3971,6 +4364,7 @@ let rev = "33e875b31c8b811a0a47908884a5e2339106bbe8"; sha256 = "1xadb22kd40swmww0qxmmkcpcq6viy8l167pjck5q32hfngll5d3"; }; + meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; vim-exchange = buildVimPluginFrom2Nix { @@ -3982,6 +4376,7 @@ let rev = "05d82b87711c6c8b9b7389bfb91c24bc4f62aa87"; sha256 = "09fa156y8pxpzdbngifa7yzg1vjg1fjsgp1h9inj818zbig8mamb"; }; + meta.homepage = "https://github.com/tommcdo/vim-exchange/"; }; vim-expand-region = buildVimPluginFrom2Nix { @@ -3993,6 +4388,7 @@ let rev = "966513543de0ddc2d673b5528a056269e7917276"; sha256 = "0l30wjlk4vxr16f1njnvf8aw9yg9p9jisvcxbcg3znsq5q8ix6zv"; }; + meta.homepage = "https://github.com/terryma/vim-expand-region/"; }; vim-extradite = buildVimPluginFrom2Nix { @@ -4004,6 +4400,7 @@ let rev = "58c77fffbb5d61eb0b87c8b4ef0ad78e9659d621"; sha256 = "1mm2icx50q5iyhaz1dypnbqh14s1wsnw8skpxcm1klhqn02zk46f"; }; + meta.homepage = "https://github.com/int3/vim-extradite/"; }; vim-fetch = buildVimPluginFrom2Nix { @@ -4015,17 +4412,19 @@ let rev = "dd674b50b261275a6a75cab6929b7bb7c5c4acba"; sha256 = "1hadfzhzkq2n9k3yga55fsl6nm5mgl2vv975jnxsi4qgz9cwcsgr"; }; + meta.homepage = "https://github.com/wsdjeg/vim-fetch/"; }; vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-12-15"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "63d7209ff4f17d4bdc30f3478986b5bd44a47a3e"; - sha256 = "1n0p70w0qmbxffchxsmklraxqrzg1q6bwnp4qhy0xjcz89p3fzx5"; + rev = "6c968f26f0bd3dd04b18fad8761e0e9e1220a3da"; + sha256 = "1x74j3gghfmqh1mxswzhb6d0zdll735r5lrgn4g3z580y15h37w5"; }; + meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; vim-fish = buildVimPluginFrom2Nix { @@ -4037,6 +4436,7 @@ let rev = "50b95cbbcd09c046121367d49039710e9dc9c15f"; sha256 = "1yvjlm90alc4zsdsppkmsja33wsgm2q6kkn9dxn6xqwnq4jw5s7h"; }; + meta.homepage = "https://github.com/dag/vim-fish/"; }; vim-flagship = buildVimPluginFrom2Nix { @@ -4048,17 +4448,19 @@ let rev = "e522bd0ffb0e329f695ead7d4288a6245ff22410"; sha256 = "0vqkdzd7b204kbinn12jk306kc9bn2f0yaifj49swd0g8hv6dk4b"; }; + meta.homepage = "https://github.com/tpope/vim-flagship/"; }; vim-flake8 = buildVimPluginFrom2Nix { pname = "vim-flake8"; - version = "2019-04-03"; + version = "2020-04-05"; src = fetchFromGitHub { owner = "nvie"; repo = "vim-flake8"; - rev = "ce9ac790430699d346aa074d7f339f2e738284e3"; - sha256 = "1dlpmsads32c8v49dqgnz1d06bh0aikgl1xq2whiimm2va9vfjng"; + rev = "0c7cf6dc038223b44e3c0a702fe2acf997768e8a"; + sha256 = "14k1b7gjj1sh40qsf4wxbn0dymmc4jvsrd9pacsr6li273aiy6gq"; }; + meta.homepage = "https://github.com/nvie/vim-flake8/"; }; vim-flatbuffers = buildVimPluginFrom2Nix { @@ -4070,6 +4472,7 @@ let rev = "ecd75c33576d982f3c83545dff7b3c9245285e75"; sha256 = "1mfi9als56cpfsz3s91hg3lci8zn7pr9s0l690wqh40vh57d1gxm"; }; + meta.homepage = "https://github.com/dcharbon/vim-flatbuffers/"; }; vim-flutter = buildVimPluginFrom2Nix { @@ -4081,6 +4484,7 @@ let rev = "030a4e609f8f38922fa4ec9a27836d9dabaae957"; sha256 = "0jibmr0v0pqml1cprs3qmkhhmacpb2bwpk8lhaz4dzp8jlga9g00"; }; + meta.homepage = "https://github.com/thosakwe/vim-flutter/"; }; vim-fsharp = buildVimPluginFrom2Nix { @@ -4092,6 +4496,7 @@ let rev = "012d98c981139976551a4d9779f5cce7f8d84d5c"; sha256 = "0ds300kjhm352ni3fwivsrnc9ls021d2x29f4cdszillamcgs7pw"; }; + meta.homepage = "https://github.com/fsharp/vim-fsharp/"; }; vim-ft-diff_fold = buildVimPluginFrom2Nix { @@ -4103,17 +4508,19 @@ let rev = "89771dffd3682ef82a4b3b3e9c971b9909f08e87"; sha256 = "0bk95cxkfzamlgv1x2jb1bnfas2pmvvqgpn5fvxddf0andm8sfma"; }; + meta.homepage = "https://github.com/thinca/vim-ft-diff_fold/"; }; vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-03-22"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "0e35c9bbc78159318e7b7ffd228f09a96afb8fde"; - sha256 = "098fz3lmfysv6gr5cjwgqsdzxjxygwc0x4ak1sxj3h6djys5x66b"; + rev = "05bbfcd0dc24088f302e7221c7ec000d0ee62982"; + sha256 = "1yrfci26yr02s2728jlk4bd29g1abh8dwps8q9l1pk93rzlchisc"; }; + meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; vim-ghost = buildVimPluginFrom2Nix { @@ -4125,6 +4532,7 @@ let rev = "156f393d9c45a5c9dd16f9316a9ad125da67c449"; sha256 = "0b21yamsfrljk3mfjql0gzsv5mv24qwbs551hxqsapgmrv7j2acg"; }; + meta.homepage = "https://github.com/raghur/vim-ghost/"; }; vim-gist = buildVimPluginFrom2Nix { @@ -4136,6 +4544,7 @@ let rev = "2158eceb210b0a354bc17aa4144554e5d8bb6c79"; sha256 = "1dz33c63q7gghz35hyrvbshqw20faccs7bvxlda5w70mkbz9h9c4"; }; + meta.homepage = "https://github.com/mattn/vim-gist/"; }; vim-gista = buildVimPluginFrom2Nix { @@ -4147,6 +4556,7 @@ let rev = "af13c0062a46d73384f15abee5a54e164fcaad8e"; sha256 = "0f3pxahsaj37iln1k3289h7pj7z4fm0z3vfd0szf1spv3hzcjapd"; }; + meta.homepage = "https://github.com/lambdalisue/vim-gista/"; }; vim-gitbranch = buildVimPluginFrom2Nix { @@ -4158,17 +4568,19 @@ let rev = "8118dc1cdd387bd609852be4bf350360ce881193"; sha256 = "01gvd96mnzfc5s0951zzq122birg5svnximkldgb9kv5bmsnmh3j"; }; + meta.homepage = "https://github.com/itchyny/vim-gitbranch/"; }; vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-03-12"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "0e509fb0ac56b24203800a1fab35162c8da9c9b4"; - sha256 = "0m1vqbgsch4vxs5y8kk03mys2qdzsfik5n0gxp1hl8a7fb3dlqsm"; + rev = "6b46098b2a83becda06586d7c430ffdc4a27db88"; + sha256 = "0q8yvjgxvfjd40f3pspv2kzdcz45q242jfpl948mw74arl0121g8"; }; + meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; vim-github-dashboard = buildVimPluginFrom2Nix { @@ -4180,28 +4592,31 @@ let rev = "8012a2016a9e39a50081c9d5db2deb09ae4a6010"; sha256 = "0jkr6mz5zcpbyswmiyprcbm8l93lkg5sr46r8kyds1n2vz19cf7x"; }; + meta.homepage = "https://github.com/junegunn/vim-github-dashboard/"; }; vim-glsl = buildVimPluginFrom2Nix { pname = "vim-glsl"; - version = "2019-11-01"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "tikhomirov"; repo = "vim-glsl"; - rev = "fbdb226318e3e1747b29f31ad07c0cce07e9f22a"; - sha256 = "076fny258ynamnd1mnknmp1zlafvvxpx7p28985mms84k65ihvy5"; + rev = "36266238d96cd2219769793855a7e915f5e6a32c"; + sha256 = "0vxjbv5qn7lvvpqv1danmkg423cbf7czxzp208zlx9l82vnr24z8"; }; + meta.homepage = "https://github.com/tikhomirov/vim-glsl/"; }; vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-03-20"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "50d52bafa00448ca8cde2b0e05b0fe71c9397762"; - sha256 = "1c8dwllscwxiqp409zy7ajwz84bn8g7p9gldqrhx8i9l7q382z0w"; + rev = "b7edb21cc518a5404b16997df056d560b6ae067f"; + sha256 = "1acwh0kqk7vy0p5vinmm42c4map4qara0590yd6mzc3ym0zyjvi0"; }; + meta.homepage = "https://github.com/fatih/vim-go/"; }; vim-grammarous = buildVimPluginFrom2Nix { @@ -4213,6 +4628,19 @@ let rev = "083cbee6094c9ec347d7c75af421be27d2ec7e70"; sha256 = "1cxycr2ijzxn9d5xgp9ri4f2i4d87a3100nsc11iwa2bzir4xsiz"; }; + meta.homepage = "https://github.com/rhysd/vim-grammarous/"; + }; + + vim-graphql = buildVimPluginFrom2Nix { + pname = "graphql"; + version = "2020-03-30"; + src = fetchFromGitHub { + owner = "jparise"; + repo = "vim-graphql"; + rev = "a3ff39f955e60baeddd8c3c4d1cab291ce37d66e"; + sha256 = "0d98b0zpbyjcafp0q25c3qsx13q74nszxsi5jxxjnpz1wv6s83x1"; + }; + meta.homepage = "https://github.com/jparise/vim-graphql/"; }; vim-grepper = buildVimPluginFrom2Nix { @@ -4224,6 +4652,7 @@ let rev = "dde6a660c7dd4e02b331da238ea477770073aca2"; sha256 = "0c411yg2s6wb8141lqpgasg7iwgvfwy88z6l0c0gccmk8knypxhm"; }; + meta.homepage = "https://github.com/mhinz/vim-grepper/"; }; vim-gui-position = buildVimPluginFrom2Nix { @@ -4235,6 +4664,7 @@ let rev = "065d0dcf96c28cfc0003d72c1b3c49203632f62a"; sha256 = "11kv9kkya9sybslg7lfhhcn2fi3n735zvprg8ch6kd58m82xr4n3"; }; + meta.homepage = "https://github.com/brennanfee/vim-gui-position/"; }; vim-gutentags = buildVimPluginFrom2Nix { @@ -4246,6 +4676,7 @@ let rev = "96cd7dbfe324e8983da68468085967e0b85dc898"; sha256 = "15xvknzy2r178jh0w76cagmxprxsznzk0zgv41h33rns4hy5q1vf"; }; + meta.homepage = "https://github.com/ludovicchabant/vim-gutentags/"; }; vim-hardtime = buildVimPluginFrom2Nix { @@ -4257,6 +4688,7 @@ let rev = "d9128568afa62947b7ac8f12c22d88e3de526a6b"; sha256 = "097wzfh4n4fnsq2gx4hbmyr731ciky8qcai5aiyh2baybvwshmr5"; }; + meta.homepage = "https://github.com/takac/vim-hardtime/"; }; vim-haskellconceal = buildVimPluginFrom2Nix { @@ -4268,6 +4700,7 @@ let rev = "802f82a5afee56e9e1251e6f756104a3bd114234"; sha256 = "1kh6853hi4rgl4z1xs8kz9l1q9w7lh0r42y2m0rabfpr6yh3091r"; }; + meta.homepage = "https://github.com/twinside/vim-haskellconceal/"; }; vim-haskellConcealPlus = buildVimPluginFrom2Nix { @@ -4279,6 +4712,7 @@ let rev = "d59da33c16966f694b2e4f0bfc57515a935da83f"; sha256 = "1y2hgcpls21738lhrgimsxnkhxxqczp05nmk68s28xssbn4dqgma"; }; + meta.homepage = "https://github.com/enomsg/vim-haskellConcealPlus/"; }; vim-hdevtools = buildVimPluginFrom2Nix { @@ -4290,6 +4724,7 @@ let rev = "ab33578bbdbcbd80050faf43e4adee1653fe34dc"; sha256 = "1xvjz6yidcywn1xmdqlxsz68lmkx6rmiqf6q2gfz56pzq1mfmski"; }; + meta.homepage = "https://github.com/bitc/vim-hdevtools/"; }; vim-hier = buildVimPluginFrom2Nix { @@ -4301,6 +4736,7 @@ let rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7"; sha256 = "118pd9sx1bl9vfr89xrf536hfx4l162a43a1qpwpkqxzb9a3ca7n"; }; + meta.homepage = "https://github.com/jceb/vim-hier/"; }; vim-highlightedyank = buildVimPluginFrom2Nix { @@ -4312,6 +4748,7 @@ let rev = "931cc6bd53e4a1fdbe592751f0e13c0e401f0a49"; sha256 = "091qw0zlc80micn29wb6r8m4f7pplcv8bx1yfvbn3cba77qyj3nb"; }; + meta.homepage = "https://github.com/machakann/vim-highlightedyank/"; }; vim-hindent = buildVimPluginFrom2Nix { @@ -4323,6 +4760,7 @@ let rev = "f8e84c199fd00a3ccaf5bbbc97786bde9a4faa13"; sha256 = "1y4nnz38zal1ffs5n751dn9p9apk8q7pq3cw79r5z6fsdp942ai6"; }; + meta.homepage = "https://github.com/alx741/vim-hindent/"; }; vim-hoogle = buildVimPluginFrom2Nix { @@ -4334,6 +4772,7 @@ let rev = "871d104c92e33cb238506f2805f1652561978cc8"; sha256 = "17qvi57g72ijgk7nczczli3kcphvdf625fzqbqcmqpsawgvfd07n"; }; + meta.homepage = "https://github.com/Twinside/vim-hoogle/"; }; vim-html-template-literals = buildVimPluginFrom2Nix { @@ -4345,6 +4784,7 @@ let rev = "3b370b69bce94bdeb0ca7137f548356f775cadcc"; sha256 = "1wmyxscyqs6344jsn839dyrx7k3iiwv07ic9gxh5d93g5s3c3pml"; }; + meta.homepage = "https://github.com/jonsmithers/vim-html-template-literals/"; }; vim-husk = buildVimPluginFrom2Nix { @@ -4356,6 +4796,7 @@ let rev = "ad89559ff8a6c4b1e94a18b2d494a69a1f701d08"; sha256 = "09kqzaqa4jdh31q0a3nxbx9li7zg890qxh68rfzblzyx22xv4mka"; }; + meta.homepage = "https://github.com/vim-utils/vim-husk/"; }; vim-hybrid-material = buildVimPluginFrom2Nix { @@ -4367,6 +4808,7 @@ let rev = "f2e92ac7e5c4bb75d72f0abaea939e4364e00e2e"; sha256 = "01b9n598106qh68ky3fykczq13pldi221r7lrxvg0vnv2zp1z5qd"; }; + meta.homepage = "https://github.com/kristijanhusak/vim-hybrid-material/"; }; vim-iced-coffee-script = buildVimPluginFrom2Nix { @@ -4378,6 +4820,7 @@ let rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; sha256 = "14yfirny359rlrr082il2ys3hxiyrbbk794rdxrs2lasjy8rb1f7"; }; + meta.homepage = "https://github.com/noc7c9/vim-iced-coffee-script/"; }; vim-illuminate = buildVimPluginFrom2Nix { @@ -4389,6 +4832,7 @@ let rev = "80dafb9b0e7b9f4ce7c843d4104f455c8c5b1f42"; sha256 = "1yijaj1dqfmw4dsdmgj01sxizyraisxwjqh2hhbq93pdln4lm51f"; }; + meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; vim-indent-guides = buildVimPluginFrom2Nix { @@ -4400,6 +4844,7 @@ let rev = "54d889a63716ee2f1818aa2ec5082db47147147b"; sha256 = "0ahlbjv2ibhhnf9zqn85b2sh3wf9l0kmg2qmavz3z5fmf8sqljj2"; }; + meta.homepage = "https://github.com/nathanaelkane/vim-indent-guides/"; }; vim-indent-object = buildVimPluginFrom2Nix { @@ -4411,6 +4856,7 @@ let rev = "5c5b24c959478929b54a9e831a8e2e651a465965"; sha256 = "1kmwnz0jxjkvfzy06r7r73pcxfcyjp8p8m2d6qrhjfvzidgfhw19"; }; + meta.homepage = "https://github.com/michaeljsmith/vim-indent-object/"; }; vim-indentwise = buildVimPluginFrom2Nix { @@ -4422,6 +4868,7 @@ let rev = "608bd6876d3b56d469e0e615eb774a6e06095dbf"; sha256 = "0bnzk1afi88icq58389nxqz196gkxcj71qrxvw87d72h2zaspvcx"; }; + meta.homepage = "https://github.com/jeetsukumaran/vim-indentwise/"; }; vim-indexed-search = buildVimPluginFrom2Nix { @@ -4433,6 +4880,7 @@ let rev = "5af020bba084b699d0453f242d7d76711d64b1e3"; sha256 = "0cq265yqksh7jqazxn7qxr7bclrk2pq7py4c29wspsvbi0m3m8rc"; }; + meta.homepage = "https://github.com/henrik/vim-indexed-search/"; }; vim-ipython = buildVimPluginFrom2Nix { @@ -4444,6 +4892,7 @@ let rev = "42499f094b805b90b683afa5009cee99abd0bb75"; sha256 = "10wpfvfs8yv1bvzra4d5zy5glp62gbalpayxx7mkalhr2ccppy3x"; }; + meta.homepage = "https://github.com/ivanov/vim-ipython/"; }; vim-isort = buildVimPluginFrom2Nix { @@ -4455,6 +4904,7 @@ let rev = "b749d009075a333634dc61a039a2dc0e7f34609c"; sha256 = "1h8s21kwbjdg632jvd46r2va7il4f1dbgwfw8fkds0n08rbnpdjw"; }; + meta.homepage = "https://github.com/fisadev/vim-isort/"; }; vim-janah = buildVimPluginFrom2Nix { @@ -4466,28 +4916,31 @@ let rev = "3b8ae976987b6ade2abeac25f0208e8bc90d7138"; sha256 = "16bygyri9qxyhl8n8md945wwy1i9lss4hwxa7yjl9ms2fzzragv4"; }; + meta.homepage = "https://github.com/mhinz/vim-janah/"; }; vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2019-12-17"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "dc7951895a98c49c39622f65cdd7b39374c348bc"; - sha256 = "1d8xiiwfg5wz57jyy7ahbi2bl5sjkhkpkqm2qbhsn7cd9vk36sxy"; + rev = "3ebc63c4b79eec08eb81bdddc8f4c7cfe9cb702f"; + sha256 = "0dwgqnjcnnyvmrplbxkzmfyrm0rgd4z5kgx5989c528gp0dwhaja"; }; + meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; vim-javascript = buildVimPluginFrom2Nix { pname = "vim-javascript"; - version = "2020-01-24"; + version = "2020-04-13"; src = fetchFromGitHub { owner = "pangloss"; repo = "vim-javascript"; - rev = "db595656304959dcc3805cf63ea9a430e3f01e8f"; - sha256 = "0lr0506zbax41xdbfgmm70iiyqi6g8lsmwfy9112fnd9n62s32yd"; + rev = "c3966153e81bc3766b1627e6ab0cd53333b61c1e"; + sha256 = "1sbd5a06linzkx59lndfw27r66ng2bfm4pgn2cgjlcsjmkbcgakn"; }; + meta.homepage = "https://github.com/pangloss/vim-javascript/"; }; vim-javascript-syntax = buildVimPluginFrom2Nix { @@ -4499,6 +4952,7 @@ let rev = "e65e4f01ba94761323450208c9bf7141428784db"; sha256 = "09561jf3cmzpm8jn8k34fd3av6i1mqi6n32bisri96jkabw8dpv7"; }; + meta.homepage = "https://github.com/jelera/vim-javascript-syntax/"; }; vim-jinja = buildVimPluginFrom2Nix { @@ -4510,6 +4964,7 @@ let rev = "8d330a7aaf0763d080dc82204b4aaba6ac0605c6"; sha256 = "1n62ga02rcj7jjgzvwr46pckj59dc1zqahjgampjcwdd8vf4mg3q"; }; + meta.homepage = "https://github.com/lepture/vim-jinja/"; }; vim-jsbeautify = buildVimPluginFrom2Nix { @@ -4522,6 +4977,7 @@ let sha256 = "06gxmqyxkw2mgdy6m7b248w0gzkwsjcpyihpnyf5cajb5aw4wk13"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/maksimr/vim-jsbeautify/"; }; vim-jsdoc = buildVimPluginFrom2Nix { @@ -4533,6 +4989,7 @@ let rev = "b23073449d1df98ecfe73828079115e0d1d7573b"; sha256 = "0r91lr3gpjbaalqln7k8kv4q88w9rclfyji87yzmnr3apjaazyjj"; }; + meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; vim-json = buildVimPluginFrom2Nix { @@ -4544,6 +5001,7 @@ let rev = "3727f089410e23ae113be6222e8a08dd2613ecf2"; sha256 = "1c19pqrys45pzflj5jyrm4q6hcvs977lv6qsfvbnk7nm4skxrqp1"; }; + meta.homepage = "https://github.com/elzr/vim-json/"; }; vim-jsonnet = buildVimPluginFrom2Nix { @@ -4555,17 +5013,19 @@ let rev = "b7459b36e5465515f7cf81d0bb0e66e42a7c2eb5"; sha256 = "0fc6xpiyxly3ibs4lzn6dk9yd2cc353qb8lavag7zmims1bncvqf"; }; + meta.homepage = "https://github.com/google/vim-jsonnet/"; }; vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2020-03-14"; + version = "2020-04-11"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "05f9953fcaccc18a8f5c1ee9db06ac2b26662347"; - sha256 = "1l9rpymz6xb9x0kd8p90hyl4yjn59sf590kmi18cvr4piaqa796y"; + rev = "496c44d89281d1e13c9bb4c75a2e69daba48b47b"; + sha256 = "09xr8pbx27qpffcr0j1857cpyxgkv5xay6mgpzvynpxq21xrmm3q"; }; + meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/"; }; vim-kitty-navigator = buildVimPluginFrom2Nix { @@ -4577,6 +5037,7 @@ let rev = "c32357892f10117291461631d51a6bfd20e72b9a"; sha256 = "0zqvcnbns0vbxkqr0mpiapql8cvp54nn5a6mwc7l24jr6plhiwmn"; }; + meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; vim-lastplace = buildVimPluginFrom2Nix { @@ -4588,6 +5049,7 @@ let rev = "48ba343c8c1ca3039224727096aae214f51327d1"; sha256 = "0m8skd86p2cr0wz8rghj4is3fgnlh7vrw7can916li35i3hajid2"; }; + meta.homepage = "https://github.com/farmergreg/vim-lastplace/"; }; vim-latex-live-preview = buildVimPluginFrom2Nix { @@ -4599,6 +5061,7 @@ let rev = "855c30915547c7e9c19b7e6efb528730c071d2e8"; sha256 = "14fgbq7wyyhhzkd8832g07z97jg1b9awibzf3sn33ih7p5bb3hhp"; }; + meta.homepage = "https://github.com/xuhdev/vim-latex-live-preview/"; }; vim-lawrencium = buildVimPluginFrom2Nix { @@ -4610,6 +5073,7 @@ let rev = "e0c127cb4e4224453cb88faffd4627b7da499bcb"; sha256 = "1gvvr04x17157iz83rv45nlbj1qaz90j0l96q3fki3h1b0fw0099"; }; + meta.homepage = "https://github.com/ludovicchabant/vim-lawrencium/"; }; vim-leader-guide = buildVimPluginFrom2Nix { @@ -4621,6 +5085,7 @@ let rev = "8dff63fcc29811bb30fccb135f31ad488a9a6170"; sha256 = "1n1qgvr729r28rprjkam0blh4qscs8bxf6ay7v8x732axg9gpyav"; }; + meta.homepage = "https://github.com/hecal3/vim-leader-guide/"; }; vim-lean = buildVimPluginFrom2Nix { @@ -4632,17 +5097,19 @@ let rev = "02d678e4346dce35d6b2eed9a03b2b2d3cc84127"; sha256 = "1yw13wf7j92gk8fwkhls6bdbz2h7xbyq4qba8zsfm76rbqn7vzfg"; }; + meta.homepage = "https://github.com/mk12/vim-lean/"; }; vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2019-11-11"; + version = "2020-03-30"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "fba44d7bab381b2107f9c6db0322282910e98267"; - sha256 = "1scv9zscvywr40rw6z1v4vsgq8j8mfvp1hxs6ana22wbm0qdwkrf"; + rev = "47186eb47f543becc34a048a37298954d89bf7c8"; + sha256 = "0265614sa2d2s3xpzfliq159v7bmdvlc9yyw5c89pqv4b86gjxzf"; }; + meta.homepage = "https://github.com/ledger/vim-ledger/"; }; vim-lion = buildVimPluginFrom2Nix { @@ -4654,6 +5121,7 @@ let rev = "75306ac1922952ca1a401aee43ddbb304029926d"; sha256 = "0kkf91ppn5jhvnpmmjsp6rvf97pqj57jrbn3qmmy925ncfqh90ld"; }; + meta.homepage = "https://github.com/tommcdo/vim-lion/"; }; vim-liquid = buildVimPluginFrom2Nix { @@ -4665,6 +5133,7 @@ let rev = "9ebc192daec70e620c22d574b5a1c1e16f89a48c"; sha256 = "0cvcjiii5wv55n695284k520rrwi0l4gqpyiqnrpnhmsaqks0n0f"; }; + meta.homepage = "https://github.com/tpope/vim-liquid/"; }; vim-localvimrc = buildVimPluginFrom2Nix { @@ -4676,6 +5145,7 @@ let rev = "fc2f789ce7afa4bbdefbbb4599a802b39b7e7596"; sha256 = "19drgnsn4rb9kv30ykndwjgflsfs328dhm44a9hcp8f8faqpim3d"; }; + meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; vim-logreview = buildVimPluginFrom2Nix { @@ -4687,28 +5157,31 @@ let rev = "b7b66ab338e904127d796af49235b8c29742f18f"; sha256 = "09lyymq0f3ybqdzhbpia7b0wcjbcyg5nkqd72qk8jkvc42da2af3"; }; + meta.homepage = "https://github.com/andreshazard/vim-logreview/"; }; vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-03-22"; + version = "2020-04-13"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "3dd7a19e8689847956266e0be1bbfb4ca12da746"; - sha256 = "0dj1b8v9iz67m833x1z3s7jac0jpfxgs43ylc6m0v3al67qcb0mj"; + rev = "fb8056a305a4e3221304ca1483231b6960de5321"; + sha256 = "0glg6225h84ahabahb9q5inipbbi7shcx5y44s8r2gyaqw1l773p"; }; + meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2020-03-20"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "b31525d7f6170c68f900abe24748ac9fbaf1ee4d"; - sha256 = "0d6qss18dq36hvxv1if1aaylljsnp2isxajb5xh4zr4cxarrzbfi"; + rev = "f630b985facf383ae1657d569ff69582224cca04"; + sha256 = "1v0f9l12afr4kh6d9sdyl5fxvcgz0c018vll5932pfcrlwhkvdd3"; }; + meta.homepage = "https://github.com/google/vim-maktaba/"; }; vim-manpager = buildVimPluginFrom2Nix { @@ -4720,6 +5193,7 @@ let rev = "25bdd9448651a7669659b1b8d8d7a82acdfbf8af"; sha256 = "0d7rg4lvyxr4v34bimxpdkynmvs606fqvv0qpi7g139ng9hv6wqm"; }; + meta.homepage = "https://github.com/lambdalisue/vim-manpager/"; }; vim-markdown = buildVimPluginFrom2Nix { @@ -4731,6 +5205,7 @@ let rev = "da5a7ac96f517e0fd6f886bc3fbe27156ca1f946"; sha256 = "198bsv88njz6l2pf9yjxb8292aj7x8n2sxi50q3cdsg29a3y2i5c"; }; + meta.homepage = "https://github.com/plasticboy/vim-markdown/"; }; vim-mergetool = buildVimPluginFrom2Nix { @@ -4742,6 +5217,7 @@ let rev = "0275a85256ad173e3cde586d54f66566c01b607f"; sha256 = "1i3zil06zyndm400i2pfn64ykbs29fw8l720229a8ypp9mxcibcp"; }; + meta.homepage = "https://github.com/samoshkin/vim-mergetool/"; }; vim-metamath = buildVimPluginFrom2Nix { @@ -4753,6 +5229,7 @@ let rev = "50aff63608256909159f1b8fc3f09ba61b2bb9bd"; sha256 = "0gwqafhr18wv9ygq47cxwi0k4gj1xll4z8s61w9l9vwaiy5znssh"; }; + meta.homepage = "https://github.com/david-a-wheeler/vim-metamath/"; }; vim-misc = buildVimPluginFrom2Nix { @@ -4764,6 +5241,7 @@ let rev = "3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0b"; sha256 = "0rd9788dyfc58py50xbiaz5j7nphyvf3rpp3yal7yq2dhf0awwfi"; }; + meta.homepage = "https://github.com/xolox/vim-misc/"; }; vim-monokai-pro = buildVimPluginFrom2Nix { @@ -4775,6 +5253,7 @@ let rev = "c18f35725a5b0d569bfe6921fc4f56c029324828"; sha256 = "1nz8jnlhd6z9zqa9dfbxa9fabihpzz8ajlf4plkaxdy9137z1zqc"; }; + meta.homepage = "https://github.com/phanviet/vim-monokai-pro/"; }; vim-move = buildVimPluginFrom2Nix { @@ -4786,6 +5265,7 @@ let rev = "58049562efb0e6e077416d897b760c4dc9bb25c4"; sha256 = "18pnk6ri73a6dq86zh510wy1s0z1dwnsyay7lxrgirjgh3s9nhhq"; }; + meta.homepage = "https://github.com/matze/vim-move/"; }; vim-mucomplete = buildVimPluginFrom2Nix { @@ -4797,6 +5277,7 @@ let rev = "f13357964cc074d4fe747787065bfb19046f7fce"; sha256 = "0kqik4xgnk3cw7ls53djij086rbp49klzckc4zs4ph4cjwcpjhgq"; }; + meta.homepage = "https://github.com/lifepillar/vim-mucomplete/"; }; vim-multiple-cursors = buildVimPluginFrom2Nix { @@ -4808,6 +5289,7 @@ let rev = "701e92dd4cfd1b0f511e83a96d52bc590c0218dd"; sha256 = "0a7fghk025f8gj5rsixi1hn8vkg2982fja7maf427v3wq74s6j1c"; }; + meta.homepage = "https://github.com/terryma/vim-multiple-cursors/"; }; vim-nerdtree-tabs = buildVimPluginFrom2Nix { @@ -4819,6 +5301,7 @@ let rev = "07d19f0299762669c6f93fbadb8249da6ba9de62"; sha256 = "16iqhp5l6xvq0k8bq9ngqfhish1fwggpmvd7ni1fh5dqr00iii9x"; }; + meta.homepage = "https://github.com/jistr/vim-nerdtree-tabs/"; }; vim-nftables = buildVimPluginFrom2Nix { @@ -4830,6 +5313,7 @@ let rev = "01c7b97eff12fd4b624e6efa2c0468163db61ebc"; sha256 = "1n3mpaa60k4w0sqpkgw19aksa1sbcqz7vl8fp6bj6i63bhiprsqf"; }; + meta.homepage = "https://github.com/nfnty/vim-nftables/"; }; vim-niceblock = buildVimPluginFrom2Nix { @@ -4841,6 +5325,7 @@ let rev = "9302f527eefc0fde8df983cbb9710ad52c4213b5"; sha256 = "1d0rx7s10jl1q9y5s4235imizbyxrgkm4dxh5ankcr8s617l7mz2"; }; + meta.homepage = "https://github.com/kana/vim-niceblock/"; }; vim-ninja-feet = buildVimPluginFrom2Nix { @@ -4852,6 +5337,7 @@ let rev = "5b48f97bf4865a25f5f4568c45cdfd08f946ec4f"; sha256 = "1i3n5nlwyg65k0f0qrimbfs67l2xx39cqp4gyrycw4vzp6hs0lsc"; }; + meta.homepage = "https://github.com/tommcdo/vim-ninja-feet/"; }; vim-nix = buildVimPluginFrom2Nix { @@ -4863,6 +5349,7 @@ let rev = "a3eed01f4de995a51dfdd06287e44fcb231f6adf"; sha256 = "0pwdfwws1dj3705m00ghw3dvym5zbm00bfsj023gmbp6vr8wn6yi"; }; + meta.homepage = "https://github.com/LnL7/vim-nix/"; }; vim-obsession = buildVimPluginFrom2Nix { @@ -4874,6 +5361,7 @@ let rev = "96a3f837c112cb64e0a9857b69f6d6a71041155e"; sha256 = "11h7jyg7fhjmq3pmpc93nrsxm175ra14407rs3558h8p04snc159"; }; + meta.homepage = "https://github.com/tpope/vim-obsession/"; }; vim-one = buildVimPluginFrom2Nix { @@ -4885,6 +5373,7 @@ let rev = "6695e135415c53a8fbe96672e382200aa1ffb4b4"; sha256 = "0951r9kw23zlwd7fda6ib2d9k0akpfd2hvh82pasgw3ks9v1n2vf"; }; + meta.homepage = "https://github.com/rakr/vim-one/"; }; vim-operator-replace = buildVimPluginFrom2Nix { @@ -4896,6 +5385,7 @@ let rev = "1345a556a321a092716e149d4765a5e17c0e9f0f"; sha256 = "07cibp61zwbzpjfxqdc77fzrgnz8jhimmdhhyjr0lvgrjgvsnv6q"; }; + meta.homepage = "https://github.com/kana/vim-operator-replace/"; }; vim-operator-surround = buildVimPluginFrom2Nix { @@ -4907,6 +5397,7 @@ let rev = "80337a40a829cfc77b065a71d8a609e2ad7d2c8b"; sha256 = "0f9shg81bl39hz67ahbi6k6gbhky7gzp8by16fhiz75hbjgp9lq2"; }; + meta.homepage = "https://github.com/rhysd/vim-operator-surround/"; }; vim-operator-user = buildVimPluginFrom2Nix { @@ -4918,6 +5409,7 @@ let rev = "c3dfd41c1ed516b4b901c97562e644de62c367aa"; sha256 = "16y2fyrmwg4vkcl85i8xg8s6m39ca2jvgi9qm36b3vzbnkcifafb"; }; + meta.homepage = "https://github.com/kana/vim-operator-user/"; }; vim-orgmode = buildVimPluginFrom2Nix { @@ -4929,6 +5421,7 @@ let rev = "44faafa1d846691645b66e83f198f46afa755a6e"; sha256 = "1s649hksrwq70xyi8cvcd9bqcfyczga5c1g4fsas50rs107fcccn"; }; + meta.homepage = "https://github.com/jceb/vim-orgmode/"; }; vim-pager = buildVimPluginFrom2Nix { @@ -4940,17 +5433,19 @@ let rev = "a657d508b4d5a23aada7585c9f1e0063914c0c45"; sha256 = "10xm77pia916zf9i2llyhs89s653r98l6zq8cswm7cw61bjfxvv6"; }; + meta.homepage = "https://github.com/lambdalisue/vim-pager/"; }; vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2020-03-20"; + version = "2020-04-17"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "c473c298d570622d520f455698a95356e55d6dcf"; - sha256 = "1j4plsm7md6yhis8bmgznwln12gnnm0lg9wvxgydqd6wxrc6hfnd"; + rev = "c6e2ddb1318cc141b2d84d630e493a14df942ea1"; + sha256 = "15ci141jiv84ibrg1v98as1k376cnx06p1zp50w1qmccv696n8nv"; }; + meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; vim-pandoc-after = buildVimPluginFrom2Nix { @@ -4962,6 +5457,7 @@ let rev = "26513a138d5e2ba8c785e0d7dfec0218e983e9dd"; sha256 = "07wg4j2kx08s9hvvp8jspwb0v7fgac8m8cjr3y1sbq8ca18bkvgy"; }; + meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-after/"; }; vim-pandoc-syntax = buildVimPluginFrom2Nix { @@ -4973,6 +5469,7 @@ let rev = "0d1129e5cf1b0e3a90e923c3b5f40133bf153f7c"; sha256 = "162l2p8md8lfyfjxzlmlz5ky5kvvr6wjmdk8r8lk6ygpkl2b51f7"; }; + meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; vim-parinfer = buildVimPluginFrom2Nix { @@ -4984,6 +5481,7 @@ let rev = "a8c075ce5256bffbf1f62e08aba37dca88d0cf1a"; sha256 = "1v2pyjyxvqw2kl9j4pdpdlbl2q3jnndcb8iqgyygs7jn91c4s073"; }; + meta.homepage = "https://github.com/bhurlow/vim-parinfer/"; }; vim-pasta = buildVimPluginFrom2Nix { @@ -4995,6 +5493,7 @@ let rev = "cb4501a123d74fc7d66ac9f10b80c9d393746c66"; sha256 = "14rswwx24i75xzgkbx1hywan1msn2ki26353ly2pyvznnqss1pwq"; }; + meta.homepage = "https://github.com/sickill/vim-pasta/"; }; vim-pathogen = buildVimPluginFrom2Nix { @@ -5006,6 +5505,7 @@ let rev = "c6bc42404597c718e4a032a98e21e63321cbb05a"; sha256 = "1scj84vlrn2kavnq2wabhdzhnlkb3w046grv9j3976i5ykjmyiif"; }; + meta.homepage = "https://github.com/tpope/vim-pathogen/"; }; vim-peekaboo = buildVimPluginFrom2Nix { @@ -5017,6 +5517,7 @@ let rev = "cc4469c204099c73dd7534531fa8ba271f704831"; sha256 = "11lgf60v2kj772d9azkfddypwidcgfps5mvnhmp4gg0fmfx12h99"; }; + meta.homepage = "https://github.com/junegunn/vim-peekaboo/"; }; vim-pencil = buildVimPluginFrom2Nix { @@ -5028,6 +5529,7 @@ let rev = "09458527601fdb2fbd174317bdddfb34e4c64e79"; sha256 = "09b30cxlwbr9l07ya05is9q2y9vzbzhcc656nvjjzf968l496xr2"; }; + meta.homepage = "https://github.com/reedes/vim-pencil/"; }; vim-phabricator = buildVimPluginFrom2Nix { @@ -5039,6 +5541,7 @@ let rev = "065c7e3f2d92a6792b50f087393b2c9a10a1e825"; sha256 = "0yhf347fhrs0aqsq1swqihyav32442lv2chzjr3mzqcym8zbzsh6"; }; + meta.homepage = "https://github.com/jparise/vim-phabricator/"; }; vim-pico8-syntax = buildVimPluginFrom2Nix { @@ -5050,17 +5553,19 @@ let rev = "dbdd92fad0533eeaeaea844815d4de11e9507ce7"; sha256 = "0say0bb74rdbabgsf7rrbm8x841pmgh80fwr6kn94fgphr3vhm0s"; }; + meta.homepage = "https://github.com/justinj/vim-pico8-syntax/"; }; vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-01-27"; + version = "2020-04-11"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "c3b6b7c2971da730d66f6955d5c467db8dae536b"; - sha256 = "088jyadfssgyyfb588vahskszbxm1vygp5dxkky7njs6v3g8lk5v"; + rev = "e718868e85e2a32410144dfcdc3ba1303719450d"; + sha256 = "1znaapjdz9nwgvr5il6rck82mz4dhj1nan87w2216xwpp53w61fb"; }; + meta.homepage = "https://github.com/junegunn/vim-plug/"; }; vim-plugin-AnsiEsc = buildVimPluginFrom2Nix { @@ -5072,17 +5577,19 @@ let rev = "690f820d20b6e3a79ba20499874eb7333aa4ca5c"; sha256 = "05sf9xh7zs475kykz1hsp0xp7iiclp7pdiy3bpx7wlfp9z71bd9p"; }; + meta.homepage = "https://github.com/powerman/vim-plugin-AnsiEsc/"; }; vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-03-05"; + version = "2020-04-14"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "e86e0ad36ef9501acbc3e8c63a1d4fab104e47cb"; - sha256 = "0xr0fv26bxas315bvz0fkw11cg5j301vmy02a2aii90ljvyviv77"; + rev = "14dc82fc4e6c0c08078f97a24a6c1639c1cc5113"; + sha256 = "0cx9wvv8ca589wna7yy0qx0hc0c9g42y50fxa0y7vyw3wwkq8q7n"; }; + meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; vim-prettyprint = buildVimPluginFrom2Nix { @@ -5094,6 +5601,7 @@ let rev = "d6060d2b1ff1cff71714e126addd3b10883ade12"; sha256 = "0mb1ylsq4023ik9wd9iwzlynra2c320xp9h2i79bspapglgd5gk9"; }; + meta.homepage = "https://github.com/thinca/vim-prettyprint/"; }; vim-projectionist = buildVimPluginFrom2Nix { @@ -5105,17 +5613,19 @@ let rev = "17a8b2078a9ca1410d2080419e1cb9c9bb2e4492"; sha256 = "1vf3jdcfiq27k9mdwlvsm2hn1xgxr79ckq3jqq00avj50bpdzs1z"; }; + meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; vim-prosession = buildVimPluginFrom2Nix { pname = "vim-prosession"; - version = "2019-11-01"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-prosession"; - rev = "84df77d6470491a67f926b9a6a6a8cc675c161ac"; - sha256 = "03p5ncdah3mxd2dxrqprd14gzyy2qlvf9y5hcsdcakf2hhsrxvlg"; + rev = "95f78bd0f719fee96569f30fd5f4199c4461efb7"; + sha256 = "1ix04f3nxxmxd36kzalx0hrbks30v44ydz15apvl1h8l8663hda2"; }; + meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; vim-protobuf = buildVimPluginFrom2Nix { @@ -5127,17 +5637,19 @@ let rev = "0d0f4e4b4087e0e608066aa2ba295e396d039931"; sha256 = "1vh9f34rb7pg6dc64xhr102yig6y03is74777av464bhq651z7p5"; }; + meta.homepage = "https://github.com/uarun/vim-protobuf/"; }; vim-ps1 = buildVimPluginFrom2Nix { pname = "vim-ps1"; - version = "2020-03-15"; + version = "2020-03-30"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "2decf51f19834434e34f1a8d79056b7014120ca3"; - sha256 = "1hph6w6mrlma96ys1nk9v46hscmplkpp2y7xq1ld2bnfs4wab3v8"; + rev = "9fdf92846fbeb8445e535cf0c5bdb4b1dce4a506"; + sha256 = "0w98zcjvb64fhd6ahy3cqrs4y7zacak9nzpkkhr03l6zzbqb5kz4"; }; + meta.homepage = "https://github.com/PProvost/vim-ps1/"; }; vim-pug = buildVimPluginFrom2Nix { @@ -5149,6 +5661,7 @@ let rev = "ea39cd942cf3194230cf72bfb838901a5344d3b3"; sha256 = "07141jkfnaia4ydc6qcg0bc06w720l2lzl7bm4bsjwswqrzmhfam"; }; + meta.homepage = "https://github.com/digitaltoad/vim-pug/"; }; vim-puppet = buildVimPluginFrom2Nix { @@ -5160,17 +5673,19 @@ let rev = "fc6e9efef797c505b2e67631ad2517d7d6e8f00d"; sha256 = "0a4qv8f74g6c2i9l6kv3zbcq9lskhdqg86w12f8hshw1vkfmfr4x"; }; + meta.homepage = "https://github.com/rodjek/vim-puppet/"; }; vim-python-pep8-indent = buildVimPluginFrom2Nix { pname = "vim-python-pep8-indent"; - version = "2019-05-13"; + version = "2020-03-20"; src = fetchFromGitHub { - owner = "hynek"; + owner = "Vimjas"; repo = "vim-python-pep8-indent"; - rev = "b3a7395ce49b13145bbb54b1cdbfe6a33585bfe9"; - sha256 = "0gkbjcwdizqivsrn0p1gdn1170jimkk1vyxhyr286nb5qxj2n8hh"; + rev = "60ba5e11a61618c0344e2db190210145083c91f8"; + sha256 = "1blyhkykfnf4pgfq9hn9l8pq0iqdvig9m4zd8qq9aa9rlm8f0kzh"; }; + meta.homepage = "https://github.com/Vimjas/vim-python-pep8-indent/"; }; vim-qml = buildVimPluginFrom2Nix { @@ -5182,6 +5697,7 @@ let rev = "b04de1dadb7dfe372d22f7529a001af1b5e19f4f"; sha256 = "1pxl70l0g4i8cbnpjhb9pyjhz982flkrng07y9xwzbdl2jx42i8s"; }; + meta.homepage = "https://github.com/peterhoeg/vim-qml/"; }; vim-quickrun = buildVimPluginFrom2Nix { @@ -5193,6 +5709,7 @@ let rev = "f637c35b16d6e83cc71dababbda2a64eb29b3f5e"; sha256 = "0yf9acqcj3x62qchz0z9mwgf1af5vz39kyzhv5jh1mc0vwksrdwl"; }; + meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; vim-racer = buildVimPluginFrom2Nix { @@ -5204,6 +5721,7 @@ let rev = "950b78f36e568134f5dcabc9a146c61e0084d220"; sha256 = "0k62yybilh2052w6zfscw7daz7y1qnqv1311zngjim5z8xmp7j1l"; }; + meta.homepage = "https://github.com/racer-rust/vim-racer/"; }; vim-repeat = buildVimPluginFrom2Nix { @@ -5215,6 +5733,7 @@ let rev = "c947ad2b6a16983724a0153bdf7f66d7a80a32ca"; sha256 = "00hhbqcx21j0738ad5xh92lsykpa0qxhdy1s7wnwc8d3jndmyjwb"; }; + meta.homepage = "https://github.com/tpope/vim-repeat/"; }; vim-rhubarb = buildVimPluginFrom2Nix { @@ -5226,17 +5745,19 @@ let rev = "5130596a65330a4e8523d3ac1582f6c31ea6bc63"; sha256 = "1hpyxcmwrjxhkgkb0w2qpg8gh9bgiqwddyj4zx8hy2g8qnx7z5yj"; }; + meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; vim-rooter = buildVimPluginFrom2Nix { pname = "vim-rooter"; - version = "2020-02-17"; + version = "2020-04-17"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "8a0a201a17fae3f7656b99f74d67741986faba37"; - sha256 = "1r8kzzljs39ycc6jjh5anpl2gw73c2wb1bs8hjv6xnw1scln6gwq"; + rev = "d64f3e04df9914e784508019a1a1f291cbb40bd4"; + sha256 = "1vwydkjm5h12kcnqmg2cv1cqf9hmhmyy2lx5lj3g0g6ra27yfjnw"; }; + meta.homepage = "https://github.com/airblade/vim-rooter/"; }; vim-rsi = buildVimPluginFrom2Nix { @@ -5248,17 +5769,19 @@ let rev = "ad8ba6beae8e82339479104b914214a868c9f1fe"; sha256 = "1ycjwnbs6rks78yxh0k0ywpvic0663mv7kydy3kjpa4f5bnkgbvc"; }; + meta.homepage = "https://github.com/tpope/vim-rsi/"; }; vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2020-02-13"; + version = "2020-04-19"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "fbf85d106a2c3979ed43d6332b8c26a72542754d"; - sha256 = "02k6l6wykw7i26fz2avjrpgml79hy4rrr2x9106g84nc5vimswn0"; + rev = "fd49b25e08618b58db678c3f8ce6e443b1ad04e7"; + sha256 = "086pzicqal2cmvbrzy09d93c7cz5scgjcqc9xn4cw19dn55irllp"; }; + meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; vim-salve = buildVimPluginFrom2Nix { @@ -5270,6 +5793,7 @@ let rev = "876104d364420a7a11a2d97729dd4ab0a2f8a72e"; sha256 = "1hj0qg182jv3cwg85rg4z0f8f8hr409is71z7sxhnhjq9fn1h6xj"; }; + meta.homepage = "https://github.com/tpope/vim-salve/"; }; vim-sandwich = buildVimPluginFrom2Nix { @@ -5281,6 +5805,7 @@ let rev = "02e3b6d1ff9ce346c115166855137b318b63c536"; sha256 = "1jd5i0ykvwf5jnm3g3rm2r0zn64xqk38p2xl55la9a1a99j9mfxh"; }; + meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; vim-sayonara = buildVimPluginFrom2Nix { @@ -5292,6 +5817,7 @@ let rev = "357135ce127581fab2c0caf45d4b3fec4603aa77"; sha256 = "0m4pbpqq7m4rbqj1sxzx3r25znm9m5df6z6kndc6x5c1p27a63pi"; }; + meta.homepage = "https://github.com/mhinz/vim-sayonara/"; }; vim-scala = buildVimPluginFrom2Nix { @@ -5303,6 +5829,7 @@ let rev = "bbdfea4b98fdb8866a8a6060ec1294643cfeb413"; sha256 = "14q8j6vwqad2nwia29d0844v2zdcx04xn9dyicv13sdpivzcm4rb"; }; + meta.homepage = "https://github.com/derekwyatt/vim-scala/"; }; vim-scouter = buildVimPluginFrom2Nix { @@ -5314,6 +5841,7 @@ let rev = "5221901d4ad6b2ef8b370b336db2aa7f69f2b6dc"; sha256 = "0fx64hj1kzrsxz96195d5lm3x88zyycbcr78819mcbgfzyxis6b8"; }; + meta.homepage = "https://github.com/thinca/vim-scouter/"; }; vim-scriptease = buildVimPluginFrom2Nix { @@ -5325,6 +5853,7 @@ let rev = "86f49aca266e4b17420bcadd29009997d15668d8"; sha256 = "0kcv5q4qahqd316h5k81xnf8skn71126x4lw2i6wa2m2653d0k5c"; }; + meta.homepage = "https://github.com/tpope/vim-scriptease/"; }; vim-sensible = buildVimPluginFrom2Nix { @@ -5336,6 +5865,7 @@ let rev = "2d9f34c09f548ed4df213389caa2882bfe56db58"; sha256 = "153i3kh44ri046va3qdrbvvsv7gy25fsd9pc2yhrg23lvj169zfp"; }; + meta.homepage = "https://github.com/tpope/vim-sensible/"; }; vim-sexp = buildVimPluginFrom2Nix { @@ -5347,6 +5877,7 @@ let rev = "12292941903d9ac8151513189d2007e1ccfc95f0"; sha256 = "1mfqbmrbqgnsc34pmcsrc0c5zvgxhhnw4hx4g5wbssfk1ddyx6y0"; }; + meta.homepage = "https://github.com/guns/vim-sexp/"; }; vim-sexp-mappings-for-regular-people = buildVimPluginFrom2Nix { @@ -5358,6 +5889,7 @@ let rev = "7c3de2f13422fb4b62b4c34a660532c7b3d240c7"; sha256 = "0malswal9hnbq2wf1rx2lp1r69wpwsvyhgi46xbg079x2n857bmj"; }; + meta.homepage = "https://github.com/tpope/vim-sexp-mappings-for-regular-people/"; }; vim-signature = buildVimPluginFrom2Nix { @@ -5369,6 +5901,7 @@ let rev = "6bc3dd1294a22e897f0dcf8dd72b85f350e306bc"; sha256 = "08m5dg77yavria7n7iajkj4kqaw848763680003j2gbrjlhpprpm"; }; + meta.homepage = "https://github.com/kshenoy/vim-signature/"; }; vim-signify = buildVimPluginFrom2Nix { @@ -5380,6 +5913,7 @@ let rev = "56db16f8d3825c4d066c2faf05315c2b208cd5f5"; sha256 = "0alargsa6sxdxha6jshax7ff6jy8svzc9yxvsh83f8301zx9vmra"; }; + meta.homepage = "https://github.com/mhinz/vim-signify/"; }; vim-slash = buildVimPluginFrom2Nix { @@ -5391,6 +5925,7 @@ let rev = "31aee09b7ea8893a18fa34f65e63e364fc998444"; sha256 = "0ifdd3yqbk8hdvdmr4k44967lyvjnv9ig3r2145wn1lab797sbl4"; }; + meta.homepage = "https://github.com/junegunn/vim-slash/"; }; vim-sleuth = buildVimPluginFrom2Nix { @@ -5402,17 +5937,19 @@ let rev = "ea3f065f23cd0592062b8226c8fef08b6af3b459"; sha256 = "17w4m6zg1izcs75isy1jdzycgdr1ml1f5wqf1bjq80qgy3f28znp"; }; + meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2020-02-26"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "73449cc1bf3375ce6f92a1018821cdd0ae91959d"; - sha256 = "1wsrgchjxhircgdvwphvswnl7jq5b63l360wnjjlmcff6nvwhm77"; + rev = "a81139239d6447b1c021e4873e6a14b47f32b65a"; + sha256 = "0wavkm9k2vm23nm5bmc3lpm6cac7mihzjcyk4r77qgdgmnnxkm49"; }; + meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; vim-smalls = buildVimPluginFrom2Nix { @@ -5424,6 +5961,7 @@ let rev = "9619eae81626bd63f88165e0520c467698264e34"; sha256 = "0s5z3zv220cg95yky2av6w0jmpc56ysyhsx0596ksvgz5jwhpbad"; }; + meta.homepage = "https://github.com/t9md/vim-smalls/"; }; vim-smt2 = buildVimPluginFrom2Nix { @@ -5435,6 +5973,7 @@ let rev = "9582e37b1dfd75621e51a3ac2275b6c6c895317f"; sha256 = "0cas6c3pj55qhbcy2vaygg8l9gncjshi1g0a54l78x73d3y3wm03"; }; + meta.homepage = "https://github.com/bohlender/vim-smt2/"; }; vim-sneak = buildVimPluginFrom2Nix { @@ -5446,28 +5985,31 @@ let rev = "98a5c946d6dc76528b9d9b044059b5ef1fab5a48"; sha256 = "0xcxr658i5vzdkxfssd7zx6n3ar9b6dg4b2ddaswgnwq75xphrh9"; }; + meta.homepage = "https://github.com/justinmk/vim-sneak/"; }; vim-snipmate = buildVimPluginFrom2Nix { pname = "vim-snipmate"; - version = "2019-01-11"; + version = "2020-03-27"; src = fetchFromGitHub { owner = "garbas"; repo = "vim-snipmate"; - rev = "17ac70ef00982b7b4865e2ff0efc34a4a5b59cab"; - sha256 = "1agfxwl3n8kz4zwqmsirwr1zzafi069xinv10q79jkczayfpcfq0"; + rev = "b80367fefc2188c9d6c4a9eb1830360b09e13476"; + sha256 = "0qq81hcavmaq76r38qfy1cxlmhj0aswbd41k2k9fyzilzq4r0bg8"; }; + meta.homepage = "https://github.com/garbas/vim-snipmate/"; }; vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-03-19"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "6e6b69fd5c12d4645225e7a3ba7d9f3414d83d25"; - sha256 = "0hc914c74dy22nm9bx2qd37py8f2xf3ylnfr3v4lvbxpnlpahjjc"; + rev = "ad4407f31bf170b0813fb9b03f851cf79b5f65ca"; + sha256 = "0nr7xq5kz94fm578ds84pd3ydbhfbxs6r4fc5250anmazip2h2cw"; }; + meta.homepage = "https://github.com/honza/vim-snippets/"; }; vim-solidity = buildVimPluginFrom2Nix { @@ -5479,6 +6021,7 @@ let rev = "569bbbedc3898236d5912fed0caf114936112ae4"; sha256 = "1qpfbbrm4gjgvbkimhpxyl4fsdqkyw4raf17nw0ibqillz2d3pxx"; }; + meta.homepage = "https://github.com/tomlion/vim-solidity/"; }; vim-sort-motion = buildVimPluginFrom2Nix { @@ -5490,6 +6033,7 @@ let rev = "49dfcabeee2bf3a85a6cc0774b35f687b6c9d0e5"; sha256 = "02v12iqy3gjhvh5aza6b6b3pfv2qkyyw83bxqjgbjj002f71ydkb"; }; + meta.homepage = "https://github.com/christoomey/vim-sort-motion/"; }; vim-sourcetrail = buildVimPluginFrom2Nix { @@ -5501,6 +6045,7 @@ let rev = "0fd679321ce51f65a37d04e4ea9031be6eaed85d"; sha256 = "1xgvvmah3zn22rjaa093vghwrchmpm5wj30lwwl6h398dyywz8bg"; }; + meta.homepage = "https://github.com/CoatiSoftware/vim-sourcetrail/"; }; vim-speeddating = buildVimPluginFrom2Nix { @@ -5512,17 +6057,19 @@ let rev = "fe98cfaa7ea9c4b838d42a6830437c919eb55b4e"; sha256 = "02875qswrmanr7b798ymlc7w60055q0av0qj3fh7fvpqhsqpg52k"; }; + meta.homepage = "https://github.com/tpope/vim-speeddating/"; }; vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-12-07"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "05122f08c6a553992f7b0a9ad88016a89f51548a"; - sha256 = "09kg1zf5lmwlksqz11scnjazg5d862fjip48qakjbabf66f23svs"; + rev = "593388d3dbe7bfdcc06a714550d3253442b2fc65"; + sha256 = "1k0sgx8r3gi3k4ira1ilvc1jmj0k5apiv7x71dqnh41gfrz1i12h"; }; + meta.homepage = "https://github.com/mhinz/vim-startify/"; }; vim-stylish-haskell = buildVimPluginFrom2Nix { @@ -5534,28 +6081,31 @@ let rev = "ef12ab024cb3928ae57ce7c4fa519c4751afef99"; sha256 = "0ysz68v4c2i4kxchsvxgkpj5kb0jbm5x06ri1ns9cmk5gj01pmd6"; }; + meta.homepage = "https://github.com/nbouscal/vim-stylish-haskell/"; }; vim-stylishask = buildVimPluginFrom2Nix { pname = "vim-stylishask"; - version = "2019-01-14"; + version = "2020-04-05"; src = fetchFromGitHub { owner = "alx741"; repo = "vim-stylishask"; - rev = "cf7ca48708da6d1b18d98fa158f9571af05f6043"; - sha256 = "0wnjl74cf26p138nndj827149psddqins5wicqdzxi2lxijgxhny"; + rev = "dcc12c724cec7f8aee7ad197752710eaa3bfd12c"; + sha256 = "09k1n6r9gy3jikss84y141dqqsgc1a1ia89jj0367an53pfl6dn2"; }; + meta.homepage = "https://github.com/alx741/vim-stylishask/"; }; vim-subversive = buildVimPluginFrom2Nix { pname = "vim-subversive"; - version = "2020-01-22"; + version = "2020-04-22"; src = fetchFromGitHub { owner = "svermeulen"; repo = "vim-subversive"; - rev = "634791f5f61aaf49ce16df2698f99a2847f6318e"; - sha256 = "0hr794fn7b5zka3whk3hwh4hznv6y3a19ffsdbgdywr70wwb5grf"; + rev = "9db5f782be230368a3a81a21d3eb93678f7523ae"; + sha256 = "0igv2yf1h1ajnv9c0z02pvgqciighwc1y53c9ahfqwxd58kpi5fj"; }; + meta.homepage = "https://github.com/svermeulen/vim-subversive/"; }; vim-surround = buildVimPluginFrom2Nix { @@ -5567,6 +6117,7 @@ let rev = "f51a26d3710629d031806305b6c8727189cd1935"; sha256 = "0aqrqn35xdiy80y7skxfsh3m33n6cdxw6lzz6aspfgzwllx2f0kr"; }; + meta.homepage = "https://github.com/tpope/vim-surround/"; }; vim-swap = buildVimPluginFrom2Nix { @@ -5578,6 +6129,7 @@ let rev = "e52ff679c88f4aa7a7afe77fb42af78c93ed33c8"; sha256 = "0rqvxqqk961syawmyc2qdfb4w9ilb1r3mxxij2ja1jbhl1f3w4vq"; }; + meta.homepage = "https://github.com/machakann/vim-swap/"; }; vim-SyntaxRange = buildVimPluginFrom2Nix { @@ -5589,17 +6141,19 @@ let rev = "dc33d8f84ebbf4c9fa03ce00b8adeb83e05249d3"; sha256 = "0nf0hkgl5fm0laxb5253br894259kz33zyiwxzrry6w3108alasr"; }; + meta.homepage = "https://github.com/inkarkat/vim-SyntaxRange/"; }; vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2020-03-02"; + version = "2020-04-19"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "6412352b544bda764a9616c3090abb09729526bc"; - sha256 = "1z5v849vjbk4mdgkxs73b2nnvmqx7l6h3ycdb16qdhp9kppwmbvv"; + rev = "6a6f3565c3bd6ea903c9824b8e9367fcdeb7a7b5"; + sha256 = "0vxkakix6r4x1a4ipzhpr7ix7fxz2bqaskwkpmgap12wy5qg3rzs"; }; + meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; vim-tabpagecd = buildVimPluginFrom2Nix { @@ -5611,6 +6165,7 @@ let rev = "8b71a03a037608fa5918f5096812577cec6355e4"; sha256 = "1mr6s2hvsf2a2nkjjvq78c9isfxk2k1ih890w740srbq6ssj0npm"; }; + meta.homepage = "https://github.com/kana/vim-tabpagecd/"; }; vim-tbone = buildVimPluginFrom2Nix { @@ -5622,6 +6177,7 @@ let rev = "82b0118772a87b659a6af49b26b0c4817ec7eccf"; sha256 = "0pbj4v6zhlpcxm10jcq50jf2rpqiyp2x0zpxa50s6y6gm834v9wc"; }; + meta.homepage = "https://github.com/tpope/vim-tbone/"; }; vim-terraform = buildVimPluginFrom2Nix { @@ -5633,17 +6189,19 @@ let rev = "89c47c6c68f6260ba34ee0733437d863046fbe95"; sha256 = "1gkr3akvx44802i8cv4zw8j3bk5qk0h0rgz5k9jgkfch2yc76gzg"; }; + meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-03-21"; + version = "2020-04-19"; src = fetchFromGitHub { owner = "janko"; repo = "vim-test"; - rev = "b302a325116d8708dc0721b7cd97ff59536f4e75"; - sha256 = "099dzadzhfkhf92lv5cmfk0iawbp40v1rz9xxp462hxxcn3p3c97"; + rev = "42c216487a2a13dce04e84534461cc1cf96fa774"; + sha256 = "0912d62frdjm488sybhafl113xh4npylzk0gzblbgdi0fl2f9i52"; }; + meta.homepage = "https://github.com/janko/vim-test/"; }; vim-textobj-comment = buildVimPluginFrom2Nix { @@ -5655,6 +6213,7 @@ let rev = "58ae4571b76a5bf74850698f23d235eef991dd4b"; sha256 = "00wc14chwjfx95gl3yzbxm1ajx88zpzqz0ckl7xvd7gvkrf0mx04"; }; + meta.homepage = "https://github.com/glts/vim-textobj-comment/"; }; vim-textobj-function = buildVimPluginFrom2Nix { @@ -5666,6 +6225,7 @@ let rev = "adb50f38499b1f558cbd58845e3e91117e4538cf"; sha256 = "0cwl102si9zhhhpg6c0fjnyq35v6bl5f34p2s7b47isxdn0qvris"; }; + meta.homepage = "https://github.com/kana/vim-textobj-function/"; }; vim-textobj-haskell = buildVimPluginFrom2Nix { @@ -5677,6 +6237,7 @@ let rev = "ca656e98ea31e201f5bc543909398a6c8bb5d537"; sha256 = "096pjjl3ngw0hsh59j2x6pdrpqvp657rcxfyl9kw13ndqyd867xs"; }; + meta.homepage = "https://github.com/gibiansky/vim-textobj-haskell/"; }; vim-textobj-multiblock = buildVimPluginFrom2Nix { @@ -5688,6 +6249,7 @@ let rev = "670a5ba57d73fcd793f480e262617c6eb0103355"; sha256 = "1s71hdr73cl8yg9mrdflvzrdccpiv7qrlainai7gqw30r1hfhfzf"; }; + meta.homepage = "https://github.com/osyo-manga/vim-textobj-multiblock/"; }; vim-textobj-user = buildVimPluginFrom2Nix { @@ -5699,6 +6261,7 @@ let rev = "41a675ddbeefd6a93664a4dc52f302fe3086a933"; sha256 = "1y1g3vcm97fqjyigiajbvbck4nlc04vxl3535x4sl40s5jbm5vz3"; }; + meta.homepage = "https://github.com/kana/vim-textobj-user/"; }; vim-textobj-variable-segment = buildVimPluginFrom2Nix { @@ -5710,6 +6273,7 @@ let rev = "78457d4322b44bf89730e708b62b69df48c39aa3"; sha256 = "14dcrnk83hj4ixrkdgjrk9cf0193f82wqckdzd4w0b76adf3habj"; }; + meta.homepage = "https://github.com/Julian/vim-textobj-variable-segment/"; }; vim-themis = buildVimPluginFrom2Nix { @@ -5721,6 +6285,7 @@ let rev = "2d10aee9c9982f4f5974e88351934759c69640e7"; sha256 = "06ab0kjamzpyql71qmc8qhvb72rx07x2g598aidk8nqkk36x87ai"; }; + meta.homepage = "https://github.com/thinca/vim-themis/"; }; vim-tmux = buildVimPluginFrom2Nix { @@ -5732,6 +6297,7 @@ let rev = "4e77341a2f8b9b7e41e81e9debbcecaea5987c85"; sha256 = "16fgc0lx1jr8zbayanf5w677ssiw5xb8vwfaca295c8xlk760c3m"; }; + meta.homepage = "https://github.com/tmux-plugins/vim-tmux/"; }; vim-tmux-focus-events = buildVimPluginFrom2Nix { @@ -5743,17 +6309,19 @@ let rev = "e80960715c09aef8ab9204848ed1683805a93a33"; sha256 = "0ds6qw2i1r67jhxh9ff36al45bafsmbxxdc127l6iy2vl5wj0d3d"; }; + meta.homepage = "https://github.com/tmux-plugins/vim-tmux-focus-events/"; }; vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2019-12-10"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "8fdf78292bb3aed1c9de880be7e03efdbf23d306"; - sha256 = "0y92na4dcfcsj5zbs3m7y6csl3sd46a9968id78cdn9cgg8iwzac"; + rev = "44ba6fbe45895cd541ebfc87606add5c76e3829b"; + sha256 = "075cncr53w9xc1kqm50zl8yl18aspn3zdr6qjqyslf7gkw8yk38d"; }; + meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; vim-togglelist = buildVimPluginFrom2Nix { @@ -5765,6 +6333,7 @@ let rev = "cafedc49860950200f28f2e1d95ab6a87b79d113"; sha256 = "17y4ply2irz81gjv5hb51dy7wzv3l3sq6qaska31lswd5dgh1ifg"; }; + meta.homepage = "https://github.com/milkypostman/vim-togglelist/"; }; vim-toml = buildVimPluginFrom2Nix { @@ -5776,6 +6345,7 @@ let rev = "a4ec206052aa347d7df90dc4b6697b7f2b7929bc"; sha256 = "1dgykq4vl7vvj2f8lvg58rzqddm53i278g26ljwfimgqc8l6gmqd"; }; + meta.homepage = "https://github.com/cespare/vim-toml/"; }; vim-trailing-whitespace = buildVimPluginFrom2Nix { @@ -5787,6 +6357,7 @@ let rev = "6b7cdecff252474fe560d32c6f05641f3c5952c7"; sha256 = "0arv1hmlw7c1rlkc00hzjyg48pg8g4cc9q9l2hy8kpmsl037akm3"; }; + meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/"; }; vim-tsx = buildVimPluginFrom2Nix { @@ -5798,6 +6369,7 @@ let rev = "77c89c42e189fefd3c9a632b37b7e3b3b9edf918"; sha256 = "0wmd6gql57bxp868sq2dchp9sc3jbisr4vaz4y0lczhmk0prds6n"; }; + meta.homepage = "https://github.com/ianks/vim-tsx/"; }; vim-twig = buildVimPluginFrom2Nix { @@ -5809,6 +6381,7 @@ let rev = "ad115512725bcc156f7f89b72ff563b9fa44933b"; sha256 = "1p7sfhk0mwx4xk88b29ijb9nfbjwsf6hf3nab2ybcw291qaa75nj"; }; + meta.homepage = "https://github.com/lumiliet/vim-twig/"; }; vim-unimpaired = buildVimPluginFrom2Nix { @@ -5820,6 +6393,7 @@ let rev = "08e66532bffed445c949ae0a0501940c000553ed"; sha256 = "0sm5rv6z0s80l9c39hijhnfggvgmi24ac6d9a1k58pzjz6i9w2vr"; }; + meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; vim-vinegar = buildVimPluginFrom2Nix { @@ -5831,6 +6405,7 @@ let rev = "fcce70f1403ba4101668a4c960c577bddbd00f06"; sha256 = "0zxqdyla40xcp0ps362b85bqwl3mp4zfmfdggl0gwvgd5m949yk0"; }; + meta.homepage = "https://github.com/tpope/vim-vinegar/"; }; vim-visual-increment = buildVimPluginFrom2Nix { @@ -5842,17 +6417,19 @@ let rev = "e50e8f7c062cec759f665278eb58535df1611a23"; sha256 = "1gd6mxp9y80wf7nxcm02104l54gqz5k3dgv1h98jl9a7q9swb8y6"; }; + meta.homepage = "https://github.com/triglav/vim-visual-increment/"; }; vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-02-26"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "32fa278c458d8790a2604a71f3ac3d2500112040"; - sha256 = "0v7asrgbqz70jq4avpi72338fcrs81bgapyvar18l43k6vgb867a"; + rev = "5983497180ce1406997e5329f526f40f76b21121"; + sha256 = "0hrc3kwrk65hdnapp056kxwzizifzdy9zsqn242d81nzymfa6353"; }; + meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; vim-visualstar = buildVimPluginFrom2Nix { @@ -5864,6 +6441,7 @@ let rev = "a18cd0e7a03311ac709595c1d261ed44b45c9098"; sha256 = "0yz6ci4i84xxrgazjfa5nsj3q8733p0b6vwcljk1l7ghdfiflvy4"; }; + meta.homepage = "https://github.com/thinca/vim-visualstar/"; }; vim-vue = buildVimPluginFrom2Nix { @@ -5875,6 +6453,7 @@ let rev = "c424294e769b26659176065f9713c395731f7b3a"; sha256 = "1ig8qacavr15i6z7whlkf2ivw5smnqsw3jwhh4dg5q6037k1hjh1"; }; + meta.homepage = "https://github.com/posva/vim-vue/"; }; vim-wakatime = buildVimPluginFrom2Nix { @@ -5886,6 +6465,7 @@ let rev = "dd74c71cd2ea23b4a6cba4b05c873983c16e297c"; sha256 = "1dc04vmpv62x2rfnfad2y60l5xzpw0167pbii9kss6n6ra81gayr"; }; + meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; vim-watchdogs = buildVimPluginFrom2Nix { @@ -5897,6 +6477,19 @@ let rev = "8ee2af37095af08376ba2409da152c2a36a4ee90"; sha256 = "1hvgqdcnnz09afbas5brwls2sifs8y78jmq44ldgsjny9l445df4"; }; + meta.homepage = "https://github.com/osyo-manga/vim-watchdogs/"; + }; + + vim-which-key = buildVimPluginFrom2Nix { + pname = "vim-which-key"; + version = "2020-03-16"; + src = fetchFromGitHub { + owner = "liuchengxu"; + repo = "vim-which-key"; + rev = "4b70b443ba5838b165f90e26f9ed628d7d05e11d"; + sha256 = "197rp20hngrq7qdlii0ai4vb81dlilah0q1wlil8hv3qcf4az7qr"; + }; + meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; vim-wordy = buildVimPluginFrom2Nix { @@ -5908,6 +6501,7 @@ let rev = "f0391713fa83771d64b065868331ef4754d861ed"; sha256 = "0v5cl3rrg2vrdb2al67hbh730rw8m2zvhb1vippv64k65mknkgp5"; }; + meta.homepage = "https://github.com/reedes/vim-wordy/"; }; vim-xdebug = buildVimPluginFrom2Nix { @@ -5919,6 +6513,7 @@ let rev = "a4980fa65f7f159780593ee37c178281691ba2c4"; sha256 = "1qh18r0sm4gh95sjbi2hnflvxdl4gk00jyy3n7z4i1gnx9ihxjqw"; }; + meta.homepage = "https://github.com/joonty/vim-xdebug/"; }; vim-xkbswitch = buildVimPluginFrom2Nix { @@ -5930,6 +6525,7 @@ let rev = "b9839555f70d319b4e21fc7bc9b559d91cf1260a"; sha256 = "1ql8yv8rxpr9j9phf4jddqs1j81vcb9gpp0p3fmy6f8nf4b26nvw"; }; + meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; vim-yaml = buildVimPluginFrom2Nix { @@ -5941,6 +6537,7 @@ let rev = "8fc9136a9c3f64b3e65bb6170391f9daf2c23056"; sha256 = "08bg7mxvgrl070m0kk4rmain7h3rv712jj6lk9l808cfjzaw9343"; }; + meta.homepage = "https://github.com/stephpy/vim-yaml/"; }; vim-yapf = buildVimPluginFrom2Nix { @@ -5952,6 +6549,7 @@ let rev = "b0c31bd73a6d1026765e659bd0a62c625ec057ad"; sha256 = "0ncv6kjyywljsq5fz71rkmgmqxm7msyscgndnj055bnx5sh9wk80"; }; + meta.homepage = "https://github.com/mindriot101/vim-yapf/"; }; vim2hs = buildVimPluginFrom2Nix { @@ -5963,6 +6561,7 @@ let rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; sha256 = "18lqrl3hqb6cmizc04bbnsh8j0g761w2q8wascbzzfw80dmxy36b"; }; + meta.homepage = "https://github.com/dag/vim2hs/"; }; vimacs = buildVimPluginFrom2Nix { @@ -5974,6 +6573,7 @@ let rev = "7b8e297722d55089f0f0535fe6422533c98112fb"; sha256 = "0x92jcpdlvxhhdpwkv7ig9ya7s96yqjy6ms9xnx8djkf12xql16f"; }; + meta.homepage = "https://github.com/andrep/vimacs/"; }; vimagit = buildVimPluginFrom2Nix { @@ -5985,6 +6585,7 @@ let rev = "bf7b16e99e075b019e56f2fbfb96c493ca3635e2"; sha256 = "1f7gvlhrvvkf69y5vfrkvidhx8aa03n1aqmdhk9qjd6sglfg5w0i"; }; + meta.homepage = "https://github.com/jreybert/vimagit/"; }; vimelette = buildVimPluginFrom2Nix { @@ -5996,6 +6597,7 @@ let rev = "662f47fe0da2625dc743532832fa39f490388fa7"; sha256 = "094xyqba64dndgr5gfcqp6hy3siw90niyrrwz0avs924abss6adg"; }; + meta.homepage = "https://github.com/gotcha/vimelette/"; }; vimfiler-vim = buildVimPluginFrom2Nix { @@ -6007,6 +6609,7 @@ let rev = "26d3fec10cb8921d510064411784301794229a93"; sha256 = "0iv1smk0999sfm3iqdlpb2il74l01lxfahwg87g7h3gq9frky2wd"; }; + meta.homepage = "https://github.com/Shougo/vimfiler.vim/"; }; VimOrganizer = buildVimPluginFrom2Nix { @@ -6018,6 +6621,7 @@ let rev = "cab0baf635eb9470e62d57d42f2d470180b06c8d"; sha256 = "0qncr00xn7lj1i469fzjaaghhqrlyg5s2wj4v6625dhg98y0irix"; }; + meta.homepage = "https://github.com/hsitz/VimOrganizer/"; }; vimoutliner = buildVimPluginFrom2Nix { @@ -6029,6 +6633,7 @@ let rev = "1031b16e6b0069229fe0f33a66489f81174fa4d9"; sha256 = "1gn21b8yr0bjg0y1nidk13zcl4f6z8wkrxncgkd1hlc14d99jkg0"; }; + meta.homepage = "https://github.com/vimoutliner/vimoutliner/"; }; vimpreviewpandoc = buildVimPluginFrom2Nix { @@ -6040,6 +6645,7 @@ let rev = "3b0a589140abf6cc5d19ad678a7f01822bbee34e"; sha256 = "15yjr01wfnhaqw1k8bgxk04vvh76y13zfms66irpihw79f9yzxi9"; }; + meta.homepage = "https://github.com/tex/vimpreviewpandoc/"; }; vimproc-vim = buildVimPluginFrom2Nix { @@ -6051,6 +6657,7 @@ let rev = "51f4664c92f0f1b121127c84d3b1c901e1c698f0"; sha256 = "06nzh4x7j7j3nvw2s4m1gmds0z0bldxbizja91jd43qma9xnwvlk"; }; + meta.homepage = "https://github.com/Shougo/vimproc.vim/"; }; vimshell-vim = buildVimPluginFrom2Nix { @@ -6062,17 +6669,19 @@ let rev = "ee683538f57aaf5094db9860f67f4957a763ffb4"; sha256 = "0inf9xx6ni1scxkn0b78qq0234r0ybrwpphyzcafw7i8kzisbn26"; }; + meta.homepage = "https://github.com/Shougo/vimshell.vim/"; }; vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-03-21"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "8c59031d50feeec8b4f3549f70f82564975265f0"; - sha256 = "16a7qpp19gci8hq8h2999pwv0gd6x0mqgifv325mlb0jj5lxy7m1"; + rev = "3e2bf3f27ad7253767eefe0b4c4e551c602d5d77"; + sha256 = "1pxkim0mh691lb8clv1828nhs4cqzf8s3vkmynq7164mzvrf77sh"; }; + meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPluginFrom2Nix { @@ -6084,6 +6693,7 @@ let rev = "37f41195e6369ac602a08ec61364906600b771f1"; sha256 = "0k7ymak2ag67lb4sf80y4k35zj38rj0jf61bf50i6h1bgw987pra"; }; + meta.homepage = "https://github.com/benmills/vimux/"; }; vimwiki = buildVimPluginFrom2Nix { @@ -6095,6 +6705,7 @@ let rev = "64c9f3d36d632b1657616c06ea8f08f14cf6438d"; sha256 = "0wwfl0bafwh9p8lzic75d0nl6v5dnpfid7fbiffr0i72agp0gcq7"; }; + meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; vissort-vim = buildVimPluginFrom2Nix { @@ -6106,17 +6717,19 @@ let rev = "75a5b08b64d2f762206bffd294066533891fa03c"; sha256 = "0a71b22apkhicca9nkd06jlcnqkf583mlpfh2mvl4d474viavqfn"; }; + meta.homepage = "https://github.com/navicore/vissort.vim/"; }; vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-03-17"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "e7b362fffe3a5d1f21bd560d0455e19ff8192997"; - sha256 = "15nmls0m5hajh4k1kjibp299hdhyyjkcax44fmkjq51xlfb1nhc9"; + rev = "48631457714b6a611b96ad4785ec16a98b639515"; + sha256 = "05zabbnrxbgnymp6iyc6gmfj3sk752679kvyzk5jiraksi32djiw"; }; + meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; Vundle-vim = buildVimPluginFrom2Nix { @@ -6128,6 +6741,7 @@ let rev = "b255382d6242d7ea3877bf059d2934125e0c4d95"; sha256 = "0fkmklcq3fgvd6x6irz9bgyvcdaxafykk3k89gsi9p6b0ikw3rw6"; }; + meta.homepage = "https://github.com/VundleVim/Vundle.vim/"; }; wal-vim = buildVimPluginFrom2Nix { @@ -6139,6 +6753,7 @@ let rev = "10f228ce1e7947f62be412f916229131b7710239"; sha256 = "0aiwsrcqnazam56cvwmck4bf7w543cr219bkmq0ngqzna72h9735"; }; + meta.homepage = "https://github.com/dylanaraps/wal.vim/"; }; webapi-vim = buildVimPluginFrom2Nix { @@ -6150,6 +6765,7 @@ let rev = "10b8e926d85a3ab689c2966a3df1139bcb4e197f"; sha256 = "1hbm2mgsncqdjjfgabgncr4ji90mjsa3z0cx7813vdf113v41x26"; }; + meta.homepage = "https://github.com/mattn/webapi-vim/"; }; wmgraphviz-vim = buildVimPluginFrom2Nix { @@ -6161,6 +6777,7 @@ let rev = "f08ff5becd1e6e81d681ff2926f2cce29f63cb18"; sha256 = "12mb0lbkrzrxyawd9gg6igmsaylvsixcslim0lcgsrd551l9lq2l"; }; + meta.homepage = "https://github.com/wannesm/wmgraphviz.vim/"; }; wombat256-vim = buildVimPluginFrom2Nix { @@ -6172,6 +6789,7 @@ let rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2"; sha256 = "01fdvfwdfqn5xi88lfanb4lb6jmn1ma6wq6d9jj2x7qamdbpvsrg"; }; + meta.homepage = "https://github.com/vim-scripts/wombat256.vim/"; }; workflowish = buildVimPluginFrom2Nix { @@ -6183,6 +6801,7 @@ let rev = "65472189814dddd060aaa558103d837c2f9a5ec9"; sha256 = "044jxkcbycmmahi98qd0ynpc8baay72i45qymv4mxvl1d96fjbmd"; }; + meta.homepage = "https://github.com/lukaszkorecki/workflowish/"; }; xptemplate = buildVimPluginFrom2Nix { @@ -6194,6 +6813,7 @@ let rev = "79d650bad58b9c896ec47785f8a0c7b603105c2d"; sha256 = "1myxp0ldk0s46aipx1iswa9zx2fkc4gwqpmhbswqgg7sxl1bz30g"; }; + meta.homepage = "https://github.com/drmingdrmer/xptemplate/"; }; xterm-color-table-vim = buildVimPluginFrom2Nix { @@ -6205,6 +6825,7 @@ let rev = "9754e857e5f4fe1f8727106dcc682d21c29a51e4"; sha256 = "08a1d9428xwrjp40qgi34cb5fwgc239qf3agxl32k7bqbn08pq19"; }; + meta.homepage = "https://github.com/guns/xterm-color-table.vim/"; }; YankRing-vim = buildVimPluginFrom2Nix { @@ -6216,30 +6837,33 @@ let rev = "28854abef8fa4ebd3cb219aefcf22566997d8f65"; sha256 = "0zdp8pdsqgrh6lfw8ipjhrig6psvmdxkim9ik801y3r373sk2hxw"; }; + meta.homepage = "https://github.com/vim-scripts/YankRing.vim/"; }; yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-03-21"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "4d3f69a3a5f56bae9475a96c3291ffdcbd9ff0b1"; - sha256 = "0f3dq4lrm9xzh780fd471b7ddibfzb9vfq1k6gn53pmqpiw6a498"; + rev = "7978f7d52e1cfbdba1d17951c7bd4be527807e4e"; + sha256 = "0fiqbnqsyr743vxm8km4q7yyd26anya1yi89gkzjipq2vgpqx7hn"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; }; YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-03-18"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "cf4a76acaeed27eb3ca1dca5adf1115b6abbcfa3"; - sha256 = "0si9by2ag2f7xgxidp5215d6wkg1mdhq9j5c4icdpsly9gv3w5s8"; + rev = "367c1518cd6f2c8695000924b8ec2815a30a9af3"; + sha256 = "0c8982qj93b8rcb4m7dfczscqyfhv2y672irrrpg0kb2yxiwk51m"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; }; YUNOcommit-vim = buildVimPluginFrom2Nix { @@ -6251,6 +6875,7 @@ let rev = "981082055a73ef076d7e27477874d2303153a448"; sha256 = "0mjc7fn405vcx1n7vadl98p5wgm6jxrlbdbkqgjq8f1m1ir81zab"; }; + meta.homepage = "https://github.com/esneider/YUNOcommit.vim/"; }; zeavim-vim = buildVimPluginFrom2Nix { @@ -6262,6 +6887,7 @@ let rev = "298e52ad683680b4aa19b53d009cf0e6b9197664"; sha256 = "1qj6z0vd7y89wfwh84rndl4iz6cvilncih2fc5xgmljaarg914fs"; }; + meta.homepage = "https://github.com/KabbAmine/zeavim.vim/"; }; zenburn = buildVimPluginFrom2Nix { @@ -6273,28 +6899,31 @@ let rev = "ec6f369a000602e37e7c066b725f9d6bd12538f4"; sha256 = "1ff5ac8lp7fq854kgf03c5h695lm60giw0qda5z428mmzwq0xask"; }; + meta.homepage = "https://github.com/jnurmine/zenburn/"; }; zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2020-02-10"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "55b690029791022fd7818ebd0ee395e8976899fe"; - sha256 = "10xkrn4yhjda187mpw1y3qw0s6bp7aklk87pansaa3fvysdf3b6c"; + rev = "0e914f2ab5ab9a9554c31b90be189dca5c4ee3a8"; + sha256 = "1njf3flx5dcahvk92kaf879sd4a75yq4nnii4ljip7bvkyci8ipa"; }; + meta.homepage = "https://github.com/ziglang/zig.vim/"; }; zoomwintab-vim = buildVimPluginFrom2Nix { pname = "zoomwintab-vim"; - version = "2018-04-14"; + version = "2020-04-10"; src = fetchFromGitHub { owner = "troydm"; repo = "zoomwintab.vim"; - rev = "5bbbd1f79e40839a34803627e11f9e662f639fe0"; - sha256 = "04pv7mmlz9ccgzfg8sycqxplaxpbyh7pmhwcw47b2xwnazjz49d6"; + rev = "63a70b9e12617d6565a0489c68efe44708d19cf8"; + sha256 = "1dsi2d6wrv5x6w2hrrjzqivsspxxav0hdj0pymml6gry2jcbj4s9"; }; + meta.homepage = "https://github.com/troydm/zoomwintab.vim/"; }; }); diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 39596da24bb01..4d5b532216d29 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -11,6 +11,7 @@ , Cocoa, CoreFoundation, CoreServices , buildVimPluginFrom2Nix , nodePackages +, dasht # coc-go dependency , go @@ -21,7 +22,7 @@ # vim-go dependencies , asmfmt, delve, errcheck, godef, golint , gomodifytags, gotags, gotools, go-motion -, gnused, reftools, gogetdoc, gometalinter +, gnused, reftools, gogetdoc, golangci-lint , impl, iferr, gocode, gocode-gomod, go-tools # direnv-vim dependencies @@ -56,16 +57,16 @@ self: super: { }; LanguageClient-neovim = let - version = "0.1.156"; + version = "0.1.157"; LanguageClient-neovim-src = fetchurl { url = "https://github.com/autozimu/LanguageClient-neovim/archive/${version}.tar.gz"; - sha256 = "0bf2va6lpgw7wqpwpfidijbzphhvw48hyc2b529qv12vwgnd1shq"; + sha256 = "1ccq5akkm8n612ni5g7w7v5gv73g7p1d9i92k0bnsy33fvi3pmnh"; }; LanguageClient-neovim-bin = rustPlatform.buildRustPackage { name = "LanguageClient-neovim-bin"; src = LanguageClient-neovim-src; - cargoSha256 = "0w66fcrlaxf6zgkrfpgfybfbm759fzimnr3pjq6sm14frar7lhr6"; + cargoSha256 = "0r3f7sixkvgfrw0j81bxj1jpam5si9dnivrw63s29cvjxrdbnmqz"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. @@ -198,19 +199,6 @@ self: super: { src = "${nodePackages.coc-metals}/lib/node_modules/coc-metals"; }; - # Only official releases contains the required index.js file - # NB: Make sure you pick a rev from the release branch! - coc-nvim = buildVimPluginFrom2Nix rec { - pname = "coc-nvim"; - version = "2020-01-05"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc.nvim"; - rev = "984779f2f825626aa9d441746d8b4ee079137c65"; - sha256 = "0w7qnhi7wikr789h3w5p59l8wd81czpvbzbdanf8klf9ap4ma3yg"; - }; - }; - coc-pairs = buildVimPluginFrom2Nix { pname = "coc-pairs"; version = nodePackages.coc-pairs.version; @@ -241,6 +229,12 @@ self: super: { src = "${nodePackages.coc-rls}/lib/node_modules/coc-rls"; }; + coc-rust-analyzer = buildVimPluginFrom2Nix { + pname = "coc-rust-analyzer"; + version = nodePackages.coc-rust-analyzer.version; + src = "${nodePackages.coc-rust-analyzer}/lib/node_modules/coc-rust-analyzer"; + }; + coc-smartf = buildVimPluginFrom2Nix { pname = "coc-smartf"; version = nodePackages.coc-smartf.version; @@ -530,11 +524,18 @@ self: super: { dependencies = with super; [ vim-maktaba ]; }); + vim-dasht = super.vim-dasht.overrideAttrs(old: { + preFixup = '' + substituteInPlace $out/share/vim-plugins/vim-dasht/autoload/dasht.vim \ + --replace "['dasht']" "['${dasht}/bin/dasht']" + ''; + }); + vim-easytags = super.vim-easytags.overrideAttrs(old: { dependencies = with super; [ vim-misc ]; patches = [ (fetchpatch { # https://github.com/xolox/vim-easytags/pull/170 fix version detection for universal-ctags - url = https://github.com/xolox/vim-easytags/commit/46e4709500ba3b8e6cf3e90aeb95736b19e49be9.patch; + url = "https://github.com/xolox/vim-easytags/commit/46e4709500ba3b8e6cf3e90aeb95736b19e49be9.patch"; sha256 = "0x0xabb56xkgdqrg1mpvhbi3yw4d829n73lsnnyj5yrxjffy4ax4"; }) ]; @@ -555,7 +556,7 @@ self: super: { godef gogetdoc golint - gometalinter + golangci-lint gomodifytags gotags gotools @@ -694,7 +695,7 @@ self: super: { unicode-vim = let unicode-data = fetchurl { - url = http://www.unicode.org/Public/UNIDATA/UnicodeData.txt; + url = "http://www.unicode.org/Public/UNIDATA/UnicodeData.txt"; sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; }; in super.unicode-vim.overrideAttrs(old: { diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py index fe8cb90d1035b..84d57133d2288 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/misc/vim-plugins/update.py @@ -15,12 +15,14 @@ import json import os import subprocess import sys +import time import traceback import urllib.error import urllib.parse import urllib.request import xml.etree.ElementTree as ET from datetime import datetime +from functools import wraps from multiprocessing.dummy import Pool from pathlib import Path from typing import Dict, List, Optional, Tuple, Union, Any, Callable @@ -38,17 +40,12 @@ DEFAULT_IN = ROOT.joinpath("vim-plugin-names") DEFAULT_OUT = ROOT.joinpath("generated.nix") DEPRECATED = ROOT.joinpath("deprecated.json") -import time -from functools import wraps - def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: float = 2): """Retry calling the decorated function using an exponential backoff. - http://www.saltycrane.com/blog/2009/11/trying-out-retry-decorator-python/ original from: http://wiki.python.org/moin/PythonDecoratorLibrary#Retry (BSD licensed) - :param ExceptionToCheck: the exception on which to retry :param tries: number of times to try (not retry) before giving up :param delay: initial delay between retries in seconds @@ -76,9 +73,12 @@ def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: floa class Repo: - def __init__(self, owner: str, name: str, alias: Optional[str]) -> None: + def __init__( + self, owner: str, name: str, branch: str, alias: Optional[str] + ) -> None: self.owner = owner self.name = name + self.branch = branch self.alias = alias self.redirect: Dict[str, str] = {} @@ -92,7 +92,7 @@ class Repo: def has_submodules(self) -> bool: try: urllib.request.urlopen( - self.url("blob/master/.gitmodules"), timeout=10 + self.url(f"blob/{self.branch}/.gitmodules"), timeout=10 ).close() except urllib.error.HTTPError as e: if e.code == 404: @@ -103,7 +103,7 @@ class Repo: @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def latest_commit(self) -> Tuple[str, datetime]: - commit_url = self.url("commits/master.atom") + commit_url = self.url(f"commits/{self.branch}.atom") with urllib.request.urlopen(commit_url, timeout=10) as req: self.check_for_redirect(commit_url, req) xml = req.read() @@ -220,9 +220,13 @@ def get_current_plugins() -> List[Plugin]: def prefetch_plugin( - user: str, repo_name: str, alias: Optional[str], cache: "Optional[Cache]" = None + user: str, + repo_name: str, + branch: str, + alias: Optional[str], + cache: "Optional[Cache]" = None, ) -> Tuple[Plugin, Dict[str, str]]: - repo = Repo(user, repo_name, alias) + repo = Repo(user, repo_name, branch, alias) commit, date = repo.latest_commit() has_submodules = repo.has_submodules() cached_plugin = cache[commit] if cache else None @@ -284,17 +288,20 @@ def check_results( sys.exit(1) -def parse_plugin_line(line: str) -> Tuple[str, str, Optional[str]]: +def parse_plugin_line(line: str) -> Tuple[str, str, str, Optional[str]]: + branch = "master" + alias = None name, repo = line.split("/") - try: + if " as " in repo: repo, alias = repo.split(" as ") - return (name, repo, alias.strip()) - except ValueError: - # no alias defined - return (name, repo.strip(), None) + alias = alias.strip() + if "@" in repo: + repo, branch = repo.split("@") + + return (name.strip(), repo.strip(), branch.strip(), alias) -def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str, Optional[str]]]: +def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str, str, Optional[str]]]: plugins = [] with open(plugin_file) as f: for line in f: @@ -361,12 +368,12 @@ class Cache: def prefetch( - args: Tuple[str, str, str], cache: Cache + args: Tuple[str, str, str, Optional[str]], cache: Cache ) -> Tuple[str, str, Union[Exception, Plugin], dict]: - assert len(args) == 3 - owner, repo, alias = args + assert len(args) == 4 + owner, repo, branch, alias = args try: - plugin, redirect = prefetch_plugin(owner, repo, alias, cache) + plugin, redirect = prefetch_plugin(owner, repo, branch, alias, cache) cache[plugin.commit] = plugin return (owner, repo, plugin, redirect) except Exception as e: @@ -386,7 +393,6 @@ def generate_nix(plugins: List[Tuple[str, str, Plugin]], outfile: str): f.write( """ { lib, buildVimPluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: - let packages = ( self: {""" @@ -408,6 +414,7 @@ let rev = "{plugin.commit}"; sha256 = "{plugin.sha256}";{submodule_attr} }}; + meta.homepage = "https://github.com/{owner}/{repo}/"; }}; """ ) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index f2a68ab5a79b2..cbb60707adffa 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -97,6 +97,7 @@ enomsg/vim-haskellConcealPlus ensime/ensime-vim ervandew/supertab esneider/YUNOcommit.vim +fannheyward/coc-rust-analyzer farmergreg/vim-lastplace fatih/vim-go FelikZ/ctrlp-py-matcher @@ -138,7 +139,6 @@ honza/vim-snippets hotwatermorning/auto-git-diff hsanson/vim-android hsitz/VimOrganizer -hynek/vim-python-pep8-indent iamcco/coc-spell-checker ianks/vim-tsx icymind/NeoSolarized @@ -175,6 +175,7 @@ jonsmithers/vim-html-template-literals joonty/vim-xdebug josa42/coc-go jpalardy/vim-slime +jparise/vim-graphql jparise/vim-phabricator jreybert/vimagit jsfaint/gen_tags.vim @@ -193,6 +194,7 @@ junegunn/vim-peekaboo junegunn/vim-plug junegunn/vim-slash justincampbell/vim-eighties +justinj/vim-pico8-syntax justinmk/vim-dirvish justinmk/vim-sneak KabbAmine/vCoolor.vim @@ -228,6 +230,7 @@ lervag/vimtex lfilho/cosco.vim lifepillar/vim-mucomplete lilydjwg/colorizer +liuchengxu/vim-which-key liuchengxu/vista.vim LnL7/vim-nix LucHermitte/lh-brackets @@ -337,6 +340,7 @@ neoclide/coc-vimtex neoclide/coc-wxml neoclide/coc-yaml neoclide/coc-yank +neoclide/coc.nvim@release neoclide/denite-extra neoclide/denite-git neoclide/vim-easygit @@ -389,7 +393,6 @@ Raimondi/delimitMate rakr/vim-one rbgrouleff/bclose.vim reedes/vim-pencil -justinj/vim-pico8-syntax reedes/vim-wordy rhysd/committia.vim rhysd/vim-grammarous @@ -442,6 +445,7 @@ solarnz/arcanist.vim sonph/onehalf stefandtw/quickfix-reflector.vim stephpy/vim-yaml +sunaku/vim-dasht svermeulen/vim-subversive t9md/vim-choosewin t9md/vim-smalls @@ -451,7 +455,6 @@ ternjs/tern_for_vim terryma/vim-expand-region terryma/vim-multiple-cursors tex/vimpreviewpandoc -tmhedberg/SimpylFold thinca/vim-ft-diff_fold thinca/vim-prettyprint thinca/vim-quickrun @@ -461,6 +464,7 @@ thinca/vim-visualstar thirtythreeforty/lessspace.vim thosakwe/vim-flutter tikhomirov/vim-glsl +tmhedberg/SimpylFold tmsvg/pear-tree tmux-plugins/vim-tmux tmux-plugins/vim-tmux-focus-events @@ -546,6 +550,7 @@ vim-scripts/wombat256.vim vim-scripts/YankRing.vim vim-syntastic/syntastic vim-utils/vim-husk +Vimjas/vim-python-pep8-indent vimlab/split-term.vim vimoutliner/vimoutliner vimwiki/vimwiki diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index d745198e6a409..5e1703c8cc362 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -188,6 +188,7 @@ let vam ? null, pathogen ? null, plug ? null, + beforePlugins ? "", customRC ? "" }: @@ -341,6 +342,8 @@ let " configuration generated by NIX set nocompatible + ${beforePlugins} + ${vamImpl} ${pathogenImpl} ${plugImpl} diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index 77cf28c552edf..84919e07c5e2b 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -33,39 +33,6 @@ assert gdbUseFixed -> null != gdb; let gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb"; - langComponentBinaries = stdenv.mkDerivation rec { - name = "cpptools-language-component-binaries"; - - src = fetchurl { - # Follow https://go.microsoft.com/fwlink/?linkid=2037608 - url = "https://download.visualstudio.microsoft.com/download/pr/fd05d7fd-b771-4746-9c54-b5b30afcd82e/1f443716d6156a265bf50cb6e53fa999/bin_linux.zip"; - sha256 = "198xnq709clibjmd8rrv0haniy2m3qvhn89hg9hpj6lvg9lsr7a4"; - }; - - sourceRoot = name; - - nativeBuildInputs = [ unzip ]; - - unpackPhase = '' - runHook preUnpack - unzip -d $name $src || true - runHook postUnpack - ''; - - installPhase = '' - runHook preInstall - mkdir -p "$out/bin" - cp -a -t "$out/bin" ./bin/* - runHook postInstall - ''; - - postFixup = '' - elfInterpreter="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter "$elfInterpreter" $out/bin/Microsoft.VSCode.CPP.Extension.linux - patchelf --set-interpreter "$elfInterpreter" $out/bin/Microsoft.VSCode.CPP.IntelliSense.Msvc.linux - chmod a+x $out/bin/Microsoft.VSCode.CPP.Extension.linux $out/bin/Microsoft.VSCode.CPP.IntelliSense.Msvc.linux - ''; - }; openDebugAD7Script = writeScript "OpenDebugAD7" '' #!${runtimeShell} @@ -79,24 +46,33 @@ let ''; in -vscode-utils.buildVscodeMarketplaceExtension { +vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.27.0"; - sha256 = "06l25fjlcj0m7f7883afbh0x2ikgkqi768kv8y4qi1jc1gxndpm0"; + version = "0.27.1"; + }; + + vsix = fetchurl { + url = "https://github.com/microsoft/vscode-cpptools/releases/download/${mktplcRef.version}/cpptools-linux.vsix"; + sha256 = "1if43zis2cy32c6y1zsh0ih0y2kpdag0flkb795b3m5iwm38rjsq"; }; + unpackPhase = '' + unzip $src + cd extension + ''; + buildInputs = [ jq ]; postPatch = '' - mv ./package.json ./package_ori.json + mv ./package.json ./package_orig.json # 1. Add activation events so that the extension is functional. This listing is empty when unpacking the extension but is filled at runtime. # 2. Patch `package.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. - cat ./package_ori.json | \ + cat ./package_orig.json | \ jq --slurpfile actEvts ${./package-activation-events.json} '(.activationEvents) = $actEvts[0]' | \ jq '(.contributes.debuggers[].configurationAttributes | .attach , .launch | .properties.miDebuggerPath | select(. != null) | select(.default == "/usr/bin/gdb") | .default) = "${gdbDefaultsTo}"' > \ ./package.json @@ -104,19 +80,20 @@ vscode-utils.buildVscodeMarketplaceExtension { # Prevent download/install of extensions touch "./install.lock" - # Move unused files out of the way. - mv ./debugAdapters/bin/OpenDebugAD7.exe.config ./debugAdapters/bin/OpenDebugAD7.exe.config.unused - - # Combining the language component binaries as part of our package. - find "${langComponentBinaries}/bin" -mindepth 1 -maxdepth 1 | xargs cp -p -t "./bin" - # Mono runtimes from nix package (used by generated `OpenDebugAD7`). - rm "./debugAdapters/OpenDebugAD7" + mv ./debugAdapters/OpenDebugAD7 ./debugAdapters/OpenDebugAD7_orig cp -p "${openDebugAD7Script}" "./debugAdapters/OpenDebugAD7" # Clang-format from nix package. - mkdir -p "./LLVM" + mv ./LLVM/ ./LLVM_orig + mkdir "./LLVM/" find "${clang-tools}" -mindepth 1 -maxdepth 1 | xargs ln -s -t "./LLVM" + + # Patching cpptools and cpptools-srv + elfInterpreter="$(cat $NIX_CC/nix-support/dynamic-linker)" + patchelf --set-interpreter "$elfInterpreter" ./bin/cpptools + patchelf --set-interpreter "$elfInterpreter" ./bin/cpptools-srv + chmod a+x ./bin/cpptools{-srv,} ''; meta = with stdenv.lib; { diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index b4ec1d2d6968d..cb145ade054c6 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -76,8 +76,8 @@ in mktplcRef = { name = "language-haskell"; publisher = "justusadam"; - version = "2.6.0"; # see the note above - sha256 = "1891pg4x5qkh151pylvn93c4plqw6vgasa4g40jbma5xzq8pygr4"; + version = "3.0.3"; + sha256 = "1sg4g8h1gww4y67zix5f33v2gf121k2fcm6l1m7lygpkn40a8dsj"; }; meta = { license = stdenv.lib.licenses.bsd3; @@ -140,6 +140,8 @@ in }; }; + matklad.rust-analyzer = callPackage ./rust-analyzer {}; + scala-lang.scala = buildVscodeMarketplaceExtension { mktplcRef = { name = "scala"; @@ -156,8 +158,8 @@ in mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.6.3"; - sha256 = "1mc3awybzd2ql1b86inirhsw3j2c7cs0b0nvbjp38jjpq674bmj7"; + version = "1.9.0"; + sha256 = "0p2wbnw98zmjbfiz4mi1mh131s78r01kjnja339lwdigqxg88gi6"; }; meta = { license = stdenv.lib.licenses.asl20; diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json new file mode 100644 index 0000000000000..d42da3bbc5bd0 --- /dev/null +++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -0,0 +1,22 @@ +{ + "name": "rust-analyzer", + "version": "0.4.0-dev", + "dependencies": { + "jsonc-parser": "^2.2.1", + "node-fetch": "^2.6.0", + "vscode-languageclient": "7.0.0-next.1", + "@rollup/plugin-commonjs": "^11.0.2", + "@rollup/plugin-node-resolve": "^7.1.1", + "@types/node": "^12.12.34", + "@types/node-fetch": "^2.5.5", + "@types/vscode": "1.44.0", + "@typescript-eslint/eslint-plugin": "^2.27.0", + "@typescript-eslint/parser": "^2.27.0", + "eslint": "^6.8.0", + "rollup": "^2.3.3", + "tslib": "^1.11.1", + "typescript": "^3.8.3", + "typescript-formatter": "^7.2.2", + "vsce": "^1.75.0" + } +} diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix new file mode 100644 index 0000000000000..230ee383af3a9 --- /dev/null +++ b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix @@ -0,0 +1,50 @@ +# Update script: pkgs/development/tools/rust/rust-analyzer/update.sh +{ lib, stdenv, vscode-utils, jq, rust-analyzer, nodePackages_10_x +, setDefaultServerPath ? true +}: + +let + pname = "rust-analyzer"; + publisher = "matklad"; + + # Follow the unstable version of rust-analyzer, since the extension is not stable yet. + inherit (rust-analyzer) version; + + build-deps = nodePackages_10_x."rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps"; + # FIXME: Making a new derivation to link `node_modules` and run `npm run package` + # will cause a build failure. + vsix = build-deps.override { + src = "${rust-analyzer.src}/editors/code"; + outputs = [ "vsix" "out" ]; + + postInstall = '' + npm run package + mkdir $vsix + cp ${pname}.vsix $vsix/${pname}.zip + ''; + }; + +in vscode-utils.buildVscodeExtension { + inherit version vsix; + name = "${pname}-${version}"; + src = "${vsix}/${pname}.zip"; + vscodeExtUniqueId = "${publisher}.${pname}"; + + nativeBuildInputs = lib.optional setDefaultServerPath jq; + + postFixup = lib.optionalString setDefaultServerPath '' + package_json="$out/${publisher}.${pname}/package.json" + jq '.contributes.configuration.properties."rust-analyzer.serverPath".default = $s' \ + --arg s "${rust-analyzer}/bin/rust-analyzer" \ + $package_json >$package_json.new + mv $package_json.new $package_json + ''; + + meta = with lib; { + description = "An alternative rust language server to the RLS"; + homepage = "https://github.com/rust-analyzer/rust-analyzer"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ oxalica ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix index a841acdca94ed..561f915d66360 100644 --- a/pkgs/misc/xosd/default.nix +++ b/pkgs/misc/xosd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Displays text on your screen"; - homepage = https://sourceforge.net/projects/libxosd; + homepage = "https://sourceforge.net/projects/libxosd"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index e31f9b91f97d9..fad33b21d0468 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { pname = "${targetPrefix}cctools-binutils-darwin"; inherit (cctools) version; - outputs = [ "out" "info" "man" ]; + outputs = [ "out" "man" ]; buildCommand = '' mkdir -p $out/bin $out/include @@ -42,12 +42,13 @@ stdenv.mkDerivation { ln -s ${cctools}/libexec $out/libexec - mkdir -p "$info/nix-support" "$man/nix-support" - printWords ${binutils-unwrapped.info} \ - >> $info/nix-support/propagated-build-inputs - # FIXME: cctools missing man pages - printWords ${binutils-unwrapped.man} \ - >> $man/nix-support/propagated-build-inputs + mkdir -p "$man"/share/man/man{1,5} + for i in ${builtins.concatStringsSep " " cmds}; do + for path in "${cctools.man}"/share/man/man?/$i.*; do + dest_path="$man''${path#${cctools.man}}" + ln -sv "$path" "$dest_path" + done + done ''; passthru = { diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 1aee5c8c35e97..0c25f225291eb 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -1,4 +1,5 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook +, installShellFiles , libcxxabi, libuuid , libobjc ? null, maloader ? null , enableTapiSupport ? true, libtapi @@ -28,9 +29,9 @@ let sha256 = "0h8b1my0wf1jyjq63wbiqkl2clgxsf87f6i4fjhqs431fzlq8sac"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "man" ]; - nativeBuildInputs = [ autoconf automake libtool autoreconfHook ]; + nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ]; buildInputs = [ libuuid ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ] ++ stdenv.lib.optional enableTapiSupport libtapi; @@ -88,6 +89,8 @@ let pushd include make DSTROOT=$out/include RC_OS=common install popd + + installManPage ar/ar.{1,5} ''; passthru = { @@ -96,7 +99,7 @@ let meta = { broken = !stdenv.targetPlatform.isDarwin; # Only supports darwin targets - homepage = http://www.opensource.apple.com/source/cctools/; + homepage = "http://www.opensource.apple.com/source/cctools/"; description = "MacOS Compiler Tools (cross-platform port)"; license = stdenv.lib.licenses.apsl20; maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; diff --git a/pkgs/os-specific/darwin/chunkwm/default.nix b/pkgs/os-specific/darwin/chunkwm/default.nix index 12b358126512d..d94f66969f461 100644 --- a/pkgs/os-specific/darwin/chunkwm/default.nix +++ b/pkgs/os-specific/darwin/chunkwm/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tiling window manager for macOS based on plugin architecture"; - homepage = https://github.com/koekeishiya/chunkwm; + homepage = "https://github.com/koekeishiya/chunkwm"; platforms = platforms.darwin; maintainers = with maintainers; [ lnl7 ]; license = licenses.mit; diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index e374bd2f11c61..f6834fca7351e 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Karabiner configurator"; - homepage = https://github.com/yqrashawn/GokuRakuJoudo; + homepage = "https://github.com/yqrashawn/GokuRakuJoudo"; license = licenses.gpl3; maintainers = [ maintainers.nikitavoloboev ]; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix index e82636fce1f2a..edf1583de9a84 100644 --- a/pkgs/os-specific/darwin/iproute2mac/default.nix +++ b/pkgs/os-specific/darwin/iproute2mac/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/brona/iproute2mac; + homepage = "https://github.com/brona/iproute2mac"; description = "CLI wrapper for basic network utilites on Mac OS X inspired with iproute2 on Linux systems - ip command."; license = licenses.mit; maintainers = with maintainers; [ flokli ]; diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix index 90f92b0b64436..b09b65f33d567 100644 --- a/pkgs/os-specific/darwin/khd/default.nix +++ b/pkgs/os-specific/darwin/khd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ # Fixes build issues, remove with >3.0.0 (fetchpatch { - url = https://github.com/koekeishiya/khd/commit/4765ae0b4c7d4ca56319dc92ff54393cd9e03fbc.patch; + url = "https://github.com/koekeishiya/khd/commit/4765ae0b4c7d4ca56319dc92ff54393cd9e03fbc.patch"; sha256 = "0kvf5hxi5bf6pf125qib7wn7hys0ag66zzpp4srj1qa87lxyf7np"; }) ]; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple modal hotkey daemon for OSX"; - homepage = https://github.com/koekeishiya/khd; - downloadPage = https://github.com/koekeishiya/khd/releases; + homepage = "https://github.com/koekeishiya/khd"; + downloadPage = "https://github.com/koekeishiya/khd/releases"; platforms = platforms.darwin; maintainers = with maintainers; [ lnl7 ]; license = licenses.mit; diff --git a/pkgs/os-specific/darwin/kwm/default.nix b/pkgs/os-specific/darwin/kwm/default.nix index c3fa76f50960b..8c412aa68ed78 100644 --- a/pkgs/os-specific/darwin/kwm/default.nix +++ b/pkgs/os-specific/darwin/kwm/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tiling window manager with focus follows mouse for OSX"; - homepage = https://github.com/koekeishiya/kwm; - downloadPage = https://github.com/koekeishiya/kwm/releases; + homepage = "https://github.com/koekeishiya/kwm"; + downloadPage = "https://github.com/koekeishiya/kwm/releases"; platforms = platforms.darwin; maintainers = with maintainers; [ lnl7 ]; license = licenses.mit; diff --git a/pkgs/os-specific/darwin/lsusb/default.nix b/pkgs/os-specific/darwin/lsusb/default.nix index 02821fe61ef98..799a4761fbd14 100644 --- a/pkgs/os-specific/darwin/lsusb/default.nix +++ b/pkgs/os-specific/darwin/lsusb/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/jlhonora/lsusb; + homepage = "https://github.com/jlhonora/lsusb"; description = "lsusb command for Mac OS X"; platforms = stdenv.lib.platforms.darwin; license = stdenv.lib.licenses.mit; diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/pkgs/os-specific/darwin/m-cli/default.nix index 12bf02bf89ff7..2699bb8e1408b 100644 --- a/pkgs/os-specific/darwin/m-cli/default.nix +++ b/pkgs/os-specific/darwin/m-cli/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Swiss Army Knife for macOS"; inherit (src.meta) homepage; - repositories.git = git://github.com/rgcr/m-cli.git; + repositories.git = "git://github.com/rgcr/m-cli.git"; license = licenses.mit; diff --git a/pkgs/os-specific/darwin/maloader/default.nix b/pkgs/os-specific/darwin/maloader/default.nix index d1df820615df1..0de94c92388d7 100644 --- a/pkgs/os-specific/darwin/maloader/default.nix +++ b/pkgs/os-specific/darwin/maloader/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Mach-O loader for Linux"; - homepage = https://github.com/shinh/maloader; + homepage = "https://github.com/shinh/maloader"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; broken = true; # 2018-09-08, no succesful build since 2017-08-21 diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix index 23b5ded1fe614..26af46a171fdb 100644 --- a/pkgs/os-specific/darwin/opencflite/default.nix +++ b/pkgs/os-specific/darwin/opencflite/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Cross platform port of the macOS CoreFoundation"; - homepage = https://sourceforge.net/projects/opencflite/; + homepage = "https://sourceforge.net/projects/opencflite/"; license = stdenv.lib.licenses.apsl20; }; } diff --git a/pkgs/os-specific/darwin/osxfuse/default.nix b/pkgs/os-specific/darwin/osxfuse/default.nix index e1a00c71cb856..e13a084201201 100644 --- a/pkgs/os-specific/darwin/osxfuse/default.nix +++ b/pkgs/os-specific/darwin/osxfuse/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { buildInputs = [ headers ]; meta = with stdenv.lib; { - homepage = https://osxfuse.github.io; + homepage = "https://osxfuse.github.io"; description = "C-based FUSE for macOS SDK"; platforms = platforms.darwin; license = licenses.gpl2; diff --git a/pkgs/os-specific/darwin/osxsnarf/default.nix b/pkgs/os-specific/darwin/osxsnarf/default.nix index e391be1807c1f..d9a0de6c7f16e 100644 --- a/pkgs/os-specific/darwin/osxsnarf/default.nix +++ b/pkgs/os-specific/darwin/osxsnarf/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Plan 9-inspired way to share your OS X clipboard."; - homepage = https://github.com/eraserhd/osxsnarf; + homepage = "https://github.com/eraserhd/osxsnarf"; license = licenses.unlicense; platforms = platforms.darwin; maintainers = [ maintainers.eraserhd ]; diff --git a/pkgs/os-specific/darwin/qes/default.nix b/pkgs/os-specific/darwin/qes/default.nix index 21b0d605021d1..f231ee5716778 100644 --- a/pkgs/os-specific/darwin/qes/default.nix +++ b/pkgs/os-specific/darwin/qes/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Quartz Event Synthesizer"; - homepage = https://github.com/koekeishiya/qes; + homepage = "https://github.com/koekeishiya/qes"; platforms = platforms.darwin; maintainers = with maintainers; [ lnl7 ]; license = licenses.mit; diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix index ba5d3e9255bc9..d145c0d75d097 100644 --- a/pkgs/os-specific/darwin/skhd/default.nix +++ b/pkgs/os-specific/darwin/skhd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "skhd"; - version = "0.3.0"; + version = "0.3.5"; src = fetchFromGitHub { owner = "koekeishiya"; - repo = "skhd"; + repo = pname; rev = "v${version}"; - sha256 = "13pqnassmzppy2ipv995rh8lzw9rraxvi0ph6zgy63cbsdfzbhgl"; + sha256 = "0x099979kgpim18r0vi9vd821qnv0rl3rkj0nd1nx3wljxgf7mrg"; }; buildInputs = [ Carbon ]; @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple hotkey daemon for macOS"; - homepage = https://github.com/koekeishiya/skhd; + homepage = "https://github.com/koekeishiya/skhd"; platforms = platforms.darwin; - maintainers = with maintainers; [ lnl7 periklis ]; + maintainers = with maintainers; [ cmacrae lnl7 periklis ]; license = licenses.mit; }; } diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/pkgs/os-specific/darwin/smimesign/default.nix index 9efa230d3b728..39582ff6dccec 100644 --- a/pkgs/os-specific/darwin/smimesign/default.nix +++ b/pkgs/os-specific/darwin/smimesign/default.nix @@ -11,14 +11,14 @@ buildGoModule rec { sha256 = "0higcg2rdz02c0n50vigg7w7bxc7wlmg1x2ygrbh3iwms5lc74vi"; }; - modSha256 = "1k3gnjzblfk14y19zhlvwysx045nbw0xr5nngh7zj1wcqxhhm206"; + vendorSha256 = "00000000000000000hlvwysx045nbw0xr5nngh7zj1wcqxhhm206"; buildFlagsArray = "-ldflags=-X main.versionString=${version}"; meta = with lib; { description = "An S/MIME signing utility for macOS and Windows that is compatible with Git."; - homepage = https://github.com/github/smimesign; + homepage = "https://github.com/github/smimesign"; license = licenses.mit; platforms = platforms.darwin; maintainers = [ maintainers.enorris ]; diff --git a/pkgs/os-specific/darwin/spacebar/default.nix b/pkgs/os-specific/darwin/spacebar/default.nix new file mode 100644 index 0000000000000..9cbd6e62c7a22 --- /dev/null +++ b/pkgs/os-specific/darwin/spacebar/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge }: + +stdenv.mkDerivation rec { + pname = "spacebar"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "somdoron"; + repo = pname; + rev = "v${version}"; + sha256 = "0v8v4xsc67qpzm859r93ggq7rr7hmaj6dahdlg6g3ppj81cq0khz"; + }; + + buildInputs = [ Carbon Cocoa ScriptingBridge ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1/ + cp ./bin/spacebar $out/bin/spacebar + cp ./doc/spacebar.1 $out/share/man/man1/spacebar.1 + ''; + + meta = with stdenv.lib; { + description = "A status bar for yabai tiling window management"; + homepage = "https://github.com/somdoron/spacebar"; + platforms = platforms.darwin; + maintainers = [ maintainers.cmacrae ]; + license = licenses.mit; + }; +} diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix index 50c6d4fd2f41c..205391a52dab3 100644 --- a/pkgs/os-specific/darwin/trash/default.nix +++ b/pkgs/os-specific/darwin/trash/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/ali-rantakari/trash; + homepage = "https://github.com/ali-rantakari/trash"; description = "Small command-line program for OS X that moves files or folders to the trash."; platforms = stdenv.lib.platforms.darwin; diff --git a/pkgs/os-specific/darwin/wifi-password/default.nix b/pkgs/os-specific/darwin/wifi-password/default.nix index 801e180f7344d..2dfc97dec1bd7 100644 --- a/pkgs/os-specific/darwin/wifi-password/default.nix +++ b/pkgs/os-specific/darwin/wifi-password/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/rauchg/wifi-password; + homepage = "https://github.com/rauchg/wifi-password"; description = "Get the password of the wifi you're on"; platforms = stdenv.lib.platforms.darwin; license = stdenv.lib.licenses.mit; diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 282afe13c34ea..1144232fba211 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -32,7 +32,7 @@ let requireXcode = version: sha256: ''; }; meta = with stdenv.lib; { - homepage = https://developer.apple.com/downloads/; + homepage = "https://developer.apple.com/downloads/"; description = "Apple's XCode SDK"; license = licenses.unfree; platforms = platforms.darwin ++ platforms.linux; diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix new file mode 100644 index 0000000000000..821d7ee5620a0 --- /dev/null +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge }: + +stdenv.mkDerivation rec { + pname = "yabai"; + version = "3.0.1"; + + src = fetchFromGitHub { + owner = "koekeishiya"; + repo = pname; + rev = "v${version}"; + sha256 = "1m7hnrbwvahf174g6j5wjlcqa8zgd1fzqwrgnx9pma6pnh8q45lx"; + }; + + buildInputs = [ Carbon Cocoa ScriptingBridge ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1/ + cp ./bin/yabai $out/bin/yabai + cp ./doc/yabai.1 $out/share/man/man1/yabai.1 + ''; + + meta = with stdenv.lib; { + description = '' + A tiling window manager for macOS based on binary space partitioning + ''; + homepage = "https://github.com/koekeishiya/yabai"; + platforms = platforms.darwin; + maintainers = [ maintainers.cmacrae ]; + license = licenses.mit; + }; +} diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/os-specific/linux/915resolution/default.nix index ce21887f19f8f..906ea04293fe4 100644 --- a/pkgs/os-specific/linux/915resolution/default.nix +++ b/pkgs/os-specific/linux/915resolution/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { installPhase = "mkdir -p $out/sbin; cp 915resolution $out/sbin/"; meta = with stdenv.lib; { - homepage = http://915resolution.mango-lang.org/; + homepage = "http://915resolution.mango-lang.org/"; description = "A tool to modify Intel 800/900 video BIOS"; platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.publicDomain; diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index cc7317f5520a4..69a36d7bf52b0 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { the "old" `apm' command on ACPI systems. It includes battery and thermal information. ''; - homepage = https://sourceforge.net/projects/acpiclient/; + homepage = "https://sourceforge.net/projects/acpiclient/"; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ ]; diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix index d58aec4a97c9d..5ef5e2724b23e 100644 --- a/pkgs/os-specific/linux/acpid/default.nix +++ b/pkgs/os-specific/linux/acpid/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/acpid2/; + homepage = "https://sourceforge.net/projects/acpid2/"; description = "A daemon for delivering ACPI events to userspace programs"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/os-specific/linux/acpitool/default.nix index 86e6b54906adb..9f2ad5b5c03bc 100644 --- a/pkgs/os-specific/linux/acpitool/default.nix +++ b/pkgs/os-specific/linux/acpitool/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { meta = { description = "A small, convenient command-line ACPI client with a lot of features"; - homepage = https://sourceforge.net/projects/acpitool/; + homepage = "https://sourceforge.net/projects/acpitool/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.guibert ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index 67c5ff1408741..758c57bb9e130 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "afuse-0.4.1"; src = fetchurl { - url = https://github.com/pcarrier/afuse/archive/v0.4.1.tar.gz; + url = "https://github.com/pcarrier/afuse/archive/v0.4.1.tar.gz"; sha256 = "1sfhicmxppkvdd4z9klfn63snb71gr9hff6xij1gzk94xg6m0ycc"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Automounter in userspace"; - homepage = https://github.com/pcarrier/afuse; + homepage = "https://github.com/pcarrier/afuse"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-firmware/default.nix index d0a3d7645b323..01955534bfc74 100644 --- a/pkgs/os-specific/linux/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-firmware/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.alsa-project.org/; + homepage = "http://www.alsa-project.org/"; description = "Soundcard firmwares from the alsa project"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index 8dcddf4baf9b7..335ae204833dd 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,31 +1,33 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, alsa-ucm-conf, alsa-topology-conf }: stdenv.mkDerivation rec { - name = "alsa-lib-1.1.9"; + name = "alsa-lib-1.2.2"; src = fetchurl { url = "mirror://alsa/lib/${name}.tar.bz2"; - sha256 = "0jwr9g4yxg9gj6xx0sb2r6wrdl8amrjd19hilkrq4rirynp770s8"; + sha256 = "1v5kb8jyvrpkvvq7dq8hfbmcj68lml97i4s0prxpfx2mh3c57s6q"; }; patches = [ ./alsa-plugin-conf-multilib.patch ]; + enableParallelBuilding = true; + # Fix pcm.h file in order to prevent some compilation bugs - # 2: see http://stackoverflow.com/questions/3103400/how-to-overcome-u-int8-t-vs-uint8-t-issue-efficiently postPatch = '' sed -i -e 's|//int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);|/\*int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);\*/|' include/pcm.h + ''; - - sed -i -e '1i#include <stdint.h>' include/pcm.h - sed -i -e 's/u_int\([0-9]*\)_t/uint\1_t/g' include/pcm.h + postInstall = '' + ln -s ${alsa-ucm-conf}/share/alsa/{ucm,ucm2} $out/share/alsa + ln -s ${alsa-topology-conf}/share/alsa/topology $out/share/alsa ''; outputs = [ "out" "dev" ]; meta = with stdenv.lib; { - homepage = http://www.alsa-project.org/; + homepage = "http://www.alsa-project.org/"; description = "ALSA, the Advanced Linux Sound Architecture libraries"; longDescription = '' diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix index 77b351a199870..774dc3d8d6767 100644 --- a/pkgs/os-specific/linux/alsa-oss/default.nix +++ b/pkgs/os-specific/linux/alsa-oss/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = [ "ASOUND_STATE_DIR=$(TMPDIR)/dummy" ]; meta = with stdenv.lib; { - homepage = http://www.alsa-project.org/; + homepage = "http://www.alsa-project.org/"; description = "ALSA, the Advanced Linux Sound Architecture alsa-oss emulation"; longDescription = '' diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index b524d7906da42..a69d86c5c4d6c 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -9,9 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0z9k3ssbfk2ky2w13avgyf202j1drsz9sv3834bp33cj1i2hc3qw"; }; + nativeBuildInputs = [ pkgconfig ]; + # ToDo: a52, etc.? buildInputs = - [ pkgconfig alsaLib libogg ] + [ alsaLib libogg ] ++ lib.optional (libpulseaudio != null) libpulseaudio ++ lib.optional (libjack2 != null) libjack2; diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index 743e8f3576b02..2fef5e07c63cd 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "alsa-tools"; - version = "1.1.7"; + version = "1.2.2"; src = fetchurl { url = "mirror://alsa/tools/${pname}-${version}.tar.bz2"; - sha256 = "1xjfghr9s0j6n91kgs95cc4r6qrjsgc4yj2w0nir3xpnm0l36950"; + sha256 = "0jbkjmq038zapj66a7nkppdf644v2mwj581xbmh6k4i8w6mcglxz"; }; nativeBuildInputs = [ pkgconfig ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.alsa-project.org/; + homepage = "http://www.alsa-project.org/"; description = "ALSA, the Advanced Linux Sound Architecture tools"; longDescription = '' diff --git a/pkgs/os-specific/linux/alsa-topology-conf/default.nix b/pkgs/os-specific/linux/alsa-topology-conf/default.nix new file mode 100644 index 0000000000000..f73bbbdba3572 --- /dev/null +++ b/pkgs/os-specific/linux/alsa-topology-conf/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "alsa-topology-conf-${version}"; + version = "1.2.2"; + + src = fetchurl { + url = "mirror://alsa/lib/${name}.tar.bz2"; + sha256 = "09cls485ckdjsp4azhv3nw7chyg3r7zrqgald6yp70f7cysxcwml"; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/alsa + cp -r topology $out/share/alsa + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = "https://www.alsa-project.org/"; + description = "ALSA topology configuration files"; + + longDescription = '' + The Advanced Linux Sound Architecture (ALSA) provides audio and + MIDI functionality to the Linux-based operating system. + ''; + + license = licenses.bsd3; + maintainers = [ maintainers.roastiek ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/alsa-ucm-conf/default.nix b/pkgs/os-specific/linux/alsa-ucm-conf/default.nix new file mode 100644 index 0000000000000..685ba3e2c3e5b --- /dev/null +++ b/pkgs/os-specific/linux/alsa-ucm-conf/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "alsa-ucm-conf-${version}"; + version = "1.2.2"; + + src = fetchurl { + url = "mirror://alsa/lib/${name}.tar.bz2"; + sha256 = "0364fgzdm2qrsqvgqri25gzscbma7yqlv31wz8b1z9c5phlxkgvy"; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/alsa + cp -r ucm ucm2 $out/share/alsa + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = "https://www.alsa-project.org/"; + description = "ALSA Use Case Manager configuration"; + + longDescription = '' + The Advanced Linux Sound Architecture (ALSA) provides audio and + MIDI functionality to the Linux-based operating system. + ''; + + license = licenses.bsd3; + maintainers = [ maintainers.roastiek ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index b72944a49eb19..32763fcded51a 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -173,7 +173,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "AMDGPU-PRO drivers"; - homepage = http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx ; + homepage = "http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ corngood ]; diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index 0012c3de98971..5f8ca7ac46fa5 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { }.${stdenv.system} or null; meta = with stdenv.lib; { - homepage = https://anbox.io; + homepage = "https://anbox.io"; description = "Android in a box"; license = licenses.gpl2; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/os-specific/linux/anbox/kmod.nix b/pkgs/os-specific/linux/anbox/kmod.nix index 0888f2c54146c..6eb74ca25f6b3 100644 --- a/pkgs/os-specific/linux/anbox/kmod.nix +++ b/pkgs/os-specific/linux/anbox/kmod.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Anbox ashmem and binder drivers."; - homepage = https://github.com/anbox/anbox-modules; + homepage = "https://github.com/anbox/anbox-modules"; license = licenses.gpl2; platforms = platforms.linux; broken = (versionOlder kernel.version "4.4") || (kernel.features.grsecurity); diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index 2aa71b92beb19..1cfa6b5856feb 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20191103"; + version = "20200410"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "0x2f2sv0x0ry7kccp47s0hlxps3hbpg37dj3xjjgpdm5hmn2cjq3"; + sha256 = "1ik9a0k9gkaw5a80m25pxx5yfiwq34ffb7iqhwicz4lwz5wsw8d3"; }; installPhase = '' @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/M0Rf30/android-udev-rules; + homepage = "https://github.com/M0Rf30/android-udev-rules"; description = "Android udev rules list aimed to be the most comprehensive on the net"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index d661b2172b3ce..afb6799fbafce 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -39,12 +39,12 @@ let patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; + url = "https://git.alpinelinux.org/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; name = "0003-Added-missing-typedef-definitions-on-parser.patch"; sha256 = "0yyaqz8jlmn1bm37arggprqz0njb4lhjni2d9c8qfqj0kll0bam0"; }) (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0007-Do-not-build-install-vim-file-with-utils-package.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; + url = "https://git.alpinelinux.org/aports/plain/testing/apparmor/0007-Do-not-build-install-vim-file-with-utils-package.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; name = "0007-Do-not-build-install-vim-file-with-utils-package.patch"; sha256 = "1m4dx901biqgnr4w4wz8a2z9r9dxyw7wv6m6mqglqwf2lxinqmp4"; }) diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index a391f73391fb1..63f9b5399da9b 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ATI Catalyst display drivers"; - homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx; + homepage = "http://support.amd.com/us/gpudownload/Pages/index.aspx"; license = licenses.unfree; maintainers = with maintainers; [ marcweber offline jerith666 ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index 5144add3a37f4..0d8392cbcd8a8 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { ''; inherit version; license = licenses.gpl2; - downloadPage = http://atoptool.nl/downloadatop.php; + downloadPage = "http://atoptool.nl/downloadatop.php"; }; } diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index dab9504964300..f77d71c823b8c 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; meta = { description = "Audit Library"; - homepage = https://people.redhat.com/sgrubb/audit/; + homepage = "https://people.redhat.com/sgrubb/audit/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index 591a9a8792fc5..baf3cc6ad55e9 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation { meta = { description = "Kernel-based automounter"; - homepage = https://www.kernel.org/pub/linux/daemons/autofs/; + homepage = "https://www.kernel.org/pub/linux/daemons/autofs/"; license = stdenv.lib.licenses.gpl2Plus; executables = [ "automount" ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index fa2be46688cb3..c1fb3ef5ee1a4 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki; + homepage = "https://www.open-mesh.org/projects/batman-adv/wiki/Wiki"; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, information distribution tool"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ fpletz ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 57bafb398d1eb..5767c4aa72c4d 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki; + homepage = "https://www.open-mesh.org/projects/batman-adv/wiki/Wiki"; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, control tool"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ fpletz ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 796be1e5d484a..8985949a01232 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki; + homepage = "https://www.open-mesh.org/projects/batman-adv/wiki/Wiki"; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ fpletz ]; diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index 4b9148600686d..67cbc6e5c5e62 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -15,10 +15,16 @@ stdenv.mkDerivation { sha256 = "0xql1nv8dafnrcg54f3jsi3ny3cd2ca9iv73pxpgxd2gfczvvjkn"; }; - patches = [ (fetchpatch { - url = "https://github.com/Bumblebee-Project/bbswitch/pull/102.patch"; - sha256 = "1lbr6pyyby4k9rn2ry5qc38kc738d0442jhhq57vmdjb6hxjya7m"; - }) ]; + patches = [ + (fetchpatch { + url = "https://github.com/Bumblebee-Project/bbswitch/pull/102.patch"; + sha256 = "1lbr6pyyby4k9rn2ry5qc38kc738d0442jhhq57vmdjb6hxjya7m"; + }) + (fetchpatch { + url = "https://github.com/Bumblebee-Project/bbswitch/pull/196.patch"; + sha256 = "02ihy3piws7783qbm9q0mb9s18ipn5ckdy1iar74xn31qjrsn99n"; + }) + ]; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -51,7 +57,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A module for powering off hybrid GPUs"; platforms = [ "x86_64-linux" "i686-linux" ]; - homepage = https://github.com/Bumblebee-Project/bbswitch; + homepage = "https://github.com/Bumblebee-Project/bbswitch"; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 585ab6ec72539..7f95ef47ee9cb 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -5,11 +5,11 @@ python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.13.0"; + version = "0.14.0"; src = fetchurl { url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; - sha256 = "15xpwf17x2j1c1wcb84cgfs35dp5w0rjd9mllmddmdjvn303wffx"; + sha256 = "1hw02bib06fjyw61as5pmhf0qxy0wv0nw8fff2i8a9d1zcd8xf3p"; }; format = "other"; @@ -67,7 +67,7 @@ python.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "Dynamic Tracing Tools for Linux"; - homepage = https://iovisor.github.io/bcc/; + homepage = "https://iovisor.github.io/bcc/"; license = licenses.asl20; maintainers = with maintainers; [ ragge mic92 thoughtpolice ]; }; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 29b100a33c526..401ab39bca369 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -11,9 +11,13 @@ , readline , systemd , udev -}: - -stdenv.mkDerivation rec { +}: let + pythonPath = with python3.pkgs; [ + dbus-python + pygobject3 + recursivePthLoader + ]; +in stdenv.mkDerivation rec { pname = "bluez"; version = "5.54"; @@ -22,12 +26,6 @@ stdenv.mkDerivation rec { sha256 = "1p2ncvjz6alr9n3l5wvq2arqgc7xjs6dqyar1l9jp0z8cfgapkb8"; }; - pythonPath = with python3.pkgs; [ - dbus-python - pygobject3 - recursivePthLoader - ]; - buildInputs = [ alsaLib dbus @@ -44,7 +42,7 @@ stdenv.mkDerivation rec { python3.pkgs.wrapPython ]; - outputs = [ "out" "dev" "test" ]; + outputs = [ "out" "dev" ] ++ lib.optional doCheck "test"; postPatch = '' substituteInPlace tools/hid2hci.rules \ @@ -79,7 +77,7 @@ stdenv.mkDerivation rec { doCheck = stdenv.hostPlatform.isx86_64; - postInstall = '' + postInstall = lib.optionalString doCheck '' mkdir -p $test/{bin,test} cp -a test $test pushd $test/test @@ -94,8 +92,8 @@ stdenv.mkDerivation rec { ln -s ../test/$a $test/bin/bluez-$a done popd - wrapPythonProgramsIn $test/test "$test/test $pythonPath" - + wrapPythonProgramsIn $test/test "$test/test ${toString pythonPath}" + '' + '' # for bluez4 compatibility for NixOS mkdir $out/sbin ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd @@ -119,6 +117,6 @@ stdenv.mkDerivation rec { homepage = "http://www.bluez.org/"; license = with licenses; [ gpl2 lgpl21 ]; platforms = platforms.linux; - repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git; + repositories.git = "https://git.kernel.org/pub/scm/bluetooth/bluez.git"; }; } diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index 3a4c2ef7d9f78..114a90129ac22 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Thunderbolt 3 device management daemon"; - homepage = https://gitlab.freedesktop.org/bolt/bolt; + homepage = "https://gitlab.freedesktop.org/bolt/bolt"; license = licenses.lgpl21Plus; maintainers = [ maintainers.callahad ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index 9eb9c53b8dd41..0c360e60b7e0a 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; rev = "refs/tags/v${version}"; - sha256 = "1qkfbmksdssmm1qxcvcwdql1pz8cqy233195n9i9q5dhk876f75v"; + sha256 = "00fvkq3razwacnpb82zkpv63dgyigbqx3gj6g0ka94nwa74i5i77"; }; enableParallelBuilding = true; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High-level tracing language for Linux eBPF"; - homepage = https://github.com/iovisor/bpftrace; + homepage = "https://github.com/iovisor/bpftrace"; license = licenses.asl20; maintainers = with maintainers; [ rvl thoughtpolice ]; }; diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index e3207fdf37d13..1aeb4a907fbf6 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "https://sourceforge.net/projects/bridge/"; - homepage = https://wiki.linuxfoundation.org/networking/bridge; + homepage = "https://wiki.linuxfoundation.org/networking/bridge"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/brillo/default.nix b/pkgs/os-specific/linux/brillo/default.nix index 1262260664cdc..5baaa0752aa68 100644 --- a/pkgs/os-specific/linux/brillo/default.nix +++ b/pkgs/os-specific/linux/brillo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Backlight and Keyboard LED control tool"; - homepage = https://gitlab.com/cameronnemo/brillo; + homepage = "https://gitlab.com/cameronnemo/brillo"; license = [ licenses.gpl3 licenses.bsd0 ]; platforms = platforms.linux; maintainers = [ maintainers.alexarice ]; diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index e24171dfefecd..ecaa3896044d9 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation { ./linux-4.12.patch ./linux-4.15.patch ./linux-5.1.patch + # source: https://salsa.debian.org/Herrie82-guest/broadcom-sta/-/commit/247307926e5540ad574a17c062c8da76990d056f + ./linux-5.6.patch ./null-pointer-fix.patch ./gcc.patch ]; @@ -57,7 +59,7 @@ stdenv.mkDerivation { meta = { description = "Kernel module driver for some Broadcom's wireless cards"; - homepage = http://www.broadcom.com/support/802.11/linux_sta.php; + homepage = "http://www.broadcom.com/support/802.11/linux_sta.php"; license = stdenv.lib.licenses.unfreeRedistributable; maintainers = with stdenv.lib.maintainers; [ phreedom ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-5.6.patch b/pkgs/os-specific/linux/broadcom-sta/linux-5.6.patch new file mode 100644 index 0000000000000..df5af79f77c65 --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/linux-5.6.patch @@ -0,0 +1,87 @@ +From dd057e40a167f4febb1a7c77dd32b7d36056952c Mon Sep 17 00:00:00 2001 +From: Herman van Hazendonk <github.com@herrie.org> +Date: Tue, 31 Mar 2020 17:09:55 +0200 +Subject: [PATCH] Add fixes for 5.6 kernel + +Use ioremap instead of ioremap_nocache and proc_ops instead of file_operations on Linux kernel 5.6 and above. + +Signed-off-by: Herman van Hazendonk <github.com@herrie.org> +--- + src/shared/linux_osl.c | 6 +++++- + src/wl/sys/wl_linux.c | 21 ++++++++++++++++++++- + 2 files changed, 25 insertions(+), 2 deletions(-) + +diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c +index 6157d18..dcfc075 100644 +--- a/src/shared/linux_osl.c ++++ b/src/shared/linux_osl.c +@@ -942,7 +942,11 @@ osl_getcycles(void) + void * + osl_reg_map(uint32 pa, uint size) + { +- return (ioremap_nocache((unsigned long)pa, (unsigned long)size)); ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++ return (ioremap((unsigned long)pa, (unsigned long)size)); ++ #else ++ return (ioremap_nocache((unsigned long)pa, (unsigned long)size)); ++ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */ + } + + void +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index 0d05100..6d9dd0d 100644 +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -582,10 +582,17 @@ wl_attach(uint16 vendor, uint16 device, ulong regs, + } + wl->bcm_bustype = bustype; + ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++ if ((wl->regsva = ioremap(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) { ++ WL_ERROR(("wl%d: ioremap() failed\n", unit)); ++ goto fail; ++ } ++ #else + if ((wl->regsva = ioremap_nocache(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) { + WL_ERROR(("wl%d: ioremap() failed\n", unit)); + goto fail; + } ++ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */ + + wl->bar1_addr = bar1_addr; + wl->bar1_size = bar1_size; +@@ -772,8 +779,13 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + if ((val & 0x0000ff00) != 0) + pci_write_config_dword(pdev, 0x40, val & 0xffff00ff); + bar1_size = pci_resource_len(pdev, 2); ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++ bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2), ++ bar1_size); ++ #else + bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2), + bar1_size); ++ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */ + wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev, + pdev->irq, bar1_addr, bar1_size); + +@@ -3335,12 +3347,19 @@ wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++static const struct proc_ops wl_fops = { ++ .proc_read = wl_proc_read, ++ .proc_write = wl_proc_write, ++}; ++#else + static const struct file_operations wl_fops = { + .owner = THIS_MODULE, + .read = wl_proc_read, + .write = wl_proc_write, + }; +-#endif ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */ ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) */ + + static int + wl_reg_proc_entry(wl_info_t *wl) diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index d2e5d91e36511..4e94151a8129a 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A bittorrent filesystem based on FUSE"; - homepage = https://github.com/johang/btfs; + homepage = "https://github.com/johang/btfs"; license = licenses.gpl3; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 41ac6e94ab374..430066831b874 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tiny versions of common UNIX utilities in a single small executable"; - homepage = https://busybox.net/; + homepage = "https://busybox.net/"; license = licenses.gpl2; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/cachefilesd/default.nix b/pkgs/os-specific/linux/cachefilesd/default.nix index 44c2cfff5a2b9..27fd8c9613ac3 100644 --- a/pkgs/os-specific/linux/cachefilesd/default.nix +++ b/pkgs/os-specific/linux/cachefilesd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Local network file caching management daemon"; - homepage = https://people.redhat.com/dhowells/fscache/; + homepage = "https://people.redhat.com/dhowells/fscache/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix index 1451a4e96c087..2b6b82591b594 100644 --- a/pkgs/os-specific/linux/can-utils/default.nix +++ b/pkgs/os-specific/linux/can-utils/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "CAN userspace utilities and tools (for use with Linux SocketCAN)"; - homepage = https://github.com/linux-can/can-utils; + homepage = "https://github.com/linux-can/can-utils"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/os-specific/linux/cgmanager/default.nix b/pkgs/os-specific/linux/cgmanager/default.nix index 6ba86036a52a5..d890ef44f7451 100644 --- a/pkgs/os-specific/linux/cgmanager/default.nix +++ b/pkgs/os-specific/linux/cgmanager/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://linuxcontainers.org/cgmanager/introduction/; + homepage = "https://linuxcontainers.org/cgmanager/introduction/"; description = "A central privileged daemon that manages all your cgroups"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 1ee7ece05377f..ad136b811df8e 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "root_sbindir=$(out)/sbin" ]; meta = with stdenv.lib; { - homepage = http://www.samba.org/linux-cifs/cifs-utils/; + homepage = "http://www.samba.org/linux-cifs/cifs-utils/"; description = "Tools for managing Linux CIFS client filesystems"; platforms = platforms.linux; license = licenses.lgpl3; diff --git a/pkgs/os-specific/linux/compsize/default.nix b/pkgs/os-specific/linux/compsize/default.nix index 0f24b1a18e9b4..dd54df77c3485 100644 --- a/pkgs/os-specific/linux/compsize/default.nix +++ b/pkgs/os-specific/linux/compsize/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "btrfs: Find compression type/ratio on a file or set of files"; - homepage = https://github.com/kilobyte/compsize; + homepage = "https://github.com/kilobyte/compsize"; license = licenses.gpl2; maintainers = with maintainers; [ CrazedProgrammer ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index f826ddd423d8e..14f17da55a773 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = with stdenv.lib; { - homepage = http://conky.sourceforge.net/; + homepage = "http://conky.sourceforge.net/"; description = "Advanced, highly configurable system monitor based on torsmo"; maintainers = [ maintainers.guibert ]; license = licenses.gpl3Plus; diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix index 20c441ffae2fb..80785015e7665 100644 --- a/pkgs/os-specific/linux/conntrack-tools/default.nix +++ b/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "conntrack-tools"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { url = "https://www.netfilter.org/projects/conntrack-tools/files/${pname}-${version}.tar.bz2"; - sha256 = "0qm4m78hr6a4fbmnkw5nyjm1pzzhydzx0nz7f96iv1c4fsfdkiin"; + sha256 = "0psx41bclqrh4514yzq03rvs3cq3scfpd1v4kkyxnic2hk65j22r"; }; buildInputs = [ @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex bison pkgconfig ]; meta = with stdenv.lib; { - homepage = http://conntrack-tools.netfilter.org/; + homepage = "http://conntrack-tools.netfilter.org/"; description = "Connection tracking userspace tools"; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix index c46af5fba85c9..83de8f5ae1a50 100644 --- a/pkgs/os-specific/linux/consoletools/default.nix +++ b/pkgs/os-specific/linux/consoletools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=\"\"" ]; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/linuxconsole/; + homepage = "https://sourceforge.net/projects/linuxconsole/"; description = "A set of tools for joysticks and serial peripherals"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index 04da31176da20..4c0515e94b3b6 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools to display or change the CPU governor settings"; - homepage = http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html; + homepage = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix index 601810f260009..b6ecaa11de28f 100644 --- a/pkgs/os-specific/linux/cpupower/default.nix +++ b/pkgs/os-specific/linux/cpupower/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tool to examine and tune power saving features"; - homepage = https://www.kernel.org/; + homepage = "https://www.kernel.org/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/cpuset/default.nix b/pkgs/os-specific/linux/cpuset/default.nix index 5791145d52afe..0a9b38f2888b5 100644 --- a/pkgs/os-specific/linux/cpuset/default.nix +++ b/pkgs/os-specific/linux/cpuset/default.nix @@ -20,7 +20,7 @@ python2Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Cpuset is a Python application that forms a wrapper around the standard Linux filesystem calls to make using the cpusets facilities in the Linux kernel easier."; - homepage = https://github.com/wykurz/cpuset; + homepage = "https://github.com/wykurz/cpuset"; license = licenses.gpl2; maintainers = with maintainers; [ wykurz ]; }; diff --git a/pkgs/os-specific/linux/cramfsswap/default.nix b/pkgs/os-specific/linux/cramfsswap/default.nix index d183bb25cb569..eb04761eef472 100644 --- a/pkgs/os-specific/linux/cramfsswap/default.nix +++ b/pkgs/os-specific/linux/cramfsswap/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "cramfsswap-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://debian/pool/main/c/cramfsswap/cramfsswap_1.4.1.tar.gz; + url = "mirror://debian/pool/main/c/cramfsswap/cramfsswap_1.4.1.tar.gz"; sha256 = "0c6lbx1inkbcvvhh3y6fvfaq3w7d1zv7psgpjs5f3zjk1jysi9qd"; }; diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index 501b1fb1884a3..5811e9358b01d 100644 --- a/pkgs/os-specific/linux/crda/default.nix +++ b/pkgs/os-specific/linux/crda/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { to the system configuration. ''; - homepage = http://drvbp1.linux-foundation.org/~mcgrof/rel-html/crda/; + homepage = "http://drvbp1.linux-foundation.org/~mcgrof/rel-html/crda/"; license = licenses.free; # "copyleft-next 0.3.0", as yet without a web site platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 3210a0106a6f2..462658396c8ab 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "criu"; - version = "3.13"; + version = "3.14"; src = fetchurl { url = "https://download.openvz.org/criu/${pname}-${version}.tar.bz2"; - sha256 = "1yn9ix9lqvqvjrs3a3g6g1wqfniyf9n7giy0mr3jvijmrcm7y0pa"; + sha256 = "1jrr3v99g18gc0hriz0avq6ccdvyya0j6wwz888sdsc4icc30gzn"; }; enableParallelBuilding = true; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Userspace checkpoint/restore for Linux"; - homepage = https://criu.org; + homepage = "https://criu.org"; license = licenses.gpl2; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.thoughtpolice ]; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index c146e18f68d5a..321f00b0ef2d0 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Device that allows access to Linux kernel cryptographic drivers"; - homepage = http://cryptodev-linux.org/; + homepage = "http://cryptodev-linux.org/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; broken = !stdenv.lib.versionOlder kernel.version "4.13"; diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 9c621d28ed290..06be9f3432e79 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = https://gitlab.com/cryptsetup/cryptsetup/; + homepage = "https://gitlab.com/cryptsetup/cryptsetup/"; description = "LUKS for dm-crypt"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index b61d99cead104..d84676bcda6f2 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux D-Bus Message Broker"; - homepage = https://github.com/bus1/dbus-broker/wiki; + homepage = "https://github.com/bus1/dbus-broker/wiki"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/os-specific/linux/devmem2/default.nix b/pkgs/os-specific/linux/devmem2/default.nix index 77fa7fe3b1b6e..9115601e35735 100644 --- a/pkgs/os-specific/linux/devmem2/default.nix +++ b/pkgs/os-specific/linux/devmem2/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple program to read/write from/to any location in memory"; - homepage = http://lartmaker.nl/lartware/port/; + homepage = "http://lartmaker.nl/lartware/port/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix index a880f699b6997..c79371909152b 100644 --- a/pkgs/os-specific/linux/directvnc/default.nix +++ b/pkgs/os-specific/linux/directvnc/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "DirectFB VNC client"; - homepage = http://drinkmilk.github.io/directvnc/; + homepage = "http://drinkmilk.github.io/directvnc/"; license = licenses.gpl2; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix index 46ebc923e3b27..b2ae930f193c7 100644 --- a/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "disk-indicator-2014-05-19"; src = fetchgit { - url = git://github.com/MeanEYE/Disk-Indicator.git; + url = "git://github.com/MeanEYE/Disk-Indicator.git"; rev = "51ef4afd8141b8d0659cbc7dc62189c56ae9c2da"; sha256 = "10jx6mx9qarn21p2l2jayxkn1gmqhvck1wymgsr4jmbwxl8ra5kd"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/MeanEYE/Disk-Indicator; + homepage = "https://github.com/MeanEYE/Disk-Indicator"; description = "A program that will turn a LED into a hard disk indicator"; longDescription = '' Small program for Linux that will turn your Scroll, Caps or Num Lock LED diff --git a/pkgs/os-specific/linux/displaylink/udev-installer.patch b/pkgs/os-specific/linux/displaylink/udev-installer.patch index bd7d9d145c9a2..880c073fbcf62 100644 --- a/pkgs/os-specific/linux/displaylink/udev-installer.patch +++ b/pkgs/os-specific/linux/displaylink/udev-installer.patch @@ -5,13 +5,13 @@ start_service() { - systemctl start displaylink-driver -+ @systemd@/bin/systemctl start --no-block dlm ++ /run/current-system/systemd/bin/systemctl start --no-block dlm } stop_service() { - systemctl stop displaylink-driver -+ @systemd@/bin/systemctl stop dlm ++ /run/current-system/systemd/bin/systemctl stop dlm } EOF diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix index 55dcba378ca10..97ad75851a6a8 100644 --- a/pkgs/os-specific/linux/dmidecode/default.nix +++ b/pkgs/os-specific/linux/dmidecode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = https://www.nongnu.org/dmidecode/; + homepage = "https://www.nongnu.org/dmidecode/"; description = "A tool that reads information about your system's hardware from the BIOS according to the SMBIOS/DMI standard"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 414f276a21093..8ad703bdd4b63 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Set of libraries and drivers for fast packet processing"; - homepage = http://dpdk.org/; + homepage = "http://dpdk.org/"; license = with licenses; [ lgpl21 gpl2 bsd2 ]; platforms = platforms.linux; maintainers = with maintainers; [ domenkozar magenbluten orivej ]; diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 02b8afa721f6e..bbf2535ce3d6d 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.drbd.org/; + homepage = "http://www.drbd.org/"; description = "Distributed Replicated Block Device, a distributed storage system for Linux"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix index 25d0eb1fd029f..2e235e27f364c 100644 --- a/pkgs/os-specific/linux/dstat/default.nix +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -15,7 +15,7 @@ python2Packages.buildPythonApplication rec { makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = http://dag.wieers.com/home-made/dstat/; + homepage = "http://dag.wieers.com/home-made/dstat/"; description = "Versatile resource statistics tool"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix index 38ef803d8e527..ea17c287a2926 100644 --- a/pkgs/os-specific/linux/e1000e/default.nix +++ b/pkgs/os-specific/linux/e1000e/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Linux kernel drivers for Intel Ethernet adapters and LOMs (LAN On Motherboard)"; - homepage = http://e1000.sf.net/; + homepage = "http://e1000.sf.net/"; license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix index 96283af40d05b..2e0f5ef783306 100644 --- a/pkgs/os-specific/linux/earlyoom/default.nix +++ b/pkgs/os-specific/linux/earlyoom/default.nix @@ -1,26 +1,31 @@ -{ lib, stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, pandoc, installShellFiles, withManpage ? false }: stdenv.mkDerivation rec { - name = "earlyoom-${VERSION}"; - # This environment variable is read by make to set the build version. - VERSION = "1.5"; + pname = "earlyoom"; + version = "1.6"; src = fetchFromGitHub { owner = "rfjakob"; repo = "earlyoom"; - rev = "v${VERSION}"; - sha256 = "1wcw2lfd9ajachbrjqywkzj9x6zv32gij2r6yap26x1wdd5x7i93"; + rev = "v${version}"; + sha256 = "0g2bjsvnqq5h4g1k3a0x6ixb334wpzbm2gafl78b6ic6j45smwcs"; }; + nativeBuildInputs = stdenv.lib.optionals withManpage [ pandoc installShellFiles ]; + + makeFlags = [ "VERSION=${version}" ]; + installPhase = '' install -D earlyoom $out/bin/earlyoom + '' + stdenv.lib.optionalString withManpage '' + installManPage earlyoom.1 ''; - meta = { + meta = with stdenv.lib; { description = "Early OOM Daemon for Linux"; - homepage = https://github.com/rfjakob/earlyoom; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; + homepage = "https://github.com/rfjakob/earlyoom"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; []; }; } diff --git a/pkgs/os-specific/linux/ebtables/default.nix b/pkgs/os-specific/linux/ebtables/default.nix index 3f025ca75045d..d3705195f599b 100644 --- a/pkgs/os-specific/linux/ebtables/default.nix +++ b/pkgs/os-specific/linux/ebtables/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A filtering tool for Linux-based bridging firewalls"; - homepage = http://ebtables.sourceforge.net/; + homepage = "http://ebtables.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/os-specific/linux/edac-utils/default.nix index eabd084855363..fb0a6dbf62ecd 100644 --- a/pkgs/os-specific/linux/edac-utils/default.nix +++ b/pkgs/os-specific/linux/edac-utils/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/grondo/edac-utils; + homepage = "https://github.com/grondo/edac-utils"; description = "Handles the reporting of hardware-related memory errors"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index b1a3a4f089151..cb971d452d61d 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.30"; + version = "0.31"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "0kiglgc02a6hqi1nhnl4d8lxax8b1fljp50pvqswrnbh7pgb5676"; + sha256 = "1qlpc906xd78fzxvvj2kxi3aikgnw0c0h3x620s131apax4qrnqa"; }; patches = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://01.org/ell; + homepage = "https://01.org/ell"; description = "Embedded Linux Library"; longDescription = '' The Embedded Linux* Library (ELL) provides core, low-level functionality for system daemons. It typically has no dependencies other than the Linux kernel, C standard library, and libdl (for dynamic linking). While ELL is designed to be efficient and compact enough for use on embedded Linux platforms, it is not limited to resource-constrained systems. diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 9b5d82b9f7b36..a3935d0069e36 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { - version = "2.1.2"; + version = "2.2.7"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "1dp1q99m2x8hq99his6n62yw0v1lbzrlyv67w1ndc774m2k77r5w"; + sha256 = "1ap100xh5wrdvy5h2ydcy6rqcklb4fz6xxs33ad3j9yx3h1ixj2d"; }; hardeningDisable = [ "pic" ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Amazon Elastic Network Adapter (ENA) driver for Linux"; - homepage = https://github.com/amzn/amzn-drivers; + homepage = "https://github.com/amzn/amzn-drivers"; license = licenses.gpl2; maintainers = [ maintainers.eelco ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/extrace/default.nix b/pkgs/os-specific/linux/extrace/default.nix index 0d00eaa3ac800..23a9c68b5d5b8 100644 --- a/pkgs/os-specific/linux/extrace/default.nix +++ b/pkgs/os-specific/linux/extrace/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/leahneukirchen/extrace; + homepage = "https://github.com/leahneukirchen/extrace"; description = "Trace exec() calls system-wide"; license = with licenses; [ gpl2 bsd2 ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix index d771563158bd5..223f766aa228c 100644 --- a/pkgs/os-specific/linux/facetimehd/default.nix +++ b/pkgs/os-specific/linux/facetimehd/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/patjak/bcwc_pcie; + homepage = "https://github.com/patjak/bcwc_pcie"; description = "Linux driver for the Facetime HD (Broadcom 1570) PCIe webcam"; license = licenses.gpl2; maintainers = with maintainers; [ womfoo grahamc kraem ]; diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix index b99f719f8361e..69d1afad8a685 100644 --- a/pkgs/os-specific/linux/fatrace/default.nix +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Report system-wide file access events"; - homepage = https://launchpad.net/fatrace/; + homepage = "https://launchpad.net/fatrace/"; license = licenses.gpl3Plus; longDescription = '' fatrace reports file access events from all running processes. diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index d56b254d3821e..2b049bc6df5d2 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (s) version; description = "Framebuffer terminal emulator"; - homepage = https://code.google.com/archive/p/fbterm/; + homepage = "https://code.google.com/archive/p/fbterm/"; maintainers = [ maintainers.raskin ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 4d263194a49d3..8c7a109cb76bd 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://firejail.wordpress.com/; + homepage = "https://firejail.wordpress.com/"; downloadPage = "https://sourceforge.net/projects/firejail/files/firejail/"; }; } diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix index 8aa78e65dec13..7cb5d2a9a4087 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Firmware extractor for cards supported by the b43 kernel module"; - homepage = http://wireless.kernel.org/en/users/Drivers/b43; + homepage = "http://wireless.kernel.org/en/users/Drivers/b43"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix index 58cd88b4dce02..4f03f58b11fb1 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Firmware for cards supported by the b43 kernel module"; - homepage = http://wireless.kernel.org/en/users/Drivers/b43; + homepage = "http://wireless.kernel.org/en/users/Drivers/b43"; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix index 959c0c74618e7..3972e52977f68 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Firmware for cards supported by the b43 kernel module"; - homepage = http://wireless.kernel.org/en/users/Drivers/b43; - downloadPage = http://www.lwfinger.com/b43-firmware; + homepage = "http://wireless.kernel.org/en/users/Drivers/b43"; + downloadPage = "http://www.lwfinger.com/b43-firmware"; license = licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix index 4d5271a9ddfee..314a6b7521b88 100644 --- a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Firmware for Broadcom WIDCOMM® Bluetooth devices"; - homepage = http://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth; + homepage = "http://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ zraexy ]; diff --git a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix index 9a99881be4627..5b4506a10eae6 100644 --- a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix +++ b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/winterheart/broadcom-bt-firmware/; + homepage = "https://github.com/winterheart/broadcom-bt-firmware/"; description = "A tool that converts hex to hcd based on inf file"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix index 1a1c1ec39d7bf..7d735e69f5687 100644 --- a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "facetimehd firmware"; - homepage = https://support.apple.com/kb/DL1877; + homepage = "https://support.apple.com/kb/DL1877"; license = licenses.unfree; maintainers = with maintainers; [ womfoo grahamc ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 1a454cb8957ea..77be6317b6c92 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Binary firmware collection packaged by kernel.org"; - homepage = http://packages.debian.org/sid/firmware-linux-nonfree; + homepage = "http://packages.debian.org/sid/firmware-linux-nonfree"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch index a13251476de3e..a727e5f4a85bf 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch @@ -1,5 +1,5 @@ diff --git a/data/meson.build b/data/meson.build -index 0667bd78..92d6c7b9 100644 +index bb749fd4..b611875b 100644 --- a/data/meson.build +++ b/data/meson.build @@ -17,7 +17,7 @@ endif @@ -12,41 +12,38 @@ index 0667bd78..92d6c7b9 100644 endif diff --git a/data/pki/meson.build b/data/pki/meson.build -index eefcc914..dc801fa1 100644 +index 94bb0b6f..1ea6a9ac 100644 --- a/data/pki/meson.build +++ b/data/pki/meson.build -@@ -4,14 +4,14 @@ if get_option('gpg') - 'GPG-KEY-Linux-Foundation-Firmware', - 'GPG-KEY-Linux-Vendor-Firmware-Service', - ], -- install_dir : join_paths(sysconfdir, 'pki', 'fwupd') -+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd') - ) - - install_data([ - 'GPG-KEY-Linux-Foundation-Metadata', - 'GPG-KEY-Linux-Vendor-Firmware-Service', - ], -- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata') -+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata') - ) - endif +@@ -3,24 +3,23 @@ install_data([ + 'GPG-KEY-Linux-Foundation-Firmware', + 'GPG-KEY-Linux-Vendor-Firmware-Service', + ], +- install_dir : join_paths(sysconfdir, 'pki', 'fwupd') ++ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd') + ) -@@ -19,12 +19,12 @@ if get_option('pkcs7') - install_data([ - 'LVFS-CA.pem', - ], -- install_dir : join_paths(sysconfdir, 'pki', 'fwupd') -+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd') - ) - install_data([ - 'LVFS-CA.pem', - ], -- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata') -+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata') - ) - endif + install_data([ + 'GPG-KEY-Linux-Foundation-Metadata', + 'GPG-KEY-Linux-Vendor-Firmware-Service', + ], +- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata') ++ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata') + ) + install_data([ + 'LVFS-CA.pem', + ], +- install_dir : join_paths(sysconfdir, 'pki', 'fwupd') ++ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd') + ) + install_data([ + 'LVFS-CA.pem', + ], +- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata') ++ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata') + ) +- diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build index 826a3c1d..b78db663 100644 --- a/data/remotes.d/meson.build @@ -76,10 +73,10 @@ index 826a3c1d..b78db663 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index b1a523d2..aacb8e0a 100644 +index 87ea67e5..3a4374db 100644 --- a/meson.build +++ b/meson.build -@@ -169,6 +169,12 @@ endif +@@ -175,6 +175,12 @@ endif mandir = join_paths(prefix, get_option('mandir')) localedir = join_paths(prefix, get_option('localedir')) @@ -93,10 +90,10 @@ index b1a523d2..aacb8e0a 100644 gio = dependency('gio-2.0', version : '>= 2.45.8') giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false) diff --git a/meson_options.txt b/meson_options.txt -index be0adfef..73983333 100644 +index 3da9b6c4..6c80275b 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -26,6 +26,7 @@ option('plugin_coreboot', type : 'boolean', value : true, description : 'enable +@@ -24,6 +24,7 @@ option('plugin_coreboot', type : 'boolean', value : true, description : 'enable option('systemd', type : 'boolean', value : true, description : 'enable systemd support') option('systemdunitdir', type: 'string', value: '', description: 'Directory for systemd units') option('elogind', type : 'boolean', value : false, description : 'enable elogind support') @@ -104,6 +101,19 @@ index be0adfef..73983333 100644 option('tests', type : 'boolean', value : true, description : 'enable tests') option('udevdir', type: 'string', value: '', description: 'Directory for udev rules') option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules') +diff --git a/plugins/ata/meson.build b/plugins/ata/meson.build +index 8444bb8a..fa4a8ad1 100644 +--- a/plugins/ata/meson.build ++++ b/plugins/ata/meson.build +@@ -7,7 +7,7 @@ install_data([ + ) + + install_data(['ata.conf'], +- install_dir: join_paths(sysconfdir, 'fwupd') ++ install_dir: join_paths(sysconfdir_install, 'fwupd') + ) + + shared_module('fu_plugin_ata', diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build index ed4eee70..76dbdb1d 100644 --- a/plugins/dell-esrt/meson.build @@ -142,10 +152,10 @@ index 06ab34ee..297a9182 100644 # we use functions from 2.52 in the tests if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52') diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build -index 7252580d..7188d1c5 100644 +index 5838cecc..9ba3d5cd 100644 --- a/plugins/uefi/meson.build +++ b/plugins/uefi/meson.build -@@ -104,7 +104,7 @@ if get_option('man') +@@ -101,7 +101,7 @@ if get_option('man') endif install_data(['uefi.conf'], diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 86a2bfbcc9e8f..2a0e52c658ae5 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -2,6 +2,7 @@ { stdenv , fetchurl +, fetchpatch , substituteAll , gtk-doc , pkgconfig @@ -16,7 +17,7 @@ , glib-networking , libsoup , help2man -, gpgme +, libjcat , libxslt , elfutils , libsmbios @@ -31,7 +32,6 @@ , docbook_xsl , ninja , gcab -, gnutls , python3 , wrapGAppsHook , json-glib @@ -87,11 +87,11 @@ in stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.3.9"; + version = "1.4.1"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "ZuRG+UN8ebXv5Z8fOYWT0eCtHykGXoB8Ysu3wAeqx0A="; + sha256 = "ga8MpbY9tTwr0jsmjEAMyFxDC+yD4LBTx5gXRXig31M="; }; # libfwupd goes to lib @@ -130,9 +130,8 @@ stdenv.mkDerivation rec { libyaml libgudev colord - gpgme + libjcat libuuid - gnutls glib-networking json-glib umockdev @@ -151,15 +150,15 @@ stdenv.mkDerivation rec { ./fix-paths.patch ./add-option-for-installation-sysconfdir.patch - # install plug-ins and libfwupdplugin to out, - # they are not really part of the library + # Install plug-ins and libfwupdplugin to out, + # they are not really part of the library. ./install-fwupdplugin-to-out.patch - # installed tests are installed to different output - # we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle + # Installed tests are installed to different output + # we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle. (substituteAll { src = ./installed-tests-path.patch; - # needs a different set of modules than po/make-images + # Needs a different set of modules than po/make-images. inherit installedTestsPython; }) ]; @@ -172,14 +171,6 @@ stdenv.mkDerivation rec { po/make-images \ po/make-images.sh \ po/test-deps - - # we cannot use placeholder in substituteAll - # https://github.com/NixOS/nix/issues/1846 - substituteInPlace data/installed-tests/meson.build --subst-var installedTests - - substituteInPlace data/meson.build --replace \ - "install_dir: systemd.get_pkgconfig_variable('systemdshutdowndir')" \ - "install_dir: '${placeholder "out"}/lib/systemd/system-shutdown'" ''; # /etc/os-release not available in sandbox @@ -203,7 +194,8 @@ stdenv.mkDerivation rec { "-Dgtkdoc=true" "-Dplugin_dummy=true" "-Dudevdir=lib/udev" - "-Dsystemdunitdir=lib/systemd/system" + "-Dsystemd_root_prefix=${placeholder "out"}" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" "-Defi-libdir=${gnu-efi}/lib" "-Defi-ldsdir=${gnu-efi}/lib" "-Defi-includedir=${gnu-efi}/include/efi" @@ -225,23 +217,19 @@ stdenv.mkDerivation rec { "-Dplugin_flashrom=true" ]; - postInstall = '' - moveToOutput share/installed-tests "$installedTests" - wrapProgram $installedTests/share/installed-tests/fwupd/hardware.py \ - --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0:${libsoup}/lib/girepository-1.0" - ''; - FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file # error: “PolicyKit files are missing” # https://github.com/NixOS/nixpkgs/pull/67625#issuecomment-525788428 PKG_CONFIG_POLKIT_GOBJECT_1_ACTIONDIR = "/run/current-system/sw/share/polkit-1/actions"; - # cannot install to systemd prefix - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMPRESETDIR = "${placeholder "out"}/lib/systemd/system-preset"; - # TODO: wrapGAppsHook wraps efi capsule even though it is not elf dontWrapGApps = true; + + preCheck = '' + addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share" + ''; + # so we need to wrap the executables manually postFixup = '' find -L "$out/bin" "$out/libexec" -type f -executable -print0 \ @@ -256,6 +244,7 @@ stdenv.mkDerivation rec { # /etc/fwupd/uefi.conf is created by the services.hardware.fwupd NixOS module passthru = { filesInstalledToEtc = [ + "fwupd/ata.conf" # "fwupd/daemon.conf" # already created by the module "fwupd/redfish.conf" "fwupd/remotes.d/dell-esrt.conf" diff --git a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch index 6c4b6b62a0cd8..432056cbe7fe6 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch @@ -1,5 +1,5 @@ ---- a/data/installed-tests/hardware.py -+++ b/data/installed-tests/hardware.py +--- a/data/device-tests/hardware.py ++++ b/data/device-tests/hardware.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!@installedTestsPython@/bin/python3 @@ -8,18 +8,23 @@ # Copyright (C) 2017 Richard Hughes <richard@hughsie.com> --- a/data/installed-tests/meson.build +++ b/data/installed-tests/meson.build -@@ -1,6 +1,6 @@ - con2 = configuration_data() - con2.set('installedtestsdir', -- join_paths(datadir, 'installed-tests', 'fwupd')) -+ join_paths('@installedTests@', 'share', 'installed-tests', 'fwupd')) - con2.set('bindir', bindir) +@@ -1,4 +1,4 @@ +-installed_test_datadir = join_paths(datadir, 'installed-tests', 'fwupd') ++installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', 'fwupd') - configure_file( -@@ -52,5 +52,5 @@ + con2 = configuration_data() + con2.set('installedtestsdir', installed_test_datadir) +@@ -52,5 +52,5 @@ configure_file( output : 'fwupd-tests.conf', configuration : con2, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), -+ install_dir: join_paths('@installedTests@', 'etc', 'fwupd', 'remotes.d'), ++ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'), ) +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,3 +1,4 @@ ++option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') + option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type') + option('agent', type : 'boolean', value : true, description : 'enable the fwupd agent') + option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support') diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix deleted file mode 100644 index c14e04dc3440e..0000000000000 --- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ efivar, fetchurl, gettext, gnu-efi, libsmbios, pkgconfig, popt, stdenv }: -let - version = "12"; -in stdenv.mkDerivation { - pname = "fwupdate"; - inherit version; - src = fetchurl { - url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2"; - sha256 = "00w7jsg7wrlq4cpfz26m9rbv2jwyf0sansf343vfq02fy5lxars1"; - }; - - patches = [ - ./do-not-create-sharedstatedir.patch - ]; - - NIX_CFLAGS_COMPILE = "-I${gnu-efi}/include/efi -Wno-error=address-of-packed-member"; - - # TODO: Just apply the disable to the efi subdir - hardeningDisable = [ "stackprotector" ]; - - makeFlags = [ - "EFIDIR=nixos" - "prefix=$(out)" - "LIBDIR=$(out)/lib" - "GNUEFIDIR=${gnu-efi}/lib" - "ESPMOUNTPOINT=$(out)/boot" - ]; - - nativeBuildInputs = [ - pkgconfig - gettext - ]; - - buildInputs = [ - gnu-efi - libsmbios - popt - ]; - - propagatedBuildInputs = [ - efivar - ]; - - # TODO: fix wrt cross-compilation - preConfigure = '' - arch=$(cc -dumpmachine | cut -f1 -d- | sed 's,i[3456789]86,ia32,' ) - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gnu-efi}/include/efi/$arch" - ''; - - postInstall = '' - rm -rf $out/src - rm -rf $out/lib/debug - ''; - - meta = with stdenv.lib; { - description = "Tools for using the ESRT and UpdateCapsule() to apply firmware updates"; - maintainers = with maintainers; [ ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch b/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch deleted file mode 100644 index b8588ef2b11a1..0000000000000 --- a/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/linux/Makefile -+++ b/linux/Makefile -@@ -131,7 +131,6 @@ - ln -fs $(x) $(patsubst %.so.1.$(VERSION),%.so.1,$(DESTDIR)$(libdir)/$(x)) ;\ - ln -fs $(x) $(patsubst %.so.1.$(VERSION),%.so,$(DESTDIR)$(libdir)/$(x)) ;\ - ) -- $(INSTALL) -d -m 755 $(DESTDIR)$(sharedstatedir)/fwupdate/ - $(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir)/fwupdate/ - $(INSTALL) -m 755 cleanup $(DESTDIR)$(libexecdir)/fwupdate/cleanup - $(INSTALL) -d -m 755 $(DESTDIR)$(libdatadir)/systemd/system diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix index 372be2d71f2cd..c9b1d7c5f0a57 100644 --- a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix +++ b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix @@ -17,7 +17,7 @@ fetchzip { meta = with lib; { description = "Firmware for Intel 2200BG cards"; - homepage = http://ipw2200.sourceforge.net/firmware.php; + homepage = "http://ipw2200.sourceforge.net/firmware.php"; license = licenses.unfreeRedistributableFirmware; maintainers = with maintainers; [ sternenseemann ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix index 421a3300f7b07..ff0081a71e17d 100644 --- a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "DVB firmware from OpenELEC"; - homepage = https://github.com/OpenELEC/dvb-firmware; + homepage = "https://github.com/OpenELEC/dvb-firmware"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; priority = 7; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index 392ddda6f573c..233386847649a 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3 and Zero W"; - homepage = https://github.com/RPi-Distro/firmware-nonfree; + homepage = "https://github.com/RPi-Distro/firmware-nonfree"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; maintainers = with maintainers; [ lopsided98 ]; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index a8c4bd559d3c2..bd9c58d33c9cd 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Firmware for the Raspberry Pi board"; - homepage = https://github.com/raspberrypi/firmware; + homepage = "https://github.com/raspberrypi/firmware"; license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; maintainers = with maintainers; [ dezgeg tavyc ]; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix index 1ea2b5e4e3d40..e3fa90ac388d1 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Userland tools for the Raspberry Pi board"; - homepage = https://github.com/raspberrypi/userland; + homepage = "https://github.com/raspberrypi/userland"; license = licenses.bsd3; platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; maintainers = with maintainers; [ dezgeg tavyc ]; diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix index d8d4c37fd886d..9b68a49266f57 100644 --- a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Firmware for Realtek RTL8188SU/RTL8191SU/RTL8192SU"; - homepage = https://github.com/chunkeey/rtl8192su; + homepage = "https://github.com/chunkeey/rtl8192su"; license = licenses.unfreeRedistributableFirmware; maintainers = with maintainers; [ mic92 ]; platforms = with platforms; linux; diff --git a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix index eea6f2893f22b..f95d1efcef77e 100644 --- a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Firmware for RealTek 8723bs"; - homepage = https://github.com/hadess/rtl8723bs; + homepage = "https://github.com/hadess/rtl8723bs"; license = licenses.unfreeRedistributableFirmware; maintainers = with maintainers; [ elitak ]; platforms = with platforms; linux; diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix new file mode 100644 index 0000000000000..73ab46b3c8a6d --- /dev/null +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +with stdenv.lib; +stdenv.mkDerivation rec { + pname = "sof-firmware"; + version = "1.4.2"; + + src = fetchurl { + url = "https://www.alsa-project.org/files/pub/misc/sof/${pname}-${version}.tar.bz2"; + sha256 = "1nkh020gjm45vxd6fvmz63hj16ilff2nl5avvsklajjs6xci1sf5"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + rm lib/firmware/intel/{sof/LICENCE,sof-tplg/LICENCE} + mkdir $out + cp -r lib $out/lib + ''; + + meta = with stdenv.lib; { + description = "Sound Open Firmware"; + homepage = "https://www.sofproject.org/"; + license = with licenses; [ bsd3 isc ]; + maintainers = with maintainers; [ lblasc ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix index 2c9db47539f73..d6963c8eb782b 100644 --- a/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -17,7 +17,7 @@ in fetchzip rec { meta = { description = "Firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip"; - homepage = https://sourceforge.net/projects/zd1211/; + homepage = "https://sourceforge.net/projects/zd1211/"; license = "GPL"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/os-specific/linux/flashbench/default.nix index bf3d2ef8d6dbd..70ad779c239b3 100644 --- a/pkgs/os-specific/linux/flashbench/default.nix +++ b/pkgs/os-specific/linux/flashbench/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Testing tool for flash based memory devices"; - homepage = https://github.com/bradfa/flashbench; + homepage = "https://github.com/bradfa/flashbench"; platforms = platforms.linux; license = licenses.gpl2; maintainers = [ maintainers.rycee ]; diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index 9f734a47c29bd..608a6d5fa70a3 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "fscrypt"; - version = "0.2.7"; + version = "0.2.8"; src = fetchFromGitHub { owner = "google"; repo = "fscrypt"; rev = "v${version}"; - sha256 = "0h1ssw9x37hvks8rcnsjq4nsl6djmhx53iiwrw8fw4lf3nlmdzpx"; + sha256 = "0433f9kx43842ic8dydxhz8plyyrrxvqqwg7kd5ghn599ix28avy"; }; postPatch = '' @@ -19,7 +19,7 @@ buildGoModule rec { --replace "/usr/local" "$out" ''; - modSha256 = "110b647q6ljsg5gwlciqv4cddxmk332nahcrpidrpsiqs2yjv1md"; + vendorSha256 = "0yak221mlyfacvlsaq9g3xiyk94n94vqgkbaji8d21pi8hhr38m6"; nativeBuildInputs = [ gnum4 ]; buildInputs = [ pam ]; diff --git a/pkgs/os-specific/linux/fswebcam/default.nix b/pkgs/os-specific/linux/fswebcam/default.nix index b7f47f12b15b2..53a1bdbc4c7e9 100644 --- a/pkgs/os-specific/linux/fswebcam/default.nix +++ b/pkgs/os-specific/linux/fswebcam/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Neat and simple webcam app"; - homepage = http://www.sanslogic.co.uk/fswebcam; + homepage = "http://www.sanslogic.co.uk/fswebcam"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix index 4d283d5dc0c62..d7791cd1a629b 100644 --- a/pkgs/os-specific/linux/ftop/default.nix +++ b/pkgs/os-specific/linux/ftop/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Show progress of open files and file systems"; - homepage = https://code.google.com/archive/p/ftop/; + homepage = "https://code.google.com/archive/p/ftop/"; license = licenses.gpl3Plus; longDescription = '' ftop is to files what top is to processes. The progress of all open files diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/os-specific/linux/fxload/default.nix index 61bd2a229ab64..e77983254e431 100644 --- a/pkgs/os-specific/linux/fxload/default.nix +++ b/pkgs/os-specific/linux/fxload/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "fxload-2002_04_11"; src = fetchurl { - url = mirror://sourceforge/linux-hotplug/fxload-2002_04_11.tar.gz; + url = "mirror://sourceforge/linux-hotplug/fxload-2002_04_11.tar.gz"; sha256 = "1hql93bp3dxrv1p67nc63xsbqwljyynm997ysldrc3n9ifi6s48m"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://linux-hotplug.sourceforge.net/?selected=usb; + homepage = "http://linux-hotplug.sourceforge.net/?selected=usb"; description = "Tool to upload firmware to Cypress EZ-USB microcontrollers"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/g15daemon/default.nix b/pkgs/os-specific/linux/g15daemon/default.nix index d00bf2f743352..c670fc86d13b1 100644 --- a/pkgs/os-specific/linux/g15daemon/default.nix +++ b/pkgs/os-specific/linux/g15daemon/default.nix @@ -5,7 +5,7 @@ , fetchpatch , patchelf , freetype -, libusb +, libusb-compat-0_1 }: let license = lib.licenses.gpl2; @@ -25,7 +25,7 @@ let sha256 = "1mkrf622n0cmz57lj8w9q82a9dcr1lmyyxbnrghrxzb6gvifnbqk"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix index 942cafd034350..d107f18c8da25 100644 --- a/pkgs/os-specific/linux/gogoclient/default.nix +++ b/pkgs/os-specific/linux/gogoclient/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { name = "${baseName}-${version}"; src = fetchurl { - #url = http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz; - url = https://src.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz; + #url = "http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz"; + url = "https://src.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz"; sha256 = "a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49"; }; patches = [./gcc46-include-fix.patch ./config-paths.patch ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://ipv6.ernet.in/Tunnel_broker; + homepage = "https://ipv6.ernet.in/Tunnel_broker"; description = "Client to connect to the Freenet6 IPv6 tunnel broker service"; maintainers = [ maintainers.bluescreen303 ]; license = licenses.bsd3; diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index 6037f35ba862b..e04b831435074 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://github.com/google/google-authenticator-libpam; + homepage = "https://github.com/google/google-authenticator-libpam"; description = "Two-step verification, with pam module"; license = licenses.asl20; maintainers = with maintainers; [ aneeshusa ]; diff --git a/pkgs/os-specific/linux/gpu-switch/default.nix b/pkgs/os-specific/linux/gpu-switch/default.nix index ea1051c5f0580..17452a5e2446d 100644 --- a/pkgs/os-specific/linux/gpu-switch/default.nix +++ b/pkgs/os-specific/linux/gpu-switch/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = with lib; { description = "Application that allows to switch between the graphic cards of dual-GPU MacBook Pro models"; - homepage = https://github.com/0xbb/gpu-switch; + homepage = "https://github.com/0xbb/gpu-switch"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.msiedlarek ]; diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index 8e6db2a5774b5..d780cade78659 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -1,6 +1,28 @@ -{ config, stdenv, fetchurl, intltool, pkgconfig -, gtk3, portaudio, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null }: +{ config +, stdenv +, fetchurl +, intltool +, pkgconfig +, portaudio +, SDL2 +, ffmpeg +, udev +, libusb1 +, libv4l +, alsaLib +, gsl +, libpng +, sfml +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux +, libpulseaudio ? null +, useQt ? false +, qtbase ? null +, wrapQtAppsHook ? null +# can be turned off if used as a library +, useGtk ? true +, gtk3 ? null +, wrapGAppsHook ? null +}: assert pulseaudioSupport -> libpulseaudio != null; @@ -13,23 +35,42 @@ stdenv.mkDerivation rec { sha256 = "11byyfpkcik7wvf2qic77zjamfr2rhji97dpj1gy2fg1bvpiqf4m"; }; - buildInputs = - [ SDL2 - alsaLib - ffmpeg - gtk3 - intltool - libusb1 - libv4l - pkgconfig - portaudio - udev - gsl - ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; + nativeBuildInputs = [ + intltool + pkgconfig + ] + ++ stdenv.lib.optionals (useGtk) [ wrapGAppsHook ] + ++ stdenv.lib.optionals (useQt) [ wrapQtAppsHook ] + ; + + buildInputs = [ + SDL2 + alsaLib + ffmpeg + libusb1 + libv4l + portaudio + udev + gsl + libpng + sfml + ] + ++ stdenv.lib.optionals (pulseaudioSupport) [ libpulseaudio ] + ++ stdenv.lib.optionals (useGtk) [ gtk3 ] + ++ stdenv.lib.optionals (useQt) [ + qtbase + ] + ; + configureFlags = [ + "--enable-sfml" + ] + ++ stdenv.lib.optionals (useGtk) [ "--enable-gtk3" ] + ++ stdenv.lib.optionals (useQt) [ "--enable-qt5" ] + ; meta = with stdenv.lib; { description = "A simple interface for devices supported by the linux UVC driver"; - homepage = http://guvcview.sourceforge.net; + homepage = "http://guvcview.sourceforge.net"; maintainers = [ maintainers.coconnor ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/pkgs/os-specific/linux/hal-flash/default.nix index 27b85fbfc89ad..c3463851fd3e8 100644 --- a/pkgs/os-specific/linux/hal-flash/default.nix +++ b/pkgs/os-specific/linux/hal-flash/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { preConfigure = "libtoolize && aclocal && autoconf && automake --add-missing"; meta = with stdenv.lib; { - homepage = https://github.com/cshorler/hal-flash; + homepage = "https://github.com/cshorler/hal-flash"; description = "libhal stub library to satisfy the Flash Player DRM requirements"; longDescription = '' diff --git a/pkgs/os-specific/linux/hd-idle/default.nix b/pkgs/os-specific/linux/hd-idle/default.nix index 911854384162c..5e32e220b2f81 100644 --- a/pkgs/os-specific/linux/hd-idle/default.nix +++ b/pkgs/os-specific/linux/hd-idle/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Spins down external disks after a period of idle time"; - homepage = http://hd-idle.sourceforge.net/; + homepage = "http://hd-idle.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.rycee ]; diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index 2aa928e81192a..99464b67db1e1 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool to get/set ATA/SATA drive parameters under Linux"; - homepage = https://sourceforge.net/projects/hdparm/; + homepage = "https://sourceforge.net/projects/hdparm/"; platforms = platforms.linux; license = licenses.bsd2; maintainers = [ ]; diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/os-specific/linux/hibernate/default.nix index 3d759001d01c6..8fc6bfdbdcf3d 100644 --- a/pkgs/os-specific/linux/hibernate/default.nix +++ b/pkgs/os-specific/linux/hibernate/default.nix @@ -40,7 +40,7 @@ in ''; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://www.tuxonice.net/; + homepage = "http://www.tuxonice.net/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index b1251a4396f7d..8152655d457df 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -17,7 +17,13 @@ stdenv.mkDerivation rec { # Note: fetchurl seems to be unhappy with openwrt git # server's URLs containing semicolons. Using the github mirror instead. url = "https://raw.githubusercontent.com/openwrt/openwrt/master/package/network/services/hostapd/patches/300-noscan.patch"; - sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k";}) + sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k"; + }) + (fetchurl { + name = "CVE-2019-16275.patch"; + url = "https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch"; + sha256 = "15xjyy7crb557wxpx898b5lnyblxghlij0xby5lmj9hpwwss34dz"; + }) ]; outputs = [ "out" "man" ]; @@ -70,8 +76,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://hostap.epitest.fi; - repositories.git = git://w1.fi/hostap.git; + homepage = "https://hostap.epitest.fi"; + repositories.git = "git://w1.fi/hostap.git"; description = "A user space daemon for access point and authentication servers"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom ninjatrappeur ]; diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 38335682ddb8a..2f6e6cd5cc9a3 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputHash = "0g2w4jr4p1hykracp2za7jb0rcr51kks1m43pzcaf7g99x8669ww"; meta = { - homepage = https://github.com/vcrhonek/hwdata; + homepage = "https://github.com/vcrhonek/hwdata"; description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix index 1b87619faa32f..3a00dbefa6356 100644 --- a/pkgs/os-specific/linux/i2c-tools/default.nix +++ b/pkgs/os-specific/linux/i2c-tools/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of I2C tools for Linux"; - homepage = https://i2c.wiki.kernel.org/index.php/I2C_Tools; + homepage = "https://i2c.wiki.kernel.org/index.php/I2C_Tools"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index 2f792cb7ea744..2e00e9eedc3b2 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A better i7 (and now i3, i5) reporting tool for Linux"; - homepage = https://github.com/DimitryAndric/i7z; - repositories.git = https://github.com/DimitryAndric/i7z.git; + homepage = "https://github.com/DimitryAndric/i7z"; + repositories.git = "https://github.com/DimitryAndric/i7z.git"; license = licenses.gpl2; maintainers = with maintainers; [ bluescreen303 ]; # broken on ARM diff --git a/pkgs/os-specific/linux/i810switch/default.nix b/pkgs/os-specific/linux/i810switch/default.nix index 2f4511bcbc470..5b65f2a16fdd7 100644 --- a/pkgs/os-specific/linux/i810switch/default.nix +++ b/pkgs/os-specific/linux/i810switch/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { "; src = fetchurl { - url = http://www16.plala.or.jp/mano-a-mano/i810switch/i810switch-0.6.5.tar.gz; + url = "http://www16.plala.or.jp/mano-a-mano/i810switch/i810switch-0.6.5.tar.gz"; sha256 = "d714840e3b14e1fa9c432c4be0044b7c008d904dece0d611554655b979cad4c3"; }; meta = { description = "A utility for switching between the LCD and external VGA display on Intel graphics cards"; - homepage = http://www16.plala.or.jp/mano-a-mano/i810switch.html; + homepage = "http://www16.plala.or.jp/mano-a-mano/i810switch.html"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix index a1d488adcfa19..95f555cef8c04 100644 --- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix +++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Proxy for sending IIO sensor data to D-Bus"; - homepage = https://github.com/hadess/iio-sensor-proxy; + homepage = "https://github.com/hadess/iio-sensor-proxy"; license = licenses.gpl3 ; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix index 69ec6560d83dc..246c109faf341 100644 --- a/pkgs/os-specific/linux/ima-evm-utils/default.nix +++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "evmctl utility to manage digital signatures of the Linux kernel integrity subsystem (IMA/EVM)"; - homepage = https://sourceforge.net/projects/linux-ima/; + homepage = "https://sourceforge.net/projects/linux-ima/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/os-specific/linux/input-utils/default.nix b/pkgs/os-specific/linux/input-utils/default.nix index c6248ee90836a..97c7b8b23f2b0 100644 --- a/pkgs/os-specific/linux/input-utils/default.nix +++ b/pkgs/os-specific/linux/input-utils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Input layer utilities, includes lsinput"; - homepage = https://www.kraxel.org/blog/linux/input/; + homepage = "https://www.kraxel.org/blog/linux/input/"; license = licenses.gpl2; maintainers = with maintainers; [ samueldr ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 308b5bb1fcf56..869041256b629 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/intel/compute-runtime; + homepage = "https://github.com/intel/compute-runtime"; description = "Intel Graphics Compute Runtime for OpenCL. Replaces Beignet for Gen8 (Broadwell) and beyond."; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix index 1f67208db8b95..95a2cfbd84602 100644 --- a/pkgs/os-specific/linux/intel-ocl/default.nix +++ b/pkgs/os-specific/linux/intel-ocl/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = { description = "Official OpenCL runtime for Intel CPUs"; - homepage = https://software.intel.com/en-us/articles/opencl-drivers; + homepage = "https://software.intel.com/en-us/articles/opencl-drivers"; license = stdenv.lib.licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.kierdavis ]; diff --git a/pkgs/os-specific/linux/intel-speed-select/default.nix b/pkgs/os-specific/linux/intel-speed-select/default.nix index cf0dd75a8a460..12536130a864b 100644 --- a/pkgs/os-specific/linux/intel-speed-select/default.nix +++ b/pkgs/os-specific/linux/intel-speed-select/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tool to enumerate and control the Intel Speed Select Technology features"; - homepage = https://www.kernel.org/; + homepage = "https://www.kernel.org/"; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; # x86-specific }; diff --git a/pkgs/os-specific/linux/iomelt/default.nix b/pkgs/os-specific/linux/iomelt/default.nix index 7b41b095091da..860a7b446328b 100644 --- a/pkgs/os-specific/linux/iomelt/default.nix +++ b/pkgs/os-specific/linux/iomelt/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "A simple yet effective way to benchmark disk IO in Linux systems"; - homepage = http://www.iomelt.com; + homepage = "http://www.iomelt.com"; maintainers = with maintainers; [ cstrahan ]; license = licenses.artistic2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/ioport/default.nix b/pkgs/os-specific/linux/ioport/default.nix index c14d9f146eb00..fad85335200cb 100644 --- a/pkgs/os-specific/linux/ioport/default.nix +++ b/pkgs/os-specific/linux/ioport/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { buildInputs = [ perl ]; meta = with stdenv.lib; { description = "Direct access to I/O ports from the command line"; - homepage = https://people.redhat.com/rjones/ioport/; + homepage = "https://people.redhat.com/rjones/ioport/"; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.cleverca22 ]; diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix index cb882a0dc1feb..8f742aa01be8f 100644 --- a/pkgs/os-specific/linux/iotop/default.nix +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { patches = [ (fetchpatch { - url = https://repo.or.cz/iotop.git/patch/99c8d7cedce81f17b851954d94bfa73787300599; + url = "https://repo.or.cz/iotop.git/patch/99c8d7cedce81f17b851954d94bfa73787300599"; sha256 = "0rdgz6xpmbx77lkr1ixklliy1aavdsjmfdqvzwrjylbv0xh5wc8z"; }) ]; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A tool to find out the processes doing the most IO"; - homepage = http://guichaz.free.fr/iotop; + homepage = "http://guichaz.free.fr/iotop"; license = licenses.gpl2; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 624644596d94b..46312a637dab3 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,29 +1,27 @@ -{ fetchurl, stdenv, flex, bash, bison, db, iptables, pkgconfig, libelf, libmnl }: +{ stdenv, fetchurl +, buildPackages, bison, flex, pkg-config +, db, iptables, libelf, libmnl +}: stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.5.0"; + version = "5.6.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0ywg70f98wgfai35jl47xzpjp45a6n7crja4vc8ql85cbi1l7ids"; + sha256 = "14j6n1bc09xhq8lxs40vfsx8bb8lx12a07ga4rsxl8vfrqjhwnqv"; }; preConfigure = '' - patchShebangs ./configure + # Don't try to create /var/lib/arpd: sed -e '/ARPDDIR/d' -i Makefile - # Don't build netem tools--they're not installed and require HOSTCC - substituteInPlace Makefile --replace " netem " " " ''; outputs = [ "out" "dev" ]; makeFlags = [ - "DESTDIR=" - "LIBDIR=$(out)/lib" + "PREFIX=$(out)" "SBINDIR=$(out)/sbin" - "MANDIR=$(out)/share/man" - "BASH_COMPDIR=$(out)/share/bash-completion/completions" "DOCDIR=$(TMPDIR)/share/doc/${pname}" # Don't install docs "HDRDIR=$(dev)/include/iproute2" ]; @@ -36,17 +34,14 @@ stdenv.mkDerivation rec { "CONFDIR=$(out)/etc/iproute2" ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; # netem requires $HOSTCC + nativeBuildInputs = [ bison flex pkg-config ]; buildInputs = [ db iptables libelf libmnl ]; - nativeBuildInputs = [ bison flex pkgconfig ]; enableParallelBuilding = true; - postInstall = '' - PATH=${bash}/bin:$PATH patchShebangs $out/sbin - ''; - meta = with stdenv.lib; { - homepage = https://wiki.linuxfoundation.org/networking/iproute2; + homepage = "https://wiki.linuxfoundation.org/networking/iproute2"; description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/iproute/mptcp.nix b/pkgs/os-specific/linux/iproute/mptcp.nix index 90503c21c04b6..4a58ae9e0469e 100644 --- a/pkgs/os-specific/linux/iproute/mptcp.nix +++ b/pkgs/os-specific/linux/iproute/mptcp.nix @@ -12,7 +12,7 @@ iproute.overrideAttrs (oa: rec { }; meta = with stdenv.lib; { - homepage = https://github.com/multipath-tcp/iproute-mptcp; + homepage = "https://github.com/multipath-tcp/iproute-mptcp"; description = "IP-Route extensions for MultiPath TCP"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix index 551fc61f81456..bff356ccb6cf5 100644 --- a/pkgs/os-specific/linux/ipsec-tools/default.nix +++ b/pkgs/os-specific/linux/ipsec-tools/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://ipsec-tools.sourceforge.net/; + homepage = "http://ipsec-tools.sourceforge.net/"; description = "Port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index f556d7368e97a..7502769c3aed2 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { description = "A program to configure the Linux IP packet filtering ruleset"; - homepage = https://www.netfilter.org/projects/iptables/index.html; + homepage = "https://www.netfilter.org/projects/iptables/index.html"; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/iptstate/default.nix b/pkgs/os-specific/linux/iptstate/default.nix index 5a0555f668051..cd290113e00e4 100644 --- a/pkgs/os-specific/linux/iptstate/default.nix +++ b/pkgs/os-specific/linux/iptstate/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Conntrack top like tool"; - homepage = https://github.com/jaymzh/iptstate; + homepage = "https://github.com/jaymzh/iptstate"; platforms = platforms.linux; maintainers = with maintainers; [ trevorj ]; downloadPage = "https://github.com/jaymzh/iptstate/releases"; diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 3944a7b37fb8d..1278463834841 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { ++ optional (!stdenv.hostPlatform.isMusl) libidn2; meta = { - homepage = https://github.com/iputils/iputils; + homepage = "https://github.com/iputils/iputils"; description = "A set of small useful utilities for Linux networking"; license = with licenses; [ gpl2Plus bsd3 sunAsIsLicense ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/pkgs/os-specific/linux/ipvsadm/default.nix index 98dab0e62d759..5f91fa5dccd9d 100644 --- a/pkgs/os-specific/linux/ipvsadm/default.nix +++ b/pkgs/os-specific/linux/ipvsadm/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux Virtual Server support programs"; - homepage = http://www.linuxvirtualserver.org/software/ipvs.html; + homepage = "http://www.linuxvirtualserver.org/software/ipvs.html"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index 27f176f6a7247..4c4e1ff025d97 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/Irqbalance/irqbalance; + homepage = "https://github.com/Irqbalance/irqbalance"; description = "A daemon to help balance the cpu load generated by interrupts across all of a systems cpus"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/it87/default.nix b/pkgs/os-specific/linux/it87/default.nix index c115eab1503e8..c48de130e5a12 100644 --- a/pkgs/os-specific/linux/it87/default.nix +++ b/pkgs/os-specific/linux/it87/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Patched module for IT87xx superio chip sensors support"; - homepage = https://github.com/hannesha/it87; + homepage = "https://github.com/hannesha/it87"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ yorickvp ]; diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 930f77437ace6..585bbfd165e2e 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { The old tool iwconfig, which uses Wireless Extensions interface, is deprecated and it's strongly recommended to switch to iw and nl80211. ''; - homepage = https://wireless.wiki.kernel.org/en/users/Documentation/iw; + homepage = "https://wireless.wiki.kernel.org/en/users/Documentation/iw"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ viric primeos ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index d93b11bc9577a..be2a4ff3e56ad 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "1.6"; + version = "1.7"; src = fetchgit { - url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; + url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "0c38c7a234cwdd5y1brq4w56xszs8zlp57rr3nvgp8z8djcy1qvx"; + sha256 = "1qi25qav1rv8gm5lbrip8ayq5vwynmyv2q4ar7bbmnjh6cglvyh2"; }; nativeBuildInputs = [ @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://git.kernel.org/pub/scm/network/wireless/iwd.git; + homepage = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; description = "Wireless daemon for Linux"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/ixgbevf/default.nix b/pkgs/os-specific/linux/ixgbevf/default.nix index 8a860cc14679e..67b9a66a8abb2 100644 --- a/pkgs/os-specific/linux/ixgbevf/default.nix +++ b/pkgs/os-specific/linux/ixgbevf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Intel 82599 Virtual Function Driver"; - homepage = https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/; + homepage = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/"; license = licenses.gpl2; priority = 20; # kernels ship ixgbevf driver for a long time already, maybe switch to a newest kernel? diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix index 58e058196bd33..f8e211fb289fe 100644 --- a/pkgs/os-specific/linux/jfbview/default.nix +++ b/pkgs/os-specific/linux/jfbview/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { - Asynchronous background rendering of the next page - Customizable multi-threaded caching ''; - homepage = https://seasonofcode.com/pages/jfbview.html; + homepage = "https://seasonofcode.com/pages/jfbview.html"; license = licenses.asl20; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index 58b1b53d52f98..2d6e624fee696 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.jool.mx/; + homepage = "https://www.jool.mx/"; description = "Fairly compliant SIIT and Stateful NAT64 for Linux - CLI tools"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index 8d170583a6cd7..69c0da3313642 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.jool.mx/; + homepage = "https://www.jool.mx/"; description = "Fairly compliant SIIT and Stateful NAT64 for Linux - kernel modules"; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/os-specific/linux/jujuutils/default.nix index 617dad8bdddce..86b24fe6a5bec 100644 --- a/pkgs/os-specific/linux/jujuutils/default.nix +++ b/pkgs/os-specific/linux/jujuutils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ linuxHeaders ]; meta = { - homepage = https://github.com/cladisch/linux-firewire-utils; + homepage = "https://github.com/cladisch/linux-firewire-utils"; description = "Utilities around FireWire devices connected to a Linux computer"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 3386a7f920628..7ee449ff33ede 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { makeFlags = [ "setowner=" ]; meta = with stdenv.lib; { - homepage = ftp://ftp.altlinux.org/pub/people/legion/kbd/; + homepage = "ftp://ftp.altlinux.org/pub/people/legion/kbd/"; description = "Linux keyboard utilities and keyboard maps"; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/kbdlight/default.nix b/pkgs/os-specific/linux/kbdlight/default.nix index 6df3e4fffe708..bc2d53b5e5d94 100644 --- a/pkgs/os-specific/linux/kbdlight/default.nix +++ b/pkgs/os-specific/linux/kbdlight/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/hobarrera/kbdlight; + homepage = "https://github.com/hobarrera/kbdlight"; description = "A very simple application that changes MacBooks' keyboard backlight level"; license = licenses.isc; maintainers = [ maintainers.womfoo ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2c8b8de65b319..c715c7baf7874 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -122,6 +122,7 @@ let XDP_SOCKETS = whenAtLeast "4.19" yes; XDP_SOCKETS_DIAG = whenAtLeast "4.19" yes; WAN = yes; + TCP_CONG_CUBIC = yes; # This is the default congestion control algorithm since 2.6.19 # Required by systemd per-cgroup firewalling CGROUP_BPF = option yes; CGROUP_NET_PRIO = yes; # Required by systemd @@ -177,6 +178,10 @@ let NF_TABLES_BRIDGE = mkMerge [ (whenBetween "4.19" "5.3" yes) (whenAtLeast "5.3" module) ]; + # needed for `dropwatch` + # Builtin-only since https://github.com/torvalds/linux/commit/f4b6bcc7002f0e3a3428bac33cf1945abff95450 + NET_DROP_MONITOR = yes; + # needed for ss INET_DIAG = yes; INET_TCP_DIAG = module; @@ -214,6 +219,7 @@ let FB_3DFX_ACCEL = yes; FB_VESA = yes; FRAMEBUFFER_CONSOLE = yes; + FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER = whenAtLeast "4.19" yes; FRAMEBUFFER_CONSOLE_ROTATION = yes; FB_GEODE = mkIf (stdenv.hostPlatform.system == "i686-linux") yes; }; @@ -244,10 +250,32 @@ let SND_HDA_RECONFIG = yes; # Support reconfiguration of jack functions # Support configuring jack functions via fw mechanism at boot SND_HDA_PATCH_LOADER = yes; + SND_HDA_CODEC_CA0132_DSP = whenOlder "5.8" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon SND_OSSEMUL = yes; SND_USB_CAIAQ_INPUT = yes; # Enable PSS mixer (Beethoven ADSP-16 and other compatible) PSS_MIXER = whenOlder "4.12" yes; + # Enable Sound Open Firmware support + } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" && + versionAtLeast version "5.5") { + SND_SOC_SOF_TOPLEVEL = yes; + SND_SOC_SOF_ACPI = module; + SND_SOC_SOF_PCI = module; + SND_SOC_SOF_APOLLOLAKE_SUPPORT = yes; + SND_SOC_SOF_CANNONLAKE_SUPPORT = yes; + SND_SOC_SOF_COFFEELAKE_SUPPORT = yes; + SND_SOC_SOF_COMETLAKE_H_SUPPORT = yes; + SND_SOC_SOF_COMETLAKE_LP_SUPPORT = yes; + SND_SOC_SOF_ELKHARTLAKE_SUPPORT = yes; + SND_SOC_SOF_GEMINILAKE_SUPPORT = yes; + SND_SOC_SOF_HDA_AUDIO_CODEC = yes; + SND_SOC_SOF_HDA_COMMON_HDMI_CODEC = yes; + SND_SOC_SOF_HDA_LINK = yes; + SND_SOC_SOF_ICELAKE_SUPPORT = yes; + SND_SOC_SOF_INTEL_TOPLEVEL = yes; + SND_SOC_SOF_JASPERLAKE_SUPPORT = yes; + SND_SOC_SOF_MERRIFIELD_SUPPORT = yes; + SND_SOC_SOF_TIGERLAKE_SUPPORT = yes; }; usb-serial = { @@ -603,10 +631,15 @@ let misc = { HID_BATTERY_STRENGTH = yes; + # enabled by default in x86_64 but not arm64, so we do that here + HIDRAW = yes; + MODULE_COMPRESS = yes; MODULE_COMPRESS_XZ = yes; KERNEL_XZ = yes; + SYSVIPC = yes; # System-V IPC + UNIX = yes; # Unix domain sockets. MD = yes; # Device mapper (RAID, LVM, etc.) diff --git a/pkgs/os-specific/linux/kernel/gpio-utils.nix b/pkgs/os-specific/linux/kernel/gpio-utils.nix new file mode 100644 index 0000000000000..447704eedc8dd --- /dev/null +++ b/pkgs/os-specific/linux/kernel/gpio-utils.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, linux }: + +with lib; + +assert versionAtLeast linux.version "4.6"; + +stdenv.mkDerivation { + name = "gpio-utils-${linux.version}"; + + inherit (linux) src makeFlags; + + preConfigure = '' + cd tools/gpio + ''; + + separateDebugInfo = true; + installFlags = [ "install" "DESTDIR=$(out)" "bindir=/bin" ]; + + meta = { + description = "Linux tools to inspect the gpiochip interface"; + maintainers = with stdenv.lib.maintainers; [ kwohlfahrt ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/kernel/hardened/anthraxx.asc b/pkgs/os-specific/linux/kernel/hardened/anthraxx.asc new file mode 100644 index 0000000000000..101ccfbf0f2b3 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/hardened/anthraxx.asc @@ -0,0 +1,325 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2 + +mQINBE64OEUBEADPS1v+zoCdKA6zyfUtVIaBoIwMhCibqurXi30tVoC9LgM6W1ve +HwPFukWq7DAS0mZUPE3mSV63JFLaTy0bY/6GO1D4wLdWZx4ppH7XKNCvKCbsi70k +UozFykNVf+83WEskuF1oYzXlF3aB5suz2IWJl7ey1EXgIpehwQaTJUA5JIWYFp9A +566LRNJefYMzUR33xc4dRKj6Etg0xdLVq7/vZoo8HpLCBGNWiP0AKqFWEwTg0xQL +7nsJA5tfJJdwAJvrzjpFsvb63PKG6waAtdHhON4q7E2Udak9fz2tRjxA5l9l2zXk +aqsysUzkxPhNjwMENoQ04KZg4aT+ZhhBzTowSWLp3KV2uaZ66kdPUO3s+/1bPp5/ +N/IlykaUwyL773iYOZ5dOY/9hIuX/zssihcrGEMW6yIyZR5uKhzYdaM9ExTXP637 +UccgNS9/pskPGPx/xK23NDCfeHzL9YHS5KokA2wb/b9hqpwvLaeblbMl2pt79F1R +ac+rZlrRyX3NvlTQP4hqM9Ei2YBAU7QFDJEjH8pVIceL7grxi1Ju1iD5QiSK+je5 +Jj5EAikfwSeAttSzsqNvaXJHfABrv5mkkVt1z3icP3HIHTYnG+uj+t8kvW+o9/1i +pD6e6LUh4w5v1aY9kaK/M3+eBH59yNYI99crPUKUBVfW4gv4DBUJAQTWRQARAQAB +tDVMZXZlbnRlIFBvbHlhayAoYW50aHJheHgpIDxsZXZlbnRlQGxldmVudGVwb2x5 +YWsubmV0PokCQQQTAQIAKwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4ACGQEF +AlSXU9QFCQfATw8ACgkQ/BtUfI2BcsjPbxAAs+UR/bJz/HeYTpPy+HnKwDJgI9GP +AZlNvp+QSIhOTtKCYkQ/Iu+5scY5J0Qyv0pcJW5Rxjx+l7KGovw84jzVznnYsJoy +UQ5H3Ev9T2xW1nrZT3abJ7j6ZIck+Q+WFHu5Plsq6doSXOXmJNoehvT3BVolvc6w +S1+CAoyA5Wm1yfocZgVOvWPWQaa1T4XA7OwxFWrvNWEZwAzTSjkGHkwmji+DxdBd +RPam9+qm/rcN1IJTu6xJPr38a9LydWonsUpTR2Qn7Bo4EJp8yHJLaiLEMV/Nmgrr +1orBYw/OzDzhbdMl+2zzwEBLUMPABdgnPM6ZCZ5PWyWnCU4jsBGyVd0IC5xEu3Eg +a0EtIdvx2lXiLfh2dulpMn52uJY5iNwaTleO+z9CENQVhh5R4FuN9H0BLiyAxf1+ +MkD3jLT+DGl02hQghtxz18iTkRk7KOw/NFn4z0is+TRl4/ocNt1LiWQXt8dr7qdx +zvUpDnxCSYZkeutzopo1TA4lKpnsS2mHabx6CbrUmF+wOIr8gHUfpBFeEQ8BHebU +5X0JrFF5mjeNl4uK9l9lD9ng74rsSpKPr15DU41jIuQDHJYd6H3TXQ4K1z7Ciivy +r4vgsruAFX/GduKseOx1obWW3GfIQzLAIuVdjldgREl61GWoLiGFqlcveiAIkN5p +Bxc20hSrHgZP9ZyIRgQQEQIABgUCTrg/KAAKCRC+dA9BPyK7GTK7AKC8Sd1ndNvc +1ispBaECbHT/JPfGrQCgvkfGBsFn/KBrgC5hTm0mSxdy942JAkEEEwECACsCGwMF +CQIchwAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheABQJOuD2qAhkBAAoJEPwbVHyN +gXLIXL4QAJtbs62EpOIFld0N+tTEFn1qQPPaExAXmH/RF5Epf+0rSS6B0OXEZBXz +cWtMPbHxoLjN1iY8o0QC1ex7/KDfYq8Ho18M9P+Lf6XfW0sJ9d021U5MJWGPs4zA +lNFXJqeMgfJZAno2N6dO/azcYHq1wmSgUbTb9Oyi1PHfn3g0UAW59dfkB8d2jEvY +Yed1X0mBPPXcbgnYNZ514JQtm9wuDdVWrh/Si9EhKg6+MPcbv18G4lpPGR+yNq9y +3Jze4vmmWen0ceDJEp06IAeTfJzzD80Oui2WXtLfaQxgf9uuZtGjrMX5l+mq7rBS +VH/dsHP1VYI0efKIs7qbmiLcMRVWYIGix9I1C3UYr3ImYiCGlBG/uQ929xbjWAHa +hy4W6rzruUWjyi/Kz7QRnyBgtHfhDO7hYziTr5hoGhd4VeUpcbxL+MegXFZsWJlE +kz8TOOsZ/4XxXHVoalg8fYOcA7j/aoszsPMQUOL/5jsVRhyP3evtVxb3m1EwvYDK +Lii4IkVxGztlBOIgeT4kwXgoJEASSZHgcd6tDv9q7o33n2I1DGL8X3axcHES2/C7 +cP+li3KL3Hc9vjgaJ9HfcQLuMcHqfoHn+YzVfbG5XeFcxhgQpwpYsZv3MTbXAQwI +fRHXRuIfOiFwqUXahi5N1WSIXNBGSyI7pu9ht5I7gIIOINE+VS7FiQJBBBMBAgAr +AhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAIZAQUCUNol8QUJA/yTqwAKCRD8 +G1R8jYFyyIqUD/9yWw7WBQiWyIMpVuX9c2Ov1fAkDya43fDm0gqIgNsdaxCt5ATh +XaXZ/p2jglWwon5jDLDNsVR0/Q/t8ugdcP3bcwRtW2YYQ2F1PaNjfr5WsuPEadyc +J62DIobY4IzqBpDuqGLYdbzZeKr49VwbRRvIJpphrk3+CekFvdIs1ofEpA2Kn2oA +DXfYuaWoVBF7fTwAZmc3hYPOI1jK7nrFZbCnAT4WZPzZ4IY9lsaNTF/4mQ8vV1xF +De6HjfslHURlZWsWtQIKhIPBKoZC1nP5VRK3IHYgKw8toq780kalLH8ofv9BkSrs +t98JOoJX4etdmE8Ta/+Wg5C9EzR+909tQfdWdkaRbhvbtl/x7X76HU4ItefLR5pW +d0OSo488QZMQjCUWlzgPMsmnYMQm6ckNOp0B/RtMfbJV7t5H+JE3PLfFG55jcz3w +uNGhfZyl/ZhV9fvGLU/sPyhIW7ewuIwd+7i12fH9r4NAGB/mkSKK+tHGcTZvXxux +5QMKE+a9u6NMJRrbsIiTFwhrCLMgzLYL0mtX8FZXNFFZzGFYkiXymBR0ze4LKzRo +dMFpyP/w/IIjYBhVpgboT2EMMIgJHSsMJDCdDjI+9cAykVF6ccSiUQ11devHL6Pv +WwlT2Ub4TP4yCScHDPyfWq+tfdQlWFVRZMRJ7kmq0VagqomdRHgLPyPgDYkCHAQQ +AQIABgUCUtgrXgAKCRBH1QFsQv98LACcEACFq3Oz8nHAa6KsyspIWo0+HjzCtTv0 +G6TB+svf3fl24C93IfFhpSyxNf8XVa9h9kCU5ZImYN+LaoUGiz3lcYxjdOeFYDc4 +GU5TFrJwY9eOYYCsr+z+NLn7wlLZEO772lGUDPJMWxSGqR9yOGhQCTIADLLcp6mt +07zdejESYxMT6IjYR+rX6miWG5Hr9/lBdh/X4XhGpHEY64IL8vVB3C+FQfG3hiMB +bHbvJ4/S/cjfNM1T9oKiA0H6jklRHIdstj+2eeWA7lS+GE3Mpkra+8KmkEjV4O03 +izcRpMm1yTGoTjp9UddTNYErb/sha5YigYAqK8bj3gh6tTFNJHbN4RWgtPDyc5Va +1u+sH2ob6JS5tez8/Z6pMarGpTQujIGAlntP4igi0Q4hxyLof6Vtc6XF80uSwTvN +RRmQrcq+kLPwX0NbyZCBCI+kjBPu2b932JDTfVBKwJCLF3e1zvQqN0C7EZnIzveX +r7VtJ4WHIfSyi/HQP7xm5L0uQj+KRr+/LMaxkCDgrlqoWTgAoxCAPYH1XCvBoJRc +DHjNikyEAS8WUGl9ZHQyAoFngi/jqH6WoDAmfBUKRoBMR2hXLOKUBmObw0DHgauM +kk4kD6CW4UEy0SM/i9JD7sk9KiKoHMip1jguKRJkHJ1WSkNl7nZpeo+KG0WbGHXN +b7hnrQsNyqJkUokCQQQTAQIAKwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AC +GQEFAlLV0QIFCQXdHmsACgkQ/BtUfI2Bcsj8DA//b8wZrFY/Fj/iR5ZaO0AjmMV1 +hM7lAFWLfDiLyYofuiGLUg9rqFWj+Ks2kedVN7+22Bjgi5fvpXv3Uy4trZKKw8Xs +FJ/s8HQ6jzIv6pFdIYPLFQBqS2tEgfsanPZWIqJI9fbhOrRGN7WV5tXiksCaRO+u +rLjIhAYmsDb//BD2xqsY54ouRdrz5nRG3qG2odq2Lw8XquW6srouGaSm+BI3sow6 +l2eAW8UjbxwICQg2ZPZYCBc9ArbgLS1ha+yPhp65nGpVbqDA8rUKC11op1ArAbY3 +Yt6xzLg+RCuCHBa1gNPpDoYV9V8Zve03mEIcsK10X0RhJQ+z4INvrjtelPRCOLpN +179JmsyxwOzwAPg773SK1Z31jSirsiEke/q8j13PGNDBCb4ZKpm/KOht+4d0jJLK +GLqD85cv3/uAeSh2zWkoKcVW6uVZpiz3KA3i4YMWnteOlrlZH28nIrDXevPzkOxo +pZlhuLboCD6g6yuZI4Wm9fEiga8xmRDw4RrOIuDXWjNW6IVaeFGvnYaNf0wnmBD+ +FE1SMWwcmqgB1yIylmKqH0lYce8SVAMLkkOlaijhWrfCO5iS7zjWaVz98HCqFfwR +gHuJTxOwwlf9Qb6cyC3bGsfILBUuE0L5vUAZUAc61H+6Sv88CDDUO1EOKaqAAYhR +plvoyYZ3xiSMgzYKGZ+0OkxldmVudGUgUG9seWFrIChKYWJiZXIvWE1QUCBvbmx5 +KSA8YW50aHJheHhAamFiYmVyLmNjYy5kZT6JAj4EEwECACgCGwMGCwkIBwMCBhUI +AgkKCwQWAgMBAh4BAheABQJUl1PaBQkHwE8PAAoJEPwbVHyNgXLIQokQAKxJB9/F +TfBae6eqcT+izxGSnsvbc2bcrtsmKkhu9HwpsJ4IDutphXFB0wFalI40BL0o1k54 +Wlfv5GHbq7Ju3kW2dmTMP0WpfFytV7rr2yqSmik+skJw27BDk74rP0v4TNOHaTrP +nokfTnlaKuv1bqlwbIwV7rJ5jbAtw5hueeN4jghGU8SGlCOEZ/xGxYYsvtyPhZhn +kmsAzcPr/BpW4NkSb2SnRIO8KzcPnzxz7JDdeIusq/YW7P5OlhDx4ejdh0Wg6ISl +zxB5VoqFqNuKTBQNz4HHpqDVQqEDE4JngMerDr+4qAiDYI4w6kN3Ce2LqciRyMVh +YYnTqyyjXYY3C1WwXIa1tZb2Cw2DorshNFdACr7wKQMOoJtAFpdd3d/DRKQWCc3x +jkBERqZ+55unTY0/0uyNPoK0noAcGydiU8WGh6wyi+Do+Zxq4QJEcqL/FHrhlaiw +LTmgDS+XDl7zRtQia7ykpi/xqe74ujOHcJO8tpY0ZCdR2A13xiOi+11wndbOkBFv +dQ0vgih9ROzwe3hBbBQQOdF4hkA9vEd2Ks4gF8IR+5ixWAIyZAVbnDiLelWgQgnE +aeEwTtfcXRNAxuj+MgMPQhXQ2/cK0dPD4z51DchVRIf9G3hAuBT/CEhTqNkkm5F0 +og7azwd75+vh5RxwVld3ES6CMXKaiV4csQkdiEYEEBECAAYFAk64PygACgkQvnQP +QT8iuxlligCeNgfNE4w1AQuOC4ef3HNNY0GXgVMAnjmtCVIUJv/w6PDimvf20rgF +GVHxiQI+BBMBAgAoBQJOuD0KAhsDBQkCHIcABgsJCAcDAgYVCAIJCgsEFgIDAQIe +AQIXgAAKCRD8G1R8jYFyyPv3D/wJ+sYXqSxoo8OriGMUzG5LXs2Hf1YULdlysGa8 +mxWTwCIEMSSx8AoOKf/FyXglDVl9msfOgv6jRiN+UyNCQEv+6a5ZCL7BlAVU0Q4W +w2/UUlOUlLMC1QAodGcC3kiPSy41jnDVswKYRrICuiW1Pqgad3h7u7caqvqG1D/A +YOR2Q8JjY15j6Qf62Xx+YANx2tPWKeDyPUAN/x1W6RrEDbN5F+1qOpPFuTnpPmqH +q4zxm4Dz4szypmAKsN+5/q8T6DJtSnP7COtsY467oX2XtNTTuCIsU79lBVo/yan9 +ofB6hu12KyXwJIl1OK34g9VEP5suU3hcEw7uVAvxyMYJQlxORUCG0DAFc/oPm3d0 +ypRdbxXJMjoS3pmCf7kwnEA9PIAjZDYuVHGZkAdmYYInTIH6ipjkVxDHEF1en0h2 +zHJEZC7NIYgPyzHXmH7Xy3VZVhhKKKM12VDOuIOOecQPuFIw3hG7dymjn5e9dMzv ++DMkbEZzoFahLYkbVGG1FGzhE6Uvb/IG0UJCC4nDz0pzZpV++QHvgEvbY/HLbHJ4 +o3CT5aVE0YIhTP+zqXNFMOao8yZy+AzdMzdX+Y3ADZfY0oiZ+JH1Zo++rdrgXUhg +Y98QgMwVwESbwaBKjsC0JnlmWyNivhIOS6NRyqR75E7j7JSvgJdxhvpQXXkQ/BzL +FM1Ej4kCPgQTAQIAKAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AFAlDaJfoF +CQP8k6sACgkQ/BtUfI2BcsiEahAArZfD1yJK385eqgCZ5LryVLRXrocuF1zlHl/6 +ugRy2TEe43ex4eTOY+mv4ZJVSxbDzUqMbBv0m3IETbM0CSESjGD+i5I7K3IToZO9 +ZgIXDbpoy9x2KWjU+R5oaxCTmZ9jk1p+f4zHxc8lJdgOXPwcIIT5Euwk4LAFN+wn +CUHkO/D0xzP2ivTrM+VHNWqSUcNInAGRx+R0NvdSryIAsdA/5E3ql786WQhPy6L6 +1d7cmxaLsfAKIOf8ydNyoiqmJkT62omLLnqyERfLZRa9RKt5EgnxX6kR2BA+h/Gn +KVV18bCIJjF3Gjnh3qjJehKRaw9nmzrB9KtGQAHdIp8ivNvjMitc1ijRIECfidWd +lGxgmuI/gX58eaV3scjbs5YUFmGhcZIgjCxWWxFSwmzJTUVT5XqBpXFQB4dokj9m +NNMpM3YH8T9QaaS/m9j7cmCJ4gxp7i1bJsqsVG5BjRLiZv701eVKVmU6vqhubR0R +eSZghqho9e44ZMbn4rJ5kTQhGc7ZGNsIyChMSaYVreB8IBLDC7rg8dB/umg1OYOp +8EqRLJyXdtpa4DN3X0e4WcWb0Toj4QuyCh/es1CtBldhdqHr0aLZYCX4i/KuGTXI +kA8LTOJmZsE+K+/NCux1VHK9DADKcNjhSV0QTf+8ntGlNW6i2Mlt34thZK5eeB6W +Bbo1zl6JAhwEEAECAAYFAlLYK14ACgkQR9UBbEL/fCyyQBAA0931q8dBD/6COmat +8S+JSgcuIpylukFxU2vySBWSGRHFmFzwbokUE4bbNyutwNO2cNBa9zcxRPrkIg+7 +d65QjdZNDV2zWTjv5GwzEMjWxhP7VpTwTouYgx9j2d2KpFo2jfhTtZ7OU7DDF9YT +FsaRiZHHZT+W/JHuB9Lxc55HkSagu00yTaZURc0olBui5c/hqBte1b3OWTjCmysG +mwDL2FwdmFi9mbEm77sdD8PSVfkZaBv5rIaet+Xe/JMZoz0WUkZRCFXMr6B7aOdS +WeB7kUsPh2J5dhf4x4YaxKLOHod9JQF/DGJsdexKqMTqM/xOMSQ1FTUMCQ5SBWJc +3PywqMB/0eqlteHydlk7bb9HLCT3M6vVxTkpj834wGRsoVXPqWKzAHPpO2kjxXtc +4DBh7T88YGE2k5rxdJHb3MjWVJQzHGhrO5Ji8CQaHjUJ4BTyim++RDisDi4C/QJ4 +qPOrafw/+KyJoWyfmAUpxplPvY/LKJlvKaKxmpwlildYjH7HjoYvCjagbSCUOnzo +uM//YIJ8/o8QdxEDdYiTd7cwskYWphrAlV8+vCl/Y0lepRf+hsUS+uZi/NX4qYMx +CTsewnnqJQduuehQl9/RnoBX9T04kS64cWNaPZ4dxZUYJm3us5QFcQJMysZ4tT1Y +A0oEUX1KUTDzTQXT/kFi8MtmXauJAj4EEwECACgCGwMGCwkIBwMCBhUIAgkKCwQW +AgMBAh4BAheABQJS1dELBQkF3R5rAAoJEPwbVHyNgXLIV98P/jcu/DiP/muH2Qsy +FtjscyLu1NzBbSFB9q1jMVfx3VbaIT22Ly6BIQNHF7L2fpjf36EWpdJzpfR+Glp5 +1+KqZgIMAW5CGguSy8v7iHs6Rh5hzChiF48wCqxUmMdQ0ITTrnAXIYq6H6s8ytKF +Y31znXmne1XYBg8e4yb3pcBhkzIPeVU7rMz9PjPB0+Q2jWCpqPA4eUSV8rL2TxFR +KbEt8XlkZ6yuCLnkN84aLZFxfZA1tIGifi0PpeaO2z/IwOmftbQRiljMdnsPye49 +j4wlJS7yRIpnH3nH9Zku/MrDV/M0z7BVwKfF2F95/2QX4Tdyd/UESTdLqGtXpX4c +axahZKrOhNr+k60qSBxoBqKauZkSbZunRnbYmVa3nA2kQuIPF9/QmoZgDUfdkKZJ +u1RjwcRUGKd1XV19QjUvBMD3oHA4G6Jbi5vWKQZ40KVcL78YIL7C8dUOiPIasA45 +olaGpCSsGsfrMp5ngegxM+uh9Tc2kTFC9bTqp17VYI96cAqGrEBUQrmLmZLk0HUm +a6MNZO/+vKN4UTlgjpjxZon+/yK8bsmT/VNie5hzqZim6tfztl3rpJ9jPUeLgr5x +oGePYV02inapzNHdWFHk0L9zR/3KKfJ3IRJwUXp00Eya28hEepIvdxgLYcN1UqVn +VuFuMY8zYSl/VXtPxySCLENJHxvdtClMZXZlbnRlIFBvbHlhayA8bGV2ZW50ZUBs +ZXZlbnRlcG9seWFrLmRlPokCPgQTAQIAKAIbAwYLCQgHAwIGFQgCCQoLBBYCAwEC +HgECF4AFAlSXU9oFCQfATw8ACgkQ/BtUfI2BcsiPxw//X2xUctIrd1O7UOk7LHBX +/xI7xXoWQcA7l/1XMuZhM8yC8yIoAgvFrWBP1a29I0P3/yigkQXs+eTDTdvb0QP2 +q72q7Azt852v5u8+dHzoOXDpbo+4lfX+0OBDWimwJuChD8LQH7b7jO0oqWIV0AzM +vegFJVp3cDbyqw08lBz3xZ79A9JtBeewf6PLpXKjEVS8bEAZjZKjsjAY+5ShtJAf +PsD8r353dmkaHgC5Aji74ijZeY3PUCvGVVCGeN9isLnRpTEn7qUvN2DfHJU4w6aw +sXu7m7zidISo6dQLUzo54dHKWPGFy6INNkzXPOgrlbYnjt7v0Ou21/R6HrhdmsSw +lt7GALJcgAUxrcT/ljB3SZhSB0BdH0DXPcUziEdfhgMhhrXYpMjwH2XFBD1MLusW +GaVDbpPrSoEnmPVePcDUonDHePcuLjfOl13mOER1Kf6WFapOCa+4HCLakfKcPnGY +eyfD7Dbz3/046MmfQ8/Iyf8ipFXN6tI2WkRKj8uq9IFYrX3yoCBxZJN837DM3Grq +h48/T3pYU1f9LiekxbsgXmcHoGNdXX5+EsuO+QILZPttlG5QLuqFdJHei77uvW+B +4u8mgzi1Zhh0hRLm4K6UaJ/fBJ87BZSHShPKI9PI073U1O/CcYXnb8cdPLu3UgSQ +FM/bxT70TSYKI01Dt4KXRfWIRgQQEQIABgUCTrg/KAAKCRC+dA9BPyK7GT9FAJ47 +X5+0dQaOFkfy3WnMgX3AmIXJYQCfR4XL47rZ9a66jWaD0IbcXMK4oE2JAj4EEwEC +ACgFAk64PJ4CGwMFCQIchwAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEPwb +VHyNgXLI2U8QAJGKPv1gWLn7P1KeHVsKkfRf+zgdsoY4mF3bUjX/03z1h1OKp+S7 +gZD/ZI80ckw/ElgFt9sr8J+pOgHk+aGHW+V0cZNgDHXCINb17s+Ra7SA/SWeJOrr +d4IpvTnjGc88C/j+bzRFagfnGXU601PeJdXIe6H75xVGIb0DgQBfPB9m+7p3sq/R +6UigzLwwhIQRW/l77hq79v5Rm77e0GTfcYHSuKu2Itim8p5OYCNchr4ZpBzrv5cF +/nH+HyD0AnM1q4a3mT9y4abNgtxJMGJBoIUEDT5vaTRpPowVHIGg9QroHkrYkMWA +ffIBzoq38WLnPjvjNtTncyP7sjbP8KS7NfjxZ6RAcNO6m6BTDYG/lM9jwCcOma90 +RZDVYD8hy+z1hXWFfB7zB+5TYuuKV5SXZpS9/JUR1BuI44WkY0hLHUa7inpqLlqc +b9O7KYikgyaeUKAN5LkF8A7rMVzuhrSItNzJVOs7WLnNAe9+Frzqx/jZ9aU04avS +r5OlWLdL7k9JNDnsLFqNtG/XQ7Hc8CPl0HvY3YXYGD3xwW6Ua6+ykxZGmQGPB68W +6a7G5EX+MEWKZgMQYsl1HgU49/sOD6QnCG3m2IB7bRAf5Kd527BnSgAaYHjVug8G ++X9opDwUW1b73Ut5tWfZJqQ4XBjl0Hc7Zi7OtlqdBeKGu/65QU+N9x33iQI+BBMB +AgAoAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCUNol+gUJA/yTqwAKCRD8 +G1R8jYFyyPv+D/9lA9yMXPBROLaCRab8Ca2QJBEtpT6lGVlkQ5Am2C8xdoLGiuJF +E7Cn/lS1j4RSVDK6DELeaBMXaY2g1eun8g2ERJIUGC98zrPjZXs/ZtCZtX8vYr1X +Bf9U8Ty6N3rKgt1XHc1oMgzkKLUc72RC+P/fkDsiAg62nVcmOFFykyTXnpM/5Ux/ +9kaahjf4LwGeRqkDIoLrXdZ7FHPjei8VlKSiHTkl4F+UCzEySxiInV+BWAhL5Lvb +zHxHaNDCquOb2zbgafVKON3oa8nCZoUw3iwpjrEy/JT+1BG6vxyT/LX7wPG3SKEw +8QTl8YBF8wvHS0JHW4KTc4grCMNWDwfkrlXnp6ZzTpy4JXZfYs/ltR4FH3atDG2C +xRCSAWXkGyTPMZkougdDbJ3jjViYcWO6B//LE1qDjeC05O9G3MXVxu16M5U8nVA2 +B3bo5cVv7+ECBTKaAvG3ZV6eOaeJ63gHRY8qI7y5OgzuNfxUXMTIAjHfO2mvSy5M +qFgDI10F8rYevGOKxvPVE1F8aiD1uRAOMCcLTy3oUKHIdaskSytL1D/bT9WqWzii +OXhLhSjMzkdPSUWVABeC6KM+Jcll0A0sHTkKWS3mavx3dUacB+O4efuTKNhSvo7n +XhUvSOOikRityipE5Ma5WlXBiu54DdIMGFzANHFdb5GmC7da9F1aALkshokCHAQQ +AQIABgUCUtgrXgAKCRBH1QFsQv98LMmaD/9W2qJyFlZAsjOWgNQPwUU4vV9/Ursj +kt4RI/oS0Gzovw2bmL0a+Q/dp6wM4PBMuYQXCepF8V+o4uKzL2OjVZDVtU/KqGCY +rEigiAhG0gHxgF1ukc9JQzhShFeq7/wkY+FQ4MOhuhuUsSMlvFzAd1hY+xlvckol +DEeS54loDspUh4EwxsWlopaA1rs5dzVXrYcinz9iDzLj6ujb6uJzCQVogk9w3dv8 +smKn81TVhtR4RFecqL9mURZcGnj7NV3n2Lrl2Pe0u/DiTtpavCkzVx7v9qiB/2Di +dqWR7OtYcywUr6lZeZsNabNwntPxSP7V6EcNXF3Qpi2IkAcwdJKb+aIG1v7/Wx77 +GhpBhbtdgKEebttzO4EVVeE8a2kmgqc8VXeAeqI89egU53dUdAinejFVDyemxHnJ +L4L6uVnSxbk/vRzu+fr6EaPyBsqORGXj2OuwxlWcnWs/N9XzNaiq6funedUSYtbP +trdpt7ogvzrQew7wetcwfxSB3IWcVwA9QvGDIBHTWPrb87jKV153w9I+cSfz9jg8 +qTIOw4qad7VOC4L1oaoRsLq6VFgnoW5DLsuhaVd6fgdY/byL6H5q2FPYJ+F8ovhR +2yPlQm8UYIFwmnwzpnuGBaPtU0bP7C+SNMK+G/9+b5q4psh1MnK8sg1RfSr1w7sw +b+Tur045QrUDu4kCPgQTAQIAKAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AF +AlLV0QsFCQXdHmsACgkQ/BtUfI2BcsitRA/7BbFuuAXPJMA4XtPhlYbfhNkYQ7+v +vx9HIZ1SgJfhpYwt/vbNTVclO79XD65v5JSWx+0gVJfHNolP5umB0++giIw9NCIx +uVa5eh3kS5NFfJ0YHrYgpFDdZPHRA9wI+oZgJBC/Cm40kafgTUoPFqXb0Sdlcz3R +hciLZBgYXV/uYubczfmAaJpmrVI1UuUWYrdPnmUkgitp9e6IePYiKVDeIGhBW8Bc +7Nbs2hc9yH1zwv3Affs8m+4tQQiwQHsB29WEZcmBuFllTbA5g5bvTvhfCRmYVgWC +Ti4SW+uA0B05a/aVP8fDXk82qCQ4cRB1BOwVNn+1/Aqcw+Zh8KKzH8gpPcsKGGP6 +uNg9uinuxYDneEY8cG7FSpm3XsXu4q4N6j5R63U6hz39pY/5Ib8mzYMEoLEZOLPu +CkVH9OOQc8zuiRL/wGc0pbMiGPEp13rAI0WbIFahrWS60bwtM1YEM5Ep8vD3TLl1 +pTWlF/zWpM/uJ6n/4nDXGQsGzKQn5D5Nsu7+55C0du0d1VRvYd8oG3AaNqhtM46V +C4eOqxH8XZtkJ3WMxhsHnV9acuDTpn5E5JKL7vEq0btN2UQ69lpKv7PmV/TgOJhf +KKvHZ0dh6KYY7iKW7NUCouLGibBoxDa+K4reh0i0M5UcsNiPkCqDIHUAIxW6FrvQ +xBr7NgCls+B9Kwu0JExldmVudGUgUG9seWFrIDxaM3IwLjB4MDBAZ21haWwuY29t +PokCPgQTAQIAKAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AFAlSXU9oFCQfA +Tw8ACgkQ/BtUfI2Bcsg4cw/5Af5/cxr5s8qiPvcGDglJyzFj8VBk0d7hpgdxcOi3 +VCOJY4YRoliu8WKThwxt7sD03fSZurFDDx+X27y3zPtgH/qBohmcr51jbSNom4mH +Gf8gpViFqbQlFh7tYz4kSQExgmpFx/FIaxmwFoEqiVrp6VpM2DZ6kg//4M+Ka2Mt +nuzV3C631A0eoMCJhPWPTgkGGknURvzhw6m2aGFWC/HE1yzf7Ej7fQeaqIxIG4Wy +Fk3lMV9rxMxGuUZTqIhvcU85JSriHowfX1VsAI2LXJYQ9c0jI737FcLwHv8VCa5s +NKDkLkb5S83/4Ep8e9M+a7u4WvkAqzmPfSna7bLxdsTS5gKGqEtMvMP2YGWWQxSR +GRSttiMmIC8Cnd45S8cASA2mR/ebNcrYOpa48cjYpBKDG2BIYU7oSLNulsM1qbxL +WJ0QM/g7iKHcrXhyIBaI22GS9hvmYcS960cox9oPCvNZcOKA6FBklnUg/ReJ3JTj +6D6v9SUxOOfXPQIon8EzB7BNKGedHxCFgniZnl10k+pP34YGyphMZTYGdhtAm6zq +T7PlraHQaFgQ3ba78lJcn3cWVZYpbCNJiH+Nna/Akm3/qQKTst3eW1lqopffCs1m +F6G6wjiHCw2bio5uX1c/gDr4Peh0E28heAqKopjultPXPZbSZL4D3fJIGP2j6e1B +wvmIRgQQEQIABgUCTrg/KAAKCRC+dA9BPyK7GcYrAKCgKW+qFwbMNeh4ikFg9fJx +4/lH9wCdGevT7dwBzPe6L+aWZxipEXYmjx6JAj4EEwECACgFAk64PN0CGwMFCQIc +hwAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEPwbVHyNgXLIThYP/AnoLpQl +whEEKaIhOSOKXegfdUHK6cL4cHRACzRIbBk/S4G2Vg/bnUW8tvWZDQLZ3CGL8Z0F +tNQ6GusUxt7mcYdSj7xynbi7bZiurgYp7B7hh1hVG3pAXEwlDnJgfoc0YZHrHZwt +HnNVYOfGEQF4zyplmUUxDyp/ZMYcXMr3PVJkYBJhYKCHOkMUtzzNjSSginaqZY1p +fgbP+Gou/9qgotkYiH84oUG9yTSKLIO5x0WzQYuoPNJyOdSHaLPfEqCC435vCYT5 +YLZB1YI5xzQiGsAL//cUCe267oiFmO9Ioky/azeX1Ouy2DH8uEDQPQFTJYXt3CbL +i10HkoBWdmncPC6+b0IJjDUo8Iv4yk0xFt2/DGkGK3h6jJxJ9pzx5KBT46iLfU50 +iTWMTguXn9ud/UJV0MpKgKjvO9hB4fae60n2UootknzEw6Y5W55PfGkT14WcrGGo +WHLSbpR6+gA9apU1cdoOC8nXlf3Eb2No6LP3X7RJXqiRsdP0s6QXkZGfR/qyNXI9 +S5j6wIyqNFU0cX21UgI9oJSKEKIKEFacgyD9za0gswEI+DZr8/p3cJE89ZX8ySgO +FG148wgaakTNGyGwR6aogGZ8IAHc83bnwGCgTeK6ZPSKNLSE/sImcTOrxIN1/x39 +r8o0TxuZjqFH+zKWfpdHX+sJLyi8Gs29CsUhiQI+BBMBAgAoAhsDBgsJCAcDAgYV +CAIJCgsEFgIDAQIeAQIXgAUCUNol+gUJA/yTqwAKCRD8G1R8jYFyyLl/EACG6QRV +kKVBoI2Ycr4UISk2+gCD2r4xSK/QLEhDFcZRgMctvPVnhod3uJOsMGJCk3aPGu91 +Jtwuj0CkeURa/cVzOjC+f7baveTuWQaAqW+r70m6F4gYHU0aDD/uQ75rTCcrsmt2 +pnZCyA9jLJxQGG11AvbOcV+7K7BuIvXs4iAactZ0hRvDVuGXuup2LnUbxyBU2oj7 +OWCXKTpZcJ0KGTWapMf8ClYYsEgS0wvMWotJzAov7ijkoP2DyEQVOPTnGWcfjsTk +QgbyqiFeBl+3IT4+xSzkPsd75dCYhsHBvCoT8cfUH4wvDXzU2CwpC1CDfHit6Hw5 +UigvZ8HXyn00Bm0UjLHGW+haS3kyOoz+z09gVFYd33cpjSnFr5is8ZMBPW31PE15 +q9/l6G/o6OGJCtOax3Yi6ttqn+KbDXIooZoRPZlayOSghyjoD40+ErevmqZPfJ3E +o1kHz62B1YpoXmhUm2Ihf2SbjWJRaW9Hp2nd81kAAXjr+8k4yvOuHxwYPFnpBjfV +cfYNQ3Zf5xF4nfszFuZMc5JYrIR3EYVgEk+n8VpulAqd0rXUEODwGy7rPjdxLY7w +DhUEZMQN3xweIb4vjPDBb0Ax3ACyfWKIdT0kC3rGOy9xyCzxWO2CjHMjrbxy4jL7 +B0WIQ5fpRcV2+wozs2WYgJKVKJgJZGYsW8dDLYkCHAQQAQIABgUCUtgrXgAKCRBH +1QFsQv98LIX0EADVefJUEMGKiTFLwUmWNF2X4oCzEZEMsQ6NliiQFvtNkKrT+OzZ +zggxfINUr0XEKgjjoGZ03Hmm7xAFc1Y51QZEr25H18PuSixz2YSHPqYwwVgLUh0v +u2AqaP0mQckssK+ZAQVvoZ7ZOI22ZXIZ6CPEPY6aJawHov8Strlm8oTbFgLfZ5Wo +3NCxMkkq3NFNHuwesccelNPefgnFZWhwr1mkUeX+rCAbQF/QHYEAi7KjfKyY+XKs +ccjYS+RWxpte21ejngp7pRYli3M8cZoaWKCzLTrD8gKztlo3op9Zc2+hjOY9gZtG +CaXkN8lchJ1yMyWju61ZO++AJq6S2OdBVxgsj9xPm+x91RbZRHQmUuq8mefUzaEm +NHE29udVFfuV//Fpabi04IrOuabkrSvP27eX9FT1y25tKFHuJdL5fDUFGnNnTvcR +X51lJmvnuIKJQ+Lthup7npS0L06+dPIDoqyxF8hmdu3RtwEsvkboPaxx5XTB5d8y +3wzBFWd4ePwBIumrY1YHSzdJCvyyLRXZbSOsHXgZfhfQ1LVgxxebP7E+stWqGLLC +Fry0WGG8f/UUgVr1QpluT6NjioUnuI/ZmKR/aKewqVYWAnr54fF+np4VdxPfYwci +lpbXpkamORZqPfq/nyoWgnp+y4AptDdDkSWnFxfcJ1wnFFcrHVUSFQ1wBYkCPgQT +AQIAKAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AFAlLV0QsFCQXdHmsACgkQ +/BtUfI2BcsjV6w/9Fe1+3Mc6wG3R9VbxiYo13/JV4t+tA9/tcJ1R/Y96eAqVajoK +c2ZQ7FrimmlzvLIvxpH4Z76h3NmPWfOQ6qEumZQ5BM3QwBfQQ3Tmj10gfiL5vOZJ +6dUaJjwXgjz0Qyk1G3gw7K1xmtnXgBPyGT9T9q3OAhHHdV2b6xS9dWoNKhUV8GUn +HfIKwq+87aZqexjFE7ubZdOAe+5nrqnlMEfJKgDjXbazES9IYvPQiSjwR3xaIPOa +ma5WfQV0SHg3Vkhtv2PjuoYWNfNy17N7u+dfg7nAtKLIQCPht45uKk66BYWYBoDI +VQfg6zcFLpdNcFzzwmgrYRZvEvBf5aSG3KFD7UReT0695/lHheRxEAA3thsx8gaM +CCavtVxbVUluEfYZ7TgXLMuIO9OBKhi7MwB3iL5qacrNShMB+1J5FxieJBmWXdla ++kCdCdS+9kIZH+mnQ8daGEJ5R9mNcVwcWasI0o9NObqIZwhKw4obrC5Q7m2NfXL6 +FUScfA7yn7+/icdQB9fH2ZXGJVuNm1b8OBN6Nbz0QauaCystWzKXKwpVb/5M623v +Vw75RfnqCFiAf4tX58nL/QalJc4C0E+TvQ2pXC47VQvHmiAB31vKvU0nbo+lzi64 +hAPWJnhr2pmTvglquTFzLwEsWfO4zDtUwFo8KM1XFsonaoX5UzGTXPmIN5+0J0xl +dmVudGUgUG9seWFrIDxhbnRocmF4eEBhcmNobGludXgub3JnPokCPwQTAQIAKQIb +AwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheABQJUl1PbBQkHwE8PAAoJEPwbVHyN +gXLIdGAP/0ch1NeFyXWszqA5ow+itBn6iyUaplXB5I56Q77cTIFB6LqJ5+2kdUuO +UqPvOilGS3dxbyDsSdWDLs+bHRFG4uqZyGUDhmu2mvS+uDqPFwcKJUNDlgdccxph +sA5HJFGg1ca0TWWg8vjwANdU4sL9Ujbaw93v0Mx/1+aSIxyEJBNxc6DJWEfCjpSy +R9JB8WTHgvxEAImVNsT1OGNTvd2DN+17WBhxBktLHDocIGJ/fttzFgKkv6NTPwt+ +y4QyP3UgeYRZR21B6MVckk2/UuCuCY7gAGruTFVoINa/Wqn2YPPZhJYrTX7ysDaV +QLObxlepeo0UWC7wFEiuqu5OM75MWLUX8j/1OAIE6my85vrlcWSf0Z3jOAgPTjJw +VT5h7T/7NPP2azoIlOE2bh5UcKXFkT0xDYPcMr2hV2Ih+jU+Ygiyg/1yIIxearmm +PFjfIHMLepa+7RPtTlHwu4fpNPXzL13W6PXSoCTTi/suGlYmSyLtOwxq15GGT3vg +1Xh8wfkuWwbWJnBKXtt8HkteQRgDngDnRSJwsO2nnQ7+sr+F8J3rQDdlVdVcolic +ekup8ZgSjJYinfcpF+H+qy2kK2jOYyyHI/+zHQtwy1R7MbLwPJe7WNWrBmEvmazB +2//Iu5EVIfFX3flPjeRQbKX4B/SuXF48uo0/8WfdgaMW8glRWJnbiQI/BBMBAgAp +BQJUSwOnAhsDBQkF3R5rBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AACgkQ/BtU +fI2Bcsj5ihAAg0d0A8OUsNWG7TiPQTuC/D4e/5JTkJARmQ5xO6gMPxTpjSZCyWEl +7gQOg/liU8nz5HZGaJgg4HuBwTs6euqdnVi6zhW1c1wye2thGTQ7DeSPJnhju3Qe +mPS1jEdC34lXCo6eGjdKnGb7TV7hkptHKHh7XCU9n6qcXQ2cNQQbdqSCRsfVm1XD ++p+mM/FGOz8uFOrhERAUl99WkVZ4NKTdws8U6FXulbdWrWwI4eRggIdwI/Tl7zuy +ja7KxBCCeJ/gFY6g+iOYmIo6//bJITgmAG60hFHJ9JigcN6xglYFI28TCdNqM0+C +hgbZUner0vLmaxRNoXqV9Xw8ihNMQa7fUFYkX8VrXOdLdVvee7OaeLuWWE8x6usQ +NzgLDQQx9fmxtrQY+dC6Y25IPMm094z0nrbM1wtfG2+8Vw4mQ2U099fT5t3Yl7fE +PlanhgQxRZE78PxezyYxms4HV+wqvrhlBzFnWAd6H27uDPfUfO9cLgbmFTUlwFhg +gsDeIFRFx8+h4/0xAIPqUODmTiN0mj5sLRW7zvqZW6zhsGIMdPd+IkhHiGjeJqme +Ai0iOjpV3tRteoW51/+/ajPmyUBbvOxiFJNADHH2NvqoBMU1pkTvpc7Wy+2J9VcF +4TFdWBbwjU8BoC3ZgixTrT0zCSwabnKriglOhA5Ik/n5HsR7S76V13y0KExldmVu +dGUgUG9seWFrIDxhbnRocmF4eEBoYW1idXJnLmNjYy5kZT6JAj0EEwEIACcFAlSX +VHICGwMFCQfATw8FCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQ/BtUfI2Bcsia +Wg//SKLFNUTEBQG11cV/AljxmI2s8y+cPKs3VqlwEjiuRMu4DRkFVaZNEuPq0b8q +8pwcHIJ5/nZvOticm9M/g7TrTp3pOxmSYf7WG31vVrprig22dz8WxQAy76srNn1z +stg0TFO7nKNVjZOFz5D0RpWazwnXyDed3l2/7RZ1CMv7ue/rZez8FnDHN7Di3daX +AJ5XkvDAsD6AITYQd+4XEbh2rt9p8G6qUUjwzoVU/aGVgo1CGZydYMJQVccNL7kv +fumnwkAED8u9j0ZI+xfaD3c1rP98bnqk9u8rJPCAeIkA4ppisDb7noz0NaO7dDyM +ywBK4OR478fw5h7GfiIwZdVAHkCoEHNvF1ON8JnYgyplLvZvxZ0dtYGDYDiFdORN +gVgGMU12kemPws4hEx3WMgUu/BBkF58XyQyqcwt7q+WGI2lQ88UzZ/FAsu8i8r/J +jkV8FsiCJ2rSHEMddmOHoaTM+6oB2i9kZo7KmToSZu7DxuemlHpuOO3kG/iRga2y +NeancRJwbxgZhNGBbhrA/7k5UOcXkmfW74oBkbCci0ncVhHu12dsJXhk+eprkOXv +nD1vEIeuzL4V/SMDar3SxFlfLFwQk4cn9+pdeP3LxwHKBn74pABsbEBhEY4IjUEL +YOTEVoP6s+Ou1NcLxFl3elmniwL2+GV5rDM8pctkKNemtZa5Ag0ETrg4RQEQALfu +qEihKS+DTVlWUujzSq5zK/5oQ1ZL8AiTUTZuVtrRWCq0HE8tWaVxEP3Vt9FCo7yF +afXigokChzHOgzczg80tctrlv+vbFyaZnjGQH20Nlz8EnZP102zudx/RdFXG/up8 +PX50Eck2lH+IvvosMLdvrZTkFJ4SgqMGSoAgMhJHZdZB5N0y8yPPAjcEnSXp8L2A +mo9e0egCrEuqBrCZld00nIoipyDlYNZkLjPf0JRgFPO/AWWgBZLvLlteLu0emq8N +96bT3QTdXpRVPM0qeX94+2gIj+0V1uQ9+k5Xkslbbii9TnOzMnLRO6dBAONVTTb3 +ajzdXK71iv2a8Y9lKShxhYWP9JNOFlXkAp+ZoD7EZex4dgu6giV3PrTDJLyWSu41 +WfqOz6cJGpJSTacrenC542ynAaSVKXH+1plqB9kq/M7HtE/P4GveQXIVT9Sho394 +4hwkuETo20KwCgFPMmiNaBysnOykIcDsDutBOyygdovzdGEyHVsM8/kz007QFgJf +hKy91H6O/Cg7VH+yaUKllRZ+kFsoSy8/E0IqLzqBHG3sUGM6lJ0Q9fgSnpzIZsdE +jRhczNCvlovGLa/kBHcEUWQ2zrjnfjsLkxvamKJ8N6LLIXIDRv5dE2smpdi3oiVg +XdOKshyXB+obhRFlWtirK4udX5yYzUpcB0zBoo1hABEBAAGJAiUEGAECAA8CGwwF +AlSXVAEFCQfATzwACgkQ/BtUfI2Bcsj0Tw//dyDYwcnh0BIb+nDCXFC91KiPUILa +f+wI5w6c9YYEo6TR89q6Wsq8EDiqcqSJcztuNvw3MZGHWA25nNB/0046CGM/tUBd +Jyudd3TxQBi6XMMSTbG1EMtSN1UMV4guuUfYcAGW38oZ+YJACCBFFz/Kt0aa/hhi +/hBNyvI73vZfQ/fsScFDewkxikUEspRsLVmX6gaEmumOxOhJP3HBoxeBCM4Z3IXo +dON2SiiMxt9BPIPJOyKNkFQGQ3dqJIag3GnsZ1s0CEoi8iqF7uS4RjC7uOJtvn74 +CODxg1Ibl1IweyAuBEA80wUh9DGLAdRJpxWy1B2fDhIROvpcg0R5p6j9UX0b0esc +jKLQEiE1wRswjXhWpZhe7Pjl38KhwqMyaeR3OnDtP7JXazIG6HiBIp4cx4k5A2TT +X+LhvG3NHCeuxIyjLTRTWgv241kf7uAu+qgjHDSKXQqpjvo+cUYQgSxQZZXnmlz0 +sz/tEeiWl+i8kW/RNKQvNNR8ghWDW3YRak/zS+WFNoLZchecIzMj+je1vSg411o4 +Xd3LHDur6boCetaq7ZkqoS+NcX9n8MnKhHKYJblvXyc1h67s90+wSwhlumA8WqlM +yqn99m13aF8GuGZbw5B2/x/Cd7WW5wZV6ioola/yqDXB1XtDFBy2Hxr/VMRlE3Cu +kekzzVjVTZxOgZE= +=yRuG +-----END PGP PUBLIC KEY BLOCK----- diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index 3010d87a178a1..95510fe218e33 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -16,32 +16,10 @@ with (stdenv.lib.kernel.whenHelpers version); assert (versionAtLeast version "4.9"); -optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") { - DEFAULT_MMAP_MIN_ADDR = freeform "65536"; # Prevent allocation of first 64K of memory - - # Reduce attack surface by disabling X32 - X86_X32 = no; - # Note: this config depends on EXPERT y and so will not take effect, hence - # it is left "optional" for now. - MODIFY_LDT_SYSCALL = option no; - VMAP_STACK = yes; # Catch kernel stack overflows - - # Randomize position of kernel and memory. - RANDOMIZE_BASE = yes; - RANDOMIZE_MEMORY = yes; - - # Disable legacy virtual syscalls by default (modern glibc use vDSO instead). - # - # Note that the vanilla default is to *emulate* the legacy vsyscall mechanism, - # which is supposed to be safer than the native variant (wrt. ret2libc), so - # disabling it mainly helps reduce surface. - LEGACY_VSYSCALL_NONE = yes; -} // { +{ # Report BUG() conditions and kill the offending process. BUG = yes; - BUG_ON_DATA_CORRUPTION = whenAtLeast "4.10" yes; - # Safer page access permissions (wrt. code injection). Default on >=4.11. DEBUG_RODATA = whenOlder "4.11" yes; DEBUG_SET_MODULE_RONX = whenOlder "4.11" yes; @@ -57,32 +35,17 @@ optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") { SECURITY_SELINUX_DISABLE = whenAtLeast "4.12" no; SECURITY_WRITABLE_HOOKS = whenAtLeast "4.12" (option no); - DEBUG_WX = yes; # boot-time warning on RWX mappings STRICT_KERNEL_RWX = whenAtLeast "4.11" yes; - # Stricter /dev/mem - STRICT_DEVMEM = option yes; - IO_STRICT_DEVMEM = option yes; - # Perform additional validation of commonly targeted structures. DEBUG_CREDENTIALS = yes; DEBUG_NOTIFIERS = yes; - DEBUG_LIST = yes; DEBUG_PI_LIST = yes; # doesn't BUG() DEBUG_SG = yes; SCHED_STACK_END_CHECK = yes; REFCOUNT_FULL = whenAtLeast "4.13" yes; - # Perform usercopy bounds checking. - HARDENED_USERCOPY = yes; - HARDENED_USERCOPY_FALLBACK = whenAtLeast "4.16" no; # for full whitelist enforcement - - # Randomize allocator freelists. - SLAB_FREELIST_RANDOM = yes; - - SLAB_FREELIST_HARDENED = whenAtLeast "4.14" yes; - # Randomize page allocator when page_alloc.shuffle=1 SHUFFLE_PAGE_ALLOCATOR = whenAtLeast "5.2" yes; @@ -98,7 +61,6 @@ optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") { SECURITY_SAFESETID = whenAtLeast "5.1" yes; # Reboot devices immediately if kernel experiences an Oops. - PANIC_ON_OOPS = yes; PANIC_TIMEOUT = freeform "-1"; GCC_PLUGINS = yes; # Enable gcc plugin options @@ -120,7 +82,4 @@ optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") { CC_STACKPROTECTOR_REGULAR = whenOlder "4.18" no; CC_STACKPROTECTOR_STRONG = whenOlder "4.18" yes; - # Enable compile/run-time buffer overflow detection ala glibc's _FORTIFY_SOURCE - FORTIFY_SOURCE = whenAtLeast "4.13" yes; - } diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json new file mode 100644 index 0000000000000..fa3718c4ad78a --- /dev/null +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -0,0 +1,22 @@ +{ + "4.14": { + "name": "linux-hardened-4.14.181.a.patch", + "sha256": "1rssvfhz10h7sqfi0ari1rsmm4h60v6bfj8fvb0yx6sxsvg7phd7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.181.a/linux-hardened-4.14.181.a.patch" + }, + "4.19": { + "name": "linux-hardened-4.19.124.a.patch", + "sha256": "0g4kp112iarkyjw6qfdkc7j10d60jak7rlw2c1m537mb1a3zz7qm", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.124.a/linux-hardened-4.19.124.a.patch" + }, + "5.4": { + "name": "linux-hardened-5.4.42.a.patch", + "sha256": "1i066nk101banphs9gbcbvmyrhcvf83xf449rs6vxanb0yhwvqvn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.42.a/linux-hardened-5.4.42.a.patch" + }, + "5.6": { + "name": "linux-hardened-5.6.14.a.patch", + "sha256": "1hnlhlssa2gwmww6j17768gn2fbw2f3v8c0cs423lg14r7plkv44", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.14.a/linux-hardened-5.6.14.a.patch" + } +} diff --git a/pkgs/os-specific/linux/kernel/tag-hardened.patch b/pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch index ff8a3a1279736..ff8a3a1279736 100644 --- a/pkgs/os-specific/linux/kernel/tag-hardened.patch +++ b/pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch diff --git a/pkgs/os-specific/linux/kernel/hardened/update.py b/pkgs/os-specific/linux/kernel/hardened/update.py new file mode 100755 index 0000000000000..d6443d2e75117 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/hardened/update.py @@ -0,0 +1,276 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python -p "python38.withPackages (ps: [ps.PyGithub])" git gnupg + +# This is automatically called by ../update.sh. + +from __future__ import annotations + +import json +import os +import re +import subprocess +import sys +from dataclasses import dataclass +from pathlib import Path +from tempfile import TemporaryDirectory +from typing import ( + Dict, + Iterator, + List, + Optional, + Sequence, + Tuple, + TypedDict, + Union, +) + +from github import Github +from github.GitRelease import GitRelease + +VersionComponent = Union[int, str] +Version = List[VersionComponent] + + +Patch = TypedDict("Patch", {"name": str, "url": str, "sha256": str}) + + +@dataclass +class ReleaseInfo: + version: Version + release: GitRelease + + +HERE = Path(__file__).resolve().parent +NIXPKGS_KERNEL_PATH = HERE.parent +NIXPKGS_PATH = HERE.parents[4] +HARDENED_GITHUB_REPO = "anthraxx/linux-hardened" +HARDENED_TRUSTED_KEY = HERE / "anthraxx.asc" +HARDENED_PATCHES_PATH = HERE / "patches.json" +MIN_KERNEL_VERSION: Version = [4, 14] + + +def run(*args: Union[str, Path]) -> subprocess.CompletedProcess[bytes]: + try: + return subprocess.run( + args, + check=True, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + encoding="utf-8", + ) + except subprocess.CalledProcessError as err: + print( + f"error: `{err.cmd}` failed unexpectedly\n" + f"status code: {err.returncode}\n" + f"stdout:\n{err.stdout.strip()}\n" + f"stderr:\n{err.stderr.strip()}", + file=sys.stderr, + ) + sys.exit(1) + + +def nix_prefetch_url(url: str) -> Tuple[str, Path]: + output = run("nix-prefetch-url", "--print-path", url).stdout + sha256, path = output.strip().split("\n") + return sha256, Path(path) + + +def verify_openpgp_signature( + *, name: str, trusted_key: Path, sig_path: Path, data_path: Path, +) -> bool: + with TemporaryDirectory(suffix=".nixpkgs-gnupg-home") as gnupg_home_str: + gnupg_home = Path(gnupg_home_str) + run("gpg", "--homedir", gnupg_home, "--import", trusted_key) + keyring = gnupg_home / "pubring.kbx" + try: + subprocess.run( + ("gpgv", "--keyring", keyring, sig_path, data_path), + check=True, + stderr=subprocess.PIPE, + encoding="utf-8", + ) + return True + except subprocess.CalledProcessError as err: + print( + f"error: signature for {name} failed to verify!", + file=sys.stderr, + ) + print(err.stderr, file=sys.stderr, end="") + return False + + +def fetch_patch(*, name: str, release: GitRelease) -> Optional[Patch]: + def find_asset(filename: str) -> str: + try: + it: Iterator[str] = ( + asset.browser_download_url + for asset in release.get_assets() + if asset.name == filename + ) + return next(it) + except StopIteration: + raise KeyError(filename) + + patch_filename = f"{name}.patch" + try: + patch_url = find_asset(patch_filename) + sig_url = find_asset(patch_filename + ".sig") + except KeyError: + print(f"error: {patch_filename}{{,.sig}} not present", file=sys.stderr) + return None + + sha256, patch_path = nix_prefetch_url(patch_url) + _, sig_path = nix_prefetch_url(sig_url) + sig_ok = verify_openpgp_signature( + name=name, + trusted_key=HARDENED_TRUSTED_KEY, + sig_path=sig_path, + data_path=patch_path, + ) + if not sig_ok: + return None + + return Patch(name=patch_filename, url=patch_url, sha256=sha256) + + +def parse_version(version_str: str) -> Version: + version: Version = [] + for component in version_str.split("."): + try: + version.append(int(component)) + except ValueError: + version.append(component) + return version + + +def version_string(version: Version) -> str: + return ".".join(str(component) for component in version) + + +def major_kernel_version_key(kernel_version: Version) -> str: + return version_string(kernel_version[:-1]) + + +def commit_patches(*, kernel_key: str, message: str) -> None: + new_patches_path = HARDENED_PATCHES_PATH.with_suffix(".new") + with open(new_patches_path, "w") as new_patches_file: + json.dump(patches, new_patches_file, indent=4, sort_keys=True) + new_patches_file.write("\n") + os.rename(new_patches_path, HARDENED_PATCHES_PATH) + message = f"linux/hardened/patches/{kernel_key}: {message}" + print(message) + if os.environ.get("COMMIT"): + run( + "git", + "-C", + NIXPKGS_PATH, + "commit", + f"--message={message}", + HARDENED_PATCHES_PATH, + ) + + +# Load the existing patches. +patches: Dict[str, Patch] +with open(HARDENED_PATCHES_PATH) as patches_file: + patches = json.load(patches_file) + +# Get the set of currently packaged kernel versions. +kernel_versions = {} +for filename in os.listdir(NIXPKGS_KERNEL_PATH): + filename_match = re.fullmatch(r"linux-(\d+)\.(\d+)\.nix", filename) + if filename_match: + nix_version_expr = f""" + with import {NIXPKGS_PATH} {{}}; + (callPackage {NIXPKGS_KERNEL_PATH / filename} {{}}).version + """ + kernel_version_json = run( + "nix-instantiate", "--eval", "--json", "--expr", nix_version_expr, + ).stdout + kernel_version = parse_version(json.loads(kernel_version_json)) + if kernel_version < MIN_KERNEL_VERSION: + continue + kernel_key = major_kernel_version_key(kernel_version) + kernel_versions[kernel_key] = kernel_version + +# Remove patches for unpackaged kernel versions. +for kernel_key in sorted(patches.keys() - kernel_versions.keys()): + commit_patches(kernel_key=kernel_key, message="remove") + +g = Github(os.environ.get("GITHUB_TOKEN")) +repo = g.get_repo(HARDENED_GITHUB_REPO) +failures = False + +# Match each kernel version with the best patch version. +releases = {} +for release in repo.get_releases(): + version = parse_version(release.tag_name) + # needs to look like e.g. 5.6.3.a + if len(version) < 4: + continue + + kernel_version = version[:-1] + kernel_key = major_kernel_version_key(kernel_version) + try: + packaged_kernel_version = kernel_versions[kernel_key] + except KeyError: + continue + + release_info = ReleaseInfo(version=version, release=release) + + if kernel_version == packaged_kernel_version: + releases[kernel_key] = release_info + else: + # Fall back to the latest patch for this major kernel version, + # skipping patches for kernels newer than the packaged one. + if kernel_version > packaged_kernel_version: + continue + elif ( + kernel_key not in releases or releases[kernel_key].version < version + ): + releases[kernel_key] = release_info + +# Update hardened-patches.json for each release. +for kernel_key in sorted(releases.keys()): + release_info = releases[kernel_key] + release = release_info.release + version = release_info.version + version_str = release.tag_name + name = f"linux-hardened-{version_str}" + + old_version: Optional[Version] = None + old_version_str: Optional[str] = None + update: bool + try: + old_filename = patches[kernel_key]["name"] + old_version_str = old_filename.replace("linux-hardened-", "").replace( + ".patch", "" + ) + old_version = parse_version(old_version_str) + update = old_version < version + except KeyError: + update = True + + if update: + patch = fetch_patch(name=name, release=release) + if patch is None: + failures = True + else: + patches[kernel_key] = patch + if old_version: + message = f"{old_version_str} -> {version_str}" + else: + message = f"init at {version_str}" + commit_patches(kernel_key=kernel_key, message=message) + +missing_kernel_versions = kernel_versions.keys() - patches.keys() + +if missing_kernel_versions: + print( + f"warning: no patches for kernel versions " + + ", ".join(missing_kernel_versions), + file=sys.stderr, + ) + +if failures: + sys.exit(1) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 70083eb6cc4d0..0f19efa16669a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.175"; + version = "4.14.181"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0b12w0d21sk261jr4p1pm32v0r20a5c2j1p5hasdqw80sb2hli6b"; + sha256 = "0kaasqhmg9in7pf4ldk9z4z1cjgv1c9xdr1ca0pznngygibym6xb"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index c7e55b1c9f8a6..c96fa330b5c0f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.114"; + version = "4.19.124"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03hz6vg5bg728ilbm4z997pf52cgxzsxb03vz5cs55gwdbfa0h0y"; + sha256 = "005dznldnj1m03cbkc5pd2q2cv9jj1j6a0x2vh4p79ypg4c01nfm"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 6f0baf2a53b33..4818e71475039 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.218"; + version = "4.4.224"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0qzhcy8i111jbpnkpzq7hqf9nkwq4s7smi820hfvnmd2ky7cns7a"; + sha256 = "1lb8ypn558vk73bj4a20wq40cig9vmzjn2xzzdws78gfair6hxpg"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 3b6a68b7c0396..4cb219d1014bc 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.218"; + version = "4.9.224"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1ka98c8sbfipzll6ss9fcsn26lh4cy60372yfw27pif4brhnwfnz"; + sha256 = "0jf92cx0b3wq9fxa3169wk4wqvy58hglfk6lsynszy8kjplhfvfz"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index e18048ef4c9d7..a27977b2bbcef 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.31"; + version = "5.4.42"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1svf4wf4j1vqhdpgx63ry4c99fc54d9nfi4d1xm7z209z3w86451"; + sha256 = "0cdwazpzfrrb2y5fp87v9yihy7v8mlbqjzxpzmv7p83609y1nhsf"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix deleted file mode 100644 index 3b6555bde53dc..0000000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.5.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: - -with stdenv.lib; - -buildLinux (args // rec { - version = "5.5.16"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0207yw1vkyzvnvbfbkyam6nac1dd9p4hmmbqw09ljki0ia531yw5"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.6.nix b/pkgs/os-specific/linux/kernel/linux-5.6.nix index 052343467db40..4ddb0c76b1241 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.6.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6.3"; + version = "5.6.14"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1ajh1iw3bplm6ckcycg45wfmmqkvfiqmh6i3m1895dfapfd6h4qx"; + sha256 = "18vyxi64i93v4qyky5q62kkasm1da7wmz91xfkx3j7ki84skyxik"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index d167a89ea8306..b13791ccb99b2 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17402"; - sha256 = "1g151h6hdiwpvpip1r2rhbma8j13xghcyxddh0ppg9h548wwwack"; + rev = "17445"; + sha256 = "0d2gd2w4pbb728a7mw9dnq3aicwpjzg8zahg80ismvc9l1sym50a"; } , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 6f5f2524276bd..31a2cc2aa157e 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -18,7 +18,7 @@ lib.overrideDerivation (buildLinux (args // { defconfig = { "1" = "bcmrpi_defconfig"; "2" = "bcm2709_defconfig"; - "3" = "bcmrpi3_defconfig"; + "3" = if stdenv.hostPlatform.isAarch64 then "bcmrpi3_defconfig" else "bcm2709_defconfig"; "4" = "bcm2711_defconfig"; }.${toString rpiVersion}; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index e63fe96be6b94..f2f0fac3b7ddb 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,15 +3,15 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6-rc7"; - extraMeta.branch = "5.6"; + version = "5.7-rc6"; + extraMeta.branch = "5.7"; # modDirVersion needs to be x.y.z, will always add .0 modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0wv3ipfm970y2pyadwn5g7hd9bj117qk8jl8sdhrasbsy1p8936i"; + sha256 = "0g04zwdxks7pa5q6shl5xl2rml1w95rxq7sqkkadj11mpk2k89w4"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 0538511c528c1..d73e0a8ac9095 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,6 +1,6 @@ { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl , libelf, cpio -, utillinux +, utillinuxMinimal , writeTextFile }: @@ -269,8 +269,8 @@ let + stdenv.lib.concatStringsSep ", " (map (x: x.name) kernelPatches) + ")"); license = stdenv.lib.licenses.gpl2; - homepage = https://www.kernel.org/; - repositories.git = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git; + homepage = "https://www.kernel.org/"; + repositories.git = "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"; maintainers = [ maintainers.thoughtpolice ]; @@ -281,7 +281,7 @@ let in assert stdenv.lib.versionAtLeast version "4.14" -> libelf != null; -assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null; +assert stdenv.lib.versionAtLeast version "4.15" -> utillinuxMinimal != null; stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // { pname = "linux"; inherit version; @@ -292,7 +292,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ] ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf - ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux + ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinuxMinimal ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] ++ optional (stdenv.lib.versionAtLeast version "5.2") cpio ; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 2af64c2ddc452..8ce1ac2b587cf 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -1,4 +1,4 @@ -{ fetchpatch }: +{ lib, fetchpatch, fetchurl }: { bridge_stp_helper = @@ -35,15 +35,23 @@ tag_hardened = { name = "tag-hardened"; - patch = ./tag-hardened.patch; + patch = ./hardened/tag-hardened.patch; }; + hardened = let + mkPatch = kernelVersion: src: { + name = lib.removeSuffix ".patch" src.name; + patch = fetchurl src; + }; + patches = builtins.fromJSON (builtins.readFile ./hardened/patches.json); + in lib.mapAttrs mkPatch patches; + # https://bugzilla.kernel.org/show_bug.cgi?id=197591#c6 iwlwifi_mvm_support_version_7_scan_req_umac_fw_command = rec { name = "iwlwifi_mvm_support_version_7_scan_req_umac_fw_command"; patch = fetchpatch { name = name + ".patch"; - url = https://bugzilla.kernel.org/attachment.cgi?id=260597; + url = "https://bugzilla.kernel.org/attachment.cgi?id=260597"; sha256 = "09096npxpgvlwdz3pb3m9brvxh7vy0xc9z9p8hh85xyczyzcsjhr"; }; }; @@ -53,7 +61,7 @@ name = "xen-netfront_fix_mismatched_rtnl_unlock"; patch = fetchpatch { name = name + ".patch"; - url = https://github.com/torvalds/linux/commit/cb257783c2927b73614b20f915a91ff78aa6f3e8.patch; + url = "https://github.com/torvalds/linux/commit/cb257783c2927b73614b20f915a91ff78aa6f3e8.patch"; sha256 = "0xhblx2j8wi3kpnfpgjjwlcwdry97ji2aaq54r3zirk5g5p72zs8"; }; }; @@ -63,7 +71,7 @@ name = "xen-netfront_update_features_after_registering_netdev"; patch = fetchpatch { name = name + ".patch"; - url = https://github.com/torvalds/linux/commit/45c8184c1bed1ca8a7f02918552063a00b909bf5.patch; + url = "https://github.com/torvalds/linux/commit/45c8184c1bed1ca8a7f02918552063a00b909bf5.patch"; sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv"; }; }; diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 07dd8c78f4263..a35582442979c 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://perf.wiki.kernel.org/; + homepage = "https://perf.wiki.kernel.org/"; description = "Linux tools to profile with performance counters"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/os-specific/linux/kernel/update.sh b/pkgs/os-specific/linux/kernel/update.sh index c7fcc07ea0a8b..55fdce06c9732 100755 --- a/pkgs/os-specific/linux/kernel/update.sh +++ b/pkgs/os-specific/linux/kernel/update.sh @@ -60,3 +60,6 @@ done # Update linux-libre COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-libre.sh + +# Update linux-hardened +COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/hardened/update.py diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index 4e9007c73625a..b1abf50f5f1f5 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://horms.net/projects/kexec/kexec-tools; + homepage = "http://horms.net/projects/kexec/kexec-tools"; description = "Tools related to the kexec Linux feature"; platforms = platforms.linux; badPlatforms = [ diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index 887aee45aa806..76869bfde5b18 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://people.redhat.com/dhowells/keyutils/; + homepage = "https://people.redhat.com/dhowells/keyutils/"; description = "Tools used to control the Linux kernel key management system"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index 55ae78219d185..e14e190cd7c56 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://packages.ubuntu.com/source/zesty/kmod; + homepage = "https://packages.ubuntu.com/source/zesty/kmod"; description = "Linux kernel module blacklists from Ubuntu"; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix index 07ab0427b226d..f0f4133172778 100644 --- a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix +++ b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://packages.debian.org/source/sid/kmod; + homepage = "https://packages.debian.org/source/sid/kmod"; description = "Linux configuration file for modprobe"; maintainers = with lib.maintainers; [ mathnerd314 ]; platforms = with lib.platforms; linux; diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 052ab3061c1b4..de025b436f543 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.kernel.org/pub/linux/utils/kernel/kmod/; + homepage = "https://www.kernel.org/pub/linux/utils/kernel/kmod/"; description = "Tools for loading and managing Linux kernel modules"; license = licenses.lgpl21; platforms = platforms.unix; diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix index fd16acaa3a984..a79f762a8a21b 100644 --- a/pkgs/os-specific/linux/kmscon/default.nix +++ b/pkgs/os-specific/linux/kmscon/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { description = "KMS/DRM based System Console"; - homepage = http://www.freedesktop.org/wiki/Software/kmscon/; + homepage = "http://www.freedesktop.org/wiki/Software/kmscon/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index 12463c736a629..e2e63bc10a182 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "kmscube-2018-06-17"; src = fetchgit { - url = git://anongit.freedesktop.org/mesa/kmscube; + url = "git://anongit.freedesktop.org/mesa/kmscube"; rev = "9dcce71e603616ee7a54707e932f962cdf8fb20a"; sha256 = "1q5b5yvyfj3127385mp1bfmcbnpnbdswdk8gspp7g4541xk4k933"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Example OpenGL app using KMS/GBM"; - homepage = https://gitlab.freedesktop.org/mesa/kmscube; + homepage = "https://gitlab.freedesktop.org/mesa/kmscube"; license = licenses.mit; maintainers = with maintainers; [ dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix index 93d2ac8b03124..40095e543b449 100644 --- a/pkgs/os-specific/linux/latencytop/default.nix +++ b/pkgs/os-specific/linux/latencytop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses glib gtk2 ]; meta = { - homepage = http://latencytop.org; + homepage = "http://latencytop.org"; description = "Tool to show kernel reports on latencies (LATENCYTOP option)"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix index ce76e31a9204a..bbc341caf11f9 100644 --- a/pkgs/os-specific/linux/ldm/default.nix +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -4,7 +4,7 @@ assert mountPath != ""; let version = "0.5"; - git = https://github.com/LemonBoy/ldm.git; + git = "https://github.com/LemonBoy/ldm.git"; in stdenv.mkDerivation rec { pname = "ldm"; @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.the-kenny ]; repositories.git = git; }; } diff --git a/pkgs/os-specific/linux/ledger-udev-rules/default.nix b/pkgs/os-specific/linux/ledger-udev-rules/default.nix index e61bac510e698..e85eb02f8c80f 100644 --- a/pkgs/os-specific/linux/ledger-udev-rules/default.nix +++ b/pkgs/os-specific/linux/ledger-udev-rules/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { license = licenses.asl20; maintainers = with maintainers; [ asymmetric ]; platforms = platforms.linux; - homepage = https://github.com/LedgerHQ/udev-rules; + homepage = "https://github.com/LedgerHQ/udev-rules"; }; } diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index 792568e8b57ba..63d446319d6fb 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; patches = [ (fetchpatch { - url = https://pagure.io/libaio/c/da47c32b2ff39e52fbed1622c34b86bc88d7c217.patch; + url = "https://pagure.io/libaio/c/da47c32b2ff39e52fbed1622c34b86bc88d7c217.patch"; sha256 = "1kqpiswjn549s3w3m89bw5qkl7bw5pvq6gp5cdzd926ymlgivj5c"; }) ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for asynchronous I/O in Linux"; - homepage = http://lse.sourceforge.net/io/aio.html; + homepage = "http://lse.sourceforge.net/io/aio.html"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl21; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/pkgs/os-specific/linux/libatasmart/default.nix index 018f8c6243503..cf5fc54ed65b7 100644 --- a/pkgs/os-specific/linux/libatasmart/default.nix +++ b/pkgs/os-specific/linux/libatasmart/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ udev ]; meta = with stdenv.lib; { - homepage = http://0pointer.de/blog/projects/being-smart.html; + homepage = "http://0pointer.de/blog/projects/being-smart.html"; description = "Library for querying ATA SMART status"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index b9626aac22d2a..aefb5ff6835c8 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -6,13 +6,13 @@ with builtins; stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "1jcqhqvfbnbijm4jn949ibw1qywai9rwhyijf6lg8cvnyxkib2bs"; + sha256 = "02vbpg9v5sjcw7ihximy63cjmz82q5izkp91i44m1qp6qj5qn4sr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix index 476c5931d4d00..c9b061fe03bfb 100644 --- a/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/pkgs/os-specific/linux/libcap-ng/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = let inherit (stdenv.lib) platforms licenses; in { description = "Library for working with POSIX capabilities"; - homepage = https://people.redhat.com/sgrubb/libcap-ng/; + homepage = "https://people.redhat.com/sgrubb/libcap-ng/"; platforms = platforms.linux; license = licenses.lgpl21; }; diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix index 026b43fc615da..4d93c3bb4fe49 100644 --- a/pkgs/os-specific/linux/libcgroup/default.nix +++ b/pkgs/os-specific/linux/libcgroup/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { + name = "CVE-2018-14348.patch"; url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/libcgroup/files/libcgroup-0.41-remove-umask.patch?id=33e9f4c81de754bbf76b893ea1133ed023f2a0e5"; sha256 = "1x0x29ld0cgmfwq4qy13s6d5c8sym1frfh1j2q47d8gfw6qaxka5"; }) diff --git a/pkgs/os-specific/linux/libfabric/default.nix b/pkgs/os-specific/linux/libfabric/default.nix new file mode 100644 index 0000000000000..40f92f38d1642 --- /dev/null +++ b/pkgs/os-specific/linux/libfabric/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, libpsm2 }: + +stdenv.mkDerivation rec { + pname = "libfabric"; + version = "1.10.1"; + + enableParallelBuilding = true; + + src = fetchFromGitHub { + owner = "ofiwg"; + repo = pname; + rev = "v${version}"; + sha256 = "0nf5x4v9rhyd67r6f6q3dw4sraaja8jfdkhhg9g8x41czmx4d456"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ] ; + + buildInputs = [ libpsm2 ] ; + + configureFlags = [ "--enable-psm2=${libpsm2}" ] ; + + meta = with stdenv.lib; { + homepage = "http://libfabric.org/"; + description = "Open Fabric Interfaces"; + license = with licenses; [ gpl2 bsd2 ]; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.bzizou ]; + }; +} diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 61380115ab5eb..551352fa46c6a 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit version; - homepage = http://www.infradead.org/~tgr/libnl/; + homepage = "http://www.infradead.org/~tgr/libnl/"; description = "Linux Netlink interface library suite"; license = licenses.lgpl21; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/os-specific/linux/libpsm2/default.nix b/pkgs/os-specific/linux/libpsm2/default.nix new file mode 100644 index 0000000000000..b9e41380da8cd --- /dev/null +++ b/pkgs/os-specific/linux/libpsm2/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, numactl, pkgconfig }: + +stdenv.mkDerivation rec { + pname = "libpsm2"; + version = "11.2.156"; + ifs_version = "10_10_2_0_44"; + + preConfigure= '' + export UDEVDIR=$out/etc/udev + substituteInPlace ./Makefile --replace "udevrulesdir}" "prefix}/etc/udev"; + ''; + + enableParallelBuilding = true; + + buildInputs = [ numactl pkgconfig ]; + + installFlags = [ + "DESTDIR=$(out)" + "UDEVDIR=/etc/udev" + "LIBPSM2_COMPAT_CONF_DIR=/etc" + ]; + + src = fetchFromGitHub { + owner = "intel"; + repo = "opa-psm2"; + rev = "IFS_RELEASE_${ifs_version}"; + sha256 = "0ckrfzih1ga9yvximxjdh0z05kn9l858ykqiblv18w6ka3gra1xz"; + }; + + postInstall = '' + mv $out/usr/* $out + rmdir $out/usr + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/intel/opa-psm2"; + description = "The PSM2 library supports a number of fabric media and stacks"; + license = with licenses; [ gpl2 bsd3 ]; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.bzizou ]; + }; +} diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix index 63220846f0cec..22763130aeecb 100644 --- a/pkgs/os-specific/linux/libratbag/default.nix +++ b/pkgs/os-specific/linux/libratbag/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Configuration library for gaming mice"; - homepage = https://github.com/libratbag/libratbag; + homepage = "https://github.com/libratbag/libratbag"; license = licenses.mit; maintainers = with maintainers; [ mvnetbiz ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index b31554d6cee4f..497961af11b44 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SELinux binary policy manipulation library"; - homepage = http://userspace.selinuxproject.org; + homepage = "http://userspace.selinuxproject.org"; platforms = platforms.linux; maintainers = [ maintainers.phreedom ]; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 81f5fe49d554b..268588f53ab15 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { preFixup = ''rm -rf "$(pwd)" ''; # Hack to avoid TMPDIR in RPATHs meta = with stdenv.lib; { - homepage = https://github.com/dell/libsmbios; + homepage = "https://github.com/dell/libsmbios"; description = "A library to obtain BIOS information"; license = with licenses; [ osl21 gpl2Plus ]; maintainers = with maintainers; [ ]; diff --git a/pkgs/os-specific/linux/libudev0-shim/default.nix b/pkgs/os-specific/linux/libudev0-shim/default.nix index ecdc658f2f1e4..2073f9f6f56ff 100644 --- a/pkgs/os-specific/linux/libudev0-shim/default.nix +++ b/pkgs/os-specific/linux/libudev0-shim/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Shim to preserve libudev.so.0 compatibility"; - homepage = https://github.com/archlinux/libudev0-shim; + homepage = "https://github.com/archlinux/libudev0-shim"; platforms = platforms.linux; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/os-specific/linux/libvolume_id/default.nix index 14c152dc10e9c..e54dee10c1d41 100644 --- a/pkgs/os-specific/linux/libvolume_id/default.nix +++ b/pkgs/os-specific/linux/libvolume_id/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libvolume_id-0.81.1"; src = fetchurl { - url = https://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2; + url = "https://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2"; sha256 = "029z04vdxxsl8gycm9whcljhv6dy4b12ybsxdb99jr251gl1ifs5"; }; diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/os-specific/linux/light/default.nix index e9ee69ca03ec8..45af4e7ae8e4e 100644 --- a/pkgs/os-specific/linux/light/default.nix +++ b/pkgs/os-specific/linux/light/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU/Linux application to control backlights"; - homepage = https://haikarainen.github.io/light/; + homepage = "https://haikarainen.github.io/light/"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ puffnfresh dtzWill ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/os-specific/linux/lightum/default.nix index 3eaf436319549..3c37b66d23159 100644 --- a/pkgs/os-specific/linux/lightum/default.nix +++ b/pkgs/os-specific/linux/lightum/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "lightum-2014-06-07"; src = fetchgit { - url = https://github.com/poliva/lightum; + url = "https://github.com/poliva/lightum"; rev = "123e6babe0669b23d4c1dfa5511088608ff2baa8"; sha256 = "01x24rcrkgksyvqpgkr9zafg3jgs8nqng8yf0hx0kbmcimar8dbp"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "MacBook automatic light sensor daemon"; - homepage = https://github.com/poliva/lightum; + homepage = "https://github.com/poliva/lightum"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/lksctp-tools/default.nix b/pkgs/os-specific/linux/lksctp-tools/default.nix index 6c644c9482a33..bef74cd33ba41 100644 --- a/pkgs/os-specific/linux/lksctp-tools/default.nix +++ b/pkgs/os-specific/linux/lksctp-tools/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux Kernel Stream Control Transmission Protocol Tools."; - homepage = http://lksctp.sourceforge.net/; + homepage = "http://lksctp.sourceforge.net/"; license = with licenses; [ gpl2 lgpl21 ]; # library is lgpl21 platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index 63155e66678af..da45e202c022f 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { installPhase = "true"; meta = { - homepage = http://www.lsi.com/; + homepage = "http://www.lsi.com/"; description = "LSI Logic Fusion MPT command line management tool"; license = stdenv.lib.licenses.unfree; }; diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 46c8dec8889fd..30d4a29b166cf 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux kernel modules for LTTng tracing"; - homepage = https://lttng.org/; + homepage = "https://lttng.org/"; license = with licenses; [ lgpl21 gpl2 mit ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 7eac8fad64cda..8db4be94e4ed5 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -47,17 +47,17 @@ stdenv.mkDerivation { patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { name = "fix-stdio-usage.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/fix-stdio-usage.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; + url = "https://git.alpinelinux.org/aports/plain/main/lvm2/fix-stdio-usage.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; sha256 = "0m6wr6qrvxqi2d2h054cnv974jq1v65lqxy05g1znz946ga73k3p"; }) (fetchpatch { name = "mallinfo.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; + url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; sha256 = "0g6wlqi215i5s30bnbkn8w7axrs27y3bnygbpbnf64wwx7rxxlj0"; }) (fetchpatch { name = "mlockall-default-config.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/mlockall-default-config.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; + url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mlockall-default-config.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; sha256 = "1ivbj3sphgf8n1ykfiv5rbw7s8dgnj5jcr9jl2v8cwf28lkacw5l"; }) ]; @@ -82,7 +82,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://sourceware.org/lvm2/; + homepage = "http://sourceware.org/lvm2/"; description = "Tools to support Logical Volume Management (LVM) on Linux"; platforms = platforms.linux; license = with licenses; [ gpl2 bsd2 lgpl21 ]; diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 405c816ea3093..cc25f90f2481c 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "lxc"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "178kqjz0n5nnjw0z8ac5lbfpqprna9xfd9ckakp34zq9vz0smfvh"; + sha256 = "1c2wbbcvs58slyq0skxizx61q1lb4yvak28x4gzsbzh3yg6nscya"; }; nativeBuildInputs = [ @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://linuxcontainers.org/; + homepage = "https://linuxcontainers.org/"; description = "Userspace tools for Linux Containers, a lightweight virtualization system"; license = licenses.lgpl21Plus; diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 65615f5c24062..68d05f0be65d3 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lxcfs-4.0.1"; + name = "lxcfs-4.0.3"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = name; - sha256 = "09y26ln2wxpi809kd3r352my64aal0yz2a5kin0i25gnvivl32cs"; + sha256 = "0v6c5vc3i1l4sy4iamzdqvwibj6xr1lna4w1hxkn3s6jggcbxwca"; }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix index 1f1c4b4d7c11c..29d2a3914a299 100644 --- a/pkgs/os-specific/linux/macchanger/default.nix +++ b/pkgs/os-specific/linux/macchanger/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "A utility for viewing/manipulating the MAC address of network interfaces"; maintainers = with maintainers; [ joachifm ma27 ]; license = licenses.gpl2Plus; - homepage = https://www.gnu.org/software/macchanger; + homepage = "https://www.gnu.org/software/macchanger"; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index 7c72c8a2dbf55..f48a3dbb62f5f 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "MacBook Air 6,1 and 6,2 (mid 2013) backlight driver"; - homepage = https://github.com/patjak/mba6x_bl; + homepage = "https://github.com/patjak/mba6x_bl"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.simonvandel ]; diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix index 4e2e31606c573..675d9417a01af 100644 --- a/pkgs/os-specific/linux/mbpfan/default.nix +++ b/pkgs/os-specific/linux/mbpfan/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { description = "Daemon that uses input from coretemp module and sets the fan speed using the applesmc module"; - homepage = https://github.com/dgraziotin/mbpfan; + homepage = "https://github.com/dgraziotin/mbpfan"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index c5b94d2d0c582..9ead1f6ad4bd8 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mcelog"; - version = "168"; + version = "169"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "0mcmmjvvc80nk20n4dknimv0jzvdkj1ajgyq33b2i4v6xq0bz1pb"; + sha256 = "0ghkwfaky026qwj6hmcvz2w2hm8qqj3ysbkxxi603vslmwj56chv"; }; postPatch = '' @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { including bad page offlining and automatic cache error handling. All errors are logged to /var/log/mcelog or syslog or the journal. ''; - homepage = http://mcelog.org/; + homepage = "http://mcelog.org/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 8638ac9f7983b..6a71196157b70 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Programs for managing RAID arrays under Linux"; - homepage = http://neil.brown.name/blog/mdadm; + homepage = "http://neil.brown.name/blog/mdadm"; license = licenses.gpl2; maintainers = with maintainers; [ ekleog ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix index 1a24ae3b9a26b..a1a37db9dd6fe 100644 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ b/pkgs/os-specific/linux/microcode/amd.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "AMD Processor microcode patch"; - homepage = http://www.amd64.org/support/microcode.html; + homepage = "http://www.amd64.org/support/microcode.html"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 70b2580b66417..c0201fb01fd4a 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20191115"; + version = "20200520"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "0pzi5qmrcrdf6nsds4bvyq1hnvv9d1dlrvqrbzcrpxk84rcjwq1x"; + sha256 = "1cs4b7q9j2lw2y09rfa82aijbfmy4lddahz8qlz9gwajf2ziqns8"; }; nativeBuildInputs = [ iucode-tool libarchive ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.intel.com/; + homepage = "http://www.intel.com/"; description = "Microcode for Intel processors"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/microcode/iucode-tool.nix b/pkgs/os-specific/linux/microcode/iucode-tool.nix index c81a0c9097afb..65cb01c84a52d 100644 --- a/pkgs/os-specific/linux/microcode/iucode-tool.nix +++ b/pkgs/os-specific/linux/microcode/iucode-tool.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Intel® 64 and IA-32 processor microcode tool"; - homepage = https://gitlab.com/iucode-tool/iucode-tool; + homepage = "https://gitlab.com/iucode-tool/iucode-tool"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix index a29a03734242b..775910d30d6ff 100644 --- a/pkgs/os-specific/linux/mingetty/default.nix +++ b/pkgs/os-specific/linux/mingetty/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "mingetty-1.08"; src = fetchurl { - url = mirror://sourceforge/mingetty/mingetty-1.08.tar.gz; + url = "mirror://sourceforge/mingetty/mingetty-1.08.tar.gz"; sha256 = "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/mingetty; + homepage = "https://sourceforge.net/projects/mingetty"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix index 6b67401b9b234..d04695ef619d0 100644 --- a/pkgs/os-specific/linux/miraclecast/default.nix +++ b/pkgs/os-specific/linux/miraclecast/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Connect external monitors via Wi-Fi"; - homepage = https://github.com/albfan/miraclecast; + homepage = "https://github.com/albfan/miraclecast"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ tstrobel ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix index 1b5925a55816a..8a20a2f733af1 100644 --- a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix +++ b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://archlinux.org/; + homepage = "https://archlinux.org/"; description = "ipconfig and nfsmount tools for root on NFS, ported from klibc"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 16c73377cb4b8..61ad327c39427 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Configure MMC storage devices from userspace"; - homepage = http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/; + homepage = "http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/pkgs/os-specific/linux/molly-guard/default.nix index 9b412d9d7ed4c..c9bdff9de3ec4 100644 --- a/pkgs/os-specific/linux/molly-guard/default.nix +++ b/pkgs/os-specific/linux/molly-guard/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Attempts to prevent you from accidentally shutting down or rebooting machines"; - homepage = https://salsa.debian.org/debian/molly-guard; + homepage = "https://salsa.debian.org/debian/molly-guard"; license = licenses.artistic2; platforms = platforms.linux; maintainers = with maintainers; [ DerTim1 ]; diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 9a76e5873d4f2..7e5ce115db4a1 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools for the Linux multipathing driver"; - homepage = http://christophe.varoqui.free.fr/; + homepage = "http://christophe.varoqui.free.fr/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 93e9ba614f881..51dcf4cfca333 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -19,10 +19,10 @@ let # iconv tool, implemented by musl author. # Original: http://git.etalabs.net/cgit/noxcuse/plain/src/iconv.c?id=02d288d89683e99fd18fe9f54d4e731a6c474a4f # We use copy from Alpine which fixes error messages, see: - # https://git.alpinelinux.org/cgit/aports/commit/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f + # https://git.alpinelinux.org/aports/commit/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f iconv_c = fetchurl { name = "iconv.c"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f"; + url = "https://git.alpinelinux.org/aports/plain/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f"; sha256 = "1mzxnc2ncq8lw9x6n7p00fvfklc9p3wfv28m68j0dfz5l8q2k6pp"; }; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { patches = [ # Minor touchup to build system making dynamic linker symlink relative (fetchurl { - url = https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch; + url = "https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch"; sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n"; }) ]; diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index 9490bc9118191..acb4676a3f513 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.magewell.com/; + homepage = "http://www.magewell.com/"; description = "Linux driver for the Magewell Pro Capture family"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ MP2E ]; diff --git a/pkgs/os-specific/linux/mxu11x0/default.nix b/pkgs/os-specific/linux/mxu11x0/default.nix index 76e60ec80ff56..ab0b927f1bd11 100644 --- a/pkgs/os-specific/linux/mxu11x0/default.nix +++ b/pkgs/os-specific/linux/mxu11x0/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "MOXA UPort 11x0 USB to Serial Hub driver"; - homepage = https://www.moxa.com/en/products/industrial-edge-connectivity/usb-to-serial-converters-usb-hubs/usb-to-serial-converters/uport-1000-series; + homepage = "https://www.moxa.com/en/products/industrial-edge-connectivity/usb-to-serial-converters-usb-hubs/usb-to-serial-converters/uport-1000-series"; license = licenses.gpl2Plus; maintainers = with maintainers; [ uralbash ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix index bdb52c0c09167..34c77bc3e6a74 100644 --- a/pkgs/os-specific/linux/ndiswrapper/default.nix +++ b/pkgs/os-specific/linux/ndiswrapper/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { meta = { description = "Ndis driver wrapper for the Linux kernel"; - homepage = https://sourceforge.net/projects/ndiswrapper; + homepage = "https://sourceforge.net/projects/ndiswrapper"; license = "GPL"; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index 7b1a0234a4f54..9095b652b42b7 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://net-tools.sourceforge.net/; + homepage = "http://net-tools.sourceforge.net/"; description = "A set of tools for controlling the network subsystem in Linux"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/net-tools/mptcp.nix b/pkgs/os-specific/linux/net-tools/mptcp.nix index 700bc5cb7f193..6e798e6807d7d 100644 --- a/pkgs/os-specific/linux/net-tools/mptcp.nix +++ b/pkgs/os-specific/linux/net-tools/mptcp.nix @@ -12,7 +12,7 @@ nettools.overrideAttrs(oa: rec { }; meta = with stdenv.lib; { - homepage = https://github.com/multipath-tcp/net-tools; + homepage = "https://github.com/multipath-tcp/net-tools"; description = "A set of tools for controlling the network subsystem in Linux"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index 718cf4815baf9..93bb1316d20d2 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "Network monitoring module for atop"; - homepage = https://www.atoptool.nl/downloadnetatop.php; + homepage = "https://www.atoptool.nl/downloadnetatop.php"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 20dc6a094e7a3..719ded4d70faa 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { daemons. ''; - homepage = https://linux-nfs.org/; + homepage = "https://linux-nfs.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/os-specific/linux/nss_ldap/default.nix index c23eb19a482a7..74369060ba9f0 100644 --- a/pkgs/os-specific/linux/nss_ldap/default.nix +++ b/pkgs/os-specific/linux/nss_ldap/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "nss_ldap-265"; src = fetchurl { - url = http://www.padl.com/download/nss_ldap-265.tar.gz; + url = "http://www.padl.com/download/nss_ldap-265.tar.gz"; sha256 = "1a16q9p97d2blrj0h6vl1xr7dg7i4s8x8namipr79mshby84vdbp"; }; diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index f2188ee37cb4f..8505fbc750f30 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library and tools for non-uniform memory access (NUMA) machines"; - homepage = https://github.com/numactl/numactl; + homepage = "https://github.com/numactl/numactl"; license = with licenses; [ gpl2 lgpl21 ]; # libnuma is lgpl21 platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; }; diff --git a/pkgs/os-specific/linux/numad/default.nix b/pkgs/os-specific/linux/numad/default.nix index 0d5dd118798ec..47af20152db9c 100644 --- a/pkgs/os-specific/linux/numad/default.nix +++ b/pkgs/os-specific/linux/numad/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A user-level daemon that monitors NUMA topology and processes resource consumption to facilitate good NUMA resource access"; - homepage = https://fedoraproject.org/wiki/Features/numad; + homepage = "https://fedoraproject.org/wiki/Features/numad"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/os-specific/linux/numatop/default.nix index 80f14b568eda2..57ee511bbadcf 100644 --- a/pkgs/os-specific/linux/numatop/default.nix +++ b/pkgs/os-specific/linux/numatop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for runtime memory locality characterization and analysis of processes and threads on a NUMA system"; - homepage = https://01.org/numatop; + homepage = "https://01.org/numatop"; license = licenses.bsd3; maintainers = with maintainers; [ dtzWill ]; platforms = [ diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 30e5d16b60f3b..dbe18ace40a24 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -45,6 +45,17 @@ installPhase() { cp -prd tls "$out/lib/" fi + # Install systemd power management executables + if [ -e nvidia-sleep.sh ]; then + sed -E 's#(PATH=).*#\1"$PATH"#' nvidia-sleep.sh > nvidia-sleep.sh.fixed + install -Dm755 nvidia-sleep.sh.fixed $out/bin/nvidia-sleep.sh + fi + + if [ -e nvidia ]; then + sed -E "s#/usr(/bin/nvidia-sleep.sh)#$out\\1#" nvidia > nvidia.fixed + install -Dm755 nvidia.fixed $out/lib/systemd/system-sleep/nvidia + fi + for i in $lib32 $out; do rm -f $i/lib/lib{glx,nvidia-wfb}.so.* # handled separately rm -f $i/lib/libnvidia-gtk* # built from source @@ -91,7 +102,6 @@ installPhase() { done - if [ -n "$bin" ]; then # Install the X drivers. mkdir -p $bin/lib/xorg/modules @@ -167,5 +177,4 @@ installPhase() { fi } - genericBuild diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 9e2ee6e834c24..1d73ab8171a23 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -89,7 +89,7 @@ let }; meta = with stdenv.lib; { - homepage = https://www.nvidia.com/object/unix.html; + homepage = "https://www.nvidia.com/object/unix.html"; description = "X.org driver and kernel module for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index 4f8a0b6866409..de36ad06c60cb 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.nvidia.com/object/unix.html; + homepage = "https://www.nvidia.com/object/unix.html"; description = "Settings application for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = nvidia_x11.meta.platforms; diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 533a74fcffd88..b1250e56ee068 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = https://www.nvidia.com/object/unix.html; + homepage = "https://www.nvidia.com/object/unix.html"; description = "Settings application for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = nvidia_x11.meta.platforms; diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix index 02161f7133ce6..08af09d3d0514 100644 --- a/pkgs/os-specific/linux/nvidiabl/default.nix +++ b/pkgs/os-specific/linux/nvidiabl/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux driver for setting the backlight brightness on laptops using NVIDIA GPU"; - homepage = https://github.com/guillaumezin/nvidiabl; + homepage = "https://github.com/guillaumezin/nvidiabl"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ yorickvp ]; diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index d0aca3bbc8276..616ad9c676475 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, pkg-config }: stdenv.mkDerivation rec { pname = "nvme-cli"; - version = "1.10.1"; + version = "1.11.1"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "12wp2wxmsw2v8m9bhvwvdbhdgx1md8iilhbl19sfzz2araiwi2x8"; + sha256 = "06cxs41biqx230grvpk7zid3apcaajjywrccag50krb6h2wqafdl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; @@ -20,8 +20,16 @@ stdenv.mkDerivation rec { installTargets = [ "install-spec" ]; meta = with lib; { - inherit (src.meta) homepage; + inherit (src.meta) homepage; # https://nvmexpress.org/ description = "NVM-Express user space tooling for Linux"; + longDescription = '' + NVM-Express is a fast, scalable host controller interface designed to + address the needs for not only PCI Express based solid state drives, but + also NVMe-oF(over fabrics). + This nvme program is a user space utility to provide standards compliant + tooling for NVM-Express drives. It was made specifically for Linux as it + relies on the IOCTLs defined by the mainline kernel driver. + ''; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos tavyc ]; diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index e1acda120253e..39bb2f3e411f5 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open Data Plane optimized for DPDK"; - homepage = https://www.opendataplane.org; + homepage = "https://www.opendataplane.org"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.abuibrahim ]; diff --git a/pkgs/os-specific/linux/ofp/default.nix b/pkgs/os-specific/linux/ofp/default.nix index 855754a6bc1b7..7467f7d871370 100644 --- a/pkgs/os-specific/linux/ofp/default.nix +++ b/pkgs/os-specific/linux/ofp/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High performance TCP/IP stack"; - homepage = http://www.openfastpath.org; + homepage = "http://www.openfastpath.org"; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.abuibrahim ]; diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix index 6a0273afbdd3e..1617696e00e5b 100644 --- a/pkgs/os-specific/linux/open-isns/default.nix +++ b/pkgs/os-specific/linux/open-isns/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "iSNS server and client for Linux"; license = stdenv.lib.licenses.lgpl21; - homepage = https://github.com/gonzoleeman/open-isns; + homepage = "https://github.com/gonzoleeman/open-isns"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix index 4f3f4c5c172a7..358a8b39917bf 100644 --- a/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/pkgs/os-specific/linux/openvswitch/lts.nix @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { support distribution across multiple physical servers similar to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. ''; - homepage = https://www.openvswitch.org/; + homepage = "https://www.openvswitch.org/"; license = licenses.asl20; maintainers = with maintainers; [ netixx kmcopper ]; }; diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/os-specific/linux/otpw/default.nix index a0464e1996a51..c9597ab0fe47d 100644 --- a/pkgs/os-specific/linux/otpw/default.nix +++ b/pkgs/os-specific/linux/otpw/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "stackprotector" ]; meta = { - homepage = http://www.cl.cam.ac.uk/~mgk25/otpw.html; + homepage = "http://www.cl.cam.ac.uk/~mgk25/otpw.html"; description = "A one-time password login package"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index e4429cc3bd7c3..fb969d7574a0f 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optionals (stdenv.hostPlatform.libc == "musl") [ (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/linux-pam/fix-compat.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; + url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/fix-compat.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; sha256 = "1h5yp5h2mqp1fcwiwwklyfpa69a3i03ya32pivs60fd7g5bqa7sf"; }) (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; + url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; sha256 = "1ib6shhvgzinjsc603k2x1lxh9dic6qq449fnk110gc359m23j81"; }) # From adelie's package repo, using local copy since it seems to be currently offline. @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails meta = with stdenv.lib; { - homepage = http://www.linux-pam.org/; + homepage = "http://www.linux-pam.org/"; description = "Pluggable Authentication Modules, a flexible mechanism for authenticating user"; platforms = platforms.linux; license = licenses.bsd3; diff --git a/pkgs/os-specific/linux/pam_ccreds/default.nix b/pkgs/os-specific/linux/pam_ccreds/default.nix index 012750c22adc7..c4abfe5c44cba 100644 --- a/pkgs/os-specific/linux/pam_ccreds/default.nix +++ b/pkgs/os-specific/linux/pam_ccreds/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ pam openssl db ]; meta = with stdenv.lib; { - homepage = https://www.padl.com/OSS/pam_ccreds.html; + homepage = "https://www.padl.com/OSS/pam_ccreds.html"; description = "PAM module to locally authenticate using an enterprise identity when the network is unavailable"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix index 3b23c286e19a0..7a384c793d23f 100644 --- a/pkgs/os-specific/linux/pam_krb5/default.nix +++ b/pkgs/os-specific/linux/pam_krb5/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, pam, kerberos }: stdenv.mkDerivation rec { - name = "pam-krb5-4.8"; + name = "pam-krb5-4.9"; src = fetchurl { url = "https://archives.eyrie.org/software/kerberos/${name}.tar.gz"; - sha256 = "0j96jfaxzkj1ifc3qxagjmaxvgda7ndqaaxx2ka018is9f5lbfrs"; + sha256 = "0kzz6mjkzw571pkv684vyczhl874f6p7lih3dj7s764gxdxnv4y5"; }; buildInputs = [ pam kerberos ]; meta = with stdenv.lib; { - homepage = https://www.eyrie.org/~eagle/software/pam-krb5/; + homepage = "https://www.eyrie.org/~eagle/software/pam-krb5/"; description = "PAM module allowing PAM-aware applications to authenticate users by performing an AS exchange with a Kerberos KDC"; longDescription = '' pam_krb5 can optionally convert Kerberos 5 credentials to Kerberos IV diff --git a/pkgs/os-specific/linux/pam_ldap/default.nix b/pkgs/os-specific/linux/pam_ldap/default.nix index 2b3a300eccaa6..e327a551b231a 100644 --- a/pkgs/os-specific/linux/pam_ldap/default.nix +++ b/pkgs/os-specific/linux/pam_ldap/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ pam openldap ]; meta = { - homepage = https://www.padl.com/OSS/pam_ldap.html; + homepage = "https://www.padl.com/OSS/pam_ldap.html"; description = "LDAP backend for PAM"; longDescription = '' The pam_ldap module provides the means for Solaris and Linux servers and diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix index 4bda93baddcfa..18bc84effa06d 100644 --- a/pkgs/os-specific/linux/pam_mount/default.nix +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://pam-mount.sourceforge.net/; + homepage = "http://pam-mount.sourceforge.net/"; description = "PAM module to mount volumes for a user session"; maintainers = [ maintainers.tstrobel ]; license = with licenses; [ gpl2 gpl3 lgpl21 lgpl3 ]; diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/os-specific/linux/pam_pgsql/default.nix index a1c91516ce000..6aa1c3be1e251 100644 --- a/pkgs/os-specific/linux/pam_pgsql/default.nix +++ b/pkgs/os-specific/linux/pam_pgsql/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Support to authenticate against PostgreSQL for PAM-enabled appliations"; - homepage = https://github.com/pam-pgsql/pam-pgsql; + homepage = "https://github.com/pam-pgsql/pam-pgsql"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix index b47ad4815b5b4..3ab1ae28a7b57 100644 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://pamsshagentauth.sourceforge.net/; + homepage = "http://pamsshagentauth.sourceforge.net/"; description = "PAM module for authentication through the SSH agent"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index 6e9ab379dbcff..30acb86d860e1 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://developers.yubico.com/pam-u2f/; + homepage = "https://developers.yubico.com/pam-u2f/"; description = "A PAM module for allowing authentication with a U2F device"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index 9b91572551423..3e01b1bd45535 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://pamusb.org/; + homepage = "http://pamusb.org/"; description = "Authentication using USB Flash Drives"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index f8c75b1913bc7..f69b2bd7fcec1 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pax-utils"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { url = "http://distfiles.gentoo.org/distfiles/${pname}-${version}.tar.xz"; - sha256 = "1v4jwbda25w07qhlx5xc5i0hwsv3pjy8hfy0r93vnmfjxq61grvw"; + sha256 = "08bzvgv1z3371sqf7zlm9i0b1y3wdymj2dqdvzvf192k3nix4hlp"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index 75c32577a00aa..820ef7f961271 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { '') firmware; meta = { - homepage = https://www.kernel.org/pub/linux/utils/kernel/pcmcia/; + homepage = "https://www.kernel.org/pub/linux/utils/kernel/pcmcia/"; longDescription = " PCMCIAutils contains the initialization tools necessary to allow the PCMCIA subsystem to behave (almost) as every other diff --git a/pkgs/os-specific/linux/perf-tools/default.nix b/pkgs/os-specific/linux/perf-tools/default.nix index ef8e8c7b34a78..1a18c6ea27213 100644 --- a/pkgs/os-specific/linux/perf-tools/default.nix +++ b/pkgs/os-specific/linux/perf-tools/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { platforms = platforms.linux; - homepage = https://github.com/brendangregg/perf-tools; + homepage = "https://github.com/brendangregg/perf-tools"; description = "Performance analysis tools based on Linux perf_events (aka perf) and ftrace"; maintainers = [ maintainers.eelco ]; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index 75fce129e9342..2d5d149292cd6 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { while noticably reducing fan noise. This driver works only on supported Intel architectures. ''; - homepage = http://www.linux-phc.org/; + homepage = "http://www.linux-phc.org/"; downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index 4eb1b2c8c14ae..f097f3e5465c6 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "GTK frontend for ratbagd mouse config daemon"; - homepage = https://github.com/libratbag/piper; + homepage = "https://github.com/libratbag/piper"; license = licenses.gpl2; maintainers = with maintainers; [ mvnetbiz ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix index 044f75cbd6fbb..14d1eb8599807 100644 --- a/pkgs/os-specific/linux/pipework/default.nix +++ b/pkgs/os-specific/linux/pipework/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = with lib; { description = "Software-Defined Networking tools for LXC"; - homepage = https://github.com/jpetazzo/pipework; + homepage = "https://github.com/jpetazzo/pipework"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index 3312f2302472a..41db6e936615a 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Traffic generator powered by DPDK"; - homepage = http://dpdk.org/; + homepage = "http://dpdk.org/"; license = licenses.bsdOriginal; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.abuibrahim ]; diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index 42739e53fdaca..1d98cfb0cd183 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "dynamic Tracing in Linux"; - homepage = https://wkz.github.io/ply/; + homepage = "https://wkz.github.io/ply/"; license = [ licenses.gpl2 ]; maintainers = with maintainers; [ mic92 mbbx6spp ]; }; diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index 1a8e3685e9c76..7a6c227f401f7 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libxslt, docbook_xsl -, gtk3, udev, systemd +, gtk3, udev, systemd, lib }: stdenv.mkDerivation rec { @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { "--enable-pango" "--enable-gdm-transition" "--enable-gtk" + "ac_cv_path_SYSTEMD_ASK_PASSWORD_AGENT=${lib.getBin systemd}/bin/systemd-tty-ask-password-agent" ]; configurePlatforms = [ "host" ]; @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/Plymouth; + homepage = "http://www.freedesktop.org/wiki/Software/Plymouth"; description = "A graphical boot animation"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index b314e8db83791..1d8314923d374 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://pm-utils.freedesktop.org/wiki/; + homepage = "https://pm-utils.freedesktop.org/wiki/"; description = "A small collection of scripts that handle suspend and resume on behalf of HAL"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index 0981a0b5a4bd6..63d0c88c1f8e9 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 1 out of 1 tests with "Error: could not open fstab-type file: No such file or directory" meta = { - homepage = https://bazaar.launchpad.net/~fourmond/pmount/main/files; + homepage = "https://bazaar.launchpad.net/~fourmond/pmount/main/files"; description = "Mount removable devices as normal user"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/os-specific/linux/pommed-light/default.nix index 06ea49034a01e..31697823e5240 100644 --- a/pkgs/os-specific/linux/pommed-light/default.nix +++ b/pkgs/os-specific/linux/pommed-light/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ambient light sensor support removed, optimized for use with dwm and the like. ''; - homepage = https://github.com/bytbox/pommed-light; + homepage = "https://github.com/bytbox/pommed-light"; platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index f5b54769f003e..dd3b24dd19a23 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "powerstat"; - version = "0.02.22"; + version = "0.02.23"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0r355b9syqa2nhfy8ksvxyy5d58v0isf983842js091s6liy0x7g"; + sha256 = "1yj8ja0hw92wscazxh9vr3qdz24wpw2fgd3w7w088srfzg2aqf3a"; }; installFlags = [ "DESTDIR=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 691b216073fd2..bcac7ab63c0a0 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ( fetchpatch { name = "strerror_r.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e"; + url = "https://git.alpinelinux.org/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e"; sha256 = "1kzddhcrb0n2iah4lhgxwwy4mkhq09ch25jjngyq6pdj6pmfkpfw"; } ) ++ [ @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Analyze power consumption on Intel-based laptops"; - homepage = https://01.org/powertop; + homepage = "https://01.org/powertop"; license = licenses.gpl2; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/pps-tools/default.nix b/pkgs/os-specific/linux/pps-tools/default.nix index f50bfcec781c9..fd5225c5cfe04 100644 --- a/pkgs/os-specific/linux/pps-tools/default.nix +++ b/pkgs/os-specific/linux/pps-tools/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib;{ description = "User-space tools for LinuxPPS"; - homepage = http://linuxpps.org/; + homepage = "http://linuxpps.org/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ sorki ]; diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 09e4cbc438bba..e71dcb497a26b 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Parallels Tools for Linux guests"; - homepage = https://parallels.com; + homepage = "https://parallels.com"; platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.unfree; # I was making this package blindly and requesting testing from the real user, diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 62a6b645c2c46..466e66a8713c0 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { '' else null; meta = { - homepage = https://gitlab.com/procps-ng/procps; + homepage = "https://gitlab.com/procps-ng/procps"; description = "Utilities that give information about processes using the /proc filesystem"; priority = 11; # less than coreutils, which also provides "kill" and "uptime" license = lib.licenses.gpl2; diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix index f8eb8c0a969f7..9dd4ba6cd3731 100644 --- a/pkgs/os-specific/linux/pscircle/default.nix +++ b/pkgs/os-specific/linux/pscircle/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://gitlab.com/mildlyparallel/pscircle; + homepage = "https://gitlab.com/mildlyparallel/pscircle"; description = "Visualize Linux processes in a form of a radial tree"; license = licenses.gpl2; maintainers = [ maintainers.ldesgoui ]; diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 999df37706ded..4379ee3ae49fc 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://gitlab.com/psmisc/psmisc; + homepage = "https://gitlab.com/psmisc/psmisc"; description = "A set of small useful utilities that use the proc filesystem (such as fuser, killall and pstree)"; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index c013a0107eabd..3d26914d4f9dd 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { is also valid for OpenCL loads; the other blocks are only useful for GL loads. Requires root rights or other permissions to read /dev/mem. ''; - homepage = https://github.com/clbr/radeontop; + homepage = "https://github.com/clbr/radeontop"; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ rycee ]; diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 1d505523c5096..a9cf7fe03b4a9 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -4,7 +4,7 @@ } : let - version = "28.0"; + version = "29.0"; in stdenv.mkDerivation { pname = "rdma-core"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "0az2is6p5gkyphi2b978kwn7knry60y33kn6p7cxz49ca79a42cy"; + sha256 = "03r7jbhw64siyrna9mz0qzppfzp8ilwi7iqdkxgyy33rndncqqnq"; }; nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; @@ -45,7 +45,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "RDMA Core Userspace Libraries and Daemons"; - homepage = https://github.com/linux-rdma/rdma-core; + homepage = "https://github.com/linux-rdma/rdma-core"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ markuskowa ]; diff --git a/pkgs/os-specific/linux/read-edid/default.nix b/pkgs/os-specific/linux/read-edid/default.nix index 815005ae290ed..36020d831aca8 100644 --- a/pkgs/os-specific/linux/read-edid/default.nix +++ b/pkgs/os-specific/linux/read-edid/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for reading and parsing EDID data from monitors"; - homepage = http://www.polypux.org/projects/read-edid/; + homepage = "http://www.polypux.org/projects/read-edid/"; license = licenses.bsd2; # Quoted: "This is an unofficial license. Let's call it BSD-like." maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/regionset/default.nix b/pkgs/os-specific/linux/regionset/default.nix index 3cb964f364d34..15030d1b19a28 100644 --- a/pkgs/os-specific/linux/regionset/default.nix +++ b/pkgs/os-specific/linux/regionset/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit version; - homepage = http://linvdr.org/projects/regionset/; + homepage = "http://linvdr.org/projects/regionset/"; description = "Tool for changing the region code setting of DVD players"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix index 1635dc064beaf..0e635583d6443 100644 --- a/pkgs/os-specific/linux/reptyr/default.nix +++ b/pkgs/os-specific/linux/reptyr/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [raskin]; license = lib.licenses.mit; description = "Reparent a running program to a new terminal"; - homepage = https://github.com/nelhage/reptyr; + homepage = "https://github.com/nelhage/reptyr"; }; } diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index 710eba642cb0c..a852e43b38f8f 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = ''A FUSE filesystem intended to be used like Apache mod_rewrite''; - homepage = https://github.com/sloonz/rewritefs; + homepage = "https://github.com/sloonz/rewritefs"; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/rfkill/default.nix b/pkgs/os-specific/linux/rfkill/default.nix index 80b5ce0124374..10d46a84821f9 100644 --- a/pkgs/os-specific/linux/rfkill/default.nix +++ b/pkgs/os-specific/linux/rfkill/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://wireless.kernel.org/en/users/Documentation/rfkill; + homepage = "http://wireless.kernel.org/en/users/Documentation/rfkill"; description = "A tool to query, enable and disable wireless devices"; platforms = platforms.linux; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/os-specific/linux/rfkill/udev.nix b/pkgs/os-specific/linux/rfkill/udev.nix index 0575c46e28e3c..3ee112126ac69 100644 --- a/pkgs/os-specific/linux/rfkill/udev.nix +++ b/pkgs/os-specific/linux/rfkill/udev.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = http://wireless.kernel.org/en/users/Documentation/rfkill; + homepage = "http://wireless.kernel.org/en/users/Documentation/rfkill"; description = "Rules+hook for udev to catch rfkill state changes"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix index 1f5b31d0deb60..5c4848980a94a 100644 --- a/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Tools to configure ROCCAT devices"; - homepage = http://roccat.sourceforge.net/; + homepage = "http://roccat.sourceforge.net/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix index 4ad454437f577..b3f73e6c3bba7 100644 --- a/pkgs/os-specific/linux/rtkit/default.nix +++ b/pkgs/os-specific/linux/rtkit/default.nix @@ -1,43 +1,46 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, dbus, libcap }: +{ stdenv, fetchFromGitHub, fetchpatch +, meson, ninja, pkgconfig, unixtools +, dbus, libcap, polkit, systemd +}: stdenv.mkDerivation rec { - name = "rtkit-0.11"; - - src = fetchurl { - url = "http://0pointer.de/public/${name}.tar.xz"; - sha256 = "1l5cb1gp6wgpc9vq6sx021qs6zb0nxg3cn1ba00hjhgnrw4931b8"; + pname = "rtkit"; + version = "0.13"; + + src = fetchFromGitHub { + owner = "heftig"; + repo = "rtkit"; + rev = "c295fa849f52b487be6433e69e08b46251950399"; + sha256 = "0yfsgi3pvg6dkizrww1jxpkvcbhzyw9110n1dypmzq0c5hlzjxcd"; }; - configureFlags = [ - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - ]; - patches = [ - # Drop removed ControlGroup stanza (fetchpatch { - url = "http://git.0pointer.net/rtkit.git/patch/?id=6c28e20c0be2f616a025059fda0ffac84e7f4f17"; - sha256 = "0lsxk5nv08i1wjb4xh20i5fcwg3x0qq0k4f8bc0r9cczph2sv7ck"; + url = "https://github.com/heftig/rtkit/commit/7d62095b94f8df3891c984a1535026d2658bb177.patch"; + sha256 = "17acv549zqcgh7sgprfagbf6drqsr0zdwvf1dsqda7wlqc2h9zn7"; }) - # security patch: Pass uid of caller to polkit (fetchpatch { - url = "http://git.0pointer.net/rtkit.git/patch/?id=88d4082ef6caf6b071d749dca1c50e7edde914cc"; - sha256 = "0hp1blbi359qz8fmr6nj4w9yc0jf3dd176f8pn25wdj38n13qkix"; - }) - - # Fix format string errors due to -Werror=format-security - (fetchpatch { - url = "https://sources.debian.org/data/main/r/rtkit/0.11-6/debian/patches/0006-fix-format-strings.patch"; - sha256 = "09mr89lh16jvz6cqw00zmh0xk919bjfhjkvna1czwmafwy9p7kgp"; + url = "https://github.com/heftig/rtkit/commit/98f70edd8f534c371cb4308b9720739c5178918d.patch"; + sha256 = "18mnjjsdjfr184nkzi01xyphpdngi31ry4bmkv9ysjxf9wilv4nl"; }) ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus libcap ]; - NIX_LDFLAGS = "-lrt"; + nativeBuildInputs = [ meson ninja pkgconfig unixtools.xxd ]; + buildInputs = [ dbus libcap polkit systemd ]; + + mesonFlags = [ + "-Dinstalled_tests=false" + + "-Ddbus_systemservicedir=${placeholder "out"}/share/dbus-1/system-services" + "-Ddbus_interfacedir=${placeholder "out"}/share/dbus-1/interfaces" + "-Ddbus_rulesdir=${placeholder "out"}/etc/dbus-1/system.d" + "-Dpolkit_actiondir=${placeholder "out"}/share/polkit-1/actions" + "-Dsystemd_systemunitdir=${placeholder "out"}/etc/systemd/system" + ]; meta = with stdenv.lib; { - homepage = http://0pointer.de/blog/projects/rtkit; + homepage = "https://github.com/heftig/rtkit"; description = "A daemon that hands out real-time priority to processes"; license = with licenses; [ gpl3 bsd0 ]; # lib is bsd license platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index f24921c7ce67b..909a972efa38d 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = { description = "Realtek rtl8192eu driver"; - homepage = https://github.com/Mange/rtl8192eu-linux-driver; + homepage = "https://github.com/Mange/rtl8192eu-linux-driver"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with maintainers; [ troydm ]; diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix index f468196dc73d3..323d6a8207390 100644 --- a/pkgs/os-specific/linux/rtl8723bs/default.nix +++ b/pkgs/os-specific/linux/rtl8723bs/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Realtek SDIO Wi-Fi driver"; - homepage = https://github.com/hadess/rtl8723bs; + homepage = "https://github.com/hadess/rtl8723bs"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; broken = (! versionOlder kernel.version "4.12"); # Now in kernel staging drivers diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index edec5932e7f91..cb93c635afe0b 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rtl8812au-${kernel.version}-${version}"; - version = "5.2.20.2_28373.20190903"; + version = "5.6.4.2_35491.20200318"; src = fetchFromGitHub { - owner = "zebulon2"; - repo = "rtl8812au-driver-5.2.20"; - rev = "30d47a0a3f43ccb19e8fd59fe93d74a955147bf2"; - sha256 = "1fy0f8ihxd0i5kr8gmky8v8xl0ns6bhxfdn64c97c5irzdvg37sr"; + owner = "gordboy"; + repo = "rtl8812au-5.6.4.2"; + rev = "49e98ff9bfdbe2ddce843808713de383132002e0"; + sha256 = "0f4isqasm9rli5v6a7xpphyh509wdxs1zcfvgdsnyhnv8amhqxgs"; }; nativeBuildInputs = [ bc nukeReferences ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod"; - homepage = https://github.com/zebulon2/rtl8812au-driver-5.2.20; + homepage = "https://github.com/zebulon2/rtl8812au-driver-5.2.20"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ danielfullmer ]; diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index c54d45773428c..99d22e2f99985 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Realtek 8814AU USB WiFi driver"; - homepage = https://github.com/zebulon2/rtl8814au; + homepage = "https://github.com/zebulon2/rtl8814au"; license = licenses.gpl2; maintainers = [ maintainers.lassulus ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index 1829bd6763f0f..f3d68cf79194d 100644 --- a/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "rtl8821AU, rtl8812AU and rtl8811AU chipset driver with firmware"; - homepage = https://github.com/zebulon2/rtl8812au; + homepage = "https://github.com/zebulon2/rtl8812au"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ plchldr ]; diff --git a/pkgs/os-specific/linux/sch_cake/default.nix b/pkgs/os-specific/linux/sch_cake/default.nix index 68fc8a6e01705..ef2ebaa036201 100644 --- a/pkgs/os-specific/linux/sch_cake/default.nix +++ b/pkgs/os-specific/linux/sch_cake/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with lib; { description = "The cake qdisc scheduler"; - homepage = https://www.bufferbloat.net/projects/codel/wiki/Cake/; + homepage = "https://www.bufferbloat.net/projects/codel/wiki/Cake/"; license = with licenses; [ bsd3 gpl2 ]; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/schedtool/default.nix b/pkgs/os-specific/linux/schedtool/default.nix index 316c980007950..de947a9cd3462 100644 --- a/pkgs/os-specific/linux/schedtool/default.nix +++ b/pkgs/os-specific/linux/schedtool/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Query or alter a process' scheduling policy under Linux"; - homepage = http://freequaos.host.sk/schedtool/; + homepage = "http://freequaos.host.sk/schedtool/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix index 2ca88c32f13f3..57aa5d49facf4 100644 --- a/pkgs/os-specific/linux/selinux-python/default.nix +++ b/pkgs/os-specific/linux/selinux-python/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { description = "SELinux policy core utilities written in Python"; license = licenses.gpl2; - homepage = https://selinuxproject.org; + homepage = "https://selinuxproject.org"; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix index 5343c5fae1a91..387db08e1d601 100644 --- a/pkgs/os-specific/linux/selinux-sandbox/default.nix +++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = { description = "SELinux sandbox utility"; license = licenses.gpl2; - homepage = https://selinuxproject.org; + homepage = "https://selinuxproject.org"; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 138b54b022420..c0ed4102aaf18 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -8,13 +8,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "setools"; - version = "4.2.2"; + version = "4.3.0"; src = fetchFromGitHub { owner = "SELinuxProject"; repo = pname; rev = version; - sha256 = "18kklv26dwm2fdjjzfflvxsq83b2svnwf4g18xq7wsfsri121a90"; + sha256 = "0vr20bi8w147z5lclqz1l0j1b34137zg2r04pkafkgqqk7qbyjk6"; }; nativeBuildInputs = [ cython ]; @@ -35,7 +35,7 @@ buildPythonApplication rec { meta = { description = "SELinux Policy Analysis Tools"; - homepage = https://github.com/SELinuxProject/setools; + homepage = "https://github.com/SELinuxProject/setools"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/os-specific/linux/seturgent/default.nix index 15582574ecb0e..8cfc9d35940fa 100644 --- a/pkgs/os-specific/linux/seturgent/default.nix +++ b/pkgs/os-specific/linux/seturgent/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.linux; description = "Set an application's urgency hint (or not)"; maintainers = [ stdenv.lib.maintainers.yarr ]; - homepage = https://github.com/hiltjo/seturgent; + homepage = "https://github.com/hiltjo/seturgent"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index c2547ce262a19..fbcecf05f1886 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -11,7 +11,7 @@ let else assert stdenv.hostPlatform.libc == "glibc"; stdenv.cc.libc; dots_in_usernames = fetchpatch { - url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch; + url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch"; sha256 = "1fj3rg6x3jppm5jvi9y7fhd2djbi4nc5pgwisw00xlh4qapgz692"; }; @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/shadow-maint; + homepage = "https://github.com/shadow-maint"; description = "Suite containing authentication-related tools such as passwd and su"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix index 32761970d81cf..71bd887535be5 100644 --- a/pkgs/os-specific/linux/sinit/default.nix +++ b/pkgs/os-specific/linux/sinit/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://tools.suckless.org/sinit; + homepage = "https://tools.suckless.org/sinit"; downloadPage = "https://git.suckless.org/sinit"; }; } diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix index f40652922d85a..cace3e22ae7d3 100644 --- a/pkgs/os-specific/linux/smem/default.nix +++ b/pkgs/os-specific/linux/smem/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.selenic.com/smem/; + homepage = "https://www.selenic.com/smem/"; description = "A memory usage reporting tool that takes shared memory into account"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.eelco ]; diff --git a/pkgs/os-specific/linux/speedometer/default.nix b/pkgs/os-specific/linux/speedometer/default.nix index 6f2e6306003b4..e4d374b0c41f3 100644 --- a/pkgs/os-specific/linux/speedometer/default.nix +++ b/pkgs/os-specific/linux/speedometer/default.nix @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { meta = with lib; { description = "Measure and display the rate of data across a network connection or data being stored in a file"; - homepage = http://excess.org/speedometer/; + homepage = "http://excess.org/speedometer/"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ Baughn ]; diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 886d5e2771840..22e2da79c8cdc 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "System Security Services Daemon"; - homepage = https://fedorahosted.org/sssd/; + homepage = "https://fedorahosted.org/sssd/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.e-user ]; diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/os-specific/linux/syscall_limiter/default.nix index ef13e5ded024b..0354abf46e1a6 100644 --- a/pkgs/os-specific/linux/syscall_limiter/default.nix +++ b/pkgs/os-specific/linux/syscall_limiter/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Start Linux programs with only selected syscalls enabled"; - homepage = https://github.com/vi/syscall_limiter; + homepage = "https://github.com/vi/syscall_limiter"; license = licenses.mit; maintainers = with maintainers; [ obadz ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index b0becd82d19fc..59577eb8d5198 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "sysdig"; - version = "0.26.6"; + version = "0.26.7"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "1rw9s5lamr02036z26vfmnp5dnn97f00hcnp4xv6gdxim6rpmbz7"; + sha256 = "09m6j2cl70jxb0k4ydsgrida381bipf0v026xz661152cy23r3ff"; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/os-specific/linux/sysfsutils/default.nix b/pkgs/os-specific/linux/sysfsutils/default.nix index 485f3d94a73da..3b2d54bc83adc 100644 --- a/pkgs/os-specific/linux/sysfsutils/default.nix +++ b/pkgs/os-specific/linux/sysfsutils/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://linux-diag.sourceforge.net/Sysfsutils.html; + homepage = "http://linux-diag.sourceforge.net/Sysfsutils.html"; longDescription = '' These are a set of utilites built upon sysfs, a new virtual diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index 213394e5eccf4..c8378f2a0cbca 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "sysklogd-1.5.1"; src = fetchurl { - url = http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.1.tar.gz; + url = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.1.tar.gz"; sha256 = "00f2wy6f0qng7qzga4iicyzl9j8b7mp6mrpfky5jxj93ms2w2rji"; }; diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index ed901b21ac116..edb951dae3dad 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchFromRepoOrCz, fetchurl, nasm, perl, python3, libuuid, mtools, makeWrapper }: +{ stdenv, fetchgit, fetchurl, fetchpatch, nasm, perl, python3, libuuid, mtools, makeWrapper }: stdenv.mkDerivation { - name = "syslinux-2019-02-07"; + pname = "syslinux"; + version = "unstable-20190207"; # This is syslinux-6.04-pre3^1; syslinux-6.04-pre3 fails to run. # Same issue here https://www.syslinux.org/archives/2019-February/026330.html - src = fetchFromRepoOrCz { - repo = "syslinux"; + src = fetchgit { + url = "https://repo.or.cz/syslinux"; rev = "b40487005223a78c3bb4c300ef6c436b3f6ec1f7"; - sha256 = "1qrxl1114sr2i2791z9rf8v53g200aq30f08808d7i8qnmgvxl2w"; + sha256 = "1acf6byx7i6vz8hq6mra526g8mf7fmfhid211y8nq0v6px7d3aqs"; + fetchSubmodules = true; }; patches = let @@ -20,9 +22,9 @@ stdenv.mkDerivation { url = mkURL "fa1349f1" "0002-gfxboot-menu-label.patch"; sha256 = "06ifgzbpjj4picpj17zgprsfi501zf4pp85qjjgn29i5rs291zni"; }) - (fetchurl { - url = mkURL "477e56d2" "0005-gnu-efi-version-compatibility.patch"; - sha256 = "041568b4abb79wynyps1n04lg4fr26rc3sbjncz99pp0mbz0ajlm"; + (fetchpatch { + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/0005-gnu-efi-version-compatibility.patch?h=packages/syslinux"; + sha256 = "0fbqz56hj8az8ws26m39hyp3l5fvcbzvzdddqz3x6n56hzdpz1p6"; }) (fetchurl { # mbr.bin: too big (452 > 440) @@ -48,6 +50,10 @@ stdenv.mkDerivation { # fix tests substituteInPlace tests/unittest/include/unittest/unittest.h \ --replace /usr/include/ "" + + # Hack to get `gcc -m32' to work without having 32-bit Glibc headers. + mkdir gnu-efi/inc/ia32/gnu + touch gnu-efi/inc/ia32/gnu/stubs-32.h ''; nativeBuildInputs = [ nasm perl python3 ]; @@ -56,18 +62,16 @@ stdenv.mkDerivation { enableParallelBuilding = false; # Fails very rarely with 'No rule to make target: ...' hardeningDisable = [ "pic" "stackprotector" "fortify" ]; - stripDebugList = "bin sbin share/syslinux/com32"; + stripDebugList = [ "bin" "sbin" "share/syslinux/com32" ]; makeFlags = [ "BINDIR=$(out)/bin" "SBINDIR=$(out)/sbin" - "LIBDIR=$(out)/lib" - "INCDIR=$(out)/include" "DATADIR=$(out)/share" "MANDIR=$(out)/share/man" "PERL=perl" - "bios" - ]; + ] + ++ stdenv.lib.optionals stdenv.hostPlatform.isi686 [ "bios" "efi32" ]; doCheck = false; # fails. some fail in a sandbox, others require qemu @@ -80,7 +84,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.syslinux.org/; + homepage = "http://www.syslinux.org/"; description = "A lightweight bootloader"; license = licenses.gpl2; maintainers = [ maintainers.samueldr ]; diff --git a/pkgs/os-specific/linux/systemd-wait/default.nix b/pkgs/os-specific/linux/systemd-wait/default.nix index 114f4c2444e6b..348549a1bc64a 100644 --- a/pkgs/os-specific/linux/systemd-wait/default.nix +++ b/pkgs/os-specific/linux/systemd-wait/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { ]; meta = { - homepage = https://github.com/Stebalien/systemd-wait; + homepage = "https://github.com/Stebalien/systemd-wait"; license = lib.licenses.gpl3; description = "Wait for a systemd unit to enter a specific state"; maintainers = [ lib.maintainers.benley ]; diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch new file mode 100644 index 0000000000000..c88d0eeeff2b7 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -0,0 +1,32 @@ +From b873e4c0de3e24f2ec9370e5a217247217e90587 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra <eelco.dolstra@logicblox.com> +Date: Tue, 8 Jan 2013 15:46:30 +0100 +Subject: [PATCH 01/18] Start device units for uninitialised encrypted devices + +This is necessary because the NixOS service that initialises the +filesystem depends on the appearance of the device unit. Also, this +makes more sense to me: the device is ready; it's the filesystem +that's not, but taking care of that is the responsibility of the mount +unit. (However, this ignores the fsck unit, so it's not perfect...) +--- + rules.d/99-systemd.rules.in | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in +index c34b606216..3ab8c1c3fe 100644 +--- a/rules.d/99-systemd.rules.in ++++ b/rules.d/99-systemd.rules.in +@@ -17,10 +17,6 @@ SUBSYSTEM=="ubi", TAG+="systemd" + SUBSYSTEM=="block", TAG+="systemd" + SUBSYSTEM=="block", ACTION=="add", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0" + +-# Ignore encrypted devices with no identified superblock on it, since +-# we are probably still calling mke2fs or mkswap on it. +-SUBSYSTEM=="block", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0" +- + # add symlink to GPT root disk + SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root" + SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks" +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch new file mode 100644 index 0000000000000..4f94cb465d4e2 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -0,0 +1,42 @@ +From bdd3ff777dd8253ff5732118dd6de0fa9a9b95fe Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra <eelco.dolstra@logicblox.com> +Date: Fri, 12 Apr 2013 13:16:57 +0200 +Subject: [PATCH 02/18] Don't try to unmount /nix or /nix/store + +They'll still be remounted read-only. + +https://github.com/NixOS/nixos/issues/126 +--- + src/core/mount.c | 2 ++ + src/shutdown/umount.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/core/mount.c b/src/core/mount.c +index 1c4aefd734..a5553226f8 100644 +--- a/src/core/mount.c ++++ b/src/core/mount.c +@@ -412,6 +412,8 @@ static bool mount_is_extrinsic(Mount *m) { + + if (PATH_IN_SET(m->where, /* Don't bother with the OS data itself */ + "/", /* (strictly speaking redundant: should already be covered by the perpetual flag check above) */ ++ "/nix", ++ "/nix/store", + "/usr", + "/etc")) + return true; +diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c +index 8a5e80eeaa..fab35ed6f3 100644 +--- a/src/shutdown/umount.c ++++ b/src/shutdown/umount.c +@@ -414,6 +414,8 @@ static int delete_dm(dev_t devnum) { + + static bool nonunmountable_path(const char *path) { + return path_equal(path, "/") ++ || path_equal(path, "/nix") ++ || path_equal(path, "/nix/store") + #if ! HAVE_SPLIT_USR + || path_equal(path, "/usr") + #endif +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch new file mode 100644 index 0000000000000..73aab8dd91cab --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -0,0 +1,34 @@ +From c28b3b2e254433e93549ee6fe8c93b43ce455776 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra <eelco.dolstra@logicblox.com> +Date: Wed, 16 Apr 2014 10:59:28 +0200 +Subject: [PATCH 03/18] Fix NixOS containers + +In NixOS containers, the init script is bind-mounted into the +container, so checking early whether it exists will fail. +--- + src/nspawn/nspawn.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c +index 734dee1130..a97b1a4bc9 100644 +--- a/src/nspawn/nspawn.c ++++ b/src/nspawn/nspawn.c +@@ -5018,6 +5018,7 @@ static int run(int argc, char *argv[]) { + goto finish; + } + } else { ++#if 0 + const char *p, *q; + + if (arg_pivot_root_new) +@@ -5032,6 +5033,7 @@ static int run(int argc, char *argv[]) { + r = -EINVAL; + goto finish; + } ++#endif + } + + } else { +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch new file mode 100644 index 0000000000000..e10726a2cb1f4 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch @@ -0,0 +1,25 @@ +From baf52609ad18785aa1d2cd043185ae9438d59411 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra <eelco.dolstra@logicblox.com> +Date: Thu, 1 May 2014 14:10:10 +0200 +Subject: [PATCH 04/18] Look for fsck in the right place + +--- + src/fsck/fsck.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c +index 80f7107b9d..74e48a385f 100644 +--- a/src/fsck/fsck.c ++++ b/src/fsck/fsck.c +@@ -370,7 +370,7 @@ static int run(int argc, char *argv[]) { + } else + dash_c[0] = 0; + +- cmdline[i++] = "/sbin/fsck"; ++ cmdline[i++] = "/run/current-system/sw/bin/fsck"; + cmdline[i++] = arg_repair; + cmdline[i++] = "-T"; + +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch new file mode 100644 index 0000000000000..23aa893362b5b --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch @@ -0,0 +1,107 @@ +From 45f80155b7c2edb1e73c233283f1ab1582e1cfbe Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra <eelco.dolstra@logicblox.com> +Date: Fri, 19 Dec 2014 14:46:17 +0100 +Subject: [PATCH 05/18] Add some NixOS-specific unit directories + +Look in `/nix/var/nix/profiles/default/lib/systemd` for units provided +by packages installed into the default profile via +`nix-env -iA nixos.$package`, and into `/etc/systemd-mutable/system` for +persistent, mutable units (used for Dysnomia). + +Also, remove /usr and /lib as these don't exist on NixOS. +--- + src/core/systemd.pc.in | 4 ++-- + src/shared/path-lookup.c | 18 +++++------------- + 2 files changed, 7 insertions(+), 15 deletions(-) + +diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in +index 8331832c7a..bedb97115d 100644 +--- a/src/core/systemd.pc.in ++++ b/src/core/systemd.pc.in +@@ -17,8 +17,8 @@ systemduserunitdir=${prefix}/lib/systemd/user + systemduserpresetdir=${prefix}/lib/systemd/user-preset + systemdsystemconfdir=${sysconfdir}/systemd/system + systemduserconfdir=${sysconfdir}/systemd/user +-systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemdsystemunitdir}:/usr/lib/systemd/system:/lib/systemd/system +-systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemduserunitdir}:/usr/lib/systemd/user:/usr/share/systemd/user ++systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/system:${systemdsystemunitdir} ++systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/user:${systemduserunitdir} + systemdsystemgeneratordir=${rootprefix}/lib/systemd/system-generators + systemdusergeneratordir=${prefix}/lib/systemd/user-generators + systemdsystemgeneratorpath=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemdsystemgeneratordir} +diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c +index 48e0eec09a..a9d38f16d0 100644 +--- a/src/shared/path-lookup.c ++++ b/src/shared/path-lookup.c +@@ -98,17 +98,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) { + } + + static const char* const user_data_unit_paths[] = { +- "/usr/local/lib/systemd/user", +- "/usr/local/share/systemd/user", + USER_DATA_UNIT_PATH, +- "/usr/lib/systemd/user", +- "/usr/share/systemd/user", + NULL + }; + + static const char* const user_config_unit_paths[] = { + USER_CONFIG_UNIT_PATH, + "/etc/systemd/user", ++ "/etc/systemd-mutable/user", + NULL + }; + +@@ -604,15 +601,14 @@ int lookup_paths_init( + persistent_config, + SYSTEM_CONFIG_UNIT_PATH, + "/etc/systemd/system", ++ "/etc/systemd-mutable/system", ++ "/nix/var/nix/profiles/default/lib/systemd/system", + STRV_IFNOTNULL(persistent_attached), + runtime_config, + "/run/systemd/system", + STRV_IFNOTNULL(runtime_attached), + STRV_IFNOTNULL(generator), +- "/usr/local/lib/systemd/system", + SYSTEM_DATA_UNIT_PATH, +- "/usr/lib/systemd/system", +- STRV_IFNOTNULL(flags & LOOKUP_PATHS_SPLIT_USR ? "/lib/systemd/system" : NULL), + STRV_IFNOTNULL(generator_late)); + break; + +@@ -628,14 +624,12 @@ int lookup_paths_init( + persistent_config, + USER_CONFIG_UNIT_PATH, + "/etc/systemd/user", ++ "/etc/systemd-mutable/user", ++ "/nix/var/nix/profiles/default/lib/systemd/user", + runtime_config, + "/run/systemd/user", + STRV_IFNOTNULL(generator), +- "/usr/local/share/systemd/user", +- "/usr/share/systemd/user", +- "/usr/local/lib/systemd/user", + USER_DATA_UNIT_PATH, +- "/usr/lib/systemd/user", + STRV_IFNOTNULL(generator_late)); + break; + +@@ -824,14 +818,12 @@ char **generator_binary_paths(UnitFileScope scope) { + case UNIT_FILE_SYSTEM: + return strv_new("/run/systemd/system-generators", + "/etc/systemd/system-generators", +- "/usr/local/lib/systemd/system-generators", + SYSTEM_GENERATOR_PATH); + + case UNIT_FILE_GLOBAL: + case UNIT_FILE_USER: + return strv_new("/run/systemd/user-generators", + "/etc/systemd/user-generators", +- "/usr/local/lib/systemd/user-generators", + USER_GENERATOR_PATH); + + default: +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch new file mode 100644 index 0000000000000..0b57dc1f9c890 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -0,0 +1,31 @@ +From d52058070c0c12bb05f82460f0b4b55678b724e9 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra <eelco.dolstra@logicblox.com> +Date: Mon, 11 May 2015 15:39:38 +0200 +Subject: [PATCH 06/18] Get rid of a useless message in user sessions + +Namely lots of variants of + + Unit nix-var-nix-db.mount is bound to inactive unit dev-disk-by\x2dlabel-nixos.device. Stopping, too. + +in containers. +--- + src/core/unit.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/core/unit.c b/src/core/unit.c +index 97e1b0004c..d3cc2ba9ec 100644 +--- a/src/core/unit.c ++++ b/src/core/unit.c +@@ -2043,7 +2043,8 @@ static void unit_check_binds_to(Unit *u) { + } + + assert(other); +- log_unit_info(u, "Unit is bound to inactive unit %s. Stopping, too.", other->id); ++ if (u->type != UNIT_MOUNT || detect_container() <= 0) ++ log_unit_info(u, "Unit is bound to inactive unit %s. Stopping, too.", other->id); + + /* A unit we need to run is gone. Sniff. Let's stop this. */ + r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, NULL, &error, NULL); +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch new file mode 100644 index 0000000000000..5703c4f43fd4e --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch @@ -0,0 +1,118 @@ +From 409fc808794942ad1736c2cc74853d9792e4ad02 Mon Sep 17 00:00:00 2001 +From: Gabriel Ebner <gebner@gebner.org> +Date: Sun, 6 Dec 2015 14:26:36 +0100 +Subject: [PATCH 07/18] hostnamed, localed, timedated: disable methods that + change system settings. + +--- + src/hostname/hostnamed.c | 9 +++++++++ + src/locale/localed.c | 9 +++++++++ + src/timedate/timedated.c | 10 ++++++++++ + 3 files changed, 28 insertions(+) + +diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c +index 21f6471495..8c5af7619f 100644 +--- a/src/hostname/hostnamed.c ++++ b/src/hostname/hostnamed.c +@@ -422,6 +422,9 @@ static int method_set_hostname(sd_bus_message *m, void *userdata, sd_bus_error * + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + if (isempty(name)) + name = c->data[PROP_STATIC_HOSTNAME]; + +@@ -478,6 +481,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + name = empty_to_null(name); + + if (streq_ptr(name, c->data[PROP_STATIC_HOSTNAME])) +@@ -535,6 +541,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + name = empty_to_null(name); + + if (streq_ptr(name, c->data[prop])) +diff --git a/src/locale/localed.c b/src/locale/localed.c +index 09f16d25f4..c1cb87cef1 100644 +--- a/src/locale/localed.c ++++ b/src/locale/localed.c +@@ -275,6 +275,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + /* If single locale without variable name is provided, then we assume it is LANG=. */ + if (strv_length(l) == 1 && !strchr(*l, '=')) { + if (!locale_is_valid(*l)) +@@ -410,6 +413,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + keymap = empty_to_null(keymap); + keymap_toggle = empty_to_null(keymap_toggle); + +@@ -586,6 +592,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + layout = empty_to_null(layout); + model = empty_to_null(model); + variant = empty_to_null(variant); +diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c +index 5e2fb50d83..63865f557c 100644 +--- a/src/timedate/timedated.c ++++ b/src/timedate/timedated.c +@@ -652,6 +652,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * + if (r < 0) + return r; + ++ if (getenv("NIXOS_STATIC_TIMEZONE")) ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing timezone via systemd is not supported when it is set in NixOS configuration."); ++ + if (!timezone_is_valid(z, LOG_DEBUG)) + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z); + +@@ -731,6 +735,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + if (lrtc == c->local_rtc) + return sd_bus_reply_method_return(m, NULL); + +@@ -923,6 +930,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + r = context_update_ntp_status(c, bus, m); + if (r < 0) + return r; +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch new file mode 100644 index 0000000000000..a9bf9abee520e --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch @@ -0,0 +1,32 @@ +From b56fc7b6ae8014eb2f71924c89498f395a1a81bd Mon Sep 17 00:00:00 2001 +From: Nikolay Amiantov <ab@fmap.me> +Date: Thu, 7 Jul 2016 02:47:13 +0300 +Subject: [PATCH 08/18] Fix hwdb paths + +Patch by vcunat. +--- + src/libsystemd/sd-hwdb/sd-hwdb.c | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c +index b3febdbb31..eba00a5bc7 100644 +--- a/src/libsystemd/sd-hwdb/sd-hwdb.c ++++ b/src/libsystemd/sd-hwdb/sd-hwdb.c +@@ -297,13 +297,8 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) { + } + + static const char hwdb_bin_paths[] = +- "/etc/systemd/hwdb/hwdb.bin\0" + "/etc/udev/hwdb.bin\0" +- "/usr/lib/systemd/hwdb/hwdb.bin\0" +-#if HAVE_SPLIT_USR +- "/lib/systemd/hwdb/hwdb.bin\0" +-#endif +- UDEVLIBEXECDIR "/hwdb.bin\0"; ++ ; + + _public_ int sd_hwdb_new(sd_hwdb **ret) { + _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL; +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch new file mode 100644 index 0000000000000..12a9dd5a77f6d --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -0,0 +1,132 @@ +From 4d304a321796db4de827aa39a149bea23d039214 Mon Sep 17 00:00:00 2001 +From: Nikolay Amiantov <ab@fmap.me> +Date: Tue, 11 Oct 2016 13:12:08 +0300 +Subject: [PATCH 09/18] Change /usr/share/zoneinfo to /etc/zoneinfo + +NixOS uses this path. +--- + man/localtime.xml | 4 ++-- + src/basic/time-util.c | 6 +++--- + src/firstboot/firstboot.c | 2 +- + src/nspawn/nspawn.c | 4 ++-- + src/timedate/timedated.c | 8 ++++---- + 5 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/man/localtime.xml b/man/localtime.xml +index 0f1652ee2e..71c4f95c2e 100644 +--- a/man/localtime.xml ++++ b/man/localtime.xml +@@ -20,7 +20,7 @@ + </refnamediv> + + <refsynopsisdiv> +- <para><filename>/etc/localtime</filename> -> <filename>../usr/share/zoneinfo/…</filename></para> ++ <para><filename>/etc/localtime</filename> -> <filename>zoneinfo/…</filename></para> + </refsynopsisdiv> + + <refsect1> +@@ -30,7 +30,7 @@ + system-wide timezone of the local system that is used by + applications for presentation to the user. It should be an + absolute or relative symbolic link pointing to +- <filename>/usr/share/zoneinfo/</filename>, followed by a timezone ++ <filename>/etc/zoneinfo/</filename>, followed by a timezone + identifier such as <literal>Europe/Berlin</literal> or + <literal>Etc/UTC</literal>. The resulting link should lead to the + corresponding binary +diff --git a/src/basic/time-util.c b/src/basic/time-util.c +index 105584e2e7..5238f69931 100644 +--- a/src/basic/time-util.c ++++ b/src/basic/time-util.c +@@ -1217,7 +1217,7 @@ int get_timezones(char ***ret) { + n_allocated = 2; + n_zones = 1; + +- f = fopen("/usr/share/zoneinfo/zone1970.tab", "re"); ++ f = fopen("/etc/zoneinfo/zone1970.tab", "re"); + if (f) { + for (;;) { + _cleanup_free_ char *line = NULL; +@@ -1312,7 +1312,7 @@ bool timezone_is_valid(const char *name, int log_level) { + if (p - name >= PATH_MAX) + return false; + +- t = strjoina("/usr/share/zoneinfo/", name); ++ t = strjoina("/etc/zoneinfo/", name); + + fd = open(t, O_RDONLY|O_CLOEXEC); + if (fd < 0) { +@@ -1410,7 +1410,7 @@ int get_timezone(char **ret) { + if (r < 0) + return r; /* returns EINVAL if not a symlink */ + +- e = PATH_STARTSWITH_SET(t, "/usr/share/zoneinfo/", "../usr/share/zoneinfo/"); ++ e = PATH_STARTSWITH_SET(t, "/etc/zoneinfo/", "../etc/zoneinfo/"); + if (!e) + return -EINVAL; + +diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c +index 901fbf0815..b57bdd8fbe 100644 +--- a/src/firstboot/firstboot.c ++++ b/src/firstboot/firstboot.c +@@ -431,7 +431,7 @@ static int process_timezone(void) { + if (isempty(arg_timezone)) + return 0; + +- e = strjoina("../usr/share/zoneinfo/", arg_timezone); ++ e = strjoina("zoneinfo/", arg_timezone); + + (void) mkdir_parents(etc_localtime, 0755); + if (symlink(e, etc_localtime) < 0) +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c +index a97b1a4bc9..aed60439e3 100644 +--- a/src/nspawn/nspawn.c ++++ b/src/nspawn/nspawn.c +@@ -1657,8 +1657,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u + static const char *timezone_from_path(const char *path) { + return PATH_STARTSWITH_SET( + path, +- "../usr/share/zoneinfo/", +- "/usr/share/zoneinfo/"); ++ "../etc/zoneinfo/", ++ "/etc/zoneinfo/"); + } + + static bool etc_writable(void) { +diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c +index 63865f557c..8021a8b753 100644 +--- a/src/timedate/timedated.c ++++ b/src/timedate/timedated.c +@@ -264,7 +264,7 @@ static int context_read_data(Context *c) { + + r = get_timezone(&t); + if (r == -EINVAL) +- log_warning_errno(r, "/etc/localtime should be a symbolic link to a time zone data file in /usr/share/zoneinfo/."); ++ log_warning_errno(r, "/etc/localtime should be a symbolic link to a time zone data file in /etc/zoneinfo/."); + else if (r < 0) + log_warning_errno(r, "Failed to get target of /etc/localtime: %m"); + +@@ -288,7 +288,7 @@ static int context_write_data_timezone(Context *c) { + + if (isempty(c->zone) || streq(c->zone, "UTC")) { + +- if (access("/usr/share/zoneinfo/UTC", F_OK) < 0) { ++ if (access("/etc/zoneinfo/UTC", F_OK) < 0) { + + if (unlink("/etc/localtime") < 0 && errno != ENOENT) + return -errno; +@@ -296,9 +296,9 @@ static int context_write_data_timezone(Context *c) { + return 0; + } + +- source = "../usr/share/zoneinfo/UTC"; ++ source = "../etc/zoneinfo/UTC"; + } else { +- p = path_join("../usr/share/zoneinfo", c->zone); ++ p = path_join("../etc/zoneinfo", c->zone); + if (!p) + return -ENOMEM; + +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch new file mode 100644 index 0000000000000..7e6453f2ddd3d --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch @@ -0,0 +1,27 @@ +From cb3f1ec1793cbf74c4b5663e038bd49ff4576192 Mon Sep 17 00:00:00 2001 +From: Imuli <i@imu.li> +Date: Wed, 19 Oct 2016 08:46:47 -0400 +Subject: [PATCH 10/18] localectl: use /etc/X11/xkb for list-x11-* + +NixOS has an option to link the xkb data files to /etc/X11, but not to +/usr/share/X11. +--- + src/locale/localectl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/locale/localectl.c b/src/locale/localectl.c +index 6f2d37d222..7aa2310d48 100644 +--- a/src/locale/localectl.c ++++ b/src/locale/localectl.c +@@ -286,7 +286,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { + } state = NONE, look_for; + int r; + +- f = fopen("/usr/share/X11/xkb/rules/base.lst", "re"); ++ f = fopen("/etc/X11/xkb/rules/base.lst", "re"); + if (!f) + return log_error_errno(errno, "Failed to open keyboard mapping list. %m"); + +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch new file mode 100644 index 0000000000000..080cd4670e6fe --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch @@ -0,0 +1,26 @@ +From 0ffb786d0e12a61899af448b1e4dd32a53ea5a8e Mon Sep 17 00:00:00 2001 +From: Franz Pletz <fpletz@fnordicwalking.de> +Date: Sun, 11 Feb 2018 04:37:44 +0100 +Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir + +--- + meson.build | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/meson.build b/meson.build +index fc216d22da..078db3bb5d 100644 +--- a/meson.build ++++ b/meson.build +@@ -3176,9 +3176,6 @@ install_data('LICENSE.GPL2', + 'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION', + install_dir : docdir) + +-meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir)) +-meson.add_install_script('sh', '-c', 'touch $DESTDIR@0@'.format(prefixdir)) +- + ############################################################ + + meson_check_help = find_program('tools/meson-check-help.sh') +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch b/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch new file mode 100644 index 0000000000000..2961a2ebe56f4 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch @@ -0,0 +1,313 @@ +From 3dbcdab1ba22c4eeca6d61718c09bcb9b5551764 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Mon, 26 Feb 2018 14:25:57 +0000 +Subject: [PATCH 12/18] Install default configuration into $out/share/factory + +By default systemd should read all its configuration from /etc. Therefor +we rely on -Dsysconfdir=/etc in meson as default value. Unfortunately +this would also lead to installation of systemd's own configuration +files to `/etc` whereas we are limited to /nix/store. To counter that +this commit introduces two new configuration variables `factoryconfdir` +and `factorypkgconfdir` to install systemd's own configuration into nix +store again, while having executables looking up files in /etc. +--- + hwdb.d/meson.build | 2 +- + meson.build | 11 +++++++---- + network/meson.build | 2 +- + src/core/meson.build | 10 +++++----- + src/coredump/meson.build | 2 +- + src/journal-remote/meson.build | 4 ++-- + src/journal/meson.build | 2 +- + src/kernel-install/meson.build | 2 +- + src/login/meson.build | 2 +- + src/network/meson.build | 2 +- + src/pstore/meson.build | 2 +- + src/resolve/meson.build | 2 +- + src/timesync/meson.build | 2 +- + src/udev/meson.build | 4 ++-- + sysctl.d/meson.build | 2 +- + tmpfiles.d/meson.build | 2 +- + units/meson.build | 2 +- + 17 files changed, 29 insertions(+), 26 deletions(-) + +diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build +index 4df6dabf89..02d8d69095 100644 +--- a/hwdb.d/meson.build ++++ b/hwdb.d/meson.build +@@ -27,7 +27,7 @@ if conf.get('ENABLE_HWDB') == 1 + install_dir : udevhwdbdir) + + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'udev/hwdb.d'))) + + meson.add_install_script('sh', '-c', + 'test -n "$DESTDIR" || @0@/systemd-hwdb update' +diff --git a/meson.build b/meson.build +index 078db3bb5d..6e1a6483fc 100644 +--- a/meson.build ++++ b/meson.build +@@ -154,6 +154,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d') + catalogdir = join_paths(prefixdir, 'lib/systemd/catalog') + kernelinstalldir = join_paths(prefixdir, 'lib/kernel/install.d') + factorydir = join_paths(datadir, 'factory') ++factoryconfdir = join_paths(datadir, 'factory/etc') ++factorypkgconfdir = join_paths(datadir, 'factory/etc/systemd') ++factoryxinitrcdir = join_paths(datadir, 'factory/etc/X11/xinit/xinitrc.d') + bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi') + testsdir = join_paths(prefixdir, 'lib/systemd/tests') + systemdstatedir = join_paths(localstatedir, 'lib/systemd') +@@ -2503,7 +2506,7 @@ if conf.get('ENABLE_BINFMT') == 1 + meson.add_install_script('sh', '-c', + mkdir_p.format(binfmtdir)) + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'binfmt.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'binfmt.d'))) + endif + + if conf.get('ENABLE_REPART') == 1 +@@ -2604,7 +2607,7 @@ executable('systemd-sleep', + install_dir : rootlibexecdir) + + install_data('src/sleep/sleep.conf', +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + + exe = executable('systemd-sysctl', + 'src/sysctl/sysctl.c', +@@ -2916,7 +2919,7 @@ if conf.get('HAVE_KMOD') == 1 + meson.add_install_script('sh', '-c', + mkdir_p.format(modulesloaddir)) + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'modules-load.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'modules-load.d'))) + endif + + exe = executable('systemd-nspawn', +@@ -3159,7 +3162,7 @@ install_subdir('factory/etc', + install_dir : factorydir) + + install_data('xorg/50-systemd-user.sh', +- install_dir : xinitrcdir) ++ install_dir : factoryxinitrcdir) + install_data('modprobe.d/systemd.conf', + install_dir : modprobedir) + install_data('LICENSE.GPL2', +diff --git a/network/meson.build b/network/meson.build +index 544dcf4387..1828c50863 100644 +--- a/network/meson.build ++++ b/network/meson.build +@@ -10,7 +10,7 @@ if conf.get('ENABLE_NETWORKD') == 1 + install_dir : networkdir) + + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'systemd/network'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'systemd/network'))) + endif + + install_data('99-default.link', +diff --git a/src/core/meson.build b/src/core/meson.build +index 3586838f59..02ddf1a123 100644 +--- a/src/core/meson.build ++++ b/src/core/meson.build +@@ -179,8 +179,8 @@ libcore = static_library( + systemd_sources = files('main.c') + + in_files = [['macros.systemd', rpmmacrosdir], +- ['system.conf', pkgsysconfdir], +- ['user.conf', pkgsysconfdir], ++ ['system.conf', factorypkgconfdir], ++ ['user.conf', factorypkgconfdir], + ['systemd.pc', pkgconfigdatadir], + ['triggers.systemd', '']] + +@@ -212,6 +212,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir)) + meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir)) + meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir)) + +-meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(pkgsysconfdir, 'system'))) +-meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(pkgsysconfdir, 'user'))) +-meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(sysconfdir, 'xdg/systemd'))) ++meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(factorypkgconfdir, 'system'))) ++meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(factorypkgconfdir, 'user'))) ++meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(factorypkgconfdir, 'xdg/systemd'))) +diff --git a/src/coredump/meson.build b/src/coredump/meson.build +index 7fa5942697..34c865dfa0 100644 +--- a/src/coredump/meson.build ++++ b/src/coredump/meson.build +@@ -15,7 +15,7 @@ coredumpctl_sources = files('coredumpctl.c') + + if conf.get('ENABLE_COREDUMP') == 1 + install_data('coredump.conf', +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + endif + + tests += [ +diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build +index 87b8ba6495..daff8ec967 100644 +--- a/src/journal-remote/meson.build ++++ b/src/journal-remote/meson.build +@@ -49,7 +49,7 @@ if conf.get('ENABLE_REMOTE') ==1 and conf.get('HAVE_LIBCURL') == 1 + output : 'journal-upload.conf', + configuration : substs) + install_data(journal_upload_conf, +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + endif + + if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 +@@ -58,7 +58,7 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 + output : 'journal-remote.conf', + configuration : substs) + install_data(journal_remote_conf, +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + + install_data('browse.html', + install_dir : join_paths(pkgdatadir, 'gatewayd')) +diff --git a/src/journal/meson.build b/src/journal/meson.build +index 5796f77cac..75d975c260 100644 +--- a/src/journal/meson.build ++++ b/src/journal/meson.build +@@ -109,7 +109,7 @@ if conf.get('HAVE_QRENCODE') == 1 + endif + + install_data('journald.conf', +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + + if get_option('create-log-dirs') + meson.add_install_script( +diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build +index 261c3aaae4..dbc5e23513 100644 +--- a/src/kernel-install/meson.build ++++ b/src/kernel-install/meson.build +@@ -11,4 +11,4 @@ install_data('00-entry-directory.install', + install_dir : kernelinstalldir) + + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'kernel/install.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'kernel/install.d'))) +diff --git a/src/login/meson.build b/src/login/meson.build +index 0a7d3d5440..ff90149c1c 100644 +--- a/src/login/meson.build ++++ b/src/login/meson.build +@@ -75,7 +75,7 @@ if conf.get('ENABLE_LOGIND') == 1 + output : 'logind.conf', + configuration : substs) + install_data(logind_conf, +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + + install_data('org.freedesktop.login1.conf', + install_dir : dbuspolicydir) +diff --git a/src/network/meson.build b/src/network/meson.build +index c1c02cfda1..1bfa79a03b 100644 +--- a/src/network/meson.build ++++ b/src/network/meson.build +@@ -201,7 +201,7 @@ if conf.get('ENABLE_NETWORKD') == 1 + endif + + install_data('networkd.conf', +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + + fuzzers += [ + [['src/network/fuzz-netdev-parser.c', +diff --git a/src/pstore/meson.build b/src/pstore/meson.build +index adbac24b54..e9dc88dfa2 100644 +--- a/src/pstore/meson.build ++++ b/src/pstore/meson.build +@@ -6,5 +6,5 @@ systemd_pstore_sources = files(''' + + if conf.get('ENABLE_PSTORE') == 1 + install_data('pstore.conf', +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + endif +diff --git a/src/resolve/meson.build b/src/resolve/meson.build +index c4d8d4e5d9..f550c289a5 100644 +--- a/src/resolve/meson.build ++++ b/src/resolve/meson.build +@@ -170,7 +170,7 @@ if conf.get('ENABLE_RESOLVE') == 1 + output : 'resolved.conf', + configuration : substs) + install_data(resolved_conf, +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + + install_data('resolv.conf', + install_dir : rootlibexecdir) +diff --git a/src/timesync/meson.build b/src/timesync/meson.build +index e5c118c8db..19235df9ca 100644 +--- a/src/timesync/meson.build ++++ b/src/timesync/meson.build +@@ -27,7 +27,7 @@ if conf.get('ENABLE_TIMESYNCD') == 1 + output : 'timesyncd.conf', + configuration : substs) + install_data(timesyncd_conf, +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + install_data('org.freedesktop.timesync1.conf', + install_dir : dbuspolicydir) + install_data('org.freedesktop.timesync1.service', +diff --git a/src/udev/meson.build b/src/udev/meson.build +index 173b10be50..82638cf5a9 100644 +--- a/src/udev/meson.build ++++ b/src/udev/meson.build +@@ -187,7 +187,7 @@ foreach prog : [['ata_id/ata_id.c'], + endforeach + + install_data('udev.conf', +- install_dir : join_paths(sysconfdir, 'udev')) ++ install_dir : join_paths(factoryconfdir, 'udev')) + + configure_file( + input : 'udev.pc.in', +@@ -196,7 +196,7 @@ configure_file( + install_dir : pkgconfigdatadir == 'no' ? '' : pkgconfigdatadir) + + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'udev/rules.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'udev/rules.d'))) + + fuzzers += [ + [['src/udev/net/fuzz-link-parser.c', +diff --git a/sysctl.d/meson.build b/sysctl.d/meson.build +index 3f072e3db7..bd9f843eba 100644 +--- a/sysctl.d/meson.build ++++ b/sysctl.d/meson.build +@@ -27,4 +27,4 @@ foreach file : in_files + endforeach + + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'sysctl.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'sysctl.d'))) +diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build +index e77f46d06b..04d2ef621d 100644 +--- a/tmpfiles.d/meson.build ++++ b/tmpfiles.d/meson.build +@@ -57,5 +57,5 @@ endforeach + if enable_tmpfiles + meson.add_install_script( + 'sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'tmpfiles.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'tmpfiles.d'))) + endif +diff --git a/units/meson.build b/units/meson.build +index ea91f0cc9e..8622054ca5 100644 +--- a/units/meson.build ++++ b/units/meson.build +@@ -323,7 +323,7 @@ install_data('user-.slice.d/10-defaults.conf', + + meson.add_install_script(meson_make_symlink, + join_paths(pkgsysconfdir, 'user'), +- join_paths(sysconfdir, 'xdg/systemd/user')) ++ join_paths(factorypkgconfdir, 'xdg/systemd/user')) + meson.add_install_script(meson_make_symlink, + join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'), + join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service')) +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch new file mode 100644 index 0000000000000..5aa397afe8e60 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch @@ -0,0 +1,42 @@ +From 0b0510aa72cf8026f34f300efa3f150f45971404 Mon Sep 17 00:00:00 2001 +From: Andreas Rammhold <andreas@rammhold.de> +Date: Fri, 2 Nov 2018 21:15:42 +0100 +Subject: [PATCH 13/18] inherit systemd environment when calling generators. + +Systemd generators need access to the environment configured in +stage-2-init.sh since it schedules fsck and mkfs executions based on +being able to find an appropriate binary for the target filesystem. + +With this commit I am altering the systemd behaviour since upstream +tries to gather environments with that they call +"environment-generators" and then seems to pass that on to all the other +executables that are being called from managers. +--- + src/core/manager.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/src/core/manager.c b/src/core/manager.c +index 25afdbea04..7afd5e5a37 100644 +--- a/src/core/manager.c ++++ b/src/core/manager.c +@@ -3896,9 +3896,14 @@ static int manager_run_generators(Manager *m) { + argv[4] = NULL; + + RUN_WITH_UMASK(0022) +- (void) execute_directories((const char* const*) paths, DEFAULT_TIMEOUT_USEC, NULL, NULL, +- (char**) argv, m->transient_environment, EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS); +- ++ (void) execute_directories((const char* const*) paths, DEFAULT_TIMEOUT_USEC, ++ // On NixOS we must propagate PATH to generators so they are ++ // able to find binaries such as `fsck.${fstype}` and ++ // `mkfs.${fstype}`. That is why the last argument of the ++ // function (envp) is set to NULL. This propagates systemd's ++ // environment (e.g. PATH) that was setup ++ // before calling systemd from stage-2-init.sh. ++ NULL, NULL, (char**) argv, /* NixOS: use inherited env */ NULL, EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS); + r = 0; + + finish: +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch new file mode 100644 index 0000000000000..91c091baa9e7a --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch @@ -0,0 +1,38 @@ +From 4bd20cf0450455e2f9831b09ba91811ba3d58961 Mon Sep 17 00:00:00 2001 +From: Andreas Rammhold <andreas@rammhold.de> +Date: Thu, 9 May 2019 11:15:22 +0200 +Subject: [PATCH 14/18] add rootprefix to lookup dir paths + +systemd does not longer use the UDEVLIBEXEC directory as root for +discovery default udev rules. By adding `$out/lib` to the lookup paths +we should again be able to discover the udev rules amongst other default +files that I might have missed. +--- + src/basic/def.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/basic/def.h b/src/basic/def.h +index 970654a1ad..bb261040f8 100644 +--- a/src/basic/def.h ++++ b/src/basic/def.h +@@ -39,13 +39,15 @@ + "/run/" n "\0" \ + "/usr/local/lib/" n "\0" \ + "/usr/lib/" n "\0" \ +- _CONF_PATHS_SPLIT_USR_NULSTR(n) ++ _CONF_PATHS_SPLIT_USR_NULSTR(n) \ ++ ROOTPREFIX "/lib/" n "\0" + + #define CONF_PATHS_USR(n) \ + "/etc/" n, \ + "/run/" n, \ + "/usr/local/lib/" n, \ +- "/usr/lib/" n ++ "/usr/lib/" n, \ ++ ROOTPREFIX "/lib/" n + + #define CONF_PATHS(n) \ + CONF_PATHS_USR(n) \ +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch new file mode 100644 index 0000000000000..2bc75e2792827 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch @@ -0,0 +1,27 @@ +From f23a1e00de028048a2a21d322493039cce7ee214 Mon Sep 17 00:00:00 2001 +From: Nikolay Amiantov <ab@fmap.me> +Date: Thu, 25 Jul 2019 20:45:55 +0300 +Subject: [PATCH 15/18] systemd-shutdown: execute scripts in + /etc/systemd/system-shutdown + +This is needed for NixOS to use such scripts as systemd directory is immutable. +--- + src/shutdown/shutdown.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c +index 15e6c1799e..412bdefe74 100644 +--- a/src/shutdown/shutdown.c ++++ b/src/shutdown/shutdown.c +@@ -298,7 +298,7 @@ int main(int argc, char *argv[]) { + _cleanup_free_ char *cgroup = NULL; + char *arguments[3], *watchdog_device; + int cmd, r, umount_log_level = LOG_INFO; +- static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, NULL}; ++ static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, "/etc/systemd/system-shutdown", NULL}; + + /* The log target defaults to console, but the original systemd process will pass its log target in through a + * command line argument, which will override this default. Also, ensure we'll never log to the journal or +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch new file mode 100644 index 0000000000000..97f63c02c380e --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch @@ -0,0 +1,26 @@ +From 758b8211e6e76524d62a2e0ffcf37dcf55e3be87 Mon Sep 17 00:00:00 2001 +From: Nikolay Amiantov <ab@fmap.me> +Date: Thu, 25 Jul 2019 20:46:58 +0300 +Subject: [PATCH 16/18] systemd-sleep: execute scripts in + /etc/systemd/system-sleep + +This is needed for NixOS to use such scripts as systemd directory is immutable. +--- + src/sleep/sleep.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c +index fbfddc0262..d2530b9421 100644 +--- a/src/sleep/sleep.c ++++ b/src/sleep/sleep.c +@@ -178,6 +178,7 @@ static int execute(char **modes, char **states) { + }; + static const char* const dirs[] = { + SYSTEM_SLEEP_PATH, ++ "/etc/systemd/system-sleep", + NULL + }; + +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch b/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch new file mode 100644 index 0000000000000..2a0bb0103f545 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch @@ -0,0 +1,27 @@ +From ce9fe2249c91fdfb224eaffce63e3dbdb4a5c25d Mon Sep 17 00:00:00 2001 +From: Florian Klink <flokli@flokli.de> +Date: Sat, 7 Mar 2020 22:40:27 +0100 +Subject: [PATCH 17/18] kmod-static-nodes.service: Update ConditionFileNotEmpty + +On NixOS, kernel modules of the currently booted systems are located at +/run/booted-system/kernel-modules/lib/modules/%v/, not /lib/modules/%v/. +--- + units/kmod-static-nodes.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in +index 0971edf9ec..87105a87b9 100644 +--- a/units/kmod-static-nodes.service.in ++++ b/units/kmod-static-nodes.service.in +@@ -12,7 +12,7 @@ Description=Create list of static device nodes for the current kernel + DefaultDependencies=no + Before=sysinit.target systemd-tmpfiles-setup-dev.service + ConditionCapability=CAP_SYS_MODULE +-ConditionFileNotEmpty=/lib/modules/%v/modules.devname ++ConditionFileNotEmpty=/run/booted-system/kernel-modules/lib/modules/%v/modules.devname + + [Service] + Type=oneshot +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch new file mode 100644 index 0000000000000..08b2fa056f8b8 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch @@ -0,0 +1,33 @@ +From 55b69fc1b5441e3aff8f1ab684ba8eed3718a32d Mon Sep 17 00:00:00 2001 +From: Florian Klink <flokli@flokli.de> +Date: Sun, 8 Mar 2020 01:05:54 +0100 +Subject: [PATCH 18/18] path-util.h: add placeholder for DEFAULT_PATH_NORMAL + +This will be the $PATH used to lookup ExecStart= etc. options, which +systemd itself uses extensively. +--- + src/basic/path-util.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/basic/path-util.h b/src/basic/path-util.h +index 30031fca8e..d97145539a 100644 +--- a/src/basic/path-util.h ++++ b/src/basic/path-util.h +@@ -24,11 +24,11 @@ + # define PATH_SBIN_BIN_NULSTR(x) PATH_NORMAL_SBIN_BIN_NULSTR(x) + #endif + +-#define DEFAULT_PATH_NORMAL PATH_SBIN_BIN("/usr/local/") ":" PATH_SBIN_BIN("/usr/") +-#define DEFAULT_PATH_NORMAL_NULSTR PATH_SBIN_BIN_NULSTR("/usr/local/") PATH_SBIN_BIN_NULSTR("/usr/") ++#define DEFAULT_PATH_NORMAL "@defaultPathNormal@" ++#define DEFAULT_PATH_NORMAL_NULSTR "@defaultPathNormal@\0" + #define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":" PATH_SBIN_BIN("/") + #define DEFAULT_PATH_SPLIT_USR_NULSTR DEFAULT_PATH_NORMAL_NULSTR PATH_SBIN_BIN_NULSTR("/") +-#define DEFAULT_PATH_COMPAT PATH_SPLIT_SBIN_BIN("/usr/local/") ":" PATH_SPLIT_SBIN_BIN("/usr/") ":" PATH_SPLIT_SBIN_BIN("/") ++#define DEFAULT_PATH_COMPAT DEFAULT_PATH_NORMAL + + #if HAVE_SPLIT_USR + # define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 1dd2f30b9bfcd..00a545ed3f54f 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -7,6 +7,7 @@ , gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 , ninja, meson, python3Packages, glibcLocales , patchelf +, substituteAll , getent , buildPackages , perl @@ -23,25 +24,50 @@ let gnupg-minimal = gnupg.override { pinentry = null; adns = null; gnutls = null; - libusb = null; + libusb1 = null; openldap = null; readline = null; zlib = null; bzip2 = null; }; in stdenv.mkDerivation { - version = "243.7"; + version = "245.5"; pname = "systemd"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! # Also fresh patches should be cherry-picked from that tree to our current one. src = fetchFromGitHub { - owner = "nixos"; - repo = "systemd"; - rev = "e7d881488292fc8bdf96acd12767eca1bd65adae"; - sha256 = "0haj3iff3y13pm4w5dbqj1drp5wryqfad58jbbmnb6zdgis56h8f"; + owner = "systemd"; + repo = "systemd-stable"; + rev = "9a506b7e9291d997a920af9ac299e7b834368119"; + sha256 = "19qd92hjlsljr6x5mbw1l2vdzz5y9hy7y7g0dwgpfifb0lwkxqbr"; }; + patches = [ + ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch + ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch + ./0003-Fix-NixOS-containers.patch + ./0004-Look-for-fsck-in-the-right-place.patch + ./0005-Add-some-NixOS-specific-unit-directories.patch + ./0006-Get-rid-of-a-useless-message-in-user-sessions.patch + ./0007-hostnamed-localed-timedated-disable-methods-that-cha.patch + ./0008-Fix-hwdb-paths.patch + ./0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch + ./0010-localectl-use-etc-X11-xkb-for-list-x11.patch + ./0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch + ./0012-Install-default-configuration-into-out-share-factory.patch + ./0013-inherit-systemd-environment-when-calling-generators.patch + ./0014-add-rootprefix-to-lookup-dir-paths.patch + ./0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch + ./0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch + ./0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch + ./0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch + ]; + + postPatch = '' + substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/" + ''; + outputs = [ "out" "lib" "man" "dev" ]; nativeBuildInputs = @@ -83,8 +109,10 @@ in stdenv.mkDerivation { "-Dtests=false" "-Dimportd=true" "-Dlz4=true" + "-Dhomed=false" "-Dhostnamed=true" "-Dnetworkd=true" + "-Dportabled=false" "-Dsysusers=false" "-Dtimedated=true" "-Dtimesyncd=true" @@ -195,6 +223,11 @@ in stdenv.mkDerivation { doCheck = false; # fails a bunch of tests + # trigger the test -n "$DESTDIR" || mutate in upstreams build system + preInstall = '' + export DESTDIR=/ + ''; + postInstall = '' # sysinit.target: Don't depend on # systemd-tmpfiles-setup.service. This interferes with NixOps's @@ -263,6 +296,6 @@ in stdenv.mkDerivation { license = licenses.lgpl21Plus; platforms = platforms.linux; priority = 10; - maintainers = with maintainers; [ andir eelco flokli mic92 ]; + maintainers = with maintainers; [ andir eelco flokli ]; }; } diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index e3a8baa7da35a..0fc5acba4dacf 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.nongnu.org/sysvinit/; + homepage = "https://www.nongnu.org/sysvinit/"; description = "Utilities related to booting and shutdown"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/targetcli/default.nix b/pkgs/os-specific/linux/targetcli/default.nix index aa670aba7271a..65d46ad34c164 100644 --- a/pkgs/os-specific/linux/targetcli/default.nix +++ b/pkgs/os-specific/linux/targetcli/default.nix @@ -20,7 +20,7 @@ python.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "A command shell for managing the Linux LIO kernel target"; - homepage = https://github.com/open-iscsi/targetcli-fb; + homepage = "https://github.com/open-iscsi/targetcli-fb"; license = licenses.asl20; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix index bb640e6fa5e16..6502cc9c38e09 100644 --- a/pkgs/os-specific/linux/tbs/default.nix +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation { ''; meta = with lib; { - homepage = https://www.tbsdtv.com/; + homepage = "https://www.tbsdtv.com/"; description = "Linux driver for TBSDTV cards"; license = licenses.gpl2; maintainers = with maintainers; [ ck3d ]; diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix index 309d69ebad5c3..b3d59cf5a6ab6 100644 --- a/pkgs/os-specific/linux/tcp-wrappers/default.nix +++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { addition to the traditional BSD sockets. ''; - homepage = ftp://ftp.porcupine.org/pub/security/index.html; + homepage = "ftp://ftp.porcupine.org/pub/security/index.html"; license = "BSD-style"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix index 299ac8ad22036..d9817a6c04b6a 100644 --- a/pkgs/os-specific/linux/thunderbolt/default.nix +++ b/pkgs/os-specific/linux/thunderbolt/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Thunderbolt(TM) user-space components"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.ryantrinkle ]; - homepage = https://01.org/thunderbolt-sw; + homepage = "https://01.org/thunderbolt-sw"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/pkgs/os-specific/linux/tiptop/default.nix index bfcf58a35307a..03db9e3bb0eef 100644 --- a/pkgs/os-specific/linux/tiptop/default.nix +++ b/pkgs/os-specific/linux/tiptop/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Performance monitoring tool for Linux"; - homepage = http://tiptop.gforge.inria.fr; + homepage = "http://tiptop.gforge.inria.fr"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/pkgs/os-specific/linux/tiscamera/default.nix index ebd17de892abe..fb2773b4d3adc 100644 --- a/pkgs/os-specific/linux/tiscamera/default.nix +++ b/pkgs/os-specific/linux/tiscamera/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The Linux sources and UVC firmwares for The Imaging Source cameras"; - homepage = https://github.com/TheImagingSource/tiscamera; + homepage = "https://github.com/TheImagingSource/tiscamera"; license = with licenses; [ asl20 ]; platforms = platforms.linux; maintainers = with maintainers; [ jraygauthier ]; diff --git a/pkgs/os-specific/linux/tmon/default.nix b/pkgs/os-specific/linux/tmon/default.nix index 690eb8b2eabb9..f8438f8d40f0a 100644 --- a/pkgs/os-specific/linux/tmon/default.nix +++ b/pkgs/os-specific/linux/tmon/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Monitoring and Testing Tool for Linux kernel thermal subsystem"; - homepage = https://www.kernel.org/; + homepage = "https://www.kernel.org/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 4a47ed8868db2..150c64a045145 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "File encryption on GNU/Linux"; - homepage = https://www.dyne.org/software/tomb/; + homepage = "https://www.dyne.org/software/tomb/"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index e22263bc2dbd0..5e0e9c539ea35 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "IBM ThinkPad hardware functions driver"; - homepage = https://github.com/evgeni/tp_smapi; + homepage = "https://github.com/evgeni/tp_smapi"; license = stdenv.lib.licenses.gpl2; maintainers = [ ]; # driver is only ment for linux thinkpads i think bellow platforms should cover it. diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 5ec5fbb7c2294..a80635c53cef5 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "User-space tools for the Linux kernel ftrace subsystem"; - homepage = https://kernelshark.org/; + homepage = "https://kernelshark.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice basvandijk ]; diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index 5e355ac7c9a76..3a280b8af0bec 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -32,7 +32,7 @@ mkDerivation { meta = with stdenv.lib; { description = "GUI for trace-cmd which is an interface for the Linux kernel ftrace subsystem"; - homepage = https://kernelshark.org/; + homepage = "https://kernelshark.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ basvandijk ]; diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix index b855f0547ba07..6d9848ab7126b 100644 --- a/pkgs/os-specific/linux/trinity/default.nix +++ b/pkgs/os-specific/linux/trinity/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Linux System call fuzz tester"; - homepage = https://codemonkey.org.uk/projects/trinity/; + homepage = "https://codemonkey.org.uk/projects/trinity/"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/tunctl/default.nix b/pkgs/os-specific/linux/tunctl/default.nix index ded9ec0281db7..c20c3e98f5588 100644 --- a/pkgs/os-specific/linux/tunctl/default.nix +++ b/pkgs/os-specific/linux/tunctl/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "tunctl-1.5"; src = fetchurl { - url = mirror://sourceforge/tunctl/tunctl-1.5.tar.gz; + url = "mirror://sourceforge/tunctl/tunctl-1.5.tar.gz"; sha256 = "aa2a6c4cc6bfacb11e0d9f62334a6638a0d435475c61230116f00b6af8b14fff"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://tunctl.sourceforge.net/; + homepage = "http://tunctl.sourceforge.net/"; description = "Utility to set up and maintain TUN/TAP network interfaces"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/turbostat/default.nix b/pkgs/os-specific/linux/turbostat/default.nix index 10074f490b80e..4207589aaff02 100644 --- a/pkgs/os-specific/linux/turbostat/default.nix +++ b/pkgs/os-specific/linux/turbostat/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Report processor frequency and idle statistics"; - homepage = https://www.kernel.org/; + homepage = "https://www.kernel.org/"; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; # x86-specific }; diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 5f40141107477..c9da86b7898a6 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -48,7 +48,7 @@ let UCLIBC_HAS_FPU n ''; - version = "1.0.32"; + version = "1.0.33"; in stdenv.mkDerivation { @@ -58,7 +58,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://downloads.uclibc-ng.org/releases/${version}/uClibc-ng-${version}.tar.bz2"; # from "${url}.sha256"; - sha256 = "0cp4xf3k0ib76xaz6n6i7yybw7s92s607ak8svq1kakwk0d1jjbv"; + sha256 = "0qy9xsqacrhhrxd16azm26pqb2ks6c43wbrlq3i8xmq2917kw3xi"; }; # 'ftw' needed to build acl, a coreutils dependency diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix index 29e3fd2e2a8dd..60a1f8a619d1e 100644 --- a/pkgs/os-specific/linux/udisks-glue/default.nix +++ b/pkgs/os-specific/linux/udisks-glue/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { preConfigure = "sh autogen.sh"; meta = { - homepage = https://github.com/fernandotcl/udisks-glue; + homepage = "https://github.com/fernandotcl/udisks-glue"; description = "A tool to associate udisks events to user-defined actions"; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [pSub]; diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index 60bf2b9bc2429..f8876e5d155a2 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--enable-lvm2" ]; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/udisks; + homepage = "http://www.freedesktop.org/wiki/Software/udisks"; description = "A daemon and command-line utility for querying and manipulating storage devices"; platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2Plus ]; diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index ab7f65925ee33..e9d9eff007cde 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; src = fetchurl { - url = https://gitlab.freedesktop.org/upower/upower/uploads/93cfe7c8d66ed486001c4f3f55399b7a/upower-0.99.11.tar.xz; + url = "https://gitlab.freedesktop.org/upower/upower/uploads/93cfe7c8d66ed486001c4f3f55399b7a/upower-0.99.11.tar.xz"; sha256 = "1vxxvmz2cxb1qy6ibszaz5bskqdy9nd9fxspj9fv3gfmrjzzzdb4"; }; @@ -63,7 +63,7 @@ stdenv.mkDerivation { ]; meta = with stdenv.lib; { - homepage = https://upower.freedesktop.org/; + homepage = "https://upower.freedesktop.org/"; description = "A D-Bus service for power management"; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index 3b4c1c4b6655c..ad751b9cfe061 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -12,14 +12,14 @@ with stdenv.lib; assert libgcrypt != null -> libsodium == null; stdenv.mkDerivation rec { - version = "0.7.6"; + version = "0.7.8"; pname = "usbguard"; repo = "https://github.com/USBGuard/usbguard"; src = fetchurl { url = "${repo}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0gzhs8s4aka86mkcjib36z54si939ki4bmk46p6v8kln1fixad3j"; + sha256 = "1il5immqfxh2cj8wn1bfk7l42inflzgjf07yqprpz7r3lalbxc25"; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix index f927eaefb4eb7..ffd33b6ff8545 100644 --- a/pkgs/os-specific/linux/usbip/default.nix +++ b/pkgs/os-specific/linux/usbip/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/torvalds/linux/tree/master/tools/usb/usbip; + homepage = "https://github.com/torvalds/linux/tree/master/tools/usb/usbip"; description = "allows to pass USB device from server to client over the network"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 2627286ccffe7..41db602bce500 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.linux-usb.org/; + homepage = "http://www.linux-usb.org/"; description = "Tools for working with USB devices, such as lsusb"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index ec58d513b0958..85f769d9dbaee 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -20,10 +20,9 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/tom5760/usermount; + homepage = "https://github.com/tom5760/usermount"; description = "A simple tool to automatically mount removable drives using UDisks2 and D-Bus"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index baaa90e431ba2..aa23a162a9291 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "util-linux"; - version = "2.33.2"; + version = "2.35.1"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15yf2dh4jd1kg6066hydlgdhhs2j3na13qld8yx30qngqvmfh6v3"; + sha256 = "1yfpy6bkab4jw61mpx48gfy24yrqp4a7arvpis8csrkk53fkxpnr"; }; patches = [ @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = https://www.kernel.org/pub/linux/utils/util-linux/; + homepage = "https://www.kernel.org/pub/linux/utils/util-linux/"; description = "A set of system utilities for Linux"; license = licenses.gpl2; # also contains parts under more permissive licenses platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch b/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch index 5f38861bf68b7..52c970a18f3da 100644 --- a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch +++ b/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch @@ -2,26 +2,68 @@ Search $PATH for the shutdown binary instead of hard-coding /sbin/shutdown, which isn't valid on NixOS (and a compatibility link on most other modern distros anyway). - -- nckx <github@tobias.gr> --- a/include/pathnames.h +++ b/include/pathnames.h -@@ -53,7 +53,7 @@ +@@ -50,8 +50,8 @@ #ifndef _PATH_LOGIN - #define _PATH_LOGIN "/bin/login" + # define _PATH_LOGIN "/bin/login" #endif -#define _PATH_SHUTDOWN "/sbin/shutdown" -+#define _PATH_SHUTDOWN "shutdown" - +-#define _PATH_POWEROFF "/sbin/poweroff" ++#define _PATH_SHUTDOWN "shutdown" ++#define _PATH_POWEROFF "poweroff" + #define _PATH_TERMCOLORS_DIRNAME "terminal-colors.d" #define _PATH_TERMCOLORS_DIR "/etc/" _PATH_TERMCOLORS_DIRNAME --- a/sys-utils/rtcwake.c +++ b/sys-utils/rtcwake.c -@@ -575,7 +575,7 @@ int main(int argc, char **argv) - arg[i++] = "now"; - arg[i] = NULL; - if (!ctl.dryrun) { -- execv(arg[0], arg); +@@ -587,29 +587,29 @@ int main(int argc, char **argv) + char *arg[5]; + int i = 0; + +- if (!access(_PATH_SHUTDOWN, X_OK)) { +- arg[i++] = _PATH_SHUTDOWN; +- arg[i++] = "-h"; +- arg[i++] = "-P"; +- arg[i++] = "now"; +- arg[i] = NULL; +- } else if (!access(_PATH_POWEROFF, X_OK)) { +- arg[i++] = _PATH_POWEROFF; +- arg[i] = NULL; +- } else { +- arg[i] = NULL; +- } ++ arg[i++] = _PATH_SHUTDOWN; ++ arg[i++] = "-h"; ++ arg[i++] = "-P"; ++ arg[i++] = "now"; ++ arg[i] = NULL; + +- if (arg[0]) { +- if (ctl.verbose) +- printf(_("suspend mode: off; executing %s\n"), +- arg[0]); +- if (!ctl.dryrun) { +- execv(arg[0], arg); ++ if (ctl.verbose) ++ printf(_("suspend mode: off; executing %s\n"), ++ arg[0]); ++ ++ if (!ctl.dryrun) { ++ execvp(arg[0], arg); ++ if (ctl.verbose) { + warn(_("failed to execute %s"), arg[0]); +- rc = EX_EXEC_ENOENT; ++ // Reuse translations. ++ printf(_("suspend mode: off; executing %s\n"), ++ _PATH_POWEROFF); + } +- } else { ++ ++ i = 0; ++ arg[i++] = _PATH_POWEROFF; ++ arg[i] = NULL; + execvp(arg[0], arg); - warn(_("failed to execute %s"), _PATH_SHUTDOWN); - rc = EXIT_FAILURE; - } + /* Failed to find shutdown command */ + warn(_("failed to find shutdown command")); + rc = EX_EXEC_ENOENT; diff --git a/pkgs/os-specific/linux/uvcdynctrl/default.nix b/pkgs/os-specific/linux/uvcdynctrl/default.nix index c2afa23efc06a..f022023fcbb01 100644 --- a/pkgs/os-specific/linux/uvcdynctrl/default.nix +++ b/pkgs/os-specific/linux/uvcdynctrl/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A simple interface for devices supported by the linux UVC driver"; - homepage = http://guvcview.sourceforge.net; + homepage = "http://guvcview.sourceforge.net"; license = licenses.gpl3Plus; maintainers = [ maintainers.puffnfresh ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 050e7eaec473b..73944bd6eb70e 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "V4L utils and libv4l, provide common image formats regardless of the v4l device"; - homepage = https://linuxtv.org/projects.php; + homepage = "https://linuxtv.org/projects.php"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ codyopel ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 275372b8309da..32ae45fbb0ea2 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "v4l2loopback-${version}-${kernel.version}"; - version = "0.12.3"; + version = "0.12.5"; src = fetchFromGitHub { owner = "umlaeute"; repo = "v4l2loopback"; rev = "v${version}"; - sha256 = "01wahmrh4iw27cfmypik6frapq14vn7m9shmj5g7cr1apz2523aq"; + sha256 = "1qi4l6yam8nrlmc3zwkrz9vph0xsj1cgmkqci4652mbpbzigg7vn"; }; hardeningDisable = [ "format" "pic" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A kernel module to create V4L2 loopback devices"; - homepage = https://github.com/umlaeute/v4l2loopback; + homepage = "https://github.com/umlaeute/v4l2loopback"; license = licenses.gpl2; maintainers = [ maintainers.domenkozar ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index 073a6ded998b3..ec0c318042a12 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A daemon to run x86 code in an emulated environment"; - homepage = https://github.com/mjanusz/v86d; + homepage = "https://github.com/mjanusz/v86d"; license = licenses.gpl2; maintainers = with maintainers; [ codyopel ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 890c774081bb8..c68dfd5fc5e06 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, kernel, perl, wireguard-tools }: +{ stdenv, fetchzip, kernel, perl, wireguard-tools, bc }: # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements assert stdenv.lib.versionAtLeast kernel.version "3.10"; @@ -7,29 +7,31 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20200401"; + version = "1.0.20200506"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "1q4gfpbvbyracnl219xqfz5yqfc08i6g41z6bn2skx5x8jbll3aq"; + sha256 = "05dphmcxm3lg860r5bj1b995avh43d1pap8p18p4ig4kv2r2g9nq"; }; - preConfigure = '' - cd src - sed -i '/depmod/,+1d' Makefile - ''; - hardeningDisable = [ "pic" ]; KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - INSTALL_MOD_PATH = "\${out}"; - - NIX_CFLAGS = ["-Wno-error=cpp"]; - nativeBuildInputs = [ perl ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ perl bc ] ++ kernel.moduleBuildDependencies; + preBuild = "cd src"; buildFlags = [ "module" ]; - installTargets = [ "module-install" ]; + + INSTALL_MOD_PATH = placeholder "out"; + installFlags = [ "DEPMOD=true" ]; + enableParallelBuilding = true; + + passthru = { + # remove this when our kernel comes with native wireguard support + # and our tests no longer tests this package + inherit (wireguard-tools) tests; + }; meta = with stdenv.lib; { inherit (wireguard-tools.meta) homepage license maintainers; diff --git a/pkgs/os-specific/linux/wooting-udev-rules/default.nix b/pkgs/os-specific/linux/wooting-udev-rules/default.nix index 49da843e3ad93..0093603c250cb 100644 --- a/pkgs/os-specific/linux/wooting-udev-rules/default.nix +++ b/pkgs/os-specific/linux/wooting-udev-rules/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wooting.helpscoutdocs.com/article/34-linux-udev-rules; + homepage = "https://wooting.helpscoutdocs.com/article/34-linux-udev-rules"; description = "udev rules that give NixOS permission to communicate with Wooting keyboards"; platforms = platforms.linux; license = "unknown"; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index dc5b4289a4515..5cd440bcdfc7a 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://hostap.epitest.fi/wpa_supplicant/; + homepage = "https://hostap.epitest.fi/wpa_supplicant/"; description = "A tool for connecting to WPA and WPA2-protected wireless networks"; license = licenses.bsd3; maintainers = with maintainers; [ marcweber ]; diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index d02901e0cc1cc..911b0331f4cd4 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -1,14 +1,23 @@ -{ stdenv, mkDerivation, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: +{ stdenv, mkDerivation, fetchpatch, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: mkDerivation { name = "wpa_gui-${wpa_supplicant.version}"; inherit (wpa_supplicant) src; + patches = [ + # Fix build with Inkscape 1.0 + # https://github.com/NixOS/nixpkgs/issues/86930 + (fetchpatch { + url = "https://w1.fi/cgit/hostap/patch/?id=0388992905a5c2be5cba9497504eaea346474754"; + sha256 = "YDSY7l/qEco+aZYcYHLf/rxCKvPw35ibGoMorjA5GhY="; + }) + ]; + buildInputs = [ qtbase ]; nativeBuildInputs = [ qmake inkscape imagemagick ]; - prePatch = '' + postPatch = '' cd wpa_supplicant/wpa_gui-qt4 ''; @@ -25,7 +34,7 @@ mkDerivation { meta = with stdenv.lib; { description = "Qt-based GUI for wpa_supplicant"; - homepage = https://hostap.epitest.fi/wpa_supplicant/; + homepage = "https://hostap.epitest.fi/wpa_supplicant/"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix b/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix index b4997714ceaf7..880456afbde22 100644 --- a/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix +++ b/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Set the energy versus performance policy preference bias on recent X86 processors"; - homepage = https://www.kernel.org/; + homepage = "https://www.kernel.org/"; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; # x86-specific }; diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix index 1c2aaa8ee01d5..9b745315b1cf6 100644 --- a/pkgs/os-specific/linux/x86info/default.nix +++ b/pkgs/os-specific/linux/x86info/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; platforms = [ "i686-linux" "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; - homepage = http://codemonkey.org.uk/projects/x86info/; + homepage = "http://codemonkey.org.uk/projects/x86info/"; maintainers = with stdenv.lib.maintainers; [jcumming]; }; } diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index ac095ffaf89b7..8a7541afa692d 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { maintainers = [ maintainers.goibhniu ]; description = "Wacom digitizer driver for X11"; - homepage = http://linuxwacom.sourceforge.net; + homepage = "http://linuxwacom.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; # Probably, works with other unices as well }; diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index 69a10673d2493..c117293d3ad18 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "xf86-video-nested-2017-06-12"; src = fetchgit { - url = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested; + url = "git://anongit.freedesktop.org/xorg/driver/xf86-video-nested"; rev = "6a48b385c41ea89354d0b2ee7f4649a1d1d9ec70"; sha256 = "133rd2kvr2q2wmwpx82bb93qbi8wm8qp1vlmbhgc7aslz0j4cqqv"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { CFLAGS = "-I${pixman}/include/pixman-1"; meta = { - homepage = https://cgit.freedesktop.org/xorg/driver/xf86-video-nested; + homepage = "https://cgit.freedesktop.org/xorg/driver/xf86-video-nested"; description = "A driver to run Xorg on top of Xorg or something else"; maintainers = [ stdenv.lib.maintainers.goibhniu ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/zenstates/default.nix b/pkgs/os-specific/linux/zenstates/default.nix new file mode 100644 index 0000000000000..4ac77c00aa3b0 --- /dev/null +++ b/pkgs/os-specific/linux/zenstates/default.nix @@ -0,0 +1,54 @@ +# Zenstates provides access to a variety of CPU tunables no Ryzen processors. +# +# In particular, I am adding Zenstates because I need it to disable the C6 +# sleep state to stabilize wake from sleep on my Lenovo x395 system. After +# installing Zenstates, I need a before-sleep script like so: +# +# before-sleep = pkgs.writeScript "before-sleep" '' +# #!${pkgs.bash}/bin/bash +# ${pkgs.zenstates}/bin/zenstates --c6-disable +# ''; +# +# ... +# +# systemd.services.before-sleep = { +# description = "Jobs to run before going to sleep"; +# serviceConfig = { +# Type = "oneshot"; +# ExecStart = "${before-sleep}"; +# }; +# wantedBy = [ "sleep.target" ]; +# before = [ "sleep.target" ]; +# }; + +{ stdenv, fetchFromGitHub, python3 }: +stdenv.mkDerivation rec { + pname = "zenstates"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "r4m0n"; + repo = "ZenStates-Linux"; + rev = "0bc27f4740e382f2a2896dc1dabfec1d0ac96818"; + sha256 = "1h1h2n50d2cwcyw3zp4lamfvrdjy1gjghffvl3qrp6arfsfa615y"; + }; + + buildInputs = [ python3 ]; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/bin + cp $src/zenstates.py $out/bin/zenstates + chmod +x $out/bin/zenstates + patchShebangs --build $out/bin/zenstates + ''; + + meta = with stdenv.lib; { + description = "Linux utility for Ryzen processors and motherboards"; + homepage = "https://github.com/r4m0n/ZenStates-Linux"; + license = licenses.mit; + maintainers = with maintainers; [ savannidgerinel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 2486f82d2ee5e..581316dc74db5 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -42,12 +42,7 @@ let inherit rev sha256; }; - patches = [ (fetchpatch { - # https://github.com/openzfs/zfs/pull/9961#issuecomment-585827288 - # will be included in zfs 0.5.4 as well - url = "https://gist.githubusercontent.com/satmandu/67cbae9c4d461be0e64428a1707aef1c/raw/ba0fb65f17ccce5b710e4ce86a095de577f7dfe1/k5.6.3.patch"; - sha256 = "0zay7cz078v7wcnk7xl96blp7j6y64q1migb91c7h66zkpikqvgb"; - }) ] ++ extraPatches; + patches = [ ] ++ extraPatches; postPatch = optionalString buildKernel '' patchShebangs scripts @@ -177,7 +172,7 @@ let Copy-On-Write filesystem with data integrity detection and repair, snapshotting, cloning, block devices, deduplication, and more. ''; - homepage = https://zfsonlinux.org/; + homepage = "https://zfsonlinux.org/"; license = licenses.cddl; platforms = platforms.linux; maintainers = with maintainers; [ jcumming wizeman fpletz globin ]; @@ -192,9 +187,9 @@ in { # incompatibleKernelVersion = "4.20"; # this package should point to the latest release. - version = "0.8.3"; + version = "0.8.4"; - sha256 = "0viql8rnqr32diapkpdsrwm6xj8vw5vi4dk2x2m7s7g0q2zdkahw"; + sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp"; }; zfsUnstable = common { @@ -202,9 +197,9 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "0.8.3"; + version = "0.8.4"; - sha256 = "0viql8rnqr32diapkpdsrwm6xj8vw5vi4dk2x2m7s7g0q2zdkahw"; + sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp"; isUnstable = true; }; } diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix index a6c74d029c57f..16b07507695b1 100644 --- a/pkgs/os-specific/windows/cygwin-setup/default.nix +++ b/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://sourceware.org/cygwin-apps/setup.html; + homepage = "https://sourceware.org/cygwin-apps/setup.html"; description = "A tool for installing Cygwin"; license = licenses.gpl2Plus; }; diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index 0ddec9282e610..1f42330be35cf 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "jom-1.0.11"; src = fetchgit { - url = git://gitorious.org/qt-labs/jom.git; + url = "git://gitorious.org/qt-labs/jom.git"; rev = "c91a204b05f97eef3c73aaaba3036e20f79fd487"; sha256 = "6d3ac84f83bb045213903d9d5340c0447c8fe41671d1dcdeae5c40b66d62ccbf"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://qt-project.org/wiki/jom; + homepage = "http://qt-project.org/wiki/jom"; description = "Clone of nmake supporting multiple independent commands in parallel"; license = stdenv.lib.licenses.gpl2Plus; # Explicitly, GPLv2 or GPLv3, but not later. }; diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index 2764c4232c167..4dc886915b736 100644 --- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "wxMSW-2.8.11"; src = fetchurl { - url = mirror://sourceforge/wxwindows/wxWidgets-2.8.11.tar.gz; + url = "mirror://sourceforge/wxwindows/wxWidgets-2.8.11.tar.gz"; sha256 = "0icxd21g18d42n1ygshkpw0jnflm03iqki6r623pb5hhd7fm2ksj"; }; diff --git a/pkgs/servers/adminer/default.nix b/pkgs/servers/adminer/default.nix index 6d7b12df56d45..c58d2e6c2ba65 100644 --- a/pkgs/servers/adminer/default.nix +++ b/pkgs/servers/adminer/default.nix @@ -1,13 +1,13 @@ { stdenv, libbsd, fetchurl, phpPackages, php }: stdenv.mkDerivation rec { - version = "4.7.6"; + version = "4.7.7"; pname = "adminer"; # not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file src = fetchurl { url = "https://github.com/vrana/adminer/releases/download/v${version}/adminer-${version}.tar.gz"; - sha256 = "1zgvscz7jk32qga8hp2dg89h7y72v05vz4yh4lq2ahhwwkbnsxpi"; + sha256 = "1rvvc7xml7ycpbpjgqbgkan8djplx67balrmfignk1b6h9cw3l4q"; }; nativeBuildInputs = with phpPackages; [ php composer ]; diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index 4eb56ee4ae20d..4f7186f31404a 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -11,9 +11,9 @@ let }; meta = with stdenv.lib; { - homepage = http://qpid.apache.org; - repositories.git = git://git.apache.org/qpid.git; - repositories.svn = http://svn.apache.org/repos/asf/qpid; + homepage = "http://qpid.apache.org"; + repositories.git = "git://git.apache.org/qpid.git"; + repositories.svn = "http://svn.apache.org/repos/asf/qpid"; description = "An AMQP message broker and a C++ messaging API"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 769f5f79a77fe..a8baefa98ea09 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://kafka.apache.org; + homepage = "http://kafka.apache.org"; description = "A high-throughput distributed messaging system"; license = licenses.asl20; maintainers = [ maintainers.ragge ]; diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index bec61d460a7a9..ad047ba31f861 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Daemon for controlling APC UPSes"; - homepage = http://www.apcupsd.com/; + homepage = "http://www.apcupsd.com/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 1e5ba46d38232..9683d2c44d055 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -72,24 +72,24 @@ let meta = with stdenv.lib; { description = "Software implementation of a telephone private branch exchange (PBX)"; - homepage = https://www.asterisk.org/; + homepage = "https://www.asterisk.org/"; license = licenses.gpl2; maintainers = with maintainers; [ auntie DerTim1 yorickvp ]; }; }; pjproject_2_7_1 = fetchurl { - url = https://www.pjsip.org/release/2.7.1/pjproject-2.7.1.tar.bz2; + url = "https://www.pjsip.org/release/2.7.1/pjproject-2.7.1.tar.bz2"; sha256 = "09ii5hgl5s7grx4fiimcl3s77i385h7b3kwpfa2q0arbl1ibryjr"; }; pjproject_2_8 = fetchurl { - url = https://www.pjsip.org/release/2.8/pjproject-2.8.tar.bz2; + url = "https://www.pjsip.org/release/2.8/pjproject-2.8.tar.bz2"; sha256 = "0ybg0113rp3fk49rm2v0pcgqb28h3dv1pdy9594w2ggiz7bhngah"; }; mp3-202 = fetchsvn { - url = http://svn.digium.com/svn/thirdparty/mp3/trunk; + url = "http://svn.digium.com/svn/thirdparty/mp3/trunk"; rev = "202"; sha256 = "1s9idx2miwk178sa731ig9r4fzx4gy1q8xazfqyd7q4lfd70s1cy"; }; @@ -141,11 +141,11 @@ in rec { # # provided here verbatim for the convenience of anyone wanting to build # # Asterisk from other sources. Include in externals. # "sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz" = fetchurl { - # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz; + # url = "http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz"; # sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd"; # }; # "sounds/asterisk-moh-opsound-wav-2.03.tar.gz" = fetchurl { - # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz; + # url = "http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz"; # sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538"; # }; # # TODO: Sounds for other languages could be added here diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index d8410c87b766d..81f8422bb04ec 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null); stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.3.4"; + version = "7.4.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "13d0vnsvyl8cjdxnp2w284814bnqgbksl8mq7lkjms1x083mhnzi"; + sha256 = "1spykb8f24dlzrcyj01nv1ra278j0b6bxbnvrcnp6yr2s69cjwd0"; }; buildPhase = '' diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 81b90091e669e..556380df46492 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Single sign-on and identity management tool"; - homepage = https://www.atlassian.com/software/crowd; + homepage = "https://www.atlassian.com/software/crowd"; license = licenses.unfree; maintainers = with maintainers; [ fpletz globin ]; }; diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix new file mode 100644 index 0000000000000..075b5e584477f --- /dev/null +++ b/pkgs/servers/bazarr/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchurl, makeWrapper, python3, nixosTests }: + +stdenv.mkDerivation rec { + pname = "bazarr"; + version = "0.8.4.4"; + + src = fetchurl { + url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz"; + sha256 = "09qpy5fyyidi45968qg37cighfh3rgwsi8pfz4fk5fp2v1xq23yg"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/src + cp -r * $out/src + + mkdir -p $out/bin + makeWrapper "${(python3.withPackages (ps: [ps.lxml])).interpreter}" \ + $out/bin/bazarr \ + --add-flags "$out/src/bazarr.py" \ + ''; + + passthru.tests = { + smoke-test = nixosTests.bazarr; + }; + + meta = with lib; { + description = "Subtitle manager for Sonarr and Radarr"; + homepage = "https://www.bazarr.media/"; + license = licenses.gpl3; + maintainers = with maintainers; [ xwvvvvwx ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix index 58ebbf88f78a8..40e6267bd7bd6 100644 --- a/pkgs/servers/beanstalkd/default.nix +++ b/pkgs/servers/beanstalkd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; meta = with stdenv.lib; { - homepage = http://kr.github.io/beanstalkd/; + homepage = "http://kr.github.io/beanstalkd/"; description = "A simple, fast work queue"; license = licenses.mit; maintainers = [ maintainers.zimbatm ]; diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 2cc27eda1d4d9..e90445e29c894 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -36,7 +36,7 @@ let meta = { description = "BIRD Internet Routing Daemon"; - homepage = http://bird.network.cz; + homepage = "http://bird.network.cz"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fpletz globin ]; platforms = platforms.linux; diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index b931e8cfcb20b..627ac42efd207 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -1,5 +1,5 @@ { stdenv -, buildGoPackage +, buildGoModule , lib , fetchFromGitHub , rocksdb @@ -12,25 +12,45 @@ , lz4 }: -buildGoPackage rec { +buildGoModule rec { pname = "blockbook"; - version = "0.3.2"; - - goPackagePath = "blockbook"; + version = "0.3.3"; + commit = "b6961ca"; src = fetchFromGitHub { owner = "trezor"; repo = "blockbook"; rev = "v${version}"; - sha256 = "0hcgz4b7k8ia4dnjg6bbii95sqg3clc40ybwwc4qz3jv21ikc54x"; + sha256 = "01nb4if2dix2h95xvqvafil325jjw2a4v1izb9mad0cjqcf8rk6n"; }; - goDeps = ./deps.nix; + vendorSha256 = "1qjlvhizl8cy06cgf4phia70bgbm4lj57z5z2gyr8aglx98bnpdn"; buildInputs = [ bzip2 zlib snappy zeromq lz4 ]; nativeBuildInputs = [ pkg-config packr ]; + buildFlagsArray = '' + -ldflags= + -X github.com/trezor/blockbook/common.version=${version} + -X github.com/trezor/blockbook/common.gitcommit=${commit} + -X github.com/trezor/blockbook/common.buildDate=unknown + ''; + + goethereum = fetchFromGitHub { + owner = "ethereum"; + repo = "go-ethereum"; + rev = "v1.8.20"; + sha256 = "0m2q1nz6f39pyr2rk6vflkwi4ykganzwr7wndpwr9rliw0x8jgi0"; + }; + + overrideModAttrs = (_: { + postBuild = '' + rm -r vendor/github.com/ethereum/go-ethereum + cp -r --reflink=auto ${goethereum} vendor/github.com/ethereum/go-ethereum + ''; + }); + preBuild = lib.optionalString stdenv.isDarwin '' ulimit -n 8192 '' + '' @@ -39,16 +59,13 @@ buildGoPackage rec { packr clean && packr ''; - postInstall = '' - rm $bin/bin/{scripts,templates,trezor-common} - ''; + subPackages = [ "." ]; meta = with lib; { description = "Trezor address/account balance backend"; homepage = "https://github.com/trezor/blockbook"; license = licenses.agpl3; - maintainers = with maintainers; [ mmahut ]; - platforms = platforms.all; + maintainers = with maintainers; [ mmahut maintainers."1000101" ]; + platforms = remove "aarch64-linux" platforms.unix; }; } - diff --git a/pkgs/servers/blockbook/deps.nix b/pkgs/servers/blockbook/deps.nix deleted file mode 100644 index 9f9ae0a4704d6..0000000000000 --- a/pkgs/servers/blockbook/deps.nix +++ /dev/null @@ -1,372 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/Groestlcoin/go-groestl-hash"; - fetch = { - type = "git"; - url = "https://github.com/Groestlcoin/go-groestl-hash"; - rev = "790653ac190c4029ee200e82a8f21b5d1afaf7d6"; - sha256 = "02davg672v9sz8l7a8s0b8m87154p42hkm5r6pavf4gqziw8bmr4"; - }; - } - { - goPackagePath = "github.com/allegro/bigcache"; - fetch = { - type = "git"; - url = "https://github.com/allegro/bigcache"; - rev = "69ea0af04088faa57adb9ac683934277141e92a5"; - sha256 = "0ac9pgzgi9lhklkqmc5f5x3d0cbyxjfpadc6mdbd7hdr7rfrjmxf"; - }; - } - { - goPackagePath = "github.com/aristanetworks/goarista"; - fetch = { - type = "git"; - url = "https://github.com/aristanetworks/goarista"; - rev = "8e7d5b18fe7ad671e07097d5445dbc70422663b2"; - sha256 = "1jbjviz8qi8izhvdvnbc5d9nqyxfww75ffcvxyhw5yxw9r1v0sn2"; - }; - } - { - goPackagePath = "github.com/agl/ed25519"; - fetch = { - type = "git"; - url = "https://github.com/agl/ed25519"; - rev = "5312a61534124124185d41f09206b9fef1d88403"; - sha256 = "1v8mhkf1m3ga5262s75vabskxvsw5rpqvi5nwhxwiv7gfk6h823i"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/bsm/go-vlq"; - fetch = { - type = "git"; - url = "https://github.com/bsm/go-vlq"; - rev = "ec6e8d4f5f4ec0f6e808ffc7f4dcc7516d4d7d49"; - sha256 = "13nhgpigaqdvcksi6jrav0rqr5mzqkx3wrsans9ql89nva51r9sz"; - }; - } - { - goPackagePath = "github.com/martinboehm/btcd"; - fetch = { - type = "git"; - url = "https://github.com/martinboehm/btcd"; - rev = "8e7c0427fee5d4778c5d4eb987150369e3ca1d0e"; - sha256 = "10fwzl8hzqpsq1rk5iz3xs8hbn3wqans12hszvlxlmm2xb0f6z9b"; - }; - } - { - goPackagePath = "github.com/btcsuite/btclog"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/btclog"; - rev = "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a"; - sha256 = "02dl46wcnfpg9sqvg0ipipkpnd7lrf4fnvb9zy56jqa7mfcwc7wk"; - }; - } - { - goPackagePath = "github.com/dchest/blake256"; - fetch = { - type = "git"; - url = "https://github.com/dchest/blake256"; - rev = "dee3fe6eb0e98dc774a94fc231f85baf7c29d360"; - sha256 = "18hkfm1zlkf6fsjzljiz5cjxxcf3kl5p9617si8xjggb33adzhyg"; - }; - } - { - goPackagePath = "github.com/deckarep/golang-set"; - fetch = { - type = "git"; - url = "https://github.com/deckarep/golang-set"; - rev = "1d4478f51bed434f1dadf96dcd9b43aabac66795"; - sha256 = "01kaqrc5ywbwa46b6lz3db7kkg8q6v383h4lnxds4z3kjglkqaff"; - }; - } - { - goPackagePath = "github.com/decred/base58"; - fetch = { - type = "git"; - url = "https://github.com/decred/base58"; - rev = "dbeddd8aab76c31eb2ea98351a63fa2c6bf46888"; - sha256 = "0fm0gsz5myin4n15gx3fhi9pk82p6v0sxza945yvny7n13q44ns5"; - }; - } - { - goPackagePath = "github.com/decred/dcrd"; - fetch = { - type = "git"; - url = "https://github.com/decred/dcrd"; - rev = "e3e8c47c68b010dbddeb783ebad32a3a4993dd71"; - sha256 = "0zifsxhrjx282kvsqj80qr3v4af8hx4g6dqvrb6xggpkcaski8b4"; - }; - } - { - goPackagePath = "github.com/decred/slog"; - fetch = { - type = "git"; - url = "https://github.com/decred/slog"; - rev = "fbd821ef791ba2b8ae945f5d44f4e49396d230c5"; - sha256 = "0n3c7saiv4j22kjc1pf3771n6khx4g99n8vn4qvvv0i5vv04585n"; - }; - } - { - goPackagePath = "github.com/ethereum/go-ethereum"; - fetch = { - type = "git"; - url = "https://github.com/ethereum/go-ethereum"; - rev = "24d727b6d6e2c0cde222fa12155c4a6db5caaf2e"; - sha256 = "0vrhwfavx3gciihf406f2qfrhvhnygvlj2icbswq0d01dx3s566m"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "259ab82a6cad3992b4e21ff5cac294ccb06474bc"; - sha256 = "0irkqifyj84cbnq4n66ax2r591id2285diw5hzcz2k3bga8d8lqr"; - }; - } - { - goPackagePath = "github.com/gobuffalo/packr"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/packr"; - rev = "5a2cbb54c4e7d482e3f518c56f1f86f133d5204f"; - sha256 = "0hs62w1bv96zzfqqmnq18w71v0kmh4qrqpkf2y8qngvwgan761gd"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "1adfc126b41513cc696b209667c8656ea7aac67c"; - sha256 = "1j7azzlnihcvnd1apw5zr0bz30h7n0gyimqqkgc76vzb1n5dpi7m"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "925541529c1fa6821df4e44ce2723319eb2be768"; - sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "553a641470496b2327abcac10b36396bd98e45c9"; - sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"; - sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1"; - }; - } - { - goPackagePath = "github.com/martinboehm/bchutil"; - fetch = { - type = "git"; - url = "https://github.com/martinboehm/bchutil"; - rev = "6373f11b6efe1ea81e8713b8788a695b2c144d38"; - sha256 = "1wp7ixa0n0jj7y9phxm6p3fymc2555fb2k71s91jhis14fil2jim"; - }; - } - { - goPackagePath = "github.com/martinboehm/btcutil"; - fetch = { - type = "git"; - url = "https://github.com/martinboehm/btcutil"; - rev = "a3d2b8457b77d37c3813742d4030e199b6e09111"; - sha256 = "0152cyabklv9l39dm1g30jb7hzdv9rj45mp3v9x4kvaza58nz0x4"; - }; - } - { - goPackagePath = "github.com/juju/errors"; - fetch = { - type = "git"; - url = "https://github.com/juju/errors"; - rev = "c7d06af17c68cd34c835053720b21f6549d9b0ee"; - sha256 = "1dmj8wkpmkw4z4c7wmnscs4ykrcv7p8lgwb75g5akahwqjaf9zcp"; - }; - } - { - goPackagePath = "github.com/martinboehm/golang-socketio"; - fetch = { - type = "git"; - url = "https://github.com/martinboehm/golang-socketio"; - rev = "f60b0a8befde091474a624a8ffd81ee9912957b3"; - sha256 = "1zln03qgzzbkr7zwm7ah1iikjdnipacp60bbg9lzkxsdcw2h1vd5"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "3247c84500bff8d9fb6d579d800f20b3e091582c"; - sha256 = "12hcych25wf725zxdkpnyx4wa0gyxl8v4m8xmhdmmaki9bbmqd0d"; - }; - } - { - goPackagePath = "github.com/mr-tron/base58"; - fetch = { - type = "git"; - url = "https://github.com/mr-tron/base58"; - rev = "c1bdf7c52f59d6685ca597b9955a443ff95eeee6"; - sha256 = "1dq6i8619manxdhb0fwhdm9ar23kx88pc2xwl1pjla9djrgql6a8"; - }; - } - { - goPackagePath = "github.com/pebbe/zmq4"; - fetch = { - type = "git"; - url = "https://github.com/pebbe/zmq4"; - rev = "5b443b6471cea4b4f9f85025530c04c93233f76a"; - sha256 = "0vnwlabrlrzszqyfbw4vypalhsxi4l4ywcbjhfhwl1fpvcph5dar"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "c5b7fccd204277076155f10851dad72b76a49317"; - sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"; - sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "d0f7cd64bda49e08b22ae8a730aa57aa0db125d6"; - sha256 = "1d4hfbb66xsf0wq317fwhgrwakqzhvryw4d7ip851lwrpql5fqcx"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "8b1c2da0d56deffdbb9e48d4414b4e674bd8083e"; - sha256 = "0x128p15h35mgwqxkigfkk1lfrcz9g697ahl8v6xp9kwvcqvjrrf"; - }; - } - { - goPackagePath = "github.com/rs/cors"; - fetch = { - type = "git"; - url = "https://github.com/rs/cors"; - rev = "feef513b9575b32f84bafa580aad89b011259019"; - sha256 = "0wjm0yjsnxhnp6924mq8v04srqa8sxrlnd7rkb19h4j6b9zagsik"; - }; - } - { - goPackagePath = "github.com/schancel/cashaddr-converter"; - fetch = { - type = "git"; - url = "https://github.com/schancel/cashaddr-converter"; - rev = "0a38f5822f795dc3727b4caacc298e02938d9eb1"; - sha256 = "0d0dsn029yckgjp26vkmg7r476hb6b9ayf2njcgdi648ln8rrad8"; - }; - } - { - goPackagePath = "github.com/syndtr/goleveldb"; - fetch = { - type = "git"; - url = "https://github.com/syndtr/goleveldb"; - rev = "714f901b98fdb3aa954b4193d8cbd64a28d80cad"; - sha256 = "0fn70vzqmww5v2xy0lamc319vrmfpza085d196cffhfw0jzw9i18"; - }; - } - { - goPackagePath = "github.com/tecbot/gorocksdb"; - fetch = { - type = "git"; - url = "https://github.com/tecbot/gorocksdb"; - rev = "214b6b7bc0f06812ab5602fdc502a3e619916f38"; - sha256 = "1mqpp14z4igr9jip39flpd7nf4rhr3z85y8mg74jjl1yrnwrwsld"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "a832865fa7ada6126f4c6124ac49f71be71bff2a"; - sha256 = "0bikp74pdi9fsvfdgy0k0r8ipzz96hy28zm8qpky0vdbwqci0a8p"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "61147c48b25b599e5b561d2e9c4f3e1ef489ca41"; - sha256 = "1520pdlw9a9s41ad1cf1z6y2ff4j96zbn82qffrxqk02bqlr9f5w"; - }; - } - { - goPackagePath = "gopkg.in/karalabe/cookiejar.v2"; - fetch = { - type = "git"; - url = "https://github.com/karalabe/cookiejar"; - rev = "8dcd6a7f4951f6ff3ee9cbb919a06d8925822e57"; - sha256 = "1dbizcklsfn6b5i182nf9pgkk4ac8jnmq8zix73si7x2n53wyb3b"; - }; - } - { - goPackagePath = "gopkg.in/natefinch/npipe.v2"; - fetch = { - type = "git"; - url = "https://github.com/natefinch/npipe"; - rev = "c1b8fa8bdccecb0b8db834ee0b92fdbcfa606dd6"; - sha256 = "1qplrvhks05pay169d9lph3hl7apdam4vj1kx3yzik7cphx6b24f"; - }; - } -] \ No newline at end of file diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index ee8925e117099..4b18e73284f95 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libusb, pkgconfig, pmutils, udev} : +{ stdenv, fetchgit, libusb1, pkgconfig, pmutils, udev} : let @@ -22,7 +22,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb pmutils udev ]; + buildInputs = [ libusb1 pmutils udev ]; # shell thing didn't work so i replaced it using nix prePatch = '' @@ -53,7 +53,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.tinkerforge.com/; + homepage = "https://www.tinkerforge.com/"; description = "A daemon (or service on Windows) that acts as a bridge between the Bricks/Bricklets and the API bindings for the different programming languages"; maintainers = [ stdenv.lib.maintainers.qknight ]; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index bcd4b7065b587..415f85371850d 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "0jrhwmr6gggppskg5h450wybzkv17iq69dgw36hd1dp56q002i7g"; }; - modSha256 = "1gc0xvsihr4zp7hkrdfrplvzkaphz1y4q53rgwn2jhd8s98l57an"; + vendorSha256 = "09vnci9pp8zp7bvn8zj68wslz2nc54nhcd0ll31sqfjbp00215mj"; preBuild = '' cat << EOF > caddy/main.go @@ -33,4 +33,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ rushmorem fpletz zimbatm filalex77 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/caddy/v2.nix b/pkgs/servers/caddy/v2.nix index 35c1f497850a8..c4f12e58b0fa4 100644 --- a/pkgs/servers/caddy/v2.nix +++ b/pkgs/servers/caddy/v2.nix @@ -1,10 +1,8 @@ -{ stdenv, callPackage, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "caddy"; - version = "2.0.0-rc.1"; - - goPackagePath = "github.com/caddyserver/caddy"; + version = "2.0.0"; subPackages = [ "cmd/caddy" ]; @@ -12,9 +10,9 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "0ir394nmdrqvslghqky4d2py65ff77fqsp0nmxdlsdps49szwh7h"; + sha256 = "1c1frfx0qkprhf4var70cncvrw8s9gjag2hygndbd9055hb52bvv"; }; - modSha256 = "0sqnw81l73gssnpd4dsl3vd10584riq0417z4dvbhjnc8b3z4xwv"; + vendorSha256 = "004hpjxpp18f71vy5v5ky0g07a8d5xh5qwl5b4bbx34hpf8yxs81"; meta = with stdenv.lib; { homepage = "https://caddyserver.com"; diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix index c9a39b691e7c6..c62a28e41bdf9 100644 --- a/pkgs/servers/cayley/default.nix +++ b/pkgs/servers/cayley/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { ''; meta = { - homepage = https://cayley.io/; + homepage = "https://cayley.io/"; description = "A graph database inspired by Freebase and Knowledge Graph"; maintainers = with stdenv.lib.maintainers; [ sigma ]; license = stdenv.lib.licenses.asl20; diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix index 2fb5b40350869..e819931002742 100644 --- a/pkgs/servers/cloud-print-connector/default.nix +++ b/pkgs/servers/cloud-print-connector/default.nix @@ -54,7 +54,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Share printers from your Windows, Linux, FreeBSD or macOS computer with ChromeOS and Android devices, using the Cloud Print Connector"; - homepage = https://github.com/google/cloud-print-connector; + homepage = "https://github.com/google/cloud-print-connector"; license = licenses.bsd3; maintainers = with maintainers; [ hodapp ]; # TODO: Fix broken build on macOS. The GitHub presently lists the diff --git a/pkgs/servers/computing/slurm-spank-x11/default.nix b/pkgs/servers/computing/slurm-spank-x11/default.nix index 13fad7059afec..bb7885025d191 100644 --- a/pkgs/servers/computing/slurm-spank-x11/default.nix +++ b/pkgs/servers/computing/slurm-spank-x11/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/hautreux/slurm-spank-x11; + homepage = "https://github.com/hautreux/slurm-spank-x11"; description = "Plugin for SLURM to allow for interactive X11 sessions"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 18ef3bf3fa554..1554fb69f1969 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.schedmd.com/; + homepage = "http://www.schedmd.com/"; description = "Simple Linux Utility for Resource Management"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index 8335e40de98f5..d55dd14601e8b 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - homepage = http://storm.apache.org; + homepage = "http://storm.apache.org"; description = "Distributed realtime computation system"; license = licenses.asl20; maintainers = with maintainers; [ edwtjo vizanto ]; diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index 8eb12a1b81124..0941ca969223c 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux -, file, libtool, which, boost, autoreconfHook +, coreutils, file, libtool, which, boost, autoreconfHook }: stdenv.mkDerivation rec { @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { --replace "contrib/init.d contrib/systemd" "" substituteInPlace src/cmds/Makefile.am \ --replace "/etc/" "$out/etc/" + substituteInPlace src/mom_rcp/pathnames.h \ + --replace /bin/cp ${coreutils}/bin/cp + substituteInPlace src/resmom/requests.c \ + --replace /bin/cp ${coreutils}/bin/cp ''; preConfigure = '' @@ -61,7 +65,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.adaptivecomputing.com/products/open-source/torque; + homepage = "http://www.adaptivecomputing.com/products/open-source/torque"; description = "Resource management system for submitting and controlling jobs on supercomputers, clusters, and grids"; platforms = platforms.linux; license = "TORQUEv1.1"; diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix index 93794ce7052ee..52023b39812f8 100644 --- a/pkgs/servers/confluent-platform/default.nix +++ b/pkgs/servers/confluent-platform/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.confluent.io/; + homepage = "https://www.confluent.io/"; description = "Confluent event streaming platform based on Apache Kafka"; license = licenses.asl20; maintainers = [ maintainers.offline ]; diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 6a356e73c95e0..a702626e1c141 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -1,12 +1,10 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "consul"; - version = "1.7.2"; + version = "1.7.3"; rev = "v${version}"; - goPackagePath = "github.com/hashicorp/consul"; - # Note: Currently only release tags are supported, because they have the Consul UI # vendored. See # https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834 @@ -19,16 +17,28 @@ buildGoPackage rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "1q587d8aqfkwg4fymr56fnf038vkxbdqz5yilz96dzny27dhspj4"; + sha256 = "05p893mfdrlf5fy9ywwnqb7blw1ffidgviyyh6a3bp82wk49f8ph"; }; + passthru.tests.consul = nixosTests.consul; + + # This corresponds to paths with package main - normally unneeded but consul + # has a split module structure in one repo + subPackages = ["." "connect/certgen"]; + + vendorSha256 = "1lcpldkssbq6qkkq22bvx9jb5klcxr8422mpx47wz39pry8vy9b6"; + deleteVendor = true; + preBuild = '' - buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=") + buildFlagsArray+=("-ldflags" + "-X github.com/hashicorp/consul/version.GitDescribe=v${version} + -X github.com/hashicorp/consul/version.Version=${version} + -X github.com/hashicorp/consul/version.VersionPrerelease=") ''; meta = with stdenv.lib; { description = "Tool for service discovery, monitoring and configuration"; - homepage = https://www.consul.io/; + homepage = "https://www.consul.io/"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; maintainers = with maintainers; [ pradeepchhetri vdemeester nh2 ]; diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index 2d7acda90af51..5a209549d352f 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://corosync.org/; + homepage = "http://corosync.org/"; description = "A Group Communication System with features for implementing high availability within applications"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 2fbd0bbfb3da5..f50a5afa81e79 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -1,22 +1,24 @@ -{ stdenv, fetchFromGitHub, openssl, libevent }: +{ stdenv, fetchFromGitHub, fetchpatch, openssl, libevent }: stdenv.mkDerivation rec { pname = "coturn"; - version = "4.5.1.1"; + version = "4.5.1.2"; src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; rev = version; - sha256 = "12x604lgva1d3g4wvl3f66rdj6lkjk5cqr0l3xas33xgzgm13pwr"; + sha256 = "01y65az8qyv2kjnb4fj7rgl4zq5pc2b286gfn727x3hfhksx9zp2"; }; buildInputs = [ openssl libevent ]; - patches = [ ./pure-configure.patch ]; + patches = [ + ./pure-configure.patch + ]; meta = with stdenv.lib; { - homepage = https://coturn.net/; + homepage = "https://coturn.net/"; license = with licenses; [ bsd3 ]; description = "A TURN server"; platforms = platforms.all; diff --git a/pkgs/servers/couchpotato/default.nix b/pkgs/servers/couchpotato/default.nix index 07ff725f7c9c7..40941123ebc42 100644 --- a/pkgs/servers/couchpotato/default.nix +++ b/pkgs/servers/couchpotato/default.nix @@ -36,7 +36,7 @@ buildPythonApplication rec { meta = { description = "Automatic movie downloading via NZBs and torrents"; license = lib.licenses.gpl3; - homepage = https://couchpota.to/; + homepage = "https://couchpota.to/"; maintainers = with lib.maintainers; [ fadenb ]; }; } diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix index 29d00caa02363..514b6873a1a8c 100644 --- a/pkgs/servers/demoit/default.nix +++ b/pkgs/servers/demoit/default.nix @@ -17,7 +17,7 @@ buildGoPackage { meta = with stdenv.lib; { description = "Live coding demos without Context Switching"; - homepage = https://github.com/dgageot/demoit; + homepage = "https://github.com/dgageot/demoit"; license = licenses.asl20; maintainers = [ maintainers.freezeboy ]; }; diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 799b73294e80b..09a3cd877ab9f 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -22,8 +22,8 @@ buildGoPackage rec { ]; postInstall = '' - mkdir -p $bin/share - cp -r $src/web $bin/share/web + mkdir -p $out/share + cp -r $src/web $out/share/web ''; meta = with lib; { diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index d2a6dc9df1576..ea549cd79677c 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flexible dictionary server and client implementing RFC 2229"; - homepage = https://www.gnu.org/software/dico/; + homepage = "https://www.gnu.org/software/dico/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux; diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix index c96f3b5c477a8..fbffecbafafe6 100644 --- a/pkgs/servers/dict/default.nix +++ b/pkgs/servers/dict/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Dict protocol server and client"; - homepage = http://www.dict.org; + homepage = "http://www.dict.org"; license = licenses.gpl2; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index 442ef45d1bff9..3ff36d4c62e45 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -29,35 +29,35 @@ let }; in rec { deu2eng = makeDictdDBFreedict (fetchurl { - url = mirror://sourceforge/freedict/deu-eng.tar.gz; + url = "mirror://sourceforge/freedict/deu-eng.tar.gz"; sha256 = "0dqrhv04g4f5s84nbgisgcfwk5x0rpincif0yfhfh4sc1bsvzsrb"; }) "deu-eng" "de_DE"; eng2deu = makeDictdDBFreedict (fetchurl { - url = mirror://sourceforge/freedict/eng-deu.tar.gz; + url = "mirror://sourceforge/freedict/eng-deu.tar.gz"; sha256 = "01x12p72sa3071iff3jhzga8588440f07zr56r3x98bspvdlz73r"; }) "eng-deu" "en_EN"; nld2eng = makeDictdDBFreedict (fetchurl { - url = mirror://sourceforge/freedict/nld-eng.tar.gz; + url = "mirror://sourceforge/freedict/nld-eng.tar.gz"; sha256 = "1vhw81pphb64fzsjvpzsnnyr34ka2fxizfwilnxyjcmpn9360h07"; }) "nld-eng" "nl_NL"; eng2nld = makeDictdDBFreedict (fetchurl { - url = mirror://sourceforge/freedict/eng-nld.tar.gz; + url = "mirror://sourceforge/freedict/eng-nld.tar.gz"; sha256 = "0rcg28ldykv0w2mpxc6g4rqmfs33q7pbvf68ssy1q9gpf6mz7vcl"; }) "eng-nld" "en_UK"; eng2rus = makeDictdDBFreedict (fetchurl { - url = mirror://sourceforge/freedict/eng-rus.tar.gz; + url = "mirror://sourceforge/freedict/eng-rus.tar.gz"; sha256 = "15409ivhww1wsfjr05083pv6mg10bak8v5pg1wkiqybk7ck61rry"; }) "eng-rus" "en_UK"; fra2eng = makeDictdDBFreedict (fetchurl { - url = mirror://sourceforge/freedict/fra-eng.tar.gz; + url = "mirror://sourceforge/freedict/fra-eng.tar.gz"; sha256 = "0sdd88s2zs5whiwdf3hd0s4pzzv75sdsccsrm1wxc87l3hjm85z3"; }) "fra-eng" "fr_FR"; eng2fra = makeDictdDBFreedict (fetchurl { - url = mirror://sourceforge/freedict/eng-fra.tar.gz; + url = "mirror://sourceforge/freedict/eng-fra.tar.gz"; sha256 = "0fi6rrnbqnhc6lq8d0nmn30zdqkibrah0mxfg27hsn9z7alwbj3m"; }) "eng-fra" "en_UK"; mueller_eng2rus_pkg = makeDictdDB (fetchurl { - url = mirror://sourceforge/mueller-dict/mueller-dict-3.1.tar.gz; + url = "mirror://sourceforge/mueller-dict/mueller-dict-3.1.tar.gz"; sha256 = "04r5xxznvmcb8hkxqbjgfh2gxvbdd87jnhqn5gmgvxxw53zpwfmq"; }) "mueller-eng-rus" "mueller-dict-*/dict" "en_UK"; mueller_enru_abbr = { diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix index b7dbf04026d2f..2207f2c36dfb7 100644 --- a/pkgs/servers/dict/dictd-wiktionary.nix +++ b/pkgs/servers/dict/dictd-wiktionary.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "DICT version of English Wiktionary"; - homepage = http://en.wiktionary.org/; + homepage = "http://en.wiktionary.org/"; maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix index 2c97101d9cbb6..0afdf442d2330 100644 --- a/pkgs/servers/dict/dictd-wordnet.nix +++ b/pkgs/servers/dict/dictd-wordnet.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { the wordnet data available to dictd and by extension for lookup with the dict command. ''; - homepage = https://wordnet.princeton.edu/; + homepage = "https://wordnet.princeton.edu/"; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index bdbff4c00f786..a7581ccbb1199 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -10,11 +10,11 @@ assert enablePython -> python3 != null; stdenv.mkDerivation rec { pname = "bind"; - version = "9.14.11"; + version = "9.14.12"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz"; - sha256 = "1v4y9308w0gd98gjzni4cgxmh8g1s37lbnnkyhsn70xs3xki5b4c"; + sha256 = "1j7ldvdschmvzxrbajjhmdsl2iqxc1lm64vk0a5sdykxpy9y8kcw"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { doCheck = false; # requires root and the net meta = with stdenv.lib; { - homepage = https://www.isc.org/downloads/bind/; + homepage = "https://www.isc.org/downloads/bind/"; description = "Domain name server"; license = licenses.mpl20; diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index cbf29b5d7c753..598f5bedc2bfe 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "18c02ss0sxxg8lkhdmyaac2x5alfxsizf6jqhck8bqkf6hiyv5hc"; }; - modSha256 = "07mlprwa37s6qpg5wvpljbvkiqcvrcljr27qsdwz49wldhdp6im6"; + vendorSha256 = "0ykhqsz4a7bkkxcg7w23jl3qs36law1f8l1b5r3i26qlamibqxl7"; meta = with stdenv.lib; { homepage = "https://coredns.io"; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ rushmorem rtreffer deltaevo ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/dns/doh-proxy/default.nix b/pkgs/servers/dns/doh-proxy/default.nix index d94f34ebd21fc..e65021599ad41 100644 --- a/pkgs/servers/dns/doh-proxy/default.nix +++ b/pkgs/servers/dns/doh-proxy/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://facebookexperimental.github.io/doh-proxy/; + homepage = "https://facebookexperimental.github.io/doh-proxy/"; description = "A proof of concept DNS-Over-HTTPS proxy"; license = licenses.bsd3; maintainers = [ maintainers.qyliss ]; diff --git a/pkgs/servers/dns/https-dns-proxy/default.nix b/pkgs/servers/dns/https-dns-proxy/default.nix new file mode 100644 index 0000000000000..6f2cb5048034d --- /dev/null +++ b/pkgs/servers/dns/https-dns-proxy/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, gtest, c-ares, curl, libev }: + +stdenv.mkDerivation rec { + pname = "https-dns-proxy"; + # there are no stable releases (yet?) + version = "unstable-20200419"; + + src = fetchFromGitHub { + owner = "aarond10"; + repo = "https_dns_proxy"; + rev = "79fc7b085e3b1ad64c8332f7115dfe2bf5f1f3e4"; + sha256 = "1cdfswfjby4alp6gy7yyjm76kfyclh5ax0zadnqs2pyigg9plh0b"; + }; + + nativeBuildInputs = [ cmake gtest ]; + + buildInputs = [ c-ares curl libev ]; + + installPhase = '' + install -Dm555 -t $out/bin https_dns_proxy + install -Dm444 -t $out/share/doc/${pname} ../{LICENSE,README}.* + ''; + + # upstream wants to add tests and the gtest framework is in place, so be ready + # for when that happens despite there being none as of right now + doCheck = true; + + meta = with stdenv.lib; { + description = "DNS to DNS over HTTPS (DoH) proxy"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 7756c5fa3f194..3dc6fd3e2c73e 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -8,11 +8,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { pname = "knot-dns"; - version = "2.9.3"; + version = "2.9.5"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "f2adf137d70955a4a20df90c5409e10be8e1127204a98b27d626ac090531a07e"; + sha256 = "1109a8ba212ff8ddfdbaf44a6f8fc13a2b880a98a9e54c19112ba72a1aacbf76"; }; outputs = [ "bin" "out" "dev" ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Authoritative-only DNS server from .cz domain registry"; - homepage = https://knot-dns.cz; + homepage = "https://knot-dns.cz"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index ccb9a85905903..f596934a4298a 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -16,21 +16,13 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.0.1"; + version = "5.1.1"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "4a93264ad0cda7ea2252d1ba057e474722f77848165f2893e0c76e21ae406415"; + sha256 = "f72214046df8aae2b1a5c6d1ad0bc8b166aa060df5b008f6e88b4f6ba79cbf4e"; }; - patches = [ - (fetchpatch { # merged to upstream master, remove on update - name = "zfs-cpu-usage.diff"; - url = "https://gitlab.labs.nic.cz/knot/knot-resolver/merge_requests/946.diff"; - sha256 = "0mcvx4pfnl19h6zrv2fcgxdjarqzczn2dz85sylcczsfvdmn6i5m"; - }) - ]; - outputs = [ "out" "dev" ]; # Path fixups for the NixOS service. @@ -85,7 +77,7 @@ unwrapped = stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Caching validating DNS resolver, from .cz domain registry"; - homepage = https://knot-resolver.cz; + homepage = "https://knot-resolver.cz"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.vcunat /* upstream developer */ ]; diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index d815771c66cb6..43c2900443e20 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "15qy25210j9nq2i3pm8rwphnc6b5gq83js10078fvw9hbmjps03s"; + sha256 = "11w9kl99fs888f3zwx2j92i8lcp78vq91jac8s317a2icv74mczl"; }; prePatch = '' diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 7d6fa7d9c91b3..10a18ab1d4583 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "13v2iah7z10wc43v9agcjrzi3wds4jna8f0b7ph35nyzhzr31h9b"; + sha256 = "1n9gymis0h1grgg63ig3kk9cb27ayy1w6s8hcn8n4g5dzi90h8sl"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 129fec2895b09..b1eae68b891bd 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Authoritative DNS server"; - homepage = https://www.powerdns.com; + homepage = "https://www.powerdns.com"; platforms = platforms.unix; broken = stdenv.isDarwin; license = licenses.gpl2; diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index 7780d900badfd..9a6580353fc23 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -1,32 +1,37 @@ -{ lib, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs }: +{ lib, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs, nixosTests }: buildGoModule rec { pname = "documize-community"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "documize"; repo = "community"; rev = "v${version}"; - sha256 = "1pcldf9lqvpb2h2a3kr3mahj2v1jasjwrszj6czjmkyml7x2sz7c"; + sha256 = "0jrqab0c2nnw8632g1f6zll3dycn7xyk01ycmn969i5qxx70am50"; }; - modSha256 = "1z0v7n8klaxcqv7mvzf3jzgrp78zb4yiibx899ppk6i5qnj4xiv0"; + vendorSha256 = null; nativeBuildInputs = [ go-bindata go-bindata-assetfs ]; - subPackages = [ "edition/community.go" ]; + # This is really weird, but they've managed to screw up + # their folder structure enough, you can only build by + # literally cding into this folder. + preBuild = "cd edition"; + + subPackages = [ "." ]; + + passthru.tests = { inherit (nixosTests) documize; }; postInstall = '' - # `buildGoModule` calls `go install` (without `go build` first), so - # `-o bin/documize` doesn't work. - mv $out/bin/community $out/bin/documize + mv $out/bin/edition $out/bin/documize ''; meta = with lib; { description = "Open source Confluence alternative for internal & external docs built with Golang + EmberJS"; license = licenses.agpl3; maintainers = with maintainers; [ ma27 elseym ]; - homepage = https://www.documize.com/; + homepage = "https://www.documize.com/"; }; } diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix index b3402933f9fef..18952d01c91db 100644 --- a/pkgs/servers/echoip/default.nix +++ b/pkgs/servers/echoip/default.nix @@ -11,7 +11,7 @@ buildGoModule { sha256 = "17gkh1qfxasvxy25lmjdwk5fsjkcp7lmw9si3xzf01m7qnj5zi4b"; }; - modSha256 = "025p891klwpid5fw4z39fimgfkwgkcwqpn5276hflzdp1hfv35ly"; + vendorSha256 = "0vvs717pl5gzggxpbn2vkyxmpiw5zjdfnpbh8i81xidbqvlnm22h"; outputs = [ "out" "index" ]; @@ -21,8 +21,8 @@ buildGoModule { ''; meta = with lib; { - homepage = https://github.com/mpolden/echoip; + homepage = "https://github.com/mpolden/echoip"; license = licenses.bsd3; maintainers = with maintainers; [ rvolosatovs ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/elasticmq/default.nix b/pkgs/servers/elasticmq/default.nix index c1216becaf3d5..1ea669f573f07 100644 --- a/pkgs/servers/elasticmq/default.nix +++ b/pkgs/servers/elasticmq/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/adamw/elasticmq; + homepage = "https://github.com/adamw/elasticmq"; description = "Message queueing system with Java, Scala and Amazon SQS-compatible interfaces"; longDescription = '' diff --git a/pkgs/servers/etcd/3.4.nix b/pkgs/servers/etcd/3.4.nix new file mode 100644 index 0000000000000..699ec033d3f37 --- /dev/null +++ b/pkgs/servers/etcd/3.4.nix @@ -0,0 +1,36 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "etcd"; + version = "3.4.9"; + + #vendorSha256 = null; revert to `null` for > 3.4.9 + + vendorSha256 = "1fhrycl8m8ddb7mwasbyfiwrl4d9lfdk7zd3mxb7ahkipdp2c94z"; + deleteVendor = true; + + src = fetchFromGitHub { + owner = "etcd-io"; + repo = "etcd"; + rev = "v${version}"; + sha256 = "16l4wmnm7mkhpb2vzf6xnhhyx6lj8xx3z6x1bfs05idajnrw824p"; + }; + + buildPhase = '' + patchShebangs . + ./build + ./functional/build + ''; + + installPhase = '' + install -Dm755 bin/* bin/functional/cmd/* -t $out/bin + ''; + + meta = with lib; { + description = "Distributed reliable key-value store for the most critical data of a distributed system"; + license = licenses.asl20; + homepage = "https://etcd.io/"; + maintainers = with maintainers; [ offline zowoq ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 5a693fd75291e..4c0df659f3ed8 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -1,33 +1,39 @@ -{ lib, libpcap, buildGoPackage, fetchFromGitHub }: - -with lib; +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "etcd"; - version = "3.3.13"; # After updating check that nixos tests pass - rev = "v${version}"; + version = "3.3.22"; goPackagePath = "github.com/coreos/etcd"; src = fetchFromGitHub { - inherit rev; - owner = "coreos"; + owner = "etcd-io"; repo = "etcd"; - sha256 = "1kac4qfr83f2hdz35403f1ald05wc85vvhw79vxb431n61jvyaqy"; + rev = "v${version}"; + sha256 = "1rd390qfx9k20j9gh1wp1g9ygc571f2kv1dg2wvqij3kwydhymcj"; }; - subPackages = [ - "cmd/etcd" - "cmd/etcdctl" - ]; + buildPhase = '' + cd go/src/${goPackagePath} + patchShebangs . + ./build + ./functional/build + ''; + + installPhase = '' + install -Dm755 bin/* bin/functional/cmd/* -t $out/bin + ''; - buildInputs = [ libpcap ]; + passthru.tests = with nixosTests; { + etcd = etcd; + etcd-cluster = etcd-cluster; + }; - meta = { + meta = with lib; { description = "Distributed reliable key-value store for the most critical data of a distributed system"; license = licenses.asl20; - homepage = https://coreos.com/etcd/; - maintainers = with maintainers; [offline]; - platforms = with platforms; linux; + homepage = "https://etcd.io/"; + maintainers = with maintainers; [ offline zowoq ]; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix index 1e05c856ab5eb..2d1ccaf6e26ce 100644 --- a/pkgs/servers/exhibitor/default.nix +++ b/pkgs/servers/exhibitor/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 ''; meta = with stdenv.lib; { - homepage = https://github.com/soabase/exhibitor; + homepage = "https://github.com/soabase/exhibitor"; description = "ZooKeeper co-process for instance monitoring, backup/recovery, cleanup and visualization"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index c8ddcf438f7b7..cd4d3116213f0 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://nginx.localdomain.pl/wiki/FcgiWrap; + homepage = "https://nginx.localdomain.pl/wiki/FcgiWrap"; description = "Simple server for running CGI applications over FastCGI"; maintainers = with maintainers; [ lethalman ]; platforms = with platforms; linux; diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix index 7be7416d04d59..486474a46b0f0 100644 --- a/pkgs/servers/felix/default.nix +++ b/pkgs/servers/felix/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-felix"; - version = "5.6.1"; + version = "6.0.3"; src = fetchurl { url = "mirror://apache/felix/org.apache.felix.main.distribution-${version}.tar.gz"; - sha256 = "0kis26iajzdid162j4i7g558q09x4hn9z7pqqys6ipb0fj84hz1x"; + sha256 = "1yk04q8rfbbabacbhmrsw5ywr96496x1cz4icdqimb1cfxixv1q0"; }; buildCommand = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "An OSGi gateway"; - homepage = https://felix.apache.org; + homepage = "https://felix.apache.org"; license = licenses.asl20; maintainers = [ maintainers.sander ]; }; diff --git a/pkgs/servers/fileshare/default.nix b/pkgs/servers/fileshare/default.nix index 42f280eed23bf..721efb313ebee 100644 --- a/pkgs/servers/fileshare/default.nix +++ b/pkgs/servers/fileshare/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.2.4"; src = fetchgit { - url = https://git.tkolb.de/Public/fileshare.git; + url = "https://git.tkolb.de/Public/fileshare.git"; rev = "v${version}"; sha256 = "03jrhk4vj6bc2w3lsrfjpfflb4laihysgs5i4cv097nr5cz32hyk"; }; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small HTTP Server for quickly sharing files over the network"; longDescription = "Fileshare is a simple tool for sharing the contents of a directory via a webserver and optionally allowing uploads."; - homepage = https://git.tkolb.de/Public/fileshare; + homepage = "https://git.tkolb.de/Public/fileshare"; license = licenses.mit; maintainers = [ maintainers.esclear ]; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index d80508bfe44cd..063eaec7dedea 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { meta = { description = "SQL relational database management system"; - homepage = https://www.firebirdnews.org; + homepage = "https://www.firebirdnews.org"; license = ["IDPL" "Interbase-1.0"]; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 512842b3a6a23..7ad27e78d3a8a 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -121,7 +121,7 @@ let meta = with stdenv.lib; { description = "Open source, distributed, transactional key-value store"; - homepage = https://www.foundationdb.org; + homepage = "https://www.foundationdb.org"; license = licenses.asl20; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/servers/foundationdb/python.nix b/pkgs/servers/foundationdb/python.nix index e4256fab0fa97..29d1f0906df74 100644 --- a/pkgs/servers/foundationdb/python.nix +++ b/pkgs/servers/foundationdb/python.nix @@ -16,7 +16,7 @@ buildPythonPackage { meta = with lib; { description = "Python bindings for FoundationDB"; - homepage = https://www.foundationdb.org; + homepage = "https://www.foundationdb.org"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ thoughtpolice ]; }; diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix index a7eedb8408b49..262ea39ca5b40 100644 --- a/pkgs/servers/foundationdb/vsmake.nix +++ b/pkgs/servers/foundationdb/vsmake.nix @@ -141,7 +141,7 @@ let meta = with gcc6Stdenv.lib; { description = "Open source, distributed, transactional key-value store"; - homepage = https://www.foundationdb.org; + homepage = "https://www.foundationdb.org"; license = licenses.asl20; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index c7d6c509f098b..9c80b7e7db397 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" ]; meta = with stdenv.lib; { - homepage = https://freeradius.org/; + homepage = "https://freeradius.org/"; description = "A modular, high performance free RADIUS suite"; license = licenses.gpl2; maintainers = with maintainers; [ sheenobu willibutz fpletz lheckemann elseym ]; diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index 34757462a176f..bb35ec075dde9 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { inherit version; description = "A minimal ftp server"; downloadPage = "http://bftpd.sf.net/download.html"; - homepage = http://bftpd.sf.net/; + homepage = "http://bftpd.sf.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix index 5f6e7d466cfd7..020d2967f3e52 100644 --- a/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, secure, production-quality and standard-conformant FTP server"; - homepage = https://www.pureftpd.org; + homepage = "https://www.pureftpd.org"; license = licenses.isc; # with some parts covered by BSD3(?) maintainers = [ maintainers.lethalman ]; platforms = platforms.linux; diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/servers/gobetween/default.nix index ff59ad53ed1ce..2b474d818ad2a 100644 --- a/pkgs/servers/gobetween/default.nix +++ b/pkgs/servers/gobetween/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, enableStatic ? false }: +{ rsync, buildGoModule, fetchFromGitHub, lib, runCommand, enableStatic ? false }: buildGoModule rec { pname = "gobetween"; @@ -10,14 +10,30 @@ buildGoModule rec { rev = version; sha256 = "f01593509ccece063acd47002c4fc52261fbbbcdbf14b088d813b7d8e38fcca8"; }; + patches = [ ./gomod.patch ]; - modSha256 = - "dd91838d20c99c73447590e43edd13c87755276f17ef3e53f24c5df3d0908f78"; + deleteVendor = true; buildPhase = '' - make build${lib.optionalString enableStatic "-static"} + make -e build${lib.optionalString enableStatic "-static"} ''; + lxd = fetchFromGitHub { + owner = "lxc"; + repo = "lxd"; + rev = "41efd98813f3b42f1752ff6c2c7569a054924623"; + sha256 = "02vnvjjkzl7b0i2cn03f1lb3jgj5rd3wdkii4pqi9bvmhzszg0l2"; + }; + + overrideModAttrs = (_: { + postBuild = '' + rm -r vendor/github.com/lxc/lxd + cp -r --reflink=auto ${lxd} vendor/github.com/lxc/lxd + ''; + }); + + vendorSha256 = "1pd0zrjwpw6yv2s86a818yy2ma2fkazd3sb2h6zfp9mvyixgxgri"; + installPhase = '' mkdir -p $out/bin cp bin/gobetween $out/bin diff --git a/pkgs/servers/gobetween/gomod.patch b/pkgs/servers/gobetween/gomod.patch new file mode 100644 index 0000000000000..98181e3fe794b --- /dev/null +++ b/pkgs/servers/gobetween/gomod.patch @@ -0,0 +1,21 @@ +diff --git a/go.mod b/go.mod +index 536631a..f91e862 100644 +--- a/go.mod ++++ b/go.mod +@@ -7,7 +7,7 @@ require ( + github.com/burntsushi/toml v0.3.1 + github.com/elgs/gojq v0.0.0-20160421194050-81fa9a608a13 + github.com/elgs/gosplitargs v0.0.0-20161028071935-a491c5eeb3c8 // indirect +- github.com/flosch/pongo2 v0.0.0-20181225140029-79872a7b2769 // indirect ++ github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4 // indirect + github.com/fsouza/go-dockerclient v1.3.6 + github.com/gin-contrib/cors v0.0.0-20190301062745-f9e10995c85a + github.com/gin-gonic/gin v1.3.0 +@@ -20,7 +20,6 @@ require ( + github.com/juju/go4 v0.0.0-20160222163258-40d72ab9641a // indirect + github.com/juju/persistent-cookiejar v0.0.0-20171026135701-d5e5a8405ef9 // indirect + github.com/juju/schema v0.0.0-20181210140654-64a6158e9071 // indirect +- github.com/juju/utils v0.0.0-20180820210520-bf9cc5bdd62d // indirect + github.com/juju/webbrowser v0.0.0-20180907093207-efb9432b2bcb // indirect + github.com/julienschmidt/httprouter v1.2.0 // indirect + github.com/lxc/lxd v0.0.0-20190314233831-41efd98813f3 diff --git a/pkgs/servers/gopher/gofish/default.nix b/pkgs/servers/gopher/gofish/default.nix index 1bec32e5125bc..d8091c4e98d68 100644 --- a/pkgs/servers/gopher/gofish/default.nix +++ b/pkgs/servers/gopher/gofish/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A lightweight Gopher server"; - homepage = http://gofish.sourceforge.net/; + homepage = "http://gofish.sourceforge.net/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix index 35c6e1452437a..3b9ed15a849c5 100644 --- a/pkgs/servers/gortr/default.nix +++ b/pkgs/servers/gortr/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "03wxlras2akk2ig8sxzs89nvbc6zr2kbcmjlqldjdfhs1rcg82ra"; }; - modSha256 = "157dpalfz3z1s3mxq63xy6lrkwzyy9xzmvn7wsxkwznjq4djv1a1"; + vendorSha256 = "1nwrzbpqycr4ixk8a90pgaxcwakv5nlfnql6hmcc518qrva198wp"; meta = with lib; { description = "The RPKI-to-Router server used at Cloudflare"; @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = with maintainers; [ petabyteboy ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index f2014aac9fdcd..5d305c1e41222 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "gotify-server"; - # Note that when this is updated, along with the hash, the `ui.nix` file - # should include the same changes to the version and the sha256. - version = "2.0.14"; + # should be update just like all other files imported like that via the + # `update.sh` script. + version = import ./version.nix; src = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - sha256 = "0hyy9fki2626cgd78l7fkk67lik6g1pkcpf6xr3gl07dxwcclyr8"; + sha256 = import ./source-sha.nix; }; - modSha256 = "1awhbc8qs2bwv6y2vwd92r4ys0l1bzymrb36iamr040x961682wv"; + vendorSha256 = import ./vendor-sha.nix; postPatch = '' substituteInPlace app.go \ @@ -38,6 +38,10 @@ buildGoModule rec { cp -r ${ui}/libexec/gotify-ui/deps/gotify-ui/build ui/build && packr ''; + passthru = { + updateScript = ./update.sh; + }; + # Otherwise, all other subpackages are built as well and from some reason, # produce binaries which panic when executed and are not interesting at all subPackages = [ "." ]; diff --git a/pkgs/servers/gotify/package.json b/pkgs/servers/gotify/package.json index 1c84de17f4638..7e8defe38588e 100644 --- a/pkgs/servers/gotify/package.json +++ b/pkgs/servers/gotify/package.json @@ -3,28 +3,29 @@ "version": "0.2.0", "private": true, "homepage": ".", + "proxy": "http://localhost:80", "dependencies": { - "@material-ui/core": "^4.4.3", - "@material-ui/icons": "^4.4.3", + "@material-ui/core": "^4.9.5", + "@material-ui/icons": "^4.9.1", "axios": "^0.19.0", "codemirror": "^5.43.0", - "detect-browser": "^3.0.0", + "detect-browser": "^5.1.0", "js-base64": "^2.5.1", "mobx": "^5.1.1", - "mobx-react": "^5.2.8", + "mobx-react": "^6.2.2", "mobx-utils": "^5.0.2", "notifyjs": "^3.0.0", "prop-types": "^15.6.2", "react": "^16.4.2", - "react-codemirror2": "^5.1.0", + "react-codemirror2": "^7.1.0", "react-dom": "^16.4.2", "react-infinite": "^0.13.0", "react-markdown": "^4.0.6", - "react-router": "^4.3.1", - "react-router-dom": "^4.3.1", + "react-router": "^5.1.2", + "react-router-dom": "^5.1.2", "react-timeago": "^4.1.9", "remove-markdown": "^0.3.0", - "typeface-roboto": "0.0.54" + "typeface-roboto": "0.0.75" }, "scripts": { "start": "react-scripts start", @@ -37,30 +38,30 @@ "testformat": "prettier \"src/**/*.{ts,tsx}\" --list-different" }, "devDependencies": { - "@types/codemirror": "0.0.71", - "@types/detect-browser": "^2.0.1", + "@types/codemirror": "0.0.91", + "@types/detect-browser": "^4.0.0", "@types/get-port": "^4.0.0", - "@types/jest": "^23.3.1", + "@types/jest": "^25.2.1", "@types/js-base64": "^2.3.1", - "@types/node": "^10.9.0", + "@types/node": "^13.13.5", "@types/notifyjs": "^3.0.0", - "@types/puppeteer": "^1.6.3", + "@types/puppeteer": "^2.0.1", "@types/react": "^16.4.11", "@types/react-dom": "^16.0.7", - "@types/react-infinite": "0.0.33", - "@types/react-router-dom": "^4.3.0", + "@types/react-infinite": "0.0.34", + "@types/react-router-dom": "^5.1.5", "@types/remove-markdown": "^0.1.1", - "@types/rimraf": "^2.0.2", - "get-port": "^4.0.0", - "prettier": "^1.14.2", - "puppeteer": "^1.8.0", - "react-scripts": "3.1.1", - "rimraf": "^2.6.2", + "@types/rimraf": "^3.0.0", + "get-port": "^5.1.1", + "prettier": "^2.0.5", + "puppeteer": "^3.0.4", + "react-scripts": "^3.4.1", + "rimraf": "^3.0.2", "tree-kill": "^1.2.0", - "tslint": "^5.20.0", + "tslint": "^6.1.2", "tslint-sonarts": "^1.7.0", - "typescript": "3.6.2", - "wait-on": "^3.0.1" + "typescript": "3.8.3", + "wait-on": "^5.0.0" }, "eslintConfig": { "extends": "react-app" diff --git a/pkgs/servers/gotify/source-sha.nix b/pkgs/servers/gotify/source-sha.nix new file mode 100644 index 0000000000000..ddac1b2461424 --- /dev/null +++ b/pkgs/servers/gotify/source-sha.nix @@ -0,0 +1 @@ +"18y2kaf0v7275a0b8ab5y3qk7qwh19aqxyy0gmlflzgr2nimpmrn" \ No newline at end of file diff --git a/pkgs/servers/gotify/ui.nix b/pkgs/servers/gotify/ui.nix index 403f01c2a856f..2a7f184308086 100644 --- a/pkgs/servers/gotify/ui.nix +++ b/pkgs/servers/gotify/ui.nix @@ -8,13 +8,13 @@ yarn2nix-moretea.mkYarnPackage rec { packageJSON = ./package.json; yarnNix = ./yarndeps.nix; - version = "2.0.14"; + version = import ./version.nix; src_all = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - sha256 = "0hyy9fki2626cgd78l7fkk67lik6g1pkcpf6xr3gl07dxwcclyr8"; + sha256 = import ./source-sha.nix; }; src = "${src_all}/ui"; diff --git a/pkgs/servers/gotify/update-yarn-deps.sh b/pkgs/servers/gotify/update-yarn-deps.sh deleted file mode 100755 index d25b5c429df27..0000000000000 --- a/pkgs/servers/gotify/update-yarn-deps.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../ -i bash -p wget yarn2nix-moretea.yarn2nix - -# This script is based upon: -# pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh - -set -euo pipefail - -if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then - echo "Regenerates the Yarn dependency lock files for the gotify-server package." - echo "Usage: $0 <git release tag>" - exit 1 -fi - -GOTIFY_WEB_SRC="https://raw.githubusercontent.com/gotify/server/$1" - -wget "$GOTIFY_WEB_SRC/ui/package.json" -O package.json -wget "$GOTIFY_WEB_SRC/ui/yarn.lock" -O yarn.lock -yarn2nix --lockfile=yarn.lock > yarndeps.nix -rm yarn.lock diff --git a/pkgs/servers/gotify/update.sh b/pkgs/servers/gotify/update.sh new file mode 100755 index 0000000000000..dc39a15be7393 --- /dev/null +++ b/pkgs/servers/gotify/update.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p wget yarn2nix-moretea.yarn2nix nix-prefetch-git jq + +set -euo pipefail + +dirname="$(dirname "$0")" + +latest_release=$(curl --silent https://api.github.com/repos/gotify/server/releases/latest) +version=$(jq -r '.tag_name' <<<"$latest_release") +echo got version $version +echo \""${version#v}"\" > "$dirname/version.nix" +printf '%s' $(nix-prefetch-git --quiet --rev ${version} https://github.com/gotify/server | jq .sha256) > $dirname/source-sha.nix +tput setaf 1 +echo zeroing vendorSha256 in $dirname/vendor-sha.nix +tput sgr0 +printf '"%s"' "0000000000000000000000000000000000000000000000000000" > $dirname/vendor-sha.nix + +GOTIFY_WEB_SRC="https://raw.githubusercontent.com/gotify/server/$version" + +curl --silent "$GOTIFY_WEB_SRC/ui/package.json" -o $dirname/package.json +echo downloaded package.json +curl --silent "$GOTIFY_WEB_SRC/ui/yarn.lock" -o $dirname/yarn.lock +echo downloaded yarndeps.nix +echo running yarn2nix +yarn2nix --lockfile=$dirname/yarn.lock > $dirname/yarndeps.nix +rm $dirname/yarn.lock +echo removed yarn.lock + +echo running nix-build for ui +nix-build -A gotify-server.ui +echo running nix-build for gotify itself in order to get vendorSha256 +set +e +vendorSha256="$(nix-build -A gotify-server 2>&1 | grep "got:" | cut -d':' -f3)" +set -e +printf '"%s"' "$vendorSha256" > $dirname/vendor-sha.nix +tput setaf 2 +echo got vendorSha256 of: $vendorSha256 +tput sgr0 +echo running nix-build -A gotify-server which should build gotify-server normally +nix-build -A gotify-server diff --git a/pkgs/servers/gotify/vendor-sha.nix b/pkgs/servers/gotify/vendor-sha.nix new file mode 100644 index 0000000000000..0705f436316d3 --- /dev/null +++ b/pkgs/servers/gotify/vendor-sha.nix @@ -0,0 +1 @@ +"1ha0zgz1n07sd3if6823fi83j7yajysjdzfbwqk9rpsi6zv3cfh3" \ No newline at end of file diff --git a/pkgs/servers/gotify/version.nix b/pkgs/servers/gotify/version.nix new file mode 100644 index 0000000000000..fdfe425152c39 --- /dev/null +++ b/pkgs/servers/gotify/version.nix @@ -0,0 +1 @@ +"2.0.16" diff --git a/pkgs/servers/gotify/yarndeps.nix b/pkgs/servers/gotify/yarndeps.nix index 3f74ad74ccc26..798c2787e34ef 100644 --- a/pkgs/servers/gotify/yarndeps.nix +++ b/pkgs/servers/gotify/yarndeps.nix @@ -2,747 +2,875 @@ offline_cache = linkFarm "offline" packages; packages = [ { - name = "_babel_code_frame___code_frame_7.5.5.tgz"; + name = "_babel_code_frame___code_frame_7.8.3.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz"; - sha1 = "bc0782f6d69f7b7d49531219699b988f669a8f9d"; + name = "_babel_code_frame___code_frame_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz"; + sha1 = "33e25903d7481181534e12ec0a25f16b6fcf419e"; }; } { - name = "_babel_core___core_7.5.5.tgz"; + name = "_babel_compat_data___compat_data_7.9.6.tgz"; path = fetchurl { - name = "_babel_core___core_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.5.5.tgz"; - sha1 = "17b2686ef0d6bc58f963dddd68ab669755582c30"; + name = "_babel_compat_data___compat_data_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.6.tgz"; + sha1 = "3f604c40e420131affe6f2c8052e9a275ae2049b"; }; } { - name = "_babel_generator___generator_7.5.5.tgz"; + name = "_babel_core___core_7.9.0.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.5.tgz"; - sha1 = "873a7f936a3c89491b43536d12245b626664e3cf"; + name = "_babel_core___core_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz"; + sha1 = "ac977b538b77e132ff706f3b8a4dbad09c03c56e"; }; } { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.0.0.tgz"; + name = "_babel_core___core_7.9.6.tgz"; path = fetchurl { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz"; - sha1 = "323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"; + name = "_babel_core___core_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz"; + sha1 = "d9aa1f580abf3b2286ef40b6904d390904c63376"; }; } { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.1.0.tgz"; + name = "_babel_generator___generator_7.9.6.tgz"; path = fetchurl { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz"; - sha1 = "6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"; + name = "_babel_generator___generator_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz"; + sha1 = "5408c82ac5de98cda0d77d8124e99fa1f2170a43"; }; } { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz"; - sha1 = "a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz"; + sha1 = "60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"; }; } { - name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz"; - sha1 = "87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz"; + sha1 = "c84097a427a061ac56a1c30ebf54b7b22d241503"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.5.5.tgz"; + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.9.5.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz"; - sha1 = "401f302c8ddbc0edd36f7c6b2887d8fa1122e5a4"; + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.5.tgz"; + sha1 = "0b4b3e04e6123f03b404ca4dfd6528fe6bb92fe3"; }; } { - name = "_babel_helper_define_map___helper_define_map_7.5.5.tgz"; + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.9.0.tgz"; path = fetchurl { - name = "_babel_helper_define_map___helper_define_map_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz"; - sha1 = "3dec32c2046f37e09b28c93eb0b103fd2a25d369"; + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz"; + sha1 = "16bf391990b57732700a3278d4d9a81231ea8d32"; }; } { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.1.0.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.9.6.tgz"; path = fetchurl { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz"; - sha1 = "537fa13f6f1674df745b0c00ec8fe4e99681c8f6"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz"; + sha1 = "1e05b7ccc9d38d2f8b40b458b380a04dcfadd38a"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.9.6.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz"; - sha1 = "a0ceb01685f73355d4360c1247f582bfafc8ff53"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz"; + sha1 = "965c8b0a9f051801fd9d3b372ca0ccf200a90897"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.8.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz"; - sha1 = "83572d4320e2a4657263734113c42868b64e49c3"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz"; + sha1 = "5d84180b588f560b7864efaeea89243e58312087"; }; } { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.4.4.tgz"; + name = "_babel_helper_define_map___helper_define_map_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz"; - sha1 = "0298b5f25c8c09c53102d52ac4a98f773eb2850a"; + name = "_babel_helper_define_map___helper_define_map_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz"; + sha1 = "a0655cad5451c3760b726eba875f1cd8faa02c15"; }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.5.5.tgz"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz"; - sha1 = "1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz"; + sha1 = "a728dc5b4e89e30fc2dfc7d04fa28a930653f982"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.9.5.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz"; - sha1 = "96081b7111e486da4d2cd971ad1a4fe216cc2e3d"; + name = "_babel_helper_function_name___helper_function_name_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz"; + sha1 = "2b53820d35275120e1874a82e5aabe1376920a5c"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.5.5.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz"; - sha1 = "f84ff8a09038dcbca1fd4355661a500937165b4a"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz"; + sha1 = "b894b947bd004381ce63ea1db9f08547e920abd5"; }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.0.0.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz"; - sha1 = "a2920c5702b073c15de51106200aa8cad20497d5"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz"; + sha1 = "1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.0.0.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz"; - sha1 = "bbb3fbee98661c569034237cc03967ba99b4f250"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz"; + sha1 = "659b710498ea6c1d9907e0c73f206eee7dadc24c"; }; } { - name = "_babel_helper_regex___helper_regex_7.5.5.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_regex___helper_regex_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz"; - sha1 = "0aa6824f7100a2e0e89c1527c23936c152cab351"; + name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz"; + sha1 = "7fe39589b39c016331b6b8c3f441e8f0b1419498"; }; } { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.1.0.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.9.0.tgz"; path = fetchurl { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz"; - sha1 = "361d80821b6f38da75bd3f0785ece20a88c5fe7f"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz"; + sha1 = "43b34dfe15961918707d247327431388e9fe96e5"; }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.5.5.tgz"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz"; - sha1 = "f84ce43df031222d2bad068d2626cb5799c34bc2"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz"; + sha1 = "7ed071813d09c75298ef4f208956006b6111ecb9"; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.1.0.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz"; - sha1 = "65eeb954c8c245beaa4e859da6188f39d71e585c"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz"; + sha1 = "9ea293be19babc0f52ff8ca88b34c3611b208670"; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.4.4.tgz"; + name = "_babel_helper_regex___helper_regex_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz"; - sha1 = "ff94894a340be78f53f06af038b205c49d993677"; + name = "_babel_helper_regex___helper_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz"; + sha1 = "139772607d51b93f23effe72105b319d2a4c6965"; }; } { - name = "_babel_helper_wrap_function___helper_wrap_function_7.2.0.tgz"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_wrap_function___helper_wrap_function_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz"; - sha1 = "c4e0012445769e2815b55296ead43a958549f6fa"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz"; + sha1 = "273c600d8b9bf5006142c1e35887d555c12edd86"; }; } { - name = "_babel_helpers___helpers_7.5.5.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.9.6.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.5.tgz"; - sha1 = "63908d2a73942229d1e6685bc2a0e730dde3b75e"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz"; + sha1 = "03149d7e6a5586ab6764996cd31d6981a17e1444"; }; } { - name = "_babel_highlight___highlight_7.5.0.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.8.3.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz"; - sha1 = "56d11312bd9248fa619591d02472be6e8cb32540"; + name = "_babel_helper_simple_access___helper_simple_access_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz"; + sha1 = "7f8109928b4dab4654076986af575231deb639ae"; }; } { - name = "_babel_parser___parser_7.5.5.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.5.tgz"; - sha1 = "02f077ac8817d3df4a832ef59de67565e71cca4b"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz"; + sha1 = "31a9f30070f91368a7182cf05f831781065fc7a9"; }; } { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.2.0.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.5.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz"; - sha1 = "b289b306669dce4ad20b0252889a15768c9d417e"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz"; + sha1 = "90977a8e6fbf6b431a7dc31752eee233bf052d80"; }; } { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.5.5.tgz"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz"; - sha1 = "a974cfae1e37c3110e71f3c6a2e48b8e71958cd4"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz"; + sha1 = "9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"; }; } { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz"; + name = "_babel_helpers___helpers_7.9.6.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz"; - sha1 = "de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0"; + name = "_babel_helpers___helpers_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.6.tgz"; + sha1 = "092c774743471d0bb6c7de3ad465ab3d3486d580"; }; } { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz"; + name = "_babel_highlight___highlight_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz"; - sha1 = "e532202db4838723691b10a67b8ce509e397c506"; + name = "_babel_highlight___highlight_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz"; + sha1 = "4e9b45ccb82b79607271b2979ad82c7b68163079"; }; } { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz"; + name = "_babel_parser___parser_7.9.6.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz"; - sha1 = "568ecc446c6148ae6b267f02551130891e29f317"; + name = "_babel_parser___parser_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz"; + sha1 = "3b1bbb30dabe600cd72db58720998376ff653bc7"; }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz"; - sha1 = "61939744f71ba76a3ae46b5eea18a54c16d22e58"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz"; + sha1 = "bad329c670b382589721b27540c7d288601c6e6f"; }; } { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.2.0.tgz"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz"; - sha1 = "135d81edb68a081e55e56ec48541ece8065c38f5"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz"; + sha1 = "5e06654af5cd04b608915aada9b2a6788004464e"; }; } { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.4.4.tgz"; + name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz"; - sha1 = "501ffd9826c0b91da22690720722ac7cb1ca9c78"; + name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz"; + sha1 = "2156860ab65c5abf068c3f67042184041066543e"; }; } { - name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.2.0.tgz"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz"; - sha1 = "69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz"; + sha1 = "38c4fe555744826e97e2ae930b0fb4cc07e66054"; }; } { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz"; - sha1 = "c50b1b957dcc69e4b1127b65e1c33eef61570c1b"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz"; + sha1 = "da5216b238a98b58a1e05d6852104b10f9a70d6b"; }; } { - name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz"; - sha1 = "69c159ffaf4998122161ad8ebc5e6d1f55df8612"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz"; + sha1 = "e4572253fdeed65cddeecfdab3f928afeb2fd5d2"; }; } { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz"; - sha1 = "a765f061f803bc48f240c26f8747faf97c26bf7c"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz"; + sha1 = "5d6769409699ec9b3b68684cd8116cedff93bad8"; }; } { - name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.2.0.tgz"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.9.6.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz"; - sha1 = "72bd13f6ffe1d25938129d2a186b11fd62951470"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz"; + sha1 = "7a093586fcb18b08266eb1a7177da671ac575b63"; }; } { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz"; - sha1 = "0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz"; + sha1 = "9dee96ab1650eed88646ae9734ca167ac4a9c5c9"; }; } { - name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz"; - sha1 = "3b7a3e733510c57e820b9142a6579ac8b0dfad2e"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz"; + sha1 = "31db16b154c39d6b8a645292472b98394c292a58"; }; } { - name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.2.0.tgz"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.8.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz"; - sha1 = "a94013d6eda8908dfe6a477e7f9eda85656ecf5c"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz"; + sha1 = "ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"; }; } { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.3.3.tgz"; + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.3.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.3.3.tgz"; - sha1 = "a7cc3f66119a9f7ebe2de5383cce193473d65991"; + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; + sha1 = "a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"; }; } { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz"; + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz"; - sha1 = "9aeafbe4d6ffc6563bf8f8372091628f00779550"; + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz"; + sha1 = "8d2c15a9f1af624b0025f961682a9d53d3001bda"; }; } { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.5.0.tgz"; + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz"; - sha1 = "89a3848a0166623b5bc481164b5936ab947e887e"; + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; + sha1 = "62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"; }; } { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.2.0.tgz"; + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz"; - sha1 = "5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190"; + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.8.3.tgz"; + sha1 = "f2c883bd61a6316f2c89380ae5122f923ba4527f"; }; } { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.5.5.tgz"; + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz"; - sha1 = "a35f395e5402822f10d2119f6f8e045e3639a2ce"; + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; + sha1 = "01ca21b668cd8218c9e640cb6dd88c5412b2c96a"; }; } { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.5.5.tgz"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz"; - sha1 = "d094299d9bd680a14a2a0edae38305ad60fb4de9"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz"; + sha1 = "521b06c83c40480f1e58b4fd33b92eceb1d6ea94"; }; } { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.2.0.tgz"; + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz"; - sha1 = "83a7df6a658865b1c8f641d510c6f3af220216da"; + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; + sha1 = "167ed70368886081f74b5c36c65a88c03b66d1a9"; }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.5.0.tgz"; + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz"; - sha1 = "f6c09fdfe3f94516ff074fe877db7bc9ef05855a"; + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz"; + sha1 = "0e3fb63e09bea1b11e96467271c8308007e7c41f"; }; } { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.4.4.tgz"; + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz"; - sha1 = "361a148bc951444312c69446d76ed1ea8e4450c3"; + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; + sha1 = "60e225edcbd98a640332a2e72dd3e66f1af55871"; }; } { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.5.0.tgz"; + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz"; - sha1 = "c5dbf5106bf84cdf691222c0974c12b1df931853"; + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; + sha1 = "6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"; }; } { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.2.0.tgz"; + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz"; - sha1 = "a63868289e5b4007f7054d46491af51435766008"; + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; + sha1 = "4f69c2ab95167e0180cd5336613f8c5788f7d48a"; }; } { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz"; - sha1 = "d267a081f49a8705fc9146de0768c6b58dccd8f7"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz"; + sha1 = "3acdece695e6b13aaf57fc291d1a800950c71391"; }; } { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz"; - sha1 = "0267fc735e24c808ba173866c6c4d1440fc3c556"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz"; + sha1 = "c1f659dda97711a569cef75275f7e15dcaa6cabc"; }; } { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.4.4.tgz"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz"; - sha1 = "e1436116abb0610c2259094848754ac5230922ad"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz"; + sha1 = "82776c2ed0cd9e1a49956daeb896024c9473b8b6"; }; } { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.2.0.tgz"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz"; - sha1 = "690353e81f9267dad4fd8cfd77eafa86aba53ea1"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz"; + sha1 = "4308fad0d9409d71eafb9b1a6ee35f9d64b64086"; }; } { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.2.0.tgz"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz"; - sha1 = "fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz"; + sha1 = "437eec5b799b5852072084b3ae5ef66e8349e8a3"; }; } { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.5.0.tgz"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz"; - sha1 = "ef00435d46da0a5961aa728a1d2ecff063e4fb91"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz"; + sha1 = "97d35dab66857a437c166358b91d09050c868f3a"; }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.5.0.tgz"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.9.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz"; - sha1 = "425127e6045231360858eeaa47a71d75eded7a74"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz"; + sha1 = "800597ddb8aefc2c293ed27459c1fcc935a26c2c"; }; } { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.5.0.tgz"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz"; - sha1 = "e75266a13ef94202db2a0620977756f51d52d249"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz"; + sha1 = "96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"; }; } { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.2.0.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.9.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz"; - sha1 = "7678ce75169f0877b8eb2235538c074268dd01ae"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz"; + sha1 = "72c97cf5f38604aea3abf3b935b0e17b1db76a50"; }; } { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.4.5.tgz"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.4.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz"; - sha1 = "9d269fd28a370258199b4294736813a60bbdd106"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz"; + sha1 = "c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"; }; } { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.4.4.tgz"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz"; - sha1 = "18d120438b0cc9ee95a47f2c72bc9768fbed60a5"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz"; + sha1 = "8d12df309aa537f272899c565ea1768e286e21f1"; }; } { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.5.5.tgz"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz"; - sha1 = "c70021df834073c65eb613b8679cc4a381d1a9f9"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz"; + sha1 = "581a6d7f56970e06bf51560cd64f5e947b70d7b7"; }; } { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.4.4.tgz"; + name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz"; - sha1 = "7556cf03f318bd2719fe4c922d2d808be5571e16"; + name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.9.0.tgz"; + sha1 = "8a3538aa40434e000b8f44a3c5c9ac7229bd2392"; }; } { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.2.0.tgz"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz"; - sha1 = "03e33f653f5b25c4eb572c98b9485055b389e905"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz"; + sha1 = "0f260e27d3e29cd1bb3128da5e76c761aa6c108e"; }; } { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.5.0.tgz"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.5.0.tgz"; - sha1 = "4d6ae4033bc38f8a65dfca2b6235c44522a422fc"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz"; + sha1 = "279373cb27322aaad67c2683e776dfc47196ed8b"; }; } { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz"; - sha1 = "ebfaed87834ce8dc4279609a4f0c324c156e3eb0"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz"; + sha1 = "aef239823d91994ec7b68e55193525d76dbd5dc1"; }; } { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz"; - sha1 = "461e21ad9478f1031dd5e276108d027f1b5240ba"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz"; + sha1 = "963fed4b620ac7cbf6029c755424029fa3a40410"; }; } { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.9.6.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz"; - sha1 = "583b10c49cf057e237085bcbd8cc960bd83bd96b"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz"; + sha1 = "8539ec42c153d12ea3836e0e3ac30d5aae7b258e"; }; } { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.9.6.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz"; - sha1 = "f2cab99026631c767e2745a5368b331cfe8f5290"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz"; + sha1 = "64b7474a4279ee588cacd1906695ca721687c277"; }; } { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.9.6.tgz"; path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz"; - sha1 = "629dc82512c55cee01341fb27bdfcb210354680f"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz"; + sha1 = "207f1461c78a231d5337a92140e52422510d81a4"; }; } { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.2.0.tgz"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz"; - sha1 = "4792af87c998a49367597d07fedf02636d2e1634"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz"; + sha1 = "e909acae276fec280f9b821a5f38e1f08b480697"; }; } { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.5.5.tgz"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.5.tgz"; - sha1 = "a6331afbfc59189d2135b2e09474457a8e3d28bc"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz"; + sha1 = "a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"; }; } { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.2.0.tgz"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz"; - sha1 = "6333aee2f8d6ee7e28615457298934a3b46198f0"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz"; + sha1 = "60cc2ae66d85c95ab540eb34babb6434d4c70c43"; }; } { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.2.2.tgz"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.2.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz"; - sha1 = "3103a9abe22f742b6d406ecd3cd49b774919b406"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz"; + sha1 = "ebb6a1e7a86ffa96858bd6ac0102d65944261725"; }; } { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.2.0.tgz"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.9.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz"; - sha1 = "a1e454b5995560a9c1e0d537dfc15061fd2687e1"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz"; + sha1 = "173b265746f5e15b2afe527eeda65b73623a0795"; }; } { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.4.4.tgz"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz"; - sha1 = "9d28fea7bbce637fb7612a0750989d8321d4bcb0"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz"; + sha1 = "33194300d8539c1ed28c62ad5087ba3807b98263"; }; } { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.2.0.tgz"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz"; - sha1 = "117d2bcec2fbf64b4b59d1f9819894682d29f2b2"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.9.0.tgz"; + sha1 = "a75abc936a3819edec42d3386d9f1c93f28d9d9e"; }; } { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.5.5.tgz"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.5.tgz"; - sha1 = "6d862766f09b2da1cb1f7d505fe2aedab6b7d4b8"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.8.3.tgz"; + sha1 = "70ded987c91609f78353dd76d2fb2a0bb991e8e5"; }; } { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.4.4.tgz"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz"; - sha1 = "ab4634bb4f14d36728bf5978322b35587787970f"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.9.0.tgz"; + sha1 = "3c2a130727caf00c2a293f0aed24520825dbf754"; }; } { - name = "_babel_preset_env___preset_env_7.5.5.tgz"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.9.0.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.5.tgz"; - sha1 = "bc470b53acaa48df4b8db24a570d6da1fef53c9a"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz"; + sha1 = "f4f26a325820205239bb915bad8e06fcadabb49b"; }; } { - name = "_babel_preset_react___preset_react_7.0.0.tgz"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.9.0.tgz"; path = fetchurl { - name = "_babel_preset_react___preset_react_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz"; - sha1 = "e86b4b3d99433c7b3e9e91747e2653958bc6b3c0"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz"; + sha1 = "89ef93025240dd5d17d3122294a093e5e0183de0"; }; } { - name = "_babel_preset_typescript___preset_typescript_7.3.3.tgz"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.9.4.tgz"; path = fetchurl { - name = "_babel_preset_typescript___preset_typescript_7.3.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.3.3.tgz"; - sha1 = "88669911053fa16b2b276ea2ede2ca603b3f307a"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.9.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz"; + sha1 = "86f576c8540bd06d0e95e0b61ea76d55f6cbd03f"; }; } { - name = "_babel_runtime___runtime_7.5.5.tgz"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.7.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.5.tgz"; - sha1 = "74fba56d35efbeca444091c7850ccd494fd2f132"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz"; + sha1 = "5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"; }; } { - name = "_babel_runtime___runtime_7.6.2.tgz"; + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.6.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz"; - sha1 = "c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd"; + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz"; + sha1 = "9a0635ac4e665d29b162837dd3cc50745dfdf1f5"; }; } { - name = "_babel_runtime___runtime_7.6.3.tgz"; + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.9.0.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.6.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.3.tgz"; - sha1 = "935122c74c73d2240cafd32ddb5fc2a6cd35cf1f"; + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz"; + sha1 = "45468c0ae74cc13204e1d3b1f4ce6ee83258af0b"; }; } { - name = "_babel_template___template_7.4.4.tgz"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz"; path = fetchurl { - name = "_babel_template___template_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz"; - sha1 = "f4b88d1225689a08f5bc3a17483545be9e4ed237"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz"; + sha1 = "28545216e023a832d4d3a1185ed492bcfeac08c8"; }; } { - name = "_babel_traverse___traverse_7.5.5.tgz"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.5.tgz"; - sha1 = "f664f8f368ed32988cd648da9f72d5ca70f165bb"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz"; + sha1 = "9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"; }; } { - name = "_babel_types___types_7.5.5.tgz"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz"; path = fetchurl { - name = "_babel_types___types_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.5.5.tgz"; - sha1 = "97b9f728e182785909aa4ab56264f090a028d18a"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz"; + sha1 = "be7a1290f81dae767475452199e1f76d6175b100"; }; } { - name = "_cnakazawa_watch___watch_1.0.3.tgz"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz"; path = fetchurl { - name = "_cnakazawa_watch___watch_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz"; - sha1 = "099139eaec7ebf07a27c1786a3ff64f39464d2ef"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz"; + sha1 = "7bfa4732b455ea6a43130adc0ba767ec0e402a80"; + }; + } + { + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz"; + sha1 = "ede4062315ce0aaf8a657a920858f1a2f35fc412"; + }; + } + { + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.9.6.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.6.tgz"; + sha1 = "2248971416a506fc78278fc0c0ea3179224af1e9"; + }; + } + { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz"; + sha1 = "0cef36e3ba73e5c57273effb182f46b91a1ecaad"; + }; + } + { + name = "_babel_preset_env___preset_env_7.9.0.tgz"; + path = fetchurl { + name = "_babel_preset_env___preset_env_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.0.tgz"; + sha1 = "a5fc42480e950ae8f5d9f8f2bbc03f52722df3a8"; + }; + } + { + name = "_babel_preset_env___preset_env_7.9.6.tgz"; + path = fetchurl { + name = "_babel_preset_env___preset_env_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.6.tgz"; + sha1 = "df063b276c6455ec6fcfc6e53aacc38da9b0aea6"; + }; + } + { + name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; + path = fetchurl { + name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; + sha1 = "13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"; + }; + } + { + name = "_babel_preset_react___preset_react_7.9.1.tgz"; + path = fetchurl { + name = "_babel_preset_react___preset_react_7.9.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.1.tgz"; + sha1 = "b346403c36d58c3bb544148272a0cefd9c28677a"; + }; + } + { + name = "_babel_preset_react___preset_react_7.9.4.tgz"; + path = fetchurl { + name = "_babel_preset_react___preset_react_7.9.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.4.tgz"; + sha1 = "c6c97693ac65b6b9c0b4f25b948a8f665463014d"; + }; + } + { + name = "_babel_preset_typescript___preset_typescript_7.9.0.tgz"; + path = fetchurl { + name = "_babel_preset_typescript___preset_typescript_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz"; + sha1 = "87705a72b1f0d59df21c179f7c3d2ef4b16ce192"; + }; + } + { + name = "_babel_runtime_corejs3___runtime_corejs3_7.9.6.tgz"; + path = fetchurl { + name = "_babel_runtime_corejs3___runtime_corejs3_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz"; + sha1 = "67aded13fffbbc2cb93247388cf84d77a4be9a71"; + }; + } + { + name = "_babel_runtime___runtime_7.9.0.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.0.tgz"; + sha1 = "337eda67401f5b066a6f205a3113d4ac18ba495b"; + }; + } + { + name = "_babel_runtime___runtime_7.9.6.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz"; + sha1 = "a9102eb5cadedf3f31d08a9ecf294af7827ea29f"; + }; + } + { + name = "_babel_template___template_7.8.6.tgz"; + path = fetchurl { + name = "_babel_template___template_7.8.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz"; + sha1 = "86b22af15f828dfb086474f964dcc3e39c43ce2b"; + }; + } + { + name = "_babel_traverse___traverse_7.9.6.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz"; + sha1 = "5540d7577697bf619cc57b92aa0f1c231a94f442"; + }; + } + { + name = "_babel_types___types_7.9.6.tgz"; + path = fetchurl { + name = "_babel_types___types_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz"; + sha1 = "2c5502b427251e9de1bd2dff95add646d95cc9f7"; + }; + } + { + name = "_cnakazawa_watch___watch_1.0.4.tgz"; + path = fetchurl { + name = "_cnakazawa_watch___watch_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz"; + sha1 = "f864ae85004d0fcab6f50be9141c4da368d1656a"; }; } { @@ -754,27 +882,35 @@ }; } { - name = "_csstools_normalize.css___normalize.css_9.0.1.tgz"; + name = "_csstools_normalize.css___normalize.css_10.1.0.tgz"; + path = fetchurl { + name = "_csstools_normalize.css___normalize.css_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-10.1.0.tgz"; + sha1 = "f0950bba18819512d42f7197e56c518aa491cf18"; + }; + } + { + name = "_emotion_hash___hash_0.8.0.tgz"; path = fetchurl { - name = "_csstools_normalize.css___normalize.css_9.0.1.tgz"; - url = "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-9.0.1.tgz"; - sha1 = "c27b391d8457d1e893f1eddeaf5e5412d12ffbb5"; + name = "_emotion_hash___hash_0.8.0.tgz"; + url = "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz"; + sha1 = "bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"; }; } { - name = "_emotion_hash___hash_0.7.3.tgz"; + name = "_hapi_address___address_2.1.4.tgz"; path = fetchurl { - name = "_emotion_hash___hash_0.7.3.tgz"; - url = "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.3.tgz"; - sha1 = "a166882c81c0c6040975dd30df24fae8549bd96f"; + name = "_hapi_address___address_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz"; + sha1 = "5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"; }; } { - name = "_hapi_address___address_2.1.0.tgz"; + name = "_hapi_address___address_4.0.1.tgz"; path = fetchurl { - name = "_hapi_address___address_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.0.tgz"; - sha1 = "d86223d40c73942cc6151838d9f264997e6673f9"; + name = "_hapi_address___address_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/@hapi/address/-/address-4.0.1.tgz"; + sha1 = "267301ddf7bc453718377a6fb3832a2f04a721dd"; }; } { @@ -786,11 +922,27 @@ }; } { - name = "_hapi_hoek___hoek_8.2.2.tgz"; + name = "_hapi_formula___formula_2.0.0.tgz"; + path = fetchurl { + name = "_hapi_formula___formula_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@hapi/formula/-/formula-2.0.0.tgz"; + sha1 = "edade0619ed58c8e4f164f233cda70211e787128"; + }; + } + { + name = "_hapi_hoek___hoek_8.5.1.tgz"; path = fetchurl { - name = "_hapi_hoek___hoek_8.2.2.tgz"; - url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.2.2.tgz"; - sha1 = "6eaa2e1ec3b50dfb8dccbe705dc289094652bc2d"; + name = "_hapi_hoek___hoek_8.5.1.tgz"; + url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.1.tgz"; + sha1 = "fde96064ca446dec8c55a8c2f130957b070c6e06"; + }; + } + { + name = "_hapi_hoek___hoek_9.0.4.tgz"; + path = fetchurl { + name = "_hapi_hoek___hoek_9.0.4.tgz"; + url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.0.4.tgz"; + sha1 = "e80ad4e8e8d2adc6c77d985f698447e8628b6010"; }; } { @@ -802,11 +954,35 @@ }; } { - name = "_hapi_topo___topo_3.1.3.tgz"; + name = "_hapi_joi___joi_17.1.1.tgz"; + path = fetchurl { + name = "_hapi_joi___joi_17.1.1.tgz"; + url = "https://registry.yarnpkg.com/@hapi/joi/-/joi-17.1.1.tgz"; + sha1 = "9cc8d7e2c2213d1e46708c6260184b447c661350"; + }; + } + { + name = "_hapi_pinpoint___pinpoint_2.0.0.tgz"; path = fetchurl { - name = "_hapi_topo___topo_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.3.tgz"; - sha1 = "c7a02e0d936596d29f184e6d7fdc07e8b5efce11"; + name = "_hapi_pinpoint___pinpoint_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@hapi/pinpoint/-/pinpoint-2.0.0.tgz"; + sha1 = "805b40d4dbec04fc116a73089494e00f073de8df"; + }; + } + { + name = "_hapi_topo___topo_3.1.6.tgz"; + path = fetchurl { + name = "_hapi_topo___topo_3.1.6.tgz"; + url = "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.6.tgz"; + sha1 = "68d935fa3eae7fdd5ab0d7f953f3205d8b2bfc29"; + }; + } + { + name = "_hapi_topo___topo_5.0.0.tgz"; + path = fetchurl { + name = "_hapi_topo___topo_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.0.0.tgz"; + sha1 = "c19af8577fa393a06e9c77b60995af959be721e7"; }; } { @@ -890,51 +1066,67 @@ }; } { - name = "_material_ui_core___core_4.4.3.tgz"; + name = "_jest_types___types_25.5.0.tgz"; + path = fetchurl { + name = "_jest_types___types_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz"; + sha1 = "4d6a4793f7b9599fc3680877b856a97dbccf2a9d"; + }; + } + { + name = "_material_ui_core___core_4.9.13.tgz"; path = fetchurl { - name = "_material_ui_core___core_4.4.3.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/core/-/core-4.4.3.tgz"; - sha1 = "65665d2c4e9cb84e018774e1471f6d0417f4535e"; + name = "_material_ui_core___core_4.9.13.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/core/-/core-4.9.13.tgz"; + sha1 = "024962bcdda05139e1bad17a1815bf4088702b15"; }; } { - name = "_material_ui_icons___icons_4.5.1.tgz"; + name = "_material_ui_icons___icons_4.9.1.tgz"; path = fetchurl { - name = "_material_ui_icons___icons_4.5.1.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.5.1.tgz"; - sha1 = "6963bad139e938702ece85ca43067688018f04f8"; + name = "_material_ui_icons___icons_4.9.1.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.9.1.tgz"; + sha1 = "fdeadf8cb3d89208945b33dbc50c7c616d0bd665"; }; } { - name = "_material_ui_styles___styles_4.4.3.tgz"; + name = "_material_ui_react_transition_group___react_transition_group_4.3.0.tgz"; path = fetchurl { - name = "_material_ui_styles___styles_4.4.3.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.4.3.tgz"; - sha1 = "78239177723660093cc9a277db5759c01c693c2a"; + name = "_material_ui_react_transition_group___react_transition_group_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/react-transition-group/-/react-transition-group-4.3.0.tgz"; + sha1 = "92529142addb5cc179dbf42d246c7e3fe4d6104b"; }; } { - name = "_material_ui_system___system_4.4.3.tgz"; + name = "_material_ui_styles___styles_4.9.13.tgz"; path = fetchurl { - name = "_material_ui_system___system_4.4.3.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/system/-/system-4.4.3.tgz"; - sha1 = "68ca8cf83614255fcd5b9d3a72ce8ee58a43a5c7"; + name = "_material_ui_styles___styles_4.9.13.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.13.tgz"; + sha1 = "08b3976bdd21c38bc076693d95834f97539f3b15"; }; } { - name = "_material_ui_types___types_4.1.1.tgz"; + name = "_material_ui_system___system_4.9.13.tgz"; path = fetchurl { - name = "_material_ui_types___types_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/types/-/types-4.1.1.tgz"; - sha1 = "b65e002d926089970a3271213a3ad7a21b17f02b"; + name = "_material_ui_system___system_4.9.13.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.13.tgz"; + sha1 = "adefb3b6a5ddf0b00fe4e82ac63bb48276e9749d"; }; } { - name = "_material_ui_utils___utils_4.4.0.tgz"; + name = "_material_ui_types___types_5.0.1.tgz"; path = fetchurl { - name = "_material_ui_utils___utils_4.4.0.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.4.0.tgz"; - sha1 = "9275421e2798a067850d201212d46f12725828ad"; + name = "_material_ui_types___types_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/types/-/types-5.0.1.tgz"; + sha1 = "c4954063cdc196eb327ee62c041368b1aebb6d61"; + }; + } + { + name = "_material_ui_utils___utils_4.9.12.tgz"; + path = fetchurl { + name = "_material_ui_utils___utils_4.9.12.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.9.12.tgz"; + sha1 = "0d639f1c1ed83fffb2ae10c21d15a938795d9e65"; }; } { @@ -986,11 +1178,11 @@ }; } { - name = "_svgr_babel_plugin_svg_dynamic_title___babel_plugin_svg_dynamic_title_4.3.1.tgz"; + name = "_svgr_babel_plugin_svg_dynamic_title___babel_plugin_svg_dynamic_title_4.3.3.tgz"; path = fetchurl { - name = "_svgr_babel_plugin_svg_dynamic_title___babel_plugin_svg_dynamic_title_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-4.3.1.tgz"; - sha1 = "646c2f5b5770c2fe318d6e51492344c3d62ddb63"; + name = "_svgr_babel_plugin_svg_dynamic_title___babel_plugin_svg_dynamic_title_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-4.3.3.tgz"; + sha1 = "2cdedd747e5b1b29ed4c241e46256aac8110dd93"; }; } { @@ -1018,19 +1210,19 @@ }; } { - name = "_svgr_babel_preset___babel_preset_4.3.1.tgz"; + name = "_svgr_babel_preset___babel_preset_4.3.3.tgz"; path = fetchurl { - name = "_svgr_babel_preset___babel_preset_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-4.3.1.tgz"; - sha1 = "62ffcb85d756580e8ce608e9d2ac3b9063be9e28"; + name = "_svgr_babel_preset___babel_preset_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-4.3.3.tgz"; + sha1 = "a75d8c2f202ac0e5774e6bfc165d028b39a1316c"; }; } { - name = "_svgr_core___core_4.3.2.tgz"; + name = "_svgr_core___core_4.3.3.tgz"; path = fetchurl { - name = "_svgr_core___core_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/@svgr/core/-/core-4.3.2.tgz"; - sha1 = "939c89be670ad79b762f4c063f213f0e02535f2e"; + name = "_svgr_core___core_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/@svgr/core/-/core-4.3.3.tgz"; + sha1 = "b37b89d5b757dc66e8c74156d00c368338d24293"; }; } { @@ -1042,11 +1234,11 @@ }; } { - name = "_svgr_plugin_jsx___plugin_jsx_4.3.2.tgz"; + name = "_svgr_plugin_jsx___plugin_jsx_4.3.3.tgz"; path = fetchurl { - name = "_svgr_plugin_jsx___plugin_jsx_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-4.3.2.tgz"; - sha1 = "ce9ddafc8cdd74da884c9f7af014afcf37f93d3c"; + name = "_svgr_plugin_jsx___plugin_jsx_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-4.3.3.tgz"; + sha1 = "e2ba913dbdfbe85252a34db101abc7ebd50992fa"; }; } { @@ -1058,27 +1250,27 @@ }; } { - name = "_svgr_webpack___webpack_4.3.2.tgz"; + name = "_svgr_webpack___webpack_4.3.3.tgz"; path = fetchurl { - name = "_svgr_webpack___webpack_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-4.3.2.tgz"; - sha1 = "319d4471c8f3d5c3af35059274834d9b5b8fb956"; + name = "_svgr_webpack___webpack_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-4.3.3.tgz"; + sha1 = "13cc2423bf3dff2d494f16b17eb7eacb86895017"; }; } { - name = "_types_babel__core___babel__core_7.1.2.tgz"; + name = "_types_babel__core___babel__core_7.1.7.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.2.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.2.tgz"; - sha1 = "608c74f55928033fce18b99b213c16be4b3d114f"; + name = "_types_babel__core___babel__core_7.1.7.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz"; + sha1 = "1dacad8840364a57c98d0dd4855c6dd3752c6b89"; }; } { - name = "_types_babel__generator___babel__generator_7.0.2.tgz"; + name = "_types_babel__generator___babel__generator_7.6.1.tgz"; path = fetchurl { - name = "_types_babel__generator___babel__generator_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz"; - sha1 = "d2112a6b21fad600d7674274293c85dce0cb47fc"; + name = "_types_babel__generator___babel__generator_7.6.1.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz"; + sha1 = "4901767b397e8711aeb99df8d396d7ba7b7f0e04"; }; } { @@ -1090,27 +1282,35 @@ }; } { - name = "_types_babel__traverse___babel__traverse_7.0.7.tgz"; + name = "_types_babel__traverse___babel__traverse_7.0.11.tgz"; path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.0.7.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.7.tgz"; - sha1 = "2496e9ff56196cc1429c72034e07eab6121b6f3f"; + name = "_types_babel__traverse___babel__traverse_7.0.11.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.11.tgz"; + sha1 = "1ae3010e8bf8851d324878b42acec71986486d18"; }; } { - name = "_types_codemirror___codemirror_0.0.71.tgz"; + name = "_types_codemirror___codemirror_0.0.91.tgz"; path = fetchurl { - name = "_types_codemirror___codemirror_0.0.71.tgz"; - url = "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.71.tgz"; - sha1 = "861f1bcb3100c0a064567c5400f2981cf4ae8ca7"; + name = "_types_codemirror___codemirror_0.0.91.tgz"; + url = "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.91.tgz"; + sha1 = "4cb9832388726e57e747f0e3a8ab69105ad02a66"; }; } { - name = "_types_detect_browser___detect_browser_2.0.1.tgz"; + name = "_types_color_name___color_name_1.1.1.tgz"; path = fetchurl { - name = "_types_detect_browser___detect_browser_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/detect-browser/-/detect-browser-2.0.1.tgz"; - sha1 = "ae49b3b3f5fae163f0988487fe76fb121b56ac53"; + name = "_types_color_name___color_name_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz"; + sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"; + }; + } + { + name = "_types_detect_browser___detect_browser_4.0.0.tgz"; + path = fetchurl { + name = "_types_detect_browser___detect_browser_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/detect-browser/-/detect-browser-4.0.0.tgz"; + sha1 = "5672576f9621aad8773489593fca2e4c57c29fb5"; }; } { @@ -1122,11 +1322,11 @@ }; } { - name = "_types_estree___estree_0.0.39.tgz"; + name = "_types_estree___estree_0.0.44.tgz"; path = fetchurl { - name = "_types_estree___estree_0.0.39.tgz"; - url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz"; - sha1 = "e177e699ee1b8c22d23174caaa7422644389509f"; + name = "_types_estree___estree_0.0.44.tgz"; + url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.44.tgz"; + sha1 = "980cc5a29a3ef3bea6ff1f7d021047d7ea575e21"; }; } { @@ -1154,11 +1354,11 @@ }; } { - name = "_types_history___history_4.7.3.tgz"; + name = "_types_history___history_4.7.5.tgz"; path = fetchurl { - name = "_types_history___history_4.7.3.tgz"; - url = "https://registry.yarnpkg.com/@types/history/-/history-4.7.3.tgz"; - sha1 = "856c99cdc1551d22c22b18b5402719affec9839a"; + name = "_types_history___history_4.7.5.tgz"; + url = "https://registry.yarnpkg.com/@types/history/-/history-4.7.5.tgz"; + sha1 = "527d20ef68571a4af02ed74350164e7a67544860"; }; } { @@ -1170,11 +1370,11 @@ }; } { - name = "_types_istanbul_lib_report___istanbul_lib_report_1.1.1.tgz"; + name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; path = fetchurl { - name = "_types_istanbul_lib_report___istanbul_lib_report_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz"; - sha1 = "e5471e7fa33c61358dd38426189c037a58433b8c"; + name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; + sha1 = "c14c24f18ea8190c118ee7562b7ff99a36552686"; }; } { @@ -1186,11 +1386,11 @@ }; } { - name = "_types_jest___jest_23.3.14.tgz"; + name = "_types_jest___jest_25.2.1.tgz"; path = fetchurl { - name = "_types_jest___jest_23.3.14.tgz"; - url = "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.14.tgz"; - sha1 = "37daaf78069e7948520474c87b80092ea912520a"; + name = "_types_jest___jest_25.2.1.tgz"; + url = "https://registry.yarnpkg.com/@types/jest/-/jest-25.2.1.tgz"; + sha1 = "9544cd438607955381c1bdbdb97767a249297db5"; }; } { @@ -1202,11 +1402,11 @@ }; } { - name = "_types_json_schema___json_schema_7.0.3.tgz"; + name = "_types_json_schema___json_schema_7.0.4.tgz"; path = fetchurl { - name = "_types_json_schema___json_schema_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz"; - sha1 = "bdfd69d61e464dcc81b25159c270d75a73c1a636"; + name = "_types_json_schema___json_schema_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz"; + sha1 = "38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"; }; } { @@ -1218,19 +1418,11 @@ }; } { - name = "_types_node___node_12.7.4.tgz"; - path = fetchurl { - name = "_types_node___node_12.7.4.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-12.7.4.tgz"; - sha1 = "64db61e0359eb5a8d99b55e05c729f130a678b04"; - }; - } - { - name = "_types_node___node_10.14.17.tgz"; + name = "_types_node___node_13.13.5.tgz"; path = fetchurl { - name = "_types_node___node_10.14.17.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-10.14.17.tgz"; - sha1 = "b96d4dd3e427382482848948041d3754d40fd5ce"; + name = "_types_node___node_13.13.5.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-13.13.5.tgz"; + sha1 = "96ec3b0afafd64a4ccea9107b75bf8489f0e5765"; }; } { @@ -1242,6 +1434,14 @@ }; } { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + path = fetchurl { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "2f8bb441434d163b35fb8ffdccd7138927ffb8c0"; + }; + } + { name = "_types_prop_types___prop_types_15.7.3.tgz"; path = fetchurl { name = "_types_prop_types___prop_types_15.7.3.tgz"; @@ -1250,11 +1450,11 @@ }; } { - name = "_types_puppeteer___puppeteer_1.19.1.tgz"; + name = "_types_puppeteer___puppeteer_2.0.1.tgz"; path = fetchurl { - name = "_types_puppeteer___puppeteer_1.19.1.tgz"; - url = "https://registry.yarnpkg.com/@types/puppeteer/-/puppeteer-1.19.1.tgz"; - sha1 = "942ca62288953a0f5fbbc25c103b5f2ba28b60ab"; + name = "_types_puppeteer___puppeteer_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/puppeteer/-/puppeteer-2.0.1.tgz"; + sha1 = "83a1d7f0a1c2e0edbbb488b4d8fb54b14ec9d455"; }; } { @@ -1266,59 +1466,51 @@ }; } { - name = "_types_react_dom___react_dom_16.9.0.tgz"; + name = "_types_react_dom___react_dom_16.9.7.tgz"; path = fetchurl { - name = "_types_react_dom___react_dom_16.9.0.tgz"; - url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.0.tgz"; - sha1 = "ba6ddb00bf5de700b0eb91daa452081ffccbfdea"; + name = "_types_react_dom___react_dom_16.9.7.tgz"; + url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.7.tgz"; + sha1 = "60844d48ce252d7b2dccf0c7bb937130e27c0cd2"; }; } { - name = "_types_react_infinite___react_infinite_0.0.33.tgz"; + name = "_types_react_infinite___react_infinite_0.0.34.tgz"; path = fetchurl { - name = "_types_react_infinite___react_infinite_0.0.33.tgz"; - url = "https://registry.yarnpkg.com/@types/react-infinite/-/react-infinite-0.0.33.tgz"; - sha1 = "08724d4a7095f3fa1d4e6cb5d05bcbe42ce135da"; + name = "_types_react_infinite___react_infinite_0.0.34.tgz"; + url = "https://registry.yarnpkg.com/@types/react-infinite/-/react-infinite-0.0.34.tgz"; + sha1 = "0b514f65c4ba80ad22dea079075e04345ddcaae2"; }; } { - name = "_types_react_router_dom___react_router_dom_4.3.5.tgz"; + name = "_types_react_router_dom___react_router_dom_5.1.5.tgz"; path = fetchurl { - name = "_types_react_router_dom___react_router_dom_4.3.5.tgz"; - url = "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-4.3.5.tgz"; - sha1 = "72f229967690c890d00f96e6b85e9ee5780db31f"; + name = "_types_react_router_dom___react_router_dom_5.1.5.tgz"; + url = "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.1.5.tgz"; + sha1 = "7c334a2ea785dbad2b2dcdd83d2cf3d9973da090"; }; } { - name = "_types_react_router___react_router_5.0.3.tgz"; + name = "_types_react_router___react_router_5.1.7.tgz"; path = fetchurl { - name = "_types_react_router___react_router_5.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.0.3.tgz"; - sha1 = "855a1606e62de3f4d69ea34fb3c0e50e98e964d5"; + name = "_types_react_router___react_router_5.1.7.tgz"; + url = "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.7.tgz"; + sha1 = "e9d12ed7dcfc79187e4d36667745b69a5aa11556"; }; } { - name = "_types_react_transition_group___react_transition_group_4.2.2.tgz"; + name = "_types_react_transition_group___react_transition_group_4.2.4.tgz"; path = fetchurl { - name = "_types_react_transition_group___react_transition_group_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.2.2.tgz"; - sha1 = "8c851c4598a23a3a34173069fb4c5c9e41c02e3f"; + name = "_types_react_transition_group___react_transition_group_4.2.4.tgz"; + url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.2.4.tgz"; + sha1 = "c7416225987ccdb719262766c1483da8f826838d"; }; } { - name = "_types_react___react_16.9.3.tgz"; + name = "_types_react___react_16.9.34.tgz"; path = fetchurl { - name = "_types_react___react_16.9.3.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.3.tgz"; - sha1 = "6d13251e441a3e67fb60d719d1fc8785b984a2ec"; - }; - } - { - name = "_types_react___react_16.9.2.tgz"; - path = fetchurl { - name = "_types_react___react_16.9.2.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.2.tgz"; - sha1 = "6d1765431a1ad1877979013906731aae373de268"; + name = "_types_react___react_16.9.34.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.34.tgz"; + sha1 = "f7d5e331c468f53affed17a8a4d488cd44ea9349"; }; } { @@ -1330,11 +1522,11 @@ }; } { - name = "_types_rimraf___rimraf_2.0.2.tgz"; + name = "_types_rimraf___rimraf_3.0.0.tgz"; path = fetchurl { - name = "_types_rimraf___rimraf_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.2.tgz"; - sha1 = "7f0fc3cf0ff0ad2a99bb723ae1764f30acaf8b6e"; + name = "_types_rimraf___rimraf_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-3.0.0.tgz"; + sha1 = "b9d03f090ece263671898d57bb7bb007023ac19f"; }; } { @@ -1354,51 +1546,67 @@ }; } { - name = "_types_yargs_parser___yargs_parser_13.0.0.tgz"; + name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; + path = fetchurl { + name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; + sha1 = "cb3f9f741869e20cce330ffbeb9271590483882d"; + }; + } + { + name = "_types_yargs___yargs_13.0.8.tgz"; + path = fetchurl { + name = "_types_yargs___yargs_13.0.8.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.8.tgz"; + sha1 = "a38c22def2f1c2068f8971acb3ea734eb3c64a99"; + }; + } + { + name = "_types_yargs___yargs_15.0.4.tgz"; path = fetchurl { - name = "_types_yargs_parser___yargs_parser_13.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.0.0.tgz"; - sha1 = "453743c5bbf9f1bed61d959baab5b06be029b2d0"; + name = "_types_yargs___yargs_15.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.4.tgz"; + sha1 = "7e5d0f8ca25e9d5849f2ea443cf7c402decd8299"; }; } { - name = "_types_yargs___yargs_13.0.2.tgz"; + name = "_types_yauzl___yauzl_2.9.1.tgz"; path = fetchurl { - name = "_types_yargs___yargs_13.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.2.tgz"; - sha1 = "a64674fc0149574ecd90ba746e932b5a5f7b3653"; + name = "_types_yauzl___yauzl_2.9.1.tgz"; + url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz"; + sha1 = "d10f69f9f522eef3cf98e30afb684a1e1ec923af"; }; } { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_1.13.0.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.31.0.tgz"; path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.13.0.tgz"; - sha1 = "22fed9b16ddfeb402fd7bcde56307820f6ebc49f"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.31.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.31.0.tgz"; + sha1 = "942c921fec5e200b79593c71fafb1e3f57aa2e36"; }; } { - name = "_typescript_eslint_experimental_utils___experimental_utils_1.13.0.tgz"; + name = "_typescript_eslint_experimental_utils___experimental_utils_2.31.0.tgz"; path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz"; - sha1 = "b08c60d780c0067de2fb44b04b432f540138301e"; + name = "_typescript_eslint_experimental_utils___experimental_utils_2.31.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.31.0.tgz"; + sha1 = "a9ec514bf7fd5e5e82bc10dcb6a86d58baae9508"; }; } { - name = "_typescript_eslint_parser___parser_1.13.0.tgz"; + name = "_typescript_eslint_parser___parser_2.31.0.tgz"; path = fetchurl { - name = "_typescript_eslint_parser___parser_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-1.13.0.tgz"; - sha1 = "61ac7811ea52791c47dc9fd4dd4a184fae9ac355"; + name = "_typescript_eslint_parser___parser_2.31.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.31.0.tgz"; + sha1 = "beddd4e8efe64995108b229b2862cd5752d40d6f"; }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_1.13.0.tgz"; + name = "_typescript_eslint_typescript_estree___typescript_estree_2.31.0.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-1.13.0.tgz"; - sha1 = "8140f17d0f60c03619798f1d628b8434913dc32e"; + name = "_typescript_eslint_typescript_estree___typescript_estree_2.31.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.31.0.tgz"; + sha1 = "ac536c2d46672aa1f27ba0ec2140d53670635cfd"; }; } { @@ -1562,19 +1770,11 @@ }; } { - name = "abab___abab_2.0.1.tgz"; - path = fetchurl { - name = "abab___abab_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/abab/-/abab-2.0.1.tgz"; - sha1 = "3fa17797032b71410ec372e11668f4b4ffc86a82"; - }; - } - { - name = "abbrev___abbrev_1.1.1.tgz"; + name = "abab___abab_2.0.3.tgz"; path = fetchurl { - name = "abbrev___abbrev_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; - sha1 = "f8f2c887ad10bf67f634f005b6987fed3179aac8"; + name = "abab___abab_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz"; + sha1 = "623e2075e02eb2d3f2475e49f99c91846467907a"; }; } { @@ -1586,19 +1786,19 @@ }; } { - name = "acorn_globals___acorn_globals_4.3.3.tgz"; + name = "acorn_globals___acorn_globals_4.3.4.tgz"; path = fetchurl { - name = "acorn_globals___acorn_globals_4.3.3.tgz"; - url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.3.tgz"; - sha1 = "a86f75b69680b8780d30edd21eee4e0ea170c05e"; + name = "acorn_globals___acorn_globals_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz"; + sha1 = "9fa1926addc11c97308c4e66d7add0d40c3272e7"; }; } { - name = "acorn_jsx___acorn_jsx_5.0.2.tgz"; + name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.2.tgz"; - sha1 = "84b68ea44b373c4f8686023a551f61a21b7c4a4f"; + name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; + sha1 = "4c66069173d6fdd68ed85239fc256226182b2ebe"; }; } { @@ -1610,35 +1810,27 @@ }; } { - name = "acorn___acorn_5.7.3.tgz"; + name = "acorn___acorn_5.7.4.tgz"; path = fetchurl { - name = "acorn___acorn_5.7.3.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz"; - sha1 = "67aa231bf8812974b85235a96771eb6bd07ea279"; + name = "acorn___acorn_5.7.4.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz"; + sha1 = "3e8d8a9947d0599a1796d10225d7432f4a4acf5e"; }; } { - name = "acorn___acorn_6.3.0.tgz"; + name = "acorn___acorn_6.4.1.tgz"; path = fetchurl { - name = "acorn___acorn_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz"; - sha1 = "0087509119ffa4fc0a0041d1e93a417e68cb856e"; + name = "acorn___acorn_6.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz"; + sha1 = "531e58ba3f51b9dacb9a6646ca4debf5b14ca474"; }; } { - name = "acorn___acorn_7.0.0.tgz"; + name = "acorn___acorn_7.1.1.tgz"; path = fetchurl { - name = "acorn___acorn_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.0.0.tgz"; - sha1 = "26b8d1cd9a9b700350b71c0905546f64d1284e7a"; - }; - } - { - name = "address___address_1.1.0.tgz"; - path = fetchurl { - name = "address___address_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/address/-/address-1.1.0.tgz"; - sha1 = "ef8e047847fcd2c5b6f50c16965f924fd99fe709"; + name = "acorn___acorn_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz"; + sha1 = "e35668de0b402f359de515c5482a1ab9f89a69bf"; }; } { @@ -1658,11 +1850,19 @@ }; } { - name = "agent_base___agent_base_4.3.0.tgz"; + name = "agent_base___agent_base_5.1.1.tgz"; + path = fetchurl { + name = "agent_base___agent_base_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz"; + sha1 = "e8fb3f242959db44d63be665db7a8e739537a32c"; + }; + } + { + name = "aggregate_error___aggregate_error_3.0.1.tgz"; path = fetchurl { - name = "agent_base___agent_base_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz"; - sha1 = "8165f01c436009bccad0b1d122f05ed770efc6ee"; + name = "aggregate_error___aggregate_error_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz"; + sha1 = "db2fe7246e536f40d9b5442a39e117d7dd6a24e0"; }; } { @@ -1690,11 +1890,11 @@ }; } { - name = "ajv___ajv_6.10.2.tgz"; + name = "ajv___ajv_6.12.2.tgz"; path = fetchurl { - name = "ajv___ajv_6.10.2.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz"; - sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52"; + name = "ajv___ajv_6.12.2.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz"; + sha1 = "c629c5eced17baf314437918d2da88c99d5958cd"; }; } { @@ -1722,6 +1922,14 @@ }; } { + name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; + path = fetchurl { + name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; + sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61"; + }; + } + { name = "ansi_html___ansi_html_0.0.7.tgz"; path = fetchurl { name = "ansi_html___ansi_html_0.0.7.tgz"; @@ -1754,6 +1962,14 @@ }; } { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; + }; + } + { name = "ansi_styles___ansi_styles_2.2.1.tgz"; path = fetchurl { name = "ansi_styles___ansi_styles_2.2.1.tgz"; @@ -1770,6 +1986,14 @@ }; } { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz"; + sha1 = "90ae75c424d008d2624c5bf29ead3177ebfcf359"; + }; + } + { name = "anymatch___anymatch_2.0.0.tgz"; path = fetchurl { name = "anymatch___anymatch_2.0.0.tgz"; @@ -1778,19 +2002,19 @@ }; } { - name = "aproba___aproba_1.2.0.tgz"; + name = "anymatch___anymatch_3.1.1.tgz"; path = fetchurl { - name = "aproba___aproba_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; - sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a"; + name = "anymatch___anymatch_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz"; + sha1 = "c55ecf02185e2469259399310c173ce31233b142"; }; } { - name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + name = "aproba___aproba_1.2.0.tgz"; path = fetchurl { - name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; + name = "aproba___aproba_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; + sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a"; }; } { @@ -1850,14 +2074,6 @@ }; } { - name = "array_filter___array_filter_0.0.1.tgz"; - path = fetchurl { - name = "array_filter___array_filter_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz"; - sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; - }; - } - { name = "array_flatten___array_flatten_1.1.1.tgz"; path = fetchurl { name = "array_flatten___array_flatten_1.1.1.tgz"; @@ -1874,27 +2090,11 @@ }; } { - name = "array_includes___array_includes_3.0.3.tgz"; + name = "array_includes___array_includes_3.1.1.tgz"; path = fetchurl { - name = "array_includes___array_includes_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz"; - sha1 = "184b48f62d92d7452bb31b323165c7f8bd02266d"; - }; - } - { - name = "array_map___array_map_0.0.0.tgz"; - path = fetchurl { - name = "array_map___array_map_0.0.0.tgz"; - url = "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz"; - sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; - }; - } - { - name = "array_reduce___array_reduce_0.0.0.tgz"; - path = fetchurl { - name = "array_reduce___array_reduce_0.0.0.tgz"; - url = "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz"; - sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; + name = "array_includes___array_includes_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz"; + sha1 = "cdd67e6852bdf9c1215460786732255ed2459348"; }; } { @@ -1922,11 +2122,19 @@ }; } { - name = "array.prototype.find___array.prototype.find_2.1.0.tgz"; + name = "array.prototype.find___array.prototype.find_2.1.1.tgz"; + path = fetchurl { + name = "array.prototype.find___array.prototype.find_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.1.tgz"; + sha1 = "3baca26108ca7affb08db06bf0be6cb3115a969c"; + }; + } + { + name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; path = fetchurl { - name = "array.prototype.find___array.prototype.find_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.0.tgz"; - sha1 = "630f2eaf70a39e608ac3573e45cf8ccd0ede9ad7"; + name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz"; + sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b"; }; } { @@ -2026,11 +2234,11 @@ }; } { - name = "async___async_1.5.2.tgz"; + name = "async___async_2.6.3.tgz"; path = fetchurl { - name = "async___async_1.5.2.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz"; - sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; + name = "async___async_2.6.3.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; + sha1 = "d72625e2344a3656e3a3ad4fa749fa83299d82ff"; }; } { @@ -2050,11 +2258,11 @@ }; } { - name = "autoprefixer___autoprefixer_9.6.1.tgz"; + name = "autoprefixer___autoprefixer_9.7.6.tgz"; path = fetchurl { - name = "autoprefixer___autoprefixer_9.6.1.tgz"; - url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz"; - sha1 = "51967a02d2d2300bb01866c1611ec8348d355a47"; + name = "autoprefixer___autoprefixer_9.7.6.tgz"; + url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.6.tgz"; + sha1 = "63ac5bbc0ce7934e6997207d5bb00d68fa8293a4"; }; } { @@ -2066,27 +2274,27 @@ }; } { - name = "aws4___aws4_1.8.0.tgz"; + name = "aws4___aws4_1.9.1.tgz"; path = fetchurl { - name = "aws4___aws4_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz"; - sha1 = "f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"; + name = "aws4___aws4_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz"; + sha1 = "7e33d8f7d449b3f673cd72deb9abdc552dbe528e"; }; } { - name = "axios___axios_0.19.0.tgz"; + name = "axios___axios_0.19.2.tgz"; path = fetchurl { - name = "axios___axios_0.19.0.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz"; - sha1 = "8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"; + name = "axios___axios_0.19.2.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz"; + sha1 = "3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"; }; } { - name = "axobject_query___axobject_query_2.0.2.tgz"; + name = "axobject_query___axobject_query_2.1.2.tgz"; path = fetchurl { - name = "axobject_query___axobject_query_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz"; - sha1 = "ea187abe5b9002b377f925d8bf7d1c561adf38f9"; + name = "axobject_query___axobject_query_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.2.tgz"; + sha1 = "2bdffc0371e643e5f03ba99065d5179b9ca79799"; }; } { @@ -2098,11 +2306,11 @@ }; } { - name = "babel_eslint___babel_eslint_10.0.2.tgz"; + name = "babel_eslint___babel_eslint_10.1.0.tgz"; path = fetchurl { - name = "babel_eslint___babel_eslint_10.0.2.tgz"; - url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.2.tgz"; - sha1 = "182d5ac204579ff0881684b040560fdcc1558456"; + name = "babel_eslint___babel_eslint_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz"; + sha1 = "6968e568a910b78fb3779cdd8b6ac2f479943232"; }; } { @@ -2122,19 +2330,19 @@ }; } { - name = "babel_loader___babel_loader_8.0.6.tgz"; + name = "babel_loader___babel_loader_8.1.0.tgz"; path = fetchurl { - name = "babel_loader___babel_loader_8.0.6.tgz"; - url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz"; - sha1 = "e33bdb6f362b03f4bb141a0c21ab87c501b70dfb"; + name = "babel_loader___babel_loader_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz"; + sha1 = "c611d5112bd5209abe8b9fa84c3e4da25275f1c3"; }; } { - name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz"; + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; path = fetchurl { - name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz"; - sha1 = "f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"; + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; + sha1 = "84fda19c976ec5c6defef57f9427b3def66e17a3"; }; } { @@ -2154,19 +2362,19 @@ }; } { - name = "babel_plugin_macros___babel_plugin_macros_2.6.1.tgz"; + name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; path = fetchurl { - name = "babel_plugin_macros___babel_plugin_macros_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.6.1.tgz"; - sha1 = "41f7ead616fc36f6a93180e89697f69f51671181"; + name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz"; + sha1 = "0f958a7cc6556b1e65344465d99111a1e5e10138"; }; } { - name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.3.tgz"; + name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.6.tgz"; path = fetchurl { - name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.3.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.3.tgz"; - sha1 = "9ba2f3ac4dc78b042651654f07e847adfe50667c"; + name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.6.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.6.tgz"; + sha1 = "c9750a1b38d85112c9e166bf3ef7c5dbc605f4be"; }; } { @@ -2202,11 +2410,11 @@ }; } { - name = "babel_preset_react_app___babel_preset_react_app_9.0.1.tgz"; + name = "babel_preset_react_app___babel_preset_react_app_9.1.2.tgz"; path = fetchurl { - name = "babel_preset_react_app___babel_preset_react_app_9.0.1.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.0.1.tgz"; - sha1 = "16a2cf84363045b530b6a03460527a5c6eac42ba"; + name = "babel_preset_react_app___babel_preset_react_app_9.1.2.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.1.2.tgz"; + sha1 = "54775d976588a8a6d1a99201a702befecaf48030"; }; } { @@ -2226,11 +2434,11 @@ }; } { - name = "bail___bail_1.0.4.tgz"; + name = "bail___bail_1.0.5.tgz"; path = fetchurl { - name = "bail___bail_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/bail/-/bail-1.0.4.tgz"; - sha1 = "7181b66d508aa3055d3f6c13f0a0c720641dde9b"; + name = "bail___bail_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz"; + sha1 = "b6fa133404a392cbc1f8c4bf63f5953351e7a776"; }; } { @@ -2290,11 +2498,35 @@ }; } { - name = "bluebird___bluebird_3.5.5.tgz"; + name = "binary_extensions___binary_extensions_2.0.0.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz"; + sha1 = "23c0df14f6a88077f5f986c0d167ec03c3d5537c"; + }; + } + { + name = "bindings___bindings_1.5.0.tgz"; + path = fetchurl { + name = "bindings___bindings_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; + sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df"; + }; + } + { + name = "bl___bl_4.0.2.tgz"; path = fetchurl { - name = "bluebird___bluebird_3.5.5.tgz"; - url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz"; - sha1 = "a8d0afd73251effbbd5fe384a77d73003c17a71f"; + name = "bl___bl_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz"; + sha1 = "52b71e9088515d0606d9dd9cc7aa48dc1f98e73a"; + }; + } + { + name = "bluebird___bluebird_3.7.2.tgz"; + path = fetchurl { + name = "bluebird___bluebird_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; + sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; }; } { @@ -2306,6 +2538,14 @@ }; } { + name = "bn.js___bn.js_5.1.1.tgz"; + path = fetchurl { + name = "bn.js___bn.js_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.1.tgz"; + sha1 = "48efc4031a9c4041b9c99c6941d903463ab62eb5"; + }; + } + { name = "body_parser___body_parser_1.19.0.tgz"; path = fetchurl { name = "body_parser___body_parser_1.19.0.tgz"; @@ -2346,6 +2586,14 @@ }; } { + name = "braces___braces_3.0.2.tgz"; + path = fetchurl { + name = "braces___braces_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; + sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; + }; + } + { name = "brorand___brorand_1.1.0.tgz"; path = fetchurl { name = "brorand___brorand_1.1.0.tgz"; @@ -2354,11 +2602,11 @@ }; } { - name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz"; + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; path = fetchurl { - name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz"; - sha1 = "616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"; + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"; + sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626"; }; } { @@ -2402,11 +2650,11 @@ }; } { - name = "browserify_sign___browserify_sign_4.0.4.tgz"; + name = "browserify_sign___browserify_sign_4.1.0.tgz"; path = fetchurl { - name = "browserify_sign___browserify_sign_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz"; - sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; + name = "browserify_sign___browserify_sign_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.1.0.tgz"; + sha1 = "4fe971b379a5aeb4925e06779f9fa1f41d249d70"; }; } { @@ -2418,27 +2666,35 @@ }; } { - name = "browserslist___browserslist_4.6.6.tgz"; + name = "browserslist___browserslist_4.10.0.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.6.6.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.6.tgz"; - sha1 = "6e4bf467cde520bc9dbdf3747dafa03531cec453"; + name = "browserslist___browserslist_4.10.0.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.10.0.tgz"; + sha1 = "f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9"; }; } { - name = "browserslist___browserslist_4.7.0.tgz"; + name = "browserslist___browserslist_4.12.0.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.7.0.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.0.tgz"; - sha1 = "9ee89225ffc07db03409f2fee524dc8227458a17"; + name = "browserslist___browserslist_4.12.0.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz"; + sha1 = "06c6d5715a1ede6c51fc39ff67fd647f740b656d"; }; } { - name = "bser___bser_2.1.0.tgz"; + name = "bser___bser_2.1.1.tgz"; path = fetchurl { - name = "bser___bser_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/bser/-/bser-2.1.0.tgz"; - sha1 = "65fc784bf7f87c009b973c12db6546902fa9c7b5"; + name = "bser___bser_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz"; + sha1 = "e6787da20ece9d07998533cfd9de6f5c38f4bc05"; + }; + } + { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + path = fetchurl { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; }; } { @@ -2466,11 +2722,19 @@ }; } { - name = "buffer___buffer_4.9.1.tgz"; + name = "buffer___buffer_4.9.2.tgz"; path = fetchurl { - name = "buffer___buffer_4.9.1.tgz"; - url = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz"; - sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; + name = "buffer___buffer_4.9.2.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz"; + sha1 = "230ead344002988644841ab0244af8c44bbe3ef8"; + }; + } + { + name = "buffer___buffer_5.6.0.tgz"; + path = fetchurl { + name = "buffer___buffer_5.6.0.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz"; + sha1 = "a31749dc7d81d84db08abf937b6b8c4033f62786"; }; } { @@ -2506,11 +2770,19 @@ }; } { - name = "cacache___cacache_12.0.3.tgz"; + name = "cacache___cacache_12.0.4.tgz"; + path = fetchurl { + name = "cacache___cacache_12.0.4.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz"; + sha1 = "668bcbd105aeb5f1d92fe25570ec9525c8faa40c"; + }; + } + { + name = "cacache___cacache_13.0.1.tgz"; path = fetchurl { - name = "cacache___cacache_12.0.3.tgz"; - url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz"; - sha1 = "be99abba4e1bf5df461cd5a2c1071fc432573390"; + name = "cacache___cacache_13.0.1.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz"; + sha1 = "a8000c21697089082f85287a1aec6e382024a71c"; }; } { @@ -2562,11 +2834,11 @@ }; } { - name = "camel_case___camel_case_3.0.0.tgz"; + name = "camel_case___camel_case_4.1.1.tgz"; path = fetchurl { - name = "camel_case___camel_case_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz"; - sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"; + name = "camel_case___camel_case_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz"; + sha1 = "1fc41c854f00e2f7d0139dfeba1542d6896fe547"; }; } { @@ -2578,14 +2850,6 @@ }; } { - name = "camelcase___camelcase_4.1.0.tgz"; - path = fetchurl { - name = "camelcase___camelcase_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz"; - sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; - }; - } - { name = "camelcase___camelcase_5.3.1.tgz"; path = fetchurl { name = "camelcase___camelcase_5.3.1.tgz"; @@ -2602,11 +2866,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30000989.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001054.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30000989.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz"; - sha1 = "b9193e293ccf7e4426c5245134b8f2a56c0ac4b9"; + name = "caniuse_lite___caniuse_lite_1.0.30001054.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001054.tgz"; + sha1 = "7e82fc42d927980b0ce1426c4813df12381e1a75"; }; } { @@ -2618,11 +2882,11 @@ }; } { - name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.2.0.tgz"; + name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.3.0.tgz"; path = fetchurl { - name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.2.0.tgz"; - sha1 = "3371ef6365ef9c25fa4b81c16ace0e9c7dc58c3e"; + name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz"; + sha1 = "23ac613cc9a856e4f88ff8bb73bbb5e989825cf7"; }; } { @@ -2650,27 +2914,35 @@ }; } { - name = "character_entities_legacy___character_entities_legacy_1.1.3.tgz"; + name = "chalk___chalk_3.0.0.tgz"; + path = fetchurl { + name = "chalk___chalk_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; + sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; + }; + } + { + name = "character_entities_legacy___character_entities_legacy_1.1.4.tgz"; path = fetchurl { - name = "character_entities_legacy___character_entities_legacy_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.3.tgz"; - sha1 = "3c729991d9293da0ede6dddcaf1f2ce1009ee8b4"; + name = "character_entities_legacy___character_entities_legacy_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz"; + sha1 = "94bc1845dce70a5bb9d2ecc748725661293d8fc1"; }; } { - name = "character_entities___character_entities_1.2.3.tgz"; + name = "character_entities___character_entities_1.2.4.tgz"; path = fetchurl { - name = "character_entities___character_entities_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.3.tgz"; - sha1 = "bbed4a52fe7ef98cc713c6d80d9faa26916d54e6"; + name = "character_entities___character_entities_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz"; + sha1 = "e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b"; }; } { - name = "character_reference_invalid___character_reference_invalid_1.1.3.tgz"; + name = "character_reference_invalid___character_reference_invalid_1.1.4.tgz"; path = fetchurl { - name = "character_reference_invalid___character_reference_invalid_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.3.tgz"; - sha1 = "1647f4f726638d3ea4a750cf5d1975c1c7919a85"; + name = "character_reference_invalid___character_reference_invalid_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz"; + sha1 = "083329cda0eae272ab3dbbf37e9a382c13af1560"; }; } { @@ -2690,11 +2962,19 @@ }; } { - name = "chownr___chownr_1.1.2.tgz"; + name = "chokidar___chokidar_3.4.0.tgz"; path = fetchurl { - name = "chownr___chownr_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.2.tgz"; - sha1 = "a18f1e0b269c8a6a5d3c86eb298beb14c3dd7bf6"; + name = "chokidar___chokidar_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz"; + sha1 = "b30611423ce376357c765b9b8f904b9fba3c0be8"; + }; + } + { + name = "chownr___chownr_1.1.4.tgz"; + path = fetchurl { + name = "chownr___chownr_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; + sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; }; } { @@ -2730,27 +3010,35 @@ }; } { - name = "clean_css___clean_css_4.2.1.tgz"; + name = "clean_css___clean_css_4.2.3.tgz"; path = fetchurl { - name = "clean_css___clean_css_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz"; - sha1 = "2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"; + name = "clean_css___clean_css_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz"; + sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78"; }; } { - name = "cli_cursor___cli_cursor_2.1.0.tgz"; + name = "clean_stack___clean_stack_2.2.0.tgz"; path = fetchurl { - name = "cli_cursor___cli_cursor_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + name = "clean_stack___clean_stack_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz"; + sha1 = "ee8472dbb129e727b31e8a10a427dee9dfe4008b"; }; } { - name = "cli_width___cli_width_2.2.0.tgz"; + name = "cli_cursor___cli_cursor_3.1.0.tgz"; path = fetchurl { - name = "cli_width___cli_width_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz"; - sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + name = "cli_cursor___cli_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz"; + sha1 = "264305a7ae490d1d03bf0c9ba7c925d1753af307"; + }; + } + { + name = "cli_width___cli_width_2.2.1.tgz"; + path = fetchurl { + name = "cli_width___cli_width_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz"; + sha1 = "b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"; }; } { @@ -2786,11 +3074,11 @@ }; } { - name = "clsx___clsx_1.0.4.tgz"; + name = "clsx___clsx_1.1.0.tgz"; path = fetchurl { - name = "clsx___clsx_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/clsx/-/clsx-1.0.4.tgz"; - sha1 = "0c0171f6d5cb2fe83848463c15fcc26b4df8c2ec"; + name = "clsx___clsx_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/clsx/-/clsx-1.1.0.tgz"; + sha1 = "62937c6adfea771247c34b54d320fb99624f5702"; }; } { @@ -2818,19 +3106,19 @@ }; } { - name = "codemirror___codemirror_5.48.4.tgz"; + name = "codemirror___codemirror_5.53.2.tgz"; path = fetchurl { - name = "codemirror___codemirror_5.48.4.tgz"; - url = "https://registry.yarnpkg.com/codemirror/-/codemirror-5.48.4.tgz"; - sha1 = "4210fbe92be79a88f0eea348fab3ae78da85ce47"; + name = "codemirror___codemirror_5.53.2.tgz"; + url = "https://registry.yarnpkg.com/codemirror/-/codemirror-5.53.2.tgz"; + sha1 = "9799121cf8c50809cca487304e9de3a74d33f428"; }; } { - name = "collapse_white_space___collapse_white_space_1.0.5.tgz"; + name = "collapse_white_space___collapse_white_space_1.0.6.tgz"; path = fetchurl { - name = "collapse_white_space___collapse_white_space_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.5.tgz"; - sha1 = "c2495b699ab1ed380d29a1091e01063e75dbbe3a"; + name = "collapse_white_space___collapse_white_space_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz"; + sha1 = "e63629c0016665792060dbbeb79c42239d2c5287"; }; } { @@ -2850,6 +3138,14 @@ }; } { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } + { name = "color_name___color_name_1.1.3.tgz"; path = fetchurl { name = "color_name___color_name_1.1.3.tgz"; @@ -2890,27 +3186,19 @@ }; } { - name = "commander___commander_2.17.1.tgz"; + name = "commander___commander_2.20.3.tgz"; path = fetchurl { - name = "commander___commander_2.17.1.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz"; - sha1 = "bd77ab7de6de94205ceacc72f1716d29f20a77bf"; + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; }; } { - name = "commander___commander_2.20.0.tgz"; + name = "commander___commander_4.1.1.tgz"; path = fetchurl { - name = "commander___commander_2.20.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz"; - sha1 = "d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"; - }; - } - { - name = "commander___commander_2.19.0.tgz"; - path = fetchurl { - name = "commander___commander_2.19.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz"; - sha1 = "f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"; + name = "commander___commander_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz"; + sha1 = "9fd602bd936294e9e9ef46a3f4d6964044b18068"; }; } { @@ -2946,11 +3234,11 @@ }; } { - name = "compressible___compressible_2.0.17.tgz"; + name = "compressible___compressible_2.0.18.tgz"; path = fetchurl { - name = "compressible___compressible_2.0.17.tgz"; - url = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz"; - sha1 = "6e8c108a16ad58384a977f3a482ca20bff2f38c1"; + name = "compressible___compressible_2.0.18.tgz"; + url = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz"; + sha1 = "af53cca6b070d4c3c0750fbd77286a6d7cc46fba"; }; } { @@ -2978,11 +3266,11 @@ }; } { - name = "confusing_browser_globals___confusing_browser_globals_1.0.8.tgz"; + name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz"; path = fetchurl { - name = "confusing_browser_globals___confusing_browser_globals_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.8.tgz"; - sha1 = "93ffec1f82a6e2bf2bc36769cc3a92fa20e502f3"; + name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz"; + sha1 = "72bc13b483c0276801681871d4898516f8f54fdd"; }; } { @@ -2994,19 +3282,11 @@ }; } { - name = "console_browserify___console_browserify_1.1.0.tgz"; + name = "console_browserify___console_browserify_1.2.0.tgz"; path = fetchurl { - name = "console_browserify___console_browserify_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz"; - sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10"; - }; - } - { - name = "console_control_strings___console_control_strings_1.1.0.tgz"; - path = fetchurl { - name = "console_control_strings___console_control_strings_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + name = "console_browserify___console_browserify_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz"; + sha1 = "67063cef57ceb6cf4993a2ab3a55840ae8c49336"; }; } { @@ -3042,19 +3322,11 @@ }; } { - name = "convert_css_length___convert_css_length_2.0.1.tgz"; - path = fetchurl { - name = "convert_css_length___convert_css_length_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/convert-css-length/-/convert-css-length-2.0.1.tgz"; - sha1 = "90a76bde5bfd24d72881a5b45d02249b2c1d257c"; - }; - } - { - name = "convert_source_map___convert_source_map_1.6.0.tgz"; + name = "convert_source_map___convert_source_map_1.7.0.tgz"; path = fetchurl { - name = "convert_source_map___convert_source_map_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz"; - sha1 = "51b537a8c43e0f04dec1993bffcdd504e758ac20"; + name = "convert_source_map___convert_source_map_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz"; + sha1 = "17a2cb882d7f77d3490585e2ce6c524424a3a442"; }; } { @@ -3098,19 +3370,19 @@ }; } { - name = "core_js_compat___core_js_compat_3.2.1.tgz"; + name = "core_js_compat___core_js_compat_3.6.5.tgz"; path = fetchurl { - name = "core_js_compat___core_js_compat_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.2.1.tgz"; - sha1 = "0cbdbc2e386e8e00d3b85dc81c848effec5b8150"; + name = "core_js_compat___core_js_compat_3.6.5.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz"; + sha1 = "2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"; }; } { - name = "core_js___core_js_3.1.4.tgz"; + name = "core_js_pure___core_js_pure_3.6.5.tgz"; path = fetchurl { - name = "core_js___core_js_3.1.4.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.1.4.tgz"; - sha1 = "3a2837fc48e582e1ae25907afcd6cf03b0cc7a07"; + name = "core_js_pure___core_js_pure_3.6.5.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz"; + sha1 = "c79e75f5e38dbc85a662d91eea52b8256d53b813"; }; } { @@ -3122,11 +3394,19 @@ }; } { - name = "core_js___core_js_2.6.9.tgz"; + name = "core_js___core_js_2.6.11.tgz"; + path = fetchurl { + name = "core_js___core_js_2.6.11.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz"; + sha1 = "38831469f9922bded8ee21c9dc46985e0399308c"; + }; + } + { + name = "core_js___core_js_3.6.5.tgz"; path = fetchurl { - name = "core_js___core_js_2.6.9.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz"; - sha1 = "6b4b214620c834152e179323727fc19741b084f2"; + name = "core_js___core_js_3.6.5.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz"; + sha1 = "7395dc273af37fb2e50e9bd3d9fe841285231d1a"; }; } { @@ -3146,6 +3426,14 @@ }; } { + name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; + path = fetchurl { + name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz"; + sha1 = "da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"; + }; + } + { name = "create_ecdh___create_ecdh_4.0.3.tgz"; path = fetchurl { name = "create_ecdh___create_ecdh_4.0.3.tgz"; @@ -3170,6 +3458,14 @@ }; } { + name = "cross_spawn___cross_spawn_7.0.1.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz"; + sha1 = "0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"; + }; + } + { name = "cross_spawn___cross_spawn_6.0.5.tgz"; path = fetchurl { name = "cross_spawn___cross_spawn_6.0.5.tgz"; @@ -3218,11 +3514,11 @@ }; } { - name = "css_loader___css_loader_2.1.1.tgz"; + name = "css_loader___css_loader_3.4.2.tgz"; path = fetchurl { - name = "css_loader___css_loader_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/css-loader/-/css-loader-2.1.1.tgz"; - sha1 = "d8254f72e412bb2238bb44dd674ffbef497333ea"; + name = "css_loader___css_loader_3.4.2.tgz"; + url = "https://registry.yarnpkg.com/css-loader/-/css-loader-3.4.2.tgz"; + sha1 = "d3fdb3358b43f233b78501c5ed7b1c6da6133202"; }; } { @@ -3250,43 +3546,35 @@ }; } { - name = "css_select___css_select_2.0.2.tgz"; - path = fetchurl { - name = "css_select___css_select_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/css-select/-/css-select-2.0.2.tgz"; - sha1 = "ab4386cec9e1f668855564b17c3733b43b2a5ede"; - }; - } - { - name = "css_tree___css_tree_1.0.0_alpha.29.tgz"; + name = "css_select___css_select_2.1.0.tgz"; path = fetchurl { - name = "css_tree___css_tree_1.0.0_alpha.29.tgz"; - url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz"; - sha1 = "3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39"; + name = "css_select___css_select_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz"; + sha1 = "6a34653356635934a81baca68d0255432105dbef"; }; } { - name = "css_tree___css_tree_1.0.0_alpha.33.tgz"; + name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; path = fetchurl { - name = "css_tree___css_tree_1.0.0_alpha.33.tgz"; - url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.33.tgz"; - sha1 = "970e20e5a91f7a378ddd0fc58d0b6c8d4f3be93e"; + name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz"; + sha1 = "98bebd62c4c1d9f960ec340cf9f7522e30709a22"; }; } { - name = "css_unit_converter___css_unit_converter_1.1.1.tgz"; + name = "css_tree___css_tree_1.0.0_alpha.39.tgz"; path = fetchurl { - name = "css_unit_converter___css_unit_converter_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz"; - sha1 = "d9b9281adcfd8ced935bdbaba83786897f64e996"; + name = "css_tree___css_tree_1.0.0_alpha.39.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.39.tgz"; + sha1 = "2bff3ffe1bb3f776cf7eefd91ee5cba77a149eeb"; }; } { - name = "css_vendor___css_vendor_2.0.6.tgz"; + name = "css_vendor___css_vendor_2.0.8.tgz"; path = fetchurl { - name = "css_vendor___css_vendor_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.6.tgz"; - sha1 = "a205f73d7562e8728c86ef6ce5ee7c7e5eefd71b"; + name = "css_vendor___css_vendor_2.0.8.tgz"; + url = "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.8.tgz"; + sha1 = "e47f91d3bd3117d49180a3c935e62e3d9f7f449d"; }; } { @@ -3298,6 +3586,14 @@ }; } { + name = "css_what___css_what_3.2.1.tgz"; + path = fetchurl { + name = "css_what___css_what_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-3.2.1.tgz"; + sha1 = "f4a8f12421064621b456755e34a03a2c22df5da1"; + }; + } + { name = "css___css_2.2.4.tgz"; path = fetchurl { name = "css___css_2.2.4.tgz"; @@ -3378,11 +3674,11 @@ }; } { - name = "csso___csso_3.5.1.tgz"; + name = "csso___csso_4.0.3.tgz"; path = fetchurl { - name = "csso___csso_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz"; - sha1 = "7b9eb8be61628973c1b261e169d2f024008e758b"; + name = "csso___csso_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/csso/-/csso-4.0.3.tgz"; + sha1 = "0d9985dc852c7cc2b2cacfbbe1079014d1a8e903"; }; } { @@ -3402,19 +3698,19 @@ }; } { - name = "csstype___csstype_2.6.6.tgz"; + name = "csstype___csstype_2.6.10.tgz"; path = fetchurl { - name = "csstype___csstype_2.6.6.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.6.tgz"; - sha1 = "c34f8226a94bbb10c32cc0d714afdf942291fc41"; + name = "csstype___csstype_2.6.10.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz"; + sha1 = "e63af50e66d7c266edb6b32909cfd0aabe03928b"; }; } { - name = "cyclist___cyclist_0.2.2.tgz"; + name = "cyclist___cyclist_1.0.1.tgz"; path = fetchurl { - name = "cyclist___cyclist_0.2.2.tgz"; - url = "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz"; - sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640"; + name = "cyclist___cyclist_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz"; + sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9"; }; } { @@ -3426,11 +3722,11 @@ }; } { - name = "damerau_levenshtein___damerau_levenshtein_1.0.5.tgz"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; path = fetchurl { - name = "damerau_levenshtein___damerau_levenshtein_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz"; - sha1 = "780cf7144eb2e8dbd1c3bb83ae31100ccc31a414"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz"; + sha1 = "143c1641cb3d85c60c32329e26899adea8701791"; }; } { @@ -3450,14 +3746,6 @@ }; } { - name = "date_now___date_now_0.1.4.tgz"; - path = fetchurl { - name = "date_now___date_now_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz"; - sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; - }; - } - { name = "debug___debug_2.6.9.tgz"; path = fetchurl { name = "debug___debug_2.6.9.tgz"; @@ -3466,6 +3754,14 @@ }; } { + name = "debug___debug_4.1.1.tgz"; + path = fetchurl { + name = "debug___debug_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; + sha1 = "3b72260255109c6b589cee050f1d516139664791"; + }; + } + { name = "debug___debug_3.1.0.tgz"; path = fetchurl { name = "debug___debug_3.1.0.tgz"; @@ -3482,14 +3778,6 @@ }; } { - name = "debug___debug_4.1.1.tgz"; - path = fetchurl { - name = "debug___debug_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; - sha1 = "3b72260255109c6b589cee050f1d516139664791"; - }; - } - { name = "decamelize___decamelize_1.2.0.tgz"; path = fetchurl { name = "decamelize___decamelize_1.2.0.tgz"; @@ -3498,14 +3786,6 @@ }; } { - name = "decamelize___decamelize_2.0.0.tgz"; - path = fetchurl { - name = "decamelize___decamelize_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz"; - sha1 = "656d7bbc8094c4c788ea53c5840908c9c7d063c7"; - }; - } - { name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; path = fetchurl { name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; @@ -3514,19 +3794,11 @@ }; } { - name = "deep_equal___deep_equal_1.1.0.tgz"; + name = "deep_equal___deep_equal_1.1.1.tgz"; path = fetchurl { - name = "deep_equal___deep_equal_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.0.tgz"; - sha1 = "3103cdf8ab6d32cf4a8df7865458f2b8d33f3745"; - }; - } - { - name = "deep_extend___deep_extend_0.6.0.tgz"; - path = fetchurl { - name = "deep_extend___deep_extend_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; - sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; + name = "deep_equal___deep_equal_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz"; + sha1 = "b5c98c942ceffaf7cb051e24e1434a25a2e6076a"; }; } { @@ -3538,14 +3810,6 @@ }; } { - name = "deepmerge___deepmerge_4.0.0.tgz"; - path = fetchurl { - name = "deepmerge___deepmerge_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.0.0.tgz"; - sha1 = "3e3110ca29205f120d7cb064960a39c3d2087c09"; - }; - } - { name = "default_gateway___default_gateway_4.2.0.tgz"; path = fetchurl { name = "default_gateway___default_gateway_4.2.0.tgz"; @@ -3586,11 +3850,11 @@ }; } { - name = "del___del_3.0.0.tgz"; + name = "del___del_4.1.1.tgz"; path = fetchurl { - name = "del___del_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz"; - sha1 = "53ecf699ffcbcb39637691ab13baf160819766e5"; + name = "del___del_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz"; + sha1 = "9e8f117222ea44a31ff3a156c049b99052a9f0b4"; }; } { @@ -3602,14 +3866,6 @@ }; } { - name = "delegates___delegates_1.0.0.tgz"; - path = fetchurl { - name = "delegates___delegates_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; - sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; - }; - } - { name = "depd___depd_1.1.2.tgz"; path = fetchurl { name = "depd___depd_1.1.2.tgz"; @@ -3618,11 +3874,11 @@ }; } { - name = "des.js___des.js_1.0.0.tgz"; + name = "des.js___des.js_1.0.1.tgz"; path = fetchurl { - name = "des.js___des.js_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz"; - sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; + name = "des.js___des.js_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz"; + sha1 = "5382142e1bdc53f85d86d53e5f4aa7deb91e0843"; }; } { @@ -3634,19 +3890,11 @@ }; } { - name = "detect_browser___detect_browser_3.0.1.tgz"; - path = fetchurl { - name = "detect_browser___detect_browser_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/detect-browser/-/detect-browser-3.0.1.tgz"; - sha1 = "39beead014347a8a2be1f3c4cb30a0aef2127c44"; - }; - } - { - name = "detect_libc___detect_libc_1.0.3.tgz"; + name = "detect_browser___detect_browser_5.1.0.tgz"; path = fetchurl { - name = "detect_libc___detect_libc_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + name = "detect_browser___detect_browser_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.1.0.tgz"; + sha1 = "0c51c66b747ad8f98a6832bf3026a5a23a7850ff"; }; } { @@ -3682,11 +3930,19 @@ }; } { - name = "diff___diff_4.0.1.tgz"; + name = "diff_sequences___diff_sequences_25.2.6.tgz"; path = fetchurl { - name = "diff___diff_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz"; - sha1 = "0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"; + name = "diff_sequences___diff_sequences_25.2.6.tgz"; + url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz"; + sha1 = "5f467c00edd35352b7bca46d7927d60e687a76dd"; + }; + } + { + name = "diff___diff_4.0.2.tgz"; + path = fetchurl { + name = "diff___diff_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz"; + sha1 = "60f3aecb89d5fae520c11aa19efc2bb982aade7d"; }; } { @@ -3762,19 +4018,19 @@ }; } { - name = "dom_helpers___dom_helpers_5.1.0.tgz"; + name = "dom_helpers___dom_helpers_5.1.4.tgz"; path = fetchurl { - name = "dom_helpers___dom_helpers_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.0.tgz"; - sha1 = "57a726de04abcc2a8bbfe664b3e21c584bde514e"; + name = "dom_helpers___dom_helpers_5.1.4.tgz"; + url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.4.tgz"; + sha1 = "4609680ab5c79a45f2531441f1949b79d6587f4b"; }; } { - name = "dom_serializer___dom_serializer_0.2.1.tgz"; + name = "dom_serializer___dom_serializer_0.2.2.tgz"; path = fetchurl { - name = "dom_serializer___dom_serializer_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.1.tgz"; - sha1 = "13650c850daffea35d8b626a4cfc4d3a17643fdb"; + name = "dom_serializer___dom_serializer_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz"; + sha1 = "1afb81f533717175d478655debc5e332d9f9bb51"; }; } { @@ -3850,27 +4106,35 @@ }; } { - name = "dot_prop___dot_prop_4.2.0.tgz"; + name = "dot_case___dot_case_3.0.3.tgz"; + path = fetchurl { + name = "dot_case___dot_case_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz"; + sha1 = "21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"; + }; + } + { + name = "dot_prop___dot_prop_5.2.0.tgz"; path = fetchurl { - name = "dot_prop___dot_prop_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz"; - sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57"; + name = "dot_prop___dot_prop_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz"; + sha1 = "c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"; }; } { - name = "dotenv_expand___dotenv_expand_4.2.0.tgz"; + name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; path = fetchurl { - name = "dotenv_expand___dotenv_expand_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz"; - sha1 = "def1f1ca5d6059d24a766e587942c21106ce1275"; + name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz"; + sha1 = "3fbaf020bfd794884072ea26b1e9791d45a629f0"; }; } { - name = "dotenv___dotenv_6.2.0.tgz"; + name = "dotenv___dotenv_8.2.0.tgz"; path = fetchurl { - name = "dotenv___dotenv_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz"; - sha1 = "941c0410535d942c8becf28d3f357dbd9d476064"; + name = "dotenv___dotenv_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz"; + sha1 = "97e619259ada750eea3e4ea3e26bceea5424b16a"; }; } { @@ -3906,19 +4170,19 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.252.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.431.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.252.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.252.tgz"; - sha1 = "5b6261965b564a0f4df0f1c86246487897017f52"; + name = "electron_to_chromium___electron_to_chromium_1.3.431.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.431.tgz"; + sha1 = "705dd8ef46200415ba837b31d927cdc1e43db303"; }; } { - name = "elliptic___elliptic_6.5.1.tgz"; + name = "elliptic___elliptic_6.5.2.tgz"; path = fetchurl { - name = "elliptic___elliptic_6.5.1.tgz"; - url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.1.tgz"; - sha1 = "c380f5f909bf1b9b4428d028cd18d3b0efd6b52b"; + name = "elliptic___elliptic_6.5.2.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz"; + sha1 = "05c5678d7173c049d8ca433552224a495d0e3762"; }; } { @@ -3930,6 +4194,14 @@ }; } { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + }; + } + { name = "emojis_list___emojis_list_2.1.0.tgz"; path = fetchurl { name = "emojis_list___emojis_list_2.1.0.tgz"; @@ -3938,6 +4210,14 @@ }; } { + name = "emojis_list___emojis_list_3.0.0.tgz"; + path = fetchurl { + name = "emojis_list___emojis_list_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz"; + sha1 = "5570662046ad29e2e916e71aae260abdff4f6a78"; + }; + } + { name = "encodeurl___encodeurl_1.0.2.tgz"; path = fetchurl { name = "encodeurl___encodeurl_1.0.2.tgz"; @@ -3954,19 +4234,19 @@ }; } { - name = "end_of_stream___end_of_stream_1.4.1.tgz"; + name = "end_of_stream___end_of_stream_1.4.4.tgz"; path = fetchurl { - name = "end_of_stream___end_of_stream_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz"; - sha1 = "ed29634d19baba463b6ce6b80a37213eab71ec43"; + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; }; } { - name = "enhanced_resolve___enhanced_resolve_4.1.0.tgz"; + name = "enhanced_resolve___enhanced_resolve_4.1.1.tgz"; path = fetchurl { - name = "enhanced_resolve___enhanced_resolve_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz"; - sha1 = "41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"; + name = "enhanced_resolve___enhanced_resolve_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz"; + sha1 = "2937e2b8066cd0fe7ce0990a98f0d71a35189f66"; }; } { @@ -3994,11 +4274,11 @@ }; } { - name = "enzyme_adapter_utils___enzyme_adapter_utils_1.12.0.tgz"; + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.0.tgz"; path = fetchurl { - name = "enzyme_adapter_utils___enzyme_adapter_utils_1.12.0.tgz"; - url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.12.0.tgz"; - sha1 = "96e3730d76b872f593e54ce1c51fa3a451422d93"; + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.0.tgz"; + sha1 = "01c885dde2114b4690bf741f8dc94cee3060eb78"; }; } { @@ -4018,27 +4298,27 @@ }; } { - name = "es_abstract___es_abstract_1.14.1.tgz"; + name = "es_abstract___es_abstract_1.17.5.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.14.1.tgz"; - sha1 = "6e8d84b445ec9c610781e74a6d52cc31aac5b4ca"; + name = "es_abstract___es_abstract_1.17.5.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz"; + sha1 = "d8c9d1d66c8981fb9200e2251d799eee92774ae9"; }; } { - name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; path = fetchurl { - name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; - sha1 = "edf72478033456e8dda8ef09e00ad9650707f377"; + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; }; } { - name = "es5_ext___es5_ext_0.10.51.tgz"; + name = "es5_ext___es5_ext_0.10.53.tgz"; path = fetchurl { - name = "es5_ext___es5_ext_0.10.51.tgz"; - url = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.51.tgz"; - sha1 = "ed2d7d9d48a12df86e0299287e93a09ff478842f"; + name = "es5_ext___es5_ext_0.10.53.tgz"; + url = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz"; + sha1 = "93c5a3acfdbef275220ad72644ad02ee18368de1"; }; } { @@ -4050,27 +4330,11 @@ }; } { - name = "es6_promise___es6_promise_4.2.8.tgz"; + name = "es6_symbol___es6_symbol_3.1.3.tgz"; path = fetchurl { - name = "es6_promise___es6_promise_4.2.8.tgz"; - url = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz"; - sha1 = "4eb21594c972bc40553d276e510539143db53e0a"; - }; - } - { - name = "es6_promisify___es6_promisify_5.0.0.tgz"; - path = fetchurl { - name = "es6_promisify___es6_promisify_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz"; - sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; - }; - } - { - name = "es6_symbol___es6_symbol_3.1.1.tgz"; - path = fetchurl { - name = "es6_symbol___es6_symbol_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz"; - sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; + name = "es6_symbol___es6_symbol_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz"; + sha1 = "bad5d3c1bcdac28269f4cb331e431c78ac705d18"; }; } { @@ -4082,6 +4346,14 @@ }; } { + name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; + sha1 = "a30304e99daa32e23b2fd20f51babd07cffca344"; + }; + } + { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; path = fetchurl { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; @@ -4090,59 +4362,59 @@ }; } { - name = "escodegen___escodegen_1.12.0.tgz"; + name = "escodegen___escodegen_1.14.1.tgz"; path = fetchurl { - name = "escodegen___escodegen_1.12.0.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz"; - sha1 = "f763daf840af172bb3a2b6dd7219c0e17f7ff541"; + name = "escodegen___escodegen_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz"; + sha1 = "ba01d0c8278b5e95a9a45350142026659027a457"; }; } { - name = "eslint_config_react_app___eslint_config_react_app_5.0.1.tgz"; + name = "eslint_config_react_app___eslint_config_react_app_5.2.1.tgz"; path = fetchurl { - name = "eslint_config_react_app___eslint_config_react_app_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.0.1.tgz"; - sha1 = "5f3d666ba3ee3cb384eb943e260e868f6c72251b"; + name = "eslint_config_react_app___eslint_config_react_app_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.2.1.tgz"; + sha1 = "698bf7aeee27f0cea0139eaef261c7bf7dd623df"; }; } { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz"; path = fetchurl { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz"; - sha1 = "58f15fb839b8d0576ca980413476aab2472db66a"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz"; + sha1 = "dbaa52b6b2816b50bc6711af75422de808e98404"; }; } { - name = "eslint_loader___eslint_loader_2.2.1.tgz"; + name = "eslint_loader___eslint_loader_3.0.3.tgz"; path = fetchurl { - name = "eslint_loader___eslint_loader_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-2.2.1.tgz"; - sha1 = "28b9c12da54057af0845e2a6112701a2f6bf8337"; + name = "eslint_loader___eslint_loader_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-3.0.3.tgz"; + sha1 = "e018e3d2722381d982b1201adb56819c73b480ca"; }; } { - name = "eslint_module_utils___eslint_module_utils_2.4.1.tgz"; + name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz"; - sha1 = "7b4675875bf96b0dbf1b21977456e5bb1f5e018c"; + name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz"; + sha1 = "579ebd094f56af7797d19c9866c9c9486629bfa6"; }; } { - name = "eslint_plugin_flowtype___eslint_plugin_flowtype_3.13.0.tgz"; + name = "eslint_plugin_flowtype___eslint_plugin_flowtype_4.6.0.tgz"; path = fetchurl { - name = "eslint_plugin_flowtype___eslint_plugin_flowtype_3.13.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-3.13.0.tgz"; - sha1 = "e241ebd39c0ce519345a3f074ec1ebde4cf80f2c"; + name = "eslint_plugin_flowtype___eslint_plugin_flowtype_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-4.6.0.tgz"; + sha1 = "82b2bd6f21770e0e5deede0228e456cb35308451"; }; } { - name = "eslint_plugin_import___eslint_plugin_import_2.18.2.tgz"; + name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz"; path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.18.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz"; - sha1 = "02f1180b90b077b33d447a17a2326ceb400aceb6"; + name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz"; + sha1 = "802423196dcb11d9ce8435a5fc02a6d3b46939b3"; }; } { @@ -4162,19 +4434,11 @@ }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.14.3.tgz"; - path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz"; - sha1 = "911030dd7e98ba49e1b2208599571846a66bdf13"; - }; - } - { - name = "eslint_scope___eslint_scope_3.7.1.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.19.0.tgz"; path = fetchurl { - name = "eslint_scope___eslint_scope_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz"; - sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; + name = "eslint_plugin_react___eslint_plugin_react_7.19.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz"; + sha1 = "6d08f9673628aa69c5559d33489e855d83551666"; }; } { @@ -4194,43 +4458,43 @@ }; } { - name = "eslint_utils___eslint_utils_1.4.2.tgz"; + name = "eslint_utils___eslint_utils_1.4.3.tgz"; path = fetchurl { - name = "eslint_utils___eslint_utils_1.4.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz"; - sha1 = "166a5180ef6ab7eb462f162fd0e6f2463d7309ab"; + name = "eslint_utils___eslint_utils_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz"; + sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f"; }; } { - name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; + name = "eslint_utils___eslint_utils_2.0.0.tgz"; path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; - sha1 = "e2a82cea84ff246ad6fb57f9bde5b46621459ec2"; + name = "eslint_utils___eslint_utils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz"; + sha1 = "7be1cc70f27a72a76cd14aa698bcabed6890e1cd"; }; } { - name = "eslint___eslint_6.3.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; path = fetchurl { - name = "eslint___eslint_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-6.3.0.tgz"; - sha1 = "1f1a902f67bfd4c354e7288b81e40654d927eb6a"; + name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; + sha1 = "e2a82cea84ff246ad6fb57f9bde5b46621459ec2"; }; } { - name = "espree___espree_6.1.1.tgz"; + name = "eslint___eslint_6.8.0.tgz"; path = fetchurl { - name = "espree___espree_6.1.1.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-6.1.1.tgz"; - sha1 = "7f80e5f7257fc47db450022d723e356daeb1e5de"; + name = "eslint___eslint_6.8.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz"; + sha1 = "62262d6729739f9275723824302fb227c8c93ffb"; }; } { - name = "esprima___esprima_3.1.3.tgz"; + name = "espree___espree_6.2.1.tgz"; path = fetchurl { - name = "esprima___esprima_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz"; - sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + name = "espree___espree_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz"; + sha1 = "77fc72e1fd744a2052c20f38a5b575832e82734a"; }; } { @@ -4242,11 +4506,11 @@ }; } { - name = "esquery___esquery_1.0.1.tgz"; + name = "esquery___esquery_1.3.1.tgz"; path = fetchurl { - name = "esquery___esquery_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz"; - sha1 = "406c51658b1f5991a5f9b62b1dc25b00e3e5c708"; + name = "esquery___esquery_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; + sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57"; }; } { @@ -4266,6 +4530,14 @@ }; } { + name = "estraverse___estraverse_5.1.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz"; + sha1 = "374309d39fd935ae500e7b92e8a6b4c720e59642"; + }; + } + { name = "esutils___esutils_2.0.3.tgz"; path = fetchurl { name = "esutils___esutils_2.0.3.tgz"; @@ -4282,19 +4554,19 @@ }; } { - name = "eventemitter3___eventemitter3_3.1.2.tgz"; + name = "eventemitter3___eventemitter3_4.0.0.tgz"; path = fetchurl { - name = "eventemitter3___eventemitter3_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz"; - sha1 = "2d3d48f9c346698fce83a85d7d664e98535df6e7"; + name = "eventemitter3___eventemitter3_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz"; + sha1 = "d65176163887ee59f386d64c82610b696a4a74eb"; }; } { - name = "events___events_3.0.0.tgz"; + name = "events___events_3.1.0.tgz"; path = fetchurl { - name = "events___events_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz"; - sha1 = "9a0a0dfaf62893d92b875b8f2698ca4114973e88"; + name = "events___events_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz"; + sha1 = "84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"; }; } { @@ -4314,11 +4586,11 @@ }; } { - name = "exec_sh___exec_sh_0.3.2.tgz"; + name = "exec_sh___exec_sh_0.3.4.tgz"; path = fetchurl { - name = "exec_sh___exec_sh_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz"; - sha1 = "6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"; + name = "exec_sh___exec_sh_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz"; + sha1 = "3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"; }; } { @@ -4362,6 +4634,14 @@ }; } { + name = "ext___ext_1.4.0.tgz"; + path = fetchurl { + name = "ext___ext_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz"; + sha1 = "89ae7a07158f79d35517882904324077e4379244"; + }; + } + { name = "extend_shallow___extend_shallow_2.0.1.tgz"; path = fetchurl { name = "extend_shallow___extend_shallow_2.0.1.tgz"; @@ -4402,11 +4682,11 @@ }; } { - name = "extract_zip___extract_zip_1.6.7.tgz"; + name = "extract_zip___extract_zip_2.0.0.tgz"; path = fetchurl { - name = "extract_zip___extract_zip_1.6.7.tgz"; - url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz"; - sha1 = "a840b4b8af6403264c8db57f4f1a74333ef81fe9"; + name = "extract_zip___extract_zip_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.0.tgz"; + sha1 = "f53b71d44f4ff5a4527a2259ade000fb8b303492"; }; } { @@ -4426,11 +4706,11 @@ }; } { - name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; + name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; path = fetchurl { - name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; - sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; + sha1 = "545145077c501491e33b15ec408c294376e94ae4"; }; } { @@ -4442,11 +4722,11 @@ }; } { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; path = fetchurl { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; }; } { @@ -4474,11 +4754,11 @@ }; } { - name = "fb_watchman___fb_watchman_2.0.0.tgz"; + name = "fb_watchman___fb_watchman_2.0.1.tgz"; path = fetchurl { - name = "fb_watchman___fb_watchman_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz"; - sha1 = "54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"; + name = "fb_watchman___fb_watchman_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz"; + sha1 = "fc84fb39d2709cf3ff6d743706157bb5708a8a85"; }; } { @@ -4490,27 +4770,27 @@ }; } { - name = "fd_slicer___fd_slicer_1.0.1.tgz"; + name = "fd_slicer___fd_slicer_1.1.0.tgz"; path = fetchurl { - name = "fd_slicer___fd_slicer_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz"; - sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; + sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; }; } { - name = "figgy_pudding___figgy_pudding_3.5.1.tgz"; + name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; path = fetchurl { - name = "figgy_pudding___figgy_pudding_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz"; - sha1 = "862470112901c727a0e495a80744bd5baa1d6790"; + name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; + sha1 = "b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"; }; } { - name = "figures___figures_2.0.0.tgz"; + name = "figures___figures_3.2.0.tgz"; path = fetchurl { - name = "figures___figures_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz"; - sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + name = "figures___figures_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz"; + sha1 = "625c18bd293c604dc4a8ddb2febf0c88341746af"; }; } { @@ -4522,19 +4802,27 @@ }; } { - name = "file_loader___file_loader_3.0.1.tgz"; + name = "file_loader___file_loader_4.3.0.tgz"; + path = fetchurl { + name = "file_loader___file_loader_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/file-loader/-/file-loader-4.3.0.tgz"; + sha1 = "780f040f729b3d18019f20605f723e844b8a58af"; + }; + } + { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; path = fetchurl { - name = "file_loader___file_loader_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz"; - sha1 = "f8e0ba0b599918b51adfe45d66d1e771ad560faa"; + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd"; }; } { - name = "filesize___filesize_3.6.1.tgz"; + name = "filesize___filesize_6.0.1.tgz"; path = fetchurl { - name = "filesize___filesize_3.6.1.tgz"; - url = "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz"; - sha1 = "090bb3ee01b6f801a8a8be99d31710b3422bb317"; + name = "filesize___filesize_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/filesize/-/filesize-6.0.1.tgz"; + sha1 = "f850b509909c7c86f7e450ea19006c31c2ed3d2f"; }; } { @@ -4546,6 +4834,14 @@ }; } { + name = "fill_range___fill_range_7.0.1.tgz"; + path = fetchurl { + name = "fill_range___fill_range_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; + sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; + }; + } + { name = "finalhandler___finalhandler_1.1.2.tgz"; path = fetchurl { name = "finalhandler___finalhandler_1.1.2.tgz"; @@ -4570,11 +4866,19 @@ }; } { - name = "find_up___find_up_3.0.0.tgz"; + name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; path = fetchurl { - name = "find_up___find_up_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz"; - sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73"; + name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; + url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz"; + sha1 = "89b33fad4a4670daa94f855f7fbe31d6d84fe880"; + }; + } + { + name = "find_up___find_up_4.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; + sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; }; } { @@ -4594,6 +4898,14 @@ }; } { + name = "find_up___find_up_3.0.0.tgz"; + path = fetchurl { + name = "find_up___find_up_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz"; + sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73"; + }; + } + { name = "flat_cache___flat_cache_2.0.1.tgz"; path = fetchurl { name = "flat_cache___flat_cache_2.0.1.tgz"; @@ -4602,19 +4914,19 @@ }; } { - name = "flatted___flatted_2.0.1.tgz"; + name = "flatted___flatted_2.0.2.tgz"; path = fetchurl { - name = "flatted___flatted_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz"; - sha1 = "69e57caa8f0eacbc281d2e2cb458d46fdb449e08"; + name = "flatted___flatted_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz"; + sha1 = "4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"; }; } { - name = "flatten___flatten_1.0.2.tgz"; + name = "flatten___flatten_1.0.3.tgz"; path = fetchurl { - name = "flatten___flatten_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz"; - sha1 = "dae46a9d78fbe25292258cc1e780a41d95c03782"; + name = "flatten___flatten_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz"; + sha1 = "c1283ac9f27b368abc1e36d1ff7b04501a30356b"; }; } { @@ -4634,11 +4946,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.8.1.tgz"; + name = "follow_redirects___follow_redirects_1.11.0.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.8.1.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.8.1.tgz"; - sha1 = "24804f9eaab67160b0e840c085885d606371a35b"; + name = "follow_redirects___follow_redirects_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz"; + sha1 = "afa14f08ba12a52963140fe43212658897bc0ecb"; }; } { @@ -4674,11 +4986,11 @@ }; } { - name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_1.5.0.tgz"; + name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_3.1.1.tgz"; path = fetchurl { - name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.5.0.tgz"; - sha1 = "ce1d77190b44d81a761b10b6284a373795e41f0c"; + name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.1.1.tgz"; + sha1 = "a1642c0d3e65f50c2cc1742e9c0a80f441f86b19"; }; } { @@ -4722,11 +5034,11 @@ }; } { - name = "fs_extra___fs_extra_7.0.1.tgz"; + name = "fs_constants___fs_constants_1.0.0.tgz"; path = fetchurl { - name = "fs_extra___fs_extra_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz"; - sha1 = "4f189c44aa123b895f722804f55ea23eadc348e9"; + name = "fs_constants___fs_constants_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz"; + sha1 = "6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"; }; } { @@ -4738,11 +5050,27 @@ }; } { - name = "fs_minipass___fs_minipass_1.2.6.tgz"; + name = "fs_extra___fs_extra_7.0.1.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz"; + sha1 = "4f189c44aa123b895f722804f55ea23eadc348e9"; + }; + } + { + name = "fs_extra___fs_extra_8.1.0.tgz"; path = fetchurl { - name = "fs_minipass___fs_minipass_1.2.6.tgz"; - url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz"; - sha1 = "2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"; + name = "fs_extra___fs_extra_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; + sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"; + }; + } + { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha1 = "7f5036fdbf12c63c169190cbe4199c852271f9fb"; }; } { @@ -4762,19 +5090,27 @@ }; } { - name = "fsevents___fsevents_2.0.7.tgz"; + name = "fsevents___fsevents_2.1.2.tgz"; path = fetchurl { - name = "fsevents___fsevents_2.0.7.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.7.tgz"; - sha1 = "382c9b443c6cbac4c57187cdda23aa3bf1ccfc2a"; + name = "fsevents___fsevents_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz"; + sha1 = "4c0a1fb34bc68e543b4b82a9ec392bfbda840805"; }; } { - name = "fsevents___fsevents_1.2.9.tgz"; + name = "fsevents___fsevents_1.2.13.tgz"; path = fetchurl { - name = "fsevents___fsevents_1.2.9.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz"; - sha1 = "3f5ed66583ccd6f400b5a00db6f7e861363e388f"; + name = "fsevents___fsevents_1.2.13.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz"; + sha1 = "f325cb0455592428bcf11b383370ef70e3bfcc38"; + }; + } + { + name = "fsevents___fsevents_2.1.3.tgz"; + path = fetchurl { + name = "fsevents___fsevents_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz"; + sha1 = "fb738703ae8d2f9fe900c33836ddebee8b97f23e"; }; } { @@ -4786,11 +5122,11 @@ }; } { - name = "function.prototype.name___function.prototype.name_1.1.1.tgz"; + name = "function.prototype.name___function.prototype.name_1.1.2.tgz"; path = fetchurl { - name = "function.prototype.name___function.prototype.name_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.1.tgz"; - sha1 = "6d252350803085abc2ad423d4fe3be2f9cbda392"; + name = "function.prototype.name___function.prototype.name_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.2.tgz"; + sha1 = "5cdf79d7c05db401591dfde83e3b70c5123e9a45"; }; } { @@ -4802,19 +5138,19 @@ }; } { - name = "functions_have_names___functions_have_names_1.1.1.tgz"; + name = "functions_have_names___functions_have_names_1.2.1.tgz"; path = fetchurl { - name = "functions_have_names___functions_have_names_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.1.1.tgz"; - sha1 = "79d35927f07b8e7103d819fed475b64ccf7225ea"; + name = "functions_have_names___functions_have_names_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.1.tgz"; + sha1 = "a981ac397fa0c9964551402cdc5533d7a4d52f91"; }; } { - name = "gauge___gauge_2.7.4.tgz"; + name = "gensync___gensync_1.0.0_beta.1.tgz"; path = fetchurl { - name = "gauge___gauge_2.7.4.tgz"; - url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; - sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + name = "gensync___gensync_1.0.0_beta.1.tgz"; + url = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz"; + sha1 = "58f4361ff987e5ff6e1e7a210827aa371eaac269"; }; } { @@ -4834,27 +5170,19 @@ }; } { - name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.0.tgz"; - path = fetchurl { - name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz"; - sha1 = "b877b49a5c16aefac3655f2ed2ea5b684df8d203"; - }; - } - { - name = "get_port___get_port_5.0.0.tgz"; + name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; path = fetchurl { - name = "get_port___get_port_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-port/-/get-port-5.0.0.tgz"; - sha1 = "aa22b6b86fd926dd7884de3e23332c9f70c031a6"; + name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; + sha1 = "b5fde77f22cbe35f390b4e089922c50bce6ef664"; }; } { - name = "get_port___get_port_4.2.0.tgz"; + name = "get_port___get_port_5.1.1.tgz"; path = fetchurl { - name = "get_port___get_port_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz"; - sha1 = "e37368b1e863b7629c43c5a323625f95cf24b119"; + name = "get_port___get_port_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz"; + sha1 = "0469ed07563479de6efb986baf053dcd7d4e3193"; }; } { @@ -4866,6 +5194,14 @@ }; } { + name = "get_stream___get_stream_5.1.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz"; + sha1 = "01203cdc92597f9b909067c3e656cc1f4d3c4dc9"; + }; + } + { name = "get_value___get_value_2.0.6.tgz"; path = fetchurl { name = "get_value___get_value_2.0.6.tgz"; @@ -4890,11 +5226,11 @@ }; } { - name = "glob_parent___glob_parent_5.0.0.tgz"; + name = "glob_parent___glob_parent_5.1.1.tgz"; path = fetchurl { - name = "glob_parent___glob_parent_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.0.0.tgz"; - sha1 = "1dc99f0f39b006d3e92c2c284068382f0c20e954"; + name = "glob_parent___glob_parent_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz"; + sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229"; }; } { @@ -4906,11 +5242,11 @@ }; } { - name = "glob___glob_7.1.4.tgz"; + name = "glob___glob_7.1.6.tgz"; path = fetchurl { - name = "glob___glob_7.1.4.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz"; - sha1 = "aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"; + name = "glob___glob_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; + sha1 = "141f33b81a7c2492e125594307480c46679278a6"; }; } { @@ -4938,6 +5274,14 @@ }; } { + name = "globals___globals_12.4.0.tgz"; + path = fetchurl { + name = "globals___globals_12.4.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz"; + sha1 = "a18813576a41b00a24a97e7f815918c2e19925f8"; + }; + } + { name = "globby___globby_8.0.2.tgz"; path = fetchurl { name = "globby___globby_8.0.2.tgz"; @@ -4954,11 +5298,11 @@ }; } { - name = "graceful_fs___graceful_fs_4.2.2.tgz"; + name = "graceful_fs___graceful_fs_4.2.4.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz"; - sha1 = "6f0952605d0140c1cfdb138ed005775b92d67b02"; + name = "graceful_fs___graceful_fs_4.2.4.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; }; } { @@ -4970,27 +5314,27 @@ }; } { - name = "gzip_size___gzip_size_5.1.1.tgz"; + name = "gud___gud_1.0.0.tgz"; path = fetchurl { - name = "gzip_size___gzip_size_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz"; - sha1 = "cb9bee692f87c0612b232840a873904e4c135274"; + name = "gud___gud_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz"; + sha1 = "a489581b17e6a70beca9abe3ae57de7a499852c0"; }; } { - name = "handle_thing___handle_thing_2.0.0.tgz"; + name = "gzip_size___gzip_size_5.1.1.tgz"; path = fetchurl { - name = "handle_thing___handle_thing_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz"; - sha1 = "0e039695ff50c93fc288557d696f3c1dc6776754"; + name = "gzip_size___gzip_size_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz"; + sha1 = "cb9bee692f87c0612b232840a873904e4c135274"; }; } { - name = "handlebars___handlebars_4.2.0.tgz"; + name = "handle_thing___handle_thing_2.0.1.tgz"; path = fetchurl { - name = "handlebars___handlebars_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.2.0.tgz"; - sha1 = "57ce8d2175b9bbb3d8b3cf3e4217b1aec8ddcb2e"; + name = "handle_thing___handle_thing_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz"; + sha1 = "857f79ce359580c340d43081cc648970d0bb234e"; }; } { @@ -5034,19 +5378,19 @@ }; } { - name = "has_symbols___has_symbols_1.0.0.tgz"; + name = "has_flag___has_flag_4.0.0.tgz"; path = fetchurl { - name = "has_symbols___has_symbols_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz"; - sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; }; } { - name = "has_unicode___has_unicode_2.0.1.tgz"; + name = "has_symbols___has_symbols_1.0.1.tgz"; path = fetchurl { - name = "has_unicode___has_unicode_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + name = "has_symbols___has_symbols_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz"; + sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8"; }; } { @@ -5090,11 +5434,11 @@ }; } { - name = "hash_base___hash_base_3.0.4.tgz"; + name = "hash_base___hash_base_3.1.0.tgz"; path = fetchurl { - name = "hash_base___hash_base_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz"; - sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; + name = "hash_base___hash_base_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz"; + sha1 = "55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"; }; } { @@ -5122,11 +5466,11 @@ }; } { - name = "history___history_4.9.0.tgz"; + name = "history___history_4.10.1.tgz"; path = fetchurl { - name = "history___history_4.9.0.tgz"; - url = "https://registry.yarnpkg.com/history/-/history-4.9.0.tgz"; - sha1 = "84587c2068039ead8af769e9d6a6860a14fa1bca"; + name = "history___history_4.10.1.tgz"; + url = "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz"; + sha1 = "33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"; }; } { @@ -5138,27 +5482,19 @@ }; } { - name = "hoist_non_react_statics___hoist_non_react_statics_2.5.5.tgz"; - path = fetchurl { - name = "hoist_non_react_statics___hoist_non_react_statics_2.5.5.tgz"; - url = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz"; - sha1 = "c5903cf409c0dfd908f388e619d86b9c1174cb47"; - }; - } - { - name = "hoist_non_react_statics___hoist_non_react_statics_3.3.0.tgz"; + name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; path = fetchurl { - name = "hoist_non_react_statics___hoist_non_react_statics_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz"; - sha1 = "b09178f0122184fb95acf525daaecb4d8f45958b"; + name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; + url = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"; + sha1 = "ece0acaf71d62c2969c2ec59feff42a4b1a85b45"; }; } { - name = "hosted_git_info___hosted_git_info_2.8.4.tgz"; + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_2.8.4.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.4.tgz"; - sha1 = "44119abaf4bc64692a16ace34700fed9c03e2546"; + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; + sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488"; }; } { @@ -5202,35 +5538,43 @@ }; } { - name = "html_entities___html_entities_1.2.1.tgz"; + name = "html_entities___html_entities_1.3.1.tgz"; path = fetchurl { - name = "html_entities___html_entities_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz"; - sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; + name = "html_entities___html_entities_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz"; + sha1 = "fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"; }; } { - name = "html_minifier___html_minifier_3.5.21.tgz"; + name = "html_escaper___html_escaper_2.0.2.tgz"; path = fetchurl { - name = "html_minifier___html_minifier_3.5.21.tgz"; - url = "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz"; - sha1 = "d0040e054730e354db008463593194015212d20c"; + name = "html_escaper___html_escaper_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz"; + sha1 = "dfd60027da36a36dfcbe236262c00a5822681453"; }; } { - name = "html_to_react___html_to_react_1.4.1.tgz"; + name = "html_minifier_terser___html_minifier_terser_5.1.0.tgz"; path = fetchurl { - name = "html_to_react___html_to_react_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/html-to-react/-/html-to-react-1.4.1.tgz"; - sha1 = "64f67657c6335056866e334c097556f25894dd47"; + name = "html_minifier_terser___html_minifier_terser_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz"; + sha1 = "95d3df037f04835e9d1a09d1767c0e361a7de916"; }; } { - name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.5.tgz"; + name = "html_to_react___html_to_react_1.4.2.tgz"; path = fetchurl { - name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.5.tgz"; - url = "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.5.tgz"; - sha1 = "2c53083c1151bfec20479b1f8aaf0039e77b5513"; + name = "html_to_react___html_to_react_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/html-to-react/-/html-to-react-1.4.2.tgz"; + sha1 = "7b628ab56cd63a52f2d0b79d0fa838a51f088a57"; + }; + } + { + name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.11.tgz"; + path = fetchurl { + name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.11.tgz"; + url = "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.11.tgz"; + sha1 = "3059a69144b5aecef97708196ca32f9e68677715"; }; } { @@ -5242,11 +5586,11 @@ }; } { - name = "htmlparser2___htmlparser2_4.0.0.tgz"; + name = "htmlparser2___htmlparser2_4.1.0.tgz"; path = fetchurl { - name = "htmlparser2___htmlparser2_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-4.0.0.tgz"; - sha1 = "6034658db65b7713a572a9ebf79f650832dceec8"; + name = "htmlparser2___htmlparser2_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-4.1.0.tgz"; + sha1 = "9a4ef161f2e4625ebf7dfbe6c0a2f52d18a59e78"; }; } { @@ -5298,11 +5642,11 @@ }; } { - name = "http_proxy___http_proxy_1.17.0.tgz"; + name = "http_proxy___http_proxy_1.18.0.tgz"; path = fetchurl { - name = "http_proxy___http_proxy_1.17.0.tgz"; - url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz"; - sha1 = "7ad38494658f84605e2f6db4436df410f4e5be9a"; + name = "http_proxy___http_proxy_1.18.0.tgz"; + url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz"; + sha1 = "dbe55f63e75a347db7f3d99974f2692a314a6a3a"; }; } { @@ -5322,11 +5666,11 @@ }; } { - name = "https_proxy_agent___https_proxy_agent_2.2.2.tgz"; + name = "https_proxy_agent___https_proxy_agent_4.0.0.tgz"; path = fetchurl { - name = "https_proxy_agent___https_proxy_agent_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz"; - sha1 = "271ea8e90f836ac9f119daccd39c19ff7dfb0793"; + name = "https_proxy_agent___https_proxy_agent_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz"; + sha1 = "702b71fb5520a132a66de1f67541d9e62154d82b"; }; } { @@ -5346,14 +5690,6 @@ }; } { - name = "icss_replace_symbols___icss_replace_symbols_1.1.0.tgz"; - path = fetchurl { - name = "icss_replace_symbols___icss_replace_symbols_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz"; - sha1 = "06ea6f83679a7749e386cfe1fe812ae5db223ded"; - }; - } - { name = "icss_utils___icss_utils_4.1.1.tgz"; path = fetchurl { name = "icss_utils___icss_utils_4.1.1.tgz"; @@ -5386,14 +5722,6 @@ }; } { - name = "ignore_walk___ignore_walk_3.0.1.tgz"; - path = fetchurl { - name = "ignore_walk___ignore_walk_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz"; - sha1 = "a83e62e7d272ac0e3b551aaa82831a19b69f82f8"; - }; - } - { name = "ignore___ignore_3.3.10.tgz"; path = fetchurl { name = "ignore___ignore_3.3.10.tgz"; @@ -5442,11 +5770,11 @@ }; } { - name = "import_fresh___import_fresh_3.1.0.tgz"; + name = "import_fresh___import_fresh_3.2.1.tgz"; path = fetchurl { - name = "import_fresh___import_fresh_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.1.0.tgz"; - sha1 = "6d33fa1dcef6df930fae003446f33415af905118"; + name = "import_fresh___import_fresh_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz"; + sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; }; } { @@ -5474,6 +5802,14 @@ }; } { + name = "indent_string___indent_string_4.0.0.tgz"; + path = fetchurl { + name = "indent_string___indent_string_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; + sha1 = "624f8f4497d619b2d9768531d58f4122854d7251"; + }; + } + { name = "indexes_of___indexes_of_1.0.1.tgz"; path = fetchurl { name = "indexes_of___indexes_of_1.0.1.tgz"; @@ -5530,19 +5866,19 @@ }; } { - name = "inquirer___inquirer_6.5.0.tgz"; + name = "inquirer___inquirer_7.0.4.tgz"; path = fetchurl { - name = "inquirer___inquirer_6.5.0.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.0.tgz"; - sha1 = "2303317efc9a4ea7ec2e2df6f86569b734accf42"; + name = "inquirer___inquirer_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.4.tgz"; + sha1 = "99af5bde47153abca23f5c7fc30db247f39da703"; }; } { - name = "inquirer___inquirer_6.5.2.tgz"; + name = "inquirer___inquirer_7.1.0.tgz"; path = fetchurl { - name = "inquirer___inquirer_6.5.2.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz"; - sha1 = "ad50942375d036d327ff528c08bd5fab089928ca"; + name = "inquirer___inquirer_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz"; + sha1 = "1298a01859883e17c7264b82870ae1034f92dd29"; }; } { @@ -5554,6 +5890,14 @@ }; } { + name = "internal_slot___internal_slot_1.0.2.tgz"; + path = fetchurl { + name = "internal_slot___internal_slot_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz"; + sha1 = "9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"; + }; + } + { name = "invariant___invariant_2.2.4.tgz"; path = fetchurl { name = "invariant___invariant_2.2.4.tgz"; @@ -5586,14 +5930,6 @@ }; } { - name = "ipaddr.js___ipaddr.js_1.9.0.tgz"; - path = fetchurl { - name = "ipaddr.js___ipaddr.js_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz"; - sha1 = "37df74e430a0e47550fe54a2defe30d8acd95f65"; - }; - } - { name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; path = fetchurl { name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; @@ -5610,6 +5946,14 @@ }; } { + name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; + path = fetchurl { + name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz"; + sha1 = "96c6a22b6a23929b11ea0afb1836c36ad4a5d698"; + }; + } + { name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; path = fetchurl { name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; @@ -5626,19 +5970,19 @@ }; } { - name = "is_alphabetical___is_alphabetical_1.0.3.tgz"; + name = "is_alphabetical___is_alphabetical_1.0.4.tgz"; path = fetchurl { - name = "is_alphabetical___is_alphabetical_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.3.tgz"; - sha1 = "eb04cc47219a8895d8450ace4715abff2258a1f8"; + name = "is_alphabetical___is_alphabetical_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz"; + sha1 = "9e7d6b94916be22153745d184c298cbf986a686d"; }; } { - name = "is_alphanumerical___is_alphanumerical_1.0.3.tgz"; + name = "is_alphanumerical___is_alphanumerical_1.0.4.tgz"; path = fetchurl { - name = "is_alphanumerical___is_alphanumerical_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.3.tgz"; - sha1 = "57ae21c374277b3defe0274c640a5704b8f6657c"; + name = "is_alphanumerical___is_alphanumerical_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz"; + sha1 = "7eb9a2431f855f6b1ef1a78e326df515696c4dbf"; }; } { @@ -5674,27 +6018,27 @@ }; } { - name = "is_buffer___is_buffer_1.1.6.tgz"; + name = "is_binary_path___is_binary_path_2.1.0.tgz"; path = fetchurl { - name = "is_buffer___is_buffer_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; - sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09"; }; } { - name = "is_buffer___is_buffer_2.0.3.tgz"; + name = "is_buffer___is_buffer_1.1.6.tgz"; path = fetchurl { - name = "is_buffer___is_buffer_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz"; - sha1 = "4ecf3fcf749cbd1e472689e109ac66261a25e725"; + name = "is_buffer___is_buffer_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; + sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; }; } { - name = "is_callable___is_callable_1.1.4.tgz"; + name = "is_callable___is_callable_1.1.5.tgz"; path = fetchurl { - name = "is_callable___is_callable_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz"; - sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"; + name = "is_callable___is_callable_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz"; + sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab"; }; } { @@ -5730,19 +6074,19 @@ }; } { - name = "is_date_object___is_date_object_1.0.1.tgz"; + name = "is_date_object___is_date_object_1.0.2.tgz"; path = fetchurl { - name = "is_date_object___is_date_object_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz"; - sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + name = "is_date_object___is_date_object_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz"; + sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"; }; } { - name = "is_decimal___is_decimal_1.0.3.tgz"; + name = "is_decimal___is_decimal_1.0.4.tgz"; path = fetchurl { - name = "is_decimal___is_decimal_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.3.tgz"; - sha1 = "381068759b9dc807d8c0dc0bfbae2b68e1da48b7"; + name = "is_decimal___is_decimal_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz"; + sha1 = "65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"; }; } { @@ -5770,6 +6114,14 @@ }; } { + name = "is_docker___is_docker_2.0.0.tgz"; + path = fetchurl { + name = "is_docker___is_docker_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.0.0.tgz"; + sha1 = "2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b"; + }; + } + { name = "is_extendable___is_extendable_0.1.1.tgz"; path = fetchurl { name = "is_extendable___is_extendable_0.1.1.tgz"; @@ -5810,6 +6162,14 @@ }; } { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + }; + } + { name = "is_generator_fn___is_generator_fn_2.1.0.tgz"; path = fetchurl { name = "is_generator_fn___is_generator_fn_2.1.0.tgz"; @@ -5834,11 +6194,11 @@ }; } { - name = "is_hexadecimal___is_hexadecimal_1.0.3.tgz"; + name = "is_hexadecimal___is_hexadecimal_1.0.4.tgz"; path = fetchurl { - name = "is_hexadecimal___is_hexadecimal_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz"; - sha1 = "e8a426a69b6d31470d3a33a47bb825cda02506ee"; + name = "is_hexadecimal___is_hexadecimal_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz"; + sha1 = "cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"; }; } { @@ -5858,6 +6218,14 @@ }; } { + name = "is_number___is_number_7.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; + sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; + }; + } + { name = "is_obj___is_obj_1.0.1.tgz"; path = fetchurl { name = "is_obj___is_obj_1.0.1.tgz"; @@ -5866,27 +6234,35 @@ }; } { - name = "is_path_cwd___is_path_cwd_1.0.0.tgz"; + name = "is_obj___is_obj_2.0.0.tgz"; + path = fetchurl { + name = "is_obj___is_obj_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; + sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982"; + }; + } + { + name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; path = fetchurl { - name = "is_path_cwd___is_path_cwd_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz"; - sha1 = "d225ec23132e89edd38fda767472e62e65f1106d"; + name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; + sha1 = "67d43b82664a7b5191fd9119127eb300048a9fdb"; }; } { - name = "is_path_in_cwd___is_path_in_cwd_1.0.1.tgz"; + name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; path = fetchurl { - name = "is_path_in_cwd___is_path_in_cwd_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz"; - sha1 = "5ac48b345ef675339bd6c7a48a912110b241cf52"; + name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; + sha1 = "bfe2dca26c69f397265a4009963602935a053acb"; }; } { - name = "is_path_inside___is_path_inside_1.0.1.tgz"; + name = "is_path_inside___is_path_inside_2.1.0.tgz"; path = fetchurl { - name = "is_path_inside___is_path_inside_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz"; - sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"; + name = "is_path_inside___is_path_inside_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz"; + sha1 = "7c9810587d659a40d27bcdb4d5616eab059494b2"; }; } { @@ -5906,27 +6282,11 @@ }; } { - name = "is_plain_object___is_plain_object_3.0.0.tgz"; - path = fetchurl { - name = "is_plain_object___is_plain_object_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.0.tgz"; - sha1 = "47bfc5da1b5d50d64110806c199359482e75a928"; - }; - } - { - name = "is_promise___is_promise_2.1.0.tgz"; - path = fetchurl { - name = "is_promise___is_promise_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; - }; - } - { - name = "is_regex___is_regex_1.0.4.tgz"; + name = "is_regex___is_regex_1.0.5.tgz"; path = fetchurl { - name = "is_regex___is_regex_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz"; - sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + name = "is_regex___is_regex_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz"; + sha1 = "39d589a358bf18967f726967120b8fc1aed74eae"; }; } { @@ -5962,6 +6322,14 @@ }; } { + name = "is_string___is_string_1.0.5.tgz"; + path = fetchurl { + name = "is_string___is_string_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz"; + sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"; + }; + } + { name = "is_svg___is_svg_3.0.0.tgz"; path = fetchurl { name = "is_svg___is_svg_3.0.0.tgz"; @@ -5970,11 +6338,11 @@ }; } { - name = "is_symbol___is_symbol_1.0.2.tgz"; + name = "is_symbol___is_symbol_1.0.3.tgz"; path = fetchurl { - name = "is_symbol___is_symbol_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz"; - sha1 = "a055f6ae57192caee329e7a860118b497a950f38"; + name = "is_symbol___is_symbol_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz"; + sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937"; }; } { @@ -5986,11 +6354,11 @@ }; } { - name = "is_whitespace_character___is_whitespace_character_1.0.3.tgz"; + name = "is_whitespace_character___is_whitespace_character_1.0.4.tgz"; path = fetchurl { - name = "is_whitespace_character___is_whitespace_character_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.3.tgz"; - sha1 = "b3ad9546d916d7d3ffa78204bca0c26b56257fac"; + name = "is_whitespace_character___is_whitespace_character_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz"; + sha1 = "0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"; }; } { @@ -6002,11 +6370,11 @@ }; } { - name = "is_word_character___is_word_character_1.0.3.tgz"; + name = "is_word_character___is_word_character_1.0.4.tgz"; path = fetchurl { - name = "is_word_character___is_word_character_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.3.tgz"; - sha1 = "264d15541cbad0ba833d3992c34e6b40873b08aa"; + name = "is_word_character___is_word_character_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.4.tgz"; + sha1 = "ce0e73216f98599060592f62ff31354ddbeb0230"; }; } { @@ -6018,6 +6386,14 @@ }; } { + name = "is_wsl___is_wsl_2.2.0.tgz"; + path = fetchurl { + name = "is_wsl___is_wsl_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz"; + sha1 = "74a4c76e77ca9fd3f932f290c17ea326cd157271"; + }; + } + { name = "isarray___isarray_0.0.1.tgz"; path = fetchurl { name = "isarray___isarray_0.0.1.tgz"; @@ -6058,14 +6434,6 @@ }; } { - name = "isobject___isobject_4.0.0.tgz"; - path = fetchurl { - name = "isobject___isobject_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz"; - sha1 = "3f1c9155e73b192022a80819bacd0343711697b0"; - }; - } - { name = "isomorphic_fetch___isomorphic_fetch_2.2.1.tgz"; path = fetchurl { name = "isomorphic_fetch___isomorphic_fetch_2.2.1.tgz"; @@ -6114,11 +6482,11 @@ }; } { - name = "istanbul_reports___istanbul_reports_2.2.6.tgz"; + name = "istanbul_reports___istanbul_reports_2.2.7.tgz"; path = fetchurl { - name = "istanbul_reports___istanbul_reports_2.2.6.tgz"; - url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz"; - sha1 = "7b4f2660d82b29303a8fe6091f8ca4bf058da1af"; + name = "istanbul_reports___istanbul_reports_2.2.7.tgz"; + url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.7.tgz"; + sha1 = "5d939f6237d7b48393cc0959eab40cd4fd056931"; }; } { @@ -6154,6 +6522,14 @@ }; } { + name = "jest_diff___jest_diff_25.5.0.tgz"; + path = fetchurl { + name = "jest_diff___jest_diff_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz"; + sha1 = "1dd26ed64f96667c068cef026b677dfa01afcfa9"; + }; + } + { name = "jest_docblock___jest_docblock_24.9.0.tgz"; path = fetchurl { name = "jest_docblock___jest_docblock_24.9.0.tgz"; @@ -6170,11 +6546,11 @@ }; } { - name = "jest_environment_jsdom_fourteen___jest_environment_jsdom_fourteen_0.1.0.tgz"; + name = "jest_environment_jsdom_fourteen___jest_environment_jsdom_fourteen_1.0.1.tgz"; path = fetchurl { - name = "jest_environment_jsdom_fourteen___jest_environment_jsdom_fourteen_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-jsdom-fourteen/-/jest-environment-jsdom-fourteen-0.1.0.tgz"; - sha1 = "aad6393a9d4b565b69a609109bf469f62bf18ccc"; + name = "jest_environment_jsdom_fourteen___jest_environment_jsdom_fourteen_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-jsdom-fourteen/-/jest-environment-jsdom-fourteen-1.0.1.tgz"; + sha1 = "4cd0042f58b4ab666950d96532ecb2fc188f96fb"; }; } { @@ -6202,6 +6578,14 @@ }; } { + name = "jest_get_type___jest_get_type_25.2.6.tgz"; + path = fetchurl { + name = "jest_get_type___jest_get_type_25.2.6.tgz"; + url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz"; + sha1 = "0b0a32fab8908b44d508be81681487dbabb8d877"; + }; + } + { name = "jest_haste_map___jest_haste_map_24.9.0.tgz"; path = fetchurl { name = "jest_haste_map___jest_haste_map_24.9.0.tgz"; @@ -6274,14 +6658,6 @@ }; } { - name = "jest_resolve___jest_resolve_24.8.0.tgz"; - path = fetchurl { - name = "jest_resolve___jest_resolve_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.8.0.tgz"; - sha1 = "84b8e5408c1f6a11539793e2b5feb1b6e722439f"; - }; - } - { name = "jest_resolve___jest_resolve_24.9.0.tgz"; path = fetchurl { name = "jest_resolve___jest_resolve_24.9.0.tgz"; @@ -6338,11 +6714,11 @@ }; } { - name = "jest_watch_typeahead___jest_watch_typeahead_0.3.1.tgz"; + name = "jest_watch_typeahead___jest_watch_typeahead_0.4.2.tgz"; path = fetchurl { - name = "jest_watch_typeahead___jest_watch_typeahead_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-0.3.1.tgz"; - sha1 = "47701024b64b444aa325d801b4b3a6d61ed70701"; + name = "jest_watch_typeahead___jest_watch_typeahead_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-0.4.2.tgz"; + sha1 = "e5be959698a7fa2302229a5082c488c3c8780a4a"; }; } { @@ -6362,27 +6738,27 @@ }; } { - name = "jest___jest_24.8.0.tgz"; + name = "jest_worker___jest_worker_25.5.0.tgz"; path = fetchurl { - name = "jest___jest_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest/-/jest-24.8.0.tgz"; - sha1 = "d5dff1984d0d1002196e9b7f12f75af1b2809081"; + name = "jest_worker___jest_worker_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.5.0.tgz"; + sha1 = "2611d071b79cea0f43ee57a3d118593ac1547db1"; }; } { - name = "js_base64___js_base64_2.5.1.tgz"; + name = "jest___jest_24.9.0.tgz"; path = fetchurl { - name = "js_base64___js_base64_2.5.1.tgz"; - url = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz"; - sha1 = "1efa39ef2c5f7980bb1784ade4a8af2de3291121"; + name = "jest___jest_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest/-/jest-24.9.0.tgz"; + sha1 = "987d290c05a08b52c56188c1002e368edb007171"; }; } { - name = "js_levenshtein___js_levenshtein_1.1.6.tgz"; + name = "js_base64___js_base64_2.5.2.tgz"; path = fetchurl { - name = "js_levenshtein___js_levenshtein_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz"; - sha1 = "c6cee58eb3550372df8deb85fad5ce66ce01d59d"; + name = "js_base64___js_base64_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.2.tgz"; + sha1 = "313b6274dda718f714d00b3330bbae6e38e90209"; }; } { @@ -6514,11 +6890,11 @@ }; } { - name = "json5___json5_2.1.0.tgz"; + name = "json5___json5_2.1.3.tgz"; path = fetchurl { - name = "json5___json5_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz"; - sha1 = "e7a0c62c48285c628d20a10b85c89bb807c32850"; + name = "json5___json5_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz"; + sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"; }; } { @@ -6546,75 +6922,75 @@ }; } { - name = "jss_plugin_camel_case___jss_plugin_camel_case_10.0.0_alpha.25.tgz"; + name = "jss_plugin_camel_case___jss_plugin_camel_case_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_camel_case___jss_plugin_camel_case_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.0-alpha.25.tgz"; - sha1 = "ea4389de47ccf3b4757f76e62cbb2e8b96b7a2c2"; + name = "jss_plugin_camel_case___jss_plugin_camel_case_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.1.1.tgz"; + sha1 = "8e73ecc4f1d0f8dfe4dd31f6f9f2782588970e78"; }; } { - name = "jss_plugin_default_unit___jss_plugin_default_unit_10.0.0_alpha.25.tgz"; + name = "jss_plugin_default_unit___jss_plugin_default_unit_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_default_unit___jss_plugin_default_unit_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.0.0-alpha.25.tgz"; - sha1 = "df5b39bbc0114146101bb3cf8bc7e281e3d0f454"; + name = "jss_plugin_default_unit___jss_plugin_default_unit_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.1.1.tgz"; + sha1 = "2df86016dfe73085eead843f5794e3890e9c5c47"; }; } { - name = "jss_plugin_global___jss_plugin_global_10.0.0_alpha.25.tgz"; + name = "jss_plugin_global___jss_plugin_global_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_global___jss_plugin_global_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.0.0-alpha.25.tgz"; - sha1 = "2b6a6a14ef6cdb9994dbadf709e480d5c871b5f6"; + name = "jss_plugin_global___jss_plugin_global_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.1.1.tgz"; + sha1 = "36b0d6d9facb74dfd99590643708a89260747d14"; }; } { - name = "jss_plugin_nested___jss_plugin_nested_10.0.0_alpha.25.tgz"; + name = "jss_plugin_nested___jss_plugin_nested_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_nested___jss_plugin_nested_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.0.0-alpha.25.tgz"; - sha1 = "b8e29d336e1850047914511681d56330e3ea24ac"; + name = "jss_plugin_nested___jss_plugin_nested_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.1.1.tgz"; + sha1 = "5c3de2b8bda344de1ebcef3a4fd30870a29a8a8c"; }; } { - name = "jss_plugin_props_sort___jss_plugin_props_sort_10.0.0_alpha.25.tgz"; + name = "jss_plugin_props_sort___jss_plugin_props_sort_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_props_sort___jss_plugin_props_sort_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.0.0-alpha.25.tgz"; - sha1 = "dfaa1a6bf9863ae9593b99bf51cd26caea2fe0ec"; + name = "jss_plugin_props_sort___jss_plugin_props_sort_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.1.1.tgz"; + sha1 = "34bddcbfaf9430ec8ccdf92729f03bb10caf1785"; }; } { - name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.0.0_alpha.25.tgz"; + name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.0.0-alpha.25.tgz"; - sha1 = "35350da52334a6031808e197526227434c194277"; + name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.1.1.tgz"; + sha1 = "be00dac6fc394aaddbcef5860b9eca6224d96382"; }; } { - name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.0.0_alpha.25.tgz"; + name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.0.0-alpha.25.tgz"; - sha1 = "bc0c4b6dcb28d4801775cbad70ad9bc7e0c7707b"; + name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.1.1.tgz"; + sha1 = "8348b20749f790beebab3b6a8f7075b07c2cfcfd"; }; } { - name = "jss___jss_10.0.0_alpha.25.tgz"; + name = "jss___jss_10.1.1.tgz"; path = fetchurl { - name = "jss___jss_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss/-/jss-10.0.0-alpha.25.tgz"; - sha1 = "20a506d8159e3f6bd91e133d54ffd3df0ffd3010"; + name = "jss___jss_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss/-/jss-10.1.1.tgz"; + sha1 = "450b27d53761af3e500b43130a54cdbe157ea332"; }; } { - name = "jsx_ast_utils___jsx_ast_utils_2.2.1.tgz"; + name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz"; path = fetchurl { - name = "jsx_ast_utils___jsx_ast_utils_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.1.tgz"; - sha1 = "4d4973ebf8b9d2837ee91a8208cc66f3a2776cfb"; + name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz"; + sha1 = "8a9364e402448a3ce7f14d357738310d9248054f"; }; } { @@ -6658,11 +7034,11 @@ }; } { - name = "kind_of___kind_of_6.0.2.tgz"; + name = "kind_of___kind_of_6.0.3.tgz"; path = fetchurl { - name = "kind_of___kind_of_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz"; - sha1 = "01146b36a6218e64e58f3a8d66de5d7fc6f6d051"; + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; }; } { @@ -6722,6 +7098,14 @@ }; } { + name = "levenary___levenary_1.1.1.tgz"; + path = fetchurl { + name = "levenary___levenary_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz"; + sha1 = "842a9ee98d2075aa7faeedbe32679e9205f46f77"; + }; + } + { name = "levn___levn_0.3.0.tgz"; path = fetchurl { name = "levn___levn_0.3.0.tgz"; @@ -6730,6 +7114,14 @@ }; } { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + path = fetchurl { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; + sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + }; + } + { name = "load_json_file___load_json_file_2.0.0.tgz"; path = fetchurl { name = "load_json_file___load_json_file_2.0.0.tgz"; @@ -6746,11 +7138,11 @@ }; } { - name = "loader_fs_cache___loader_fs_cache_1.0.2.tgz"; + name = "loader_fs_cache___loader_fs_cache_1.0.3.tgz"; path = fetchurl { - name = "loader_fs_cache___loader_fs_cache_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.2.tgz"; - sha1 = "54cedf6b727e1779fd8f01205f05f6e88706f086"; + name = "loader_fs_cache___loader_fs_cache_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz"; + sha1 = "f08657646d607078be2f0a032f8bd69dd6f277d9"; }; } { @@ -6770,6 +7162,14 @@ }; } { + name = "loader_utils___loader_utils_1.4.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz"; + sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"; + }; + } + { name = "locate_path___locate_path_2.0.0.tgz"; path = fetchurl { name = "locate_path___locate_path_2.0.0.tgz"; @@ -6786,6 +7186,14 @@ }; } { + name = "locate_path___locate_path_5.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; + sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + }; + } + { name = "lodash._reinterpolate___lodash._reinterpolate_3.0.0.tgz"; path = fetchurl { name = "lodash._reinterpolate___lodash._reinterpolate_3.0.0.tgz"; @@ -6850,14 +7258,6 @@ }; } { - name = "lodash.unescape___lodash.unescape_4.0.1.tgz"; - path = fetchurl { - name = "lodash.unescape___lodash.unescape_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz"; - sha1 = "bf2249886ce514cda112fae9218cdc065211fc9c"; - }; - } - { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; path = fetchurl { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; @@ -6874,11 +7274,11 @@ }; } { - name = "loglevel___loglevel_1.6.3.tgz"; + name = "loglevel___loglevel_1.6.8.tgz"; path = fetchurl { - name = "loglevel___loglevel_1.6.3.tgz"; - url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.3.tgz"; - sha1 = "77f2eb64be55a404c9fd04ad16d57c1d6d6b1280"; + name = "loglevel___loglevel_1.6.8.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz"; + sha1 = "8a25fb75d092230ecd4457270d80b54e28011171"; }; } { @@ -6890,11 +7290,11 @@ }; } { - name = "lower_case___lower_case_1.1.4.tgz"; + name = "lower_case___lower_case_2.0.1.tgz"; path = fetchurl { - name = "lower_case___lower_case_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz"; - sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"; + name = "lower_case___lower_case_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz"; + sha1 = "39eeb36e396115cc05e29422eaea9e692c9408c7"; }; } { @@ -6914,6 +7314,14 @@ }; } { + name = "make_dir___make_dir_3.1.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; + sha1 = "415e967046b3a7f1d185277d84aa58203726a13f"; + }; + } + { name = "makeerror___makeerror_1.0.11.tgz"; path = fetchurl { name = "makeerror___makeerror_1.0.11.tgz"; @@ -6954,11 +7362,11 @@ }; } { - name = "markdown_escapes___markdown_escapes_1.0.3.tgz"; + name = "markdown_escapes___markdown_escapes_1.0.4.tgz"; path = fetchurl { - name = "markdown_escapes___markdown_escapes_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.3.tgz"; - sha1 = "6155e10416efaafab665d466ce598216375195f5"; + name = "markdown_escapes___markdown_escapes_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz"; + sha1 = "c95415ef451499d7602b91095f3c8e8975f78535"; }; } { @@ -6986,11 +7394,11 @@ }; } { - name = "mdn_data___mdn_data_1.1.4.tgz"; + name = "mdn_data___mdn_data_2.0.6.tgz"; path = fetchurl { - name = "mdn_data___mdn_data_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz"; - sha1 = "50b5d4ffc4575276573c4eedb8780812a8419f01"; + name = "mdn_data___mdn_data_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz"; + sha1 = "852dc60fcaa5daa2e8cf6c9189c440ed3e042978"; }; } { @@ -7018,6 +7426,14 @@ }; } { + name = "memory_fs___memory_fs_0.5.0.tgz"; + path = fetchurl { + name = "memory_fs___memory_fs_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz"; + sha1 = "324c01288b88652966d161db77838720845a8e3c"; + }; + } + { name = "merge_deep___merge_deep_3.0.2.tgz"; path = fetchurl { name = "merge_deep___merge_deep_3.0.2.tgz"; @@ -7042,11 +7458,11 @@ }; } { - name = "merge2___merge2_1.2.4.tgz"; + name = "merge2___merge2_1.3.0.tgz"; path = fetchurl { - name = "merge2___merge2_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/merge2/-/merge2-1.2.4.tgz"; - sha1 = "c9269589e6885a60cf80605d9522d4b67ca646e3"; + name = "merge2___merge2_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz"; + sha1 = "5b366ee83b2f1582c48f87e47cf1a9352103ca81"; }; } { @@ -7082,27 +7498,19 @@ }; } { - name = "mime_db___mime_db_1.40.0.tgz"; + name = "mime_db___mime_db_1.44.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.40.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz"; - sha1 = "a65057e998db090f732a68f6c276d387d4126c32"; + name = "mime_db___mime_db_1.44.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz"; + sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"; }; } { - name = "mime_db___mime_db_1.41.0.tgz"; + name = "mime_types___mime_types_2.1.27.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.41.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.41.0.tgz"; - sha1 = "9110408e1f6aa1b34aef51f2c9df3caddf46b6a0"; - }; - } - { - name = "mime_types___mime_types_2.1.24.tgz"; - path = fetchurl { - name = "mime_types___mime_types_2.1.24.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz"; - sha1 = "b6f8d0b3e951efb77dedeca194cff6d16f676f81"; + name = "mime_types___mime_types_2.1.27.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz"; + sha1 = "47949f98e279ea53119f5722e0f34e529bec009f"; }; } { @@ -7114,19 +7522,11 @@ }; } { - name = "mime___mime_2.4.4.tgz"; + name = "mime___mime_2.4.5.tgz"; path = fetchurl { - name = "mime___mime_2.4.4.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz"; - sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5"; - }; - } - { - name = "mimic_fn___mimic_fn_1.2.0.tgz"; - path = fetchurl { - name = "mimic_fn___mimic_fn_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha1 = "820c86a39334640e99516928bd03fca88057d022"; + name = "mime___mime_2.4.5.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.4.5.tgz"; + sha1 = "d8de2ecb92982dedbb6541c9b6841d7f218ea009"; }; } { @@ -7138,11 +7538,19 @@ }; } { - name = "mini_css_extract_plugin___mini_css_extract_plugin_0.5.0.tgz"; + name = "mini_create_react_context___mini_create_react_context_0.3.2.tgz"; + path = fetchurl { + name = "mini_create_react_context___mini_create_react_context_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz"; + sha1 = "79fc598f283dd623da8e088b05db8cddab250189"; + }; + } + { + name = "mini_css_extract_plugin___mini_css_extract_plugin_0.9.0.tgz"; path = fetchurl { - name = "mini_css_extract_plugin___mini_css_extract_plugin_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz"; - sha1 = "ac0059b02b9692515a637115b0cc9fed3a35c7b0"; + name = "mini_css_extract_plugin___mini_css_extract_plugin_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz"; + sha1 = "47f2cf07aa165ab35733b1fc97d4c46c0564339e"; }; } { @@ -7170,43 +7578,43 @@ }; } { - name = "minimist___minimist_0.0.8.tgz"; + name = "minimist___minimist_1.2.5.tgz"; path = fetchurl { - name = "minimist___minimist_0.0.8.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; }; } { - name = "minimist___minimist_1.2.0.tgz"; + name = "minipass_collect___minipass_collect_1.0.2.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha1 = "22b813bf745dc6edba2576b940022ad6edc8c617"; }; } { - name = "minimist___minimist_0.0.10.tgz"; + name = "minipass_flush___minipass_flush_1.0.5.tgz"; path = fetchurl { - name = "minimist___minimist_0.0.10.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz"; + sha1 = "82e7135d7e89a50ffe64610a787953c4c4cbb373"; }; } { - name = "minipass___minipass_2.5.0.tgz"; + name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz"; path = fetchurl { - name = "minipass___minipass_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-2.5.0.tgz"; - sha1 = "dddb1d001976978158a05badfcbef4a771612857"; + name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz"; + sha1 = "3dcb6bb4a546e32969c7ad710f2c79a86abba93a"; }; } { - name = "minizlib___minizlib_1.2.1.tgz"; + name = "minipass___minipass_3.1.1.tgz"; path = fetchurl { - name = "minizlib___minizlib_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz"; - sha1 = "dd27ea6136243c7c880684e8672bb3a45fd9b614"; + name = "minipass___minipass_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz"; + sha1 = "7607ce778472a185ad6d89082aa2070f79cedcd5"; }; } { @@ -7234,35 +7642,51 @@ }; } { - name = "mkdirp___mkdirp_0.5.1.tgz"; + name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; path = fetchurl { - name = "mkdirp___mkdirp_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha1 = "fa10c9115cc6d8865be221ba47ee9bed78601113"; }; } { - name = "mobx_react___mobx_react_5.4.4.tgz"; + name = "mkdirp___mkdirp_0.5.5.tgz"; path = fetchurl { - name = "mobx_react___mobx_react_5.4.4.tgz"; - url = "https://registry.yarnpkg.com/mobx-react/-/mobx-react-5.4.4.tgz"; - sha1 = "b3de9c6eabcd0ed8a40036888cb0221ab9568b80"; + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; }; } { - name = "mobx_utils___mobx_utils_5.4.1.tgz"; + name = "mobx_react_lite___mobx_react_lite_2.0.6.tgz"; path = fetchurl { - name = "mobx_utils___mobx_utils_5.4.1.tgz"; - url = "https://registry.yarnpkg.com/mobx-utils/-/mobx-utils-5.4.1.tgz"; - sha1 = "18ff5f9723b27e1ff50ae0b362938a4792eb077a"; + name = "mobx_react_lite___mobx_react_lite_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/mobx-react-lite/-/mobx-react-lite-2.0.6.tgz"; + sha1 = "e1307a2b271c6a6016c8ad815a25014b7f95997d"; }; } { - name = "mobx___mobx_5.13.0.tgz"; + name = "mobx_react___mobx_react_6.2.2.tgz"; path = fetchurl { - name = "mobx___mobx_5.13.0.tgz"; - url = "https://registry.yarnpkg.com/mobx/-/mobx-5.13.0.tgz"; - sha1 = "0fd68f10aa5ff2d146a4ed9e145b53337cfbca59"; + name = "mobx_react___mobx_react_6.2.2.tgz"; + url = "https://registry.yarnpkg.com/mobx-react/-/mobx-react-6.2.2.tgz"; + sha1 = "45e8e7c4894cac8399bba0a91060d7cfb8ea084b"; + }; + } + { + name = "mobx_utils___mobx_utils_5.5.7.tgz"; + path = fetchurl { + name = "mobx_utils___mobx_utils_5.5.7.tgz"; + url = "https://registry.yarnpkg.com/mobx-utils/-/mobx-utils-5.5.7.tgz"; + sha1 = "0ef58f2d5e05ca0e59ba2322f84f9c763de6ce14"; + }; + } + { + name = "mobx___mobx_5.15.4.tgz"; + path = fetchurl { + name = "mobx___mobx_5.15.4.tgz"; + url = "https://registry.yarnpkg.com/mobx/-/mobx-5.15.4.tgz"; + sha1 = "9da1a84e97ba624622f4e55a0bf3300fb931c2ab"; }; } { @@ -7314,19 +7738,19 @@ }; } { - name = "mute_stream___mute_stream_0.0.7.tgz"; + name = "mute_stream___mute_stream_0.0.8.tgz"; path = fetchurl { - name = "mute_stream___mute_stream_0.0.7.tgz"; - url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz"; - sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; + name = "mute_stream___mute_stream_0.0.8.tgz"; + url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz"; + sha1 = "1630c42b2251ff81e2a283de96a5497ea92e5e0d"; }; } { - name = "nan___nan_2.14.0.tgz"; + name = "nan___nan_2.14.1.tgz"; path = fetchurl { - name = "nan___nan_2.14.0.tgz"; - url = "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz"; - sha1 = "7818f722027b2459a86f0295d434d1fc2336c52c"; + name = "nan___nan_2.14.1.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz"; + sha1 = "d7be34dfa3105b91494c3147089315eff8874b01"; }; } { @@ -7346,14 +7770,6 @@ }; } { - name = "needle___needle_2.4.0.tgz"; - path = fetchurl { - name = "needle___needle_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz"; - sha1 = "6833e74975c444642590e15a750288c5f939b57c"; - }; - } - { name = "negotiator___negotiator_0.6.2.tgz"; path = fetchurl { name = "negotiator___negotiator_0.6.2.tgz"; @@ -7386,11 +7802,11 @@ }; } { - name = "no_case___no_case_2.3.2.tgz"; + name = "no_case___no_case_3.0.3.tgz"; path = fetchurl { - name = "no_case___no_case_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz"; - sha1 = "60b813396be39b3f1288a4c1ed5d1e7d28b464ac"; + name = "no_case___no_case_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz"; + sha1 = "c21b434c1ffe48b39087e86cfb4d2582e9df18f8"; }; } { @@ -7402,11 +7818,11 @@ }; } { - name = "node_forge___node_forge_0.7.5.tgz"; + name = "node_forge___node_forge_0.9.0.tgz"; path = fetchurl { - name = "node_forge___node_forge_0.7.5.tgz"; - url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz"; - sha1 = "6c152c345ce11c52f465c2abd957e8639cd674df"; + name = "node_forge___node_forge_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz"; + sha1 = "d624050edbb44874adca12bb9a52ec63cb782579"; }; } { @@ -7442,27 +7858,11 @@ }; } { - name = "node_pre_gyp___node_pre_gyp_0.12.0.tgz"; + name = "node_releases___node_releases_1.1.55.tgz"; path = fetchurl { - name = "node_pre_gyp___node_pre_gyp_0.12.0.tgz"; - url = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz"; - sha1 = "39ba4bb1439da030295f899e3b520b7785766149"; - }; - } - { - name = "node_releases___node_releases_1.1.29.tgz"; - path = fetchurl { - name = "node_releases___node_releases_1.1.29.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.29.tgz"; - sha1 = "86a57c6587a30ecd6726449e5d293466b0a0bb86"; - }; - } - { - name = "nopt___nopt_4.0.1.tgz"; - path = fetchurl { - name = "nopt___nopt_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz"; - sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + name = "node_releases___node_releases_1.1.55.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.55.tgz"; + sha1 = "8af23b7c561d8e2e6e36a46637bab84633b07cee"; }; } { @@ -7498,11 +7898,11 @@ }; } { - name = "normalize_scroll_left___normalize_scroll_left_0.2.0.tgz"; + name = "normalize_url___normalize_url_1.9.1.tgz"; path = fetchurl { - name = "normalize_scroll_left___normalize_scroll_left_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-scroll-left/-/normalize-scroll-left-0.2.0.tgz"; - sha1 = "9445d74275f303cc661e113329aefa492f58114c"; + name = "normalize_url___normalize_url_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz"; + sha1 = "2cc0d66b31ea23036458436e3620d85954c66c3c"; }; } { @@ -7522,22 +7922,6 @@ }; } { - name = "npm_bundled___npm_bundled_1.0.6.tgz"; - path = fetchurl { - name = "npm_bundled___npm_bundled_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz"; - sha1 = "e7ba9aadcef962bb61248f91721cd932b3fe6bdd"; - }; - } - { - name = "npm_packlist___npm_packlist_1.4.4.tgz"; - path = fetchurl { - name = "npm_packlist___npm_packlist_1.4.4.tgz"; - url = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.4.tgz"; - sha1 = "866224233850ac534b63d1a6e76050092b5d2f44"; - }; - } - { name = "npm_run_path___npm_run_path_2.0.2.tgz"; path = fetchurl { name = "npm_run_path___npm_run_path_2.0.2.tgz"; @@ -7546,14 +7930,6 @@ }; } { - name = "npmlog___npmlog_4.1.2.tgz"; - path = fetchurl { - name = "npmlog___npmlog_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; - sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; - }; - } - { name = "nth_check___nth_check_1.0.2.tgz"; path = fetchurl { name = "nth_check___nth_check_1.0.2.tgz"; @@ -7578,11 +7954,11 @@ }; } { - name = "nwsapi___nwsapi_2.1.4.tgz"; + name = "nwsapi___nwsapi_2.2.0.tgz"; path = fetchurl { - name = "nwsapi___nwsapi_2.1.4.tgz"; - url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz"; - sha1 = "e006a878db23636f8e8a67d33ca0e4edf61a842f"; + name = "nwsapi___nwsapi_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz"; + sha1 = "204879a9e3d068ff2a55139c2c772780681a38b7"; }; } { @@ -7618,27 +7994,27 @@ }; } { - name = "object_hash___object_hash_1.3.1.tgz"; + name = "object_hash___object_hash_2.0.3.tgz"; path = fetchurl { - name = "object_hash___object_hash_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz"; - sha1 = "fde452098a951cb145f039bb7d455449ddc126df"; + name = "object_hash___object_hash_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.3.tgz"; + sha1 = "d12db044e03cd2ca3d77c0570d87225b02e1e6ea"; }; } { - name = "object_inspect___object_inspect_1.6.0.tgz"; + name = "object_inspect___object_inspect_1.7.0.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz"; - sha1 = "c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"; + name = "object_inspect___object_inspect_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz"; + sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"; }; } { - name = "object_is___object_is_1.0.1.tgz"; + name = "object_is___object_is_1.1.2.tgz"; path = fetchurl { - name = "object_is___object_is_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz"; - sha1 = "0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"; + name = "object_is___object_is_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz"; + sha1 = "c5d2e87ff9e119f78b7a088441519e2eec1573b6"; }; } { @@ -7674,27 +8050,27 @@ }; } { - name = "object.entries___object.entries_1.1.0.tgz"; + name = "object.entries___object.entries_1.1.1.tgz"; path = fetchurl { - name = "object.entries___object.entries_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz"; - sha1 = "2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519"; + name = "object.entries___object.entries_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz"; + sha1 = "ee1cf04153de02bb093fec33683900f57ce5399b"; }; } { - name = "object.fromentries___object.fromentries_2.0.0.tgz"; + name = "object.fromentries___object.fromentries_2.0.2.tgz"; path = fetchurl { - name = "object.fromentries___object.fromentries_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.0.tgz"; - sha1 = "49a543d92151f8277b3ac9600f1e930b189d30ab"; + name = "object.fromentries___object.fromentries_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz"; + sha1 = "4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"; }; } { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; path = fetchurl { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; - sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; + sha1 = "369bf1f9592d8ab89d712dced5cb81c7c5352649"; }; } { @@ -7706,11 +8082,11 @@ }; } { - name = "object.values___object.values_1.1.0.tgz"; + name = "object.values___object.values_1.1.1.tgz"; path = fetchurl { - name = "object.values___object.values_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz"; - sha1 = "bf6810ef5da3e5325790eaaa2be213ea84624da9"; + name = "object.values___object.values_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz"; + sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"; }; } { @@ -7746,19 +8122,19 @@ }; } { - name = "onetime___onetime_2.0.1.tgz"; + name = "onetime___onetime_5.1.0.tgz"; path = fetchurl { - name = "onetime___onetime_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + name = "onetime___onetime_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz"; + sha1 = "fff0f3c91617fe62bb50189636e99ac8a6df7be5"; }; } { - name = "open___open_6.4.0.tgz"; + name = "open___open_7.0.3.tgz"; path = fetchurl { - name = "open___open_6.4.0.tgz"; - url = "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz"; - sha1 = "5c13e96d0dc894686164f18965ecfe889ecfc8a9"; + name = "open___open_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/open/-/open-7.0.3.tgz"; + sha1 = "db551a1af9c7ab4c7af664139930826138531c48"; }; } { @@ -7770,14 +8146,6 @@ }; } { - name = "optimist___optimist_0.6.1.tgz"; - path = fetchurl { - name = "optimist___optimist_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz"; - sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; - }; - } - { name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.3.tgz"; path = fetchurl { name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.3.tgz"; @@ -7786,11 +8154,11 @@ }; } { - name = "optionator___optionator_0.8.2.tgz"; + name = "optionator___optionator_0.8.3.tgz"; path = fetchurl { - name = "optionator___optionator_0.8.2.tgz"; - url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz"; - sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; + name = "optionator___optionator_0.8.3.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; + sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; }; } { @@ -7810,14 +8178,6 @@ }; } { - name = "os_homedir___os_homedir_1.0.2.tgz"; - path = fetchurl { - name = "os_homedir___os_homedir_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - } - { name = "os_locale___os_locale_3.1.0.tgz"; path = fetchurl { name = "os_locale___os_locale_3.1.0.tgz"; @@ -7834,14 +8194,6 @@ }; } { - name = "osenv___osenv_0.1.5.tgz"; - path = fetchurl { - name = "osenv___osenv_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz"; - sha1 = "85cdfafaeb28e8677f416e287592b5f3f49ea410"; - }; - } - { name = "p_defer___p_defer_1.0.0.tgz"; path = fetchurl { name = "p_defer___p_defer_1.0.0.tgz"; @@ -7882,11 +8234,11 @@ }; } { - name = "p_limit___p_limit_2.2.1.tgz"; + name = "p_limit___p_limit_2.3.0.tgz"; path = fetchurl { - name = "p_limit___p_limit_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz"; - sha1 = "aa07a788cc3151c939b5131f63570f0dd2009537"; + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; }; } { @@ -7906,11 +8258,27 @@ }; } { - name = "p_map___p_map_1.2.0.tgz"; + name = "p_locate___p_locate_4.1.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; + sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + }; + } + { + name = "p_map___p_map_2.1.0.tgz"; + path = fetchurl { + name = "p_map___p_map_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz"; + sha1 = "310928feef9c9ecc65b68b17693018a665cea175"; + }; + } + { + name = "p_map___p_map_3.0.0.tgz"; path = fetchurl { - name = "p_map___p_map_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz"; - sha1 = "e4e94f311eabbc8633a1e79908165fca26241b6b"; + name = "p_map___p_map_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz"; + sha1 = "d704d9af8a2ba684e2600d9a215983d4141a979d"; }; } { @@ -7922,6 +8290,14 @@ }; } { + name = "p_retry___p_retry_3.0.1.tgz"; + path = fetchurl { + name = "p_retry___p_retry_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz"; + sha1 = "316b4c8893e2c8dc1cfa891f406c4b422bebf328"; + }; + } + { name = "p_try___p_try_1.0.0.tgz"; path = fetchurl { name = "p_try___p_try_1.0.0.tgz"; @@ -7938,27 +8314,27 @@ }; } { - name = "pako___pako_1.0.10.tgz"; + name = "pako___pako_1.0.11.tgz"; path = fetchurl { - name = "pako___pako_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz"; - sha1 = "4328badb5086a426aa90f541977d4955da5c9732"; + name = "pako___pako_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz"; + sha1 = "6c9599d340d54dfd3946380252a35705a6b992bf"; }; } { - name = "parallel_transform___parallel_transform_1.1.0.tgz"; + name = "parallel_transform___parallel_transform_1.2.0.tgz"; path = fetchurl { - name = "parallel_transform___parallel_transform_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz"; - sha1 = "d410f065b05da23081fcd10f28854c29bda33b06"; + name = "parallel_transform___parallel_transform_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz"; + sha1 = "9049ca37d6cb2182c3b1d2c720be94d14a5814fc"; }; } { - name = "param_case___param_case_2.1.1.tgz"; + name = "param_case___param_case_3.0.3.tgz"; path = fetchurl { - name = "param_case___param_case_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz"; - sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; + name = "param_case___param_case_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz"; + sha1 = "4be41f8399eff621c56eebb829a5e451d9801238"; }; } { @@ -7970,11 +8346,11 @@ }; } { - name = "parse_asn1___parse_asn1_5.1.4.tgz"; + name = "parse_asn1___parse_asn1_5.1.5.tgz"; path = fetchurl { - name = "parse_asn1___parse_asn1_5.1.4.tgz"; - url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.4.tgz"; - sha1 = "37f6628f823fbdeb2273b4d540434a22f3ef1fcc"; + name = "parse_asn1___parse_asn1_5.1.5.tgz"; + url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz"; + sha1 = "003271343da58dc94cace494faef3d2147ecea0e"; }; } { @@ -8002,6 +8378,14 @@ }; } { + name = "parse_json___parse_json_5.0.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz"; + sha1 = "73e5114c986d143efa3712d4ea24db9a4266f60f"; + }; + } + { name = "parse5___parse5_4.0.0.tgz"; path = fetchurl { name = "parse5___parse5_4.0.0.tgz"; @@ -8026,6 +8410,14 @@ }; } { + name = "pascal_case___pascal_case_3.1.1.tgz"; + path = fetchurl { + name = "pascal_case___pascal_case_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz"; + sha1 = "5ac1975133ed619281e88920973d2cd1f279de5f"; + }; + } + { name = "pascalcase___pascalcase_0.1.1.tgz"; path = fetchurl { name = "pascalcase___pascalcase_0.1.1.tgz"; @@ -8066,6 +8458,14 @@ }; } { + name = "path_exists___path_exists_4.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; + sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + }; + } + { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; path = fetchurl { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; @@ -8090,6 +8490,14 @@ }; } { + name = "path_key___path_key_3.1.1.tgz"; + path = fetchurl { + name = "path_key___path_key_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; + sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + }; + } + { name = "path_parse___path_parse_1.0.6.tgz"; path = fetchurl { name = "path_parse___path_parse_1.0.6.tgz"; @@ -8106,11 +8514,11 @@ }; } { - name = "path_to_regexp___path_to_regexp_1.7.0.tgz"; + name = "path_to_regexp___path_to_regexp_1.8.0.tgz"; path = fetchurl { - name = "path_to_regexp___path_to_regexp_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; - sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; + name = "path_to_regexp___path_to_regexp_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz"; + sha1 = "887b3ba9d84393e87a0a0b9f4cb756198b53548a"; }; } { @@ -8130,6 +8538,14 @@ }; } { + name = "path_type___path_type_4.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; + sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + }; + } + { name = "pbkdf2___pbkdf2_3.0.17.tgz"; path = fetchurl { name = "pbkdf2___pbkdf2_3.0.17.tgz"; @@ -8154,6 +8570,14 @@ }; } { + name = "picomatch___picomatch_2.2.2.tgz"; + path = fetchurl { + name = "picomatch___picomatch_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; + sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; + }; + } + { name = "pify___pify_2.3.0.tgz"; path = fetchurl { name = "pify___pify_2.3.0.tgz"; @@ -8226,6 +8650,22 @@ }; } { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + }; + } + { + name = "pkg_up___pkg_up_3.1.0.tgz"; + path = fetchurl { + name = "pkg_up___pkg_up_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz"; + sha1 = "100ec235cc150e4fd42519412596a28512a0def5"; + }; + } + { name = "pkg_up___pkg_up_2.0.0.tgz"; path = fetchurl { name = "pkg_up___pkg_up_2.0.0.tgz"; @@ -8242,27 +8682,27 @@ }; } { - name = "pnp_webpack_plugin___pnp_webpack_plugin_1.5.0.tgz"; + name = "pnp_webpack_plugin___pnp_webpack_plugin_1.6.4.tgz"; path = fetchurl { - name = "pnp_webpack_plugin___pnp_webpack_plugin_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.5.0.tgz"; - sha1 = "62a1cd3068f46d564bb33c56eb250e4d586676eb"; + name = "pnp_webpack_plugin___pnp_webpack_plugin_1.6.4.tgz"; + url = "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz"; + sha1 = "c9711ac4dc48a685dabafc86f8b6dd9f8df84149"; }; } { - name = "popper.js___popper.js_1.15.0.tgz"; + name = "popper.js___popper.js_1.16.1.tgz"; path = fetchurl { - name = "popper.js___popper.js_1.15.0.tgz"; - url = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz"; - sha1 = "5560b99bbad7647e9faa475c6b8056621f5a4ff2"; + name = "popper.js___popper.js_1.16.1.tgz"; + url = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz"; + sha1 = "2a223cb3dc7b6213d740e40372be40de43e65b1b"; }; } { - name = "portfinder___portfinder_1.0.23.tgz"; + name = "portfinder___portfinder_1.0.26.tgz"; path = fetchurl { - name = "portfinder___portfinder_1.0.23.tgz"; - url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.23.tgz"; - sha1 = "894db4bcc5daf02b6614517ce89cd21a38226b82"; + name = "portfinder___portfinder_1.0.26.tgz"; + url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.26.tgz"; + sha1 = "475658d56ca30bed72ac7f1378ed350bd1b64e70"; }; } { @@ -8274,27 +8714,27 @@ }; } { - name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_4.0.1.tgz"; + name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_4.0.2.tgz"; path = fetchurl { - name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.1.tgz"; - sha1 = "b2a721a0d279c2f9103a36331c88981526428cc7"; + name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz"; + sha1 = "d93e46b504589e94ac7277b0463226c68041a880"; }; } { - name = "postcss_browser_comments___postcss_browser_comments_2.0.0.tgz"; + name = "postcss_browser_comments___postcss_browser_comments_3.0.0.tgz"; path = fetchurl { - name = "postcss_browser_comments___postcss_browser_comments_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-browser-comments/-/postcss-browser-comments-2.0.0.tgz"; - sha1 = "dc48d6a8ddbff188a80a000b7393436cb18aed88"; + name = "postcss_browser_comments___postcss_browser_comments_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-browser-comments/-/postcss-browser-comments-3.0.0.tgz"; + sha1 = "1248d2d935fb72053c8e1f61a84a57292d9f65e9"; }; } { - name = "postcss_calc___postcss_calc_7.0.1.tgz"; + name = "postcss_calc___postcss_calc_7.0.2.tgz"; path = fetchurl { - name = "postcss_calc___postcss_calc_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.1.tgz"; - sha1 = "36d77bab023b0ecbb9789d84dcb23c4941145436"; + name = "postcss_calc___postcss_calc_7.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.2.tgz"; + sha1 = "504efcd008ca0273120568b0792b16cdcde8aac1"; }; } { @@ -8482,11 +8922,11 @@ }; } { - name = "postcss_initial___postcss_initial_3.0.1.tgz"; + name = "postcss_initial___postcss_initial_3.0.2.tgz"; path = fetchurl { - name = "postcss_initial___postcss_initial_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.1.tgz"; - sha1 = "99d319669a13d6c06ef8e70d852f68cb1b399b61"; + name = "postcss_initial___postcss_initial_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.2.tgz"; + sha1 = "f018563694b3c16ae8eaabe3c585ac6319637b2d"; }; } { @@ -8586,27 +9026,27 @@ }; } { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_2.0.6.tgz"; + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz"; path = fetchurl { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz"; - sha1 = "dd9953f6dd476b5fd1ef2d8830c8929760b56e63"; + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz"; + sha1 = "e8a6561be914aaf3c052876377524ca90dbb7915"; }; } { - name = "postcss_modules_scope___postcss_modules_scope_2.1.0.tgz"; + name = "postcss_modules_scope___postcss_modules_scope_2.2.0.tgz"; path = fetchurl { - name = "postcss_modules_scope___postcss_modules_scope_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz"; - sha1 = "ad3f5bf7856114f6fcab901b0502e2a2bc39d4eb"; + name = "postcss_modules_scope___postcss_modules_scope_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz"; + sha1 = "385cae013cc7743f5a7d7602d1073a89eaae62ee"; }; } { - name = "postcss_modules_values___postcss_modules_values_2.0.0.tgz"; + name = "postcss_modules_values___postcss_modules_values_3.0.0.tgz"; path = fetchurl { - name = "postcss_modules_values___postcss_modules_values_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz"; - sha1 = "479b46dc0c5ca3dc7fa5270851836b9ec7152f64"; + name = "postcss_modules_values___postcss_modules_values_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz"; + sha1 = "5b5000d6ebae29b4255301b4a3a54574423e7f10"; }; } { @@ -8690,11 +9130,11 @@ }; } { - name = "postcss_normalize___postcss_normalize_7.0.1.tgz"; + name = "postcss_normalize___postcss_normalize_8.0.1.tgz"; path = fetchurl { - name = "postcss_normalize___postcss_normalize_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize/-/postcss-normalize-7.0.1.tgz"; - sha1 = "eb51568d962b8aa61a8318383c8bb7e54332282e"; + name = "postcss_normalize___postcss_normalize_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize/-/postcss-normalize-8.0.1.tgz"; + sha1 = "90e80a7763d7fdf2da6f2f0f82be832ce4f66776"; }; } { @@ -8794,11 +9234,11 @@ }; } { - name = "postcss_selector_parser___postcss_selector_parser_3.1.1.tgz"; + name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz"; path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz"; - sha1 = "4f875f4afb0c96573d5cf4d74011aee250a7e865"; + name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"; + sha1 = "b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"; }; } { @@ -8842,11 +9282,11 @@ }; } { - name = "postcss_value_parser___postcss_value_parser_4.0.2.tgz"; + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; path = fetchurl { - name = "postcss_value_parser___postcss_value_parser_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz"; - sha1 = "482282c09a42706d1fc9a069b73f44ec08391dc9"; + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; + sha1 = "443f6a20ced6481a2bda4fa8532a6e55d789a2cb"; }; } { @@ -8858,19 +9298,19 @@ }; } { - name = "postcss___postcss_7.0.14.tgz"; + name = "postcss___postcss_7.0.21.tgz"; path = fetchurl { - name = "postcss___postcss_7.0.14.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz"; - sha1 = "4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"; + name = "postcss___postcss_7.0.21.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz"; + sha1 = "06bb07824c19c2021c5d056d5b10c35b989f7e17"; }; } { - name = "postcss___postcss_7.0.17.tgz"; + name = "postcss___postcss_7.0.29.tgz"; path = fetchurl { - name = "postcss___postcss_7.0.17.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz"; - sha1 = "4da1bdff5322d4a0acaab4d87f3e782436bad31f"; + name = "postcss___postcss_7.0.29.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.29.tgz"; + sha1 = "d3a903872bd52280b83bce38cdc83ce55c06129e"; }; } { @@ -8882,11 +9322,19 @@ }; } { - name = "prettier___prettier_1.18.2.tgz"; + name = "prepend_http___prepend_http_1.0.4.tgz"; + path = fetchurl { + name = "prepend_http___prepend_http_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz"; + sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + }; + } + { + name = "prettier___prettier_2.0.5.tgz"; path = fetchurl { - name = "prettier___prettier_1.18.2.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz"; - sha1 = "6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"; + name = "prettier___prettier_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz"; + sha1 = "d6d56282455243f2f92cc1716692c08aa31522d4"; }; } { @@ -8914,6 +9362,14 @@ }; } { + name = "pretty_format___pretty_format_25.5.0.tgz"; + path = fetchurl { + name = "pretty_format___pretty_format_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz"; + sha1 = "7873c1d774f682c34b8d48b6743a2bf2ac55791a"; + }; + } + { name = "private___private_0.1.8.tgz"; path = fetchurl { name = "private___private_0.1.8.tgz"; @@ -8954,14 +9410,6 @@ }; } { - name = "promise___promise_8.0.3.tgz"; - path = fetchurl { - name = "promise___promise_8.0.3.tgz"; - url = "https://registry.yarnpkg.com/promise/-/promise-8.0.3.tgz"; - sha1 = "f592e099c6cddc000d538ee7283bb190452b0bf6"; - }; - } - { name = "promise___promise_7.3.1.tgz"; path = fetchurl { name = "promise___promise_7.3.1.tgz"; @@ -8970,11 +9418,19 @@ }; } { - name = "prompts___prompts_2.2.1.tgz"; + name = "promise___promise_8.1.0.tgz"; + path = fetchurl { + name = "promise___promise_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz"; + sha1 = "697c25c3dfe7435dd79fcd58c38a135888eaf05e"; + }; + } + { + name = "prompts___prompts_2.3.2.tgz"; path = fetchurl { - name = "prompts___prompts_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/prompts/-/prompts-2.2.1.tgz"; - sha1 = "f901dd2a2dfee080359c0e20059b24188d75ad35"; + name = "prompts___prompts_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz"; + sha1 = "480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"; }; } { @@ -8994,19 +9450,19 @@ }; } { - name = "proxy_addr___proxy_addr_2.0.5.tgz"; + name = "proxy_addr___proxy_addr_2.0.6.tgz"; path = fetchurl { - name = "proxy_addr___proxy_addr_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz"; - sha1 = "34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"; + name = "proxy_addr___proxy_addr_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz"; + sha1 = "fdc2336505447d3f2f2c638ed272caf614bbb2bf"; }; } { - name = "proxy_from_env___proxy_from_env_1.0.0.tgz"; + name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; path = fetchurl { - name = "proxy_from_env___proxy_from_env_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz"; - sha1 = "33c50398f70ea7eb96d21f7b817630a55791c7ee"; + name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz"; + sha1 = "e102f16ca355424865755d2c9e8ea4f24d58c3e2"; }; } { @@ -9018,11 +9474,11 @@ }; } { - name = "psl___psl_1.3.1.tgz"; + name = "psl___psl_1.8.0.tgz"; path = fetchurl { - name = "psl___psl_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/psl/-/psl-1.3.1.tgz"; - sha1 = "d5aa3873a35ec450bc7db9012ad5a7246f6fc8bd"; + name = "psl___psl_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz"; + sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24"; }; } { @@ -9082,11 +9538,11 @@ }; } { - name = "puppeteer___puppeteer_1.19.0.tgz"; + name = "puppeteer___puppeteer_3.0.4.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_1.19.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.19.0.tgz"; - sha1 = "e3b7b448c2c97933517078d7a2c53687361bebea"; + name = "puppeteer___puppeteer_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.0.4.tgz"; + sha1 = "f445aae0a6732c65bbb90e963dcd6fd8fde0d780"; }; } { @@ -9114,6 +9570,14 @@ }; } { + name = "query_string___query_string_4.3.4.tgz"; + path = fetchurl { + name = "query_string___query_string_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz"; + sha1 = "bbb693b9ca915c232515b228b1a02b609043dbeb"; + }; + } + { name = "querystring_es3___querystring_es3_0.2.1.tgz"; path = fetchurl { name = "querystring_es3___querystring_es3_0.2.1.tgz"; @@ -9186,51 +9650,43 @@ }; } { - name = "rc___rc_1.2.8.tgz"; + name = "react_app_polyfill___react_app_polyfill_1.0.6.tgz"; path = fetchurl { - name = "rc___rc_1.2.8.tgz"; - url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; - sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; + name = "react_app_polyfill___react_app_polyfill_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-1.0.6.tgz"; + sha1 = "890f8d7f2842ce6073f030b117de9130a5f385f0"; }; } { - name = "react_app_polyfill___react_app_polyfill_1.0.2.tgz"; + name = "react_codemirror2___react_codemirror2_7.1.0.tgz"; path = fetchurl { - name = "react_app_polyfill___react_app_polyfill_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-1.0.2.tgz"; - sha1 = "2a51175885c88245a2a356dc46df29f38ec9f060"; + name = "react_codemirror2___react_codemirror2_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/react-codemirror2/-/react-codemirror2-7.1.0.tgz"; + sha1 = "b874a275ad4f6f2ee5adb23b550c0f4b8b82776d"; }; } { - name = "react_codemirror2___react_codemirror2_5.1.0.tgz"; + name = "react_dev_utils___react_dev_utils_10.2.1.tgz"; path = fetchurl { - name = "react_codemirror2___react_codemirror2_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/react-codemirror2/-/react-codemirror2-5.1.0.tgz"; - sha1 = "62de4460178adea40eb52eabf7491669bf3794b8"; + name = "react_dev_utils___react_dev_utils_10.2.1.tgz"; + url = "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.1.tgz"; + sha1 = "f6de325ae25fa4d546d09df4bb1befdc6dd19c19"; }; } { - name = "react_dev_utils___react_dev_utils_9.0.3.tgz"; + name = "react_dom___react_dom_16.13.1.tgz"; path = fetchurl { - name = "react_dev_utils___react_dev_utils_9.0.3.tgz"; - url = "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-9.0.3.tgz"; - sha1 = "7607455587abb84599451460eb37cef0b684131a"; + name = "react_dom___react_dom_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz"; + sha1 = "c1bd37331a0486c078ee54c4740720993b2e0e7f"; }; } { - name = "react_dom___react_dom_16.9.0.tgz"; + name = "react_error_overlay___react_error_overlay_6.0.7.tgz"; path = fetchurl { - name = "react_dom___react_dom_16.9.0.tgz"; - url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.9.0.tgz"; - sha1 = "5e65527a5e26f22ae3701131bcccaee9fb0d3962"; - }; - } - { - name = "react_error_overlay___react_error_overlay_6.0.1.tgz"; - path = fetchurl { - name = "react_error_overlay___react_error_overlay_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.1.tgz"; - sha1 = "b8d3cf9bb991c02883225c48044cb3ee20413e0f"; + name = "react_error_overlay___react_error_overlay_6.0.7.tgz"; + url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.7.tgz"; + sha1 = "1dcfb459ab671d53f660a991513cb2f0a0553108"; }; } { @@ -9242,35 +9698,19 @@ }; } { - name = "react_is___react_is_16.9.0.tgz"; - path = fetchurl { - name = "react_is___react_is_16.9.0.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz"; - sha1 = "21ca9561399aad0ff1a7701c01683e8ca981edcb"; - }; - } - { - name = "react_is___react_is_16.10.0.tgz"; + name = "react_is___react_is_16.13.1.tgz"; path = fetchurl { - name = "react_is___react_is_16.10.0.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-16.10.0.tgz"; - sha1 = "3d6a031e57fff73c3cfa0347feb3e8f40c5141e5"; + name = "react_is___react_is_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; + sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; }; } { - name = "react_lifecycles_compat___react_lifecycles_compat_3.0.4.tgz"; + name = "react_markdown___react_markdown_4.3.1.tgz"; path = fetchurl { - name = "react_lifecycles_compat___react_lifecycles_compat_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz"; - sha1 = "4f1a273afdfc8f3488a8c516bfda78f872352362"; - }; - } - { - name = "react_markdown___react_markdown_4.2.2.tgz"; - path = fetchurl { - name = "react_markdown___react_markdown_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/react-markdown/-/react-markdown-4.2.2.tgz"; - sha1 = "b378774fcffb354653db8749153fc8740f9ed2f1"; + name = "react_markdown___react_markdown_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/react-markdown/-/react-markdown-4.3.1.tgz"; + sha1 = "39f0633b94a027445b86c9811142d05381300f2f"; }; } { @@ -9282,35 +9722,35 @@ }; } { - name = "react_router_dom___react_router_dom_4.3.1.tgz"; + name = "react_router_dom___react_router_dom_5.1.2.tgz"; path = fetchurl { - name = "react_router_dom___react_router_dom_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz"; - sha1 = "4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6"; + name = "react_router_dom___react_router_dom_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.1.2.tgz"; + sha1 = "06701b834352f44d37fbb6311f870f84c76b9c18"; }; } { - name = "react_router___react_router_4.3.1.tgz"; + name = "react_router___react_router_5.1.2.tgz"; path = fetchurl { - name = "react_router___react_router_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz"; - sha1 = "aada4aef14c809cb2e686b05cee4742234506c4e"; + name = "react_router___react_router_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/react-router/-/react-router-5.1.2.tgz"; + sha1 = "6ea51d789cb36a6be1ba5f7c0d48dd9e817d3418"; }; } { - name = "react_scripts___react_scripts_3.1.1.tgz"; + name = "react_scripts___react_scripts_3.4.1.tgz"; path = fetchurl { - name = "react_scripts___react_scripts_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.1.1.tgz"; - sha1 = "1796bc92447f3a2d3072c3b71ca99f88d099c48d"; + name = "react_scripts___react_scripts_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.1.tgz"; + sha1 = "f551298b5c71985cc491b9acf3c8e8c0ae3ada0a"; }; } { - name = "react_test_renderer___react_test_renderer_16.9.0.tgz"; + name = "react_test_renderer___react_test_renderer_16.13.1.tgz"; path = fetchurl { - name = "react_test_renderer___react_test_renderer_16.9.0.tgz"; - url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.9.0.tgz"; - sha1 = "7ed657a374af47af88f66f33a3ef99c9610c8ae9"; + name = "react_test_renderer___react_test_renderer_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.1.tgz"; + sha1 = "de25ea358d9012606de51e012d9742e7f0deabc1"; }; } { @@ -9322,19 +9762,19 @@ }; } { - name = "react_transition_group___react_transition_group_4.3.0.tgz"; + name = "react_transition_group___react_transition_group_4.4.1.tgz"; path = fetchurl { - name = "react_transition_group___react_transition_group_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.3.0.tgz"; - sha1 = "fea832e386cf8796c58b61874a3319704f5ce683"; + name = "react_transition_group___react_transition_group_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz"; + sha1 = "63868f9325a38ea5ee9535d828327f85773345c9"; }; } { - name = "react___react_16.9.0.tgz"; + name = "react___react_16.13.1.tgz"; path = fetchurl { - name = "react___react_16.9.0.tgz"; - url = "https://registry.yarnpkg.com/react/-/react-16.9.0.tgz"; - sha1 = "40ba2f9af13bc1a38d75dbf2f4359a5185c4f7aa"; + name = "react___react_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz"; + sha1 = "2e818822f1a9743122c063d6410d85c1e3afe48e"; }; } { @@ -9370,19 +9810,19 @@ }; } { - name = "readable_stream___readable_stream_2.3.6.tgz"; + name = "readable_stream___readable_stream_2.3.7.tgz"; path = fetchurl { - name = "readable_stream___readable_stream_2.3.6.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz"; - sha1 = "b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"; + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; }; } { - name = "readable_stream___readable_stream_3.4.0.tgz"; + name = "readable_stream___readable_stream_3.6.0.tgz"; path = fetchurl { - name = "readable_stream___readable_stream_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz"; - sha1 = "a51c26754658e0a3c21dbf59163bd45ba6f447fc"; + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; }; } { @@ -9394,6 +9834,14 @@ }; } { + name = "readdirp___readdirp_3.4.0.tgz"; + path = fetchurl { + name = "readdirp___readdirp_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz"; + sha1 = "9fdccdf9e9155805449221ac645e8303ab5b9ada"; + }; + } + { name = "realpath_native___realpath_native_1.1.0.tgz"; path = fetchurl { name = "realpath_native___realpath_native_1.1.0.tgz"; @@ -9418,11 +9866,11 @@ }; } { - name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; path = fetchurl { - name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz"; - sha1 = "ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"; + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; + sha1 = "e5de7111d655e7ba60c057dbe9ff37c87e65cdec"; }; } { @@ -9434,14 +9882,6 @@ }; } { - name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; - path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz"; - sha1 = "7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"; - }; - } - { name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; path = fetchurl { name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; @@ -9450,11 +9890,19 @@ }; } { - name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; path = fetchurl { - name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; - url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz"; - sha1 = "3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb"; + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; + sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; + }; + } + { + name = "regenerator_transform___regenerator_transform_0.14.4.tgz"; + path = fetchurl { + name = "regenerator_transform___regenerator_transform_0.14.4.tgz"; + url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz"; + sha1 = "5266857896518d1616a78a0479337a30ea974cc7"; }; } { @@ -9474,19 +9922,11 @@ }; } { - name = "regexp_tree___regexp_tree_0.1.13.tgz"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; path = fetchurl { - name = "regexp_tree___regexp_tree_0.1.13.tgz"; - url = "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.13.tgz"; - sha1 = "5b19ab9377edc68bc3679256840bb29afc158d7f"; - }; - } - { - name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz"; - path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz"; - sha1 = "6b30724e306a27833eeb171b66ac8890ba37e41c"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; + sha1 = "7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"; }; } { @@ -9498,27 +9938,35 @@ }; } { - name = "regexpu_core___regexpu_core_4.5.5.tgz"; + name = "regexpp___regexpp_3.1.0.tgz"; + path = fetchurl { + name = "regexpp___regexpp_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz"; + sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"; + }; + } + { + name = "regexpu_core___regexpu_core_4.7.0.tgz"; path = fetchurl { - name = "regexpu_core___regexpu_core_4.5.5.tgz"; - url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.5.tgz"; - sha1 = "aaffe61c2af58269b3e516b61a73790376326411"; + name = "regexpu_core___regexpu_core_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz"; + sha1 = "fcbf458c50431b0bb7b45d6967b8192d91f3d938"; }; } { - name = "regjsgen___regjsgen_0.5.0.tgz"; + name = "regjsgen___regjsgen_0.5.1.tgz"; path = fetchurl { - name = "regjsgen___regjsgen_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz"; - sha1 = "a7634dc08f89209c2049adda3525711fb97265dd"; + name = "regjsgen___regjsgen_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz"; + sha1 = "48f0bf1a5ea205196929c0d9798b42d1ed98443c"; }; } { - name = "regjsparser___regjsparser_0.6.0.tgz"; + name = "regjsparser___regjsparser_0.6.4.tgz"; path = fetchurl { - name = "regjsparser___regjsparser_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz"; - sha1 = "f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"; + name = "regjsparser___regjsparser_0.6.4.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz"; + sha1 = "a769f8684308401a66e9b529d2436ff4d0666272"; }; } { @@ -9586,27 +10034,27 @@ }; } { - name = "request_promise_core___request_promise_core_1.1.2.tgz"; + name = "request_promise_core___request_promise_core_1.1.3.tgz"; path = fetchurl { - name = "request_promise_core___request_promise_core_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz"; - sha1 = "339f6aababcafdb31c799ff158700336301d3346"; + name = "request_promise_core___request_promise_core_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz"; + sha1 = "e9a3c081b51380dfea677336061fea879a829ee9"; }; } { - name = "request_promise_native___request_promise_native_1.0.7.tgz"; + name = "request_promise_native___request_promise_native_1.0.8.tgz"; path = fetchurl { - name = "request_promise_native___request_promise_native_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.7.tgz"; - sha1 = "a49868a624bdea5069f1251d0a836e0d89aa2c59"; + name = "request_promise_native___request_promise_native_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz"; + sha1 = "a455b960b826e44e2bf8999af64dff2bfe58cb36"; }; } { - name = "request___request_2.88.0.tgz"; + name = "request___request_2.88.2.tgz"; path = fetchurl { - name = "request___request_2.88.0.tgz"; - url = "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz"; - sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef"; + name = "request___request_2.88.2.tgz"; + url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; + sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; }; } { @@ -9666,19 +10114,19 @@ }; } { - name = "resolve_pathname___resolve_pathname_2.2.0.tgz"; + name = "resolve_pathname___resolve_pathname_3.0.0.tgz"; path = fetchurl { - name = "resolve_pathname___resolve_pathname_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz"; - sha1 = "7e9ae21ed815fd63ab189adeee64dc831eefa879"; + name = "resolve_pathname___resolve_pathname_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz"; + sha1 = "99d02224d3cf263689becbb393bc560313025dcd"; }; } { - name = "resolve_url_loader___resolve_url_loader_3.1.0.tgz"; + name = "resolve_url_loader___resolve_url_loader_3.1.1.tgz"; path = fetchurl { - name = "resolve_url_loader___resolve_url_loader_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.0.tgz"; - sha1 = "54d8181d33cd1b66a59544d05cadf8e4aa7d37cc"; + name = "resolve_url_loader___resolve_url_loader_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.1.tgz"; + sha1 = "28931895fa1eab9be0647d3b2958c100ae3c0bf0"; }; } { @@ -9698,19 +10146,27 @@ }; } { - name = "resolve___resolve_1.12.0.tgz"; + name = "resolve___resolve_1.15.0.tgz"; + path = fetchurl { + name = "resolve___resolve_1.15.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.15.0.tgz"; + sha1 = "1b7ca96073ebb52e741ffd799f6b39ea462c67f5"; + }; + } + { + name = "resolve___resolve_1.17.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.12.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz"; - sha1 = "3fc644a35c84a48554609ff26ec52b66fa577df6"; + name = "resolve___resolve_1.17.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz"; + sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444"; }; } { - name = "restore_cursor___restore_cursor_2.0.0.tgz"; + name = "restore_cursor___restore_cursor_3.1.0.tgz"; path = fetchurl { - name = "restore_cursor___restore_cursor_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + name = "restore_cursor___restore_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz"; + sha1 = "39f67c54b3a7a58cea5236d95cf0034239631f7e"; }; } { @@ -9722,6 +10178,14 @@ }; } { + name = "retry___retry_0.12.0.tgz"; + path = fetchurl { + name = "retry___retry_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + } + { name = "rework_visit___rework_visit_1.0.0.tgz"; path = fetchurl { name = "rework_visit___rework_visit_1.0.0.tgz"; @@ -9770,6 +10234,14 @@ }; } { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + }; + } + { name = "ripemd160___ripemd160_2.0.2.tgz"; path = fetchurl { name = "ripemd160___ripemd160_2.0.2.tgz"; @@ -9786,11 +10258,11 @@ }; } { - name = "run_async___run_async_2.3.0.tgz"; + name = "run_async___run_async_2.4.1.tgz"; path = fetchurl { - name = "run_async___run_async_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz"; - sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; + name = "run_async___run_async_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz"; + sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455"; }; } { @@ -9802,19 +10274,11 @@ }; } { - name = "rx___rx_4.1.0.tgz"; - path = fetchurl { - name = "rx___rx_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz"; - sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782"; - }; - } - { - name = "rxjs___rxjs_6.5.3.tgz"; + name = "rxjs___rxjs_6.5.5.tgz"; path = fetchurl { - name = "rxjs___rxjs_6.5.3.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz"; - sha1 = "510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"; + name = "rxjs___rxjs_6.5.5.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz"; + sha1 = "c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"; }; } { @@ -9858,11 +10322,19 @@ }; } { - name = "sass_loader___sass_loader_7.2.0.tgz"; + name = "sanitize.css___sanitize.css_10.0.0.tgz"; path = fetchurl { - name = "sass_loader___sass_loader_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.2.0.tgz"; - sha1 = "e34115239309d15b2527cb62b5dfefb62a96ff7f"; + name = "sanitize.css___sanitize.css_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/sanitize.css/-/sanitize.css-10.0.0.tgz"; + sha1 = "b5cb2547e96d8629a60947544665243b1dc3657a"; + }; + } + { + name = "sass_loader___sass_loader_8.0.2.tgz"; + path = fetchurl { + name = "sass_loader___sass_loader_8.0.2.tgz"; + url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.2.tgz"; + sha1 = "debecd8c3ce243c76454f2e8290482150380090d"; }; } { @@ -9882,11 +10354,11 @@ }; } { - name = "scheduler___scheduler_0.15.0.tgz"; + name = "scheduler___scheduler_0.19.1.tgz"; path = fetchurl { - name = "scheduler___scheduler_0.15.0.tgz"; - url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.15.0.tgz"; - sha1 = "6bfcf80ff850b280fed4aeecc6513bc0b4f17f8e"; + name = "scheduler___scheduler_0.19.1.tgz"; + url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz"; + sha1 = "4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"; }; } { @@ -9898,11 +10370,11 @@ }; } { - name = "schema_utils___schema_utils_2.2.0.tgz"; + name = "schema_utils___schema_utils_2.6.6.tgz"; path = fetchurl { - name = "schema_utils___schema_utils_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.2.0.tgz"; - sha1 = "48a065ce219e0cacf4631473159037b2c1ae82da"; + name = "schema_utils___schema_utils_2.6.6.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.6.tgz"; + sha1 = "299fe6bd4a3365dc23d99fd446caff8f1d6c330c"; }; } { @@ -9914,11 +10386,11 @@ }; } { - name = "selfsigned___selfsigned_1.10.4.tgz"; + name = "selfsigned___selfsigned_1.10.7.tgz"; path = fetchurl { - name = "selfsigned___selfsigned_1.10.4.tgz"; - url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz"; - sha1 = "cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"; + name = "selfsigned___selfsigned_1.10.7.tgz"; + url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.7.tgz"; + sha1 = "da5819fd049d5574f28e88a9bcc6dbc6e6f3906b"; }; } { @@ -9930,14 +10402,6 @@ }; } { - name = "semver___semver_5.5.0.tgz"; - path = fetchurl { - name = "semver___semver_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz"; - sha1 = "dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"; - }; - } - { name = "semver___semver_6.3.0.tgz"; path = fetchurl { name = "semver___semver_6.3.0.tgz"; @@ -9946,6 +10410,14 @@ }; } { + name = "semver___semver_7.0.0.tgz"; + path = fetchurl { + name = "semver___semver_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; + sha1 = "5f3ca35761e47e05b206c6daff2cf814f0316b8e"; + }; + } + { name = "send___send_0.17.1.tgz"; path = fetchurl { name = "send___send_0.17.1.tgz"; @@ -9954,11 +10426,11 @@ }; } { - name = "serialize_javascript___serialize_javascript_1.9.0.tgz"; + name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; path = fetchurl { - name = "serialize_javascript___serialize_javascript_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.0.tgz"; - sha1 = "5b77019d7c3b85fe91b33ae424c53dcbfb6618bd"; + name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz"; + sha1 = "ecec53b0e0317bdc95ef76ab7074b7384785fa61"; }; } { @@ -10050,6 +10522,14 @@ }; } { + name = "shebang_command___shebang_command_2.0.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; + sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + }; + } + { name = "shebang_regex___shebang_regex_1.0.0.tgz"; path = fetchurl { name = "shebang_regex___shebang_regex_1.0.0.tgz"; @@ -10058,11 +10538,19 @@ }; } { - name = "shell_quote___shell_quote_1.6.1.tgz"; + name = "shebang_regex___shebang_regex_3.0.0.tgz"; path = fetchurl { - name = "shell_quote___shell_quote_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz"; - sha1 = "f4781949cce402697127430ea3b3c5476f481767"; + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + }; + } + { + name = "shell_quote___shell_quote_1.7.2.tgz"; + path = fetchurl { + name = "shell_quote___shell_quote_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz"; + sha1 = "67a7d02c76c9da24f99d20808fcaded0e0e04be2"; }; } { @@ -10074,11 +10562,19 @@ }; } { - name = "signal_exit___signal_exit_3.0.2.tgz"; + name = "side_channel___side_channel_1.0.2.tgz"; + path = fetchurl { + name = "side_channel___side_channel_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz"; + sha1 = "df5d1abadb4e4bf4af1cd8852bf132d2f7876947"; + }; + } + { + name = "signal_exit___signal_exit_3.0.3.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + name = "signal_exit___signal_exit_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; + sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; }; } { @@ -10090,11 +10586,11 @@ }; } { - name = "sisteransi___sisteransi_1.0.3.tgz"; + name = "sisteransi___sisteransi_1.0.5.tgz"; path = fetchurl { - name = "sisteransi___sisteransi_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.3.tgz"; - sha1 = "98168d62b79e3a5e758e27ae63c4a053d748f4eb"; + name = "sisteransi___sisteransi_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz"; + sha1 = "134d681297756437cc05ca01370d3a7a571075ed"; }; } { @@ -10114,6 +10610,14 @@ }; } { + name = "slash___slash_3.0.0.tgz"; + path = fetchurl { + name = "slash___slash_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; + sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634"; + }; + } + { name = "slice_ansi___slice_ansi_2.1.0.tgz"; path = fetchurl { name = "slice_ansi___slice_ansi_2.1.0.tgz"; @@ -10146,11 +10650,11 @@ }; } { - name = "sockjs_client___sockjs_client_1.3.0.tgz"; + name = "sockjs_client___sockjs_client_1.4.0.tgz"; path = fetchurl { - name = "sockjs_client___sockjs_client_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz"; - sha1 = "12fc9d6cb663da5739d3dc5fb6e8687da95cb177"; + name = "sockjs_client___sockjs_client_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz"; + sha1 = "c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"; }; } { @@ -10162,6 +10666,14 @@ }; } { + name = "sort_keys___sort_keys_1.1.2.tgz"; + path = fetchurl { + name = "sort_keys___sort_keys_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz"; + sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad"; + }; + } + { name = "source_list_map___source_list_map_2.0.1.tgz"; path = fetchurl { name = "source_list_map___source_list_map_2.0.1.tgz"; @@ -10170,19 +10682,19 @@ }; } { - name = "source_map_resolve___source_map_resolve_0.5.2.tgz"; + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; path = fetchurl { - name = "source_map_resolve___source_map_resolve_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; - sha1 = "72e2cc34095543e43b2c62b2c4c10d4a9054f259"; + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a"; }; } { - name = "source_map_support___source_map_support_0.5.13.tgz"; + name = "source_map_support___source_map_support_0.5.19.tgz"; path = fetchurl { - name = "source_map_support___source_map_support_0.5.13.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz"; - sha1 = "31b24a9c2e73c2de85066c0feb7d44767ed52932"; + name = "source_map_support___source_map_support_0.5.19.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; + sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; }; } { @@ -10218,11 +10730,11 @@ }; } { - name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; path = fetchurl { - name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; - sha1 = "2ea450aee74f2a89bfb94519c07fcd6f41322977"; + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; }; } { @@ -10250,11 +10762,11 @@ }; } { - name = "spdy___spdy_4.0.1.tgz"; + name = "spdy___spdy_4.0.2.tgz"; path = fetchurl { - name = "spdy___spdy_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.1.tgz"; - sha1 = "6f12ed1c5db7ea4f24ebb8b89ba58c87c08257f2"; + name = "spdy___spdy_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz"; + sha1 = "b74f466203a3eda452c02492b91fb9e84a27677b"; }; } { @@ -10290,6 +10802,14 @@ }; } { + name = "ssri___ssri_7.1.0.tgz"; + path = fetchurl { + name = "ssri___ssri_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-7.1.0.tgz"; + sha1 = "92c241bf6de82365b5c7fb4bd76e975522e1294d"; + }; + } + { name = "stable___stable_0.1.8.tgz"; path = fetchurl { name = "stable___stable_0.1.8.tgz"; @@ -10306,11 +10826,11 @@ }; } { - name = "state_toggle___state_toggle_1.0.2.tgz"; + name = "state_toggle___state_toggle_1.0.3.tgz"; path = fetchurl { - name = "state_toggle___state_toggle_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.2.tgz"; - sha1 = "75e93a61944116b4959d665c8db2d243631d6ddc"; + name = "state_toggle___state_toggle_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz"; + sha1 = "e123b16a88e143139b09c6852221bc9815917dfe"; }; } { @@ -10362,11 +10882,19 @@ }; } { - name = "stream_shift___stream_shift_1.0.0.tgz"; + name = "stream_shift___stream_shift_1.0.1.tgz"; path = fetchurl { - name = "stream_shift___stream_shift_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz"; - sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; + name = "stream_shift___stream_shift_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz"; + sha1 = "d7088281559ab2778424279b0877da3c392d5a3d"; + }; + } + { + name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz"; + path = fetchurl { + name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; + sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; }; } { @@ -10378,6 +10906,14 @@ }; } { + name = "string_length___string_length_3.1.0.tgz"; + path = fetchurl { + name = "string_length___string_length_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-length/-/string-length-3.1.0.tgz"; + sha1 = "107ef8c23456e187a8abd4a61162ff4ac6e25837"; + }; + } + { name = "string_width___string_width_1.0.2.tgz"; path = fetchurl { name = "string_width___string_width_1.0.2.tgz"; @@ -10402,19 +10938,51 @@ }; } { - name = "string.prototype.trimleft___string.prototype.trimleft_2.0.0.tgz"; + name = "string_width___string_width_4.2.0.tgz"; + path = fetchurl { + name = "string_width___string_width_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz"; + sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; + }; + } + { + name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; + path = fetchurl { + name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz"; + sha1 = "48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"; + }; + } + { + name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; path = fetchurl { - name = "string.prototype.trimleft___string.prototype.trimleft_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.0.0.tgz"; - sha1 = "68b6aa8e162c6a80e76e3a8a0c2e747186e271ff"; + name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; + sha1 = "85812a6b847ac002270f5808146064c995fb6913"; }; } { - name = "string.prototype.trimright___string.prototype.trimright_2.0.0.tgz"; + name = "string.prototype.trimleft___string.prototype.trimleft_2.1.2.tgz"; path = fetchurl { - name = "string.prototype.trimright___string.prototype.trimright_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.0.0.tgz"; - sha1 = "ab4a56d802a01fbe7293e11e84f24dc8164661dd"; + name = "string.prototype.trimleft___string.prototype.trimleft_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz"; + sha1 = "4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"; + }; + } + { + name = "string.prototype.trimright___string.prototype.trimright_2.1.2.tgz"; + path = fetchurl { + name = "string.prototype.trimright___string.prototype.trimright_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; + sha1 = "c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"; + }; + } + { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; + path = fetchurl { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; + sha1 = "14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"; }; } { @@ -10442,11 +11010,11 @@ }; } { - name = "strip_ansi___strip_ansi_5.2.0.tgz"; + name = "strip_ansi___strip_ansi_6.0.0.tgz"; path = fetchurl { - name = "strip_ansi___strip_ansi_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; - sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; }; } { @@ -10466,6 +11034,14 @@ }; } { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; + }; + } + { name = "strip_bom___strip_bom_3.0.0.tgz"; path = fetchurl { name = "strip_bom___strip_bom_3.0.0.tgz"; @@ -10490,27 +11066,19 @@ }; } { - name = "strip_json_comments___strip_json_comments_3.0.1.tgz"; - path = fetchurl { - name = "strip_json_comments___strip_json_comments_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz"; - sha1 = "85713975a91fb87bf1b305cca77395e40d2a64a7"; - }; - } - { - name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + name = "strip_json_comments___strip_json_comments_3.1.0.tgz"; path = fetchurl { - name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + name = "strip_json_comments___strip_json_comments_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz"; + sha1 = "7638d31422129ecf4457440009fba03f9f9ac180"; }; } { - name = "style_loader___style_loader_1.0.0.tgz"; + name = "style_loader___style_loader_0.23.1.tgz"; path = fetchurl { - name = "style_loader___style_loader_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/style-loader/-/style-loader-1.0.0.tgz"; - sha1 = "1d5296f9165e8e2c85d24eee0b7caf9ec8ca1f82"; + name = "style_loader___style_loader_0.23.1.tgz"; + url = "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz"; + sha1 = "cb9154606f3e771ab6c4ab637026a1049174d925"; }; } { @@ -10546,19 +11114,27 @@ }; } { - name = "svg_parser___svg_parser_2.0.2.tgz"; + name = "supports_color___supports_color_7.1.0.tgz"; path = fetchurl { - name = "svg_parser___svg_parser_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.2.tgz"; - sha1 = "d134cc396fa2681dc64f518330784e98bd801ec8"; + name = "supports_color___supports_color_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz"; + sha1 = "68e32591df73e25ad1c4b49108a2ec507962bfd1"; }; } { - name = "svgo___svgo_1.3.0.tgz"; + name = "svg_parser___svg_parser_2.0.4.tgz"; path = fetchurl { - name = "svgo___svgo_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/svgo/-/svgo-1.3.0.tgz"; - sha1 = "bae51ba95ded9a33a36b7c46ce9c359ae9154313"; + name = "svg_parser___svg_parser_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz"; + sha1 = "fdc2e29e13951736140b76cb122c8ee6630eb6b5"; + }; + } + { + name = "svgo___svgo_1.3.2.tgz"; + path = fetchurl { + name = "svgo___svgo_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz"; + sha1 = "b6dc511c063346c9e415b81e43401145b96d4167"; }; } { @@ -10586,27 +11162,43 @@ }; } { - name = "tar___tar_4.4.10.tgz"; + name = "tar_fs___tar_fs_2.0.1.tgz"; path = fetchurl { - name = "tar___tar_4.4.10.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-4.4.10.tgz"; - sha1 = "946b2810b9a5e0b26140cf78bea6b0b0d689eba1"; + name = "tar_fs___tar_fs_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.1.tgz"; + sha1 = "e44086c1c60d31a4f0cf893b1c4e155dabfae9e2"; }; } { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.1.tgz"; + name = "tar_stream___tar_stream_2.1.2.tgz"; path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz"; - sha1 = "61b18e40eaee5be97e771cdbb10ed1280888c2b4"; + name = "tar_stream___tar_stream_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.2.tgz"; + sha1 = "6d5ef1a7e5783a95ff70b69b97455a5968dc1325"; }; } { - name = "terser___terser_4.2.1.tgz"; + name = "terser_webpack_plugin___terser_webpack_plugin_2.3.5.tgz"; path = fetchurl { - name = "terser___terser_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-4.2.1.tgz"; - sha1 = "1052cfe17576c66e7bc70fcc7119f22b155bdac1"; + name = "terser_webpack_plugin___terser_webpack_plugin_2.3.5.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz"; + sha1 = "5ad971acce5c517440ba873ea4f09687de2f4a81"; + }; + } + { + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; + path = fetchurl { + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz"; + sha1 = "5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"; + }; + } + { + name = "terser___terser_4.6.13.tgz"; + path = fetchurl { + name = "terser___terser_4.6.13.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.6.13.tgz"; + sha1 = "e879a7364a5e0db52ba4891ecde007422c56a916"; }; } { @@ -10650,11 +11242,11 @@ }; } { - name = "thunky___thunky_1.0.3.tgz"; + name = "thunky___thunky_1.1.0.tgz"; path = fetchurl { - name = "thunky___thunky_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz"; - sha1 = "f5df732453407b09191dae73e2a8cc73f381a826"; + name = "thunky___thunky_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz"; + sha1 = "5abaf714a9405db0504732bbccd2cedd9ef9537d"; }; } { @@ -10674,11 +11266,11 @@ }; } { - name = "tiny_invariant___tiny_invariant_1.0.6.tgz"; + name = "tiny_invariant___tiny_invariant_1.1.0.tgz"; path = fetchurl { - name = "tiny_invariant___tiny_invariant_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.0.6.tgz"; - sha1 = "b3f9b38835e36a41c843a3b0907a5a7b3755de73"; + name = "tiny_invariant___tiny_invariant_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz"; + sha1 = "634c5f8efdc27714b7f386c35e6760991d230875"; }; } { @@ -10738,6 +11330,14 @@ }; } { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; + }; + } + { name = "to_regex___to_regex_3.0.2.tgz"; path = fetchurl { name = "to_regex___to_regex_3.0.2.tgz"; @@ -10762,14 +11362,6 @@ }; } { - name = "tough_cookie___tough_cookie_2.4.3.tgz"; - path = fetchurl { - name = "tough_cookie___tough_cookie_2.4.3.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz"; - sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781"; - }; - } - { name = "tr46___tr46_1.0.1.tgz"; path = fetchurl { name = "tr46___tr46_1.0.1.tgz"; @@ -10778,27 +11370,19 @@ }; } { - name = "tree_kill___tree_kill_1.2.1.tgz"; + name = "tree_kill___tree_kill_1.2.2.tgz"; path = fetchurl { - name = "tree_kill___tree_kill_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz"; - sha1 = "5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a"; + name = "tree_kill___tree_kill_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz"; + sha1 = "4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"; }; } { - name = "trim_right___trim_right_1.0.1.tgz"; + name = "trim_trailing_lines___trim_trailing_lines_1.1.3.tgz"; path = fetchurl { - name = "trim_right___trim_right_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz"; - sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; - }; - } - { - name = "trim_trailing_lines___trim_trailing_lines_1.1.2.tgz"; - path = fetchurl { - name = "trim_trailing_lines___trim_trailing_lines_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.2.tgz"; - sha1 = "d2f1e153161152e9f02fabc670fb40bec2ea2e3a"; + name = "trim_trailing_lines___trim_trailing_lines_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz"; + sha1 = "7f0739881ff76657b7776e10874128004b625a94"; }; } { @@ -10810,35 +11394,35 @@ }; } { - name = "trough___trough_1.0.4.tgz"; + name = "trough___trough_1.0.5.tgz"; path = fetchurl { - name = "trough___trough_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/trough/-/trough-1.0.4.tgz"; - sha1 = "3b52b1f13924f460c3fbfd0df69b587dbcbc762e"; + name = "trough___trough_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz"; + sha1 = "b8b639cefad7d0bb2abd37d433ff8293efa5f406"; }; } { - name = "ts_pnp___ts_pnp_1.1.2.tgz"; + name = "ts_pnp___ts_pnp_1.1.6.tgz"; path = fetchurl { - name = "ts_pnp___ts_pnp_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.2.tgz"; - sha1 = "be8e4bfce5d00f0f58e0666a82260c34a57af552"; + name = "ts_pnp___ts_pnp_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.6.tgz"; + sha1 = "389a24396d425a0d3162e96d2b4638900fdc289a"; }; } { - name = "ts_pnp___ts_pnp_1.1.4.tgz"; + name = "ts_pnp___ts_pnp_1.2.0.tgz"; path = fetchurl { - name = "ts_pnp___ts_pnp_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.4.tgz"; - sha1 = "ae27126960ebaefb874c6d7fa4729729ab200d90"; + name = "ts_pnp___ts_pnp_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz"; + sha1 = "a500ad084b0798f1c3071af391e65912c86bca92"; }; } { - name = "tslib___tslib_1.10.0.tgz"; + name = "tslib___tslib_1.11.2.tgz"; path = fetchurl { - name = "tslib___tslib_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz"; - sha1 = "c3c19f95973fb0a62973fb09d90d961ee43e5c8a"; + name = "tslib___tslib_1.11.2.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.2.tgz"; + sha1 = "9c79d83272c9a7aaf166f73915c9667ecdde3cc9"; }; } { @@ -10850,11 +11434,11 @@ }; } { - name = "tslint___tslint_5.20.0.tgz"; + name = "tslint___tslint_6.1.2.tgz"; path = fetchurl { - name = "tslint___tslint_5.20.0.tgz"; - url = "https://registry.yarnpkg.com/tslint/-/tslint-5.20.0.tgz"; - sha1 = "fac93bfa79568a5a24e7be9cdde5e02b02d00ec1"; + name = "tslint___tslint_6.1.2.tgz"; + url = "https://registry.yarnpkg.com/tslint/-/tslint-6.1.2.tgz"; + sha1 = "2433c248512cc5a7b2ab88ad44a6b1b34c6911cf"; }; } { @@ -10906,11 +11490,19 @@ }; } { - name = "type_fest___type_fest_0.3.1.tgz"; + name = "type_fest___type_fest_0.11.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz"; + sha1 = "97abf0872310fed88a5c466b25681576145e33f1"; + }; + } + { + name = "type_fest___type_fest_0.8.1.tgz"; path = fetchurl { - name = "type_fest___type_fest_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz"; - sha1 = "63d00d204e059474fe5e1b7c011112bbd1dc29e1"; + name = "type_fest___type_fest_0.8.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; + sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; }; } { @@ -10922,67 +11514,67 @@ }; } { - name = "type___type_1.0.3.tgz"; + name = "type___type_1.2.0.tgz"; path = fetchurl { - name = "type___type_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/type/-/type-1.0.3.tgz"; - sha1 = "16f5d39f27a2d28d86e48f8981859e9d3296c179"; + name = "type___type_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz"; + sha1 = "848dd7698dafa3e54a6c479e759c4bc3f18847a0"; }; } { - name = "typedarray___typedarray_0.0.6.tgz"; + name = "type___type_2.0.0.tgz"; path = fetchurl { - name = "typedarray___typedarray_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + name = "type___type_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz"; + sha1 = "5f16ff6ef2eb44f260494dae271033b29c09a9c3"; }; } { - name = "typeface_roboto___typeface_roboto_0.0.54.tgz"; + name = "typedarray___typedarray_0.0.6.tgz"; path = fetchurl { - name = "typeface_roboto___typeface_roboto_0.0.54.tgz"; - url = "https://registry.yarnpkg.com/typeface-roboto/-/typeface-roboto-0.0.54.tgz"; - sha1 = "8f02c9a18d1cfa7f49381a6ff0d21ff061f38ad2"; + name = "typedarray___typedarray_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; } { - name = "typescript___typescript_3.6.2.tgz"; + name = "typeface_roboto___typeface_roboto_0.0.75.tgz"; path = fetchurl { - name = "typescript___typescript_3.6.2.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.6.2.tgz"; - sha1 = "105b0f1934119dde543ac8eb71af3a91009efe54"; + name = "typeface_roboto___typeface_roboto_0.0.75.tgz"; + url = "https://registry.yarnpkg.com/typeface-roboto/-/typeface-roboto-0.0.75.tgz"; + sha1 = "98d5ba35ec234bbc7172374c8297277099cc712b"; }; } { - name = "ua_parser_js___ua_parser_js_0.7.20.tgz"; + name = "typescript___typescript_3.8.3.tgz"; path = fetchurl { - name = "ua_parser_js___ua_parser_js_0.7.20.tgz"; - url = "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.20.tgz"; - sha1 = "7527178b82f6a62a0f243d1f94fd30e3e3c21098"; + name = "typescript___typescript_3.8.3.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz"; + sha1 = "409eb8544ea0335711205869ec458ab109ee1061"; }; } { - name = "uglify_js___uglify_js_3.4.10.tgz"; + name = "ua_parser_js___ua_parser_js_0.7.21.tgz"; path = fetchurl { - name = "uglify_js___uglify_js_3.4.10.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz"; - sha1 = "9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"; + name = "ua_parser_js___ua_parser_js_0.7.21.tgz"; + url = "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz"; + sha1 = "853cf9ce93f642f67174273cc34565ae6f308777"; }; } { - name = "uglify_js___uglify_js_3.6.0.tgz"; + name = "unbzip2_stream___unbzip2_stream_1.4.2.tgz"; path = fetchurl { - name = "uglify_js___uglify_js_3.6.0.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz"; - sha1 = "704681345c53a8b2079fb6cec294b05ead242ff5"; + name = "unbzip2_stream___unbzip2_stream_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.2.tgz"; + sha1 = "84eb9e783b186d8fb397515fbb656f312f1a7dbf"; }; } { - name = "unherit___unherit_1.1.2.tgz"; + name = "unherit___unherit_1.1.3.tgz"; path = fetchurl { - name = "unherit___unherit_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/unherit/-/unherit-1.1.2.tgz"; - sha1 = "14f1f397253ee4ec95cec167762e77df83678449"; + name = "unherit___unherit_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz"; + sha1 = "6c9b503f2b41b262330c80e91c8614abdaa69c22"; }; } { @@ -11002,19 +11594,19 @@ }; } { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; path = fetchurl { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz"; - sha1 = "5b4b426e08d13a80365e0d657ac7a6c1ec46a277"; + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; + sha1 = "0d91f600eeeb3096aa962b1d6fc88876e64ea531"; }; } { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; path = fetchurl { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz"; - sha1 = "a9cc6cc7ce63a0a3023fc99e341b94431d405a57"; + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; + sha1 = "dd57a99f6207bedff4628abefb94c50db941c8f4"; }; } { @@ -11074,11 +11666,11 @@ }; } { - name = "unist_util_remove_position___unist_util_remove_position_1.1.3.tgz"; + name = "unist_util_remove_position___unist_util_remove_position_1.1.4.tgz"; path = fetchurl { - name = "unist_util_remove_position___unist_util_remove_position_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.3.tgz"; - sha1 = "d91aa8b89b30cb38bad2924da11072faa64fd972"; + name = "unist_util_remove_position___unist_util_remove_position_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz"; + sha1 = "ec037348b6102c897703eee6d0294ca4755a2020"; }; } { @@ -11154,14 +11746,6 @@ }; } { - name = "upper_case___upper_case_1.1.3.tgz"; - path = fetchurl { - name = "upper_case___upper_case_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz"; - sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598"; - }; - } - { name = "uri_js___uri_js_4.2.2.tgz"; path = fetchurl { name = "uri_js___uri_js_4.2.2.tgz"; @@ -11178,11 +11762,11 @@ }; } { - name = "url_loader___url_loader_2.1.0.tgz"; + name = "url_loader___url_loader_2.3.0.tgz"; path = fetchurl { - name = "url_loader___url_loader_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/url-loader/-/url-loader-2.1.0.tgz"; - sha1 = "bcc1ecabbd197e913eca23f5e0378e24b4412961"; + name = "url_loader___url_loader_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/url-loader/-/url-loader-2.3.0.tgz"; + sha1 = "e0e2ef658f003efb8ca41b0f3ffbf76bab88658b"; }; } { @@ -11226,6 +11810,14 @@ }; } { + name = "util.promisify___util.promisify_1.0.1.tgz"; + path = fetchurl { + name = "util.promisify___util.promisify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz"; + sha1 = "6baf7774b80eeb0f7520d8b81d07982a59abbaee"; + }; + } + { name = "util___util_0.10.3.tgz"; path = fetchurl { name = "util___util_0.10.3.tgz"; @@ -11258,11 +11850,11 @@ }; } { - name = "uuid___uuid_3.3.3.tgz"; + name = "uuid___uuid_3.4.0.tgz"; path = fetchurl { - name = "uuid___uuid_3.3.3.tgz"; - url = "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz"; - sha1 = "4568f0216e78760ee1dbf3a4d2cf53e224112866"; + name = "uuid___uuid_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; + sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; }; } { @@ -11282,11 +11874,11 @@ }; } { - name = "value_equal___value_equal_0.4.0.tgz"; + name = "value_equal___value_equal_1.0.1.tgz"; path = fetchurl { - name = "value_equal___value_equal_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz"; - sha1 = "c5bdd2f54ee093c04839d71ce2e4758a6890abc7"; + name = "value_equal___value_equal_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz"; + sha1 = "1e0b794c734c5c0cade179c437d356d931a34d6c"; }; } { @@ -11298,11 +11890,11 @@ }; } { - name = "vendors___vendors_1.0.3.tgz"; + name = "vendors___vendors_1.0.4.tgz"; path = fetchurl { - name = "vendors___vendors_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/vendors/-/vendors-1.0.3.tgz"; - sha1 = "a6467781abd366217c050f8202e7e50cc9eef8c0"; + name = "vendors___vendors_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz"; + sha1 = "e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"; }; } { @@ -11314,11 +11906,11 @@ }; } { - name = "vfile_location___vfile_location_2.0.5.tgz"; + name = "vfile_location___vfile_location_2.0.6.tgz"; path = fetchurl { - name = "vfile_location___vfile_location_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.5.tgz"; - sha1 = "c83eb02f8040228a8d2b3f10e485be3e3433e0a2"; + name = "vfile_location___vfile_location_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.6.tgz"; + sha1 = "8a274f39411b8719ea5728802e10d9e0dff1519e"; }; } { @@ -11338,19 +11930,19 @@ }; } { - name = "vm_browserify___vm_browserify_1.1.0.tgz"; + name = "vm_browserify___vm_browserify_1.1.2.tgz"; path = fetchurl { - name = "vm_browserify___vm_browserify_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz"; - sha1 = "bd76d6a23323e2ca8ffa12028dc04559c75f9019"; + name = "vm_browserify___vm_browserify_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz"; + sha1 = "78641c488b8e6ca91a75f511e7a3b32a86e5dda0"; }; } { - name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz"; + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; path = fetchurl { - name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz"; - sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045"; + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"; + sha1 = "0a89cdf5cc15822df9c360543676963e0cc308cd"; }; } { @@ -11362,11 +11954,11 @@ }; } { - name = "wait_on___wait_on_3.3.0.tgz"; + name = "wait_on___wait_on_5.0.0.tgz"; path = fetchurl { - name = "wait_on___wait_on_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/wait-on/-/wait-on-3.3.0.tgz"; - sha1 = "9940981d047a72a9544a97b8b5fca45b2170a082"; + name = "wait_on___wait_on_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/wait-on/-/wait-on-5.0.0.tgz"; + sha1 = "72e554b338490bbc7131362755ca1af04f46d029"; }; } { @@ -11378,19 +11970,11 @@ }; } { - name = "warning___warning_4.0.3.tgz"; + name = "watchpack___watchpack_1.6.1.tgz"; path = fetchurl { - name = "warning___warning_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz"; - sha1 = "16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"; - }; - } - { - name = "watchpack___watchpack_1.6.0.tgz"; - path = fetchurl { - name = "watchpack___watchpack_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz"; - sha1 = "4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"; + name = "watchpack___watchpack_1.6.1.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz"; + sha1 = "280da0a8718592174010c078c7585a74cd8cd0e2"; }; } { @@ -11410,19 +11994,19 @@ }; } { - name = "webpack_dev_middleware___webpack_dev_middleware_3.7.1.tgz"; + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz"; path = fetchurl { - name = "webpack_dev_middleware___webpack_dev_middleware_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.1.tgz"; - sha1 = "1167aea02afa034489869b8368fe9fed1aea7d09"; + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz"; + sha1 = "0019c3db716e3fa5cecbf64f2ab88a74bab331f3"; }; } { - name = "webpack_dev_server___webpack_dev_server_3.2.1.tgz"; + name = "webpack_dev_server___webpack_dev_server_3.10.3.tgz"; path = fetchurl { - name = "webpack_dev_server___webpack_dev_server_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz"; - sha1 = "1b45ce3ecfc55b6ebe5e36dab2777c02bc508c4e"; + name = "webpack_dev_server___webpack_dev_server_3.10.3.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz"; + sha1 = "f35945036813e57ef582c2420ef7b470e14d3af0"; }; } { @@ -11434,11 +12018,11 @@ }; } { - name = "webpack_manifest_plugin___webpack_manifest_plugin_2.0.4.tgz"; + name = "webpack_manifest_plugin___webpack_manifest_plugin_2.2.0.tgz"; path = fetchurl { - name = "webpack_manifest_plugin___webpack_manifest_plugin_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-2.0.4.tgz"; - sha1 = "e4ca2999b09557716b8ba4475fb79fab5986f0cd"; + name = "webpack_manifest_plugin___webpack_manifest_plugin_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-2.2.0.tgz"; + sha1 = "19ca69b435b0baec7e29fbe90fb4015de2de4f16"; }; } { @@ -11450,11 +12034,11 @@ }; } { - name = "webpack___webpack_4.39.1.tgz"; + name = "webpack___webpack_4.42.0.tgz"; path = fetchurl { - name = "webpack___webpack_4.39.1.tgz"; - url = "https://registry.yarnpkg.com/webpack/-/webpack-4.39.1.tgz"; - sha1 = "60ed9fb2b72cd60f26ea526c404d2a4cc97a1bd8"; + name = "webpack___webpack_4.42.0.tgz"; + url = "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz"; + sha1 = "b901635dd6179391d90740a63c93f76f39883eb8"; }; } { @@ -11506,11 +12090,11 @@ }; } { - name = "whatwg_url___whatwg_url_7.0.0.tgz"; + name = "whatwg_url___whatwg_url_7.1.0.tgz"; path = fetchurl { - name = "whatwg_url___whatwg_url_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz"; - sha1 = "fde926fa54a599f3adf82dff25a9f7be02dc6edd"; + name = "whatwg_url___whatwg_url_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz"; + sha1 = "c2c492f1eca612988efd3d2266be1b9fc6170d06"; }; } { @@ -11530,27 +12114,19 @@ }; } { - name = "wide_align___wide_align_1.1.3.tgz"; - path = fetchurl { - name = "wide_align___wide_align_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; - sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; - }; - } - { - name = "wordwrap___wordwrap_0.0.3.tgz"; + name = "which___which_2.0.2.tgz"; path = fetchurl { - name = "wordwrap___wordwrap_0.0.3.tgz"; - url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; }; } { - name = "wordwrap___wordwrap_1.0.0.tgz"; + name = "word_wrap___word_wrap_1.2.3.tgz"; path = fetchurl { - name = "wordwrap___wordwrap_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz"; - sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; }; } { @@ -11754,6 +12330,14 @@ }; } { + name = "ws___ws_7.2.5.tgz"; + path = fetchurl { + name = "ws___ws_7.2.5.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz"; + sha1 = "abb1370d4626a5a9cd79d8de404aa18b3465d10d"; + }; + } + { name = "x_is_string___x_is_string_0.1.0.tgz"; path = fetchurl { name = "x_is_string___x_is_string_0.1.0.tgz"; @@ -11770,19 +12354,19 @@ }; } { - name = "xmlchars___xmlchars_2.1.1.tgz"; + name = "xmlchars___xmlchars_2.2.0.tgz"; path = fetchurl { - name = "xmlchars___xmlchars_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.1.1.tgz"; - sha1 = "ef1a81c05bff629c2280007f12daca21bd6f6c93"; + name = "xmlchars___xmlchars_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz"; + sha1 = "060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"; }; } { - name = "xregexp___xregexp_4.0.0.tgz"; + name = "xregexp___xregexp_4.3.0.tgz"; path = fetchurl { - name = "xregexp___xregexp_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz"; - sha1 = "e698189de49dd2a18cc5687b05e17c8e43943020"; + name = "xregexp___xregexp_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz"; + sha1 = "7e92e73d9174a99a59743f67a4ce879a04b5ae50"; }; } { @@ -11802,51 +12386,67 @@ }; } { - name = "yallist___yallist_3.0.3.tgz"; + name = "yallist___yallist_3.1.1.tgz"; + path = fetchurl { + name = "yallist___yallist_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz"; + sha1 = "dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"; + }; + } + { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + }; + } + { + name = "yaml___yaml_1.9.2.tgz"; path = fetchurl { - name = "yallist___yallist_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz"; - sha1 = "b4b049e314be545e3ce802236d6cd22cd91c3de9"; + name = "yaml___yaml_1.9.2.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.9.2.tgz"; + sha1 = "f0cfa865f003ab707663e4f04b3956957ea564ed"; }; } { - name = "yargs_parser___yargs_parser_10.1.0.tgz"; + name = "yargs_parser___yargs_parser_11.1.1.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_10.1.0.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz"; - sha1 = "7202265b89f7e9e9f2e5765e0fe735a905edbaa8"; + name = "yargs_parser___yargs_parser_11.1.1.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz"; + sha1 = "879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"; }; } { - name = "yargs_parser___yargs_parser_13.1.1.tgz"; + name = "yargs_parser___yargs_parser_13.1.2.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_13.1.1.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz"; - sha1 = "d26058532aa06d365fe091f6a1fc06b2f7e5eca0"; + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; }; } { - name = "yargs___yargs_12.0.2.tgz"; + name = "yargs___yargs_12.0.5.tgz"; path = fetchurl { - name = "yargs___yargs_12.0.2.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz"; - sha1 = "fe58234369392af33ecbef53819171eff0f5aadc"; + name = "yargs___yargs_12.0.5.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz"; + sha1 = "05f5997b609647b64f66b81e3b4b10a368e7ad13"; }; } { - name = "yargs___yargs_13.3.0.tgz"; + name = "yargs___yargs_13.3.2.tgz"; path = fetchurl { - name = "yargs___yargs_13.3.0.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz"; - sha1 = "4c657a55e07e5f2cf947f8a366567c04a0dedc83"; + name = "yargs___yargs_13.3.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz"; + sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"; }; } { - name = "yauzl___yauzl_2.4.1.tgz"; + name = "yauzl___yauzl_2.10.0.tgz"; path = fetchurl { - name = "yauzl___yauzl_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz"; - sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; + name = "yauzl___yauzl_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; + sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; }; } ]; diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index a9cf6c1da4770..e7d0e6f7c65ac 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Share your terminal as a web application"; - homepage = https://github.com/yudai/gotty; + homepage = "https://github.com/yudai/gotty"; maintainers = with maintainers; [ ]; license = licenses.mit; }; diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index 3cd36858204ea..1a5032772aba6 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.nico.schottelius.org/software/gpm/; + homepage = "https://www.nico.schottelius.org/software/gpm/"; description = "A daemon that provides mouse support on the Linux console"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.cygwin; diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index e5dcb3e28e450..4d66e666ed58e 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { diagnostic monitoring and profiling of receivers and feeding location-aware applications GPS/AIS logs for diagnostic purposes. ''; - homepage = http://catb.org/gpsd/; + homepage = "http://catb.org/gpsd/"; license = "BSD-style"; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor rasendubi ]; diff --git a/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch b/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch index 654d96ae4e1a9..ed315c854c824 100644 --- a/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch +++ b/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch @@ -1,7 +1,7 @@ From 931958d8f11cb55f2e88a178a3b828f3c537eba8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> Date: Fri, 6 Mar 2020 23:43:58 +0100 -Subject: [PATCH] Define configs with env vars +Subject: [PATCH 1/2] Define configs with env vars --- app.php | 4 ++-- diff --git a/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch b/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch new file mode 100644 index 0000000000000..e7f84a146fbf2 --- /dev/null +++ b/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch @@ -0,0 +1,24 @@ +From 1556489f0b475ae56e5ed3afba19cc2abb696a76 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Thu, 16 Apr 2020 19:37:32 +0200 +Subject: [PATCH 2/2] Remove check for config-file as it's stored in /etc/grocy + +--- + helpers/PrerequisiteChecker.php | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/helpers/PrerequisiteChecker.php b/helpers/PrerequisiteChecker.php +index d4bf74c6..ca7686c9 100644 +--- a/helpers/PrerequisiteChecker.php ++++ b/helpers/PrerequisiteChecker.php +@@ -8,7 +8,6 @@ class PrerequisiteChecker + { + public function checkRequirements() + { +- self::checkForConfigFile(); + self::checkForConfigDistFile(); + self::checkForComposer(); + self::checkForYarn(); +-- +2.25.0 + diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix index 2694765a948bb..193f3929809a4 100644 --- a/pkgs/servers/grocy/default.nix +++ b/pkgs/servers/grocy/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, unzip, nixosTests }: stdenv.mkDerivation rec { pname = "grocy"; - version = "2.6.2"; + version = "2.7.1"; src = fetchurl { url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip"; - sha256 = "1cjkyv50vwx24xb1mxgy51mr4qqsqgixjww06rql77d9czmmd94k"; + sha256 = "0ab1yxj499vadakq2c1lils3ir6fm02wrdgrirrlar4s4z6c4p7r"; }; nativeBuildInputs = [ unzip ]; @@ -14,11 +14,16 @@ stdenv.mkDerivation rec { unzip ${src} -d . ''; - patches = [ ./0001-Define-configs-with-env-vars.patch ]; + patches = [ + ./0001-Define-configs-with-env-vars.patch + ./0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch + ]; patchFlags = [ "--binary" "-p1" ]; dontBuild = true; + passthru.tests = { inherit (nixosTests) grocy; }; + installPhase = '' mkdir -p $out/ cp -R . $out/ diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index ff127e705e50b..b7f56cfe446ce 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The Java SQL database"; - homepage = http://www.h2database.com/html/main.html; + homepage = "http://www.h2database.com/html/main.html"; license = licenses.mpl20; platforms = stdenv.lib.platforms.linux; maintainers = with maintainers; [ mahe ]; diff --git a/pkgs/servers/hashi-ui/default.nix b/pkgs/servers/hashi-ui/default.nix new file mode 100644 index 0000000000000..019a8dca3b656 --- /dev/null +++ b/pkgs/servers/hashi-ui/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "hashi-ui"; + version = "1.3.8"; + + src = fetchurl { + url = "https://github.com/jippi/hashi-ui/releases/download/v${version}/hashi-ui-linux-amd64"; + sha256 = "999a34b6e99657ffc7e6c98a15b8ea744c28420e891a8802c7d99b737752dfb6"; + }; + + dontUnpack = true; + sourceRoot = "."; + + installPhase = '' + install -m755 -D $src $out/bin/hashi-ui + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/jippi/hashi-ui"; + description = "A modern user interface for hashicorp Consul & Nomad"; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ numkem ]; + }; +} diff --git a/pkgs/servers/hasura/ci-info.nix b/pkgs/servers/hasura/ci-info.nix new file mode 100644 index 0000000000000..53c85a2e5ba19 --- /dev/null +++ b/pkgs/servers/hasura/ci-info.nix @@ -0,0 +1,22 @@ +{ mkDerivation, aeson, aeson-casing, base, fetchgit, hashable +, hpack, stdenv, template-haskell, text, th-lift-instances +, unordered-containers +}: +mkDerivation { + pname = "ci-info"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/hasura/ci-info-hs.git"; + sha256 = "0rn1799z4y7z1c6ijrr0gscarg25zmnfq0z9rrmk4ad727vf1ppc"; + rev = "6af5a68450347a02295a9cd050d05a8b2f5c06ab"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + aeson aeson-casing base hashable template-haskell text + th-lift-instances unordered-containers + ]; + libraryToolDepends = [ hpack ]; + prePatch = "hpack"; + homepage = "https://github.com/hasura/ci-info-hs#readme"; + license = stdenv.lib.licenses.mit; +} diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix new file mode 100644 index 0000000000000..a4d8d147fda63 --- /dev/null +++ b/pkgs/servers/hasura/cli.nix @@ -0,0 +1,33 @@ +{ buildGoModule, hasura-graphql-engine }: + +buildGoModule rec { + name = "hasura-${version}"; + version = hasura-graphql-engine.version; + + src = hasura-graphql-engine.src; + modRoot = "./cli"; + + goPackagePath = "github.com/hasura/graphql-engine/cli"; + subPackages = [ "cmd/hasura" ]; + + vendorSha256 = "0a3mlkl00r680v8x3hy24ykggq5qm7k3101krlyfrb5y4karp75a"; + + buildFlagsArray = [''-ldflags= + -X github.com/hasura/graphql-engine/cli/version.BuildVersion=${version} + -s + -w + '']; + + postInstall = '' + mkdir -p $out/share/{bash-completion/completions,zsh/site-functions} + + export HOME=$PWD + $out/bin/hasura completion bash > $out/share/bash-completion/completions/hasura + $out/bin/hasura completion zsh > $out/share/zsh/site-functions/_hasura + ''; + + meta = { + inherit (hasura-graphql-engine.meta) license homepage maintainers; + description = "Hasura GraphQL Engine CLI"; + }; +} \ No newline at end of file diff --git a/pkgs/servers/hasura/default.nix b/pkgs/servers/hasura/default.nix new file mode 100644 index 0000000000000..0852746603514 --- /dev/null +++ b/pkgs/servers/hasura/default.nix @@ -0,0 +1,63 @@ +{ haskell }: + +with haskell.lib; + +let + # version in cabal file is invalid + version = "1.2.1"; + + pkgs = haskell.packages.ghc865.override { + overrides = self: super: { + # cabal2nix --subpath server --maintainer offline --no-check --revision 1.2.1 https://github.com/hasura/graphql-engine.git + hasura-graphql-engine = justStaticExecutables + ((self.callPackage ./graphql-engine.nix { }).overrideDerivation (d: { + name = "graphql-engine-${version}"; + + inherit version; + + # hasura needs VERSION env exported during build + preBuild = "export VERSION=${version}"; + })); + + hasura-cli = self.callPackage ./cli.nix { + hasura-graphql-engine = self.hasura-graphql-engine // { + inherit version; + }; + }; + + # internal dependencies, non published on hackage (find revisions in cabal.project file) + # cabal2nix --revision <rev> https://github.com/hasura/ci-info-hs.git + ci-info = self.callPackage ./ci-info.nix { }; + # cabal2nix --revision <rev> https://github.com/hasura/graphql-parser-hs.git + graphql-parser = self.callPackage ./graphql-parser.nix { }; + # cabal2nix --revision <rev> https://github.com/hasura/pg-client-hs.git + pg-client = self.callPackage ./pg-client.nix { }; + + # version constrained dependencies, without these hasura will not build, + # find versions in graphql-engine.cabal + # cabal2nix cabal://dependent-map-0.2.4.0 + dependent-map = self.callPackage ./dependent-map.nix { }; + # cabal2nix cabal://dependent-sum-0.4 + dependent-sum = self.callPackage ./dependent-sum.nix { }; + # cabal2nix cabal://these-0.7.6 + these = doJailbreak (self.callPackage ./these.nix { }); + # cabal2nix cabal://immortal-0.2.2.1 + immortal = self.callPackage ./immortal.nix { }; + # cabal2nix cabal://network-uri-2.6.1.0 + network-uri = self.callPackage ./network-uri.nix { }; + # cabal2nix cabal://ghc-heap-view-0.6.0 + ghc-heap-view = disableLibraryProfiling (self.callPackage ./ghc-heap-view.nix { }); + + # unmark broewn packages and do required modifications + stm-hamt = doJailbreak (unmarkBroken super.stm-hamt); + superbuffer = dontCheck (doJailbreak (unmarkBroken super.superbuffer)); + Spock-core = dontCheck (unmarkBroken super.Spock-core); + stm-containers = dontCheck (unmarkBroken super.stm-containers); + ekg-json = unmarkBroken super.ekg-json; + list-t = dontCheck (unmarkBroken super.list-t); + primitive-extras = unmarkBroken super.primitive-extras; + }; + }; +in { + inherit (pkgs) hasura-graphql-engine hasura-cli; +} diff --git a/pkgs/servers/hasura/dependent-map.nix b/pkgs/servers/hasura/dependent-map.nix new file mode 100644 index 0000000000000..68ebb616b5f6f --- /dev/null +++ b/pkgs/servers/hasura/dependent-map.nix @@ -0,0 +1,13 @@ +{ mkDerivation, base, containers, dependent-sum, stdenv }: +mkDerivation { + pname = "dependent-map"; + version = "0.2.4.0"; + sha256 = "5db396bdb5d156434af920c074316c3b84b4d39ba8e1cd349c7bb6679cb28246"; + revision = "1"; + editedCabalFile = "0a5f35d1sgfq1cl1r5bgb5pwfjniiycxiif4ycxglaizp8g5rlr1"; + libraryHaskellDepends = [ base containers dependent-sum ]; + homepage = "https://github.com/mokus0/dependent-map"; + description = "Dependent finite maps (partial dependent products)"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; +} diff --git a/pkgs/servers/hasura/dependent-sum.nix b/pkgs/servers/hasura/dependent-sum.nix new file mode 100644 index 0000000000000..90717b8736604 --- /dev/null +++ b/pkgs/servers/hasura/dependent-sum.nix @@ -0,0 +1,10 @@ +{ mkDerivation, base, stdenv }: +mkDerivation { + pname = "dependent-sum"; + version = "0.4"; + sha256 = "a8deecb4153a1878173f8d0a18de0378ab068bc15e5035b9e4cb478e8e4e1a1e"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mokus0/dependent-sum"; + description = "Dependent sum type"; + license = stdenv.lib.licenses.publicDomain; +} diff --git a/pkgs/servers/hasura/ghc-heap-view.nix b/pkgs/servers/hasura/ghc-heap-view.nix new file mode 100644 index 0000000000000..54c873baee4bd --- /dev/null +++ b/pkgs/servers/hasura/ghc-heap-view.nix @@ -0,0 +1,18 @@ +{ mkDerivation, base, binary, bytestring, Cabal, containers +, deepseq, filepath, ghc-heap, stdenv, template-haskell +, transformers +}: +mkDerivation { + pname = "ghc-heap-view"; + version = "0.6.0"; + sha256 = "99ed6034d02a7a942e1b6ed970e9f7028dcdfd5b5d29fd8a0fb89f1a5e7c5ec8"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal filepath ]; + libraryHaskellDepends = [ + base binary bytestring containers ghc-heap template-haskell + transformers + ]; + testHaskellDepends = [ base deepseq ]; + description = "Extract the heap representation of Haskell values and thunks"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/servers/hasura/graphql-engine.nix b/pkgs/servers/hasura/graphql-engine.nix new file mode 100644 index 0000000000000..05ba895be080a --- /dev/null +++ b/pkgs/servers/hasura/graphql-engine.nix @@ -0,0 +1,71 @@ +{ mkDerivation, aeson, aeson-casing, ansi-wl-pprint, asn1-encoding +, asn1-types, async, attoparsec, attoparsec-iso8601, auto-update +, base, base64-bytestring, byteorder, bytestring, case-insensitive +, ci-info, containers, criterion, cryptonite, data-has, deepseq +, dependent-map, dependent-sum, directory, ekg-core, ekg-json +, fast-logger, fetchgit, file-embed, filepath, generic-arbitrary +, ghc-heap-view, graphql-parser, hashable, hspec, hspec-core +, hspec-expectations-lifted, http-client, http-client-tls +, http-types, immortal, insert-ordered-containers, jose, lens +, lifted-async, lifted-base, list-t, mime-types, monad-control +, monad-time, monad-validate, mtl, mustache, mwc-probability +, mwc-random, natural-transformation, network, network-uri +, optparse-applicative, pem, pg-client, postgresql-binary +, postgresql-libpq, process, profunctors, psqueues, QuickCheck +, regex-tdfa, safe, scientific, semver, shakespeare, split +, Spock-core, stdenv, stm, stm-containers, template-haskell, text +, text-builder, text-conversions, th-lift-instances, these, time +, transformers, transformers-base, unix, unordered-containers +, uri-encode, uuid, vector, wai, wai-websockets, warp, websockets +, wreq, x509, yaml, zlib +}: +mkDerivation { + pname = "graphql-engine"; + version = "1.0.0"; + src = fetchgit { + url = "https://github.com/hasura/graphql-engine.git"; + sha256 = "0hg44zl3gqa8lq7kggwgmgbsgdc7zrv5cxs507vilg11xklsbz4l"; + rev = "27b0b59361cebecd074bd59123f602e7b013bac1"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing ansi-wl-pprint asn1-encoding asn1-types async + attoparsec attoparsec-iso8601 auto-update base base64-bytestring + byteorder bytestring case-insensitive ci-info containers cryptonite + data-has deepseq dependent-map dependent-sum directory ekg-core + ekg-json fast-logger file-embed filepath generic-arbitrary + ghc-heap-view graphql-parser hashable http-client http-client-tls + http-types immortal insert-ordered-containers jose lens + lifted-async lifted-base list-t mime-types monad-control monad-time + monad-validate mtl mustache network network-uri + optparse-applicative pem pg-client postgresql-binary + postgresql-libpq process profunctors psqueues QuickCheck regex-tdfa + scientific semver shakespeare split Spock-core stm stm-containers + template-haskell text text-builder text-conversions + th-lift-instances these time transformers transformers-base unix + unordered-containers uri-encode uuid vector wai wai-websockets warp + websockets wreq x509 yaml zlib + ]; + executableHaskellDepends = [ + base bytestring pg-client text text-conversions + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-core hspec-expectations-lifted + http-client http-client-tls lifted-base monad-control mtl + natural-transformation optparse-applicative pg-client process + QuickCheck safe split text time transformers-base + unordered-containers + ]; + benchmarkHaskellDepends = [ + async base bytestring criterion deepseq mwc-probability mwc-random + split text vector + ]; + doCheck = false; + homepage = "https://www.hasura.io"; + description = "GraphQL API over Postgres"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ offline ]; +} diff --git a/pkgs/servers/hasura/graphql-parser.nix b/pkgs/servers/hasura/graphql-parser.nix new file mode 100644 index 0000000000000..8066bb83dd0ac --- /dev/null +++ b/pkgs/servers/hasura/graphql-parser.nix @@ -0,0 +1,35 @@ +{ mkDerivation, aeson, attoparsec, base, bytestring, containers +, criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter +, protolude, regex-tdfa, scientific, stdenv, template-haskell, text +, text-builder, th-lift-instances, unordered-containers, vector +}: +mkDerivation { + pname = "graphql-parser"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/hasura/graphql-parser-hs.git"; + sha256 = "0vz0sqqmr1l02d3f1pc5k7rm7vpxmg5d5ijvdcwdm34yw6x5lz1v"; + rev = "623ad78aa46e7ba2ef1aa58134ad6136b0a85071"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers filepath hedgehog + prettyprinter protolude regex-tdfa scientific template-haskell text + text-builder th-lift-instances unordered-containers vector + ]; + libraryToolDepends = [ hpack ]; + testHaskellDepends = [ + aeson attoparsec base bytestring containers filepath hedgehog + prettyprinter protolude regex-tdfa scientific template-haskell text + text-builder th-lift-instances unordered-containers vector + ]; + benchmarkHaskellDepends = [ + aeson attoparsec base bytestring containers criterion filepath + hedgehog prettyprinter protolude regex-tdfa scientific + template-haskell text text-builder th-lift-instances + unordered-containers vector + ]; + prePatch = "hpack"; + homepage = "https://github.com/hasura/graphql-parser-hs#readme"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/servers/hasura/immortal.nix b/pkgs/servers/hasura/immortal.nix new file mode 100644 index 0000000000000..c53f0f18709ca --- /dev/null +++ b/pkgs/servers/hasura/immortal.nix @@ -0,0 +1,17 @@ +{ mkDerivation, base, lifted-base, monad-control, stdenv, stm +, tasty, tasty-hunit, transformers, transformers-base +}: +mkDerivation { + pname = "immortal"; + version = "0.2.2.1"; + sha256 = "ed4aa1a2883a693a73fec47c8c2d5332d61a0626a2013403e1a8fb25cc6c8d8e"; + libraryHaskellDepends = [ + base lifted-base monad-control stm transformers-base + ]; + testHaskellDepends = [ + base lifted-base stm tasty tasty-hunit transformers + ]; + homepage = "https://github.com/feuerbach/immortal"; + description = "Spawn threads that never die (unless told to do so)"; + license = stdenv.lib.licenses.mit; +} diff --git a/pkgs/servers/hasura/network-uri.nix b/pkgs/servers/hasura/network-uri.nix new file mode 100644 index 0000000000000..45016d470a8d1 --- /dev/null +++ b/pkgs/servers/hasura/network-uri.nix @@ -0,0 +1,18 @@ +{ mkDerivation, base, deepseq, HUnit, parsec, stdenv +, test-framework, test-framework-hunit, test-framework-quickcheck2 +}: +mkDerivation { + pname = "network-uri"; + version = "2.6.1.0"; + sha256 = "423e0a2351236f3fcfd24e39cdbc38050ec2910f82245e69ca72a661f7fc47f0"; + revision = "1"; + editedCabalFile = "141nj7q0p9wkn5gr41ayc63cgaanr9m59yym47wpxqr3c334bk32"; + libraryHaskellDepends = [ base deepseq parsec ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + homepage = "https://github.com/haskell/network-uri"; + description = "URI manipulation"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/servers/hasura/pg-client.nix b/pkgs/servers/hasura/pg-client.nix new file mode 100644 index 0000000000000..725e5e7f64084 --- /dev/null +++ b/pkgs/servers/hasura/pg-client.nix @@ -0,0 +1,30 @@ +{ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring +, criterion, fetchgit, file-embed, hashable, hashtables, hasql +, hasql-pool, hasql-transaction, monad-control, mtl +, postgresql-binary, postgresql-libpq, resource-pool, retry +, scientific, stdenv, template-haskell, text, text-builder, th-lift +, th-lift-instances, time, transformers-base, uuid, vector +}: +mkDerivation { + pname = "pg-client"; + version = "0.1.0"; + src = fetchgit { + url = "https://github.com/hasura/pg-client-hs.git"; + sha256 = "1941gj5yp24kx0xb1nd774nwp5vnpsp6m83isqkwpyz9spl4sq7l"; + rev = "70a849d09bea9461e72c5a5bbde06df65aab61c0"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + aeson aeson-casing attoparsec base bytestring hashable hashtables + monad-control mtl postgresql-binary postgresql-libpq resource-pool + retry scientific template-haskell text text-builder th-lift + th-lift-instances time transformers-base uuid vector + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ + base bytestring criterion file-embed hashable hasql hasql-pool + hasql-transaction mtl postgresql-libpq text text-builder + ]; + homepage = "https://github.com/hasura/platform"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/servers/hasura/these.nix b/pkgs/servers/hasura/these.nix new file mode 100644 index 0000000000000..396f9e2a28248 --- /dev/null +++ b/pkgs/servers/hasura/these.nix @@ -0,0 +1,25 @@ +{ mkDerivation, aeson, base, base-compat, bifunctors, binary +, containers, data-default-class, deepseq, hashable, keys, lens +, mtl, QuickCheck, quickcheck-instances, semigroupoids, stdenv +, tasty, tasty-quickcheck, transformers, transformers-compat +, unordered-containers, vector, vector-instances +}: +mkDerivation { + pname = "these"; + version = "0.7.6"; + sha256 = "9464b83d98e626360a8ad9836ba77e5201cd1e9c89b95b1b11a28ef3c23ac746"; + libraryHaskellDepends = [ + aeson base base-compat bifunctors binary containers + data-default-class deepseq hashable keys lens mtl QuickCheck + semigroupoids transformers transformers-compat unordered-containers + vector vector-instances + ]; + testHaskellDepends = [ + aeson base base-compat bifunctors binary containers hashable lens + QuickCheck quickcheck-instances tasty tasty-quickcheck transformers + unordered-containers vector + ]; + homepage = "https://github.com/isomorphism/these"; + description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index 3d05933f51306..e964e956c55bf 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "A distributed, scalable, big data store"; - homepage = https://hbase.apache.org; + homepage = "https://hbase.apache.org"; license = licenses.asl20; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix index 442796b806564..c81cd80eb7a61 100644 --- a/pkgs/servers/hitch/default.nix +++ b/pkgs/servers/hitch/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Hitch is a libev-based high performance SSL/TLS proxy by Varnish Software"; - homepage = https://hitch-tls.org/; + homepage = "https://hitch-tls.org/"; license = licenses.bsd2; maintainers = [ maintainers.jflanglois ]; platforms = platforms.linux; diff --git a/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch b/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch new file mode 100644 index 0000000000000..0b9dd3e447d9d --- /dev/null +++ b/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch @@ -0,0 +1,48 @@ +From 9d730514540929dc95a7313bdb385bab95d9a28c Mon Sep 17 00:00:00 2001 +From: Martin Weinelt <hexa@darmstadt.ccc.de> +Date: Wed, 20 May 2020 23:23:23 +0200 +Subject: [PATCH] setup.py: relax dependencies + +--- + setup.py | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/setup.py b/setup.py +index 1473fd1f5f..149af58b3a 100755 +--- a/setup.py ++++ b/setup.py +@@ -32,24 +32,24 @@ PROJECT_URLS = { + PACKAGES = find_packages(exclude=["tests", "tests.*"]) + + REQUIRES = [ +- "aiohttp==3.6.1", ++ "aiohttp>=3.6.1", + "astral==1.10.1", + "async_timeout==3.0.1", + "attrs==19.3.0", + "bcrypt==3.1.7", + "certifi>=2020.4.5.1", + "ciso8601==2.1.3", +- "importlib-metadata==1.6.0", ++ "importlib-metadata>=1.5.0", + "jinja2>=2.11.1", + "PyJWT==1.7.1", + # PyJWT has loose dependency. We want the latest one. +- "cryptography==2.9.2", ++ "cryptography>=2.9", + "pip>=8.0.3", + "python-slugify==4.0.0", +- "pytz>=2020.1", +- "pyyaml==5.3.1", +- "requests==2.23.0", +- "ruamel.yaml==0.15.100", ++ "pytz>=2019.03", ++ "pyyaml>=5.2", ++ "requests>=2.22", ++ "ruamel.yaml>=0.15.100", + "voluptuous==0.11.7", + "voluptuous-serialize==2.3.0", + ] +-- +2.26.2 + diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 258e46db1990c..2c0854d0a8b40 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -63,7 +63,7 @@ in python.pkgs.buildPythonApplication rec { meta = with lib; { description = "Sandboxed python execution environment for writing automation apps for Home Assistant"; - homepage = https://github.com/home-assistant/appdaemon; + homepage = "https://github.com/home-assistant/appdaemon"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg dotlambda ]; }; diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix index 419462dcf8506..6b7758dd5e138 100644 --- a/pkgs/servers/home-assistant/cli.nix +++ b/pkgs/servers/home-assistant/cli.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "homeassistant-cli"; - version = "0.8.0"; + version = "0.9.1"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0qq42b2a0rlrzaxwf3zqks5gzgv0hf4pz4yjjl6ldnizw8fcj40n"; + sha256 = "1a31ky2p5w8byf0bjgma6xi328jj690qqksm3dwbi3v8dpqvghgf"; }; postPatch = '' @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Command-line tool for Home Assistant"; - homepage = https://github.com/home-assistant/home-assistant-cli; + homepage = "https://github.com/home-assistant/home-assistant-cli"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 8cf5f5a375576..aff2e9dc0cb94 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.107.7"; + version = "0.110.1"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "acer_projector" = ps: with ps; [ pyserial]; @@ -10,13 +10,13 @@ "adguard" = ps: with ps; [ ]; # missing inputs: adguardhome "ads" = ps: with ps; [ ]; # missing inputs: pyads "aftership" = ps: with ps; [ ]; # missing inputs: pyaftership + "agent_dvr" = ps: with ps; [ ]; # missing inputs: agent-py "air_quality" = ps: with ps; [ ]; "airly" = ps: with ps; [ ]; # missing inputs: airly "airvisual" = ps: with ps; [ pyairvisual]; "aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect "alarm_control_panel" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ alarmdecoder]; - "alarmdotcom" = ps: with ps; [ ]; # missing inputs: pyalarmdotcom "alert" = ps: with ps; [ ]; "alexa" = ps: with ps; [ aiohttp-cors]; "almond" = ps: with ps; [ aiohttp-cors]; # missing inputs: pyalmond @@ -43,11 +43,13 @@ "arduino" = ps: with ps; [ ]; # missing inputs: PyMata "arest" = ps: with ps; [ ]; "arlo" = ps: with ps; [ ha-ffmpeg]; # missing inputs: pyarlo + "arris_tg2492lg" = ps: with ps; [ ]; # missing inputs: arris-tg2492lg "aruba" = ps: with ps; [ pexpect]; "arwn" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; "asterisk_cdr" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asuswrt" = ps: with ps; [ ]; # missing inputs: aioasuswrt + "atag" = ps: with ps; [ ]; # missing inputs: pyatag "aten_pe" = ps: with ps; [ ]; # missing inputs: atenpdu "atome" = ps: with ps; [ ]; # missing inputs: pyatome "august" = ps: with ps; [ ]; # missing inputs: py-august @@ -74,6 +76,7 @@ "bitcoin" = ps: with ps; [ ]; # missing inputs: blockchain "bizkaibus" = ps: with ps; [ ]; # missing inputs: bizkaibus "blackbird" = ps: with ps; [ ]; # missing inputs: pyblackbird + "blebox" = ps: with ps; [ ]; # missing inputs: blebox_uniapi "blink" = ps: with ps; [ ]; # missing inputs: blinkpy "blinksticklight" = ps: with ps; [ BlinkStick]; "blinkt" = ps: with ps; [ ]; # missing inputs: blinkt @@ -84,14 +87,16 @@ "bluetooth_tracker" = ps: with ps; [ bt_proximity]; # missing inputs: pybluez "bme280" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi "bme680" = ps: with ps; [ ]; # missing inputs: bme680 smbus-cffi + "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected "bom" = ps: with ps; [ ]; # missing inputs: bomradarloop - "braviatv" = ps: with ps; [ bravia-tv getmac]; + "braviatv" = ps: with ps; [ bravia-tv]; "broadlink" = ps: with ps; [ broadlink]; "brother" = ps: with ps; [ ]; # missing inputs: brother "brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan "browser" = ps: with ps; [ ]; "brunt" = ps: with ps; [ ]; # missing inputs: brunt + "bsblan" = ps: with ps; [ ]; # missing inputs: bsblan "bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist "bt_smarthub" = ps: with ps; [ ]; # missing inputs: btsmarthub_devicelist "buienradar" = ps: with ps; [ ]; # missing inputs: buienradar @@ -139,7 +144,7 @@ "datadog" = ps: with ps; [ datadog]; "ddwrt" = ps: with ps; [ ]; "deconz" = ps: with ps; [ ]; # missing inputs: pydeconz - "decora" = ps: with ps; [ ]; # missing inputs: bluepy decora + "decora" = ps: with ps; [ bluepy]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro hass-nabucasa netdisco sqlalchemy zeroconf]; # missing inputs: home-assistant-frontend "delijn" = ps: with ps; [ ]; # missing inputs: pydelijn @@ -152,11 +157,12 @@ "device_automation" = ps: with ps; [ aiohttp-cors]; "device_sun_light_trigger" = ps: with ps; [ ]; "device_tracker" = ps: with ps; [ ]; + "devolo_home_control" = ps: with ps; [ ]; # missing inputs: devolo-home-control-api "dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT "dialogflow" = ps: with ps; [ aiohttp-cors]; "digital_ocean" = ps: with ps; [ digital-ocean]; "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower - "directv" = ps: with ps; [ ]; # missing inputs: directpy + "directv" = ps: with ps; [ ]; # missing inputs: directv "discogs" = ps: with ps; [ discogs_client]; "discord" = ps: with ps; [ discordpy]; "discovery" = ps: with ps; [ netdisco]; @@ -241,6 +247,7 @@ "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist "flexit" = ps: with ps; [ ]; # missing inputs: pyflexit pymodbus "flic" = ps: with ps; [ ]; # missing inputs: pyflic-homeassistant + "flick_electric" = ps: with ps; [ ]; # missing inputs: PyFlick "flock" = ps: with ps; [ ]; "flume" = ps: with ps; [ ]; # missing inputs: pyflume "flunearyou" = ps: with ps; [ ]; # missing inputs: pyflunearyou @@ -249,6 +256,7 @@ "folder" = ps: with ps; [ ]; "folder_watcher" = ps: with ps; [ watchdog]; "foobot" = ps: with ps; [ ]; # missing inputs: foobot_async + "forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java "fortigate" = ps: with ps; [ ]; # missing inputs: pyfgt "fortios" = ps: with ps; [ ]; # missing inputs: fortiosapi "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam @@ -310,7 +318,7 @@ "habitica" = ps: with ps; [ ]; # missing inputs: habitipy "hangouts" = ps: with ps; [ ]; # missing inputs: hangups "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr - "harmony" = ps: with ps; [ ]; # missing inputs: aioharmony + "harmony" = ps: with ps; [ aioharmony]; "hassio" = ps: with ps; [ aiohttp-cors]; "haveibeenpwned" = ps: with ps; [ ]; "hddtemp" = ps: with ps; [ ]; @@ -326,8 +334,9 @@ "hitron_coda" = ps: with ps; [ ]; "hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 + "home_connect" = ps: with ps; [ aiohttp-cors]; # missing inputs: homeconnect "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ ]; # missing inputs: HAP-python + "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg]; # missing inputs: PyTurboJPEG base36 fnvhash "homekit_controller" = ps: with ps; [ ]; # missing inputs: aiohomekit[IP] "homematic" = ps: with ps; [ pyhomematic]; "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip @@ -372,11 +381,12 @@ "iota" = ps: with ps; [ ]; # missing inputs: pyota "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3 "ipma" = ps: with ps; [ ]; # missing inputs: pyipma + "ipp" = ps: with ps; [ ]; # missing inputs: pyipp "iqvia" = ps: with ps; [ numpy]; # missing inputs: pyiqvia "irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail "islamic_prayer_times" = ps: with ps; [ ]; # missing inputs: prayer_times_calculator "iss" = ps: with ps; [ ]; # missing inputs: pyiss - "isy994" = ps: with ps; [ ]; # missing inputs: PyISY + "isy994" = ps: with ps; [ ]; # missing inputs: pyisy "itach" = ps: with ps; [ ]; # missing inputs: pyitachip2ir "itunes" = ps: with ps; [ ]; "izone" = ps: with ps; [ ]; # missing inputs: python-izone @@ -431,7 +441,7 @@ "london_underground" = ps: with ps; [ ]; # missing inputs: london-tube-status "loopenergy" = ps: with ps; [ ]; # missing inputs: pyloopenergy "lovelace" = ps: with ps; [ ]; - "luci" = ps: with ps; [ ]; # missing inputs: openwrt-luci-rpc + "luci" = ps: with ps; [ openwrt-luci-rpc]; "luftdaten" = ps: with ps; [ luftdaten]; "lupusec" = ps: with ps; [ ]; # missing inputs: lupupy "lutron" = ps: with ps; [ ]; # missing inputs: pylutron @@ -466,11 +476,11 @@ "microsoft_face" = ps: with ps; [ aiohttp-cors]; "microsoft_face_detect" = ps: with ps; [ aiohttp-cors]; "microsoft_face_identify" = ps: with ps; [ aiohttp-cors]; - "miflora" = ps: with ps; [ ]; # missing inputs: bluepy miflora + "miflora" = ps: with ps; [ bluepy]; # missing inputs: miflora "mikrotik" = ps: with ps; [ ]; # missing inputs: librouteros "mill" = ps: with ps; [ ]; # missing inputs: millheater "min_max" = ps: with ps; [ ]; - "minecraft_server" = ps: with ps; [ getmac]; # missing inputs: mcstatus + "minecraft_server" = ps: with ps; [ aiodns getmac]; # missing inputs: mcstatus "minio" = ps: with ps; [ minio]; "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt "mjpeg" = ps: with ps; [ ]; @@ -481,7 +491,6 @@ "mold_indicator" = ps: with ps; [ ]; "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ ]; - "mopar" = ps: with ps; [ ]; # missing inputs: motorparts "mpchc" = ps: with ps; [ ]; "mpd" = ps: with ps; [ mpd2]; "mqtt" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; @@ -512,7 +521,9 @@ "netgear_lte" = ps: with ps; [ ]; # missing inputs: eternalegypt "netio" = ps: with ps; [ aiohttp-cors]; # missing inputs: pynetio "neurio_energy" = ps: with ps; [ ]; # missing inputs: neurio + "nexia" = ps: with ps; [ ]; # missing inputs: nexia "nextbus" = ps: with ps; [ ]; # missing inputs: py_nextbusnext + "nextcloud" = ps: with ps; [ ]; # missing inputs: nextcloudmonitor "nfandroidtv" = ps: with ps; [ ]; "niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control "nilu" = ps: with ps; [ ]; # missing inputs: niluclient @@ -529,6 +540,7 @@ "nuheat" = ps: with ps; [ ]; # missing inputs: nuheat "nuimo_controller" = ps: with ps; [ ]; # missing inputs: --only-binary=all nuimo "nuki" = ps: with ps; [ ]; # missing inputs: pynuki + "numato" = ps: with ps; [ ]; # missing inputs: numato-gpio "nut" = ps: with ps; [ ]; # missing inputs: pynut2 "nws" = ps: with ps; [ ]; # missing inputs: pynws "nx584" = ps: with ps; [ ]; # missing inputs: pynx584 @@ -542,13 +554,14 @@ "onboarding" = ps: with ps; [ aiohttp-cors]; "onewire" = ps: with ps; [ ]; # missing inputs: pyownet "onkyo" = ps: with ps; [ onkyo-eiscp]; - "onvif" = ps: with ps; [ ha-ffmpeg]; # missing inputs: onvif-zeep-async + "onvif" = ps: with ps; [ ha-ffmpeg]; # missing inputs: WSDiscovery onvif-zeep-async "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ ]; "opencv" = ps: with ps; [ numpy]; # missing inputs: opencv-python-headless + "openerz" = ps: with ps; [ ]; # missing inputs: openerz-api "openevse" = ps: with ps; [ ]; # missing inputs: openevsewifi "openexchangerates" = ps: with ps; [ ]; - "opengarage" = ps: with ps; [ ]; + "opengarage" = ps: with ps; [ ]; # missing inputs: open-garage "openhardwaremonitor" = ps: with ps; [ ]; "openhome" = ps: with ps; [ ]; # missing inputs: openhomedevice "opensensemap" = ps: with ps; [ ]; # missing inputs: opensensemap-api @@ -564,8 +577,9 @@ "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otp" = ps: with ps; [ pyotp]; "owntracks" = ps: with ps; [ pynacl aiohttp-cors]; + "ozw" = ps: with ps; [ ]; # missing inputs: python-openzwave-mqtt "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta - "panasonic_viera" = ps: with ps; [ wakeonlan]; # missing inputs: panasonic_viera + "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "pandora" = ps: with ps; [ pexpect]; "panel_custom" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend "panel_iframe" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend @@ -574,6 +588,7 @@ "persistent_notification" = ps: with ps; [ ]; "person" = ps: with ps; [ ]; "philips_js" = ps: with ps; [ ]; # missing inputs: ha-philipsjs + "pi4ioe5v9xxxx" = ps: with ps; [ ]; # missing inputs: pi4ioe5v9xxxx "pi_hole" = ps: with ps; [ ]; # missing inputs: hole "picotts" = ps: with ps; [ ]; "piglow" = ps: with ps; [ ]; # missing inputs: piglow @@ -588,6 +603,7 @@ "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad "pocketcasts" = ps: with ps; [ ]; # missing inputs: pocketcasts "point" = ps: with ps; [ aiohttp-cors]; # missing inputs: pypoint + "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall "prezzibenzina" = ps: with ps; [ ]; # missing inputs: prezzibenzina-py "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client]; @@ -597,13 +613,13 @@ "proxy" = ps: with ps; [ pillow]; "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen "ptvsd" = ps: with ps; [ ]; # missing inputs: ptvsd - "pulseaudio_loopback" = ps: with ps; [ ]; + "pulseaudio_loopback" = ps: with ps; [ pulsectl]; "push" = ps: with ps; [ aiohttp-cors]; "pushbullet" = ps: with ps; [ pushbullet]; - "pushetta" = ps: with ps; [ ]; # missing inputs: pushetta "pushover" = ps: with ps; [ pushover-complete]; "pushsafer" = ps: with ps; [ ]; "pvoutput" = ps: with ps; [ ]; + "pvpc_hourly_pricing" = ps: with ps; [ ]; # missing inputs: aiopvpc "pyload" = ps: with ps; [ ]; "python_script" = ps: with ps; [ restrictedpython]; "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent @@ -640,7 +656,7 @@ "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api "rmvtransport" = ps: with ps; [ ]; # missing inputs: PyRMVtransport "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API - "roku" = ps: with ps; [ roku]; + "roku" = ps: with ps; [ ]; # missing inputs: rokuecp "roomba" = ps: with ps; [ ]; # missing inputs: roombapy "route53" = ps: with ps; [ boto3]; # missing inputs: ipify "rova" = ps: with ps; [ ]; # missing inputs: rova @@ -660,6 +676,7 @@ "samsungtv" = ps: with ps; [ ]; # missing inputs: samsungctl[websocket] samsungtvws[websocket] "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra "scene" = ps: with ps; [ ]; + "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter "scrape" = ps: with ps; [ beautifulsoup4]; "script" = ps: with ps; [ ]; "scsgate" = ps: with ps; [ ]; # missing inputs: scsgate @@ -692,7 +709,7 @@ "sky_hub" = ps: with ps; [ ]; "skybeacon" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL] "skybell" = ps: with ps; [ ]; # missing inputs: skybellpy - "slack" = ps: with ps; [ ]; # missing inputs: slacker + "slack" = ps: with ps; [ ]; # missing inputs: slackclient "sleepiq" = ps: with ps; [ ]; # missing inputs: sleepyq "slide" = ps: with ps; [ ]; # missing inputs: goslide-api "sma" = ps: with ps; [ ]; # missing inputs: pysma @@ -728,7 +745,7 @@ "spotcrime" = ps: with ps; [ ]; # missing inputs: spotcrime "spotify" = ps: with ps; [ aiohttp-cors spotipy]; "sql" = ps: with ps; [ sqlalchemy]; - "squeezebox" = ps: with ps; [ ]; + "squeezebox" = ps: with ps; [ ]; # missing inputs: pysqueezebox "ssdp" = ps: with ps; [ defusedxml netdisco]; "starline" = ps: with ps; [ ]; # missing inputs: starline "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank @@ -756,8 +773,8 @@ "syncthru" = ps: with ps; [ ]; # missing inputs: pysyncthru "synology" = ps: with ps; [ ]; # missing inputs: py-synology "synology_chat" = ps: with ps; [ ]; + "synology_dsm" = ps: with ps; [ ]; # missing inputs: python-synology "synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm - "synologydsm" = ps: with ps; [ ]; # missing inputs: python-synology "syslog" = ps: with ps; [ ]; "system_health" = ps: with ps; [ aiohttp-cors]; "system_log" = ps: with ps; [ aiohttp-cors]; @@ -828,6 +845,7 @@ "unifi_direct" = ps: with ps; [ pexpect]; "unifiled" = ps: with ps; [ ]; # missing inputs: unifiled "universal" = ps: with ps; [ ]; + "upb" = ps: with ps; [ ]; # missing inputs: upb_lib "upc_connect" = ps: with ps; [ ]; # missing inputs: connect-box "upcloud" = ps: with ps; [ ]; # missing inputs: upcloud-api "updater" = ps: with ps; [ distro]; @@ -875,6 +893,7 @@ "websocket_api" = ps: with ps; [ aiohttp-cors]; "wemo" = ps: with ps; [ ]; # missing inputs: pywemo "whois" = ps: with ps; [ ]; # missing inputs: python-whois + "wiffi" = ps: with ps; [ ]; # missing inputs: wiffi "wink" = ps: with ps; [ aiohttp-cors]; # missing inputs: pubnubsub-handler python-wink "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors]; # missing inputs: withings-api @@ -907,13 +926,13 @@ "yessssms" = ps: with ps; [ ]; # missing inputs: YesssSMS "yi" = ps: with ps; [ aioftp ha-ffmpeg]; "yr" = ps: with ps; [ xmltodict]; - "yweather" = ps: with ps; [ yahooweather]; "zabbix" = ps: with ps; [ ]; # missing inputs: pyzabbix "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf]; + "zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc "zestimate" = ps: with ps; [ xmltodict]; - "zha" = ps: with ps; [ zha-quirks zigpy-deconz zigpy]; # missing inputs: bellows-homeassistant zigpy-cc zigpy-xbee-homeassistant zigpy-zigate + "zha" = ps: with ps; [ pyserial zha-quirks zigpy-deconz]; # missing inputs: bellows zigpy-cc zigpy-xbee zigpy-zigate zigpy "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac "zigbee" = ps: with ps; [ ]; # missing inputs: xbee-helper "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 877c03cb19e64..2d6d734745584 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6 +{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6 # Look up dependencies of specified components in component-packages.nix , extraComponents ? [ ] @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.107.7"; + hassVersion = "0.110.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -76,7 +76,7 @@ in with py.pkgs; buildPythonApplication rec { disabled = pythonOlder "3.5"; patches = [ - ./relax-deps.patch + ./0001-setup.py-relax-dependencies.patch ]; inherit availableComponents; @@ -84,9 +84,9 @@ in with py.pkgs; buildPythonApplication rec { # PyPI tarball is missing tests/ directory src = fetchFromGitHub { owner = "home-assistant"; - repo = "home-assistant"; + repo = "core"; rev = version; - sha256 = "1sr7vzsd4hpaix37bb10vbnnqs1v8ll2wb8m713qrvcp3crs6snk"; + sha256 = "1495kl997mvk9k11lk1ahv5w0yc0185qmxwa1h51j6d0zyqwz749"; }; propagatedBuildInputs = [ @@ -98,24 +98,20 @@ in with py.pkgs; buildPythonApplication rec { sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode ciso8601 ] ++ componentBuildInputs ++ extraBuildInputs; + # upstream only tests on Linux, so do we. + doCheck = stdenv.isLinux; + checkInputs = [ - asynctest pytest pytest-aiohttp requests-mock pydispatcher aiohue netdisco - hass-nabucasa defusedxml zeroconf + asynctest pytest pytest-aiohttp requests-mock hass-nabucasa netdisco pydispatcher ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "aiohttp==3.6.1" "aiohttp" \ - --replace "attrs==19.2.0" "attrs" \ - --replace "ruamel.yaml==0.15.100" "ruamel.yaml" - ''; - checkPhase = '' # - components' dependencies are not included, so they cannot be tested # - test_merge_id_schema requires pyqwikswitch + # - test_loader.py tries to load not-packaged dependencies # - unclear why test_merge fails: assert merge_log_err.call_count != 0 # - test_setup_safe_mode_if_no_frontend: requires dependencies for components we have not packaged - py.test --ignore tests/components -k "not test_setup_safe_mode_if_no_frontend and not test_merge_id_schema and not test_merge" + py.test --ignore tests/components --ignore tests/test_loader.py -k "not test_setup_safe_mode_if_no_frontend and not test_merge_id_schema and not test_merge" # Some basic components should be tested however py.test \ @@ -125,8 +121,12 @@ in with py.pkgs; buildPythonApplication rec { makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; + passthru = { + inherit (py.pkgs) hass-frontend; + }; + meta = with lib; { - homepage = https://home-assistant.io/; + homepage = "https://home-assistant.io/"; description = "Open-source home automation platform running on Python 3"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda globin mic92 ]; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 04cef9fa6d72e..3481a2d1bd900 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20200318.0"; + version = "20200519.1"; src = fetchPypi { inherit pname version; - sha256 = "15by4wd3lpq1pd0hpx04v827i3xywsvxziqb1qrbsraxh1rvsbhz"; + sha256 = "149v56q5anzdfxf0dw1h39vdmcigx732a7abqjfb0xny5484iq8w"; }; # no Python tests implemented @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Polymer frontend for Home Assistant"; - homepage = https://github.com/home-assistant/home-assistant-polymer; + homepage = "https://github.com/home-assistant/home-assistant-polymer"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda globin ]; }; diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index a5c6e9d09614e..f802485d6c62d 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -36,7 +36,9 @@ PKG_PREFERENCES = { # Use python3Packages.youtube-dl-light instead of python3Packages.youtube-dl "youtube-dl": "youtube-dl-light", "tensorflow-bin": "tensorflow", + "tensorflow-bin_2": "tensorflow", "tensorflowWithoutCuda": "tensorflow", + "tensorflow-build_2": "tensorflow", } @@ -78,8 +80,9 @@ def parse_components(version: str = "master"): # Recursively get the requirements of a component and its dependencies def get_reqs(components, component): - requirements = set(components[component]["requirements"]) - for dependency in components[component]["dependencies"]: + requirements = set(components[component].get("requirements", [])) + deps = components[component].get("dependencies", []) + for dependency in deps: requirements.update(get_reqs(components, dependency)) return requirements diff --git a/pkgs/servers/home-assistant/relax-deps.patch b/pkgs/servers/home-assistant/relax-deps.patch deleted file mode 100644 index 5d9716f0683cd..0000000000000 --- a/pkgs/servers/home-assistant/relax-deps.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/setup.py 2020-03-18 15:34:35.474693786 +0000 -+++ b/setup.py 2020-03-18 15:49:07.185801916 +0000 -@@ -47,8 +47,8 @@ - "pip>=8.0.3", - "python-slugify==4.0.0", - "pytz>=2019.03", -- "pyyaml==5.3", -- "requests==2.23.0", -+ "pyyaml>=5.2", -+ "requests>=2.22.0", - "ruamel.yaml==0.15.100", - "voluptuous==0.11.7", - "voluptuous-serialize==2.3.0", diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 252365098ddc1..8d8a0fceefb40 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.41"; + version = "2.4.43"; pname = "apache-httpd"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "0h7a31yxwyh7h521frnmlppl0h7sh9icc3ka6vlmlcg5iwllhg8k"; + sha256 = "0hqgw47r3p3521ygkkqs8s30s5crm683081avj6330gwncm6b5x4"; }; # FIXME: -dev depends on -doc @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - stripDebugList = "lib modules bin"; + stripDebugList = [ "lib" "modules" "bin" ]; postInstall = '' mkdir -p $doc/share/doc/httpd @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Apache HTTPD, the world's most popular web server"; - homepage = http://httpd.apache.org/; + homepage = "http://httpd.apache.org/"; license = licenses.asl20; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with maintainers; [ lovek323 peti ]; diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix index 6bad43a62f0ae..d696ece826756 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/UNINETT/mod_auth_mellon; + homepage = "https://github.com/UNINETT/mod_auth_mellon"; description = "An Apache module with a simple SAML 2.0 service provider"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index d681146eee5d2..5831401813289 100644 --- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://0pointer.de/lennart/projects/mod_dnssd; + homepage = "http://0pointer.de/lennart/projects/mod_dnssd"; description = "Provide Zeroconf support via DNS-SD using Avahi"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/servers/http/apache-modules/mod_evasive/default.nix b/pkgs/servers/http/apache-modules/mod_evasive/default.nix index 2b8693f7379d0..9abd08baa0914 100644 --- a/pkgs/servers/http/apache-modules/mod_evasive/default.nix +++ b/pkgs/servers/http/apache-modules/mod_evasive/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "mod_evasive-1.10.1"; src = fetchurl { - url = http://www.zdziarski.com/blog/wp-content/uploads/2010/02/mod_evasive_1.10.1.tar.gz; + url = "http://www.zdziarski.com/blog/wp-content/uploads/2010/02/mod_evasive_1.10.1.tar.gz"; sha256 = "0rsnx50rjv6xygbp9r0gyss7xqdkcb0hy3wh9949jf1im8wm3i07"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.zdziarski.com/blog/?page_id=442; + homepage = "http://www.zdziarski.com/blog/?page_id=442"; description = "Evasive maneuvers module for Apache to provide evasive action in the event of an HTTP DoS or DDoS attack or brute force attack"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index a6f4f99267105..4922076266bbb 100644 --- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/FastCGI-Archives/mod_fastcgi; + homepage = "https://github.com/FastCGI-Archives/mod_fastcgi"; description = "Provide support for the FastCGI protocol"; longDescription = '' diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index 6aed1481ddf35..39c568d1d499c 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ apacheHttpd python2 ]; meta = { - homepage = http://modpython.org/; + homepage = "http://modpython.org/"; description = "An Apache module that embeds the Python interpreter within the server"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 0e4804c1a39aa..c8f95e685ab72 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/GrahamDumpleton/mod_wsgi; + homepage = "https://github.com/GrahamDumpleton/mod_wsgi"; description = "Host Python applications in Apache through the WSGI interface"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index 65ec2510d342e..f8c4b80020453 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -4,6 +4,7 @@ , doxygen , fetchurl , fuse +, libevent , lzma , openssl , pkgconfig @@ -14,19 +15,19 @@ stdenv.mkDerivation rec { pname = "apt-cacher-ng"; - version = "3.2"; + version = "3.5"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; - sha256 = "1kas5xq44rx33pczhrz05dsdhjaavxdmcs5h1ygfi76bpqvyhpa0"; + sha256 = "0h76n02nnpg7ir9247qrxb8p4d4p282nh13zrv5bb9sfm12pril2"; }; nativeBuildInputs = [ cmake doxygen pkgconfig ]; - buildInputs = [ bzip2 fuse lzma openssl systemd tcp_wrappers zlib ]; + buildInputs = [ bzip2 fuse libevent lzma openssl systemd tcp_wrappers zlib ]; meta = with stdenv.lib; { description = "A caching proxy specialized for linux distribution files"; - homepage = https://www.unix-ag.uni-kl.de/~bloch/acng/; + homepage = "https://www.unix-ag.uni-kl.de/~bloch/acng/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.makefu ]; diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix index a9d806f9de841..3f6f00e1bdbfc 100644 --- a/pkgs/servers/http/couchdb/2.0.0.nix +++ b/pkgs/servers/http/couchdb/2.0.0.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; - homepage = http://couchdb.apache.org; + homepage = "http://couchdb.apache.org"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ ]; diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index f2e5e67dd7ac9..b8807532181a7 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; - homepage = http://couchdb.apache.org; + homepage = "http://couchdb.apache.org"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ ]; diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix index 42de9904f90a2..4bcb16a04ea78 100644 --- a/pkgs/servers/http/darkhttpd/default.nix +++ b/pkgs/servers/http/darkhttpd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small and secure static webserver"; - homepage = https://unix4lyfe.org/darkhttpd/; + homepage = "https://unix4lyfe.org/darkhttpd/"; license = licenses.bsd3; maintainers = with maintainers; [ bobvanderlinden ]; platforms = platforms.all; diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/servers/http/gatling/default.nix index 395504e49703b..9157c09cbebde 100644 --- a/pkgs/servers/http/gatling/default.nix +++ b/pkgs/servers/http/gatling/default.nix @@ -25,9 +25,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high performance web server"; - homepage = http://www.fefe.de/gatling/; + homepage = "http://www.fefe.de/gatling/"; license = stdenv.lib.licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.the-kenny ]; }; } diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix index d599956cfda9b..999016e4bd954 100644 --- a/pkgs/servers/http/h2o/default.nix +++ b/pkgs/servers/http/h2o/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optimized HTTP/1 and HTTP/2 server"; - homepage = https://h2o.examp1e.net; + homepage = "https://h2o.examp1e.net"; license = licenses.mit; maintainers = with maintainers; [ thoughtpolice ]; platforms = platforms.linux; diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index 4e799774569c4..b731d4d0b3415 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://www.hiawatha-webserver.org; + homepage = "https://www.hiawatha-webserver.org"; description = "An advanced and secure webserver"; license = licenses.gpl2; platforms = platforms.unix; # "Hiawatha runs perfectly on Linux, BSD and MacOS X" diff --git a/pkgs/servers/http/hyp/default.nix b/pkgs/servers/http/hyp/default.nix index c34959f9d0471..6a16ee412f514 100644 --- a/pkgs/servers/http/hyp/default.nix +++ b/pkgs/servers/http/hyp/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonPackage rec { meta = with stdenv.lib; { description = "Hyperminimal https server"; - homepage = https://github.com/rnhmjoj/hyp; + homepage = "https://github.com/rnhmjoj/hyp"; license = with licenses; [gpl3Plus mit]; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.unix; diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index c5702132d2808..b470a127aee55 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "jboss-as-7.1.1.Final"; src = fetchurl { - url = https://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1.Final.tar.gz; + url = "https://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1.Final.tar.gz"; sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.jboss.org/; + homepage = "http://www.jboss.org/"; description = "Open Source J2EE application server"; license = licenses.lgpl21; maintainers = [ maintainers.sander ]; diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 4a3a3f2da0160..49c11bf462e6b 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.25.v20191220"; + version = "9.4.26.v20200117"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; name = "jetty-distribution-${version}.tar.gz"; - sha256 = "1jnx4hnvd2krsdisqwpws1qd1r0f8gm9a4sx4a8c7zqrmfd2zx1a"; + sha256 = "0wgh7vap0h6gkz6pk8iycvhwmybyxv25ssinwxxrnzk8jg25g89i"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 462151400fdd7..01a07a9f5029a 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight high-performance web server"; - homepage = http://www.lighttpd.net/; + homepage = "http://www.lighttpd.net/"; license = stdenv.lib.licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index 37a0a98d4e018..98bb27221c37b 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://mini-httpd.nongnu.org/; + homepage = "http://mini-httpd.nongnu.org/"; description = "minimalistic high-performance web server"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index 3c29ddb8e0a6c..be659114d4701 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { built-in features. Share your files in minutes! ''; - homepage = https://www.gnu.org/software/myserver/; + homepage = "https://www.gnu.org/software/myserver/"; license = lib.licenses.gpl3Plus; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 67a914b6a9884..80bc1458ad7ab 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -68,6 +68,14 @@ stdenv.mkDerivation { "--with-http_stub_status_module" "--with-threads" "--with-pcre-jit" + "--http-log-path=/var/log/nginx/access.log" + "--error-log-path=/var/log/nginx/error.log" + "--pid-path=/var/log/nginx/nginx.pid" + "--http-client-body-temp-path=/var/cache/nginx/client_body" + "--http-proxy-temp-path=/var/cache/nginx/proxy" + "--http-fastcgi-temp-path=/var/cache/nginx/fastcgi" + "--http-uwsgi-temp-path=/var/cache/nginx/uwsgi" + "--http-scgi-temp-path=/var/cache/nginx/scgi" ] ++ optionals withDebug [ "--with-debug" ] ++ optionals withStream [ @@ -99,26 +107,28 @@ stdenv.mkDerivation { preConfigure = preConfigure + concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules; - patches = map fixPatch - (singleton (substituteAll { + patches = map fixPatch ([ + (substituteAll { src = ./nix-etag-1.15.4.patch; preInstall = '' export nixStoreDir="$NIX_STORE" nixStoreDirLen="''${#NIX_STORE}" ''; - }) ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - (fetchpatch { - url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/102-sizeof_test_fix.patch"; - sha256 = "0i2k30ac8d7inj9l6bl0684kjglam2f68z8lf3xggcc2i5wzhh8a"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/101-feature_test_fix.patch"; - sha256 = "0v6890a85aqmw60pgj3mm7g8nkaphgq65dj4v9c6h58wdsrc6f0y"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/103-sys_nerr.patch"; - sha256 = "0s497x6mkz947aw29wdy073k8dyjq8j99lax1a1mzpikzr4rxlmd"; - }) - ] ++ mapModules "patches"); + }) + ./nix-skip-check-logs-path.patch + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + (fetchpatch { + url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/102-sizeof_test_fix.patch"; + sha256 = "0i2k30ac8d7inj9l6bl0684kjglam2f68z8lf3xggcc2i5wzhh8a"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/101-feature_test_fix.patch"; + sha256 = "0v6890a85aqmw60pgj3mm7g8nkaphgq65dj4v9c6h58wdsrc6f0y"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/103-sys_nerr.patch"; + sha256 = "0s497x6mkz947aw29wdy073k8dyjq8j99lax1a1mzpikzr4rxlmd"; + }) + ] ++ mapModules "patches"); hardeningEnable = optional (!stdenv.isDarwin) "pie"; diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index b382d2891f906..74df3c1647280 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.17.9"; - sha256 = "12dnrdxwnlid0wr797vdxj9z1fmxnk7ib55bznvl2g3mbi05vmkx"; + version = "1.18.0"; + sha256 = "16azscl74ym1far0s0p6xsjin1k1cm4wk80i9x5d74dznmx3wdsc"; } diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 167829669440b..4ea74019692bc 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -73,8 +73,8 @@ in src = fetchFromGitHub { owner = "aperezdc"; repo = "ngx-fancyindex"; - rev = "v0.4.3"; - sha256 = "12xdx6a76sfrq0yciylvyjlnvyczszpadn31jqya8c2dzdkyyx7f"; + rev = "v0.4.4"; + sha256 = "14xmzcl608pr7hb7wng6hpz7by51cfnxlszbka3zhp3kk86ljsi6"; }; }; @@ -140,6 +140,7 @@ in export LUAJIT_LIB="${pkgs.luajit}/lib" export LUAJIT_INC="${pkgs.luajit}/include/luajit-2.0" ''; + allowMemoryWriteExecute = true; }; lua-upstream = { @@ -150,6 +151,7 @@ in sha256 = "1gqccg8airli3i9103zv1zfwbjm27h235qjabfbfqk503rjamkpk"; }; inputs = [ pkgs.luajit ]; + allowMemoryWriteExecute = true; }; modsecurity = { @@ -246,6 +248,7 @@ in in { src = ngx_pagespeed; inputs = [ pkgs.zlib pkgs.libuuid ]; # psol deps + allowMemoryWriteExecute = true; }; pam = { diff --git a/pkgs/servers/http/nginx/nix-skip-check-logs-path.patch b/pkgs/servers/http/nginx/nix-skip-check-logs-path.patch new file mode 100644 index 0000000000000..a823660cc32ea --- /dev/null +++ b/pkgs/servers/http/nginx/nix-skip-check-logs-path.patch @@ -0,0 +1,27 @@ +diff --git a/auto/install b/auto/install +index d884487..dccc411 100644 +--- a/auto/install ++++ b/auto/install +@@ -148,12 +148,6 @@ install: build $NGX_INSTALL_PERL_MODULES + || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH' + cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default' + +- test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \\ +- || mkdir -p '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' +- +- test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' \\ +- || mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' +- + test -d '\$(DESTDIR)$NGX_PREFIX/html' \\ + || cp -R $NGX_HTML '\$(DESTDIR)$NGX_PREFIX' + END +@@ -161,9 +155,6 @@ END + + if test -n "$NGX_ERROR_LOG_PATH"; then + cat << END >> $NGX_MAKEFILE +- +- test -d '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' \\ +- || mkdir -p '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' + END + + fi diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index 001ea60839a28..c08615ef5125b 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix args { - version = "1.16.1"; - sha256 = "0az3vf463b538ajvaq94hsz9ipmjgnamfj1jy0v5flfks5njl77i"; + version = "1.18.0"; + sha256 = "16azscl74ym1far0s0p6xsjin1k1cm4wk80i9x5d74dznmx3wdsc"; } diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 4b5b4259ca43d..9c01cfb19e1d3 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -16,10 +16,11 @@ callPackage ../nginx/generic.nix args rec { sha256 = "1a1la7vszv1parsnhphydblz64ffhycazncn3ividnvqg2mg735n"; }; - fixPatch = patch: - runCommand "openresty-${patch.name}" { src = patch; } '' + fixPatch = patch: let name = patch.name or (builtins.baseNameOf patch); in + runCommand "openresty-${name}" { src = patch; } '' substitute $src $out \ - --replace "src/" "bundle/nginx-${nginxVersion}/src/" + --replace "a/" "a/bundle/nginx-${nginxVersion}/" \ + --replace "b/" "b/bundle/nginx-${nginxVersion}/" ''; buildInputs = [ postgresql ]; @@ -37,7 +38,7 @@ callPackage ../nginx/generic.nix args rec { meta = { description = "A fast web application server built on Nginx"; - homepage = http://openresty.org; + homepage = "http://openresty.org"; license = lib.licenses.bsd2; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ thoughtpolice lblasc emily ]; diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index 19d0b9a2641cb..f83ab4642f046 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Pretty small HTTP server - a command-line tool to share files"; - homepage = https://github.com/mgorny/pshs; + homepage = "https://github.com/mgorny/pshs"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/servers/http/redstore/default.nix index 7d592d0256b7d..80f2434e52973 100644 --- a/pkgs/servers/http/redstore/default.nix +++ b/pkgs/servers/http/redstore/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "An HTTP interface to Redland RDF store"; - homepage = https://www.aelius.com/njh/redstore/; + homepage = "https://www.aelius.com/njh/redstore/"; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = with stdenv.lib.platforms; linux ++ freebsd ++ gnu; diff --git a/pkgs/servers/http/showoff/default.nix b/pkgs/servers/http/showoff/default.nix index 136fcb3e07cff..0a10c806e5ed9 100644 --- a/pkgs/servers/http/showoff/default.nix +++ b/pkgs/servers/http/showoff/default.nix @@ -10,7 +10,7 @@ bundlerApp { meta = with lib; { description = "A slideshow presentation tool with a twist"; longDescription = "It runs as a web application, with audience interactivity features. This means that your audience can follow along in their own browsers, can download supplemental materials, can participate in quizzes or polls, post questions for the presenter, etc. By default, their slideshows will synchronize with the presenter, but they can switch to self-navigation mode"; - homepage = https://puppetlabs.github.io/showoff/; + homepage = "https://puppetlabs.github.io/showoff/"; license = with licenses; mit; platforms = platforms.unix; maintainers = with maintainers; [ mwilsoninsight nicknovitski ]; diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index 1eeb5a8c4dd8d..f3cae597ef9e6 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt -, gd, geoip, gperftools, jemalloc +, substituteAll, gd, geoip, gperftools, jemalloc , withDebug ? false , withMail ? false , withStream ? false @@ -24,8 +24,14 @@ stdenv.mkDerivation rec { [ openssl zlib pcre libxml2 libxslt gd geoip gperftools jemalloc ] ++ concatMap (mod: mod.inputs or []) modules; - patches = [ + patches = singleton (substituteAll { + src = ../nginx/nix-etag-1.15.4.patch; + preInstall = '' + export nixStoreDir="$NIX_STORE" nixStoreDirLen="''${#NIX_STORE}" + ''; + }) ++ [ ./check-resolv-conf.patch + ../nginx/nix-skip-check-logs-path.patch ]; configureFlags = [ @@ -53,6 +59,14 @@ stdenv.mkDerivation rec { "--with-poll_module" "--with-google_perftools_module" "--with-jemalloc" + "--http-log-path=/var/log/nginx/access.log" + "--error-log-path=/var/log/nginx/error.log" + "--pid-path=/var/log/nginx/nginx.pid" + "--http-client-body-temp-path=/var/cache/nginx/client_body" + "--http-proxy-temp-path=/var/cache/nginx/proxy" + "--http-fastcgi-temp-path=/var/cache/nginx/fastcgi" + "--http-uwsgi-temp-path=/var/cache/nginx/uwsgi" + "--http-scgi-temp-path=/var/cache/nginx/scgi" ] ++ optionals withDebug [ "--with-debug" ] ++ optionals withMail [ @@ -99,7 +113,7 @@ stdenv.mkDerivation rec { meta = { description = "A web server based on Nginx and has many advanced features, originated by Taobao."; - homepage = https://tengine.taobao.org; + homepage = "https://tengine.taobao.org"; license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ izorkin ]; diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index b72439bc37a25..6ff1026ba0c6b 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/pkgs/servers/http/thttpd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Tiny/turbo/throttling HTTP server"; - homepage = http://www.acme.com/software/thttpd/; + homepage = "http://www.acme.com/software/thttpd/"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 3908db5ea71c5..78e108d8c8dac 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -21,7 +21,7 @@ let ''; meta = { - homepage = https://tomcat.apache.org/; + homepage = "https://tomcat.apache.org/"; description = "An implementation of the Java Servlet and JavaServer Pages technologies"; platforms = with lib.platforms; all; maintainers = with lib.maintainers; [ danbst ]; diff --git a/pkgs/servers/http/tomcat/tomcat-native.nix b/pkgs/servers/http/tomcat/tomcat-native.nix new file mode 100644 index 0000000000000..17c4367866fb6 --- /dev/null +++ b/pkgs/servers/http/tomcat/tomcat-native.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, apr, jdk, openssl }: + +stdenv.mkDerivation rec { + pname = "tomcat-native"; + version = "1.2.24"; + + src = fetchurl { + url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz"; + sha512 = "5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f"; + }; + + sourceRoot = "${pname}-${version}-src/native"; + + buildInputs = [ apr jdk openssl ]; + + configureFlags = [ + "--with-apr=${apr.dev}" + "--with-java-home=${jdk}" + "--with-ssl=${openssl.dev}" + ]; + + meta = with stdenv.lib; { + description = "An optional component for use with Apache Tomcat that allows Tomcat to use certain native resources for performance, compatibility, etc"; + homepage = "https://tomcat.apache.org/native-doc/"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ aanderse ]; + }; +} diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 96bc88b9f04d2..c161566d329fc 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchFromGitHub, which +{ stdenv, fetchFromGitHub, nixosTests, which , withPython2 ? false, python2 , withPython3 ? true, python3, ncurses -, withPHP72 ? false, php72base -, withPHP73 ? true, php73base +, withPHP72 ? false, php72 +, withPHP73 ? false, php73 +, withPHP74 ? true, php74 , withPerl528 ? false, perl528 , withPerl530 ? true, perl530 , withPerldevel ? false, perldevel @@ -18,32 +19,29 @@ with stdenv.lib; let phpConfig = { - config.php.embed = true; - config.php.apxs2 = false; - config.php.systemd = false; - config.php.phpdbg = false; - config.php.cgi = false; - config.php.fpm = false; + embedSupport = true; + apxs2Support = false; + systemdSupport = false; + phpdbgSupport = false; + cgiSupport = false; + fpmSupport = false; }; - php72-unit = php72base.override phpConfig; - php73-unit = php73base.override phpConfig; + php72-unit = php72.override phpConfig; + php73-unit = php73.override phpConfig; + php74-unit = php74.override phpConfig; + in stdenv.mkDerivation rec { - version = "1.16.0"; + version = "1.17.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = "unit"; rev = version; - sha256 = "19gclqhwccpi7y4386ap33ycwhylv4s4kwfc6ik8scmc4pw3sj9l"; + sha256 = "1q3659vw8rxv4fk7ljkjav8ga72sb3arljfxcqw8b080f9hvi7hh"; }; - patches = [ - # https://github.com/nginx/unit/issues/357 - ./drop_cap.patch - ]; - nativeBuildInputs = [ which ]; buildInputs = [ ] @@ -51,6 +49,7 @@ in stdenv.mkDerivation rec { ++ optionals withPython3 [ python3 ncurses ] ++ optional withPHP72 php72-unit ++ optional withPHP73 php73-unit + ++ optional withPHP73 php74-unit ++ optional withPerl528 perl528 ++ optional withPerl530 perl530 ++ optional withPerldevel perldevel @@ -71,8 +70,9 @@ in stdenv.mkDerivation rec { postConfigure = '' ${optionalString withPython2 "./configure python --module=python2 --config=${python2}/bin/python2-config --lib-path=${python2}/lib"} ${optionalString withPython3 "./configure python --module=python3 --config=${python3}/bin/python3-config --lib-path=${python3}/lib"} - ${optionalString withPHP72 "./configure php --module=php72 --config=${php72-unit.dev}/bin/php-config --lib-path=${php72-unit}/lib"} - ${optionalString withPHP73 "./configure php --module=php73 --config=${php73-unit.dev}/bin/php-config --lib-path=${php73-unit}/lib"} + ${optionalString withPHP72 "./configure php --module=php72 --config=${php72-unit.unwrapped.dev}/bin/php-config --lib-path=${php72-unit}/lib"} + ${optionalString withPHP73 "./configure php --module=php73 --config=${php73-unit.unwrapped.dev}/bin/php-config --lib-path=${php73-unit}/lib"} + ${optionalString withPHP74 "./configure php --module=php74 --config=${php74-unit.unwrapped.dev}/bin/php-config --lib-path=${php74-unit}/lib"} ${optionalString withPerl528 "./configure perl --module=perl528 --perl=${perl528}/bin/perl"} ${optionalString withPerl530 "./configure perl --module=perl530 --perl=${perl530}/bin/perl"} ${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"} @@ -81,9 +81,11 @@ in stdenv.mkDerivation rec { ${optionalString withRuby_2_7 "./configure ruby --module=ruby27 --ruby=${ruby_2_7}/bin/ruby"} ''; + passthru.tests.unit-php = nixosTests.unit-php; + meta = { description = "Dynamic web and application server, designed to run applications in multiple languages."; - homepage = https://unit.nginx.org/; + homepage = "https://unit.nginx.org/"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ izorkin ]; diff --git a/pkgs/servers/http/unit/drop_cap.patch b/pkgs/servers/http/unit/drop_cap.patch deleted file mode 100644 index 87caf77904e2e..0000000000000 --- a/pkgs/servers/http/unit/drop_cap.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -r ed17ce89119f src/nxt_capability.c ---- a/src/nxt_capability.c Fri Dec 06 17:02:23 2019 +0000 -+++ b/src/nxt_capability.c Mon Dec 09 23:23:00 2019 +0000 -@@ -93,6 +93,26 @@ nxt_capability_specific_set(nxt_task_t * - return NXT_OK; - } - -+ -+nxt_int_t -+nxt_capability_drop_all(nxt_task_t *task) -+{ -+ struct __user_cap_header_struct hdr; -+ struct __user_cap_data_struct data[2]; -+ -+ hdr.version = nxt_capability_linux_get_version(); -+ hdr.pid = nxt_pid; -+ -+ nxt_memset(data, 0, sizeof(data)); -+ -+ if (nxt_slow_path(nxt_capset(&hdr, data) == -1)) { -+ nxt_alert(task, "failed to drop capabilities %E", nxt_errno); -+ return NXT_ERROR; -+ } -+ -+ return NXT_OK; -+} -+ - #else - - static nxt_int_t -diff -r ed17ce89119f src/nxt_capability.h ---- a/src/nxt_capability.h Fri Dec 06 17:02:23 2019 +0000 -+++ b/src/nxt_capability.h Mon Dec 09 23:23:00 2019 +0000 -@@ -14,4 +14,6 @@ typedef struct { - NXT_EXPORT nxt_int_t nxt_capability_set(nxt_task_t *task, - nxt_capabilities_t *cap); - -+NXT_EXPORT nxt_int_t nxt_capability_drop_all(nxt_task_t *task); -+ - #endif /* _NXT_CAPABILITY_INCLUDED_ */ -diff -r ed17ce89119f src/nxt_process.c ---- a/src/nxt_process.c Fri Dec 06 17:02:23 2019 +0000 -+++ b/src/nxt_process.c Mon Dec 09 23:23:00 2019 +0000 -@@ -264,7 +264,7 @@ cleanup: - static void - nxt_process_start(nxt_task_t *task, nxt_process_t *process) - { -- nxt_int_t ret, cap_setid; -+ nxt_int_t ret, cap_setid, drop_caps; - nxt_port_t *port, *main_port; - nxt_thread_t *thread; - nxt_runtime_t *rt; -@@ -285,9 +285,12 @@ nxt_process_start(nxt_task_t *task, nxt_ - - cap_setid = rt->capabilities.setid; - -+ drop_caps = cap_setid; -+ - #if (NXT_HAVE_CLONE_NEWUSER) -- if (!cap_setid && NXT_CLONE_USER(init->isolation.clone.flags)) { -+ if (NXT_CLONE_USER(init->isolation.clone.flags)) { - cap_setid = 1; -+ drop_caps = 0; - } - #endif - -@@ -301,6 +304,12 @@ nxt_process_start(nxt_task_t *task, nxt_ - if (nxt_slow_path(ret != NXT_OK)) { - goto fail; - } -+ -+#if (NXT_HAVE_LINUX_CAPABILITY) -+ if (drop_caps && nxt_capability_drop_all(task) != NXT_OK) { -+ goto fail; -+ } -+#endif - } - - rt->type = init->type; \ No newline at end of file diff --git a/pkgs/servers/http/webfs/default.nix b/pkgs/servers/http/webfs/default.nix index 79c7d9e9eca1c..cb95673b5bb18 100644 --- a/pkgs/servers/http/webfs/default.nix +++ b/pkgs/servers/http/webfs/default.nix @@ -2,7 +2,7 @@ let # Let's not pull the whole apache httpd package mime_file = fetchurl { - url = https://raw.githubusercontent.com/apache/httpd/906e419c1f703360e2e8ec077b393347f993884f/docs/conf/mime.types; + url = "https://raw.githubusercontent.com/apache/httpd/906e419c1f703360e2e8ec077b393347f993884f/docs/conf/mime.types"; sha256 = "ef972fc545cbff4c0daa2b2e6b440859693b3c10435ee90f10fa6fffad800c16"; }; in @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "HTTP server for purely static content"; - homepage = http://linux.bytesex.org/misc/webfs.html; + homepage = "http://linux.bytesex.org/misc/webfs.html"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ zimbatm ]; diff --git a/pkgs/servers/http/webhook/default.nix b/pkgs/servers/http/webhook/default.nix index 707b48786483a..d40adb171a639 100644 --- a/pkgs/servers/http/webhook/default.nix +++ b/pkgs/servers/http/webhook/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with lib; { - homepage = https://github.com/adnanh/webhook; + homepage = "https://github.com/adnanh/webhook"; license = [ licenses.mit ]; description = "incoming webhook server that executes shell commands"; }; diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index 109f7bc06dcdc..1d57a951dc7b2 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high performance HTTP 1.1 server in Erlang"; - homepage = http://yaws.hyber.org; + homepage = "http://yaws.hyber.org"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ goibhniu the-kenny ]; + maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 289ae59d379bc..21e39b5f2e20b 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -89,8 +89,8 @@ stdenv.mkDerivation { postInstallCheck = ''. ${./post-install-check.sh}''; meta = { description = "enterprise-class system for sending and receiving facsimiles"; - downloadPage = https://hylafax.sourceforge.io/download.php; - homepage = https://hylafax.sourceforge.io; + downloadPage = "https://hylafax.sourceforge.io/download.php"; + homepage = "https://hylafax.sourceforge.io"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.yarny ]; platforms = lib.platforms.linux; diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix index 55ec611d60531..c7046ea8247e0 100644 --- a/pkgs/servers/icecast/default.nix +++ b/pkgs/servers/icecast/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { open standards for commuincation and interaction. ''; - homepage = http://www.icecast.org; + homepage = "http://www.icecast.org"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ jcumming ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/pkgs/servers/identd/nullidentdmod/default.nix index 8171f61c112da..4fdc7f6d50309 100644 --- a/pkgs/servers/identd/nullidentdmod/default.nix +++ b/pkgs/servers/identd/nullidentdmod/default.nix @@ -18,7 +18,7 @@ meta = with stdenv.lib; { description = "Simple identd that just replies with a random string or customized userid"; license = licenses.gpl2; - homepage = http://acidhub.click/NullidentdMod; + homepage = "http://acidhub.click/NullidentdMod"; maintainers = with maintainers; [ das_j ]; platforms = platforms.linux; # Must be run by systemd }; diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix index 85d1186f525ac..46a26a659ac1a 100644 --- a/pkgs/servers/identd/oidentd/default.nix +++ b/pkgs/servers/identd/oidentd/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "oidentd"; - version = "2.4.0"; + version = "2.5.0"; nativeBuildInputs = [ bison flex ]; src = fetchurl { url = "https://files.janikrabe.com/pub/oidentd/releases/${version}/${pname}-${version}.tar.gz"; - sha256 = "132bzlbjp437lrlxv5k9aqa1q9w5pghk02rnazg33cw6av00q2li"; + sha256 = "1d5mqlknfywbx2bgj7ap7x6qzvz257hhqcqhy6zk45dqpsirdn7a"; }; meta = with stdenv.lib; { description = "Configurable Ident protocol server"; - homepage = https://oidentd.janikrabe.com/; + homepage = "https://oidentd.janikrabe.com/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index faaad1ac7a715..099caf8796348 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "2.11.0"; + version = "2.13.1"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "1n91snf5sxsiy2r8y2nksw4ah70f70nxamy7k0ylgkpfxp4dxwb8"; + sha256 = "105mjlbzgv1c8argwgs0d9wm28m06nqi5hrk3358zg2jaa7ahaqf"; rev = "v${version}"; }; - modSha256 = "1fm3s1ksah0w86xv8xjhrbf5ia0ynfg2qgajnldy3dpdbxa3yh7s"; + vendorSha256 = "069if1ifsmdn5hrwybiifhnq6xzmdccq85mzi9v98iii18pzfwqx"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/irc/atheme/default.nix b/pkgs/servers/irc/atheme/default.nix index d7aa061024003..06119861b9f4b 100644 --- a/pkgs/servers/irc/atheme/default.nix +++ b/pkgs/servers/irc/atheme/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set of services for IRC networks"; - homepage = https://atheme.github.io/; + homepage = "https://atheme.github.io/"; license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ leo60228 ]; diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index ecbedcfbec8e6..ebc0b47f8b7bd 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "IRCv3 server designed to be highly scalable"; - homepage = https://github.com/charybdis-ircd/charybdis; + homepage = "https://github.com/charybdis-ircd/charybdis"; license = licenses.gpl2; maintainers = with maintainers; [ lassulus fpletz ]; platforms = platforms.unix; diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index cf5b572c9eb41..8b65c7870f934 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "An IPv6-capable IRC server"; platforms = stdenv.lib.platforms.unix; - homepage = http://www.ircd-hybrid.org/; + homepage = "http://www.ircd-hybrid.org/"; }; } diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix index 5194ab278bf7f..b564a9b5c9617 100644 --- a/pkgs/servers/irc/ngircd/default.nix +++ b/pkgs/servers/irc/ngircd/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Next Generation IRC Daemon"; - homepage = https://ngircd.barton.de; + homepage = "https://ngircd.barton.de"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix index c056a543aa1d7..f91b5a73b7d05 100644 --- a/pkgs/servers/irker/default.nix +++ b/pkgs/servers/irker/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "IRC client that runs as a daemon accepting notification requests"; - homepage = https://gitlab.com/esr/irker; + homepage = "https://gitlab.com/esr/irker"; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.unix; diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index 166555099588e..bb9302479e98f 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -31,7 +31,7 @@ with python2.pkgs; buildPythonApplication rec { meta = with stdenv.lib; { description = "A commenting server similar to Disqus"; - homepage = https://posativ.org/isso/; + homepage = "https://posativ.org/isso/"; license = licenses.mit; maintainers = with maintainers; [ fgaz ]; }; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 1b01ffe5d6937..aaa762836bdd0 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,12 +2,18 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.14.365"; + version = "0.16.175"; - src = fetchurl { - url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxAMDx64.tar.gz"; - sha256 = "0xvlknjhc75km12d8li50ifqpfyl6whymb6gd7ccwyd9lv9xxm27"; - }; + src = { + x86_64-linux = fetchurl { + url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxAMDx64.tar.gz"; + sha512 = "269n84qc8sfrmnidgrjywanbqr65mhkmk24dlqfi17pi0l27wi4fc4qmnjj683xwprz5hqjsmkqf963pbx4k3jaz0rp0jnizan91wij"; + }; + aarch64-linux = fetchurl { + url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxARM64.tar.gz"; + sha512 = "0dmyhprd2vi2z9q5g79psqgsc3w0zdac4s6k20rngi8jxm5jgphzrzcic4rgdijyryap99my619k447w701a08vh9sfcfk0fjg9pgwb"; + }; + }."${stdenv.targetPlatform.system}" or (throw "Missing hash for host system: ${stdenv.targetPlatform.system}"); buildInputs = [ makeWrapper ]; @@ -35,6 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Jackett/Jackett/"; license = licenses.gpl2; maintainers = with maintainers; [ edwtjo nyanloutre ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 9e79faef0f9b0..35476db921527 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnetCorePackages, ffmpeg, - fontconfig, freetype }: + fontconfig, freetype, nixosTests }: let os = if stdenv.isDarwin then "osx" else "linux"; @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.5.3"; + version = "10.5.5"; # Impossible to build anything offline with dotnet src = fetchurl { url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz"; - sha256 = "04fq3g6yddyqiixgk45x3c90zjdhkm7glahlb71fyx8ivf1qkcvs"; + sha256 = "1s3hva1j5w74qc9wyqnmr5clk4smzfi7wvx8qrzrwy81mx7r5w27"; }; buildInputs = [ @@ -49,9 +49,13 @@ in stdenv.mkDerivation rec { --add-flags "$out/opt/jellyfin/jellyfin.dll --ffmpeg ${ffmpeg}/bin/ffmpeg" ''; + passthru.tests = { + smoke-test = nixosTests.jellyfin; + }; + meta = with stdenv.lib; { description = "The Free Software Media System"; - homepage = https://jellyfin.github.io/; + homepage = "https://jellyfin.github.io/"; license = licenses.gpl2; maintainers = with maintainers; [ nyanloutre minijackson ]; }; diff --git a/pkgs/servers/kapow/default.nix b/pkgs/servers/kapow/default.nix new file mode 100644 index 0000000000000..1990dba381da1 --- /dev/null +++ b/pkgs/servers/kapow/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kapow"; + version = "0.5.3"; + + goPackagePath = "github.com/BBVA/kapow"; + + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "BBVA"; + repo = pname; + rev = "v${version}"; + sha256 = "0m5b9lvg5d908d27khyx9p3567pap1b2mxl8fk7cxhb51r89jypj"; + }; + + vendorSha256 = "159s46rhg67mgglaxgddx3k8kssl0cqiq8yjdqgjhhxppf16r7dy"; + + meta = with stdenv.lib; { + homepage = "https://github.com/BBVA/kapow"; + description = "Expose command-line tools over HTTP"; + license = licenses.asl20; + maintainers = with maintainers; [ nilp0inter ]; + }; +} diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index b5fec49b910d6..ce24cc7071fe6 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "keycloak"; - version = "9.0.2"; + version = "9.0.3"; src = fetchzip { url = "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.zip"; - sha256 = "0yavkmwhjb8i4j3g57nda77simlf1dj1m751xzbgxxq6nd0q73lw"; + sha256 = "0nlfa6wwgj04xgg4ps5gpjp4iq2lmas97y5qz61lhns1p42xr4ls"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix index bec8ccbbf18dc..e91c35538a255 100644 --- a/pkgs/servers/kippo/default.nix +++ b/pkgs/servers/kippo/default.nix @@ -49,7 +49,7 @@ let postInstall = "$out/bin/twistd --help > /dev/null"; meta = with stdenv.lib; { - homepage = https://twistedmatrix.com/; + homepage = "https://twistedmatrix.com/"; description = "Twisted, an event-driven networking engine written in Python"; longDescription = '' Twisted is an event-driven networking engine written in Python @@ -86,7 +86,7 @@ in stdenv.mkDerivation rec { passthru.twisted = twisted_13; meta = with stdenv.lib; { - homepage = https://github.com/desaster/kippo; + homepage = "https://github.com/desaster/kippo"; description = "SSH Honeypot"; longDescription = '' Default port is 2222. Recommend using something like this for port redirection to default SSH port: diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index 547a106a3987e..d401d3ada5e1d 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Official Go implementation of the Livepeer protocol"; - homepage = https://livepeer.org; + homepage = "https://livepeer.org"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ elitak ]; diff --git a/pkgs/servers/ma1sd/default.nix b/pkgs/servers/ma1sd/default.nix index f35bc3bb3024f..a4a95197d0dc9 100644 --- a/pkgs/servers/ma1sd/default.nix +++ b/pkgs/servers/ma1sd/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "a federated matrix identity server; fork of mxisd"; - homepage = https://github.com/ma1uta/ma1sd; + homepage = "https://github.com/ma1uta/ma1sd"; license = licenses.agpl3; maintainers = with maintainers; [ mguentner ]; platforms = platforms.all; diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix index 55cc4c121f0f5..962d5603e4728 100644 --- a/pkgs/servers/mail/archiveopteryx/default.nix +++ b/pkgs/servers/mail/archiveopteryx/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://archiveopteryx.org/; + homepage = "http://archiveopteryx.org/"; description = "An advanced PostgreSQL-based IMAP/POP server"; license = licenses.postgresql; maintainers = [ maintainers.phunehehe ]; diff --git a/pkgs/servers/mail/clamsmtp/default.nix b/pkgs/servers/mail/clamsmtp/default.nix index 7214c08d2427b..327e545adcea7 100644 --- a/pkgs/servers/mail/clamsmtp/default.nix +++ b/pkgs/servers/mail/clamsmtp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SMTP filter that allows to check for viruses using the ClamAV anti-virus software"; - homepage = http://thewalter.net/stef/software/clamsmtp/; + homepage = "http://thewalter.net/stef/software/clamsmtp/"; license = licenses.bsd3; maintainers = [ maintainers.ekleog ]; platforms = platforms.all; diff --git a/pkgs/servers/mail/dkimproxy/default.nix b/pkgs/servers/mail/dkimproxy/default.nix index d4bfd3c6ca577..376beac7e36fc 100644 --- a/pkgs/servers/mail/dkimproxy/default.nix +++ b/pkgs/servers/mail/dkimproxy/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SMTP-proxy that signs and/or verifies emails"; - homepage = http://dkimproxy.sourceforge.net/; + homepage = "http://dkimproxy.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = [ maintainers.ekleog ]; platforms = platforms.all; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index fd27d18b50357..a110df0fb42fe 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -9,7 +9,8 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.3.10"; + pname = "dovecot"; + version = "2.3.10.1"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -20,8 +21,8 @@ stdenv.mkDerivation rec { ++ lib.optional withSQLite sqlite; src = fetchurl { - url = "https://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "1ibiz3k2flablkcqbkvfzsjnq5b5kxximhcrplflsjl57mr88ca7"; + url = "https://dovecot.org/releases/2.3/${pname}-${version}.tar.gz"; + sha256 = "035idr2j81s5mngnhd58rih79dhwwak7q01mqbx3rcmi4cpychk6"; }; enableParallelBuilding = true; diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix index 44e2223960a20..6a0db5f8f8b41 100644 --- a/pkgs/servers/mail/dspam/default.nix +++ b/pkgs/servers/mail/dspam/default.nix @@ -99,7 +99,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = http://nuclearelephant.com/; + homepage = "http://nuclearelephant.com/"; description = "Community Driven Antispam Filter"; license = licenses.agpl3; platforms = platforms.linux; diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index dd4d1850b5963..a85cb92a3fb12 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -7,11 +7,12 @@ }: stdenv.mkDerivation rec { - name = "exim-4.92.3"; + pname = "exim"; + version = "4.93.0.4"; src = fetchurl { - url = "https://ftp.exim.org/pub/exim/exim4/${name}.tar.xz"; - sha256 = "1zfj4zblv5881qxpzkrg3f6a96pbcq270s9p6p1w85lfxjsknif4"; + url = "https://ftp.exim.org/pub/exim/exim4/fixes/${pname}-${version}.tar.xz"; + sha256 = "01g4sfycv13glnmfrapwhjbdw6z1z7w5bwjldxjmglwfw5p3czak"; }; nativeBuildInputs = [ pkgconfig ]; @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { s:^\(FIXED_NEVER_USERS\)=root$:\1=0: s:^# \(WITH_CONTENT_SCAN\)=.*:\1=yes: s:^# \(AUTH_PLAINTEXT\)=.*:\1=yes: - s:^# \(SUPPORT_TLS\)=.*:\1=yes: + s:^# \(USE_OPENSSL\)=.*:\1=yes: s:^# \(USE_OPENSSL_PC=openssl\)$:\1: s:^# \(LOG_FILE_PATH=syslog\)$:\1: s:^# \(HAVE_IPV6=yes\)$:\1: @@ -92,7 +93,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://exim.org/; + homepage = "http://exim.org/"; description = "A mail transfer agent (MTA)"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/mail/freepops/default.nix b/pkgs/servers/mail/freepops/default.nix index b4f671862f884..5f027c89af8c4 100644 --- a/pkgs/servers/mail/freepops/default.nix +++ b/pkgs/servers/mail/freepops/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "freepops-0.2.9"; src = fetchurl { - url = mirror://sourceforge/freepops/0.2.9/freepops-0.2.9.tar.gz; + url = "mirror://sourceforge/freepops/0.2.9/freepops-0.2.9.tar.gz"; sha256 = "3a065e30cafed03d9b6fdb28251ae5bf0d8aeb62181746154beecd25dc0c9cae"; }; nativeBuildInputs = [ pkgconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation { FreePOPs is an extensible pop3 server. Its main purpose is to provide a pop3 interface to a webmail. ''; - homepage = http://www.freepops.org/; + homepage = "http://www.freepops.org/"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ pierron ]; broken = true; diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix index 429d735ffcd0b..10b2306130775 100644 --- a/pkgs/servers/mail/mailhog/default.nix +++ b/pkgs/servers/mail/mailhog/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Web and API based SMTP testing"; - homepage = https://github.com/mailhog/MailHog; + homepage = "https://github.com/mailhog/MailHog"; maintainers = with maintainers; [ disassembler ]; license = licenses.mit; }; diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index d6b73aea3da55..8443a1968fdf5 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { dontWrapPythonPrograms = true; meta = { - homepage = https://www.gnu.org/software/mailman/; + homepage = "https://www.gnu.org/software/mailman/"; description = "Free software for managing electronic mail discussion and newsletter lists"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ peti ]; diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index bcb92051fc8a7..5f542b9036ead 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://www.gnu.org/software/mailman/; + homepage = "https://www.gnu.org/software/mailman/"; description = "Web-based user interface for managing GNU Mailman"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ globin peti ]; diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix index 2c1c07e502a7c..4caa9e8bfefa1 100644 --- a/pkgs/servers/mail/mlmmj/default.nix +++ b/pkgs/servers/mail/mlmmj/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://mlmmj.org; + homepage = "http://mlmmj.org"; description = "Mailing List Management Made Joyful"; maintainers = [ maintainers.edwtjo ]; platforms = platforms.linux; diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix index 7738c4eb3d4ad..6744d1ffac126 100644 --- a/pkgs/servers/mail/nullmailer/default.nix +++ b/pkgs/servers/mail/nullmailer/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://untroubled.org/nullmailer/; + homepage = "http://untroubled.org/nullmailer/"; description = '' A sendmail/qmail/etc replacement MTA for hosts which relay to a fixed set of smart relays. It is designed to be simple to configure, secure, and easily extendable. diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 76b247cfd8414..0c2cd68cb1be8 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "opensmtpd"; - version = "6.6.4p1"; + version = "6.7.0p1"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ libasr libevent zlib libressl db pam ]; src = fetchurl { url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; - sha256 = "1kyph9ycq0j21dl9n1sq5fns9p4gckdi0fmnf8awrcwrdcm9dyg2"; + sha256 = "1f8bp40ywyixflg5qbnang6l210bv4vqa1k2pgm2356bp7bmsgy1"; }; patches = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://www.opensmtpd.org/; + homepage = "https://www.opensmtpd.org/"; description = '' A free implementation of the server-side SMTP protocol as defined by RFC 5321, with some additional standard extensions diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 14d36ad65549c..6c29de8cddbc9 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "opensmtpd-extras"; - version = "6.4.0"; + version = "6.7.1"; src = fetchurl { url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; - sha256 = "09k25l7zy5ch3fk6qphni2h0rxdp8wacmfag1whi608dgimrhrnb"; + sha256 = "1b1mx71bvmv92lbm08wr2p60g3qhikvv3n15zsr6dcwbk9aqahzq"; }; nativeBuildInputs = [ pkgconfig ]; @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { " -L${libmysqlclient}/lib/mysql"; meta = with stdenv.lib; { - homepage = https://www.opensmtpd.org/; + homepage = "https://www.opensmtpd.org/"; description = "Extra plugins for the OpenSMTPD mail server"; license = licenses.isc; platforms = platforms.linux; diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix index c97d8e4ccf388..146160b79c324 100644 --- a/pkgs/servers/mail/petidomo/default.nix +++ b/pkgs/servers/mail/petidomo/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = http://petidomo.sourceforge.net/; + homepage = "http://petidomo.sourceforge.net/"; description = "A simple and easy to administer mailing list server"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/servers/mail/popa3d/default.nix b/pkgs/servers/mail/popa3d/default.nix index e14b62a859713..998dce882866d 100644 --- a/pkgs/servers/mail/popa3d/default.nix +++ b/pkgs/servers/mail/popa3d/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configurePhase = ''makeFlags="PREFIX=$out MANDIR=$out/share/man"''; meta = { - homepage = http://www.openwall.com/popa3d/; + homepage = "http://www.openwall.com/popa3d/"; description = "Tiny POP3 daemon with security as the primary goal"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index 9fb441a92de3c..40a2d7fe092d5 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { meta = { description = "A collection of postfix-related tools"; license = with lib.licenses; [ bsd3 ]; - homepage = https://github.com/Fruneau/pfixtools; + homepage = "https://github.com/Fruneau/pfixtools"; platforms = stdenv.lib.platforms.linux; maintainers = with lib.maintainers; [ jerith666 ]; }; diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/servers/mail/postfix/pflogsumm.nix index 8f85bc5f6d6d9..e6451cddec6d4 100644 --- a/pkgs/servers/mail/postfix/pflogsumm.nix +++ b/pkgs/servers/mail/postfix/pflogsumm.nix @@ -26,7 +26,7 @@ perlPackages.buildPerlPackage rec { ''; meta = { - homepage = http://jimsun.linxnet.com/postfix_contrib.html; + homepage = "http://jimsun.linxnet.com/postfix_contrib.html"; maintainers = with stdenv.lib.maintainers; [ schneefux ]; description = "Postfix activity overview"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix index 0abfc00fdd66f..dffe0191a0a49 100644 --- a/pkgs/servers/mail/postgrey/default.nix +++ b/pkgs/servers/mail/postgrey/default.nix @@ -17,7 +17,7 @@ in runCommand name { }; meta = with stdenv.lib; { description = "A postfix policy server to provide greylisting"; - homepage = https://postgrey.schweikert.ch/; + homepage = "https://postgrey.schweikert.ch/"; platforms = postfix.meta.platforms; license = licenses.gpl2; }; diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix index 49854927e57f8..845c423743228 100644 --- a/pkgs/servers/mail/postsrsd/default.nix +++ b/pkgs/servers/mail/postsrsd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake help2man ]; meta = with stdenv.lib; { - homepage = https://github.com/roehling/postsrsd; + homepage = "https://github.com/roehling/postsrsd"; description = "Postfix Sender Rewriting Scheme daemon"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/servers/mail/pypolicyd-spf/default.nix b/pkgs/servers/mail/pypolicyd-spf/default.nix index 5da94ca80269e..cbc63ff535a11 100644 --- a/pkgs/servers/mail/pypolicyd-spf/default.nix +++ b/pkgs/servers/mail/pypolicyd-spf/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://launchpad.net/pypolicyd-spf/; + homepage = "https://launchpad.net/pypolicyd-spf/"; description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; maintainers = with maintainers; [ abbradar ]; license = licenses.asl20; diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 7b9e766f246c9..7f54b97a8e825 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, perl , glib, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu -, hyperscan, jemalloc, openblas, lua, libsodium +, hyperscan, jemalloc, blas, lapack, lua, libsodium , withBlas ? true , withHyperscan ? stdenv.isx86_64 , withLuaJIT ? stdenv.isx86_64 @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig perl ]; buildInputs = [ glib openssl pcre sqlite ragel icu jemalloc libsodium ] ++ lib.optional withHyperscan hyperscan - ++ lib.optional withBlas openblas + ++ lib.optionals withBlas [ blas lapack ] ++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua; cmakeFlags = [ diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index 6980dca940356..c474c501cee80 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -33,7 +33,7 @@ perlPackages.buildPerlPackage rec { ''; meta = { - homepage = http://spamassassin.apache.org/; + homepage = "http://spamassassin.apache.org/"; description = "Open-Source Spam Filter"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 6b06a493509a2..1cb92baa93757 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.12.1"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "0l3a5dvnahrzwqh8p0cnfr019bxxgd769jk2wprfvfd65h7p0g1r"; + sha256 = "10s34h1qh9k88bxv0l0whvy7kirmx9kwgdxrz7sv3rv42cyr1989"; }; patches = [ @@ -85,7 +85,7 @@ in buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://matrix.org; + homepage = "https://matrix.org"; description = "Matrix reference homeserver"; license = licenses.asl20; maintainers = with maintainers; [ ralith roblabla ekleog pacien ma27 ]; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix index 9af470f8310f5..7de8cd858a3d8 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix @@ -13,13 +13,22 @@ let sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; }; }; - "@babel/highlight-7.8.3" = { + "@babel/helper-validator-identifier-7.9.5" = { + name = "_at_babel_slash_helper-validator-identifier"; + packageName = "@babel/helper-validator-identifier"; + version = "7.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz"; + sha512 = "/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g=="; + }; + }; + "@babel/highlight-7.9.0" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz"; - sha512 = "PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz"; + sha512 = "lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ=="; }; }; "@slack/logger-1.1.1" = { @@ -31,31 +40,31 @@ let sha512 = "PAC5CMnNAv/FPtJ0le+YD2wUV+tZ7n3Bnjj9dBI+deIcHsExCnQkQmZE79cLvfuYXbz3PWyv5coti30MJQhEjA=="; }; }; - "@slack/rtm-api-5.0.3" = { + "@slack/rtm-api-5.0.4" = { name = "_at_slack_slash_rtm-api"; packageName = "@slack/rtm-api"; - version = "5.0.3"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/rtm-api/-/rtm-api-5.0.3.tgz"; - sha512 = "rzNIFst8iuVYyHdE7e3KSrbAtIA7sfS4Pth9ObKUm5KDemX0zyI7YfAijO1kgr1EMriQkjlpKBhlNq9Y+aQr6g=="; + url = "https://registry.npmjs.org/@slack/rtm-api/-/rtm-api-5.0.4.tgz"; + sha512 = "5xXOjLPb4H8a+URLrCjnFXA62Kf4IrvSfp9KtuOxv6vTtFVvxNW4WqhWgAcxwXolD43xRuB/pikxLu76vLDTfw=="; }; }; - "@slack/types-1.5.0" = { + "@slack/types-1.6.0" = { name = "_at_slack_slash_types"; packageName = "@slack/types"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/types/-/types-1.5.0.tgz"; - sha512 = "oCYgatJYxHf9wE3tKXzOLeeTsF0ghX1TIcguNfVmO2V6NDe+cHAzZRglEOmJLdRINDS5gscAgSkeZpDhpKBeUA=="; + url = "https://registry.npmjs.org/@slack/types/-/types-1.6.0.tgz"; + sha512 = "SrrAD/ZxDN4szQ35V/mY2TvKSyGsUWP8def1C8NMg9AvdYG0VyaL5f+Dd6jw8STosMFXd3zqjekMowT9LB9/IQ=="; }; }; - "@slack/web-api-5.8.0" = { + "@slack/web-api-5.8.1" = { name = "_at_slack_slash_web-api"; packageName = "@slack/web-api"; - version = "5.8.0"; + version = "5.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.8.0.tgz"; - sha512 = "lUMFM9jtdn+9Q0kHLegf5RjIgQlmb1PGWwWdTsc9mQ8PJu2BogI5ZttG8/tA6r2bX/C4bgXhd0JJ4syUR0AAhQ=="; + url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.8.1.tgz"; + sha512 = "MONzkjWOXV39Dejo8B9WSl/F0dxcVh9wyeW6R0jf6T6BhwN4f24iErYtTh19g+MRhb0oiyeKfnFsJTSKQulfDA=="; }; }; "@types/body-parser-1.19.0" = { @@ -103,22 +112,22 @@ let sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; }; }; - "@types/express-4.17.3" = { + "@types/express-4.17.6" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.3"; + version = "4.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz"; - sha512 = "I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.6.tgz"; + sha512 = "n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w=="; }; }; - "@types/express-serve-static-core-4.17.2" = { + "@types/express-serve-static-core-4.17.6" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.2"; + version = "4.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz"; - sha512 = "El9yMpctM6tORDAiBwZVLMcxoTMcqqRO9dVyYcn7ycLWbvR8klrDn8CAOwRfZujZtWD7yS/mshTdz43jMOejbg=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.6.tgz"; + sha512 = "U2oynuRIB17GIbEdvjFrrEACOy7GQkzsX7bPEBz1H41vZYEU4j0fLL97sawmHDwHUXpUQDBMHIyM9vejqP9o1A=="; }; }; "@types/is-stream-1.1.0" = { @@ -139,13 +148,13 @@ let sha512 = "FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw=="; }; }; - "@types/mocha-5.2.7" = { + "@types/mocha-7.0.2" = { name = "_at_types_slash_mocha"; packageName = "@types/mocha"; - version = "5.2.7"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz"; - sha512 = "NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ=="; + url = "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz"; + sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w=="; }; }; "@types/nedb-1.8.9" = { @@ -157,13 +166,13 @@ let sha512 = "w9Tl3DQCkdT0Ghes+PKhe+3/pZppBXuFFpSCjPJbb2KE3DjYmUpEyCYzjrAYlT9Y1TndnbbnChzkax2h/JorVQ=="; }; }; - "@types/node-12.12.30" = { + "@types/node-13.9.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.12.30"; + version = "13.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.12.30.tgz"; - sha512 = "sz9MF/zk6qVr3pAnM0BSQvYIBK44tS75QC5N+VbWSE4DjCV/pJ+UzCW/F+vVnl7TkOPcuwQureKNtSSwjBTaMg=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz"; + sha512 = "28ci34pqk99zkrqa473xlzfms3j6nj4nl2i69ghpbjvw2mh68bd0nd2shb78i09gng4d0fj65l2njrqbdjzmhqix4fvqyiarrlkwnyk"; }; }; "@types/node-emoji-1.8.1" = { @@ -184,6 +193,15 @@ let sha512 = "eKAv5Ql6k78dh3ULCsSBxX6bFNuGjTmof5Q/T6PiECDq0Yf8IIn46jCyp3RJvCi8owaEmm3DZH1PEImjBMd/vQ=="; }; }; + "@types/qs-6.9.2" = { + name = "_at_types_slash_qs"; + packageName = "@types/qs"; + version = "6.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.2.tgz"; + sha512 = "a9bDi4Z3zCZf4Lv1X/vwnvbbDYSNz59h3i3KdyuYYN+YrLjSeJD0dnphdULDfySvUv6Exy/O0K6wX/kQpnPQ+A=="; + }; + }; "@types/randomstring-1.1.6" = { name = "_at_types_slash_randomstring"; packageName = "@types/randomstring"; @@ -238,22 +256,22 @@ let sha512 = "oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g=="; }; }; - "@types/tough-cookie-2.3.6" = { + "@types/tough-cookie-4.0.0" = { name = "_at_types_slash_tough-cookie"; packageName = "@types/tough-cookie"; - version = "2.3.6"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.6.tgz"; - sha512 = "wHNBMnkoEBiRAd3s8KTKwIuO9biFtTf0LehITzBhSco+HQI0xkXZbLOD55SW3Aqw3oUkHstkm5SPv58yaAdFPQ=="; + url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz"; + sha512 = "I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A=="; }; }; - "@types/uuid-3.4.8" = { + "@types/uuid-7.0.3" = { name = "_at_types_slash_uuid"; packageName = "@types/uuid"; - version = "3.4.8"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.8.tgz"; - sha512 = "zHWce3allXWSmRx6/AGXKCtSOA7JjeWd2L3t4aHfysNk8mouQnWCocveaT7a4IEIlPVHp81jzlnknqTgCjCLXA=="; + url = "https://registry.npmjs.org/@types/uuid/-/uuid-7.0.3.tgz"; + sha512 = "PUdqTZVrNYTNcIhLHkiaYzoOIaUi5LFg/XLerAdgvwQrUCx+oSbtoBze1AMyvYbcwzUSNC+Isl58SM4Sm/6COw=="; }; }; "@types/ws-5.1.2" = { @@ -311,13 +329,13 @@ let sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; - "ajv-6.12.0" = { + "ajv-6.12.2" = { name = "ajv"; packageName = "ajv"; - version = "6.12.0"; + version = "6.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz"; - sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz"; + sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ=="; }; }; "another-json-0.2.0" = { @@ -365,6 +383,15 @@ let sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; + "anymatch-3.1.1" = { + name = "anymatch"; + packageName = "anymatch"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz"; + sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="; + }; + }; "arg-4.1.3" = { name = "arg"; packageName = "arg"; @@ -410,13 +437,13 @@ let sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; - "assert-options-0.6.0" = { + "assert-options-0.6.2" = { name = "assert-options"; packageName = "assert-options"; - version = "0.6.0"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/assert-options/-/assert-options-0.6.0.tgz"; - sha512 = "xmBFb5sY0AO8SNihIfavR6uMhOyzq6D7RoFKJxxAditMQc876szBBQ9RQVwLi6Bm3zUoG0nexZK11Gy5TBX69A=="; + url = "https://registry.npmjs.org/assert-options/-/assert-options-0.6.2.tgz"; + sha512 = "KP9S549XptFAPGYmLRnIjQBL4/Ry8Jx5YNLQZ/l+eejqbTidBMnw4uZSAsUrzBq/lgyqDYqxcTF7cOxZb9gyEw=="; }; }; "assert-plus-1.0.0" = { @@ -545,6 +572,15 @@ let sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; + "binary-extensions-2.0.0" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz"; + sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow=="; + }; + }; "binary-search-tree-0.2.5" = { name = "binary-search-tree"; packageName = "binary-search-tree"; @@ -599,6 +635,15 @@ let sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; + "braces-3.0.2" = { + name = "braces"; + packageName = "braces"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; + }; + }; "browser-request-0.3.3" = { name = "browser-request"; packageName = "browser-request"; @@ -707,6 +752,15 @@ let sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82"; }; }; + "chokidar-3.3.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"; + sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; + }; + }; "cliui-5.0.0" = { name = "cliui"; packageName = "cliui"; @@ -950,6 +1004,15 @@ let sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; }; }; + "depd-2.0.0" = { + name = "depd"; + packageName = "depd"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; + sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; + }; + }; "destroy-1.0.4" = { name = "destroy"; packageName = "destroy"; @@ -1040,13 +1103,13 @@ let sha512 = "bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg=="; }; }; - "es-abstract-1.17.4" = { + "es-abstract-1.17.5" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.17.4"; + version = "1.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz"; - sha512 = "Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz"; + sha512 = "BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg=="; }; }; "es-to-primitive-1.2.1" = { @@ -1094,15 +1157,6 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; - "esutils-2.0.3" = { - name = "esutils"; - packageName = "esutils"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; - sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; - }; - }; "etag-1.8.1" = { name = "etag"; packageName = "etag"; @@ -1202,6 +1256,15 @@ let sha512 = "W3aa3QJEc8BS2MmdVpQiYLKHj3ijpto1gMDlsgCRSKfIUe6MwkcpODGPQ3vZfb0XvCeCqlu9CBQTN7oQri2TZQ=="; }; }; + "fill-range-7.0.1" = { + name = "fill-range"; + packageName = "fill-range"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + }; + }; "finalhandler-1.1.2" = { name = "finalhandler"; packageName = "finalhandler"; @@ -1301,6 +1364,15 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; + "fsevents-2.1.3" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; + sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; + }; + }; "function-bind-1.1.1" = { name = "function-bind"; packageName = "function-bind"; @@ -1364,6 +1436,15 @@ let sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; }; }; + "glob-parent-5.1.1" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; + sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; + }; + }; "growl-1.10.5" = { name = "growl"; packageName = "growl"; @@ -1499,6 +1580,15 @@ let sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; }; }; + "is-binary-path-2.1.0" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; + }; + }; "is-buffer-2.0.4" = { name = "is-buffer"; packageName = "is-buffer"; @@ -1526,6 +1616,15 @@ let sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; }; }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; "is-fullwidth-code-point-2.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -1535,6 +1634,15 @@ let sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; }; }; + "is-glob-4.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + }; + }; "is-my-ip-valid-1.0.0" = { name = "is-my-ip-valid"; packageName = "is-my-ip-valid"; @@ -1553,6 +1661,15 @@ let sha512 = "XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA=="; }; }; + "is-number-7.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; + }; + }; "is-property-1.0.2" = { name = "is-property"; packageName = "is-property"; @@ -1751,13 +1868,13 @@ let sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; }; }; - "log-symbols-2.2.0" = { + "log-symbols-3.0.0" = { name = "log-symbols"; packageName = "log-symbols"; - version = "2.2.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"; - sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="; + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz"; + sha512 = "dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ=="; }; }; "logform-1.10.0" = { @@ -1778,13 +1895,13 @@ let sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ=="; }; }; - "loglevel-1.6.7" = { + "loglevel-1.6.8" = { name = "loglevel"; packageName = "loglevel"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz"; - sha512 = "cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz"; + sha512 = "bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA=="; }; }; "make-error-1.3.6" = { @@ -1796,15 +1913,6 @@ let sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; - "manakin-0.5.2" = { - name = "manakin"; - packageName = "manakin"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/manakin/-/manakin-0.5.2.tgz"; - sha512 = "pfDSB7QYoVg0Io4KMV9hhPoXpj6p0uBscgtyUSKCOFZe8bqgbpStfgnKIbF/ulnr6U3ICu4OqdyxAqBgOhZwBQ=="; - }; - }; "matrix-appservice-0.4.1" = { name = "matrix-appservice"; packageName = "matrix-appservice"; @@ -1814,13 +1922,13 @@ let sha512 = "mxHr9XDOvN/p6OFrfb4kkcEjCPftnXNzMS8Lg9Cz/pDy1arfRWq11vl9pL9bjzBaAouBGLpW1JzmCR2MsW+VKA=="; }; }; - "matrix-appservice-bridge-1.11.1" = { + "matrix-appservice-bridge-1.12.2" = { name = "matrix-appservice-bridge"; packageName = "matrix-appservice-bridge"; - version = "1.11.1"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-1.11.1.tgz"; - sha512 = "xrtjxScBIx33HRkiK/5G6wkUxZ9jxF9GqTiKzM/Fn7CgMZoHVDIms3sTc7ybZKA6RHAqH68bg4Eg4JbGCtUrhw=="; + url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-1.12.2.tgz"; + sha512 = "cGD31MLi4ARnx4DIyJndIhHIsNjaWUoBMXeAbnHhvkwkdVgZ9pgA6IKKmcBCFfsNX1r/I04KjcjlKpVdmZu4VQ=="; }; }; "matrix-js-sdk-2.4.6" = { @@ -1868,22 +1976,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.43.0" = { + "mime-db-1.44.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz"; - sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"; + sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; }; }; - "mime-types-2.1.26" = { + "mime-types-2.1.27" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.26"; + version = "2.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz"; - sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz"; + sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; }; }; "minimatch-3.0.4" = { @@ -1895,15 +2003,6 @@ let sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; "minimist-1.2.5" = { name = "minimist"; packageName = "minimist"; @@ -1913,49 +2012,40 @@ let sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; - "mkdirp-0.5.1" = { + "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.1"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "mkdirp-0.5.3" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz"; - sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg=="; - }; - }; - "mocha-6.2.2" = { + "mocha-7.1.2" = { name = "mocha"; packageName = "mocha"; - version = "6.2.2"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-6.2.2.tgz"; - sha512 = "FgDS9Re79yU1xz5d+C4rv1G7QagNGHZ+iXF81hO8zY35YZZcLEsJVfFolfsqKFWunATEvNzMK0r/CwWd/szO9A=="; + url = "https://registry.npmjs.org/mocha/-/mocha-7.1.2.tgz"; + sha512 = "o96kdRKMKI3E8U0bjnfqW4QMk12MwZ4mhdBTf+B5a1q9+aq2HRnj+3ZdJu0B/ZhJeK78MgYuv6L8d/rA5AeBJA=="; }; }; - "moment-2.24.0" = { + "moment-2.25.3" = { name = "moment"; packageName = "moment"; - version = "2.24.0"; + version = "2.25.3"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; - sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; + url = "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz"; + sha512 = "PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg=="; }; }; - "morgan-1.9.1" = { + "morgan-1.10.0" = { name = "morgan"; packageName = "morgan"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz"; - sha512 = "HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA=="; + url = "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz"; + sha512 = "AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ=="; }; }; "ms-2.0.0" = { @@ -2012,13 +2102,13 @@ let sha512 = "Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw=="; }; }; - "node-environment-flags-1.0.5" = { + "node-environment-flags-1.0.6" = { name = "node-environment-flags"; packageName = "node-environment-flags"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz"; - sha512 = "VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ=="; + url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz"; + sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="; }; }; "nopt-3.0.6" = { @@ -2030,6 +2120,15 @@ let sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; }; }; + "normalize-path-3.0.0" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; + }; + }; "oauth-sign-0.9.0" = { name = "oauth-sign"; packageName = "oauth-sign"; @@ -2138,13 +2237,13 @@ let sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; }; - "p-limit-2.2.2" = { + "p-limit-2.3.0" = { name = "p-limit"; packageName = "p-limit"; - version = "2.2.2"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz"; - sha512 = "WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ=="; + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; }; "p-locate-3.0.0" = { @@ -2165,13 +2264,13 @@ let sha512 = "n8/y+yDJwBjoLQe1GSJbbaYQLTI7QHNZI2+rpmCDbe++WLf9HC3gf6iqj5yfPAV71W4UF3ql5W1+UBPXoXTxng=="; }; }; - "p-queue-6.3.0" = { + "p-queue-6.4.0" = { name = "p-queue"; packageName = "p-queue"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-6.3.0.tgz"; - sha512 = "fg5dJlFpd5+3CgG3/0ogpVZUeJbjiyXFg0nu53hrOYsybqSiDyxyOpad0Rm6tAiGjgztAwkyvhlYHC53OiAJOA=="; + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.4.0.tgz"; + sha512 = "X7ddxxiQ+bLR/CUt3/BVKrGcJDNxBr0pEEFKHHB6vTPWNUhgDv36GpIH18RmGM3YGPpBT+JWGjDDqsVGuF0ERw=="; }; }; "p-retry-4.2.0" = { @@ -2273,13 +2372,13 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "pg-7.12.1" = { + "pg-8.0.3" = { name = "pg"; packageName = "pg"; - version = "7.12.1"; + version = "8.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-7.12.1.tgz"; - sha512 = "l1UuyfEvoswYfcUe6k+JaxiN+5vkOgYcVSbSuw3FvdLqDbaoa2RJo1zfJKfPsSYPFVERd4GHvX3s2PjG1asSDA=="; + url = "https://registry.npmjs.org/pg/-/pg-8.0.3.tgz"; + sha512 = "fvcNXn4o/iq4jKq15Ix/e58q3jPSmzOp6/8C3CaHoSR/bsxdg+1FXfDRePdtE/zBb3++TytvOrS1hNef3WC/Kg=="; }; }; "pg-connection-string-0.1.3" = { @@ -2300,31 +2399,40 @@ let sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; }; }; - "pg-minify-1.5.1" = { + "pg-minify-1.5.2" = { name = "pg-minify"; packageName = "pg-minify"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.5.1.tgz"; - sha512 = "nqUTo8y9T0VhiJoWC0sK0+2S8hYDiu7CdH0Z9ijPi2iikiQ44mfcAFxEJxfvF8H3h/bDBvXthtOQPIB3pLWIow=="; + url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.5.2.tgz"; + sha512 = "uZn/gXkGmO5JBdopxNLSpFMS1lXr+KJqynI8Di1Qyr8ZVXt67ruh+XNfzLMVdLzYv+MQRdNYQdVwWPSs0qM7xQ=="; }; }; - "pg-pool-2.0.10" = { + "pg-pool-3.1.1" = { name = "pg-pool"; packageName = "pg-pool"; - version = "2.0.10"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.10.tgz"; - sha512 = "qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.1.1.tgz"; + sha512 = "kYH6S0mcZF1TPg1F9boFee2JlCSm2oqnlR2Mz2Wgn1psQbEBNVeNTJCw2wCK48QsctwvGUzbxLMg/lYV6hL/3A=="; }; }; - "pg-promise-9.3.6" = { + "pg-promise-10.5.3" = { name = "pg-promise"; packageName = "pg-promise"; - version = "9.3.6"; + version = "10.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.5.3.tgz"; + sha512 = "cfHgFpcqOc0IIRDABre//k1eda7s94Wys67P9r3q590nmvO0AzZucqWTVmgRUzNTIrDChUwY4hVOMBTIsU/ZiA=="; + }; + }; + "pg-protocol-1.2.2" = { + name = "pg-protocol"; + packageName = "pg-protocol"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/pg-promise/-/pg-promise-9.3.6.tgz"; - sha512 = "b64UalKAkUImn01z7LeG2NtTTsp0TYfqMzo1vXjO2bDAshL+kXJ2HvCyHstJ4Nj8hLeqtCe0Tar5TbB4QGUHfw=="; + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.2.2.tgz"; + sha512 = "r8hGxHOk3ccMjjmhFJ/QOSVW5A+PP84TeRlEwB/cQ9Zu+bvtZg8Z59Cx3AMfVQc9S0Z+EG+HKhicF1W1GN5Eqg=="; }; }; "pg-types-2.2.0" = { @@ -2345,6 +2453,15 @@ let sha1 = "2a7bb41b6065b67907e91da1b07c1847c877b306"; }; }; + "picomatch-2.2.2" = { + name = "picomatch"; + packageName = "picomatch"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; + sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; + }; + }; "postgres-array-2.0.0" = { name = "postgres-array"; packageName = "postgres-array"; @@ -2363,13 +2480,13 @@ let sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; }; }; - "postgres-date-1.0.4" = { + "postgres-date-1.0.5" = { name = "postgres-date"; packageName = "postgres-date"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.4.tgz"; - sha512 = "bESRvKVuTrjoBluEcpv2346+6kgB7UlnqWZsnbnCccTNq/pqfj1j6oBaN5+b/NrDXepYUT/HKadqv3iS9lJuVA=="; + url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.5.tgz"; + sha512 = "pdau6GRPERdAYUQwkBnGKxEfPyhVZXG/JiS44iZWiNdSOWE09N2lUgN6yshuq6fVSon4Pm0VMXd1srUUkLe9iA=="; }; }; "postgres-interval-1.2.0" = { @@ -2408,13 +2525,13 @@ let sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; }; }; - "psl-1.7.0" = { + "psl-1.8.0" = { name = "psl"; packageName = "psl"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz"; - sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="; + url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; }; }; "punycode-2.1.1" = { @@ -2444,13 +2561,13 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "quick-lru-4.0.1" = { + "quick-lru-5.1.0" = { name = "quick-lru"; packageName = "quick-lru"; - version = "4.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz"; - sha512 = "ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g=="; + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.0.tgz"; + sha512 = "WjAKQ9ORzvqjLijJXiXWqc3Gcs1ivoxCj6KJmEjoWBE6OtHwuaDLSAUqGHALUiid7A1KqGqsSHZs8prxF5xxAQ=="; }; }; "randomstring-1.1.5" = { @@ -2498,6 +2615,15 @@ let sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; + "readdirp-3.2.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"; + sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; + }; + }; "regenerator-runtime-0.11.1" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -2552,13 +2678,13 @@ let sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; - "resolve-1.15.1" = { + "resolve-1.17.0" = { name = "resolve"; packageName = "resolve"; - version = "1.15.1"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz"; - sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"; + sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; }; }; "retry-0.12.0" = { @@ -2678,22 +2804,22 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; - "source-map-support-0.5.16" = { + "source-map-support-0.5.19" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.16"; + version = "0.5.19"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz"; - sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ=="; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"; + sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; }; }; - "spex-3.0.0" = { + "spex-3.0.1" = { name = "spex"; packageName = "spex"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/spex/-/spex-3.0.0.tgz"; - sha512 = "JoMfgbrJcEPn53JCLkSNH1o7fZ9rzkb24UKEt5LTcsp0YsaN+yxtb5MEmibbMRltj9CdXDNGitPrYi11JY2hog=="; + url = "https://registry.npmjs.org/spex/-/spex-3.0.1.tgz"; + sha512 = "priWZUrXBmVPHTOmtUeS7gZzCOUwRK87OHJw5K8bTC6MLOq93mQocx+vWccNyKPT2EY+goZvKGguGn2lx8TBDA=="; }; }; "split-1.0.1" = { @@ -2768,22 +2894,40 @@ let sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; - "string.prototype.trimleft-2.1.1" = { + "string.prototype.trimend-1.0.1" = { + name = "string.prototype.trimend"; + packageName = "string.prototype.trimend"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; + sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; + }; + }; + "string.prototype.trimleft-2.1.2" = { name = "string.prototype.trimleft"; packageName = "string.prototype.trimleft"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz"; - sha512 = "iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag=="; + url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz"; + sha512 = "gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw=="; }; }; - "string.prototype.trimright-2.1.1" = { + "string.prototype.trimright-2.1.2" = { name = "string.prototype.trimright"; packageName = "string.prototype.trimright"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz"; - sha512 = "qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g=="; + url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; + sha512 = "ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg=="; + }; + }; + "string.prototype.trimstart-1.0.1" = { + name = "string.prototype.trimstart"; + packageName = "string.prototype.trimstart"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; + sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; }; }; "string_decoder-1.1.1" = { @@ -2876,6 +3020,15 @@ let sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; }; }; + "to-regex-range-5.0.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; + }; + }; "toidentifier-1.0.0" = { name = "toidentifier"; packageName = "toidentifier"; @@ -2903,31 +3056,31 @@ let sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; }; }; - "ts-node-8.7.0" = { + "ts-node-8.10.1" = { name = "ts-node"; packageName = "ts-node"; - version = "8.7.0"; + version = "8.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.7.0.tgz"; - sha512 = "s659CsHrsxaRVDEleuOkGvbsA0rWHtszUNEt1r0CgAFN5ZZTQtDzpsluS7W5pOGJIa1xZE8R/zK4dEs+ldFezg=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-8.10.1.tgz"; + sha512 = "bdNz1L4ekHiJul6SHtZWs1ujEKERJnHs4HxN7rjTyyVOFf3HaJ6sLqe6aPG62XTzAB/63pKRh5jTSWL0D7bsvw=="; }; }; - "tslib-1.11.1" = { + "tslib-1.11.2" = { name = "tslib"; packageName = "tslib"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz"; - sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="; + url = "https://registry.npmjs.org/tslib/-/tslib-1.11.2.tgz"; + sha512 = "tTSkux6IGPnUGUd1XAZHcpu85MOkIl5zX49pO+jfsie3eP0B6pyhOlLXm3cAC6T7s+euSDDUUV+Acop5WmtkVg=="; }; }; - "tslint-5.20.1" = { + "tslint-6.1.2" = { name = "tslint"; packageName = "tslint"; - version = "5.20.1"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz"; - sha512 = "EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg=="; + url = "https://registry.npmjs.org/tslint/-/tslint-6.1.2.tgz"; + sha512 = "UyNrLdK3E0fQG/xWNqAFAC5ugtFyPO4JJR1KyyfQAyzR8W0fTRrC91A8Wej4BntFzcvETdCSDa/4PnNYJQLYiA=="; }; }; "tsutils-2.29.0" = { @@ -3047,6 +3200,15 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; + "uuid-7.0.3" = { + name = "uuid"; + packageName = "uuid"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz"; + sha512 = "DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="; + }; + }; "vary-1.1.2" = { name = "vary"; packageName = "vary"; @@ -3173,15 +3335,6 @@ let sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; }; }; - "yargs-13.3.0" = { - name = "yargs"; - packageName = "yargs"; - version = "13.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz"; - sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA=="; - }; - }; "yargs-13.3.2" = { name = "yargs"; packageName = "yargs"; @@ -3191,15 +3344,6 @@ let sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; }; }; - "yargs-parser-13.1.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "13.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz"; - sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ=="; - }; - }; "yargs-parser-13.1.2" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -3230,26 +3374,27 @@ let }; in { - "matrix-appservice-slack-git+https://github.com/matrix-org/matrix-appservice-slack.git#1.1.0" = nodeEnv.buildNodePackage { + "matrix-appservice-slack-git+https://github.com/matrix-org/matrix-appservice-slack.git#1.2.0" = nodeEnv.buildNodePackage { name = "matrix-appservice-slack"; packageName = "matrix-appservice-slack"; - version = "1.1.0"; + version = "1.2.0"; src = fetchgit { url = "https://github.com/matrix-org/matrix-appservice-slack.git"; - rev = "62b2a05c99bbefb0b268adc8b0fedfe91a4f76bd"; - sha256 = "64e930cecb11de9df3cb03367a22ff7dc78d44b7f992d9379fae8b692bf35157"; + rev = "2967f02484a3cdb386336b328438ec65fa8be382"; + sha256 = "bc7f87744046561d8dcd5b75d2469950f11ceac9d6d69a49eac4e05354f34834"; }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/highlight-7.8.3" + sources."@babel/helper-validator-identifier-7.9.5" + sources."@babel/highlight-7.9.0" sources."@slack/logger-1.1.1" - (sources."@slack/rtm-api-5.0.3" // { + (sources."@slack/rtm-api-5.0.4" // { dependencies = [ sources."p-queue-2.4.2" ]; }) - sources."@slack/types-1.5.0" - (sources."@slack/web-api-5.8.0" // { + sources."@slack/types-1.6.0" + (sources."@slack/web-api-5.8.1" // { dependencies = [ sources."p-queue-2.4.2" ]; @@ -3259,40 +3404,42 @@ in sources."@types/chai-4.2.11" sources."@types/connect-3.4.33" sources."@types/events-3.0.0" - sources."@types/express-4.17.3" - sources."@types/express-serve-static-core-4.17.2" + sources."@types/express-4.17.6" + sources."@types/express-serve-static-core-4.17.6" sources."@types/is-stream-1.1.0" sources."@types/mime-2.0.1" - sources."@types/mocha-5.2.7" + sources."@types/mocha-7.0.2" sources."@types/nedb-1.8.9" - sources."@types/node-12.12.30" + sources."@types/node-13.9.3" sources."@types/node-emoji-1.8.1" sources."@types/p-queue-2.3.2" + sources."@types/qs-6.9.2" sources."@types/randomstring-1.1.6" sources."@types/range-parser-1.2.3" sources."@types/request-2.48.4" sources."@types/request-promise-native-1.0.17" sources."@types/retry-0.12.0" sources."@types/serve-static-1.13.3" - sources."@types/tough-cookie-2.3.6" - sources."@types/uuid-3.4.8" + sources."@types/tough-cookie-4.0.0" + sources."@types/uuid-7.0.3" sources."@types/ws-5.1.2" sources."@types/yargs-13.0.8" sources."@types/yargs-parser-13.1.0" sources."Slackdown-git://github.com/Half-Shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."another-json-0.2.0" sources."ansi-colors-3.2.3" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" + sources."anymatch-3.1.1" sources."arg-4.1.3" sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."array-uniq-1.0.2" sources."asn1-0.2.4" - sources."assert-options-0.6.0" + sources."assert-options-0.6.2" sources."assert-plus-1.0.0" sources."assertion-error-1.1.0" sources."async-0.2.10" @@ -3306,6 +3453,7 @@ in sources."base-x-3.0.8" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" + sources."binary-extensions-2.0.0" sources."binary-search-tree-0.2.5" sources."bintrees-1.0.1" sources."bluebird-2.11.0" @@ -3315,6 +3463,7 @@ in ]; }) sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."browser-request-0.3.3" sources."browser-stdout-1.3.1" sources."bs58-4.0.1" @@ -3331,6 +3480,7 @@ in ]; }) sources."check-error-1.0.2" + sources."chokidar-3.3.0" sources."cliui-5.0.0" sources."color-3.0.0" sources."color-convert-1.9.3" @@ -3365,12 +3515,11 @@ in sources."enabled-1.0.2" sources."encodeurl-1.0.2" sources."env-variable-0.0.6" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-2.0.0" sources."esprima-4.0.1" - sources."esutils-2.0.3" sources."etag-1.8.1" sources."eventemitter3-3.1.2" (sources."express-4.17.1" // { @@ -3385,6 +3534,7 @@ in sources."fast-safe-stringify-2.0.7" sources."fecha-2.3.3" sources."file-stream-rotator-0.4.1" + sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { dependencies = [ sources."debug-2.6.9" @@ -3399,6 +3549,7 @@ in sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" + sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" @@ -3406,6 +3557,7 @@ in sources."get-func-name-2.0.0" sources."getpass-0.1.7" sources."glob-7.1.3" + sources."glob-parent-5.1.1" sources."growl-1.10.5" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -3421,12 +3573,16 @@ in sources."inherits-2.0.3" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.3.2" + sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" sources."is-callable-1.1.5" sources."is-date-object-1.0.2" + sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-4.0.1" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.0" + sources."is-number-7.0.0" sources."is-property-1.0.2" sources."is-regex-1.0.5" sources."is-stream-1.1.0" @@ -3449,17 +3605,16 @@ in sources."locate-path-3.0.0" sources."lodash-4.17.15" sources."lodash.toarray-4.4.0" - sources."log-symbols-2.2.0" + sources."log-symbols-3.0.0" (sources."logform-2.1.2" // { dependencies = [ sources."ms-2.1.2" ]; }) - sources."loglevel-1.6.7" + sources."loglevel-1.6.8" sources."make-error-1.3.6" - sources."manakin-0.5.2" sources."matrix-appservice-0.4.1" - sources."matrix-appservice-bridge-1.11.1" + sources."matrix-appservice-bridge-1.12.2" (sources."matrix-js-sdk-2.4.6" // { dependencies = [ sources."bluebird-3.5.5" @@ -3469,39 +3624,37 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.3" - (sources."mocha-6.2.2" // { + sources."mkdirp-0.5.5" + (sources."mocha-7.1.2" // { dependencies = [ sources."debug-3.2.6" sources."escape-string-regexp-1.0.5" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" sources."ms-2.1.1" sources."supports-color-6.0.0" - sources."yargs-13.3.0" - sources."yargs-parser-13.1.1" ]; }) - sources."moment-2.24.0" - (sources."morgan-1.9.1" // { + sources."moment-2.25.3" + (sources."morgan-1.10.0" // { dependencies = [ sources."debug-2.6.9" + sources."depd-2.0.0" ]; }) sources."ms-2.0.0" sources."nedb-1.8.0" sources."negotiator-0.6.2" sources."node-emoji-1.10.0" - (sources."node-environment-flags-1.0.5" // { + (sources."node-environment-flags-1.0.6" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."nopt-3.0.6" + sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" sources."object-hash-1.3.1" sources."object-inspect-1.7.0" @@ -3514,9 +3667,9 @@ in sources."one-time-0.0.4" sources."p-cancelable-1.1.0" sources."p-finally-1.0.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" - (sources."p-queue-6.3.0" // { + (sources."p-queue-6.4.0" // { dependencies = [ sources."eventemitter3-4.0.0" ]; @@ -3532,41 +3685,45 @@ in sources."path-to-regexp-0.1.7" sources."pathval-1.1.0" sources."performance-now-2.1.0" - sources."pg-7.12.1" + sources."pg-8.0.3" sources."pg-connection-string-0.1.3" sources."pg-int8-1.0.1" - sources."pg-minify-1.5.1" - sources."pg-pool-2.0.10" - sources."pg-promise-9.3.6" + sources."pg-minify-1.5.2" + sources."pg-pool-3.1.1" + sources."pg-promise-10.5.3" + sources."pg-protocol-1.2.2" sources."pg-types-2.2.0" sources."pgpass-1.0.2" + sources."picomatch-2.2.2" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" - sources."postgres-date-1.0.4" + sources."postgres-date-1.0.5" sources."postgres-interval-1.2.0" sources."process-nextick-args-2.0.1" sources."prom-client-11.5.3" sources."proxy-addr-2.0.6" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.7.0" - sources."quick-lru-4.0.1" + sources."quick-lru-5.1.0" sources."randomstring-1.1.5" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."readable-stream-3.6.0" + sources."readdirp-3.2.0" sources."regenerator-runtime-0.11.1" (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" sources."qs-6.5.2" + sources."uuid-3.4.0" ]; }) sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."retry-0.12.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -3586,8 +3743,8 @@ in sources."setprototypeof-1.1.1" sources."simple-swizzle-0.2.2" sources."source-map-0.6.1" - sources."source-map-support-0.5.16" - sources."spex-3.0.0" + sources."source-map-support-0.5.19" + sources."spex-3.0.1" sources."split-1.0.1" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -3595,8 +3752,10 @@ in sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."string-width-3.1.0" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.0" @@ -3608,16 +3767,17 @@ in sources."tdigest-0.1.1" sources."text-hex-1.0.0" sources."through-2.3.8" + sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" sources."triple-beam-1.3.0" - (sources."ts-node-8.7.0" // { + (sources."ts-node-8.10.1" // { dependencies = [ sources."diff-4.0.2" ]; }) - sources."tslib-1.11.1" - (sources."tslint-5.20.1" // { + sources."tslib-1.11.2" + (sources."tslint-6.1.2" // { dependencies = [ sources."diff-4.0.2" sources."semver-5.7.1" @@ -3635,7 +3795,7 @@ in sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.4.0" + sources."uuid-7.0.3" sources."vary-1.1.2" sources."verror-1.10.0" sources."which-1.3.1" @@ -3689,4 +3849,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json index 8fb44891dd423..a197abdda2e78 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json @@ -1,3 +1,3 @@ [ - {"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.1.0" } + {"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.2.0" } ] diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index 1f39278de6256..7f1868af4c357 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { version = "1.17.1"; goPackagePath = "github.com/42wim/matterbridge"; - modSha256 = "1mqp8dlwa4p70iv9ksq3pxx5zbxdh56xyksvd98zk0vkrz4f1rij"; + vendorSha256 = null; src = fetchurl { url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz"; @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = with maintainers; [ ryantm ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 00f74e7a01ec5..6327921aaac8e 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -50,7 +50,7 @@ in meta = with stdenv.lib; { description = "Open-source, self-hosted Slack-alternative"; - homepage = https://www.mattermost.org; + homepage = "https://www.mattermost.org"; license = with licenses; [ agpl3 asl20 ]; maintainers = with maintainers; [ fpletz ryantm ]; platforms = platforms.unix; diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index f5f624c06d9e2..1b64fb73184b3 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/tulir/mautrix-telegram; + homepage = "https://github.com/tulir/mautrix-telegram"; description = "A Matrix-Telegram hybrid puppeting/relaybot bridge"; license = licenses.agpl3Plus; platforms = platforms.linux; diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 0b4aff676fe85..1ee491acebefd 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,20 +1,22 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, olm }: buildGoModule { pname = "mautrix-whatsapp-unstable"; - version = "2020-04-02"; + version = "2020-05-21"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; - rev = "064b5b8fedb6896d04509aa0e094a8d9f83426c2"; - sha256 = "1xky31x5jk7yxh875nk20vvsn9givy6vxdqhqg5qwf4xjj2zqh2p"; + rev = "b4949eec5982643502bb9787cf5e2872a78807c1"; + sha256 = "1hjqxqfza6r7fsxr4fgwhfdwjzligxk416692xi4pavd5krfxxmd"; }; - modSha256 = "0qcxxhfp3fkx90r3lwhi0lkzg3digwrnxk8cack11k717szg7zrd"; + buildInputs = [ olm ]; + + vendorSha256 = "0ix65b48cpx6vkqmjizzij7zl8h2kjkfsa0s42vnmjdlmsv7yn42"; meta = with stdenv.lib; { - homepage = https://github.com/tulir/mautrix-whatsapp; + homepage = "https://github.com/tulir/mautrix-whatsapp"; description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge"; license = licenses.agpl3; maintainers = with maintainers; [ vskilet ma27 ]; diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index 33151c4063b3d..17bfdef2a30de 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { pkgconfig autoreconfHook ]; meta = with stdenv.lib; { - homepage = http://mediatomb.cc; - repositories.git = git://mediatomb.git.sourceforge.net/gitroot/mediatomb/mediatomb; + homepage = "http://mediatomb.cc"; + repositories.git = "git://mediatomb.git.sourceforge.net/gitroot/mediatomb/mediatomb"; description = "UPnP MediaServer with a web user interface"; license = licenses.gpl2; maintainers = [ maintainers.phreedom ]; diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index 3088ee190e772..4c5521e97bb5a 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -35,9 +35,9 @@ buildGoPackage { ''; installPhase = '' - mkdir -p $bin/bin $bin/share/meguca - cp meguca $bin/bin - cp -r www $bin/share/meguca + mkdir -p $out/bin $out/share/meguca + cp meguca $out/bin + cp -r www $out/share/meguca ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index c6c8ddbfbed65..58276ff8632d7 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.3"; + version = "1.6.6"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "0h0mlg3xz1y889xj6lcsb4sz9bar1birc2wzjf7x4ig31qib6r0w"; + sha256 = "1xrj7vy05nc6bky4wnrmrbxfibvk5vq4dp2fwk4jk4amzbn0x3wh"; }; configureFlags = [ @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A distributed memory object caching system"; - repositories.git = https://github.com/memcached/memcached.git; + repositories.git = "https://github.com/memcached/memcached.git"; homepage = "http://memcached.org/"; license = licenses.bsd3; maintainers = [ maintainers.coconnor ]; diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index b2e040748ab36..5d50f8c9b0c8c 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.35.1"; + version = "0.35.3"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1c8mxadf8siakhgdkbw5d8r6ph9lqxrw5wlrrc8a5ycp43h0z226"; + sha256 = "1iax99id47a8mkdyr5wp2dwvl0d1lfh9gsamd1m0qpxw9mbvpkbq"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index b6abec241a5eb..ddf7a972c2eb8 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }: let - version = "1.9.3"; + version = "1.10.2"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { pname = "meteor"; src = fetchurl { url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; - sha256 = "1njp2db939w3ah5k943bkgm62k969fj47qwmlzvhmmg87xwnq3fb"; + sha256 = "17s1n92nznasaaprvxg289a1fcizq2nj51xqw7akgw5f77q19vmw"; }; #dontStrip = true; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index dd06c358358bc..43c4125097016 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -20,12 +20,12 @@ buildGoPackage rec { ''; postInstall = '' - mv $bin/bin/miniflux.app $bin/bin/miniflux + mv $out/bin/miniflux.app $out/bin/miniflux ''; meta = with stdenv.lib; { description = "Minimalist and opinionated feed reader"; - homepage = https://miniflux.app/; + homepage = "https://miniflux.app/"; license = licenses.asl20; maintainers = with maintainers; [ rvolosatovs benpye ]; }; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 953cc9fb77cdb..9f9796b3a5e6a 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -1,24 +1,26 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "minio"; - version = "2020-03-25T07-03-04Z"; + version = "2020-05-01T22-19-14Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "0xdflc7pfx1misbh695x8kmqpysi5iydsarr9mwmjragf5b1kbl5"; + sha256 = "0yyq5j82rcl8yhn2jg8sjfxii6kzbrbmxvb05yiwv7p0q42ag5rn"; }; - modSha256 = "09kbibsfa7qq55paqr7wcs4gpwk6g5pknc5fjssmd12nm2cji96k"; + vendorSha256 = "15yx5nkyf424v42glg3cx0gkqckdfv1xn25570s9cwf8zid0zlxd"; subPackages = [ "." ]; buildFlagsArray = [''-ldflags= - -X github.com/minio/minio/cmd.Version=${version} + -s -w -X github.com/minio/minio/cmd.Version=${version} '']; + passthru.tests.minio = nixosTests.minio; + meta = with stdenv.lib; { homepage = "https://www.minio.io/"; description = "An S3-compatible object storage server"; @@ -26,4 +28,4 @@ buildGoModule rec { platforms = platforms.unix; license = licenses.asl20; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index d8501878435bb..852b5350bbae3 100644 --- a/pkgs/servers/misc/airsonic/default.nix +++ b/pkgs/servers/misc/airsonic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "airsonic"; - version = "10.5.0"; + version = "10.6.2"; src = fetchurl { url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war"; - sha256 = "0nja33x3qh8zylqc7dn6x8j1wyxf7pzf9vdg9rzaq1hl6mi573jq"; + sha256 = "0q3qnqymj3gaa6n79pvbyidn1ga99lpngp5wvhlw1aarg1m7vccl"; }; buildCommand = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Personal media streamer"; - homepage = https://airsonic.github.io; + homepage = "https://airsonic.github.io"; license = stdenv.lib.licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ disassembler ]; diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/servers/misc/subsonic/default.nix index a7041fc57d053..9f7559872b9f1 100644 --- a/pkgs/servers/misc/subsonic/default.nix +++ b/pkgs/servers/misc/subsonic/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://subsonic.org; + homepage = "http://subsonic.org"; description = "Personal media streamer"; license = licenses.unfree; maintainers = with maintainers; [ telotortium ]; diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix index 0ab921a6f6f8c..e5024e6694ef2 100644 --- a/pkgs/servers/misc/taskserver/default.nix +++ b/pkgs/servers/misc/taskserver/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Server for synchronising Taskwarrior clients"; - homepage = https://taskwarrior.org; + homepage = "https://taskwarrior.org"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ matthiasbeyer makefu ]; diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index 957bb59b12144..22c741024b218 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with lib; { description = "Time Series Alerting Framework"; license = licenses.mit; - homepage = https://bosun.org; + homepage = "https://bosun.org"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 715a52ec99c26..426dd2ad2a239 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Analyzes resource usage and performance characteristics of running docker containers"; - homepage = https://github.com/google/cadvisor; + homepage = "https://github.com/google/cadvisor"; license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = platforms.linux; diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index cafccfeb8f28c..9bece7cb2e0b8 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "An extendable open source continuous integration server"; - homepage = https://github.com/AcalephStorage/consul-alerts; + homepage = "https://github.com/AcalephStorage/consul-alerts"; # As per README platforms = platforms.linux ++ platforms.freebsd ++ platforms.darwin; license = licenses.gpl2; diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix index 572535b7fcd04..1d6bb7198e5b4 100644 --- a/pkgs/servers/monitoring/do-agent/default.nix +++ b/pkgs/servers/monitoring/do-agent/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { -X main.version=${version} ''; - modSha256 = "164bwqg996097db399j7lar6gj9xpshjdmyapvzg7zh655xlkf3d"; + vendorSha256 = null; meta = with lib; { description = "DigitalOcean droplet system metrics agent"; @@ -25,9 +25,9 @@ buildGoModule rec { metrics from a DigitalOcean Droplet (on which the program runs) and sends them to DigitalOcean to provide resource usage graphs and alerting. ''; - homepage = https://github.com/digitalocean/do-agent; + homepage = "https://github.com/digitalocean/do-agent"; license = licenses.asl20; maintainers = with maintainers; [ yvt ]; platforms = platforms.linux; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index 27e3cfdab9d11..42b07e605a0b3 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -17,12 +17,12 @@ perlPackages.buildPerlPackage rec { ./remove_software_test.patch # support for os-release file (fetchurl { - url = https://github.com/fusioninventory/fusioninventory-agent/pull/396.diff; + url = "https://github.com/fusioninventory/fusioninventory-agent/pull/396.diff"; sha256 = "0bxrjmff80ab01n23xggci32ajsah6zvcmz5x4hj6ayy6dzwi6jb"; }) # support for Nix software inventory (fetchurl { - url = https://github.com/fusioninventory/fusioninventory-agent/pull/397.diff; + url = "https://github.com/fusioninventory/fusioninventory-agent/pull/397.diff"; sha256 = "0pyf7mp0zsb3zcqb6yysr1zfp54p9ciwjn1pzayw6s9flmcgrmbw"; }) ]; @@ -85,7 +85,7 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; meta = with stdenv.lib; { - homepage = http://www.fusioninventory.org; + homepage = "http://www.fusioninventory.org"; description = "FusionInventory unified Agent for UNIX, Linux, Windows and MacOSX"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.phile314 ]; diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix index 502ff10b0929a..d6f3c28d82b6f 100644 --- a/pkgs/servers/monitoring/grafana-reporter/default.nix +++ b/pkgs/servers/monitoring/grafana-reporter/default.nix @@ -19,13 +19,13 @@ buildGoPackage rec { }; postInstall = '' - wrapProgram $bin/bin/grafana-reporter \ + wrapProgram $out/bin/grafana-reporter \ --prefix PATH : ${makeBinPath [ tetex ]} ''; meta = { description = "PDF report generator from a Grafana dashboard"; - homepage = https://github.com/IzakMarais/reporter; + homepage = "https://github.com/IzakMarais/reporter"; license = licenses.mit; maintainers = with maintainers; [ disassembler ]; }; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index ac50717208aae..23a8bdc601400 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,10 +1,8 @@ -{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomJsSupport ? false, phantomjs2 ? null }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "grafana"; - version = "6.7.2"; - - goPackagePath = "github.com/grafana/grafana"; + version = "7.0.0"; excludedPackages = [ "release_publisher" ]; @@ -12,27 +10,25 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "03f6f9caxphrfbps0ljwwiq246vfjlznd8xs7a7va7kb823ff5li"; + sha256 = "1xicqsn8qg2wwp7p3p3643vqvpp6fbzpx1x7w0mgv9l2va9px8mq"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0sgpc34jfldi0hkbqx9idkzm1n1jy82yhg29kdsvndxvi44z49lv"; + sha256 = "1x6b61rsflj9dbj0r9wj1wgp4lqwa1q21s3x7ws50scqhq1m3xmk"; }; + vendorSha256 = "00xvpxhnvxdf030978paywl794mlmgqzd94b64hh67946acnbjcl"; + postPatch = '' substituteInPlace pkg/cmd/grafana-server/main.go \ --replace 'var version = "5.0.0"' 'var version = "${version}"' ''; - preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; - postInstall = '' tar -xvf $srcStatic - mkdir -p $bin/share/grafana - mv grafana-*/{public,conf,tools} $bin/share/grafana/ - '' + lib.optionalString phantomJsSupport '' - ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/tools/phantomjs/phantomjs + mkdir -p $out/share/grafana + mv grafana-*/{public,conf,tools} $out/share/grafana/ ''; meta = with lib; { diff --git a/pkgs/servers/monitoring/heapster/default.nix b/pkgs/servers/monitoring/heapster/default.nix index 39c0485763880..2460cc633ebe1 100644 --- a/pkgs/servers/monitoring/heapster/default.nix +++ b/pkgs/servers/monitoring/heapster/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { meta = with lib; { description = "Compute Resource Usage Analysis and Monitoring of Container Clusters"; license = licenses.asl20; - homepage = https://github.com/kubernetes/heapster; + homepage = "https://github.com/kubernetes/heapster"; maintainers = with maintainers; [ offline ]; platforms = docker.meta.platforms; }; diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix index f33a418fe5cea..93f0531887c14 100644 --- a/pkgs/servers/monitoring/kapacitor/default.nix +++ b/pkgs/servers/monitoring/kapacitor/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kapacitor"; - version = "1.5.1"; + version = "1.5.4"; goPackagePath = "github.com/influxdata/kapacitor"; @@ -10,14 +10,14 @@ buildGoPackage rec { owner = "influxdata"; repo = "kapacitor"; rev = "v${version}"; - sha256 = "17f3my1zmqmcx7qqhdcq8n73l60bsxnnxqgvnw0cnf0xsa5g1yks"; + sha256 = "1sd0gwqwa2bk81lshs8cy49mk1nh4azjkk0283rh0rkimy90l0zz"; }; meta = with lib; { description = "Open source framework for processing, monitoring, and alerting on time series data"; license = licenses.mit; - homepage = https://influxdata.com/time-series-platform/kapacitor/; - maintainers = with maintainers; [offline]; + homepage = "https://influxdata.com/time-series-platform/kapacitor/"; + maintainers = with maintainers; [ offline ]; platforms = with platforms; linux; }; } diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index cc67bdfa56db6..e469ee6b40822 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig -, doxygen, freetype, libX11, libftdi, libusb, libusb1, ncurses, perl }: +, doxygen, freetype, libX11, libftdi, libusb-compat-0_1, libusb1, ncurses, perl }: stdenv.mkDerivation rec { pname = "lcdproc"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "--with-pidfile-dir=/run" ]; - buildInputs = [ freetype libX11 libftdi libusb libusb1 ncurses ]; + buildInputs = [ freetype libX11 libftdi libusb-compat-0_1 libusb1 ncurses ]; nativeBuildInputs = [ autoreconfHook doxygen makeWrapper pkgconfig ]; # In 0.5.9: gcc: error: libbignum.a: No such file or directory @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Client/server suite for controlling a wide variety of LCD devices"; - homepage = http://lcdproc.org/; + homepage = "http://lcdproc.org/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index a4117d923e372..668695aa8df2e 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }: buildGoPackage rec { - version = "1.4.0"; + version = "1.5.0"; pname = "grafana-loki"; goPackagePath = "github.com/grafana/loki"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "0dz0icbkwpmysl5jyljmj783xdzrbbxbfxfkizw7gcs8jjxbqvfl"; + sha256 = "137lnd69p8qfg2z8l32dr1mrk2lhrxjx392xfij11sy5i9blfc3n"; }; postPatch = '' @@ -24,7 +24,7 @@ buildGoPackage rec { buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ]; preFixup = stdenv.lib.optionalString stdenv.isLinux '' - wrapProgram $bin/bin/promtail \ + wrapProgram $out/bin/promtail \ --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" ''; diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index 5459d58ceb9f8..c5c284b7f02f7 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.linode.com/longview; + homepage = "https://www.linode.com/longview"; description = "Longview collects all of your system-level metrics and sends them to Linode"; license = licenses.gpl2Plus; maintainers = [ maintainers.rvl ]; diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index 64966e183feaf..d701a7ca001e5 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "04hzr0cw0dq7hmqvp1lhm5wl239yrxmcpsl25sqk74wy06cgrrqd"; }; - modSha256 = "0h3q1qd9a01wlfkk0yv74a4bk5nilpsppq522cv7kl8ysnrjh5yi"; + vendorSha256 = "1km3ldqz35lpkglp9n332vxr38xxfqyij1fi2qq0agyyydbvakj5"; subPackages = [ "cmd/mtail" ]; preBuild = '' @@ -27,4 +27,4 @@ buildGoModule rec { homepage = "https://github.com/google/mtail"; description = "Tool for extracting metrics from application logs"; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 02a81bfe33cc9..ecbed520bbdc4 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.59"; + version = "2.0.61"; pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "1i28ba53gh9z0mb3fk0y3cb88wh73qdlbg7rl5g9mc6iwqrbvg97"; + sha256 = "0gjbz8zdj1rdx2azgpdh64isna0l77wm42gr1jhwb5an3lf6sgxs"; }; buildInputs = [ diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 006d91ef74eb7..b8246c27b47de 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nagios"; - version = "4.4.5"; + version = "4.4.6"; src = fetchurl { url = "mirror://sourceforge/nagios/nagios-4.x/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "079rgi3dqdg6h511c96hrch62rxsap9p4x37hm2nj672zb9f4sdz"; + sha256 = "1x5hb97zbvkm73q53ydp1gwj8nnznm72q9c4rm6ny7phr995l3db"; }; patches = [ ./nagios.patch ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A host, service and network monitoring program"; - homepage = https://www.nagios.org/; + homepage = "https://www.nagios.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice relrod ]; diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index ed2abbc7fc8a0..160907d58fa69 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = let fetchAlpinePatch = name: sha256: fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/net-snmp/${name}?id=f25d3fb08341b60b6ccef424399f060dfcf3f1a5"; + url = "https://git.alpinelinux.org/aports/plain/main/net-snmp/${name}?id=f25d3fb08341b60b6ccef424399f060dfcf3f1a5"; inherit name sha256; }; in [ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Clients and server for the SNMP network monitoring protocol"; - homepage = http://net-snmp.sourceforge.net/; + homepage = "http://net-snmp.sourceforge.net/"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix index 2dc1bdf9681c4..9413b5e73b6c4 100644 --- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix +++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "System-wide monitoring for newrelic"; - homepage = https://newrelic.com/; + homepage = "https://newrelic.com/"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ lnl7 ]; diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index f72fa16cd1228..8f1c08bebd88c 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -78,7 +78,7 @@ _EOF meta = { description = "Official monitoring plugins for Nagios/Icinga/Sensu and others."; - homepage = https://www.monitoring-plugins.org; + homepage = "https://www.monitoring-plugins.org"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice relrod ]; diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix index dfa13c805e59a..897d6395f95a7 100644 --- a/pkgs/servers/monitoring/plugins/esxi.nix +++ b/pkgs/servers/monitoring/plugins/esxi.nix @@ -30,7 +30,7 @@ in python2Packages.buildPythonApplication rec { propagatedBuildInputs = with python2Packages; [ pywbem ]; meta = with stdenv.lib; { - homepage = https://www.claudiokuenzler.com/nagios-plugins/; + homepage = "https://www.claudiokuenzler.com/nagios-plugins/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index a703c80b61a40..8464d4f1b2f83 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -43,7 +43,7 @@ let ''; meta = with stdenv.lib; { - homepage = https://labs.consol.de/; + homepage = "https://labs.consol.de/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; inherit description; diff --git a/pkgs/servers/monitoring/plugins/uptime.nix b/pkgs/servers/monitoring/plugins/uptime.nix index 9b4f3144a372c..d4861309fe581 100644 --- a/pkgs/servers/monitoring/plugins/uptime.nix +++ b/pkgs/servers/monitoring/plugins/uptime.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Uptime check plugin for Sensu/Nagios/others"; - homepage = https://github.com/madrisan/nagios-plugins-uptime; + homepage = "https://github.com/madrisan/nagios-plugins-uptime"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 759d2abfad094..9402fa44eed27 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -1,4 +1,4 @@ -{ stdenv, go, buildGoPackage, fetchFromGitHub }: +{ stdenv, go, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "alertmanager"; @@ -24,14 +24,16 @@ buildGoPackage rec { -X ${t}.GoVersion=${stdenv.lib.getVersion go} ''; + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' - mkdir -p $bin/etc/bash_completion.d - $NIX_BUILD_TOP/go/bin/amtool --completion-script-bash > $bin/etc/bash_completion.d/amtool_completion.sh + $out/bin/amtool --completion-script-bash > amtool.bash + installShellCompletion amtool.bash ''; meta = with stdenv.lib; { description = "Alert dispatcher for the Prometheus monitoring system"; - homepage = https://github.com/prometheus/alertmanager; + homepage = "https://github.com/prometheus/alertmanager"; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz globin ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix index 07c8a14ce0b32..d27fd094aa661 100644 --- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Prometheus exporter for bind9 server"; - homepage = https://github.com/digitalocean/bind_exporter; + homepage = "https://github.com/digitalocean/bind_exporter"; license = licenses.asl20; maintainers = with maintainers; [ rtreffer ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index ce4bacfc9b7c2..95b6c0640344c 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Relay server for exporting metrics from collectd to Prometheus"; - homepage = https://github.com/prometheus/collectd_exporter; + homepage = "https://github.com/prometheus/collectd_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index aaee2e8d770d0..4267d8d34c118 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -15,7 +15,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Prometheus exporter for Consul metrics"; - homepage = https://github.com/prometheus/consul_exporter; + homepage = "https://github.com/prometheus/consul_exporter"; license = licenses.asl20; maintainers = with maintainers; [ hectorj ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index d0b413a10a01d..c0b161954b26b 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,13 +1,13 @@ { lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage }: let - version = "2.17.1"; + version = "2.18.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "0ai9l7gx25x5m07617c0cjzwxknywwq822fn2q5b850hvs48whyv"; + sha256 = "0ixgjp3j9dkdb0vv5n83h8w48xgi70m83im660z97y7mflr5s2cf"; }; webui = mkYarnPackage { @@ -54,9 +54,9 @@ in buildGoPackage rec { ''; preInstall = '' - mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus" - cp -a $src/documentation/* $bin/share/doc/prometheus - cp -a $src/console_libraries $src/consoles $bin/etc/prometheus + mkdir -p "$out/share/doc/prometheus" "$out/etc/prometheus" + cp -a $src/documentation/* $out/share/doc/prometheus + cp -a $src/console_libraries $src/consoles $out/etc/prometheus ''; doCheck = true; diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index c8013e6bc15c7..43c63e24dfcb4 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -11,7 +11,7 @@ buildGoModule rec { rev = "v${version}"; }; - modSha256 = "1ag1k0z35zkazaxj8hh2wxfj73xg63xdybfm1565il2vxs5986dh"; + vendorSha256 = "1dqpa180pbdi2gcmp991d4cry560mx5rm5l9x065s9n9gnd38hvl"; meta = with stdenv.lib; { inherit (src.meta) homepage; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ willibutz globin ma27 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index 95b0db7dbc608..997b8784a1c5c 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Prometheus Exporter for FRITZ!Box (TR64 and UPnP)"; - homepage = https://github.com/ndecker/fritzbox_exporter; + homepage = "https://github.com/ndecker/fritzbox_exporter"; license = licenses.asl20; maintainers = with maintainers; [ bachp flokli ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index 4a84db38f78d9..aaff022df89fa 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "HAProxy Exporter for the Prometheus monitoring system"; - homepage = https://github.com/prometheus/haproxy_exporter; + homepage = "https://github.com/prometheus/haproxy_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix index ca1dc83e96add..05e0d4cb079f6 100644 --- a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix +++ b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/prometheus/jmx_exporter; + homepage = "https://github.com/prometheus/jmx_exporter"; description = "A process for exposing JMX Beans via HTTP for Prometheus consumption"; license = licenses.asl20; maintainers = [ maintainers.offline ]; diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix index 4d92532c90e1b..c020817edc059 100644 --- a/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -23,7 +23,7 @@ buildGoPackage { meta = with lib; { description = "A prometheus exporter which scrapes remote JSON by JSONPath"; - homepage = https://github.com/kawamuray/prometheus-json-exporter; + homepage = "https://github.com/kawamuray/prometheus-json-exporter"; license = licenses.asl20; maintainers = with maintainers; [ willibutz ]; }; diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix index 1e29eefba2b21..f845a6ef25678 100644 --- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage { pname = "mailexporter"; @@ -15,9 +15,11 @@ buildGoPackage { goDeps = ./mail-exporter_deps.nix; + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' - install -D -m 0444 -t $bin/share/man/man1 $src/man/mailexporter.1 - install -D -m 0444 -t $bin/share/man/man5 $src/man/mailexporter.conf.5 + installManPage $src/man/mailexporter.1 + installManPage $src/man/mailexporter.conf.5 ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index 04fbc7fbed93c..ce04046280511 100644 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Export Mesos metrics to Prometheus"; - homepage = https://github.com/prometheus/mesos_exporter; + homepage = "https://github.com/prometheus/mesos_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix index 12341eee911ed..0c357a768b554 100644 --- a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix @@ -11,7 +11,7 @@ buildGoModule rec { rev = "3b33400d24abcfdc07dc31c15ca5ba7b82de444f"; }; - modSha256 = "1cqjn6j3dfq51ssjx0qrajprlac1h0lb1r4af44lfpigzmrfyi07"; + vendorSha256 = "0i5x4d3ra0s41knmybbg8gnjxgraxkid6y3gfkjwa65xcbp7hr7q"; meta = with stdenv.lib; { inherit (src.meta) homepage; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ mmilata ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix index 7d46077380274..c329050d4d1ae 100644 --- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A Prometheus exporter for Minio cloud storage server"; - homepage = https://github.com/joe-pll/minio-exporter; + homepage = "https://github.com/joe-pll/minio-exporter"; license = licenses.asl20; maintainers = with maintainers; [ bachp ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index f5c438a87dc11..3ef947b28738e 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Prometheus exporter for MySQL server metrics"; - homepage = https://github.com/prometheus/mysqld_exporter; + homepage = "https://github.com/prometheus/mysqld_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley globin ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 857a7667c13fb..584382b47b73d 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -25,7 +25,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Prometheus exporter for machine metrics"; - homepage = https://github.com/prometheus/node_exporter; + homepage = "https://github.com/prometheus/node_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz globin ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 8202a8c8c29f3..b5a9334325246 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -43,7 +43,7 @@ buildGoPackage rec { ]; postInstall = optionalString withSystemdSupport '' - wrapProgram $bin/bin/postfix_exporter \ + wrapProgram $out/bin/postfix_exporter \ --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" ''; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index c101e55bc871d..101a53e7bb3ad 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Tool to scrape a Prometheus client and dump the result as JSON"; - homepage = https://github.com/prometheus/prom2json; + homepage = "https://github.com/prometheus/prom2json"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 0a707519c64ee..1425fccdca4b0 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -29,7 +29,7 @@ buildGoPackage rec { doInstallCheck = true; installCheckPhase = '' - export PATH=$PATH:$bin/bin + export PATH=$PATH:$out/bin pushgateway --help @@ -41,7 +41,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Allows ephemeral and batch jobs to expose metrics to Prometheus"; - homepage = https://github.com/prometheus/pushgateway; + homepage = "https://github.com/prometheus/pushgateway"; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index c6af09743ce9e..915a481ad0f4b 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -18,7 +18,7 @@ buildGoPackage { meta = with stdenv.lib; { description = "Prometheus exporter for RabbitMQ"; - homepage = https://github.com/kbudde/rabbitmq_exporter; + homepage = "https://github.com/kbudde/rabbitmq_exporter"; license = licenses.mit; maintainers = with maintainers; [ ocharles ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index 612066edb6d4b..ed2ed29ab8988 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "SNMP Exporter for Prometheus"; - homepage = https://github.com/prometheus/snmp_exporter; + homepage = "https://github.com/prometheus/snmp_exporter"; license = licenses.asl20; maintainers = with maintainers; [ oida willibutz ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index f4aa8344f7779..cc6b55cac220b 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Receives StatsD-style metrics and exports them to Prometheus"; - homepage = https://github.com/prometheus/statsd_exporter; + homepage = "https://github.com/prometheus/statsd_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley ivan ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix index 07b5055831e7b..8502b76f708a8 100644 --- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -15,7 +15,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Arris Surfboard signal metrics exporter"; - homepage = https://github.com/ipstatic/surfboard_exporter; + homepage = "https://github.com/ipstatic/surfboard_exporter"; license = licenses.mit; maintainers = with maintainers; [ disassembler ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/tor-exporter.nix b/pkgs/servers/monitoring/prometheus/tor-exporter.nix index ef971ce04746f..9fa7988468780 100644 --- a/pkgs/servers/monitoring/prometheus/tor-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/tor-exporter.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Prometheus exporter that exposes metrics from a Tor daemon"; - homepage = https://github.com/atx/prometheus-tor_exporter; + homepage = "https://github.com/atx/prometheus-tor_exporter"; license = licenses.mit; maintainers = with maintainers; [ delroth ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix index 5682c3ccd2a07..b4f58d789f6f1 100644 --- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Prometheus exporter that exposes metrics from a Ubiquiti UniFi Controller and UniFi devices"; - homepage = https://github.com/mdlayher/unifi_exporter; + homepage = "https://github.com/mdlayher/unifi_exporter"; license = licenses.mit; maintainers = with maintainers; [ bachp globin ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index d776756719507..640730e3ca00d 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prometheus_varnish_exporter"; - version = "1.5.2"; + version = "unstable-2020-03-26"; src = fetchFromGitHub { owner = "jonnenauha"; repo = "prometheus_varnish_exporter"; - rev = version; - sha256 = "0rpabw6a6paavv62f0gzhax9brzcgkly27rhkf0ihw8736gkw8ar"; + rev = "f0f90fc69723de8b716cda16cb419e8a025130ff"; + sha256 = "1viiiyvhpr7cnf8ykaaq4fzgg9xvn4hnlhv7cagy3jkjlmz60947"; }; - modSha256 = "0w1zg9jc2466srx9pdckw7rzn7ma4pbd0617b1h98v364wjzgj72"; + vendorSha256 = "1h9iz3sbz02hb8827hcssqlfg2ag3ymq38siffw9wzajslzhp9sx"; nativeBuildInputs = [ makeWrapper ]; @@ -28,4 +28,4 @@ buildGoModule rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ MostAwesomeDude willibutz ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/prometheus/webui-package.json b/pkgs/servers/monitoring/prometheus/webui-package.json index 5ae33ae62dfa9..64ac8689bbdfa 100644 --- a/pkgs/servers/monitoring/prometheus/webui-package.json +++ b/pkgs/servers/monitoring/prometheus/webui-package.json @@ -34,7 +34,7 @@ "react-copy-to-clipboard": "^5.0.1", "react-dom": "^16.7.0", "react-resize-detector": "^4.2.1", - "react-scripts": "^3.4.0", + "react-scripts": "3.4.0", "react-test-renderer": "^16.9.0", "reactstrap": "^8.0.1", "sanitize-html": "^1.20.1", @@ -71,7 +71,6 @@ "@types/sinon": "^7.5.0", "@typescript-eslint/eslint-plugin": "2.x", "@typescript-eslint/parser": "2.x", - "babel-eslint": "10.x", "enzyme": "^3.10.0", "enzyme-adapter-react-16": "^1.15.1", "eslint": "6.x", diff --git a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix index 0d8652982cd33..5eed837c910af 100644 --- a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix +++ b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix @@ -10,11 +10,11 @@ }; } { - name = "_babel_compat_data___compat_data_7.8.5.tgz"; + name = "_babel_compat_data___compat_data_7.9.0.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.8.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.8.5.tgz"; - sha1 = "d28ce872778c23551cbb9432fc68d28495b613b9"; + name = "_babel_compat_data___compat_data_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.0.tgz"; + sha1 = "04815556fc90b0c174abd2c0c1bb966faa036a6c"; }; } { @@ -26,11 +26,27 @@ }; } { - name = "_babel_generator___generator_7.8.4.tgz"; + name = "_babel_core___core_7.9.0.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.4.tgz"; - sha1 = "35bbc74486956fe4251829f9f6c48330e8d0985e"; + name = "_babel_core___core_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz"; + sha1 = "ac977b538b77e132ff706f3b8a4dbad09c03c56e"; + }; + } + { + name = "_babel_generator___generator_7.9.0.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.0.tgz"; + sha1 = "0f67adea4ec39dad6e63345f70eec33014d78c89"; + }; + } + { + name = "_babel_generator___generator_7.9.4.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.9.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.4.tgz"; + sha1 = "12441e90c3b3c4159cdecf312075bf1a8ce2dbce"; }; } { @@ -50,43 +66,51 @@ }; } { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.8.3.tgz"; + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.9.0.tgz"; + path = fetchurl { + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.0.tgz"; + sha1 = "066d80262ade488f9c1b1823ce5db88a4cedaa43"; + }; + } + { + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.9.0.tgz"; path = fetchurl { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.8.3.tgz"; - sha1 = "dee98d7d79cc1f003d80b76fe01c7f8945665ff6"; + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz"; + sha1 = "16bf391990b57732700a3278d4d9a81231ea8d32"; }; } { - name = "_babel_helper_call_delegate___helper_call_delegate_7.8.3.tgz"; + name = "_babel_helper_call_delegate___helper_call_delegate_7.8.7.tgz"; path = fetchurl { - name = "_babel_helper_call_delegate___helper_call_delegate_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz"; - sha1 = "de82619898aa605d409c42be6ffb8d7204579692"; + name = "_babel_helper_call_delegate___helper_call_delegate_7.8.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz"; + sha1 = "28a279c2e6c622a6233da548127f980751324cab"; }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.4.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.7.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.4.tgz"; - sha1 = "03d7ecd454b7ebe19a254f76617e61770aed2c88"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz"; + sha1 = "dac1eea159c0e4bd46e309b5a1b04a66b53c1dde"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.3.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.6.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.3.tgz"; - sha1 = "5b94be88c255f140fd2c10dd151e7f98f4bff397"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.6.tgz"; + sha1 = "243a5b46e2f8f0f674dc1387631eb6b28b851de0"; }; } { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.3.tgz"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.8.tgz"; path = fetchurl { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.3.tgz"; - sha1 = "c774268c95ec07ee92476a3862b75cc2839beb79"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz"; + sha1 = "5d84180b588f560b7864efaeea89243e58312087"; }; } { @@ -146,11 +170,11 @@ }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.8.3.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.9.0.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.8.3.tgz"; - sha1 = "d305e35d02bee720fbc2c3c3623aa0c316c01590"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz"; + sha1 = "43b34dfe15961918707d247327431388e9fe96e5"; }; } { @@ -186,11 +210,11 @@ }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.8.3.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.8.6.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.3.tgz"; - sha1 = "91192d25f6abbcd41da8a989d4492574fb1530bc"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.8.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz"; + sha1 = "5ada744fd5ad73203bf1d67459a27dcba67effc8"; }; } { @@ -210,6 +234,14 @@ }; } { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.0.tgz"; + path = fetchurl { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz"; + sha1 = "ad53562a7fc29b3b9a91bbf7d10397fd146346ed"; + }; + } + { name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; path = fetchurl { name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; @@ -218,27 +250,35 @@ }; } { - name = "_babel_helpers___helpers_7.8.4.tgz"; + name = "_babel_helpers___helpers_7.9.2.tgz"; + path = fetchurl { + name = "_babel_helpers___helpers_7.9.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz"; + sha1 = "b42a81a811f1e7313b88cba8adc66b3d9ae6c09f"; + }; + } + { + name = "_babel_highlight___highlight_7.9.0.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.4.tgz"; - sha1 = "754eb3ee727c165e0a240d6c207de7c455f36f73"; + name = "_babel_highlight___highlight_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz"; + sha1 = "4e9b45ccb82b79607271b2979ad82c7b68163079"; }; } { - name = "_babel_highlight___highlight_7.8.3.tgz"; + name = "_babel_parser___parser_7.9.4.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz"; - sha1 = "28f173d04223eaaa59bc1d439a3836e6d1265797"; + name = "_babel_parser___parser_7.9.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz"; + sha1 = "68a35e6b0319bbc014465be43828300113f2f2e8"; }; } { - name = "_babel_parser___parser_7.8.4.tgz"; + name = "_babel_parser___parser_7.9.2.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz"; - sha1 = "d1dbe64691d60358a974295fa53da074dd2ce8e8"; + name = "_babel_parser___parser_7.9.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.2.tgz"; + sha1 = "4e767f424b479c514077544484d1f9bdba7f1158"; }; } { @@ -298,11 +338,11 @@ }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.8.3.tgz"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz"; - sha1 = "eb5ae366118ddca67bed583b53d7554cad9951bb"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz"; + sha1 = "a28993699fc13df165995362693962ba6b061d6f"; }; } { @@ -314,19 +354,19 @@ }; } { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.8.3.tgz"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz"; - sha1 = "ae10b3214cb25f7adb1f3bc87ba42ca10b7e2543"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz"; + sha1 = "31db16b154c39d6b8a645292472b98394c292a58"; }; } { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.3.tgz"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.8.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz"; - sha1 = "b646c3adea5f98800c9ab45105ac34d06cd4a47f"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz"; + sha1 = "ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"; }; } { @@ -466,11 +506,11 @@ }; } { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.8.3.tgz"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.9.2.tgz"; path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.3.tgz"; - sha1 = "46fd7a9d2bb9ea89ce88720477979fe0d71b21b8"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.9.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz"; + sha1 = "8603fc3cc449e31fdbdbc257f67717536a11af8d"; }; } { @@ -482,11 +522,11 @@ }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.3.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.8.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.3.tgz"; - sha1 = "20ddfbd9e4676906b1056ee60af88590cc7aaa0b"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz"; + sha1 = "fadb2bc8e90ccaf5658de6f8d4d22ff6272a2f4b"; }; } { @@ -514,19 +554,19 @@ }; } { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.8.3.tgz"; + name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.8.3.tgz"; - sha1 = "da705a655466b2a9b36046b57bf0cbcd53551bd4"; + name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.9.0.tgz"; + sha1 = "8a3538aa40434e000b8f44a3c5c9ac7229bd2392"; }; } { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.8.4.tgz"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.4.tgz"; - sha1 = "6fe8eae5d6875086ee185dd0b098a8513783b47d"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz"; + sha1 = "0f260e27d3e29cd1bb3128da5e76c761aa6c108e"; }; } { @@ -554,35 +594,35 @@ }; } { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.8.3.tgz"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz"; - sha1 = "65606d44616b50225e76f5578f33c568a0b876a5"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz"; + sha1 = "19755ee721912cf5bb04c07d50280af3484efef4"; }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.8.3.tgz"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz"; - sha1 = "df251706ec331bd058a34bdd72613915f82928a5"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz"; + sha1 = "e3e72f4cbc9b4a260e30be0ea59bdf5a39748940"; }; } { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.8.3.tgz"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz"; - sha1 = "d8bbf222c1dbe3661f440f2f00c16e9bb7d0d420"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz"; + sha1 = "e9fd46a296fc91e009b64e07ddaa86d6f0edeb90"; }; } { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.8.3.tgz"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz"; - sha1 = "592d578ce06c52f5b98b02f913d653ffe972661a"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz"; + sha1 = "e909acae276fec280f9b821a5f38e1f08b480697"; }; } { @@ -610,11 +650,11 @@ }; } { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.4.tgz"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.8.tgz"; path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.4.tgz"; - sha1 = "1d5155de0b65db0ccf9971165745d3bb990d77d3"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.8.tgz"; + sha1 = "0381de466c85d5404565243660c4496459525daf"; }; } { @@ -626,11 +666,11 @@ }; } { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.8.3.tgz"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.8.3.tgz"; - sha1 = "784c25294bddaad2323eb4ff0c9f4a3f6c87d6bc"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.9.0.tgz"; + sha1 = "a75abc936a3819edec42d3386d9f1c93f28d9d9e"; }; } { @@ -642,35 +682,43 @@ }; } { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.8.3.tgz"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.9.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.9.0.tgz"; + sha1 = "3c2a130727caf00c2a293f0aed24520825dbf754"; + }; + } + { + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.8.3.tgz"; - sha1 = "c4f178b2aa588ecfa8d077ea80d4194ee77ed702"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz"; + sha1 = "f4f26a325820205239bb915bad8e06fcadabb49b"; }; } { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.8.3.tgz"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.8.3.tgz"; - sha1 = "951e75a8af47f9f120db731be095d2b2c34920e0"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz"; + sha1 = "89ef93025240dd5d17d3122294a093e5e0183de0"; }; } { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.8.3.tgz"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.9.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.8.3.tgz"; - sha1 = "4220349c0390fdefa505365f68c103562ab2fc4a"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.9.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.1.tgz"; + sha1 = "d03af29396a6dc51bfa24eefd8005a9fd381152a"; }; } { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.3.tgz"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz"; - sha1 = "b31031e8059c07495bf23614c97f3d9698bc6ec8"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz"; + sha1 = "5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"; }; } { @@ -682,11 +730,11 @@ }; } { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.8.3.tgz"; + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.8.3.tgz"; - sha1 = "c0153bc0a5375ebc1f1591cb7eea223adea9f169"; + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz"; + sha1 = "45468c0ae74cc13204e1d3b1f4ce6ee83258af0b"; }; } { @@ -730,11 +778,11 @@ }; } { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.8.3.tgz"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.3.tgz"; - sha1 = "be6f01a7ef423be68e65ace1f04fc407e6d88917"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.0.tgz"; + sha1 = "8b52649c81cb7dee117f760952ab46675a258836"; }; } { @@ -746,59 +794,83 @@ }; } { - name = "_babel_preset_env___preset_env_7.8.4.tgz"; + name = "_babel_preset_env___preset_env_7.9.0.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.4.tgz"; - sha1 = "9dac6df5f423015d3d49b6e9e5fa3413e4a72c4e"; + name = "_babel_preset_env___preset_env_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.0.tgz"; + sha1 = "a5fc42480e950ae8f5d9f8f2bbc03f52722df3a8"; }; } { - name = "_babel_preset_react___preset_react_7.8.3.tgz"; + name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; path = fetchurl { - name = "_babel_preset_react___preset_react_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.8.3.tgz"; - sha1 = "23dc63f1b5b0751283e04252e78cf1d6589273d2"; + name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; + sha1 = "13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"; }; } { - name = "_babel_preset_typescript___preset_typescript_7.8.3.tgz"; + name = "_babel_preset_react___preset_react_7.9.1.tgz"; path = fetchurl { - name = "_babel_preset_typescript___preset_typescript_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.8.3.tgz"; - sha1 = "90af8690121beecd9a75d0cc26c6be39d1595d13"; + name = "_babel_preset_react___preset_react_7.9.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.1.tgz"; + sha1 = "b346403c36d58c3bb544148272a0cefd9c28677a"; }; } { - name = "_babel_runtime___runtime_7.8.4.tgz"; + name = "_babel_preset_typescript___preset_typescript_7.9.0.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz"; - sha1 = "d79f5a2040f7caa24d53e563aad49cbc05581308"; + name = "_babel_preset_typescript___preset_typescript_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz"; + sha1 = "87705a72b1f0d59df21c179f7c3d2ef4b16ce192"; }; } { - name = "_babel_template___template_7.8.3.tgz"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.9.2.tgz"; path = fetchurl { - name = "_babel_template___template_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz"; - sha1 = "e02ad04fe262a657809327f578056ca15fd4d1b8"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.9.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz"; + sha1 = "26fe4aa77e9f1ecef9b776559bbb8e84d34284b7"; }; } { - name = "_babel_traverse___traverse_7.8.4.tgz"; + name = "_babel_runtime___runtime_7.9.0.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.4.tgz"; - sha1 = "f0845822365f9d5b0e312ed3959d3f827f869e3c"; + name = "_babel_runtime___runtime_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.0.tgz"; + sha1 = "337eda67401f5b066a6f205a3113d4ac18ba495b"; }; } { - name = "_babel_types___types_7.8.3.tgz"; + name = "_babel_runtime___runtime_7.9.2.tgz"; path = fetchurl { - name = "_babel_types___types_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz"; - sha1 = "5a383dffa5416db1b73dedffd311ffd0788fb31c"; + name = "_babel_runtime___runtime_7.9.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz"; + sha1 = "d90df0583a3a252f09aaa619665367bae518db06"; + }; + } + { + name = "_babel_template___template_7.8.6.tgz"; + path = fetchurl { + name = "_babel_template___template_7.8.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz"; + sha1 = "86b22af15f828dfb086474f964dcc3e39c43ce2b"; + }; + } + { + name = "_babel_traverse___traverse_7.9.0.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz"; + sha1 = "d3882c2830e513f4fe4cec9fe76ea1cc78747892"; + }; + } + { + name = "_babel_types___types_7.9.0.tgz"; + path = fetchurl { + name = "_babel_types___types_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz"; + sha1 = "00b064c3df83ad32b2dbf5ff07312b15c7f1efb5"; }; } { @@ -850,11 +922,11 @@ }; } { - name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.8.tgz"; + name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.9.tgz"; path = fetchurl { - name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.8.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.8.tgz"; - sha1 = "cb6d4dd3aeec45b6ff2d48c812317a6627618511"; + name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.9.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.9.tgz"; + sha1 = "c865b9286c707407effcec99958043711367cd02"; }; } { @@ -994,11 +1066,11 @@ }; } { - name = "_reach_router___router_1.3.1.tgz"; + name = "_reach_router___router_1.3.3.tgz"; path = fetchurl { - name = "_reach_router___router_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/@reach/router/-/router-1.3.1.tgz"; - sha1 = "0a49f75fa9621323d6e21c803447bcfcde1713b2"; + name = "_reach_router___router_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/@reach/router/-/router-1.3.3.tgz"; + sha1 = "58162860dce6c9449d49be86b0561b5ef46d80db"; }; } { @@ -1154,11 +1226,11 @@ }; } { - name = "_types_babel__core___babel__core_7.1.5.tgz"; + name = "_types_babel__core___babel__core_7.1.6.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.5.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.5.tgz"; - sha1 = "e4d84704b4df868b3ad538365a13da2fa6dbc023"; + name = "_types_babel__core___babel__core_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.6.tgz"; + sha1 = "16ff42a5ae203c9af1c6e190ed1f30f83207b610"; }; } { @@ -1186,11 +1258,19 @@ }; } { - name = "_types_cheerio___cheerio_0.22.16.tgz"; + name = "_types_cheerio___cheerio_0.22.17.tgz"; path = fetchurl { - name = "_types_cheerio___cheerio_0.22.16.tgz"; - url = "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.16.tgz"; - sha1 = "c748a97b8a6f781b04bbda4a552e11b35bcc77e4"; + name = "_types_cheerio___cheerio_0.22.17.tgz"; + url = "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.17.tgz"; + sha1 = "e54f71c3135f71ebc16c8dc62edad533872c9e72"; + }; + } + { + name = "_types_color_name___color_name_1.1.1.tgz"; + path = fetchurl { + name = "_types_color_name___color_name_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz"; + sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"; }; } { @@ -1306,11 +1386,11 @@ }; } { - name = "_types_jquery___jquery_3.3.32.tgz"; + name = "_types_jquery___jquery_3.3.33.tgz"; path = fetchurl { - name = "_types_jquery___jquery_3.3.32.tgz"; - url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.32.tgz"; - sha1 = "93e27fdc45dd38ee07f2f0acf34b59c1ccee036f"; + name = "_types_jquery___jquery_3.3.33.tgz"; + url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.33.tgz"; + sha1 = "61d9cbd4004ffcdf6cf7e34720a87a5625a7d8e9"; }; } { @@ -1338,19 +1418,19 @@ }; } { - name = "_types_node___node_13.7.4.tgz"; + name = "_types_node___node_13.9.2.tgz"; path = fetchurl { - name = "_types_node___node_13.7.4.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-13.7.4.tgz"; - sha1 = "76c3cb3a12909510f52e5dc04a6298cdf9504ffd"; + name = "_types_node___node_13.9.2.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-13.9.2.tgz"; + sha1 = "ace1880c03594cc3e80206d96847157d8e7fa349"; }; } { - name = "_types_node___node_12.12.28.tgz"; + name = "_types_node___node_12.12.30.tgz"; path = fetchurl { - name = "_types_node___node_12.12.28.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-12.12.28.tgz"; - sha1 = "3a2b5f8d21f96ace690a8832ae9779114612575f"; + name = "_types_node___node_12.12.30.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-12.12.30.tgz"; + sha1 = "3501e6f09b954de9c404671cefdbcc5d9d7c45f6"; }; } { @@ -1378,11 +1458,11 @@ }; } { - name = "_types_reach__router___reach__router_1.3.0.tgz"; + name = "_types_reach__router___reach__router_1.3.1.tgz"; path = fetchurl { - name = "_types_reach__router___reach__router_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.0.tgz"; - sha1 = "4c05a947ccecca05c72bb335a0f7bb43fec12446"; + name = "_types_reach__router___reach__router_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.1.tgz"; + sha1 = "ca8b431acb12bb897d2b806f6fdd815f056d6d02"; }; } { @@ -1418,35 +1498,35 @@ }; } { - name = "_types_react___react_16.9.21.tgz"; + name = "_types_react___react_16.9.25.tgz"; path = fetchurl { - name = "_types_react___react_16.9.21.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.21.tgz"; - sha1 = "99e274e2ecfab6bb93920e918341daa3198b348d"; + name = "_types_react___react_16.9.25.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.25.tgz"; + sha1 = "6ae2159b40138c792058a23c3c04fd3db49e929e"; }; } { - name = "_types_reactstrap___reactstrap_8.4.1.tgz"; + name = "_types_reactstrap___reactstrap_8.4.2.tgz"; path = fetchurl { - name = "_types_reactstrap___reactstrap_8.4.1.tgz"; - url = "https://registry.yarnpkg.com/@types/reactstrap/-/reactstrap-8.4.1.tgz"; - sha1 = "6dff4d1fdf59233877925e3caec406272050b632"; + name = "_types_reactstrap___reactstrap_8.4.2.tgz"; + url = "https://registry.yarnpkg.com/@types/reactstrap/-/reactstrap-8.4.2.tgz"; + sha1 = "e7066d0e67e2924dab0a52c6aedcf922f2be53b6"; }; } { - name = "_types_sanitize_html___sanitize_html_1.20.2.tgz"; + name = "_types_sanitize_html___sanitize_html_1.22.0.tgz"; path = fetchurl { - name = "_types_sanitize_html___sanitize_html_1.20.2.tgz"; - url = "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-1.20.2.tgz"; - sha1 = "59777f79f015321334e3a9f28882f58c0a0d42b8"; + name = "_types_sanitize_html___sanitize_html_1.22.0.tgz"; + url = "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-1.22.0.tgz"; + sha1 = "9bf3a13aeab6e38d130d8ba34bb443956b75bc3d"; }; } { - name = "_types_sinon___sinon_7.5.1.tgz"; + name = "_types_sinon___sinon_7.5.2.tgz"; path = fetchurl { - name = "_types_sinon___sinon_7.5.1.tgz"; - url = "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.5.1.tgz"; - sha1 = "d27b81af0d1cfe1f9b24eebe7a24f74ae40f5b7c"; + name = "_types_sinon___sinon_7.5.2.tgz"; + url = "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.5.2.tgz"; + sha1 = "5e2f1d120f07b9cda07e5dedd4f3bf8888fccdb9"; }; } { @@ -1490,35 +1570,35 @@ }; } { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.20.0.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.24.0.tgz"; path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.20.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.20.0.tgz"; - sha1 = "a522d0e1e4898f7c9c6a8e1ed3579b60867693fa"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.24.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.24.0.tgz"; + sha1 = "a86cf618c965a462cddf3601f594544b134d6d68"; }; } { - name = "_typescript_eslint_experimental_utils___experimental_utils_2.20.0.tgz"; + name = "_typescript_eslint_experimental_utils___experimental_utils_2.24.0.tgz"; path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_2.20.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.20.0.tgz"; - sha1 = "3b6fa5a6b8885f126d5a4280e0d44f0f41e73e32"; + name = "_typescript_eslint_experimental_utils___experimental_utils_2.24.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.24.0.tgz"; + sha1 = "a5cb2ed89fedf8b59638dc83484eb0c8c35e1143"; }; } { - name = "_typescript_eslint_parser___parser_2.20.0.tgz"; + name = "_typescript_eslint_parser___parser_2.24.0.tgz"; path = fetchurl { - name = "_typescript_eslint_parser___parser_2.20.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.20.0.tgz"; - sha1 = "608e5bb06ba98a415b64ace994c79ab20f9772a9"; + name = "_typescript_eslint_parser___parser_2.24.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.24.0.tgz"; + sha1 = "2cf0eae6e6dd44d162486ad949c126b887f11eb8"; }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_2.20.0.tgz"; + name = "_typescript_eslint_typescript_estree___typescript_estree_2.24.0.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_2.20.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.20.0.tgz"; - sha1 = "90a0f5598826b35b966ca83483b1a621b1a4d0c9"; + name = "_typescript_eslint_typescript_estree___typescript_estree_2.24.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.24.0.tgz"; + sha1 = "38bbc8bb479790d2f324797ffbcdb346d897c62a"; }; } { @@ -1690,14 +1770,6 @@ }; } { - name = "abbrev___abbrev_1.1.1.tgz"; - path = fetchurl { - name = "abbrev___abbrev_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; - sha1 = "f8f2c887ad10bf67f634f005b6987fed3179aac8"; - }; - } - { name = "accepts___accepts_1.3.7.tgz"; path = fetchurl { name = "accepts___accepts_1.3.7.tgz"; @@ -1714,11 +1786,11 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; + name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz"; - sha1 = "294adb71b57398b0680015f0a38c563ee1db5384"; + name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; + sha1 = "4c66069173d6fdd68ed85239fc256226182b2ebe"; }; } { @@ -1730,27 +1802,27 @@ }; } { - name = "acorn___acorn_5.7.3.tgz"; + name = "acorn___acorn_5.7.4.tgz"; path = fetchurl { - name = "acorn___acorn_5.7.3.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz"; - sha1 = "67aa231bf8812974b85235a96771eb6bd07ea279"; + name = "acorn___acorn_5.7.4.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz"; + sha1 = "3e8d8a9947d0599a1796d10225d7432f4a4acf5e"; }; } { - name = "acorn___acorn_6.4.0.tgz"; + name = "acorn___acorn_6.4.1.tgz"; path = fetchurl { - name = "acorn___acorn_6.4.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz"; - sha1 = "b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"; + name = "acorn___acorn_6.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz"; + sha1 = "531e58ba3f51b9dacb9a6646ca4debf5b14ca474"; }; } { - name = "acorn___acorn_7.1.0.tgz"; + name = "acorn___acorn_7.1.1.tgz"; path = fetchurl { - name = "acorn___acorn_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz"; - sha1 = "949d36f2c292535da602283586c2477c57eb2d6c"; + name = "acorn___acorn_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz"; + sha1 = "e35668de0b402f359de515c5482a1ab9f89a69bf"; }; } { @@ -1802,11 +1874,11 @@ }; } { - name = "ajv___ajv_6.11.0.tgz"; + name = "ajv___ajv_6.12.0.tgz"; path = fetchurl { - name = "ajv___ajv_6.11.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz"; - sha1 = "c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"; + name = "ajv___ajv_6.12.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz"; + sha1 = "06d60b96d87b8454a5adaba86e7854da629db4b7"; }; } { @@ -1834,11 +1906,11 @@ }; } { - name = "ansi_escapes___ansi_escapes_4.3.0.tgz"; + name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; path = fetchurl { - name = "ansi_escapes___ansi_escapes_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz"; - sha1 = "a4ce2b33d6b214b7950d8595c212f12ac9cc569d"; + name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; + sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61"; }; } { @@ -1898,6 +1970,14 @@ }; } { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz"; + sha1 = "90ae75c424d008d2624c5bf29ead3177ebfcf359"; + }; + } + { name = "anymatch___anymatch_2.0.0.tgz"; path = fetchurl { name = "anymatch___anymatch_2.0.0.tgz"; @@ -1922,14 +2002,6 @@ }; } { - name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; - path = fetchurl { - name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; - }; - } - { name = "argparse___argparse_1.0.10.tgz"; path = fetchurl { name = "argparse___argparse_1.0.10.tgz"; @@ -2050,11 +2122,11 @@ }; } { - name = "array.prototype.find___array.prototype.find_2.1.0.tgz"; + name = "array.prototype.find___array.prototype.find_2.1.1.tgz"; path = fetchurl { - name = "array.prototype.find___array.prototype.find_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.0.tgz"; - sha1 = "630f2eaf70a39e608ac3573e45cf8ccd0ede9ad7"; + name = "array.prototype.find___array.prototype.find_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.1.tgz"; + sha1 = "3baca26108ca7affb08db06bf0be6cb3115a969c"; }; } { @@ -2330,11 +2402,11 @@ }; } { - name = "babel_preset_react_app___babel_preset_react_app_9.1.1.tgz"; + name = "babel_preset_react_app___babel_preset_react_app_9.1.2.tgz"; path = fetchurl { - name = "babel_preset_react_app___babel_preset_react_app_9.1.1.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.1.1.tgz"; - sha1 = "d1ceb47cbe48b285fdd5c562c54c432ed5a41e0e"; + name = "babel_preset_react_app___babel_preset_react_app_9.1.2.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.1.2.tgz"; + sha1 = "54775d976588a8a6d1a99201a702befecaf48030"; }; } { @@ -2506,11 +2578,11 @@ }; } { - name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz"; + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; path = fetchurl { - name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz"; - sha1 = "616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"; + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"; + sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626"; }; } { @@ -2570,19 +2642,11 @@ }; } { - name = "browserslist___browserslist_4.8.6.tgz"; - path = fetchurl { - name = "browserslist___browserslist_4.8.6.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.6.tgz"; - sha1 = "96406f3f5f0755d272e27a66f4163ca821590a7e"; - }; - } - { - name = "browserslist___browserslist_4.8.7.tgz"; + name = "browserslist___browserslist_4.10.0.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.8.7.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.7.tgz"; - sha1 = "ec8301ff415e6a42c949d0e66b405eb539c532d0"; + name = "browserslist___browserslist_4.10.0.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.10.0.tgz"; + sha1 = "f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9"; }; } { @@ -2746,11 +2810,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001028.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001035.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001028.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001028.tgz"; - sha1 = "f2241242ac70e0fa9cda55c2776d32a0867971c2"; + name = "caniuse_lite___caniuse_lite_1.0.30001035.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz"; + sha1 = "2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e"; }; } { @@ -2794,6 +2858,14 @@ }; } { + name = "chalk___chalk_3.0.0.tgz"; + path = fetchurl { + name = "chalk___chalk_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; + sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; + }; + } + { name = "chardet___chardet_0.7.0.tgz"; path = fetchurl { name = "chardet___chardet_0.7.0.tgz"; @@ -2978,6 +3050,14 @@ }; } { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } + { name = "color_name___color_name_1.1.3.tgz"; path = fetchurl { name = "color_name___color_name_1.1.3.tgz"; @@ -3130,14 +3210,6 @@ }; } { - name = "console_control_strings___console_control_strings_1.1.0.tgz"; - path = fetchurl { - name = "console_control_strings___console_control_strings_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; - }; - } - { name = "constants_browserify___constants_browserify_1.0.0.tgz"; path = fetchurl { name = "constants_browserify___constants_browserify_1.0.0.tgz"; @@ -3218,11 +3290,11 @@ }; } { - name = "copy_to_clipboard___copy_to_clipboard_3.2.1.tgz"; + name = "copy_to_clipboard___copy_to_clipboard_3.3.1.tgz"; path = fetchurl { - name = "copy_to_clipboard___copy_to_clipboard_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.2.1.tgz"; - sha1 = "b1a1137100e5665d5a96015cb579e30e90e07c44"; + name = "copy_to_clipboard___copy_to_clipboard_3.3.1.tgz"; + url = "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz"; + sha1 = "115aa1a9998ffab6196f93076ad6da3b913662ae"; }; } { @@ -3234,6 +3306,14 @@ }; } { + name = "core_js_pure___core_js_pure_3.6.4.tgz"; + path = fetchurl { + name = "core_js_pure___core_js_pure_3.6.4.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.4.tgz"; + sha1 = "4bf1ba866e25814f149d4e9aaa08c36173506e3a"; + }; + } + { name = "core_js___core_js_2.6.11.tgz"; path = fetchurl { name = "core_js___core_js_2.6.11.tgz"; @@ -3658,14 +3738,6 @@ }; } { - name = "deep_extend___deep_extend_0.6.0.tgz"; - path = fetchurl { - name = "deep_extend___deep_extend_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; - sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; - }; - } - { name = "deep_is___deep_is_0.1.3.tgz"; path = fetchurl { name = "deep_is___deep_is_0.1.3.tgz"; @@ -3730,14 +3802,6 @@ }; } { - name = "delegates___delegates_1.0.0.tgz"; - path = fetchurl { - name = "delegates___delegates_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; - sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; - }; - } - { name = "depd___depd_1.1.2.tgz"; path = fetchurl { name = "depd___depd_1.1.2.tgz"; @@ -3762,14 +3826,6 @@ }; } { - name = "detect_libc___detect_libc_1.0.3.tgz"; - path = fetchurl { - name = "detect_libc___detect_libc_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; - }; - } - { name = "detect_newline___detect_newline_2.1.0.tgz"; path = fetchurl { name = "detect_newline___detect_newline_2.1.0.tgz"; @@ -3954,6 +4010,14 @@ }; } { + name = "domhandler___domhandler_3.0.0.tgz"; + path = fetchurl { + name = "domhandler___domhandler_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/domhandler/-/domhandler-3.0.0.tgz"; + sha1 = "51cd13efca31da95bbb0c5bee3a48300e333b3e9"; + }; + } + { name = "domutils___domutils_1.5.1.tgz"; path = fetchurl { name = "domutils___domutils_1.5.1.tgz"; @@ -3970,6 +4034,14 @@ }; } { + name = "domutils___domutils_2.0.0.tgz"; + path = fetchurl { + name = "domutils___domutils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-2.0.0.tgz"; + sha1 = "15b8278e37bfa8468d157478c58c367718133c08"; + }; + } + { name = "dot_case___dot_case_3.0.3.tgz"; path = fetchurl { name = "dot_case___dot_case_3.0.3.tgz"; @@ -4042,11 +4114,11 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.356.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.380.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.356.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.356.tgz"; - sha1 = "fb985ee0f3023e6e11b97547ff3f738bdd8643d2"; + name = "electron_to_chromium___electron_to_chromium_1.3.380.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.380.tgz"; + sha1 = "1e1f07091b42b54bccd0ad6d3a14f2b73b60dc9d"; }; } { @@ -4266,11 +4338,11 @@ }; } { - name = "eslint_config_react_app___eslint_config_react_app_5.2.0.tgz"; + name = "eslint_config_react_app___eslint_config_react_app_5.2.1.tgz"; path = fetchurl { - name = "eslint_config_react_app___eslint_config_react_app_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.2.0.tgz"; - sha1 = "135110ba56a9e378f7acfe5f36e2ae76a2317899"; + name = "eslint_config_react_app___eslint_config_react_app_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.2.1.tgz"; + sha1 = "698bf7aeee27f0cea0139eaef261c7bf7dd623df"; }; } { @@ -4362,11 +4434,11 @@ }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.18.3.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.19.0.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.18.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.18.3.tgz"; - sha1 = "8be671b7f6be095098e79d27ac32f9580f599bc8"; + name = "eslint_plugin_react___eslint_plugin_react_7.19.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz"; + sha1 = "6d08f9673628aa69c5559d33489e855d83551666"; }; } { @@ -4410,11 +4482,11 @@ }; } { - name = "espree___espree_6.1.2.tgz"; + name = "espree___espree_6.2.1.tgz"; path = fetchurl { - name = "espree___espree_6.1.2.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz"; - sha1 = "6c272650932b4f91c3714e5e7b5f5e2ecf47262d"; + name = "espree___espree_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz"; + sha1 = "77fc72e1fd744a2052c20f38a5b575832e82734a"; }; } { @@ -4762,11 +4834,11 @@ }; } { - name = "find_cache_dir___find_cache_dir_3.2.0.tgz"; + name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; path = fetchurl { - name = "find_cache_dir___find_cache_dir_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.2.0.tgz"; - sha1 = "e7fe44c1abc1299f516146e563108fd1006c1874"; + name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; + url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz"; + sha1 = "89b33fad4a4670daa94f855f7fbe31d6d84fe880"; }; } { @@ -4946,14 +5018,6 @@ }; } { - name = "fs_minipass___fs_minipass_1.2.7.tgz"; - path = fetchurl { - name = "fs_minipass___fs_minipass_1.2.7.tgz"; - url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz"; - sha1 = "ccff8570841e7fe4265693da88936c55aed7f7c7"; - }; - } - { name = "fs_minipass___fs_minipass_2.1.0.tgz"; path = fetchurl { name = "fs_minipass___fs_minipass_2.1.0.tgz"; @@ -4986,11 +5050,11 @@ }; } { - name = "fsevents___fsevents_1.2.11.tgz"; + name = "fsevents___fsevents_1.2.12.tgz"; path = fetchurl { - name = "fsevents___fsevents_1.2.11.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz"; - sha1 = "67bf57f4758f02ede88fb2a1712fef4d15358be3"; + name = "fsevents___fsevents_1.2.12.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.12.tgz"; + sha1 = "db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c"; }; } { @@ -5034,14 +5098,6 @@ }; } { - name = "gauge___gauge_2.7.4.tgz"; - path = fetchurl { - name = "gauge___gauge_2.7.4.tgz"; - url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; - sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; - }; - } - { name = "gensync___gensync_1.0.0_beta.1.tgz"; path = fetchurl { name = "gensync___gensync_1.0.0_beta.1.tgz"; @@ -5162,11 +5218,11 @@ }; } { - name = "globals___globals_12.3.0.tgz"; + name = "globals___globals_12.4.0.tgz"; path = fetchurl { - name = "globals___globals_12.3.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz"; - sha1 = "1e564ee5c4dded2ab098b0f88f24702a3c56be13"; + name = "globals___globals_12.4.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz"; + sha1 = "a18813576a41b00a24a97e7f815918c2e19925f8"; }; } { @@ -5282,14 +5338,6 @@ }; } { - name = "has_unicode___has_unicode_2.0.1.tgz"; - path = fetchurl { - name = "has_unicode___has_unicode_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; - }; - } - { name = "has_value___has_value_0.3.1.tgz"; path = fetchurl { name = "has_value___has_value_0.3.1.tgz"; @@ -5370,11 +5418,11 @@ }; } { - name = "hosted_git_info___hosted_git_info_2.8.5.tgz"; + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_2.8.5.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz"; - sha1 = "759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"; + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; + sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488"; }; } { @@ -5434,11 +5482,11 @@ }; } { - name = "html_escaper___html_escaper_2.0.0.tgz"; + name = "html_escaper___html_escaper_2.0.1.tgz"; path = fetchurl { - name = "html_escaper___html_escaper_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.0.tgz"; - sha1 = "71e87f931de3fe09e56661ab9a29aadec707b491"; + name = "html_escaper___html_escaper_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.1.tgz"; + sha1 = "beed86b5d2b921e92533aa11bce6d8e3b583dee7"; }; } { @@ -5466,6 +5514,14 @@ }; } { + name = "htmlparser2___htmlparser2_4.1.0.tgz"; + path = fetchurl { + name = "htmlparser2___htmlparser2_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-4.1.0.tgz"; + sha1 = "9a4ef161f2e4625ebf7dfbe6c0a2f52d18a59e78"; + }; + } + { name = "http_deceiver___http_deceiver_1.2.7.tgz"; path = fetchurl { name = "http_deceiver___http_deceiver_1.2.7.tgz"; @@ -5586,14 +5642,6 @@ }; } { - name = "ignore_walk___ignore_walk_3.0.3.tgz"; - path = fetchurl { - name = "ignore_walk___ignore_walk_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz"; - sha1 = "017e2447184bfeade7c238e4aefdd1e8f95b1e37"; - }; - } - { name = "ignore___ignore_3.3.10.tgz"; path = fetchurl { name = "ignore___ignore_3.3.10.tgz"; @@ -5738,6 +5786,14 @@ }; } { + name = "inquirer___inquirer_7.1.0.tgz"; + path = fetchurl { + name = "inquirer___inquirer_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz"; + sha1 = "1298a01859883e17c7264b82870ae1034f92dd29"; + }; + } + { name = "internal_ip___internal_ip_4.3.0.tgz"; path = fetchurl { name = "internal_ip___internal_ip_4.3.0.tgz"; @@ -5786,14 +5842,6 @@ }; } { - name = "ipaddr.js___ipaddr.js_1.9.0.tgz"; - path = fetchurl { - name = "ipaddr.js___ipaddr.js_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz"; - sha1 = "37df74e430a0e47550fe54a2defe30d8acd95f65"; - }; - } - { name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; path = fetchurl { name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; @@ -6730,11 +6778,11 @@ }; } { - name = "json5___json5_2.1.1.tgz"; + name = "json5___json5_2.1.2.tgz"; path = fetchurl { - name = "json5___json5_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz"; - sha1 = "81b6cb04e9ba496f1c7005d07b4368a2638f90b6"; + name = "json5___json5_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz"; + sha1 = "43ef1f0af9835dd624751a6b7fa48874fb2d608e"; }; } { @@ -6770,11 +6818,11 @@ }; } { - name = "just_extend___just_extend_4.0.2.tgz"; + name = "just_extend___just_extend_4.1.0.tgz"; path = fetchurl { - name = "just_extend___just_extend_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/just-extend/-/just-extend-4.0.2.tgz"; - sha1 = "f3f47f7dfca0f989c55410a7ebc8854b07108afc"; + name = "just_extend___just_extend_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/just-extend/-/just-extend-4.1.0.tgz"; + sha1 = "7278a4027d889601640ee0ce0e5a00b992467da4"; }; } { @@ -6922,11 +6970,11 @@ }; } { - name = "loader_fs_cache___loader_fs_cache_1.0.2.tgz"; + name = "loader_fs_cache___loader_fs_cache_1.0.3.tgz"; path = fetchurl { - name = "loader_fs_cache___loader_fs_cache_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.2.tgz"; - sha1 = "54cedf6b727e1779fd8f01205f05f6e88706f086"; + name = "loader_fs_cache___loader_fs_cache_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz"; + sha1 = "f08657646d607078be2f0a032f8bd69dd6f277d9"; }; } { @@ -7394,19 +7442,11 @@ }; } { - name = "minimist___minimist_0.0.8.tgz"; + name = "minimist___minimist_1.2.5.tgz"; path = fetchurl { - name = "minimist___minimist_0.0.8.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - } - { - name = "minimist___minimist_1.2.0.tgz"; - path = fetchurl { - name = "minimist___minimist_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; }; } { @@ -7434,14 +7474,6 @@ }; } { - name = "minipass___minipass_2.9.0.tgz"; - path = fetchurl { - name = "minipass___minipass_2.9.0.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz"; - sha1 = "e713762e7d3e32fed803115cf93e04bca9fcc9a6"; - }; - } - { name = "minipass___minipass_3.1.1.tgz"; path = fetchurl { name = "minipass___minipass_3.1.1.tgz"; @@ -7450,14 +7482,6 @@ }; } { - name = "minizlib___minizlib_1.3.3.tgz"; - path = fetchurl { - name = "minizlib___minizlib_1.3.3.tgz"; - url = "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz"; - sha1 = "2290de96818a34c29551c8a8d301216bd65a861d"; - }; - } - { name = "mississippi___mississippi_3.0.0.tgz"; path = fetchurl { name = "mississippi___mississippi_3.0.0.tgz"; @@ -7482,11 +7506,11 @@ }; } { - name = "mkdirp___mkdirp_0.5.1.tgz"; + name = "mkdirp___mkdirp_0.5.3.tgz"; path = fetchurl { - name = "mkdirp___mkdirp_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + name = "mkdirp___mkdirp_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.3.tgz"; + sha1 = "5a514b7179259287952881e94410ec5465659f8c"; }; } { @@ -7498,11 +7522,11 @@ }; } { - name = "moment_timezone___moment_timezone_0.5.27.tgz"; + name = "moment_timezone___moment_timezone_0.5.28.tgz"; path = fetchurl { - name = "moment_timezone___moment_timezone_0.5.27.tgz"; - url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.27.tgz"; - sha1 = "73adec8139b6fe30452e78f210f27b1f346b8877"; + name = "moment_timezone___moment_timezone_0.5.28.tgz"; + url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.28.tgz"; + sha1 = "f093d789d091ed7b055d82aa81a82467f72e4338"; }; } { @@ -7610,14 +7634,6 @@ }; } { - name = "needle___needle_2.3.2.tgz"; - path = fetchurl { - name = "needle___needle_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz"; - sha1 = "3342dea100b7160960a450dc8c22160ac712a528"; - }; - } - { name = "negotiator___negotiator_0.6.2.tgz"; path = fetchurl { name = "negotiator___negotiator_0.6.2.tgz"; @@ -7714,27 +7730,11 @@ }; } { - name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz"; - path = fetchurl { - name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz"; - sha1 = "9a0596533b877289bcad4e143982ca3d904ddc83"; - }; - } - { - name = "node_releases___node_releases_1.1.49.tgz"; - path = fetchurl { - name = "node_releases___node_releases_1.1.49.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.49.tgz"; - sha1 = "67ba5a3fac2319262675ef864ed56798bb33b93e"; - }; - } - { - name = "nopt___nopt_4.0.1.tgz"; + name = "node_releases___node_releases_1.1.52.tgz"; path = fetchurl { - name = "nopt___nopt_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz"; - sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + name = "node_releases___node_releases_1.1.52.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz"; + sha1 = "bcffee3e0a758e92e44ecfaecd0a47554b0bcba9"; }; } { @@ -7786,30 +7786,6 @@ }; } { - name = "npm_bundled___npm_bundled_1.1.1.tgz"; - path = fetchurl { - name = "npm_bundled___npm_bundled_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz"; - sha1 = "1edd570865a94cdb1bc8220775e29466c9fb234b"; - }; - } - { - name = "npm_normalize_package_bin___npm_normalize_package_bin_1.0.1.tgz"; - path = fetchurl { - name = "npm_normalize_package_bin___npm_normalize_package_bin_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz"; - sha1 = "6e79a41f23fd235c0623218228da7d9c23b8f6e2"; - }; - } - { - name = "npm_packlist___npm_packlist_1.4.8.tgz"; - path = fetchurl { - name = "npm_packlist___npm_packlist_1.4.8.tgz"; - url = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz"; - sha1 = "56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"; - }; - } - { name = "npm_run_path___npm_run_path_2.0.2.tgz"; path = fetchurl { name = "npm_run_path___npm_run_path_2.0.2.tgz"; @@ -7818,14 +7794,6 @@ }; } { - name = "npmlog___npmlog_4.1.2.tgz"; - path = fetchurl { - name = "npmlog___npmlog_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; - sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; - }; - } - { name = "nth_check___nth_check_1.0.2.tgz"; path = fetchurl { name = "nth_check___nth_check_1.0.2.tgz"; @@ -8018,11 +7986,11 @@ }; } { - name = "open___open_7.0.2.tgz"; + name = "open___open_7.0.3.tgz"; path = fetchurl { - name = "open___open_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/open/-/open-7.0.2.tgz"; - sha1 = "fb3681f11f157f2361d2392307548ca1792960e8"; + name = "open___open_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/open/-/open-7.0.3.tgz"; + sha1 = "db551a1af9c7ab4c7af664139930826138531c48"; }; } { @@ -8066,14 +8034,6 @@ }; } { - name = "os_homedir___os_homedir_1.0.2.tgz"; - path = fetchurl { - name = "os_homedir___os_homedir_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - } - { name = "os_locale___os_locale_3.1.0.tgz"; path = fetchurl { name = "os_locale___os_locale_3.1.0.tgz"; @@ -8090,14 +8050,6 @@ }; } { - name = "osenv___osenv_0.1.5.tgz"; - path = fetchurl { - name = "osenv___osenv_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz"; - sha1 = "85cdfafaeb28e8677f416e287592b5f3f49ea410"; - }; - } - { name = "p_defer___p_defer_1.0.0.tgz"; path = fetchurl { name = "p_defer___p_defer_1.0.0.tgz"; @@ -8466,11 +8418,11 @@ }; } { - name = "picomatch___picomatch_2.2.1.tgz"; + name = "picomatch___picomatch_2.2.2.tgz"; path = fetchurl { - name = "picomatch___picomatch_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz"; - sha1 = "21bac888b6ed8601f831ce7816e335bc779f0a4a"; + name = "picomatch___picomatch_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; + sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; }; } { @@ -8922,11 +8874,11 @@ }; } { - name = "postcss_modules_scope___postcss_modules_scope_2.1.1.tgz"; + name = "postcss_modules_scope___postcss_modules_scope_2.2.0.tgz"; path = fetchurl { - name = "postcss_modules_scope___postcss_modules_scope_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz"; - sha1 = "33d4fc946602eb5e9355c4165d68a10727689dba"; + name = "postcss_modules_scope___postcss_modules_scope_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz"; + sha1 = "385cae013cc7743f5a7d7602d1073a89eaae62ee"; }; } { @@ -9306,19 +9258,19 @@ }; } { - name = "promise___promise_8.0.3.tgz"; + name = "promise___promise_8.1.0.tgz"; path = fetchurl { - name = "promise___promise_8.0.3.tgz"; - url = "https://registry.yarnpkg.com/promise/-/promise-8.0.3.tgz"; - sha1 = "f592e099c6cddc000d538ee7283bb190452b0bf6"; + name = "promise___promise_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz"; + sha1 = "697c25c3dfe7435dd79fcd58c38a135888eaf05e"; }; } { - name = "prompts___prompts_2.3.1.tgz"; + name = "prompts___prompts_2.3.2.tgz"; path = fetchurl { - name = "prompts___prompts_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/prompts/-/prompts-2.3.1.tgz"; - sha1 = "b63a9ce2809f106fa9ae1277c275b167af46ea05"; + name = "prompts___prompts_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz"; + sha1 = "480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"; }; } { @@ -9338,11 +9290,11 @@ }; } { - name = "proxy_addr___proxy_addr_2.0.5.tgz"; + name = "proxy_addr___proxy_addr_2.0.6.tgz"; path = fetchurl { - name = "proxy_addr___proxy_addr_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz"; - sha1 = "34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"; + name = "proxy_addr___proxy_addr_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz"; + sha1 = "fdc2336505447d3f2f2c638ed272caf614bbb2bf"; }; } { @@ -9538,14 +9490,6 @@ }; } { - name = "rc___rc_1.2.8.tgz"; - path = fetchurl { - name = "rc___rc_1.2.8.tgz"; - url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; - sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; - }; - } - { name = "react_app_polyfill___react_app_polyfill_1.0.6.tgz"; path = fetchurl { name = "react_app_polyfill___react_app_polyfill_1.0.6.tgz"; @@ -9562,35 +9506,35 @@ }; } { - name = "react_dev_utils___react_dev_utils_10.2.0.tgz"; + name = "react_dev_utils___react_dev_utils_10.2.1.tgz"; path = fetchurl { - name = "react_dev_utils___react_dev_utils_10.2.0.tgz"; - url = "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.0.tgz"; - sha1 = "b11cc48aa2be2502fb3c27a50d1dfa95cfa9dfe0"; + name = "react_dev_utils___react_dev_utils_10.2.1.tgz"; + url = "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.1.tgz"; + sha1 = "f6de325ae25fa4d546d09df4bb1befdc6dd19c19"; }; } { - name = "react_dom___react_dom_16.12.0.tgz"; + name = "react_dom___react_dom_16.13.1.tgz"; path = fetchurl { - name = "react_dom___react_dom_16.12.0.tgz"; - url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz"; - sha1 = "0da4b714b8d13c2038c9396b54a92baea633fe11"; + name = "react_dom___react_dom_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz"; + sha1 = "c1bd37331a0486c078ee54c4740720993b2e0e7f"; }; } { - name = "react_error_overlay___react_error_overlay_6.0.6.tgz"; + name = "react_error_overlay___react_error_overlay_6.0.7.tgz"; path = fetchurl { - name = "react_error_overlay___react_error_overlay_6.0.6.tgz"; - url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.6.tgz"; - sha1 = "ac4d9dc4c1b5c536c2c312bf66aa2b09bfa384e2"; + name = "react_error_overlay___react_error_overlay_6.0.7.tgz"; + url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.7.tgz"; + sha1 = "1dcfb459ab671d53f660a991513cb2f0a0553108"; }; } { - name = "react_is___react_is_16.12.0.tgz"; + name = "react_is___react_is_16.13.1.tgz"; path = fetchurl { - name = "react_is___react_is_16.12.0.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz"; - sha1 = "2cc0fe0fba742d97fd527c42a13bec4eeb06241c"; + name = "react_is___react_is_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; + sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; }; } { @@ -9626,11 +9570,11 @@ }; } { - name = "react_test_renderer___react_test_renderer_16.12.0.tgz"; + name = "react_test_renderer___react_test_renderer_16.13.1.tgz"; path = fetchurl { - name = "react_test_renderer___react_test_renderer_16.12.0.tgz"; - url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.12.0.tgz"; - sha1 = "11417ffda579306d4e841a794d32140f3da1b43f"; + name = "react_test_renderer___react_test_renderer_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.1.tgz"; + sha1 = "de25ea358d9012606de51e012d9742e7f0deabc1"; }; } { @@ -9642,11 +9586,11 @@ }; } { - name = "react___react_16.12.0.tgz"; + name = "react___react_16.13.1.tgz"; path = fetchurl { - name = "react___react_16.12.0.tgz"; - url = "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz"; - sha1 = "0c0a9c6a142429e3614834d5a778e18aa78a0b83"; + name = "react___react_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz"; + sha1 = "2e818822f1a9743122c063d6410d85c1e3afe48e"; }; } { @@ -9746,11 +9690,11 @@ }; } { - name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; path = fetchurl { - name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz"; - sha1 = "ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"; + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; + sha1 = "e5de7111d655e7ba60c057dbe9ff37c87e65cdec"; }; } { @@ -9770,19 +9714,19 @@ }; } { - name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz"; - sha1 = "7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"; + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; + sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; }; } { - name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; + name = "regenerator_transform___regenerator_transform_0.14.4.tgz"; path = fetchurl { - name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; - url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz"; - sha1 = "3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb"; + name = "regenerator_transform___regenerator_transform_0.14.4.tgz"; + url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz"; + sha1 = "5266857896518d1616a78a0479337a30ea974cc7"; }; } { @@ -9826,11 +9770,11 @@ }; } { - name = "regexpu_core___regexpu_core_4.6.0.tgz"; + name = "regexpu_core___regexpu_core_4.7.0.tgz"; path = fetchurl { - name = "regexpu_core___regexpu_core_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz"; - sha1 = "2037c18b327cfce8a6fea2a4ec441f2432afb8b6"; + name = "regexpu_core___regexpu_core_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz"; + sha1 = "fcbf458c50431b0bb7b45d6967b8192d91f3d938"; }; } { @@ -9842,11 +9786,11 @@ }; } { - name = "regjsparser___regjsparser_0.6.3.tgz"; + name = "regjsparser___regjsparser_0.6.4.tgz"; path = fetchurl { - name = "regjsparser___regjsparser_0.6.3.tgz"; - url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz"; - sha1 = "74192c5805d35e9f5ebe3c1fb5b40d40a8a38460"; + name = "regjsparser___regjsparser_0.6.4.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz"; + sha1 = "a769f8684308401a66e9b529d2436ff4d0666272"; }; } { @@ -10114,11 +10058,11 @@ }; } { - name = "run_async___run_async_2.3.0.tgz"; + name = "run_async___run_async_2.4.0.tgz"; path = fetchurl { - name = "run_async___run_async_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz"; - sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; + name = "run_async___run_async_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz"; + sha1 = "e59054a5b86876cfae07f431d18cbaddc594f1e8"; }; } { @@ -10178,11 +10122,11 @@ }; } { - name = "sanitize_html___sanitize_html_1.21.1.tgz"; + name = "sanitize_html___sanitize_html_1.22.1.tgz"; path = fetchurl { - name = "sanitize_html___sanitize_html_1.21.1.tgz"; - url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.21.1.tgz"; - sha1 = "1647d15c0c672901aa41eac1b86d0c38146d30ce"; + name = "sanitize_html___sanitize_html_1.22.1.tgz"; + url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.22.1.tgz"; + sha1 = "5b36c92ab27917ddd2775396815c2bc1a6268310"; }; } { @@ -10218,11 +10162,11 @@ }; } { - name = "scheduler___scheduler_0.18.0.tgz"; + name = "scheduler___scheduler_0.19.1.tgz"; path = fetchurl { - name = "scheduler___scheduler_0.18.0.tgz"; - url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.18.0.tgz"; - sha1 = "5901ad6659bc1d8f3fdaf36eb7a67b0d6746b1c4"; + name = "scheduler___scheduler_0.19.1.tgz"; + url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz"; + sha1 = "4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"; }; } { @@ -10234,11 +10178,11 @@ }; } { - name = "schema_utils___schema_utils_2.6.4.tgz"; + name = "schema_utils___schema_utils_2.6.5.tgz"; path = fetchurl { - name = "schema_utils___schema_utils_2.6.4.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz"; - sha1 = "a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53"; + name = "schema_utils___schema_utils_2.6.5.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.5.tgz"; + sha1 = "c758f0a7e624263073d396e29cd40aa101152d8a"; }; } { @@ -10458,11 +10402,11 @@ }; } { - name = "sisteransi___sisteransi_1.0.4.tgz"; + name = "sisteransi___sisteransi_1.0.5.tgz"; path = fetchurl { - name = "sisteransi___sisteransi_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.4.tgz"; - sha1 = "386713f1ef688c7c0304dc4c0632898941cad2e3"; + name = "sisteransi___sisteransi_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz"; + sha1 = "134d681297756437cc05ca01370d3a7a571075ed"; }; } { @@ -10658,11 +10602,11 @@ }; } { - name = "srcset___srcset_1.0.0.tgz"; + name = "srcset___srcset_2.0.1.tgz"; path = fetchurl { - name = "srcset___srcset_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/srcset/-/srcset-1.0.0.tgz"; - sha1 = "a5669de12b42f3b1d5e83ed03c71046fc48f41ef"; + name = "srcset___srcset_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/srcset/-/srcset-2.0.1.tgz"; + sha1 = "8f842d357487eb797f413d9c309de7a5149df5ac"; }; } { @@ -10938,14 +10882,6 @@ }; } { - name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; - path = fetchurl { - name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; - }; - } - { name = "style_loader___style_loader_0.23.1.tgz"; path = fetchurl { name = "style_loader___style_loader_0.23.1.tgz"; @@ -10994,11 +10930,11 @@ }; } { - name = "svg_parser___svg_parser_2.0.3.tgz"; + name = "svg_parser___svg_parser_2.0.4.tgz"; path = fetchurl { - name = "svg_parser___svg_parser_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.3.tgz"; - sha1 = "a38f2e4e5442986f7ecb554c11f1411cfcf8c2b9"; + name = "svg_parser___svg_parser_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz"; + sha1 = "fdc2e29e13951736140b76cb122c8ee6630eb6b5"; }; } { @@ -11034,14 +10970,6 @@ }; } { - name = "tar___tar_4.4.13.tgz"; - path = fetchurl { - name = "tar___tar_4.4.13.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz"; - sha1 = "43b364bc52888d555298637b10d60790254ab525"; - }; - } - { name = "tempusdominus_bootstrap_4___tempusdominus_bootstrap_4_5.1.2.tgz"; path = fetchurl { name = "tempusdominus_bootstrap_4___tempusdominus_bootstrap_4_5.1.2.tgz"; @@ -11074,11 +11002,11 @@ }; } { - name = "terser___terser_4.6.3.tgz"; + name = "terser___terser_4.6.7.tgz"; path = fetchurl { - name = "terser___terser_4.6.3.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-4.6.3.tgz"; - sha1 = "e33aa42461ced5238d352d2df2a67f21921f8d87"; + name = "terser___terser_4.6.7.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.6.7.tgz"; + sha1 = "478d7f9394ec1907f0e488c5f6a6a9a2bad55e72"; }; } { @@ -11258,19 +11186,19 @@ }; } { - name = "ts_pnp___ts_pnp_1.1.6.tgz"; + name = "ts_pnp___ts_pnp_1.2.0.tgz"; path = fetchurl { - name = "ts_pnp___ts_pnp_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.6.tgz"; - sha1 = "389a24396d425a0d3162e96d2b4638900fdc289a"; + name = "ts_pnp___ts_pnp_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz"; + sha1 = "a500ad084b0798f1c3071af391e65912c86bca92"; }; } { - name = "tslib___tslib_1.11.0.tgz"; + name = "tslib___tslib_1.11.1.tgz"; path = fetchurl { - name = "tslib___tslib_1.11.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.0.tgz"; - sha1 = "f1f3528301621a53220d58373ae510ff747a66bc"; + name = "tslib___tslib_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz"; + sha1 = "eb15d128827fbee2841549e171f45ed338ac7e35"; }; } { @@ -11322,6 +11250,14 @@ }; } { + name = "type_fest___type_fest_0.11.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz"; + sha1 = "97abf0872310fed88a5c466b25681576145e33f1"; + }; + } + { name = "type_fest___type_fest_0.8.1.tgz"; path = fetchurl { name = "type_fest___type_fest_0.8.1.tgz"; @@ -11370,11 +11306,11 @@ }; } { - name = "typescript___typescript_3.8.2.tgz"; + name = "typescript___typescript_3.8.3.tgz"; path = fetchurl { - name = "typescript___typescript_3.8.2.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.2.tgz"; - sha1 = "91d6868aaead7da74f493c553aeff76c0c0b1d5a"; + name = "typescript___typescript_3.8.3.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz"; + sha1 = "409eb8544ea0335711205869ec458ab109ee1061"; }; } { @@ -11394,19 +11330,19 @@ }; } { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; path = fetchurl { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz"; - sha1 = "5b4b426e08d13a80365e0d657ac7a6c1ec46a277"; + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; + sha1 = "0d91f600eeeb3096aa962b1d6fc88876e64ea531"; }; } { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; path = fetchurl { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz"; - sha1 = "a9cc6cc7ce63a0a3023fc99e341b94431d405a57"; + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; + sha1 = "dd57a99f6207bedff4628abefb94c50db941c8f4"; }; } { @@ -11650,11 +11586,11 @@ }; } { - name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz"; + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; path = fetchurl { - name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz"; - sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045"; + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"; + sha1 = "0a89cdf5cc15822df9c360543676963e0cc308cd"; }; } { @@ -11842,14 +11778,6 @@ }; } { - name = "wide_align___wide_align_1.1.3.tgz"; - path = fetchurl { - name = "wide_align___wide_align_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; - sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; - }; - } - { name = "word_wrap___word_wrap_1.2.3.tgz"; path = fetchurl { name = "word_wrap___word_wrap_1.2.3.tgz"; @@ -12058,11 +11986,11 @@ }; } { - name = "ws___ws_7.2.1.tgz"; + name = "ws___ws_7.2.3.tgz"; path = fetchurl { - name = "ws___ws_7.2.1.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.2.1.tgz"; - sha1 = "03ed52423cd744084b2cf42ed197c8b65a936b8e"; + name = "ws___ws_7.2.3.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.2.3.tgz"; + sha1 = "a5411e1fb04d5ed0efee76d26d5c46d830c39b46"; }; } { @@ -12082,6 +12010,14 @@ }; } { + name = "xregexp___xregexp_4.3.0.tgz"; + path = fetchurl { + name = "xregexp___xregexp_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz"; + sha1 = "7e92e73d9174a99a59743f67a4ce879a04b5ae50"; + }; + } + { name = "xtend___xtend_4.0.2.tgz"; path = fetchurl { name = "xtend___xtend_4.0.2.tgz"; @@ -12114,11 +12050,11 @@ }; } { - name = "yaml___yaml_1.7.2.tgz"; + name = "yaml___yaml_1.8.3.tgz"; path = fetchurl { - name = "yaml___yaml_1.7.2.tgz"; - url = "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz"; - sha1 = "f26aabf738590ab61efaca502358e48dc9f348b2"; + name = "yaml___yaml_1.8.3.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.8.3.tgz"; + sha1 = "2f420fca58b68ce3a332d0ca64be1d191dd3f87a"; }; } { @@ -12130,11 +12066,11 @@ }; } { - name = "yargs_parser___yargs_parser_13.1.1.tgz"; + name = "yargs_parser___yargs_parser_13.1.2.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_13.1.1.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz"; - sha1 = "d26058532aa06d365fe091f6a1fc06b2f7e5eca0"; + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; }; } { @@ -12146,11 +12082,11 @@ }; } { - name = "yargs___yargs_13.3.0.tgz"; + name = "yargs___yargs_13.3.2.tgz"; path = fetchurl { - name = "yargs___yargs_13.3.0.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz"; - sha1 = "4c657a55e07e5f2cf947f8a366567c04a0dedc83"; + name = "yargs___yargs_13.3.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz"; + sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"; }; } ]; diff --git a/pkgs/servers/monitoring/riemann-dash/default.nix b/pkgs/servers/monitoring/riemann-dash/default.nix index 943fa0af63f35..f6c11703fce7e 100644 --- a/pkgs/servers/monitoring/riemann-dash/default.nix +++ b/pkgs/servers/monitoring/riemann-dash/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A javascript, websockets-powered dashboard for Riemann"; - homepage = https://github.com/riemann/riemann-dash; + homepage = "https://github.com/riemann/riemann-dash"; license = licenses.mit; maintainers = with maintainers; [ manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 295a75928805c..644af1492cd69 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://riemann.io/; + homepage = "http://riemann.io/"; description = "A network monitoring system"; license = licenses.epl10; platforms = platforms.all; diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index f109b08d1a6fd..5f9f3b80f8007 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -4,8 +4,8 @@ let generic = { subPackages, pname, postInstall ? "" }: buildGoModule rec { inherit pname; - version = "5.18.1"; - shortRev = "1f6d16b"; # for internal version info + version = "5.20.1"; + shortRev = "3a1ac58"; # for internal version info goPackagePath = "github.com/sensu/sensu-go"; @@ -13,12 +13,12 @@ let owner = "sensu"; repo = "sensu-go"; rev = "v${version}"; - sha256 = "1iwlkm7ac7brap45r6ly0blywgq6f28r1nws3yf0ybydv30brfj4"; + sha256 = "0wrcchz878sq7zhkb8p0s93k92xppihv5yyvkl363xs6519xzm7m"; }; inherit subPackages postInstall; - modSha256 = "02h4cav6ivzs3z0qakwxzf5lfy6hzax5c0i2icp0qymqc2789npw"; + vendorSha256 = "03lkra5vf07zicd2aipvmkrda56ys5swwj6lq5hnp324ndajfcya"; buildFlagsArray = let versionPkg = "github.com/sensu/sensu-go/version"; @@ -66,4 +66,4 @@ in pname = "sensu-go-agent"; subPackages = [ "cmd/sensu-agent" ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix index 82c52b18d4055..42f6e395c2d63 100644 --- a/pkgs/servers/monitoring/sensu/default.nix +++ b/pkgs/servers/monitoring/sensu/default.nix @@ -46,7 +46,7 @@ bundlerApp { meta = with lib; { description = "A monitoring framework that aims to be simple, malleable, and scalable"; - homepage = https://sensuapp.org/; + homepage = "https://sensuapp.org/"; license = licenses.mit; maintainers = with maintainers; [ theuni peterhoeg manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index 5312ecb069245..e926d797f9f9f 100644 --- a/pkgs/servers/monitoring/seyren/default.nix +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An alerting dashboard for Graphite"; - homepage = https://github.com/scobal/seyren; + homepage = "https://github.com/scobal/seyren"; license = licenses.asl20; maintainers = [ maintainers.offline ]; platforms = platforms.all; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 4785d78ab185c..adc42173f8e5c 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.14.0"; + version = "1.14.3"; goPackagePath = "github.com/influxdata/telegraf"; @@ -14,10 +14,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "062j4sm7im4iv5i9afr771724srvwwcqbhkyznlzncaz06mk1sn7"; + sha256 = "11rd54brdbxb5ari6zan7gyr0fa1m0rmwcn5a8h8dla3xprw30wp"; }; - modSha256 = "1q7il1x1pfyz15z23cs0kk7zyacn6b3y28b1q52bqi30l1x8bdbp"; + vendorSha256 = "05nj99hl5f5l0a2aswy19wmbm94hd1h03r227gmn419dkzc5hpah"; buildFlagsArray = [ ''-ldflags= -w -s -X main.version=${version} @@ -31,4 +31,4 @@ buildGoModule rec { homepage = "https://www.influxdata.com/time-series-platform/telegraf/"; maintainers = with maintainers; [ mic92 roblabla foxit64 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index f307032f41417..227085184298c 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.11.0"; + version = "0.12.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "152ic9pga0wjg4r7b66hdnbsj9wrzfzbbps7wjas3rcbcv1f2i90"; + sha256 = "10xscm9h2krha66v96v2q85fynnxfizjcc47h7yz4xhjwvb5dgz2"; }; - modSha256 = "1pdypyyy352l6wy5lr94fv8j890lh863h8zg2hxchiymrs5pgq1c"; + vendorSha256 = "126rghnyjpykvjg9sr4kwpskc13qqafxgfn9ffykwc4jjz8vc07q"; subPackages = "cmd/thanos"; @@ -30,4 +30,4 @@ buildGoModule rec { maintainers = with maintainers; [ basvandijk ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix index 95f8ca4432b3c..9f0be68e168b6 100644 --- a/pkgs/servers/monitoring/uchiwa/default.nix +++ b/pkgs/servers/monitoring/uchiwa/default.nix @@ -16,7 +16,7 @@ let goPackagePath = "github.com/${owner}/${repo}"; inherit src; postInstall = '' - mkdir $out + mkdir -p $out cp go/src/github.com/sensu/uchiwa/public/index.html $out/ ''; }; @@ -37,7 +37,7 @@ in stdenv.mkDerivation { buildCommand = '' mkdir -p $out/bin $out/public - makeWrapper ${backend.bin}/bin/uchiwa $out/bin/uchiwa \ + makeWrapper ${backend}/bin/uchiwa $out/bin/uchiwa \ --add-flags "-p $out/public" ln -s ${backend.out}/index.html $out/public/index.html ln -s ${frontend.out}/bower_components $out/public/bower_components @@ -45,7 +45,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A Dashboard for the sensu monitoring framework"; - homepage = http://sensuapp.org/; + homepage = "http://sensuapp.org/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix index 09f43c755f168..184d7e6aea7a1 100644 --- a/pkgs/servers/monitoring/zabbix/agent.nix +++ b/pkgs/servers/monitoring/zabbix/agent.nix @@ -6,7 +6,7 @@ import ./versions.nix ({ version, sha256 }: inherit version; src = fetchurl { - url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index 697492d96277f..4179cf52c7a9c 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -21,7 +21,7 @@ in inherit version; src = fetchurl { - url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 4046cc7d8bb59..fdf3fd476df16 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -21,7 +21,7 @@ in inherit version; src = fetchurl { - url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 2b7fb972c90a4..c75df46cf0479 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,16 +1,16 @@ generic: { v44 = generic { - version = "4.4.7"; - sha256 = "13gckz5ysmqr257mcmbbbf8l43f1jdk4iyn6a3ad8xjmj3kqyys9"; + version = "4.4.8"; + sha256 = "0l9n4l5179lf90krv1kb0lraipj7q4hyba6r48n6rj2zqx2j4mn0"; }; v40 = generic { - version = "4.0.19"; - sha256 = "0csiva0iddzdf18lii7vwlvp91kh3vfl8r90jpcsnsivaqwfnkbr"; + version = "4.0.20"; + sha256 = "0h6qx4imrf5inmmczxir81a9xhra8a1dxxv538mqhxhbpqn1yh3w"; }; v30 = generic { - version = "3.0.30"; - sha256 = "0g2qw4ff02gsnmqza1cv9dq6bqyg7w9cdli6hsln07irf0hyrb07"; + version = "3.0.31"; + sha256 = "0a2jznpmg24lqdqbc9p8i2q6jkz0hx53hh6q12xsvvmq48vi3snm"; }; } diff --git a/pkgs/servers/monitoring/zabbix/web.nix b/pkgs/servers/monitoring/zabbix/web.nix index c4cf5d044dae0..a75deff3db275 100644 --- a/pkgs/servers/monitoring/zabbix/web.nix +++ b/pkgs/servers/monitoring/zabbix/web.nix @@ -6,7 +6,7 @@ import ./versions.nix ({ version, sha256 }: inherit version; src = fetchurl { - url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/pkgs/servers/monitoring/zipkin/default.nix index fe90d4d6408b5..c9b2e36d87307 100644 --- a/pkgs/servers/monitoring/zipkin/default.nix +++ b/pkgs/servers/monitoring/zipkin/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "Zipkin distributed tracing system"; - homepage = https://zipkin.io/; + homepage = "https://zipkin.io/"; license = licenses.asl20; platforms = platforms.unix; maintainers = [ maintainers.hectorj ]; diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index f19d3a1e18a1e..cb02a7684785a 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Client library for MPD (music player daemon)"; - homepage = https://www.musicpd.org/libs/libmpdclient/; + homepage = "https://www.musicpd.org/libs/libmpdclient/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 4f97e3fc7838e..8d862373b9952 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -18,6 +18,7 @@ , mpd_clientlib # Tag support , libid3tag +, nixosTests }: let @@ -102,13 +103,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.21.21"; + version = "0.21.23"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "0ysyjlmmfm1y5jqyv83bs9p7zqr9pgj1hmdq2b7kx9kridclbnng"; + sha256 = "0jnhjhm1ilpcwb4f58b8pgyzjq3dlr0j2xyk0zck0afwkdxyj9cb"; }; buildInputs = [ glib boost ] @@ -128,6 +129,8 @@ let ++ lib.optional (builtins.elem "systemd" features_) "-Dsystemd_system_unit_dir=etc/systemd/system"; + passthru.tests.nixos = nixosTests.mpd; + meta = with stdenv.lib; { description = "A flexible, powerful daemon for playing music"; homepage = "https://www.musicpd.org/"; diff --git a/pkgs/servers/mtprotoproxy/default.nix b/pkgs/servers/mtprotoproxy/default.nix index 4838fed47fb03..9faa7ec56bf22 100644 --- a/pkgs/servers/mtprotoproxy/default.nix +++ b/pkgs/servers/mtprotoproxy/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Async MTProto proxy for Telegram"; license = licenses.mit; - homepage = https://github.com/alexbers/mtprotoproxy; + homepage = "https://github.com/alexbers/mtprotoproxy"; platforms = python.meta.platforms; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/servers/mxisd/default.nix b/pkgs/servers/mxisd/default.nix index c5841d4d1a851..6e9ab2ca99a21 100644 --- a/pkgs/servers/mxisd/default.nix +++ b/pkgs/servers/mxisd/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "a federated matrix identity server"; - homepage = https://github.com/kamax-matrix/mxisd; + homepage = "https://github.com/kamax-matrix/mxisd"; license = licenses.agpl3; maintainers = with maintainers; [ mguentner ]; platforms = platforms.all; diff --git a/pkgs/servers/nas/default.nix b/pkgs/servers/nas/default.nix index 0b6451d104f3b..2e8b8b14d44f3 100644 --- a/pkgs/servers/nas/default.nix +++ b/pkgs/servers/nas/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A network transparent, client/server audio transport system"; - homepage = http://radscan.com/nas.html; + homepage = "http://radscan.com/nas.html"; license = licenses.mit; maintainers = [ maintainers.gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 7f75579b51c6f..3685589fa70a3 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { description = "High-Performance server for NATS"; license = licenses.asl20; maintainers = [ maintainers.swdunlop ]; - homepage = https://nats.io/; + homepage = "https://nats.io/"; platforms = platforms.all; }; } diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix index 29f0f29a1bc6a..efaec689a1ab3 100644 --- a/pkgs/servers/nats-streaming-server/default.nix +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { description = "NATS Streaming System Server"; license = licenses.asl20; maintainers = [ maintainers.swdunlop ]; - homepage = https://nats.io/; + homepage = "https://nats.io/"; platforms = platforms.all; }; } diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index de317ada6e450..3b360e308b571 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Near Field Communication manager"; - homepage = https://01.org/linux-nfc; + homepage = "https://01.org/linux-nfc"; license = licenses.gpl2; maintainers = with maintainers; [ tstrobel ]; platforms = platforms.unix; diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix index 0f1a8e120f65b..76ce8d2d5733f 100644 --- a/pkgs/servers/news/leafnode/default.nix +++ b/pkgs/servers/news/leafnode/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { buildInputs = [ pcre]; meta = { - homepage = http://leafnode.sourceforge.net/; + homepage = "http://leafnode.sourceforge.net/"; description = "Leafnode implements a store & forward NNTP proxy"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 29c5cb5911110..9a7cc077508f9 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, nixosTests }: let generic = { version, sha256, insecure ? false }: stdenv.mkDerivation rec { @@ -10,6 +10,8 @@ let inherit sha256; }; + passthru.tests = nixosTests.nextcloud; + installPhase = '' mkdir -p $out/ cp -R . $out/ @@ -17,7 +19,7 @@ let meta = with stdenv.lib; { description = "Sharing solution for files, calendars, contacts and more"; - homepage = https://nextcloud.com; + homepage = "https://nextcloud.com"; maintainers = with maintainers; [ schneefux bachp globin fpletz ma27 ]; license = licenses.agpl3Plus; platforms = with platforms; unix; @@ -26,12 +28,12 @@ let }; in { nextcloud17 = generic { - version = "17.0.4"; - sha256 = "0cj5mng0nmj3hz30pyz3g19kj3mkm5ca8si3sw3arv61dmw6c5g6"; + version = "17.0.6"; + sha256 = "0qq7lkgzsn1zakfym5bjqzpcisxmgfcdd927ddqlhddy3zvgxrxx"; }; nextcloud18 = generic { - version = "18.0.3"; - sha256 = "0wpxa35zj81i541j3cjq6klsjwwc5slryzvjjl7zjc32004yfrvv"; + version = "18.0.4"; + sha256 = "0aa3f4xbkzacfw0h9aic0ywk5mqlwka83qaszizj8lmk68kf3n7s"; }; } diff --git a/pkgs/servers/nextcloud/news-updater.nix b/pkgs/servers/nextcloud/news-updater.nix index 0fcb5047549db..dd7e8e4879c5a 100644 --- a/pkgs/servers/nextcloud/news-updater.nix +++ b/pkgs/servers/nextcloud/news-updater.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Fast parallel feed updater for the Nextcloud news app"; - homepage = https://github.com/nextcloud/news-updater; + homepage = "https://github.com/nextcloud/news-updater"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ schneefux ]; }; diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index cee4b3f4356bf..769a8605f0320 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -15,13 +15,13 @@ buildGoPackage rec { }; postInstall = '' - mkdir -p $bin/share - cp -R $src/frontend $bin/share + mkdir -p $out/share + cp -R $src/frontend $out/share ''; meta = with stdenv.lib; { description = "SSO authentication provider for the auth_request nginx module"; - homepage = https://github.com/Luzifer/nginx-sso; + homepage = "https://github.com/Luzifer/nginx-sso"; license = licenses.asl20; maintainers = with maintainers; [ delroth ]; platforms = platforms.unix; diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix index b7b43edc1cd9d..73a07ec057eb8 100644 --- a/pkgs/servers/nosql/aerospike/default.nix +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flash-optimized, in-memory, NoSQL database"; - homepage = http://aerospike.com/; + homepage = "http://aerospike.com/"; license = licenses.agpl3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index f3d5d121c3871..bd7f9a36c9c68 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.asl20; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = http://jena.apache.org; + homepage = "http://jena.apache.org"; downloadPage = "http://archive.apache.org/dist/jena/binaries/"; updateWalker = true; downloadURLRegexp = "apache-jena-.*[.]tar[.]gz\$"; diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index 05153a7f85948..135fd31ea3d21 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.asl20; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = http://jena.apache.org; + homepage = "http://jena.apache.org"; downloadPage = "http://archive.apache.org/dist/jena/binaries/"; downloadURLRegexp = "apache-jena-fuseki-.*[.]tar[.]gz\$"; }; diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index e41930a2f4857..54d5e8484bcb9 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -45,7 +45,7 @@ let enableParallelBuilding = true; meta = with lib; { - homepage = https://www.arangodb.com; + homepage = "https://www.arangodb.com"; description = "A native multi-model database with flexible data models for documents, graphs, and key-values"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index fd0a97d029d5f..6ccd2e1c8ddfa 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://cassandra.apache.org/; + homepage = "http://cassandra.apache.org/"; description = "A massively scalable open source NoSQL database"; platforms = platforms.unix; license = licenses.asl20; diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index d1f4938197ca4..239c6875c3421 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "EventStore"; - version = "5.0.7"; + version = "5.0.8"; src = fetchFromGitHub { owner = "EventStore"; repo = "EventStore"; rev = "oss-v${version}"; - sha256 = "0yvprql73g4lc88b6kp1kk8h64az2hn4am5hc4gyiaxfavaww3ci"; + sha256 = "021m610gzmrp2drywl1q3y6xxpy4qayn580d855ag952z9s6w9nj"; }; buildInputs = [ diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 3669df47ee2a3..4bddd77248a6d 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -1,30 +1,26 @@ -{ lib, buildGoPackage, fetchFromGitHub, }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "influxdb"; - version = "1.7.6"; + version = "1.8.0"; src = fetchFromGitHub { owner = "influxdata"; repo = pname; rev = "v${version}"; - sha256 = "07abzhmsgj7krmhf7jis50a4fc4w29h48nyzgvrll5lz3cax979q"; + sha256 = "111n36xifmd644xp80imqxx61nlap6fdwx1di2qphlqb43z99jrq"; }; - buildFlagsArray = [ ''-ldflags= - -X main.version=${version} - '' ]; + vendorSha256 = "097x3z1fhdl5s3ni2qzbqxqr60l6lqcrbikq20fs052dp287q0sp"; - goPackagePath = "github.com/influxdata/influxdb"; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; excludedPackages = "test"; - goDeps = ./deps.nix; - meta = with lib; { description = "An open-source distributed time series database"; license = licenses.mit; - homepage = https://influxdata.com/; + homepage = "https://influxdata.com/"; maintainers = with maintainers; [ offline zimbatm ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/nosql/influxdb/deps.nix b/pkgs/servers/nosql/influxdb/deps.nix deleted file mode 100644 index 5492ad9d8eaac..0000000000000 --- a/pkgs/servers/nosql/influxdb/deps.nix +++ /dev/null @@ -1,804 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "collectd.org"; - fetch = { - type = "git"; - url = "https://github.com/collectd/go-collectd"; - rev = "2ce144541b8903101fb8f1483cc0497a68798122"; - sha256 = "0rr9rnc777jk27a7yxhdb7vgkj493158a8k6q44x51s30dkp78x3"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"; - sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5"; - }; - } - { - goPackagePath = "github.com/Masterminds/semver"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/semver"; - rev = "c7af12943936e8c39859482e61f0574c2fd7fc75"; - sha256 = "0k2fpk2x8jbvqkqxx5hkx1ygrsppzmzypqb90i1r33yq7ac7zlxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/kingpin"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/apache/arrow"; - fetch = { - type = "git"; - url = "https://github.com/apache/arrow"; - rev = "f5df77359953ed06e1dce47edffc03340e2ff3ea"; - sha256 = "12lygmhrchpf46jzyf0gnbfq3bf9ha68iajbnzflqf6k78jf6dj7"; - }; - } - { - goPackagePath = "github.com/apex/log"; - fetch = { - type = "git"; - url = "https://github.com/apex/log"; - rev = "941dea75d3ebfbdd905a5d8b7b232965c5e5c684"; - sha256 = "0cavvljwrxhxpsf6wdfncswamsqvpkah2pmnm6g94iq6l16lkbix"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "dd947f47decb37a7c3bee72501bfc790701ab5ad"; - sha256 = "1l4lxxlw0x2lkkr2m78p67ncr7dbv9a5ij8ahwa8hqm2sv0zsc5d"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/blakesmith/ar"; - fetch = { - type = "git"; - url = "https://github.com/blakesmith/ar"; - rev = "8bd4349a67f2533b078dbc524689d15dba0f4659"; - sha256 = "1rdbn3v9vv3cs6indgrf9agydcbaspyc21fi0mpxlksva1sci99j"; - }; - } - { - goPackagePath = "github.com/bmizerany/pat"; - fetch = { - type = "git"; - url = "https://github.com/bmizerany/pat"; - rev = "6226ea591a40176dd3ff9cd8eff81ed6ca721a00"; - sha256 = "0qjkm7169y6pybwh0s02fjjk251isa2b367xqfzrwvl6cy4yzfxp"; - }; - } - { - goPackagePath = "github.com/boltdb/bolt"; - fetch = { - type = "git"; - url = "https://github.com/boltdb/bolt"; - rev = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8"; - sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"; - }; - } - { - goPackagePath = "github.com/c-bata/go-prompt"; - fetch = { - type = "git"; - url = "https://github.com/c-bata/go-prompt"; - rev = "e99fbc797b795e0a7a94affc8d44f6a0350d85f0"; - sha256 = "00i8wfi51hzla59qgkdlijnvad4h1p1si9jaaw3jzchm7g7ryrlj"; - }; - } - { - goPackagePath = "github.com/caarlos0/ctrlc"; - fetch = { - type = "git"; - url = "https://github.com/caarlos0/ctrlc"; - rev = "70dc48d5d792f20f684a8f1d29bbac298f4b2ef4"; - sha256 = "1xqlagjzwvfls17vn5zlmw58g4ha60hvpjpj7nbd9mn87yd2h22j"; - }; - } - { - goPackagePath = "github.com/campoy/unique"; - fetch = { - type = "git"; - url = "https://github.com/campoy/unique"; - rev = "88950e537e7e644cd746a3102037b5d2b723e9f5"; - sha256 = "1cf0mfdxx68ak8i3x5z50nhr29ivpssg2sg73krdpxs2qjzwji90"; - }; - } - { - goPackagePath = "github.com/cespare/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/cespare/xxhash"; - rev = "5c37fe3735342a2e0d01c87a907579987c8936cc"; - sha256 = "02aii7z46sasagw816zz3v0gzax1z5d1hkjslz7ng25386p0gzk1"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; - sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; - }; - } - { - goPackagePath = "github.com/dgryski/go-bitstream"; - fetch = { - type = "git"; - url = "https://github.com/dgryski/go-bitstream"; - rev = "3522498ce2c8ea06df73e55df58edfbfb33cfdd6"; - sha256 = "1lr0qjdddxdiwfs530saglk4q5395i4n3w8h8k5j8nsjj8k3na7f"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "570b54cabe6b8eb0bc2dfce68d964677d63b5260"; - sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh"; - }; - } - { - goPackagePath = "github.com/glycerine/go-unsnap-stream"; - fetch = { - type = "git"; - url = "https://github.com/glycerine/go-unsnap-stream"; - rev = "9f0cb55181dd3a0a4c168d3dbc72d4aca4853126"; - sha256 = "1v10z30y9qc8dl34x0s8lr773g6raxilfdxbmzd1176pspzcmm9n"; - }; - } - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "7b294651033cd7d9e7f0d9ffa1b75ed1e198e737"; - sha256 = "0y6qzla90zd6dhs04vclrg46rwlsy9zlqi0y6y2k1pdxn2cbblhb"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "72cd26f257d44c1114970e19afddcd812016007e"; - sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "636bf0302bc95575d69441b25a2603156ffdddf1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380"; - sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "3af367b6b30c263d47e8895973edcca9a49cf029"; - sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; - }; - } - { - goPackagePath = "github.com/google/go-github"; - fetch = { - type = "git"; - url = "https://github.com/google/go-github"; - rev = "dd29b543e14c33e6373773f2c5ea008b29aeac95"; - sha256 = "0sk67d9zdn420h2g4l3wib28zqr3ihbg6dj382cwmns7yska58lp"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "44c6ddd0a2342c386950e880b658017258da92fc"; - sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; - }; - } - { - goPackagePath = "github.com/goreleaser/goreleaser"; - fetch = { - type = "git"; - url = "https://github.com/goreleaser/goreleaser"; - rev = "f99940ff5397b099bf606cf1323c00c63afcd153"; - sha256 = "1mh4j0vdyxhr7fmwva59p0wrsrk318c2fbgzf1vqbgs8iwibs739"; - }; - } - { - goPackagePath = "github.com/goreleaser/nfpm"; - fetch = { - type = "git"; - url = "https://github.com/goreleaser/nfpm"; - rev = "de75d679901371e3ed0c0a606e160539d5a4b45e"; - sha256 = "1dbw458xndgj9k5dvffrqkz7cq6rcmflvsvzd8adsg24a3mk3qgy"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4"; - sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; - }; - } - { - goPackagePath = "github.com/influxdata/flux"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/flux"; - rev = "bcfc535fb7443776501797df4ba596483c50c7fe"; - sha256 = "0w87dqphaca49hb9wdrs35plvhcpgfmfwd5k00vbkwwmyil7majf"; - }; - } - { - goPackagePath = "github.com/influxdata/influxql"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/influxql"; - rev = "1cbfca8e56b6eaa120f5b5161e4f0d5edcc9e513"; - sha256 = "0hfjr5yg6cbvlv96l4riw6bv5gdv7y1sfymm7awix1ab6xdmv3lm"; - }; - } - { - goPackagePath = "github.com/influxdata/line-protocol"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/line-protocol"; - rev = "a3afd890113fb9f0337e05808bb06fb0ca4c685a"; - sha256 = "1nspgpm8na2agkmzd4fhn7g8sqyn77mj6hzx1l27zbwf8ask266h"; - }; - } - { - goPackagePath = "github.com/influxdata/roaring"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/roaring"; - rev = "fc520f41fab6dcece280e8d4853d87a09a67f9e0"; - sha256 = "0jr9r5q4s5bz4kbqndrlm5aikls4kqbl955qbsh6bpbmxdsamcsr"; - }; - } - { - goPackagePath = "github.com/influxdata/tdigest"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/tdigest"; - rev = "bf2b5ad3c0a925c44a0d2842c5d8182113cd248e"; - sha256 = "0cf0hcm4g052qzq4n67vxl5qh7lvp13x23hndzwmazxzdaar8gh1"; - }; - } - { - goPackagePath = "github.com/influxdata/usage-client"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/usage-client"; - rev = "6d3895376368aa52a3a81d2a16e90f0f52371967"; - sha256 = "0a5adnid42f9vpckgcpkj7v60fh147j7zlg1rhxcpq5vkw698ifl"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "0b12d6b5"; - sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; - }; - } - { - goPackagePath = "github.com/jsternberg/zap-logfmt"; - fetch = { - type = "git"; - url = "https://github.com/jsternberg/zap-logfmt"; - rev = "ac4bd917e18a4548ce6e0e765b29a4e7f397b0b6"; - sha256 = "0pqp2nsqvsq8kqc7l14340lrvl03715s12bag63kdbi25s8fcdkx"; - }; - } - { - goPackagePath = "github.com/jwilder/encoding"; - fetch = { - type = "git"; - url = "https://github.com/jwilder/encoding"; - rev = "b4e1701a28efcc637d9afcca7d38e495fe909a09"; - sha256 = "195js5njz86k096p3ggglgpc7rw3801mpqzdfwfr3miflhnp7nwg"; - }; - } - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "80517062f582ea3340cd4baf70e86d539ae7d84d"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "github.com/klauspost/compress"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/compress"; - rev = "b939724e787a27c0005cabe3f78e7ed7987ac74f"; - sha256 = "1y7951q0ji894d111lqqbacq64cxyi2dxsni5sqi9488zsasgw8s"; - }; - } - { - goPackagePath = "github.com/klauspost/cpuid"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/cpuid"; - rev = "ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da"; - sha256 = "178apw89g8nsd7w6mbdylxn956h3iig6rbw3bkivp6lplhb5dvq4"; - }; - } - { - goPackagePath = "github.com/klauspost/crc32"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/crc32"; - rev = "cb6bfca970f6908083f26f39a79009d608efd5cd"; - sha256 = "0q4yr4isgmph1yf1vq527lpmid7vqv56q7vxh3gkp5679fb90q6n"; - }; - } - { - goPackagePath = "github.com/klauspost/pgzip"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/pgzip"; - rev = "0bf5dcad4ada2814c3c00f996a982270bb81a506"; - sha256 = "0dgp2iljvhibzxia1g3lsfg4bjmfh4kf0bfrmfi7sd49hwhrvk7s"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "4ded0e9383f75c197b3a2aaa6d590ac52df6fd79"; - sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "9e777a8366cce605130a531d2cd6363d07ad7317"; - sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb"; - }; - } - { - goPackagePath = "github.com/mattn/go-tty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-tty"; - rev = "13ff1204f104d52c3f7645ec027ecbcf9026429e"; - sha256 = "1c9vzrq7r5skq0cz9alkix9n1cp6h7wybdwrg0f1vzvxj26qr7yq"; - }; - } - { - goPackagePath = "github.com/mattn/go-zglob"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-zglob"; - rev = "2ea3427bfa539cca900ca2768d8663ecc8a708c1"; - sha256 = "1sncdyq5fbd42al4amyy91h7vlzm3wm6c9vl8za2pjgfgsd581fz"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4"; - sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; - }; - } - { - goPackagePath = "github.com/mschoch/smat"; - fetch = { - type = "git"; - url = "https://github.com/mschoch/smat"; - rev = "90eadee771aeab36e8bf796039b8c261bebebe4f"; - sha256 = "141saq6d4z3c7v3jw45zy4gn6wwjlyralqygjff1fzvz1gkvimk3"; - }; - } - { - goPackagePath = "github.com/opentracing/opentracing-go"; - fetch = { - type = "git"; - url = "https://github.com/opentracing/opentracing-go"; - rev = "bd9c3193394760d98b2fa6ebb2291f0cd1d06a7d"; - sha256 = "11ad6yhi1fi7ybg6jj18kw5pl12zhvvcrkjqbz6rspawb5qrlq1g"; - }; - } - { - goPackagePath = "github.com/paulbellamy/ratecounter"; - fetch = { - type = "git"; - url = "https://github.com/paulbellamy/ratecounter"; - rev = "524851a93235ac051e3540563ed7909357fe24ab"; - sha256 = "0z4c61ac6v8mpnr9z37d91h1cf8v9psja5jfdxmsf69r1b7qr4f9"; - }; - } - { - goPackagePath = "github.com/peterh/liner"; - fetch = { - type = "git"; - url = "https://github.com/peterh/liner"; - rev = "8c1271fcf47f341a9e6771872262870e1ad7650c"; - sha256 = "15swk6y173sdav3gzxk0rj2z17khsyc8wljk6gk3w4fq9wnziggd"; - }; - } - { - goPackagePath = "github.com/philhofer/fwd"; - fetch = { - type = "git"; - url = "https://github.com/philhofer/fwd"; - rev = "bb6d471dc95d4fe11e432687f8b70ff496cf3136"; - sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pkg/term"; - fetch = { - type = "git"; - url = "https://github.com/pkg/term"; - rev = "bffc007b7fd5a70e20e28f5b7649bb84671ef436"; - sha256 = "0c9xnx7dyw7j890nm9av5fjpqjb129z7vbg3lw554vwnckc84x54"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "661e31bf844dfca9aeba15f27ea8aa0d485ad212"; - sha256 = "0r9sr3m57ks7rc5bbghl0gy9wxlznzmz331xdp42zlgk6g774xcn"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"; - sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "7600349dcfe1abd18d72d3a1770870d9800a7801"; - sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "ae68e2d4c00fed4943b5f6698d504a5fe083da8a"; - sha256 = "04sar4k99w8nvq3kwx6chz0mbp4s6xfjfxww7aqfd950xgs2jv5f"; - }; - } - { - goPackagePath = "github.com/retailnext/hllpp"; - fetch = { - type = "git"; - url = "https://github.com/retailnext/hllpp"; - rev = "101a6d2f8b52abfc409ac188958e7e7be0116331"; - sha256 = "1dyyjyrscd3d22jhh2pbn67c6nzva0v069215sjjmj313k1xzmj3"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"; - sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; - }; - } - { - goPackagePath = "github.com/segmentio/kafka-go"; - fetch = { - type = "git"; - url = "https://github.com/segmentio/kafka-go"; - rev = "0b3aacc527812d4040e51211146a43545e82d670"; - sha256 = "05qz309l8chs9p2f1vqapgc4k459wflhhlc7p18ij5kz7qhx2mjl"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "8c9545af88b134710ab1cd196795e7f2388358d7"; - sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; - }; - } - { - goPackagePath = "github.com/tinylib/msgp"; - fetch = { - type = "git"; - url = "https://github.com/tinylib/msgp"; - rev = "b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1"; - sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc"; - }; - } - { - goPackagePath = "github.com/willf/bitset"; - fetch = { - type = "git"; - url = "https://github.com/willf/bitset"; - rev = "d860f346b89450988a379d7d705e83c58d1ea227"; - sha256 = "18419ip5mnblnyx2rjixad90dhjb1x2kaiidr7zk9b3qci799rh0"; - }; - } - { - goPackagePath = "github.com/xlab/treeprint"; - fetch = { - type = "git"; - url = "https://github.com/xlab/treeprint"; - rev = "d6fb6747feb6e7cfdc44682a024bddf87ef07ec2"; - sha256 = "1ln6p8va53sxrhyy0gfanskzzc30c55l6nk1f0bin91jlr2mxn4n"; - }; - } - { - goPackagePath = "go.uber.org/atomic"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/atomic"; - rev = "1ea20fb1cbb1cc08cbd0d913a96dead89aa18289"; - sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; - }; - } - { - goPackagePath = "go.uber.org/multierr"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/multierr"; - rev = "3c4937480c32f4c13a875a1829af76c98ca3d40a"; - sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w"; - }; - } - { - goPackagePath = "go.uber.org/zap"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/zap"; - rev = "4d45f9617f7d90f7a663ff21c7a4321dbe78098b"; - sha256 = "0fpgcbqv8inx70jmnrv0zay7mjj8rwwcvd3ivqwy1wmrmkm8jjmj"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9"; - sha256 = "0hjjk6k9dq7zllwsw9icdfbli12ii379q2lajd6l7lyw72wy28by"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1"; - sha256 = "018zmn4kmg2mbngcciqal54slc3pl4ry5vlv0bw36fcxvnazxnbp"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "c57b0facaced709681d9f90397429b9430a74754"; - sha256 = "044rx9vkkwpp7d23gdk3k4yb7k28kcy34y83pjb1gwndhhh019w1"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"; - sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "fbb02b2291d28baffd63558aa44b4b56f178d650"; - sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "45ff765b4815d34d8b80220fd05c79063b185ce1"; - sha256 = "0pirpy0xcks294zd629x6p5yxwcpz1xbxbg6hy5xpxqq2v24nxqr"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "ae0ab99deb4dc413a2b4bd6c8bdd0eb67f1e4d06"; - sha256 = "1iabxnqgxvvn1239i6fvfl375vlbvhfrc03m1x2rvalmx4d6w9c7"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "fedd2861243fd1a8152376292b921b394c7bef7e"; - sha256 = "08324j170skzacglhjmpkpsivp9gwcvmljx1nq6a2d2h2qksfdbp"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8"; - sha256 = "0d8vj372ri55mrqfc0rhjl3albp5ykwfjhda1s5cgm5n40v70pr3"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "d73ab98e7c39fdcf9ba65062e43d34310f198353"; - sha256 = "1khl6szjj0skkfqp234p9rf3icik7fw2pk2x0wbj3wa9q3f84hb7"; - }; - } -] \ No newline at end of file diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index e3d277ba5afbf..8ffdbcd63c4c4 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -6,7 +6,9 @@ with stdenv.lib; -{ version, sha256, patches ? [] }@args: +{ version, sha256, patches ? [] +, license ? stdenv.lib.licenses.sspl +}@args: let python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]); @@ -109,7 +111,7 @@ in stdenv.mkDerivation rec { meta = { description = "A scalable, high-performance, open source NoSQL database"; homepage = "http://www.mongodb.org"; - license = licenses.sspl; + inherit license; maintainers = with maintainers; [ bluescreen303 offline cstrahan ]; platforms = subtractLists systems.doubles.i686 systems.doubles.unix; diff --git a/pkgs/servers/nosql/mongodb/v3_4.nix b/pkgs/servers/nosql/mongodb/v3_4.nix index 2f02ae7f72ade..e1c71bc13f7a9 100644 --- a/pkgs/servers/nosql/mongodb/v3_4.nix +++ b/pkgs/servers/nosql/mongodb/v3_4.nix @@ -12,4 +12,5 @@ in buildMongoDB { version = "3.4.24"; sha256 = "0j6mvgv0jnsnvgkl8505bl88kbxkba66qijlpi1la0dd5pd1imfr"; patches = [ ./forget-build-dependencies-3-4.patch ]; + license = stdenv.lib.licenses.agpl3; } diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 98dd604c76ddb..743553f5f6167 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A highly scalable, robust (fully ACID) native graph database"; - homepage = http://www.neo4j.org/; + homepage = "http://www.neo4j.org/"; license = licenses.gpl3; maintainers = [ maintainers.offline ]; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 8e75ee4fbde2f..8089fa46f92d5 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, lua, jemalloc, nixosTests }: +{ stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests }: stdenv.mkDerivation rec { - version = "5.0.8"; + version = "6.0.3"; pname = "redis"; src = fetchurl { url = "http://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "1msfxr97aflk5zdgq8xvdbsgmzb906x0vdc1v6l2ccs35z2fmizk"; + sha256 = "0fmvbhbgkrw75kqzgpklasylzff4zd0sxy2cvsrgg4pyh776v95w"; }; # Cross-compiling fixes @@ -18,13 +18,14 @@ stdenv.mkDerivation rec { ''} ''; - buildInputs = [ lua ]; + buildInputs = [ lua pkgconfig ] ++ stdenv.lib.optional (stdenv.isLinux) systemd; # More cross-compiling fixes. # Note: this enables libc malloc as a temporary fix for cross-compiling. # Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator. # It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them! makeFlags = [ "PREFIX=$(out)" ] - ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ]; + ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ] + ++ stdenv.lib.optional (stdenv.isLinux) ["USE_SYSTEMD=yes"]; enableParallelBuilding = true; diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 63c1b3b5fd771..46a23ed2529f1 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { query language that supports really useful queries like table joins and group by, and is easy to setup and learn. ''; - homepage = http://www.rethinkdb.com; + homepage = "http://www.rethinkdb.com"; license = stdenv.lib.licenses.agpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice bluescreen303 ]; diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 75d309fe90998..eb956b130edf8 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -1,17 +1,18 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "VictoriaMetrics"; - version = "1.34.5"; + version = "1.34.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0isifyvbrv0f6l32dycka67cpnizwh2c9ns2q8pz6r2myzbdsf3s"; + sha256 = "0k4l3nq1d6f5qjx8svgga0ygv9mmhykvs3n3xr824ih6d0vrkzbg"; }; - modSha256 = "0fr5yah4qicqjfgina1ghflaz8dlzsqk3rrpsvg5l68jb6l7nxkb"; + goPackagePath = "github.com/VictoriaMetrics/VictoriaMetrics"; + meta = with lib; { homepage = "https://victoriametrics.com/"; description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus"; diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix index d094fda84b4f1..225c221b319ef 100644 --- a/pkgs/servers/oauth2_proxy/default.nix +++ b/pkgs/servers/oauth2_proxy/default.nix @@ -2,23 +2,28 @@ buildGoPackage rec { pname = "oauth2_proxy"; - version = "3.2.0"; - + version = "5.1.0"; + goPackagePath = "github.com/pusher/${pname}"; src = fetchFromGitHub { repo = pname; owner = "pusher"; - sha256 = "0k73ggyh12g2vzjq91i9d3bxbqfvh5k6njzza1lvkzasgp07wisg"; + sha256 = "190k1v2c1f6vp9waqs01rlzm0jc3vrmsq1w1n0c2q2nfqx76y2wz"; rev = "v${version}"; }; goDeps = ./deps.nix; + doCheck = true; + + # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile + buildFlagsArray = ("-ldflags=-X main.VERSION=${version}"); + meta = with lib; { - description = "A reverse proxy that provides authentication with Google, Github or other provider"; - homepage = https://github.com/pusher/oauth2_proxy/; + description = "A reverse proxy that provides authentication with Google, Github, or other providers"; + homepage = "https://github.com/pusher/oauth2_proxy/"; license = licenses.mit; - maintainers = [ maintainers.yorickvp ]; + maintainers = with maintainers; [ yorickvp knl ]; }; } diff --git a/pkgs/servers/oauth2_proxy/deps.nix b/pkgs/servers/oauth2_proxy/deps.nix index dd10ab2866894..611a07c2fda08 100644 --- a/pkgs/servers/oauth2_proxy/deps.nix +++ b/pkgs/servers/oauth2_proxy/deps.nix @@ -1,183 +1,615 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { - goPackagePath = "cloud.google.com/go"; + goPackagePath = "cloud.google.com/go"; fetch = { type = "git"; url = "https://code.googlesource.com/gocloud"; - rev = "2d3a6656c17a60b0815b7e06ab0be04eacb6e613"; - sha256 = "0fi3qj9fvc4bxbrwa1m5sxsb8yhvawiwigaddvmmizjykxbq5csq"; + rev = "v0.38.0"; + sha256 = "0n6n13b7lri2fmc4bn4ifszyawj31dpbzvyv0xafsf81440z8cyh"; }; } { - goPackagePath = "github.com/BurntSushi/toml"; + goPackagePath = "github.com/BurntSushi/toml"; fetch = { type = "git"; url = "https://github.com/BurntSushi/toml"; - rev = "b26d9c308763d68093482582cea63d69be07a0f0"; - sha256 = "0k7v2i1d2d6si8gswn83qb84czhhia53v2wdy33yz9ppdidxk0ry"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; }; } { - goPackagePath = "github.com/bitly/go-simplejson"; + goPackagePath = "github.com/alicebob/gopher-json"; + fetch = { + type = "git"; + url = "https://github.com/alicebob/gopher-json"; + rev = "5a6b3ba71ee6"; + sha256 = "0hx6n722zq51p852lv56k39yjy09lw6mnr2c3x0p23rfyyrakj2p"; + }; + } + { + goPackagePath = "github.com/alicebob/miniredis"; + fetch = { + type = "git"; + url = "https://github.com/alicebob/miniredis"; + rev = "v2.11.2"; + sha256 = "1fc6w9n1jznwj8ks2svxmjrv87pk3spjf5z3kcxpgpynp13pd55n"; + }; + } + { + goPackagePath = "github.com/bitly/go-simplejson"; fetch = { type = "git"; url = "https://github.com/bitly/go-simplejson"; - rev = "aabad6e819789e569bd6aabf444c935aa9ba1e44"; + rev = "v0.5.0"; sha256 = "0n9f9dz1jn1jx86d48569nznpjn9fmq3knn7r65xpy7jhih284jj"; }; } { - goPackagePath = "github.com/coreos/go-oidc"; + goPackagePath = "github.com/bmizerany/assert"; + fetch = { + type = "git"; + url = "https://github.com/bmizerany/assert"; + rev = "b7ed37b82869"; + sha256 = "18hy1wyl9zdi7sgxafrn3m7fadh6in0rhhb8l0cvkxqzdl0jcw2s"; + }; + } + { + goPackagePath = "github.com/census-instrumentation/opencensus-proto"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-proto"; + rev = "v0.2.1"; + sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; + }; + } + { + goPackagePath = "github.com/chzyer/logex"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/logex"; + rev = "v1.1.10"; + sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4"; + }; + } + { + goPackagePath = "github.com/chzyer/readline"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/readline"; + rev = "2972be24d48e"; + sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; + }; + } + { + goPackagePath = "github.com/chzyer/test"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/test"; + rev = "a1ea475d72b1"; + sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k"; + }; + } + { + goPackagePath = "github.com/client9/misspell"; + fetch = { + type = "git"; + url = "https://github.com/client9/misspell"; + rev = "v0.3.4"; + sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; + }; + } + { + goPackagePath = "github.com/coreos/go-oidc"; fetch = { type = "git"; url = "https://github.com/coreos/go-oidc"; - rev = "77e7f2010a464ade7338597afe650dfcffbe2ca8"; - sha256 = "0mh8fa7al9gfzx4k7rd623bpy14s06s96iz6lbf6psi5q2bnbs2r"; + rev = "v2.2.1"; + sha256 = "11m6slbpi33ynffml7812piq4anhjlf1qszjlsf26f5y7x3qh8n5"; }; } { - goPackagePath = "github.com/davecgh/go-spew"; + goPackagePath = "github.com/davecgh/go-spew"; fetch = { type = "git"; url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + rev = "v1.1.0"; sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; }; } { - goPackagePath = "github.com/dgrijalva/jwt-go"; + goPackagePath = "github.com/dgrijalva/jwt-go"; fetch = { type = "git"; url = "https://github.com/dgrijalva/jwt-go"; - rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; + rev = "v3.2.0"; sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; }; } { - goPackagePath = "github.com/golang/protobuf"; + goPackagePath = "github.com/envoyproxy/go-control-plane"; + fetch = { + type = "git"; + url = "https://github.com/envoyproxy/go-control-plane"; + rev = "5f8ba28d4473"; + sha256 = "1f1s764rd41vd9vgk3r14h1m6fz6pdvxj6fd83q58gxifbc4q5w4"; + }; + } + { + goPackagePath = "github.com/envoyproxy/protoc-gen-validate"; + fetch = { + type = "git"; + url = "https://github.com/envoyproxy/protoc-gen-validate"; + rev = "v0.1.0"; + sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/go-redis/redis"; + fetch = { + type = "git"; + url = "https://github.com/go-redis/redis"; + rev = "v6.15.7"; + sha256 = "0fc0sfispyzn652ny05wn6bz18a60n6ryk23ki8j97xx3l24nq2g"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "v1.2.0"; + sha256 = "12ddj2g8ab87id6n2n67vnbhq6p8dvgsq1pzpqfriym4dk8w54fg"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845"; - sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8"; + rev = "v1.3.2"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + }; + } + { + goPackagePath = "github.com/gomodule/redigo"; + fetch = { + type = "git"; + url = "https://github.com/gomodule/redigo"; + rev = "v2.0.0"; + sha256 = "1kg7s8027b4g1sfw0v3nh30c15j407kv684s53gg281r807dnfpk"; + }; + } + { + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "4030bb1f1f0c"; + sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.3.0"; + sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; + }; + } + { + goPackagePath = "github.com/google/martian"; + fetch = { + type = "git"; + url = "https://github.com/google/martian"; + rev = "v2.1.0"; + sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; + }; + } + { + goPackagePath = "github.com/google/pprof"; + fetch = { + type = "git"; + url = "https://github.com/google/pprof"; + rev = "3ea8567a2e57"; + sha256 = "09rhjn3ms0a72dw0yzbp237p7yhqma772zspddn6mgkh3gi3kn4c"; + }; + } + { + goPackagePath = "github.com/googleapis/gax-go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gax-go"; + rev = "v2.0.5"; + sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "v0.5.1"; + sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; + }; + } + { + goPackagePath = "github.com/hpcloud/tail"; + fetch = { + type = "git"; + url = "https://github.com/hpcloud/tail"; + rev = "v1.0.0"; + sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; + }; + } + { + goPackagePath = "github.com/jstemmer/go-junit-report"; + fetch = { + type = "git"; + url = "https://github.com/jstemmer/go-junit-report"; + rev = "af01ea7f8024"; + sha256 = "1lp3n94ris12hac02wi31f3whs88lcrzwgdg43a5j6cafg9p1d0s"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.2.0"; + sha256 = "1ywbfzz1h3a3qd8rpkiqwi1dm4w8ls9ijb4x1b7567grns9f0vnp"; }; } { - goPackagePath = "github.com/mbland/hmacauth"; + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/mbland/hmacauth"; fetch = { type = "git"; url = "https://github.com/mbland/hmacauth"; - rev = "107c17adcc5eccc9935cd67d9bc2feaf5255d2cb"; - sha256 = "1zd9r8znhkxyl997lhjk8nrlxlfv5s1hn7ql87wrcyvlsszx3mzh"; + rev = "44256dfd4bfa"; + sha256 = "1d5pbjgc5j8pi3frsjp5gqg7j12bxdbl55nhy01cv4c96hay2ij1"; }; } { - goPackagePath = "github.com/mreiferson/go-options"; + goPackagePath = "github.com/mreiferson/go-options"; fetch = { type = "git"; url = "https://github.com/mreiferson/go-options"; - rev = "20ba7d382d05facb01e02eb777af0c5f229c5c95"; - sha256 = "1vdz3wqkj885a0jkggaygl4k6k8b94fpspywr26snm4xnb8vgxsf"; + rev = "v1.0.0"; + sha256 = "1pxs9ybrh196qy14ijn4zn51h2z28lj31y6vxrz2xxhgvpmfmxyl"; + }; + } + { + goPackagePath = "github.com/onsi/ginkgo"; + fetch = { + type = "git"; + url = "https://github.com/onsi/ginkgo"; + rev = "v1.12.0"; + sha256 = "0ly246i0ax53l6dn9f1zlhkd9gs03hvbk7aazxay2dd5fxzh9n65"; }; } { - goPackagePath = "github.com/pmezard/go-difflib"; + goPackagePath = "github.com/onsi/gomega"; + fetch = { + type = "git"; + url = "https://github.com/onsi/gomega"; + rev = "v1.9.0"; + sha256 = "0l69r6nbnz6b3j9zrqn8aql88jjv1pqykzkvqdbhfprss9b2dy46"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; fetch = { type = "git"; url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + rev = "v1.0.0"; sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; }; } { - goPackagePath = "github.com/pquerna/cachecontrol"; + goPackagePath = "github.com/pquerna/cachecontrol"; fetch = { type = "git"; url = "https://github.com/pquerna/cachecontrol"; - rev = "0dec1b30a0215bb68605dfc568e8855066c9202d"; - sha256 = "14yyfhrv60rvb983rqm7s916nwvn9kcmbvnrcna2md0s3mkzs3yh"; + rev = "1555304b9b35"; + sha256 = "0nr3p9pms6jmr2s44vy2s22q1d3v6xns2kzsvkq2gg1rkx6c1hc9"; }; } { - goPackagePath = "github.com/stretchr/testify"; + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "14fe0d1b01d4"; + sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.0"; + sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"; - sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb"; + rev = "v1.5.1"; + sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; }; } { - goPackagePath = "github.com/yhat/wsutil"; + goPackagePath = "github.com/yhat/wsutil"; fetch = { type = "git"; url = "https://github.com/yhat/wsutil"; - rev = "1d66fa95c997864ba4d8479f56609620fe542928"; + rev = "1d66fa95c997"; sha256 = "1agh4ss6y1laps8pg4mdl844ivmw2wrb7rnpfyag4gai4693i7bv"; }; } { - goPackagePath = "golang.org/x/crypto"; + goPackagePath = "github.com/yuin/gopher-lua"; + fetch = { + type = "git"; + url = "https://github.com/yuin/gopher-lua"; + rev = "ab39c6098bdb"; + sha256 = "13b0rrpv3988qw8rq6z7npajn1my059ybhafi5mxff9jw09k9sja"; + }; + } + { + goPackagePath = "go.opencensus.io"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-go"; + rev = "v0.21.0"; + sha256 = "14s0a12xdzjvad0dgksgv8m3hh7nc585abvjkvyk6r67a29lxj6x"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "9f005a07e0d31d45e6656d241bb5c0f2efd4bc94"; - sha256 = "1mhmr6ljzl3iafsz4qy8vval7rmr828wh59dlqqqjqx6sqmcs1dv"; + rev = "2aa609cf4a9d"; + sha256 = "1yvis6fqbsd7f356aqyi18f76vnwj3bry6mxqnkvshq4cwrf92il"; + }; + } + { + goPackagePath = "golang.org/x/exp"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/exp"; + rev = "509febef88a4"; + sha256 = "02isrh39z8znrp5znplzy0dip2gnrl3jm1355raliyvhnhg04j6q"; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "959b441ac422"; + sha256 = "1mgcv5f00pkzsbwnq2y7vqvd1b4lr5a3s47cphh2qv4indfk7pck"; }; } { - goPackagePath = "golang.org/x/net"; + goPackagePath = "golang.org/x/net"; fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "9dfe39835686865bff950a07b394c12a98ddc811"; - sha256 = "0z8mnl4mi88syafrgqys2ak2gg3yrbna25hpz88y3anl8x4jhg1a"; + rev = "0de0cce0169b"; + sha256 = "1db7s5kbzyh2zd5lpv05n7hp8wbwdvgk0wpiwrlnig94mkr0y5aq"; }; } { - goPackagePath = "golang.org/x/oauth2"; + goPackagePath = "golang.org/x/oauth2"; fetch = { type = "git"; url = "https://go.googlesource.com/oauth2"; - rev = "9ff8ebcc8e241d46f52ecc5bff0e5a2f2dbef402"; - sha256 = "035v5w1nad6r1l22cj6f73zzr6qi4jgq71yjywf2c6rvsa5147r2"; + rev = "bf48bf16ab8d"; + sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; }; } { - goPackagePath = "google.golang.org/api"; + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "bd437916bb0e"; + sha256 = "1i8x26frmlin55k69k936zd1rp5sqnq14y5ms4rkxbfzhasdm2rx"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.2"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "85acf8d2951c"; + sha256 = "0yqnxsrarjk4qkda8kcxzmk7y90kkkxzx9iwryzrk7bzs87ky3xc"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "2c0ae7006135"; + sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "a985d3407aa7"; + sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; + }; + } + { + goPackagePath = "google.golang.org/api"; fetch = { type = "git"; url = "https://code.googlesource.com/google-api-go-client"; - rev = "8791354e7ab150705ede13637a18c1fcc16b62e8"; - sha256 = "0ps7y4m9787wvkqwrwqyb4nmmibhrihmg7xqh7sba2cyj397wngm"; + rev = "v0.19.0"; + sha256 = "0rbwijzl91xmbr9kqhiwx4fydm7r6ci6rxsi9jsy8zap9zy120f6"; }; } { - goPackagePath = "google.golang.org/appengine"; + goPackagePath = "google.golang.org/appengine"; fetch = { type = "git"; url = "https://github.com/golang/appengine"; - rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a"; - sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq"; + rev = "v1.5.0"; + sha256 = "0l7mkdnwhidv8m686x432vmx8z5nqcrr9f46ddgvrxbh4wvyfcll"; }; } { - goPackagePath = "gopkg.in/fsnotify/fsnotify.v1"; + goPackagePath = "google.golang.org/genproto"; fetch = { type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "836bfd95fecc0f1511dd66bdbf2b5b61ab8b00b6"; - sha256 = "0470dznkcbabncskgr8hfilpj5w24ygg455pyggbfbssmfv1m9gg"; + url = "https://github.com/google/go-genproto"; + rev = "24fa4b261c55"; + sha256 = "109zhaqlfd8zkbr1hk6zqbs6vcxfrk64scjwh2nswph05gr0m84d"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "v1.27.0"; + sha256 = "1ijrmgrxyabfn51nm3p9l81iaasq5fg237wnr6mdc4dzsfcg8kd7"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify/fsnotify.v1"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "gopkg.in/natefinch/lumberjack.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/natefinch/lumberjack.v2"; + rev = "v2.0.0"; + sha256 = "1m2sxypk7p805jvc68padvylyx5v7cwkh5klnnxxr0340kgspf08"; + }; + } + { + goPackagePath = "gopkg.in/square/go-jose.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/square/go-jose.v2"; + rev = "v2.4.1"; + sha256 = "1y0angxwryishwd1z0q7fp2xwjjhpw70kqh4ml4ly40akfhf1f5a"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v1"; + rev = "dd632973f1e7"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.4"; + sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2"; }; } { - goPackagePath = "gopkg.in/square/go-jose.v2"; + goPackagePath = "honnef.co/go/tools"; fetch = { type = "git"; - url = "https://github.com/square/go-jose"; - rev = "f8f38de21b4dcd69d0413faf231983f5fd6634b1"; - sha256 = "1bjrs3xq3m2ckfds0l4wqf81311ymm9agipmkllbvkadac156dsa"; + url = "https://github.com/dominikh/go-tools"; + rev = "ea95bdfd59fc"; + sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic"; }; } -] \ No newline at end of file +] diff --git a/pkgs/servers/openafs/1.6/default.nix b/pkgs/servers/openafs/1.6/default.nix index a1e56ca161ed0..4dcc7b5e05de5 100644 --- a/pkgs/servers/openafs/1.6/default.nix +++ b/pkgs/servers/openafs/1.6/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { outputsToInstall = [ "out" "doc" "man" ]; description = "Open AFS client"; - homepage = https://www.openafs.org; + homepage = "https://www.openafs.org"; license = licenses.ipl10; platforms = platforms.linux; maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix index 0d61b1cd10417..f1acdfcce5a43 100644 --- a/pkgs/servers/openafs/1.6/module.nix +++ b/pkgs/servers/openafs/1.6/module.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open AFS client kernel module"; - homepage = https://www.openafs.org; + homepage = "https://www.openafs.org"; license = licenses.ipl10; platforms = platforms.linux; maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index 5fe4cad021f1e..07f5560ff20a8 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { outputsToInstall = [ "out" "doc" "man" ]; description = "Open AFS client"; - homepage = https://www.openafs.org; + homepage = "https://www.openafs.org"; license = licenses.ipl10; platforms = platforms.linux; maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index dab97f10bee37..d998784b3faa3 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, which, autoconf, automake, flex, yacc , kernel, glibc, perl, libtool_2, kerberos, fetchpatch }: -with (import ./srcs.nix { inherit fetchurl; }); +with (import ./srcs.nix { + inherit fetchurl; +}); let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs"; @@ -16,6 +18,22 @@ in stdenv.mkDerivation { buildInputs = [ kerberos ]; + patches = [ + # openafs 5.6 patches, included in the next release + (fetchpatch { + url = "https://github.com/openafs/openafs/commit/34f1689b7288688550119638ee9959e453fde414.patch"; + sha256 = "0rxjqzr8c5ajlk8wrhgjc1qp1934qiriqdi0qxsnk4gj5ibbk4d5"; + }) + (fetchpatch { + url = "https://github.com/openafs/openafs/commit/355ea43f0d1b7feae1b3af58bc33af12838db7c3.patch"; + sha256 = "1f9xn8ql6vnxglpj3dvi30sj8vkncazjab2rc13hbw48nvsvcnhm"; + }) + (fetchpatch { + url = "https://github.com/openafs/openafs/commit/17d38e31e6f2e237a7fb4dfb46841060296310b6.patch"; + sha256 = "14dydxfm0f5fvnj0kmvgm3bgh0ajhh04i3l7l0hr9cpmwl7vrlcg"; + }) + ]; + hardeningDisable = [ "pic" ]; configureFlags = [ @@ -50,7 +68,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open AFS client kernel module"; - homepage = https://www.openafs.org; + homepage = "https://www.openafs.org"; license = licenses.ipl10; platforms = platforms.linux; maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix index 7bd0ee2eede1a..9b952938e893a 100644 --- a/pkgs/servers/openxpki/default.nix +++ b/pkgs/servers/openxpki/default.nix @@ -73,7 +73,7 @@ perlPackages.buildPerlPackage { doCheck = false; meta = { - homepage = http://www.openxpki.org; + homepage = "http://www.openxpki.org"; description = "Enterprise-grade PKI/Trustcenter software"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index b744c58d4fb18..fe3e3c06285bf 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles"; meta = { - homepage = https://github.com/Project-OSRM/osrm-backend/wiki; + homepage = "https://github.com/Project-OSRM/osrm-backend/wiki"; description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project"; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers;[ erictapen ]; diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/servers/p910nd/default.nix index 67e125d7a8cc3..f209a2d2aa6e5 100644 --- a/pkgs/servers/p910nd/default.nix +++ b/pkgs/servers/p910nd/default.nix @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { the AppSocket protocol and has the scheme socket://. LPRng also supports this protocol and the syntax is lp=remotehost%9100 in /etc/printcap. ''; - homepage = http://p910nd.sourceforge.net/; - downloadPage = https://sourceforge.net/projects/p910nd/; + homepage = "http://p910nd.sourceforge.net/"; + downloadPage = "https://sourceforge.net/projects/p910nd/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix index a113d583cb1aa..201ff3296fa5f 100644 --- a/pkgs/servers/pies/default.nix +++ b/pkgs/servers/pies/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/pies/; + homepage = "https://www.gnu.org/software/pies/"; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 0b259f9c75358..cdeaaa77c059c 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,13 +8,13 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.19.1.2630-72c16a276"; + version = "1.19.2.2737-b69929dab"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "0mjw7qx94p5avvzmbz5rkxdmvddn48s1l84d91lnvwvcdc7smj58"; + sha256 = "00s3ab66wnpwkjrp0ng8srcy3l32sh5ibv0i9m6l4d0a19hr01fs"; }; outputs = [ "out" "basedb" ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { dontAutoPatchelf = true; meta = with stdenv.lib; { - homepage = https://plex.tv/; + homepage = "https://plex.tv/"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ diff --git a/pkgs/servers/polipo/default.nix b/pkgs/servers/polipo/default.nix index a6b65cde89f9f..444705d85d018 100644 --- a/pkgs/servers/polipo/default.nix +++ b/pkgs/servers/polipo/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "LOCAL_ROOT=$(out)/share/polipo/www" ]; meta = with stdenv.lib; { - homepage = http://www.pps.jussieu.fr/~jch/software/polipo/; + homepage = "http://www.pps.jussieu.fr/~jch/software/polipo/"; description = "A small and fast caching web proxy"; license = licenses.mit; maintainers = with maintainers; [ phreedom ehmry ]; diff --git a/pkgs/servers/pounce/default.nix b/pkgs/servers/pounce/default.nix index 8fb71f72721d4..8609648378a74 100644 --- a/pkgs/servers/pounce/default.nix +++ b/pkgs/servers/pounce/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://code.causal.agency/june/pounce; + homepage = "https://code.causal.agency/june/pounce"; description = "Simple multi-client TLS-only IRC bouncer"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix index 95fbe446bb244..8bc40cb73cc92 100644 --- a/pkgs/servers/prayer/default.nix +++ b/pkgs/servers/prayer/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lpam"; meta = { - homepage = http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/; + homepage = "http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/"; description = "Yet another Webmail interface for IMAP servers on Unix systems written in C"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/servers/ps3netsrv/default.nix index 7e6b92a037647..2288942ebf302 100644 --- a/pkgs/servers/ps3netsrv/default.nix +++ b/pkgs/servers/ps3netsrv/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "C++ implementation of the ps3netsrv server"; - homepage = https://github.com/dirkvdb/ps3netsrv--; + homepage = "https://github.com/dirkvdb/ps3netsrv--"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ makefu ]; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 1a98af0558787..b9fb104d5f6c4 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { meta = { description = "Sound server for POSIX and Win32 systems"; - homepage = http://www.pulseaudio.org/; + homepage = "http://www.pulseaudio.org/"; license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ lovek323 ]; platforms = lib.platforms.unix; diff --git a/pkgs/servers/pulseaudio/qpaeq.nix b/pkgs/servers/pulseaudio/qpaeq.nix index 2ed4009b67028..1f50022a91816 100644 --- a/pkgs/servers/pulseaudio/qpaeq.nix +++ b/pkgs/servers/pulseaudio/qpaeq.nix @@ -46,7 +46,7 @@ mkDerivation rec { meta = { description = "An equalizer interface for pulseaudio's equalizer sinks"; - homepage = http://www.pulseaudio.org/; + homepage = "http://www.pulseaudio.org/"; license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ lovek323 mkg20001 ]; platforms = lib.platforms.unix; diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix index bd679fd3ff82d..5bff70878d3b7 100644 --- a/pkgs/servers/quagga/default.nix +++ b/pkgs/servers/quagga/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { It is more than a routed replacement, it can be used as a Route Server and a Route Reflector. ''; - homepage = https://www.nongnu.org/quagga/; + homepage = "https://www.nongnu.org/quagga/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ tavyc ]; diff --git a/pkgs/servers/radicale/1.x.nix b/pkgs/servers/radicale/1.x.nix index 83fa2506800fd..96c94c2bc6b2b 100644 --- a/pkgs/servers/radicale/1.x.nix +++ b/pkgs/servers/radicale/1.x.nix @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { doCheck = !pythonPackages.isPy3k; meta = with stdenv.lib; { - homepage = http://www.radicale.org/; + homepage = "http://www.radicale.org/"; description = "CalDAV CardDAV server"; longDescription = '' The Radicale Project is a complete CalDAV (calendar) and CardDAV diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix index da55131773be9..fc98795bbc796 100644 --- a/pkgs/servers/radicale/default.nix +++ b/pkgs/servers/radicale/default.nix @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://www.radicale.org/; + homepage = "https://www.radicale.org/"; description = "CalDAV CardDAV server"; longDescription = '' The Radicale Project is a complete CalDAV (calendar) and CardDAV diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix index 6d5016961e983..bff5d2ea30629 100644 --- a/pkgs/servers/rainloop/default.nix +++ b/pkgs/servers/rainloop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, dataPath ? "/etc/rainloop" }: let +{ stdenv, fetchurl, unzip, pkgs, dataPath ? "/var/lib/rainloop" }: let common = { edition, sha256 }: stdenv.mkDerivation (rec { pname = "rainloop${stdenv.lib.optionalString (edition != "") "-${edition}"}"; @@ -16,11 +16,23 @@ sha256 = sha256; }; + includeScript = pkgs.writeText "include.php" '' + <?php + + /** + * @return string + */ + function __get_custom_data_full_path() + { + return '${dataPath}'; // custom data folder path + } + ''; + installPhase = '' mkdir $out cp -r rainloop/* $out rm -rf $out/data - ln -s ${dataPath} $out/data + cp ${includeScript} $out/include.php ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/rippled/data-api.nix b/pkgs/servers/rippled/data-api.nix index 04d520b412c14..2d1db24474bbd 100644 --- a/pkgs/servers/rippled/data-api.nix +++ b/pkgs/servers/rippled/data-api.nix @@ -10,7 +10,7 @@ in nodePackages.buildNodePackage rec { rev = "c56b860105f36c1c44ae011189d495272648c589"; src = fetchgit { - url = https://github.com/ripple/ripple-data-api.git; + url = "https://github.com/ripple/ripple-data-api.git"; inherit rev; sha256 = "1iygp26ilradxj268g1l2y93cgrpchqwn71qdag67lv273dbq48m"; }; @@ -19,7 +19,7 @@ in nodePackages.buildNodePackage rec { meta = { description = "Historical ripple data"; - homepage = https://github.com/ripple/ripple-data-api; + homepage = "https://github.com/ripple/ripple-data-api"; maintainers = with maintainers; [ offline ]; }; } diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 905e776ea362e..69a54a1202d24 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -149,7 +149,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ripple P2P payment network reference server"; - homepage = https://github.com/ripple/rippled; + homepage = "https://github.com/ripple/rippled"; maintainers = with maintainers; [ ehmry offline ]; license = licenses.isc; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/servers/rippled/validator-keys-tool.nix b/pkgs/servers/rippled/validator-keys-tool.nix index 684e070292c7c..ec5794d1509ca 100644 --- a/pkgs/servers/rippled/validator-keys-tool.nix +++ b/pkgs/servers/rippled/validator-keys-tool.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Generate master and ephemeral rippled validator keys"; - homepage = https://github.com/ripple/validator-keys-tool; + homepage = "https://github.com/ripple/validator-keys-tool"; maintainers = with maintainers; [ offline ]; license = licenses.isc; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 64b212eb49fb3..49eaa26c29479 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = { description = "The music player for music lovers."; - homepage = https://roonlabs.com; + homepage = "https://roonlabs.com"; license = licenses.unfree; maintainers = with maintainers; [ steell ]; platforms = platforms.linux; diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 939424ff2bfd4..a1dc25e6e28e8 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "1gsl9rpdkv388i6zvciladhb15fw94a8xjyh4ai1664nkwl51wi4"; + sha256 = "1my726p0wmsn21nbdsjx02h6hnbh8nidzipzdy0gk0qgda1j729b"; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 9c99faca48422..46416c982760b 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "1hbqvjv9h1aghpyrl03w5f4j8gjy6n9lx83rmpsh5p7yd9ahwmf9"; + sha256 = "1qbaibmbiw3pffi0cm6d06k1gra4acgxr97gj7f1ckvql5rni4h0"; }; - cargoSha256 = "1chf1l9jlnhi9cyqpmcz8yfzwzmkn4lfxqhdhclvl8j4b2zvbcgc"; + cargoSha256 = "138h99l3vv34higbqj59fa88w7c63c80g3rw07n9j2f834cvr901"; meta = with stdenv.lib; { description = "An RPKI Validator written in Rust"; diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index 00d01b01efee0..52197a6afaac0 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { description = "ONC RPC portmapper"; license = licenses.bsd3; platforms = platforms.unix; - homepage = https://linux-nfs.org/; + homepage = "https://linux-nfs.org/"; maintainers = with maintainers; [ abbradar ]; longDescription = '' Universal addresses to RPC program number mapper. diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 57c774ebcb05a..54d327d5fc428 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Usenet NZB downloader, par2 repairer and auto extracting server"; - homepage = https://sabnzbd.org; + homepage = "https://sabnzbd.org"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with stdenv.lib.maintainers; [ fridh ]; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 1d6951bb8c1c1..0aae779106a53 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -24,6 +24,7 @@ , libtasn1 , tdb , cmocka +, nixosTests , enableLDAP ? false, openldap , enablePrinting ? false, cups @@ -42,11 +43,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.12.0"; + version = "4.12.3"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "1zk5jqnkifkfi6ssn02bh2ih7vyw2nsr0angsd6kyg3xaq5bgh3f"; + sha256 = "09w7aap1cjc41ayhaksm1igc7p7gl40fad4a1l6q4ds9a2jbrb9z"; }; outputs = [ "out" "dev" "man" ]; @@ -148,6 +149,10 @@ stdenv.mkDerivation rec { find $out -type f -name \*.so -exec $SHELL -c "$SCRIPT" \; ''; + passthru = { + tests.samba = nixosTests.samba; + }; + meta = with stdenv.lib; { homepage = "https://www.samba.org"; description = "The standard Windows interoperability suite of programs for Linux and Unix"; diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index ad3654f17dfb3..8e086ac5e66b1 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -41,7 +41,7 @@ in { else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with stdenv.lib; { - homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/analysis-icu; + homepage = "https://github.com/elastic/elasticsearch/tree/master/plugins/analysis-icu"; description = "The ICU Analysis plugin integrates the Lucene ICU module into elasticsearch"; license = licenses.asl20; }; @@ -58,7 +58,7 @@ in { else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { - homepage = https://github.com/vhyza/elasticsearch-analysis-lemmagen; + homepage = "https://github.com/vhyza/elasticsearch-analysis-lemmagen"; description = "LemmaGen Analysis plugin provides jLemmaGen lemmatizer as Elasticsearch token filter"; license = licenses.asl20; }; @@ -75,7 +75,7 @@ in { else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { - homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/discovery-ec2; + homepage = "https://github.com/elastic/elasticsearch/tree/master/plugins/discovery-ec2"; description = "The EC2 discovery plugin uses the AWS API for unicast discovery."; license = licenses.asl20; }; @@ -92,7 +92,7 @@ in { else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { - homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/ingest-attachment; + homepage = "https://github.com/elastic/elasticsearch/tree/master/plugins/ingest-attachment"; description = "Ingest processor that uses Apache Tika to extract contents"; license = licenses.asl20; }; @@ -109,7 +109,7 @@ in { else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { - homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/repository-s3; + homepage = "https://github.com/elastic/elasticsearch/tree/master/plugins/repository-s3"; description = "The S3 repository plugin adds support for using AWS S3 as a repository for Snapshot/Restore."; license = licenses.asl20; }; @@ -126,7 +126,7 @@ in { else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { - homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/repository-gcs; + homepage = "https://github.com/elastic/elasticsearch/tree/master/plugins/repository-gcs"; description = "The GCS repository plugin adds support for using Google Cloud Storage as a repository for Snapshot/Restore."; license = licenses.asl20; }; @@ -149,7 +149,7 @@ in { else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { - homepage = https://search-guard.com; + homepage = "https://search-guard.com"; description = "Elasticsearch plugin that offers encryption, authentication, and authorisation. "; license = licenses.asl20; }; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 3877740c84cdc..b53a207a6c574 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "10.0.0"; + version = "10.0.2"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "01wacd9rijnjydshsl7z0waasr87gxkwr0kr647chczcxlh1b9gr"; + sha256 = "0851sdzgg5krf05b1pg29gmwzvzxvawfp37ny3lrb5xcdqbr379c"; }; buildInputs = with stdenv.lib; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { installCheckPhase = "$out/bin/groonga --version"; meta = with stdenv.lib; { - homepage = https://groonga.org/; + homepage = "https://groonga.org/"; description = "An open-source fulltext search engine and column store"; license = licenses.lgpl21; maintainers = [ maintainers.ericsagnes ]; diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix new file mode 100644 index 0000000000000..f2484dffa6368 --- /dev/null +++ b/pkgs/servers/search/meilisearch/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, IOKit +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "meilisearch"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "meilisearch"; + repo = "MeiliSearch"; + rev = "v${version}"; + sha256 = "00i5vsbcyrbsvhr5n1b3pxa87v0kfw6pg931i2kzyf4wh021k6sw"; + }; + + cargoSha256 = "0axjygk8a7cykpa5skk4a6mkm8rndkr76l10h3z3gjdc88b17qcz"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit Security ]; + + meta = with stdenv.lib; { + description = "Ultra relevant and instant full-text search API"; + homepage = "https://meilisearch.com/"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index 0da61861207ce..73aa349a517bc 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "solr"; - version = "8.5.0"; + version = "8.5.1"; src = fetchurl { url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz"; - sha256 = "1pb1vja9spybkp2qw150kymy47njy06b5pic7mrfjq5as0d72m4y"; + sha256 = "02sa0sldsfajryyfndv587qw69q8y8igfpimg98w1g3vndrq1dj7"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix index 5c29d8b47808e..47547f07fb49a 100644 --- a/pkgs/servers/search/sphinxsearch/default.nix +++ b/pkgs/servers/search/sphinxsearch/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "An open source full text search server"; - homepage = http://sphinxsearch.com; + homepage = "http://sphinxsearch.com"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ ederoyd46 valodim ]; diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix index e18d96013e403..bbfb0315d9efc 100644 --- a/pkgs/servers/ser2net/default.nix +++ b/pkgs/servers/ser2net/default.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, fetchFromGitHub, gensio, libyaml, autoreconfHook }: +{ stdenv, lib, fetchFromGitHub, gensio, libyaml, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.1.1"; + version = "4.1.8"; src = fetchFromGitHub { owner = "cminyard"; repo = "${pname}"; rev = "v${version}"; - sha256 = "1zl68mmd7pp10cjv1jk8rs2dlbwvzskyb58qvc7ph7vc6957lfhc"; + sha256 = "0xxxxlfi4wln2l86ybdsc42qcj37mnac2s2baj6s7mqri8alaa14"; }; - buildInputs = [ autoreconfHook gensio libyaml ]; + buildInputs = [ pkgconfig autoreconfHook gensio libyaml ]; meta = with lib; { description = "Serial to network connection server"; diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix index 585fc2b73ef9c..8129cb5ad8e3e 100644 --- a/pkgs/servers/serf/default.nix +++ b/pkgs/servers/serf/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Tool for service orchestration and management"; - homepage = https://www.serf.io/; + homepage = "https://www.serf.io/"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; maintainers = with maintainers; [ pradeepchhetri ]; diff --git a/pkgs/servers/serviio/default.nix b/pkgs/servers/serviio/default.nix index 03d86c209f07d..769ed5e727281 100644 --- a/pkgs/servers/serviio/default.nix +++ b/pkgs/servers/serviio/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "serviio"; - version = "2.0"; + version = "2.1"; src = fetchurl { url = "http://download.serviio.org/releases/${pname}-${version}-linux.tar.gz"; - sha256 = "1zq1ax0pdxfn0nw0vm7s23ik47w8nwh1n83a7yka8dnknxjf5nng"; + sha256 = "0mxpdyhjf4w83q8ssmvpxm95hw4x7lfkh48vvdablccfndh82x2i"; }; phases = ["unpackPhase" "installPhase"]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://serviio.org; + homepage = "https://serviio.org"; description = "UPnP Media Streaming Server"; longDescription = '' Serviio is a free media server. It allows you to stream your media files (music, video or images) @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.thpham ]; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index fe1837e907a1c..279cfa3300be6 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/shellinabox/shellinabox; + homepage = "https://github.com/shellinabox/shellinabox"; description = "Web based AJAX terminal emulator"; license = licenses.gpl2; maintainers = with maintainers; [ tomberek lihop ]; diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 060b58d18b1b6..41543c325a639 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.gnu.org/software/shishi/; + homepage = "https://www.gnu.org/software/shishi/"; description = "An implementation of the Kerberos 5 network security system"; license = licenses.gpl3Plus; maintainers = with maintainers; [ bjg lovek323 ]; diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index cd98af51e0866..3bf72043ec509 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.21.22"; + version = "0.21.30"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "16jwvg9mcv0yr94ldncfs6bczyv4n3q9v7g7v0ssrkrnkxh722zx"; + sha256 = "19j0hm2d2q279kzmdjbjgfhjwcp7071a2mmvsnb0167wdyaq4bcf"; }; dontBuild = true; diff --git a/pkgs/servers/sickbeard/sickrage.nix b/pkgs/servers/sickbeard/sickrage.nix index 1a187dffd23ec..9ff44fade8228 100644 --- a/pkgs/servers/sickbeard/sickrage.nix +++ b/pkgs/servers/sickbeard/sickrage.nix @@ -28,7 +28,7 @@ python2.pkgs.buildPythonApplication rec { description = "Automatic Video Library Manager for TV Shows"; longDescription = "It watches for new episodes of your favorite shows, and when they are posted it does its magic."; license = licenses.gpl3; - homepage = https://sickrage.github.io; + homepage = "https://sickrage.github.io"; maintainers = with maintainers; [ sterfield ]; }; } diff --git a/pkgs/servers/silc-server/default.nix b/pkgs/servers/silc-server/default.nix index fdb1dcbd1cf61..084d60ba6a5b9 100644 --- a/pkgs/servers/silc-server/default.nix +++ b/pkgs/servers/silc-server/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://silcnet.org/; + homepage = "http://silcnet.org/"; description = "Secure Internet Live Conferencing server"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/servers/simplehttp2server/default.nix b/pkgs/servers/simplehttp2server/default.nix index 3ac32509ba3b4..58b04b316b347 100644 --- a/pkgs/servers/simplehttp2server/default.nix +++ b/pkgs/servers/simplehttp2server/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/GoogleChromeLabs/simplehttp2server; + homepage = "https://github.com/GoogleChromeLabs/simplehttp2server"; description = "HTTP/2 server for development purposes"; license = licenses.asl20; maintainers = with maintainers; [ yrashk ]; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index f6791d0108831..46ef6bcfac5ed 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -8,6 +8,7 @@ , SystemConfiguration , modules ? null +, nixosTests }: let @@ -89,12 +90,12 @@ in stdenv.mkDerivation rec { pname = "freeswitch"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "1fmrm51zgrasjbmhs0pzb1lyca3ddx0wd35shvxnkjnifi8qd1h7"; + sha256 = "0rp4sxqxd2wsb5iyv0mh11l16zxvh7rbgfg0vcgns823gvh8lqai"; }; postPatch = '' patchShebangs libs/libvpx/build/make/rtcd.pl @@ -129,9 +130,11 @@ stdenv.mkDerivation rec { cp -r conf $out/share/freeswitch/ ''; + passthru.tests.freeswitch = nixosTests.freeswitch; + meta = { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; - homepage = https://freeswitch.org/; + homepage = "https://freeswitch.org/"; license = stdenv.lib.licenses.mpl11; maintainers = with stdenv.lib.maintainers; [ misuzu ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 1252153b79ace..33c888ba35edb 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Secure peer-to-peer VoIP server that uses the SIP protocol"; - homepage = https://www.gnu.org/software/sipwitch/; + homepage = "https://www.gnu.org/software/sipwitch/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index d755f864d4e38..254825c862ef4 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -93,7 +93,7 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; meta = with stdenv.lib; { - homepage = https://github.com/Logitech/slimserver; + homepage = "https://github.com/Logitech/slimserver"; description = "Server for Logitech Squeezebox players. This server is also called Logitech Media Server"; # the firmware is not under a free license! # https://github.com/Logitech/slimserver/blob/public/7.9/License.txt diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index 730d1bbdddce1..e725e6243f00d 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Static multicast routing daemon"; - homepage = http://troglobit.com/smcroute.html; + homepage = "http://troglobit.com/smcroute.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fpletz ]; platforms = with platforms; (linux ++ freebsd ++ netbsd ++ openbsd); diff --git a/pkgs/servers/softether/4.25.nix b/pkgs/servers/softether/4.25.nix index 2b21bef7d6f65..65e21010e7570 100644 --- a/pkgs/servers/softether/4.25.nix +++ b/pkgs/servers/softether/4.25.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An Open-Source Free Cross-platform Multi-protocol VPN Program"; - homepage = https://www.softether.org/; + homepage = "https://www.softether.org/"; license = licenses.gpl2; maintainers = [ maintainers.rick68 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/servers/softether/4.29.nix b/pkgs/servers/softether/4.29.nix index 1d80752a41a56..b1ef8643aa36e 100644 --- a/pkgs/servers/softether/4.29.nix +++ b/pkgs/servers/softether/4.29.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An Open-Source Free Cross-platform Multi-protocol VPN Program"; - homepage = https://www.softether.org/; + homepage = "https://www.softether.org/"; license = licenses.asl20; maintainers = [ maintainers.rick68 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 6637a75ea2f7d..2ce8e901e8671 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -1,6 +1,7 @@ { stdenv, buildGoPackage, fetchurl , cmake, xz, which, autoconf , ncurses6, libedit, libunwind +, installShellFiles }: let @@ -8,7 +9,7 @@ let linuxDeps = [ ncurses6 ]; buildInputs = if stdenv.isDarwin then darwinDeps else linuxDeps; - nativeBuildInputs = [ cmake xz which autoconf ]; + nativeBuildInputs = [ installShellFiles cmake xz which autoconf ]; in buildGoPackage rec { @@ -41,8 +42,8 @@ buildGoPackage rec { installPhase = '' runHook preInstall - install -D cockroachoss $bin/bin/cockroach - install -D cockroach.bash $bin/share/bash-completion/completions/cockroach.bash + install -D cockroachoss $out/bin/cockroach + installShellCompletion cockroach.bash mkdir -p $man/share/man cp -r man $man/share/man @@ -50,14 +51,10 @@ buildGoPackage rec { runHook postInstall ''; - # Unfortunately we have to keep an empty reference to $out, because it seems - # buildGoPackages only nukes references to the go compiler under $bin, effectively - # making all binary output under $bin mandatory. Ideally, we would just use - # $out and $man and remove $bin since there's no point in an empty path. :( - outputs = [ "bin" "man" "out" ]; + outputs = [ "out" "man" ]; meta = with stdenv.lib; { - homepage = https://www.cockroachlabs.com; + homepage = "https://www.cockroachlabs.com"; description = "A scalable, survivable, strongly-consistent SQL database"; license = licenses.asl20; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 6f7f81f237809..2af0f149e7d8d 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.15.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "0av21czfxpwy4y7n9x6hy6m2fliqcazjx7ww0rwm6kdwxipq1xsz"; + sha256 = "141wv5av7hms4wa3s4md7mnb77bbyn3854d7gj7fy6f6jvzghdny"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - modSha256 = "0c120gkkswg0cqvvhjkxvalr4fsjv81khwg0x0fm8fr6lipkfksn"; + vendorSha256 = "1kjh252p91yxq5mi0igamkwlsr50lij24wsp2ilgz6ksv3ijzfr1"; meta = with lib; { description = "Relational database with version control and CLI a-la Git."; @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = with maintainers; [ danbst ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch b/pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch new file mode 100644 index 0000000000000..864ee818d3c16 --- /dev/null +++ b/pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch @@ -0,0 +1,12 @@ +diff --git a/plugin/auth_pam/CMakeLists.txt b/plugin/auth_pam/CMakeLists.txt +index a556b870..918a26f9 100644 +--- a/plugin/auth_pam/CMakeLists.txt ++++ b/plugin/auth_pam/CMakeLists.txt +@@ -22,7 +22,6 @@ IF(HAVE_PAM_APPL_H) + COMPONENT Server) + ENDIF() + IF(TARGET auth_pam OR TARGET auth_pam_v1) +- ADD_SUBDIRECTORY(testing) + ADD_LIBRARY(pam_user_map MODULE mapper/pam_user_map.c) + TARGET_LINK_LIBRARIES(pam_user_map pam) + SET_TARGET_PROPERTIES (pam_user_map PROPERTIES PREFIX "") diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 9c23da852f5b4..ac9772922ec28 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses +{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, nixosTests , libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl , libaio, libevent, jemalloc450, jemalloc, cracklib, systemd, perl , bzip2, lz4, lzo, snappy, xz, zlib, zstd @@ -23,14 +23,14 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.3.22"; + version = "10.4.12"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "1iyf1hl82nqsci5h327a537rvdrc5qcbrd1v3fc4cxy2pmfha01j"; + sha256 = "0252b9rxxz1ljjv6ni0wwgy14j8qmmdd2sq0a65dslx2ib9y3wgy"; name = "mariadb-${version}.tar.gz"; }; @@ -101,10 +101,18 @@ common = rec { # attributes common to both builds passthru.mysqlVersion = "5.7"; - meta = { + passthru.tests = { + mariadb-galera-mariabackup = nixosTests.mariadb-galera-mariabackup; + mariadb-galera-rsync = nixosTests.mariadb-galera-rsync; + mysql = nixosTests.mysql; + mysql-autobackup = nixosTests.mysql-autobackup; + mysql-backup = nixosTests.mysql-backup; + mysql-replication = nixosTests.mysql-replication; + }; + meta = { description = "An enhanced, drop-in replacement for MySQL"; - homepage = https://mariadb.org/; + homepage = "https://mariadb.org/"; license = licenses.gpl2; maintainers = with maintainers; [ thoughtpolice ]; platforms = platforms.all; @@ -152,7 +160,10 @@ server = stdenv.mkDerivation (common // { ++ optional stdenv.hostPlatform.isLinux linux-pam ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv; - patches = common.patches ++ optionals stdenv.hostPlatform.isDarwin [ + patches = common.patches ++ [ + # Disable build unused plugin pam_mariadb_mtr.so. See https://jira.mariadb.org/browse/MDEV-21654 + ./cmake-disable-auth-pam-testing.patch + ] ++ optionals stdenv.hostPlatform.isDarwin [ ./cmake-without-plugin-auth-pam.patch ]; @@ -189,7 +200,7 @@ server = stdenv.mkDerivation (common // { postInstall = common.postInstall + '' chmod +x "$out"/bin/wsrep_sst_common - rm "$out"/bin/{mysql_client_test,mysqltest} + rm "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest} rm -r "$out"/data # Don't need testing data '' + optionalString withStorageMroonga '' mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql diff --git a/pkgs/servers/sql/mariadb/galera/25.nix b/pkgs/servers/sql/mariadb/galera/25.nix deleted file mode 100644 index 2772d60e398b7..0000000000000 --- a/pkgs/servers/sql/mariadb/galera/25.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./. (args // { - version = "25.3.27"; - sha256 = "143kzj0fmak1gdww4qkqmmliw8klxm6mwk5531748swlwm6gqr5q"; -}) diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index 73d37ba11a220..6c3a1af907dd8 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -1,24 +1,22 @@ { stdenv, fetchFromGitHub, buildEnv , asio, boost, check, openssl, scons -, version, sha256, ... }: let - pname = "mariadb-galera"; galeraLibs = buildEnv { name = "galera-lib-inputs-united"; paths = [ openssl.out boost check ]; }; -in stdenv.mkDerivation { - inherit pname; - inherit version; +in stdenv.mkDerivation rec { + pname = "mariadb-galera"; + version = "26.4.3"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - inherit sha256; + sha256 = "1r0b4kxgqrivnwm4hprnpscb16v6l6j8cnvk4i8c64fig1ly8g3j"; fetchSubmodules = true; }; @@ -40,7 +38,7 @@ in stdenv.mkDerivation { installPhase = '' # copied with modifications from scripts/packages/freebsd.sh - GALERA_LICENSE_DIR="$share/licenses/${pname}" + GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}" install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR} install -m 555 "garb/garbd" "$out/bin/garbd" install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so" @@ -55,7 +53,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Galera 3 wsrep provider library"; - homepage = https://galeracluster.com/; + homepage = "https://galeracluster.com/"; license = licenses.lgpl2; maintainers = with maintainers; [ izorkin ]; platforms = platforms.all; diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix index 062de0c2368c9..b14b3d9f6ad48 100644 --- a/pkgs/servers/sql/oracle-xe/default.nix +++ b/pkgs/servers/sql/oracle-xe/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { meta = { description = "Oracle Database Express Edition"; - homepage = http://www.oracle.com/technetwork/products/express-edition/; + homepage = "http://www.oracle.com/technetwork/products/express-edition/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/servers/sql/patroni/default.nix index a9fc3fd1a174f..1634b0b5b74b5 100644 --- a/pkgs/servers/sql/patroni/default.nix +++ b/pkgs/servers/sql/patroni/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "patroni"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = "v${version}"; - sha256 = "0w0mz4a1cyxdsqmv7jrkw163jll8ir5zmf93zcidlqx13knrk80g"; + sha256 = "0iw0ra9fya4bf1vkjq3w5kij4x46yinb90v015pi9c6qfpancfdj"; }; # cdiff renamed to ydiff; remove when patroni source reflects this. diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix index 860c1f8e94f79..43c1de7ea8493 100644 --- a/pkgs/servers/sql/percona/5.6.x.nix +++ b/pkgs/servers/sql/percona/5.6.x.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { passthru.mysqlVersion = "5.6"; meta = with stdenv.lib; { - homepage = https://www.percona.com; + homepage = "https://www.percona.com"; description = "a free, fully compatible, enhanced, open source drop-in replacement for MySQL that provides superior performance, scalability and instrumentation"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index f71afc2b674ee..0a6d1a8cf6135 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgbouncer"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz"; - sha256 = "0gi7ggmyjqd4kxdwm5csmzmjmfrjx7q20dfzk3da1bvc6xj6ag0v"; + sha256 = "0ccxr0hbj9h5pwsj2712mxif197j770qkfjv6na5aqh5bz4j3f2c"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 32c30836f6dc5..7c2f3521a085f 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://pgpool.net/mediawiki/index.php; + homepage = "http://pgpool.net/mediawiki/index.php"; description = "A middleware that works between postgresql servers and postgresql clients"; license = licenses.free; platforms = platforms.linux; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 129292e889075..8ba7e9c96cfce 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -125,7 +125,7 @@ let disallowedReferences = [ stdenv.cc ]; passthru = { - inherit readline psqlSchema version; + inherit readline psqlSchema; pkgs = let scope = { postgresql = this; }; @@ -141,7 +141,7 @@ let }; meta = with lib; { - homepage = https://www.postgresql.org; + homepage = "https://www.postgresql.org"; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; maintainers = with maintainers; [ ocharles thoughtpolice danbst globin ]; diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index 8bd50c3974c8d..5525fc9f9655f 100644 --- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Columnar storage for PostgreSQL"; - homepage = https://www.citusdata.com/; + homepage = "https://www.citusdata.com/"; maintainers = with maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; license = licenses.asl20; diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 257af21cec978..168cee9711bc6 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "128bfxy7aabyvlcrzdi20f51k9xxgynd76f01v6w1314wrjg2r8f"; + sha256 = "1si4k37azigp7hqibnkzr1p6zknadxm7pb33lygrxarqkifx67j4"; }; buildInputs = [ postgresql openssl zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 1e5824d60d854..4af950973b2b4 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Run Cron jobs through PostgreSQL"; - homepage = https://github.com/citusdata/pg_cron; + homepage = "https://github.com/citusdata/pg_cron"; maintainers = with maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix index deac1072e65c6..7630e2e32baca 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "HyperLogLog for PostgreSQL"; - homepage = https://www.citusdata.com/; + homepage = "https://www.citusdata.com/"; maintainers = with maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; license = licenses.asl20; diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index 2edc07c1d2904..9a289919558c1 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_partman"; - version = "4.3.0"; + version = "4.4.0"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "1zkjz4hkjqzg0j7i7bjxgdcv2kfcgqwahirh06yag6hvm4qf9y9w"; + sha256 = "0wr2nivp0b8vk355rnv4bygiashq98q9zhfgdbxzhm7bgxd01rk2"; }; installPhase = '' @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Partition management extension for PostgreSQL"; - homepage = https://github.com/pgpartman/pg_partman; + homepage = "https://github.com/pgpartman/pg_partman"; maintainers = with maintainers; [ ggpeti ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index b6300f78af25a..0f8e2f61a6ec3 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Efficient querying of 'top values' for PostgreSQL"; - homepage = https://github.com/citusdata/postgresql-topn; + homepage = "https://github.com/citusdata/postgresql-topn"; maintainers = with maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; license = licenses.agpl3; diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 13aa5d942e54a..76aa4c4ffec6b 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, postgresql, perl, cmake, boost, gmp, cgal, mpfr }: +{ stdenv, fetchFromGitHub, postgresql, perl, cmake, boost }: stdenv.mkDerivation rec { pname = "pgrouting"; - version = "2.6.3"; + version = "3.0.0"; nativeBuildInputs = [ cmake perl ]; - buildInputs = [ postgresql boost gmp cgal mpfr ]; + buildInputs = [ postgresql boost ]; src = fetchFromGitHub { owner = "pgRouting"; repo = pname; rev = "v${version}"; - sha256 = "0jdjb8476vjgc7i26v2drcqjvhdbsk1wx243fddffg169nb664ml"; + sha256 = "101lyhhfcv3chrp2h5q04l155hr6wvx427cv1kgd4ryzk88wxx5i"; }; installPhase = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A PostgreSQL/PostGIS extension that provides geospatial routing functionality"; - homepage = https://pgrouting.org/; + homepage = "https://pgrouting.org/"; maintainers = [ maintainers.steve-chavez ]; platforms = postgresql.meta.platforms; license = licenses.gpl2; diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix index 54e92b977bcc7..d86c70984019e 100644 --- a/pkgs/servers/sql/postgresql/ext/pgtap.nix +++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { It can also be used in the xUnit testing style. ''; maintainers = with maintainers; [ willibutz ]; - homepage = https://pgtap.org; + homepage = "https://pgtap.org"; inherit (postgresql.meta) platforms; license = licenses.mit; }; diff --git a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix index 4a80e5cafcb7e..3bca35095c4cb 100644 --- a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix +++ b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High-performance time-series aggregation for PostgreSQL"; - homepage = https://www.pipelinedb.com/; + homepage = "https://www.pipelinedb.com/"; license = licenses.asl20; platforms = postgresql.meta.platforms; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 70ba715cf66e7..c8e26b5a82b87 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Geographic Objects for PostgreSQL"; - homepage = https://postgis.net/; + homepage = "https://postgis.net/"; changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"; license = licenses.gpl2; maintainers = [ maintainers.marcweber ]; diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index ddefaea1549db..70b8dd3092724 100644 --- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A PostgreSQL foreign data wrapper to connect to TDS databases (Sybase and Microsoft SQL Server)"; - homepage = https://github.com/tds-fdw/tds_fdw; + homepage = "https://github.com/tds-fdw/tds_fdw"; maintainers = [ maintainers.steve-chavez ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix index 7a4b1ed88fc48..eaf63fcba6e92 100644 --- a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix +++ b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Temporal Tables PostgreSQL Extension "; - homepage = https://github.com/mlt/temporal_tables; + homepage = "https://github.com/mlt/temporal_tables"; maintainers = with maintainers; [ ggpeti ]; platforms = postgresql.meta.platforms; license = licenses.bsd2; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 42a8d9de49ee6..419bec6823d74 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "1.6.1"; + version = "1.7.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "0k03aqpc1faqlpw46wazv0dy0xja57cv1sr1zwmizw3j3p3s0zdq"; + sha256 = "11h1vvchnipcxvvbjb5y4bgkdzdsik5cq8k8yzkrqz8q33zmjvgg"; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space"; - homepage = https://www.timescale.com/; + homepage = "https://www.timescale.com/"; maintainers = with maintainers; [ volth marsam ]; platforms = postgresql.meta.platforms; license = licenses.asl20; diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index 77e4cd9df7ae8..f05fa6312d8fe 100644 --- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix +++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Provides a few PostgreSQL functions for a lower-level data full text search"; - homepage = https://github.com/zulip/tsearch_extras/; + homepage = "https://github.com/zulip/tsearch_extras/"; license = licenses.postgresql; platforms = postgresql.meta.platforms; maintainers = with maintainers; [ DerTim1 ]; diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index 0daf7533a6044..efd8cd02a15bf 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SQL/RDF database used by, e.g., KDE-nepomuk"; - homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/; + homepage = "http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix index 17ec49d161313..bca1aae82e512 100644 --- a/pkgs/servers/sql/virtuoso/7.x.nix +++ b/pkgs/servers/sql/virtuoso/7.x.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SQL/RDF database used by, e.g., KDE-nepomuk"; - homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/; + homepage = "http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/"; #configure: The current version [...] can only be built on 64bit platforms platforms = [ "x86_64-linux" ]; license = licenses.gpl2; diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 8452adcf22215..3e292d8740cf9 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -3,11 +3,12 @@ }: stdenv.mkDerivation rec { - name = "squid-4.10"; + pname = "squid"; + version = "4.11"; src = fetchurl { - url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz"; - sha256 = "07sz0adv8nkhy797675bpra7lvdkwjq9isw1ddgylhlazl511w4q"; + url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz"; + sha256 = "0z986kykx539wjqd7mr8y0abf3z6hz8byf8fmmbky9hh4ihlgnaf"; }; nativeBuildInputs = [ pkgconfig ]; @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; - homepage = http://www.squid-cache.org; + homepage = "http://www.squid-cache.org"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ fpletz raskin ]; diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index f7b4dd84d3290..cbeacece3e1ec 100644 --- a/pkgs/servers/sslh/default.nix +++ b/pkgs/servers/sslh/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)"; license = licenses.gpl2Plus; - homepage = https://www.rutschle.net/tech/sslh/README.html; + homepage = "https://www.rutschle.net/tech/sslh/README.html"; maintainers = with maintainers; [ koral fpletz ]; platforms = platforms.all; }; diff --git a/pkgs/servers/syncserver/default.nix b/pkgs/servers/syncserver/default.nix index d419237580177..24c093fde5050 100644 --- a/pkgs/servers/syncserver/default.nix +++ b/pkgs/servers/syncserver/default.nix @@ -39,7 +39,7 @@ in python.pkgs.buildPythonPackage rec { meta = with lib; { description = "Run-Your-Own Firefox Sync Server"; - homepage = https://github.com/mozilla-services/syncserver; + homepage = "https://github.com/mozilla-services/syncserver"; platforms = platforms.unix; license = licenses.mpl20; maintainers = with maintainers; [ nadrieril ]; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index e4cc0889c31fd..9f0a8de4ef680 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,15 @@ buildGoModule rec { pname = "tailscale"; - version = "0.97"; + version = "0.97-219"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; - rev = "v${version}"; - sha256 = "0ckjqhj99c25h8xgyfkrd19nw5w4a7972nvba9r5faw5micjs02n"; + # Tailscale uses "git describe" as version numbers. v0.97-219 + # means "tag v0.97 plus 219 commits", which is what this rev is. + rev = "afbfe4f217a2a202f0eefe943c7c1ef648311339"; + sha256 = "1an897ys3gycdmclqd0yqs9f7q88zxqxyc6r0gcgs4678svxhb68"; }; nativeBuildInputs = [ makeWrapper ]; @@ -16,7 +18,14 @@ buildGoModule rec { CGO_ENABLED = 0; goPackagePath = "tailscale.com"; - modSha256 = "0anpakcqz4irwxnm0iwm7wqzh84kv3yxxdvyr38154pbd0ys5pa2"; + overrideModAttrs = (_: { + preBuild = '' + rm ipn/e2e_test.go + rm control/controlclient/auto_test.go + rm control/controlclient/direct_test.go + ''; + }); + vendorSha256 = "1v90lbwgrc2m4kvpglf2jykrm8rry3pbhqqbc3mcysrzmqlw84yl"; subPackages = [ "cmd/tailscale" "cmd/tailscaled" ]; postInstall = '' @@ -32,4 +41,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ danderson mbaillie ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index 32102dd48b5ad..27a627dd4823f 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { - version = "2.2.0"; + version = "2.2.3"; pname = "Tautulli"; pythonPath = [ python.pkgs.setuptools ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "10ahmgm4pr7lz39qcmgjqzlp435i2dasd6y47zpi1c5fy62jq4is"; + sha256 = "0ni3dg5ly1xdyj1g931y2by3w17f0q031mpnrw2slhy6i792r5bp"; }; buildPhase = ":"; diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix index ac3dccdab738f..7dc32972fe478 100644 --- a/pkgs/servers/tegola/default.nix +++ b/pkgs/servers/tegola/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://www.tegola.io/; + homepage = "https://www.tegola.io/"; description = "Mapbox Vector Tile server"; maintainers = with maintainers; [ ingenieroariel ]; platforms = platforms.unix; diff --git a/pkgs/servers/tmate-ssh-server/default.nix b/pkgs/servers/tmate-ssh-server/default.nix index 836fa33f3f758..ca188ee951d9e 100644 --- a/pkgs/servers/tmate-ssh-server/default.nix +++ b/pkgs/servers/tmate-ssh-server/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://tmate.io/; + homepage = "https://tmate.io/"; description = "tmate SSH Server"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index f3c97e8adcc1f..db31006192743 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -1,39 +1,37 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, bash, go-bindata}: +{ stdenv, buildGoModule, fetchFromGitHub, go-bindata, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "traefik"; - version = "1.7.14"; - - goPackagePath = "github.com/containous/traefik"; + version = "2.2.1"; src = fetchFromGitHub { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "1j3p09j8rpdkp8v4d4mz224ddakkvhzchvccm9qryrqc2fq4022v"; + sha256 = "0byi2h1lma95l77sdj8jkidmwb12ryjqwxa0zz6vwjg07p5ps3k4"; }; - nativeBuildInputs = [ go-bindata bash ]; - - buildPhase = '' - runHook preBuild - ( - cd go/src/github.com/containous/traefik - bash ./script/make.sh generate - - CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary) - go build -ldflags "\ - -X github.com/containous/traefik/version.Version=${version} \ - -X github.com/containous/traefik/version.Codename=$CODENAME \ - " -a -o $bin/bin/traefik ./cmd/traefik - ) - runHook postBuild + vendorSha256 = "0rbwp0cxqfv4v5sii6kavdj73a0q0l4fnvxincvyy698qzx716kf"; + subPackages = [ "cmd/traefik" ]; + + nativeBuildInputs = [ go-bindata ]; + + passthru.tests = { inherit (nixosTests) traefik; }; + + preBuild = '' + go generate + + CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary) + + makeFlagsArray+=("-ldflags=\ + -X github.com/containous/traefik/version.Version=${version} \ + -X github.com/containous/traefik/version.Codename=$CODENAME") ''; meta = with stdenv.lib; { - homepage = https://traefik.io; + homepage = "https://traefik.io"; description = "A modern reverse proxy"; license = licenses.mit; - maintainers = with maintainers; [ hamhut1066 vdemeester ]; + maintainers = with maintainers; [ vdemeester ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index c1694316f3eda..4478c4ab8d7d3 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Web-based news feed (RSS/Atom) aggregator"; license = licenses.gpl2Plus; - homepage = https://tt-rss.org; + homepage = "https://tt-rss.org"; maintainers = with maintainers; [ globin zohl ]; platforms = platforms.all; }; diff --git a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix index 0600640155be8..14e6eaa77ae33 100644 --- a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix +++ b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Plugin for TT-RSS to authenticate users via ldap"; license = licenses.asl20; - homepage = https://github.com/hydrian/TTRSS-Auth-LDAP; + homepage = "https://github.com/hydrian/TTRSS-Auth-LDAP"; maintainers = with maintainers; [ mic92 ]; platforms = platforms.all; }; diff --git a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix index 7c3d6a5b57e21..a6f47c1ccbf90 100644 --- a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix +++ b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix @@ -23,7 +23,7 @@ The name of the plugin in TT-RSS is 'tumblr_gdpr'. ''; license = licenses.gpl3; - homepage = https://github.com/GregThib/ttrss-tumblr-gdpr; + homepage = "https://github.com/GregThib/ttrss-tumblr-gdpr"; maintainers = with maintainers; [ das_j ]; platforms = platforms.all; }; diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix index 3358973fc4eba..b7fac5fc477c2 100644 --- a/pkgs/servers/ttyd/default.nix +++ b/pkgs/servers/ttyd/default.nix @@ -1,29 +1,29 @@ { stdenv, fetchFromGitHub , pkgconfig, cmake, xxd -, openssl, libwebsockets, json_c, libuv +, openssl, libwebsockets, json_c, libuv, zlib }: with builtins; stdenv.mkDerivation rec { pname = "ttyd"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "tsl0922"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "16nngc3dqrsgpapzvl34c0msgdd1fyp3k8r1jj1m9bch6z2p50bl"; + sha256 = "08skw3h897jb71sbnglj571h35pcb1mikzlh71sx5imjgi4hfczr"; }; nativeBuildInputs = [ pkgconfig cmake xxd ]; - buildInputs = [ openssl libwebsockets json_c libuv ]; + buildInputs = [ openssl libwebsockets json_c libuv zlib ]; enableParallelBuilding = true; outputs = [ "out" "man" ]; meta = { description = "Share your terminal over the web"; - homepage = https://github.com/tsl0922/ttyd; + homepage = "https://github.com/tsl0922/ttyd"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 9a01bf3eed634..009dd9bfc43f1 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation { Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, SAT>IP and HDHomeRun as input sources. Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.''; - homepage = https://tvheadend.org; + homepage = "https://tvheadend.org"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ simonvandel ]; diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix index 4f5d9636fe6be..3dea897971aa5 100644 --- a/pkgs/servers/u9fs/default.nix +++ b/pkgs/servers/u9fs/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "u9fs-20110513"; src = fetchhg { - url = https://bitbucket.org/plan9-from-bell-labs/u9fs; + url = "https://bitbucket.org/plan9-from-bell-labs/u9fs"; rev = "9474edb23b11"; sha256 = "0irwyk8vnvx0fmz8lmbdb2jrlvas8imr61jr76a1pkwi9wpf2wv6"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Serve 9P from Unix"; - homepage = http://plan9.bell-labs.com/magic/man2html/4/u9fs; + homepage = "http://plan9.bell-labs.com/magic/man2html/4/u9fs"; license = licenses.free; maintainers = [ maintainers.ehmry ]; platforms = platforms.unix; diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix index cddfdf9f48f6f..2849f8c7e7437 100644 --- a/pkgs/servers/udpt/default.nix +++ b/pkgs/servers/udpt/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = { description = "A lightweight UDP torrent tracker"; - homepage = https://naim94a.github.io/udpt; + homepage = "https://naim94a.github.io/udpt"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ makefu ]; diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 13e7fb7b93b69..02607155d4861 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "uftp"; - version = "4.10.1"; + version = "5.0"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "1xi2cvn1lxk1h1kilmjiq8ybxln3rrh6m5cd340zg20vpzz56cwh"; + sha256 = "1q08schd765fsm9647ac4ic2x70ys2x48mqz97mibdi4bbm72bsn"; }; buildInputs = [ openssl ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Encrypted UDP based FTP with multicast"; - homepage = http://uftp-multicast.sourceforge.net/; + homepage = "http://uftp-multicast.sourceforge.net/"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.fadenb ]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 11dd5449b4b0b..05c67b0ce1cfb 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High performance peer-to-peer hub for the ADC network"; - homepage = https://www.uhub.org/; + homepage = "https://www.uhub.org/"; license = licenses.gpl3; maintainers = [ maintainers.ehmry ]; platforms = platforms.unix; diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix index 503ff16caeeb3..3e58edba42fbd 100644 --- a/pkgs/servers/ums/default.nix +++ b/pkgs/servers/ums/default.nix @@ -4,13 +4,18 @@ stdenv.mkDerivation rec { pname = "ums"; - version = "9.1.0"; - - src = fetchurl { - url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + ".tgz"; - sha256 = "07wprjpwqids96v5q5fhwcxqlg8jp1vy585vl2nqbfi1vf5v294s"; - name = "${pname}-${version}.tgz"; - }; + version = "9.4.2"; + + src = { + i686-linux = fetchurl { + url = "mirror://sourceforge/project/unimediaserver/${version}/" + stdenv.lib.toUpper "${pname}-${version}" + "-x86.tgz"; + sha256 = "0i319g2c3z9j131nwh5m92clgnxxxs3izplzhjb30bx4lldmjs1j"; + }; + x86_64-linux = fetchurl { + url = "mirror://sourceforge/project/unimediaserver/${version}/" + stdenv.lib.toUpper "${pname}-${version}" + "-x86_64.tgz"; + sha256 = "07wc0is86fdfyz4as3f17q8pfzl8x55ci65zvpls0a9rfyyvjjw3"; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); buildInputs = [ makeWrapper ]; @@ -21,7 +26,7 @@ stdenv.mkDerivation rec { # ums >= 9.0.0 ships its own JRE in the package. if we remove it, the `UMS.sh` # script will correctly fall back to the JRE specified by JAVA_HOME - rm -rf $out/linux/jre-x64 $out/linux/jre-x86 + rm -rf $out/jre makeWrapper "$out/UMS.sh" "$out/bin/ums" \ --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ libzen libmediainfo] }" \ @@ -32,6 +37,6 @@ stdenv.mkDerivation rec { description = "Universal Media Server: a DLNA-compliant UPnP Media Server"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thall ]; + maintainers = with stdenv.lib.maintainers; [ thall snicket2100 ]; }; } diff --git a/pkgs/servers/unfs3/default.nix b/pkgs/servers/unfs3/default.nix index 4304dc229e35a..c2a0fbbd1c204 100644 --- a/pkgs/servers/unfs3/default.nix +++ b/pkgs/servers/unfs3/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { server. ''; - homepage = http://unfs3.sourceforge.net/; + homepage = "http://unfs3.sourceforge.net/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index f86ae9d7cec48..3d49d4d71b5bc 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -30,7 +30,7 @@ let ''; meta = with stdenv.lib; { - homepage = http://www.ubnt.com/; + homepage = "http://www.ubnt.com/"; description = "Controller for Ubiquiti UniFi access points"; license = licenses.unfree; platforms = platforms.unix; @@ -49,7 +49,7 @@ in { }; unifiStable = generic { - version = "5.12.35"; - sha256 = "0ln8x7yisanbx1afclhffa0f3fk0sgh7dpj548xyhn5mgpwbj4i2"; + version = "5.12.66"; + sha256 = "119jdwk2ys3vzg9wa4h25rwgl6sjly6v52k1g1ycrq0bspzxdhm2"; }; } diff --git a/pkgs/servers/ursadb/default.nix b/pkgs/servers/ursadb/default.nix new file mode 100644 index 0000000000000..8a2f768443f58 --- /dev/null +++ b/pkgs/servers/ursadb/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, cmake, zeromq, cppzmq }: + +stdenv.mkDerivation { + name = "ursadb"; + version = "1.2.0"; + + src = fetchurl { + url = "https://github.com/CERT-Polska/ursadb/archive/v1.2.0.tar.gz"; + sha256 = "10dax3mswq0x4cfrpi31b7ii7bxl536wz1j11b7f5c0zw9pjxzym"; + }; + + installPhase = '' + mkdir -p $out/bin + cp ursadb $out/bin/ + cp ursadb_new $out/bin/ + cp ursadb_trim $out/bin/ + ''; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + zeromq + cppzmq + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/CERT-Polska/ursadb"; + description = "Trigram database written in C++, suited for malware indexing"; + license = licenses.bsd3; + maintainers = with maintainers; [ msm ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 0a1ad23c2cef1..0f0d2c23e4c41 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -8,8 +8,8 @@ }: let php-embed = php.override { - config.php.embed = true; - config.php.apxs2 = false; + embedSupport = true; + apxs2Support = false; }; pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" { @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_LINK = toString (lib.optional withSystemd "-lsystemd" ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed); meta = with stdenv.lib; { - homepage = https://uwsgi-docs.readthedocs.org/en/latest/; + homepage = "https://uwsgi-docs.readthedocs.org/en/latest/"; description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar schneefux globin ]; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 8d49846cbc042..27e0edfcc2b22 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -32,7 +32,7 @@ let meta = with stdenv.lib; { description = "Web application accelerator also known as a caching HTTP reverse proxy"; - homepage = https://www.varnish-cache.org; + homepage = "https://www.varnish-cache.org"; license = licenses.bsd2; maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix index f11c577288f71..8d69451f8b5ef 100644 --- a/pkgs/servers/varnish/digest.nix +++ b/pkgs/servers/varnish/digest.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Digest and HMAC vmod"; - homepage = https://github.com/varnish/libvmod-digest; + homepage = "https://github.com/varnish/libvmod-digest"; inherit (varnish.meta) license platforms maintainers; }; } diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index 7db4680ac62a9..c43f00b7a6bba 100644 --- a/pkgs/servers/varnish/dynamic.nix +++ b/pkgs/servers/varnish/dynamic.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Dynamic director similar to the DNS director from Varnish 3"; - homepage = https://github.com/nigoroll/libvmod-dynamic; + homepage = "https://github.com/nigoroll/libvmod-dynamic"; inherit (varnish.meta) license platforms maintainers; }; } diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index 32c462e4a775f..69ee7028de87d 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Collection of Varnish Cache modules (vmods) by Varnish Software"; - homepage = https://github.com/varnish/varnish-modules; + homepage = "https://github.com/varnish/varnish-modules"; inherit (varnish.meta) license platforms maintainers; }; } diff --git a/pkgs/servers/web-apps/engelsystem/default.nix b/pkgs/servers/web-apps/engelsystem/default.nix new file mode 100644 index 0000000000000..8ef6a9afa0e8f --- /dev/null +++ b/pkgs/servers/web-apps/engelsystem/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchzip, php, writeText, nixosTests }: + +let + phpExt = php.withExtensions + ({ enabled, all }: with all; [ json filter mysqlnd mysqli pdo pdo_mysql ]); +in stdenv.mkDerivation rec { + pname = "engelsystem"; + version = "3.1.0"; + + src = fetchzip { + url = + "https://github.com/engelsystem/engelsystem/releases/download/v3.1.0/engelsystem-v3.1.0.zip"; + sha256 = "01wra7li7n5kn1l6xkrmw4vlvvyqh089zs43qzn98hj0mw8gw7ai"; + # This is needed, because the zip contains a directory with world write access, which is not allowed in nix + extraPostFetch = "chmod -R a-w $out"; + }; + + buildInputs = [ phpExt ]; + + installPhase = '' + runHook preInstall + + # prepare + rm -r ./storage/ + rm -r ./docker/ + + ln -sf /etc/engelsystem/config.php ./config/config.php + ln -sf /var/lib/engelsystem/storage/ ./storage + + mkdir -p $out/share/engelsystem + mkdir -p $out/bin + cp -r . $out/share/engelsystem + + echo $(command -v php) + # The patchShebangAuto function always used the php without extensions, so path the shebang manually + sed -i -e "1 s|.*|#\!${phpExt}/bin/php|" "$out/share/engelsystem/bin/migrate" + ln -s "$out/share/engelsystem/bin/migrate" "$out/bin/migrate" + + runHook postInstall + ''; + + passthru.tests = nixosTests.engelsystem; + + meta = with stdenv.lib; { + description = + "Coordinate your helpers in teams, assign them to work shifts or let them decide for themselves when and where they want to help with what"; + license = licenses.gpl2; + homepage = "https://engelsystem.de"; + maintainers = with maintainers; [ kloenk ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/web-apps/frab/default.nix b/pkgs/servers/web-apps/frab/default.nix index 0b0583f1fb6fe..88e95be46195d 100644 --- a/pkgs/servers/web-apps/frab/default.nix +++ b/pkgs/servers/web-apps/frab/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Web-based conference planning and management system"; - homepage = https://github.com/frab/frab; + homepage = "https://github.com/frab/frab"; license = licenses.mit; broken = true; # 2018-09-08; no successful hydra build since 2018-02-14 }; diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 26ab5a6bb4d33..76d1a5f0b7551 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -3,16 +3,16 @@ let versions = { matomo = { - version = "3.13.4"; - sha256 = "0yd24hn3ajj5bhzv8f5xr6wpgh2ma9zilzbm9c1n225q553scgjw"; + version = "3.13.5"; + sha256 = "1b9a9jj86bb3f0093k6sz235iivvvqbcvkjqxwn7c9z7qsmpvbxr"; }; matomo-beta = { - version = "3.13.4"; + version = "3.13.5"; # `beta` examples: "b1", "rc1", null # TOOD when updating: use null if stable version is >= latest beta or release candidate beta = null; - sha256 = "0yd24hn3ajj5bhzv8f5xr6wpgh2ma9zilzbm9c1n225q553scgjw"; + sha256 = "1b9a9jj86bb3f0093k6sz235iivvvqbcvkjqxwn7c9z7qsmpvbxr"; }; }; common = pname: { version, sha256, beta ? null }: @@ -100,7 +100,7 @@ let meta = with stdenv.lib; { description = "A real-time web analytics application"; license = licenses.gpl3Plus; - homepage = https://matomo.org/; + homepage = "https://matomo.org/"; platforms = platforms.all; maintainers = with maintainers; [ florianjacob kiwi ]; }; diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index 98bd8e0027f48..62de7620c5e46 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, writeText }: let - version = "3.8.2"; + version = "3.8.3"; stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version); in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "134vxsbslk7sfalmgcp744aygaxz2k080d14j8nkivk9zhplds53"; + sha256 = "1anjv4gvbb6833j04a1b4aaysnl4h0x96sr1hhm4nm5kq2fimjd1"; }; phpConfig = writeText "config.php" '' diff --git a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix index 1b61632824f26..8fea1f992565f 100644 --- a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix +++ b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/mattrude/pgpkeyserver-lite; + homepage = "https://github.com/mattrude/pgpkeyserver-lite"; description = "A lightweight static front-end for a sks keyserver."; license = licenses.gpl3; maintainers = with maintainers; [ calbrecht globin ]; diff --git a/pkgs/servers/web-apps/restya-board/default.nix b/pkgs/servers/web-apps/restya-board/default.nix index 5c105e85a8729..89e22b23361e6 100644 --- a/pkgs/servers/web-apps/restya-board/default.nix +++ b/pkgs/servers/web-apps/restya-board/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Web-based kanban board"; license = licenses.osl3; - homepage = http://restya.com; + homepage = "https://restya.com"; maintainers = with maintainers; [ tstrobel ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index ff44fbd89b1a4..d0ff13917969e 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -50,7 +50,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/asciimoo/searx; + homepage = "https://github.com/asciimoo/searx"; description = "A privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; maintainers = with maintainers; [ matejc fpletz globin danielfullmer ]; diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix index f6000fc421177..e54f9d74c1d29 100644 --- a/pkgs/servers/web-apps/selfoss/default.nix +++ b/pkgs/servers/web-apps/selfoss/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Web-based news feed (RSS/Atom) aggregator"; - homepage = https://selfoss.aditu.de; + homepage = "https://selfoss.aditu.de"; license = licenses.gpl3; maintainers = with maintainers; [ jtojnar regnat ]; platforms = platforms.all; diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index f5bce90c23416..288c30734fe11 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The personal, minimalist, super-fast, database free, bookmarking service"; license = licenses.gpl3Plus; - homepage = https://github.com/shaarli/Shaarli; + homepage = "https://github.com/shaarli/Shaarli"; maintainers = with maintainers; [ schneefux ]; platforms = platforms.all; }; diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix index b0829fce73393..bce08646a3b56 100644 --- a/pkgs/servers/web-apps/shaarli/material-theme.nix +++ b/pkgs/servers/web-apps/shaarli/material-theme.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { broken = true; description = "A theme base on Google's Material Design for Shaarli, the superfast delicious clone"; license = licenses.mit; - homepage = https://github.com/kalvn/Shaarli-Material; + homepage = "https://github.com/kalvn/Shaarli-Material"; maintainers = with maintainers; [ ]; platforms = platforms.all; }; diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix index dd4cdc08287b6..dbea567b7e1e5 100644 --- a/pkgs/servers/web-apps/shiori/default.nix +++ b/pkgs/servers/web-apps/shiori/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "shiori"; version = "1.5.0"; - modSha256 = "1z6q5lv0j433p8lc3nxlw1rds5x1kvs1vzl63jf3disxw7ppyai3"; + vendorSha256 = "1ik5faysc880kz7nymvbmjj006l1fsqfy76036szwzg314v78643"; src = fetchFromGitHub { owner = "go-shiori"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ minijackson ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix new file mode 100644 index 0000000000000..3e78b5d9d4361 --- /dev/null +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -0,0 +1,76 @@ +{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python2, lndir +, openssl_1_1, openldap, sope, libmemcached, curl }: with lib; gnustep.stdenv.mkDerivation rec { + pname = "SOGo"; + version = "4.3.2"; + + src = fetchFromGitHub { + owner = "inverse-inc"; + repo = pname; + rev = "SOGo-${version}"; + sha256 = "1xxad23a8zy6w850x5nrrf54db0x73lc9drmc5kpfk870fk2lmr0"; + }; + + nativeBuildInputs = [ gnustep.make makeWrapper python2 ]; + buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) ] + ++ optional (openldap != null) openldap; + + patches = [ + # TODO: take a closer look at other patches in https://sources.debian.org/patches/sogo/ and https://github.com/Skrupellos/sogo-patches + (fetchpatch { + url = "https://sources.debian.org/data/main/s/sogo/4.3.0-1/debian/patches/0005-Remove-build-date.patch"; + sha256 = "0lrh3bkfj3r0brahfkyb0g7zx7r2jjd5cxzjl43nqla0fs09wsh8"; + }) + ]; + + postPatch = '' + # Exclude NIX_ variables + sed -i 's/grep GNUSTEP_/grep ^GNUSTEP_/g' configure + + # Disable argument verification because $out is not a GNUStep prefix + sed -i 's/^validateArgs$//g' configure + + # Patch exception-generating python scripts + patchShebangs . + + # Move all GNUStep makefiles to a common directory + mkdir -p makefiles + cp -r {${gnustep.make},${sope}}/share/GNUstep/Makefiles/* makefiles + + # Modify the search path for GNUStep makefiles + find . -type f -name GNUmakefile -exec sed -i "s:\\$.GNUSTEP_MAKEFILES.:$PWD/makefiles:g" {} + + ''; + + configureFlags = [ "--disable-debug" "--with-ssl=ssl" ]; + + preFixup = '' + # Create gnustep.conf + mkdir -p $out/share/GNUstep + cp ${gnustep.make}/etc/GNUstep/GNUstep.conf $out/share/GNUstep/ + sed -i "s:${gnustep.make}:$out:g" $out/share/GNUstep/GNUstep.conf + + # Link in GNUstep base + ${lndir}/bin/lndir ${gnustep.base}/lib/GNUstep/ $out/lib/GNUstep/ + + # Link in sope + ${lndir}/bin/lndir ${sope}/ $out/ + + # sbin fixup + mkdir -p $out/bin + mv $out/sbin/* $out/bin + rmdir $out/sbin + + # Make sogo find its files + for bin in $out/bin/*; do + wrapProgram $bin --prefix LD_LIBRARY_PATH : $out/lib/sogo --prefix GNUSTEP_CONFIG_FILE : $out/share/GNUstep/GNUstep.conf + done + ''; + + meta = { + description = "SOGo is a very fast and scalable modern collaboration suite (groupware)"; + license = with licenses; [ gpl2 lgpl21 ]; + homepage = "https://sogo.nu/"; + platforms = platforms.linux; + maintainers = with maintainers; [ ajs124 das_j ]; + }; +} + diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix index 4be14b37bd2bd..69270afb76bb7 100644 --- a/pkgs/servers/web-apps/virtlyst/default.nix +++ b/pkgs/servers/web-apps/virtlyst/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Web interface to manage virtual machines with libvirt"; - homepage = https://github.com/cutelyst/Virtlyst; + homepage = "https://github.com/cutelyst/Virtlyst"; license = licenses.agpl3Plus; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index a105531ff4e6b..e4f1a3009ee12 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { After a package upgrade, empty the `var/cache` folder. ''; license = licenses.mit; - homepage = http://wallabag.org; + homepage = "http://wallabag.org"; maintainers = with maintainers; [ schneefux ]; platforms = platforms.all; }; diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 9cab8c4a9babc..ca4b5d832a626 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.4"; + version = "5.4.1"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "10zjgbr96ri87r5v7860vg5ndbnjfhjhily4m9nyl60f1lbjdhrr"; + sha256 = "0i9ndfhm9iwilqwbqs3dngmzzjmazw4vwbyccjabs3zmzliis6vv"; }; installPhase = '' diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 97506ce74472b..564660ab48620 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -9,7 +9,7 @@ lib.makeScope newScope (self: with self; { name = "appres-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/appres-1.0.5.tar.bz2; + url = "mirror://xorg/individual/app/appres-1.0.5.tar.bz2"; sha256 = "0a2r4sxky3k7b3kdb5pbv709q9b5zi3gxjz336wl66f828vqkbgz"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -22,7 +22,7 @@ lib.makeScope newScope (self: with self; { name = "bdftopcf-1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2; + url = "mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2"; sha256 = "18hiscgljrz10zjcws25bis32nyrg3hzgmiq6scrh7izqmgz0kab"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -35,7 +35,7 @@ lib.makeScope newScope (self: with self; { name = "bitmap-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/bitmap-1.0.9.tar.gz; + url = "mirror://xorg/individual/app/bitmap-1.0.9.tar.gz"; sha256 = "0kzbv5wh02798l77y9y8d8sjkmzm9cvsn3rjh8a86v5waj50apsb"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -48,7 +48,7 @@ lib.makeScope newScope (self: with self; { name = "editres-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/editres-1.0.7.tar.bz2; + url = "mirror://xorg/individual/app/editres-1.0.7.tar.bz2"; sha256 = "04awfwmy3f9f0bchidc4ssbgrbicn5gzasg3jydpfnp5513d76h8"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -61,7 +61,7 @@ lib.makeScope newScope (self: with self; { name = "encodings-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/encodings-1.0.5.tar.bz2; + url = "mirror://xorg/individual/font/encodings-1.0.5.tar.bz2"; sha256 = "0caafx0yqqnqyvbalxhh3mb0r9v36xmcy5zjhygb2i508dhy35mx"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -74,7 +74,7 @@ lib.makeScope newScope (self: with self; { name = "font-adobe-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-adobe-100dpi-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-adobe-100dpi-1.0.3.tar.bz2"; sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -88,7 +88,7 @@ lib.makeScope newScope (self: with self; { name = "font-adobe-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-adobe-75dpi-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-adobe-75dpi-1.0.3.tar.bz2"; sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -102,7 +102,7 @@ lib.makeScope newScope (self: with self; { name = "font-adobe-utopia-100dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2; + url = "mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2"; sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -116,7 +116,7 @@ lib.makeScope newScope (self: with self; { name = "font-adobe-utopia-75dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2; + url = "mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2"; sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -130,7 +130,7 @@ lib.makeScope newScope (self: with self; { name = "font-adobe-utopia-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2; + url = "mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2"; sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -144,7 +144,7 @@ lib.makeScope newScope (self: with self; { name = "font-alias-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-alias-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-alias-1.0.3.tar.bz2"; sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -157,7 +157,7 @@ lib.makeScope newScope (self: with self; { name = "font-arabic-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-arabic-misc-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-arabic-misc-1.0.3.tar.bz2"; sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -171,7 +171,7 @@ lib.makeScope newScope (self: with self; { name = "font-bh-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-bh-100dpi-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-bh-100dpi-1.0.3.tar.bz2"; sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -185,7 +185,7 @@ lib.makeScope newScope (self: with self; { name = "font-bh-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-bh-75dpi-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-bh-75dpi-1.0.3.tar.bz2"; sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -199,7 +199,7 @@ lib.makeScope newScope (self: with self; { name = "font-bh-lucidatypewriter-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2"; sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -213,7 +213,7 @@ lib.makeScope newScope (self: with self; { name = "font-bh-lucidatypewriter-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2"; sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -227,7 +227,7 @@ lib.makeScope newScope (self: with self; { name = "font-bh-ttf-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-bh-ttf-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-bh-ttf-1.0.3.tar.bz2"; sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -241,7 +241,7 @@ lib.makeScope newScope (self: with self; { name = "font-bh-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-bh-type1-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-bh-type1-1.0.3.tar.bz2"; sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -255,7 +255,7 @@ lib.makeScope newScope (self: with self; { name = "font-bitstream-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2"; sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -269,7 +269,7 @@ lib.makeScope newScope (self: with self; { name = "font-bitstream-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2"; sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -283,7 +283,7 @@ lib.makeScope newScope (self: with self; { name = "font-bitstream-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-bitstream-type1-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-bitstream-type1-1.0.3.tar.bz2"; sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -297,7 +297,7 @@ lib.makeScope newScope (self: with self; { name = "font-cronyx-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2"; sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -311,7 +311,7 @@ lib.makeScope newScope (self: with self; { name = "font-cursor-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-cursor-misc-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-cursor-misc-1.0.3.tar.bz2"; sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -325,7 +325,7 @@ lib.makeScope newScope (self: with self; { name = "font-daewoo-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-daewoo-misc-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-daewoo-misc-1.0.3.tar.bz2"; sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -339,7 +339,7 @@ lib.makeScope newScope (self: with self; { name = "font-dec-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-dec-misc-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-dec-misc-1.0.3.tar.bz2"; sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -353,7 +353,7 @@ lib.makeScope newScope (self: with self; { name = "font-ibm-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-ibm-type1-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-ibm-type1-1.0.3.tar.bz2"; sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -367,7 +367,7 @@ lib.makeScope newScope (self: with self; { name = "font-isas-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-isas-misc-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-isas-misc-1.0.3.tar.bz2"; sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -381,7 +381,7 @@ lib.makeScope newScope (self: with self; { name = "font-jis-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-jis-misc-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-jis-misc-1.0.3.tar.bz2"; sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -395,7 +395,7 @@ lib.makeScope newScope (self: with self; { name = "font-micro-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-micro-misc-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-micro-misc-1.0.3.tar.bz2"; sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -409,7 +409,7 @@ lib.makeScope newScope (self: with self; { name = "font-misc-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-misc-cyrillic-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-misc-cyrillic-1.0.3.tar.bz2"; sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -423,7 +423,7 @@ lib.makeScope newScope (self: with self; { name = "font-misc-ethiopic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-misc-ethiopic-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-misc-ethiopic-1.0.3.tar.bz2"; sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -437,7 +437,7 @@ lib.makeScope newScope (self: with self; { name = "font-misc-meltho-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-misc-meltho-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-misc-meltho-1.0.3.tar.bz2"; sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -451,7 +451,7 @@ lib.makeScope newScope (self: with self; { name = "font-misc-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-misc-misc-1.1.2.tar.bz2; + url = "mirror://xorg/individual/font/font-misc-misc-1.1.2.tar.bz2"; sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -465,7 +465,7 @@ lib.makeScope newScope (self: with self; { name = "font-mutt-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-mutt-misc-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-mutt-misc-1.0.3.tar.bz2"; sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -479,7 +479,7 @@ lib.makeScope newScope (self: with self; { name = "font-schumacher-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-schumacher-misc-1.1.2.tar.bz2; + url = "mirror://xorg/individual/font/font-schumacher-misc-1.1.2.tar.bz2"; sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -493,7 +493,7 @@ lib.makeScope newScope (self: with self; { name = "font-screen-cyrillic-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-screen-cyrillic-1.0.4.tar.bz2; + url = "mirror://xorg/individual/font/font-screen-cyrillic-1.0.4.tar.bz2"; sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -507,7 +507,7 @@ lib.makeScope newScope (self: with self; { name = "font-sony-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-sony-misc-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-sony-misc-1.0.3.tar.bz2"; sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -521,7 +521,7 @@ lib.makeScope newScope (self: with self; { name = "font-sun-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-sun-misc-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-sun-misc-1.0.3.tar.bz2"; sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -535,7 +535,7 @@ lib.makeScope newScope (self: with self; { name = "fonttosfnt-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2; + url = "mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2"; sha256 = "00w5in1gznai141wishz8ng7spvi5274n16zj0pdl1ma2vsmy2n8"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -548,7 +548,7 @@ lib.makeScope newScope (self: with self; { name = "font-util-1.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-util-1.3.1.tar.bz2; + url = "mirror://xorg/individual/font/font-util-1.3.1.tar.bz2"; sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -561,7 +561,7 @@ lib.makeScope newScope (self: with self; { name = "font-winitzki-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2"; sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -575,7 +575,7 @@ lib.makeScope newScope (self: with self; { name = "font-xfree86-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2; + url = "mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2"; sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -589,7 +589,7 @@ lib.makeScope newScope (self: with self; { name = "gccmakedep-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2; + url = "mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2"; sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -602,7 +602,7 @@ lib.makeScope newScope (self: with self; { name = "iceauth-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2; + url = "mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2"; sha256 = "1ik0mdidmyvy48hn8p2hwvf3535rf3m96hhf0mvcqrbj44x23vp6"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -615,7 +615,7 @@ lib.makeScope newScope (self: with self; { name = "ico-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/ico-1.0.5.tar.bz2; + url = "mirror://xorg/individual/app/ico-1.0.5.tar.bz2"; sha256 = "0gvpwfk9kvlfn631dgizc45qc2qqjn9pavdp2q7qb3drkvr64fyp"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -628,7 +628,7 @@ lib.makeScope newScope (self: with self; { name = "imake-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/imake-1.0.8.tar.bz2; + url = "mirror://xorg/individual/util/imake-1.0.8.tar.bz2"; sha256 = "00m7l90ws72k1qm101sd2rx92ckd50cszyng5d4dd77jncbf9lmq"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -641,7 +641,7 @@ lib.makeScope newScope (self: with self; { name = "libAppleWM-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2; + url = "mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2"; sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -654,7 +654,7 @@ lib.makeScope newScope (self: with self; { name = "libFS-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2; + url = "mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2"; sha256 = "03xxyvpfa3rhqcld4p2chkil482jn9cp80hj17jdybcv2hkkgqf8"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -667,7 +667,7 @@ lib.makeScope newScope (self: with self; { name = "libICE-1.0.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2; + url = "mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2"; sha256 = "0j638yvmyna2k4mz465jywgdybgdchdqppfx6xfazg7l5khxr1kg"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -680,7 +680,7 @@ lib.makeScope newScope (self: with self; { name = "libSM-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2; + url = "mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2"; sha256 = "1fwwfq9v3sqmpzpscymswxn76xhxnysa24pfim1mcpxhvjcl89id"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -693,7 +693,7 @@ lib.makeScope newScope (self: with self; { name = "libWindowsWM-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2; + url = "mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2"; sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -706,7 +706,7 @@ lib.makeScope newScope (self: with self; { name = "libX11-1.6.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2; + url = "mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2"; sha256 = "1mbkwhhprhf49s2iwx7kiliprsdvd690zk44x3h53ql9q52si2dj"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -719,7 +719,7 @@ lib.makeScope newScope (self: with self; { name = "libXScrnSaver-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2; + url = "mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2"; sha256 = "1y4vx1vabg7j9hamp0vrfrax5b0lmgm3h0lbgbb3hnkv3dd0f5zr"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -732,7 +732,7 @@ lib.makeScope newScope (self: with self; { name = "libXTrap-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2; + url = "mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2"; sha256 = "0bi5wxj6avim61yidh9fd3j4n8czxias5m8vss9vhxjnk1aksdwg"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -745,7 +745,7 @@ lib.makeScope newScope (self: with self; { name = "libXau-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2; + url = "mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2"; sha256 = "1v3krc6x0zliaa66qq1bf9j60x5nqfy68v8axaiglxpnvgqcpy6c"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -758,7 +758,7 @@ lib.makeScope newScope (self: with self; { name = "libXaw-1.0.13"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2; + url = "mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2"; sha256 = "1kdhxplwrn43d9jp3v54llp05kwx210lrsdvqb6944jp29rhdy4f"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -771,7 +771,7 @@ lib.makeScope newScope (self: with self; { name = "libXaw3d-1.6.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2; + url = "mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2"; sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -784,7 +784,7 @@ lib.makeScope newScope (self: with self; { name = "libXcomposite-0.4.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2; + url = "mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2"; sha256 = "13sfcglvz87vl58hd9rszwr73z0z4nwga3c12rfh7f5s2ln8l8dk"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -797,7 +797,7 @@ lib.makeScope newScope (self: with self; { name = "libXcursor-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2; + url = "mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2"; sha256 = "10l7c9fm0jmpkm9ab9dz8r6m1pr87vvgqjnbx1psz50h4pwfklrs"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -810,7 +810,7 @@ lib.makeScope newScope (self: with self; { name = "libXdamage-1.1.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2; + url = "mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2"; sha256 = "0igaw2akjf712y3rv7lx473jigxmcv9rs9y8sbrvbhya8f30cd5p"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -823,7 +823,7 @@ lib.makeScope newScope (self: with self; { name = "libXdmcp-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2; + url = "mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2"; sha256 = "0ab53h0rkq721ihk5hi469x500f3pgbkm1wy01yf24x5m923nli0"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -836,7 +836,7 @@ lib.makeScope newScope (self: with self; { name = "libXext-1.3.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2; + url = "mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2"; sha256 = "0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -849,7 +849,7 @@ lib.makeScope newScope (self: with self; { name = "libXfixes-5.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2; + url = "mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2"; sha256 = "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -862,7 +862,7 @@ lib.makeScope newScope (self: with self; { name = "libXfont-1.5.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2; + url = "mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2"; sha256 = "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -875,7 +875,7 @@ lib.makeScope newScope (self: with self; { name = "libXfont2-2.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2; + url = "mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2"; sha256 = "1rk9pjxcm01lbr1dxhnvk4f2qrn6zp068qjbvvz5w0z5d0rin5bd"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -888,7 +888,7 @@ lib.makeScope newScope (self: with self; { name = "libXft-2.3.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2; + url = "mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2"; sha256 = "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -901,7 +901,7 @@ lib.makeScope newScope (self: with self; { name = "libXi-1.7.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2; + url = "mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2"; sha256 = "0q8hz3slga3w3ch8wp0k7ay9ilhz315qnab0w1y2x9w3cf7hv8rn"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -914,7 +914,7 @@ lib.makeScope newScope (self: with self; { name = "libXinerama-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2; + url = "mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2"; sha256 = "086p0axqj57nvkaqa6r00dnr9kyrn1m8blgf0zjy25zpxkbxn200"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -927,7 +927,7 @@ lib.makeScope newScope (self: with self; { name = "libXmu-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2; + url = "mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2"; sha256 = "0cdpqnx6258i4l6qhphvkdiyspysg0i5caqjy820kp63wwjk4d4w"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -940,7 +940,7 @@ lib.makeScope newScope (self: with self; { name = "libXp-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2; + url = "mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2"; sha256 = "0mwc2jwmq03b1m9ihax5c6gw2ln8rc70zz4fsj3kb7440nchqdkz"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -953,7 +953,7 @@ lib.makeScope newScope (self: with self; { name = "libXpm-3.5.13"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXpm-3.5.13.tar.bz2; + url = "mirror://xorg/individual/lib/libXpm-3.5.13.tar.bz2"; sha256 = "09dc6nwlb2122h02vl64k9x56mxnyqz2gwpga0abfv4bb1bxmlcw"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -966,7 +966,7 @@ lib.makeScope newScope (self: with self; { name = "libXpresent-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2; + url = "mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2"; sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -979,7 +979,7 @@ lib.makeScope newScope (self: with self; { name = "libXrandr-1.5.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2; + url = "mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2"; sha256 = "08z0mqywrm7ij8bxlfrx0d2wy6kladdmkva1nw5k6qix82z0xsla"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -992,7 +992,7 @@ lib.makeScope newScope (self: with self; { name = "libXrender-0.9.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2; + url = "mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2"; sha256 = "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1005,7 +1005,7 @@ lib.makeScope newScope (self: with self; { name = "libXres-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2; + url = "mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2"; sha256 = "1m0jr0lbz9ixpp9ihk68349q0i7ry2379lnfzdy4mrl86ijc2xgz"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1018,7 +1018,7 @@ lib.makeScope newScope (self: with self; { name = "libXt-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2; + url = "mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2"; sha256 = "0cbqlyssr8aia88c8i7z59z9d0kp3p2hp6683xhz9ndyv8qza7dk"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1031,7 +1031,7 @@ lib.makeScope newScope (self: with self; { name = "libXtst-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2; + url = "mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2"; sha256 = "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1044,7 +1044,7 @@ lib.makeScope newScope (self: with self; { name = "libXv-1.0.11"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2; + url = "mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2"; sha256 = "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1057,7 +1057,7 @@ lib.makeScope newScope (self: with self; { name = "libXvMC-1.0.11"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2; + url = "mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2"; sha256 = "0bb2c996p0smp2lwckffcfh4701bzv7266xh230ag0x68ka38bja"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1070,7 +1070,7 @@ lib.makeScope newScope (self: with self; { name = "libXxf86dga-1.1.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2; + url = "mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2"; sha256 = "00vjvcdlc1sga251jkxn6gkxmx9h5n290ffxxpa40qbca1gvr61b"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1083,7 +1083,7 @@ lib.makeScope newScope (self: with self; { name = "libXxf86misc-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2; + url = "mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2"; sha256 = "107k593sx27vjz3v7gbb223add9i7w0bjc90gbb3jqpin3i07758"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1096,7 +1096,7 @@ lib.makeScope newScope (self: with self; { name = "libXxf86vm-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2; + url = "mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2"; sha256 = "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1109,7 +1109,7 @@ lib.makeScope newScope (self: with self; { name = "libdmx-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2; + url = "mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2"; sha256 = "0hvjfhrcym770cr0zpqajdy3cda30aiwbjzv16iafkqkbl090gr5"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1122,7 +1122,7 @@ lib.makeScope newScope (self: with self; { name = "libfontenc-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2; + url = "mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2"; sha256 = "0y90170dp8wsidr1dzza0grxr1lfh30ji3b5vkjz4j6x1n0wxz1c"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1135,7 +1135,7 @@ lib.makeScope newScope (self: with self; { name = "libpciaccess-0.16"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2; + url = "mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2"; sha256 = "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1148,7 +1148,7 @@ lib.makeScope newScope (self: with self; { name = "libpthread-stubs-0.4"; builder = ./builder.sh; src = fetchurl { - url = https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2; + url = "https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2"; sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1161,7 +1161,7 @@ lib.makeScope newScope (self: with self; { name = "libxcb-1.13.1"; builder = ./builder.sh; src = fetchurl { - url = https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2; + url = "https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2"; sha256 = "1i27lvrcsygims1pddpl5c4qqs6z715lm12ax0n3vx0igapvg7x8"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1174,7 +1174,7 @@ lib.makeScope newScope (self: with self; { name = "libxkbfile-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2; + url = "mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2"; sha256 = "1irq9crvscd3yb8sr802dhvvfr35jdy1n2yz094xplmd42mbv3bm"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1187,7 +1187,7 @@ lib.makeScope newScope (self: with self; { name = "libxshmfence-1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2; + url = "mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2"; sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1200,7 +1200,7 @@ lib.makeScope newScope (self: with self; { name = "listres-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/listres-1.0.4.tar.bz2; + url = "mirror://xorg/individual/app/listres-1.0.4.tar.bz2"; sha256 = "041bxkvv6f92sm3hhm977c4gdqdv5r1jyxjqcqfi8vkrg3s2j4ka"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1213,7 +1213,7 @@ lib.makeScope newScope (self: with self; { name = "lndir-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/lndir-1.0.3.tar.bz2; + url = "mirror://xorg/individual/util/lndir-1.0.3.tar.bz2"; sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1226,7 +1226,7 @@ lib.makeScope newScope (self: with self; { name = "luit-20190106"; builder = ./builder.sh; src = fetchurl { - url = https://invisible-mirror.net/archives/luit/luit-20190106.tgz; + url = "https://invisible-mirror.net/archives/luit/luit-20190106.tgz"; sha256 = "081rrajj5hpgx3pvm43grqzscnq5kl320q0wq6zzhf6wrijhz41b"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1239,7 +1239,7 @@ lib.makeScope newScope (self: with self; { name = "makedepend-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2; + url = "mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2"; sha256 = "072h9nzh8s5vqfz35dli4fba36fnr219asjrb7p89n8ph0paan6m"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1252,7 +1252,7 @@ lib.makeScope newScope (self: with self; { name = "mkfontscale-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2; + url = "mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2"; sha256 = "1ixsnsm2mn0zy9ksdid0lj6irnhvasfik9mz8bbrs5sajzmra16a"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1265,7 +1265,7 @@ lib.makeScope newScope (self: with self; { name = "oclock-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/oclock-1.0.4.tar.bz2; + url = "mirror://xorg/individual/app/oclock-1.0.4.tar.bz2"; sha256 = "1zmfzfmdp42nvapf0qz1bc3i3waq5sjrpkgfw64qs4nmq30wy86c"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1278,7 +1278,7 @@ lib.makeScope newScope (self: with self; { name = "sessreg-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/sessreg-1.1.2.tar.bz2; + url = "mirror://xorg/individual/app/sessreg-1.1.2.tar.bz2"; sha256 = "0crczl25zynkrslmm8sjaxszhrh4i33m7h5fg4wfdb3k8aarxjyz"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1291,7 +1291,7 @@ lib.makeScope newScope (self: with self; { name = "setxkbmap-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/setxkbmap-1.3.2.tar.bz2; + url = "mirror://xorg/individual/app/setxkbmap-1.3.2.tar.bz2"; sha256 = "1xdrxs65v7d0rw1yaz0vsz55w4hxym99216p085ya9978j379wlg"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1304,7 +1304,7 @@ lib.makeScope newScope (self: with self; { name = "smproxy-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2; + url = "mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2"; sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1317,7 +1317,7 @@ lib.makeScope newScope (self: with self; { name = "transset-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/transset-1.0.2.tar.bz2; + url = "mirror://xorg/individual/app/transset-1.0.2.tar.bz2"; sha256 = "088v8p0yfn4r3azabp6662hqikfs2gjb9xmjjd45gnngwwp19b2b"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1330,7 +1330,7 @@ lib.makeScope newScope (self: with self; { name = "twm-1.0.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/twm-1.0.10.tar.bz2; + url = "mirror://xorg/individual/app/twm-1.0.10.tar.bz2"; sha256 = "1ms5cj1w3g26zg6bxdv1j9hl0pxr4300qnv003cz1q3cl7ffljb4"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1343,7 +1343,7 @@ lib.makeScope newScope (self: with self; { name = "util-macros-1.19.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2; + url = "mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2"; sha256 = "04p7ydqxgq37jklnfj18b70zsifiz4h50wvrk94i2112mmv37r6p"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1356,7 +1356,7 @@ lib.makeScope newScope (self: with self; { name = "viewres-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/viewres-1.0.5.tar.bz2; + url = "mirror://xorg/individual/app/viewres-1.0.5.tar.bz2"; sha256 = "1mz319kfmvcrdpi22dmdr91mif1j0j3ck1f8mmnz5g1r9kl1in2y"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1369,7 +1369,7 @@ lib.makeScope newScope (self: with self; { name = "x11perf-1.6.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2; + url = "mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2"; sha256 = "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1382,7 +1382,7 @@ lib.makeScope newScope (self: with self; { name = "xauth-1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xauth-1.1.tar.bz2; + url = "mirror://xorg/individual/app/xauth-1.1.tar.bz2"; sha256 = "032klzzw8r09z36x1272ssd79bcisz8j5p8gbdy111fiknvx27bd"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1395,7 +1395,7 @@ lib.makeScope newScope (self: with self; { name = "xbacklight-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2; + url = "mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2"; sha256 = "1plssg0s3pbslg6rfzxp9sx8ryvn8l32zyvc8zp9zsbsfwjg69rs"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1408,7 +1408,7 @@ lib.makeScope newScope (self: with self; { name = "xbitmaps-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2; + url = "mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2"; sha256 = "1vh73sc13s7w5r6gnc6irca56s7998bja7wgdivkfn8jccawgw5r"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1421,7 +1421,7 @@ lib.makeScope newScope (self: with self; { name = "xcalc-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2; + url = "mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2"; sha256 = "1sxmlcb0sb3h4z05kl5l0kxnhrc0h8c74p9m3zdc7bv58jaldmym"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1434,7 +1434,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-proto-1.13"; builder = ./builder.sh; src = fetchurl { - url = https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2; + url = "https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2"; sha256 = "1qdxw9syhbvswiqj5dvj278lrmfhs81apzmvx6205s4vcqg7563v"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1447,7 +1447,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2; + url = "https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2"; sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1460,7 +1460,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-cursor-0.1.3"; builder = ./builder.sh; src = fetchurl { - url = https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2; + url = "https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2"; sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1473,7 +1473,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-errors-1.0"; builder = ./builder.sh; src = fetchurl { - url = https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2; + url = "https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2"; sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1486,7 +1486,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-image-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2; + url = "https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2"; sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1499,7 +1499,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-keysyms-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2; + url = "https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2"; sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1512,7 +1512,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-renderutil-0.3.9"; builder = ./builder.sh; src = fetchurl { - url = https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2; + url = "https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2"; sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1525,7 +1525,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-wm-0.4.1"; builder = ./builder.sh; src = fetchurl { - url = https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2; + url = "https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2"; sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1538,7 +1538,7 @@ lib.makeScope newScope (self: with self; { name = "xclock-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xclock-1.0.9.tar.bz2; + url = "mirror://xorg/individual/app/xclock-1.0.9.tar.bz2"; sha256 = "1fr3q4rszgx7x2zxy2ip592a3fgx20hfwac49p2l5b7jqsr1ying"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1551,7 +1551,7 @@ lib.makeScope newScope (self: with self; { name = "xcmsdb-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2; + url = "mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2"; sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1564,7 +1564,7 @@ lib.makeScope newScope (self: with self; { name = "xcompmgr-1.1.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2; + url = "mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2"; sha256 = "0hvjkanrdlvk3ln5a1jx3c9ggziism2jr1na7jl3zyk0y3sdm28b"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1577,7 +1577,7 @@ lib.makeScope newScope (self: with self; { name = "xconsole-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2; + url = "mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2"; sha256 = "1q2ib1626i5da0nda09sp3vzppjrcn82fff83cw7hwr0vy14h56i"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1590,7 +1590,7 @@ lib.makeScope newScope (self: with self; { name = "xcursorgen-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2; + url = "mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2"; sha256 = "0ggbv084cavp52hjgcz3vdj0g018axs0m23c03lpc5sgn92gidim"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1603,7 +1603,7 @@ lib.makeScope newScope (self: with self; { name = "xcursor-themes-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2; + url = "mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2"; sha256 = "16a96li0s0ggg60v7f6ywxmsrmxdfizcw55ccv7sp4qjfisca7pf"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1616,7 +1616,7 @@ lib.makeScope newScope (self: with self; { name = "xdm-1.1.12"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xdm-1.1.12.tar.bz2; + url = "mirror://xorg/individual/app/xdm-1.1.12.tar.bz2"; sha256 = "1x17hdymf6rd8jmh4n1sd4g5a8ayr5w94nwjw84qs2fs5pvq7lhd"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1629,7 +1629,7 @@ lib.makeScope newScope (self: with self; { name = "xdpyinfo-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2; + url = "mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2"; sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1642,7 +1642,7 @@ lib.makeScope newScope (self: with self; { name = "xdriinfo-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2; + url = "mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2"; sha256 = "0lcx8h3zd11m4w8wf7dyp89826d437iz78cyrix436bqx31x5k6r"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1655,7 +1655,7 @@ lib.makeScope newScope (self: with self; { name = "xev-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xev-1.2.3.tar.bz2; + url = "mirror://xorg/individual/app/xev-1.2.3.tar.bz2"; sha256 = "02ddsdx138g7szhwklpbzi0cxr34871iay3k28kdcihrz8f4zg36"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1668,7 +1668,7 @@ lib.makeScope newScope (self: with self; { name = "xeyes-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2; + url = "mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2"; sha256 = "0lq5j7fryx1wn998jq6h3icz1h6pqrsbs3adskjzjyhn5l6yrg2p"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1681,7 +1681,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-input-evdev-2.10.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2"; sha256 = "1h1y0fwnawlp4yc5llr1l7hwfcxxpln2fxhy6arcf6w6h4z0f9l7"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1694,7 +1694,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-input-joystick-1.6.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2"; sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1707,7 +1707,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-input-keyboard-1.9.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2"; sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1720,7 +1720,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-input-libinput-0.28.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.28.2.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-input-libinput-0.28.2.tar.bz2"; sha256 = "0818vr0yhk9j1y1wcbxzcd458vrvp06rrhi8k43bhqkb5jb4dcxq"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1733,7 +1733,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-input-mouse-1.9.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2"; sha256 = "1iawr1wyl2qch1mqszcs0s84i92mh4xxprflnycbw1adc18b7v4k"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1746,7 +1746,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-input-synaptics-1.9.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2"; sha256 = "0xhm03qywwfgkpfl904d08lx00y28m1b6lqmks5nxizixwk3by3s"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1759,7 +1759,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-input-vmmouse-13.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2"; sha256 = "06ckn4hlkpig5vnivl0zj8a7ykcgvrsj8b3iccl1pgn1gaamix8a"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1772,7 +1772,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-input-void-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2"; sha256 = "171k8b8s42s3w73l7ln9jqwk88w4l7r1km2blx1vy898c854yvpr"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1785,7 +1785,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-amdgpu-19.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-19.0.1.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-amdgpu-19.0.1.tar.bz2"; sha256 = "1mf6s7i423b2xyl469kwnakrpp5fr41sm8hh7vli5jxdd8crg8da"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1798,7 +1798,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-apm-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2"; sha256 = "0znwqfc8abkiha98an8hxsngnz96z6cd976bc4bsvz1km6wqk0c0"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1811,7 +1811,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-ark-0.7.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2"; sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1824,7 +1824,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-ast-1.1.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2"; sha256 = "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1837,7 +1837,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-ati-19.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-19.0.1.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-ati-19.0.1.tar.bz2"; sha256 = "1c31g5q5p3nk9nscwikh1vvfnhdwsxiw7j8v678nlm34hrfh3djw"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1850,7 +1850,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-chips-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2"; sha256 = "1gqzy7q9v824m7hqkbbmncxg082zm0d4mafgc97c4skyiwgf9wq7"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1863,7 +1863,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-cirrus-1.5.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2"; sha256 = "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1876,7 +1876,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-dummy-0.3.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2"; sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1889,7 +1889,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-fbdev-0.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2"; sha256 = "16a66zr0l1lmssa07i3rzy07djxnb45c17ks8c71h8l06xgxihyw"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1902,7 +1902,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-geode-2.11.19"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-geode-2.11.19.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-geode-2.11.19.tar.bz2"; sha256 = "0zn9gb49grds5mcs1dlrx241k2w1sgqmx4i5x7v6159xxqhlqsf6"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1915,7 +1915,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-glide-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2"; sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1928,7 +1928,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-glint-1.2.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2"; sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1941,7 +1941,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-i128-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2"; sha256 = "1snhpv1igrhifcls3r498kjd14ml6x2xvih7zk9xlsd1ymmhlb4g"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1954,7 +1954,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-i740-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2"; sha256 = "0l3s1m95bdsg4gki943qipq8agswbb84dzcflpxa3vlckwhh3r26"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1967,7 +1967,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-intel-2.99.917"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2"; sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1980,7 +1980,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-mach64-6.9.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2"; sha256 = "171wg8r6py1l138s58rlapin3rlpwsg9spmvhc7l68mm3g3hf1vs"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1993,7 +1993,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-mga-2.0.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2"; sha256 = "0yaxpgyyj9398nzzr5vnsfxcis76z46p9814yzj8179yl7hld296"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2006,7 +2006,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-neomagic-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2"; sha256 = "0r4h673kw8fl7afc30anwbjlbhp82mg15fvaxf470xg7z983k0wk"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2019,7 +2019,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-newport-0.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2"; sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2032,7 +2032,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-nouveau-1.0.15"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2"; sha256 = "0k0xah72ryjwak4dc4crszxrlkmi9x1s7p3sd4la642n77yi1pmf"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2045,7 +2045,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-nv-2.1.21"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2"; sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2058,7 +2058,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-omap-0.4.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2"; sha256 = "0nmbrx6913dc724y8wj2p6vqfbj5zdjfmsl037v627jj0whx9rwk"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2071,7 +2071,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-openchrome-0.6.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2"; sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2084,7 +2084,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-qxl-0.1.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2"; sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2097,7 +2097,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-r128-6.11.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2"; sha256 = "0snvwmrh8dqyyaq7ggicym6yrsg4brygkx9156r0m095m7fp3rav"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2110,7 +2110,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-rendition-4.2.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2"; sha256 = "0yzqcdfrnnyaaaa76d4hpwycpq4x2j8qvg9m4q19lj4xbicwc4cm"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2123,7 +2123,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-s3virge-1.11.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2"; sha256 = "06d1v5s7xf00y18x12cz11sk00rgn0yq95w66kmgzy465pzxvj84"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2136,7 +2136,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-savage-2.3.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2"; sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2149,7 +2149,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-siliconmotion-1.7.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2"; sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2162,7 +2162,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-sis-0.11.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2"; sha256 = "0srvrhydjnynfb7b1s145rgmsk4f71iz0ag4icpmb05944d90xr1"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2175,7 +2175,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-sisusb-0.9.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2"; sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2188,7 +2188,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-suncg6-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2"; sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2201,7 +2201,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-sunffb-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2"; sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2214,7 +2214,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-sunleo-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2"; sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2227,7 +2227,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-tdfx-1.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2"; sha256 = "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2240,7 +2240,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-tga-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2"; sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2253,7 +2253,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-trident-1.3.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2"; sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2266,7 +2266,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-v4l-0.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2"; sha256 = "084x4p4avy72mgm2vnnvkicw3419i6pp3wxik8zqh7gmq4xv5z75"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2279,7 +2279,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-vboxvideo-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2"; sha256 = "195z1js3i51qgxvhfw4bxb4dw3jcrrx2ynpm2y3475dypjzs7dkz"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2292,7 +2292,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-vesa-2.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2"; sha256 = "1373vsxn6qh00na0s9c09kf09gj78rzi98zq93id8v5zsya3qi5z"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2305,7 +2305,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-vmware-13.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vmware-13.3.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-vmware-13.3.0.tar.bz2"; sha256 = "0v06qhm059klq40m2yx4wypzb7h53aaassbjfmm6clcyclj1k5s7"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2318,7 +2318,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-voodoo-1.2.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2"; sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2331,7 +2331,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-wsfb-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2"; sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2344,7 +2344,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-xgi-1.6.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2"; sha256 = "10xd2vah0pnpw5spn40n4p95mpmgvdkly4i1cz51imnlfsw7g8si"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2357,7 +2357,7 @@ lib.makeScope newScope (self: with self; { name = "xfd-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xfd-1.1.3.tar.bz2; + url = "mirror://xorg/individual/app/xfd-1.1.3.tar.bz2"; sha256 = "0n6r1v8sm0z0ycqch035xpm46nv5v4mav3kxh36883l3ln5r6bqr"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2370,7 +2370,7 @@ lib.makeScope newScope (self: with self; { name = "xfontsel-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2; + url = "mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2"; sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2383,7 +2383,7 @@ lib.makeScope newScope (self: with self; { name = "xfs-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xfs-1.2.0.tar.bz2; + url = "mirror://xorg/individual/app/xfs-1.2.0.tar.bz2"; sha256 = "0q4q4rbzx159sfn2n52y039fki6nc6a39qdfxa78yjc3aw8i48nv"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2396,7 +2396,7 @@ lib.makeScope newScope (self: with self; { name = "xfsinfo-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2; + url = "mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2"; sha256 = "1mmir5i7gm71xc0ba8vnizi4744vsd31hknhi4cmgvg6kadqngla"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2409,7 +2409,7 @@ lib.makeScope newScope (self: with self; { name = "xgamma-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2; + url = "mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2"; sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2422,7 +2422,7 @@ lib.makeScope newScope (self: with self; { name = "xgc-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xgc-1.0.5.tar.bz2; + url = "mirror://xorg/individual/app/xgc-1.0.5.tar.bz2"; sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2435,7 +2435,7 @@ lib.makeScope newScope (self: with self; { name = "xhost-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xhost-1.0.8.tar.bz2; + url = "mirror://xorg/individual/app/xhost-1.0.8.tar.bz2"; sha256 = "15n3mnd4i5kh4z32qv11580qjgvnng0wry2y753ljrqkkrbkrp52"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2448,7 +2448,7 @@ lib.makeScope newScope (self: with self; { name = "xinit-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xinit-1.4.1.tar.bz2; + url = "mirror://xorg/individual/app/xinit-1.4.1.tar.bz2"; sha256 = "1fdbakx59vyh474skjydj1bbglpby3y03nl7mxn0z9v8gdhqz6yy"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2461,7 +2461,7 @@ lib.makeScope newScope (self: with self; { name = "xinput-1.6.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xinput-1.6.3.tar.bz2; + url = "mirror://xorg/individual/app/xinput-1.6.3.tar.bz2"; sha256 = "1vb6xdd1xmk5f7pwc5zcbxfray5sf1vbnscqwf2yl8lv7gfq38im"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2474,7 +2474,7 @@ lib.makeScope newScope (self: with self; { name = "xkbcomp-1.4.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2; + url = "mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2"; sha256 = "0944rrkkf0dxp07vhh9yr4prslxhqyw63qmbjirbv1bypswvrn3d"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2487,7 +2487,7 @@ lib.makeScope newScope (self: with self; { name = "xkbevd-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2; + url = "mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2"; sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2500,7 +2500,7 @@ lib.makeScope newScope (self: with self; { name = "xkbprint-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2; + url = "mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2"; sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2513,7 +2513,7 @@ lib.makeScope newScope (self: with self; { name = "xkbutils-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2; + url = "mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2"; sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2526,7 +2526,7 @@ lib.makeScope newScope (self: with self; { name = "xkeyboard-config-2.27"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.27.tar.bz2; + url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.27.tar.bz2"; sha256 = "07wh443lhwv1j0q6xnxnji7f7ahh7xphxj90fv02cdd6zv4aw3b9"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2539,7 +2539,7 @@ lib.makeScope newScope (self: with self; { name = "xkill-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xkill-1.0.5.tar.bz2; + url = "mirror://xorg/individual/app/xkill-1.0.5.tar.bz2"; sha256 = "0szzd9nzn0ybkhnfyizb876irwnjsnb78rcaxx6prb71jmmbpw65"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2552,7 +2552,7 @@ lib.makeScope newScope (self: with self; { name = "xload-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xload-1.1.3.tar.bz2; + url = "mirror://xorg/individual/app/xload-1.1.3.tar.bz2"; sha256 = "01sr6yd6yhyyfgn88l867w6h9dn5ikcynaz5rwji6xqxhw1lhkpk"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2565,7 +2565,7 @@ lib.makeScope newScope (self: with self; { name = "xlsatoms-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2; + url = "mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2"; sha256 = "10m3a046jvaw5ywx4y65kl84lsxqan70gww1g1r7cf96ijaqz1jp"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2578,7 +2578,7 @@ lib.makeScope newScope (self: with self; { name = "xlsclients-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2; + url = "mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2"; sha256 = "1h8931sn34mcip6vpi4v7hdmr1r58gkbw4s2p97w98kykks2lgvp"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2591,7 +2591,7 @@ lib.makeScope newScope (self: with self; { name = "xlsfonts-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2; + url = "mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2"; sha256 = "0s6kxgv78chkwsqmhw929f4pf91gq63f4yvixxnan1h00cx0pf49"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2604,7 +2604,7 @@ lib.makeScope newScope (self: with self; { name = "xmag-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xmag-1.0.6.tar.bz2; + url = "mirror://xorg/individual/app/xmag-1.0.6.tar.bz2"; sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2617,7 +2617,7 @@ lib.makeScope newScope (self: with self; { name = "xmessage-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2; + url = "mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2"; sha256 = "0a90kfm0qz8cn2pbpqfyqrc5s9bfvvy14nj848ynvw56wy0zng9p"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2630,7 +2630,7 @@ lib.makeScope newScope (self: with self; { name = "xmodmap-1.0.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2; + url = "mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2"; sha256 = "0z28331i2pm16x671fa9qwsfqdmr6a43bzwmp0dm17a3sx0hjgs7"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2643,7 +2643,7 @@ lib.makeScope newScope (self: with self; { name = "xmore-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xmore-1.0.3.tar.bz2; + url = "mirror://xorg/individual/app/xmore-1.0.3.tar.bz2"; sha256 = "06r514p30v87vx00ddlck9mwazaqk9bx08ip866p1mw2a46iwjk4"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2656,7 +2656,7 @@ lib.makeScope newScope (self: with self; { name = "xorg-cf-files-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2; + url = "mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2"; sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2669,7 +2669,7 @@ lib.makeScope newScope (self: with self; { name = "xorg-docs-1.7.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2; + url = "mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2"; sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2682,7 +2682,7 @@ lib.makeScope newScope (self: with self; { name = "xorgproto-2019.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2; + url = "mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2"; sha256 = "16yll1kaffnslik5sizlw3qrigj1gpsgfgyq6903g3mwdixamnm6"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2692,11 +2692,11 @@ lib.makeScope newScope (self: with self; { }) {}; xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { - name = "xorg-server-1.20.7"; + name = "xorg-server-1.20.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.20.7.tar.bz2; - sha256 = "18bfl04ihw1jr3h0fs522nnxxq5ixjay77y9dcymnkzk23q8cndx"; + url = "mirror://xorg/individual/xserver/xorg-server-1.20.8.tar.bz2"; + sha256 = "0ih15m7gh1z1ly6z7g82bkni719yisqmbk61a1wgp82bxrmn8yyi"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2708,7 +2708,7 @@ lib.makeScope newScope (self: with self; { name = "xorg-sgml-doctools-1.11"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2; + url = "mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2"; sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2721,7 +2721,7 @@ lib.makeScope newScope (self: with self; { name = "xpr-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xpr-1.0.5.tar.bz2; + url = "mirror://xorg/individual/app/xpr-1.0.5.tar.bz2"; sha256 = "07qy9lwjvxighcmg6qvjkgagad3wwvidrfx0jz85lgynz3qy0dmr"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2734,7 +2734,7 @@ lib.makeScope newScope (self: with self; { name = "xprop-1.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xprop-1.2.4.tar.bz2; + url = "mirror://xorg/individual/app/xprop-1.2.4.tar.bz2"; sha256 = "0lzp7kyhpwd5hm83j2zm6j3w3z1z5i4ykgg2nwr01ij6dq4znxwc"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2747,7 +2747,7 @@ lib.makeScope newScope (self: with self; { name = "xrandr-1.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2; + url = "mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2"; sha256 = "1kaih7rmzxr1vp5a5zzjhm5x7dn9mckya088sqqw026pskhx9ky1"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2760,7 +2760,7 @@ lib.makeScope newScope (self: with self; { name = "xrdb-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2; + url = "mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2"; sha256 = "0ik9gh6363c47pr0dp7q22nfs8vmavjg2v4bsr0604ppl77nafpj"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2773,7 +2773,7 @@ lib.makeScope newScope (self: with self; { name = "xrefresh-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2; + url = "mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2"; sha256 = "0lv3rlshh7s0z3aqx5ahnnf8cl082m934bk7gv881mz8nydznz98"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2786,7 +2786,7 @@ lib.makeScope newScope (self: with self; { name = "xset-1.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xset-1.2.4.tar.bz2; + url = "mirror://xorg/individual/app/xset-1.2.4.tar.bz2"; sha256 = "0my987wjvra7l92ry6q44ky383yg3phzxhdbn3lqhapm1ll9bzg4"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2799,7 +2799,7 @@ lib.makeScope newScope (self: with self; { name = "xsetroot-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2; + url = "mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2"; sha256 = "0z21mqvmdl6rl63q77479wgkfygnll57liza1i3va7sr4fx45i0h"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2812,7 +2812,7 @@ lib.makeScope newScope (self: with self; { name = "xsm-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xsm-1.0.4.tar.bz2; + url = "mirror://xorg/individual/app/xsm-1.0.4.tar.bz2"; sha256 = "09a4ss1fnrh1sgm21r4n5pivawf34paci3rn6mscyljf7a4vcd4r"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2825,7 +2825,7 @@ lib.makeScope newScope (self: with self; { name = "xstdcmap-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2; + url = "mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2"; sha256 = "12vgzsxv4rw25frkgjyli6w6hy10lgpvsx9wzw2v5l5a3qzqp286"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2838,7 +2838,7 @@ lib.makeScope newScope (self: with self; { name = "xtrans-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2; + url = "mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2"; sha256 = "0wyp0yc6gi72hwc3kjmvm3vkj9p6s407cb6dxx37jh9wb68l8z1p"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2851,7 +2851,7 @@ lib.makeScope newScope (self: with self; { name = "xtrap-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2; + url = "mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2"; sha256 = "0sqm4j1zflk1s94iq4waa70hna1xcys88v9a70w0vdw66czhvj2j"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2864,7 +2864,7 @@ lib.makeScope newScope (self: with self; { name = "xvinfo-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2; + url = "mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2"; sha256 = "0gz7fvxavqlrqynpfbrm2nc9yx8h0ksnbnv34fj7n1q6cq6j4lq3"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2877,7 +2877,7 @@ lib.makeScope newScope (self: with self; { name = "xwd-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xwd-1.0.7.tar.bz2; + url = "mirror://xorg/individual/app/xwd-1.0.7.tar.bz2"; sha256 = "1537i8q8pgf0sjklakzfvjwrq5b246qjywrx9ll8xfg0p6w1as6d"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2890,7 +2890,7 @@ lib.makeScope newScope (self: with self; { name = "xwininfo-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2; + url = "mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2"; sha256 = "00avrpw4h5mr1klp41lv2j4dmq465v6l5kb5bhm4k5ml8sm9i543"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2903,7 +2903,7 @@ lib.makeScope newScope (self: with self; { name = "xwud-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xwud-1.0.5.tar.bz2; + url = "mirror://xorg/individual/app/xwud-1.0.5.tar.bz2"; sha256 = "1a8hdgy40smvblnh3s9f0vkqckl68nmivx7d48zk34m8z18p16cr"; }; hardeningDisable = [ "bindnow" "relro" ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 58ebc6d984ee2..c6fe55ad9f750 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -256,6 +256,15 @@ self: super: libXres = super.libXres.overrideAttrs (attrs: { outputs = [ "out" "dev" "devdoc" ]; + buildInputs = with self; attrs.buildInputs ++ [ utilmacros ]; + configureFlags = attrs.configureFlags or [] + ++ malloc0ReturnsNullCrossFlag; + }); + + libXScrnSaver = super.libXScrnSaver.overrideAttrs (attrs: { + buildInputs = with self; attrs.buildInputs ++ [ utilmacros ]; + configureFlags = attrs.configureFlags or [] + ++ malloc0ReturnsNullCrossFlag; }); libXv = super.libXv.overrideAttrs (attrs: { @@ -291,7 +300,7 @@ self: super: libxshmfence = super.libxshmfence.overrideAttrs (attrs: { name = "libxshmfence-1.3"; src = fetchurl { - url = mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2; + url = "mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2"; sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q"; }; outputs = [ "out" "dev" ]; # mainly to avoid propagation @@ -571,7 +580,7 @@ self: super: name = "xorg-server-1.17.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2; + url = "mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2"; sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc"; }; nativeBuildInputs = [ pkgconfig ]; @@ -581,7 +590,7 @@ self: super: name = "xorg-server-1.18.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2; + url = "mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2"; sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 8db2034f1bccb..556e999aacbd5 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.20.7.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.20.8.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix index af526730ca97a..e868dbab7f608 100644 --- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix +++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "XCB utility functions for the X resource manager"; - homepage = https://github.com/Airblader/xcb-util-xrm; + homepage = "https://github.com/Airblader/xcb-util-xrm"; license = licenses.mit; # X11 variant platforms = with platforms; unix; }; diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index d033f211c3a53..a60025b797798 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -31,7 +31,7 @@ xorgserver.overrideAttrs (oldAttrs: { meta = { description = "An X server for interfacing X11 apps with the Wayland protocol"; - homepage = https://wayland.freedesktop.org/xserver.html; + homepage = "https://wayland.freedesktop.org/xserver.html"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index 445c6c57bbf15..ebe927a85d879 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Secure replacement for inetd"; platforms = stdenv.lib.platforms.linux; - homepage = http://xinetd.org; + homepage = "http://xinetd.org"; license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix index c25c4baf13b80..e1cec51e4ab0a 100644 --- a/pkgs/servers/xmpp/biboumi/default.nix +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; louiz_catch = fetchgit { - url = https://lab.louiz.org/louiz/Catch.git; + url = "https://lab.louiz.org/louiz/Catch.git"; rev = "0a34cc201ef28bf25c88b0062f331369596cb7b7"; # v2.2.1 sha256 = "0ad0sjhmzx61a763d2ali4vkj8aa1sbknnldks7xlf4gy83jfrbl"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Modern XMPP IRC gateway"; platforms = platforms.unix; - homepage = https://lab.louiz.org/louiz/biboumi; + homepage = "https://lab.louiz.org/louiz/biboumi"; license = licenses.zlib; maintainers = [ maintainers.woffs ]; }; diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index fbfae96c0584e..2cf4d9465aec3 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -113,7 +113,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source XMPP application server written in Erlang"; license = licenses.gpl2; - homepage = https://www.ejabberd.im; + homepage = "https://www.ejabberd.im"; platforms = platforms.linux; maintainers = with maintainers; [ sander abbradar ajs124 ]; broken = withElixir; diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 0d552e9e1121f..05e276f0b9892 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg +{ stdenv, fetchurl, lib, libidn, openssl, makeWrapper, fetchhg , lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop +, nixosTests , withLibevent ? true, luaevent ? null , withDBI ? true, luadbi ? null # use withExtraLibs to add additional dependencies of community modules @@ -16,7 +17,16 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "0.11.5"; # also update communityModules pname = "prosody"; - + # The following community modules are necessary for the nixos module + # prosody module to comply with XEP-0423 and provide a working + # default setup. + nixosModuleDeps = [ + "bookmarks" + "cloud_notify" + "vcard_muc" + "smacks" + "http_upload" + ]; src = fetchurl { url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; sha256 = "12s0hn6hvjbi61cdw3165l6iw0878971dmlvfg663byjsmjvvy2m"; @@ -52,7 +62,7 @@ stdenv.mkDerivation rec { postInstall = '' ${concatMapStringsSep "\n" (module: '' cp -r $communityModules/mod_${module} $out/lib/prosody/modules/ - '') (withCommunityModules ++ withOnlyInstalledCommunityModules)} + '') (lib.lists.unique(nixosModuleDeps ++ withCommunityModules ++ withOnlyInstalledCommunityModules))} wrapProgram $out/bin/prosody \ --prefix LUA_PATH ';' "$LUA_PATH" \ --prefix LUA_CPATH ';' "$LUA_CPATH" @@ -62,7 +72,13 @@ stdenv.mkDerivation rec { --prefix LUA_CPATH ';' "$LUA_CPATH" ''; - passthru.communityModules = withCommunityModules; + passthru = { + communityModules = withCommunityModules; + tests = { + main = nixosTests.prosody; + mysql = nixosTests.prosodyMysql; + }; + }; meta = { description = "Open-source XMPP application server written in Lua"; diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 93f22e77f8700..8dcbe36850afd 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchurl, substituteAll, cmake, makeWrapper, pkgconfig , curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages , polkit, utillinuxMinimal, x264, zlib -, coreutils, procps, psmisc }: +, coreutils, procps, psmisc, nixosTests }: # NOTES: # @@ -78,13 +78,13 @@ let in stdenv.mkDerivation rec { pname = "zoneminder"; - version = "1.34.3"; + version = "1.34.9"; src = fetchFromGitHub { owner = "ZoneMinder"; repo = "zoneminder"; rev = version; - sha256 = "0jp7950v36gxxzkwdp5i0312s26czhfsl5ixdxfzn21cx31hhlg0"; + sha256 = "1xvgfsm260a3v0vqgbk7m9jzayhcs4ysyadnnxajyrndjhn802ic"; }; patches = [ @@ -170,13 +170,12 @@ in stdenv.mkDerivation rec { "-DZM_CONFIG_DIR=${placeholder "out"}/etc/zoneminder" "-DZM_WEB_USER=${user}" "-DZM_WEB_GROUP=${user}" - - # Workaround issue in CMakeLists.txt where ZM_CGIDIR set to ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin - # But CMAKE_INSTALL_LIBEXECDIR is already an absolute path from cmake setup-hook - "-DZM_CGIDIR=${placeholder "out"}/libexec/zoneminder/cgi-bin" ]; - passthru = { inherit dirName; }; + passthru = { + inherit dirName; + tests = nixosTests.zoneminder; + }; postInstall = '' PERL5LIB="$PERL5LIB''${PERL5LIB:+:}$out/${perl.libPrefix}" diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index e45845359019a..b0685d7f9546f 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://zookeeper.apache.org; + homepage = "http://zookeeper.apache.org"; description = "Apache Zookeeper"; license = licenses.asl20; maintainers = with maintainers; [ nathan-gs cstrahan pradeepchhetri ]; diff --git a/pkgs/shells/any-nix-shell/default.nix b/pkgs/shells/any-nix-shell/default.nix index d2b7a4929e1c3..bab39aef2441f 100644 --- a/pkgs/shells/any-nix-shell/default.nix +++ b/pkgs/shells/any-nix-shell/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "fish and zsh support for nix-shell"; license = licenses.mit; - homepage = https://github.com/haslersn/any-nix-shell; + homepage = "https://github.com/haslersn/any-nix-shell"; maintainers = with maintainers; [ haslersn ]; }; -} \ No newline at end of file +} diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index 7ca57ac015649..4cb3c14a9a0d7 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/bash/; + homepage = "https://www.gnu.org/software/bash/"; description = "GNU Bourne-Again Shell, the de facto standard shell on Linux" + (if interactive then " (for interactive use)" else ""); diff --git a/pkgs/shells/bash/5.0.nix b/pkgs/shells/bash/5.0.nix index 05aaf39b34049..09030493fb608 100644 --- a/pkgs/shells/bash/5.0.nix +++ b/pkgs/shells/bash/5.0.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/bash/; + homepage = "https://www.gnu.org/software/bash/"; description = "GNU Bourne-Again Shell, the de facto standard shell on Linux" + (if interactive then " (for interactive use)" else ""); diff --git a/pkgs/shells/bash/bash-completion/0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch b/pkgs/shells/bash/bash-completion/0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch deleted file mode 100644 index c0d94a1a76d9b..0000000000000 --- a/pkgs/shells/bash/bash-completion/0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 398f44b4ed545fc1b6c13a057bf0900001f7958b Mon Sep 17 00:00:00 2001 -From: Frederik Rietdijk <fridh@fridh.nl> -Date: Tue, 22 Oct 2019 15:07:05 +0200 -Subject: [PATCH] Revert "build: Do cmake, pc, and profile variable - replacements in Makefile" - -This reverts commit 81ba2c7e7dfbaefbafa1e8615727c9612e5fb314. ---- - Makefile.am | 12 ++++++++---- - bash-completion-config.cmake.in | 4 ++-- - bash-completion.pc.in | 4 ++-- - configure.ac | 3 +++ - 4 files changed, 15 insertions(+), 8 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 8f441185..53979529 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -23,8 +23,7 @@ cmakeconfig_DATA = bash-completion-config.cmake \ - -e 's|@VERSION[@]|$(VERSION)|' \ - <$(srcdir)/$@.in >$@ - --CLEANFILES = bash_completion.sh bash-completion.pc \ -- bash-completion-config.cmake bash-completion-config-version.cmake -+CLEANFILES = bash_completion.sh bash-completion.pc - - EXTRA_DIST = CHANGES $(pkgdata_DATA) bash_completion.sh.in .dir-locals.el \ - .editorconfig README.md CONTRIBUTING.md pyproject.toml .perltidyrc \ -@@ -34,6 +33,11 @@ EXTRA_DIST = CHANGES $(pkgdata_DATA) bash_completion.sh.in .dir-locals.el \ - install-data-hook: - tmpfile=`mktemp $${TMPDIR:-/tmp}/bash_completion.XXXXXX` && \ - $(SED) -e 's|-/etc/bash_completion\.d|-$(compatdir)|' \ -- $(DESTDIR)$(pkgdatadir)/bash_completion >$$tmpfile && \ -- cat $$tmpfile >$(DESTDIR)$(pkgdatadir)/bash_completion && \ -+ $(DESTDIR)$(pkgdatadir)/bash_completion > $$tmpfile && \ -+ cat $$tmpfile > $(DESTDIR)$(pkgdatadir)/bash_completion && \ -+ $(SED) -e 's|\$${prefix}|$(prefix)|' \ -+ $(DESTDIR)$(datadir)/cmake/$(PACKAGE)/bash-completion-config.cmake \ -+ > $$tmpfile && \ -+ cat $$tmpfile > \ -+ $(DESTDIR)$(datadir)/cmake/$(PACKAGE)/bash-completion-config.cmake && \ - rm $$tmpfile -diff --git a/bash-completion-config.cmake.in b/bash-completion-config.cmake.in -index d907b76c..ccc6e052 100644 ---- a/bash-completion-config.cmake.in -+++ b/bash-completion-config.cmake.in -@@ -5,7 +5,7 @@ set (BASH_COMPLETION_VERSION "@VERSION@") - - set (BASH_COMPLETION_PREFIX "@prefix@") - set (BASH_COMPLETION_COMPATDIR "@compatdir@") --set (BASH_COMPLETION_COMPLETIONSDIR "@pkgdatadir@/completions") --set (BASH_COMPLETION_HELPERSDIR "@pkgdatadir@/helpers") -+set (BASH_COMPLETION_COMPLETIONSDIR "@datarootdir@/@PACKAGE@/completions") -+set (BASH_COMPLETION_HELPERSDIR "@datarootdir@/@PACKAGE@/helpers") - - set (BASH_COMPLETION_FOUND "TRUE") -diff --git a/bash-completion.pc.in b/bash-completion.pc.in -index ea03fd75..bde217db 100644 ---- a/bash-completion.pc.in -+++ b/bash-completion.pc.in -@@ -1,7 +1,7 @@ - prefix=@prefix@ - compatdir=@compatdir@ --completionsdir=@pkgdatadir@/completions --helpersdir=@pkgdatadir@/helpers -+completionsdir=@datarootdir@/@PACKAGE@/completions -+helpersdir=@datarootdir@/@PACKAGE@/helpers - - Name: bash-completion - Description: programmable completion for the bash shell -diff --git a/configure.ac b/configure.ac -index 1f3b37e8..a216d9b7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13,5 +13,8 @@ helpers/Makefile - test/Makefile - test/t/Makefile - test/t/unit/Makefile -+bash-completion.pc -+bash-completion-config.cmake -+bash-completion-config-version.cmake - ]) - AC_OUTPUT --- -2.21.0 - diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index a741633340d6d..e5ef70e43a99d 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -1,49 +1,62 @@ { stdenv, fetchFromGitHub , fetchpatch , autoreconfHook +, perl +, ps , python3Packages , bashInteractive }: stdenv.mkDerivation rec { pname = "bash-completion"; - # TODO: Remove musl patch below upon next release! - version = "2.9"; + version = "2.10"; src = fetchFromGitHub { owner = "scop"; repo = "bash-completion"; rev = version; - sha256 = "1813r4jxfa2zgzm2ppjhrq62flfmxai8433pklxcrl4fp5wwx9yv"; + sha256 = "047yjryy9d6hp18wkigbfrw9r0sm31inlsp8l28fhxg8ii032sgq"; }; nativeBuildInputs = [ autoreconfHook ]; doCheck = !stdenv.isDarwin; checkInputs = [ + # perl is assumed by perldoc completion + perl + # ps assumed to exist by gdb, killall, pgrep, pidof, + # pkill, pwdx, renice, and reptyr completions + ps python3Packages.pexpect python3Packages.pytest bashInteractive - ]; - patches = [ - ./0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch - # TODO: Remove when https://github.com/scop/bash-completion/commit/2cdac1b9f24df62a1fa80c1824ee8524c9b02393 - # is availabe in a release in nixpkgs. see https://github.com/scop/bash-completion/issues/312. - # Fixes a test failure with musl. - (fetchpatch { - url = "https://github.com/scop/bash-completion/commit/2cdac1b9f24df62a1fa80c1824ee8524c9b02393.patch"; - name = "bash-completion-musl-test_iconv-skip-option-completion-if-help-fails"; - sha256 = "1l53d62zf01k625nzw3vcrxky93h7bzdpchgk4argxalrn17ckvb"; - }) + # use xdist to speed up the test run, just like upstream: + # https://github.com/scop/bash-completion/blob/009bf2228c68894629eb6fd17b3dc0f1f6d67615/test/requirements.txt#L4 + python3Packages.pytest_xdist ]; - # ignore ip_addresses because it tries to touch network - # ignore test_ls because impure logic + # - ignore test_gcc on ARM because it assumes -march=native + # - ignore test_chsh because it assumes /etc/shells exists + # - ignore test_ether_wake, test_ifdown, test_ifstat, test_ifup, + # test_iperf, test_iperf3, test_nethogs and ip_addresses + # because they try to touch network + # - ignore test_ls because impure logic + # - ignore test_screen because it assumes vt terminals exist checkPhase = '' - pytest . \ + pytest -n $NIX_BUILD_CORES . \ + ${stdenv.lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) "--ignore=test/t/test_gcc.py"} \ + --ignore=test/t/test_chsh.py \ + --ignore=test/t/test_ether_wake.py \ + --ignore=test/t/test_ifdown.py \ + --ignore=test/t/test_ifstat.py \ + --ignore=test/t/test_ifup.py \ + --ignore=test/t/test_iperf.py \ + --ignore=test/t/test_iperf3.py \ + --ignore=test/t/test_nethogs.py \ --ignore=test/t/unit/test_unit_ip_addresses.py \ - --ignore=test/t/test_ls.py + --ignore=test/t/test_ls.py \ + --ignore=test/t/test_screen.py ''; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' @@ -51,10 +64,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/scop/bash-completion; + homepage = "https://github.com/scop/bash-completion"; description = "Programmable completion for the bash shell"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.peti ]; + maintainers = [ maintainers.peti maintainers.xfix ]; }; } diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index f8d592748b3fc..7aedd0189e44a 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = http://gondor.apana.org.au/~herbert/dash/; + homepage = "http://gondor.apana.org.au/~herbert/dash/"; description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible"; platforms = platforms.unix; license = with licenses; [ bsd3 gpl2 ]; diff --git a/pkgs/shells/dgsh/default.nix b/pkgs/shells/dgsh/default.nix index e2fd845c286e5..0314180e2d55a 100644 --- a/pkgs/shells/dgsh/default.nix +++ b/pkgs/shells/dgsh/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The Directed Graph Shell"; - homepage = http://www.dmst.aueb.gr/dds/sw/dgsh; + homepage = "http://www.dmst.aueb.gr/dds/sw/dgsh"; license = with licenses; asl20; maintainers = with maintainers; [ vrthra ]; platforms = with platforms; all; diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 402b5a7ebca7d..2aa23cd063e87 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "0lz9lf1swrn67kymcp2wh67lh3c0ifqm9035gpkd3zynlq3wzqfm"; }; - modSha256 = "13x4wbfj8049ygm3zbgzyr2bm4sq4x6xddrxx6shr8fydlcf1g8v"; + vendorSha256 = null; meta = with stdenv.lib; { description = "A friendly and expressive command shell"; @@ -27,7 +27,7 @@ buildGoModule rec { language. It runs on Linux, BSDs, macOS and Windows. Despite its pre-1.0 status, it is already suitable for most daily interactive use. ''; - homepage = https://elv.sh/; + homepage = "https://elv.sh/"; license = licenses.bsd2; maintainers = with maintainers; [ vrthra AndersonTorres ]; platforms = with platforms; linux ++ darwin; @@ -36,4 +36,4 @@ buildGoModule rec { passthru = { shellPath = "/bin/elvish"; }; -} +} \ No newline at end of file diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix index 446f28ba65271..761846843feac 100644 --- a/pkgs/shells/es/default.nix +++ b/pkgs/shells/es/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { functional programming languages, such as Scheme, and the Tcl embeddable programming language. ''; - homepage = http://wryun.github.io/es-shell/; + homepage = "http://wryun.github.io/es-shell/"; license = licenses.publicDomain; maintainers = with maintainers; [ sjmackenzie ttuegel ]; platforms = platforms.all; diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 013cebfd7ec54..11d9e48008faf 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,20 +1,28 @@ -{ stdenv, fetchurl, coreutils, utillinux, - which, gnused, gnugrep, - groff, man-db, getent, libiconv, pcre2, - gettext, ncurses, python3, - cmake - , fetchpatch - - , writeText - - , useOperatingSystemEtc ? true - +{ stdenv +, lib +, fetchurl +, coreutils +, utillinux +, which +, gnused +, gnugrep +, groff +, man-db +, getent +, libiconv +, pcre2 +, gettext +, ncurses +, python3 +, cmake + +, runCommand +, writeText +, nixosTests +, useOperatingSystemEtc ? true }: - -with stdenv.lib; - let - etcConfigAppendixText = '' + etcConfigAppendix = writeText "config.fish.appendix" '' ############### ↓ Nix hook for sourcing /etc/fish/config.fish ↓ ############### # # # Origin: @@ -46,7 +54,7 @@ let ############### ↑ Nix hook for sourcing /etc/fish/config.fish ↑ ############### ''; - fishPreInitHooks = '' + fishPreInitHooks = writeText "__fish_build_paths_suffix.fish" '' # source nixos environment # note that this is required: # 1. For all shells, not just login shells (mosh needs this as do some other command-line utilities) @@ -90,40 +98,49 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.1.0"; - - etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText; + version = "3.1.2"; src = fetchurl { - # There are differences between the release tarball and the tarball github packages from the tag - # Hence we cannot use fetchFromGithub + # There are differences between the release tarball and the tarball GitHub + # packages from the tag. Specifically, it comes with a file containing its + # version, which is used in `build_tools/git_version_gen.sh` to determine + # the shell's actual version (and what it displays when running `fish + # --version`), as well as the local documentation for all builtins (and + # maybe other things). url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0s2356mlx7fp9kgqgw91lm5ds2i9iq9hq071fbqmcp3875l1xnz5"; + sha256 = "1vblmb3x2k2cb0db5jdyflppnlqsm7i6jjaidyhmvaaw7ch2gffm"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ ncurses libiconv pcre2 ]; + # We don't have access to the codesign executable, so we patch this out. + # For more information, see: https://github.com/fish-shell/fish-shell/issues/6952 + patches = lib.optional stdenv.isDarwin ./dont-codesign-on-mac.diff; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + ncurses + libiconv + pcre2 + ]; preConfigure = '' patchShebangs ./build_tools/git_version_gen.sh ''; - patches = [ - # Fixes compilation on old Apple SDKs - (fetchpatch { - url = "https://github.com/fish-shell/fish-shell/commit/10385d422b3e2a823faebfdaf13edd0e7f48a27f.patch"; - sha256 = "0hj13kyjf5wr9j5afd4mfylcr7mz68ilbncbcf307drk1lv1lvrn"; - }) - ]; - # Required binaries during execution # Python: Autocompletion generated from manpages and config editing propagatedBuildInputs = [ - coreutils gnugrep gnused - python3 groff gettext - ] ++ optional (!stdenv.isDarwin) man-db; - - postInstall = '' + coreutils + gnugrep + gnused + python3 + groff + gettext + ] ++ lib.optional (!stdenv.isDarwin) man-db; + + postInstall = with lib; '' sed -r "s|command grep|command ${gnugrep}/bin/grep|" \ -i "$out/share/fish/functions/grep.fish" sed -i "s|which |${which}/bin/which |" \ @@ -148,6 +165,13 @@ let sed -i "s|/usr/local/sbin /sbin /usr/sbin||" \ $out/share/fish/completions/{sudo.fish,doas.fish} + cat > $out/share/fish/functions/__fish_anypython.fish <<EOF + function __fish_anypython + echo ${python3.interpreter} + return 0 + end + EOF + '' + optionalString stdenv.isLinux '' sed -e "s| ul| ${utillinux}/bin/ul|" \ -i "$out/share/fish/functions/__fish_print_help.fish" @@ -162,53 +186,58 @@ let sed -i "s|command manpath|command ${man-db}/bin/manpath|" \ "$out/share/fish/functions/man.fish" '' + optionalString useOperatingSystemEtc '' - tee -a $out/etc/fish/config.fish < ${(writeText "config.fish.appendix" etcConfigAppendixText)} + tee -a $out/etc/fish/config.fish < ${etcConfigAppendix} '' + '' - tee -a $out/share/fish/__fish_build_paths.fish < ${(writeText "__fish_build_paths_suffix.fish" fishPreInitHooks)} + tee -a $out/share/fish/__fish_build_paths.fish < ${fishPreInitHooks} ''; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Smart and user-friendly command line shell"; - homepage = http://fishshell.com/; + homepage = "http://fishshell.com/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ocharles cole-h ]; }; passthru = { shellPath = "/bin/fish"; + tests = { + nixos = nixosTests.fish; + + # Test the fish_config tool by checking the generated splash page. + # Since the webserver requires a port to run, it is not started. + fishConfig = + let fishScript = writeText "test.fish" '' + set -x __fish_bin_dir ${fish}/bin + echo $__fish_bin_dir + cp -r ${fish}/share/fish/tools/web_config/* . + chmod -R +w * + + # if we don't set `delete=False`, the file will get cleaned up + # automatically (leading the test to fail because there's no + # tempfile to check) + sed -e "s@, mode='w'@, mode='w', delete=False@" -i webconfig.py + + # we delete everything after the fileurl is assigned + sed -e '/fileurl =/q' -i webconfig.py + echo "print(fileurl)" >> webconfig.py + + # and check whether the message appears on the page + cat (${python3}/bin/python ./webconfig.py \ + | tail -n1 | sed -ne 's|.*\(/build/.*\)|\1|p' \ + ) | grep 'a href="http://localhost.*Start the Fish Web config' + + # cannot test the http server because it needs a localhost port + ''; + in + runCommand "test-web-config" { } '' + HOME=$(mktemp -d) + ${fish}/bin/fish ${fishScript} && touch $out + ''; + }; }; }; - - tests = { - - # Test the fish_config tool by checking the generated splash page. - # Since the webserver requires a port to run, it is not started. - fishConfig = - let fishScript = writeText "test.fish" '' - set -x __fish_bin_dir ${fish}/bin - echo $__fish_bin_dir - cp -r ${fish}/share/fish/tools/web_config/* . - chmod -R +w * - # we delete everything after the fileurl is assigned - sed -e '/fileurl =/q' -i webconfig.py - echo "print(fileurl)" >> webconfig.py - # and check whether the message appears on the page - cat (${python3}/bin/python ./webconfig.py \ - | tail -n1 | sed -ne 's|.*\(/tmp/.*\)|\1|p' \ - ) | grep 'a href="http://localhost.*Start the Fish Web config' - - # cannot test the http server because it needs a localhost port - ''; - in '' - HOME=$(mktemp -d) - ${fish}/bin/fish ${fishScript} - ''; - }; - - # FIXME(Profpatsch) replace withTests stub - withTests = flip const; - -in withTests tests fish +in +fish diff --git a/pkgs/shells/fish/dont-codesign-on-mac.diff b/pkgs/shells/fish/dont-codesign-on-mac.diff new file mode 100644 index 0000000000000..c61350b0549f3 --- /dev/null +++ b/pkgs/shells/fish/dont-codesign-on-mac.diff @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7d220a032..786b60e6e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -183,7 +183,6 @@ ENDFUNCTION(CODESIGN_ON_MAC target) + # Define a function to link dependencies. + FUNCTION(FISH_LINK_DEPS_AND_SIGN target) + TARGET_LINK_LIBRARIES(${target} fishlib) +- CODESIGN_ON_MAC(${target}) + ENDFUNCTION(FISH_LINK_DEPS_AND_SIGN) + + # Define libfish.a. diff --git a/pkgs/shells/jush/default.nix b/pkgs/shells/jush/default.nix index 833947a6ddb88..9894c90bb69e2 100644 --- a/pkgs/shells/jush/default.nix +++ b/pkgs/shells/jush/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "just a useless shell"; - homepage = https://github.com/troglobit/jush; + homepage = "https://github.com/troglobit/jush"; license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/shells/ksh/default.nix b/pkgs/shells/ksh/default.nix index 108d1a5875809..e27732226f55f 100644 --- a/pkgs/shells/ksh/default.nix +++ b/pkgs/shells/ksh/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { provides access to the UNIX system and to many other systems, on the many different computers and workstations on which it is implemented. ''; - homepage = https://github.com/att/ast; + homepage = "https://github.com/att/ast"; license = licenses.cpl10; maintainers = with maintainers; [ ]; platforms = platforms.all; diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix index 62efabb022ca2..d6d655d1f17a2 100644 --- a/pkgs/shells/liquidprompt/default.nix +++ b/pkgs/shells/liquidprompt/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A full-featured & carefully designed adaptive prompt for Bash & Zsh"; - homepage = https://github.com/nojhan/liquidprompt; + homepage = "https://github.com/nojhan/liquidprompt"; license = licenses.agpl3; platforms = platforms.all; maintainers = with maintainers; [ gerschtli ]; diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index 9b48c5c68a1c9..7abf75c70f49f 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -2,17 +2,19 @@ stdenv.mkDerivation rec { pname = "mksh"; - version = "57"; + version = "59b"; src = fetchurl { urls = [ "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" ]; - sha256 = "0xdykm1z710wriwd6nc8s8lwk2dwjl63dq96xxaawlid31a1241x"; + sha256 = "1rp0farbylypyiaald2hw5avg5w3m8x7cjnxxyyihzvfb2lx2zlh"; }; - buildPhase = ''sh ./Build.sh -r -c lto''; + dontConfigure = true; + + buildPhase = ''sh ./Build.sh -r''; installPhase = '' install -D -m 755 mksh $out/bin/mksh @@ -29,7 +31,7 @@ stdenv.mkDerivation rec { also to be readily available under other UNIX(R)-like operating systems. ''; - homepage = https://www.mirbsd.org/mksh.htm; + homepage = "https://www.mirbsd.org/mksh.htm"; license = licenses.bsd3; maintainers = with maintainers; [ AndersonTorres joachifm ]; platforms = platforms.unix; diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 43e0d2cb56a08..ecef2fc436e5d 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.12.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0cy3rm0yr4ay4hcgw202w5k1sqw09kd75a0yyk0s0v0cxpmssf5n"; + sha256 = "1g289zma19mh85xl5ffq1f3cv76piqavbhzs9m55mkg9wrhmgljd"; }; - cargoSha256 = "0q89841jwbsvl4c90sl8wgnjjl8q0bb3kw7sl7k9dpnfmj5j144x"; + cargoSha256 = "16a32q2la7f4628m947dwif3j3wszsy603sj29ch6l2vdab40i3p"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 9e2aa3454d2ca..019a66c77eb7b 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -1,12 +1,12 @@ -{ stdenv, lib, fetchurl, fetchpatch, readline }: +{ stdenv, lib, fetchurl, readline }: stdenv.mkDerivation rec { pname = "oil"; - version = "0.7.0"; + version = "0.8.pre4"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "12c9s462879adb6mwd3fqafk0dnqsm16s18rhym6cmzfzy8v8zm3"; + sha256 = "07kj86hrvlz9f1gh3qv4hdaz3qnb4a2qf0dnxhd2r0qilrkjanxh"; }; postPatch = '' diff --git a/pkgs/shells/pash/default.nix b/pkgs/shells/pash/default.nix index 8b8601e326cc5..c646c1c3f9bd3 100644 --- a/pkgs/shells/pash/default.nix +++ b/pkgs/shells/pash/default.nix @@ -17,7 +17,7 @@ buildDotnetPackage { meta = with stdenv.lib; { description = "An open source implementation of Windows PowerShell"; - homepage = https://github.com/Pash-Project/Pash; + homepage = "https://github.com/Pash-Project/Pash"; maintainers = [ maintainers.fornever maintainers.vrthra ]; platforms = platforms.all; license = with licenses; [ bsd3 gpl3 ]; diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index d4c18f9f58150..58c18fb695bc5 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -1,21 +1,21 @@ -{ stdenv, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl -, darwin, makeWrapper, less, openssl_1_0_2, pam, lttng-ust }: +{ stdenv, lib, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl +, darwin, makeWrapper, less, openssl_1_1, pam, lttng-ust }: let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; - platformSha = if stdenv.isDarwin then "0jb2xm79m3m14zk7v730ai1zvxcb5a13jbkkya0qy7332k6gn6bl" - else if stdenv.isLinux then "0s0jvc9ha6fw8qy7f5n0v6zf043rawsjdlm5wvqxq1q2idz7xcw1" + platformSha = if stdenv.isDarwin then "0c71w6z6sc86si07i6vy4w3069jal7476wyiizyr7qjm9m22963f" + else if stdenv.isLinux then "14d6nhv525pa8pi4p1r2mn180isfzgshqrbmql3qd55aksjpq1v0" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" else throw "unsupported platform"; - libraries = [ libunwind libuuid icu curl openssl_1_0_2 ] ++ + libraries = [ libunwind libuuid icu curl openssl_1_1 ] ++ (if stdenv.isLinux then [ pam lttng-ust ] else [ darwin.Libsystem ]); in stdenv.mkDerivation rec { pname = "powershell"; - version = "6.2.3"; + version = "7.0.1"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; @@ -26,21 +26,42 @@ stdenv.mkDerivation rec { buildInputs = [ less ] ++ libraries; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - installPhase = '' + installPhase = + let + ext = stdenv.hostPlatform.extensions.sharedLibrary; + in '' + pslibs=$out/share/powershell + mkdir -p $pslibs + + cp -r * $pslibs + + rm -f $pslibs/libcrypto${ext}.1.0.0 + rm -f $pslibs/libssl${ext}.1.0.0 + + ls $pslibs + '' + lib.optionalString (!stdenv.isDarwin) '' + patchelf --replace-needed libcrypto${ext}.1.0.0 libcrypto${ext}.1.1 $pslibs/libmi.so + patchelf --replace-needed libssl${ext}.1.0.0 libssl${ext}.1.1 $pslibs/libmi.so + '' + '' + mkdir -p $out/bin - mkdir -p $out/share/powershell - cp -r * $out/share/powershell - makeWrapper $out/share/powershell/pwsh $out/bin/pwsh \ + + makeWrapper $pslibs/pwsh $out/bin/pwsh \ --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \ --set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 --set DOTNET_CLI_TELEMETRY_OPTOUT 1 ''; dontStrip = true; - meta = with stdenv.lib; { - description = "Cross-platform (Windows, Linux, and macOS) automation and configuration tool/framework"; + doInstallCheck = true; + installCheck = '' + $out/bin/pwsh --help > /dev/null + ''; + + meta = with lib; { + description = "Powerful cross-platform (Windows, Linux, and macOS) shell and scripting language based on .NET"; homepage = "https://github.com/PowerShell/PowerShell"; - maintainers = [ maintainers.yrashk ]; + maintainers = with maintainers; [ yrashk srgom ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; license = with licenses; [ mit ]; }; diff --git a/pkgs/shells/rc/default.nix b/pkgs/shells/rc/default.nix index a8a7d4f6e7775..cd5ed860b2e66 100644 --- a/pkgs/shells/rc/default.nix +++ b/pkgs/shells/rc/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The Plan 9 shell"; longDescription = "Byron Rakitzis' UNIX reimplementation of Tom Duff's Plan 9 shell."; - homepage = http://tobold.org/article/rc; + homepage = "http://tobold.org/article/rc"; license = with licenses; zlib; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; all; diff --git a/pkgs/shells/rssh/default.nix b/pkgs/shells/rssh/default.nix index ecefbff7d22ef..b2bec51a95edd 100644 --- a/pkgs/shells/rssh/default.nix +++ b/pkgs/shells/rssh/default.nix @@ -18,42 +18,42 @@ stdenv.mkDerivation rec { # Patches from AUR (fetchurl { - url = https://aur.archlinux.org/cgit/aur.git/plain/0001-fail-logging.patch?h=rssh; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-fail-logging.patch?h=rssh"; name = "0001-fail-logging.patch"; sha256 = "d30f2f4fdb1b57f94773f5b0968a4da3356b14a040efe69ec1e976c615035c65"; }) (fetchurl { - url = https://aur.archlinux.org/cgit/aur.git/plain/0002-info-to-debug.patch?h=rssh; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-info-to-debug.patch?h=rssh"; name = "0002-info-to-debug.patch"; sha256 = "86f6ecf34f62415b0d6204d4cbebc47322dc2ec71732d06aa27758e35d688fcd"; }) (fetchurl { - url = https://aur.archlinux.org/cgit/aur.git/plain/0003-man-page-spelling.patch?h=rssh; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0003-man-page-spelling.patch?h=rssh"; name = "0003-man-page-spelling.patch"; sha256 = "455b3bbccddf1493999d00c2cd46e62930ef4fd8211e0b7d3a89d8010d6a5431"; }) (fetchurl { - url = https://aur.archlinux.org/cgit/aur.git/plain/0004-mkchroot.patch?h=rssh; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0004-mkchroot.patch?h=rssh"; name = "0004-mkchroot.patch"; sha256 = "f7fd8723d2aa94e64e037c13c2f263a52104af680ab52bfcaea73dfa836457c2"; }) (fetchurl { - url = https://aur.archlinux.org/cgit/aur.git/plain/0005-mkchroot-arch.patch?h=rssh; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0005-mkchroot-arch.patch?h=rssh"; name = "0005-mkchroot-arch.patch"; sha256 = "ac8894c4087a063ae8267d2fdfcde69c2fe6b67a8ff5917e4518b8f73f08ba3f"; }) (fetchurl { - url = https://aur.archlinux.org/cgit/aur.git/plain/0006-mkchroot-symlink.patch?h=rssh; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0006-mkchroot-symlink.patch?h=rssh"; name = "0006-mkchroot-symlink.patch"; sha256 = "bce98728cb9b55c92182d4901c5f9adf49376a07c5603514b0004e3d1c85e9c7"; }) (fetchurl { - url = https://aur.archlinux.org/cgit/aur.git/plain/0007-destdir.patch?h=rssh; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0007-destdir.patch?h=rssh"; name = "0007-destdir.patch"; sha256 = "7fa03644f81dc37d77cc7e2cad994f17f91b2b8a49b1a74e41030a4ac764385e"; }) (fetchurl { - url = https://aur.archlinux.org/cgit/aur.git/plain/0008-rsync-protocol.patch?h=rssh; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0008-rsync-protocol.patch?h=rssh"; name = "0008-rsync-protocol.patch"; sha256 = "0c772afe9088eeded129ead86775ef18e58c318bbc58fc3e2585e7ff09cc5e91"; }) @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { longDescription = '' rssh also includes support for rsync and cvs. For example, if you have a server which you only want to allow users to copy files off of via scp, without providing shell access, you can use rssh to do that. ''; - homepage = http://www.pizzashack.org/rssh/; + homepage = "http://www.pizzashack.org/rssh/"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ arobyn ]; diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index 9db36bc85fcbc..f9e15d4a0b47b 100644 --- a/pkgs/shells/rush/default.nix +++ b/pkgs/shells/rush/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sftp-server or scp, that lack this ability. ''; - homepage = https://www.gnu.org/software/rush/; + homepage = "https://www.gnu.org/software/rush/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index e22811828fcdb..87cbf8c59f362 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "sysmalloc.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/community/tcsh/001-sysmalloc.patch?id=184585c046cdd56512f1a76e426dd799b368f8cf"; + url = "https://git.alpinelinux.org/aports/plain/community/tcsh/001-sysmalloc.patch?id=184585c046cdd56512f1a76e426dd799b368f8cf"; sha256 = "1qc6ydxhdfizsbkaxhpn3wib8sfphrw10xnnsxx2prvzg9g2zp67"; }); diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 2ae4abcb8ea84..192e38b963d3b 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.16"; + version = "0.9.18"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "12k6flj9lzmriy7xhhsi2cgdk75p9mhvhdndwbn50mh2ff4wbkyj"; + sha256 = "1zg5dl9qdysbaw2djy9f7f1ydp7vzjv840cjwqxlmg9615lgg7xa"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index cc4726a3cb419..c0e87cd6021b8 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "antibody"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "getantibody"; repo = "antibody"; rev = "v${version}"; - sha256 = "0m7c879b3f402av20jsybq2dhhckbknlvn2n1csp7xmcz4zcyn1n"; + sha256 = "0ix2liy8h48s3n7ykr85ik03kwj45iqwhwn79ap8y21bar00gybs"; }; - modSha256 = "0yny1p8vll1wdqdlwyxf9m4kd5njdm7nq527blqqa680zf2k4h8b"; + vendorSha256 = "072kxr68p9f58w2q98fjcn4wzd5szy5l5sz8sh4ssapljvic2lam"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ filalex77 worldofpeace ]; }; -} +} \ No newline at end of file diff --git a/pkgs/shells/zsh/antigen/default.nix b/pkgs/shells/zsh/antigen/default.nix index c754d7bbe5808..b4812428adff1 100644 --- a/pkgs/shells/zsh/antigen/default.nix +++ b/pkgs/shells/zsh/antigen/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "The plugin manager for zsh."; - homepage = http://antigen.sharats.me; + homepage = "http://antigen.sharats.me"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 8e050acef1fd5..3b346e4e44b27 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -81,7 +81,7 @@ EOF a host of other features. ''; license = "MIT-like"; - homepage = http://www.zsh.org/; + homepage = "http://www.zsh.org/"; maintainers = with stdenv.lib.maintainers; [ pSub ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/shells/zsh/fzf-zsh/default.nix b/pkgs/shells/zsh/fzf-zsh/default.nix index e97ef1074f122..075707f425c4c 100644 --- a/pkgs/shells/zsh/fzf-zsh/default.nix +++ b/pkgs/shells/zsh/fzf-zsh/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/wyntau/fzf-zsh; + homepage = "https://github.com/wyntau/fzf-zsh"; description = "wrap fzf to use in oh-my-zsh"; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/shells/zsh/gradle-completion/default.nix b/pkgs/shells/zsh/gradle-completion/default.nix index d13fd8aee00ff..72667d862a893 100644 --- a/pkgs/shells/zsh/gradle-completion/default.nix +++ b/pkgs/shells/zsh/gradle-completion/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gradle tab completion for bash and zsh"; - homepage = https://github.com/gradle/gradle-completion; + homepage = "https://github.com/gradle/gradle-completion"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index d23999abf3da9..e76ca68421018 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "grml's zsh setup"; - homepage = http://grml.org/zsh/; + homepage = "http://grml.org/zsh/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ msteen rvolosatovs ]; diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix index 1794979bedf41..0f244c4d6866b 100644 --- a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix +++ b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A ZSH theme optimized for people who use Git & Unicode-compatible fonts and terminals"; - homepage = https://github.com/halfo/lambda-mod-zsh-theme/; + homepage = "https://github.com/halfo/lambda-mod-zsh-theme/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 036c388fbda80..623d562b16e04 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: let - version = "0.4.3"; + version = "0.4.4"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "spwhitt"; repo = "nix-zsh-completions"; rev = version; - sha256 = "0fq1zlnsj1bb7byli7mwlz7nm2yszwmyx43ccczcv51mjjfivyp3"; + sha256 = "1n9whlys95k4wc57cnz3n07p7zpkv796qkmn68a50ygkx6h3afqf"; }; installPhase = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/spwhitt/nix-zsh-completions; + homepage = "https://github.com/spwhitt/nix-zsh-completions"; description = "ZSH completions for Nix, NixOS, and NixOps"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 5a61cd2e90a74..845d0fa438977 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-03-12"; + version = "2020-05-24"; pname = "oh-my-zsh"; - rev = "07e3236bc5c8dbf9d818a4f0145f09bdb4bec6f0"; + rev = "5ea25e6736430ab5b8439d11b2e9a837a803771b"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1imjvig60r250ljbnajxq4zv4fgs3l3jrrda0dvlnax5v5psxb12"; + sha256 = "047vdx7c5fsli6yh35kmp25nxs2bgji21837iq5dwq8nvyq42a9i"; }; pathsToLink = [ "/share/oh-my-zsh" ]; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { $ cp -v $(nix-env -q --out-path oh-my-zsh | cut -d' ' -f3)/share/oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc ''; - homepage = https://ohmyz.sh/; + homepage = "https://ohmyz.sh/"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ scolobb nequissimus ]; diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix index 0e7536b4fa17e..e1839d5dd07f2 100644 --- a/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Zsh prompt for Astronauts"; - homepage = https://github.com/denysdovhan/spaceship-prompt/; + homepage = "https://github.com/denysdovhan/spaceship-prompt/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ nyanloutre ]; diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix index 8c9c65c24e446..58e560d2fa4dc 100644 --- a/pkgs/shells/zsh/zsh-autosuggestions/default.nix +++ b/pkgs/shells/zsh/zsh-autosuggestions/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fish shell autosuggestions for Zsh"; - homepage = https://github.com/zsh-users/zsh-autosuggestions; + homepage = "https://github.com/zsh-users/zsh-autosuggestions"; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.loskutov ]; diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix index 6228b97685ab2..3ef210a028186 100644 --- a/pkgs/shells/zsh/zsh-command-time/default.nix +++ b/pkgs/shells/zsh/zsh-command-time/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Plugin that output time: xx after long commands"; - homepage = https://github.com/popstas/zsh-command-time; + homepage = "https://github.com/popstas/zsh-command-time"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index 35355fe374df5..03f6146df7c60 100644 --- a/pkgs/shells/zsh/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Additional completion definitions for zsh"; - homepage = https://github.com/zsh-users/zsh-completions; + homepage = "https://github.com/zsh-users/zsh-completions"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/shells/zsh/zsh-history-substring-search/default.nix b/pkgs/shells/zsh/zsh-history-substring-search/default.nix index fcd294f4dce3a..9890993eed648 100644 --- a/pkgs/shells/zsh/zsh-history-substring-search/default.nix +++ b/pkgs/shells/zsh/zsh-history-substring-search/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fish shell history-substring-search for Zsh"; - homepage = https://github.com/zsh-users/zsh-history-substring-search; + homepage = "https://github.com/zsh-users/zsh-history-substring-search"; license = licenses.bsd3; maintainers = with maintainers; [ qyliss ]; platforms = platforms.unix; diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix index ece3c87cb6643..47f590a78f286 100644 --- a/pkgs/shells/zsh/zsh-history/default.nix +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - modSha256 = "0f10b86gyn7m7lw43c8y1m30mdg0i092a319v3cb2qj05jb9vn42"; + vendorSha256 = "13rc1afds5xg30faqz35haha4kxg73b5nvjirbrkc6kna0vhb54z"; goPackagePath = "github.com/b4b4r07/history"; postInstall = '' @@ -25,7 +25,7 @@ buildGoModule rec { meta = with lib; { description = "A CLI to provide enhanced history for your ZSH shell"; license = licenses.mit; - homepage = https://github.com/b4b4r07/history; + homepage = "https://github.com/b4b4r07/history"; platforms = platforms.unix; maintainers = with maintainers; [ kampka ]; }; @@ -33,4 +33,4 @@ buildGoModule rec { passthru.tests = { zsh-history-shell-integration = nixosTests.zsh-history; }; -} +} \ No newline at end of file diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 7fac0fb8ab8aa..169173a42e87d 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.5.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "0r8vccgfy85ryswaigzgwmvhvrhlap7nrg7bi66w63877znqlksj"; + sha256 = "04j37qmgzj62gixysj3di9dccfib4hx1c4ld9kcms3ag7k403bgj"; }; patches = [ diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix index c80ff0da60af1..676f9458675bb 100644 --- a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "A beautiful theme for zsh"; - homepage = https://github.com/bhilburn/powerlevel9k; + homepage = "https://github.com/bhilburn/powerlevel9k"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index 383d19675314a..ec6288a6e63c2 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { description = "Prezto is the configuration framework for Zsh; it enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes."; - homepage = https://github.com/sorin-ionescu/prezto; + homepage = "https://github.com/sorin-ionescu/prezto"; license = licenses.mit; maintainers = with maintainers; [ ]; platforms = with platforms; unix; diff --git a/pkgs/shells/zsh/zsh-you-should-use/default.nix b/pkgs/shells/zsh/zsh-you-should-use/default.nix index 91cf34268acd9..13e3bbdc0383c 100644 --- a/pkgs/shells/zsh/zsh-you-should-use/default.nix +++ b/pkgs/shells/zsh/zsh-you-should-use/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/MichaelAquilina/zsh-you-should-use; + homepage = "https://github.com/MichaelAquilina/zsh-you-should-use"; license = licenses.gpl3; description = "ZSH plugin that reminds you to use existing aliases for commands you just typed"; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index a11b280b047ee..09879451d8e45 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -49,6 +49,7 @@ in rec { # Configure Phase , configureFlags ? [] , cmakeFlags ? [] + , mesonFlags ? [] , # Target is not included by default because most programs don't care. # Including it then would cause needless mass rebuilds. # @@ -252,6 +253,32 @@ in rec { ++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}" ++ lib.optional (stdenv.buildPlatform.uname.processor != null) "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}" ++ lib.optional (stdenv.buildPlatform.uname.release != null) "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}"; + + mesonFlags = if mesonFlags == null then null else let + # See https://mesonbuild.com/Reference-tables.html#cpu-families + cpuFamily = platform: with platform; + /**/ if isAarch32 then "arm" + else if isAarch64 then "aarch64" + else if isx86_32 then "x86" + else if isx86_64 then "x86_64" + else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits; + crossFile = builtins.toFile "cross-file.conf" ('' + [properties] + needs_exe_wrapper = true + + [host_machine] + system = '${stdenv.targetPlatform.parsed.kernel.name}' + cpu_family = '${cpuFamily stdenv.targetPlatform}' + cpu = '${stdenv.targetPlatform.parsed.cpu.name}' + endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} + '' + # TODO should have target prefix too, issue #86077 + + '' + + [binaries] + pkgconfig = 'pkg-config' + ''); + in [ "--cross-file=${crossFile}" ] ++ mesonFlags; } // lib.optionalAttrs (attrs.enableParallelBuilding or false) { enableParallelChecking = attrs.enableParallelChecking or true; } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) { diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 5b8fdde579612..839757945a2bc 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -779,7 +779,7 @@ substituteAllInPlace() { # the environment used for building. dumpVars() { if [ "${noDumpEnvVars:-0}" != 1 ]; then - export > "$NIX_BUILD_TOP/env-vars" || true + export >| "$NIX_BUILD_TOP/env-vars" || true fi } @@ -1266,6 +1266,7 @@ genericBuild() { for curPhase in $phases; do if [[ "$curPhase" = unpackPhase && -n "${dontUnpack:-}" ]]; then continue; fi + if [[ "$curPhase" = patchPhase && -n "${dontPatch:-}" ]]; then continue; fi if [[ "$curPhase" = configurePhase && -n "${dontConfigure:-}" ]]; then continue; fi if [[ "$curPhase" = buildPhase && -n "${dontBuild:-}" ]]; then continue; fi if [[ "$curPhase" = checkPhase && -z "${doCheck:-}" ]]; then continue; fi diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix b/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix index ff0eec893f2ff..252783cce47cb 100644 --- a/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix +++ b/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix @@ -1,11 +1,11 @@ { busybox = import <nix/fetchurl.nix> { - url = https://wdtz.org/files/wjzsj9cmdkc70f78yh072483x8656nci-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/busybox; + url = "https://wdtz.org/files/wjzsj9cmdkc70f78yh072483x8656nci-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/busybox"; sha256 = "01s6bwq84wyrjh3rdsgxni9gkzp7ss8rghg0cmp8zd87l79y8y4g"; executable = true; }; bootstrapTools = import <nix/fetchurl.nix> { - url = https://wdtz.org/files/wjzsj9cmdkc70f78yh072483x8656nci-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/bootstrap-tools.tar.xz; + url = "https://wdtz.org/files/wjzsj9cmdkc70f78yh072483x8656nci-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/bootstrap-tools.tar.xz"; sha256 = "0pbqrw9z4ifkijpfpx15l2dzi00rq8c5zg9ghimz5qgr5dx7f7cl"; }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64.nix b/pkgs/stdenv/linux/bootstrap-files/aarch64.nix index 85a5dd373abbd..592f8ee6bef53 100644 --- a/pkgs/stdenv/linux/bootstrap-files/aarch64.nix +++ b/pkgs/stdenv/linux/bootstrap-files/aarch64.nix @@ -1,11 +1,11 @@ { busybox = import <nix/fetchurl.nix> { - url = http://tarballs.nixos.org/stdenv-linux/aarch64/bb3ef8a95c9659596b8a34d27881cd30ffea2f9f/busybox; + url = "http://tarballs.nixos.org/stdenv-linux/aarch64/bb3ef8a95c9659596b8a34d27881cd30ffea2f9f/busybox"; sha256 = "12qcml1l67skpjhfjwy7gr10nc86gqcwjmz9ggp7knss8gq8pv7f"; executable = true; }; bootstrapTools = import <nix/fetchurl.nix> { - url = http://tarballs.nixos.org/stdenv-linux/aarch64/c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31/bootstrap-tools.tar.xz; + url = "http://tarballs.nixos.org/stdenv-linux/aarch64/c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31/bootstrap-tools.tar.xz"; sha256 = "d3f1bf2a1495b97f45359d5623bdb1f8eb75db43d3bf2059fc127b210f059358"; }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix index 45ac0d5f9acd0..e445a7bba4d8f 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix @@ -1,11 +1,11 @@ { busybox = import <nix/fetchurl.nix> { - url = https://wdtz.org/files/xmz441m69qrlfdw47l2k10zf87fsya6r-stdenv-bootstrap-tools-armv6l-unknown-linux-musleabihf/on-server/busybox; + url = "https://wdtz.org/files/xmz441m69qrlfdw47l2k10zf87fsya6r-stdenv-bootstrap-tools-armv6l-unknown-linux-musleabihf/on-server/busybox"; sha256 = "01d0hp1xgrriiy9w0sd9vbqzwxnpwiyah80pi4vrpcmbwji36j1i"; executable = true; }; bootstrapTools = import <nix/fetchurl.nix> { - url = https://wdtz.org/files/xmz441m69qrlfdw47l2k10zf87fsya6r-stdenv-bootstrap-tools-armv6l-unknown-linux-musleabihf/on-server/bootstrap-tools.tar.xz; + url = "https://wdtz.org/files/xmz441m69qrlfdw47l2k10zf87fsya6r-stdenv-bootstrap-tools-armv6l-unknown-linux-musleabihf/on-server/bootstrap-tools.tar.xz"; sha256 = "1r9mz9w8y5jd7gfwfsrvs20qarzxy7bvrp5dlm41hnx6z617if1h"; }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/i686.nix b/pkgs/stdenv/linux/bootstrap-files/i686.nix index 81dede2c80eb1..112d37670c8cd 100644 --- a/pkgs/stdenv/linux/bootstrap-files/i686.nix +++ b/pkgs/stdenv/linux/bootstrap-files/i686.nix @@ -1,12 +1,12 @@ { busybox = import <nix/fetchurl.nix> { - url = http://tarballs.nixos.org/stdenv-linux/i686/4907fc9e8d0d82b28b3c56e3a478a2882f1d700f/busybox; + url = "http://tarballs.nixos.org/stdenv-linux/i686/4907fc9e8d0d82b28b3c56e3a478a2882f1d700f/busybox"; sha256 = "ef4c1be6c7ae57e4f654efd90ae2d2e204d6769364c46469fa9ff3761195cba1"; executable = true; }; bootstrapTools = import <nix/fetchurl.nix> { - url = http://tarballs.nixos.org/stdenv-linux/i686/c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31/bootstrap-tools.tar.xz; + url = "http://tarballs.nixos.org/stdenv-linux/i686/c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31/bootstrap-tools.tar.xz"; sha256 = "b9bf20315f8c5c0411679c5326084420b522046057a0850367c67d9514794f1c"; }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix index 543c1c8384927..98a65bd776453 100644 --- a/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix +++ b/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix @@ -1,11 +1,11 @@ { busybox = import <nix/fetchurl.nix> { - url = https://wdtz.org/files/gywxhjgl70sxippa0pxs0vj5qcgz1wi8-stdenv-bootstrap-tools/on-server/busybox; + url = "https://wdtz.org/files/gywxhjgl70sxippa0pxs0vj5qcgz1wi8-stdenv-bootstrap-tools/on-server/busybox"; sha256 = "0779c2wn00467h76xpqil678gfi1y2p57c7zq2d917jsv2qj5009"; executable = true; }; bootstrapTools = import <nix/fetchurl.nix> { - url = https://wdtz.org/files/gywxhjgl70sxippa0pxs0vj5qcgz1wi8-stdenv-bootstrap-tools/on-server/bootstrap-tools.tar.xz; + url = "https://wdtz.org/files/gywxhjgl70sxippa0pxs0vj5qcgz1wi8-stdenv-bootstrap-tools/on-server/bootstrap-tools.tar.xz"; sha256 = "1dwiqw4xvnm0b5fdgl89lz2qq45f6s9icwxn6n6ams71xw0dbqyi"; }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64.nix index 2800d571c40fd..bdfa98c89cbc7 100644 --- a/pkgs/stdenv/linux/bootstrap-files/x86_64.nix +++ b/pkgs/stdenv/linux/bootstrap-files/x86_64.nix @@ -3,7 +3,7 @@ { bootstrapTools = import <nix/fetchurl.nix> { - url = http://tarballs.nixos.org/stdenv-linux/x86_64/c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31/bootstrap-tools.tar.xz; + url = "http://tarballs.nixos.org/stdenv-linux/x86_64/c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31/bootstrap-tools.tar.xz"; sha256 = "a5ce9c155ed09397614646c9717fc7cd94b1023d7b76b618d409e4fefd6e9d39"; }; } diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/tools/X11/alttab/default.nix index 4efd86ca63faa..28c8efffa2a5f 100644 --- a/pkgs/tools/X11/alttab/default.nix +++ b/pkgs/tools/X11/alttab/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuild = true; meta = with stdenv.lib; { - homepage = https://github.com/sagb/alttab; + homepage = "https://github.com/sagb/alttab"; description = "X11 window switcher designed for minimalistic window managers or standalone X11 session"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index 3fffd1dbc1a02..94e3ac36d078b 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -32,7 +32,7 @@ in buildPythonApplication rec { propagatedBuildInputs = [ xrandr pygobject3 ]; meta = { - homepage = http://christian.amsuess.com/tools/arandr/; + homepage = "http://christian.amsuess.com/tools/arandr/"; description = "A simple visual front end for XRandR"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.domenkozar ]; diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix index db17788cea005..ece42502d81cf 100644 --- a/pkgs/tools/X11/autocutsel/default.nix +++ b/pkgs/tools/X11/autocutsel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { inherit version; - homepage = https://www.nongnu.org/autocutsel/; + homepage = "https://www.nongnu.org/autocutsel/"; description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection"; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index f5a8fd24f5e69..8540cf6975dcd 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -134,7 +134,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/Bumblebee-Project/Bumblebee; + homepage = "https://github.com/Bumblebee-Project/Bumblebee"; description = "Daemon for managing Optimus videocards (power-on/off, spawns xservers)"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 1948dd2b9c5db..dc665bf9c41b8 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compiles a XKB keyboard description to a keymap suitable for loadkeys"; - homepage = https://salsa.debian.org/installer-team/console-setup; + homepage = "https://salsa.debian.org/installer-team/console-setup"; license = licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ dezgeg ]; platforms = platforms.unix; diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix index 9387c62c2a515..af8188883d9bf 100644 --- a/pkgs/tools/X11/dex/default.nix +++ b/pkgs/tools/X11/dex/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://github.com/jceb/dex/commit/107358ddf5e1ca4fa56ef1a7ab161dc3b6adc45a.patch; + url = "https://github.com/jceb/dex/commit/107358ddf5e1ca4fa56ef1a7ab161dc3b6adc45a.patch"; sha256 = "06dfkfzxp8199by0jc5wim8g8qw38j09dq9p6n9w4zaasla60pjq"; }) ]; meta = with stdenv.lib; { description = "A program to generate and execute DesktopEntry files of the Application type"; - homepage = https://github.com/jceb/dex; + homepage = "https://github.com/jceb/dex"; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/pkgs/tools/X11/dispad/default.nix b/pkgs/tools/X11/dispad/default.nix index 7c1457d3e2ae2..fccb28489efda 100644 --- a/pkgs/tools/X11/dispad/default.nix +++ b/pkgs/tools/X11/dispad/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small daemon for disabling trackpads while typing"; - homepage = https://github.com/BlueDragonX/dispad; + homepage = "https://github.com/BlueDragonX/dispad"; license = licenses.gpl2; maintainers = with maintainers; [ zimbatm ]; platforms = platforms.linux; diff --git a/pkgs/tools/X11/dragon-drop/default.nix b/pkgs/tools/X11/dragon-drop/default.nix index 54ece6a9a1639..86c867b16ba8a 100644 --- a/pkgs/tools/X11/dragon-drop/default.nix +++ b/pkgs/tools/X11/dragon-drop/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple drag-and-drop source/sink for X"; - homepage = https://github.com/mwh/dragon; + homepage = "https://github.com/mwh/dragon"; maintainers = with maintainers; [ jb55 markus1189 ]; license = licenses.gpl3; platforms = with platforms; unix; diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix index ff84dde6f99b5..1378d5e6b9825 100644 --- a/pkgs/tools/X11/ffcast/default.nix +++ b/pkgs/tools/X11/ffcast/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Run commands on rectangular screen regions"; - homepage = https://github.com/lolilolicon/FFcast; + homepage = "https://github.com/lolilolicon/FFcast"; license = licenses.gpl3; maintainers = [ maintainers.guyonvarch ]; platforms = platforms.linux; diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/tools/X11/grobi/default.nix index 976cabc33f8be..a2cca87edc083 100644 --- a/pkgs/tools/X11/grobi/default.nix +++ b/pkgs/tools/X11/grobi/default.nix @@ -14,7 +14,7 @@ buildGoPackage { }; meta = with stdenv.lib; { - homepage = https://github.com/fd0/grobi; + homepage = "https://github.com/fd0/grobi"; description = "Automatically configure monitors/outputs for Xorg via RANDR"; license = with licenses; [ bsd2 ]; platforms = platforms.linux; diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index 6bae355812c29..3bfe98a7a2119 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # See https://bugs.gentoo.org/show_bug.cgi?id=504056 underlinkingPatch = fetchurl { - url = http://www.gtlib.gatech.edu/pub/gentoo/gentoo-x86-portage/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch; + url = "http://www.gtlib.gatech.edu/pub/gentoo/gentoo-x86-portage/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch"; name = "hsetroot-1.0.2-underlinking.patch"; sha256 = "1px1p3wz7ji725z9nlwb0x0h6lnnvnpz15sblzzq7zrijl3wz65x"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Allows you to compose wallpapers ('root pixmaps') for X"; - homepage = https://thegraveyard.org/hsetroot.html; + homepage = "https://thegraveyard.org/hsetroot.html"; license = licenses.gpl2Plus; maintainers = [ maintainers.henrytill ]; platforms = platforms.unix; diff --git a/pkgs/tools/X11/jumpapp/default.nix b/pkgs/tools/X11/jumpapp/default.nix index 23ba445b67486..c152a72a23d8b 100644 --- a/pkgs/tools/X11/jumpapp/default.nix +++ b/pkgs/tools/X11/jumpapp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/mkropat/jumpapp; + homepage = "https://github.com/mkropat/jumpapp"; description = "A run-or-raise application switcher for any X11 desktop"; license = lib.licenses.mit; maintainers = [ lib.maintainers.matklad ]; diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix index 5eb74a267983c..64684cf73df2c 100644 --- a/pkgs/tools/X11/keynav/default.nix +++ b/pkgs/tools/X11/keynav/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Generate X11 mouse clicks from keyboard"; - homepage = https://www.semicomplete.com/projects/keynav/; + homepage = "https://www.semicomplete.com/projects/keynav/"; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/tools/X11/ksuperkey/default.nix index 1472e39c83c2d..d5c2232dce118 100644 --- a/pkgs/tools/X11/ksuperkey/default.nix +++ b/pkgs/tools/X11/ksuperkey/default.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchgit, libX11, libXtst, pkgconfig, xorgproto, libXi }: +{ stdenv, fetchFromGitHub, libX11, libXtst, pkgconfig, xorgproto, libXi }: -stdenv.mkDerivation { - name = "ksuperkey-git-2015-07-21"; +stdenv.mkDerivation rec { + pname = "ksuperkey"; + version = "0.4"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - libX11 libXtst xorgproto libXi - ]; - - src = fetchgit { - url = "https://github.com/hanschen/ksuperkey"; - rev = "e75a31a0e3e80b14341e92799a7ce3232ac37639"; - sha256 = "0y4wkak9dvcm14g54ll1ln9aks2az63hx8fv7b8d3nscxjbkxl6g"; + src = fetchFromGitHub { + owner = "hanschen"; + repo = "ksuperkey"; + rev = "v${version}"; + sha256 = "1dvgf356fihfav8pjzww1q6vgd96c5h18dh8vpv022g9iipiwq8a"; }; - preConfigure = '' - makeFlags="$makeFlags PREFIX=$out" - ''; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXtst xorgproto libXi ]; - meta = { + meta = with stdenv.lib; { description = "A tool to be able to bind the super key as a key rather than a modifier"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.vozz ]; - platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/hanschen/ksuperkey"; + license = licenses.gpl3; + maintainers = [ maintainers.vozz ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index 95aa15840da62..057288fbaa372 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { multi-head with Xinerama. Wallpapers are browsable with a convenient GUI, and settings are stored in a human-readable config file. ''; - homepage = https://github.com/l3ib/nitrogen; + homepage = "https://github.com/l3ib/nitrogen"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.auntie ]; diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix index 07b58bcfad606..42444e5fca1b2 100644 --- a/pkgs/tools/X11/nx-libs/default.nix +++ b/pkgs/tools/X11/nx-libs/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "NX X server based on Xnest"; - homepage = https://github.com/ArcticaProject/nx-libs; + homepage = "https://github.com/ArcticaProject/nx-libs"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ jD91mZM2 ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix index 6b1b353b09bea..809e3614f0b19 100644 --- a/pkgs/tools/X11/obconf/default.nix +++ b/pkgs/tools/X11/obconf/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "GUI configuration tool for openbox"; - homepage = http://openbox.org/wiki/ObConf; + homepage = "http://openbox.org/wiki/ObConf"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.lhvwb ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix index 13d7e06c73047..f4c2c9efc49ee 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/tools/X11/primus/lib.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Low-overhead client-side GPU offloading"; - homepage = https://github.com/amonakov/primus; + homepage = "https://github.com/amonakov/primus"; platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.bsd2; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/X11/ratmen/default.nix b/pkgs/tools/X11/ratmen/default.nix index aa5e346334a3f..f604262267472 100644 --- a/pkgs/tools/X11/ratmen/default.nix +++ b/pkgs/tools/X11/ratmen/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.free ; # 9menu derivative with 9menu license maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = http://www.update.uu.se/~zrajm/programs/; + homepage = "http://www.update.uu.se/~zrajm/programs/"; downloadPage = "http://www.update.uu.se/~zrajm/programs/ratmen/"; updateWalker = true; }; diff --git a/pkgs/tools/X11/run-scaled/default.nix b/pkgs/tools/X11/run-scaled/default.nix index fc0068e6e2783..aae09d49b3d4a 100644 --- a/pkgs/tools/X11/run-scaled/default.nix +++ b/pkgs/tools/X11/run-scaled/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Run an X application scaled via xpra"; - homepage = https://github.com/kaueraal/run_scaled; + homepage = "https://github.com/kaueraal/run_scaled"; maintainers = [ maintainers.snaar ]; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/tools/X11/runningx/default.nix b/pkgs/tools/X11/runningx/default.nix index 31e2320e1b9fd..55f99c63365dc 100644 --- a/pkgs/tools/X11/runningx/default.nix +++ b/pkgs/tools/X11/runningx/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.fiction.net/blong/programs/mutt/; + homepage = "http://www.fiction.net/blong/programs/mutt/"; description = "A program for testing if X is running"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/X11/sct/default.nix b/pkgs/tools/X11/sct/default.nix index 9f45bbe308719..3f6291417e590 100644 --- a/pkgs/tools/X11/sct/default.nix +++ b/pkgs/tools/X11/sct/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "sct"; src = fetchurl { - url = http://www.tedunangst.com/flak/files/sct.c; + url = "http://www.tedunangst.com/flak/files/sct.c"; sha256 = "01f3ndx3s6d2qh2xmbpmhd4962dyh8yp95l87xwrs4plqdz6knhd"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installPhase = "install -Dt $out/bin sct"; meta = with stdenv.lib; { - homepage = https://www.tedunangst.com/flak/post/sct-set-color-temperature; + homepage = "https://www.tedunangst.com/flak/post/sct-set-color-temperature"; description = "A minimal utility to set display colour temperature"; maintainers = [ maintainers.raskin ]; license = licenses.publicDomain; diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix index a9b5f17af8329..56c356b20d5b2 100644 --- a/pkgs/tools/X11/setroot/default.nix +++ b/pkgs/tools/X11/setroot/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple X background setter inspired by imlibsetroot and feh"; - homepage = https://github.com/ttzhou/setroot; + homepage = "https://github.com/ttzhou/setroot"; license = licenses.gpl3Plus; maintainers = [ maintainers.vyp ]; platforms = platforms.unix; diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/tools/X11/sselp/default.nix index 30f99cd40f29e..81893fd2be83f 100644 --- a/pkgs/tools/X11/sselp/default.nix +++ b/pkgs/tools/X11/sselp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://tools.suckless.org/sselp; + homepage = "https://tools.suckless.org/sselp"; description = "Prints the X selection to stdout, useful in scripts"; license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index c0956fb1dec41..741043a9e5386 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libvdpau ]; meta = with stdenv.lib; { - homepage = https://people.freedesktop.org/~aplattner/vdpau/; + homepage = "https://people.freedesktop.org/~aplattner/vdpau/"; description = "Tool to query the Video Decode and Presentation API for Unix (VDPAU) abilities of the system"; license = licenses.mit; # expat version platforms = platforms.unix; diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index 92afa30e61689..a2a7e5e6922ba 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.virtualgl.org/; + homepage = "http://www.virtualgl.org/"; description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; license = licenses.wxWindows; platforms = platforms.linux; diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/tools/X11/wayv/default.nix index f906a6d403e66..55f6eede0fa35 100644 --- a/pkgs/tools/X11/wayv/default.nix +++ b/pkgs/tools/X11/wayv/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://github.com/mikemb/wayV; + homepage = "https://github.com/mikemb/wayV"; }; } diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index e4cb70c8f24db..64f8627a2eff0 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./64-bit-data.patch ]; meta = { - homepage = https://sites.google.com/site/tstyblo/wmctrl; + homepage = "https://sites.google.com/site/tstyblo/wmctrl"; description = "CLI tool to interact with EWMH/NetWM compatible X Window Managers"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/tools/X11/wmutils-core/default.nix b/pkgs/tools/X11/wmutils-core/default.nix index fe5c70f6ce23a..fdf805f809924 100644 --- a/pkgs/tools/X11/wmutils-core/default.nix +++ b/pkgs/tools/X11/wmutils-core/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of window manipulation tools"; - homepage = https://github.com/wmutils/core; + homepage = "https://github.com/wmutils/core"; license = licenses.isc; platforms = platforms.unix; }; diff --git a/pkgs/tools/X11/wmutils-opt/default.nix b/pkgs/tools/X11/wmutils-opt/default.nix index c123030386235..39f26b95cdbcc 100644 --- a/pkgs/tools/X11/wmutils-opt/default.nix +++ b/pkgs/tools/X11/wmutils-opt/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optional addons to wmutils"; - homepage = https://github.com/wmutils/opt; + homepage = "https://github.com/wmutils/opt"; license = licenses.isc; maintainers = with maintainers; [ vifino ]; platforms = platforms.unix; diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index 4125229237ae1..2aa05935991eb 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "wpgtk"; - version = "6.0.13"; + version = "6.1.0"; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; rev = version; - sha256 = "1fphv6k2hqfi3fzazjqmvip7sz9fhy5ccsgpqv68vfylrf8g1f92"; + sha256 = "06z6qbfd9l3acp3wm28rq4vx3m5cxi4lpxgzc2nxvxmiz8rnnmh1"; }; buildInputs = [ diff --git a/pkgs/tools/X11/x11spice/default.nix b/pkgs/tools/X11/x11spice/default.nix index 513149049faf3..23af2ac44ca68 100644 --- a/pkgs/tools/X11/x11spice/default.nix +++ b/pkgs/tools/X11/x11spice/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { x11spice will enable a running X11 desktop to be available via a Spice server ''; - homepage = https://gitlab.freedesktop.org/spice/x11spice; + homepage = "https://gitlab.freedesktop.org/spice/x11spice"; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index acf0fc9aabfda..2f7b0d7697e5e 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A VNC server connected to a real X11 screen"; - homepage = https://github.com/LibVNC/x11vnc/; + homepage = "https://github.com/LibVNC/x11vnc/"; platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ OPNA2608 ]; diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix index 6075f0070f90f..65d45e23396e3 100644 --- a/pkgs/tools/X11/x2vnc/default.nix +++ b/pkgs/tools/X11/x2vnc/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "x2vnc-1.7.2"; src = fetchurl { - url = https://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz; + url = "https://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz"; sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = http://fredrik.hubbe.net/x2vnc.html; + homepage = "http://fredrik.hubbe.net/x2vnc.html"; description = "A program to control a remote VNC server"; platforms = platforms.unix; license = licenses.gpl2; diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix index 5c8e3d4f8fb64..deada6ae2d1cc 100644 --- a/pkgs/tools/X11/x2x/default.nix +++ b/pkgs/tools/X11/x2x/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Allows the keyboard, mouse on one X display to be used to control another X display"; - homepage = https://github.com/dottedmag/x2x; + homepage = "https://github.com/dottedmag/x2x"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/tools/X11/xannotate/default.nix b/pkgs/tools/X11/xannotate/default.nix index d52698b0ed7ee..b1e070673c6df 100644 --- a/pkgs/tools/X11/xannotate/default.nix +++ b/pkgs/tools/X11/xannotate/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://bitbucket.org/blais/xannotate; + homepage = "https://bitbucket.org/blais/xannotate"; }; } diff --git a/pkgs/tools/X11/xautomation/default.nix b/pkgs/tools/X11/xautomation/default.nix index a648eefcdde17..0a31d5fb8653e 100644 --- a/pkgs/tools/X11/xautomation/default.nix +++ b/pkgs/tools/X11/xautomation/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ libpng libX11 libXext libXi libXtst ]; meta = { - homepage = https://www.hoopajoo.net/projects/xautomation.html; + homepage = "https://www.hoopajoo.net/projects/xautomation.html"; description = "Control X from the command line for scripts, and do \"visual scraping\" to find things on the screen"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ vaibhavsagar ]; diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix index bb83effe60116..35961aff178d9 100644 --- a/pkgs/tools/X11/xbindkeys-config/default.nix +++ b/pkgs/tools/X11/xbindkeys-config/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = https://packages.debian.org/source/xbindkeys-config; + homepage = "https://packages.debian.org/source/xbindkeys-config"; description = "Graphical interface for configuring xbindkeys"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [benley]; diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index 23e0ce63e5b49..e844f44430938 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 guile ]; meta = { - homepage = https://www.nongnu.org/xbindkeys/xbindkeys.html; + homepage = "https://www.nongnu.org/xbindkeys/xbindkeys.html"; description = "Launch shell commands with your keyboard or your mouse under X Window"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix index e196411ce412c..cbf4d2c940037 100644 --- a/pkgs/tools/X11/xbrightness/default.nix +++ b/pkgs/tools/X11/xbrightness/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "xbrightness-0.3-mika-akk"; src = fetchurl { - url = https://shallowsky.com/software/xbrightness/xbrightness-0.3-mika-akk.tar.gz; + url = "https://shallowsky.com/software/xbrightness/xbrightness-0.3-mika-akk.tar.gz"; sha256 = "2564dbd393544657cdabe4cbf535d9cfb9abe8edddb1b8cdb1ed4d12f358626e"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "X11 brigthness and gamma software control"; - homepage = http://shallowsky.com/software; + homepage = "http://shallowsky.com/software"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix index d1b6f9b23b6da..eefaad82b1a71 100644 --- a/pkgs/tools/X11/xcape/default.nix +++ b/pkgs/tools/X11/xcape/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { is to generate the Escape key when Left Control is pressed and released on its own. ''; - homepage = https://github.com/alols/xcape; + homepage = "https://github.com/alols/xcape"; license = licenses.gpl3 ; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/tools/X11/xchainkeys/default.nix index f06b4cc6b3789..238b8c7b2b2d8 100644 --- a/pkgs/tools/X11/xchainkeys/default.nix +++ b/pkgs/tools/X11/xchainkeys/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 ]; meta = { - homepage = http://henning-bekel.de/xchainkeys/; + homepage = "http://henning-bekel.de/xchainkeys/"; description = "A standalone X11 program to create chained key bindings"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/tools/X11/xcwd/default.nix index f2fadd71427c9..c0e8cf5d35b37 100644 --- a/pkgs/tools/X11/xcwd/default.nix +++ b/pkgs/tools/X11/xcwd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { description = '' A simple tool which print the current working directory of the currently focused window ''; - homepage = https://github.com/schischi/xcwd; + homepage = "https://github.com/schischi/xcwd"; maintainers = [ maintainers.grburst ]; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix index 066b566be1fe1..9ad3db80805f0 100644 --- a/pkgs/tools/X11/xdg-user-dirs/default.nix +++ b/pkgs/tools/X11/xdg-user-dirs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://freedesktop.org/wiki/Software/xdg-user-dirs; + homepage = "http://freedesktop.org/wiki/Software/xdg-user-dirs"; description = "A tool to help manage well known user directories like the desktop folder and the music folder"; license = licenses.gpl2; maintainers = with maintainers; [ lethalman ]; diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 99d5df2591ac3..64b205bada58d 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.freedesktop.org/wiki/Software/xdg-utils/; + homepage = "https://www.freedesktop.org/wiki/Software/xdg-utils/"; description = "A set of command line tools that assist applications with a variety of desktop integration tasks"; license = if mimiSupport then licenses.gpl2 else licenses.free; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index 6fa185dfeab45..6785d10258f3d 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = { - homepage = https://www.semicomplete.com/projects/xdotool/; + homepage = "https://www.semicomplete.com/projects/xdotool/"; description = "Fake keyboard/mouse input, window management, and more"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/X11/xgeometry-select/default.nix b/pkgs/tools/X11/xgeometry-select/default.nix index 76493dfb73ea1..ed3b460dcb615 100644 --- a/pkgs/tools/X11/xgeometry-select/default.nix +++ b/pkgs/tools/X11/xgeometry-select/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Select a region with mouse and prints geometry information (x/y/w/h)"; - homepage = https://bbs.archlinux.org/viewtopic.php?pid=660837; + homepage = "https://bbs.archlinux.org/viewtopic.php?pid=660837"; maintainers = with maintainers; [ obadz ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index 943fdb2711c3e..e15bee331a8b4 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "xautolock rewrite in Rust, with a few extra features"; - homepage = https://github.com/jD91mZM2/xidlehook; + homepage = "https://github.com/jD91mZM2/xidlehook"; license = licenses.mit; maintainers = with maintainers; [ jD91mZM2 ]; platforms = platforms.unix; diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix index 9aee0d778c46e..9e11c948f40b5 100644 --- a/pkgs/tools/X11/xinput_calibrator/default.nix +++ b/pkgs/tools/X11/xinput_calibrator/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorgproto libXi autoconf automake libtool m4 xlibsWrapper ]; meta = { - homepage = https://github.com/tias/xinput_calibrator; + homepage = "https://github.com/tias/xinput_calibrator"; description = "A generic touchscreen calibration program for X.Org"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.flosse ]; diff --git a/pkgs/tools/X11/xkb-switch/default.nix b/pkgs/tools/X11/xkb-switch/default.nix index a837e73983f90..3b69ec8805498 100644 --- a/pkgs/tools/X11/xkb-switch/default.nix +++ b/pkgs/tools/X11/xkb-switch/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switch your X keyboard layouts from the command line"; - homepage = https://github.com/ierton/xkb-switch; + homepage = "https://github.com/ierton/xkb-switch"; license = licenses.gpl2Plus; maintainers = with maintainers; [ smironov ]; platforms = platforms.linux; diff --git a/pkgs/tools/X11/xlayoutdisplay/default.nix b/pkgs/tools/X11/xlayoutdisplay/default.nix index 7f3d9cfda5695..47a2c8f3f3ecc 100644 --- a/pkgs/tools/X11/xlayoutdisplay/default.nix +++ b/pkgs/tools/X11/xlayoutdisplay/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Detects and arranges linux display outputs, using XRandR for detection and xrandr for arrangement"; - homepage = https://github.com/alex-courtis/xlayoutdisplay; + homepage = "https://github.com/alex-courtis/xlayoutdisplay"; maintainers = with maintainers; [ dtzWill ]; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/tools/X11/xmagnify/default.nix b/pkgs/tools/X11/xmagnify/default.nix index dfd28e3177187..710c9b83dbd03 100644 --- a/pkgs/tools/X11/xmagnify/default.nix +++ b/pkgs/tools/X11/xmagnify/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tiny screen magnifier for X11"; - homepage = https://gitlab.com/amiloradovsky/magnify; + homepage = "https://gitlab.com/amiloradovsky/magnify"; license = licenses.mit; # or GPL2+, optionally maintainers = with maintainers; [ amiloradovsky ]; platforms = platforms.all; diff --git a/pkgs/tools/X11/xmousepasteblock/default.nix b/pkgs/tools/X11/xmousepasteblock/default.nix index 0cace7f452bbf..094b26d1f55cf 100644 --- a/pkgs/tools/X11/xmousepasteblock/default.nix +++ b/pkgs/tools/X11/xmousepasteblock/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { description = "Middle mouse button primary X selection/clipboard paste disabler"; - homepage = https://github.com/milaq/XMousePasteBlock; + homepage = "https://github.com/milaq/XMousePasteBlock"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.petercommand ]; }; diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index f8f48ea4cdb62..ae057c769845d 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/xnee/; + homepage = "https://www.gnu.org/software/xnee/"; maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix index 4dbe31df03caf..6f6d38932df3c 100644 --- a/pkgs/tools/X11/xpointerbarrier/default.nix +++ b/pkgs/tools/X11/xpointerbarrier/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; meta = { - homepage = https://uninformativ.de/git/xpointerbarrier; + homepage = "https://uninformativ.de/git/xpointerbarrier"; description = "Create X11 pointer barriers around your working area"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.xzfc ]; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 1f9efc31061aa..0d989fccb02cb 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -30,11 +30,11 @@ let in buildPythonApplication rec { pname = "xpra"; - version = "3.0.8"; + version = "3.0.9"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - sha256 = "0d78bn7s03nwnyc4ryznxaivbg55kvsb26q75p8747j3562s9p2b"; + sha256 = "04qskz1x1pvbdfirpxk58d3dfnf1n6dc69q2rdkak0avzl1nlzi7"; }; patches = [ @@ -42,6 +42,7 @@ in buildPythonApplication rec { src = ./fix-paths.patch; inherit (xorg) xkeyboardconfig; }) + ./fix-41106.patch ]; postPatch = '' diff --git a/pkgs/tools/X11/xpra/fix-41106.patch b/pkgs/tools/X11/xpra/fix-41106.patch new file mode 100644 index 0000000000000..06387c87154db --- /dev/null +++ b/pkgs/tools/X11/xpra/fix-41106.patch @@ -0,0 +1,15 @@ +diff --git a/xpra/server/server_util.py b/xpra/server/server_util.py +index 2ff2c0c..513201a 100644 +--- a/xpra/server/server_util.py ++++ b/xpra/server/server_util.py +@@ -17,6 +17,10 @@ if PYTHON3: + return b"'" + s.replace(b"'", b"'\\''") + b"'" + + def xpra_runner_shell_script(xpra_file, starting_dir, socket_dir): ++ # Nixpkgs contortion: ++ # xpra_file points to a shell wrapper, not to the python script. ++ dirname, basename = os.path.split(xpra_file) ++ xpra_file = os.path.join(dirname, "."+basename+"-wrapped") + script = [] + script.append(b"#!/bin/sh\n") + for var, value in os.environb.items(): diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/tools/X11/xpra/libfakeXinerama.nix index 770024aa4ba5a..712f47fb2c815 100644 --- a/pkgs/tools/X11/xpra/libfakeXinerama.nix +++ b/pkgs/tools/X11/xpra/libfakeXinerama.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://xpra.org/; + homepage = "http://xpra.org/"; description = "fakeXinerama for Xpra"; platforms = platforms.linux; maintainers = [ maintainers.tstrobel ]; diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/tools/X11/xprintidle-ng/default.nix index 4ae457dab4a8b..c7bb2bc348b1c 100644 --- a/pkgs/tools/X11/xprintidle-ng/default.nix +++ b/pkgs/tools/X11/xprintidle-ng/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''A command-line tool to print idle time from libXss''; - homepage = http://taktoa.me/xprintidle-ng/; + homepage = "http://taktoa.me/xprintidle-ng/"; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/X11/xrectsel/default.nix b/pkgs/tools/X11/xrectsel/default.nix index 4712192eacff3..e2f9fdf4a4356 100644 --- a/pkgs/tools/X11/xrectsel/default.nix +++ b/pkgs/tools/X11/xrectsel/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Print the geometry of a rectangular screen region"; - homepage = https://github.com/lolilolicon/xrectsel; + homepage = "https://github.com/lolilolicon/xrectsel"; license = licenses.gpl3; maintainers = [ maintainers.guyonvarch ]; platforms = platforms.linux; diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix index 6f75d2360cf49..a28fc50c1e74a 100644 --- a/pkgs/tools/X11/xrestop/default.nix +++ b/pkgs/tools/X11/xrestop/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "0.4"; src = fetchurl { - url = mirror://gentoo/distfiles/xrestop-0.4.tar.gz; + url = "mirror://gentoo/distfiles/xrestop-0.4.tar.gz"; sha256 = "0mz27jpij8am1s32i63mdm58znfijcpfhdqq1npbmvgclyagrhk7"; }; diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index 548101c34c3ca..effdd76ce9db7 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "X11 screen lock utility with security in mind"; - homepage = https://github.com/google/xsecurelock; + homepage = "https://github.com/google/xsecurelock"; license = licenses.asl20; maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix index bee6cdb748f10..10abd957e397a 100644 --- a/pkgs/tools/X11/xsettingsd/default.nix +++ b/pkgs/tools/X11/xsettingsd/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Provides settings to X11 applications via the XSETTINGS specification"; - homepage = https://github.com/derat/xsettingsd; + homepage = "https://github.com/derat/xsettingsd"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/tools/X11/xtruss/default.nix b/pkgs/tools/X11/xtruss/default.nix index 043514ebb4367..7d490571f4820 100644 --- a/pkgs/tools/X11/xtruss/default.nix +++ b/pkgs/tools/X11/xtruss/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "easy-to-use X protocol tracing program"; - homepage = https://www.chiark.greenend.org.uk/~sgtatham/xtruss; + homepage = "https://www.chiark.greenend.org.uk/~sgtatham/xtruss"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index 3c1dc3de2b420..6c61133077e4e 100644 --- a/pkgs/tools/X11/xvkbd/default.nix +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { facility to enter characters onto other clients (softwares) by clicking on a keyboard displayed on the screen. ''; - homepage = http://t-sato.in.coocan.jp/xvkbd; + homepage = "http://t-sato.in.coocan.jp/xvkbd"; license = licenses.gpl2Plus; maintainers = [ maintainers.bennofs ]; platforms = platforms.linux; diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/pkgs/tools/X11/xwinwrap/default.nix index b9d48f5457499..89b2fdd3dcf17 100644 --- a/pkgs/tools/X11/xwinwrap/default.nix +++ b/pkgs/tools/X11/xwinwrap/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit version; src = fetchbzr { - url = https://code.launchpad.net/~shantanu-goel/xwinwrap/devel; + url = "https://code.launchpad.net/~shantanu-goel/xwinwrap/devel"; rev = version; sha256 = "1annhqc71jcgx5zvcy31c1c488ygx4q1ygrwyy2y0ww743smbchw"; }; @@ -48,7 +48,7 @@ stdenv.mkDerivation { it is, in its new avatar “Shantz XWinWrap”. ''; license = licenses.hpnd; - homepage = https://shantanugoel.com/2008/09/03/shantz-xwinwrap/; + homepage = "https://shantanugoel.com/2008/09/03/shantz-xwinwrap/"; maintainers = with maintainers; [ infinisil ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 25a92f1117bb5..2254f2e22d9d1 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools, dnsutils }: stdenv.mkDerivation rec { pname = "acme.sh"; - version = "2.8.5"; + version = "2.8.6"; src = fetchFromGitHub { owner = "Neilpang"; repo = "acme.sh"; rev = version; - sha256 = "0yxhfdb0jz0wn10ka6c79qvcx07656vsaxmjls8qgcfgc472ymhs"; + sha256 = "0zbs8vzbh89wxf36h9mvhin2p85n3jrsq6l5i40q1zkzgwi3648n"; }; nativeBuildInputs = [ makeWrapper ]; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { socat openssl curl + dnsutils (if stdenv.isLinux then iproute else unixtools.netstat) ] }" @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A pure Unix shell script implementing ACME client protocol"; - homepage = https://acme.sh/; + homepage = "https://acme.sh/"; license = licenses.gpl3; maintainers = [ maintainers.yorickvp ]; }; diff --git a/pkgs/tools/admin/adtool/default.nix b/pkgs/tools/admin/adtool/default.nix index 5522fd7a68beb..f239b18aec9fa 100644 --- a/pkgs/tools/admin/adtool/default.nix +++ b/pkgs/tools/admin/adtool/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Active Directory administration utility for Unix"; - homepage = https://gp2x.org/adtool; + homepage = "https://gp2x.org/adtool"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix index b3e688c681d94..b36daefa16b60 100644 --- a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix +++ b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { meta = with lib; { description = "The Amazon ECR Docker Credential Helper is a credential helper for the Docker daemon that makes it easier to use Amazon Elastic Container Registry"; - homepage = https://github.com/awslabs/amazon-ecr-credential-helper; + homepage = "https://github.com/awslabs/amazon-ecr-credential-helper"; license = licenses.asl20 ; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 4af0311186936..174aef7c4babb 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -1,37 +1,27 @@ { python3Packages, fetchurl }: rec { - ansible = ansible_2_8; + ansible = ansible_2_9; ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible; ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; - version = "2.8.7"; + version = "2.8.12"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "0iy90kqxs52nspfkhj1y7z4zf017jfm5qhdb01d8d4jd5g53k0l2"; + sha256 = "091id1da3hlnmf0hwvrhv2r0mnyna3mc6s7rwdg5kll7yfiy4k1a"; }; })); ansible_2_7 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; - version = "2.7.15"; + version = "2.7.18"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "1kjqr35c11njyi3f2rjab6821bhqcrdykv4285q76gwv0qynigwr"; - }; - })); - - ansible_2_6 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { - pname = "ansible"; - version = "2.6.20"; - - src = fetchurl { - url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "02ra9q2mifyawn0719y78wrbqzik73aymlzwi90fq71jgyfvkkqn"; + sha256 = "0sgshaaqyjq3i035yi5hivmrrwrq05hxrbjrv1w3hfzmvljn41d1"; }; })); } diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix index 830dcee26e431..228aa5a26a258 100644 --- a/pkgs/tools/admin/aws-rotate-key/default.nix +++ b/pkgs/tools/admin/aws-rotate-key/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Easily rotate your AWS key"; - homepage = https://github.com/Fullscreen/aws-rotate-key; + homepage = "https://github.com/Fullscreen/aws-rotate-key"; license = licenses.mit; maintainers = [maintainers.mbode]; platforms = platforms.unix; diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index 48a1de61cd80e..0216660e1ecce 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -1,16 +1,16 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "aws-vault"; - version = "5.3.2"; + version = "5.4.4"; src = fetchFromGitHub { owner = "99designs"; repo = pname; rev = "v${version}"; - sha256 = "04dyibcaijv5011laycf39m4gvprvvsn5zkxslyih1kqd170w3wg"; + sha256 = "0qmxq2jd7dg5fp9giw6xd96q2l2df3sxksc0rwmrgx2rjx6iyivn"; }; - modSha256 = "1d3hjfmfmlpw2scfyn597zkzz864w97p0wrsxjp49m9mi0pgmhq9"; + vendorSha256 = "0jlraq480llamns6yw8yjkzxsndyqiyzy120djni8sw5h0bz65j7"; subPackages = [ "." ]; # set the version. see: aws-vault's Makefile @@ -26,4 +26,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/admin/aws_shell/default.nix b/pkgs/tools/admin/aws_shell/default.nix index b9169691808f3..104c2f1e44a94 100644 --- a/pkgs/tools/admin/aws_shell/default.nix +++ b/pkgs/tools/admin/aws_shell/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/awslabs/aws-shell; + homepage = "https://github.com/awslabs/aws-shell"; description = "An integrated shell for working with the AWS CLI"; license = licenses.asl20; maintainers = [ ]; diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 08843d5bca97a..d64736bc2c52b 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -57,7 +57,7 @@ in with py.pkgs; buildPythonApplication rec { passthru.python = py; # for aws_shell meta = with lib; { - homepage = https://aws.amazon.com/cli/; + homepage = "https://aws.amazon.com/cli/"; description = "Unified tool to manage your AWS services"; license = licenses.asl20; maintainers = with maintainers; [ muflax ]; diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix index 92b6d62a8a2dc..4a33d74207655 100644 --- a/pkgs/tools/admin/awslogs/default.nix +++ b/pkgs/tools/admin/awslogs/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/jorgebastida/awslogs; + homepage = "https://github.com/jorgebastida/awslogs"; description = "AWS CloudWatch logs for Humans"; maintainers = with maintainers; [ dbrock ]; license = licenses.bsd3; diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix index 661747c2fd0d6..372d287cbd2f5 100644 --- a/pkgs/tools/admin/awsweeper/default.nix +++ b/pkgs/tools/admin/awsweeper/default.nix @@ -1,17 +1,23 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub }: buildGoModule rec { pname = "awsweeper"; - version = "0.6.0"; + version = "0.7.0"; + + # Requires go generate to be run with mockgen, but doesn't check in the results. + patches = fetchurl { + url = "https://raw.githubusercontent.com/c00w/patches/master/awskeeper.patch"; + sha256 = "0dz553ffxc37m2iwygrbhxf7pm91hxdriic8a1gjf8q3nyn13npl"; + }; src = fetchFromGitHub { owner = "cloudetc"; repo = pname; rev = "v${version}"; - sha256 = "0sbd1jgzz3rxxwgbni885zvvcznfc51imaxwv7f064290iqlbrv4"; + sha256 = "1ybrrpnp6rh7rcwihww43cvhfhzzyy51rdk1hwy9ljpkg37k4y28"; }; - modSha256 = "14yvf0svh7xqpc2y7xr94pc6r7d3iv2nsr8qs3f5q29hdc5hv3fs"; + vendorSha256 = "0hnpb1xp135z2qpn1b6xad59739hffhs8dfpr3n5drmrvajpn4xp"; meta = with lib; { description = "A tool to clean out your AWS account"; diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 13fdf6dcd0d06..942346bc1a73e 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, python, fetchFromGitHub, installShellFiles }: let - version = "2.2.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "0bqkvx1gp4bhpjn5nrjc08lq8wldl1icrz6q1llaxgvqqmc8hcgp"; + sha256 = "129v01da0whayqi9nvrfnlrq10mn5j096k43xl72214nk7iliwfy"; }; # put packages that needs to be overriden in the py package scope @@ -23,8 +23,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { substituteInPlace setup.py \ --replace "javaproperties==0.5.1" "javaproperties" \ --replace "pytz==2019.1" "pytz" \ - --replace "mock~=2.0" "mock" \ - --replace "azure-mgmt-reservations==0.3.1" "azure-mgmt-reservations~=0.3.1" + --replace "mock~=4.0" "mock" # remove namespace hacks # remove urllib3 because it was added as 'urllib3[secure]', which doesn't get handled well @@ -93,6 +92,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-mgmt-rdbms azure-mgmt-recoveryservices azure-mgmt-recoveryservicesbackup + azure-mgmt-redhatopenshift azure-mgmt-redis azure-mgmt-relay azure-mgmt-reservations diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 3c598e67a711e..61633c1bbdc02 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -55,14 +55,18 @@ let argcomplete azure-common azure-cli-telemetry + azure-mgmt-core azure-mgmt-resource colorama humanfriendly jmespath knack + msal + msal-extensions msrest msrestazure paramiko + pkginfo psutil pygments pyjwt @@ -111,20 +115,29 @@ let ''; }; - azure-batch = overrideAzureMgmtPackage super.azure-batch "8.0.0" "zip" - "1j8nibnics9vakhqiwnjv7bwril7mfyz1svcvvsrb9a4wbdd12wi"; + azure-batch = overrideAzureMgmtPackage super.azure-batch "9.0.0" "zip" + "112d73gxjqng348mcvi36ska6pxyg8qc3qswvhf5x4a0lr86zjj7"; + + azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "0.1.0" "zip" + "06bqqkn5mx127x1z7ycm6rl8ajxlrmrm2kcdpgkbl4baii1x6iax"; + + azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "7.0.0" "zip" + "18dwgbwk1kc0pdqa85hbsm9312l50rf8ymb60fia1c9rni9bdi8n"; azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.4.0" "zip" "1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g"; - azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "2.0.0" "zip" - "19z0lpq6bpidlflwa263y51549xgcg4m040k872m7fmy7jm2xcbb"; + azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "2.2.0" "zip" + "1iz1pf28ajrzbq8nab1jbjbgfbv0g6ni036xayy6xylvga4l8czr"; + + azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "0.4.0" "zip" + "0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rz1"; azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip" "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "8.0.1" "zip" - "0gngm7w17r5922ji11pnpa6gp5vh5z6la025v9cda6smsnx0fxx7"; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "9.0.0" "zip" + "00bmdbr7hdwb3ibr9sfbgbmmr6626qlz19cdi84d87rcisczf4nw"; azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.4.0" "zip" "1dn5585nsizszjivx6lp677ka0mrg0ayqgag4yzfdz9ml8mj1xl5"; @@ -132,17 +145,20 @@ let azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "5.0.0" "zip" "1m7v3rfkvmdgghrpz15fm8pvmmhi40lcwfxdm2kxh7mx01r5l906"; - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "11.0.0" "zip" - "1dnlql4z9wawf8gc1v4rr386pifwcnx3ycr4gdccqwkgimgpsdg4"; + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "12.0.0" "zip" + "0vzq93g2fpnij4rykkk3391xq2knhlbz87vhim4zvj8s45sx6z8q"; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "8.1.0" "zip" - "07vpzhvi2946v5dn9cb2hkd1b9vj5c6zl32958bg2bxsjg9vvyi1"; + azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "9.0.1" "zip" + "11nqjpi9qypb0xvfy63l98q5m5jfv5iqx15mliksm96vkdkmji3y"; - azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.12.0" "zip" - "07c0hr7nha9789x1wz0ndca0sr0zscq63m9vd8pm1c6y0ss4iyn5"; + azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.0.0" "zip" + "0pm565v05480f672l0n8z2sg6zk6iqyi91n0dhscibhdl54sy3si"; + + azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.13.0" "zip" + "160cn4arl4dy6ax1zb64bzw0ygmpg8jc942m1zlh4nwx5x322gg8"; azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip" "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6"; @@ -150,11 +166,11 @@ let azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.2.1" "zip" "0mwlvy4x5nr3hsz7wdpdhpzwarzzwz4225bfpd68hr0pcjgzspky"; - azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "0.8.2" "zip" - "0w3w1d156rnkwjdarv3qvycklxr3z2j7lry7a3jfgj3ykzny12rq"; + azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "0.11.0" "zip" + "11887zf61ji1dh62czrsgxwz8idybw93m6iwahjy777jkdyviyzn"; - azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "2.0.0" "zip" - "1fql0j28d2r6slgabb7b438gdga513iskqh4al6c7dsmj1yzdzwa"; + azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "3.0.0" "zip" + "0iq04hvivq3fvg2lhax95gx0x35avk5hps42227z3qna5i2cznpn"; azure-mgmt-kusto = overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip" "1pmcdgimd66h964a3d5m2j2fbydshcwhrk87wblhwhfl3xwbgf4y"; @@ -162,14 +178,17 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "2.2.0" "zip" "15lpyv9z8ss47rjmg1wx5akh22p9br2vckaj7jk3639vi38ac5nl"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.7.0" "zip" - "0cf4pknb5y2yz4jqwg7xm626zkfx8i8hqcr3dkvq21lrx7fz96r3"; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.8.0" "zip" + "0vbg5mpahrnnnbj80flgzxxiffic94wsc9srm4ir85y2j5rprpv7"; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip" "1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p"; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "9.0.0" "zip" - "12bsdbh37xiz42hvrp8ghszyqkiali3pk50x44f3aip12pgx6kix"; + azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "0.5.0" "zip" + "0k91zdlzx6nfly1v2i7qmzqrdiygdx8rmgar3iz8nwgafvvc9x0n"; + + azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "10.1.0" "zip" + "0fmsdwzyn167lwh87yyadq1bdc4q6rfz3gj5bh1mgavi9ghhxb75"; azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "1.1.1" "zip" "16wk0ksycrscsn3n14qk4vvf7i567vq6f96lwf5dwbc81wx6n32x"; @@ -180,6 +199,9 @@ let azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.44.0" "zip" "05dqakhfi301k2jnvccxdkigqvwnf9xz858pqg9vsri3dq69f1rw"; + azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "0.1.0" "zip" + "1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn"; + azure-mgmt-redis = overrideAzureMgmtPackage super.azure-mgmt-redis "7.0.0rc1" "zip" "086wk31wsl8dx14qpd0g1bly8i9a8fix007djlj9cybva2f2bk6k"; @@ -189,8 +211,8 @@ let azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.1.0" "zip" "1cb466722bs0ribrirb32kc299716pl0pwivz3jyn40dd78cwhhx"; - azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.17.0" "zip" - "1kp1wzcydgyc2mzkxigfv6rqzwzf3d0cnbqc6w7h907qbb4lw2r0"; + azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.18.0" "zip" + "0i9lnhcx85xccddvz1wdz5j0idm6sw2cn3066dww5993nmg0ijlr"; azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip" "1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm"; @@ -204,17 +226,17 @@ let azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "3.0.0" "zip" "05c6isg13dslds94kv28v6navxj4bp4c5lsd9df0g3ndsxvpdrxp"; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "2.1.0" "zip" - "1ikv8b2h1r91fa0srz95ymn54qpqgb5a4faxwp4hf92r5h85c8j9"; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "2.2.0" "zip" + "1r5ww9ndya6sifafrbp4cr5iyyaww2ns7wrbqm6hc6aqxcpf30qq"; azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "4.1.0rc1" "zip" "00q5723gvc57kg2w1iyhfchp018skwd89ibrw23p7ngm2bb76g45"; - azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc9" "zip" - "060m4hqi1h5h53imj0vmpbzhqkwis7h91nwinpcvjs422figcv0i"; + azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc11" "zip" + "1ixh2wmrbm1v2xlrnmy1l513jpqch6b5vyh9x77flm649x1cff2q"; - azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.7.0" "zip" - "1pprvk5255b6brbw73g0g13zygwa7a2px5x08wy3153rqlzan5l2"; + azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.9.0" "zip" + "170jyr1qzwhv5ihyrsg5d8qzjylqmg31dscd31jzi4i7bwqf3sb8"; azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "2.0.1" "zip" "1wsfkprdrn22mwm24y2zlcms8ppp7jwq3s86r3ymbl29pbaxca8r"; @@ -225,14 +247,14 @@ let azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.52.0" "zip" "0357laxgldb7lvvws81r8xb6mrq9dwwnr1bnwdnyj4bw6p21i9hn"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "8.0.0" "zip" - "0cxcdyy974ya1yi7s14sw54rwpc8qjngxr0jqb8vxki3528phrv3"; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "9.0.0" "zip" + "198r51av2rd1mr3q9j8jibhd14w0v8k59ipc3czsm4g1n44adgkl"; azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.4.0" "zip" "1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2"; - azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.3.0" "zip" - "1r7isr7hzq2dv1idwwa9xxxgk8wh0ncka45r4rdcsl1p7kd2kqam"; + azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.4.0" "zip" + "0zmmfj7z1zrayjqwqybcn3bwm47d2ngyxm1g6fh2iw5c2f9czycv"; azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec { version = "0.60.0"; @@ -297,6 +319,26 @@ let ''; }); + knack = super.knack.overridePythonAttrs(oldAttrs: rec { + version = "0.7.0rc4"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "10v6qjpr7sbq5irq3kz24jiivpfm0f7jbj9iyx4dm8fgkrhgzlb6"; + }; + }); + + msal = super.msal.overridePythonAttrs(oldAttrs: rec { + version = "1.0.0"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "0h33wayvakggr684spdyhiqvrwraavcbk3phmcbavb3zqxd3zgpc"; + }; + }); + }; }; in diff --git a/pkgs/tools/admin/bash-my-aws/default.nix b/pkgs/tools/admin/bash-my-aws/default.nix index 8c0dd3067439e..b99f031f41654 100644 --- a/pkgs/tools/admin/bash-my-aws/default.nix +++ b/pkgs/tools/admin/bash-my-aws/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://bash-my-aws.org; + homepage = "https://bash-my-aws.org"; description = "CLI commands for AWS"; license = licenses.mit; maintainers = with maintainers; [ tomberek ]; diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index c1c46da41b75c..ecafb13978237 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0y393g36h35zzqyf5b10j6qq2jhvz83j17cmasnv6wbyrb3vnn0n"; }; - modSha256 = "0m2bqx102lf6nihdjbl8a08xcwi80rawvh91j1cav0njm9w5vmmm"; + vendorSha256 = null; meta = with stdenv.lib; { description = "A tool for managing secrets on Google Cloud"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index 5474cb254298f..86873d9051490 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0siwbxxzknmbsjy23d0lvh591ngabqhr2g8mip0siwa7c1y7ivv4"; }; - modSha256 = "1i5n5yh6nvv2i2nm60vqy1gngj8p5w6ma5fcwmp7bl4jxjrzbi83"; + vendorSha256 = "1l6ajfl04rfbssvijgd5jrppmqc5svfrswdx01x007lr8rvdfd94"; meta = with stdenv.lib; { description = "A utility to examine and validate certificates in a variety of formats"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/admin/chkcrontab/default.nix b/pkgs/tools/admin/chkcrontab/default.nix index a4b119f126a4f..0740b0c1be606 100644 --- a/pkgs/tools/admin/chkcrontab/default.nix +++ b/pkgs/tools/admin/chkcrontab/default.nix @@ -15,6 +15,6 @@ buildPythonApplication rec { description = "A tool to detect crontab errors"; license = licenses.asl20; maintainers = with maintainers; [ ma27 ]; - homepage = https://github.com/lyda/chkcrontab; + homepage = "https://github.com/lyda/chkcrontab"; }; } diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index 3f4d00736ad94..22e490979bc9c 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clair"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - sha256 = "14dh9iv2g138rivvfk135m3l90kk6c1ln1iqxhbi7s99h1jixbqw"; + sha256 = "0wkljfq9lnadzkg1ki3wkimlqd6j405nxcl35npzrxjglkvsdjym"; }; - modSha256 = "0rgkrid58kji39nlmiii95r8shbzr6dwalj5m7qwxy5w1rcaljr5"; + vendorSha256 = "0x31n50vd8660z816as6kms5dkv87b0mhblccpkvd9cbvcv2n37a"; nativeBuildInputs = [ makeWrapper ]; @@ -26,4 +26,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index 8195207ef60a9..0ba4593f6a567 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -18,7 +18,7 @@ buildGoPackage { meta = with lib; { description = "CLI tool for the Amazon Route 53 DNS service"; - homepage = https://github.com/barnybug/cli53; + homepage = "https://github.com/barnybug/cli53"; license = licenses.mit; maintainers = with maintainers; [ benley ]; }; diff --git a/pkgs/tools/admin/daemontools/default.nix b/pkgs/tools/admin/daemontools/default.nix index 7e8c1bccc3e84..660563d9757c1 100644 --- a/pkgs/tools/admin/daemontools/default.nix +++ b/pkgs/tools/admin/daemontools/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.publicDomain; - homepage = https://cr.yp.to/daemontools.html; + homepage = "https://cr.yp.to/daemontools.html"; description = "A collection of tools for managing UNIX services."; maintainers = with stdenv.lib.maintainers; [ kevincox ]; diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix index 4d71ebd2c5c95..741d652596946 100644 --- a/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { helper. It allows for Docker clients v1.11+ to easily make authenticated requests to GCR's repositories (gcr.io, eu.gcr.io, etc.). ''; - homepage = https://github.com/GoogleCloudPlatform/docker-credential-gcr; + homepage = "https://github.com/GoogleCloudPlatform/docker-credential-gcr"; license = licenses.asl20; maintainers = with maintainers; [ suvash ]; }; diff --git a/pkgs/tools/admin/docker-credential-helpers/default.nix b/pkgs/tools/admin/docker-credential-helpers/default.nix index 1f4315afc40db..38762b6fd29cd 100644 --- a/pkgs/tools/admin/docker-credential-helpers/default.nix +++ b/pkgs/tools/admin/docker-credential-helpers/default.nix @@ -32,11 +32,11 @@ buildGoPackage rec { installPhase = if stdenv.isDarwin then '' - install -Dm755 -t $bin/bin bin/docker-credential-osxkeychain + install -Dm755 -t $out/bin bin/docker-credential-osxkeychain '' else '' - install -Dm755 -t $bin/bin bin/docker-credential-pass - install -Dm755 -t $bin/bin bin/docker-credential-secretservice + install -Dm755 -t $out/bin bin/docker-credential-pass + install -Dm755 -t $out/bin bin/docker-credential-secretservice ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index fdb03b50feb8e..18fb37aa41c05 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,23 +2,22 @@ buildGoModule rec { pname = "eksctl"; - version = "0.16.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "067q2cj4iwhiijv6nd9crjfncn67829f4d2ls07lwdcsvgi1cyfi"; + sha256 = "0xlr7hsncih4nzydi6sphp7j7k82cbhmi7jb0sd954i8kzl3sc1q"; }; - modSha256 = "187jv78asav97cbvn7336ycflqa0c2alvkhvlyv2mp5f3crygagy"; + vendorSha256 = "14d9hl01z7ixp1wa8kp1zs0z1p3pvz6hkp49z582nqllpb2xjmkx"; subPackages = [ "cmd/eksctl" ]; buildFlags = [ "-tags netgo" "-tags release" ]; - postInstall = - '' + postInstall = '' mkdir -p "$out/share/"{bash-completion/completions,zsh/site-functions} $out/bin/eksctl completion bash > "$out/share/bash-completion/completions/eksctl" diff --git a/pkgs/tools/admin/elasticsearch-curator/default.nix b/pkgs/tools/admin/elasticsearch-curator/default.nix index 8d8f907049991..88ae57251b7fb 100644 --- a/pkgs/tools/admin/elasticsearch-curator/default.nix +++ b/pkgs/tools/admin/elasticsearch-curator/default.nix @@ -58,7 +58,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/elastic/curator; + homepage = "https://github.com/elastic/curator"; description = "Curate, or manage, your Elasticsearch indices and snapshots"; license = licenses.asl20; longDescription = '' diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix new file mode 100644 index 0000000000000..a408746c7fd0a --- /dev/null +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildGo114Package, fetchFromGitHub }: + +buildGo114Package rec { + pname = "exoscale-cli"; + version = "1.12.0"; + + src = fetchFromGitHub { + owner = "exoscale"; + repo = "cli"; + rev = "v${version}"; + sha256 = "04ym7mfv565icj3lmd2nrvq9asawwmmzg09681pj9py61ws56bxr"; + }; + + goPackagePath = "github.com/exoscale/cli"; + goDeps = ./deps.nix; + + # ensures only the cli binary is built and we don't clutter bin/ with submodules + subPackages = [ "." ]; + + # we need to rename the resulting binary but can't use buildFlags with -o here + # because these are passed to "go install" which does not recognize -o + postBuild = '' + mv go/bin/cli go/bin/exo + ''; + + meta = { + description = "Command-line tool for everything at Exoscale: compute, storage, dns"; + homepage = "https://github.com/exoscale/cli"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ dramaturg ]; + }; +} diff --git a/pkgs/tools/admin/exoscale-cli/deps.nix b/pkgs/tools/admin/exoscale-cli/deps.nix new file mode 100644 index 0000000000000..a67ee93a85146 --- /dev/null +++ b/pkgs/tools/admin/exoscale-cli/deps.nix @@ -0,0 +1,876 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/VividCortex/ewma"; + fetch = { + type = "git"; + url = "https://github.com/VividCortex/ewma"; + rev = "v1.1.1"; + sha256 = "14v2dy5gqchjn7k0sd6cx59ms42v681r6xz7cb1kspp4b28a74rw"; + }; + } + { + goPackagePath = "github.com/alecthomas/assert"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/assert"; + rev = "405dbfeb8e38"; + sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"; + }; + } + { + goPackagePath = "github.com/alecthomas/chroma"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/chroma"; + rev = "v0.6.2"; + sha256 = "1bcppy1s148iikr78qjm0akahn01ywh83a8pw544prr9yc16jvmz"; + }; + } + { + goPackagePath = "github.com/alecthomas/colour"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/colour"; + rev = "60882d9e2721"; + sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs"; + }; + } + { + goPackagePath = "github.com/alecthomas/gometalinter"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/gometalinter"; + rev = "v2.0.11"; + sha256 = "08p7bwvhpgizif8qi59m8mm3mcny70x9msbk8m8vjpphsq55wha4"; + }; + } + { + goPackagePath = "github.com/alecthomas/kong"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/kong"; + rev = "v0.1.15"; + sha256 = "1llxabcdzlb2hard0h931knqkdnyjyz8dp3k0nli0m0mags7l31b"; + }; + } + { + goPackagePath = "github.com/alecthomas/repr"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/repr"; + rev = "117648cd9897"; + sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cf"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/armon/consul-api"; + fetch = { + type = "git"; + url = "https://github.com/armon/consul-api"; + rev = "eb2c6b5be1b6"; + sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; + }; + } + { + goPackagePath = "github.com/blang/semver"; + fetch = { + type = "git"; + url = "https://github.com/blang/semver"; + rev = "v3.5.1"; + sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy"; + }; + } + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "v2.0.0"; + sha256 = "0k4899ifpir6kmfxli8a2xfj5zdh0xb2jd0fq2r38wzd4pk25ipr"; + }; + } + { + goPackagePath = "github.com/chzyer/logex"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/logex"; + rev = "v1.1.10"; + sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4"; + }; + } + { + goPackagePath = "github.com/chzyer/readline"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/readline"; + rev = "2972be24d48e"; + sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; + }; + } + { + goPackagePath = "github.com/chzyer/test"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/test"; + rev = "a1ea475d72b1"; + sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k"; + }; + } + { + goPackagePath = "github.com/client9/misspell"; + fetch = { + type = "git"; + url = "https://github.com/client9/misspell"; + rev = "v0.3.4"; + sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "v3.3.10"; + sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-etcd"; + rev = "v2.0.0"; + sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "v0.2.0"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "v1.0.8"; + sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2"; + }; + } + { + goPackagePath = "github.com/cyberdelia/templates"; + fetch = { + type = "git"; + url = "https://github.com/cyberdelia/templates"; + rev = "ca7fffd4298c"; + sha256 = "1miakwci9pz95p0jps4i3pyv5ws713ks1wwir5bzrl0yg8klrgw1"; + }; + } + { + goPackagePath = "github.com/danwakefield/fnmatch"; + fetch = { + type = "git"; + url = "https://github.com/danwakefield/fnmatch"; + rev = "cbb64ac3d964"; + sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/deepmap/oapi-codegen"; + fetch = { + type = "git"; + url = "https://github.com/deepmap/oapi-codegen"; + rev = "ee90a3f9f1ae"; + sha256 = "199nb6aqhllkk891x24h1jffin1x9fx8jdsav9pbc2ki0z8mlji3"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "v3.2.0"; + sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; + }; + } + { + goPackagePath = "github.com/dlclark/regexp2"; + fetch = { + type = "git"; + url = "https://github.com/dlclark/regexp2"; + rev = "v1.1.6"; + sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + { + goPackagePath = "github.com/exoscale/egoscale"; + fetch = { + type = "git"; + url = "https://github.com/exoscale/egoscale"; + rev = "v0.24.0"; + sha256 = "1ls7blpmhwqxz9cfjc5799q4047pawfda1v1mhyicjdlp3b1z1zi"; + }; + } + { + goPackagePath = "github.com/fatih/camelcase"; + fetch = { + type = "git"; + url = "https://github.com/fatih/camelcase"; + rev = "v1.0.0"; + sha256 = "0z7rw6f5j97dkzqya257dqlxf3cm8zl508081gmnr4bsjhkwpz2l"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/getkin/kin-openapi"; + fetch = { + type = "git"; + url = "https://github.com/getkin/kin-openapi"; + rev = "v0.2.0"; + sha256 = "0slv4k55yiqgv5cv51mvfdcckl95wsbvhvrrpmh4wf7q9rk0jkf6"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "v1.0.0"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + }; + } + { + goPackagePath = "github.com/go-chi/chi"; + fetch = { + type = "git"; + url = "https://github.com/go-chi/chi"; + rev = "v4.0.2"; + sha256 = "1ay9yxzj60l21h4wayrq9sv5ajaqaryy5yyf27z7v2k4a83b5qr6"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "v1.42.0"; + sha256 = "18ywm8zyv091j1pp5mvx8szl7928chk8lw02br6jy568d7rk4xal"; + }; + } + { + goPackagePath = "github.com/gofrs/uuid"; + fetch = { + type = "git"; + url = "https://github.com/gofrs/uuid"; + rev = "v3.2.0"; + sha256 = "1q63mp7bznhfgyw133c0wc0hpcj1cq9bcf7w1f8r6inkcrils1fz"; + }; + } + { + goPackagePath = "github.com/golang/lint"; + fetch = { + type = "git"; + url = "https://github.com/golang/lint"; + rev = "c67002cb31c3"; + sha256 = "0gymbggskjmphqxqcx4s0vnlcz7mygbix0vhwcwv5r67c0bf6765"; + }; + } + { + goPackagePath = "github.com/golangci/lint-1"; + fetch = { + type = "git"; + url = "https://github.com/golangci/lint-1"; + rev = "d2cdd8c08219"; + sha256 = "0viib12a61338411ng4nnd4na4fscsknghk397jdfn00sigyy4ls"; + }; + } + { + goPackagePath = "github.com/google/shlex"; + fetch = { + type = "git"; + url = "https://github.com/google/shlex"; + rev = "c34317bd91bf"; + sha256 = "00qivza4hkllfkar2vpqmyxybi0fwqipgijv61dgapq4xddxdq0r"; + }; + } + { + goPackagePath = "github.com/gopherjs/gopherjs"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherjs"; + rev = "d547d1d9531e"; + sha256 = "0rhgxfh8b3qq4imkw6dmv0hxsmflm9pkax8i7a9z8q464z1ixrz7"; + }; + } + { + goPackagePath = "github.com/gordonklaus/ineffassign"; + fetch = { + type = "git"; + url = "https://github.com/gordonklaus/ineffassign"; + rev = "1003c8bd00dc"; + sha256 = "1rkzqvd3z03vq8q8qi9cghvgggsf02ammj9wq8jvpnx6b2sd16nd"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "v1.0.0"; + sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/jtolds/gls"; + fetch = { + type = "git"; + url = "https://github.com/jtolds/gls"; + rev = "v4.20.0"; + sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; + }; + } + { + goPackagePath = "github.com/juju/ansiterm"; + fetch = { + type = "git"; + url = "https://github.com/juju/ansiterm"; + rev = "720a0952cc2a"; + sha256 = "0n6j0y7xhashp8gdkdl0r7vlbkdrkymrzxn9hxrx522k2isggs7h"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/labstack/echo"; + fetch = { + type = "git"; + url = "https://github.com/labstack/echo"; + rev = "v4.1.11"; + sha256 = "0b14vgwzznn7wzyjb98xdmq4wjg16l3y62njiwfz4qsm4pwzk405"; + }; + } + { + goPackagePath = "github.com/labstack/gommon"; + fetch = { + type = "git"; + url = "https://github.com/labstack/gommon"; + rev = "v0.3.0"; + sha256 = "18z7akyzm75p6anm4b8qkqgm4iivx50z07hi5wf50w1pbsvbcdi0"; + }; + } + { + goPackagePath = "github.com/lunixbochs/vtclean"; + fetch = { + type = "git"; + url = "https://github.com/lunixbochs/vtclean"; + rev = "2d01aacdc34a"; + sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "v1.8.0"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + }; + } + { + goPackagePath = "github.com/manifoldco/promptui"; + fetch = { + type = "git"; + url = "https://github.com/manifoldco/promptui"; + rev = "v0.3.2"; + sha256 = "185h0lqm14l9j0yvdsn9njq7jw3j6x3l21jvvczzbcbbrj44q0pl"; + }; + } + { + goPackagePath = "github.com/matryer/moq"; + fetch = { + type = "git"; + url = "https://github.com/matryer/moq"; + rev = "6cfb0558e1bd"; + sha256 = "0x7ss68cvq2aljyw4765iy7divmp8rghpyzlas3nb95qzsfmmpzl"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.1.4"; + sha256 = "1yxcz08kminqr1221zxpibnbzfcgs3fafin0z9zqb3gqvf74jywz"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.10"; + sha256 = "0jf4hwfwd2cpxrlyv0jzcia809q2bjw7y1m3ciaj2s8lj2jqyf6r"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.3"; + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + }; + } + { + goPackagePath = "github.com/minio/minio-go"; + fetch = { + type = "git"; + url = "https://github.com/minio/minio-go"; + rev = "v6.0.44"; + sha256 = "0sfmd2lf24f7ds16imk63mas6izhjnmprbxad0sil9abvk8r23mk"; + }; + } + { + goPackagePath = "github.com/minio/sha256-simd"; + fetch = { + type = "git"; + url = "https://github.com/minio/sha256-simd"; + rev = "v0.1.1"; + sha256 = "1j0iqsckm97g4l79vd4mc7apbmkdar23jpzqpnpdhwpfd834j8lp"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "v1.1.0"; + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "v1.1.2"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; + }; + } + { + goPackagePath = "github.com/nicksnyder/go-i18n"; + fetch = { + type = "git"; + url = "https://github.com/nicksnyder/go-i18n"; + rev = "v1.10.0"; + sha256 = "1nlvq85c232z5yjs86pxpmkv7hk6gb5pa6j4hhzgdz85adk2ma04"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "be2c049b30cc"; + sha256 = "1fr996vpmh6v5q13kfgf0fbi0hksxqg0fnbvj2nqhlsyfp5s8f4w"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "v1.2.0"; + sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.9.1"; + sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "v1.5.2"; + sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c"; + }; + } + { + goPackagePath = "github.com/sergi/go-diff"; + fetch = { + type = "git"; + url = "https://github.com/sergi/go-diff"; + rev = "v1.0.0"; + sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.4.2"; + sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; + }; + } + { + goPackagePath = "github.com/smartystreets/assertions"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/assertions"; + rev = "b2de0cb4f26d"; + sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y"; + }; + } + { + goPackagePath = "github.com/smartystreets/goconvey"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/goconvey"; + rev = "68dc04aab96a"; + sha256 = "1kas5v95fzhr88hg4rjy0vp03y4pzvy3pwwgkfz2yhn5nlj29nk6"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "v1.1.2"; + sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "v1.3.0"; + sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "v0.0.3"; + sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "v1.0.0"; + sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "v1.3.1"; + sha256 = "1190mg04718r03qriav99sf4kx2n7wdgr8vdni15f74bpbzrdjrl"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.4.0"; + sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; + }; + } + { + goPackagePath = "github.com/tsenart/deadcode"; + fetch = { + type = "git"; + url = "https://github.com/tsenart/deadcode"; + rev = "210d2dc333e9"; + sha256 = "05kif593f4wygnrq2fdjhn7kkcpdmgjnykcila85d0gqlb1f36g0"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "d75b2dcb6bc8"; + sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; + }; + } + { + goPackagePath = "github.com/valyala/bytebufferpool"; + fetch = { + type = "git"; + url = "https://github.com/valyala/bytebufferpool"; + rev = "v1.0.0"; + sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93"; + }; + } + { + goPackagePath = "github.com/valyala/fasttemplate"; + fetch = { + type = "git"; + url = "https://github.com/valyala/fasttemplate"; + rev = "v1.1.0"; + sha256 = "089wm839lqmw9knr3ifbi82iykaybk0zxzp3c02lsh31wax4f8a2"; + }; + } + { + goPackagePath = "github.com/vbauerster/mpb"; + fetch = { + type = "git"; + url = "https://github.com/vbauerster/mpb"; + rev = "v4.8.4"; + sha256 = "0ifz1hp1a5xjxx7x9km5pb0x6p60lcpzwmhnxlg5x4ls6hrs8wd9"; + }; + } + { + goPackagePath = "github.com/xordataexchange/crypt"; + fetch = { + type = "git"; + url = "https://github.com/xordataexchange/crypt"; + rev = "b2862e3d0a77"; + sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "e1110fd1c708"; + sha256 = "0n5n7dzlr87mvk3mbcx400al4pa1i85jbbdhbx4s1rhr0rs3kh9a"; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "c67002cb31c3"; + sha256 = "0gymbggskjmphqxqcx4s0vnlcz7mygbix0vhwcwv5r67c0bf6765"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "2180aed22343"; + sha256 = "0hl3pgi8rzij5m6alq4xqfvyvidy7jnf5y85031jv4y1bj85r6pl"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "52ab43148777"; + sha256 = "1kakxbqrb1w2vwg7r1896z68qcx2lfvimsl8cs2niiipbgpi6imx"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.2"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "a911d9008d1f"; + sha256 = "118vsliq2a9xfp6rckc310mf9lydfgah6hgiggd88cm3zch4626m"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "a985d3407aa7"; + sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v3-unstable"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v3-unstable"; + rev = "df19058c872c"; + sha256 = "0nb6925fixs6brdwpmwi32b38acn1s8dv4g0syjy3kpq0wasljy9"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "gopkg.in/ini.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/ini.v1"; + rev = "v1.42.0"; + sha256 = "18ywm8zyv091j1pp5mvx8szl7928chk8lw02br6jy568d7rk4xal"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.5"; + sha256 = "08smz8dfyxp02ha74my9iszqa5qzgl3ksi28ilyp8lqipssiq6fg"; + }; + } +] diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/tools/admin/fastlane/default.nix index 1cdc969ea2e61..01f2d23740720 100644 --- a/pkgs/tools/admin/fastlane/default.nix +++ b/pkgs/tools/admin/fastlane/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool to automate building and releasing iOS and Android apps"; longDescription = "fastlane is a tool for iOS and Android developers to automate tedious tasks like generating screenshots, dealing with provisioning profiles, and releasing your application."; - homepage = https://github.com/fastlane/fastlane; + homepage = "https://github.com/fastlane/fastlane"; license = licenses.mit; maintainers = with maintainers; [ peterromfeldhk diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix index bbec64c0aee9f..118457d408022 100644 --- a/pkgs/tools/admin/gixy/default.nix +++ b/pkgs/tools/admin/gixy/default.nix @@ -35,7 +35,7 @@ python.pkgs.buildPythonApplication rec { Gixy is a tool to analyze Nginx configuration. The main goal of Gixy is to prevent security misconfiguration and automate flaw detection. ''; - homepage = https://github.com/yandex/gixy; + homepage = "https://github.com/yandex/gixy"; license = licenses.mpl20; maintainers = [ maintainers.willibutz ]; platforms = platforms.linux; diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 37a27127bab0d..afaa237d342c7 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GTK VNC widget"; - homepage = https://wiki.gnome.org/Projects/gtk-vnc; + homepage = "https://wiki.gnome.org/Projects/gtk-vnc"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin offline ]; platforms = platforms.linux; diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix index e09cd2f52853c..8e79959ba3737 100644 --- a/pkgs/tools/admin/iamy/default.nix +++ b/pkgs/tools/admin/iamy/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "1fypc6yjnhlpk7zhb2lvah2ikh2zji9sll55rqjbr3i4j02h484z"; }; - modSha256 = "0akak573zvz3xg5d7vf0ch2mrmj1jkzcdc29v3kn43f7944c2wcl"; + vendorSha256 = "0c4g1zr0wl118g41hqri0vwvfin39yvgs214w3spw8ggjcj6bzph"; buildFlagsArray = [''-ldflags= -X main.Version=v${version} -s -w @@ -21,8 +21,8 @@ buildGoModule rec { meta = with stdenv.lib; { description = "A cli tool for importing and exporting AWS IAM configuration to YAML files"; - homepage = https://github.com/99designs/iamy; + homepage = "https://github.com/99designs/iamy"; license = licenses.mit; maintainers = with maintainers; [ suvash ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix index 7fc3da2f19c54..1c2d84836ebb0 100644 --- a/pkgs/tools/admin/intecture/agent.nix +++ b/pkgs/tools/admin/intecture/agent.nix @@ -22,7 +22,7 @@ buildRustPackage rec { meta = with lib; { description = "Authentication client/server for Intecture components"; - homepage = https://intecture.io; + homepage = "https://intecture.io"; license = licenses.mpl20; maintainers = [ maintainers.rushmorem ]; }; diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix index f60cbaf7b6e7f..0d7443d3225e3 100644 --- a/pkgs/tools/admin/intecture/auth.nix +++ b/pkgs/tools/admin/intecture/auth.nix @@ -22,7 +22,7 @@ buildRustPackage rec { meta = with lib; { description = "Authentication client/server for Intecture components"; - homepage = https://intecture.io; + homepage = "https://intecture.io"; license = licenses.mpl20; maintainers = [ maintainers.rushmorem ]; }; diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix index 73865bdea7872..5a841b9204021 100644 --- a/pkgs/tools/admin/intecture/cli.nix +++ b/pkgs/tools/admin/intecture/cli.nix @@ -25,7 +25,7 @@ buildRustPackage rec { meta = with lib; { description = "A developer friendly, language agnostic configuration management tool for server systems"; - homepage = https://intecture.io; + homepage = "https://intecture.io"; license = licenses.mpl20; maintainers = [ maintainers.rushmorem ]; }; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 72c61ceecaf26..025afe25e87a1 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "3.5.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "08mh2q426gmhcaz578lw08jbxfqb7qm37cd00ap937dymi1zs9qw"; + hash = "sha256-hjH1TBw6GHYNI9JSBOzdyEtJmp8NhlwNYydGZwsjAg0="; }; - modSha256 = "10n8pcbmzlnk63gzsjb1xnmjwxfhxsqx8ffpcbwdzq9fc5yvjiii"; + vendorSha256 = "14453iiya6algkympyvwm03qgjcwk79z8bbrij7qhnp52qfrbmrp"; subPackages = [ "cmd/lego" ]; buildFlagsArray = [ @@ -22,6 +22,6 @@ buildGoModule rec { description = "Let's Encrypt client and ACME library written in Go"; license = licenses.mit; homepage = "https://go-acme.github.io/lego/"; - maintainers = with maintainers; [ andrew-d ]; + maintainers = teams.acme.members; }; } diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index 4f6db4169a15b..de967578d5c9e 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "lexicon"; - version = "3.3.17"; + version = "3.3.22"; propagatedBuildInputs = with python3Packages; [ requests tldextract future cryptography pyyaml boto3 zeep xmltodict beautifulsoup4 dnspython pynamecheap softlayer transip localzone ]; @@ -19,12 +19,12 @@ python3Packages.buildPythonApplication rec { owner = "AnalogJ"; repo = pname; rev = "v${version}"; - sha256 = "1wrsw759am6yp2m9b34iv82m371df3ssp2vhdjr18ys3xk7dvj89"; + sha256 = "1adwqglh3lrx04y0f6slp1l97xzbsqgw0v5i4jll3a54aqyzfz0a"; }; meta = with lib; { description = "Manipulate DNS records on various DNS providers in a standardized way."; - homepage = https://github.com/AnalogJ/lexicon; + homepage = "https://github.com/AnalogJ/lexicon"; maintainers = with maintainers; [ flyfloh ]; license = licenses.mit; }; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index f85a61be4a8d7..f270576e684a1 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,23 +1,29 @@ -{ stdenv, pkgconfig, lxc, buildGoPackage, fetchurl +{ stdenv, hwdata, pkgconfig, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , squashfsTools, iproute, iptables, ebtables, libcap, libco-canonical, dqlite , raft-canonical, sqlite-replication, udev , writeShellScriptBin, apparmor-profiles, apparmor-parser , criu , bash +, installShellFiles }: buildGoPackage rec { pname = "lxd"; - version = "4.0.0"; + version = "4.1"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "00kydp6aysggng9a7m0q3zj3591yk6jgcibbqxx4ki20pd4vmqnb"; + sha256 = "0svzj57wwm43d2gnx0myr2p9pzjmkivwhgg0dww6zl169bx32liz"; }; + postPatch = '' + substituteInPlace shared/usbid/load.go \ + --replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids" + ''; + preBuild = '' # unpack vendor pushd go/src/github.com/lxc/lxd @@ -30,20 +36,19 @@ buildGoPackage rec { postInstall = '' # test binaries, code generation - rm $bin/bin/{deps,macaroon-identity,generate} + rm $out/bin/{deps,macaroon-identity,generate} - wrapProgram $bin/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [ + wrapProgram $out/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash criu (writeShellScriptBin "apparmor_parser" '' exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" '') ]} - mkdir -p "$bin/share/bash-completion/completions/" - cp -av go/src/github.com/lxc/lxd/scripts/bash/lxd-client "$bin/share/bash-completion/completions/lxc" + installShellCompletion --bash go/src/github.com/lxc/lxd/scripts/bash/lxd-client ''; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ installShellFiles pkgconfig makeWrapper ]; buildInputs = [ lxc acl libcap libco-canonical.dev dqlite.dev raft-canonical.dev sqlite-replication udev.dev ]; diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index 7414b83b16e7a..42c790d1adaa5 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -34,7 +34,7 @@ buildPythonApplication rec { Rich command-line interface for MySQL with auto-completion and syntax highlighting. ''; - homepage = http://mycli.net; + homepage = "http://mycli.net"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.jojosch ]; }; diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index 9e93b5f2f75e0..a4d201fd4c4cd 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -1,29 +1,35 @@ { stdenv, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "6.9"; - versionMinor = "2"; + versionMajor = "6.10"; + versionMinor = "12"; versionBuild_x86_64 = "1"; versionBuild_i686 = "1"; in stdenv.mkDerivation rec { pname = "nomachine-client"; version = "${versionMajor}.${versionMinor}"; - + src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"; - sha256 = "1z2pcfkzicjma4lxrj4qx43xyml993v7qyjd7k8xy8hw85fwnzii"; + urls = [ + "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz" + "https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz" + ]; + sha256 = "17yb377ry7i7cmkb72xmhyqkfggv1ygqlz55ymvmrs7psbh7ql01"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; - sha256 = "03421s0k91c02ga9k6bdvixw71brlgi13q82cinnfayg3fhb0rb6"; + urls = [ + "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz" + "https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz" + ]; + sha256 = "0k6dspmwdkm0zf0c2zqlqy0jya8qgsg90wwv9wa12fn4chp66gqg"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; - + postUnpack = '' mv $(find . -type f -name nxclient.tar.gz) . mv $(find . -type f -name nxplayer.tar.gz) . @@ -32,7 +38,7 @@ in tar xf nxplayer.tar.gz rm $(find . -maxdepth 1 -type f) ''; - + nativeBuildInputs = [ file makeWrapper autoPatchelfHook ]; buildInputs = [ jsoncpp libpulseaudio ]; @@ -50,7 +56,7 @@ in cp "$i"/* "$out/share/icons/hicolor/$(basename $i)/apps/" fi done - + mkdir $out/share/applications cp share/applnk/player/xdg/*.desktop $out/share/applications/ cp share/applnk/client/xdg-mime/*.desktop $out/share/applications/ @@ -62,7 +68,7 @@ in substituteInPlace "$i" --replace /usr/NX/bin $out/bin done ''; - + postFixup = '' makeWrapper $out/bin/nxplayer.bin $out/bin/nxplayer --set NX_SYSTEM $out/NX makeWrapper $out/bin/nxclient.bin $out/bin/nxclient --set NX_SYSTEM $out/NX @@ -71,20 +77,20 @@ in # have a DT_NEEDED entry for it. patchelf --add-needed libpulse.so.0 $out/NX/lib/libnxcau.so ''; - + dontBuild = true; dontStrip = true; meta = with stdenv.lib; { description = "NoMachine remote desktop client (nxplayer)"; - homepage = https://www.nomachine.com/; + homepage = "https://www.nomachine.com/"; license = { fullName = "NoMachine 6 End-User License Agreement"; - url = https://www.nomachine.com/licensing-6; + url = "https://www.nomachine.com/licensing-6"; free = false; }; maintainers = with maintainers; [ talyz ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } - + diff --git a/pkgs/tools/admin/oxidized/default.nix b/pkgs/tools/admin/oxidized/default.nix index a11906e80f040..01129c5afb107 100644 --- a/pkgs/tools/admin/oxidized/default.nix +++ b/pkgs/tools/admin/oxidized/default.nix @@ -12,7 +12,7 @@ bundlerApp { meta = with lib; { description = "Oxidized is a network device configuration backup tool. It's a RANCID replacement!"; - homepage = https://github.com/ytti/oxidized; + homepage = "https://github.com/ytti/oxidized"; license = licenses.asl20; maintainers = with maintainers; [ willibutz nicknovitski ]; platforms = platforms.linux; diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/tools/admin/pebble/default.nix index 5aa220fd89e68..4813f86ea641d 100644 --- a/pkgs/tools/admin/pebble/default.nix +++ b/pkgs/tools/admin/pebble/default.nix @@ -4,7 +4,7 @@ }: let - version = "v2.2.2"; + version = "v2.3.0"; pname = "pebble"; in buildGoPackage { inherit pname version; @@ -14,13 +14,13 @@ in buildGoPackage { owner = "letsencrypt"; repo = pname; rev = version; - sha256 = "10g6ivdxxp3632wk0gvmp75v9x668kchhmlczbsq8qnsc8sb8pwf"; + sha256 = "1piwzzfqsdx6s2niczzp4mf4r3qn9nfdgpn7882g52cmmm0vzks2"; }; meta = { - homepage = "https://github.com/letsencrypt/boulder"; + homepage = "https://github.com/letsencrypt/pebble"; description = "A miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA"; license = [ lib.licenses.mpl20 ]; - maintainers = [ ]; + maintainers = lib.teams.acme.members; }; } diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index db6f27a3010fa..5bfbb6d8c64d6 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.9.20"; + version = "0.10.3"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "00qqn8nwv791bs88n302hy67dpas5hcacnkakn7law567klnzxfz"; + sha256 = "0lg4v32jx0fxcjz6cj6cxxlg7rhj75k4p75izpkk4l11xpxqhgjm"; }; - cargoSha256 = "09ib1nlqhzq3mc5wc16mgqbyr652asrwdpbwaax54fm1gd334prl"; + cargoSha256 = "05qqy6l28ihn7hykkkh1x7z3q58cdrwv76fc22xjcg20985ac2nx"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { description = "A modern replacement for ps written in Rust"; homepage = "https://github.com/dalance/procs"; license = licenses.mit; - maintainers = with maintainers; [ dalance filalex77 ]; + maintainers = with maintainers; [ dalance filalex77 ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 8a8888b2aa0a2..cad7b97fd37d0 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,50 +1,50 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "1.12.0"; + version = "2.1.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v1.12.0-linux-x64.tar.gz"; - sha256 = "14j8f43h920k62h8bhywapphhfbj7whb9l6pjmyigld6x2jpr4mc"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.1.0-linux-x64.tar.gz"; + sha256 = "0d9bmljgf62dhj1z8h71c2pj2cbvf4ghhlbbbh2jcg55i33ks8ih"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v1.5.0-linux-amd64.tar.gz"; - sha256 = "1vdd5ghlsxqrfd1nrdj7hsl745k8myhxmd3gh1fq6ksa3apnh1ca"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.1.0-linux-amd64.tar.gz"; + sha256 = "1kf43j1b4wp39sny92dnsy1myn6wb2msli1ydds3yza81srgcfnh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v2.8.0-linux-amd64.tar.gz"; - sha256 = "1q34kv41dbmz45s1sg0rqdxp1qlfq0ii0hy9p95lkzd7qj19qrvv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.3.0-linux-amd64.tar.gz"; + sha256 = "17anj9pc90hhiknyf2yab7dzvcfbjn1803bl6ld26r701w3h1jqx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v1.5.6-linux-amd64.tar.gz"; - sha256 = "1g5zgkqnzjqfri61p8876czn0ab2n3mjqf1acdyn8kg5q52sd8ix"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.0.0-linux-amd64.tar.gz"; + sha256 = "0526a4ll1q9v566i313223pnx2pa3qkcjp01l49h5jmgn8qpw1fn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v1.24.0-linux-amd64.tar.gz"; - sha256 = "1fwnad5p1v4bigcr2icgzmxdn1b3x0j8c361546pqzk67vskn9fg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.2.0-linux-amd64.tar.gz"; + sha256 = "14ya2sax2yyza3zbxp5a638y81pcbi26hv8k9y8agnjn82bgx8dy"; } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v1.12.0-darwin-x64.tar.gz"; - sha256 = "1bg6vnxic8fzycgv8q7m1bf8pk2bxvcn0b6lwy7aa2f3kzw70q46"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.1.0-darwin-x64.tar.gz"; + sha256 = "1d7w32wac2sc0z5i893h66fgyivf4x3mqki649vxkxc3081kpzi9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v1.5.0-darwin-amd64.tar.gz"; - sha256 = "1skvfg8s8f81l4yfgm49jca38cx96khk3f9rpq4ywa3r3f450kni"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.1.0-darwin-amd64.tar.gz"; + sha256 = "1smy1y2pnxnvw8zcs31q9xs80hyqhzawfzcwkkfnyamdrgasxqsi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v2.8.0-darwin-amd64.tar.gz"; - sha256 = "0f0gnbiv2gbam5n3ng9j5rbrml0jfv9k402vd4j9ryfkly4grpa9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "03idn1livy9w3izi7qrdgnigx3ayrp8qp2q3m5ik9ffvv2g11962"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v1.5.6-darwin-amd64.tar.gz"; - sha256 = "1l610a0bvwrsbqv4s00ghbplwnk11q3c0n3py0l7w0a2mpl8izzd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.0.0-darwin-amd64.tar.gz"; + sha256 = "06m6ldqa82w82kjz7pxi0pbk9x02pzsy4x0in8fcq9gsh1p0gka9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v1.24.0-darwin-amd64.tar.gz"; - sha256 = "17qq7w2wk0803y0if7dn3gnxxnfqnb4n2gcil3zgbc4yhqz4py0y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.2.0-darwin-amd64.tar.gz"; + sha256 = "0mymvn2355bq9ykvnww0si0imikzxp7mp1yh2scn8kjn2gs4nhgk"; } ]; }; diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index d6fc6e8a837aa..c0547f0c0c893 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -17,13 +17,14 @@ in stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin cp * $out/bin/ + '' + optionalString stdenv.isLinux '' wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" ''; - buildInputs = optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ]; + nativeBuildInputs = optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ]; meta = { - homepage = https://pulumi.io/; + homepage = "https://pulumi.io/"; description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive"; license = with licenses; [ asl20 ]; platforms = builtins.attrNames data.pulumiPkgs; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index 35494235d36bc..26a48469841c7 100644 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash -VERSION="1.12.0" +VERSION="2.1.0" declare -A plugins plugins=( - ["aws"]="1.24.0" - ["gcp"]="2.8.0" - ["random"]="1.5.0" - ["kubernetes"]="1.5.6" + ["aws"]="2.2.0" + ["gcp"]="3.3.0" + ["random"]="2.1.0" + ["kubernetes"]="2.0.0" ) function genMainSrc() { diff --git a/pkgs/tools/admin/s3bro/default.nix b/pkgs/tools/admin/s3bro/default.nix index 9f383a8638d31..154b4aae96656 100644 --- a/pkgs/tools/admin/s3bro/default.nix +++ b/pkgs/tools/admin/s3bro/default.nix @@ -16,8 +16,8 @@ python3Packages.buildPythonPackage rec { meta = with stdenv.lib; { description = "A handy s3 cli tool"; - homepage = https://github.com/rsavordelli/s3bro; + homepage = "https://github.com/rsavordelli/s3bro"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index c94686c93c162..f3c375a99660c 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -1,21 +1,38 @@ -{ - stdenv, pythonPackages, openssl, - +{ lib +, python3 +, openssl # Many Salt modules require various Python modules to be installed, # passing them in this array enables Salt to find them. - extraInputs ? [] +, extraInputs ? [] }: +let + + py = python3.override { + packageOverrides = self: super: { + # Can be unpinned once https://github.com/saltstack/salt/issues/56007 is resolved + msgpack = super.msgpack.overridePythonAttrs ( + oldAttrs: rec { + version = "0.6.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0c0q3vx0x137567msgs5dnizghnr059qi5kfqigxbz26jf2jyg7a"; + }; + } + ); + }; + }; -pythonPackages.buildPythonApplication rec { +in +py.pkgs.buildPythonApplication rec { pname = "salt"; - version = "2019.2.0"; + version = "3000.3"; - src = pythonPackages.fetchPypi { + src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "1kgn3lway0zwwysyzpphv05j4xgxk92dk4rv1vybr2527wmvp5an"; + sha256 = "19yfjhidx93rl9s03lvrfz7kp0xxigyv4d3zb9792zb9bsc4kjpw"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with py.pkgs; [ jinja2 markupsafe msgpack @@ -24,8 +41,6 @@ pythonPackages.buildPythonApplication rec { pyzmq requests tornado_4 - ] ++ stdenv.lib.optionals (!pythonPackages.isPy3k) [ - futures ] ++ extraInputs; patches = [ ./fix-libcrypto-loading.patch ]; @@ -40,8 +55,8 @@ pythonPackages.buildPythonApplication rec { # as is it rather long. doCheck = false; - meta = with stdenv.lib; { - homepage = https://saltstack.com/; + meta = with lib; { + homepage = "https://saltstack.com/"; description = "Portable, distributed, remote execution and configuration management system"; maintainers = with maintainers; [ aneeshusa ]; license = licenses.asl20; diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix index 4bf24e3092d74..e2cfa806f95b1 100644 --- a/pkgs/tools/admin/salt/pepper/default.nix +++ b/pkgs/tools/admin/salt/pepper/default.nix @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { meta = with lib; { description = "A CLI front-end to a running salt-api system"; - homepage = https://github.com/saltstack/pepper; + homepage = "https://github.com/saltstack/pepper"; maintainers = [ maintainers.pierrer ]; license = licenses.asl20; }; diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 3365d87bba4a1..f9b608ebc4c66 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec{ pname = "scaleway-cli"; - version = "1.17"; + version = "1.20"; goPackagePath = "github.com/scaleway/scaleway-cli"; @@ -10,12 +10,12 @@ buildGoPackage rec{ owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "0v50wk6q8537880whi6w83dia9y934v0s2xr1z52cn3mrsjghsnd"; + sha256 = "14likzp3hl04nq9nmpmh9m5zqjyspy5cyk20dkh03c1nhkd4vcnx"; }; meta = with stdenv.lib; { description = "Interact with Scaleway API from the command line"; - homepage = https://github.com/scaleway/scaleway-cli; + homepage = "https://github.com/scaleway/scaleway-cli"; license = licenses.mit; maintainers = with maintainers; [ nickhu ]; platforms = platforms.all; diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index f6f5923eb4abe..b082f61f875d6 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { owner = "simple-evcorr"; repo = "sec"; rev = meta.version; - sha256 = "025cz3mr5yrdgs0i3h8v2znhvjkyh78kba1rzvl03ns2b1c49168"; + sha256 = "0ryic5ilj1i5l41440i0ss6j3yv796fz3gr0qij5pqyd1z21md83"; }; buildInputs = [ perl ]; @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://simple-evcorr.github.io; + homepage = "https://simple-evcorr.github.io"; license = stdenv.lib.licenses.gpl2; description = "Simple Event Correlator"; maintainers = [ stdenv.lib.maintainers.tv ]; platforms = stdenv.lib.platforms.all; - version = "2.8.2"; + version = "2.8.3"; }; } diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index eaefba3654503..6ff547ab5322e 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ acme setuptools_scm josepy idna ]; meta = with stdenv.lib; { - homepage = https://github.com/zenhack/simp_le; + homepage = "https://github.com/zenhack/simp_le"; description = "Simple Let's Encrypt client"; license = licenses.gpl3; maintainers = with maintainers; [ gebner makefu ]; diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/pkgs/tools/admin/ssl-cert-check/default.nix index e6a83c397c572..b94d77bdf7061 100644 --- a/pkgs/tools/admin/ssl-cert-check/default.nix +++ b/pkgs/tools/admin/ssl-cert-check/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "a Bourne shell script that can be used to report on expiring SSL certificates"; - homepage = https://github.com/Matty9191/ssl-cert-check; + homepage = "https://github.com/Matty9191/ssl-cert-check"; license = licenses.gpl2; maintainers = [ maintainers.ryantm ]; platforms = platforms.linux; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 9f105a7d5d552..0bb291d797bae 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { rm -f $out/lib/xorg/protocol.txt wrapProgram $out/bin/vncserver \ - --prefix PATH : ${stdenv.lib.makeBinPath (with xorg; [ xterm twm xsetroot ]) } + --prefix PATH : ${stdenv.lib.makeBinPath (with xorg; [ xterm twm xsetroot xauth ]) } ''; buildInputs = with xorg; [ diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index 1a65c31102e98..7dc416c8efda5 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "tightvnc-1.3.10"; src = fetchurl { - url = mirror://sourceforge/vnc-tight/tightvnc-1.3.10_unixsrc.tar.bz2; + url = "mirror://sourceforge/vnc-tight/tightvnc-1.3.10_unixsrc.tar.bz2"; sha256 = "f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d"; }; @@ -69,7 +69,7 @@ stdenv.mkDerivation { meta = { license = stdenv.lib.licenses.gpl2Plus; - homepage = http://vnc-tight.sourceforge.net/; + homepage = "http://vnc-tight.sourceforge.net/"; description = "Improved version of VNC"; longDescription = '' diff --git a/pkgs/tools/admin/virtscreen/default.nix b/pkgs/tools/admin/virtscreen/default.nix index 73a81fcff8750..3c5fb64f7224e 100644 --- a/pkgs/tools/admin/virtscreen/default.nix +++ b/pkgs/tools/admin/virtscreen/default.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Make your iPad/tablet/computer as a secondary monitor on Linux"; - homepage = https://github.com/kbumsik/VirtScreen; + homepage = "https://github.com/kbumsik/VirtScreen"; license = licenses.gpl3; maintainers = with maintainers; [ borisbabic ]; }; diff --git a/pkgs/tools/admin/vncdo/default.nix b/pkgs/tools/admin/vncdo/default.nix index 3dd7a45aa2b7c..5ca633a944b24 100644 --- a/pkgs/tools/admin/vncdo/default.nix +++ b/pkgs/tools/admin/vncdo/default.nix @@ -23,7 +23,7 @@ python2Packages.buildPythonPackage { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/sibson/vncdotool; + homepage = "https://github.com/sibson/vncdotool"; description = "A command line VNC client and python library"; license = licenses.mit; maintainers = with maintainers; [ elitak ]; diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix index 8d1e28fed296f..3b4eb6a5ea560 100644 --- a/pkgs/tools/archivers/afio/default.nix +++ b/pkgs/tools/archivers/afio/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl } : +{ stdenv, fetchFromGitHub } : stdenv.mkDerivation rec { version = "2.5.2"; pname = "afio"; - src = fetchurl { - url = "http://members.chello.nl/~k.holtman/${pname}-${version}.tgz"; - sha256 = "1fa29wlqv76hzf8bxp1qpza1r23pm2f3m7rcf0jpwm6z150s2k66"; + src = fetchFromGitHub { + owner = "kholtman"; + repo = "afio"; + rev = "v${version}"; + sha256 = "1vbxl66r5rp5a1qssjrkfsjqjjgld1cq57c871gd0m4qiq9rmcfy"; }; /* @@ -18,7 +20,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; meta = { - homepage = http://members.chello.nl/~k.holtman/afio.html; + homepage = "https://github.com/kholtman/afio"; description = "Fault tolerant cpio archiver targeting backups"; platforms = stdenv.lib.platforms.all; /* diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix index 64a606a4cb502..0d24ead456a71 100644 --- a/pkgs/tools/archivers/atool/default.nix +++ b/pkgs/tools/archivers/atool/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "atool-0.39.0"; src = fetchurl { - url = mirror://savannah/atool/atool-0.39.0.tar.gz; + url = "mirror://savannah/atool/atool-0.39.0.tar.gz"; sha256 = "aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b"; }; @@ -11,7 +11,7 @@ stdenv.mkDerivation { configureScript = "${bash}/bin/bash configure"; meta = { - homepage = https://www.nongnu.org/atool; + homepage = "https://www.nongnu.org/atool"; description = "Archive command line helper"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix index d8a874d0b2e97..14c4ede50041e 100644 --- a/pkgs/tools/archivers/cabextract/default.nix +++ b/pkgs/tools/archivers/cabextract/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.cabextract.org.uk/; + homepage = "https://www.cabextract.org.uk/"; description = "Free Software for extracting Microsoft cabinet files"; platforms = platforms.all; license = licenses.gpl3; diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index 3f6b3ba4598c9..a196ddcaa3062 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/cpio/; + homepage = "https://www.gnu.org/software/cpio/"; description = "A program to create or extract from cpio archives"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 57a8a8e973806..e0eb11aa9a6f7 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "FUSE Compressed ROM filesystem with lzma"; - homepage = https://bisqwit.iki.fi/source/cromfs.html; + homepage = "https://bisqwit.iki.fi/source/cromfs.html"; license = licenses.gpl3; maintainers = [ maintainers.viric ]; platforms = platforms.linux; diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/tools/archivers/fsarchiver/default.nix index 3f958f7f958d5..31341e417875b 100644 --- a/pkgs/tools/archivers/fsarchiver/default.nix +++ b/pkgs/tools/archivers/fsarchiver/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation { checksummed in the archive in order to protect the data. If the archive is corrupt, you just loose the current file, not the whole archive. ''; - homepage = http://www.fsarchiver.org/; + homepage = "http://www.fsarchiver.org/"; license = licenses.lgpl2; maintainers = [ maintainers.etu ]; platforms = platforms.linux; diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index caf507670f4f7..749f795c449a1 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { doInstallCheck = false; # fails meta = { - homepage = https://www.gnu.org/software/tar/; + homepage = "https://www.gnu.org/software/tar/"; description = "GNU implementation of the `tar' archiver"; longDescription = '' diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index 6a8c8c7127479..5dab195014565 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool to unpack installers created by Inno Setup"; - homepage = https://constexpr.org/innoextract/; + homepage = "https://constexpr.org/innoextract/"; license = licenses.zlib; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/tools/archivers/ndstool/default.nix b/pkgs/tools/archivers/ndstool/default.nix index 7af30e313f45a..9a6350a8df161 100644 --- a/pkgs/tools/archivers/ndstool/default.nix +++ b/pkgs/tools/archivers/ndstool/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = { - homepage = https://github.com/devkitPro/ndstool; + homepage = "https://github.com/devkitPro/ndstool"; description = "A tool to unpack and repack nds rom"; maintainers = [ stdenv.lib.maintainers.marius851000 ]; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 465bc474a9e52..d6ad699eaa8df 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch, lib, enableUnfree ? false }: stdenv.mkDerivation rec { pname = "p7zip"; @@ -12,6 +12,16 @@ stdenv.mkDerivation rec { patches = [ ./12-CVE-2016-9296.patch ./13-CVE-2017-17969.patch + (fetchpatch { + name = "3-CVE-2018-5996.patch"; + url = "https://raw.githubusercontent.com/termux/termux-packages/master/packages/p7zip/3-CVE-2018-5996.patch"; + sha256 = "1zivvkazmza0653i498ccp3zbpbpc7dvxl3zxwllbx41b6n589yp"; + }) + (fetchpatch { + name = "4-CVE-2018-10115.patch"; + url = "https://raw.githubusercontent.com/termux/termux-packages/master/packages/p7zip/4-CVE-2018-10115.patch"; + sha256 = "1cr7q8gnrk9yp6dcvxaqi1yhdbgp964nkv65ls41mw1kdfm44zn6"; + }) ]; # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional @@ -24,6 +34,11 @@ stdenv.mkDerivation rec { substituteInPlace makefile.machine \ --replace 'CC=gcc' 'CC=${stdenv.cc.targetPrefix}gcc' \ --replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++' + '' + lib.optionalString (!enableUnfree) '' + # Remove non-free RAR source code + # (see DOC/License.txt, https://fedoraproject.org/wiki/Licensing:Unrar) + rm -r CPP/7zip/Compress/Rar* + find . -name makefile'*' -exec sed -i '/Rar/d' {} + ''; preConfigure = '' @@ -40,11 +55,16 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = { - homepage = http://p7zip.sourceforge.net/; + homepage = "http://p7zip.sourceforge.net/"; description = "A port of the 7-zip archiver"; - # license = stdenv.lib.licenses.lgpl21Plus; + "unRAR restriction" platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.raskin ]; - license = stdenv.lib.licenses.lgpl2Plus; + knownVulnerabilities = [ + # p7zip is abandoned, according to this thread on its forums: + # https://sourceforge.net/p/p7zip/discussion/383043/thread/fa143cf2/#1817 + "p7zip is abandoned and may not receive important security fixes" + ]; + # RAR code is under non-free UnRAR license, but we remove it + license = if enableUnfree then lib.licenses.unfree else lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/tools/archivers/pxattr/default.nix b/pkgs/tools/archivers/pxattr/default.nix index b507b60287c9d..74ad0669d6938 100644 --- a/pkgs/tools/archivers/pxattr/default.nix +++ b/pkgs/tools/archivers/pxattr/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.lesbonscomptes.com/pxattr/index.html; + homepage = "https://www.lesbonscomptes.com/pxattr/index.html"; description = "Provides a single interface to extended file attributes"; maintainers = [ stdenv.lib.maintainers.vrthra ]; license = [ stdenv.lib.licenses.mit ]; diff --git a/pkgs/tools/archivers/s-tar/default.nix b/pkgs/tools/archivers/s-tar/default.nix index 48e5cc6c43618..30ff2bc36a25e 100644 --- a/pkgs/tools/archivers/s-tar/default.nix +++ b/pkgs/tools/archivers/s-tar/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { The way star acts may be modified by additional options. Note that unpacking tar archives may be a security risk because star may overwrite existing files. ''; - homepage = http://cdrtools.sourceforge.net/private/star.html; + homepage = "http://cdrtools.sourceforge.net/private/star.html"; license = stdenv.lib.licenses.cddl; maintainers = [ stdenv.lib.maintainers.wucke13 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index b4fc2377f0e4f..aefe4f87eb4a5 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { by a copy of the shell. unshar may also process files containing concatenated shell archives. ''; - homepage = https://www.gnu.org/software/sharutils/; + homepage = "https://www.gnu.org/software/sharutils/"; license = licenses.gpl3Plus; maintainers = []; platforms = platforms.all; diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index 1104548f77f87..9fdbada9ab8d5 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -1,52 +1,54 @@ -{ stdenv, fetchurl, gnustep, unzip, bzip2, zlib, icu, openssl }: +{ stdenv, fetchFromGitHub, installShellFiles, gnustep, bzip2, zlib, icu, openssl, wavpack }: -let +stdenv.mkDerivation rec { pname = "unar"; + version = "1.10.7"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "1.10.1"; - - src = fetchurl { - url = "http://unarchiver.c3.cx/downloads/${pname}${version}_src.zip"; - sha256 = "0aq9zlar5vzr5qxphws8dm7ax60bsfsw77f4ciwa5dq5lla715j0"; + src = fetchFromGitHub { + owner = "MacPaw"; + # the unar repo contains a shallow clone of both XADMaster and universal-detector + repo = "unar"; + rev = "v${version}"; + sha256 = "0p846q1l66k3rnd512sncp26zpv411b8ahi145sghfcsz9w8abc4"; }; - buildInputs = [ gnustep.base bzip2 icu openssl zlib ]; - - nativeBuildInputs = [ gnustep.make unzip ]; - - enableParallelBuilding = true; - postPatch = '' for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do substituteInPlace $f \ - --replace "CC = gcc" "CC=cc" \ - --replace "CXX = g++" "CXX=c++" \ - --replace "OBJCC = gcc" "OBJCC=cc" \ - --replace "OBJCXX = g++" "OBJCXX=c++" + --replace "= gcc" "=cc" \ + --replace "= g++" "=c++" done + + # we need to build inside this directory as well, so we have to make it writeable + chmod +w ../UniversalDetector -R ''; + buildInputs = [ gnustep.base bzip2 icu openssl wavpack zlib ]; + + nativeBuildInputs = [ gnustep.make installShellFiles ]; + + enableParallelBuilding = true; + + dontConfigure = true; + makefile = "Makefile.linux"; - sourceRoot = "./The Unarchiver/XADMaster"; + sourceRoot = "./source/XADMaster"; installPhase = '' runHook preInstall - install -Dm755 -t $out/bin lsar unar - install -Dm644 -t $out/share/man/man1 ../Extra/{lsar,unar}.1 - - mkdir -p $out/etc/bash_completion.d - cp ../Extra/lsar.bash_completion $out/etc/bash_completion.d/lsar - cp ../Extra/unar.bash_completion $out/etc/bash_completion.d/unar + install -Dm555 -t $out/bin lsar unar + for f in lsar unar; do + installManPage ./Extra/$f.? + installShellCompletion --bash --name $f ./Extra/$f.bash_completion + done runHook postInstall ''; meta = with stdenv.lib; { - homepage = http://unarchiver.c3.cx/unarchiver; + homepage = "https://theunarchiver.com"; description = "An archive unpacker program"; longDescription = '' The Unarchiver is an archive unpacker program with support for the popular \ @@ -55,7 +57,8 @@ in stdenv.mkDerivation rec { Compact Pro, Packit, cpio, compress (.Z), ARJ, ARC, PAK, ACE, ZOO, LZH, \ ADF, DMS, LZX, PowerPacker, LBR, Squeeze, Crunch, and other old formats. ''; - license = with licenses; [ lgpl21Plus ]; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; }; } diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/tools/archivers/undmg/default.nix index 72be49d97927a..79b861de485e0 100644 --- a/pkgs/tools/archivers/undmg/default.nix +++ b/pkgs/tools/archivers/undmg/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/matthewbauer/undmg; + homepage = "https://github.com/matthewbauer/undmg"; description = "Extract a DMG file"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix index 82e83a8c6a381..afe00972141cc 100644 --- a/pkgs/tools/archivers/unp/default.nix +++ b/pkgs/tools/archivers/unp/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Command line tool for unpacking archives easily"; - homepage = https://packages.qa.debian.org/u/unp.html; + homepage = "https://packages.qa.debian.org/u/unp.html"; license = with licenses; [ gpl2 ]; maintainers = [ maintainers.timor ]; platforms = platforms.all; diff --git a/pkgs/tools/archivers/unshield/default.nix b/pkgs/tools/archivers/unshield/default.nix index cfab2443032bd..dbcb2b24f100b 100644 --- a/pkgs/tools/archivers/unshield/default.nix +++ b/pkgs/tools/archivers/unshield/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool and library to extract CAB files from InstallShield installers"; - homepage = https://github.com/twogood/unshield; + homepage = "https://github.com/twogood/unshield"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index b8f649fbdcbb9..b3b150637d601 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "unzip-6.0"; src = fetchurl { - url = mirror://sourceforge/infozip/unzip60.tar.gz; + url = "mirror://sourceforge/infozip/unzip60.tar.gz"; sha256 = "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83"; }; @@ -72,7 +72,7 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; meta = { - homepage = http://www.info-zip.org; + homepage = "http://www.info-zip.org"; description = "An extraction utility for archives compressed in .zip format"; license = stdenv.lib.licenses.free; # http://www.info-zip.org/license.html platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix index 9d58bf5c2f897..da01602cca430 100644 --- a/pkgs/tools/archivers/wimlib/default.nix +++ b/pkgs/tools/archivers/wimlib/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wimlib.net; + homepage = "https://wimlib.net"; description = "A library and program to extract, create, and modify WIM files"; platforms = platforms.unix; maintainers = with maintainers; [ andir ]; diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index 1a05c1ba2699d..fd53cd9b54bb1 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; - homepage = https://github.com/ib/xarchiver; + homepage = "https://github.com/ib/xarchiver"; maintainers = [ stdenv.lib.maintainers.domenkozar ]; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 09ba6510707b1..173f48121090c 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation { src = fetchurl { urls = [ - ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz - https://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz + "ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz" + "https://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz" ]; sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Compressor/archiver for creating and modifying zipfiles"; - homepage = http://www.info-zip.org; + homepage = "http://www.info-zip.org"; license = licenses.bsdOriginal; platforms = platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 09c4e914bd884..dbdcdf5cada8c 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Incremental journaling backup utility and archiver"; - homepage = http://mattmahoney.net/dc/zpaq.html; + homepage = "http://mattmahoney.net/dc/zpaq.html"; license = licenses.gpl3Plus ; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index 4a824050c9fd9..302654f771543 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype pango ]; meta = with stdenv.lib; { - homepage = http://moinejf.free.fr/; + homepage = "http://moinejf.free.fr/"; license = licenses.gpl3; description = "A command line program which converts ABC to music sheet in PostScript or SVG format"; platforms = platforms.unix; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index d7d1adbdf4e47..0ccfaa081c9ac 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://abc.sourceforge.net/abcMIDI/"; - downloadPage = https://ifdo.ca/~seymour/runabc/top.html; + downloadPage = "https://ifdo.ca/~seymour/runabc/top.html"; license = licenses.gpl2Plus; description = "Utilities for converting between abc and MIDI"; platforms = platforms.unix; diff --git a/pkgs/tools/audio/accuraterip-checksum/default.nix b/pkgs/tools/audio/accuraterip-checksum/default.nix index 4590a0dfbc30a..efd4402564706 100644 --- a/pkgs/tools/audio/accuraterip-checksum/default.nix +++ b/pkgs/tools/audio/accuraterip-checksum/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Program for computing the AccurateRip checksum of singletrack WAV files"; - homepage = https://github.com/leo-bogert/accuraterip-checksum; + homepage = "https://github.com/leo-bogert/accuraterip-checksum"; license = licenses.gpl3; maintainers = with maintainers; [ ]; platforms = with platforms; linux; diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index 7b92b973df4c6..e2824bc07b664 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://acoustid.org/fingerprinter; + homepage = "https://acoustid.org/fingerprinter"; description = "Audio fingerprinting tool using chromaprint"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix index 75d8975ab32c8..fdad7dd89844b 100644 --- a/pkgs/tools/audio/beets/alternatives-plugin.nix +++ b/pkgs/tools/audio/beets/alternatives-plugin.nix @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Beets plugin to manage external files"; - homepage = https://github.com/geigerzaehler/beets-alternatives; + homepage = "https://github.com/geigerzaehler/beets-alternatives"; maintainers = [ stdenv.lib.maintainers.aszlig ]; license = stdenv.lib.licenses.mit; }; diff --git a/pkgs/tools/audio/beets/check-plugin.nix b/pkgs/tools/audio/beets/check-plugin.nix index 49ee97ead06a0..241dcdad45213 100644 --- a/pkgs/tools/audio/beets/check-plugin.nix +++ b/pkgs/tools/audio/beets/check-plugin.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Beets plugin to Verify and store checksums in your library"; - homepage = https://github.com/geigerzaehler/beets-check; + homepage = "https://github.com/geigerzaehler/beets-check"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; }; diff --git a/pkgs/tools/audio/beets/copyartifacts-plugin.nix b/pkgs/tools/audio/beets/copyartifacts-plugin.nix index fac37962f3cf0..9432cb9bd0b95 100644 --- a/pkgs/tools/audio/beets/copyartifacts-plugin.nix +++ b/pkgs/tools/audio/beets/copyartifacts-plugin.nix @@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication { meta = { description = "Beets plugin to move non-music files during the import process"; - homepage = https://github.com/sbarakat/beets-copyartifacts; + homepage = "https://github.com/sbarakat/beets-copyartifacts"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix index c5f7bcd5a71d8..89b93b02865f9 100644 --- a/pkgs/tools/audio/darkice/default.nix +++ b/pkgs/tools/audio/darkice/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://darkice.org/; + homepage = "http://darkice.org/"; description = "Live audio streamer"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ ikervagyok fpletz ]; diff --git a/pkgs/tools/audio/dir2opus/default.nix b/pkgs/tools/audio/dir2opus/default.nix index d6c988ef0bedc..8720065470313 100644 --- a/pkgs/tools/audio/dir2opus/default.nix +++ b/pkgs/tools/audio/dir2opus/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { postFixup = "wrapPythonPrograms"; meta = with stdenv.lib; { - homepage = https://github.com/ehmry/dir2opus; + homepage = "https://github.com/ehmry/dir2opus"; maintainers = [ maintainers.ehmry ]; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/tools/audio/ezstream/default.nix b/pkgs/tools/audio/ezstream/default.nix index fbf90d2211c4b..02a6e9d37f371 100644 --- a/pkgs/tools/audio/ezstream/default.nix +++ b/pkgs/tools/audio/ezstream/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { from standard input without reencoding and thus requires only very little CPU resources. ''; - homepage = http://icecast.org/ezstream/; + homepage = "http://icecast.org/ezstream/"; license = licenses.gpl2; maintainers = [ maintainers.barrucadu ]; platforms = platforms.all; diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix index 2acca1510400a..41490381487e1 100644 --- a/pkgs/tools/audio/glyr/default.nix +++ b/pkgs/tools/audio/glyr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.lgpl3; description = "A music related metadata searchengine"; - homepage = https://github.com/sahib/glyr; + homepage = "https://github.com/sahib/glyr"; maintainers = [ maintainers.sternenseemann ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 9029eb38b06fe..5190699be087a 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "A simple and lightweight volume icon that sits in your system tray"; - homepage = https://github.com/Unia/gvolicon; + homepage = "https://github.com/Unia/gvolicon"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bennofs ]; diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index f69e60117ce35..2aa01dfe073ff 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Swiss-army knife for multimedia streaming"; - homepage = https://www.liquidsoap.info/; + homepage = "https://www.liquidsoap.info/"; maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; platforms = ocamlPackages.ocaml.meta.platforms or []; diff --git a/pkgs/tools/audio/midicsv/default.nix b/pkgs/tools/audio/midicsv/default.nix index 10f78807a73e0..e5f3f6124b9b2 100644 --- a/pkgs/tools/audio/midicsv/default.nix +++ b/pkgs/tools/audio/midicsv/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Losslessly translate MIDI to CSV and back"; - homepage = http://www.fourmilab.ch/webtools/midicsv/; + homepage = "http://www.fourmilab.ch/webtools/midicsv/"; license = licenses.publicDomain; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; diff --git a/pkgs/tools/audio/mp3cat/default.nix b/pkgs/tools/audio/mp3cat/default.nix index acd11bc75e6f7..e7a1d004a0192 100644 --- a/pkgs/tools/audio/mp3cat/default.nix +++ b/pkgs/tools/audio/mp3cat/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { only outputs MP3 frames with valid headers, even if there is extra garbage in its input stream ''; - homepage = https://github.com/tomclegg/mp3cat; + homepage = "https://github.com/tomclegg/mp3cat"; license = licenses.gpl2; maintainers = [ maintainers.omnipotententity ]; platforms = platforms.all; diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix index 37766a9072194..3c736258cbb6e 100644 --- a/pkgs/tools/audio/mpd-mpris/default.nix +++ b/pkgs/tools/audio/mpd-mpris/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1cr5j2z2ynj1hwkjzi5amcg59vmgazsci41v6vpsj119g7psjmzm"; }; - modSha256 = "1a95kfy8w952269x4llbl0afyxr5fjkg30mxsn81zdh5wr8gabwh"; + vendorSha256 = "108yjymp64iqx1b2wqjbkmbm2w199wq46g7hrmqhcziv6f4aqljp"; subPackages = [ "cmd/${pname}" ]; @@ -29,5 +29,4 @@ buildGoModule rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux; }; -} - +} \ No newline at end of file diff --git a/pkgs/tools/audio/mpdas/default.nix b/pkgs/tools/audio/mpdas/default.nix index bfb4f81c8166e..507e62b0dae97 100644 --- a/pkgs/tools/audio/mpdas/default.nix +++ b/pkgs/tools/audio/mpdas/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Music Player Daemon AudioScrobbler"; - homepage = https://50hz.ws/mpdas/; + homepage = "https://50hz.ws/mpdas/"; license = licenses.bsd3; maintainers = [ maintainers.taketwo ]; platforms = platforms.all; diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix index a791a81db3517..c083c60a96253 100644 --- a/pkgs/tools/audio/mpdcron/default.nix +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A cron like daemon for mpd"; - homepage = http://alip.github.io/mpdcron/; + homepage = "http://alip.github.io/mpdcron/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ lovek323 manveru ]; diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index 0dbdcd7d25a38..029dcd127f130 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "MPRIS 2 support for mpd"; - homepage = https://github.com/eonpatapon/mpDris2/; + homepage = "https://github.com/eonpatapon/mpDris2/"; license = licenses.gpl3; maintainers = with maintainers; []; platforms = platforms.unix; diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 782ea314359d9..8b0580ba98c4e 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { sha256 = "0xx1bm9kimgq11a359ikabdndqg5q54pn1d1dyyjnrj0s41168fk"; }; + patches = [ + # https://github.com/christophgysin/pasystray/issues/90#issuecomment-306190701 + ./fix-wayland.patch + ]; + nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; buildInputs = [ gnome3.adwaita-icon-theme @@ -23,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PulseAudio system tray"; - homepage = https://github.com/christophgysin/pasystray; + homepage = "https://github.com/christophgysin/pasystray"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ exlevan kamilchm ]; platforms = platforms.linux; diff --git a/pkgs/tools/audio/pasystray/fix-wayland.patch b/pkgs/tools/audio/pasystray/fix-wayland.patch new file mode 100644 index 0000000000000..17c4e2e6d6589 --- /dev/null +++ b/pkgs/tools/audio/pasystray/fix-wayland.patch @@ -0,0 +1,34 @@ +--- a/src/x11-property.c ++++ b/src/x11-property.c +@@ -43,11 +43,15 @@ static Window window; + void x11_property_init() + { + display = gdk_x11_get_default_xdisplay(); ++ if (!GDK_IS_X11_DISPLAY(display)) return; ++ Screen* scr = ScreenOfDisplay(display, 0); ++ + window = RootWindow(display, 0); + } + + void x11_property_set(const char* key, const char* value) + { ++ if (!GDK_IS_X11_DISPLAY(display)) return; + g_debug("[x11-property] setting '%s' to '%s'", key, value); + + Atom atom = XInternAtom(display, key, False); +@@ -57,6 +61,7 @@ void x11_property_set(const char* key, c + + void x11_property_del(const char* key) + { ++ if (!GDK_IS_X11_DISPLAY(display)) return; + g_debug("[x11-property] deleting '%s'", key); + + Atom atom = XInternAtom(display, key, False); +@@ -65,6 +70,7 @@ void x11_property_del(const char* key) + + char* x11_property_get(const char* key) + { ++ if (!GDK_IS_X11_DISPLAY(display)) return NULL; + Atom property = XInternAtom(display, key, False); + Atom actual_type; + int actual_format; diff --git a/pkgs/tools/audio/picotts/default.nix b/pkgs/tools/audio/picotts/default.nix index d1b055f1d5f46..023bf4577740d 100644 --- a/pkgs/tools/audio/picotts/default.nix +++ b/pkgs/tools/audio/picotts/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { preConfigure = "./autogen.sh"; meta = { description = "Text to speech voice sinthesizer from SVox."; - homepage = https://github.com/naggety/picotts; + homepage = "https://github.com/naggety/picotts"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.canndrew ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index 8392228cef4c7..3541453bafe4e 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line utility and library for controlling media players that implement MPRIS"; - homepage = https://github.com/acrisci/playerctl; + homepage = "https://github.com/acrisci/playerctl"; license = licenses.lgpl3; platforms = platforms.unix; maintainers = with maintainers; [ puffnfresh ]; diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index 5b27a00a95561..c1e40ae5dbb91 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib gtk3 glib libnotify libX11 pcre ]; meta = with stdenv.lib; { - homepage = https://github.com/nicklan/pnmixer; + homepage = "https://github.com/nicklan/pnmixer"; description = "ALSA volume mixer for the system tray"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/audio/pulsemixer/default.nix b/pkgs/tools/audio/pulsemixer/default.nix index 051743b46e7a4..b735c40031f6a 100644 --- a/pkgs/tools/audio/pulsemixer/default.nix +++ b/pkgs/tools/audio/pulsemixer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pulsemixer"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "GeorgeFilipkin"; repo = pname; rev = version; - sha256 = "162nfpyqn4gp45x332a73n07c118vispz3jicin4p67x3f8f0g3j"; + sha256 = "1jagx9zmz5pfsld8y2rj2kqg6ww9f6vqiawfy3vhqc49x3xx92p4"; }; inherit libpulseaudio; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cli and curses mixer for pulseaudio"; - homepage = https://github.com/GeorgeFilipkin/pulsemixer; + homepage = "https://github.com/GeorgeFilipkin/pulsemixer"; license = licenses.mit; maintainers = [ maintainers.woffs ]; platforms = platforms.all; diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix index 80775fe6f51a2..86ef7f050b23e 100644 --- a/pkgs/tools/audio/qastools/default.nix +++ b/pkgs/tools/audio/qastools/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { meta = with lib; { description = "Collection of desktop applications for ALSA configuration"; - homepage = https://gitlab.com/sebholt/qastools; + homepage = "https://gitlab.com/sebholt/qastools"; license = licenses.mit; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/tools/audio/trx/default.nix index 224c331b9610f..6a23b6caead48 100644 --- a/pkgs/tools/audio/trx/default.nix +++ b/pkgs/tools/audio/trx/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple toolset for broadcasting live audio using RTP/UDP and Opus"; - homepage = http://www.pogo.org.uk/~mark/trx/; + homepage = "http://www.pogo.org.uk/~mark/trx/"; license = licenses.gpl2; maintainers = [ maintainers.hansjoergschurr ]; platforms = platforms.linux; diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix index 3871bbd39a167..50290881dc77e 100644 --- a/pkgs/tools/audio/volumeicon/default.nix +++ b/pkgs/tools/audio/volumeicon/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A lightweight volume control that sits in your systray"; - homepage = http://softwarebakery.com/maato/volumeicon.html; + homepage = "http://softwarebakery.com/maato/volumeicon.html"; platforms = pkgs.lib.platforms.linux; maintainers = with maintainers; [ bobvanderlinden ]; license = pkgs.lib.licenses.gpl3; diff --git a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix index 3d219eed012c4..a872060ce2127 100644 --- a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix +++ b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix @@ -25,7 +25,7 @@ python2Packages.buildPythonApplication rec { meta = { description = "Command line interface for Amazon Glacier"; - homepage = https://github.com/uskudnik/amazon-glacier-cmd-interface; + homepage = "https://github.com/uskudnik/amazon-glacier-cmd-interface"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.lovek323 ]; }; diff --git a/pkgs/tools/backup/automysqlbackup/default.nix b/pkgs/tools/backup/automysqlbackup/default.nix index 44c14f2dc3245..acdf31e47d8c4 100644 --- a/pkgs/tools/backup/automysqlbackup/default.nix +++ b/pkgs/tools/backup/automysqlbackup/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A script to run daily, weekly and monthly backups for your MySQL database"; - homepage = https://sourceforge.net/projects/automysqlbackup/; + homepage = "https://sourceforge.net/projects/automysqlbackup/"; platforms = platforms.linux; maintainers = [ maintainers.aanderse ]; license = licenses.gpl2Plus; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 949e45de5e11e..53de4853c6275 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.bareos.org/; + homepage = "http://www.bareos.org/"; description = "A fork of the bacula project"; license = licenses.agpl3; platforms = platforms.unix; diff --git a/pkgs/tools/backup/bdsync/default.nix b/pkgs/tools/backup/bdsync/default.nix index be8746932cafc..53704ce39d42d 100644 --- a/pkgs/tools/backup/bdsync/default.nix +++ b/pkgs/tools/backup/bdsync/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast block device synchronizing tool"; - homepage = https://github.com/TargetHolding/bdsync; + homepage = "https://github.com/TargetHolding/bdsync"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index a12cc368ee589..de69a8db3de13 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "A deduplicating backup program (attic fork)"; - homepage = https://www.borgbackup.org; + homepage = "https://www.borgbackup.org"; license = licenses.bsd3; platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage maintainers = with maintainers; [ flokli dotlambda globin ]; diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix index 89f577e93ad0f..3727a4b7f427d 100644 --- a/pkgs/tools/backup/btar/default.nix +++ b/pkgs/tools/backup/btar/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Tar-compatible block-based archiver"; license = stdenv.lib.licenses.gpl3Plus; - homepage = http://viric.name/cgi-bin/btar; + homepage = "http://viric.name/cgi-bin/btar"; platforms = with stdenv.lib.platforms; all; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index ce43ebb5720bb..0c528bcea1ec8 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -43,10 +43,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A backup tool for btrfs subvolumes"; - homepage = https://digint.ch/btrbk; + homepage = "https://digint.ch/btrbk"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ asymmetric the-kenny ]; + maintainers = with maintainers; [ asymmetric ]; inherit version; }; } diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 4788091a5f48a..57ab854a33cbd 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -5,7 +5,7 @@ assert par2Support -> par2cmdline != null; -let version = "0.30"; in +let version = "0.30.1"; in with stdenv.lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation { repo = "bup"; owner = "bup"; rev = version; - sha256 = "0kzi9mzgmx1kjv3aldawapz7bk73f02bysiwh8rngqnirmm0vxdp"; + sha256 = "0z9rpmmi6mbm48ynd6izr0f8l3cklfyar6gjy0c8z9zal1ac9r55"; }; buildInputs = [ @@ -51,7 +51,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/bup/bup; + homepage = "https://github.com/bup/bup"; description = "Efficient file backup system based on the git packfile format"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index 5c0be4a2de7d0..d9b4df98790e6 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "BURP - BackUp and Restore Program"; - homepage = https://burp.grke.org; + homepage = "https://burp.grke.org"; license = licenses.agpl3; maintainers = with maintainers; [ tokudan ]; platforms = platforms.all; diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix index 736a3122a6f0a..6885f3f8265ac 100644 --- a/pkgs/tools/backup/chunksync/default.nix +++ b/pkgs/tools/backup/chunksync/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Space-efficient incremental backups of large files or block devices"; - homepage = http://chunksync.florz.de/; + homepage = "http://chunksync.florz.de/"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/backup/dedup/default.nix b/pkgs/tools/backup/dedup/default.nix index 05a4360492638..db9a05fcfde68 100644 --- a/pkgs/tools/backup/dedup/default.nix +++ b/pkgs/tools/backup/dedup/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Data deduplication program"; - homepage = https://git.2f30.org/dedup/file/README.html; + homepage = "https://git.2f30.org/dedup/file/README.html"; license = with licenses; [ bsd0 isc ]; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/tools/backup/dirvish/default.nix b/pkgs/tools/backup/dirvish/default.nix index 0127e32fe93b4..9b138d48f213a 100644 --- a/pkgs/tools/backup/dirvish/default.nix +++ b/pkgs/tools/backup/dirvish/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Dirvish is a fast, disk based, rotating network backup system"; - homepage = http://dirvish.org/; + homepage = "http://dirvish.org/"; license = stdenv.lib.licenses.osl2; platforms = platforms.linux; maintainers = [ maintainers.winpat ]; diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix index b2ef04dcffc7a..b96d6d75725a0 100644 --- a/pkgs/tools/backup/diskrsync/default.nix +++ b/pkgs/tools/backup/diskrsync/default.nix @@ -17,12 +17,12 @@ buildGoPackage rec { buildInputs = [ makeWrapper ]; preFixup = '' - wrapProgram "$bin/bin/diskrsync" --argv0 diskrsync --prefix PATH : ${openssh}/bin + wrapProgram "$out/bin/diskrsync" --argv0 diskrsync --prefix PATH : ${openssh}/bin ''; meta = with stdenv.lib; { description = "Rsync for block devices and disk images"; - homepage = https://github.com/dop251/diskrsync; + homepage = "https://github.com/dop251/diskrsync"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/tools/backup/duplicacy/default.nix b/pkgs/tools/backup/duplicacy/default.nix index d7a248b7a49cb..b261289f0bf16 100644 --- a/pkgs/tools/backup/duplicacy/default.nix +++ b/pkgs/tools/backup/duplicacy/default.nix @@ -19,11 +19,11 @@ buildGoPackage rec { ''; installPhase = '' - install -D duplicacy_main $bin/bin/duplicacy + install -D duplicacy_main $out/bin/duplicacy ''; meta = with lib; { - homepage = https://duplicacy.com; + homepage = "https://duplicacy.com"; description = "A new generation cloud backup tool"; platforms = platforms.linux ++ platforms.darwin; license = lib.licenses.unfree; diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix index bb24cb35d875d..e2a5cc1c4cf99 100644 --- a/pkgs/tools/backup/duplicati/default.nix +++ b/pkgs/tools/backup/duplicati/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free backup client that securely stores encrypted, incremental, compressed backups on cloud storage services and remote file servers"; - homepage = https://www.duplicati.com/; + homepage = "https://www.duplicati.com/"; license = licenses.lgpl21; maintainers = with maintainers; [ nyanloutre ]; platforms = platforms.all; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index e49d87c697cfd..8e4014eea9dd7 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -19,11 +19,11 @@ let in pythonPackages.buildPythonApplication rec { pname = "duplicity"; - version = "0.8.11.1596"; + version = "0.8.12.1612"; src = fetchurl { url = "https://code.launchpad.net/duplicity/${majorMinor version}-series/${majorMinorPatch version}/+download/duplicity-${version}.tar.gz"; - sha256 = "1qdaaybwdc13nfwnwrqij4lc23iwy73lyqn5lb4iznq6axp6m0h9"; + sha256 = "06n58pwqg6kfigckjlslz2kx1lsykz1kn9a0r1cl8r3kn93zhk07"; }; patches = [ diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index 3e4375cb76c67..7808a0925b15f 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { implementing backup job profiles, batch commands and more. Who says secure backups on non-trusted spaces are no child's play? ''; - homepage = https://duply.net/; + homepage = "https://duply.net/"; license = licenses.gpl2; maintainers = [ maintainers.bjornfor ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/backup/easysnap/default.nix b/pkgs/tools/backup/easysnap/default.nix index 7f9b06275097b..9b5450ba7a3ba 100644 --- a/pkgs/tools/backup/easysnap/default.nix +++ b/pkgs/tools/backup/easysnap/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/sjau/easysnap; + homepage = "https://github.com/sjau/easysnap"; description = "Customizable ZFS Snapshotting tool with zfs send/recv pulling"; license = licenses.gpl3; maintainers = with maintainers; [ sjau ]; diff --git a/pkgs/tools/backup/flockit/default.nix b/pkgs/tools/backup/flockit/default.nix index 8d71671f6fece..53baa6a6d9344 100644 --- a/pkgs/tools/backup/flockit/default.nix +++ b/pkgs/tools/backup/flockit/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { Also see the following blog post: https://www.swiftstack.com/blog/2012/08/15/old-school-monkeypatching/ ''; - homepage = https://github.com/smerritt/flockit; + homepage = "https://github.com/smerritt/flockit"; license = licenses.asl20; platforms = platforms.linux; maintainers = [ maintainers.basvandijk ]; diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index c8093f4453e95..64a711606f855 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Crawler for web archiving with WARC output"; - homepage = https://github.com/ArchiveTeam/grab-site; + homepage = "https://github.com/ArchiveTeam/grab-site"; license = licenses.mit; maintainers = with maintainers; [ ivan ]; platforms = platforms.all; diff --git a/pkgs/tools/backup/hpe-ltfs/default.nix b/pkgs/tools/backup/hpe-ltfs/default.nix index d289febe1f090..e34155bb23897 100644 --- a/pkgs/tools/backup/hpe-ltfs/default.nix +++ b/pkgs/tools/backup/hpe-ltfs/default.nix @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "HPE's implementation of the open-source tape filesystem standard ltfs"; - homepage = https://support.hpe.com/hpesc/public/km/product/1009214665/Product; + homepage = "https://support.hpe.com/hpesc/public/km/product/1009214665/Product"; license = licenses.lgpl21; maintainers = [ maintainers.redvers ]; platforms = platforms.linux; - downloadPage = https://github.com/nix-community/hpe-ltfs; + downloadPage = "https://github.com/nix-community/hpe-ltfs"; }; } diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index 6fe614195a4b9..9a77153e2ff3f 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Easy-to-use offline browser / website mirroring utility"; - homepage = http://www.httrack.com; + homepage = "http://www.httrack.com"; license = licenses.gpl3; - maintainers = with maintainers; [ the-kenny ]; platforms = with platforms; unix; }; } diff --git a/pkgs/tools/backup/httrack/qt.nix b/pkgs/tools/backup/httrack/qt.nix index 8cf3eb29462c6..6ee7f6e6a2102 100644 --- a/pkgs/tools/backup/httrack/qt.nix +++ b/pkgs/tools/backup/httrack/qt.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, pkgconfig, makeWrapper +{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig, makeWrapper , httrack, qtbase, qtmultimedia }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "httraqt"; version = "1.4.9"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Easy-to-use offline browser / website mirroring utility - QT frontend"; - homepage = http://www.httrack.com; + homepage = "http://www.httrack.com"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; unix; diff --git a/pkgs/tools/backup/luckybackup/default.nix b/pkgs/tools/backup/luckybackup/default.nix index 3e89be15391f5..7203ba480e60a 100644 --- a/pkgs/tools/backup/luckybackup/default.nix +++ b/pkgs/tools/backup/luckybackup/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl +{ mkDerivation, stdenv, fetchurl , pkgconfig, libtool, qmake , rsync, ssh }: with stdenv.lib; -stdenv.mkDerivation rec { +mkDerivation rec { pname = "luckybackup"; version = "0.5.0"; diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix index a52c6bf1ba7c3..75962c98f8b64 100644 --- a/pkgs/tools/backup/lvmsync/default.nix +++ b/pkgs/tools/backup/lvmsync/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optimised synchronisation of LVM snapshots over a network"; - homepage = https://theshed.hezmatt.org/lvmsync/; + homepage = "https://theshed.hezmatt.org/lvmsync/"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ jluttine nicknovitski ]; diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index 5d086abf7807e..261267b809a1e 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -3,25 +3,27 @@ , fetchFromGitHub , pkg-config , openssl +, Security }: rustPlatform.buildRustPackage rec { pname = "monolith"; - version = "2.2.2"; + version = "2.2.6"; src = fetchFromGitHub { owner = "Y2Z"; repo = pname; rev = "v${version}"; - sha256 = "08xbpn6kdfiyvz5pwx9hkzbgb40z6dicmiry7frclw0aibal9avi"; + sha256 = "0ifv1h16xrs40gw5wx7kwj7hirnzpgfrznskz2igsslk7ycjlbr1"; }; - cargoSha256 = "10zwyg54f05m6ldpnchqzxjkb6rlpcl80crdnk8s6wkf18qny4i3"; + cargoSha256 = "1plx9p265jcc6wg3bhcdk1f77md8ann08kkv3g2706d82kxy2c1i"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - checkPhase = "cargo test -- --skip tests::cli"; + checkFlagsArray = [ "--skip=tests::cli" ]; meta = with stdenv.lib; { description = "Bundle any web page into a single HTML file"; diff --git a/pkgs/tools/backup/mt-st/default.nix b/pkgs/tools/backup/mt-st/default.nix index 0b7b7469af1b8..57201d69dbacb 100644 --- a/pkgs/tools/backup/mt-st/default.nix +++ b/pkgs/tools/backup/mt-st/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { longDescription = '' Fork of the standard "mt" tool with additional Linux-specific IOCTLs. ''; - homepage = https://github.com/iustin/mt-st; + homepage = "https://github.com/iustin/mt-st"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.redvers ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/backup/mtx/default.nix b/pkgs/tools/backup/mtx/default.nix index 46f213a6ef4c6..2a2dd80c566bf 100644 --- a/pkgs/tools/backup/mtx/default.nix +++ b/pkgs/tools/backup/mtx/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { that they properly report the MChanger bit as required by the SCSI T-10 SMC specification. ''; - homepage = https://sourceforge.net/projects/mtx/; + homepage = "https://sourceforge.net/projects/mtx/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.redvers ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix index 7160e7f195034..88a7276299030 100644 --- a/pkgs/tools/backup/mydumper/default.nix +++ b/pkgs/tools/backup/mydumper/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''High-perfomance MySQL backup tool''; - homepage = https://github.com/maxbube/mydumper; + homepage = "https://github.com/maxbube/mydumper"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ izorkin ]; diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix index 30ee0041c7cc7..e3b4a0fb537e0 100644 --- a/pkgs/tools/backup/ori/default.nix +++ b/pkgs/tools/backup/ori/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A secure distributed file system"; - homepage = http://ori.scs.stanford.edu/; + homepage = "http://ori.scs.stanford.edu/"; license = licenses.mit; platforms = platforms.unix; broken = true; # 2018-04-11 diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index fa4346c8cccce..2a325046123e3 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { using existing libraries, e.g. e2fslibs is used to read and write the ext2 partition. ''; - homepage = https://partclone.org; + homepage = "https://partclone.org"; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index 4a18deeb57c8d..51a1a05fe6c58 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; src = fetchurl { - url = mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2; + url = "mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2"; sha256 = "0db6xiphk6xnlpbxraiy31c5xzj0ql6k4rfkmqzh665yyj0nqfkm"; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "Opensource disk backup software"; - homepage = http://www.partimage.org; + homepage = "http://www.partimage.org"; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix index 98eae9cc67024..a610bb8e13a47 100644 --- a/pkgs/tools/backup/percona-xtrabackup/default.nix +++ b/pkgs/tools/backup/percona-xtrabackup/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Non-blocking backup tool for MySQL"; - homepage = http://www.percona.com/software/percona-xtrabackup; + homepage = "http://www.percona.com/software/percona-xtrabackup"; license = licenses.lgpl2; platforms = platforms.linux; maintainers = with maintainers; [ izorkin ]; diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index 1ed5bfd9ef874..e2d415d92f6a5 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Data deduplication with compression and public key encryption"; - homepage = https://github.com/dpc/rdedup; + homepage = "https://github.com/dpc/rdedup"; license = licenses.mpl20; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index f3910893b7b28..707ba8a9885b6 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -4,7 +4,7 @@ python2Packages.buildPythonApplication { name = "rdiff-backup-1.3.3"; src = fetchurl { - url = mirror://savannah/rdiff-backup/rdiff-backup-1.3.3.tar.gz; + url = "mirror://savannah/rdiff-backup/rdiff-backup-1.3.3.tar.gz"; sha256 = "01hcwf5rgqi303fa4kdjkbpa7n8mvvh7h9gpgh2b23nz73k0q0zf"; }; @@ -16,9 +16,8 @@ python2Packages.buildPythonApplication { meta = { description = "Backup system trying to combine best a mirror and an incremental backup system"; - homepage = http://rdiff-backup.nongnu.org/; + homepage = "http://rdiff-backup.nongnu.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 345d14fd10b90..f366533f9bfaf 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, nixosTests}: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, installShellFiles, nixosTests}: buildGoPackage rec { pname = "restic"; @@ -13,27 +13,23 @@ buildGoPackage rec { sha256 = "0lydll93n1lcn1fl669b9cikmzz9d6vfpc8ky3ng5fi8kj3v1dz7"; }; + subPackages = [ "cmd/restic" ]; + + nativeBuildInputs = [ installShellFiles ]; + passthru.tests.restic = nixosTests.restic; - # Use a custom install phase here as by default the - # build-release-binaries and prepare-releases binaries are - # installed. - installPhase = '' - mkdir -p "$bin/bin" - cp go/bin/restic "$bin/bin" - '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' - mkdir -p \ - $bin/etc/bash_completion.d \ - $bin/share/zsh/vendor-completions \ - $bin/share/man/man1 - $bin/bin/restic generate \ - --bash-completion $bin/etc/bash_completion.d/restic.sh \ - --zsh-completion $bin/share/zsh/vendor-completions/_restic \ - --man $bin/share/man/man1 + postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + $out/bin/restic generate \ + --bash-completion restic.bash \ + --zsh-completion restic.zsh \ + --man . + installShellCompletion restic.{bash,zsh} + installManPage *.1 ''; meta = with lib; { - homepage = https://restic.net; + homepage = "https://restic.net"; description = "A backup program that is fast, efficient and secure"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd2; diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix index c7f12cb751b23..45a4df74b15d2 100644 --- a/pkgs/tools/backup/restic/rest-server.nix +++ b/pkgs/tools/backup/restic/rest-server.nix @@ -19,7 +19,7 @@ buildGoPackage rec { ''; installPhase = '' - install -Dt $bin/bin rest-server + install -Dt $out/bin rest-server ''; meta = with lib; { diff --git a/pkgs/tools/backup/rotate-backups/default.nix b/pkgs/tools/backup/rotate-backups/default.nix index 17397ce838f5a..c0a06e1b9ae58 100644 --- a/pkgs/tools/backup/rotate-backups/default.nix +++ b/pkgs/tools/backup/rotate-backups/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple command line interface for backup rotation"; - homepage = https://github.com/xolox/python-rotate-backups; + homepage = "https://github.com/xolox/python-rotate-backups"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; }; diff --git a/pkgs/tools/backup/rsbep/default.nix b/pkgs/tools/backup/rsbep/default.nix index 90a8c665cd43a..d7967c018a26b 100644 --- a/pkgs/tools/backup/rsbep/default.nix +++ b/pkgs/tools/backup/rsbep/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Create resilient backups with Reed-Solomon error correction and byte-spreading"; - homepage = https://www.thanassis.space/rsbep.html; + homepage = "https://www.thanassis.space/rsbep.html"; license = licenses.gpl3; maintainers = [ maintainers.earvstedt ]; }; diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index eebdcf7ba915e..0503dc3b65729 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A filesystem snapshot utility for making backups of local and remote systems"; - homepage = https://rsnapshot.org/; + homepage = "https://rsnapshot.org/"; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/backup/stenc/default.nix b/pkgs/tools/backup/stenc/default.nix index ed4f944a960d1..11859c4f8be41 100644 --- a/pkgs/tools/backup/stenc/default.nix +++ b/pkgs/tools/backup/stenc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "SCSI Tape Encryption Manager"; - homepage = https://github.com/scsitape/stenc; + homepage = "https://github.com/scsitape/stenc"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ woffs ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix index a0f568b16b3e0..bd1c0d802aa03 100644 --- a/pkgs/tools/backup/store-backup/default.nix +++ b/pkgs/tools/backup/store-backup/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { meta = { description = "A backup suite that stores files on other disks"; - homepage = https://savannah.nongnu.org/projects/storebackup; + homepage = "https://savannah.nongnu.org/projects/storebackup"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/backup/tsm-client/default.nix b/pkgs/tools/backup/tsm-client/default.nix index a1f7b1aba84ec..c432d47becdee 100644 --- a/pkgs/tools/backup/tsm-client/default.nix +++ b/pkgs/tools/backup/tsm-client/default.nix @@ -53,8 +53,8 @@ let meta = { - homepage = https://www.ibm.com/us-en/marketplace/data-protection-and-recovery; - downloadPage = https://www-01.ibm.com/support/docview.wss?uid=swg21239415; + homepage = "https://www.ibm.com/us-en/marketplace/data-protection-and-recovery"; + downloadPage = "https://www-01.ibm.com/support/docview.wss?uid=swg21239415"; platforms = [ "x86_64-linux" ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.yarny ]; diff --git a/pkgs/tools/backup/ugarit-manifest-maker/default.nix b/pkgs/tools/backup/ugarit-manifest-maker/default.nix index 8f93474f8f169..f763296e1d6e5 100644 --- a/pkgs/tools/backup/ugarit-manifest-maker/default.nix +++ b/pkgs/tools/backup/ugarit-manifest-maker/default.nix @@ -22,7 +22,7 @@ in with pkgs; eggDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://www.kitten-technologies.co.uk/project/ugarit-manifest-maker/; + homepage = "https://www.kitten-technologies.co.uk/project/ugarit-manifest-maker/"; description = "A tool for generating import manifests for Ugarit"; license = licenses.bsd3; maintainers = [ maintainers.ebzzry ]; diff --git a/pkgs/tools/backup/ugarit/default.nix b/pkgs/tools/backup/ugarit/default.nix index e8f0ea22df10b..bc69662dc2bda 100644 --- a/pkgs/tools/backup/ugarit/default.nix +++ b/pkgs/tools/backup/ugarit/default.nix @@ -32,7 +32,7 @@ in with pkgs; eggDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://www.kitten-technologies.co.uk/project/ugarit/; + homepage = "https://www.kitten-technologies.co.uk/project/ugarit/"; description = "A backup/archival system based around content-addressible storage"; license = licenses.bsd3; maintainers = [ maintainers.ebzzry ]; diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix index 9c7cb0a83fd6d..af1506bff6e92 100644 --- a/pkgs/tools/backup/wal-e/default.nix +++ b/pkgs/tools/backup/wal-e/default.nix @@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A Postgres WAL-shipping disaster recovery and replication toolkit"; - homepage = https://github.com/wal-e/wal-e; + homepage = "https://github.com/wal-e/wal-e"; maintainers = []; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index e5ed04bb4a1c7..2f2541c41cbd0 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, brotli, Security }: +{ stdenv, buildGoModule, fetchFromGitHub, brotli }: buildGoModule rec { pname = "wal-g"; @@ -11,9 +11,9 @@ buildGoModule rec { sha256 = "1hslhs9i4wib6c74gdq9yail958ff1y11pymjww2xr84wkwd9v7i"; }; - modSha256 = "0kwl5gwc5gc0cq2gldg13nvswp9wd90xiv1qb3g8yxcczywkpmrm"; + vendorSha256 = "0jjr33k27k6h27sa01ipz0aydch3i9klknqb3yq8f048zkb54gv8"; - buildInputs = [ brotli ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ brotli ]; doCheck = true; @@ -31,4 +31,4 @@ buildGoModule rec { description = "An archival restoration tool for PostgreSQL"; maintainers = [ stdenv.lib.maintainers.ocharles ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/tools/backup/zbackup/default.nix index d7a160328ed1c..5de58c56f002e 100644 --- a/pkgs/tools/backup/zbackup/default.nix +++ b/pkgs/tools/backup/zbackup/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake protobufc ]; meta = { description = "A versatile deduplicating backup tool"; - homepage = http://zbackup.org/; + homepage = "http://zbackup.org/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index 1cb7e64744121..ff2f6062554f7 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -34,7 +34,7 @@ buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/alunduil/zfs-replicate; + homepage = "https://github.com/alunduil/zfs-replicate"; description = "ZFS Snapshot Replication"; license = licenses.bsd2; maintainers = with maintainers; [ alunduil ]; diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index b44564efb8275..5ca460beb3bec 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -1,27 +1,28 @@ -{ stdenv, fetchFromGitHub, fetchurl, perl, perlPackages, wget, autoconf, automake }: +{ stdenv, fetchFromGitHub, fetchurl, perl, perlPackages, wget, autoconf, automake, autoreconfHook }: let - # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/PERL_MODULES - Mojolicious-6-46 = perlPackages.buildPerlPackage rec { + # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/cpanfile + # pinned versions are listed at https://github.com/oetiker/znapzend/blob/master/thirdparty/cpanfile-5.26.1.snapshot + Mojolicious-8-35 = perlPackages.buildPerlPackage rec { pname = "Mojolicious"; - version = "6.46"; + version = "8.35"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${pname}-${version}.tar.gz"; - sha256 = "0i3axmx4506fx5gms148pj65x6ys7flaz1aqjd8hd9zfkd8pzdfr"; + sha256 = "1bll0ahh5v1y3x0ql29klwsa68cj46wzqc385srsnn2m8kh2ak8h"; }; }; - MojoIOLoopForkCall-0-17 = perlPackages.buildPerlModule rec { + MojoIOLoopForkCall-0-20 = perlPackages.buildPerlModule rec { pname = "Mojo-IOLoop-ForkCall"; - version = "0.17"; + version = "0.20"; src = fetchurl { url = "mirror://cpan/authors/id/J/JB/JBERGER/${pname}-${version}.tar.gz"; - sha256 = "090qxz1nbah2qxvfg4whl6yp6q03qkx7a42751iai521nk1yavc8"; + sha256 = "19pih5x0ayxs2m8j29qwdpi6ky3w4ghv6vrmax3ix9r59hj6569b"; }; - propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious-6-46 ]; + propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious-8-35 ]; }; - version = "0.18.0"; - checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd"; + version = "0.20.0"; + checksum = "15lb5qwksa508m9bj6d3n4rrjpakfaas9qxspg408bcqfp7pqjw3"; in stdenv.mkDerivation { pname = "znapzend"; @@ -34,9 +35,9 @@ stdenv.mkDerivation { sha256 = checksum; }; - buildInputs = [ wget perl MojoIOLoopForkCall-0-17 perlPackages.TAPParserSourceHandlerpgTAP ]; + buildInputs = [ wget perl MojoIOLoopForkCall-0-20 perlPackages.TAPParserSourceHandlerpgTAP ]; - nativeBuildInputs = [ autoconf automake ]; + nativeBuildInputs = [ autoconf automake autoreconfHook ]; preConfigure = '' sed -i 's/^SUBDIRS =.*$/SUBDIRS = lib/' Makefile.am @@ -55,30 +56,30 @@ stdenv.mkDerivation { postInstall = '' substituteInPlace $out/bin/znapzend --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ - -I${Mojolicious-6-46}/${perl.libPrefix} \ + -I${Mojolicious-8-35}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ - -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ + -I${MojoIOLoopForkCall-0-20}/${perl.libPrefix} \ -I${perlPackages.IOPipely}/${perl.libPrefix} \ " substituteInPlace $out/bin/znapzendzetup --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ - -I${Mojolicious-6-46}/${perl.libPrefix} \ + -I${Mojolicious-8-35}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ - -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ + -I${MojoIOLoopForkCall-0-20}/${perl.libPrefix} \ -I${perlPackages.IOPipely}/${perl.libPrefix} \ " substituteInPlace $out/bin/znapzendztatz --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ - -I${Mojolicious-6-46}/${perl.libPrefix} \ + -I${Mojolicious-8-35}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ - -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ + -I${MojoIOLoopForkCall-0-20}/${perl.libPrefix} \ -I${perlPackages.IOPipely}/${perl.libPrefix} \ " ''; meta = with stdenv.lib; { description = "High performance open source ZFS backup with mbuffer and ssh support"; - homepage = http://www.znapzend.org; + homepage = "http://www.znapzend.org"; license = licenses.gpl3; maintainers = with maintainers; [ otwieracz ]; platforms = platforms.all; diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index e351867ca1bff..69db0053cfa14 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://github.com/blueman-project/blueman; + homepage = "https://github.com/blueman-project/blueman"; description = "GTK-based Bluetooth Manager"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix index 326366f4f0d3b..09f5471de483e 100644 --- a/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { ++ optional aacSupport fdk_aac; configureFlags = [ - "--with-alsaplugindir=\$out/lib/alsa-lib" - "--with-dbusconfdir=\$out/etc/dbus-1" + "--with-alsaplugindir=${placeholder "out"}/lib/alsa-lib" + "--with-dbusconfdir=${placeholder "out"}/share/dbus-1/system.d" "--enable-rfcomm" "--enable-hcitop" ] diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index 5c8f65ae5141c..f95869e789cb4 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus-glib, bluez, openobex, dbus }: +{ stdenv, fetchurl, pkgconfig, libusb-compat-0_1, glib, dbus-glib, bluez, openobex, dbus }: stdenv.mkDerivation rec { name = "obex-data-server-0.4.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb glib dbus-glib bluez openobex dbus ]; + buildInputs = [ libusb-compat-0_1 glib dbus-glib bluez openobex dbus ]; patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://wiki.muiline.com/obex-data-server; + homepage = "http://wiki.muiline.com/obex-data-server"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/pkgs/tools/bluetooth/obexd/default.nix index 0771505b7269c..c235c99d762c7 100644 --- a/pkgs/tools/bluetooth/obexd/default.nix +++ b/pkgs/tools/bluetooth/obexd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { - homepage = http://www.bluez.org/; + homepage = "http://www.bluez.org/"; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/tools/bluetooth/obexfs/default.nix b/pkgs/tools/bluetooth/obexfs/default.nix index 81d0849b408a6..1c24697c6898a 100644 --- a/pkgs/tools/bluetooth/obexfs/default.nix +++ b/pkgs/tools/bluetooth/obexfs/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse obexftp bluez ]; meta = with stdenv.lib; { - homepage = http://dev.zuckschwerdt.org/openobex/wiki/ObexFs; + homepage = "http://dev.zuckschwerdt.org/openobex/wiki/ObexFs"; description = "A tool to mount OBEX-based devices (such as Bluetooth phones)"; platforms = platforms.linux; license = licenses.lgpl2Plus; diff --git a/pkgs/tools/bluetooth/obexftp/default.nix b/pkgs/tools/bluetooth/obexftp/default.nix index 3e40c7d8ef69a..69779557300d6 100644 --- a/pkgs/tools/bluetooth/obexftp/default.nix +++ b/pkgs/tools/bluetooth/obexftp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp; + homepage = "http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"; description = "A library and tool to access files on OBEX-based devices (such as Bluetooth phones)"; platforms = platforms.linux; license = licenses.lgpl2Plus; diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix index e3a360818e636..7ac0234852c1a 100644 --- a/pkgs/tools/bluetooth/openobex/default.nix +++ b/pkgs/tools/bluetooth/openobex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bluez, libusb, cmake }: +{ stdenv, fetchurl, pkgconfig, bluez, libusb-compat-0_1, cmake }: stdenv.mkDerivation rec { name = "openobex-1.7.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ bluez libusb ]; + buildInputs = [ bluez libusb-compat-0_1 ]; configureFlags = [ "--enable-apps" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://dev.zuckschwerdt.org/openobex/; + homepage = "http://dev.zuckschwerdt.org/openobex/"; description = "An open source implementation of the Object Exchange (OBEX) protocol"; platforms = platforms.linux; license = licenses.lgpl2Plus; diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 398641faf15eb..5c7c68d9d9e39 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { runtime makes it very easy to use, particularly when paired with Linux kernels that provide EFI stub support. ''; - homepage = http://refind.sourceforge.net/; + homepage = "http://refind.sourceforge.net/"; maintainers = with maintainers; [ AndersonTorres samueldr ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; license = licenses.gpl3Plus; diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix index ccf632dfe5a50..9b232be8ce00c 100644 --- a/pkgs/tools/cd-dvd/bashburn/default.nix +++ b/pkgs/tools/cd-dvd/bashburn/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { - manipulate ISO-files - and probably more... ''; - homepage = http://bashburn.dose.se/; + homepage = "http://bashburn.dose.se/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix index b4f0d1039edc6..df63ced882fe7 100644 --- a/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/pkgs/tools/cd-dvd/bchunk/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://he.fi/bchunk/; + homepage = "http://he.fi/bchunk/"; description = "A program that converts CD images in BIN/CUE format into a set of ISO and CDR tracks"; platforms = platforms.unix; license = licenses.gpl2; diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index a9f5b321d3d7e..cdc1988733372 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Gnome CD/DVD Burner"; - homepage = https://wiki.gnome.org/Apps/Brasero; + homepage = "https://wiki.gnome.org/Apps/Brasero"; maintainers = [ maintainers.bdimcheff ]; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/tools/cd-dvd/ccd2iso/default.nix b/pkgs/tools/cd-dvd/ccd2iso/default.nix index c7aab91adbeb2..a6ba7fd332f3a 100644 --- a/pkgs/tools/cd-dvd/ccd2iso/default.nix +++ b/pkgs/tools/cd-dvd/ccd2iso/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CloneCD to ISO converter"; - homepage = https://sourceforge.net/projects/ccd2iso/; + homepage = "https://sourceforge.net/projects/ccd2iso/"; license = licenses.gpl2; maintainers = with maintainers; [ yegortimoshenko ]; platforms = platforms.unix; diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/pkgs/tools/cd-dvd/cdi2iso/default.nix index 00a1864b03577..9d7336663a8e5 100644 --- a/pkgs/tools/cd-dvd/cdi2iso/default.nix +++ b/pkgs/tools/cd-dvd/cdi2iso/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A very simple utility for converting DiscJuggler images to the standard ISO-9660 format"; - homepage = https://sourceforge.net/projects/cdi2iso.berlios; + homepage = "https://sourceforge.net/projects/cdi2iso.berlios"; license = licenses.gpl2; maintainers = with maintainers; [ hrdinka ]; platforms = platforms.linux; diff --git a/pkgs/tools/cd-dvd/cdimgtools/default.nix b/pkgs/tools/cd-dvd/cdimgtools/default.nix index ece45944c5c0c..fde9eb1a33208 100644 --- a/pkgs/tools/cd-dvd/cdimgtools/default.nix +++ b/pkgs/tools/cd-dvd/cdimgtools/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { installTargets = [ "install" "install-doc" ]; meta = with stdenv.lib; { - homepage = https://repo.or.cz/cdimgtools.git/blob_plain/refs/heads/release:/README.html; + homepage = "https://repo.or.cz/cdimgtools.git/blob_plain/refs/heads/release:/README.html"; description = "Tools to inspect and manipulate CD/DVD optical disc images"; license = licenses.gpl2; maintainers = with maintainers; [ hhm ]; diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index 908808b79f3c6..d0d12c34c0591 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "cdrdao-1.2.3"; src = fetchurl { - url = mirror://sourceforge/cdrdao/cdrdao-1.2.3.tar.bz2; + url = "mirror://sourceforge/cdrdao/cdrdao-1.2.3.tar.bz2"; sha256 = "0pmpgx91j984snrsxbq1dgf3ximks2dfh1sqqmic72lrls7wp4w1"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode"; - homepage = http://cdrdao.sourceforge.net/; + homepage = "http://cdrdao.sourceforge.net/"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index 7de086dba6073..251eee66f9cfc 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { independent project. ''; - homepage = http://cdrkit.org/; + homepage = "http://cdrkit.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/cd-dvd/cue2pops/default.nix b/pkgs/tools/cd-dvd/cue2pops/default.nix index 2ee69682a1d51..87e633c504a8d 100644 --- a/pkgs/tools/cd-dvd/cue2pops/default.nix +++ b/pkgs/tools/cd-dvd/cue2pops/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Convert CUE to ISO suitable to POPStarter"; - homepage = https://github.com/makefu/cue2pops-linux; + homepage = "https://github.com/makefu/cue2pops-linux"; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.all; }; diff --git a/pkgs/tools/cd-dvd/cuetools/default.nix b/pkgs/tools/cd-dvd/cuetools/default.nix index e4e34aa919b6f..ebc631521773a 100644 --- a/pkgs/tools/cd-dvd/cuetools/default.nix +++ b/pkgs/tools/cd-dvd/cuetools/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set of utilities for working with cue files and toc files"; - homepage = https://github.com/svend/cuetools; + homepage = "https://github.com/svend/cuetools"; license = licenses.gpl2; maintainers = with maintainers; [ codyopel jcumming ]; platforms = platforms.all; diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/pkgs/tools/cd-dvd/dvd-vr/default.nix index 2cb90129ed9a3..aef0c3a636f9d 100644 --- a/pkgs/tools/cd-dvd/dvd-vr/default.nix +++ b/pkgs/tools/cd-dvd/dvd-vr/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://www.pixelbeat.org/programs/dvd-vr/; - downloadPage = https://www.pixelbeat.org/programs/dvd-vr/; + homepage = "https://www.pixelbeat.org/programs/dvd-vr/"; + downloadPage = "https://www.pixelbeat.org/programs/dvd-vr/"; description = "A utility to identify and optionally copy recordings from a DVD-VR format disc"; license = licenses.gpl2; maintainers = with maintainers; [ fgaz ]; diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix index 6a4161ba1faa7..5a3828d801315 100644 --- a/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://dvdisaster.net/; + homepage = "http://dvdisaster.net/"; description = "Data loss/scratch/aging protection for CD/DVD media"; longDescription = '' Dvdisaster provides a margin of safety against data loss on CD and diff --git a/pkgs/tools/cd-dvd/ecm-tools/default.nix b/pkgs/tools/cd-dvd/ecm-tools/default.nix index 922ab39063a0f..2ebf8e6555171 100644 --- a/pkgs/tools/cd-dvd/ecm-tools/default.nix +++ b/pkgs/tools/cd-dvd/ecm-tools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A utility to uncompress ECM files to BIN CD format"; - homepage = https://github.com/alucryd/ecm-tools; + homepage = "https://github.com/alucryd/ecm-tools"; license = licenses.gpl3; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.all; diff --git a/pkgs/tools/cd-dvd/isomd5sum/default.nix b/pkgs/tools/cd-dvd/isomd5sum/default.nix index 3bc1f886ccd2d..0c30f0fe98012 100644 --- a/pkgs/tools/cd-dvd/isomd5sum/default.nix +++ b/pkgs/tools/cd-dvd/isomd5sum/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { installTargets = [ "install-bin" "install-devel" ]; meta = with stdenv.lib; { - homepage = https://github.com/rhinstaller/isomd5sum; + homepage = "https://github.com/rhinstaller/isomd5sum"; description = "Utilities for working with md5sum implanted in ISO images"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix index 09fbc8b38c873..39d0ab5fc2d65 100644 --- a/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/lsdvd/; + homepage = "https://sourceforge.net/projects/lsdvd/"; description = "Display information about audio, video, and subtitle tracks on a DVD"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/pkgs/tools/cd-dvd/nrg2iso/default.nix index 43ed7ea7d3895..082dada85fdef 100644 --- a/pkgs/tools/cd-dvd/nrg2iso/default.nix +++ b/pkgs/tools/cd-dvd/nrg2iso/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A linux utils for converting CD (or DVD) image generated by Nero Burning Rom to ISO format"; - homepage = http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html; + homepage = "http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix b/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix index 94cd09674dace..8efc50c449354 100644 --- a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix +++ b/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Convert SRT files to VTT"; license = licenses.mit; maintainers = with maintainers; [ ericdallo ]; - homepage = https://github.com/nwoltman/srt-to-vtt-cl; + homepage = "https://github.com/nwoltman/srt-to-vtt-cl"; platforms = platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index ec8ef6c165109..d81790d66a855 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://unetbootin.sourceforge.net/; + homepage = "http://unetbootin.sourceforge.net/"; description = "A tool to create bootable live USB drives from ISO images"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/tools/cd-dvd/vobcopy/default.nix b/pkgs/tools/cd-dvd/vobcopy/default.nix index 48a58c0c7d119..2b918c4ffebc8 100644 --- a/pkgs/tools/cd-dvd/vobcopy/default.nix +++ b/pkgs/tools/cd-dvd/vobcopy/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Copies DVD .vob files to harddisk, decrypting them on the way"; - homepage = http://vobcopy.org/projects/c/c.shtml; + homepage = "http://vobcopy.org/projects/c/c.shtml"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix index fe7a1a044149d..9e5ee52fca8dd 100644 --- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchgit { inherit rev; - url = https://github.com/ruediger/VobSub2SRT.git; + url = "https://github.com/ruediger/VobSub2SRT.git"; sha256 = "1rpanrv8bgdh95v2320qbd44xskncvq6y84cbbfc86gw0qxpd9cb"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ tesseract ]; meta = { - homepage = https://github.com/ruediger/VobSub2SRT; + homepage = "https://github.com/ruediger/VobSub2SRT"; description = "Converts VobSub subtitles into SRT subtitles"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 901b0c329c5ed..b3f268214db36 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; - homepage = https://www.gnu.org/software/xorriso/; + homepage = "https://www.gnu.org/software/xorriso/"; maintainers = [ maintainers.vrthra ]; platforms = platforms.unix; diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix index 46c8f4338c699..e648aa6feb648 100644 --- a/pkgs/tools/compression/advancecomp/default.nix +++ b/pkgs/tools/compression/advancecomp/default.nix @@ -28,12 +28,19 @@ stdenv.mkDerivation rec { }) ]; + # autover.sh relies on 'git describe', which obviously doesn't work as we're not cloning + # the full git repo. so we have to put the version number in `.version`, otherwise + # the binaries get built reporting "none" as their version number. + postPatch = '' + echo "${version}" >.version + ''; + meta = with stdenv.lib; { description = ''A set of tools to optimize deflate-compressed files''; license = licenses.gpl3 ; maintainers = [ maintainers.raskin ]; platforms = platforms.linux ++ platforms.darwin; - homepage = https://github.com/amadvance/advancecomp; + homepage = "https://github.com/amadvance/advancecomp"; }; } diff --git a/pkgs/tools/compression/bsc/default.nix b/pkgs/tools/compression/bsc/default.nix index c1ddb242dad0f..384cbfc3839bf 100644 --- a/pkgs/tools/compression/bsc/default.nix +++ b/pkgs/tools/compression/bsc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High performance block-sorting data compression library"; - homepage = http://libbsc.com/; + homepage = "http://libbsc.com/"; # Later commits changed the licence to Apache2 (no release yet, though) license = with licenses; [ lgpl3Plus ]; platforms = platforms.unix; diff --git a/pkgs/tools/compression/dejsonlz4/default.nix b/pkgs/tools/compression/dejsonlz4/default.nix index 53b968c5134bc..7520fc824c01b 100644 --- a/pkgs/tools/compression/dejsonlz4/default.nix +++ b/pkgs/tools/compression/dejsonlz4/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Decompress Mozilla Firefox bookmarks backup files"; - homepage = https://github.com/avih/dejsonlz4; + homepage = "https://github.com/avih/dejsonlz4"; license = licenses.bsd2; maintainers = with maintainers; [ mt-caret ]; platforms = platforms.linux; diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 19bc2fdc17693..81a446066d971 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -26,7 +26,7 @@ in pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives"; - homepage = https://brettcsmith.org/2007/dtrx/; + homepage = "https://brettcsmith.org/2007/dtrx/"; license = licenses.gpl3Plus; maintainers = [ maintainers.spwhitt ]; platforms = platforms.all; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index e6409f051227c..65760a0b6ccd2 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -17,8 +17,17 @@ stdenv.mkDerivation rec { makeFlags = [ "SHELL=/bin/sh" "GREP=grep" ]; + # Many gzip executables are shell scripts that depend upon other gzip + # executables being in $PATH. Rather than try to re-write all the + # internal cross-references, just add $out/bin to PATH at the top of + # all the executables that are shell scripts. + preFixup = '' + sed -i '1{;/#!\/bin\/sh/aPATH="'$out'/bin:$PATH" + }' $out/bin/* + ''; + meta = { - homepage = https://www.gnu.org/software/gzip/; + homepage = "https://www.gnu.org/software/gzip/"; description = "GNU zip compression program"; longDescription = diff --git a/pkgs/tools/compression/gzrt/default.nix b/pkgs/tools/compression/gzrt/default.nix index 6ce50bb3d996a..4367f4b6d61f3 100644 --- a/pkgs/tools/compression/gzrt/default.nix +++ b/pkgs/tools/compression/gzrt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.urbanophile.com/arenn/hacking/gzrt/; + homepage = "https://www.urbanophile.com/arenn/hacking/gzrt/"; description = "The gzip Recovery Toolkit"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/tools/compression/hactool/default.nix new file mode 100644 index 0000000000000..77382d980e54b --- /dev/null +++ b/pkgs/tools/compression/hactool/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "hactool"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "SciresM"; + repo = "hactool"; + rev = "1.3.3"; + sha256 = "1qb51fck7liqc1ridms8wdlzgbdbvp6iv4an8jvmzhcj5p5xq631"; + }; + + preBuild = '' + mv config.mk.template config.mk + ''; + + installPhase = '' + install -D hactool $out/bin/hactool + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/SciresM/hactool"; + description = "A tool to manipulate common file formats for the Nintendo Switch"; + longDescription = "A tool to view information about, decrypt, and extract common file formats for the Nintendo Switch, especially Nintendo Content Archives"; + license = licenses.isc; + maintainers = with maintainers; [ ivar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/compression/kzipmix/default.nix b/pkgs/tools/compression/kzipmix/default.nix index 6fcff7b292802..f68b0cdc751a2 100644 --- a/pkgs/tools/compression/kzipmix/default.nix +++ b/pkgs/tools/compression/kzipmix/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "kzipmix-20091108"; src = fetchurl { - url = http://static.jonof.id.au/dl/kenutils/kzipmix-20091108-linux.tar.gz; + url = "http://static.jonof.id.au/dl/kenutils/kzipmix-20091108-linux.tar.gz"; sha256 = "19gyn8pblffdz1bf3xkbpzx8a8wn3xb0v411pqzmz5g5l6pm5gph"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "A tool that aggressively optimizes the sizes of Zip archives"; license = stdenv.lib.licenses.unfree; - homepage = http://advsys.net/ken/utils.htm; + homepage = "http://advsys.net/ken/utils.htm"; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/compression/lhasa/default.nix b/pkgs/tools/compression/lhasa/default.nix index 64a9ad7f65626..edf42266acdb1 100644 --- a/pkgs/tools/compression/lhasa/default.nix +++ b/pkgs/tools/compression/lhasa/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "lhasa-0.3.1"; src = fetchurl { - url = https://soulsphere.org/projects/lhasa/lhasa-0.3.1.tar.gz; + url = "https://soulsphere.org/projects/lhasa/lhasa-0.3.1.tar.gz"; sha256 = "092zi9av18ma20c6h9448k0bapvx2plnp292741dvfd9hmgqxc1z"; }; meta = { @@ -14,7 +14,7 @@ stdenv.mkDerivation { the tool is a library, so that it can be reused for other purposes. ''; license = stdenv.lib.licenses.isc; - homepage = http://fragglet.github.io/lhasa; + homepage = "http://fragglet.github.io/lhasa"; maintainers = with stdenv.lib; [ maintainers.sander ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index 2c6765b2e8372..aaddb6299c4bc 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib lzo bzip2 nasm perl ]; meta = { - homepage = http://ck.kolivas.org/apps/lrzip/; + homepage = "http://ck.kolivas.org/apps/lrzip/"; description = "The CK LRZIP compression program (LZMA + RZIP)"; license = stdenv.lib.licenses.gpl2Plus; inherit version; diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix index 0c54c3b452b60..72560c1d9ae2d 100644 --- a/pkgs/tools/compression/lzfse/default.nix +++ b/pkgs/tools/compression/lzfse/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { enableParallelBuilding = false; #bug meta = with stdenv.lib; { - homepage = https://github.com/lzfse/lzfse; + homepage = "https://github.com/lzfse/lzfse"; description = "a reference C implementation of the LZFSE compressor"; longDescription = '' This is a reference C implementation of the LZFSE compressor introduced in the Compression library with OS X 10.11 and iOS 9. diff --git a/pkgs/tools/compression/lzham/default.nix b/pkgs/tools/compression/lzham/default.nix index 0aa30ceb6632f..9c18e4d69fed9 100644 --- a/pkgs/tools/compression/lzham/default.nix +++ b/pkgs/tools/compression/lzham/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Lossless data compression codec with LZMA-like ratios but 1.5x-8x faster decompression speed"; - homepage = https://github.com/richgel999/lzham_codec; + homepage = "https://github.com/richgel999/lzham_codec"; license = with licenses; [ mit ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 4ec40deab6c3a..62f57a8cca792 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://www.nongnu.org/lzip/lzip.html; + homepage = "https://www.nongnu.org/lzip/lzip.html"; description = "A lossless data compressor based on the LZMA algorithm"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix index 00eb5f265aafe..48645942038ff 100644 --- a/pkgs/tools/compression/lzop/default.nix +++ b/pkgs/tools/compression/lzop/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ lzo ]; meta = with stdenv.lib; { - homepage = http://www.lzop.org; + homepage = "http://www.lzop.org"; description = "Fast file compressor"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix index 28c7c1d69f709..04323f8c49ecb 100644 --- a/pkgs/tools/compression/mozlz4a/default.nix +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd2; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5; + homepage = "https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5"; }; } diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index 8e55d24fc9859..b60a23e660ca4 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://ncompress.sourceforge.net/; + homepage = "http://ncompress.sourceforge.net/"; license = stdenv.lib.licenses.publicDomain; description = "A fast, simple LZW file compressor"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix index 3314544084f87..1c78d27654d27 100644 --- a/pkgs/tools/compression/pbzip2/default.nix +++ b/pkgs/tools/compression/pbzip2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; meta = with stdenv.lib; { - homepage = http://compression.ca/pbzip2/; + homepage = "http://compression.ca/pbzip2/"; description = "A parallel implementation of bzip2 for multi-core machines"; license = licenses.bsd2; maintainers = with maintainers; [viric]; diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 1fabedaf62d8a..1953b793657ee 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.zlib.net/pigz/; + homepage = "http://www.zlib.net/pigz/"; description = "A parallel implementation of gzip for multi-core machines"; license = licenses.zlib; platforms = platforms.unix; diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix index f9ca3aa185751..e731d91f6d6ee 100644 --- a/pkgs/tools/compression/pxz/default.nix +++ b/pkgs/tools/compression/pxz/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://jnovy.fedorapeople.org/pxz/; + homepage = "https://jnovy.fedorapeople.org/pxz/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [pashev]; description = ''Parallel XZ is a compression utility that takes advantage of diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index 8773121e6461c..fe4ac14ad0210 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "rzip-2.1"; src = fetchurl { - url = mirror://samba/rzip/rzip-2.1.tar.gz; + url = "mirror://samba/rzip/rzip-2.1.tar.gz"; sha256 = "4bb96f4d58ccf16749ed3f836957ce97dbcff3e3ee5fd50266229a48f89815b7"; }; buildInputs = [ bzip2 ]; @@ -11,13 +11,13 @@ stdenv.mkDerivation { patches = [ (fetchpatch { name = "CVE-2017-8364-fill-buffer.patch"; - url = https://sources.debian.net/data/main/r/rzip/2.1-4.1/debian/patches/80-CVE-2017-8364-fill-buffer.patch; + url = "https://sources.debian.net/data/main/r/rzip/2.1-4.1/debian/patches/80-CVE-2017-8364-fill-buffer.patch"; sha256 = "0jcjlx9ksdvxvjyxmyzscx9ar9992iy5icw0sc3n0p09qi4d6x1r"; }) ]; meta = { - homepage = https://rzip.samba.org/; + homepage = "https://rzip.samba.org/"; description = "Compression program"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index f602a52d85abb..06dcaa26077a5 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://upx.github.io/; + homepage = "https://upx.github.io/"; description = "The Ultimate Packer for eXecutables"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix index 691f3a8ee5d8d..b877f78b8c35d 100644 --- a/pkgs/tools/compression/xar/default.nix +++ b/pkgs/tools/compression/xar/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = { - homepage = https://mackyle.github.io/xar/; + homepage = "https://mackyle.github.io/xar/"; description = "Extensible Archiver"; longDescription = diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index 8251d7a497eba..2420f3fab61cf 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { file differences. This is similar to diff and patch, but it is targeted for binary files and does not generate human readable output. ''; - homepage = http://xdelta.org/; + homepage = "http://xdelta.org/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/pkgs/tools/compression/xdelta/unstable.nix index bf2601dd37385..ae4a5ebac3ec6 100644 --- a/pkgs/tools/compression/xdelta/unstable.nix +++ b/pkgs/tools/compression/xdelta/unstable.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { file differences. This is similar to diff and patch, but it is targeted for binary files and does not generate human readable output. ''; - homepage = http://xdelta.org/; + homepage = "http://xdelta.org/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/compression/zdelta/default.nix b/pkgs/tools/compression/zdelta/default.nix index 20748c31ab819..b59e7d5708bac 100644 --- a/pkgs/tools/compression/zdelta/default.nix +++ b/pkgs/tools/compression/zdelta/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://cis.poly.edu/zdelta; + homepage = "http://cis.poly.edu/zdelta"; platforms = platforms.linux; license = licenses.zlib; }; diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix index 81fdc95d88d49..13e1d83693810 100644 --- a/pkgs/tools/compression/zopfli/default.nix +++ b/pkgs/tools/compression/zopfli/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { postInstall = '' install -Dm444 -t $out/share/doc/zopfli ../README* + cp $src/src/zopfli/*.h $dev/include/ ''; enableParallelBuilding = true; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 82a6a3a8a53cf..2f89331f92c63 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -6,26 +6,26 @@ stdenv.mkDerivation rec { pname = "zstd"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { - sha256 = "0zn7r8d4m8w2lblnjalqpz18na0spzkdiw3fwq2fzb7drhb32v54"; - rev = "v${version}"; - repo = "zstd"; owner = "facebook"; + repo = "zstd"; + rev = "v${version}"; + sha256 = "0ay3qlk4sffnmcl3b34q4zd7mkcmjds023icmib1mdli97qcp38l"; }; nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; patches = [ - # From https://github.com/facebook/zstd/pull/1883 + ./playtests-darwin.patch (fetchpatch { - url = "https://github.com/facebook/zstd/commit/106278e7e5fafaea3b7deb4147bdc8071562d2f0.diff"; - sha256 = "13z7id1qbc05cv1rmak7c8xrchp7jh1i623bq5pwcihg57wzcyr8"; + url = "https://github.com/facebook/zstd/pull/2163.patch"; + sha256 = "07mfjc5f9wy0w2xlj36hyf7g5ax9r2rf6ixhkffhnwc6rwy0q54p"; }) ] # This I didn't upstream because if you use posix threads with MinGW it will - # work find, and I'm not sure how to write the condition. + # work fine, and I'm not sure how to write the condition. ++ stdenv.lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch; cmakeFlags = [ @@ -41,12 +41,13 @@ stdenv.mkDerivation rec { checkInputs = [ file ]; doCheck = true; - preCheck = '' - substituteInPlace ../tests/playTests.sh \ - --replace 'MD5SUM="md5 -r"' 'MD5SUM="md5sum"' + checkPhase = '' + runHook preCheck + ctest -R playTests # The only relatively fast test. + runHook postCheck ''; - preInstall = stdenv.lib.optionalString enableShared '' + preInstall = '' substituteInPlace ../programs/zstdgrep \ --replace ":-grep" ":-${gnugrep}/bin/grep" \ --replace ":-zstdcat" ":-$out/bin/zstdcat" @@ -66,7 +67,7 @@ stdenv.mkDerivation rec { speed is preserved and remain roughly the same at all settings, a property shared by most LZ compression algorithms, such as zlib. ''; - homepage = https://facebook.github.io/zstd/; + homepage = "https://facebook.github.io/zstd/"; license = with licenses; [ bsd3 ]; # Or, at your opinion, GPL-2.0-only. platforms = platforms.all; diff --git a/pkgs/tools/compression/zstd/playtests-darwin.patch b/pkgs/tools/compression/zstd/playtests-darwin.patch new file mode 100644 index 0000000000000..a98365eec33a9 --- /dev/null +++ b/pkgs/tools/compression/zstd/playtests-darwin.patch @@ -0,0 +1,18 @@ +--- a/tests/playTests.sh ++++ b/tests/playTests.sh +@@ -109,5 +109,2 @@ esac + case "$UNAME" in +- Darwin) MD5SUM="md5 -r" ;; +- FreeBSD) MD5SUM="gmd5sum" ;; +- OpenBSD) MD5SUM="md5" ;; + *) MD5SUM="md5sum" ;; +@@ -116,5 +113,2 @@ esac + MTIME="stat -c %Y" +-case "$UNAME" in +- Darwin | FreeBSD | OpenBSD) MTIME="stat -f %m" ;; +-esac + +@@ -752,3 +746,2 @@ zstd -d --rm dirTestDict/*.zst -D tmpDictC # note : use internal checksum by de + case "$UNAME" in +- Darwin) println "md5sum -c not supported on OS-X : test skipped" ;; # not compatible with OS-X's md5 + *) $MD5SUM -c tmph1 ;; diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index 830e5f10ef6d4..7984e2bd58934 100644 --- a/pkgs/tools/compression/zsync/default.nix +++ b/pkgs/tools/compression/zsync/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; meta = { - homepage = http://zsync.moria.org.uk/; + homepage = "http://zsync.moria.org.uk/"; description = "File distribution system using the rsync algorithm"; license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix index b9c5c55a8e47f..9664526761b98 100644 --- a/pkgs/tools/filesystems/9pfs/default.nix +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - homepage = https://github.com/mischief/9pfs; + homepage = "https://github.com/mischief/9pfs"; description = "FUSE-based client of the 9P network filesystem protocol"; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/tools/filesystems/aefs/default.nix index 1be33e1299d20..ea94c26248e94 100644 --- a/pkgs/tools/filesystems/aefs/default.nix +++ b/pkgs/tools/filesystems/aefs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse ]; meta = with stdenv.lib; { - homepage = https://github.com/edolstra/aefs; + homepage = "https://github.com/edolstra/aefs"; description = "A cryptographic filesystem implemented in userspace using FUSE"; platforms = platforms.linux; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/tools/filesystems/afpfs-ng/default.nix b/pkgs/tools/filesystems/afpfs-ng/default.nix index 7f8a8c4f931fd..3340bdba0e6d8 100644 --- a/pkgs/tools/filesystems/afpfs-ng/default.nix +++ b/pkgs/tools/filesystems/afpfs-ng/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ fuse readline libgcrypt gmp ]; meta = with stdenv.lib; { - homepage = https://github.com/simonvetter/afpfs-ng; + homepage = "https://github.com/simonvetter/afpfs-ng"; description = "A client implementation of the Apple Filing Protocol"; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index 001e644b7e7dc..48e964bf687de 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Reliable MTP client with minimalistic UI"; - homepage = https://whoozle.github.io/android-file-transfer-linux/; + homepage = "https://whoozle.github.io/android-file-transfer-linux/"; license = licenses.lgpl21; maintainers = [ maintainers.xaverdh ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index 18bde25267d38..d1d4ba6adf17b 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, fuse, libarchive }: let - name = "archivemount-0.8.12"; + name = "archivemount-0.9.1"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "https://www.cybernoia.de/software/archivemount/${name}.tar.gz"; - sha256 = "12fb8fcmd1zwvfgzx4pay47md5cr2kgxcgq82cm6skmq75alfzi4"; + sha256 = "1cy5b6qril9c3ry6fv7ir87s8iyy5vxxmbyx90dm86fbra0vjaf5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index b66d67fbc9f2a..eaf9ac634a171 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "avfs"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0fxzigpyi08ipqz30ihjcpqmmx8g7r1kqdqq1bnnznvnhrzyygn8"; + sha256 = "035b6y49nzgswf5n70aph8pm48sbv9nqwlnp3wwbq892c39kk4xn"; }; nativeBuildInputs = [ pkgconfig ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://avf.sourceforge.net/; + homepage = "http://avf.sourceforge.net/"; description = "Virtual filesystem that allows browsing of compressed files"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix index d449bf1266a0e..5aeff6baaa9a9 100644 --- a/pkgs/tools/filesystems/bashmount/default.nix +++ b/pkgs/tools/filesystems/bashmount/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/jamielinux/bashmount; + homepage = "https://github.com/jamielinux/bashmount"; description = "A menu-driven bash script for the management of removable media with udisks"; maintainers = [ maintainers.koral ]; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index d3e790a3cf134..749aa04ebc70f 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { User documentation is in Documentation/bcache.txt in the Linux kernel tree. ''; - homepage = https://bcache.evilpiepirate.org/; + homepage = "https://bcache.evilpiepirate.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index ad159f08872de..26158b0361d52 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tool for managing bcachefs filesystems"; - homepage = https://bcachefs.org/; + homepage = "https://bcachefs.org/"; license = licenses.gpl2; maintainers = with maintainers; [ davidak chiiruno ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/bees/bees-service-wrapper b/pkgs/tools/filesystems/bees/bees-service-wrapper index 8ef46afc18f55..67c95e8f80315 100755 --- a/pkgs/tools/filesystems/bees/bees-service-wrapper +++ b/pkgs/tools/filesystems/bees/bees-service-wrapper @@ -140,7 +140,11 @@ _setup() { [[ $bees_uuid ]] || { # if bees_uuid is not in our .conf file, look it up with findmnt - read -r bees_uuid fstype < <(findmnt -n -o uuid,fstype "$bees_fsSpec") && [[ $fstype ]] || exit + for findmnt_mode in --kernel --mtab --fstab; do + read -r bees_uuid fstype < <(findmnt "$findmnt_mode" -n -o uuid,fstype "$bees_fsSpec") ||: + [[ $bees_uuid && $fstype ]] && break + done + [[ $bees_uuid ]] || die "Unable to identify a device matching $bees_fsSpec with findmnt" [[ $fstype = btrfs ]] || die "Device type is $fstype, not btrfs" } diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index f13439482db49..f8968260ce798 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fuse, pkgconfig }: stdenv.mkDerivation rec { - version = "1.14.4"; + version = "1.14.7"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "1vk42bq8y13gv4yvajf65qsh59lscwcaw3xv94qpjxld3786i8c7"; + sha256 = "1lbqyc9vpgck05n0q3qsvsr34142iv721z6iwxhc5j98370ff9i8"; }; dontStrip = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A FUSE filesystem for mounting a directory to another location"; - homepage = https://bindfs.org; + homepage = "https://bindfs.org"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix index 57dc51e411159..ab49ce02225f4 100644 --- a/pkgs/tools/filesystems/bonnie/default.nix +++ b/pkgs/tools/filesystems/bonnie/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; meta = { - homepage = http://www.coker.com.au/bonnie++/; + homepage = "http://www.coker.com.au/bonnie++/"; description = "Hard drive and file system benchmark suite"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index 3ddc952739728..5dba4b4bbf1ae 100644 --- a/pkgs/tools/filesystems/boxfs/default.nix +++ b/pkgs/tools/filesystems/boxfs/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation { the terminal and in your browser. When you've done using your files, unmount the file system with `fusermount -u mountpoint`. ''; - homepage = https://github.com/drotiro/boxfs2; + homepage = "https://github.com/drotiro/boxfs2"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index e3545315d6f77..5c73ee945c795 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.4.1"; + version = "5.6"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0scxg9p6z0wss92gmv5a8yxdmr8x449kb5v3bfnvs26n92r7zq7k"; + sha256 = "0srg276yccfmqz0skmmga3vbqx4wiqsk1l6h86n6ryhxa9viqcm1"; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities for the btrfs filesystem"; - homepage = https://btrfs.wiki.kernel.org/; + homepage = "https://btrfs.wiki.kernel.org/"; license = licenses.gpl2; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/buttersink/default.nix b/pkgs/tools/filesystems/buttersink/default.nix index 791d59b7ac27e..aa0f317787f82 100644 --- a/pkgs/tools/filesystems/buttersink/default.nix +++ b/pkgs/tools/filesystems/buttersink/default.nix @@ -23,7 +23,7 @@ python2.pkgs.buildPythonApplication rec { Sources and destinations can be local btrfs file systems, remote btrfs file systems over SSH, or S3 buckets. ''; - homepage = https://github.com/AmesCornish/buttersink/wiki; + homepage = "https://github.com/AmesCornish/buttersink/wiki"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix new file mode 100644 index 0000000000000..25de04467ef97 --- /dev/null +++ b/pkgs/tools/filesystems/catcli/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromGitHub +, buildPythonApplication +, docopt, anytree +}: + +buildPythonApplication rec { + + pname = "catcli"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "deadc0de6"; + repo = pname; + rev = "v${version}"; + sha256 = "0myhvflph4fayl2bg8m9a7prh5pcnvnb75p0jb4jpmbx7jyn7ihp"; + }; + + propagatedBuildInputs = [ docopt anytree ]; + + postPatch = '' patchShebangs . ''; + + meta = with stdenv.lib; { + description = "The command line catalog tool for your offline data"; + homepage = "https://github.com/deadc0de6/catcli"; + license = licenses.gpl3; + maintainers = with maintainers; [ petersjt014 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 64512272777c2..c2234404d34a8 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -93,7 +93,7 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "14.2.8"; + version = "14.2.9"; in rec { ceph = stdenv.mkDerivation { pname = "ceph"; @@ -101,7 +101,7 @@ in rec { src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "0p7pjycqhxqg1mmix8ykx3xqq01d560p54iiidxps0rcvwfkyyki"; + sha256 = "0zkh1a23v8g1fa5flqa2d53lv08ancab3li57gybpqpnja90k7il"; }; patches = [ @@ -173,7 +173,7 @@ in rec { doCheck = false; # uses pip to install things from the internet meta = { - homepage = https://ceph.com/; + homepage = "https://ceph.com/"; description = "Distributed storage system"; license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; maintainers = with maintainers; [ adev ak krav johanot ]; @@ -185,7 +185,7 @@ in rec { ceph-client = runCommand "ceph-client-${version}" { meta = { - homepage = https://ceph.com/; + homepage = "https://ceph.com/"; description = "Tools needed to mount Ceph's RADOS Block Devices"; license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; maintainers = with maintainers; [ adev ak johanot krav ]; diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix index 6c0a6c2870311..c18bbe5a4559d 100644 --- a/pkgs/tools/filesystems/chunkfs/default.nix +++ b/pkgs/tools/filesystems/chunkfs/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa"; - homepage = http://chunkfs.florz.de/; + homepage = "http://chunkfs.florz.de/"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix index 533bb2322e729..8b633ecbe0f57 100644 --- a/pkgs/tools/filesystems/ciopfs/default.nix +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; meta = { - homepage = http://www.brain-dump.org/projects/ciopfs/; + homepage = "https://www.brain-dump.org/projects/ciopfs/"; description = "A case-insensitive filesystem layered on top of any other filesystem"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix index 00ef368ad3dae..77d6dca066a4a 100644 --- a/pkgs/tools/filesystems/convoy/default.nix +++ b/pkgs/tools/filesystems/convoy/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { buildInputs = [lvm2]; meta = with stdenv.lib; { - homepage = https://github.com/rancher/convoy; + homepage = "https://github.com/rancher/convoy"; description = "A Docker volume plugin, managing persistent container volumes."; license = licenses.asl20; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 93a70f1f08818..8f7f4f1a313f5 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cryptographic filesystem for the cloud"; - homepage = https://www.cryfs.org; + homepage = "https://www.cryfs.org"; license = licenses.lgpl3; maintainers = with maintainers; [ peterhoeg c0bw3b ]; platforms = with platforms; linux; diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix index 5636909093e6c..a0306693b28e9 100644 --- a/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/pkgs/tools/filesystems/curlftpfs/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "curlftpfs-0.9.2"; src = fetchurl { - url = mirror://sourceforge/curlftpfs/curlftpfs-0.9.2.tar.gz; + url = "mirror://sourceforge/curlftpfs/curlftpfs-0.9.2.tar.gz"; sha256 = "0n397hmv21jsr1j7zx3m21i7ryscdhkdsyqpvvns12q7qwwlgd2f"; }; nativeBuildInputs = [ pkgconfig ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Filesystem for accessing FTP hosts based on FUSE and libcurl"; - homepage = http://curlftpfs.sourceforge.net; + homepage = "http://curlftpfs.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix index 0890db67fe728..43823e5b51a30 100644 --- a/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/pkgs/tools/filesystems/darling-dmg/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; meta = { - homepage = http://www.darlinghq.org/; + homepage = "https://www.darlinghq.org/"; description = "Darling lets you open macOS dmgs on Linux"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 13f21ae8b58a1..e3e4444c6c18c 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = https://savannah.nongnu.org/projects/davfs2; + homepage = "https://savannah.nongnu.org/projects/davfs2"; description = "Mount WebDAV shares like a typical filesystem"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/tools/filesystems/dislocker/default.nix index cf87f9ca98e0a..10e6e2f9c8011 100644 --- a/pkgs/tools/filesystems/dislocker/default.nix +++ b/pkgs/tools/filesystems/dislocker/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Read BitLocker encrypted partitions in Linux"; - homepage = https://github.com/aorimn/dislocker; + homepage = "https://github.com/aorimn/dislocker"; license = licenses.gpl2; maintainers = with maintainers; [ elitak ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/tools/filesystems/djmount/default.nix index e3c8c2944fbae..15086d28c9881 100644 --- a/pkgs/tools/filesystems/djmount/default.nix +++ b/pkgs/tools/filesystems/djmount/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse]; meta = { - homepage = http://djmount.sourceforge.net/; + homepage = "http://djmount.sourceforge.net/"; description = "UPnP AV client, mounts as a Linux filesystem the media content of compatible UPnP AV devices"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.jagajaga ]; diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index 369d2e74f3015..5af1580d0a513 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; - homepage = https://github.com/dosfstools/dosfstools; + homepage = "https://github.com/dosfstools/dosfstools"; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index d68ad10bd0dc1..48511b97c04e4 100644 --- a/pkgs/tools/filesystems/duff/default.nix +++ b/pkgs/tools/filesystems/duff/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { Duff is a Unix command-line utility for quickly finding duplicates in a given set of files. ''; - homepage = https://duff.dreda.org/; + homepage = "https://duff.dreda.org/"; license = licenses.zlib; platforms = platforms.all; }; diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index 0950445bd3ec9..53ebbb2f8d442 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple tool for finding duplicated extents and submitting them for deduplication"; - homepage = https://github.com/markfasheh/duperemove; + homepage = "https://github.com/markfasheh/duperemove"; license = licenses.gpl2; maintainers = with maintainers; [ bluescreen303 thoughtpolice ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index c23e60e79b2ca..469ed6fdf343c 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://e2fsprogs.sourceforge.net/; + homepage = "http://e2fsprogs.sourceforge.net/"; description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/tools/filesystems/e2tools/default.nix b/pkgs/tools/filesystems/e2tools/default.nix index 14f6afa99f0cd..9c86ced90f7f7 100644 --- a/pkgs/tools/filesystems/e2tools/default.nix +++ b/pkgs/tools/filesystems/e2tools/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://home.earthlink.net/~k_sheff/sw/e2tools/; + homepage = "http://home.earthlink.net/~k_sheff/sw/e2tools/"; description = "Utilities to read/write/manipulate files in an ext2/ext3 filesystem"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 19767b7013ae2..24aa52e366f1d 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An encrypted filesystem in user-space via FUSE"; - homepage = https://vgough.github.io/encfs; + homepage = "https://vgough.github.io/encfs"; license = with licenses; [ gpl3 lgpl3 ]; platforms = with platforms; linux; }; diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/tools/filesystems/ext4magic/default.nix index 1e1edfab8dd1b..19e0e4ee63ec4 100644 --- a/pkgs/tools/filesystems/ext4magic/default.nix +++ b/pkgs/tools/filesystems/ext4magic/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://sourceforge.net/p/ext4magic/tickets/10/attachment/ext4magic-0.3.2-i_dir_acl.patch; + url = "https://sourceforge.net/p/ext4magic/tickets/10/attachment/ext4magic-0.3.2-i_dir_acl.patch"; sha256 = "1accydd8kigid68yir2fbihm3r3x8ws3iyznp25snkx41w6y6x8c"; }) ./glibc-fix.patch @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { It's much more effective and works much better than extundelete. ''; - homepage = http://ext4magic.sourceforge.net/ext4magic_en.html; + homepage = "http://ext4magic.sourceforge.net/ext4magic_en.html"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.rkoe ]; diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix index b84992e1acbbc..447f7a656d127 100644 --- a/pkgs/tools/filesystems/extundelete/default.nix +++ b/pkgs/tools/filesystems/extundelete/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Utility that can recover deleted files from an ext3 or ext4 partition"; - homepage = http://extundelete.sourceforge.net/; + homepage = "http://extundelete.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index c5ec523e247da..2ab168a19a5ac 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./f2fs-tools-cross-fix.patch ]; meta = with stdenv.lib; { - homepage = http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/; + homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/"; description = "Userland tools for the f2fs filesystem"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix index d288758293888..3559579fe80f3 100644 --- a/pkgs/tools/filesystems/f3/default.nix +++ b/pkgs/tools/filesystems/f3/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Fight Flash Fraud"; - homepage = http://oss.digirati.com.br/f3/; + homepage = "http://oss.digirati.com.br/f3/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ makefu ]; diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix index 5a60f8c055e50..c1d048889c701 100644 --- a/pkgs/tools/filesystems/fatresize/default.nix +++ b/pkgs/tools/filesystems/fatresize/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The FAT16/FAT32 non-destructive resizer"; - homepage = https://sourceforge.net/projects/fatresize; + homepage = "https://sourceforge.net/projects/fatresize"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix index aee053ad13559..b8f63a379b1b7 100644 --- a/pkgs/tools/filesystems/fatsort/default.nix +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -1,20 +1,22 @@ {stdenv, fetchurl, help2man}: stdenv.mkDerivation rec { - version = "1.5.0.456"; + version = "1.6.2.605"; pname = "fatsort"; src = fetchurl { url = "mirror://sourceforge/fatsort/${pname}-${version}.tar.xz"; - sha256 = "15fy2m4p9s8cfvnzdcd5ynkc2js0zklkkf34sjxdac7x2iwb8dd8"; + sha256 = "1dzzsl3a1ampari424vxkma0i87qkbgkgm2169x9xf3az0vgmjh8"; }; patches = [ ./fatsort-Makefiles.patch ]; buildInputs = [ help2man ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + meta = with stdenv.lib; { - homepage = http://fatsort.sourceforge.net/; + homepage = "http://fatsort.sourceforge.net/"; description = "Sorts FAT partition table, for devices that don't do sorting of files"; maintainers = [ maintainers.kovirobi ]; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch b/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch index 9c9f58e97ab4f..51775edfb41d1 100644 --- a/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch +++ b/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch @@ -1,31 +1,34 @@ -diff -uNr fatsort-1.3.365-a/Makefile fatsort-1.3.365-b/Makefile ---- fatsort-1.3.365-a/Makefile 2014-04-08 19:19:36.000000000 +0100 -+++ fatsort-1.3.365-b/Makefile 2014-12-14 18:31:55.982857720 +0000 +diff -uNr fatsort-1.6.2.605.orig/Makefile fatsort-1.6.2.605.new/Makefile +--- fatsort-1.6.2.605.orig/Makefile 2019-11-16 16:40:27.000000000 +0100 ++++ fatsort-1.6.2.605.new/Makefile 2020-05-10 21:34:34.820874026 +0200 @@ -1,4 +1,5 @@ -MANDIR=/usr/local/share/man/man1 -+PREFIX=$(out) ++PREFIX?=/usr/local +MANDIR=$(PREFIX)/share/man/man1 INSTALL_FLAGS=-m 0755 -p -D -diff -uNr fatsort-1.3.365-a/src/Makefile fatsort-1.3.365-b/src/Makefile ---- fatsort-1.3.365-a/src/Makefile 2014-04-08 19:19:36.000000000 +0100 -+++ fatsort-1.3.365-b/src/Makefile 2014-12-14 18:32:08.282870461 +0000 -@@ -1,3 +1,5 @@ -+PREFIX=$(out) -+ - CC=gcc - LD=gcc - -@@ -33,9 +35,9 @@ - - # Mac OS X does not have a "/usr/local/sbin" - ifeq ($(UNAME),Darwin) --SBINDIR=/usr/local/bin -+SBINDIR=$(PREFIX)/bin +diff -uNr fatsort-1.6.2.605.orig/src/Makefile fatsort-1.6.2.605.new/src/Makefile +--- fatsort-1.6.2.605.orig/src/Makefile 2018-11-17 00:40:59.000000000 +0100 ++++ fatsort-1.6.2.605.new/src/Makefile 2020-05-10 21:33:52.053391027 +0200 +@@ -30,7 +30,7 @@ + override CFLAGS += -D __CYGWIN__ + override CFLAGS += -D __LINUX__ + override LDFLAGS += -liconv +- SBINDIR=/usr/local/sbin ++ SBINDIR=$(PREFIX)/sbin + endif else --SBINDIR=/usr/local/sbin -+SBINDIR=$(PREFIX)/sbin + ifdef MINGW +@@ -60,9 +60,9 @@ + # OS X's install does not support the '-D' flag. + INSTALL_FLAGS=-m 0755 -p + # Mac OS X does not have a "/usr/local/sbin" +- SBINDIR=/usr/local/bin ++ SBINDIR=$(PREFIX)/bin + else +- SBINDIR=/usr/local/sbin ++ SBINDIR=$(PREFIX)/sbin + endif + endif endif - - OBJ=fatsort.o FAT_fs.o fileio.o endianness.o signal.o entrylist.o errors.o options.o clusterchain.o sort.o misc.o natstrcmp.o stringlist.o diff --git a/pkgs/tools/filesystems/file-rename/default.nix b/pkgs/tools/filesystems/file-rename/default.nix index 8eeb052b22f02..f9b6a941f68f3 100644 --- a/pkgs/tools/filesystems/file-rename/default.nix +++ b/pkgs/tools/filesystems/file-rename/default.nix @@ -5,7 +5,7 @@ perlPackages.buildPerlPackage { version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/R/RM/RMBARKER/File-Rename-0.20.tar.gz; + url = "mirror://cpan/authors/id/R/RM/RMBARKER/File-Rename-0.20.tar.gz"; sha256 = "1cf6xx2hiy1xalp35fh8g73j67r0w0g66jpcbc6971x9jbm7bvjy"; }; diff --git a/pkgs/tools/filesystems/fsfs/default.nix b/pkgs/tools/filesystems/fsfs/default.nix index 75e5280d391d7..3e76653dd3e05 100644 --- a/pkgs/tools/filesystems/fsfs/default.nix +++ b/pkgs/tools/filesystems/fsfs/default.nix @@ -5,7 +5,7 @@ throw "It still does not build" stdenv.mkDerivation { name = "fsfs-0.1.1"; src = fetchurl { - url = mirror://sourceforge/fsfs/fsfs-0.1.1.tar.gz; + url = "mirror://sourceforge/fsfs/fsfs-0.1.1.tar.gz"; sha256 = "05wka9aq182li2r7gxcd8bb3rhpns7ads0k59v7w1jza60l57c74"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://fsfs.sourceforge.net/; + homepage = "http://fsfs.sourceforge.net/"; description = "Secure distributed file system in user space"; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 0234794478829..f21f19eb7251f 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -1,26 +1,28 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, fuse3 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fuse3, nixosTests }: stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "0.7.8"; + version = "1.0.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "10wsssf9mxgkgcqks3z02y9ya8xh4wd45lsb1jrvw31wmz9zpalc"; + sha256 = "0h1ay2l7zyiqplh8whanw68mcfri79lc03wjjrhqji5ddwznv6fa"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse3 ]; - meta = with lib; { + passthru.tests.podman = nixosTests.podman; + + meta = with stdenv.lib; { description = "FUSE implementation for overlayfs"; longDescription = "An implementation of overlay+shiftfs in FUSE for rootless containers."; license = licenses.gpl3; maintainers = with maintainers; [ ma9e ] ++ teams.podman.members; - platforms = platforms.unix; + platforms = platforms.linux; inherit (src.meta) homepage; }; } diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix index 41c4cc84f966a..0a4472d7123df 100644 --- a/pkgs/tools/filesystems/fuseiso/default.nix +++ b/pkgs/tools/filesystems/fuseiso/default.nix @@ -1,40 +1,55 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, fuse, zlib, glib }: +{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, fuse, glib, zlib }: -stdenv.mkDerivation { - name = "fuseiso-20070708"; +stdenv.mkDerivation rec { + pname = "fuseiso"; + version = "20070708"; src = fetchurl { - url = "mirror://sourceforge/project/fuseiso/fuseiso/20070708/fuseiso-20070708.tar.bz2"; + url = "mirror://sourceforge/project/fuseiso/fuseiso/${version}/fuseiso-${version}.tar.bz2"; sha256 = "127xql52dcdhmh7s5m9xc6q39jdlj3zhbjar1j821kb6gl3jw94b"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse zlib glib ]; - - patches = let fetchPatchFromDebian = { patch, sha256 }: - fetchpatch { - inherit sha256; - url = "https://sources.debian.net/data/main/f/fuseiso/20070708-3.2/debian/patches/${patch}"; - }; - in [ - (fetchPatchFromDebian { - patch = "00-support_large_iso.patch"; + patches = [ + (fetchpatch { + name = "00-support_large_iso.patch"; + url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/00-support_large_iso.patch"; sha256 = "1lmclb1qwzz5f4wlq693g83bblwnjjl73qhgfxbsaac5hnn2shjw"; }) - (fetchPatchFromDebian { # CVE-2015-8837 - patch = "02-prevent-buffer-overflow.patch"; + (fetchpatch { + name = "01-fix_typo.patch"; + url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/01-fix_typo.patch"; + sha256 = "14rpxp0yylzsgqv0r19l4wx1h5hvqp617gpv1yg0w48amr9drasa"; + }) + (fetchpatch { + name = "02-prevent-buffer-overflow_CVE-2015-8837.patch"; + url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/02-prevent-buffer-overflow.patch"; sha256 = "1ls2pp3mh91pdb51qz1fsd8pwhbky6988bpd156bn7wgfxqzh8ig"; }) - (fetchPatchFromDebian { # CVE-2015-8836 - patch = "03-prevent-integer-overflow.patch"; + (fetchpatch { + name = "03-prevent-integer-overflow_CVE-2015-8836.patch"; + url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/03-prevent-integer-overflow.patch"; sha256 = "100cw07fk4sa3hl7a1gk2hgz4qsxdw99y20r7wpidwwwzy463zcv"; }) ]; - meta = { - homepage = https://sourceforge.net/projects/fuseiso; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ fuse glib zlib ]; + + # after autoreconfHook, glib and zlib are not found, so force link against + # them + NIX_LDFLAGS = "-lglib-2.0 -lz"; + + enableParallelBuilding = true; + + postInstall = '' + install -Dm444 -t $out/share/doc/${pname} NEWS README + ''; + + meta = with stdenv.lib; { description = "FUSE module to mount ISO filesystem images"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + homepage = "https://sourceforge.net/projects/fuseiso"; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index f8d955dbfc172..3f0e261b18d67 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -16,8 +16,8 @@ buildGoPackage rec { subPackages = [ "." "tools/mount_gcsfuse" ]; postInstall = '' - ln -s $bin/bin/mount_gcsfuse $bin/bin/mount.gcsfuse - ln -s $bin/bin/mount_gcsfuse $bin/bin/mount.fuse.gcsfuse + ln -s $out/bin/mount_gcsfuse $out/bin/mount.gcsfuse + ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse ''; meta = with lib;{ diff --git a/pkgs/tools/filesystems/genext2fs/default.nix b/pkgs/tools/filesystems/genext2fs/default.nix index 0ef85abd2b772..8d0c0325aa9d8 100644 --- a/pkgs/tools/filesystems/genext2fs/default.nix +++ b/pkgs/tools/filesystems/genext2fs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "genext2fs-1.4.1"; src = fetchurl { - url = mirror://sourceforge/genext2fs/genext2fs-1.4.1.tar.gz; + url = "mirror://sourceforge/genext2fs/genext2fs-1.4.1.tar.gz"; sha256 = "1z7czvsf3ircvz2cw1cf53yifsq29ljxmj15hbgc79l6gbxbnka0"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://genext2fs.sourceforge.net/; + homepage = "http://genext2fs.sourceforge.net/"; description = "A tool to generate ext2 filesystem images without requiring root privileges"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix index e905222ad45e8..c3b867fbb601d 100644 --- a/pkgs/tools/filesystems/genimage/default.nix +++ b/pkgs/tools/filesystems/genimage/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://git.pengutronix.de/cgit/genimage; + homepage = "https://git.pengutronix.de/cgit/genimage"; description = "Generate filesystem images from directory trees"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/tools/filesystems/genromfs/default.nix b/pkgs/tools/filesystems/genromfs/default.nix index 1e6c73f725a8c..d9d97a424bdd9 100644 --- a/pkgs/tools/filesystems/genromfs/default.nix +++ b/pkgs/tools/filesystems/genromfs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://romfs.sourceforge.net/; + homepage = "http://romfs.sourceforge.net/"; description = "Tool for creating romfs file system images"; license = licenses.gpl2; maintainers = with maintainers; [ pxc ]; diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index 7c36e37b33fd7..0f66955360f7a 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { and any subsequent changes made to the files will be automatically committed to the remote. ''; - homepage = https://github.com/PressLabs/gitfs; + homepage = "https://github.com/PressLabs/gitfs"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.robbinch ]; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 5cc6e5c156b24..44880638e65d8 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -15,10 +15,10 @@ let # The command # find /nix/store/...-glusterfs-.../ -name '*.py' -executable # can help with finding new Python scripts. - version = "7.4"; + version = "7.6"; name="${baseName}-${version}"; url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "1f7z1dacnx7pd3ri4nka6851fzhdfandbf94blds8bqfqc1263h6"; + sha256 = "0zdcv2jk8dp67id8ic30mkn97ccp07jf20g7v09a5k31pw9aqyih"; }; buildInputs = [ @@ -73,19 +73,25 @@ stdenv.mkDerivation postPatch = '' sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am + substituteInPlace libglusterfs/src/glusterfs/lvm-defaults.h \ + --replace '/sbin/' '${lvm2}/bin/' + substituteInPlace libglusterfs/src/glusterfs/compat.h \ + --replace '/bin/umount' '${utillinux}/bin/umount' + substituteInPlace contrib/fuse-lib/mount-gluster-compat.h \ + --replace '/bin/mount' '${utillinux}/bin/mount' ''; - # Note that the VERSION file is something that is present in release tarballs - # but not in git tags (at least not as of writing in v3.10.1). - # That's why we have to create it. - # Without this, gluster (at least 3.10.1) will fail very late and cryptically, - # for example when setting up geo-replication, with a message like - # Staging of operation 'Volume Geo-replication Create' failed on localhost : Unable to fetch master volume details. Please check the master cluster and master volume. - # What happens here is that the gverify.sh script tries to compare the versions, - # but fails when the version is empty. - # See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705 - preConfigure = '' - echo "v${s.version}" > VERSION + # Note that the VERSION file is something that is present in release tarballs + # but not in git tags (at least not as of writing in v3.10.1). + # That's why we have to create it. + # Without this, gluster (at least 3.10.1) will fail very late and cryptically, + # for example when setting up geo-replication, with a message like + # Staging of operation 'Volume Geo-replication Create' failed on localhost : Unable to fetch master volume details. Please check the master cluster and master volume. + # What happens here is that the gverify.sh script tries to compare the versions, + # but fails when the version is empty. + # See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705 + preConfigure = '' + echo "v${s.version}" > VERSION ./autogen.sh export PYTHON=${python3}/bin/python ''; diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index 8491bf20e8f13..70a0aff118dbd 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -43,7 +43,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Encrypted overlay filesystem written in Go"; license = licenses.mit; - homepage = https://nuetzlich.net/gocryptfs/; + homepage = "https://nuetzlich.net/gocryptfs/"; maintainers = with maintainers; [ flokli offline ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix index f325fc97e32c1..01b63003d62d1 100644 --- a/pkgs/tools/filesystems/grive2/default.nix +++ b/pkgs/tools/filesystems/grive2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A console Google Drive client"; - homepage = https://github.com/vitalif/grive2; + homepage = "https://github.com/vitalif/grive2"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index b0f7981ebb3cb..d97b05abb6c73 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "HTTPFS2, a FUSE-based HTTP file system for Linux"; - homepage = http://httpfs.sourceforge.net/; + homepage = "http://httpfs.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix index 9b1c2b66e7aae..5bb8b4e91e2b1 100644 --- a/pkgs/tools/filesystems/hubicfuse/default.nix +++ b/pkgs/tools/filesystems/hubicfuse/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/TurboGit/hubicfuse; + homepage = "https://github.com/TurboGit/hubicfuse"; description = "FUSE-based filesystem to access hubic cloud storage"; platforms = platforms.linux; license = licenses.mit; diff --git a/pkgs/tools/filesystems/ifuse/default.nix b/pkgs/tools/filesystems/ifuse/default.nix index aef6087d3f283..5e6025c03482c 100644 --- a/pkgs/tools/filesystems/ifuse/default.nix +++ b/pkgs/tools/filesystems/ifuse/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig fuse usbmuxd libimobiledevice ]; meta = with stdenv.lib; { - homepage = https://github.com/libimobiledevice/ifuse; + homepage = "https://github.com/libimobiledevice/ifuse"; description = "A fuse filesystem implementation to access the contents of iOS devices"; longDescription = '' Mount directories of an iOS device locally using fuse. By default the media diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix index 902d7d7d1a1e5..fb90c3b0aebb3 100644 --- a/pkgs/tools/filesystems/irods/common.nix +++ b/pkgs/tools/filesystems/irods/common.nix @@ -1,4 +1,4 @@ -{ stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, kerberos, gcc, libcxx, which }: +{ stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: # Common attributes of irods packages @@ -7,7 +7,7 @@ with stdenv; { enableParallelBuilding = true; - buildInputs = [ bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos gcc boost libcxx which ]; + buildInputs = [ bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos gcc boost libcxx which catch2 ]; cmakeFlags = [ "-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}" @@ -18,6 +18,7 @@ with stdenv; "-DIRODS_EXTERNALS_FULLPATH_JANSSON=${jansson}" "-DIRODS_EXTERNALS_FULLPATH_ZMQ=${zeromq}" "-DIRODS_EXTERNALS_FULLPATH_CPPZMQ=${cppzmq}" + "-DIRODS_EXTERNALS_FULLPATH_CATCH2=${catch2}" "-DIRODS_LINUX_DISTRIBUTION_NAME=nix" "-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=${builtins.nixVersion}" "-DCPACK_GENERATOR=TGZ" @@ -47,7 +48,7 @@ with stdenv; important in data management. The development infrastructure supports exhaustive testing on supported platforms; plug-in support for microservices, storage resources, drivers, and databases; and extensive documentation, training and support services.''; - homepage = https://irods.org; + homepage = "https://irods.org"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.bzizou ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index b6099c099f321..8dfdd96dbeb89 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }: +{ stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: with stdenv; @@ -10,19 +10,21 @@ let inherit stdenv bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive jansson zeromq openssl pam libiodbc kerberos gcc libcxx - boost avro-cpp which; + boost avro-cpp which catch2; }; in rec { # irods: libs and server package irods = stdenv.mkDerivation (common // rec { - version = "4.2.2"; - prefix = "irods"; - name = "${prefix}-${version}"; - - src = fetchurl { - url = "https://github.com/irods/irods/releases/download/${version}/irods-${version}.tar.gz"; - sha256 = "0b89hs7sizwrs2ja7jl521byiwb58g297p0p7zg5frxmv4ig8dw7"; + version = "4.2.7"; + pname = "irods"; + + src = fetchFromGitHub { + owner = "irods"; + repo = "irods"; + rev = version; + sha256 = "1pd4l42z4igzf0l8xbp7yz0nhzsv47ziv5qj8q1hh6pfhmwlzp9s"; + fetchSubmodules = true; }; # Patches: @@ -41,6 +43,10 @@ in rec { substituteInPlace cmake/runtime_library.cmake --replace "DESTINATION usr/lib" "DESTINATION lib" substituteInPlace cmake/development_library.cmake --replace "DESTINATION usr/lib" "DESTINATION lib" substituteInPlace cmake/development_library.cmake --replace "DESTINATION usr/include" "DESTINATION include" + for file in unit_tests/cmake/test_config/*.cmake + do + substituteInPlace $file --replace "CATCH2}/include" "CATCH2}/include/catch2" + done export cmakeFlags="$cmakeFlags -DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,$out/lib -DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,$out/lib @@ -59,13 +65,18 @@ in rec { # icommands (CLI) package, depends on the irods package irods-icommands = stdenv.mkDerivation (common // rec { - version = "4.2.2"; - name = "irods-icommands-${version}"; - src = fetchurl { - url = "https://github.com/irods/irods_client_icommands/archive/${version}.tar.gz"; - sha256 = "15zcxrx0q5c3rli3snd0b2q4i0hs3zzcrbpnibbhsip855qvs77h"; + version = "4.2.7"; + pname = "irods-icommands"; + + src = fetchFromGitHub { + owner = "irods"; + repo = "irods_client_icommands"; + rev = version; + sha256 = "08hqrc9iaw0y9rrrcknnl5mzbcrsvqc39pwvm62fipl3vnfqryli"; }; + patches = [ ./zmqcpp-deprecated-send_recv.patch ]; + buildInputs = common.buildInputs ++ [ irods ]; preConfigure = common.preConfigure + '' @@ -84,7 +95,6 @@ in rec { description = common.meta.description + " CLI clients"; longDescription = common.meta.longDescription + '' This package provides the CLI clients, called 'icommands'.''; - broken = true; }; }); } diff --git a/pkgs/tools/filesystems/irods/zmqcpp-deprecated-send_recv.patch b/pkgs/tools/filesystems/irods/zmqcpp-deprecated-send_recv.patch new file mode 100644 index 0000000000000..8c249dc4745bb --- /dev/null +++ b/pkgs/tools/filesystems/irods/zmqcpp-deprecated-send_recv.patch @@ -0,0 +1,21 @@ +diff -r -u source/src/irods-grid.cpp source.new/src/irods-grid.cpp +--- source/src/irods-grid.cpp 1970-01-01 01:00:01.000000000 +0100 ++++ source.new/src/irods-grid.cpp 2020-05-05 16:34:35.566464346 +0200 +@@ -412,7 +412,7 @@ + data_to_send.data(), + data_to_send.size() ); + try { +- if (!zmq_skt.send(req)) { ++ if (!zmq_skt.send( req, zmq::send_flags::dontwait )) { + std::cerr << "ZeroMQ encountered an error sending a message.\n"; + return errno; + } +@@ -426,7 +426,7 @@ + zmq::message_t rep; + // wait for the server reponse + try { +- if (!zmq_skt.recv( &rep )) { ++ if (!zmq_skt.recv( rep, zmq::recv_flags::dontwait )) { + std::cerr << "ZeroMQ encountered an error receiving a message.\n"; + return errno; + } diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix index 8b899da32c105..954393e45897d 100644 --- a/pkgs/tools/filesystems/jfsutils/default.nix +++ b/pkgs/tools/filesystems/jfsutils/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "IBM JFS utilities"; - homepage = http://jfs.sourceforge.net; + homepage = "http://jfs.sourceforge.net"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix index 58963753a51ad..56afb8f0f55db 100644 --- a/pkgs/tools/filesystems/jmtpfs/default.nix +++ b/pkgs/tools/filesystems/jmtpfs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A FUSE filesystem for MTP devices like Android phones"; - homepage = https://github.com/JasonFerrara/jmtpfs; + homepage = "https://github.com/JasonFerrara/jmtpfs"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.coconnor ]; diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/pkgs/tools/filesystems/mhddfs/default.nix index 4d90e189b950d..94aa07b104373 100644 --- a/pkgs/tools/filesystems/mhddfs/default.nix +++ b/pkgs/tools/filesystems/mhddfs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://mhddfs.uvw.ru/; + homepage = "http://mhddfs.uvw.ru/"; description = "Combines a several mount points into the single one"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.makefu ]; diff --git a/pkgs/tools/filesystems/mkspiffs/default.nix b/pkgs/tools/filesystems/mkspiffs/default.nix index 6733b3df45eae..086791de787a2 100644 --- a/pkgs/tools/filesystems/mkspiffs/default.nix +++ b/pkgs/tools/filesystems/mkspiffs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool to build and unpack SPIFFS images"; license = licenses.mit; - homepage = https://github.com/igrr/mkspiffs; + homepage = "https://github.com/igrr/mkspiffs"; maintainers = with maintainers; [ haslersn ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index 4a912d3b42c23..af09cafe1deaf 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.112"; + version = "3.0.113"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "04ymwg9r9x9gqjwy9jbjv7zzfgwal0xlfy6z5bwl27m2ys6l5k4a"; + sha256 = "0h3dhj6lznbkvmkr21w58avl9fa4pgj73fv0lkzcagksyyh5l0n9"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix index b453067eaef8a..9675f44583a31 100644 --- a/pkgs/tools/filesystems/mp3fs/default.nix +++ b/pkgs/tools/filesystems/mp3fs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { which only understands the MP3 format, or transcode files through simple drag-and-drop in a file browser. ''; - homepage = https://khenriks.github.io/mp3fs/; + homepage = "https://khenriks.github.io/mp3fs/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index bf048113714f6..bede0e5fca01a 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/cjd/mtpfs; + homepage = "https://github.com/cjd/mtpfs"; description = "FUSE Filesystem providing access to MTP devices"; platforms = platforms.all; license = licenses.gpl3; diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 0a4207d0715fd..faa0a1ebfe860 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec{ meta = { description = "Apple Filing Protocol Server"; - homepage = http://netatalk.sourceforge.net/; + homepage = "http://netatalk.sourceforge.net/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ jcumming ]; diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index 003a0e24fb521..b05abd72bac7b 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -42,7 +42,7 @@ buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://fedoraproject.org/wiki/Blivet; + homepage = "https://fedoraproject.org/wiki/Blivet"; description = "Module for management of a system's storage configuration"; license = with licenses; [ gpl2Plus lgpl21Plus ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index b5f3a2f3e1f6e..3feed23888090 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enablePython python; meta = { - homepage = http://code.google.com/p/cryptsetup/; + homepage = "http://code.google.com/p/cryptsetup/"; description = "LUKS for dm-crypt"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix index 804b052b61ae8..c8c748b4c45fe 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://sourceware.org/lvm2/; + homepage = "http://sourceware.org/lvm2/"; description = "Tools to support Logical Volume Management (LVM) on Linux"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix index f30bd958cf3ab..b3b18579334f0 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Tools for the Linux multipathing driver"; - homepage = http://christophe.varoqui.free.fr/; + homepage = "http://christophe.varoqui.free.fr/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix index 046fe81e64ac8..2a0ffe326dcb5 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { which also serves as a sample implementation and script backend. ''; - homepage = https://www.gnu.org/software/parted/; + homepage = "https://www.gnu.org/software/parted/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix index 9d067359c44ad..0698dcd9ecb73 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { ''; meta = { - homepage = http://fedoraproject.org/wiki/Pykickstart; + homepage = "http://fedoraproject.org/wiki/Pykickstart"; description = "Read and write Fedora kickstart files"; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix index e0947b01f51bb..f71e7c3a06db3 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix @@ -34,7 +34,7 @@ buildPythonApplication rec { ''; meta = { - homepage = https://fedorahosted.org/pyparted/; + homepage = "https://fedorahosted.org/pyparted/"; description = "Python interface for libparted"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 1d402090355f4..abe171170d41b 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.tuxera.com/community/open-source-ntfs-3g/; + homepage = "https://www.tuxera.com/community/open-source-ntfs-3g/"; description = "FUSE-based NTFS driver with full write support"; maintainers = with maintainers; [ dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix index 424f84ec34f9b..54cb54b1df4b6 100644 --- a/pkgs/tools/filesystems/rdfind/default.nix +++ b/pkgs/tools/filesystems/rdfind/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ nettle ]; meta = with stdenv.lib; { - homepage = https://rdfind.pauldreik.se/; + homepage = "https://rdfind.pauldreik.se/"; description = "Removes or hardlinks duplicate files very swiftly"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.wmertens ]; diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index dbc391d008282..896d472b83291 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; - homepage = https://sourceforge.net/projects/reiser4/; + homepage = "https://sourceforge.net/projects/reiser4/"; description = "Reiser4 utilities"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index 10962f10a8f5f..daafdbf231fd5 100644 --- a/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { inherit version; - homepage = http://www.namesys.com/; + homepage = "http://www.namesys.com/"; description = "ReiserFS utilities"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/filesystems/rmount/default.nix b/pkgs/tools/filesystems/rmount/default.nix index 72172ef5baa22..529fc0244916a 100644 --- a/pkgs/tools/filesystems/rmount/default.nix +++ b/pkgs/tools/filesystems/rmount/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/Luis-Hebendanz/rmount; + homepage = "https://github.com/Luis-Hebendanz/rmount"; description = "Remote mount utility which parses a json file"; license = licenses.mit; maintainers = [ maintainers.luis ]; diff --git a/pkgs/tools/filesystems/romdirfs/default.nix b/pkgs/tools/filesystems/romdirfs/default.nix index 8085eb5f2347e..96389214c7e03 100644 --- a/pkgs/tools/filesystems/romdirfs/default.nix +++ b/pkgs/tools/filesystems/romdirfs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "FUSE for access Playstation 2 IOP IOPRP images and BIOS dumps"; - homepage = https://github.com/mlafeldt/romdirfs; + homepage = "https://github.com/mlafeldt/romdirfs"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ genesis ]; diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index 186da6255ebf2..1906f68053549 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/archiecobbs/s3backer; + homepage = "https://github.com/archiecobbs/s3backer"; description = "FUSE-based single file backing store via Amazon S3"; license = licenses.gpl2Plus; platforms = with platforms; linux; diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix index 36ac3630e54d0..d4c7d9b766748 100644 --- a/pkgs/tools/filesystems/sasquatch/default.nix +++ b/pkgs/tools/filesystems/sasquatch/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "4.3"; src = fetchurl { - url = mirror://sourceforge/squashfs/squashfs4.3.tar.gz; + url = "mirror://sourceforge/squashfs/squashfs4.3.tar.gz"; sha256 = "1xpklm0y43nd9i6jw43y2xh5zvlmj9ar2rvknh0bh7kv8c95aq0d"; }; diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index b5ffdade98f81..1cb9ccd873e71 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "snapraid"; - version = "11.3"; + version = "11.4"; src = fetchFromGitHub { owner = "amadvance"; repo = "snapraid"; rev = "v${version}"; - sha256 = "08rwz55njkr1w794y3hs8nxc11vzbv4drds9wgxpf6ps8qf9q49f"; + sha256 = "1mhinc9wny4a1xdrbksdl58kfrsh1cxp79zcgsl99gnyw47r22jy"; }; VERSION = version; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ ]; meta = { - homepage = http://www.snapraid.it/; + homepage = "http://www.snapraid.it/"; description = "A backup program for disk arrays"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.makefu ]; diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index df8b3f22c484a..72b95641d00fb 100644 --- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -4,18 +4,18 @@ stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "0.9"; + version = "0.9.1"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "1jx6bga0k07cckpv0yk77kwql7rjiicf9wkbadc8yqhp463xn90q"; + sha256 = "1ilxkrqbpb5whv7xfwfvph76jwyjzf988njjpyyr99h6jv2r77q1"; }; nativeBuildInputs = [ doxygen graphviz pkgconfig perl ]; buildInputs = [ zlib xz lz4 lzo zstd ]; meta = with lib; { - homepage = https://github.com/AgentD/squashfs-tools-ng; + homepage = "https://github.com/AgentD/squashfs-tools-ng"; license = licenses.gpl3Plus; maintainers = with maintainers; [ qyliss ]; platforms = platforms.unix; diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index f02a913bc2576..645633a87e1e5 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1"; meta = { - homepage = http://squashfs.sourceforge.net/; + homepage = "http://squashfs.sourceforge.net/"; description = "Tool for creating and unpacking squashfs filesystems"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix index e828698b0e977..27335a9cf5da8 100644 --- a/pkgs/tools/filesystems/squashfuse/default.nix +++ b/pkgs/tools/filesystems/squashfuse/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "FUSE filesystem to mount squashfs archives"; - homepage = https://github.com/vasi/squashfuse; + homepage = "https://github.com/vasi/squashfuse"; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; license = "BSD-2-Clause"; diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index ebfb211732e8d..4ae4ebb6f197b 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "svnfs-0.4"; src = fetchurl { - url = http://www.jmadden.eu/wp-content/uploads/svnfs/svnfs-0.4.tgz; + url = "http://www.jmadden.eu/wp-content/uploads/svnfs/svnfs-0.4.tgz"; sha256 = "1lrzjr0812lrnkkwk60bws9k1hq2iibphm0nhqyv26axdsygkfky"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "FUSE filesystem for accessing Subversion repositories"; - homepage = http://www.jmadden.eu/index.php/svnfs/; + homepage = "http://www.jmadden.eu/index.php/svnfs/"; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index 67e21ac4c2c48..5efa218ed081b 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -1,59 +1,37 @@ -{ stdenv, fetchgit, fetchFromGitHub, go, fuse }: +{ stdenv, buildGoPackage, fetchFromGitHub, fuse, installShellFiles }: -stdenv.mkDerivation rec { +buildGoPackage rec { pname = "tmsu"; - version = "0.7.4"; - - go-sqlite3 = fetchgit { - url = "git://github.com/mattn/go-sqlite3"; - rev = "c9a0db5d8951646743317f0756da0339fe144dd5"; - sha256 = "1m0q9869fis0dhg34g5wc5xi6pby491spfxi23w461h29higbrqh"; - }; - - go-fuse = fetchgit { - url = "git://github.com/hanwen/go-fuse"; - rev = "8c85ded140ac1889372a0e22d8d21e3d10a303bd"; - sha256 = "1iph2hpvby2mfwqg9pp39xjqdl9a09h4442yfdn5l67pznljh2bi"; - }; + version = "0.7.5"; + goPackagePath = "github.com/oniony/TMSU"; src = fetchFromGitHub { owner = "oniony"; repo = "tmsu"; rev = "v${version}"; - sha256 = "1g9gxlll2g4qkqbrshq3888sy1lgw6p5dvcrl5qyh6w73yimi1cq"; + sha256 = "0834hah7p6ad81w60ifnxyh9zn09ddfgrll04kwjxwp7ypbv38wq"; }; - buildInputs = [ go fuse ]; + goDeps = ./deps.nix; - preBuild = '' - mkdir -p src/github.com/mattn/go-sqlite3/ - ln -s ${go-sqlite3}/* src/github.com/mattn/go-sqlite3 + buildInputs = [ fuse ]; + nativeBuildInputs = [ installShellFiles ]; - mkdir -p src/github.com/hanwen/go-fuse - ln -s ${go-fuse}/* src/github.com/hanwen/go-fuse - - mkdir -p src/github.com/oniony/tmsu - ln -s ${src}/* src/github.com/oniony/tmsu - - patchShebangs tests/. - - export GOPATH=$PWD - export GOCACHE=$TMPDIR/go-cache + preBuild = '' + mv go/src/${goPackagePath} src + mv src/src/${goPackagePath} go/src/${goPackagePath} + export GOPATH=$PWD:$GOPATH ''; - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/sbin - mkdir -p $out/share/man/man1 - mkdir -p $out/share/zsh/site-functions - make install INSTALL_DIR=$out/bin \ - MOUNT_INSTALL_DIR=$out/sbin \ - MAN_INSTALL_DIR=$out/share/man/man1 \ - ZSH_COMP_INSTALL_DIR=$out/share/zsh/site-functions + postInstall = '' + mv $out/bin/{TMSU,tmsu} + cp src/misc/bin/* $out/bin/ + installManPage src/misc/man/tmsu.1 + installShellCompletion --zsh src/misc/zsh/_tmsu ''; meta = with stdenv.lib; { - homepage = http://www.tmsu.org; + homepage = "http://www.tmsu.org"; description = "A tool for tagging your files using a virtual filesystem"; maintainers = with maintainers; [ pSub ]; license = licenses.gpl3; diff --git a/pkgs/tools/filesystems/tmsu/deps.nix b/pkgs/tools/filesystems/tmsu/deps.nix new file mode 100644 index 0000000000000..90e64b434c4af --- /dev/null +++ b/pkgs/tools/filesystems/tmsu/deps.nix @@ -0,0 +1,39 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/hanwen/go-fuse"; + fetch = { + type = "git"; + url = "https://github.com/hanwen/go-fuse"; + rev = "730713460d4fc41afdc2533bd37ff60c94c0c586"; + sha256 = "1y44d08fxyis99s6jxdr6dbbw5kv3wb8lkhq3xmr886i4w41lz03"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "98a44bcf5949f178c8116fa30e62c9ac2ef65927"; + sha256 = "108rk74ringkkyx05zlq5khh32fsfi0przyzrpsr1r5j57xrhxj0"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "3c4aac89819a5fdc28d906456729d3423fd46969"; + sha256 = "16q9ay6bl28zrnb377p8lvrs2nd98h7i6y3yi8ccjwzg1czbfdsi"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "1957bb5e6d1f523308b49060df02171d06ddfc77"; + sha256 = "0imqk4l9785rw7ddvywyf8zn7k3ga6f17ky8rmf8wrri7nknr03f"; + }; + } +] diff --git a/pkgs/tools/filesystems/u3-tool/default.nix b/pkgs/tools/filesystems/u3-tool/default.nix index 62b4b9301397e..f18eb9e82271b 100644 --- a/pkgs/tools/filesystems/u3-tool/default.nix +++ b/pkgs/tools/filesystems/u3-tool/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for controlling the special features of a 'U3 smart drive' USB Flash disk"; - homepage = https://sourceforge.net/projects/u3-tool/ ; + homepage = "https://sourceforge.net/projects/u3-tool/"; license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix index 73272b83989ed..359d8b7abbe4e 100644 --- a/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "unionfs-fuse"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "rpodgorny"; repo = "unionfs-fuse"; rev = "v${version}"; - sha256 = "0lb8zgdxnjy2fjr2284hvdfn7inc1in44ynzgcr66x54bxzvynj6"; + sha256 = "0bwx70x834qgqh53vqp18bhbxbsny80hz922rbgj8k9wj7cbfilm"; }; patches = @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "FUSE UnionFS implementation"; - homepage = https://github.com/rpodgorny/unionfs-fuse; + homepage = "https://github.com/rpodgorny/unionfs-fuse"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix index 50a50ad18f052..af1caecfd7486 100644 --- a/pkgs/tools/filesystems/wdfs/default.nix +++ b/pkgs/tools/filesystems/wdfs/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [fuse glib neon]; meta = with stdenv.lib; { - homepage = http://noedler.de/projekte/wdfs/; + homepage = "http://noedler.de/projekte/wdfs/"; license = licenses.gpl2; description = "User-space filesystem that allows to mount a webdav share"; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index aa28ee625969b..b5254a92024ab 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://xfs.org/; + homepage = "http://xfs.org/"; description = "SGI XFS utilities"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index b97480d655b48..334aa6ad9c609 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://help.yandex.com/disk/cli-clients.xml; + homepage = "https://help.yandex.com/disk/cli-clients.xml"; description = "A free cloud file storage service"; maintainers = with stdenv.lib.maintainers; [ smironov jagajaga ]; platforms = ["i686-linux" "x86_64-linux"]; diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix index 734c8df9b6ae2..f9fd8a3c7f351 100644 --- a/pkgs/tools/filesystems/zerofree/default.nix +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://frippery.org/uml/; + homepage = "https://frippery.org/uml/"; description = "Zero free blocks from ext2, ext3 and ext4 file-systems"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix index cafe0bb7b11a2..e9e57595e3d38 100644 --- a/pkgs/tools/graphics/appleseed/default.nix +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source, physically-based global illumination rendering engine"; - homepage = https://appleseedhq.net/; + homepage = "https://appleseedhq.net/"; maintainers = with maintainers; [ hodapp ]; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 3f8bdf3ac6b27..115a9a3e4a56c 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.argyllcms.com; + homepage = "http://www.argyllcms.com"; description = "Color management system (compatible with ICC)"; license = licenses.gpl3; maintainers = []; diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix index 179085e1fd6bd..48558d022597d 100644 --- a/pkgs/tools/graphics/barcode/default.nix +++ b/pkgs/tools/graphics/barcode/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; # Maybe other non-darwin Unix downloadPage = "https://ftp.gnu.org/gnu/barcode/"; updateWalker = true; - homepage = https://www.gnu.org/software/barcode/; + homepage = "https://www.gnu.org/software/barcode/"; license = licenses.gpl3; }; } diff --git a/pkgs/tools/graphics/blur-effect/default.nix b/pkgs/tools/graphics/blur-effect/default.nix index 4990040131967..b22a2e8970b62 100644 --- a/pkgs/tools/graphics/blur-effect/default.nix +++ b/pkgs/tools/graphics/blur-effect/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/sonald/blur-effect; + homepage = "https://github.com/sonald/blur-effect"; description = "Off-screen image blurring utility using OpenGL ES 3.0"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index e57f80f738f34..3ac49b690d716 100644 --- a/pkgs/tools/graphics/briss/default.nix +++ b/pkgs/tools/graphics/briss/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = https://sourceforge.net/projects/briss/; + homepage = "https://sourceforge.net/projects/briss/"; description = "Java application for cropping PDF files"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index 1fd4d3324a0be..8122e5a5ec2d8 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "cfdg"; - version = "3.2_2"; + version = "3.3"; src = fetchFromGitHub { owner = "MtnViewJohn"; repo = "context-free"; rev = "Version${version}"; - sha256 = "14v1gya7h0p9dj16hw87wpmjfddmkz537w3kjvaribgxxp0gzyz5"; + sha256 = "13m8npccacmgxbs4il45zw53dskjh53ngv2nxahwqw8shjrws4mh"; }; buildInputs = [ libpng bison flex ffmpeg icu ]; diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 3d48b328934b5..5213245b7d4bf 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Multi-language OCR system"; - homepage = https://launchpad.net/cuneiform-linux; + homepage = "https://launchpad.net/cuneiform-linux"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 11ff4b743ddd6..f8e78d0171201 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.dechifro.org/dcraw/; + homepage = "https://www.dechifro.org/dcraw/"; description = "Decoder for many camera raw picture formats"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; # Once had cygwin problems diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/tools/graphics/ditaa/default.nix index c8c330d80e5b5..89a18ae1fe2a3 100644 --- a/pkgs/tools/graphics/ditaa/default.nix +++ b/pkgs/tools/graphics/ditaa/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ditaa-0.11.0"; src = fetchurl { - url = https://github.com/stathissideris/ditaa/releases/download/v0.11.0/ditaa-0.11.0-standalone.jar; + url = "https://github.com/stathissideris/ditaa/releases/download/v0.11.0/ditaa-0.11.0-standalone.jar"; sha256 = "1acnl7khz8aasg230nbsx9dyf8716scgb5l3679cb2bdzxisl64l"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Convert ascii art diagrams into proper bitmap graphics"; - homepage = https://github.com/stathissideris/ditaa; + homepage = "https://github.com/stathissideris/ditaa"; license = licenses.lgpl3; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index cb83e02689cfc..1dc4891d6423e 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = https://cgit.freedesktop.org/xorg/app/editres/; + homepage = "https://cgit.freedesktop.org/xorg/app/editres/"; description = "A dynamic resource editor for X Toolkit applications"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index 8c46e8154c104..89c861267f0b2 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://enblend.sourceforge.net/; + homepage = "http://enblend.sourceforge.net/"; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; license = licenses.gpl2; platforms = with platforms; linux; diff --git a/pkgs/tools/graphics/eplot/default.nix b/pkgs/tools/graphics/eplot/default.nix index ff2091fc29987..de729e38662d1 100644 --- a/pkgs/tools/graphics/eplot/default.nix +++ b/pkgs/tools/graphics/eplot/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { This package also includes the complementary 'ec' tool (say "extract column"). ''; - homepage = http://liris.cnrs.fr/christian.wolf/software/eplot/; + homepage = "http://liris.cnrs.fr/christian.wolf/software/eplot/"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/tools/graphics/epstool/default.nix index 2ad52d2de4379..aed49158599ab 100644 --- a/pkgs/tools/graphics/epstool/default.nix +++ b/pkgs/tools/graphics/epstool/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A utility to create or extract preview images in EPS files, fix bounding boxes and convert to bitmaps"; - homepage = http://pages.cs.wisc.edu/~ghost/gsview/epstool.htm; + homepage = "http://pages.cs.wisc.edu/~ghost/gsview/epstool.htm"; license = licenses.gpl2; maintainers = [ maintainers.asppsa ]; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/tools/graphics/escrotum/default.nix index 16f33251dd6ab..4a887688c4f54 100644 --- a/pkgs/tools/graphics/escrotum/default.nix +++ b/pkgs/tools/graphics/escrotum/default.nix @@ -23,7 +23,7 @@ buildPythonApplication { ''; meta = with lib; { - homepage = https://github.com/Roger/escrotum; + homepage = "https://github.com/Roger/escrotum"; description = "Linux screen capture using pygtk, inspired by scrot"; platforms = platforms.linux; maintainers = with maintainers; [ rasendubi ]; diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix index 83fec1287a6b8..68007ec3a6b22 100644 --- a/pkgs/tools/graphics/exif/default.nix +++ b/pkgs/tools/graphics/exif/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libexif popt libintl ]; meta = with stdenv.lib; { - homepage = https://libexif.github.io; + homepage = "https://libexif.github.io"; description = "A utility to read and manipulate EXIF data in digital photographs"; platforms = platforms.unix; license = licenses.lgpl21; diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix index 9ce95154cb0bb..3ca748aa956f7 100644 --- a/pkgs/tools/graphics/exiftags/default.nix +++ b/pkgs/tools/graphics/exiftags/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "exiftags-1.01"; src = fetchurl { - url = https://johnst.org/sw/exiftags/exiftags-1.01.tar.gz; + url = "https://johnst.org/sw/exiftags/exiftags-1.01.tar.gz"; sha256 = "194ifl6hybx2a5x8jhlh9i56k3qfc6p2l72z0ii1b7v0bzg48myr"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://johnst.org/sw/exiftags/; + homepage = "http://johnst.org/sw/exiftags/"; description = "Displays EXIF data from JPEG files"; license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/tools/graphics/facedetect/default.nix index cb697148d045d..690c7336b6955 100644 --- a/pkgs/tools/graphics/facedetect/default.nix +++ b/pkgs/tools/graphics/facedetect/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.thregr.org/~wavexx/software/facedetect/; + homepage = "https://www.thregr.org/~wavexx/software/facedetect/"; description = "A simple face detector for batch processing"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/tools/graphics/fbv/default.nix b/pkgs/tools/graphics/fbv/default.nix index c7fab17106727..561c007ff161c 100644 --- a/pkgs/tools/graphics/fbv/default.nix +++ b/pkgs/tools/graphics/fbv/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "View pictures on a linux framebuffer device"; - homepage = http://s-tech.elsat.net.pl/fbv/; + homepage = "http://s-tech.elsat.net.pl/fbv/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index 8f94624febe82..ef699b5437a02 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -48,7 +48,7 @@ perlPackages.buildPerlPackage rec { meta = with stdenv.lib; { description = "General purpose pipe-oriented plotting tool"; - homepage = https://github.com/dkogan/feedgnuplot/; + homepage = "https://github.com/dkogan/feedgnuplot/"; license = with licenses; [ artistic1 gpl1Plus ]; platforms = platforms.unix; maintainers = with maintainers; [ mnacamura ]; diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 2bce8ec4941b7..cc387e29412bb 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Static photo gallery generator"; - homepage = http://www.thregr.org/~wavexx/software/fgallery/; + homepage = "http://www.thregr.org/~wavexx/software/fgallery/"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix index 3fc82a9c72a04..6a3d9a29db371 100644 --- a/pkgs/tools/graphics/fim/default.nix +++ b/pkgs/tools/graphics/fim/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { to be a highly customizable and scriptable for users who are comfortable with software like the VIM text editor or the Mutt mail user agent. ''; - homepage = https://www.nongnu.org/fbi-improved/; + homepage = "https://www.nongnu.org/fbi-improved/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix index a6277f58cbdb9..0f1bf80655144 100644 --- a/pkgs/tools/graphics/flam3/default.nix +++ b/pkgs/tools/graphics/flam3/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cosmic recursive fractal flames"; - homepage = https://flam3.com/; + homepage = "https://flam3.com/"; maintainers = [ maintainers.nand0p ]; platforms = platforms.linux; license = licenses.cc-by-nc-sa-20; diff --git a/pkgs/tools/graphics/ggobi/default.nix b/pkgs/tools/graphics/ggobi/default.nix index de02865c36e26..82ee194ad1218 100644 --- a/pkgs/tools/graphics/ggobi/default.nix +++ b/pkgs/tools/graphics/ggobi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Visualization program for exploring high-dimensional data"; - homepage = http://www.ggobi.org/; + homepage = "http://www.ggobi.org/"; license = licenses.cpl10; platforms = platforms.linux; maintainers = [ maintainers.michelk ]; diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 9b3836b9decc1..007ba0f99720a 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Command-line tool for creating, editing, and getting information about GIF images and animations"; - homepage = https://www.lcdf.org/gifsicle/; + homepage = "https://www.lcdf.org/gifsicle/"; license = stdenv.lib.licenses.gpl2; platforms = platforms.all; maintainers = with stdenv.lib.maintainers; [ zimbatm ]; diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 3d1e2114196ac..8c808657f4c5c 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "0.10.2"; + version = "0.10.4"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "0gsk1pagg89q1mi3d28q6dsnanncwphw9lrb7qybppw0vyvqlqbx"; + sha256 = "1ly465y435cha22rmnq632hgq2s7y0akrcna6m30f6l078br8mhn"; }; - cargoSha256 = "0k7pzcll7hn2a354vviyj8dr0kq63cwsldgv303kwklmxji02d0v"; + cargoSha256 = "0khfkh1ylqv4v5dsb4hsha5fh3b62hcvkp3swplv64h626p3q54s"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/tools/graphics/glee/default.nix index a68e64c0894c5..58fcfbfd9acaa 100644 --- a/pkgs/tools/graphics/glee/default.nix +++ b/pkgs/tools/graphics/glee/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GL Easy Extension Library"; - homepage = https://sourceforge.net/p/glee/glee/; + homepage = "https://sourceforge.net/p/glee/glee/"; maintainers = with maintainers; [ nand0p ]; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 5668e755d0174..deea9e10a1a06 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "OpenGL (ES) 2.0 benchmark"; - homepage = https://github.com/glmark2/glmark2; + homepage = "https://github.com/glmark2/glmark2"; license = licenses.gpl3Plus; longDescription = '' glmark2 is a benchmark for OpenGL (ES) 2.0. It uses only the subset of diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index 0710f47cb5718..a1160fd738386 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Test utilities for OpenGL"; - homepage = https://www.mesa3d.org/; + homepage = "https://www.mesa3d.org/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index a8dd35ce7b049..b7650b220809e 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -137,7 +137,7 @@ mkDerivation rec { meta = with lib; { description = variants.${variant}.description; - homepage = http://gmic.eu/; + homepage = "http://gmic.eu/"; license = licenses.gpl3; platforms = platforms.unix; }; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 3f181d12ba07b..f4be95556c8f9 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open and full-featured framework for image processing"; - homepage = http://gmic.eu/; + homepage = "http://gmic.eu/"; license = licenses.cecill20; platforms = platforms.unix; }; diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index c04101575c73d..fc1892317fa13 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -63,7 +63,7 @@ in enableParallelBuilding = true; meta = with lib; { - homepage = http://www.gnuplot.info/; + homepage = "http://www.gnuplot.info/"; description = "A portable command-line driven graphing utility for many platforms"; platforms = platforms.linux ++ platforms.darwin; license = { @@ -73,7 +73,7 @@ in # be distributed as patches to the released version. Permission to # distribute binaries produced by compiling modified sources is granted, # provided you: ... - url = https://sourceforge.net/p/gnuplot/gnuplot-main/ci/master/tree/Copyright; + url = "https://sourceforge.net/p/gnuplot/gnuplot-main/ci/master/tree/Copyright"; }; maintainers = with maintainers; [ lovek323 ]; }; diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index 3b9d8a4cca5de..a65f5ce455c3f 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -12,7 +12,7 @@ let # https://gitlab.com/graphviz/graphviz/issues/1367 CVE-2018-10196 fetchpatch { name = "CVE-2018-10196.patch"; - url = https://gitlab.com/graphviz/graphviz/uploads/30f8f0b00e357c112ac35fb20241604a/p.diff; + url = "https://gitlab.com/graphviz/graphviz/uploads/30f8f0b00e357c112ac35fb20241604a/p.diff"; sha256 = "074qx6ch9blrnlilmz7p96fkiz2va84x2fbqdza5k4808rngirc7"; excludes = ["tests/*"]; # we don't run them and they don't apply }; @@ -80,7 +80,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://graphviz.org; + homepage = "https://graphviz.org"; description = "Graph visualization tools"; license = licenses.epl10; platforms = platforms.unix; diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/tools/graphics/grim/default.nix index ed7ed5fdef05d..ab0418bd0dc68 100644 --- a/pkgs/tools/graphics/grim/default.nix +++ b/pkgs/tools/graphics/grim/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Grab images from a Wayland compositor"; - homepage = https://github.com/emersion/grim; + homepage = "https://github.com/emersion/grim"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ buffet ]; diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 7465ebb788365..ebb50cfad2ee3 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { to make annotations on the screen. ''; - homepage = https://github.com/bk138/gromit-mpx; + homepage = "https://github.com/bk138/gromit-mpx"; maintainers = with maintainers; [ pjones ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/graphics/guff/default.nix b/pkgs/tools/graphics/guff/default.nix index db218a812e69a..f03adb7bff0f3 100644 --- a/pkgs/tools/graphics/guff/default.nix +++ b/pkgs/tools/graphics/guff/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A plot device"; - homepage = https://github.com/silentbicycle/guff; + homepage = "https://github.com/silentbicycle/guff"; license = licenses.isc; maintainers = [ maintainers.marsam ]; platforms = platforms.all; diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index b16dbe2198534..0689c9cc24863 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.nongnu.org/icoutils/; + homepage = "https://www.nongnu.org/icoutils/"; description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files"; license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/tools/graphics/ifm/default.nix b/pkgs/tools/graphics/ifm/default.nix index c6e8df31dd08f..8478395a874f1 100644 --- a/pkgs/tools/graphics/ifm/default.nix +++ b/pkgs/tools/graphics/ifm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; # ifm-scan.l:16:10: fatal error: ifm-parse.h: No such file or directory meta = with lib; { - homepage = https://bitbucket.org/zondo/ifm; + homepage = "https://bitbucket.org/zondo/ifm"; description = "Interactive fiction mapper"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/imageworsener/default.nix b/pkgs/tools/graphics/imageworsener/default.nix index 7c3d893170014..3eade7ee76b9c 100644 --- a/pkgs/tools/graphics/imageworsener/default.nix +++ b/pkgs/tools/graphics/imageworsener/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A raster image scaling and processing utility"; - homepage = https://entropymine.com/imageworsener/; + homepage = "https://entropymine.com/imageworsener/"; changelog = "https://github.com/jsummers/${pname}/blob/${version}/changelog.txt"; license = licenses.mit; maintainers = with maintainers; [ emily ]; diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix index 1099b11176c86..c994ee02811e2 100644 --- a/pkgs/tools/graphics/imgur-screenshot/default.nix +++ b/pkgs/tools/graphics/imgur-screenshot/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for easy screencapping and uploading to imgur"; - homepage = https://github.com/jomo/imgur-screenshot/; + homepage = "https://github.com/jomo/imgur-screenshot/"; platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ lw ]; diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix index 883453379c4e1..ea3b1ed9b02de 100644 --- a/pkgs/tools/graphics/imgurbash2/default.nix +++ b/pkgs/tools/graphics/imgurbash2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgurbash2"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "ram-on"; repo = "imgurbash2"; rev = version; - sha256 = "1hqghlk8c6svfszhmp02bhkc791lqhqffgiypf05giqmr5d8b9a9"; + sha256 = "10zs6p17psl1vq5vpkfkf9nrlmibk6v1ds3yxbf1rip1zaqlwxg6"; }; installPhase = '' @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; - homepage = https://github.com/ram-on/imgurbash2; + homepage = "https://github.com/ram-on/imgurbash2"; }; } diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix index 1be5f0120fd99..05818bf8dda1b 100644 --- a/pkgs/tools/graphics/jbig2enc/default.nix +++ b/pkgs/tools/graphics/jbig2enc/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "jbig2enc-0.28"; src = fetchurl { - url = https://github.com/agl/jbig2enc/archive/0.28-dist.tar.gz; + url = "https://github.com/agl/jbig2enc/archive/0.28-dist.tar.gz"; sha256 = "1wc0lmqz4jag3rhhk1xczlqpfv2qqp3fz7wzic2lba3vsbi1rrw3"; }; diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index 13df4ede8ecfb..9f5ffcad8fd63 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.sentex.net/~mwandel/jhead/; + homepage = "http://www.sentex.net/~mwandel/jhead/"; description = "Exif Jpeg header manipulation tool"; license = licenses.publicDomain; maintainers = with maintainers; [ rycee ]; diff --git a/pkgs/tools/graphics/kst/default.nix b/pkgs/tools/graphics/kst/default.nix index 480ae328cd38b..9c0c8bae49b75 100644 --- a/pkgs/tools/graphics/kst/default.nix +++ b/pkgs/tools/graphics/kst/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Real-time large-dataset viewing and plotting tool"; - homepage = https://kst-plot.kde.org/; + homepage = "https://kst-plot.kde.org/"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/tools/graphics/leela/default.nix b/pkgs/tools/graphics/leela/default.nix index d1b31f3915261..0c56f3859839e 100644 --- a/pkgs/tools/graphics/leela/default.nix +++ b/pkgs/tools/graphics/leela/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "CLI frontend to the poppler-glib libary of PDF tools"; - homepage = https://github.com/TrilbyWhite/Leela; + homepage = "https://github.com/TrilbyWhite/Leela"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.puffnfresh ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix index 2a4f8a310ada5..0088422c6a4ab 100644 --- a/pkgs/tools/graphics/lepton/default.nix +++ b/pkgs/tools/graphics/lepton/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optionals stdenv.isLinux [ glibc.static ]; meta = with stdenv.lib; { - homepage = https://github.com/dropbox/lepton; + homepage = "https://github.com/dropbox/lepton"; description = "A tool to losslessly compress JPEGs"; license = licenses.asl20; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index aed8b0573bae7..83178824eab62 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { glm freetype ]; meta = with stdenv.lib; { - homepage = https://logstalgia.io/; + homepage = "https://logstalgia.io/"; description = "Website traffic visualization tool"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/graphics/lprof/default.nix b/pkgs/tools/graphics/lprof/default.nix index 42ccc4d5022e9..9c666462ef76c 100644 --- a/pkgs/tools/graphics/lprof/default.nix +++ b/pkgs/tools/graphics/lprof/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = mirror://sourceforge/lprof/lprof/lprof-1.11.4/lprof-1.11.4.1.tar.gz; + url = "mirror://sourceforge/lprof/lprof/lprof-1.11.4/lprof-1.11.4.1.tar.gz"; sha256 = "0q8x24fm5yyvm151xrl3l03p7hvvciqnkbviprfnvlr0lyg9wsrn"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Little CMS ICC profile construction set"; - homepage = https://sourceforge.net/projects/lprof; + homepage = "https://sourceforge.net/projects/lprof"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 6a0db954da643..fc8a98c199309 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -71,7 +71,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open source, physically based, unbiased rendering engine"; - homepage = https://luxcorerender.org/; + homepage = "https://luxcorerender.org/"; maintainers = with maintainers; [ hodapp ]; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index 8f3a4dc5c6593..29c9144f89fed 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "maim"; - version = "5.5.3"; + version = "5.6.3"; src = fetchFromGitHub { owner = "naelstrof"; repo = "maim"; rev = "v${version}"; - sha256 = "1kbxsz8whfxl5blwsvpva2q95zwy72argwhi1cfqh5lrhzq5zrpp"; + sha256 = "181mjjrjb9fs1ficcv9miqbk94v95j1yli7fjp2dj514g7nj9l3x"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { take only a region, and relies on slop to query for regions. maim is supposed to be an improved scrot. ''; + changelog = "https://github.com/naelstrof/maim/releases/tag/v${version}"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.gpl3Plus; maintainers = with maintainers; [ primeos mbakke ]; diff --git a/pkgs/tools/graphics/mesa-demos/default.nix b/pkgs/tools/graphics/mesa-demos/default.nix new file mode 100644 index 0000000000000..12e751e0f0875 --- /dev/null +++ b/pkgs/tools/graphics/mesa-demos/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, freeglut, glew, libGL, libGLU, libX11, libXext, mesa, pkg-config, wayland }: + +stdenv.mkDerivation rec { + pname = "mesa-demos"; + version = "8.4.0"; + + src = fetchurl { + url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${pname}-${version}.tar.bz2"; + sha256 = "0zgzbz55a14hz83gbmm0n9gpjnf5zadzi2kjjvkn6khql2a9rs81"; + }; + + buildInputs = [ freeglut glew libX11 libXext libGL libGLU mesa mesa.osmesa wayland ]; + nativeBuildInputs = [ pkg-config ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Collection of demos and test programs for OpenGL and Mesa"; + homepage = "https://www.mesa3d.org/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ andersk ]; + }; +} diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index 613a906a7b4ed..f6bec5983c2af 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -1,4 +1,15 @@ -{ stdenv, fetchurl, flex, bison, gd, libpng, libjpeg, freetype, zlib, libwebp, runtimeShell }: +{ stdenv +, bison +, fetchurl +, flex +, gd +, libjpeg +, libpng +, libwebp +, pkg-config +, runtimeShell +, zlib +}: let version = "0.20"; @@ -12,15 +23,18 @@ stdenv.mkDerivation { sha256 = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23"; }; - buildInputs = [ flex bison gd libjpeg libpng freetype zlib libwebp ]; + nativeBuildInputs = [ bison flex pkg-config ]; + buildInputs = [ gd libjpeg libpng libwebp zlib ]; doCheck = true; preCheck = '' sed -i -e "s|#!/bin/bash|#!${runtimeShell}|" test/renderercheck.sh ''; + outputs = [ "out" "man" ]; + meta = { - homepage = http://www.mcternan.me.uk/mscgen/; + homepage = "http://www.mcternan.me.uk/mscgen/"; description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index 65ccfecedd682..68cf812d052a1 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://niftools.sourceforge.net/wiki/NifSkope; + homepage = "http://niftools.sourceforge.net/wiki/NifSkope"; description = "A tool for analyzing and editing NetImmerse/Gamebryo '*.nif' files"; maintainers = with maintainers; [ eelco ma27 ]; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/optar/default.nix b/pkgs/tools/graphics/optar/default.nix index b831e359e9cc8..4eee8acb97980 100644 --- a/pkgs/tools/graphics/optar/default.nix +++ b/pkgs/tools/graphics/optar/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Optar stands for OPTical ARchiver - it's a codec for encoding data on paper"; - homepage = http://ronja.twibright.com/optar/; + homepage = "http://ronja.twibright.com/optar/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; # possibly others, but only tested on Linux diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index bc849b21117f6..93c2f2c350256 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { '' else null; meta = with stdenv.lib; { - homepage = http://optipng.sourceforge.net/; + homepage = "http://optipng.sourceforge.net/"; description = "A PNG optimizer"; license = licenses.zlib; platforms = platforms.unix; diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 7326e2427d034..4135eb966a343 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "2.3.0"; + version = "3.0.0"; pname = "oxipng"; src = fetchFromGitHub { owner = "shssoichiro"; repo = pname; rev = "v${version}"; - sha256 = "1cx026g1gdvk4qmnrbsmg46y2lizx0wqny25hhdjnh9pwzjc77mh"; + sha256 = "1k6q5xdfbw4vv4mvms32fhih7k1gpjj98nzrd171ig1vv3gpwwpg"; }; - cargoSha256 = "17wgsj2fcxhpsib3ps20sninbf236f9ihf4lnnfrawknmqfvq4s9"; + cargoSha256 = "19h3fwc5s2yblah5lnsm0f4m618p2bkdz2qz47kfi6jdvk89j8z7"; # https://crates.io/crates/cloudflare-zlib#arm-vs-nightly-rust cargoBuildFlags = [ "--features=cloudflare-zlib/arm-always" ]; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; meta = with stdenv.lib; { - homepage = https://github.com/shssoichiro/oxipng; + homepage = "https://github.com/shssoichiro/oxipng"; description = "A multithreaded lossless PNG compression optimizer"; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix index 46eb61d1cf75f..b1463544bbd70 100644 --- a/pkgs/tools/graphics/pdf2svg/default.nix +++ b/pkgs/tools/graphics/pdf2svg/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PDF converter to SVG format"; - homepage = http://www.cityinthesky.co.uk/opensource/pdf2svg; + homepage = "http://www.cityinthesky.co.uk/opensource/pdf2svg"; license = licenses.gpl2; maintainers = [ maintainers.ianwookim ]; platforms = platforms.unix; diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index 8733b2c1caa03..80f7404bc94f1 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { # But that needs user registration to allow downloading. # This is an evolution from pdfread 1.7 in http://pdfread.sourceforge.net/ # Temporary place: - url = http://vicerveza.homeunix.net/~viric/soft/PDFRead-1.8.2-Source-noGUI-noInstaller.zip; + url = "http://vicerveza.homeunix.net/~viric/soft/PDFRead-1.8.2-Source-noGUI-noInstaller.zip"; sha256 = "0mzxpnk97f0ww5ds7h4wsval3g4lnrhv6rhspjs7cy4i41gmk8an"; }; @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "PDF/DJVU to ebook format converter"; - homepage = https://www.mobileread.com/forums/showthread.php?t=21906; + homepage = "https://www.mobileread.com/forums/showthread.php?t=21906"; license = licenses.mit; }; } diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 668f73c04f429..1c437a3f05cd4 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, darwin , openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat -, fftw, gsl, libexif, perl, opencv, qt5, netpbm +, fftw, gsl, libexif, perl, opencv2, qt5, netpbm }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openexr zlib imagemagick fftwFloat - fftw gsl libexif perl opencv qt5.qtbase netpbm + fftw gsl libexif perl opencv2 qt5.qtbase netpbm ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ OpenGL GLUT ]) else [ @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { patches = [ ./threads.patch ./pfstools.patch ./pfsalign.patch ]; meta = with stdenv.lib; { - homepage = http://pfstools.sourceforge.net/; + homepage = "http://pfstools.sourceforge.net/"; description = "Toolkit for manipulation of HDR images"; platforms = platforms.linux; license = licenses.lgpl2; diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/tools/graphics/pgf/default.nix index 6ae45cc85331f..d3f01fa7d1f09 100644 --- a/pkgs/tools/graphics/pgf/default.nix +++ b/pkgs/tools/graphics/pgf/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { # configureFlags = optional static "--enable-static --disable-shared"; meta = { - homepage = http://www.libpgf.org/; + homepage = "https://www.libpgf.org/"; description = "Progressive Graphics Format command line program"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix index d0e6785787230..409a91dba0d57 100644 --- a/pkgs/tools/graphics/ploticus/default.nix +++ b/pkgs/tools/graphics/ploticus/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/ploticus/ploticus/2.41/pl241src.tar.gz; + url = "mirror://sourceforge/ploticus/ploticus/2.41/pl241src.tar.gz"; sha256 = "1065r0nizjixi9sxxfxrnwg10r458i6fgsd23nrxa200rypvdk7c"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation { over colors, styles, options and details.''; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; - homepage = http://ploticus.sourceforge.net/; + homepage = "http://ploticus.sourceforge.net/"; platforms = with platforms; linux; }; } diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index 61e21b1a33da5..7292b2ac37bf8 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { graphics. ''; - homepage = https://www.gnu.org/software/plotutils/; + homepage = "https://www.gnu.org/software/plotutils/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.marcweber ]; diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index f7bd8d520c876..ba5082ac30487 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -21,10 +21,9 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://pmt.sourceforge.net/pngcrush; + homepage = "http://pmt.sourceforge.net/pngcrush"; description = "Verifies the integrity of PNG, JNG and MNG files"; license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index fce1f3f913cff..5bc52b92f0d24 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -17,10 +17,9 @@ stdenv.mkDerivation rec { buildInputs = [ libpng ]; meta = { - homepage = http://pmt.sourceforge.net/pngcrush; + homepage = "http://pmt.sourceforge.net/pngcrush"; description = "A PNG optimizer"; license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/tools/graphics/pngnq/default.nix b/pkgs/tools/graphics/pngnq/default.nix index e01f3ea2acc5b..ca1edda454e97 100644 --- a/pkgs/tools/graphics/pngnq/default.nix +++ b/pkgs/tools/graphics/pngnq/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://pngnq.sourceforge.net/; + homepage = "http://pngnq.sourceforge.net/"; description = "A PNG quantizer"; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/graphics/pngout/default.nix b/pkgs/tools/graphics/pngout/default.nix index 9d0e1b0ea8790..33a62478a4b6b 100644 --- a/pkgs/tools/graphics/pngout/default.nix +++ b/pkgs/tools/graphics/pngout/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "pngout-20150319"; src = fetchurl { - url = http://static.jonof.id.au/dl/kenutils/pngout-20150319-linux.tar.gz; + url = "http://static.jonof.id.au/dl/kenutils/pngout-20150319-linux.tar.gz"; sha256 = "0iwv941hgs2g7ljpx48fxs24a70m2whrwarkrb77jkfcd309x2h7"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "A tool that aggressively optimizes the sizes of PNG images"; license = stdenv.lib.licenses.unfree; - homepage = http://advsys.net/ken/utils.htm; + homepage = "http://advsys.net/ken/utils.htm"; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix index 51be6afd102e5..2c9e3b272e705 100644 --- a/pkgs/tools/graphics/pngquant/default.nix +++ b/pkgs/tools/graphics/pngquant/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpng zlib lcms2 ]; meta = with stdenv.lib; { - homepage = https://pngquant.org/; + homepage = "https://pngquant.org/"; description = "A tool to convert 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix index ed8fa5ee5192f..2300c65f24b51 100644 --- a/pkgs/tools/graphics/pngtoico/default.nix +++ b/pkgs/tools/graphics/pngtoico/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pngtoico-1.0"; src = fetchurl { - url = mirror://kernel/software/graphics/pngtoico/pngtoico-1.0.tar.gz; + url = "mirror://kernel/software/graphics/pngtoico/pngtoico-1.0.tar.gz"; sha256 = "1xb4aa57sjvgqfp01br3dm72hf7q0gb2ad144s1ifrs09215fgph"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ libpng ]; meta = { - homepage = https://www.kernel.org/pub/software/graphics/pngtoico/; + homepage = "https://www.kernel.org/pub/software/graphics/pngtoico/"; description = "Small utility to convert a set of PNG images to Microsoft ICO format"; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index ead44897968fa..94ce3e7f06b10 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.povray.org/; + homepage = "http://www.povray.org/"; description = "Persistence of Vision Raytracer"; license = licenses.free; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index ebd265b8a80c6..ec06088ae52f2 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Translates PostScript and PDF graphics into other vector formats"; - homepage = https://sourceforge.net/projects/pstoedit/; + homepage = "https://sourceforge.net/projects/pstoedit/"; license = licenses.gpl2; maintainers = [ maintainers.marcweber ]; platforms = platforms.unix; diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix index 97c400fbc9e32..683a2c73f454a 100644 --- a/pkgs/tools/graphics/rocket/default.nix +++ b/pkgs/tools/graphics/rocket/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase }: +{ mkDerivation, stdenv, fetchFromGitHub, qmake, qtbase }: -stdenv.mkDerivation { +mkDerivation { pname = "rocket"; version = "2018-06-09"; diff --git a/pkgs/tools/graphics/s2png/default.nix b/pkgs/tools/graphics/s2png/default.nix index e7d3b8151a445..745a032b068aa 100644 --- a/pkgs/tools/graphics/s2png/default.nix +++ b/pkgs/tools/graphics/s2png/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installFlags = [ "prefix=" "DESTDIR=$(out)" ]; meta = { - homepage = https://github.com/dbohdan/s2png/; + homepage = "https://github.com/dbohdan/s2png/"; description = "Store any data in PNG images"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.dbohdan ]; diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix index fd26869d298be..14f925a4fd2dc 100644 --- a/pkgs/tools/graphics/scanbd/default.nix +++ b/pkgs/tools/graphics/scanbd/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { scanbd can use all sane-backends or some special backends from the (old) scanbuttond project. ''; - homepage = http://scanbd.sourceforge.net/; - downloadPage = https://sourceforge.net/projects/scanbd/; + homepage = "http://scanbd.sourceforge.net/"; + downloadPage = "https://sourceforge.net/projects/scanbd/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index 413bc8c52f1e5..f9042645be0be 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -3,20 +3,20 @@ stdenv.mkDerivation rec { pname = "scrot"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "resurrecting-open-source-projects"; repo = pname; rev = version; - sha256 = "08gkdby0ysx2mki57z81zlm7vfnq9c1gq692xw67cg5vv2p3320w"; + sha256 = "0x70hd59ik37kqd8xqpwrz46np01jv324iz28x2s0kk36d7sblsj"; }; nativeBuildInputs = [ autoreconfHook autoconf-archive ]; buildInputs = [ giblib xlibsWrapper libXfixes libXcursor ]; meta = with stdenv.lib; { - homepage = https://github.com/resurrecting-open-source-projects/scrot; + homepage = "https://github.com/resurrecting-open-source-projects/scrot"; description = "A command-line screen capture utility"; platforms = platforms.linux; maintainers = with maintainers; [ globin ]; diff --git a/pkgs/tools/graphics/sng/default.nix b/pkgs/tools/graphics/sng/default.nix index 71bf0160a1e13..45f5a6f2c235f 100644 --- a/pkgs/tools/graphics/sng/default.nix +++ b/pkgs/tools/graphics/sng/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Minilanguage designed to represent the entire contents of a PNG file in an editable form"; - homepage = http://sng.sourceforge.net/; + homepage = "http://sng.sourceforge.net/"; license = licenses.zlib; maintainers = [ maintainers.dezgeg ]; platforms = platforms.unix; diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix new file mode 100644 index 0000000000000..3ca698f1c54af --- /dev/null +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, python3 }: + +stdenv.mkDerivation rec { + pname = "spirv-cross"; + version = "2020-05-19"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Cross"; + rev = version; + sha256 = "0zyijp9zx9wbd4i5lwjap7n793iz6yjkf27la60dsffxl75yy9pd"; + }; + + nativeBuildInputs = [ cmake python3 ]; + + meta = with stdenv.lib; { + description = "A tool designed for parsing and converting SPIR-V to other shader languages"; + homepage = "https://github.com/KhronosGroup/SPIRV-Cross"; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = with maintainers; [ Flakebi ]; + }; +} diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix index 2c586cd3b1f6b..73dd9c04be992 100644 --- a/pkgs/tools/graphics/structure-synth/default.nix +++ b/pkgs/tools/graphics/structure-synth/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { version = "v1.5"; src = fetchurl { - url = mirror://sourceforge/structuresynth/StructureSynth-Source-v1.5.0.zip; + url = "mirror://sourceforge/structuresynth/StructureSynth-Source-v1.5.0.zip"; sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb"; }; @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Application for generating 3D structures by specifying a design grammar"; - homepage = http://structuresynth.sourceforge.net; + homepage = "http://structuresynth.sourceforge.net"; maintainers = with maintainers; [ hodapp ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/swfdec/default.nix b/pkgs/tools/graphics/swfdec/default.nix index 8a64e25d879a5..d721d06ad5846 100644 --- a/pkgs/tools/graphics/swfdec/default.nix +++ b/pkgs/tools/graphics/swfdec/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl21 ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://swfdec.freedesktop.org/wiki/; + homepage = "https://swfdec.freedesktop.org/wiki/"; }; } diff --git a/pkgs/tools/graphics/transfig/default.nix b/pkgs/tools/graphics/transfig/default.nix index db204113226e2..960e7fd3ba38e 100644 --- a/pkgs/tools/graphics/transfig/default.nix +++ b/pkgs/tools/graphics/transfig/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "transfig-3.2.4"; src = fetchurl { - url = ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz; + url = "ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz"; sha256 = "0429snhp5acbz61pvblwlrwv8nxr6gf12p37f9xxwrkqv4ir7dd4"; }; diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix index 44a86e961ec8b..f3e6f0d8b96fd 100644 --- a/pkgs/tools/graphics/unpaper/default.nix +++ b/pkgs/tools/graphics/unpaper/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libav libxslt ]; meta = with stdenv.lib; { - homepage = https://www.flameeyes.eu/projects/unpaper; + homepage = "https://www.flameeyes.eu/projects/unpaper"; description = "Post-processing tool for scanned sheets of paper"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 8546c4e8182af..1bfb2f880204f 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -12,9 +12,10 @@ , libjpeg , libgsf , libexif +, libheif , ApplicationServices , python27 -, libpng ? null +, libpng , fetchFromGitHub , fetchpatch , autoreconfHook @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.9.1"; + version = "8.9.2"; outputs = [ "bin" "out" "man" "dev" ]; @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "01vgvzlygg3fzpinb0x1rdm2sqvnqxmvxbnlbg73ygdadv3l2s0v"; + sha256 = "0pgvcp5yjk96izh7kjfprjd9kddx7zqrwwhm8dyalhrwbmj6c2q5"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -41,15 +42,6 @@ stdenv.mkDerivation rec { ''; }; - patches = [ - # autogen.sh should not run configure - # https://github.com/libvips/libvips/pull/1566 - (fetchpatch { - url = "https://github.com/libvips/libvips/commit/97a92e0e6abab652fdf99313b138bfd77d70deb4.patch"; - sha256 = "0w1sm5wmvfp8svdpk8mz57c1n6zzy3snq0g2f8yxjamv0d2gw2dp"; - }) - ]; - nativeBuildInputs = [ pkgconfig autoreconfHook @@ -69,6 +61,8 @@ stdenv.mkDerivation rec { libjpeg libgsf libexif + libheif + libpng python27 libpng expat diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index f61835ac81f89..71bcdc2e2691b 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LunarG Vulkan loader"; - homepage = https://www.lunarg.com; + homepage = "https://www.lunarg.com"; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index 5537540382bf8..66c8b1d5cc743 100644 --- a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Improved fork of Waifu2X C++ using OpenCL and OpenCV"; - homepage = https://github.com/DeadSix27/waifu2x-converter-cpp; + homepage = "https://github.com/DeadSix27/waifu2x-converter-cpp"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.xzfc ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/graphics/wdisplays/default.nix b/pkgs/tools/graphics/wdisplays/default.nix index baa05be821bc5..0993a39983ed7 100644 --- a/pkgs/tools/graphics/wdisplays/default.nix +++ b/pkgs/tools/graphics/wdisplays/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gtk3, epoxy, wayland }: -stdenv.mkDerivation { - pname = "wdisplays-unstable"; - version = "2020-01-12"; + +stdenv.mkDerivation rec { + pname = "wdisplays"; + version = "1.0"; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -10,8 +11,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "cyclopsian"; repo = "wdisplays"; - rev = "ba331cab535318888a562f5a2731d2523b310dac"; - sha256 = "0fk3l78hirxdi74iqmq6mxi9daqnxdkbb5a2wfshmr11ic9xixpm"; + rev = version; + sha256 = "1xhgrcihja2i7yg54ghbwr1v6kf8jnsfcp364yb97vkxskc4y21y"; }; meta = let inherit (stdenv) lib; in { diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index 2aa6abcccfc4b..ee083c3e301b7 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = https://wkhtmltopdf.org/; + homepage = "https://wkhtmltopdf.org/"; description = "Tools for rendering web pages to PDF or images"; longDescription = '' wkhtmltopdf and wkhtmltoimage are open source (LGPL) command line tools diff --git a/pkgs/tools/graphics/xcftools/default.nix b/pkgs/tools/graphics/xcftools/default.nix index 749631999e49c..a8b0b406aa426 100644 --- a/pkgs/tools/graphics/xcftools/default.nix +++ b/pkgs/tools/graphics/xcftools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://henning.makholm.net/software; + homepage = "http://henning.makholm.net/software"; description = "Command-line tools for converting Gimp XCF files"; longDescription = '' A set of fast command-line tools for extracting information from diff --git a/pkgs/tools/graphics/xcur2png/default.nix b/pkgs/tools/graphics/xcur2png/default.nix index 1e3da5dddecf7..f917328460c2a 100644 --- a/pkgs/tools/graphics/xcur2png/default.nix +++ b/pkgs/tools/graphics/xcur2png/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/eworm-de/xcur2png/releases; + homepage = "https://github.com/eworm-de/xcur2png/releases"; description = "Convert X cursors to PNG images"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix index 6dd0b20687840..be8b20fd052ce 100644 --- a/pkgs/tools/graphics/yafaray-core/default.nix +++ b/pkgs/tools/graphics/yafaray-core/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "yafaray-core"; - version = "3.3.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "YafaRay"; repo = "Core"; rev = "v${version}"; - sha256 = "04p3nlg1rv617qf8v1nzjl6f0w43rvi8w9j6l6ck4bvl77v6cjp6"; + sha256 = "0ipkrgn5siad6y8naw1pgxkxas70l09g97vabyfbx1k67xrr4ldp"; }; preConfigure = '' @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open source raytracer"; - homepage = http://www.yafaray.org; + homepage = "http://www.yafaray.org"; maintainers = with maintainers; [ hodapp ]; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 7610b4e56fb01..229d3f3cdbdbc 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "zbar"; - version = "0.23"; + version = "0.23.1"; outputs = [ "out" "lib" "dev" "doc" "man" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "mchehab"; repo = "zbar"; rev = version; - sha256 = "0hlxakpyjg4q9hp7yp3har1n78341b4knwyll28hn48vykg28pza"; + sha256 = "0l4nxha8k18iqzrbqpgca49lrf1gigy3kpbzl3ldw2lw8alwy8x2"; }; nativeBuildInputs = [ @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ delroth raskin ]; platforms = platforms.unix; license = licenses.lgpl21; - homepage = https://github.com/mchehab/zbar; + homepage = "https://github.com/mchehab/zbar"; }; } diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/tools/graphics/zxing/default.nix index 97bbeb4d2d43a..d295a5899c50a 100644 --- a/pkgs/tools/graphics/zxing/default.nix +++ b/pkgs/tools/graphics/zxing/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.asl20; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://github.com/zxing/zxing; + homepage = "https://github.com/zxing/zxing"; }; } diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix index 230b2926561bf..043b4438b3ccf 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isFcitxEngine = true; description = "A standalone module for fcitx that uses web API to provide better pinyin result"; - homepage = https://github.com/fcitx/fcitx-cloudpinyin; + homepage = "https://github.com/fcitx/fcitx-cloudpinyin"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index 9e0ef551d82c7..02724a94be391 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isFcitxEngine = true; description = "Fcitx Wrapper for libpinyin, Library to deal with pinyin"; - homepage = https://github.com/fcitx/fcitx-libpinyin; + homepage = "https://github.com/fcitx/fcitx-libpinyin"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index 9f062036438f9..f04acb72b4720 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -96,7 +96,7 @@ in clangStdenv.mkDerivation rec { meta = with clangStdenv.lib; { isFcitxEngine = true; description = "Fcitx engine for Google japanese input method"; - homepage = https://github.com/google/mozc; + homepage = "https://github.com/google/mozc"; downloadPage = "http://download.fcitx-im.org/fcitx-mozc/"; license = licenses.free; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix index 095be7469cd80..1410dcc1f1cdb 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isFcitxEngine = true; - homepage = https://github.com/fcitx/fcitx-rime; - downloadPage = https://download.fcitx-im.org/fcitx-rime/; + homepage = "https://github.com/fcitx/fcitx-rime"; + downloadPage = "https://download.fcitx-im.org/fcitx-rime/"; description = "Rime support for Fcitx"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index 60de9e6910e38..99a92a95060a6 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -19,7 +19,7 @@ let sha256 = "1svcb97sq7nrywp5f2ws57cqvlic8j6p811d9ngflplj8xw5sjn4"; }; table = fetchurl { - url = http://download.fcitx-im.org/data/table.tar.gz; + url = "http://download.fcitx-im.org/data/table.tar.gz"; sha256 = "1dw7mgbaidv3vqy0sh8dbfv8631d2zwv5mlb7npf69a1f8y0b5k1"; }; pystroke-data = let PY_STROKE_VER="20121124"; in fetchurl { @@ -31,7 +31,7 @@ let sha256 = "011cg7wssssm6hm564cwkrrnck2zj5rxi7p9z5akvhg6gp4nl522"; }; pinyin-data = fetchurl { - url = http://download.fcitx-im.org/data/pinyin.tar.gz; + url = "http://download.fcitx-im.org/data/pinyin.tar.gz"; sha256 = "1qfq5dy4czvd1lvdnxzyaiir9x8b1m46jjny11y0i33m9ar2jf2q"; }; in @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/fcitx/fcitx; + homepage = "https://github.com/fcitx/fcitx"; description = "A Flexible Input Method Framework"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index cfdfa85ad9f6a..34d918cb7da76 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isIbusEngine = true; description = "IBus interface to the anthy input method"; - homepage = https://github.com/fujiwarat/ibus-anthy; + homepage = "https://github.com/fujiwarat/ibus-anthy"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ gebner ericsagnes ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index d5e2f50299e3a..978ac675581f0 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isIbusEngine = true; description = "Ibus Hangul engine"; - homepage = https://github.com/choehwanjin/ibus-hangul; + homepage = "https://github.com/choehwanjin/ibus-hangul"; license = licenses.gpl2; maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix index 589ddd09144f3..0b16b54ad48b6 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isIbusEngine = true; description = "libkkc (Japanese Kana Kanji input method) engine for ibus"; - homepage = https://github.com/ueno/ibus-kkc; + homepage = "https://github.com/ueno/ibus-kkc"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ vanzef ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 552d9f5e53251..48d082564b76d 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isIbusEngine = true; description = "m17n engine for ibus"; - homepage = https://github.com/ibus/ibus-m17n; + homepage = "https://github.com/ibus/ibus-m17n"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ericsagnes ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index a33eb277926cd..9b73345d5e8eb 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -15,7 +15,7 @@ in clangStdenv.mkDerivation rec { meta = with clangStdenv.lib; { isIbusEngine = true; description = "Japanese input method from Google"; - homepage = https://github.com/google/mozc; + homepage = "https://github.com/google/mozc"; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ gebner ericsagnes ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix index b77394f218b89..316593990d960 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix @@ -56,7 +56,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { isIbusEngine = true; description = "Chinese tables for IBus-Table"; - homepage = https://github.com/definite/ibus-table-chinese; + homepage = "https://github.com/definite/ibus-table-chinese"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ pneumaticat ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index dc11acb4756b0..cc0d12745b125 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://mike-fabian.github.io/ibus-typing-booster/; + homepage = "https://mike-fabian.github.io/ibus-typing-booster/"; license = licenses.gpl3Plus; description = "A typing booster engine for the IBus platform"; maintainers = with maintainers; [ ]; diff --git a/pkgs/tools/inputmethods/ibus/ibus-qt.nix b/pkgs/tools/inputmethods/ibus/ibus-qt.nix index 85fccc46de080..4e6b92f77c551 100644 --- a/pkgs/tools/inputmethods/ibus/ibus-qt.nix +++ b/pkgs/tools/inputmethods/ibus/ibus-qt.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DQT_PLUGINS_DIR=lib/qt4/plugins" ]; meta = with stdenv.lib; { - homepage = https://github.com/ibus/ibus-qt/; + homepage = "https://github.com/ibus/ibus-qt/"; description = "Qt4 interface to the ibus input method"; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/tools/inputmethods/keyfuzz/default.nix b/pkgs/tools/inputmethods/keyfuzz/default.nix index a2f01c7367c81..489a24c3a5897 100644 --- a/pkgs/tools/inputmethods/keyfuzz/default.nix +++ b/pkgs/tools/inputmethods/keyfuzz/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Manipulate the scancode/keycode translation tables of keyboard drivers."; - homepage = http://0pointer.de/lennart/projects/keyfuzz/; + homepage = "http://0pointer.de/lennart/projects/keyfuzz/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ mboes ]; diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix index 2764d2fee7293..b816a6898ab3f 100644 --- a/pkgs/tools/inputmethods/libinput-gestures/default.nix +++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/bulletmark/libinput-gestures; + homepage = "https://github.com/bulletmark/libinput-gestures"; description = "Gesture mapper for libinput"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/libkkc/default.nix b/pkgs/tools/inputmethods/libkkc/default.nix index 68889d45df04e..1e24d5d969f9e 100644 --- a/pkgs/tools/inputmethods/libkkc/default.nix +++ b/pkgs/tools/inputmethods/libkkc/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Japanese Kana Kanji conversion input method library"; - homepage = https://github.com/ueno/libkkc; + homepage = "https://github.com/ueno/libkkc"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vanzef ]; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix index 8732d1a816d13..1abd84608454c 100644 --- a/pkgs/tools/inputmethods/m17n-db/default.nix +++ b/pkgs/tools/inputmethods/m17n-db/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ; meta = { - homepage = https://www.nongnu.org/m17n/; + homepage = "https://www.nongnu.org/m17n/"; description = "Multilingual text processing library (database)"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix index baf57ed90498f..f7bff50920516 100644 --- a/pkgs/tools/inputmethods/m17n-lib/default.nix +++ b/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ m17n_db ]; meta = { - homepage = https://www.nongnu.org/m17n/; + homepage = "https://www.nongnu.org/m17n/"; description = "Multilingual text processing library (runtime)"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/inputmethods/m17n-lib/otf.nix b/pkgs/tools/inputmethods/m17n-lib/otf.nix index a69f46e9678c9..7703de957167a 100644 --- a/pkgs/tools/inputmethods/m17n-lib/otf.nix +++ b/pkgs/tools/inputmethods/m17n-lib/otf.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.nongnu.org/m17n/; + homepage = "https://www.nongnu.org/m17n/"; description = "Multilingual text processing library (libotf)"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/tools/inputmethods/nabi/default.nix index b93c59d9789ba..ef316ec55a0af 100644 --- a/pkgs/tools/inputmethods/nabi/default.nix +++ b/pkgs/tools/inputmethods/nabi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The Easy Hangul XIM"; - homepage = https://github.com/choehwanjin/nabi; + homepage = "https://github.com/choehwanjin/nabi"; license = licenses.gpl2; maintainers = [ maintainers.ianwookim ]; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index 2f8425bd8b541..d760e9d320a6e 100644 --- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation { This package provides a collection of standard kana-to-kanji dictionaries for the SKK Japanese input method. ''; - homepage = https://github.com/skk-dev/dict; + homepage = "https://github.com/skk-dev/dict"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/tools/inputmethods/skk/skktools/default.nix index 19d871bc77fc0..8a7423eea1f4c 100644 --- a/pkgs/tools/inputmethods/skk/skktools/default.nix +++ b/pkgs/tools/inputmethods/skk/skktools/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { (merge, sort etc.) the dictionaries formatted for SKK Japanese input method. ''; - homepage = https://github.com/skk-dev/skktools; + homepage = "https://github.com/skk-dev/skktools"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix index afacc302eda1e..4295e2b3fdd88 100644 --- a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix +++ b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Japanese handwriting model for the Zinnia engine"; - homepage = http://tegaki.org/; + homepage = "http://tegaki.org/"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = [ maintainers.gebner ]; diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index c915e8128913f..6bda390dc4aa4 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/JoseExposito/touchegg; + homepage = "https://github.com/JoseExposito/touchegg"; description = "Macro binding for touch surfaces"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/inputmethods/triggerhappy/default.nix b/pkgs/tools/inputmethods/triggerhappy/default.nix index a9e106f2c7204..22987fe639f60 100644 --- a/pkgs/tools/inputmethods/triggerhappy/default.nix +++ b/pkgs/tools/inputmethods/triggerhappy/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { interprets the event data received and executes scripts configured in its configuration. ''; - homepage = https://github.com/wertarbyte/triggerhappy/; + homepage = "https://github.com/wertarbyte/triggerhappy/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau taha ]; diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/tools/inputmethods/zinnia/default.nix index b23e0c369a62a..b1516aa56ab05 100644 --- a/pkgs/tools/inputmethods/zinnia/default.nix +++ b/pkgs/tools/inputmethods/zinnia/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Online hand recognition system with machine learning"; - homepage = http://taku910.github.io/zinnia/; + homepage = "http://taku910.github.io/zinnia/"; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.gebner ]; diff --git a/pkgs/tools/misc/3llo/default.nix b/pkgs/tools/misc/3llo/default.nix index 82a8d2aaad12a..75dc8f772c1c5 100644 --- a/pkgs/tools/misc/3llo/default.nix +++ b/pkgs/tools/misc/3llo/default.nix @@ -11,7 +11,7 @@ bundlerApp { dontBuild = false; patches = [ (fetchpatch { - url = https://github.com/qcam/3llo/commit/7667c67fdc975bac315da027a3c69f49e7c06a2e.patch; + url = "https://github.com/qcam/3llo/commit/7667c67fdc975bac315da027a3c69f49e7c06a2e.patch"; sha256 = "0ahp19igj77x23b2j9zk3znlmm7q7nija7mjgsmgqkgfbz2r1y7v"; }) ]; @@ -25,7 +25,7 @@ bundlerApp { meta = with lib; { description = "Trello interactive CLI on terminal"; license = licenses.mit; - homepage = https://github.com/qcam/3llo; + homepage = "https://github.com/qcam/3llo"; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/3mux/default.nix b/pkgs/tools/misc/3mux/default.nix new file mode 100644 index 0000000000000..81ca4d9462859 --- /dev/null +++ b/pkgs/tools/misc/3mux/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "3mux"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "aaronjanse"; + repo = pname; + rev = "v${version}"; + sha256 = "02ry066psvlqdyhimci7nskw4sfb70dw5z7ag7s7rz36gmx1vnmr"; + }; + + vendorSha256 = "1hjzpg3q4znvgzk0wbl8rq6cq877xxdsf950bcsks92cs8386847"; + + meta = with stdenv.lib; { + description = "Terminal multiplexer inspired by i3"; + homepage = "https://github.com/aaronjanse/3mux"; + license = licenses.mit; + maintainers = with maintainers; [ aaronjanse filalex77 ]; + # TODO: fix modules build on darwin + broken = stdenv.isDarwin; + }; +} \ No newline at end of file diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index 8545d86427a4e..a0868344d4cf7 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; meta = { - homepage = http://brain-dump.org/projects/abduco; + homepage = "http://brain-dump.org/projects/abduco"; license = licenses.isc; description = "Allows programs to be run independently from its controlling terminal"; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index 75d8d71b89524..42941c263e6d0 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Encrypt files with Advanced Encryption Standard (AES)"; - homepage = https://www.aescrypt.com/; + homepage = "https://www.aescrypt.com/"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 qknight ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/agedu/default.nix b/pkgs/tools/misc/agedu/default.nix index d0254e9ce9f58..c9bad789ad263 100644 --- a/pkgs/tools/misc/agedu/default.nix +++ b/pkgs/tools/misc/agedu/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchgit, autoreconfHook, halibut}: let - date = "20180918"; - rev = "80c7beb"; + date = "20200206"; + rev = "963bc9d"; in stdenv.mkDerivation { name = "agedu-${date}.${rev}"; # upstream provides tarballs but it seems they disappear after the next version is released src = fetchgit { - url = https://git.tartarus.org/simon/agedu.git; + url = "https://git.tartarus.org/simon/agedu.git"; inherit rev; - sha256 = "0i930izna3s73p2q52qa377ixd14zij5q1n7w3irl7csyy78g0cd"; + sha256 = "1jmvgg2v6aqgbgpxbndrdhgfhlglrq4yv4sdbjaj6bsz9fb8lqhc"; }; nativeBuildInputs = [autoreconfHook halibut]; @@ -27,7 +27,7 @@ stdenv.mkDerivation { agedu uses this information to tell you which files waste disk space when you haven't used them since a long time. ''; - homepage = https://www.chiark.greenend.org.uk/~sgtatham/agedu/; + homepage = "https://www.chiark.greenend.org.uk/~sgtatham/agedu/"; license = licenses.mit; maintainers = with maintainers; [ symphorien ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index c92c0821092cc..3102dd635ca2e 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://alarm-clock.pseudoberries.com/; + homepage = "http://alarm-clock.pseudoberries.com/"; description = "A fully-featured alarm clock for your GNOME panel or equivalent"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/misc/apparix/default.nix b/pkgs/tools/misc/apparix/default.nix index 550ab4972d978..155fa8190d9f8 100644 --- a/pkgs/tools/misc/apparix/default.nix +++ b/pkgs/tools/misc/apparix/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://micans.org/apparix; + homepage = "http://micans.org/apparix"; description = "Add directory bookmarks, distant listing, and distant editing to the command line"; maintainers = with maintainers; [ lethalman ]; license = licenses.gpl2; diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 55cfa09aa24fe..3c97c16842900 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, gnupg, bzip2, xz, graphviz }: +{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper, gnupg, bzip2, xz, graphviz }: let @@ -29,17 +29,16 @@ buildGoPackage { goPackagePath = "github.com/aptly-dev/aptly"; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; postInstall = '' - mkdir -p $bin/share/bash-completion/completions - ln -s ${aptlyCompletionSrc}/aptly $bin/share/bash-completion/completions - wrapProgram "$bin/bin/aptly" \ + installShellCompletion --bash ${aptlyCompletionSrc}/aptly + wrapProgram "$out/bin/aptly" \ --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg bzip2 xz graphviz ]}" ''; meta = with stdenv.lib; { - homepage = https://www.aptly.info; + homepage = "https://www.aptly.info"; description = "Debian repository management tool"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/tools/misc/argtable/default.nix b/pkgs/tools/misc/argtable/default.nix index c16e4aded0d01..867b2eaba5d03 100644 --- a/pkgs/tools/misc/argtable/default.nix +++ b/pkgs/tools/misc/argtable/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { version = "3.0.1"; src = fetchgit { - url = https://github.com/argtable/argtable3.git; + url = "https://github.com/argtable/argtable3.git"; rev = "de93cfd85f755250285b337cba053a709a270721"; sha256 = "0fbvk78s3dwryrzgafdra0lb8w7lb873c6xgldl94ps9828x85i3"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.argtable.org/; + homepage = "https://www.argtable.org/"; description = "A Cross-Platform, Single-File, ANSI C Command-Line Parsing Library"; license = licenses.bsd3; maintainers = with maintainers; [ artuuge ]; diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index d42c666e96740..67c324d4aeedf 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Terminal session recorder and the best companion of asciinema.org"; - homepage = https://asciinema.org/; + homepage = "https://asciinema.org/"; license = with lib.licenses; [ gpl3 ]; }; } diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index 8294e92d13f3d..85e500388341f 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { Autojump supports tab-completion. ''; - homepage = https://github.com/wting/autojump; + homepage = "https://github.com/wting/autojump"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ domenkozar yurrriq ]; diff --git a/pkgs/tools/misc/automirror/default.nix b/pkgs/tools/misc/automirror/default.nix index 84778fb1c2d00..dde9c2d02d3ad 100644 --- a/pkgs/tools/misc/automirror/default.nix +++ b/pkgs/tools/misc/automirror/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/schlomo/automirror; + homepage = "https://github.com/schlomo/automirror"; description = "Automatic Display Mirror"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index adf73037af89f..b2bbb161f289c 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -6,7 +6,7 @@ let python = python3Packages.python; - version = "1.9"; + version = "1.10.1"; in stdenv.mkDerivation { pname = "autorandr"; @@ -34,7 +34,7 @@ in SYSTEMD_UNIT_DIR=/lib/systemd/system \ UDEV_RULES_DIR=/etc/udev/rules.d substituteInPlace $out/etc/udev/rules.d/40-monitor-hotplug.rules \ - --replace /bin/systemctl "${systemd}/bin/systemctl" + --replace /bin/systemctl "/run/current-system/systemd/bin/systemctl" '' else '' make install TARGETS='pmutils' DESTDIR=$out \ PM_SLEEPHOOKS_DIR=/lib/pm-utils/sleep.d @@ -49,11 +49,11 @@ in owner = "phillipberndt"; repo = "autorandr"; rev = version; - sha256 = "1bb0l7fcm5lcx9y02zdxv7pfdqf4v4gsc5br3v1x9gzjvqj64l7n"; + sha256 = "0msw9b1hdy3gbq9w5d04mfizhyirz1c648x84mlcbzl8salm7vpg"; }; meta = with stdenv.lib; { - homepage = https://github.com/phillipberndt/autorandr/; + homepage = "https://github.com/phillipberndt/autorandr/"; description = "Automatically select a display configuration based on connected devices"; license = licenses.gpl3Plus; maintainers = with maintainers; [ coroa globin ]; diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/tools/misc/autorevision/default.nix index ee07221b75594..abaca62c400c1 100644 --- a/pkgs/tools/misc/autorevision/default.nix +++ b/pkgs/tools/misc/autorevision/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extracts revision metadata from your VCS repository"; - homepage = https://autorevision.github.io/; + homepage = "https://autorevision.github.io/"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix index c7829239c41f0..c5f4b0f5670ae 100644 --- a/pkgs/tools/misc/aws-mturk-clt/default.nix +++ b/pkgs/tools/misc/aws-mturk-clt/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; # */ meta = { - homepage = https://requester.mturk.com/developer; + homepage = "https://requester.mturk.com/developer"; description = "Command line tools for interacting with the Amazon Mechanical Turk"; license = stdenv.lib.licenses.amazonsl; diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix index 6f2afc888e843..bfb622ee74190 100644 --- a/pkgs/tools/misc/azure-vhd-utils/default.nix +++ b/pkgs/tools/misc/azure-vhd-utils/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/Microsoft/azure-vhd-utils; + homepage = "https://github.com/Microsoft/azure-vhd-utils"; description = "Read, inspect and upload VHD files for Azure"; longDescription = "Go package to read Virtual Hard Disk (VHD) file, a CLI interface to upload local VHD to Azure storage and to inspect a local VHD"; license = licenses.mit; diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index b4cbc747b1dc7..5de77aea0e045 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://zsmith.co/bandwidth.html; + homepage = "https://zsmith.co/bandwidth.html"; description = "Artificial benchmark for identifying weaknesses in the memory subsystem"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/tools/misc/bashcards/default.nix b/pkgs/tools/misc/bashcards/default.nix new file mode 100644 index 0000000000000..ecaabb43c1439 --- /dev/null +++ b/pkgs/tools/misc/bashcards/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "bashcards"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "rpearce"; + repo = pname; + rev = "v${version}"; + sha256 = "1zbijbcm9lrqwiax37li0jjqcaxf469wh5d423frain56z1qknxl"; + }; + + dontBuild = true; + installPhase = '' + mkdir -p $out/bin $out/share/man/man8 + cp bashcards.8 $out/share/man/man8/ + cp bashcards $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "Practice flashcards in bash"; + homepage = "https://github.com/rpearce/bashcards/"; + license = licenses.bsd3; + maintainers = with maintainers; [ rpearce ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/tools/misc/bashplotlib/default.nix index 14ab790d9c768..3e8ae31835a6b 100644 --- a/pkgs/tools/misc/bashplotlib/default.nix +++ b/pkgs/tools/misc/bashplotlib/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/glamp/bashplotlib; + homepage = "https://github.com/glamp/bashplotlib"; description = "Plotting in the terminal"; maintainers = with maintainers; [ dtzWill ]; license = licenses.mit; diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix new file mode 100644 index 0000000000000..0f98b819b0f7b --- /dev/null +++ b/pkgs/tools/misc/bat-extras/default.nix @@ -0,0 +1,147 @@ +{ stdenv, callPackage, fetchFromGitHub, bash, makeWrapper, ncurses, bat +# batgrep and batwatch +, less +# batgrep +, ripgrep +# prettybat +, withShFmt ? shfmt != null, shfmt ? null +, withPrettier ? nodePackages?prettier, nodePackages ? null +, withClangTools ? clang-tools != null, clang-tools ? null +, withRustFmt ? rustfmt != null, rustfmt ? null +# batwatch +, withEntr ? entr != null, entr ? null + }: + +let + # Core derivation that all the others are based on. + # This includes the complete source so the per-script derivations can run the tests. + core = stdenv.mkDerivation rec { + pname = "bat-extras"; + version = "20200408"; + + src = fetchFromGitHub { + owner = "eth-p"; + repo = pname; + rev = "v${version}"; + sha256 = "184d5rwasfpgbj2k98alg3wy8jmzna2dgfik98w2a297ky67s51v"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ bash makeWrapper ]; + + dontConfigure = true; + + postPatch = '' + substituteInPlace lib/constants.sh \ + --replace 'EXECUTABLE_BAT="bat"' 'EXECUTABLE_BAT="${bat}/bin/bat"' + + patchShebangs --build test.sh test/shimexec .test-framework/bin/best.sh + wrapProgram .test-framework/bin/best.sh \ + --prefix PATH : "${ncurses}/bin" + ''; + + buildPhase = '' + runHook preBuild + bash ./build.sh --minify=none --no-verify + runHook postBuild + ''; + + # Run the library tests as they don't have external dependencies + doCheck = true; + checkPhase = '' + runHook preCheck + # test list repeats suites. Unique them + declare -A test_suites + while read -r action arg _; do + [[ "$action" == "test_suite" && "$arg" == lib_* ]] && + test_suites+=(["$arg"]=1) + done <<<"$(bash ./test.sh --compiled --list --porcelain)" + (( ''${#test_suites[@]} != 0 )) || { + echo "Couldn't find any library test suites" + exit 1 + } + bash ./test.sh --compiled $(printf -- "--suite %q\n" "''${!test_suites[@]}") + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + cp -a . $out + runHook postInstall + ''; + + # A few random files have shebangs. Don't patch them, they don't make it into the final output. + # The per-script derivations will go ahead and patch the files they actually install. + dontPatchShebangs = true; + + meta = with stdenv.lib; { + description = "Bash scripts that integrate bat with various command line tools"; + homepage = "https://github.com/eth-p/bat-extras"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ bbigras lilyball ]; + platforms = platforms.all; + }; + }; + script = + name: # the name of the script + dependencies: # the tools we need to prefix onto PATH + stdenv.mkDerivation { + pname = "${core.pname}-${name}"; + inherit (core) version; + + src = core; + + nativeBuildInputs = [ bash makeWrapper ]; + # Make the dependencies available to the tests. + buildInputs = dependencies; + + # Patch shebangs now because our tests rely on them + postPatch = '' + patchShebangs --host bin/${name} + ''; + + dontConfigure = true; + dontBuild = true; # we've already built + + doCheck = true; + checkPhase = '' + runHook preCheck + bash ./test.sh --compiled --suite ${name} + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp -p bin/${name} $out/bin/${name} + '' + stdenv.lib.optionalString (dependencies != []) '' + wrapProgram $out/bin/${name} \ + --prefix PATH : ${stdenv.lib.makeBinPath dependencies} + '' + '' + runHook postInstall + ''; + + # We already patched + dontPatchShebangs = true; + + inherit (core) meta; + }; + optionalDep = cond: dep: + assert cond -> dep != null; + stdenv.lib.optional cond dep; +in +{ + batgrep = script "batgrep" [ less ripgrep ]; + batman = (script "batman" []).overrideAttrs (drv: { + doCheck = stdenv.isDarwin; # test fails on Linux due to SIGPIPE (eth-p/bat-extras#19) + }); + batwatch = script "batwatch" ([ less ] ++ optionalDep withEntr entr); + prettybat = (script "prettybat" ([] + ++ optionalDep withShFmt shfmt + ++ optionalDep withPrettier nodePackages.prettier + ++ optionalDep withClangTools clang-tools + ++ optionalDep withRustFmt rustfmt) + ).overrideAttrs (drv: { + doCheck = stdenv.isDarwin; # test fails on Linux due to SIGPIPE (eth-p/bat-extras#19) + }); +} diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index bf84502af2bca..95bc44dcce06b 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -4,17 +4,22 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.13.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "1kaa6ps6v1wk9qs63h116k4pbz7y9mfbfxfbq7g89yjhzkjmh6xc"; + sha256 = "10cs94ja1dmn0f24gqkcy8rf68b3b43k6qpbb5njbg0hcx3x6cyj"; fetchSubmodules = true; }; - cargoSha256 = "01l1y124gjh6gf9z1jkbpfzh0w92hrgwvsmqkqdw3a9pa4w5f6yg"; + cargoSha256 = "13cphi08bp6lg054acgliir8dx2jajll4m3c4xxy04skmx555zr8"; + + # Disable test that's broken on macOS. + # This should probably be removed on the next release. + # https://github.com/sharkdp/bat/issues/983 + patches = [ ./macos.patch ]; nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles makeWrapper ]; diff --git a/pkgs/tools/misc/bat/macos.patch b/pkgs/tools/misc/bat/macos.patch new file mode 100644 index 0000000000000..549782f0c91b2 --- /dev/null +++ b/pkgs/tools/misc/bat/macos.patch @@ -0,0 +1,13 @@ +diff --git a/src/assets.rs b/src/assets.rs +index 4f8556f..222abc2 100644 +--- a/src/assets.rs ++++ b/src/assets.rs +@@ -336,7 +336,7 @@ mod tests { + assert_eq!(test.syntax_for_file("Makefile"), "Makefile"); + } + +- #[cfg(unix)] ++ #[cfg(all(unix,not(target_os = "macos")))] + #[test] + fn syntax_detection_invalid_utf8() { + use std::os::unix::ffi::OsStrExt; diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix index 111ab254accbb..d065732a2991d 100644 --- a/pkgs/tools/misc/bc/default.nix +++ b/pkgs/tools/misc/bc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU software calculator"; - homepage = https://www.gnu.org/software/bc/; + homepage = "https://www.gnu.org/software/bc/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index cc63dab9645ab..460f20a5f5f92 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -52,7 +52,7 @@ in with python.pkgs; buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/bepasty/bepasty-server; + homepage = "https://github.com/bepasty/bepasty-server"; description = "Binary pastebin server"; license = lib.licenses.mit; maintainers = [ lib.maintainers.makefu ]; diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix index c0339834b649b..ddda4ef4445af 100644 --- a/pkgs/tools/misc/bibtex2html/default.nix +++ b/pkgs/tools/misc/bibtex2html/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "1.99"; src = fetchurl { - url = https://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.99.tar.gz; + url = "https://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.99.tar.gz"; sha256 = "07gzrs4lfrkvbn48cgn2gn6c7cx3jsanakkrb2irj0gmjzfxl96j"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A collection of tools for translating from BibTeX to HTML"; - homepage = https://www.lri.fr/~filliatr/bibtex2html/; + homepage = "https://www.lri.fr/~filliatr/bibtex2html/"; license = licenses.gpl2; platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.scolobb ]; diff --git a/pkgs/tools/misc/bibtool/default.nix b/pkgs/tools/misc/bibtool/default.nix index df7564a4b8488..041dabeee775e 100644 --- a/pkgs/tools/misc/bibtool/default.nix +++ b/pkgs/tools/misc/bibtool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bibtool"; - version = "2.67"; + version = "2.68"; src = fetchurl { url = "http://www.gerd-neugebauer.de/software/TeX/BibTool/BibTool-${version}.tar.gz"; - sha256 = "116pv532mz0q954y5b7c6zipnamc05f0x7g5x1b674jsjxh42v2v"; + sha256 = "1ymq901ckaysq2n1bplk1064rb2njq9n30pii15w157y0lxcwd3i"; }; # Perl for running test suite. @@ -15,10 +15,11 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install.man" ]; doCheck = true; + checkTarget = "test"; meta = with stdenv.lib; { description = "Tool for manipulating BibTeX bibliographies"; - homepage = http://www.gerd-neugebauer.de/software/TeX/BibTool/index.en.html; + homepage = "http://www.gerd-neugebauer.de/software/TeX/BibTool/index.en.html"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.rycee ]; diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index 8cc21158e8a92..a0e133ec5047f 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Font editor which can generate fonts in TTF, EOT, SVG and BIRDFONT format"; - homepage = https://birdfont.org; + homepage = "https://birdfont.org"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/tools/misc/birdfont/xmlbird.nix b/pkgs/tools/misc/birdfont/xmlbird.nix index 3d51f282daeff..e5ad56376cac7 100644 --- a/pkgs/tools/misc/birdfont/xmlbird.nix +++ b/pkgs/tools/misc/birdfont/xmlbird.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "XML parser for Vala and C programs"; - homepage = https://birdfont.org/xmlbird.php; + homepage = "https://birdfont.org/xmlbird.php"; license = licenses.lgpl3; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix index 8d587e34af461..5bf38f1b0e7a5 100644 --- a/pkgs/tools/misc/blink1-tool/default.nix +++ b/pkgs/tools/misc/blink1-tool/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Command line client for the blink(1) notification light"; - homepage = https://blink1.thingm.com/; + homepage = "https://blink1.thingm.com/"; license = stdenv.lib.licenses.cc-by-sa-30; maintainers = [ stdenv.lib.maintainers.cransom ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/blsd/default.nix b/pkgs/tools/misc/blsd/default.nix deleted file mode 100644 index 1b860fc1b4d50..0000000000000 --- a/pkgs/tools/misc/blsd/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libgit2 }: - -buildGoPackage { - pname = "blsd"; - version = "2017-07-27"; - - goPackagePath = "github.com/junegunn/blsd"; - - src = fetchFromGitHub { - owner = "junegunn"; - repo = "blsd"; - rev = "a2ac619821e502452abdeae9ebab45026893b9e8"; - sha256 = "0b0q6i4i28cjqgxqmwxbps22gp9rcd3jz562q5wvxrwlpbzlls2h"; - }; - - goDeps = ./deps.nix; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libgit2 ]; - - meta = with stdenv.lib; { - homepage = https://github.com/junegunn/blsd; - description = "List directories in breadth-first order"; - license = licenses.mit; - maintainers = [ maintainers.magnetophon ]; - platforms = platforms.unix; - broken = true; # since 2020-02-08, libgit2 is incompatible upstream is dead. - }; -} diff --git a/pkgs/tools/misc/blsd/deps.nix b/pkgs/tools/misc/blsd/deps.nix deleted file mode 100644 index d212f213a60ef..0000000000000 --- a/pkgs/tools/misc/blsd/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/libgit2/git2go"; - fetch = { - type = "git"; - url = "https://github.com/libgit2/git2go"; - rev = "14280de4da0f392935854a7cbdd67b2a5505c3a8"; - sha256 = "17ppd7byzir8rhdk645dmggi700scb8f401yiwx8zy81q41dk1qi"; - }; - } -] diff --git a/pkgs/tools/misc/bmap-tools/default.nix b/pkgs/tools/misc/bmap-tools/default.nix index 6b7a51e08f51b..8273d60bd5969 100644 --- a/pkgs/tools/misc/bmap-tools/default.nix +++ b/pkgs/tools/misc/bmap-tools/default.nix @@ -13,7 +13,7 @@ python2Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "bmap-related tools"; - homepage = https://github.com/intel/bmap-tools; + homepage = "https://github.com/intel/bmap-tools"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index e4664e34b964b..d99cce78bbfd2 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Network bandwidth monitor"; - homepage = https://github.com/tgraf/bmon; + homepage = "https://github.com/tgraf/bmon"; # Licensed unter BSD and MIT # - https://github.com/tgraf/bmon/blob/master/LICENSE.BSD # - https://github.com/tgraf/bmon/blob/master/LICENSE.MIT diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index f86d44c580de1..1924968f2d35f 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = false; # needs "y" tool meta = { - homepage = http://bogofilter.sourceforge.net/; + homepage = "http://bogofilter.sourceforge.net/"; longDescription = '' Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) by a statistical analysis of the message's header and diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index 12b0ad2abf1f1..85d54c1673604 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -39,7 +39,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ arrow click keyring parsedatetime requests six termcolor ]; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/bonfire; + homepage = "https://pypi.python.org/pypi/bonfire"; description = "CLI Graylog Client with Follow Mode"; license = licenses.bsd3; maintainers = [ maintainers.womfoo ]; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 5d31570aacd54..bf5d569bab483 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.13.5b"; + version = "0.13.6"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "0gcv9w79r9q3rzrdqiq9xgh68ya653sq84vzgf0fb154zmzjkxfv"; + sha256 = "08d0zddqqymxj1qcp8c78r7mpii1piy6awaf135jxhzwi775sqqv"; }; - cargoSha256 = "0534jykfnqs1gfnmijkpcf91ddpbggw7p25h4arci14lgd2wrmgd"; + cargoSha256 = "1cxvx51zkmhszmgwsi0aj469xz98v5nk79zvqfyma27gsnh8jczr"; nativeBuildInputs = [ installShellFiles ]; @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' # install shell completion files - OUT_DIR=target/release/build/broot-*/out + OUT_DIR=$releaseDir/build/broot-*/out installShellCompletion --bash $OUT_DIR/{br,broot}.bash installShellCompletion --fish $OUT_DIR/{br,broot}.fish diff --git a/pkgs/tools/misc/brotab/default.nix b/pkgs/tools/misc/brotab/default.nix index 7e827f007eb97..854958dc8a3b2 100644 --- a/pkgs/tools/misc/brotab/default.nix +++ b/pkgs/tools/misc/brotab/default.nix @@ -1,14 +1,14 @@ { lib, fetchFromGitHub, glibcLocales, python }: python.pkgs.buildPythonApplication rec { - version = "1.2.1"; + version = "1.2.2"; pname = "brotab"; src = fetchFromGitHub { owner = "balta2ar"; repo = pname; rev = version; - sha256 = "14yz0szwzdjvwkw24rma34y6iiwnw9qzsm89gkglc0xxa6msg6j3"; + sha256 = "1c6npyws705qf9rv70mmh7d0almmpxz87a0n65lhw08lms1h3dl2"; }; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/pkgs/tools/misc/buildtorrent/default.nix index b86bc38cb2670..150371f82b6e1 100644 --- a/pkgs/tools/misc/buildtorrent/default.nix +++ b/pkgs/tools/misc/buildtorrent/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple commandline torrent creator"; - homepage = http://mathr.co.uk/blog/torrent.html; + homepage = "http://mathr.co.uk/blog/torrent.html"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index e63ad0e42af50..9e1671aec9dee 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec{ - version = "1.4.0"; + version = "1.4.1"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "0vf658dd9sb2d3yh65c8nals9z0z7rykqqigmxq2h92x2ysjbg6x"; + sha256 = "13vv2xmfh0dr949bh75448lidvzwxks6f1mjawdg1q8qwzxhzry4"; }; nativeBuildInputs = [ autoconf diff --git a/pkgs/tools/misc/chelf/default.nix b/pkgs/tools/misc/chelf/default.nix index f9740f223754a..96949dd5da57e 100644 --- a/pkgs/tools/misc/chelf/default.nix +++ b/pkgs/tools/misc/chelf/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "change or display the stack size of an ELF binary"; - homepage = https://github.com/Gottox/chelf; + homepage = "https://github.com/Gottox/chelf"; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index beb7c41f906bf..75b10bc32ca74 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.7.18"; + version = "1.8.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "12gx78cbs7abizlqhs7y2w6lwlk5d1hhvixj0ki8d1d5vdr747bc"; + sha256 = "1b8y0wq3myhvjdnwl0i4x85iil7i7kmsjajvbw1a47afm83jkbaw"; }; - modSha256 = "15b3hik3nzb7xnd6806dqdb36v7z2a0wmvxbrfwvnbigd8zd2y0j"; + vendorSha256 = "1za47n08iamhfl4ky928rixgadflmz86vnmnwbczd167bdndh5rq"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs" @@ -34,4 +34,4 @@ buildGoModule rec { maintainers = with maintainers; [ jhillyerd ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index 4d33d957b4d10..084d51d2a3abc 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { description = "CLI client for cheat.sh, a community driven cheat sheet"; license = licenses.mit; maintainers = with maintainers; [ fgaz evanjs ]; - homepage = https://github.com/chubin/cheat.sh; + homepage = "https://github.com/chubin/cheat.sh"; }; } diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index 12c7f91f5abef..8189a07c214b4 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -41,7 +41,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Driver and configuration tool for Corsair keyboards and mice"; - homepage = https://github.com/ckb-next/ckb-next; + homepage = "https://github.com/ckb-next/ckb-next"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ kierdavis ]; diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix index 544379d8d2175..8aea37ebddff4 100644 --- a/pkgs/tools/misc/clac/default.nix +++ b/pkgs/tools/misc/clac/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd2; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; - homepage = https://github.com/soveran/clac; + homepage = "https://github.com/soveran/clac"; }; } diff --git a/pkgs/tools/misc/clasp/default.nix b/pkgs/tools/misc/clasp/default.nix index 31c35af81186b..2748c0126cde8 100644 --- a/pkgs/tools/misc/clasp/default.nix +++ b/pkgs/tools/misc/clasp/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Answer set solver for (extended) normal and disjunctive logic programs"; - homepage = http://potassco.sourceforge.net/; + homepage = "http://potassco.sourceforge.net/"; platforms = platforms.all; maintainers = [ maintainers.hakuch ]; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix index d5fd4e97df104..5e5bf4166ff98 100644 --- a/pkgs/tools/misc/clex/default.nix +++ b/pkgs/tools/misc/clex/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { to be executed by the shell. There are no built-in commands, CLEX is an add-on to your favorite shell. ''; - homepage = http://www.clex.sk; + homepage = "http://www.clex.sk"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/clipman/default.nix b/pkgs/tools/misc/clipman/default.nix index 3153c843025a7..5146e25da5011 100644 --- a/pkgs/tools/misc/clipman/default.nix +++ b/pkgs/tools/misc/clipman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clipman"; - version = "1.4.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "yory8"; repo = pname; rev = "v${version}"; - sha256 = "0d5w94cylrzhwyb4zfgidh6rr1h82dx5y7cxfa37wx5xxcjyyja1"; + sha256 = "1lf5fbzplyc1mpdqgfwbrn8m5568vhjf48580fvvfgbhz6zcil8n"; }; - modSha256 = "1sim3x794kj3wdw0g432zbgh1cimdmmg1hjgynh9jgm3y8w9q7ij"; + vendorSha256 = "18jw4z0lcrh00yjr3qdkgvlrpfwqbsm0ncz7fp1h72pzkh41byv7"; nativeBuildInputs = [ makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { ''; meta = with lib; { - homepage = https://github.com/yory8/clipman; + homepage = "https://github.com/yory8/clipman"; license = licenses.gpl3; maintainers = with maintainers; [ ma27 ]; description = "A simple clipboard manager for Wayland"; platforms = platforms.linux; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index 699285f266476..bb14830bf063b 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { - Ability to delete items in clipboard history. ''; license = licenses.agpl3; - homepage = https://github.com/mrichar1/clipster; + homepage = "https://github.com/mrichar1/clipster"; platforms = platforms.linux; maintainers = [ maintainers.magnetophon ]; }; diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 6d567f6119add..e35d5283256e8 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cloc"; - version = "1.84"; + version = "1.86"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; rev = version; - sha256 = "14xikdwcr6pcnkk2i43zrsj88z8b3mrv0svbnbvxvarw1id83pnn"; + sha256 = "082gj2b3x11bilz8c572dd60vn6n0fhld5zhi7wk7g1wy9wlgm9w"; }; setSourceRoot = '' @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A program that counts lines of source code"; - homepage = https://github.com/AlDanial/cloc; + homepage = "https://github.com/AlDanial/cloc"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ rycee ]; diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix index 41c80146e68fa..33686498112b1 100644 --- a/pkgs/tools/misc/colord-kde/default.nix +++ b/pkgs/tools/misc/colord-kde/default.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, fetchurl +{ mkDerivation, lib, fetchurl , extra-cmake-modules, ki18n , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils , kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem , kitemviews, lcms2, libXrandr, qtx11extras }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "colord-kde"; version = "0.5.0"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = https://projects.kde.org/projects/playground/graphics/colord-kde; + homepage = "https://projects.kde.org/projects/playground/graphics/colord-kde"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ttuegel ]; }; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index c6dbcfdda02f3..79d27129173a8 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "System service to manage, install and generate color profiles to accurately color manage input and output devices"; - homepage = https://www.freedesktop.org/software/colord/; + homepage = "https://www.freedesktop.org/software/colord/"; license = licenses.lgpl2Plus; maintainers = [ maintainers.marcweber ] ++ teams.freedesktop.members; platforms = platforms.linux; diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index f3d7fbd812735..b58e0c6e31e15 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Access contacts from the Mac address book from command-line"; - homepage = http://www.gnufoo.org/contacts/contacts.html; + homepage = "http://www.gnufoo.org/contacts/contacts.html"; license = licenses.gpl2; maintainers = with maintainers; [ jwiegley ]; platforms = stdenv.lib.platforms.darwin; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 1294c6758f483..49edc002bec76 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -131,7 +131,7 @@ stdenv.mkDerivation (rec { ''; meta = { - homepage = https://www.gnu.org/software/coreutils/; + homepage = "https://www.gnu.org/software/coreutils/"; description = "The basic file, shell and text manipulation utilities of the GNU operating system"; longDescription = '' diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix index fb44b051b7eec..d2a27fa9cb0b9 100644 --- a/pkgs/tools/misc/cowsay/default.nix +++ b/pkgs/tools/misc/cowsay/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { description = "A program which generates ASCII pictures of a cow with a message"; - homepage = https://en.wikipedia.org/wiki/Cowsay; + homepage = "https://en.wikipedia.org/wiki/Cowsay"; license = licenses.gpl1; platforms = platforms.all; maintainers = [ maintainers.rob ]; diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix index 1978476a12d6c..13c29d6ab9360 100644 --- a/pkgs/tools/misc/cpulimit/default.nix +++ b/pkgs/tools/misc/cpulimit/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://limitcpu.sourceforge.net/; + homepage = "http://limitcpu.sourceforge.net/"; description = "A tool to throttle the CPU usage of programs"; platforms = with platforms; linux ++ freebsd; license = licenses.gpl2; diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix index 5792fa4121b45..65482fabb1172 100644 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/pkgs/tools/misc/cpuminer-multi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchgit { inherit rev; - url = https://github.com/wolf9466/cpuminer-multi.git; + url = "https://github.com/wolf9466/cpuminer-multi.git"; sha256 = "11dg4rra4dgfb9x6q85irn0hrkx2lkwyrdpgdh10pag09s3vhy4v"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Multi-algo CPUMiner"; - homepage = https://github.com/wolf9466/cpuminer-multi; + homepage = "https://github.com/wolf9466/cpuminer-multi"; license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; # does not build on i686 https://github.com/lucasjones/cpuminer-multi/issues/27 diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index db0ab75d91668..99eb6a52ca0b0 100644 --- a/pkgs/tools/misc/cpuminer/default.nix +++ b/pkgs/tools/misc/cpuminer/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "CFLAGS=-O3" ]; meta = with stdenv.lib; { - homepage = https://github.com/pooler/cpuminer; + homepage = "https://github.com/pooler/cpuminer"; description = "CPU miner for Litecoin and Bitcoin"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/tools/misc/crex/default.nix b/pkgs/tools/misc/crex/default.nix index a00f8d6654f55..72e8521fec1a9 100644 --- a/pkgs/tools/misc/crex/default.nix +++ b/pkgs/tools/misc/crex/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Explore, test, and check regular expressions in the terminal"; - homepage = https://octobanana.com/software/crex; + homepage = "https://octobanana.com/software/crex"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/csv2latex/default.nix b/pkgs/tools/misc/csv2latex/default.nix index 7cad80456b34c..da22258296771 100644 --- a/pkgs/tools/misc/csv2latex/default.nix +++ b/pkgs/tools/misc/csv2latex/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line CSV to LaTeX file converter"; - homepage = http://brouits.free.fr/csv2latex/; + homepage = "http://brouits.free.fr/csv2latex/"; license = licenses.gpl2; maintainers = [ maintainers.catern ]; }; diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index f1930c925ff43..305084b900d1c 100644 --- a/pkgs/tools/misc/cunit/default.nix +++ b/pkgs/tools/misc/cunit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { with a flexible variety of user interfaces. ''; - homepage = http://cunit.sourceforge.net/; + homepage = "http://cunit.sourceforge.net/"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix index f45889e78d858..8d7f16b5becac 100644 --- a/pkgs/tools/misc/dashing/default.nix +++ b/pkgs/tools/misc/dashing/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A Dash Generator Script for Any HTML"; - homepage = https://github.com/technosophos/dashing; + homepage = "https://github.com/technosophos/dashing"; license = licenses.mit; maintainers = [ ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/dasht/default.nix b/pkgs/tools/misc/dasht/default.nix index e128682079700..7c2ff35483667 100644 --- a/pkgs/tools/misc/dasht/default.nix +++ b/pkgs/tools/misc/dasht/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , makeWrapper +, installShellFiles , coreutils , gnused , gnugrep @@ -14,13 +15,13 @@ stdenv.mkDerivation rec { pname = "dasht"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "sunaku"; repo = pname; rev = "v${version}"; - sha256 = "0d0pcjalba58nvxdgn39m4b6n9ifajf3ygyjaqgvzwxzgpzw0a60"; + sha256 = "08wssmifxi7pnvn9gqrvpzpkc2qpkfbzbhxh0dk1gff2y2211qqk"; }; deps = lib.makeBinPath [ @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { (placeholder "out") ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; installPhase = '' runHook preInstall @@ -43,8 +44,8 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp bin/* $out/bin/ - mkdir -p $out/share/man/man1 - cp man/man1/* $out/share/man/man1/ + installManPage man/man1/* + installShellCompletion --zsh etc/zsh/completions/* for i in $out/bin/*; do echo "Wrapping $i" diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix index f66f2b97d1416..8e9782506fb9d 100644 --- a/pkgs/tools/misc/datamash/default.nix +++ b/pkgs/tools/misc/datamash/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "datamash"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1jvqxcyh0aghnqh3m2rk5av1x0038flcmfzd493vasv1k69vgfdr"; + sha256 = "1cxdlhgz3wzjqlq8bgwad93fgqymk2abbldfzw1ffnhcp4mmjjjp"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix index a441124189cbe..f56cee49ecf5a 100644 --- a/pkgs/tools/misc/dateutils/default.nix +++ b/pkgs/tools/misc/dateutils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A bunch of tools that revolve around fiddling with dates and times in the command line"; - homepage = http://www.fresse.org/dateutils/; + homepage = "http://www.fresse.org/dateutils/"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.paperdigits ]; diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/tools/misc/dbacl/default.nix index 9107debfd12c8..a6bc0111ad4f6 100644 --- a/pkgs/tools/misc/dbacl/default.nix +++ b/pkgs/tools/misc/dbacl/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://dbacl.sourceforge.net/; + homepage = "http://dbacl.sourceforge.net/"; longDescription = "a digramic Bayesian classifier for text recognition."; maintainers = []; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix index 72687f4bfa482..c311de3a7790b 100644 --- a/pkgs/tools/misc/dbus-map/default.nix +++ b/pkgs/tools/misc/dbus-map/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = with lib; { description = "Simple utility for enumerating D-Bus endpoints, an nmap for D-Bus"; - homepage = https://github.com/taviso/dbusmap; + homepage = "https://github.com/taviso/dbusmap"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/tools/misc/ddate/default.nix b/pkgs/tools/misc/ddate/default.nix index c602a4c9235ea..0987fb6d286fc 100644 --- a/pkgs/tools/misc/ddate/default.nix +++ b/pkgs/tools/misc/ddate/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ cmake ]; meta = { - homepage = https://github.com/bo0ts/ddate; + homepage = "https://github.com/bo0ts/ddate"; description = "Discordian version of the date program"; license = stdenv.lib.licenses.publicDomain; maintainers = with stdenv.lib.maintainers; [kovirobi]; diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 0d5efb2ca22bc..cfc48af5be547 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A program used to control monitor parameters by software"; - homepage = https://github.com/ddccontrol/ddccontrol; + homepage = "https://github.com/ddccontrol/ddccontrol"; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.pakhfn ]; diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index a138adc332424..c2eed30a70d11 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.ddcutil.com/; + homepage = "http://www.ddcutil.com/"; description = "Query and change Linux monitor settings using DDC/CI and USB"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix index 74aec9bae6a01..f9643fbde79ce 100644 --- a/pkgs/tools/misc/debianutils/default.nix +++ b/pkgs/tools/misc/debianutils/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { The specific utilities included are: add-shell installkernel ischroot remove-shell run-parts savelog tempfile which ''; - downloadPage = https://packages.debian.org/sid/debianutils; + downloadPage = "https://packages.debian.org/sid/debianutils"; license = with licenses; [ gpl2Plus publicDomain smail ]; maintainers = []; platforms = platforms.all; diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 6b47027a5b9ec..045e199e3ae7d 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = { - homepage = http://www.freedesktop.org/wiki/Software/desktop-file-utils; + homepage = "http://www.freedesktop.org/wiki/Software/desktop-file-utils"; description = "Command line utilities for working with .desktop files"; platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl2; diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/tools/misc/detox/default.nix index 9ad891fd9bd83..85bed63c7f9dd 100644 --- a/pkgs/tools/misc/detox/default.nix +++ b/pkgs/tools/misc/detox/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "detox-1.2.0"; src = fetchurl { - url = mirror://sourceforge/detox/1.2.0/detox-1.2.0.tar.gz; + url = "mirror://sourceforge/detox/1.2.0/detox-1.2.0.tar.gz"; sha256 = "02cfkf3yhw64xg8mksln8w24gdwgm2x9g3vps7gn6jbjbfd8mh45"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://detox.sourceforge.net/; + homepage = "http://detox.sourceforge.net/"; description = "Utility designed to clean up filenames"; longDescription = '' Detox is a utility designed to clean up filenames. It replaces diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 0ce0e1be32566..a9b014be35618 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,13 +9,15 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "138"; + version = "144"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "171nz5n4dayr7bj04h0x282vdk92kp7lgarnb3x0md91m2i9x997"; + sha256 = "1n916k6z35c8ffksjjglkbl52jjhjv3899w230sg7k4ayzylj6zi"; }; + outputs = [ "out" "man" ]; + patches = [ ./ignore_links.patch ]; diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix index e99e9289b6765..deb70d082d982 100644 --- a/pkgs/tools/misc/ding-libs/default.nix +++ b/pkgs/tools/misc/ding-libs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "'D is not GLib' utility libraries"; - homepage = https://fedorahosted.org/sssd/; + homepage = "https://fedorahosted.org/sssd/"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ e-user ]; license = [ stdenv.lib.licenses.gpl3 stdenv.lib.licenses.lgpl3 ]; diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index c358e24095a5e..1b6b87984c6fa 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,31 +1,27 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, bash }: +{ stdenv, fetchFromGitHub, buildGoModule, bash }: -buildGoPackage rec { +buildGoModule rec { pname = "direnv"; - version = "2.21.2"; - goPackagePath = "github.com/direnv/direnv"; + version = "2.21.3"; + + vendorSha256 = null; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "0afpxx8pwa1zb66l79af57drzjaazn2rp6306w4pxvqfh0zi2bri"; + sha256 = "1adi6ld9g4zgz0f6q0kkzrywclqrmikyp7yh22zm9lfdvd5hs8wp"; }; - postConfigure = '' - cd $NIX_BUILD_TOP/go/src/$goPackagePath - ''; - # we have no bash at the moment for windows makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isWindows) [ "BASH_PATH=${bash}/bin/bash" ]; installPhase = '' - mkdir -p $out - make install DESTDIR=$bin - mkdir -p $bin/share/fish/vendor_conf.d - echo "eval ($bin/bin/direnv hook fish)" > $bin/share/fish/vendor_conf.d/direnv.fish + make install DESTDIR=$out + mkdir -p $out/share/fish/vendor_conf.d + echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish ''; meta = with stdenv.lib; { @@ -41,7 +37,7 @@ buildGoPackage rec { In short, this little tool allows you to have project-specific environment variables. ''; - homepage = https://direnv.net; + homepage = "https://direnv.net"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix index 10406b8bf03bb..204b7b4cf8dd1 100644 --- a/pkgs/tools/misc/diskscan/default.nix +++ b/pkgs/tools/misc/diskscan/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = https://github.com/baruch/diskscan; + homepage = "https://github.com/baruch/diskscan"; description = "Scan HDD/SSD for failed and near failed sectors"; platforms = with platforms; linux; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix index e02811e03ebb7..b3fbc6377ab59 100644 --- a/pkgs/tools/misc/diskus/default.nix +++ b/pkgs/tools/misc/diskus/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A minimal, fast alternative to 'du -sh'"; - homepage = https://github.com/sharkdp/diskus; + homepage = "https://github.com/sharkdp/diskus"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.fuerbringer ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix index 167b4a547f821..6ba446d7bc049 100644 --- a/pkgs/tools/misc/disper/default.nix +++ b/pkgs/tools/misc/disper/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "On-the-fly display switch utility"; - homepage = http://willem.engen.nl/projects/disper/; + homepage = "http://willem.engen.nl/projects/disper/"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix index df084579b79a0..267983dd432c4 100644 --- a/pkgs/tools/misc/dmg2img/default.nix +++ b/pkgs/tools/misc/dmg2img/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, bzip2, openssl }: +{ stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }: stdenv.mkDerivation rec { name = "dmg2img-1.6.7"; @@ -8,11 +8,20 @@ stdenv.mkDerivation rec { sha256 = "066hqhg7k90xcw5aq86pgr4l7apzvnb4559vj5s010avbk8adbh2"; }; - buildInputs = [zlib bzip2 openssl]; + buildInputs = [ zlib bzip2 openssl ]; + + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/85fa66a9/dmg2img/openssl-1.1.diff"; + sha256 = "076sz69hf3ryylplg025vl8sj991cb81g3yazsmrf8anrd7ffmxx"; + }) + ]; + + patchFlags = [ "-p0" ]; installPhase = '' - mkdir -p $out/bin - cp dmg2img $out/bin + install -D dmg2img $out/bin/dmg2img + install -D vfdecrypt $out/bin/vfdecrypt ''; meta = { diff --git a/pkgs/tools/misc/docbook2mdoc/default.nix b/pkgs/tools/misc/docbook2mdoc/default.nix index efe65683e07bb..2237d009d43cf 100644 --- a/pkgs/tools/misc/docbook2mdoc/default.nix +++ b/pkgs/tools/misc/docbook2mdoc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://mdocml.bsd.lv/; + homepage = "http://mdocml.bsd.lv/"; description = "converter from DocBook V4.x and v5.x XML into mdoc"; license = licenses.isc; platforms = platforms.all; diff --git a/pkgs/tools/misc/docker-ls/default.nix b/pkgs/tools/misc/docker-ls/default.nix index c1baf8e82f5fc..8522256c7d524 100644 --- a/pkgs/tools/misc/docker-ls/default.nix +++ b/pkgs/tools/misc/docker-ls/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { with tags. ''; - homepage = https://github.com/mayflower/docker-ls; + homepage = "https://github.com/mayflower/docker-ls"; maintainers = with maintainers; [ ma27 ]; platforms = docker.meta.platforms; license = licenses.mit; diff --git a/pkgs/tools/misc/docker-sync/default.nix b/pkgs/tools/misc/docker-sync/default.nix index e75b83475681f..48fbaa1e9de04 100644 --- a/pkgs/tools/misc/docker-sync/default.nix +++ b/pkgs/tools/misc/docker-sync/default.nix @@ -12,7 +12,7 @@ bundlerApp { meta = with lib; { description = "Run your application at full speed while syncing your code for development"; - homepage = http://docker-sync.io; + homepage = "http://docker-sync.io"; license = licenses.gpl3; maintainers = with maintainers; [ manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index 0329c1bc4a691..f3f89d0a667aa 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0jya0wdp8scjmsr44krdbbb8q4gplf44gsng1nyn12a6ldqzayxl"; }; - modSha256 = "1wyx05kk4f41mgvwnvfc9xk7vd3x96cbn5xb5ph7p443f70ydnak"; + vendorSha256 = "1ggdczvv03lj0g6cq26vrk1rba6pk0805n85w9hkbjx9c4r3j577"; meta = with stdenv.lib; { description = "TUI Client for Docker"; @@ -20,4 +20,4 @@ buildGoModule rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ aethelz ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/tools/misc/doitlive/default.nix index 6edcefb11d5e2..3c0406a4ea0ed 100644 --- a/pkgs/tools/misc/doitlive/default.nix +++ b/pkgs/tools/misc/doitlive/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Tool for live presentations in the terminal"; - homepage = https://pypi.python.org/pypi/doitlive; + homepage = "https://pypi.python.org/pypi/doitlive"; license = licenses.mit; maintainers = with maintainers; [ mbode ]; }; diff --git a/pkgs/tools/misc/dpt-rp1-py/default.nix b/pkgs/tools/misc/dpt-rp1-py/default.nix index 88359adc31854..69b689fb8244e 100644 --- a/pkgs/tools/misc/dpt-rp1-py/default.nix +++ b/pkgs/tools/misc/dpt-rp1-py/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { ]; meta = with lib; { - homepage = https://github.com/janten/dpt-rp1-py; + homepage = "https://github.com/janten/dpt-rp1-py"; description = "Python script to manage Sony DPT-RP1 without Digital Paper App"; license = licenses.mit; maintainers = with maintainers; [ mt-caret ]; diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix index 7d85decbb84bd..9973eddc7efae 100644 --- a/pkgs/tools/misc/dtach/default.nix +++ b/pkgs/tools/misc/dtach/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://dtach.sourceforge.net/; + homepage = "http://dtach.sourceforge.net/"; description = "A program that emulates the detach feature of screen"; longDescription = '' diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 2dea0f179a1e4..cb000b2947237 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "1r94fcygp9mmg457dkksx3mjdxfddzfzl6n0rmxasiinsz0hak4c"; + sha256 = "1697z9j0xd4il01bcvz1xwzkcg5mbkpp207mshb9csdhwi9a50wg"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "15a4hari3my59xvmkll2jlvb1jyf8gg8alp91nvh3bagpajpvdx6"; + cargoSha256 = "1rczq41jpds7kfyf31nxj4v8rk9rccijjixpznhlriam6xhgm90b"; doCheck = false; diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index c5ea2cd46a16e..74dd2a34cc440 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { stdenv.lib.optionals (!enableCairo) [ "--disable-x11" "--disable-cairo" ]; meta = with stdenv.lib; { - homepage = http://duc.zevv.nl/; + homepage = "http://duc.zevv.nl/"; description = "Collection of tools for inspecting and visualizing disk usage"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/dumptorrent/default.nix b/pkgs/tools/misc/dumptorrent/default.nix index 1b9a6c9bbea2d..146ab54dd62ff 100644 --- a/pkgs/tools/misc/dumptorrent/default.nix +++ b/pkgs/tools/misc/dumptorrent/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Dump .torrent file information"; - homepage = https://sourceforge.net/projects/dumptorrent/; + homepage = "https://sourceforge.net/projects/dumptorrent/"; license = licenses.gpl2; maintainers = [ maintainers.zohl ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/dupd/default.nix b/pkgs/tools/misc/dupd/default.nix index 06b9f3adac924..4c8f5e2e2b1e7 100644 --- a/pkgs/tools/misc/dupd/default.nix +++ b/pkgs/tools/misc/dupd/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CLI utility to find duplicate files"; - homepage = http://www.virkki.com/dupd; + homepage = "http://www.virkki.com/dupd"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/tools/misc/dvtm/dvtm.nix b/pkgs/tools/misc/dvtm/dvtm.nix index df2e25c7ea33b..5bb8efb5540c6 100644 --- a/pkgs/tools/misc/dvtm/dvtm.nix +++ b/pkgs/tools/misc/dvtm/dvtm.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation { cp ${builtins.toFile "config.h" customConfig} ./config.h ''; + nativeBuildInputs = [ ncurses ]; buildInputs = [ ncurses ]; prePatch = '' @@ -16,13 +17,11 @@ stdenv.mkDerivation { --replace /usr/share/terminfo $out/share/terminfo ''; - installPhase = '' - make PREFIX=$out install - ''; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Dynamic virtual terminal manager"; - homepage = http://www.brain-dump.org/projects/dvtm; + homepage = "http://www.brain-dump.org/projects/dvtm"; license = licenses.mit; maintainers = [ maintainers.vrthra ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index 11a46f620c0a1..c755f73b118ba 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation { meta = { description = "EDID decoder and conformance tester"; - homepage = https://cgit.freedesktop.org/xorg/app/edid-decode/; + homepage = "https://cgit.freedesktop.org/xorg/app/edid-decode/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.chiiruno ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix index 6a5fcfb12174d..76ea8ceba0d9c 100644 --- a/pkgs/tools/misc/emv/default.nix +++ b/pkgs/tools/misc/emv/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.i0i0.de/toolchest/emv; + homepage = "http://www.i0i0.de/toolchest/emv"; description = "Editor Move: Rename files with your favourite text editor"; license = stdenv.lib.licenses.publicDomain; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix index 7e8d04b420928..4ecb8fe488a22 100644 --- a/pkgs/tools/misc/ent/default.nix +++ b/pkgs/tools/misc/ent/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Pseudorandom Number Sequence Test Program"; - homepage = http://www.fourmilab.ch/random/; + homepage = "http://www.fourmilab.ch/random/"; platforms = platforms.all; license = licenses.publicDomain; }; diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index 247572a379f7d..be8134a92a331 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "entr"; - version = "4.4"; + version = "4.5"; src = fetchurl { url = "http://entrproject.org/code/${pname}-${version}.tar.gz"; - sha256 = "1x2hyc8vc5dz6k7b3291vxz36wllhinvqrb0d8zx9bv0ydj6qmjl"; + sha256 = "08gsd99w20fdi0apppmzsh06z29ga8y89nfcizidil2hkl8b7jyn"; }; postPatch = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://entrproject.org/; + homepage = "http://entrproject.org/"; description = "Run arbitrary commands when files change"; license = licenses.isc; platforms = platforms.all; diff --git a/pkgs/tools/misc/envdir-go/default.nix b/pkgs/tools/misc/envdir-go/default.nix index db31df982cf8e..957f5941cb6b4 100644 --- a/pkgs/tools/misc/envdir-go/default.nix +++ b/pkgs/tools/misc/envdir-go/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = { description = "A go rewrite of envdir"; - homepage = https://github.com/d10n/envdir; + homepage = "https://github.com/d10n/envdir"; maintainers = with stdenv.lib.maintainers; [ edude03 ]; }; } diff --git a/pkgs/tools/misc/envsubst/default.nix b/pkgs/tools/misc/envsubst/default.nix index 9b2153d17cb17..af0fa6a76ba9c 100644 --- a/pkgs/tools/misc/envsubst/default.nix +++ b/pkgs/tools/misc/envsubst/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { meta = with lib; { description = "Environment variables substitution for Go"; - homepage = https://github.com/a8m/envsubst; + homepage = "https://github.com/a8m/envsubst"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ nicknovitski ]; diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix index 8d65aee9e7a84..546ad8d3d7ddc 100644 --- a/pkgs/tools/misc/eot-utilities/default.nix +++ b/pkgs/tools/misc/eot-utilities/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = { - homepage = http://www.w3.org/Tools/eot-utils/; + homepage = "http://www.w3.org/Tools/eot-utils/"; description = "Create Embedded Open Type from OpenType or TrueType font"; license = stdenv.lib.licenses.w3c; maintainers = with stdenv.lib.maintainers; [ leenaars ]; diff --git a/pkgs/tools/misc/esptool-ck/default.nix b/pkgs/tools/misc/esptool-ck/default.nix index 52b56f10ea97d..a57a042a0c17f 100644 --- a/pkgs/tools/misc/esptool-ck/default.nix +++ b/pkgs/tools/misc/esptool-ck/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ESP8266/ESP32 build helper tool"; - homepage = https://github.com/igrr/esptool-ck; + homepage = "https://github.com/igrr/esptool-ck"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 8793685069a09..465e30e76157f 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "ESP8266 and ESP32 serial bootloader utility"; - homepage = https://github.com/espressif/esptool; + homepage = "https://github.com/espressif/esptool"; license = licenses.gpl2; maintainers = with maintainers; [ dezgeg dotlambda ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix index 4944600108ae6..0d2029fa31455 100644 --- a/pkgs/tools/misc/etcher/default.nix +++ b/pkgs/tools/misc/etcher/default.nix @@ -1,25 +1,19 @@ -{ lib -, stdenv +{ stdenv , fetchurl , gcc-unwrapped , dpkg , polkit +, utillinux , bash , nodePackages -, electron_3 -, gtk3 -, wrapGAppsHook +, makeWrapper +, electron_7 }: let - libPath = lib.makeLibraryPath [ - # for libstdc++.so.6 - gcc-unwrapped.lib - ]; - sha256 = { - "x86_64-linux" = "0zb9j34dz7ybjix018bm8g0b6kilw9300q4ahcm22p0ggg528dh7"; - "i686-linux" = "0wsv4mvwrvsaz1pwiqs94b3854h5l8ff2dbb1ybxmvwjbfrkdcqc"; + "x86_64-linux" = "1yvqi86bw0kym401zwknhwq9041fxg047sbj3aydnfcqf11vrrmk"; + "i686-linux" = "12lghzhsl16h3jvzm3vw4hrly32fz99z6rdmybl8viralrxy8mb8"; }."${stdenv.system}"; arch = { @@ -27,26 +21,22 @@ let "i686-linux" = "i386"; }."${stdenv.system}"; -in stdenv.mkDerivation rec { +in + +stdenv.mkDerivation rec { pname = "etcher"; - version = "1.5.60"; + version = "1.5.86"; src = fetchurl { url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher-electron_${version}_${arch}.deb"; inherit sha256; }; - buildInputs = [ - gtk3 - ]; - - nativeBuildInputs = [ - wrapGAppsHook - ]; - dontBuild = true; dontConfigure = true; + nativeBuildInputs = [ makeWrapper ]; + unpackPhase = '' ${dpkg}/bin/dpkg-deb -x $src . ''; @@ -55,33 +45,33 @@ in stdenv.mkDerivation rec { # along with some other paths patchPhase = '' ${nodePackages.asar}/bin/asar extract opt/balenaEtcher/resources/app.asar tmp - # Use Nix(OS) paths + # use Nix(OS) paths sed -i "s|/usr/bin/pkexec|/usr/bin/pkexec', '/run/wrappers/bin/pkexec|" tmp/node_modules/sudo-prompt/index.js sed -i 's|/bin/bash|${bash}/bin/bash|' tmp/node_modules/sudo-prompt/index.js - sed -i "s|process.resourcesPath|'$out/opt/balenaEtcher/resources/'|" tmp/generated/gui.js + sed -i "s|'lsblk'|'${utillinux}/bin/lsblk'|" tmp/node_modules/drivelist/js/lsblk/index.js + sed -i "s|process.resourcesPath|'$out/share/${pname}/resources/'|" tmp/generated/gui.js ${nodePackages.asar}/bin/asar pack tmp opt/balenaEtcher/resources/app.asar rm -rf tmp - # Fix up .desktop file - substituteInPlace usr/share/applications/balena-etcher-electron.desktop \ - --replace "/opt/balenaEtcher/balena-etcher-electron" "$out/bin/balena-etcher-electron" ''; installPhase = '' - mkdir -p $out/bin - cp -r opt $out/ - cp -r usr/share $out/ + runHook preInstall + + mkdir -p $out/bin $out/share/${pname} + + cp -a usr/share/* $out/share + cp -a opt/balenaEtcher/{locales,resources} $out/share/${pname} - # We'll use our Nixpkgs electron_3 instead - rm $out/opt/balenaEtcher/balena-etcher-electron + substituteInPlace $out/share/applications/balena-etcher-electron.desktop \ + --replace 'Exec=/opt/balenaEtcher/balena-etcher-electron' 'Exec=${pname}' - ln -s ${electron_3}/bin/electron $out/bin/balena-etcher-electron + runHook postInstall ''; - preFixup = '' - gappsWrapperArgs+=( - --add-flags $out/opt/balenaEtcher/resources/app.asar - --prefix LD_LIBRARY_PATH : ${libPath} - ) + postFixup = '' + makeWrapper ${electron_7}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/resources/app.asar \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gcc-unwrapped.lib ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index 1ec99f12d8214..d593d677cc324 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -67,10 +67,12 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ethereum miner with OpenCL, CUDA and stratum support"; - homepage = https://github.com/ethereum-mining/ethminer; + homepage = "https://github.com/ethereum-mining/ethminer"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nand0p ]; license = licenses.gpl2; + # Doesn't build with gcc9, and if overlayed to use gcc8 stdenv fails on CUDA issues. + broken = true; }; } diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index ec1e2c48e640c..b1b9956404a9d 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility for controlling network drivers and hardware"; - homepage = https://www.kernel.org/pub/software/network/ethtool/; + homepage = "https://www.kernel.org/pub/software/network/ethtool/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix index dee181d95c231..06b7b0a5200f2 100644 --- a/pkgs/tools/misc/eva/default.nix +++ b/pkgs/tools/misc/eva/default.nix @@ -18,14 +18,14 @@ rustPlatform.buildRustPackage rec { patches = [ # to fix the test suite (can be removed as soon as #33 is merged). (fetchpatch { - url = https://github.com/NerdyPepper/eva/commit/cacf51dbb9748b1dbe97b35f3c593a0a272bd4db.patch; + url = "https://github.com/NerdyPepper/eva/commit/cacf51dbb9748b1dbe97b35f3c593a0a272bd4db.patch"; sha256 = "11q7dkz2x1888f3awnlr1nbbxzzfjrr46kd0kk6sgjdkyfh50cvv"; }) ]; meta = with stdenv.lib; { description = "A calculator REPL, similar to bc"; - homepage = https://github.com/NerdyPepper/eva; + homepage = "https://github.com/NerdyPepper/eva"; license = licenses.mit; maintainers = with maintainers; [ nrdxp ma27 ]; }; diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index acfbe6bb63c54..fd6baadb685c3 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -55,7 +55,7 @@ buildRustPackage rec { for a directory, or recursing into directories with a tree view. exa is written in Rust, so it’s small, fast, and portable. ''; - homepage = https://the.exa.website; + homepage = "https://the.exa.website"; license = licenses.mit; maintainers = with maintainers; [ ehegnes lilyball globin ]; }; diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 9fcff332de6df..cbb8c337ff87d 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for automating interactive applications"; - homepage = http://expect.sourceforge.net/; + homepage = "http://expect.sourceforge.net/"; license = "Expect"; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 060e1c3fcdf6e..b55b2c0cc4ed6 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,25 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "fd"; - version = "7.5.0"; + version = "8.1.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "029xr7l751dy167hfzrd030llkaiy8j585h1d4l6391fgrsvnav7"; + sha256 = "0zp9bsa0kmg1rsvnxf93d2fnib0cyla0wxpd3sn9kmz20b0vblvn"; }; - cargoSha256 = "0lq6da2f6xywyhzyyrpph96d8b9vpdzakzipci167g6hhh232b5b"; + cargoSha256 = "17fnf61q32a0ljjna3lb0bafwhsll4zgwfwbcqh2ah5gfk1pwc92"; nativeBuildInputs = [ installShellFiles ]; preFixup = '' installManPage "$src/doc/fd.1" - (cd target/release/build/fd-find-*/out - installShellCompletion fd.{bash,fish} - installShellCompletion --zsh _fd) + installShellCompletion $releaseDir/build/fd-find-*/out/fd.{bash,fish} + installShellCompletion --zsh $releaseDir/build/fd-find-*/out/_fd ''; meta = with lib; { diff --git a/pkgs/tools/misc/fdtools/default.nix b/pkgs/tools/misc/fdtools/default.nix new file mode 100644 index 0000000000000..6e0cb66749f46 --- /dev/null +++ b/pkgs/tools/misc/fdtools/default.nix @@ -0,0 +1,78 @@ +{ stdenv, lib, fetchurl, skawarePackages }: + +let + pname = "fdtools"; + version = "2020.05.04"; + sha256 = "0lnafcp4yipi0dl8gh33zjs8wlpz0mim8mwmiz9s49id0b0fmlla"; + +in stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://code.dogmap.org/${pname}/releases/${pname}-${version}.tar.bz2"; + inherit sha256; + }; + + outputs = [ "bin" "lib" "dev" "doc" "out" ]; + + buildInputs = [ skawarePackages.skalibs ]; + + configurePhase = '' + cd ${pname}-${version} + sed -e 's|gcc|$CC|' \ + conf-compile/defaults/host_link.sh \ + > conf-compile/host_link.sh + + echo "${skawarePackages.skalibs.lib}/lib/skalibs/sysdeps" \ + > conf-compile/depend_skalibs_sysdeps + ''; + + buildPhase = '' + bash package/build + ''; + + installPhase = '' + mkdir -p $bin/bin + tools=( grabconsole multitee pipecycle recvfd seek0 sendfd setblock setstate statfile vc-get vc-lock vc-switch ) + + for t in "''${tools[@]}"; do + mv "command/$t" "$bin/bin/$t" + done + + mkdir -p $lib/lib + mkdir -p $dev/include + docdir=$doc/share/doc/${pname} + mkdir -p $docdir + + mv library/fdtools.a $lib/lib/fdtools.a + mv include/fdtools.h $dev/include/fdtools.h + + ${skawarePackages.cleanPackaging.commonFileActions { + noiseFiles = [ + "conf-compile/**/*" + "src/**/*" + "src/.**/*" + "compile/**/*" + "package/{build,check,compile,elsewhere,install,install_commands,own,run,sharing,upgrade,upgrade_version,url_src,url_src_latest,versions}" + ]; + docFiles = [ + "package/INSTALL" + "package/LICENSE" + "package/README" + ]; + }} $docdir + + ${skawarePackages.cleanPackaging.checkForRemainingFiles} + + # we don’t use this, but nixpkgs requires it + touch $out + ''; + + meta = { + homepage = "https://code.dogmap.org./fdtools/"; + description = "A set of utilities for working with file descriptors"; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.Profpatsch ]; + }; +} diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix index af9a7c9a13328..731ad86e622af 100644 --- a/pkgs/tools/misc/fdupes/default.nix +++ b/pkgs/tools/misc/fdupes/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { Such files are found by comparing file sizes and MD5 signatures, followed by a byte-by-byte comparison. ''; - homepage = https://github.com/adrianlopezroche/fdupes; + homepage = "https://github.com/adrianlopezroche/fdupes"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.maggesi ]; diff --git a/pkgs/tools/misc/fffuu/default.nix b/pkgs/tools/misc/fffuu/default.nix index 5d79b26f23089..2463ee5a6e99e 100644 --- a/pkgs/tools/misc/fffuu/default.nix +++ b/pkgs/tools/misc/fffuu/default.nix @@ -45,7 +45,7 @@ mkDerivation { ]; description = "Fancy Formal Firewall Universal Understander"; - homepage = https://github.com/diekmann/Iptables_Semantics/tree/master/haskell_tool; + homepage = "https://github.com/diekmann/Iptables_Semantics/tree/master/haskell_tool"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.marsam ]; } diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 7a8e56a4d6aa1..264afc68b67f8 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -16,21 +16,21 @@ with rustPlatform; buildRustPackage rec { pname = "ffsend"; - version = "0.2.59"; + version = "0.2.64"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "14a7mb1a1s74hi124v4jscc72m09zq2bd8xrhq5agz9z27plqm2c"; + sha256 = "1fgzcw0955vjypwwx3ja8sil0vxwvhsnspn1bjl869ccbnx2x4hs"; }; - cargoSha256 = "1945s3ajpy55fzh5wbl7fchqck0fh69shl18lxni9hvg04smq39i"; + cargoSha256 = "0svmbay9waaq9fpc8lg1nys6l35xsjvkri5v1frlgxida5dzghpq"; nativeBuildInputs = [ cmake pkgconfig installShellFiles ]; - buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ]) - ; + buildInputs = + if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ]) + else [ openssl ]; preBuild = stdenv.lib.optionalString (x11Support && usesX11) ( if preferXsel && xsel != null then '' @@ -53,7 +53,7 @@ buildRustPackage rec { may be up to 2GB. Others are able to download these files with this tool, or through their web browser. ''; - homepage = https://gitlab.com/timvisee/ffsend; + homepage = "https://gitlab.com/timvisee/ffsend"; license = licenses.gpl3; maintainers = with maintainers; [ lilyball equirosa ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 86434847b4a24..90fb0981fbd0c 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { # some tools can be found here ftp://ftp.figlet.org/pub/figlet/util/ src = fetchurl { - url = ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz; + url = "ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz"; sha256 = "0za1ax15x7myjl8jz271ybly8ln9kb9zhm1gf6rdlxzhs07w925z"; }; patches = [ (fetchpatch { - url = https://git.alpinelinux.org/cgit/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399; + url = "https://git.alpinelinux.org/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399"; name = "musl-fix-cplusplus-decls.patch"; sha256 = "1720zgrfk9makznqkbjrnlxm7nnhk6zx7g458fv53337n3g3zn7j"; }) @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Program for making large letters out of ordinary text"; - homepage = http://www.figlet.org/; + homepage = "http://www.figlet.org/"; license = stdenv.lib.licenses.afl21; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 24a7143d8e116..71e547d843316 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { makeFlags = stdenv.lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file"; meta = with stdenv.lib; { - homepage = https://darwinsys.com/file; + homepage = "https://darwinsys.com/file"; description = "A program that shows the type of files"; license = licenses.bsd2; platforms = platforms.all; diff --git a/pkgs/tools/misc/filebench/default.nix b/pkgs/tools/misc/filebench/default.nix index a16695cf7c32d..4cd572ac99204 100644 --- a/pkgs/tools/misc/filebench/default.nix +++ b/pkgs/tools/misc/filebench/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "File system and storage benchmark that can generate both micro and macro workloads"; - homepage = https://sourceforge.net/projects/filebench/; + homepage = "https://sourceforge.net/projects/filebench/"; license = licenses.cddl; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix index 6818bb708bb6f..056943e96d78c 100644 --- a/pkgs/tools/misc/fileschanged/default.nix +++ b/pkgs/tools/misc/fileschanged/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = https://www.nongnu.org/fileschanged/; + homepage = "https://www.nongnu.org/fileschanged/"; description = "A command-line utility that reports when files have been altered"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 2df8ee420fae4..1b69b80be70f3 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://www.gnu.org/software/findutils/; + homepage = "https://www.gnu.org/software/findutils/"; description = "GNU Find Utilities, the basic directory searching utilities of the GNU operating system"; longDescription = '' diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index ad6ed6acb4cc6..afca2e3007eda 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -36,7 +36,7 @@ mkDerivation rec { meta = with lib; { description = "Powerful yet simple to use screenshot software"; - homepage = https://github.com/lupoDharkael/flameshot; + homepage = "https://github.com/lupoDharkael/flameshot"; maintainers = [ maintainers.scode ]; license = lib.licenses.gpl3; platforms = lib.platforms.linux; diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 3b9e600dcdbe3..6b190fcf842e5 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ libftdi1 libusb1 pciutils ]; meta = with lib; { - homepage = http://www.flashrom.org; + homepage = "http://www.flashrom.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; license = licenses.gpl2; maintainers = with maintainers; [ funfunctor fpletz ]; diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix index 8c2c5adfb5f42..8d585324d8758 100644 --- a/pkgs/tools/misc/fltrdr/default.nix +++ b/pkgs/tools/misc/fltrdr/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://octobanana.com/software/fltrdr; + homepage = "https://octobanana.com/software/fltrdr"; description = "A TUI text reader for the terminal"; longDescription = '' diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 0933e6eae9008..75294f4d0642b 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.4.1"; + version = "1.4.4"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "1xfbghaylzsh48ag4aw77nmzm1cds4nx53m4s1fiy0r31sm8vqwl"; + sha256 = "1p6ay2frrxi18965r9c83crlljx92zbdvzkwl4bl9qkb0lpml3yl"; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix index 18d03982f37c4..82ea02aae6807 100644 --- a/pkgs/tools/misc/fluentd/default.nix +++ b/pkgs/tools/misc/fluentd/default.nix @@ -10,7 +10,7 @@ bundlerEnv { meta = with lib; { description = "A data collector"; - homepage = https://www.fluentd.org/; + homepage = "https://www.fluentd.org/"; license = licenses.asl20; maintainers = with maintainers; [ offline nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 635d786da53aa..67ab7b2d69179 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = { description = "A font editor"; - homepage = http://fontforge.github.io; + homepage = "http://fontforge.github.io"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.erictapen ]; diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/tools/misc/fpp/default.nix index 7f036cb1f908f..7f68a14c5aa21 100644 --- a/pkgs/tools/misc/fpp/default.nix +++ b/pkgs/tools/misc/fpp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "CLI program that accepts piped input and presents files for selection"; - homepage = https://facebook.github.io/PathPicker/; + homepage = "https://facebook.github.io/PathPicker/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index e508eb02ad095..d979e1e1a00b8 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.6.9"; + version = "0.6.10"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "0cgzvzdsy8vbiapgk1l5dp48c3kq0xmx53yfi486mx8nwvz3ksc0"; + sha256 = "17dz0qj2981plvzp72yisyrjnyz1sy3pqyvhx76ws2754vjgq4ra"; }; - cargoSha256 = "0mjd9nmaggsszf0kx68yrvy3fqbn35v34c7q3584fv50ipqn6drb"; + cargoSha256 = "19b05gx717xjg4arn4zgrqh7ckzgzx0ygg9gkfzsg7phz7f01626"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/fsmark/default.nix b/pkgs/tools/misc/fsmark/default.nix index ac56d948bdad1..7bfa24e3a0820 100644 --- a/pkgs/tools/misc/fsmark/default.nix +++ b/pkgs/tools/misc/fsmark/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Synchronous write workload file system benchmark"; - homepage = https://sourceforge.net/projects/fsmark/; + homepage = "https://sourceforge.net/projects/fsmark/"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index 4e7db2dc48476..fa64d74286582 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Search through your filesystem with SQL-esque queries"; - homepage = https://github.com/kshvmdn/fsql; + homepage = "https://github.com/kshvmdn/fsql"; license = licenses.mit; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix index 5181610a03911..ec977d48572de 100644 --- a/pkgs/tools/misc/fx_cast/default.nix +++ b/pkgs/tools/misc/fx_cast/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Implementation of the Chrome Sender API (Chromecast) within Firefox"; - homepage = https://hensm.github.io/fx_cast/; + homepage = "https://hensm.github.io/fx_cast/"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/tools/misc/fxlinuxprintutil/default.nix b/pkgs/tools/misc/fxlinuxprintutil/default.nix index 7965b591afbbb..112f6a9f2328e 100644 --- a/pkgs/tools/misc/fxlinuxprintutil/default.nix +++ b/pkgs/tools/misc/fxlinuxprintutil/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optional configuration tool for fxlinuxprint"; - homepage = https://onlinesupport.fujixerox.com; + homepage = "https://onlinesupport.fujixerox.com"; license = licenses.unfree; maintainers = with maintainers; [ delan ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index d5c75a1e8a7a6..e875dd77b02b3 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0piz1dzczcw1nsff775zicvpm6iy0iw0v0ba7rj7i0xqv9ni1prw"; }; - modSha256 = "16bb0a9z49jqhh9lmq8rvl7x9vh79mi4ygkb9sm04g41g5z6ag1s"; + vendorSha256 = "1c2iz28hjrw9rig9a6r27wd8clycdhi8fgs3da91c63w4qi140zm"; outputs = [ "out" "man" ]; @@ -63,4 +63,4 @@ buildGoModule rec { maintainers = with maintainers; [ filalex77 ma27 ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/fzy/default.nix b/pkgs/tools/misc/fzy/default.nix index 24daa7fc81fa4..90042d632b79e 100644 --- a/pkgs/tools/misc/fzy/default.nix +++ b/pkgs/tools/misc/fzy/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A better fuzzy finder"; - homepage = https://github.com/jhawthorn/fzy; + homepage = "https://github.com/jhawthorn/fzy"; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix index ba0b76026a580..0723735228a4e 100644 --- a/pkgs/tools/misc/gams/default.nix +++ b/pkgs/tools/misc/gams/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { The General Algebraic Modeling System is a high-level modeling system for mathematical optimization. GAMS is designed for modeling and solving linear, nonlinear, and mixed-integer optimization problems. ''; - homepage = https://www.gams.com/; + homepage = "https://www.gams.com/"; license = licenses.unfree; maintainers = [ maintainers.Scriptkiddi ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/gbdfed/default.nix b/pkgs/tools/misc/gbdfed/default.nix index 9b41dba4e259d..e5dc243ede119 100644 --- a/pkgs/tools/misc/gbdfed/default.nix +++ b/pkgs/tools/misc/gbdfed/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { it allows cut and paste operations between fonts and glyphs and editing font properties. The editor works natively with BDF fonts. ''; - homepage = http://sofia.nmsu.edu/~mleisher/Software/gbdfed/; + homepage = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.linquize ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/geteltorito/default.nix b/pkgs/tools/misc/geteltorito/default.nix index d6fbb6233312f..cee93ae29910f 100644 --- a/pkgs/tools/misc/geteltorito/default.nix +++ b/pkgs/tools/misc/geteltorito/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extract the initial/default boot image from a CD image if existent"; - homepage = https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/; + homepage = "https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/"; maintainers = [ maintainers.Profpatsch ]; license = licenses.gpl2; }; diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix index d168c8aaa14e6..f94d6eeff4ed2 100644 --- a/pkgs/tools/misc/getopt/default.nix +++ b/pkgs/tools/misc/getopt/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; - homepage = http://frodo.looijaard.name/project/getopt; + homepage = "http://frodo.looijaard.name/project/getopt"; description = "Parses command-line arguments from shell scripts"; }; } diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix index e5c0997c8e3e0..d78e7f9439fd2 100644 --- a/pkgs/tools/misc/gh-ost/default.nix +++ b/pkgs/tools/misc/gh-ost/default.nix @@ -20,7 +20,7 @@ buildGoPackage ({ meta = with stdenv.lib; { description = "Triggerless online schema migration solution for MySQL"; - homepage = https://github.com/github/gh-ost; + homepage = "https://github.com/github/gh-ost"; license = licenses.mit; }; }) diff --git a/pkgs/tools/misc/gibo/default.nix b/pkgs/tools/misc/gibo/default.nix index a8e957ce4840a..abee4950d879b 100644 --- a/pkgs/tools/misc/gibo/default.nix +++ b/pkgs/tools/misc/gibo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/simonwhitaker/gibo; + homepage = "https://github.com/simonwhitaker/gibo"; license = stdenv.lib.licenses.publicDomain; description = "A shell script for easily accessing gitignore boilerplates"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/gif-for-cli/default.nix b/pkgs/tools/misc/gif-for-cli/default.nix index 771fc354da423..993c20222d8ed 100644 --- a/pkgs/tools/misc/gif-for-cli/default.nix +++ b/pkgs/tools/misc/gif-for-cli/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication { meta = with stdenv.lib; { description = "Render gifs as ASCII art in your cli"; longDescription = "Takes in a GIF, short video, or a query to the Tenor GIF API and converts it to animated ASCII art."; - homepage = https://github.com/google/gif-for-cli; + homepage = "https://github.com/google/gif-for-cli"; license = licenses.asl20; maintainers = with maintainers; [ Scriptkiddi ]; }; diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index 581a1f84fc7f5..25c3166619174 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, perl, gettext, libusb, pkgconfig, bluez +{ stdenv, fetchurl, intltool, perl, gettext, libusb-compat-0_1, pkgconfig, bluez , readline, pcsclite, libical, gtk2, glib, libXpm }: stdenv.mkDerivation rec { @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ - perl intltool gettext libusb + perl intltool gettext libusb-compat-0_1 glib gtk2 pkgconfig bluez readline libXpm pcsclite libical ]; meta = { description = "Cellphone tool"; - homepage = http://www.gnokii.org; + homepage = "http://www.gnokii.org"; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; broken = true; # 2018-04-10 diff --git a/pkgs/tools/misc/gnuvd/default.nix b/pkgs/tools/misc/gnuvd/default.nix index 4da5ec2e5d5f4..0c49296227043 100644 --- a/pkgs/tools/misc/gnuvd/default.nix +++ b/pkgs/tools/misc/gnuvd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { name = "gnuvd-1.0.12"; src = fetchurl { - url = https://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.12.tar.gz ; + url = "https://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.12.tar.gz"; sha256 = "0mpy76a0pxy62zjiihlzmvl4752hiwxhfs8rm1v5zgdr78acxyxz"; }; meta = with stdenv.lib; { description = "Command-line dutch dictionary application"; - homepage = https://www.djcbsoftware.nl/code/gnuvd/; + homepage = "https://www.djcbsoftware.nl/code/gnuvd/"; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 0fe9001fcdbec..1906c9d56656c 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb }: stdenv.mkDerivation rec { - version = "1.3"; + version = "1.4"; pname = "goaccess"; src = fetchurl { url = "https://tar.goaccess.io/goaccess-${version}.tar.gz"; - sha256 = "16vv3pj7pbraq173wlxa89jjsd279004j4kgzlrsk1dz4if5qxwc"; + sha256 = "1gkpjg39f3afdwm9128jqjsfap07p8s027czzlnxfmi5hpzvkyz8"; }; configureFlags = [ @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems"; - homepage = https://goaccess.io; + homepage = "https://goaccess.io"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ ederoyd46 ]; diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix index a4b9af09712e0..cd50271a2e60e 100644 --- a/pkgs/tools/misc/gotify-cli/default.nix +++ b/pkgs/tools/misc/gotify-cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "131gs6xzfggnrzq5jgyky23zvcmhx3q3hd17xvqxd02s2i9x1mg4"; }; - modSha256 = "1lrsg33zd7m24za2gv407hz02n3lmz9qljfk82whlj44hx7kim1z"; + vendorSha256 = "1lhhsf944gm1p6qxn05g2s3hdnra5dggj7pdrdq6qr6r2xg7f5qh"; postInstall = '' mv $out/bin/cli $out/bin/gotify @@ -19,8 +19,8 @@ buildGoModule rec { meta = with lib; { license = licenses.mit; - homepage = https://github.com/gotify/cli; + homepage = "https://github.com/gotify/cli"; description = "A command line interface for pushing messages to gotify/server."; maintainers = with maintainers; [ ma27 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 1884cb3ce31a8..6292fb4a72275 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { partitions. GParted enables you to change the partition organization while preserving the partition contents. ''; - homepage = https://gparted.org; + homepage = "https://gparted.org"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 49ca39c7d0606..df645789c582f 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "0m3g68ycb0yvdpiyd6qysgz0ygz9s0kb98g79cdx9rqpb7x0rmd0"; + sha256 = "1sbws735w0qww3nj8ai105a743nyrf1iprmcl89w5h8yirq2z1r9"; }; dontBuild = true; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index e7d32dd4b3733..1f351b662038c 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -31,7 +31,7 @@ in { sha256 = "1c48almnjr0b6nvzagnb9yddqbcjs7yhrd5yc5fx9q7w3vxi50zp"; }; meta = { - homepage = https://github.com/cvtienhoven/graylog-plugin-aggregates; + homepage = "https://github.com/cvtienhoven/graylog-plugin-aggregates"; description = "SSO support for Graylog through trusted HTTP headers set by load balancers or authentication proxies"; }; }; @@ -44,7 +44,7 @@ in { sha256 = "0hwgpq1j3qk0j1zgap5f1avh2nvkcscgds81x8xr0gamphgps8y2"; }; meta = { - homepage = https://github.com/Graylog2/graylog-plugin-auth-sso; + homepage = "https://github.com/Graylog2/graylog-plugin-auth-sso"; description = "SSO support for Graylog through trusted HTTP headers set by load balancers or authentication proxies"; }; }; @@ -57,7 +57,7 @@ in { sha256 = "0djlyd4w4mrrqfbrs20j1xw0fygqsb81snz437v9bf80avmcyzg1"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-dnsresolver; + homepage = "https://github.com/graylog-labs/graylog-plugin-dnsresolver"; description = "Message filter plugin can be used to do DNS lookups for the source field in Graylog messages"; }; }; @@ -70,7 +70,7 @@ in { sha256 = "1vx62yikd6d3lbwsfiyf9j6kx8drvn4xhffwv27fw5jzhfqr61ji"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-filter-messagesize; + homepage = "https://github.com/graylog-labs/graylog-plugin-filter-messagesize"; description = "Prints out all messages that have an estimated size crossing a configured threshold during processing"; }; }; @@ -83,7 +83,7 @@ in { sha256 = "1jyy0wkjapv3xv5q957xxv2pcnd4n1yivkvkvg6cx7kv1ip75xwc"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-internal-logs; + homepage = "https://github.com/graylog-labs/graylog-plugin-internal-logs"; description = "Graylog plugin to record internal logs of Graylog efficiently instead of sending them over the network"; }; }; @@ -96,7 +96,7 @@ in { sha256 = "0hd66751hp97ddkn29s1cmjmc2h1nrp431bq7d2wq16iyxxlygri"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-ipanonymizer; + homepage = "https://github.com/graylog-labs/graylog-plugin-ipanonymizer"; description = "A graylog-server plugin that replaces the last octet of IP addresses in messages with xxx"; }; }; @@ -109,7 +109,7 @@ in { sha256 = "0zy27q8y0bv7i5nypsfxad4yiw121sbwzd194jsz2w08jhk3skl5"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-jabber; + homepage = "https://github.com/graylog-labs/graylog-plugin-jabber"; description = "Jabber Alarmcallback Plugin for Graylog"; }; }; @@ -122,7 +122,7 @@ in { sha256 = "1v1yzmqp43kxigh3fymdwki7pn21sk2ym3kk4nn4qv4zzkhz59vp"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-metrics; + homepage = "https://github.com/graylog-labs/graylog-plugin-metrics"; description = "An output plugin for integrating Graphite, Ganglia and StatsD with Graylog"; }; }; @@ -135,7 +135,7 @@ in { sha256 = "1hadxyawdz234lal3dq5cy3zppl7ixxviw96iallyav83xyi23i8"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-mongodb-profiler; + homepage = "https://github.com/graylog-labs/graylog-plugin-mongodb-profiler"; description = "Graylog input plugin that reads MongoDB profiler data"; }; }; @@ -148,7 +148,7 @@ in { sha256 = "1g63c6rm5pkz7f0d73wb2lmk4zm430jqnhihbyq112cm4i7ymglh"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-pagerduty; + homepage = "https://github.com/graylog-labs/graylog-plugin-pagerduty"; description = "An alarm callback plugin for integrating PagerDuty into Graylog"; }; }; @@ -161,7 +161,7 @@ in { sha256 = "0dfgh6w293ssagas5y0ixwn0vf54i5iv61r5p2q0rbv2da6xvhbw"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-redis; + homepage = "https://github.com/graylog-labs/graylog-plugin-redis"; description = "Redis plugin for Graylog"; }; }; @@ -174,7 +174,7 @@ in { sha256 = "067p8g94b007gypwyyi8vb6qhwdanpk8ah57abik54vv14jxg94k"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-slack; + homepage = "https://github.com/graylog-labs/graylog-plugin-slack"; description = "Can notify Slack or Mattermost channels about triggered alerts in Graylog (Alarm Callback)"; }; }; @@ -187,7 +187,7 @@ in { sha256 = "1mwqy3fhyy4zdwyrzvbr565xwf96xs9d3l70l0khmrm848xf8wz4"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-spaceweather; + homepage = "https://github.com/graylog-labs/graylog-plugin-spaceweather"; description = "Correlate proton density to the response time of your app and the ion temperature to your exception rate."; }; }; @@ -200,7 +200,7 @@ in { sha256 = "0kwfv1zfj0fmxh9i6413bcsaxrn1vdwrzb6dphvg3dx27wxn1j1a"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-twiliosms; + homepage = "https://github.com/graylog-labs/graylog-plugin-twiliosms"; description = "An alarm callback plugin for integrating the Twilio SMS API into Graylog"; }; }; @@ -213,7 +213,7 @@ in { sha256 = "1pi34swy9nzq35a823zzvqrjhb6wsg302z31vk2y656sw6ljjxyh"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-twitter; + homepage = "https://github.com/graylog-labs/graylog-plugin-twitter"; description = "Graylog input plugin that reads Twitter messages based on keywords in realtime"; }; }; diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index 828d4e4dab783..1900764604b5c 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Yet another colouriser for beautifying your logfiles or output of commands"; - homepage = http://korpus.juls.savba.sk/~garabik/software/grc.html; + homepage = "http://korpus.juls.savba.sk/~garabik/software/grc.html"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 AndersonTorres peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix index 2d1284d665294..92f1eb895855a 100644 --- a/pkgs/tools/misc/gringo/default.nix +++ b/pkgs/tools/misc/gringo/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Converts input programs with first-order variables to equivalent ground programs"; - homepage = http://potassco.sourceforge.net/; + homepage = "http://potassco.sourceforge.net/"; platforms = platforms.all; maintainers = [ maintainers.hakuch ]; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 3eec453824d7f..4e00a4ddd49cf 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, flex, bison, python, autoconf, automake, gnulib, libtool -, gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig +, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkgconfig , fuse # only needed for grub-mount , zfs ? null , efiSupport ? false @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ bison flex python pkgconfig autoconf automake ]; - buildInputs = [ ncurses libusb freetype gettext lvm2 fuse libtool ] + buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ] ++ optional doCheck qemu ++ optional zfsSupport zfs; @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { operating system (e.g., GNU). ''; - homepage = https://www.gnu.org/software/grub/; + homepage = "https://www.gnu.org/software/grub/"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 87e9814d8993d..e657431429cce 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "grub-0.97-73"; src = fetchurl { - url = https://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz; + url = "https://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz"; sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation { passthru.grubTarget = ""; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/grub; + homepage = "https://www.gnu.org/software/grub"; description = "GRand Unified Bootloader"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 1033a489c7670..f14758a3ae75e 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake -, gettext, ncurses, libusb, freetype, qemu, lvm2 +, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2 , for_HP_laptop ? false }: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; - buildInputs = [ ncurses libusb freetype gettext lvm2 ] + buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ] ++ optional doCheck qemu; hardeningDisable = [ "stackprotector" "pic" ]; @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GRUB 2.0 extended with TCG (TPM) support for integrity measured boot process (trusted boot)"; - homepage = https://github.com/Sirrix-AG/TrustedGRUB2; + homepage = "https://github.com/Sirrix-AG/TrustedGRUB2"; license = licenses.gpl3Plus; platforms = platforms.gnu ++ platforms.linux; }; diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index 2dd8688232f8a..24548b4d209b5 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation { enableParallelBuilding = false; meta = with stdenv.lib; { - homepage = http://grub4dos.chenall.net/; + homepage = "http://grub4dos.chenall.net/"; description = "GRUB for DOS is the dos extension of GRUB"; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index 78a678f0714db..2e85448bde820 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { It allows you to inspect the drive's SMART data to determine its health, as well as run various tests on it. ''; - homepage = https://gsmartcontrol.sourceforge.io/; + homepage = "https://gsmartcontrol.sourceforge.io/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [qknight]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix index cdb6be992539a..9c2e65676c2dd 100644 --- a/pkgs/tools/misc/gti/default.nix +++ b/pkgs/tools/misc/gti/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://r-wos.org/hacks/gti; + homepage = "http://r-wos.org/hacks/gti"; license = licenses.mit; description = "Humorous typo-based git runner; drives a car over the terminal"; maintainers = with maintainers; [ fadenb ]; diff --git a/pkgs/tools/misc/h5utils/default.nix b/pkgs/tools/misc/h5utils/default.nix index 9fe2677711022..f5c01c83a48a6 100644 --- a/pkgs/tools/misc/h5utils/default.nix +++ b/pkgs/tools/misc/h5utils/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A set of utilities for visualization and conversion of scientific data in the free, portable HDF5 format"; - homepage = https://github.com/stevengj/h5utils; + homepage = "https://github.com/stevengj/h5utils"; license = with licenses; [ mit gpl2 ]; maintainers = with maintainers; [ sfrijters ]; }; diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index 9a3ffe9351020..5793382838b9b 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple app for checking usual checksums - Designed for elementary OS"; - homepage = https://github.com/artemanufrij/hashit; + homepage = "https://github.com/artemanufrij/hashit"; license = licenses.gpl2Plus; maintainers = pantheon.maintainers; platforms = platforms.linux; diff --git a/pkgs/tools/misc/hdaps-gl/default.nix b/pkgs/tools/misc/hdaps-gl/default.nix index af4d4228c2c64..79f4d067b108b 100644 --- a/pkgs/tools/misc/hdaps-gl/default.nix +++ b/pkgs/tools/misc/hdaps-gl/default.nix @@ -1,24 +1,22 @@ -{ stdenv, fetchzip, freeglut, libGL, libGLU }: +{ stdenv, fetchFromGitHub, autoreconfHook, freeglut, libGL, libGLU }: -let version = "0.0.5"; in +let version = "0.0.7"; in stdenv.mkDerivation { pname = "hdaps-gl"; inherit version; - src = fetchzip { - url = "mirror://sourceforge/project/hdaps/hdaps-gl/hdaps-gl-${version}/hdaps-gl-${version}.tar.gz"; - sha256 = "16fk4k0lvr4c95vd6c7qdylcqa1h5yjp3xm4xwipdjbp0bvsgxq4"; + src = fetchFromGitHub { + owner = "linux-thinkpad"; + repo = "hdaps-gl"; + rev = version; + sha256 = "0jywsrcr1wzkjig5cvz014c3r026sbwscbkv7zh1014lkjm0kyyh"; }; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ freeglut libGL libGLU ]; - # the Makefile has no install target - installPhase = '' - install -Dt $out/bin ./hdaps-gl - ''; - meta = with stdenv.lib; { description = "GL-based laptop model that rotates in real-time via hdaps"; - homepage = https://sourceforge.net/projects/hdaps/; + homepage = "https://github.com/linux-thinkpad/hdaps-gl"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.symphorien ]; diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix index 13b69dad971f7..1f3fbd2381ff1 100644 --- a/pkgs/tools/misc/hddtemp/default.nix +++ b/pkgs/tools/misc/hddtemp/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation { name = "hddtemp-0.3_beta15"; db = fetchurl{ - url = mirror://savannah/hddtemp/hddtemp.db; + url = "mirror://savannah/hddtemp/hddtemp.db"; sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya"; }; src = fetchurl { - url = mirror://savannah/hddtemp/hddtemp-0.3-beta15.tar.bz2; + url = "mirror://savannah/hddtemp/hddtemp-0.3-beta15.tar.bz2"; sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tool for displaying hard disk temperature"; - homepage = https://savannah.nongnu.org/projects/hddtemp/; + homepage = "https://savannah.nongnu.org/projects/hddtemp/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index e765e9234745f..8d694aa88b759 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = { description = "Data model, library, and file format for storing and managing data"; - homepage = https://support.hdfgroup.org/products/hdf4/; + homepage = "https://support.hdfgroup.org/products/hdf4/"; maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/misc/hdf5/1_8.nix b/pkgs/tools/misc/hdf5/1_8.nix index d27f6fc01bcec..849fa6b9ac3b9 100644 --- a/pkgs/tools/misc/hdf5/1_8.nix +++ b/pkgs/tools/misc/hdf5/1_8.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { applications for managing, manipulating, viewing, and analyzing data in the HDF5 format. ''; license = stdenv.lib.licenses.free; # BSD-like - homepage = https://www.hdfgroup.org/HDF5/; + homepage = "https://www.hdfgroup.org/HDF5/"; platforms = stdenv.lib.platforms.unix; broken = (gfortran != null) && stdenv.isDarwin; }; diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index b0d69fb98b085..e56108767aba9 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { applications for managing, manipulating, viewing, and analyzing data in the HDF5 format. ''; license = stdenv.lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant - homepage = https://www.hdfgroup.org/HDF5/; + homepage = "https://www.hdfgroup.org/HDF5/"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/hdfjava/default.nix b/pkgs/tools/misc/hdfjava/default.nix index 6087a76e6bd1d..7ee843998313c 100644 --- a/pkgs/tools/misc/hdfjava/default.nix +++ b/pkgs/tools/misc/hdfjava/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A Java package that implements HDF4 and HDF5 data objects in an object-oriented form"; license = stdenv.lib.licenses.free; # BSD-like - homepage = https://support.hdfgroup.org/products/java/index.html; + homepage = "https://support.hdfgroup.org/products/java/index.html"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix index fb6914c01d0a4..0125bfa73696c 100644 --- a/pkgs/tools/misc/hdfview/default.nix +++ b/pkgs/tools/misc/hdfview/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A visual tool for browsing and editing HDF4 and HDF5 files"; license = stdenv.lib.licenses.free; # BSD-like - homepage = https://support.hdfgroup.org/products/java/index.html; + homepage = "https://support.hdfgroup.org/products/java/index.html"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index 22a7d8ec4a7db..e0b8c02a08eac 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, coreutils }: rustPlatform.buildRustPackage rec { pname = "heatseeker"; @@ -13,6 +13,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0jnlcm7v29m4nc318qgf7r7jvs80s7n04fw83imm506vwr9rxbx9"; + # https://github.com/rschmitt/heatseeker/issues/42 + # I've suggested using `/usr/bin/env stty`, but doing that isn't quite as simple + # as a substitution, and this works since we have the path to coreutils stty. + patchPhase = '' + substituteInPlace src/screen/unix.rs --replace "/bin/stty" "${coreutils}/bin/stty" + ''; + # some tests require a tty, this variable turns them off for Travis CI, # which we can also make use of TRAVIS = "true"; diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix index 8b435fcef565b..12d3e7ecc7757 100644 --- a/pkgs/tools/misc/hebcal/default.nix +++ b/pkgs/tools/misc/hebcal/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - version = "4.19"; + version = "4.20"; pname = "hebcal"; src = fetchFromGitHub { owner = "hebcal"; repo = "hebcal"; rev = "v${version}"; - sha256 = "028y2bw0bs0bx58gnxzbrg2c14a2pgkni2carf5i7kb6dg4wnkaq"; + sha256 = "19siipj1svcj7rxgxmm3aaj4d43jx13fr7bghab8wak2dk1x0igb"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://hebcal.github.io; + homepage = "https://hebcal.github.io"; description = "A perpetual Jewish Calendar"; longDescription = "Hebcal is a program which prints out the days in the Jewish calendar for a given Gregorian year. Hebcal is fairly flexible in terms of which events in the Jewish calendar it displays."; license = licenses.gpl2; diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index 26396fee507e7..bd99fa7024c3e 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -42,7 +42,7 @@ mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.glassechidna.com.au/products/heimdall/; + homepage = "http://www.glassechidna.com.au/products/heimdall/"; description = "A cross-platform tool suite to flash firmware onto Samsung Galaxy S devices"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/tools/misc/hexd/default.nix b/pkgs/tools/misc/hexd/default.nix index eabb7838e8ac4..0c0c56c527139 100644 --- a/pkgs/tools/misc/hexd/default.nix +++ b/pkgs/tools/misc/hexd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Colourful, human-friendly hexdump tool"; - homepage = https://github.com/FireyFly/hexd; + homepage = "https://github.com/FireyFly/hexd"; maintainers = [ maintainers.FireyFly ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/tools/misc/hid-listen/default.nix b/pkgs/tools/misc/hid-listen/default.nix index 6bbe4888d1b8a..afc7c5741fd48 100644 --- a/pkgs/tools/misc/hid-listen/default.nix +++ b/pkgs/tools/misc/hid-listen/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool thats prints debugging information from usb HID devices"; - homepage = https://www.pjrc.com/teensy/hid_listen.html; + homepage = "https://www.pjrc.com/teensy/hid_listen.html"; license = licenses.gpl3; maintainers = with maintainers; [ tomsmeets ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/homesick/default.nix b/pkgs/tools/misc/homesick/default.nix index 00a9bf85650cb..5cd11bc48d1f4 100644 --- a/pkgs/tools/misc/homesick/default.nix +++ b/pkgs/tools/misc/homesick/default.nix @@ -20,7 +20,7 @@ bundlerEnv { dotfiles, and saves them in ~/.homesick. It then allows you to symlink all the dotfiles into place with a single command. ''; - homepage = https://github.com/technicalpickles/homesick; + homepage = "https://github.com/technicalpickles/homesick"; license = licenses.mit; maintainers = with maintainers; [ aaronschif nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/hostsblock/default.nix b/pkgs/tools/misc/hostsblock/default.nix index a6ed7bf92ff99..0346c81c66dbc 100644 --- a/pkgs/tools/misc/hostsblock/default.nix +++ b/pkgs/tools/misc/hostsblock/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { meta = with lib; { description = "An ad- and malware-blocking script for Linux"; - homepage = http://gaenserich.github.io/hostsblock/; + homepage = "http://gaenserich.github.io/hostsblock/"; license = licenses.gpl3; maintainers = [ maintainers.nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/hpcg/default.nix b/pkgs/tools/misc/hpcg/default.nix new file mode 100644 index 0000000000000..6274178c266a0 --- /dev/null +++ b/pkgs/tools/misc/hpcg/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, openmpi } : + +stdenv.mkDerivation rec { + pname = "hpcg"; + version = "3.1"; + + src = fetchurl { + url = "http://www.hpcg-benchmark.org/downloads/${pname}-${version}.tar.gz"; + sha256 = "197lw2nwmzsmfsbvgvi8z7kj69n374kgfzzp8pkmk7mp2vkk991k"; + }; + + dontConfigure = true; + + enableParallelBuilding = true; + + buildInputs = [ openmpi ]; + + makeFlags = [ "arch=Linux_MPI" ]; + + installPhase = '' + mkdir -p $out/bin $out/share/hpcg + + cp bin/xhpcg $out/bin + cp bin/hpcg.dat $out/share/hpcg + ''; + + meta = with stdenv.lib; { + description = "HPC conjugate gradient benchmark"; + homepage = "https://www.hpcg-benchmark.org"; + platforms = platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.markuskowa ]; + }; +} + diff --git a/pkgs/tools/misc/hpl/default.nix b/pkgs/tools/misc/hpl/default.nix index 16bc0393f23c3..d688f3adf30ed 100644 --- a/pkgs/tools/misc/hpl/default.nix +++ b/pkgs/tools/misc/hpl/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, openblasCompat, mpi } : +{ stdenv, fetchurl, blas, lapack, mpi } : + +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "hpl"; @@ -18,14 +20,13 @@ stdenv.mkDerivation rec { install -D testing/ptest/HPL.dat $out/share/hpl/HPL.dat ''; - buildInputs = [ openblasCompat mpi ]; + buildInputs = [ blas lapack mpi ]; meta = with stdenv.lib; { description = "Portable Implementation of the Linpack Benchmark for Distributed-Memory Computers"; - homepage = http://www.netlib.org/benchmark/hpl/; + homepage = "http://www.netlib.org/benchmark/hpl/"; platforms = platforms.unix; license = licenses.bsdOriginal; maintainers = [ maintainers.markuskowa ]; }; } - diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock index c3ff0fd210fe9..0ba32818d21b4 100644 --- a/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -6,7 +6,7 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) ffi (1.12.2) - html-proofer (3.15.2) + html-proofer (3.15.3) addressable (~> 2.3) mercenary (~> 0.3) nokogumbo (~> 2.0) @@ -21,7 +21,7 @@ GEM nokogumbo (2.0.2) nokogiri (~> 1.8, >= 1.8.4) parallel (1.19.1) - public_suffix (4.0.3) + public_suffix (4.0.4) rainbow (3.0.0) typhoeus (1.3.1) ethon (>= 0.9.0) diff --git a/pkgs/tools/misc/html-proofer/default.nix b/pkgs/tools/misc/html-proofer/default.nix index 49881f1b0b492..ba136b06b8a5d 100644 --- a/pkgs/tools/misc/html-proofer/default.nix +++ b/pkgs/tools/misc/html-proofer/default.nix @@ -10,7 +10,7 @@ bundlerEnv rec { meta = with lib; { description = "A tool to validate HTML files"; - homepage = https://github.com/gjtorikian/html-proofer; + homepage = "https://github.com/gjtorikian/html-proofer"; license = licenses.mit; maintainers = with maintainers; [ primeos ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix index 2e3b3a10b3b89..c5836bc74ba00 100644 --- a/pkgs/tools/misc/html-proofer/gemset.nix +++ b/pkgs/tools/misc/html-proofer/gemset.nix @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b7wx2hnwnml3y10x6yxybl3hy973n2ifq3hbqh0jd72bqs615wp"; + sha256 = "18afz6rz72j8hnfgzhyr21wh1rfy1x41iyhbcgaq0r1bd7ng1vni"; type = "gem"; }; - version = "3.15.2"; + version = "3.15.3"; }; mercenary = { groups = ["default"]; @@ -99,10 +99,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c6kq6s13idl2036b5lch8r7390f8w82cal8hcp4ml76fm2vdac7"; + sha256 = "1l1kqw75asziwmzrig8rywxswxz8l91sc3pvns02ffsqac1a3wiz"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.4"; }; rainbow = { groups = ["default"]; diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/pkgs/tools/misc/hyperledger-fabric/default.nix index a66923b03f496..e782d793dab86 100644 --- a/pkgs/tools/misc/hyperledger-fabric/default.nix +++ b/pkgs/tools/misc/hyperledger-fabric/default.nix @@ -28,7 +28,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "An implementation of blockchain technology, leveraging familiar and proven technologies"; - homepage = https://wiki.hyperledger.org/projects/Fabric; + homepage = "https://wiki.hyperledger.org/projects/Fabric"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index 372eebb59f611..ad9c41d47052b 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec { manage workspaces defining windows and their layout. The project is inspired by tmuxinator and uses i3-py. ''; - homepage = https://github.com/carlesso/i3minator; + homepage = "https://github.com/carlesso/i3minator"; license = stdenv.lib.licenses.wtfpl; maintainers = with maintainers; [ domenkozar ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix index 872de2c702b6d..095336b7df548 100644 --- a/pkgs/tools/misc/ical2org/default.nix +++ b/pkgs/tools/misc/ical2org/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Convert an iCal file to org agenda format, optionally deduplicating entries."; - homepage = https://github.com/rjhorniii/ical2org; + homepage = "https://github.com/rjhorniii/ical2org"; license = licenses.gpl3; maintainers = with maintainers; [ swflint ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/pkgs/tools/misc/ideviceinstaller/default.nix index 98b039e3f8ae4..4046d775a542b 100644 --- a/pkgs/tools/misc/ideviceinstaller/default.nix +++ b/pkgs/tools/misc/ideviceinstaller/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig usbmuxd libimobiledevice libzip ]; meta = with stdenv.lib; { - homepage = https://github.com/libimobiledevice/ideviceinstaller; + homepage = "https://github.com/libimobiledevice/ideviceinstaller"; description = "List/modify installed apps of iOS devices"; longDescription = '' ideviceinstaller is a tool to interact with the installation_proxy diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/pkgs/tools/misc/idevicerestore/default.nix index ec9d1f5285339..5a60641144195 100644 --- a/pkgs/tools/misc/idevicerestore/default.nix +++ b/pkgs/tools/misc/idevicerestore/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/libimobiledevice/idevicerestore; + homepage = "https://github.com/libimobiledevice/idevicerestore"; description = "Restore/upgrade firmware of iOS devices"; longDescription = '' The idevicerestore tool allows to restore firmware files to iOS devices. diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index 01995c4939afa..9afb927913406 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { contents of certain character strings. ''; - homepage = https://www.gnu.org/software/idutils/; + homepage = "https://www.gnu.org/software/idutils/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; diff --git a/pkgs/tools/misc/ili2c/default.nix b/pkgs/tools/misc/ili2c/default.nix index 4d78f797f109a..43eed8367c47b 100644 --- a/pkgs/tools/misc/ili2c/default.nix +++ b/pkgs/tools/misc/ili2c/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "ili2c"; - version = "5.0.0"; + version = "5.0.8"; nativeBuildInputs = [ ant jdk makeWrapper ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "claeis"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0xps2343d5gdr2aj8j3l4cjq4k9zbxxlhnp8sjlhxh1wdczxlwx6"; + sha256 = "1yhsyh940kb33y2n6xl7zhf0f6q0nrxbyg6c4g5n2imllpn54sgi"; }; buildPhase = "ant jar"; diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/tools/misc/intermodal/default.nix new file mode 100644 index 0000000000000..8a2412f86ef1e --- /dev/null +++ b/pkgs/tools/misc/intermodal/default.nix @@ -0,0 +1,25 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "intermodal"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "casey"; + repo = pname; + rev = "v${version}"; + sha256 = "05wjzx1ibd7cyl5lgmmn5y8dhsk71wz2bnimbmq7z51ds6cbyw5i"; + }; + + cargoSha256 = "04xqk1mmbrz8bjn36nxabwla3y62wfdly5bckkya6y2dhf1vkdjq"; + + # include_hidden test tries to use `chflags` on darwin + checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; + + meta = with stdenv.lib; { + description = "User-friendly and featureful command-line BitTorrent metainfo utility"; + homepage = "https://github.com/casey/intermodal"; + license = licenses.cc0; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 6946010b52a04..87b26f223bc8f 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Network boot firmware"; - homepage = https://ipxe.org/; + homepage = "https://ipxe.org/"; license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index 6b1c0d735eedf..094c42b59dd2b 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { name = "jdiskreport-1.4.1"; src = fetchurl { - url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_1.zip; + url = "http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_1.zip"; sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58"; }; @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.jgoodies.com/freeware/jdiskreport/; + homepage = "http://www.jgoodies.com/freeware/jdiskreport/"; description = "A graphical utility to visualize disk usage"; license = licenses.unfreeRedistributable; #TODO freedist, libs under BSD-3 platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index 109a84de63102..ae0b32d2120dd 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,21 +2,24 @@ stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "18hn25f7cdz1li0vvx74al7a8z2220xhzjp9j6idhldsmjnscgq8"; + sha256 = "05q2ys7ii6mqiddl9ixzqhbvk4xy5ckh3yfz26vycxiyh9cp7yls"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. extraPostFetch = "rm -r $out/testdir"; }; + dontConfigure = true; + makeFlags = [ "PREFIX=${placeholder "out"}" + "HARDEN=1" ] ++ stdenv.lib.optionals stdenv.isLinux [ "ENABLE_DEDUPE=1" "STATIC_DEDUPE_H=1" @@ -27,7 +30,7 @@ stdenv.mkDerivation rec { doCheck = false; # broken Makefile, the above also removes tests postInstall = '' - install -Dm644 -t $out/share/doc/jdupes CHANGES LICENSE README.md + install -Dm444 -t $out/share/doc/jdupes CHANGES LICENSE README.md ''; meta = with stdenv.lib; { @@ -40,6 +43,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jbruchon/jdupes"; license = licenses.mit; maintainers = with maintainers; [ romildo ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/jugglinglab/default.nix b/pkgs/tools/misc/jugglinglab/default.nix new file mode 100644 index 0000000000000..32c45b31a17dd --- /dev/null +++ b/pkgs/tools/misc/jugglinglab/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, jre, makeWrapper, ant, jdk }: +stdenv.mkDerivation rec { + version = "1.2.1"; + name = "jugglinglab"; + src = fetchFromGitHub { + owner = "jkboyce"; + repo = "jugglinglab"; + rev = "1908012682d8c39a9b92248a20f285455104c510"; # v1.2.1 does not have a tag on Github + sha256 = "0dvcyjwynvapqbjchrln59vdskrm3w6kh0knxcn4bx61vcz3171z"; + }; + buildInputs = [ jre ]; + nativeBuildInputs = [ ant jdk makeWrapper ]; + buildPhase = "ant"; + + installPhase = '' + mkdir -p "$out/bin" + mkdir -p "$out/lib" + cp bin/JugglingLab.jar $out/lib/ + + makeWrapper ${jre}/bin/java $out/bin/jugglinglab \ + --add-flags "-jar $out/lib/JugglingLab.jar" + ''; + + meta = with stdenv.lib; { + description = "A program to visualize different juggling pattens"; + license = licenses.gpl2; + maintainers = with maintainers; [ wnklmnn ]; + platforms = platforms.all; + }; +} \ No newline at end of file diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix index 4bcfd81f71de8..2f63eaf438067 100644 --- a/pkgs/tools/misc/kak-lsp/default.nix +++ b/pkgs/tools/misc/kak-lsp/default.nix @@ -2,22 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "kak-lsp"; - version = "7.0.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "ul"; repo = pname; rev = "v${version}"; - sha256 = "1b9v417g0z9q1sqgnms5vy740xggg4fcz0fdwbc4hfvfj6jkyaad"; + sha256 = "0nka51szivwhlfkimjiyzj67nxh75m784c28ass6ihlfax631w9m"; }; - cargoSha256 = "1cmms8kvh24sjb0w77i1bwl09wkx3x65p49pkg1j0lipwic3apm3"; + cargoSha256 = "174qy50m9487vv151vm8q6sby79dq3gbqjbz6h4326jwsc9wwi8c"; buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = "Kakoune Language Server Protocol Client"; - homepage = https://github.com/ul/kak-lsp; + homepage = "https://github.com/ul/kak-lsp"; license = with licenses; [ unlicense /* or */ mit ]; maintainers = [ maintainers.spacekookie ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix index 0fd1c7c5cd733..53b1763ad6a1e 100644 --- a/pkgs/tools/misc/kdecoration-viewer/default.nix +++ b/pkgs/tools/misc/kdecoration-viewer/default.nix @@ -20,7 +20,7 @@ mkDerivation { kdecoration-viewer allows to preview a KDecoration plugin. Put your plugins under $QT_PLUGIN_PATH/org.kde.kdecoration2 to preview. ''; - homepage = https://blog.martin-graesslin.com/blog/2014/07/kdecoration2-the-road-ahead/; + homepage = "https://blog.martin-graesslin.com/blog/2014/07/kdecoration2-the-road-ahead/"; license = licenses.gpl2; maintainers = [ maintainers.gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix index 0a8f10fa85d5d..46d75e5086e8e 100644 --- a/pkgs/tools/misc/kepubify/default.nix +++ b/pkgs/tools/misc/kepubify/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "13d3fl53v9pqlm555ly1dm9vc58xwkyik0qmsg173q78ysy2p4q5"; }; - modSha256 = "0jz8v4rnwm5zbxxp49kv96wm4lack6prwyhcrqwsrm79dr9yjcxf"; + vendorSha256 = "04qpxl4j6v6w25i7r6wghd9xi7jzpy7dynhs9ni35wflq0rlczax"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -23,4 +23,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ zowoq ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/tools/misc/kermit/default.nix index d320491756cf2..f81d9b7266b69 100644 --- a/pkgs/tools/misc/kermit/default.nix +++ b/pkgs/tools/misc/kermit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "kermit-9.0.302"; src = fetchurl { - url = ftp://ftp.kermitproject.org/kermit/archives/cku302.tar.gz; + url = "ftp://ftp.kermitproject.org/kermit/archives/cku302.tar.gz"; sha256 = "0487mh6s99ijqf1pfmbm302pa5i4pzmm8s439hdl1ffs5g8jqpqd"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.kermitproject.org/ck90.html; + homepage = "http://www.kermitproject.org/ck90.html"; description = "Portable Scriptable Network and Serial Communication Software"; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index e10b42273be83..a65d408fa6b2c 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "Keychain management tool"; - homepage = https://www.funtoo.org/Keychain; + homepage = "https://www.funtoo.org/Keychain"; license = stdenv.lib.licenses.gpl2; # other platforms are untested (AFAIK) platforms = diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix index 5e5a7174a1497..c6ec5f3103fe3 100644 --- a/pkgs/tools/misc/kisslicer/default.nix +++ b/pkgs/tools/misc/kisslicer/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Convert STL files into Gcode"; - homepage = http://www.kisslicer.com; + homepage = "http://www.kisslicer.com"; license = licenses.unfree; maintainers = [ maintainers.cransom ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/misc/kodi-cli/default.nix b/pkgs/tools/misc/kodi-cli/default.nix index d2fb32319bf7e..37eed61008b4d 100644 --- a/pkgs/tools/misc/kodi-cli/default.nix +++ b/pkgs/tools/misc/kodi-cli/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/nawar/kodi-cli; + homepage = "https://github.com/nawar/kodi-cli"; description = "Kodi/XBMC bash script to send Kodi commands using JSON RPC. It also allows sending YouTube videos to Kodi"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/tools/misc/kt/default.nix index c272584e2c058..9664759cf5a43 100644 --- a/pkgs/tools/misc/kt/default.nix +++ b/pkgs/tools/misc/kt/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Kafka command line tool"; - homepage = https://github.com/fgeller/kt; + homepage = "https://github.com/fgeller/kt"; maintainers = with maintainers; [ utdemir ]; platforms = with platforms; unix; license = licenses.mit; diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix index c379a0d1abc7d..1d78210d298bc 100644 --- a/pkgs/tools/misc/latex2html/default.nix +++ b/pkgs/tools/misc/latex2html/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { commands. ''; - homepage = https://www.ctan.org/pkg/latex2html; + homepage = "https://www.ctan.org/pkg/latex2html"; license = licenses.gpl2; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 6624eb5102d3b..7a6553461cb9c 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { + ":${perlldap}/${perl.libPrefix}"; meta = { - homepage = http://www.spinnaker.de/lbdb/; + homepage = "http://www.spinnaker.de/lbdb/"; license = licenses.gpl2; platforms = platforms.all; description = "The Little Brother's Database"; diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index 3d2b7c5b214cd..52e6b0c6a30a9 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ldapvi is an interactive LDAP client for Unix terminals. Using it, you can update LDAP entries with a text editor. ''; - homepage = http://www.lichteblau.com/ldapvi/; + homepage = "http://www.lichteblau.com/ldapvi/"; license = licenses.gpl2; maintainers = with maintainers; [ domenkozar ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix index 2ec683484958c..9c9751d35c321 100644 --- a/pkgs/tools/misc/ldmtool/default.nix +++ b/pkgs/tools/misc/ldmtool/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool and library for managing Microsoft Windows Dynamic Disks"; - homepage = https://github.com/mdbooth/libldm; + homepage = "https://github.com/mdbooth/libldm"; maintainers = with maintainers; [ jensbin ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index e98b085c78d50..9b1aa0dc59064 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; meta = with stdenv.lib; { - homepage = http://www.greenwoodsoftware.com/less/; + homepage = "http://www.greenwoodsoftware.com/less/"; description = "A more advanced file pager than ‘more’"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix index bb99521cc27e2..231e660f5826c 100644 --- a/pkgs/tools/misc/lesspipe/default.nix +++ b/pkgs/tools/misc/lesspipe/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { plist and archive formats, perl storable data and gpg encrypted files. This does require additional helper programs being installed. ''; - homepage = https://github.com/wofr06/lesspipe; + homepage = "https://github.com/wofr06/lesspipe"; platforms = platforms.all; license = licenses.gpl2; maintainers = [ maintainers.martijnvermaat ]; diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index c2f281ecb17b1..8627003db5f9e 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -1,17 +1,19 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib, installShellFiles }: buildGoModule rec { pname = "lf"; - version = "13"; + version = "14"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "1ld3q75v8rvp169w5p85z1vznqs9bhck6bm2f6fykxx16hmpb6ga"; + sha256 = "0kl9yrgph1i0jbxhlg3k0411436w80xw1s8dzd7v7h2raygkb4is"; }; - modSha256 = "14fvn8yjm9cnpsmzgxw2dypr3h8h36mxrbk7zma42w8rsp46jpz7"; + vendorSha256 = "1zb2z3c2w4gnq9cjczg1y7r7jg4mlrm2hsb12dqd9w8mh44rvr37"; + + nativeBuildInputs = [ installShellFiles ]; # TODO: Setting buildFlags probably isn't working properly. I've tried a few # variants, e.g.: @@ -26,7 +28,9 @@ buildGoModule rec { ''; postInstall = '' - install -D --mode=444 lf.1 $out/share/man/man1/lf.1 + install -D --mode=444 lf.desktop $out/share/applications/lf.desktop + installManPage lf.1 + installShellCompletion etc/lf.{zsh,fish} ''; meta = with lib; { @@ -37,9 +41,10 @@ buildGoModule rec { the missing features are deliberately omitted since it is better if they are handled by external tools. ''; - homepage = https://godoc.org/github.com/gokcehan/lf; + homepage = "https://godoc.org/github.com/gokcehan/lf"; + changelog = "https://github.com/gokcehan/lf/releases/tag/r${version}"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index eb3b6aa11e6ab..bad820c150694 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Bitcoin client query library"; - homepage = https://github.com/libbitcoin/libbitcoin-client; + homepage = "https://github.com/libbitcoin/libbitcoin-client"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ chris-martin ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index d0395ecbd7f0b..93d8ceed2b47b 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Bitcoin command line tool"; - homepage = https://github.com/libbitcoin/libbitcoin-explorer; + homepage = "https://github.com/libbitcoin/libbitcoin-explorer"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ chris-martin asymmetric ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix index cb9e2cbf1e842..fc660687ffc37 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Bitcoin P2P Network Library"; - homepage = https://libbitcoin.org/; + homepage = "https://libbitcoin.org/"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ asymmetric ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix index 2c13927dfad8d..a5467fdcbd7a9 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Bitcoin Blockchain Query Protocol"; - homepage = https://libbitcoin.org/; + homepage = "https://libbitcoin.org/"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ asymmetric ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 8009fe563ee17..e68635585d0f4 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "C++ library for building bitcoin applications"; - homepage = https://libbitcoin.org/; + homepage = "https://libbitcoin.org/"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ chris-martin ]; diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index e31112a74d8ad..b0fe00d44d9cd 100644 --- a/pkgs/tools/misc/libcpuid/default.nix +++ b/pkgs/tools/misc/libcpuid/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = http://libcpuid.sourceforge.net/; + homepage = "http://libcpuid.sourceforge.net/"; description = "A small C library for x86 CPU detection and feature extraction"; license = licenses.bsd2; maintainers = with maintainers; [ orivej artuuge ]; diff --git a/pkgs/tools/misc/libgen-cli/default.nix b/pkgs/tools/misc/libgen-cli/default.nix index c34e934fba48e..c92b4ad42e1b6 100644 --- a/pkgs/tools/misc/libgen-cli/default.nix +++ b/pkgs/tools/misc/libgen-cli/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "1lfsnyzin2dqhwhz6phms6yipli88sqiw55ls18dfv7bvx30sqlp"; }; - modSha256 = "1k16zjb7p65g72hr9vsk38jhpsy1yclm7fjgq47qy6jwjd44w1bi"; + vendorSha256 = "1j45h8p13xfz0qy1nrddlx1xzbr5vqxd3q76hbb0v60636izfk0r"; subPackages = [ "." ]; @@ -27,4 +27,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ zaninime ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/lice/default.nix b/pkgs/tools/misc/lice/default.nix index bb0f93ba3283b..f4653f81f3a5d 100644 --- a/pkgs/tools/misc/lice/default.nix +++ b/pkgs/tools/misc/lice/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonPackage rec { meta = with stdenv.lib; { description = "Print license based on selection and user options."; - homepage = https://github.com/licenses/lice; + homepage = "https://github.com/licenses/lice"; license = licenses.bsd3; maintainers = with maintainers; [ swflint ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/tools/misc/linuxquota/default.nix index 9bc7c372d93c9..b6b722379da88 100644 --- a/pkgs/tools/misc/linuxquota/default.nix +++ b/pkgs/tools/misc/linuxquota/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools to manage kernel-level quotas in Linux"; - homepage = https://sourceforge.net/projects/linuxquota/; + homepage = "https://sourceforge.net/projects/linuxquota/"; license = licenses.gpl2; # With some files being BSD as an exception platforms = platforms.linux; maintainers = [ maintainers.dezgeg ]; diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index 90560d3215734..aab980d76e7ee 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/tstack/lnav; + homepage = "https://github.com/tstack/lnav"; description = "The Logfile Navigator"; longDescription = '' The log file navigator, lnav, is an enhanced log file viewer that takes diff --git a/pkgs/tools/misc/lnch/default.nix b/pkgs/tools/misc/lnch/default.nix new file mode 100644 index 0000000000000..4d9324af1807f --- /dev/null +++ b/pkgs/tools/misc/lnch/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + pname = "lnch"; + version = "2017-02-16"; + + goPackagePath = "github.com/oem/${pname}"; + + src = fetchFromGitHub { + owner = "oem"; + repo = pname; + rev = "f24eed5392f01d2c8a9cfe9cdf70dcfbbf4b6b36"; + sha256 = "0skzrjnbxq1yj7y64cq7angp4wqnrgw1xp9v8vw9zp8f8zwmpy0y"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/oem/lnch"; + description = "A small go app that launches a process and moves it out of the process group"; + platforms = platforms.all; + license = licenses.publicDomain; # really I don't know + }; +} diff --git a/pkgs/tools/misc/loadlibrary/default.nix b/pkgs/tools/misc/loadlibrary/default.nix index bc52598ff8001..d33f6d8610af3 100644 --- a/pkgs/tools/misc/loadlibrary/default.nix +++ b/pkgs/tools/misc/loadlibrary/default.nix @@ -22,7 +22,7 @@ stdenv_32bit.mkDerivation rec { ''; meta = with stdenv_32bit.lib; { - homepage = https://github.com/taviso/loadlibrary; + homepage = "https://github.com/taviso/loadlibrary"; description = "Porting Windows Dynamic Link Libraries to Linux"; platforms = platforms.linux; maintainers = [ maintainers.eleanor ]; diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix index e851855834a45..e30b36919b77c 100644 --- a/pkgs/tools/misc/lockfile-progs/default.nix +++ b/pkgs/tools/misc/lockfile-progs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Programs for locking and unlocking files and mailboxes"; - homepage = http://packages.debian.org/sid/lockfile-progs; + homepage = "http://packages.debian.org/sid/lockfile-progs"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index c926d220b05de..ec8106e922ae1 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; - homepage = https://www.elastic.co/products/logstash; + homepage = "https://www.elastic.co/products/logstash"; license = if enableUnfree then licenses.elastic else licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ wjlroe offline basvandijk ]; diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index 1bd3073376552..e7872b0c4061d 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; - homepage = https://www.elastic.co/products/logstash; + homepage = "https://www.elastic.co/products/logstash"; license = if enableUnfree then licenses.elastic else licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ wjlroe offline basvandijk ]; diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix index b580d559868b7..d03e031b7aeec 100644 --- a/pkgs/tools/misc/logstash/contrib.nix +++ b/pkgs/tools/misc/logstash/contrib.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Community-maintained logstash plugins"; - homepage = https://github.com/elasticsearch/logstash-contrib; + homepage = "https://github.com/elasticsearch/logstash-contrib"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/tools/misc/lolcat/default.nix b/pkgs/tools/misc/lolcat/default.nix index 25efcdf34611b..f62be23108eb6 100644 --- a/pkgs/tools/misc/lolcat/default.nix +++ b/pkgs/tools/misc/lolcat/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A rainbow version of cat"; - homepage = https://github.com/busyloop/lolcat; + homepage = "https://github.com/busyloop/lolcat"; license = licenses.bsd3; maintainers = with maintainers; [ StillerHarpo manveru nicknovitski ]; }; diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix index 2b5bb1989f42c..73907e233ab04 100644 --- a/pkgs/tools/misc/loop/default.nix +++ b/pkgs/tools/misc/loop/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage { meta = with stdenv.lib; { description = "UNIX's missing `loop` command"; - homepage = https://github.com/Miserlou/Loop; + homepage = "https://github.com/Miserlou/Loop"; maintainers = with maintainers; [ koral ]; license = licenses.mit; }; diff --git a/pkgs/tools/misc/lrzsz/default.nix b/pkgs/tools/misc/lrzsz/default.nix index 11351790becc4..112a14f55f241 100644 --- a/pkgs/tools/misc/lrzsz/default.nix +++ b/pkgs/tools/misc/lrzsz/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--program-transform-name=s/^l//" ]; meta = with stdenv.lib; { - homepage = https://ohse.de/uwe/software/lrzsz.html; + homepage = "https://ohse.de/uwe/software/lrzsz.html"; description = "Communication package providing the XMODEM, YMODEM ZMODEM file transfer protocols"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 4e2b3a91a0694..73dcbd3bc3cbf 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -19,11 +19,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - installShellCompletion target/release/build/lsd-*/out/{_lsd,lsd.{bash,fish}} + installShellCompletion $releaseDir/build/lsd-*/out/{_lsd,lsd.{bash,fish}} ''; meta = with stdenv.lib; { - homepage = https://github.com/Peltoche/lsd; + homepage = "https://github.com/Peltoche/lsd"; description = "The next gen ls command"; license = licenses.asl20; maintainers = with maintainers; [ filalex77 marsam ]; diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix index 84a92ec771281..e345f86e0212d 100644 --- a/pkgs/tools/misc/ltunify/default.nix +++ b/pkgs/tools/misc/ltunify/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tool for working with Logitech Unifying receivers and devices"; - homepage = https://lekensteyn.nl/logitech-unifying.html; + homepage = "https://lekensteyn.nl/logitech-unifying.html"; license = licenses.gpl3Plus; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/makebootfat/default.nix b/pkgs/tools/misc/makebootfat/default.nix index e23e12bcb307b..dc66976720d0c 100644 --- a/pkgs/tools/misc/makebootfat/default.nix +++ b/pkgs/tools/misc/makebootfat/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Create bootable USB disks using the FAT filesystem and syslinux"; - homepage = http://advancemame.sourceforge.net/boot-readme.html; + homepage = "http://advancemame.sourceforge.net/boot-readme.html"; license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 918e8372dcbb2..f19e5fd5b9df2 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.hostPlatform.isMusl /* iconv binary */ && !stdenv.hostPlatform.isDarwin; meta = with stdenv.lib; { - homepage = http://man-db.nongnu.org; + homepage = "http://man-db.nongnu.org"; description = "An implementation of the standard Unix documentation system accessed using the man command"; license = licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix index 828e235823636..82fc1dee00c3e 100644 --- a/pkgs/tools/misc/mandoc/default.nix +++ b/pkgs/tools/misc/mandoc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://mandoc.bsd.lv/; + homepage = "https://mandoc.bsd.lv/"; description = "suite of tools compiling mdoc and man"; downloadPage = "http://mandoc.bsd.lv/snapshots/"; license = licenses.bsd3; diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/tools/misc/massren/default.nix index 6d198a35605dd..4c9d5a6da8a22 100644 --- a/pkgs/tools/misc/massren/default.nix +++ b/pkgs/tools/misc/massren/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with lib; { description = "Easily rename multiple files using your text editor"; license = licenses.mit; - homepage = https://github.com/laurent22/massren; + homepage = "https://github.com/laurent22/massren"; maintainers = with maintainers; [ andrew-d ]; }; } diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 7edfb280e4307..8b1cb938fb742 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -3,12 +3,12 @@ } : stdenv.mkDerivation rec { - version = "20191016"; + version = "20200505"; pname = "mbuffer"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "05xyvmbs2x5gbj2njgg7hsj3alb5dh96xhab0w0qkhb58x2i1hld"; + sha256 = "02qzy3appah0llg6aa71isl2a5nc93bkzy5r4d682lcy2j1n216c"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index e9ba1c3b5d1f6..f206c54a0037e 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0r2zb59rpja9z7q0gsylqaq4vqm5rp57fy56ajjrm6k6z06nq7bv"; meta = with stdenv.lib; { - homepage = https://github.com/cantino/mcfly; + homepage = "https://github.com/cantino/mcfly"; description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now."; license = licenses.mit; maintainers = [ maintainers.melkor333 ]; diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix index bc520c57a338e..afbe811e7f2f2 100644 --- a/pkgs/tools/misc/mcrypt/default.nix +++ b/pkgs/tools/misc/mcrypt/default.nix @@ -9,7 +9,12 @@ stdenv.mkDerivation rec { sha256 = "5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098"; }; - patches = [ ./format-string.patch ./overflow.patch ./segv.patch ./sprintf.patch ]; + patches = [ + ./format-string_CVE-2012-4426.patch + ./overflow_CVE-2012-4409.patch + ./segv.patch + ./sprintf_CVE-2012-4527.patch + ]; buildInputs = [ libmcrypt libmhash ]; @@ -20,7 +25,7 @@ stdenv.mkDerivation rec { for the old Unix crypt, except that they are under the GPL and support an ever-wider range of algorithms and modes. ''; - homepage = http://mcrypt.sourceforge.net; + homepage = "http://mcrypt.sourceforge.net"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.qknight ]; diff --git a/pkgs/tools/misc/mcrypt/format-string.patch b/pkgs/tools/misc/mcrypt/format-string_CVE-2012-4426.patch index 322ab473811f6..322ab473811f6 100644 --- a/pkgs/tools/misc/mcrypt/format-string.patch +++ b/pkgs/tools/misc/mcrypt/format-string_CVE-2012-4426.patch diff --git a/pkgs/tools/misc/mcrypt/overflow.patch b/pkgs/tools/misc/mcrypt/overflow_CVE-2012-4409.patch index bf747a58266a5..bf747a58266a5 100644 --- a/pkgs/tools/misc/mcrypt/overflow.patch +++ b/pkgs/tools/misc/mcrypt/overflow_CVE-2012-4409.patch diff --git a/pkgs/tools/misc/mcrypt/sprintf.patch b/pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch index 1c9ade807778f..1c9ade807778f 100644 --- a/pkgs/tools/misc/mcrypt/sprintf.patch +++ b/pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index b365086c46d3b..0a887531fb86d 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = ".mdb (MS Access) format tools"; - homepage = http://mdbtools.sourceforge.net; + homepage = "http://mdbtools.sourceforge.net"; platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; }; diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/pkgs/tools/misc/memtest86-efi/default.nix index 9f029ee5ded33..c33aa074404f9 100644 --- a/pkgs/tools/misc/memtest86-efi/default.nix +++ b/pkgs/tools/misc/memtest86-efi/default.nix @@ -1,4 +1,10 @@ -{ fetchzip, lib, p7zip, stdenv }: +{ stdenv +, lib +, fetchzip +, utillinux +, jq +, mtools +}: stdenv.mkDerivation rec { pname = "memtest86-efi"; @@ -22,19 +28,28 @@ stdenv.mkDerivation rec { stripRoot = false; }; - nativeBuildInputs = [ p7zip ]; + nativeBuildInputs = [ + utillinux + jq + mtools + ]; installPhase = '' - mkdir -p $out - # memtest86 is distributed as a bootable USB image. It contains the actual # memtest86 EFI app. # - # The following command uses p7zip to extract the actual EFI app from the - # usb image so that it can be installed directly on the hard drive. - 7z x -o$TEMP/temp-efi-dirs $src/memtest86-usb.img - 7z x -o$TEMP/memtest86-files $TEMP/temp-efi-dirs/EFI\ System\ Partition.img - cp -r $TEMP/memtest86-files/EFI/BOOT/* $out/ + # The following uses sfdisk to calculate the offset of the FAT EFI System + # Partition in the disk image, and mcopy to extract the actual EFI app from + # the filesystem so that it can be installed directly on the hard drive. + IMG=$src/memtest86-usb.img + ESP_OFFSET=$(sfdisk --json $IMG | jq -r ' + # Partition type GUID identifying EFI System Partitions + def ESP_GUID: "C12A7328-F81F-11D2-BA4B-00A0C93EC93B"; + .partitiontable | + .sectorsize * (.partitions[] | select(.type == ESP_GUID) | .start) + ') + mkdir $out + mcopy -vsi $IMG@@$ESP_OFFSET ::'/EFI/BOOT/*' $out/ ''; meta = with lib; { diff --git a/pkgs/tools/misc/mht2htm/default.nix b/pkgs/tools/misc/mht2htm/default.nix index e382db0b92c3d..31f645e48ceb8 100644 --- a/pkgs/tools/misc/mht2htm/default.nix +++ b/pkgs/tools/misc/mht2htm/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Convert .mht files to .html"; - homepage = http://pgm.bpalanka.com/mht2htm.html; + homepage = "http://pgm.bpalanka.com/mht2htm.html"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 64cad47b54083..55cc9717688a6 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Open files by MIME-type or file name using regular expressions"; - homepage = http://xyne.archlinux.ca/projects/mimeo/; + homepage = "http://xyne.archlinux.ca/projects/mimeo/"; license = [ licenses.gpl2 ]; maintainers = [ maintainers.rycee ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index 168e1dac3a321..35c04faf45921 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Modem control and terminal emulation program"; - homepage = https://salsa.debian.org/minicom-team/minicom; + homepage = "https://salsa.debian.org/minicom-team/minicom"; license = licenses.gpl2; longDescription = '' Minicom is a menu driven communications program. It emulates ANSI diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 9add75acee207..dab44e1eea5a7 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -1,28 +1,35 @@ -{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkg-config, zlib, openssl }: +{ stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, zlib +, openssl +, Security +}: rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { - owner = "svenstaro"; - repo = "miniserve"; - rev = "v${version}"; - sha256 = "0ybxnxjg0vqm4q60z4zjl3hfls0s2rvy44m6jgyhlj1p6cr3dbyw"; + owner = "svenstaro"; + repo = "miniserve"; + rev = "v${version}"; + sha256 = "06nrb84xfvx02yc4bjn1szfq3bjy8mqgxwwrjghl7vpcw51qhlk5"; }; - cargoSha256 = "0ypxv9wqcnjxjdrvdparddpssrarnifr43dq7kcr4l3fd1anl40a"; + cargoSha256 = "0mk8hvhjqggfr410yka9ygb41l1bnsizs8py3100xf685yxy5mhl"; RUSTC_BOOTSTRAP = 1; - nativeBuildInputs = [ cmake pkg-config zlib ]; - buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config zlib ]; + buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ]; meta = with stdenv.lib; { description = "For when you really just want to serve some files over HTTP right now!"; - homepage = "https://github.com/svenstaro/miniserve"; - license = with licenses; [ mit ]; + homepage = "https://github.com/svenstaro/miniserve"; + license = with licenses; [ mit ]; maintainers = with maintainers; [ nequissimus ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/ministat/default.nix b/pkgs/tools/misc/ministat/default.nix index 7b8b8a82b7278..dfc2e2c624edd 100644 --- a/pkgs/tools/misc/ministat/default.nix +++ b/pkgs/tools/misc/ministat/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple tool for statistical comparison of data sets"; - homepage = https://git.decadent.org.uk/gitweb/?p=ministat.git; + homepage = "https://git.decadent.org.uk/gitweb/?p=ministat.git"; license = licenses.beerware; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index c88f12c74d1a7..485c3403cff7d 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; meta = { - homepage = http://mktorrent.sourceforge.net/; + homepage = "http://mktorrent.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; description = "Command line utility to create BitTorrent metainfo files"; maintainers = with stdenv.lib.maintainers; [Profpatsch]; diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix index f8fb253af471d..d3f406c535526 100644 --- a/pkgs/tools/misc/mlocate/default.nix +++ b/pkgs/tools/misc/mlocate/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Merging locate is an utility to index and quickly search for files"; - homepage = https://pagure.io/mlocate; + homepage = "https://pagure.io/mlocate"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ]; diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix index a791cbe5d4828..e272c56e0acdd 100644 --- a/pkgs/tools/misc/mmake/default.nix +++ b/pkgs/tools/misc/mmake/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/tj/mmake; + homepage = "https://github.com/tj/mmake"; description = "A small program which wraps make to provide additional functionality"; longDescription = '' Mmake is a small program which wraps make to provide additional diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix index 6129f15c734f1..48c3b39326286 100644 --- a/pkgs/tools/misc/mmv/default.nix +++ b/pkgs/tools/misc/mmv/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://linux.maruhn.com/sec/mmv.html; + homepage = "http://linux.maruhn.com/sec/mmv.html"; description = "Utility for wildcard renaming, copying, etc"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 95c87cb35fc66..bdc3ac4ddebdf 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -81,7 +81,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "The GUI for MongoDB"; - homepage = https://www.mongodb.com/products/compass; + homepage = "https://www.mongodb.com/products/compass"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index dbccbf9b2f643..c3e9a0dc2ff24 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -45,14 +45,14 @@ in buildGoPackage { runHook preBuild ${stdenv.lib.concatMapStrings (t: '' - go build -o "$bin/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main + go build -o "$out/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main '') tools} runHook postBuild ''; meta = { - homepage = https://github.com/mongodb/mongo-tools; + homepage = "https://github.com/mongodb/mongo-tools"; description = "Tools for the MongoDB"; license = lib.licenses.asl20; }; diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 44f791e5b8aa8..92402797d112f 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young"; - homepage = https://joeyh.name/code/moreutils/; + homepage = "https://joeyh.name/code/moreutils/"; maintainers = with maintainers; [ koral pSub ]; platforms = platforms.all; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index df84084fc9c18..49f9c6bc03136 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Music Player Daemon (MPD) client which submits information about tracks beeing played to a scrobbler (e.g. last.fm)"; - homepage = https://www.musicpd.org/clients/mpdscribble/; + homepage = "https://www.musicpd.org/clients/mpdscribble/"; license = licenses.gpl2; maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix index 922592a256d05..047cd87308f54 100644 --- a/pkgs/tools/misc/mrtg/default.nix +++ b/pkgs/tools/misc/mrtg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "The Multi Router Traffic Grapher"; - homepage = https://oss.oetiker.ch/mrtg/; + homepage = "https://oss.oetiker.ch/mrtg/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.robberer ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix index 0a862834dfb77..315dbce74070e 100644 --- a/pkgs/tools/misc/ms-sys/default.nix +++ b/pkgs/tools/misc/ms-sys/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A program for writing Microsoft-compatible boot records"; - homepage = http://ms-sys.sourceforge.net/; + homepage = "http://ms-sys.sourceforge.net/"; license = licenses.gpl2Plus; platforms = with platforms; linux; }; diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix index f3cd1c6e52778..c44934ef45c36 100644 --- a/pkgs/tools/misc/mstflint/default.nix +++ b/pkgs/tools/misc/mstflint/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libibmad ]; meta = with stdenv.lib; { - homepage = https://www.openfabrics.org/; + homepage = "https://www.openfabrics.org/"; license = licenses.gpl2; platforms = platforms.linux; broken = true; # 2018-04-11 diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index 6ca0c6e8e08fd..e0ac18a76b2d3 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.vanheusden.com/multitail/; + homepage = "http://www.vanheusden.com/multitail/"; description = "tail on Steroids"; maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index 8940fef2a0dd1..50f8ffc25d7d4 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mutagen"; - version = "0.11.2"; + version = "0.11.4"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "0ykzrxlllip4wvhd9rja5bcr2m72695fjj2q1scwn8ri6jcgfa19"; + sha256 = "15bknyk6mkrwlm18ypncsf9az8l1nv67n0lf0zav867z0r46cc6x"; }; - modSha256 = "1r6b4y6civk75if6nljl66pgv5qm7x05qqby1anf7s7cz7d1rc3g"; + vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l"; subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ]; @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = [ maintainers.marsam ]; license = licenses.mit; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix index 83e6ee5b5ca4d..829bb7f5be792 100644 --- a/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/pkgs/tools/misc/mysql2pgsql/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "mysql2pgsql-0.0.1a"; src = fetchurl { - url = http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-0.0.1a.tgz; + url = "http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-0.0.1a.tgz"; sha256 = "0dpbxf3kdvpihz9cisx6wi3zzd0cnifaqvjxavrbwm4k4sz1qamp"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Convert MySQL dump files to PostgreSQL-loadable files"; - homepage = http://pgfoundry.org/projects/mysql2pgsql/; + homepage = "http://pgfoundry.org/projects/mysql2pgsql/"; license = stdenv.lib.licenses.bsdOriginal; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/pkgs/tools/misc/mysqltuner/default.nix index 9b7453ad1cc76..2f7889111b0ef 100644 --- a/pkgs/tools/misc/mysqltuner/default.nix +++ b/pkgs/tools/misc/mysqltuner/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Make recommendations for increased performance and stability of MariaDB/MySQL"; - homepage = http://mysqltuner.com; + homepage = "http://mysqltuner.com"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/tools/misc/nagstamon/default.nix b/pkgs/tools/misc/nagstamon/default.nix index 525c16b6024bb..9b063947a4491 100644 --- a/pkgs/tools/misc/nagstamon/default.nix +++ b/pkgs/tools/misc/nagstamon/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A status monitor for the desktop"; - homepage = https://nagstamon.ifw-dresden.de/; + homepage = "https://nagstamon.ifw-dresden.de/"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; inherit version; diff --git a/pkgs/tools/misc/nbench/default.nix b/pkgs/tools/misc/nbench/default.nix index a1a6347642b63..950f3883f8f46 100644 --- a/pkgs/tools/misc/nbench/default.nix +++ b/pkgs/tools/misc/nbench/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.math.utah.edu/~mayer/linux/bmark.html; + homepage = "https://www.math.utah.edu/~mayer/linux/bmark.html"; description = "A synthetic computing benchmark program"; platforms = platforms.linux; maintainers = with stdenv.lib.maintainers; [ bennofs ]; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index f47a43ab5d245..7eddca8ca6de0 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Disk usage analyzer with an ncurses interface"; - homepage = https://dev.yorhel.nl/ncdu; + homepage = "https://dev.yorhel.nl/ncdu"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/misc/neo-cowsay/default.nix b/pkgs/tools/misc/neo-cowsay/default.nix index a4fe58fb10755..e50960d063cf0 100644 --- a/pkgs/tools/misc/neo-cowsay/default.nix +++ b/pkgs/tools/misc/neo-cowsay/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0c6lygdqi26mczij41sn8ckc3g6qaakkkh3iasf10a4d07amxci1"; }; - modSha256 = "063ds35dzv8m4bjk7v1q3f6jwyp7j5jrkrhrl41z1c1mbzzkagkq"; + vendorSha256 = "1clar59x2dvn7yj4fbylby9nrzy8kdixi48hkbmrv8g5l8n0wdl2"; subPackages = [ "cmd/cowsay" "cmd/cowthink" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = with licenses; [artistic1 /* or */ gpl3]; maintainers = with maintainers; [ filalex77 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/nginx-config-formatter/default.nix b/pkgs/tools/misc/nginx-config-formatter/default.nix index db60010490e51..c9726d7e04031 100644 --- a/pkgs/tools/misc/nginx-config-formatter/default.nix +++ b/pkgs/tools/misc/nginx-config-formatter/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { description = "nginx config file formatter"; maintainers = with maintainers; [ Baughn ]; license = licenses.asl20; - homepage = https://github.com/1connect/nginx-config-formatter; + homepage = "https://github.com/1connect/nginx-config-formatter"; }; } diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix new file mode 100644 index 0000000000000..cff7df1801f75 --- /dev/null +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, gnugrep, nix }: + +stdenv.mkDerivation rec { + pname = "nix-direnv"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nix-direnv"; + rev = "${version}"; + sha256 = "1lwmg6mn3lf7s0345v53zadxn9v0x8z6pcbj90v5dx3pgrq41gs8"; + }; + + # Substitute instead of wrapping because the resulting file is + # getting sourced, not executed: + postPatch = '' + substituteInPlace direnvrc \ + --replace "grep" "${gnugrep}/bin/grep" \ + --replace "nix-shell" "${nix}/bin/nix-shell" \ + --replace "nix-instantiate" "${nix}/bin/nix-instantiate" + ''; + + installPhase = '' + runHook preInstall + install -m500 -D direnvrc $out/share/nix-direnv/direnvrc + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "A fast, persistent use_nix implementation for direnv"; + homepage = "https://github.com/nix-community/nix-direnv"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ mic92 ]; + }; +} diff --git a/pkgs/tools/misc/noteshrink/default.nix b/pkgs/tools/misc/noteshrink/default.nix index b197e9bc5d2e9..b934b12887031 100644 --- a/pkgs/tools/misc/noteshrink/default.nix +++ b/pkgs/tools/misc/noteshrink/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Convert scans of handwritten notes to beautiful, compact PDFs"; - homepage = https://mzucker.github.io/2016/09/20/noteshrink.html; + homepage = "https://mzucker.github.io/2016/09/20/noteshrink.html"; license = licenses.mit; maintainers = with maintainers; [ rnhmjoj ]; }; diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index a6288b3229578..ac06b44055c11 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -32,7 +32,7 @@ buildGoPackage rec { Never sit and wait for some long-running process to finish. Noti can alert you when it's done. You can receive messages on your computer or phone. ''; - homepage = https://github.com/variadico/noti; + homepage = "https://github.com/variadico/noti"; license = licenses.mit; maintainers = with maintainers; [ stites marsam ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix index 26517361ae2d0..a3cf6ad07d5b6 100644 --- a/pkgs/tools/misc/ntfy/default.nix +++ b/pkgs/tools/misc/ntfy/default.nix @@ -30,7 +30,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A utility for sending notifications, on demand and when commands finish"; - homepage = http://ntfy.rtfd.org/; + homepage = "http://ntfy.rtfd.org/"; license = licenses.gpl3; maintainers = with maintainers; [ jfrankenau kamilchm ]; }; diff --git a/pkgs/tools/misc/nyancat/default.nix b/pkgs/tools/misc/nyancat/default.nix index 47a91915c4310..a7b0661478500 100644 --- a/pkgs/tools/misc/nyancat/default.nix +++ b/pkgs/tools/misc/nyancat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Nyancat in your terminal, rendered through ANSI escape sequences."; - homepage = https://nyancat.dakko.us; + homepage = "https://nyancat.dakko.us"; license = licenses.ncsa; maintainers = with maintainers; [ midchildan ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/oci-image-tool/default.nix b/pkgs/tools/misc/oci-image-tool/default.nix index 3b45b7b064423..8cac6d1c3f5a6 100644 --- a/pkgs/tools/misc/oci-image-tool/default.nix +++ b/pkgs/tools/misc/oci-image-tool/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = { description = "A collection of tools for working with the OCI image format specification"; - homepage = https://github.com/opencontainers/image-tools; + homepage = "https://github.com/opencontainers/image-tools"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nzhang-zh ]; }; diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix index d54302b31d1d3..00926663a6c0b 100644 --- a/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; meta = { - homepage = http://ocz.com/ssd-guru; + homepage = "http://ocz.com/ssd-guru"; description = "SSD Management Tool for OCZ disks"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/odyssey/default.nix b/pkgs/tools/misc/odyssey/default.nix index 160474f815234..f736184ea50ea 100644 --- a/pkgs/tools/misc/odyssey/default.nix +++ b/pkgs/tools/misc/odyssey/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Scalable PostgreSQL connection pooler"; - homepage = https://github.com/yandex/odyssey; + homepage = "https://github.com/yandex/odyssey"; license = licenses.bsd3; maintainers = [ maintainers.marsam ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/tools/misc/opentimestamps-client/default.nix index 8cc5cd7f6f2b6..4d65a406e53a0 100644 --- a/pkgs/tools/misc/opentimestamps-client/default.nix +++ b/pkgs/tools/misc/opentimestamps-client/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { meta = { description = "Command-line tool to create and verify OpenTimestamps proofs"; - homepage = https://github.com/opentimestamps/opentimestamps-client; + homepage = "https://github.com/opentimestamps/opentimestamps-client"; license = lib.licenses.lgpl3; }; } diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 2888b2a118611..3b9623d5ad0a5 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Time series database with millisecond precision"; - homepage = http://opentsdb.net; + homepage = "http://opentsdb.net"; license = licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ maintainers.ocharles ]; diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index c776144a40d06..9b2afed0a9a10 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { description = "Utility to detect other OSs on a set of drives"; - homepage = http://packages.debian.org/source/sid/os-prober; + homepage = "http://packages.debian.org/source/sid/os-prober"; license = licenses.gpl2Plus; maintainers = with maintainers; [ symphorien ]; }; diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index 0b7a7826a972f..a93ec0ab573ff 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, libxml2, perl +{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, glib, libxml2, perl, python3 , libxslt, libarchive, bzip2, lzma, json-glib, libsoup }: stdenv.mkDerivation rec { pname = "osinfo-db-tools"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.gz"; - sha256 = "0x155d4hqz7mabgqvgydqjm9d8aabc78vr0v0pnsp9vkdlcv3mfh"; + url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; + sha256 = "08x8mrafphyll0d35xdc143rip3ahrz6bmzhc85nwhq7yk2vxpab"; }; - nativeBuildInputs = [ pkgconfig gettext perl ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext perl python3 ]; buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma libsoup ]; meta = with stdenv.lib; { description = "Tools for managing the osinfo database"; - homepage = https://libosinfo.org/; + homepage = "https://libosinfo.org/"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix index 4b28a7c45e5dd..c3ca53616f78f 100644 --- a/pkgs/tools/misc/otfcc/default.nix +++ b/pkgs/tools/misc/otfcc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "otfcc"; - version = "0.9.6"; + version = "0.10.4"; src = fetchFromGitHub { owner = "caryll"; repo = "otfcc"; rev = "v${version}"; - sha256 = "1rnjfqqyc6d9nhlh8if9k37wk94mcwz4wf3k239v6idg48nrk10b"; + sha256 = "1nrkzpqklfpqsccji4ans40rj88l80cv7dpxwx4g577xrvk13a0f"; }; nativeBuildInputs = [ premake5 ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optimized OpenType builder and inspector"; - homepage = https://github.com/caryll/otfcc; + homepage = "https://github.com/caryll/otfcc"; license = licenses.asl20; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ jfrankenau ttuegel ]; diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index 85bad70edc9ce..c285dc2463bbf 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = http://palcal.sourceforge.net/; + homepage = "http://palcal.sourceforge.net/"; description = "Command-line calendar program that can keep track of events"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index d55b2cd6f2481..0720ca76f253b 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20200322"; + name = "parallel-20200422"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0kg95glnfg25i1w7qg2vr5v4671vigsazmz4qdf223l64khq8x10"; + sha256 = "0c2mr2rzsz0y24q4mbm2zmc2fz6bcda4gbc4qgg59sirrj8vzpjb"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 46606e3b43be3..97c67f59b0843 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight GTK clipboard manager"; - homepage = https://github.com/rickyrockrat/parcellite; + homepage = "https://github.com/rickyrockrat/parcellite"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 0eed491e8a907..808b0382f3210 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { which also serves as a sample implementation and script backend. ''; - homepage = https://www.gnu.org/software/parted/; + homepage = "https://www.gnu.org/software/parted/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix index ab3c4b5a6c461..1b5f7dbdbece4 100644 --- a/pkgs/tools/misc/partition-manager/default.nix +++ b/pkgs/tools/misc/partition-manager/default.nix @@ -26,7 +26,7 @@ in mkDerivation rec { meta = with lib; { description = "KDE Partition Manager"; license = licenses.gpl2; - homepage = https://www.kde.org/applications/system/kdepartitionmanager/; + homepage = "https://www.kde.org/applications/system/kdepartitionmanager/"; maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix index c2c8e2b857339..a3134f57397c9 100644 --- a/pkgs/tools/misc/pastebinit/default.nix +++ b/pkgs/tools/misc/pastebinit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://launchpad.net/pastebinit; + homepage = "https://launchpad.net/pastebinit"; description = "A software that lets you send anything you want directly to a pastebin from the command line"; maintainers = with maintainers; [ lethalman ]; license = licenses.gpl2; diff --git a/pkgs/tools/misc/patdiff/default.nix b/pkgs/tools/misc/patdiff/default.nix index 1c5e5b0447414..e0b54e56081dd 100644 --- a/pkgs/tools/misc/patdiff/default.nix +++ b/pkgs/tools/misc/patdiff/default.nix @@ -4,7 +4,7 @@ with ocamlPackages; janePackage { pname = "patdiff"; - hash = "04krzn6rj2r81z55pms5ayk6bxhlxrm006cbhy0m6rc69a0h00lh"; + hash = "1yqvxdmkgcwgx3npgncpdqwkpdxiqr1q41wci7589s8z7xi5nwyz"; buildInputs = [ core_extended expect_test_helpers patience_diff ocaml_pcre shell ]; meta = { description = "File Diff using the Patience Diff algorithm"; diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/tools/misc/pazi/default.nix index dd64200e1301a..cc7e7b043e0ee 100644 --- a/pkgs/tools/misc/pazi/default.nix +++ b/pkgs/tools/misc/pazi/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "An autojump \"zap to directory\" helper"; - homepage = https://github.com/euank/pazi; + homepage = "https://github.com/euank/pazi"; license = licenses.gpl3; maintainers = with maintainers; [ bbigras ]; }; diff --git a/pkgs/tools/misc/pg_flame/default.nix b/pkgs/tools/misc/pg_flame/default.nix index fbeba0ff1bdcc..6fe2e814fa4d6 100644 --- a/pkgs/tools/misc/pg_flame/default.nix +++ b/pkgs/tools/misc/pg_flame/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1a03vxqnga83mhjp7pkl0klhkyfaby7ncbwm45xbl8c7s6zwhnw2"; }; - modSha256 = "0j7qpvji546z0cfjijdd66l0vsl0jmny6i1n9fsjqjgjpwg26naq"; + vendorSha256 = "1rkx20winh66y2m7i7q13jpr83044i2d1pfd5p5l5kkpsix5mra5"; meta = with lib; { description = "Flamegraph generator for Postgres EXPLAIN ANALYZE output"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ filalex77 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/tools/misc/pg_top/default.nix index 4f4bd7e754c47..ca3318d45c672 100644 --- a/pkgs/tools/misc/pg_top/default.nix +++ b/pkgs/tools/misc/pg_top/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { * View user index statistics. ''; - homepage = http://ptop.projects.postgresql.org/; + homepage = "http://ptop.projects.postgresql.org/"; platforms = platforms.linux; license = licenses.free; # see commands.c }; diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix index 7cb810b2fe2d5..89f1e606e63f5 100644 --- a/pkgs/tools/misc/pgcenter/default.nix +++ b/pkgs/tools/misc/pgcenter/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "pgcenter"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "lesovsky"; repo = "pgcenter"; rev = "v${version}"; - sha256 = "0p8ck4s5jj53nc638darhwbylcsslfmfz72bwy6wxby9iqi9kq6b"; + sha256 = "03n1gn944z6rz5g643y68hvfxpxp65mip32w1zx43xr60x1vpf2v"; }; - modSha256 = "0kassq52v07zmffs6l066g0d3kfv6wmrh9g5cgk79bmyq13clqjj"; + vendorSha256 = "1mzvpr12qh9668iz97p62zl4zhlrcyfgwr4a9zg9irj585pkb5x2"; meta = with stdenv.lib; { - homepage = https://pgcenter.org/; + homepage = "https://pgcenter.org/"; description = "Command-line admin tool for observing and troubleshooting PostgreSQL"; license = licenses.bsd3; maintainers = [ maintainers.marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index b702ffc1703d5..c78aa6a531567 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "06w2kqjq2yq9yypg6biywrybnmi4jlnnigd7az72hp7lzf2nhl62"; + sha256 = "0f7pjagr3zcqmbhmk446j6n7nanyhvyq4rn68f5wljl9g68ni7sj"; }; - modSha256 = "0h375zk0ik06g0b5vmi00b1wn5q2c0r137f7qf6l8k8p886x41h6"; + vendorSha256 = "16x33fmh4q993rw0jr65337yimska4fwgyyw3kmq84q0x28a3zg5"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index 00ed2db1073b7..0abbcd5c3a284 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, php, which, gnused, makeWrapper, gnumake, gcc }: +{ stdenv, fetchurl, php, which, gnused, makeWrapper, gnumake, gcc, callPackage }: stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "9.4.1"; + version = "9.6.0"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "1c33c8aihsfdxaqkwy4isrvmjam5j5rdz98vv2apy73638vx3q04"; + sha256 = "1wgw5lwpm3ylby2llnjiq356cdb3v1jghj7xq659c722wj617i88"; }; buildInputs = [ php ]; @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { --prefix PATH : ${stdenv.lib.makeBinPath [ gnumake gcc ]} ''; + passthru.tests = { + simple-execution = callPackage ./tests.nix { }; + }; + meta = with stdenv.lib; { description = "Open-Source, Automated Benchmarking"; homepage = "https://www.phoronix-test-suite.com/"; diff --git a/pkgs/tools/misc/phoronix-test-suite/tests.nix b/pkgs/tools/misc/phoronix-test-suite/tests.nix new file mode 100644 index 0000000000000..06bd9def9aa69 --- /dev/null +++ b/pkgs/tools/misc/phoronix-test-suite/tests.nix @@ -0,0 +1,20 @@ +{ runCommand, phoronix-test-suite }: + +let + inherit (phoronix-test-suite) pname version; +in + +runCommand "${pname}-tests" { meta.timeout = 3; } + '' + # automatic initial setup to prevent interactive questions + ${phoronix-test-suite}/bin/phoronix-test-suite enterprise-setup >/dev/null + # get version of installed program and compare with package version + if [[ `${phoronix-test-suite}/bin/phoronix-test-suite version` != *"${version}"* ]]; then + echo "Error: program version does not match package version" + exit 1 + fi + # run dummy command + ${phoronix-test-suite}/bin/phoronix-test-suite dummy_module.dummy-command >/dev/null + # needed for Nix to register the command as successful + touch $out + '' diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix index dd07fee340542..35bd84005b5f3 100644 --- a/pkgs/tools/misc/phraseapp-client/default.nix +++ b/pkgs/tools/misc/phraseapp-client/default.nix @@ -15,11 +15,11 @@ buildGoPackage rec { }; postInstall = '' - ln -s $bin/bin/phraseapp-client $bin/bin/phraseapp + ln -s $out/bin/phraseapp-client $out/bin/phraseapp ''; meta = with stdenv.lib; { - homepage = http://docs.phraseapp.com; + homepage = "http://docs.phraseapp.com"; description = "PhraseApp API v2 Command Line Client"; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index 1ad219403687e..5dd83c4887b14 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Minimal dumb-terminal emulation program"; - homepage = https://github.com/npat-efault/picocom/; + homepage = "https://github.com/npat-efault/picocom/"; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 4c7e9d0892cae..fe16406256f89 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://pipelight.net/; + homepage = "http://pipelight.net/"; license = with stdenv.lib.licenses; [ mpl11 gpl2 lgpl21 ]; description = "A wrapper for using Windows plugins in Linux browsers"; maintainers = with stdenv.lib.maintainers; [ skeidel ]; diff --git a/pkgs/tools/misc/pipreqs/default.nix b/pkgs/tools/misc/pipreqs/default.nix index 9925021b3f646..bbd4125c4b0e4 100644 --- a/pkgs/tools/misc/pipreqs/default.nix +++ b/pkgs/tools/misc/pipreqs/default.nix @@ -17,7 +17,7 @@ python2Packages.buildPythonApplication rec { meta = with lib; { description = "Generate requirements.txt file for any project based on imports"; - homepage = https://github.com/bndr/pipreqs; + homepage = "https://github.com/bndr/pipreqs"; license = licenses.asl20; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index 35496ed4766d6..eeb392606edd5 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pistol"; - version = "0.0.4"; + version = "0.1.1"; src = fetchFromGitHub { owner = "doronbehar"; repo = pname; rev = "v${version}"; - sha256 = "0r2nq1zsm9zxl097qnjgr5lk9jm3jjvpgczpvp1nx7dfnahkx2wf"; + sha256 = "1d9c1bhidh781dis4427wramfrla4avqw9y2bmpjp81cqq3nc27d"; }; - modSha256 = "0l4rjrvgbb4b3abyvyz9ws0mh78pri0cvncwv91dzgbx796a2nn6"; + vendorSha256 = "1f780vhxw0brvnr8hhah4sf6ms8spar29rqmy1kcqf9m75n94g56"; subPackages = [ "cmd/pistol" ]; @@ -29,4 +29,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/pixd/default.nix b/pkgs/tools/misc/pixd/default.nix index a16333f6e4405..a2dc84ed6a935 100644 --- a/pkgs/tools/misc/pixd/default.nix +++ b/pkgs/tools/misc/pixd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Colourful visualization tool for binary files"; - homepage = https://github.com/FireyFly/pixd; + homepage = "https://github.com/FireyFly/pixd"; maintainers = [ maintainers.FireyFly ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index c1db4f9d59782..8c7e5b8bcf226 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -1,13 +1,13 @@ -{stdenv, fetchurl, libusb, makeWrapper}: +{stdenv, fetchurl, libusb-compat-0_1, makeWrapper}: stdenv.mkDerivation { name = "pk2cmd-1.20"; src = fetchurl { - url = https://ww1.microchip.com/downloads/en/DeviceDoc/pk2cmdv1.20LinuxMacSource.tar.gz; + url = "https://ww1.microchip.com/downloads/en/DeviceDoc/pk2cmdv1.20LinuxMacSource.tar.gz"; sha256 = "1yjpi2qshnqfpan4w3ggakkr3znfrx5cxkny92ka7v9na3g2fc4h"; }; - makeFlags = [ "LIBUSB=${libusb.dev}" "linux" ]; + makeFlags = [ "LIBUSB=${libusb-compat-0_1.dev}" "linux" ]; installPhase = '' mkdir -p $out/bin $out/share/pk2 @@ -16,10 +16,10 @@ stdenv.mkDerivation { wrapProgram $out/bin/pk2cmd --prefix PATH : $out/share/pk2 ''; - buildInputs = [ libusb makeWrapper ]; + buildInputs = [ libusb-compat-0_1 makeWrapper ]; meta = { - homepage = https://www.microchip.com/pickit2; + homepage = "https://www.microchip.com/pickit2"; license = stdenv.lib.licenses.unfree; #MicroChip-PK2 description = "Microchip PIC programming software for the PICKit2 programmer"; }; diff --git a/pkgs/tools/misc/pkgdiff/default.nix b/pkgs/tools/misc/pkgdiff/default.nix index 3c9c0f9bfaffe..04d0c95b81a42 100644 --- a/pkgs/tools/misc/pkgdiff/default.nix +++ b/pkgs/tools/misc/pkgdiff/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for visualizing changes in Linux software packages"; - homepage = https://lvc.github.io/pkgdiff/; + homepage = "https://lvc.github.io/pkgdiff/"; license = licenses.gpl2; maintainers = with maintainers; [ sweber ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index fec1bee160f99..09dba27a1efed 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2020.5"; + version = "1.2020.10"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "1cn1bjah9qvhh3hixa92v804crkgz69mg30k8229a551x3alykhd"; + sha256 = "00azasannh77ns3wpy6yrlw77pgq89frx0f4c7gk1gqiqjavsvdy"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/plotinus/default.nix b/pkgs/tools/misc/plotinus/default.nix index 58a6c7c4071d9..6440ed533f60d 100644 --- a/pkgs/tools/misc/plotinus/default.nix +++ b/pkgs/tools/misc/plotinus/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A searchable command palette in every modern GTK application"; - homepage = https://github.com/p-e-w/plotinus; + homepage = "https://github.com/p-e-w/plotinus"; maintainers = with maintainers; [ samdroid-apps ]; platforms = platforms.linux; # No COPYING file, but headers in the source code diff --git a/pkgs/tools/misc/pod2mdoc/default.nix b/pkgs/tools/misc/pod2mdoc/default.nix index 5712e02e8ea06..7571002512601 100644 --- a/pkgs/tools/misc/pod2mdoc/default.nix +++ b/pkgs/tools/misc/pod2mdoc/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://mdocml.bsd.lv/; + homepage = "http://mdocml.bsd.lv/"; description = "converter from POD into mdoc"; license = licenses.isc; platforms = platforms.all; diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 47336e54d67eb..33ab2bbc7297a 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "powerline-go"; - version = "1.15.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "justjanne"; repo = pname; rev = "v${version}"; - sha256 = "06i07m68l24v29j01qp2y91rwsfqh4x1nc8sxkjzrc7q1c7fsc1r"; + sha256 = "135j18d53nhg6adjd2hax067c5f1py9fyprzfcr3plsxnaki2hrx"; }; - modSha256 = "0mz1qrwar9cgrhrgw4z3gwhjj62bnfnn59ji31zkyvwlc1mqh9an"; + vendorSha256 = "0dkgp9vlb76la0j439w0rb548qg5v8648zryk3rqgfhd4qywlk11"; meta = with stdenv.lib; { description = "A Powerline like prompt for Bash, ZSH and Fish"; @@ -19,4 +19,4 @@ buildGoModule rec { platforms = platforms.unix; maintainers = with maintainers; [ sifmelcara ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix index 0c9d3a0ea7993..b8a747d4222a9 100644 --- a/pkgs/tools/misc/profile-cleaner/default.nix +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc, file }: stdenv.mkDerivation rec { - version = "2.37"; + version = "2.41"; pname = "profile-cleaner"; src = fetchFromGitHub { owner = "graysky2"; repo = "profile-cleaner"; rev = "v${version}"; - sha256 = "1fbsn2xvcjkqhhkhidn04iwc0zha68cpkyc9vs5yly38qr1q238a"; + sha256 = "11sjf4j9dr6ih9jkg6vqq6gkfg6wly4182bi1008bsm1zdmm5iz7"; }; buildInputs = [ makeWrapper ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { term "browser" is used loosely since profile-cleaner happily works on some email clients and newsreaders too. ''; - homepage = https://github.com/graysky2/profile-cleaner; + homepage = "https://github.com/graysky2/profile-cleaner"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index 9c07254e5873f..790bf73a44dc0 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, utillinux}: +{ stdenv, fetchurl, utillinux, coreutils}: stdenv.mkDerivation rec { - version = "6.36"; + version = "6.38"; pname = "profile-sync-daemon"; src = fetchurl { url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz"; - sha256 = "0zw9fqpfiz1ld443cw2vp54y86maksmq4mnjs73nlp00nn5z2047"; + sha256 = "0mhjgd2b3grdaad64b72m8i5rm9k58yx7kpiqmhmd3kl5qlgxagy"; }; installPhase = '' @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { # $HOME detection fails (and is unnecessary) sed -i '/^HOME/d' $out/bin/profile-sync-daemon substituteInPlace $out/bin/psd-overlay-helper \ - --replace "PATH=/usr/bin:/bin" "PATH=${utillinux.bin}/bin" + --replace "PATH=/usr/bin:/bin" "PATH=${utillinux.bin}/bin:${coreutils}/bin" \ + --replace "sudo " "/run/wrappers/bin/sudo " ''; preferLocalBuild = true; @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { transparent user experience. ''; homepage = "https://github.com/graysky2/profile-sync-daemon"; - downloadPage = https://github.com/graysky2/profile-sync-daemon/releases; + downloadPage = "https://github.com/graysky2/profile-sync-daemon/releases"; license = licenses.mit; maintainers = [ maintainers.prikhi ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix index 3edca413f3aa8..bbde732aadf5f 100644 --- a/pkgs/tools/misc/progress/default.nix +++ b/pkgs/tools/misc/progress/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/Xfennec/progress; + homepage = "https://github.com/Xfennec/progress"; description = "Tool that shows the progress of coreutils programs"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix index 335bddd6730e8..74c049059941e 100644 --- a/pkgs/tools/misc/proxytunnel/default.nix +++ b/pkgs/tools/misc/proxytunnel/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "proxytunnel-1.9.0"; src = fetchurl { - url = mirror://sourceforge/proxytunnel/proxytunnel-1.9.0.tgz; + url = "mirror://sourceforge/proxytunnel/proxytunnel-1.9.0.tgz"; sha256 = "1fd644kldsg14czkqjybqh3wrzwsp3dcargqf4fjkpqxv3wbpx9f"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "Program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"; - homepage = http://proxytunnel.sourceforge.net/download.php; + homepage = "http://proxytunnel.sourceforge.net/download.php"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 1bd2fc259eead..fa8404615f9f9 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "2.7.1"; + version = "3.1.1"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "1fq8n5naicfv0lsyzfb52c84w40zrsks0x9rrvyyzih4vkhic4vm"; + sha256 = "1hs1cixk1jcx8br81c4drm1b56hwcq6jiww0ywrpdna475jv5vvw"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix index 4e840957ce32c..96d1a5fc6a06e 100644 --- a/pkgs/tools/misc/pubs/default.nix +++ b/pkgs/tools/misc/pubs/default.nix @@ -14,12 +14,12 @@ python3Packages.buildPythonApplication rec { patches = [ # Fix for bibtexparser 1.1.0 (fetchpatch { - url = https://github.com/pubs/pubs/pull/185/commits/e58ae98b93b8364a07fd5f5f452ba88ad332c948.patch; + url = "https://github.com/pubs/pubs/pull/185/commits/e58ae98b93b8364a07fd5f5f452ba88ad332c948.patch"; sha256 = "1n7zrk119v395jj8wqg8wlymc9l9pq3v752yy3kam9kflc0aashp"; }) # Fix test broken by PyYAML 5.1 (fetchpatch { - url = https://github.com/pubs/pubs/pull/194/commits/c3cb713ae76528eeeaaeb948fe319a76ab3934d8.patch; + url = "https://github.com/pubs/pubs/pull/194/commits/c3cb713ae76528eeeaaeb948fe319a76ab3934d8.patch"; sha256 = "05as418m7wzs65839bb91b2jrs8l68z8ldcjcd9cn4b9fcgsf3rk"; }) ]; @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Command-line bibliography manager"; - homepage = https://github.com/pubs/pubs; + homepage = "https://github.com/pubs/pubs"; license = licenses.lgpl3; maintainers = with maintainers; [ gebner ]; }; diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index 3642653944b3a..dd64366679c68 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://www.ivarch.com/programs/pv; + homepage = "http://www.ivarch.com/programs/pv"; description = "Tool for monitoring the progress of data through a pipeline"; license = stdenv.lib.licenses.artistic2; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix index 50952435dd766..0edec63c8c927 100644 --- a/pkgs/tools/misc/pws/default.nix +++ b/pkgs/tools/misc/pws/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command-line password safe"; - homepage = https://github.com/janlelis/pws; + homepage = "https://github.com/janlelis/pws"; license = licenses.mit; maintainers = with maintainers; [ swistak35 nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index 3e7e3870959b4..2b8a2fb02be5f 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { of gaming devices in Linux, and makes the Linux gaming experience just a little bit nicer. ''; - homepage = http://qjoypad.sourceforge.net; + homepage = "http://qjoypad.sourceforge.net"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index d7598b0c6dd5c..97793b025577e 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -24,7 +24,7 @@ mkDerivation rec { meta = with lib; { description = "Qt5 Configuration Tool"; - homepage = https://www.opendesktop.org/content/show.php?content=168066; + homepage = "https://www.opendesktop.org/content/show.php?content=168066"; platforms = platforms.linux; license = licenses.bsd2; maintainers = with maintainers; [ ralith ]; diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix index 90498767c9950..852c46b6d0056 100644 --- a/pkgs/tools/misc/radeon-profile/default.nix +++ b/pkgs/tools/misc/radeon-profile/default.nix @@ -24,7 +24,7 @@ mkDerivation rec { meta = with lib; { description = "Application to read current clocks of AMD Radeon cards"; - homepage = https://github.com/marazmista/radeon-profile; + homepage = "https://github.com/marazmista/radeon-profile"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix index 3d97874df7de2..570b55c9acf34 100644 --- a/pkgs/tools/misc/rcm/default.nix +++ b/pkgs/tools/misc/rcm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Management Suite for Dotfiles"; - homepage = https://github.com/thoughtbot/rcm; + homepage = "https://github.com/thoughtbot/rcm"; license = licenses.bsd3; maintainers = with maintainers; [ malyn ]; platforms = with platforms; unix; diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/tools/misc/recoverjpeg/default.nix index 88aff4f3c084d..bf75213acdf62 100644 --- a/pkgs/tools/misc/recoverjpeg/default.nix +++ b/pkgs/tools/misc/recoverjpeg/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://rfc1149.net/devel/recoverjpeg.html; + homepage = "https://rfc1149.net/devel/recoverjpeg.html"; description = "Recover lost JPEGs and MOV files on a bogus memory card or disk"; license = licenses.gpl2; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index 8d648e293c5a6..416fa23f4534e 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { number of named fields. ''; - homepage = https://www.gnu.org/software/recutils/; + homepage = "https://www.gnu.org/software/recutils/"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 91d8e47213079..46f78ddb093f4 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation { name = "remind-3.1.16"; src = fetchurl { - url = https://dianne.skoll.ca/projects/remind/download/remind-03.01.16.tar.gz; + url = "https://dianne.skoll.ca/projects/remind/download/remind-03.01.16.tar.gz"; sha256 = "14yavwqmimba8rdpwx3wlav9sfb0v5rcd1iyzqrs08wx07a9pdzf"; }; @@ -38,7 +38,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = https://dianne.skoll.ca/projects/remind/; + homepage = "https://dianne.skoll.ca/projects/remind/"; description = "Sophisticated calendar and alarm program for the console"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [raskin kovirobi]; diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/tools/misc/renameutils/default.nix index b5e5d64dda68a..73146f09792bb 100644 --- a/pkgs/tools/misc/renameutils/default.nix +++ b/pkgs/tools/misc/renameutils/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "renameutils-0.12.0"; src = fetchurl { - url = mirror://savannah/renameutils/renameutils-0.12.0.tar.gz; + url = "mirror://savannah/renameutils/renameutils-0.12.0.tar.gz"; sha256 = "18xlkr56jdyajjihcmfqlyyanzyiqqlzbhrm6695mkvw081g1lnb"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ readline ]; meta = { - homepage = https://www.nongnu.org/renameutils/; + homepage = "https://www.nongnu.org/renameutils/"; description = "A set of programs to make renaming of files faster"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index d52910b5a848e..48e0f7757aebe 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/algernon/riemann-c-client; + homepage = "https://github.com/algernon/riemann-c-client"; description = "A C client library for the Riemann monitoring system"; license = licenses.gpl3; maintainers = with maintainers; [ pradeepchhetri ]; diff --git a/pkgs/tools/misc/rig/default.nix b/pkgs/tools/misc/rig/default.nix index 627758e9c5e71..7e1d9307a167b 100644 --- a/pkgs/tools/misc/rig/default.nix +++ b/pkgs/tools/misc/rig/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./rig_1.11-1.diff ]; meta = { - homepage = http://rig.sourceforge.net/; + homepage = "http://rig.sourceforge.net/"; description = "Random identity generator"; longDescription = '' RIG (Random Identity Generator) is a free replacement for a shareware diff --git a/pkgs/tools/misc/rkflashtool/default.nix b/pkgs/tools/misc/rkflashtool/default.nix index fb55b15bbd550..94d6ca95748f2 100644 --- a/pkgs/tools/misc/rkflashtool/default.nix +++ b/pkgs/tools/misc/rkflashtool/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/rkflashtool/; + homepage = "https://sourceforge.net/projects/rkflashtool/"; description = "Tools for flashing Rockchip devices"; platforms = platforms.linux; maintainers = [ maintainers.viric ]; diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index 96df0707153fa..c19b0f1f9acdc 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Readline wrapper for console programs"; - homepage = https://github.com/hanslub42/rlwrap; + homepage = "https://github.com/hanslub42/rlwrap"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 408660bf3d9a9..cbe1f7d407cef 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Extremely fast tool to remove duplicates and other lint from your filesystem"; - homepage = https://rmlint.readthedocs.org; + homepage = "https://rmlint.readthedocs.org"; platforms = platforms.linux; license = licenses.gpl3; maintainers = [ maintainers.koral ]; diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 06a6c27d7c5e6..995a8b5eb1563 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source firmware for mp3 players"; - homepage = https://www.rockbox.org; + homepage = "https://www.rockbox.org"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/tools/misc/roundup/default.nix b/pkgs/tools/misc/roundup/default.nix index 7eebc1943009a..8d0c62889f998 100644 --- a/pkgs/tools/misc/roundup/default.nix +++ b/pkgs/tools/misc/roundup/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A unit testing tool for running test plans which are written in any POSIX shell"; - homepage = http://bmizerany.github.io/roundup/; + homepage = "http://bmizerany.github.io/roundup/"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index d946ed91c726a..aad63b66ec47e 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = http://www.routino.org/; + homepage = "http://www.routino.org/"; description = "OpenStreetMap Routing Software"; license = licenses.agpl3; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 8365a47830ada..10ff6db63f15b 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://oss.oetiker.ch/rrdtool/; + homepage = "https://oss.oetiker.ch/rrdtool/"; description = "High performance logging in Round Robin Databases"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/misc/rw/default.nix b/pkgs/tools/misc/rw/default.nix index b6e53e4653600..b36eff12a2fc9 100644 --- a/pkgs/tools/misc/rw/default.nix +++ b/pkgs/tools/misc/rw/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://sortix.org/rw; + homepage = "https://sortix.org/rw"; description = "Block device and byte copying program similar to dd"; longDescription = '' rw is a command line program which copies information between files diff --git a/pkgs/tools/misc/sam-ba/default.nix b/pkgs/tools/misc/sam-ba/default.nix index acab41e8ff54e..67c751a57791c 100644 --- a/pkgs/tools/misc/sam-ba/default.nix +++ b/pkgs/tools/misc/sam-ba/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { Atmel SAM-BA software provides an open set of tools for programming the Atmel SAM3, SAM7 and SAM9 ARM-based microcontrollers. ''; - homepage = http://www.at91.com/linux4sam/bin/view/Linux4SAM/SoftwareTools; + homepage = "http://www.at91.com/linux4sam/bin/view/Linux4SAM/SoftwareTools"; # License in <source>/doc/readme.txt license = "BSD-like (partly binary-only)"; # according to Buildroot platforms = [ "x86_64-linux" ]; # patchelf fails on i686-linux diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix index 65b7b47256a8b..58350f7a638da 100644 --- a/pkgs/tools/misc/scanmem/default.nix +++ b/pkgs/tools/misc/scanmem/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; meta = with stdenv.lib; { - homepage = https://github.com/scanmem/scanmem; + homepage = "https://github.com/scanmem/scanmem"; description = "Memory scanner for finding and poking addresses in executing processes"; maintainers = [ maintainers.chattered ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/scfbuild/default.nix b/pkgs/tools/misc/scfbuild/default.nix index 7fbe13fd44e37..d604f1a68fe26 100644 --- a/pkgs/tools/misc/scfbuild/default.nix +++ b/pkgs/tools/misc/scfbuild/default.nix @@ -33,7 +33,7 @@ buildPythonApplication { meta = with lib; { description = "SVGinOT color font builder"; - homepage = https://github.com/13rac1/scfbuild; + homepage = "https://github.com/13rac1/scfbuild"; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 136ab4fe34134..9bc219289c449 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { - url = https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff; + url = "https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff"; sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p"; stripLen = 1; }); @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/screen/; + homepage = "https://www.gnu.org/software/screen/"; description = "A window manager that multiplexes a physical terminal"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index d01a3a877f2b4..3d42ab9374a0c 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { command! This script is very easy to add to and can easily be extended. ''; license = licenses.gpl3; - homepage = https://github.com/KittyKatt/screenFetch; + homepage = "https://github.com/KittyKatt/screenFetch"; maintainers = with maintainers; [ relrod ]; platforms = platforms.all; }; diff --git a/pkgs/tools/misc/sdate/default.nix b/pkgs/tools/misc/sdate/default.nix index 742b25601c08c..6c52aa217df63 100644 --- a/pkgs/tools/misc/sdate/default.nix +++ b/pkgs/tools/misc/sdate/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "sdate"; - version = "0.5"; + version = "0.6"; src = fetchurl { url = "https://github.com/ChristophBerg/sdate/archive/${version}.tar.gz"; - sha256 = "0gbjl1jfxjwiiwf9rz38yp6rb1mgzhawcyg0g9byl6m4kgivf0cx"; + sha256 = "11irlbbhlzkg6y621smk351jl8ay3yjhl2j9hila0xa72hs4n7gz"; }; buildInputs = [ autoreconfHook ]; meta = { - homepage = https://www.df7cb.de/projects/sdate; + homepage = "https://www.df7cb.de/projects/sdate"; description = "Eternal september version of the date program"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ edef ]; diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix index 0be5b8d137965..bb1bf6b0a3771 100644 --- a/pkgs/tools/misc/sdl-jstest/default.nix +++ b/pkgs/tools/misc/sdl-jstest/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig docbook_xsl git ]; meta = with stdenv.lib; { - homepage = https://github.com/Grumbel/sdl-jstest; + homepage = "https://github.com/Grumbel/sdl-jstest"; description = "Simple SDL joystick test application for the console"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix index a464ea638bda9..7c9352d33100a 100644 --- a/pkgs/tools/misc/shadowenv/default.nix +++ b/pkgs/tools/misc/shadowenv/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowenv"; - version = "2.0.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = version; - sha256 = "1fjqm4qr85wb0i3vazp0w74izfzvkycdii7dlpdp5zs8jgb35pdh"; + sha256 = "1x5i5km6wblqbc0fibdjdlqkamqswxwhy8p6cbfz2nvcia7fgsf1"; }; - cargoSha256 = "1n8qh730nhdmpm08mm2ppcl3nkcgm50cyz9q5h6dlzq4bv4rijp4"; + cargoSha256 = "1hrsbd6025sfgnwr7smp43yzi7w2lfyfbdxhapgizrpwbq8y7xzd"; nativeBuildInputs = [ installShellFiles ]; @@ -20,6 +20,9 @@ rustPlatform.buildRustPackage rec { postInstall = '' installManPage man/man1/shadowenv.1 installManPage man/man5/shadowlisp.5 + installShellCompletion --bash sh/completions/shadowenv.bash + installShellCompletion --fish sh/completions/shadowenv.fish + installShellCompletion --zsh sh/completions/_shadowenv ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/shallot/default.nix b/pkgs/tools/misc/shallot/default.nix index ced15038b0c1c..e8ab6168541cc 100644 --- a/pkgs/tools/misc/shallot/default.nix +++ b/pkgs/tools/misc/shallot/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "Shallot allows you to create customized .onion addresses for your hidden service"; license = stdenv.lib.licenses.mit; - homepage = https://github.com/katmagic/Shallot; + homepage = "https://github.com/katmagic/Shallot"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/shelldap/default.nix b/pkgs/tools/misc/shelldap/default.nix index 89257c8ffc469..bfa8ea16ed365 100644 --- a/pkgs/tools/misc/shelldap/default.nix +++ b/pkgs/tools/misc/shelldap/default.nix @@ -17,7 +17,7 @@ perlPackages.buildPerlPackage rec { ''; outputs = [ "out" ]; meta = with stdenv.lib; { - homepage = https://bitbucket.org/mahlon/shelldap/; + homepage = "https://bitbucket.org/mahlon/shelldap/"; description = "A handy shell-like interface for browsing LDAP servers and editing their content"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ tobiasBora ]; diff --git a/pkgs/tools/misc/shunit2/default.nix b/pkgs/tools/misc/shunit2/default.nix index acfbd48c606fd..186235be44288 100644 --- a/pkgs/tools/misc/shunit2/default.nix +++ b/pkgs/tools/misc/shunit2/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/kward/shunit2; + homepage = "https://github.com/kward/shunit2"; description = "A xUnit based unit test framework for Bourne based shell scripts."; maintainers = with maintainers; [ cdepillabout utdemir ]; license = licenses.asl20; diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix index 7fc1a63c5abc5..a59a14d4b9016 100644 --- a/pkgs/tools/misc/silicon/default.nix +++ b/pkgs/tools/misc/silicon/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "silicon"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "silicon"; rev = "v${version}"; - sha256 = "0j211qrkwgll7rm15dk4fcazmxkcqk2zah0qg2s3y0k7cx65bcxy"; + sha256 = "1avdzs3v6k4jhkadm8i8dlwg0iffqd99xqpi53smd0zgwks744l5"; }; - cargoSha256 = "1i0y3x5rmg27gxrr2lv04sqq7qyiv1bnazfy24l5zgb4akvdg3r5"; + cargoSha256 = "0bdb4nadrms5jq3s8pby2qfky7112ynd7vd6mw720mshqklk5zyb"; buildInputs = [ llvmPackages.libclang expat freetype ] ++ lib.optionals stdenv.isLinux [ libxcb ] diff --git a/pkgs/tools/misc/sixpair/default.nix b/pkgs/tools/misc/sixpair/default.nix index 055fa9418a9ab..f738ed71ec7a8 100644 --- a/pkgs/tools/misc/sixpair/default.nix +++ b/pkgs/tools/misc/sixpair/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, libusb }: +{ stdenv, fetchurl, libusb-compat-0_1 }: stdenv.mkDerivation { name = "sixpair-2007-04-18"; src = fetchurl { - url = http://www.pabr.org/sixlinux/sixpair.c; + url = "http://www.pabr.org/sixlinux/sixpair.c"; sha256 = "1b0a3k7gs544cbji7n29jxlrsscwfx6s1r2sgwdl6hmkc1l9gagr"; }; # hcitool is depricated patches = [ ./hcitool.patch ]; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; unpackPhase = '' cp $src sixpair.c @@ -30,7 +30,7 @@ stdenv.mkDerivation { longDescription = '' This command-line utility searches USB buses for SIXAXIS controllers and tells them to connect to a new Bluetooth master. ''; - homepage = http://www.pabr.org/sixlinux/; + homepage = "http://www.pabr.org/sixlinux/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.tomsmeets ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/tools/misc/sl/default.nix index 4ef91f6c55a31..902617665d889 100644 --- a/pkgs/tools/misc/sl/default.nix +++ b/pkgs/tools/misc/sl/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Steam Locomotive runs across your terminal when you type 'sl'"; - homepage = http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html; + homepage = "http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html"; license = rec { shortName = "Toyoda Masashi's free software license"; fullName = shortName; - url = https://github.com/eyJhb/sl/blob/master/LICENSE; + url = "https://github.com/eyJhb/sl/blob/master/LICENSE"; }; maintainers = with maintainers; [ eyjhb ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index 335a687dbc286..36f40dca6cb14 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "slop"; - version = "7.4"; + version = "7.5"; src = fetchFromGitHub { owner = "naelstrof"; repo = "slop"; rev = "v${version}"; - sha256 = "0fgd8a2dqkg64all0f96sca92sdss9r3pzmv5kck46b99z2325z6"; + sha256 = "1k8xxb4rj2fylr4vj16yvsf73cyywliz9cy78pl4ibmi03jhg837"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/tools/misc/slsnif/default.nix b/pkgs/tools/misc/slsnif/default.nix index 72363de7653e3..8078ee51eb2d4 100644 --- a/pkgs/tools/misc/slsnif/default.nix +++ b/pkgs/tools/misc/slsnif/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { name = "slsnif-0.4.4"; src = fetchurl { - url = mirror://sourceforge/slsnif/slsnif-0.4.4.tar.gz; + url = "mirror://sourceforge/slsnif/slsnif-0.4.4.tar.gz"; sha256 = "0gn8c5hj8m3sywpwdgn6w5xl4rzsvg0z7d2w8dxi6p152j5b0pii"; }; meta = { description = "Serial line sniffer"; - homepage = http://slsnif.sourceforge.net/; + homepage = "http://slsnif.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/slurp/default.nix b/pkgs/tools/misc/slurp/default.nix index bc0e86f1b5180..dbec2324674ba 100644 --- a/pkgs/tools/misc/slurp/default.nix +++ b/pkgs/tools/misc/slurp/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Select a region in a Wayland compositor"; - homepage = https://github.com/emersion/slurp; + homepage = "https://github.com/emersion/slurp"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ buffet ]; diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix index f442df399d90f..87bda5d78b432 100644 --- a/pkgs/tools/misc/smc/default.nix +++ b/pkgs/tools/misc/smc/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { SMC can also generate GraphViz state diagrams from the input file. ''; - homepage = http://smc.sourceforge.net/; + homepage = "http://smc.sourceforge.net/"; license = licenses.mpl11; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index c6661ee62e464..4d24a1542fa35 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; meta = with stdenv.lib; { - homepage = https://github.com/p-gen/smenu; + homepage = "https://github.com/p-gen/smenu"; description = "Terminal selection utility"; longDescription = '' Terminal utility that allows you to use words coming from the standard diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 8b0167917dd3f..eed9516d09603 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for Linux filesystem snapshot management"; - homepage = http://snapper.io; + homepage = "http://snapper.io"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ tstrobel markuskowa ]; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 01aec4aabb764..d6ff65adb4ca7 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.39.0"; + version = "0.41.3"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "13phic9898wjc4b000nkwhy24yczn3dyhw8pqcaqhyzxdaj3gwmw"; + sha256 = "0f3d95abivbmjqdzw9pbdbis96sfds26xv3k8k9skxml8iqzq29c"; }; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; @@ -22,14 +22,14 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - cargoSha256 = "0ds19sjy0fd7psmqkw64scjf3ysi408i7c1qk9zvqkl4ghz8wymg"; + cargoSha256 = "10h0arvl3gf5hg530d24ypj4yzk3zhm8mgkhz0v61y0jcdy2zdrm"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { description = "A minimal, blazing fast, and extremely customizable prompt for any shell"; homepage = "https://starship.rs"; license = licenses.isc; - maintainers = with maintainers; [ bbigras davidtwco filalex77 ]; + maintainers = with maintainers; [ bbigras davidtwco filalex77 Frostman ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index e4e1adf20016e..a1e6f57ce3d8f 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A sophisticated software modeler"; - homepage = http://staruml.io/; + homepage = "http://staruml.io/"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/tools/misc/statserial/default.nix b/pkgs/tools/misc/statserial/default.nix new file mode 100644 index 0000000000000..66ae899b9c5a3 --- /dev/null +++ b/pkgs/tools/misc/statserial/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, ncurses, glibc }: + +stdenv.mkDerivation rec { + pname = "statserial"; + version = "1.1"; + + src = fetchurl { + url = "http://www.ibiblio.org/pub/Linux/system/serial/${pname}-${version}.tar.gz"; + sha256 = "0rrrmxfba5yn836zlgmr8g9xnrpash7cjs7lk2m44ac50vakpks0"; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace '-lcurses' '-lncurses' + + substituteInPlace Makefile \ + --replace 'LDFLAGS = -s -N' '#LDFLAGS = -s -N' + ''; + + buildInputs = [ ncurses glibc stdenv ]; + + installPhase = '' + mkdir -p $out/bin + cp statserial $out/bin + + mkdir -p $out/share/man/man1 + cp statserial.1 $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + homepage = "https://sites.google.com/site/tranter/software"; + description = "Display serial port modem status lines."; + license = licenses.gpl2; + + longDescription = + '' Statserial displays a table of the signals on a standard 9-pin or + 25-pin serial port, and indicates the status of the handshaking lines. It + can be useful for debugging problems with serial ports or modems. + ''; + + platforms = platforms.unix; + maintainers = with maintainers; [ rps ]; + }; +} diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix index d5eecff727816..80741f0543ce5 100644 --- a/pkgs/tools/misc/stow/default.nix +++ b/pkgs/tools/misc/stow/default.nix @@ -30,9 +30,7 @@ stdenv.mkDerivation { ''; license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/stow/; - - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + homepage = "https://www.gnu.org/software/stow/"; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/misc/subberthehut/default.nix b/pkgs/tools/misc/subberthehut/default.nix index e54dc3b3f2b66..e4fa57e30ac5f 100644 --- a/pkgs/tools/misc/subberthehut/default.nix +++ b/pkgs/tools/misc/subberthehut/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/mus65/subberthehut; + homepage = "https://github.com/mus65/subberthehut"; description = "An OpenSubtitles.org downloader"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix index 8d42d2d823f30..c94b8f646a96f 100644 --- a/pkgs/tools/misc/sutils/default.nix +++ b/pkgs/tools/misc/sutils/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Small command-line utilities"; - homepage = https://github.com/baskerville/sutils; + homepage = "https://github.com/baskerville/sutils"; maintainers = [ stdenv.lib.maintainers.meisternu ]; license = "Custom"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 66ed0a11fd92a..8490771ad8d2f 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/spaam/svtplay-dl; + homepage = "https://github.com/spaam/svtplay-dl"; description = "Command-line tool to download videos from svtplay.se and other sites"; license = licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix index 0d1ebd70041f6..21e6f49df1f58 100644 --- a/pkgs/tools/misc/sweep-visualizer/default.nix +++ b/pkgs/tools/misc/sweep-visualizer/default.nix @@ -50,7 +50,7 @@ ''; meta = with stdenv.lib; { - homepage = https://support.scanse.io/hc/en-us/articles/115006008948-Visualizer-Overview; + homepage = "https://support.scanse.io/hc/en-us/articles/115006008948-Visualizer-Overview"; description = "A minimal desktop application for interfacing with the Sweep device"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix index aa34b98bbe292..dd0eda67ce55a 100644 --- a/pkgs/tools/misc/t/default.nix +++ b/pkgs/tools/misc/t/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A command-line power tool for Twitter"; - homepage = http://sferik.github.io/t/; + homepage = "http://sferik.github.io/t/"; license = licenses.asl20; maintainers = with maintainers; [ offline manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix index 03926b955383d..fd4ca5f92d539 100644 --- a/pkgs/tools/misc/t1utils/default.nix +++ b/pkgs/tools/misc/t1utils/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { resources from a Macintosh font file or create a Macintosh Type 1 font file from a PFA or PFB font. ''; - homepage = http://www.lcdf.org/type/; + homepage = "http://www.lcdf.org/type/"; # README from tarball says "BSD-like" and points to non-existing LICENSE # file... license = "Click"; # MIT with extra clause, https://github.com/kohler/t1utils/blob/master/LICENSE diff --git a/pkgs/tools/misc/td/default.nix b/pkgs/tools/misc/td/default.nix index 437bdb0373f8e..f4b120d1bc127 100644 --- a/pkgs/tools/misc/td/default.nix +++ b/pkgs/tools/misc/td/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing."; - homepage = https://github.com/treasure-data/td; + homepage = "https://github.com/treasure-data/td"; license = licenses.asl20; maintainers = with maintainers; [ groodt nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/teamocil/default.nix b/pkgs/tools/misc/teamocil/default.nix index a5e356edbf481..b1f6c7cdcab59 100644 --- a/pkgs/tools/misc/teamocil/default.nix +++ b/pkgs/tools/misc/teamocil/default.nix @@ -9,7 +9,7 @@ bundlerEnv { meta = with lib; { description = "A simple tool used to automatically create windows and panes in tmux with YAML files"; - homepage = https://github.com/remiprev/teamocil; + homepage = "https://github.com/remiprev/teamocil"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix index a17994706bb33..d60a65214b74c 100644 --- a/pkgs/tools/misc/termplay/default.nix +++ b/pkgs/tools/misc/termplay/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Play an image/video in your terminal"; - homepage = https://jd91mzm2.github.io/termplay/; + homepage = "https://jd91mzm2.github.io/termplay/"; license = licenses.mit; maintainers = with maintainers; [ jD91mZM2 ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/tools/misc/termtosvg/default.nix index 93b52ad175e93..a89ed808c8b14 100644 --- a/pkgs/tools/misc/termtosvg/default.nix +++ b/pkgs/tools/misc/termtosvg/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ lxml pyte wcwidth ]; meta = with lib; { - homepage = https://nbedos.github.io/termtosvg/; + homepage = "https://nbedos.github.io/termtosvg/"; description = "Record terminal sessions as SVG animations"; license = licenses.bsd3; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/tools/misc/tewisay/default.nix index d875b098ab568..b4f834bdd1af9 100644 --- a/pkgs/tools/misc/tewisay/default.nix +++ b/pkgs/tools/misc/tewisay/default.nix @@ -18,16 +18,16 @@ buildGoPackage rec { goDeps = ./deps.nix; postInstall = '' - install -D -t $bin/share/tewisay/cows go/src/${goPackagePath}/cows/*.cow + install -D -t $out/share/tewisay/cows go/src/${goPackagePath}/cows/*.cow ''; preFixup = '' - wrapProgram $bin/bin/tewisay \ - --prefix COWPATH : $bin/share/tewisay/cows + wrapProgram $out/bin/tewisay \ + --prefix COWPATH : $out/share/tewisay/cows ''; meta = { - homepage = https://github.com/lucy/tewisay; + homepage = "https://github.com/lucy/tewisay"; description = "Cowsay replacement with unicode and partial ansi escape support"; license = stdenv.lib.licenses.cc0; maintainers = [ stdenv.lib.maintainers.chiiruno ]; diff --git a/pkgs/tools/misc/texi2mdoc/default.nix b/pkgs/tools/misc/texi2mdoc/default.nix index abc25db2fa7e5..6c090c0b4b363 100644 --- a/pkgs/tools/misc/texi2mdoc/default.nix +++ b/pkgs/tools/misc/texi2mdoc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://mdocml.bsd.lv/; + homepage = "http://mdocml.bsd.lv/"; description = "converter from Texinfo into mdoc"; license = licenses.isc; platforms = platforms.all; diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index d67da78a30046..b2d31a6291165 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { doCheck = false; # The above is only enough for tests to pass outside the sandbox. meta = with stdenv.lib; { - homepage = https://github.com/nvbn/thefuck; + homepage = "https://github.com/nvbn/thefuck"; description = "Magnificent app which corrects your previous console command."; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix index 0739435084d29..0aba67647e0bd 100644 --- a/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/jthornber/thin-provisioning-tools/; + homepage = "https://github.com/jthornber/thin-provisioning-tools/"; description = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index bb6276f706551..89af4f693d3f2 100644 --- a/pkgs/tools/misc/time/default.nix +++ b/pkgs/tools/misc/time/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/time/; + homepage = "https://www.gnu.org/software/time/"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index 88c3c7cb42529..f33520aee0a8c 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "timidity-2.15.0"; src = fetchurl { - url = mirror://sourceforge/timidity/TiMidity++-2.15.0.tar.bz2; + url = "mirror://sourceforge/timidity/TiMidity++-2.15.0.tar.bz2"; sha256 = "1xf8n6dqzvi6nr2asags12ijbj1lwk1hgl3s27vm2szib8ww07qn"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-ljack -L${libjack2}/lib"; instruments = fetchurl { - url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz; + url = "http://www.csee.umbc.edu/pub/midia/instruments.tar.gz"; sha256 = "0lsh9l8l5h46z0y8ybsjd4pf6c22n33jsjvapfv3rjlfnasnqw67"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/timidity/; + homepage = "https://sourceforge.net/projects/timidity/"; license = licenses.gpl2; description = "A software MIDI renderer"; maintainers = [ maintainers.marcweber ]; diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix index 9ee9b977ab295..bab0098ecaa48 100644 --- a/pkgs/tools/misc/tio/default.nix +++ b/pkgs/tools/misc/tio/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Serial console TTY"; - homepage = https://tio.github.io/; + homepage = "https://tio.github.io/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ yegortimoshenko ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index d4ff9d8c84421..66d763fd304ed 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { tldr pages gives common use cases for commands, so you don't need to hunt through a man page for the correct flags. ''; - homepage = http://tldr-pages.github.io; + homepage = "http://tldr-pages.github.io"; license = licenses.mit; maintainers = with maintainers; [ taeer carlosdagos ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index 86ab249287778..3a125fcdbf7cc 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://tmate.io/; + homepage = "https://tmate.io/"; description = "Instant Terminal Sharing"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix index 006cef6f10274..ac20cab2842ed 100644 --- a/pkgs/tools/misc/tmpwatch/default.nix +++ b/pkgs/tools/misc/tmpwatch/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-fuser=${psmisc}/bin/fuser" ]; meta = with stdenv.lib; { - homepage = https://fedorahosted.org/tmpwatch/; + homepage = "https://fedorahosted.org/tmpwatch/"; description = "Recursively searches through specified directories and removes files which have not been accessed in a specified period of time"; license = licenses.gpl2; maintainers = with maintainers; [ vlstill ]; diff --git a/pkgs/tools/misc/tmux-cssh/default.nix b/pkgs/tools/misc/tmux-cssh/default.nix index f54cd2756eb11..c38769f448f18 100644 --- a/pkgs/tools/misc/tmux-cssh/default.nix +++ b/pkgs/tools/misc/tmux-cssh/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/dennishafemann/tmux-cssh; + homepage = "https://github.com/dennishafemann/tmux-cssh"; description = "SSH to multiple hosts at the same time using tmux"; longDescription = diff --git a/pkgs/tools/misc/tmux-xpanes/default.nix b/pkgs/tools/misc/tmux-xpanes/default.nix index 06e7980167a20..6e41eba735904 100644 --- a/pkgs/tools/misc/tmux-xpanes/default.nix +++ b/pkgs/tools/misc/tmux-xpanes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tmux-xpanes"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "greymd"; repo = pname; rev = "v${version}"; - sha256 = "13q02vdk229chgbn547wwv29cj4njvz02lmw840g8qmwh73qb2pi"; + sha256 = "0vm5mi6dqdbg0b5qh4r8sr1plpc00jryd8a2qxpp3a72cigjvvf0"; }; buildInputs = [ openssl perl ]; diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 1aa221bd59e37..12ea456b9f7e7 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { pname = "tmux"; - version = "3.0a"; + version = "3.1b"; outputs = [ "out" "man" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "0y9lv1yr0x50v3k70vzkc8hfr7yijlsi30p7dr7i8akp3lwmmc7h"; + sha256 = "0jvyq4r691bn0wsr8i6c0q0lzss25vm9nx8sv3fhw9cs63ncq04y"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index b7c9150e12d77..e631aa9d342b6 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -1,4 +1,4 @@ -{ lib, buildRubyGem, ruby }: +{ lib, buildRubyGem, ruby, installShellFiles }: # Cannot use bundleEnv because bundleEnv create stub with # BUNDLE_FROZEN='1' environment variable set, which broke everything @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "1.1.4"; - source.sha256 = "06ajfvsmq2040b7nk2ifih3sqxgwzih5j1d25nh4ilgjlrfmha98"; + version = "2.0.1"; + source.sha256 = "03q1q6majci0l6kzw6kv7r395jycrl862mlqmyydxcd29y8wm3m2"; erubis = buildRubyGem rec { inherit ruby; @@ -37,9 +37,15 @@ buildRubyGem rec { propagatedBuildInputs = [ erubis thor xdg ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion $GEM_HOME/gems/${gemName}-${version}/completion/tmuxinator.{bash,zsh,fish} + ''; + meta = with lib; { description = "Manage complex tmux sessions easily"; - homepage = https://github.com/tmuxinator/tmuxinator; + homepage = "https://github.com/tmuxinator/tmuxinator"; license = licenses.mit; maintainers = with maintainers; [ auntie ericsagnes ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 9ffa89f591966..94cdcf5689360 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Manage tmux workspaces from JSON and YAML"; - homepage = https://tmuxp.git-pull.com/; + homepage = "https://tmuxp.git-pull.com/"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix index e2d263817ee75..4afa1781ac0e3 100644 --- a/pkgs/tools/misc/togglesg-download/default.nix +++ b/pkgs/tools/misc/togglesg-download/default.nix @@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication { ''; meta = with stdenv.lib; { - homepage = https://github.com/0x776b7364/toggle.sg-download; + homepage = "https://github.com/0x776b7364/toggle.sg-download"; description = "Command-line tool to download videos from toggle.sg written in Python"; longDescription = '' toggle.sg requires SilverLight in order to view videos. This tool will diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix index abc6933a777e6..c598b37897c78 100644 --- a/pkgs/tools/misc/toilet/default.nix +++ b/pkgs/tools/misc/toilet/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Display large colourful characters in text mode"; - homepage = http://caca.zoy.org/wiki/toilet; + homepage = "http://caca.zoy.org/wiki/toilet"; license = licenses.wtfpl; maintainers = with maintainers; [ pSub ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 39882b4e6e6db..529252901a4aa 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "4.3.1"; + version = "4.5.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "0r42hrhd33kkkvii9h4896cmr319q728pdnhhamkhzgilvzxrwrz"; + sha256 = "0df79vlbclv1qx4zwir728c6ggqfawxh2x1py16m5q0ga1hd799j"; }; - cargoSha256 = "041djz3w7qmr19xq4cxgpw0m4qz2368q2wijw5aidvrxqlcz7xg2"; + cargoSha256 = "0wwxh71i94h68sryckbvrr43gd19qjcs0cgcpycnimkhdcdy8nlj"; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index b863786145c63..ea2c07ec97bbe 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight implementation of some Unix command line utilities"; - homepage = https://landley.net/toybox/; + homepage = "https://landley.net/toybox/"; license = licenses.bsd0; platforms = with platforms; linux ++ darwin ++ freebsd; maintainers = with maintainers; [ hhm ]; diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 7fcd3176c7e9e..141cceff24d3a 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { checkPhase = "nosetests"; meta = with stdenv.lib; { - homepage = https://github.com/andreafrancia/trash-cli; + homepage = "https://github.com/andreafrancia/trash-cli"; description = "Command line tool for the desktop trash can"; maintainers = [ maintainers.rycee ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix index 7142d346336a5..b7888f0884bd0 100644 --- a/pkgs/tools/misc/ttf2pt1/default.nix +++ b/pkgs/tools/misc/ttf2pt1/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ttf2pt1-3.4.4"; src = fetchurl { - url = mirror://sourceforge/ttf2pt1/ttf2pt1-3.4.4.tgz; + url = "mirror://sourceforge/ttf2pt1/ttf2pt1-3.4.4.tgz"; sha256 = "1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "True Type to Postscript Type 3 converter, fpdf"; - homepage = http://ttf2pt1.sourceforge.net/index.html; + homepage = "http://ttf2pt1.sourceforge.net/index.html"; license = "ttf2pt1"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index f82917239e647..502b829afcecc 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { new font where all glyphs are bytecode hinted using the information given by FreeType’s auto-hinting module. ''; - homepage = https://www.freetype.org/ttfautohint; + homepage = "https://www.freetype.org/ttfautohint"; license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) maintainers = with maintainers; [ goibhniu ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/tools/misc/ttmkfdir/default.nix index 4a2ab0d3475c4..d75011ea6f409 100644 --- a/pkgs/tools/misc/ttmkfdir/default.nix +++ b/pkgs/tools/misc/ttmkfdir/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ttf-mkfontdir-3.0.9-6"; src = fetchurl { - url = http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz; + url = "http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz"; sha256 = "0n6bmmndmp4c1myisvv7cby559gzgvwsw4rfw065a3f92m87jxiq"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { # who knows more about C/C++ .. patches = [ (fetchurl { - url = http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-6.diff.gz; + url = "http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-6.diff.gz"; sha256 = "141kxaf2by8nf87hqyszaxi0n7nnmswr1nh2i5r5bsvxxmaj9633"; }) diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix index 5a2d1aaa4279a..afd5139565c81 100644 --- a/pkgs/tools/misc/ttwatch/default.nix +++ b/pkgs/tools/misc/ttwatch/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/ryanbinns/ttwatch; + homepage = "https://github.com/ryanbinns/ttwatch"; description = "Linux TomTom GPS Watch Utilities"; maintainers = with maintainers; [ dotlambda ]; license = licenses.mit; diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix index b261f0ef84114..f6a312f046087 100644 --- a/pkgs/tools/misc/tty-clock/default.nix +++ b/pkgs/tools/misc/tty-clock/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/xorg62/tty-clock; + homepage = "https://github.com/xorg62/tty-clock"; license = licenses.free; description = "Digital clock in ncurses"; platforms = platforms.all; diff --git a/pkgs/tools/misc/ttygif/default.nix b/pkgs/tools/misc/ttygif/default.nix index 2fbd436069884..5a14dade01b84 100644 --- a/pkgs/tools/misc/ttygif/default.nix +++ b/pkgs/tools/misc/ttygif/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { pname = "ttygif"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "icholy"; repo = pname; rev = version; - sha256 = "18l26iacpfn4xqqv1ai6ncabn83mqv98c48gl265gfld66y7zbzn"; + sha256 = "1w9c3h6hik2gglwsw8ww63piy66i4zqr3273wh5rc9r2awiwh643"; }; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ "CC:=$(CC)" "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { homepage = "https://github.com/icholy/ttygif"; description = "Convert terminal recordings to animated gifs"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; maintainers = with maintainers; [ moaxcp ]; }; diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix index 70856fba7319d..55785c7a211cd 100644 --- a/pkgs/tools/misc/ttylog/default.nix +++ b/pkgs/tools/misc/ttylog/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = http://ttylog.sourceforge.net; + homepage = "http://ttylog.sourceforge.net"; description = "Simple serial port logger"; longDescription = '' A serial port logger which can be used to print everything to stdout diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix index 45aa9ea5c0b24..afa4cb3e15556 100644 --- a/pkgs/tools/misc/ttyplot/default.nix +++ b/pkgs/tools/misc/ttyplot/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple general purpose plotting utility for tty with data input from stdin"; - homepage = https://github.com/tenox7/ttyplot; + homepage = "https://github.com/tenox7/ttyplot"; license = licenses.unlicense; maintainers = with maintainers; [ lassulus ]; }; diff --git a/pkgs/tools/misc/ttyrec/default.nix b/pkgs/tools/misc/ttyrec/default.nix index 799e397daceb0..97049276a32d9 100644 --- a/pkgs/tools/misc/ttyrec/default.nix +++ b/pkgs/tools/misc/ttyrec/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://0xcc.net/ttyrec/; + homepage = "http://0xcc.net/ttyrec/"; description = "Terminal interaction recorder and player"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index a6b851e18aef6..ce928f0a37810 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Programming language for convenient data munging"; license = licenses.bsd2; - homepage = http://nongnu.org/txr; + homepage = "http://nongnu.org/txr"; maintainers = with stdenv.lib.maintainers; [ dtzWill ]; platforms = platforms.linux; # Darwin fails although it should work AFAIK }; diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix index 90f9559e6b7c3..c7d8837f82353 100644 --- a/pkgs/tools/misc/txt2man/default.nix +++ b/pkgs/tools/misc/txt2man/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Convert flat ASCII text to man page format"; - homepage = http://mvertes.free.fr/; + homepage = "http://mvertes.free.fr/"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ bjornfor ]; diff --git a/pkgs/tools/misc/txtw/default.nix b/pkgs/tools/misc/txtw/default.nix index ab8256842aed4..1cf80007901ee 100644 --- a/pkgs/tools/misc/txtw/default.nix +++ b/pkgs/tools/misc/txtw/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compute text widths"; - homepage = https://github.com/baskerville/txtw; + homepage = "https://github.com/baskerville/txtw"; maintainers = with maintainers; [ lihop ]; license = licenses.unlicense; platforms = platforms.linux; diff --git a/pkgs/tools/misc/tydra/default.nix b/pkgs/tools/misc/tydra/default.nix new file mode 100644 index 0000000000000..c6d7c86c7efd2 --- /dev/null +++ b/pkgs/tools/misc/tydra/default.nix @@ -0,0 +1,34 @@ +{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "tydra"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "Mange"; + repo = pname; + rev = "v${version}"; + sha256 = "1kvyski3qy2lwlpipynq894i0g9x2j4a1iy2mgdwfibfyfkv2jnm"; + }; + + cargoSha256 = "11l3fvym16wrrpm9vy4asmqdh8qynwjy0w4gx2bbcnc6300ag43a"; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage doc/{tydra.1,tydra-actions.5} + + $out/bin/tydra --generate-completions bash > tydra.bash + $out/bin/tydra --generate-completions fish > tydra.fish + $out/bin/tydra --generate-completions zsh > _tydra + + installShellCompletion tydra.{bash,fish} _tydra + ''; + + meta = with stdenv.lib; { + description = "Shortcut menu-based task runner, inspired by Emacs Hydra"; + homepage = "https://github.com/Mange/tydra"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/tools/misc/uhubctl/default.nix b/pkgs/tools/misc/uhubctl/default.nix index 0ed5d97ad7b5b..49da81d6094f6 100644 --- a/pkgs/tools/misc/uhubctl/default.nix +++ b/pkgs/tools/misc/uhubctl/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "uhubctl"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "mvp"; repo = "uhubctl"; rev = "refs/tags/v${version}"; - sha256 = "1cgmwsf68g49k6q4jvz073bpjhg5p73kk1a4kbgkxmvx01gmbcmq"; + sha256 = "0pimhw2a2wfg7nh1ahsxmzkb0j6bbncwdqsvyp8l23zhs5kx7wm9"; }; buildInputs = [ libusb1 ]; diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix index dd9742293ac78..923f6e7a3a453 100644 --- a/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/pkgs/tools/misc/ultrastar-creator/default.nix @@ -38,7 +38,7 @@ mkDerivation { meta = with lib; { description = "Ultrastar karaoke song creation tool"; - homepage = https://github.com/UltraStar-Deluxe/UltraStar-Creator; + homepage = "https://github.com/UltraStar-Deluxe/UltraStar-Creator"; license = licenses.gpl2; maintainers = with maintainers; [ Profpatsch ]; }; diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix index 19d126d98f64f..64221a9213966 100644 --- a/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/pkgs/tools/misc/ultrastar-manager/default.nix @@ -114,7 +114,7 @@ in mkDerivation { meta = with lib; { description = "Ultrastar karaoke song manager"; - homepage = https://github.com/UltraStar-Deluxe/UltraStar-Manager; + homepage = "https://github.com/UltraStar-Deluxe/UltraStar-Manager"; license = licenses.gpl2; maintainers = with maintainers; [ Profpatsch ]; }; diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix index 2b70848cbb815..25d92905bd857 100644 --- a/pkgs/tools/misc/umlet/default.nix +++ b/pkgs/tools/misc/umlet/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { UMLet runs stand-alone or as Eclipse plug-in on Windows, macOS and Linux. ''; - homepage = http://www.umlet.com; + homepage = "http://www.umlet.com"; license = licenses.gpl3; maintainers = with maintainers; [ geistesk ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index 978a3d541ab09..ef8e865e91f39 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "unclutter-8"; src = fetchurl { - url = https://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz; + url = "https://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz"; sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6"; }; diff --git a/pkgs/tools/misc/unicode/default.nix b/pkgs/tools/misc/unicode/default.nix index 94289f0d9b72c..c4ae9cc5e36d3 100644 --- a/pkgs/tools/misc/unicode/default.nix +++ b/pkgs/tools/misc/unicode/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { }; ucdtxt = fetchurl { - url = http://www.unicode.org/Public/11.0.0/ucd/UnicodeData.txt; + url = "http://www.unicode.org/Public/11.0.0/ucd/UnicodeData.txt"; sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; }; @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Display unicode character properties"; - homepage = https://github.com/garabik/unicode; + homepage = "https://github.com/garabik/unicode"; license = licenses.gpl3; maintainers = [ maintainers.woffs ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index 8bea94770ba65..d62f10daeea6f 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Unit conversion tool"; - homepage = https://www.gnu.org/software/units/; + homepage = "https://www.gnu.org/software/units/"; license = [ licenses.gpl3Plus ]; platforms = platforms.all; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/tools/misc/up/default.nix b/pkgs/tools/misc/up/default.nix index b3937175604df..f0f9cf4cee85c 100644 --- a/pkgs/tools/misc/up/default.nix +++ b/pkgs/tools/misc/up/default.nix @@ -4,6 +4,8 @@ buildGoModule rec { pname = "up"; version = "0.3.2"; + patches = [ ./gomod.patch ]; + src = fetchFromGitHub { owner = "akavel"; repo = "up"; @@ -11,12 +13,12 @@ buildGoModule rec { sha256 = "1psixyymk98z52yy92lwb75yfins45dw6rif9cxwd7yiascwg2if"; }; - modSha256 = "0nfs190rzabphhhyacypz3ic5c4ajlqpx9jiiincs0vxfkmfwnjd"; + vendorSha256 = "1h3w4i7dyh6yagqmdclvflfq6fx0z880jdnpf28assv7fxd9rjsx"; meta = with lib; { description = "Ultimate Plumber is a tool for writing Linux pipes with instant live preview"; - homepage = https://github.com/akavel/up; + homepage = "https://github.com/akavel/up"; maintainers = with maintainers; [ ma27 ]; license = licenses.asl20; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/up/gomod.patch b/pkgs/tools/misc/up/gomod.patch new file mode 100644 index 0000000000000..f894f14d21f13 --- /dev/null +++ b/pkgs/tools/misc/up/gomod.patch @@ -0,0 +1,23 @@ +diff --git a/go.mod b/go.mod +index ecbfe90..56a1409 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,11 +1,14 @@ + module github.com/akavel/up + ++go 1.14 ++ + require ( +- github.com/gdamore/encoding v0.0.0-20151215212835-b23993cbb635 ++ github.com/gdamore/encoding v0.0.0-20151215212835-b23993cbb635 // indirect + github.com/gdamore/tcell v0.0.0-20180924055237-493f3b46b3c2 +- github.com/lucasb-eyer/go-colorful v0.0.0-20170903184257-231272389856 ++ github.com/lucasb-eyer/go-colorful v0.0.0-20170903184257-231272389856 // indirect + github.com/mattn/go-isatty v0.0.3 +- github.com/mattn/go-runewidth v0.0.2 ++ github.com/mattn/go-runewidth v0.0.2 // indirect + github.com/spf13/pflag v1.0.3 +- golang.org/x/text v0.0.0-20171214130843-f21a4dfb5e38 ++ golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 // indirect ++ golang.org/x/text v0.0.0-20171214130843-f21a4dfb5e38 // indirect + ) diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 865fd4f44f845..2056fb9d0a5ae 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -1,5 +1,5 @@ { stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison -, flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb, readline +, flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb-compat-0_1, readline , python3 , svfSupport ? true , bsdlSupport ? true @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext autoconf automake libtool bison flex which - subversion makeWrapper readline libftdi libusb python3 ]; + subversion makeWrapper readline libftdi libusb-compat-0_1 python3 ]; configureFlags = [ (stdenv.lib.enableFeature svfSupport "svf") @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more"; - homepage = http://urjtag.org/; + homepage = "http://urjtag.org/"; license = with stdenv.lib.licenses; [ gpl2Plus lgpl21Plus ]; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ]; diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix index 5935710164c42..1c1da7597e7db 100644 --- a/pkgs/tools/misc/usbmuxd/default.nix +++ b/pkgs/tools/misc/usbmuxd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/libimobiledevice/usbmuxd; + homepage = "https://github.com/libimobiledevice/usbmuxd"; description = "A socket daemon to multiplex connections from and to iOS devices"; longDescription = '' usbmuxd stands for "USB multiplexing daemon". This daemon is in charge of diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix index 0fae40a5c9643..1516e9dba33ac 100644 --- a/pkgs/tools/misc/uucp/default.nix +++ b/pkgs/tools/misc/uucp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { just found one of the finest UUCP implementations available. ''; - homepage = https://www.gnu.org/software/uucp/uucp.html; + homepage = "https://www.gnu.org/software/uucp/uucp.html"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/misc/uudeview/default.nix b/pkgs/tools/misc/uudeview/default.nix index 3e8b7d494deb5..a8495d7767c4e 100644 --- a/pkgs/tools/misc/uudeview/default.nix +++ b/pkgs/tools/misc/uudeview/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "The Nice and Friendly Decoder"; - homepage = http://www.fpx.de/fp/Software/UUDeview/; + homepage = "http://www.fpx.de/fp/Software/UUDeview/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ woffs ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index 09c29a0af1fb3..f18deb0c83de1 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage { uutils is an attempt at writing universal (as in cross-platform) CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites. ''; - homepage = https://github.com/uutils/coreutils; + homepage = "https://github.com/uutils/coreutils"; maintainers = with maintainers; [ ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/tools/misc/vcs_query/default.nix b/pkgs/tools/misc/vcs_query/default.nix index a39619f354bd4..da42b35391b72 100644 --- a/pkgs/tools/misc/vcs_query/default.nix +++ b/pkgs/tools/misc/vcs_query/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/mageta/vcs_query; + homepage = "https://github.com/mageta/vcs_query"; description = "eMail query-command to use vCards in mutt and Vim"; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/tools/misc/vdirsyncer/stable.nix b/pkgs/tools/misc/vdirsyncer/stable.nix deleted file mode 100644 index ac950894035b9..0000000000000 --- a/pkgs/tools/misc/vdirsyncer/stable.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, python3Packages, fetchpatch }: - -# Packaging documentation at: -# https://github.com/pimutils/vdirsyncer/blob/0.16.7/docs/packaging.rst -python3Packages.buildPythonApplication rec { - version = "0.16.7"; - pname = "vdirsyncer"; - - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "6c9bcfb9bcb01246c83ba6f8551cf54c58af3323210755485fc23bb7848512ef"; - }; - - propagatedBuildInputs = with python3Packages; [ - click click-log click-threading - requests_toolbelt - requests - requests_oauthlib # required for google oauth sync - atomicwrites - ]; - - nativeBuildInputs = with python3Packages; [ setuptools_scm ]; - - checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ]; - - patches = [ - # Fixes for hypothesis: https://github.com/pimutils/vdirsyncer/pull/779 - (fetchpatch { - url = https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch; - sha256 = "0dbzj6jlxhdidnm3i21a758z83sdiwzhpd45pbkhycfhgmqmhjpl"; - }) - ]; - - postPatch = '' - # Invalid argument: 'perform_health_check' is not a valid setting - substituteInPlace tests/conftest.py \ - --replace "perform_health_check=False" "" - substituteInPlace tests/unit/test_repair.py \ - --replace $'@settings(perform_health_check=False) # Using the random module for UIDs\n' "" - ''; - - checkPhase = '' - make DETERMINISTIC_TESTS=true test - ''; - - meta = with lib; { - homepage = https://github.com/pimutils/vdirsyncer; - description = "Synchronize calendars and contacts"; - license = licenses.mit; - maintainers = with maintainers; [ loewenheim ]; - }; -} diff --git a/pkgs/tools/misc/venus/default.nix b/pkgs/tools/misc/venus/default.nix index 534a500c7bccc..944b6e4ef6445 100644 --- a/pkgs/tools/misc/venus/default.nix +++ b/pkgs/tools/misc/venus/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { feeds published by web sites and aggregates their content together into a single combined feed, latest news first. ''; - homepage = http://intertwingly.net/code/venus/docs/index.html; + homepage = "http://intertwingly.net/code/venus/docs/index.html"; license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; maintainers = []; diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix index 7f81774aebee3..5bef80adcaf8e 100644 --- a/pkgs/tools/misc/vimer/default.nix +++ b/pkgs/tools/misc/vimer/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/susam/vimer; + homepage = "https://github.com/susam/vimer"; description = '' A convenience wrapper for gvim/mvim --remote(-tab)-silent to open files in an existing instance of GVim or MacVim. diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix index 1696a54d0aa4a..c8831a6fca5b4 100644 --- a/pkgs/tools/misc/vivid/default.nix +++ b/pkgs/tools/misc/vivid/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A generator for LS_COLORS with support for multiple color themes"; - homepage = https://github.com/sharkdp/vivid; + homepage = "https://github.com/sharkdp/vivid"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.dtzWill ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/tools/misc/vmtouch/default.nix index 6397a09334761..0f46d8141f1c4 100644 --- a/pkgs/tools/misc/vmtouch/default.nix +++ b/pkgs/tools/misc/vmtouch/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Portable file system cache diagnostics and control"; longDescription = "vmtouch is a tool for learning about and controlling the file system cache of unix and unix-like systems."; - homepage = https://hoytech.com/vmtouch/; + homepage = "https://hoytech.com/vmtouch/"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.garrison ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix index f71151259c88a..f9805531f86c0 100644 --- a/pkgs/tools/misc/void/default.nix +++ b/pkgs/tools/misc/void/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Terminal-based personal organizer"; - homepage = https://github.com/spacejam/void; + homepage = "https://github.com/spacejam/void"; license = licenses.gpl3; maintainers = with maintainers; [ spacekookie ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/pkgs/tools/misc/vorbisgain/default.nix index 90b721ad58ae2..fdb283d4dce90 100644 --- a/pkgs/tools/misc/vorbisgain/default.nix +++ b/pkgs/tools/misc/vorbisgain/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sjeng.org/vorbisgain.html; + homepage = "https://sjeng.org/vorbisgain.html"; description = "A utility that corrects the volume of an Ogg Vorbis file to a predefined standardized loudness"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/tools/misc/vttest/default.nix index 38fedbbf09924..6a9a12b2a07a2 100644 --- a/pkgs/tools/misc/vttest/default.nix +++ b/pkgs/tools/misc/vttest/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vttest"; - version = "20200303"; + version = "20200420"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" ]; - sha256 = "1g27yp37kh57hmwicw3ndnsapsbqzk2cnjccmvyj4zw2z0l5iaj9"; + sha256 = "03li63v9mbsqn4cw6d769r1a6iaixi80m2c32y32vc9i5k3ik43c"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/wacomtablet/default.nix b/pkgs/tools/misc/wacomtablet/default.nix index d0fbcecf0270a..aa631d4411485 100644 --- a/pkgs/tools/misc/wacomtablet/default.nix +++ b/pkgs/tools/misc/wacomtablet/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { This module implements a GUI for the Wacom Linux Drivers and extends it with profile support to handle different button / pen layouts per profile. ''; - homepage = https://cgit.kde.org/wacomtablet.git/about/; + homepage = "https://cgit.kde.org/wacomtablet.git/about/"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.Thra11 ]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/misc/wagyu/default.nix b/pkgs/tools/misc/wagyu/default.nix index f21db2c4b4fc8..8ed952a82cebd 100644 --- a/pkgs/tools/misc/wagyu/default.nix +++ b/pkgs/tools/misc/wagyu/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Rust library for generating cryptocurrency wallets"; - homepage = https://github.com/ArgusHQ/wagyu; + homepage = "https://github.com/ArgusHQ/wagyu"; license = with licenses; [ mit asl20 ]; maintainers = [ maintainers.offline ]; }; diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index eede909ddceb3..1c626785483ca 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Executes commands in response to file modifications"; - homepage = https://github.com/watchexec/watchexec; + homepage = "https://github.com/watchexec/watchexec"; license = with licenses; [ asl20 ]; maintainers = [ maintainers.michalrus ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix index 14617f207dbef..7870974531eee 100644 --- a/pkgs/tools/misc/websocat/default.nix +++ b/pkgs/tools/misc/websocat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, openssl, rustPlatform, Security }: +{ stdenv, fetchFromGitHub, pkgconfig, openssl, rustPlatform, Security, makeWrapper, bash }: rustPlatform.buildRustPackage rec { pname = "websocat"; @@ -14,9 +14,17 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features=ssl" ]; cargoSha256 = "09chj0bgf4r8v5cjq0hvb84zvh98nrzrh1m0wdqjy5gi7zc30cis"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; + # The wrapping is required so that the "sh-c" option of websocat works even + # if sh is not in the PATH (as can happen, for instance, when websocat is + # started as a systemd service). + postInstall = '' + wrapProgram $out/bin/websocat \ + --prefix PATH : ${stdenv.lib.makeBinPath [ bash ]} + ''; + meta = with stdenv.lib; { description = "Command-line client for WebSockets (like netcat/socat)"; homepage = "https://github.com/vi/websocat"; diff --git a/pkgs/tools/misc/wl-clipboard/default.nix b/pkgs/tools/misc/wl-clipboard/default.nix index 349d910dafc35..66a6137855754 100644 --- a/pkgs/tools/misc/wl-clipboard/default.nix +++ b/pkgs/tools/misc/wl-clipboard/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line copy/paste utilities for Wayland"; - homepage = https://github.com/bugaevc/wl-clipboard; + homepage = "https://github.com/bugaevc/wl-clipboard"; license = licenses.gpl3; maintainers = with maintainers; [ dywedir ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index a61434d21020e..991ab62249079 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, makeWrapper -, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, p7zip, utillinux, wget +, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, utillinux, wget , wxGTK30 }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # should be patched with a less useless default PATH, but for now # we add everything we need manually. wrapProgram "$out/bin/woeusb" \ - --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget p7zip ]}' + --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget ]}' ''; doInstallCheck = true; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Create bootable USB disks from Windows ISO images"; - homepage = https://github.com/slacka/WoeUSB; + homepage = "https://github.com/slacka/WoeUSB"; license = licenses.gpl3; maintainers = with maintainers; [ bjornfor gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/woof/default.nix b/pkgs/tools/misc/woof/default.nix index fa3ab747f64f1..e00634dd53e15 100644 --- a/pkgs/tools/misc/woof/default.nix +++ b/pkgs/tools/misc/woof/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.home.unix-ag.org/simon/woof.html; + homepage = "http://www.home.unix-ag.org/simon/woof.html"; description = "Web Offer One File - Command-line utility to easily exchange files over a local network"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix index c621e5ae2c2de..00cfd27d2e89f 100644 --- a/pkgs/tools/misc/wootility/default.nix +++ b/pkgs/tools/misc/wootility/default.nix @@ -23,7 +23,7 @@ appimageTools.wrapType2 rec { extraInstallCommands = "mv $out/bin/{${name},${pname}}"; meta = with lib; { - homepage = https://wooting.io/wootility; + homepage = "https://wooting.io/wootility"; description = "Wootility is customization and management software for Wooting keyboards."; platforms = [ "x86_64-linux" ]; license = "unknown"; diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix index b9a8f70ff71a7..abac98d855f34 100644 --- a/pkgs/tools/misc/wv2/default.nix +++ b/pkgs/tools/misc/wv2/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { description = "Excellent MS Word filter lib, used in most Office suites"; license = stdenv.lib.licenses.lgpl2; - homepage = http://wvware.sourceforge.net; + homepage = "http://wvware.sourceforge.net"; }; } diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix index 6a5ec86722243..e1c4e4fd2fca7 100644 --- a/pkgs/tools/misc/wyrd/default.nix +++ b/pkgs/tools/misc/wyrd/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { flashy GUI dialogs. Rather, Wyrd is designed to make you more efficient at editing your reminder files directly. ''; - homepage = http://pessimization.com/software/wyrd/; - downloadPage = http://pessimization.com/software/wyrd/; + homepage = "http://pessimization.com/software/wyrd/"; + downloadPage = "http://pessimization.com/software/wyrd/"; license = licenses.gpl2; maintainers = [ maintainers.prikhi ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/x11idle/default.nix b/pkgs/tools/misc/x11idle/default.nix index ac13f41ef9f5a..5e64137cbf6ef 100644 --- a/pkgs/tools/misc/x11idle/default.nix +++ b/pkgs/tools/misc/x11idle/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { longDescription = '' Idle time passes when the user does not act, i.e. when the user doesn't move the mouse or use the keyboard. ''; - homepage = https://orgmode.org/; + homepage = "https://orgmode.org/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.swflint ]; diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index 62e2b31fa1534..12acbcfbe1c8d 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libusb, libusb1, autoconf, automake, libconfuse, pkgconfig +{ stdenv, fetchgit, libusb-compat-0_1, libusb1, autoconf, automake, libconfuse, pkgconfig , gccCross ? null }: @@ -10,7 +10,7 @@ stdenv.mkDerivation { inherit version; src = fetchgit { - url = git://projects.qi-hardware.com/xburst-tools.git; + url = "git://projects.qi-hardware.com/xburst-tools.git"; rev = "c71ce8e15db25fe49ce8702917cb17720882e341"; sha256 = "1hzdngs1l5ivvwnxjwzc246am6w1mj1aidcf0awh9yw0crzcjnjr"; }; @@ -30,13 +30,13 @@ stdenv.mkDerivation { dontCrossStrip = true; nativeBuildInputs = [ autoconf automake pkgconfig ]; - buildInputs = [ libusb libusb1 libconfuse ] ++ + buildInputs = [ libusb-compat-0_1 libusb1 libconfuse ] ++ stdenv.lib.optional (gccCross != null) gccCross; meta = { description = "Qi tools to access the Ben Nanonote USB_BOOT mode"; license = stdenv.lib.licenses.gpl3; - homepage = http://www.linux-mtd.infradead.org/; + homepage = "http://www.linux-mtd.infradead.org/"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.x86_64; }; diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index 69009b86af8cb..c1a015d3c09a8 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool to access the X clipboard from a console application"; - homepage = https://github.com/astrand/xclip; + homepage = "https://github.com/astrand/xclip"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index 28268052826cd..3950e6bee28ae 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin rycee ]; platforms = with platforms; linux ++ freebsd; license = licenses.free; #TODO BSD on Gentoo, looks like MIT - downloadPage = http://www.jwz.org/xdaliclock/; + downloadPage = "http://www.jwz.org/xdaliclock/"; }; } diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix index 77a2ef763a974..f9928b6f140fb 100644 --- a/pkgs/tools/misc/xdo/default.nix +++ b/pkgs/tools/misc/xdo/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small X utility to perform elementary actions on windows"; - homepage = https://github.com/baskerville/xdo; + homepage = "https://github.com/baskerville/xdo"; maintainers = with maintainers; [ meisternu ]; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/tools/misc/xdxf2slob/default.nix index b6801130a45d8..00f1899f97afb 100644 --- a/pkgs/tools/misc/xdxf2slob/default.nix +++ b/pkgs/tools/misc/xdxf2slob/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication { meta = with stdenv.lib; { description = "Tool to convert XDXF dictionary files to slob format"; - homepage = https://github.com/itkach/xdxf2slob/; + homepage = "https://github.com/itkach/xdxf2slob/"; license = licenses.gpl3; maintainers = [ maintainers.rycee ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/xflux/default.nix b/pkgs/tools/misc/xflux/default.nix index d0f358446952a..adc3b87ffa72d 100644 --- a/pkgs/tools/misc/xflux/default.nix +++ b/pkgs/tools/misc/xflux/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "xflux-2013-09-01"; src = fetchurl { - url = https://justgetflux.com/linux/xflux64.tgz; + url = "https://justgetflux.com/linux/xflux64.tgz"; sha256 = "cc50158fabaeee58c331f006cc1c08fd2940a126e99d37b76c8e878ef20c2021"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation { when the sun sets, and then changes it back its colder temperature when the sun rises. ''; - homepage = https://justgetflux.com/; + homepage = "https://justgetflux.com/"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.paholg ]; diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index 6a629af61ba28..03a458e818d2f 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { meta = { description = "Better lighting for Linux. Open source GUI for xflux"; - homepage = https://justgetflux.com/linux.html; + homepage = "https://justgetflux.com/linux.html"; license = stdenv.lib.licenses.unfree; # marked as unfree since the source code contains a copy of the unfree xflux binary maintainers = [ stdenv.lib.maintainers.sheenobu ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index 2040599133180..5f6d2bb1278d8 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Torture test suite for filesystems"; - homepage = https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/; + homepage = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/tools/misc/xiccd/default.nix index 43a674069706e..82759441a46b7 100644 --- a/pkgs/tools/misc/xiccd/default.nix +++ b/pkgs/tools/misc/xiccd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "X color profile daemon"; - homepage = https://github.com/agalakhov/xiccd; + homepage = "https://github.com/agalakhov/xiccd"; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/pkgs/tools/misc/xmonad-log/default.nix index ad5086f2f5958..5dfbcdfad7405 100644 --- a/pkgs/tools/misc/xmonad-log/default.nix +++ b/pkgs/tools/misc/xmonad-log/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "xmonad DBus monitoring solution"; - homepage = https://github.com/xintron/xmonad-log; + homepage = "https://github.com/xintron/xmonad-log"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ joko ]; diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index 4c39babc31767..aea86eda9cb7c 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Command-line program for getting and setting the contents of the X selection"; - homepage = http://www.kfish.org/software/xsel; + homepage = "http://www.kfish.org/software/xsel"; license = licenses.mit; maintainers = [ maintainers.cstrahan ]; platforms = lib.platforms.unix; diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/tools/misc/xtitle/default.nix index 84cf506fb6316..2c24e627b6345 100644 --- a/pkgs/tools/misc/xtitle/default.nix +++ b/pkgs/tools/misc/xtitle/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Outputs X window titles"; - homepage = https://github.com/baskerville/xtitle; + homepage = "https://github.com/baskerville/xtitle"; maintainers = [ stdenv.lib.maintainers.meisternu ]; license = "Custom"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index d6adbde5ea9ee..889ab823a9c07 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -4,7 +4,7 @@ let xvfb_run = fetchurl { name = "xvfb-run"; # https://git.archlinux.org/svntogit/packages.git/?h=packages/xorg-server - url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server&id=9cb733cefa92af3fca608fb051d5251160c9bbff; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server&id=9cb733cefa92af3fca608fb051d5251160c9bbff"; sha256 = "1307mz4nr8ga3qz73i8hbcdphky75rq8lrvfk2zm4kmv6pkbk611"; }; in diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index 9fb5399fd7243..6111a0f98708b 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "YANKCMD=${xsel}/bin/xsel" ]; meta = with stdenv.lib; { - homepage = https://github.com/mptre/yank; + homepage = "https://github.com/mptre/yank"; description = "Yank terminal output to clipboard"; longDescription = '' Read input from stdin and display a selection interface that allows a diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index e106c3b8595a6..d337430254648 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Downloads videos from Yle (Finnish Broadcasting Company) servers"; - homepage = https://aajanki.github.io/yle-dl/; + homepage = "https://aajanki.github.io/yle-dl/"; license = licenses.gpl3; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 7b58ccfa85314..4b399abb61e0f 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.03.24"; + version = "2020.05.08"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "05l4asakakxn53wrvxn6c03fd80zdizdbj6r2cj8c1ja3sj9i8s5"; + sha256 = "16zxa8ss2rka7cvkqyi67s8i1h9f4nxx88w9vjbxchbga6w0scc6"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index 39150cfed7e16..07f186e33226e 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-backend=${if withApplePCSC then "macscard" else "pcsc"}" ]; meta = with stdenv.lib; { - homepage = https://developers.yubico.com/yubico-piv-tool/; + homepage = "https://developers.yubico.com/yubico-piv-tool/"; description = '' Used for interacting with the Privilege and Identification Card (PIV) application on a YubiKey diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 7fa0e70cd2ef4..8ebbe75d686a0 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit version; description = "Cross-platform application for configuring any YubiKey over all USB interfaces."; - homepage = https://developers.yubico.com/yubikey-manager-qt/; + homepage = "https://developers.yubico.com/yubikey-manager-qt/"; license = licenses.bsd2; maintainers = [ maintainers.cbley ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index ee55563747427..4740b3ac55f52 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -46,7 +46,7 @@ python3Packages.buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://developers.yubico.com/yubikey-manager; + homepage = "https://developers.yubico.com/yubikey-manager"; description = "Command line tool for configuring any YubiKey over all USB transports."; license = licenses.bsd2; diff --git a/pkgs/tools/misc/yubikey-neo-manager/default.nix b/pkgs/tools/misc/yubikey-neo-manager/default.nix index acc0bac04ff6e..cb37ae249289e 100644 --- a/pkgs/tools/misc/yubikey-neo-manager/default.nix +++ b/pkgs/tools/misc/yubikey-neo-manager/default.nix @@ -19,7 +19,7 @@ python27Packages.buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = https://developers.yubico.com/yubikey-neo-manager; + homepage = "https://developers.yubico.com/yubikey-neo-manager"; description = "Cross platform personalization tool for the YubiKey NEO"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 59685aa721a98..96e7024f7a7af 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://developers.yubico.com/yubikey-personalization-gui; + homepage = "https://developers.yubico.com/yubikey-personalization-gui"; description = "A QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index c20fe68b7b22e..5ef828762f64d 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb, libyubikey, json_c }: +{ stdenv, fetchurl, pkgconfig, libusb1, libyubikey, json_c }: stdenv.mkDerivation rec { pname = "yubikey-personalization"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb libyubikey json_c ]; + buildInputs = [ libusb1 libyubikey json_c ]; configureFlags = [ "--with-backend=libusb-1.0" @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://developers.yubico.com/yubikey-personalization; + homepage = "https://developers.yubico.com/yubikey-personalization"; description = "A library and command line tool to personalize YubiKeys"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index a43d41637b101..ab8633c499046 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.3.1"; + version = "0.4.1"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "1sad18d0pxfdy9gvjmixzgdskg1l7djvzp0aipx7pz0lyi6gs23z"; + sha256 = "1zfk9y5f12h2d5zwf2z8c95xwhbhc6ayv971875fbxgz1nd8vqb6"; }; buildInputs = [ fzf ]; - cargoSha256 = "1sx3s1jnfxylbjr3x6v6j8a6zkl7hfyj4alzlyrsw36b1b64pwqm"; + cargoSha256 = "0z0p3cxxazw19bmk3zw7z2q93p00ywsa2cz1jhy78mn5pq1v95rd"; meta = with lib; { description = "A fast cd command that learns your habits"; diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix index 4b19331f39253..c44837b877d1c 100644 --- a/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/pkgs/tools/misc/zsh-autoenv/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { It handles "enter" and "leave" events, nesting, and stashing of variables (overwriting and restoring). ''; - homepage = https://github.com/Tarrasch/zsh-autoenv; + homepage = "https://github.com/Tarrasch/zsh-autoenv"; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix index be64ff47e6be6..86dd990cd746c 100644 --- a/pkgs/tools/misc/zsh-navigation-tools/default.nix +++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Curses-based tools for ZSH"; - homepage = https://github.com/psprint/zsh-navigation-tools; + homepage = "https://github.com/psprint/zsh-navigation-tools"; license = licenses.gpl3; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; diff --git a/pkgs/tools/networking/ahcpd/default.nix b/pkgs/tools/networking/ahcpd/default.nix index 4b03c3cf27874..0789b37c65a0c 100644 --- a/pkgs/tools/networking/ahcpd/default.nix +++ b/pkgs/tools/networking/ahcpd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/; + homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/"; description = "Autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 networks"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index e1b5f9827272b..fe07d203607af 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wireless encryption cracking tools"; - homepage = http://www.aircrack-ng.org/; + homepage = "http://www.aircrack-ng.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix index a31bc57904d50..d08996eb13f65 100644 --- a/pkgs/tools/networking/airfield/default.nix +++ b/pkgs/tools/networking/airfield/default.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A web-interface for hipache-proxy"; license = licenses.mit; - homepage = https://github.com/emblica/airfield; + homepage = "https://github.com/emblica/airfield"; maintainers = with maintainers; [ offline ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/airfield/node-packages.nix b/pkgs/tools/networking/airfield/node-packages.nix index fe93f449b0377..9a246fa319be4 100644 --- a/pkgs/tools/networking/airfield/node-packages.nix +++ b/pkgs/tools/networking/airfield/node-packages.nix @@ -694,7 +694,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Template engine consolidation library"; - homepage = https://github.com/visionmedia/consolidate.js; + homepage = "https://github.com/visionmedia/consolidate.js"; }; production = true; bypassCache = true; @@ -717,7 +717,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A high performance Redis client."; - homepage = https://github.com/NodeRedis/node-redis; + homepage = "https://github.com/NodeRedis/node-redis"; license = "MIT"; }; production = true; @@ -753,7 +753,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Higher-order functions and common patterns for asynchronous code"; - homepage = https://caolan.github.io/async/; + homepage = "https://caolan.github.io/async/"; license = "MIT"; }; production = true; @@ -826,4 +826,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 93b2aba5dbfc3..ebe67b27e7c75 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -1,33 +1,30 @@ { buildGoModule , fetchFromGitHub -, stdenv -, Security +, lib }: buildGoModule rec { pname = "amass"; - version = "3.5.4"; + version = "3.6.2"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "0sxcyrlgqajmlsicr4j2b8hq2fzw8ai1xsq176bz0f33q9m9wvhf"; + sha256 = "1ih681790sp0lqfbsl153dpr5vzxp1jjza28pajrqjzs7zyjmkgs"; }; - modSha256 = "1yjvwkm2zaf017lai5xl088x1z1ifwsbw56dagyf8z9jk9lhkcj7"; + vendorSha256 = "1f8za3z5pv1pznbd91fk5j4y8qg93qk5zvnchjl7inyirciawdf6"; outputs = [ "out" "wordlists" ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - postInstall = '' mkdir -p $wordlists cp -R $src/examples/wordlists/*.txt $wordlists gzip $wordlists/*.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "In-Depth DNS Enumeration and Network Mapping"; longDescription = '' The OWASP Amass tool suite obtains subdomain names by scraping data diff --git a/pkgs/tools/networking/argus-clients/default.nix b/pkgs/tools/networking/argus-clients/default.nix index 08db7b4f58d83..a1ff30faff3fe 100644 --- a/pkgs/tools/networking/argus-clients/default.nix +++ b/pkgs/tools/networking/argus-clients/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { Operations, Performance and Security Management. If you need to know what is going on in your network, right now or historically, you will find Argus a useful tool. ''; - homepage = http://qosient.com/argus; + homepage = "http://qosient.com/argus"; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix index bb9abccc933a6..32c6c785fa5de 100644 --- a/pkgs/tools/networking/argus/default.nix +++ b/pkgs/tools/networking/argus/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { Operations, Performance and Security Management. If you need to know what is going on in your network, right now or historically, you will find Argus a useful tool. ''; - homepage = http://qosient.com/argus; + homepage = "http://qosient.com/argus"; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 0b4d77881b4db..5ede0db598c94 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -20,7 +20,12 @@ stdenv.mkDerivation rec { buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++ stdenv.lib.optional stdenv.isDarwin Security; - configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ]; + outputs = [ "bin" "dev" "out" "doc" "man" ]; + + configureFlags = [ + "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" + "--enable-libaria2" + ]; prePatch = '' patchShebangs doc/manual-src/en/mkapiref.py @@ -32,7 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://aria2.github.io; + homepage = "https://aria2.github.io"; description = "A lightweight, multi-protocol, multi-source, command-line download utility"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/tools/networking/arpoison/default.nix b/pkgs/tools/networking/arpoison/default.nix index cedd8597870ba..eac2f380d15b2 100644 --- a/pkgs/tools/networking/arpoison/default.nix +++ b/pkgs/tools/networking/arpoison/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "UNIX arp cache update utility"; - homepage = http://www.arpoison.net/; + homepage = "http://www.arpoison.net/"; license = with licenses; [ gpl2 ]; maintainers = [ maintainers.michalrus ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index bfb1abaeaf234..7b796a52e3aa1 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -10,7 +10,7 @@ buildGoPackage rec { nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram "$bin/bin/assh" \ + wrapProgram "$out/bin/assh" \ --prefix PATH : ${openssh}/bin ''; @@ -23,7 +23,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Advanced SSH config - Regex, aliases, gateways, includes and dynamic hosts"; - homepage = https://github.com/moul/advanced-ssh-config; + homepage = "https://github.com/moul/advanced-ssh-config"; license = licenses.mit; maintainers = with maintainers; [ zzamboni ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/tools/networking/asynk/default.nix b/pkgs/tools/networking/asynk/default.nix index 4d069a7e6d7d7..b37f21335016d 100644 --- a/pkgs/tools/networking/asynk/default.nix +++ b/pkgs/tools/networking/asynk/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://asynk.io/; + homepage = "http://asynk.io/"; description = "Flexible contacts synchronization program"; license = licenses.agpl3; maintainers = [ ]; diff --git a/pkgs/tools/networking/atinout/default.nix b/pkgs/tools/networking/atinout/default.nix index 16b3ee668da62..fcd48564da0f5 100644 --- a/pkgs/tools/networking/atinout/default.nix +++ b/pkgs/tools/networking/atinout/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://atinout.sourceforge.net; + homepage = "http://atinout.sourceforge.net"; description = "Tool for talking to modems"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix index 55b464607b11d..f89302c4295fa 100644 --- a/pkgs/tools/networking/autossh/default.nix +++ b/pkgs/tools/networking/autossh/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.harding.motd.ca/autossh/; + homepage = "https://www.harding.motd.ca/autossh/"; description = "Automatically restart SSH sessions and tunnels"; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 5fccd9c0ebcb6..debd918eb39d1 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "babeld"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${pname}-${version}.tar.gz"; - sha256 = "1d503igqv9s5pgrhvxp1czjy2xfsjhagyyh2iny7g4cjvl0kq6qy"; + sha256 = "01vzhrspnm4sy9ggaz9n3bfl5hy3qlynr218j3mdcddzm3h00kqm"; }; preBuild = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { passthru.tests.babeld = nixosTests.babeld; meta = { - homepage = http://www.pps.univ-paris-diderot.fr/~jch/software/babel/; + homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/babel/"; description = "Loop-avoiding distance-vector routing protocol"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ fpletz ]; diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 7522b1629cc41..5f7c862371265 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bandwhich"; - version = "0.13.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; rev = version; - sha256 = "0xcn65j2q2pmbvrd5dkjg8anw1r12vizazr1wz4cinhrpsxx8p1p"; + sha256 = "09qr8s136ilqa9r5yjys2mnyyprhancn5n4maqmlfbjrz590g6nb"; }; - cargoSha256 = "16nkmmkla3dlz40qhy04sknm3p2f5qik0ijczcw5ibg5w1jsydfr"; + cargoSha256 = "0awm79gbip3p2k3qr08n0p9lmmbnibnhvz06qzcj27gvmdxs8xvz"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/bgpdump/default.nix b/pkgs/tools/networking/bgpdump/default.nix index 3c84de29bf1fb..a6f66ea10fc50 100644 --- a/pkgs/tools/networking/bgpdump/default.nix +++ b/pkgs/tools/networking/bgpdump/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib bzip2 ]; meta = { - homepage = https://bitbucket.org/ripencc/bgpdump/; + homepage = "https://bitbucket.org/ripencc/bgpdump/"; description = ''Analyze dump files produced by Zebra/Quagga or MRT''; license = stdenv.lib.licenses.hpnd; maintainers = with stdenv.lib.maintainers; [ lewo ]; diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix index 244d635436681..7c322638712c3 100644 --- a/pkgs/tools/networking/boringtun/default.nix +++ b/pkgs/tools/networking/boringtun/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Userspace WireGuard® implementation in Rust"; - homepage = https://github.com/cloudflare/boringtun; + homepage = "https://github.com/cloudflare/boringtun"; license = licenses.bsd3; maintainers = with maintainers; [ xrelkd marsam ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index 48da63ae8559f..b70eb080a7af5 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/txthinking/brook; + homepage = "https://github.com/txthinking/brook"; description = "A cross-platform Proxy/VPN software"; license = with licenses; [ gpl3 ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix index 2c97e1a17dc0f..944fccb0ec526 100644 --- a/pkgs/tools/networking/bukubrow/default.nix +++ b/pkgs/tools/networking/bukubrow/default.nix @@ -40,7 +40,7 @@ in rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Bukubrow is a WebExtension for Buku, a command-line bookmark manager"; - homepage = https://github.com/SamHH/bukubrow-host; + homepage = "https://github.com/SamHH/bukubrow-host"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ infinisil ]; diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix index 46bac3d5b5b28..c9512392347ed 100644 --- a/pkgs/tools/networking/bully/default.nix +++ b/pkgs/tools/networking/bully/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point"; - homepage = https://github.com/aanarchyy/bully; + homepage = "https://github.com/aanarchyy/bully"; maintainers = with maintainers; [ edwtjo ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index ebb46dfed7e14..e8caddcbe29ae 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation { initial mapping and analysis of an application's attack surface, through to finding and exploiting security vulnerabilities. ''; - homepage = https://portswigger.net/burp/; + homepage = "https://portswigger.net/burp/"; downloadPage = "https://portswigger.net/burp/freedownload"; license = [ stdenv.lib.licenses.unfree ]; platforms = jre.meta.platforms; diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index 8e766cdeeb5c1..ae3edf7dcea79 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small and simple console-based live network and disk io bandwidth monitor"; - homepage = http://www.gropp.org/?id=projects&sub=bwm-ng; + homepage = "http://www.gropp.org/?id=projects&sub=bwm-ng"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix index 95012208129a5..46ebb234fb180 100644 --- a/pkgs/tools/networking/cadaver/default.nix +++ b/pkgs/tools/networking/cadaver/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://projects.archlinux.org/svntogit/community.git/plain/trunk/disable-sslv2.patch?h=packages/cadaver; + url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk/disable-sslv2.patch?h=packages/cadaver"; name = "disable-sslv2.patch"; sha256 = "1qx65hv584wdarks51yhd3y38g54affkphm5wz27xiz4nhmbssrr"; }) @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command-line WebDAV client"; - homepage = http://www.webdav.org/cadaver; + homepage = "http://www.webdav.org/cadaver"; maintainers = with maintainers; [ ianwookim ]; license = licenses.gpl2; platforms = with platforms; linux ++ freebsd ++ openbsd; diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix index 08014ed122697..c28048a56c076 100644 --- a/pkgs/tools/networking/carddav-util/default.nix +++ b/pkgs/tools/networking/carddav-util/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "carddav-0.1-2014-02-26"; src = fetchgit { - url = git://github.com/ljanyst/carddav-util; + url = "git://github.com/ljanyst/carddav-util"; rev = "53b181faff5f154bcd180467dd04c0ce69405564"; sha256 = "0f0raffdy032wlnxfck6ky60r163nhqfbr311y4ry55l60s4497n"; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/ljanyst/carddav-util; + homepage = "https://github.com/ljanyst/carddav-util"; description = "A CardDAV import/export utility"; platforms = platforms.unix; license = licenses.isc; diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index 6156f43b04b8d..be1df3394396f 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0p5vcs25h5nj36dm9yjmdjymcq0zldm3zlqfppxcjx862h48k8zj"; }; - modSha256 = "1iylnnmj5slji89pkb3shp4xqar1zbpl7bzwddbzpp8y52fmsv1c"; + vendorSha256 = "1m5jaqf5jrib415k0i7w6rf5bjjwfn572wk94jwfpwjcbbvh8fck"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = with maintainers; [ hugoreeves ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index 2c78b20138aa6..48d675ea09b33 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-server" ]; meta = with stdenv.lib; { - homepage = https://github.com/haiwen/ccnet; + homepage = "https://github.com/haiwen/ccnet"; description = "A framework for writing networked applications in C"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 2ec16aa430a34..0a8ae10eb1347 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sets your computer's clock from time servers on the Net"; - homepage = https://chrony.tuxfamily.org/; - repositories.git = git://git.tuxfamily.org/gitroot/chrony/chrony.git; + homepage = "https://chrony.tuxfamily.org/"; + repositories.git = "git://git.tuxfamily.org/gitroot/chrony/chrony.git"; license = licenses.gpl2; platforms = with platforms; linux ++ freebsd ++ openbsd; maintainers = with maintainers; [ fpletz thoughtpolice ]; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 7dce5dc10443a..9a74344d29365 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: +{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux, nixosTests }: -let version = "20.5"; in +let version = "20.6"; in stdenv.mkDerivation { name = "cjdns-"+version; @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "cjdelisle"; repo = "cjdns"; rev = "cjdns-v${version}"; - sha256 = "13f174bmbyqna899naja4fzpma3yaw815ylksk8klcc3glg07v7b"; + sha256 = "1d5rrnqb5dcmm5cg2ky1cgxz6ncb23n1j797j9zzw6xxdvkf3kgi"; }; buildInputs = [ which python27 nodejs ] ++ @@ -29,8 +29,10 @@ stdenv.mkDerivation { cp -R contrib tools node_build node_modules $out/share/cjdns/ ''; + passthru.tests.basic = nixosTests.cjdns; + meta = with stdenv.lib; { - homepage = https://github.com/cjdelisle/cjdns; + homepage = "https://github.com/cjdelisle/cjdns"; description = "Encrypted networking for regular people"; license = licenses.gpl3; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix index 3098b091dc647..c777f487b3d41 100644 --- a/pkgs/tools/networking/cksfv/default.nix +++ b/pkgs/tools/networking/cksfv/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://zakalwe.fi/~shd/foss/cksfv/; + homepage = "http://zakalwe.fi/~shd/foss/cksfv/"; description = "A tool for verifying files against a SFV checksum file"; platforms = platforms.all; license = licenses.gpl2; diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 12bfad0c8dfaf..af21e9d4fef59 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "clash"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "08zwrnpiihlir83fryani8pr972lmj1sjvhjc5pzlw1hks88i9m2"; + sha256 = "1nb4hl9x2lj0hy8byz14c2xn6yhrb6pqmhzl002k83qd3zrc6s3p"; }; goPackagePath = "github.com/Dreamacro/clash"; - modSha256 = "05i8mzhxzkgcmaa4gazfl8pq3n8mc4prww0ghl6m28cy7a0vsh7f"; + vendorSha256 = "0nh3cn31p7yhnhjzqp84dnhzy3hag253bjp70w8q03lw7mkhdgz3"; buildFlagsArray = [ "-ldflags=" @@ -26,4 +26,4 @@ buildGoModule rec { maintainers = with maintainers; [ contrun filalex77 ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index dcda354e4b425..aa61d42d3d004 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { meta = { description = "QT GUI for Connman with system tray icon"; - homepage = https://github.com/andrew-bibb/cmst; + homepage = "https://github.com/andrew-bibb/cmst"; maintainers = [ lib.maintainers.matejc ]; platforms = lib.platforms.linux; license = lib.licenses.mit; diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix index 9b8a1f0e7904e..d05d8e48dc0f1 100644 --- a/pkgs/tools/networking/cntlm/default.nix +++ b/pkgs/tools/networking/cntlm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "NTLM/NTLMv2 authenticating HTTP proxy"; - homepage = http://cntlm.sourceforge.net/; + homepage = "http://cntlm.sourceforge.net/"; license = licenses.gpl2; maintainers = [ diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index 17923081dfdfc..2fbd8ddf4a369 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { This proxy traversal tool is intended to assist OpenSSH (via ProxyCommand in ~/.ssh/config) and GIT (via $GIT_PROXY_COMMAND) utilize SOCKS and https proxies. ''; - homepage = https://bitbucket.org/gotoh/connect/wiki/Home; + homepage = "https://bitbucket.org/gotoh/connect/wiki/Home"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ jcumming ]; diff --git a/pkgs/tools/networking/connman/connman-gtk/default.nix b/pkgs/tools/networking/connman/connman-gtk/default.nix index a3c774a62b11f..5de63098185c2 100644 --- a/pkgs/tools/networking/connman/connman-gtk/default.nix +++ b/pkgs/tools/networking/connman/connman-gtk/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GTK GUI for Connman"; - homepage = https://github.com/jgke/connman-gtk; + homepage = "https://github.com/jgke/connman-gtk"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/tools/networking/connman/connman-ncurses/default.nix b/pkgs/tools/networking/connman/connman-ncurses/default.nix index 140105c247549..7bfb4571e107b 100644 --- a/pkgs/tools/networking/connman/connman-ncurses/default.nix +++ b/pkgs/tools/networking/connman/connman-ncurses/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple ncurses UI for connman"; - homepage = https://github.com/eurogiciel-oss/connman-json-client; + homepage = "https://github.com/eurogiciel-oss/connman-json-client"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/tools/networking/connman/connman-notify/default.nix b/pkgs/tools/networking/connman/connman-notify/default.nix index d17729c691d34..df72a9474899e 100644 --- a/pkgs/tools/networking/connman/connman-notify/default.nix +++ b/pkgs/tools/networking/connman/connman-notify/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication { meta = with stdenv.lib; { description = "Desktop notification integration for connman"; - homepage = https://gitlab.com/wavexx/connman-notify; + homepage = "https://gitlab.com/wavexx/connman-notify"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/tools/networking/connman/connman_dmenu/default.nix b/pkgs/tools/networking/connman/connman_dmenu/default.nix index 7096b9b758614..8bc1b47e19815 100644 --- a/pkgs/tools/networking/connman/connman_dmenu/default.nix +++ b/pkgs/tools/networking/connman/connman_dmenu/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "A dmenu wrapper for connmann"; - homepage = https://github.com/march-linux/connman_dmenu; + homepage = "https://github.com/march-linux/connman_dmenu"; license = stdenv.lib.licenses.free; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/networking/connman/connmanui/default.nix b/pkgs/tools/networking/connman/connmanui/default.nix index 17e8551fdda0d..51c97e6cb7ecb 100644 --- a/pkgs/tools/networking/connman/connmanui/default.nix +++ b/pkgs/tools/networking/connman/connmanui/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A full-featured GTK based trayicon UI for ConnMan"; - homepage = https://github.com/tbursztyka/connman-ui; + homepage = "https://github.com/tbursztyka/connman-ui"; maintainers = [ stdenv.lib.maintainers.matejc ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 96798c1c17e96..a4eb50d0c7736 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "corerad"; - version = "0.2.2"; + version = "0.2.5"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "0nxrksv98mxs5spykhzpydwjzii5cc6gk8az7irs3fdi4jx6pq1w"; + sha256 = "0fi9wgv5aj3ds3r5qjyi4pxnd56psrpdy2sz84jd0sz2w48x4k4p"; }; - modSha256 = "0vbbpndqwwz1mc59j7liaayxaj53cs8s3javgj3pvhkn4vp65p7c"; + vendorSha256 = "11r3vpimhik7y09gwb3p6pl0yf53hpaw24ry4a833fw8060rqp3q"; buildFlagsArray = '' -ldflags= - -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1583280117 + -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1590182656 -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} ''; diff --git a/pkgs/tools/networking/corkscrew/default.nix b/pkgs/tools/networking/corkscrew/default.nix index 9394b123bbe6f..9cfe65873acdc 100644 --- a/pkgs/tools/networking/corkscrew/default.nix +++ b/pkgs/tools/networking/corkscrew/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://agroman.net/corkscrew/; + homepage = "http://agroman.net/corkscrew/"; description = "A tool for tunneling SSH through HTTP proxies"; license = stdenv.lib.licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index b4a74b620035c..8fe208c98bcaa 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,21 +2,22 @@ buildGoModule rec { pname = "croc"; - version = "8.0.7"; + version = "8.0.11"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "06iwb2wm9wwcwl88rqhwbrky2ab0kbcyzmcv89vw533glknycw04"; + sha256 = "09yx7xjhvpyvzwsf859b9yfrxzg01ak3dfavfhmx3h97lrdxprgi"; }; - modSha256 = "1gjigbc9511h3qd12j9ypdnmb5ia4x9f2mk7mxasy9p2xkcfyhpg"; + vendorSha256 = "1lqlrsd90475b1wp1krfppi635q5gw1ka8x4d8haanmnlnxkniqf"; subPackages = [ "." ]; meta = with stdenv.lib; { - description = "Easily and securely send things from one computer to another"; + description = + "Easily and securely send things from one computer to another"; homepage = "https://github.com/schollz/croc"; license = licenses.mit; maintainers = with maintainers; [ hugoreeves equirosa ]; diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix index e6f2dec30e6a4..b25e5dcab0b76 100644 --- a/pkgs/tools/networking/curl-unix-socket/default.nix +++ b/pkgs/tools/networking/curl-unix-socket/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Run HTTP requests over UNIX socket"; license = licenses.mit; - homepage = https://github.com/Soulou/curl-unix-socket; + homepage = "https://github.com/Soulou/curl-unix-socket"; maintainers = with maintainers; [offline]; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index a732ddcb89ea6..ba54b2c5671c1 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -28,14 +28,14 @@ assert brotliSupport -> brotli != null; assert gssSupport -> libkrb5 != null; stdenv.mkDerivation rec { - name = "curl-7.68.0"; + name = "curl-7.69.1"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${name}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2" ]; - sha256 = "1fgf4f33wj25jk6lkpxmrvmfnnxvc66z3k3561rxr8nngn8m8zr0"; + sha256 = "1s2ddjjif1wkp69vx25nzxklhimgqzaazfzliyl6mpvsa2yybx9g"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command line tool for transferring files with URL syntax"; - homepage = https://curl.haxx.se/; + homepage = "https://curl.haxx.se/"; maintainers = with maintainers; [ lovek323 ]; license = licenses.curl; platforms = platforms.all; diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix index fa1471aa62033..cb1cf8d97faf7 100644 --- a/pkgs/tools/networking/curlie/default.nix +++ b/pkgs/tools/networking/curlie/default.nix @@ -11,12 +11,12 @@ buildGoModule rec { sha256 = "09v8alrbw6qva3q3bcqxnyjm7svagfxqvhdff7cqf5pbmkxnhln9"; }; - modSha256 = "18nwq99vv3nbdwfilfn8v64mn58jviwybi93li0lcg7779nxab3d"; + vendorSha256 = "1mxgf004czf65a2mv99gfp27g98xhllmfcz4ynfv66nfkbfz6a8n"; meta = with lib; { description = "Curlie is a frontend to curl that adds the ease of use of httpie, without compromising on features and performance"; - homepage = https://curlie.io/; + homepage = "https://curlie.io/"; maintainers = with maintainers; [ ma27 ]; license = licenses.mit; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/cutter/default.nix b/pkgs/tools/networking/cutter/default.nix index 28eab7f495aa7..2430e75430b09 100644 --- a/pkgs/tools/networking/cutter/default.nix +++ b/pkgs/tools/networking/cutter/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "TCP/IP Connection cutting on Linux Firewalls and Routers"; - homepage = http://www.digitage.co.uk/digitage/software/linux-security/cutter; + homepage = "http://www.digitage.co.uk/digitage/software/linux-security/cutter"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.offline ]; diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/tools/networking/darkstat/default.nix index 6509c9c310604..af15e70aa86cb 100644 --- a/pkgs/tools/networking/darkstat/default.nix +++ b/pkgs/tools/networking/darkstat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { - Small. Portable. Single-threaded. Efficient. - Supports IPv6. ''; - homepage = http://unix4lyfe.org/darkstat; + homepage = "http://unix4lyfe.org/darkstat"; license = licenses.gpl2; platforms = with platforms; unix; }; diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 9faad37752090..797791e1c0b90 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, cmake, pkgconfig, openssl, libxml2, boost, python3, libuuid }: stdenv.mkDerivation rec { - version = "0.7.5"; + version = "0.7.6"; pname = "davix"; nativeBuildInputs = [ cmake pkgconfig python3 ]; buildInputs = [ openssl libxml2 boost libuuid ]; - # using the url below since the 0.7.5 release did carry a broken CMake file, + # using the url below since the 0.7.6 release did carry a broken CMake file, # supposedly fixed in the next release # https://github.com/cern-fts/davix/issues/40 src = fetchurl { url = "http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/${version}/davix-${version}.tar.gz"; - sha256 = "1j3gzsjhzrsk6irxalc3rwgp9cqb52chriadmy1mv1s6d2bwl86r"; + sha256 = "0wq66spnr616cns72f9dvr2xfvkdvfqqmc6d7dx29fpp57zzvrx2"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { Davix provides an API and a set of command line tools"; license = licenses.lgpl2Plus; - homepage = http://dmc.web.cern.ch/projects/davix/home; + homepage = "http://dmc.web.cern.ch/projects/davix/home"; maintainers = [ maintainers.adev ]; platforms = platforms.all; }; diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix index 98902e9809b98..dd206eb8c975b 100644 --- a/pkgs/tools/networking/dd-agent/5.nix +++ b/pkgs/tools/networking/dd-agent/5.nix @@ -104,7 +104,7 @@ in stdenv.mkDerivation rec { Event collector for the DataDog analysis service -- v5 Python implementation ''; - homepage = https://www.datadoghq.com; + homepage = "https://www.datadoghq.com"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ thoughtpolice domenkozar ]; diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 2253daa2d1158..dc29a95d92b0a 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -47,8 +47,8 @@ in buildGoPackage rec { # DataDog use paths relative to the agent binary, so fix these. postPatch = '' - sed -e "s|PyChecksPath =.*|PyChecksPath = \"$bin/${python.sitePackages}\"|" \ - -e "s|distPath =.*|distPath = \"$bin/share/datadog-agent\"|" \ + sed -e "s|PyChecksPath =.*|PyChecksPath = \"$out/${python.sitePackages}\"|" \ + -e "s|distPath =.*|distPath = \"$out/share/datadog-agent\"|" \ -i cmd/agent/common/common_nix.go sed -e "s|/bin/hostname|${lib.getBin hostname}/bin/hostname|" \ -i pkg/util/hostname_nix.go @@ -57,14 +57,14 @@ in buildGoPackage rec { # Install the config files and python modules from the "dist" dir # into standard paths. postInstall = '' - mkdir -p $bin/${python.sitePackages} $bin/share/datadog-agent - cp -R $src/cmd/agent/dist/conf.d $bin/share/datadog-agent - cp -R $src/cmd/agent/dist/{checks,utils,config.py} $bin/${python.sitePackages} + mkdir -p $out/${python.sitePackages} $out/share/datadog-agent + cp -R $src/cmd/agent/dist/conf.d $out/share/datadog-agent + cp -R $src/cmd/agent/dist/{checks,utils,config.py} $out/${python.sitePackages} - cp -R $src/pkg/status/dist/templates $bin/share/datadog-agent + cp -R $src/pkg/status/dist/templates $out/share/datadog-agent - wrapProgram "$bin/bin/agent" \ - --set PYTHONPATH "$bin/${python.sitePackages}" \ + wrapProgram "$out/bin/agent" \ + --set PYTHONPATH "$out/${python.sitePackages}" \ --prefix LD_LIBRARY_PATH : ${systemd.lib}/lib ''; @@ -73,7 +73,7 @@ in buildGoPackage rec { Event collector for the DataDog analysis service -- v6 new golang implementation. ''; - homepage = https://www.datadoghq.com; + homepage = "https://www.datadoghq.com"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice domenkozar rvl ]; diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix index 280619a5eca65..8f1294eb751a2 100644 --- a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Live process collector for the DataDog Agent v6"; - homepage = https://www.datadoghq.com; + homepage = "https://www.datadoghq.com"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ domenkozar rvl ]; diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 6efba72b1dcf7..375898913c8b6 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -38,7 +38,7 @@ perlPackages.buildPerlPackage rec { meta = with stdenv.lib; { description = "Client for updating dynamic DNS service entries"; - homepage = https://sourceforge.net/p/ddclient/wiki/Home/; + homepage = "https://sourceforge.net/p/ddclient/wiki/Home/"; license = licenses.gpl2Plus; # Mostly since `iproute` is Linux only. platforms = platforms.linux; diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index c45d017e3f5f8..1a16645cc9b6e 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; - homepage = https://roy.marples.name/projects/dhcpcd; + homepage = "https://roy.marples.name/projects/dhcpcd"; platforms = platforms.linux; license = licenses.bsd2; maintainers = with maintainers; [ eelco fpletz ]; diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix index a7cc90c2b33ae..f68d68382ddb2 100644 --- a/pkgs/tools/networking/dhcpdump/default.nix +++ b/pkgs/tools/networking/dhcpdump/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses"; - homepage = http://www.mavetju.org/unix/dhcpdump-man.php; + homepage = "http://www.mavetju.org/unix/dhcpdump-man.php"; platforms = platforms.linux; license = licenses.bsd2; }; diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/tools/networking/dhcping/default.nix index a6cb05b3865bc..36f81555495af 100644 --- a/pkgs/tools/networking/dhcping/default.nix +++ b/pkgs/tools/networking/dhcping/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { privileges are dropped as soon as the program has bound itself to that port. ''; - homepage = http://www.mavetju.org/unix/general.php; + homepage = "http://www.mavetju.org/unix/general.php"; license = licenses.bsd2; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/dibbler/default.nix b/pkgs/tools/networking/dibbler/default.nix index 43c9455712db0..1849890d23c2d 100644 --- a/pkgs/tools/networking/dibbler/default.nix +++ b/pkgs/tools/networking/dibbler/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Portable DHCPv6 implementation"; - homepage = http://www.klub.com.pl/dhcpv6/; + homepage = "http://www.klub.com.pl/dhcpv6/"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/tools/networking/dirb/default.nix b/pkgs/tools/networking/dirb/default.nix index fe845f3cae87f..1f9516ccaccd8 100644 --- a/pkgs/tools/networking/dirb/default.nix +++ b/pkgs/tools/networking/dirb/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { meta = { description = "A web content scanner"; - homepage = http://dirb.sourceforge.net/; + homepage = "http://dirb.sourceforge.net/"; maintainers = with stdenv.lib.maintainers; [ bennofs ]; license = with stdenv.lib.licenses; [ gpl2 ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/djbdns/default.nix b/pkgs/tools/networking/djbdns/default.nix index 974f8a1f346a3..ca622a6244fcb 100644 --- a/pkgs/tools/networking/djbdns/default.nix +++ b/pkgs/tools/networking/djbdns/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A collection of Domain Name System tools"; longDescription = "Includes software for all the fundamental DNS operations: DNS cache: finding addresses of Internet hosts; DNS server: publishing addresses of Internet hosts; and DNS client: talking to a DNS cache."; - homepage = https://cr.yp.to/djbdns.html; + homepage = "https://cr.yp.to/djbdns.html"; license = licenses.publicDomain; maintainers = with maintainers; [ jerith666 ]; }; diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix index b82f1e7bb4bb6..7f16d9478f3fc 100644 --- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { description = "A tool that provides secure DNS resolution"; license = licenses.isc; - homepage = https://dnscrypt.info/; + homepage = "https://dnscrypt.info/"; maintainers = with maintainers; [ atemu waynr ]; platforms = with platforms; unix; }; diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix index 94d52b953d491..5c44734665c9f 100644 --- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix +++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for adding dnscrypt support to any name resolver"; - homepage = https://dnscrypt.info/; + homepage = "https://dnscrypt.info/"; license = licenses.isc; maintainers = with maintainers; [ tstrobel joachifm ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 2a6b776c14d50..055f92141b29b 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -12,21 +12,13 @@ let ]); in stdenv.mkDerivation rec { - name = "dnsmasq-2.80"; + name = "dnsmasq-2.81"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; - sha256 = "1fv3g8vikj3sn37x1j6qsywn09w1jipvlv34j3q5qrljbrwa5ayd"; + sha256 = "1yzq6anwgr5rlnwydpszb51cyhp2vjq29b24ck19flbwac1sk73l"; }; - patches = [ - # Fix build with nettle 3.5 - (fetchpatch { - name = "nettle-3.5.patch"; - url = "thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=ab73a746a0d6fcac2e682c5548eeb87fb9c9c82e"; - sha256 = "1hnixij3jp1p6zc3bx2dr92yyf9jp1ahhl9hiiq7bkbhbrw6mbic"; - }) - ]; postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' sed '1i#include <linux/sockios.h>' -i src/dhcp.c ''; @@ -79,7 +71,7 @@ stdenv.mkDerivation rec { meta = { description = "An integrated DNS, DHCP and TFTP server for small networks"; - homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html; + homepage = "http://www.thekelleys.org.uk/dnsmasq/doc.html"; license = licenses.gpl2; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ eelco fpletz globin ]; diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 6f57e98123972..b868f075b9b59 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.24.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "1jwy2qi99ks6zcas6h1n0zq3b0k47036ayas0mprdips60azw0hg"; + sha256 = "1pa4skrhdcblqs8r1kik5g8h9p6pcin5pd7b1dh7xk2n86xs8j22"; }; - modSha256 = "0kba3jay6m9ir1pc7i833p7ylbs610g0lkp8kc3gm47xnxy7j4gz"; + vendorSha256 = null; meta = with stdenv.lib; { description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support"; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ contrun ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix index 207078773b264..705888568d9b8 100644 --- a/pkgs/tools/networking/dnstop/default.nix +++ b/pkgs/tools/networking/dnstop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "libpcap application that displays DNS traffic on your network"; - homepage = http://dns.measurement-factory.com/tools/dnstop; + homepage = "http://dns.measurement-factory.com/tools/dnstop"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix index 5261fdb18960b..7109a29454369 100644 --- a/pkgs/tools/networking/dnstracer/default.nix +++ b/pkgs/tools/networking/dnstracer/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Dnstracer determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data."; - homepage = http://www.mavetju.org/unix/general.php; + homepage = "http://www.mavetju.org/unix/general.php"; license = licenses.bsd2; maintainers = with maintainers; [ andir ]; platforms = platforms.all; diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix index a0f5b5b08420c..4410191037169 100644 --- a/pkgs/tools/networking/driftnet/default.nix +++ b/pkgs/tools/networking/driftnet/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Driftnet watches network traffic, and picks out and displays JPEG and GIF images for display"; - homepage = https://github.com/deiv/driftnet; + homepage = "https://github.com/deiv/driftnet"; maintainers = with maintainers; [ offline ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix new file mode 100644 index 0000000000000..572dc0d838483 --- /dev/null +++ b/pkgs/tools/networking/drill/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "drill"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "fcsonline"; + repo = pname; + rev = version; + sha256 = "0pcc91nk68z7hlhj7xvh6v3rybxpy6bzv3pzjcyaq7l0szjljrpw"; + }; + + cargoSha256 = "1611w8b60d3x16ik8v96za0mkr5p0f9gdpz0awprfgj6c3r6s16m"; + + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = [ ] + ++ stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { + description = "HTTP load testing application inspired by Ansible syntax"; + homepage = "https://github.com/fcsonline/drill"; + license = licenses.gpl3; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index c51f0a4fdf02d..20d2545e50827 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] ++ lib.optionals enableStatic [ glibc.static zlib.static ]; meta = with stdenv.lib; { - homepage = http://matt.ucc.asn.au/dropbear/dropbear.html; + homepage = "http://matt.ucc.asn.au/dropbear/dropbear.html"; description = "A small footprint implementation of the SSH 2 protocol"; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/tools/networking/dsniff/default.nix index 256e59628aa22..4fe381cdd7a78 100644 --- a/pkgs/tools/networking/dsniff/default.nix +++ b/pkgs/tools/networking/dsniff/default.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation { longDescription = '' dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor a network for interesting data (passwords, e-mail, files, etc.). arpspoof, dnsspoof, and macof facilitate the interception of network traffic normally unavailable to an attacker (e.g, due to layer-2 switching). sshmitm and webmitm implement active monkey-in-the-middle attacks against redirected SSH and HTTPS sessions by exploiting weak bindings in ad-hoc PKI. ''; - homepage = https://www.monkey.org/~dugsong/dsniff/; + homepage = "https://www.monkey.org/~dugsong/dsniff/"; license = licenses.bsd3; maintainers = [ maintainers.symphorien ]; # bsd and solaris should work as well diff --git a/pkgs/tools/networking/easyrsa/2.x.nix b/pkgs/tools/networking/easyrsa/2.x.nix index 9d6a1712e6736..fef2648de7fb9 100644 --- a/pkgs/tools/networking/easyrsa/2.x.nix +++ b/pkgs/tools/networking/easyrsa/2.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple shell based CA utility"; - homepage = https://openvpn.net/; + homepage = "https://openvpn.net/"; license = licenses.gpl2; maintainers = [ maintainers.offline ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index 4d374cece3d74..90e05e5310bd4 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple shell based CA utility"; - homepage = https://openvpn.net/; + homepage = "https://openvpn.net/"; license = licenses.gpl2; maintainers = [ maintainers.offline ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix index d8c60882cd4a5..b61503b1b3f46 100644 --- a/pkgs/tools/networking/email/default.nix +++ b/pkgs/tools/networking/email/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "Command line SMTP client"; license = with lib.licenses; [ gpl2 ]; - homepage = https://deanproxy.com/code; + homepage = "https://deanproxy.com/code"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/fakeroute/default.nix b/pkgs/tools/networking/fakeroute/default.nix index d5190331d33fa..2bfecc389d5f4 100644 --- a/pkgs/tools/networking/fakeroute/default.nix +++ b/pkgs/tools/networking/fakeroute/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { Makes your machine appear to be anywhere on the internet to any host running a (UDP) unix traceroute ''; - homepage = https://moxie.org/software/fakeroute/; + homepage = "https://moxie.org/software/fakeroute/"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/fastd/default.nix b/pkgs/tools/networking/fastd/default.nix index 43efe2090f2ca..8c9a877b8f1eb 100644 --- a/pkgs/tools/networking/fastd/default.nix +++ b/pkgs/tools/networking/fastd/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchgit, cmake, bison, pkgconfig -, libuecc, libsodium, libcap, json_c }: +{ stdenv, fetchFromGitHub, cmake, bison, pkgconfig +, libuecc, libsodium, libcap, json_c, openssl }: stdenv.mkDerivation rec { - version = "18"; pname = "fastd"; + version = "19"; - src = fetchgit { - url = "git://git.universe-factory.net/fastd"; - rev = "refs/tags/v${version}"; - sha256 = "0c9v3igv3812b3jr7jk75a2np658yy00b3i4kpbpdjgvqzc1jrq8"; + src = fetchFromGitHub { + owner = "Neoraider"; + repo = "fastd"; + rev = "v${version}"; + sha256 = "1h3whjvy2n2cyvbkbg4y1z9vlrn790spzbdhj4glwp93xcykhz5i"; }; postPatch = '' @@ -17,13 +18,17 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig bison cmake ]; - buildInputs = [ libuecc libsodium libcap json_c ]; + buildInputs = [ libuecc libsodium libcap json_c openssl ]; + + cmakeFlags = [ + "-DENABLE_OPENSSL=true" + ]; enableParallelBuilding = true; meta = with stdenv.lib; { description = "Fast and Secure Tunneling Daemon"; - homepage = https://projects.universe-factory.net/projects/fastd/wiki; + homepage = "https://projects.universe-factory.net/projects/fastd/wiki"; license = with licenses; [ bsd2 bsd3 ]; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index abb76e633ee71..fb125b486d796 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation { description = "Mail fetching and delivery tool - should do the job of getmail and procmail"; maintainers = with maintainers; [ raskin ]; platforms = with platforms; linux; - homepage = https://github.com/nicm/fdm; - downloadPage = https://github.com/nicm/fdm/releases; + homepage = "https://github.com/nicm/fdm"; + downloadPage = "https://github.com/nicm/fdm/releases"; license = licenses.isc; }; } diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix index 6f1660484e789..855a57b7720fb 100644 --- a/pkgs/tools/networking/ferm/default.nix +++ b/pkgs/tools/networking/ferm/default.nix @@ -1,30 +1,36 @@ { stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables, nixosTests }: -stdenv.mkDerivation rec { - version = "2.4.1"; +let + inherit (stdenv.lib.versions) majorMinor; +in stdenv.mkDerivation rec { + version = "2.5.1"; pname = "ferm"; src = fetchurl { - url = "http://ferm.foo-projects.org/download/2.4/ferm-${version}.tar.xz"; - sha256 = "1fv8wk513yysp4q0i65rl2m0hg2lxwwgk9ppprsca1xcxrdpsvwa"; + url = "http://ferm.foo-projects.org/download/${majorMinor version}/ferm-${version}.tar.xz"; + sha256 = "0awl9s243sxgayr2fcmfks8xydhrmb9gy8bd9sfq738dgq7vybjb"; }; - buildInputs = [ perl ipset ebtables iptables makeWrapper ]; - preConfigure = '' - substituteInPlace config.mk --replace "PERL = /usr/bin/perl" "PERL = ${perl}/bin/perl" - substituteInPlace config.mk --replace "PREFIX = /usr" "PREFIX = $out" - ''; + # perl is used at build time to gather the ferm version. + nativeBuildInputs = [ makeWrapper perl ]; + buildInputs = [ perl ]; + + makeFlags = [ + "PERL=perl" + "PREFIX=${placeholder "out"}" + ]; + postInstall = '' rm -r $out/lib/systemd for i in "$out/sbin/"*; do - wrapProgram "$i" --prefix PATH : "${iptables}/bin:${ipset}/bin:${ebtables}/bin" + wrapProgram "$i" --prefix PATH : "${stdenv.lib.makeBinPath [ iptables ipset ebtables ]}" done ''; passthru.tests.ferm = nixosTests.ferm; meta = { - homepage = http://ferm.foo-projects.org/; + homepage = "http://ferm.foo-projects.org/"; description = "Tool to maintain complex firewalls"; longDescription = '' ferm is a tool to maintain complex firewalls, without having the trouble to diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index f9e334d81962a..bedb97200c127 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { goPackagePath = "viric.name/soft/filegive"; meta = with stdenv.lib; { - homepage = http://viric.name/cgi-bin/filegive; + homepage = "http://viric.name/cgi-bin/filegive"; description = "Easy p2p file sending program"; license = licenses.agpl3Plus; maintainers = [ maintainers.viric ]; diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index d5e801a6f9202..e194425769880 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "1.4.5"; + version = "1.5.0"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "1p4ddyqg1v27hf19n1ksmfvj5s6z2c8i13syb0anhlyzqy576hwb"; + sha256 = "1w3parmk3836v5ghn3cgcxyk0alk05r5ljl3j1fpnly5xvl131rd"; }; - cargoSha256 = "0mdcj4almwziq1ph3imfdx41a96xq19sbjm7wsm9lxlzhvv256br"; + cargoSha256 = "1cs076cgkzjan6y78a3bhriv2q2s83hp5vzhkjwz4dqn83r6b8hx"; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index d2f0ec2ec634a..a52088ed231df 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = { description = "Network fabric for containers, designed for Kubernetes"; license = licenses.asl20; - homepage = https://github.com/coreos/flannel; + homepage = "https://github.com/coreos/flannel"; maintainers = with maintainers; [johanot offline]; platforms = with platforms; linux; }; diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index b5e61bee4dfe8..57f29b275e379 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - homepage = https://savannah.nongnu.org/projects/flvstreamer; + homepage = "https://savannah.nongnu.org/projects/flvstreamer"; maintainers = [ stdenv.lib.maintainers.thammers ]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index 4b5242818b3dc..6a63a2047b231 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -11,9 +11,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-ipv6" "--enable-ipv4" ]; meta = with stdenv.lib; { - homepage = http://fping.org/; + homepage = "http://fping.org/"; description = "Send ICMP echo probes to network hosts"; - maintainers = with maintainers; [ the-kenny ]; license = licenses.bsd0; platforms = platforms.all; }; diff --git a/pkgs/tools/networking/freebind/default.nix b/pkgs/tools/networking/freebind/default.nix index 0c74f14e17446..c1dc3d8fd5f8f 100644 --- a/pkgs/tools/networking/freebind/default.nix +++ b/pkgs/tools/networking/freebind/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "IPv4 and IPv6 address rate limiting evasion tool"; - homepage = https://github.com/blechschmidt/freebind; + homepage = "https://github.com/blechschmidt/freebind"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ volth ]; diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index f44e2208646ce..588f8a8c1cbfc 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "1hj3xy7ihwl66hyxc1m8k3fwgz5jyx1bd32f80d7266klhjqf6nw"; + sha256 = "1z914p20n3i1bf4hx5iq2fylx1s49knb70cbg53ji2n7nrm1q33r"; }; - modSha256 = "1v90w5grc0vjpcp0m56d73zi0qnbswgz1rcvcwrjfa3rwqhigbal"; + vendorSha256 = "0pi661mb5vwj16wwxnyx9b0ic7gzby6qfs3y4w00agn6sn5nahx2"; subPackages = [ "cmd/frpc" "cmd/frps" ]; @@ -28,4 +28,4 @@ buildGoModule rec { maintainers = with maintainers; [ filalex77 ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix index 2ea09404e3478..b323cde28bc28 100644 --- a/pkgs/tools/networking/gandi-cli/default.nix +++ b/pkgs/tools/networking/gandi-cli/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Command-line interface to the public Gandi.net API"; - homepage = https://cli.gandi.net/; + homepage = "https://cli.gandi.net/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kampka ]; }; diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index f107e41067845..0bf0ebb07b33e 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -22,7 +22,7 @@ python2Packages.buildPythonApplication rec { maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.domenkozar ]; platforms = stdenv.lib.platforms.linux; - homepage = http://pyropus.ca/software/getmail/; + homepage = "http://pyropus.ca/software/getmail/"; inherit version; updateWalker = true; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index fb63ee46c9d37..f6aa4c061ce65 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gftp-2.0.19"; src = fetchurl { - url = https://www.gftp.org/gftp-2.0.19.tar.bz2; + url = "https://www.gftp.org/gftp-2.0.19.tar.bz2"; sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "GTK-based FTP client"; - homepage = http://www.gftp.org; + homepage = "http://www.gftp.org"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix index d942dce6a197e..fa364dc4eab69 100644 --- a/pkgs/tools/networking/gmrender-resurrect/default.nix +++ b/pkgs/tools/networking/gmrender-resurrect/default.nix @@ -30,7 +30,7 @@ in meta = with stdenv.lib; { description = "Resource efficient UPnP/DLNA renderer, optimal for Raspberry Pi, CuBox or a general MediaServer"; - homepage = https://github.com/hzeller/gmrender-resurrect; + homepage = "https://github.com/hzeller/gmrender-resurrect"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ koral ashkitten ]; diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix index aab5b77351c96..31b91c01c2d6e 100644 --- a/pkgs/tools/networking/gmvault/default.nix +++ b/pkgs/tools/networking/gmvault/default.nix @@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Backup and restore your gmail account"; - homepage = http://gmvault.org; + homepage = "http://gmvault.org"; license = pkgs.lib.licenses.agpl3Plus; }; } diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index 601f70e187a64..f739e80be1fe5 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage { This relies on adb, make sure you have the required permissions/udev rules. ''; - homepage = https://github.com/Genymobile/gnirehtet; + homepage = "https://github.com/Genymobile/gnirehtet"; license = licenses.asl20; maintainers = with maintainers; [ symphorien ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/goklp/default.nix b/pkgs/tools/networking/goklp/default.nix index c260b47a63322..534a809e46af4 100644 --- a/pkgs/tools/networking/goklp/default.nix +++ b/pkgs/tools/networking/goklp/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Golang OpenSSH Keys Ldap Provider for AuthorizedKeysCommand"; - homepage = https://github.com/AppliedTrust/goklp; + homepage = "https://github.com/AppliedTrust/goklp"; maintainers = with maintainers; [ disassembler ]; license = licenses.bsd2; }; diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index 85f13f031b4dc..092f3611abb78 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Ping, but with a graph"; - homepage = https://github.com/orf/gping; + homepage = "https://github.com/orf/gping"; license = licenses.gpl2; maintainers = with maintainers; [ andrew-d ]; }; diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix index 58e698ed70811..6bae95298fe2e 100644 --- a/pkgs/tools/networking/grpcui/default.nix +++ b/pkgs/tools/networking/grpcui/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0dcah6bamjqyp9354qrd1cykdr5k5l93hh7qcy5b4nkag9531gl0"; }; - modSha256 = "1yq8484cjxad72nqsrim3zppr8hmn7dc6f8rgkw8fg952lqy5jjb"; + vendorSha256 = "0m9nn8x0ji0n9v3d5w5z3grwv0zh8ijvh92jqjpcfv4bcjr5vsjr"; meta = with lib; { description = "An interactive web UI for gRPC, along the lines of postman"; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ pradyuman ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/grpcurl/default.nix b/pkgs/tools/networking/grpcurl/default.nix index b4c224841639b..6a72be9a1e451 100644 --- a/pkgs/tools/networking/grpcurl/default.nix +++ b/pkgs/tools/networking/grpcurl/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { meta = { description = "Like cURL, but for gRPC: Command-line tool for interacting with gRPC servers"; - homepage = https://github.com/fullstorydev/grpcurl; + homepage = "https://github.com/fullstorydev/grpcurl"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ knl ]; }; diff --git a/pkgs/tools/networking/guardian-agent/default.nix b/pkgs/tools/networking/guardian-agent/default.nix index a5e8dc10d341b..262234ca67b5f 100644 --- a/pkgs/tools/networking/guardian-agent/default.nix +++ b/pkgs/tools/networking/guardian-agent/default.nix @@ -23,14 +23,14 @@ buildGoPackage rec { goDeps = ./deps.nix; postInstall = '' - mkdir -p $bin/bin $out/share/doc/${pname} - cp -v ./go/src/github.com/StanfordSNR/${pname}/scripts/* $bin/bin/ + mkdir -p $out/bin $out/share/doc/${pname} + cp -v ./go/src/github.com/StanfordSNR/${pname}/scripts/* $out/bin/ cp -vr ./go/src/github.com/StanfordSNR/${pname}/{AUTHORS,doc,LICENSE,README.md} $out/share/doc/guardian-agent ''; postFixup = '' - wrapProgram $bin/bin/sga-guard \ - --prefix PATH : "$bin/bin" \ + wrapProgram $out/bin/sga-guard \ + --prefix PATH : "$out/bin" \ --prefix PATH : "${autossh}/bin" ''; diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index 830d27fa6ce24..c93873caa07f3 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -49,9 +49,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of utilities and demos to work with UPnP"; - homepage = https://wiki.gnome.org/Projects/GUPnP; + homepage = "https://wiki.gnome.org/Projects/GUPnP"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix index ba59870a6b863..3dea0217b60d4 100644 --- a/pkgs/tools/networking/gvpe/default.nix +++ b/pkgs/tools/networking/gvpe/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A protected multinode virtual network"; - homepage = http://software.schmorp.de/pkg/gvpe.html; + homepage = "http://software.schmorp.de/pkg/gvpe.html"; maintainers = [ maintainers.raskin ]; platforms = with platforms; linux ++ freebsd; license = licenses.gpl2; diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix index ccc598b0692fc..cea13bca24c3c 100644 --- a/pkgs/tools/networking/hans/default.nix +++ b/pkgs/tools/networking/hans/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { the situation that your Internet access is firewalled, but pings are allowed. ''; - homepage = https://code.gerade.org/hans/; + homepage = "https://code.gerade.org/hans/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/tools/networking/hey/default.nix index d65d5c9e32355..8ed6ecbbf26d7 100644 --- a/pkgs/tools/networking/hey/default.nix +++ b/pkgs/tools/networking/hey/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "06w5hf0np0ayvjnfy8zgy605yrs5j326nk2gm0fy7amhwx1fzkwv"; }; - modSha256 = "0a00kcyagqczw0vhl8qs2xs1y8myw080y9kjs4qrcmj6kibdy55q"; + vendorSha256 = null; meta = with lib; { description = "HTTP load generator, ApacheBench (ab) replacement"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ filalex77 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix index 96fb342e27fc3..704eaa85cd04a 100644 --- a/pkgs/tools/networking/horst/default.nix +++ b/pkgs/tools/networking/horst/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small and lightweight IEEE802.11 wireless LAN analyzer with a text interface"; - homepage = http://br1.einfach.org/tech/horst/; + homepage = "http://br1.einfach.org/tech/horst/"; maintainers = [ maintainers.fpletz ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/tools/networking/hping/default.nix index 6e00a6e9afa85..1ef02b599e839 100644 --- a/pkgs/tools/networking/hping/default.nix +++ b/pkgs/tools/networking/hping/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command-line oriented TCP/IP packet assembler/analyzer"; - homepage = http://www.hping.org/; + homepage = "http://www.hping.org/"; license = licenses.gpl2; platforms = platforms.all; broken = stdenv.isDarwin; diff --git a/pkgs/tools/networking/hss/default.nix b/pkgs/tools/networking/hss/default.nix index 913e76c0f4bae..77f96113decf4 100644 --- a/pkgs/tools/networking/hss/default.nix +++ b/pkgs/tools/networking/hss/default.nix @@ -26,7 +26,7 @@ buildRubyGem rec { description = '' A SSH helper that uses regex and fancy expansion to dynamically manage SSH shortcuts. ''; - homepage = https://github.com/akerl/hss; + homepage = "https://github.com/akerl/hss"; license = licenses.mit; maintainers = with maintainers; [ nixy ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index 9bb44b70f11e0..d03b08cf5eb5e 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility to fetch time and set the system clock over HTTP"; - homepage = http://www.vervest.org/htp/; + homepage = "http://www.vervest.org/htp/"; platforms = platforms.linux; license = licenses.gpl2Plus; }; diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 9ed2f000f3252..9c524c0cc090a 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "An interactive command-line HTTP client featuring autocomplete and syntax highlighting"; - homepage = https://github.com/eliangcs/http-prompt; + homepage = "https://github.com/eliangcs/http-prompt"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/networking/httperf/default.nix b/pkgs/tools/networking/httperf/default.nix index 271be9c2352fe..50c35fbb33c1d 100644 --- a/pkgs/tools/networking/httperf/default.nix +++ b/pkgs/tools/networking/httperf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The httperf HTTP load generator"; - homepage = https://github.com/httperf/httperf; + homepage = "https://github.com/httperf/httperf"; maintainers = with maintainers; [ nand0p ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index a0e2b8e01cc12..01986bf932192 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "httpie"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "jakubroztocil"; repo = "httpie"; rev = version; - sha256 = "0d0rsn5i973l9y0ws3xmnzaw4jwxdlryyjbasnlddph5mvkf7dq0"; + sha256 = "1vwjlzx830q4dcm3r7j9cl8yzka37dw42rl1r05m5ysb1081cbj2"; }; outputs = [ "out" "doc" "man" ]; @@ -87,7 +87,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A command line HTTP client whose goal is to make CLI human-friendly"; - homepage = https://httpie.org/; + homepage = "https://httpie.org/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ antono relrod schneefux ]; }; diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix index e269a38f8218f..74aff38e1a609 100644 --- a/pkgs/tools/networking/httping/default.nix +++ b/pkgs/tools/networking/httping/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://vanheusden.com/httping; + homepage = "https://vanheusden.com/httping"; description = "ping with HTTP requests"; longDescription = '' Give httping an url, and it'll show you how long it takes to connect, diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/tools/networking/httplab/default.nix index a7b157d3ebc24..f39b061c34db0 100644 --- a/pkgs/tools/networking/httplab/default.nix +++ b/pkgs/tools/networking/httplab/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/gchaincl/httplab; + homepage = "https://github.com/gchaincl/httplab"; description = "Interactive WebServer"; license = licenses.mit; maintainers = with maintainers; [ pradeepchhetri ]; diff --git a/pkgs/tools/networking/httplz/cargo-lock.patch b/pkgs/tools/networking/httplz/cargo-lock.patch index 5ded54799a788..293d65f7a2389 100644 --- a/pkgs/tools/networking/httplz/cargo-lock.patch +++ b/pkgs/tools/networking/httplz/cargo-lock.patch @@ -1,1269 +1,1275 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 0000000..4b798fc +index 0000000..722bfbd --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,1263 @@ +@@ -0,0 +1,1269 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "adler32" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" + +[[package]] +name = "aho-corasick" -+version = "0.7.6" ++version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" +dependencies = [ -+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", +] + +[[package]] +name = "antidote" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ -+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi", ++ "libc", ++ "winapi", +] + +[[package]] +name = "autocfg" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" + +[[package]] +name = "autocfg" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" + +[[package]] +name = "base64" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" +dependencies = [ -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder", ++ "safemem", +] + +[[package]] +name = "base64" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +dependencies = [ -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder", +] + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "bitstring" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3e54f7b7a46d7b183eb41e2d82965261fa8a1597c68b50aced268ee1fc70272d" + +[[package]] +name = "brotli-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" +dependencies = [ -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "libc", +] + +[[package]] +name = "brotli2" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" +dependencies = [ -+ "brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "brotli-sys", ++ "libc", +] + +[[package]] +name = "byteorder" -+version = "1.3.2" ++version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" + +[[package]] +name = "bzip2" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" +dependencies = [ -+ "bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bzip2-sys", ++ "libc", +] + +[[package]] +name = "bzip2-sys" -+version = "0.1.7" ++version = "0.1.8+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05305b41c5034ff0e93937ac64133d109b5a2660114ec45e9760bc6816d83038" +dependencies = [ -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "c2-chacha" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "libc", +] + +[[package]] +name = "cc" -+version = "1.0.50" ++version = "1.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "cidr" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2da1cf0f275bb8dc1867a7f40cdb3b746951db73a183048e6e37fa89ed81bd01" ++dependencies = [ ++ "bitstring", ++] + +[[package]] +name = "clap" +version = "2.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" +dependencies = [ -+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", +] + +[[package]] +name = "cloudabi" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", +] + +[[package]] +name = "core-foundation" -+version = "0.6.4" ++version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +dependencies = [ -+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys", ++ "libc", +] + +[[package]] +name = "core-foundation-sys" -+version = "0.6.2" ++version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" + +[[package]] +name = "crc32fast" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", +] + +[[package]] +name = "ctrlc" -+version = "3.1.3" ++version = "3.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a4ba686dff9fa4c1c9636ce1010b0cf98ceb421361b0bb3d6faeec43bd217a7" +dependencies = [ -+ "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nix", ++ "winapi", +] + +[[package]] +name = "dtoa" -+version = "0.4.4" ++version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3" + +[[package]] +name = "either" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" + +[[package]] +name = "embed-resource" -+version = "1.3.1" ++version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1f6b0b4403da80c2fd32333937dd468292c001d778c587ae759b75432772715d" +dependencies = [ -+ "vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vswhom", ++ "winreg", +] + +[[package]] +name = "flate2" -+version = "1.0.13" ++version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2cfff41391129e0a856d6d822600b8d71179d46879e310417eb9c762eb178b42" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "crc32fast", ++ "libc", ++ "miniz_oxide", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ -+ "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] +name = "gcc" +version = "0.3.55" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" + +[[package]] +name = "getrandom" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "wasi", +] + +[[package]] +name = "hermit-abi" -+version = "0.1.6" ++version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a0d737e0f947a1864e93d33fdef4af8445a00d1ed8dc0c8ddb73139ea6abf15" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", +] + +[[package]] +name = "httparse" +version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" + +[[package]] +name = "https" -+version = "1.8.0" -+dependencies = [ -+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "md6 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "os-str-generic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rfsapi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tabwriter 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -+ "trivial_colours 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++version = "1.9.2" ++dependencies = [ ++ "base64 0.10.1", ++ "brotli2", ++ "bzip2", ++ "cc", ++ "cidr", ++ "clap", ++ "ctrlc", ++ "embed-resource", ++ "flate2", ++ "hyper-native-tls", ++ "iron", ++ "itertools", ++ "lazy_static", ++ "lazysort", ++ "libc", ++ "md6", ++ "mime_guess", ++ "os-str-generic", ++ "percent-encoding 2.1.0", ++ "rand 0.7.3", ++ "regex", ++ "rfsapi", ++ "serde", ++ "serde_json", ++ "tabwriter", ++ "time", ++ "trivial_colours", ++ "unicase 2.6.0", ++ "walkdir", ++ "winapi", ++ "xml-rs", +] + +[[package]] +name = "hyper" +version = "0.10.16" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273" +dependencies = [ -+ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -+ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "base64 0.9.3", ++ "httparse", ++ "language-tags", ++ "log 0.3.9", ++ "mime", ++ "num_cpus", ++ "time", ++ "traitobject", ++ "typeable", ++ "unicase 1.4.2", ++ "url", +] + +[[package]] +name = "hyper-native-tls" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068" +dependencies = [ -+ "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "antidote", ++ "hyper", ++ "native-tls", +] + +[[package]] +name = "idna" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +dependencies = [ -+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", +] + +[[package]] +name = "iron" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c6d308ca2d884650a8bf9ed2ff4cb13fbb2207b71f64cda11dc9b892067295e8" +dependencies = [ -+ "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper", ++ "hyper-native-tls", ++ "log 0.3.9", ++ "mime_guess", ++ "modifier", ++ "num_cpus", ++ "plugin", ++ "typemap", ++ "url", +] + +[[package]] +name = "itertools" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" +dependencies = [ -+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "either", +] + +[[package]] +name = "itoa" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" + +[[package]] +name = "language-tags" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazysort" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f" + +[[package]] +name = "libc" -+version = "0.2.66" ++version = "0.2.69" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" + +[[package]] +name = "log" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" +dependencies = [ -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8", +] + +[[package]] +name = "log" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", +] + +[[package]] +name = "matches" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" + +[[package]] +name = "md6" -+version = "2.0.0" ++version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "21baf112ff708069b0d0544843236583c9c18675cc1af78ba4ace0f60f63fb31" +dependencies = [ -+ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gcc", ++ "libc", +] + +[[package]] +name = "memchr" -+version = "2.3.0" ++version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" + +[[package]] +name = "mime" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" +dependencies = [ -+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9", +] + +[[package]] +name = "mime_guess" -+version = "1.8.7" ++version = "1.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "216929a5ee4dd316b1702eedf5e74548c123d370f47841ceaac38ca154690ca3" +dependencies = [ -+ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime", ++ "phf", ++ "phf_codegen", ++ "unicase 1.4.2", +] + +[[package]] +name = "miniz_oxide" -+version = "0.3.5" ++version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5" +dependencies = [ -+ "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "adler32", +] + +[[package]] +name = "modifier" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58" + +[[package]] +name = "native-tls" -+version = "0.2.3" ++version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" +dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", ++ "libc", ++ "log 0.4.8", ++ "openssl", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "security-framework", ++ "security-framework-sys", ++ "tempfile", +] + +[[package]] +name = "nix" -+version = "0.14.1" ++version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" +dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "cc", ++ "cfg-if", ++ "libc", ++ "void", +] + +[[package]] +name = "num-traits" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" +dependencies = [ -+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.11", +] + +[[package]] +name = "num-traits" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" +dependencies = [ -+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.0", +] + +[[package]] +name = "num_cpus" -+version = "1.12.0" ++version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ -+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi", ++ "libc", +] + +[[package]] +name = "openssl" -+version = "0.10.26" ++version = "0.10.29" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd" +dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "cfg-if", ++ "foreign-types", ++ "lazy_static", ++ "libc", ++ "openssl-sys", +] + +[[package]] +name = "openssl-probe" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" + +[[package]] +name = "openssl-sys" -+version = "0.9.53" ++version = "0.9.55" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7717097d810a0f2e2323f9e5d11e71608355e24828410b55b9d4f18aa5f9a5d8" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.0", ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", +] + +[[package]] +name = "os-str-generic" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "78f3d620827b89763f54b7f1da3029bd4e0ca7eb1ae61a5c4d3b0bc0dca5157e" + +[[package]] +name = "percent-encoding" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "phf" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" +dependencies = [ -+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" +dependencies = [ -+ "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_generator", ++ "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" +dependencies = [ -+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_shared", ++ "rand 0.6.5", +] + +[[package]] +name = "phf_shared" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" +dependencies = [ -+ "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "siphasher", ++ "unicase 1.4.2", +] + +[[package]] +name = "pkg-config" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" + +[[package]] +name = "plugin" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0" +dependencies = [ -+ "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "typemap", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" + +[[package]] +name = "quote" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" + +[[package]] +name = "rand" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7", ++ "libc", ++ "rand_chacha 0.1.1", ++ "rand_core 0.4.2", ++ "rand_hc 0.1.0", ++ "rand_isaac", ++ "rand_jitter", ++ "rand_os", ++ "rand_pcg", ++ "rand_xorshift", ++ "winapi", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ -+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom", ++ "libc", ++ "rand_chacha 0.2.2", ++ "rand_core 0.5.1", ++ "rand_hc 0.2.0", +] + +[[package]] +name = "rand_chacha" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7", ++ "rand_core 0.3.1", +] + +[[package]] +name = "rand_chacha" -+version = "0.2.1" ++version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ -+ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ppv-lite86", ++ "rand_core 0.5.1", +] + +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ -+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +dependencies = [ -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1", +] + +[[package]] +name = "rand_isaac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +dependencies = [ -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", +] + +[[package]] +name = "rand_jitter" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "rand_core 0.4.2", ++ "winapi", +] + +[[package]] +name = "rand_os" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +dependencies = [ -+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cloudabi", ++ "fuchsia-cprng", ++ "libc", ++ "rand_core 0.4.2", ++ "rdrand", ++ "winapi", +] + +[[package]] +name = "rand_pcg" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7", ++ "rand_core 0.4.2", +] + +[[package]] +name = "rand_xorshift" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +dependencies = [ -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", +] + +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", +] + +[[package]] +name = "redox_syscall" +version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" + +[[package]] +name = "regex" -+version = "1.3.3" ++version = "1.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692" +dependencies = [ -+ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local", +] + +[[package]] +name = "regex-syntax" -+version = "0.6.13" ++version = "0.6.17" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" + +[[package]] +name = "remove_dir_all" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" +dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", +] + +[[package]] +name = "rfsapi" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1b6fbc119d00459f80252adb96e554766d75de071ed5d3c49f46a000d137cd49" +dependencies = [ -+ "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper", ++ "mime", ++ "serde", ++ "serde_derive", ++ "time", +] + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ -+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util", +] + +[[package]] +name = "schannel" -+version = "0.1.16" ++version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "039c25b130bd8c1321ee2d7de7fde2659fa9c2744e4bb29711cfc852ea53cd19" +dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", ++ "winapi", +] + +[[package]] +name = "security-framework" -+version = "0.3.4" ++version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f331b9025654145cd425b9ded0caf8f5ae0df80d418b326e2dc1c3dc5eb0620" +dependencies = [ -+ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "core-foundation", ++ "core-foundation-sys", ++ "libc", ++ "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" -+version = "0.3.3" ++version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" +dependencies = [ -+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys", ++ "libc", +] + +[[package]] +name = "serde" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" + +[[package]] +name = "serde_codegen_internals" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc888bd283bd2420b16ad0d860e35ad8acb21941180a83a189bb2046f9d00400" +dependencies = [ -+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn", +] + +[[package]] +name = "serde_derive" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "978fd866f4d4872084a81ccc35e275158351d3b9fe620074e7d7504b816b74ba" +dependencies = [ -+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote", ++ "serde_codegen_internals", ++ "syn", +] + +[[package]] +name = "serde_json" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1" +dependencies = [ -+ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dtoa", ++ "itoa", ++ "num-traits 0.1.43", ++ "serde", +] + +[[package]] +name = "siphasher" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" + +[[package]] +name = "smallvec" -+version = "1.1.0" ++version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "syn" +version = "0.11.11" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" +dependencies = [ -+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote", ++ "synom", ++ "unicode-xid", +] + +[[package]] +name = "synom" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" +dependencies = [ -+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid", +] + +[[package]] +name = "tabwriter" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "36205cfc997faadcc4b0b87aaef3fbedafe20d38d4959a7ca6ff803564051111" +dependencies = [ -+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width", +] + +[[package]] +name = "tempfile" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "rand 0.7.3", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ -+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width", +] + +[[package]] +name = "thread_local" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", +] + +[[package]] +name = "time" -+version = "0.1.42" ++version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "winapi", +] + +[[package]] +name = "traitobject" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" + +[[package]] +name = "trivial_colours" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7153365ea16c5a0ce2eebc4da1b33339a6b21d90c49f670e82130639656bb458" + +[[package]] +name = "typeable" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" + +[[package]] +name = "typemap" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" +dependencies = [ -+ "unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unsafe-any", +] + +[[package]] +name = "unicase" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" +dependencies = [ -+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "version_check 0.1.5", +] + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ -+ "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "version_check 0.9.1", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +dependencies = [ -+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches", +] + +[[package]] +name = "unicode-normalization" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" +dependencies = [ -+ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" + +[[package]] +name = "unicode-xid" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" + +[[package]] +name = "unsafe-any" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" +dependencies = [ -+ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "traitobject", +] + +[[package]] +name = "url" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" +dependencies = [ -+ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "idna", ++ "matches", ++ "percent-encoding 1.0.1", +] + +[[package]] +name = "vcpkg" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" + +[[package]] +name = "vec_map" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" + +[[package]] +name = "version_check" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" + +[[package]] +name = "version_check" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" + +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + +[[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532" +dependencies = [ -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "libc", +] + +[[package]] +name = "walkdir" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" +dependencies = [ -+ "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "same-file", ++ "winapi", ++ "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "winapi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +dependencies = [ -+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" -+version = "0.1.3" ++version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "winreg" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" +dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", +] + +[[package]] +name = "xml-rs" -+version = "0.8.0" ++version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[metadata] -+"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" -+"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" -+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -+"checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" -+"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -+"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" -+"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -+"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+"checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" -+"checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" -+"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" -+"checksum bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" -+"checksum bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f" -+"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" -+"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" -+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -+"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" -+"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" -+"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -+"checksum ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7dfd2d8b4c82121dfdff120f818e09fc4380b0b7e17a742081a89b94853e87f" -+"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" -+"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" -+"checksum embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bbaba4684ab0af1cbb3ef0b1f540ddc4b57b31940c920ea594efe09ab86e2a6c" -+"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f" -+"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -+"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -+"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" -+"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -+"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" -+"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" -+"checksum hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273" -+"checksum hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068" -+"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -+"checksum iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d308ca2d884650a8bf9ed2ff4cb13fbb2207b71f64cda11dc9b892067295e8" -+"checksum itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" -+"checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" -+"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" -+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+"checksum lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f" -+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" -+"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -+"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -+"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -+"checksum md6 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "54e5826684849cecd3fa05a6a5052c50a3542f163a9917ff0b91379426a2e45d" -+"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223" -+"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" -+"checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7" -+"checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625" -+"checksum modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58" -+"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" -+"checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" -+"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -+"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" -+"checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6" -+"checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585" -+"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -+"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" -+"checksum os-str-generic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "78f3d620827b89763f54b7f1da3029bd4e0ca7eb1ae61a5c4d3b0bc0dca5157e" -+"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" -+"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -+"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" -+"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" -+"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" -+"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" -+"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" -+"checksum plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0" -+"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" -+"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" -+"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -+"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -+"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -+"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" -+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -+"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" -+"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -+"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -+"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -+"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -+"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -+"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -+"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -+"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -+"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -+"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -+"checksum regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b5508c1941e4e7cb19965abef075d35a9a8b5cdf0846f30b4050e9b55dc55e87" -+"checksum regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e734e891f5b408a29efbf8309e656876276f49ab6a6ac208600b4419bd893d90" -+"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -+"checksum rfsapi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b6fbc119d00459f80252adb96e554766d75de071ed5d3c49f46a000d137cd49" -+"checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" -+"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -+"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" -+"checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df" -+"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895" -+"checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" -+"checksum serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc888bd283bd2420b16ad0d860e35ad8acb21941180a83a189bb2046f9d00400" -+"checksum serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "978fd866f4d4872084a81ccc35e275158351d3b9fe620074e7d7504b816b74ba" -+"checksum serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1" -+"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -+"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4" -+"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" -+"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" -+"checksum tabwriter 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "36205cfc997faadcc4b0b87aaef3fbedafe20d38d4959a7ca6ff803564051111" -+"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -+"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" -+"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" -+"checksum trivial_colours 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7153365ea16c5a0ce2eebc4da1b33339a6b21d90c49f670e82130639656bb458" -+"checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" -+"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" -+"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" -+"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -+"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -+"checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" -+"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" -+"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" -+"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" -+"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -+"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" -+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -+"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" -+"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" -+"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -+"checksum vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" -+"checksum vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532" -+"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" -+"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80" -+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" -+"checksum xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5" ++checksum = "2bb76e5c421bbbeb8924c60c030331b345555024d56261dae8f3e786ed817c23" diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index c4f003f884fca..bf0a5b9038880 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "httplz"; - version = "1.8.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "thecoshman"; repo = "http"; rev = "v${version}"; - sha256 = "0i41hqig8v6w1qb6498239iix1rss0lznm5lcl9m3i439c2zv7pw"; + sha256 = "154alxxclz78r29m656c8yahnzq0vd64s4sp19h0ca92dfw4s46y"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--bin httplz" ]; cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "13hk9m09jff3bxbixsjvksiir4j4mak4ckvlq45bx5d5lh8sapxl"; + cargoSha256 = "1rpwzrr9bvw375vn97y5fqhraqz35d3ani9kfflvn2758x3g8gwf"; postInstall = '' wrapProgram $out/bin/httplz \ diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/tools/networking/httpstat/default.nix index b3700fb93389a..70bbabc35bb75 100644 --- a/pkgs/tools/networking/httpstat/default.nix +++ b/pkgs/tools/networking/httpstat/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "curl statistics made simple"; - homepage = https://github.com/reorx/httpstat; + homepage = "https://github.com/reorx/httpstat"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ nequissimus ]; }; diff --git a/pkgs/tools/networking/httptunnel/default.nix b/pkgs/tools/networking/httptunnel/default.nix index df62f90ad0bb2..e8ed86da3da35 100644 --- a/pkgs/tools/networking/httptunnel/default.nix +++ b/pkgs/tools/networking/httptunnel/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Creates a bidirectional virtual data connection tunnelled in HTTP requests"; - homepage = http://www.nocrew.org/software/httptunnel; + homepage = "http://www.nocrew.org/software/httptunnel"; license = licenses.gpl2; maintainers = with maintainers; [ koral ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/hue-cli/default.nix b/pkgs/tools/networking/hue-cli/default.nix index b9b4a8eac9d2d..f2ea6b37c8101 100644 --- a/pkgs/tools/networking/hue-cli/default.nix +++ b/pkgs/tools/networking/hue-cli/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Command line interface for controlling Philips Hue system's lights and bridge"; - homepage = https://github.com/birkirb/hue-cli; + homepage = "https://github.com/birkirb/hue-cli"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ manveru nicknovitski ]; diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/tools/networking/hyenae/default.nix index cbcaee4de784e..2ec22f2bab6fc 100644 --- a/pkgs/tools/networking/hyenae/default.nix +++ b/pkgs/tools/networking/hyenae/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; src = fetchurl { - url = mirror://sourceforge/hyenae/0.36-1/hyenae-0.36-1.tar.gz; + url = "mirror://sourceforge/hyenae/0.36-1/hyenae-0.36-1.tar.gz"; sha256 = "1f3x4yn9a9p4f4wk4l8pv7hxfjc8q7cv20xzf7ky735sq1hj0xcg"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = ""; - homepage = https://sourceforge.net/projects/hyenae/; + homepage = "https://sourceforge.net/projects/hyenae/"; license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 3b96807709512..191035f59f278 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://i2pd.website; + homepage = "https://i2pd.website"; description = "Minimal I2P router written in C++"; license = licenses.bsd3; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/tools/networking/ifstat-legacy/default.nix b/pkgs/tools/networking/ifstat-legacy/default.nix index 72aaaa1e1706a..25b6af5e92f4d 100644 --- a/pkgs/tools/networking/ifstat-legacy/default.nix +++ b/pkgs/tools/networking/ifstat-legacy/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Report network interfaces bandwith just like vmstat/iostat do for other system counters - legacy version"; - homepage = http://gael.roualland.free.fr/ifstat/; + homepage = "http://gael.roualland.free.fr/ifstat/"; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; license = licenses.gpl2; diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix index bc6f657f3781e..70c1f0b6c965f 100644 --- a/pkgs/tools/networking/iftop/default.nix +++ b/pkgs/tools/networking/iftop/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, ncurses, libpcap, automake}: +{ stdenv, fetchurl, ncurses, libpcap, automake, nixosTests }: stdenv.mkDerivation { name = "iftop-1.0pre4"; src = fetchurl { - url = http://ex-parrot.com/pdw/iftop/download/iftop-1.0pre4.tar.gz; + url = "http://ex-parrot.com/pdw/iftop/download/iftop-1.0pre4.tar.gz"; sha256 = "15sgkdyijb7vbxpxjavh5qm5nvyii3fqcg9mzvw7fx8s6zmfwczp"; }; @@ -18,6 +18,8 @@ stdenv.mkDerivation { buildInputs = [ncurses libpcap]; + passthru.tests = { inherit (nixosTests) iftop; }; + meta = with stdenv.lib; { description = "Display bandwidth usage on a network interface"; longDescription = '' @@ -26,7 +28,7 @@ stdenv.mkDerivation { bandwidth usage by pairs of hosts. ''; license = licenses.gpl2Plus; - homepage = http://ex-parrot.com/pdw/iftop/; + homepage = "http://ex-parrot.com/pdw/iftop/"; platforms = platforms.unix; maintainers = [ ]; }; diff --git a/pkgs/tools/networking/imapproxy/default.nix b/pkgs/tools/networking/imapproxy/default.nix index 984b0a2f87ea3..01480056a2aef 100644 --- a/pkgs/tools/networking/imapproxy/default.nix +++ b/pkgs/tools/networking/imapproxy/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "imapproxy-1.2.7"; src = fetchurl { - url = mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-1.2.7.tar.bz2; + url = "mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-1.2.7.tar.bz2"; sha256 = "0j5fq755sxiz338ia93jrkiy64crv30g37pir5pxfys57q7d92nx"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://imapproxy.org/; + homepage = "http://imapproxy.org/"; description = "It proxies IMAP transactions caching server connections"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix index c05928fa34b9a..aa0980a2514e8 100644 --- a/pkgs/tools/networking/imapsync/default.nix +++ b/pkgs/tools/networking/imapsync/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.linux-france.org/prj/imapsync/; + homepage = "http://www.linux-france.org/prj/imapsync/"; description = "Mail folder synchronizer between IMAP servers"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 9f7d79bdd88cd..2a551c56768cc 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "inadyn"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "troglobit"; repo = "inadyn"; rev = "v${version}"; - sha256 = "013kxlglxliajv3lrsix4w88w40g709rvycajb6ad6gbh8giqv47"; + sha256 = "00jhayx0hfl9dw78d58bdxa5390bvxq73lz26q9h1gg1xw76adan"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 612e3ec0f835d..1290ec2bdb1d0 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { traceroute, uucpd, and whois. ''; - homepage = https://www.gnu.org/software/inetutils/; + homepage = "https://www.gnu.org/software/inetutils/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index c978a330ceeb4..2703ca0fc64de 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://code.kryo.se/iodine/; + homepage = "http://code.kryo.se/iodine/"; description = "Tool to tunnel IPv4 data through a DNS server"; license = stdenv.lib.licenses.isc; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix index c3304c385e7bc..205a4e6e70150 100644 --- a/pkgs/tools/networking/ip2location/default.nix +++ b/pkgs/tools/networking/ip2location/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { weather, MCC, MNC, mobile brand name, elevation and usage type of any IP address or host name in the IP2Location databases. ''; - homepage = https://www.ip2location.com/free/applications; + homepage = "https://www.ip2location.com/free/applications"; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix index d2dbd235e11cb..83a6ea4b24342 100644 --- a/pkgs/tools/networking/ip2unix/default.nix +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/nixcloud/ip2unix; + homepage = "https://github.com/nixcloud/ip2unix"; description = "Turn IP sockets into Unix domain sockets"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl3; diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/tools/networking/ipcalc/default.nix index 2727175f0412f..7f118193a3a34 100644 --- a/pkgs/tools/networking/ipcalc/default.nix +++ b/pkgs/tools/networking/ipcalc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; meta = { description = "Simple IP network calculator"; - homepage = http://jodies.de/ipcalc; + homepage = "http://jodies.de/ipcalc"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index 6494b907a3a99..f90b74313e505 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/iperf/; + homepage = "https://sourceforge.net/projects/iperf/"; description = "Tool to measure IP bandwidth using UDP or TCP"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index bea61b082ec0c..4506fbb11e36c 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://software.es.net/iperf/; + homepage = "http://software.es.net/iperf/"; description = "Tool to measure IP bandwidth using UDP or TCP"; platforms = platforms.unix; license = licenses.bsd3; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index e62d819e1ec0c..49efeac02a97b 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -1,22 +1,31 @@ -{ fetchurl, stdenv, openssl, pkgconfig, db, zlib, cyrus_sasl, perl }: +{ stdenv, fetchurl, pkg-config, perl +, openssl, db, zlib, cyrus_sasl +}: stdenv.mkDerivation rec { - name = "isync-1.3.1"; + pname = "isync"; + version = "1.3.1"; src = fetchurl { - url = "mirror://sourceforge/isync/${name}.tar.gz"; + url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; sha256 = "1sphd30jplii58y2zmw365bckm6pszmapcy905zhjll1sm1ldjv8"; }; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ openssl db cyrus_sasl zlib ]; meta = with stdenv.lib; { - homepage = http://isync.sourceforge.net/; + homepage = "http://isync.sourceforge.net/"; + # https://sourceforge.net/projects/isync/ + changelog = "https://sourceforge.net/p/isync/isync/ci/v${version}/tree/NEWS"; description = "Free IMAP and MailDir mailbox synchronizer"; + longDescription = '' + mbsync (formerly isync) is a command line application which synchronizes + mailboxes. Currently Maildir and IMAP4 mailboxes are supported. New + messages, message deletions and flag changes can be propagated both ways. + ''; license = licenses.gpl2Plus; - - maintainers = with maintainers; [ the-kenny ]; platforms = platforms.unix; + maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index 083ec23af5694..2d23ff1f1fd2e 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { by bandwidth they use. ''; - homepage = http://jnettop.kubs.info/; + homepage = "http://jnettop.kubs.info/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix index e9f43da981c51..0a9ac99e23619 100644 --- a/pkgs/tools/networking/jwhois/default.nix +++ b/pkgs/tools/networking/jwhois/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "jwhois-4.0"; src = fetchurl { - url = mirror://gnu/jwhois/jwhois-4.0.tar.gz; + url = "mirror://gnu/jwhois/jwhois-4.0.tar.gz"; sha256 = "0knn7iaj5v0n6jpmldyv2yk4bcy9dn3kywmv63bwc5drh9kvi6zs"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "A client for the WHOIS protocol allowing you to query the owner of a domain name"; - homepage = https://www.gnu.org/software/jwhois/; + homepage = "https://www.gnu.org/software/jwhois/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix index 931cfa3a74d97..e7c9b499675a2 100644 --- a/pkgs/tools/networking/kail/default.nix +++ b/pkgs/tools/networking/kail/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Kubernetes log viewer"; - homepage = https://github.com/boz/kail; + homepage = "https://github.com/boz/kail"; license = licenses.mit; maintainers = with maintainers; [ offline vdemeester ]; }; diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 3986cadd08a58..386a3ae280aa6 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://kea.isc.org/; + homepage = "https://kea.isc.org/"; description = "High-performance, extensible DHCP server by ISC"; longDescription = '' KEA is a new open source DHCPv4/DHCPv6 server being developed by diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 68d253ef0b8fe..076953161a333 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://keepalived.org; + homepage = "https://keepalived.org"; description = "Routing software written in C"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 602ada1476a99..3bd61a0bd4988 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A file transfer program supporting a number of network protocols"; - homepage = https://lftp.tech/; + homepage = "https://lftp.tech/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/networking/libnids/default.nix b/pkgs/tools/networking/libnids/default.nix index ef753127c67ec..2a93d3c8a5989 100644 --- a/pkgs/tools/networking/libnids/default.nix +++ b/pkgs/tools/networking/libnids/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An E-component of Network Intrusion Detection System which emulates the IP stack of Linux 2.0.x"; - homepage = http://libnids.sourceforge.net/; + homepage = "http://libnids.sourceforge.net/"; license = licenses.gpl2; maintainers = [ maintainers.symphorien ]; # probably also bsd and solaris diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 3c361fe48baff..6f94e0c63c50b 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -48,7 +48,7 @@ python2Packages.buildPythonApplication rec { meta = { description = "Check websites for broken links"; - homepage = https://linkcheck.github.io/linkchecker/; + homepage = "https://linkcheck.github.io/linkchecker/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ peterhoeg tweber ]; }; diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 653865b0e9194..8462d907a1f69 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "802.1ab implementation (LLDP) to help you locate neighbors of all your equipments"; - homepage = https://vincentbernat.github.io/lldpd/; + homepage = "https://vincentbernat.github.io/lldpd/"; license = licenses.isc; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index e8a83d381317c..4abe083a0b9cc 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A hosted VPN service that lets you securely extend LAN-like networks to distributed teams"; - homepage = https://secure.logmein.com/products/hamachi/; + homepage = "https://secure.logmein.com/products/hamachi/"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix index 5d788af1682e6..56ed33ea36af6 100644 --- a/pkgs/tools/networking/lsh/default.nix +++ b/pkgs/tools/networking/lsh/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { SECSH working group. ''; - homepage = http://www.lysator.liu.se/~nisse/lsh/; + homepage = "http://www.lysator.liu.se/~nisse/lsh/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix index 44c8b9a9c4d50..d0a74fe4b5bfa 100644 --- a/pkgs/tools/networking/maildrop/default.nix +++ b/pkgs/tools/networking/maildrop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { doCheck = false; # fails with "setlocale: LC_ALL: cannot change locale (en_US.UTF-8)" meta = with stdenv.lib; { - homepage = http://www.courier-mta.org/maildrop/; + homepage = "http://www.courier-mta.org/maildrop/"; description = "Mail filter/mail delivery agent that is used by the Courier Mail Server"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/networking/mailsend/default.nix b/pkgs/tools/networking/mailsend/default.nix index c888f354eae75..6b9a0caacb925 100644 --- a/pkgs/tools/networking/mailsend/default.nix +++ b/pkgs/tools/networking/mailsend/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { patches = [ (fetchurl { - url = https://github.com/muquit/mailsend/commit/960df6d7a11eef90128dc2ae660866b27f0e4336.patch; + url = "https://github.com/muquit/mailsend/commit/960df6d7a11eef90128dc2ae660866b27f0e4336.patch"; sha256 = "0vz373zcfl19inflybfjwshcq06rvhx0i5g0f4b021cxfhyb1sm0"; }) ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.bsd3 ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://github.com/muquit/mailsend; + homepage = "https://github.com/muquit/mailsend"; downloadPage = "https://github.com/muquit/mailsend/releases"; }; } diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 3e5300549db68..935cadbd7b871 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ orivej vrthra ]; - homepage = https://www.gnu.org/software/mailutils/; + homepage = "https://www.gnu.org/software/mailutils/"; # Some of the dependencies fail to build on {cyg,dar}win. platforms = platforms.gnu ++ platforms.linux; diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/tools/networking/maphosts/default.nix index dd9886a65eee4..8e3d0cf9160ce 100644 --- a/pkgs/tools/networking/maphosts/default.nix +++ b/pkgs/tools/networking/maphosts/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Small command line application for keeping your project hostnames in sync with /etc/hosts"; - homepage = https://github.com/mpscholten/maphosts; + homepage = "https://github.com/mpscholten/maphosts"; license = licenses.mit; maintainers = with maintainers; [ mpscholten nicknovitski ]; platforms = platforms.all; diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix index 4288395cdac59..48590a9e30591 100644 --- a/pkgs/tools/networking/maxscale/default.nix +++ b/pkgs/tools/networking/maxscale/default.nix @@ -79,9 +79,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''MaxScale database proxy extends MariaDB Server's high availability''; - homepage = https://mariadb.com/products/technology/maxscale; + homepage = "https://mariadb.com/products/technology/maxscale"; license = licenses.bsl11; platforms = platforms.linux; maintainers = with maintainers; [ izorkin ]; + broken = true; }; } diff --git a/pkgs/tools/networking/mcrcon/default.nix b/pkgs/tools/networking/mcrcon/default.nix index 469dd4cceb717..4f943f2cec61c 100644 --- a/pkgs/tools/networking/mcrcon/default.nix +++ b/pkgs/tools/networking/mcrcon/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://bukkit.org/threads/admin-rcon-mcrcon-remote-connection-client-for-minecraft-servers.70910/; + homepage = "https://bukkit.org/threads/admin-rcon-mcrcon-remote-connection-client-for-minecraft-servers.70910/"; description = "Minecraft console client with Bukkit coloring support."; longDescription = '' Mcrcon is a powerful Minecraft RCON terminal client with Bukkit coloring support. diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index 50875858574d1..b729e9961857a 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, glib, fuse, curl, glib-networking +{ stdenv, fetchgit, autoreconfHook, pkg-config, glib, fuse, curl, glib-networking , asciidoc, libxml2, docbook_xsl, docbook_xml_dtd_45, libxslt, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "megatools"; - version = "1.10.2"; + version = "1.10.3"; src = fetchgit { url = "https://megous.com/git/megatools"; - rev = version; - sha256 = "001hw8j36ld03wwaphq3xdaazf2dpl36h84k8xmk524x8vlia8lk"; + rev = "5581d06e447b84d0101d36dc96ab72920eec1017"; + sha256 = "1fh456kjsmdvpmvklkpi06h720yvhahd4rxa6cm5x818pl44p1r4"; }; nativeBuildInputs = [ - autoreconfHook pkgconfig wrapGAppsHook asciidoc libxml2 + autoreconfHook pkg-config wrapGAppsHook asciidoc libxml2 docbook_xsl docbook_xml_dtd_45 libxslt ]; buildInputs = [ glib glib-networking curl ] @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command line client for Mega.co.nz"; - homepage = https://megatools.megous.com/; + homepage = "https://megatools.megous.com/"; license = licenses.gpl2Plus; maintainers = [ maintainers.viric maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/tools/networking/memtier-benchmark/default.nix index 075696cfba1be..3579002e41698 100644 --- a/pkgs/tools/networking/memtier-benchmark/default.nix +++ b/pkgs/tools/networking/memtier-benchmark/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Redis and Memcached traffic generation and benchmarking tool"; - homepage = https://github.com/redislabs/memtier_benchmark; + homepage = "https://github.com/redislabs/memtier_benchmark"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index 49cc5710e5992..0fbd76855a7da 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully compliant with DLNA/UPnP-AV clients. ''; - homepage = https://sourceforge.net/projects/minidlna/; + homepage = "https://sourceforge.net/projects/minidlna/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 885ffbe915798..4e81321dc627f 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,28 +2,26 @@ buildGoModule rec { pname = "minio-client"; - version = "2020-03-06T23-29-45Z"; + version = "2020-04-25T00-43-23Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "1vqvp7mn841s5g9vvas3c8j4y9lp90maw5y49hdv7zcsqncqvzkv"; + sha256 = "0ff2fyr3787zp0lpgbph064am33py2wzjikzmxd3zwp3y0dic770"; }; - modSha256 = "1qjfsqmcc6i0nixwvdmm3vnnv19yvqaaza096cpdf5rl35knsp5i"; + vendorSha256 = "0nfcxz47v5gl0wih59xarhz82nd8wy61c3ijvg2v08ipk29zivcc"; subPackages = [ "." ]; - preBuild = '' - buildFlagsArray+=("-ldflags=-X github.com/minio/mc/cmd.Version=${version}") - ''; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/minio/mc/cmd.Version=${version}" ]; meta = with stdenv.lib; { - homepage = https://github.com/minio/mc; + homepage = "https://github.com/minio/mc"; description = "A replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage"; maintainers = with maintainers; [ eelco bachp ]; platforms = platforms.unix; license = licenses.asl20; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix index 1277a17f9bae6..b5702b9bfaddd 100644 --- a/pkgs/tools/networking/minissdpd/default.nix +++ b/pkgs/tools/networking/minissdpd/default.nix @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { the machine. Software must be patched in order to take advantage of MiniSSDPd, and MiniSSDPd must be started before any other UPnP program. ''; - homepage = http://miniupnp.free.fr/minissdpd.html; - downloadPage = http://miniupnp.free.fr/files/; + homepage = "http://miniupnp.free.fr/minissdpd.html"; + downloadPage = "http://miniupnp.free.fr/files/"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index ebe6a60291a46..41927278ac82d 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -20,7 +20,7 @@ let makeFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://miniupnp.free.fr/; + homepage = "http://miniupnp.free.fr/"; description = "A client that implements the UPnP Internet Gateway Device (IGD) specification"; platforms = with platforms; linux ++ freebsd ++ darwin; license = licenses.bsd3; diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index f65c0c63370ba..23f02dde1f42a 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://miniupnp.free.fr/; + homepage = "http://miniupnp.free.fr/"; description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification"; platforms = platforms.linux; license = licenses.bsd3; diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/tools/networking/miredo/default.nix index 26f6c2498e182..1982cab6b3953 100644 --- a/pkgs/tools/networking/miredo/default.nix +++ b/pkgs/tools/networking/miredo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Teredo IPv6 Tunneling Daemon"; - homepage = https://www.remlab.net/miredo/; + homepage = "https://www.remlab.net/miredo/"; license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index 53369baa01c81..b9d873fad6af4 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -4,47 +4,15 @@ with python3Packages; buildPythonPackage rec { pname = "mitmproxy"; - version = "4.0.4"; + version = "5.1.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "14i9dkafvyl15rq2qa8xldscn5lmkk2g52kbi2hl63nzx9yibx6r"; + sha256 = "1lirlckpvd3c6s6q3p32w4k4yfna5mlgr1x9g39lhzzq0sdiz3lk"; }; - patches = [ - (fetchpatch { - # Tests failed due to expired test certificates, - # https://github.com/mitmproxy/mitmproxy/issues/3316 - # TODO: remove on next update - name = "test-certificates.patch"; - url = "https://github.com/mitmproxy/mitmproxy/commit/1b6a8d6acd3d70f9b9627ad4ae9def08103f8250.patch"; - sha256 = "03y79c25yir7d8xj79czdc81y3irqq1i3ks9ca0mv1az8b7xsvfv"; - }) - (fetchpatch { - # 0.13 <= wsproto < 0.14 patch - # https://github.com/mitmproxy/mitmproxy/issues/3459 - # TODO: remove on next update - name = "wsproto-0.13.patch"; - url = https://github.com/mitmproxy/mitmproxy/commit/70777a1b6ed64af9cafcdef223a8a260ecc96864.patch; - sha256 = "1ddxdr7js510kzyq3gyks4k5k1n8zb1i9amxw7wzmi1dcg8kqw9a"; - # We strip these bounds anyway - excludes = [ "setup.py" ]; - }) - (fetchpatch { - # Fix for newer pytest disallowing calling fixtures - # https://github.com/mitmproxy/mitmproxy/issues/3403 - # TODO: remove on next update - name = "dont-call-fixtures.patch"; - url = https://github.com/mitmproxy/mitmproxy/commit/ce28721458c8cc71de86513a5110676e9763041b.patch; - sha256 = "05pljr28lx7l1xgswqr9sz8dnhvc7npzh8xg2p9hignf159kd54d"; - # Irrelevant in nixpkgs - excludes = [ "setup.py" "setup.cfg" "release/docker/*" ]; - }) - ./pytest5.patch - ]; - postPatch = '' # remove dependency constraints sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?//' -i setup.py @@ -61,22 +29,26 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - blinker click certifi cryptography - h2 hyperframe kaitaistruct passlib - pyasn1 pyopenssl pyparsing pyperclip - ruamel_yaml tornado urwid brotlipy - sortedcontainers ldap3 wsproto setuptools + blinker brotli certifi cffi + click cryptography flask h11 + h2 hpack hyperframe itsdangerous + jinja2 kaitaistruct ldap3 markupsafe + passlib protobuf publicsuffix2 pyasn1 + pycparser pyopenssl pyparsing pyperclip + ruamel_yaml setuptools six sortedcontainers + tornado urwid werkzeug wsproto zstandard ]; checkInputs = [ beautifulsoup4 flask pytest requests glibcLocales asynctest parver pytest-asyncio + hypothesis ]; meta = with stdenv.lib; { description = "Man-in-the-middle proxy"; - homepage = https://mitmproxy.org/; + homepage = "https://mitmproxy.org/"; license = licenses.mit; maintainers = with maintainers; [ fpletz kamilchm ]; }; diff --git a/pkgs/tools/networking/mitmproxy/pytest5.patch b/pkgs/tools/networking/mitmproxy/pytest5.patch deleted file mode 100644 index bfbf7253b9c40..0000000000000 --- a/pkgs/tools/networking/mitmproxy/pytest5.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/test/mitmproxy/net/test_tls.py b/test/mitmproxy/net/test_tls.py -index 489bf89f..c78472e3 100644 ---- a/test/mitmproxy/net/test_tls.py -+++ b/test/mitmproxy/net/test_tls.py -@@ -87,14 +87,16 @@ def test_get_client_hello(): - rfile = io.BufferedReader(io.BytesIO( - FULL_CLIENT_HELLO_NO_EXTENSIONS[:30] - )) -- with pytest.raises(exceptions.TlsProtocolException, message="Unexpected EOF"): -+ with pytest.raises(exceptions.TlsProtocolException): - tls.get_client_hello(rfile) -+ pytest.fail("Unexpected EOF") - - rfile = io.BufferedReader(io.BytesIO( - b"GET /" - )) -- with pytest.raises(exceptions.TlsProtocolException, message="Expected TLS record"): -+ with pytest.raises(exceptions.TlsProtocolException): - tls.get_client_hello(rfile) -+ pytest.fail("Expected TLS record") - - - class TestClientHello: -@@ -153,5 +155,6 @@ class TestClientHello: - b"\x01\x00\x00\x03" + # handshake header - b"foo" - )) -- with pytest.raises(exceptions.TlsProtocolException, message='Cannot parse Client Hello'): -+ with pytest.raises(exceptions.TlsProtocolException): - tls.ClientHello.from_file(rfile) -+ pytest.fail('Cannot parse Client Hello') diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index e9d925fb930c5..7329d78c2c832 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "modem-manager"; - version = "1.12.6"; + version = "1.12.8"; package = "ModemManager"; src = fetchurl { url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz"; - sha256 = "0k32rjh06p3q9yq054gxya6c7n39bilhi4s23p2hb02iwlz3bcrf"; + sha256 = "1zrsf57bn9rmaa2qvavr1aisci76vwlx0viqpwmkw3ds2l33vdb8"; }; nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ]; @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon" ''; + enableParallelBuilding = true; + doCheck = true; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/mosh/bash_completion_datadir.patch b/pkgs/tools/networking/mosh/bash_completion_datadir.patch new file mode 100644 index 0000000000000..4b71f125d2879 --- /dev/null +++ b/pkgs/tools/networking/mosh/bash_completion_datadir.patch @@ -0,0 +1,19 @@ +diff --git a/configure.ac b/configure.ac +index 3ad983d..ff8ff96 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -476,13 +476,7 @@ AS_IF([echo "$protobuf_LIBS" | grep -q -- -pthread], + + # Bash completion needs to ask where it goes if >= 2.0 is installed. + AS_IF([test "$install_completion" != no], +- [PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], +- [if test "$prefix" = "NONE"; then +- completions="`pkg-config --variable=completionsdir bash-completion`" +- else +- completions="`pkg-config --define-variable=prefix=$prefix --variable=completionsdir bash-completion`" +- fi], +- [completions="${sysconfdir}/bash_completion.d"]) ++ [completions="`pkg-config --define-variable=datadir=$datadir --variable=completionsdir bash-completion`"] + AC_SUBST([completions])]) + + AC_CONFIG_FILES([ diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 5649ff06dda3c..26c9035cd79b2 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { url = "https://github.com/mobile-shell/mosh/commit/e5f8a826ef9ff5da4cfce3bb8151f9526ec19db0.patch"; sha256 = "15518rb0r5w1zn4s6981bf1sz6ins6gpn2saizfzhmr13hw4gmhm"; }) + # Fix build with bash-completion 2.10 + ./bash_completion_datadir.patch ]; postPatch = '' substituteInPlace scripts/mosh.pl \ @@ -40,7 +42,7 @@ stdenv.mkDerivation rec { CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; meta = { - homepage = https://mosh.org/; + homepage = "https://mosh.org/"; description = "Mobile shell (ssh replacement)"; longDescription = '' Remote terminal application that allows roaming, supports intermittent diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 18850fab33009..ae5695537af48 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/traviscross/mtr/pull/315 (fetchpatch { - url = https://github.com/traviscross/mtr/pull/315.patch?full_index=1; + url = "https://github.com/traviscross/mtr/pull/315.patch?full_index=1"; sha256 = "18qcsj9058snc2qhq6v6gdbqhz021gi5fgw9h7vfczv45gf0qasa"; }) ]; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index cdd954e19758c..ab13a70a69175 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,27 +1,31 @@ { stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe , xapian, glib, gmime3, texinfo , emacs, guile , gtk3, webkitgtk, libsoup, icu -, withMug ? false }: +, withMug ? false +, batchSize ? null }: stdenv.mkDerivation rec { pname = "mu"; - version = "1.2"; + version = "1.4.6"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "0yhjlj0z23jw3cf2wfnl98y8q6gikvmhkb8vdm87bd7jw0bdnrfz"; + sha256 = "0qbn99ar45vdpx1qwmqyr9zz14833d5xkxs1hr75549dds6a7rh5"; }; - # test-utils coredumps so don't run those - postPatch = '' - sed -i -e '/test-utils/d' lib/parser/Makefile.am + postPatch = stdenv.lib.optionalString (batchSize != null) '' + sed -i lib/mu-store.cc --regexp-extended \ + -e 's@(constexpr auto BatchSize).*@\1 = ${toString batchSize};@' ''; buildInputs = [ - sqlite xapian glib gmime3 texinfo emacs guile libsoup icu - ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ]; + sqlite xapian glib gmime3 texinfo emacs libsoup icu + ] + # Workaround for https://github.com/djcb/mu/issues/1641 + ++ stdenv.lib.optional (!stdenv.isDarwin) guile + ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ]; nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ]; @@ -31,15 +35,11 @@ stdenv.mkDerivation rec { # Fix mu4e-builddir (set it to $out) substituteInPlace mu4e/mu4e-meta.el.in \ --replace "@abs_top_builddir@" "$out" - - # We install msg2pdf to bin/msg2pdf, fix its location in elisp - substituteInPlace mu4e/mu4e-actions.el \ - --replace "/toys/msg2pdf/" "/bin/" ''; - # Install mug and msg2pdf + # Install mug postInstall = stdenv.lib.optionalString withMug '' - for f in msg2pdf mug ; do + for f in mug ; do install -m755 toys/$f/$f $out/bin/$f done ''; @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A collection of utilties for indexing and searching Maildirs"; license = licenses.gpl3Plus; - homepage = https://www.djcbsoftware.nl/code/mu/; + homepage = "https://www.djcbsoftware.nl/code/mu/"; + maintainers = with maintainers; [ antono peterhoeg ]; platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ antono the-kenny peterhoeg ]; }; } diff --git a/pkgs/tools/networking/nat-traverse/default.nix b/pkgs/tools/networking/nat-traverse/default.nix index a4dcfb4a40f2a..e3bf3391f21e8 100644 --- a/pkgs/tools/networking/nat-traverse/default.nix +++ b/pkgs/tools/networking/nat-traverse/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { isn't necessary to reconfigure the involved NAT gateways, either. nat-traverse works out-of-the-box. ''; - homepage = https://www.speicherleck.de/iblech/nat-traverse/; + homepage = "https://www.speicherleck.de/iblech/nat-traverse/"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.iblech ]; diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 9c443696eda68..d634c37b1231a 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lrt -lpthread"; meta = { - homepage = http://nbd.sourceforge.net; + homepage = "http://nbd.sourceforge.net"; description = "Map arbitrary files as block devices over the network"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.peti ]; diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix index acd9a0e27f86b..98fa6cc29f1a0 100644 --- a/pkgs/tools/networking/ncftp/default.nix +++ b/pkgs/tools/networking/ncftp/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command line FTP (File Transfer Protocol) client"; - homepage = https://www.ncftp.com/ncftp/; + homepage = "https://www.ncftp.com/ncftp/"; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.unix; license = licenses.clArtistic; diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix index 43018e401f1e1..03304df5f7928 100644 --- a/pkgs/tools/networking/ndisc6/default.nix +++ b/pkgs/tools/networking/ndisc6/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://www.remlab.net/ndisc6/; + homepage = "https://www.remlab.net/ndisc6/"; description = "A small collection of useful tools for IPv6 networking"; maintainers = with maintainers; [ eelco ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix index 85de6d131837c..3edfe9b7e5d60 100644 --- a/pkgs/tools/networking/ndjbdns/default.nix +++ b/pkgs/tools/networking/ndjbdns/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { longDescription = '' Djbdns is a fully‐fledged Domain Name System(DNS), originally written by the eminent author of qmail, Dr. D J Bernstein. ''; - homepage = http://pjp.dgplug.org/ndjbdns/; + homepage = "http://pjp.dgplug.org/ndjbdns/"; license = licenses.gpl2; maintainers = [ maintainers.msackman ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index ec94fc97997a5..69fc3e7a8b001 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0xrki9w83b4b3l5adq1rxz374f124wf388sdyvy7ngc3b04k7qlb"; }; - modSha256 = "0v45ikw0bl00412krg4v6sr9bggvsrvl0h6clihkh4mdfz6kwa47"; + vendorSha256 = "094mn1r69c40w7k3lsggjh0dpws9l0j7mgiyjy1lpblkvkyk2azm"; subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; @@ -40,4 +40,4 @@ buildGoModule rec { platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/netcat/default.nix b/pkgs/tools/networking/netcat/default.nix index 47ec804e5d481..5c275ee6ab4b0 100644 --- a/pkgs/tools/networking/netcat/default.nix +++ b/pkgs/tools/networking/netcat/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { name = "netcat-gnu-0.7.1"; src = fetchurl { - url = mirror://sourceforge/netcat/netcat-0.7.1.tar.bz2; + url = "mirror://sourceforge/netcat/netcat-0.7.1.tar.bz2"; sha256 = "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm"; }; meta = with stdenv.lib; { description = "Utility which reads and writes data across network connections"; - homepage = http://netcat.sourceforge.net/; + homepage = "http://netcat.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix index de53cfdd224cf..847d8cbcf8951 100644 --- a/pkgs/tools/networking/netkit/tftp/default.nix +++ b/pkgs/tools/networking/netkit/tftp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Netkit TFTP client and server"; - homepage = ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/; + homepage = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"; license = stdenv.lib.licenses.bsdOriginal; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/networking/netmask/default.nix b/pkgs/tools/networking/netmask/default.nix index 864838bdd3902..fa36ee5d80267 100644 --- a/pkgs/tools/networking/netmask/default.nix +++ b/pkgs/tools/networking/netmask/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = https://github.com/tlby/netmask; + homepage = "https://github.com/tlby/netmask"; description = "An IP address formatting tool "; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix index dfd355237dc07..f7d73283d48f4 100644 --- a/pkgs/tools/networking/netrw/default.nix +++ b/pkgs/tools/networking/netrw/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple tool for transporting data over the network"; license = stdenv.lib.licenses.gpl2; - homepage = https://mamuti.net/netrw/index.en.html; + homepage = "https://mamuti.net/netrw/index.en.html"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/netselect/default.nix b/pkgs/tools/networking/netselect/default.nix index c40f43c214fc6..dfca4c9058ee1 100644 --- a/pkgs/tools/networking/netselect/default.nix +++ b/pkgs/tools/networking/netselect/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/apenwarr/netselect; + homepage = "https://github.com/apenwarr/netselect"; description = "An ultrafast intelligent parallelizing binary-search implementation of \"ping\""; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 8da36d72fda28..9eb9afcb0e788 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "netsniff-ng"; - version = "0.6.6"; + version = "0.6.7"; # Upstream recommends and supports git src = fetchFromGitHub { repo = pname; owner = pname; rev = "v${version}"; - sha256 = "0spp8dl4i5xcqfbqxxcpdf3gwcmyf4ywl1dd79w6gzbr07p894p5"; + sha256 = "1jvihq30cwlpjqwny0lcrciysn40wscq6xik3s9b81nw2s7wiyqr"; }; nativeBuildInputs = [ pkgconfig makeWrapper bison flex ]; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { to user space and vice versa. The toolkit can be used for network development and analysis, debugging, auditing or network reconnaissance. ''; - homepage = http://netsniff-ng.org/; + homepage = "http://netsniff-ng.org/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/network-manager/0.9.8/default.nix b/pkgs/tools/networking/network-manager/0.9.8/default.nix index 131ec6751159a..6035e35f63405 100644 --- a/pkgs/tools/networking/network-manager/0.9.8/default.nix +++ b/pkgs/tools/networking/network-manager/0.9.8/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://projects.gnome.org/NetworkManager/; + homepage = "http://projects.gnome.org/NetworkManager/"; description = "Network configuration and management tool"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 3e1d6c8b8e65e..baf2128153aa8 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/NetworkManager; + homepage = "https://wiki.gnome.org/Projects/NetworkManager"; description = "Network configuration and management tool"; license = licenses.gpl2Plus; maintainers = with maintainers; [ phreedom domenkozar obadz worldofpeace ]; diff --git a/pkgs/tools/networking/network-manager/dmenu/default.nix b/pkgs/tools/networking/network-manager/dmenu/default.nix index 93a169a3fb0f8..f84ef027f7620 100644 --- a/pkgs/tools/networking/network-manager/dmenu/default.nix +++ b/pkgs/tools/networking/network-manager/dmenu/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small script to manage NetworkManager connections with dmenu instead of nm-applet"; - homepage = https://github.com/firecat53/networkmanager-dmenu; + homepage = "https://github.com/firecat53/networkmanager-dmenu"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.jensbin ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix index 09fb0c5977b53..430462f919971 100644 --- a/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "L2TP plugin for NetworkManager"; inherit (networkmanager.meta) platforms; - homepage = https://github.com/nm-l2tp/network-manager-l2tp; + homepage = "https://github.com/nm-l2tp/network-manager-l2tp"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar obadz ]; }; diff --git a/pkgs/tools/networking/network-manager/strongswan/default.nix b/pkgs/tools/networking/network-manager/strongswan/default.nix index 4f0a516b4201d..a1c6962d3f9ac 100644 --- a/pkgs/tools/networking/network-manager/strongswan/default.nix +++ b/pkgs/tools/networking/network-manager/strongswan/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "NetworkManager-strongswan"; - version = "1.4.5"; + version = "1.5.0"; src = fetchurl { url = "https://download.strongswan.org/NetworkManager/${pname}-${version}.tar.bz2"; - sha256 = "015xcj42pd84apa0j0n9r3fhldp42mj72dqvl2xf4r9gwg5nhfrl"; + sha256 = "1x6hivr1v76fxy1dn82xrj9rj8k3r097kf4yiblqq16y631hxzy4"; }; buildInputs = [ networkmanager strongswanNM libsecret gtk3 libnma ]; diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix index ab8da6236cff6..60125b515d67c 100644 --- a/pkgs/tools/networking/ngrep/default.nix +++ b/pkgs/tools/networking/ngrep/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { null interfaces, and understands BPF filter logic in the same fashion as more common packet sniffing tools, such as tcpdump and snoop. ''; - homepage = https://github.com/jpr5/ngrep/; + homepage = "https://github.com/jpr5/ngrep/"; # <ngrep>/doc/README.txt says that ngrep itself is licensed under a # 'BSD-like' license but that the 'regex' library (in the ngrep tarball) is # GPLv2. diff --git a/pkgs/tools/networking/ngrok-1/default.nix b/pkgs/tools/networking/ngrok-1/default.nix index 6e6d543c4391a..82f6ed4760cf1 100644 --- a/pkgs/tools/networking/ngrok-1/default.nix +++ b/pkgs/tools/networking/ngrok-1/default.nix @@ -30,6 +30,6 @@ buildGoPackage rec { buildFlags = [ "-tags release" ]; meta = { - homepage = https://ngrok.com/; + homepage = "https://ngrok.com/"; }; } diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index a0d6171efe211..f17849ef757cd 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { longDescription = '' Allows you to expose a web server running on your local machine to the internet. ''; - homepage = https://ngrok.com/; + homepage = "https://ngrok.com/"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; maintainers = [ maintainers.bobvanderlinden ]; diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix index 0ef2ce508671c..6503e70137748 100644 --- a/pkgs/tools/networking/noip/default.nix +++ b/pkgs/tools/networking/noip/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "noip-2.1.9-1"; src = fetchurl { - url = https://www.noip.com/client/linux/noip-duc-linux.tar.gz; + url = "https://www.noip.com/client/linux/noip-duc-linux.tar.gz"; sha256 = "82b9bafab96a0c53b21aaef688bf70b3572e26217b5e2072bdb09da3c4a6f593"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Dynamic DNS daemon for no-ip accounts"; - homepage = http://noip.com/download?page=linux; + homepage = "http://noip.com/download?page=linux"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.iand675 ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index 9f83949e8de08..1aaead46f6ad6 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { domain `.local'. ''; - homepage = http://0pointer.de/lennart/projects/nss-mdns/; + homepage = "http://0pointer.de/lennart/projects/nss-mdns/"; license = stdenv.lib.licenses.lgpl2Plus; # Supports both the GNU and FreeBSD NSS. diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index 569a6d118e777..3ce7638923c3c 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LDAP identity and authentication for NSS/PAM"; - homepage = https://arthurdejong.org/nss-pam-ldapd/; + homepage = "https://arthurdejong.org/nss-pam-ldapd/"; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 68f801060310f..3db5a28f1616a 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High-speed web-based traffic analysis and flow collection tool"; - homepage = http://www.ntop.org/products/ntop/; + homepage = "http://www.ntop.org/products/ntop/"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 0ce1c5a042929..d118227c3268f 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "An implementation of the Network Time Protocol"; license = { # very close to isc and bsd2 - url = https://www.eecis.udel.edu/~mills/ntp/html/copyright.html; + url = "https://www.eecis.udel.edu/~mills/ntp/html/copyright.html"; }; maintainers = with maintainers; [ eelco thoughtpolice ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix index f01d5ccada195..fe3cde5f91a03 100644 --- a/pkgs/tools/networking/nuttcp/default.nix +++ b/pkgs/tools/networking/nuttcp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { and loss percentage (for UDP transfers). ''; license = licenses.gpl2; - homepage = http://nuttcp.net/; + homepage = "http://nuttcp.net/"; maintainers = with maintainers; [ ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix index 5c8f98101eed1..d6f8cb21e0bcf 100644 --- a/pkgs/tools/networking/nylon/default.nix +++ b/pkgs/tools/networking/nylon/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { name = "nylon-1.21"; src = fetchurl { - url = https://monkey.org/~marius/nylon/nylon-1.21.tar.gz; + url = "https://monkey.org/~marius/nylon/nylon-1.21.tar.gz"; sha256 = "34c132b005c025c1a5079aae9210855c80f50dc51dde719298e1113ad73408a4"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { buildInputs = [ libevent ]; meta = with stdenv.lib; { - homepage = http://monkey.org/~marius/nylon; + homepage = "http://monkey.org/~marius/nylon"; description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode"; license = licenses.bsdOriginal; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/tools/networking/nyx/default.nix b/pkgs/tools/networking/nyx/default.nix index a7d788d7c3640..6ae81609eec83 100644 --- a/pkgs/tools/networking/nyx/default.nix +++ b/pkgs/tools/networking/nyx/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { meta = with lib; { description = "Command-line monitor for Tor"; - homepage = https://nyx.torproject.org/; + homepage = "https://nyx.torproject.org/"; license = licenses.gpl3; maintainers = with maintainers; [ offline ]; }; diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index b3c77f5b797cb..c25f19c03507a 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://nzbget.net; + homepage = "https://nzbget.net"; license = licenses.gpl2Plus; description = "A command line tool for downloading files from news servers"; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index 005abb0968b6d..784c6d5c638ed 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -10,12 +10,12 @@ buildGoModule rec { sha256 = "05aqmw8x8s0yqyqmdj5zcsq06gsbcmrlcd52gaqm20m1pg9503ad"; }; - modSha256 = "150kg22kznrdj5icjxk3qd70g7wpq8zd2zklw1y2fgvrggw8zvyv"; + vendorSha256 = "0h3gjxv26pc6cysvy1hny2f4abw6i847dk8fx0m113ixx9qghk87"; meta = with lib; { description = "A pluggable transport proxy"; - homepage = https://www.torproject.org/projects/obfsproxy; - repositories.git = https://git.torproject.org/pluggable-transports/obfs4.git; + homepage = "https://www.torproject.org/projects/obfsproxy"; + repositories.git = "https://git.torproject.org/pluggable-transports/obfs4.git"; maintainers = with maintainers; [ phreedom thoughtpolice ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/ocproxy/default.nix b/pkgs/tools/networking/ocproxy/default.nix index 729f5b3199807..877f15865acbc 100644 --- a/pkgs/tools/networking/ocproxy/default.nix +++ b/pkgs/tools/networking/ocproxy/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ocproxy is a user-level SOCKS and port forwarding proxy for OpenConnect based on lwIP. ''; - homepage = https://github.com/cernekee/ocproxy; + homepage = "https://github.com/cernekee/ocproxy"; license = licenses.bsd3; maintainers = [ maintainers.joko ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix index 8d4b340ea2b1f..dea0d10a277fa 100644 --- a/pkgs/tools/networking/ocserv/default.nix +++ b/pkgs/tools/networking/ocserv/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ nettle gnutls libev protobufc guile geoip libseccomp gperf readline lz4 libgssglue ronn pam ]; meta = with stdenv.lib; { - homepage = https://gitlab.com/openconnect/ocserv; + homepage = "https://gitlab.com/openconnect/ocserv"; license = licenses.gpl2; description = "This program is openconnect VPN server (ocserv), a server for the openconnect VPN client."; maintainers = with maintainers; [ ]; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 983ba01847381..73e2e6b60f51d 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -2,14 +2,14 @@ asciidoc, cacert, libxml2, libxslt, docbook_xsl }: python2Packages.buildPythonApplication rec { - version = "7.3.2"; + version = "7.3.3"; pname = "offlineimap"; src = fetchFromGitHub { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "0rmj1ws6hljqnfap3p3js5s46kx85yc02hjkiki5zg44wn3hswjg"; + sha256 = "1gg8ry67i20qapj4z20am9bm67m2q28kixcj7ja75m897vhzarnq"; }; postPatch = '' @@ -33,7 +33,7 @@ python2Packages.buildPythonApplication rec { meta = { description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers"; - homepage = http://offlineimap.org; + homepage = "http://offlineimap.org"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ endocrimes ]; }; diff --git a/pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch b/pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch index eb97209a693e4..c1174e1093a80 100644 --- a/pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch +++ b/pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch @@ -98,7 +98,7 @@ index 924a45ec..f05055c3 100644 + + plugin_path = g_getenv ("OFONO_PLUGIN_PATH"); + -+ if (!plugin_path) { ++ if (plugin_path) { + gchar **plugin_path_list; + gsize i; + diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix index 5cae8a612033a..c6b2ffe9e832f 100644 --- a/pkgs/tools/networking/ofono/default.nix +++ b/pkgs/tools/networking/ofono/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Infrastructure for building mobile telephony (GSM/UMTS) applications"; - homepage = https://01.org/ofono; + homepage = "https://01.org/ofono"; license = licenses.gpl2; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/olsrd/default.nix b/pkgs/tools/networking/olsrd/default.nix index cff4b7e97137b..bc5a03580195b 100644 --- a/pkgs/tools/networking/olsrd/default.nix +++ b/pkgs/tools/networking/olsrd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "An adhoc wireless mesh routing daemon"; license = stdenv.lib.licenses.bsd3; - homepage = http://olsr.org/; + homepage = "http://olsr.org/"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 1cb8e02130f73..2e5695ff45256 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; - homepage = https://github.com/OpenAPITools/openapi-generator; + homepage = "https://github.com/OpenAPITools/openapi-generator"; license = licenses.asl20; maintainers = [ maintainers.shou ]; }; diff --git a/pkgs/tools/networking/openapi-generator-cli/unstable.nix b/pkgs/tools/networking/openapi-generator-cli/unstable.nix index 01a0ef2242ed1..f5d71fb8e85b3 100644 --- a/pkgs/tools/networking/openapi-generator-cli/unstable.nix +++ b/pkgs/tools/networking/openapi-generator-cli/unstable.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; - homepage = https://github.com/OpenAPITools/openapi-generator; + homepage = "https://github.com/OpenAPITools/openapi-generator"; license = licenses.asl20; maintainers = [ maintainers.shou ]; }; diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index a926ef1e1ddcf..11f9fdc0fd8c1 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -4,19 +4,19 @@ assert (openssl != null) == (gnutls == null); let vpnc = fetchgit { url = "git://git.infradead.org/users/dwmw2/vpnc-scripts.git"; - rev = "c84fb8e5a523a647a01a1229a9104db934e19f00"; - sha256 = "01xdclx0y3x66mpbdr77n4ilapwzjz475h32q88ml9gnq6phjxrs"; + rev = "c0122e891f7e033f35f047dad963702199d5cb9e"; + sha256 = "11b1ls012mb704jphqxjmqrfbbhkdjb64j2q4k8wb5jmja8jnd14"; }; in stdenv.mkDerivation rec { pname = "openconnect"; - version = "8.05"; + version = "8.10"; src = fetchurl { urls = [ "ftp://ftp.infradead.org/pub/openconnect/${pname}-${version}.tar.gz" ]; - sha256 = "14i9q727c2zc9xhzp1a9hz3gzb5lwgsslbhircm84dnbs192jp1k"; + sha256 = "1cdsx4nsrwawbsisfkldfc9i4qn60g03vxb13nzppr2br9p4rrih"; }; outputs = [ "out" "dev" ]; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "VPN Client for Cisco's AnyConnect SSL VPN"; - homepage = http://www.infradead.org/openconnect/; + homepage = "http://www.infradead.org/openconnect/"; license = licenses.lgpl21; maintainers = with maintainers; [ pradeepchhetri tricktron ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/tools/networking/openconnect_pa/default.nix b/pkgs/tools/networking/openconnect_pa/default.nix index 68d18bff777bc..2c452847aa3ba 100644 --- a/pkgs/tools/networking/openconnect_pa/default.nix +++ b/pkgs/tools/networking/openconnect_pa/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "OpenConnect client extended to support Palo Alto Networks' GlobalProtect VPN"; - homepage = https://github.com/dlenski/openconnect/; + homepage = "https://github.com/dlenski/openconnect/"; license = licenses.lgpl21; maintainers = with maintainers; [ chessai ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 6e6e8fbf23c20..b0be2ab5e6d3b 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.13.1"; + version = "1.13.3"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "1sfqi169xf0wmlpzri9frkgsh99fgjvcpbdkd42vsm10qa1dnpk5"; + sha256 = "1y3b3zwzig520nyky7xnr0l0zf68i4w698bysyngpkada14d8dv3"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index 9cfb24ce95d45..7cbba9bfbf6bc 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.openntpd.org/; + homepage = "http://www.openntpd.org/"; license = licenses.bsd3; description = "OpenBSD NTP daemon (Debian port)"; platforms = platforms.all; diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index a05c8283e76c9..a80f94d2e9f2a 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "A program to manage /etc/resolv.conf"; - homepage = https://roy.marples.name/projects/openresolv; + homepage = "https://roy.marples.name/projects/openresolv"; license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index dd0151c89dac0..ad5072342f15f 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://www.openssh.com/; + homepage = "http://www.openssh.com/"; description = "An implementation of the SSH protocol"; license = stdenv.lib.licenses.bsd2; platforms = platforms.unix ++ platforms.windows; diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index c8aa2c1f5c57f..c5a15c2f87a86 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig +{ stdenv, fetchurl, fetchpatch, pkgconfig, makeWrapper , iproute, lzo, openssl, pam , useSystemd ? stdenv.isLinux, systemd ? null, utillinux ? null , pkcs11Support ? false, pkcs11helper ? null, @@ -10,36 +10,28 @@ assert pkcs11Support -> (pkcs11helper != null); with stdenv.lib; let - # There is some fairly brittle string substitutions going on to replace paths, - # so please verify this script in case you are upgrading it + # Check if the script needs to have other binaries wrapped when changing this. update-resolved = fetchurl { - url = "https://raw.githubusercontent.com/jonathanio/update-systemd-resolved/v1.2.7/update-systemd-resolved"; - sha256 = "12zfzh42apwbj7ks5kfxf3far7kaghlby4yapbhn00q8pbdlw7pq"; + url = "https://raw.githubusercontent.com/jonathanio/update-systemd-resolved/v1.3.0/update-systemd-resolved"; + sha256 = "021qzv1k0zxgv1rmyfpqj3zlzqr28xa7zff1n7vrbjk36ijylpsc"; }; in stdenv.mkDerivation rec { pname = "openvpn"; - version = "2.4.7"; + version = "2.4.9"; src = fetchurl { url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz"; - sha256 = "0j7na936isk9j8nsdrrbw7wmy09inmjqvsb8mw8az7k61xbm6bx4"; + sha256 = "1qpbllwlha7cffsd5dlddb8rl22g9rar5zflkz1wrcllhvfkl7v4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ lzo openssl ] ++ optionals stdenv.isLinux [ pam iproute ] ++ optional useSystemd systemd ++ optional pkcs11Support pkcs11helper; - patches = [ - ( fetchpatch { - url = "https://sources.debian.org/data/main/o/openvpn/2.4.7-1/debian/patches/fix-pkcs11-helper-hang.patch"; - sha256 = "0c8jzbfsmb0mm9f7kkjxac1hk8q6igm267s687vx3mdqs1wys6bm"; - }) - ]; - configureFlags = optionals stdenv.isLinux [ "--enable-iproute2" "IPROUTE=${iproute}/sbin/ip" ] @@ -52,24 +44,18 @@ in stdenv.mkDerivation rec { cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples cp -r sample/sample-keys/ $out/share/doc/openvpn/examples cp -r sample/sample-scripts/ $out/share/doc/openvpn/examples - - ${optionalString useSystemd '' - install -Dm755 ${update-resolved} $out/libexec/update-systemd-resolved - - substituteInPlace $out/libexec/update-systemd-resolved \ - --replace '/usr/bin/env bash' '${stdenv.shell} -e' \ - --replace 'busctl call' '${getBin systemd}/bin/busctl call' \ - --replace '(ip ' '(${getBin iproute}/bin/ip ' \ - --replace 'logger ' '${getBin utillinux}/bin/logger ' - ''} + '' + optionalString useSystemd '' + install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved + wrapProgram $out/libexec/update-systemd-resolved \ + --prefix PATH : ${makeBinPath [ stdenv.shell iproute systemd utillinux ]} ''; enableParallelBuilding = true; meta = with stdenv.lib; { description = "A robust and highly flexible tunneling application"; - downloadPage = "https://openvpn.net/index.php/open-source/downloads.html"; - homepage = https://openvpn.net/; + downloadPage = "https://openvpn.net/community-downloads/"; + homepage = "https://openvpn.net/"; license = licenses.gpl2; maintainers = with maintainers; [ viric ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix index 35b577ac37ece..bb06479be30e3 100644 --- a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix +++ b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "LDAP authentication plugin for OpenVPN"; - homepage = https://github.com/threerings/openvpn-auth-ldap; + homepage = "https://github.com/threerings/openvpn-auth-ldap"; license = [ licenses.asl20 licenses.bsd3 diff --git a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix index d86934d079b1f..d73b8e911b9d5 100644 --- a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix +++ b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "openvpn-learnaddress-19b03c3"; src = fetchgit { - url = https://gist.github.com/4058733.git; + url = "https://gist.github.com/4058733.git"; rev = "19b03c3beb0190df46ea07bf4b68244acb8eae80"; sha256 = "16pcyvyhwsx34i0cjkkx906lmrwdd9gvznvqdwlad4ha8l8f8z42"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Openvpn learn-address script to manage a hosts-like file"; - homepage = https://gist.github.com/offlinehacker/4058733/; + homepage = "https://gist.github.com/offlinehacker/4058733/"; maintainers = [ stdenv.lib.maintainers.offline ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix index 0f7e8f2c44500..76d04e6b685cf 100644 --- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Script to update your /etc/resolv.conf with DNS settings that come from the received push dhcp-options"; - homepage = https://github.com/masterkorp/openvpn-update-resolv-conf/; + homepage = "https://github.com/masterkorp/openvpn-update-resolv-conf/"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix index ddb3cc8e37712..4d18372363b68 100644 --- a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix +++ b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Helper script for OpenVPN to directly update the DNS settings of a link through systemd-resolved via DBus"; - homepage = https://github.com/jonathanio/update-systemd-resolved; + homepage = "https://github.com/jonathanio/update-systemd-resolved"; maintainers = with maintainers; [ eadwu ]; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/tools/networking/p2p/azureus/default.nix b/pkgs/tools/networking/p2p/azureus/default.nix index 4fcfc251f3fad..03737f9af2779 100644 --- a/pkgs/tools/networking/p2p/azureus/default.nix +++ b/pkgs/tools/networking/p2p/azureus/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "azureus-2.3.0.6"; builder = ./builder.sh; src = fetchurl { - url = http://tarballs.nixos.org/Azureus2.3.0.6.jar; + url = "http://tarballs.nixos.org/Azureus2.3.0.6.jar"; sha256 = "1hwrh3n0b0jbpsdk15zrs7pw175418phhmg6pn4xi1bvilxq1wrd"; }; # buildInputs = [unzip]; diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index 2ca31a6a1e739..b55c673c058bb 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://rakshasa.github.io/rtorrent/; + homepage = "https://rakshasa.github.io/rtorrent/"; description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; platforms = platforms.unix; diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix index 2a89e419b2e42..eccf38f39fdc2 100644 --- a/pkgs/tools/networking/p2p/seeks/default.nix +++ b/pkgs/tools/networking/p2p/seeks/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.agpl3Plus; - homepage = http://www.seeks-project.info/; + homepage = "http://www.seeks-project.info/"; maintainers = [ stdenv.lib.maintainers.matejc diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index e8a4261ed12e3..d55a46f609b11 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -86,7 +86,7 @@ pythonPackages.buildPythonApplication rec { such a way that it remains available even when some of the peers are unavailable, malfunctioning, or malicious. ''; - homepage = http://tahoe-lafs.org/; + homepage = "http://tahoe-lafs.org/"; license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; maintainers = with lib.maintainers; [ MostAwesomeDude ]; platforms = lib.platforms.gnu ++ lib.platforms.linux; diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/tools/networking/packetdrill/default.nix index 623645efc0cab..e4322242e0b66 100644 --- a/pkgs/tools/networking/packetdrill/default.nix +++ b/pkgs/tools/networking/packetdrill/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { description = "Quick, precise tests for entire TCP/UDP/IPv4/IPv6 network stacks"; - homepage = https://github.com/google/packetdrill; + homepage = "https://github.com/google/packetdrill"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ dmjio cleverca22 ]; diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/tools/networking/pacparser/default.nix index 211256ea72b8a..2d703730785f6 100644 --- a/pkgs/tools/networking/pacparser/default.nix +++ b/pkgs/tools/networking/pacparser/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to parse proxy auto-config (PAC) files"; - homepage = http://pacparser.manugarg.com/; + homepage = "http://pacparser.manugarg.com/"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix index 29d3230c6d37f..ecfe5fa035727 100644 --- a/pkgs/tools/networking/par2cmdline/default.nix +++ b/pkgs/tools/networking/par2cmdline/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = https://github.com/Parchive/par2cmdline; + homepage = "https://github.com/Parchive/par2cmdline"; description = "PAR 2.0 compatible file verification and repair tool"; longDescription = '' par2cmdline is a program for creating and using PAR2 files to detect diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/tools/networking/pcapc/default.nix index 663e04db46018..94a181eb5ae2b 100644 --- a/pkgs/tools/networking/pcapc/default.nix +++ b/pkgs/tools/networking/pcapc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/pfactum/pcapc; + homepage = "https://github.com/pfactum/pcapc"; description = "Compile libpcap filter expressions into BPF opcodes"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/tools/networking/pcapfix/default.nix index 92df5d55524b9..a700bd54e7ae0 100644 --- a/pkgs/tools/networking/pcapfix/default.nix +++ b/pkgs/tools/networking/pcapfix/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { postPatch = ''sed -i "s|/usr|$out|" Makefile''; meta = with stdenv.lib; { - homepage = https://f00l.de/pcapfix/; + homepage = "https://f00l.de/pcapfix/"; description = "Repair your broken pcap and pcapng files"; license = licenses.gpl3; maintainers = [ maintainers.ehmry ]; diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/tools/networking/pdnsd/default.nix index f5d30fa32a8b7..d2894271301fe 100644 --- a/pkgs/tools/networking/pdnsd/default.nix +++ b/pkgs/tools/networking/pdnsd/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pdnsd-1.2.9a-par"; src = fetchurl { - url = http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-1.2.9a-par.tar.gz; + url = "http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-1.2.9a-par.tar.gz"; sha256 = "0yragv5zk77a1hfkpnsh17vvsw8b14d6mzfng4bb7i58rb83an5v"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Permanent DNS caching"; - homepage = http://members.home.nl/p.a.rombouts/pdnsd; + homepage = "http://members.home.nl/p.a.rombouts/pdnsd"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [viric]; diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 68aa356261abb..9dd1a5581c554 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/chaos/pdsh; + homepage = "https://github.com/chaos/pdsh"; description = "High-performance, parallel remote shell utility"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index 7412bc568a280..63e2af48c1ea2 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -53,7 +53,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Persepolis Download Manager is a GUI for aria2."; - homepage = https://persepolisdm.github.io/; + homepage = "https://persepolisdm.github.io/"; license = licenses.gpl3; maintainers = [ maintainers.linarcx ]; }; diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix index c8b4411684689..ee079fe9fdf03 100644 --- a/pkgs/tools/networking/philter/default.nix +++ b/pkgs/tools/networking/philter/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mail sorter for Maildirs"; - homepage = http://philter.sourceforge.net; + homepage = "http://philter.sourceforge.net"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix index 617eb0ec40ce8..c6b479dd25075 100644 --- a/pkgs/tools/networking/phodav/default.nix +++ b/pkgs/tools/networking/phodav/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "WebDav server implementation and library using libsoup"; - homepage = https://wiki.gnome.org/phodav; + homepage = "https://wiki.gnome.org/phodav"; license = licenses.lgpl21; maintainers = with maintainers; [ gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix index 8d75ea413ecaa..22da1320803e5 100644 --- a/pkgs/tools/networking/photon/default.nix +++ b/pkgs/tools/networking/photon/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "a lightning fast web crawler which extracts URLs, files, intel & endpoints from a target"; - homepage = https://github.com/s0md3v/Photon; + homepage = "https://github.com/s0md3v/Photon"; license = licenses.gpl3; maintainers = with maintainers; [ genesis ]; }; diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/tools/networking/pingtcp/default.nix index d791f6b91d995..d3fb37705bd9d 100644 --- a/pkgs/tools/networking/pingtcp/default.nix +++ b/pkgs/tools/networking/pingtcp/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Measure TCP handshake time"; - homepage = https://github.com/LanetNetwork/pingtcp; + homepage = "https://github.com/LanetNetwork/pingtcp"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index bacea663493ff..aa4fbd52e2872 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonApplication rec { pname = "pirate-get"; - version = "0.3.5"; + version = "0.3.7"; doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "01jr9c04ic4bfalfdijavzvqzmpkw3hq1glqyc86z3v6zwl8dlp2"; + sha256 = "0i87g7f25dzsi5b3swr9gny2zpmrrgygxmr1ps71rjr1n540si9n"; }; propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 pyperclip ]; diff --git a/pkgs/tools/networking/pixiecore/default.nix b/pkgs/tools/networking/pixiecore/default.nix index bc8ec7da16987..60d2a0986b164 100644 --- a/pkgs/tools/networking/pixiecore/default.nix +++ b/pkgs/tools/networking/pixiecore/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { sha256 = "14dslmx3gk08h9gqfjw5y27x7d2c6r8ir7mjd7l9ybysagpzr02a"; }; - modSha256 = "1waqaglm6f9zy5296z309ppkck2vmydhk9gjnxrgzmhqld5lcq4f"; + vendorSha256 = "08n3m6fkwh8jmmzky3ygij4gxlcqidqk5ywi8ki8bkyzzs2lqaw7"; subPackages = [ "cmd/pixiecore" ]; meta = { @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = with stdenv.lib.maintainers; [ bbigras danderson ]; platforms = stdenv.lib.platforms.linux; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/pixiewps/default.nix b/pkgs/tools/networking/pixiewps/default.nix index 8bbf589f3b3df..98a780a1704f8 100644 --- a/pkgs/tools/networking/pixiewps/default.nix +++ b/pkgs/tools/networking/pixiewps/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "An offline WPS bruteforce utility"; - homepage = https://github.com/wiire/pixiewps; + homepage = "https://github.com/wiire/pixiewps"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.nico202 ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/polygraph/default.nix b/pkgs/tools/networking/polygraph/default.nix index bdc6e7b67f7d0..05053b3734948 100644 --- a/pkgs/tools/networking/polygraph/default.nix +++ b/pkgs/tools/networking/polygraph/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib ncurses ]; meta = with stdenv.lib; { - homepage = http://www.web-polygraph.org; + homepage = "http://www.web-polygraph.org"; description = "Performance testing tool for caching proxies, origin server accelerators, L4/7 switches, content filters, and other Web intermediaries"; platforms = platforms.linux; license = licenses.asl20; diff --git a/pkgs/tools/networking/polysh/default.nix b/pkgs/tools/networking/polysh/default.nix index cf963068d1c57..34bc908060aaa 100644 --- a/pkgs/tools/networking/polysh/default.nix +++ b/pkgs/tools/networking/polysh/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { at once. ''; maintainers = [ maintainers.astsmtl ]; - homepage = http://guichaz.free.fr/polysh/; + homepage = "http://guichaz.free.fr/polysh/"; license = licenses.gpl2; }; } diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 1579823450b69..f507b582f64b4 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sha256 = "0wirmcis67xjwllqhz9lsz1b7dcvl8shvz78lxgybc70j2sv7ih4"; }) (fetchurl { - url = https://www.nikhef.nl/~janjust/ppp/ppp-2.4.7-eaptls-mppe-1.102.patch; + url = "https://www.nikhef.nl/~janjust/ppp/ppp-2.4.7-eaptls-mppe-1.102.patch"; sha256 = "04war8l5szql53l36043hvzgfwqp3v76kj8brbz7wlf7vs2mlkia"; }) (fetchpatch { @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://ppp.samba.org/; + homepage = "https://ppp.samba.org/"; description = "Point-to-point implementation for Linux and Solaris"; license = with licenses; [ bsdOriginal publicDomain gpl2 lgpl2 ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index 6a97abfab590d..dfc61d8197c19 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PPTP client for Linux"; - homepage = http://pptpclient.sourceforge.net/; + homepage = "http://pptpclient.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/pptpd/default.nix b/pkgs/tools/networking/pptpd/default.nix index f373f594df80c..e6f5f9503d8e6 100644 --- a/pkgs/tools/networking/pptpd/default.nix +++ b/pkgs/tools/networking/pptpd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://poptop.sourceforge.net/dox/; + homepage = "http://poptop.sourceforge.net/dox/"; description = "The PPTP Server for Linux"; platforms = platforms.linux; maintainers = with maintainers; [ obadz ]; diff --git a/pkgs/tools/networking/prettyping/default.nix b/pkgs/tools/networking/prettyping/default.nix index fb0508b3c9030..43f32ddb9fb41 100644 --- a/pkgs/tools/networking/prettyping/default.nix +++ b/pkgs/tools/networking/prettyping/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://github.com/denilsonsa/prettyping; + homepage = "https://github.com/denilsonsa/prettyping"; description = "A wrapper around the standard ping tool with the objective of making the output prettier, more colorful, more compact, and easier to read"; license = with licenses; [ mit ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 848a99f77718e..331295ffd1f46 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec{ ''; meta = with stdenv.lib; { - homepage = https://www.privoxy.org/; + homepage = "https://www.privoxy.org/"; description = "Non-caching web proxy with advanced filtering capabilities"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix index 52ef43838c265..6f00c7fc8b742 100644 --- a/pkgs/tools/networking/proxychains/default.nix +++ b/pkgs/tools/networking/proxychains/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Proxifier for SOCKS proxies"; - homepage = http://proxychains.sourceforge.net; + homepage = "http://proxychains.sourceforge.net"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/pwnat/default.nix b/pkgs/tools/networking/pwnat/default.nix index 9e06a64414566..55965173e0ef3 100644 --- a/pkgs/tools/networking/pwnat/default.nix +++ b/pkgs/tools/networking/pwnat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://samy.pl/pwnat/; + homepage = "http://samy.pl/pwnat/"; description = "ICMP NAT to NAT client-server communication"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with maintainers; [viric]; diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix index e1a13b73120e6..345999c00bcd9 100644 --- a/pkgs/tools/networking/pykms/default.nix +++ b/pkgs/tools/networking/pykms/default.nix @@ -44,16 +44,14 @@ in buildPythonApplication rec { propagatedBuildInputs = [ systemd pytz tzlocal ]; + # Fix https://github.com/SystemRage/py-kms/issues/64 : + patches = [ ./log-to-current-directory-by-default.patch ]; + postPatch = '' siteDir=$out/${python3.sitePackages} substituteInPlace pykms_DB2Dict.py \ --replace "'KmsDataBase.xml'" "'$siteDir/KmsDataBase.xml'" - - # we are logging to journal - sed -i pykms_Misc.py \ - -e '6ifrom systemd import journal' \ - -e 's/log_obj.addHandler(log_handler)/log_obj.addHandler(journal.JournalHandler())/' ''; format = "other"; diff --git a/pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch b/pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch new file mode 100644 index 0000000000000..7c8c65b63a2a0 --- /dev/null +++ b/pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch @@ -0,0 +1,20 @@ +# By default, create log files in current directory, instead of the script directory. +--- ../original/py-kms/pykms_Client.py ++++ py-kms/pykms_Client.py +@@ -48,5 +48,5 @@ + 'choi' : ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG", "MINI"]}, + 'lfile' : {'help' : 'Use this option to set an output log file. The default is \"pykms_logclient.log\" or type \"STDOUT\" to view log info on stdout.', +- 'def' : os.path.dirname(os.path.abspath( __file__ )) + "/pykms_logclient.log", 'des' : "logfile"}, ++ 'def' : "pykms_logclient.log", 'des' : "logfile"}, + 'lsize' : {'help' : 'Use this flag to set a maximum size (in MB) to the output log file. Desactivated by default.', 'def' : 0, 'des': "logsize"}, + } +--- ../original/py-kms/pykms_Server.py ++++ py-kms/pykms_Server.py +@@ -85,5 +85,5 @@ + 'choi' : ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG", "MINI"]}, + 'lfile' : {'help' : 'Use this option to set or not an output log file. The default is \"pykms_logserver.log\" or type \"STDOUT\" to view log info on stdout.', +- 'def' : os.path.dirname(os.path.abspath( __file__ )) + "/pykms_logserver.log", 'des' : "logfile"}, ++ 'def' : "pykms_logserver.log", 'des' : "logfile"}, + 'lsize' : {'help' : 'Use this flag to set a maximum size (in MB) to the output log file. Desactivated by default.', 'def' : 0, 'des': "logsize"}, + } + ''); diff --git a/pkgs/tools/networking/qr-filetransfer/default.nix b/pkgs/tools/networking/qr-filetransfer/default.nix index b95d0facda893..bb62be6d3e243 100644 --- a/pkgs/tools/networking/qr-filetransfer/default.nix +++ b/pkgs/tools/networking/qr-filetransfer/default.nix @@ -16,7 +16,7 @@ buildGoPackage { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/claudiodangelis/qr-filetransfer; + homepage = "https://github.com/claudiodangelis/qr-filetransfer"; description = "Transfer files over wifi by scanning a QR code from your terminal"; longDescription = '' qr-filetransfer binds a web server to the address of your Wi-Fi network diff --git a/pkgs/tools/networking/quickserve/default.nix b/pkgs/tools/networking/quickserve/default.nix index 22589582e3b98..8f4876b6ee267 100644 --- a/pkgs/tools/networking/quickserve/default.nix +++ b/pkgs/tools/networking/quickserve/default.nix @@ -3,7 +3,7 @@ let threaded_servers = python3Packages.buildPythonPackage { name = "threaded_servers"; src = fetchzip { - url = https://xyne.archlinux.ca/projects/python3-threaded_servers/src/python3-threaded_servers-2018.6.tar.xz; + url = "https://xyne.archlinux.ca/projects/python3-threaded_servers/src/python3-threaded_servers-2018.6.tar.xz"; sha256 = "1irliz90a1dk4lyl7mrfq8qnnrfad9czvbcw1spc13zyai66iyhf"; }; @@ -28,7 +28,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A simple HTTP server for quickly sharing files."; - homepage = https://xyne.archlinux.ca/projects/quickserve/; + homepage = "https://xyne.archlinux.ca/projects/quickserve/"; license = licenses.gpl2; maintainers = with maintainers; [ lassulus ]; }; diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix index 87071e23a9663..0f7a16caa82cd 100644 --- a/pkgs/tools/networking/quicktun/default.nix +++ b/pkgs/tools/networking/quicktun/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Very simple, yet secure VPN software"; - homepage = http://wiki.ucis.nl/QuickTun; + homepage = "http://wiki.ucis.nl/QuickTun"; maintainers = [ maintainers.fpletz ]; platforms = platforms.unix; license = licenses.bsd2; diff --git a/pkgs/tools/networking/radsecproxy/default.nix b/pkgs/tools/networking/radsecproxy/default.nix index 5460bf80a07e0..ab5ff481ec7aa 100644 --- a/pkgs/tools/networking/radsecproxy/default.nix +++ b/pkgs/tools/networking/radsecproxy/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://software.nordu.net/radsecproxy/; + homepage = "https://software.nordu.net/radsecproxy/"; description = "A generic RADIUS proxy that supports both UDP and TLS (RadSec) RADIUS transports."; license = licenses.bsd3; maintainers = with maintainers; [ sargon ]; diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index 30e706d667376..aef67022f7865 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdaemon ]; meta = with stdenv.lib; { - homepage = http://www.litech.org/radvd/; + homepage = "http://www.litech.org/radvd/"; description = "IPv6 Router Advertisement Daemon"; platforms = platforms.linux; license = licenses.bsdOriginal; diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/tools/networking/ratools/default.nix index f5353db680355..23d0dae086ec8 100644 --- a/pkgs/tools/networking/ratools/default.nix +++ b/pkgs/tools/networking/ratools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A fast, dynamic, multi-threading framework for IPv6 Router Advertisements"; - homepage = https://github.com/danrl/ratools; + homepage = "https://github.com/danrl/ratools"; license = licenses.asl20; platforms = platforms.linux; maintainers = [ maintainers.fpletz ]; diff --git a/pkgs/tools/networking/reaver-wps-t6x/default.nix b/pkgs/tools/networking/reaver-wps-t6x/default.nix index 2d239180a93dc..d347273f50ec7 100644 --- a/pkgs/tools/networking/reaver-wps-t6x/default.nix +++ b/pkgs/tools/networking/reaver-wps-t6x/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Online and offline brute force attack against WPS"; - homepage = https://github.com/t6x/reaver-wps-fork-t6x; + homepage = "https://github.com/t6x/reaver-wps-fork-t6x"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ nico202 volth ]; diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix index 864a7fb5e613f..9f4f2d5bea4eb 100644 --- a/pkgs/tools/networking/reaver-wps/default.nix +++ b/pkgs/tools/networking/reaver-wps/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Brute force attack against Wifi Protected Setup"; - homepage = https://code.google.com/archive/p/reaver-wps/; + homepage = "https://code.google.com/archive/p/reaver-wps/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ nico202 volth ]; diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix index 1a6efb065e2ee..7f69dacedf317 100644 --- a/pkgs/tools/networking/redir/default.nix +++ b/pkgs/tools/networking/redir/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "A TCP port redirector for UNIX"; - homepage = https://github.com/troglobit/redir; + homepage = "https://github.com/troglobit/redir"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/tools/networking/redsocks/default.nix index 32a30f48ec652..d389221eabb10 100644 --- a/pkgs/tools/networking/redsocks/default.nix +++ b/pkgs/tools/networking/redsocks/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "Transparent redirector of any TCP connection to proxy"; - homepage = http://darkk.net.ru/redsocks/; + homepage = "http://darkk.net.ru/redsocks/"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.ekleog ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix index ae84d9662aa0b..0c3c32270b17a 100644 --- a/pkgs/tools/networking/ripmime/default.nix +++ b/pkgs/tools/networking/ripmime/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Attachment extractor for MIME messages"; maintainers = with maintainers; [ raskin ]; - homepage = http://www.pldaniels.com/ripmime/; + homepage = "http://www.pldaniels.com/ripmime/"; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index bdb526c70543e..d8476d1d159a6 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Roaring Penguin Point-to-Point over Ethernet tool"; platforms = platforms.linux; - homepage = https://www.roaringpenguin.com/products/pppoe; + homepage = "https://www.roaringpenguin.com/products/pppoe"; license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/rshijack/default.nix b/pkgs/tools/networking/rshijack/default.nix new file mode 100644 index 0000000000000..59558028c01e7 --- /dev/null +++ b/pkgs/tools/networking/rshijack/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "rshijack"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "kpcyrd"; + repo = pname; + rev = "v${version}"; + sha256 = "0y01hi3jpfawqlqs8ka0vwfhjw5j5gkhk2nz5m13ns2h27bw20v7"; + }; + + cargoSha256 = "0l1kavacnjvi22l6pawgkqqxnjaizi3pddqkhwjshw4pzzixzvli"; + + meta = with lib; { + description = "TCP connection hijacker"; + homepage = "https://github.com/kpcyrd/rshijack"; + license = licenses.gpl3; + maintainers = with maintainers; [ xrelkd ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/rtptools/default.nix b/pkgs/tools/networking/rtptools/default.nix index a713331d7c29d..5d439f183d2f6 100644 --- a/pkgs/tools/networking/rtptools/default.nix +++ b/pkgs/tools/networking/rtptools/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; meta = { description = "A number of small applications that can be used for processing RTP data"; - homepage = "http://www.cs.columbia.edu/irt/software/rtptools/"; + homepage = "https://www.cs.columbia.edu/irt/software/rtptools/"; maintainers = [ lib.maintainers.lheckemann ]; platforms = lib.platforms.unix; license = lib.licenses.bsd3; diff --git a/pkgs/tools/networking/s4cmd/default.nix b/pkgs/tools/networking/s4cmd/default.nix index 8088cc0ec4d98..dedbc751179f0 100644 --- a/pkgs/tools/networking/s4cmd/default.nix +++ b/pkgs/tools/networking/s4cmd/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/bloomreach/s4cmd; + homepage = "https://github.com/bloomreach/s4cmd"; description = "Super S3 command line tool"; license = licenses.asl20; maintainers = [ maintainers.bhipple ]; diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/tools/networking/samplicator/default.nix index d8167b8a48fce..0cc446edd9cd7 100644 --- a/pkgs/tools/networking/samplicator/default.nix +++ b/pkgs/tools/networking/samplicator/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Send copies of (UDP) datagrams to multiple receivers"; - homepage = https://github.com/sleinen/samplicator/; + homepage = "https://github.com/sleinen/samplicator/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index f2ae143e1b9e9..f4cc57c9c8b2f 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { goPackagePath = "github.com/SrKomodo/shadowfox-updater"; - modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r"; + vendorSha256 = "06ar9ivry9b01609izjbl6hqgg0cy7aqd8n2cqpyq0g7my0l0lbj"; buildFlags = [ "--tags" "release" ]; @@ -27,4 +27,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ infinisil ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index c9ff4c7f649d6..7ad0f1e862d66 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices and low-end boxes. It is a port of Shadowsocks created by @clowwindy, which is maintained by @madeye and @linusyang. ''; - homepage = https://github.com/shadowsocks/shadowsocks-libev; + homepage = "https://github.com/shadowsocks/shadowsocks-libev"; license = licenses.gpl3Plus; maintainers = [ maintainers.nfjinjing ]; platforms = platforms.all; diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 973d0287149b2..ba90a7cacb77a 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,26 +2,25 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.7.2"; + version = "1.8.11"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "0w7ysha46ml3j1i1knvll4pmqg291z8a2ypcy650m61dhrvkh2ng"; + sha256 = "0imnvx3v0msk9qf72zy1qg5q52dmc8xfs9iwdwa2q13scjslgmwn"; }; - cargoSha256 = "0srmn8ndy7vdvcysyb7a5pjly0m3jchq0zrqzhrwicynm291w56h"; + cargoSha256 = "1aqqx0pdq3vp5c06pjwsrbrqfkz5dhxnpvv3vnr3pqfm62xrffgg"; + + SODIUM_USE_PKG_CONFIG = 1; buildInputs = [ openssl libsodium ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkgconfig ]; - # tries to read /etc/resolv.conf, hence fails in sandbox - doCheck = false; - meta = with stdenv.lib; { - homepage = https://github.com/shadowsocks/shadowsocks-rust; + homepage = "https://github.com/shadowsocks/shadowsocks-rust"; description = "A Rust port of shadowsocks"; license = licenses.mit; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/tools/networking/shncpd/default.nix b/pkgs/tools/networking/shncpd/default.nix index be861654f658d..46c9b22248acf 100644 --- a/pkgs/tools/networking/shncpd/default.nix +++ b/pkgs/tools/networking/shncpd/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple, stupid and slow HNCP daemon"; - homepage = https://www.irif.univ-paris-diderot.fr/~jch/software/homenet/shncpd.html; + homepage = "https://www.irif.univ-paris-diderot.fr/~jch/software/homenet/shncpd.html"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.fpletz ]; diff --git a/pkgs/tools/networking/shorewall/default.nix b/pkgs/tools/networking/shorewall/default.nix index 8e62aa735a41b..67f81b8210531 100644 --- a/pkgs/tools/networking/shorewall/default.nix +++ b/pkgs/tools/networking/shorewall/default.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.shorewall.net/; + homepage = "http://www.shorewall.net/"; description = "An IP gateway/firewall configuration tool for GNU/Linux"; longDescription = '' Shorewall is a high-level tool for configuring Netfilter. You describe your diff --git a/pkgs/tools/networking/simpleproxy/default.nix b/pkgs/tools/networking/simpleproxy/default.nix index f94e177a8585d..7a5bc713faee3 100644 --- a/pkgs/tools/networking/simpleproxy/default.nix +++ b/pkgs/tools/networking/simpleproxy/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/vzaliva/simpleproxy; + homepage = "https://github.com/vzaliva/simpleproxy"; description = "A simple TCP proxy"; license = licenses.gpl2; maintainers = [ maintainers.montag451 ]; diff --git a/pkgs/tools/networking/sipcalc/default.nix b/pkgs/tools/networking/sipcalc/default.nix index dff929e9fa1c7..081f200533012 100644 --- a/pkgs/tools/networking/sipcalc/default.nix +++ b/pkgs/tools/networking/sipcalc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Advanced console ip subnet calculator"; - homepage = http://www.routemeister.net/projects/sipcalc/; + homepage = "http://www.routemeister.net/projects/sipcalc/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.globin ]; diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix index c1a2451328df0..09de1c2e594a7 100644 --- a/pkgs/tools/networking/sipsak/default.nix +++ b/pkgs/tools/networking/sipsak/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/sipwise/sipsak; + homepage = "https://github.com/sipwise/sipsak"; description = "SIP Swiss army knife"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ sheenobu ]; diff --git a/pkgs/tools/networking/slimrat/default.nix b/pkgs/tools/networking/slimrat/default.nix deleted file mode 100644 index 8632a33e34987..0000000000000 --- a/pkgs/tools/networking/slimrat/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, fetchurl, perlPackages, makeWrapper}: - -stdenv.mkDerivation { - name = "slimrat-1.0"; - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/slimrat/slimrat-1.0.tar.bz2"; - sha256 = "139b71d45k4b1y47iq62a9732cnaqqbh8s4knkrgq2hx0jxpsk5a"; - }; - - buildInputs = [ makeWrapper ] ++ (with perlPackages; [ perl WWWMechanize LWP ]); - - patchPhase = '' - sed -e 's,#!.*,#!${perlPackages.perl}/bin/perl,' -i src/{slimrat,slimrat-gui} - ''; - - installPhase = '' - mkdir -p $out/share/slimrat $out/bin - cp -R src/* $out/share/slimrat - # slimrat-gui does not work (it needs the Gtk2 perl package) - for i in slimrat; do - makeWrapper $out/share/slimrat/$i $out/bin/$i \ - --prefix PERL5LIB : $PERL5LIB - done - ''; - - meta = { - homepage = https://code.google.com/archive/p/slimrat/; - description = "Linux Rapidshare downloader"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - broken = true; # officially abandonned upstream - }; -} diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index f3bd0a23d587f..5aa3219e5b101 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -6,17 +6,18 @@ , libcap , libseccomp , libslirp +, nixosTests }: stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "152wmccz47anvx5w88qcz8higw80l17jl7i24xfj5574adviqnv2"; + sha256 = "1p5cvq0jsjkl136b8cz3j552x01g96j38ygh6m8ss62bmyzb8ayc"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -25,6 +26,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests.podman = nixosTests.podman; + meta = with stdenv.lib; { homepage = "https://github.com/rootless-containers/slirp4netns"; description = "User-mode networking for unprivileged network namespaces"; diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix index 6a816615e9c19..80f8b49a0cce0 100644 --- a/pkgs/tools/networking/smokeping/default.nix +++ b/pkgs/tools/networking/smokeping/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = { description = "Network latency collector"; - homepage = http://oss.oetiker.ch/smokeping; + homepage = "http://oss.oetiker.ch/smokeping"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.erictapen ]; diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index caca1c829ec3f..52ad14c1d110d 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = { - homepage = https://github.com/SnabbCo/snabbswitch; + homepage = "https://github.com/SnabbCo/snabbswitch"; description = "Simple and fast packet networking toolkit"; longDescription = '' Snabb Switch is a LuaJIT-based toolkit for writing high-speed diff --git a/pkgs/tools/networking/sniffglue/default.nix b/pkgs/tools/networking/sniffglue/default.nix new file mode 100644 index 0000000000000..83f1e372aa585 --- /dev/null +++ b/pkgs/tools/networking/sniffglue/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub, rustPlatform, libpcap, libseccomp, pkgconfig }: + +rustPlatform.buildRustPackage rec { + pname = "sniffglue"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "kpcyrd"; + repo = pname; + rev = "v${version}"; + sha256 = "0vyxlqwh90shihp80fk0plnkjix9i37n2dnypzyz6nx44xd5737s"; + }; + + cargoSha256 = "162p3a696k281cygqpl6gg4makwk2v0g2jnf1gd108dnz4jya11l"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libpcap libseccomp ]; + + meta = with lib; { + description = "Secure multithreaded packet sniffer"; + homepage = "https://github.com/kpcyrd/sniffglue"; + license = licenses.gpl3; + maintainers = with maintainers; [ xrelkd ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/socat/2.x.nix b/pkgs/tools/networking/socat/2.x.nix index 99f0301c7c862..97775a00604bb 100644 --- a/pkgs/tools/networking/socat/2.x.nix +++ b/pkgs/tools/networking/socat/2.x.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A utility for bidirectional data transfer between two independent data channels"; - homepage = http://www.dest-unreach.org/socat/; - repositories.git = git://repo.or.cz/socat.git; + homepage = "http://www.dest-unreach.org/socat/"; + repositories.git = "git://repo.or.cz/socat.git"; platforms = platforms.unix; license = licenses.gpl2; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index ba7aaee63ab9d..c50b2236c9e4e 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "A utility for bidirectional data transfer between two independent data channels"; - homepage = http://www.dest-unreach.org/socat/; - repositories.git = git://repo.or.cz/socat.git; + homepage = "http://www.dest-unreach.org/socat/"; + repositories.git = "git://repo.or.cz/socat.git"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix index 2b5aa2b7cbf78..cadaf021cda7a 100644 --- a/pkgs/tools/networking/spoofer/default.nix +++ b/pkgs/tools/networking/spoofer/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ++ optional withGUI qt5.qtbase ; meta = with stdenv.lib; { - homepage = https://www.caida.org/projects/spoofer; + homepage = "https://www.caida.org/projects/spoofer"; description = "Assess and report on deployment of source address validation"; longDescription = '' Spoofer is a new client-server system for Windows, MacOS, and diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix index b55860a20c172..1e7486dd30595 100644 --- a/pkgs/tools/networking/srelay/default.nix +++ b/pkgs/tools/networking/srelay/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "A SOCKS proxy and relay"; - homepage = http://socks-relay.sourceforge.net/; + homepage = "http://socks-relay.sourceforge.net/"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.bsd3; }; diff --git a/pkgs/tools/networking/ssh-agents/default.nix b/pkgs/tools/networking/ssh-agents/default.nix index b01d373088b7b..a4e930281a508 100644 --- a/pkgs/tools/networking/ssh-agents/default.nix +++ b/pkgs/tools/networking/ssh-agents/default.nix @@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation rec { given name is expected to be a folder under ~/.ssh/name containing the keys to include in the agent. ''; - homepage = https://github.com/kalbasit/ssh-agents; + homepage = "https://github.com/kalbasit/ssh-agents"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/ssh-ident/default.nix b/pkgs/tools/networking/ssh-ident/default.nix index cb07d73a63199..d46d6ea1ac285 100644 --- a/pkgs/tools/networking/ssh-ident/default.nix +++ b/pkgs/tools/networking/ssh-ident/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/ccontavalli/ssh-ident; + homepage = "https://github.com/ccontavalli/ssh-ident"; description = "Start and use ssh-agent and load identities as necessary"; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ telotortium ]; diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix index 3765e6aa08f72..7f5644edb5263 100644 --- a/pkgs/tools/networking/sshpass/default.nix +++ b/pkgs/tools/networking/sshpass/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/sshpass/; + homepage = "https://sourceforge.net/projects/sshpass/"; description = "Non-interactive ssh password auth"; license = licenses.gpl2; maintainers = [ maintainers.madjar ]; diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix index 0081e7d1ddb97..2c008cbb36a15 100644 --- a/pkgs/tools/networking/ssldump/default.nix +++ b/pkgs/tools/networking/ssldump/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { "--with-openssl-inc=${openssl}/include" ]; meta = { description = "ssldump is an SSLv3/TLS network protocol analyzer"; - homepage = http://ssldump.sourceforge.net; + homepage = "http://ssldump.sourceforge.net"; license = "BSD-style"; maintainers = with stdenv.lib.maintainers; [ aycanirican ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index 81da427a52cfa..90547eb13643f 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "ssmtp-2.64"; src = fetchurl { - url = mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2; + url = "mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2"; sha256 = "0dps8s87ag4g3jr6dk88hs9zl46h3790marc5c2qw7l71k4pvhr2"; }; diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index de65298d6481f..4d05b478ab402 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "SSTP client for Linux"; - homepage = http://sstp-client.sourceforge.net/; + homepage = "http://sstp-client.sourceforge.net/"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.ktosiek ]; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index fb7de5486fb0a..6ff141e099c72 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { meta = { description = "OpenSource IPsec-based VPN Solution"; - homepage = https://www.strongswan.org; + homepage = "https://www.strongswan.org"; license = licenses.gpl2Plus; platforms = platforms.all; }; diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix index 9960e6f003044..306b1899f763f 100644 --- a/pkgs/tools/networking/stun/default.nix +++ b/pkgs/tools/networking/stun/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stun server and test client"; - homepage = https://sourceforge.net/projects/stun/; + homepage = "https://sourceforge.net/projects/stun/"; license = licenses.vsl10; maintainers = with maintainers; [ marcweber obadz ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix index eac7376530046..d26bdbbb771ac 100644 --- a/pkgs/tools/networking/surfraw/default.nix +++ b/pkgs/tools/networking/surfraw/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power"; - homepage = https://gitlab.com/surfraw/Surfraw; + homepage = "https://gitlab.com/surfraw/Surfraw"; maintainers = []; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.publicDomain; diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/pkgs/tools/networking/swagger-codegen/default.nix index 91f155739140a..ac4c1e24e3ba8 100644 --- a/pkgs/tools/networking/swagger-codegen/default.nix +++ b/pkgs/tools/networking/swagger-codegen/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; - homepage = https://github.com/swagger-api/swagger-codegen; + homepage = "https://github.com/swagger-api/swagger-codegen"; license = licenses.asl20; maintainers = [ maintainers.jraygauthier ]; }; diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index 515fcee6963be..e65bc5e208fc0 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { checkPhase = "make test"; meta = { - homepage = https://random.zerodogg.org/swec/; + homepage = "https://random.zerodogg.org/swec/"; description = "Simple Web Error Checker (SWEC)"; diff --git a/pkgs/tools/networking/tayga/default.nix b/pkgs/tools/networking/tayga/default.nix index 97bcbdc999eb1..866d680a02d16 100644 --- a/pkgs/tools/networking/tayga/default.nix +++ b/pkgs/tools/networking/tayga/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { It is intended to provide production-quality NAT64 service for networks where dedicated NAT64 hardware would be overkill. ''; - homepage = http://www.litech.org/tayga; + homepage = "http://www.litech.org/tayga"; license = licenses.gpl2; maintainers = [ maintainers."0x4A6F" ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index a74dc7ca1d720..fd7b203fbbf43 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Network sniffer"; - homepage = http://www.tcpdump.org/; + homepage = "http://www.tcpdump.org/"; license = "BSD-style"; maintainers = with stdenv.lib.maintainers; [ globin ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix index 032adbff74fb2..d6d7b45364a39 100644 --- a/pkgs/tools/networking/tcpreplay/default.nix +++ b/pkgs/tools/networking/tcpreplay/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A suite of utilities for editing and replaying network traffic"; - homepage = http://tcpreplay.appneta.com/; + homepage = "http://tcpreplay.appneta.com/"; license = with licenses; [ bsd3 gpl3 ]; maintainers = with maintainers; [ eleanor ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/tcptraceroute/default.nix b/pkgs/tools/networking/tcptraceroute/default.nix index 01c832dbcea51..6901166e38fa9 100644 --- a/pkgs/tools/networking/tcptraceroute/default.nix +++ b/pkgs/tools/networking/tcptraceroute/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A traceroute implementation using TCP packets."; - homepage = https://github.com/mct/tcptraceroute; + homepage = "https://github.com/mct/tcptraceroute"; license = stdenv.lib.licenses.gpl2; maintainers = [ ]; }; diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix index 697c33957a3df..216a2863f8490 100644 --- a/pkgs/tools/networking/telepresence/default.nix +++ b/pkgs/tools/networking/telepresence/default.nix @@ -45,7 +45,7 @@ in pythonPackages.buildPythonPackage rec { doCheck = false; meta = { - homepage = https://www.telepresence.io/; + homepage = "https://www.telepresence.io/"; description = "Local development against a remote Kubernetes or OpenShift cluster"; license = with lib.licenses; [ asl20 ]; maintainers = with lib.maintainers; [ offline ]; diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 0b9c254deeb4d..93b0b69f22f1b 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -2,22 +2,22 @@ buildGoModule rec { pname = "tendermint"; - version = "0.32.3"; + version = "0.32.12"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "0vpnw42a28glghdpgxmqhxd63cnbpghhazpzsdksqkw0i1l36ywr"; + sha256 = "1d3q5d49pzh86brrwp4kfsxs0n9zdmcnkminarg3wl9w97qrjsr6"; }; - modSha256 = "1h51zgvjq3bm09yhm54rk8a86cqa1zma3mx6pb0kq7k72xvhpx0a"; + vendorSha256 = "1vhd3s6yxfhirgipxcy0rh8sk55cdzirr8n8r31sijgyak92mq0l"; meta = with stdenv.lib; { description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short."; - homepage = https://tendermint.com/; + homepage = "https://tendermint.com/"; license = licenses.asl20; maintainers = with maintainers; [ alexfmpe ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix index 35b92e0f653bd..7933cad687a27 100644 --- a/pkgs/tools/networking/termshark/default.nix +++ b/pkgs/tools/networking/termshark/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ wireshark-cli ]; - modSha256 = "0lp4gky76di7as78421p3lsirfr7mic3z204ildvj6gf6d15svpr"; + vendorSha256 = "14apff3vcbndr30765lzi4qswakavb4396bjixxvpxv6i5c04dq7"; postFixup = '' wrapProgram $out/bin/termshark --prefix PATH : ${stdenv.lib.makeBinPath [ wireshark-cli ]} @@ -26,9 +26,9 @@ buildGoModule rec { ''; meta = with stdenv.lib; { - homepage = https://termshark.io/; + homepage = "https://termshark.io/"; description = "A terminal UI for wireshark-cli, inspired by Wireshark"; license = licenses.mit; maintainers = with maintainers; [ winpat elseym ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix index edd2abdd13e33..2d88c9bf07e60 100644 --- a/pkgs/tools/networking/tftp-hpa/default.nix +++ b/pkgs/tools/networking/tftp-hpa/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = licenses.bsd3; - homepage = https://www.kernel.org/pub/software/network/tftp/; + homepage = "https://www.kernel.org/pub/software/network/tftp/"; }; passthru = { diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix index f3e6f2f156f63..1a476676a2583 100644 --- a/pkgs/tools/networking/tinyproxy/default.nix +++ b/pkgs/tools/networking/tinyproxy/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec{ stdenv.lib.optional stdenv.isDarwin "--disable-regexcheck"; meta = with stdenv.lib; { - homepage = https://tinyproxy.github.io/; + homepage = "https://tinyproxy.github.io/"; description = "A light-weight HTTP/HTTPS proxy daemon for POSIX operating systems"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix index df199869e6050..c91c703f28fb8 100644 --- a/pkgs/tools/networking/tlspool/default.nix +++ b/pkgs/tools/networking/tlspool/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A supercharged TLS daemon that allows for easy, strong and consistent deployment"; license = licenses.gpl3; - homepage = http://www.tlspool.org; + homepage = "http://www.tlspool.org"; maintainers = with maintainers; [ leenaars qknight ]; }; } diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index 6f9ee7355df99..feeceef81f451 100644 --- a/pkgs/tools/networking/tox-node/default.nix +++ b/pkgs/tools/networking/tox-node/default.nix @@ -24,7 +24,7 @@ buildRustPackage rec { installPhase = '' runHook preInstall - install -D target/release/tox-node $out/bin/tox-node + install -D $releaseDir/tox-node $out/bin/tox-node runHook postInstall ''; @@ -35,7 +35,7 @@ buildRustPackage rec { meta = with stdenv.lib; { description = "A server application to run tox node written in pure Rust"; - homepage = https://github.com/tox-rs/tox-node; + homepage = "https://github.com/tox-rs/tox-node"; license = [ licenses.mit ]; platforms = platforms.linux; maintainers = with maintainers; [ suhr ]; diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index e4faa5e30f4ac..10e4dc2f1b14f 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A powerful tool that allows one to make tunneled point to point connections over Tox"; - homepage = https://github.com/cleverca22/toxvpn; + homepage = "https://github.com/cleverca22/toxvpn"; license = licenses.gpl3; maintainers = with maintainers; [ cleverca22 obadz toonn ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix index 1d3c4190e3884..1fe2d25e35d0e 100644 --- a/pkgs/tools/networking/tracebox/default.nix +++ b/pkgs/tools/networking/tracebox/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.tracebox.org/; + homepage = "http://www.tracebox.org/"; description = "A middlebox detection tool"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.lethalman ]; diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix index 8591db4e016c4..2948a571a3861 100644 --- a/pkgs/tools/networking/traceroute/default.nix +++ b/pkgs/tools/networking/traceroute/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://traceroute.sourceforge.net/; + homepage = "http://traceroute.sourceforge.net/"; description = "Tracks the route taken by packets over an IP network"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.koral ]; diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix index 7a4adc14c2dff..f97d3c8576210 100644 --- a/pkgs/tools/networking/trickle/default.nix +++ b/pkgs/tools/networking/trickle/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight userspace bandwidth shaper"; license = stdenv.lib.licenses.bsd3; - homepage = https://monkey.org/~marius/pages/?page=trickle; + homepage = "https://monkey.org/~marius/pages/?page=trickle"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix index 44daa23cd92db..c2ea4ee62d85c 100644 --- a/pkgs/tools/networking/tridactyl-native/default.nix +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.17.1"; + version = "1.19.0"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "197vh3k9nh58djl6ph0lznkdb2schqlksxxr93xjkk4xsc7k6j1g"; + sha256 = "1myqhhjilj9sjvvw64f2931jqgvwv60ajqngw790ygcs4vr7gmfk"; }; sourceRoot = "source/native"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tridactyl native messaging host application"; - homepage = https://github.com/tridactyl/tridactyl; + homepage = "https://github.com/tridactyl/tridactyl"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix index b15b6dcba31e9..21cbd2dfefbaa 100644 --- a/pkgs/tools/networking/twa/default.nix +++ b/pkgs/tools/networking/twa/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tiny web auditor with strong opinions"; - homepage = https://github.com/trailofbits/twa; + homepage = "https://github.com/trailofbits/twa"; license = licenses.mit; maintainers = with maintainers; [ avaq ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix index ddd0bab5d6153..9ce7f5df247f9 100644 --- a/pkgs/tools/networking/ua/default.nix +++ b/pkgs/tools/networking/ua/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { buildInputs = [ glib libxml2 ]; meta = { - homepage = https://github.com/sloonz/ua; + homepage = "https://github.com/sloonz/ua"; license = stdenv.lib.licenses.isc; description = "Universal Aggregator"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/ucspi-tcp/default.nix b/pkgs/tools/networking/ucspi-tcp/default.nix index 8a3b292ad81ff..72325df8be79d 100644 --- a/pkgs/tools/networking/ucspi-tcp/default.nix +++ b/pkgs/tools/networking/ucspi-tcp/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { Interface, using the TCP protocol. UCSPI tools are available for several different networks. ''; - homepage = http://cr.yp.to/ucspi-tcp.html; + homepage = "http://cr.yp.to/ucspi-tcp.html"; license = licenses.publicDomain; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/networking/udptunnel/default.nix b/pkgs/tools/networking/udptunnel/default.nix index 4ee4fa418335f..08fb7cd62e063 100644 --- a/pkgs/tools/networking/udptunnel/default.nix +++ b/pkgs/tools/networking/udptunnel/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://code.google.com/archive/p/udptunnel/; + homepage = "https://code.google.com/archive/p/udptunnel/"; description = "Tunnels TCP over UDP packets"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/pkgs/tools/networking/uget-integrator/default.nix index 68f457c2a6382..a600d6c5341c4 100644 --- a/pkgs/tools/networking/uget-integrator/default.nix +++ b/pkgs/tools/networking/uget-integrator/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Native messaging host to integrate uGet Download Manager with web browsers"; - homepage = https://github.com/ugetdm/uget-integrator; + homepage = "https://github.com/ugetdm/uget-integrator"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index e7493ada0584f..c03f68c36e2f2 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Validating, recursive, and caching DNS resolver"; license = licenses.bsd3; - homepage = https://www.unbound.net; + homepage = "https://www.unbound.net"; maintainers = with maintainers; [ ehmry fpletz globin ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix index c118620410496..939c2299e32c5 100644 --- a/pkgs/tools/networking/unbound/python.nix +++ b/pkgs/tools/networking/unbound/python.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Python library for Unbound, the validating, recursive, and caching DNS resolver"; license = licenses.bsd3; - homepage = http://www.unbound.net; + homepage = "http://www.unbound.net"; maintainers = with maintainers; [ leenaars ]; platforms = stdenv.lib.platforms.unix; broken = true; diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 3e572a10da0ad..639bea38f0ac7 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.17"; + version = "2.18"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "1865p3yczgpq8gvgh4cpgbx2ibc1fwycd7pagga9sj8r3q0giqyk"; + sha256 = "14dmyk95v3kajhn1w2lpil3rjs78y0wxylsxclv6zjxgjcc1xsi3"; }; propagatedBuildInputs = with python3Packages; [ @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A tool for monitoring webpages for updates"; - homepage = https://thp.io/2008/urlwatch/; + homepage = "https://thp.io/2008/urlwatch/"; license = licenses.bsd3; maintainers = with maintainers; [ tv ]; }; diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index 4a8dab9366f61..bd38a1cfa2feb 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation ({ ''; meta = { - homepage = https://www.washington.edu/imap/; + homepage = "https://www.washington.edu/imap/"; description = "UW IMAP toolkit - IMAP-supporting software developed by the UW"; license = stdenv.lib.licenses.asl20; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/networking/v2ray/generic.nix b/pkgs/tools/networking/v2ray/generic.nix index bf6e6cd55ae23..e4831f5dced72 100644 --- a/pkgs/tools/networking/v2ray/generic.nix +++ b/pkgs/tools/networking/v2ray/generic.nix @@ -13,7 +13,7 @@ let pname = "v2ray-core"; inherit version src; - modSha256 = "11gsncy3449a7y6w6pr7acqabyj2q2a1q52f8fcl5cdz1vjbmmxi"; + vendorSha256 = "1lh8382gyss01frq4gxyx9p26p5m8f158qfw55sy5wb7ddrafcc2"; buildPhase = '' runHook preBuild @@ -47,4 +47,4 @@ in runCommand "v2ray-${version}" { makeWrapper "$file" "$out/bin/$(basename "$file")" \ --set-default V2RAY_LOCATION_ASSET ${assetsDrv} done -'' +'' \ No newline at end of file diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index be3d12678613c..b10ec5c1695d1 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }) ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl [ (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238"; + url = "https://git.alpinelinux.org/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238"; sha256 = "0b5382v541bkxhqylilcy34bh83ag96g71f39m070jzvi84kx8af"; }) ]; diff --git a/pkgs/tools/networking/vlan/default.nix b/pkgs/tools/networking/vlan/default.nix index 7a6a37c911287..331a993f3acdf 100644 --- a/pkgs/tools/networking/vlan/default.nix +++ b/pkgs/tools/networking/vlan/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "vlan-1.9"; src = fetchurl { - url = mirror://gentoo/distfiles/vlan.1.9.tar.gz; + url = "mirror://gentoo/distfiles/vlan.1.9.tar.gz"; sha256 = "1jjc5f26hj7bk8nkjxsa8znfxcf8pgry2ipnwmj2fr6ky0dhm3rv"; }; diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index 424355e41df8f..7a52112e65ffa 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.unix-ag.uni-kl.de/~massar/vpnc/; + homepage = "https://www.unix-ag.uni-kl.de/~massar/vpnc/"; description = "Virtual private network (VPN) client for Cisco's VPN concentrators"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/networking/vtun/default.nix b/pkgs/tools/networking/vtun/default.nix index d2cbb5d8a4eed..71d9097a15013 100644 --- a/pkgs/tools/networking/vtun/default.nix +++ b/pkgs/tools/networking/vtun/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch { url = http://sources.debian.net/data/main/v/vtun/3.0.3-2.2/debian/patches/08-gcc5-inline.patch; + (fetchpatch { url = "http://sources.debian.net/data/main/v/vtun/3.0.3-2.2/debian/patches/08-gcc5-inline.patch"; sha256 = "18sys97v2hx6vac5zp3ld7sa6kz4izv3g9dnkm0lflbaxhym2vs1"; }) ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Virtual Tunnels over TCP/IP with traffic shaping, compression and encryption"; - homepage = http://vtun.sourceforge.net/; + homepage = "http://vtun.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix index 89177f49ecfce..dab52720a0290 100644 --- a/pkgs/tools/networking/wavemon/default.nix +++ b/pkgs/tools/networking/wavemon/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; description = "Ncurses-based monitoring application for wireless network devices"; - homepage = https://github.com/uoaerg/wavemon; + homepage = "https://github.com/uoaerg/wavemon"; license = licenses.gpl3Plus; maintainers = with maintainers; [ raskin fpletz ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/wbox/default.nix b/pkgs/tools/networking/wbox/default.nix index b1fb6ae8d9093..8b10bb599c4e1 100644 --- a/pkgs/tools/networking/wbox/default.nix +++ b/pkgs/tools/networking/wbox/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple HTTP benchmarking tool"; - homepage = http://www.hping.org/wbox/; + homepage = "http://www.hping.org/wbox/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix index bd80eae2bebc6..133aac67bdbf0 100644 --- a/pkgs/tools/networking/webalizer/default.nix +++ b/pkgs/tools/networking/webalizer/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "webalizer-2.23-05"; src = fetchurl { - url = ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.23-05-src.tar.bz2; + url = "ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.23-05-src.tar.bz2"; sha256 = "0nl88y57a7gawfragj3viiigfkh5sgivfb4n0k89wzcjw278pj5g"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Web server log file analysis program"; - homepage = http://www.webalizer.org; + homepage = "http://www.webalizer.org"; platforms = platforms.unix; license = licenses.gpl2; }; diff --git a/pkgs/tools/networking/weighttp/default.nix b/pkgs/tools/networking/weighttp/default.nix index 8ba47534cfbc9..efcb8d8cf4259 100644 --- a/pkgs/tools/networking/weighttp/default.nix +++ b/pkgs/tools/networking/weighttp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.4"; src = fetchgit { - url = https://git.lighttpd.net/weighttp.git; + url = "https://git.lighttpd.net/weighttp.git"; rev = "refs/tags/weighttp-${version}"; sha256 = "14yjmdx9p8g8c3zlrx5qid8k156lsagfwhl3ny54162nxjf7kzgr"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; - homepage = https://redmine.lighttpd.net/projects/weighttp/wiki; + homepage = "https://redmine.lighttpd.net/projects/weighttp/wiki"; description = "A lightweight and simple webserver benchmarking tool"; }; } diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index b7486ded4c8ae..77913c4f32a11 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; - homepage = https://www.gnu.org/software/wget/; + homepage = "https://www.gnu.org/software/wget/"; maintainers = with maintainers; [ fpletz ]; platforms = platforms.all; diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 1010c5d9cda34..35124ef6719cf 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { select the appropriate WHOIS server for most queries. ''; - homepage = https://packages.qa.debian.org/w/whois.html; + homepage = "https://packages.qa.debian.org/w/whois.html"; license = licenses.gpl2; maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 2f95876c2f306..8cd0b7c55f7c8 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -103,7 +103,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://wicd.net/; + homepage = "http://wicd.net/"; description = "A wiredless and wired network manager"; longDescription='' A complete network connection manager diff --git a/pkgs/tools/networking/wifite2/default.nix b/pkgs/tools/networking/wifite2/default.nix index 2333408f07818..505e461e48062 100644 --- a/pkgs/tools/networking/wifite2/default.nix +++ b/pkgs/tools/networking/wifite2/default.nix @@ -1,16 +1,29 @@ -{ stdenv, lib, fetchFromGitHub, python3, aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools, which }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, python3, wirelesstools +, aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools +, hcxdumptool, pyrit, which }: python3.pkgs.buildPythonApplication rec { - version = "2.2.5"; + version = "2.5.3"; pname = "wifite2"; src = fetchFromGitHub { - owner = "derv82"; + owner = "kimocoder"; repo = "wifite2"; rev = version; - sha256 = "1hfy90wf2bjg0z8rbs8cfhhvz78pzg2c6nj0zksal42mb6b5cjdp"; + sha256 = "080hbjpbgdnzr6jkmg5cb8dvzxm57zpi4c9x0y92yy472vqll3ax"; }; + patches = [ + (fetchpatch { + url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/${version}-1/debian/patches/Disable-aircrack-failing-test.patch"; + sha256 = "04qql8w27c1lqk59ghkr1n6r08jwdrb1dcam5k88szkk2bxv8yx1"; + }) + (fetchpatch { + url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/${version}-1/debian/patches/Disable-two-failing-tests.patch"; + sha256 = "1sixcqz1kbkhxf38yq55pwycm54adjx22bq46dfnl44mg69nx356"; + }) + ]; + propagatedBuildInputs = [ aircrack-ng wireshark-cli @@ -18,6 +31,9 @@ python3.pkgs.buildPythonApplication rec { cowpatty hashcat hcxtools + hcxdumptool + wirelesstools + pyrit which ]; @@ -27,14 +43,14 @@ python3.pkgs.buildPythonApplication rec { mv ${sitePackagesDir}/wifite/__main__.py ${sitePackagesDir}/wifite/wifite.py ''; - # which is not found - doCheck = false; + checkInputs = propagatedBuildInputs; + checkPhase = "python -m unittest discover tests -v"; meta = with stdenv.lib; { homepage = "https://github.com/derv82/wifite2"; description = "Rewrite of the popular wireless network auditor, wifite"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ lassulus ]; + maintainers = with maintainers; [ lassulus danielfullmer ]; }; } diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index a722a8016bc9f..2913a31e16ad2 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "wireguard-go"; - version = "0.0.20200121"; + version = "0.0.20200320"; goPackagePath = "golang.zx2c4.com/wireguard"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; - sha256 = "04ca1j8lcbyg1qg7ls23yy90s17k97i912ksxfpads0sdd3r2yc9"; + sha256 = "0fy4qsss3i3pkq1rpgjds4aipbwlh1dr9hbbf7jn2a1c63kfks0r"; }; patches = [ ./0001-Fix-darwin-build.patch ]; @@ -17,9 +17,13 @@ buildGoPackage rec { passthru.updateScript = ./update.sh; + postInstall = '' + mv $out/bin/wireguard $out/bin/wireguard-go + ''; + meta = with stdenv.lib; { description = "Userspace Go implementation of WireGuard"; - homepage = https://git.zx2c4.com/wireguard-go/about/; + homepage = "https://git.zx2c4.com/wireguard-go/about/"; license = licenses.gpl2; maintainers = with maintainers; [ elseym kirelagin yegortimoshenko zx2c4 ]; }; diff --git a/pkgs/tools/networking/wireguard-go/deps.nix b/pkgs/tools/networking/wireguard-go/deps.nix index b1a92582b7c70..859b8572f82e1 100644 --- a/pkgs/tools/networking/wireguard-go/deps.nix +++ b/pkgs/tools/networking/wireguard-go/deps.nix @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "c178f38b412c"; - sha256 = "1r6v8xnvb4z5vdckbj6vd08kn6h4ivr9hvdpgq4drj6l1mp79rf7"; + rev = "5c8b2ff67527"; + sha256 = "0r5s7f4w7crrbcf5ydpr2xzsq0svjm332vsds41yp58kwi2lvh2v"; }; } { diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 0a86d7dec8f91..632ef2803c2f3 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -1,23 +1,23 @@ -{ - stdenv, fetchzip, - - iptables ? null, - iproute ? null, - makeWrapper ? null, - openresolv ? null, - procps ? null, - wireguard-go ? null, +{ stdenv +, fetchzip +, nixosTests +, iptables ? null +, iproute ? null +, makeWrapper ? null +, openresolv ? null +, procps ? null +, wireguard-go ? null }: with stdenv.lib; stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "1.0.20200319"; + version = "1.0.20200513"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"; - sha256 = "0g9vlngg9dnh7qqfhaycw35fq8ij5hfz6p1cykh4ncjgr93i7rbx"; + sha256 = "1rvnr4hk17xa2sp48icbhdnd3l69fiwwlxnn3587p1slrlms808l"; }; outputs = [ "out" "man" ]; @@ -47,7 +47,12 @@ stdenv.mkDerivation rec { done ''; - passthru.updateScript = ./update.sh; + passthru = { + updateScript = ./update.sh; + tests = { + inherit (nixosTests) wireguard wg-quick wireguard-generated wireguard-namespaces; + }; + }; meta = { description = "Tools for the WireGuard secure network tunnel"; diff --git a/pkgs/tools/networking/wol/default.nix b/pkgs/tools/networking/wol/default.nix index 570d800311e28..3ca10e2ecbc3f 100644 --- a/pkgs/tools/networking/wol/default.nix +++ b/pkgs/tools/networking/wol/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Implements Wake On LAN functionality in a small program"; - homepage = https://sourceforge.net/projects/wake-on-lan/; + homepage = "https://sourceforge.net/projects/wake-on-lan/"; license = licenses.gpl2; maintainers = with maintainers; [ makefu ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/wolfebin/default.nix b/pkgs/tools/networking/wolfebin/default.nix index 7eded00db8583..52874e89bbe7a 100644 --- a/pkgs/tools/networking/wolfebin/default.nix +++ b/pkgs/tools/networking/wolfebin/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/thejoshwolfe/wolfebin; + homepage = "https://github.com/thejoshwolfe/wolfebin"; description = "Quick and easy file sharing"; license = licenses.mit; maintainers = [ maintainers.andrewrk ]; diff --git a/pkgs/tools/networking/wormhole/default.nix b/pkgs/tools/networking/wormhole/default.nix new file mode 100644 index 0000000000000..2b826224f42bb --- /dev/null +++ b/pkgs/tools/networking/wormhole/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, openssl +, pkg-config +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "wormhole"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "agrinman"; + repo = pname; + rev = version; + sha256 = "0aq2myzqd9xqz4zdl03jhdd7f22y9k39xdhiark6ymhwcxijsq8y"; + }; + + cargoSha256 = "1gjqiv8sgdab0i461v72zcvh91cpqmmpcc3qyx3svq0391rwzp46"; + + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = [ ] + ++ stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { + description = "Expose your local web server to the internet with a public URL"; + homepage = "https://tunnelto.dev"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix index 98705430c2f0a..40daeb8619443 100644 --- a/pkgs/tools/networking/wrk/default.nix +++ b/pkgs/tools/networking/wrk/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "HTTP benchmarking tool"; - homepage = https://github.com/wg/wrk; + homepage = "https://github.com/wg/wrk"; longDescription = '' wrk is a modern HTTP benchmarking tool capable of generating significant load when run on a single multi-core CPU. It diff --git a/pkgs/tools/networking/wrk2/default.nix b/pkgs/tools/networking/wrk2/default.nix index 7908143bdab3f..2a5e8e3a5dca7 100644 --- a/pkgs/tools/networking/wrk2/default.nix +++ b/pkgs/tools/networking/wrk2/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Constant throughput, correct latency recording variant of wrk"; - homepage = https://github.com/giltene/wrk2; + homepage = "https://github.com/giltene/wrk2"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix index e84a97525f120..8db9c07ffc564 100644 --- a/pkgs/tools/networking/wuzz/default.nix +++ b/pkgs/tools/networking/wuzz/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/asciimoo/wuzz; + homepage = "https://github.com/asciimoo/wuzz"; description = "Interactive cli tool for HTTP inspection"; license = licenses.agpl3; maintainers = with maintainers; [ pradeepchhetri ]; diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix index 1b9d553490309..7e1597451b13c 100644 --- a/pkgs/tools/networking/x11-ssh-askpass/default.nix +++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { outputs = [ "out" "man" ]; src = fetchurl { - url = http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-1.2.4.1.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-1.2.4.1.tar.gz; + url = "http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-1.2.4.1.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-1.2.4.1.tar.gz"; sha256 = "620de3c32ae72185a2c9aeaec03af24242b9621964e38eb625afb6cdb30b8c88"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { installTargets = [ "install" "install.man" ]; meta = with stdenv.lib; { - homepage = https://github.com/sigmavirus24/x11-ssh-askpass; + homepage = "https://github.com/sigmavirus24/x11-ssh-askpass"; description = "Lightweight passphrase dialog for OpenSSH or other open variants of SSH"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix index 01453379022c7..38a45fd3e6fa3 100644 --- a/pkgs/tools/networking/xl2tpd/default.nix +++ b/pkgs/tools/networking/xl2tpd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://www.xelerance.com/software/xl2tpd/; + homepage = "http://www.xelerance.com/software/xl2tpd/"; description = "Layer 2 Tunnelling Protocol Daemon (RFC 2661)"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/tools/networking/xnbd/default.nix index a874565684ff6..79a968f806e33 100644 --- a/pkgs/tools/networking/xnbd/default.nix +++ b/pkgs/tools/networking/xnbd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://bitbucket.org/hirofuchi/xnbd; + homepage = "https://bitbucket.org/hirofuchi/xnbd"; description = "Yet another NBD (Network Block Device) server program"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.volth ]; diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index 91b080153279b..438d620d2b586 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "yggdrasil"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "147kl2kvv1rn3yk0mlvd998a2yayjl07csxxkjvs6264j6csb860"; }; - modSha256 = "1ffp7q7kbkm1312sz6xnpc7342iczy9vj3m76lflirr1ljmw0dnb"; + vendorSha256 = "09xv2p9rydnsb185x61fxhyjqx41wz285c1gdd47ad3s08ay1qc7"; # Change the default location of the management socket on Linux # systems so that the yggdrasil system service unit does not have to @@ -27,6 +27,8 @@ buildGoModule rec { -s -w ''; + passthru.tests.basic = nixosTests.yggdrasil; + meta = with lib; { description = "An experiment in scalable routing as an encrypted IPv6 overlay network"; @@ -35,4 +37,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ ehmry gazally lassulus ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/yrd/default.nix b/pkgs/tools/networking/yrd/default.nix index a259d892cc155..9b76d033829ff 100644 --- a/pkgs/tools/networking/yrd/default.nix +++ b/pkgs/tools/networking/yrd/default.nix @@ -22,6 +22,6 @@ in pythonPackages.buildPythonApplication { maintainers = with maintainers; [ akru ]; platforms = platforms.linux; license = licenses.gpl3; - homepage = https://github.com/kpcyrd/yrd; + homepage = "https://github.com/kpcyrd/yrd"; }; } diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index 3acd207df95dc..2d8902f690978 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.owasp.org/index.php/ZAP; + homepage = "https://www.owasp.org/index.php/ZAP"; description = "Java application for web penetration testing"; maintainers = with maintainers; [ mog ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 2a3987f490ffc..666b30d2c8e75 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Create flat virtual Ethernet networks of almost unlimited size"; - homepage = https://www.zerotier.com; + homepage = "https://www.zerotier.com"; license = licenses.bsl11; maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz danielfullmer ]; platforms = platforms.all; diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix index b2016fe9452cb..720c43ccc2d72 100644 --- a/pkgs/tools/networking/zssh/default.nix +++ b/pkgs/tools/networking/zssh/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { # Cargo-culted from Arch, returns “out of pty's” without it (fetchurl { name = "fix_use_ptmx_on_arch.patch"; - url = https://git.archlinux.org/svntogit/community.git/plain/trunk/fix_use_ptmx_on_arch.patch?h=packages/zssh&id=0a7c92543f9309856d02e31196f06d7c3eaa8b67; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/fix_use_ptmx_on_arch.patch?h=packages/zssh&id=0a7c92543f9309856d02e31196f06d7c3eaa8b67"; sha256 = "12daw9wpy58ql882zww945wk9cg2adwp8qsr5rvazx0xq0qawgbr"; }) ]; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = { description = "SSH and Telnet client with ZMODEM file transfer capability"; - homepage = http://zssh.sourceforge.net/; + homepage = "http://zssh.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = deepin.deepin-terminal.meta.maintainers; # required by deepin-terminal platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/nix/cached-nix-shell/default.nix b/pkgs/tools/nix/cached-nix-shell/default.nix index dc69d3f030d7d..2db9ee6d9b3f4 100644 --- a/pkgs/tools/nix/cached-nix-shell/default.nix +++ b/pkgs/tools/nix/cached-nix-shell/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchFromGitHub, openssl, pkgconfig, ronn, rustPlatform }: -let +let blake3-src = fetchFromGitHub { owner = "BLAKE3-team"; repo = "BLAKE3"; - rev = "0.3.1"; - sha256 = "0wkxx2w56hsng28p8zpndsy288ix4s5qg6xqjzgjz53fbyk46hda"; + rev = "0.3.3"; + sha256 = "0av41ld0gqf3g60gcllpz59nqlr7r62v99mgfq9gs0p8diw5gi7x"; }; in rustPlatform.buildRustPackage rec { pname = "cached-nix-shell"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "xzfc"; repo = pname; rev = "v${version}"; - sha256 = "0pzwknpc4qrh9pv5z0xvldql2dkj9ddksvaci86a4f8cnd86p2l6"; + sha256 = "1ni671wr2lrvyz6myaz3v4llrjvq4jc1ygw1m7rvnadzyf3va3lw"; }; - cargoSha256 = "1n88gcnrfdrk025hb54igc83cn5vlv8n6ndyx1ydmzhd95vhbznf"; + cargoSha256 = "19i39b1yqdf81ql4psr3nfah6ci2mw3ljkv740clqmz088j2av8g"; # The BLAKE3 C library is intended to be built by the project depending on it # rather than as a standalone library. @@ -34,7 +34,7 @@ in rustPlatform.buildRustPackage rec { postInstall = '' mkdir -p $out/lib $out/share/cached-nix-shell $out/share/man/man1 $out/var/empty - cp target/release/build/cached-nix-shell-*/out/trace-nix.so $out/lib + cp $releaseDir/build/cached-nix-shell-*/out/trace-nix.so $out/lib cp rcfile.sh $out/share/cached-nix-shell/rcfile.sh cp cached-nix-shell.1 $out/share/man/man1 ''; diff --git a/pkgs/tools/nix/nix-script/default.nix b/pkgs/tools/nix/nix-script/default.nix index dec5993f1b277..da8ba3bce8e90 100644 --- a/pkgs/tools/nix/nix-script/default.nix +++ b/pkgs/tools/nix/nix-script/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A shebang for running inside nix-shell."; - homepage = https://github.com/bennofs/nix-script; + homepage = "https://github.com/bennofs/nix-script"; license = licenses.bsd3; maintainers = with maintainers; [ bennofs rnhmjoj ]; platforms = haskellPackages.ghc.meta.platforms; diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index 6ea28dbea2b45..cdcb274945e2f 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Generate documentation for Nix functions"; - homepage = https://github.com/tazjin/nixdoc; + homepage = "https://github.com/tazjin/nixdoc"; license = [ licenses.gpl3 ]; maintainers = [ maintainers.tazjin ]; platforms = platforms.unix; diff --git a/pkgs/tools/nix/nixos-generators/default.nix b/pkgs/tools/nix/nixos-generators/default.nix index 4e51b9b46dd3e..c1e8449460947 100644 --- a/pkgs/tools/nix/nixos-generators/default.nix +++ b/pkgs/tools/nix/nixos-generators/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "nixos-generators"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixos-generators"; rev = version; - sha256 = "10xncifdfhilxclxyf72h7dcfn8yn1h34qbkvdq9l76ghv5qjniq"; + sha256 = "04cfhj42c2m7lafir9ksh36n3nhx3x20lhamyk4zc5p3pm1xdbs6"; }; nativeBuildInputs = [ makeWrapper ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix index dfd7eb63b12d0..53e70ad7bd7da 100644 --- a/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -1,16 +1,16 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "nixpkgs-fmt"; - version = "0.7.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - sha256 = "0b9wwv77bpq24yxky44ndgvxsx2zgsl15lvl6wklbkr41mwz3xis"; + sha256 = "1kkw87c63nx5pqsxcwn6iw27k02j9ls21zyhb5dvf0zaqd9sz7ad"; }; - - cargoSha256 = "1vv2gypbmgd9lksrk5h2z3agcs1269p1i3im9529nhcsl62ckj7n"; + + cargoSha256 = "1wybvm9qckx9cd656gx9zrbszmaj66ihh2kk6qqdb6maixcq5k0x"; meta = with lib; { description = "Nix code formatter for nixpkgs"; diff --git a/pkgs/tools/package-management/apt-dater/default.nix b/pkgs/tools/package-management/apt-dater/default.nix index f161591c8f1d5..49669cba40a97 100644 --- a/pkgs/tools/package-management/apt-dater/default.nix +++ b/pkgs/tools/package-management/apt-dater/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://github.com/DE-IBH/apt-dater; + homepage = "https://github.com/DE-IBH/apt-dater"; description = "Terminal-based remote package update manager"; longDescription = '' Provides an ncurses frontend for managing package updates on a large diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index 0438e340b2121..b83c49029b38a 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command-line package management tools used on Debian-based systems"; - homepage = https://salsa.debian.org/apt-team/apt; + homepage = "https://salsa.debian.org/apt-team/apt"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/tools/package-management/bunny/default.nix b/pkgs/tools/package-management/bunny/default.nix index 938a762ba303a..33c6249ebd47b 100644 --- a/pkgs/tools/package-management/bunny/default.nix +++ b/pkgs/tools/package-management/bunny/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple shell script wrapper around multiple package managers"; - homepage = https://gitlab.com/tim241/bunny; + homepage = "https://gitlab.com/tim241/bunny"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ buffet ]; diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix index 82da6b7b93c74..84bea234c20fc 100644 --- a/pkgs/tools/package-management/cargo-about/default.nix +++ b/pkgs/tools/package-management/cargo-about/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = "${version}"; - sha256 = "0bsay1vqi5b3z7qjwbkwx3ikmpjzc0kswbajm50xmcwlg8jrn420"; + sha256 = "00ing1v6vjqfvirp3mbayn8rwvxf72wnhz9249k2iifw8bl2r2hd"; }; - cargoSha256 = "1ynalwaqa70ihgras3frp5l3xniz58hwp108wkxn6zj8lwxbxfgx"; + cargoSha256 = "1wmw7knkx79fbwizaj9qkcnw0ld1lsfhca8mfpn5f0daxa5v5y97"; meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix index fba2b82ff32b4..01acc2ed6ed8c 100644 --- a/pkgs/tools/package-management/cargo-audit/default.nix +++ b/pkgs/tools/package-management/cargo-audit/default.nix @@ -1,16 +1,16 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "RustSec"; repo = "cargo-audit"; rev = "v${version}"; - sha256 = "0py4z50ld4vs0g7vh8ga6v5h11nz2yfcpr3xqzpihf4p7sg1mdf4"; + sha256 = "0zby9bd64bmrkb229ic7ckn2ycf9bpwsisx2a7z0id0j4mjaca4k"; }; - cargoSha256 = "0n4q8767aby6fgq0z7wj966zgqydlwirrzgyahf234dz6arsxw2l"; + cargoSha256 = "1w4618w5yj1205d7s2hq273fb35qfcd7cnxdwxn4pq8x3ahgy4kx"; buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/pkgs/tools/package-management/cargo-deb/default.nix index 623c8e2065c72..c6e8b4803ccfe 100644 --- a/pkgs/tools/package-management/cargo-deb/default.nix +++ b/pkgs/tools/package-management/cargo-deb/default.nix @@ -6,18 +6,18 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "1.23.2"; + version = "1.24.0"; src = fetchFromGitHub { owner = "mmstick"; repo = pname; - rev = "367910e0020de93f45c175c92a37a53ee401978f"; - sha256 = "1s0xv818rlafdzpb70c1ldv5iq3hh2jxj7g3l6p7v20q1wx0nnvv"; + rev = "b49351f6770aa7aeb053dd1d4a02d6b086caad2a"; + sha256 = "1hs96yv0awgi7ggpxp7k3n21jpv642sm0529b21hs9ib6kp4vs8s"; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0ffzq2gm0f56vyfkmdzxfs5z1xsdj2kcsyc1fdrk4k1cylqn2f47"; + cargoSha256 = "1vqnnqn6rzkdi239bh3lk7gaxr7w6v3c4ws4ya1ah04g6v9hkzlw"; meta = with lib; { description = "Generate Debian packages from information in Cargo.toml"; diff --git a/pkgs/tools/package-management/cargo-deps/default.nix b/pkgs/tools/package-management/cargo-deps/default.nix index e648990ccf8f7..d90d0fe797964 100644 --- a/pkgs/tools/package-management/cargo-deps/default.nix +++ b/pkgs/tools/package-management/cargo-deps/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Cargo subcommand for building dependency graphs of Rust projects"; - homepage = https://github.com/m-cat/cargo-deps; + homepage = "https://github.com/m-cat/cargo-deps"; license = licenses.mit; maintainers = with maintainers; [ arcnmx ]; platforms = platforms.all; diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index 2fdf8a999561a..7bcc6c12ee9d7 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A utility for managing cargo dependencies from the command line"; - homepage = https://github.com/killercup/cargo-edit; + homepage = "https://github.com/killercup/cargo-edit"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ gerschtli jb55 filalex77 killercup ]; platforms = platforms.all; diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index 41b6d26d02d87..1a20c6b9ab647 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "kbknapp"; repo = pname; rev = "v${version}"; - sha256 = "01yvkfclrynv7gpvdckzbcv03xr28yb4v6333a6nv6gy05p26g3a"; + sha256 = "1aj76wwpnvniv5xdygfv17kj74rxxkvngkvw2019qinm2nv81c3p"; }; - cargoSha256 = "152f2f16d5vlww51aldvh1r2r4kx8ad5d48dc30xsfj669zzw24h"; + cargoSha256 = "0nzxx31nlmrcrcs67z1wci0d4n6kdq83z2ld4bq8xgp6p916f4sl"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 145d8aaacc006..69a55bcda91c9 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = ''Cargo subcommand "release": everything about releasing a rust crate''; - homepage = https://github.com/sunng87/cargo-release; + homepage = "https://github.com/sunng87/cargo-release"; license = with licenses; [ mit ]; maintainers = with maintainers; [ gerschtli ]; platforms = platforms.all; diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix index 5354fbb5e5edd..ec6ad6eb55abb 100644 --- a/pkgs/tools/package-management/cde/default.nix +++ b/pkgs/tools/package-management/cde/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pgbovine/CDE; + homepage = "https://github.com/pgbovine/CDE"; description = "A packaging tool for building portable packages"; license = licenses.gpl3; maintainers = [ maintainers.rlupton20 ]; diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index 6605d9de65ae4..bd23da8efb510 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "checkinstall-1.6.2"; src = fetchurl { - url = http://www.asic-linux.com.mx/~izto/checkinstall/files/source/checkinstall-1.6.2.tar.gz; + url = "http://www.asic-linux.com.mx/~izto/checkinstall/files/source/checkinstall-1.6.2.tar.gz"; sha256 = "1x4kslyvfd6lm6zd1ylbq2pjxrafb77ydfjaqi16sa5qywn1jqfw"; }; @@ -65,7 +65,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://checkinstall.izto.org/; + homepage = "http://checkinstall.izto.org/"; description = "A tool for automatically generating Slackware, RPM or Debian packages when doing `make install'"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index 75c47dda0c405..c7e3c0fb66536 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, curl }: stdenv.mkDerivation rec { - version = "1.11.2"; + version = "1.11.3"; pname = "clib"; src = fetchFromGitHub { rev = version; owner = "clibs"; repo = "clib"; - sha256 = "03q5l873zc1dm478f35ibqandypakf47hzqb5gjpnpbcyb2m2jxz"; + sha256 = "0qwds9w9y2dy39bwh2523wra5dj820cjl11ynkshh7k94fk7qgpm"; }; hardeningDisable = [ "fortify" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C micro-package manager"; - homepage = https://github.com/clibs/clib; + homepage = "https://github.com/clibs/clib"; license = licenses.mit; maintainers = with maintainers; [ jb55 ]; platforms = platforms.all; diff --git a/pkgs/tools/package-management/conda/default.nix b/pkgs/tools/package-management/conda/default.nix index 92d0e2543125b..325a5c4fa5eeb 100644 --- a/pkgs/tools/package-management/conda/default.nix +++ b/pkgs/tools/package-management/conda/default.nix @@ -66,7 +66,7 @@ in meta = { description = "Conda is a package manager for Python"; - homepage = https://conda.io/; + homepage = "https://conda.io/"; platforms = lib.platforms.linux; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jluttine bhipple ]; diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index dd64241fd3720..5ede7af10bf0f 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "DisnixWebService-0.9"; src = fetchurl { - url = https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.9/DisnixWebService-0.9.tar.gz; + url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.9/DisnixWebService-0.9.tar.gz"; sha256 = "1z7w44bf023c0aqchjfi4mla3qbhsh87mdzx7pqn0sy74cjfgqvl"; }; buildInputs = [ apacheAnt jdk ]; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 2c5bc41e18d67..cc6072eb6dc8e 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "disnix-0.9.1"; src = fetchurl { - url = https://github.com/svanderburg/disnix/releases/download/disnix-0.9.1/disnix-0.9.1.tar.gz; + url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.9.1/disnix-0.9.1.tar.gz"; sha256 = "0bidln5xw3raqkvdks9aipis8aaza8asgyapmilnxkkrxgmw7rdf"; }; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 319716c0f3eaf..709c5454e104d 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "disnixos-0.8"; src = fetchurl { - url = https://github.com/svanderburg/disnixos/releases/download/disnixos-0.8/disnixos-0.8.tar.gz; + url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.8/disnixos-0.8.tar.gz"; sha256 = "186blirfx89i8hdp4a0djy4q9qr9wcl0ilwr66hlil0wxqj1sr91"; }; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 7b5d99bef9e78..2485becc9e57b 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -22,10 +22,10 @@ assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); assert enableInfluxDatabase -> influxdb != null; stdenv.mkDerivation { - name = "dysnomia-0.9"; + name = "dysnomia-0.9.1"; src = fetchurl { - url = https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.9/dysnomia-0.9.tar.gz; - sha256 = "09pk2l3pss48kvm5wvskh842vakbzmjzxzfzyw1nkqnvni130ikl"; + url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.9.1/dysnomia-0.9.1.tar.gz"; + sha256 = "1rrq9jnmpsjg1rrjbnq7znm4gma2ga5j4nlykvxwkylp72dq12ks"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; diff --git a/pkgs/tools/package-management/elm-github-install/default.nix b/pkgs/tools/package-management/elm-github-install/default.nix index 5703a13745bdb..8da05981dafac 100644 --- a/pkgs/tools/package-management/elm-github-install/default.nix +++ b/pkgs/tools/package-management/elm-github-install/default.nix @@ -13,7 +13,7 @@ bundlerEnv rec { meta = with lib; { description = "Install Elm packages from git repositories."; - homepage = https://github.com/gdotdesign/elm-github-install; + homepage = "https://github.com/gdotdesign/elm-github-install"; license = licenses.unfree; maintainers = with maintainers; [ roberth nicknovitski ]; platforms = platforms.all; diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index bb91697ab57ce..0ccad3013100d 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.2.15"; + version = "0.3.3"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "1h1z18m504kflzv9wcybkgc4xr5w9l9d7qsjri0an57lxv6dpv0f"; + sha256 = "0zw7lbm6ly2c607ha9gbriknzqbgh3hkqb83507hah1hanzp7zq9"; }; - cargoSha256 = "1wfxy4py2xwf1m0i52jq1f9xgzc7v5m55crl0xbp8f0raflksaxk"; + cargoSha256 = "166nsk3v3w5ji7k8hflvjylz8hkgbxqrdwb03m7l8ak8wgkycxzx"; meta = with lib; { description = "Mirror installed software on multiple machines"; diff --git a/pkgs/tools/package-management/fpm/default.nix b/pkgs/tools/package-management/fpm/default.nix index ccb50717accf7..4eab1556d9544 100644 --- a/pkgs/tools/package-management/fpm/default.nix +++ b/pkgs/tools/package-management/fpm/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Tool to build packages for multiple platforms with ease"; - homepage = https://github.com/jordansissel/fpm; + homepage = "https://github.com/jordansissel/fpm"; license = licenses.mit; maintainers = with maintainers; [ manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix index 8e8d30e4fccf3..791dfe755ee49 100644 --- a/pkgs/tools/package-management/gx/default.nix +++ b/pkgs/tools/package-management/gx/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A packaging tool built around IPFS"; - homepage = https://github.com/whyrusleeping/gx; + homepage = "https://github.com/whyrusleeping/gx"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index 0a0793130d140..652edf95e550c 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A tool for importing go packages into gx"; - homepage = https://github.com/whyrusleeping/gx-go; + homepage = "https://github.com/whyrusleeping/gx-go"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index 8c70a5a472421..e569d5a3de9be 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A user environment configurator"; - maintainers = with maintainers; [ rycee ]; + homepage = "https://rycee.gitlab.io/home-manager/"; platforms = platforms.unix; license = licenses.mit; }; diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index a1d2f15ad134d..130bf2bb2e5fb 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -29,10 +29,10 @@ buildGoPackage rec { postInstall = '' mkdir -p $lib cp -v $src/data/*.nix $lib - wrapProgram $bin/bin/morph --prefix PATH : ${lib.makeBinPath [ openssh ]}; + wrapProgram $out/bin/morph --prefix PATH : ${lib.makeBinPath [ openssh ]}; ''; - outputs = [ "out" "bin" "lib" ]; + outputs = [ "out" "lib" ]; meta = with lib; { description = "Morph is a NixOS host manager written in Golang."; diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index b40257d42f4bd..ce155b72fc39a 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -13,19 +13,19 @@ buildGoModule rec { patches = [ (fetchpatch { - url = https://github.com/apache/mynewt-newt/commit/6a51e35565323ebe8feb8d1aa6e00960b6ce662e.patch; + url = "https://github.com/apache/mynewt-newt/commit/6a51e35565323ebe8feb8d1aa6e00960b6ce662e.patch"; sha256 = "186yha60jzcjq8r04w12rqqh3cin2w974l77hz2ixhmjzyr56wqv"; }) (fetchpatch { - url = https://github.com/apache/mynewt-newt/commit/7d4ef3fe65a9a83cc58e7bd973654ad235cc68bc.patch; + url = "https://github.com/apache/mynewt-newt/commit/7d4ef3fe65a9a83cc58e7bd973654ad235cc68bc.patch"; sha256 = "01scmq58bfr4c9icqzm79q7a55izflsb3mlx9xn0dv92m3mbprx7"; }) ]; - modSha256 = "068r8wa2pgd68jv50x0l1w8n96f97b3mgv7z6f85280ahgywaasq"; + vendorSha256 = "1sh9mx3lc28fzvc1yrhz58rlbaac7aq1dqyvxwj98vld3kigpv1z"; meta = with stdenv.lib; { - homepage = https://mynewt.apache.org/; + homepage = "https://mynewt.apache.org/"; description = "Build and package management tool for embedded development."; longDescription = '' Apache Newt is a smart build and package management tool, @@ -36,4 +36,4 @@ buildGoModule rec { maintainers = with maintainers; [ pjones ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 0b5f5edf39927..c7ad0c30e4357 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "0zl8xf74k5is8rxbirrqb5cnfgrlppr1gchfqm31305mnpicr92s"; + sha256 = "0q0472kfsm7h9p1g7yvd9k62myv5db3shpmjv39cx9rkfn6z8482"; }; - modSha256 = "14izjwadl4ify0wrz0yinqvayar79h0pxxqj5n69a5dgbx09fp0l"; + vendorSha256 = "07xg8cm7pqpnb96drcmzk7rj2dhfn4pd8vr2a7nxqizd3qk6d5bf"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -21,4 +21,4 @@ buildGoModule rec { maintainers = [ maintainers.marsam ]; license = licenses.mit; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/package-management/niff/default.nix b/pkgs/tools/package-management/niff/default.nix index 8c6a72cf131e0..9d3736f6faad6 100644 --- a/pkgs/tools/package-management/niff/default.nix +++ b/pkgs/tools/package-management/niff/default.nix @@ -27,8 +27,8 @@ in stdenv.mkDerivation { meta = { description = "A program that compares two Nix expressions and determines which attributes changed"; - homepage = https://github.com/FRidh/niff; + homepage = "https://github.com/FRidh/niff"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/tools/package-management/nix-bundle/default.nix index b78b3bf07cd55..41ce0967b2e3c 100644 --- a/pkgs/tools/package-management/nix-bundle/default.nix +++ b/pkgs/tools/package-management/nix-bundle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nix-bundle"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "matthewbauer"; repo = pname; rev = "v${version}"; - sha256 = "084m9hqm1nhwln2sbg8ck2v2dprvpldxxqmd1r8fcj3dmn4bysz0"; + sha256 = "0hdvdjm467w37clkhbifn54hbdmnxlbk66cj88lwaz26j4s2ik5g"; }; # coreutils, gnutar is actually needed by nix for bootstrap @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; description = "Create bundles from Nixpkgs attributes"; license = licenses.mit; - homepage = https://github.com/matthewbauer/nix-bundle; + homepage = "https://github.com/matthewbauer/nix-bundle"; }; } diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 6ee7dee33f674..417962733af6d 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1a6svl89dcdb5fpvs2i32i6agyhl0sx7kkkw70rqr17fyzl5psai"; doCheck = true; - checkInputs = [ graphviz ]; + checkInputs = [ nix graphviz ]; buildInputs = [ boost @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A tool to determine which gc-roots take space in your nix store"; - homepage = https://github.com/symphorien/nix-du; + homepage = "https://github.com/symphorien/nix-du"; license = licenses.lgpl3; maintainers = [ maintainers.symphorien ]; platforms = platforms.unix; diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index da7469ea6465d..db26f9e0b0871 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A files database for nixpkgs"; - homepage = https://github.com/bennofs/nix-index; + homepage = "https://github.com/bennofs/nix-index"; license = with licenses; [ bsd3 ]; maintainers = [ maintainers.bennofs ]; platforms = platforms.all; diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index 2c5781a95b8c7..bab12ca8e8df3 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -1,5 +1,5 @@ { stdenv, makeWrapper, buildEnv, - bazaar, coreutils, cvs, findutils, gawk, git, gnused, mercurial, nix, subversion + breezy, coreutils, cvs, findutils, gawk, git, gnused, mercurial, nix, subversion }: let mkPrefetchScript = tool: src: deps: @@ -26,7 +26,7 @@ let mkPrefetchScript = tool: src: deps: }; }; in rec { - nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [ bazaar ]; + nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [ breezy ]; nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [ cvs ]; nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [ coreutils findutils gawk git ]; nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [ mercurial ]; diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix index 19a40b7395fa6..1a750da693015 100644 --- a/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-prefetch/default.nix @@ -1,67 +1,74 @@ -{ stdenv, fetchFromGitHub, makeWrapper -, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt -, coreutils, gawk, gnugrep, gnused, jq, nix }: +{ stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc +, docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk +, gnugrep, gnused, jq, nix }: -stdenv.mkDerivation rec { +let + binPath = stdenv.lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ]; + +in stdenv.mkDerivation rec { pname = "nix-prefetch"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "msteen"; repo = "nix-prefetch"; rev = version; - sha256 = "0b9gdi7xzmfq0j258x724xsll8gi31m0m4pzfjkqinlm6zwr3sgm"; + sha256 = "15h6f743nn6sdq8l771sjxh92cyzqznkcs7szrc7nm066xvx8rd4"; + # the stat call has to be in a subshell or we get the current date + extraPostFetch = '' + echo $(stat -c %Y $out) > $out/.timestamp + ''; }; + postPatch = '' + lib=$out/lib/${pname} + + substituteInPlace doc/nix-prefetch.1.asciidoc \ + --subst-var-by version $version + + substituteInPlace src/main.sh \ + --subst-var-by lib $lib \ + --subst-var-by version $version + + substituteInPlace src/tests.sh \ + --subst-var-by bin $out/bin + ''; + nativeBuildInputs = [ + asciidoc + docbook_xml_dtd_45 + docbook_xsl + installShellFiles + libxml2 + libxslt makeWrapper - asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; - configurePhase = '' - . configure.sh - ''; + dontConfigure = true; buildPhase = '' - a2x -f manpage doc/nix-prefetch.1.asciidoc + a2x -a revdate=$(date --utc --date=@$(cat $src/.timestamp) +%d/%m/%Y) \ + -f manpage doc/nix-prefetch.1.asciidoc ''; installPhase = '' - lib=$out/lib/${pname} - mkdir -p $lib - substitute src/main.sh $lib/main.sh \ - --subst-var-by lib $lib \ - --subst-var-by version '${version}' - chmod +x $lib/main.sh - patchShebangs $lib/main.sh - cp lib/*.nix $lib/ - - mkdir -p $out/bin + install -Dm555 -t $lib src/*.sh + install -Dm444 -t $lib lib/* makeWrapper $lib/main.sh $out/bin/${pname} \ - --prefix PATH : '${stdenv.lib.makeBinPath [ coreutils gawk gnugrep gnused jq nix ]}' - - substitute src/tests.sh $lib/tests.sh \ - --subst-var-by bin $out/bin - chmod +x $lib/tests.sh - patchShebangs $lib/tests.sh + --prefix PATH : ${binPath} - mkdir -p $out/share/man/man1 - substitute doc/nix-prefetch.1 $out/share/man/man1/nix-prefetch.1 \ - --subst-var-by version '${version}' \ - --replace '01/01/1970' "$date" + installManPage doc/nix-prefetch.? - install -D contrib/nix-prefetch-completion.bash $out/share/bash-completion/completions/nix-prefetch - install -D contrib/nix-prefetch-completion.zsh $out/share/zsh/site-functions/_nix_prefetch + installShellCompletion --name ${pname} contrib/nix-prefetch-completion.{bash,zsh} mkdir -p $out/share/doc/${pname}/contrib - cp -r contrib/hello_rs $out/share/doc/${pname}/contrib/ + cp -r contrib/hello_rs $out/share/doc/${pname}/contrib ''; meta = with stdenv.lib; { description = "Prefetch any fetcher function call, e.g. package sources"; - homepage = "https://github.com/msteen/nix-prefetch"; license = licenses.mit; maintainers = with maintainers; [ msteen ]; - platforms = platforms.all; + inherit (src.meta) homepage; }; } diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index 63f948db9db34..fccfbe98f7866 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/edolstra/nix-serve; + homepage = "https://github.com/edolstra/nix-serve"; description = "A utility for sharing a Nix store as a binary cache"; maintainers = [ maintainers.eelco ]; license = licenses.lgpl21; diff --git a/pkgs/tools/package-management/nix-simple-deploy/default.nix b/pkgs/tools/package-management/nix-simple-deploy/default.nix new file mode 100644 index 0000000000000..3bc0b35c0f179 --- /dev/null +++ b/pkgs/tools/package-management/nix-simple-deploy/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "nix-simple-deploy"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "misuzu"; + repo = pname; + rev = version; + sha256 = "12g0sbgs2dfnk0agp1kagfi1yhk26ga98zygxxrjhjxrqb2n5w80"; + }; + + cargoSha256 = "0svnz9r0lrmz333qpbpdddjd46vh9i74qchws8aifa2qwnqy0kmn"; + + meta = with stdenv.lib; { + description = "Deploy software or an entire NixOS system configuration to another NixOS system"; + homepage = "https://github.com/misuzu/nix-simple-deploy"; + license = with licenses; [ asl20 /* OR */ mit ]; + platforms = platforms.all; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/pkgs/tools/package-management/nix-top/default.nix b/pkgs/tools/package-management/nix-top/default.nix index 1d2cad2e39e48..0a003ba6b6b44 100644 --- a/pkgs/tools/package-management/nix-top/default.nix +++ b/pkgs/tools/package-management/nix-top/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tracks what nix is building"; - homepage = https://github.com/samueldr/nix-top; + homepage = "https://github.com/samueldr/nix-top"; license = licenses.mit; maintainers = with maintainers; [ samueldr ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/package-management/nix-universal-prefetch/default.nix b/pkgs/tools/package-management/nix-universal-prefetch/default.nix index a4e43f1496777..7079904735d76 100644 --- a/pkgs/tools/package-management/nix-universal-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-universal-prefetch/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Uses nixpkgs fetchers to figure out hashes"; - homepage = https://github.com/samueldr/nix-universal-prefetch; + homepage = "https://github.com/samueldr/nix-universal-prefetch"; license = licenses.mit; maintainers = with maintainers; [ samueldr ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix new file mode 100644 index 0000000000000..bd4ff86c9949e --- /dev/null +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, nix +, nix-prefetch +}: + +buildPythonApplication rec { + pname = "nix-update"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = pname; + rev = version; + sha256 = "0mw31n7kqfr7fskkxp58b0wprxj1pj6n1zs6ymvvl548gs5rgn2s"; + }; + + makeWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath [ nix nix-prefetch ]) + ]; + + checkPhase = '' + $out/bin/nix-update --help + ''; + + meta = with lib; { + description = "Swiss-knife for updating nix packages"; + inherit (src.meta) homepage; + license = licenses.mit; + maintainers = with maintainers; [ mic92 zowoq ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 8260f2e83c3ac..c44c7d4c96dc0 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -14,6 +14,8 @@ common = , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns , jq, libarchive, rustc, cargo + # Used by tests + , gmock , busybox-sandbox-shell , storeDir , stateDir @@ -39,7 +41,8 @@ common = nativeBuildInputs = [ pkgconfig ] - ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns jq ]; + ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt + docbook5 docbook_xsl_ns jq gmock ]; buildInputs = [ curl openssl sqlite xz bzip2 nlohmann_json @@ -54,7 +57,7 @@ common = customMemoryManagement = false; }).overrideDerivation (args: { patches = args.patches or [] ++ [(fetchpatch { - url = https://github.com/edolstra/aws-sdk-cpp/commit/7d58e303159b2fb343af9a1ec4512238efa147c7.patch; + url = "https://github.com/edolstra/aws-sdk-cpp/commit/7d58e303159b2fb343af9a1ec4512238efa147c7.patch"; sha256 = "103phn6kyvs1yc7fibyin3lgxz699qakhw671kl207484im55id1"; })]; })); @@ -136,7 +139,7 @@ common = a package, multi-user package management and easy setup of build environments. ''; - homepage = https://nixos.org/; + homepage = "https://nixos.org/"; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.unix; @@ -175,10 +178,10 @@ in rec { nix = nixStable; nixStable = callPackage common (rec { - name = "nix-2.3.3"; + name = "nix-2.3.4"; src = fetchurl { - url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "332fffb8dfc33eab854c136ef162a88cec15b701def71fa63714d160831ba224"; + url = "https://nixos.org/releases/nix/${name}/${name}.tar.xz"; + sha256 = "1c626a0de0acc69830b1891ec4d3c96aabe673b2a9fd04cef84f2304d05ad00d"; }; inherit storeDir stateDir confDir boehmgc; @@ -188,18 +191,18 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre7346_5e7ccdc9"; + suffix = "pre7534_b92f58f6"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "5e7ccdc9e3ddd61dc85e20c898001345bfb497a5"; - sha256 = "10jg0rq92xbigbbri7harn4b75blqaf6rjgq4hhvlnggf2w9iprg"; + rev = "b92f58f6d9e44f97002d1722bd77bad939824c1c"; + sha256 = "1p791961y5v04kpz37g6hm98f1ig7i34inxl9dcj3pbqhf5kicxg"; }; crates = fetchurl { - url = https://hydra.nixos.org/build/115942497/download/1/nix-vendored-crates-2.4pre20200403_3473b19.tar.xz; - sha256 = "a83785553bb4bc5b28220562153e201ec555a00171466ac08b716f0c97aee45a"; + url = "https://hydra.nixos.org/build/118797694/download/1/nix-vendored-crates-2.4pre7534_b92f58f6.tar.xz"; + sha256 = "a4c2612bbd81732bbb899bc0c230e07b16f6b6150ffbb19c4907dedbbc2bf9fc"; }; inherit storeDir stateDir confDir boehmgc; @@ -207,18 +210,18 @@ in rec { nixFlakes = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre20200403_3473b19"; + suffix = "pre20200501_941f952"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "3473b1950a90d596a3baa080fdfdb080f55a5cc0"; - sha256 = "1bb7a8a5lzmb3pzq80zxd3s9y3qv757q7032s5wvp75la9wgvmvr"; + rev = "941f95284ab57e9baa317791327cf1715d8564b5"; + sha256 = "0d99jl5baxji5dmqb4fwmbffx0z04k0naanms5zzbwvxdmzn3yhs"; }; crates = fetchurl { - url = https://hydra.nixos.org/build/115942497/download/1/nix-vendored-crates-2.4pre20200403_3473b19.tar.xz; - sha256 = "a83785553bb4bc5b28220562153e201ec555a00171466ac08b716f0c97aee45a"; + url = "https://hydra.nixos.org/build/118093786/download/1/nix-vendored-crates-2.4pre20200501_941f952.tar.xz"; + sha256 = "060f4n5srdbb8vsj0m14aqch7im79a4h5g3nrs41p1xc602vhcdl"; }; inherit storeDir stateDir confDir boehmgc; diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index 79400a8e5ea04..59d139d288475 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -46,7 +46,7 @@ python2Packages.buildPythonApplication { ''; meta = { - homepage = https://github.com/NixOS/nixops; + homepage = "https://github.com/NixOS/nixops"; description = "NixOS cloud provisioning and deployment tool"; maintainers = with lib.maintainers; [ aminechikhaoui eelco rob domenkozar ]; platforms = lib.platforms.unix; diff --git a/pkgs/tools/package-management/nixops/nixops-dns.nix b/pkgs/tools/package-management/nixops/nixops-dns.nix index f63fe868e0118..cf633a65ca53b 100644 --- a/pkgs/tools/package-management/nixops/nixops-dns.nix +++ b/pkgs/tools/package-management/nixops/nixops-dns.nix @@ -17,7 +17,7 @@ buildGoPackage rec { }; meta = with lib; { - homepage = https://github.com/kamilchm/nixops-dns/; + homepage = "https://github.com/kamilchm/nixops-dns/"; description = "DNS server for resolving NixOps machines"; license = licenses.mit; maintainers = with maintainers; [ kamilchm sorki ]; diff --git a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix b/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix index e6e30b26240f5..dc0c733ca7b13 100644 --- a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix +++ b/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix @@ -3,7 +3,7 @@ callPackage ./generic.nix (rec { version = "1.6.1"; src = fetchurl { - url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; + url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; sha256 = "0lfx5fhyg3z6725ydsk0ibg5qqzp5s0x9nbdww02k8s307axiah3"; }; nixopsAzurePackages = with python2Packages; [ diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index 9f54d82d3cd29..922546009fcab 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "0qsvrcxl97nih1yprydzlqc6n1ppg726664d6harx5kjzp5776mr"; + sha256 = "1v988jsxx2r82q6mf3503130cny088hin2as00yi26jzxjkrjcli"; }; makeWrapperArgs = [ @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "Review pull-requests on https://github.com/NixOS/nixpkgs"; - homepage = https://github.com/Mic92/nixpkgs-review; + homepage = "https://github.com/Mic92/nixpkgs-review"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix index 131a3bb5fddcd..12bf229580f67 100644 --- a/pkgs/tools/package-management/nixui/default.nix +++ b/pkgs/tools/package-management/nixui/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ''; meta = { description = "NodeWebkit user interface for Nix"; - homepage = https://github.com/matejc/nixui; + homepage = "https://github.com/matejc/nixui"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.matejc ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix index 25eaac8f2b7d6..f822bdb53332c 100644 --- a/pkgs/tools/package-management/nixui/node-packages.nix +++ b/pkgs/tools/package-management/nixui/node-packages.nix @@ -98,11 +98,11 @@ in buildInputs = globalBuildInputs; meta = { description = "nix-env frontend written with Polymer"; - homepage = https://github.com/matejc/nixui; + homepage = "https://github.com/matejc/nixui"; license = "Apache-2.0"; }; production = true; bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index 673fc89e98db3..bf98f5400b8eb 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { ]; meta = { - homepage = https://github.com/madjar/nox; + homepage = "https://github.com/madjar/nox"; description = "Tools to make nix nicer to use"; maintainers = [ lib.maintainers.madjar ]; license = lib.licenses.mit; diff --git a/pkgs/tools/package-management/opkg-utils/default.nix b/pkgs/tools/package-management/opkg-utils/default.nix index 1c97757ff8a65..373ebbeb02f88 100644 --- a/pkgs/tools/package-management/opkg-utils/default.nix +++ b/pkgs/tools/package-management/opkg-utils/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Helper scripts for use with the opkg package manager"; - homepage = http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/; + homepage = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 1aae0290d5a72..c097674135c74 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A lightweight package management system based upon ipkg"; - homepage = https://git.yoctoproject.org/cgit/cgit.cgi/opkg/; + homepage = "https://git.yoctoproject.org/cgit/cgit.cgi/opkg/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index bd80d4a935075..05877979e9c52 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { a common set of abstractions that can be used by standard GUI and text mode package managers. ''; - homepage = http://www.packagekit.org/; + homepage = "http://www.packagekit.org/"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index cdd0c83574afd..3ca55ddbbf29a 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple library-based package manager"; - homepage = https://www.archlinux.org/pacman/; + homepage = "https://www.archlinux.org/pacman/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ mt-caret ]; diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index c2bdf327124d4..fe7f41c4d08a5 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -45,7 +45,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "A simple wrapper for running Winetricks commands for Proton-enabled games"; - homepage = https://github.com/Matoking/protontricks; + homepage = "https://github.com/Matoking/protontricks"; license = licenses.gpl3; platforms = with platforms; linux; maintainers = with maintainers; [ metadark ]; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 05d293b5bf12c..fdcf9832e6670 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.rpm.org/; + homepage = "http://www.rpm.org/"; license = licenses.gpl2; description = "The RPM Package Manager"; maintainers = with maintainers; [ copumpkin ]; diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix index 0322faa4c88b9..108b64bd8b2f8 100644 --- a/pkgs/tools/package-management/xbps/default.nix +++ b/pkgs/tools/package-management/xbps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xbps"; - version = "0.59"; + version = "0.59.1"; src = fetchFromGitHub { owner = "void-linux"; repo = "xbps"; rev = version; - sha256 = "0m00h1f004gsa998cr93b4zmsn4162983d360pzpd3hfi3qzan5d"; + sha256 = "0pab3xf97y4wqlyrb92zxd3cfsrbnlx6pssbw4brgwcxccw9jrhy"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/tools/security/2fa/default.nix index c4ba7b67dc716..cf14ec124024b 100644 --- a/pkgs/tools/security/2fa/default.nix +++ b/pkgs/tools/security/2fa/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://rsc.io/2fa; + homepage = "https://rsc.io/2fa"; description = "Two-factor authentication on the command line"; platforms = platforms.all; maintainers = with maintainers; [ rvolosatovs ]; diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index df5e3728943ec..e32aa03487478 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -47,6 +47,11 @@ let # has totally different semantics in that case(?) - and also set a # proper AFL_CC and AFL_CXX so we don't pick up the wrong one out # of $PATH. + # first though we need to replace the afl-clang-fast++ symlink with + # a real copy to prevent wrapProgram skipping the symlink and confusing + # nix's cc wrapper + rm $out/bin/afl-clang-fast++ + cp $out/bin/afl-clang-fast $out/bin/afl-clang-fast++ for x in $out/bin/afl-clang-fast $out/bin/afl-clang-fast++; do wrapProgram $x \ --prefix AFL_PATH : "$out/lib/afl" \ @@ -68,7 +73,7 @@ let also useful for seeding other, more labor or resource-intensive testing regimes down the road. ''; - homepage = "http://lcamtuf.coredump.cx/afl/"; + homepage = "https://lcamtuf.coredump.cx/afl/"; license = stdenv.lib.licenses.asl20; platforms = ["x86_64-linux" "i686-linux"]; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ris ]; diff --git a/pkgs/tools/security/afl/libdislocator.nix b/pkgs/tools/security/afl/libdislocator.nix index 953c59e435cb0..103786d12441d 100644 --- a/pkgs/tools/security/afl/libdislocator.nix +++ b/pkgs/tools/security/afl/libdislocator.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = "http://lcamtuf.coredump.cx/afl/"; + homepage = "https://lcamtuf.coredump.cx/afl/"; description = '' Drop-in replacement for the libc allocator which improves the odds of bumping into heap-related security bugs in diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index b841ccb93d3c2..3af44763a8a6a 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { ]; meta = with stdenv.lib; { - homepage = http://www.qemu.org/; + homepage = "http://www.qemu.org/"; description = "Fork of QEMU with AFL instrumentation support"; license = licenses.gpl2Plus; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix new file mode 100644 index 0000000000000..f99be6d757580 --- /dev/null +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -0,0 +1,146 @@ +{ stdenv, stdenvNoCC, fetchFromGitHub, callPackage, makeWrapper +, clang_9, llvm_9, gcc, which, libcgroup, python, perl, gmp +, file, cmocka, wine ? null, fetchpatch +}: + +# wine fuzzing is only known to work for win32 binaries, and using a mixture of +# 32 and 64-bit libraries ... complicates things, so it's recommended to build +# a full 32bit version of this package if you want to do wine fuzzing +assert (wine != null) -> (stdenv.targetPlatform.system == "i686-linux"); + +let + aflplusplus-qemu = callPackage ./qemu.nix { inherit aflplusplus; }; + qemu-exe-name = if stdenv.targetPlatform.system == "x86_64-linux" then "qemu-x86_64" + else if stdenv.targetPlatform.system == "i686-linux" then "qemu-i386" + else throw "aflplusplus: no support for ${stdenv.targetPlatform.system}!"; + libdislocator = callPackage ./libdislocator.nix { inherit aflplusplus; }; + libtokencap = callPackage ./libtokencap.nix { inherit aflplusplus; }; + aflplusplus = stdenvNoCC.mkDerivation rec { + pname = "aflplusplus"; + version = "2.64c"; + + src = fetchFromGitHub { + owner = "AFLplusplus"; + repo = "AFLplusplus"; + rev = version; + sha256 = "0n618pk6nlmkcbv1qm05fny4mnhcprrw0ppmra1phvk1y22iildj"; + }; + enableParallelBuilding = true; + + # build of unsigaction32 broken in 2.64c: + # https://github.com/AFLplusplus/AFLplusplus/commit/079fdbf9bc5be1adba19e4bd08be965bd4dd79dc#commitcomment-38428357 + # The applied patch fixes it. + patches = [ + (fetchpatch { + url = "https://github.com/AFLplusplus/AFLplusplus/commit/5b9928f1a9d4b017ea04365ca8b522fde71236eb.patch"; + sha256 = "1m4w9w4jaxb2mjkwvr6r4qa2j5cdzzpchjphpwd95861h0zvb6hh"; + }) + ]; + + # Note: libcgroup isn't needed for building, just for the afl-cgroup + # script. + nativeBuildInputs = [ makeWrapper which clang_9 gcc ]; + buildInputs = [ llvm_9 python gmp ] + ++ stdenv.lib.optional (wine != null) python.pkgs.wrapPython; + + + postPatch = '' + # Replace the CLANG_BIN variables with the correct path + substituteInPlace llvm_mode/afl-clang-fast.c \ + --replace "CLANGPP_BIN" '"${clang_9}/bin/clang++"' \ + --replace "CLANG_BIN" '"${clang_9}/bin/clang"' \ + --replace 'getenv("AFL_PATH")' "(getenv(\"AFL_PATH\") ? getenv(\"AFL_PATH\") : \"$out/lib/afl\")" + + # Replace "gcc" and friends with full paths in afl-gcc + # Prevents afl-gcc picking up any (possibly incorrect) gcc from the path + substituteInPlace src/afl-gcc.c \ + --replace '"gcc"' '"${gcc}/bin/gcc"' \ + --replace '"g++"' '"${gcc}/bin/g++"' \ + --replace '"gcj"' '"gcj-UNSUPPORTED"' \ + --replace '"clang"' '"clang-UNSUPPORTED"' \ + --replace '"clang++"' '"clang++-UNSUPPORTED"' + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + buildPhase = '' + common="$makeFlags -j$NIX_BUILD_CORES" + make all $common + make radamsa $common + make -C gcc_plugin CC=${gcc}/bin/gcc CXX=${gcc}/bin/g++ $common + make -C llvm_mode $common + make -C qemu_mode/libcompcov $common + make -C qemu_mode/unsigaction $common + ''; + + postInstall = '' + # remove afl-clang(++) which are just symlinks to afl-clang-fast + rm $out/bin/afl-clang $out/bin/afl-clang++ + + # the makefile neglects to install unsigaction + cp qemu_mode/unsigaction/unsigaction*.so $out/lib/afl/ + + # Install the custom QEMU emulator for binary blob fuzzing. + cp ${aflplusplus-qemu}/bin/${qemu-exe-name} $out/bin/afl-qemu-trace + + # give user a convenient way of accessing libcompconv.so, libdislocator.so, libtokencap.so + cat > $out/bin/get-afl-qemu-libcompcov-so <<END + #!${stdenv.shell} + echo $out/lib/afl/libcompcov.so + END + chmod +x $out/bin/get-afl-qemu-libcompcov-so + cp ${libdislocator}/bin/get-libdislocator-so $out/bin/ + cp ${libtokencap}/bin/get-libtokencap-so $out/bin/ + + # Install the cgroups wrapper for asan-based fuzzing. + cp examples/asan_cgroups/limit_memory.sh $out/bin/afl-cgroup + chmod +x $out/bin/afl-cgroup + substituteInPlace $out/bin/afl-cgroup \ + --replace "cgcreate" "${libcgroup}/bin/cgcreate" \ + --replace "cgexec" "${libcgroup}/bin/cgexec" \ + --replace "cgdelete" "${libcgroup}/bin/cgdelete" + + patchShebangs $out/bin + + '' + stdenv.lib.optionalString (wine != null) '' + substitute afl-wine-trace $out/bin/afl-wine-trace \ + --replace "qemu_mode/unsigaction" "$out/lib/afl" + chmod +x $out/bin/afl-wine-trace + + # qemu needs to be fed ELFs, not wrapper scripts, so we have to cheat a bit if we + # detect a wrapped wine + for winePath in ${wine}/bin/.wine ${wine}/bin/wine; do + if [ -x $winePath ]; then break; fi + done + makeWrapperArgs="--set-default 'AFL_WINE_PATH' '$winePath'" \ + wrapPythonProgramsIn $out/bin ${python.pkgs.pefile} + ''; + + installCheckInputs = [ perl file cmocka ]; + doInstallCheck = true; + installCheckPhase = '' + # replace references to tools in build directory with references to installed locations + substituteInPlace test/test.sh \ + --replace '../libcompcov.so' '`$out/bin/get-afl-qemu-libcompcov-so`' \ + --replace '../libdislocator.so' '`$out/bin/get-libdislocator-so`' \ + --replace '../libtokencap.so' '`$out/bin/get-libtokencap-so`' + perl -pi -e 's|(?<!\.)(\.\./)([^\s\/]+?)(?<!\.c)(?<!\.s?o)(?=\s)|\$out/bin/\2|g' test/test.sh + cd test && ./test.sh + ''; + + passthru = { + inherit libdislocator libtokencap; + qemu = aflplusplus-qemu; + }; + + meta = { + description = '' + AFL++ is a heavily enhanced version of AFL, incorporating many features and + improvements from the community. + ''; + homepage = "https://aflplus.plus"; + license = stdenv.lib.licenses.asl20; + platforms = ["x86_64-linux" "i686-linux"]; + maintainers = with stdenv.lib.maintainers; [ ris mindavi ]; + }; + }; +in aflplusplus diff --git a/pkgs/tools/security/aflplusplus/libdislocator.nix b/pkgs/tools/security/aflplusplus/libdislocator.nix new file mode 100644 index 0000000000000..6f947a7280af6 --- /dev/null +++ b/pkgs/tools/security/aflplusplus/libdislocator.nix @@ -0,0 +1,37 @@ +{ stdenv, aflplusplus}: + +stdenv.mkDerivation { + version = stdenv.lib.getVersion aflplusplus; + pname = "libdislocator"; + + src = aflplusplus.src; + postUnpack = "chmod -R +w ${aflplusplus.src.name}"; + sourceRoot = "${aflplusplus.src.name}/libdislocator"; + + makeFlags = [ "PREFIX=$(out)" ]; + + preInstall = '' + mkdir -p $out/lib/afl + # issue is fixed upstream: https://github.com/AFLplusplus/AFLplusplus/commit/2a60ceb6944a7ca273057ddf64dcf837bf7f9521 + sed -i 's/README\.dislocator\.md/README\.md/g' Makefile + ''; + postInstall = '' + mkdir $out/bin + cat > $out/bin/get-libdislocator-so <<END + #!${stdenv.shell} + echo $out/lib/afl/libdislocator.so + END + chmod +x $out/bin/get-libdislocator-so + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/vanhauser-thc/AFLplusplus"; + description = '' + Drop-in replacement for the libc allocator which improves + the odds of bumping into heap-related security bugs in + several ways. + ''; + license = stdenv.lib.licenses.asl20; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/tools/security/aflplusplus/libtokencap.nix b/pkgs/tools/security/aflplusplus/libtokencap.nix new file mode 100644 index 0000000000000..9421ee0d1e2b6 --- /dev/null +++ b/pkgs/tools/security/aflplusplus/libtokencap.nix @@ -0,0 +1,32 @@ +{ stdenv, aflplusplus}: + +stdenv.mkDerivation { + version = stdenv.lib.getVersion aflplusplus; + pname = "libtokencap"; + + src = aflplusplus.src; + postUnpack = "chmod -R +w ${aflplusplus.src.name}"; + sourceRoot = "${aflplusplus.src.name}/libtokencap"; + + makeFlags = [ "PREFIX=$(out)" ]; + + preInstall = '' + mkdir -p $out/lib/afl + mkdir -p $out/share/doc/afl + ''; + postInstall = '' + mkdir $out/bin + cat > $out/bin/get-libtokencap-so <<END + #!${stdenv.shell} + echo $out/lib/afl/libtokencap.so + END + chmod +x $out/bin/get-libtokencap-so + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/vanhauser-thc/AFLplusplus"; + description = "strcmp & memcmp token capture library"; + license = stdenv.lib.licenses.asl20; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/tools/security/aflplusplus/qemu-no-etc-install.patch b/pkgs/tools/security/aflplusplus/qemu-no-etc-install.patch new file mode 100644 index 0000000000000..5dfbfd780f1ca --- /dev/null +++ b/pkgs/tools/security/aflplusplus/qemu-no-etc-install.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index d6b9dc1..ce7c493 100644 +--- a/Makefile ++++ b/Makefile +@@ -601,7 +601,7 @@ install-localstatedir: + endif + + +-install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir ++install: all $(if $(BUILD_DOCS),install-doc) install-datadir + ifneq ($(TOOLS),) + $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir)) + endif diff --git a/pkgs/tools/security/aflplusplus/qemu.nix b/pkgs/tools/security/aflplusplus/qemu.nix new file mode 100644 index 0000000000000..c51c839afe85b --- /dev/null +++ b/pkgs/tools/security/aflplusplus/qemu.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchurl, aflplusplus, python2, zlib, pkgconfig, glib, perl +, texinfo, libuuid, flex, bison, pixman, autoconf +}: + +with stdenv.lib; + +let + qemuName = "qemu-3.1.0"; + cpuTarget = if stdenv.targetPlatform.system == "x86_64-linux" then "x86_64-linux-user" + else if stdenv.targetPlatform.system == "i686-linux" then "i386-linux-user" + else throw "aflplusplus: no support for ${stdenv.targetPlatform.system}!"; +in +stdenv.mkDerivation { + name = "aflplusplus-${qemuName}"; + + srcs = [ + (fetchurl { + url = "http://wiki.qemu.org/download/${qemuName}.tar.bz2"; + sha256 = "08frr1fdjx8qcfh3fafn10kibdwbvkqqvfl7hpqbm7i9dg4f1zlq"; + }) + aflplusplus.src + ]; + + sourceRoot = qemuName; + + postUnpack = '' + chmod -R +w ${aflplusplus.src.name} + for f in ${aflplusplus.src.name}/qemu_mode/patches/* ; do + sed -E -i 's|(\.\./)+patches/([a-z-]+\.h)|\2|g' $f + sed -E -i 's|\.\./\.\./config\.h|afl-config.h|g' $f + sed -E -i 's|\.\./\.\./include/cmplog\.h|afl-cmplog.h|g' $f + done + cp ${aflplusplus.src.name}/qemu_mode/patches/*.h $sourceRoot/ + cp ${aflplusplus.src.name}/types.h $sourceRoot/afl-types.h + substitute ${aflplusplus.src.name}/config.h $sourceRoot/afl-config.h \ + --replace "types.h" "afl-types.h" + substitute ${aflplusplus.src.name}/include/cmplog.h $sourceRoot/afl-cmplog.h \ + --replace "config.h" "afl-config.h" \ + --replace "forkserver.h" "afl-forkserver.h" + substitute ${aflplusplus.src.name}/include/forkserver.h $sourceRoot/afl-forkserver.h \ + --replace "types.h" "afl-types.h" + + cat ${aflplusplus.src.name}/qemu_mode/patches/*.diff > all.patch + ''; + + nativeBuildInputs = [ + python2 perl pkgconfig flex bison autoconf texinfo + ]; + + buildInputs = [ + zlib glib pixman libuuid + ]; + + enableParallelBuilding = true; + + patches = [ + # patches extracted from aflplusplus source + "../all.patch" + # nix-specific patches to make installation more well-behaved + ./qemu-no-etc-install.patch + ]; + + configureFlags = + [ "--disable-system" + "--enable-linux-user" + "--disable-gtk" + "--disable-sdl" + "--disable-vnc" + "--disable-kvm" + "--target-list=${cpuTarget}" + "--enable-pie" + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; + + meta = with stdenv.lib; { + homepage = "https://www.qemu.org/"; + description = "Fork of QEMU with AFL++ instrumentation support"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ris ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index bde597ba9f30f..c3756b545e3ee 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "age"; - version = "1.0.0-beta2"; + version = "unstable-2020-03-25"; goPackagePath = "github.com/FiloSottile/age"; - modSha256 = "0kwdwhkxgqjd8h1p7pm4h4xidp2vk840h1j4qya4qz8bjf9vskl9"; + vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m"; subPackages = [ "cmd/age" @@ -14,8 +14,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "FiloSottile"; repo = "age"; - rev = "v${version}"; - sha256 = "1n1ww8yjw0mg00dvnfmggww9kwp1hls0a85iv6vx9k89mzv8mdrq"; + rev = "f0f8092d60bb96737fa096c29ec6d8adb5810390"; + sha256 = "079kfc8d1pr39hr4qnx48kviyzwg4p8m4pz0bdkypns4aq8ppbfk"; }; meta = with lib; { @@ -24,4 +24,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ tazjin ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix index ea14d89c45c64..116ada633c6fa 100644 --- a/pkgs/tools/security/aide/default.nix +++ b/pkgs/tools/security/aide/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://aide.sourceforge.net/; + homepage = "http://aide.sourceforge.net/"; description = "A file and directory integrity checker"; license = licenses.free; maintainers = [ maintainers.tstrobel ]; diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix index db490c7822f88..1dcdeae832d5b 100644 --- a/pkgs/tools/security/apg/default.nix +++ b/pkgs/tools/security/apg/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { * Ability to enforce remote users to use only allowed type of password generation ''; - homepage = http://www.adel.nursat.kz/apg/; + homepage = "http://www.adel.nursat.kz/apg/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix index 580cf7585c926..ee5fa924cb6fb 100644 --- a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix +++ b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/yishilin14/asc-key-to-qr-code-gif; + homepage = "https://github.com/yishilin14/asc-key-to-qr-code-gif"; description = "Convert ASCII-armored PGP keys to animated QR code"; platforms = platforms.linux; maintainers = with maintainers; [ asymmetric ]; diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index 71732f26934b4..fe7d5e69f4d5a 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { license = licenses.mit; maintainers = [maintainers.imalsogreg]; platforms = platforms.all; - homepage = https://github.com/segmentio/aws-okta; + homepage = "https://github.com/segmentio/aws-okta"; downloadPage = "https://github.com/segmentio/aws-okta"; }; } diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix index b745a2c872e7b..f72c916acf992 100644 --- a/pkgs/tools/security/bash-supergenpass/default.nix +++ b/pkgs/tools/security/bash-supergenpass/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ fgaz ]; - homepage = https://github.com/lanzz/bash-supergenpass; + homepage = "https://github.com/lanzz/bash-supergenpass"; }; } diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index 0560f91b22b7a..d3cc3c7cadbb6 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "bettercap"; - version = "2.27"; + version = "2.27.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "18hwz9m16pxlb7wp78iqmdi0kimrx3h05fs0zhzm8qhzancq8alf"; + sha256 = "0jb78c3s6p210mj28qg4aacd8ly6d6k5h9c48y88vmcyllzjvbhl"; }; - modSha256 = "1qhmrjb3fvw6maxrl7hb3bizrw6szhwx6s2g59p5pj3dz4x8jajn"; + vendorSha256 = "1j272w0zdndcz4fmh9fzbk2q8wmyfi70vn0p6d8cg0r0l231sbyx"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap libnfnetlink libnetfilter_queue libusb1 ]; @@ -34,4 +34,4 @@ buildGoModule rec { maintainers = with maintainers; [ y0no ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index 6accefa58a4f4..6d3c4bccef9f5 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -8,13 +8,13 @@ let in rustPlatform.buildRustPackage rec { pname = "bitwarden_rs"; - version = "1.14.1"; + version = "1.14.2"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "10fi5vvckmdbjvlg6mlaqh2dsm33sbkq1z1b6gmz8qjbijc8i7gw"; + sha256 = "0413yjbnj4k917x48h1gnj64kygbr6c1n55f23qkvj0hgbxpgssz"; }; nativeBuildInputs = [ pkgconfig ]; @@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - cargoSha256 = "1p8wpndj1aydhcjl15z3xhjf52a0l5rh5cy9qs6w4776crya2jjr"; + cargoSha256 = "09747f9g7yyq9c8wbfdb3hwxii5xq23ynhba0vc01nhjpjyn0ksd"; cargoBuildFlags = [ featuresFlag ]; checkPhase = '' diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index 43d8d3a9b1184..0c60ab621063d 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/bitwarden_rs/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.13.2"; + version = "2.13.2b"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "1000iqjr670imm1dlw9r003d8psp5sq0m0p62sjnll7wnycd805r"; + sha256 = "1pba3d04gfnviv8r98anpv7m8r9r417s352r5fz8qzg8lr070540"; }; buildCommand = '' diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix index 47851fbfa0537..c7d4c4d017416 100644 --- a/pkgs/tools/security/bmrsa/11.nix +++ b/pkgs/tools/security/bmrsa/11.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "RSA utility"; - homepage = http://bmrsa.sourceforge.net/; + homepage = "http://bmrsa.sourceforge.net/"; license = licenses.gpl1; platforms = platforms.linux; }; diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index 966383163e60a..2dd03bc465d9c 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - modSha256 = "13yw7idgw8l48yvm4jjha0kbx6q22m2zp13y006mikavynqsr5kj"; + vendorSha256 = "1wcbn0ip596f2dp68y6jmxgv20l0dgrcxg5cwclkawigj05416zj"; postPatch = '' # Because this Makefile will be installed to be used by the user, patch @@ -46,9 +46,9 @@ buildGoModule rec { meta = with lib; { description = "Browserpass native client app"; - homepage = https://github.com/browserpass/browserpass-native; + homepage = "https://github.com/browserpass/browserpass-native"; license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ rvolosatovs infinisil ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/brutespray/default.nix b/pkgs/tools/security/brutespray/default.nix index be7c99f525272..78dd789047d07 100644 --- a/pkgs/tools/security/brutespray/default.nix +++ b/pkgs/tools/security/brutespray/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "brutespray"; - version = "1.6.6"; + version = "1.6.8"; src = fetchFromGitHub { owner = "x90skysn3k"; repo = pname; rev = "brutespray-${version}"; - sha256 = "1rj8fkq1xz4ph1pmldphlsa25mg6xl7i7dranb0qjx00jhfxjxjh"; + sha256 = "1pi4d5vcvvjsby39dq995dlhpxdicmfhqsiw23hr25m38ccfm3rh"; }; postPatch = '' diff --git a/pkgs/tools/security/bundler-audit/default.nix b/pkgs/tools/security/bundler-audit/default.nix index 3712c129cf656..6bcb341a83436 100644 --- a/pkgs/tools/security/bundler-audit/default.nix +++ b/pkgs/tools/security/bundler-audit/default.nix @@ -20,7 +20,7 @@ bundlerEnv rec { - Prints advisory information. - Does not require a network connection. ''; - homepage = https://github.com/rubysec/bundler-audit; + homepage = "https://github.com/rubysec/bundler-audit"; license = licenses.gpl3Plus; maintainers = with maintainers; [ primeos nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 8d0b3a89a3484..e74e1b61438a5 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ccid"; - version = "1.4.31"; + version = "1.4.32"; src = fetchurl { url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; - sha256 = "1xz8ikr6vk73w3xnwb931yq8lqc1zrj8c3v34n6h63irwjvdfj3b"; + sha256 = "0f8nzk7379ip4x2ii5vn6h67jyx733pq0ywnnsj2llbxi2vllpsl"; }; postPatch = '' @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ccid drivers for pcsclite"; - homepage = https://ccid.apdu.fr/; + homepage = "https://ccid.apdu.fr/"; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/ccrypt/default.nix b/pkgs/tools/security/ccrypt/default.nix index 77a15e2f27c7d..a3210b2a59874 100644 --- a/pkgs/tools/security/ccrypt/default.nix +++ b/pkgs/tools/security/ccrypt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ccrypt-1.11"; src = fetchurl { - url = mirror://sourceforge/ccrypt/ccrypt-1.11.tar.gz; + url = "mirror://sourceforge/ccrypt/ccrypt-1.11.tar.gz"; sha256 = "0kx4a5mhmp73ljknl2lcccmw9z3f5y8lqw0ghaymzvln1984g75i"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; meta = { - homepage = http://ccrypt.sourceforge.net/; + homepage = "http://ccrypt.sourceforge.net/"; description = "Utility for encrypting and decrypting files and streams with AES-256"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/security/certmgr/default.nix b/pkgs/tools/security/certmgr/default.nix index 4f48522e613f9..be3f891cc8bbb 100644 --- a/pkgs/tools/security/certmgr/default.nix +++ b/pkgs/tools/security/certmgr/default.nix @@ -18,7 +18,7 @@ let inherit patches; meta = with stdenv.lib; { - homepage = https://cfssl.org/; + homepage = "https://cfssl.org/"; description = "Cloudflare's certificate manager"; platforms = platforms.linux; license = licenses.bsd2; diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index 8d8497f6cb944..6d4238de7001f 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { ]; meta = with stdenv.lib; { - homepage = https://cfssl.org/; + homepage = "https://cfssl.org/"; description = "Cloudflare's PKI and TLS toolkit"; license = licenses.bsd2; maintainers = with maintainers; [ mbrgm ]; diff --git a/pkgs/tools/security/chaps/default.nix b/pkgs/tools/security/chaps/default.nix index c8ee95069682e..decc9ba31268c 100644 --- a/pkgs/tools/security/chaps/default.nix +++ b/pkgs/tools/security/chaps/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PKCS #11 implementation based on trusted platform module (TPM)"; - homepage = https://www.chromium.org/developers/design-documents/chaps-technical-design; + homepage = "https://www.chromium.org/developers/design-documents/chaps-technical-design"; maintainers = [ maintainers.tstrobel ]; platforms = [ "x86_64-linux" ]; license = licenses.bsd3; diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix index 1d85ba0b5669b..864d73aaa9720 100644 --- a/pkgs/tools/security/chkrootkit/default.nix +++ b/pkgs/tools/security/chkrootkit/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Locally checks for signs of a rootkit"; - homepage = http://www.chkrootkit.org/; + homepage = "http://www.chkrootkit.org/"; license = licenses.bsd2; platforms = with platforms; linux; }; diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/tools/security/chntpw/default.nix index 5a037090801a5..0a44c463eb70a 100644 --- a/pkgs/tools/security/chntpw/default.nix +++ b/pkgs/tools/security/chntpw/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://pogostick.net/~pnh/ntpasswd/; + homepage = "http://pogostick.net/~pnh/ntpasswd/"; description = "An utility to reset the password of any user that has a valid local account on a Windows system"; maintainers = with stdenv.lib.maintainers; [ deepfire ]; license = licenses.gpl2; diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 6cb2eaa7d33ec..9b58aa97dd5b7 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "clamav"; - version = "0.102.2"; + version = "0.102.3"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz"; - sha256 = "1lq7r6r2yl8pp3fkn32b0bsmbbl9pg90kpvhsa2clad3xg0drz49"; + sha256 = "14q6vi178ih60yz4ja33b6181va1dcj8fyscnmxfx2crav250c7d"; }; # don't install sample config files into the absolute sysconfdir folder @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.clamav.net; + homepage = "https://www.clamav.net"; description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom robberer qknight fpletz globin ]; diff --git a/pkgs/tools/security/clevis/default.nix b/pkgs/tools/security/clevis/default.nix index 4acec7c8a5ba2..daeb5e0d39c1d 100644 --- a/pkgs/tools/security/clevis/default.nix +++ b/pkgs/tools/security/clevis/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "clevis"; - version = "12"; + version = "13"; src = fetchFromGitHub { owner = "latchset"; repo = pname; rev = "v${version}"; - sha256 = "1dbyl3c21h841w9lrrq6gd5y6dhamr0z5ixd87jz86cn02lznp5m"; + sha256 = "1p522jjksxmdwjjxa32z2ij1g81ygpkmcx998d07g8pb6rfnknjy"; }; nativeBuildInputs = [ meson ninja pkgconfig asciidoc ]; diff --git a/pkgs/tools/security/cowpatty/default.nix b/pkgs/tools/security/cowpatty/default.nix index 0fb9ed58997f6..7d58de8553b37 100644 --- a/pkgs/tools/security/cowpatty/default.nix +++ b/pkgs/tools/security/cowpatty/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Offline dictionary attack against WPA/WPA2 networks"; license = licenses.gpl2; - homepage = https://www.willhackforsushi.com/?page_id=50; + homepage = "https://www.willhackforsushi.com/?page_id=50"; maintainers = with maintainers; [ nico202 ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix index 04b7b5695b551..e861d70f7252e 100644 --- a/pkgs/tools/security/crackxls/default.nix +++ b/pkgs/tools/security/crackxls/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.4"; src = fetchgit { - url = https://github.com/GavinSmith0123/crackxls2003.git; + url = "https://github.com/GavinSmith0123/crackxls2003.git"; rev = "refs/tags/v${version}"; sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/GavinSmith0123/crackxls2003/; + homepage = "https://github.com/GavinSmith0123/crackxls2003/"; description = "Used to break the encryption on old Microsoft Excel and Microsoft Word files"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/tools/security/crowbar/default.nix b/pkgs/tools/security/crowbar/default.nix new file mode 100644 index 0000000000000..cd4e7db87186e --- /dev/null +++ b/pkgs/tools/security/crowbar/default.nix @@ -0,0 +1,42 @@ +{ fetchFromGitHub +, freerdp +, nmap +, openvpn +, python3Packages +, stdenv +, tigervnc +}: + +python3Packages.buildPythonApplication rec { + pname = "crowbar"; + version = "unstable-2020-04-23"; + + src = fetchFromGitHub { + owner = "galkan"; + repo = pname; + rev = "500d633ff5ddfcbc70eb6d0b4d2181e5b8d3c535"; + sha256 = "05m9vywr9976pc7il0ak8nl26mklzxlcqx0p8rlfyx1q766myqzf"; + }; + + propagatedBuildInputs = [ python3Packages.paramiko ]; + + patchPhase = '' + sed -i 's,/usr/bin/xfreerdp,${freerdp}/bin/xfreerdp,g' lib/main.py + sed -i 's,/usr/bin/vncviewer,${tigervnc}/bin/vncviewer,g' lib/main.py + sed -i 's,/usr/sbin/openvpn,${openvpn}/bin/openvpn,g' lib/main.py + + sed -i 's,/usr/bin/nmap,${nmap}/bin/nmap,g' lib/nmap.py + ''; + + # Sanity check + checkPhase = '' + $out/bin/crowbar --help > /dev/null + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/galkan/crowbar"; + description = "A brute forcing tool that can be used during penetration tests"; + license = licenses.mit; + maintainers = with maintainers; [ pamplemousse ]; + }; +} diff --git a/pkgs/tools/security/crunch/default.nix b/pkgs/tools/security/crunch/default.nix index 259ee38c68f75..b53ead1c8527c 100644 --- a/pkgs/tools/security/crunch/default.nix +++ b/pkgs/tools/security/crunch/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wordlist generator"; - homepage = https://sourceforge.net/projects/crunch-wordlist/; + homepage = "https://sourceforge.net/projects/crunch-wordlist/"; platforms = platforms.unix; maintainers = with maintainers; [ lethalman lnl7 ]; }; diff --git a/pkgs/tools/security/ctmg/default.nix b/pkgs/tools/security/ctmg/default.nix index 104a615542bda..a30523c3bbc19 100644 --- a/pkgs/tools/security/ctmg/default.nix +++ b/pkgs/tools/security/ctmg/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An encrypted container manager for Linux using cryptsetup"; - homepage = https://git.zx2c4.com/ctmg/about/; + homepage = "https://git.zx2c4.com/ctmg/about/"; license = licenses.isc; maintainers = with maintainers; [ mrVanDalo ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/diceware/default.nix b/pkgs/tools/security/diceware/default.nix index dcd7e853564ac..f32d63cfc10d9 100644 --- a/pkgs/tools/security/diceware/default.nix +++ b/pkgs/tools/security/diceware/default.nix @@ -26,7 +26,7 @@ buildPythonApplication rec { meta = with lib; { description = "Generates passphrases by concatenating words randomly picked from wordlists"; - homepage = https://github.com/ulif/diceware; + homepage = "https://github.com/ulif/diceware"; license = licenses.gpl3; maintainers = with maintainers; [ asymmetric ]; }; diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix index ce8b5825647ce..8cc9017a8feac 100644 --- a/pkgs/tools/security/doas/default.nix +++ b/pkgs/tools/security/doas/default.nix @@ -1,20 +1,31 @@ -{ stdenv, lib, fetchFromGitHub, bison, pam }: +{ stdenv +, lib +, fetchFromGitHub +, bison +, pam + +, withTimestamp ? true +}: stdenv.mkDerivation rec { pname = "doas"; - - version = "6.0"; + version = "6.6.1"; src = fetchFromGitHub { owner = "Duncaen"; repo = "OpenDoas"; rev = "v${version}"; - sha256 = "1j50l3jvbgvg8vmp1nx6vrjxkbj5bvfh3m01bymzfn25lkwwhz1x"; + sha256 = "07kkc5729p654jrgfsc8zyhiwicgmq38yacmwfvay2b3gmy728zn"; }; # otherwise confuses ./configure dontDisableStatic = true; + configureFlags = [ + (lib.optionalString withTimestamp "--with-timestamp") # to allow the "persist" setting + "--pamdir=${placeholder "out"}/etc/pam.d" + ]; + postPatch = '' sed -i '/\(chown\|chmod\)/d' bsd.prog.mk ''; @@ -26,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Duncaen/OpenDoas"; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ cole-h cstrahan ]; }; } diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index 2cf9b92745fd1..2c3a7a441afde 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "duo-unix"; - version = "1.11.3"; + version = "1.11.4"; src = fetchurl { url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; - sha256 = "097i2dsnbndpnyc4nx1j76qkx1bxwwlxnzmp1h3j4raghddgiq0g"; + sha256 = "1hqklf6jzrxn5hgh69bbl6962hwwgf06dlrb0ry7n5iy8w8imnsg"; }; buildInputs = [ pam openssl zlib ]; diff --git a/pkgs/tools/security/ecdsatool/default.nix b/pkgs/tools/security/ecdsatool/default.nix index 0e57a5bab884c..524f38982cc4e 100644 --- a/pkgs/tools/security/ecdsatool/default.nix +++ b/pkgs/tools/security/ecdsatool/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Create and manipulate ECC NISTP256 keypairs."; - homepage = https://github.com/kaniini/ecdsatool/; + homepage = "https://github.com/kaniini/ecdsatool/"; license = with licenses; [free]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/tools/security/ecdsautils/default.nix index 13280e3226d94..f5ead317f4ecd 100644 --- a/pkgs/tools/security/ecdsautils/default.nix +++ b/pkgs/tools/security/ecdsautils/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tiny collection of programs used for ECDSA (keygen, sign, verify)"; - homepage = https://github.com/tcatm/ecdsautils/; + homepage = "https://github.com/tcatm/ecdsautils/"; license = with licenses; [ mit bsd2 ]; maintainers = with maintainers; [ andir ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 13ab56aaa9a23..cad5bb244f996 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Belgian electronic identity card (eID) middleware"; - homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; + homepage = "http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/"; license = licenses.lgpl3; longDescription = '' Allows user authentication and digital signatures with Belgian ID cards. diff --git a/pkgs/tools/security/enchive/default.nix b/pkgs/tools/security/enchive/default.nix index 7e45ab76ed0b4..3c7d3144d3b24 100644 --- a/pkgs/tools/security/enchive/default.nix +++ b/pkgs/tools/security/enchive/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Encrypted personal archives"; - homepage = https://github.com/skeeto/enchive; + homepage = "https://github.com/skeeto/enchive"; license = stdenv.lib.licenses.unlicense; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix index 01855ee3e5b4d..b4c2bef2cf407 100644 --- a/pkgs/tools/security/encryptr/default.nix +++ b/pkgs/tools/security/encryptr/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - homepage = https://spideroak.com/solutions/encryptr; + homepage = "https://spideroak.com/solutions/encryptr"; description = "Free, private and secure password management tool and e-wallet"; license = licenses.unfree; maintainers = with maintainers; [ guillaumekoenig ]; diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 6e61f05412259..370282d02d066 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -14,7 +14,7 @@ let data = all_data.${system_map.${stdenv.hostPlatform.system} or (throw "Unsupported platform")}; - baseUrl = http://repo.sinew.in; + baseUrl = "http://repo.sinew.in"; # used of both wrappers and libpath libPath = lib.makeLibraryPath (with xorg; [ @@ -51,7 +51,7 @@ let meta = { description = "a well known password manager"; - homepage = https://www.enpass.io/; + homepage = "https://www.enpass.io/"; license = lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux"]; }; diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 39017d09886e2..6377e829aa657 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication { ''; meta = with stdenv.lib; { - homepage = https://www.fail2ban.org/; + homepage = "https://www.fail2ban.org/"; description = "A program that scans log files for repeated failing login attempts and bans IP addresses"; license = licenses.gpl2Plus; maintainers = with maintainers; [ eelco lovek323 fpletz ]; diff --git a/pkgs/tools/security/fcrackzip/default.nix b/pkgs/tools/security/fcrackzip/default.nix index d923e81ae8261..15510f7b70967 100644 --- a/pkgs/tools/security/fcrackzip/default.nix +++ b/pkgs/tools/security/fcrackzip/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "zip password cracker, similar to fzc, zipcrack and others"; - homepage = http://oldhome.schmorp.de/marc/fcrackzip.html; + homepage = "http://oldhome.schmorp.de/marc/fcrackzip.html"; license = licenses.gpl2; maintainers = with maintainers; [ nico202 ]; platforms = with platforms; unix; diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix index b6669358f7f91..3d082523f6fa3 100644 --- a/pkgs/tools/security/fpm2/default.nix +++ b/pkgs/tools/security/fpm2/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "FPM2 is GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements."; - homepage = https://als.regnet.cz/fpm2/; + homepage = "https://als.regnet.cz/fpm2/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ hce ]; diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 41a00306f6953..62f5dda17f67f 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -1,42 +1,70 @@ -{ thinkpad ? false -, stdenv -, fetchurl +{ stdenv +, fetchFromGitLab , fetchpatch , pkgconfig -, intltool -, libfprint-thinkpad ? null -, libfprint ? null +, meson +, ninja +, perl +, gettext +, cairo +, gtk-doc +, libxslt +, docbook-xsl-nons +, docbook_xml_dtd_412 , glib +, dbus , dbus-glib , polkit , nss , pam , systemd -, autoreconfHook -, gtk-doc +, libfprint +, python3 }: stdenv.mkDerivation rec { - pname = "fprintd" + stdenv.lib.optionalString thinkpad "-thinkpad"; - version = "0.9.0"; + pname = "fprintd"; + version = "1.90.1"; + outputs = [ "out" "devdoc" ]; - src = fetchurl { - url = "https://gitlab.freedesktop.org/libfprint/fprintd/uploads/9dec4b63d1f00e637070be1477ce63c0/fprintd-${version}.tar.xz"; - sha256 = "182gcnwb6zjwmk0dn562rjmpbk7ac7dhipbfdhfic2sn1jzis49p"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "libfprint"; + repo = pname; + rev = version; + sha256 = "0mbzk263x7f58i9cxhs44mrngs7zw5wkm62j5r6xlcidhmfn03cg"; }; patches = [ + # Fixes issue with ":" when there is multiple paths (might be the case on NixOS) + # https://gitlab.freedesktop.org/libfprint/fprintd/-/merge_requests/50 + (fetchpatch { + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/d7fec03f24d10f88d34581c72f0eef201f5eafac.patch"; + sha256 = "QNN05WF4YZ0XiTwm5NkfqZDuQpyXlnrh+RJF9SNsCDk="; + }) + + # Fix locating libpam_wrapper for tests + (fetchpatch { + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/merge_requests/40.patch"; + sha256 = "43uPihK6HhygHw1Qplwci80Wseq/S77VUp+OdEECHmM="; + }) (fetchpatch { - url = "https://gitlab.freedesktop.org/libfprint/fprintd/merge_requests/16.patch"; - sha256 = "1y39zsmxjll9hip8464qwhq5qg06c13pnafyafgxdph75lvhdll7"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f401f399a85dbeb2de165b9b9162eb552ab6eea7.patch"; + sha256 = "Pga+/QEkln8DOwGZfKM1r2urJX4Y3X0bozWWxKZ5ia0="; }) ]; nativeBuildInputs = [ - intltool pkgconfig - autoreconfHook # Drop with above patch - gtk-doc # Drop with above patch + meson + ninja + perl + gettext + gtk-doc + libxslt + dbus + docbook-xsl-nons + docbook_xml_dtd_412 ]; buildInputs = [ @@ -46,23 +74,43 @@ stdenv.mkDerivation rec { nss pam systemd - ] - ++ stdenv.lib.optional thinkpad libfprint-thinkpad - ++ stdenv.lib.optional (!thinkpad) libfprint - ; + libfprint + ]; + + checkInputs = with python3.pkgs; [ + python-dbusmock + dbus-python + pygobject3 + pycairo + pypamtest + ]; - configureFlags = [ - # is hardcoded to /var/lib/fprint, this is for the StateDirectory install target - "--localstatedir=${placeholder "out"}/var" - "--sysconfdir=${placeholder "out"}/etc" - "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + mesonFlags = [ + "-Dgtk_doc=true" + "-Dpam_modules_dir=${placeholder "out"}/lib/security" + "-Dsysconfdir=${placeholder "out"}/etc" + "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/system-services" + "-Dsystemd_system_unit_dir=${placeholder "out"}/lib/systemd/system" ]; + PKG_CONFIG_DBUS_1_INTERFACES_DIR = "${placeholder "out"}/share/dbus-1/interfaces"; + PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; + PKG_CONFIG_DBUS_1_DATADIR = "${placeholder "out"}/share"; + + # FIXME: Ugly hack for tests to find libpam_wrapper.so + LIBRARY_PATH = stdenv.lib.makeLibraryPath [ python3.pkgs.pypamtest ]; + + doCheck = true; + + postPatch = '' + patchShebangs po/check-translations.sh + ''; + meta = with stdenv.lib; { - homepage = https://fprint.freedesktop.org/; + homepage = "https://fprint.freedesktop.org/"; description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar elyhaka ]; }; } diff --git a/pkgs/tools/security/fprot/default.nix b/pkgs/tools/security/fprot/default.nix index 3fff99a6ce10f..12b47694db3c7 100644 --- a/pkgs/tools/security/fprot/default.nix +++ b/pkgs/tools/security/fprot/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { version = "6.2.1"; src = fetchurl { - url = http://files.f-prot.com/files/unix-trial/fp-Linux.x86.32-ws.tar.gz; + url = "http://files.f-prot.com/files/unix-trial/fp-Linux.x86.32-ws.tar.gz"; sha256 = "0qlsrkanf0inplwv1i6hqbimdg91syf5ggd1vahsm9lhivmnr0v5"; }; @@ -33,10 +33,10 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.f-prot.com; + homepage = "http://www.f-prot.com"; description = "A popular proprietary antivirus program"; license = licenses.unfree; maintainers = [ maintainers.phreedom ]; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix index a9f69c8b96e12..0f1c37aa79752 100644 --- a/pkgs/tools/security/fwknop/default.nix +++ b/pkgs/tools/security/fwknop/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { fwknop stands for the "FireWall KNock OPerator", and implements an authorization scheme called Single Packet Authorization (SPA). ''; - homepage = https://www.cipherdyne.org/fwknop/; + homepage = "https://www.cipherdyne.org/fwknop/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/pkgs/tools/security/gen-oath-safe/default.nix index 89900d27bd276..15b8820bfd55d 100644 --- a/pkgs/tools/security/gen-oath-safe/default.nix +++ b/pkgs/tools/security/gen-oath-safe/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${path} ''; meta = with stdenv.lib; { - homepage = https://github.com/mcepl/gen-oath-safe; + homepage = "https://github.com/mcepl/gen-oath-safe"; description = "Script for generating HOTP/TOTP keys (and QR code)"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index 63d1bab89d7fb..e56c9e20fd43d 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.libertyzero.com/GEncfsM/; - downloadPage = https://launchpad.net/gencfsm/; + homepage = "http://www.libertyzero.com/GEncfsM/"; + downloadPage = "https://launchpad.net/gencfsm/"; description = "EncFS manager and mounter with GNOME3 integration"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix new file mode 100644 index 0000000000000..ee3eebac991bd --- /dev/null +++ b/pkgs/tools/security/genpass/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +}: +rustPlatform.buildRustPackage rec { + pname = "genpass"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "cyplo"; + repo = pname; + rev = "v${version}"; + sha256 = "1b22m7g55k5ry0vwyd8pakh8rmfkhk37qy5r74cn3n5pv3fcwini"; + }; + + cargoSha256 = "1p6l64s9smhwka8bh3pamqimamxziad859i62nrmxzqc49nq5s7m"; + + meta = with stdenv.lib; { + description = "A simple yet robust commandline random password generator."; + homepage = "https://github.com/cyplo/genpass"; + license = licenses.agpl3; + platforms = platforms.all; + maintainers = with maintainers; [ cyplo ]; + }; +} diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index b3773725e6e96..d31e1f2c27582 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, lib, makeWrapper, autoPatchelfHook +{ stdenv, fetchzip, lib, makeWrapper, autoPatchelfHook , openjdk11, pam, makeDesktopItem, icoutils }: let @@ -16,23 +16,22 @@ in stdenv.mkDerivation { - name = "ghidra-9.1"; + name = "ghidra-9.1.2"; - src = fetchurl { - url = https://ghidra-sre.org/ghidra_9.1_PUBLIC_20191023.zip; - sha256 = "0pl7s59008gvgwz4mxp7rz3xr3vaa12a6s5zvx2yr9jxx3gk1l99"; + src = fetchzip { + url = "https://ghidra-sre.org/ghidra_9.1.2_PUBLIC_20200212.zip"; + sha256 = "0j48pijypg44bw06azbrgfqjkigb13ljfdxib70sxwyqia3vkbbm"; }; nativeBuildInputs = [ makeWrapper autoPatchelfHook - unzip + icoutils ]; buildInputs = [ stdenv.cc.cc.lib pam - icoutils ]; dontStrip = true; @@ -42,7 +41,7 @@ in stdenv.mkDerivation { mkdir -p "${pkg_path}" "$out/share/applications" cp -a * "${pkg_path}" ln -s ${desktopItem}/share/applications/* $out/share/applications - + icotool -x "${pkg_path}/support/ghidra.ico" rm ghidra_4_40x40x32.png for f in ghidra_*.png; do diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/tools/security/gnome-keysign/default.nix index a559039d95aca..4b9a6fb0e3219 100644 --- a/pkgs/tools/security/gnome-keysign/default.nix +++ b/pkgs/tools/security/gnome-keysign/default.nix @@ -6,7 +6,6 @@ , gobject-introspection , gtk3 , glib -, gnome3 , gst_all_1 }: @@ -53,7 +52,7 @@ python3.pkgs.buildPythonApplication rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) - gst_all_1.gst-plugins-bad # for zbar plug-in + (gst_all_1.gst-plugins-bad.override { enableZbar = true; }) # for zbar plug-in ]; propagatedBuildInputs = with python3.pkgs; [ @@ -68,12 +67,6 @@ python3.pkgs.buildPythonApplication rec { twisted ]; - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - # https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; @@ -82,9 +75,9 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "GTK/GNOME application to use GnuPG for signing other peoples’ keys"; - homepage = https://wiki.gnome.org/Apps/Keysign; + homepage = "https://wiki.gnome.org/Apps/Keysign"; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/pkgs/tools/security/gnu-pw-mgr/default.nix index 940a5b9a05350..de5234961d254 100644 --- a/pkgs/tools/security/gnu-pw-mgr/default.nix +++ b/pkgs/tools/security/gnu-pw-mgr/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnulib ]; meta = with lib; { - homepage = https://www.gnu.org/software/gnu-pw-mgr/; + homepage = "https://www.gnu.org/software/gnu-pw-mgr/"; description = "A password manager designed to make it easy to reconstruct difficult passwords"; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix index bc7cff99dc239..4d6b97c7192ee 100644 --- a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix +++ b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { gnupg-pkcs11 is a project to implement a BSD-licensed smart-card daemon to enable the use of PKCS#11 tokens with GnuPG. ''; - homepage = http://gnupg-pkcs11.sourceforge.net/; + homepage = "http://gnupg-pkcs11.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ lschuermann philandstuff ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index 3b916378bf52d..20ecd7c92fb22 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://gnupg.org; + homepage = "https://gnupg.org"; description = "Classic (1.4) release of the GNU Privacy Guard, a GPL OpenPGP implementation"; license = licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index ef348e388342b..f5b693fed35aa 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -4,7 +4,7 @@ # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. , pinentry ? null, guiSupport ? false -, openldap ? null, bzip2 ? null, libusb ? null, curl ? null +, openldap ? null, bzip2 ? null, libusb-compat-0_1 ? null, curl ? null }: with stdenv.lib; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline zlib libgpgerror libgcrypt libassuan libksba pth - openldap bzip2 libusb curl libiconv ]; + openldap bzip2 libusb-compat-0_1 curl libiconv ]; patches = [ ./gpgkey2ssh-20.patch ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://gnupg.org; + homepage = "https://gnupg.org"; description = "Stable (2.0) release of the GNU Privacy Guard, a GPL OpenPGP implementation"; license = licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index f67e8bedcef15..7c095cffa3116 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -4,7 +4,7 @@ # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. , guiSupport ? true, enableMinimal ? false -, adns ? null , bzip2 ? null , gnutls ? null , libusb ? null , openldap ? null +, adns ? null , bzip2 ? null , gnutls ? null , libusb1 ? null , openldap ? null , pcsclite ? null , pinentry ? null , readline ? null , sqlite ? null , zlib ? null }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig texinfo ]; buildInputs = [ libgcrypt libassuan libksba libiconv npth gettext - readline libusb gnutls adns openldap zlib bzip2 sqlite + readline libusb1 gnutls adns openldap zlib bzip2 sqlite ]; patches = [ @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://gnupg.org; + homepage = "https://gnupg.org"; description = "Modern (2.1) release of the GNU Privacy Guard, a GPL OpenPGP implementation"; license = licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/tools/security/gobuster/default.nix index c3426bee965ba..8b80855114950 100644 --- a/pkgs/tools/security/gobuster/default.nix +++ b/pkgs/tools/security/gobuster/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "0q8ighqykh8qyvidnm6az6dc9mp32bbmhkmkqzl1ybbw6paa8pym"; }; - modSha256 = "0jq0z5s05vqdvq7v1gdjwlqqwbl1j2rv9f16k52idl50vdiqviql"; + vendorSha256 = "0kr9i2nm5csf3070hwaiss137pfa3088xbw2zigp7aqb2naky036"; meta = with lib; { description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers"; @@ -22,4 +22,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ pamplemousse ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 41a0d6eb7a5a6..6b9042e56914f 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -1,20 +1,29 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, wl-clipboard, makeWrapper }: +{ stdenv, makeWrapper +, buildGoModule, fetchFromGitHub, installShellFiles +, git +, gnupg +, xclip +, wl-clipboard +, passAlias ? false +}: -buildGoPackage rec { +buildGoModule rec { pname = "gopass"; - version = "1.8.6"; + version = "1.9.2"; - goPackagePath = "github.com/gopasspw/gopass"; - - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; src = fetchFromGitHub { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "0v3sx9hb03bdn4rvsv2r0jzif6p1rx47hrkpsbnwva31k396mck2"; + sha256 = "066dphw8xq0g72kj64sdai2yyllnr6ca27bfy5sxhk8x69j97rvz"; }; + vendorSha256 = "1wn20bh7ma4pblsf6qnlbz5bx4p9apig3d1yz7cpsqv4z3w07baw"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ]; + wrapperPath = stdenv.lib.makeBinPath ([ git gnupg @@ -22,25 +31,24 @@ buildGoPackage rec { ] ++ stdenv.lib.optional stdenv.isLinux wl-clipboard); postInstall = '' - mkdir -p \ - $bin/share/bash-completion/completions \ - $bin/share/zsh/site-functions \ - $bin/share/fish/vendor_completions.d - $bin/bin/gopass completion bash > $bin/share/bash-completion/completions/_gopass - $bin/bin/gopass completion zsh > $bin/share/zsh/site-functions/_gopass - $bin/bin/gopass completion fish > $bin/share/fish/vendor_completions.d/gopass.fish + for shell in bash fish zsh; do + $out/bin/gopass completion $shell > gopass.$shell + installShellCompletion gopass.$shell + done + '' + stdenv.lib.optionalString passAlias '' + ln -s $out/bin/gopass $out/bin/pass ''; postFixup = '' - wrapProgram $bin/bin/gopass \ + wrapProgram $out/bin/gopass \ --prefix PATH : "${wrapperPath}" ''; meta = with stdenv.lib; { description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go."; - homepage = https://www.gopass.pw/; + homepage = "https://www.gopass.pw/"; license = licenses.mit; - maintainers = with maintainers; [ andir ]; + maintainers = with maintainers; [ andir rvolosatovs ]; platforms = platforms.unix; longDescription = '' @@ -53,4 +61,4 @@ buildGoPackage rec { well, providing a stellar user experience and a sane, simple interface. ''; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix index 1ba650f5af751..975976c6a3c1a 100644 --- a/pkgs/tools/security/gorilla-bin/default.nix +++ b/pkgs/tools/security/gorilla-bin/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Password Gorilla is a Tk based password manager"; - homepage = https://github.com/zdia/gorilla/wiki; + homepage = "https://github.com/zdia/gorilla/wiki"; maintainers = [ stdenv.lib.maintainers.namore ]; platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/security/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix index c3a14f62c7664..80153b857c4fb 100644 --- a/pkgs/tools/security/gpgstats/default.nix +++ b/pkgs/tools/security/gpgstats/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { longDescription = '' GPGstats calculates statistics on the keys in your key-ring. ''; - homepage = http://www.vanheusden.com/gpgstats/; + homepage = "http://www.vanheusden.com/gpgstats/"; license = licenses.gpl2; maintainers = with maintainers; [ davidak ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix index bfac54d2d8601..9468ee2843bdc 100644 --- a/pkgs/tools/security/haka/default.nix +++ b/pkgs/tools/security/haka/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "A collection of tools that allows capturing TCP/IP packets and filtering them based on Lua policy files"; - homepage = http://www.haka-security.org/; + homepage = "http://www.haka-security.org/"; license = stdenv.lib.licenses.mpl20; maintainers = [ stdenv.lib.maintainers.tvestelind ]; platforms = [ "x86_64-linux" "i686-linux" ]; # fails on aarch64 diff --git a/pkgs/tools/security/hash_extender/default.nix b/pkgs/tools/security/hash_extender/default.nix index 30ba2fb30872a..6efa780e1cd3b 100644 --- a/pkgs/tools/security/hash_extender/default.nix +++ b/pkgs/tools/security/hash_extender/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tool to automate hash length extension attacks"; - homepage = https://github.com/iagox86/hash_extender; + homepage = "https://github.com/iagox86/hash_extender"; license = licenses.bsd3; maintainers = with maintainers; [ geistesk ]; }; diff --git a/pkgs/tools/security/hashcash/default.nix b/pkgs/tools/security/hashcash/default.nix index a28822ecd951e..bb8fba33e1d4d 100644 --- a/pkgs/tools/security/hashcash/default.nix +++ b/pkgs/tools/security/hashcash/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Proof-of-work algorithm used as spam and denial-of-service counter measure"; - homepage = http://hashcash.org; + homepage = "http://hashcash.org"; license = licenses.gpl2; maintainers = with maintainers; [ kisonecat ]; }; diff --git a/pkgs/tools/security/hashcat-utils/default.nix b/pkgs/tools/security/hashcat-utils/default.nix index 50508cfc4941d..7dcfff038a8df 100644 --- a/pkgs/tools/security/hashcat-utils/default.nix +++ b/pkgs/tools/security/hashcat-utils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small utilities that are useful in advanced password cracking"; - homepage = https://github.com/hashcat/hashcat-utils; + homepage = "https://github.com/hashcat/hashcat-utils"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ fadenb ]; diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 72a13c0f259e3..c1fd84b645270 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast password cracker"; - homepage = https://hashcat.net/hashcat/; + homepage = "https://hashcat.net/hashcat/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ kierdavis zimbatm ]; diff --git a/pkgs/tools/security/haveged/default.nix b/pkgs/tools/security/haveged/default.nix index c47331f1bcb95..c676a173092da 100644 --- a/pkgs/tools/security/haveged/default.nix +++ b/pkgs/tools/security/haveged/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { of haveged is directed towards improving overall reliability and adaptability while minimizing the barriers to using haveged for other tasks. ''; - homepage = http://www.issihosts.com/haveged/; + homepage = "http://www.issihosts.com/haveged/"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.domenkozar ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/security/hcxdumptool/default.nix b/pkgs/tools/security/hcxdumptool/default.nix new file mode 100644 index 0000000000000..c7a5a99855521 --- /dev/null +++ b/pkgs/tools/security/hcxdumptool/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub, openssl }: + +stdenv.mkDerivation rec { + pname = "hcxdumptool"; + version = "6.0.6"; + + src = fetchFromGitHub { + owner = "ZerBea"; + repo = "hcxdumptool"; + rev = version; + sha256 = "1b4d543y64ib92w9gcmiyjn5hz2vyjqmxk3f3yr1zk04fhw16gmf"; + }; + + buildInputs = [ openssl ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/ZerBea/hcxdumptool"; + description = "Small tool to capture packets from wlan devices"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ danielfullmer ]; + }; +} diff --git a/pkgs/tools/security/hcxtools/default.nix b/pkgs/tools/security/hcxtools/default.nix index 84517ce2bd8b4..5634ee6cff062 100644 --- a/pkgs/tools/security/hcxtools/default.nix +++ b/pkgs/tools/security/hcxtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxtools"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "ZerBea"; repo = pname; rev = version; - sha256 = "0r7pjz89chgb7zl2pqgw3zb1z8cgwp0nxmqvmkv0jn1m9dw3f44f"; + sha256 = "0a36184igdgs2h83zr4zihc5acps91ipmgph37jakvzwrsn64ma6"; }; buildInputs = [ curl openssl zlib ]; diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index e6c375599a92c..910bcc522e7fc 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/AdRoll/hologram/; + homepage = "https://github.com/AdRoll/hologram/"; description = "Easy, painless AWS credentials on developer laptops."; maintainers = with maintainers; [ nand0p ]; platforms = platforms.all; diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/pkgs/tools/security/ibm-sw-tpm2/default.nix index e2e01fbb921cb..5e1d460a4634d 100644 --- a/pkgs/tools/security/ibm-sw-tpm2/default.nix +++ b/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "IBM's Software TPM 2.0, an implementation of the TCG TPM 2.0 specification"; - homepage = https://sourceforge.net/projects/ibmswtpm2/; + homepage = "https://sourceforge.net/projects/ibmswtpm2/"; platforms = platforms.linux; maintainers = with maintainers; [ delroth ]; license = licenses.bsd3; diff --git a/pkgs/tools/security/ifdnfc/default.nix b/pkgs/tools/security/ifdnfc/default.nix index 5ec66a5b98cc9..bab6527f41532 100644 --- a/pkgs/tools/security/ifdnfc/default.nix +++ b/pkgs/tools/security/ifdnfc/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { Supports the pn533 smart-card reader chip which is for example used in the SCM SCL3711. ''; - homepage = https://github.com/nfc-tools/ifdnfc; + homepage = "https://github.com/nfc-tools/ifdnfc"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/tools/security/ipscan/default.nix b/pkgs/tools/security/ipscan/default.nix index 642b7d80305a6..80634b7d1a1cb 100644 --- a/pkgs/tools/security/ipscan/default.nix +++ b/pkgs/tools/security/ipscan/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipscan"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { url = "https://github.com/angryip/ipscan/releases/download/${version}/ipscan_${version}_all.deb"; - sha256 = "1dbralnbi5q5v6a5nbs64ihvs20fkm3cddsbakck5fbqdm5by7k7"; + sha256 = "1l6l3nb1yq0f09ia3k9k1dcpzp9g1hxnf547pqmiyiqvd27n7shs"; }; sourceRoot = "."; diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix new file mode 100644 index 0000000000000..961f1e6954a16 --- /dev/null +++ b/pkgs/tools/security/jadx/default.nix @@ -0,0 +1,103 @@ +{ stdenv, fetchFromGitHub, gradle, jdk, makeWrapper, perl }: + +let + pname = "jadx"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "skylot"; + repo = pname; + rev = "v${version}"; + sha256 = "1dx3g0sm46qy57gggpg8bpmin5glzbxdbf0qzvha9r2dwh4mrwlg"; + }; + + deps = stdenv.mkDerivation { + name = "${pname}-deps"; + inherit src; + + nativeBuildInputs = [ gradle jdk perl ]; + + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + export JADX_VERSION=${version} + gradle --no-daemon jar + ''; + + # Mavenize dependency paths + # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "083r4hg6m9cxzm2m8nckf10awq8kh901v5i39r60x47xk5yw84ps"; + }; +in stdenv.mkDerivation { + inherit pname version src; + + nativeBuildInputs = [ gradle jdk makeWrapper ]; + + buildPhase = '' + # The installDist Gradle build phase tries to copy some dependency .jar + # files multiple times into the build directory. This ends up failing when + # the dependencies are read directly from the Nix store since they are not + # marked as chmod +w. To work around this, get a local copy of the + # dependency store, and give write permissions. + depsDir=$(mktemp -d) + cp -R ${deps}/* $depsDir + chmod -R u+w $depsDir + + gradleInit=$(mktemp) + cat >$gradleInit <<EOF + gradle.projectsLoaded { + rootProject.allprojects { + buildscript { + repositories { + clear() + maven { url '$depsDir' } + } + } + repositories { + clear() + maven { url '$depsDir' } + } + } + } + + settingsEvaluated { settings -> + settings.pluginManagement { + repositories { + maven { url '$depsDir' } + } + } + } + EOF + + export GRADLE_USER_HOME=$(mktemp -d) + export JADX_VERSION=${version} + gradle --offline --no-daemon --info --init-script $gradleInit pack + ''; + + installPhase = '' + mkdir $out $out/bin + cp -R build/jadx/lib $out + for prog in jadx jadx-gui; do + cp build/jadx/bin/$prog $out/bin + wrapProgram $out/bin/$prog --set JAVA_HOME ${jdk.home} + done + ''; + + meta = with stdenv.lib; { + description = "Dex to Java decompiler"; + longDescription = '' + Command line and GUI tools for produce Java source code from Android Dex + and Apk files. + ''; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ delroth ]; + }; +} diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 17e02e736dc44..f47728b8ba2aa 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = { description = "John the Ripper password cracker"; license = licenses.gpl2; - homepage = https://github.com/magnumripper/JohnTheRipper/; + homepage = "https://github.com/magnumripper/JohnTheRipper/"; maintainers = with maintainers; [ offline matthewbauer ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index f2314d7a0e87c..2161aa5f1cd84 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jwt-cli"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "mike-engel"; repo = pname; rev = version; - sha256 = "108pwk0h6zcbfmp0k8rhjxaa9yk8rhb78aaql22x48n11fnjl27i"; + sha256 = "0pmxis3m3madwnmswz9hn0i8fz6a9bg11slgrrwql7mx23ijqf6y"; }; - cargoSha256 = "1xh2ylx5fqblhlrs8yhl3zf8kvgrqnwdwmix6yzch9bi5mv5c11w"; + cargoSha256 = "165g1v0c8jxs8ddm8ld0hh7k8mvk3566ig43pf99hnw009fg1yc2"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 6f2eaf5770111..bbc99c2ac410b 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "keybase"; - version = "5.3.1"; + version = "5.4.2"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/kbnm" "go/keybase" ]; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "1a1h2c8jr4r20w4gyvyrpsslmh69bl8syl3jbr0fcr2kka7vqnzg"; + sha256 = "08lw5aw962f75xi42bwbgba94hiql2n2jnsxrkx84czi0ijs1wlr"; }; patches = [ @@ -32,10 +32,10 @@ buildGoPackage rec { buildFlags = [ "-tags production" ]; meta = with stdenv.lib; { - homepage = https://www.keybase.io/; + homepage = "https://www.keybase.io/"; description = "The Keybase official command-line utility and service."; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ carlsverre np rvolosatovs filalex77 ]; + maintainers = with maintainers; [ avaq carlsverre np rvolosatovs filalex77 ]; license = licenses.bsd3; }; } diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 0a5855b20605d..054907843909b 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -4,16 +4,16 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20200320154633.3e235215b3"; + versionSuffix = "20200424214931.7b0bbf1e3c"; in stdenv.mkDerivation rec { pname = "keybase-gui"; - version = "5.3.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "5.4.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "00k1xg27arbqpa836c55fhkxjvjbhjgkf6jqzprjzz76zksfdcx4"; + sha256 = "06iksmrr959mlzxc3nwd70apmvhij1xarxvvflys5qa31vravizs"; }; nativeBuildInputs = [ @@ -105,10 +105,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.keybase.io/; + homepage = "https://www.keybase.io/"; description = "The Keybase official GUI"; platforms = platforms.linux; - maintainers = with maintainers; [ rvolosatovs puffnfresh np filalex77 ]; + maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np filalex77 ]; license = licenses.bsd3; }; } diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix index 20fadee6a40e5..e9284e7230fb2 100644 --- a/pkgs/tools/security/keybase/kbfs.nix +++ b/pkgs/tools/security/keybase/kbfs.nix @@ -16,7 +16,7 @@ buildGoPackage { homepage = "https://keybase.io/docs/kbfs"; description = "The Keybase filesystem"; platforms = platforms.unix; - maintainers = with maintainers; [ rvolosatovs bennofs np ]; + maintainers = with maintainers; [ avaq rvolosatovs bennofs np ]; license = licenses.bsd3; }; } diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index 9d4c590efa1e3..09916f85f9e6a 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { - version = "3.3"; + version = "3.4"; pname = "kpcli"; src = fetchurl { url = "mirror://sourceforge/kpcli/${pname}-${version}.pl"; - sha256 = "1z6dy70d3ag16vgzzafcnxb8gap3wahfmy4vd22fpgbrdd6riph4"; + sha256 = "0s46cni16ph93havmkrlai3k13mdppyca1s2bqm751a6rirmsgj0"; }; buildInputs = [ makeWrapper perl ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Use this program to access and manage your KeePass 1.x or 2.x databases from a Unix-like command line. ''; license = licenses.artistic1; - homepage = http://kpcli.sourceforge.net; + homepage = "http://kpcli.sourceforge.net"; platforms = platforms.all; maintainers = [ maintainers.j-keck ]; }; diff --git a/pkgs/tools/security/krunner-pass/default.nix b/pkgs/tools/security/krunner-pass/default.nix index 57174148160dc..7904235b86a47 100644 --- a/pkgs/tools/security/krunner-pass/default.nix +++ b/pkgs/tools/security/krunner-pass/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { patches = [ (fetchpatch { - url = https://github.com/peterhoeg/krunner-pass/commit/be2695f4ae74b0cccec8294defcc92758583d96b.patch; + url = "https://github.com/peterhoeg/krunner-pass/commit/be2695f4ae74b0cccec8294defcc92758583d96b.patch"; sha256 = "098dqnal57994p51p2srfzg4lgcd6ybp29h037llr9cdv02hdxvl"; name = "fix_build.patch"; }) @@ -35,7 +35,7 @@ mkDerivation rec { meta = with lib; { description = "Integrates krunner with pass the unix standard password manager (https://www.passwordstore.org/)"; - homepage = https://github.com/akermu/krunner-pass; + homepage = "https://github.com/akermu/krunner-pass"; license = licenses.gpl3; maintainers = with maintainers; [ ysndr ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/kwalletcli/default.nix b/pkgs/tools/security/kwalletcli/default.nix index 9356e2f53f940..d03de5f7cfc24 100644 --- a/pkgs/tools/security/kwalletcli/default.nix +++ b/pkgs/tools/security/kwalletcli/default.nix @@ -42,7 +42,7 @@ mkDerivation rec { meta = with lib; { description = "Command-Line Interface to the KDE Wallet"; - homepage = https://www.mirbsd.org/kwalletcli.htm; + homepage = "https://www.mirbsd.org/kwalletcli.htm"; license = licenses.miros; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/tools/security/lesspass-cli/default.nix b/pkgs/tools/security/lesspass-cli/default.nix index 76732170079cf..0d59c34ee9a37 100644 --- a/pkgs/tools/security/lesspass-cli/default.nix +++ b/pkgs/tools/security/lesspass-cli/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Stateless password manager"; - homepage = https://lesspass.com; + homepage = "https://lesspass.com"; maintainers = with maintainers; [ jasoncarr ]; license = licenses.gpl3; }; diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix index 248fbe008fc72..b56c15af3d62a 100644 --- a/pkgs/tools/security/libacr38u/default.nix +++ b/pkgs/tools/security/libacr38u/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pcsclite , libusb }: +{ stdenv, fetchurl, pkgconfig, pcsclite , libusb-compat-0_1 }: stdenv.mkDerivation { version = "1.7.11"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { doCheck = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pcsclite libusb ]; + buildInputs = [ pcsclite libusb-compat-0_1 ]; preBuild = '' makeFlagsArray=(usbdropdir="$out/pcsc/drivers"); @@ -33,7 +33,7 @@ stdenv.mkDerivation { The package is based on the debian package libacr38u. ''; - homepage = https://www.acs.com.hk; + homepage = "https://www.acs.com.hk"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ berce ]; platforms = with platforms; unix; diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix index 17861ac2da607..01e9a38479204 100644 --- a/pkgs/tools/security/libmodsecurity/default.nix +++ b/pkgs/tools/security/libmodsecurity/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { the ModSecurity SecRules format and apply them to HTTP content provided by your application via Connectors. ''; - homepage = https://modsecurity.org/; + homepage = "https://modsecurity.org/"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ izorkin ]; diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix index f06ce2f246a4f..f3ea25d716010 100644 --- a/pkgs/tools/security/logkeys/default.nix +++ b/pkgs/tools/security/logkeys/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A GNU/Linux keylogger that works!"; license = licenses.gpl3; - homepage = https://github.com/kernc/logkeys; + homepage = "https://github.com/kernc/logkeys"; maintainers = with maintainers; [mikoim offline]; platforms = platforms.linux; }; diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix index f6f9e0df655a4..297d13ef9f95c 100644 --- a/pkgs/tools/security/masscan/default.nix +++ b/pkgs/tools/security/masscan/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast scan of the Internet"; - homepage = https://github.com/robertdavidgraham/masscan; + homepage = "https://github.com/robertdavidgraham/masscan"; license = licenses.agpl3; platforms = platforms.unix; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/tools/security/mbox/default.nix b/pkgs/tools/security/mbox/default.nix index 1ef282b8b6eba..7292ac6785f66 100644 --- a/pkgs/tools/security/mbox/default.nix +++ b/pkgs/tools/security/mbox/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Lightweight sandboxing mechanism that any user can use without special privileges"; - homepage = http://pdos.csail.mit.edu/mbox/; + homepage = "http://pdos.csail.mit.edu/mbox/"; maintainers = with maintainers; [ ehmry ]; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix index d10c165996436..54b96917623a0 100644 --- a/pkgs/tools/security/meo/default.nix +++ b/pkgs/tools/security/meo/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "meo-20121113"; src = fetchhg { - url = http://oss.stamfest.net/hg/meo; + url = "http://oss.stamfest.net/hg/meo"; rev = "b48e5f16cff8"; sha256 = "0ifg7y28s89i9gwda6fyj1jbrykbcvq8bf1m6rxmdcv5afi3arbq"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://oss.stamfest.net/wordpress/meo-multiple-eyepairs-only; + homepage = "http://oss.stamfest.net/wordpress/meo-multiple-eyepairs-only"; description = "Tools to use cryptography for things like four-eyes principles"; license = stdenv.lib.licenses.agpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 3924e6919d37f..457c6249ca00c 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/5.0.74" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/5.0.90" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 17d160c8dcb0f..7142983f98cc2 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 22104a154544b3ee57d3ce98a490c4b42a4a8776 - ref: refs/tags/5.0.74 + revision: 592eedc5584953fb94b01a9aae48ec04d2cf153a + ref: refs/tags/5.0.90 specs: - metasploit-framework (5.0.74) + metasploit-framework (5.0.90) actionpack (~> 4.2.6) activerecord (~> 4.2.6) activesupport (~> 4.2.6) @@ -13,27 +13,30 @@ GIT bcrypt (= 3.1.12) bcrypt_pbkdf bit-struct + bson concurrent-ruby (= 1.0.5) dnsruby ed25519 em-http-request eventmachine faker - faraday (<= 0.17.0) + faraday faye-websocket filesize + hrr_rb_ssh (= 0.3.0.pre2) jsobfu json metasm metasploit-concern (~> 2.0.0) metasploit-credential (~> 3.0.0) metasploit-model (~> 2.0.4) - metasploit-payloads (= 1.3.84) + metasploit-payloads (= 1.4.2) metasploit_data_models (~> 3.0.10) - metasploit_payloads-mettle (= 0.5.16) + metasploit_payloads-mettle (= 0.5.21) mqtt msgpack nessus_rest + net-ldap net-ssh network_interface nexpose @@ -87,27 +90,27 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.0.3) - actionpack (4.2.11.1) - actionview (= 4.2.11.1) - activesupport (= 4.2.11.1) + actionpack (4.2.11.3) + actionview (= 4.2.11.3) + activesupport (= 4.2.11.3) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.11.1) - activesupport (= 4.2.11.1) + actionview (4.2.11.3) + activesupport (= 4.2.11.3) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activemodel (4.2.11.1) - activesupport (= 4.2.11.1) + activemodel (4.2.11.3) + activesupport (= 4.2.11.3) builder (~> 3.1) - activerecord (4.2.11.1) - activemodel (= 4.2.11.1) - activesupport (= 4.2.11.1) + activerecord (4.2.11.3) + activemodel (= 4.2.11.3) + activesupport (= 4.2.11.3) arel (~> 6.0) - activesupport (4.2.11.1) + activesupport (4.2.11.3) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -118,32 +121,33 @@ GEM arel (6.0.4) arel-helpers (2.11.0) activerecord (>= 3.1.0, < 7) - aws-eventstream (1.0.3) - aws-partitions (1.274.0) - aws-sdk-core (3.90.1) - aws-eventstream (~> 1.0, >= 1.0.2) + aws-eventstream (1.1.0) + aws-partitions (1.319.0) + aws-sdk-core (3.96.1) + aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.144.0) + aws-sdk-ec2 (1.162.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.33.0) + aws-sdk-iam (1.37.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.29.0) + aws-sdk-kms (1.31.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.60.2) - aws-sdk-core (~> 3, >= 3.83.0) + aws-sdk-s3 (1.66.0) + aws-sdk-core (~> 3, >= 3.96.1) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.0) + aws-sigv4 (1.1.3) aws-eventstream (~> 1.0, >= 1.0.2) bcrypt (3.1.12) bcrypt_pbkdf (1.0.1) - bindata (2.4.4) + bindata (2.4.7) bit-struct (0.16) + bson (4.8.2) builder (3.2.4) concurrent-ruby (1.0.5) cookiejar (0.3.3) @@ -164,13 +168,15 @@ GEM eventmachine (1.2.7) faker (2.2.1) i18n (>= 0.8) - faraday (0.17.0) + faraday (1.0.1) multipart-post (>= 1.2, < 3) faye-websocket (0.10.9) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) filesize (0.2.0) hashery (2.1.2) + hrr_rb_ssh (0.3.0.pre2) + ed25519 (~> 1.2) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) @@ -178,7 +184,7 @@ GEM jsobfu (0.4.2) rkelly-remix json (2.3.0) - loofah (2.4.0) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) metasm (1.0.4) @@ -200,7 +206,7 @@ GEM activemodel (~> 4.2.6) activesupport (~> 4.2.6) railties (~> 4.2.6) - metasploit-payloads (1.3.84) + metasploit-payloads (1.4.2) metasploit_data_models (3.0.10) activerecord (~> 4.2.6) activesupport (~> 4.2.6) @@ -211,19 +217,20 @@ GEM postgres_ext railties (~> 4.2.6) recog (~> 2.0) - metasploit_payloads-mettle (0.5.16) + metasploit_payloads-mettle (0.5.21) mini_portile2 (2.4.0) - minitest (5.14.0) + minitest (5.14.1) mqtt (0.5.0) msgpack (1.3.3) multipart-post (2.1.1) nessus_rest (0.1.6) - net-ssh (5.2.0) + net-ldap (0.16.2) + net-ssh (6.0.2) network_interface (0.0.2) nexpose (7.2.1) - nokogiri (1.10.8) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) - octokit (4.16.0) + octokit (4.18.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) openssl-ccm (1.2.2) @@ -244,7 +251,7 @@ GEM activerecord (~> 4.0) arel (>= 4.0.1) pg_array_parser (~> 0.0.9) - public_suffix (4.0.3) + public_suffix (4.0.5) rack (1.6.13) rack-protection (1.5.5) rack @@ -258,14 +265,14 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (4.2.11.1) - actionpack (= 4.2.11.1) - activesupport (= 4.2.11.1) + railties (4.2.11.3) + actionpack (= 4.2.11.3) + activesupport (= 4.2.11.3) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (13.0.1) rb-readline (0.5.5) - recog (2.3.6) + recog (2.3.7) nokogiri redcarpet (3.5.0) rex-arch (0.1.13) @@ -281,7 +288,7 @@ GEM metasm rex-arch rex-text - rex-exploitation (0.1.22) + rex-exploitation (0.1.24) jsobfu metasm rex-arch @@ -294,9 +301,10 @@ GEM rex-arch rex-ole (0.1.6) rex-text - rex-powershell (0.1.86) + rex-powershell (0.1.87) rex-random_identifier rex-text + ruby-rc4 rex-random_identifier (0.1.4) rex-text rex-registry (0.1.3) @@ -304,14 +312,14 @@ GEM metasm rex-core rex-text - rex-socket (0.1.21) + rex-socket (0.1.23) rex-core rex-sslscan (0.1.5) rex-core rex-socket rex-text rex-struct2 (0.1.2) - rex-text (0.2.24) + rex-text (0.2.26) rex-zip (0.1.3) rex-text rkelly-remix (0.0.7) @@ -322,7 +330,7 @@ GEM rubyntlm windows_error rubyntlm (0.6.2) - rubyzip (2.2.0) + rubyzip (2.3.0) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) @@ -340,9 +348,9 @@ GEM thread_safe (0.3.6) tilt (2.0.10) ttfunk (1.6.2.1) - tzinfo (1.2.6) + tzinfo (1.2.7) thread_safe (~> 0.1) - tzinfo-data (1.2019.3) + tzinfo-data (1.2020.1) tzinfo (>= 1.0.0) warden (1.2.7) rack (>= 1.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 31d45c30db730..cc3d26fbee0b5 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -17,13 +17,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "5.0.74"; + version = "5.0.90"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "1ml4d6xfaxyv1mamc2qldd39db92qkic8660f8clabi9f1k0ghpp"; + sha256 = "1z3m8pvf1r8rz0snfkr9svhgjl2xn2qjgf8qswszzplsccqx1rss"; }; buildInputs = [ makeWrapper ]; @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Metasploit Framework - a collection of exploits"; - homepage = https://github.com/rapid7/metasploit-framework/wiki; + homepage = "https://github.com/rapid7/metasploit-framework/wiki"; platforms = platforms.unix; license = licenses.bsd3; maintainers = [ maintainers.makefu ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index a35aa958a1dfe..cd3b2a336bdae 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rmldsk3a4lwxk0lrp6x1nz1v1r2xmbm3300l4ghgfygv3grdwjh"; + sha256 = "1955wx9m2g776sinamanzlk1jx2dzd34ci3sk22xicp0rmglps37"; type = "gem"; }; - version = "4.2.11.1"; + version = "4.2.11.3"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x7vjn8q6blzyf7j3kwg0ciy7vnfh28bjdkd1mp9k4ghp9jn0g9p"; + sha256 = "0glnaq3jx4m9q6vn55xqlsg8dbflqzm99fgsl9fl267mc2mz3qrv"; type = "gem"; }; - version = "4.2.11.1"; + version = "4.2.11.3"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c1x0rd6wnk1f0gsmxs6x3gx7yf6fs9qqkdv7r4hlbcdd849in33"; + sha256 = "1z3777xsm82i7ggkg74mg21sqz8m5dfl8ykjm7xcrhd2nj843fcp"; type = "gem"; }; - version = "4.2.11.1"; + version = "4.2.11.3"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07ixiwi0zzs9skqarvpfamsnay7npfswymrn28ngxaf8hi279q5p"; + sha256 = "1fpw9vyf2frkxkc6jbq9g78lhhflwz04j89qxj4krvmlq12q8v6d"; type = "gem"; }; - version = "4.2.11.1"; + version = "4.2.11.3"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6"; + sha256 = "0wp36wi3r3dscmcr0q6sbz13hr5h911c24ar7zrmmcy7p32ial2i"; type = "gem"; }; - version = "4.2.11.1"; + version = "4.2.11.3"; }; addressable = { groups = ["default"]; @@ -104,80 +104,80 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "100g77a5ixg4p5zwq77f28n2pdkk0y481f7v83qrlmnj22318qq6"; + sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k2dpn0xznksh5y9bq9gbvbych06pzyswsdak7bz8nlkbsgf38x3"; + sha256 = "11gr3pkd0cq034jdmvmi32sb99hkh91qjrpvc6jchi4lsaiaiqgc"; type = "gem"; }; - version = "1.274.0"; + version = "1.319.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q7f9jkpmpppj31kh3wnzybkphq4piy8ays3vld0zsibfjs9iw7i"; + sha256 = "0jdnzynjrpp2jyg8vrbfbaad16k8ni1520xah1z2ckl5779x9fi6"; type = "gem"; }; - version = "3.90.1"; + version = "3.96.1"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wnql5rzwkn97w4l3pq6k97grqdci1qs7h132pnd6lc3bx62v4h5"; + sha256 = "0xp9kp90ixk1ywd0d8ssbk8dl5kxqnz942yr2qq00m7fd60pihh7"; type = "gem"; }; - version = "1.144.0"; + version = "1.162.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s78ssjcp974v7r1znrgk78bqz23jhws4gy1nm659z5390zsn1fz"; + sha256 = "09l3g5a2r7gnc6pwln409b9ahwcs6xpnjx2qaj70cbllanyxbw0c"; type = "gem"; }; - version = "1.33.0"; + version = "1.37.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "191qnrpg9qhwj24pisha28fwqx30sqkj75ibgpqcf4q389l3a2gw"; + sha256 = "1czxr6yi8p9gma4dwgygp1jn0i289hwa2vw69kzfscgbn118c3mm"; type = "gem"; }; - version = "1.29.0"; + version = "1.31.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pblkq7rw465w08hs2xy6v7w10x9n004hk43yqzswqxirki68ldz"; + sha256 = "1x1d1azxwanvm0d7qppw41x5nx2zv0bcz41yk9vqi5lvr7apaq13"; type = "gem"; }; - version = "1.60.2"; + version = "1.66.0"; }; aws-sigv4 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs"; + sha256 = "0kysxyw1zkvggbmcj4xnscdh15kxli8mx07hv447h74g9x02drsd"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.3"; }; bcrypt = { groups = ["default"]; @@ -204,10 +204,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kz42nvxnk1j9cj0i8lcnhprcgdqsqska92g6l19ziadydfk2gqy"; + sha256 = "033vd169q751qn3zrsv8j5f80k6wg5yhsy8z3clds6py4vqm6xl8"; type = "gem"; }; - version = "2.4.4"; + version = "2.4.7"; }; bit-struct = { groups = ["default"]; @@ -219,6 +219,16 @@ }; version = "0.16"; }; + bson = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06h8sk2wl7pgrwl15xb1bd6l9ws8sz006rf9cy6n6q7g0iwdalkh"; + type = "gem"; + }; + version = "4.8.2"; + }; builder = { groups = ["default"]; platforms = []; @@ -344,10 +354,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jk2bar4x6miq2cr73lv0lsbmw4cymiljvp29xb85jifsb3ba6az"; + sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq"; type = "gem"; }; - version = "0.17.0"; + version = "1.0.1"; }; faye-websocket = { groups = ["default"]; @@ -379,6 +389,16 @@ }; version = "2.1.2"; }; + hrr_rb_ssh = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "066dj9sw5p8aa54vqc1bw7a8nfpf5rggrjyxqw2ccyxp10964qkz"; + type = "gem"; + }; + version = "0.3.0.pre2"; + }; "http_parser.rb" = { groups = ["default"]; platforms = []; @@ -434,10 +454,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g7ps9m3s14cajhxrfgbzahv9i3gy47s4hqrv3mpybpj5cyr0srn"; + sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; metasm = { groups = ["default"]; @@ -474,12 +494,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "22104a154544b3ee57d3ce98a490c4b42a4a8776"; - sha256 = "1ml4d6xfaxyv1mamc2qldd39db92qkic8660f8clabi9f1k0ghpp"; + rev = "592eedc5584953fb94b01a9aae48ec04d2cf153a"; + sha256 = "1z3m8pvf1r8rz0snfkr9svhgjl2xn2qjgf8qswszzplsccqx1rss"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "5.0.74"; + version = "5.0.90"; }; metasploit-model = { groups = ["default"]; @@ -496,10 +516,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wz72w5a34r6jcgbl97ha3zhl8d28r974clcp99qj5sg71k280c0"; + sha256 = "1kddir54jnzl64nsawnvkzdabnmqncq9vav49i1cfschnf4cxc4g"; type = "gem"; }; - version = "1.3.84"; + version = "1.4.2"; }; metasploit_data_models = { groups = ["default"]; @@ -516,10 +536,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x2rgs2r16m8z87j5z78vp49xvr2sr4dxjgbi6d0nxrlr52pd8yf"; + sha256 = "1419z6z0j69zdlkfx3kqgqygsm0ysigwccgn82z5lz82i16krhca"; type = "gem"; }; - version = "0.5.16"; + version = "0.5.21"; }; mini_portile2 = { groups = ["default"]; @@ -536,10 +556,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; + sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; type = "gem"; }; - version = "5.14.0"; + version = "5.14.1"; }; mqtt = { groups = ["default"]; @@ -581,15 +601,25 @@ }; version = "0.1.6"; }; + net-ldap = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vzfhivjfr9q65hkln7xig3qcba6fw9y4kb4384fpm7d7ww0b7xg"; + type = "gem"; + }; + version = "0.16.2"; + }; net-ssh = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40"; + sha256 = "0kf4am0mz8mwqhif4iqh5yz9pcbbmja5w707j00sfsgrq19nxqld"; type = "gem"; }; - version = "5.2.0"; + version = "6.0.2"; }; network_interface = { groups = ["default"]; @@ -616,20 +646,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8"; + sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; type = "gem"; }; - version = "1.10.8"; + version = "1.10.9"; }; octokit = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06kx258qa5k24q5pv8i4daaw3g57gif6p5k5h3gndj3q2jk6vhkn"; + sha256 = "0zvfr9njmj5svi39fcsi2b0g7pcxb0vamw9dlyas8bg814jlzhi6"; type = "gem"; }; - version = "4.16.0"; + version = "4.18.0"; }; openssl-ccm = { groups = ["default"]; @@ -726,10 +756,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c6kq6s13idl2036b5lch8r7390f8w82cal8hcp4ml76fm2vdac7"; + sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.5"; }; rack = { groups = ["default"]; @@ -796,10 +826,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bjf21z9maiiazc1if56nnh9xmgbkcqlpznv34f40a1hsvgk1d1m"; + sha256 = "12f7g5iw1gqjwl2rvfmbgxipds5c475ggalw6qskzzrx9vyc2fpk"; type = "gem"; }; - version = "4.2.11.1"; + version = "4.2.11.3"; }; rake = { groups = ["default"]; @@ -826,10 +856,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kw753vq5m5m8pzn1avafzz757gdzzsv7ck94y6d8n4jzqa50isv"; + sha256 = "1j65iary8qkgyrjc3vnjd7dbyjs2bsz2hcg7ndibjk623faxb1wk"; type = "gem"; }; - version = "2.3.6"; + version = "2.3.7"; }; redcarpet = { groups = ["default"]; @@ -886,10 +916,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16anprj4pc4pi2yb1y6b7c8nrqgpk49g40wy1384snmii24jiwyx"; + sha256 = "0inrf2vahmpxhjf84i8ak2b7gcirsrjrmb1rnvvqqr9kl0xw5xm3"; type = "gem"; }; - version = "0.1.22"; + version = "0.1.24"; }; rex-java = { groups = ["default"]; @@ -936,10 +966,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "150nmpgrvpd6hyx9cghah8dxpcfb1h7inpcwmz7ijpir60zxxfdj"; + sha256 = "11wi8dpb2s8bvkqhbf80g16nyj2hscs3vz31ffzl1g0g6imcs0dl"; type = "gem"; }; - version = "0.1.86"; + version = "0.1.87"; }; rex-random_identifier = { groups = ["default"]; @@ -976,10 +1006,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jkmff92ga9qd9gg13cd6s99qcdmr5n354l9br70j784mpyl9apb"; + sha256 = "07vm17w791vdpr23aqp45kqsjbqgwpqj92a535h6n4fckxgzhg94"; type = "gem"; }; - version = "0.1.21"; + version = "0.1.23"; }; rex-sslscan = { groups = ["default"]; @@ -1006,10 +1036,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wjrp4n7j2ifdgqc6z8z4jbz9gr7g5m5h35b7vx4k9cbaq9b5zxw"; + sha256 = "17m5zwca15qsd7mqqhi2q530iwsrb7wkqh8qff7pxjxwlxbvsrxx"; type = "gem"; }; - version = "0.2.24"; + version = "0.2.26"; }; rex-zip = { groups = ["default"]; @@ -1076,10 +1106,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13b15icwx0c8zzjfzf7bmqq9ynilw0dy8ydgjb199nqzp93p6wqv"; + sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; sawyer = { groups = ["default"]; @@ -1176,20 +1206,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; tzinfo-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17fbf05qhcxp8anmp7k5wnafw3ypy607h5ybnqg92dqgh4b1c3yi"; + sha256 = "1kjywciambyhlkc8ijp3kkx4r24pi9zs7plmxw003mxr6mrhah1w"; type = "gem"; }; - version = "1.2019.3"; + version = "1.2020.1"; }; warden = { groups = ["default"]; diff --git a/pkgs/tools/security/metasploit/shell.nix b/pkgs/tools/security/metasploit/shell.nix index cd7a01214c6a2..e4bae57b68669 100644 --- a/pkgs/tools/security/metasploit/shell.nix +++ b/pkgs/tools/security/metasploit/shell.nix @@ -3,14 +3,15 @@ with import <nixpkgs> {}; stdenv.mkDerivation { name = "env"; buildInputs = [ - ruby.devEnv + bundix git - sqlite + libiconv libpcap - postgresql libxml2 libxslt - pkgconfig - bundix + pkg-config + postgresql + ruby.devEnv + sqlite ]; } diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix index a23e29175615f..59908f2a9ce57 100644 --- a/pkgs/tools/security/mfcuk/default.nix +++ b/pkgs/tools/security/mfcuk/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "MiFare Classic Universal toolKit"; license = licenses.gpl2; - homepage = https://github.com/nfc-tools/mfcuk; + homepage = "https://github.com/nfc-tools/mfcuk"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/mfoc/default.nix b/pkgs/tools/security/mfoc/default.nix index 1ae18e3435374..fb622ad82496d 100644 --- a/pkgs/tools/security/mfoc/default.nix +++ b/pkgs/tools/security/mfoc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mifare Classic Offline Cracker"; license = licenses.gpl2; - homepage = https://github.com/nfc-tools/mfoc; + homepage = "https://github.com/nfc-tools/mfoc"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/tools/security/minisign/default.nix index 15ee2446922b5..ed226994a31e9 100644 --- a/pkgs/tools/security/minisign/default.nix +++ b/pkgs/tools/security/minisign/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { necessarily private) file transfer, e.g., of software artefacts. minisign is similar to and compatible with OpenBSD's signify. ''; - homepage = https://jedisct1.github.io/minisign/; + homepage = "https://jedisct1.github.io/minisign/"; license = licenses.isc; maintainers = with maintainers; [ joachifm ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/mkp224o/default.nix b/pkgs/tools/security/mkp224o/default.nix index 7585fdf22e1a7..5640debf124ac 100644 --- a/pkgs/tools/security/mkp224o/default.nix +++ b/pkgs/tools/security/mkp224o/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Vanity address generator for tor onion v3 (ed25519) hidden services"; - homepage = http://cathug2kyi4ilneggumrenayhuhsvrgn6qv2y47bgeet42iivkpynqad.onion/; + homepage = "http://cathug2kyi4ilneggumrenayhuhsvrgn6qv2y47bgeet42iivkpynqad.onion/"; license = licenses.cc0; platforms = platforms.linux; maintainers = with maintainers; [ volth ]; diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index 3d30fef02e291..b88852966ee1d 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = "make install-mkpasswd"; meta = with stdenv.lib; { - homepage = https://packages.qa.debian.org/w/whois.html; + homepage = "https://packages.qa.debian.org/w/whois.html"; description = "Overfeatured front-end to crypt, from the Debian whois package"; license = licenses.gpl2; maintainers = with maintainers; [ cstrahan fpletz ]; diff --git a/pkgs/tools/security/mkrand/default.nix b/pkgs/tools/security/mkrand/default.nix index bb9c932d19e3a..54934b7111a94 100644 --- a/pkgs/tools/security/mkrand/default.nix +++ b/pkgs/tools/security/mkrand/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "A Digital Random Bit Generator"; longDescription = "MKRAND is a utility for generating random information."; - homepage = https://github.com/mknight-tag/MKRAND/; + homepage = "https://github.com/mknight-tag/MKRAND/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/security/mktemp/default.nix b/pkgs/tools/security/mktemp/default.nix index 71bdd3af55dec..0732adecc45bc 100644 --- a/pkgs/tools/security/mktemp/default.nix +++ b/pkgs/tools/security/mktemp/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = ftp://ftp.mktemp.org/pub/mktemp/mktemp-1.7.tar.gz; + url = "ftp://ftp.mktemp.org/pub/mktemp/mktemp-1.7.tar.gz"; sha256 = "0x969152znxxjbj7387xb38waslr4yv6bnj5jmhb4rpqxphvk54f"; }; meta = with stdenv.lib; { description = "Simple tool to make temporary file handling in shells scripts safe and simple"; - homepage = https://www.mktemp.org; + homepage = "https://www.mktemp.org"; license = licenses.isc; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index 2a9e41ac0fa98..b9b696c17be62 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source, cross-platform web application firewall (WAF)"; license = licenses.asl20; - homepage = https://www.modsecurity.org/; + homepage = "https://www.modsecurity.org/"; maintainers = with maintainers; [offline]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index 1e585136d887a..4b1f756988715 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://web.monkeysphere.info/; + homepage = "http://web.monkeysphere.info/"; description = "Leverage the OpenPGP web of trust for SSH and TLS authentication"; longDescription = '' The Monkeysphere project's goal is to extend OpenPGP's web of diff --git a/pkgs/tools/security/mpw/default.nix b/pkgs/tools/security/mpw/default.nix index 4cff17ef84954..9d25daf29a69f 100644 --- a/pkgs/tools/security/mpw/default.nix +++ b/pkgs/tools/security/mpw/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A stateless password management solution"; - homepage = https://masterpasswordapp.com/; + homepage = "https://masterpasswordapp.com/"; license = licenses.gpl3; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/nasty/default.nix b/pkgs/tools/security/nasty/default.nix index d45861cf50e11..7f423860100be 100644 --- a/pkgs/tools/security/nasty/default.nix +++ b/pkgs/tools/security/nasty/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { in case you forget or lost it. It is mostly a proof-of-concept: with a different implementation this program could be at least 100x faster. ''; - homepage = http://www.vanheusden.com/nasty/; + homepage = "http://www.vanheusden.com/nasty/"; license = licenses.gpl2; maintainers = with maintainers; [ davidak ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix index 73451b1243508..4f4f660e20f4a 100644 --- a/pkgs/tools/security/neopg/default.nix +++ b/pkgs/tools/security/neopg/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://neopg.io/; + homepage = "https://neopg.io/"; description = "Modern replacement for GnuPG 2"; license = licenses.gpl3; longDescription = '' diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 48df486ef0a45..a4936d763b6cd 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { access the extra functionality of a Nitrokey Storage or Nitrokey Pro. See https://www.nitrokey.com/ for more information. ''; - homepage = https://github.com/Nitrokey/nitrokey-app; - repositories.git = https://github.com/Nitrokey/nitrokey-app.git; + homepage = "https://github.com/Nitrokey/nitrokey-app"; + repositories.git = "https://github.com/Nitrokey/nitrokey-app.git"; license = licenses.gpl3; maintainers = with maintainers; [ kaiha fpletz ]; }; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index f88c533d71d30..bd543154494cf 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = { description = "A free and open source utility for network discovery and security auditing"; - homepage = http://www.nmap.org; + homepage = "http://www.nmap.org"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice fpletz ]; diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix index d1e2ee58e483d..15797fc866504 100644 --- a/pkgs/tools/security/notary/default.nix +++ b/pkgs/tools/security/notary/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { installPhase = '' runHook preInstall - install -D bin/notary $bin/bin/notary + install -D bin/notary $out/bin/notary runHook postInstall ''; @@ -58,7 +58,7 @@ buildGoPackage rec { integrity of the received content. ''; license = licenses.asl20; - homepage = https://github.com/theupdateframework/notary; + homepage = "https://github.com/theupdateframework/notary"; maintainers = with maintainers; [ vdemeester ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index f1335a1ad1d75..27712e4d42f51 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A light-weight process isolation tool, making use of Linux namespaces and seccomp-bpf syscall filters"; - homepage = http://nsjail.com/; + homepage = "http://nsjail.com/"; license = licenses.asl20; maintainers = with maintainers; [ bosu c0bw3b ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index d462101e92eaa..22327c6a38f00 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Components for building one-time password authentication systems"; - homepage = https://www.nongnu.org/oath-toolkit/; + homepage = "https://www.nongnu.org/oath-toolkit/"; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/tools/security/omapd/default.nix index baea02402d9f4..8ed23864ced50 100644 --- a/pkgs/tools/security/omapd/default.nix +++ b/pkgs/tools/security/omapd/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://code.google.com/archive/p/omapd/; + homepage = "https://code.google.com/archive/p/omapd/"; description = "IF-MAP Server that implements the IF-MAP v1.1 and v2.0 specifications published by the Trusted Computing Group (TCG)"; license = licenses.gpl3; maintainers = [ maintainers.tstrobel ]; diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index 5a9f101274815..0eb0f7b401ee5 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://tails.boum.org; + homepage = "https://tails.boum.org"; description = "GTK application to display Tor circuits and streams"; license = licenses.gpl3; maintainers = [ maintainers.phreedom ]; diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/tools/security/open-ecard/default.nix index 98f2e56e7497f..bac036e67900b 100644 --- a/pkgs/tools/security/open-ecard/default.nix +++ b/pkgs/tools/security/open-ecard/default.nix @@ -13,7 +13,7 @@ let sha256 = "0rc862lx3y6sw87r1v5xjmqqpysyr1x6yqhycqmcdrwz0j3wykrr"; }; logo = fetchurl { - url = https://raw.githubusercontent.com/ecsec/open-ecard/1.2.3/gui/graphics/src/main/ext/oec_logo_bg-transparent.svg; + url = "https://raw.githubusercontent.com/ecsec/open-ecard/1.2.3/gui/graphics/src/main/ext/oec_logo_bg-transparent.svg"; sha256 = "0rpmyv10vjx2yfpm03mqliygcww8af2wnrnrppmsazdplksaxkhs"; }; }; @@ -56,7 +56,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Client side implementation of the eCard-API-Framework (BSI TR-03112) and related international standards, such as ISO/IEC 24727"; - homepage = https://www.openecard.org/; + homepage = "https://www.openecard.org/"; license = licenses.gpl3; maintainers = with maintainers; [ sephalon ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/opencryptoki/default.nix b/pkgs/tools/security/opencryptoki/default.nix index 1d506928a52a8..1eb4aab66b475 100644 --- a/pkgs/tools/security/opencryptoki/default.nix +++ b/pkgs/tools/security/opencryptoki/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PKCS#11 implementation for Linux"; - homepage = https://github.com/opencryptoki/opencryptoki; + homepage = "https://github.com/opencryptoki/opencryptoki"; license = licenses.cpl10; maintainers = [ maintainers.tstrobel ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 315cd1c8c285d..103345abf61b1 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of libraries and utilities to access smart cards"; - homepage = https://github.com/OpenSC/OpenSC/wiki; + homepage = "https://github.com/OpenSC/OpenSC/wiki"; license = licenses.lgpl21Plus; platforms = platforms.all; maintainers = [ maintainers.erictapen ]; diff --git a/pkgs/tools/security/ossec/default.nix b/pkgs/tools/security/ossec/default.nix index 2b52099e70b30..285e275a81f76 100644 --- a/pkgs/tools/security/ossec/default.nix +++ b/pkgs/tools/security/ossec/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ossec-client-2.6"; src = fetchurl { - url = https://www.ossec.net/files/ossec-hids-2.6.tar.gz; + url = "https://www.ossec.net/files/ossec-hids-2.6.tar.gz"; sha256 = "0k1b59wdv9h50gbyy88qw3cnpdm8hv0nrl0znm92h9a11i5b39ip"; }; @@ -32,7 +32,7 @@ yes meta = { description = "Open source host-based instrusion detection system"; - homepage = https://www.ossec.net; + homepage = "https://www.ossec.net"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/tools/security/p0f/default.nix index 1e618cdce1ad9..02d888b725ff5 100644 --- a/pkgs/tools/security/p0f/default.nix +++ b/pkgs/tools/security/p0f/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Passive network reconnaissance and fingerprinting tool"; - homepage = "http://lcamtuf.coredump.cx/p0f3/"; + homepage = "https://lcamtuf.coredump.cx/p0f3/"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; diff --git a/pkgs/tools/security/pamtester/default.nix b/pkgs/tools/security/pamtester/default.nix index 21f58ef517eeb..a1055dadc6cab 100644 --- a/pkgs/tools/security/pamtester/default.nix +++ b/pkgs/tools/security/pamtester/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility program to test the PAM facility"; - homepage = http://pamtester.sourceforge.net/; + homepage = "http://pamtester.sourceforge.net/"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index aed6a9d4012c6..76b90d5b8858d 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -142,9 +142,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stores, retrieves, generates, and synchronizes passwords securely"; - homepage = https://www.passwordstore.org/; + homepage = "https://www.passwordstore.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher globin ma27 ]; + maintainers = with maintainers; [ lovek323 fpletz tadfisher globin ma27 ]; platforms = platforms.unix; longDescription = '' diff --git a/pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch b/pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch deleted file mode 100644 index 36faf3140ccd0..0000000000000 --- a/pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 37c2b4d2940476555aeec20fe1e5e3fa0492a94e Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Sun, 15 Mar 2020 19:58:53 +0100 -Subject: [PATCH] Make it possible to run the tests offline - -Helpful when developing without network access, also makes sure that -the test actually depend on the API's data like number of breaches -(which will change in time). ---- - tests/commons.py | 25 +++++++++++++++++++++++++ - tests/test_audit.py | 8 +++++--- - tests/test_pass_audit.py | 10 +++++++++- - tests/test_pwned.py | 8 +++++--- - 4 files changed, 44 insertions(+), 7 deletions(-) - -diff --git a/tests/commons.py b/tests/commons.py -index 13c4cb1..4f1ecd8 100644 ---- a/tests/commons.py -+++ b/tests/commons.py -@@ -56,3 +56,28 @@ class TestPass(TestBase): - for path in self.store.list(root): - data[path] = self.store.show(path) - return data -+ -+ -+def mock_request(*args, **kwargs): -+ class MockResponse: -+ def __init__(self): -+ data = [ -+ "D5EE0CB1A41071812CCED2F1930E6E1A5D2:2", -+ "2DC183F740EE76F27B78EB39C8AD972A757:52579", -+ "CF164D7A51A1FD864B1BF9E1CE8A3EC171B:4", -+ "D0B910E7A3028703C0B30039795E908CEB2:7", -+ "AD6438836DBE526AA231ABDE2D0EEF74D42:3", -+ "EBAB0A7CE978E0194608B572E4F9404AA21:3", -+ "17727EAB0E800E62A776C76381DEFBC4145:120", -+ "5370372AC65308F03F6ED75EC6068C8E1BE:1386", -+ "1E4C9B93F3F0682250B6CF8331B7EE68FD8:3730471", -+ "437FAA5A7FCE15D1DDCB9EAEAEA377667B8:123422", -+ "944C22589AC652B0F47918D58CA0CDCCB63:411" -+ ] -+ -+ self.text = "\r\n".join(data) -+ -+ def raise_for_status(self): -+ pass -+ -+ return MockResponse() -diff --git a/tests/test_audit.py b/tests/test_audit.py -index d8c7a9a..5e0a9cf 100644 ---- a/tests/test_audit.py -+++ b/tests/test_audit.py -@@ -17,12 +17,13 @@ - # - - from .. import pass_audit --from tests.commons import TestPass -- -+from tests.commons import TestPass, mock_request -+from unittest import mock - - class TestPassAudit(TestPass): - passwords_nb = 7 - -+ @mock.patch('requests.get', mock_request) - def test_password_notpwned(self): - """Testing: pass audit for password not breached with K-anonymity method.""" - data = self._getdata("Password/notpwned") -@@ -30,9 +31,10 @@ class TestPassAudit(TestPass): - breached = audit.password() - self.assertTrue(len(breached) == 0) - -+ @mock.patch('requests.get', mock_request) - def test_password_pwned(self): - """Testing: pass audit for password breached with K-anonymity method.""" -- ref_counts = [51259, 3, 114, 1352, 3645804, 78773, 396] -+ ref_counts = [52579, 3, 120, 1386, 3730471, 123422, 411] - data = self._getdata("Password/pwned") - audit = pass_audit.PassAudit(data) - breached = audit.password() -diff --git a/tests/test_pass_audit.py b/tests/test_pass_audit.py -index 4c10f87..2c949f7 100644 ---- a/tests/test_pass_audit.py -+++ b/tests/test_pass_audit.py -@@ -19,7 +19,8 @@ - import os - - from .. import pass_audit --from tests.commons import TestPass -+from tests.commons import TestPass, mock_request -+from unittest import mock - - - class TestPassAuditCMD(TestPass): -@@ -47,6 +48,7 @@ class TestPassAuditCMD(TestPass): - cmd = ['--not-an-option', '-q'] - self._passaudit(cmd, 2) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_StoreNotInitialized(self): - """Testing: store not initialized.""" - cmd = ['Password/', '-v'] -@@ -56,6 +58,7 @@ class TestPassAuditCMD(TestPass): - os.rename(os.path.join(self.store.prefix, 'backup.gpg-id'), - os.path.join(self.store.prefix, '.gpg-id')) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_InvalidID(self): - """Testing: invalid user ID.""" - os.rename(os.path.join(self.store.prefix, '.gpg-id'), -@@ -66,26 +69,31 @@ class TestPassAuditCMD(TestPass): - os.rename(os.path.join(self.store.prefix, 'backup.gpg-id'), - os.path.join(self.store.prefix, '.gpg-id')) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_NotAFile(self): - """Testing: pass audit not_a_file.""" - cmd = ['not_a_file'] - self._passaudit(cmd, 1) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_passwords_notpwned(self): - """Testing: pass audit Password/notpwned.""" - cmd = ['Password/notpwned'] - self._passaudit(cmd) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_passwords_pwned(self): - """Testing: pass audit Password/pwned.""" - cmd = ['Password/pwned'] - self._passaudit(cmd) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_passwords_good(self): - """Testing: pass audit Password/good.""" - cmd = ['Password/good'] - self._passaudit(cmd) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_passwords_all(self): - """Testing: pass audit .""" - cmd = [''] -diff --git a/tests/test_pwned.py b/tests/test_pwned.py -index 5ce6bc6..c28939a 100644 ---- a/tests/test_pwned.py -+++ b/tests/test_pwned.py -@@ -17,7 +17,8 @@ - # - - from .. import pass_audit --from tests.commons import TestPass -+from tests.commons import TestPass, mock_request -+from unittest import mock - - - class TestPwnedAPI(TestPass): -@@ -25,12 +26,13 @@ class TestPwnedAPI(TestPass): - def setUp(self): - self.api = pass_audit.PwnedAPI() - -+ @mock.patch('requests.get', mock_request) - def test_password_range(self): - """Testing: https://api.haveibeenpwned.com/range API.""" - prefix = '21BD1' - Hash = '21BD12DC183F740EE76F27B78EB39C8AD972A757' - hashes, counts = self.api.password_range(prefix) - self.assertIn(Hash, hashes) -- self.assertTrue(counts[hashes.index(Hash)] == 51259) -+ self.assertTrue(counts[hashes.index(Hash)] == 52579) - self.assertTrue(len(hashes) == len(counts)) -- self.assertTrue(len(hashes) == 527) -+ self.assertTrue(len(hashes) == 11) --- -2.25.0 - diff --git a/pkgs/tools/security/pass/extensions/audit/default.nix b/pkgs/tools/security/pass/extensions/audit/default.nix index bae6b9bbafdfb..144d13238f264 100644 --- a/pkgs/tools/security/pass/extensions/audit/default.nix +++ b/pkgs/tools/security/pass/extensions/audit/default.nix @@ -5,23 +5,24 @@ let in stdenv.mkDerivation rec { pname = "pass-audit"; - version = "1.0.1"; + version = "1.1"; src = fetchFromGitHub { owner = "roddhjav"; repo = "pass-audit"; rev = "v${version}"; - sha256 = "1mdckw0dwcnv8smp1za96y0zmdnykbkw2606v7mzfnzbz4zjdlwl"; + sha256 = "1vapymgpab91kh798mirgs1nb7j9qln0gm2d3321cmsghhb7xs45"; }; patches = [ - ./0001-Make-it-possible-to-run-the-tests-offline.patch ./0002-Fix-audit.bash-setup.patch ]; postPatch = '' substituteInPlace audit.bash \ - --replace '/usr/bin/env python3' "${pythonEnv}/bin/python3" + --replace 'python3' "${pythonEnv}/bin/python3" + substituteInPlace Makefile \ + --replace "install --root" "install --prefix ''' --root" ''; outputs = [ "out" "man" ]; @@ -43,7 +44,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pass extension for auditing your password repository."; - homepage = https://github.com/roddhjav/pass-audit; + homepage = "https://github.com/roddhjav/pass-audit"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix index 208012e2f8830..48db0094db94d 100644 --- a/pkgs/tools/security/pass/extensions/genphrase.nix +++ b/pkgs/tools/security/pass/extensions/genphrase.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pass extension that generates memorable passwords"; - homepage = https://github.com/congma/pass-genphrase; + homepage = "https://github.com/congma/pass-genphrase"; license = licenses.gpl3; maintainers = with maintainers; [ seqizz ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index 90e3105bbd804..cc5f0c94e1195 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -51,9 +51,9 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pass extension for importing data from existing password managers"; - homepage = https://github.com/roddhjav/pass-import; + homepage = "https://github.com/roddhjav/pass-import"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + maintainers = with maintainers; [ lovek323 fpletz tadfisher ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/pass/extensions/otp.nix b/pkgs/tools/security/pass/extensions/otp.nix index 4b15c3d68035e..835e693c2c5c2 100644 --- a/pkgs/tools/security/pass/extensions/otp.nix +++ b/pkgs/tools/security/pass/extensions/otp.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A pass extension for managing one-time-password (OTP) tokens"; - homepage = https://github.com/tadfisher/pass-otp; + homepage = "https://github.com/tadfisher/pass-otp"; license = licenses.gpl3; maintainers = with maintainers; [ jwiegley tadfisher toonn ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/pass/extensions/tomb.nix b/pkgs/tools/security/pass/extensions/tomb.nix index ccb558c9b853f..43c74a9029b3a 100644 --- a/pkgs/tools/security/pass/extensions/tomb.nix +++ b/pkgs/tools/security/pass/extensions/tomb.nix @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pass extension that keeps the password store encrypted inside a tomb"; - homepage = https://github.com/roddhjav/pass-tomb; + homepage = "https://github.com/roddhjav/pass-tomb"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + maintainers = with maintainers; [ lovek323 fpletz tadfisher ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/pass/extensions/update.nix b/pkgs/tools/security/pass/extensions/update.nix index 86563b7ff42d4..b2f331f13757e 100644 --- a/pkgs/tools/security/pass/extensions/update.nix +++ b/pkgs/tools/security/pass/extensions/update.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pass extension that provides an easy flow for updating passwords"; - homepage = https://github.com/roddhjav/pass-update; + homepage = "https://github.com/roddhjav/pass-update"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + maintainers = with maintainers; [ lovek323 fpletz tadfisher ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index b188b411517bc..b3c0864886290 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -49,8 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to make rofi work with password-store"; - homepage = https://github.com/carnager/rofi-pass; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + homepage = "https://github.com/carnager/rofi-pass"; license = stdenv.lib.licenses.gpl3; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/security/passff-host/default.nix b/pkgs/tools/security/passff-host/default.nix index 59f03db0200d9..0bdb04b761294 100644 --- a/pkgs/tools/security/passff-host/default.nix +++ b/pkgs/tools/security/passff-host/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Host app for the WebExtension PassFF"; - homepage = https://github.com/passff/passff-host; + homepage = "https://github.com/passff/passff-host"; license = licenses.gpl2; maintainers = with maintainers; [ nadrieril ]; }; diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix index 6cee5c1ccbdea..7ae062547aa29 100644 --- a/pkgs/tools/security/pcsc-cyberjack/default.nix +++ b/pkgs/tools/security/pcsc-cyberjack/default.nix @@ -1,25 +1,28 @@ -{ stdenv, fetchurl, pkgconfig, libusb1, pcsclite }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libusb1, pcsclite }: -stdenv.mkDerivation rec { +let + version = "3.99.5"; + suffix = "SP13"; + tarBall = "${version}final.${suffix}"; + +in stdenv.mkDerivation rec { pname = "pcsc-cyberjack"; - version = "3.99.5_SP12"; - - src = with stdenv.lib; let - splittedVer = splitString "_" version; - mainVer = if length splittedVer >= 1 then head splittedVer else version; - spVer = optionalString (length splittedVer >= 1) ("." + last splittedVer); - tarballVersion = "${mainVer}final${spVer}"; - in fetchurl { - url = "http://support.reiner-sct.de/downloads/LINUX/V${version}" - + "/pcsc-cyberjack-${tarballVersion}.tar.bz2"; - sha256 = "04pkmybal56s5xnjld09vl1s1h6qf8mvhm41b758d6hi240kgp1j"; + inherit version; + + src = fetchurl { + url = + "http://support.reiner-sct.de/downloads/LINUX/V${version}_${suffix}/${pname}_${tarBall}.tar.gz"; + sha256 = "1lx4bfz4riz7j77sl65akyxzww0ygm63w0c1b75knr1pijlv8d3b"; }; outputs = [ "out" "tools" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libusb1 pcsclite ]; + enableParallelBuilding = true; + configureFlags = [ "--with-usbdropdir=${placeholder "out"}/pcsc/drivers" "--bindir=${placeholder "tools"}/bin" @@ -29,9 +32,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "REINER SCT cyberJack USB chipcard reader user space driver"; - homepage = https://www.reiner-sct.com/; + homepage = "https://www.reiner-sct.com/"; license = licenses.gpl2Plus; - platforms = platforms.linux; maintainers = with maintainers; [ aszlig ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix index 0302fc6fc674c..62f4c3e855642 100644 --- a/pkgs/tools/security/pcsc-scm-scl011/default.nix +++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libusb }: +{ stdenv, fetchurl, unzip, libusb-compat-0_1 }: let arch = if stdenv.hostPlatform.system == "i686-linux" then "32" @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { cp -r proprietary/*.bundle $out/pcsc/drivers ''; - libPath = stdenv.lib.makeLibraryPath [ libusb ]; + libPath = stdenv.lib.makeLibraryPath [ libusb-compat-0_1 ]; fixupPhase = '' patchelf --set-rpath $libPath \ @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SCM Microsystems SCL011 chipcard reader user space driver"; - homepage = http://www.scm-pc-card.de/index.php?lang=en&page=product&function=show_product&product_id=630; - downloadPage = https://support.identiv.com/scl010-scl011/; + homepage = "http://www.scm-pc-card.de/index.php?lang=en&page=product&function=show_product&product_id=630"; + downloadPage = "https://support.identiv.com/scl010-scl011/"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ sephalon ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 2141f12151fa2..4e01a5792dcc6 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Middleware to access a smart card using SCard API (PC/SC)"; - homepage = https://pcsclite.apdu.fr/; + homepage = "https://pcsclite.apdu.fr/"; license = licenses.bsd3; platforms = with platforms; unix; }; diff --git a/pkgs/tools/security/pdfcrack/default.nix b/pkgs/tools/security/pdfcrack/default.nix index bf8f014bcfd1f..afef0d4c47237 100644 --- a/pkgs/tools/security/pdfcrack/default.nix +++ b/pkgs/tools/security/pdfcrack/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfcrack"; - version = "0.18"; + version = "0.19"; src = fetchurl { url = "mirror://sourceforge/pdfcrack/pdfcrack/pdfcrack-${version}.tar.gz"; - sha256 = "035s3jzrs3ci0i53x04dzpqp9225c4s52cd722d6zqra5b2sw8w2"; + sha256 = "1vf0l83xk627fg0a3b10wabgqxy08q4vbm0xjw9xzkdpk1lj059i"; }; installPhase = '' @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = http://pdfcrack.sourceforge.net/; + homepage = "http://pdfcrack.sourceforge.net/"; description = "Small command line driven tool for recovering passwords and content from PDF files"; license = with licenses; [ gpl2 ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix index 8bf440d2b07f5..cd421224fa633 100644 --- a/pkgs/tools/security/pgpdump/default.nix +++ b/pkgs/tools/security/pgpdump/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pgpdump is a PGP packet visualizer which displays the packet format of OpenPGP (RFC 4880) and PGP version 2 (RFC 1991). ''; - homepage = http://www.mew.org/~kazu/proj/pgpdump/en/; + homepage = "http://www.mew.org/~kazu/proj/pgpdump/en/"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 87edc914131d0..e6d07888d1dd3 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -90,7 +90,7 @@ pinentryMkDerivation rec { passthru = { flavors = enabledFlavors; }; meta = with stdenv.lib; { - homepage = http://gnupg.org/aegypten2/; + homepage = "http://gnupg.org/aegypten2/"; description = "GnuPG’s interface to passphrase input"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index 25fa180c48b9e..1c3b87cd9f02e 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "Pinentry for GPG on Mac"; license = stdenv.lib.licenses.gpl2Plus; - homepage = https://github.com/GPGTools/pinentry-mac; + homepage = "https://github.com/GPGTools/pinentry-mac"; platforms = stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index 6d2b5569a0d41..f1b4d80a35544 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication { buildInputs = [ perl ]; meta = { - homepage = https://www.phildev.net/pius/; + homepage = "https://www.phildev.net/pius/"; description = "PGP Individual UID Signer (PIUS), quickly and easily sign UIDs on a set of PGP keys"; diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix deleted file mode 100644 index 2c03183fa96ed..0000000000000 --- a/pkgs/tools/security/prey/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchurl, fetchgit, curl, scrot, imagemagick, xawtv, inetutils, makeWrapper, coreutils -, apiKey ? "" -, deviceKey ? "" }: - -# TODO: this should assert keys are set, somehow if set through .override assertion fails -#assert apiKey != ""; -#assert deviceKey != ""; - -let - modulesSrc = fetchgit { - url = "git://github.com/prey/prey-bash-client-modules.git"; - rev = "aba260ef110834cb2e92923a31f50c15970639ee"; - sha256 = "9cb1ad813d052a0a3e3bbdd329a8711ae3272e340379489511f7dd578d911e30"; - }; -in stdenv.mkDerivation rec { - pname = "prey-bash-client"; - version = "0.6.0"; - - src = fetchurl { - url = "https://github.com/prey/prey-bash-client/archive/v${version}.tar.gz"; - sha256 = "09cb15jh4jdwvix9nx048ajkw2r5jaflk68y3rkha541n8n0qwh0"; - }; - - buildInputs = [ curl scrot imagemagick xawtv makeWrapper ]; - - phases = "unpackPhase installPhase"; - - installPhase = '' - substituteInPlace config --replace api_key=\'\' "api_key='${apiKey}'" - substituteInPlace config --replace device_key=\'\' "device_key='${deviceKey}'" - - substituteInPlace prey.sh --replace /bin/bash $(type -Pp bash) - mkdir -p $out/modules - cp -R . $out - cp -R ${modulesSrc}/* $out/modules/ - wrapProgram "$out/prey.sh" \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ xawtv imagemagick curl scrot inetutils coreutils ]}" \ - --set CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt" - ''; - - meta = with stdenv.lib; { - homepage = https://preyproject.com; - description = "Proven tracking software that helps you find, lock and recover your devices when stolen or missing"; - maintainers = with maintainers; [ domenkozar ]; - license = licenses.gpl3; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/tools/security/proxmark3/default.nix index e717558a24da6..304ba041b46df 100644 --- a/pkgs/tools/security/proxmark3/default.nix +++ b/pkgs/tools/security/proxmark3/default.nix @@ -35,7 +35,7 @@ let meta = with stdenv.lib; { description = "Client for proxmark3, powerful general purpose RFID tool"; - homepage = http://www.proxmark.org; + homepage = "http://www.proxmark.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix index 79e8fb071b37f..a63e40b744e87 100644 --- a/pkgs/tools/security/pwgen/default.nix +++ b/pkgs/tools/security/pwgen/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "pwgen-2.08"; src = fetchurl { - url = https://github.com/tytso/pwgen/archive/v2.08.tar.gz; + url = "https://github.com/tytso/pwgen/archive/v2.08.tar.gz"; sha256 = "8d6e94f28655e61d6126290e3eafad4d17d7fba0d0d354239522a740a270bb2f"; }; diff --git a/pkgs/tools/security/pyrit/default.nix b/pkgs/tools/security/pyrit/default.nix new file mode 100644 index 0000000000000..93ae86416e13c --- /dev/null +++ b/pkgs/tools/security/pyrit/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, fetchFromGitHub, python2Packages, openssl, zlib, libpcap, opencl-headers, ocl-icd }: + +let + version = "2019-12-13"; + src = fetchFromGitHub { + owner = "JPaulMora"; + repo = "Pyrit"; + rev = "f0f1913c645b445dd391fb047b812b5ba511782c"; + sha256 = "1npkvngc4g3g6mpjip2wwhvcd4a75jy3dbddxhxhzrrz4p7259gr"; + }; + + cpyrit_opencl = python2Packages.buildPythonPackage { + pname = "cpyrit-opencl"; + inherit version; + + src = "${src}/modules/cpyrit_opencl"; + + buildInputs = [ opencl-headers ocl-icd openssl zlib ]; + + postInstall = let + python = python2Packages.python; + in '' + # pyrit uses "import _cpyrit_cuda" so put the output in the root site-packages + mv $out/lib/${python.libPrefix}/site-packages/cpyrit/_cpyrit_opencl.so $out/lib/${python.libPrefix}/site-packages/ + ''; + }; +in +python2Packages.buildPythonApplication rec { + pname = "pyrit"; + inherit version src; + + buildInputs = [ openssl zlib libpcap ]; + propagatedBuildInputs = [ cpyrit_opencl ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/JPaulMora/Pyrit"; + description = "GPGPU-driven WPA/WPA2-PSK key cracker"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ danielfullmer ]; + }; +} diff --git a/pkgs/tools/security/radamsa/default.nix b/pkgs/tools/security/radamsa/default.nix index 7a78233dbced0..b1d6400f2d0d6 100644 --- a/pkgs/tools/security/radamsa/default.nix +++ b/pkgs/tools/security/radamsa/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "A general purpose fuzzer"; longDescription = "Radamsa is a general purpose data fuzzer. It reads data from given sample files, or standard input if none are given, and outputs modified data. It is usually used to generate malformed data for testing programs."; - homepage = https://gitlab.com/akihe/radamsa; + homepage = "https://gitlab.com/akihe/radamsa"; maintainers = [ stdenv.lib.maintainers.markWot ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/tools/security/rarcrack/default.nix index 68e5df809377e..9749d82516882 100644 --- a/pkgs/tools/security/rarcrack/default.nix +++ b/pkgs/tools/security/rarcrack/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { This program uses bruteforce algorithm to find correct password. You can specify wich characters will be used in password generations. Warning: Please don't use this program for any illegal things! ''; - homepage = https://github.com/jaredsburrows/Rarcrack; + homepage = "https://github.com/jaredsburrows/Rarcrack"; license = licenses.gpl2; maintainers = with maintainers; [ davidak ]; platforms = with platforms; unix; diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index bd289200fe801..16952e6dabb46 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = { description = "A random number generator daemon"; - homepage = https://github.com/nhorman/rng-tools; + homepage = "https://github.com/nhorman/rng-tools"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ johnazoidberg c0bw3b ]; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 4373abdb9a4b1..42845705ff6b5 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -11,7 +11,20 @@ buildGoModule rec { sha256 = "12aidylamrq4rvy2cfdz669lr1p20yqrshigcc5x1hrlhh9y64xc"; }; - modSha256 = "1kcj5065yy52p1jy4fad5lsz3y4spqc40k1qsirm53qqixhrhvag"; + hid = fetchFromGitHub { + owner = "karalabe"; + repo = "hid"; + rev = "9c14560f9ee858c43f40b5cd01392b167aacf4e8"; + sha256 = "0xc7b8mwha64j7l2fr2g5zy8pz7cqi0vrxx60gii52b6ii31xncx"; + }; + + vendorSha256 = "0mns5clykvj33krf29yjh8lkf05nih42ka5ji7miq0iaikqyyc78"; + overrideModAttrs = (_: { + postBuild = '' + cp -r --reflink=auto ${hid}/libusb vendor/github.com/karalabe/hid + cp -r --reflink=auto ${hid}/hidapi vendor/github.com/karalabe/hid + ''; + }); subPackages = [ "." "cmd/saml2aws" ]; @@ -26,4 +39,4 @@ buildGoModule rec { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.pmyjavec ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix index e0e2896f6ffc8..1a42ddf8becad 100644 --- a/pkgs/tools/security/sbsigntool/default.nix +++ b/pkgs/tools/security/sbsigntool/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tools for maintaining UEFI signature databases"; - homepage = http://jk.ozlabs.org/docs/sbkeysync-maintaing-uefi-key-databases; + homepage = "http://jk.ozlabs.org/docs/sbkeysync-maintaing-uefi-key-databases"; maintainers = [ maintainers.tstrobel ]; platforms = [ "x86_64-linux" ]; # Broken on i686 license = licenses.gpl3; diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix index 66313b536499f..018bc44b1443c 100644 --- a/pkgs/tools/security/scrypt/default.nix +++ b/pkgs/tools/security/scrypt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Encryption utility"; - homepage = https://www.tarsnap.com/scrypt.html; + homepage = "https://www.tarsnap.com/scrypt.html"; license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/tools/security/seccure/default.nix b/pkgs/tools/security/seccure/default.nix index 686ef36f863c2..e0f01f4f2c417 100644 --- a/pkgs/tools/security/seccure/default.nix +++ b/pkgs/tools/security/seccure/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://point-at-infinity.org/seccure/; + homepage = "http://point-at-infinity.org/seccure/"; description = "Zero-configuration elliptic curve cryptography utility"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.lgpl3; diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index 7189032454d64..b5e92a3545417 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { Bitcoin Core. This library is a work in progress and is being used to research best practices. Use at your own risk. ''; - homepage = https://github.com/bitcoin-core/secp256k1; + homepage = "https://github.com/bitcoin-core/secp256k1"; license = with licenses; [ mit ]; maintainers = with maintainers; [ chris-martin ]; platforms = with platforms; unix; diff --git a/pkgs/tools/security/sedutil/default.nix b/pkgs/tools/security/sedutil/default.nix index 9edd9745326e5..4877a8adfcefa 100644 --- a/pkgs/tools/security/sedutil/default.nix +++ b/pkgs/tools/security/sedutil/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "DTA sedutil Self encrypting drive software"; - homepage = https://www.drivetrust.com; + homepage = "https://www.drivetrust.com"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/tools/security/shc/default.nix b/pkgs/tools/security/shc/default.nix index 18814eb7fa8f9..3705d2c7ed1ad 100644 --- a/pkgs/tools/security/shc/default.nix +++ b/pkgs/tools/security/shc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://neurobin.org/projects/softwares/unix/shc/; + homepage = "https://neurobin.org/projects/softwares/unix/shc/"; description = "Shell Script Compiler"; platforms = stdenv.lib.platforms.linux; license = licenses.gpl3; diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/tools/security/signify/default.nix index 22604a3f70ba2..3ec260a7c0c57 100644 --- a/pkgs/tools/security/signify/default.nix +++ b/pkgs/tools/security/signify/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { OpenBSDs signing tool, which uses the Ed25519 public key signature system for fast signing and verification of messages using small public keys. ''; - homepage = https://www.tedunangst.com/flak/post/signify; + homepage = "https://www.tedunangst.com/flak/post/signify"; license = licenses.isc; maintainers = [ maintainers.rlupton20 ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index ea487fed2a1d6..91d3ea356df33 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -192,7 +192,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://salsa.debian.org/signing-party-team/signing-party; + homepage = "https://salsa.debian.org/signing-party-team/signing-party"; description = "A collection of several projects relating to OpenPGP"; longDescription = '' This is a collection of several projects relating to OpenPGP. diff --git a/pkgs/tools/security/simple-tpm-pk11/default.nix b/pkgs/tools/security/simple-tpm-pk11/default.nix index 16056f9a59e06..2a360b4321c50 100644 --- a/pkgs/tools/security/simple-tpm-pk11/default.nix +++ b/pkgs/tools/security/simple-tpm-pk11/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { longDescription = '' A simple library for using the TPM chip to secure SSH keys. ''; - homepage = https://github.com/ThomasHabets/simple-tpm-pk11; + homepage = "https://github.com/ThomasHabets/simple-tpm-pk11"; license = licenses.asl20; maintainers = with maintainers; [ tstrobel ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix new file mode 100644 index 0000000000000..9e9cbe2bb3a53 --- /dev/null +++ b/pkgs/tools/security/sn0int/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, rustPlatform, + libsodium, libseccomp, sqlite, pkgconfig }: + +rustPlatform.buildRustPackage rec { + pname = "sn0int"; + version = "0.18.2"; + + src = fetchFromGitHub { + owner = "kpcyrd"; + repo = pname; + rev = "v${version}"; + sha256 = "0b21b0ryq03zrhqailg2iajirn30l358aj3k44lfnravr4h9zwkj"; + }; + + cargoSha256 = "1pvn0sc325b5fh29m2l6cack4qfssa4lp3zhyb1qzkb3fmw3lgcy"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libsodium libseccomp sqlite ]; + + # One of the dependencies (chrootable-https) tries to read "/etc/resolv.conf" + # in "checkPhase", hence fails in sandbox of "nix". + doCheck = false; + + meta = with lib; { + description = "Semi-automatic OSINT framework and package manager"; + homepage = "https://github.com/kpcyrd/sn0int"; + license = licenses.gpl3; + maintainers = with maintainers; [ xrelkd ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix index 94642700c336a..5cc7dbac5da56 100644 --- a/pkgs/tools/security/softhsm/default.nix +++ b/pkgs/tools/security/softhsm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/var"; meta = with stdenv.lib; { - homepage = https://www.opendnssec.org/softhsm; + homepage = "https://www.opendnssec.org/softhsm"; description = "Cryptographic store accessible through a PKCS #11 interface"; license = licenses.bsd2; maintainers = [ maintainers.leenaars ]; diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 8aa2e219e7df4..55dde8438c8ae 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1515bk0fl0pvdkp402l51gdg63bmqlh89sglss6prc1qqvv5v2xy"; }; - modSha256 = "0vhxd3dschj5i9sig6vpxzbl59cas1qa843akzmjnfjrrafb916y"; + vendorSha256 = "0yryc799k4563wy53z7amraj89cyprklj0lfv207530hwv5i5gm6"; meta = with stdenv.lib; { homepage = "https://github.com/mozilla/sops"; @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = [ maintainers.marsam ]; license = licenses.mpl20; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index 656efbf390cb9..4d58095c43b14 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Spectre & Meltdown vulnerability/mitigation checker for Linux"; - homepage = https://github.com/speed47/spectre-meltdown-checker; + homepage = "https://github.com/speed47/spectre-meltdown-checker"; license = licenses.gpl3; maintainers = with maintainers; [ dotlambda ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/srm/default.nix b/pkgs/tools/security/srm/default.nix index 9782d00267f57..853ad4f280a2e 100644 --- a/pkgs/tools/security/srm/default.nix +++ b/pkgs/tools/security/srm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { provide drop in security for users who wish to prevent recovery of deleted information, even if the machine is compromised. ''; - homepage = http://srm.sourceforge.net; + homepage = "http://srm.sourceforge.net"; license = licenses.mit; maintainers = with maintainers; [ edwtjo ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix index a196fe9ca47a7..bad1c9fd16d59 100644 --- a/pkgs/tools/security/sshguard/default.nix +++ b/pkgs/tools/security/sshguard/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { SSHGuard can read log messages from various input sources. Log messages are parsed, line-by-line, for recognized patterns. If an attack, such as several login failures within a few seconds, is detected, the offending IP is blocked. ''; - homepage = https://sshguard.net; + homepage = "https://sshguard.net"; license = licenses.bsd3; maintainers = with maintainers; [ sargon ]; platforms = with platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd; diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 0ec98ec1cf22c..4d0ae5e051d0c 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/sshuttle/sshuttle/; + homepage = "https://github.com/sshuttle/sshuttle/"; description = "Transparent proxy server that works as a poor man's VPN"; longDescription = '' Forward connections over SSH, without requiring administrator access to the diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index 15ac376d72a77..68efa7a17d1fe 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tests SSL/TLS services and discover supported cipher suites"; - homepage = https://github.com/rbsec/sslscan; + homepage = "https://github.com/rbsec/sslscan"; license = licenses.gpl3; maintainers = with maintainers; [ fpletz globin ]; platforms = platforms.all; diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix index 157e007c534ae..bd7de72e6beca 100644 --- a/pkgs/tools/security/ssss/default.nix +++ b/pkgs/tools/security/ssss/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ssss-0.5"; src = fetchurl { - url = http://point-at-infinity.org/ssss/ssss-0.5.tar.gz; + url = "http://point-at-infinity.org/ssss/ssss-0.5.tar.gz"; sha256 = "15grn2fp1x8p92kxkwbmsx8rz16g93y9grl3hfqbh1jn21ama5jx"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Shamir Secret Sharing Scheme"; - homepage = http://point-at-infinity.org/ssss/; + homepage = "http://point-at-infinity.org/ssss/"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/tools/security/steghide/default.nix b/pkgs/tools/security/steghide/default.nix index 7a759c3c33363..5ac40e0a04744 100644 --- a/pkgs/tools/security/steghide/default.nix +++ b/pkgs/tools/security/steghide/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://steghide.sourceforge.net/; + homepage = "http://steghide.sourceforge.net/"; description = "Steganography program that is able to hide data in various kinds of image- and audio-files"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index 0ecd3bc82532a..d696b560f6dc3 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; - homepage = https://smallstep.com/cli/; + homepage = "https://smallstep.com/cli/"; license = licenses.asl20; maintainers = with maintainers; [ xfix ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix index d6375bee64958..22dc5e476e7f4 100644 --- a/pkgs/tools/security/stoken/default.nix +++ b/pkgs/tools/security/stoken/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Software Token for Linux/UNIX"; - homepage = https://github.com/cernekee/stoken; + homepage = "https://github.com/cernekee/stoken"; license = licenses.lgpl21Plus; maintainers = [ ]; platforms = platforms.all; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index e92ce05ad1a9c..e05374575d24d 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { homepage = "https://www.sudo.ws/"; - license = https://www.sudo.ws/sudo/license.html; + license = "https://www.sudo.ws/sudo/license.html"; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix index 716973a3e2e71..0705173106961 100644 --- a/pkgs/tools/security/super/default.nix +++ b/pkgs/tools/security/super/default.nix @@ -17,9 +17,11 @@ stdenv.mkDerivation rec { ''; patches = [ - (fetchpatch { url = https://salsa.debian.org/debian/super/raw/debian/3.30.0-7/debian/patches/14-Fix-unchecked-setuid-call.patch; - sha256 = "08m9hw4kyfjv0kqns1cqha4v5hkgp4s4z0q1rgif1fnk14xh7wqh"; - }) + (fetchpatch { + name = "CVE-2014-0470.patch"; + url = "https://salsa.debian.org/debian/super/raw/debian/3.30.0-7/debian/patches/14-Fix-unchecked-setuid-call.patch"; + sha256 = "08m9hw4kyfjv0kqns1cqha4v5hkgp4s4z0q1rgif1fnk14xh7wqh"; + }) ]; NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index 062bf40b7d6d4..38f467fb441f1 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM"; - homepage = https://sourceforge.net/projects/tboot/; + homepage = "https://sourceforge.net/projects/tboot/"; license = licenses.bsd3; maintainers = with maintainers; [ ak ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix index 86a65a060280e..a6eb09fd2c5f6 100644 --- a/pkgs/tools/security/tcpcrypt/default.nix +++ b/pkgs/tools/security/tcpcrypt/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://tcpcrypt.org/; + homepage = "http://tcpcrypt.org/"; description = "Fast TCP encryption"; platforms = platforms.all; license = licenses.bsd2; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 0ef45bd5337eb..e6cd74eda4b11 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { patches = [ ./disable-monotonic-timer-tests.patch ]; + # cross compiles correctly but needs the following + configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + "--disable-tool-name-check"; + NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; postPatch = '' @@ -67,7 +71,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://www.torproject.org/"; - repositories.git = https://git.torproject.org/git/tor; + repositories.git = "https://git.torproject.org/git/tor"; description = "Anonymizing overlay network"; longDescription = '' diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 8681d80c2ed32..2ce4c9806eb31 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { description = "Wrapper to safely torify applications"; - homepage = https://github.com/dgoulet/torsocks; - repositories.git = https://git.torproject.org/torsocks.git; + homepage = "https://github.com/dgoulet/torsocks"; + repositories.git = "https://git.torproject.org/torsocks.git"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ phreedom thoughtpolice ]; diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix index 94d833ca74629..fc1931fa4ba27 100644 --- a/pkgs/tools/security/tpm-luks/default.nix +++ b/pkgs/tools/security/tpm-luks/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "LUKS key storage in TPM NVRAM"; - homepage = https://github.com/shpedoikal/tpm-luks/; + homepage = "https://github.com/shpedoikal/tpm-luks/"; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/tools/security/tpm-quote-tools/default.nix index f7526ac7225d8..a652867a0d096 100644 --- a/pkgs/tools/security/tpm-quote-tools/default.nix +++ b/pkgs/tools/security/tpm-quote-tools/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { for TPM based attestation using the TPM quote mechanism. The manual page for tpm_quote_tools provides a usage overview. ''; - homepage = http://tpmquotetools.sourceforge.net/; + homepage = "http://tpmquotetools.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ ak ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix index e546cc5a10fb9..5e0b4e6d94f43 100644 --- a/pkgs/tools/security/tpm-tools/default.nix +++ b/pkgs/tools/security/tpm-tools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { - url = https://sources.debian.org/data/main/t/tpm-tools/1.3.9.1-0.1/debian/patches/05-openssl1.1_fix_data_mgmt.patch; + url = "https://sources.debian.org/data/main/t/tpm-tools/1.3.9.1-0.1/debian/patches/05-openssl1.1_fix_data_mgmt.patch"; sha256 = "161yysw4wgy3spsz6p1d0ib0h5pnrqm8bdh1l71c4hz6a6wpcyxj"; }) ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { application enablement of Trusted Computing using a Trusted Platform Module (TPM), similar to a smart card environment. ''; - homepage = https://sourceforge.net/projects/trousers/files/tpm-tools/; + homepage = "https://sourceforge.net/projects/trousers/files/tpm-tools/"; license = licenses.cpl10; maintainers = [ maintainers.ak ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/tools/security/tpm2-abrmd/default.nix index 84dafca4e0c4e..fbebde2e7bf60 100644 --- a/pkgs/tools/security/tpm2-abrmd/default.nix +++ b/pkgs/tools/security/tpm2-abrmd/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "TPM2 resource manager, accessible via D-Bus"; - homepage = https://github.com/tpm2-software/tpm2-tools; + homepage = "https://github.com/tpm2-software/tpm2-tools"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ lschuermann ]; diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/tools/security/tpm2-tools/default.nix index 9600326cd5574..282b1df299cfe 100644 --- a/pkgs/tools/security/tpm2-tools/default.nix +++ b/pkgs/tools/security/tpm2-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "tpm2-tools"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "1cd74nd57wmms2yrnzs64xki29rf4kx61kd30fyd56wlicyjdfa0"; + sha256 = "0di97zmxdh04m2ibyshcgvillwxx6rnd0543scm7q10y7nv74m0p"; }; nativeBuildInputs = [ pandoc pkgconfig makeWrapper ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command line tools that provide access to a TPM 2.0 compatible device"; - homepage = https://github.com/tpm2-software/tpm2-tools; + homepage = "https://github.com/tpm2-software/tpm2-tools"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ delroth ]; diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index a38c011d7a49f..2cc702cf6f2f6 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Trusted computing software stack"; - homepage = http://trousers.sourceforge.net/; + homepage = "http://trousers.sourceforge.net/"; license = licenses.bsd3; maintainers = [ maintainers.ak ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 9492f2bb6eac5..353590ed87c81 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -1,22 +1,22 @@ -{ lib, pythonPackages }: +{ lib, python3Packages }: let - truffleHogRegexes = pythonPackages.buildPythonPackage rec { + truffleHogRegexes = python3Packages.buildPythonPackage rec { pname = "truffleHogRegexes"; - version = "0.0.4"; - src = pythonPackages.fetchPypi { + version = "0.0.7"; + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "09vrscbb4h4w01gmamlzghxx6cvrqdscylrbdcnbjsd05xl7zh4z"; + sha256 = "b81dfc60c86c1e353f436a0e201fd88edb72d5a574615a7858485c59edf32405"; }; }; in - pythonPackages.buildPythonApplication rec { + python3Packages.buildPythonApplication rec { pname = "truffleHog"; - version = "2.0.97"; + version = "2.1.11"; - src = pythonPackages.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "034kpv1p4m90286slvc6d4mlrzaf0b5jbd4qaj87hj65wbpcpg8r"; + sha256 = "53619f0c5be082abd377f987291ace80bc3b88f864972b1a30494780980f769e"; }; # Relax overly restricted version constraint @@ -24,13 +24,13 @@ in substituteInPlace setup.py --replace "GitPython ==" "GitPython >= " ''; - propagatedBuildInputs = [ pythonPackages.GitPython truffleHogRegexes ]; + propagatedBuildInputs = [ python3Packages.GitPython truffleHogRegexes ]; # Test cases run git clone and require network access doCheck = false; meta = { - homepage = https://github.com/dxa4481/truffleHog; + homepage = "https://github.com/dxa4481/truffleHog"; description = "Searches through git repositories for high entropy strings and secrets, digging deep into commit history"; license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ bhipple ]; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 54be477cfe2cb..e1b6ef8086057 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -1,28 +1,30 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: +{ stdenv, fetchFromGitHub, buildGoPackage, installShellFiles }: buildGoPackage rec { pname = "vault"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "13ycg9shara4ycbi79wj28z6nimnsqgisbf35ca3q9w066ac0ja2"; + sha256 = "0aschysngs6f50plqkqbnhgl6zryd0bpypr50zd45cgww7jvvqd4"; }; goPackagePath = "github.com/hashicorp/vault"; subPackages = [ "." ]; + nativeBuildInputs = [ installShellFiles ]; + buildFlagsArray = [ "-tags='vault'" "-ldflags=\"-X github.com/hashicorp/vault/sdk/version.GitCommit='v${version}'\"" ]; postInstall = '' - mkdir -p $bin/share/bash-completion/completions - echo "complete -C $bin/bin/vault vault" > $bin/share/bash-completion/completions/vault + echo "complete -C $out/bin/vault vault" > vault.bash + installShellCompletion vault.bash ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 6e2ab221c42f0..6b14a834330de 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.vaultproject.io; + homepage = "https://www.vaultproject.io"; description = "A tool for managing secrets, this binary includes the UI"; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "i686-darwin" ]; license = licenses.mpl20; diff --git a/pkgs/tools/security/verifpal/default.nix b/pkgs/tools/security/verifpal/default.nix index 95afb580d4e15..e1e5e100bd11b 100644 --- a/pkgs/tools/security/verifpal/default.nix +++ b/pkgs/tools/security/verifpal/default.nix @@ -28,8 +28,8 @@ buildGoPackage rec { ''; installPhase = '' - mkdir -p $bin/bin - cp go/src/$goPackagePath/build/bin/linux/verifpal $bin/bin/ + mkdir -p $out/bin + cp go/src/$goPackagePath/build/bin/linux/verifpal $out/bin/ ''; meta = { diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index bc8f1ce52c1d5..8cf904c39c5fd 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = [ pythonPackages.pycrypto pythonPackages.distorm3 ]; meta = with stdenv.lib; { - homepage = https://www.volatilityfoundation.org/; + homepage = "https://www.volatilityfoundation.org/"; description = "Advanced memory forensics framework"; maintainers = with maintainers; [ bosu ]; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/security/wipe/default.nix b/pkgs/tools/security/wipe/default.nix index 25c7921d34c84..6b84803d2c46c 100644 --- a/pkgs/tools/security/wipe/default.nix +++ b/pkgs/tools/security/wipe/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Secure file wiping utility"; - homepage = http://wipe.sourceforge.net/; + homepage = "http://wipe.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index e09e1e6940838..8a11953502341 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -1,30 +1,28 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pcre +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pcre +, pkg-config +, protobufc , withCrypto ? true, openssl , enableMagic ? true, file , enableCuckoo ? true, jansson }: stdenv.mkDerivation rec { - version = "3.11.0"; + version = "4.0.1"; pname = "yara"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara"; rev = "v${version}"; - sha256 = "0mx3xm2a70fx8vlynkavq8gfd9w5yjcix5rx85444i2s1h6kcd0j"; + sha256 = "0dy8jf0pdn0wilxy1pj6pqjxg7icxkwax09w54np87gl9p00f5rk"; }; - # See: https://github.com/VirusTotal/yara/issues/1036 - # TODO: This patch should not be necessary in the next release - patches = [ - (fetchpatch { - url = "https://github.com/VirusTotal/yara/commit/04df811fa61fa54390b274bfcf56d7403c184404.patch"; - sha256 = "0hsbc2k7nmk2kskll971draz0an4rmcs5v0iql47mz596vqvkzmb"; - }) - ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ autoconf automake libtool pcre ] + buildInputs = [ pcre protobufc ] ++ stdenv.lib.optionals withCrypto [ openssl ] ++ stdenv.lib.optionals enableMagic [ file ] ++ stdenv.lib.optionals enableCuckoo [ jansson ] @@ -40,8 +38,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The pattern matching swiss knife for malware researchers"; - homepage = http://Virustotal.github.io/yara/; - license = licenses.asl20; - platforms = stdenv.lib.platforms.all; + homepage = "http://Virustotal.github.io/yara/"; + license = licenses.asl20; + platforms = platforms.all; }; } diff --git a/pkgs/tools/security/zmap/default.nix b/pkgs/tools/security/zmap/default.nix index f98b4295e9e6b..ef36b21641bce 100644 --- a/pkgs/tools/security/zmap/default.nix +++ b/pkgs/tools/security/zmap/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; meta = with stdenv.lib; { - homepage = https://zmap.io/; + homepage = "https://zmap.io/"; license = licenses.asl20; description = "Fast single packet network scanner designed for Internet-wide network surveys"; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/tools/security/zzuf/default.nix b/pkgs/tools/security/zzuf/default.nix index dc2cfe81746a0..5dab990e22f75 100644 --- a/pkgs/tools/security/zzuf/default.nix +++ b/pkgs/tools/security/zzuf/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Transparent application input fuzzer."; - homepage = http://caca.zoy.org/wiki/zzuf; + homepage = "http://caca.zoy.org/wiki/zzuf"; license = licenses.wtfpl; platforms = platforms.linux; maintainers = with maintainers; [ lihop ]; diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix index 669c91adf10d5..dd4eb0d5d2b84 100644 --- a/pkgs/tools/system/acct/default.nix +++ b/pkgs/tools/system/acct/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; - homepage = https://www.gnu.org/software/acct/; + homepage = "https://www.gnu.org/software/acct/"; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index a1c7527c46a49..62b1be619650a 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "acpica-tools"; - version = "20200110"; + version = "20200430"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "1cb6aa6acrixmdzvj9vv4qs9lmlsbkd27pjlz14i1kq1x3xn0gwx"; + sha256 = "0z19bniqsa8y0n1qrxmb6gz7m63jpwx22zgk5ablyriixhfpz07v"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/tools/system/actkbd/default.nix b/pkgs/tools/system/actkbd/default.nix index 501311e967244..706b3700a4157 100644 --- a/pkgs/tools/system/actkbd/default.nix +++ b/pkgs/tools/system/actkbd/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { release events. ''; license = licenses.gpl2; - homepage = http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/; + homepage = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/"; platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/amtterm/default.nix b/pkgs/tools/system/amtterm/default.nix index 7e92fc06b2d76..9050111fc17b7 100644 --- a/pkgs/tools/system/amtterm/default.nix +++ b/pkgs/tools/system/amtterm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Intel AMT® SoL client + tools"; - homepage = https://www.kraxel.org/cgit/amtterm/; + homepage = "https://www.kraxel.org/cgit/amtterm/"; license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index fded1da861d44..278b14cd19996 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { description = ''The classical Unix `at' job scheduling command''; license = stdenv.lib.licenses.gpl2Plus; - homepage = https://packages.qa.debian.org/at; + homepage = "https://packages.qa.debian.org/at"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix index 08731cd6db234..338b8f8ac4531 100644 --- a/pkgs/tools/system/augeas/default.nix +++ b/pkgs/tools/system/augeas/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Configuration editing tool"; license = licenses.lgpl2; - homepage = http://augeas.net/; + homepage = "http://augeas.net/"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix index 6d191f33a64d5..9da6ac59f3de7 100644 --- a/pkgs/tools/system/awstats/default.nix +++ b/pkgs/tools/system/awstats/default.nix @@ -54,7 +54,7 @@ perlPackages.buildPerlPackage rec { meta = with stdenv.lib; { description = "Real-time logfile analyzer to get advanced statistics"; - homepage = http://awstats.org; + homepage = "http://awstats.org"; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/tools/system/bar/default.nix b/pkgs/tools/system/bar/default.nix index a295da844af2e..32945a24bb163 100644 --- a/pkgs/tools/system/bar/default.nix +++ b/pkgs/tools/system/bar/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { description = "Console progress bar"; - homepage = http://clpbar.sourceforge.net/; + homepage = "http://clpbar.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.rdnetto ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 50146f0aad31d..78e92e01c6ea2 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bfs"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "0qrxd1vdz2crk7jf7cdda5bhm1f841hjvin7fn497wymwr5qyjah"; + sha256 = "1jkz99i10y6dwc4dyh2vp3p549jscgwjdp6x17mcw561bnam2287"; }; buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ]; diff --git a/pkgs/tools/system/chase/default.nix b/pkgs/tools/system/chase/default.nix index 6c48d3341ecc8..c4396aad9ca6d 100644 --- a/pkgs/tools/system/chase/default.nix +++ b/pkgs/tools/system/chase/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { longDescription = '' A commandline program that chases symbolic filesystems links to the original file ''; - homepage = https://qa.debian.org/developer.php?login=rotty%40debian.org; + homepage = "https://qa.debian.org/developer.php?login=rotty%40debian.org"; license = licenses.gpl2Plus; maintainers = [ maintainers.polyrod ]; platforms = platforms.all; diff --git a/pkgs/tools/system/clinfo/default.nix b/pkgs/tools/system/clinfo/default.nix index dd6e3d4a84b88..c50bfe4a0d046 100644 --- a/pkgs/tools/system/clinfo/default.nix +++ b/pkgs/tools/system/clinfo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Print all known information about all available OpenCL platforms and devices in the system"; - homepage = https://github.com/Oblomov/clinfo; + homepage = "https://github.com/Oblomov/clinfo"; license = licenses.cc0; platforms = platforms.linux; maintainers = with maintainers; [ athas ]; diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 9118fc55ea960..f625a441ba3f9 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -8,12 +8,12 @@ let plugins = callPackage ./plugins.nix args; in stdenv.mkDerivation rec { - version = "5.10.0"; + version = "5.11.0"; pname = "collectd"; src = fetchurl { url = "https://collectd.org/files/${pname}-${version}.tar.bz2"; - sha256 = "0nrpq09q6vbbv0hjc1vfa36z8j5802500hy75m678gh2cgsmjcx0"; + sha256 = "1cjxksxdqcqdccz1nbnc2fp6yy84qq361ynaq5q8bailds00mc9p"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/system/colorls/Gemfile.lock b/pkgs/tools/system/colorls/Gemfile.lock index ebbcd0fdb037a..1b84a550e4821 100644 --- a/pkgs/tools/system/colorls/Gemfile.lock +++ b/pkgs/tools/system/colorls/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: clocale (0.0.4) - colorls (1.2.0) + colorls (1.3.3) clocale (~> 0) filesize (~> 0) manpages (~> 0) diff --git a/pkgs/tools/system/colorls/default.nix b/pkgs/tools/system/colorls/default.nix index 1631b9f721804..8243590cd7d55 100644 --- a/pkgs/tools/system/colorls/default.nix +++ b/pkgs/tools/system/colorls/default.nix @@ -10,9 +10,9 @@ bundlerApp { meta = with lib; { description = "Prettified LS"; - homepage = https://github.com/athityakumar/colorls; + homepage = "https://github.com/athityakumar/colorls"; license = with licenses; mit; - maintainers = with maintainers; [ lukebfox nicknovitski ]; + maintainers = with maintainers; [ lukebfox nicknovitski cbley ]; platforms = ruby.meta.platforms; }; } diff --git a/pkgs/tools/system/colorls/gemset.nix b/pkgs/tools/system/colorls/gemset.nix index e7264a895a2c2..c16f87f457ff7 100644 --- a/pkgs/tools/system/colorls/gemset.nix +++ b/pkgs/tools/system/colorls/gemset.nix @@ -15,10 +15,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bcrig88ipzj43lnkrb5qmimdrml4lx15rcrhr6m2hxb0pks8932"; + sha256 = "07rvm3g65slnqzal718qwfmgsjnkysx00jn8dnv96317yx0mxfx6"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.3"; }; filesize = { groups = ["default"]; diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index ad120dd6481e7..69d5cd6bb7366 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/hashicorp/consul-template/; + homepage = "https://github.com/hashicorp/consul-template/"; description = "Generic template rendering and notifications with Consul"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index aa047ca4a681d..9cde31205e1f9 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "cron-4.1"; src = fetchurl { - url = ftp://ftp.isc.org/isc/cron/cron_4.1.shar; + url = "ftp://ftp.isc.org/isc/cron/cron_4.1.shar"; sha256 = "16n3dras4b1jh7g958nz1k54pl9pg5fwb3fvjln8z67varvq6if4"; }; diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix index 4f492def16246..1c46caaf93247 100644 --- a/pkgs/tools/system/ctop/default.nix +++ b/pkgs/tools/system/ctop/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0y72l65xgfqrgghzbm1zcy776l5m31z0gn6vfr689zyi3k3f4kh8"; }; - modSha256 = "0wxv6yzlgki7047qszx9p9xpph95bg097jkgaa0b3wbpx8vg7qml"; + vendorSha256 = "1x4li44vg0l1x205v9a971cgphplxhsrn59q97gmj9cfy4m7jdfw"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.build=v${version}" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ apeyroux marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/tools/system/daemon/default.nix index 76f53b55f3db3..fb06247f98436 100644 --- a/pkgs/tools/system/daemon/default.nix +++ b/pkgs/tools/system/daemon/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "daemon-0.6.4"; src = fetchurl { - url = http://libslack.org/daemon/download/daemon-0.6.4.tar.gz; + url = "http://libslack.org/daemon/download/daemon-0.6.4.tar.gz"; sha256 = "18aw0f8k3j30xqwv4z03962kdpqd10nf1w9liihylmadlx5fmff4"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/system/daemonize/default.nix b/pkgs/tools/system/daemonize/default.nix index 205b693dd9248..a8685189b61c8 100644 --- a/pkgs/tools/system/daemonize/default.nix +++ b/pkgs/tools/system/daemonize/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Runs a command as a Unix daemon"; - homepage = http://software.clapper.org/daemonize/; + homepage = "http://software.clapper.org/daemonize/"; license = licenses.bsd3; platforms = with platforms; linux ++ freebsd ++ darwin; }; diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix index 29767c879ffbc..8c1a5657991cc 100644 --- a/pkgs/tools/system/das_watchdog/default.nix +++ b/pkgs/tools/system/das_watchdog/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/kmatheussen/das_watchdog; + homepage = "https://github.com/kmatheussen/das_watchdog"; description = "A general watchdog for the linux operating system"; longDescription = '' It should run in the background at all times to ensure a realtime process diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix index 63aa563bfa0c5..839e14a20d8a9 100644 --- a/pkgs/tools/system/datefudge/default.nix +++ b/pkgs/tools/system/datefudge/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { different by pre-loading a small library which modifies the time, gettimeofday and clock_gettime system calls. ''; - homepage = https://packages.qa.debian.org/d/datefudge.html; + homepage = "https://packages.qa.debian.org/d/datefudge.html"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/tools/system/dcfldd/default.nix b/pkgs/tools/system/dcfldd/default.nix index 240cc36f7266d..9ea7b485b96b1 100644 --- a/pkgs/tools/system/dcfldd/default.nix +++ b/pkgs/tools/system/dcfldd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An enhanced version of GNU dd"; - homepage = http://dcfldd.sourceforge.net/; + homepage = "http://dcfldd.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/tools/system/ddrescueview/default.nix b/pkgs/tools/system/ddrescueview/default.nix index 466232e2bf779..838873b7557f8 100644 --- a/pkgs/tools/system/ddrescueview/default.nix +++ b/pkgs/tools/system/ddrescueview/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool to graphically examine ddrescue mapfiles"; - homepage = https://sourceforge.net/projects/ddrescueview/; + homepage = "https://sourceforge.net/projects/ddrescueview/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/tools/system/ddrutility/default.nix b/pkgs/tools/system/ddrutility/default.nix index 54bf6fbaf42b7..bb24076ce7c8c 100644 --- a/pkgs/tools/system/ddrutility/default.nix +++ b/pkgs/tools/system/ddrutility/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set of utilities for hard drive data rescue"; - homepage = https://sourceforge.net/projects/ddrutility/; + homepage = "https://sourceforge.net/projects/ddrutility/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix index 8575d971898ac..415b647befa09 100644 --- a/pkgs/tools/system/dfc/default.nix +++ b/pkgs/tools/system/dfc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gettext ]; meta = { - homepage = https://projects.gw-computing.net/projects/dfc; + homepage = "https://projects.gw-computing.net/projects/dfc"; description = "Displays file system space usage using graphs and colors"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [qknight]; diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix index 3aef366ea066f..239544d20a6dd 100644 --- a/pkgs/tools/system/di/default.nix +++ b/pkgs/tools/system/di/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Disk information utility; displays everything 'df' does and more"; - homepage = https://gentoo.com/di/; + homepage = "https://gentoo.com/di/"; license = licenses.zlib; updateWalker = true; maintainers = with maintainers; [ manveru ]; diff --git a/pkgs/tools/system/disk-filltest/default.nix b/pkgs/tools/system/disk-filltest/default.nix new file mode 100644 index 0000000000000..074b06aa4e666 --- /dev/null +++ b/pkgs/tools/system/disk-filltest/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "disk-filltest"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "bingmann"; + repo = "disk-filltest"; + rev = "v${version}"; + sha256 = "1vcb43hdln7xlklz1n0fsfp5x1j9pn829wbad4b110hrc7nwrnvm"; + }; + + preBuild = '' + substituteInPlace Makefile --replace 'prefix = /usr/local' 'prefix = $(out)' + ''; + + postInstall = '' + install -D -m0644 -t $out/share/doc COPYING README + mkdir -p $out/share/man; mv $out/man1 $out/share/man + ''; + + meta = with stdenv.lib; { + description = "Simple program to detect bad disks by filling them with random data"; + longDescription = '' + disk-filltest is a tool to check storage disks for coming + failures by write files with pseudo-random data to the current + directory until the disk is full, read the files again + and verify the sequence written. It also can measure + read/write speed while filling the disk. + ''; + homepage = "https://panthema.net/2013/disk-filltest"; + license = licenses.gpl3; + maintainers = with maintainers; [ caadar ]; + platforms = platforms.all; + }; + +} diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/tools/system/dog/default.nix index 8bb84c562b643..5063e3555bb1d 100644 --- a/pkgs/tools/system/dog/default.nix +++ b/pkgs/tools/system/dog/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://lwn.net/Articles/421072/; + homepage = "http://lwn.net/Articles/421072/"; description = "cat replacement"; license = licenses.gpl2Plus; maintainers = with maintainers; [ qknight ]; diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index a248732484974..3323ac2489749 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager"; - homepage = https://github.com/rhboot/efibootmgr; + homepage = "https://github.com/rhboot/efibootmgr"; license = licenses.gpl2; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/envconsul/default.nix b/pkgs/tools/system/envconsul/default.nix index c2f5556cec67b..09175f14609f3 100644 --- a/pkgs/tools/system/envconsul/default.nix +++ b/pkgs/tools/system/envconsul/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/hashicorp/envconsul/; + homepage = "https://github.com/hashicorp/envconsul/"; description = "Read and set environmental variables for processes from Consul"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix index 1ba2b78e8609f..02f92a198909a 100644 --- a/pkgs/tools/system/evemu/default.nix +++ b/pkgs/tools/system/evemu/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { # We could have downloaded a release tarball from cgit, but it changes hash # each time it is downloaded :/ src = fetchgit { - url = git://git.freedesktop.org/git/evemu; + url = "git://git.freedesktop.org/git/evemu"; rev = "refs/tags/v${version}"; sha256 = "1m38fxwy2s82vb2qm9aqxinws12akmqqq7q66is931lc3awqkbah"; }; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Records and replays device descriptions and events to emulate input devices through the kernel's input system"; - homepage = https://www.freedesktop.org/wiki/Evemu/; - repositories.git = git://git.freedesktop.org/git/evemu; + homepage = "https://www.freedesktop.org/wiki/Evemu/"; + repositories.git = "git://git.freedesktop.org/git/evemu"; license = licenses.gpl2; maintainers = [ maintainers.amorsillo ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index d6f7a782824d1..0d2d704ea6c20 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.14.9"; + version = "3.14.10"; src = fetchFromGitHub { - sha256 = "1c8g4fg8c9x816xx3m33njfn9h6ksl8g4rmc20y39v1y9jn72vxk"; + sha256 = "0yblz8k30kv9jpfs6bd0hcx5nfr23l7nxyw0q7p7c4ygkx3mb1ji"; rev = version; repo = pname; owner = "puppetlabs"; diff --git a/pkgs/tools/system/fakechroot/default.nix b/pkgs/tools/system/fakechroot/default.nix index 77ba6689b0d49..fc74644ab0323 100644 --- a/pkgs/tools/system/fakechroot/default.nix +++ b/pkgs/tools/system/fakechroot/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; meta = with stdenv.lib; { - homepage = https://github.com/dex4er/fakechroot; + homepage = "https://github.com/dex4er/fakechroot"; description = "Give a fake chroot environment through LD_PRELOAD"; license = licenses.lgpl21; maintainers = with maintainers; [offline]; diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index 934b74dd3846d..c5765609a278e 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://salsa.debian.org/clint/fakeroot; + homepage = "https://salsa.debian.org/clint/fakeroot"; description = "Give a fake root environment through LD_PRELOAD"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix index 3dd84aa8a9cc5..59daac89bd440 100644 --- a/pkgs/tools/system/fcron/default.nix +++ b/pkgs/tools/system/fcron/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description="A command scheduler with extended capabilities over cron and anacron"; - homepage = http://fcron.free.fr; + homepage = "http://fcron.free.fr"; license = licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix index 0aea3ced3b527..423b00bd54394 100644 --- a/pkgs/tools/system/fdisk/default.nix +++ b/pkgs/tools/system/fdisk/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/fdisk/; + homepage = "https://www.gnu.org/software/fdisk/"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/system/foreman/default.nix b/pkgs/tools/system/foreman/default.nix index e97d71f5c84ab..ce2f201762902 100644 --- a/pkgs/tools/system/foreman/default.nix +++ b/pkgs/tools/system/foreman/default.nix @@ -7,7 +7,7 @@ bundlerEnv { meta = with lib; { description = "Process manager for applications with multiple components"; - homepage = https://github.com/ddollar/foreman; + homepage = "https://github.com/ddollar/foreman"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; platforms = ruby.meta.platforms; diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix index be33f45ca9dc8..96c54513ef1b1 100644 --- a/pkgs/tools/system/foremost/default.nix +++ b/pkgs/tools/system/foremost/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { look at the data structures of a given file format allowing for a more reliable and faster recovery. ''; - homepage = http://foremost.sourceforge.net/; + homepage = "http://foremost.sourceforge.net/"; license = licenses.publicDomain; platforms = platforms.linux; }; diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index b057c80c74ecb..35fb630d23802 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline, libgpgerror }: stdenv.mkDerivation rec { - version = "1.6.4"; + version = "1.6.5"; pname = "freeipmi"; src = fetchurl { url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz"; - sha256 = "0g0s4iwx0ng4rv7hp5cc3kkx4drahsc89981gwjblf04lfavppv5"; + sha256 = "1ncf1s84752xaq07h36wrxa5ww1167s2bizkww0igxv8djyddwk1"; }; buildInputs = [ libgcrypt readline libgpgerror ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { info. ''; - homepage = https://www.gnu.org/software/freeipmi/; + homepage = "https://www.gnu.org/software/freeipmi/"; downloadPage = "https://www.gnu.org/software/freeipmi/download.html"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index 4adc81608293a..6fdfd6e719096 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lm"; meta = with stdenv.lib; { - homepage = http://gdmap.sourceforge.net; + homepage = "http://gdmap.sourceforge.net"; description = "Recursive rectangle map of disk usage"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix index c0dd2c89d2f1f..48c68f8d2f2ca 100644 --- a/pkgs/tools/system/gohai/default.nix +++ b/pkgs/tools/system/gohai/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { license = licenses.mit; maintainers = [ maintainers.tazjin ]; platforms = platforms.unix; - repositories.git = git://github.com/DataDog/gohai.git; + repositories.git = "git://github.com/DataDog/gohai.git"; longDescription = '' Gohai is a tool which collects an inventory of system diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index 44ef60c70f384..893e3e7e9833d 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotop"; - version = "3.5.0"; + version = "3.5.2"; src = fetchFromGitHub { owner = "xxxserxxx"; repo = pname; rev = "v${version}"; - sha256 = "01a2y2604dh2zfy5f2fxr306id0fbq0df91fpz2m8w7rpaszd6xr"; + sha256 = "0d08pi213nzvj4vhd2sbri39qlxa7iazc8bcrikhmmr0pghjfwhn"; }; - modSha256 = "1gbpxq2vyshln97gij5y9qsjyf3mkwfqwwhikc0cck3mnwiv87dd"; + vendorSha256 = "1ais548gii4q7xzysnw2ykjxyzb7azszsqdlp9hgiwp0bax9nj2n"; meta = with stdenv.lib; { description = "A terminal based graphical activity monitor inspired by gtop and vtop"; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = [ maintainers.magnetophon ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 72d9d70ed8bbc..613f63c3f0441 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks"; license = licenses.gpl2; - homepage = https://www.rodsbooks.com/gdisk/; + homepage = "https://www.rodsbooks.com/gdisk/"; platforms = platforms.all; }; } diff --git a/pkgs/tools/system/gt5/default.nix b/pkgs/tools/system/gt5/default.nix index ea121b0e43c99..61d25f414bbd3 100644 --- a/pkgs/tools/system/gt5/default.nix +++ b/pkgs/tools/system/gt5/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "A diff-capable 'du' browser"; - homepage = http://gt5.sourceforge.net/; + homepage = "http://gt5.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/system/hardinfo/default.nix b/pkgs/tools/system/hardinfo/default.nix index 6c5019847ff3c..fd8fb08cf2938 100644 --- a/pkgs/tools/system/hardinfo/default.nix +++ b/pkgs/tools/system/hardinfo/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://hardinfo.org/; + homepage = "http://hardinfo.org/"; description = "Display information about your hardware and operating system"; license = licenses.gpl2; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index d1d2b7a3e7698..c0c6aa72d3ba2 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Consolidate duplicate files via hardlinks"; - homepage = https://pagure.io/hardlink; - repositories.git = https://src.fedoraproject.org/cgit/rpms/hardlink.git; + homepage = "https://pagure.io/hardlink"; + repositories.git = "https://src.fedoraproject.org/cgit/rpms/hardlink.git"; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/tools/system/hiera-eyaml/default.nix b/pkgs/tools/system/hiera-eyaml/default.nix index 33d97aa7d6b6d..be6fb1c7462ab 100644 --- a/pkgs/tools/system/hiera-eyaml/default.nix +++ b/pkgs/tools/system/hiera-eyaml/default.nix @@ -9,7 +9,7 @@ bundlerEnv { meta = with lib; { description = "Per-value asymmetric encryption of sensitive data for Hiera"; - homepage = https://github.com/TomPoulton/hiera-eyaml; + homepage = "https://github.com/TomPoulton/hiera-eyaml"; license = licenses.mit; maintainers = with maintainers; [ benley nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix index fcdcc23961b5e..eb96c3f46132a 100644 --- a/pkgs/tools/system/honcho/default.nix +++ b/pkgs/tools/system/honcho/default.nix @@ -43,7 +43,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A Python clone of Foreman, a tool for managing Procfile-based applications"; license = licenses.mit; - homepage = https://github.com/nickstenning/honcho; + homepage = "https://github.com/nickstenning/honcho"; maintainers = with maintainers; [ benley ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 1b68273a57008..c9adf5377e233 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An interactive process viewer for Linux"; - homepage = https://hisham.hm/htop/; + homepage = "https://hisham.hm/htop/"; license = licenses.gpl2Plus; platforms = with platforms; linux ++ freebsd ++ openbsd ++ darwin; maintainers = with maintainers; [ rob relrod ]; diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index b8bbe09fcb730..6b6aa40a0f732 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.69"; + version = "21.70"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "01lmxyqhx092ahbls7z9gwgmsinlqcv8zb7xvklbwyhzy5c02fxx"; + sha256 = "13vvsxj06wy86m7fy6bwy63ga49a2k4chdnk8jj3klj2cnh7ql8z"; }; patchPhase = '' diff --git a/pkgs/tools/system/idle3tools/default.nix b/pkgs/tools/system/idle3tools/default.nix index d1631776d3939..fa5234d8cbc3c 100644 --- a/pkgs/tools/system/idle3tools/default.nix +++ b/pkgs/tools/system/idle3tools/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://idle3-tools.sourceforge.net/; + homepage = "http://idle3-tools.sourceforge.net/"; description = "Tool to get/set the infamous idle3 timer in WD HDDs"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/tools/system/illum/default.nix index 767fccbd38828..41fce9b9b912c 100644 --- a/pkgs/tools/system/illum/default.nix +++ b/pkgs/tools/system/illum/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/jmesmon/illum; + homepage = "https://github.com/jmesmon/illum"; description = "Daemon that wires button presses to screen backlight level"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.dancek ]; diff --git a/pkgs/tools/system/incron/default.nix b/pkgs/tools/system/incron/default.nix index 2afbed2f9bb20..4b5709e62270e 100644 --- a/pkgs/tools/system/incron/default.nix +++ b/pkgs/tools/system/incron/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A cron-like daemon which handles filesystem events."; - homepage = https://github.com/ar-/incron; + homepage = "https://github.com/ar-/incron"; license = licenses.gpl2; maintainers = [ maintainers.aanderse ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index f5b5d4ef7a2ad..3645650161855 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -1,14 +1,34 @@ -{ stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper +, ps, dnsutils # dig is recommended for multiple categories +, withRecommends ? false # Install (almost) all recommended tools (see --recommends) +, withRecommendedSystemPrograms ? withRecommends, utillinuxMinimal, dmidecode +, file, hddtemp, iproute, ipmitool, usbutils, kmod, lm_sensors, smartmontools +, binutils, tree, upower +, withRecommendedDisplayInformationPrograms ? withRecommends, glxinfo, xorg +}: -stdenv.mkDerivation rec { +let + prefixPath = programs: + "--prefix PATH ':' '${stdenv.lib.makeBinPath programs}'"; + recommendedSystemPrograms = lib.optionals withRecommendedSystemPrograms [ + utillinuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod + lm_sensors smartmontools binutils tree upower + ]; + recommendedDisplayInformationPrograms = lib.optionals + withRecommendedDisplayInformationPrograms + ([ glxinfo ] ++ (with xorg; [ xdpyinfo xprop xrandr ])); + programs = [ ps dnsutils ] # Core programs + ++ recommendedSystemPrograms + ++ recommendedDisplayInformationPrograms; +in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.0.38-1"; + version = "3.1.00-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "1qw3sxgd3ly916bzzl3873s3flngwd3vh57slw0shsj7ivz8bfnm"; + sha256 = "0md6yfd297l8695g0rsbs4mm74dc3k00rfjl4x2n4i33mkylp6qa"; }; buildInputs = [ perl makeWrapper ]; @@ -17,13 +37,21 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp inxi $out/bin/ wrapProgram $out/bin/inxi \ - --set PERL5LIB "${perlPackages.makePerlPath (with perlPackages; [ CpanelJSONXS ])}" + --set PERL5LIB "${perlPackages.makePerlPath (with perlPackages; [ CpanelJSONXS ])}" \ + ${prefixPath programs} mkdir -p $out/share/man/man1 cp inxi.1 $out/share/man/man1/ ''; meta = with stdenv.lib; { description = "A full featured CLI system information tool"; + longDescription = '' + inxi is a command line system information script built for console and + IRC. It is also used a debugging tool for forum technical support to + quickly ascertain users' system configurations and hardware. inxi shows + system hardware, CPU, drivers, Xorg, Desktop, Kernel, gcc version(s), + Processes, RAM usage, and a wide variety of other useful information. + ''; homepage = "https://smxi.org/docs/inxi.htm"; changelog = "https://github.com/smxi/inxi/blob/${version}/inxi.changelog"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix index 6acd41046ceb8..7b65739c1a8d9 100644 --- a/pkgs/tools/system/ioping/default.nix +++ b/pkgs/tools/system/ioping/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; license = licenses.gpl3Plus; - homepage = https://github.com/koct9i/ioping; + homepage = "https://github.com/koct9i/ioping"; }; } diff --git a/pkgs/tools/system/iops/default.nix b/pkgs/tools/system/iops/default.nix index 7e6854afe627b..cf34cb115f142 100644 --- a/pkgs/tools/system/iops/default.nix +++ b/pkgs/tools/system/iops/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { Iops lets you measure how many I/O operations per second a storage device can perform. Usefull for determing e.g. the best RAID-setting of your storage device. ''; - homepage = http://www.vanheusden.com/iops/; + homepage = "http://www.vanheusden.com/iops/"; license = licenses.gpl2; maintainers = with maintainers; [ davidak ]; platforms = platforms.linux; # build problems on Darwin diff --git a/pkgs/tools/system/ior/default.nix b/pkgs/tools/system/ior/default.nix index 6217f601121c6..eff85589a1eb8 100644 --- a/pkgs/tools/system/ior/default.nix +++ b/pkgs/tools/system/ior/default.nix @@ -1,27 +1,23 @@ -{ stdenv, fetchurl, openmpi, automake, autoconf, perl }: +{ stdenv, fetchFromGitHub, openmpi, perl, autoreconfHook }: -let - version = "3.0.1"; - sha256 = "039rh4z3lsj4vqjsqgakk0b7dkrdrkkzj0p1cjikpc9gn36zpghc"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ior"; - inherit version; + version = "3.2.1"; - src = fetchurl { - url = "https://github.com/LLNL/ior/archive/${version}.tar.gz"; - inherit sha256; + src = fetchFromGitHub { + owner = "hpc"; + repo = pname; + rev = version; + sha256 = "036cg75c5vq6kijfv8f918vpm9sf1h7lyg6xr9fba7n0dwbbmycv"; }; - buildInputs = [ openmpi automake autoconf perl ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ openmpi perl ]; enableParallelBuilding = true; - preConfigure = "./bootstrap"; - meta = with stdenv.lib; { - homepage = https://www.nersc.gov/users/computational-systems/cori/nersc-8-procurement/trinity-nersc-8-rfp/nersc-8-trinity-benchmarks/ior/; + homepage = "https://ior.readthedocs.io/en/latest/"; description = "Parallel file system I/O performance test"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 2b6479198c97a..b5da2db67fe8b 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { meta = with lib; { description = ''Command-line interface to IPMI-enabled devices''; license = licenses.bsd3; - homepage = https://sourceforge.net/projects/ipmitool/; + homepage = "https://sourceforge.net/projects/ipmitool/"; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/tools/system/journalwatch/default.nix index e0aaee31217cc..b41196b85c914 100644 --- a/pkgs/tools/system/journalwatch/default.nix +++ b/pkgs/tools/system/journalwatch/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "journalwatch is a tool to find error messages in the systemd journal."; - homepage = https://github.com/The-Compiler/journalwatch; + homepage = "https://github.com/The-Compiler/journalwatch"; license = licenses.gpl3Plus; maintainers = with maintainers; [ florianjacob ]; }; diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/tools/system/jump/default.nix index 3aa0cb242a942..fe0138783d3b1 100644 --- a/pkgs/tools/system/jump/default.nix +++ b/pkgs/tools/system/jump/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0mph3bqfjnw3yf0a6ml3ccmkr1shviwvvq4d04ky4gppfy6z51jy"; }; - modSha256 = "1fzsm85c31vkdw80kijxmjhk8jyhjz8b21npgks2qrnizhm6iaf8"; + vendorSha256 = "1500vim2lmkkls758pwhlx3piqbw6ap0nnhdwz9pcxih4s4as2nk"; outputs = [ "out" "man"]; postInstall = '' @@ -32,9 +32,9 @@ buildGoModule rec { navigational habits by keeping track of the directories you visit. It strives to give you the best directory for the shortest search term. ''; - homepage = https://github.com/gsamokovarov/jump; + homepage = "https://github.com/gsamokovarov/jump"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ sondr3 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/system/kmon/default.nix b/pkgs/tools/system/kmon/default.nix index c1e511fa0c2ca..afb59b25059e6 100644 --- a/pkgs/tools/system/kmon/default.nix +++ b/pkgs/tools/system/kmon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kmon"; - version = "1.0.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "0kmkcs13cccmjjfbl25bs3m54zcjcs38fiv84q0vy09a4dnx3gn8"; + sha256 = "1l2zdp5f9spkfx1dhxyj32791kgvc8hqjr1kk75vds4c1wgwq8gk"; }; - cargoSha256 = "0l1yq9k6lyk0ww1nzk93axylgrwipkmmqh9r6fq4a31wjlblrkkb"; + cargoSha256 = "08a7gr70a3rh7a52gglck16qlwngb6ap723lg3b3mxmkyigdf6i6"; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/tools/system/krakenx/default.nix b/pkgs/tools/system/krakenx/default.nix index c6866264a9b05..e5b1e3ec1c94e 100644 --- a/pkgs/tools/system/krakenx/default.nix +++ b/pkgs/tools/system/krakenx/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Python script to control NZXT cooler Kraken X52/X62/X72"; - homepage = https://github.com/KsenijaS/krakenx; + homepage = "https://github.com/KsenijaS/krakenx"; license = licenses.gpl2; maintainers = [ maintainers.willibutz ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/ledmon/default.nix b/pkgs/tools/system/ledmon/default.nix index ab11fc9e27f8e..6775a4711261a 100644 --- a/pkgs/tools/system/ledmon/default.nix +++ b/pkgs/tools/system/ledmon/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/intel/ledmon; + homepage = "https://github.com/intel/ledmon"; description = "Enclosure LED Utilities"; platforms = platforms.linux; license = with licenses; [ gpl2 ]; diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix index a12d70315d912..805a70c74e9e7 100644 --- a/pkgs/tools/system/localtime/default.nix +++ b/pkgs/tools/system/localtime/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { makeFlags = [ "PREFIX=${placeholder "out"}" - "BINDIR=${placeholder "bin"}/bin" + "BINDIR=${placeholder "out"}/bin" ]; buildPhase = '' @@ -30,7 +30,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A daemon for keeping the system timezone up-to-date based on the current location"; - homepage = https://github.com/Stebalien/localtime; + homepage = "https://github.com/Stebalien/localtime"; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix index d51df4f408a45..71edfde9a0b3a 100644 --- a/pkgs/tools/system/logcheck/default.nix +++ b/pkgs/tools/system/logcheck/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { Logcheck helps spot problems and security violations in your logfiles automatically and will send the results to you by e-mail. Logcheck was part of the Abacus Project of security tools, but this version has been rewritten. ''; - homepage = https://salsa.debian.org/debian/logcheck; + homepage = "https://salsa.debian.org/debian/logcheck"; license = licenses.gpl2; maintainers = [ maintainers.bluescreen303 ]; }; diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix index 2ea7b11677ed3..8d2febbeb8afb 100644 --- a/pkgs/tools/system/lr/default.nix +++ b/pkgs/tools/system/lr/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/chneukirchen/lr; + homepage = "https://github.com/chneukirchen/lr"; description = "List files recursively"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index 29c20ad8d5341..3d1a6ace08e4a 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://ezix.org/project/wiki/HardwareLiSter; + homepage = "https://ezix.org/project/wiki/HardwareLiSter"; description = "Provide detailed information on the hardware configuration of the machine"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom ]; diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix index 1831041063b62..ca515cbdfd832 100644 --- a/pkgs/tools/system/mcron/default.nix +++ b/pkgs/tools/system/mcron/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { when jobs should be run. Mcron was written by Dale Mellor. ''; - homepage = https://www.gnu.org/software/mcron/; + homepage = "https://www.gnu.org/software/mcron/"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/system/memtester/default.nix b/pkgs/tools/system/memtester/default.nix index ff6ccb534fb9a..7b065c6cfa88f 100644 --- a/pkgs/tools/system/memtester/default.nix +++ b/pkgs/tools/system/memtester/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A userspace utility for testing the memory subsystem for faults"; - homepage = http://pyropus.ca/software/memtester/; + homepage = "http://pyropus.ca/software/memtester/"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.unix; diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index f4238e272480c..7cec79ff25ea2 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://mmonit.com/monit/; + homepage = "http://mmonit.com/monit/"; description = "Monitoring system"; license = stdenv.lib.licenses.agpl3; maintainers = with stdenv.lib.maintainers; [ raskin wmertens ]; diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/tools/system/mq-cli/default.nix index afde8b8f9d276..a29e1630116df 100644 --- a/pkgs/tools/system/mq-cli/default.nix +++ b/pkgs/tools/system/mq-cli/default.nix @@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ tazjin ]; platforms = platforms.linux; - repositories.git = git://github.com/aprilabank/mq-cli.git; + repositories.git = "git://github.com/aprilabank/mq-cli.git"; }; } diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index dcf1177e48f82..5d856e7953007 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -14,14 +14,14 @@ with stdenv.lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.21.0"; + version = "1.22.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "08gxwxvg816hj7sxsb8s97ny2562xri9nx0w2zx7xsssp22grawk"; + sha256 = "1hliv4d3pa8c3inz0bcl6nngfmp8vwnvh7smbwqiq7isfjijbpr6"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -41,8 +41,8 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; postInstall = '' - ln -s ${go-d-plugin.bin}/lib/netdata/conf.d/* $out/lib/netdata/conf.d - ln -s ${go-d-plugin.bin}/bin/godplugin $out/libexec/netdata/plugins.d/go.d.plugin + ln -s ${go-d-plugin}/lib/netdata/conf.d/* $out/lib/netdata/conf.d + ln -s ${go-d-plugin}/bin/godplugin $out/libexec/netdata/plugins.d/go.d.plugin '' + optionalString (!stdenv.isDarwin) '' # rename this plugin so netdata will look for setuid wrapper mv $out/libexec/netdata/plugins.d/apps.plugin \ @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { meta = { description = "Real-time performance monitoring tool"; - homepage = https://my-netdata.io/; + homepage = "https://my-netdata.io/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.lethalman ]; diff --git a/pkgs/tools/system/netdata/deps.nix b/pkgs/tools/system/netdata/deps.nix deleted file mode 100644 index 10d933c5a5684..0000000000000 --- a/pkgs/tools/system/netdata/deps.nix +++ /dev/null @@ -1,534 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/OneOfOne/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/OneOfOne/xxhash"; - rev = "v1.2.2"; - sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6"; - }; - } - { - goPackagePath = "github.com/Wing924/ltsv"; - fetch = { - type = "git"; - url = "https://github.com/Wing924/ltsv"; - rev = "v0.3.1"; - sha256 = "05jl8myq16y847wmx6cmlxl50z86cpiv9pq4fflmac7lp4hf67m3"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "fb15b899a751"; - sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "c3de453c63f4"; - sha256 = "0js37zlgv37y61j4a2d46jh72xm5kxmpaiw0ya9v944bjpc386my"; - }; - } - { - goPackagePath = "github.com/axiomhq/hyperloglog"; - fetch = { - type = "git"; - url = "https://github.com/axiomhq/hyperloglog"; - rev = "a4c4c47bc57f"; - sha256 = "0pwjxyhn0ms3n1q0hbqb5gz2lxb28giflkya9ck2lwfyd28y254s"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "v1.0.0"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; - }; - } - { - goPackagePath = "github.com/cespare/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/cespare/xxhash"; - rev = "v1.1.0"; - sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/davecgh/go-xdr"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-xdr"; - rev = "e6a2ba005892"; - sha256 = "0vifrz4iil4r7k8sz5iqlfbh80ysgs5abp2simgyhsbrkxrrsrrd"; - }; - } - { - goPackagePath = "github.com/dgryski/go-metro"; - fetch = { - type = "git"; - url = "https://github.com/dgryski/go-metro"; - rev = "280f6062b5bc"; - sha256 = "1a82ksyklh1lcpgzh07ik78pgz4m0b3q921yfglafd7v0ld6xljr"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.9.0"; - sha256 = "09038mnw705h7isbjp8dzgp2i04bp5rqkmifxvwc5xkh75s00qpw"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.4.0"; - sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "v1.5.0"; - sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.1.1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.2"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "6a5e28554805"; - sha256 = "0q1zwabj77agp1yljqjlf31ip8c6lr25xwqlw3zzfgha81y45lv0"; - }; - } - { - goPackagePath = "github.com/influxdata/influxdb"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/influxdb"; - rev = "v1.7.6"; - sha256 = "07abzhmsgj7krmhf7jis50a4fc4w29h48nyzgvrll5lz3cax979q"; - }; - } - { - goPackagePath = "github.com/jessevdk/go-flags"; - fetch = { - type = "git"; - url = "https://github.com/jessevdk/go-flags"; - rev = "v1.4.0"; - sha256 = "0algnnigph27spgn655zm4723yfjxjjvlf4k14z9drj3682df25a"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "v1.1.6"; - sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.7"; - sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "v1.1.27"; - sha256 = "0fpd9alvhzrkb1c31n4lrxlpv1nlhy51w1yg39xxb3mjmrb7lby1"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.1.0"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "v1.0.1"; - sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - }; - } - { - goPackagePath = "github.com/netdata/go-orchestrator"; - fetch = { - type = "git"; - url = "https://github.com/netdata/go-orchestrator"; - rev = "c793edba0e8f"; - sha256 = "0bqvqdkd510yl3c9f86h6ii7r1l5sjx0x655lzgv6cahq90k3pr7"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.1"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v1.0.0"; - sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "v0.2.0"; - sha256 = "0jffnz94d6ff39fr96b5w8i8yk26pwnrfggzz8jhi8k0yihg2c9d"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.9.0"; - sha256 = "0gvfb622fjybvhwh8rjpgnz2zxrz9cdc1kzn40hk4hyqg5435w3b"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "v0.0.2"; - sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; - }; - } - { - goPackagePath = "github.com/prometheus/prometheus"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/prometheus"; - rev = "v2.5.0"; - sha256 = "07sgsmazjr5lgkbaz63qanpg536pyfb7asljz67rqz6c47ngzifp"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.4.2"; - sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; - }; - } - { - goPackagePath = "github.com/spaolacci/murmur3"; - fetch = { - type = "git"; - url = "https://github.com/spaolacci/murmur3"; - rev = "f09979ecbc72"; - sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.4.0"; - sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; - }; - } - { - goPackagePath = "github.com/vmware/govmomi"; - fetch = { - type = "git"; - url = "https://github.com/vmware/govmomi"; - rev = "v0.22.1"; - sha256 = "1z4am6143jrrls0023flnqgadm1z9p60w09cp1j5pnslm60vvw78"; - }; - } - { - goPackagePath = "github.com/vmware/vmw-guestinfo"; - fetch = { - type = "git"; - url = "https://github.com/vmware/vmw-guestinfo"; - rev = "25eff159a728"; - sha256 = "1nag33p0i6zxh25kf0hpdsc3n1agrjsncdqqj8sxd2q1zf7lhf5j"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "87dc89f01550"; - sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "c90efee705ee"; - sha256 = "0i5md645rmcy5z5ij9ng428k9rz4g3k1kjy3blsq1264rn426gdf"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "aa69164e4478"; - sha256 = "1w0r52a9csj5vkhysvdx6l5v2dq1lnmvs95ffhpibypjha7lq214"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "2837fb4f24fe"; - sha256 = "01wrq33y1bjkk0kpxhs59iq7i95llhs2f8k0v5mr3f6wd46v4h5b"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "49a3e744a425"; - sha256 = "0xx4gv9wpv36crk7gv7imf5vzzs2mz7zla2q2jkck3xnzff8fw3v"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "1b5146add898"; - sha256 = "0w2akj91krxjag0xdhsg78470888nicc5ismc2ap9jqpss6v1zih"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.7"; - sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj"; - }; - } - { - goPackagePath = "layeh.com/radius"; - fetch = { - type = "git"; - url = "https://github.com/layeh/radius"; - rev = "890bc1058917"; - sha256 = "01ncxwmlj5xjz4kd4pbp77xqqgixip492ilczk7ac0fivjcvdnb3"; - }; - } -] diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index 0e1de1bbd8e7f..2e397da8a817c 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -1,30 +1,29 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "netdata-go.d.plugin"; - version = "0.15.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - sha256 = "0v732mndhgrbqiwsdndqd08pvgbvl4ffn5rqbyv7iw1dwwr08f67"; + sha256 = "15h4075lwqh58ssdgyq34jj8r4dga0sz7h18dzy4nir75p8a0s7b"; }; - goPackagePath = "github.com/netdata/go.d.plugin"; + vendorSha256 = "1pw9pb3rdjzf2dx1p1jiqxs7qhlpjki7fy74nyxza5wzrv4317sj"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; postInstall = '' - mkdir -p $bin/lib/netdata/conf.d - cp -r go/src/${goPackagePath}/config/* $bin/lib/netdata/conf.d + mkdir -p $out/lib/netdata/conf.d + cp -r config/* $out/lib/netdata/conf.d ''; - goDeps = ./deps.nix; - meta = with lib; { description = "Netdata orchestrator for data collection modules written in go"; - homepage = https://github.com/netdata/go.d.plugin; + homepage = "https://github.com/netdata/go.d.plugin"; license = licenses.gpl3; - platforms = platforms.unix; maintainers = [ maintainers.lethalman ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix index 89c84c8c9ca8e..9e6522b202849 100644 --- a/pkgs/tools/system/nq/default.nix +++ b/pkgs/tools/system/nq/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { description = "Unix command line queue utility"; - homepage = https://github.com/chneukirchen/nq; + homepage = "https://github.com/chneukirchen/nq"; license = licenses.publicDomain; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index 0e7a5d4a3111e..cd9ec7c7082d2 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A (h)top like like task monitor for NVIDIA GPUs"; - homepage = https://github.com/Syllo/nvtop; + homepage = "https://github.com/Syllo/nvtop"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ willibutz ]; diff --git a/pkgs/tools/system/opencl-info/default.nix b/pkgs/tools/system/opencl-info/default.nix index d1c3d0ec6c0c0..a5013a688855a 100644 --- a/pkgs/tools/system/opencl-info/default.nix +++ b/pkgs/tools/system/opencl-info/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A tool to dump OpenCL platform/device information"; - homepage = https://github.com/marchv/opencl-info; + homepage = "https://github.com/marchv/opencl-info"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 51cfaf9f333c0..e76ab496ef98a 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8"; meta = with stdenv.lib; { - homepage = http://mj.ucw.cz/pciutils.html; + homepage = "http://mj.ucw.cz/pciutils.html"; description = "A collection of programs for inspecting and manipulating configuration of PCI devices"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix index 5a1bad1092dbf..5febbcb6ef665 100644 --- a/pkgs/tools/system/pcstat/default.nix +++ b/pkgs/tools/system/pcstat/default.nix @@ -17,7 +17,7 @@ buildGoPackage { meta = with stdenv.lib; { description = "Page Cache stat: get page cache stats for files on Linux."; - homepage = https://github.com/tobert/pcstat; + homepage = "https://github.com/tobert/pcstat"; license = licenses.asl20; maintainers = with maintainers; [ aminechikhaoui ]; }; diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 9a4a223855848..54e88f5d06994 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -11,17 +11,16 @@ stdenv.mkDerivation { pname = "plan9port"; - version = "2019-02-25"; + version = "2020-01-08"; src = fetchFromGitHub { owner = "9fans"; repo = "plan9port"; - rev = "047fd921744f39a82a86d9370e03f7af511e6e84"; - sha256 = "1lp17948q7vpl8rc2bf5a45bc8jqyj0s3zffmks9r25ai42vgb43"; + rev = "cc3d97d52a72d7eaceb5b636bcdf81c3e19f7a2e"; + sha256 = "0gb55kj0gzx1kdhiwcrbr7xcgz1im21dyxgxhfhh6d0q9rw0c17g"; }; patches = [ - ./tmpdir.patch ./darwin-sw_vers.patch ./darwin-cfframework.patch ]; @@ -81,7 +80,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://9fans.github.io/plan9port/; + homepage = "https://9fans.github.io/plan9port/"; description = "Plan 9 from User Space"; longDescription = '' Plan 9 from User Space (aka plan9port) is a port of many Plan 9 programs @@ -90,7 +89,7 @@ stdenv.mkDerivation { license = licenses.lpl-102; maintainers = with maintainers; [ AndersonTorres bbarker ftrvxmtrx kovirobi ]; - platforms = platforms.unix; + platforms = remove "aarch64-linux" platforms.unix; }; } # TODO: investigate the mouse chording support patch diff --git a/pkgs/tools/system/plan9port/tmpdir.patch b/pkgs/tools/system/plan9port/tmpdir.patch deleted file mode 100644 index e8200a177a274..0000000000000 --- a/pkgs/tools/system/plan9port/tmpdir.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c762625549ff367b54bcd8281d1ce248a69b4401 Mon Sep 17 00:00:00 2001 -From: Jason Felice <jason.m.felice@gmail.com> -Date: Mon, 1 Jul 2019 15:01:21 -0400 -Subject: [PATCH] Use $TMPDIR if available - -NixOS sandboxed builds (at least on Mac) don't have access to /tmp, -and this should be better POSIX. ---- - bin/9c | 2 +- - bin/9l | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/bin/9c b/bin/9c -index 3ffb716c..88c47887 100755 ---- a/bin/9c -+++ b/bin/9c -@@ -133,7 +133,7 @@ case "$tag" in - esac - - # N.B. Must use temp file to avoid pipe; pipe loses status. --xtmp=/tmp/9c.$$.$USER.out -+xtmp=${TMPDIR-/tmp}/9c.$$.$USER.out - $cc -DPLAN9PORT -I$PLAN9/include $cflags "$@" 2>$xtmp - status=$? - quiet $xtmp -diff --git a/bin/9l b/bin/9l -index 6195815f..717a540a 100755 ---- a/bin/9l -+++ b/bin/9l -@@ -346,7 +346,7 @@ then - echo $ld -L$PLAN9/lib "$@" $libsl $extralibs $frameworks - fi - --xtmp=/tmp/9l.$$.$USER.out -+xtmp="${TMPDIR-/tmp}/9l.$$.$USER.out" - xxout() { - sed 's/.*: In function `[^:]*: *//' $xtmp | egrep . | - egrep -v 'is (often|almost always) misused|is dangerous, better use|text-based stub' --- -2.21.0 - diff --git a/pkgs/tools/system/procodile/default.nix b/pkgs/tools/system/procodile/default.nix index 3ae80a312ed62..2751601b39b96 100644 --- a/pkgs/tools/system/procodile/default.nix +++ b/pkgs/tools/system/procodile/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Run processes in the background (and foreground) on Mac & Linux from a Procfile (for production and/or development environments)"; - homepage = https://adam.ac/procodile; + homepage = "https://adam.ac/procodile"; license = with licenses; mit; maintainers = with maintainers; [ ravloony manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 5ff8ff95f8ae6..06147df093e65 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://proot-me.github.io; + homepage = "https://proot-me.github.io"; description = "User-space implementation of chroot, mount --bind and binfmt_misc"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix index bde4429c48131..45a33a1adb7bb 100644 --- a/pkgs/tools/system/ps_mem/default.nix +++ b/pkgs/tools/system/ps_mem/default.nix @@ -15,7 +15,7 @@ in pythonPackages.buildPythonApplication { meta = with stdenv.lib; { description = "A utility to accurately report the in core memory usage for a program"; - homepage = https://github.com/pixelb/ps_mem; + homepage = "https://github.com/pixelb/ps_mem"; license = licenses.lgpl21; maintainers = [ maintainers.gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix index 83d281642bd36..49d2747a33e16 100644 --- a/pkgs/tools/system/psensor/default.nix +++ b/pkgs/tools/system/psensor/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Graphical hardware monitoring application for Linux"; - homepage = https://wpitchoune.net/psensor/; + homepage = "https://wpitchoune.net/psensor/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/tools/system/psstop/default.nix b/pkgs/tools/system/psstop/default.nix index 4d413e60c77f3..3a5ee2b058133 100644 --- a/pkgs/tools/system/psstop/default.nix +++ b/pkgs/tools/system/psstop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; meta = with stdenv.lib; { - homepage = https://github.com/clearlinux/psstop; + homepage = "https://github.com/clearlinux/psstop"; description = "Show processes' memory usage by looking into pss"; # upstream summary license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/tools/system/r10k/default.nix b/pkgs/tools/system/r10k/default.nix index 56e4e4f94faeb..43d67eddf7db9 100644 --- a/pkgs/tools/system/r10k/default.nix +++ b/pkgs/tools/system/r10k/default.nix @@ -15,7 +15,7 @@ bundlerApp { meta = with lib; { description = "Puppet environment and module deployment"; - homepage = https://github.com/puppetlabs/r10k; + homepage = "https://github.com/puppetlabs/r10k"; license = licenses.asl20; maintainers = with maintainers; [ zimbatm manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/system/rofi-systemd/default.nix b/pkgs/tools/system/rofi-systemd/default.nix index 73c1b48815595..92c13527c6fe3 100644 --- a/pkgs/tools/system/rofi-systemd/default.nix +++ b/pkgs/tools/system/rofi-systemd/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Control your systemd units using rofi"; - homepage = https://github.com/IvanMalison/rofi-systemd; + homepage = "https://github.com/IvanMalison/rofi-systemd"; maintainers = with stdenv.lib.maintainers; [ imalison ]; license = stdenv.lib.licenses.gpl3; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/pkgs/tools/system/rowhammer-test/default.nix index 64c184a612295..02462584c6508 100644 --- a/pkgs/tools/system/rowhammer-test/default.nix +++ b/pkgs/tools/system/rowhammer-test/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Test DRAM for bit flips caused by the rowhammer problem"; - homepage = https://github.com/google/rowhammer-test; + homepage = "https://github.com/google/rowhammer-test"; license = licenses.asl20; maintainers = [ maintainers.viric ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index a5ced1e325d07..1739e0ad784f1 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.2002.0"; + version = "8.2004.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - sha256 = "1y414g61j93dgm5xg0ni985a99cyag0flvv1fqn2188dhr6w31py"; + sha256 = "1n97kx6cyyzd4zh6q01fyqi2wq1ah68h95kdc109m1zhfnvxghsz"; }; #patches = [ ./fix-gnutls-detection.patch ]; diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix index 78306907079e1..a4319fd574962 100644 --- a/pkgs/tools/system/runit/default.nix +++ b/pkgs/tools/system/runit/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "UNIX init scheme with service supervision"; license = licenses.bsd3; - homepage = http://smarden.org/runit; + homepage = "http://smarden.org/runit"; maintainers = with maintainers; [ joachifm ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index a6816daae33a9..2875bca4a2ac0 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; meta = with stdenv.lib; { - homepage = https://amanusk.github.io/s-tui/; + homepage = "https://amanusk.github.io/s-tui/"; description = "Stress-Terminal UI monitoring tool"; license = licenses.gpl2; maintainers = with maintainers; [ infinisil ]; diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/tools/system/safe-rm/default.nix index 571f70e0756c1..a9fc44e8b40d8 100644 --- a/pkgs/tools/system/safe-rm/default.nix +++ b/pkgs/tools/system/safe-rm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool intended to prevent the accidental deletion of important files"; - homepage = https://launchpad.net/safe-rm; + homepage = "https://launchpad.net/safe-rm"; license = licenses.gpl3; platforms = platforms.all; maintainers = [ maintainers.koral ]; diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/tools/system/safecopy/default.nix index ce0779c0999ce..e8db6a2fd39bb 100644 --- a/pkgs/tools/system/safecopy/default.nix +++ b/pkgs/tools/system/safecopy/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { resets and other helpful low level operations on a number of other device classes. ''; - homepage = http://safecopy.sourceforge.net; + homepage = "http://safecopy.sourceforge.net"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index 7c90d41da18e1..8dbc28d3a314c 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A forensic/data recovery tool"; - homepage = https://www.sleuthkit.org/; + homepage = "https://www.sleuthkit.org/"; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.ipl10; diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 077e1326f2089..034564949c931 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools for monitoring the health of hard drives"; - homepage = https://www.smartmontools.org/; + homepage = "https://www.smartmontools.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ peti Frostman ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/tools/system/socklog/default.nix b/pkgs/tools/system/socklog/default.nix index 9f2cc22574729..cf7fbe5e9a13a 100644 --- a/pkgs/tools/system/socklog/default.nix +++ b/pkgs/tools/system/socklog/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { description = "System and kernel logging services"; - homepage = http://smarden.org/socklog/; + homepage = "http://smarden.org/socklog/"; license = licenses.publicDomain; platforms = platforms.unix; maintainers = [ maintainers.joachifm ]; diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix index e3b58a50c9251..4324fba87e774 100644 --- a/pkgs/tools/system/storebrowse/default.nix +++ b/pkgs/tools/system/storebrowse/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://viric.name/cgi-bin/storebrowse; + homepage = "http://viric.name/cgi-bin/storebrowse"; license = stdenv.lib.licenses.agpl3Plus; broken = true; }; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 6645639bcf03e..5e50c3c875313 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.11.07"; + version = "0.11.10"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1kyxkwn18y4161yyvxw3hd9xlzwlp270sn4gpnzvmr6rwxhr0nvh"; + sha256 = "0x46shnwllv5knpbxj1vj2aqmxgnfhz582crlacwsinc22n1j18i"; }; postPatch = '' diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/tools/system/supervise/default.nix index 3834b3762f03a..cbf96818f4864 100644 --- a/pkgs/tools/system/supervise/default.nix +++ b/pkgs/tools/system/supervise/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/catern/supervise; + homepage = "https://github.com/catern/supervise"; description = "A minimal unprivileged process supervisor making use of modern Linux features"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index 881fda241ed79..5d802dbed7e57 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/balabit/syslog-ng-incubator; + homepage = "https://github.com/balabit/syslog-ng-incubator"; description = "A collection of tools and modules for syslog-ng"; license = licenses.gpl2; maintainers = []; diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index ed104f3a9ba13..238c9ac1f6896 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "syslog-ng"; - version = "3.26.1"; + version = "3.27.1"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1kb2rdhfw4vcdxpvr7rcpg5ysr14ib43bfqdm3755wjdhqil48ch"; + sha256 = "1cv1kn4jpqyhlhx8w5v557jyc4b2ly2dgkv1hbb8vzgpjwy66k65"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/tools/system/testdisk/default.nix b/pkgs/tools/system/testdisk/default.nix index ad11cd2e3b65c..223d1102e0d4b 100644 --- a/pkgs/tools/system/testdisk/default.nix +++ b/pkgs/tools/system/testdisk/default.nix @@ -44,8 +44,8 @@ assert enableQt -> qwt != null; NIX_CFLAGS_COMPILE="-Wno-unused"; meta = with stdenv.lib; { - homepage = https://www.cgsecurity.org/wiki/Main_Page; - downloadPage = https://www.cgsecurity.org/wiki/TestDisk_Download; + homepage = "https://www.cgsecurity.org/wiki/Main_Page"; + downloadPage = "https://www.cgsecurity.org/wiki/TestDisk_Download"; description = "Testdisk / Photorec - Data recovery utilities"; longDescription = '' TestDisk is a powerful free data recovery software. It was primarily diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index fae772a2713fc..51a443b9bde72 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool -, pkgconfig, dbus, dbus-glib, libxml2 }: +, pkgconfig, dbus, dbus-glib, libxml2, autoconf-archive }: stdenv.mkDerivation rec { pname = "thermald"; - version = "1.9.1"; + version = "2.1"; src = fetchFromGitHub { - owner = "01org"; + owner = "intel"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "0iagc3jqpnh6q2fa1gx4wx6r8qg0556j60xr159zqg95djr4dv99"; + sha256 = "1k8svy03k57ld6p5d29i0ccrd1gics6kbyx1bkfmw9fh1bbljyf7"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool dbus dbus-glib libxml2 ]; + 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''; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Thermal Daemon"; - homepage = https://01.org/linux-thermal-daemon; + homepage = "https://01.org/linux-thermal-daemon"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix index 02ff751138246..71bb6dfb357d1 100644 --- a/pkgs/tools/system/throttled/default.nix +++ b/pkgs/tools/system/throttled/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fix for Intel CPU throttling issues"; - homepage = https://github.com/erpalma/throttled; + homepage = "https://github.com/erpalma/throttled"; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ michaelpj ]; diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix index cbb1fd88669a0..390eae4de50a3 100644 --- a/pkgs/tools/system/tm/default.nix +++ b/pkgs/tools/system/tm/default.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = http://vicerveza.homeunix.net/~viric/soft/tm/tm-0.4.1.tar.gz; + url = "http://vicerveza.homeunix.net/~viric/soft/tm/tm-0.4.1.tar.gz"; sha256 = "3b389bc03b6964ad5ffa57a344b891fdbcf7c9b2604adda723a863f83657c4a0"; }; meta = with stdenv.lib; { - homepage = http://vicerveza.homeunix.net/~viric/soft/tm; + homepage = "http://vicerveza.homeunix.net/~viric/soft/tm"; description = "Terminal mixer - multiplexer for the i/o of terminal applications"; license = licenses.gpl2; maintainers = with maintainers; [ viric ]; diff --git a/pkgs/tools/system/tre-command/default.nix b/pkgs/tools/system/tre-command/default.nix index 0cbe87ccd3778..bc0fa7ea988de 100644 --- a/pkgs/tools/system/tre-command/default.nix +++ b/pkgs/tools/system/tre-command/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "tre"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "dduan"; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1fazw2wn738iknbv54gv7qll7d4q2gy9bq1s3f3cv21cdv6bqral"; }; - cargoSha256 = "1m3ccp5ncafkifg8sxyxczsg3ja1gvq8wmgni68bgzm2lwxh2qgw"; + cargoSha256 = "16bvnwgjf3kj99d77j1pkldbasxfwy55sj9sv9vf2z6llfmzfabd"; meta = with stdenv.lib; { description = "Tree command, improved"; diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index 0163d55021733..24d11a9c0ee89 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://mama.indstate.edu/users/ice/tree/; + homepage = "http://mama.indstate.edu/users/ice/tree/"; description = "Command to produce a depth indented directory listing"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index 79ba7d8930408..4046b36381121 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://vicerveza.homeunix.net/~viric/soft/ts; + homepage = "http://vicerveza.homeunix.net/~viric/soft/ts"; description = "Task spooler - batch queue"; license = licenses.gpl2; maintainers = with maintainers; [ viric ]; diff --git a/pkgs/tools/system/tuptime/default.nix b/pkgs/tools/system/tuptime/default.nix new file mode 100644 index 0000000000000..acc96998952d8 --- /dev/null +++ b/pkgs/tools/system/tuptime/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, python3 }: + +stdenv.mkDerivation rec { + pname = "tuptime"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "rfrail3"; + repo = "tuptime"; + rev = version; + sha256 = "0p5v1jp6bl0hjv04q3gh11q6dx9z0x61h6svcbvwp5ni0h1bkz1a"; + }; + + buildInputs = [ python3 ]; + + installPhase = '' + mkdir -p $out/bin + install -m 755 src/tuptime $out/bin/ + + mkdir -p $out/share/man/man1 + cp src/man/tuptime.1 $out/share/man/man1/ + + # upstream only ships this, there are more scripts there... + mkdir -p $out/usr/share/doc/tuptime/contrib + cp misc/scripts/uptimed-to-tuptime.py $out/usr/share/doc/tuptime/contrib/ + ''; + + meta = with stdenv.lib; { + description = "Total uptime & downtime statistics utility"; + homepage = "https://github.com/rfrail3/tuptime"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.evils ]; + }; +} diff --git a/pkgs/tools/system/uefitool/variants.nix b/pkgs/tools/system/uefitool/variants.nix index cced17e6ddd43..470c8a0ca4d5c 100644 --- a/pkgs/tools/system/uefitool/variants.nix +++ b/pkgs/tools/system/uefitool/variants.nix @@ -3,13 +3,13 @@ let common = opts: libsForQt5.callPackage (import ./common.nix opts) {}; in rec { new-engine = common rec { - version = "A56"; - sha256 = "0sxmjkrwcchxg2qmcjsw2vr42s7cdcg2fxkwb8axq2r2z23465gp"; + version = "A57"; + sha256 = "0algfdlxfjs582hsqmagbcmw06p8qlh0k5xczfkscs3prdn2vm7n"; installFiles = [ "UEFITool/UEFITool" "UEFIFind/UEFIFind" "UEFIExtract/UEFIExtract" ]; }; old-engine = common rec { - version = "0.27.0"; - sha256 = "1i1p823qld927p4f1wcphqcnivb9mq7fi5xmzibxc3g9zzgnyc2h"; + version = "0.28.0"; + sha256 = "1n2hd2dysi5bv2iyq40phh1jxc48gdwzs414vfbxvcharcwapnja"; installFiles = [ "UEFITool" "UEFIReplace/UEFIReplace" "UEFIPatch/UEFIPatch" ]; }; } diff --git a/pkgs/tools/system/undaemonize/default.nix b/pkgs/tools/system/undaemonize/default.nix index 0f33a8d34c33d..e82ee18b8314a 100644 --- a/pkgs/tools/system/undaemonize/default.nix +++ b/pkgs/tools/system/undaemonize/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; meta = { description = "Tiny helper utility to force programs which insist on daemonizing themselves to run in the foreground"; - homepage = https://github.com/nickstenning/undaemonize; + homepage = "https://github.com/nickstenning/undaemonize"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.canndrew ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix index 2e856aaf9beae..e9224977542fc 100644 --- a/pkgs/tools/system/uptimed/default.nix +++ b/pkgs/tools/system/uptimed/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { each other. Uptimed comes with a console front-end to parse the records, which can also easily be used to show your records on a web page. ''; - homepage = https://github.com/rpodgorny/uptimed/; + homepage = "https://github.com/rpodgorny/uptimed/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix index 06ae286266249..dc2ec24e594aa 100644 --- a/pkgs/tools/system/vbetool/default.nix +++ b/pkgs/tools/system/vbetool/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Video BIOS execution tool"; - homepage = http://www.codon.org.uk/~mjg59/vbetool/; + homepage = "http://www.codon.org.uk/~mjg59/vbetool/"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix index 12aac2508cbff..79a50e43ed8b3 100644 --- a/pkgs/tools/system/which/default.nix +++ b/pkgs/tools/system/which/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/which/; + homepage = "https://www.gnu.org/software/which/"; description = "Shows the full path of (shell) commands"; platforms = platforms.all; license = licenses.gpl3; diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix index da502946781be..79fb92d5bb2a4 100644 --- a/pkgs/tools/system/wsmancli/default.nix +++ b/pkgs/tools/system/wsmancli/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { also has several switches to allow for optional features of the WS-Management specification and Testing. ''; - downloadPage = https://github.com/Openwsman/wsmancli/releases; + downloadPage = "https://github.com/Openwsman/wsmancli/releases"; inherit (openwsman.meta) homepage license maintainers platforms; inherit version; }; diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/tools/system/xe/default.nix index 62423ff594ff3..2464f624a28e8 100644 --- a/pkgs/tools/system/xe/default.nix +++ b/pkgs/tools/system/xe/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple xargs and apply replacement"; - homepage = https://github.com/chneukirchen/xe; + homepage = "https://github.com/chneukirchen/xe"; license = licenses.publicDomain; platforms = platforms.all; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/tools/system/yeshup/default.nix b/pkgs/tools/system/yeshup/default.nix index 42060aed295a0..3242eeaeebc57 100644 --- a/pkgs/tools/system/yeshup/default.nix +++ b/pkgs/tools/system/yeshup/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/RhysU/yeshup; + homepage = "https://github.com/RhysU/yeshup"; platforms = platforms.linux; license = licenses.cc-by-sa-30; # From Stackoverflow answer maintainers = with maintainers; [ obadz ]; diff --git a/pkgs/tools/system/ytop/default.nix b/pkgs/tools/system/ytop/default.nix index 7bd97507beaf1..64c3bf93aaa33 100644 --- a/pkgs/tools/system/ytop/default.nix +++ b/pkgs/tools/system/ytop/default.nix @@ -4,22 +4,22 @@ assert stdenv.isDarwin -> IOKit != null; rustPlatform.buildRustPackage rec { pname = "ytop"; - version = "0.5.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "cjbassi"; repo = pname; rev = version; - sha256 = "1wpxn8i5112pzs8b03shl627r2yz70lvzjhd6f5crwhsnir06h5x"; + sha256 = "02cpn5257yrmbakx3mlqs97kfambbn9ljb60jbqr1b9w24kd6zgf"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; - cargoSha256 = "0wmlmkq4y2923i5kjhprw2hd2v5qls49ncs6h8g9rdlmwd7qdl86"; + cargoSha256 = "0alqzy9gbj9m4l7xj1jsrnl09pv6z7c73gq787cqwn0gj93aaj19"; meta = with stdenv.lib; { description = "A TUI system monitor written in Rust"; - homepage = https://github.com/cjbassi/ytop; + homepage = "https://github.com/cjbassi/ytop"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/tools/system/zenith/cargo-lock.patch b/pkgs/tools/system/zenith/cargo-lock.patch deleted file mode 100644 index 3ab51ad5d4ebd..0000000000000 --- a/pkgs/tools/system/zenith/cargo-lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 3f4eec6..2f565c6 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1297,7 +1297,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - - [[package]] - name = "zenith" --version = "0.8.0" -+version = "0.8.1" - dependencies = [ - "battery", - "bincode", diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index f59541c264128..b7912f44cdd66 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -2,17 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zenith"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "bvaisvil"; repo = pname; rev = version; - sha256 = "12wbx4zhf1rf13g3mw8vcn8aqk9vcza61vi42y6c1pb2km73qw1h"; + sha256 = "1yfbr8zmcy7zp9s9cqv7qypj2vvhpq09r0398gr7ckjk6v70hhfg"; }; - cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "1nyci2vjwsyfscsd520d1r5vyazb33hv4mrsysy6amss4jdf2dlq"; + cargoSha256 = "1l4cjcpfghis983y31s54fzjppdnh3wa4anwi7bdsbyvqz3n3ywj"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix index f423bd7ea1c49..c29060cb82fcf 100644 --- a/pkgs/tools/text/a2ps/default.nix +++ b/pkgs/tools/text/a2ps/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0grqqsc3m45niac56m19m5gx7gc0m8zvia5iman1l4rlq31shf8s"; }) (fetchpatch { + name = "CVE-2015-8107.patch"; url = "https://sources.debian.net/data/main/a/a2ps/1:4.14-1.3/debian/patches/fix-format-security.diff"; sha256 = "0pq7zl41gf2kc6ahwyjnzn93vbxb4jc2c5g8j20isp4vw6dqrnwv"; }) @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { (page number, printing date, file name or supplied header), line numbering, symbol substitution as well as pretty printing for a wide range of programming languages. ''; - homepage = https://www.gnu.org/software/a2ps/; + homepage = "https://www.gnu.org/software/a2ps/"; license = licenses.gpl3Plus; maintainers = [ maintainers.bennofs ]; platforms = platforms.linux; diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/tools/text/agrep/default.nix index 902067b3d5354..c285b892b925b 100644 --- a/pkgs/tools/text/agrep/default.nix +++ b/pkgs/tools/text/agrep/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Approximate grep for fast fuzzy string searching"; - homepage = https://www.tgries.de/agrep/; + homepage = "https://www.tgries.de/agrep/"; license = stdenv.lib.licenses.isc; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index 7dc07664fcefe..a823f37d8d2cf 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { longDescription = '' aha takes ANSI SGR-coloured input and produces W3C-conformant HTML code. ''; - homepage = https://github.com/theZiz/aha; + homepage = "https://github.com/theZiz/aha"; license = with licenses; [ lgpl2Plus mpl11 ]; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix index 70bfaafbcec99..4afab278370c7 100644 --- a/pkgs/tools/text/amber/default.nix +++ b/pkgs/tools/text/amber/default.nix @@ -4,22 +4,22 @@ rustPlatform.buildRustPackage rec { pname = "amber"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "0k70rk19hwdlhhqm91x12xcb8r09kzpijs0xwhplrwdh86qfxymx"; + sha256 = "0pqz3spb5lmrj7w8hynmah9nrcfjsb1s0bmrr0cng9a9jx8amwzn"; }; - cargoSha256 = "0g8n3r6bdsfl1417wnss3ggnv5ywz8mx53hjglshmln40552znh3"; + cargoSha256 = "1ps70swh96xbfn4hng5krlmwvw2bwrl2liqvx9v9vy6pr86643s6"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; meta = with stdenv.lib; { description = "A code search-and-replace tool"; - homepage = https://github.com/dalance/amber; + homepage = "https://github.com/dalance/amber"; license = with licenses; [ mit ]; maintainers = [ maintainers.bdesham ]; platforms = platforms.all; diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/tools/text/ascii/default.nix index b01ce7773e308..94ab5286f8c02 100644 --- a/pkgs/tools/text/ascii/default.nix +++ b/pkgs/tools/text/ascii/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Interactive ASCII name and synonym chart"; - homepage = http://www.catb.org/~esr/ascii/; + homepage = "http://www.catb.org/~esr/ascii/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/text/bcat/default.nix b/pkgs/tools/text/bcat/default.nix index e8000f17cdeb3..dffd58de44fea 100644 --- a/pkgs/tools/text/bcat/default.nix +++ b/pkgs/tools/text/bcat/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Pipe to browser utility"; - homepage = http://rtomayko.github.com/bcat/; + homepage = "http://rtomayko.github.com/bcat/"; license = licenses.mit; maintainers = with maintainers; [ jraygauthier nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/text/boxes/default.nix b/pkgs/tools/text/boxes/default.nix index 8325c6c08f359..b9d54d3a9e77d 100644 --- a/pkgs/tools/text/boxes/default.nix +++ b/pkgs/tools/text/boxes/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { Boxes is a command line filter program that draws ASCII art boxes around your input text. ''; - homepage = https://boxes.thomasjensen.com; + homepage = "https://boxes.thomasjensen.com"; license = licenses.gpl2; maintainers = with maintainers; [ waiting-for-dev ]; platforms = platforms.unix; diff --git a/pkgs/tools/text/catdocx/default.nix b/pkgs/tools/text/catdocx/default.nix index adf9d17815b0c..f24864f754b35 100644 --- a/pkgs/tools/text/catdocx/default.nix +++ b/pkgs/tools/text/catdocx/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Extracts plain text from docx files"; - homepage = https://github.com/jncraton/catdocx; + homepage = "https://github.com/jncraton/catdocx"; license = with licenses; [ bsd3 ]; maintainers = [ maintainers.michalrus ]; platforms = platforms.all; diff --git a/pkgs/tools/text/cconv/default.nix b/pkgs/tools/text/cconv/default.nix index 3b80af365f657..8fe400aaab255 100644 --- a/pkgs/tools/text/cconv/default.nix +++ b/pkgs/tools/text/cconv/default.nix @@ -13,7 +13,7 @@ let version = "0.6.3"; in meta = with stdenv.lib; { description = "A iconv based simplified-traditional chinese conversion tool"; - homepage = https://github.com/xiaoyjy/cconv; + homepage = "https://github.com/xiaoyjy/cconv"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.redfish64 ]; diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix index 521b4c5b284fe..7f706cf13765c 100644 --- a/pkgs/tools/text/codesearch/default.nix +++ b/pkgs/tools/text/codesearch/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = { description = "Fast, indexed regexp search over large file trees"; - homepage = https://github.com/google/codesearch; + homepage = "https://github.com/google/codesearch"; license = [ stdenv.lib.licenses.bsd3 ]; maintainers = [ stdenv.lib.maintainers.bennofs ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 46fdf29ad46c9..c3da9a6055583 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, perl /*, xmlto */}: stdenv.mkDerivation rec { - name = "colordiff-1.0.18"; + name = "colordiff-1.0.19"; src = fetchurl { urls = [ "https://www.colordiff.org/${name}.tar.gz" "http://www.colordiff.org/archive/${name}.tar.gz" ]; - sha256 = "1q6n60n4b9fnzccxyxv04mxjsql4ddq17vl2c74ijvjdhpcfrkr9"; + sha256 = "069vzzgs7b44bmfh3ks2psrdb26s1w19gp9w4xxbgi7nhx6w3s26"; }; buildInputs = [ perl /* xmlto */ ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wrapper for 'diff' that produces the same output but with pretty 'syntax' highlighting"; - homepage = https://www.colordiff.org/; + homepage = "https://www.colordiff.org/"; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/tools/text/convertlit/default.nix b/pkgs/tools/text/convertlit/default.nix index ffc2dc1c4d5c3..a947ef98a6895 100644 --- a/pkgs/tools/text/convertlit/default.nix +++ b/pkgs/tools/text/convertlit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "convertlit-1.8"; src = fetchzip { - url = http://www.convertlit.com/convertlit18src.zip; + url = "http://www.convertlit.com/convertlit18src.zip"; sha256 = "182nsin7qscgbw2h92m0zadh3h8q410h5cza6v486yjfvla3dxjx"; stripRoot = false; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.convertlit.com/; + homepage = "http://www.convertlit.com/"; description = "A tool for converting Microsoft Reader ebooks to more open formats"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/text/copyright-update/default.nix b/pkgs/tools/text/copyright-update/default.nix index 9a405674dc7a0..ca815f915db35 100644 --- a/pkgs/tools/text/copyright-update/default.nix +++ b/pkgs/tools/text/copyright-update/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL=install" "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/jaalto/project--copyright-update; + homepage = "https://github.com/jaalto/project--copyright-update"; description = "Updates the copyright information in a set of files"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix index d2c710d10f8c0..7a0240fc73013 100644 --- a/pkgs/tools/text/csvkit/default.nix +++ b/pkgs/tools/text/csvkit/default.nix @@ -36,6 +36,6 @@ python3.pkgs.buildPythonApplication rec { description = "A suite of command-line tools for converting to and working with CSV"; maintainers = with maintainers; [ vrthra ]; license = licenses.mit; - homepage = https://github.com/wireservice/csvkit; + homepage = "https://github.com/wireservice/csvkit"; }; } diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/tools/text/dadadodo/default.nix index 5f6b0a8a60580..5de8e25e6fb2b 100644 --- a/pkgs/tools/text/dadadodo/default.nix +++ b/pkgs/tools/text/dadadodo/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Markov chain-based text generator"; - homepage = http://www.jwz.org/dadadodo; + homepage = "http://www.jwz.org/dadadodo"; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; }; diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix index 7ce9c31630426..016cc40977b24 100644 --- a/pkgs/tools/text/diffr/default.nix +++ b/pkgs/tools/text/diffr/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Yet another diff highlighting tool"; - homepage = https://github.com/mookid/diffr; + homepage = "https://github.com/mookid/diffr"; license = with licenses; [ mit ]; maintainers = with maintainers; [ davidtwco ]; platforms = platforms.all; diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix index bf4ff279f8fc1..bed34e30e7902 100644 --- a/pkgs/tools/text/diffstat/default.nix +++ b/pkgs/tools/text/diffstat/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { insertions, deletions, and modifications per-file. It is useful for reviewing large, complex patch files. ''; - homepage = https://invisible-island.net/diffstat/; + homepage = "https://invisible-island.net/diffstat/"; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 67f397dbe48aa..06ecda9ff21dc 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes"; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/diffutils/diffutils.html; + homepage = "https://www.gnu.org/software/diffutils/diffutils.html"; description = "Commands for showing the differences between files (diff, cmp, etc.)"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index c1183d4c5a01c..5a4dfd5de854e 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Implementation of Markdown markup language in C"; - homepage = http://www.pell.portland.or.us/~orc/Code/discount/; + homepage = "http://www.pell.portland.or.us/~orc/Code/discount/"; license = licenses.bsd3; maintainers = with maintainers; [ shell ]; platforms = platforms.unix; diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix index 7dcd94e5363f2..2a6af785692ab 100644 --- a/pkgs/tools/text/ebook-tools/default.nix +++ b/pkgs/tools/text/ebook-tools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://ebook-tools.sourceforge.net; + homepage = "http://ebook-tools.sourceforge.net"; description = "Tools and library for dealing with various ebook file formats"; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix index 24ac649026af2..670e052772eff 100644 --- a/pkgs/tools/text/enscript/default.nix +++ b/pkgs/tools/text/enscript/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/enscript/; + homepage = "https://www.gnu.org/software/enscript/"; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/text/epubcheck/default.nix b/pkgs/tools/text/epubcheck/default.nix index 4e117ab7a4812..914fe00673555 100644 --- a/pkgs/tools/text/epubcheck/default.nix +++ b/pkgs/tools/text/epubcheck/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/w3c/epubcheck; + homepage = "https://github.com/w3c/epubcheck"; description = "Validation tool for EPUB"; license = with licenses; [ asl20 bsd3 mpl10 w3c ]; platforms = platforms.all; diff --git a/pkgs/tools/text/esh/default.nix b/pkgs/tools/text/esh/default.nix index 231a16bdc1b37..171d90026be82 100644 --- a/pkgs/tools/text/esh/default.nix +++ b/pkgs/tools/text/esh/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple templating engine based on shell"; - homepage = https://github.com/jirutka/esh; + homepage = "https://github.com/jirutka/esh"; license = licenses.mit; maintainers = with maintainers; [ mnacamura ]; platforms = platforms.unix; diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index ac90b4d7792cc..6fc27bdf00cb2 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FanFicFare"; - version = "3.17.0"; + version = "3.19.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1h7kzlw516w9qk5vcn0rqibxbhvzbmxgnf9l6yjxj30x53ynrvzj"; + sha256 = "01cr4941sg6is6k6sajlbr6hs5s47aq9xhp7gadhq4h3x6dilj40"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 0d5a50570f5f7..73e2b8a6de49b 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -19,11 +19,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - name = "gawk-5.0.1"; + name = "gawk-5.1.0"; src = fetchurl { url = "mirror://gnu/gawk/${name}.tar.xz"; - sha256 = "15570p7g2x54asvr2fsc56sxzmm08fbk4mzpcs5n92fp9vq8cklf"; + sha256 = "1gc2cccqy1x1bf6rhwlmd8q7dz7gnam6nwgl38bxapv6qm5flpyg"; }; # When we do build separate interactive version, it makes sense to always include man. @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/gawk/; + homepage = "https://www.gnu.org/software/gawk/"; description = "GNU implementation of the Awk programming language"; longDescription = '' diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix index ebefae06c8ca7..a4a26e139fb29 100644 --- a/pkgs/tools/text/gist/default.nix +++ b/pkgs/tools/text/gist/default.nix @@ -9,7 +9,7 @@ buildRubyGem rec { meta = with lib; { description = "Upload code to https://gist.github.com (or github enterprise)"; - homepage = http://defunkt.io/gist/; + homepage = "http://defunkt.io/gist/"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; platforms = ruby.meta.platforms; diff --git a/pkgs/tools/text/gjo/default.nix b/pkgs/tools/text/gjo/default.nix new file mode 100644 index 0000000000000..74a5c87a760eb --- /dev/null +++ b/pkgs/tools/text/gjo/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gjo"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "skanehira"; + repo = "gjo"; + rev = version; + sha256 = "07halr0jzds4rya6hlvp45bjf7vg4yf49w5q60mch05hk8qkjjdw"; + }; + + doCheck = true; + + vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + + meta = with stdenv.lib; { + description = "Small utility to create JSON objects"; + homepage = "https://github.com/skanehira/gjo"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} \ No newline at end of file diff --git a/pkgs/tools/text/glogg/default.nix b/pkgs/tools/text/glogg/default.nix index 6e9ff5170f2bc..90c1419ef30ec 100644 --- a/pkgs/tools/text/glogg/default.nix +++ b/pkgs/tools/text/glogg/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, qmake, boost }: +{ mkDerivation, stdenv, fetchurl, qmake, boost }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "glogg"; version = "1.1.4"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { longDescription = '' A multi-platform GUI application to browse and search through long or complex log files. It is designed with programmers and system administrators in mind. glogg can be seen as a graphical, interactive combination of grep and less. ''; - homepage = https://glogg.bonnefon.org/; + homepage = "https://glogg.bonnefon.org/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ c0bw3b ]; diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 7608587e3c279..3f5c4d7d86cf0 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/grep/; + homepage = "https://www.gnu.org/software/grep/"; description = "GNU implementation of the Unix grep command"; longDescription = '' diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index 87a3c72f16536..8cca7f15962a1 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { more original files, producing patched versions. ''; - homepage = https://savannah.gnu.org/projects/patch; + homepage = "https://savannah.gnu.org/projects/patch"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/tools/text/gnused/422.nix b/pkgs/tools/text/gnused/422.nix index 3a9856c3dd37a..7ea637dc8c95f 100644 --- a/pkgs/tools/text/gnused/422.nix +++ b/pkgs/tools/text/gnused/422.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gnused-4.2.2"; src = fetchurl { - url = mirror://gnu/sed/sed-4.2.2.tar.bz2; + url = "mirror://gnu/sed/sed-4.2.2.tar.bz2"; sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { outputs = [ "out" "info" ]; meta = { - homepage = https://www.gnu.org/software/sed/; + homepage = "https://www.gnu.org/software/sed/"; description = "GNU sed, a batch stream editor"; longDescription = '' diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index 953be5e07d66f..d4da6f2c8ce88 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing"; meta = { - homepage = https://www.gnu.org/software/sed/; + homepage = "https://www.gnu.org/software/sed/"; description = "GNU sed, a batch stream editor"; longDescription = '' diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix index 837ec5b7a5ffd..611507da75c7c 100644 --- a/pkgs/tools/text/grin/default.nix +++ b/pkgs/tools/text/grin/default.nix @@ -16,7 +16,7 @@ python2Packages.buildPythonApplication rec { buildInputs = with python2Packages; [ nose ]; meta = { - homepage = https://github.com/rkern/grin; + homepage = "https://github.com/rkern/grin"; description = "A grep program configured the way I like it"; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.sjagoe ]; diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 391e7543eca57..8c98a4aba465e 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/groff/; + homepage = "https://www.gnu.org/software/groff/"; description = "GNU Troff, a typesetting package that reads plain text and produces formatted output"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix index 523a8d48712a5..ff5288f163161 100644 --- a/pkgs/tools/text/gtranslator/default.nix +++ b/pkgs/tools/text/gtranslator/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNOME translation making program"; - homepage = https://wiki.gnome.org/Apps/Gtranslator; + homepage = "https://wiki.gnome.org/Apps/Gtranslator"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/tools/text/gucci/default.nix index 58f1768bfa1f7..1667f2e45b543 100644 --- a/pkgs/tools/text/gucci/default.nix +++ b/pkgs/tools/text/gucci/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A simple CLI templating tool written in golang"; - homepage = https://github.com/noqcks/gucci; + homepage = "https://github.com/noqcks/gucci"; license = licenses.mit; maintainers = [ maintainers.braydenjw ]; platforms = platforms.unix; diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 5f4855f295602..bc32a60c67275 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; let self = stdenv.mkDerivation rec { pname = "highlight"; - version = "3.55"; + version = "3.56"; src = fetchFromGitLab { owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "1cn8m2qk5vl5zcrmg0wlvj9wvpm0gdb5idh9bhh5b6pbl0hm93cr"; + sha256 = "1pilx58dg96zm0yx7i6k92vibwpvpj8ir39f2akrsyjgijnv3sx4"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index e31db4378507c..28e1759fea59c 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { used to validate and fix HTML data. ''; license = licenses.libpng; # very close to it - the 3 clauses are identical - homepage = http://html-tidy.org; + homepage = "http://html-tidy.org"; platforms = platforms.all; maintainers = with maintainers; [ edwtjo ]; }; diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/tools/text/html2text/default.nix index 1944847554817..7cf276f2da3b9 100644 --- a/pkgs/tools/text/html2text/default.nix +++ b/pkgs/tools/text/html2text/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "html2text-1.3.2a"; src = fetchurl { - url = http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz; + url = "http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz"; sha256 = "000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Convert HTML to plain text"; - homepage = http://www.mbayer.de/html2text/; + homepage = "http://www.mbayer.de/html2text/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.eikek ]; diff --git a/pkgs/tools/text/hyx/default.nix b/pkgs/tools/text/hyx/default.nix index 70745266fe55c..83fdabb8f46fe 100644 --- a/pkgs/tools/text/hyx/default.nix +++ b/pkgs/tools/text/hyx/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "minimalistic but powerful Linux console hex editor"; - homepage = https://yx7.cc/code/; + homepage = "https://yx7.cc/code/"; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix index 79bcf90718b1d..15739432a19f3 100644 --- a/pkgs/tools/text/icdiff/default.nix +++ b/pkgs/tools/text/icdiff/default.nix @@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec { }; meta = with stdenv.lib; { - homepage = https://www.jefftk.com/icdiff; + homepage = "https://www.jefftk.com/icdiff"; description = "Side-by-side highlighted command line diffs"; maintainers = with maintainers; [ aneeshusa ]; license = licenses.psfl; diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/tools/text/invoice2data/default.nix index 0e2e4cedfc220..78ab971f0c0d3 100644 --- a/pkgs/tools/text/invoice2data/default.nix +++ b/pkgs/tools/text/invoice2data/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonPackage rec { meta = with stdenv.lib; { description = "Data extractor for PDF invoices"; - homepage = https://github.com/invoice-x/invoice2data; + homepage = "https://github.com/invoice-x/invoice2data"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/tools/text/jsawk/default.nix b/pkgs/tools/text/jsawk/default.nix index c7f4002e2d3a6..4f2ad403e365f 100644 --- a/pkgs/tools/text/jsawk/default.nix +++ b/pkgs/tools/text/jsawk/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Jsawk is like awk, but for JSON"; - homepage = https://github.com/micha/jsawk; + homepage = "https://github.com/micha/jsawk"; license = stdenv.lib.licenses.publicDomain; maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index 6be7106f2b957..ecadb4a89d8fd 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/pkgs/tools/text/jumanpp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { plausibility of word sequences by using a recurrent neural network language model (RNNLM). ''; - homepage = http://nlp.ist.i.kyoto-u.ac.jp/index.php?JUMAN++; + homepage = "http://nlp.ist.i.kyoto-u.ac.jp/index.php?JUMAN++"; license = licenses.asl20; maintainers = with maintainers; [ mt-caret ]; platforms = platforms.all; diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/tools/text/kytea/default.nix index 621408866e8ca..b120d43287a57 100644 --- a/pkgs/tools/text/kytea/default.nix +++ b/pkgs/tools/text/kytea/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = with stdenv.lib; { - homepage = http://www.phontron.com/kytea/; + homepage = "http://www.phontron.com/kytea/"; description = "General toolkit developed for analyzing text"; longDescription = '' diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 154e099d3dd2b..fccd2174a6d64 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "4.9"; + version = "4.9.1"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "05jqqamdvi5x35yy9bqw6wf7qagrm1r9488f7cfbbv764zfirz17"; + sha256 = "0hvzckb92yijzmp2vphjp1wgql3xqq0xd83v5x6pbhziq9yxc5yh"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/tools/text/mairix/default.nix index e72824db6273a..a2ae91e974b06 100644 --- a/pkgs/tools/text/mairix/default.nix +++ b/pkgs/tools/text/mairix/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.rc0.org.uk/mairix; + homepage = "http://www.rc0.org.uk/mairix"; license = stdenv.lib.licenses.gpl2Plus; description = "Program for indexing and searching email messages stored in maildir, MH or mbox"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index 8ad5cd16aafa3..204d346082c36 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Interpreter for the AWK Programming Language"; - homepage = https://invisible-island.net/mawk/mawk.html; + homepage = "https://invisible-island.net/mawk/mawk.html"; license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; platforms = with platforms; unix; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 9bb3d7469ef7e..38ef6561ac6a7 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.15.1"; + version = "0.17.1"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - sha256 = "0qvlnjw0h2hnap1crnprdrynqvg7pywq32qin5fdkk4fv496wjhs"; + sha256 = "0kkpacb31d0rg4774a63x3njifn3813d8r8vc8skzv4ki7gvhxkr"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; - cargoSha256 = "12s0dakv37vvvd43xzkydr7w3cpp7sizk8s1kalg4b0xz6ydghcp"; + cargoSha256 = "1pljgnckardy3j81im6k5dssz794c7vjx1dfr7950ndhrzwv7p22"; checkInputs = [ ansi2html ]; checkPhase = '' @@ -22,13 +22,15 @@ rustPlatform.buildRustPackage rec { cargo test -- --skip terminal::iterm2 \ --skip magic::tests::detect_mimetype_of_svg_image \ --skip magic::tests::detect_mimetype_of_png_image \ + --skip magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length \ + --skip magic::tests::detect_mimetype_of_magic_param_bytes_max_length \ --skip resources::tests::read_url_with_http_url_fails_when_status_404 \ --skip resources::tests::read_url_with_http_url_returns_content_when_status_200 ''; meta = with stdenv.lib; { description = "cat for markdown"; - homepage = https://github.com/lunaryorn/mdcat; + homepage = "https://github.com/lunaryorn/mdcat"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ davidtwco ]; platforms = platforms.all; diff --git a/pkgs/tools/text/mecab/base.nix b/pkgs/tools/text/mecab/base.nix index e97980ef3d2d0..181eb405cbd71 100644 --- a/pkgs/tools/text/mecab/base.nix +++ b/pkgs/tools/text/mecab/base.nix @@ -4,7 +4,7 @@ version = "0.996"; src = fetchurl { - url = https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7cENtOXlicTFaRUE; + url = "https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7cENtOXlicTFaRUE"; name = "mecab-0.996.tar.gz"; sha256 = "0ncwlqxl1hdn1x4v4kr2sn1sbbcgnhdphp0lcvk74nqkhdbk4wz0"; }; diff --git a/pkgs/tools/text/mecab/default.nix b/pkgs/tools/text/mecab/default.nix index 0b7e7e86df1bf..32060a6179a2d 100644 --- a/pkgs/tools/text/mecab/default.nix +++ b/pkgs/tools/text/mecab/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (mecab-base // { meta = with stdenv.lib; { description = "Japanese morphological analysis system"; - homepage = http://taku910.github.io/mecab/; + homepage = "http://taku910.github.io/mecab/"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ auntie ]; diff --git a/pkgs/tools/text/mecab/ipadic.nix b/pkgs/tools/text/mecab/ipadic.nix index 3b011787c7cb0..026e385e7c2bd 100644 --- a/pkgs/tools/text/mecab/ipadic.nix +++ b/pkgs/tools/text/mecab/ipadic.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "2.7.0-20070801"; src = fetchurl { - url = https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7MWVlSDBCSXZMTXM; + url = "https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7MWVlSDBCSXZMTXM"; name = "mecab-ipadic-2.7.0-20070801.tar.gz"; sha256 = "08rmkvj0f0x6jq0axrjw2y5nam0mavv6x77dp9v4al0wi1ym4bxn"; }; diff --git a/pkgs/tools/text/mir-qualia/default.nix b/pkgs/tools/text/mir-qualia/default.nix index 0a9b3777783bc..f532daf8c442c 100644 --- a/pkgs/tools/text/mir-qualia/default.nix +++ b/pkgs/tools/text/mir-qualia/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Dynamically enable sections of config files"; - homepage = https://github.com/darkfeline/mir.qualia; + homepage = "https://github.com/darkfeline/mir.qualia"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.srhb ] ; }; diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix index 6665b377ccf50..e86c9f2ad266c 100644 --- a/pkgs/tools/text/mpage/default.nix +++ b/pkgs/tools/text/mpage/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; license = "liberal"; # a non-copyleft license, see `Copyright' file - homepage = http://www.mesa.nl/pub/mpage/; + homepage = "http://www.mesa.nl/pub/mpage/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/text/multitran/data/default.nix b/pkgs/tools/text/multitran/data/default.nix index d4b4902303b62..9b431f5b30bd2 100644 --- a/pkgs/tools/text/multitran/data/default.nix +++ b/pkgs/tools/text/multitran/data/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "multitran-data-0.3"; src = fetchurl { - url = mirror://sourceforge/multitran/multitran-data.tar.bz2; + url = "mirror://sourceforge/multitran/multitran-data.tar.bz2"; sha256 = "9c2ff5027c2fe72b0cdf056311cd7543f447feb02b455982f20d4a3966b7828c"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://multitran.sourceforge.net/; + homepage = "http://multitran.sourceforge.net/"; description = "Multitran data english-russian"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/text/multitran/libbtree/default.nix b/pkgs/tools/text/multitran/libbtree/default.nix index ae4ece899a4c2..9a7e0fdbd07f2 100644 --- a/pkgs/tools/text/multitran/libbtree/default.nix +++ b/pkgs/tools/text/multitran/libbtree/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libbtree-0.0.1alpha2"; src = fetchurl { - url = mirror://sourceforge/multitran/libbtree-0.0.1alpha2.tar.bz2; + url = "mirror://sourceforge/multitran/libbtree-0.0.1alpha2.tar.bz2"; sha256 = "34a584e45058950337ff9342693b6739b52c3ce17e66440526c4bd6f9575802c"; }; patchPhase = '' @@ -11,7 +11,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://multitran.sourceforge.net/; + homepage = "http://multitran.sourceforge.net/"; description = "Multitran lib: library for reading Multitran's BTREE database format"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/text/multitran/libfacet/default.nix b/pkgs/tools/text/multitran/libfacet/default.nix index 4470511f6163a..f359819aa7360 100644 --- a/pkgs/tools/text/multitran/libfacet/default.nix +++ b/pkgs/tools/text/multitran/libfacet/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libfacet-0.0.1alpha2"; src = fetchurl { - url = mirror://sourceforge/multitran/libfacet-0.0.1alpha2.tar.bz2; + url = "mirror://sourceforge/multitran/libfacet-0.0.1alpha2.tar.bz2"; sha256 = "dc53351c4035a3c27dc6c1d0410e808346fbc107e7e7c112ec65c59d0df7a144"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://multitran.sourceforge.net/; + homepage = "http://multitran.sourceforge.net/"; description = "Multitran lib: enchanced locale facets"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/text/multitran/libmtquery/default.nix b/pkgs/tools/text/multitran/libmtquery/default.nix index baccdfdedba5a..2c03de6ede890 100644 --- a/pkgs/tools/text/multitran/libmtquery/default.nix +++ b/pkgs/tools/text/multitran/libmtquery/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libmtquery-0.0.1alpha3"; src = fetchurl { - url = mirror://sourceforge/multitran/libmtquery-0.0.1alpha3.tar.bz2; + url = "mirror://sourceforge/multitran/libmtquery-0.0.1alpha3.tar.bz2"; sha256 = "e24c7c15772445f1b14871928d84dd03cf93bd88f9d2b2ed1bf0257c2cf2b15e"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://multitran.sourceforge.net/; + homepage = "http://multitran.sourceforge.net/"; description = "Multitran lib: main engine to query translations"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/text/multitran/libmtsupport/default.nix b/pkgs/tools/text/multitran/libmtsupport/default.nix index 9b214e6b50276..bc5a77be4fb9b 100644 --- a/pkgs/tools/text/multitran/libmtsupport/default.nix +++ b/pkgs/tools/text/multitran/libmtsupport/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libmtsupport-0.0.1alpha2"; src = fetchurl { - url = mirror://sourceforge/multitran/libmtsupport-0.0.1alpha2.tar.bz2; + url = "mirror://sourceforge/multitran/libmtsupport-0.0.1alpha2.tar.bz2"; sha256 = "481f0f1ec15d7274f1e4eb93e7d060df10a181efd037eeff5e8056d283a9298b"; }; patchPhase = '' @@ -11,7 +11,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://multitran.sourceforge.net/; + homepage = "http://multitran.sourceforge.net/"; description = "Multitran lib: basic useful functions"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/text/multitran/mtutils/default.nix b/pkgs/tools/text/multitran/mtutils/default.nix index ca65c567c661a..9d701421d11c1 100644 --- a/pkgs/tools/text/multitran/mtutils/default.nix +++ b/pkgs/tools/text/multitran/mtutils/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "mt-utils-0.0.1alpha3"; src = fetchurl { - url = mirror://sourceforge/multitran/mt-utils-0.0.1alpha3.tar.bz2; + url = "mirror://sourceforge/multitran/mt-utils-0.0.1alpha3.tar.bz2"; sha256 = "e407702c90c5272882386914e1eeca5f6c5039393af9a44538536b94867b0a0e"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://multitran.sourceforge.net/; + homepage = "http://multitran.sourceforge.net/"; description = "Multitran: simple command line utilities for dictionary maintenance"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index 59cfc86efbf33..93fc9dc75de72 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://namazu.org/; + homepage = "http://namazu.org/"; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = [ ]; diff --git a/pkgs/tools/text/nawk/default.nix b/pkgs/tools/text/nawk/default.nix index a746c45443500..aafce117ee4a1 100644 --- a/pkgs/tools/text/nawk/default.nix +++ b/pkgs/tools/text/nawk/default.nix @@ -1,21 +1,18 @@ -{ stdenv, fetchurl, yacc }: +{ stdenv, fetchFromGitHub, yacc }: stdenv.mkDerivation rec { - name = "nawk-20121220"; + pname = "nawk"; + version = "20180827"; - src = fetchurl { - url = "https://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz"; - sha256 = "10wvdn7xwc5bbp5h7l0b9fxby3bds21n8a34z54i8kjsbhb95h4d"; + src = fetchFromGitHub { + owner = "onetrueawk"; + repo = "awk"; + rev = version; + sha256 = "0qcsxhcwg6g3c0zxmbipqa8d8d5n8zxrq0hymb8yavsaz103fcl6"; }; nativeBuildInputs = [ yacc ]; - unpackPhase = '' - mkdir build - cd build - tar xvf ${src} - ''; - patchPhase = '' substituteInPlace ./makefile \ --replace "YACC = yacc -d -S" "" @@ -33,7 +30,7 @@ stdenv.mkDerivation rec { Language", by Al Aho, Brian Kernighan, and Peter Weinberger (Addison-Wesley, 1988, ISBN 0-201-07981-X). ''; - homepage = https://www.cs.princeton.edu/~bwk/btl.mirror/; + homepage = "https://www.cs.princeton.edu/~bwk/btl.mirror/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.konimex ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index f7543dc0f70eb..6e0c7e756493b 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { line by line and field by field, ignoring small numeric differences or/and different numeric formats ''; - homepage = https://www.nongnu.org/numdiff/; + homepage = "https://www.nongnu.org/numdiff/"; license = licenses.gpl3Plus; maintainers = with maintainers; []; platforms = platforms.gnu ++ platforms.linux; diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index 83d0bdd92c748..19690e270af02 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -29,14 +29,14 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "9.6.1"; + version = "9.8.0"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "0lbld11r8zds79183hh5y2f5fi7cacl7bx9f7f2g58j38y1c65vj"; + sha256 = "1l4bwnbd3g0wmdx8yv8hi5wm2z2q67y9mwrvrc4xxmkdrb5y8jcd"; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix index 69277d0412dfc..2a64533a459f5 100644 --- a/pkgs/tools/text/odt2txt/default.nix +++ b/pkgs/tools/text/odt2txt/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple .odt to .txt converter"; - homepage = https://github.com/dstosberg/odt2txt; + homepage = "https://github.com/dstosberg/odt2txt"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.gpl2; maintainers = [ ]; diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index 07990aca92ada..54027de9acded 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "opencc"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "BYVoid"; repo = "OpenCC"; rev = "ver.${version}"; - sha256 = "1pv5md225qwhbn8ql932zdg6gh1qlx3paiajaks8gfsa07yzvhr4"; + sha256 = "1ygj2ygxsva72hs6cm0a6wdd2rp71k4nm0pd7cb20y2srdlzvdqk"; }; nativeBuildInputs = [ cmake python ]; diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix index d20727f725a2a..d635fab74d5ac 100644 --- a/pkgs/tools/text/papertrail/default.nix +++ b/pkgs/tools/text/papertrail/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Command-line client for Papertrail log management service"; - homepage = https://github.com/papertrail/papertrail-cli/; + homepage = "https://github.com/papertrail/papertrail-cli/"; license = licenses.mit; maintainers = with maintainers; [ nicknovitski ]; platforms = ruby.meta.platforms; diff --git a/pkgs/tools/text/par/default.nix b/pkgs/tools/text/par/default.nix index 88325c38731d4..54b5e6566e871 100644 --- a/pkgs/tools/text/par/default.nix +++ b/pkgs/tools/text/par/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "1.52"; src = fetchurl { - url = http://www.nicemice.net/par/Par152.tar.gz; + url = "http://www.nicemice.net/par/Par152.tar.gz"; sha256 = "33dcdae905f4b4267b4dc1f3efb032d79705ca8d2122e17efdecfd8162067082"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { - homepage = http://www.nicemice.net/par/; + homepage = "http://www.nicemice.net/par/"; description = "Paragraph reflow for email"; platforms = platforms.unix; # See https://fedoraproject.org/wiki/Licensing/Par for license details diff --git a/pkgs/tools/text/patchutils/generic.nix b/pkgs/tools/text/patchutils/generic.nix index 9d7ac4b53f051..52961e58c0eea 100644 --- a/pkgs/tools/text/patchutils/generic.nix +++ b/pkgs/tools/text/patchutils/generic.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools to manipulate patch files"; - homepage = http://cyberelk.net/tim/software/patchutils; + homepage = "http://cyberelk.net/tim/software/patchutils"; license = licenses.gpl2Plus; platforms = platforms.all; executables = [ "combinediff" "dehtmldiff" "editdiff" "espdiff" diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/tools/text/peco/default.nix index 9407e68ed165e..c5655cb2a5852 100644 --- a/pkgs/tools/text/peco/default.nix +++ b/pkgs/tools/text/peco/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Simplistic interactive filtering tool"; - homepage = https://github.com/peco/peco; + homepage = "https://github.com/peco/peco"; license = licenses.mit; # peco should work on Windows or other POSIX platforms, but the go package # declares only linux and darwin. diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix index 342377b85aea9..53aa9ac7b76d1 100644 --- a/pkgs/tools/text/platinum-searcher/default.nix +++ b/pkgs/tools/text/platinum-searcher/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/monochromegane/the_platinum_searcher; + homepage = "https://github.com/monochromegane/the_platinum_searcher"; description = "A code search tool similar to ack and the_silver_searcher(ag)."; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/tools/text/podiff/default.nix index a71ef2f06bd0d..bee2c7a1a8f80 100644 --- a/pkgs/tools/text/podiff/default.nix +++ b/pkgs/tools/text/podiff/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Finds differences in translations between two PO files, or revisions"; - homepage = http://puszcza.gnu.org.ua/software/podiff; + homepage = "http://puszcza.gnu.org.ua/software/podiff"; license = licenses.gpl3Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index e0e7f5d957da1..767569e42c205 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross-platform gettext catalogs (.po files) editor"; - homepage = https://www.poedit.net/; + homepage = "https://www.poedit.net/"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ domenkozar genesis ]; diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix index 5e76e35417333..b7134ba735642 100644 --- a/pkgs/tools/text/popfile/default.nix +++ b/pkgs/tools/text/popfile/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = { description = "An email classification system that automatically sorts messages and fights spam"; - homepage = http://getpopfile.org; + homepage = "http://getpopfile.org"; license = stdenv.lib.licenses.gpl2; # Should work on macOS, but havent tested it. diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix index 27e9c80bc7d57..36a68f9406d39 100644 --- a/pkgs/tools/text/proselint/default.nix +++ b/pkgs/tools/text/proselint/default.nix @@ -15,7 +15,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "A linter for prose"; - homepage = http://proselint.com; + homepage = "http://proselint.com"; license = licenses.bsd3; maintainers = with maintainers; [ alibabzo ]; }; diff --git a/pkgs/tools/text/qgrep/default.nix b/pkgs/tools/text/qgrep/default.nix index c45398e31a1fb..30873e89d1bf3 100644 --- a/pkgs/tools/text/qgrep/default.nix +++ b/pkgs/tools/text/qgrep/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast regular expression grep for source code with incremental index updates"; - homepage = https://github.com/zeux/qgrep; + homepage = "https://github.com/zeux/qgrep"; license = licenses.mit; maintainers = [ maintainers.yrashk ]; platforms = platforms.all; diff --git a/pkgs/tools/text/qprint/default.nix b/pkgs/tools/text/qprint/default.nix index 8f998e3a26d27..d616d15ad75bf 100644 --- a/pkgs/tools/text/qprint/default.nix +++ b/pkgs/tools/text/qprint/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.fourmilab.ch/webtools/qprint/; + homepage = "http://www.fourmilab.ch/webtools/qprint/"; license = stdenv.lib.licenses.publicDomain; description = "Encode and decode Quoted-Printable files"; maintainers = [ stdenv.lib.maintainers.tv ]; diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix index 9cf9349badb2f..bb2eeee8a9e23 100644 --- a/pkgs/tools/text/qshowdiff/default.nix +++ b/pkgs/tools/text/qshowdiff/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://qshowdiff.danfis.cz/; + homepage = "http://qshowdiff.danfis.cz/"; description = "Colourful diff viewer"; license = stdenv.lib.licenses.gpl3Plus; }; diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix index e1c3d87bdcbc7..b562c92679b26 100644 --- a/pkgs/tools/text/recode/default.nix +++ b/pkgs/tools/text/recode/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = https://github.com/rrthomas/recode; + homepage = "https://github.com/rrthomas/recode"; description = "Converts files between various character sets and usages"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index 3549e7c1c943d..009c3dcd8c58b 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "replace-2.24"; src = fetchurl { - url = ftp://hpux.connect.org.uk/hpux/Users/replace-2.24/replace-2.24-src-11.11.tar.gz; + url = "ftp://hpux.connect.org.uk/hpux/Users/replace-2.24/replace-2.24-src-11.11.tar.gz"; sha256 = "1c2nkxx83vmlh1v3ib6r2xqh121gdb1rharwsimcb2h0xwc558dm"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { patches = [./malloc.patch]; meta = { - homepage = https://replace.richardlloyd.org.uk/; + homepage = "https://replace.richardlloyd.org.uk/"; description = "A tool to replace verbatim strings"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix index dcce9bf32911f..44eacacd0e84e 100644 --- a/pkgs/tools/text/ripgrep-all/default.nix +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "ripgrep-all"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "phiresky"; repo = pname; rev = "v${version}"; - sha256 = "1nl03i36ilhxn5xbcry6pcr7vbl5667m43flpxaa0lf1wijzn5c2"; + sha256 = "1wjpgi7m3lxybllkr3r60zaphp02ykq2syq72q9ail2760cjcir6"; }; - cargoSha256 = "0ndyd8qrvljkk6yvpsp0w17iizxb529sh5q2bj790m32x0gz2w8l"; + cargoSha256 = "0arwxqrpxdws4q1pnqzqkp1yv5aas08lkzh1vcgmf26j58sycniy"; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index c794b4ba33c7c..ab589eb87fc14 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -1,9 +1,7 @@ { stdenv , fetchFromGitHub , rustPlatform -, asciidoc -, docbook_xsl -, libxslt +, asciidoctor , installShellFiles , Security , withPCRE2 ? true @@ -12,27 +10,27 @@ rustPlatform.buildRustPackage rec { pname = "ripgrep"; - version = "12.0.1"; + version = "12.1.0"; src = fetchFromGitHub { owner = "BurntSushi"; repo = pname; rev = version; - sha256 = "1c0v51s05kbg9825n6mvpizhkkgz38wl7hp8f3vzbjfg4i8l8wb0"; + sha256 = "1vgkk78c25ia9y4q5psrh7xrlbfdn7dz7bc20kci40n8zr0vjwww"; }; - cargoSha256 = "0i8x2xgri8f8mzrlkc8l2yzcgczl35nw4bmwg09d343mjkmk6d8y"; + cargoSha256 = "143lnf4yah9ik7v8rphv7gbvr2ckhjpmy8zfgqml1n3fqxiqvxnb"; cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2"; - nativeBuildInputs = [ asciidoc docbook_xsl libxslt installShellFiles ]; + nativeBuildInputs = [ asciidoctor installShellFiles ]; buildInputs = (stdenv.lib.optional withPCRE2 pcre2) ++ (stdenv.lib.optional stdenv.isDarwin Security); preFixup = '' - (cd target/release/build/ripgrep-*/out - installManPage rg.1 - installShellCompletion rg.{bash,fish}) + installManPage $releaseDir/build/ripgrep-*/out/rg.1 + + installShellCompletion $releaseDir/build/ripgrep-*/out/rg.{bash,fish} installShellCompletion --zsh "$src/complete/_rg" ''; diff --git a/pkgs/tools/text/rosie/default.nix b/pkgs/tools/text/rosie/default.nix index 37f523c034751..4f70f972b683b 100644 --- a/pkgs/tools/text/rosie/default.nix +++ b/pkgs/tools/text/rosie/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "rosie"; version = "unstable-2020-01-11"; src = fetchgit { - url = https://gitlab.com/rosie-pattern-language/rosie; + url = "https://gitlab.com/rosie-pattern-language/rosie"; rev = "670e9027563609ba2ea31e14e2621a1302742795"; sha256 = "0jc512dbn62a1fniknhbp6q0xa1p7xi3hn5v60is8sy9jgi3afxv"; fetchSubmodules = true; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ libbsd readline ]; meta = with lib; { - homepage = https://rosie-lang.org; + homepage = "https://rosie-lang.org"; description = "Tools for searching using parsing expression grammars"; license = licenses.mit; maintainers = with maintainers; [ kovirobi ]; diff --git a/pkgs/tools/text/rs/default.nix b/pkgs/tools/text/rs/default.nix new file mode 100644 index 0000000000000..bd141f491d415 --- /dev/null +++ b/pkgs/tools/text/rs/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, libbsd }: + +stdenv.mkDerivation rec { + pname = "rs"; + version = "20200313"; + + src = fetchurl { + url = "https://www.mirbsd.org/MirOS/dist/mir/rs/${pname}-${version}.tar.gz"; + sha256 = "0gxwlfk7bzivpp2260w2r6gkyl7vdi05cggn1fijfnp8kzf1b4li"; + }; + + buildInputs = [ libbsd ]; + + buildPhase = '' + ${stdenv.cc}/bin/cc utf8.c rs.c -o rs -lbsd + ''; + + installPhase = '' + install -Dm 755 rs -t $out/bin + install -Dm 644 rs.1 -t $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + description = "Reshape a data array from standard input"; + longDescription = '' + rs reads the standard input, interpreting each line as a row of blank- + separated entries in an array, transforms the array according to the op- + tions, and writes it on the standard output. With no arguments (argc < 2) + it transforms stream input into a columnar format convenient for terminal + viewing, i.e. if the length (in bytes!) of the first line is smaller than + the display width, -et is implied, -t otherwise. + + The shape of the input array is deduced from the number of lines and the + number of columns on the first line. If that shape is inconvenient, a more + useful one might be obtained by skipping some of the input with the -k + option. Other options control interpretation of the input columns. + + The shape of the output array is influenced by the rows and cols specifi- + cations, which should be positive integers. If only one of them is a po- + sitive integer, rs computes a value for the other which will accommodate + all of the data. When necessary, missing data are supplied in a manner + specified by the options and surplus data are deleted. There are options + to control presentation of the output columns, including transposition of + the rows and columns. + ''; + + homepage = "https://www.mirbsd.org/htman/i386/man1/rs.htm"; + license = licenses.bsd3; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/text/rst2html5/default.nix b/pkgs/tools/text/rst2html5/default.nix index 83ac2d4d766dc..d20ce99dd74e2 100644 --- a/pkgs/tools/text/rst2html5/default.nix +++ b/pkgs/tools/text/rst2html5/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonPackage rec { [ docutils genshi pygments beautifulsoup4 ]; meta = with stdenv.lib;{ - homepage = https://bitbucket.org/andre_felipe_dias/rst2html5; + homepage = "https://bitbucket.org/andre_felipe_dias/rst2html5"; description = "Converts ReSTructuredText to (X)HTML5"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/pkgs/tools/text/ruby-zoom/default.nix b/pkgs/tools/text/ruby-zoom/default.nix index c395384083621..965d23d0c44bf 100644 --- a/pkgs/tools/text/ruby-zoom/default.nix +++ b/pkgs/tools/text/ruby-zoom/default.nix @@ -10,7 +10,7 @@ bundlerEnv { meta = with lib; { description = "Quickly open CLI search results in your favorite editor!"; - homepage = https://gitlab.com/mjwhitta/zoom; + homepage = "https://gitlab.com/mjwhitta/zoom"; license = with licenses; gpl3; maintainers = with maintainers; [ vmandela nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index a12f07d6da61f..a540918e56d23 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "sd"; - version = "0.7.2"; + version = "0.7.5"; src = fetchFromGitHub { owner = "chmln"; repo = pname; rev = "v${version}"; - sha256 = "15siv3p22v7lj37b74pjsy360qx97d40q2xdzdg2srbi8svjgg27"; + sha256 = "04jsni80jzhbb106283df34cdyp5p362l6m29kp30hnc6x49853q"; }; - cargoSha256 = "1sa7ki7kyg98l2gcrdzk7182ghm1clyqljjb596mhzh48g8kddn5"; + cargoSha256 = "1gwb76zys7gky42clzjs5g4hhgpfvzcw63chw9mnj703c7h0cgfh"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; @@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/chmln/sd"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.amar1729 ]; + maintainers = with maintainers; [ amar1729 filalex77 ]; }; } diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix index 2cc40510121ba..f4110ed210526 100644 --- a/pkgs/tools/text/sgml/jade/default.nix +++ b/pkgs/tools/text/sgml/jade/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "James Clark's DSSSL Engine"; license = "custom"; - homepage = http://www.jclark.com/jade/; + homepage = "http://www.jclark.com/jade/"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ e-user ]; }; diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix index cf3b2bad6c992..eee5d005c0585 100644 --- a/pkgs/tools/text/sgml/openjade/default.nix +++ b/pkgs/tools/text/sgml/openjade/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of DSSSL, an ISO standard for formatting SGML (and XML) documents"; license = stdenv.lib.licenses.mit; - homepage = http://openjade.sourceforge.net/; + homepage = "http://openjade.sourceforge.net/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index ade640dac7a9c..9880564d96921 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "opensp-1.5.2"; src = fetchurl { - url = mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz; + url = "mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz"; sha256 = "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p"; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = { description = "A suite of SGML/XML processing tools"; license = stdenv.lib.licenses.mit; - homepage = http://openjade.sourceforge.net/; + homepage = "http://openjade.sourceforge.net/"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/text/shab/default.nix b/pkgs/tools/text/shab/default.nix index 02d2d545122af..b5bb98e5f4d2a 100644 --- a/pkgs/tools/text/shab/default.nix +++ b/pkgs/tools/text/shab/default.nix @@ -41,7 +41,7 @@ let meta = with lib; { description = "The bash templating language"; - homepage = https://github.com/zimbatm/shab; + homepage = "https://github.com/zimbatm/shab"; license = licenses.unlicense; maintainers = with maintainers; [ zimbatm ]; platforms = bash.meta.platforms; diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index 71f79724b9cbb..ab96392a95d0e 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "shfmt"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "1k0bq4b4rv6wrh24jvcnpg1mfqrzqhl90zg4zibxzv3zkhjdskzh"; + sha256 = "0zlk1jjk65jwd9cx0xarz4yg2r2h86kd5g00gcnsav6dp6rx3aw8"; }; - modSha256 = "080k8d5rp8kyg0x7vjxm758b9ya9z336yd4rcqws7yhqawxiv55z"; + vendorSha256 = "1jq2x4yxshsy4ahp7nrry8dc9cyjj46mljs447rq57sgix4ndpq8"; subPackages = ["cmd/shfmt"]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -25,4 +25,4 @@ buildGoModule rec { ''; license = licenses.bsd3; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/text/shocco/default.nix b/pkgs/tools/text/shocco/default.nix index f657df5b780b8..65adfc29b95a6 100644 --- a/pkgs/tools/text/shocco/default.nix +++ b/pkgs/tools/text/shocco/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A quick-and-dirty, literate-programming-style documentation generator for / in POSIX shell"; - homepage = https://rtomayko.github.io/shocco/; + homepage = "https://rtomayko.github.io/shocco/"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix index c2a4cf22ea6dd..830810a84c43f 100644 --- a/pkgs/tools/text/sift/default.nix +++ b/pkgs/tools/text/sift/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with lib; { description = "sift is a fast and powerful alternative to grep"; - homepage = https://sift-tool.org; + homepage = "https://sift-tool.org"; maintainers = [ maintainers.carlsverre ]; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 2c28f9ea5a565..51003694203f4 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ pcre zlib lzma ]; meta = with stdenv.lib; { - homepage = https://github.com/ggreer/the_silver_searcher/; + homepage = "https://github.com/ggreer/the_silver_searcher/"; description = "A code-searching tool similar to ack, but faster"; maintainers = with maintainers; [ madjar ]; platforms = platforms.all; diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index e273105a14a51..d2116ced5e287 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { For example:- "spr`" expands to "Snippet Pixie rules!" ''; - homepage = https://www.snippetpixie.com; + homepage = "https://www.snippetpixie.com"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ianmjones diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index 8e937fe8518ba..7052d9e5a44a1 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Source code renderer with syntax highlighting"; - homepage = https://www.gnu.org/software/src-highlite/; + homepage = "https://www.gnu.org/software/src-highlite/"; license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux ++ darwin; longDescription = diff --git a/pkgs/tools/text/tab/default.nix b/pkgs/tools/text/tab/default.nix index b7855bc753250..f7796c8a32916 100644 --- a/pkgs/tools/text/tab/default.nix +++ b/pkgs/tools/text/tab/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Programming language/shell calculator"; - homepage = https://tkatchev.bitbucket.io/tab/; + homepage = "https://tkatchev.bitbucket.io/tab/"; license = licenses.boost; maintainers = with maintainers; [ mstarzyk ]; platforms = with platforms; linux; diff --git a/pkgs/tools/text/transifex-client/default.nix b/pkgs/tools/text/transifex-client/default.nix index 403adaf71b6fd..ac10564c9f769 100644 --- a/pkgs/tools/text/transifex-client/default.nix +++ b/pkgs/tools/text/transifex-client/default.nix @@ -3,7 +3,7 @@ buildPythonApplication rec { pname = "transifex-client"; - version = "0.13.6"; + version = "0.13.9"; propagatedBuildInputs = [ urllib3 requests python-slugify six setuptools @@ -11,13 +11,13 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "0y6pprlmkmi7wfqr3k70sb913qa70p3i90q5mravrai7cr32y1w8"; + sha256 = "0lgd77vrddvyn8afkxr7a7hblmp4k5sr0i9i1032xdih2bipdd9f"; }; prePatch = '' substituteInPlace requirements.txt --replace "urllib3<1.24" "urllib3>=1.24" \ --replace "six==1.11.0" "six>=1.11.0" \ - --replace "python-slugify==1.2.6" "python-slugify>=1.2.6" + --replace "python-slugify<2.0.0" "python-slugify>2.0.0" ''; # Requires external resources diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix index 100124043ed7a..f70ad1710e298 100644 --- a/pkgs/tools/text/txt2tags/default.nix +++ b/pkgs/tools/text/txt2tags/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = https://txt2tags.org/; + homepage = "https://txt2tags.org/"; description = "A KISS markup language"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ kovirobi ]; diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index ccf17695f6cd0..d6b1215caf399 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.gpl3; - homepage = http://billposer.org/Software/uni2ascii.html; + homepage = "http://billposer.org/Software/uni2ascii.html"; description = "Converts between UTF-8 and many 7-bit ASCII equivalents and back"; longDescription = '' diff --git a/pkgs/tools/text/unoconv/default.nix b/pkgs/tools/text/unoconv/default.nix index 2eaabc4f53d5b..dc9412d3c0e02 100644 --- a/pkgs/tools/text/unoconv/default.nix +++ b/pkgs/tools/text/unoconv/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Convert between any document format supported by LibreOffice/OpenOffice"; - homepage = http://dag.wieers.com/home-made/unoconv/; + homepage = "http://dag.wieers.com/home-made/unoconv/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix index 93611ec5531d3..752d576701ee4 100644 --- a/pkgs/tools/text/unrtf/default.nix +++ b/pkgs/tools/text/unrtf/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { UnRTF converts documents in Rich Text Format to other formats, including HTML, LaTeX, and RTF itself. ''; - homepage = https://www.gnu.org/software/unrtf/; + homepage = "https://www.gnu.org/software/unrtf/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ joachifm ]; platforms = platforms.unix; diff --git a/pkgs/tools/text/untex/default.nix b/pkgs/tools/text/untex/default.nix index f9c7e3cdfc632..829c4da384936 100644 --- a/pkgs/tools/text/untex/default.nix +++ b/pkgs/tools/text/untex/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A utility which removes LaTeX commands from input"; - homepage = https://www.ctan.org/pkg/untex; + homepage = "https://www.ctan.org/pkg/untex"; license = licenses.gpl1; maintainers = with maintainers; [ joachifm ]; platforms = platforms.all; diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index 001ed1addaade..bec7ba8825ddb 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { checkInputs = [ which ]; meta = { - homepage = https://www.gnu.org/software/wdiff/; + homepage = "https://www.gnu.org/software/wdiff/"; description = "Comparing files on a word by word basis"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index 3360fd4cbe096..9180573541d2a 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Command-line interface to various pastebins"; - homepage = http://wgetpaste.zlin.dk/; + homepage = "http://wgetpaste.zlin.dk/"; license = stdenv.lib.licenses.publicDomain; maintainers = with stdenv.lib.maintainers; [ qknight domenkozar ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix index 92ad2e005884b..fabfdd857107c 100644 --- a/pkgs/tools/text/xidel/default.nix +++ b/pkgs/tools/text/xidel/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command line tool to download and extract data from html/xml pages"; - homepage = http://videlibri.sourceforge.net/xidel.html; + homepage = "http://videlibri.sourceforge.net/xidel.html"; # source contains no license info (AFAICS), but sourceforge says GPLv2 license = licenses.gpl2; # more platforms will be supported when we switch to source build diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 704ccede799bf..4dcaed16bb84e 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { highly interactive front-end (basexgui). Apart from two local standalone modes, BaseX offers a client/server architecture. ''; - homepage = http://basex.org/; + homepage = "http://basex.org/"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index 7ac624caff184..c42ecfc244106 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities for manipulating HTML and XML files"; - homepage = http://www.w3.org/Tools/HTML-XML-utils/; + homepage = "http://www.w3.org/Tools/HTML-XML-utils/"; license = licenses.w3c; platforms = platforms.all; }; diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index b38c2b3e34de0..dcf83c736cc42 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { description = "A RELAX NG validator in Java"; # The homepage is www.thaiopensource.com, but it links to googlecode.com # for downloads and call it the "project site". - homepage = https://www.thaiopensource.com/relaxng/trang.html; + homepage = "https://www.thaiopensource.com/relaxng/trang.html"; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/tools/text/xml/rnv/default.nix b/pkgs/tools/text/xml/rnv/default.nix index 21869cef4ee42..2bc1b6ddddac4 100644 --- a/pkgs/tools/text/xml/rnv/default.nix +++ b/pkgs/tools/text/xml/rnv/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Relax NG Compact Syntax validator"; - homepage = http://www.davidashen.net/rnv.html; + homepage = "http://www.davidashen.net/rnv.html"; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/tools/text/xml/rxp/default.nix b/pkgs/tools/text/xml/rxp/default.nix index 093f1b0aec7f2..c0e2ea1c4e25f 100644 --- a/pkgs/tools/text/xml/rxp/default.nix +++ b/pkgs/tools/text/xml/rxp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.gpl2Plus; description = "A validating XML parser written in C"; - homepage = http://www.cogsci.ed.ac.uk/~richard/rxp.html; + homepage = "http://www.cogsci.ed.ac.uk/~richard/rxp.html"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/text/xml/xml2/default.nix b/pkgs/tools/text/xml/xml2/default.nix index 3be952358b65a..8c341855e6877 100644 --- a/pkgs/tools/text/xml/xml2/default.nix +++ b/pkgs/tools/text/xml/xml2/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "xml2-0.5"; src = fetchurl { - url = https://web.archive.org/web/20160427221603/http://download.ofb.net/gale/xml2-0.5.tar.gz; + url = "https://web.archive.org/web/20160427221603/http://download.ofb.net/gale/xml2-0.5.tar.gz"; sha256 = "01cps980m99y99cnmvydihga9zh3pvdsqag2fi1n6k2x7rfkl873"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ libxml2 ]; meta = with stdenv.lib; { - homepage = https://web.archive.org/web/20160515005047/http://dan.egnor.name:80/xml2; + homepage = "https://web.archive.org/web/20160515005047/http://dan.egnor.name:80/xml2"; description = "Tools for command line processing of XML, HTML, and CSV"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix index 5d085e4119637..2cd7a580ee344 100644 --- a/pkgs/tools/text/xml/xmloscopy/default.nix +++ b/pkgs/tools/text/xml/xmloscopy/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "wtf is my docbook broken?"; - homepage = https://github.com/grahamc/xmloscopy; + homepage = "https://github.com/grahamc/xmloscopy"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ grahamc ]; diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index 4fe6ad6b3dc97..7d3471f9561c2 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A command line tool for manipulating and querying XML data"; - homepage = http://xmlstar.sourceforge.net/; + homepage = "http://xmlstar.sourceforge.net/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix index b35053d362bbc..6999a4a64d030 100644 --- a/pkgs/tools/text/xml/xpf/default.nix +++ b/pkgs/tools/text/xml/xpf/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "xpf-0.2"; src = fetchurl { - url = http://tarballs.nixos.org/xpf-0.2.tar.gz; + url = "http://tarballs.nixos.org/xpf-0.2.tar.gz"; sha256 = "0ljx91w68rnh4871c0xlq2whlmhqz8dr39wcdczfjjpniqz1fmpz"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "XML Pipes and Filters - command line tools for manipulating and querying XML data"; - homepage = http://www.cs.uu.nl/wiki/bin/view/Martin/XmlPipesAndFilters; + homepage = "http://www.cs.uu.nl/wiki/bin/view/Martin/XmlPipesAndFilters"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix index 72a586d2b22d7..927d0d14be68a 100644 --- a/pkgs/tools/text/xsv/default.nix +++ b/pkgs/tools/text/xsv/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A fast CSV toolkit written in Rust"; - homepage = https://github.com/BurntSushi/xsv; + homepage = "https://github.com/BurntSushi/xsv"; license = with licenses; [ unlicense /* or */ mit ]; maintainers = [ maintainers.jgertm ]; platforms = platforms.all; diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix index c8d10a6e26997..6c8e5520d7453 100644 --- a/pkgs/tools/text/xurls/default.nix +++ b/pkgs/tools/text/xurls/default.nix @@ -1,14 +1,14 @@ { buildGoPackage, stdenv, fetchFromGitHub }: buildGoPackage rec { - version = "2.0.0"; + version = "2.2.0"; pname = "xurls"; src = fetchFromGitHub { owner = "mvdan"; repo = "xurls"; rev = "v${version}"; - sha256 = "1jdjwlp19r8cb7vycyrjmpwf8dz2fzrqphq4lkvy9x2v7x0kksx8"; + sha256 = "0w7i1yfl5q24wvmsfb3fz1zcqsdh4c6qikjnmswxbjc7wva8rngg"; }; goPackagePath = "mvdan.cc/xurls/v2"; @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Extract urls from text"; - homepage = https://github.com/mvdan/xurls; + homepage = "https://github.com/mvdan/xurls"; maintainers = with maintainers; [ koral ]; platforms = platforms.unix; license = licenses.bsd3; diff --git a/pkgs/tools/text/yaml-merge/default.nix b/pkgs/tools/text/yaml-merge/default.nix index 95a94cee7c4bb..b91d24e1137d7 100644 --- a/pkgs/tools/text/yaml-merge/default.nix +++ b/pkgs/tools/text/yaml-merge/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Merge YAML data files"; - homepage = https://github.com/abbradar/yaml-merge; + homepage = "https://github.com/abbradar/yaml-merge"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix index 177f9326dd27e..0b947ee5db363 100644 --- a/pkgs/tools/text/zimreader/default.nix +++ b/pkgs/tools/text/zimreader/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "A tool to serve ZIM files using HTTP"; - homepage = http://git.wikimedia.org/log/openzim; + homepage = "http://git.wikimedia.org/log/openzim"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ robbinch juliendehos ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix index 27334bf09b4c4..8362280c2fa23 100644 --- a/pkgs/tools/text/zimwriterfs/default.nix +++ b/pkgs/tools/text/zimwriterfs/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "A console tool to create ZIM files"; - homepage = http://git.wikimedia.org/log/openzim; + homepage = "http://git.wikimedia.org/log/openzim"; maintainers = with stdenv.lib.maintainers; [ robbinch ]; license = stdenv.lib.licenses.gpl3; platforms = with stdenv.lib.platforms; [ linux ]; diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 44c5f6d1f242c..136c25f73b159 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -273,7 +273,7 @@ stdenv.mkDerivation rec { the backend output markups (which can be almost any type of SGML/XML markup) can be customized and extended by the user. ''; - homepage = http://www.methods.co.nz/asciidoc/; + homepage = "http://www.methods.co.nz/asciidoc/"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index 20bbe782d91d0..f875cc26311bd 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -30,7 +30,7 @@ let meta = with lib; { description = "A faster Asciidoc processor written in Ruby"; - homepage = https://asciidoctor.org/; + homepage = "https://asciidoctor.org/"; license = licenses.mit; maintainers = with maintainers; [ gpyh nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix index 39e7eab34abbe..ba46d36814ac7 100644 --- a/pkgs/tools/typesetting/asciidoctorj/default.nix +++ b/pkgs/tools/typesetting/asciidoctorj/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "asciidoctorj"; - version = "2.2.0"; + version = "2.3.0"; src = fetchzip { url = "http://dl.bintray.com/asciidoctor/maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip"; - sha256 = "0akxzfibfa8msnardvyy9hkj2z6sqn7pnwphz6avixdcclg6yxa5"; + sha256 = "1hmra1pg79hj9kqbj6702y5b03vyvfzqf6hq65jg1vxjqlq7h3xx"; }; nativeBuildInputs = [ makeWrapper ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { structure of a parsed AsciiDoc document from Java and other JVM languages. ''; - homepage = https://asciidoctor.org/docs/asciidoctorj/; + homepage = "https://asciidoctor.org/docs/asciidoctorj/"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ moaxcp ]; diff --git a/pkgs/tools/typesetting/bibclean/default.nix b/pkgs/tools/typesetting/bibclean/default.nix index 5763a059d4b72..d0e2c79c0bcef 100644 --- a/pkgs/tools/typesetting/bibclean/default.nix +++ b/pkgs/tools/typesetting/bibclean/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bibclean"; - version = "3.03"; + version = "3.04"; src = fetchurl { url = "http://ftp.math.utah.edu/pub/bibclean/bibclean-${version}.tar.xz"; - sha256 = "06ic9zix8gh1wz7hd1cnlxxyrp7sqs67a7xnv08r71b5ikri35a3"; + sha256 = "0n5jb6w86y91q5lkcc9sb1kh4c2bk3q2va24gfr0n6v1jzyqp9jg"; }; postPatch = '' diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix index cb667e6b12182..4e76fb87a6bda 100644 --- a/pkgs/tools/typesetting/djvu2pdf/default.nix +++ b/pkgs/tools/typesetting/djvu2pdf/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Convert DjVu files to PDF files"; - homepage = https://0x2a.at/s/projects/djvu2pdf; + homepage = "https://0x2a.at/s/projects/djvu2pdf"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; inherit version; diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/tools/typesetting/docbook2odf/default.nix index 7200909660bdf..d846d9394b26c 100644 --- a/pkgs/tools/typesetting/docbook2odf/default.nix +++ b/pkgs/tools/typesetting/docbook2odf/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { makes it easy to convert DocBook->ODF, ODT, ODS and ODP as all these documents are XML based. ''; - homepage = http://open.comsultia.com/docbook2odf/; + homepage = "http://open.comsultia.com/docbook2odf/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index 5309e4555b49c..a36da7a2b6ae8 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { format. ''; license = licenses.mit; - homepage = http://docbook2x.sourceforge.net/; + homepage = "http://docbook2x.sourceforge.net/"; platforms = platforms.all; }; } diff --git a/pkgs/tools/typesetting/docbookrx/default.nix b/pkgs/tools/typesetting/docbookrx/default.nix index 484e98fc88cb3..6bfb0188a3a85 100644 --- a/pkgs/tools/typesetting/docbookrx/default.nix +++ b/pkgs/tools/typesetting/docbookrx/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "(An early version of) a DocBook to AsciiDoc converter written in Ruby."; - homepage = https://asciidoctor.org/; + homepage = "https://asciidoctor.org/"; license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix index 0b5c79756bd6e..d5dea2c6dc6fe 100644 --- a/pkgs/tools/typesetting/fop/default.nix +++ b/pkgs/tools/typesetting/fop/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { This package contains the fop command line tool. ''; - homepage = https://xmlgraphics.apache.org/fop/; + homepage = "https://xmlgraphics.apache.org/fop/"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/tools/typesetting/git-latexdiff/default.nix b/pkgs/tools/typesetting/git-latexdiff/default.nix index c214bd3cac7e4..d969ca8fec6fc 100644 --- a/pkgs/tools/typesetting/git-latexdiff/default.nix +++ b/pkgs/tools/typesetting/git-latexdiff/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "View diff on LaTeX source files on the generated PDF files"; - homepage = https://gitlab.com/git-latexdiff/git-latexdiff; + homepage = "https://gitlab.com/git-latexdiff/git-latexdiff"; maintainers = [ ]; license = licenses.bsd3; # https://gitlab.com/git-latexdiff/git-latexdiff/issues/9 platforms = platforms.unix; diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/tools/typesetting/halibut/default.nix index f0ed44351a208..d2779df0c9442 100644 --- a/pkgs/tools/typesetting/halibut/default.nix +++ b/pkgs/tools/typesetting/halibut/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Documentation production system for software manuals"; - homepage = https://www.chiark.greenend.org.uk/~sgtatham/halibut/; + homepage = "https://www.chiark.greenend.org.uk/~sgtatham/halibut/"; license = licenses.mit; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index 7fca57ab9d261..ae6e2e9006e64 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Converts HTML files to PostScript and PDF"; - homepage = https://michaelrsweet.github.io/htmldoc; + homepage = "https://michaelrsweet.github.io/htmldoc"; license = licenses.gpl2; maintainers = with maintainers; [ shanemikel ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/tools/typesetting/kindlegen/default.nix b/pkgs/tools/typesetting/kindlegen/default.nix index ff63ece34173a..709e94005346a 100644 --- a/pkgs/tools/typesetting/kindlegen/default.nix +++ b/pkgs/tools/typesetting/kindlegen/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Convert documents to .mobi for use with Amazon Kindle"; - homepage = https://www.amazon.com/gp/feature.html?docId=1000765211; + homepage = "https://www.amazon.com/gp/feature.html?docId=1000765211"; license = licenses.unfree; maintainers = with maintainers; [ peterhoeg ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" "x86_64-cygwin" "i686-cygwin" ]; diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/default.nix b/pkgs/tools/typesetting/kramdown-asciidoc/default.nix index f37be270ddbe2..3b54eb637d2e3 100644 --- a/pkgs/tools/typesetting/kramdown-asciidoc/default.nix +++ b/pkgs/tools/typesetting/kramdown-asciidoc/default.nix @@ -27,7 +27,7 @@ let meta = with lib; { description = "A kramdown extension for converting Markdown documents to AsciiDoc."; - homepage = https://asciidoctor.org/; + homepage = "https://asciidoctor.org/"; license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix index 85c0bacf3155d..d86c4908f21b7 100644 --- a/pkgs/tools/typesetting/lout/default.nix +++ b/pkgs/tools/typesetting/lout/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # Author's page: http://jeffreykingston.id.au/lout/ # Wiki: https://sourceforge.net/p/lout/wiki/ - homepage = https://savannah.nongnu.org/projects/lout/; + homepage = "https://savannah.nongnu.org/projects/lout/"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix index 064e75ecbdc10..be7d4c9583334 100644 --- a/pkgs/tools/typesetting/mmark/default.nix +++ b/pkgs/tools/typesetting/mmark/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = { description = "A powerful markdown processor in Go geared towards the IETF"; - homepage = https://github.com/miekg/mmark; + homepage = "https://github.com/miekg/mmark"; license = with stdenv.lib.licenses; bsd2; maintainers = with stdenv.lib.maintainers; [ yrashk ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/tools/typesetting/multimarkdown/default.nix index 4cdbac7d63813..5043eb681e881 100644 --- a/pkgs/tools/typesetting/multimarkdown/default.nix +++ b/pkgs/tools/typesetting/multimarkdown/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { glossary entries (LaTeX only) document metadata (e.g. title, author, date, etc.) ''; - homepage = https://fletcherpenney.net/multimarkdown/; + homepage = "https://fletcherpenney.net/multimarkdown/"; # licensed under GPLv2+ or MIT: # https://raw.githubusercontent.com/fletcher/MultiMarkdown-4/master/LICENSE license = with stdenv.lib.licenses; [ gpl2Plus mit ]; diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix index 9f62671a4facf..4b85a252c1308 100644 --- a/pkgs/tools/typesetting/odpdown/default.nix +++ b/pkgs/tools/typesetting/odpdown/default.nix @@ -17,8 +17,8 @@ pythonPackages.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/thorstenb/odpdown; - repositories.git = https://github.com/thorstenb/odpdown.git; + homepage = "https://github.com/thorstenb/odpdown"; + repositories.git = "https://github.com/thorstenb/odpdown.git"; description = "Create nice-looking slides from your favourite text editor"; longDescription = '' Have a tool like pandoc, latex beamer etc, that you can write (or diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/tools/typesetting/pdf2odt/default.nix index c8e27fb5a6e7a..879597f91da4e 100644 --- a/pkgs/tools/typesetting/pdf2odt/default.nix +++ b/pkgs/tools/typesetting/pdf2odt/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PDF to ODT format converter"; - homepage = https://github.com/gutschke/pdf2odt; + homepage = "https://github.com/gutschke/pdf2odt"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix index 20da90961dda3..e445cf78d7ae3 100644 --- a/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Commandline utility to search text in PDF files"; - homepage = https://pdfgrep.org/; + homepage = "https://pdfgrep.org/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ qknight fpletz ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/tools/typesetting/pdfsandwich/default.nix b/pkgs/tools/typesetting/pdfsandwich/default.nix index f8b17be01ddc3..12fcf8a71a26b 100644 --- a/pkgs/tools/typesetting/pdfsandwich/default.nix +++ b/pkgs/tools/typesetting/pdfsandwich/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "OCR tool for scanned PDFs"; - homepage = http://www.tobias-elze.de/pdfsandwich/; + homepage = "http://www.tobias-elze.de/pdfsandwich/"; license = licenses.gpl2; maintainers = [ maintainers.rps ]; platforms = platforms.linux; diff --git a/pkgs/tools/typesetting/pdftk/legacy.nix b/pkgs/tools/typesetting/pdftk/legacy.nix index 72f25ef099bc3..b3edd7d54507f 100644 --- a/pkgs/tools/typesetting/pdftk/legacy.nix +++ b/pkgs/tools/typesetting/pdftk/legacy.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "Simple tool for doing everyday things with PDF documents"; - homepage = https://www.pdflabs.com/tools/pdftk-server/; + homepage = "https://www.pdflabs.com/tools/pdftk-server/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [raskin]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/typesetting/psutils/default.nix b/pkgs/tools/typesetting/psutils/default.nix index 39beab751a7ae..72c72d1b3baa6 100644 --- a/pkgs/tools/typesetting/psutils/default.nix +++ b/pkgs/tools/typesetting/psutils/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Collection of useful utilities for manipulating PS documents"; - homepage = http://knackered.knackered.org/angus/psutils/; + homepage = "http://knackered.knackered.org/angus/psutils/"; license = licenses.bsd3; }; } diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix index a045a9810b990..a9ac2690b66de 100644 --- a/pkgs/tools/typesetting/rubber/default.nix +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { of pdfLaTeX to produce PDF documents. ''; license = licenses.gpl2Plus; - homepage = https://launchpad.net/rubber; + homepage = "https://launchpad.net/rubber"; maintainers = with maintainers; [ ttuegel peterhoeg ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index c355d7b6d986b..7a4b8010f04cd 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -62,7 +62,7 @@ in ''; meta = with stdenv.lib; { - homepage = https://github.com/gfngfn/SATySFi; + homepage = "https://github.com/gfngfn/SATySFi"; description = "A statically-typed, functional typesetting system"; license = licenses.lgpl3; maintainers = [ maintainers.mt-caret maintainers.marsam ]; diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index 6bddf1073289a..356433bac41c3 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { scdoc is a simple man page generator written for POSIX systems written in C99. ''; - homepage = https://git.sr.ht/~sircmpwn/scdoc; + homepage = "https://git.sr.ht/~sircmpwn/scdoc"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 5bb4c5b7fb2f9..a8969fd459854 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.10.3"; + version = "0.10.4"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "d89d5ce7d2bf46fb062e5299ffd8b5d821dc3cb3462a0e7c1109edeee111d856"; + sha256 = "08j2vv6spnzz8bsh62wbdv1pjiziiba71cadscsy5hw6pklzndni"; }; configureFlags = [ "--with-system-luarocks" ]; diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix index b06b2e25fcc2c..813a464b7703d 100644 --- a/pkgs/tools/typesetting/skribilo/default.nix +++ b/pkgs/tools/typesetting/skribilo/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { outline mode and from other conventions used in emails, Usenet and text. ''; - homepage = https://www.nongnu.org/skribilo/; + homepage = "https://www.nongnu.org/skribilo/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/tools/typesetting/sshlatex/default.nix index be218cda535aa..26af225894673 100644 --- a/pkgs/tools/typesetting/sshlatex/default.nix +++ b/pkgs/tools/typesetting/sshlatex/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { thereby preloading the required LaTeX packages, it is also useful in a purely local setting. ''; - homepage = https://github.com/iblech/sshlatex; + homepage = "https://github.com/iblech/sshlatex"; license = stdenv.lib.licenses.gpl3Plus; # actually dual-licensed gpl3Plus | lppl13cplus platforms = stdenv.lib.platforms.all; maintainers = [ maintainers.iblech ]; diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 7e4c7dafefe3e..f5ac36690fd72 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive"; - homepage = https://tectonic-typesetting.github.io/; + homepage = "https://tectonic-typesetting.github.io/"; license = with licenses; [ mit ]; maintainers = [ maintainers.lluchs ]; platforms = platforms.all; diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/tools/typesetting/ted/default.nix index a03432b729ad4..25e9dce242f31 100644 --- a/pkgs/tools/typesetting/ted/default.nix +++ b/pkgs/tools/typesetting/ted/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { MS-Word. Additionally, Ted also is an RTF to PostScript and an RTF to Acrobat PDF converter. ''; - homepage = https://nllgg.nl/Ted/; + homepage = "https://nllgg.nl/Ted/"; license = licenses.gpl2; platforms = platforms.all; broken = stdenv.isDarwin; diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 787f19d91f4ab..ccb5dcc519079 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -29,7 +29,7 @@ let auctex = stdenv.mkDerivation ( rec { meta = { description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs"; - homepage = https://www.gnu.org/software/auctex; + homepage = "https://www.gnu.org/software/auctex"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index cc9432f6f22d1..a145e1a42ff2f 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = { description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt"; - homepage = http://dblatex.sourceforge.net/; + homepage = "http://dblatex.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/typesetting/tex/latexrun/default.nix b/pkgs/tools/typesetting/tex/latexrun/default.nix index 6d64b536502e7..392edfc3a2f3f 100644 --- a/pkgs/tools/typesetting/tex/latexrun/default.nix +++ b/pkgs/tools/typesetting/tex/latexrun/default.nix @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation { meta = with stdenvNoCC.lib; { description = "A 21st century LaTeX wrapper"; - homepage = https://github.com/aclements/latexrun; + homepage = "https://github.com/aclements/latexrun"; license = licenses.mit; maintainers = [ maintainers.lucus16 ]; platforms = platforms.all; diff --git a/pkgs/tools/typesetting/tex/lkproof/default.nix b/pkgs/tools/typesetting/tex/lkproof/default.nix index db0ec6d9bead6..39029635beb46 100644 --- a/pkgs/tools/typesetting/tex/lkproof/default.nix +++ b/pkgs/tools/typesetting/tex/lkproof/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "lkproof-3.1"; src = fetchurl { - url = http://mirror.ctan.org/macros/latex/contrib/lkproof.zip; + url = "http://mirror.ctan.org/macros/latex/contrib/lkproof.zip"; sha256 = "1qjkjhpc4rm62qxn18r83zdlwnj1wvnkcpdiqlv7w4bakh0gvjly"; }; diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix index 9215a1e0ac486..dc13ea3317822 100644 --- a/pkgs/tools/typesetting/tex/pgf/1.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/1.x.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pgf-1.18"; src = fetchurl { - url = mirror://sourceforge/pgf/pgf-1.18.tar.gz; + url = "mirror://sourceforge/pgf/pgf-1.18.tar.gz"; sha256 = "0s6b8rx9yfxcjjg18vx1mphnwbd28fl5lnq0dasjz40pp3ypwdjv"; }; diff --git a/pkgs/tools/typesetting/tex/pgf/2.x.nix b/pkgs/tools/typesetting/tex/pgf/2.x.nix index 56e50e4440815..00b92935babb6 100644 --- a/pkgs/tools/typesetting/tex/pgf/2.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/2.x.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pgf-2.00"; src = fetchurl { - url = mirror://sourceforge/pgf/pgf-2.00.tar.gz; + url = "mirror://sourceforge/pgf/pgf-2.00.tar.gz"; sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264"; }; diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix index 0835c7c547df2..a9ff54e4c11ec 100644 --- a/pkgs/tools/typesetting/tex/pgf/3.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pgf-3.00"; src = fetchurl { - url = mirror://sourceforge/project/pgf/pgf/version%203.0.0/pgf_3.0.0.tds.zip; + url = "mirror://sourceforge/project/pgf/pgf/version%203.0.0/pgf_3.0.0.tds.zip"; sha256 = "0kj769hyp4z2zmdv3f8xv443wcfqn5nkkbzxzqgfxjizlz81aav7"; }; diff --git a/pkgs/tools/typesetting/tex/pgfplots/default.nix b/pkgs/tools/typesetting/tex/pgfplots/default.nix index fcdebedb7d876..998f61786db45 100644 --- a/pkgs/tools/typesetting/tex/pgfplots/default.nix +++ b/pkgs/tools/typesetting/tex/pgfplots/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pgfplots-1.5.1"; src = fetchurl { - url = mirror://sourceforge/pgfplots/pgfplots_1.5.1.tds.zip; + url = "mirror://sourceforge/pgfplots/pgfplots_1.5.1.tds.zip"; sha256 = "1xajrmq35i0qlsfwydy5zzg6f1jg88hqqh5b3xsmglzrarnllbdi"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "TeX package to draw plots directly in TeX in two and three dimensions"; - homepage = http://pgfplots.sourceforge.net; + homepage = "http://pgfplots.sourceforge.net"; platforms = platforms.unix; license = licenses.gpl3Plus; }; diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index ac317fd51dcba..021927702ffbe 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation { name = "tetex-3.0"; src = fetchurl { - url = http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-src-3.0.tar.gz; + url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-src-3.0.tar.gz"; sha256 = "16v44465ipd9yyqri9rgxp6rbgs194k4sh1kckvccvdsnnp7w3ww"; }; texmf = fetchurl { - url = http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-texmf-3.0.tar.gz; + url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-texmf-3.0.tar.gz"; sha256 = "1hj06qvm02a2hx1a67igp45kxlbkczjlg20gr8lbp73l36k8yfvc"; }; @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A full-featured (La)TeX distribution"; - homepage = http://www.tug.org/tetex/; + homepage = "http://www.tug.org/tetex/"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; hydraPlatforms = []; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 6054ea5c6e922..c0ae6b8e187ba 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -26,10 +26,7 @@ let sha256 = "1dfps39q6bdr1zsbp9p74mvalmy3bycihv19sb9c6kg30kprz8nj"; }; - patches = [ - ]; - - postPatch = let + prePatch = let # The source compatible with Poppler ${popplerVersion} not yet available in TeXLive ${year} # so we need to use files introduced in https://www.tug.org/svn/texlive?view=revision&revision=52959 popplerVersion = "0.83.0"; @@ -68,10 +65,26 @@ let done cp -pv ${pdftoepdf} texk/web2c/pdftexdir/pdftoepdf.cc cp -pv ${pdftosrc} texk/web2c/pdftexdir/pdftosrc.cc + ''; + patches = [ # poppler 0.84 compat fixups, use 0.83 files otherwise - patch -p1 -i ${./poppler84.patch} - ''; + ./poppler84.patch + + (fetchpatch { + name = "texlive-poppler-0.86.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/texlive-poppler-0.86.patch?h=packages/texlive-bin&id=60244e41bb6f1501e8ed1fc9e6b7ba8d3f283398"; + sha256 = "0pdvhaqc3zgz7hp0x3a4qs0nh26fkvgmr6w1cjljqhp1nyiw2f1l"; + }) + + # Needed for ghostscript>=9.50 + (fetchpatch { + name = "xdvipdfm-fix.patch"; + url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/dvipdfm-x/spc_dvips.c?view=patch&r1=52765&r2=52764&pathrev=52765"; + sha256 = "0qvrc7yxhbl5f4g340z8aql388bwib0m2gxd473skbmviy5bjr3f"; + stripLen = 2; + }) + ]; # remove when removing synctex-missing-header.patch preAutoreconf = "pushd texk/web2c"; @@ -108,7 +121,7 @@ core = stdenv.mkDerivation rec { pname = "texlive-bin"; inherit version; - inherit (common) src patches postPatch preAutoreconf postAutoreconf; + inherit (common) src patches prePatch preAutoreconf postAutoreconf; outputs = [ "out" "doc" ]; @@ -188,7 +201,7 @@ core = stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Basic binaries for TeX Live"; - homepage = http://www.tug.org/texlive; + homepage = "http://www.tug.org/texlive"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ vcunat veprbl lovek323 raskin jwiegley ]; platforms = platforms.all; @@ -201,7 +214,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex pname = "texlive-core-big.bin"; inherit version; - inherit (common) src patches postPatch preAutoreconf postAutoreconf; + inherit (common) src patches prePatch preAutoreconf postAutoreconf; hardeningDisable = [ "format" ]; @@ -383,7 +396,7 @@ pygmentex = python2Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://www.ctan.org/pkg/pygmentex; + homepage = "https://www.ctan.org/pkg/pygmentex"; description = "Auxiliary tool for typesetting code listings in LaTeX documents using Pygments"; longDescription = '' PygmenTeX is a Python-based LaTeX package that can be used for diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 278e33c383a42..29c07408e7e1d 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -1,6 +1,6 @@ /* TeX Live user docs - source: ../../../../../doc/languages-frameworks/texlive.xml - - current html: http://nixos.org/nixpkgs/manual/#sec-language-texlive + - current html: https://nixos.org/nixpkgs/manual/#sec-language-texlive */ { stdenv, lib, fetchurl, runCommand, writeText, buildEnv , callPackage, ghostscriptX, harfbuzz, poppler_min @@ -111,8 +111,8 @@ let # (https://tug.org/historic/). urlPrefixes = args.urlPrefixes or [ # tlnet-final snapshot - http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2019/tlnet-final/archive - ftp://tug.org/texlive/historic/2019/tlnet-final/archive + "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2019/tlnet-final/archive" + "ftp://tug.org/texlive/historic/2019/tlnet-final/archive" # Daily snapshots hosted by one of the texlive release managers #https://texlive.info/tlnet-archive/2019/10/19/tlnet/archive @@ -175,7 +175,7 @@ in description = "TeX Live environment for ${pname}"; platforms = lib.platforms.all; hydraPlatforms = lib.optionals - (lib.elem pname ["scheme-small" "scheme-basic"]) platforms; + (!lib.elem pname ["scheme-infraonly"]) platforms; maintainers = with lib.maintainers; [ veprbl ]; } (combine { diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix index 0a1f6591b860e..31baa431bfc9e 100644 --- a/pkgs/tools/typesetting/tikzit/default.nix +++ b/pkgs/tools/typesetting/tikzit/default.nix @@ -2,13 +2,13 @@ mkDerivation { pname = "tikzit"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "tikzit"; repo = "tikzit"; - rev = "v2.1.4"; - sha256 = "121pgl2cdkksw48mjg6hzk7324ax6iw6fq7q3v1kdgwm8rwxm1fl"; + rev = "v2.1.5"; + sha256 = "1xrx7r8b6nb912k91pkdwaz2gijfq6lzssyqxard0591h2mycbcg"; }; nativeBuildInputs = [ qmake qttools flex bison ]; @@ -25,7 +25,7 @@ mkDerivation { can be included directly in papers typeset using LaTeX. For preview support the texlive package 'preview' has to be installed. ''; - homepage = https://tikzit.github.io/; + homepage = "https://tikzit.github.io/"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.iblech maintainers.mgttlinger ]; diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index b5b03b470cde7..f37bfb7c133b4 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl2Plus; - homepage = https://fedorahosted.org/xmlto/; + homepage = "https://fedorahosted.org/xmlto/"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index a4089636b951a..9a19a6789e579 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { This is a maintained fork of the original AtomicParsley. ''; - homepage = https://bitbucket.org/wez/atomicparsley; + homepage = "https://bitbucket.org/wez/atomicparsley"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ pjones ]; diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/tools/video/bento4/default.nix index 4dea8dba6eda0..94a1a5d04f32e 100644 --- a/pkgs/tools/video/bento4/default.nix +++ b/pkgs/tools/video/bento4/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Full-featured MP4 format and MPEG DASH library and tools"; - homepage = http://bento4.com; + homepage = "http://bento4.com"; license = licenses.gpl2Plus; maintainers = with maintainers; [ makefu ]; broken = stdenv.isAarch64; diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index 8fe2a70dcb44d..9077d34614df9 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { AVI type 2, Quicktime DV, a series of JPEG stills or MPEG2-TS. ''; - homepage = http://kinodv.org/; + homepage = "http://kinodv.org/"; license = licenses.gpl2Plus; platforms = platforms.gnu ++ platforms.linux; diff --git a/pkgs/tools/video/flvtool2/default.nix b/pkgs/tools/video/flvtool2/default.nix index 037e07c722865..9a1f9f121031f 100644 --- a/pkgs/tools/video/flvtool2/default.nix +++ b/pkgs/tools/video/flvtool2/default.nix @@ -9,7 +9,7 @@ buildRubyGem rec { meta = { broken = true; # depends on ruby 2.2 - homepage = https://github.com/unnu/flvtool2; + homepage = "https://github.com/unnu/flvtool2"; description = "A tool to manipulate Macromedia Flash Video files"; platforms = ruby.meta.platforms; license = lib.licenses.bsd3; diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 3e72d8b8af592..6c74aab957319 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A suite of programs for processing MPEG or MJPEG video"; - homepage = http://mjpeg.sourceforge.net/; + homepage = "http://mjpeg.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index 3832f3c3be0c8..b675c1a57c2fa 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "An xml2swf and swf2xml processor with import functionalities"; - homepage = http://swfmill.org; + homepage = "http://swfmill.org"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix index d75405ab309fd..a37f58937b81c 100644 --- a/pkgs/tools/video/swftools/default.nix +++ b/pkgs/tools/video/swftools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Collection of SWF manipulation and creation utilities"; - homepage = http://www.swftools.org/about.html; + homepage = "http://www.swftools.org/about.html"; license = licenses.gpl2; maintainers = [ maintainers.koral ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/video/untrunc/default.nix b/pkgs/tools/video/untrunc/default.nix index c7b76e0cb6ea5..728b4ff01188a 100644 --- a/pkgs/tools/video/untrunc/default.nix +++ b/pkgs/tools/video/untrunc/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Restore a damaged (truncated) mp4, m4v, mov, 3gp video from a similar, undamaged video"; license = licenses.gpl2; - homepage = https://github.com/ponchio/untrunc; + homepage = "https://github.com/ponchio/untrunc"; maintainers = [ maintainers.earvstedt ]; }; } diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix index 52d3e34f347bc..ed2d872b874c7 100644 --- a/pkgs/tools/video/vnc2flv/default.nix +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Tool to record VNC sessions to Flash Video"; - homepage = http://www.unixuser.org/~euske/python/vnc2flv/; + homepage = "http://www.unixuser.org/~euske/python/vnc2flv/"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix index 857524661bfa5..98b644a633c85 100644 --- a/pkgs/tools/video/vncrec/default.nix +++ b/pkgs/tools/video/vncrec/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "VNC recorder"; - homepage = http://ronja.twibright.com/utils/vncrec/; + homepage = "http://ronja.twibright.com/utils/vncrec/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/tools/video/yamdi/default.nix b/pkgs/tools/video/yamdi/default.nix index b9b16e4d8ece7..28861887ed2a4 100644 --- a/pkgs/tools/video/yamdi/default.nix +++ b/pkgs/tools/video/yamdi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Yet Another MetaData Injector for FLV"; - homepage = http://yamdi.sourceforge.net/; + homepage = "http://yamdi.sourceforge.net/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.ryanartecona ]; diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index ada948735d0f1..19766fb5ba9da 100644 --- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; # */ meta = with stdenv.lib; { - homepage = https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_CLI.html; + homepage = "https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_CLI.html"; description = "The Amazon ECS command line interface"; longDescription = "The Amazon Elastic Container Service (Amazon ECS) command line interface (CLI) provides high-level commands to simplify creating, updating, and monitoring clusters and tasks from a local development environment."; license = licenses.asl20; diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix index 57a68b8680961..f051fd12ab3b6 100644 --- a/pkgs/tools/virtualization/awless/default.nix +++ b/pkgs/tools/virtualization/awless/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/wallix/awless/; + homepage = "https://github.com/wallix/awless/"; description = "A Mighty CLI for AWS"; platforms = with platforms; linux ++ darwin; license = licenses.asl20; diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix index 618a45075c954..57aae0c695f98 100644 --- a/pkgs/tools/virtualization/aws/default.nix +++ b/pkgs/tools/virtualization/aws/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "aws-1.75"; src = fetchurl { - url = https://raw.github.com/timkay/aws/2f2ff99f9f5111ea708ae6cd14d20e264748e72b/aws; + url = "https://raw.github.com/timkay/aws/2f2ff99f9f5111ea708ae6cd14d20e264748e72b/aws"; sha256 = "0d5asv73a58yb1bb1jpsw3c7asd62y86z5fwpg4llhjzkx79maj6"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.timkay.com/aws/; + homepage = "https://www.timkay.com/aws/"; description = "Command-line utility for working with Amazon EC2, S3, SQS, ELB, IAM and SDB"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index fabdd53577435..aff00519a2dc8 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -88,7 +88,7 @@ in with localPython.pkgs; buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://aws.amazon.com/elasticbeanstalk/; + homepage = "https://aws.amazon.com/elasticbeanstalk/"; description = "A command line interface for Elastic Beanstalk"; maintainers = with maintainers; [ eqyiel ]; license = licenses.asl20; diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 580c2f9a01f3c..bf932ff1ad4fb 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -37,7 +37,7 @@ in pythonPackages.buildPythonApplication { doCheck = false; meta = { - homepage = https://cloudinit.readthedocs.org; + homepage = "https://cloudinit.readthedocs.org"; description = "Provides configuration and customization of cloud instance"; maintainers = [ lib.maintainers.madjar lib.maintainers.phile314 ]; platforms = lib.platforms.all; diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/tools/virtualization/cloudmonkey/default.nix index 1c7613b4893fa..2565d9346b0e1 100644 --- a/pkgs/tools/virtualization/cloudmonkey/default.nix +++ b/pkgs/tools/virtualization/cloudmonkey/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { meta = with lib; { description = "CLI for Apache CloudStack."; - homepage = https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+cloudmonkey+CLI; + homepage = "https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+cloudmonkey+CLI"; license = [ licenses.asl20 ]; maintainers = [ maintainers.womfoo ]; }; diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index 910f2822c6f31..ef622f055ee62 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -1,26 +1,41 @@ -{ buildGoPackage, fetchFromGitHub, lib }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: -buildGoPackage rec { +buildGoModule rec { pname = "cri-tools"; - version = "1.17.0"; + version = "1.18.0"; + src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "0h9gry56graif761lmcy91q9fzwvmwb15wcx8245927yfg5j0zgh"; + sha256 = "06sxjhjpd893fn945c1s4adri2bf7s50ddvcw5pnwb6qndzfljw6"; }; - goPackagePath = "github.com/kubernetes-sigs/cri-tools"; + vendorSha256 = null; + + nativeBuildInputs = [ installShellFiles ]; buildPhase = '' - pushd go/src/${goPackagePath} - make all install BINDIR=$bin/bin + make binaries VERSION=${version} + ''; + + installPhase = '' + make install BINDIR=$out/bin + + for shell in bash fish zsh; do + $out/bin/crictl completion $shell > crictl.$shell + installShellCompletion crictl.$shell + done ''; meta = with lib; { description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)"; - homepage = https://github.com/kubernetes-sigs/cri-tools; - license = lib.licenses.asl20; - maintainers = with maintainers; [ saschagrunert ]; + homepage = "https://github.com/kubernetes-sigs/cri-tools"; + license = licenses.asl20; + maintainers = with maintainers; [ ] ++ teams.podman.members; }; } diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index a781f3a442490..6ad8c355ee299 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { goDeps = ./deps.nix; postInstall = '' - wrapProgram $bin/bin/distrobuilder --prefix PATH ":" ${binPath} + wrapProgram $out/bin/distrobuilder --prefix PATH ":" ${binPath} ''; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index e8172066800d6..f8359e6286c9a 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; # */ meta = { - homepage = https://aws.amazon.com/developertools/Amazon-EC2/368; + homepage = "https://aws.amazon.com/developertools/Amazon-EC2/368"; description = "Command-line tools to create and manage Amazon EC2 virtual machine images"; license = stdenv.lib.licenses.amazonsl; }; diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix index 86ad36886c9fb..409b2ba8f416e 100644 --- a/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; # */ meta = { - homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351; + homepage = "http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351"; description = "Command-line tools to create and manage Amazon EC2 virtual machines"; license = stdenv.lib.licenses.amazonsl; }; diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index 0f00a3606d3ce..3d7b62777aa5d 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -7,7 +7,7 @@ in buildPythonApplication { version = "2.1.4"; src = fetchgit { - url = https://github.com/eucalyptus/euca2ools.git; + url = "https://github.com/eucalyptus/euca2ools.git"; rev = "19cb7eac34dd7efe3a56e4841b9692c03458bf3b"; sha256 = "0grsgn5gbvk1hlfa8qx7ppz7iyfyi2pdhxy8njr8lm60w4amfiyq"; }; @@ -15,7 +15,7 @@ in buildPythonApplication { propagatedBuildInputs = [ boto m2crypto ]; meta = { - homepage = https://github.com/eucalyptus/euca2ools; + homepage = "https://github.com/eucalyptus/euca2ools"; description = "Tools for interacting with Amazon EC2/S3-compatible cloud computing services"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix index 04d222609a67d..ea58eb4c6b837 100644 --- a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix @@ -1,29 +1,29 @@ { stdenv -, fetchFromGitHub +, lib +, bashInteractive , curl +, fetchFromGitHub , json_c +, nixosTests , pam -, bashInteractive }: stdenv.mkDerivation rec { pname = "google-compute-engine-oslogin"; - version = "1.5.3"; - # from packages/google-compute-engine-oslogin/packaging/debian/changelog + version = "20200507.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; - repo = "compute-image-packages"; - rev = "20190522"; - sha256 = "16jbbrnz49g843h813r408dbvfa2hicf8canxwbfxr2kzhv7ycmm"; + repo = "guest-oslogin"; + rev = version; + sha256 = "1np8c96sm29pwnxykc0id8kkgalhw576g43fgi1y936sr2hfvx3v"; }; - sourceRoot = "source/packages/google-compute-engine-oslogin"; postPatch = '' # change sudoers dir from /var/google-sudoers.d to /run/google-sudoers.d (managed through systemd-tmpfiles) - substituteInPlace pam_module/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d + substituteInPlace src/pam/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d # fix "User foo not allowed because shell /bin/bash does not exist" - substituteInPlace compat.h --replace /bin/bash ${bashInteractive}/bin/bash + substituteInPlace src/include/compat.h --replace /bin/bash ${bashInteractive}/bin/bash ''; buildInputs = [ curl.dev pam ]; @@ -31,22 +31,26 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="-I${json_c.dev}/include/json-c"; NIX_CFLAGS_LINK="-L${json_c}/lib"; - installPhase = '' - mkdir -p $out/{bin,lib} - - install -Dm755 libnss_cache_google-compute-engine-oslogin-${version}.so $out/lib/libnss_cache_oslogin.so.2 - install -Dm755 libnss_google-compute-engine-oslogin-${version}.so $out/lib/libnss_oslogin.so.2 - - install -Dm755 pam_oslogin_admin.so pam_oslogin_login.so $out/lib - install -Dm755 google_{oslogin_nss_cache,authorized_keys} $out/bin - ''; + makeFlags = [ + "VERSION=${version}" + "DESTDIR=${placeholder "out"}" + "PREFIX=/" + "BINDIR=/bin" + "LIBDIR=/lib" + "PAMDIR=/lib" + "MANDIR=/share/man" + ]; enableParallelBuilding = true; + passthru.tests = { + inherit (nixosTests) google-oslogin; + }; + meta = with stdenv.lib; { - homepage = https://github.com/GoogleCloudPlatform/compute-image-packages; + homepage = "https://github.com/GoogleCloudPlatform/compute-image-packages"; description = "OS Login Guest Environment for Google Compute Engine"; license = licenses.asl20; - maintainers = with maintainers; [ adisbladis flokli ]; + maintainers = with maintainers; [ flokli ]; }; } diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index 48255ca68a735..34f2bc9e19097 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { postPatch = '' for file in $(find google_compute_engine -type f); do substituteInPlace "$file" \ - --replace /bin/systemctl "/run/current-system/sw/bin/systemctl" \ + --replace /bin/systemctl "/run/current-system/systemd/bin/systemctl" \ --replace /bin/bash "${bashInteractive}/bin/bash" \ --replace /sbin/hwclock "${utillinux}/bin/hwclock" # SELinux tool ??? /sbin/restorecon diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index b53c211d379f6..e3329ea13f11c 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "govc"; - version = "0.21.0"; + version = "0.22.1"; goPackagePath = "github.com/vmware/govmomi"; @@ -12,12 +12,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "0mig8w0szxqcii3gihrsm8n8hzziq9l6axc5z32nw9kiy9bi4130"; + sha256 = "1z4am6143jrrls0023flnqgadm1z9p60w09cp1j5pnslm60vvw78"; }; meta = { description = "A vSphere CLI built on top of govmomi"; - homepage = https://github.com/vmware/govmomi/tree/master/govc; + homepage = "https://github.com/vmware/govmomi/tree/master/govc"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nicknovitski ]; }; diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index d7696be85e40f..c16eb003d8d43 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -1,42 +1,70 @@ -{ stdenv, fetchFromGitHub, perlPackages, makeWrapper}: +{ lib +, buildPythonApplication +, fetchFromGitHub +, fetchpatch +, fetchurl +, terminaltables +, colorclass +, requests +, pyyaml +, setuptools +}: -perlPackages.buildPerlPackage rec { +let + + spec = fetchurl { + url = "https://raw.githubusercontent.com/linode/linode-api-docs/v4.63.1/openapi.yaml"; + sha256 = "03ngzbq24zazfqmfd7xjmxixkcb9vv1jgamplsj633j7sjj708s0"; + }; + +in + +buildPythonApplication rec { pname = "linode-cli"; - version = "1.4.7"; + version = "2.14.1"; src = fetchFromGitHub { owner = "linode"; - repo = "cli"; - rev = "v${version}"; - sha256 = "1wiz067wgxi4z4rz4n9p7dlvx5z4hkl2nxpfvhikl6dri4m2nkkp"; + repo = pname; + rev = version; + sha256 = "1hpdmbzs182iag471yvq3kwd1san04a58sczzbmw6vjv2kswn1c2"; }; - buildInputs = [ makeWrapper ]; - propagatedBuildInputs = with perlPackages; [ - JSON - LWP - MozillaCA - TryTiny - WebServiceLinode + patches = [ + # make enum34 depend on python version + ( fetchpatch { + url = "https://github.com/linode/linode-cli/pull/184/commits/4cf55759c5da33fbc49b9ba664698875d67d4f76.patch"; + sha256 = "04n9a6yh0abyyymvfzajhav6qxwvzjl2vs8jnqp3yqrma7kl0slj"; + }) ]; - # Wrap perl scripts so they can find libraries - postInstall = '' - for n in "$out/bin"/*; do - wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" - done + # remove need for git history + prePatch = '' + substituteInPlace setup.py \ + --replace "version=get_version()," "version='${version}'," ''; - # Has no tests - doCheck = false; + propagatedBuildInputs = [ + terminaltables + colorclass + requests + pyyaml + setuptools + ]; - # Has no "doc" or "devdoc" outputs - outputs = [ "out" ]; + postConfigure = '' + python3 -m linodecli bake ${spec} --skip-config + cp data-3 linodecli/ + ''; - meta = with stdenv.lib; { - description = "Command-line interface to the Linode platform"; - homepage = https://github.com/linode/cli; - license = with licenses; [ artistic2 gpl2 ]; - maintainers = with maintainers; [ nixy ]; + # requires linode access token for unit tests, and running executable + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/linode/linode-cli"; + description = "The Linode Command Line Interface"; + license = licenses.bsd3; + maintainers = with maintainers; [ ryantm ]; }; + } diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/tools/virtualization/marathonctl/default.nix index 10103be263089..c557361f122f6 100644 --- a/pkgs/tools/virtualization/marathonctl/default.nix +++ b/pkgs/tools/virtualization/marathonctl/default.nix @@ -16,7 +16,7 @@ buildGoPackage { }; meta = with stdenv.lib; { - homepage = https://github.com/shoenig/marathonctl; + homepage = "https://github.com/shoenig/marathonctl"; description = "CLI tool for Marathon"; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/tools/virtualization/mininet/default.nix b/pkgs/tools/virtualization/mininet/default.nix index 0ee27d36e0afe..78ddc8e6dfd5c 100644 --- a/pkgs/tools/virtualization/mininet/default.nix +++ b/pkgs/tools/virtualization/mininet/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { fullName = "Mininet 2.3.0d6 License"; }; platforms = platforms.linux; - homepage = https://github.com/mininet/mininet; + homepage = "https://github.com/mininet/mininet"; maintainers = with maintainers; [ teto ]; }; } diff --git a/pkgs/tools/virtualization/nixos-shell/default.nix b/pkgs/tools/virtualization/nixos-shell/default.nix new file mode 100644 index 0000000000000..0c6d7e7b9bb80 --- /dev/null +++ b/pkgs/tools/virtualization/nixos-shell/default.nix @@ -0,0 +1,30 @@ +{ stdenv, nix, fetchFromGitHub, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "nixos-shell"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = "nixos-shell"; + rev = version; + sha256 = "1qk5a01vh6wbbkib8xr57w1j4l3n6xdjd46nsw9bsa444fzlc0wr"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/nixos-shell \ + --prefix PATH : ${stdenv.lib.makeBinPath [ nix ]} + ''; + + installFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with stdenv.lib; { + description = "Spawns lightweight nixos vms in a shell"; + inherit (src.meta) homepage; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix index 79dd4e4551adc..224e7b33081a5 100644 --- a/pkgs/tools/virtualization/rootlesskit/default.nix +++ b/pkgs/tools/virtualization/rootlesskit/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { }; meta = with lib; { - homepage = https://github.com/rootless-containers/rootlesskit; + homepage = "https://github.com/rootless-containers/rootlesskit"; description = ''Kind of Linux-native "fake root" utility, made for mainly running Docker and Kubernetes as an unprivileged user''; license = licenses.asl20; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix index 5f4d982d86d94..00771b9175015 100644 --- a/pkgs/tools/virtualization/udocker/default.nix +++ b/pkgs/tools/virtualization/udocker/default.nix @@ -33,7 +33,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "basic user tool to execute simple docker containers in user space without root privileges"; - homepage = https://indigo-dc.gitbooks.io/udocker; + homepage = "https://indigo-dc.gitbooks.io/udocker"; license = licenses.asl20; maintainers = [ maintainers.bzizou ]; platforms = platforms.linux; diff --git a/pkgs/tools/virtualization/vpsfree-client/Gemfile b/pkgs/tools/virtualization/vpsfree-client/Gemfile new file mode 100644 index 0000000000000..87c9aeebb90c1 --- /dev/null +++ b/pkgs/tools/virtualization/vpsfree-client/Gemfile @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +gem "vpsfree-client" diff --git a/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock b/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock new file mode 100644 index 0000000000000..9b8fd4b918a3d --- /dev/null +++ b/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock @@ -0,0 +1,75 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (6.0.2.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + concurrent-ruby (1.1.6) + cookiejar (0.3.3) + curses (1.3.2) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + em-http-request (1.1.5) + addressable (>= 2.3.4) + cookiejar (!= 0.3.1) + em-socksify (>= 0.3) + eventmachine (>= 1.0.3) + http_parser.rb (>= 0.6.0) + em-socksify (0.3.2) + eventmachine (>= 1.0.0.beta.4) + eventmachine (1.0.9.1) + haveapi-client (0.13.2) + activesupport (>= 4.0) + highline (~> 1.7.8) + json + require_all (~> 2.0.0) + rest-client (~> 2.0.2) + ruby-progressbar (~> 1.7.5) + highline (1.7.10) + http-cookie (1.0.3) + domain_name (~> 0.5) + http_parser.rb (0.6.0) + i18n (1.8.2) + concurrent-ruby (~> 1.0) + json (2.3.0) + mime-types (3.3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2020.0425) + minitest (5.14.0) + netrc (0.11.0) + public_suffix (4.0.4) + require_all (2.0.0) + rest-client (2.0.2) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + ruby-progressbar (1.7.5) + thread_safe (0.3.6) + tzinfo (1.2.7) + thread_safe (~> 0.1) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.7) + vpsadmin-client (3.0.0.master.20190517.pre.0.3ab5ddfe) + curses + em-http-request (~> 1.1.3) + eventmachine (~> 1.0.3) + haveapi-client (~> 0.13.0) + json + vpsfree-client (0.11.0) + vpsadmin-client (= 3.0.0.master.20190517.pre.0.3ab5ddfe) + zeitwerk (2.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + vpsfree-client + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/tools/virtualization/vpsfree-client/default.nix b/pkgs/tools/virtualization/vpsfree-client/default.nix new file mode 100644 index 0000000000000..17d570414882e --- /dev/null +++ b/pkgs/tools/virtualization/vpsfree-client/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerApp, bundlerUpdateScript }: + +bundlerApp { + pname = "vpsfree-client"; + gemdir = ./.; + exes = [ "vpsfreectl" ]; + + passthru.updateScript = bundlerUpdateScript "vpsfree-client"; + + meta = with lib; { + description = "Ruby API and CLI for the vpsFree.cz API"; + homepage = "https://github.com/vpsfreecz/vpsfree-client"; + maintainers = with maintainers; [ zimbatm ]; + license = licenses.gpl3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/virtualization/vpsfree-client/gemset.nix b/pkgs/tools/virtualization/vpsfree-client/gemset.nix new file mode 100644 index 0000000000000..366c5836bd3ac --- /dev/null +++ b/pkgs/tools/virtualization/vpsfree-client/gemset.nix @@ -0,0 +1,316 @@ +{ + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1md98dkbirc8mq5nbz1vqq3hwqjiv7b54q7180w8wyxgd4k1awwb"; + type = "gem"; + }; + version = "6.0.2.2"; + }; + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + type = "gem"; + }; + version = "2.7.0"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + type = "gem"; + }; + version = "1.1.6"; + }; + cookiejar = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q0kmbks9l3hl0wdq744hzy97ssq9dvlzywyqv9k9y1p3qc9va2a"; + type = "gem"; + }; + version = "0.3.3"; + }; + curses = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hic9kq09dhh8jqjx3k1991rnqhlj3glz82w0g7ndcri52m1hgqg"; + type = "gem"; + }; + version = "1.3.2"; + }; + domain_name = { + dependencies = ["unf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + type = "gem"; + }; + version = "0.5.20190701"; + }; + em-http-request = { + dependencies = ["addressable" "cookiejar" "em-socksify" "eventmachine" "http_parser.rb"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13rxmbi0fv91n4sg300v3i9iiwd0jxv0i6xd0sp81dx3jlx7kasx"; + type = "gem"; + }; + version = "1.1.5"; + }; + em-socksify = { + dependencies = ["eventmachine"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rk43ywaanfrd8180d98287xv2pxyl7llj291cwy87g1s735d5nk"; + type = "gem"; + }; + version = "0.3.2"; + }; + eventmachine = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17jr1caa3ggg696dd02g2zqzdjqj9x9q2nl7va82l36f7c5v6k4z"; + type = "gem"; + }; + version = "1.0.9.1"; + }; + haveapi-client = { + dependencies = ["activesupport" "highline" "json" "require_all" "rest-client" "ruby-progressbar"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wn5zvyy3w3q74m2fsb4jwxfdbdnpyyzxdf9iklpggcdmjhb78z0"; + type = "gem"; + }; + version = "0.13.2"; + }; + highline = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y"; + type = "gem"; + }; + version = "1.7.10"; + }; + http-cookie = { + dependencies = ["domain_name"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + type = "gem"; + }; + version = "1.0.3"; + }; + "http_parser.rb" = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + type = "gem"; + }; + version = "0.6.0"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm"; + type = "gem"; + }; + version = "1.8.2"; + }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; + type = "gem"; + }; + version = "2.3.0"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + type = "gem"; + }; + version = "3.3.1"; + }; + mime-types-data = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zin0q26wc5p7zb7glpwary7ms60s676vcq987yv22jgm6hnlwlh"; + type = "gem"; + }; + version = "3.2020.0425"; + }; + minitest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; + type = "gem"; + }; + version = "5.14.0"; + }; + netrc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + type = "gem"; + }; + version = "0.11.0"; + }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l1kqw75asziwmzrig8rywxswxz8l91sc3pvns02ffsqac1a3wiz"; + type = "gem"; + }; + version = "4.0.4"; + }; + require_all = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sjf2vigdg4wq7z0xlw14zyhcz4992s05wgr2s58kjgin12bkmv8"; + type = "gem"; + }; + version = "2.0.0"; + }; + rest-client = { + dependencies = ["http-cookie" "mime-types" "netrc"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j"; + type = "gem"; + }; + version = "2.0.2"; + }; + ruby-progressbar = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hynaavnqzld17qdx9r7hfw00y16ybldwq730zrqfszjwgi59ivi"; + type = "gem"; + }; + version = "1.7.5"; + }; + thread_safe = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + type = "gem"; + }; + version = "1.2.7"; + }; + unf = { + dependencies = ["unf_ext"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; + type = "gem"; + }; + version = "0.1.4"; + }; + unf_ext = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; + type = "gem"; + }; + version = "0.0.7.7"; + }; + vpsadmin-client = { + dependencies = ["curses" "em-http-request" "eventmachine" "haveapi-client" "json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ki3204pkg3f9wk9plbq5n9lrnsmc364smfxyrbq32gi8ag2y2s8"; + type = "gem"; + }; + version = "3.0.0.master.20190517.pre.0.3ab5ddfe"; + }; + vpsfree-client = { + dependencies = ["vpsadmin-client"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cs2ibl9kl39hnpzyhyczaqv4i58pn106vx2m6lds9p3av5mcbxs"; + type = "gem"; + }; + version = "0.11.0"; + }; + zeitwerk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1akpm3pwvyiack2zk6giv9yn3cqb8pw6g40p4394pdc3xmy3s4k0"; + type = "gem"; + }; + version = "2.3.0"; + }; +} \ No newline at end of file diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix index 4a81e8fe48b17..e5c5b0978af03 100644 --- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix +++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation (rec { version = "6.2.0"; meta = { description = "Citrix XenServer Tools"; - homepage = http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US; + homepage = "http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US"; maintainers = with stdenv.lib.maintainers; [ benwbooth ]; platforms = stdenv.lib.platforms.linux; license = [ stdenv.lib.licenses.gpl2 stdenv.lib.licenses.lgpl21 ]; diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix new file mode 100644 index 0000000000000..5b5b2d19181c4 --- /dev/null +++ b/pkgs/top-level/agda-packages.nix @@ -0,0 +1,28 @@ +{ pkgs, lib, callPackage, newScope, Agda }: + +let + mkAgdaPackages = Agda: lib.makeScope newScope (mkAgdaPackages' Agda); + mkAgdaPackages' = Agda: self: let + callPackage = self.callPackage; + inherit (callPackage ../build-support/agda { + inherit Agda self; + inherit (pkgs.haskellPackages) ghcWithPackages; + }) withPackages mkDerivation; + in { + inherit mkDerivation; + + agda = withPackages [] // { inherit withPackages; }; + + standard-library = callPackage ../development/libraries/agda/standard-library { + inherit (pkgs.haskellPackages) ghcWithPackages; + }; + + iowa-stdlib = callPackage ../development/libraries/agda/iowa-stdlib { }; + + agda-prelude = callPackage ../development/libraries/agda/agda-prelude { }; + + agda-categories = callPackage ../development/libraries/agda/agda-categories { }; + + cubical = callPackage ../development/libraries/agda/cubical { }; + }; +in mkAgdaPackages Agda diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b56f921d0c2aa..a01f5a9a34086 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -50,6 +50,8 @@ mapAliases ({ bar-xft = lemonbar-xft; # added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 + bazaar = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 + bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 beegfs = throw "beegfs has been removed."; # added 2019-11-24 bluezFull = bluez; # Added 2019-12-03 bridge_utils = bridge-utils; # added 2015-02-20 @@ -60,6 +62,8 @@ mapAliases ({ bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 + buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26 + buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 bundler_HEAD = bundler; # added 2015-11-15 cantarell_fonts = cantarell-fonts; # added 2018-03-03 catfish = xfce.catfish; # added 2019-12-22 @@ -98,6 +102,7 @@ mapAliases ({ devicemapper = lvm2; # added 2018-04-25 digikam5 = digikam; # added 2017-02-18 dmtx = dmtx-utils; # added 2018-04-25 + dnnl = oneDNN; # added 2020-04-22 docbook5_xsl = docbook_xsl_ns; # added 2018-04-25 docbook_xml_xslt = docbook_xsl; # added 2018-04-25 double_conversion = double-conversion; # 2017-11-22 @@ -146,12 +151,14 @@ mapAliases ({ fuse_exfat = exfat; # 2015-09-11 fuseki = apache-jena-fuseki; # added 2018-04-25 fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15 + fwupdate = throw "fwupdate was merged into fwupd"; # added 2020-05-19 gccApple = throw "gccApple is no longer supported"; # added 2018-04-25 gdb-multitarget = gdb; # added 2017-11-13 gdk_pixbuf = gdk-pixbuf; # added 2019-05-22 gettextWithExpat = gettext; # 2016-02-19 git-hub = gitAndTools.git-hub; # added 2016-04-29 glib_networking = glib-networking; # added 2018-02-25 + gmailieer = lieer; # added 2020-04-19 gnome-mpv = celluloid; # added 2019-08-22 gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2019-12-10 gmic_krita_qt = gmic-qt-krita; # added 2019-09-07 @@ -165,9 +172,11 @@ mapAliases ({ gnuradio-rds = gr-rds; # added 2019-05-27 gnuradio-osmosdr = gr-osmosdr; # added 2019-05-27 gnustep-make = gnustep.make; # added 2016-7-6 + go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 go-pup = pup; # added 2017-12-19 gobjectIntrospection = gobject-introspection; # added 2018-12-02 goimports = gotools; # added 2018-09-16 + gometalinter = throw "Abandoned by upstream. Consider switching to golangci-lint instead"; # added 2020-04-23 google-gflags = gflags; # added 2019-07-25 googleAuthenticator = google-authenticator; # added 2016-10-16 grantlee5 = libsForQt5.grantlee; # added 2015-12-19 @@ -210,6 +219,7 @@ mapAliases ({ keepassx-reboot = keepassx-community; # added 2017-02-01 keepassx2-http = keepassx-reboot; # added 2016-10-17 keybase-go = keybase; # added 2016-08-24 + kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # 2020-04-28 kicad-with-packages3d = kicad; # added 2019-11-25 krename-qt5 = krename; # added 2017-02-18 keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10 @@ -237,18 +247,28 @@ mapAliases ({ libGL_driver = mesa.drivers; libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 - liblapackWithoutAtlas = liblapack; # added 2018-11-05 + liblapackWithoutAtlas = lapack-reference; # added 2018-11-05 liblrdf = lrdf; # added 2018-04-25 libqrencode = qrencode; # added 2019-01-01 librdf = lrdf; # added 2020-03-22 librecad2 = librecad; # backwards compatibility alias, added 2015-10 libsysfs = sysfsutils; # added 2018-04-25 libtidy = html-tidy; # added 2014-12-21 + libtxc_dxtn = throw "removed 2020-03-16, now integrated in Mesa"; + libtxc_dxtn_s2tc = throw "removed 2020-03-16, now integrated in Mesa"; libudev = udev; # added 2018-04-25 + libusb = libusb1; # added 2020-04-28 libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 + libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09 links = links2; # added 2016-01-31 linux_rpi0 = linux_rpi1; linuxPackages_rpi0 = linuxPackages_rpi1; + + # added 2020-04-04 + linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; + linux_testing_hardened = throw "linux_testing_hardened has been removed, please use linux_latest_hardened"; + + linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # added 2020-05-22 loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 @@ -259,6 +279,7 @@ mapAliases ({ man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 + matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 matrique = spectral; # added 2020-01-27 mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 mess = mame; # added 2019-10-30 @@ -324,48 +345,50 @@ mapAliases ({ pg_tmp = ephemeralpg; # added 2018-01-16 php-embed = throw '' - php*-embed has been dropped, you can build the same package by using - something similar with this following snippet: - (php74.override { config.php.embed = true; config.php.apxs2 = false; }) + php*-embed has been dropped, you can build something similar + with the following snippet: + php74.override { embedSupport = true; apxs2Support = false; } ''; # added 2020-04-01 php72-embed = php-embed; # added 2020-04-01 php73-embed = php-embed; # added 2020-04-01 php74-embed = php-embed; # added 2020-04-01 phpPackages-embed = throw '' - php*Packages-embed has been dropped, you can build the same package by using - something similar with this following snippet: - (php74.override { config.php.embed = true; config.php.apxs2 = false; }).packages + php*Packages-embed has been dropped, you can build something + similar with the following snippet: + (php74.override { embedSupport = true; apxs2Support = false; }).packages ''; # added 2020-04-01 php74Packages-embed = phpPackages-embed; php73Packages-embed = phpPackages-embed; php72Packages-embed = phpPackages-embed; php-unit = throw '' - php*-unit has been dropped, you can build the same package by using - something similar with this following snippet: - (php74.override { - config.php.embed = true; - config.php.apxs2 = false; - config.php.systemd = false; - config.php.phpdbg = false; - config.php.cgi = false; - config.php.fpm = false; }) + php*-unit has been dropped, you can build something similar with + the following snippet: + php74.override { + embedSupport = true; + apxs2Support = false; + systemdSupport = false; + phpdbgSupport = false; + cgiSupport = false; + fpmSupport = false; + } ''; # added 2020-04-01 php72-unit = php-unit; # added 2020-04-01 php73-unit = php-unit; # added 2020-04-01 php74-unit = php-unit; # added 2020-04-01 phpPackages-unit = throw '' - php*Packages-unit has been dropped, you can build the same package by using - something similar with this following snippet: + php*Packages-unit has been dropped, you can build something + similar with this following snippet: (php74.override { - config.php.embed = true; - config.php.apxs2 = false; - config.php.systemd = false; - config.php.phpdbg = false; - config.php.cgi = false; - config.php.fpm = false; }).packages + embedSupport = true; + apxs2Support = false; + systemdSupport = false; + phpdbgSupport = false; + cgiSupport = false; + fpmSupport = false; + }).packages ''; # added 2020-04-01 php74Packages-unit = phpPackages-unit; php73Packages-unit = phpPackages-unit; @@ -423,6 +446,7 @@ mapAliases ({ quake3game = ioquake3; # added 2016-01-14 qwt6 = libsForQt5.qwt; # added 2015-12-19 qtpfsgui = throw "Is now luminanceHDR"; # added 2019-06-26 + quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09 rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21 rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 @@ -433,6 +457,7 @@ mapAliases ({ recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 + rkt = throw "rkt was archived by upstream"; # added 2020-05-16 ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby"; ruby_2_1_0 = throw "deprecated 2018-0213: use a newer version of ruby"; ruby_2_2_9 = throw "deprecated 2018-0213: use a newer version of ruby"; @@ -514,6 +539,7 @@ mapAliases ({ spice_gtk = spice-gtk; # added 2018-02-25 spice_protocol = spice-protocol; # added 2018-02-25 spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_60 instead."; # added 2019-10-16 + spring-boot = spring-boot-cli; # added 2020-04-24 sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22 sqliteInteractive = sqlite-interactive; # added 2014-12-06 squid4 = squid; # added 2019-08-22 @@ -557,8 +583,10 @@ mapAliases ({ transmission_gtk = transmission-gtk; # added 2018-01-06 transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; + trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # added 2020-04-29 truecrypt = veracrypt; # added 2018-10-24 tshark = wireshark-cli; # added 2018-04-25 + uberwriter = apostrophe; # added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 ucsFonts = ucs-fonts; # added 2016-07-15 ultrastardx-beta = ultrastardx; # added 2017-08-12 @@ -585,6 +613,7 @@ mapAliases ({ winswitch = throw "winswitch has been removed from nixpkgs."; # added 2019-12-10 wireguard = wireguard-tools; # added 2018-05-19 morituri = whipper; # added 2018-09-13 + xp-pen-g430 = pentablet-driver; # added 2020-05-03 xfceUnstable = xfce4-14; # added 2019-09-17 xfce4-14 = xfce; xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # added 2020-03-14 @@ -681,6 +710,11 @@ mapAliases ({ clang_35 = llvm_4; clang_4 = llvm_4; + # added 2019-04-13 + # *-polly pointed to llvmPackages_latest + llvm-polly = throw "clang is now built with polly-plugin by default"; + clang-polly = throw "clang is now built with polly-plugin by default"; + /* Cleanup before 20.09 */ oraclejdk8psu = throw '' The *psu versions of oraclejdk aren't provided by upstream anymore and were therefore removed! diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 836e668e9ec50..bc6c8e13f961f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -92,6 +92,8 @@ in common-updater-scripts = callPackage ../common-updater/scripts.nix { }; + genericUpdater = callPackage ../common-updater/generic-updater.nix { }; + ### Push NixOS tests inside the fixed point nixosTests = import ../../nixos/tests/all-tests.nix { @@ -102,6 +104,10 @@ in ### BUILD SUPPORT + auditBlasHook = makeSetupHook + { name = "auto-blas-hook"; deps = [ blas lapack ]; } + ../build-support/setup-hooks/audit-blas.sh; + autoreconfHook = makeSetupHook { deps = [ autoconf automake gettext libtool ]; } ../build-support/setup-hooks/autoreconf.sh; @@ -167,18 +173,26 @@ in colorz = callPackage ../tools/misc/colorz { }; + comedilib = callPackage ../development/libraries/comedilib { }; + + cpu-x = callPackage ../applications/misc/cpu-x { }; + dhallToNix = callPackage ../build-support/dhall-to-nix.nix { inherit dhall-nix; }; deadcode = callPackage ../development/tools/deadcode { }; - hobbes = callPackage ../development/tools/hobbes { stdenv = gcc6Stdenv; }; # GCC 6 is latest currently supported. See https://git.io/JvK6M. + glade = callPackage ../development/tools/glade { }; + + hobbes = callPackage ../development/tools/hobbes { }; proto-contrib = callPackage ../development/tools/proto-contrib {}; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; + ptags = callPackage ../development/tools/misc/ptags { }; + demoit = callPackage ../servers/demoit { }; deviceTree = callPackage ../os-specific/linux/device-tree {}; @@ -286,14 +300,12 @@ in packer = callPackage ../development/tools/packer { }; - packr = callPackage ../development/libraries/packr { - # Version 2.6.0 fails to build with go 1.13 due to nested modules: - # go: directory v2/packr2 is outside main module - buildGoModule = buildGo112Module; - }; + packr = callPackage ../development/libraries/packr { }; pet = callPackage ../development/tools/pet { }; + pkger = callPackage ../development/libraries/pkger { }; + run = callPackage ../development/tools/run { }; mod = callPackage ../development/tools/mod { }; @@ -444,7 +456,7 @@ in singularity-tools = callPackage ../build-support/singularity-tools { }; - srcOnly = args: callPackage ../build-support/src-only args; + srcOnly = callPackage ../build-support/src-only { }; substituteAll = callPackage ../build-support/substitute/substitute-all.nix { }; @@ -504,6 +516,8 @@ in _3llo = callPackage ../tools/misc/3llo { }; + _3mux = callPackage ../tools/misc/3mux { }; + _1password = callPackage ../applications/misc/1password { }; _6tunnel = callPackage ../tools/networking/6tunnel { }; @@ -567,9 +581,7 @@ in acme-client = callPackage ../tools/networking/acme-client { inherit (darwin) apple_sdk; }; - amass = callPackage ../tools/networking/amass { - inherit (darwin.apple_sdk.frameworks) Security; - }; + amass = callPackage ../tools/networking/amass { }; afew = callPackage ../applications/networking/mailreaders/afew { }; @@ -579,6 +591,12 @@ in stdenv = clangStdenv; }; + aflplusplus = callPackage ../tools/security/aflplusplus { + stdenv = clangStdenv; + python = python37; + wine = null; + }; + libdislocator = callPackage ../tools/security/afl/libdislocator.nix { }; afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { }; @@ -657,6 +675,8 @@ in aptly = callPackage ../tools/misc/aptly { }; + ArchiSteamFarm = callPackage ../applications/misc/ArchiSteamFarm { }; + archivemount = callPackage ../tools/filesystems/archivemount { }; arandr = callPackage ../tools/X11/arandr { }; @@ -768,6 +788,8 @@ in ec2-utils = callPackage ../tools/virtualization/ec2-utils { }; + exoscale-cli = callPackage ../tools/admin/exoscale-cli { }; + altermime = callPackage ../tools/networking/altermime {}; alttab = callPackage ../tools/X11/alttab { }; @@ -794,6 +816,10 @@ in bash-my-aws = callPackage ../tools/admin/bash-my-aws { }; + bashcards = callPackage ../tools/misc/bashcards { }; + + bazarr = callPackage ../servers/bazarr { }; + bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; bitwarden = callPackage ../tools/security/bitwarden { }; @@ -828,6 +854,8 @@ in certigo = callPackage ../tools/admin/certigo { }; + catcli = python3Packages.callPackage ../tools/filesystems/catcli { }; + chezmoi = callPackage ../tools/misc/chezmoi { }; chipsec = callPackage ../tools/security/chipsec { @@ -863,10 +891,14 @@ in ctrtool = callPackage ../tools/archivers/ctrtool { }; + crowbar = callPackage ../tools/security/crowbar { }; + crumbs = callPackage ../applications/misc/crumbs { }; crc32c = callPackage ../development/libraries/crc32c { }; + cudd = callPackage ../development/libraries/cudd { }; + cue = callPackage ../development/tools/cue { }; deltachat-electron = callPackage @@ -912,8 +944,12 @@ in libfx2 = with python3Packages; toPythonApplication fx2; + fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { }; + fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; + genpass = callPackage ../tools/security/genpass { }; + genymotion = callPackage ../development/mobile/genymotion { }; gaia = callPackage ../development/libraries/gaia { }; @@ -940,6 +976,8 @@ in gjs = callPackage ../development/libraries/gjs { }; + gjo = callPackage ../tools/text/gjo { }; + glances = python3Packages.callPackage ../applications/system/glances { }; glasgow = with python3Packages; toPythonApplication glasgow; @@ -1158,6 +1196,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + bat-extras = recurseIntoAttrs (callPackages ../tools/misc/bat-extras { }); + bc = callPackage ../tools/misc/bc { }; bdf2psf = callPackage ../tools/misc/bdf2psf { }; @@ -1222,14 +1262,9 @@ in charles4 ; - inherit (libsForQt5.callPackage ../development/libraries/libqmatrixclient { }) - libqmatrixclient_0_4 - libqmatrixclient_0_5 - libqmatrixclient; + libquotient = libsForQt5.callPackage ../development/libraries/libquotient {}; - inherit (libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }) - quaternion - quaternion-git; + quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; @@ -1257,8 +1292,6 @@ in blockdiag = with python3Packages; toPythonApplication blockdiag; - blsd = callPackage ../tools/misc/blsd { }; - bluez-alsa = callPackage ../tools/bluetooth/bluez-alsa { }; bluez-tools = callPackage ../tools/bluetooth/bluez-tools { }; @@ -1330,13 +1363,14 @@ in }; bsh = fetchurl { - url = http://www.beanshell.org/bsh-2.0b5.jar; + url = "http://www.beanshell.org/bsh-2.0b5.jar"; sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2"; }; btfs = callPackage ../os-specific/linux/btfs { }; - buildah = callPackage ../development/tools/buildah { }; + buildah = callPackage ../development/tools/buildah/wrapper.nix { }; + buildah-unwrapped = callPackage ../development/tools/buildah { }; buildkit = callPackage ../development/tools/buildkit { }; @@ -1484,11 +1518,7 @@ in compactor = callPackage ../applications/networking/compactor { }; - consul = callPackage ../servers/consul { - # Version 1.6.0 fails to build with go 1.13 due to broken dependency: - # go/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http_status.pb.go:11:2: code in directory /build/go/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/protoc-gen-validate/validate expects import "github.com/lyft/protoc-gen-validate/validate" - buildGoPackage = buildGo112Package; - }; + consul = callPackage ../servers/consul { }; consul-alerts = callPackage ../servers/monitoring/consul-alerts { }; @@ -1646,6 +1676,8 @@ in discount = callPackage ../tools/text/discount { }; + disk-filltest = callPackage ../tools/system/disk-filltest { }; + diskscan = callPackage ../tools/misc/diskscan { }; disorderfs = callPackage ../tools/filesystems/disorderfs { @@ -1809,7 +1841,7 @@ in fzy = callPackage ../tools/misc/fzy { }; - g2o = callPackage ../development/libraries/g2o { }; + g2o = libsForQt5.callPackage ../development/libraries/g2o { }; gbsplay = callPackage ../applications/audio/gbsplay { }; @@ -1841,6 +1873,8 @@ in gixy = callPackage ../tools/admin/gixy { }; + glpaper = callPackage ../development/tools/glpaper { }; + gllvm = callPackage ../development/tools/gllvm { }; glide = callPackage ../development/tools/glide { }; @@ -1957,6 +1991,8 @@ in linuxptp = callPackage ../os-specific/linux/linuxptp { }; + lite = callPackage ../applications/editors/lite { }; + loadwatch = callPackage ../tools/system/loadwatch { }; loccount = callPackage ../development/tools/misc/loccount { }; @@ -2009,7 +2045,9 @@ in mididings = callPackage ../tools/audio/mididings { }; - miniserve = callPackage ../tools/misc/miniserve { }; + miniserve = callPackage ../tools/misc/miniserve { + inherit (darwin.apple_sdk.frameworks) Security; + }; mkspiffs = callPackage ../tools/filesystems/mkspiffs { }; @@ -2045,6 +2083,8 @@ in nfstrace = callPackage ../tools/networking/nfstrace { }; + nix-direnv = callPackage ../tools/misc/nix-direnv { }; + nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; noteshrink = callPackage ../tools/misc/noteshrink { }; @@ -2069,6 +2109,8 @@ in xkbd = callPackage ../applications/misc/xkbd { }; + libpsm2 = callPackage ../os-specific/linux/libpsm2 { }; + optar = callPackage ../tools/graphics/optar {}; obinskit = callPackage ../applications/misc/obinskit {}; @@ -2105,6 +2147,8 @@ in pyCA = python3Packages.callPackage ../applications/video/pyca {}; + pyrit = callPackage ../tools/security/pyrit {}; + pyznap = python3Packages.callPackage ../tools/backup/pyznap {}; procs = callPackage ../tools/admin/procs { @@ -2131,6 +2175,8 @@ in stagit = callPackage ../development/tools/stagit { }; + statserial = callPackage ../tools/misc/statserial { }; + step-ca = callPackage ../tools/security/step-ca { }; step-cli = callPackage ../tools/security/step-cli { }; @@ -2456,6 +2502,7 @@ in circus = callPackage ../tools/networking/circus { }; citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { }; + citrix_workspace_unwrapped_20_04_0 = citrix_workspace_unwrapped.override { version = "20.04.0"; }; citrix_workspace_unwrapped_19_12_0 = citrix_workspace_unwrapped.override { version = "19.12.0"; }; citrix_workspace_unwrapped_19_10_0 = citrix_workspace_unwrapped.override { version = "19.10.0"; }; citrix_workspace_unwrapped_19_8_0 = citrix_workspace_unwrapped.override { version = "19.8.0"; }; @@ -2750,11 +2797,7 @@ in curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { }; - curlie = callPackage ../tools/networking/curlie { - # Version 1.2.0 fails to build with go 1.13 due to: - # verifying golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: Get https://sum.golang.org/lookup/golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:49088->[::1]:53: read: connection refused - buildGoModule = buildGo112Module; - }; + curlie = callPackage ../tools/networking/curlie { }; cunit = callPackage ../tools/misc/cunit { }; bcunit = callPackage ../tools/misc/bcunit { }; @@ -2805,6 +2848,10 @@ in deer = callPackage ../shells/zsh/zsh-deer { }; + deno = callPackage ../development/web/deno { + inherit (darwin.apple_sdk.frameworks) Security CoreServices; + }; + detox = callPackage ../tools/misc/detox { }; devilspie2 = callPackage ../applications/misc/devilspie2 { @@ -2829,9 +2876,15 @@ in ddrutility = callPackage ../tools/system/ddrutility { }; - deluge = callPackage ../applications/networking/p2p/deluge { + deluge-2_x = callPackage ../applications/networking/p2p/deluge/2 { + pythonPackages = python3Packages; + libtorrentRasterbar = libtorrentRasterbar.override { python = python3; }; + }; + deluge-1_x = callPackage ../applications/networking/p2p/deluge/1 { pythonPackages = python2Packages; + libtorrentRasterbar = libtorrentRasterbar-1_1_x; }; + deluge = deluge-2_x; desktop-file-utils = callPackage ../tools/misc/desktop-file-utils { }; @@ -2909,9 +2962,7 @@ in dmd = callPackage ../development/compilers/dmd { }; - dmg2img = callPackage ../tools/misc/dmg2img { - openssl = openssl_1_0_2; - }; + dmg2img = callPackage ../tools/misc/dmg2img { }; docbook2odf = callPackage ../tools/typesetting/docbook2odf { }; @@ -2956,6 +3007,10 @@ in driftnet = callPackage ../tools/networking/driftnet {}; + drill = callPackage ../tools/networking/drill { + inherit (darwin.apple_sdk.frameworks) Security; + }; + drone = callPackage ../development/tools/continuous-integration/drone { }; drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { }; @@ -3046,6 +3101,8 @@ in kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; + magic-vlsi = callPackage ../applications/science/electronics/magic-vlsi { }; + mcrcon = callPackage ../tools/networking/mcrcon {}; rage = callPackage ../tools/security/rage { @@ -3100,6 +3157,8 @@ in wob = callPackage ../tools/misc/wob { }; + xkcdpass = with pythonPackages; toPythonApplication xkcdpass; + xob = callPackage ../tools/X11/xob { }; z-lua = callPackage ../tools/misc/z-lua { }; @@ -3317,6 +3376,8 @@ in fdm = callPackage ../tools/networking/fdm {}; + fdtools = callPackage ../tools/misc/fdtools { }; + featherpad = callPackage ../applications/editors/featherpad {}; feedreader = callPackage ../applications/networking/feedreaders/feedreader {}; @@ -3347,8 +3408,6 @@ in stdenv = gccStdenv; }; - fluidasserts = with python37Packages; toPythonApplication fluidasserts; - flux = callPackage ../development/compilers/flux { }; fido2luks = callPackage ../tools/security/fido2luks {}; @@ -3472,9 +3531,6 @@ in fprot = callPackage ../tools/security/fprot { }; fprintd = callPackage ../tools/security/fprintd { }; - fprintd-thinkpad = fprintd.override { - thinkpad = true; - }; franz = callPackage ../applications/networking/instant-messengers/franz { }; @@ -3777,6 +3833,12 @@ in # rename to upower-notify? go-upower-notify = callPackage ../tools/misc/upower-notify { }; + goattracker = callPackage ../applications/audio/goattracker { }; + + goattracker-stereo = callPackage ../applications/audio/goattracker { + isStereo = true; + }; + google-app-engine-go-sdk = callPackage ../development/tools/google-app-engine-go-sdk { }; google-authenticator = callPackage ../os-specific/linux/google-authenticator { }; @@ -3872,9 +3934,7 @@ in grpcurl = callPackage ../tools/networking/grpcurl { }; - grpcui = callPackage ../tools/networking/grpcui { - buildGoModule = buildGo112Module; - }; + grpcui = callPackage ../tools/networking/grpcui { }; grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6; @@ -3968,6 +4028,8 @@ in httplab = callPackage ../tools/networking/httplab { }; + lucky-cli = callPackage ../development/web/lucky-cli { }; + partclone = callPackage ../tools/backup/partclone { }; partimage = callPackage ../tools/backup/partimage { }; @@ -4035,6 +4097,8 @@ in hcxtools = callPackage ../tools/security/hcxtools { }; + hcxdumptool = callPackage ../tools/security/hcxdumptool { }; + hdapsd = callPackage ../os-specific/linux/hdapsd { }; hdaps-gl = callPackage ../tools/misc/hdaps-gl { }; @@ -4269,6 +4333,8 @@ in intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { }; + intermodal = callPackage ../tools/misc/intermodal { }; + invoice2data = callPackage ../tools/text/invoice2data { }; inxi = callPackage ../tools/system/inxi { }; @@ -4293,12 +4359,7 @@ in iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; - ipfs = callPackage ../applications/networking/ipfs { - # Version 0.4.22 fails to build with go 1.13 due to version validation: - # go: github.com/go-critic/go-critic@v0.0.0-20181204210945-ee9bf5809ead: invalid pseudo-version: does not match version-control timestamp (2019-02-10T22:04:43Z) - # This is fixed in master, but release containing the fix does not exist yet. - buildGoModule = buildGo112Module; - }; + ipfs = callPackage ../applications/networking/ipfs { }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; @@ -4346,6 +4407,8 @@ in jade = callPackage ../tools/text/sgml/jade { }; + jadx = callPackage ../tools/security/jadx { }; + jazzy = callPackage ../development/tools/jazzy { }; jc = with python3Packages; toPythonApplication jc; @@ -4429,6 +4492,8 @@ in jucipp = callPackage ../applications/editors/jucipp { }; + jugglinglab = callPackage ../tools/misc/jugglinglab { }; + jupp = callPackage ../applications/editors/jupp { }; jupyter = callPackage ../applications/editors/jupyter { }; @@ -4530,6 +4595,8 @@ in kst = libsForQt5.callPackage ../tools/graphics/kst { gsl = gsl_1; }; + kstars = libsForQt5.callPackage ../applications/science/astronomy/kstars { }; + kytea = callPackage ../tools/text/kytea { }; k6 = callPackage ../development/tools/k6 { }; @@ -4583,6 +4650,8 @@ in lnav = callPackage ../tools/misc/lnav { }; + lnch = callPackage ../tools/misc/lnch { }; + loadlibrary = callPackage ../tools/misc/loadlibrary { }; loc = callPackage ../development/misc/loc { }; @@ -4652,8 +4721,14 @@ in medfile = callPackage ../development/libraries/medfile { }; + meilisearch = callPackage ../servers/search/meilisearch { + inherit (darwin.apple_sdk.frameworks) IOKit Security; + }; + memtester = callPackage ../tools/system/memtester { }; + mesa-demos = callPackage ../tools/graphics/mesa-demos { }; + mhonarc = perlPackages.MHonArc; minergate = callPackage ../applications/misc/minergate { }; @@ -4765,10 +4840,14 @@ in nodejs-slim-13_x = callPackage ../development/web/nodejs/v13.nix { enableNpm = false; }; + nodejs-14_x = callPackage ../development/web/nodejs/v14.nix { }; + nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix { + enableNpm = false; + }; # Update this when adding the newest nodejs major version! - nodejs_latest = nodejs-13_x; - nodejs-slim_latest = nodejs-slim-13_x; + nodejs_latest = nodejs-14_x; + nodejs-slim_latest = nodejs-slim-14_x; nodePackages_13_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v13.nix { nodejs = pkgs.nodejs-13_x; @@ -5112,6 +5191,8 @@ in mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; + microcom = callPackage ../applications/misc/microcom { }; + midisheetmusic = callPackage ../applications/audio/midisheetmusic { }; mikutter = callPackage ../applications/networking/instant-messengers/mikutter { }; @@ -5185,7 +5266,9 @@ in monit = callPackage ../tools/system/monit { }; - monolith = callPackage ../tools/backup/monolith { }; + monolith = callPackage ../tools/backup/monolith { + inherit (darwin.apple_sdk.frameworks) Security; + }; moreutils = callPackage ../tools/misc/moreutils { docbook-xsl = docbook_xsl; @@ -5391,9 +5474,7 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = callPackage ../applications/networking/cluster/nomad { - buildGoPackage = buildGo112Package; - }; + nomad = callPackage ../applications/networking/cluster/nomad { }; notable = callPackage ../applications/misc/notable { }; @@ -5501,6 +5582,8 @@ in nylon = callPackage ../tools/networking/nylon { }; + nym = callPackage ../applications/networking/nym { }; + nzbget = callPackage ../tools/networking/nzbget { }; oathToolkit = callPackage ../tools/security/oath-toolkit { }; @@ -5561,6 +5644,9 @@ in openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { }; openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { }; + openbazaar = callPackage ../applications/networking/openbazaar { }; + openbazaar-client = callPackage ../applications/networking/openbazaar/client.nix { }; + opencc = callPackage ../tools/text/opencc { }; opencl-info = callPackage ../tools/system/opencl-info { }; @@ -5638,6 +5724,8 @@ in stdenv = clangStdenv; }; + oq = callPackage ../development/tools/oq { }; + out-of-tree = callPackage ../development/tools/out-of-tree { }; oppai-ng = callPackage ../tools/misc/oppai-ng { }; @@ -5707,17 +5795,14 @@ in padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { }; page = callPackage ../tools/misc/page { }; - + pagmo2 = callPackage ../development/libraries/pagmo2 { }; pakcs = callPackage ../development/compilers/pakcs { }; pal = callPackage ../tools/misc/pal { }; - pandoc = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.pandoc) (drv: { - configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; - buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; - }); + pandoc = callPackage ../development/tools/pandoc { }; pamtester = callPackage ../tools/security/pamtester { }; @@ -5819,6 +5904,8 @@ in fmodex = callPackage ../games/zandronum/fmod.nix { }; + pdfminer = with python3Packages; toPythonApplication pdfminer; + pdfmod = callPackage ../applications/misc/pdfmod { }; pdf-quench = callPackage ../applications/misc/pdf-quench { }; @@ -5833,9 +5920,7 @@ in briss = callPackage ../tools/graphics/briss { }; - brickd = callPackage ../servers/brickd { - libusb = libusb1; - }; + brickd = callPackage ../servers/brickd { }; bully = callPackage ../tools/networking/bully { openssl = openssl_1_0_2; @@ -5949,7 +6034,8 @@ in podiff = callPackage ../tools/text/podiff { }; - podman = callPackage ../applications/virtualization/podman { }; + podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; + podman-unwrapped = callPackage ../applications/virtualization/podman { }; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; @@ -5991,8 +6077,6 @@ in prettyping = callPackage ../tools/networking/prettyping { }; - prey-bash-client = callPackage ../tools/security/prey { }; - profile-cleaner = callPackage ../tools/misc/profile-cleaner { }; profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { }; @@ -6195,6 +6279,8 @@ in richgo = callPackage ../development/tools/richgo { }; + rs = callPackage ../tools/text/rs { }; + rst2html5 = callPackage ../tools/text/rst2html5 { }; rt = callPackage ../servers/rt { }; @@ -6317,6 +6403,8 @@ in rrdtool = callPackage ../tools/misc/rrdtool { }; + rshijack = callPackage ../tools/networking/rshijack { }; + rsibreak = libsForQt5.callPackage ../applications/misc/rsibreak { }; rss2email = callPackage ../applications/networking/feedreaders/rss2email { @@ -6379,6 +6467,8 @@ in safe = callPackage ../tools/security/safe { }; + safety-cli = with python3.pkgs; toPythonApplication safety; + safe-rm = callPackage ../tools/system/safe-rm { }; safeeyes = callPackage ../applications/misc/safeeyes { }; @@ -6497,6 +6587,8 @@ in shocco = callPackage ../tools/text/shocco { }; + shopify-themekit = callPackage ../development/web/shopify-themekit { }; + shorewall = callPackage ../tools/networking/shorewall { }; shotwell = callPackage ../applications/graphics/shotwell { }; @@ -6568,9 +6660,7 @@ in sleuthkit = callPackage ../tools/system/sleuthkit {}; - sleepyhead = callPackage ../applications/misc/sleepyhead {}; - - slimrat = callPackage ../tools/networking/slimrat { }; + sleepyhead = libsForQt5.callPackage ../applications/misc/sleepyhead {}; slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { }; @@ -6599,6 +6689,8 @@ in smugline = python3Packages.smugline; + sn0int = callPackage ../tools/security/sn0int { }; + snabb = callPackage ../tools/networking/snabb { } ; snapcast = callPackage ../applications/audio/snapcast { }; @@ -6607,6 +6699,8 @@ in libpng = libpng12; }; + sniffglue = callPackage ../tools/networking/sniffglue { }; + snort = callPackage ../applications/networking/ids/snort { }; soapui = callPackage ../applications/networking/soapui { }; @@ -6619,6 +6713,8 @@ in python = python3; }; + sof-firmware = callPackage ../os-specific/linux/firmware/sof-firmware { }; + softhsm = callPackage ../tools/security/softhsm { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Security; @@ -6668,6 +6764,11 @@ in sourceHighlight = callPackage ../tools/text/source-highlight { }; + spacebar = callPackage ../os-specific/darwin/spacebar { + inherit (darwin.apple_sdk.frameworks) + Carbon Cocoa ScriptingBridge; + }; + spaceFM = callPackage ../applications/misc/spacefm { }; speech-denoiser = callPackage ../applications/audio/speech-denoiser {}; @@ -6736,7 +6837,10 @@ in sshpass = callPackage ../tools/networking/sshpass { }; sslscan = callPackage ../tools/security/sslscan { - openssl = openssl_1_0_2.override { enableSSL2 = true; }; + openssl = openssl_1_0_2.override { + enableSSL2 = true; + enableSSL3 = true; + }; }; sslmate = callPackage ../development/tools/sslmate { }; @@ -6803,6 +6907,8 @@ in libxml2 = libxml2Python; }; + systembus-notify = callPackage ../applications/misc/systembus-notify { }; + stricat = callPackage ../tools/security/stricat { }; staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; @@ -6835,6 +6941,8 @@ in tarsnapper = callPackage ../tools/backup/tarsnapper { }; + tartube = callPackage ../applications/video/tartube { }; + tayga = callPackage ../tools/networking/tayga { }; tcpcrypt = callPackage ../tools/security/tcpcrypt { }; @@ -6867,6 +6975,8 @@ in pythonPackages = python3Packages; }; + termius = callPackage ../applications/networking/termius { }; + termplay = callPackage ../tools/misc/termplay { }; tewisay = callPackage ../tools/misc/tewisay { }; @@ -7048,7 +7158,6 @@ in trilium-desktop trilium-server ; - trilium = trilium-desktop; trousers = callPackage ../tools/security/trousers { }; @@ -7079,6 +7188,8 @@ in tuir = callPackage ../applications/misc/tuir { }; + tuptime = callPackage ../tools/system/tuptime { }; + turses = callPackage ../applications/networking/instant-messengers/turses { }; oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; @@ -7097,6 +7208,8 @@ in txtw = callPackage ../tools/misc/txtw { }; + tydra = callPackage ../tools/misc/tydra { }; + u9fs = callPackage ../servers/u9fs { }; ua = callPackage ../tools/networking/ua { }; @@ -7135,6 +7248,8 @@ in unrtf = callPackage ../tools/text/unrtf { }; + unrpa = with python3Packages; toPythonApplication unrpa; + untex = callPackage ../tools/text/untex { }; untrunc = callPackage ../tools/video/untrunc { }; @@ -7153,6 +7268,8 @@ in urlview = callPackage ../applications/misc/urlview {}; + ursadb = callPackage ../servers/ursadb {}; + usbmuxd = callPackage ../tools/misc/usbmuxd {}; usync = callPackage ../applications/misc/usync { }; @@ -7324,6 +7441,10 @@ in wootility = callPackage ../tools/misc/wootility { }; + wormhole = callPackage ../tools/networking/wormhole { + inherit (darwin.apple_sdk.frameworks) Security; + }; + wpscan = callPackage ../tools/security/wpscan { }; wsmancli = callPackage ../tools/system/wsmancli {}; @@ -7378,6 +7499,8 @@ in tweet-hs = haskell.lib.justStaticExecutables haskellPackages.tweet-hs; + tweeny = callPackage ../development/libraries/tweeny { }; + qfsm = callPackage ../applications/science/electronics/qfsm { }; tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix { }; @@ -7477,6 +7600,8 @@ in uptimed = callPackage ../tools/system/uptimed { }; + upwork = callPackage ../applications/misc/upwork { }; + urjtag = callPackage ../tools/misc/urjtag { }; urlwatch = callPackage ../tools/networking/urlwatch { }; @@ -7536,6 +7661,8 @@ in which = callPackage ../tools/system/which { }; + whsniff = callPackage ../applications/networking/sniffers/whsniff { }; + woeusb = callPackage ../tools/misc/woeusb { }; chase = callPackage ../tools/system/chase { }; @@ -7995,8 +8122,6 @@ in useMacosReexportHack = true; }; }; - llvm-polly = llvmPackages_latest.llvm-polly; - clang-polly = llvmPackages_latest.clang.override { cc = llvmPackages_latest.clang-polly-unwrapped; }; clang_10 = llvmPackages_10.clang; clang_9 = llvmPackages_9.clang; @@ -8056,20 +8181,16 @@ in cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol; inherit (callPackages ../development/compilers/crystal { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - inherit (llvmPackages_6) clang llvm; + inherit (llvmPackages_10) stdenv clang llvm; }) - crystal_0_27 - crystal_0_29 - crystal_0_30 crystal_0_31 crystal_0_32 + crystal_0_33 + crystal_0_34 crystal crystal2nix; - icr = callPackage ../development/tools/icr { - openssl = openssl_1_0_2; - }; + icr = callPackage ../development/tools/icr { }; scry = callPackage ../development/tools/scry {}; @@ -8109,10 +8230,13 @@ in fpc = callPackage ../development/compilers/fpc { }; - gambit = callPackage ../development/compilers/gambit { stdenv = gccStdenv; }; - gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { stdenv = gccStdenv; }; - gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; - gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; + gambit = callPackage ../development/compilers/gambit { }; + gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { }; + gambit-support = callPackage ../development/compilers/gambit/gambit-support.nix { }; + gerbil = callPackage ../development/compilers/gerbil { }; + gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { }; + gerbil-support = callPackage ../development/compilers/gerbil/gerbil-support.nix { }; + gerbilPackages-unstable = gerbil-support.gerbilPackages-unstable; # NB: don't recurseIntoAttrs for (unstable!) libraries gccFun = callPackage (if stdenv.targetPlatform.isVc4 then ../development/compilers/gcc/6 else ../development/compilers/gcc/9); gcc = if stdenv.targetPlatform.isVc4 then gcc6 else gcc9; @@ -8131,6 +8255,7 @@ in gcc7Stdenv = overrideCC gccStdenv buildPackages.gcc7; gcc8Stdenv = overrideCC gccStdenv buildPackages.gcc8; gcc9Stdenv = overrideCC gccStdenv buildPackages.gcc9; + gcc10Stdenv = overrideCC gccStdenv buildPackages.gcc10; wrapCCMulti = cc: if stdenv.targetPlatform.system == "x86_64-linux" then let @@ -8176,7 +8301,11 @@ in })); libstdcxxHook = makeSetupHook - { substitutions = { gcc = gcc-unwrapped; }; } + { substitutions = { + gcc = gcc-unwrapped; + targetConfig = stdenv.targetPlatform.config; + }; + } ../development/compilers/gcc/libstdc++-hook.sh; crossLibcStdenv = overrideCC stdenv @@ -8294,6 +8423,20 @@ in isl = if !stdenv.isDarwin then isl_0_17 else null; })); + gcc10 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/10 { + inherit noSysDirs; + + # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion + profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + + enableLTO = !stdenv.isi686; + + libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + + isl = if !stdenv.isDarwin then isl_0_17 else null; + })); + gfortran = gfortran9; gfortran48 = wrapCC (gcc48.cc.override { @@ -8344,6 +8487,14 @@ in profiledCompiler = false; }); + gfortran10 = wrapCC (gcc10.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + gcj = gcj6; gcj6 = wrapCC (gcc6.cc.override { name = "gcj"; @@ -8356,6 +8507,37 @@ in inherit (gnome2) libart_lgpl; }); + gnat = gnat9; + + gnat6 = wrapCC (gcc6.cc.override { + name = "gnat"; + langC = true; + langCC = false; + langAda = true; + profiledCompiler = false; + inherit gnatboot; + }); + + gnat9 = wrapCC (gcc9.cc.override { + name = "gnat"; + langC = true; + langCC = false; + langAda = true; + profiledCompiler = false; + gnatboot = gnat6; + }); + + gnat10 = wrapCC (gcc10.cc.override { + name = "gnat"; + langC = true; + langCC = false; + langAda = true; + profiledCompiler = false; + gnatboot = gnat6; + }); + + gnatboot = wrapCC (callPackage ../development/compilers/gnatboot { }); + gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; gccgo = gccgo6; @@ -8367,6 +8549,16 @@ in profiledCompiler = false; }); + ghdl = ghdl-mcode; + + ghdl-mcode = callPackage ../development/compilers/ghdl { + backend = "mcode"; + }; + + ghdl-llvm = callPackage ../development/compilers/ghdl { + backend = "llvm"; + }; + gcl = callPackage ../development/compilers/gcl { gmp = gmp4; }; @@ -8379,6 +8571,15 @@ in gcc-arm-embedded-9 = callPackage ../development/compilers/gcc-arm-embedded/9 {}; gcc-arm-embedded = gcc-arm-embedded-9; + gdc = gdc9; + gdc9 = wrapCC (gcc9.cc.override { + name = "gdc"; + langCC = false; + langC = false; + langD = true; + profiledCompiler = false; + }); + gforth = callPackage ../development/compilers/gforth {}; gleam = callPackage ../development/compilers/gleam { @@ -8419,6 +8620,8 @@ in pscid = nodePackages.pscid; + remarkable-toolchain = callPackage ../development/tools/misc/remarkable/remarkable-toolchain { }; + tacacsplus = callPackage ../servers/tacacsplus { }; tamarin-prover = @@ -8483,13 +8686,6 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - go_1_12 = callPackage ../development/compilers/go/1.12.nix ({ - inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs stdenv.isAarch64 { - stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; - }); - go_1_13 = callPackage ../development/compilers/go/1.13.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs stdenv.isAarch64 { @@ -8512,8 +8708,6 @@ in gogetdoc = callPackage ../development/tools/gogetdoc { }; - gometalinter = callPackage ../development/tools/gometalinter { }; - gox = callPackage ../development/tools/gox { }; gprolog = callPackage ../development/compilers/gprolog { }; @@ -8542,7 +8736,7 @@ in openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; - openjfx13 = callPackage ../development/compilers/openjdk/openjfx/13.nix { }; + openjfx14 = callPackage ../development/compilers/openjdk/openjfx/14.nix { }; openjdk8-bootstrap = if adoptopenjdk-hotspot-bin-8.meta.available then @@ -8587,33 +8781,39 @@ in else openjdk11.override { headless = true; }; - openjdk13-bootstrap = + openjdk14-bootstrap = if adoptopenjdk-hotspot-bin-13.meta.available then adoptopenjdk-hotspot-bin-13 else - /* adoptopenjdk not available for i686, so fall back to our old build of 12 for bootstrapping */ - callPackage ../development/compilers/openjdk/12.nix { + /* adoptopenjdk not available for i686, so fall back to our old builds of 12 & 13 for bootstrapping */ + callPackage ../development/compilers/openjdk/13.nix { openjfx = openjfx11; /* need this despite next line :-( */ enableJavaFX = false; headless = true; inherit (gnome2) GConf gnome_vfs; + openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix { + openjfx = openjfx11; /* need this despite next line :-( */ + enableJavaFX = false; + headless = true; + inherit (gnome2) GConf gnome_vfs; + }; }; /* current JDK */ - openjdk13 = + openjdk14 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin { } else callPackage ../development/compilers/openjdk { - openjfx = openjfx13; + openjfx = openjfx14; inherit (gnome2) GConf gnome_vfs; }; - openjdk13_headless = + openjdk14_headless = if stdenv.isDarwin then - openjdk13 + openjdk14 else - openjdk13.override { headless = true; }; + openjdk14.override { headless = true; }; openjdk = openjdk8; openjdk_headless = openjdk8_headless; @@ -8625,8 +8825,8 @@ in jdk11 = openjdk11; jdk11_headless = openjdk11_headless; - jdk13 = openjdk13; - jdk13_headless = openjdk13_headless; + jdk14 = openjdk14; + jdk14_headless = openjdk14_headless; jdk = jdk8; jre = jre8; @@ -8676,25 +8876,21 @@ in julia_07 = callPackage ../development/compilers/julia/0.7.nix { gmp = gmp6; - openblas = openblasCompat; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; julia_10 = callPackage ../development/compilers/julia/1.0.nix { gmp = gmp6; - openblas = openblasCompat; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; julia_11 = callPackage ../development/compilers/julia/1.1.nix { gmp = gmp6; - openblas = openblasCompat; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; julia_13 = callPackage ../development/compilers/julia/1.3.nix { gmp = gmp6; - openblas = openblasCompat; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; @@ -8793,7 +8989,7 @@ in stdenv = gcc7Stdenv; }); - llvmPackages_latest = llvmPackages_9; # llvmPackages_10: when out of RC + llvmPackages_latest = llvmPackages_10; lorri = callPackage ../tools/misc/lorri { inherit (darwin.apple_sdk.frameworks) CoreServices Security; @@ -8907,6 +9103,8 @@ in inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; + open-watcom-bin = callPackage ../development/compilers/open-watcom-bin { }; + pforth = callPackage ../development/compilers/pforth {}; picat = callPackage ../development/compilers/picat { }; @@ -8972,6 +9170,7 @@ in cargo-release = callPackage ../tools/package-management/cargo-release { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { }; cargo-tree = callPackage ../tools/package-management/cargo-tree { }; cargo-update = callPackage ../tools/package-management/cargo-update { }; @@ -8982,6 +9181,9 @@ in cargo-crev = callPackage ../development/tools/rust/cargo-crev { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-deny = callPackage ../development/tools/rust/cargo-deny { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { @@ -9018,6 +9220,8 @@ in rustracerd = callPackage ../development/tools/rust/racerd { inherit (darwin.apple_sdk.frameworks) Security; }; + inherit (callPackage ../development/tools/rust/rust-analyzer { }) + rust-analyzer-unwrapped rust-analyzer; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; rust-cbindgen = callPackage ../development/tools/rust/cbindgen { inherit (darwin.apple_sdk.frameworks) Security; @@ -9038,6 +9242,7 @@ in scala_2_13 = callPackage ../development/compilers/scala/2.13.nix { jre = jre8; }; scala = scala_2_13; + metal = callPackage ../development/libraries/metal { }; metals = callPackage ../development/tools/metals { }; scalafix = callPackage ../development/tools/scalafix { }; scalafmt = callPackage ../development/tools/scalafmt { }; @@ -9104,7 +9309,7 @@ in tinycc = callPackage ../development/compilers/tinycc { }; tinygo = callPackage ../development/compilers/tinygo { - inherit (llvmPackages_9) llvm clang-unwrapped lld; + inherit (llvmPackages_10) llvm clang-unwrapped lld; avrgcc = pkgsCross.avr.buildPackages.gcc; }; @@ -9154,7 +9359,7 @@ in isGNU = cc.isGNU or false; isClang = cc.isClang or false; - inherit cc bintools libc extraPackages; + inherit cc bintools libc extraPackages zlib; } // extraArgs; in self); wrapCC = cc: wrapCCWith { @@ -9276,6 +9481,8 @@ in janet = callPackage ../development/interpreters/janet {}; + jelly = callPackage ../development/interpreters/jelly {}; + jimtcl = callPackage ../development/interpreters/jimtcl {}; jmeter = callPackage ../applications/networking/jmeter {}; @@ -9375,16 +9582,13 @@ in octave = callPackage ../development/interpreters/octave { python = python3; - openblas = if stdenv.isDarwin then openblasCompat else openblas; }; octave-jit = callPackage ../development/interpreters/octave { python = python3; - openblas = if stdenv.isDarwin then openblasCompat else openblas; enableJIT = true; }; octaveFull = (lowPrio (libsForQt512.callPackage ../development/interpreters/octave { python = python3; - openblas = if stdenv.isDarwin then openblasCompat else openblas; enableQt = true; overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; })); @@ -9405,9 +9609,9 @@ in php73Extensions = recurseIntoAttrs php73.extensions; php74Extensions = recurseIntoAttrs php74.extensions; - inherit (callPackages ../development/interpreters/php { + inherit (callPackage ../development/interpreters/php { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }) php74 php73 php72 php74base php73base php72base; + }) php74 php73 php72; picoc = callPackage ../development/interpreters/picoc {}; @@ -9600,6 +9804,7 @@ in spidermonkey = spidermonkey_38; ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; + ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { }; supercollider = libsForQt5.callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; @@ -9620,26 +9825,6 @@ in ### DEVELOPMENT / MISC - amdadlsdk = callPackage ../development/misc/amdadl-sdk { }; - - amdappsdk26 = amdappsdk.override { - version = "2.6"; - }; - - amdappsdk27 = amdappsdk.override { - version = "2.7"; - }; - - amdappsdk28 = amdappsdk.override { - version = "2.8"; - }; - - amdappsdk = callPackage ../development/misc/amdapp-sdk { }; - - amdappsdkFull = amdappsdk.override { - samples = true; - }; - h3 = callPackage ../development/misc/h3 { }; amtk = callPackage ../development/libraries/amtk { }; @@ -9745,7 +9930,6 @@ in inherit (callPackage ../tools/admin/ansible { }) ansible - ansible_2_6 ansible_2_7 ansible_2_8 ansible_2_9; @@ -9874,9 +10058,7 @@ in bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; - bazel-watcher = callPackage ../development/tools/bazel-watcher { - go = go_1_12; - }; + bazel-watcher = callPackage ../development/tools/bazel-watcher { }; bazel-gazelle = callPackage ../development/tools/bazel-gazelle { }; @@ -9906,6 +10088,8 @@ in bison = callPackage ../development/tools/parsing/bison { }; yacc = bison; # TODO: move to aliases.nix + black = with python3Packages; toPythonApplication black; + blackmagic = callPackage ../development/tools/misc/blackmagic { }; bloaty = callPackage ../development/tools/bloaty { }; @@ -10344,9 +10528,7 @@ in help2man = callPackage ../development/tools/misc/help2man { }; - heroku = callPackage ../development/tools/heroku { - nodejs = nodejs-10_x; - }; + heroku = callPackage ../development/tools/heroku { }; ccloud-cli = callPackage ../development/tools/ccloud-cli { }; @@ -10426,7 +10608,9 @@ in kubicorn = callPackage ../development/tools/kubicorn { }; - kubie = callPackage ../development/tools/kubie { }; + kubie = callPackage ../development/tools/kubie { + inherit (darwin.apple_sdk.frameworks) Security; + }; kustomize = callPackage ../development/tools/kustomize { }; @@ -10485,6 +10669,10 @@ in mdl = callPackage ../development/tools/misc/mdl { }; + python-language-server = callPackage ../development/dotnet-modules/python-language-server { + inherit (dotnetPackages) Nuget; + }; + minify = callPackage ../development/web/minify { }; minizinc = callPackage ../development/tools/minizinc { }; @@ -10525,6 +10713,8 @@ in pythonPackages = python3Packages; }; + nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { }; + nexus = callPackage ../development/tools/repository-managers/nexus { }; nwjs = callPackage ../development/tools/nwjs { @@ -10598,6 +10788,8 @@ in pkg-configUpstream = lowPrio (pkg-config.override { vanilla = true; }); pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02 + inherit (nodePackages) postcss-cli; + postiats-utilities = callPackage ../development/tools/postiats-utilities {}; postman = callPackage ../development/web/postman {}; @@ -10797,6 +10989,8 @@ in swiftformat = callPackage ../development/tools/swiftformat { }; + systemfd = callPackage ../development/tools/systemfd { }; + swig1 = callPackage ../development/tools/misc/swig { }; swig2 = callPackage ../development/tools/misc/swig/2.x.nix { }; swig3 = callPackage ../development/tools/misc/swig/3.x.nix { }; @@ -10897,6 +11091,8 @@ in vultr = callPackage ../development/tools/vultr { }; + vultr-cli = callPackage ../development/tools/vultr-cli { }; + vulnix = callPackage ../tools/security/vulnix { }; vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; @@ -11347,8 +11543,6 @@ in dhex = callPackage ../applications/editors/dhex { }; - dnnl = callPackage ../development/libraries/dnnl { }; - double-conversion = callPackage ../development/libraries/double-conversion { }; dclib = callPackage ../development/libraries/dclib { }; @@ -11450,20 +11644,11 @@ in ffcast = callPackage ../tools/X11/ffcast { }; - fflas-ffpack = callPackage ../development/libraries/fflas-ffpack { - # We need to use blas instead of openblas on darwin, - # see https://github.com/NixOS/nixpkgs/pull/45013. - blas = if stdenv.isDarwin then blas else openblas; - }; + fflas-ffpack = callPackage ../development/libraries/fflas-ffpack { }; forge = callPackage ../development/libraries/forge { }; - linbox = callPackage ../development/libraries/linbox { - # We need to use blas instead of openblas on darwin, see - # https://github.com/NixOS/nixpkgs/pull/45013 and - # https://github.com/NixOS/nixpkgs/pull/45015. - blas = if stdenv.isDarwin then blas else openblas; - }; + linbox = callPackage ../development/libraries/linbox { }; ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -11675,6 +11860,16 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + libgit2_0_27 = libgit2.overrideAttrs (oldAttrs: rec { + version = "0.27.10"; + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad"; + }; + }); + libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; glbinding = callPackage ../development/libraries/glbinding { }; @@ -12066,9 +12261,13 @@ in heyefi = haskellPackages.heyefi; - hidapi = callPackage ../development/libraries/hidapi { - libusb = libusb1; - }; + hidapi = callPackage ../development/libraries/hidapi { }; + + highfive = callPackage ../development/libraries/highfive { }; + + highfive-mpi = appendToName "mpi" (highfive.override { + hdf5 = hdf5-mpi; + }); hiredis = callPackage ../development/libraries/hiredis { }; @@ -12112,6 +12311,8 @@ in hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; + hydra-check = with python3.pkgs; toPythonApplication hydra-check; + hyena = callPackage ../development/libraries/hyena { }; hyperscan = callPackage ../development/libraries/hyperscan { }; @@ -12142,6 +12343,21 @@ in } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); + icu65 = callPackage ../development/libraries/icu/65.nix ({ + nativeBuildRoot = buildPackages.icu65.override { buildRootOnly = true; }; + } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' + })); + icu66 = callPackage ../development/libraries/icu/66.nix ({ + nativeBuildRoot = buildPackages.icu66.override { buildRootOnly = true; }; + } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' + })); + icu67 = callPackage ../development/libraries/icu/67.nix ({ + nativeBuildRoot = buildPackages.icu67.override { buildRootOnly = true; }; + } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' + })); icu = icu64; @@ -12201,8 +12417,8 @@ in isocodes = callPackage ../development/libraries/iso-codes { }; ispc = callPackage ../development/compilers/ispc { - llvmPackages = llvmPackages_6; - stdenv = llvmPackages_6.stdenv; + stdenv = llvmPackages_10.stdenv; + llvmPackages = llvmPackages_10; }; isso = callPackage ../servers/isso { }; @@ -12210,7 +12426,7 @@ in itk4 = callPackage ../development/libraries/itk/4.x.nix { stdenv = gcc8Stdenv; }; itk = callPackage ../development/libraries/itk { - stdenv = gcc8Stdenv; + inherit (darwin.apple_sdk.frameworks) Cocoa; }; jasper = callPackage ../development/libraries/jasper { }; @@ -12276,10 +12492,6 @@ in kf5gpgmepp = libsForQt5.callPackage ../development/libraries/kf5gpgmepp { }; - kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { - openssl = openssl_1_0_2; - }; - krb5 = callPackage ../development/libraries/kerberos/krb5.nix { inherit (buildPackages.darwin) bootstrap_cmds; }; @@ -12339,6 +12551,8 @@ in libacr38u = callPackage ../tools/security/libacr38u { }; + libaec = callPackage ../development/libraries/libaec { }; + libagar = callPackage ../development/libraries/libagar { }; libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { }; @@ -12607,9 +12821,7 @@ in libfakekey = callPackage ../development/libraries/libfakekey { }; - libfido2 = callPackage ../development/libraries/libfido2 { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; + libfido2 = callPackage ../development/libraries/libfido2 { }; libfilezilla = callPackage ../development/libraries/libfilezilla { }; @@ -12621,9 +12833,6 @@ in }; libfprint = callPackage ../development/libraries/libfprint { }; - libfprint-thinkpad = libfprint.override { - thinkpad = true; - }; libfpx = callPackage ../development/libraries/libfpx { }; @@ -12720,7 +12929,9 @@ in libf2c = callPackage ../development/libraries/libf2c {}; - libfive = callPackage ../development/libraries/libfive { }; + libfabric = callPackage ../os-specific/linux/libfabric {}; + + libfive = libsForQt5.callPackage ../development/libraries/libfive { }; libfixposix = callPackage ../development/libraries/libfixposix {}; @@ -12951,7 +13162,10 @@ in libiptcdata = callPackage ../development/libraries/libiptcdata { }; + libjcat = callPackage ../development/libraries/libjcat { }; + libjpeg_original = callPackage ../development/libraries/libjpeg { }; + # also known as libturbojpeg libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { }; libjpeg = libjpeg_turbo; @@ -13104,6 +13318,8 @@ in libp11 = callPackage ../development/libraries/libp11 { }; + libpam-wrapper = callPackage ../development/libraries/libpam-wrapper { }; + libpar2 = callPackage ../development/libraries/libpar2 { }; libpcap = callPackage ../development/libraries/libpcap { }; @@ -13214,7 +13430,11 @@ in libtomcrypt = callPackage ../development/libraries/libtomcrypt { }; - libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; + libtorrentRasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2 { }; + + libtorrentRasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1 { }; + + libtorrentRasterbar = libtorrentRasterbar-1_2_x; # this is still the new version of the old API libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { }; @@ -13229,10 +13449,6 @@ in libtsm = callPackage ../development/libraries/libtsm { }; - libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { }; - - libtxc_dxtn_s2tc = callPackage ../development/libraries/libtxc_dxtn_s2tc { }; - libgeotiff = callPackage ../development/libraries/libgeotiff { }; libu2f-host = callPackage ../development/libraries/libu2f-host { }; @@ -13271,7 +13487,7 @@ in liburcu = callPackage ../development/libraries/liburcu { }; - libusb = callPackage ../development/libraries/libusb {}; + libusb-compat-0_1 = callPackage ../development/libraries/libusb-compat/0.1.nix {}; libusb1 = callPackage ../development/libraries/libusb1 { inherit (darwin) libobjc; @@ -13393,6 +13609,8 @@ in python = if stdenv.isDarwin then python2 else python3; }; + libxsmm = callPackage ../development/libraries/libxsmm { }; + libixp_hg = callPackage ../development/libraries/libixp-hg { }; libyaml = callPackage ../development/libraries/libyaml { }; @@ -13697,6 +13915,8 @@ in one_gadget = callPackage ../development/tools/misc/one_gadget { }; + oneDNN = callPackage ../development/libraries/oneDNN { }; + onedrive = callPackage ../applications/networking/sync/onedrive { }; oneko = callPackage ../applications/misc/oneko { }; @@ -13730,7 +13950,7 @@ in openct = callPackage ../development/libraries/openct { }; - opencv = callPackage ../development/libraries/opencv { + opencv2 = callPackage ../development/libraries/opencv { inherit (darwin.apple_sdk.frameworks) Cocoa QTKit; }; @@ -13746,6 +13966,8 @@ in inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; }; + opencv = opencv4; + openexr = callPackage ../development/libraries/openexr { }; openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; @@ -13885,7 +14107,7 @@ in portaudio2014 = portaudio.overrideAttrs (oldAttrs: { src = fetchurl { - url = http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz; + url = "http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz"; sha256 = "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g"; }; }); @@ -13911,8 +14133,9 @@ in python = python37; }; - protobuf = protobuf3_7; + protobuf = protobuf3_8; + protobuf3_12 = callPackage ../development/libraries/protobuf/3.12.nix { }; protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { }; protobuf3_10 = callPackage ../development/libraries/protobuf/3.10.nix { }; protobuf3_9 = callPackage ../development/libraries/protobuf/3.9.nix { }; @@ -14029,7 +14252,7 @@ in knotifyconfig kpackage kparts kpeople kplotting kpty kross krunner kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt - networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting + networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet syntax-highlighting syndication threadweaver kirigami2 kholidays kpurpose kcontacts; ### KDE PLASMA 5 @@ -14191,6 +14414,8 @@ in readosm = callPackage ../development/libraries/readosm { }; + kissfft = callPackage ../development/libraries/kissfft { }; + lambdabot = callPackage ../development/tools/haskell/lambdabot { haskellLib = haskell.lib; }; @@ -14219,6 +14444,8 @@ in lvtk = callPackage ../development/libraries/audio/lvtk { }; + qm-dsp = callPackage ../development/libraries/audio/qm-dsp { }; + qradiolink = callPackage ../applications/radio/qradiolink { }; qrupdate = callPackage ../development/libraries/qrupdate { }; @@ -14335,7 +14562,10 @@ in simp_le = callPackage ../tools/admin/simp_le { }; - simpleitk = callPackage ../development/libraries/simpleitk { lua = lua51Packages.lua; }; + simpleitk = callPackage ../development/libraries/simpleitk { + lua = lua51Packages.lua; + stdenv = gcc8Stdenv; + }; sfml = callPackage ../development/libraries/sfml { inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL; @@ -14422,6 +14652,8 @@ in sonic = callPackage ../development/libraries/sonic { }; + sope = callPackage ../development/libraries/sope { }; + soprano = callPackage ../development/libraries/soprano { }; soqt = callPackage ../development/libraries/soqt { }; @@ -14462,6 +14694,8 @@ in spice-up = callPackage ../applications/office/spice-up { }; + spirv-cross = callPackage ../tools/graphics/spirv-cross { }; + sratom = callPackage ../development/libraries/audio/sratom { }; srm = callPackage ../tools/security/srm { }; @@ -14518,10 +14752,7 @@ in stfl = callPackage ../development/libraries/stfl { }; - stlink = callPackage ../development/tools/misc/stlink { - # The Darwin build of stlink explicitly refers to static libusb. - libusb1 = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1; - }; + stlink = callPackage ../development/tools/misc/stlink { }; steghide = callPackage ../tools/security/steghide {}; @@ -14695,9 +14926,7 @@ in ustr = callPackage ../development/libraries/ustr { }; - usbredir = callPackage ../development/libraries/usbredir { - libusb = libusb1; - }; + usbredir = callPackage ../development/libraries/usbredir { }; uthash = callPackage ../development/libraries/uthash { }; @@ -14769,7 +14998,7 @@ in vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; vtk = callPackage ../development/libraries/vtk { - stdenv = gcc8Stdenv; + stdenv = if stdenv.isDarwin then stdenv else gcc8Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration @@ -14968,9 +15197,7 @@ in yubikey-neo-manager = callPackage ../tools/misc/yubikey-neo-manager { }; - yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { - libusb = libusb1; - }; + yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { }; yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { }; @@ -14995,7 +15222,7 @@ in zmqpp = callPackage ../development/libraries/zmqpp { }; zig = callPackage ../development/compilers/zig { - llvmPackages = llvmPackages_9; + llvmPackages = llvmPackages_10; }; zimlib = callPackage ../development/libraries/zimlib { }; @@ -15023,31 +15250,10 @@ in ### DEVELOPMENT / LIBRARIES / AGDA - agda = callPackage ../build-support/agda { - glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null; - extension = self : super : { }; + agdaPackages = callPackage ./agda-packages.nix { inherit (haskellPackages) Agda; }; - - agdaBase = callPackage ../development/libraries/agda/agda-base { }; - - agdaIowaStdlib = callPackage ../development/libraries/agda/agda-iowa-stdlib { }; - - agdaPrelude = callPackage ../development/libraries/agda/agda-prelude { }; - - AgdaStdlib = callPackage ../development/libraries/agda/agda-stdlib { - inherit (haskellPackages) ghcWithPackages; - }; - - AgdaSheaves = callPackage ../development/libraries/agda/Agda-Sheaves { }; - - bitvector = callPackage ../development/libraries/agda/bitvector { }; - - categories = callPackage ../development/libraries/agda/categories { }; - - pretty = callPackage ../development/libraries/agda/pretty { }; - - TotalParserCombinators = callPackage ../development/libraries/agda/TotalParserCombinators { }; + agda = agdaPackages.agda; ### DEVELOPMENT / LIBRARIES / JAVA @@ -15120,9 +15326,6 @@ in ### DEVELOPMENT / GO MODULES - buildGo112Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_12; - }; buildGo113Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_13; }; @@ -15132,9 +15335,6 @@ in buildGoPackage = buildGo114Package; - buildGo112Module = callPackage ../development/go-modules/generic { - go = buildPackages.go_1_12; - }; buildGo113Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_13; }; @@ -15220,7 +15420,6 @@ in texLive = texlive.combine { inherit (texlive) scheme-small inconsolata helvetic texinfo fancyvrb cm-super; }; - openblas = openblasCompat; withRecommendedPackages = false; inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; inherit (darwin) libobjc; @@ -15393,7 +15592,10 @@ in dspam = callPackage ../servers/mail/dspam { }; + engelsystem = callPackage ../servers/web-apps/engelsystem { }; + etcd = callPackage ../servers/etcd { }; + etcd_3_4 = callPackage ../servers/etcd/3.4.nix { }; ejabberd = callPackage ../servers/xmpp/ejabberd { }; @@ -15457,14 +15659,18 @@ in grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; - gobetween = callPackage ../servers/gobetween { - buildGoModule = buildGo112Module; - }; + gobetween = callPackage ../servers/gobetween { }; h2o = callPackage ../servers/http/h2o { }; haka = callPackage ../tools/security/haka { }; + hashi-ui = callPackage ../servers/hashi-ui {}; + + inherit (callPackage ../servers/hasura { }) + hasura-cli + hasura-graphql-engine; + heapster = callPackage ../servers/monitoring/heapster { }; hbase = callPackage ../servers/hbase {}; @@ -15477,6 +15683,8 @@ in home-assistant-cli = callPackage ../servers/home-assistant/cli.nix { }; + https-dns-proxy = callPackage ../servers/dns/https-dns-proxy { }; + hydron = callPackage ../servers/hydron { }; icingaweb2 = callPackage ../servers/icingaweb2 { }; @@ -15498,6 +15706,8 @@ in jetty = callPackage ../servers/http/jetty { }; + kapow = callPackage ../servers/kapow { }; + keycloak = callPackage ../servers/keycloak { }; knot-dns = callPackage ../servers/dns/knot-dns { }; @@ -15708,6 +15918,8 @@ in tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; + tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { }; + pies = callPackage ../servers/pies { }; rpcbind = callPackage ../servers/rpcbind { }; @@ -15717,8 +15929,7 @@ in mariadb-connector-c = mariadb-connector-c_3_1; mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { }; - mariadb-galera = mariadb-galera_25; - mariadb-galera_25 = callPackage ../servers/sql/mariadb/galera/25.nix { + mariadb-galera = callPackage ../servers/sql/mariadb/galera { asio = asio_1_10; }; @@ -15779,12 +15990,14 @@ in inherit (darwin) cctools developer_cmds; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost159; + protobuf = protobuf3_7; }; mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { inherit (darwin) cctools developer_cmds; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost169; # Configure checks for specific version. + protobuf = protobuf3_7; }; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; @@ -15911,11 +16124,7 @@ in prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { }; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; - prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { - # Version 1.5.1 fails to build with go 1.13 due to test failure - # FAIL github.com/jonnenauha/prometheus_varnish_exporter 0.041s - buildGoModule = buildGo112Module; - }; + prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { inherit (darwin.apple_sdk.frameworks) Security; @@ -16057,9 +16266,11 @@ in smcroute = callPackage ../servers/smcroute { }; + sogo = callPackage ../servers/web-apps/sogo { }; + spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; - spring-boot = callPackage ../development/tools/spring-boot { }; + spring-boot-cli = callPackage ../development/tools/spring-boot-cli { }; squid = callPackage ../servers/squid { }; @@ -16232,6 +16443,10 @@ in alsaOss = callPackage ../os-specific/linux/alsa-oss { }; alsaTools = callPackage ../os-specific/linux/alsa-tools { }; + alsa-ucm-conf = callPackage ../os-specific/linux/alsa-ucm-conf { }; + + alsa-topology-conf = callPackage ../os-specific/linux/alsa-topology-conf { }; + inherit (callPackage ../misc/arm-trusted-firmware {}) buildArmTrustedFirmware armTrustedFirmwareTools @@ -16307,9 +16522,7 @@ in cpustat = callPackage ../os-specific/linux/cpustat { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { - buildGoPackage = buildGo112Package; - }; + cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_3_compat; @@ -16369,8 +16582,6 @@ in fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; - fwupdate = callPackage ../os-specific/linux/firmware/fwupdate { }; - fwts = callPackage ../os-specific/linux/fwts { }; libossp_uuid = callPackage ../development/libraries/libossp-uuid { }; @@ -16419,8 +16630,6 @@ in gfxtablet = callPackage ../os-specific/linux/gfxtablet {}; - gmailieer = callPackage ../applications/networking/gmailieer {}; - gmailctl = callPackage ../applications/networking/gmailctl {}; gpm = callPackage ../servers/gpm { @@ -16527,6 +16736,8 @@ in libnl = callPackage ../os-specific/linux/libnl { }; + lieer = callPackage ../applications/networking/lieer {}; + linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; openelec-dvb-firmware = callPackage ../os-specific/linux/firmware/openelec-dvb-firmware { }; @@ -16618,11 +16829,6 @@ in kernelPatches.request_key_helper_updated kernelPatches.cpu-cgroup-v2."4.4" kernelPatches.modinst_arg_list_too_long - # https://github.com/NixOS/nixpkgs/issues/42755 - # Remove these xen-netfront patches once they're included in - # upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755 - kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock - kernelPatches.xen-netfront_update_features_after_registering_netdev ]; }; @@ -16664,14 +16870,6 @@ in ]; }; - linux_5_5 = callPackage ../os-specific/linux/kernel/linux-5.5.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" - ]; - }; - linux_5_6 = callPackage ../os-specific/linux/kernel/linux-5.6.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -16691,7 +16889,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.modinst_arg_list_too_long ]; }; @@ -16903,7 +17100,6 @@ in linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); - linuxPackages_5_5 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_5); linuxPackages_5_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_6); # When adding to this list: @@ -16941,11 +17137,14 @@ in # Hardened linux hardenedLinuxPackagesFor = kernel: linuxPackagesFor (kernel.override { - structuredExtraConfig = import ../os-specific/linux/kernel/hardened-config.nix { + structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { inherit stdenv; inherit (kernel) version; }; - kernelPatches = kernel.kernelPatches ++ [ kernelPatches.tag_hardened ]; + kernelPatches = kernel.kernelPatches ++ [ + kernelPatches.tag_hardened + kernelPatches.hardened.${kernel.meta.branch} + ]; modDirVersionArg = kernel.modDirVersion + "-hardened"; }); @@ -16955,9 +17154,6 @@ in linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest); linux_latest_hardened = linuxPackages_latest_hardened.kernel; - linuxPackages_testing_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_testing); - linux_testing_hardened = linuxPackages_testing_hardened.kernel; - linuxPackages_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux.override { features.xen_dom0=true; })); linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); @@ -17157,9 +17353,7 @@ in go-tools = callPackage ../development/tools/go-tools { }; - gotools = callPackage ../development/tools/gotools { - inherit (darwin.apple_sdk.frameworks) Security; - }; + gotools = callPackage ../development/tools/gotools { }; gotop = callPackage ../tools/system/gotop { }; @@ -17167,13 +17361,11 @@ in go-langserver = callPackage ../development/tools/go-langserver { }; + gopls = callPackage ../development/tools/gopls { }; + gotests = callPackage ../development/tools/gotests { }; - gotestsum = callPackage ../development/tools/gotestsum { - # Version 0.3.5 fails to build with go 1.13: - # build ./testjson/internal/badmain: cannot find module for path ./testjson/internal/badmain - buildGoModule = buildGo112Module; - }; + gotestsum = callPackage ../development/tools/gotestsum { }; impl = callPackage ../development/tools/impl { }; @@ -17794,6 +17986,8 @@ in hermit = callPackage ../data/fonts/hermit { }; + humanity-icon-theme = callPackage ../data/icons/humanity-icon-theme { }; + hyperscrypt-font = callPackage ../data/fonts/hyperscrypt { }; ia-writer-duospace = callPackage ../data/fonts/ia-writer-duospace { }; @@ -17808,7 +18002,9 @@ in inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix {}; - inconsolata-nerdfont = callPackage ../data/fonts/inconsolata-nerdfont {}; + inconsolata-nerdfont = nerdfonts.override { + fonts = [ "Inconsolata" ]; + }; input-fonts = callPackage ../data/fonts/input-fonts { }; @@ -17849,7 +18045,7 @@ in ledger-udev-rules = callPackage ../os-specific/linux/ledger-udev-rules {}; - inherit (callPackages ../data/fonts/redhat-liberation-fonts { }) + inherit (callPackages ../data/fonts/liberation-fonts { }) liberation_ttf_v1 liberation_ttf_v2 ; @@ -17877,6 +18073,8 @@ in libre-franklin = callPackage ../data/fonts/libre-franklin { }; + line-awesome = callPackage ../data/fonts/line-awesome { }; + lmmath = callPackage ../data/fonts/lmmath {}; lmodern = callPackage ../data/fonts/lmodern { }; @@ -17905,7 +18103,7 @@ in manrope = callPackage ../data/fonts/manrope { }; - matcha = callPackage ../data/themes/matcha { }; + matcha-gtk-theme = callPackage ../data/themes/matcha { }; materia-theme = callPackage ../data/themes/materia-theme { }; @@ -18042,6 +18240,8 @@ in pop-gtk-theme = callPackage ../data/themes/pop-gtk { }; + pop-icon-theme = callPackage ../data/icons/pop-icon-theme { }; + posix_man_pages = callPackage ../data/documentation/man-pages-posix { }; powerline-fonts = callPackage ../data/fonts/powerline-fonts { }; @@ -18075,6 +18275,8 @@ in sarasa-gothic = callPackage ../data/fonts/sarasa-gothic { }; + scheme-manpages = callPackage ../data/documentation/scheme-manpages { }; + scowl = callPackage ../data/misc/scowl { }; seshat = callPackage ../data/fonts/seshat { }; @@ -18189,6 +18391,8 @@ in tamsyn = callPackage ../data/fonts/tamsyn { inherit (buildPackages.xorg) mkfontscale; }; + tamzen = callPackage ../data/fonts/tamzen { inherit (buildPackages.xorg) mkfontscale; }; + tango-icon-theme = callPackage ../data/icons/tango-icon-theme { gtk = res.gtk2; }; @@ -18212,7 +18416,9 @@ in terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; - terminus-nerdfont = callPackage ../data/fonts/terminus-nerdfont { }; + terminus-nerdfont = nerdfonts.override { + fonts = [ "Terminus" ]; + }; termtekst = callPackage ../misc/emulators/termtekst { }; @@ -18412,9 +18618,7 @@ in aqemu = libsForQt5.callPackage ../applications/virtualization/aqemu { }; - ardour = callPackage ../applications/audio/ardour { - inherit (gnome2) libgnomecanvas libgnomecanvasmm; - }; + ardour = callPackage ../applications/audio/ardour { }; arelle = with python3Packages; toPythonApplication arelle; @@ -18490,6 +18694,8 @@ in aesop = callPackage ../applications/office/aesop { }; + AusweisApp2 = libsForQt5.callPackage ../applications/misc/ausweisapp2 { }; + avidemux = libsForQt5.callPackage ../applications/video/avidemux { }; avrdudess = callPackage ../applications/misc/avrdudess { }; @@ -18528,13 +18734,10 @@ in baudline = callPackage ../applications/audio/baudline { }; - - bazaar = callPackage ../applications/version-management/bazaar { }; - - bazaarTools = callPackage ../applications/version-management/bazaar/tools.nix { }; - bb = callPackage ../applications/misc/bb { }; + berry = callPackage ../applications/window-managers/berry { }; + bevelbar = callPackage ../applications/window-managers/bevelbar { }; bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; @@ -18592,8 +18795,6 @@ in gtk = gtk3; }; - bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { }; - bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { }; blugon = callPackage ../applications/misc/blugon { }; @@ -18620,6 +18821,8 @@ in bs1770gain = callPackage ../applications/audio/bs1770gain { }; + bjumblr = callPackage ../applications/audio/bjumblr { }; + bsequencer = callPackage ../applications/audio/bsequencer { }; bslizr = callPackage ../applications/audio/bslizr { }; @@ -18652,11 +18855,7 @@ in poppler = poppler_0_61; }; - perkeep = callPackage ../applications/misc/perkeep { - # Revision c9f78d02adf9740f3b8d403a1418554293cc9f41 fails to build with go 1.13 due to a dependency: - # go: bazil.org/fuse@v0.0.0-20160811212531-371fbbdaa898: Get https://proxy.golang.org/bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:36526->[::1]:53: read: connection refused - buildGoPackage = buildGo112Package; - }; + perkeep = callPackage ../applications/misc/perkeep { }; canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; @@ -18837,7 +19036,7 @@ in dablin = callPackage ../applications/radio/dablin { }; - darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskell.packages.ghc865.darcs) (drv: { + darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: { configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; }); @@ -19161,6 +19360,8 @@ in gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; + gspeech = callPackage ../applications/audio/gspeech { }; + icesl = callPackage ../applications/misc/icesl { }; keepassx = callPackage ../applications/misc/keepassx { }; @@ -19186,6 +19387,8 @@ in fasttext = callPackage ../applications/science/machine-learning/fasttext { }; + fbmenugen = callPackage ../applications/misc/fbmenugen { }; + fbpanel = callPackage ../applications/window-managers/fbpanel { }; fbreader = callPackage ../applications/misc/fbreader { @@ -19246,10 +19449,6 @@ in freewheeling = callPackage ../applications/audio/freewheeling { }; - fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { - openssl = openssl_1_0_2; - }; - fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; fsv = callPackage ../applications/misc/fsv { }; @@ -19267,6 +19466,8 @@ in geany = callPackage ../applications/editors/geany { }; geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { }; + genxword = callPackage ../applications/misc/genxword { }; + geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { }; ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; @@ -19329,8 +19530,6 @@ in gopher = callPackage ../applications/networking/gopher/gopher { }; - gopherclient = libsForQt5.callPackage ../applications/networking/gopher/gopherclient { }; - goxel = callPackage ../applications/graphics/goxel { }; gpa = callPackage ../applications/misc/gpa { }; @@ -19528,6 +19727,8 @@ in gcalcli = callPackage ../applications/misc/gcalcli { }; + havoc = callPackage ../applications/misc/havoc { }; + vcal = callPackage ../applications/misc/vcal { }; gcolor2 = callPackage ../applications/graphics/gcolor2 { }; @@ -19704,16 +19905,14 @@ in inherit (gnome2) GConf; }; - google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin { - libpng = libpng12; - }; - gosmore = callPackage ../applications/misc/gosmore { }; gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { inherit (darwin) IOKit; }; + gpsbabel-gui = libsForQt5.callPackage ../applications/misc/gpsbabel/gui.nix { }; + gpscorrelate = callPackage ../applications/misc/gpscorrelate { }; gpsd = callPackage ../servers/gpsd { }; @@ -19742,7 +19941,7 @@ in gvisor-containerd-shim = callPackage ../applications/virtualization/gvisor/containerd-shim.nix { }; - guvcview = callPackage ../os-specific/linux/guvcview { }; + guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { }; gxmessage = callPackage ../applications/misc/gxmessage { }; @@ -19756,6 +19955,8 @@ in hashit = callPackage ../tools/misc/hashit { }; + hactool = callPackage ../tools/compression/hactool { }; + heimer = libsForQt5.callPackage ../applications/misc/heimer { }; hello = callPackage ../applications/misc/hello { }; @@ -19765,7 +19966,9 @@ in heme = callPackage ../applications/editors/heme { }; - herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; + herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { + asciidoc = asciidoc-full; + }; hercules = callPackage ../applications/virtualization/hercules { }; @@ -19793,6 +19996,8 @@ in howl = callPackage ../applications/editors/howl { }; + hpcg = callPackage ../tools/misc/hpcg/default.nix { }; + hpl = callPackage ../tools/misc/hpl { mpi = openmpi; }; hpmyroom = libsForQt5.callPackage ../applications/networking/hpmyroom { }; @@ -19812,6 +20017,7 @@ in hugo = callPackage ../applications/misc/hugo { }; hydrogen = callPackage ../applications/audio/hydrogen { }; + hydrogen-unstable = qt5.callPackage ../applications/audio/hydrogen/unstable.nix { }; hydroxide = callPackage ../applications/networking/hydroxide { }; @@ -19839,6 +20045,10 @@ in leftwm = callPackage ../applications/window-managers/leftwm { }; + lwm = callPackage ../applications/window-managers/lwm { }; + + musikcube = callPackage ../applications/audio/musikcube {}; + pinboard-notes-backup = haskell.lib.overrideCabal (haskell.lib.generateOptparseApplicativeCompletion "pnbackup" haskellPackages.pinboard-notes-backup) @@ -19858,6 +20068,8 @@ in spectmorph = callPackage ../applications/audio/spectmorph { }; + smallwm = callPackage ../applications/window-managers/smallwm { }; + spectrwm = callPackage ../applications/window-managers/spectrwm { }; spectral = qt5.callPackage ../applications/networking/instant-messengers/spectral { }; @@ -20096,7 +20308,7 @@ in joe = callPackage ../applications/editors/joe { }; - josm = callPackage ../applications/misc/josm { }; + josm = callPackage ../applications/misc/josm { jre = jdk11; }; jwm = callPackage ../applications/window-managers/jwm { }; @@ -20105,7 +20317,13 @@ in k3d = callPackage ../applications/graphics/k3d { inherit (pkgs.gnome2) gtkglext; stdenv = gcc6Stdenv; - boost = boost155.override { enablePython = true; }; + boost = boost155.override { + enablePython = true; + stdenv = gcc6Stdenv; + buildPackages = buildPackages // { + stdenv = gcc6Stdenv; + }; + }; }; k3s = callPackage ../applications/networking/cluster/k3s {}; @@ -20228,12 +20446,12 @@ in kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; - kubernetes = callPackage ../applications/networking/cluster/kubernetes { - go = buildPackages.go_1_13; - }; + kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; + kubernix = callPackage ../applications/networking/cluster/kubernix { }; + kubectl = callPackage ../applications/networking/cluster/kubectl { }; kubeless = callPackage ../applications/networking/cluster/kubeless { }; @@ -20472,10 +20690,7 @@ in marp = callPackage ../applications/office/marp { }; - magnetico = callPackage ../applications/networking/p2p/magnetico { - # Version 2019-08-14 fails to build with go 1.13 due to missing go.sum - buildGoModule = buildGo112Module; - }; + magnetico = callPackage ../applications/networking/p2p/magnetico { }; matchbox = callPackage ../applications/window-managers/matchbox { }; @@ -20598,6 +20813,7 @@ in monotone = callPackage ../applications/version-management/monotone { lua = lua5; + botan = botan.override (x: { openssl = null; }); }; monotoneViz = callPackage ../applications/version-management/monotone-viz { @@ -20612,36 +20828,14 @@ in mop = callPackage ../applications/misc/mop { }; - mopidy = callPackage ../applications/audio/mopidy { }; - - mopidy-gmusic = callPackage ../applications/audio/mopidy/gmusic.nix { }; - - mopidy-local-images = callPackage ../applications/audio/mopidy/local-images.nix { }; - - mopidy-local-sqlite = callPackage ../applications/audio/mopidy/local-sqlite.nix { }; - - mopidy-spotify = callPackage ../applications/audio/mopidy/spotify.nix { }; - - mopidy-moped = callPackage ../applications/audio/mopidy/moped.nix { }; - - mopidy-mopify = callPackage ../applications/audio/mopidy/mopify.nix { }; - - mopidy-spotify-tunigo = callPackage ../applications/audio/mopidy/spotify-tunigo.nix { }; - - mopidy-youtube = callPackage ../applications/audio/mopidy/youtube.nix { }; - - mopidy-soundcloud = callPackage ../applications/audio/mopidy/soundcloud.nix { }; - - mopidy-musicbox-webclient = callPackage ../applications/audio/mopidy/musicbox-webclient.nix { }; - - mopidy-iris = callPackage ../applications/audio/mopidy/iris.nix { }; + mopidyPackages = callPackages ../applications/audio/mopidy/default.nix { + python = python3; + }; - mopidy-mpd = callPackage ../applications/audio/mopidy/mpd.nix { }; + inherit (mopidyPackages) mopidy mopidy-gmusic mopidy-local-images mopidy-local-sqlite mopidy-spotify mopidy-moped mopidy-mopify mopidy-spotify-tunigo mopidy-youtube mopidy-soundcloud mopidy-musicbox-webclient mopidy-iris mopidy-mpd; motif = callPackage ../development/libraries/motif { }; - mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {}; - mozjpeg = callPackage ../applications/graphics/mozjpeg { }; easytag = callPackage ../applications/audio/easytag { }; @@ -20678,6 +20872,8 @@ in rofi-emoji = callPackage ../applications/misc/rofi-emoji { }; + rofi-file-browser = callPackage ../applications/misc/rofi-file-browser { }; + ympd = callPackage ../applications/audio/ympd { }; nload = callPackage ../applications/networking/nload { }; @@ -20696,12 +20892,6 @@ in libdvdnav = libdvdnav_4_2_1; } // (config.mplayer or {})); - MPlayerPlugin = browser: - callPackage ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { - inherit browser; - # !!! should depend on MPlayer - }; - mpv = callPackage ../applications/video/mpv { inherit lua; inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; @@ -20709,7 +20899,7 @@ in mpv-with-scripts = callPackage ../applications/video/mpv/wrapper.nix { }; - mpvScripts = { + mpvScripts = recurseIntoAttrs { convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {}; }; @@ -20780,6 +20970,12 @@ in geoip = geoipWithDatabase; }; + nixos-shell = callPackage ../tools/virtualization/nixos-shell {}; + + node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { }; + + ninjas2 = callPackage ../applications/audio/ninjas2 {}; + notion = callPackage ../applications/window-managers/notion { }; nootka = qt5.callPackage ../applications/audio/nootka { }; @@ -20787,9 +20983,7 @@ in open-policy-agent = callPackage ../development/tools/open-policy-agent { }; - openshift = callPackage ../applications/networking/cluster/openshift { - buildGoPackage = buildGo112Package; - }; + openshift = callPackage ../applications/networking/cluster/openshift { }; oroborus = callPackage ../applications/window-managers/oroborus {}; @@ -20840,6 +21034,12 @@ in i3GapsSupport = false; }; + polyphone = libsForQt5.callPackage ../applications/audio/polyphone { }; + + portfolio = callPackage ../applications/office/portfolio { + jre = openjdk11; + }; + ptex = callPackage ../development/libraries/ptex {}; qbec = callPackage ../applications/networking/cluster/qbec { }; @@ -21009,8 +21209,6 @@ in nova-filters = callPackage ../applications/audio/nova-filters { }; - nspluginwrapper = callPackage ../applications/networking/browsers/mozilla-plugins/nspluginwrapper {}; - nvi = callPackage ../applications/editors/nvi { }; nvpy = callPackage ../applications/editors/nvpy { }; @@ -21025,11 +21223,13 @@ in obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; + obs-v4l2sink = libsForQt5.callPackage ../applications/video/obs-studio/v4l2sink.nix { }; + obs-ndi = callPackage ../applications/video/obs-studio/obs-ndi.nix { }; octoprint = callPackage ../applications/misc/octoprint { }; - octoprint-plugins = callPackage ../applications/misc/octoprint/plugins.nix { }; + octoprint-plugins = throw ''octoprint-plugins are now part of the octoprint.python.pkgs package set.''; ocrad = callPackage ../applications/graphics/ocrad { }; @@ -21041,6 +21241,8 @@ in omxplayer = callPackage ../applications/video/omxplayer { }; + inherit (python3Packages.callPackage ../applications/networking/onionshare { }) onionshare onionshare-gui; + openbox = callPackage ../applications/window-managers/openbox { }; openbox-menu = callPackage ../applications/misc/openbox-menu { @@ -21073,6 +21275,8 @@ in inherit (pkgs) pkgconfig; }; + orca-c = callPackage ../applications/audio/orca-c {}; + osm2xmap = callPackage ../applications/misc/osm2xmap { libyamlcpp = libyamlcpp_0_3; }; @@ -21131,6 +21335,8 @@ in packet = callPackage ../development/tools/packet { }; + packet-cli = callPackage ../development/tools/packet-cli { }; + pb_cli = callPackage ../tools/misc/pb_cli {}; capture = callPackage ../tools/misc/capture {}; @@ -21409,7 +21615,12 @@ in qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; - qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { }; + qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { + guvcview = guvcview.override { + useQt = true; + useGtk = false; + }; + }; qsynth = libsForQt5.callPackage ../applications/audio/qsynth { }; @@ -21417,6 +21628,8 @@ in qtchan = libsForQt5.callPackage ../applications/networking/browsers/qtchan { }; + qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { }; + qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { }; qtpass = libsForQt5.callPackage ../applications/misc/qtpass { }; @@ -21548,8 +21761,6 @@ in ripser = callPackage ../applications/science/math/ripser { }; - rkt = callPackage ../applications/virtualization/rkt { }; - rkdeveloptool = callPackage ../misc/rkdeveloptool { }; rofi-unwrapped = callPackage ../applications/misc/rofi { }; @@ -22013,11 +22224,9 @@ in teleprompter = callPackage ../applications/misc/teleprompter {}; - tendermint = callPackage ../tools/networking/tendermint { - buildGoModule = buildGo112Module; - }; + tendermint = callPackage ../tools/networking/tendermint { }; - termdown = (newScope pythonPackages) ../applications/misc/termdown { }; + termdown = python3Packages.callPackage ../applications/misc/termdown { }; terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; @@ -22140,6 +22349,7 @@ in transmission = callPackage ../applications/networking/p2p/transmission { }; transmission-gtk = transmission.override { enableGTK3 = true; }; + transmission-qt = transmission.override { enableQt = true; }; transmission-remote-cli = callPackage ../applications/networking/p2p/transmission-remote-cli {}; transmission-remote-gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {}; @@ -22150,6 +22360,8 @@ in trayer = callPackage ../applications/window-managers/trayer { }; + tinywm = callPackage ../applications/window-managers/tinywm { }; + tree-from-tags = callPackage ../applications/audio/tree-from-tags { }; tdrop = callPackage ../applications/misc/tdrop { }; @@ -22191,6 +22403,8 @@ in uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix {}); uefitool = uefitoolPackages.new-engine; + ungoogled-chromium = callPackage ../applications/networking/browsers/ungoogled-chromium (config.chromium or {}); + unigine-valley = callPackage ../applications/graphics/unigine-valley { }; unison = callPackage ../applications/networking/sync/unison { @@ -22221,11 +22435,9 @@ in vcv-rack = callPackage ../applications/audio/vcv-rack { }; - vdirsyncer = callPackage ../tools/misc/vdirsyncer { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; - }; + vdirsyncer = with python3Packages; toPythonApplication vdirsyncer; - vdirsyncerStable = callPackage ../tools/misc/vdirsyncer/stable.nix { }; + vdirsyncerStable = with python3Packages; toPythonApplication vdirsyncerStable; vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; @@ -22398,6 +22610,8 @@ in vwm = callPackage ../applications/window-managers/vwm { }; + yeahwm = callPackage ../applications/window-managers/yeahwm { }; + vym = qt5.callPackage ../applications/misc/vym { }; waon = callPackage ../applications/audio/waon { }; @@ -22440,6 +22654,8 @@ in wayvnc = callPackage ../applications/networking/remote/wayvnc { }; + webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; + webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {}; webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {}; @@ -22454,7 +22670,7 @@ in weechat = wrapWeechat weechat-unwrapped { }; - weechatScripts = dontRecurseIntoAttrs (callPackage ../applications/networking/irc/weechat/scripts { }); + weechatScripts = recurseIntoAttrs (callPackage ../applications/networking/irc/weechat/scripts { }); westonLite = weston.override { pango = null; @@ -22518,7 +22734,7 @@ in worldengine-cli = python3Packages.worldengine; - wpsoffice = callPackage ../applications/office/wpsoffice {}; + wpsoffice = libsForQt5.callPackage ../applications/office/wpsoffice {}; wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { }; @@ -23057,9 +23273,7 @@ in }; litecoind = litecoin.override { withGui = false; }; - lnd = callPackage ../applications/blockchains/lnd.nix { - buildGoModule = buildGo112Module; - }; + lnd = callPackage ../applications/blockchains/lnd.nix { }; monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; @@ -23227,9 +23441,8 @@ in crispyDoom = callPackage ../games/crispy-doom { }; - cri-o = callPackage ../applications/virtualization/cri-o { - buildGoPackage = buildGo112Package; - }; + cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { }; + cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { }; ckan = callPackage ../games/ckan { }; @@ -23512,6 +23725,8 @@ in gtk = gtk2; }; + mari0 = callPackage ../games/mari0 { }; + mars = callPackage ../games/mars { }; megaglest = callPackage ../games/megaglest {}; @@ -23550,7 +23765,7 @@ in lua = lua5_1; }; - n2048 = callPackage ../games/n2048 {}; + n2048 = callPackage ../games/n2048 { }; naev = callPackage ../games/naev { }; @@ -23563,6 +23778,8 @@ in nethack-x11 = callPackage ../games/nethack { x11Mode = true; }; + netris = callPackage ../games/netris { }; + neverball = callPackage ../games/neverball { }; nexuiz = callPackage ../games/nexuiz { }; @@ -23571,6 +23788,8 @@ in newtonwars = callPackage ../games/newtonwars { }; + nottetris2 = callPackage ../games/nottetris2 { }; + nudoku = callPackage ../games/nudoku { }; nxengine-evo = callPackage ../games/nxengine-evo { }; @@ -23591,20 +23810,11 @@ in openclonk = callPackage ../games/openclonk { }; - openjk = callPackage ../games/openjk { - # segfaults when built with gcc9 - stdenv = gcc8Stdenv; - }; + openjk = callPackage ../games/openjk { }; openmw = libsForQt5.callPackage ../games/openmw { }; - openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { - openmw = openmw.override { - stdenv = gcc8Stdenv; - openscenegraph = openscenegraph.override { stdenv = gcc8Stdenv; }; - mygui = mygui.override { stdenv = gcc8Stdenv; }; - }; - }; + openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; openraPackages = import ../games/openra pkgs; @@ -23729,9 +23939,9 @@ in sauerbraten = callPackage ../games/sauerbraten {}; - scaleway-cli = callPackage ../tools/admin/scaleway-cli { - buildGoPackage = buildGo112Package; - }; + scaleft = callPackage ../applications/networking/scaleft { }; + + scaleway-cli = callPackage ../tools/admin/scaleway-cli { }; scid = callPackage ../games/scid { tcl = tcl-8_5; @@ -23807,10 +24017,6 @@ in steamcmd = steamPackages.steamcmd; - linux-steam-integration = callPackage ../games/linux-steam-integration { - gtk = pkgs.gtk3; - }; - protontricks = callPackage ../tools/package-management/protontricks { inherit (python3Packages) buildPythonApplication pytest setuptools_scm vdf; inherit (gnome3) zenity; @@ -23849,7 +24055,7 @@ in lua = lua5_1; }; - tbe = callPackage ../games/the-butterfly-effect { }; + tbe = libsForQt5.callPackage ../games/the-butterfly-effect { }; teetertorture = callPackage ../games/teetertorture { }; @@ -23869,6 +24075,8 @@ in tinyfugue = callPackage ../games/tinyfugue { }; + tockloader = callPackage ../development/tools/misc/tockloader { }; + tome2 = callPackage ../games/tome2 { }; tome4 = callPackage ../games/tome4 { }; @@ -23968,10 +24176,6 @@ in lua = lua5_2; }; - worldofgoo_demo = worldofgoo.override { - demo = true; - }; - worldofgoo = callPackage ../games/worldofgoo { }; xboard = callPackage ../games/xboard { }; @@ -24104,6 +24308,7 @@ in timepp = callPackage ../desktops/gnome-3/extensions/timepp { }; topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { }; + window-is-ready-remover = callPackage ../desktops/gnome-3/extensions/window-is-ready-remover { }; workspace-matrix = callPackage ../desktops/gnome-3/extensions/workspace-matrix { }; nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks."; @@ -24129,8 +24334,6 @@ in pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { }); - maxx = callPackage ../desktops/maxx { }; - plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { }; inherit (callPackages ../applications/misc/redshift { @@ -24197,7 +24400,7 @@ in molden = callPackage ../applications/science/chemistry/molden { }; - octopus = callPackage ../applications/science/chemistry/octopus { openblas=openblasCompat; }; + octopus = callPackage ../applications/science/chemistry/octopus { }; openmolcas = callPackage ../applications/science/chemistry/openmolcas { }; @@ -24279,7 +24482,7 @@ in est-sfs = callPackage ../applications/science/biology/est-sfs { }; - ezminc = callPackage ../applications/science/biology/EZminc { }; + ezminc = callPackage ../applications/science/biology/EZminc { stdenv = gcc8Stdenv; }; exonerate = callPackage ../applications/science/biology/exonerate { }; @@ -24369,6 +24572,8 @@ in prodigal = callPackage ../applications/science/biology/prodigal { }; + quast = callPackage ../applications/science/biology/quast { }; + raxml = callPackage ../applications/science/biology/raxml { }; raxml-mpi = appendToName "mpi" (raxml.override { @@ -24425,7 +24630,9 @@ in arpack = callPackage ../development/libraries/science/math/arpack { }; - blas = callPackage ../development/libraries/science/math/blas { }; + blas = callPackage ../build-support/alternatives/blas { }; + + blas-reference = callPackage ../development/libraries/science/math/blas { }; brial = callPackage ../development/libraries/science/math/brial { }; @@ -24445,12 +24652,15 @@ in jags = callPackage ../applications/science/math/jags { }; + lapack = callPackage ../build-support/alternatives/lapack { }; + + lapack-reference = callPackage ../development/libraries/science/math/liblapack { }; + liblapack = lapack-reference; + libbraiding = callPackage ../development/libraries/science/math/libbraiding { }; libhomfly = callPackage ../development/libraries/science/math/libhomfly { }; - liblapack = callPackage ../development/libraries/science/math/liblapack {}; - liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; lrs = callPackage ../development/libraries/science/math/lrs { }; @@ -24533,7 +24743,7 @@ in sympow = callPackage ../development/libraries/science/math/sympow { }; - ipopt = callPackage ../development/libraries/science/math/ipopt { openblas = openblasCompat; }; + ipopt = callPackage ../development/libraries/science/math/ipopt { }; gmsh = callPackage ../applications/science/math/gmsh { }; @@ -24587,7 +24797,9 @@ in dcmtk = callPackage ../applications/science/medicine/dcmtk { }; - ### PHYSICS + ### SCIENCE/PHYSICS + + elmerfem = callPackage ../applications/science/physics/elmerfem {}; sacrifice = callPackage ../applications/science/physics/sacrifice {}; @@ -24833,9 +25045,16 @@ in fped = callPackage ../applications/science/electronics/fped { }; + # this is a wrapper for kicad.base and kicad.libraries kicad = callPackage ../applications/science/electronics/kicad { }; kicad-small = kicad.override { pname = "kicad-small"; with3d = false; }; - kicad-unstable = kicad.override { pname = "kicad-unstable"; debug = true; }; + kicad-unstable = kicad.override { pname = "kicad-unstable"; stable = false; }; + # mostly here so the kicad-unstable components (except packages3d) get built + kicad-unstable-small = kicad.override { + pname = "kicad-unstable-small"; + stable = false; + with3d = false; + }; librepcb = libsForQt5.callPackage ../applications/science/electronics/librepcb { }; @@ -24955,7 +25174,9 @@ in inherit (pkgs.gnome2) gtkglext; }; - cytoscape = callPackage ../applications/science/misc/cytoscape { }; + cytoscape = callPackage ../applications/science/misc/cytoscape { + jre = openjdk11; + }; fityk = callPackage ../applications/science/misc/fityk { }; @@ -25115,9 +25336,7 @@ in clinfo = callPackage ../tools/system/clinfo { }; - cups = callPackage ../misc/cups { - libusb = libusb1; - }; + cups = callPackage ../misc/cups { }; cups-filters = callPackage ../misc/cups/filters.nix { }; @@ -25165,13 +25384,9 @@ in # this driver ships with pre-compiled 32-bit binary libraries cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { }; - cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { - libusb = libusb1; - }; + cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { }; - cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { - libusb = libusb1; - }; + cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { }; darcnes = callPackage ../misc/emulators/darcnes { }; @@ -25291,6 +25506,8 @@ in helmfile = callPackage ../applications/networking/cluster/helmfile { }; + helmsman = callPackage ../applications/networking/cluster/helmsman { }; + heptio-ark = callPackage ../applications/networking/cluster/heptio-ark { }; hplip = callPackage ../misc/drivers/hplip { }; @@ -25350,11 +25567,12 @@ in kontemplate = callPackage ../applications/networking/cluster/kontemplate { }; + # In general we only want keep the last three minor versions around that + # correspond to the last three supported kubernetes versions: + # https://kubernetes.io/docs/setup/release/version-skew-policy/#supported-versions + # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases inherit (callPackage ../applications/networking/cluster/kops {}) mkKops - kops_1_12 - kops_1_13 - kops_1_14 kops_1_15 kops_1_16 ; @@ -25586,6 +25804,8 @@ in nix-query-tree-viewer = callPackage ../tools/nix/nix-query-tree-viewer { }; + nix-update = python3Packages.callPackage ../tools/package-management/nix-update { }; + nix-update-source = callPackage ../tools/package-management/nix-update-source {}; nix-script = callPackage ../tools/nix/nix-script {}; @@ -25608,6 +25828,8 @@ in nix-serve = callPackage ../tools/package-management/nix-serve { }; + nix-simple-deploy = callPackage ../tools/package-management/nix-simple-deploy { }; + nixfmt = haskell.lib.justStaticExecutables haskellPackages.nixfmt; nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; @@ -25624,7 +25846,7 @@ in nut = callPackage ../applications/misc/nut { }; - solfege = callPackage ../misc/solfege { }; + solfege = python3Packages.callPackage ../misc/solfege { }; disnix = callPackage ../tools/package-management/disnix { }; @@ -25690,7 +25912,9 @@ in physlock = callPackage ../misc/screensavers/physlock { }; - pjsip = callPackage ../applications/networking/pjsip { }; + pjsip = callPackage ../applications/networking/pjsip { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; pounce = callPackage ../servers/pounce { }; @@ -25821,7 +26045,9 @@ in sanoid = callPackage ../tools/backup/sanoid { }; - satysfi = callPackage ../tools/typesetting/satysfi { }; + satysfi = callPackage ../tools/typesetting/satysfi { + ocamlPackages = ocaml-ng.ocamlPackages_4_07; + }; sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller { inherit libusb1; # Shadow python.pkgs.libusb1. @@ -25870,10 +26096,9 @@ in prow = callPackage ../applications/networking/cluster/prow { }; - inherit (callPackage ../applications/networking/cluster/terraform { - # terraform 0.12 crashes with go1.14 on darwin https://github.com/hashicorp/terraform/issues/24287 - buildGoPackage = if stdenv.isDarwin then buildGo113Package else buildGoPackage; - }) + termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; + + inherit (callPackage ../applications/networking/cluster/terraform { }) terraform_0_11 terraform_0_11-full terraform_0_12 @@ -25905,7 +26130,7 @@ in texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; - # TeX Live; see http://nixos.org/nixpkgs/manual/#sec-language-texlive + # TeX Live; see https://nixos.org/nixpkgs/manual/#sec-language-texlive texlive = recurseIntoAttrs (callPackage ../tools/typesetting/tex/texlive { }); @@ -26109,6 +26334,11 @@ in xzoom = callPackage ../tools/X11/xzoom {}; + yabai = callPackage ../os-specific/darwin/yabai { + inherit (darwin.apple_sdk.frameworks) + Carbon Cocoa ScriptingBridge; + }; + yabause = libsForQt5.callPackage ../misc/emulators/yabause { freeglut = null; openal = null; @@ -26174,8 +26404,8 @@ in dart = callPackage ../development/interpreters/dart { }; dart_old = dart.override { version = "1.24.3"; }; - dart_stable = dart.override { version = "2.7.1"; }; - dart_dev = dart.override { version = "2.8.0-dev.10.0"; }; + dart_stable = dart.override { version = "2.7.2"; }; + dart_dev = dart.override { version = "2.9.0-4.0.dev"; }; httrack = callPackage ../tools/backup/httrack { }; @@ -26269,7 +26499,7 @@ in xib2nib = callPackage ../development/tools/xib2nib {}; - linode-cli = callPackage ../tools/virtualization/linode-cli { }; + linode-cli = python3Packages.callPackage ../tools/virtualization/linode-cli {}; hss = callPackage ../tools/networking/hss {}; @@ -26289,9 +26519,7 @@ in dsniff = callPackage ../tools/networking/dsniff {}; - wal-g = callPackage ../tools/backup/wal-g { - inherit (darwin.apple_sdk.frameworks) Security; - }; + wal-g = callPackage ../tools/backup/wal-g { }; tlwg = callPackage ../data/fonts/tlwg { }; @@ -26342,7 +26570,7 @@ in bcompare = libsForQt5.callPackage ../applications/version-management/bcompare {}; - xp-pen-g430 = libsForQt5.callPackage ../misc/drivers/xp-pen-g430 {}; + pentablet-driver = libsForQt5.callPackage ../misc/drivers/pentablet-driver { }; qmk_firmware = callPackage ../development/misc/qmk_firmware { avrgcc = pkgsCross.avr.buildPackages.gcc; @@ -26402,6 +26630,10 @@ in kcli = callPackage ../development/tools/kcli {}; + pxlib = callPackage ../development/libraries/pxlib {}; + + pxview = callPackage ../development/tools/pxview {}; + unstick = callPackage ../os-specific/linux/unstick {}; quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; @@ -26416,4 +26648,11 @@ in btcdeb = callPackage ../applications/blockchains/btcdeb {}; + jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { }; + + zenstates = callPackage ../os-specific/linux/zenstates {}; + + vpsfree-client = callPackage ../tools/virtualization/vpsfree-client {}; + + gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; } diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 7d1bcc5bd99cb..d2b9eb52ec6c1 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -39,43 +39,17 @@ let ltac2 = callPackage ../development/coq-modules/ltac2 {}; math-classes = callPackage ../development/coq-modules/math-classes { }; inherit (callPackage ../development/coq-modules/mathcomp {}) - mathcompGen mathcompGenSingle ssreflect - - mathcompCorePkgs mathcomp + mathcomp_ mathcomp-config + mathcomp ssreflect mathcomp-ssreflect mathcomp-fingroup mathcomp-algebra mathcomp-solvable mathcomp-field mathcomp-character - - mathcompCorePkgs_1_7 mathcomp_1_7 - mathcomp-ssreflect_1_7 mathcomp-fingroup_1_7 mathcomp-algebra_1_7 - mathcomp-solvable_1_7 mathcomp-field_1_7 mathcomp-character_1_7 - - mathcompCorePkgs_1_8 mathcomp_1_8 - mathcomp-ssreflect_1_8 mathcomp-fingroup_1_8 mathcomp-algebra_1_8 - mathcomp-solvable_1_8 mathcomp-field_1_8 mathcomp-character_1_8 - - mathcompCorePkgs_1_9 mathcomp_1_9 - mathcomp-ssreflect_1_9 mathcomp-fingroup_1_9 mathcomp-algebra_1_9 - mathcomp-solvable_1_9 mathcomp-field_1_9 mathcomp-character_1_9 - - mathcompCorePkgs_1_10 mathcomp_1_10 - mathcomp-ssreflect_1_10 mathcomp-fingroup_1_10 mathcomp-algebra_1_10 - mathcomp-solvable_1_10 mathcomp-field_1_10 mathcomp-character_1_10 - ; + ; inherit (callPackage ../development/coq-modules/mathcomp/extra.nix { }) - mathcompExtraGen multinomials coqeal - - mathcomp-finmap mathcomp-bigenough mathcomp-analysis - mathcomp-multinomials mathcomp-real-closed mathcomp-coqeal - - mathcomp_1_7-finmap mathcomp_1_7-bigenough mathcomp_1_7-analysis - mathcomp_1_7-multinomials mathcomp_1_7-real-closed - mathcomp_1_7-finmap_1_0 - - mathcomp_1_8-finmap mathcomp_1_8-bigenough mathcomp_1_8-analysis - mathcomp_1_8-multinomials mathcomp_1_8-real-closed mathcomp_1_8-coqeal - - mathcomp_1_9-finmap mathcomp_1_9-bigenough mathcomp_1_9-analysis - mathcomp_1_9-multinomials mathcomp_1_9-real-closed; + mathcomp-extra-override mathcomp-extra-config mathcomp-extra + current-mathcomp-extra mathcomp-extra-fast mathcomp-extra-all + mathcomp-finmap mathcomp-bigenough mathcomp-real-closed + mathcomp-analysis multinomials coqeal + ; metalib = callPackage ../development/coq-modules/metalib { }; paco = callPackage ../development/coq-modules/paco {}; paramcoq = callPackage ../development/coq-modules/paramcoq {}; @@ -86,6 +60,8 @@ let tlc = callPackage ../development/coq-modules/tlc {}; Velisarios = callPackage ../development/coq-modules/Velisarios {}; Verdi = callPackage ../development/coq-modules/Verdi {}; + + filterPackages = filterCoqPackages; }; filterCoqPackages = coq: set: @@ -113,8 +89,7 @@ in rec { */ mkCoqPackages = coq: let self = lib.makeScope newScope (lib.flip mkCoqPackages' coq); in - if coq.dontFilter or false then self - else filterCoqPackages coq self; + if coq.dontFilter or false then self else filterCoqPackages coq self; coq_8_5 = callPackage ../applications/science/logic/coq { ocamlPackages = ocamlPackages_4_05; @@ -137,7 +112,7 @@ in rec { version = "8.10.2"; }; coq_8_11 = callPackage ../applications/science/logic/coq { - version = "8.11.1"; + version = "8.11.2"; }; coqPackages_8_5 = mkCoqPackages coq_8_5; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 35cbcebb2422f..3b58e1937b605 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -558,7 +558,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { FSharp.Compiler.Service project. It is intended to be used as a backend service for rich editing or 'intellisense' features for editors. ''; - homepage = https://github.com/fsharp/FSharp.AutoComplete; + homepage = "https://github.com/fsharp/FSharp.AutoComplete"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ obadz ]; platforms = with stdenv.lib.platforms; linux; @@ -607,13 +607,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { fileProvidedTypes = fetchurl { name = "ProvidedTypes.fs"; - url = https://raw.githubusercontent.com/fsprojects/FSharp.TypeProviders.StarterPack/877014bfa6244ac382642e113d7cd6c9bc27bc6d/src/ProvidedTypes.fs; + url = "https://raw.githubusercontent.com/fsprojects/FSharp.TypeProviders.StarterPack/877014bfa6244ac382642e113d7cd6c9bc27bc6d/src/ProvidedTypes.fs"; sha256 = "1lb056v1xld1rfx6a8p8i2jz8i6qa2r2823n5izsf1qg1qgf2980"; }; fileDebugProvidedTypes = fetchurl { name = "DebugProvidedTypes.fs"; - url = https://raw.githubusercontent.com/fsprojects/FSharp.TypeProviders.StarterPack/877014bfa6244ac382642e113d7cd6c9bc27bc6d/src/DebugProvidedTypes.fs; + url = "https://raw.githubusercontent.com/fsprojects/FSharp.TypeProviders.StarterPack/877014bfa6244ac382642e113d7cd6c9bc27bc6d/src/DebugProvidedTypes.fs"; sha256 = "1whyrf2jv6fs7kgysn2086v15ggjsd54g1xfs398mp46m0nxp91f"; }; @@ -709,7 +709,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = with stdenv.lib; { description = "A tool to help visualize git revisions and branches"; - homepage = https://github.com/crc8/GitVersionTree; + homepage = "https://github.com/crc8/GitVersionTree"; license = licenses.gpl2; maintainers = with maintainers; [ obadz ]; platforms = platforms.all; @@ -733,7 +733,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "Math.NET Numerics is an opensource numerical library for .Net, Silverlight and Mono"; - homepage = https://numerics.mathdotnet.com/; + homepage = "https://numerics.mathdotnet.com/"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ obadz ]; platforms = with stdenv.lib.platforms; linux; @@ -763,7 +763,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "A generic framework for creating extensible applications"; - homepage = https://www.mono-project.com/Mono.Addins; + homepage = "https://www.mono-project.com/Mono.Addins"; longDescription = '' A generic framework for creating extensible applications, and for creating libraries which extend those applications. @@ -854,7 +854,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "A callback-based program option parser for C#"; - homepage = http://www.ndesk.org/Options; + homepage = "http://www.ndesk.org/Options"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ obadz ]; platforms = with stdenv.lib.platforms; linux; @@ -949,7 +949,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "A declarative CLI argument/XML configuration parser for F# applications"; - homepage = https://nessos.github.io/UnionArgParser/; + homepage = "https://nessos.github.io/UnionArgParser/"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ obadz ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 1853c7eb8ac15..d044ed8004858 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -78,7 +78,7 @@ in lib.makeScope newScope (self: lib.makeOverridable ({ // melpaStablePackages // { inherit melpaStablePackages; } // melpaPackages // { inherit melpaPackages; } // orgPackages // { inherit orgPackages; } - // manualPackages + // manualPackages // { inherit manualPackages; } // { inherit emacs melpaBuild trivialBuild; emacsWithPackages = emacsWithPackages self; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 052b84f269e6f..13c5b7213013d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -56,12 +56,6 @@ in { buildLlvmPackages = buildPackages.llvmPackages_6; llvmPackages = pkgs.llvmPackages_6; }; - ghc881 = callPackage ../development/compilers/ghc/8.8.1.nix { - bootPkgs = packages.ghc865Binary; - inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_7; - llvmPackages = pkgs.llvmPackages_7; - }; ghc882 = callPackage ../development/compilers/ghc/8.8.2.nix { bootPkgs = packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; @@ -81,10 +75,11 @@ in { llvmPackages = pkgs.llvmPackages_9; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { - bootPkgs = packages.ghc865Binary; + bootPkgs = packages.ghc883; # no binary yet inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_6; - llvmPackages = pkgs.llvmPackages_6; + buildLlvmPackages = buildPackages.llvmPackages_10; + llvmPackages = pkgs.llvmPackages_10; + libffi = pkgs.libffi; }; ghcjs = compiler.ghcjs86; ghcjs86 = callPackage ../development/compilers/ghcjs-ng { @@ -133,11 +128,6 @@ in { ghc = bh.compiler.ghc865; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; }; - ghc881 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc881; - ghc = bh.compiler.ghc881; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { }; - }; ghc882 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc882; ghc = bh.compiler.ghc882; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 7f29d47a993c6..7cf47c26c6fc4 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -186,7 +186,7 @@ with self; { meta = with stdenv.lib; { description = "A modular widget library for the awesome window manager"; - homepage = https://github.com/Mic92/vicious; + homepage = "https://github.com/Mic92/vicious"; license = licenses.gpl2; maintainers = with maintainers; [ makefu mic92 ]; platforms = platforms.linux; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index fd863e428aff8..6c45b77abb776 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -16,6 +16,8 @@ let buildDunePackage = callPackage ../build-support/ocaml/dune.nix {}; + afl-persistent = callPackage ../development/ocaml-modules/afl-persistent { }; + alcotest = callPackage ../development/ocaml-modules/alcotest {}; alcotest-lwt = callPackage ../development/ocaml-modules/alcotest/lwt.nix {}; @@ -36,27 +38,8 @@ let astring = callPackage ../development/ocaml-modules/astring { }; - async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { }; - - async_find = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async_find - else callPackage ../development/ocaml-modules/async_find { }; - async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { }; - async_shell = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async_shell - else callPackage ../development/ocaml-modules/async_shell { }; - - async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { }; - - async_p4 = - if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/async { } - else null; - atd = callPackage ../development/ocaml-modules/atd { }; atdgen = callPackage ../development/ocaml-modules/atdgen { }; @@ -75,6 +58,8 @@ let bigstringaf = callPackage ../development/ocaml-modules/bigstringaf { }; + bigstring = callPackage ../development/ocaml-modules/bigstring { }; + biocaml = callPackage ../development/ocaml-modules/biocaml { }; bistro = callPackage ../development/ocaml-modules/bistro { }; @@ -214,6 +199,10 @@ let dispatch = callPackage ../development/ocaml-modules/dispatch { }; + dns = callPackage ../development/ocaml-modules/dns { }; + + dns-client = callPackage ../development/ocaml-modules/dns/client.nix { }; + dolmen = callPackage ../development/ocaml-modules/dolmen { }; dolog = callPackage ../development/ocaml-modules/dolog { }; @@ -228,12 +217,21 @@ let dune = callPackage ../development/tools/ocaml/dune { }; - dune_2 = callPackage ../development/tools/ocaml/dune/2.nix { }; + dune_2 = + if lib.versionAtLeast ocaml.version "4.07" + then callPackage ../development/tools/ocaml/dune/2.nix { } + else if lib.versionAtLeast ocaml.version "4.02" + then pkgs.dune_2 + else throw "dune_2 is not available for OCaml ${ocaml.version}"; + + dune-build-info = callPackage ../development/ocaml-modules/dune-build-info { }; dune-configurator = callPackage ../development/ocaml-modules/dune-configurator { }; dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { }; + duration = callPackage ../development/ocaml-modules/duration { }; + earley = callPackage ../development/ocaml-modules/earley { }; earlybird = callPackage ../development/ocaml-modules/earlybird { }; @@ -272,6 +270,8 @@ let farfadet = callPackage ../development/ocaml-modules/farfadet { }; + fiat-p256 = callPackage ../development/ocaml-modules/fiat-p256 { }; + fieldslib_p4 = callPackage ../development/ocaml-modules/fieldslib { }; fileutils = callPackage ../development/ocaml-modules/fileutils { }; @@ -290,6 +290,8 @@ let functoria = callPackage ../development/ocaml-modules/functoria { }; + functoria-runtime = callPackage ../development/ocaml-modules/functoria/runtime.nix { }; + functory = callPackage ../development/ocaml-modules/functory { }; gen = callPackage ../development/ocaml-modules/gen { }; @@ -300,10 +302,14 @@ let inherit (pkgs) gnuplot; }; + hacl_x25519 = callPackage ../development/ocaml-modules/hacl_x25519 { }; + herelib = callPackage ../development/ocaml-modules/herelib { }; higlo = callPackage ../development/ocaml-modules/higlo { }; + hkdf = callPackage ../development/ocaml-modules/hkdf { }; + hmap = callPackage ../development/ocaml-modules/hmap { }; imagelib = callPackage ../development/ocaml-modules/imagelib { }; @@ -316,12 +322,9 @@ let io-page = callPackage ../development/ocaml-modules/io-page { }; - ipaddr_p4 = callPackage ../development/ocaml-modules/ipaddr/2.6.1.nix { }; + io-page-unix = callPackage ../development/ocaml-modules/io-page/unix.nix { }; - ipaddr = - if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/ipaddr { } - else ipaddr_p4; + ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; irmin_1 = callPackage ../development/ocaml-modules/irmin/1.4.nix { }; @@ -392,9 +395,7 @@ let irmin-watcher = callPackage ../development/ocaml-modules/irmin-watcher { }; - jingoo = callPackage ../development/ocaml-modules/jingoo { - pcre = ocaml_pcre; - }; + jingoo = callPackage ../development/ocaml-modules/jingoo { }; js_of_ocaml = if lib.versionOlder "4.02" ocaml.version @@ -416,9 +417,7 @@ let js_of_ocaml-ppx = callPackage ../development/tools/ocaml/js_of_ocaml/ppx.nix {}; - js_of_ocaml-ppx_deriving_json = callPackage ../development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix { - ppxlib = ppxlib.override { version = "0.12.0"; }; - }; + js_of_ocaml-ppx_deriving_json = callPackage ../development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix { }; js_of_ocaml-tyxml = callPackage ../development/tools/ocaml/js_of_ocaml/tyxml.nix {}; @@ -448,10 +447,6 @@ let then callPackage ../development/ocaml-modules/lablgtk-extras { } else callPackage ../development/ocaml-modules/lablgtk-extras/1.4.nix { }; - lablgtkmathview = callPackage ../development/ocaml-modules/lablgtkmathview { - gtkmathview = callPackage ../development/libraries/gtkmathview { }; - }; - labltk = callPackage ../development/ocaml-modules/labltk { }; lacaml = callPackage ../development/ocaml-modules/lacaml { }; @@ -530,6 +525,38 @@ let minisat = callPackage ../development/ocaml-modules/minisat { }; + mirage-clock = callPackage ../development/ocaml-modules/mirage-clock { }; + + mirage-clock-unix = callPackage ../development/ocaml-modules/mirage-clock/unix.nix { }; + + mirage-crypto = callPackage ../development/ocaml-modules/mirage-crypto { }; + + mirage-crypto-pk = callPackage ../development/ocaml-modules/mirage-crypto/pk.nix { }; + + mirage-crypto-rng = callPackage ../development/ocaml-modules/mirage-crypto/rng.nix { }; + + mirage-device = callPackage ../development/ocaml-modules/mirage-device { }; + + mirage-flow = callPackage ../development/ocaml-modules/mirage-flow { }; + + mirage-flow-combinators = callPackage ../development/ocaml-modules/mirage-flow/combinators.nix { }; + + mirage-flow-unix = callPackage ../development/ocaml-modules/mirage-flow/unix.nix { }; + + mirage-protocols = callPackage ../development/ocaml-modules/mirage-protocols { }; + + mirage-random = callPackage ../development/ocaml-modules/mirage-random { }; + + mirage-runtime = callPackage ../development/ocaml-modules/mirage/runtime.nix { }; + + mirage-stack = callPackage ../development/ocaml-modules/mirage-stack { }; + + mirage-time = callPackage ../development/ocaml-modules/mirage-time { }; + + mirage-time-unix = callPackage ../development/ocaml-modules/mirage-time/unix.nix { }; + + mirage-unix = callPackage ../development/ocaml-modules/mirage-unix { }; + mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; mlgmpidl = callPackage ../development/ocaml-modules/mlgmpidl { }; @@ -560,8 +587,6 @@ let comparelib = callPackage ../development/ocaml-modules/comparelib { }; - core_extended_p4 = callPackage ../development/ocaml-modules/core_extended { }; - core_kernel_p4 = callPackage ../development/ocaml-modules/core_kernel { }; core_p4 = callPackage ../development/ocaml-modules/core { }; @@ -627,6 +652,8 @@ let ocaml_sqlite3 = callPackage ../development/ocaml-modules/sqlite3 { }; + ocaml-syntax-shims = callPackage ../development/ocaml-modules/ocaml-syntax-shims { }; + syslog = callPackage ../development/ocaml-modules/syslog { }; ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { }; @@ -687,6 +714,8 @@ let ounit = callPackage ../development/ocaml-modules/ounit { }; + ounit2 = callPackage ../development/ocaml-modules/ounit2 { }; + pgsolver = callPackage ../development/ocaml-modules/pgsolver { }; phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { }; @@ -707,8 +736,6 @@ let ptime = callPackage ../development/ocaml-modules/ptime { }; - re2_p4 = callPackage ../development/ocaml-modules/re2 { }; - resource-pooling = callPackage ../development/ocaml-modules/resource-pooling { }; result = callPackage ../development/ocaml-modules/ocaml-result { }; @@ -729,11 +756,7 @@ let ulex = callPackage ../development/ocaml-modules/ulex { }; - textutils_p4 = callPackage ../development/ocaml-modules/textutils { }; - - tls = callPackage ../development/ocaml-modules/tls { - lwt = ocaml_lwt; - }; + tls = callPackage ../development/ocaml-modules/tls { }; type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { }; type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { }; @@ -796,7 +819,9 @@ let ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {}; - ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc {}; + ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { + ppxlib = ppxlib.override { legacy = true; }; + }; ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {}; @@ -804,6 +829,9 @@ let ppx_import = callPackage ../development/ocaml-modules/ppx_import {}; + ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix { + }; + ppx_sqlexpr = callPackage ../development/ocaml-modules/sqlexpr/ppx.nix {}; ppx_tools = @@ -825,6 +853,8 @@ let qtest = callPackage ../development/ocaml-modules/qtest { }; + randomconv = callPackage ../development/ocaml-modules/randomconv { }; + re = callPackage ../development/ocaml-modules/re { }; react = callPackage ../development/ocaml-modules/react { }; @@ -885,17 +915,10 @@ let uucp = callPackage ../development/ocaml-modules/uucp { }; uunf = callPackage ../development/ocaml-modules/uunf { }; - uri = - if lib.versionAtLeast ocaml.version "4.3" - then callPackage ../development/ocaml-modules/uri { } - else callPackage ../development/ocaml-modules/uri/legacy.nix { }; + uri = callPackage ../development/ocaml-modules/uri { }; uri-sexp = callPackage ../development/ocaml-modules/uri/sexp.nix { }; - uri_p4 = callPackage ../development/ocaml-modules/uri/legacy.nix { - legacyVersion = true; - }; - uuseg = callPackage ../development/ocaml-modules/uuseg { }; uutf = callPackage ../development/ocaml-modules/uutf { }; @@ -938,21 +961,30 @@ let # Jane Street janePackage = - if lib.versionOlder "4.07" ocaml.version + if lib.versionOlder "4.08" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/janePackage_0_13.nix {} + else if lib.versionOlder "4.07" ocaml.version then callPackage ../development/ocaml-modules/janestreet/janePackage_0_12.nix {} else callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; janeStreet = - if lib.versionOlder "4.07" ocaml.version - then import ../development/ocaml-modules/janestreet/0.12.nix { + if lib.versionOlder "4.08" ocaml.version + then import ../development/ocaml-modules/janestreet/0.13.nix { inherit ctypes janePackage num octavius ppxlib re; inherit (pkgs) openssl; } + else if lib.versionOlder "4.07" ocaml.version + then import ../development/ocaml-modules/janestreet/0.12.nix { + inherit ctypes janePackage num octavius re; + inherit (pkgs) openssl; + ppxlib = ppxlib.override { legacy = true; }; + } else import ../development/ocaml-modules/janestreet { inherit janePackage ocamlbuild angstrom ctypes cryptokit; inherit magic-mime num ocaml-migrate-parsetree octavius ounit; - inherit ppx_deriving re ppxlib; + inherit ppx_deriving re; inherit (pkgs) openssl; + ppxlib = ppxlib.override { legacy = true; }; }; janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { @@ -1138,27 +1170,6 @@ let then callPackage ../development/ocaml-modules/janestreet/core.nix {} else core_p4; - re2 = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.re2 - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/re2.nix {} - else re2_p4; - - textutils = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.textutils - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/textutils.nix {} - else textutils_p4; - - core_extended = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.core_extended - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/core-extended.nix {} - else core_extended_p4; - async_kernel = if lib.versionOlder "4.03" ocaml.version then janeStreet.async_kernel @@ -1171,32 +1182,6 @@ let then janeStreet.async_rpc_kernel else callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {}; - async_unix = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async_unix - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {} - else async_unix_p4; - - async_extra = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async_extra - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/async-extra.nix {} - else async_extra_p4; - - async = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/async.nix {} - else async_p4; - - async_ssl = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async_ssl - else callPackage ../development/ocaml-modules/janestreet/async_ssl.nix { }; - # Apps / from all-packages ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { }; @@ -1234,6 +1219,8 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_4_10 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.10.nix { }); + ocamlPackages_4_11 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.11.nix { }); + ocamlPackages_latest = ocamlPackages_4_10; ocamlPackages = ocamlPackages_4_09; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 941ec10d9ee6b..f405d879c3475 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -90,7 +90,7 @@ let version = "3.3.1"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/ack-v3.3.1.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/ack-v3.3.1.tar.gz"; sha256 = "12fm9zplyqndji52nb3b5d91z22g8gr61r1k153kjq84kw264fxf"; }; @@ -107,7 +107,7 @@ let meta = with stdenv.lib; { description = "A grep-like tool tailored to working with large trees of source code"; - homepage = https://beyondgrep.com; + homepage = "https://beyondgrep.com"; license = licenses.artistic2; maintainers = with maintainers; [ lovek323 ]; }; @@ -117,7 +117,7 @@ let pname = "Algorithm-Annotate"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/C/CL/CLKAO/Algorithm-Annotate-0.10.tar.gz; + url = "mirror://cpan/authors/id/C/CL/CLKAO/Algorithm-Annotate-0.10.tar.gz"; sha256 = "1y92k4nqkscfwpriv8q7c90rjfj85lvwq1k96niv2glk8d37dcf9"; }; propagatedBuildInputs = [ AlgorithmDiff ]; @@ -127,7 +127,7 @@ let pname = "Algorithm-C3"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Algorithm-C3-0.10.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Algorithm-C3-0.10.tar.gz"; sha256 = "01hlcaxndls86bl92rkd3fvf9pfa3inxqaimv88bxs95803kmkss"; }; meta = { @@ -140,7 +140,7 @@ let pname = "Algorithm-Diff"; version = "1.1903"; src = fetchurl { - url = mirror://cpan/authors/id/T/TY/TYEMQ/Algorithm-Diff-1.1903.tar.gz; + url = "mirror://cpan/authors/id/T/TY/TYEMQ/Algorithm-Diff-1.1903.tar.gz"; sha256 = "0l8pk7ziz72d022hsn4xldhhb9f5649j5cgpjdibch0xng24ms1h"; }; buildInputs = [ pkgs.unzip ]; @@ -150,7 +150,7 @@ let pname = "Algorithm-Merge"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/J/JS/JSMITH/Algorithm-Merge-0.08.tar.gz; + url = "mirror://cpan/authors/id/J/JS/JSMITH/Algorithm-Merge-0.08.tar.gz"; sha256 = "1kqn13wd0lfjrf6h19b9kgdqqwp7k2d9yfq5i0wvii0xi8jqh1lw"; }; propagatedBuildInputs = [ AlgorithmDiff ]; @@ -160,7 +160,7 @@ let pname = "Alien-Build"; version = "1.98"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.98.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.98.tar.gz"; sha256 = "12w9da57616gmcj69yv7cjv423cj957dm0f84cn2q093g64kjmif"; }; propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny PkgConfig ]; @@ -175,7 +175,7 @@ let pname = "Alien-GMP"; version = "1.14"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-GMP-1.14.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-GMP-1.14.tar.gz"; sha256 = "116vvh1b0d1ykkklqgfxfn89g3bw90a4cj3qrvsnkw1kk5cmn60a"; }; propagatedBuildInputs = [ AlienBuild ]; @@ -190,7 +190,7 @@ let pname = "Alien-Libxml2"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.12.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.12.tar.gz"; sha256 = "0b3dj1510fxldhicijvw390gnh5j1k6rjzcc2jzs9f8nwfkqh6r2"; }; propagatedBuildInputs = [ AlienBuild ]; @@ -205,7 +205,7 @@ let pname = "aliased"; version = "0.34"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/aliased-0.34.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/aliased-0.34.tar.gz"; sha256 = "1syyqzy462501kn5ma9gl6xbmcahqcn4qpafhsmpz0nd0x2m4l63"; }; buildInputs = [ ModuleBuildTiny ]; @@ -215,7 +215,7 @@ let pname = "asa"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/asa-1.04.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/asa-1.04.tar.gz"; sha256 = "0pk783s1h2f45zbmm6a62yfgy71w4sqh8ppgs4cyxfikwxs3p0z5"; }; meta = { @@ -249,7 +249,7 @@ let pname = "Alien-Tidyp"; version = "1.4.7"; src = fetchurl { - url = mirror://cpan/authors/id/K/KM/KMX/Alien-Tidyp-v1.4.7.tar.gz; + url = "mirror://cpan/authors/id/K/KM/KMX/Alien-Tidyp-v1.4.7.tar.gz"; sha256 = "0raapwp4155lqag1kzhsd20z4if10hav9wx4d7mc1xpvf7dcnr5r"; }; @@ -262,7 +262,7 @@ let pname = "Alien-wxWidgets"; version = "0.69"; src = fetchurl { - url = mirror://cpan/authors/id/M/MD/MDOOTSON/Alien-wxWidgets-0.69.tar.gz; + url = "mirror://cpan/authors/id/M/MD/MDOOTSON/Alien-wxWidgets-0.69.tar.gz"; sha256 = "0jg2dmkzhj03f6b0vmv597yryfw9cclsdn9ynvvlrzzgpd5lw8jk"; }; propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK30 ModulePluggable ]; @@ -273,7 +273,7 @@ let pname = "AnyEvent"; version = "7.17"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.17.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.17.tar.gz"; sha256 = "50beea689c098fe4aaeb83806c40b9fe7f946d5769acf99f849f099091a4b985"; }; buildInputs = [ CanaryStability ]; @@ -286,13 +286,13 @@ let pname = "AnyEvent-CacheDNS"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/P/PO/POTYL/AnyEvent-CacheDNS-0.08.tar.gz; + url = "mirror://cpan/authors/id/P/PO/POTYL/AnyEvent-CacheDNS-0.08.tar.gz"; sha256 = "41c1faf183b61806b55889ceea1237750c1f61b9ce2735fdf33dc05536712dae"; }; propagatedBuildInputs = [ AnyEvent ]; doCheck = false; # does an DNS lookup meta = { - homepage = https://github.com/potyl/perl-AnyEvent-CacheDNS; + homepage = "https://github.com/potyl/perl-AnyEvent-CacheDNS"; description = "Simple DNS resolver with caching"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -302,7 +302,7 @@ let pname = "AnyEvent-FastPing"; version = "2.1"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-FastPing-2.1.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-FastPing-2.1.tar.gz"; sha256 = "0b3ha864nw0qk22ybhzfgz0r0p69iyj01bi500x9hp6kga7ip4p5"; }; propagatedBuildInputs = [ AnyEvent commonsense ]; @@ -314,7 +314,7 @@ let pname = "AnyEvent-HTTP"; version = "2.24"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-HTTP-2.24.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-HTTP-2.24.tar.gz"; sha256 = "0358a542baa45403d81c0a70e43e79c044ddfa1371161d043f002acef63121dd"; }; propagatedBuildInputs = [ AnyEvent commonsense ]; @@ -324,7 +324,7 @@ let pname = "AnyEvent-I3"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTPLBG/AnyEvent-I3-0.17.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSTPLBG/AnyEvent-I3-0.17.tar.gz"; sha256 = "5382c984c9f138395f29f0c00af81aa0c8f4b765582055c73ede4b13f04a6d63"; }; propagatedBuildInputs = [ AnyEvent JSONXS ]; @@ -338,7 +338,7 @@ let pname = "AnyEvent-RabbitMQ"; version = "1.19"; src = fetchurl { - url = mirror://cpan/authors/id/D/DL/DLAMBLEY/AnyEvent-RabbitMQ-1.19.tar.gz; + url = "mirror://cpan/authors/id/D/DL/DLAMBLEY/AnyEvent-RabbitMQ-1.19.tar.gz"; sha256 = "a440ec2fa5a4018ad44739baaa9601cc460ad497282e89110ba8e3cf23312f0a"; }; buildInputs = [ TestException ]; @@ -353,7 +353,7 @@ let pname = "Any-Moose"; version = "0.27"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Any-Moose-0.27.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Any-Moose-0.27.tar.gz"; sha256 = "0dc55mpayrixwx8dwql0vj0jalg4rlb3k64rprc84bl0z8vkx9m8"; }; propagatedBuildInputs = [ Moose Mouse ]; @@ -363,7 +363,7 @@ let pname = "Any-URI-Escape"; version = "0.01"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/Any-URI-Escape-0.01.tar.gz; + url = "mirror://cpan/authors/id/P/PH/PHRED/Any-URI-Escape-0.01.tar.gz"; sha256 = "0k4c20bmw32yxksgkc2i44j4vfmzhqcqrq36pv0ab3qhkzn3r0g3"; }; propagatedBuildInputs = [ URI ]; @@ -376,7 +376,7 @@ let pname = "Apache-AuthCookie"; version = "3.28"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHOUT/Apache-AuthCookie-3.28.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Apache-AuthCookie-3.28.tar.gz"; sha256 = "bcd795a7f654a94ae0a6bd734ba4d8ba1085371fca486229dba49f1c2d62142b"; }; buildInputs = [ ApacheTest ]; @@ -397,7 +397,7 @@ let pname = "Apache-LogFormat-Compiler"; version = "0.36"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/Apache-LogFormat-Compiler-0.36.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/Apache-LogFormat-Compiler-0.36.tar.gz"; sha256 = "05xcl7j65vakx7x79jqjikyw0nzf60bc2w6hhc0q5sklxq1ral4l"; }; buildInputs = [ HTTPMessage ModuleBuildTiny TestMockTime TestRequires TryTiny URI ]; @@ -405,7 +405,7 @@ let # We cannot change the timezone on the fly. prePatch = "rm t/04_tz.t"; meta = { - homepage = https://github.com/kazeburo/Apache-LogFormat-Compiler; + homepage = "https://github.com/kazeburo/Apache-LogFormat-Compiler"; description = "Compile a log format string to perl-code"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -415,7 +415,7 @@ let pname = "Apache-Session"; version = "1.93"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHORNY/Apache-Session-1.93.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHORNY/Apache-Session-1.93.tar.gz"; sha256 = "8e5a4882ac8ec657d1018d74d3ba37854e2688a41ddd0e1d73955ea59f276e8d"; }; buildInputs = [ TestDeep TestException ]; @@ -429,7 +429,7 @@ let pname = "Apache-Test"; version = "1.42"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.42.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.42.tar.gz"; sha256 = "1sxk7dmpg3ib1dkl58ddh7zffnv5danwba7qxp82k54agmyz1086"; }; doCheck = false; @@ -443,7 +443,7 @@ let pname = "App-CLI"; version = "0.50"; src = fetchurl { - url = mirror://cpan/authors/id/P/PT/PTC/App-CLI-0.50.tar.gz; + url = "mirror://cpan/authors/id/P/PT/PTC/App-CLI-0.50.tar.gz"; sha256 = "0ick5agl02rx2pjfxl97d0f9qksy8pjn0asmwm3gn6dm7a1zblsi"; }; propagatedBuildInputs = [ CaptureTiny ClassLoad ]; @@ -454,7 +454,7 @@ let pname = "App-ClusterSSH"; version = "4.14"; src = fetchurl { - url = mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.14.tar.gz; + url = "mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.14.tar.gz"; sha256 = "020p28xl9507blvr8lr7hdxk1cl8jjkz5rkrkh7g538g52sa2cmi"; }; propagatedBuildInputs = [ ExceptionClass Tk X11ProtocolOther XMLSimple ]; @@ -480,13 +480,13 @@ let pname = "App-Cmd"; version = "0.331"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.331.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.331.tar.gz"; sha256 = "4a5d3df0006bd278880d01f4957aaa652a8f91fe8f66e93adf70fba0c3ecb680"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ CaptureTiny ClassLoad GetoptLongDescriptive IOTieCombine ModulePluggable StringRewritePrefix ]; meta = { - homepage = https://github.com/rjbs/App-Cmd; + homepage = "https://github.com/rjbs/App-Cmd"; description = "Write command line apps with less suffering"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -496,7 +496,7 @@ let pname = "AppConfig"; version = "1.71"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/AppConfig-1.71.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/AppConfig-1.71.tar.gz"; sha256 = "03vvi3mk4833mx2c6dkm9zhvakf02mb2b7wz9pk9xc7c4mq04xqi"; }; meta = { @@ -509,7 +509,7 @@ let pname = "App-FatPacker"; version = "0.010008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTROUT/App-FatPacker-0.010008.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSTROUT/App-FatPacker-0.010008.tar.gz"; sha256 = "1kzcbpsf1p7ww45d9fl2w0nfn5jj5pz0r0c649c1lrj5r1nv778j"; }; meta = { @@ -522,11 +522,11 @@ let pname = "App-cpanminus"; version = "1.7044"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz"; sha256 = "9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3"; }; meta = { - homepage = https://github.com/miyagawa/cpanminus; + homepage = "https://github.com/miyagawa/cpanminus"; description = "Get, unpack, build and install modules from CPAN"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -551,7 +551,7 @@ let pname = "App-perlbrew"; version = "0.88"; src = fetchurl { - url = mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.88.tar.gz; + url = "mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.88.tar.gz"; sha256 = "08aj77i7bh4nhilz16axp4zfv0zg66za2c4i0rcwfg3qxgxbcrzs"; }; buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; @@ -569,7 +569,7 @@ let pname = "Archive-Any-Lite"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Archive-Any-Lite-0.11.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Archive-Any-Lite-0.11.tar.gz"; sha256 = "0w2i50fd81ip674zmnrb15nadw162fdpiw4rampbd94k74jqih8m"; }; propagatedBuildInputs = [ ArchiveZip ]; @@ -584,14 +584,14 @@ let version = "1.0.0"; pname = "App-Sqitch"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.0.0.tar.gz; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.0.0.tar.gz"; sha256 = "f46466c1e9ad8bbabf6844fed4f6e534ea475731de61b775ad7c331db1ca9c5c"; }; buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestNoWarnings TestWarn ]; propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ]; doCheck = false; # Can't find home directory. meta = { - homepage = https://sqitch.org/; + homepage = "https://sqitch.org/"; description = "Sane database change management"; license = stdenv.lib.licenses.mit; }; @@ -601,7 +601,7 @@ let pname = "App-St"; version = "1.1.4"; src = fetchurl { - url = https://github.com/nferraz/st/archive/v1.1.4.tar.gz; + url = "https://github.com/nferraz/st/archive/v1.1.4.tar.gz"; sha256 = "1f4bqm4jiazcxgzzja1i48671za96621k0s3ln87cdacgvv1can0"; }; postInstall = @@ -611,7 +611,7 @@ let meta = { description = "A command that computes simple statistics"; license = stdenv.lib.licenses.mit; - homepage = https://github.com/nferraz/st; + homepage = "https://github.com/nferraz/st"; maintainers = [ maintainers.eelco ]; }; }; @@ -620,7 +620,7 @@ let pname = "Attribute-Params-Validate"; version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Attribute-Params-Validate-1.21.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Attribute-Params-Validate-1.21.tar.gz"; sha256 = "586b939ceffdb37188b7c461dd1a8f9f35695184c8703b05c35f6d508c8090f5"; }; buildInputs = [ TestFatal ]; @@ -636,7 +636,7 @@ let pname = "Array-Compare"; version = "3.0.3"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.3.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.3.tar.gz"; sha256 = "13hn913cj7vswh5yy7gxpmhzrwmwknkc73qn7bhw0x7gx757rav2"; }; @@ -648,7 +648,7 @@ let pname = "Array-Diff"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Array-Diff-0.09.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Array-Diff-0.09.tar.gz"; sha256 = "0xsh8k312spzl90xds075qprcaz4r0b93g1bgi9l3rv1k0p3j1l0"; }; propagatedBuildInputs = [ AlgorithmDiff ClassAccessor ]; @@ -662,13 +662,13 @@ let pname = "Array-FIFO"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/D/DB/DBURKE/Array-FIFO-0.13.tar.gz; + url = "mirror://cpan/authors/id/D/DB/DBURKE/Array-FIFO-0.13.tar.gz"; sha256 = "be2aeb5f5a9af1a96f0033508a569ca93ad19ad15dc7c6b998e6d7bc740c66f7"; }; buildInputs = [ TestDeep TestSpec TestTrap ]; propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { - homepage = https://github.com/dwburke/perl-Array-FIFO; + homepage = "https://github.com/dwburke/perl-Array-FIFO"; description = "A Simple limitable FIFO array, with sum and average methods"; license = stdenv.lib.licenses.artistic2; }; @@ -678,7 +678,7 @@ let pname = "AsyncPing"; version = "2016.1207"; src = fetchurl { - url = mirror://cpan/authors/id/X/XI/XINFWANG/AsyncPing-2016.1207.tar.gz; + url = "mirror://cpan/authors/id/X/XI/XINFWANG/AsyncPing-2016.1207.tar.gz"; sha256 = "0nn9k79gihzr9wfksi03jmdgc2ihsb4952ddz1v70xvsq7z9mgkg"; }; meta = { @@ -691,7 +691,7 @@ let pname = "Archive-Cpio"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/P/PI/PIXEL/Archive-Cpio-0.10.tar.gz; + url = "mirror://cpan/authors/id/P/PI/PIXEL/Archive-Cpio-0.10.tar.gz"; sha256 = "246fb31669764e78336b2191134122e07c44f2d82dc4f37d552ab28f8668bed3"; }; meta = { @@ -705,7 +705,7 @@ let pname = "Archive-Extract"; version = "0.86"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Archive-Extract-0.86.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Archive-Extract-0.86.tar.gz"; sha256 = "9acd09cdb8e8cf0b6d08210a3b80342300c89a359855319bf6b00c14c4aab687"; }; meta = { @@ -718,7 +718,7 @@ let pname = "Archive-Tar"; version = "2.32"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-2.32.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-2.32.tar.gz"; sha256 = "92783780731ab0c9247adf43e70f4801e8317e3915ea87e38b85c8f734e8fca2"; }; meta = { @@ -731,7 +731,7 @@ let pname = "Archive-Tar-Wrapper"; version = "0.37"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.37.tar.gz; + url = "mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.37.tar.gz"; sha256 = "0b1hi3zfnq487kfg514kr595j9w8x6wxddy3zlpqcxgiv90zlv3y"; }; propagatedBuildInputs = [ FileWhich IPCRun LogLog4perl ]; @@ -744,7 +744,7 @@ let pname = "Archive-Zip"; version = "1.67"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.67.tar.gz; + url = "mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.67.tar.gz"; sha256 = "0x17b7s5c3bqy9gx7psdqxbzkilylnwwd3c3i68vynbn9hs788my"; }; buildInputs = [ TestMockModule ]; @@ -758,7 +758,7 @@ let pname = "Audio-Scan"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/A/AG/AGRUNDMA/Audio-Scan-1.01.tar.gz; + url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/Audio-Scan-1.01.tar.gz"; sha256 = "0jk3djnk6yf0jsjh8qk3mj8bkx4avp6i4czcpr5xrbf7f41744l3"; }; buildInputs = [ pkgs.zlib TestWarn ]; @@ -774,7 +774,7 @@ let pname = "Authen-DecHpwd"; version = "2.007"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-DecHpwd-2.007.tar.gz; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-DecHpwd-2.007.tar.gz"; sha256 = "f43a93bb02b41f7327d92f9e963b69505f67350a52e8f50796f98afc4fb3f177"; }; perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' @@ -789,7 +789,7 @@ let pname = "Authen-Htpasswd"; version = "0.171"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTROUT/Authen-Htpasswd-0.171.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSTROUT/Authen-Htpasswd-0.171.tar.gz"; sha256 = "0rw06hwpxg388d26l0jvirczx304f768ijvc20l4b2ll7xzg9ymm"; }; propagatedBuildInputs = [ ClassAccessor CryptPasswdMD5 DigestSHA1 IOLockedFile ]; @@ -803,7 +803,7 @@ let pname = "Authen-ModAuthPubTkt"; version = "0.1.1"; src = fetchurl { - url = mirror://cpan/authors/id/A/AG/AGORDON/Authen-ModAuthPubTkt-0.1.1.tar.gz; + url = "mirror://cpan/authors/id/A/AG/AGORDON/Authen-ModAuthPubTkt-0.1.1.tar.gz"; sha256 = "7996e1a42c51216003ccf03c4b5250286b4c55684257971851f5ece9161dc7dd"; }; propagatedBuildInputs = [ pkgs.openssl IPCRun3 ]; @@ -839,7 +839,7 @@ let pname = "Authen-Passphrase"; version = "0.008"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-Passphrase-0.008.tar.gz; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-Passphrase-0.008.tar.gz"; sha256 = "55db4520617d859d88c0ee54965da815b7226d792b8cdc8debf92073559e0463"; }; propagatedBuildInputs = [ AuthenDecHpwd CryptDES CryptEksblowfish CryptMySQL CryptPasswdMD5 CryptUnixCryptXS DataEntropy DigestMD4 ModuleRuntime ]; @@ -853,7 +853,7 @@ let pname = "Authen-Radius"; version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.31.tar.gz; + url = "mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.31.tar.gz"; sha256 = "bb5191484188ac7d6e281eb199d16c4e09fb0090af7c2187aa275c454c1fc012"; }; buildInputs = [ TestNoWarnings ]; @@ -868,7 +868,7 @@ let pname = "Authen-SASL"; version = "2.16"; src = fetchurl { - url = mirror://cpan/authors/id/G/GB/GBARR/Authen-SASL-2.16.tar.gz; + url = "mirror://cpan/authors/id/G/GB/GBARR/Authen-SASL-2.16.tar.gz"; sha256 = "02afhlrdq5hh5g8b32fa79fqq5i76qzwfqqvfi9zi57h31szl536"; }; propagatedBuildInputs = [ DigestHMAC ]; @@ -915,7 +915,7 @@ let pname = "Authen-Simple"; version = "0.5"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHANSEN/Authen-Simple-0.5.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHANSEN/Authen-Simple-0.5.tar.gz"; sha256 = "02cddab47f8bf1a1cbd4c9bf8d258f6d05111499c33f8315e7244812f72613aa"; }; propagatedBuildInputs = [ ClassAccessor ClassDataInheritable CryptPasswdMD5 ParamsValidate ]; @@ -929,7 +929,7 @@ let pname = "Authen-Simple-Passwd"; version = "0.6"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHANSEN/Authen-Simple-Passwd-0.6.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHANSEN/Authen-Simple-Passwd-0.6.tar.gz"; sha256 = "1ckl2ry9r5nb1rcn1ik2l5b5pp1i3g4bmllsmzb0zpwy4lvbqmfg"; }; propagatedBuildInputs = [ AuthenSimple ]; @@ -943,7 +943,7 @@ let pname = "autobox"; version = "3.0.1"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-v3.0.1.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-v3.0.1.tar.gz"; sha256 = "c303b7fccfaa1ff4d4c429ab3f15e5ca2a77554ef8c9fc3b8c62ba859e874c98"; }; propagatedBuildInputs = [ ScopeGuard ]; @@ -958,7 +958,7 @@ let pname = "Autodia"; version = "2.14"; src = fetchurl { - url = mirror://cpan/authors/id/T/TE/TEEJAY/Autodia-2.14.tar.gz; + url = "mirror://cpan/authors/id/T/TE/TEEJAY/Autodia-2.14.tar.gz"; sha256 = "08pl5y18nsvy8ihfzdsbd8rz6a8al09wqfna07zdjfdyib42b0dc"; }; propagatedBuildInputs = [ TemplateToolkit XMLSimple ]; @@ -978,7 +978,7 @@ let which includes C, C++, Java, Perl, Python, and more. ''; - homepage = http://www.aarontrevena.co.uk/opensource/autodia/; + homepage = "http://www.aarontrevena.co.uk/opensource/autodia/"; license = stdenv.lib.licenses.gpl2Plus; }; buildInputs = [ DBI ]; @@ -988,7 +988,7 @@ let pname = "autovivification"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/V/VP/VPIT/autovivification-0.18.tar.gz; + url = "mirror://cpan/authors/id/V/VP/VPIT/autovivification-0.18.tar.gz"; sha256 = "01giacr2sx6b9bgfz6aqw7ndcnf08j8n6kwhm7880a94hmb9g69d"; }; meta = { @@ -1001,12 +1001,12 @@ let pname = "B-C"; version = "1.57"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/B-C-1.57.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/B-C-1.57.tar.gz"; sha256 = "1zs9a4gl63icja055kncgyny6xk1nsk6payfbzczkba3sc8sclh4"; }; propagatedBuildInputs = [ BFlags IPCRun Opcodes ]; meta = { - homepage = https://github.com/rurban/perl-compiler; + homepage = "https://github.com/rurban/perl-compiler"; description = "Perl compiler"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -1017,7 +1017,7 @@ let pname = "B-COW"; version = "0.002"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.002.tar.gz; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.002.tar.gz"; sha256 = "0z2px2x15vr1y5rxsv7d80kh186ld7a45nbm4lsbs07g8y0p7rzw"; }; meta = { @@ -1030,7 +1030,7 @@ let pname = "B-Flags"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/B-Flags-0.17.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Flags-0.17.tar.gz"; sha256 = "1chhgkaw2h3qniz71dykynggqp0r6b6mi2f4nh4x3ghm2g89gny1"; }; meta = { @@ -1043,7 +1043,7 @@ let version = "0.63"; src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.63.tar.gz; + url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.63.tar.gz"; sha256 = "1lh2a75cy85hqxlridk862nwzhrp762h74vy27hcbfgb4a6r62by"; }; @@ -1057,7 +1057,7 @@ let pname = "B-Hooks-EndOfScope"; version = "0.24"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.24.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.24.tar.gz"; sha256 = "1imcqxp23yc80a7p0h56sja9glbrh4qyhgzljqd4g9habpz3vah3"; }; propagatedBuildInputs = [ ModuleImplementation SubExporterProgressive ]; @@ -1071,7 +1071,7 @@ let pname = "B-Hooks-OP-Check"; version = "0.22"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-OP-Check-0.22.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-OP-Check-0.22.tar.gz"; sha256 = "1kfdv25gn6yik8jrwik4ajp99gi44s6idcvyyrzhiycyynzd3df7"; }; buildInputs = [ ExtUtilsDepends ]; @@ -1085,7 +1085,7 @@ let pname = "bignum"; version = "0.51"; src = fetchurl { - url = mirror://cpan/authors/id/P/PJ/PJACKLAM/bignum-0.51.tar.gz; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/bignum-0.51.tar.gz"; sha256 = "8ac0f6efe0b6f24804690e53908bdc5346613667f1c0590d8cf808ec090e9c47"; }; meta = { @@ -1099,7 +1099,7 @@ let pname = "Bit-Vector"; version = "7.4"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-7.4.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-7.4.tar.gz"; sha256 = "09m96p8c0ipgz42li2ywdgy0vxb57mb5nf59j9gw7yzc3xkslv9w"; }; propagatedBuildInputs = [ CarpClan ]; @@ -1109,7 +1109,7 @@ let pname = "B-Keywords"; version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.21.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.21.tar.gz"; sha256 = "12481z1z1nyrjlkizzqn4cdmcrfjkc3hvxppqipsf6r5gnffh9as"; }; meta = { @@ -1122,11 +1122,11 @@ let pname = "boolean"; version = "0.46"; src = fetchurl { - url = mirror://cpan/authors/id/I/IN/INGY/boolean-0.46.tar.gz; + url = "mirror://cpan/authors/id/I/IN/INGY/boolean-0.46.tar.gz"; sha256 = "95c088085c3e83bf680fe6ce16d8264ec26310490f7d1680e416ea7a118f156a"; }; meta = { - homepage = https://github.com/ingydotnet/boolean-pm; + homepage = "https://github.com/ingydotnet/boolean-pm"; description = "Boolean support for Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -1136,7 +1136,7 @@ let pname = "Boost-Geometry-Utils"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/A/AA/AAR/Boost-Geometry-Utils-0.15.tar.gz; + url = "mirror://cpan/authors/id/A/AA/AAR/Boost-Geometry-Utils-0.15.tar.gz"; sha256 = "1jnihz3029x51a455nxa0jx2z125x38q3vkkggsgdlrvawzxsm00"; }; patches = [ @@ -1151,7 +1151,7 @@ let pname = "BSD-Resource"; version = "1.2911"; src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHI/BSD-Resource-1.2911.tar.gz; + url = "mirror://cpan/authors/id/J/JH/JHI/BSD-Resource-1.2911.tar.gz"; sha256 = "0g8c7825ng2m0yz5sy6838rvfdl8j3vm29524wjgf66ccfhgn74x"; }; meta = { @@ -1165,7 +1165,7 @@ let pname = "B-Utils"; version = "0.27"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/B-Utils-0.27.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/B-Utils-0.27.tar.gz"; sha256 = "1spzhmk3z6c4blmra3kn84nq20fira2b3vjg86m0j085lgv56zzr"; }; propagatedBuildInputs = [ TaskWeaken ]; @@ -1180,7 +1180,7 @@ let pname = "Business-Hours"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/B/BP/BPS/Business-Hours-0.13.tar.gz; + url = "mirror://cpan/authors/id/B/BP/BPS/Business-Hours-0.13.tar.gz"; sha256 = "1hiybixagj3i1hsnfr134jgs9wv4azkwq6kijr9zlkxqzczzw1x8"; }; propagatedBuildInputs = [ SetIntSpan ]; @@ -1193,7 +1193,7 @@ let pname = "Business-ISBN"; version = "3.005"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-3.005.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-3.005.tar.gz"; sha256 = "0aifzqj3xvxi8x0103ddpb2bagfsz15c71k69vdpcqy582pgnc35"; }; propagatedBuildInputs = [ BusinessISBNData ]; @@ -1207,7 +1207,7 @@ let pname = "Business-ISBN-Data"; version = "20191107"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-Data-20191107.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-Data-20191107.tar.gz"; sha256 = "03faqnxx7qxgr2dcdra2iq60ziilpkas2ra41cs8klwky5j4yk44"; }; meta = { @@ -1220,7 +1220,7 @@ let pname = "Business-ISMN"; version = "1.201"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISMN-1.201.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISMN-1.201.tar.gz"; sha256 = "1cpcfyaz1fl6fnm076jx2jsphw147wj6aszj2yzqrgsncjhk2cja"; }; propagatedBuildInputs = [ TieCycle ]; @@ -1234,7 +1234,7 @@ let pname = "Business-ISSN"; version = "1.003"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.003.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.003.tar.gz"; sha256 = "1272456c19937a24bc5f9a0db9dc447043591137719ee4dc955a63be544b99d1"; }; meta = { @@ -1262,7 +1262,7 @@ let pname = "Cache-Cache"; version = "1.08"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Cache-Cache-1.08.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Cache-Cache-1.08.tar.gz"; sha256 = "1s6i670dc3yb6ngvdk48y6szdk5n1f4icdcjv2vi1l2xp9fzviyj"; }; propagatedBuildInputs = [ DigestSHA1 Error IPCShareLite ]; @@ -1273,7 +1273,7 @@ let pname = "Cache-FastMmap"; version = "1.48"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.48.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.48.tar.gz"; sha256 = "118y5lxwa092zrii7mcwnqypff7424w1dpgfkg8zlnz7h2mmnd9c"; }; }; @@ -1298,7 +1298,7 @@ let version = "1.30"; src = fetchurl { url = - mirror://cpan/authors/id/D/DO/DORMANDO/Cache-Memcached-1.30.tar.gz; + "mirror://cpan/authors/id/D/DO/DORMANDO/Cache-Memcached-1.30.tar.gz"; sha256 = "1aa2mjn5767b13063nnsrwcikrnbspby7j1c5q007bzaq0gcbcri"; }; propagatedBuildInputs = [ StringCRC32 ]; @@ -1308,7 +1308,7 @@ let pname = "Cache-Memcached-Fast"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.25.tar.gz; + url = "mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.25.tar.gz"; sha256 = "0ijw5hlzas1aprp3s6wzabch426m1d8cvp1wn9qphrn4jj82aakq"; }; meta = { @@ -1321,7 +1321,7 @@ let pname = "Cache"; version = "2.11"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Cache-2.11.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Cache-2.11.tar.gz"; sha256 = "14m513f4g02daklmnvdm7vqh3w3ick65wvmvqnmnc4cqfybdilp1"; }; propagatedBuildInputs = [ DBFile FileNFSLock HeapFibonacci IOString TimeDate ]; @@ -1332,7 +1332,7 @@ let pname = "Cache-Simple-TimedExpiry"; version = "0.27"; src = fetchurl { - url = mirror://cpan/authors/id/J/JE/JESSE/Cache-Simple-TimedExpiry-0.27.tar.gz; + url = "mirror://cpan/authors/id/J/JE/JESSE/Cache-Simple-TimedExpiry-0.27.tar.gz"; sha256 = "4e78b7e4dd231b5571a48cd0ee1b63953f5e34790c9d020e1595a7c7d0abbe49"; }; meta = { @@ -1345,12 +1345,12 @@ let pname = "Cairo"; version = "1.107"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.107.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.107.tar.gz"; sha256 = "0sg1gf1f2pjq7pji0zsv4rbi3bzpsx82z98k7yqxafzrvlkf27ay"; }; buildInputs = [ pkgs.cairo ]; meta = { - homepage = http://gtk2-perl.sourceforge.net/; + homepage = "http://gtk2-perl.sourceforge.net/"; description = "Perl interface to the cairo 2D vector graphics library"; license = stdenv.lib.licenses.lgpl21Plus; }; @@ -1361,7 +1361,7 @@ let pname = "Cairo-GObject"; version = "1.005"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Cairo-GObject-1.005.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/Cairo-GObject-1.005.tar.gz"; sha256 = "0l2wcz77ndmbgvxx34gdm919a3dxh9fixqr47p50n78ysx2692cd"; }; buildInputs = [ pkgs.cairo ]; @@ -1376,7 +1376,7 @@ let pname = "CAM-PDF"; version = "1.60"; src = fetchurl { - url = mirror://cpan/authors/id/C/CD/CDOLAN/CAM-PDF-1.60.tar.gz; + url = "mirror://cpan/authors/id/C/CD/CDOLAN/CAM-PDF-1.60.tar.gz"; sha256 = "12dv5ssf3y7yjz9mrrqnfzx8nf4ydk1qijf5fx59495671zzqsp7"; }; propagatedBuildInputs = [ CryptRC4 TextPDF ]; @@ -1386,7 +1386,7 @@ let pname = "capitalization"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/capitalization-0.03.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/capitalization-0.03.tar.gz"; sha256 = "0g7fpckydzxsf8mjkfbyj0pv42dzym4hwbizqahnh7wlfbaicdgi"; }; propagatedBuildInputs = [ DevelSymdump ]; @@ -1398,7 +1398,7 @@ let pname = "Canary-Stability"; version = "2013"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Canary-Stability-2013.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Canary-Stability-2013.tar.gz"; sha256 = "a5c91c62cf95fcb868f60eab5c832908f6905221013fea2bce3ff57046d7b6ea"; }; meta = { @@ -1410,7 +1410,7 @@ let pname = "Captcha-reCaptcha"; version = "0.99"; src = fetchurl { - url = mirror://cpan/authors/id/S/SU/SUNNYP/Captcha-reCaptcha-0.99.tar.gz; + url = "mirror://cpan/authors/id/S/SU/SUNNYP/Captcha-reCaptcha-0.99.tar.gz"; sha256 = "14j3lk6fhfzda5d3d7z6f373ng3fzxazzwpjyziysrhic1v3b4mq"; }; propagatedBuildInputs = [ HTMLTiny LWP ]; @@ -1420,7 +1420,7 @@ let pname = "Capture-Tiny"; version = "0.48"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.48.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.48.tar.gz"; sha256 = "069yrikrrb4vqzc3hrkkfj96apsh7q0hg8lhihq97lxshwz128vc"; }; meta = { @@ -1433,7 +1433,7 @@ let pname = "Carp-Always"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/F/FE/FERREIRA/Carp-Always-0.16.tar.gz; + url = "mirror://cpan/authors/id/F/FE/FERREIRA/Carp-Always-0.16.tar.gz"; sha256 = "1wb6b0qjga7kvn4p8df6k4g1pl2yzaqiln1713xidh3i454i3alq"; }; meta = { @@ -1447,7 +1447,7 @@ let pname = "Carp-Assert"; version = "0.21"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Carp-Assert-0.21.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Carp-Assert-0.21.tar.gz"; sha256 = "0km5fc6r6whxh6h5yd7g1j0bi96sgk0gkda6cardicrw9qmqwkwj"; }; meta = { @@ -1458,7 +1458,7 @@ let pname = "Carp-Assert-More"; version = "1.20"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.20.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.20.tar.gz"; sha256 = "16jnhdjgfwymrc5fki4xlf1rlziszf9k6q0245g976124k708ac5"; }; propagatedBuildInputs = [ CarpAssert ]; @@ -1472,7 +1472,7 @@ let pname = "Carp-Clan"; version = "6.08"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Carp-Clan-6.08.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Carp-Clan-6.08.tar.gz"; sha256 = "0237xx3rqa72sr4vdvws9r1m453h5f25bl85mdjmmk128kir4py7"; }; meta = { @@ -1485,12 +1485,12 @@ let pname = "Carton"; version = "1.0.34"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Carton-v1.0.34.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Carton-v1.0.34.tar.gz"; sha256 = "77d42b92732bcfc18a59d341e56ce476205b1c4d380eab3a07224f5745c23e45"; }; propagatedBuildInputs = [ MenloLegacy PathTiny TryTiny ]; meta = { - homepage = https://github.com/perl-carton/carton; + homepage = "https://github.com/perl-carton/carton"; description = "Perl module dependency manager (aka Bundler for Perl)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -1500,7 +1500,7 @@ let pname = "Catalyst-Action-RenderView"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Action-RenderView-0.16.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Action-RenderView-0.16.tar.gz"; sha256 = "8565203950a057d43ecd64e9593715d565c2fbd8b02c91f43c53b2111acd3948"; }; propagatedBuildInputs = [ CatalystRuntime DataVisitor ]; @@ -1515,7 +1515,7 @@ let pname = "Catalyst-Action-REST"; version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Action-REST-1.21.tar.gz; + url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Action-REST-1.21.tar.gz"; sha256 = "ccf81bba5200d3a0ad6901f923af173a3d4416618aea08a6938baaffdef4cb20"; }; buildInputs = [ TestRequires ]; @@ -1530,7 +1530,7 @@ let pname = "Catalyst-Authentication-Credential-HTTP"; version = "1.018"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Authentication-Credential-HTTP-1.018.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Authentication-Credential-HTTP-1.018.tar.gz"; sha256 = "0ad5clfiyllnf37an99n139cxhhxf5g5rh8cxashsjv4xrnq38bg"; }; buildInputs = [ ModuleBuildTiny TestException TestMockObject TestNeeds ]; @@ -1545,7 +1545,7 @@ let pname = "Catalyst-Authentication-Store-Htpasswd"; version = "1.006"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Authentication-Store-Htpasswd-1.006.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Authentication-Store-Htpasswd-1.006.tar.gz"; sha256 = "0kw0w2g1qmym896bgnqr1bfhvgb6xja39mv10701ipp8fmi8bzf7"; }; buildInputs = [ ModuleBuildTiny TestLongString TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst ]; @@ -1556,7 +1556,7 @@ let pname = "Catalyst-Authentication-Store-DBIx-Class"; version = "0.1506"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-DBIx-Class-0.1506.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-DBIx-Class-0.1506.tar.gz"; sha256 = "0i5ja7690fs9nhxcij6lw51j804sm8s06m5mvk1n8pi8jljrymvw"; }; propagatedBuildInputs = [ CatalystModelDBICSchema CatalystPluginAuthentication ]; @@ -1571,7 +1571,7 @@ let pname = "Catalyst-Component-InstancePerContext"; version = "0.001001"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GRODITI/Catalyst-Component-InstancePerContext-0.001001.tar.gz; + url = "mirror://cpan/authors/id/G/GR/GRODITI/Catalyst-Component-InstancePerContext-0.001001.tar.gz"; sha256 = "7f63f930e1e613f15955c9e6d73873675c50c0a3bc2a61a034733361ed26d271"; }; propagatedBuildInputs = [ CatalystRuntime ]; @@ -1585,7 +1585,7 @@ let pname = "Catalyst-Controller-HTML-FormFu"; version = "2.04"; src = fetchurl { - url = mirror://cpan/authors/id/N/NI/NIGELM/Catalyst-Controller-HTML-FormFu-2.04.tar.gz; + url = "mirror://cpan/authors/id/N/NI/NIGELM/Catalyst-Controller-HTML-FormFu-2.04.tar.gz"; sha256 = "f13fb9b3b3b00b35f06abc31614461c8d7346fbe07fb569c71e8d586e5eb5ddc"; }; buildInputs = [ CatalystActionRenderView CatalystPluginSession CatalystPluginSessionStateCookie CatalystPluginSessionStoreFile CatalystViewTT CodeTidyAllPluginPerlAlignMooseAttributes PodCoverageTrustPod PodTidy TemplateToolkit TestCPANMeta TestDifferences TestEOL TestKwalitee TestLongString TestMemoryCycle TestNoTabs TestPAUSEPermissions TestPod TestPodCoverage TestWWWMechanize TestWWWMechanizeCatalyst ]; @@ -1601,7 +1601,7 @@ let pname = "Catalyst-Controller-POD"; version = "1.0.0"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERLER/Catalyst-Controller-POD-1.0.0.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PERLER/Catalyst-Controller-POD-1.0.0.tar.gz"; sha256 = "ee2a4bb3ed78baa1464335408f284345b6ba0ef6576ad7bfbd7b656c788a39f9"; }; buildInputs = [ ModuleInstall TestLongString TestWWWMechanize TestWWWMechanizeCatalyst ]; @@ -1616,13 +1616,13 @@ let pname = "Catalyst-Devel"; version = "1.39"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Devel-1.39.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Devel-1.39.tar.gz"; sha256 = "bce371ba801c7d79eff3257e0af907cf62f140de968f0d63bf55be37d702a58a"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ CatalystActionRenderView CatalystPluginConfigLoader CatalystPluginStaticSimple ConfigGeneral FileChangeNotify FileCopyRecursive ModuleInstall TemplateToolkit ]; meta = { - homepage = http://wiki.catalystframework.org/wiki/; + homepage = "http://wiki.catalystframework.org/wiki/"; description = "Catalyst Development Tools"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -1632,7 +1632,7 @@ let pname = "Catalyst-DispatchType-Regex"; version = "5.90035"; src = fetchurl { - url = mirror://cpan/authors/id/M/MG/MGRIMES/Catalyst-DispatchType-Regex-5.90035.tar.gz; + url = "mirror://cpan/authors/id/M/MG/MGRIMES/Catalyst-DispatchType-Regex-5.90035.tar.gz"; sha256 = "06jq1lmpq88rmp9zik5gqczg234xac0hiyc3l698iif7zsgcyb80"; }; propagatedBuildInputs = [ CatalystRuntime ]; @@ -1646,7 +1646,7 @@ let pname = "Catalyst-Manual"; version = "5.9010"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Manual-5.9010.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Manual-5.9010.tar.gz"; sha256 = "1xg2m6d76xl0a76vq0v4yv25458d6df00k5xq1ab2z8mzvwbm4ah"; }; meta = { @@ -1659,7 +1659,7 @@ let pname = "Catalyst-Model-DBIC-Schema"; version = "0.65"; src = fetchurl { - url = mirror://cpan/authors/id/G/GB/GBJK/Catalyst-Model-DBIC-Schema-0.65.tar.gz; + url = "mirror://cpan/authors/id/G/GB/GBJK/Catalyst-Model-DBIC-Schema-0.65.tar.gz"; sha256 = "26a911ef5ef7ffc81b6ce65c3156f71fb35083c456ad27e6d82d2dc02493eeea"; }; buildInputs = [ DBDSQLite TestException TestRequires ]; @@ -1674,13 +1674,13 @@ let pname = "Catalyst-Runtime"; version = "5.90126"; src = fetchurl { - url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Runtime-5.90126.tar.gz; + url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Runtime-5.90126.tar.gz"; sha256 = "66f08334bf8b70049e77c0dcafd741c568e6f1341b2ffbb531a93833638d3986"; }; buildInputs = [ TestFatal TypeTiny ]; propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT DataDump HTTPBody ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PerlIOutf8_strict PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ]; meta = { - homepage = http://wiki.catalystframework.org/wiki/; + homepage = "http://wiki.catalystframework.org/wiki/"; description = "The Catalyst Framework Runtime"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -1690,7 +1690,7 @@ let pname = "Catalyst-Plugin-AccessLog"; version = "1.10"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARODLAND/Catalyst-Plugin-AccessLog-1.10.tar.gz; + url = "mirror://cpan/authors/id/A/AR/ARODLAND/Catalyst-Plugin-AccessLog-1.10.tar.gz"; sha256 = "873db8e4e72a994e3e17aeb53d2b837e6d524b4b8b0f3539f262135c88cc2120"; }; propagatedBuildInputs = [ CatalystRuntime DateTime ]; @@ -1704,7 +1704,7 @@ let pname = "Catalyst-Plugin-Authentication"; version = "0.10023"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Authentication-0.10023.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Authentication-0.10023.tar.gz"; sha256 = "0v6hb4r1wv3djrnqvnjcn3xx1scgqzx8nyjdg9lfc1ybvamrl0rn"; }; buildInputs = [ TestException ]; @@ -1719,7 +1719,7 @@ let pname = "Catalyst-Plugin-Authorization-ACL"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/Catalyst-Plugin-Authorization-ACL-0.16.tar.gz; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/Catalyst-Plugin-Authorization-ACL-0.16.tar.gz"; sha256 = "0z4328rr6l9xi45hyv6q9pwwamp0864q6skcp29jrz9f919ycdra"; }; propagatedBuildInputs = [ CatalystRuntime ClassThrowable ]; @@ -1730,7 +1730,7 @@ let pname = "Catalyst-Plugin-Authorization-Roles"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Authorization-Roles-0.09.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Authorization-Roles-0.09.tar.gz"; sha256 = "0l83lkwmq0lngwh8b1rv3r719pn8w1gdbyhjqm74rnd0wbjl8h7f"; }; buildInputs = [ TestException ]; @@ -1745,7 +1745,7 @@ let pname = "Catalyst-Plugin-Cache"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Cache-0.12.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Cache-0.12.tar.gz"; sha256 = "1q23aipvrl888h06ldr4mmjbykz0j4rqwipxg1jv094kki2fspr9"; }; buildInputs = [ ClassAccessor TestDeep TestException ]; @@ -1760,7 +1760,7 @@ let pname = "Catalyst-Plugin-Cache-HTTP"; version = "0.001000"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GRAF/Catalyst-Plugin-Cache-HTTP-0.001000.tar.gz; + url = "mirror://cpan/authors/id/G/GR/GRAF/Catalyst-Plugin-Cache-HTTP-0.001000.tar.gz"; sha256 = "0v5iphbq4csc4r6wkvxnqlh97p8g0yhjky9qqmsdyqczn87agbba"; }; buildInputs = [ CatalystRuntime TestLongString TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst ]; @@ -1775,7 +1775,7 @@ let pname = "Catalyst-Plugin-Captcha"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/D/DI/DIEGOK/Catalyst-Plugin-Captcha-0.04.tar.gz; + url = "mirror://cpan/authors/id/D/DI/DIEGOK/Catalyst-Plugin-Captcha-0.04.tar.gz"; sha256 = "0llyj3v5nx9cx46jdbbvxf1lc9s9cxq5ml22xmx3wkb201r5qgaa"; }; propagatedBuildInputs = [ CatalystPluginSession GDSecurityImage ]; @@ -1788,7 +1788,7 @@ let pname = "Catalyst-Plugin-ConfigLoader"; version = "0.34"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-ConfigLoader-0.34.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-ConfigLoader-0.34.tar.gz"; sha256 = "19j7p4v7mbx6wrmpvmrnd974apx7hdl2s095ga3b9zcbdrl77h5q"; }; propagatedBuildInputs = [ CatalystRuntime ConfigAny DataVisitor ]; @@ -1798,7 +1798,7 @@ let pname = "Catalyst-Plugin-FormValidator"; version = "0.094"; src = fetchurl { - url = mirror://cpan/authors/id/D/DH/DHOSS/Catalyst-Plugin-FormValidator-0.094.tar.gz; + url = "mirror://cpan/authors/id/D/DH/DHOSS/Catalyst-Plugin-FormValidator-0.094.tar.gz"; sha256 = "5834f11bf5c9f4b5d336d65c7ce6639b76ce7bfe7a2875eb048d7ea1c82ce05a"; }; propagatedBuildInputs = [ CatalystRuntime DataFormValidator ]; @@ -1812,7 +1812,7 @@ let pname = "Catalyst-Plugin-FormValidator-Simple"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/D/DH/DHOSS/Catalyst-Plugin-FormValidator-Simple-0.15.tar.gz; + url = "mirror://cpan/authors/id/D/DH/DHOSS/Catalyst-Plugin-FormValidator-Simple-0.15.tar.gz"; sha256 = "486c6a0e8f410fd017279f4804ab9e35ba46321d33a0a9721fe1e08a391de7a0"; }; propagatedBuildInputs = [ CatalystPluginFormValidator FormValidatorSimple ]; @@ -1825,7 +1825,7 @@ let pname = "Catalyst-Plugin-Log-Handler"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEPE/Catalyst-Plugin-Log-Handler-0.08.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEPE/Catalyst-Plugin-Log-Handler-0.08.tar.gz"; sha256 = "0db3c3a57b4ee3d789ba5129890e2858913fef00d8185bdc9c5d7fde31e043ef"; }; propagatedBuildInputs = [ ClassAccessor LogHandler MROCompat ]; @@ -1839,7 +1839,7 @@ let pname = "Catalyst-Plugin-Session"; version = "0.41"; src = fetchurl { - url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Plugin-Session-0.41.tar.gz; + url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Plugin-Session-0.41.tar.gz"; sha256 = "0a451997zc2vjx7rvndgx1ldbrpic8sfbddyvncynh0zr8bhlqc5"; }; buildInputs = [ TestDeep TestException TestWWWMechanizePSGI ]; @@ -1854,7 +1854,7 @@ let pname = "Catalyst-Plugin-Session-DynamicExpiry"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-DynamicExpiry-0.04.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-DynamicExpiry-0.04.tar.gz"; sha256 = "7707c56734cdb1512f733dc400fadf6f4c53cb217b58207857824dad6780a079"; }; propagatedBuildInputs = [ CatalystPluginSession ]; @@ -1868,7 +1868,7 @@ let pname = "Catalyst-Plugin-Session-State-Cookie"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTROUT/Catalyst-Plugin-Session-State-Cookie-0.17.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSTROUT/Catalyst-Plugin-Session-State-Cookie-0.17.tar.gz"; sha256 = "1rvxbfnpf9x2pc2zgpazlcgdlr2dijmxgmcs0m5nazs0w6xikssb"; }; propagatedBuildInputs = [ CatalystPluginSession ]; @@ -1878,7 +1878,7 @@ let pname = "Catalyst-Plugin-Session-Store-FastMmap"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-Store-FastMmap-0.16.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-Store-FastMmap-0.16.tar.gz"; sha256 = "0x3j6zv3wr41jlwr6yb2jpmcx019ibyn11y8653ffnwhpzbpzsxs"; }; propagatedBuildInputs = [ CacheFastMmap CatalystPluginSession ]; @@ -1888,7 +1888,7 @@ let pname = "Catalyst-Plugin-Session-Store-File"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/Catalyst-Plugin-Session-Store-File-0.18.tar.gz; + url = "mirror://cpan/authors/id/F/FL/FLORA/Catalyst-Plugin-Session-Store-File-0.18.tar.gz"; sha256 = "54738e3ce76f8be8b66947092d28973c73d79d1ee19b5d92b057552f8ff09b4f"; }; propagatedBuildInputs = [ CacheCache CatalystPluginSession ClassDataInheritable ]; @@ -1902,7 +1902,7 @@ let pname = "Catalyst-Plugin-SmartURI"; version = "0.041"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/Catalyst-Plugin-SmartURI-0.041.tar.gz; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/Catalyst-Plugin-SmartURI-0.041.tar.gz"; sha256 = "0msz3w2vfdb5w4ixi5llq66xlhm0181gjz9xj8yj0lalk232326b"; }; propagatedBuildInputs = [ CatalystRuntime ClassC3Componentised ]; @@ -1917,7 +1917,7 @@ let pname = "Catalyst-Plugin-StackTrace"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-StackTrace-0.12.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-StackTrace-0.12.tar.gz"; sha256 = "1b2ksz74cpigxqzf63rddar3vfmnbpwpdcbs11v0ml89pb8ar79j"; }; propagatedBuildInputs = [ CatalystRuntime ]; @@ -1931,7 +1931,7 @@ let pname = "Catalyst-Plugin-Static-Simple"; version = "0.36"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Plugin-Static-Simple-0.36.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Plugin-Static-Simple-0.36.tar.gz"; sha256 = "0m4l627p2fvzr4i6sgdxhdvsx4wpa6qmaibsbxlg5x5yjs7k7drn"; }; patches = [ ../development/perl-modules/catalyst-plugin-static-simple-etag.patch ]; @@ -1946,7 +1946,7 @@ let pname = "Catalyst-Plugin-StatusMessage"; version = "1.002000"; src = fetchurl { - url = mirror://cpan/authors/id/H/HK/HKCLARK/Catalyst-Plugin-StatusMessage-1.002000.tar.gz; + url = "mirror://cpan/authors/id/H/HK/HKCLARK/Catalyst-Plugin-StatusMessage-1.002000.tar.gz"; sha256 = "649c894ab16f9f48ada8f9cc599a7ecbb8891ab3761ff6fd510520c6de407c1f"; }; propagatedBuildInputs = [ CatalystRuntime strictures ]; @@ -1960,7 +1960,7 @@ let pname = "Catalyst-View-CSV"; version = "1.7"; src = fetchurl { - url = mirror://cpan/authors/id/M/MC/MCB/Catalyst-View-CSV-1.7.tar.gz; + url = "mirror://cpan/authors/id/M/MC/MCB/Catalyst-View-CSV-1.7.tar.gz"; sha256 = "e41326b6099891f244b432921ed10096ac619f32b8c4f8b41633313bd54662db"; }; buildInputs = [ CatalystActionRenderView CatalystModelDBICSchema CatalystPluginConfigLoader CatalystXComponentTraits ConfigGeneral DBDSQLite DBIxClass TestException ]; @@ -1975,7 +1975,7 @@ let pname = "Catalyst-View-Download"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAUDEON/Catalyst-View-Download-0.09.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAUDEON/Catalyst-View-Download-0.09.tar.gz"; sha256 = "1qgq6y9iwfbhbkbgpw9czang2ami6z8jk1zlagrzdisy4igqzkvs"; }; buildInputs = [ CatalystRuntime TestLongString TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst TextCSV XMLSimple ]; @@ -1988,7 +1988,7 @@ let pname = "Catalyst-View-JSON"; version = "0.37"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-View-JSON-0.37.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-View-JSON-0.37.tar.gz"; sha256 = "1v4xkzazs743sc7cd1kxkbi99cf00a4dadyyancckcbpi9p3znn5"; }; propagatedBuildInputs = [ CatalystRuntime ]; @@ -2002,7 +2002,7 @@ let pname = "Catalyst-View-TT"; version = "0.44"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Catalyst-View-TT-0.44.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Catalyst-View-TT-0.44.tar.gz"; sha256 = "06d1zg4nbb6kcyjbnyxrkf8z4zlscxr8650d94f7187jygfl8rvh"; }; propagatedBuildInputs = [ CatalystRuntime ClassAccessor TemplateTimer ]; @@ -2016,7 +2016,7 @@ let pname = "CatalystX-Component-Traits"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/CatalystX-Component-Traits-0.19.tar.gz; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/CatalystX-Component-Traits-0.19.tar.gz"; sha256 = "0iq4ci8m6g2c4g01fvdl568y7pjz28f3widk986v3pyhr7ll8j88"; }; propagatedBuildInputs = [ CatalystRuntime MooseXTraitsPluggable ]; @@ -2026,7 +2026,7 @@ let pname = "CatalystX-RoleApplicator"; version = "0.005"; src = fetchurl { - url = mirror://cpan/authors/id/H/HD/HDP/CatalystX-RoleApplicator-0.005.tar.gz; + url = "mirror://cpan/authors/id/H/HD/HDP/CatalystX-RoleApplicator-0.005.tar.gz"; sha256 = "0vwaapxn8g5hs2xp63c4dwv9jmapmji4272fakssvgc9frklg3p2"; }; propagatedBuildInputs = [ CatalystRuntime MooseXRelatedClassRoles ]; @@ -2036,7 +2036,7 @@ let pname = "Catalyst-TraitFor-Request-ProxyBase"; version = "0.000005"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-TraitFor-Request-ProxyBase-0.000005.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-TraitFor-Request-ProxyBase-0.000005.tar.gz"; sha256 = "a7bf0faa7e12ca5df625d9f5fc710f11bfd16ba5385837e48d42b3d286c9710a"; }; buildInputs = [ CatalystRuntime CatalystXRoleApplicator HTTPMessage ]; @@ -2051,7 +2051,7 @@ let pname = "CatalystX-Script-Server-Starman"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABRAXXA/CatalystX-Script-Server-Starman-0.03.tar.gz; + url = "mirror://cpan/authors/id/A/AB/ABRAXXA/CatalystX-Script-Server-Starman-0.03.tar.gz"; sha256 = "08jvibq4v8xjj0c3cr93h0w8w0c88ajwjn37xjy7ygxl9krlffp6"; }; patches = [ @@ -2070,7 +2070,7 @@ let pname = "CDB_File"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/CDB_File-1.02.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/CDB_File-1.02.tar.gz"; sha256 = "a0ae46916a190dd746be9fb11cda51cfb27dfec0f21e15e1ec2773dadc50c05f"; }; meta = { @@ -2085,7 +2085,7 @@ let pname = "Catmandu"; version = "1.2011"; src = fetchurl { - url = mirror://cpan/authors/id/N/NI/NICS/Catmandu-1.2011.tar.gz; + url = "mirror://cpan/authors/id/N/NI/NICS/Catmandu-1.2011.tar.gz"; sha256 = "0awl5qhciphnr1ihq66ssd2hzxvh1ddbr016sxb0qhxbzqv77sb9"; }; propagatedBuildInputs = [ AnyURIEscape AppCmd CGIExpand ConfigOnion CpanelJSONXS DataCompare DataUtil IOHandleUtil LWP ListMoreUtils LogAny MIMETypes ModuleInfo MooXAliases ParserMGC PathIteratorRule PathTiny StringCamelCase TextCSV TextHogan Throwable TryTinyByClass URITemplate UUIDTiny YAMLLibYAML namespaceclean ]; @@ -2101,7 +2101,7 @@ let pname = "CDDB_get"; version = "2.28"; src = fetchurl { - url = mirror://cpan/authors/id/F/FO/FONKIE/CDDB_get-2.28.tar.gz; + url = "mirror://cpan/authors/id/F/FO/FONKIE/CDDB_get-2.28.tar.gz"; sha256 = "1jfrwvfasylcafbvb0jjm94ad4v6k99a7rf5i4qwzhg4m0gvmk5x"; }; meta = { @@ -2115,7 +2115,7 @@ let pname = "CGI"; version = "4.45"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.45.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.45.tar.gz"; sha256 = "f6c1513740ee502e947d30131da18a5595dbcd19962d3dd0ff5dedf3cd1ed407"; }; buildInputs = [ TestDeep TestNoWarnings TestWarn ]; @@ -2130,7 +2130,7 @@ let pname = "CGI-Compile"; version = "0.24"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/CGI-Compile-0.24.tar.gz; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/CGI-Compile-0.24.tar.gz"; sha256 = "1zyz35hmflgm9jibi0mkni7n13lg5wwfvkavpzqgyza6kgzp515j"; }; propagatedBuildInputs = [ Filepushd SubName ]; @@ -2146,7 +2146,7 @@ let pname = "CGI-Cookie-XS"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/A/AG/AGENT/CGI-Cookie-XS-0.18.tar.gz; + url = "mirror://cpan/authors/id/A/AG/AGENT/CGI-Cookie-XS-0.18.tar.gz"; sha256 = "1iixvnm0l1q24vdlnayb4vd8fns2bdlhm6zb7fpi884ppm5cp6a6"; }; }; @@ -2155,13 +2155,13 @@ let pname = "CGI-Emulate-PSGI"; version = "0.23"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/CGI-Emulate-PSGI-0.23.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/CGI-Emulate-PSGI-0.23.tar.gz"; sha256 = "dd5b6c353f08fba100dae09904284f7f73f8328d31f6a67b2c136fad728d158b"; }; buildInputs = [ TestRequires ]; propagatedBuildInputs = [ CGI HTTPMessage ]; meta = { - homepage = https://github.com/tokuhirom/p5-cgi-emulate-psgi; + homepage = "https://github.com/tokuhirom/p5-cgi-emulate-psgi"; description = "PSGI adapter for CGI"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -2171,7 +2171,7 @@ let pname = "CGI-Expand"; version = "2.05"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOWMANBS/CGI-Expand-2.05.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOWMANBS/CGI-Expand-2.05.tar.gz"; sha256 = "1ad48nd067j5irjampxpw3zvzpg8wpnpan6szkdc5h64wccd30kf"; }; meta = { @@ -2184,7 +2184,7 @@ let pname = "CGI-Fast"; version = "2.15"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.15.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.15.tar.gz"; sha256 = "e5342df3dc593edfb724c7afe850b1a0ee753f4d733f5193e037b04633dfeece"; }; propagatedBuildInputs = [ CGI FCGI ]; @@ -2198,7 +2198,7 @@ let pname = "CGI-FormBuilder"; version = "3.10"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BIGPRESH/CGI-FormBuilder-3.10.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BIGPRESH/CGI-FormBuilder-3.10.tar.gz"; sha256 = "163ixq9kninqq094z2rnkg9pv3bcmvjphlww4vksfrzhq3h9pjdf"; }; @@ -2209,7 +2209,7 @@ let pname = "CGI-Minimal"; version = "1.29"; src = fetchurl { - url = mirror://cpan/authors/id/S/SN/SNOWHARE/CGI-Minimal-1.29.tar.gz; + url = "mirror://cpan/authors/id/S/SN/SNOWHARE/CGI-Minimal-1.29.tar.gz"; sha256 = "36c785ffacf5cdee4f1a7219ca1848b7e1700bdd71cd9116e1f00545ec88475d"; }; meta = { @@ -2222,7 +2222,7 @@ let pname = "CGI-PSGI"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/CGI-PSGI-0.15.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/CGI-PSGI-0.15.tar.gz"; sha256 = "c50dcb10bf8486a9843baed032ad89d879ff2f41c993342dead62f947a598d91"; }; propagatedBuildInputs = [ CGI ]; @@ -2236,7 +2236,7 @@ let pname = "CGI-Session"; version = "4.48"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKSTOS/CGI-Session-4.48.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKSTOS/CGI-Session-4.48.tar.gz"; sha256 = "1xsl2pz1jrh127pq0b01yffnj4mnp9nvkp88h5mndrscq9hn8xa6"; }; propagatedBuildInputs = [ CGI ]; @@ -2246,7 +2246,7 @@ let pname = "CGI-Simple"; version = "1.22"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.22.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.22.tar.gz"; sha256 = "13c7iwnnavky10ab87pi8jc1kqph03s0rhvj7myn7szhbfisc4gn"; }; propagatedBuildInputs = [ IOStringy ]; @@ -2261,7 +2261,7 @@ let pname = "CGI-Struct"; version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/F/FU/FULLERMD/CGI-Struct-1.21.tar.gz; + url = "mirror://cpan/authors/id/F/FU/FULLERMD/CGI-Struct-1.21.tar.gz"; sha256 = "d13d8da7fdcd6d906054e4760fc28a718aec91bd3cf067a58927fb7cb1c09d6c"; }; buildInputs = [ TestDeep ]; @@ -2275,7 +2275,7 @@ let pname = "CHI"; version = "0.60"; src = fetchurl { - url = mirror://cpan/authors/id/J/JS/JSWARTZ/CHI-0.60.tar.gz; + url = "mirror://cpan/authors/id/J/JS/JSWARTZ/CHI-0.60.tar.gz"; sha256 = "c7f1a2b3570a8fede484e933f89ba1729e0abd05935791d146c522dd120ee851"; }; preConfigure = '' @@ -2294,7 +2294,7 @@ let pname = "Chart"; version = "2.4.10"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHARTGRP/Chart-2.4.10.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHARTGRP/Chart-2.4.10.tar.gz"; sha256 = "84bd99a1a0ce72477b15e35881e6120398bb3f553aeeb5e8d72b088520e4f6bf"; }; propagatedBuildInputs = [ GD ]; @@ -2323,7 +2323,7 @@ let pname = "Class-Accessor"; version = "0.51"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.51.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.51.tar.gz"; sha256 = "07215zzr4ydf49832vn54i3gf2q5b97lydkv8j56wb2svvjs64mz"; }; meta = { @@ -2335,7 +2335,7 @@ let pname = "Class-Accessor-Chained"; version = "0.01"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCLAMP/Class-Accessor-Chained-0.01.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCLAMP/Class-Accessor-Chained-0.01.tar.gz"; sha256 = "1lilrjy1s0q5hyr0888kf0ifxjyl2iyk4vxil4jsv0sgh39lkgx5"; }; propagatedBuildInputs = [ ClassAccessor ]; @@ -2345,7 +2345,7 @@ let pname = "Class-Accessor-Grouped"; version = "0.10014"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Class-Accessor-Grouped-0.10014.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Class-Accessor-Grouped-0.10014.tar.gz"; sha256 = "35d5b03efc09f67f3a3155c9624126c3e162c8e3ca98ff826db358533a44c4bb"; }; buildInputs = [ TestException ]; @@ -2360,7 +2360,7 @@ let pname = "Class-Accessor-Lite"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/Class-Accessor-Lite-0.08.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZUHO/Class-Accessor-Lite-0.08.tar.gz"; sha256 = "75b3b8ec8efe687677b63f0a10eef966e01f60735c56656ce75cbb44caba335a"; }; meta = { @@ -2373,7 +2373,7 @@ let pname = "Class-Autouse"; version = "2.01"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/Class-Autouse-2.01.tar.gz; + url = "mirror://cpan/authors/id/A/AD/ADAMK/Class-Autouse-2.01.tar.gz"; sha256 = "c05b3236c05719d819c20db0fdeb6d0954747e43d7a738294eed7fbcf36ecf1b"; }; meta = { @@ -2386,7 +2386,7 @@ let pname = "Class-Base"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/Y/YA/YANICK/Class-Base-0.09.tar.gz; + url = "mirror://cpan/authors/id/Y/YA/YANICK/Class-Base-0.09.tar.gz"; sha256 = "117dmsrb30a09zlrv919fb5h5rg8r4asa24i99k04n2habgbv9g1"; }; propagatedBuildInputs = [ Clone ]; @@ -2396,7 +2396,7 @@ let pname = "Class-C3"; version = "0.34"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Class-C3-0.34.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Class-C3-0.34.tar.gz"; sha256 = "1dcibc31v5jwmi6hsdzi7c5ag1sb4wp3kxkibc889qrdj7jm12sd"; }; propagatedBuildInputs = [ AlgorithmC3 ]; @@ -2410,7 +2410,7 @@ let pname = "Class-C3-Adopt-NEXT"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Class-C3-Adopt-NEXT-0.14.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Class-C3-Adopt-NEXT-0.14.tar.gz"; sha256 = "1xsbydmiskpa1qbmnf6n39cb83nlb432xgkad9kfhxnvm8jn4rw5"; }; buildInputs = [ ModuleBuildTiny TestException ]; @@ -2425,7 +2425,7 @@ let pname = "Class-C3-Componentised"; version = "1.001002"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Class-C3-Componentised-1.001002.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Class-C3-Componentised-1.001002.tar.gz"; sha256 = "14wn1g45z3b5apqq7dcai5drk01hfyqydsd2m6hsxzhyvi3b2l9h"; }; buildInputs = [ TestException ]; @@ -2439,7 +2439,7 @@ let pname = "Class-Classgen-classgen"; version = "3.03"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHLUE/Class-Classgen-classgen-3.03.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHLUE/Class-Classgen-classgen-3.03.tar.gz"; sha256 = "9b65d41b991538992e816b32cc4fa9b4a4a0bb3e9c10e7eebeff82658dbbc8f6"; }; }; @@ -2448,7 +2448,7 @@ let pname = "Class-Container"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Class-Container-0.13.tar.gz; + url = "mirror://cpan/authors/id/K/KW/KWILLIAMS/Class-Container-0.13.tar.gz"; sha256 = "f5d495b1dfb826d5c0c45d03b4d0e6b6047cbb06cdbf6be15fd4dc902aeeb70b"; }; propagatedBuildInputs = [ ParamsValidate ]; @@ -2462,7 +2462,7 @@ let pname = "Class-Data-Accessor"; version = "0.04004"; src = fetchurl { - url = mirror://cpan/authors/id/C/CL/CLACO/Class-Data-Accessor-0.04004.tar.gz; + url = "mirror://cpan/authors/id/C/CL/CLACO/Class-Data-Accessor-0.04004.tar.gz"; sha256 = "0578m3rplk41059rkkjy1009xrmrdivjnv8yxadwwdk1vzidc8n1"; }; }; @@ -2471,7 +2471,7 @@ let pname = "Class-Data-Inheritable"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz; + url = "mirror://cpan/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz"; sha256 = "0jpi38wy5xh6p1mg2cbyjjw76vgbccqp46685r27w8hmxb7gwrwr"; }; }; @@ -2480,7 +2480,7 @@ let pname = "Class-EHierarchy"; version = "2.01"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORLISS/Class-EHierarchy/Class-EHierarchy-2.01.tar.gz; + url = "mirror://cpan/authors/id/C/CO/CORLISS/Class-EHierarchy/Class-EHierarchy-2.01.tar.gz"; sha256 = "637ab76beb3832a9b071b999a1b15bf05d297df6a662ccb1a8004f2987308382"; }; meta = { @@ -2494,7 +2494,7 @@ let pname = "Class-Factory"; version = "1.06"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/Class-Factory-1.06.tar.gz; + url = "mirror://cpan/authors/id/P/PH/PHRED/Class-Factory-1.06.tar.gz"; sha256 = "c37a2d269eb935f36a23e113480ae0946fa7c12a12781396a1226c8e435f30f5"; }; }; @@ -2503,7 +2503,7 @@ let pname = "Class-Factory-Util"; version = "1.7"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Class-Factory-Util-1.7.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Class-Factory-Util-1.7.tar.gz"; sha256 = "09ifd6v0c94vr20n9yr1dxgcp7hyscqq851szdip7y24bd26nlbc"; }; meta = { @@ -2516,7 +2516,7 @@ let pname = "Class-Gomor"; version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/G/GO/GOMOR/Class-Gomor-1.03.tar.gz; + url = "mirror://cpan/authors/id/G/GO/GOMOR/Class-Gomor-1.03.tar.gz"; sha256 = "02r0zylv8c5cb34j0w2kmf8hfw6g6bymfif7z65skzz9kkm3rns7"; }; meta = { @@ -2529,7 +2529,7 @@ let pname = "Class-Inspector"; version = "1.36"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Class-Inspector-1.36.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Class-Inspector-1.36.tar.gz"; sha256 = "0kk900bp8iq7bw5jyllfb31gvf93mmp24n4x90j7qs3jlhimsafc"; }; meta = { @@ -2542,7 +2542,7 @@ let pname = "Class-ISA"; version = "0.36"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/Class-ISA-0.36.tar.gz; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/Class-ISA-0.36.tar.gz"; sha256 = "0r5r574i6wgxm8zsq4bc34d0dzprrh6h6mpp1nhlks1qk97g65l8"; }; }; @@ -2551,7 +2551,7 @@ let pname = "Class-Iterator"; version = "0.3"; src = fetchurl { - url = mirror://cpan/authors/id/T/TE/TEXMEC/Class-Iterator-0.3.tar.gz; + url = "mirror://cpan/authors/id/T/TE/TEXMEC/Class-Iterator-0.3.tar.gz"; sha256 = "db1ba87ca9107f161fe9c1e9e7e267c0026defc26fe3e73bcad8ab8ffc18ef9d"; }; meta = { @@ -2562,7 +2562,7 @@ let pname = "Class-MakeMethods"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/E/EV/EVO/Class-MakeMethods-1.01.tar.gz; + url = "mirror://cpan/authors/id/E/EV/EVO/Class-MakeMethods-1.01.tar.gz"; sha256 = "0ricb0mn0i06ngfhq5y035yx8i7ahlx83yyqwixqmv6hg4p79b5c"; }; preConfigure = '' @@ -2575,7 +2575,7 @@ let pname = "Class-MethodMaker"; version = "2.24"; src = fetchurl { - url = mirror://cpan/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-2.24.tar.gz; + url = "mirror://cpan/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-2.24.tar.gz"; sha256 = "0a03i4k3a33qqwhykhz5k437ld5mag2vq52vvsy03gbynb65ivsy"; }; # Remove unnecessary, non-autoconf, configure script. @@ -2590,7 +2590,7 @@ let pname = "Class-Method-Modifiers"; version = "2.13"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Class-Method-Modifiers-2.13.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Class-Method-Modifiers-2.13.tar.gz"; sha256 = "0qzx83mgd71hlc2m1kpw15dqsjzjq7b2cj3sdgg45a0q23vhfn5b"; }; buildInputs = [ TestFatal TestNeeds ]; @@ -2605,7 +2605,7 @@ let pname = "Class-Mix"; version = "0.006"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Class-Mix-0.006.tar.gz; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Class-Mix-0.006.tar.gz"; sha256 = "8747f643893914f8c44979f1716d0c1ec8a41394796555447944e860f1ff7c0b"; }; propagatedBuildInputs = [ ParamsClassify ]; @@ -2619,7 +2619,7 @@ let pname = "Class-ReturnValue"; version = "0.55"; src = fetchurl { - url = mirror://cpan/authors/id/J/JE/JESSE/Class-ReturnValue-0.55.tar.gz; + url = "mirror://cpan/authors/id/J/JE/JESSE/Class-ReturnValue-0.55.tar.gz"; sha256 = "ed3836885d78f734ccd7a98550ec422a616df7c31310c1b7b1f6459f5fb0e4bd"; }; propagatedBuildInputs = [ DevelStackTrace ]; @@ -2633,7 +2633,7 @@ let pname = "Class-Singleton"; version = "1.5"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHAY/Class-Singleton-1.5.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHAY/Class-Singleton-1.5.tar.gz"; sha256 = "0y7ngrjf551bjgmijp5rsidbkq6c8hb5lmy2jcqq0fify020s8iq"; }; }; @@ -2642,7 +2642,7 @@ let pname = "Class-Throwable"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/K/KM/KMX/Class-Throwable-0.13.tar.gz; + url = "mirror://cpan/authors/id/K/KM/KMX/Class-Throwable-0.13.tar.gz"; sha256 = "1kmwzdxvp9ca2z44vl0ygkfygdbxqkilzjd8vqhc4vdmvbh136nw"; }; }; @@ -2651,7 +2651,7 @@ let pname = "Class-Tiny"; version = "1.006"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.006.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.006.tar.gz"; sha256 = "0knbi1agcfc9d7fca0szvxr6335pb22pc5n648q1vrcba8qvvz1f"; }; meta = { @@ -2665,13 +2665,13 @@ let pname = "Class-Load"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Class-Load-0.25.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Class-Load-0.25.tar.gz"; sha256 = "2a48fa779b5297e56156380e8b32637c6c58decb4f4a7f3c7350523e11275f8f"; }; buildInputs = [ TestFatal TestNeeds ]; propagatedBuildInputs = [ DataOptList PackageStash ]; meta = { - homepage = https://github.com/moose/Class-Load; + homepage = "https://github.com/moose/Class-Load"; description = "A working (require \"Class::Name\") and more"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -2681,13 +2681,13 @@ let pname = "Class-Load-XS"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Class-Load-XS-0.10.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Class-Load-XS-0.10.tar.gz"; sha256 = "5bc22cf536ebfd2564c5bdaf42f0d8a4cee3d1930fc8b44b7d4a42038622add1"; }; buildInputs = [ TestFatal TestNeeds ]; propagatedBuildInputs = [ ClassLoad ]; meta = { - homepage = https://github.com/moose/Class-Load-XS; + homepage = "https://github.com/moose/Class-Load-XS"; description = "XS implementation of parts of Class::Load"; license = stdenv.lib.licenses.artistic2; }; @@ -2697,7 +2697,7 @@ let pname = "Class-Observable"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/C/CW/CWINTERS/Class-Observable-1.04.tar.gz; + url = "mirror://cpan/authors/id/C/CW/CWINTERS/Class-Observable-1.04.tar.gz"; sha256 = "3ef18733a0f03c113f3bcf8ac50476e09ca1fe6234f4aaacaa24dfca95168094"; }; propagatedBuildInputs = [ ClassISA ]; @@ -2707,7 +2707,7 @@ let pname = "Class-Std"; version = "0.013"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHORNY/Class-Std-0.013.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHORNY/Class-Std-0.013.tar.gz"; sha256 = "bcd6d82f6c8af0fe069fced7dd165a4795b0b6e92351c7d4e5a1ab9a14fc35c6"; }; meta = { @@ -2720,7 +2720,7 @@ let pname = "Class-Std-Fast"; version = "0.0.8"; src = fetchurl { - url = mirror://cpan/authors/id/A/AC/ACID/Class-Std-Fast-v0.0.8.tar.gz; + url = "mirror://cpan/authors/id/A/AC/ACID/Class-Std-Fast-v0.0.8.tar.gz"; sha256 = "1057rz95jsr66gam472i4zdv04v7bmzph3m3jwq1hwx3qrikgm0v"; }; propagatedBuildInputs = [ ClassStd ]; @@ -2735,7 +2735,7 @@ let pname = "Class-Unload"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/Class-Unload-0.11.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILMARI/Class-Unload-0.11.tar.gz"; sha256 = "0pqa98z3ij6a3v9wkmvc8b410kv30y0xxqf0i6if3lp4lx3rgqjj"; }; propagatedBuildInputs = [ ClassInspector ]; @@ -2746,7 +2746,7 @@ let pname = "Class-Virtual"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHWERN/Class-Virtual-0.08.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHWERN/Class-Virtual-0.08.tar.gz"; sha256 = "c6499b42d3b4e5c6488a5e82fbc28698e6c9860165072dddfa6749355a9cfbb2"; }; propagatedBuildInputs = [ CarpAssert ClassDataInheritable ClassISA ]; @@ -2760,7 +2760,7 @@ let pname = "Class-XSAccessor"; version = "1.19"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/Class-XSAccessor-1.19.tar.gz; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/Class-XSAccessor-1.19.tar.gz"; sha256 = "1wm6013il899jnm0vn50a7iv9v6r4nqywbqzj0csyf8jbwwnpicr"; }; meta = { @@ -2773,7 +2773,7 @@ let pname = "Clipboard"; version = "0.22"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.22.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.22.tar.gz"; sha256 = "9fdb4dfc2e9bc2f3990b5b71649094dfe83aa12172c5a1809cf7e8b3be295ca7"; }; meta = { @@ -2793,7 +2793,7 @@ let pname = "Clone"; version = "0.43"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/Clone-0.43.tar.gz; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Clone-0.43.tar.gz"; sha256 = "1npf5s4b90ds6lv8gn76b2w4bdh0z5ni5zk4skgc2db5d12560lr"; }; meta = { @@ -2807,7 +2807,7 @@ let pname = "Clone-Choose"; version = "0.010"; src = fetchurl { - url = mirror://cpan/authors/id/H/HE/HERMES/Clone-Choose-0.010.tar.gz; + url = "mirror://cpan/authors/id/H/HE/HERMES/Clone-Choose-0.010.tar.gz"; sha256 = "0cin2bjn5z8xhm9v4j7pwlkx88jnvz8al0njdjwyvs6fb0glh8sn"; }; buildInputs = [ Clone ClonePP TestWithoutModule ]; @@ -2821,7 +2821,7 @@ let pname = "Clone-PP"; version = "1.07"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Clone-PP-1.07.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Clone-PP-1.07.tar.gz"; sha256 = "15dkhqvih6rx9dnngfwwljcm9s8afb0nbyl2vdvhd8frnw4y31dz"; }; meta = { @@ -2833,7 +2833,7 @@ let pname = "Code-TidyAll"; version = "0.75"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.75.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.75.tar.gz"; sha256 = "0gplkyds3zmiqpvw8x8kg3g81jcm58kcxvwg5yk4dm2fdkl77xqf"; }; propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ]; @@ -2848,7 +2848,7 @@ let pname = "Code-TidyAll-Plugin-Perl-AlignMooseAttributes"; version = "0.01"; src = fetchurl { - url = mirror://cpan/authors/id/J/JS/JSWARTZ/Code-TidyAll-Plugin-Perl-AlignMooseAttributes-0.01.tar.gz; + url = "mirror://cpan/authors/id/J/JS/JSWARTZ/Code-TidyAll-Plugin-Perl-AlignMooseAttributes-0.01.tar.gz"; sha256 = "1r8w5kfm17j1dyrrsjhwww423zzdzhx1i3d3brl32wzhasgf47cd"; }; propagatedBuildInputs = [ CodeTidyAll TextAligner ]; @@ -2862,7 +2862,7 @@ let pname = "common-sense"; version = "3.74"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.74.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.74.tar.gz"; sha256 = "1wxv2s0hbjkrnssvxvsds0k213awg5pgdlrpkr6xkpnimc17s7vp"; }; meta = { @@ -2875,7 +2875,7 @@ let pname = "Compress-Bzip2"; version = "2.26"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.26.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.26.tar.gz"; sha256 = "5132f0c5f377a54d77ee36d332aa0ece585c22a40f2c31f2619e40262f5c4f0c"; }; meta = { @@ -2888,7 +2888,7 @@ let pname = "Compress-Raw-Bzip2"; version = "2.093"; src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.093.tar.gz; + url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.093.tar.gz"; sha256 = "1sb6sazwyxaan26laclbkbnr57mkm1yx7c5l6d0045pw3q9q6mi9"; }; @@ -2908,7 +2908,7 @@ let version = "2.093"; src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.093.tar.gz; + url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.093.tar.gz"; sha256 = "1x794dz83888c26lmls81rvvnhk3j91cwh407f6p65aazaa73v5m"; }; @@ -2933,7 +2933,7 @@ let pname = "Compress-unLZMA"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/F/FE/FERREIRA/Compress-unLZMA-0.05.tar.gz; + url = "mirror://cpan/authors/id/F/FE/FERREIRA/Compress-unLZMA-0.05.tar.gz"; sha256 = "1f0pcpcjjj60whqc5sc5jd0dd7z3si4fnp268w4ykmcjini03s2d"; }; }; @@ -2942,7 +2942,7 @@ let pname = "Config-Any"; version = "0.32"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Config-Any-0.32.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Config-Any-0.32.tar.gz"; sha256 = "0l31sg7dwh4dwwnql42hp7arkhcm15bhsgfg4i6xvbjzy9f2mnk8"; }; propagatedBuildInputs = [ ModulePluggable ]; @@ -2956,7 +2956,7 @@ let pname = "Config-AutoConf"; version = "0.318"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.318.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.318.tar.gz"; sha256 = "0d5bxsax2x3xy8bgqrbzs0562x7bpglan8m23hjxw0rhxkz31j9k"; }; propagatedBuildInputs = [ CaptureTiny ]; @@ -2970,7 +2970,7 @@ let pname = "Config-General"; version = "2.63"; src = fetchurl { - url = mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.63.tar.gz; + url = "mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.63.tar.gz"; sha256 = "1bbg3wp0xcpj04cmm86j1x0j5968jqi5s2c87qs7dgmap1vzk6qa"; }; meta = { @@ -2982,7 +2982,7 @@ let pname = "Config-GitLike"; version = "1.17"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-1.17.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-1.17.tar.gz"; sha256 = "674a07b814fdcf9d323088d093245bcd066aaee24ec0914cb4decc9a943de54e"; }; buildInputs = [ TestException ]; @@ -2997,11 +2997,11 @@ let pname = "Config-Grammar"; version = "1.13"; src = fetchurl { - url = mirror://cpan/authors/id/D/DS/DSCHWEI/Config-Grammar-1.13.tar.gz; + url = "mirror://cpan/authors/id/D/DS/DSCHWEI/Config-Grammar-1.13.tar.gz"; sha256 = "a8b3a3a2c9c8c43b92dc401bf2709d6514f15b467fd4f72c48d356335771d6e3"; }; meta = { - homepage = https://github.com/schweikert/Config-Grammar; + homepage = "https://github.com/schweikert/Config-Grammar"; description = "A grammar-based, user-friendly config parser"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3011,12 +3011,12 @@ let pname = "Config-INI"; version = "0.025"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Config-INI-0.025.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Config-INI-0.025.tar.gz"; sha256 = "628bf76d5b91f89dde22d4813ec033026ebf71b772bb61ccda909da00c869732"; }; propagatedBuildInputs = [ MixinLinewise ]; meta = { - homepage = https://github.com/rjbs/Config-INI; + homepage = "https://github.com/rjbs/Config-INI"; description = "Simple .ini-file format"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3026,7 +3026,7 @@ let pname = "Config-Identity"; version = "0.0019"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Config-Identity-0.0019.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Config-Identity-0.0019.tar.gz"; sha256 = "1a0jx12pxwpbnkww4xg4lav8j6ls89hrdimhj4a697k56zdhnli9"; }; propagatedBuildInputs = [ FileHomeDir IPCRun ]; @@ -3042,7 +3042,7 @@ let pname = "Config-IniFiles"; version = "3.000002"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-3.000002.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-3.000002.tar.gz"; sha256 = "d92ed6ed2db98d5addf732c96d2a9c15d9f878c7e8b355bb7a5c1668e3f8ba09"; }; propagatedBuildInputs = [ IOStringy ]; @@ -3057,7 +3057,7 @@ let pname = "Config-Merge"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DRTECH/Config-Merge-1.04.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DRTECH/Config-Merge-1.04.tar.gz"; sha256 = "a932477b43ae5fb04a16f071a891da7bd2086c10c680592f2888fa9d9972cccf"; }; buildInputs = [ YAML ]; @@ -3072,7 +3072,7 @@ let pname = "Config-Onion"; version = "1.007"; src = fetchurl { - url = mirror://cpan/authors/id/D/DS/DSHEROH/Config-Onion-1.007.tar.gz; + url = "mirror://cpan/authors/id/D/DS/DSHEROH/Config-Onion-1.007.tar.gz"; sha256 = "1bx81nakvgj9m7x1q7pnra2cm1rzfdyf7fm2wmlj92qkivvdszrj"; }; propagatedBuildInputs = [ ConfigAny HashMergeSimple Moo ]; @@ -3087,13 +3087,13 @@ let pname = "Config-MVP"; version = "2.200011"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200011.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200011.tar.gz"; sha256 = "23c95666fc43c4adaebcc093b1b56091efc2a6aa2d75366a216d18eda96ad716"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ ModulePluggable MooseXOneArgNew RoleHasMessage RoleIdentifiable Throwable TieIxHash ]; meta = { - homepage = https://github.com/rjbs/Config-MVP; + homepage = "https://github.com/rjbs/Config-MVP"; description = "Multivalue-property package-oriented configuration"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3103,22 +3103,35 @@ let pname = "Config-MVP-Reader-INI"; version = "2.101463"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-Reader-INI-2.101463.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-Reader-INI-2.101463.tar.gz"; sha256 = "0iflnsh0sgihff3ra8sr7awiiscmqvrp1anaskkwksqi6yzidab9"; }; propagatedBuildInputs = [ ConfigINI ConfigMVP ]; meta = { - homepage = https://github.com/rjbs/Config-MVP-Reader-INI; + homepage = "https://github.com/rjbs/Config-MVP-Reader-INI"; description = "An MVP config reader for .ini files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; + ConfigProperties = buildPerlPackage { + pname = "Config-Properties"; + version = "1.80"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SA/SALVA/Config-Properties-1.80.tar.gz"; + sha256 = "5d04395be7e14e970a03ea952fb7629ae304d97c031f90cc1c29bd0a6a62fc40"; + }; + meta = { + description = "Read and write property files"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ConfigSimple = buildPerlPackage { pname = "Config-Simple"; version = "4.58"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHERZODR/Config-Simple-4.58.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHERZODR/Config-Simple-4.58.tar.gz"; sha256 = "1d7dhvis1i03xlj8z3g5l8mz88kf7dn13zngbjhq94qgdxq9b6fx"; }; meta = { @@ -3130,7 +3143,7 @@ let pname = "Config-Std"; version = "0.903"; src = fetchurl { - url = mirror://cpan/authors/id/B/BR/BRICKER/Config-Std-0.903.tar.gz; + url = "mirror://cpan/authors/id/B/BR/BRICKER/Config-Std-0.903.tar.gz"; sha256 = "b7709ff663bd279d264ab9c2f51e9e9588479a3367a8c4cfc18659c2a11480fe"; }; propagatedBuildInputs = [ ClassStd ]; @@ -3143,7 +3156,7 @@ let pname = "Config-Tiny"; version = "2.24"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.24.tgz; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.24.tgz"; sha256 = "0cjj2f0pj9y3cx1lgk2qp6arsnyaacf7kj6v33iqczn59f798r0h"; }; buildInputs = [ TestPod ]; @@ -3153,7 +3166,7 @@ let pname = "Config-Versioned"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Config-Versioned-1.01.tar.gz; + url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Config-Versioned-1.01.tar.gz"; sha256 = "bc9a4ae3738bd89f86a07bca673627ca3c92ba969737cd6dbc7ab7ad17cd2348"; }; propagatedBuildInputs = [ ConfigStd GitPurePerl ]; @@ -3168,7 +3181,7 @@ let pname = "Connector"; version = "1.28"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.28.tar.gz; + url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.28.tar.gz"; sha256 = "0cd1575bab80e78294aa79809904f40d2f534d99b78e0161454f037625c6bf7d"; }; buildInputs = [ ConfigMerge ConfigStd ConfigVersioned DBDSQLite DBI ProcSafeExec TemplateToolkit YAML ]; @@ -3188,7 +3201,7 @@ let pname = "Const-Fast"; version = "0.014"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Const-Fast-0.014.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/Const-Fast-0.014.tar.gz"; sha256 = "1nwlldgrx86yn7y6a53cqgvzm2ircsvxg1addahlcy6510x9a1gq"; }; propagatedBuildInputs = [ SubExporterProgressive ]; @@ -3203,7 +3216,7 @@ let pname = "Convert-ASN1"; version = "0.27"; src = fetchurl { - url = mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.27.tar.gz; + url = "mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.27.tar.gz"; sha256 = "12nmsca6hzgxq57sx7dp8yq6zxqhl41z5a6018877sf5w25ag93l"; }; }; @@ -3224,11 +3237,24 @@ let }; }; + ConvertBencode = buildPerlPackage rec { + pname = "Convert-Bencode"; + version = "1.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OR/ORCLEV/${pname}-${version}.tar.gz"; + sha256 = "0v2ywj18px67mg97xnrdq9mnlzgqvj92pr2g47g9c9b9cpw3v7r6"; + }; + meta = { + description = "Functions for converting to/from bencoded strings"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ConvertColor = buildPerlModule { pname = "Convert-Color"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Convert-Color-0.11.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Convert-Color-0.11.tar.gz"; sha256 = "b41217c72931034ba4417d7a9e1e2999f04580d4e6b31c70993fedccc2440d38"; }; buildInputs = [ TestNumberDelta ]; @@ -3256,7 +3282,7 @@ let pname = "constant-boolean"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/constant-boolean-0.02.tar.gz; + url = "mirror://cpan/authors/id/D/DE/DEXTER/constant-boolean-0.02.tar.gz"; sha256 = "1s8gxfg4xqp543aqanv5lbp64vqqyw6ic4x3fm4imkk1h3amjb6d"; }; propagatedBuildInputs = [ SymbolUtil ]; @@ -3266,7 +3292,7 @@ let pname = "curry"; version = "1.001000"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTROUT/curry-1.001000.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSTROUT/curry-1.001000.tar.gz"; sha256 = "1m2n3w67cskh8ic6vf6ik0fmap9zma875kr5rhyznr1041wn064b"; }; meta = { @@ -3279,7 +3305,7 @@ let pname = "constant-defer"; version = "6"; src = fetchurl { - url = mirror://cpan/authors/id/K/KR/KRYDE/constant-defer-6.tar.gz; + url = "mirror://cpan/authors/id/K/KR/KRYDE/constant-defer-6.tar.gz"; sha256 = "1ykgk0rd05p7kyrdxbv047fj7r0b4ix9ibpkzxp6h8nak0qjc8bv"; }; }; @@ -3288,7 +3314,7 @@ let pname = "Context-Preserve"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Context-Preserve-0.03.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Context-Preserve-0.03.tar.gz"; sha256 = "07zxgmb11bn4zj3w9g1zwbb9iv4jyk5q7hc0nv59knvv5i64m489"; }; buildInputs = [ TestException TestSimple13 ]; @@ -3298,13 +3324,13 @@ let pname = "Cookie-Baker"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/Cookie-Baker-0.11.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/Cookie-Baker-0.11.tar.gz"; sha256 = "59275f474e07c0aa3611e3e684b894e7db913333d8214420be63f12ec18cd7ab"; }; buildInputs = [ ModuleBuildTiny TestTime ]; propagatedBuildInputs = [ URI ]; meta = { - homepage = https://github.com/kazeburo/Cookie-Baker; + homepage = "https://github.com/kazeburo/Cookie-Baker"; description = "Cookie string generator / parser"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3314,7 +3340,7 @@ let pname = "Cookie-XS"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/A/AG/AGENT/Cookie-XS-0.11.tar.gz; + url = "mirror://cpan/authors/id/A/AG/AGENT/Cookie-XS-0.11.tar.gz"; sha256 = "1616rcn2qn1cwiv3rxb8mq5fmwxpj4gya1lxxxq2w952h03p3fd3"; }; propagatedBuildInputs = [ CGICookieXS ]; @@ -3324,7 +3350,7 @@ let pname = "Coro"; version = "6.55"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.55.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.55.tar.gz"; sha256 = "0c4ams0lqxlh9nwp2l3gd0if35dw0m3774pfl16dmz3hf419rms3"; }; propagatedBuildInputs = [ AnyEvent Guard commonsense ]; @@ -3337,7 +3363,7 @@ let pname = "Corona"; version = "0.1004"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Corona-0.1004.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Corona-0.1004.tar.gz"; sha256 = "0g5gpma3998rn61qfjv5csv2nrdi4sc84ipkb4k6synyhfgd3xgz"; }; propagatedBuildInputs = [ NetServerCoro Plack ]; @@ -3352,7 +3378,7 @@ let pname = "CPAN"; version = "2.27"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.27.tar.gz; + url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.27.tar.gz"; sha256 = "b4b1471a2881e2d616f59e723879b4110ae485b79d5962f115119c28cf69e07f"; }; patches = [ @@ -3373,7 +3399,7 @@ let pname = "Cpanel-JSON-XS"; version = "4.17"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.17.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.17.tar.gz"; sha256 = "fa80ae47caa9beee6db9b12df2c04482e98df1d62041a114ccd82b681a8706fb"; }; meta = { @@ -3386,7 +3412,7 @@ let pname = "CPAN-Changes"; version = "0.400002"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/CPAN-Changes-0.400002.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/CPAN-Changes-0.400002.tar.gz"; sha256 = "01eedea90d07468cb58e4a50bfa3bb1d4eeda9073596add1118fc359153abe8d"; }; meta = { @@ -3399,7 +3425,7 @@ let pname = "CPAN-Checksums"; version = "2.12"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDK/CPAN-Checksums-2.12.tar.gz; + url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-Checksums-2.12.tar.gz"; sha256 = "0f1dbpp4638jfdfwrywjmz88na5wzw4fdsmm2r7gh1x0s6r0yq4r"; }; propagatedBuildInputs = [ CompressBzip2 DataCompare ModuleSignature ]; @@ -3412,13 +3438,13 @@ let pname = "CPAN-Common-Index"; version = "0.010"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Common-Index-0.010.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Common-Index-0.010.tar.gz"; sha256 = "c43ddbb22fd42b06118fe6357f53700fbd77f531ba3c427faafbf303cbf4eaf0"; }; buildInputs = [ TestDeep TestFailWarnings TestFatal ]; propagatedBuildInputs = [ CPANDistnameInfo ClassTiny TieHandleOffset URI ]; meta = { - homepage = https://github.com/Perl-Toolchain-Gang/CPAN-Common-Index; + homepage = "https://github.com/Perl-Toolchain-Gang/CPAN-Common-Index"; description = "Common library for searching CPAN modules, authors and distributions"; license = stdenv.lib.licenses.asl20; }; @@ -3428,7 +3454,7 @@ let pname = "CPAN-DistnameInfo"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/G/GB/GBARR/CPAN-DistnameInfo-0.12.tar.gz; + url = "mirror://cpan/authors/id/G/GB/GBARR/CPAN-DistnameInfo-0.12.tar.gz"; sha256 = "0d94kx596w7k328cvq4y96z1gz12hdhn3z1mklkbrb7fyzlzn91g"; }; meta = { @@ -3441,7 +3467,7 @@ let pname = "CPAN-Meta-Check"; version = "0.014"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.014.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.014.tar.gz"; sha256 = "07rmdbz1rbnb7w33vswn1wixlyh947sqr93xrvcph1hwzhmmg818"; }; buildInputs = [ TestDeep ]; @@ -3455,11 +3481,11 @@ let pname = "CPAN-Perl-Releases"; version = "5.20200120"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20200120.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20200120.tar.gz"; sha256 = "0xhn05aiyrdcxhmps0qg9ivr9p7278mjix7719rv2k5kd2nf1jg8"; }; meta = { - homepage = https://github.com/bingos/cpan-perl-releases; + homepage = "https://github.com/bingos/cpan-perl-releases"; description = "Mapping Perl releases on CPAN to the location of the tarballs"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3469,12 +3495,12 @@ let pname = "CPANPLUS"; version = "0.9906"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9906.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9906.tar.gz"; sha256 = "0w1gi4w7xriqhh44ssgg2abk5dfxchshqfab4cs3j4ab6p8vf9j5"; }; propagatedBuildInputs = [ ArchiveExtract ModulePluggable ObjectAccessor PackageConstants TermUI ]; meta = { - homepage = https://github.com/jib/cpanplus-devel; + homepage = "https://github.com/jib/cpanplus-devel"; description = "Ameliorated interface to the CPAN"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3484,12 +3510,12 @@ let pname = "CPAN-Uploader"; version = "0.103013"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103013.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103013.tar.gz"; sha256 = "07k8ia8gvj9mrz7a2lckgd3vxjsahfr43lgrb85474dkhz94f5pq"; }; propagatedBuildInputs = [ FileHomeDir GetoptLongDescriptive LWPProtocolHttps TermReadKey ]; meta = { - homepage = https://github.com/rjbs/cpan-uploader; + homepage = "https://github.com/rjbs/cpan-uploader"; description = "Upload things to the CPAN"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3499,7 +3525,7 @@ let pname = "Crypt-Blowfish"; version = "2.14"; src = fetchurl { - url = mirror://cpan/authors/id/D/DP/DPARIS/Crypt-Blowfish-2.14.tar.gz; + url = "mirror://cpan/authors/id/D/DP/DPARIS/Crypt-Blowfish-2.14.tar.gz"; sha256 = "1cb7g8cyfs9alrfdykxhs8m6azj091fmcycz6p5vkxbbzcgl7cs6"; }; }; @@ -3508,7 +3534,7 @@ let pname = "Crypt-CBC"; version = "2.33"; src = fetchurl { - url = mirror://cpan/authors/id/L/LD/LDS/Crypt-CBC-2.33.tar.gz; + url = "mirror://cpan/authors/id/L/LD/LDS/Crypt-CBC-2.33.tar.gz"; sha256 = "0ig698lmpjz7fslnznxm0609lvlnvf4f3s370082nzycnqhxww3a"; }; }; @@ -3517,7 +3543,7 @@ let pname = "Crypt-Curve25519"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/A/AJ/AJGB/Crypt-Curve25519-0.06.tar.gz; + url = "mirror://cpan/authors/id/A/AJ/AJGB/Crypt-Curve25519-0.06.tar.gz"; sha256 = "1ir0gfxm8i7r9zyfs2zvil5jgwirl7j6cb9cm1p2kjpfnhyp0j4z"; }; patches = [ @@ -3536,7 +3562,7 @@ let pname = "Crypt-DES"; version = "2.07"; src = fetchurl { - url = mirror://cpan/authors/id/D/DP/DPARIS/Crypt-DES-2.07.tar.gz; + url = "mirror://cpan/authors/id/D/DP/DPARIS/Crypt-DES-2.07.tar.gz"; sha256 = "1rypxlhpd1jc0c327aghgl9y6ls47drmpvn0a40b4k3vhfsypc9d"; }; }; @@ -3545,7 +3571,7 @@ let pname = "Crypt-DH"; version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MITHALDU/Crypt-DH-0.07.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MITHALDU/Crypt-DH-0.07.tar.gz"; sha256 = "0pvzlgwpx8fzdy64ki15155vhsj30i9zxmw6i4p7irh17d1g7368"; }; propagatedBuildInputs = [ MathBigIntGMP ]; @@ -3555,7 +3581,7 @@ let pname = "Crypt-DH-GMP"; version = "0.00012"; src = fetchurl { - url = mirror://cpan/authors/id/D/DM/DMAKI/Crypt-DH-GMP-0.00012.tar.gz; + url = "mirror://cpan/authors/id/D/DM/DMAKI/Crypt-DH-GMP-0.00012.tar.gz"; sha256 = "0f5gdprcql4kwzgxl2s6ngcfg1jl45lzcqh7dkv5bkwlwmxa9rsi"; }; buildInputs = [ pkgs.gmp DevelChecklib TestRequires ]; @@ -3580,7 +3606,7 @@ let pname = "Crypt-Eksblowfish"; version = "0.009"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Crypt-Eksblowfish-0.009.tar.gz; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Crypt-Eksblowfish-0.009.tar.gz"; sha256 = "3cc7126d5841107237a9be2dc5c7fbc167cf3c4b4ce34678a8448b850757014c"; }; propagatedBuildInputs = [ ClassMix ]; @@ -3591,7 +3617,7 @@ let pname = "Crypt-IDEA"; version = "1.10"; src = fetchurl { - url = mirror://cpan/authors/id/D/DP/DPARIS/Crypt-IDEA-1.10.tar.gz; + url = "mirror://cpan/authors/id/D/DP/DPARIS/Crypt-IDEA-1.10.tar.gz"; sha256 = "0690lzlyjqgmnb94dq7dm5n6pgybg10fkpgfycgzr814370pig9k"; }; }; @@ -3600,7 +3626,7 @@ let pname = "Crypt-JWT"; version = "0.025"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.025.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.025.tar.gz"; sha256 = "2def87936645723de70fcc11cb380b1faddf9c5678832e4fc6116f267987087d"; }; propagatedBuildInputs = [ CryptX JSONMaybeXS ]; @@ -3614,7 +3640,7 @@ let pname = "Crypt-PasswdMD5"; version = "1.40"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSAVAGE/Crypt-PasswdMD5-1.40.tgz; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Crypt-PasswdMD5-1.40.tgz"; sha256 = "0j0r74f18nk63phddzqbf7wqma2ci4p4bxvrwrxsy0aklbp6lzdp"; }; }; @@ -3623,7 +3649,7 @@ let pname = "Crypt-PKCS10"; version = "2.001"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-PKCS10-2.001.tar.gz; + url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-PKCS10-2.001.tar.gz"; sha256 = "f7945b76a2d8f4d8ecf627b2eb8ea4f41d001e6a915efe82e71d6b97fea3ffa9"; }; buildInputs = [ pkgs.unzip ModuleBuildTiny ]; @@ -3653,7 +3679,7 @@ let pname = "Crypt-Random-Source"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Crypt-Random-Source-0.14.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Crypt-Random-Source-0.14.tar.gz"; sha256 = "1rpdds3sy5l1fhngnkrsgwsmwd54wpicx3i9ds69blcskwkcwkpc"; }; buildInputs = [ ModuleBuildTiny TestFatal TestSimple13 ]; @@ -3682,7 +3708,7 @@ let pname = "Crypt-RC4"; version = "2.02"; src = fetchurl { - url = mirror://cpan/authors/id/S/SI/SIFUKURT/Crypt-RC4-2.02.tar.gz; + url = "mirror://cpan/authors/id/S/SI/SIFUKURT/Crypt-RC4-2.02.tar.gz"; sha256 = "1sp099cws0q225h6j4y68hmfd1lnv5877gihjs40f8n2ddf45i2y"; }; }; @@ -3691,7 +3717,7 @@ let pname = "Crypt-RandPasswd"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Crypt-RandPasswd-0.06.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Crypt-RandPasswd-0.06.tar.gz"; sha256 = "0ca8544371wp4vvqsa19lnhl02hczpkbwkgsgm65ziwwim3r1gdi"; }; }; @@ -3700,7 +3726,7 @@ let pname = "Crypt-MySQL"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/I/IK/IKEBE/Crypt-MySQL-0.04.tar.gz; + url = "mirror://cpan/authors/id/I/IK/IKEBE/Crypt-MySQL-0.04.tar.gz"; sha256 = "93ebdfaaefcfe9ab683f0121c85f24475d8197f0bcec46018219e4111434dde3"; }; propagatedBuildInputs = [ DigestSHA1 ]; @@ -3711,7 +3737,7 @@ let pname = "Crypt-Rijndael"; version = "1.14"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.14.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.14.tar.gz"; sha256 = "03l5nwq97a8q9na4dpd4m3r7vrwpranx225vw8xm40w7zvgw6lb4"; }; }; @@ -3720,7 +3746,7 @@ let pname = "Crypt-UnixCrypt_XS"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BORISZ/Crypt-UnixCrypt_XS-0.11.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BORISZ/Crypt-UnixCrypt_XS-0.11.tar.gz"; sha256 = "1ajg3x6kwxy4x9p3nw1j36qjxpjvdpi9wkca5gfd86y9q8939sv2"; }; }; @@ -3769,7 +3795,7 @@ let pname = "Crypt-OpenSSL-AES"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/T/TT/TTAR/Crypt-OpenSSL-AES-0.02.tar.gz; + url = "mirror://cpan/authors/id/T/TT/TTAR/Crypt-OpenSSL-AES-0.02.tar.gz"; sha256 = "b66fab514edf97fc32f58da257582704a210c2b35e297d5c31b7fa2ffd08e908"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; @@ -3784,7 +3810,7 @@ let pname = "Crypt-OpenSSL-Bignum"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/K/KM/KMX/Crypt-OpenSSL-Bignum-0.09.tar.gz; + url = "mirror://cpan/authors/id/K/KM/KMX/Crypt-OpenSSL-Bignum-0.09.tar.gz"; sha256 = "1p22znbajq91lbk2k3yg12ig7hy5b4vy8igxwqkmbm4nhgxp4ki3"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; @@ -3795,7 +3821,7 @@ let pname = "Crypt-OpenSSL-Guess"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/A/AK/AKIYM/Crypt-OpenSSL-Guess-0.11.tar.gz; + url = "mirror://cpan/authors/id/A/AK/AKIYM/Crypt-OpenSSL-Guess-0.11.tar.gz"; sha256 = "0rvi9l4ljcbhwwvspq019nfq2h2v746dk355h2nwnlmqikiihsxa"; }; meta = { @@ -3809,7 +3835,7 @@ let pname = "Crypt-OpenSSL-Random"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Crypt-OpenSSL-Random-0.15.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Crypt-OpenSSL-Random-0.15.tar.gz"; sha256 = "1x6ffps8q7mnawmcfq740llzy7i10g3319vap0wiw4d33fm6z1zh"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; @@ -3821,7 +3847,7 @@ let pname = "Crypt-OpenSSL-RSA"; version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.31.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.31.tar.gz"; sha256 = "4173403ad4cf76732192099f833fbfbf3cd8104e0246b3844187ae384d2c5436"; }; propagatedBuildInputs = [ CryptOpenSSLRandom ]; @@ -3868,7 +3894,7 @@ let pname = "Crypt-Ed25519"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Crypt-Ed25519-1.04.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Crypt-Ed25519-1.04.tar.gz"; sha256 = "1jwh6b8b2ppvzxaljz287zakj4q3ip4zq121i23iwh26wxhlll2q"; }; @@ -3899,7 +3925,7 @@ let pname = "CSS-DOM"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/S/SP/SPROUT/CSS-DOM-0.17.tar.gz; + url = "mirror://cpan/authors/id/S/SP/SPROUT/CSS-DOM-0.17.tar.gz"; sha256 = "09phb6c9czpcp9imq06khm54kspsx6hnvfrjxramx663ygmpifb5"; }; propagatedBuildInputs = [ Clone ]; @@ -3909,7 +3935,7 @@ let pname = "CSS-Minifier-XS"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz; + url = "mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz"; sha256 = "1myswrmh0sqp5xjpp03x45z8arfmgkjx0srl3r6kjsyzl1zrk9l8"; }; perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' @@ -3923,7 +3949,7 @@ let pname = "CSS-Squish"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/T/TS/TSIBLEY/CSS-Squish-0.10.tar.gz; + url = "mirror://cpan/authors/id/T/TS/TSIBLEY/CSS-Squish-0.10.tar.gz"; sha256 = "65fc0d69acd1fa33d9a4c3b09cce0fbd737d747b1fcc4e9d87ebd91050cbcb4e"; }; buildInputs = [ TestLongString ]; @@ -3952,7 +3978,7 @@ let pname = "Curses-UI"; version = "0.9609"; src = fetchurl { - url = mirror://cpan/authors/id/M/MD/MDXI/Curses-UI-0.9609.tar.gz; + url = "mirror://cpan/authors/id/M/MD/MDXI/Curses-UI-0.9609.tar.gz"; sha256 = "1bqf4h8z70f78nzqq5yj4ahvsbhxxal6bc2g301l9qdn2fjjgf0a"; }; meta = { @@ -3966,7 +3992,7 @@ let pname = "CryptX"; version = "0.066"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIK/CryptX-0.066.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.066.tar.gz"; sha256 = "e7e823ac4db0b452e885b0e0d5adfc8a9c5f688938f1adf3f1d91432b3238335"; }; meta = { @@ -3979,7 +4005,7 @@ let pname = "Cwd-Guard"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/Cwd-Guard-0.05.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/Cwd-Guard-0.05.tar.gz"; sha256 = "0xwf4rmii55k3lp19mpbh00mbgby7rxdk2lk84148bjhp6i7rz3s"; }; meta = { @@ -3993,7 +4019,7 @@ let pname = "Data-Clone"; version = "0.004"; src = fetchurl { - url = mirror://cpan/authors/id/G/GF/GFUJI/Data-Clone-0.004.tar.gz; + url = "mirror://cpan/authors/id/G/GF/GFUJI/Data-Clone-0.004.tar.gz"; sha256 = "0g1qhi5qyk4fp0pwyaw90vxiyyn8las0i8ghzrnr4srai1wy3r9g"; }; buildInputs = [ TestRequires ]; @@ -4007,7 +4033,7 @@ let pname = "Data-Compare"; version = "1.27"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Compare-1.27.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Compare-1.27.tar.gz"; sha256 = "1gg8rqbv3x6a1lrpabv6vnlab53zxmpwz2ygad9fcx4gygqj12l1"; }; propagatedBuildInputs = [ Clone FileFindRule ]; @@ -4017,7 +4043,7 @@ let pname = "Data-Dump"; version = "1.23"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.23.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.23.tar.gz"; sha256 = "0r9ba52b7p8nnn6nw0ygm06lygi8g68piri78jmlqyrqy5gb0lxg"; }; meta = { @@ -4030,7 +4056,7 @@ let pname = "Data-Dumper"; version = "2.173"; src = fetchurl { - url = mirror://cpan/authors/id/X/XS/XSAWYERX/Data-Dumper-2.173.tar.gz; + url = "mirror://cpan/authors/id/X/XS/XSAWYERX/Data-Dumper-2.173.tar.gz"; sha256 = "697608b39330988e519131be667ff47168aaaaf99f06bd2095d5b46ad05d76fa"; }; outputs = [ "out" ]; @@ -4043,7 +4069,7 @@ let pname = "Data-Dumper-Concise"; version = "2.023"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Data-Dumper-Concise-2.023.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Data-Dumper-Concise-2.023.tar.gz"; sha256 = "a6c22f113caf31137590def1b7028a7e718eface3228272d0672c25e035d5853"; }; meta = { @@ -4056,7 +4082,7 @@ let pname = "Data-Entropy"; version = "0.007"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Entropy-0.007.tar.gz; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Entropy-0.007.tar.gz"; sha256 = "2611c4a1a3038594d79ea4ed14d9e15a9af8f77105f51667795fe4f8a53427e4"; }; propagatedBuildInputs = [ CryptRijndael DataFloat HTTPLite ParamsClassify ]; @@ -4066,7 +4092,7 @@ let pname = "Data-Float"; version = "0.013"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Float-0.013.tar.gz; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Float-0.013.tar.gz"; sha256 = "e2b1523d858930b8bbdbd196f08235f5e678b84919ba87712e26313b9c27518a"; }; }; @@ -4075,7 +4101,7 @@ let pname = "Data-FormValidator"; version = "4.88"; src = fetchurl { - url = mirror://cpan/authors/id/D/DF/DFARRELL/Data-FormValidator-4.88.tar.gz; + url = "mirror://cpan/authors/id/D/DF/DFARRELL/Data-FormValidator-4.88.tar.gz"; sha256 = "c1a539f91c92cbcd8a8d83597ec9a7643fcd8ccf5a94e15382c3765289170066"; }; propagatedBuildInputs = [ DateCalc EmailValid FileMMagic ImageSize MIMETypes RegexpCommon ]; @@ -4090,12 +4116,12 @@ let pname = "Data-GUID"; version = "0.049"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Data-GUID-0.049.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-GUID-0.049.tar.gz"; sha256 = "0yx7d4qwsr9n85gslip0y3mdwr5fkncfbwxz7si2a17x95yl7bxq"; }; propagatedBuildInputs = [ DataUUID SubExporter ]; meta = { - homepage = https://github.com/rjbs/Data-GUID; + homepage = "https://github.com/rjbs/Data-GUID"; description = "Globally unique identifiers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4105,7 +4131,7 @@ let pname = "Data-HexDump"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/F/FT/FTASSIN/Data-HexDump-0.02.tar.gz; + url = "mirror://cpan/authors/id/F/FT/FTASSIN/Data-HexDump-0.02.tar.gz"; sha256 = "1a9d843e7f667c1c6f77c67af5d77e7462ff23b41937cb17454d03535cd9be70"; }; meta = { @@ -4118,7 +4144,7 @@ let pname = "Data-Hexdumper"; version = "3.0001"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Hexdumper-3.0001.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Hexdumper-3.0001.tar.gz"; sha256 = "f9243cbe8affed5045fe4df505726a7a7289471e30c51ac065b3ed6ce0d1a604"; }; meta = { @@ -4131,7 +4157,7 @@ let pname = "Data-Hierarchy"; version = "0.34"; src = fetchurl { - url = mirror://cpan/authors/id/C/CL/CLKAO/Data-Hierarchy-0.34.tar.gz; + url = "mirror://cpan/authors/id/C/CL/CLKAO/Data-Hierarchy-0.34.tar.gz"; sha256 = "1vfrkygdaq0k7006i83jwavg9wgszfcyzbl9b7fp37z2acmyda5k"; }; buildInputs = [ TestException ]; @@ -4141,7 +4167,7 @@ let pname = "Data-ICal"; version = "0.24"; src = fetchurl { - url = mirror://cpan/authors/id/B/BP/BPS/Data-ICal-0.24.tar.gz; + url = "mirror://cpan/authors/id/B/BP/BPS/Data-ICal-0.24.tar.gz"; sha256 = "7331c7c84886c53337c0db823615e0e7134a8f13efd284e5c20726d5bcd52dff"; }; buildInputs = [ TestLongString TestNoWarnings TestWarn ]; @@ -4156,7 +4182,7 @@ let pname = "Data-IEEE754"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/Data-IEEE754-0.02.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAXMIND/Data-IEEE754-0.02.tar.gz"; sha256 = "07b73dlxd0qmxgkkrpa2xr61y18v3adlf1qgnl9k90kj8q9spx66"; }; buildInputs = [ TestBits ]; @@ -4170,7 +4196,7 @@ let pname = "Data-Integer"; version = "0.006"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Integer-0.006.tar.gz; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Integer-0.006.tar.gz"; sha256 = "0m53zxhx9sn49yqh7azlpyy9m65g54v8cd2ha98y77337gg7xdv3"; }; }; @@ -4195,12 +4221,12 @@ let pname = "Data-OptList"; version = "0.110"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.110.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.110.tar.gz"; sha256 = "1hzmgr2imdg1fc3hmwx0d56fhsdfyrgmgx7jb4jkyiv6575ifq9n"; }; propagatedBuildInputs = [ ParamsUtil SubInstall ]; meta = { - homepage = https://github.com/rjbs/data-optlist; + homepage = "https://github.com/rjbs/data-optlist"; description = "Parse and validate simple name/value option pairs"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4210,7 +4236,7 @@ let pname = "Data-Page"; version = "2.03"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Data-Page-2.03.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Data-Page-2.03.tar.gz"; sha256 = "12rxrr2b11qjk0c437cisw2kfqkafw1awcng09cv6yhzglb55yif"; }; propagatedBuildInputs = [ ClassAccessorChained ]; @@ -4221,7 +4247,7 @@ let pname = "Data-Page-Pageset"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHUNZI/Data-Page-Pageset-1.02.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHUNZI/Data-Page-Pageset-1.02.tar.gz"; sha256 = "142isi8la383dbjxj7lfgcbmmrpzwckcc4wma6rdl8ryajsipb6f"; }; buildInputs = [ ClassAccessor DataPage TestException ]; @@ -4235,7 +4261,7 @@ let pname = "Data-Password"; version = "1.12"; src = fetchurl { - url = mirror://cpan/authors/id/R/RA/RAZINF/Data-Password-1.12.tar.gz; + url = "mirror://cpan/authors/id/R/RA/RAZINF/Data-Password-1.12.tar.gz"; sha256 = "830cde81741ff384385412e16faba55745a54a7cc019dd23d7ed4f05d551a961"; }; }; @@ -4244,13 +4270,13 @@ let pname = "Data-Perl"; version = "0.002011"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/Data-Perl-0.002011.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Data-Perl-0.002011.tar.gz"; sha256 = "8d34dbe314cfa2d99bd9aae546bbde94c38bb05b74b07c89bde1673a6f6c55f4"; }; buildInputs = [ TestDeep TestFatal TestOutput ]; propagatedBuildInputs = [ ClassMethodModifiers ListMoreUtils ModuleRuntime RoleTiny strictures ]; meta = { - homepage = https://github.com/mattp-/Data-Perl; + homepage = "https://github.com/mattp-/Data-Perl"; description = "Base classes wrapping fundamental Perl data types"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4260,7 +4286,7 @@ let pname = "Data-Printer"; version = "0.40"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GARU/Data-Printer-0.40.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GARU/Data-Printer-0.40.tar.gz"; sha256 = "0njjh8zp5afc4602jrnmg89icj7gfsil6i955ypcqxc2gl830sb0"; }; propagatedBuildInputs = [ ClonePP FileHomeDir PackageStash SortNaturally ]; @@ -4274,12 +4300,12 @@ let pname = "Data-Section"; version = "0.200007"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Data-Section-0.200007.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-Section-0.200007.tar.gz"; sha256 = "1pmlxca0a8sv2jjwvhwgqavq6iwys6kf457lby4anjp3f1dpx4yd"; }; propagatedBuildInputs = [ MROCompat SubExporter ]; meta = { - homepage = https://github.com/rjbs/data-section; + homepage = "https://github.com/rjbs/data-section"; description = "Read multiple hunks of data out of your DATA section"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4290,7 +4316,7 @@ let pname = "Data-Serializer"; version = "0.60"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.60.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.60.tar.gz"; sha256 = "0ca4s811l7f2bqkx7vnyxbpp4f0qska89g2pvsfb3k0bhhbk0jdk"; }; meta = { @@ -4317,7 +4343,7 @@ let pname = "Data-SpreadPagination"; version = "0.1.2"; src = fetchurl { - url = mirror://cpan/authors/id/K/KN/KNEW/Data-SpreadPagination-0.1.2.tar.gz; + url = "mirror://cpan/authors/id/K/KN/KNEW/Data-SpreadPagination-0.1.2.tar.gz"; sha256 = "74ebfd847132c38cc9e835e14e82c43f1809a95cbc98bb84d1f7ce2e4ef487e3"; }; propagatedBuildInputs = [ DataPage MathRound ]; @@ -4330,7 +4356,7 @@ let pname = "Data-Stream-Bulk"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Data-Stream-Bulk-0.11.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOY/Data-Stream-Bulk-0.11.tar.gz"; sha256 = "06e08432a6b97705606c925709b99129ad926516e477d58e4461e4b3d9f30917"; }; buildInputs = [ TestRequires ]; @@ -4345,7 +4371,7 @@ let pname = "Data-Structure-Util"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDYA/Data-Structure-Util-0.16.tar.gz; + url = "mirror://cpan/authors/id/A/AN/ANDYA/Data-Structure-Util-0.16.tar.gz"; sha256 = "9cd42a13e65cb15f3a76296eb9a134da220168ec747c568d331a50ae7a2ddbc6"; }; buildInputs = [ TestPod ]; @@ -4359,7 +4385,7 @@ let pname = "Data-Taxi"; version = "0.96"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKO/Data-Taxi-0.96.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIKO/Data-Taxi-0.96.tar.gz"; sha256 = "0y4wls4jlwd6prvd77szymddhq9sfj06kaqnk4frlvd0zh83djxb"; }; buildInputs = [ DebugShowStuff ]; @@ -4369,7 +4395,7 @@ let pname = "Data-Uniqid"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/M/MW/MWX/Data-Uniqid-0.12.tar.gz; + url = "mirror://cpan/authors/id/M/MW/MWX/Data-Uniqid-0.12.tar.gz"; sha256 = "b6919ba49b9fe98bfdf3e8accae7b9b7f78dc9e71ebbd0b7fef7a45d99324ccb"; }; }; @@ -4378,7 +4404,7 @@ let pname = "Data-Util"; version = "0.66"; src = fetchurl { - url = mirror://cpan/authors/id/S/SY/SYOHEX/Data-Util-0.66.tar.gz; + url = "mirror://cpan/authors/id/S/SY/SYOHEX/Data-Util-0.66.tar.gz"; sha256 = "1x662pqjg9p0wcigi7pwf969b2ymk66ncm2vd5dfm5i08pdkjpf3"; }; buildInputs = [ HashUtilFieldHashCompat ModuleBuildXSUtil ScopeGuard TestException ]; @@ -4394,7 +4420,7 @@ let pname = "Data-URIEncode"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/R/RH/RHANDOM/Data-URIEncode-0.11.tar.gz; + url = "mirror://cpan/authors/id/R/RH/RHANDOM/Data-URIEncode-0.11.tar.gz"; sha256 = "51c9efbf8423853616eaa24841e4d1996b2db0036900617fb1dbc76c75a1f360"; }; meta = { @@ -4406,7 +4432,7 @@ let pname = "Data-UUID"; version = "1.224"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.224.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.224.tar.gz"; sha256 = "0z7l3fc710v830n1krgrp7wzfispi5s0h10cyk65xvxv09sw2n69"; }; }; @@ -4415,7 +4441,7 @@ let pname = "Data-UUID-MT"; version = "1.001"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Data-UUID-MT-1.001.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Data-UUID-MT-1.001.tar.gz"; sha256 = "0bb7qibq1c5lhaihxa1sck9pb744p8c7172jgx5zh4c32ac4nk1h"; }; buildInputs = [ ListAllUtils ]; @@ -4430,7 +4456,7 @@ let pname = "Data-Validate-Domain"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-Domain-0.14.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-Domain-0.14.tar.gz"; sha256 = "4470f253b8d2720a4dd3fa3ae550995417c2269f3be7ff030e01afa04a3a9421"; }; buildInputs = [ Test2Suite ]; @@ -4445,7 +4471,7 @@ let pname = "Data-Validate-IP"; version = "0.27"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-IP-0.27.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-IP-0.27.tar.gz"; sha256 = "e1aa92235dcb9c6fd9b6c8cda184d1af73537cc77f4f83a0f88207a8bfbfb7d6"; }; buildInputs = [ TestRequires ]; @@ -4460,7 +4486,7 @@ let pname = "Data-Validate-URI"; version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/S/SO/SONNEN/Data-Validate-URI-0.07.tar.gz; + url = "mirror://cpan/authors/id/S/SO/SONNEN/Data-Validate-URI-0.07.tar.gz"; sha256 = "f06418d2a4603913d1b6ce52b167dd13e787e13bf2be325a065df7d408f79c60"; }; propagatedBuildInputs = [ DataValidateDomain DataValidateIP ]; @@ -4474,7 +4500,7 @@ let pname = "Data-Visitor"; version = "0.30"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Data-Visitor-0.30.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOY/Data-Visitor-0.30.tar.gz"; sha256 = "0m7d1505af9z2hj5aw020grcmjjlvnkjpvjam457d7k5qfy4m8lf"; }; buildInputs = [ TestRequires ]; @@ -4485,7 +4511,7 @@ let pname = "Date-Calc"; version = "6.4"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STBEY/Date-Calc-6.4.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STBEY/Date-Calc-6.4.tar.gz"; sha256 = "1barz0jgdaan3jm7ciphs5n3ahwkl42imprs3y8c1dwpwyr3gqbw"; }; propagatedBuildInputs = [ BitVector ]; @@ -4496,7 +4522,7 @@ let pname = "Date-Extract"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/Date-Extract-0.06.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXMV/Date-Extract-0.06.tar.gz"; sha256 = "bc7658d5c50c3525ec0efcb55236a5de2d5d4fc06fc147fa3929c8f0953cda2b"; }; buildInputs = [ TestMockTime ]; @@ -4507,7 +4533,7 @@ let pname = "Date-Manip"; version = "6.79"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.79.tar.gz; + url = "mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.79.tar.gz"; sha256 = "0fllcvsd08wz71wyppyhgb6mingfihhsf5raraildggdwhnc9a3i"; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work @@ -4525,7 +4551,7 @@ let pname = "Date-Simple"; version = "3.03"; src = fetchurl { - url = mirror://cpan/authors/id/I/IZ/IZUT/Date-Simple-3.03.tar.gz; + url = "mirror://cpan/authors/id/I/IZ/IZUT/Date-Simple-3.03.tar.gz"; sha256 = "29a1926314ce1681a312d6155c29590c771ddacf91b7485873ce449ef209dd04"; }; meta = { @@ -4537,7 +4563,7 @@ let pname = "DateTime"; version = "1.51"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.51.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.51.tar.gz"; sha256 = "1ibfq6acz1ih28vl613yygbb3r2d8ykx6di669vajhvswl6xl8ny"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; @@ -4552,7 +4578,7 @@ let pname = "DateTime-Calendar-Julian"; version = "0.102"; src = fetchurl { - url = mirror://cpan/authors/id/W/WY/WYANT/DateTime-Calendar-Julian-0.102.tar.gz; + url = "mirror://cpan/authors/id/W/WY/WYANT/DateTime-Calendar-Julian-0.102.tar.gz"; sha256 = "0j95dhma66spjyb04zi6rwy7l33hibnrx02mn0znd9m89aiq52s6"; }; meta = { @@ -4566,7 +4592,7 @@ let pname = "DateTime-Event-ICal"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-ICal-0.13.tar.gz; + url = "mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-ICal-0.13.tar.gz"; sha256 = "1skmykxbrf98ldi72d5s1v6228gfdr5iy4y0gpl0xwswxy247njk"; }; propagatedBuildInputs = [ DateTimeEventRecurrence ]; @@ -4580,7 +4606,7 @@ let pname = "DateTime-Event-Recurrence"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-Recurrence-0.19.tar.gz; + url = "mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-Recurrence-0.19.tar.gz"; sha256 = "f9408789a461107766ca1a232bb3ec1e702eec7ca8167401ea6ec3f4b6d0b5a5"; }; propagatedBuildInputs = [ DateTimeSet ]; @@ -4590,7 +4616,7 @@ let pname = "DateTime-Format-Builder"; version = "0.82"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.82.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.82.tar.gz"; sha256 = "383faeb22b992c77ca65a5257992dd2f6db91a7db73ea4601c512e1c6c2e1ca3"; }; propagatedBuildInputs = [ DateTimeFormatStrptime ParamsValidate ]; @@ -4604,7 +4630,7 @@ let pname = "DateTime-Format-DateParse"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-DateParse-0.05.tar.gz; + url = "mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-DateParse-0.05.tar.gz"; sha256 = "f6eca4c8be66ce9992ee150932f8fcf07809fd3d1664caf200b8a5fd3a7e5ebc"; }; propagatedBuildInputs = [ DateTime TimeDate ]; @@ -4618,7 +4644,7 @@ let pname = "DateTime-Format-Flexible"; version = "0.32"; src = fetchurl { - url = mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.32.tar.gz; + url = "mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.32.tar.gz"; sha256 = "50a7b9feb287bb14b27323a53c2324486181a3ab6cb3f4c7662d42be901ad8ee"; }; propagatedBuildInputs = [ DateTimeFormatBuilder ListMoreUtils ModulePluggable ]; @@ -4633,7 +4659,7 @@ let pname = "DateTime-Format-HTTP"; version = "0.42"; src = fetchurl { - url = mirror://cpan/authors/id/C/CK/CKRAS/DateTime-Format-HTTP-0.42.tar.gz; + url = "mirror://cpan/authors/id/C/CK/CKRAS/DateTime-Format-HTTP-0.42.tar.gz"; sha256 = "0h6qqdg1yzqkdxp7hqlp0qa7d1y64nilgimxs79dys2ryjfpcknh"; }; propagatedBuildInputs = [ DateTime HTTPDate ]; @@ -4647,7 +4673,7 @@ let pname = "DateTime-Format-ICal"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ICal-0.09.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ICal-0.09.tar.gz"; sha256 = "8b09f6539f5e9c0df0e6135031699ed4ef9eef8165fc80aefeecc817ef997c33"; }; propagatedBuildInputs = [ DateTimeEventICal ]; @@ -4661,7 +4687,7 @@ let pname = "DateTime-Format-ISO8601"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-0.08.tar.gz; + url = "mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-0.08.tar.gz"; sha256 = "1syccqd5jlwms8v78ksnf68xijzl97jky5vbwhnyhxi5gvgfx8xk"; }; propagatedBuildInputs = [ DateTimeFormatBuilder ]; @@ -4675,7 +4701,7 @@ let pname = "DateTime-Format-Mail"; version = "0.403"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOOK/DateTime-Format-Mail-0.403.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOOK/DateTime-Format-Mail-0.403.tar.gz"; sha256 = "8df8e35c4477388ff5c7ce8b3e8b6ae4ed30209c7a5051d41737bd14d755fcb0"; }; propagatedBuildInputs = [ DateTime ParamsValidate ]; @@ -4689,7 +4715,7 @@ let pname = "DateTime-Format-Natural"; version = "1.08"; src = fetchurl { - url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.08.tar.gz; + url = "mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.08.tar.gz"; sha256 = "0hfk9cqfy0j49vqllhxfikbkqjhf7jrm6zb9i2bxq2ywm8qnz1rj"; }; buildInputs = [ ModuleUtil TestMockTime ]; @@ -4704,7 +4730,7 @@ let pname = "DateTime-Format-MySQL"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/X/XM/XMIKEW/DateTime-Format-MySQL-0.06.tar.gz; + url = "mirror://cpan/authors/id/X/XM/XMIKEW/DateTime-Format-MySQL-0.06.tar.gz"; sha256 = "07cgz60gxvrv7xqvngyll60pa8cx93h3jyx9kc9wdkn95qbd864q"; }; propagatedBuildInputs = [ DateTimeFormatBuilder ]; @@ -4718,7 +4744,7 @@ let pname = "DateTime-Format-Pg"; version = "0.16013"; src = fetchurl { - url = mirror://cpan/authors/id/D/DM/DMAKI/DateTime-Format-Pg-0.16013.tar.gz; + url = "mirror://cpan/authors/id/D/DM/DMAKI/DateTime-Format-Pg-0.16013.tar.gz"; sha256 = "16siw0f3a0ilzv5fnfas5s9n92drjy271yf6qvmmpm0vwnjjx1kz"; }; propagatedBuildInputs = [ DateTimeFormatBuilder ]; @@ -4733,7 +4759,7 @@ let pname = "DateTime-Format-Strptime"; version = "1.76"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.76.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.76.tar.gz"; sha256 = "593c26466ed7a3d2cefe9215f1619666c5116bd3a551e0aa74b64a6353fcb50d"; }; buildInputs = [ TestFatal TestWarnings ]; @@ -4748,7 +4774,7 @@ let pname = "DateTime-Format-SQLite"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/C/CF/CFAERBER/DateTime-Format-SQLite-0.11.tar.gz; + url = "mirror://cpan/authors/id/C/CF/CFAERBER/DateTime-Format-SQLite-0.11.tar.gz"; sha256 = "cc1f4e0ae1d39b0d4c3dddccfd7423c77c67a70950c4b5ecabf8ca553ab294b4"; }; propagatedBuildInputs = [ DateTimeFormatBuilder ]; @@ -4762,7 +4788,7 @@ let pname = "DateTime-Format-W3CDTF"; version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-0.07.tar.gz; + url = "mirror://cpan/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-0.07.tar.gz"; sha256 = "69a02b661bbf1daa14a4813cb6786eaa66dbdf2743f0b3f458e30234c3a26268"; }; propagatedBuildInputs = [ DateTime ]; @@ -4776,7 +4802,7 @@ let pname = "DateTime-Locale"; version = "1.25"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.25.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.25.tar.gz"; sha256 = "aa79746bd488b32aa4dbccccd05f1e5505642be013d8064a5d6f8a76a3c45d0b"; }; buildInputs = [ CPANMetaCheck FileShareDirInstall IPCSystemSimple TestFatal TestFileShareDir TestRequires TestWarnings ]; @@ -4791,7 +4817,7 @@ let pname = "DateTime-Set"; version = "0.3900"; src = fetchurl { - url = mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Set-0.3900.tar.gz; + url = "mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Set-0.3900.tar.gz"; sha256 = "94f41c3924aafde4ef7fa6b58e0595d4038d8ac5ffd62ba111b13c5f4dbc0946"; }; propagatedBuildInputs = [ DateTime ParamsValidate SetInfinite ]; @@ -4805,7 +4831,7 @@ let pname = "DateTime-TimeZone"; version = "2.38"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.38.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.38.tar.gz"; sha256 = "0e5c99ef22471f4d262ac590ce5ce8177094d7a92f380d8eea6219f5a12dc0cd"; }; buildInputs = [ TestFatal TestRequires ]; @@ -4820,7 +4846,7 @@ let pname = "DateTimeX-Easy"; version = "0.089"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROKR/DateTimeX-Easy-0.089.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROKR/DateTimeX-Easy-0.089.tar.gz"; sha256 = "17e6d202e7ac6049523048e97bb8f195e3c79208570da1504f4313584e487a79"; }; buildInputs = [ TestMost ]; @@ -4836,7 +4862,7 @@ let pname = "Debug-ShowStuff"; version = "1.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKO/Debug-ShowStuff-1.16.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIKO/Debug-ShowStuff-1.16.tar.gz"; sha256 = "1drcrnji3yrd0s3xb69bxnqa51s19c13w68vhvjad3nvswn5vpd4"; }; propagatedBuildInputs = [ ClassISA DevelStackTrace StringUtil TermReadKey TextTabularDisplay TieIxHash ]; @@ -4850,7 +4876,7 @@ let pname = "Devel-Caller"; version = "2.06"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCLAMP/Devel-Caller-2.06.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCLAMP/Devel-Caller-2.06.tar.gz"; sha256 = "1pxpimifzmnjnvf4icclx77myc15ahh0k56sj1djad1855mawwva"; }; propagatedBuildInputs = [ PadWalker ]; @@ -4864,7 +4890,7 @@ let pname = "Devel-CheckBin"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Devel-CheckBin-0.04.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/Devel-CheckBin-0.04.tar.gz"; sha256 = "1r735yzgvsxkj4m6ks34xva5m21cfzp9qiis2d4ivv99kjskszqm"; }; meta = { @@ -4878,7 +4904,7 @@ let pname = "Devel-CheckCompiler"; version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/S/SY/SYOHEX/Devel-CheckCompiler-0.07.tar.gz; + url = "mirror://cpan/authors/id/S/SY/SYOHEX/Devel-CheckCompiler-0.07.tar.gz"; sha256 = "1db973a4dbyknjxq608hywil5ai6vplnayshqxrd7m5qnjbpd2vn"; }; buildInputs = [ ModuleBuildTiny ]; @@ -4893,7 +4919,7 @@ let pname = "Devel-CheckLib"; version = "1.14"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MATTN/Devel-CheckLib-1.14.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MATTN/Devel-CheckLib-1.14.tar.gz"; sha256 = "15621qh5gaan1sgmk9y9svl70nm8viw17x5h1kf0zknkk8lmw77j"; }; buildInputs = [ CaptureTiny MockConfig ]; @@ -4903,7 +4929,7 @@ let pname = "Devel-CheckOS"; version = "1.81"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.81.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.81.tar.gz"; sha256 = "f3c17b56b79283b62616f938d36c57adc9df06bfaa295ff98be21e9014a23b10"; }; propagatedBuildInputs = [ DataCompare ]; @@ -4927,12 +4953,12 @@ let pname = "Devel-PatchPerl"; version = "1.84"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-1.84.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-1.84.tar.gz"; sha256 = "1nlil7mq8vc3lbsr5p3zr7jqaclkr0blhmb8sgkyc7mbvhml9jzp"; }; propagatedBuildInputs = [ Filepushd ModulePluggable ]; meta = { - homepage = https://github.com/bingos/devel-patchperl; + homepage = "https://github.com/bingos/devel-patchperl"; description = "Patch perl source a la Devel::PPPort's buildperl.pl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4942,7 +4968,7 @@ let pname = "Devel-Refcount"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Devel-Refcount-0.10.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Devel-Refcount-0.10.tar.gz"; sha256 = "0jnaraqkigyinhwz4nqk1ndq7ssjizr98nd1dd183a6icdlx8m5n"; }; buildInputs = [ TestFatal ]; @@ -4956,7 +4982,7 @@ let pname = "Devel-PPPort"; version = "3.56"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.56.tar.gz; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.56.tar.gz"; sha256 = "628476dbfeb7be92471e48f75fe0d36659b92493669ebd02cf04e3a13429521b"; }; meta = { @@ -4969,7 +4995,7 @@ let pname = "Devel-Trace"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/M/MJ/MJD/Devel-Trace-0.12.tar.gz; + url = "mirror://cpan/authors/id/M/MJ/MJD/Devel-Trace-0.12.tar.gz"; sha256 = "0s1q1a05gk3xvwqkya3k05vqjk13rvb489g0frprhzpzfvvwl0gm"; }; meta = { @@ -5015,7 +5041,7 @@ let pname = "DBD-CSV"; version = "0.54"; src = fetchurl { - url = mirror://cpan/authors/id/H/HM/HMBRAND/DBD-CSV-0.54.tgz; + url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBD-CSV-0.54.tgz"; sha256 = "bc597cd7195e5a023e2b3413d8dc614602b9b3f279f436027881796464d4f0be"; }; propagatedBuildInputs = [ DBI TextCSV_XS SQLStatement ModuleRuntime ParamsUtil ]; @@ -5025,7 +5051,7 @@ let pname = "DBD-Mock"; version = "1.55"; src = fetchurl { - url = mirror://cpan/authors/id/J/JL/JLCOOPER/DBD-Mock-1.55.tar.gz; + url = "mirror://cpan/authors/id/J/JL/JLCOOPER/DBD-Mock-1.55.tar.gz"; sha256 = "827ca7a363eca8d1d4912decc920eb55ef8e8173e0f756808e2ed304f0dad20c"; }; propagatedBuildInputs = [ DBI ]; @@ -5037,7 +5063,7 @@ let version = "1.64"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.64.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.64.tar.gz"; sha256 = "00gz5aw3xrr92lf9nfk0dhmy7a8jzmxhznddd9b0a8w4a1xqzbpl"; }; @@ -5070,7 +5096,7 @@ let version = "4.050"; src = fetchurl { - url = mirror://cpan/authors/id/D/DV/DVEEDEN/DBD-mysql-4.050.tar.gz; + url = "mirror://cpan/authors/id/D/DV/DVEEDEN/DBD-mysql-4.050.tar.gz"; sha256 = "0y4djb048i09dk19av7mzfb3khr72vw11p3ayw2p82jsy4gm8j2g"; }; @@ -5087,7 +5113,7 @@ let version = "1.80"; src = fetchurl { - url = mirror://cpan/authors/id/M/MJ/MJEVANS/DBD-Oracle-1.80.tar.gz; + url = "mirror://cpan/authors/id/M/MJ/MJEVANS/DBD-Oracle-1.80.tar.gz"; sha256 = "1rza36dywbsaync99ibscpqdp53m0yg2748bbib16gbf4cl2apph"; }; @@ -5106,7 +5132,7 @@ let version = "3.10.3"; src = fetchurl { - url = mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.10.3.tar.gz; + url = "mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.10.3.tar.gz"; sha256 = "0swj2pkga92z15rnq9f0j9s84j5ancgas0ncd4k230bd8advlgn6"; }; @@ -5130,7 +5156,7 @@ let version = "1.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/ME/MEWP/DBD-Sybase-1.16.tar.gz; + url = "mirror://cpan/authors/id/M/ME/MEWP/DBD-Sybase-1.16.tar.gz"; sha256 = "1k6n261nrrcll9wxn5xwi4ibpavqv1il96687k62mbpznzl2gx37"; }; @@ -5147,7 +5173,7 @@ let version = "1.853"; src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.853.tar.gz; + url = "mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.853.tar.gz"; sha256 = "1y967si45vj0skip1hnhicbv9da29fv6qcfwnsbnvj06n36mkj6h"; }; @@ -5165,7 +5191,7 @@ let pname = "DBI"; version = "1.642"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.642.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TIMB/DBI-1.642.tar.gz"; sha256 = "3f2025023a56286cebd15cb495e36ccd9b456c3cc229bf2ce1f69e9ebfc27f5d"; }; postInstall = stdenv.lib.optionalString (perl ? crossVersion) '' @@ -5207,7 +5233,7 @@ let EOF ''; meta = { - homepage = https://dbi.perl.org/; + homepage = "https://dbi.perl.org/"; description = "Database independent interface for Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5234,13 +5260,13 @@ let pname = "DBIx-Class"; version = "0.082841"; src = fetchurl { - url = mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.082841.tar.gz; + url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.082841.tar.gz"; sha256 = "d705f85825aced299020534349778537524526d64f524217ca362787f683c3bd"; }; buildInputs = [ DBDSQLite TestDeep TestException TestWarn ]; propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction ModuleFind PathClass SQLAbstract ScopeGuard SubName namespaceclean ]; meta = { - homepage = https://metacpan.org/pod/DBIx::Class; + homepage = "https://metacpan.org/pod/DBIx::Class"; description = "Extensible and flexible object <-> relational mapper"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5250,13 +5276,13 @@ let pname = "DBIx-Class-Candy"; version = "0.005003"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Candy-0.005003.tar.gz; + url = "mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Candy-0.005003.tar.gz"; sha256 = "b8a229a7b15f559095d4561cf8220460128541ba7fc3545ed35869923d46565c"; }; buildInputs = [ TestDeep TestFatal ]; propagatedBuildInputs = [ DBIxClass LinguaENInflect SubExporter ]; meta = { - homepage = https://github.com/frioux/DBIx-Class-Candy; + homepage = "https://github.com/frioux/DBIx-Class-Candy"; description = "Sugar for your favorite ORM, DBIx::Class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5266,7 +5292,7 @@ let pname = "DBIx-Class-Cursor-Cached"; version = "1.001004"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARCANEZ/DBIx-Class-Cursor-Cached-1.001004.tar.gz; + url = "mirror://cpan/authors/id/A/AR/ARCANEZ/DBIx-Class-Cursor-Cached-1.001004.tar.gz"; sha256 = "09b2jahn2x12qm4f7qm1jzsxbz7qn1czp6a3fnl5l2i3l4r5421p"; }; buildInputs = [ CacheCache DBDSQLite ]; @@ -5298,7 +5324,7 @@ let pname = "DBIx-Class-HTMLWidget"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDREMAR/DBIx-Class-HTMLWidget-0.16.tar.gz; + url = "mirror://cpan/authors/id/A/AN/ANDREMAR/DBIx-Class-HTMLWidget-0.16.tar.gz"; sha256 = "05zhniyzl31nq410ywhxm0vmvac53h7ax42hjs9mmpvf45ipahj1"; }; propagatedBuildInputs = [ DBIxClass HTMLWidget ]; @@ -5308,13 +5334,13 @@ let pname = "DBIx-Class-Helpers"; version = "2.034002"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Helpers-2.034002.tar.gz; + url = "mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Helpers-2.034002.tar.gz"; sha256 = "08ab0eae514653b7f59444a0a19188ef65351889e9aefb19a2ea5a159fe2574b"; }; buildInputs = [ DBDSQLite DateTimeFormatSQLite TestDeep TestFatal TestRoo aliased ]; propagatedBuildInputs = [ CarpClan DBIxClassCandy DBIxIntrospector SafeIsa TextBrew ]; meta = { - homepage = https://github.com/frioux/DBIx-Class-Helpers; + homepage = "https://github.com/frioux/DBIx-Class-Helpers"; description = "Simplify the common case stuff for DBIx::Class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5341,7 +5367,7 @@ let pname = "DBIx-Class-IntrospectableM2M"; version = "0.001002"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/DBIx-Class-IntrospectableM2M-0.001002.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILMARI/DBIx-Class-IntrospectableM2M-0.001002.tar.gz"; sha256 = "c6baafb4241693fdb34b29ebd906993add364bf31aafa4462f3e062204cc87f0"; }; propagatedBuildInputs = [ DBIxClass ]; @@ -5355,7 +5381,7 @@ let pname = "DBIx-Class-Schema-Loader"; version = "0.07049"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/DBIx-Class-Schema-Loader-0.07049.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILMARI/DBIx-Class-Schema-Loader-0.07049.tar.gz"; sha256 = "e869cdde1378cfebccf229b0cde58d2746dc6080b75f56d072aa5f1fce76a764"; }; buildInputs = [ DBDSQLite TestDeep TestDifferences TestException TestWarn ]; @@ -5370,7 +5396,7 @@ let pname = "DBIx-Connector"; version = "0.56"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/DBIx-Connector-0.56.tar.gz; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/DBIx-Connector-0.56.tar.gz"; sha256 = "57c08d2c1951486cb95cfb83f518f462a3dbf20d353f3eee4f46af44fa19c359"; }; buildInputs = [ TestMockModule ]; @@ -5385,7 +5411,7 @@ let pname = "DBIx-DBSchema"; version = "0.45"; src = fetchurl { - url = mirror://cpan/authors/id/I/IV/IVAN/DBIx-DBSchema-0.45.tar.gz; + url = "mirror://cpan/authors/id/I/IV/IVAN/DBIx-DBSchema-0.45.tar.gz"; sha256 = "7a2a978fb6d9feaa3e4b109c71c963b26a008a2d130c5876ecf24c5a72338a1d"; }; propagatedBuildInputs = [ DBI ]; @@ -5395,7 +5421,7 @@ let pname = "DBIx-SearchBuilder"; version = "1.67"; src = fetchurl { - url = mirror://cpan/authors/id/B/BP/BPS/DBIx-SearchBuilder-1.67.tar.gz; + url = "mirror://cpan/authors/id/B/BP/BPS/DBIx-SearchBuilder-1.67.tar.gz"; sha256 = "453179c22a61af573e502c8396f3f28daea03dfdc162094b90f9b3c331d563da"; }; buildInputs = [ DBDSQLite ]; @@ -5410,7 +5436,7 @@ let pname = "DBIx-Simple"; version = "1.37"; src = fetchurl { - url = mirror://cpan/authors/id/J/JU/JUERD/DBIx-Simple-1.37.tar.gz; + url = "mirror://cpan/authors/id/J/JU/JUERD/DBIx-Simple-1.37.tar.gz"; sha256 = "46d311aa2ce08907401c56119658426dbb044c5a40de73d9a7b79bf50390cae3"; }; propagatedBuildInputs = [ DBI ]; @@ -5423,7 +5449,7 @@ let pname = "Data-Binary"; version = "0.01"; src = fetchurl { - url = mirror://cpan/authors/id/S/SN/SNKWATT/Data-Binary-0.01.tar.gz; + url = "mirror://cpan/authors/id/S/SN/SNKWATT/Data-Binary-0.01.tar.gz"; sha256 = "0wwdrgkz4yqpzdmfvid63v5v10b9hwdsg15jvks0hwdc23ga48a8"; }; meta = { @@ -5436,7 +5462,7 @@ let pname = "DBIx-Introspector"; version = "0.001005"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Introspector-0.001005.tar.gz; + url = "mirror://cpan/authors/id/F/FR/FREW/DBIx-Introspector-0.001005.tar.gz"; sha256 = "0fp6h71xv4pgb8l815rs6ad4camzhjqf64s1sf7zmhchqqn4vacn"; }; @@ -5448,7 +5474,7 @@ let pname = "Devel-Cycle"; version = "1.12"; src = fetchurl { - url = mirror://cpan/authors/id/L/LD/LDS/Devel-Cycle-1.12.tar.gz; + url = "mirror://cpan/authors/id/L/LD/LDS/Devel-Cycle-1.12.tar.gz"; sha256 = "1hhb77kz3dys8yaik452j22cm3510zald2mpvfyv5clqv326aczx"; }; meta = { @@ -5460,7 +5486,7 @@ let pname = "Devel-Declare"; version = "0.006019"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Devel-Declare-0.006019.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Devel-Declare-0.006019.tar.gz"; sha256 = "ac719dc289cbf53fbb3b090ccd3a55a9d207f24e09480423c96f7185af131808"; }; buildInputs = [ ExtUtilsDepends TestRequires ]; @@ -5475,7 +5501,7 @@ let pname = "Devel-FindPerl"; version = "0.015"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.015.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.015.tar.gz"; sha256 = "1z1xfj3178w632mqddyklk355a19bsgzkilznrng3rvg4bfbfxaj"; }; meta = { @@ -5488,7 +5514,7 @@ let pname = "Devel-GlobalDestruction"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Devel-GlobalDestruction-0.14.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Devel-GlobalDestruction-0.14.tar.gz"; sha256 = "1aslj6myylsvzr0vpqry1cmmvzbmpbdcl4v9zrl18ccik7rabf1l"; }; propagatedBuildInputs = [ SubExporterProgressive ]; @@ -5501,7 +5527,7 @@ let pname = "Devel-GlobalPhase"; version = "0.003003"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Devel-GlobalPhase-0.003003.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Devel-GlobalPhase-0.003003.tar.gz"; sha256 = "1x9jzy3l7gwikj57swzl94qsq03j9na9h1m69azzs7d7ghph58wd"; }; meta = { @@ -5514,7 +5540,7 @@ let pname = "Devel-Hide"; version = "0.0010"; src = fetchurl { - url = mirror://cpan/authors/id/F/FE/FERREIRA/Devel-Hide-0.0010.tar.gz; + url = "mirror://cpan/authors/id/F/FE/FERREIRA/Devel-Hide-0.0010.tar.gz"; sha256 = "10jyv9nmv513hs75rls5yx2xn82513xnnhjir3dxiwgb1ykfyvvm"; }; }; @@ -5523,12 +5549,12 @@ let pname = "Devel-NYTProf"; version = "6.06"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TIMB/Devel-NYTProf-6.06.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TIMB/Devel-NYTProf-6.06.tar.gz"; sha256 = "a14227ca79f1750b92cc7b8b0a5806c92abc4964a21a7fb100bd4907d6c4be55"; }; propagatedBuildInputs = [ FileWhich JSONMaybeXS ]; meta = { - homepage = https://github.com/timbunce/devel-nytprof; + homepage = "https://github.com/timbunce/devel-nytprof"; description = "Powerful fast feature-rich Perl source code profiler"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5539,7 +5565,7 @@ let pname = "Devel-OverloadInfo"; version = "0.005"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.005.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.005.tar.gz"; sha256 = "1rx6g8pyhi7lx6z130b7vlf8syzrq92w9ky8mpw4d6bwlkzy5zcb"; }; propagatedBuildInputs = [ MROCompat PackageStash SubIdentify ]; @@ -5554,7 +5580,7 @@ let pname = "Devel-PartialDump"; version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Devel-PartialDump-0.20.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Devel-PartialDump-0.20.tar.gz"; sha256 = "01yrsdpn9ns9iwwc92bhjn2605b7ys7i3198gjb935lsllzgzw5f"; }; propagatedBuildInputs = [ ClassTiny SubExporter namespaceclean ]; @@ -5565,7 +5591,7 @@ let pname = "Devel-StackTrace"; version = "2.04"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-2.04.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-2.04.tar.gz"; sha256 = "cd3c03ed547d3d42c61fa5814c98296139392e7971c092e09a431f2c9f5d6855"; }; meta = { @@ -5578,7 +5604,7 @@ let pname = "Devel-StackTrace-AsHTML"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Devel-StackTrace-AsHTML-0.15.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Devel-StackTrace-AsHTML-0.15.tar.gz"; sha256 = "0iri5nb2lb76qv5l9z0vjpfrq5j2fyclkd64kh020bvy37idp0v2"; }; propagatedBuildInputs = [ DevelStackTrace ]; @@ -5592,7 +5618,7 @@ let pname = "Devel-Symdump"; version = "2.18"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDK/Devel-Symdump-2.18.tar.gz; + url = "mirror://cpan/authors/id/A/AN/ANDK/Devel-Symdump-2.18.tar.gz"; sha256 = "826f81a107f5592a2516766ed43beb47e10cc83edc9ea48090b02a36040776c0"; }; meta = { @@ -5605,7 +5631,7 @@ let pname = "Digest-CRC"; version = "0.22.2"; src = fetchurl { - url = mirror://cpan/authors/id/O/OL/OLIMAUL/Digest-CRC-0.22.2.tar.gz; + url = "mirror://cpan/authors/id/O/OL/OLIMAUL/Digest-CRC-0.22.2.tar.gz"; sha256 = "112b50f7fbc6f6baf5d4584ee97f542ced6c9ec03a3147f7902c84b8b26778cb"; }; meta = { @@ -5618,7 +5644,7 @@ let pname = "Digest-HMAC"; version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.03.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.03.tar.gz"; sha256 = "0naavabbm1c9zgn325ndy66da4insdw9l3mrxwxdfi7i7xnjrirv"; }; meta = { @@ -5631,7 +5657,7 @@ let pname = "Digest-JHash"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Digest-JHash-0.10.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Digest-JHash-0.10.tar.gz"; sha256 = "c746cf0a861a004090263cd54d7728d0c7595a0cf90cbbfd8409b396ee3b0063"; }; meta = { @@ -5644,7 +5670,7 @@ let pname = "Digest-MD4"; version = "1.9"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKEM/DigestMD4/Digest-MD4-1.9.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIKEM/DigestMD4/Digest-MD4-1.9.tar.gz"; sha256 = "19ma1hmvgiznq95ngzvm6v4dfxc9zmi69k8iyfcg6w14lfxi0lb6"; }; }; @@ -5653,7 +5679,7 @@ let pname = "Digest-MD5-File"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/D/DM/DMUEY/Digest-MD5-File-0.08.tar.gz; + url = "mirror://cpan/authors/id/D/DM/DMUEY/Digest-MD5-File-0.08.tar.gz"; sha256 = "060jzf45dlwysw5wsm7av1wvpl06xgk415kwwpvv89r6wda3md5d"; }; propagatedBuildInputs = [ LWP ]; @@ -5666,7 +5692,7 @@ let pname = "Digest-Perl-MD5"; version = "1.9"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DELTA/Digest-Perl-MD5-1.9.tar.gz; + url = "mirror://cpan/authors/id/D/DE/DELTA/Digest-Perl-MD5-1.9.tar.gz"; sha256 = "7100cba1710f45fb0e907d8b1a7bd8caef35c64acd31d7f225aff5affeecd9b1"; }; meta = { @@ -5679,7 +5705,7 @@ let pname = "Digest-SHA1"; version = "2.13"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Digest-SHA1-2.13.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/Digest-SHA1-2.13.tar.gz"; sha256 = "1k23p5pjk42vvzg8xcn4iwdii47i0qm4awdzgbmz08bl331dmhb8"; }; meta = { @@ -5707,7 +5733,7 @@ let pname = "Dir-Manifest"; version = "0.6.1"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Dir-Manifest-0.6.1.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Dir-Manifest-0.6.1.tar.gz"; sha256 = "01g54wlvp647zvhn0sxl2pqajly17044qd3pxib8cpixhwk75zw4"; }; propagatedBuildInputs = [ Moo PathTiny ]; @@ -5721,7 +5747,7 @@ let pname = "Dispatch-Class"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAUKE/Dispatch-Class-0.02.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAUKE/Dispatch-Class-0.02.tar.gz"; sha256 = "10k5l4n2mp0hfn9jwn785k211n75y56zwny1zx3bvs7r38xv8kfp"; }; propagatedBuildInputs = [ ExporterTiny ]; @@ -5735,7 +5761,7 @@ let pname = "Dist-CheckConflicts"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Dist-CheckConflicts-0.11.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOY/Dist-CheckConflicts-0.11.tar.gz"; sha256 = "1i7dr9jpdiy2nijl2p4q5zg2q2s9ckbj2hs4kmnnckf9hsb4p17a"; }; buildInputs = [ TestFatal ]; @@ -5750,13 +5776,13 @@ let pname = "Dist-Zilla"; version = "6.012"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.012.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.012.tar.gz"; sha256 = "0w1hhvxcdf52ln940f8i37adv2gp7l8ryf2nm6m7haynyrsk0n37"; }; buildInputs = [ CPANMetaCheck TestDeep TestFailWarnings TestFatal TestFileShareDir ]; propagatedBuildInputs = [ AppCmd CPANUploader ConfigMVPReaderINI DateTime FileCopyRecursive FileFindRule FileShareDirInstall Filepushd LogDispatchouli MooseXLazyRequire MooseXSetOnce MooseXTypesPerl PathTiny PerlPrereqScanner PodEventual SoftwareLicense TermEncoding TermUI YAMLTiny ]; meta = { - homepage = http://dzil.org/; + homepage = "http://dzil.org/"; description = "Distribution builder; installer not included!"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5767,7 +5793,7 @@ let pname = "Dist-Zilla-PluginBundle-TestingMania"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-PluginBundle-TestingMania-0.25.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-PluginBundle-TestingMania-0.25.tar.gz"; sha256 = "072rsilh88xnk18ldbr8d0svji72r79sabyird6xc3ql1z0b42sy"; }; buildInputs = [ MooseAutobox TestCPANMeta TestPerlCritic TestVersion ]; @@ -5783,7 +5809,7 @@ let pname = "Dist-Zilla-Plugin-CheckChangeLog"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/F/FA/FAYLAND/Dist-Zilla-Plugin-CheckChangeLog-0.05.tar.gz; + url = "mirror://cpan/authors/id/F/FA/FAYLAND/Dist-Zilla-Plugin-CheckChangeLog-0.05.tar.gz"; sha256 = "b0b34d6d70b56f1944d03c5f0dc3b8f6f24474c816d07b657a116c692c2e052a"; }; propagatedBuildInputs = [ DistZilla ]; @@ -5798,12 +5824,12 @@ let pname = "Dist-Zilla-Plugin-MojibakeTests"; version = "0.8"; src = fetchurl { - url = mirror://cpan/authors/id/S/SY/SYP/Dist-Zilla-Plugin-MojibakeTests-0.8.tar.gz; + url = "mirror://cpan/authors/id/S/SY/SYP/Dist-Zilla-Plugin-MojibakeTests-0.8.tar.gz"; sha256 = "f1fff547ea24a8f7a483406a72ed6c4058d746d9dae963725502ddba025ab380"; }; propagatedBuildInputs = [ DistZilla ]; meta = { - homepage = https://github.com/creaktive/Dist-Zilla-Plugin-MojibakeTests; + homepage = "https://github.com/creaktive/Dist-Zilla-Plugin-MojibakeTests"; description = "Release tests for source encoding"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5814,12 +5840,12 @@ let pname = "Dist-Zilla-Plugin-PodWeaver"; version = "4.008"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-Plugin-PodWeaver-4.008.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-Plugin-PodWeaver-4.008.tar.gz"; sha256 = "0ff1i26s54z292j8w8vm3gw3p7w1yq35wi8g978c84ia7y1y7n8z"; }; propagatedBuildInputs = [ DistZilla PodElementalPerlMunger PodWeaver ]; meta = { - homepage = https://github.com/rjbs/Dist-Zilla-Plugin-PodWeaver; + homepage = "https://github.com/rjbs/Dist-Zilla-Plugin-PodWeaver"; description = "Weave your Pod together from configuration and Dist::Zilla"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5829,13 +5855,13 @@ let pname = "Dist-Zilla-Plugin-ReadmeAnyFromPod"; version = "0.163250"; src = fetchurl { - url = mirror://cpan/authors/id/R/RT/RTHOMPSON/Dist-Zilla-Plugin-ReadmeAnyFromPod-0.163250.tar.gz; + url = "mirror://cpan/authors/id/R/RT/RTHOMPSON/Dist-Zilla-Plugin-ReadmeAnyFromPod-0.163250.tar.gz"; sha256 = "d44f2799922f78b2a7961ed89123e11bdd77abfe85ba2040d82b80ad72ed13bc"; }; buildInputs = [ TestDeep TestDifferences TestException TestFatal TestMost TestRequires TestSharedFork TestWarn ]; propagatedBuildInputs = [ DistZillaRoleFileWatcher MooseXHasSugar PodMarkdownGithub ]; meta = { - homepage = https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeAnyFromPod; + homepage = "https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeAnyFromPod"; description = "Automatically convert POD to a README in any format for Dist::Zilla"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5845,13 +5871,13 @@ let pname = "Dist-Zilla-Plugin-ReadmeMarkdownFromPod"; version = "0.141140"; src = fetchurl { - url = mirror://cpan/authors/id/R/RT/RTHOMPSON/Dist-Zilla-Plugin-ReadmeMarkdownFromPod-0.141140.tar.gz; + url = "mirror://cpan/authors/id/R/RT/RTHOMPSON/Dist-Zilla-Plugin-ReadmeMarkdownFromPod-0.141140.tar.gz"; sha256 = "9caad7b366ea59119ad73cdd99dcdd53f877a515bd0164fc28b339c01739a801"; }; buildInputs = [ TestDeep TestDifferences TestException TestMost TestWarn ]; propagatedBuildInputs = [ DistZillaPluginReadmeAnyFromPod ]; meta = { - homepage = https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeMarkdownFromPod; + homepage = "https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeMarkdownFromPod"; description = "Automatically convert POD to a README.mkdn for Dist::Zilla"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5861,7 +5887,7 @@ let pname = "Dist-Zilla-Plugin-Test-CPAN-Changes"; version = "0.012"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-CPAN-Changes-0.012.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-CPAN-Changes-0.012.tar.gz"; sha256 = "215b3a5c3c58c8bab0ea27130441bbdaec737eecc00f0670937f608bdbf64806"; }; buildInputs = [ CPANChanges TestDeep ]; @@ -5876,13 +5902,13 @@ let pname = "Dist-Zilla-Plugin-Test-CPAN-Meta-JSON"; version = "0.004"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-CPAN-Meta-JSON-0.004.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-CPAN-Meta-JSON-0.004.tar.gz"; sha256 = "0a573e1d5640374e6ee4d56d4fb94a3c67d4e75d52b3ddeae70cfa6450e1af22"; }; buildInputs = [ MooseAutobox TestCPANMetaJSON TestDeep ]; propagatedBuildInputs = [ DistZilla ]; meta = { - homepage = http://p3rl.org/Dist::Zilla::Plugin::Test::CPAN::Meta::JSON; + homepage = "http://p3rl.org/Dist::Zilla::Plugin::Test::CPAN::Meta::JSON"; description = "Release tests for your META.json"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5892,13 +5918,13 @@ let pname = "Dist-Zilla-Plugin-Test-Compile"; version = "2.058"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Compile-2.058.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Compile-2.058.tar.gz"; sha256 = "d0cf93e525f102eca0f7f3967124d2e59d0a212f738ce54c1ddd91dda268d88a"; }; buildInputs = [ CPANMetaCheck ModuleBuildTiny TestDeep TestMinimumVersion TestWarnings ]; propagatedBuildInputs = [ DistZilla ]; meta = { - homepage = https://github.com/karenetheridge/Dist-Zilla-Plugin-Test-Compile; + homepage = "https://github.com/karenetheridge/Dist-Zilla-Plugin-Test-Compile"; description = "Common tests to check syntax of your modules, only using core modules"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5908,7 +5934,7 @@ let pname = "Dist-Zilla-Plugin-Test-DistManifest"; version = "2.000005"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-DistManifest-2.000005.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-DistManifest-2.000005.tar.gz"; sha256 = "4f0af27bb38745d2dec7d941bcf749e6d7fbeaf8e7bcf8a79a1310a9639b0f65"; }; buildInputs = [ TestDeep TestDistManifest TestOutput ]; @@ -5923,7 +5949,7 @@ let pname = "Dist-Zilla-Plugin-Test-EOL"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-EOL-0.19.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-EOL-0.19.tar.gz"; sha256 = "0f23g931azz1k41xdfxw7kayy4snhw4qdr9ysknk5k1cl33mkfd2"; }; buildInputs = [ ModuleBuildTiny TestDeep TestEOL TestWarnings ]; @@ -5938,7 +5964,7 @@ let pname = "Dist-Zilla-Plugin-Test-Kwalitee"; version = "2.12"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Kwalitee-2.12.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Kwalitee-2.12.tar.gz"; sha256 = "bddbcfcc75e8eb2d2d9c8611552f00cdc1b051f0f00798623b8692ff5030af2f"; }; buildInputs = [ ModuleBuildTiny TestDeep TestFatal TestKwalitee ]; @@ -5953,7 +5979,7 @@ let pname = "Dist-Zilla-Plugin-Test-MinimumVersion"; version = "2.000010"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-MinimumVersion-2.000010.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-MinimumVersion-2.000010.tar.gz"; sha256 = "b8b71f4b64b689f4b647a3a87d6aaaae45a68892d35e36baa976f605736370fb"; }; buildInputs = [ ModuleBuildTiny TestDeep TestMinimumVersion TestOutput ]; @@ -5968,7 +5994,7 @@ let pname = "Dist-Zilla-Plugin-Test-NoTabs"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-NoTabs-0.15.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-NoTabs-0.15.tar.gz"; sha256 = "196hchmn8y591533v3p7kl75nlhpaygbfdiw2iqbnab9j510qq8v"; }; propagatedBuildInputs = [ DistZilla ]; @@ -5984,7 +6010,7 @@ let pname = "Dist-Zilla-Plugin-Test-Perl-Critic"; version = "3.001"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Perl-Critic-3.001.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Perl-Critic-3.001.tar.gz"; sha256 = "9250b59d5dc1ae4c6893ba783bd3f05131b14ff9e91afb4555314f55268a3825"; }; buildInputs = [ ModuleBuildTiny TestDeep TestPerlCritic ]; @@ -5999,13 +6025,13 @@ let pname = "Dist-Zilla-Plugin-Test-Pod-LinkCheck"; version = "1.004"; src = fetchurl { - url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Dist-Zilla-Plugin-Test-Pod-LinkCheck-1.004.tar.gz; + url = "mirror://cpan/authors/id/R/RW/RWSTAUNER/Dist-Zilla-Plugin-Test-Pod-LinkCheck-1.004.tar.gz"; sha256 = "325d236da0940388d2aa86ec5c1326516b4ad45adef8e7a4f83bb91d5ee15490"; }; # buildInputs = [ TestPodLinkCheck ]; propagatedBuildInputs = [ DistZilla ]; meta = { - homepage = https://github.com/rwstauner/Dist-Zilla-Plugin-Test-Pod-LinkCheck; + homepage = "https://github.com/rwstauner/Dist-Zilla-Plugin-Test-Pod-LinkCheck"; description = "Add release tests for POD links"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -6015,7 +6041,7 @@ let pname = "Dist-Zilla-Plugin-Test-Portability"; version = "2.001000"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Portability-2.001000.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Portability-2.001000.tar.gz"; sha256 = "e08ff5bd9e24cf9503055330148913808d91a3dfe320a2bdf8b0fc638719b179"; }; buildInputs = [ ModuleBuildTiny TestDeep TestPortabilityFiles TestWarnings ]; @@ -6030,7 +6056,7 @@ let pname = "Dist-Zilla-Plugin-Test-Synopsis"; version = "2.000007"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-Synopsis-2.000007.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-Synopsis-2.000007.tar.gz"; sha256 = "e7d5e2530cd8a5bb5aadf3e1669a653aaa96e32cad7bd6b9caba6b425ceab563"; }; buildInputs = [ TestDeep TestOutput TestSynopsis ]; @@ -6045,7 +6071,7 @@ let pname = "Dist-Zilla-Plugin-Test-UnusedVars"; version = "2.000007"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-UnusedVars-2.000007.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-UnusedVars-2.000007.tar.gz"; sha256 = "ea0199a3a0043213ddc132508b9ed9b131ef717735b8f93d78291191d04b43c2"; }; buildInputs = [ TestDeep TestOutput TestVars ]; @@ -6060,7 +6086,7 @@ let pname = "Dist-Zilla-Plugin-Test-Version"; version = "1.09"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Dist-Zilla-Plugin-Test-Version-1.09.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Dist-Zilla-Plugin-Test-Version-1.09.tar.gz"; sha256 = "7240508731bc1bf6dfad7701ec65450a18ef9245a521ab26ebd6acb39a9ebe17"; }; buildInputs = [ Filechdir TestDeep TestEOL TestNoTabs TestScript TestVersion ]; @@ -6075,7 +6101,7 @@ let pname = "Dist-Zilla-Role-FileWatcher"; version = "0.006"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Role-FileWatcher-0.006.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Role-FileWatcher-0.006.tar.gz"; sha256 = "15jfpr257xxp27gz156npgpj7kh2dchzgfmvzivi5bvdb2wl8fpy"; }; propagatedBuildInputs = [ DistZilla SafeIsa ]; @@ -6091,7 +6117,7 @@ let pname = "Dumbbench"; version = "0.111"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Dumbbench-0.111.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Dumbbench-0.111.tar.gz"; sha256 = "1ixjb9y9d0k1vd4mzbi4sgvr99ay4z9jkgychf0r5gbjsskkq7fk"; }; propagatedBuildInputs = [ CaptureTiny ClassXSAccessor DevelCheckOS NumberWithError StatisticsCaseResampling ]; @@ -6106,12 +6132,12 @@ let pname = "Email-Abstract"; version = "3.008"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Abstract-3.008.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Abstract-3.008.tar.gz"; sha256 = "fc7169acb6c43df7f005e7ef6ad08ee8ca6eb6796b5d1604593c997337cc8240"; }; propagatedBuildInputs = [ EmailSimple MROCompat ModulePluggable ]; meta = { - homepage = https://github.com/rjbs/Email-Abstract; + homepage = "https://github.com/rjbs/Email-Abstract"; description = "Unified interface to mail representations"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -6121,7 +6147,7 @@ let pname = "Email-Address"; version = "1.912"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.912.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.912.tar.gz"; sha256 = "1vzr0vx4zsw4zbc9xdffc31wnkc1raqmyfiyws06fbyck197i8qg"; }; meta = { @@ -6134,7 +6160,7 @@ let pname = "Email-Address-List"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/B/BP/BPS/Email-Address-List-0.06.tar.gz; + url = "mirror://cpan/authors/id/B/BP/BPS/Email-Address-List-0.06.tar.gz"; sha256 = "305b94c778011cee70d9f21514d92e985fa9dccbb84c64798f0c1f0b24eb870e"; }; buildInputs = [ JSON ]; @@ -6149,7 +6175,7 @@ let pname = "Email-Address-XS"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.04.tar.gz; + url = "mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.04.tar.gz"; sha256 = "0gjrrl81z3sfwavgx5kwjd87gj44mlnbbqsm3dgdv1xllw26spwr"; }; meta = { @@ -6162,11 +6188,11 @@ let pname = "Email-Date-Format"; version = "1.005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Date-Format-1.005.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Date-Format-1.005.tar.gz"; sha256 = "579c617e303b9d874411c7b61b46b59d36f815718625074ae6832e7bb9db5104"; }; meta = { - homepage = https://github.com/rjbs/Email-Date-Format; + homepage = "https://github.com/rjbs/Email-Date-Format"; description = "Produce RFC 2822 date strings"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -6176,7 +6202,7 @@ let pname = "Email-Reply"; version = "1.204"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Reply-1.204.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Reply-1.204.tar.gz"; sha256 = "ba4fd80ac5017d6d132e0358c786b0ecd1c7adcbeee5c19fb3da2964791a56f0"; }; propagatedBuildInputs = [ EmailAbstract EmailAddress EmailMIME ]; @@ -6190,7 +6216,7 @@ let pname = "Email-MessageID"; version = "1.406"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MessageID-1.406.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MessageID-1.406.tar.gz"; sha256 = "1f22sdnfq169qw1l0lg7y74pmiam7j9v95bggjnf3q4mygdmshpc"; }; meta = { @@ -6203,12 +6229,12 @@ let pname = "Email-MIME"; version = "1.946"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.946.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.946.tar.gz"; sha256 = "68ee79023165d77bec99a2e12ef89ad4e12501e6c321f6822053dc4f411c337c"; }; propagatedBuildInputs = [ EmailAddressXS EmailMIMEContentType EmailMIMEEncodings EmailMessageID EmailSimple MIMETypes ModuleRuntime ]; meta = { - homepage = https://github.com/rjbs/Email-MIME; + homepage = "https://github.com/rjbs/Email-MIME"; description = "Easy MIME message handling"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -6221,7 +6247,7 @@ let propagatedBuildInputs = [ EmailAbstract EmailMIME ]; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Attachment-Stripper-1.317.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Attachment-Stripper-1.317.tar.gz"; sha256 = "dcb98b09dc3e8f757ec3882a4234548108bb2d12e3cfadf95a26cef381a9e789"; }; meta = { @@ -6234,11 +6260,11 @@ let pname = "Email-MIME-ContentType"; version = "1.022"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.022.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.022.tar.gz"; sha256 = "9abb7280b0da62a855ae5528b14deb94341a84e721af0a7e5a2adc3534ec5310"; }; meta = { - homepage = https://github.com/rjbs/Email-MIME-ContentType; + homepage = "https://github.com/rjbs/Email-MIME-ContentType"; description = "Parse a MIME Content-Type Header"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -6248,12 +6274,12 @@ let pname = "Email-MIME-Encodings"; version = "1.315"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Encodings-1.315.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Encodings-1.315.tar.gz"; sha256 = "4c71045507b31ec853dd60152b40e33ba3741779c0f49bb143b50cf8d243ab5c"; }; buildInputs = [ CaptureTiny ]; meta = { - homepage = https://github.com/rjbs/Email-MIME-Encodings; + homepage = "https://github.com/rjbs/Email-MIME-Encodings"; description = "A unified interface to MIME encoding and decoding"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -6263,12 +6289,12 @@ let pname = "Email-Send"; version = "2.201"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Send-2.201.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Send-2.201.tar.gz"; sha256 = "4bbec933558d7cc9b8152bad86dd313de277a21a89b4ea83d84e61587e95dbc6"; }; propagatedBuildInputs = [ EmailAbstract EmailAddress ReturnValue ]; meta = { - homepage = https://github.com/rjbs/Email-Send; + homepage = "https://github.com/rjbs/Email-Send"; description = "Simply Sending Email"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -6279,12 +6305,12 @@ let pname = "Email-Outlook-Message"; version = "0.919"; src = fetchurl { - url = mirror://cpan/authors/id/M/MV/MVZ/Email-Outlook-Message-0.919.tar.gz; + url = "mirror://cpan/authors/id/M/MV/MVZ/Email-Outlook-Message-0.919.tar.gz"; sha256 = "0fb1gymqa8nlj540dmbb1rhs2b0ln3y9ippbgj0miswcw92iaayb"; }; propagatedBuildInputs = [ EmailMIME EmailSender IOAll IOString OLEStorage_Lite ]; meta = with stdenv.lib; { - homepage = https://www.matijs.net/software/msgconv/; + homepage = "https://www.matijs.net/software/msgconv/"; description = "A .MSG to mbox converter"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ peterhoeg ]; @@ -6295,7 +6321,7 @@ let pname = "Email-Sender"; version = "1.300034"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300034.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300034.tar.gz"; sha256 = "05ac38a63b053c7c3846ffa45196e4483a5785941b0bfb615b22b7a4f04c5291"; }; buildInputs = [ CaptureTiny ]; @@ -6308,7 +6334,7 @@ let shortenPerlShebang util/sendmail ''; meta = { - homepage = https://github.com/rjbs/Email-Sender; + homepage = "https://github.com/rjbs/Email-Sender"; description = "A library for sending email"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -6318,12 +6344,12 @@ let pname = "Email-Simple"; version = "2.216"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.216.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.216.tar.gz"; sha256 = "d85f63cd1088d11311103676a8cf498fff564a201b538de52cd753b5e5ca8bd4"; }; propagatedBuildInputs = [ EmailDateFormat ]; meta = { - homepage = https://github.com/rjbs/Email-Simple; + homepage = "https://github.com/rjbs/Email-Simple"; description = "Simple parsing of RFC2822 message format and headers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -6333,7 +6359,7 @@ let pname = "Email-Valid"; version = "1.202"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-1.202.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-1.202.tar.gz"; sha256 = "18hkmhddzbd23s6ak64d4j6q8ijykjyp5nxbr2hfcq1acsdhh8fh"; }; propagatedBuildInputs = [ IOCaptureOutput MailTools NetDNS NetDomainTLD ]; @@ -6344,7 +6370,7 @@ let pname = "Email-Valid-Loose"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Email-Valid-Loose-0.05.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Email-Valid-Loose-0.05.tar.gz"; sha256 = "e718e76eddee240251c999e139c8cbe6f2cc80192da5af875cbd12fa8ab93a59"; }; propagatedBuildInputs = [ EmailValid ]; @@ -6357,7 +6383,7 @@ let pname = "Encode"; version = "3.02"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-3.02.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-3.02.tar.gz"; sha256 = "5865be4951870f62f43722818d076d7724306c75c8f268346b282351cbc820a8"; }; meta = { @@ -6370,7 +6396,7 @@ let pname = "Encode-Detect"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/J/JG/JGMYERS/Encode-Detect-1.01.tar.gz; + url = "mirror://cpan/authors/id/J/JG/JGMYERS/Encode-Detect-1.01.tar.gz"; sha256 = "834d893aa7db6ce3f158afbd0e432d6ed15a276e0940db0a74be13fd9c4bbbf1"; }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; @@ -6385,7 +6411,7 @@ let pname = "Encode-EUCJPASCII"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEZUMI/Encode-EUCJPASCII-0.03.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEZUMI/Encode-EUCJPASCII-0.03.tar.gz"; sha256 = "f998d34d55fd9c82cf910786a0448d1edfa60bf68e2c2306724ca67c629de861"; }; outputs = [ "out" ]; @@ -6399,7 +6425,7 @@ let pname = "Encode-HanExtra"; version = "0.23"; src = fetchurl { - url = mirror://cpan/authors/id/A/AU/AUDREYT/Encode-HanExtra-0.23.tar.gz; + url = "mirror://cpan/authors/id/A/AU/AUDREYT/Encode-HanExtra-0.23.tar.gz"; sha256 = "1fd4b06cada70858003af153f94c863b3b95f2e3d03ba18d0451a81d51db443a"; }; meta = { @@ -6412,7 +6438,7 @@ let pname = "Encode-JIS2K"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-JIS2K-0.03.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-JIS2K-0.03.tar.gz"; sha256 = "1ec84d72db39deb4dad6fca95acfcc21033f45a24d347c20f9a1a696896c35cc"; }; outputs = [ "out" ]; @@ -6424,7 +6450,7 @@ let pname = "Encode-Locale"; version = "1.05"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Encode-Locale-1.05.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/Encode-Locale-1.05.tar.gz"; sha256 = "176fa02771f542a4efb1dbc2a4c928e8f4391bf4078473bd6040d8f11adb0ec1"; }; preCheck = if stdenv.isCygwin then '' @@ -6442,7 +6468,7 @@ let pname = "Encode-Newlines"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Encode-Newlines-0.05.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Encode-Newlines-0.05.tar.gz"; sha256 = "1gipd3wnma28w5gjbzycfkpi6chksy14lhxkp4hwizf8r351zcrl"; }; meta = { @@ -6456,7 +6482,7 @@ let pname = "enum"; version = "1.11"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/enum-1.11.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/enum-1.11.tar.gz"; sha256 = "d2f36b5015f1e35f640159867b60bf5d5cd66b56cd5e42d33f531be68e5eee35"; }; meta = { @@ -6468,7 +6494,7 @@ let pname = "Env"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/Env-1.04.tar.gz; + url = "mirror://cpan/authors/id/F/FL/FLORA/Env-1.04.tar.gz"; sha256 = "d94a3d412df246afdc31a2199cbd8ae915167a3f4684f7b7014ce1200251ebb0"; }; meta = { @@ -6481,7 +6507,7 @@ let pname = "Env-Path"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/D/DS/DSB/Env-Path-0.19.tar.gz; + url = "mirror://cpan/authors/id/D/DS/DSB/Env-Path-0.19.tar.gz"; sha256 = "1qhmj15a66h90pjl2dgnxsb9jj3b1r5mpvnr87cafcl8g69z0jr4"; }; }; @@ -6490,7 +6516,7 @@ let pname = "Env-Sanctify"; version = "1.12"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Env-Sanctify-1.12.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Env-Sanctify-1.12.tar.gz"; sha256 = "0prj51c9w4k6nrpnpfw6an96953vna74g698kyk78m163ikbbqr0"; }; meta = { @@ -6504,7 +6530,7 @@ let pname = "Error"; version = "0.17029"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Error-0.17029.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Error-0.17029.tar.gz"; sha256 = "1p3spyarrh8y14d3j9s71xcndjlr70x3f8c3nvaddbij628zf8qs"; }; }; @@ -6513,7 +6539,7 @@ let pname = "EV"; version = "4.32"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.32.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.32.tar.gz"; sha256 = "b82a8b89bb9cca475f6242c8621dc2c48f24851ca61558e1bd592b8506752936"; }; buildInputs = [ CanaryStability ]; @@ -6527,7 +6553,7 @@ let pname = "Eval-Closure"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Eval-Closure-0.14.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOY/Eval-Closure-0.14.tar.gz"; sha256 = "1bcc47r6zm3hfr6ccsrs72kgwxm3wkk07mgnpsaxi67cypr482ga"; }; buildInputs = [ TestFatal TestRequires ]; @@ -6541,7 +6567,7 @@ let pname = "Exception-Base"; version = "0.2501"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Base-0.2501.tar.gz; + url = "mirror://cpan/authors/id/D/DE/DEXTER/Exception-Base-0.2501.tar.gz"; sha256 = "5723dd78f4ac0b4d262a05ea46af663ea00d8096b2e9c0a43515c210760e1e75"; }; buildInputs = [ TestUnitLite ]; @@ -6555,7 +6581,7 @@ let pname = "Exception-Class"; version = "1.44"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Exception-Class-1.44.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Exception-Class-1.44.tar.gz"; sha256 = "03gf4cdgrjnljgrlxkvbh2cahsyzn0zsh2zcli7b1lrqn7wgpwrk"; }; propagatedBuildInputs = [ ClassDataInheritable DevelStackTrace ]; @@ -6565,7 +6591,7 @@ let pname = "Exception-Died"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Died-0.06.tar.gz; + url = "mirror://cpan/authors/id/D/DE/DEXTER/Exception-Died-0.06.tar.gz"; sha256 = "1dcajw2m3x5m76fpi3fvy9fjkmfrd171pnx087i5fkgx5ay41i1m"; }; buildInputs = [ TestAssert TestUnitLite ]; @@ -6576,7 +6602,7 @@ let pname = "Exception-Warning"; version = "0.0401"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Warning-0.0401.tar.gz; + url = "mirror://cpan/authors/id/D/DE/DEXTER/Exception-Warning-0.0401.tar.gz"; sha256 = "1a6k3sbhkxmz00wrmhv70f9kxjf7fklp1y6mnprfvcdmrsk9qdkv"; }; buildInputs = [ TestAssert TestUnitLite ]; @@ -6587,7 +6613,7 @@ let pname = "Exporter-Declare"; version = "0.114"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Exporter-Declare-0.114.tar.gz; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Exporter-Declare-0.114.tar.gz"; sha256 = "4bd70d6ca76f6f6ba7e4c618d4ac93b8593a58f1233ccbe18b10f5f204f1d4e4"; }; buildInputs = [ FennecLite TestException ]; @@ -6603,7 +6629,7 @@ let pname = "Exporter-Lite"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Exporter-Lite-0.08.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Exporter-Lite-0.08.tar.gz"; sha256 = "1hns15imih8z2h6zv3m1wwmv9fiysacsb52y94v6zf2cmw4kjny0"; }; meta = { @@ -6615,7 +6641,7 @@ let pname = "Exporter-Tiny"; version = "1.002001"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002001.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002001.tar.gz"; sha256 = "a82c334c02ce4b0f9ea77c67bf77738f76a9b8aa4bae5c7209d1c76453d3c48d"; }; meta = { @@ -6628,7 +6654,7 @@ let pname = "ExtUtils-CBuilder"; version = "0.280234"; src = fetchurl { - url = mirror://cpan/authors/id/A/AM/AMBS/ExtUtils-CBuilder-0.280234.tar.gz; + url = "mirror://cpan/authors/id/A/AM/AMBS/ExtUtils-CBuilder-0.280234.tar.gz"; sha256 = "1hzixkg85mys94a2i658pdr28xhzyrisvknsps691d183zm9a06q"; }; meta = { @@ -6642,7 +6668,7 @@ let pname = "Expect"; version = "1.35"; src = fetchurl { - url = mirror://cpan/authors/id/J/JA/JACOBY/Expect-1.35.tar.gz; + url = "mirror://cpan/authors/id/J/JA/JACOBY/Expect-1.35.tar.gz"; sha256 = "09d92761421decd495853103379165a99efbf452c720f30277602cf23679fd06"; }; propagatedBuildInputs = [ IOTty ]; @@ -6656,7 +6682,7 @@ let pname = "ExtUtils-CChecker"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/ExtUtils-CChecker-0.10.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/ExtUtils-CChecker-0.10.tar.gz"; sha256 = "50bfe76870fc1510f56bae4fa2dce0165d9ac4af4e7320d6b8fda14dfea4be0b"; }; buildInputs = [ TestFatal ]; @@ -6670,7 +6696,7 @@ let pname = "ExtUtils-Config"; version = "0.008"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Config-0.008.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Config-0.008.tar.gz"; sha256 = "ae5104f634650dce8a79b7ed13fb59d67a39c213a6776cfdaa3ee749e62f1a8c"; }; meta = { @@ -6683,7 +6709,7 @@ let pname = "ExtUtils-Constant"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.25.tar.gz; + url = "mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.25.tar.gz"; sha256 = "6933d0e963b62281ef7561068e6aecac8c4ac2b476b2bba09ab0b90fbac9d757"; }; }; @@ -6692,7 +6718,7 @@ let pname = "ExtUtils-CppGuess"; version = "0.21"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-0.21.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-0.21.tar.gz"; sha256 = "0ls1y9bb2nff9djli91s86541r7ajcjp22gqhcdmj7hs69w92qpz"; }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; @@ -6704,7 +6730,7 @@ let pname = "ExtUtils-Depends"; version = "0.8000"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.8000.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.8000.tar.gz"; sha256 = "165y1cjirbq64w39svkz82cb5jjqkjm8f4c0wqi2lk6050hzf3vq"; }; meta = { @@ -6730,7 +6756,7 @@ let pname = "ExtUtils-Helpers"; version = "0.026"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Helpers-0.026.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Helpers-0.026.tar.gz"; sha256 = "05ilqcj1rg5izr09dsqmy5di4fvq6ph4k0chxks7qmd4j1kip46y"; }; meta = { @@ -6743,7 +6769,7 @@ let pname = "ExtUtils-Install"; version = "2.14"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Install-2.14.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Install-2.14.tar.gz"; sha256 = "35412305cbae979aac3b6e2c70cb301ae461979a1d848a8a043f74518eb96aea"; }; meta = { @@ -6756,7 +6782,7 @@ let pname = "ExtUtils-InstallPaths"; version = "0.012"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.012.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.012.tar.gz"; sha256 = "1v9lshfhm9ck4p0v77arj5f7haj1mmkqal62lgzzvcds6wq5www4"; }; propagatedBuildInputs = [ ExtUtilsConfig ]; @@ -6770,7 +6796,7 @@ let pname = "ExtUtils-LibBuilder"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/A/AM/AMBS/ExtUtils-LibBuilder-0.08.tar.gz; + url = "mirror://cpan/authors/id/A/AM/AMBS/ExtUtils-LibBuilder-0.08.tar.gz"; sha256 = "1lmmfcjxvsvhn4f3v2lyylgr8dzcf5j7mnd1pkq3jc75dph724f5"; }; perlPreHook = "export LD=$CC"; @@ -6784,7 +6810,7 @@ let pname = "ExtUtils-MakeMaker"; version = "7.44"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.44.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.44.tar.gz"; sha256 = "52a18f8271250faf5f3527499dd2b78d3b4fd3b064408d0cfdda9a3538887188"; }; meta = { @@ -6797,7 +6823,7 @@ let pname = "ExtUtils-MakeMaker-CPANfile"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/ExtUtils-MakeMaker-CPANfile-0.09.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/ExtUtils-MakeMaker-CPANfile-0.09.tar.gz"; sha256 = "0xg2z100vjhcndwaz9m3mmi90rb8h5pggpvlj1b0i8dhsh3pc1rc"; }; propagatedBuildInputs = [ ModuleCPANfile ]; @@ -6811,7 +6837,7 @@ let pname = "ExtUtils-Manifest"; version = "1.72"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/ExtUtils-Manifest-1.72.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/ExtUtils-Manifest-1.72.tar.gz"; sha256 = "0pml5pfdk34nj9fa8m4f0qp1rh1yv0d54xagvxzjvvwq9w3q14kr"; }; }; @@ -6820,12 +6846,12 @@ let pname = "ExtUtils-PkgConfig"; version = "1.16"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-PkgConfig-1.16.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-PkgConfig-1.16.tar.gz"; sha256 = "bbeaced995d7d8d10cfc51a3a5a66da41ceb2bc04fedcab50e10e6300e801c6e"; }; propagatedBuildInputs = [ pkgs.pkgconfig ]; meta = { - homepage = http://gtk2-perl.sourceforge.net; + homepage = "http://gtk2-perl.sourceforge.net"; description = "Simplistic interface to pkg-config"; license = stdenv.lib.licenses.lgpl21Plus; }; @@ -6846,7 +6872,7 @@ let pname = "ExtUtils-Typemap"; version = "1.00"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-Typemap-1.00.tar.gz; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-Typemap-1.00.tar.gz"; sha256 = "1iqz0xlscg655gnwb2h1wrjj70llblps1zznl29qn1mv5mvibc5i"; }; }; @@ -6855,7 +6881,7 @@ let pname = "ExtUtils-Typemaps-Default"; version = "1.05"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-Typemaps-Default-1.05.tar.gz; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-Typemaps-Default-1.05.tar.gz"; sha256 = "1phmha0ks95kvzl00r1kgnd5hvg7qb1q9jmzjmw01p5zgs1zbyix"; }; }; @@ -6864,7 +6890,7 @@ let pname = "ExtUtils-XSBuilder"; version = "0.28"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-0.28.tar.gz; + url = "mirror://cpan/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-0.28.tar.gz"; sha256 = "8cced386e3d544c5ec2deb3aed055b72ebcfc2ea9a6c807da87c4245272fe80a"; }; propagatedBuildInputs = [ ParseRecDescent TieIxHash ]; @@ -6874,7 +6900,7 @@ let pname = "ExtUtils-XSpp"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-XSpp-0.18.tar.gz; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-XSpp-0.18.tar.gz"; sha256 = "1zx84f93lkymqz7qa4d63gzlnhnkxm5i3gvsrwkvvqr9cxjasxli"; }; buildInputs = [ TestBase TestDifferences ]; @@ -6884,7 +6910,7 @@ let pname = "Fatal-Exception"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Fatal-Exception-0.05.tar.gz; + url = "mirror://cpan/authors/id/D/DE/DEXTER/Fatal-Exception-0.05.tar.gz"; sha256 = "0kzfwc44vpxla3j637kfmnwmv57g6x4899ijqb4ljamk7whms298"; }; buildInputs = [ ExceptionWarning TestAssert TestUnitLite ]; @@ -6895,7 +6921,7 @@ let pname = "FCGI"; version = "0.79"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/FCGI-0.79.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/FCGI-0.79.tar.gz"; sha256 = "1r1lzd74lzzdl2brcanw4n70m37nd8n6gv9clb55m3gv2hdlxylc"; }; postPatch = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -6907,7 +6933,7 @@ let pname = "FCGI-Client"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/FCGI-Client-0.09.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/FCGI-Client-0.09.tar.gz"; sha256 = "1s11casbv0jmkcl5dk8i2vhfy1nc8rg43d3bg923zassrq4wndym"; }; propagatedBuildInputs = [ Moo TypeTiny ]; @@ -6922,7 +6948,7 @@ let pname = "FCGI-ProcManager"; version = "0.28"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARODLAND/FCGI-ProcManager-0.28.tar.gz; + url = "mirror://cpan/authors/id/A/AR/ARODLAND/FCGI-ProcManager-0.28.tar.gz"; sha256 = "e1c958c042427a175e051e0008f2025e8ec80613d3c7750597bf8e529b04420e"; }; meta = { @@ -6934,7 +6960,7 @@ let pname = "FFI-CheckLib"; version = "0.26"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.26.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.26.tar.gz"; sha256 = "0rbzm4cisn4vdj1kc0sa6v8m1b3mjkryi5w14hk1d13zh3q3pqq6"; }; buildInputs = [ Test2Suite ]; @@ -6948,7 +6974,7 @@ let pname = "Fennec-Lite"; version = "0.004"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Fennec-Lite-0.004.tar.gz; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Fennec-Lite-0.004.tar.gz"; sha256 = "dce28e3932762c2ff92aa52d90405c06e898e81cb7b164ccae8966ae77f1dcab"; }; meta = { @@ -6962,7 +6988,7 @@ let pname = "File-ChangeNotify"; version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/File-ChangeNotify-0.31.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/File-ChangeNotify-0.31.tar.gz"; sha256 = "192bdb1ce76266c6a694a8e962d039e3adeeb829b6ac1e23f5057f2b506392bd"; }; buildInputs = [ Test2Suite TestRequires TestWithoutModule ]; @@ -6977,7 +7003,7 @@ let pname = "File-chdir"; version = "0.1010"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1010.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1010.tar.gz"; sha256 = "009b8p2fzj4nhl03fpkhrn0rsh7myxqbrf69iqpzd86p1gs23hgg"; }; }; @@ -6986,7 +7012,7 @@ let version = "0.08"; pname = "File-BaseDir"; src = fetchurl { - url = mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.08.tar.gz; + url = "mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.08.tar.gz"; sha256 = "c065fcd3e2f22ae769937bcc971b91f80294d5009fac140bfba83bf7d35305e3"; }; configurePhase = '' @@ -7001,7 +7027,7 @@ let pname = "File-BOM"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MATTLAW/File-BOM-0.16.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MATTLAW/File-BOM-0.16.tar.gz"; sha256 = "97091a72bb1d3a7b5cac1dfb5372962b6f8055729189d0f3fd2c959c8ff374cf"; }; buildInputs = [ TestException ]; @@ -7016,7 +7042,7 @@ let pname = "File-CheckTree"; version = "4.42"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/File-CheckTree-4.42.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/File-CheckTree-4.42.tar.gz"; sha256 = "66fb417f8ff8a5e5b7ea25606156e70e204861c59fa8c3831925b4dd3f155f8a"; }; meta = { @@ -7029,7 +7055,7 @@ let pname = "File-Copy-Recursive"; version = "0.45"; src = fetchurl { - url = mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.45.tar.gz; + url = "mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.45.tar.gz"; sha256 = "0mqivx4nbzagl3s2kxka72050sfb75xvn25j8a0f6ic3ibvir5yk"; }; buildInputs = [ PathTiny TestDeep TestFatal TestFile TestWarnings ]; @@ -7039,7 +7065,7 @@ let pname = "File-Copy-Recursive-Reduced"; version = "0.006"; src = fetchurl { - url = mirror://cpan/authors/id/J/JK/JKEENAN/File-Copy-Recursive-Reduced-0.006.tar.gz; + url = "mirror://cpan/authors/id/J/JK/JKEENAN/File-Copy-Recursive-Reduced-0.006.tar.gz"; sha256 = "0b3yf33bahaf4ipfqipn8y5z4296k3vgzzsqbhh5ahwzls9zj676"; }; buildInputs = [ CaptureTiny PathTiny ]; @@ -7054,7 +7080,7 @@ let version = "0.22"; pname = "File-DesktopEntry"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MICHIELB/File-DesktopEntry-0.22.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MICHIELB/File-DesktopEntry-0.22.tar.gz"; sha256 = "169c01e3dae2f629767bec1a9f1cdbd6ec6d713d1501e0b2786e4dd1235635b8"; }; propagatedBuildInputs = [ FileBaseDir URI ]; @@ -7064,7 +7090,7 @@ let pname = "File-Find-Iterator"; version = "0.4"; src = fetchurl { - url = mirror://cpan/authors/id/T/TE/TEXMEC/File-Find-Iterator-0.4.tar.gz; + url = "mirror://cpan/authors/id/T/TE/TEXMEC/File-Find-Iterator-0.4.tar.gz"; sha256 = "a2b87ab9756a2e5bb674adbd39937663ed20c28c716bf5a1095a3ca44d54ab2c"; }; propagatedBuildInputs = [ ClassIterator ]; @@ -7076,7 +7102,7 @@ let pname = "File-Find-Object"; version = "0.3.5"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-0.3.5.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-0.3.5.tar.gz"; sha256 = "dc4124abe64dc1274e8e8a5e5bf9e17a2a9269debace458115b57469f1e16a91"; }; propagatedBuildInputs = [ ClassXSAccessor ]; @@ -7090,7 +7116,7 @@ let pname = "File-Find-Object-Rule"; version = "0.0312"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-Rule-0.0312.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-Rule-0.0312.tar.gz"; sha256 = "3e0b6c8dadf6362e65f2310530b1be637ed6aac113399d10c6f9129e734afff9"; }; propagatedBuildInputs = [ FileFindObject NumberCompare TextGlob ]; @@ -7099,7 +7125,7 @@ let tar xf $src */t/sample-data --strip-components=1 ''; meta = { - homepage = https://www.shlomifish.org/open-source/projects/File-Find-Object/; + homepage = "https://www.shlomifish.org/open-source/projects/File-Find-Object/"; description = "Alternative interface to File::Find::Object"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -7109,7 +7135,7 @@ let pname = "File-Find-Rule"; version = "0.34"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCLAMP/File-Find-Rule-0.34.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCLAMP/File-Find-Rule-0.34.tar.gz"; sha256 = "1znachnhmi1w5pdqx8dzgfa892jb7x8ivrdy4pzjj7zb6g61cvvy"; }; propagatedBuildInputs = [ NumberCompare TextGlob ]; @@ -7119,7 +7145,7 @@ let pname = "File-Find-Rule-Perl"; version = "1.15"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/File-Find-Rule-Perl-1.15.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/File-Find-Rule-Perl-1.15.tar.gz"; sha256 = "9a48433f86e08ce18e03526e2982de52162eb909d19735460f07eefcaf463ea6"; }; propagatedBuildInputs = [ FileFindRule ParamsUtil ]; @@ -7133,7 +7159,7 @@ let pname = "File-Finder"; version = "0.53"; src = fetchurl { - url = mirror://cpan/authors/id/M/ME/MERLYN/File-Finder-0.53.tar.gz; + url = "mirror://cpan/authors/id/M/ME/MERLYN/File-Finder-0.53.tar.gz"; sha256 = "2ecbc19ac67a9e635c872a807a8d3eaaff5babc054f15a191d47cdfc5f176a74"; }; propagatedBuildInputs = [ TextGlob ]; @@ -7160,12 +7186,12 @@ let pname = "FileHandle-Unget"; version = "0.1634"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCOPPIT/FileHandle-Unget-0.1634.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCOPPIT/FileHandle-Unget-0.1634.tar.gz"; sha256 = "380f34ad3ce5e9ec661d4c468bb3392231c162317d4172df378146b42aab1785"; }; buildInputs = [ FileSlurper TestCompile UNIVERSALrequire URI ]; meta = { - homepage = https://github.com/coppit/filehandle-unget/; + homepage = "https://github.com/coppit/filehandle-unget/"; description = "FileHandle which supports multi-byte unget"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ romildo ]; @@ -7176,7 +7202,7 @@ let pname = "File-HomeDir"; version = "1.004"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/File-HomeDir-1.004.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/File-HomeDir-1.004.tar.gz"; sha256 = "45f67e2bb5e60a7970d080e8f02079732e5a8dfc0c7c3cbdb29abfb3f9f791ad"; }; propagatedBuildInputs = [ FileWhich ]; @@ -7192,7 +7218,7 @@ let pname = "File-KeePass"; version = "2.03"; src = fetchurl { - url = mirror://cpan/authors/id/R/RH/RHANDOM/File-KeePass-2.03.tar.gz; + url = "mirror://cpan/authors/id/R/RH/RHANDOM/File-KeePass-2.03.tar.gz"; sha256 = "c30c688027a52ff4f58cd69d6d8ef35472a7cf106d4ce94eb73a796ba7c7ffa7"; }; propagatedBuildInputs = [ CryptRijndael ]; @@ -7202,7 +7228,7 @@ let pname = "File-lchown"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/File-lchown-0.02.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/File-lchown-0.02.tar.gz"; sha256 = "a02fbf285406a8a4d9399284f032f2d55c56975154c2e1674bd109837b8096ec"; }; buildInputs = [ ExtUtilsCChecker ]; @@ -7217,7 +7243,7 @@ let pname = "File-LibMagic"; version = "1.16"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/File-LibMagic-1.16.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/File-LibMagic-1.16.tar.gz"; sha256 = "c8a695fac1454f52e18e2e1b624c0647cf117326014023dda69fa3e1a5f33d60"; }; buildInputs = [ pkgs.file TestFatal ]; @@ -7236,7 +7262,7 @@ let pname = "File-Listing"; version = "6.04"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/File-Listing-6.04.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/File-Listing-6.04.tar.gz"; sha256 = "1xcwjlnxaiwwpn41a5yi6nz95ywh3szq5chdxiwj36kqsvy5000y"; }; propagatedBuildInputs = [ HTTPDate ]; @@ -7246,7 +7272,7 @@ let pname = "File-MimeInfo"; version = "0.29"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.29.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.29.tar.gz"; sha256 = "1sh8r6vczyz08zm8vfsjmkg6a165wch54akjdrd1vbifcmwjg5pi"; }; doCheck = false; # Failed test 'desktop file is the right one' @@ -7257,7 +7283,7 @@ let pname = "File-MMagic"; version = "1.30"; src = fetchurl { - url = mirror://cpan/authors/id/K/KN/KNOK/File-MMagic-1.30.tar.gz; + url = "mirror://cpan/authors/id/K/KN/KNOK/File-MMagic-1.30.tar.gz"; sha256 = "cf0c1b1eb29705c02d97c2913648009c0be42ce93ec24b36c696bf2d4f5ebd7e"; }; meta = { @@ -7270,11 +7296,11 @@ let pname = "File-Modified"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/File-Modified-0.10.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/File-Modified-0.10.tar.gz"; sha256 = "6b50b1aab6ec6998a017f6403c2735b3bc1e1cf46187bd134d7eb6df3fc45144"; }; meta = { - homepage = https://github.com/neilbowers/File-Modified; + homepage = "https://github.com/neilbowers/File-Modified"; description = "Checks intelligently if files have changed"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -7284,7 +7310,7 @@ let pname = "File-Next"; version = "1.18"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/File-Next-1.18.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/File-Next-1.18.tar.gz"; sha256 = "1vy2dqpc1nbjrnga08xr2hcxxfzifc5s2lfam5lf3djya0wwn07r"; }; }; @@ -7293,7 +7319,7 @@ let pname = "File-NFSLock"; version = "1.29"; src = fetchurl { - url = mirror://cpan/authors/id/B/BB/BBB/File-NFSLock-1.29.tar.gz; + url = "mirror://cpan/authors/id/B/BB/BBB/File-NFSLock-1.29.tar.gz"; sha256 = "0dzssj15faz9cn1w3xi7jwm64gyjyazapv4bkgglw5l1njcibm31"; }; }; @@ -7302,7 +7328,7 @@ let pname = "File-Path"; version = "2.16"; src = fetchurl { - url = mirror://cpan/authors/id/J/JK/JKEENAN/File-Path-2.16.tar.gz; + url = "mirror://cpan/authors/id/J/JK/JKEENAN/File-Path-2.16.tar.gz"; sha256 = "21f7d69b59c381f459c5f0bf697d512109bd911f12ca33270b70ca9a9ef6fa05"; }; meta = { @@ -7315,7 +7341,7 @@ let pname = "File-Pid"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/C/CW/CWEST/File-Pid-1.01.tar.gz; + url = "mirror://cpan/authors/id/C/CW/CWEST/File-Pid-1.01.tar.gz"; sha256 = "bafeee8fdc96eb06306a0c58bbdb7209b6de45f850e75fdc6b16db576e05e422"; }; propagatedBuildInputs = [ ClassAccessor ]; @@ -7330,7 +7356,7 @@ let pname = "File-pushd"; version = "1.016"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.016.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.016.tar.gz"; sha256 = "d73a7f09442983b098260df3df7a832a5f660773a313ca273fa8b56665f97cdc"; }; meta = { @@ -7343,7 +7369,7 @@ let pname = "File-ReadBackwards"; version = "1.05"; src = fetchurl { - url = mirror://cpan/authors/id/U/UR/URI/File-ReadBackwards-1.05.tar.gz; + url = "mirror://cpan/authors/id/U/UR/URI/File-ReadBackwards-1.05.tar.gz"; sha256 = "82b261af87507cc3e7e66899c457104ebc8d1c09fb85c53f67c1f90f70f18d6e"; }; meta = { @@ -7356,7 +7382,7 @@ let pname = "File-Remove"; version = "1.58"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/File-Remove-1.58.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Remove-1.58.tar.gz"; sha256 = "1n6h5w3sp2bs4cfrifdx2z15cfpb4r536179mx1a12xbmj1yrxl1"; }; }; @@ -7365,7 +7391,7 @@ let pname = "File-Share"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/I/IN/INGY/File-Share-0.25.tar.gz; + url = "mirror://cpan/authors/id/I/IN/INGY/File-Share-0.25.tar.gz"; sha256 = "0w3h800qqcf1sn79h84zngnn788rg2jx4jjb70l44f6419p2b7cf"; }; propagatedBuildInputs = [ FileShareDir ]; @@ -7380,7 +7406,7 @@ let pname = "File-ShareDir"; version = "1.116"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.116.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.116.tar.gz"; sha256 = "0a43rfb0a1fpxh4d2dayarkdxw4cx9a2krkk87zmcilcz7yhpnar"; }; propagatedBuildInputs = [ ClassInspector ]; @@ -7395,7 +7421,7 @@ let pname = "File-ShareDir-Install"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/File-ShareDir-Install-0.13.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/File-ShareDir-Install-0.13.tar.gz"; sha256 = "1yc0wlkav2l2wr36a53n4mnhsy2zv29z5nm14mygxgjwv7qgvgj5"; }; meta = { @@ -7408,7 +7434,7 @@ let pname = "Filesys-Df"; version = "0.92"; src = fetchurl { - url = mirror://cpan/authors/id/I/IG/IGUTHRIE/Filesys-Df-0.92.tar.gz; + url = "mirror://cpan/authors/id/I/IG/IGUTHRIE/Filesys-Df-0.92.tar.gz"; sha256 = "fe89cbb427e0e05f1cd97c2dd6d3866ac6b21bc7a85734ede159bdc35479552a"; }; meta = { @@ -7421,7 +7447,7 @@ let pname = "Filesys-Notify-Simple"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Filesys-Notify-Simple-0.14.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Filesys-Notify-Simple-0.14.tar.gz"; sha256 = "192m0l4cnfskdmhgaxk3bm1rvbmzxzwgcdgdb60qdqd59cnp3nhz"; }; meta = { @@ -7435,7 +7461,7 @@ let pname = "Filesys-DiskUsage"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MANWAR/Filesys-DiskUsage-0.13.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MANWAR/Filesys-DiskUsage-0.13.tar.gz"; sha256 = "fd3e52c6f6241271a281348d1d43c44154c2f61a32543db46aa9e15692d1b713"; }; buildInputs = [ TestWarn ]; @@ -7449,7 +7475,7 @@ let pname = "File-Slurp"; version = "9999.29"; src = fetchurl { - url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.29.tar.gz; + url = "mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.29.tar.gz"; sha256 = "1iqr7qi6rg45f4xa3fp48b30mnbw30xs9izxa5zf6fd6pgh4fvhf"; }; meta = { @@ -7462,7 +7488,7 @@ let pname = "File-Slurper"; version = "0.012"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/File-Slurper-0.012.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/File-Slurper-0.012.tar.gz"; sha256 = "4efb2ea416b110a1bda6f8133549cc6ea3676402e3caf7529fce0313250aa578"; }; buildInputs = [ TestWarnings ]; @@ -7476,7 +7502,7 @@ let pname = "File-Slurp-Tiny"; version = "0.004"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/File-Slurp-Tiny-0.004.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/File-Slurp-Tiny-0.004.tar.gz"; sha256 = "452995beeabf0e923e65fdc627a725dbb12c9e10c00d8018c16d10ba62757f1e"; }; meta = { @@ -7489,7 +7515,7 @@ let pname = "File-Tail"; version = "1.3"; src = fetchurl { - url = mirror://cpan/authors/id/M/MG/MGRABNAR/File-Tail-1.3.tar.gz; + url = "mirror://cpan/authors/id/M/MG/MGRABNAR/File-Tail-1.3.tar.gz"; sha256 = "1ixg6kn4h330xfw3xgvqcbzfc3v2wlzjim9803jflhvfhf0rzl16"; }; meta = { @@ -7503,7 +7529,7 @@ let pname = "File-Temp"; version = "0.2309"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/File-Temp-0.2309.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/File-Temp-0.2309.tar.gz"; sha256 = "0pr3wrxrk93wy7dz9gsb1sgl77icrs8rh2mah6wms5cdi2ll5ch1"; }; meta = { @@ -7517,11 +7543,11 @@ let pname = "File-Touch"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/File-Touch-0.11.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/File-Touch-0.11.tar.gz"; sha256 = "e379a5ff89420cf39906e5ceff309b8ce958f99f9c3e57ad52b5002a3982d93c"; }; meta = { - homepage = https://github.com/neilb/File-Touch; + homepage = "https://github.com/neilb/File-Touch"; description = "Update file access and modification times, optionally creating files if needed"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.limeytexan ]; @@ -7532,7 +7558,7 @@ let pname = "File-Type"; version = "0.22"; src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMISON/File-Type-0.22.tar.gz; + url = "mirror://cpan/authors/id/P/PM/PMISON/File-Type-0.22.tar.gz"; sha256 = "0hfkaafp6wb0nw19x47wc6wc9mwlw8s2rxiii3ylvzapxxgxjp6k"; }; meta = { @@ -7545,12 +7571,12 @@ let pname = "File-Util"; version = "4.161950"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOMMY/File-Util-4.161950.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOMMY/File-Util-4.161950.tar.gz"; sha256 = "88507b19da580d595b5c25fe6ba75bbd6096b4359e389ead067a216f766c20ee"; }; buildInputs = [ TestNoWarnings ]; meta = { - homepage = https://github.com/tommybutler/file-util/wiki; + homepage = "https://github.com/tommybutler/file-util/wiki"; description = "Easy, versatile, portable file handling"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -7560,7 +7586,7 @@ let pname = "File-Which"; version = "1.23"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/File-Which-1.23.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/File-Which-1.23.tar.gz"; sha256 = "b79dc2244b2d97b6f27167fc3b7799ef61a179040f3abd76ce1e0a3b0bc4e078"; }; meta = { @@ -7574,7 +7600,7 @@ let pname = "File-Zglob"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/File-Zglob-0.11.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/File-Zglob-0.11.tar.gz"; sha256 = "16v61rn0yimpv5kp6b20z2f1c93n5kpsyjvr0gq4w2dc43gfvc8w"; }; meta = { @@ -7587,7 +7613,7 @@ let pname = "Filter"; version = "1.59"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.59.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.59.tar.gz"; sha256 = "b4babfad4e0566a9a61199735f6e622a60d3274122752304f18f623412bf4e5a"; }; meta = { @@ -7600,12 +7626,12 @@ let pname = "Finance-Quote"; version = "1.49"; src = fetchurl { - url = mirror://cpan/authors/id/E/EC/ECOCODE/Finance-Quote-1.49.tar.gz; + url = "mirror://cpan/authors/id/E/EC/ECOCODE/Finance-Quote-1.49.tar.gz"; sha256 = "0lxz9fsm4ld3l900zxh2w91wjygk0ifn4miw6q5k4mm67d2c9nwm"; }; propagatedBuildInputs = [ CGI DateTimeFormatStrptime HTMLTableExtract JSON JSONParse LWPProtocolHttps StringUtil TextTemplate ]; meta = with stdenv.lib; { - homepage = http://finance-quote.sourceforge.net/; + homepage = "http://finance-quote.sourceforge.net/"; description = "Get stock and mutual fund quotes from various exchanges"; license = licenses.gpl2; }; @@ -7629,7 +7655,7 @@ let pname = "Font-AFM"; version = "1.20"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Font-AFM-1.20.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/Font-AFM-1.20.tar.gz"; sha256 = "32671166da32596a0f6baacd0c1233825a60acaf25805d79c81a3f18d6088bc1"; }; }; @@ -7638,7 +7664,7 @@ let pname = "Font-TTF"; version = "1.06"; src = fetchurl { - url = mirror://cpan/authors/id/B/BH/BHALLISSY/Font-TTF-1.06.tar.gz; + url = "mirror://cpan/authors/id/B/BH/BHALLISSY/Font-TTF-1.06.tar.gz"; sha256 = "4b697d444259759ea02d2c442c9bffe5ffe14c9214084a01f743693a944cc293"; }; meta = { @@ -7652,7 +7678,7 @@ let pname = "Forks-Super"; version = "0.97"; src = fetchurl { - url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.97.tar.gz; + url = "mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.97.tar.gz"; sha256 = "0kias11b4zchxy5x9ns2wwjzvzxlzsbap8sq587z9micw5bl7nrk"; }; doCheck = false; @@ -7667,7 +7693,7 @@ let pname = "FormValidator-Simple"; version = "0.29"; src = fetchurl { - url = mirror://cpan/authors/id/L/LY/LYOKATO/FormValidator-Simple-0.29.tar.gz; + url = "mirror://cpan/authors/id/L/LY/LYOKATO/FormValidator-Simple-0.29.tar.gz"; sha256 = "fc3a63dc54b962d74586070176adaf5be869f09b561bb30f5fd32ef531792666"; }; propagatedBuildInputs = [ ClassAccessor ClassDataAccessor DateCalc DateTimeFormatStrptime EmailValidLoose ListMoreUtils TieIxHash UNIVERSALrequire YAML ]; @@ -7682,7 +7708,7 @@ let pname = "FreezeThaw"; version = "0.5001"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/FreezeThaw-0.5001.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILYAZ/modules/FreezeThaw-0.5001.tar.gz"; sha256 = "0h8gakd6b9770n2xhld1hhqghdar3hrq2js4mgiwxy86j4r0hpiw"; }; doCheck = false; @@ -7707,7 +7733,7 @@ let pname = "Future"; version = "0.43"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Future-0.43.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-0.43.tar.gz"; sha256 = "191qvn3jz5pk5zxykwsg1i17s45kc82rfd6kgzsv9nki1c04dzaf"; }; buildInputs = [ TestFatal TestIdentity TestRefcount ]; @@ -7721,7 +7747,7 @@ let pname = "Games-Solitaire-Verify"; version = "0.2202"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.2202.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.2202.tar.gz"; sha256 = "14fe240613b41c9d3e7cc560eaabd78bd13ded66d2838b738b74f7d1811d9263"; }; buildInputs = [ DirManifest TestDifferences ]; @@ -7736,7 +7762,7 @@ let pname = "GD"; version = "2.71"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/GD-2.71.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/GD-2.71.tar.gz"; sha256 = "1ivskdb4nwy7ky37369hwkfxp11fkp6ri5k7qlf2dmra7f3y86s5"; }; @@ -7752,7 +7778,7 @@ let pname = "GDGraph"; version = "1.54"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RUZ/GDGraph-1.54.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RUZ/GDGraph-1.54.tar.gz"; sha256 = "0kzsdc07ycxjainmz0dnsclb15w2j1y7g8b5mcb7vhannq85qvxr"; }; propagatedBuildInputs = [ GDText ]; @@ -7767,7 +7793,7 @@ let pname = "GD-SecurityImage"; version = "1.75"; src = fetchurl { - url = mirror://cpan/authors/id/B/BU/BURAK/GD-SecurityImage-1.75.tar.gz; + url = "mirror://cpan/authors/id/B/BU/BURAK/GD-SecurityImage-1.75.tar.gz"; sha256 = "19lf1kzdavrkkx3f900jnpynr55d5kjd2sdmwpfir5dsmkcj9pix"; }; propagatedBuildInputs = [ GD ]; @@ -7781,7 +7807,7 @@ let pname = "GDTextUtil"; version = "0.86"; src = fetchurl { - url = mirror://cpan/authors/id/M/MV/MVERB/GDTextUtil-0.86.tar.gz; + url = "mirror://cpan/authors/id/M/MV/MVERB/GDTextUtil-0.86.tar.gz"; sha256 = "1g0nc7fz4d672ag7brlrrcz7ibm98x49qs75bq9z957ybkwcnvl8"; }; propagatedBuildInputs = [ GD ]; @@ -7794,7 +7820,7 @@ let pname = "Geo-IP"; version = "1.51"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/Geo-IP-1.51.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAXMIND/Geo-IP-1.51.tar.gz"; sha256 = "1fka8fr7fw6sh3xa9glhs1zjg3s2gfkhi7n7da1l2m2wblqj0c0n"; }; makeMakerFlags = "LIBS=-L${pkgs.geoip}/lib INC=-I${pkgs.geoip}/include"; @@ -7805,7 +7831,7 @@ let pname = "GeoIP2"; version = "2.006002"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/GeoIP2-2.006002.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAXMIND/GeoIP2-2.006002.tar.gz"; sha256 = "0d4qq0k0pd0xd83iykr0jkyizl499ii6ajwwwl93rgg9xsl44189"; }; propagatedBuildInputs = [ JSONMaybeXS LWPProtocolHttps MaxMindDBReader ParamsValidate Throwable ]; @@ -7820,7 +7846,7 @@ let pname = "Getopt-ArgvFile"; version = "1.11"; src = fetchurl { - url = mirror://cpan/authors/id/J/JS/JSTENZEL/Getopt-ArgvFile-1.11.tar.gz; + url = "mirror://cpan/authors/id/J/JS/JSTENZEL/Getopt-ArgvFile-1.11.tar.gz"; sha256 = "3709aa513ce6fd71d1a55a02e34d2f090017d5350a9bd447005653c9b0835b22"; }; meta = { @@ -7833,7 +7859,7 @@ let pname = "Getopt-Long"; version = "2.51"; src = fetchurl { - url = mirror://cpan/authors/id/J/JV/JV/Getopt-Long-2.51.tar.gz; + url = "mirror://cpan/authors/id/J/JV/JV/Getopt-Long-2.51.tar.gz"; sha256 = "0r659i6rkz8zkfgdccbn29zmd4bk9lcdc4y20ng6w2glqaa3pd10"; }; }; @@ -7842,13 +7868,13 @@ let pname = "Getopt-Long-Descriptive"; version = "0.104"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.104.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.104.tar.gz"; sha256 = "878bc1782c5e196a08a52fa252bbfce1aeb0546d073eac164fc6b80b4cea1e28"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; propagatedBuildInputs = [ ParamsValidate SubExporter ]; meta = { - homepage = https://github.com/rjbs/Getopt-Long-Descriptive; + homepage = "https://github.com/rjbs/Getopt-Long-Descriptive"; description = "Getopt::Long, but simpler and more powerful"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -7858,7 +7884,7 @@ let pname = "Getopt-Tabular"; version = "0.3"; src = fetchurl { - url = mirror://cpan/authors/id/G/GW/GWARD/Getopt-Tabular-0.3.tar.gz; + url = "mirror://cpan/authors/id/G/GW/GWARD/Getopt-Tabular-0.3.tar.gz"; sha256 = "0xskl9lcj07sdfx5dkma5wvhhgf5xlsq0khgh8kk34dm6dv0dpwv"; }; }; @@ -7867,7 +7893,7 @@ let pname = "Git"; version = "0.42"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSOUTH/Git-0.42.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSOUTH/Git-0.42.tar.gz"; sha256 = "9469a9f398f3a2bf2b0500566ee41d3ff6fae460412a137185767a1cc4783a6d"; }; propagatedBuildInputs = [ Error ]; @@ -7878,11 +7904,25 @@ let }; }; + GitAutofixup = buildPerlPackage rec { + pname = "GitAutofixup"; + version = "0.002007"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-${version}.tar.gz"; + sha256 = "1ydy15pibva0qr5vrv5mqyzw3zlc3wbszzv7932vh7m88vv6gfr6"; + }; + meta = { + maintainers = [ maintainers.DamienCassou ]; + description = "Create fixup commits for topic branches"; + license = stdenv.lib.licenses.artistic2; + }; + }; + GitPurePerl = buildPerlPackage { pname = "Git-PurePerl"; version = "0.53"; src = fetchurl { - url = mirror://cpan/authors/id/B/BR/BROQ/Git-PurePerl-0.53.tar.gz; + url = "mirror://cpan/authors/id/B/BR/BROQ/Git-PurePerl-0.53.tar.gz"; sha256 = "987c74366cc4c37ee084050f985fa254359c89c12507f5b8bfc6607de538d5a8"; }; buildInputs = [ Testutf8 ]; @@ -7898,7 +7938,7 @@ let pname = "Git-Repository"; version = "1.324"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOOK/Git-Repository-1.324.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOOK/Git-Repository-1.324.tar.gz"; sha256 = "814dfad104a9546349f9e0fd492c86137de827ebc284017a91a5267c120ad4f6"; }; buildInputs = [ TestRequiresGit ]; @@ -7913,7 +7953,7 @@ let pname = "Git-Version-Compare"; version = "1.004"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOOK/Git-Version-Compare-1.004.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOOK/Git-Version-Compare-1.004.tar.gz"; sha256 = "63e8264ed351cb2371b47852a72366214164b5f3fad9dbd68309c7fc63d06491"; }; buildInputs = [ TestNoWarnings ]; @@ -7927,13 +7967,13 @@ let pname = "Glib"; version = "1.3291"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3291.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3291.tar.gz"; sha256 = "0whz5f87wvzq8zsva85h06mkfqim2ciq845ixlvmafwxggccv0xr"; }; buildInputs = [ pkgs.glib ]; doCheck = false; # tests failing with glib 2.60 https://rt.cpan.org/Public/Bug/Display.html?id=128165 meta = { - homepage = http://gtk2-perl.sourceforge.net/; + homepage = "http://gtk2-perl.sourceforge.net/"; description = "Perl wrappers for the GLib utility and Object libraries"; license = stdenv.lib.licenses.lgpl21Plus; }; @@ -7944,7 +7984,7 @@ let pname = "Glib-Object-Introspection"; version = "0.048"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.048.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.048.tar.gz"; sha256 = "01dx5w6r4nl3rgnz7wvgvqfaa48xmzy90p95d5k6315q44610kx6"; }; propagatedBuildInputs = [ pkgs.gobject-introspection Glib ]; @@ -7958,13 +7998,13 @@ let pname = "Gnome2"; version = "1.047"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Gnome2-1.047.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-1.047.tar.gz"; sha256 = "ccc85c5dc3c14f915ed1a186d238681d83fef3d17eed1c20001499ff56b6390c"; }; buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gnome2Canvas Gnome2VFS Gtk2 ]; propagatedBuildInputs = [ pkgs.gnome2.libgnomeui ]; meta = { - homepage = http://gtk2-perl.sourceforge.net; + homepage = "http://gtk2-perl.sourceforge.net"; description = "Perl interface to the 2.x series of the GNOME libraries"; license = stdenv.lib.licenses.lgpl21Plus; }; @@ -7974,7 +8014,7 @@ let pname = "Gnome2-Canvas"; version = "1.002"; src = fetchurl { - url = mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Canvas-1.002.tar.gz; + url = "mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Canvas-1.002.tar.gz"; sha256 = "47a34204cd5f3a0ef5c8b9e1c9c96f41740edab7e9abf1d0560fa8666ba1916e"; }; buildInputs = [ pkgs.gnome2.libgnomecanvas ]; @@ -7988,7 +8028,7 @@ let pname = "Gnome2-VFS"; version = "1.083"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Gnome2-VFS-1.083.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-VFS-1.083.tar.gz"; sha256 = "eca974669df4e7f21b4fcedb96c8a328422369c68b8c2cd99b9ce9cc5d7a7979"; }; propagatedBuildInputs = [ pkgs.gnome2.gnome_vfs Glib ]; @@ -8002,7 +8042,7 @@ let pname = "Gnome2-Wnck"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Wnck-0.16.tar.gz; + url = "mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Wnck-0.16.tar.gz"; sha256 = "604a8ece88ac29f132d59b0caac27657ec31371c1606a4698a2160e88ac586e5"; }; buildInputs = [ pkgs.libwnck pkgs.glib pkgs.gtk2 ]; @@ -8017,7 +8057,7 @@ let pname = "GnuPG"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/Y/YA/YANICK/GnuPG-0.19.tar.gz; + url = "mirror://cpan/authors/id/Y/YA/YANICK/GnuPG-0.19.tar.gz"; sha256 = "af53f2d3f63297e046676eae14a76296afdd2910e09723b6b113708622b7989b"; }; buildInputs = [ pkgs.gnupg1orig ]; @@ -8028,7 +8068,7 @@ let pname = "GnuPG-Interface"; version = "0.52"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/GnuPG-Interface-0.52.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXMV/GnuPG-Interface-0.52.tar.gz"; sha256 = "247a9f5a88bb6745281c00d0f7d5d94e8599a92396849fd9571356dda047fd35"; }; buildInputs = [ pkgs.which pkgs.gnupg1compat ]; @@ -8044,7 +8084,7 @@ let pname = "GoferTransport-http"; version = "1.017"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TIMB/GoferTransport-http-1.017.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TIMB/GoferTransport-http-1.017.tar.gz"; sha256 = "f73effe3ea7afa1907ce8977c87387abb0d4404f85a724ae2637b29a73154a9b"; }; propagatedBuildInputs = [ DBI LWP mod_perl2 ]; @@ -8058,7 +8098,7 @@ let pname = "Goo-Canvas"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/Y/YE/YEWENBIN/Goo-Canvas-0.06.tar.gz; + url = "mirror://cpan/authors/id/Y/YE/YEWENBIN/Goo-Canvas-0.06.tar.gz"; sha256 = "0c588c507eed5e62d12ed1cc1e491c6ff3a1f59c4fb3d435e14214b37ab39251"; }; propagatedBuildInputs = [ pkgs.goocanvas pkgs.gtk2 Gtk2 ]; @@ -8072,7 +8112,7 @@ let pname = "GooCanvas2"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERLMAX/GooCanvas2-0.06.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PERLMAX/GooCanvas2-0.06.tar.gz"; sha256 = "0l1vsvyv9hjxhsxrahq4h64axh7qmk50kiz2spa3s1hr7s3qfk72"; }; buildInputs = [ pkgs.gtk3 ]; @@ -8087,7 +8127,7 @@ let pname = "Google-ProtocolBuffers"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SAXJAZMAN/protobuf/Google-ProtocolBuffers-0.12.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SAXJAZMAN/protobuf/Google-ProtocolBuffers-0.12.tar.gz"; sha256 = "0wad56n12h9yhnrq1m1z3jna1ch3mg3mqj41wkfi49ws1g34k15k"; }; propagatedBuildInputs = [ ClassAccessor ParseRecDescent ]; @@ -8103,7 +8143,7 @@ let pname = "Graph"; version = "0.9704"; src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHI/Graph-0.9704.tar.gz; + url = "mirror://cpan/authors/id/J/JH/JHI/Graph-0.9704.tar.gz"; sha256 = "099a1gca0wj5zs0cffncjqp2mjrdlk9i6325ks89ml72gfq8wpij"; }; }; @@ -8112,7 +8152,7 @@ let pname = "GraphViz"; version = "2.24"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSAVAGE/GraphViz-2.24.tgz; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/GraphViz-2.24.tgz"; sha256 = "1bgm4a8kan53r30qiknr4kasvhar1khf7vq064l1inzfrp2glpnr"; }; @@ -8130,14 +8170,14 @@ let pname = "grepmail"; version = "5.3111"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCOPPIT/grepmail-5.3111.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCOPPIT/grepmail-5.3111.tar.gz"; sha256 = "d0984e3f7a1be17ae014575f70c1678151a5bcc9622185dc5a052cb63271a761"; }; buildInputs = [ FileHomeDir FileSlurper TestCompile UNIVERSALrequire URI ]; propagatedBuildInputs = [ MailMboxMessageParser TimeDate ]; outputs = [ "out" ]; meta = { - homepage = https://github.com/coppit/grepmail; + homepage = "https://github.com/coppit/grepmail"; description = "Search mailboxes for mail matching a regular expression"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ romildo ]; @@ -8148,7 +8188,7 @@ let pname = "Growl-GNTP"; version = "0.21"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MATTN/Growl-GNTP-0.21.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MATTN/Growl-GNTP-0.21.tar.gz"; sha256 = "0gq8ypam6ifp8f3s2mf5d6sw53m7h3ki1zfahh2p41kl8a77yy98"; }; buildInputs = [ ModuleBuildTiny ]; @@ -8159,7 +8199,7 @@ let pname = "GSSAPI"; version = "0.28"; src = fetchurl { - url = mirror://cpan/authors/id/A/AG/AGROLMS/GSSAPI-0.28.tar.gz; + url = "mirror://cpan/authors/id/A/AG/AGROLMS/GSSAPI-0.28.tar.gz"; sha256 = "1mkhwxjjlhr58pd770i9gnf7zy7jj092iv6jfbnb8bvnc5xjr3vx"; }; propagatedBuildInputs = [ pkgs.krb5Full.dev ]; @@ -8175,7 +8215,7 @@ let pname = "Gtk2"; version = "1.24993"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Gtk2-1.24993.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk2-1.24993.tar.gz"; sha256 = "0ry9jfvfgdwzalxcvwsgr7plhk3agx7p40l0fqdf3vrf7ds47i29"; }; buildInputs = [ pkgs.gtk2 ]; @@ -8183,7 +8223,7 @@ let # doCheck = !stdenv.isDarwin; doCheck = false; meta = { - homepage = http://gtk2-perl.sourceforge.net/; + homepage = "http://gtk2-perl.sourceforge.net/"; description = "Perl interface to the 2.x series of the Gimp Toolkit library"; license = stdenv.lib.licenses.lgpl21Plus; }; @@ -8194,7 +8234,7 @@ let pname = "Gtk2-GladeXML"; version = "1.007"; src = fetchurl { - url = mirror://cpan/authors/id/T/TS/TSCH/Gtk2-GladeXML-1.007.tar.gz; + url = "mirror://cpan/authors/id/T/TS/TSCH/Gtk2-GladeXML-1.007.tar.gz"; sha256 = "50240a2bddbda807c8f8070de941823b7bf3d288a13be6d0d6563320b42c445a"; }; propagatedBuildInputs = [ pkgs.gnome2.libglade pkgs.gtk2 Gtk2 ]; @@ -8208,7 +8248,7 @@ let pname = "Gtk2-TrayIcon"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BORUP/Gtk2-TrayIcon-0.06.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BORUP/Gtk2-TrayIcon-0.06.tar.gz"; sha256 = "cbb7632b75d7f41554dfe8ee9063dbfd1d8522291077c65d0d82e9ceb5e94ae2"; }; propagatedBuildInputs = [ pkgs.gtk2 Gtk2 ]; @@ -8221,7 +8261,7 @@ let pname = "Gtk2-AppIndicator"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/O/OE/OESTERHOL/Gtk2-AppIndicator-0.15.tar.gz; + url = "mirror://cpan/authors/id/O/OE/OESTERHOL/Gtk2-AppIndicator-0.15.tar.gz"; sha256 = "a25cb071e214fb89b4450aa4605031eae89b7961e149b0d6e8f491c19c14a90a"; }; propagatedBuildInputs = [ pkgs.libappindicator-gtk2 pkgs.libdbusmenu-gtk2 pkgs.gtk2 pkgs.pkgconfig Gtk2 ]; @@ -8238,7 +8278,7 @@ let pname = "Gtk2-ImageView"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/R/RA/RATCLIFFE/Gtk2-ImageView-0.05.tar.gz; + url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Gtk2-ImageView-0.05.tar.gz"; sha256 = "087186c3693acf196451cf59cc8b7f5cf9a7b05abe20d32dcbcba0822953fb80"; }; buildInputs = [ pkgs.gtkimageview pkgs.gtk2 ]; @@ -8257,7 +8297,7 @@ let pname = "Gtk2-Unique"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/P/PO/POTYL/Gtk2-Unique-0.05.tar.gz; + url = "mirror://cpan/authors/id/P/PO/POTYL/Gtk2-Unique-0.05.tar.gz"; sha256 = "ae8dfb0f6844ddaa2ce7b5b44553419490c8e83c24fd35c431406a58f6be0f4f"; }; propagatedBuildInputs = [ pkgs.libunique pkgs.gtk2 Gtk2 ]; @@ -8271,7 +8311,7 @@ let pname = "Gtk3"; version = "0.036"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.036.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.036.tar.gz"; sha256 = "1rxzhahrncv58z0n93bzlagxd8swqxiafq4qn4zv9i9jbfql8mwq"; }; propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ]; @@ -8285,7 +8325,7 @@ let pname = "Gtk3-SimpleList"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/T/TV/TVIGNAUD/Gtk3-SimpleList-0.18.tar.gz; + url = "mirror://cpan/authors/id/T/TV/TVIGNAUD/Gtk3-SimpleList-0.18.tar.gz"; sha256 = "09azmc7miyvw7q21rz8cxw16zbd5i1j5hpakxy376f5vmhqqjyhp"; }; meta = { @@ -8299,7 +8339,7 @@ let pname = "Guard"; version = "1.023"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Guard-1.023.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Guard-1.023.tar.gz"; sha256 = "34c4ddf91fc93d1090d86da14df706d175b1610c67372c01e12ce9555d4dd1dc"; }; }; @@ -8308,7 +8348,7 @@ let pname = "Hash-Diff"; version = "0.010"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOLAV/Hash-Diff-0.010.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOLAV/Hash-Diff-0.010.tar.gz"; sha256 = "1ig0l859gq00k0r9l85274r2lbvwl7wsndcy52c0m3y9isilm6mw"; }; propagatedBuildInputs = [ HashMerge ]; @@ -8326,7 +8366,7 @@ let pname = "Hash-Flatten"; version = "1.19"; src = fetchurl { - url = mirror://cpan/authors/id/B/BB/BBC/Hash-Flatten-1.19.tar.gz; + url = "mirror://cpan/authors/id/B/BB/BBC/Hash-Flatten-1.19.tar.gz"; sha256 = "162b9qgkr19f97w4pic6igyk3zd0sbnrhl3s8530fikciffw9ikh"; }; buildInputs = [ TestAssertions ]; @@ -8337,7 +8377,7 @@ let pname = "Hash-Merge"; version = "0.300"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/Hash-Merge-0.300.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/Hash-Merge-0.300.tar.gz"; sha256 = "0h3wfnpv5d4d3f9xzmwkchay6251nhzngdv3f6xia56mj4hxabs0"; }; propagatedBuildInputs = [ CloneChoose ]; @@ -8351,7 +8391,7 @@ let pname = "Hash-Merge-Simple"; version = "0.051"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROKR/Hash-Merge-Simple-0.051.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROKR/Hash-Merge-Simple-0.051.tar.gz"; sha256 = "1c56327873d2f04d5722777f044863d968910466997740d55a754071c6287b73"; }; buildInputs = [ TestDeep TestDifferences TestException TestMost TestWarn ]; @@ -8366,7 +8406,7 @@ let pname = "Hash-MoreUtils"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/Hash-MoreUtils-0.06.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/Hash-MoreUtils-0.06.tar.gz"; sha256 = "db9a8fb867d50753c380889a5e54075651b5e08c9b3b721cb7220c0883547de8"; }; meta = { @@ -8379,7 +8419,7 @@ let pname = "Hash-MultiValue"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARISTOTLE/Hash-MultiValue-0.16.tar.gz; + url = "mirror://cpan/authors/id/A/AR/ARISTOTLE/Hash-MultiValue-0.16.tar.gz"; sha256 = "1x3k7h542xnigz0b8vsfiq580p5r325wi5b8mxppiqk8mbvis636"; }; meta = { @@ -8392,7 +8432,7 @@ let pname = "Hash-Util-FieldHash-Compat"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Hash-Util-FieldHash-Compat-0.11.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Hash-Util-FieldHash-Compat-0.11.tar.gz"; sha256 = "06vlygjyk7rkkw0di3252mma141w801qn3xk40aa2yskbfklcbk4"; }; }; @@ -8401,7 +8441,7 @@ let pname = "Heap"; version = "0.80"; src = fetchurl { - url = mirror://cpan/authors/id/J/JM/JMM/Heap-0.80.tar.gz; + url = "mirror://cpan/authors/id/J/JM/JMM/Heap-0.80.tar.gz"; sha256 = "1plv2djbyhvkdcw2ic54rdqb745cwksxckgzvw7ssxiir7rjknnc"; }; }; @@ -8410,12 +8450,12 @@ let pname = "Hook-LexWrap"; version = "0.26"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Hook-LexWrap-0.26.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Hook-LexWrap-0.26.tar.gz"; sha256 = "b60bdc5f98f94f9294b06adef82b1d996da192d5f183f9f434b610fd1137ec2d"; }; buildInputs = [ pkgs.unzip ]; meta = { - homepage = https://github.com/chorny/Hook-LexWrap; + homepage = "https://github.com/chorny/Hook-LexWrap"; description = "Lexically scoped subroutine wrappers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -8425,7 +8465,7 @@ let pname = "HTML-Clean"; version = "1.4"; src = fetchurl { - url = mirror://cpan/authors/id/A/AZ/AZJADFTRE/HTML-Clean-1.4.tar.gz; + url = "mirror://cpan/authors/id/A/AZ/AZJADFTRE/HTML-Clean-1.4.tar.gz"; sha256 = "01l7g2hr0kjbh1wk7cv03ijmpjlbm1vm661m99mkrz2ilyyllzd6"; }; meta = { @@ -8438,7 +8478,7 @@ let pname = "HTML-Element-Extended"; version = "1.18"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSISK/HTML-Element-Extended-1.18.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSISK/HTML-Element-Extended-1.18.tar.gz"; sha256 = "f3ef1af108f27fef15ebec66479f251ce08aa49bd00b0462c9c80c86b4b6b32b"; }; propagatedBuildInputs = [ HTMLTree ]; @@ -8448,13 +8488,13 @@ let pname = "HTML-Escape"; version = "1.10"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/HTML-Escape-1.10.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/HTML-Escape-1.10.tar.gz"; sha256 = "b1cbac4157ad8dedac6914e1628855e05b8dc885a4007d2e4df8177c6a9b70fb"; }; buildInputs = [ ModuleBuildPluggablePPPort TestRequires ]; perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { - homepage = https://github.com/tokuhirom/HTML-Escape; + homepage = "https://github.com/tokuhirom/HTML-Escape"; description = "Extremely fast HTML escaping"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -8464,7 +8504,7 @@ let pname = "HTML-FromANSI"; version = "2.03"; src = fetchurl { - url = mirror://cpan/authors/id/N/NU/NUFFIN/HTML-FromANSI-2.03.tar.gz; + url = "mirror://cpan/authors/id/N/NU/NUFFIN/HTML-FromANSI-2.03.tar.gz"; sha256 = "21776345ed701b2c04c7b09380af943f9984cc7f99624087aea45db5fc09c359"; }; propagatedBuildInputs = [ HTMLParser TermVT102Boundless ]; @@ -8476,7 +8516,7 @@ let pname = "HTML-Form"; version = "6.05"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/HTML-Form-6.05.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTML-Form-6.05.tar.gz"; sha256 = "14i4ldyvdvhdhvfhh9kiq6z853q2f84biq8vcpv1k5w2r80wdiin"; }; propagatedBuildInputs = [ HTMLParser HTTPMessage ]; @@ -8490,7 +8530,7 @@ let pname = "HTML-Formatter"; version = "2.16"; src = fetchurl { - url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-Formatter-2.16.tar.gz; + url = "mirror://cpan/authors/id/N/NI/NIGELM/HTML-Formatter-2.16.tar.gz"; sha256 = "cb0a0dd8aa5e8ba9ca214ce451bf4df33aa09c13e907e8d3082ddafeb30151cc"; }; buildInputs = [ FileSlurper TestWarnings ]; @@ -8505,7 +8545,7 @@ let pname = "HTML-FormatText-WithLinks"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-0.15.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-0.15.tar.gz"; sha256 = "7fcc1ab79eb58fb97d43e5bdd14e21791a250a204998918c62d6a171131833b1"; }; propagatedBuildInputs = [ HTMLFormatter URI ]; @@ -8519,7 +8559,7 @@ let pname = "HTML-FormatText-WithLinks-AndTables"; version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DALEEVANS/HTML-FormatText-WithLinks-AndTables-0.07.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DALEEVANS/HTML-FormatText-WithLinks-AndTables-0.07.tar.gz"; sha256 = "809ee2f11705706b33c54312b5c7bee674838f2beaaedaf8cb945e702aae39b6"; }; propagatedBuildInputs = [ HTMLFormatTextWithLinks ]; @@ -8533,7 +8573,7 @@ let pname = "HTML-FormFu"; version = "2.07"; src = fetchurl { - url = mirror://cpan/authors/id/C/CF/CFRANKS/HTML-FormFu-2.07.tar.gz; + url = "mirror://cpan/authors/id/C/CF/CFRANKS/HTML-FormFu-2.07.tar.gz"; sha256 = "0cpbcrip95rvihc7i8dywca6lx9ws67ch1hjx6vgnm47g9zh2bsg"; }; buildInputs = [ CGI FileShareDirInstall RegexpAssemble TestException TestMemoryCycle TestRequiresInternet ]; @@ -8548,7 +8588,7 @@ let pname = "HTML-FormFu-MultiForm"; version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-FormFu-MultiForm-1.03.tar.gz; + url = "mirror://cpan/authors/id/N/NI/NIGELM/HTML-FormFu-MultiForm-1.03.tar.gz"; sha256 = "17qm94hwhn6jyhd2am4gqxq7yrlhv3jv0ayx17df95mqdgbhrw1n"; }; propagatedBuildInputs = [ CryptCBC CryptDES HTMLFormFu ]; @@ -8563,7 +8603,7 @@ let pname = "HTML-FormHandler"; version = "0.40068"; src = fetchurl { - url = mirror://cpan/authors/id/G/GS/GSHANK/HTML-FormHandler-0.40068.tar.gz; + url = "mirror://cpan/authors/id/G/GS/GSHANK/HTML-FormHandler-0.40068.tar.gz"; sha256 = "09z8rpb3avdd8984rm6j6gd2igbzjz9rc0ycig654mqjlgfphyzb"; }; # a single test is failing on perl 5.20 @@ -8580,7 +8620,7 @@ let pname = "HTML-Mason"; version = "1.58"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.58.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.58.tar.gz"; sha256 = "81dc9b199f0f3b3473c97ba0ebee4b9535cd633d4e9c1ca3818615dc03dff948"; }; buildInputs = [ TestDeep ]; @@ -8595,7 +8635,7 @@ let pname = "HTML-Mason-PSGIHandler"; version = "0.53"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RUZ/HTML-Mason-PSGIHandler-0.53.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RUZ/HTML-Mason-PSGIHandler-0.53.tar.gz"; sha256 = "eafd7c7655dfa8261df3446b931a283d30306877b83ac4671c49cff74ea7f00b"; }; buildInputs = [ Plack ]; @@ -8610,7 +8650,7 @@ let pname = "HTML-Parser"; version = "3.72"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.72.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.72.tar.gz"; sha256 = "12v05ywlnsi9lc17z32k9jxx3sj1viy7y1wpl7n4az76v7hwfa7c"; }; propagatedBuildInputs = [ HTMLTagset ]; @@ -8624,7 +8664,7 @@ let pname = "HTML-TagCloud"; version = "0.38"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROBERTSD/HTML-TagCloud-0.38.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROBERTSD/HTML-TagCloud-0.38.tar.gz"; sha256 = "05bhnrwwlwd6cj3cn91zw5r99xddvy142bznid26p1pg5m3rk029"; }; meta = { @@ -8637,7 +8677,7 @@ let pname = "HTML-Quoted"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/T/TS/TSIBLEY/HTML-Quoted-0.04.tar.gz; + url = "mirror://cpan/authors/id/T/TS/TSIBLEY/HTML-Quoted-0.04.tar.gz"; sha256 = "8b41f313fdc1812f02f6f6c37d58f212c84fdcf7827f7fd4b030907f39dc650c"; }; propagatedBuildInputs = [ HTMLParser ]; @@ -8651,7 +8691,7 @@ let pname = "HTML-RewriteAttributes"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/T/TS/TSIBLEY/HTML-RewriteAttributes-0.05.tar.gz; + url = "mirror://cpan/authors/id/T/TS/TSIBLEY/HTML-RewriteAttributes-0.05.tar.gz"; sha256 = "1808ec7cdf40d2708575fe6155a88f103b17fec77973a5831c2f24c250e7a58c"; }; propagatedBuildInputs = [ HTMLParser URI ]; @@ -8665,7 +8705,7 @@ let pname = "HTML-Selector-XPath"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORION/HTML-Selector-XPath-0.25.tar.gz; + url = "mirror://cpan/authors/id/C/CO/CORION/HTML-Selector-XPath-0.25.tar.gz"; sha256 = "1qbad8ayffpx7wj76ip05p6rh9p1lkir6qknpl76zy679ghlsp8s"; }; buildInputs = [ TestBase ]; @@ -8675,7 +8715,7 @@ let pname = "HTML-Scrubber"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-Scrubber-0.19.tar.gz; + url = "mirror://cpan/authors/id/N/NI/NIGELM/HTML-Scrubber-0.19.tar.gz"; sha256 = "1c9b4r9x96a8fbz2zy52fxgq7djp9dq38hiyqra92psnz1w5aa5f"; }; propagatedBuildInputs = [ HTMLParser ]; @@ -8686,7 +8726,7 @@ let pname = "HTML-StripScripts"; version = "1.06"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DRTECH/HTML-StripScripts-1.06.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DRTECH/HTML-StripScripts-1.06.tar.gz"; sha256 = "222bfb7ec1fdfa465e32da3dc4abed2edc7364bbe19e8e3c513c7d585b0109ad"; }; meta = { @@ -8699,7 +8739,7 @@ let pname = "HTML-StripScripts-Parser"; version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DRTECH/HTML-StripScripts-Parser-1.03.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DRTECH/HTML-StripScripts-Parser-1.03.tar.gz"; sha256 = "478c1a4e46eb77fa7bce96ba288168f0b98c27f250e00dc6312365081aed3407"; }; propagatedBuildInputs = [ HTMLParser HTMLStripScripts ]; @@ -8713,7 +8753,7 @@ let pname = "HTML-TableExtract"; version = "2.13"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSISK/HTML-TableExtract-2.13.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSISK/HTML-TableExtract-2.13.tar.gz"; sha256 = "01jimmss3q68a89696wmclvqwb2ybz6xgabpnbp6mm6jcni82z8a"; }; propagatedBuildInputs = [ HTMLElementExtended ]; @@ -8723,7 +8763,7 @@ let pname = "HTML-Tagset"; version = "3.20"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz"; sha256 = "1qh8249wgr4v9vgghq77zh1d2zs176bir223a8gh3k9nksn7vcdd"; }; }; @@ -8732,7 +8772,7 @@ let pname = "HTML-Template"; version = "2.97"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SAMTREGAR/HTML-Template-2.97.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SAMTREGAR/HTML-Template-2.97.tar.gz"; sha256 = "17qjw8swj2q4b1ic285pndgrkmvpsqw0j68nhqzpk1daydhsyiv5"; }; propagatedBuildInputs = [ CGI ]; @@ -8743,7 +8783,7 @@ let pname = "HTML-Tidy"; version = "1.60"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tidy-1.60.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tidy-1.60.tar.gz"; sha256 = "1iyp2fd6j75cn1xvcwl2lxr8qpjxssy2360cyqn6g3kzd1fzdyxw"; }; @@ -8758,7 +8798,7 @@ let pname = "HTML-Tiny"; version = "1.05"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDYA/HTML-Tiny-1.05.tar.gz; + url = "mirror://cpan/authors/id/A/AN/ANDYA/HTML-Tiny-1.05.tar.gz"; sha256 = "d7cdc9d5985e2e44ceba10b756acf1e0d3a1b3ee3b516e5b54adb850fe79fda3"; }; meta = { @@ -8771,7 +8811,7 @@ let pname = "HTML-TokeParser-Simple"; version = "3.16"; src = fetchurl { - url = mirror://cpan/authors/id/O/OV/OVID/HTML-TokeParser-Simple-3.16.tar.gz; + url = "mirror://cpan/authors/id/O/OV/OVID/HTML-TokeParser-Simple-3.16.tar.gz"; sha256 = "17aa1v62sp8ycxcicwhankmj4brs6nnfclk9z7mf1rird1f164gd"; }; propagatedBuildInputs = [ HTMLParser SubOverride ]; @@ -8781,7 +8821,7 @@ let pname = "HTML-Tree"; version = "5.07"; src = fetchurl { - url = mirror://cpan/authors/id/K/KE/KENTNL/HTML-Tree-5.07.tar.gz; + url = "mirror://cpan/authors/id/K/KE/KENTNL/HTML-Tree-5.07.tar.gz"; sha256 = "1gyvm4qlwm9y6hczkpnrdfl303ggbybr0nqxdjw09hii8yw4sdzh"; }; buildInputs = [ TestFatal ]; @@ -8796,7 +8836,7 @@ let pname = "HTML-TreeBuilder-XPath"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIROD/HTML-TreeBuilder-XPath-0.14.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIROD/HTML-TreeBuilder-XPath-0.14.tar.gz"; sha256 = "1wx4i1scng20n405fp3a4vrwvvq9bvbmg977wnd5j2ja8jrbvsr5"; }; propagatedBuildInputs = [ HTMLTree XMLXPathEngine ]; @@ -8810,7 +8850,7 @@ let pname = "HTML-Widget"; version = "1.11"; src = fetchurl { - url = mirror://cpan/authors/id/C/CF/CFRANKS/HTML-Widget-1.11.tar.gz; + url = "mirror://cpan/authors/id/C/CF/CFRANKS/HTML-Widget-1.11.tar.gz"; sha256 = "02w21rd30cza094m5xs9clzw8ayigbhg2ddzl6jycp4jam0dyhmy"; }; doCheck = false; @@ -8822,7 +8862,7 @@ let pname = "HTTP-Body"; version = "1.22"; src = fetchurl { - url = mirror://cpan/authors/id/G/GE/GETTY/HTTP-Body-1.22.tar.gz; + url = "mirror://cpan/authors/id/G/GE/GETTY/HTTP-Body-1.22.tar.gz"; sha256 = "fc0d2c585b3bd1532d92609965d589e0c87cd380e7cca42fb9ad0a1311227297"; }; buildInputs = [ TestDeep ]; @@ -8837,7 +8877,7 @@ let pname = "HTTP-CookieJar"; version = "0.008"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/HTTP-CookieJar-0.008.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/HTTP-CookieJar-0.008.tar.gz"; sha256 = "0rfw6avcralggs7bf7n86flvhaahxjnqzvpwszp0sk4z4wwy01wm"; }; propagatedBuildInputs = [ HTTPDate ]; @@ -8853,7 +8893,7 @@ let pname = "HTTP-Cookies"; version = "6.08"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Cookies-6.08.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Cookies-6.08.tar.gz"; sha256 = "0ndgqciqqcxyycry0nl0xkg9ci09vxvr81xw0hy0chgbfqsvgss9"; }; propagatedBuildInputs = [ HTTPMessage ]; @@ -8867,7 +8907,7 @@ let pname = "HTTP-Daemon"; version = "6.01"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz"; sha256 = "1hmd2isrkilf0q0nkxms1q64kikjmcw9imbvrjgky6kh89vqdza3"; }; propagatedBuildInputs = [ HTTPMessage ]; @@ -8881,7 +8921,7 @@ let pname = "HTTP-Date"; version = "6.05"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Date-6.05.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Date-6.05.tar.gz"; sha256 = "0awjdbz7x0jd5pna55dwxhs3k6xp3sw6b2zg3p2yndxxvya64p9n"; }; meta = { @@ -8895,7 +8935,7 @@ let pname = "HTTP-Entity-Parser"; version = "0.22"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/HTTP-Entity-Parser-0.22.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/HTTP-Entity-Parser-0.22.tar.gz"; sha256 = "1j6nxs0nmx160ip0xw9gb3l19ii8pz9x1ay1y15q7rmllbr1rzlk"; }; propagatedBuildInputs = [ HTTPMultiPartParser HashMultiValue JSONMaybeXS StreamBuffered WWWFormUrlEncoded ]; @@ -8911,7 +8951,7 @@ let pname = "HTTP-DAV"; version = "0.49"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/COSIMO/HTTP-DAV-0.49.tar.gz; + url = "mirror://cpan/authors/id/C/CO/COSIMO/HTTP-DAV-0.49.tar.gz"; sha256 = "0z4mgb8mc6l5nfsm3ihndjqgpk43q39x1kq9hryy6v8hxkwrscrk"; }; meta = { @@ -8924,7 +8964,7 @@ let pname = "HTTP-HeaderParser-XS"; version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKSMITH/HTTP-HeaderParser-XS-0.20.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKSMITH/HTTP-HeaderParser-XS-0.20.tar.gz"; sha256 = "1vs6sw431nnlnbdy6jii9vqlz30ndlfwdpdgm8a1m6fqngzhzq59"; }; meta.broken = stdenv.isi686; # loadable library and perl binaries are mismatched (got handshake key 0x7d40080, needed 0x7dc0080) @@ -8934,13 +8974,13 @@ let pname = "HTTP-Headers-Fast"; version = "0.22"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/HTTP-Headers-Fast-0.22.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/HTTP-Headers-Fast-0.22.tar.gz"; sha256 = "cc431db68496dd884db4bc0c0b7112c1f4a4f1dc68c4f5a3caa757a1e7481b48"; }; buildInputs = [ ModuleBuildTiny TestRequires ]; propagatedBuildInputs = [ HTTPDate ]; meta = { - homepage = https://github.com/tokuhirom/HTTP-Headers-Fast; + homepage = "https://github.com/tokuhirom/HTTP-Headers-Fast"; description = "Faster implementation of HTTP::Headers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -8950,7 +8990,7 @@ let pname = "HTTP-Lite"; version = "2.44"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/HTTP-Lite-2.44.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/HTTP-Lite-2.44.tar.gz"; sha256 = "0z77nflj8zdcfg70kc93glq5kmd6qxn2nf7h70x4xhfg25wkvr1q"; }; buildInputs = [ CGI ]; @@ -8960,13 +9000,13 @@ let pname = "HTTP-Message"; version = "6.18"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.18.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.18.tar.gz"; sha256 = "d060d170d388b694c58c14f4d13ed908a2807f0e581146cef45726641d809112"; }; buildInputs = [ TryTiny ]; propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; meta = { - homepage = https://github.com/libwww-perl/HTTP-Message; + homepage = "https://github.com/libwww-perl/HTTP-Message"; description = "HTTP style message (base class)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -8976,7 +9016,7 @@ let pname = "HTTP-MultiPartParser"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHANSEN/HTTP-MultiPartParser-0.02.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHANSEN/HTTP-MultiPartParser-0.02.tar.gz"; sha256 = "04hbs0b1lzv2c8dqfcc9qjm5akh25fn40903is36zlalkwaxmpay"; }; buildInputs = [ TestDeep ]; @@ -8990,7 +9030,7 @@ let pname = "HTTP-Negotiate"; version = "6.01"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/HTTP-Negotiate-6.01.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/HTTP-Negotiate-6.01.tar.gz"; sha256 = "05p053vjs5g91v5cmjnny7a3xzddz5k7vnjw81wfh01ilqg9qwhw"; }; propagatedBuildInputs = [ HTTPMessage ]; @@ -9004,7 +9044,7 @@ let pname = "HTTP-Parser-XS"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/HTTP-Parser-XS-0.17.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZUHO/HTTP-Parser-XS-0.17.tar.gz"; sha256 = "02d84xq1mm53c7jl33qyb7v5w4372vydp74z6qj0vc96wcrnhkkr"; }; }; @@ -9013,7 +9053,7 @@ let pname = "HTTP-Proxy"; version = "0.304"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOOK/HTTP-Proxy-0.304.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOOK/HTTP-Proxy-0.304.tar.gz"; sha256 = "b05290534ec73625c21a0565fc35170890dab163843d95331c292c23f504c69d"; }; propagatedBuildInputs = [ LWP ]; @@ -9029,7 +9069,7 @@ let pname = "HTTP-Request-AsCGI"; version = "1.2"; src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/HTTP-Request-AsCGI-1.2.tar.gz; + url = "mirror://cpan/authors/id/F/FL/FLORA/HTTP-Request-AsCGI-1.2.tar.gz"; sha256 = "1smwmiarwcgq7vjdblnb6ldi2x1s5sk5p15p7xvm5byiqq3znnwl"; }; propagatedBuildInputs = [ ClassAccessor HTTPMessage ]; @@ -9039,7 +9079,7 @@ let pname = "HTTP-Response-Encoding"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DANKOGAI/HTTP-Response-Encoding-0.06.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DANKOGAI/HTTP-Response-Encoding-0.06.tar.gz"; sha256 = "1am8lis8107s5npca1xgazdy5sknknzcqyhdmc220s4a4f77n5hh"; }; propagatedBuildInputs = [ HTTPMessage ]; @@ -9053,7 +9093,7 @@ let pname = "HTTP-Server-Simple"; version = "0.52"; src = fetchurl { - url = mirror://cpan/authors/id/B/BP/BPS/HTTP-Server-Simple-0.52.tar.gz; + url = "mirror://cpan/authors/id/B/BP/BPS/HTTP-Server-Simple-0.52.tar.gz"; sha256 = "0k6bg7k6mjixfzxdkkdrhqvaqmdhjszx0zsk8g0bimiby6j9z4yq"; }; doCheck = false; @@ -9067,7 +9107,7 @@ let pname = "HTTP-Server-Simple-Authen"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Server-Simple-Authen-0.04.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Server-Simple-Authen-0.04.tar.gz"; sha256 = "2dddc8ab9dc8986980151e4ba836a6bbf091f45cf195be1768ebdb4a993ed59b"; }; propagatedBuildInputs = [ AuthenSimple HTTPServerSimple ]; @@ -9080,7 +9120,7 @@ let pname = "HTTP-Server-Simple-Mason"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/J/JE/JESSE/HTTP-Server-Simple-Mason-0.14.tar.gz; + url = "mirror://cpan/authors/id/J/JE/JESSE/HTTP-Server-Simple-Mason-0.14.tar.gz"; sha256 = "b7a49d8e6e55bff0b1f0278d951685466b143243b6f9e59e071f5472ca2a025a"; }; propagatedBuildInputs = [ HTMLMason HTTPServerSimple HookLexWrap ]; @@ -9094,7 +9134,7 @@ let pname = "HTTP-Server-Simple-PSGI"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Server-Simple-PSGI-0.16.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Server-Simple-PSGI-0.16.tar.gz"; sha256 = "1fhx2glycd66m4l4m1gja81ixq8nh4r5g9wjhhkrffq4af2cnz2z"; }; propagatedBuildInputs = [ HTTPServerSimple ]; @@ -9109,12 +9149,12 @@ let pname = "HTTP-Tinyish"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Tinyish-0.15.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Tinyish-0.15.tar.gz"; sha256 = "5d65f0ee20a9e4744acdb3ef12edae78c121f53dcbc9cf00867c5725c4513aa5"; }; propagatedBuildInputs = [ FileWhich IPCRun3 ]; meta = { - homepage = https://github.com/miyagawa/HTTP-Tinyish; + homepage = "https://github.com/miyagawa/HTTP-Tinyish"; description = "HTTP::Tiny compatible HTTP client wrappers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -9124,7 +9164,7 @@ let pname = "iCal-Parser"; version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/R/RI/RIXED/iCal-Parser-1.21.tar.gz; + url = "mirror://cpan/authors/id/R/RI/RIXED/iCal-Parser-1.21.tar.gz"; sha256 = "0d7939a644a8e67017ec7239d3d9604f3986bb9a4ff80be68fe7299ebfd2270c"; }; propagatedBuildInputs = [ DateTimeFormatICal FreezeThaw IOString TextvFileasData ]; @@ -9137,13 +9177,13 @@ let pname = "Imager"; version = "1.011"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TONYC/Imager-1.011.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TONYC/Imager-1.011.tar.gz"; sha256 = "a3aea2f0c172c2c094baeced4a3bdaa9f54e3e85c97eea2e5f8f994ba2beedfc"; }; buildInputs = [ pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ]; makeMakerFlags = "--incpath ${pkgs.libjpeg.dev}/include --libpath ${pkgs.libjpeg.out}/lib --incpath ${pkgs.libpng.dev}/include --libpath ${pkgs.libpng.out}/lib"; meta = { - homepage = http://imager.perl.org/; + homepage = "http://imager.perl.org/"; description = "Perl extension for Generating 24 bit Images"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -9153,7 +9193,7 @@ let pname = "Image-Info"; version = "1.42"; src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SREZIC/Image-Info-1.42.tar.gz; + url = "mirror://cpan/authors/id/S/SR/SREZIC/Image-Info-1.42.tar.gz"; sha256 = "2bca560c3f71b3c1cd63ac3a974e62f3baeb986b7ffaa026b929081b914a8f4f"; }; propagatedBuildInputs = [ IOStringy ]; @@ -9167,7 +9207,7 @@ let pname = "Image-Sane"; version = "5"; src = fetchurl { - url = mirror://cpan/authors/id/R/RA/RATCLIFFE/Image-Sane-5.tar.gz; + url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Image-Sane-5.tar.gz"; sha256 = "229aa0e9f049efa760f3c2f6e61d9d539af43d8f764b50a6e03064b4729a35ff"; }; buildInputs = [ pkgs.sane-backends ExtUtilsDepends ExtUtilsPkgConfig TestRequires TryTiny ]; @@ -9182,7 +9222,7 @@ let pname = "Image-Scale"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/A/AG/AGRUNDMA/Image-Scale-0.14.tar.gz; + url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/Image-Scale-0.14.tar.gz"; sha256 = "f09c5f0663b87738365ac2819e186b909abeb9ed85d83bc15ee76872c947cdf8"; }; buildInputs = [ pkgs.libpng pkgs.libjpeg TestNoWarnings ]; @@ -9198,7 +9238,7 @@ let pname = "Image-Size"; version = "3.300"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJRAY/Image-Size-3.300.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJRAY/Image-Size-3.300.tar.gz"; sha256 = "0sq2kwdph55h4adx50fmy86brjkkv8grsw33xrhf1k9icpwb3jak"; }; buildInputs = [ ModuleBuild ]; @@ -9212,7 +9252,7 @@ let pname = "IMAP-Client"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CONTEB/IMAP-Client-0.13.tar.gz; + url = "mirror://cpan/authors/id/C/CO/CONTEB/IMAP-Client-0.13.tar.gz"; sha256 = "15fa4hpw2rqg2iadyz10rnv99hns78wph5qlh3257a3mbfjjyyla"; }; doCheck = false; # nondeterministic @@ -9222,7 +9262,7 @@ let pname = "Importer"; version = "0.025"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Importer-0.025.tar.gz; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Importer-0.025.tar.gz"; sha256 = "0745138c487d74033d0cbeb36f06595036dc7e688f1a5dbec9cc2fa799e13946"; }; meta = { @@ -9235,7 +9275,7 @@ let pname = "Import-Into"; version = "1.002005"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Import-Into-1.002005.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Import-Into-1.002005.tar.gz"; sha256 = "0rq5kz7c270q33jq6hnrv3xgkvajsc62ilqq7fs40av6zfipg7mx"; }; propagatedBuildInputs = [ ModuleRuntime ]; @@ -9249,7 +9289,7 @@ let pname = "IO"; version = "1.42"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/IO-1.42.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/IO-1.42.tar.gz"; sha256 = "eec5cc33a6cddba8b5d2425b60752882add7e4d41b7431a0ea4dcd73cc1f8cca"; }; doCheck = false; @@ -9263,7 +9303,7 @@ let pname = "IO-All"; version = "0.87"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/IO-All-0.87.tar.gz; + url = "mirror://cpan/authors/id/F/FR/FREW/IO-All-0.87.tar.gz"; sha256 = "0nsd9knlbd7if2v6zwj4q978axq0w5hk8ymp61z14a821hjivqjl"; }; meta = { @@ -9277,7 +9317,7 @@ let pname = "IO-Async"; version = "0.75"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.75.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.75.tar.gz"; sha256 = "1mi6gfbl11rimvzgzyj8kiqf131cg1w9nwxi47fwm9sbs0x6rkjb"; }; propagatedBuildInputs = [ Future StructDumb ]; @@ -9292,7 +9332,7 @@ let pname = "IO-Capture"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REYNOLDS/IO-Capture-0.05.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REYNOLDS/IO-Capture-0.05.tar.gz"; sha256 = "c2c15a254ca74fb8c57d25d7b6cbcaff77a3b4fb5695423f1f80bb423abffea9"; }; meta = { @@ -9304,11 +9344,11 @@ let pname = "IO-CaptureOutput"; version = "1.1105"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/IO-CaptureOutput-1.1105.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/IO-CaptureOutput-1.1105.tar.gz"; sha256 = "ae99009fca1273800f169ecb82f4ed1cc6c76795f156bee5c0093005d572f487"; }; meta = { - homepage = https://github.com/dagolden/IO-CaptureOutput; + homepage = "https://github.com/dagolden/IO-CaptureOutput"; description = "Capture STDOUT and STDERR from Perl code, subprocesses or XS"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -9318,7 +9358,7 @@ let pname = "IO-Compress"; version = "2.093"; src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.093.tar.gz; + url = "mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.093.tar.gz"; sha256 = "5f8f5d06913f16c16759cc4e06749692208b8947910ffedd2c00a74ed0d60ba2"; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; @@ -9334,7 +9374,7 @@ let pname = "IO-Digest"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/C/CL/CLKAO/IO-Digest-0.11.tar.gz; + url = "mirror://cpan/authors/id/C/CL/CLKAO/IO-Digest-0.11.tar.gz"; sha256 = "14kz7z4xw179aya3116wxac29l4y2wmwrba087lya4v2gxdgiz4g"; }; propagatedBuildInputs = [ PerlIOviadynamic ]; @@ -9344,7 +9384,7 @@ let pname = "IO-HTML"; version = "1.001"; src = fetchurl { - url = mirror://cpan/authors/id/C/CJ/CJM/IO-HTML-1.001.tar.gz; + url = "mirror://cpan/authors/id/C/CJ/CJM/IO-HTML-1.001.tar.gz"; sha256 = "ea78d2d743794adc028bc9589538eb867174b4e165d7d8b5f63486e6b828e7e0"; }; meta = { @@ -9357,7 +9397,7 @@ let pname = "IO-Handle-Util"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/IO-Handle-Util-0.02.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/IO-Handle-Util-0.02.tar.gz"; sha256 = "1vncvsx53iiw1yy3drlk44hzx2pk5cial0h74djf9i6s2flndfcd"; }; propagatedBuildInputs = [ IOString SubExporter asa ]; @@ -9370,7 +9410,7 @@ let pname = "IO-Interactive"; version = "1.022"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/IO-Interactive-1.022.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/IO-Interactive-1.022.tar.gz"; sha256 = "0ed53b8ae93ae877e98e0d89b7b429e29ccd1ee4c28e952c4ea9aa73d01febdc"; }; meta = { @@ -9383,7 +9423,7 @@ let pname = "IO-LockedFile"; version = "0.23"; src = fetchurl { - url = mirror://cpan/authors/id/R/RA/RANI/IO-LockedFile-0.23.tar.gz; + url = "mirror://cpan/authors/id/R/RA/RANI/IO-LockedFile-0.23.tar.gz"; sha256 = "1dgq8zfkaszisdb5hz8jgcl0xc3qpv7bbv562l31xgpiddm7xnxi"; }; }; @@ -9392,7 +9432,7 @@ let pname = "IO-Multiplex"; version = "1.16"; src = fetchurl { - url = mirror://cpan/authors/id/B/BB/BBB/IO-Multiplex-1.16.tar.gz; + url = "mirror://cpan/authors/id/B/BB/BBB/IO-Multiplex-1.16.tar.gz"; sha256 = "74d22c44b5ad2e7190e2786e8a17d74bbf4cef89b4d1157ba33598b5a2720dad"; }; }; @@ -9401,7 +9441,7 @@ let version = "1.01"; pname = "IO-Pager"; src = fetchurl { - url = mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-1.01.tgz; + url = "mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-1.01.tgz"; sha256 = "19fslzb11wn8s9hwnwpnwymnw040nmychza2dpbbcqpgnk4k5zpa"; }; propagatedBuildInputs = [ pkgs.more FileWhich TermReadKey ]; # `more` used in tests @@ -9411,7 +9451,7 @@ let pname = "IO-Prompt"; version = "0.997004"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCONWAY/IO-Prompt-0.997004.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCONWAY/IO-Prompt-0.997004.tar.gz"; sha256 = "f17bb305ee6ac8b5b203e6d826eb940c4f3f6d6f4bfe719c3b3a225f46f58615"; }; propagatedBuildInputs = [ TermReadKey Want ]; @@ -9425,7 +9465,7 @@ let pname = "IO-SessionData"; version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/IO-SessionData-1.03.tar.gz; + url = "mirror://cpan/authors/id/P/PH/PHRED/IO-SessionData-1.03.tar.gz"; sha256 = "1p9d77pqy9a8dbgw7h7vmmkg0rlckk19dchd4c8gvcyv7qm73934"; }; outputs = [ "out" "dev" ]; # no "devdoc" @@ -9438,7 +9478,7 @@ let pname = "IO-Socket-INET6"; version = "2.72"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.72.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.72.tar.gz"; sha256 = "1fqypz6qa5rw2d5y2zq7f49frwra0aln13nhq5gi514j2zx21q45"; }; propagatedBuildInputs = [ Socket6 ]; @@ -9449,7 +9489,7 @@ let pname = "IO-Socket-SSL"; version = "2.066"; src = fetchurl { - url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.066.tar.gz; + url = "mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.066.tar.gz"; sha256 = "0d47064781a545304d5dcea5dfcee3acc2e95a32e1b4884d80505cde8ee6ebcd"; }; propagatedBuildInputs = [ MozillaCA NetSSLeay ]; @@ -9459,7 +9499,7 @@ let --replace "\$openssldir/cert.pem" "/etc/ssl/certs/ca-certificates.crt" ''; meta = { - homepage = https://github.com/noxxi/p5-io-socket-ssl; + homepage = "https://github.com/noxxi/p5-io-socket-ssl"; description = "Nearly transparent SSL encapsulation for IO::Socket::INET"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -9470,7 +9510,7 @@ let pname = "IO-Socket-Timeout"; version = "0.32"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAMS/IO-Socket-Timeout-0.32.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAMS/IO-Socket-Timeout-0.32.tar.gz"; sha256 = "edf915d6cc66bee43503aa6dc2b373366f38eaff701582183dad10cb8adf2972"; }; buildInputs = [ ModuleBuildTiny TestSharedFork TestTCP ]; @@ -9485,7 +9525,7 @@ let pname = "IO-String"; version = "1.08"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/IO-String-1.08.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/IO-String-1.08.tar.gz"; sha256 = "2a3f4ad8442d9070780e58ef43722d19d1ee21a803bf7c8206877a10482de5a0"; }; }; @@ -9494,7 +9534,7 @@ let pname = "IO-Stringy"; version = "2.113"; src = fetchurl { - url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/IO-Stringy-2.113.tar.gz; + url = "mirror://cpan/authors/id/C/CA/CAPOEIRAB/IO-Stringy-2.113.tar.gz"; sha256 = "0kpycb56l6ilvmdx9swx9wpj1x3vfnqdflfjd6dn6spnz750y8ji"; }; }; @@ -9503,7 +9543,7 @@ let pname = "IO-Tee"; version = "0.65"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/IO-Tee-0.65.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/IO-Tee-0.65.tar.gz"; sha256 = "04hc94fk6qlazrarcznw2d8wiqw289js4za0czw65296kc8csgf6"; }; }; @@ -9512,11 +9552,11 @@ let pname = "IO-TieCombine"; version = "1.005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/IO-TieCombine-1.005.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/IO-TieCombine-1.005.tar.gz"; sha256 = "1bv9ampayf4bvyxg4ivy18l8k79jvq55x6gl68b2fg8b62w4sba0"; }; meta = { - homepage = https://github.com/rjbs/io-tiecombine; + homepage = "https://github.com/rjbs/io-tiecombine"; description = "Produce tied (and other) separate but combined variables"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -9526,7 +9566,7 @@ let pname = "IO-Tty"; version = "1.14"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-1.14.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-1.14.tar.gz"; sha256 = "1dcmxdhrapxvvzlfp6yzz7655f3c6x8jrw0md8ndp2qj27iy9wsi"; }; doCheck = !stdenv.isDarwin; # openpty fails in the sandbox @@ -9536,7 +9576,7 @@ let pname = "IP-Country"; version = "2.28"; src = fetchurl { - url = mirror://cpan/authors/id/N/NW/NWETTERS/IP-Country-2.28.tar.gz; + url = "mirror://cpan/authors/id/N/NW/NWETTERS/IP-Country-2.28.tar.gz"; sha256 = "88db833a5ab22ed06cb53d6f205725e3b5371b254596053738885e91fa105f75"; }; propagatedBuildInputs = [ GeographyCountries ]; @@ -9550,7 +9590,7 @@ let pname = "Geography-Countries"; version = "2009041301"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABIGAIL/Geography-Countries-2009041301.tar.gz; + url = "mirror://cpan/authors/id/A/AB/ABIGAIL/Geography-Countries-2009041301.tar.gz"; sha256 = "48c42e40e8281ba7c981743a854c48e6def2d51eb0925ea6c96e25c74497f20f"; }; meta = { @@ -9564,7 +9604,7 @@ let pname = "IPC-Run"; version = "20180523.0"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20180523.0.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20180523.0.tar.gz"; sha256 = "0bvckcs1629ifqfb68xkapd4a74fd5qbg6z9qs8i6rx4z3nxfl1q"; }; doCheck = false; /* attempts a network connection to localhost */ @@ -9580,7 +9620,7 @@ let pname = "IPC-Run3"; version = "0.048"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/IPC-Run3-0.048.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/IPC-Run3-0.048.tar.gz"; sha256 = "0r9m8q78bg7yycpixd7738jm40yz71p2q7inm766kzsw3g6c709x"; }; }; @@ -9589,7 +9629,7 @@ let pname = "IPC-ShareLite"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDYA/IPC-ShareLite-0.17.tar.gz; + url = "mirror://cpan/authors/id/A/AN/ANDYA/IPC-ShareLite-0.17.tar.gz"; sha256 = "1gz7dbwxrzbzdsjv11kb49jlf9q6lci2va6is0hnavd93nwhdm0l"; }; }; @@ -9598,7 +9638,7 @@ let pname = "IPC-System-Simple"; version = "1.26"; src = fetchurl { - url = mirror://cpan/authors/id/J/JK/JKEENAN/IPC-System-Simple-1.26.tar.gz; + url = "mirror://cpan/authors/id/J/JK/JKEENAN/IPC-System-Simple-1.26.tar.gz"; sha256 = "57177f21d8e8625bba32ea454f10a1fda16f93c1baf1aa80d106ab1951b465fd"; }; meta = { @@ -9611,7 +9651,7 @@ let pname = "IPC-SysV"; version = "2.07"; src = fetchurl { - url = mirror://cpan/authors/id/M/MH/MHX/IPC-SysV-2.07.tar.gz; + url = "mirror://cpan/authors/id/M/MH/MHX/IPC-SysV-2.07.tar.gz"; sha256 = "d01a367af771d35e3b11a21366ad6405f8d28e8cbca4c0cf08ab78bf157d052d"; }; meta = { @@ -9661,12 +9701,12 @@ let pname = "Inline"; version = "0.83"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/Inline-0.83.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TINITA/Inline-0.83.tar.gz"; sha256 = "171a8e5f66faf88fe5ef4de7126267cd8fb2503483432eabc3b88ac7d5be4239"; }; buildInputs = [ TestWarn ]; meta = { - homepage = https://github.com/ingydotnet/inline-pm; + homepage = "https://github.com/ingydotnet/inline-pm"; description = "Write Perl Subroutines in Other Programming Languages"; longDescription = '' The Inline module allows you to put source code from other @@ -9682,7 +9722,7 @@ let pname = "Inline-C"; version = "0.81"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/Inline-C-0.81.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TINITA/Inline-C-0.81.tar.gz"; sha256 = "f185258d9050d7f79b4f00f12625cc469c2f700ff62d3e831cb18d80d2c87aac"; }; buildInputs = [ FileCopyRecursive TestWarn YAMLLibYAML ]; @@ -9693,7 +9733,7 @@ let rm -f t/28autowrap.t ''; meta = { - homepage = https://github.com/ingydotnet/inline-c-pm; + homepage = "https://github.com/ingydotnet/inline-c-pm"; description = "C Language Support for Inline"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -9704,7 +9744,7 @@ let version = "0.66"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETJ/Inline-Java-0.66.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETJ/Inline-Java-0.66.tar.gz"; sha256 = "0j6r6gxdn3wzx36cgcx4znj4ihp5fjl4gzk1623vvwgnwrlf0hy7"; }; @@ -9734,7 +9774,7 @@ let pname = "IPC-Signal"; version = "1.00"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROSCH/IPC-Signal-1.00.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROSCH/IPC-Signal-1.00.tar.gz"; sha256 = "1l3g0zrcwf2whwjhbpwdcridb7c77mydwxvfykqg1h6hqb4gj8bw"; }; }; @@ -9743,7 +9783,7 @@ let pname = "JavaScript-Minifier-XS"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.11.tar.gz; + url = "mirror://cpan/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.11.tar.gz"; sha256 = "1vlyhckpjbrg2v4dy9szsxxl0q44n0y1xl763mg2y2ym9g5144hm"; }; perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' @@ -9757,7 +9797,7 @@ let pname = "JavaScript-Value-Escape"; version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/JavaScript-Value-Escape-0.07.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/JavaScript-Value-Escape-0.07.tar.gz"; sha256 = "1p5365lvnax8kbcfrj169lx05af3i3qi5wg5x9mizqgd10vxmjws"; }; meta = { @@ -9771,7 +9811,7 @@ let pname = "JSON"; version = "4.02"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-4.02.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-4.02.tar.gz"; sha256 = "0z32x2lijij28c9fhmzgxc41i9nw24fyvd2a8ajs5zw9b9sqhjj4"; }; # Do not abort cross-compilation on failure to load native JSON module into host perl @@ -9789,7 +9829,7 @@ let pname = "JSON-Any"; version = "1.39"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/JSON-Any-1.39.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/JSON-Any-1.39.tar.gz"; sha256 = "1hspg6khjb38syn59cysnapc1q77qgavfym3fqr6l2kiydf7ajdf"; }; meta = { @@ -9803,7 +9843,7 @@ let pname = "JSON-MaybeXS"; version = "1.004000"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/JSON-MaybeXS-1.004000.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/JSON-MaybeXS-1.004000.tar.gz"; sha256 = "09m1w03as6n0a00pzvaldkhm494yaf5n0g3j2cwwfx24iwpa1gar"; }; meta = { @@ -9816,7 +9856,7 @@ let pname = "JSON-PP"; version = "4.04"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.04.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.04.tar.gz"; sha256 = "0smna2b8h9jlzlbfb64i31vabyqyjs3iwhng0f0byjxrsxb1qcc1"; }; meta = { @@ -9829,7 +9869,7 @@ let pname = "JSON-PP-Compat5006"; version = "1.09"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-Compat5006-1.09.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-Compat5006-1.09.tar.gz"; sha256 = "197030df52635f9bbe25af10742eea5bd74971473118c11311fcabcb62e3716a"; }; meta = { @@ -9842,7 +9882,7 @@ let pname = "JSON-Parse"; version = "0.55"; src = fetchurl { - url = mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.55.tar.gz; + url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.55.tar.gz"; sha256 = "0mnjypkiga8zdxr5kbd7sf49pcbn55ivndn01p5ln4amqgdmd66w"; }; meta = { @@ -9872,13 +9912,13 @@ let pname = "JSON-WebToken"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAICRON/JSON-WebToken-0.10.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAICRON/JSON-WebToken-0.10.tar.gz"; sha256 = "77c182a98528f1714d82afc548d5b3b4dc93e67069128bb9b9413f24cf07248b"; }; buildInputs = [ TestMockGuard TestRequires ]; propagatedBuildInputs = [ JSON ModuleRuntime ]; meta = { - homepage = https://github.com/xaicron/p5-JSON-WebToken; + homepage = "https://github.com/xaicron/p5-JSON-WebToken"; description = "JSON Web Token (JWT) implementation"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -9888,7 +9928,7 @@ let pname = "JSON-XS"; version = "4.02"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.02.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.02.tar.gz"; sha256 = "05ngmpc0smlfzgyhyagd5gza8g93r8hik858kmr186h770higbd5"; }; propagatedBuildInputs = [ TypesSerialiser ]; @@ -9899,7 +9939,7 @@ let pname = "JSON-XS-VersionOneAndTwo"; version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/L/LB/LBROCARD/JSON-XS-VersionOneAndTwo-0.31.tar.gz; + url = "mirror://cpan/authors/id/L/LB/LBROCARD/JSON-XS-VersionOneAndTwo-0.31.tar.gz"; sha256 = "e6092c4d961fae777acf7fe99fb3cd6e5b710fec85765a6b90417480e4c94a34"; }; propagatedBuildInputs = [ JSONXS ]; @@ -9912,7 +9952,7 @@ let version = "0.21"; pname = "Object-Realize-Later"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/Object-Realize-Later-0.21.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKOV/Object-Realize-Later-0.21.tar.gz"; sha256 = "1nfqssld7pcdw9sj4mkfnh75w51wl14i1h7npj9fld4fri09cywg"; }; }; @@ -9943,7 +9983,7 @@ let pname = "libapreq2"; version = "2.13"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISAAC/libapreq2-2.13.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISAAC/libapreq2-2.13.tar.gz"; sha256 = "5731e6833b32d88e4a5c690e45ddf20fcf969ce3da666c5627d775e92da0cf6e"; }; patches = [ @@ -10001,7 +10041,7 @@ let pname = "libintl-perl"; version = "1.31"; src = fetchurl { - url = mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.31.tar.gz; + url = "mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.31.tar.gz"; sha256 = "1afandrl44mq9c32r57xr489gkfswdgc97h8x86k98dz1byv3l6a"; }; }; @@ -10010,7 +10050,7 @@ let pname = "libnet"; version = "3.11"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHAY/libnet-3.11.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHAY/libnet-3.11.tar.gz"; sha256 = "1lsj3a2vbryh85mbb6yddyb2zjv5vs88fdj5x3v7fp2ndr6ixarg"; }; meta = { @@ -10023,7 +10063,7 @@ let pname = "lib-relative"; version = "1.000"; src = fetchurl { - url = mirror://cpan/authors/id/D/DB/DBOOK/lib-relative-1.000.tar.gz; + url = "mirror://cpan/authors/id/D/DB/DBOOK/lib-relative-1.000.tar.gz"; sha256 = "1mvcdl87d3kyrdx4y6x79k3n5qdd1x5m1hp8lwjxvgfqbw0cgq6z"; }; meta = { @@ -10037,7 +10077,7 @@ let pname = "libxml-perl"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/K/KM/KMACLEOD/libxml-perl-0.08.tar.gz; + url = "mirror://cpan/authors/id/K/KM/KMACLEOD/libxml-perl-0.08.tar.gz"; sha256 = "1jy9af0ljyzj7wakqli0437zb2vrbplqj4xhab7bfj2xgfdhawa5"; }; propagatedBuildInputs = [ XMLParser ]; @@ -10047,12 +10087,12 @@ let pname = "Lingua-EN-FindNumber"; version = "1.32"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-EN-FindNumber-1.32.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Lingua-EN-FindNumber-1.32.tar.gz"; sha256 = "1d176d1c863fb9844bd19d2c2a4e68a0ed73da158f724a89405b90db7e8dbd04"; }; propagatedBuildInputs = [ LinguaENWords2Nums ]; meta = { - homepage = https://github.com/neilbowers/Lingua-EN-FindNumber; + homepage = "https://github.com/neilbowers/Lingua-EN-FindNumber"; description = "Locate (written) numbers in English text"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -10062,7 +10102,7 @@ let pname = "Lingua-EN-Inflect"; version = "1.904"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.904.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.904.tar.gz"; sha256 = "54d344884ba9b585680975bbd4049ddbf27bf654446fb00c7e1fc538e08c3173"; }; meta = { @@ -10075,12 +10115,12 @@ let pname = "Lingua-EN-Inflect-Number"; version = "1.12"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-EN-Inflect-Number-1.12.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Lingua-EN-Inflect-Number-1.12.tar.gz"; sha256 = "66fb33838512746f5c597e80264fea66643f7f26570ec2f9205b6135ad67acbf"; }; propagatedBuildInputs = [ LinguaENInflect ]; meta = { - homepage = https://github.com/neilbowers/Lingua-EN-Inflect-Number; + homepage = "https://github.com/neilbowers/Lingua-EN-Inflect-Number"; description = "Force number of words to singular or plural"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -10090,7 +10130,7 @@ let pname = "Lingua-EN-Inflect-Phrase"; version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/Lingua-EN-Inflect-Phrase-0.20.tar.gz; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/Lingua-EN-Inflect-Phrase-0.20.tar.gz"; sha256 = "55058911a99f1755de3eb449a99ffbeb92d88c01ff5dc60511a24679050ddea8"; }; buildInputs = [ TestNoWarnings ]; @@ -10105,7 +10145,7 @@ let pname = "Lingua-EN-Number-IsOrdinal"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/Lingua-EN-Number-IsOrdinal-0.05.tar.gz; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/Lingua-EN-Number-IsOrdinal-0.05.tar.gz"; sha256 = "28d5695400c0f4e2bd209793cb74f6da2b9257356aacb2947c603425e09618d6"; }; buildInputs = [ TestFatal TryTiny ]; @@ -10120,7 +10160,7 @@ let pname = "Lingua-EN-Tagger"; version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.31.tar.gz; + url = "mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.31.tar.gz"; sha256 = "14z9fbl3mf6lxhp0v2apdlxy1fw1y07j4ydrjsh7p3w0wj3qr7ll"; }; propagatedBuildInputs = [ HTMLParser LinguaStem MemoizeExpireLRU ]; @@ -10134,7 +10174,7 @@ let pname = "Lingua-EN-Words2Nums"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/J/JO/JOEY/Lingua-EN-Words2Nums-0.18.tar.gz; + url = "mirror://cpan/authors/id/J/JO/JOEY/Lingua-EN-Words2Nums-0.18.tar.gz"; sha256 = "686556797cd2a4eaa066f19bbf03ab25c06278292c9ead2f187dfd9031ea1d85"; }; meta = { @@ -10146,7 +10186,7 @@ let pname = "Lingua-PT-Stemmer"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-PT-Stemmer-0.02.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Lingua-PT-Stemmer-0.02.tar.gz"; sha256 = "17c48sfbgwd2ivlgf59sr6jdhwa3aim8750f8pyzz7xpi8gz0var"; }; meta = { @@ -10160,7 +10200,7 @@ let pname = "Lingua-Stem"; version = "0.84"; src = fetchurl { - url = mirror://cpan/authors/id/S/SN/SNOWHARE/Lingua-Stem-0.84.tar.gz; + url = "mirror://cpan/authors/id/S/SN/SNOWHARE/Lingua-Stem-0.84.tar.gz"; sha256 = "12avh2mnnc7llmmshrr5bgb473fvydxnlqrqbl2815mf2dp4pxcg"; }; doCheck = false; @@ -10171,7 +10211,7 @@ let pname = "Lingua-Stem-Fr"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/S/SD/SDP/Lingua-Stem-Fr-0.02.tar.gz; + url = "mirror://cpan/authors/id/S/SD/SDP/Lingua-Stem-Fr-0.02.tar.gz"; sha256 = "0vyrspwzaqjxm5mqshf4wvwa3938mkajd1918d9ii2l9m2rn8kwx"; }; meta = { @@ -10182,7 +10222,7 @@ let pname = "Lingua-Stem-It"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/A/AC/ACALPINI/Lingua-Stem-It-0.02.tar.gz; + url = "mirror://cpan/authors/id/A/AC/ACALPINI/Lingua-Stem-It-0.02.tar.gz"; sha256 = "1207r183s5hlh4mfwa6p46vzm0dhvrs2dnss5s41a0gyfkxp7riq"; }; meta = { @@ -10193,7 +10233,7 @@ let pname = "Lingua-Stem-Ru"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-Stem-Ru-0.04.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Lingua-Stem-Ru-0.04.tar.gz"; sha256 = "0a2jmdz7jn32qj5hyiw5kbv8fvlpmws8i00a6xcbkzb48yvwww0j"; }; meta = { @@ -10207,7 +10247,7 @@ let pname = "Lingua-Stem-Snowball-Da"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/C/CI/CINE/Lingua-Stem-Snowball-Da-1.01.tar.gz; + url = "mirror://cpan/authors/id/C/CI/CINE/Lingua-Stem-Snowball-Da-1.01.tar.gz"; sha256 = "0mm0m7glm1s6i9f6a78jslw6wh573208arxhq93yriqmw17bwf9f"; }; meta = { @@ -10218,7 +10258,7 @@ let pname = "Lingua-Translit"; version = "0.28"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALINKE/Lingua-Translit-0.28.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALINKE/Lingua-Translit-0.28.tar.gz"; sha256 = "113f91d8fc2c630437153a49fb7a52b023af8f6278ed96c070b1f60824b8eae1"; }; doCheck = false; @@ -10228,7 +10268,7 @@ let pname = "Linux-ACL"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/N/NA/NAZAROV/Linux-ACL-0.05.tar.gz; + url = "mirror://cpan/authors/id/N/NA/NAZAROV/Linux-ACL-0.05.tar.gz"; sha256 = "312940c1f60f47c4fc93fa0a9d2a626425faa837040c8c2f1ad58ee09f62f371"; }; buildInputs = [ pkgs.acl ]; @@ -10244,11 +10284,11 @@ let pname = "Linux-DesktopFiles"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/T/TR/TRIZEN/Linux-DesktopFiles-0.25.tar.gz; + url = "mirror://cpan/authors/id/T/TR/TRIZEN/Linux-DesktopFiles-0.25.tar.gz"; sha256 = "60377a74fba90fa465200ee1c7430dbdde69d454d85f9ee101c039803a07e5f5"; }; meta = { - homepage = https://github.com/trizen/Linux-DesktopFiles; + homepage = "https://github.com/trizen/Linux-DesktopFiles"; description = "Fast parsing of the Linux desktop files"; license = stdenv.lib.licenses.artistic2; }; @@ -10258,7 +10298,7 @@ let pname = "Linux-Distribution"; version = "0.23"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHORNY/Linux-Distribution-0.23.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHORNY/Linux-Distribution-0.23.tar.gz"; sha256 = "603e27da607b3e872a669d7a66d75982f0969153eab2d4b20c341347b4ebda5f"; }; # The tests fail if the distro it's built on isn't in the supported list. @@ -10274,7 +10314,7 @@ let pname = "Linux-FD"; version = "0.011"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Linux-FD-0.011.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/Linux-FD-0.011.tar.gz"; sha256 = "6bb579d47644cb0ed35626ff77e909ae69063073c6ac09aa0614fef00fa37356"; }; buildInputs = [ TestException ]; @@ -10290,7 +10330,7 @@ let pname = "Linux-Inotify2"; version = "2.2"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Linux-Inotify2-2.2.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Linux-Inotify2-2.2.tar.gz"; sha256 = "0crlxmaa4lsgdjm5p9ib8rdxiy70qj1s68za3q3v57v8ll6s4hfx"; }; propagatedBuildInputs = [ commonsense ]; @@ -10300,7 +10340,7 @@ let pname = "List-AllUtils"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.15.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.15.tar.gz"; sha256 = "3711fac729321d3aad8356a756fd9272094f227aa048866a3751f9d8ea6cc95d"; }; propagatedBuildInputs = [ ListSomeUtils ListUtilsBy ]; @@ -10314,7 +10354,7 @@ let pname = "List-BinarySearch"; version = "0.25"; src = pkgs.fetchurl { - url = mirror://cpan/authors/id/D/DA/DAVIDO/List-BinarySearch-0.25.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAVIDO/List-BinarySearch-0.25.tar.gz"; sha256 = "0ap8y9rsjxg75887klgij90mf459f8dwy0dbx1g06h30pmqk04f8"; }; }; @@ -10323,12 +10363,12 @@ let pname = "List-Compare"; version = "0.53"; src = fetchurl { - url = mirror://cpan/authors/id/J/JK/JKEENAN/List-Compare-0.53.tar.gz; + url = "mirror://cpan/authors/id/J/JK/JKEENAN/List-Compare-0.53.tar.gz"; sha256 = "fdbf4ff67b3135d44475fef7fcac0cd4706407d5720d26dca914860eb10f8550"; }; buildInputs = [ IOCaptureOutput ]; meta = { - homepage = http://thenceforward.net/perl/modules/List-Compare/; + homepage = "http://thenceforward.net/perl/modules/List-Compare/"; description = "Compare elements of two or more lists"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -10338,7 +10378,7 @@ let pname = "List-MoreUtils"; version = "0.428"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-0.428.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-0.428.tar.gz"; sha256 = "713e0945d5f16e62d81d5f3da2b6a7b14a4ce439f6d3a7de74df1fd166476cc2"; }; propagatedBuildInputs = [ ExporterTiny ListMoreUtilsXS ]; @@ -10353,7 +10393,7 @@ let pname = "List-MoreUtils-XS"; version = "0.428"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.428.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.428.tar.gz"; sha256 = "0bfndmnkqaaf3gffprak143bzplxd69c368jxgr7rzlx88hyd7wx"; }; preConfigure = '' @@ -10369,7 +10409,7 @@ let pname = "List-SomeUtils"; version = "0.58"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/List-SomeUtils-0.58.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/List-SomeUtils-0.58.tar.gz"; sha256 = "96eafb359339d22bf2a2de421298847a3c40f6a28b6d44005d0965da86a5469d"; }; buildInputs = [ TestLeakTrace ]; @@ -10384,7 +10424,7 @@ let pname = "List-UtilsBy"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.11.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.11.tar.gz"; sha256 = "0nkpylkqccxanr8wc7j9wg6jdrizybjjd6p8q3jbh7f29cxz9pgs"; }; }; @@ -10393,7 +10433,7 @@ let pname = "Locale-Codes"; version = "3.62"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.62.tar.gz; + url = "mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.62.tar.gz"; sha256 = "11a6d343e9c321d8ee9eee4479954a4e9c1ff2145187e74fd64952092f9dfab7"; }; meta = { @@ -10408,7 +10448,7 @@ let version = "1.07"; buildInputs = [ pkgs.gettext ]; src = fetchurl { - url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.07.tar.gz; + url = "mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.07.tar.gz"; sha256 = "05cwqjxxary11di03gg3fm6j9lbvg1dr2wpr311c1rwp8salg7ch"; }; LANG="C"; @@ -10418,7 +10458,7 @@ let pname = "Locale-MO-File"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-MO-File-0.09.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-MO-File-0.09.tar.gz"; sha256 = "0gsaaqimsh5bdhns2v67j1nvb178hx2536lxmr971cwxy31ns0wp"; }; propagatedBuildInputs = [ ConstFast MooXStrictConstructor MooXTypesMooseLike ParamsValidate namespaceautoclean ]; @@ -10433,7 +10473,7 @@ let pname = "Locale-Maketext-Fuzzy"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/A/AU/AUDREYT/Locale-Maketext-Fuzzy-0.11.tar.gz; + url = "mirror://cpan/authors/id/A/AU/AUDREYT/Locale-Maketext-Fuzzy-0.11.tar.gz"; sha256 = "3785171ceb78cc7671319a3a6d8ced9b190e097dfcd9b2a9ebc804cd1a282f96"; }; meta = { @@ -10446,7 +10486,7 @@ let pname = "Locale-Maketext-Lexicon"; version = "1.00"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DRTECH/Locale-Maketext-Lexicon-1.00.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DRTECH/Locale-Maketext-Lexicon-1.00.tar.gz"; sha256 = "b73f6b04a58d3f0e38ebf2115a4c1532f1a4eef6fac5c6a2a449e4e14c1ddc7c"; }; meta = { @@ -10459,7 +10499,7 @@ let pname = "Locale-Msgfmt"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/A/AZ/AZAWAWI/Locale-Msgfmt-0.15.tar.gz; + url = "mirror://cpan/authors/id/A/AZ/AZAWAWI/Locale-Msgfmt-0.15.tar.gz"; sha256 = "c3276831cbeecf58be02081bcc180bd348daa35da21a7737b7b038a59f643ab4"; }; meta = { @@ -10472,7 +10512,7 @@ let pname = "Locale-PO"; version = "0.27"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/COSIMO/Locale-PO-0.27.tar.gz; + url = "mirror://cpan/authors/id/C/CO/COSIMO/Locale-PO-0.27.tar.gz"; sha256 = "3c994a4b63e6e4e836c6f79a93f51921cab77c90c9753fe0f8b5429220d516b9"; }; propagatedBuildInputs = [ FileSlurp ]; @@ -10485,7 +10525,7 @@ let pname = "Locale-TextDomain-OO"; version = "1.036"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-1.036.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-1.036.tar.gz"; sha256 = "0f0fajq4k1sgyywsb7qypsf6xa1sxjx4agm8l8z2284nm3hq65xm"; }; propagatedBuildInputs = [ ClassLoad Clone JSON LocaleMOFile LocalePO LocaleTextDomainOOUtil LocaleUtilsPlaceholderBabelFish LocaleUtilsPlaceholderMaketext LocaleUtilsPlaceholderNamed MooXSingleton PathTiny TieSub ]; @@ -10500,7 +10540,7 @@ let pname = "Locale-TextDomain-OO-Util"; version = "4.002"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-Util-4.002.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-Util-4.002.tar.gz"; sha256 = "1826pl11vr9p7zv7vqs7kcd8y5218086l90dw8lw0xzdcmzs0prw"; }; propagatedBuildInputs = [ namespaceautoclean ]; @@ -10515,7 +10555,7 @@ let pname = "Locale-Utils-PlaceholderBabelFish"; version = "0.006"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderBabelFish-0.006.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderBabelFish-0.006.tar.gz"; sha256 = "1k54njj8xz19c8bjb0iln1mnfq55j3pvbff7samyrab3k59h071f"; }; propagatedBuildInputs = [ HTMLParser MooXStrictConstructor MooXTypesMooseLike namespaceautoclean ]; @@ -10530,7 +10570,7 @@ let pname = "Locale-Utils-PlaceholderMaketext"; version = "1.005"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderMaketext-1.005.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderMaketext-1.005.tar.gz"; sha256 = "1srlbp8sfnzhndgh9s4d8bglpzw0vb8gnab9r8r8sggkv15n0a2h"; }; propagatedBuildInputs = [ MooXStrictConstructor MooXTypesMooseLike namespaceautoclean ]; @@ -10545,7 +10585,7 @@ let pname = "Locale-Utils-PlaceholderNamed"; version = "1.004"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderNamed-1.004.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderNamed-1.004.tar.gz"; sha256 = "1gd68lm5w5c6ndcilx91rn84zviqyrk3fx92jjx5khxm76i8xmvg"; }; propagatedBuildInputs = [ MooXStrictConstructor MooXTypesMooseLike namespaceautoclean ]; @@ -10560,7 +10600,7 @@ let pname = "local-lib"; version = "2.000024"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/local-lib-2.000024.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/local-lib-2.000024.tar.gz"; sha256 = "01cav7m6qc1x96wna1viiw6n212f94ks7cik4vj1a1lasixr36rf"; }; meta = { @@ -10583,13 +10623,13 @@ let pname = "Log-Any"; version = "1.708"; src = fetchurl { - url = mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-1.708.tar.gz; + url = "mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-1.708.tar.gz"; sha256 = "e1407759dc9462ab096d4ddc89feaac8abb341c5429e38cf6f7b8a996a35ecd9"; }; # Syslog test fails. preCheck = "rm t/syslog.t"; meta = { - homepage = https://github.com/preaction/Log-Any; + homepage = "https://github.com/preaction/Log-Any"; description = "Bringing loggers and listeners together"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -10599,7 +10639,7 @@ let pname = "Log-Any-Adapter-Log4perl"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-Adapter-Log4perl-0.09.tar.gz; + url = "mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-Adapter-Log4perl-0.09.tar.gz"; sha256 = "19f1drqnzr6g4xwjm6jk4iaa3zmiax8bzxqch04f4jr12bjd75qi"; }; propagatedBuildInputs = [ LogAny LogLog4perl ]; @@ -10614,13 +10654,13 @@ let pname = "Log-Contextual"; version = "0.008001"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/Log-Contextual-0.008001.tar.gz; + url = "mirror://cpan/authors/id/F/FR/FREW/Log-Contextual-0.008001.tar.gz"; sha256 = "b93cbcfbb8796d51c836e3b00243cda5630808c152c14eee5f20ca09c9451993"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ DataDumperConcise ExporterDeclare Moo ]; meta = { - homepage = https://github.com/frioux/Log-Contextual; + homepage = "https://github.com/frioux/Log-Contextual"; description = "Simple logging interface with a contextual log"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -10630,7 +10670,7 @@ let pname = "Log-Dispatch"; version = "2.69"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.69.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.69.tar.gz"; sha256 = "0xsjb0j3dzs8ym8jbgi29kia4pz5vl8jzkmpxxrhhqjc1h54qqjq"; }; propagatedBuildInputs = [ DevelGlobalDestruction ParamsValidationCompiler Specio namespaceautoclean ]; @@ -10660,7 +10700,7 @@ let pname = "Log-Handler"; version = "0.88"; src = fetchurl { - url = mirror://cpan/authors/id/B/BL/BLOONIX/Log-Handler-0.88.tar.gz; + url = "mirror://cpan/authors/id/B/BL/BLOONIX/Log-Handler-0.88.tar.gz"; sha256 = "45bf540ab2138ed3ff93afc205b0516dc75755b86acdcc5e75c41347833c293d"; }; propagatedBuildInputs = [ ParamsValidate ]; @@ -10674,7 +10714,7 @@ let pname = "Log-Message"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Log-Message-0.08.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Log-Message-0.08.tar.gz"; sha256 = "bd697dd62aaf26d118e9f0a0813429deb1c544e4501559879b61fcbdfe99fe46"; }; meta = { @@ -10687,7 +10727,7 @@ let pname = "Log-Message-Simple"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Log-Message-Simple-0.10.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Log-Message-Simple-0.10.tar.gz"; sha256 = "15nxi935nfrf8dkdrgvcrf2qlai4pbz03yj8sja0n9mcq2jd24ma"; }; propagatedBuildInputs = [ LogMessage ]; @@ -10701,7 +10741,7 @@ let pname = "Log-Trace"; version = "1.070"; src = fetchurl { - url = mirror://cpan/authors/id/B/BB/BBC/Log-Trace-1.070.tar.gz; + url = "mirror://cpan/authors/id/B/BB/BBC/Log-Trace-1.070.tar.gz"; sha256 = "1qrnxn9b05cqyw1286djllnj8wzys10754glxx6z5hihxxc85jwy"; }; }; @@ -10710,7 +10750,7 @@ let pname = "MCE"; version = "1.865"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.865.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.865.tar.gz"; sha256 = "1fhrc0mig5rzywz3lki0gkpvm9l9693cwaljzwxkprdkxnvk709c"; }; meta = { @@ -10724,11 +10764,11 @@ let pname = "Log-Log4perl"; version = "1.49"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHILLI/Log-Log4perl-1.49.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHILLI/Log-Log4perl-1.49.tar.gz"; sha256 = "b739187f519146cb6bebcfc427c64b1f4138b35c5f4c96f46a21ed4a43872e16"; }; meta = { - homepage = https://mschilli.github.io/log4perl/; + homepage = "https://mschilli.github.io/log4perl/"; description = "Log4j implementation for Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -10738,13 +10778,13 @@ let pname = "Log-Dispatch-Array"; version = "1.003"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatch-Array-1.003.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatch-Array-1.003.tar.gz"; sha256 = "0dvzp0gsh17jqg02460ndchyapr1haahndq1p9v6mwkv5wf9680c"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ LogDispatch ]; meta = { - homepage = https://github.com/rjbs/log-dispatch-array; + homepage = "https://github.com/rjbs/log-dispatch-array"; description = "Log events to an array (reference)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -10754,13 +10794,13 @@ let pname = "Log-Dispatchouli"; version = "2.019"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-2.019.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-2.019.tar.gz"; sha256 = "fe8890c553c8f72b8b55633067270862c34db2ab8ff1cf8db0855f0427c23442"; }; buildInputs = [ TestDeep TestFatal ]; propagatedBuildInputs = [ LogDispatchArray StringFlogger SubExporterGlobExporter ]; meta = { - homepage = https://github.com/rjbs/Log-Dispatchouli; + homepage = "https://github.com/rjbs/Log-Dispatchouli"; description = "A simple wrapper around Log::Dispatch"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -10788,7 +10828,7 @@ let pname = "Log-LogLite"; version = "0.82"; src = fetchurl { - url = mirror://cpan/authors/id/R/RA/RANI/Log-LogLite-0.82.tar.gz; + url = "mirror://cpan/authors/id/R/RA/RANI/Log-LogLite-0.82.tar.gz"; sha256 = "0sqsa4750wvhw4cjmxpxqg30i1jjcddadccflisrdb23qn5zn285"; }; propagatedBuildInputs = [ IOLockedFile ]; @@ -10802,7 +10842,7 @@ let pname = "libwww-perl"; version = "6.43"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.43.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.43.tar.gz"; sha256 = "e9849d7ee6fd0e89cc999e63d7612c951afd6aeea6bc721b767870d9df4ac40d"; }; propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; @@ -10822,7 +10862,7 @@ let pname = "LWP-Authen-OAuth"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TIMBRODY/LWP-Authen-OAuth-1.02.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TIMBRODY/LWP-Authen-OAuth-1.02.tar.gz"; sha256 = "e78e0bd7de8002cfb4760073258d555ef55b2c27c07a94b3d8a2166a17fd96bc"; }; propagatedBuildInputs = [ LWP ]; @@ -10836,7 +10876,7 @@ let pname = "LWP-MediaTypes"; version = "6.04"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/LWP-MediaTypes-6.04.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/LWP-MediaTypes-6.04.tar.gz"; sha256 = "1n8rg6csv3dsvymg06cmxipimr6cb1g9r903ghm1qsmiv89cl6wg"; }; meta = { @@ -10850,7 +10890,7 @@ let pname = "LWP-Protocol-connect"; version = "6.09"; src = fetchurl { - url = mirror://cpan/authors/id/B/BE/BENNING/LWP-Protocol-connect-6.09.tar.gz; + url = "mirror://cpan/authors/id/B/BE/BENNING/LWP-Protocol-connect-6.09.tar.gz"; sha256 = "9f252394775e23aa42c3176611e5930638ab528d5190110b4731aa5b0bf35a15"; }; buildInputs = [ TestException ]; @@ -10865,7 +10905,7 @@ let pname = "LWP-Protocol-https"; version = "6.07"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.07.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.07.tar.gz"; sha256 = "1rxrpwylfw1afah0nk96kgkwjbl2p1a7lwx50iipg8c4rx3cjb2j"; }; patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ]; @@ -10882,7 +10922,7 @@ let pname = "LWP-Protocol-http10"; version = "6.03"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/LWP-Protocol-http10-6.03.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/LWP-Protocol-http10-6.03.tar.gz"; sha256 = "1lxq40qfwfai9ryhzhsdnycc4189c8kfl43rf7qq34fmz48skzzk"; }; propagatedBuildInputs = [ LWP ]; @@ -10896,7 +10936,7 @@ let pname = "LWP-UserAgent-DNS-Hosts"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MASAKI/LWP-UserAgent-DNS-Hosts-0.13.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MASAKI/LWP-UserAgent-DNS-Hosts-0.13.tar.gz"; sha256 = "0piwcsb0m1xpzxbakhr9zq45a9hq3rx7s55lrjg66nd4x5n7xs5y"; }; propagatedBuildInputs = [ LWP ScopeGuard ]; @@ -10912,7 +10952,7 @@ let pname = "LWP-UserAgent-Determined"; version = "1.07"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/LWP-UserAgent-Determined-1.07.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXMV/LWP-UserAgent-Determined-1.07.tar.gz"; sha256 = "06d8d50e8cd3692a11cb4fb44a2f84e5476a98f0e2e6a4a0dfce9f67e55ddb53"; }; propagatedBuildInputs = [ LWP ]; @@ -10925,7 +10965,7 @@ let pname = "LWP-UserAgent-Mockable"; version = "1.18"; src = fetchurl { - url = mirror://cpan/authors/id/M/MJ/MJEMMESON/LWP-UserAgent-Mockable-1.18.tar.gz; + url = "mirror://cpan/authors/id/M/MJ/MJEMMESON/LWP-UserAgent-Mockable-1.18.tar.gz"; sha256 = "0923ahl22c0gdzrihj7dqnrawia9hmcl462asf4ry8d5wd84z1i5"; }; propagatedBuildInputs = [ HookLexWrap LWP SafeIsa ]; @@ -10940,7 +10980,7 @@ let pname = "LWPx-ParanoidAgent"; version = "1.12"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SAXJAZMAN/lwp/LWPx-ParanoidAgent-1.12.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SAXJAZMAN/lwp/LWPx-ParanoidAgent-1.12.tar.gz"; sha256 = "0gfhw3jbs25yya2dryv8xvyn9myngcfcmsybj7gkq62fnznil16c"; }; doCheck = false; # 3 tests fail, probably because they try to connect to the network @@ -10968,7 +11008,7 @@ let pname = "Mail-AuthenticationResults"; version = "1.20200108"; src = fetchurl { - url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-1.20200108.tar.gz; + url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-1.20200108.tar.gz"; sha256 = "1j003bzqh7nax604f93k1s70b1im97986p6g58a6ynv92fbnhjq5"; }; buildInputs = [ TestException ]; @@ -10983,7 +11023,7 @@ let version = "1.0.0"; pname = "Mail-Maildir"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEROALTI/Mail-Maildir-100/Mail-Maildir-1.0.0.tar.bz2; + url = "mirror://cpan/authors/id/Z/ZE/ZEROALTI/Mail-Maildir-100/Mail-Maildir-1.0.0.tar.bz2"; sha256 = "1krkqfps6q3ifrhi9450l5gm9199qyfcm6vidllr0dv65kdaqpj4"; }; }; @@ -10992,7 +11032,7 @@ let version = "3.008"; pname = "Mail-Box"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-3.008.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-3.008.tar.gz"; sha256 = "15yjq3ap1ch0k0pqa1zag50rqrjfqzf7cka1w41macxibna506mm"; }; @@ -11005,13 +11045,13 @@ let pname = "Mail-Mbox-MessageParser"; version = "1.5111"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCOPPIT/Mail-Mbox-MessageParser-1.5111.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCOPPIT/Mail-Mbox-MessageParser-1.5111.tar.gz"; sha256 = "5723c0aa9cc10bab9ed1e3bfd9d5c95f7159e71c1a475414eb1af1dee3a46237"; }; buildInputs = [ FileSlurper TestCompile TestPod TestPodCoverage TextDiff UNIVERSALrequire URI ]; propagatedBuildInputs = [ FileHandleUnget ]; meta = { - homepage = https://github.com/coppit/mail-mbox-messageparser; + homepage = "https://github.com/coppit/mail-mbox-messageparser"; description = "A fast and simple mbox folder reader"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ romildo ]; @@ -11022,7 +11062,7 @@ let pname = "Mail-Message"; version = "3.008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.008.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.008.tar.gz"; sha256 = "1k3d996r2aqqzbv0xx5y88blpy9rp14lhd9vzjc1hjnrl7gij63f"; }; propagatedBuildInputs = [ IOStringy MIMETypes MailTools URI UserIdentity ]; @@ -11036,7 +11076,7 @@ let pname = "Mail-DKIM"; version = "0.58"; src = fetchurl { - url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.58.tar.gz; + url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.58.tar.gz"; sha256 = "0cgkal65qqcy57b21lgij90ba36wl66byw9i76g5yhwaa8ms8hqa"; }; propagatedBuildInputs = [ CryptOpenSSLRSA MailAuthenticationResults MailTools NetDNSResolverMock YAMLLibYAML ]; @@ -11048,7 +11088,7 @@ let pname = "Mail-IMAPClient"; version = "3.42"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.42.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.42.tar.gz"; sha256 = "0znf035ikaxyfishv507qq6g691xvbnziqlcwfikkj2l1kan88hw"; }; propagatedBuildInputs = [ ParseRecDescent ]; @@ -11058,7 +11098,7 @@ let pname = "Mail-POP3Client"; version = "2.19"; src = fetchurl { - url = mirror://cpan/authors/id/S/SD/SDOWD/Mail-POP3Client-2.19.tar.gz; + url = "mirror://cpan/authors/id/S/SD/SDOWD/Mail-POP3Client-2.19.tar.gz"; sha256 = "1142d6247a93cb86b23ed8835553bb2d227ff8213ee2743e4155bb93f47acb59"; }; meta = { @@ -11071,7 +11111,7 @@ let pname = "Mail-RFC822-Address"; version = "0.3"; src = fetchurl { - url = mirror://cpan/authors/id/P/PD/PDWARREN/Mail-RFC822-Address-0.3.tar.gz; + url = "mirror://cpan/authors/id/P/PD/PDWARREN/Mail-RFC822-Address-0.3.tar.gz"; sha256 = "351ef4104ecb675ecae69008243fae8243d1a7e53c681eeb759e7b781684c8a7"; }; }; @@ -11080,11 +11120,11 @@ let pname = "Mail-Sender"; version = "0.903"; src = fetchurl { - url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/Mail-Sender-0.903.tar.gz; + url = "mirror://cpan/authors/id/C/CA/CAPOEIRAB/Mail-Sender-0.903.tar.gz"; sha256 = "4413eb49f520a8318151811ccb05a8d542973aada20aa503ad32f9ffc98a39bf"; }; meta = { - homepage = https://github.com/Perl-Email-Project/Mail-Sender; + homepage = "https://github.com/Perl-Email-Project/Mail-Sender"; description = "(DEPRECATED) module for sending mails with attachments through an SMTP server"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -11137,7 +11177,7 @@ let pname = "MailTools"; version = "2.21"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.21.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.21.tar.gz"; sha256 = "1js43bp2dnd8n2rv8clsv749166jnyqnc91k4wkkmw5n4rlbvnaa"; }; propagatedBuildInputs = [ TimeDate ]; @@ -11151,7 +11191,7 @@ let pname = "Mail-Transport"; version = "3.004"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.004.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.004.tar.gz"; sha256 = "049xsjxfn00v5znmrg7vgyafy5wzxxa901hq2g083s0pyq4mlcfg"; }; propagatedBuildInputs = [ MailMessage ]; @@ -11165,7 +11205,7 @@ let pname = "Math-Base85"; version = "0.4"; src = fetchurl { - url = mirror://cpan/authors/id/P/PT/PTC/Math-Base85-0.4.tar.gz; + url = "mirror://cpan/authors/id/P/PT/PTC/Math-Base85-0.4.tar.gz"; sha256 = "03cbp5ls98zcj183wjzlzjcrhbc96mw3p1hagzy1yplj1xh5ia4y"; }; meta = { @@ -11178,7 +11218,7 @@ let pname = "Math-Base-Convert"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKER/Math-Base-Convert-0.11.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIKER/Math-Base-Convert-0.11.tar.gz"; sha256 = "8c0971355f24c93b79e77ad54a4570090a1a598fcb9b86f5c17eba42f38b40e0"; }; }; @@ -11187,7 +11227,7 @@ let pname = "Math-Libm"; version = "1.00"; src = fetchurl { - url = mirror://cpan/authors/id/D/DS/DSLEWART/Math-Libm-1.00.tar.gz; + url = "mirror://cpan/authors/id/D/DS/DSLEWART/Math-Libm-1.00.tar.gz"; sha256 = "0xn2a950mzzs5q1c4q98ckysn9dz20x7r35g02zvk35chgr0klxz"; }; }; @@ -11196,7 +11236,7 @@ let pname = "Math-Calc-Units"; version = "1.07"; src = fetchurl { - url = mirror://cpan/authors/id/S/SF/SFINK/Math-Calc-Units-1.07.tar.gz; + url = "mirror://cpan/authors/id/S/SF/SFINK/Math-Calc-Units-1.07.tar.gz"; sha256 = "13wgbxv2fmigdj0vf7nwkq1y2q07jgfj8wdrpqkywfxv4zdwzqv1"; }; meta = { @@ -11209,7 +11249,7 @@ let pname = "Math-BigInt"; version = "1.999816"; src = fetchurl { - url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-1.999816.tar.gz; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-1.999816.tar.gz"; sha256 = "95a5a1f636a23f66d400d40bffb0d24ad50df00e6e3c7359c9e645c375f40a89"; }; meta = { @@ -11222,7 +11262,7 @@ let pname = "Math-BigInt-GMP"; version = "1.6007"; src = fetchurl { - url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-GMP-1.6007.tar.gz; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-GMP-1.6007.tar.gz"; sha256 = "07y0akadx2nm1bsp17v12785s3ni1l5qyqkk4q3pxcyc41nmwwjx"; }; buildInputs = [ pkgs.gmp ]; @@ -11236,7 +11276,7 @@ let pname = "Math-BigInt-Lite"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.18.tar.gz; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.18.tar.gz"; sha256 = "1m97jkh26nrji6mjdwhwlq9bcdn8qlw3vimik8bs2hw80syi70j4"; }; propagatedBuildInputs = [ MathBigInt ]; @@ -11249,7 +11289,7 @@ let pname = "Math-BigRat"; version = "0.2614"; src = fetchurl { - url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigRat-0.2614.tar.gz; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigRat-0.2614.tar.gz"; sha256 = "cea6c20afc6c10a3dc3b62a71df3f842dce13898443bd827242ff3f09f1f3d59"; }; meta = { @@ -11262,7 +11302,7 @@ let pname = "Math-Clipper"; version = "1.29"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHELDRAKE/Math-Clipper-1.29.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHELDRAKE/Math-Clipper-1.29.tar.gz"; sha256 = "14vmz1x8hwnlk239dcsh0n39kd7cd7v5g1iikgbyjvc66gqw89sk"; }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; @@ -11273,7 +11313,7 @@ let pname = "Math-ConvexHull-MonotoneChain"; version = "0.01"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/Math-ConvexHull-MonotoneChain-0.01.tar.gz; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/Math-ConvexHull-MonotoneChain-0.01.tar.gz"; sha256 = "1xcl7cz62ydddji9qzs4xsfxss484jqjlj4iixa4aci611cw92r8"; }; }; @@ -11282,7 +11322,7 @@ let pname = "Math-GMP"; version = "2.20"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.20.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.20.tar.gz"; sha256 = "0psmpj3j8cw02b5bzb7qnkd4rcpxm82891rwpdi2hx2jxy0mznhn"; }; buildInputs = [ pkgs.gmp AlienGMP ]; @@ -11298,7 +11338,7 @@ let pname = "Math-Geometry-Voronoi"; version = "1.3"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SAMTREGAR/Math-Geometry-Voronoi-1.3.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SAMTREGAR/Math-Geometry-Voronoi-1.3.tar.gz"; sha256 = "0b206k2q5cznld45cjhgm0as0clc9hk135ds8qafbkl3k175w1vj"; }; propagatedBuildInputs = [ ClassAccessor ParamsValidate ]; @@ -11308,7 +11348,7 @@ let pname = "Math-Int128"; version = "0.22"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SALVA/Math-Int128-0.22.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SALVA/Math-Int128-0.22.tar.gz"; sha256 = "1g0ra7ldv4fz3kqqg45dlrfavi2abfmlhf0py5ank1jk2x0clc56"; }; propagatedBuildInputs = [ MathInt64 ]; @@ -11323,7 +11363,7 @@ let pname = "Math-Int64"; version = "0.54"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SALVA/Math-Int64-0.54.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SALVA/Math-Int64-0.54.tar.gz"; sha256 = "0lfkc0cry65lnsi28gjyz2kvdkanbhhpc0pyrswsczj3k3k53z6w"; }; meta = { @@ -11336,7 +11376,7 @@ let pname = "Math-PlanePath"; version = "127"; src = fetchurl { - url = mirror://cpan/authors/id/K/KR/KRYDE/Math-PlanePath-127.tar.gz; + url = "mirror://cpan/authors/id/K/KR/KRYDE/Math-PlanePath-127.tar.gz"; sha256 = "1dzywpydigwyr38vz9f4yn7xkkk21vi6lyzjlyqv8iny0y0c7w20"; }; propagatedBuildInputs = [ MathLibm constant-defer ]; @@ -11347,7 +11387,7 @@ let pname = "Math-Random"; version = "0.72"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GROMMEL/Math-Random-0.72.tar.gz; + url = "mirror://cpan/authors/id/G/GR/GROMMEL/Math-Random-0.72.tar.gz"; sha256 = "0k15pk2qx9wrp5xqzhymm1ph4nb314ysrsyr0pjnvn8ii0r241dy"; }; meta = { @@ -11358,7 +11398,7 @@ let pname = "Math-Random-ISAAC"; version = "1.004"; src = fetchurl { - url = mirror://cpan/authors/id/J/JA/JAWNSY/Math-Random-ISAAC-1.004.tar.gz; + url = "mirror://cpan/authors/id/J/JA/JAWNSY/Math-Random-ISAAC-1.004.tar.gz"; sha256 = "0z1b3xbb3xz71h25fg6jgsccra7migq7s0vawx2rfzi0pwpz0wr7"; }; buildInputs = [ TestNoWarnings ]; @@ -11372,7 +11412,7 @@ let pname = "Math-Random-MT-Auto"; version = "6.23"; src = fetchurl { - url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Math-Random-MT-Auto-6.23.tar.gz; + url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/Math-Random-MT-Auto-6.23.tar.gz"; sha256 = "04v3fxbqg6bs7dpljw64v62jqb10l2xdrln4l3slz5k266nvbg2q"; }; propagatedBuildInputs = [ ObjectInsideOut ]; @@ -11386,7 +11426,7 @@ let pname = "Math-Random-Secure"; version = "0.080001"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/Math-Random-Secure-0.080001.tar.gz; + url = "mirror://cpan/authors/id/F/FR/FREW/Math-Random-Secure-0.080001.tar.gz"; sha256 = "0dgbf4ncll4kmgkyb9fsaxn0vf2smc9dmwqzgh3259zc2zla995z"; }; buildInputs = [ ListMoreUtils TestSharedFork TestWarn ]; @@ -11401,7 +11441,7 @@ let pname = "Math-Round"; version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GROMMEL/Math-Round-0.07.tar.gz; + url = "mirror://cpan/authors/id/G/GR/GROMMEL/Math-Round-0.07.tar.gz"; sha256 = "09wkvqj4hfq9y0fimri967rmhnq90dc2wf20lhlmqjp5hsd359vk"; }; }; @@ -11410,7 +11450,7 @@ let pname = "Math-VecStat"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/A/AS/ASPINELLI/Math-VecStat-0.08.tar.gz; + url = "mirror://cpan/authors/id/A/AS/ASPINELLI/Math-VecStat-0.08.tar.gz"; sha256 = "03bdcl9pn2bc9b50c50nhnr7m9wafylnb3v21zlch98h9c78x6j0"; }; }; @@ -11419,7 +11459,7 @@ let pname = "MaxMind-DB-Common"; version = "0.040001"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Common-0.040001.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Common-0.040001.tar.gz"; sha256 = "1mqvnabskhyvi2f10f602gisfk39ws51ky55lixd0033sd5xzikb"; }; propagatedBuildInputs = [ DataDumperConcise DateTime ListAllUtils MooXStrictConstructor ]; @@ -11433,7 +11473,7 @@ let pname = "MaxMind-DB-Reader"; version = "1.000014"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-1.000014.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-1.000014.tar.gz"; sha256 = "1a9rrvarw3q6378w3sqv632w36a9bsh0r90yfa49lzwnkj7hf81q"; }; propagatedBuildInputs = [ DataIEEE754 DataPrinter DataValidateIP MaxMindDBCommon ]; @@ -11448,7 +11488,7 @@ let pname = "MaxMind-DB-Reader-XS"; version = "1.000008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-XS-1.000008.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-XS-1.000008.tar.gz"; sha256 = "11y71m77y38mi68gw5dqx54z9syvax42x3m9v7mgx35c5z4gpal4"; }; propagatedBuildInputs = [ pkgs.libmaxminddb MathInt128 MaxMindDBReader ]; @@ -11463,7 +11503,7 @@ let pname = "MaxMind-DB-Writer"; version = "0.300003"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Writer-0.300003.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Writer-0.300003.tar.gz"; sha256 = "0gpbrlmxjl45k0wg5v9ghw415hd0fns9fk8ncxzlfyjzjsxgalxs"; }; propagatedBuildInputs = [ DigestSHA1 MaxMindDBReader MooseXParamsValidate MooseXStrictConstructor NetWorks SerealDecoder SerealEncoder ]; @@ -11479,7 +11519,7 @@ let pname = "Memoize"; version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/M/MJ/MJD/Memoize-1.03.tgz; + url = "mirror://cpan/authors/id/M/MJ/MJD/Memoize-1.03.tgz"; sha256 = "5239cc5f644a50b0de9ffeaa51fa9991eb06ecb1bf4678873e3ab89af9c0daf3"; }; }; @@ -11488,7 +11528,7 @@ let pname = "Memoize-ExpireLRU"; version = "0.56"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Memoize-ExpireLRU-0.56.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Memoize-ExpireLRU-0.56.tar.gz"; sha256 = "1xnp3jqabl4il5kfadlqimbxhzsbm7gpwrgw0m5s5fdsrc0n70zf"; }; meta = { @@ -11502,12 +11542,12 @@ let pname = "Menlo"; version = "1.9019"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Menlo-1.9019.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Menlo-1.9019.tar.gz"; sha256 = "3b573f68e7b3a36a87c860be258599330fac248b518854dfb5657ac483dca565"; }; propagatedBuildInputs = [ CPANCommonIndex CPANMetaCheck CaptureTiny ExtUtilsHelpers ExtUtilsInstallPaths Filepushd HTTPTinyish ModuleCPANfile ParsePMFile StringShellQuote Win32ShellQuote locallib ]; meta = { - homepage = https://github.com/miyagawa/cpanminus; + homepage = "https://github.com/miyagawa/cpanminus"; description = "A CPAN client"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -11517,12 +11557,12 @@ let pname = "Menlo-Legacy"; version = "1.9022"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Menlo-Legacy-1.9022.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Menlo-Legacy-1.9022.tar.gz"; sha256 = "a6acac3fee318a804b439de54acbc7c27f0b44cfdad8551bbc9cd45986abc201"; }; propagatedBuildInputs = [ Menlo ]; meta = { - homepage = https://github.com/miyagawa/cpanminus; + homepage = "https://github.com/miyagawa/cpanminus"; description = "Legacy internal and client support for Menlo"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -11532,7 +11572,7 @@ let pname = "Meta-Builder"; version = "0.004"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Meta-Builder-0.004.tar.gz; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Meta-Builder-0.004.tar.gz"; sha256 = "acb499aa7206eb9db21eb85357a74521bfe3bdae4a6416d50a7c75b939cf56fe"; }; buildInputs = [ FennecLite TestException ]; @@ -11546,7 +11586,7 @@ let pname = "Method-Signatures-Simple"; version = "1.07"; src = fetchurl { - url = mirror://cpan/authors/id/R/RH/RHESA/Method-Signatures-Simple-1.07.tar.gz; + url = "mirror://cpan/authors/id/R/RH/RHESA/Method-Signatures-Simple-1.07.tar.gz"; sha256 = "1p6sf6iyyn73pc89mfr65bzxvbw1ibcsp4j10iv8ik3p353pvkf8"; }; propagatedBuildInputs = [ DevelDeclare ]; @@ -11584,7 +11624,7 @@ let pname = "MIME-Charset"; version = "1.012.2"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEZUMI/MIME-Charset-1.012.2.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEZUMI/MIME-Charset-1.012.2.tar.gz"; sha256 = "878c779c0256c591666bd06c0cde4c0d7820eeeb98fd1183082aee9a1e7b1d13"; }; meta = { @@ -11597,7 +11637,7 @@ let pname = "mime-construct"; version = "1.11"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROSCH/mime-construct-1.11.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROSCH/mime-construct-1.11.tar.gz"; sha256 = "00wk9950i9q6qwp1vdq9xdddgk54lqd0bhcq2hnijh8xnmhvpmsc"; }; outputs = [ "out" ]; @@ -11624,7 +11664,7 @@ let pname = "MIME-Lite"; version = "3.031"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/MIME-Lite-3.031.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/MIME-Lite-3.031.tar.gz"; sha256 = "f1235866482b67f00858b3edaa4ff4cf909ef900f1d15d889948bf9c03a591e0"; }; propagatedBuildInputs = [ EmailDateFormat ]; @@ -11638,7 +11678,7 @@ let pname = "MIME-Lite-HTML"; version = "1.24"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALIAN/MIME-Lite-HTML-1.24.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALIAN/MIME-Lite-HTML-1.24.tar.gz"; sha256 = "db603ccbf6653bcd28cfa824d72e511ead019fc8afb9f1854ec872db2d3cd8da"; }; doCheck = false; @@ -11653,7 +11693,7 @@ let pname = "MIME-tools"; version = "5.509"; src = fetchurl { - url = mirror://cpan/authors/id/D/DS/DSKOLL/MIME-tools-5.509.tar.gz; + url = "mirror://cpan/authors/id/D/DS/DSKOLL/MIME-tools-5.509.tar.gz"; sha256 = "0wv9rzx5j1wjm01c3dg48qk9wlbm6iyf91j536idk09xj869ymv4"; }; propagatedBuildInputs = [ MailTools ]; @@ -11668,7 +11708,7 @@ let pname = "MIME-Types"; version = "2.17"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-2.17.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-2.17.tar.gz"; sha256 = "1xlg7q6h8zyb8534sy0iqn90py18kilg419q6051bwqz5zadfkp0"; }; meta = { @@ -11681,12 +11721,12 @@ let pname = "Mixin-Linewise"; version = "0.108"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Mixin-Linewise-0.108.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Mixin-Linewise-0.108.tar.gz"; sha256 = "7df20678474c0973930a472b0c55e3f8e85b7790b68ab18ef618f9c453c8aef2"; }; propagatedBuildInputs = [ PerlIOutf8_strict SubExporter ]; meta = { - homepage = https://github.com/rjbs/mixin-linewise; + homepage = "https://github.com/rjbs/mixin-linewise"; description = "Write your linewise code for handles; this does the rest"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -11696,7 +11736,7 @@ let pname = "MLDBM"; version = "2.05"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHORNY/MLDBM-2.05.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHORNY/MLDBM-2.05.tar.gz"; sha256 = "586880ed0c20801abbf6734747e13e0203edefece6ebc4f20ddb5059f02a17a2"; }; meta = { @@ -11711,7 +11751,7 @@ let pname = "Mo"; version = "0.40"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/Mo-0.40.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TINITA/Mo-0.40.tar.gz"; sha256 = "1fff81awg9agfawf3wxx0gpf6vgav8w920rmxsbjg30z75943lli"; }; meta = { @@ -11725,7 +11765,7 @@ let pname = "Mock-Config"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Mock-Config-0.03.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Mock-Config-0.03.tar.gz"; sha256 = "06q0xkg5cwdwafzmb9rkaa305ddv7vli9gpm6n9jnkyaaxbk9f55"; }; meta = { @@ -11739,11 +11779,11 @@ let version = "1.20190727"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20190727.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20190727.tar.gz"; sha256 = "2e69d7ab7e4a53153e686c25547ad914e7464d4e5604b8851931a6e63fc51b21"; }; meta = { - homepage = https://github.com/chromatic/Modern-Perl; + homepage = "https://github.com/chromatic/Modern-Perl"; description = "Enable all of the features of Modern Perl with one import"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -11753,7 +11793,7 @@ let pname = "Module-Build"; version = "0.4231"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4231.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4231.tar.gz"; sha256 = "05xpn8qg814y49vrih16zfr9iiwb7pmdf57ahjnc2h0p5illq3vy"; }; meta = { @@ -11766,7 +11806,7 @@ let pname = "Module-Build-Deprecated"; version = "0.4210"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Deprecated-0.4210.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Deprecated-0.4210.tar.gz"; sha256 = "be089313fc238ee2183473aca8c86b55fb3cf44797312cbe9b892d6362621703"; }; doCheck = false; @@ -11780,12 +11820,12 @@ let pname = "Module-Build-Pluggable"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Module-Build-Pluggable-0.10.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/Module-Build-Pluggable-0.10.tar.gz"; sha256 = "e5bb2acb117792c984628812acb0fec376cb970caee8ede57535e04d762b0e40"; }; propagatedBuildInputs = [ ClassAccessorLite ClassMethodModifiers DataOptList ]; meta = { - homepage = https://github.com/tokuhirom/Module-Build-Pluggable; + homepage = "https://github.com/tokuhirom/Module-Build-Pluggable"; description = "Module::Build meets plugins"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -11796,7 +11836,7 @@ let pname = "Module-Build-Pluggable-PPPort"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Module-Build-Pluggable-PPPort-0.04.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/Module-Build-Pluggable-PPPort-0.04.tar.gz"; sha256 = "44084ba3d8815f343bd391585ac5d8339a4807ce5c0dd84c98db8f310b64c0ea"; }; buildInputs = [ TestRequires TestSharedFork ]; @@ -11811,7 +11851,7 @@ let pname = "Module-Build-Tiny"; version = "0.039"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.039.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.039.tar.gz"; sha256 = "7d580ff6ace0cbe555bf36b86dc8ea232581530cbeaaea09bccb57b55797f11c"; }; buildInputs = [ FileShareDir ]; @@ -11826,7 +11866,7 @@ let pname = "Module-Build-WithXSpp"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/Module-Build-WithXSpp-0.14.tar.gz; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/Module-Build-WithXSpp-0.14.tar.gz"; sha256 = "0d39fjg9c0n820bk3fb50vvlwhdny4hdl69xmlyzql5xzp4cicsk"; }; propagatedBuildInputs = [ ExtUtilsCppGuess ExtUtilsXSpp ]; @@ -11836,7 +11876,7 @@ let pname = "Module-Build-XSUtil"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/H/HI/HIDEAKIO/Module-Build-XSUtil-0.19.tar.gz; + url = "mirror://cpan/authors/id/H/HI/HIDEAKIO/Module-Build-XSUtil-0.19.tar.gz"; sha256 = "004ly9xxjlsbrr2vhxsa1n84z3034gxrzr7z0wl45szd8v1v6qwh"; }; buildInputs = [ CaptureTiny CwdGuard FileCopyRecursiveReduced ]; @@ -11867,7 +11907,7 @@ let pname = "Module-CPANTS-Analyse"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-1.01.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-1.01.tar.gz"; sha256 = "0jf83v9ylw7s9i2zv0l1v11gafp3k4389asc52r6s6q5s2j0p6dx"; }; propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff CPANDistnameInfo DataBinary FileFindObject PerlPrereqScannerNotQuiteLite SoftwareLicense ]; @@ -11875,7 +11915,7 @@ let meta = { description = "Generate Kwalitee ratings for a distribution"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - homepage = https://cpants.cpanauthors.org; + homepage = "https://cpants.cpanauthors.org"; }; }; @@ -11883,7 +11923,7 @@ let pname = "Module-CPANfile"; version = "1.1004"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Module-CPANfile-1.1004.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Module-CPANfile-1.1004.tar.gz"; sha256 = "08a9a5mybf0llwlfvk7n0q7az6lrrzgzwc3432mcwbb4k8pbxvw8"; }; meta = { @@ -11898,7 +11938,7 @@ let pname = "Module-ExtractUse"; version = "0.343"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOMM/Module-ExtractUse-0.343.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOMM/Module-ExtractUse-0.343.tar.gz"; sha256 = "00hcggwnqk953s4zbvkcabd5mfidg60hawlqsw6146in91dlclj8"; }; propagatedBuildInputs = [ ParseRecDescent PodStrip ]; @@ -11913,7 +11953,7 @@ let pname = "Module-Find"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.15.tar.gz; + url = "mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.15.tar.gz"; sha256 = "0pm8v398rv4sy7sn7zzfbq4szxw6p1q4963ancsi17iyzskq4m2w"; }; meta = { @@ -11926,7 +11966,7 @@ let pname = "Module-Implementation"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Module-Implementation-0.09.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Module-Implementation-0.09.tar.gz"; sha256 = "0vfngw4dbryihqhi7g9ks360hyw8wnpy3hpkzyg0q4y2y091lpy1"; }; buildInputs = [ TestFatal TestRequires ]; @@ -11941,7 +11981,7 @@ let pname = "Module-Info"; version = "0.37"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Module-Info-0.37.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Module-Info-0.37.tar.gz"; sha256 = "0j143hqxgdkdpj5qssppq72gjr0n73c4f7is6wgrrcchjx905a4f"; }; buildInputs = [ TestPod TestPodCoverage ]; @@ -11956,7 +11996,7 @@ let pname = "Module-Install"; version = "1.19"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Module-Install-1.19.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Module-Install-1.19.tar.gz"; sha256 = "06q12cm97yh4p7qbm0a2p96996ii6ss59qy57z0f7f9svy6sflqs"; }; propagatedBuildInputs = [ FileRemove ModuleBuild ModuleScanDeps YAMLTiny ]; @@ -11970,7 +12010,7 @@ let pname = "Module-Install-AuthorRequires"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/Module-Install-AuthorRequires-0.02.tar.gz; + url = "mirror://cpan/authors/id/F/FL/FLORA/Module-Install-AuthorRequires-0.02.tar.gz"; sha256 = "1v2ciw75dj5y8lh10d1vrhwmjx266gpqavr8m21jlpblgm9j2qyc"; }; propagatedBuildInputs = [ ModuleInstall ]; @@ -11984,7 +12024,7 @@ let pname = "Module-Install-AuthorTests"; version = "0.002"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Module-Install-AuthorTests-0.002.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Module-Install-AuthorTests-0.002.tar.gz"; sha256 = "121dyggy38316xss06v1zkwx4b59gl7b00c5q99xyzimwqnp49a0"; }; propagatedBuildInputs = [ ModuleInstall ]; @@ -11998,7 +12038,7 @@ let pname = "Module-Manifest"; version = "1.09"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Module-Manifest-1.09.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Module-Manifest-1.09.tar.gz"; sha256 = "a395f80ff15ea0e66fd6c453844b6787ed4a875a3cd8df9f7e29280250bd539b"; }; buildInputs = [ TestException TestWarn ]; @@ -12013,12 +12053,12 @@ let pname = "Module-Path"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Module-Path-0.19.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Module-Path-0.19.tar.gz"; sha256 = "b33179ce4dd73dfcde7d46808804b9ffbb11db0245fe455a7d001747562feaca"; }; buildInputs = [ DevelFindPerl ]; meta = { - homepage = https://github.com/neilbowers/Module-Path; + homepage = "https://github.com/neilbowers/Module-Path"; description = "Get the full path to a locally installed module"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12028,7 +12068,7 @@ let pname = "Module-Pluggable"; version = "5.2"; src = fetchurl { - url = mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-5.2.tar.gz; + url = "mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-5.2.tar.gz"; sha256 = "b3f2ad45e4fd10b3fb90d912d78d8b795ab295480db56dc64e86b9fa75c5a6df"; }; patches = [ @@ -12046,7 +12086,7 @@ let pname = "Module-Pluggable-Fast"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRAMBERG/Module-Pluggable-Fast-0.19.tar.gz; + url = "mirror://cpan/authors/id/M/MR/MRAMBERG/Module-Pluggable-Fast-0.19.tar.gz"; sha256 = "0pq758wlasmh77xyd2xh75m5b2x14s8pnsv63g5356gib1q5gj08"; }; propagatedBuildInputs = [ UNIVERSALrequire ]; @@ -12056,7 +12096,7 @@ let pname = "Module-Refresh"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/Module-Refresh-0.17.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXMV/Module-Refresh-0.17.tar.gz"; sha256 = "6b30a6ceddc6512ab4490c16372ecf309a259f2ca147d622e478ac54e08511c3"; }; buildInputs = [ PathClass ]; @@ -12070,7 +12110,7 @@ let pname = "Module-Runtime"; version = "0.016"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.016.tar.gz; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.016.tar.gz"; sha256 = "097hy2czwkxlppri32m599ph0xfvfsbf0a5y23a4fdc38v32wc38"; }; meta = { @@ -12083,12 +12123,12 @@ let pname = "Module-Runtime-Conflicts"; version = "0.003"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Module-Runtime-Conflicts-0.003.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Module-Runtime-Conflicts-0.003.tar.gz"; sha256 = "707cdc75038c70fe91779b888ac050f128565d3967ba96680e1b1c7cc9733875"; }; propagatedBuildInputs = [ DistCheckConflicts ]; meta = { - homepage = https://github.com/karenetheridge/Module-Runtime-Conflicts; + homepage = "https://github.com/karenetheridge/Module-Runtime-Conflicts"; description = "Provide information on conflicts for Module::Runtime"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12098,7 +12138,7 @@ let pname = "Module-ScanDeps"; version = "1.27"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.27.tar.gz; + url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.27.tar.gz"; sha256 = "0j6r9r99x5p0i6fv06i44wpsvjxj32amjkiqf6pmqpj80jff2k7f"; }; buildInputs = [ TestRequires ]; @@ -12112,7 +12152,7 @@ let pname = "Module-Signature"; version = "0.83"; src = fetchurl { - url = mirror://cpan/authors/id/A/AU/AUDREYT/Module-Signature-0.83.tar.gz; + url = "mirror://cpan/authors/id/A/AU/AUDREYT/Module-Signature-0.83.tar.gz"; sha256 = "3c15f3845a85d2a76a81253be53cb0f716465a3f696eb9c50e92eef34e9601cb"; }; buildInputs = [ IPCRun ]; @@ -12126,7 +12166,7 @@ let pname = "Module-Util"; version = "1.09"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MATTLAW/Module-Util-1.09.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MATTLAW/Module-Util-1.09.tar.gz"; sha256 = "6cfbcb6a45064446ec8aa0ee1a7dddc420b54469303344187aef84d2c7f3e2c6"; }; meta = { @@ -12139,7 +12179,7 @@ let pname = "Module-Versions"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/T/TH/THW/Module-Versions-0.02.zip; + url = "mirror://cpan/authors/id/T/TH/THW/Module-Versions-0.02.zip"; sha256 = "0g7qs6vqg91xpwg1cdy91m3kh9m1zbkzyz1qsy453b572xdscf0d"; }; buildInputs = [ pkgs.unzip ]; @@ -12149,7 +12189,7 @@ let pname = "Module-Versions-Report"; version = "1.06"; src = fetchurl { - url = mirror://cpan/authors/id/J/JE/JESSE/Module-Versions-Report-1.06.tar.gz; + url = "mirror://cpan/authors/id/J/JE/JESSE/Module-Versions-Report-1.06.tar.gz"; sha256 = "a3261d0d84b17678d8c4fd55eb0f892f5144d81ca53ea9a38d75d1a00ad9796a"; }; meta = { @@ -12162,7 +12202,7 @@ let pname = "Mojo-DOM58"; version = "2.000"; src = fetchurl { - url = mirror://cpan/authors/id/D/DB/DBOOK/Mojo-DOM58-2.000.tar.gz; + url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-DOM58-2.000.tar.gz"; sha256 = "1wsy0j6jpd06gc1ay6isyzqh5cdc834g5w0amslqcjgvf4snlk46"; }; meta = { @@ -12176,7 +12216,7 @@ let pname = "mod_perl"; version = "2.0.11"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.11.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.11.tar.gz"; sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana"; }; makeMakerFlags = "MP_AP_DESTDIR=$out"; @@ -12192,11 +12232,11 @@ let pname = "Mojolicious"; version = "8.32"; src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.32.tar.gz; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.32.tar.gz"; sha256 = "11fyz534syihisl8498655bqq4y8c73a6xhvl1wlq4axdgkm0d2h"; }; meta = { - homepage = https://mojolicious.org; + homepage = "https://mojolicious.org"; description = "Real-time web framework"; license = stdenv.lib.licenses.artistic2; maintainers = [ maintainers.thoughtpolice ]; @@ -12223,7 +12263,7 @@ let pname = "Mojolicious-Plugin-OpenAPI"; version = "2.21"; src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-2.21.tar.gz; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-2.21.tar.gz"; sha256 = "34b1f42d846c26d8be3a3556dc5a02dd7ab47c5612b41d3caf1ce6bc16101dc2"; }; propagatedBuildInputs = [ JSONValidator ]; @@ -12239,18 +12279,34 @@ let pname = "Mojolicious-Plugin-Status"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-Status-1.01.tar.gz; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-Status-1.01.tar.gz"; sha256 = "08hvwg395sibjjkwc9fg31ngpmzf7z0467p6b0il355xqbwjpdf6"; }; propagatedBuildInputs = [ BSDResource IPCShareLite Mojolicious Sereal ]; meta = { - homepage = https://github.com/mojolicious/mojo-status; + homepage = "https://github.com/mojolicious/mojo-status"; description = "Mojolicious server status plugin"; license = with stdenv.lib.licenses; [ artistic2 ]; maintainers = [ maintainers.thoughtpolice ]; }; }; + MojoliciousPluginTextExceptions = buildPerlPackage { + pname = "Mojolicious-Plugin-TextExceptions"; + version = "0.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MR/MRAMBERG/Mojolicious-Plugin-TextExceptions-0.01.tar.gz"; + sha256 = "070daf284c5d3832b7fde42120eaf747aea4cc75de8ff807f77accc84fe4f22e"; + }; + propagatedBuildInputs = [ Mojolicious ]; + meta = { + homepage = "https://github.com/marcusramberg/mojolicious-plugin-textexceptions"; + description = "Render exceptions as text in command line user agents"; + license = stdenv.lib.licenses.artistic2; + maintainers = [ maintainers.sgo ]; + }; + }; + MojoRedis = buildPerlPackage { pname = "Mojo-Redis"; version = "3.24"; @@ -12271,7 +12327,7 @@ let pname = "Mojo-SQLite"; version = "3.003"; src = fetchurl { - url = mirror://cpan/authors/id/D/DB/DBOOK/Mojo-SQLite-3.003.tar.gz; + url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-SQLite-3.003.tar.gz"; sha256 = "d96c00dcf45e2becc8e8181df074853d42616f2a660703455d0e0a2741478092"; }; buildInputs = [ ModuleBuildTiny ]; @@ -12288,7 +12344,7 @@ let pname = "Mojo-mysql"; version = "1.18"; src = fetchurl { - url = mirror://cpan/authors/id/T/TE/TEKKI/Mojo-mysql-1.18.tar.gz; + url = "mirror://cpan/authors/id/T/TE/TEKKI/Mojo-mysql-1.18.tar.gz"; sha256 = "cc023f068f1ed158b5788758ea175aabe646b06d2f86049552bd7307457396bd"; }; propagatedBuildInputs = [ DBDmysql Mojolicious SQLAbstract ]; @@ -12304,7 +12360,7 @@ let pname = "Mojo-IOLoop-ForkCall"; version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/J/JB/JBERGER/Mojo-IOLoop-ForkCall-0.20.tar.gz; + url = "mirror://cpan/authors/id/J/JB/JBERGER/Mojo-IOLoop-ForkCall-0.20.tar.gz"; sha256 = "2b9962244c25a71e4757356fb3e1237cf869e26d1c27215115ba7b057a81f1a6"; }; propagatedBuildInputs = [ IOPipely Mojolicious ]; @@ -12352,7 +12408,7 @@ let pname = "Monitoring-Plugin"; version = "0.40"; src = fetchurl { - url = mirror://cpan/authors/id/N/NI/NIERLEIN/Monitoring-Plugin-0.40.tar.gz; + url = "mirror://cpan/authors/id/N/NI/NIERLEIN/Monitoring-Plugin-0.40.tar.gz"; sha256 = "0vr3wwdn3zs246qwi04bqk8jir6l88j5m59jk97hmfyj4xz6pfpq"; }; propagatedBuildInputs = [ ClassAccessor ConfigTiny MathCalcUnits ParamsValidate ]; @@ -12369,7 +12425,7 @@ let pname = "IO-Pipely"; version = "0.005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCAPUTO/IO-Pipely-0.005.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCAPUTO/IO-Pipely-0.005.tar.gz"; sha256 = "e33b6cf5cb2b46ee308513f51e623987a50a89901e81bf19701dce35179f2e74"; }; meta = { @@ -12382,7 +12438,7 @@ let pname = "Moo"; version = "2.003006"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Moo-2.003006.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Moo-2.003006.tar.gz"; sha256 = "bcb2092ab18a45005b5e2e84465ebf3a4999d8e82a43a09f5a94d859ae7f2472"; }; buildInputs = [ TestFatal ]; @@ -12397,7 +12453,7 @@ let pname = "Moose"; version = "2.2012"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2012.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2012.tar.gz"; sha256 = "46bbe47a9d16379c355b3a263214eb69bf0edca6a0ef75499a012236f5153569"; }; buildInputs = [ CPANMetaCheck TestCleanNamespaces TestFatal TestRequires ]; @@ -12406,7 +12462,7 @@ let export LD=$CC ''; meta = { - homepage = http://moose.perl.org/; + homepage = "http://moose.perl.org/"; description = "A postmodern object system for Perl 5"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.eelco ]; @@ -12417,7 +12473,7 @@ let pname = "MooX-HandlesVia"; version = "0.001008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MATTP/MooX-HandlesVia-0.001008.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MATTP/MooX-HandlesVia-0.001008.tar.gz"; sha256 = "b0946f23b3537763b8a96b8a83afcdaa64fce4b45235e98064845729acccfe8c"; }; buildInputs = [ MooXTypesMooseLike TestException TestFatal ]; @@ -12432,7 +12488,7 @@ let pname = "MooX-Locale-Passthrough"; version = "0.001"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/MooX-Locale-Passthrough-0.001.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/MooX-Locale-Passthrough-0.001.tar.gz"; sha256 = "04h5xhqdvydd4xk9ckb6a79chn0ygf915ix55vg1snmba9z841bs"; }; propagatedBuildInputs = [ Moo ]; @@ -12446,7 +12502,7 @@ let pname = "MooX-Locale-TextDomain-OO"; version = "0.001"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/MooX-Locale-TextDomain-OO-0.001.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/MooX-Locale-TextDomain-OO-0.001.tar.gz"; sha256 = "0g8pwj45ccqrzvs9cqyhw29nm68vai1vj46ad39rajnqzp7m53jv"; }; propagatedBuildInputs = [ LocaleTextDomainOO MooXLocalePassthrough ]; @@ -12460,7 +12516,7 @@ let pname = "MooX-Options"; version = "4.103"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/MooX-Options-4.103.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/MooX-Options-4.103.tar.gz"; sha256 = "0v9j0wxx4f6z6lrmdqf2k084b2c2f2jbvh86pwib0vgjz1sdbyad"; }; propagatedBuildInputs = [ GetoptLongDescriptive MROCompat MooXLocalePassthrough PathClass UnicodeLineBreak strictures ]; @@ -12476,7 +12532,7 @@ let pname = "MooX-Singleton"; version = "1.20"; src = fetchurl { - url = mirror://cpan/authors/id/A/AJ/AJGB/MooX-Singleton-1.20.tar.gz; + url = "mirror://cpan/authors/id/A/AJ/AJGB/MooX-Singleton-1.20.tar.gz"; sha256 = "03i1wfag279ldjjkwi9gvpfs8fgi05my47icq5ggi66yzxpn5mzp"; }; propagatedBuildInputs = [ RoleTiny ]; @@ -12491,7 +12547,7 @@ let pname = "MooX-StrictConstructor"; version = "0.010"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HARTZELL/MooX-StrictConstructor-0.010.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HARTZELL/MooX-StrictConstructor-0.010.tar.gz"; sha256 = "0vvjgz7xbfmf69yav7sxsxmvklqv835xvh7h47w0apxmlkm9fjgr"; }; propagatedBuildInputs = [ Moo strictures ]; @@ -12506,7 +12562,7 @@ let pname = "MooX-Types-MooseLike"; version = "0.29"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MATEU/MooX-Types-MooseLike-0.29.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MATEU/MooX-Types-MooseLike-0.29.tar.gz"; sha256 = "1d6jg9x3p7gm2r0xmbcag374a44gf5pcga2swvxhlhzakfm80dqx"; }; propagatedBuildInputs = [ ModuleRuntime ]; @@ -12517,7 +12573,7 @@ let pname = "MooX-Types-MooseLike-Numeric"; version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MATEU/MooX-Types-MooseLike-Numeric-1.03.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MATEU/MooX-Types-MooseLike-Numeric-1.03.tar.gz"; sha256 = "16adeb617b963d010179922c2e4e8762df77c75232e17320b459868c4970c44b"; }; buildInputs = [ Moo TestFatal ]; @@ -12532,7 +12588,7 @@ let pname = "Moose-Autobox"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Moose-Autobox-0.16.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Moose-Autobox-0.16.tar.gz"; sha256 = "0mbhd0p7gf6qdhaylldl0ahq59zghs0vd5n1iqcbfkj8ryj1sh4j"; }; buildInputs = [ ModuleBuildTiny TestException ]; @@ -12547,7 +12603,7 @@ let pname = "MooseX-ABC"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/MooseX-ABC-0.06.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOY/MooseX-ABC-0.06.tar.gz"; sha256 = "1sky0dpi22wrymmkjmqba4k966zn7vrbpx918wn2nmg48swyrgjf"; }; buildInputs = [ TestFatal ]; @@ -12562,7 +12618,7 @@ let pname = "MooseX-Aliases"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/MooseX-Aliases-0.11.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOY/MooseX-Aliases-0.11.tar.gz"; sha256 = "0j07zqczjfmng3md6nkha7560i786d0cp3gdmrx49hr64jbhz1f4"; }; buildInputs = [ TestFatal ]; @@ -12573,13 +12629,13 @@ let pname = "MooseX-App-Cmd"; version = "0.32"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-App-Cmd-0.32.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-App-Cmd-0.32.tar.gz"; sha256 = "2e3bbf7283a4bee72d91d26eb204436030992bbe55cbd35ec33a546f16f973ff"; }; buildInputs = [ ModuleBuildTiny MooseXConfigFromFile TestOutput YAML ]; propagatedBuildInputs = [ AppCmd MooseXGetopt MooseXNonMoose ]; meta = { - homepage = https://github.com/moose/MooseX-App-Cmd; + homepage = "https://github.com/moose/MooseX-App-Cmd"; description = "Mashes up MooseX::Getopt and App::Cmd"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12589,12 +12645,12 @@ let pname = "MooX"; version = "0.101"; src = fetchurl { - url = mirror://cpan/authors/id/G/GE/GETTY/MooX-0.101.tar.gz; + url = "mirror://cpan/authors/id/G/GE/GETTY/MooX-0.101.tar.gz"; sha256 = "2ff91a656e78aae0aca42293829d7a7e5acb9bf22b0401635b2ab6c870de32d5"; }; propagatedBuildInputs = [ DataOptList ImportInto Moo ]; meta = { - homepage = https://github.com/Getty/p5-moox; + homepage = "https://github.com/Getty/p5-moox"; description = "Using Moo and MooX:: packages the most lazy way"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12604,7 +12660,7 @@ let pname = "MooX-Aliases"; version = "0.001006"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/MooX-Aliases-0.001006.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/MooX-Aliases-0.001006.tar.gz"; sha256 = "0rrqqsm8i6rckzxgzcj2p2s4cfszzddzwbcm04yjcqdcihkk2q01"; }; propagatedBuildInputs = [ Moo strictures ]; @@ -12619,7 +12675,7 @@ let pname = "MooX-Cmd"; version = "0.017"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/MooX-Cmd-0.017.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/MooX-Cmd-0.017.tar.gz"; sha256 = "1xbhmq07v9z371ygkyghva9aryhc22kwbzn5qwkp72c0ma6z4gwl"; }; propagatedBuildInputs = [ ListMoreUtils ModulePluggable Moo PackageStash ParamsUtil RegexpCommon ]; @@ -12634,7 +12690,7 @@ let pname = "MooX-late"; version = "0.016"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/MooX-late-0.016.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/MooX-late-0.016.tar.gz"; sha256 = "1fb6393e8b77c0ec1e99229bc6f5b9db362eedc172fa940b37defd9bb3415e4e"; }; buildInputs = [ TestFatal TestRequires ]; @@ -12649,7 +12705,7 @@ let pname = "MouseX-SimpleConfig"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/M/MJ/MJGARDNER/MouseX-SimpleConfig-0.11.tar.gz; + url = "mirror://cpan/authors/id/M/MJ/MJGARDNER/MouseX-SimpleConfig-0.11.tar.gz"; sha256 = "257f384091d33d340373a6153947039c698dc449d1ef989335644fc3d2da0069"; }; propagatedBuildInputs = [ ConfigAny MouseXConfigFromFile ]; @@ -12663,7 +12719,7 @@ let pname = "Test-UseAllModules"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Test-UseAllModules-0.17.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Test-UseAllModules-0.17.tar.gz"; sha256 = "a71f2fe8b96ab8bfc2760aa1d3135ea049a5b20dcb105457b769a1195c7a2509"; }; meta = { @@ -12676,7 +12732,7 @@ let pname = "Test-Valgrind"; version = "1.19"; src = fetchurl { - url = mirror://cpan/authors/id/V/VP/VPIT/Test-Valgrind-1.19.tar.gz; + url = "mirror://cpan/authors/id/V/VP/VPIT/Test-Valgrind-1.19.tar.gz"; sha256 = "06w1c0ddmmdkhhvv9pxq2nv5i40nbqf4cssfkq38yypfbyhsff0q"; }; propagatedBuildInputs = [ EnvSanctify FileHomeDir PerlDestructLevel XMLTwig ]; @@ -12691,7 +12747,7 @@ let pname = "MouseX-Types-Path-Class"; version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MASAKI/MouseX-Types-Path-Class-0.07.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MASAKI/MouseX-Types-Path-Class-0.07.tar.gz"; sha256 = "228d4b4f3f0ed9547278691d0b7c5fe53d90874a69df709a49703c6af87c09de"; }; buildInputs = [ TestUseAllModules ]; @@ -12706,7 +12762,7 @@ let pname = "MouseX-Types"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Types-0.06.tar.gz; + url = "mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Types-0.06.tar.gz"; sha256 = "77288441fdadd15beeec9a0813ece8aec1542f1d8ceaaec14755b3f316fbcf8b"; }; buildInputs = [ TestException ]; @@ -12721,7 +12777,7 @@ let pname = "MouseX-ConfigFromFile"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MASAKI/MouseX-ConfigFromFile-0.05.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MASAKI/MouseX-ConfigFromFile-0.05.tar.gz"; sha256 = "921b31cb13fc1f982a602f8e23815b7add23a224257e43790e287504ce879534"; }; buildInputs = [ TestUseAllModules ]; @@ -12736,13 +12792,13 @@ let pname = "MouseX-Getopt"; version = "0.38"; src = fetchurl { - url = mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Getopt-0.38.tar.gz; + url = "mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Getopt-0.38.tar.gz"; sha256 = "de3ea8ef452dd9501ea8c4eda8744b7224602602b04692607edd7d62b79f038f"; }; buildInputs = [ ModuleBuildTiny MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; propagatedBuildInputs = [ GetoptLongDescriptive Mouse ]; meta = { - homepage = https://github.com/gfx/mousex-getopt; + homepage = "https://github.com/gfx/mousex-getopt"; description = "A Mouse role for processing command line options"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12752,7 +12808,7 @@ let pname = "MooseX-Attribute-Chained"; version = "1.0.3"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOMHUKINS/MooseX-Attribute-Chained-1.0.3.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOMHUKINS/MooseX-Attribute-Chained-1.0.3.tar.gz"; sha256 = "0kjydmkxh8hpkbbmsgd5wrkhgq7w69lgfg6lx4s5g2xpqfkqmqz7"; }; propagatedBuildInputs = [ Moose ]; @@ -12762,7 +12818,7 @@ let pname = "MooseX-AttributeHelpers"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-AttributeHelpers-0.25.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-AttributeHelpers-0.25.tar.gz"; sha256 = "b0c819ec83999b258b248f82059fa5975a0cee365423abbee0efaca5401c5ec6"; }; buildInputs = [ ModuleBuildTiny TestException ]; @@ -12777,7 +12833,7 @@ let pname = "MooseX-Clone"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Clone-0.06.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Clone-0.06.tar.gz"; sha256 = "19wd74dihybnz1lbbsqn0clwxzb6y0aa0i25a8zhajz7p5fq5myb"; }; propagatedBuildInputs = [ DataVisitor HashUtilFieldHashCompat namespaceautoclean ]; @@ -12788,13 +12844,13 @@ let pname = "MooseX-ConfigFromFile"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-ConfigFromFile-0.14.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-ConfigFromFile-0.14.tar.gz"; sha256 = "9ad343cd9f86d714be9b54b9c68a443d8acc6501b6ad6b15e9ca0130b2e96f08"; }; buildInputs = [ ModuleBuildTiny TestDeep TestFatal TestRequires TestWithoutModule ]; propagatedBuildInputs = [ MooseXTypesPathTiny ]; meta = { - homepage = https://github.com/moose/MooseX-ConfigFromFile; + homepage = "https://github.com/moose/MooseX-ConfigFromFile"; description = "An abstract Moose role for setting attributes from a configfile"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12804,13 +12860,13 @@ let pname = "MooseX-Daemonize"; version = "0.22"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Daemonize-0.22.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Daemonize-0.22.tar.gz"; sha256 = "8a7fb999dca9b802a85136a10141b2d3378a3ecde0527c1df73d55edb28e59b3"; }; buildInputs = [ DevelCheckOS ModuleBuildTiny TestFatal ]; propagatedBuildInputs = [ MooseXGetopt MooseXTypesPathClass ]; meta = { - homepage = https://github.com/moose/MooseX-Daemonize; + homepage = "https://github.com/moose/MooseX-Daemonize"; description = "Role for daemonizing your Moose based application"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12820,7 +12876,7 @@ let pname = "MooseX-Emulate-Class-Accessor-Fast"; version = "0.009032"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/MooseX-Emulate-Class-Accessor-Fast-0.009032.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/MooseX-Emulate-Class-Accessor-Fast-0.009032.tar.gz"; sha256 = "153r30nggcyyx7ai15dbnba2h5145f8jdsh6wj54298d3zpvgvl2"; }; buildInputs = [ TestException ]; @@ -12835,13 +12891,13 @@ let pname = "MooseX-Getopt"; version = "0.74"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Getopt-0.74.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Getopt-0.74.tar.gz"; sha256 = "1de0df3b431ebe9f3563bdf4569eacd7e07e865a8397f2a990d0cb57d4cb2c24"; }; buildInputs = [ ModuleBuildTiny MooseXStrictConstructor PathTiny TestDeep TestFatal TestNeeds TestTrap TestWarnings ]; propagatedBuildInputs = [ GetoptLongDescriptive MooseXRoleParameterized ]; meta = { - homepage = https://github.com/moose/MooseX-Getopt; + homepage = "https://github.com/moose/MooseX-Getopt"; description = "A Moose role for processing command line options"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12851,13 +12907,13 @@ let pname = "MooseX-Has-Options"; version = "0.003"; src = fetchurl { - url = mirror://cpan/authors/id/P/PS/PSHANGOV/MooseX-Has-Options-0.003.tar.gz; + url = "mirror://cpan/authors/id/P/PS/PSHANGOV/MooseX-Has-Options-0.003.tar.gz"; sha256 = "07c21cf8ed500b272020ff8da19f194728bb414e0012a2f0cc54ef2ef6222a68"; }; buildInputs = [ Moose TestDeep TestDifferences TestException TestMost TestWarn namespaceautoclean ]; propagatedBuildInputs = [ ClassLoad ListMoreUtils StringRewritePrefix ]; meta = { - homepage = https://github.com/pshangov/moosex-has-options; + homepage = "https://github.com/pshangov/moosex-has-options"; description = "Succinct options for Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12867,13 +12923,13 @@ let pname = "MooseX-Has-Sugar"; version = "1.000006"; src = fetchurl { - url = mirror://cpan/authors/id/K/KE/KENTNL/MooseX-Has-Sugar-1.000006.tar.gz; + url = "mirror://cpan/authors/id/K/KE/KENTNL/MooseX-Has-Sugar-1.000006.tar.gz"; sha256 = "efeed3ddb3a8ea18f416d485f3c2b0427145d267e63368c651d488eaa8c28d09"; }; buildInputs = [ TestFatal namespaceclean ]; propagatedBuildInputs = [ SubExporterProgressive ]; meta = { - homepage = https://github.com/kentfredric/MooseX-Has-Sugar; + homepage = "https://github.com/kentfredric/MooseX-Has-Sugar"; description = "Sugar Syntax for moose 'has' fields"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12883,7 +12939,7 @@ let pname = "MooseX-LazyRequire"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-LazyRequire-0.11.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-LazyRequire-0.11.tar.gz"; sha256 = "ef620c1e019daf9cf3f23a943d25a94c91e93ab312bcd63be2e9740ec0b94288"; }; buildInputs = [ ModuleBuildTiny TestFatal ]; @@ -12899,7 +12955,7 @@ let pname = "MooseX-MarkAsMethods"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSRCHBOY/MooseX-MarkAsMethods-0.15.tar.gz; + url = "mirror://cpan/authors/id/R/RS/RSRCHBOY/MooseX-MarkAsMethods-0.15.tar.gz"; sha256 = "1y3yxwcjjajm66pvca54cv9fax7a6dy36xqr92x7vzyhfqrw3v69"; }; propagatedBuildInputs = [ Moose namespaceautoclean ]; @@ -12913,13 +12969,13 @@ let pname = "MooseX-MethodAttributes"; version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-MethodAttributes-0.31.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-MethodAttributes-0.31.tar.gz"; sha256 = "1whd10w7bm3dwaj7gpgw40bci9vvb2zmxs4349ifji91hvinwqck"; }; buildInputs = [ MooseXRoleParameterized TestFatal TestRequires ]; propagatedBuildInputs = [ MooseXTypes ]; meta = { - homepage = https://github.com/karenetheridge/moosex-methodattributes; + homepage = "https://github.com/karenetheridge/moosex-methodattributes"; description = "Code attribute introspection"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12929,7 +12985,7 @@ let pname = "MooseX-NonMoose"; version = "0.26"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/MooseX-NonMoose-0.26.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOY/MooseX-NonMoose-0.26.tar.gz"; sha256 = "0zdaiphc45s5xj0ax5mkijf5d8v6w6yccb3zplgj6f30y7n55gnb"; }; buildInputs = [ TestFatal ]; @@ -12944,12 +13000,12 @@ let pname = "MooseX-OneArgNew"; version = "0.005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-OneArgNew-0.005.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-OneArgNew-0.005.tar.gz"; sha256 = "0gqhqdkwsnxmni0xv43iplplgp6g55khdwc5117j9i569r3wykvy"; }; propagatedBuildInputs = [ MooseXRoleParameterized ]; meta = { - homepage = https://github.com/rjbs/moosex-oneargnew; + homepage = "https://github.com/rjbs/moosex-oneargnew"; description = "Teach ->new to accept single, non-hashref arguments"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12959,7 +13015,7 @@ let pname = "MooseX-RelatedClassRoles"; version = "0.004"; src = fetchurl { - url = mirror://cpan/authors/id/H/HD/HDP/MooseX-RelatedClassRoles-0.004.tar.gz; + url = "mirror://cpan/authors/id/H/HD/HDP/MooseX-RelatedClassRoles-0.004.tar.gz"; sha256 = "17vynkf6m5d039qkr4in1c9lflr8hnwp1fgzdwhj4q6jglipmnrh"; }; propagatedBuildInputs = [ MooseXRoleParameterized ]; @@ -12969,7 +13025,7 @@ let pname = "MooseX-Params-Validate"; version = "0.21"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-Params-Validate-0.21.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-Params-Validate-0.21.tar.gz"; sha256 = "1n9ry6gnskkp9ir6s7d5jirn3mh14ydgpmwqz6wcp6d9md358ac8"; }; buildInputs = [ TestFatal ]; @@ -12984,7 +13040,7 @@ let pname = "MooseX-Role-Parameterized"; version = "1.11"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-Parameterized-1.11.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-Parameterized-1.11.tar.gz"; sha256 = "17pc5dly7ba0p50p2xcmp7bar8m262jcqgbkgyswl3kzbmn7dzhw"; }; buildInputs = [ CPANMetaCheck ModuleBuildTiny TestFatal TestNeeds ]; @@ -13000,7 +13056,7 @@ let pname = "MooseX-Role-WithOverloading"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-WithOverloading-0.17.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-WithOverloading-0.17.tar.gz"; sha256 = "0rb8k0dp1a55bm2pr6r0vsi5msvjl1dslfidxp1gj80j7zbrbc4j"; }; propagatedBuildInputs = [ Moose aliased namespaceautoclean ]; @@ -13014,13 +13070,13 @@ let pname = "MooseX-Runnable"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Runnable-0.10.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Runnable-0.10.tar.gz"; sha256 = "40d8fd1b5524ae965965a1f144d7a0a0c850594c524402b2319b24d5c4af1199"; }; buildInputs = [ ModuleBuildTiny TestFatal TestSimple13 TestTableDriven ]; propagatedBuildInputs = [ ListSomeUtils MooseXTypesPathTiny ]; meta = { - homepage = https://github.com/moose/MooseX-Runnable; + homepage = "https://github.com/moose/MooseX-Runnable"; description = "Tag a class as a runnable application"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13030,7 +13086,7 @@ let pname = "MooseX-SemiAffordanceAccessor"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-SemiAffordanceAccessor-0.10.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-SemiAffordanceAccessor-0.10.tar.gz"; sha256 = "1mdil9ckgmgr78z59p8wfa35ixn5855ndzx14y01dvfxpiv5gf55"; }; propagatedBuildInputs = [ Moose ]; @@ -13040,7 +13096,7 @@ let pname = "MooseX-SetOnce"; version = "0.200002"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-SetOnce-0.200002.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-SetOnce-0.200002.tar.gz"; sha256 = "0ndnl8dj7nh8lvckl6r3jw31d0dmq30qf2pqkgcz0lykzjvhdvfb"; }; buildInputs = [ TestFatal ]; @@ -13051,7 +13107,7 @@ let pname = "MooseX-Singleton"; version = "0.30"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Singleton-0.30.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Singleton-0.30.tar.gz"; sha256 = "0hb5s1chsgbx2nlb0f112mdh2v1zwww8f4i3gvfvcghx3grv5135"; }; buildInputs = [ ModuleBuildTiny TestFatal TestRequires TestWarnings ]; @@ -13062,7 +13118,7 @@ let pname = "MooseX-StrictConstructor"; version = "0.21"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-StrictConstructor-0.21.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-StrictConstructor-0.21.tar.gz"; sha256 = "c72a5ae9583706ccdec71d401dcb3054013a7536b750df1436613d858ea2920d"; }; buildInputs = [ Moo TestFatal TestNeeds ]; @@ -13077,13 +13133,13 @@ let pname = "MooseX-Traits"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Traits-0.13.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Traits-0.13.tar.gz"; sha256 = "74afe0c4faf4e3b97c57f289437caa60becca34cd5821f489dd4cc9da4fbe29a"; }; buildInputs = [ ModuleBuildTiny MooseXRoleParameterized TestFatal TestRequires TestSimple13 ]; propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { - homepage = https://github.com/moose/MooseX-Traits; + homepage = "https://github.com/moose/MooseX-Traits"; description = "Automatically apply roles at object creation time"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13093,7 +13149,7 @@ let pname = "MooseX-Traits-Pluggable"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/MooseX-Traits-Pluggable-0.12.tar.gz; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/MooseX-Traits-Pluggable-0.12.tar.gz"; sha256 = "1jjqmcidy4kdgp5yffqqwxrsab62mbhbpvnzdy1rpwnb1savg5mb"; }; buildInputs = [ TestException ]; @@ -13104,13 +13160,13 @@ let pname = "MooseX-Types"; version = "0.50"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-0.50.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-0.50.tar.gz"; sha256 = "9cd87b3492cbf0be9d2df9317b2adf9fc30663770e69906654bea3f41b17cb08"; }; buildInputs = [ ModuleBuildTiny TestFatal TestRequires ]; propagatedBuildInputs = [ CarpClan Moose SubExporterForMethods namespaceautoclean ]; meta = { - homepage = https://github.com/moose/MooseX-Types; + homepage = "https://github.com/moose/MooseX-Types"; description = "Organise your Moose types in libraries"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13120,13 +13176,13 @@ let pname = "MooseX-Types-Common"; version = "0.001014"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Common-0.001014.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Common-0.001014.tar.gz"; sha256 = "ef93718b6d2f240d50b5c3acb1a74b4c2a191869651470001a82be1f35d0ef0f"; }; buildInputs = [ ModuleBuildTiny TestDeep TestWarnings ]; propagatedBuildInputs = [ MooseXTypes ]; meta = { - homepage = https://github.com/moose/MooseX-Types-Common; + homepage = "https://github.com/moose/MooseX-Types-Common"; description = "A library of commonly used type constraints"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13136,13 +13192,13 @@ let pname = "MooseX-Types-DateTime"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-DateTime-0.13.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-DateTime-0.13.tar.gz"; sha256 = "b89fa26636f6a17eaa3868b4514340472b68bbdc2161a1d79a22a1bf5b1d39c6"; }; buildInputs = [ ModuleBuildTiny TestFatal TestSimple13 ]; propagatedBuildInputs = [ DateTime MooseXTypes ]; meta = { - homepage = https://github.com/moose/MooseX-Types-DateTime; + homepage = "https://github.com/moose/MooseX-Types-DateTime"; description = "DateTime related constraints and coercions for Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13152,13 +13208,13 @@ let pname = "MooseX-Types-DateTime-MoreCoercions"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-DateTime-MoreCoercions-0.15.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-DateTime-MoreCoercions-0.15.tar.gz"; sha256 = "21bb3a597719888edb6ceaa132418d5cf92ecb92a50cce37b94259a55e0e3796"; }; buildInputs = [ ModuleBuildTiny TestFatal TestSimple13 ]; propagatedBuildInputs = [ DateTimeXEasy MooseXTypesDateTime TimeDurationParse ]; meta = { - homepage = https://github.com/moose/MooseX-Types-DateTime-MoreCoercions; + homepage = "https://github.com/moose/MooseX-Types-DateTime-MoreCoercions"; description = "Extensions to MooseX::Types::DateTime"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13168,13 +13224,13 @@ let pname = "MooseX-Types-LoadableClass"; version = "0.015"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-LoadableClass-0.015.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-LoadableClass-0.015.tar.gz"; sha256 = "e037d3778253dcf92946435715bada0e6449c0a2808fa3ff32a965064d5a3bf4"; }; buildInputs = [ ModuleBuildTiny TestFatal ]; propagatedBuildInputs = [ MooseXTypes ]; meta = { - homepage = https://github.com/moose/MooseX-Types-LoadableClass; + homepage = "https://github.com/moose/MooseX-Types-LoadableClass"; description = "ClassName type constraint with coercion to load the class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13184,7 +13240,7 @@ let pname = "MooseX-Types-Path-Class"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Class-0.09.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Class-0.09.tar.gz"; sha256 = "0zpgwzxj6d9k2lbg6v6zd1bcbzjz2h336rm816krbblq6ssvm177"; }; propagatedBuildInputs = [ MooseXTypes PathClass ]; @@ -13199,13 +13255,13 @@ let pname = "MooseX-Types-Path-Tiny"; version = "0.012"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Tiny-0.012.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Tiny-0.012.tar.gz"; sha256 = "19eede02dd654e70f73e34cd7af0063765173bcaefeeff1bdbe21318ecfd9158"; }; buildInputs = [ Filepushd ModuleBuildTiny TestFatal ]; propagatedBuildInputs = [ MooseXGetopt MooseXTypesStringlike PathTiny ]; meta = { - homepage = https://github.com/karenetheridge/moosex-types-path-tiny; + homepage = "https://github.com/karenetheridge/moosex-types-path-tiny"; description = "Path::Tiny types and coercions for Moose"; license = stdenv.lib.licenses.asl20; }; @@ -13215,7 +13271,7 @@ let pname = "MooseX-Types-Perl"; version = "0.101343"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Types-Perl-0.101343.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Types-Perl-0.101343.tar.gz"; sha256 = "0nijy676q27bvjb8swxrb1j4lq2xq8jbqkaxs1l9q81k7jpvx17h"; }; propagatedBuildInputs = [ MooseXTypes ]; @@ -13229,12 +13285,12 @@ let pname = "MooseX-Types-Stringlike"; version = "0.003"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/MooseX-Types-Stringlike-0.003.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/MooseX-Types-Stringlike-0.003.tar.gz"; sha256 = "06fgamdiz0n7cgghb8ycjd5mcidj8w769zs2gws6z6jjbkn4kqrf"; }; propagatedBuildInputs = [ MooseXTypes ]; meta = { - homepage = https://github.com/dagolden/moosex-types-stringlike; + homepage = "https://github.com/dagolden/moosex-types-stringlike"; description = "Moose type constraints for strings or string-like objects"; license = stdenv.lib.licenses.asl20; }; @@ -13244,7 +13300,7 @@ let pname = "MooseX-Types-Structured"; version = "0.36"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Structured-0.36.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Structured-0.36.tar.gz"; sha256 = "0mrxc00sid7526c6brrnjr6288468sszic3wazij71v3z59bdka3"; }; buildInputs = [ DateTime ModuleBuildTiny MooseXTypesDateTime TestFatal TestNeeds ]; @@ -13259,13 +13315,13 @@ let pname = "MooseX-Types-URI"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-URI-0.08.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-URI-0.08.tar.gz"; sha256 = "d310d20fa361fe2dff758236df87949cc7bf98e5cf3a7c79115365eccde6ccc1"; }; buildInputs = [ ModuleBuildTiny TestSimple13 ]; propagatedBuildInputs = [ MooseXTypesPathClass URIFromHash ]; meta = { - homepage = https://github.com/moose/MooseX-Types-URI; + homepage = "https://github.com/moose/MooseX-Types-URI"; description = "URI related types and coercions for Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13275,7 +13331,7 @@ let pname = "Mouse"; version = "2.5.9"; src = fetchurl { - url = mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.9.tar.gz; + url = "mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.9.tar.gz"; sha256 = "0wqcnm6xl7fv9r8izc9c43kr83qsr60i7y53hkickcqhxx38vmxr"; }; buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny ]; @@ -13288,7 +13344,7 @@ let pname = "MouseX-NativeTraits"; version = "1.09"; src = fetchurl { - url = mirror://cpan/authors/id/G/GF/GFUJI/MouseX-NativeTraits-1.09.tar.gz; + url = "mirror://cpan/authors/id/G/GF/GFUJI/MouseX-NativeTraits-1.09.tar.gz"; sha256 = "0pnbchkxfz9fwa8sniyjqp0mz75b3k2fafq9r09znbbh51dbz9gq"; }; buildInputs = [ AnyMoose TestFatal ]; @@ -13303,7 +13359,7 @@ let pname = "Mozilla-CA"; version = "20180117"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20180117.tar.gz; + url = "mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20180117.tar.gz"; sha256 = "f2cc9fbe119f756313f321e0d9f1fac0859f8f154ac9d75b1a264c1afdf4e406"; }; @@ -13323,7 +13379,7 @@ let pname = "MRO-Compat"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/MRO-Compat-0.13.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/MRO-Compat-0.13.tar.gz"; sha256 = "1y547lr6zccf7919vx01v22zsajy528psanhg5aqschrrin3nb4a"; }; meta = { @@ -13336,7 +13392,7 @@ let pname = "MusicBrainz-DiscID"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.03.tar.gz; + url = "mirror://cpan/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.03.tar.gz"; sha256 = "0fjph2q3yp0aa87gckv3391s47m13wbyylj7jb7vqx7hv0pzj0jh"; }; perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' @@ -13351,7 +13407,7 @@ let pname = "WebService-MusicBrainz"; version = "1.0.5"; src = fetchurl { - url = mirror://cpan/authors/id/B/BF/BFAIST/WebService-MusicBrainz-1.0.5.tar.gz; + url = "mirror://cpan/authors/id/B/BF/BFAIST/WebService-MusicBrainz-1.0.5.tar.gz"; sha256 = "16chs1l58cf000d5kalkyph3p31ci73p1rlyx98mfv10d2cq6fsj"; }; propagatedBuildInputs = [ Mojolicious ]; @@ -13392,13 +13448,13 @@ let pname = "namespace-autoclean"; version = "0.29"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/namespace-autoclean-0.29.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/namespace-autoclean-0.29.tar.gz"; sha256 = "45ebd8e64a54a86f88d8e01ae55212967c8aa8fed57e814085def7608ac65804"; }; buildInputs = [ TestNeeds ]; propagatedBuildInputs = [ SubIdentify namespaceclean ]; meta = { - homepage = https://github.com/moose/namespace-autoclean; + homepage = "https://github.com/moose/namespace-autoclean"; description = "Keep imports out of your namespace"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13408,7 +13464,7 @@ let pname = "namespace-clean"; version = "0.27"; src = fetchurl { - url = mirror://cpan/authors/id/R/RI/RIBASUSHI/namespace-clean-0.27.tar.gz; + url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/namespace-clean-0.27.tar.gz"; sha256 = "8a10a83c3e183dc78f9e7b7aa4d09b47c11fb4e7d3a33b9a12912fd22e31af9d"; }; propagatedBuildInputs = [ BHooksEndOfScope PackageStash ]; @@ -13422,11 +13478,11 @@ let pname = "Net-Ident"; version = "1.25"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Net-Ident-1.25.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/Net-Ident-1.25.tar.gz"; sha256 = "2e5bd58b01c2a66e8049a2f8d9c93e1b5f6dce53e0ee3a481ce6a6f411f2c8f8"; }; meta = { - homepage = https://github.com/toddr/Net-Ident; + homepage = "https://github.com/toddr/Net-Ident"; description = "Lookup the username on the remote end of a TCP/IP connection"; license = stdenv.lib.licenses.mit; }; @@ -13436,7 +13492,7 @@ let pname = "NetAddr-IP"; version = "4.079"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKER/NetAddr-IP-4.079.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIKER/NetAddr-IP-4.079.tar.gz"; sha256 = "ec5a82dfb7028bcd28bb3d569f95d87dd4166cc19867f2184ed3a59f6d6ca0e7"; }; meta = { @@ -13449,7 +13505,7 @@ let pname = "Net-Amazon-AWSSign"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/N/NA/NATON/Net-Amazon-AWSSign-0.12.tar.gz; + url = "mirror://cpan/authors/id/N/NA/NATON/Net-Amazon-AWSSign-0.12.tar.gz"; sha256 = "0gpdjz5095hd3y1xhnbv45m6q2shw0c9r7spj1jvb8hy7dmhq10x"; }; propagatedBuildInputs = [ URI ]; @@ -13462,7 +13518,7 @@ let pname = "Net-Amazon-EC2"; version = "0.36"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MALLEN/Net-Amazon-EC2-0.36.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MALLEN/Net-Amazon-EC2-0.36.tar.gz"; sha256 = "1wbjgmxjzr8mjpwj3mglan9hyh327cz27sfsir0w4rphwy93ca2f"; }; propagatedBuildInputs = [ LWPProtocolHttps Moose ParamsValidate XMLSimple ]; @@ -13477,7 +13533,7 @@ let pname = "Net-Amazon-MechanicalTurk"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/M/MT/MTURK/Net-Amazon-MechanicalTurk-1.02.tar.gz; + url = "mirror://cpan/authors/id/M/MT/MTURK/Net-Amazon-MechanicalTurk-1.02.tar.gz"; sha256 = "13hgggfchhp4m3l2rn3d1v6g6ccwmwf9xiyc9izv5570930mw2cd"; }; patches = @@ -13490,7 +13546,7 @@ let pname = "Net-Amazon-S3"; version = "0.87"; src = fetchurl { - url = mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.87.tar.gz; + url = "mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.87.tar.gz"; sha256 = "77d803477a0c635f311f538e163c5f10e471882c5153398012c93f4284376b8f"; }; buildInputs = [ TestDeep TestException TestLoadAllModules TestMockTime TestWarnings ]; @@ -13505,7 +13561,7 @@ let pname = "Net-Amazon-S3-Policy"; version = "0.1.6"; src = fetchurl { - url = mirror://cpan/authors/id/P/PO/POLETTIX/Net-Amazon-S3-Policy-0.1.6.tar.gz; + url = "mirror://cpan/authors/id/P/PO/POLETTIX/Net-Amazon-S3-Policy-0.1.6.tar.gz"; sha256 = "056rhq6vsdpwi2grbmxj8341qjrz0258civpnhs78j37129nxcfj"; }; propagatedBuildInputs = [ JSON ]; @@ -13519,7 +13575,7 @@ let pname = "Net-Async-Ping"; version = "0.004001"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABRAXXA/Net-Async-Ping-0.004001.tar.gz; + url = "mirror://cpan/authors/id/A/AB/ABRAXXA/Net-Async-Ping-0.004001.tar.gz"; sha256 = "0nz9i9fp7wp620f4i9z8fip1zhcaz34ckhd00ymksw8cfr8fhmwh"; }; propagatedBuildInputs = [ IOAsync Moo NetFrameLayerIPv6 namespaceclean ]; @@ -13535,7 +13591,7 @@ let pname = "Net-AMQP"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHIPS/Net-AMQP-0.06.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHIPS/Net-AMQP-0.06.tar.gz"; sha256 = "0b2ba7de2cd7ddd5fe102a2e2ae7aeba21eaab1078bf3bfd3c5a722937256380"; }; doCheck = false; # failures on 32bit @@ -13551,7 +13607,7 @@ let pname = "Net-CIDR"; version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.20.tar.gz; + url = "mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.20.tar.gz"; sha256 = "c75edc6818bb360d71c139169fd64ad65c35fff6d2b9fac7b9f9e6c467f187b5"; }; meta = { @@ -13565,7 +13621,7 @@ let pname = "Net-CIDR-Lite"; version = "0.21"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOUGW/Net-CIDR-Lite-0.21.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOUGW/Net-CIDR-Lite-0.21.tar.gz"; sha256 = "cfa125e8a2aef9259bc3a44e07cbdfb7894b64d22e7c0cee92aee2f5c7915093"; }; meta = { @@ -13577,13 +13633,13 @@ let pname = "Net-CoverArtArchive"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/C/CY/CYCLES/Net-CoverArtArchive-1.02.tar.gz; + url = "mirror://cpan/authors/id/C/CY/CYCLES/Net-CoverArtArchive-1.02.tar.gz"; sha256 = "1lfx8lrjgb3s11fcm243jp5sghngd9svkgmg7xmssmj34q4f49ap"; }; buildInputs = [ FileFindRule ]; propagatedBuildInputs = [ JSONAny LWP Moose namespaceautoclean ]; meta = { - homepage = https://github.com/metabrainz/CoverArtArchive; + homepage = "https://github.com/metabrainz/CoverArtArchive"; description = "Query the coverartarchive.org"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13593,14 +13649,14 @@ let pname = "Net-DBus"; version = "1.2.0"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DANBERR/Net-DBus-1.2.0.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DANBERR/Net-DBus-1.2.0.tar.gz"; sha256 = "e7a1ac9ef4a1235b3fdbd5888f86c347182306467bd79abc9b0756a64b441cbc"; }; nativeBuildInputs = [ pkgs.buildPackages.pkgconfig ]; buildInputs = [ pkgs.dbus TestPod TestPodCoverage ]; propagatedBuildInputs = [ XMLTwig ]; meta = { - homepage = http://www.freedesktop.org/wiki/Software/dbus; + homepage = "http://www.freedesktop.org/wiki/Software/dbus"; description = "Extension for the DBus bindings"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13610,7 +13666,7 @@ let pname = "Net-DNS"; version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.21.tar.gz; + url = "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.21.tar.gz"; sha256 = "ddefe13b28084ffcc8f10a96b3c13c59449dbf6fc371c006d129630ea0ce767a"; }; propagatedBuildInputs = [ DigestHMAC ]; @@ -13625,7 +13681,7 @@ let pname = "Net-DNS-Resolver-Mock"; version = "1.20171219"; src = fetchurl { - url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20171219.tar.gz; + url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20171219.tar.gz"; sha256 = "0m3rxpkv1b9121srvbqkrgzg4m8mnydiydqv34in1i1ixwrl6jn9"; }; propagatedBuildInputs = [ NetDNS ]; @@ -13639,7 +13695,7 @@ let pname = "Net-Domain-TLD"; version = "1.75"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXP/Net-Domain-TLD-1.75.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXP/Net-Domain-TLD-1.75.tar.gz"; sha256 = "4c37f811184d68ac4179d48c10ea31922dd5fca2c1bffcdcd95c5a2a3b4002ee"; }; meta = { @@ -13652,7 +13708,7 @@ let pname = "Net-FastCGI"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHANSEN/Net-FastCGI-0.14.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHANSEN/Net-FastCGI-0.14.tar.gz"; sha256 = "0sjrnlzci21sci5m52zz0x9bf889j67i6vnhrjlypsfm9w5914qi"; }; buildInputs = [ TestException TestHexString ]; @@ -13666,7 +13722,7 @@ let pname = "Net-Frame"; version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/G/GO/GOMOR/Net-Frame-1.21.tar.gz; + url = "mirror://cpan/authors/id/G/GO/GOMOR/Net-Frame-1.21.tar.gz"; sha256 = "0ffphcw52dgn07k7q02di77zq2zzc0p3vlv2gnphr7v3ifi5gcxw"; }; propagatedBuildInputs = [ BitVector ClassGomor NetIPv6Addr ]; @@ -13681,7 +13737,7 @@ let pname = "Net-Frame-Layer-IPv6"; version = "1.08"; src = fetchurl { - url = mirror://cpan/authors/id/G/GO/GOMOR/Net-Frame-Layer-IPv6-1.08.tar.gz; + url = "mirror://cpan/authors/id/G/GO/GOMOR/Net-Frame-Layer-IPv6-1.08.tar.gz"; sha256 = "1mzp778jmjn23990gj0mibhr9mrwmaw85nh7wf25hzzkx0mqabds"; }; propagatedBuildInputs = [ NetFrame ]; @@ -13695,13 +13751,13 @@ let pname = "Net-HTTP"; version = "6.19"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/Net-HTTP-6.19.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/Net-HTTP-6.19.tar.gz"; sha256 = "52b76ec13959522cae64d965f15da3d99dcb445eddd85d2ce4e4f4df385b2fc4"; }; propagatedBuildInputs = [ URI ]; __darwinAllowLocalNetworking = true; meta = { - homepage = https://github.com/libwww-perl/Net-HTTP; + homepage = "https://github.com/libwww-perl/Net-HTTP"; description = "Low-level HTTP connection (client)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13712,7 +13768,7 @@ let pname = "Net-IDN-Encode"; version = "2.500"; src = fetchurl { - url = mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.500.tar.gz; + url = "mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.500.tar.gz"; sha256 = "1aiy7adirk3wpwlczd8sldi9k1dray0jrg1lbcrcw97zwcrkciam"; }; buildInputs = [ TestNoWarnings ]; @@ -13726,7 +13782,7 @@ let pname = "Net-IMAP-Client"; version = "0.9505"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GANGLION/Net-IMAP-Client-0.9505.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GANGLION/Net-IMAP-Client-0.9505.tar.gz"; sha256 = "d3f6a608b85e09a8080a67a9933837aae6f2cd0e8ee39df3380123dc5e3de912"; }; propagatedBuildInputs = [ IOSocketSSL ListMoreUtils ]; @@ -13739,7 +13795,7 @@ let pname = "Net-IP"; version = "1.26"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MANU/Net-IP-1.26.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MANU/Net-IP-1.26.tar.gz"; sha256 = "0ffn2xqqbkfi7v303sp5dwgbv36jah3vg8r4nxhxfiv60vric3q4"; }; meta = { @@ -13751,7 +13807,7 @@ let pname = "Net-IPv4Addr"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FRAJULAC/Net-IPv4Addr-0.10.tar.gz; + url = "mirror://cpan/authors/id/F/FR/FRAJULAC/Net-IPv4Addr-0.10.tar.gz"; sha256 = "1zk3591822dg187sgkwjjvg18qmvkn3yib1c34mq8z5i617xwi9q"; }; meta = { @@ -13762,7 +13818,7 @@ let pname = "Net-IPv6Addr"; version = "0.96"; src = fetchurl { - url = mirror://cpan/authors/id/B/BK/BKB/Net-IPv6Addr-0.96.tar.gz; + url = "mirror://cpan/authors/id/B/BK/BKB/Net-IPv6Addr-0.96.tar.gz"; sha256 = "1y6dpv3gafvjcw9c5ldxminykz6aggwqdj6l93h9w2hncz8fa0iv"; }; propagatedBuildInputs = [ MathBase85 MathBigInt NetIPv4Addr ]; @@ -13776,7 +13832,7 @@ let pname = "Net-Netmask"; version = "1.9104"; src = fetchurl { - url = mirror://cpan/authors/id/J/JM/JMASLAK/Net-Netmask-1.9104.tar.gz; + url = "mirror://cpan/authors/id/J/JM/JMASLAK/Net-Netmask-1.9104.tar.gz"; sha256 = "17li2svymz49az35xl6galp4b9qcnb985gzklhikkvkn9da6rz3y"; }; buildInputs = [ Test2Suite TestUseAllModules ]; @@ -13789,7 +13845,7 @@ let pname = "Net-OAuth"; version = "0.28"; src = fetchurl { - url = mirror://cpan/authors/id/K/KG/KGRENNAN/Net-OAuth-0.28.tar.gz; + url = "mirror://cpan/authors/id/K/KG/KGRENNAN/Net-OAuth-0.28.tar.gz"; sha256 = "0k4h4a5048h7qgyx25ih64x0l4airx8a6d9gjq08wmxcl2fk3z3v"; }; buildInputs = [ TestWarn ]; @@ -13804,7 +13860,7 @@ let pname = "Net-Patricia"; version = "1.22"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GRUBER/Net-Patricia-1.22.tar.gz; + url = "mirror://cpan/authors/id/G/GR/GRUBER/Net-Patricia-1.22.tar.gz"; sha256 = "70835a926e1c5a8d0324c72fffee82eeb7ec6c141dee04fd446820b64f71c552"; }; propagatedBuildInputs = [ NetCIDRLite Socket6 ]; @@ -13814,7 +13870,7 @@ let pname = "Net-Ping"; version = "2.72"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.72.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.72.tar.gz"; sha256 = "555af602f54229cd81fef7da1a81516800f3155c6dc4d07dc71be1de3253dd6a"; }; meta = { @@ -13826,7 +13882,7 @@ let pname = "Net-DNS-Resolver-Programmable"; version = "0.009"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BIGPRESH/Net-DNS-Resolver-Programmable-0.009.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BIGPRESH/Net-DNS-Resolver-Programmable-0.009.tar.gz"; sha256 = "8080a2ab776629585911af1179bdb7c4dc2bebfd4b5efd77b11d1dac62454bf8"; }; propagatedBuildInputs = [ NetDNS ]; @@ -13840,7 +13896,7 @@ let pname = "Net-Prometheus"; version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Net-Prometheus-0.07.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Prometheus-0.07.tar.gz"; sha256 = "1dh498b26wdaip053hw52317jjmb2n2r5209a1zv5yfrlxpblqm7"; }; propagatedBuildInputs = [ RefUtil StructDumb ]; @@ -13855,7 +13911,7 @@ let pname = "Net-SCP"; version = "0.08.reprise"; src = fetchurl { - url = mirror://cpan/authors/id/I/IV/IVAN/Net-SCP-0.08.reprise.tar.gz; + url = "mirror://cpan/authors/id/I/IV/IVAN/Net-SCP-0.08.reprise.tar.gz"; sha256 = "88a9b2df69e769e5855a408b19f61915b82e8fe070ab5cf4d525dd3b8bbe31c1"; }; propagatedBuildInputs = [ pkgs.openssl ]; @@ -13873,7 +13929,7 @@ let pname = "Net-Server"; version = "2.009"; src = fetchurl { - url = mirror://cpan/authors/id/R/RH/RHANDOM/Net-Server-2.009.tar.gz; + url = "mirror://cpan/authors/id/R/RH/RHANDOM/Net-Server-2.009.tar.gz"; sha256 = "0gw1k9gcw7habbkxvsfa2gz34brlbwcidk6khgsf1qjm0dbccrw2"; }; doCheck = false; # seems to hang waiting for connections @@ -13886,7 +13942,7 @@ let pname = "Net-SFTP-Foreign"; version = "1.90"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SALVA/Net-SFTP-Foreign-1.90.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SALVA/Net-SFTP-Foreign-1.90.tar.gz"; sha256 = "d1eafb34f669ab6de675058292778ba2e0e42ecafd59abb1128ba31d62a0419d"; }; propagatedBuildInputs = [ pkgs.openssl ]; @@ -13903,7 +13959,7 @@ let pname = "Net-Server-Coro"; version = "1.3"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/Net-Server-Coro-1.3.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXMV/Net-Server-Coro-1.3.tar.gz"; sha256 = "11pvfxsi0q37kd17z597wb8r9dv3r96fiagq57kc746k1lmp06hy"; }; propagatedBuildInputs = [ Coro NetServer ]; @@ -13917,7 +13973,7 @@ let pname = "Net-SMTP-SSL"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Net-SMTP-SSL-1.04.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Net-SMTP-SSL-1.04.tar.gz"; sha256 = "001a6dcfahf7kkyirqkc8jd4fh4fkal7n7vm9c4dblqrvmdc8abv"; }; propagatedBuildInputs = [ IOSocketSSL ]; @@ -13927,7 +13983,7 @@ let pname = "Net-SMTP-TLS"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/A/AW/AWESTHOLM/Net-SMTP-TLS-0.12.tar.gz; + url = "mirror://cpan/authors/id/A/AW/AWESTHOLM/Net-SMTP-TLS-0.12.tar.gz"; sha256 = "19g48kabj22v66jbf69q78xplhi7r1y2kdbddfwh4xy3g9k75rzg"; }; propagatedBuildInputs = [ DigestHMAC IOSocketSSL ]; @@ -13937,7 +13993,7 @@ let pname = "Net-SMTP-TLS-ButMaintained"; version = "0.24"; src = fetchurl { - url = mirror://cpan/authors/id/F/FA/FAYLAND/Net-SMTP-TLS-ButMaintained-0.24.tar.gz; + url = "mirror://cpan/authors/id/F/FA/FAYLAND/Net-SMTP-TLS-ButMaintained-0.24.tar.gz"; sha256 = "0vi5cv7f9i96hgp3q3jpxzn1ysn802kh5xc304f8b7apf67w15bb"; }; propagatedBuildInputs = [ DigestHMAC IOSocketSSL ]; @@ -13972,7 +14028,7 @@ let pname = "Net-SSH"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/I/IV/IVAN/Net-SSH-0.09.tar.gz; + url = "mirror://cpan/authors/id/I/IV/IVAN/Net-SSH-0.09.tar.gz"; sha256 = "7c71c7c3cbe953234dfe25bcc1ad7edb0e1f5a0578601f5523bc6070262a3817"; }; propagatedBuildInputs = [ pkgs.openssl ]; @@ -13989,7 +14045,7 @@ let pname = "Net-SSH-Perl"; version = "2.14"; src = fetchurl { - url = mirror://cpan/authors/id/S/SC/SCHWIGON/Net-SSH-Perl-2.14.tar.gz; + url = "mirror://cpan/authors/id/S/SC/SCHWIGON/Net-SSH-Perl-2.14.tar.gz"; sha256 = "2b5d1bb13590b5870116704e7f1dce9a9823c4f80ff5461b97bb26a317393017"; }; propagatedBuildInputs = [ CryptCurve25519 CryptIDEA CryptX FileHomeDir MathGMP StringCRC32 ]; @@ -14004,7 +14060,7 @@ let pname = "Net-SSLeay"; version = "1.88"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.88.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.88.tar.gz"; sha256 = "1pfgh4h3szcpvqlcimc60pjbk9zwls99x5863sva0wc47i4dl010"; }; buildInputs = [ pkgs.openssl ]; @@ -14026,7 +14082,7 @@ let pname = "Net-Statsd"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/COSIMO/Net-Statsd-0.12.tar.gz; + url = "mirror://cpan/authors/id/C/CO/COSIMO/Net-Statsd-0.12.tar.gz"; sha256 = "63e453603da165bc6d1c4ca0b55eda3d2204f040c59304a47782c5aa7886565c"; }; meta = { @@ -14039,7 +14095,7 @@ let pname = "Net-Telnet"; version = "3.04"; src = fetchurl { - url = mirror://cpan/authors/id/J/JR/JROGERS/Net-Telnet-3.04.tar.gz; + url = "mirror://cpan/authors/id/J/JR/JROGERS/Net-Telnet-3.04.tar.gz"; sha256 = "e64d567a4e16295ecba949368e7a6b8b5ae2a16b3ad682121d9b007dc5d2a37a"; }; meta = { @@ -14052,14 +14108,14 @@ let pname = "Net-Twitter-Lite"; version = "0.12008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MM/MMIMS/Net-Twitter-Lite-0.12008.tar.gz; + url = "mirror://cpan/authors/id/M/MM/MMIMS/Net-Twitter-Lite-0.12008.tar.gz"; sha256 = "13j69a6nqq8mh5b4qk021db55rkfnk1ppwk0rpg68b1z58gvxsmj"; }; buildInputs = [ ModuleBuildTiny TestFatal ]; propagatedBuildInputs = [ JSON LWPProtocolHttps ]; doCheck = false; meta = { - homepage = https://github.com/semifor/Net-Twitter-Lite; + homepage = "https://github.com/semifor/Net-Twitter-Lite"; description = "A perl interface to the Twitter API"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -14069,7 +14125,7 @@ let pname = "Net-Whois-IP"; version = "1.19"; src = fetchurl { - url = mirror://cpan/authors/id/B/BS/BSCHMITZ/Net-Whois-IP-1.19.tar.gz; + url = "mirror://cpan/authors/id/B/BS/BSCHMITZ/Net-Whois-IP-1.19.tar.gz"; sha256 = "08kj2h9qiyfvv3jfz619xl796j93cslg7d96919mnrnjy6hdz6zh"; }; doCheck = false; @@ -14085,7 +14141,7 @@ let pname = "Net-Works"; version = "0.22"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/Net-Works-0.22.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAXMIND/Net-Works-0.22.tar.gz"; sha256 = "1zz91vn1kdxljnlwllf4dzdsm4v6pja5694vf8l4w66azcyv5j8a"; }; propagatedBuildInputs = [ ListAllUtils MathInt128 Moo namespaceautoclean ]; @@ -14100,7 +14156,7 @@ let pname = "Number-Bytes-Human"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/F/FE/FERREIRA/Number-Bytes-Human-0.11.tar.gz; + url = "mirror://cpan/authors/id/F/FE/FERREIRA/Number-Bytes-Human-0.11.tar.gz"; sha256 = "0b3gprpbcrdwc2gqalpys5m2ngilh5injhww8y0gf3dln14rrisz"; }; }; @@ -14109,7 +14165,7 @@ let pname = "Number-Compare"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCLAMP/Number-Compare-0.03.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCLAMP/Number-Compare-0.03.tar.gz"; sha256 = "09q8i0mxvr7q9vajwlgawsi0hlpc119gnhq4hc933d03x0vkfac3"; }; }; @@ -14118,7 +14174,7 @@ let pname = "Number-Format"; version = "1.75"; src = fetchurl { - url = mirror://cpan/authors/id/W/WR/WRW/Number-Format-1.75.tar.gz; + url = "mirror://cpan/authors/id/W/WR/WRW/Number-Format-1.75.tar.gz"; sha256 = "82d659cb16461764fd44d11a9ce9e6a4f5e8767dc1069eb03467c6e55de257f3"; }; meta = { @@ -14131,7 +14187,7 @@ let pname = "Number-Fraction"; version = "2.01"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAVECROSS/Number-Fraction-2.01.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Number-Fraction-2.01.tar.gz"; sha256 = "1ysv5md4dmz95zc0gy8ivb21nhqxyv8vrc5lr2sgshsjrdqsi185"; }; propagatedBuildInputs = [ Moose ]; @@ -14145,7 +14201,7 @@ let pname = "Number-Misc"; version = "1.2"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKO/Number-Misc-1.2.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIKO/Number-Misc-1.2.tar.gz"; sha256 = "1n4ivj4ydplanwbxn3jbsfyfcl91ngn2d0addzqrq1hac26bdfbp"; }; meta = { @@ -14158,7 +14214,7 @@ let pname = "Number-WithError"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/Number-WithError-1.01.tar.gz; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/Number-WithError-1.01.tar.gz"; sha256 = "0m7my372rcj2d3j8xvhqdlhnnvxqabasvpvvhdkyli3qgrra1xnz"; }; propagatedBuildInputs = [ ParamsUtil prefork ]; @@ -14173,7 +14229,7 @@ let pname = "NTLM"; version = "1.09"; src = fetchurl { - url = mirror://cpan/authors/id/N/NB/NBEBOUT/NTLM-1.09.tar.gz; + url = "mirror://cpan/authors/id/N/NB/NBEBOUT/NTLM-1.09.tar.gz"; sha256 = "c823e30cda76bc15636e584302c960e2b5eeef9517c2448f7454498893151f85"; }; propagatedBuildInputs = [ DigestHMAC ]; @@ -14187,7 +14243,7 @@ let pname = "Object-Accessor"; version = "0.48"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Object-Accessor-0.48.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Object-Accessor-0.48.tar.gz"; sha256 = "76cb824a27b6b4e560409fcf6fd5b3bfbbd38b72f1f3d37ed0b54bd9c0baeade"; }; meta = { @@ -14200,7 +14256,7 @@ let pname = "Object-InsideOut"; version = "4.05"; src = fetchurl { - url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Object-InsideOut-4.05.tar.gz; + url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/Object-InsideOut-4.05.tar.gz"; sha256 = "1i6aif37ji91nsyncp5d0d3q29clf009sxdn1rz38917hai6rzcx"; }; propagatedBuildInputs = [ ExceptionClass ]; @@ -14214,7 +14270,7 @@ let pname = "Object-Signature"; version = "1.08"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Object-Signature-1.08.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Object-Signature-1.08.tar.gz"; sha256 = "12k90c19ly93ib1p6sm3k7sbnr2h5dbywkdmnff2ngm99p4m68c4"; }; meta = { @@ -14227,7 +14283,7 @@ let pname = "OLE-Storage_Lite"; version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/J/JM/JMCNAMARA/OLE-Storage_Lite-0.20.tar.gz; + url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/OLE-Storage_Lite-0.20.tar.gz"; sha256 = "1fpqhhgb8blj4hhs97fsbnbhk29s9yms057a9s9yl20f3hbsc65b"; }; meta = { @@ -14240,7 +14296,7 @@ let pname = "Opcodes"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Opcodes-0.14.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Opcodes-0.14.tar.gz"; sha256 = "7f7365447e4d1c5b87b43091448f0488e67c9f036b26c022a5409cd73d343893"; }; meta = { @@ -14269,7 +14325,7 @@ let pname = "OpenGL"; version = "0.70"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHM/OpenGL-0.70.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHM/OpenGL-0.70.tar.gz"; sha256 = "1q3lz168q081iwl9jg21fbzhp9la79gav9mv6nmh2jab83s2l3mj"; }; @@ -14294,7 +14350,7 @@ let pname = "Net-OpenID-Common"; version = "1.20"; src = fetchurl { - url = mirror://cpan/authors/id/W/WR/WROG/Net-OpenID-Common-1.20.tar.gz; + url = "mirror://cpan/authors/id/W/WR/WROG/Net-OpenID-Common-1.20.tar.gz"; sha256 = "1jdbkp18ka2m4akjp9b0dbw2lqnzgwpq435cnh6hwwa79bbrfkmb"; }; propagatedBuildInputs = [ CryptDHGMP XMLSimple ]; @@ -14304,7 +14360,7 @@ let pname = "Net-OpenID-Consumer"; version = "1.18"; src = fetchurl { - url = mirror://cpan/authors/id/W/WR/WROG/Net-OpenID-Consumer-1.18.tar.gz; + url = "mirror://cpan/authors/id/W/WR/WROG/Net-OpenID-Consumer-1.18.tar.gz"; sha256 = "0f2g6sczvbpyjmy14pabmrj0d48hlsndqswrvmqk1161wxpkh70f"; }; propagatedBuildInputs = [ JSON NetOpenIDCommon ]; @@ -14315,7 +14371,7 @@ let pname = "Net-OpenSSH"; version = "0.78"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.78.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.78.tar.gz"; sha256 = "8f10844542a2824389decdb8edec7561d8199dc5f0250e849a0bb56f7aee880c"; }; meta = { @@ -14328,7 +14384,7 @@ let pname = "Net-ZooKeeper"; version = "0.41"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAF/Net-ZooKeeper-0.41.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAF/Net-ZooKeeper-0.41.tar.gz"; sha256 = "91c177f30f82302eaf3173356eef05c21bc82163df752acb469177bd14a72db9"; }; buildInputs = [ pkgs.zookeeper_mt ]; @@ -14338,7 +14394,7 @@ let NIX_CFLAGS_LINK = "-L${pkgs.zookeeper_mt.out}/lib -lzookeeper_mt"; meta = { maintainers = [ maintainers.limeytexan ]; - homepage = https://github.com/mark-5/p5-net-zookeeper; + homepage = "https://github.com/mark-5/p5-net-zookeeper"; license = stdenv.lib.licenses.asl20; }; }; @@ -14347,7 +14403,7 @@ let pname = "Package-Constants"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Package-Constants-0.06.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Package-Constants-0.06.tar.gz"; sha256 = "0b58be78706ccc4e4bd9bbad41767470427fd7b2cfad749489de101f85bc5df5"; }; meta = { @@ -14360,7 +14416,7 @@ let pname = "Package-DeprecationManager"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Package-DeprecationManager-0.17.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Package-DeprecationManager-0.17.tar.gz"; sha256 = "1d743ada482b5c9871d894966e87d4c20edc96931bb949fb2638b000ddd6684b"; }; buildInputs = [ TestFatal TestWarnings ]; @@ -14375,7 +14431,7 @@ let pname = "PatchReader"; version = "0.9.6"; src = fetchurl { - url = mirror://cpan/authors/id/T/TM/TMANNERM/PatchReader-0.9.6.tar.gz; + url = "mirror://cpan/authors/id/T/TM/TMANNERM/PatchReader-0.9.6.tar.gz"; sha256 = "b8de37460347bb5474dc01916ccb31dd2fe0cd92242c4a32d730e8eb087c323c"; }; meta = { @@ -14388,7 +14444,7 @@ let pname = "Package-Stash"; version = "0.38"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-0.38.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-0.38.tar.gz"; sha256 = "c58ee8844df2dda38e3bf66fdf443439aaefaef1a33940edf2055f0afd223a7f"; }; buildInputs = [ TestFatal TestRequires ]; @@ -14403,7 +14459,7 @@ let pname = "Package-Stash-XS"; version = "0.29"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-XS-0.29.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-XS-0.29.tar.gz"; sha256 = "1akqk10qxwk798qppajqbczwmhy4cs9g0lg961m3vq218slnnryk"; }; buildInputs = [ TestFatal TestRequires ]; @@ -14417,13 +14473,13 @@ let pname = "Pango"; version = "1.227"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Pango-1.227.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/Pango-1.227.tar.gz"; sha256 = "0wdcidnfnb6nm79fzfs39ivawj3x8m98a147fmcxgv1zvwia9c1l"; }; buildInputs = [ pkgs.pango ]; propagatedBuildInputs = [ Cairo Glib ]; meta = { - homepage = http://gtk2-perl.sourceforge.net/; + homepage = "http://gtk2-perl.sourceforge.net/"; description = "Layout and render international text"; license = stdenv.lib.licenses.lgpl21Plus; }; @@ -14433,12 +14489,12 @@ let pname = "Parallel-ForkManager"; version = "2.02"; src = fetchurl { - url = mirror://cpan/authors/id/Y/YA/YANICK/Parallel-ForkManager-2.02.tar.gz; + url = "mirror://cpan/authors/id/Y/YA/YANICK/Parallel-ForkManager-2.02.tar.gz"; sha256 = "c1b2970a8bb666c3de7caac4a8f4dbcc043ab819bbc337692ec7bf27adae4404"; }; buildInputs = [ TestWarn ]; meta = { - homepage = https://github.com/dluxhu/perl-parallel-forkmanager; + homepage = "https://github.com/dluxhu/perl-parallel-forkmanager"; description = "A simple parallel processing fork manager"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -14449,7 +14505,7 @@ let pname = "Parallel-Prefork"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/Parallel-Prefork-0.18.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZUHO/Parallel-Prefork-0.18.tar.gz"; sha256 = "f1c1f48f1ae147a58bc88f9cb2f570d6bb15ea4c0d589abd4c3084ddc961596e"; }; buildInputs = [ TestRequires TestSharedFork ]; @@ -14464,7 +14520,7 @@ let pname = "Params-Classify"; version = "0.015"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Params-Classify-0.015.tar.gz; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Params-Classify-0.015.tar.gz"; sha256 = "052r198xyrsv8wz21gijdigz2cgnidsa37nvyfzdiz4rv1fc33ir"; }; perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' @@ -14474,7 +14530,7 @@ let pname = "Params-Util"; version = "1.07"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/Params-Util-1.07.tar.gz; + url = "mirror://cpan/authors/id/A/AD/ADAMK/Params-Util-1.07.tar.gz"; sha256 = "0v67sx93yhn7xa0nh9mnbf8mixf54czk6wzrjsp6dzzr5hzyrw9h"; }; meta = { @@ -14487,7 +14543,7 @@ let pname = "Params-Validate"; version = "1.29"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Params-Validate-1.29.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Params-Validate-1.29.tar.gz"; sha256 = "49a68dfb430bea028042479111d19068e08095e5a467e320b7ab7bde3d729733"; }; buildInputs = [ TestFatal TestRequires ]; @@ -14503,7 +14559,7 @@ let pname = "Params-ValidationCompiler"; version = "0.30"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.30.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.30.tar.gz"; sha256 = "1jqn1l4m4i341g14kmjsf3a1kn7vv6z89cix0xjjgr1v70iywnyw"; }; propagatedBuildInputs = [ EvalClosure ExceptionClass ]; @@ -14518,7 +14574,7 @@ let pname = "Paranoid"; version = "2.07"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORLISS/Paranoid/Paranoid-2.07.tar.gz; + url = "mirror://cpan/authors/id/C/CO/CORLISS/Paranoid/Paranoid-2.07.tar.gz"; sha256 = "b55cfd8c6d5f181e218efd012f711a50cd14e4dbc8804650b95477178f43b7fc"; }; patches = [ ../development/perl-modules/Paranoid-blessed-path.patch ]; @@ -14538,7 +14594,7 @@ let pname = "PAR-Dist"; version = "0.49"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-Dist-0.49.tar.gz; + url = "mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-Dist-0.49.tar.gz"; sha256 = "078ycyn8pw3rba4k3qwcqrqfcym5c1pivymwa0bvs9sab45j4iwy"; }; meta = { @@ -14550,7 +14606,7 @@ let pname = "PAUSE-Permissions"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/PAUSE-Permissions-0.17.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/PAUSE-Permissions-0.17.tar.gz"; sha256 = "021ink414w4mdk6rd54cc1f23kfqg0zk4njx4ngr0bw3wc6r4kks"; }; propagatedBuildInputs = [ FileHomeDir HTTPDate MooXOptions TimeDurationParse ]; @@ -14566,7 +14622,7 @@ let pname = "parent"; version = "0.237"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORION/parent-0.237.tar.gz; + url = "mirror://cpan/authors/id/C/CO/CORION/parent-0.237.tar.gz"; sha256 = "1bnaadzf51g6zrpq6pvvgds2cc9d4w1vck7sapkd3hb5hmjdk28h"; }; }; @@ -14575,7 +14631,7 @@ let pname = "Parse-DebControl"; version = "2.005"; src = fetchurl { - url = mirror://cpan/authors/id/J/JA/JAYBONCI/Parse-DebControl-2.005.tar.gz; + url = "mirror://cpan/authors/id/J/JA/JAYBONCI/Parse-DebControl-2.005.tar.gz"; sha256 = "0ad78qri4sg9agghqdm83xsjgks94yvffs23kppy7mqjy8gwwjxn"; }; propagatedBuildInputs = [ IOStringy LWP ]; @@ -14588,7 +14644,7 @@ let pname = "Parse-LocalDistribution"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-LocalDistribution-0.19.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-LocalDistribution-0.19.tar.gz"; sha256 = "17p92nj4k3acrqqjnln1j5x8hbra9jkx5hdcybrq37ld9qnc62vb"; }; propagatedBuildInputs = [ ParsePMFile ]; @@ -14603,7 +14659,7 @@ let pname = "Parse-PlainConfig"; version = "3.05"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORLISS/Parse-PlainConfig/Parse-PlainConfig-3.05.tar.gz; + url = "mirror://cpan/authors/id/C/CO/CORLISS/Parse-PlainConfig/Parse-PlainConfig-3.05.tar.gz"; sha256 = "6b78a8552398b0d2d7063505c93b3cfed0432c5b2cf6e00b8e51febf411c1efa"; }; propagatedBuildInputs = [ ClassEHierarchy Paranoid ]; @@ -14618,7 +14674,7 @@ let pname = "Parse-PMFile"; version = "0.42"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-PMFile-0.42.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-PMFile-0.42.tar.gz"; sha256 = "0v3k5jslbl29735hs32x9si546v55cyy6sb58aib8vmq684wgxp7"; }; buildInputs = [ ExtUtilsMakeMakerCPANfile ]; @@ -14632,7 +14688,7 @@ let pname = "Parse-RecDescent"; version = "1.967015"; src = fetchurl { - url = mirror://cpan/authors/id/J/JT/JTBRAUN/Parse-RecDescent-1.967015.tar.gz; + url = "mirror://cpan/authors/id/J/JT/JTBRAUN/Parse-RecDescent-1.967015.tar.gz"; sha256 = "1943336a4cb54f1788a733f0827c0c55db4310d5eae15e542639c9dd85656e37"; }; meta = { @@ -14645,7 +14701,7 @@ let pname = "Parse-Syslog"; version = "1.10"; src = fetchurl { - url = mirror://cpan/authors/id/D/DS/DSCHWEI/Parse-Syslog-1.10.tar.gz; + url = "mirror://cpan/authors/id/D/DS/DSCHWEI/Parse-Syslog-1.10.tar.gz"; sha256 = "659a2145441ef36d9835decaf83da308fcd03f49138cb3d90928e8bfc9f139d9"; }; }; @@ -14654,7 +14710,7 @@ let pname = "Parser-MGC"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Parser-MGC-0.16.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Parser-MGC-0.16.tar.gz"; sha256 = "14bv2fwg59q4s3kv0vf11hh222anlm181ig87cph2f68y32n2i3l"; }; propagatedBuildInputs = [ FileSlurpTiny ]; @@ -14668,7 +14724,7 @@ let pname = "Parser-Yapp"; version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/W/WB/WBRASWELL/Parse-Yapp-1.21.tar.gz; + url = "mirror://cpan/authors/id/W/WB/WBRASWELL/Parse-Yapp-1.21.tar.gz"; sha256 = "1r8kbyk0qd4ficmabj753kjpq0ib0csk01169w7jxflg62cfj41q"; }; meta = { @@ -14681,7 +14737,7 @@ let pname = "Path-Class"; version = "0.37"; src = fetchurl { - url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.37.tar.gz; + url = "mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.37.tar.gz"; sha256 = "1kj8q8dmd8jci94w5arav59nkp0pkxrkliz4n8n6yf02hsa82iv5"; }; meta = { @@ -14694,7 +14750,7 @@ let pname = "Path-Iterator-Rule"; version = "1.014"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Iterator-Rule-1.014.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Iterator-Rule-1.014.tar.gz"; sha256 = "19mik0r5v1cmxfxm0h4lwqyj0nmq6jgnvvq96hqcjgylpvc02x1z"; }; propagatedBuildInputs = [ NumberCompare TextGlob TryTiny ]; @@ -14710,7 +14766,7 @@ let pname = "Path-Tiny"; version = "0.112"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.112.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.112.tar.gz"; sha256 = "813df2d140c65f795daefd8eca18e61194ecac7050c5406a069db86dea31cc3a"; }; meta = { @@ -14734,7 +14790,7 @@ let substituteInPlace Cwd.pm --replace '/usr/bin/pwd' '${pkgs.coreutils}/bin/pwd' ''; src = fetchurl { - url = mirror://cpan/authors/id/X/XS/XSAWYERX/PathTools-3.75.tar.gz; + url = "mirror://cpan/authors/id/X/XS/XSAWYERX/PathTools-3.75.tar.gz"; sha256 = "a558503aa6b1f8c727c0073339081a77888606aa701ada1ad62dd9d8c3f945a2"; }; }; @@ -14767,7 +14823,7 @@ let # tests fail; look unfinished doCheck = false; meta = { - homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-perl/; + homepage = "http://ludovic.rousseau.free.fr/softwares/pcsc-perl/"; description = "Communicate with a smart card using PC/SC"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with maintainers; [ abbradar ]; @@ -14778,7 +14834,7 @@ let pname = "PDF-API2"; version = "2.036"; src = fetchurl { - url = mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.036.tar.gz; + url = "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.036.tar.gz"; sha256 = "070444e9fef8beb6f115994a6ac89533fe8ba02d5e240a35bb07adcbcb511774"; }; buildInputs = [ TestException TestMemoryCycle ]; @@ -14793,12 +14849,12 @@ let pname = "Pegex"; version = "0.74"; src = fetchurl { - url = mirror://cpan/authors/id/I/IN/INGY/Pegex-0.74.tar.gz; + url = "mirror://cpan/authors/id/I/IN/INGY/Pegex-0.74.tar.gz"; sha256 = "31f0889695d79a3ab79a6315a8a08baeb1268592bc6596c3feffb424d982dfdf"; }; buildInputs = [ TestPod TieIxHash ]; meta = { - homepage = https://github.com/ingydotnet/pegex-pm; + homepage = "https://github.com/ingydotnet/pegex-pm"; description = "Acmeist PEG Parser Framework"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -14811,7 +14867,7 @@ let pname = "perl5lib"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/N/NO/NOBULL/perl5lib-1.02.tar.gz; + url = "mirror://cpan/authors/id/N/NO/NOBULL/perl5lib-1.02.tar.gz"; sha256 = "1b6fgs8wy2a7ff8rr1qdvdghhvlpr1pv760k4i2c8lq1hhjnkf94"; }; }; @@ -14820,7 +14876,7 @@ let pname = "Perl-osnames"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERLANCAR/Perl-osnames-0.11.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PERLANCAR/Perl-osnames-0.11.tar.gz"; sha256 = "fb22a1ed59dc2311f7f1ffca5685d90c0600020467f624f57b4dd3dba5bc659b"; }; meta = { @@ -14833,13 +14889,13 @@ let pname = "Perl-Critic"; version = "1.138"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.138.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.138.tar.gz"; sha256 = "2ad194f91ef24df4698369c2562d4164e9bf74f2d5565c681841abf79789ed82"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ BKeywords ConfigTiny FileWhich ModulePluggable PPIxQuoteLike PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ]; meta = { - homepage = http://perlcritic.com; + homepage = "http://perlcritic.com"; description = "Critique Perl source code for best-practices"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -14849,7 +14905,7 @@ let pname = "Perl-Destruct-Level"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/R/RG/RGARCIA/Perl-Destruct-Level-0.02.tar.gz; + url = "mirror://cpan/authors/id/R/RG/RGARCIA/Perl-Destruct-Level-0.02.tar.gz"; sha256 = "0fyiysrq874ncscgdjg522fs29gvqads6ynyhwxwwq1b545srd20"; }; meta = { @@ -14860,7 +14916,7 @@ let pname = "PerlIO-eol"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/PerlIO-eol-0.17.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/PerlIO-eol-0.17.tar.gz"; sha256 = "1fayp27vcmypqyzcd4003036h3g5zy6jk1ia25frdca58pzcpk6f"; }; }; @@ -14884,7 +14940,7 @@ let pname = "PerlIO-utf8_strict"; version = "0.007"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.007.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.007.tar.gz"; sha256 = "83a33f2fe046cb3ad6afc80790635a423e2c7c6854afacc6998cd46951cc81cb"; }; buildInputs = [ TestException ]; @@ -14898,7 +14954,7 @@ let pname = "PerlIO-via-dynamic"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/PerlIO-via-dynamic-0.14.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXMV/PerlIO-via-dynamic-0.14.tar.gz"; sha256 = "0jbb3xpbqzmr625blvnjszd69l3cwxzi7bhmkj5x48dgv3s7mkca"; }; }; @@ -14907,7 +14963,7 @@ let pname = "PerlIO-via-symlink"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/C/CL/CLKAO/PerlIO-via-symlink-0.05.tar.gz; + url = "mirror://cpan/authors/id/C/CL/CLKAO/PerlIO-via-symlink-0.05.tar.gz"; sha256 = "0lidddcaz9anddqrpqk4zwm550igv6amdhj86i2jjdka9b1x81s1"; }; @@ -14924,7 +14980,7 @@ let pname = "PerlIO-via-Timeout"; version = "0.32"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAMS/PerlIO-via-Timeout-0.32.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAMS/PerlIO-via-Timeout-0.32.tar.gz"; sha256 = "9278f9ef668850d913d98fa4c0d7e7d667cff3503391f4a4eae73a246f2e7916"; }; buildInputs = [ ModuleBuildTiny TestSharedFork TestTCP ]; @@ -14938,13 +14994,13 @@ let pname = "perl-ldap"; version = "0.66"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARSCHAP/perl-ldap-0.66.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARSCHAP/perl-ldap-0.66.tar.gz"; sha256 = "09263ce6166e80c98d689d41d09995b813389fd069b784601f6dc57f8e2b4102"; }; buildInputs = [ TextSoundex ]; propagatedBuildInputs = [ ConvertASN1 ]; meta = { - homepage = http://ldap.perl.org/; + homepage = "http://ldap.perl.org/"; description = "LDAP client library"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.limeytexan ]; @@ -14955,7 +15011,7 @@ let pname = "PerlMagick"; version = "6.89-1"; src = fetchurl { - url = mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-6.89-1.tar.gz; + url = "mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-6.89-1.tar.gz"; sha256 = "0n9afy1z5bhf9phrbahnkwhgcmijn8jggpbzwrivw1zhliliiy68"; }; buildInputs = [ pkgs.imagemagick ]; @@ -14970,7 +15026,7 @@ let pname = "Perl-Tidy"; version = "20200110"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20200110.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20200110.tar.gz"; sha256 = "c8c13ab88f42409d419993d488b8dc7cf4a02d5034d3037ca859fb93b18e8086"; }; meta = { @@ -14983,7 +15039,7 @@ let pname = "PHP-Serialization"; version = "0.34"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.34.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.34.tar.gz"; sha256 = "0yphqsgg7zrar2ywk2j2fnjxmi9rq32yf0p5ln8m9fmfx4kd84mr"; }; meta = { @@ -14995,7 +15051,7 @@ let pname = "PkgConfig"; version = "0.23026"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/PkgConfig-0.23026.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/PkgConfig-0.23026.tar.gz"; sha256 = "56c8ad9015af3799b99a21b8790997723406acf479f35d13fe9bf632db2d5c26"; }; meta = { @@ -15009,13 +15065,13 @@ let pname = "Plack"; version = "1.0047"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0047.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0047.tar.gz"; sha256 = "322c93f5acc0a0f0e11fd4a76188f978bdc14338a9f1df3ae535227017046561"; }; buildInputs = [ AuthenSimplePasswd CGIEmulatePSGI FileShareDirInstall HTTPRequestAsCGI HTTPServerSimplePSGI IOHandleUtil LWP LWPProtocolhttp10 LogDispatchArray MIMETypes TestMockTimeHiRes TestRequires TestSharedFork TestTCP ]; propagatedBuildInputs = [ ApacheLogFormatCompiler CookieBaker DevelStackTraceAsHTML FileShareDir FilesysNotifySimple HTTPEntityParser HTTPHeadersFast HTTPMessage TryTiny ]; meta = { - homepage = https://github.com/plack/Plack; + homepage = "https://github.com/plack/Plack"; description = "Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15025,7 +15081,7 @@ let pname = "Plack-App-Proxy"; version = "0.29"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEEDO/Plack-App-Proxy-0.29.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEEDO/Plack-App-Proxy-0.29.tar.gz"; sha256 = "03x6yb6ykz1ms90jp1s0pq19yplf7wswljvhzqkr16jannfrmah4"; }; propagatedBuildInputs = [ AnyEventHTTP LWP Plack ]; @@ -15040,7 +15096,7 @@ let pname = "Plack-Middleware-Auth-Digest"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Auth-Digest-0.05.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Auth-Digest-0.05.tar.gz"; sha256 = "1sqm23kfsl3ac4060zcclc3r86x1vxzhsgvgzg6mxk9njj93zgcs"; }; propagatedBuildInputs = [ DigestHMAC Plack ]; @@ -15056,7 +15112,7 @@ let pname = "Plack-Middleware-ConsoleLogger"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ConsoleLogger-0.05.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ConsoleLogger-0.05.tar.gz"; sha256 = "1ngvhwdw9ll4cwnvf0i89ppa9pbyiwng6iba04scrqjda353lrsm"; }; propagatedBuildInputs = [ JavaScriptValueEscape Plack ]; @@ -15072,13 +15128,13 @@ let pname = "Plack-Middleware-Debug"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Debug-0.17.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Debug-0.17.tar.gz"; sha256 = "a30b62f1bb94e641f7b60b5ea5335e140c553b4131ec4003b56db37f47617a26"; }; buildInputs = [ ModuleBuildTiny TestRequires ]; propagatedBuildInputs = [ ClassMethodModifiers DataDump DataDumperConcise Plack TextMicroTemplate ]; meta = { - homepage = https://github.com/miyagawa/Plack-Middleware-Debug; + homepage = "https://github.com/miyagawa/Plack-Middleware-Debug"; description = "Display information about the current request/response"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15088,7 +15144,7 @@ let pname = "Plack-Middleware-Deflater"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/Plack-Middleware-Deflater-0.12.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/Plack-Middleware-Deflater-0.12.tar.gz"; sha256 = "0xf2visi16hgwgyp9q0cjr10ikbn474hjia5mj8mb2scvbkrbni8"; }; propagatedBuildInputs = [ Plack ]; @@ -15103,12 +15159,12 @@ let pname = "Plack-Middleware-FixMissingBodyInRedirect"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-FixMissingBodyInRedirect-0.12.tar.gz; + url = "mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-FixMissingBodyInRedirect-0.12.tar.gz"; sha256 = "6c22d069f5a57ac206d4659b28b8869bb9270640bb955efddd451dcc58cdb391"; }; propagatedBuildInputs = [ HTMLParser Plack ]; meta = { - homepage = https://github.com/Sweet-kid/Plack-Middleware-FixMissingBodyInRedirect; + homepage = "https://github.com/Sweet-kid/Plack-Middleware-FixMissingBodyInRedirect"; description = "Plack::Middleware which sets body for redirect response, if it's not already set"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15118,7 +15174,7 @@ let pname = "Plack-Middleware-Header"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHIBA/Plack-Middleware-Header-0.04.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHIBA/Plack-Middleware-Header-0.04.tar.gz"; sha256 = "0pjxxbnilphn38s3mmv0fmg9q2hm4z02ngp2a1lxblzjfbzvkdjy"; }; propagatedBuildInputs = [ Plack ]; @@ -15132,7 +15188,7 @@ let pname = "Plack-Middleware-MethodOverride"; version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-MethodOverride-0.20.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-MethodOverride-0.20.tar.gz"; sha256 = "dbfb5a2efb48bfeb01cb3ae1e1c677e155dc7bfe210c7e7f221bae3cb6aab5f1"; }; propagatedBuildInputs = [ Plack ]; @@ -15146,12 +15202,12 @@ let pname = "Plack-Middleware-RemoveRedundantBody"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-RemoveRedundantBody-0.09.tar.gz; + url = "mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-RemoveRedundantBody-0.09.tar.gz"; sha256 = "80d45f93d6b7290b0bd8b3cedd84a37fc501456cc3dec02ec7aad81c0018087e"; }; propagatedBuildInputs = [ Plack ]; meta = { - homepage = https://github.com/Sweet-kid/Plack-Middleware-RemoveRedundantBody; + homepage = "https://github.com/Sweet-kid/Plack-Middleware-RemoveRedundantBody"; description = "Plack::Middleware which sets removes body for HTTP response if it's not required"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15161,7 +15217,7 @@ let pname = "Plack-Middleware-ReverseProxy"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ReverseProxy-0.16.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ReverseProxy-0.16.tar.gz"; sha256 = "0a512n62pnk5ayj3zdzyj50iy1qi8nwh6ygks2h7nrh7gp9k2jc7"; }; propagatedBuildInputs = [ Plack ]; @@ -15175,7 +15231,7 @@ let pname = "Plack-Middleware-Session"; version = "0.33"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Session-0.33.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Session-0.33.tar.gz"; sha256 = "1vm4a66civdzh7xvl5hy5wn1w8j1vndppwyz8ndh9n4as74s5yag"; }; propagatedBuildInputs = [ DigestHMAC Plack ]; @@ -15191,13 +15247,13 @@ let pname = "Plack-Test-ExternalServer"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Plack-Test-ExternalServer-0.02.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Plack-Test-ExternalServer-0.02.tar.gz"; sha256 = "5baf5c57fe0c06412deec9c5abe7952ab8a04f8c47b4bbd8e9e9982268903ed0"; }; buildInputs = [ Plack TestSharedFork TestTCP ]; propagatedBuildInputs = [ LWP ]; meta = { - homepage = https://github.com/perl-catalyst/Plack-Test-ExternalServer; + homepage = "https://github.com/perl-catalyst/Plack-Test-ExternalServer"; description = "Run HTTP tests on external live servers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15247,7 +15303,7 @@ let pname = "POE-Test-Loops"; version = "1.360"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Test-Loops-1.360.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Test-Loops-1.360.tar.gz"; sha256 = "0yx4wsljfmdzsiv0ni98x6lw975cm82ahngbwqvzv60wx5pwkl5y"; }; meta = { @@ -15261,7 +15317,7 @@ let pname = "PPI"; version = "1.270"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.270.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.270.tar.gz"; sha256 = "622a698c781bb85d2bdf7bbfe040fe70d33b79774c9ae01fce2375dc73faf457"; }; buildInputs = [ ClassInspector TestDeep TestNoWarnings TestObject TestSubCalls ]; @@ -15272,7 +15328,7 @@ let preCheck = "rm t/03_document.t"; meta = { - homepage = https://github.com/adamkennedy/PPI; + homepage = "https://github.com/adamkennedy/PPI"; description = "Parse, Analyze and Manipulate Perl (without perl)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15282,7 +15338,7 @@ let pname = "PPIx-QuoteLike"; version = "0.008"; src = fetchurl { - url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.008.tar.gz; + url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.008.tar.gz"; sha256 = "0dzlcddvfzn7s8z1jj12ghsbzf9wm5dq84361v4vx5p6j8zhsaz4"; }; propagatedBuildInputs = [ PPI ]; @@ -15296,7 +15352,7 @@ let pname = "PPIx-Regexp"; version = "0.068"; src = fetchurl { - url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.068.tar.gz; + url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.068.tar.gz"; sha256 = "b5444b699a3c7ad79506c796559449c6f858dc62deb60e08249f96782636e5f4"; }; propagatedBuildInputs = [ ListMoreUtils PPI ]; @@ -15310,7 +15366,7 @@ let pname = "PPIx-Utilities"; version = "1.001000"; src = fetchurl { - url = mirror://cpan/authors/id/E/EL/ELLIOTJS/PPIx-Utilities-1.001000.tar.gz; + url = "mirror://cpan/authors/id/E/EL/ELLIOTJS/PPIx-Utilities-1.001000.tar.gz"; sha256 = "03a483386fd6a2c808f09778d44db06b02c3140fb24ba4bf12f851f46d3bcb9b"; }; buildInputs = [ TestDeep ]; @@ -15325,7 +15381,7 @@ let pname = "Proc-Background"; version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NERDVANA/Proc-Background-1.21.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NERDVANA/Proc-Background-1.21.tar.gz"; sha256 = "91b6a5aeb841b1c313498c78fad08e37d17595702dc6205b5ad38ef69949b7ee"; }; meta = { @@ -15336,7 +15392,7 @@ let pname = "Proc-ProcessTable"; version = "0.59"; src = fetchurl { - url = mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.59.tar.gz; + url = "mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.59.tar.gz"; sha256 = "f8cc5054d78c35a0ce39fb75430b4ef402e2a99013d2ec37e7997f316594606c"; }; meta = { @@ -15349,7 +15405,7 @@ let pname = "Proc-Find"; version = "0.051"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERLANCAR/Proc-Find-0.051.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PERLANCAR/Proc-Find-0.051.tar.gz"; sha256 = "64d39071ec94d7b66a7cab5a950246f0fff013b5a200a63d1176432987e5a135"; }; propagatedBuildInputs = [ ProcProcessTable ]; @@ -15363,7 +15419,7 @@ let pname = "Proc-SafeExec"; version = "1.5"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BILBO/Proc-SafeExec-1.5.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BILBO/Proc-SafeExec-1.5.tar.gz"; sha256 = "1b4d0908bcac563d34a7e5be61c5da3eee98e4a6c7fa68c2670cc5844b5a2d78"; }; }; @@ -15372,7 +15428,7 @@ let pname = "Proc-Simple"; version = "1.32"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHILLI/Proc-Simple-1.32.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHILLI/Proc-Simple-1.32.tar.gz"; sha256 = "4c8f0a924b19ad78a13da73fe0fb306d32a7b9d10a332c523087fc83a209a8c4"; }; meta = { @@ -15384,7 +15440,7 @@ let pname = "Proc-Wait3"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/C/CT/CTILMES/Proc-Wait3-0.05.tar.gz; + url = "mirror://cpan/authors/id/C/CT/CTILMES/Proc-Wait3-0.05.tar.gz"; sha256 = "1a907f5db6933dc2939bbfeffe19eeae7ed39ef1b97a2bc9b723f2f25f81caf3"; }; meta = { @@ -15397,7 +15453,7 @@ let pname = "Proc-WaitStat"; version = "1.00"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROSCH/Proc-WaitStat-1.00.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROSCH/Proc-WaitStat-1.00.tar.gz"; sha256 = "1g3l8jzx06x4l4p0x7fyn4wvg6plfzl420irwwb9v447wzsn6xfh"; }; propagatedBuildInputs = [ IPCSignal ]; @@ -15407,7 +15463,7 @@ let pname = "Protocol-Redis"; version = "1.0011"; src = fetchurl { - url = mirror://cpan/authors/id/U/UN/UNDEF/Protocol-Redis-1.0011.tar.gz; + url = "mirror://cpan/authors/id/U/UN/UNDEF/Protocol-Redis-1.0011.tar.gz"; sha256 = "7ceb6bd80067c904465d4fd1f1715724388c9bdc37c6c2c003a20ce569b7f4e8"; }; meta = { @@ -15438,7 +15494,7 @@ let pname = "Protocol-WebSocket"; version = "0.26"; src = fetchurl { - url = mirror://cpan/authors/id/V/VT/VTI/Protocol-WebSocket-0.26.tar.gz; + url = "mirror://cpan/authors/id/V/VT/VTI/Protocol-WebSocket-0.26.tar.gz"; sha256 = "08jmazvrmvp8jn15p2n3c1h3f2cbkr07xjzy197jb8x724vx0dsq"; }; buildInputs = [ ModuleBuildTiny ]; @@ -15449,7 +15505,7 @@ let version = "1.10"; src = fetchurl { - url = mirror://cpan/authors/id/C/CR/CRUX/Protocol-HTTP2-1.10.tar.gz; + url = "mirror://cpan/authors/id/C/CR/CRUX/Protocol-HTTP2-1.10.tar.gz"; sha256 = "0jm6jq1wszjrrcypyi642m2i8wgni50wdnzh9dzfkyjazdc00sn2"; }; buildInputs = [ AnyEvent ModuleBuildTiny NetSSLeay TestLeakTrace TestSharedFork TestTCP ]; @@ -15459,7 +15515,7 @@ let pname = "PSGI"; version = "1.102"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/PSGI-1.102.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/PSGI-1.102.tar.gz"; sha256 = "0iqzxs8fv63510knm3zr3jr3ky4x7diwd7y24mlshzci81kl8v55"; }; }; @@ -15468,7 +15524,7 @@ let pname = "PadWalker"; version = "2.3"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROBIN/PadWalker-2.3.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROBIN/PadWalker-2.3.tar.gz"; sha256 = "2a6c44fb600861e54568e74081a8d1f121f0060076069ceab34b1ae89d6588cf"; }; }; @@ -15477,7 +15533,7 @@ let pname = "Perl6-Junction"; version = "1.60000"; src = fetchurl { - url = mirror://cpan/authors/id/C/CF/CFRANKS/Perl6-Junction-1.60000.tar.gz; + url = "mirror://cpan/authors/id/C/CF/CFRANKS/Perl6-Junction-1.60000.tar.gz"; sha256 = "0r3in9pyrm6wfrhcvxbq5w1617x8x5537lxj9hdzks4pa7l7a8yh"; }; }; @@ -15486,13 +15542,13 @@ let pname = "Perl-MinimumVersion"; version = "1.38"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Perl-MinimumVersion-1.38.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Perl-MinimumVersion-1.38.tar.gz"; sha256 = "478b5824791b87fc74c94a892180682bd06ad2cdf34034b1a4b859273927802a"; }; buildInputs = [ TestScript ]; propagatedBuildInputs = [ FileFindRulePerl PerlCritic ]; meta = { - homepage = https://github.com/neilbowers/Perl-MinimumVersion; + homepage = "https://github.com/neilbowers/Perl-MinimumVersion"; description = "Find a minimum required version of perl for Perl code"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15502,12 +15558,12 @@ let pname = "Perl-PrereqScanner"; version = "1.023"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.023.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.023.tar.gz"; sha256 = "280a1c4710390865fb9f310a861a34720b28b4cbe50609c841af5cf2d3a2bced"; }; propagatedBuildInputs = [ GetoptLongDescriptive ListMoreUtils ModulePath Moose PPI StringRewritePrefix namespaceautoclean ]; meta = { - homepage = https://github.com/rjbs/Perl-PrereqScanner; + homepage = "https://github.com/rjbs/Perl-PrereqScanner"; description = "A tool to scan your Perl code for its prerequisites"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15517,7 +15573,7 @@ let pname = "Perl-PrereqScanner-NotQuiteLite"; version = "0.9909"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9909.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9909.tar.gz"; sha256 = "09sa86maxrqnxf84wa0cgkcs8p6xvpsv0x5dny3hz0300zgrqmq5"; }; propagatedBuildInputs = [ DataDump ModuleCPANfile ModuleFind RegexpTrie ]; @@ -15532,7 +15588,7 @@ let pname = "Perl-Version"; version = "1.013"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Perl-Version-1.013.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Perl-Version-1.013.tar.gz"; sha256 = "1887414d1c8689d864c840114101e043e99d7dd5b9cca69369a60e821e3ad0f7"; }; propagatedBuildInputs = [ FileSlurpTiny ]; @@ -15546,7 +15602,7 @@ let pname = "Pod-Checker"; version = "1.73"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAREKR/Pod-Checker-1.73.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAREKR/Pod-Checker-1.73.tar.gz"; sha256 = "7dee443b03d80d0735ec50b6d1caf0209c51ab0a97d64050cfc10e1555cb9305"; }; }; @@ -15555,7 +15611,7 @@ let pname = "Pod-Coverage"; version = "0.23"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCLAMP/Pod-Coverage-0.23.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCLAMP/Pod-Coverage-0.23.tar.gz"; sha256 = "01xifj83dv492lxixijmg6va02rf3ydlxly0a9slmx22r6qa1drh"; }; propagatedBuildInputs = [ DevelSymdump ]; @@ -15565,12 +15621,12 @@ let pname = "Pod-Coverage-TrustPod"; version = "0.100005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Coverage-TrustPod-0.100005.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Coverage-TrustPod-0.100005.tar.gz"; sha256 = "08bk6lfimr2pwi6c92xg5cw1cxmi5fqhls3yasqzpjnd4if86s3c"; }; propagatedBuildInputs = [ PodCoverage PodEventual ]; meta = { - homepage = https://github.com/rjbs/pod-coverage-trustpod; + homepage = "https://github.com/rjbs/pod-coverage-trustpod"; description = "Allow a module's pod to contain Pod::Coverage hints"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15580,13 +15636,13 @@ let pname = "Pod-Elemental"; version = "0.103005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-0.103005.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-0.103005.tar.gz"; sha256 = "824336ec18326e3b970e7815922b3921b0a821d2ee0e50b0c5b2bc327f99615e"; }; buildInputs = [ TestDeep TestDifferences ]; propagatedBuildInputs = [ MooseXTypes PodEventual StringRewritePrefix StringTruncate ]; meta = { - homepage = https://github.com/rjbs/Pod-Elemental; + homepage = "https://github.com/rjbs/Pod-Elemental"; description = "Work with nestable Pod elements"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15596,13 +15652,13 @@ let pname = "Pod-Elemental-PerlMunger"; version = "0.200006"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.200006.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.200006.tar.gz"; sha256 = "09fd3b5d53119437a01dced66b42eafdcd53895b3c32a2b0f781f36fda0f665b"; }; buildInputs = [ TestDifferences ]; propagatedBuildInputs = [ PPI PodElemental ]; meta = { - homepage = https://github.com/rjbs/Pod-Elemental-PerlMunger; + homepage = "https://github.com/rjbs/Pod-Elemental-PerlMunger"; description = "A thing that takes a string of Perl and rewrites its documentation"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15612,7 +15668,7 @@ let pname = "Pod-Eventual"; version = "0.094001"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Eventual-0.094001.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Eventual-0.094001.tar.gz"; sha256 = "be9fb8910b108e5d1a66f002b659ad22576e88d779b703dff9d15122c3f80834"; }; propagatedBuildInputs = [ MixinLinewise ]; @@ -15627,7 +15683,7 @@ let pname = "Pod-Parser"; version = "1.63"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAREKR/Pod-Parser-1.63.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAREKR/Pod-Parser-1.63.tar.gz"; sha256 = "dbe0b56129975b2f83a02841e8e0ed47be80f060686c66ea37e529d97aa70ccd"; }; meta = { @@ -15640,12 +15696,12 @@ let pname = "Pod-POM"; version = "2.01"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Pod-POM-2.01.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Pod-POM-2.01.tar.gz"; sha256 = "1b50fba9bbdde3ead192beeba0eaddd0c614e3afb1743fa6fff805f57c56f7f4"; }; buildInputs = [ FileSlurper TestDifferences TextDiff ]; meta = { - homepage = https://github.com/neilb/Pod-POM; + homepage = "https://github.com/neilb/Pod-POM"; description = "POD Object Model"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15655,7 +15711,7 @@ let pname = "Pod-POM-View-TOC"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERLER/Pod-POM-View-TOC-0.02.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PERLER/Pod-POM-View-TOC-0.02.tar.gz"; sha256 = "ccb42272c7503379cb1131394620ee50276d72844e0e80eb4b007a9d58f87623"; }; propagatedBuildInputs = [ PodPOM ]; @@ -15669,11 +15725,11 @@ let pname = "Pod-LaTeX"; version = "0.61"; src = fetchurl { - url = mirror://cpan/authors/id/T/TJ/TJENNESS/Pod-LaTeX-0.61.tar.gz; + url = "mirror://cpan/authors/id/T/TJ/TJENNESS/Pod-LaTeX-0.61.tar.gz"; sha256 = "15a840ea1c8a76cd3c865fbbf2fec33b03615c0daa50f9c800c54e0cf0659d46"; }; meta = { - homepage = https://github.com/timj/perl-Pod-LaTeX/tree/master; + homepage = "https://github.com/timj/perl-Pod-LaTeX/tree/master"; description = "Convert Pod data to formatted Latex"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15683,7 +15739,7 @@ let pname = "podlators"; version = "4.10"; src = fetchurl { - url = mirror://cpan/authors/id/R/RR/RRA/podlators-4.10.tar.gz; + url = "mirror://cpan/authors/id/R/RR/RRA/podlators-4.10.tar.gz"; sha256 = "008b4j41ijrfyyq5nd3y7pqyww6rg49fjg2c6kmpnqrmgs347qqp"; }; meta = { @@ -15696,12 +15752,12 @@ let pname = "podlinkcheck"; version = "15"; src = fetchurl { - url = mirror://cpan/authors/id/K/KR/KRYDE/podlinkcheck-15.tar.gz; + url = "mirror://cpan/authors/id/K/KR/KRYDE/podlinkcheck-15.tar.gz"; sha256 = "4e3bebec1bf82dbf850a94ae26a253644cf5806ec41afc74e43e1710a37321db"; }; propagatedBuildInputs = [ FileFindIterator FileHomeDir IPCRun constant-defer libintl_perl ]; meta = { - homepage = http://user42.tuxfamily.org/podlinkcheck/index.html; + homepage = "http://user42.tuxfamily.org/podlinkcheck/index.html"; description = "Check POD L<> link references"; license = stdenv.lib.licenses.gpl3Plus; }; @@ -15711,7 +15767,7 @@ let pname = "prefork"; version = "1.05"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/prefork-1.05.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/prefork-1.05.tar.gz"; sha256 = "01ckn45ij3nbrsc0yc4wl4z0wndn36jh6247zbycwa1vlvgvr1vd"; }; meta = { @@ -15724,7 +15780,7 @@ let pname = "Pod-Perldoc"; version = "3.28"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MALLEN/Pod-Perldoc-3.28.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MALLEN/Pod-Perldoc-3.28.tar.gz"; sha256 = "0kf6xwdha8jl0nxv60r2v7xsfnvv6i3gy135xsl40g71p02ychfc"; }; meta = { @@ -15737,7 +15793,7 @@ let pname = "Pod-Plainer"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/R/RM/RMBARKER/Pod-Plainer-1.04.tar.gz; + url = "mirror://cpan/authors/id/R/RM/RMBARKER/Pod-Plainer-1.04.tar.gz"; sha256 = "1bbfbf7d1d4871e5a83bab2137e22d089078206815190eb1d5c1260a3499456f"; }; meta = { @@ -15750,12 +15806,12 @@ let pname = "Pod-Markdown"; version = "3.200"; src = fetchurl { - url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-3.200.tar.gz; + url = "mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-3.200.tar.gz"; sha256 = "16dffpqwrdhi2s90ff2sgncrpnzqp81ydhl5pd78m725j60p2286"; }; buildInputs = [ TestDifferences ]; meta = { - homepage = https://github.com/rwstauner/Pod-Markdown; + homepage = "https://github.com/rwstauner/Pod-Markdown"; description = "Convert POD to Markdown"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15766,7 +15822,7 @@ let pname = "Pod-Markdown-Github"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MINIMAL/Pod-Markdown-Github-0.04.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MINIMAL/Pod-Markdown-Github-0.04.tar.gz"; sha256 = "04y67c50hpf1vb9cwsza3fbj4rshdqa47vi3zcj4kkjckh02yzmk"; }; propagatedBuildInputs = [ PodMarkdown ]; @@ -15781,7 +15837,7 @@ let pname = "Pod-Simple"; version = "3.40"; src = fetchurl { - url = mirror://cpan/authors/id/K/KH/KHW/Pod-Simple-3.40.tar.gz; + url = "mirror://cpan/authors/id/K/KH/KHW/Pod-Simple-3.40.tar.gz"; sha256 = "0384k8k18srsdj2a2j10gbvv19lnvynq359y9kb4zn5bv2wqqfh6"; }; }; @@ -15790,7 +15846,7 @@ let pname = "Pod-Spell"; version = "1.20"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOLMEN/Pod-Spell-1.20.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOLMEN/Pod-Spell-1.20.tar.gz"; sha256 = "6383f7bfe22bc0d839a08057a0ce780698b046184aea935be4833d94986dd03c"; }; propagatedBuildInputs = [ ClassTiny FileShareDir LinguaENInflect PathTiny ]; @@ -15801,7 +15857,7 @@ let pname = "Pod-Strip"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOMM/Pod-Strip-1.02.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOMM/Pod-Strip-1.02.tar.gz"; sha256 = "1zsjfw2cjq1bd3ppl67fdvrx46vj9lina0c3cv9qgk5clzvaq3fq"; }; meta = { @@ -15814,7 +15870,7 @@ let pname = "Pod-Tidy"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHOBLITT/Pod-Tidy-0.10.tar.gz; + url = "mirror://cpan/authors/id/J/JH/JHOBLITT/Pod-Tidy-0.10.tar.gz"; sha256 = "1gcxjplgksnc5iggi8dzbkbkcryii5wjhypd7fs3kmbwx91y2vl8"; }; propagatedBuildInputs = [ EncodeNewlines IOString PodWrap TextGlob ]; @@ -15829,13 +15885,13 @@ let pname = "Pod-Weaver"; version = "4.015"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-4.015.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-4.015.tar.gz"; sha256 = "5af25b29a55783e495a9df5ef6293240e2c9ab02764613d79f1ed50b12dec5ae"; }; buildInputs = [ PPI SoftwareLicense TestDifferences ]; propagatedBuildInputs = [ ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli PodElemental ]; meta = { - homepage = https://github.com/rjbs/Pod-Weaver; + homepage = "https://github.com/rjbs/Pod-Weaver"; description = "Weave together a Pod document from an outline"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15845,7 +15901,7 @@ let pname = "Pod-Wrap"; version = "0.01"; src = fetchurl { - url = mirror://cpan/authors/id/N/NU/NUFFIN/Pod-Wrap-0.01.tar.gz; + url = "mirror://cpan/authors/id/N/NU/NUFFIN/Pod-Wrap-0.01.tar.gz"; sha256 = "0qwb5hp26f85xnb3zivf8ccfdplabiyl5sd53c6wgdgvzzicpjjh"; }; meta = { @@ -15857,7 +15913,7 @@ let pname = "Probe-Perl"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Probe-Perl-0.03.tar.gz; + url = "mirror://cpan/authors/id/K/KW/KWILLIAMS/Probe-Perl-0.03.tar.gz"; sha256 = "0c9wiaz0mqqknafr4jdr0g2gdzxnn539182z0icqaqvp5qgd5r6r"; }; }; @@ -15866,13 +15922,13 @@ let pname = "POSIX-strftime-Compiler"; version = "0.42"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/POSIX-strftime-Compiler-0.42.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/POSIX-strftime-Compiler-0.42.tar.gz"; sha256 = "26582bdd78b254bcc1c56d0b770fa280e8b8f70957c84dc44572ba4cacb0ac11"; }; # We cannot change timezones on the fly. prePatch = "rm t/04_tzset.t"; meta = { - homepage = https://github.com/kazeburo/POSIX-strftime-Compiler; + homepage = "https://github.com/kazeburo/POSIX-strftime-Compiler"; description = "GNU C library compatible strftime for loggers and servers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15882,12 +15938,12 @@ let pname = "Razor2-Client-Agent"; version = "2.86"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Razor2-Client-Agent-2.86.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/Razor2-Client-Agent-2.86.tar.gz"; sha256 = "5e062e02ebb65e24b708e7eefa5300c43d6f657bf20d08fec4ca8a0a3b94845f"; }; propagatedBuildInputs = [ DigestSHA1 URI ]; meta = { - homepage = http://razor.sourceforge.net/; + homepage = "http://razor.sourceforge.net/"; description = "Collaborative, content-based spam filtering network agent"; license = stdenv.lib.licenses.mit; }; @@ -15898,12 +15954,12 @@ let pname = "Readonly"; version = "2.05"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SANKO/Readonly-2.05.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SANKO/Readonly-2.05.tar.gz"; sha256 = "4b23542491af010d44a5c7c861244738acc74ababae6b8838d354dfb19462b5e"; }; buildInputs = [ ModuleBuildTiny ]; meta = { - homepage = https://github.com/sanko/readonly; + homepage = "https://github.com/sanko/readonly"; description = "Facility for creating read-only scalars, arrays, hashes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15913,7 +15969,7 @@ let pname = "Readonly-XS"; version = "1.05"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROODE/Readonly-XS-1.05.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROODE/Readonly-XS-1.05.tar.gz"; sha256 = "8ae5c4e85299e5c8bddd1b196f2eea38f00709e0dc0cb60454dc9114ae3fff0d"; }; propagatedBuildInputs = [ Readonly ]; @@ -15923,13 +15979,13 @@ let pname = "Redis"; version = "1.995"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAMS/Redis-1.995.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAMS/Redis-1.995.tar.gz"; sha256 = "a0b07b284ff12bb852a3120723f1e63ab279df575d6c52a78f914565a9f0b906"; }; buildInputs = [ IOString ModuleBuildTiny TestDeep TestFatal TestSharedFork TestTCP ]; propagatedBuildInputs = [ IOSocketTimeout TryTiny ]; meta = { - homepage = https://github.com/PerlRedis/perl-redis; + homepage = "https://github.com/PerlRedis/perl-redis"; description = "Perl binding for Redis database"; license = stdenv.lib.licenses.artistic2; }; @@ -15939,7 +15995,7 @@ let pname = "Ref-Util"; version = "0.204"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARC/Ref-Util-0.204.tar.gz; + url = "mirror://cpan/authors/id/A/AR/ARC/Ref-Util-0.204.tar.gz"; sha256 = "1q85y5lzgl8wz5qnz3j6mch2fmllr668h54wszaz6i6gp8ysfps1"; }; meta = { @@ -15952,7 +16008,7 @@ let pname = "Regexp-Assemble"; version = "0.38"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSAVAGE/Regexp-Assemble-0.38.tgz; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Regexp-Assemble-0.38.tgz"; sha256 = "0hp4v8mghmpflq9l9fqrkjg4cw0d3ha2nrmnsnzwjwqvmvwyfsx0"; }; }; @@ -15961,7 +16017,7 @@ let pname = "Regexp-Common"; version = "2017060201"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2017060201.tar.gz; + url = "mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2017060201.tar.gz"; sha256 = "ee07853aee06f310e040b6bf1a0199a18d81896d3219b9b35c9630d0eb69089b"; }; meta = with stdenv.lib; { @@ -15974,7 +16030,7 @@ let pname = "Regexp-Common-net-CIDR"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/B/BP/BPS/Regexp-Common-net-CIDR-0.03.tar.gz; + url = "mirror://cpan/authors/id/B/BP/BPS/Regexp-Common-net-CIDR-0.03.tar.gz"; sha256 = "39606a57aab20d4f4468300f2ec3fa2ab557fcc9cb7880ec7c6e07d80162da33"; }; propagatedBuildInputs = [ RegexpCommon ]; @@ -15987,7 +16043,7 @@ let pname = "Regexp-Grammars"; version = "1.052"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.052.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.052.tar.gz"; sha256 = "d552e7aaec956fc9ff0c56602fc95bc5c97ef815a0a8df7f42d1128f39534a62"; }; meta = { @@ -16000,7 +16056,7 @@ let pname = "Regexp-IPv6"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SALVA/Regexp-IPv6-0.03.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SALVA/Regexp-IPv6-0.03.tar.gz"; sha256 = "d542d17d75ce93631de8ba2156da0e0b58a755c409cd4a0d27a3873a26712ce2"; }; }; @@ -16009,11 +16065,11 @@ let pname = "Regexp-Parser"; version = "0.23"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Regexp-Parser-0.23.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/Regexp-Parser-0.23.tar.gz"; sha256 = "f739dab8df2b06aae5c48f9971251b73704464a32d07d8d025f3c0f869544e89"; }; meta = { - homepage = https://github.com/toddr/Regexp-Parser; + homepage = "https://github.com/toddr/Regexp-Parser"; description = "Base class for parsing regexes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -16023,7 +16079,7 @@ let pname = "Regexp-Trie"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DANKOGAI/Regexp-Trie-0.02.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DANKOGAI/Regexp-Trie-0.02.tar.gz"; sha256 = "1yn5l6x3xyic9jxw9jggqsbggcv7rc8ggj4zbnlz9hfvv17gjazv"; }; meta = { @@ -16034,7 +16090,7 @@ let pname = "REST-Client"; version = "273"; src = fetchurl { - url = mirror://cpan/authors/id/K/KK/KKANE/REST-Client-273.tar.gz; + url = "mirror://cpan/authors/id/K/KK/KKANE/REST-Client-273.tar.gz"; sha256 = "a8652a2214308faff2c68be5ce64c904dcccc5e86be7f32376c1590869d01844"; }; propagatedBuildInputs = [ LWPProtocolHttps ]; @@ -16048,12 +16104,12 @@ let pname = "REST-Utils"; version = "0.6"; src = fetchurl { - url = mirror://cpan/authors/id/J/JA/JALDHAR/REST-Utils-0.6.tar.gz; + url = "mirror://cpan/authors/id/J/JA/JALDHAR/REST-Utils-0.6.tar.gz"; sha256 = "1zdrf3315rp2b8r9dwwj5h93xky7i33iawf4hzszwcddhzflmsfl"; }; buildInputs = [ TestLongString TestWWWMechanize TestWWWMechanizeCGI ]; meta = { - homepage = https://jaldhar.github.io/REST-Utils/; + homepage = "https://jaldhar.github.io/REST-Utils/"; description = "Utility functions for REST applications"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -16063,7 +16119,7 @@ let pname = "RPC-XML"; version = "0.80"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.80.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.80.tar.gz"; sha256 = "1xvy9hs7bqsjnk0663kf7zk2qjg0pzv96n6z2wlc2w5bgal7q3ga"; }; propagatedBuildInputs = [ XMLParser ]; @@ -16074,7 +16130,7 @@ let pname = "Return-Value"; version = "1.666005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.666005.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.666005.tar.gz"; sha256 = "1b2hfmdl19zi1z3npzv9wf6dh1g0xd88i70b4233ds9icnln08lf"; }; }; @@ -16083,7 +16139,7 @@ let pname = "Role-Basic"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/O/OV/OVID/Role-Basic-0.13.tar.gz; + url = "mirror://cpan/authors/id/O/OV/OVID/Role-Basic-0.13.tar.gz"; sha256 = "38a0959ef9f193ff76e72c325a9e9211bc4868689bd0e2b005778f53f8b6f36a"; }; meta = { @@ -16096,7 +16152,7 @@ let pname = "Role-HasMessage"; version = "0.006"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Role-HasMessage-0.006.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Role-HasMessage-0.006.tar.gz"; sha256 = "1lylfvarjfy6wy34dfny3032pc6r33mjby5yzzhmxybg8zhdp9pn"; }; propagatedBuildInputs = [ MooseXRoleParameterized StringErrf ]; @@ -16110,7 +16166,7 @@ let pname = "Role-Identifiable"; version = "0.007"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Role-Identifiable-0.007.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Role-Identifiable-0.007.tar.gz"; sha256 = "1bbkj2wqpbfdw1cbm99vg9d94rvzba19m18xhnylaym0l78lc4sn"; }; propagatedBuildInputs = [ Moose ]; @@ -16124,7 +16180,7 @@ let pname = "Role-Tiny"; version = "2.001004"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Role-Tiny-2.001004.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Role-Tiny-2.001004.tar.gz"; sha256 = "92ba5712850a74102c93c942eb6e7f62f7a4f8f483734ed289d08b324c281687"; }; meta = { @@ -16151,7 +16207,7 @@ let pname = "RSS-Parser-Lite"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/T/TF/TFPBL/RSS-Parser-Lite-0.12.tar.gz; + url = "mirror://cpan/authors/id/T/TF/TFPBL/RSS-Parser-Lite-0.12.tar.gz"; sha256 = "1fcmp4qp7q3xr2mw7clqqwph45icbvgfs2n41gp9zamim2y39p49"; }; propagatedBuildInputs = [ locallib ]; @@ -16162,7 +16218,7 @@ let pname = "RT-Client-REST"; version = "0.56"; src = fetchurl { - url = mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.56.tar.gz; + url = "mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.56.tar.gz"; sha256 = "798baccf11eaecbb7d2d27be0b5e4fa9cb80b34cc51cab12eb7b88facf39fd4b"; }; buildInputs = [ CGI HTTPServerSimple TestException ]; @@ -16177,7 +16233,7 @@ let pname = "Safe-Isa"; version = "1.000010"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Safe-Isa-1.000010.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Safe-Isa-1.000010.tar.gz"; sha256 = "0sm6p1kw98s7j6n92vvxjqf818xggnmjwci34xjmw7gzl2519x47"; }; meta = { @@ -16190,7 +16246,7 @@ let pname = "Scalar-List-Utils"; version = "1.53"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.53.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.53.tar.gz"; sha256 = "bd4086b066fb3b18a0be2e7d9bc100a99aa0f233ad659492340415c7b2bdae99"; }; meta = { @@ -16203,7 +16259,7 @@ let pname = "Scalar-String"; version = "0.003"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Scalar-String-0.003.tar.gz; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Scalar-String-0.003.tar.gz"; sha256 = "f54a17c9b78713b02cc43adfadf60b49467e7634d31317e8b9e9e97c26d68b52"; }; }; @@ -16212,7 +16268,7 @@ let pname = "SCGI"; version = "0.6"; src = fetchurl { - url = mirror://cpan/authors/id/V/VI/VIPERCODE/SCGI-0.6.tar.gz; + url = "mirror://cpan/authors/id/V/VI/VIPERCODE/SCGI-0.6.tar.gz"; sha256 = "196rj47mh4fq2vlnw595q391zja5v6qg7s3sy0vy8igfyid8rdsq"; }; preConfigure = "export HOME=$(mktemp -d)"; @@ -16222,7 +16278,7 @@ let pname = "Scope-Guard"; version = "0.21"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.21.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.21.tar.gz"; sha256 = "0y6jfzvxiz8h5yfz701shair0ilypq2mvimd7wn8wi2nbkm1p6wc"; }; meta = { @@ -16235,7 +16291,7 @@ let pname = "Scope-Upper"; version = "0.32"; src = fetchurl { - url = mirror://cpan/authors/id/V/VP/VPIT/Scope-Upper-0.32.tar.gz; + url = "mirror://cpan/authors/id/V/VP/VPIT/Scope-Upper-0.32.tar.gz"; sha256 = "ccaff3251c092f2af8b5ad840b76655c4bc4ccf504ff7bde233811822a40abcf"; }; meta = { @@ -16288,13 +16344,13 @@ let pname = "Sereal-Decoder"; version = "4.008"; src = fetchurl { - url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-4.008.tar.gz; + url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-4.008.tar.gz"; sha256 = "1vxgwlya7sj9mb6y278qblrjl2708d0agy7cryyqj7qf08d056rv"; }; buildInputs = [ TestDeep TestDifferences TestLongString TestWarn ]; preBuild = ''ls''; meta = { - homepage = https://github.com/Sereal/Sereal; + homepage = "https://github.com/Sereal/Sereal"; description = "Fast, compact, powerful binary deserialization"; license = with stdenv.lib.licenses; [ artistic2 ]; maintainers = [ maintainers.thoughtpolice ]; @@ -16305,12 +16361,12 @@ let pname = "Sereal-Encoder"; version = "4.008"; src = fetchurl { - url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-Encoder-4.008.tar.gz; + url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-Encoder-4.008.tar.gz"; sha256 = "0vzk6d2h034qks4lby53xrfljsrx4cvkaqi7gz9frba17lvl01rq"; }; buildInputs = [ SerealDecoder TestDeep TestDifferences TestLongString TestWarn ]; meta = { - homepage = https://github.com/Sereal/Sereal; + homepage = "https://github.com/Sereal/Sereal"; description = "Fast, compact, powerful binary deserialization"; license = with stdenv.lib.licenses; [ artistic2 ]; maintainers = [ maintainers.thoughtpolice ]; @@ -16321,13 +16377,13 @@ let pname = "Sereal"; version = "4.008"; src = fetchurl { - url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-4.008.tar.gz; + url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-4.008.tar.gz"; sha256 = "1ima428v8mi509crr3b1rnh67ki8vbcd7iignw68mf2iaw5wmb58"; }; buildInputs = [ TestLongString TestWarn ]; propagatedBuildInputs = [ SerealDecoder SerealEncoder ]; meta = { - homepage = https://github.com/Sereal/Sereal; + homepage = "https://github.com/Sereal/Sereal"; description = "Fast, compact, powerful binary deserialization"; license = with stdenv.lib.licenses; [ artistic2 ]; maintainers = [ maintainers.thoughtpolice ]; @@ -16351,12 +16407,12 @@ let pname = "Server-Starter"; version = "0.35"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/Server-Starter-0.35.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZUHO/Server-Starter-0.35.tar.gz"; sha256 = "676dc0d6cff4648538332c63c32fb88ad09ed868213ea9e62e3f19fad41b9c40"; }; buildInputs = [ TestRequires TestSharedFork TestTCP ]; meta = { - homepage = https://github.com/kazuho/p5-Server-Starter; + homepage = "https://github.com/kazuho/p5-Server-Starter"; description = "A superdaemon for hot-deploying server programs"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -16381,7 +16437,7 @@ let pname = "Set-Infinite"; version = "0.65"; src = fetchurl { - url = mirror://cpan/authors/id/F/FG/FGLOCK/Set-Infinite-0.65.tar.gz; + url = "mirror://cpan/authors/id/F/FG/FGLOCK/Set-Infinite-0.65.tar.gz"; sha256 = "07bc880734492de40b4a3a8b5a331762f64e69b4629029fd9a9d357b25b87e1f"; }; meta = { @@ -16393,7 +16449,7 @@ let pname = "Set-IntSpan"; version = "1.19"; src = fetchurl { - url = mirror://cpan/authors/id/S/SW/SWMCD/Set-IntSpan-1.19.tar.gz; + url = "mirror://cpan/authors/id/S/SW/SWMCD/Set-IntSpan-1.19.tar.gz"; sha256 = "1l6znd40ylzvfwl02rlqzvakv602rmvwgm2xd768fpgc2fdm9dqi"; }; @@ -16406,7 +16462,7 @@ let pname = "Set-Object"; version = "1.40"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Set-Object-1.40.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Set-Object-1.40.tar.gz"; sha256 = "1c4d8464c13e6d94957cf021ce603c961b08f52db6a9eaf5a5b0d37868cd37b7"; }; meta = { @@ -16419,7 +16475,7 @@ let pname = "Set-Scalar"; version = "1.29"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAVIDO/Set-Scalar-1.29.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAVIDO/Set-Scalar-1.29.tar.gz"; sha256 = "07aiqkyi1p22drpcyrrmv7f8qq6fhrxh007achy2vryxyck1bp53"; }; meta = { @@ -16446,7 +16502,7 @@ let pname = "SGMLSpm"; version = "1.1"; src = fetchurl { - url = mirror://cpan/authors/id/R/RA/RAAB/SGMLSpm-1.1.tar.gz; + url = "mirror://cpan/authors/id/R/RA/RAAB/SGMLSpm-1.1.tar.gz"; sha256 = "1gdjf3mcz2bxir0l9iljxiz6qqqg3a9gg23y5wjg538w552r432m"; }; }; @@ -16455,7 +16511,7 @@ let pname = "Signal-Mask"; version = "0.008"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Signal-Mask-0.008.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/Signal-Mask-0.008.tar.gz"; sha256 = "043d995b6b249d9ebc04c467db31bb7ddc2e55faa08e885bdb050b1f2336b73f"; }; propagatedBuildInputs = [ IPCSignal ]; @@ -16469,7 +16525,7 @@ let pname = "Snowball-Norwegian"; version = "1.2"; src = fetchurl { - url = mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Norwegian-1.2.tar.gz; + url = "mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Norwegian-1.2.tar.gz"; sha256 = "0675v45bbsh7vr7kpf36xs2q79g02iq1kmfw22h20xdk4rzqvkqx"; }; meta = { @@ -16482,7 +16538,7 @@ let pname = "Snowball-Swedish"; version = "1.2"; src = fetchurl { - url = mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Swedish-1.2.tar.gz; + url = "mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Swedish-1.2.tar.gz"; sha256 = "0agwc12jk5kmabnpsplw3wf4ii5w1zb159cpin44x3srb0sr5apg"; }; meta = { @@ -16495,7 +16551,7 @@ let pname = "SOAP-Lite"; version = "1.27"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.27.tar.gz; + url = "mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.27.tar.gz"; sha256 = "00fkvmnxiy5mr45rj5qmxmflw0xdkw2gihm48iha2i8smdmi0ng3"; }; propagatedBuildInputs = [ ClassInspector IOSessionData LWPProtocolHttps TaskWeaken XMLParser ]; @@ -16510,7 +16566,7 @@ let pname = "Socket6"; version = "0.29"; src = fetchurl { - url = mirror://cpan/authors/id/U/UM/UMEMOTO/Socket6-0.29.tar.gz; + url = "mirror://cpan/authors/id/U/UM/UMEMOTO/Socket6-0.29.tar.gz"; sha256 = "468915fa3a04dcf6574fc957eff495915e24569434970c91ee8e4e1459fc9114"; }; setOutputFlags = false; @@ -16526,13 +16582,13 @@ let pname = "Software-License"; version = "0.103014"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Software-License-0.103014.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/Software-License-0.103014.tar.gz"; sha256 = "eb45ea602d75006683789fbba57a01c0a1f7037371de95ea54b91577535d1789"; }; buildInputs = [ TryTiny ]; propagatedBuildInputs = [ DataSection TextTemplate ]; meta = { - homepage = https://github.com/rjbs/Software-License; + homepage = "https://github.com/rjbs/Software-License"; description = "Packages that provide templated software licenses"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -16542,7 +16598,7 @@ let pname = "Software-License-CCpack"; version = "1.11"; src = fetchurl { - url = mirror://cpan/authors/id/B/BB/BBYRD/Software-License-CCpack-1.11.tar.gz; + url = "mirror://cpan/authors/id/B/BB/BBYRD/Software-License-CCpack-1.11.tar.gz"; sha256 = "1cakbn7am8mhalwas5h33l7c6avdqpg42z478p6rav11pim5qksr"; }; propagatedBuildInputs = [ SoftwareLicense ]; @@ -16558,7 +16614,7 @@ let pname = "Sort-Key"; version = "1.33"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SALVA/Sort-Key-1.33.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SALVA/Sort-Key-1.33.tar.gz"; sha256 = "1kqs10s2plj6c96srk0j8d7xj8dxk1704r7mck8rqk09mg7lqspd"; }; meta = { @@ -16571,7 +16627,7 @@ let pname = "Sort-Versions"; version = "1.62"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Sort-Versions-1.62.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Sort-Versions-1.62.tar.gz"; sha256 = "1aifzm79ky03gi2lwxyx4mk6yky8x215j0kz4f0jbgkf803k6pxz"; }; }; @@ -16580,7 +16636,7 @@ let pname = "Specio"; version = "0.45"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.45.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.45.tar.gz"; sha256 = "1xk1skzvmqjgk7dqfkcmp6g7fc493cyk2hp94fzpdc43cg78ifg4"; }; propagatedBuildInputs = [ DevelStackTrace EvalClosure MROCompat ModuleRuntime RoleTiny SubQuote TryTiny ]; @@ -16595,7 +16651,7 @@ let pname = "Specio-Library-Path-Tiny"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Specio-Library-Path-Tiny-0.04.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Specio-Library-Path-Tiny-0.04.tar.gz"; sha256 = "0cyfx8gigsgisdwynjamh8jkpad23sr8v6a98hq285zmibm16s7g"; }; propagatedBuildInputs = [ PathTiny Specio ]; @@ -16610,7 +16666,7 @@ let pname = "Spiffy"; version = "0.46"; src = fetchurl { - url = mirror://cpan/authors/id/I/IN/INGY/Spiffy-0.46.tar.gz; + url = "mirror://cpan/authors/id/I/IN/INGY/Spiffy-0.46.tar.gz"; sha256 = "18qxshrjh0ibpzjm2314157mxlibh3smyg64nr4mq990hh564n4g"; }; }; @@ -16619,12 +16675,12 @@ let pname = "Spreadsheet-ParseExcel"; version = "0.65"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOUGW/Spreadsheet-ParseExcel-0.65.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOUGW/Spreadsheet-ParseExcel-0.65.tar.gz"; sha256 = "6ec4cb429bd58d81640fe12116f435c46f51ff1040c68f09cc8b7681c1675bec"; }; propagatedBuildInputs = [ CryptRC4 DigestPerlMD5 IOStringy OLEStorage_Lite ]; meta = { - homepage = https://github.com/runrig/spreadsheet-parseexcel/; + homepage = "https://github.com/runrig/spreadsheet-parseexcel/"; description = "Read information from an Excel file"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -16634,7 +16690,7 @@ let pname = "Spreadsheet-WriteExcel"; version = "2.40"; src = fetchurl { - url = mirror://cpan/authors/id/J/JM/JMCNAMARA/Spreadsheet-WriteExcel-2.40.tar.gz; + url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/Spreadsheet-WriteExcel-2.40.tar.gz"; sha256 = "e356aad6866cf135731268ee0e979a197443c15a04878e9cf3e80d022ad6c07e"; }; propagatedBuildInputs = [ OLEStorage_Lite ParseRecDescent ]; @@ -16648,7 +16704,7 @@ let pname = "SQL-Abstract"; version = "1.86"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/SQL-Abstract-1.86.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILMARI/SQL-Abstract-1.86.tar.gz"; sha256 = "e7a7f7da5e6fa42f495860e92e9138b8a0964ca7674c95bd6ff1b1ce21aa8cdf"; }; buildInputs = [ TestDeep TestException TestWarn ]; @@ -16663,7 +16719,7 @@ let pname = "SQL-Abstract-Limit"; version = "0.141"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAVEBAIRD/SQL-Abstract-Limit-0.141.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAVEBAIRD/SQL-Abstract-Limit-0.141.tar.gz"; sha256 = "1qqh89kz065mkgyg5pjcgbf8qcpzfk8vf1lgkbwynknadmv87zqg"; }; propagatedBuildInputs = [ DBI SQLAbstract ]; @@ -16674,7 +16730,7 @@ let pname = "SQL-SplitStatement"; version = "1.00020"; src = fetchurl { - url = mirror://cpan/authors/id/E/EM/EMAZEP/SQL-SplitStatement-1.00020.tar.gz; + url = "mirror://cpan/authors/id/E/EM/EMAZEP/SQL-SplitStatement-1.00020.tar.gz"; sha256 = "0bqg45k4c9qkb2ypynlwhpvzsl4ssfagmsalys18s5c79ps30z7p"; }; buildInputs = [ TestException ]; @@ -16685,7 +16741,7 @@ let pname = "SQL-Statement"; version = "1.412"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/SQL-Statement-1.412.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/SQL-Statement-1.412.tar.gz"; sha256 = "65c870883379c11b53f19ead10aaac241ccc86a90bbab77f6376fe750720e5c8"; }; buildInputs = [ TestDeep ]; @@ -16696,7 +16752,7 @@ let pname = "SQL-Tokenizer"; version = "0.24"; src = fetchurl { - url = mirror://cpan/authors/id/I/IZ/IZUT/SQL-Tokenizer-0.24.tar.gz; + url = "mirror://cpan/authors/id/I/IZ/IZUT/SQL-Tokenizer-0.24.tar.gz"; sha256 = "1qa2dfbzdlr5qqdam9yn78z5w3al5r8577x06qan8wv58ay6ka7s"; }; }; @@ -16705,7 +16761,7 @@ let pname = "SQL-Translator"; version = "1.60"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/SQL-Translator-1.60.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILMARI/SQL-Translator-1.60.tar.gz"; sha256 = "6bb0cb32ca25da69df65e5de71f679f3ca90044064526fa336cabd342f220e87"; }; buildInputs = [ FileShareDirInstall JSONMaybeXS TestDifferences TestException XMLWriter YAML ]; @@ -16720,7 +16776,7 @@ let pname = "Package-Variant"; version = "1.003002"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTROUT/Package-Variant-1.003002.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSTROUT/Package-Variant-1.003002.tar.gz"; sha256 = "b2ed849d2f4cdd66467512daa3f143266d6df810c5fae9175b252c57bc1536dc"; }; buildInputs = [ TestFatal ]; @@ -16735,7 +16791,7 @@ let pname = "Sort-Naturally"; version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Sort-Naturally-1.03.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Sort-Naturally-1.03.tar.gz"; sha256 = "eaab1c5c87575a7826089304ab1f8ffa7f18e6cd8b3937623e998e865ec1e746"; }; }; @@ -16744,7 +16800,7 @@ let pname = "Starlet"; version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/Starlet-0.31.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZUHO/Starlet-0.31.tar.gz"; sha256 = "b9603b8e62880cb4582f6a7939eafec65e6efd3d900f2c7dd342e5f4c68d62d8"; }; buildInputs = [ LWP TestSharedFork TestTCP ]; @@ -16760,7 +16816,7 @@ let pname = "Starman"; version = "0.4015"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4015.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4015.tar.gz"; sha256 = "1y1kn4929k299fbf6sw9lxcsdlq9fvq777p6yrzk591rr9xhkx8h"; }; buildInputs = [ LWP ModuleBuildTiny TestRequires TestTCP ]; @@ -16772,7 +16828,7 @@ let doCheck = false; # binds to various TCP ports meta = { - homepage = https://github.com/miyagawa/Starman; + homepage = "https://github.com/miyagawa/Starman"; description = "High-performance preforking PSGI/Plack web server"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -16782,7 +16838,7 @@ let pname = "Statistics-Basic"; version = "1.6611"; src = fetchurl { - url = mirror://cpan/authors/id/J/JE/JETTERO/Statistics-Basic-1.6611.tar.gz; + url = "mirror://cpan/authors/id/J/JE/JETTERO/Statistics-Basic-1.6611.tar.gz"; sha256 = "1ywl398z42hz9w1k0waf1caa6agz8jzsjlf4rzs1lgpx2mbcwmb8"; }; propagatedBuildInputs = [ NumberFormat ]; @@ -16795,7 +16851,7 @@ let pname = "Statistics-CaseResampling"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/Statistics-CaseResampling-0.15.tar.gz; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/Statistics-CaseResampling-0.15.tar.gz"; sha256 = "11whlh2dl7l6wrrnfmpbsg7ldcn316iccl1aaa4j5lqhdyyl6745"; }; meta = { @@ -16807,11 +16863,11 @@ let pname = "Statistics-Descriptive"; version = "3.0702"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0702.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0702.tar.gz"; sha256 = "f98a10c625640170cdda408cccc72bdd7f66f8ebe5f59dec1b96185171ef11d0"; }; meta = { - #homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; # berlios shut down; I found no replacement + #homepage = "http://web-cpan.berlios.de/modules/Statistics-Descriptive/"; # berlios shut down; I found no replacement description = "Module of basic descriptive statistical functions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -16822,7 +16878,7 @@ let pname = "Statistics-Distributions"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKEK/Statistics-Distributions-1.02.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIKEK/Statistics-Distributions-1.02.tar.gz"; sha256 = "1j1kswl98f4i9dn176f9aa3y9bissx2sscga5jm3gjl4pxm3k7zr"; }; }; @@ -16831,7 +16887,7 @@ let pname = "Statistics-TTest"; version = "1.1.0"; src = fetchurl { - url = mirror://cpan/authors/id/Y/YU/YUNFANG/Statistics-TTest-1.1.0.tar.gz; + url = "mirror://cpan/authors/id/Y/YU/YUNFANG/Statistics-TTest-1.1.0.tar.gz"; sha256 = "0rkifgzm4rappiy669dyi6lyxn2sdqaf0bl6gndlfa67b395kndj"; }; propagatedBuildInputs = [ StatisticsDescriptive StatisticsDistributions ]; @@ -16841,7 +16897,7 @@ let pname = "Storable"; version = "3.15"; src = fetchurl { - url = mirror://cpan/authors/id/X/XS/XSAWYERX/Storable-3.15.tar.gz; + url = "mirror://cpan/authors/id/X/XS/XSAWYERX/Storable-3.15.tar.gz"; sha256 = "fc3dad06cb2e6fc86a2f2abc5b5491d9da328ca3e6b6306559c224521db174da"; }; meta = { @@ -16853,11 +16909,11 @@ let pname = "Stream-Buffered"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Stream-Buffered-0.03.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOY/Stream-Buffered-0.03.tar.gz"; sha256 = "0fs2n9zw6isfkha2kbqrvl9mwg572x1x0jlfaps0qsyynn846bcv"; }; meta = { - homepage = https://plackperl.org; + homepage = "https://plackperl.org"; description = "Temporary buffer to save bytes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -16867,11 +16923,11 @@ let pname = "strictures"; version = "2.000006"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/strictures-2.000006.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/strictures-2.000006.tar.gz"; sha256 = "0mwd9xqz4n8qfpi5h5581lbm33qhf7agww18h063icnilrs7km89"; }; meta = { - homepage = http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git; + homepage = "http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git"; description = "Turn on strict and make all warnings fatal"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -16881,7 +16937,7 @@ let pname = "String-Approx"; version = "3.28"; src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHI/String-Approx-3.28.tar.gz; + url = "mirror://cpan/authors/id/J/JH/JHI/String-Approx-3.28.tar.gz"; sha256 = "43201e762d8699cb0ac2c0764a5454bdc2306c0771014d6c8fba821480631342"; }; }; @@ -16890,7 +16946,7 @@ let pname = "String-CamelCase"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/H/HI/HIO/String-CamelCase-0.04.tar.gz; + url = "mirror://cpan/authors/id/H/HI/HIO/String-CamelCase-0.04.tar.gz"; sha256 = "1a8i4yzv586svd0pbxls7642vvmyiwzh4x2xyij8gbnfxsydxhw9"; }; }; @@ -16899,7 +16955,7 @@ let pname = "String-CRC32"; version = "1.8"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-1.8.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-1.8.tar.gz"; sha256 = "0vvwlf50vylx1m7nrjphkz309nsl2k2yqyldn3942337kiipjnmn"; }; }; @@ -16908,7 +16964,7 @@ let pname = "String-Errf"; version = "0.008"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/String-Errf-0.008.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Errf-0.008.tar.gz"; sha256 = "1nyn9s52jgbffrsv0m7rhcx1awjj43n68bfjlap8frdc7mw6y4xf"; }; buildInputs = [ JSONMaybeXS TimeDate ]; @@ -16923,7 +16979,7 @@ let pname = "String-Escape"; version = "2010.002"; src = fetchurl { - url = mirror://cpan/authors/id/E/EV/EVO/String-Escape-2010.002.tar.gz; + url = "mirror://cpan/authors/id/E/EV/EVO/String-Escape-2010.002.tar.gz"; sha256 = "12ls7f7847i4qcikkp3skwraqvjphjiv2zxfhl5d49326f5myr7x"; }; }; @@ -16932,12 +16988,12 @@ let pname = "String-Flogger"; version = "1.101245"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/String-Flogger-1.101245.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Flogger-1.101245.tar.gz"; sha256 = "aa03c08e01f802a358c175c6093c02adf9688659a087a8ddefdc3e9cef72640b"; }; propagatedBuildInputs = [ JSONMaybeXS SubExporter ]; meta = { - homepage = https://github.com/rjbs/String-Flogger; + homepage = "https://github.com/rjbs/String-Flogger"; description = "String munging for loggers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -16947,7 +17003,7 @@ let pname = "String-Format"; version = "1.18"; src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SREZIC/String-Format-1.18.tar.gz; + url = "mirror://cpan/authors/id/S/SR/SREZIC/String-Format-1.18.tar.gz"; sha256 = "0y77frxzjifd4sw0j19cc346ysas1mya84rdxaz279lyin7plhcy"; }; }; @@ -16956,7 +17012,7 @@ let pname = "String-Formatter"; version = "0.102084"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-0.102084.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-0.102084.tar.gz"; sha256 = "0mlwm0rirv46gj4h072q8gdync5zxxsxy8p028gdyrhczl942dc3"; }; propagatedBuildInputs = [ SubExporter ]; @@ -16966,11 +17022,25 @@ let }; }; + StringInterpolate = buildPerlPackage { + pname = "String-Interpolate"; + version = "0.32"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEILB/String-Interpolate-0.32.tar.gz; + sha256 = "15fwbpz3jdpdgmz794iw9hz2caxrnrw9pdwprxxkanpm92cdhaf7"; + }; + meta = with stdenv.lib; { + # https://metacpan.org/pod/String::Interpolate + description = "String::Interpolate - Wrapper for builtin the Perl interpolation engine."; + license = licenses.gpl1Plus; + }; + }; + StringMkPasswd = buildPerlPackage { pname = "String-MkPasswd"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/C/CG/CGRAU/String-MkPasswd-0.05.tar.gz; + url = "mirror://cpan/authors/id/C/CG/CGRAU/String-MkPasswd-0.05.tar.gz"; sha256 = "15lvcc8c9hp6mg3jx02wd3b85aphn8yl5db62q3pam04c0sgh42k"; }; }; @@ -16979,7 +17049,7 @@ let pname = "String-Random"; version = "0.30"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/String-Random-0.30.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/String-Random-0.30.tar.gz"; sha256 = "06xdpyjc53al0a4ib2lw1m388v41z97hzqbdkd00w3nmjsdrn4w1"; }; }; @@ -16988,7 +17058,7 @@ let pname = "String-RewritePrefix"; version = "0.008"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/String-RewritePrefix-0.008.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/String-RewritePrefix-0.008.tar.gz"; sha256 = "1sq8way03gxb990n232y201grnh0jj0xhj7g4b3mz3sfj7b32np4"; }; propagatedBuildInputs = [ SubExporter ]; @@ -17002,7 +17072,7 @@ let pname = "String-ShellQuote"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROSCH/String-ShellQuote-1.04.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROSCH/String-ShellQuote-1.04.tar.gz"; sha256 = "0dfxhr6hxc2majkkrm0qbx3qcbykzpphbj2ms93dc86f7183c1p6"; }; doCheck = !stdenv.isDarwin; @@ -17012,11 +17082,25 @@ let }; }; + StringSimilarity = buildPerlPackage { + pname = "String-Similarity"; + version = "1.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/String-Similarity-1.04.tar.gz"; + sha256 = "0i9j3hljxw7j6yiii9nsscfj009vw6zv1q8cxwd75jxvj0idm3hz"; + }; + doCheck = true; + meta = { + license = with stdenv.lib.licenses; [ gpl2 ]; + description = "Calculate the similarity of two strings"; + }; + }; + ShellCommand = buildPerlPackage { pname = "Shell-Command"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/Shell-Command-0.06.tar.gz; + url = "mirror://cpan/authors/id/F/FL/FLORA/Shell-Command-0.06.tar.gz"; sha256 = "1lgc2rb3b5a4lxvbq0cbg08qk0n2i88srxbsz93bwi3razpxxr7k"; }; }; @@ -17025,7 +17109,7 @@ let pname = "String-ToIdentifier-EN"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/String-ToIdentifier-EN-0.12.tar.gz; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/String-ToIdentifier-EN-0.12.tar.gz"; sha256 = "12nw7h2yiybhdw0vnnpc7bif8ylhsn6kqf6s39dsrf9h54iq9yrs"; }; propagatedBuildInputs = [ LinguaENInflectPhrase TextUnidecode namespaceclean ]; @@ -17035,7 +17119,7 @@ let pname = "String-Truncate"; version = "1.100602"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100602.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100602.tar.gz"; sha256 = "0vjz4fd4cvcy12gk5bdha7z73ifmfpmk748khha94dhiq3pd98xa"; }; propagatedBuildInputs = [ SubExporter ]; @@ -17049,7 +17133,7 @@ let pname = "String-TT"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/String-TT-0.03.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/String-TT-0.03.tar.gz"; sha256 = "1asjr79wqcl9wk96afxrm1yhpj8lk9bk8kyz78yi5ypr0h55yq7p"; }; buildInputs = [ TestException TestSimple13 TestTableDriven ]; @@ -17064,7 +17148,7 @@ let pname = "String-Util"; version = "1.26"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKO/String-Util-1.26.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIKO/String-Util-1.26.tar.gz"; sha256 = "0bgs6fsc0gcj9qa1k98nwjp4xbkl3ckz71rz3qhmav0lgkrr96pl"; }; meta = { @@ -17081,7 +17165,7 @@ let pname = "Struct-Dumb"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Struct-Dumb-0.09.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Struct-Dumb-0.09.tar.gz"; sha256 = "0g9rziaqxkm00vh30g1yfwzq3b1xl23p8fbm4rszqsp641wr2z9k"; }; buildInputs = [ TestFatal ]; @@ -17095,12 +17179,12 @@ let pname = "Sub-Exporter"; version = "0.987"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.987.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.987.tar.gz"; sha256 = "1ml3n1ck4ln9qjm2mcgkczj1jb5n1fkscz9c4x23v4db0glb4g2l"; }; propagatedBuildInputs = [ DataOptList ]; meta = { - homepage = https://github.com/rjbs/sub-exporter; + homepage = "https://github.com/rjbs/sub-exporter"; description = "A sophisticated exporter for custom-built routines"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17110,13 +17194,13 @@ let pname = "Sub-Exporter-ForMethods"; version = "0.100052"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-ForMethods-0.100052.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-ForMethods-0.100052.tar.gz"; sha256 = "421fbba4f6ffcf13c4335f2c20630d709e6fa659c07545d094dbc5a558ad3006"; }; buildInputs = [ namespaceautoclean ]; propagatedBuildInputs = [ SubExporter SubName ]; meta = { - homepage = https://github.com/rjbs/Sub-Exporter-ForMethods; + homepage = "https://github.com/rjbs/Sub-Exporter-ForMethods"; description = "Helper routines for using Sub::Exporter to build methods"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17126,12 +17210,12 @@ let pname = "Sub-Exporter-GlobExporter"; version = "0.005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-GlobExporter-0.005.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-GlobExporter-0.005.tar.gz"; sha256 = "0qvsvfvfyk69v2ygjnyd5sh3bgbzd6f7k7mgv0zws1yywvpmxi1g"; }; propagatedBuildInputs = [ SubExporter ]; meta = { - homepage = https://github.com/rjbs/sub-exporter-globexporter; + homepage = "https://github.com/rjbs/sub-exporter-globexporter"; description = "Export shared globs with Sub::Exporter collectors"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17141,7 +17225,7 @@ let pname = "Sub-Exporter-Progressive"; version = "0.001013"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/Sub-Exporter-Progressive-0.001013.tar.gz; + url = "mirror://cpan/authors/id/F/FR/FREW/Sub-Exporter-Progressive-0.001013.tar.gz"; sha256 = "0mn0x8mkh36rrsr58s1pk4srwxh2hbwss7sv630imnk49navfdfm"; }; meta = { @@ -17154,7 +17238,7 @@ let pname = "Sub-Identify"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/R/RG/RGARCIA/Sub-Identify-0.14.tar.gz; + url = "mirror://cpan/authors/id/R/RG/RGARCIA/Sub-Identify-0.14.tar.gz"; sha256 = "068d272086514dd1e842b6a40b1bedbafee63900e5b08890ef6700039defad6f"; }; meta = { @@ -17167,7 +17251,7 @@ let pname = "Sub-Info"; version = "0.002"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Sub-Info-0.002.tar.gz; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Sub-Info-0.002.tar.gz"; sha256 = "ea3056d696bdeff21a99d340d5570887d39a8cc47bff23adfc82df6758cdd0ea"; }; propagatedBuildInputs = [ Importer ]; @@ -17181,7 +17265,7 @@ let pname = "Sub-Install"; version = "0.928"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.928.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.928.tar.gz"; sha256 = "03zgk1yh128gciyx3q77zxzxg9kf8yy2gm46gdxqi24mcykngrb1"; }; meta = { @@ -17194,12 +17278,12 @@ let pname = "Sub-Name"; version = "0.26"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Sub-Name-0.26.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Sub-Name-0.26.tar.gz"; sha256 = "2d2f2d697d516c89547e7c4307f1e79441641cae2c7395e7319b306d390df105"; }; buildInputs = [ BC DevelCheckBin ]; meta = { - homepage = https://github.com/p5sagit/Sub-Name; + homepage = "https://github.com/p5sagit/Sub-Name"; description = "(Re)name a sub"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17209,7 +17293,7 @@ let pname = "Sub-Override"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/O/OV/OVID/Sub-Override-0.09.tar.gz; + url = "mirror://cpan/authors/id/O/OV/OVID/Sub-Override-0.09.tar.gz"; sha256 = "1d955qn44brkcfif3gi0q2vvvqahny6rax0vr068x5i9yz0ng6lk"; }; buildInputs = [ TestFatal ]; @@ -17219,7 +17303,7 @@ let pname = "Sub-Quote"; version = "2.006006"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-2.006006.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-2.006006.tar.gz"; sha256 = "6e4e2af42388fa6d2609e0e82417de7cc6be47223f576592c656c73c7524d89d"; }; buildInputs = [ TestFatal ]; @@ -17233,11 +17317,11 @@ let pname = "Sub-Uplevel"; version = "0.2800"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.2800.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.2800.tar.gz"; sha256 = "14z2xjiw931wizcx3mblmby753jspvfm321d6chs907nh0xzdwxl"; }; meta = { - homepage = https://github.com/dagolden/sub-uplevel; + homepage = "https://github.com/dagolden/sub-uplevel"; description = "Apparently run a function in a higher stack frame"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17247,7 +17331,7 @@ let pname = "SVN-Simple"; version = "0.28"; src = fetchurl { - url = mirror://cpan/authors/id/C/CL/CLKAO/SVN-Simple-0.28.tar.gz; + url = "mirror://cpan/authors/id/C/CL/CLKAO/SVN-Simple-0.28.tar.gz"; sha256 = "1ysgi38zx236cxz539k6d6rw5z0vc70rrglsaf5fk6rnwilw2g6n"; }; propagatedBuildInputs = [ (pkgs.subversionClient.override { inherit perl; }) ]; @@ -17257,12 +17341,12 @@ let pname = "Swim"; version = "0.1.48"; src = fetchurl { - url = mirror://cpan/authors/id/I/IN/INGY/Swim-0.1.48.tar.gz; + url = "mirror://cpan/authors/id/I/IN/INGY/Swim-0.1.48.tar.gz"; sha256 = "a5f72fd2f22917fa2b4acbb2ee2c3d32903d97ee5b0e449b0f387018c77f4f0c"; }; propagatedBuildInputs = [ HTMLEscape HashMerge IPCRun Pegex TextAutoformat YAMLLibYAML ]; meta = { - homepage = https://github.com/ingydotnet/swim-pm; + homepage = "https://github.com/ingydotnet/swim-pm"; description = "See What I Mean?!"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17282,7 +17366,7 @@ let pname = "Symbol-Global-Name"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/Symbol-Global-Name-0.05.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXMV/Symbol-Global-Name-0.05.tar.gz"; sha256 = "0f7623e9d724760aa64040222da1d82f1188586791329261cc60dad1d60d6a92"; }; meta = { @@ -17295,7 +17379,7 @@ let pname = "Symbol-Util"; version = "0.0203"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Symbol-Util-0.0203.tar.gz; + url = "mirror://cpan/authors/id/D/DE/DEXTER/Symbol-Util-0.0203.tar.gz"; sha256 = "0cnwwrd5d6i80f33s7n2ak90rh4s53ss7q57wndrpkpr4bfn3djm"; }; }; @@ -17304,12 +17388,12 @@ let pname = "syntax"; version = "0.004"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHAYLON/syntax-0.004.tar.gz; + url = "mirror://cpan/authors/id/P/PH/PHAYLON/syntax-0.004.tar.gz"; sha256 = "fe19b6da8a8f43a5aa2ee571441bc0e339fb156d0081c157a1a24e9812c7d365"; }; propagatedBuildInputs = [ DataOptList namespaceclean ]; meta = { - homepage = https://github.com/phaylon/syntax/wiki; + homepage = "https://github.com/phaylon/syntax/wiki"; description = "Activate syntax extensions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17319,13 +17403,13 @@ let pname = "Syntax-Keyword-Junction"; version = "0.003008"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/Syntax-Keyword-Junction-0.003008.tar.gz; + url = "mirror://cpan/authors/id/F/FR/FREW/Syntax-Keyword-Junction-0.003008.tar.gz"; sha256 = "8b4975f21b1992a7e6c2df5dcc92b254c61925595eddcdfaf0b1498717aa95ef"; }; buildInputs = [ TestRequires ]; propagatedBuildInputs = [ syntax ]; meta = { - homepage = https://github.com/frioux/Syntax-Keyword-Junction; + homepage = "https://github.com/frioux/Syntax-Keyword-Junction"; description = "Perl6 style Junction operators in Perl5"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17335,7 +17419,7 @@ let pname = "Sys-Mmap"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/S/SW/SWALTERS/Sys-Mmap-0.19.tar.gz; + url = "mirror://cpan/authors/id/S/SW/SWALTERS/Sys-Mmap-0.19.tar.gz"; sha256 = "1yh0170xfw3z7n3lynffcb6axv7wi6zb46cx03crj1cvrhjmwa89"; }; meta = with stdenv.lib; { @@ -17349,7 +17433,7 @@ let pname = "Sys-MemInfo"; version = "0.99"; src = fetchurl { - url = mirror://cpan/authors/id/S/SC/SCRESTO/Sys-MemInfo-0.99.tar.gz; + url = "mirror://cpan/authors/id/S/SC/SCRESTO/Sys-MemInfo-0.99.tar.gz"; sha256 = "0786319d3a3a8bae5d727939244bf17e140b714f52734d5e9f627203e4cf3e3b"; }; meta = { @@ -17363,7 +17447,7 @@ let pname = "Sys-CPU"; version = "0.61"; src = fetchurl { - url = mirror://cpan/authors/id/M/MZ/MZSANFORD/Sys-CPU-0.61.tar.gz; + url = "mirror://cpan/authors/id/M/MZ/MZSANFORD/Sys-CPU-0.61.tar.gz"; sha256 = "1r6976bs86j7zp51m5vh42xlyah951jgdlkimv202413kjvqc2i5"; }; patches = [ @@ -17386,7 +17470,7 @@ let pname = "Sys-Hostname-Long"; version = "1.5"; src = fetchurl { - url = mirror://cpan/authors/id/S/SC/SCOTT/Sys-Hostname-Long-1.5.tar.gz; + url = "mirror://cpan/authors/id/S/SC/SCOTT/Sys-Hostname-Long-1.5.tar.gz"; sha256 = "1jv5n8jv48c1p8svjsigyxndv1ygsq8wgwj9c7ypx1vaf3rns679"; }; doCheck = false; # no `hostname' in stdenv @@ -17396,7 +17480,7 @@ let pname = "Sys-SigAction"; version = "0.23"; src = fetchurl { - url = mirror://cpan/authors/id/L/LB/LBAXTER/Sys-SigAction-0.23.tar.gz; + url = "mirror://cpan/authors/id/L/LB/LBAXTER/Sys-SigAction-0.23.tar.gz"; sha256 = "c4ef6c9345534031fcbbe2adc347fc7194d47afc945e7a44fac7e9563095d353"; }; doCheck = !stdenv.isAarch64; # it hangs on Aarch64 @@ -17410,7 +17494,7 @@ let pname = "Sys-Syslog"; version = "0.36"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SAPER/Sys-Syslog-0.36.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SAPER/Sys-Syslog-0.36.tar.gz"; sha256 = "ed42a9e5ba04ad4856cc0cb5d38d289c3c5d3764543ec04efafc4af7e3378df8"; }; meta = { @@ -17423,7 +17507,7 @@ let pname = "System-Command"; version = "1.119"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOOK/System-Command-1.119.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOOK/System-Command-1.119.tar.gz"; sha256 = "c8c9fb1e527c52463cab1476500efea70396a0b62bea625d2d6faea994dc46e7"; }; propagatedBuildInputs = [ IPCRun ]; @@ -17437,7 +17521,7 @@ let pname = "Sys-Virt"; version = "6.2.0"; src = assert version == pkgs.libvirt.version; pkgs.fetchgit { - url = git://libvirt.org/libvirt-perl.git; + url = "git://libvirt.org/libvirt-perl.git"; rev = "799b243230163ff4f8dde6293da8a0e31e7c900e"; sha256 = "1k38d1ycx3ibgfzcr1iym7cvpwvygh6a2i5548m4qjb47vfi12rz"; }; @@ -17450,7 +17534,7 @@ let pname = "TAP-Parser-SourceHandler-pgTAP"; version = "3.35"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.35.tar.gz; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.35.tar.gz"; sha256 = "1655337l1cyd7q62007wrk87q2gbbwfq9xjy1wgx3hyflxpkkvl4"; }; doCheck = !stdenv.isDarwin; @@ -17464,7 +17548,7 @@ let pname = "Task-Catalyst-Tutorial"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRAMBERG/Task-Catalyst-Tutorial-0.06.tar.gz; + url = "mirror://cpan/authors/id/M/MR/MRAMBERG/Task-Catalyst-Tutorial-0.06.tar.gz"; sha256 = "75b1b2d96155647842587146cefd0de30943b85195e8e3eca51e0f0b8642d61e"; }; propagatedBuildInputs = [ CatalystAuthenticationStoreDBIxClass CatalystControllerHTMLFormFu CatalystDevel CatalystManual CatalystPluginAuthorizationACL CatalystPluginAuthorizationRoles CatalystPluginSessionStateCookie CatalystPluginSessionStoreFastMmap CatalystPluginStackTrace CatalystViewTT ]; @@ -17479,7 +17563,7 @@ let pname = "Task-FreecellSolver-Testing"; version = "0.0.11"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Task-FreecellSolver-Testing-v0.0.11.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Task-FreecellSolver-Testing-v0.0.11.tar.gz"; sha256 = "a2f73c65d0e5676cf4aae213ba4c3f88bf85f084a2165f1e71e3ce5b19023206"; }; buildInputs = [ CodeTidyAll TestDataSplit TestDifferences TestPerlTidy TestRunPluginTrimDisplayedFilenames TestRunValgrind TestTrailingSpace TestTrap ]; @@ -17494,7 +17578,7 @@ let pname = "Task-Plack"; version = "0.28"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Task-Plack-0.28.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Task-Plack-0.28.tar.gz"; sha256 = "0ajwkyr9nwn11afi6fz6kx4bi7a3p8awjsldmsakz3sl0s42pmbr"; }; propagatedBuildInputs = [ CGICompile CGIEmulatePSGI CGIPSGI Corona FCGI FCGIClient FCGIProcManager HTTPServerSimplePSGI IOHandleUtil NetFastCGI PSGI PlackAppProxy PlackMiddlewareAuthDigest PlackMiddlewareConsoleLogger PlackMiddlewareDebug PlackMiddlewareDeflater PlackMiddlewareHeader PlackMiddlewareReverseProxy PlackMiddlewareSession Starlet Starman Twiggy ]; @@ -17505,12 +17589,12 @@ let pname = "Task-Test-Run-AllPlugins"; version = "0.0105"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Task-Test-Run-AllPlugins-0.0105.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Task-Test-Run-AllPlugins-0.0105.tar.gz"; sha256 = "fd43bd053aa884a5abca851f145a0e29898515dcbfc3512f18cd0d86d28eb0a9"; }; buildInputs = [ TestRun TestRunCmdLine TestRunPluginAlternateInterpreters TestRunPluginBreakOnFailure TestRunPluginColorFileVerdicts TestRunPluginColorSummary TestRunPluginTrimDisplayedFilenames ]; meta = { - homepage = https://web-cpan.shlomifish.org/modules/Test-Run/; + homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "Specifications for installing all the Test::Run"; license = stdenv.lib.licenses.mit; }; @@ -17520,7 +17604,7 @@ let pname = "Task-Weaken"; version = "1.06"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Task-Weaken-1.06.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Task-Weaken-1.06.tar.gz"; sha256 = "1gk6rmnp4x50lzr0vfng41khf0f8yzxlm0pad1j69vxskpdzx0r3"; }; meta = { @@ -17533,12 +17617,12 @@ let pname = "Template-Plugin-Autoformat"; version = "2.77"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KARMAN/Template-Plugin-Autoformat-2.77.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KARMAN/Template-Plugin-Autoformat-2.77.tar.gz"; sha256 = "bddfb4919f0abb2a2be7a9665333e0d4e098032f0e383dbaf04c4d896c7486ed"; }; propagatedBuildInputs = [ TemplateToolkit TextAutoformat ]; meta = { - homepage = https://github.com/karpet/template-plugin-autoformat; + homepage = "https://github.com/karpet/template-plugin-autoformat"; description = "TT plugin for Text::Autoformat"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17548,7 +17632,7 @@ let pname = "Template-Plugin-Class"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCLAMP/Template-Plugin-Class-0.14.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCLAMP/Template-Plugin-Class-0.14.tar.gz"; sha256 = "1hq7jy6zg1iaslsyi05afz0i944y9jnv3nb4krkxjfmzwy5gw106"; }; propagatedBuildInputs = [ TemplateToolkit ]; @@ -17558,7 +17642,7 @@ let pname = "Template-Plugin-IO-All"; version = "0.01"; src = fetchurl { - url = mirror://cpan/authors/id/X/XE/XERN/Template-Plugin-IO-All-0.01.tar.gz; + url = "mirror://cpan/authors/id/X/XE/XERN/Template-Plugin-IO-All-0.01.tar.gz"; sha256 = "1f7445422a21932e09bbef935766e0af6b7cceb088e9d8e030cd7a84bcdc5ee4"; }; propagatedBuildInputs = [ IOAll TemplateToolkit ]; @@ -17573,7 +17657,7 @@ let pname = "Template-Plugin-JavaScript"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Template-Plugin-JavaScript-0.02.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Template-Plugin-JavaScript-0.02.tar.gz"; sha256 = "1mqqqs0dhfr6bp1305j9ns05q4pq1n3f561l6p8848k5ml3dh87a"; }; propagatedBuildInputs = [ TemplateToolkit ]; @@ -17583,7 +17667,7 @@ let pname = "Template-Plugin-JSON-Escape"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/N/NA/NANTO/Template-Plugin-JSON-Escape-0.02.tar.gz; + url = "mirror://cpan/authors/id/N/NA/NANTO/Template-Plugin-JSON-Escape-0.02.tar.gz"; sha256 = "051a8b1d3bc601d58fc51e246067d36450cfe970278a0456e8ab61940f13cd86"; }; propagatedBuildInputs = [ JSON TemplateToolkit ]; @@ -17593,7 +17677,7 @@ let pname = "Template-Timer"; version = "1.00"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Template-Timer-1.00.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Template-Timer-1.00.tar.gz"; sha256 = "1d3pbcx1kz73ncg8s8lx3ifwphz838qy0m40gdar7790cnrlqcdp"; }; propagatedBuildInputs = [ TemplateToolkit ]; @@ -17607,7 +17691,7 @@ let pname = "Template-Tiny"; version = "1.12"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/Template-Tiny-1.12.tar.gz; + url = "mirror://cpan/authors/id/A/AD/ADAMK/Template-Tiny-1.12.tar.gz"; sha256 = "073e062c630b51dfb725cd6485a329155cb72d5c596e8cb698eb67c4566f0a4a"; }; meta = { @@ -17620,7 +17704,7 @@ let pname = "Template-Toolkit"; version = "3.007"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.007.tar.gz; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.007.tar.gz"; sha256 = "1jh953f1v4r494mdvzfqs1ay1bh453dmp10z4qmv0makwarjsnfp"; }; doCheck = !stdenv.isDarwin; @@ -17634,7 +17718,7 @@ let pname = "Template-GD"; version = "2.66"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABW/Template-GD-2.66.tar.gz; + url = "mirror://cpan/authors/id/A/AB/ABW/Template-GD-2.66.tar.gz"; sha256 = "98523c8192f2e8184042e5a2e172bd767ac289dd2e480f35f680dce32160905b"; }; propagatedBuildInputs = [ GD TemplateToolkit ]; @@ -17648,7 +17732,7 @@ let pname = "Term-Encoding"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Term-Encoding-0.03.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Term-Encoding-0.03.tar.gz"; sha256 = "95ba9687d735d25a3cbe64508d7894f009c7fa2a1726c3e786e9e21da2251d0b"; }; meta = { @@ -17661,7 +17745,7 @@ let pname = "Term-ProgressBar"; version = "2.22"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MANWAR/Term-ProgressBar-2.22.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MANWAR/Term-ProgressBar-2.22.tar.gz"; sha256 = "2642ecca5b0b038c14812bcad3a9611ff7911dc59c9104d220797f837a880c49"; }; buildInputs = [ CaptureTiny TestException TestWarnings ]; @@ -17676,7 +17760,7 @@ let pname = "Term-ProgressBar-Quiet"; version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/L/LB/LBROCARD/Term-ProgressBar-Quiet-0.31.tar.gz; + url = "mirror://cpan/authors/id/L/LB/LBROCARD/Term-ProgressBar-Quiet-0.31.tar.gz"; sha256 = "25675292f588bc29d32e710cf3667da9a2a1751e139801770a9fdb18cd2184a6"; }; propagatedBuildInputs = [ IOInteractive TermProgressBar ]; @@ -17691,7 +17775,7 @@ let pname = "Term-ProgressBar-Simple"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/E/EV/EVDB/Term-ProgressBar-Simple-0.03.tar.gz; + url = "mirror://cpan/authors/id/E/EV/EVDB/Term-ProgressBar-Simple-0.03.tar.gz"; sha256 = "a20db3c67d5bdfd0c1fab392c6d1c26880a7ee843af602af4f9b53a7043579a6"; }; propagatedBuildInputs = [ TermProgressBarQuiet ]; @@ -17704,7 +17788,7 @@ let pname = "TermReadKey"; version = "2.38"; src = fetchurl { - url = mirror://cpan/authors/id/J/JS/JSTOWE/TermReadKey-2.38.tar.gz; + url = "mirror://cpan/authors/id/J/JS/JSTOWE/TermReadKey-2.38.tar.gz"; sha256 = "143jlibah1g14bym7sj3gphvqkpj1w4vn7sqc4vc62jpviw5hr2s"; }; @@ -17728,7 +17812,7 @@ let pname = "Term-ReadLine-Gnu"; version = "1.36"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.36.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.36.tar.gz"; sha256 = "9a08f7a4013c9b865541c10dbba1210779eb9128b961250b746d26702bab6925"; }; buildInputs = [ pkgs.readline pkgs.ncurses ]; @@ -17749,7 +17833,7 @@ let doCheck = false; meta = { - homepage = https://sourceforge.net/projects/perl-trg/; + homepage = "https://sourceforge.net/projects/perl-trg/"; description = "Perl extension for the GNU Readline/History Library"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17775,12 +17859,12 @@ let pname = "Term-Shell"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Term-Shell-0.11.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Term-Shell-0.11.tar.gz"; sha256 = "7a142361f22f2e5fae9d6e39353663e8bdfa6118d1aee82204bd9083ddb04154"; }; propagatedBuildInputs = [ TermReadKey TextAutoformat ]; meta = with stdenv.lib; { - homepage = https://metacpan.org/release/Term-Shell; + homepage = "https://metacpan.org/release/Term-Shell"; description = "A simple command-line shell framework"; license = with licenses; [ artistic1 gpl1Plus ]; }; @@ -17790,7 +17874,7 @@ let pname = "Term-ShellUI"; version = "0.92"; src = fetchurl { - url = mirror://cpan/authors/id/B/BR/BRONSON/Term-ShellUI-0.92.tar.gz; + url = "mirror://cpan/authors/id/B/BR/BRONSON/Term-ShellUI-0.92.tar.gz"; sha256 = "3279c01c76227335eeff09032a40f4b02b285151b3576c04cacd15be05942bdb"; }; }; @@ -17799,7 +17883,7 @@ let pname = "Term-Size-Any"; version = "0.002"; src = fetchurl { - url = mirror://cpan/authors/id/F/FE/FERREIRA/Term-Size-Any-0.002.tar.gz; + url = "mirror://cpan/authors/id/F/FE/FERREIRA/Term-Size-Any-0.002.tar.gz"; sha256 = "64fa5fdb1ae3a823134aaa95aec75354bc17bdd9ca12ba0a7ae34a7e51b3ded2"; }; propagatedBuildInputs = [ DevelHide TermSizePerl ]; @@ -17813,7 +17897,7 @@ let pname = "Term-Size-Perl"; version = "0.031"; src = fetchurl { - url = mirror://cpan/authors/id/F/FE/FERREIRA/Term-Size-Perl-0.031.tar.gz; + url = "mirror://cpan/authors/id/F/FE/FERREIRA/Term-Size-Perl-0.031.tar.gz"; sha256 = "ae9a6746cb1b305ddc8f8d8ca46878552b9c1123628971e13a275183822f209e"; }; meta = { @@ -17826,7 +17910,7 @@ let pname = "Term-Table"; version = "0.015"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Term-Table-0.015.tar.gz; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Term-Table-0.015.tar.gz"; sha256 = "d8a18b2801f91f0e5d747147ce786964a76f91d18568652908a3dc06a9b948d5"; }; propagatedBuildInputs = [ Importer ]; @@ -17840,7 +17924,7 @@ let pname = "Term-UI"; version = "0.46"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Term-UI-0.46.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Term-UI-0.46.tar.gz"; sha256 = "19p92za5cx1v7g57pg993amprcvm1az3pp7y9g5b1aplsy06r54i"; }; propagatedBuildInputs = [ LogMessageSimple ]; @@ -17854,7 +17938,7 @@ let pname = "Term-VT102"; version = "0.91"; src = fetchurl { - url = mirror://cpan/authors/id/A/AJ/AJWOOD/Term-VT102-0.91.tar.gz; + url = "mirror://cpan/authors/id/A/AJ/AJWOOD/Term-VT102-0.91.tar.gz"; sha256 = "f954e0310941d45c0fc3eb4a40f5d3a00d68119e277d303a1e6af11ded6fbd94"; }; meta = { @@ -17865,7 +17949,7 @@ let pname = "Term-VT102-Boundless"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/F/FB/FBARRIOS/Term-VT102-Boundless-0.05.tar.gz; + url = "mirror://cpan/authors/id/F/FB/FBARRIOS/Term-VT102-Boundless-0.05.tar.gz"; sha256 = "e1ded85ae3d76b59c03b8697f4a6cb01ae31bd62a9354f5bb7d18f9e927b485f"; }; propagatedBuildInputs = [ TermVT102 ]; @@ -17875,7 +17959,7 @@ let pname = "Term-Animation"; version = "2.6"; src = fetchurl { - url = mirror://cpan/authors/id/K/KB/KBAUCOM/Term-Animation-2.6.tar.gz; + url = "mirror://cpan/authors/id/K/KB/KBAUCOM/Term-Animation-2.6.tar.gz"; sha256 = "7d5c3c2d4f9b657a8b1dce7f5e2cbbe02ada2e97c72f3a0304bf3c99d084b045"; }; propagatedBuildInputs = [ Curses ]; @@ -17889,7 +17973,7 @@ let pname = "Test2-Plugin-NoWarnings"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.08.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.08.tar.gz"; sha256 = "122rcksn4qg0f99ap9ppmkvk0fvxcqa9jlqmq7wlk3q0ajylr4cy"; }; buildInputs = [ IPCRun3 Test2Suite ]; @@ -17903,7 +17987,7 @@ let pname = "Test2-Suite"; version = "0.000128"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000128.tar.gz; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000128.tar.gz"; sha256 = "f8e4e76900f5fb748d085aa5d18b916e07273e9ca50fb671ab8be1301cfae08c"; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; @@ -17917,7 +18001,7 @@ let pname = "Test-Abortable"; version = "0.002"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Abortable-0.002.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Abortable-0.002.tar.gz"; sha256 = "0v97y31j56f4mxw0vxyjbdprq4951h4wcdh4acnfm63np7wvg44p"; }; propagatedBuildInputs = [ SubExporter ]; @@ -17933,7 +18017,7 @@ let pname = "Test-Assert"; version = "0.0504"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Test-Assert-0.0504.tar.gz; + url = "mirror://cpan/authors/id/D/DE/DEXTER/Test-Assert-0.0504.tar.gz"; sha256 = "194bzflmzc0cw5727kznbj1zwzj7gnj7nx1643zk2hshdjlnv8yg"; }; buildInputs = [ ClassInspector TestUnitLite ]; @@ -17944,7 +18028,7 @@ let pname = "Test-Assertions"; version = "1.054"; src = fetchurl { - url = mirror://cpan/authors/id/B/BB/BBC/Test-Assertions-1.054.tar.gz; + url = "mirror://cpan/authors/id/B/BB/BBC/Test-Assertions-1.054.tar.gz"; sha256 = "10026w4r3yv6k3vc6cby7d61mxddlqh0ls6z39c82f17awfy9p7w"; }; propagatedBuildInputs = [ LogTrace ]; @@ -17954,7 +18038,7 @@ let pname = "Test-Aggregate"; version = "0.375"; src = fetchurl { - url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Test-Aggregate-0.375.tar.gz; + url = "mirror://cpan/authors/id/R/RW/RWSTAUNER/Test-Aggregate-0.375.tar.gz"; sha256 = "c6cc0abfd0d4fce85371acca93ec245381841d32b4caa2d6475e4bc8130427d1"; }; buildInputs = [ TestMost TestNoWarnings TestTrap ]; @@ -17970,7 +18054,7 @@ let pname = "Test-Base"; version = "0.89"; src = fetchurl { - url = mirror://cpan/authors/id/I/IN/INGY/Test-Base-0.89.tar.gz; + url = "mirror://cpan/authors/id/I/IN/INGY/Test-Base-0.89.tar.gz"; sha256 = "056hibgg3i2b89mwr76vyxi6ayb3hqjqcwicvn3s5lximsma3517"; }; propagatedBuildInputs = [ Spiffy ]; @@ -17981,7 +18065,7 @@ let pname = "Test-Bits"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Test-Bits-0.02.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Test-Bits-0.02.tar.gz"; sha256 = "1hqbvqlkj3k9ys4zq3f1fl1y6crni8r0ynan673f49rs91b6z0m9"; }; propagatedBuildInputs = [ ListAllUtils ]; @@ -17996,7 +18080,7 @@ let pname = "Test-CheckDeps"; version = "0.010"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Test-CheckDeps-0.010.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/Test-CheckDeps-0.010.tar.gz"; sha256 = "1vjinlixxdx6gfcw8y1dw2rla8bfhi8nmgcqr3nffc7kqskcrz36"; }; propagatedBuildInputs = [ CPANMetaCheck ]; @@ -18010,7 +18094,7 @@ let pname = "Test-Class"; version = "0.50"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-Class-0.50.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Class-0.50.tar.gz"; sha256 = "099154ed8caf3ff97c71237fab952264ac1c03d9270737a56071cabe65991350"; }; buildInputs = [ TestException ]; @@ -18025,7 +18109,7 @@ let pname = "Test-Class-Most"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/O/OV/OVID/Test-Class-Most-0.08.tar.gz; + url = "mirror://cpan/authors/id/O/OV/OVID/Test-Class-Most-0.08.tar.gz"; sha256 = "1zvx9hil0mg0pnb8xfa4m0xgjpvh8s5gnbyprq3xwpdsdgcdwk33"; }; buildInputs = [ TestClass TestDeep TestDifferences TestException TestMost TestWarn ]; @@ -18039,13 +18123,13 @@ let pname = "Test-CleanNamespaces"; version = "0.24"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.24.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.24.tar.gz"; sha256 = "338d5569e8e89a654935f843ec0bc84aaa486fe8dd1898fb9cab3eccecd5327a"; }; buildInputs = [ Filepushd Moo Mouse RoleTiny SubExporter TestDeep TestNeeds TestWarnings namespaceclean ]; propagatedBuildInputs = [ PackageStash SubIdentify ]; meta = { - homepage = https://github.com/karenetheridge/Test-CleanNamespaces; + homepage = "https://github.com/karenetheridge/Test-CleanNamespaces"; description = "Check for uncleaned imports"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -18055,7 +18139,7 @@ let pname = "Test-Cmd"; version = "1.09"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Test-Cmd-1.09.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Test-Cmd-1.09.tar.gz"; sha256 = "114nfafwfxxn7kig265b7lg0znb5ybvc282sjjwf14g7vpn20cyg"; }; doCheck = false; /* test fails */ @@ -18070,11 +18154,11 @@ let pname = "Test-Command"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DANBOO/Test-Command-0.11.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DANBOO/Test-Command-0.11.tar.gz"; sha256 = "0cwm3c4d49mdrbm6vgh78b3x8mk730l0zg8i7xb9z8bkx9pzr8r8"; }; meta = { - homepage = https://github.com/danboo/perl-test-command; + homepage = "https://github.com/danboo/perl-test-command"; description = "Test routines for external commands "; license = with stdenv.lib.licenses; [ artistic1 gpl1 ]; }; @@ -18084,7 +18168,7 @@ let pname = "Test-Compile"; version = "2.3.1"; src = fetchurl { - url = mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v2.3.1.tar.gz; + url = "mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v2.3.1.tar.gz"; sha256 = "1174cff010011ae43e6462755ccd8a6cf0372ca506705c60586f7b1748ff4ddf"; }; propagatedBuildInputs = [ UNIVERSALrequire ]; @@ -18098,7 +18182,7 @@ let pname = "Test-CPAN-Meta"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-0.25.tar.gz; + url = "mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-0.25.tar.gz"; sha256 = "f55b4f9cf6bc396d0fe8027267685cb2ac4affce897d0967a317fac6db5a8db5"; }; meta = { @@ -18111,7 +18195,7 @@ let pname = "Test-CPAN-Meta-JSON"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-JSON-0.16.tar.gz; + url = "mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-JSON-0.16.tar.gz"; sha256 = "1jg9ka50ixwq083wd4k12rhdjq87w0ihb34gd8jjn7gvvyd51b37"; }; propagatedBuildInputs = [ JSON ]; @@ -18125,7 +18209,7 @@ let pname = "Test-Data-Split"; version = "0.2.1"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Data-Split-0.2.1.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Data-Split-0.2.1.tar.gz"; sha256 = "9ba0c27a9e23c5dd8ede7611a049180485acc512a63783e1d1843b6569db5ae7"; }; buildInputs = [ TestDifferences ]; @@ -18140,7 +18224,7 @@ let pname = "Test-Deep"; version = "1.128"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.128.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.128.tar.gz"; sha256 = "0bq9c0vrxbwhhy1pd2ss06fk06jal98j022mnyq6k0msdy1pwbc5"; }; meta = { @@ -18151,7 +18235,7 @@ let pname = "Test-Dir"; version = "1.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/MT/MTHURN/Test-Dir-1.16.tar.gz; + url = "mirror://cpan/authors/id/M/MT/MTHURN/Test-Dir-1.16.tar.gz"; sha256 = "7332b323913eb6a2684d094755196304b2f8606f70eaab913654ca91f273eac2"; }; meta = { @@ -18164,7 +18248,7 @@ let pname = "Test-Differences"; version = "0.67"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.67.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.67.tar.gz"; sha256 = "c88dbbb48b934b069284874f33abbaaa438aa31204aa3fa73bfc2f4aeac878da"; }; propagatedBuildInputs = [ CaptureTiny TextDiff ]; @@ -18178,7 +18262,7 @@ let pname = "Test-DistManifest"; version = "1.014"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-DistManifest-1.014.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-DistManifest-1.014.tar.gz"; sha256 = "3d26c20df42628981cbfcfa5b1ca028c6ceadb344c1dcf97a25ad6a88b73d7c5"; }; buildInputs = [ ModuleBuildTiny ]; @@ -18193,7 +18277,7 @@ let pname = "Test-EOL"; version = "2.00"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-EOL-2.00.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-EOL-2.00.tar.gz"; sha256 = "0l3bxpsw0x7j9nclizcp53mnf9wny25dmg2iglfhzgnk0xfpwzwf"; }; meta = { @@ -18206,7 +18290,7 @@ let pname = "Test-Exception"; version = "0.43"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Exception-0.43.tar.gz; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-Exception-0.43.tar.gz"; sha256 = "0cxm7s4bg0xpxa6l6996a6iq3brr4j7p4hssnkc6dxv4fzq16sqm"; }; propagatedBuildInputs = [ SubUplevel ]; @@ -18216,7 +18300,7 @@ let pname = "Test-FailWarnings"; version = "0.008"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-FailWarnings-0.008.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-FailWarnings-0.008.tar.gz"; sha256 = "0vx9chcp5x8m0chq574p9fnfckh5gl94j7904rh9v17n568fyd6s"; }; buildInputs = [ CaptureTiny ]; @@ -18230,7 +18314,7 @@ let pname = "Test-Fake-HTTPD"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MASAKI/Test-Fake-HTTPD-0.08.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MASAKI/Test-Fake-HTTPD-0.08.tar.gz"; sha256 = "1jkflkcjzrdvnlxff1xqfhfdcpsmvvjqzayl7hk3whavsxdrf9yh"; }; propagatedBuildInputs = [ HTTPDaemon Plack ]; @@ -18246,12 +18330,12 @@ let pname = "Test-Fatal"; version = "0.014"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.014.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.014.tar.gz"; sha256 = "bcdcef5c7b2790a187ebca810b0a08221a63256062cfab3c3b98685d91d1cbb0"; }; propagatedBuildInputs = [ TryTiny ]; meta = { - homepage = https://github.com/rjbs/Test-Fatal; + homepage = "https://github.com/rjbs/Test-Fatal"; description = "Incredibly simple helpers for testing code with exceptions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -18261,7 +18345,7 @@ let pname = "Test-File"; version = "1.443"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.443.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.443.tar.gz"; sha256 = "61b4a6ab8f617c8c7b5975164cf619468dc304b6baaaea3527829286fa58bcd5"; }; buildInputs = [ Testutf8 ]; @@ -18275,7 +18359,7 @@ let pname = "Test-File-Contents"; version = "0.23"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-File-Contents-0.23.tar.gz; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/Test-File-Contents-0.23.tar.gz"; sha256 = "cd6fadfb910b34b4b53991ff231dad99929ca8850abec3ad0e2810c4bd7b1f3d"; }; propagatedBuildInputs = [ TextDiff ]; @@ -18289,13 +18373,13 @@ let pname = "Test-File-ShareDir"; version = "1.001002"; src = fetchurl { - url = mirror://cpan/authors/id/K/KE/KENTNL/Test-File-ShareDir-1.001002.tar.gz; + url = "mirror://cpan/authors/id/K/KE/KENTNL/Test-File-ShareDir-1.001002.tar.gz"; sha256 = "b33647cbb4b2f2fcfbde4f8bb4383d0ac95c2f89c4c5770eb691f1643a337aad"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ ClassTiny FileCopyRecursive FileShareDir PathTiny ScopeGuard ]; meta = { - homepage = https://github.com/kentfredric/Test-File-ShareDir; + homepage = "https://github.com/kentfredric/Test-File-ShareDir"; description = "Create a Fake ShareDir for your modules for testing"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -18305,7 +18389,7 @@ let pname = "Test-Filename"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Filename-0.03.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Filename-0.03.tar.gz"; sha256 = "1gpw4mjw68gnby8s4cifvbz6g2923xsc189jkw9d27i8qv20qiba"; }; propagatedBuildInputs = [ PathTiny ]; @@ -18319,7 +18403,7 @@ let pname = "Test-Fork"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Fork-0.02.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Fork-0.02.tar.gz"; sha256 = "0gnh8m81fdrwmzy1fix12grfq7sf7nn0gbf24zlap1gq4kxzpzpw"; }; meta = { @@ -18332,7 +18416,7 @@ let pname = "Test-Harness-Straps"; version = "0.30"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Harness-Straps-0.30.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Harness-Straps-0.30.tar.gz"; sha256 = "8b00efaa35723c1a35c8c8f5fa46a99e4bc528dfa520352b54ac418ef6d1cfa8"; }; meta = { @@ -18345,7 +18429,7 @@ let pname = "Test-HexDifferences"; version = "1.001"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Test-HexDifferences-1.001.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Test-HexDifferences-1.001.tar.gz"; sha256 = "18lh6shpfx567gjikrid4hixydgv1hi3mycl20qzq2j2vpn4afd6"; }; propagatedBuildInputs = [ SubExporter TextDiff ]; @@ -18358,7 +18442,7 @@ let pname = "Test-HexString"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Test-HexString-0.03.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Test-HexString-0.03.tar.gz"; sha256 = "0h1zl2l1ljlcxsn0xvin9dwiymnhyhnfnxgzg3f9899g37f4qk3x"; }; meta = { @@ -18371,7 +18455,7 @@ let pname = "Test-Identity"; version = "0.01"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Test-Identity-0.01.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Test-Identity-0.01.tar.gz"; sha256 = "08szivpqfwxnf6cfh0f0rfs4f7xbaxis3bra31l2c5gdk800a0ig"; }; meta = { @@ -18384,7 +18468,7 @@ let pname = "Test-HTTP-Server-Simple"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/Test-HTTP-Server-Simple-0.11.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXMV/Test-HTTP-Server-Simple-0.11.tar.gz"; sha256 = "85c97ebd4deb805291b17277032da48807228f24f89b1ce2fb3c09f7a896bb78"; }; propagatedBuildInputs = [ HTTPServerSimple ]; @@ -18397,7 +18481,7 @@ let pname = "Test-JSON"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/O/OV/OVID/Test-JSON-0.11.tar.gz; + url = "mirror://cpan/authors/id/O/OV/OVID/Test-JSON-0.11.tar.gz"; sha256 = "1cyp46w3q7dg89qkw31ik2h2a6mdx6pzdz2lmp8m0a61zjr8mh07"; }; propagatedBuildInputs = [ JSONAny ]; @@ -18408,7 +18492,7 @@ let pname = "Test-Kwalitee"; version = "1.28"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-Kwalitee-1.28.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Kwalitee-1.28.tar.gz"; sha256 = "18s3c8qfr3kmmyxmsn5la2zgbdsgpnkmscnl68i7fnavfpfnqlxl"; }; propagatedBuildInputs = [ ModuleCPANTSAnalyse ]; @@ -18424,7 +18508,7 @@ let pname = "Test-LWP-UserAgent"; version = "0.033"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.033.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.033.tar.gz"; sha256 = "03fjjj65fpjr4pv1532kwci1llfbsv4g9an0h7k723yqfx1wgdsb"; }; propagatedBuildInputs = [ LWP SafeIsa namespaceclean ]; @@ -18440,7 +18524,7 @@ let pname = "Test-LeakTrace"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEEJO/Test-LeakTrace-0.16.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEEJO/Test-LeakTrace-0.16.tar.gz"; sha256 = "00z4hcjra5nk700f3fgpy8fs036d7ry7glpn8g3wh7jzj7nrw22z"; }; meta = { @@ -18453,7 +18537,7 @@ let pname = "Test-LectroTest"; version = "0.5001"; src = fetchurl { - url = mirror://cpan/authors/id/T/TM/TMOERTEL/Test-LectroTest-0.5001.tar.gz; + url = "mirror://cpan/authors/id/T/TM/TMOERTEL/Test-LectroTest-0.5001.tar.gz"; sha256 = "0dfpkvn06499gczch4gfmdb05fdj82vlqy7cl6hz36l9jl6lyaxc"; }; meta = { @@ -18466,7 +18550,7 @@ let pname = "Test-LoadAllModules"; version = "0.022"; src = fetchurl { - url = mirror://cpan/authors/id/K/KI/KITANO/Test-LoadAllModules-0.022.tar.gz; + url = "mirror://cpan/authors/id/K/KI/KITANO/Test-LoadAllModules-0.022.tar.gz"; sha256 = "1zjwbqk1ns9m8srrhyj3i5zih976i4d2ibflh5s8lr10a1aiz1hv"; }; propagatedBuildInputs = [ ListMoreUtils ModulePluggable ]; @@ -18480,7 +18564,7 @@ let pname = "Test-LongString"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/R/RG/RGARCIA/Test-LongString-0.17.tar.gz; + url = "mirror://cpan/authors/id/R/RG/RGARCIA/Test-LongString-0.17.tar.gz"; sha256 = "0kwp7rfr1i2amz4ckigkv13ah7jr30q6l5k4wk0vxl84myg39i5b"; }; }; @@ -18489,7 +18573,7 @@ let pname = "Test-Memory-Cycle"; version = "1.06"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-Memory-Cycle-1.06.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Test-Memory-Cycle-1.06.tar.gz"; sha256 = "9d53ddfdc964cd8454cb0da4c695b6a3ae47b45839291c34cb9d8d1cfaab3202"; }; propagatedBuildInputs = [ DevelCycle PadWalker ]; @@ -18502,7 +18586,7 @@ let pname = "Test-Mock-Class"; version = "0.0303"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Test-Mock-Class-0.0303.tar.gz; + url = "mirror://cpan/authors/id/D/DE/DEXTER/Test-Mock-Class-0.0303.tar.gz"; sha256 = "00pkfqcz7b34q1mvx15k46sbxs22zcrvrbv15rnbn2na57z54bnd"; }; buildInputs = [ ClassInspector TestAssert TestUnitLite ]; @@ -18517,12 +18601,12 @@ let pname = "Test-Mock-Guard"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAICRON/Test-Mock-Guard-0.10.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAICRON/Test-Mock-Guard-0.10.tar.gz"; sha256 = "7f228a63f8d6ceb92aa784080a13e85073121b2835eca06d794f9709950dbd3d"; }; propagatedBuildInputs = [ ClassLoad ]; meta = { - homepage = https://github.com/zigorou/p5-test-mock-guard; + homepage = "https://github.com/zigorou/p5-test-mock-guard"; description = "Simple mock test library using RAII"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -18532,7 +18616,7 @@ let pname = "Test-MockModule"; version = "0.171.0"; src = fetchurl { - url = mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.171.0.tar.gz; + url = "mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.171.0.tar.gz"; sha256 = "1arqgb1773zym5dqlwm6kz48bfrccjhb5bjfsif0vkalwq2gvm7b"; }; propagatedBuildInputs = [ SUPER ]; @@ -18543,7 +18627,7 @@ let pname = "SUPER"; version = "1.20190531"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/SUPER-1.20190531.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHROMATIC/SUPER-1.20190531.tar.gz"; sha256 = "685d1ee76e7f0e9006942923bf7df8b11c107132992917593dcf7397d417d39a"; }; propagatedBuildInputs = [ SubIdentify ]; @@ -18558,7 +18642,7 @@ let pname = "Test-MockObject"; version = "1.20200122"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.20200122.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.20200122.tar.gz"; sha256 = "2b7f80da87f5a6fe0360d9ee521051053017442c3a26e85db68dfac9f8307623"; }; buildInputs = [ TestException TestWarn ]; @@ -18573,7 +18657,7 @@ let pname = "Test-MockTime"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/D/DD/DDICK/Test-MockTime-0.17.tar.gz; + url = "mirror://cpan/authors/id/D/DD/DDICK/Test-MockTime-0.17.tar.gz"; sha256 = "1y820qsq7yf7r6smy5c6f0mpf2cis2q24vwmpim1svv0n8cf2qrk"; }; }; @@ -18582,7 +18666,7 @@ let pname = "Test-MockTime-HiRes"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/T/TA/TARAO/Test-MockTime-HiRes-0.08.tar.gz; + url = "mirror://cpan/authors/id/T/TA/TARAO/Test-MockTime-HiRes-0.08.tar.gz"; sha256 = "1hfykcjrls6ywgbd49w29c7apj3nq4wlyx7jzpd2glwmz2pgfjaz"; }; buildInputs = [ AnyEvent ModuleBuildTiny TestClass TestMockTime TestRequires ]; @@ -18597,11 +18681,11 @@ let pname = "Test-Mojibake"; version = "1.3"; src = fetchurl { - url = mirror://cpan/authors/id/S/SY/SYP/Test-Mojibake-1.3.tar.gz; + url = "mirror://cpan/authors/id/S/SY/SYP/Test-Mojibake-1.3.tar.gz"; sha256 = "0cqvbwddgh0pfzmh989gkysi9apqj7dp7jkxfa428db9kgzpbzlg"; }; meta = { - homepage = https://github.com/creaktive/Test-Mojibake; + homepage = "https://github.com/creaktive/Test-Mojibake"; description = "Check your source for encoding misbehavior"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -18611,7 +18695,7 @@ let pname = "Test-More-UTF8"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/M/MO/MONS/Test-More-UTF8-0.05.tar.gz; + url = "mirror://cpan/authors/id/M/MO/MONS/Test-More-UTF8-0.05.tar.gz"; sha256 = "016fs77lmw8xxrcnapvp6wq4hjwgsdfi3l9ylpxgxkcpdarw9wdr"; }; meta = { @@ -18624,7 +18708,7 @@ let pname = "Test-Most"; version = "0.35"; src = fetchurl { - url = mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.35.tar.gz; + url = "mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.35.tar.gz"; sha256 = "0zv5dyzq55r28plffibcr7wd00abap0h2zh4s4p8snaiszsad5wq"; }; propagatedBuildInputs = [ ExceptionClass ]; @@ -18639,7 +18723,7 @@ let pname = "Test-Needs"; version = "0.002006"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Test-Needs-0.002006.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Test-Needs-0.002006.tar.gz"; sha256 = "77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5"; }; meta = { @@ -18652,7 +18736,7 @@ let pname = "Test-NoTabs"; version = "2.02"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-NoTabs-2.02.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-NoTabs-2.02.tar.gz"; sha256 = "0c306p9qdpa2ycii3c50hml23mwy6bjxpry126g1dw11hyiwcxgv"; }; meta = { @@ -18665,7 +18749,7 @@ let pname = "Test-NoWarnings"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/Test-NoWarnings-1.04.tar.gz; + url = "mirror://cpan/authors/id/A/AD/ADAMK/Test-NoWarnings-1.04.tar.gz"; sha256 = "0v385ch0hzz9naqwdw2az3zdqi15gka76pmiwlgsy6diiijmg2k3"; }; meta = { @@ -18678,7 +18762,7 @@ let pname = "Test-Object"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-Object-0.08.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Object-0.08.tar.gz"; sha256 = "65278964147837313f4108e55b59676e8a364d6edf01b3dc198aee894ab1d0bb"; }; }; @@ -18687,7 +18771,7 @@ let pname = "Test-Output"; version = "1.031"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Test-Output-1.031.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-Output-1.031.tar.gz"; sha256 = "193y1xjvgc1p9pdgdwps2127knvpz9wc1xh6gmr74y3ihmqz7f7q"; }; propagatedBuildInputs = [ CaptureTiny ]; @@ -18697,7 +18781,7 @@ let pname = "Test-PAUSE-Permissions"; version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/S/SK/SKAJI/Test-PAUSE-Permissions-0.07.tar.gz; + url = "mirror://cpan/authors/id/S/SK/SKAJI/Test-PAUSE-Permissions-0.07.tar.gz"; sha256 = "0gh7f67g1y30yggmwj1pq6xgrx3cfjibj2378nl3gilvyaxw2w2m"; }; propagatedBuildInputs = [ ConfigIdentity PAUSEPermissions ParseLocalDistribution ]; @@ -18712,7 +18796,7 @@ let pname = "Test-Perl-Critic"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-Perl-Critic-1.04.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Test-Perl-Critic-1.04.tar.gz"; sha256 = "28f806b5412c7908b56cf1673084b8b44ce1cb54c9417d784d91428e1a04096e"; }; propagatedBuildInputs = [ MCE PerlCritic ]; @@ -18722,7 +18806,7 @@ let pname = "Test-PerlTidy"; version = "20190402"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-PerlTidy-20190402.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-PerlTidy-20190402.tar.gz"; sha256 = "e9cb9b23ed62e8c6a47a1e18b55328aa3bfa467e05cd93e7e12b2738dd1e025f"; }; propagatedBuildInputs = [ PathTiny PerlTidy TextDiff ]; @@ -18736,7 +18820,7 @@ let pname = "Test-Pod"; version = "1.52"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-Pod-1.52.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Pod-1.52.tar.gz"; sha256 = "1z75x1pxwp8ajwq9iazlg2c3wd7rdlim08yclpdg32qnc36dpa30"; }; meta = { @@ -18749,7 +18833,7 @@ let pname = "Test-Pod-Coverage"; version = "1.10"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Test-Pod-Coverage-1.10.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Test-Pod-Coverage-1.10.tar.gz"; sha256 = "1m203mhgfilz7iqc8mxaw4lw02fz391mni3n25sfx7nryylwrja8"; }; propagatedBuildInputs = [ PodCoverage ]; @@ -18759,7 +18843,7 @@ let pname = "Test-Pod-LinkCheck"; version = "0.008"; src = fetchurl { - url = mirror://cpan/authors/id/A/AP/APOCAL/Test-Pod-LinkCheck-0.008.tar.gz; + url = "mirror://cpan/authors/id/A/AP/APOCAL/Test-Pod-LinkCheck-0.008.tar.gz"; sha256 = "2bfe771173c38b69eeb089504e3f76511b8e45e6a9e6dac3e616e400ea67bcf0"; }; buildInputs = [ ModuleBuildTiny TestPod ]; @@ -18789,7 +18873,7 @@ let pname = "Test-Portability-Files"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABRAXXA/Test-Portability-Files-0.10.tar.gz; + url = "mirror://cpan/authors/id/A/AB/ABRAXXA/Test-Portability-Files-0.10.tar.gz"; sha256 = "08e4b432492dc1b44b55d5db57952eb76379c7f434ee8f16aca64d491f401a16"; }; meta = { @@ -18802,7 +18886,7 @@ let pname = "Test-Refcount"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Test-Refcount-0.10.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Test-Refcount-0.10.tar.gz"; sha256 = "1chf6zizi7x128l3qm1bdqzwjjqm2j4gzajgghaksisn945c4mq4"; }; meta = { @@ -18815,7 +18899,7 @@ let pname = "Test-Requires"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-Requires-0.10.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-Requires-0.10.tar.gz"; sha256 = "1d9f481lj12cw1ciil46xq9nq16p6a90nm7yrsalpf8asn8s6s17"; }; meta = { @@ -18828,7 +18912,7 @@ let pname = "Test-Requires-Git"; version = "1.008"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOOK/Test-Requires-Git-1.008.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOOK/Test-Requires-Git-1.008.tar.gz"; sha256 = "70916210970d84d7491451159ab8b67e15251c8c0dae7c3df6c8d88542ea42a6"; }; propagatedBuildInputs = [ GitVersionCompare ]; @@ -18842,7 +18926,7 @@ let pname = "Test-RequiresInternet"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MALLEN/Test-RequiresInternet-0.05.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MALLEN/Test-RequiresInternet-0.05.tar.gz"; sha256 = "0gl33vpj9bb78pzyijp884b66sbw6jkh1ci0xki8rmf03hmb79xv"; }; meta = { @@ -18855,7 +18939,7 @@ let pname = "Test-Roo"; version = "1.004"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Roo-1.004.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Roo-1.004.tar.gz"; sha256 = "1mnym49j1lj7gzylma5b6nr4vp75rmgz2v71904v01xmxhy9l4i1"; }; @@ -18867,13 +18951,13 @@ let pname = "Test-Routine"; version = "0.027"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Routine-0.027.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Routine-0.027.tar.gz"; sha256 = "0n6k310v2py787lkvhzrn8vndws9icdf8mighgl472k0x890xm5s"; }; buildInputs = [ TestAbortable TestFatal ]; propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { - homepage = https://github.com/rjbs/Test-Routine; + homepage = "https://github.com/rjbs/Test-Routine"; description = "Composable units of assertion"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -18883,13 +18967,13 @@ let pname = "Test-Run"; version = "0.0304"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-0.0304.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-0.0304.tar.gz"; sha256 = "f3feaf9c4494c0b3a5294228cab27efe93653b7e0bbd7fbb99b94b65b247f323"; }; buildInputs = [ TestTrap ]; propagatedBuildInputs = [ IPCSystemSimple ListMoreUtils MooseXStrictConstructor TextSprintfNamed UNIVERSALrequire ]; meta = { - homepage = https://web-cpan.shlomifish.org/modules/Test-Run/; + homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "Base class to run standard TAP scripts"; license = stdenv.lib.licenses.mit; }; @@ -18899,14 +18983,14 @@ let pname = "Test-Run-CmdLine"; version = "0.0131"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-CmdLine-0.0131.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-CmdLine-0.0131.tar.gz"; sha256 = "cceeeecd3f4b2f1d2929f3ada351c1ade23a8ac73ef0486dc6e9605ebcdaef18"; }; buildInputs = [ TestRun TestTrap ]; propagatedBuildInputs = [ MooseXGetopt UNIVERSALrequire YAMLLibYAML ]; doCheck = !stdenv.isDarwin; meta = { - homepage = http://web-cpan.berlios.de/modules/Test-Run/; + homepage = "http://web-cpan.berlios.de/modules/Test-Run/"; description = "Analyze tests from the command line using Test::Run"; license = stdenv.lib.licenses.mit; }; @@ -18916,13 +19000,13 @@ let pname = "Test-Run-Plugin-AlternateInterpreters"; version = "0.0124"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-AlternateInterpreters-0.0124.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-AlternateInterpreters-0.0124.tar.gz"; sha256 = "eecb3830d350b5d7853322df4f3090af42ff17e9c31075f8d4f69856c968bff3"; }; buildInputs = [ TestRun TestRunCmdLine TestTrap YAMLLibYAML ]; propagatedBuildInputs = [ Moose ]; meta = { - homepage = https://web-cpan.shlomifish.org/modules/Test-Run/; + homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "Define different interpreters for different test scripts with Test::Run"; license = stdenv.lib.licenses.mit; }; @@ -18932,13 +19016,13 @@ let pname = "Test-Run-Plugin-BreakOnFailure"; version = "0.0.5"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-BreakOnFailure-v0.0.5.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-BreakOnFailure-v0.0.5.tar.gz"; sha256 = "e422eb64a2fa6ae59837312e37ab88d68b4945148eb436a3774faed5074f0430"; }; buildInputs = [ TestRun TestRunCmdLine TestTrap YAMLLibYAML ]; propagatedBuildInputs = [ Moose ]; meta = { - homepage = https://web-cpan.shlomifish.org/modules/Test-Run/; + homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "Stop processing the entire test suite"; license = stdenv.lib.licenses.mit; }; @@ -18948,7 +19032,7 @@ let pname = "Test-Run-Plugin-ColorFileVerdicts"; version = "0.0124"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-ColorFileVerdicts-0.0124.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-ColorFileVerdicts-0.0124.tar.gz"; sha256 = "0418f03abe241f5a3c2a2ab3dd2679d11eee42c9e1f5b5a6ea80d9e238374302"; }; buildInputs = [ TestRun TestRunCmdLine TestTrap ]; @@ -18956,7 +19040,7 @@ let moreInputs = [ TestTrap ]; # Added because tests were failing without it doCheck=true; meta = { - homepage = https://web-cpan.shlomifish.org/modules/Test-Run/; + homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "Make the file verdict ('ok', 'NOT OK')"; license = stdenv.lib.licenses.mit; }; @@ -18966,14 +19050,14 @@ let pname = "Test-Run-Plugin-ColorSummary"; version = "0.0202"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-ColorSummary-0.0202.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-ColorSummary-0.0202.tar.gz"; sha256 = "ea4fb6768c4f6645cedf87d9b7c6baf97364ebc6f4171e4dd5f68939fb2bdd3a"; }; buildInputs = [ TestRun TestRunCmdLine TestTrap ]; moreInputs = [ TestTrap ]; # Added because tests were failing without it doCheck=true; meta = { - homepage = https://web-cpan.shlomifish.org/modules/Test-Run/; + homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "A Test::Run plugin that"; license = stdenv.lib.licenses.mit; }; @@ -18983,13 +19067,13 @@ let pname = "Test-Run-Plugin-TrimDisplayedFilenames"; version = "0.0125"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-TrimDisplayedFilenames-0.0125.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-TrimDisplayedFilenames-0.0125.tar.gz"; sha256 = "2255bc5cb6ab65ee4dfff3bcdf007fb74785ff3bb439a9cef5052c66d80424a5"; }; buildInputs = [ TestRun TestRunCmdLine TestTrap YAMLLibYAML ]; propagatedBuildInputs = [ Moose ]; meta = { - homepage = https://web-cpan.shlomifish.org/modules/Test-Run/; + homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "Trim the first components"; license = stdenv.lib.licenses.mit; }; @@ -18999,7 +19083,7 @@ let pname = "Test-RunValgrind"; version = "0.2.1"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-RunValgrind-0.2.1.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-RunValgrind-0.2.1.tar.gz"; sha256 = "25a4a8bfcefaed7c40d8b8492e8828e798e6c85ca5f34ce4b9993f9899a7b09c"; }; buildInputs = [ TestTrap ]; @@ -19014,7 +19098,7 @@ let pname = "Test-Script"; version = "1.26"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Test-Script-1.26.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Test-Script-1.26.tar.gz"; sha256 = "1dvkb8dvidnycd6ws2h2iy262h37fjakflv6z90xrw72xix26hkd"; }; @@ -19027,12 +19111,12 @@ let pname = "Test-SharedFork"; version = "0.35"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test-SharedFork-0.35.tar.gz; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-SharedFork-0.35.tar.gz"; sha256 = "17y52j20k1bs9dgf4n6rhh9dn4cfxxbnfn2cfs7pb00fc5jyhci9"; }; buildInputs = [ TestRequires ]; meta = { - homepage = https://github.com/tokuhirom/Test-SharedFork; + homepage = "https://github.com/tokuhirom/Test-SharedFork"; description = "Fork test"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -19042,7 +19126,7 @@ let pname = "Test-Simple"; version = "1.302171"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302171.tar.gz; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302171.tar.gz"; sha256 = "e27f90d2b2a6bc6ffa7675a072c2f41d5caffd99858dc69b2030940cc138368a"; }; meta = { @@ -19055,7 +19139,7 @@ let pname = "Test-Spec"; version = "0.54"; src = fetchurl { - url = mirror://cpan/authors/id/A/AK/AKZHAN/Test-Spec-0.54.tar.gz; + url = "mirror://cpan/authors/id/A/AK/AKZHAN/Test-Spec-0.54.tar.gz"; sha256 = "1lk5l69bm6yl1zxzz5v6mizzqfinpdhasmi4qjxr1vnwcl9cyc8a"; }; propagatedBuildInputs = [ DevelGlobalPhase PackageStash TieIxHash ]; @@ -19070,7 +19154,7 @@ let pname = "Test-SubCalls"; version = "1.10"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-SubCalls-1.10.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-SubCalls-1.10.tar.gz"; sha256 = "cbc1e9b35a05e71febc13e5ef547a31c8249899bb6011dbdc9d9ff366ddab6c2"; }; propagatedBuildInputs = [ HookLexWrap ]; @@ -19080,7 +19164,7 @@ let pname = "Test-Synopsis"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZO/ZOFFIX/Test-Synopsis-0.16.tar.gz; + url = "mirror://cpan/authors/id/Z/ZO/ZOFFIX/Test-Synopsis-0.16.tar.gz"; sha256 = "09891vnkw9i8v074rswaxbrp6x2d8j8r90gqc306497ppiryq4qv"; }; meta = { @@ -19093,7 +19177,7 @@ let pname = "Test-TableDriven"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/J/JR/JROCKWAY/Test-TableDriven-0.02.tar.gz; + url = "mirror://cpan/authors/id/J/JR/JROCKWAY/Test-TableDriven-0.02.tar.gz"; sha256 = "16l5n6sx3yqdir1rqq21d41znpwzbs8v34gqr93y051arypphn22"; }; meta = { @@ -19106,7 +19190,7 @@ let pname = "Test-TempDir-Tiny"; version = "0.018"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-TempDir-Tiny-0.018.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-TempDir-Tiny-0.018.tar.gz"; sha256 = "10ay3zbihyxn4nbb1f0fmr4szag8iy8pd27v8j6idq6cgzys3dyp"; }; meta = { @@ -19121,7 +19205,7 @@ let pname = "Test-TCP"; version = "2.22"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Test-TCP-2.22.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Test-TCP-2.22.tar.gz"; sha256 = "0mvv9rqwrwlcfh8qrs0s47p85rhlnw15d4gbpyi802bddp0c6lry"; }; meta = { @@ -19135,7 +19219,7 @@ let pname = "Test-Time"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SATOH/Test-Time-0.08.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SATOH/Test-Time-0.08.tar.gz"; sha256 = "b8bc3b074bb2247e8588399c1e55d071f049cf6ce1c8b4192c38cf3c24559548"; }; meta = { @@ -19148,7 +19232,7 @@ let pname = "Test-Toolbox"; version = "0.4"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKO/Test-Toolbox-0.4.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIKO/Test-Toolbox-0.4.tar.gz"; sha256 = "1hxx9rhvncvn7wvzhzx4sk00w0xq2scgspfhhyqwjnm1yg3va820"; }; meta = { @@ -19161,7 +19245,7 @@ let pname = "Test-TrailingSpace"; version = "0.0302"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-TrailingSpace-0.0302.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-TrailingSpace-0.0302.tar.gz"; sha256 = "c48a6377d84576512b47652798d9d4bb4467adacf0e6afc3df1f880f2c03b612"; }; propagatedBuildInputs = [ FileFindObjectRule ]; @@ -19175,7 +19259,7 @@ let pname = "Test-Unit-Lite"; version = "0.1202"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Test-Unit-Lite-0.1202.tar.gz; + url = "mirror://cpan/authors/id/D/DE/DEXTER/Test-Unit-Lite-0.1202.tar.gz"; sha256 = "1a5jym9hjcpdf0rwyn7gwrzsx4xqzwgzx59rgspqlqiif7p2a79m"; }; meta = { @@ -19188,7 +19272,7 @@ let pname = "Test-Warn"; version = "0.36"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.36.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.36.tar.gz"; sha256 = "1nkc7jzxff0w4x9axbpsgxrksqdjnf70rb74q39zikkrsd3a7g7c"; }; propagatedBuildInputs = [ SubUplevel ]; @@ -19202,12 +19286,12 @@ let pname = "Test-Warnings"; version = "0.028"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.028.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.028.tar.gz"; sha256 = "26fda9f8d279e943d27e43a4a3a5cea8a6592cd36e7308695f8dc6602262c0e0"; }; buildInputs = [ CPANMetaCheck PadWalker ]; meta = { - homepage = https://github.com/karenetheridge/Test-Warnings; + homepage = "https://github.com/karenetheridge/Test-Warnings"; description = "Test for warnings and the lack of them"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -19217,7 +19301,7 @@ let pname = "Test-Without-Module"; version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.20.tar.gz; + url = "mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.20.tar.gz"; sha256 = "8e9aeb7c32a6c6d0b8a93114db2a8c072721273a9d9a2dd4f9ca86cfd28aa524"; }; meta = { @@ -19230,13 +19314,13 @@ let pname = "Test-WWW-Mechanize"; version = "1.52"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.52.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.52.tar.gz"; sha256 = "1jsywlbxhqw39ij7s8vmgff5vys58vlfaq27072awacnxc65aal4"; }; buildInputs = [ TestLongString ]; propagatedBuildInputs = [ CarpAssertMore HTTPServerSimple WWWMechanize ]; meta = { - homepage = https://github.com/petdance/test-www-mechanize; + homepage = "https://github.com/petdance/test-www-mechanize"; description = "Testing-specific WWW::Mechanize subclass"; license = stdenv.lib.licenses.artistic2; }; @@ -19246,7 +19330,7 @@ let pname = "Test-WWW-Mechanize-Catalyst"; version = "0.62"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTROUT/Test-WWW-Mechanize-Catalyst-0.62.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSTROUT/Test-WWW-Mechanize-Catalyst-0.62.tar.gz"; sha256 = "1cdc2q16vs6fb335pzaislz2rx1ph9acaxyp7v5hv9xbwwddwfqq"; }; doCheck = false; # listens on an external port @@ -19262,7 +19346,7 @@ let pname = "Test-WWW-Mechanize-CGI"; version = "0.1"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRAMBERG/Test-WWW-Mechanize-CGI-0.1.tar.gz; + url = "mirror://cpan/authors/id/M/MR/MRAMBERG/Test-WWW-Mechanize-CGI-0.1.tar.gz"; sha256 = "0bwwdk0iai5dlvvfpja971qpgvmf6yq67iag4z4szl9v5sra0xm5"; }; propagatedBuildInputs = [ WWWMechanizeCGI ]; @@ -19273,7 +19357,7 @@ let pname = "Test-WWW-Mechanize-PSGI"; version = "0.39"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/Test-WWW-Mechanize-PSGI-0.39.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/Test-WWW-Mechanize-PSGI-0.39.tar.gz"; sha256 = "0n4rhyyags3cwqb0gb1pr6gccd2x3l190j8gd96lwlvxnjrklss7"; }; buildInputs = [ CGI TestLongString TestWWWMechanize ]; @@ -19288,7 +19372,7 @@ let pname = "Test-XPath"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MANWAR/Test-XPath-0.19.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MANWAR/Test-XPath-0.19.tar.gz"; sha256 = "1wy0488yg15kahfafnlmlhppxik7d0z00wxwj9fszrsq2h6crz6y"; }; propagatedBuildInputs = [ XMLLibXML ]; @@ -19298,7 +19382,7 @@ let pname = "Test-YAML"; version = "1.07"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/Test-YAML-1.07.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TINITA/Test-YAML-1.07.tar.gz"; sha256 = "0pwrrnwi1qaiy3c5522vy0kzncxc9g02r4b056wqqaa69w1hsc0z"; }; buildInputs = [ TestBase ]; @@ -19308,7 +19392,7 @@ let pname = "Text-Aligner"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Aligner-0.13.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Aligner-0.13.tar.gz"; sha256 = "1vry21jrh91l2pkajnrps83bnr1fn6zshbzi80mcrnggrn9iq776"; }; meta = { @@ -19320,7 +19404,7 @@ let pname = "Text-Aspell"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HANK/Text-Aspell-0.09.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HANK/Text-Aspell-0.09.tar.gz"; sha256 = "0r9g31rd55934mp6n45b96g934ck4qns8x9i7qckn9wfy44k5sib"; }; propagatedBuildInputs = [ pkgs.aspell ]; @@ -19333,12 +19417,12 @@ let pname = "Text-Autoformat"; version = "1.75"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Text-Autoformat-1.75.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Text-Autoformat-1.75.tar.gz"; sha256 = "9dd4f4ce3daec4b4dbf5b59dac4568a8946aed12c28b4e5988c8e8c602c6b771"; }; propagatedBuildInputs = [ TextReform ]; meta = { - homepage = https://github.com/neilbowers/Text-Autoformat; + homepage = "https://github.com/neilbowers/Text-Autoformat"; description = "Automatic text wrapping and reformatting"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -19348,7 +19432,7 @@ let pname = "Text-Balanced"; version = "2.03"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHAY/Text-Balanced-2.03.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHAY/Text-Balanced-2.03.tar.gz"; sha256 = "057753f8f0568b53921f66a60a89c30092b73329bcc61a2c43339ab70c9792c8"; }; meta = { @@ -19362,7 +19446,7 @@ let version = "0.88"; buildInputs = [ CaptureTiny ConfigAutoConf ExtUtilsLibBuilder ]; src = fetchurl { - url = mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.88.tar.gz; + url = "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.88.tar.gz"; sha256 = "0b7lmjvfmypps1nw6nsdikgaakm0n0g4186glaqazg5xd1p5h55h"; }; perlPreHook = "export LD=$CC"; @@ -19386,7 +19470,7 @@ let pname = "Text-Brew"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/K/KC/KCIVEY/Text-Brew-0.02.tar.gz; + url = "mirror://cpan/authors/id/K/KC/KCIVEY/Text-Brew-0.02.tar.gz"; sha256 = "0k7nxglbx5pxl693zrj1fsi094sf1a3vqsrn73inzz7r3j28a6xa"; }; }; @@ -19395,7 +19479,7 @@ let pname = "Text-CharWidth"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/K/KU/KUBOTA/Text-CharWidth-0.04.tar.gz; + url = "mirror://cpan/authors/id/K/KU/KUBOTA/Text-CharWidth-0.04.tar.gz"; sha256 = "abded5f4fdd9338e89fd2f1d8271c44989dae5bf50aece41b6179d8e230704f8"; }; }; @@ -19404,7 +19488,7 @@ let pname = "Text-CSV"; version = "2.00"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-2.00.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-2.00.tar.gz"; sha256 = "8ccbd9195805222d995844114d0e595bb24ce188f85284dbf256080311cbb2c2"; }; meta = { @@ -19417,7 +19501,7 @@ let pname = "Text-CSV-Encoded"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZA/ZARQUON/Text-CSV-Encoded-0.25.tar.gz; + url = "mirror://cpan/authors/id/Z/ZA/ZARQUON/Text-CSV-Encoded-0.25.tar.gz"; sha256 = "1l5rwlmnpnhjszb200a94lwvkwslsvyxm24ycf37gm8dla1mk2i4"; }; propagatedBuildInputs = [ TextCSV ]; @@ -19431,7 +19515,7 @@ let pname = "Text-CSV_XS"; version = "1.40"; src = fetchurl { - url = mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.40.tgz; + url = "mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.40.tgz"; sha256 = "6a448ae1f66768fa5dec1cd2fb246bcaaa3f3ea22d555d1fee8d091833073675"; }; meta = { @@ -19444,7 +19528,7 @@ let pname = "Text-Diff"; version = "1.45"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Text-Diff-1.45.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Text-Diff-1.45.tar.gz"; sha256 = "013g13prdghxvrp5754gyc7rmv1syyxrhs33yc5f0lrz3dxs1fp8"; }; propagatedBuildInputs = [ AlgorithmDiff ]; @@ -19458,7 +19542,7 @@ let pname = "Text-Format"; version = "0.61"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Format-0.61.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Format-0.61.tar.gz"; sha256 = "bb8a3b8ff515c85101baf553a769337f944a05cde81f111ae78aff416bf4ae2b"; }; meta = { @@ -19473,7 +19557,7 @@ let pname = "Text-German"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/U/UL/ULPFR/Text-German-0.06.tar.gz; + url = "mirror://cpan/authors/id/U/UL/ULPFR/Text-German-0.06.tar.gz"; sha256 = "1p87pgap99lw0nv62i3ghvsi7yg90lhn8vsa3yqp75rd04clybcj"; }; meta = { @@ -19484,7 +19568,7 @@ let pname = "Text-Glob"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCLAMP/Text-Glob-0.11.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCLAMP/Text-Glob-0.11.tar.gz"; sha256 = "11sj62fynfgwrlgkv5a051cq6yn0pagxqjsz27dxx8phsd4wv706"; }; }; @@ -19493,7 +19577,7 @@ let pname = "Text-Hogan"; version = "2.03"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAORU/Text-Hogan-2.03.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAORU/Text-Hogan-2.03.tar.gz"; sha256 = "0yk1qn457jqknds4g2khlhi5vk2li1njbfwvxy44i665wknj7naq"; }; propagatedBuildInputs = [ Clone RefUtil TextTrim ]; @@ -19508,7 +19592,7 @@ let pname = "Text-Iconv"; version = "1.7"; src = fetchurl { - url = mirror://cpan/authors/id/M/MP/MPIOTR/Text-Iconv-1.7.tar.gz; + url = "mirror://cpan/authors/id/M/MP/MPIOTR/Text-Iconv-1.7.tar.gz"; sha256 = "5b80b7d5e709d34393bcba88971864a17b44a5bf0f9e4bcee383d029e7d2d5c3"; }; }; @@ -19517,7 +19601,7 @@ let pname = "Test-Inter"; version = "1.09"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Test-Inter-1.09.tar.gz; + url = "mirror://cpan/authors/id/S/SB/SBECK/Test-Inter-1.09.tar.gz"; sha256 = "1e9f129cc1a001fb95449d385253b38afabf5b466e3b3bd33e4e430f216e177a"; }; meta = { @@ -19545,7 +19629,7 @@ let pname = "Test-Manifest"; version = "2.021"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-2.021.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-2.021.tar.gz"; sha256 = "a47aaad71c580e16e6e63d8c037cdddcd919876754beb2c95d9a88682dd332d9"; }; meta = { @@ -19558,7 +19642,7 @@ let pname = "Text-Markdown"; version = "1.000031"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Text-Markdown-1.000031.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Text-Markdown-1.000031.tar.gz"; sha256 = "06y79lla8adkqhrs41xdddqjs81dcrh266b50mfbg37bxkawd4f1"; }; buildInputs = [ ListMoreUtils TestDifferences TestException ]; @@ -19568,12 +19652,12 @@ let pname = "Test-MinimumVersion"; version = "0.101082"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Test-MinimumVersion-0.101082.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-MinimumVersion-0.101082.tar.gz"; sha256 = "3fba4e8fcf74806259aa639be7d90e70346ad0e0e4b8b619593490e378241970"; }; propagatedBuildInputs = [ PerlMinimumVersion ]; meta = { - homepage = https://github.com/rjbs/Test-MinimumVersion; + homepage = "https://github.com/rjbs/Test-MinimumVersion"; description = "Does your code require newer perl than you think?"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -19583,7 +19667,7 @@ let pname = "Text-MicroTemplate"; version = "0.24"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/Text-MicroTemplate-0.24.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZUHO/Text-MicroTemplate-0.24.tar.gz"; sha256 = "1j5ljx7hs4k29732nr5f2m4kssz4rqjw3kknsnhams2yydqix01j"; }; meta = { @@ -19596,11 +19680,11 @@ let pname = "Test-Number-Delta"; version = "1.06"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Number-Delta-1.06.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Number-Delta-1.06.tar.gz"; sha256 = "535430919e6fdf6ce55ff76e9892afccba3b7d4160db45f3ac43b0f92ffcd049"; }; meta = { - homepage = https://github.com/dagolden/Test-Number-Delta; + homepage = "https://github.com/dagolden/Test-Number-Delta"; description = "Compare the difference between numbers against a given tolerance"; license = "apache"; }; @@ -19610,7 +19694,7 @@ let pname = "Text-Password-Pronounceable"; version = "0.30"; src = fetchurl { - url = mirror://cpan/authors/id/T/TS/TSIBLEY/Text-Password-Pronounceable-0.30.tar.gz; + url = "mirror://cpan/authors/id/T/TS/TSIBLEY/Text-Password-Pronounceable-0.30.tar.gz"; sha256 = "c186a50256e0bedfafb17e7ce157e7c52f19503bb79e18ebf06255911f6ead1a"; }; meta = { @@ -19636,7 +19720,7 @@ let pname = "Text-PDF"; version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/B/BH/BHALLISSY/Text-PDF-0.31.tar.gz; + url = "mirror://cpan/authors/id/B/BH/BHALLISSY/Text-PDF-0.31.tar.gz"; sha256 = "0s5cimfr4wwzgv15k30x83ncg1257jwsvmbmb86lp02rw5g537yz"; }; }; @@ -19645,7 +19729,7 @@ let pname = "Text-Quoted"; version = "2.10"; src = fetchurl { - url = mirror://cpan/authors/id/B/BP/BPS/Text-Quoted-2.10.tar.gz; + url = "mirror://cpan/authors/id/B/BP/BPS/Text-Quoted-2.10.tar.gz"; sha256 = "081bf95ec9220af26cec89161e61bf73f9fbcbfeee1d9af15139e5d7b708f445"; }; propagatedBuildInputs = [ TextAutoformat ]; @@ -19659,7 +19743,7 @@ let pname = "Text-RecordParser"; version = "1.6.5"; src = fetchurl { - url = mirror://cpan/authors/id/K/KC/KCLARK/Text-RecordParser-1.6.5.tar.gz; + url = "mirror://cpan/authors/id/K/KC/KCLARK/Text-RecordParser-1.6.5.tar.gz"; sha256 = "0nn33c058bl957v38xhqig4ld34lifl4arqiilhxky339i0q2fys"; }; @@ -19675,7 +19759,7 @@ let pname = "Text-Reform"; version = "1.20"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHORNY/Text-Reform-1.20.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHORNY/Text-Reform-1.20.tar.gz"; sha256 = "a8792dd8c1aac97001032337b36a356be96e2d74c4f039ef9a363b641db4ae61"; }; meta = { @@ -19688,7 +19772,7 @@ let pname = "Text-Roman"; version = "3.5"; src = fetchurl { - url = mirror://cpan/authors/id/S/SY/SYP/Text-Roman-3.5.tar.gz; + url = "mirror://cpan/authors/id/S/SY/SYP/Text-Roman-3.5.tar.gz"; sha256 = "0sh47svzz0wm993ywfgpn0fvhajl2sj5hcnf5zxjz02in6ihhjnb"; }; meta = { @@ -19701,7 +19785,7 @@ let pname = "Text-SimpleTable"; version = "2.07"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRAMBERG/Text-SimpleTable-2.07.tar.gz; + url = "mirror://cpan/authors/id/M/MR/MRAMBERG/Text-SimpleTable-2.07.tar.gz"; sha256 = "1v8r8qpzg283p2pqqr8dqrak2bxray1b2jmib0qk75jffqw3yv95"; }; meta = { @@ -19715,7 +19799,7 @@ let pname = "Text-Soundex"; version = "3.05"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Text-Soundex-3.05.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Text-Soundex-3.05.tar.gz"; sha256 = "f6dd55b4280b25dea978221839864382560074e1d6933395faee2510c2db60ed"; }; }; @@ -19724,7 +19808,7 @@ let pname = "Text-Sprintf-Named"; version = "0.0403"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Sprintf-Named-0.0403.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Sprintf-Named-0.0403.tar.gz"; sha256 = "8a2f6e52998d1d8adb6ce0f5be85265be2e51ce06cf8ae23b3a0f059ba21b888"; }; buildInputs = [ TestWarn ]; @@ -19738,12 +19822,12 @@ let pname = "Text-Table"; version = "1.133"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.133.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.133.tar.gz"; sha256 = "04kh5x5inq183rdg221wlqaaqi1ipyj588mxsslik6nhc14f17nd"; }; propagatedBuildInputs = [ TextAligner ]; meta = { - homepage = https://www.shlomifish.org/open-source/projects/docmake/; + homepage = "https://www.shlomifish.org/open-source/projects/docmake/"; description = "Organize Data in Tables"; license = stdenv.lib.licenses.isc; }; @@ -19753,7 +19837,7 @@ let pname = "Text-TabularDisplay"; version = "1.38"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DARREN/Text-TabularDisplay-1.38.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DARREN/Text-TabularDisplay-1.38.tar.gz"; sha256 = "1s46s4pg5mpfllx3icf4vnqz9iadbbdbsr5p7pr6gdjnzbx902gb"; }; }; @@ -19762,7 +19846,7 @@ let pname = "Text-Template"; version = "1.58"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.58.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.58.tar.gz"; sha256 = "0c465757782c4bfb9b17335307a8286771fd36ea04d259bc454ac63355f2a287"; }; buildInputs = [ TestMoreUTF8 TestWarnings ]; @@ -19772,7 +19856,7 @@ let pname = "Test-Trap"; version = "0.3.4"; src = fetchurl { - url = mirror://cpan/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.3.4.tar.gz; + url = "mirror://cpan/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.3.4.tar.gz"; sha256 = "1qjs2080kcc66s4d7499br5lw2qmhr9gxky4xsl6vjdn6dpna10b"; }; propagatedBuildInputs = [ DataDump ]; @@ -19786,14 +19870,14 @@ let pname = "Test-Vars"; version = "0.014"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Test-Vars-0.014.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Test-Vars-0.014.tar.gz"; sha256 = "0qr8q0ksr925ycwbsyxjwgz4p9r7a8vkxpn33vy23zbijwpa3xx7"; }; buildInputs = [ ModuleBuildTiny ]; meta = { - homepage = https://github.com/gfx/p5-Test-Vars; + homepage = "https://github.com/gfx/p5-Test-Vars"; description = "Detects unused variables"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -19803,7 +19887,7 @@ let pname = "Test-Version"; version = "2.09"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Test-Version-2.09.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Test-Version-2.09.tar.gz"; sha256 = "9ce1dd2897a5f30e1b7f8966ec66f57d8d8f280f605f28c7ca221fa79aca38e0"; }; buildInputs = [ TestException ]; @@ -19818,7 +19902,7 @@ let pname = "Text-Trim"; version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJT/Text-Trim-1.03.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJT/Text-Trim-1.03.tar.gz"; sha256 = "0ks9afvx9c1b6px98wwzhbyhd2y6hdg7884814fc9pnx8qfzrz50"; }; meta = { @@ -19831,7 +19915,7 @@ let pname = "Text-Unaccent"; version = "1.08"; src = fetchurl { - url = mirror://cpan/authors/id/L/LD/LDACHARY/Text-Unaccent-1.08.tar.gz; + url = "mirror://cpan/authors/id/L/LD/LDACHARY/Text-Unaccent-1.08.tar.gz"; sha256 = "0avk50kia78kxryh2whmaj5l18q2wvmkdyqyjsf6kwr4kgy6x3i7"; }; # https://rt.cpan.org/Public/Bug/Display.html?id=124815 @@ -19842,7 +19926,7 @@ let pname = "Text-Unidecode"; version = "1.30"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBURKE/Text-Unidecode-1.30.tar.gz; + url = "mirror://cpan/authors/id/S/SB/SBURKE/Text-Unidecode-1.30.tar.gz"; sha256 = "1imii0p6wvhrxsr5z2zhazpx5vl4l4ybf1y2c5hy480xvi6z293c"; }; }; @@ -19851,7 +19935,7 @@ let pname = "Test-utf8"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.01.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.01.tar.gz"; sha256 = "ef371b1769cd8d36d2d657e8321723d94c8f8d89e7fd7437c6648c5dc6711b7a"; }; meta = { @@ -19865,7 +19949,7 @@ let pname = "Text-NSP"; version = "1.31"; src = fetchurl { - url = mirror://cpan/authors/id/T/TP/TPEDERSE/Text-NSP-1.31.tar.gz; + url = "mirror://cpan/authors/id/T/TP/TPEDERSE/Text-NSP-1.31.tar.gz"; sha256 = "a01201beb29636b3e41ecda2a6cf6522fd265416bd6d994fad02f59fb49cf595"; }; meta = { @@ -19879,7 +19963,7 @@ let pname = "Text-vFile-asData"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCLAMP/Text-vFile-asData-0.08.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCLAMP/Text-vFile-asData-0.08.tar.gz"; sha256 = "b291ab5e0f987c5172560a692234711a75e4596d83475f72d01278369532f82a"; }; propagatedBuildInputs = [ ClassAccessorChained ]; @@ -19893,7 +19977,7 @@ let pname = "Text-WikiFormat"; version = "0.81"; src = fetchurl { - url = mirror://cpan/authors/id/C/CY/CYCLES/Text-WikiFormat-0.81.tar.gz; + url = "mirror://cpan/authors/id/C/CY/CYCLES/Text-WikiFormat-0.81.tar.gz"; sha256 = "0cxbgx879bsskmnhjzamgsa5862ddixyx4yr77lafmwimnaxjg74"; }; propagatedBuildInputs = [ URI ]; @@ -19903,7 +19987,7 @@ let pname = "Text-WrapI18N"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz; + url = "mirror://cpan/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz"; sha256 = "4bd29a17f0c2c792d12c1005b3c276f2ab0fae39c00859ae1741d7941846a488"; }; propagatedBuildInputs = [ pkgs.glibc TextCharWidth ]; @@ -19922,7 +20006,7 @@ let pname = "Text-Wrapper"; version = "1.05"; src = fetchurl { - url = mirror://cpan/authors/id/C/CJ/CJM/Text-Wrapper-1.05.tar.gz; + url = "mirror://cpan/authors/id/C/CJ/CJM/Text-Wrapper-1.05.tar.gz"; sha256 = "64268e15983a9df47e1d9199a491f394e89f542e54afb33f4b78f3f318e09ab9"; }; meta = { @@ -19936,7 +20020,7 @@ let pname = "threads-shared"; version = "1.59"; src = fetchurl { - url = mirror://cpan/authors/id/J/JD/JDHEDDEN/threads-shared-1.59.tar.gz; + url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/threads-shared-1.59.tar.gz"; sha256 = "1krz69ks3siz0fhc9waf817nnlmxsgq7rc5rq99xvqg1f1g9iz6i"; }; meta = { @@ -19949,7 +20033,7 @@ let pname = "Thread-Queue"; version = "3.13"; src = fetchurl { - url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Thread-Queue-3.13.tar.gz; + url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/Thread-Queue-3.13.tar.gz"; sha256 = "1s6wpxy07mr03krkzjr5r02cswsj18dd38aa5f16dfrgvp6xm8vb"; }; meta = { @@ -19962,12 +20046,12 @@ let pname = "Throwable"; version = "0.200013"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Throwable-0.200013.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Throwable-0.200013.tar.gz"; sha256 = "184gdcwxqwnkrx5md968v1ny70pq6blzpkihccm3bpdxnpgd11wr"; }; propagatedBuildInputs = [ DevelStackTrace Moo ]; meta = { - homepage = https://github.com/rjbs/Throwable; + homepage = "https://github.com/rjbs/Throwable"; description = "A role for classes that can be thrown"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -19977,7 +20061,7 @@ let pname = "Tie-Cache-LRU"; version = "20150301"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHWERN/Tie-Cache-LRU-20150301.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHWERN/Tie-Cache-LRU-20150301.tar.gz"; sha256 = "1bf740450d3a6d7c12b48c25f7da5964e44e7cc38b28572cfb76ff22464f4469"; }; propagatedBuildInputs = [ ClassVirtual enum ]; @@ -19991,7 +20075,7 @@ let pname = "Tie-Cache-LRU-Expires"; version = "0.55"; src = fetchurl { - url = mirror://cpan/authors/id/O/OE/OESTERHOL/Tie-Cache-LRU-Expires-0.55.tar.gz; + url = "mirror://cpan/authors/id/O/OE/OESTERHOL/Tie-Cache-LRU-Expires-0.55.tar.gz"; sha256 = "b316d849acd25f24346d55a9950d281fee0746398767c601234122159573eb9a"; }; propagatedBuildInputs = [ TieCacheLRU ]; @@ -20004,7 +20088,7 @@ let pname = "Tie-Cycle"; version = "1.225"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Tie-Cycle-1.225.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Tie-Cycle-1.225.tar.gz"; sha256 = "0i9xq2qm50p2ih24265jndp2x8hfq7ap0d88nrlv5yaad4hxhc7k"; }; meta = { @@ -20017,7 +20101,7 @@ let pname = "Tie-File"; version = "1.05"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Tie-File-1.05.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/Tie-File-1.05.tar.gz"; sha256 = "8a980b577ff4b10fe11062ed8c774857fa8c9833c5305f2e8bfb3347af63f139"; }; meta = { @@ -20029,7 +20113,7 @@ let pname = "Tie-IxHash"; version = "1.23"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHORNY/Tie-IxHash-1.23.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHORNY/Tie-IxHash-1.23.tar.gz"; sha256 = "0mmg9iyh42syal3z1p2pn9airq65yrkfs66cnqs9nz76jy60pfzs"; }; meta = { @@ -20042,11 +20126,11 @@ let pname = "Tie-Handle-Offset"; version = "0.004"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Tie-Handle-Offset-0.004.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Tie-Handle-Offset-0.004.tar.gz"; sha256 = "ee9f39055dc695aa244a252f56ffd37f8be07209b337ad387824721206d2a89e"; }; meta = { - homepage = https://github.com/dagolden/tie-handle-offset; + homepage = "https://github.com/dagolden/tie-handle-offset"; description = "Tied handle that hides the beginning of a file"; license = stdenv.lib.licenses.asl20; }; @@ -20056,7 +20140,7 @@ let pname = "Tie-Hash-Indexed"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/M/MH/MHX/Tie-Hash-Indexed-0.05.tar.gz; + url = "mirror://cpan/authors/id/M/MH/MHX/Tie-Hash-Indexed-0.05.tar.gz"; sha256 = "a8862a4763d58a8c785e34b8b18e5db4ce5c3e36b9b5cf565a3088584eab361e"; }; meta = { @@ -20070,7 +20154,7 @@ let pname = "Tie-RefHash"; version = "1.39"; src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/Tie-RefHash-1.39.tar.gz; + url = "mirror://cpan/authors/id/F/FL/FLORA/Tie-RefHash-1.39.tar.gz"; sha256 = "b0b80ef571e7dadb726b8214f7352a932a8fa82af29072895aa1aadc89f48bec"; }; }; @@ -20079,7 +20163,7 @@ let pname = "Tie-RegexpHash"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALTREUS/Tie-RegexpHash-0.17.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALTREUS/Tie-RegexpHash-0.17.tar.gz"; sha256 = "0c207850e77efb16618e0aa015507926a3425b34aad5aa6e3e40d83989a085a3"; }; meta = { @@ -20104,7 +20188,7 @@ let pname = "Tie-Sub"; version = "1.001"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Tie-Sub-1.001.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Tie-Sub-1.001.tar.gz"; sha256 = "1cgiyj85hhw2m4x2iv4zgaj3hzf3fghircpcfqmjndni4r4a0wgg"; }; propagatedBuildInputs = [ ParamsValidate ]; @@ -20119,7 +20203,7 @@ let pname = "Tie-ToObject"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz; + url = "mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz"; sha256 = "1x1smn1kw383xc5h9wajxk9dlx92bgrbf7gk4abga57y6120s6m3"; }; }; @@ -20128,7 +20212,7 @@ let pname = "TimeDate"; version = "2.31"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/TimeDate-2.31.tar.gz; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/TimeDate-2.31.tar.gz"; sha256 = "10ad6l4ii2iahdpw8h0xqwasc1jblan31h597q3js4j5nbnhywjw"; }; }; @@ -20137,7 +20221,7 @@ let pname = "Time-Duration"; version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-1.21.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-1.21.tar.gz"; sha256 = "1f59z2svfydxgd1gzrb5k3hl6d432kzmskk7jhv2dyb5hyx0wd7y"; }; meta = { @@ -20150,7 +20234,7 @@ let pname = "Time-Duration-Parse"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-Parse-0.15.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-Parse-0.15.tar.gz"; sha256 = "10g39bbrxkabbsfq4rv7f5b5x7h3jba08j4pg8gwr0b9iqx19n31"; }; buildInputs = [ TimeDuration ]; @@ -20165,7 +20249,7 @@ let pname = "Time-Local"; version = "1.30"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.30.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.30.tar.gz"; sha256 = "c7744f6b2986b946d3e2cf034df371bee16cdbafe53e945abb1a542c4f8920cb"; }; meta = { @@ -20178,7 +20262,7 @@ let pname = "Time-Out"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/P/PA/PATL/Time-Out-0.11.tar.gz; + url = "mirror://cpan/authors/id/P/PA/PATL/Time-Out-0.11.tar.gz"; sha256 = "1lhmx1x8j6z1k9vn32bcsw7g44cg22icshnnc37djlnlixlxm5lk"; }; meta = { @@ -20189,7 +20273,7 @@ let pname = "Time-ParseDate"; version = "2015.103"; src = fetchurl { - url = mirror://cpan/authors/id/M/MU/MUIR/modules/Time-ParseDate-2015.103.tar.gz; + url = "mirror://cpan/authors/id/M/MU/MUIR/modules/Time-ParseDate-2015.103.tar.gz"; sha256 = "2c1a06235bf811813caac9eaa9daa71af758667cdf7b082cb59863220fcaeed1"; }; doCheck = false; @@ -20241,7 +20325,7 @@ let meta = { description = "Tools for running a map tile server"; - homepage = https://github.com/openstreetmap/tirex; + homepage = "https://github.com/openstreetmap/tirex"; maintainers = with maintainers; [ jglukasik ]; license = with stdenv.lib.licenses; [ gpl2 ]; }; @@ -20251,7 +20335,7 @@ let pname = "Tk"; version = "804.034"; src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.034.tar.gz; + url = "mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.034.tar.gz"; sha256 = "fea6b144c723528a2206c8cd9175844032ee9c14ee37791f0f151e5e5b293fe2"; }; makeMakerFlags = "X11INC=${pkgs.xorg.libX11.dev}/include X11LIB=${pkgs.xorg.libX11.out}/lib"; @@ -20266,7 +20350,7 @@ let pname = "Tree-DAG_Node"; version = "1.31"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-DAG_Node-1.31.tgz; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-DAG_Node-1.31.tgz"; sha256 = "016kr76azxzfcpxjkhqp2piyyl6529shjis20mc3g2snfabsd2qw"; }; meta = { @@ -20280,7 +20364,7 @@ let pname = "Tree-Simple"; version = "1.33"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-1.33.tgz; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-1.33.tgz"; sha256 = "1alnwb6c7n4al91m9cyknvcyvdz521lh22dz1hyk4v7c50adffnv"; }; buildInputs = [ TestException ]; @@ -20294,7 +20378,7 @@ let pname = "Tree-Simple-VisitorFactory"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-VisitorFactory-0.15.tgz; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-VisitorFactory-0.15.tgz"; sha256 = "06y2vazkl307k59hnkp9h5bp3p7711kgmp1qdhb2lgnfwzn84zin"; }; propagatedBuildInputs = [ TreeSimple ]; @@ -20305,7 +20389,7 @@ let pname = "Try-Tiny"; version = "0.30"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Try-Tiny-0.30.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Try-Tiny-0.30.tar.gz"; sha256 = "da5bd0d5c903519bbf10bb9ba0cb7bcac0563882bcfe4503aee3fb143eddef6b"; }; buildInputs = [ CPANMetaCheck CaptureTiny ]; @@ -20319,7 +20403,7 @@ let pname = "Try-Tiny-ByClass"; version = "0.01"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAUKE/Try-Tiny-ByClass-0.01.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAUKE/Try-Tiny-ByClass-0.01.tar.gz"; sha256 = "0ipif12ix6vnmlyar4gh89libfadbsd9kvqg52f2cpr957slx3h3"; }; propagatedBuildInputs = [ DispatchClass TryTiny ]; @@ -20332,7 +20416,7 @@ let pname = "Twiggy"; version = "0.1025"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Twiggy-0.1025.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Twiggy-0.1025.tar.gz"; sha256 = "1a57knbwync7rlzhsz1kdc0sd380xnaccwgiy1qwj5d87abdynnp"; }; propagatedBuildInputs = [ AnyEvent Plack ]; @@ -20348,7 +20432,7 @@ let pname = "Type-Tiny"; version = "1.008005"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.008005.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.008005.tar.gz"; sha256 = "cc25eb6bd204b586b71e1f6408922b88be3c8183a1e4f99282d885904c776226"; }; propagatedBuildInputs = [ ExporterTiny ]; @@ -20363,7 +20447,7 @@ let pname = "Types-Serialiser"; version = "1.0"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Types-Serialiser-1.0.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Types-Serialiser-1.0.tar.gz"; sha256 = "03bk0hm5ys8k7265dkap825ybn2zmzb1hl0kf1jdm8yq95w39lvs"; }; propagatedBuildInputs = [ commonsense ]; @@ -20375,11 +20459,11 @@ let pname = "UNIVERSAL-can"; version = "1.20140328"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-1.20140328.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-1.20140328.tar.gz"; sha256 = "522da9f274786fe2cba99bc77cc1c81d2161947903d7fad10bd62dfb7f11990f"; }; meta = { - homepage = https://github.com/chromatic/UNIVERSAL-can; + homepage = "https://github.com/chromatic/UNIVERSAL-can"; description = "Work around buggy code calling UNIVERSAL::can() as a function"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -20389,11 +20473,11 @@ let pname = "UNIVERSAL-isa"; version = "1.20171012"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/UNIVERSAL-isa-1.20171012.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/UNIVERSAL-isa-1.20171012.tar.gz"; sha256 = "0avzv9j32aab6l0rd63n92v0pgliz1p4yabxxjfq275hdh1mcsfi"; }; meta = { - homepage = https://github.com/chromatic/UNIVERSAL-isa; + homepage = "https://github.com/chromatic/UNIVERSAL-isa"; description = "Attempt to recover from people calling UNIVERSAL::isa as a function"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -20403,7 +20487,7 @@ let pname = "UNIVERSAL-require"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.18.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.18.tar.gz"; sha256 = "b2a736a87967a143dab58c8a110501d5235bcdd2c8b2a3bfffcd3c0bd06b38ed"; }; meta = { @@ -20416,7 +20500,7 @@ let pname = "Unicode-CaseFold"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARODLAND/Unicode-CaseFold-1.01.tar.gz; + url = "mirror://cpan/authors/id/A/AR/ARODLAND/Unicode-CaseFold-1.01.tar.gz"; sha256 = "418a212808f9d0b8bb330ac905096d2dd364976753d4c71534dab9836a63194d"; }; perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' @@ -20430,7 +20514,7 @@ let pname = "Unicode-CheckUTF8"; version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/B/BR/BRADFITZ/Unicode-CheckUTF8-1.03.tar.gz; + url = "mirror://cpan/authors/id/B/BR/BRADFITZ/Unicode-CheckUTF8-1.03.tar.gz"; sha256 = "97f84daf033eb9b49cd8fe31db221fef035a5c2ee1d757f3122c88cf9762414c"; }; }; @@ -20439,7 +20523,7 @@ let pname = "Unicode-LineBreak"; version = "2019.001"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEZUMI/Unicode-LineBreak-2019.001.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEZUMI/Unicode-LineBreak-2019.001.tar.gz"; sha256 = "12iinva5gqc9g7qzxrvmh45n714z0ad9g7wq2dxwgp6drbj64rs8"; }; propagatedBuildInputs = [ MIMECharset ]; @@ -20453,7 +20537,7 @@ let pname = "Unicode-String"; version = "2.10"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/GAAS/Unicode-String-2.10.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/GAAS/Unicode-String-2.10.tar.gz"; sha256 = "0s4vp8k7ag7z9lsnnkpa9mnch83kxhp9gh7yiapld5a7rq712jl9"; }; }; @@ -20477,7 +20561,7 @@ let pname = "Unix-Getrusage"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/T/TA/TAFFY/Unix-Getrusage-0.03.tar.gz; + url = "mirror://cpan/authors/id/T/TA/TAFFY/Unix-Getrusage-0.03.tar.gz"; sha256 = "76cde1cee2453260b85abbddc27cdc9875f01d2457e176e03dcabf05fb444d12"; }; }; @@ -20486,12 +20570,12 @@ let pname = "URI"; version = "1.76"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/URI-1.76.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/URI-1.76.tar.gz"; sha256 = "b2c98e1d50d6f572483ee538a6f4ccc8d9185f91f0073fd8af7390898254413e"; }; buildInputs = [ TestNeeds ]; meta = { - homepage = https://github.com/libwww-perl/URI; + homepage = "https://github.com/libwww-perl/URI"; description = "Uniform Resource Identifiers (absolute and relative)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -20501,7 +20585,7 @@ let pname = "URI-db"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.19.tar.gz; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.19.tar.gz"; sha256 = "c4999deaf451652216032c8e327ff6e6d655539eac379095bb69b0c369efa658"; }; propagatedBuildInputs = [ URINested ]; @@ -20515,7 +20599,7 @@ let pname = "URI-Find"; version = "20160806"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHWERN/URI-Find-20160806.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHWERN/URI-Find-20160806.tar.gz"; sha256 = "1mk3jv8x0mcq3ajrn9garnxd0jc7sw4pkwqi88r5apqvlljs84z2"; }; propagatedBuildInputs = [ URI ]; @@ -20529,7 +20613,7 @@ let pname = "URI-FromHash"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/URI-FromHash-0.05.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/URI-FromHash-0.05.tar.gz"; sha256 = "1l3g5ygv83vn9y1zpwjdqq5cs4ip2q058q0gmpcf5wp9rsycbjm7"; }; propagatedBuildInputs = [ ParamsValidate URI ]; @@ -20544,7 +20628,7 @@ let pname = "URI-GoogleChart"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/URI-GoogleChart-1.02.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/URI-GoogleChart-1.02.tar.gz"; sha256 = "00hq5cpsk7sa04n0wg52qhpqf9i2849yyvw2zk83ayh1qqpc50js"; }; propagatedBuildInputs = [ URI ]; @@ -20554,7 +20638,7 @@ let pname = "User-Identity"; version = "0.99"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-0.99.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-0.99.tar.gz"; sha256 = "0c2qwxgpqncm4ya3rb5zz2hgiwwf559j1b1a6llyarf9jy43hfzm"; }; meta = { @@ -20567,7 +20651,7 @@ let pname = "URI-imap"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/C/CW/CWEST/URI-imap-1.01.tar.gz; + url = "mirror://cpan/authors/id/C/CW/CWEST/URI-imap-1.01.tar.gz"; sha256 = "0bdv6mrdijcq46r3lmz801rscs63f8p9qqliy2safd6fds4rj55v"; }; propagatedBuildInputs = [ URI ]; @@ -20577,7 +20661,7 @@ let pname = "URI-Nested"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/URI-Nested-0.10.tar.gz; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/URI-Nested-0.10.tar.gz"; sha256 = "e1971339a65fbac63ab87142d4b59d3d259d51417753c77cb58ea31a8233efaf"; }; propagatedBuildInputs = [ URI ]; @@ -20591,7 +20675,7 @@ let pname = "URI-SmartURI"; version = "0.032"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/URI-SmartURI-0.032.tar.gz; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/URI-SmartURI-0.032.tar.gz"; sha256 = "0b2grkmkbnp37q85wj7jpj5zr93vdbisgxlls2vl5q928rwln5zb"; }; propagatedBuildInputs = [ ClassC3Componentised FileFindRule ListMoreUtils Moose URI namespaceclean ]; @@ -20606,7 +20690,7 @@ let pname = "URI-Template"; version = "0.24"; src = fetchurl { - url = mirror://cpan/authors/id/B/BR/BRICAS/URI-Template-0.24.tar.gz; + url = "mirror://cpan/authors/id/B/BR/BRICAS/URI-Template-0.24.tar.gz"; sha256 = "1phibcmam2hklrddzj79l43va1gcqpyszbw21ynxq53ynmhjvbk8"; }; propagatedBuildInputs = [ URI ]; @@ -20620,7 +20704,7 @@ let pname = "URI-ws"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/URI-ws-0.03.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/URI-ws-0.03.tar.gz"; sha256 = "6e6b0e4172acb6a53c222639c000608c2dd61d50848647482ac8600d50e541ef"; }; propagatedBuildInputs = [ URI ]; @@ -20635,7 +20719,7 @@ let pname = "UUID-Tiny"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/C/CA/CAUGUSTIN/UUID-Tiny-1.04.tar.gz; + url = "mirror://cpan/authors/id/C/CA/CAUGUSTIN/UUID-Tiny-1.04.tar.gz"; sha256 = "6dcd92604d64e96cc6c188194ae16a9d3a46556224f77b6f3d1d1312b68f9a3d"; }; meta = { @@ -20648,7 +20732,7 @@ let pname = "Variable-Magic"; version = "0.62"; src = fetchurl { - url = mirror://cpan/authors/id/V/VP/VPIT/Variable-Magic-0.62.tar.gz; + url = "mirror://cpan/authors/id/V/VP/VPIT/Variable-Magic-0.62.tar.gz"; sha256 = "3f9a18517e33f006a9c2fc4f43f01b54abfe6ff2eae7322424f31069296b615c"; }; meta = { @@ -20661,7 +20745,7 @@ let pname = "version"; version = "0.9924"; src = fetchurl { - url = mirror://cpan/authors/id/J/JP/JPEACOCK/version-0.9924.tar.gz; + url = "mirror://cpan/authors/id/J/JP/JPEACOCK/version-0.9924.tar.gz"; sha256 = "81e4485ff3faf9b7813584d57b557f4b34e73b6c2eb696394f6deefacf5ca65b"; }; meta = { @@ -20689,7 +20773,7 @@ let pname = "VM-EC2"; version = "1.28"; src = fetchurl { - url = mirror://cpan/authors/id/L/LD/LDS/VM-EC2-1.28.tar.gz; + url = "mirror://cpan/authors/id/L/LD/LDS/VM-EC2-1.28.tar.gz"; sha256 = "b2b6b31745c57431fca0efb9b9d0b8f168d6081755e048fd9d6c4469bd108acd"; }; propagatedBuildInputs = [ AnyEventCacheDNS AnyEventHTTP JSON StringApprox XMLSimple ]; @@ -20703,7 +20787,7 @@ let pname = "VM-EC2-Security-CredentialCache"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCONOVER/VM-EC2-Security-CredentialCache-0.25.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCONOVER/VM-EC2-Security-CredentialCache-0.25.tar.gz"; sha256 = "fc7e9c152ff2b721ccb221ac40089934775cf58366aedb5cc1693609f840937b"; }; propagatedBuildInputs = [ DateTimeFormatISO8601 VMEC2 ]; @@ -20717,13 +20801,13 @@ let pname = "W3C-LinkChecker"; version = "4.81"; src = fetchurl { - url = mirror://cpan/authors/id/S/SC/SCOP/W3C-LinkChecker-4.81.tar.gz; + url = "mirror://cpan/authors/id/S/SC/SCOP/W3C-LinkChecker-4.81.tar.gz"; sha256 = "6239f61b20d91dce7b21e4d4f626ab93a8f1e2f207da5015590d508cf6c66a65"; }; outputs = [ "out" ]; propagatedBuildInputs = [ CGI CSSDOM ConfigGeneral LWP NetIP TermReadKey ]; meta = { - homepage = https://validator.w3.org/checklink; + homepage = "https://validator.w3.org/checklink"; description = "A tool to check links and anchors in Web pages or full Web sites"; license = stdenv.lib.licenses.w3c; }; @@ -20733,7 +20817,7 @@ let pname = "WWW-Curl"; version = "4.17"; src = fetchurl { - url = mirror://cpan/authors/id/S/SZ/SZBALINT/WWW-Curl-4.17.tar.gz; + url = "mirror://cpan/authors/id/S/SZ/SZBALINT/WWW-Curl-4.17.tar.gz"; sha256 = "1fmp9aib1kaps9vhs4dwxn7b15kgnlz9f714bxvqsd1j1q8spzsj"; }; patches = [ ../development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch ]; @@ -20752,7 +20836,7 @@ let pname = "WWW-Form-UrlEncoded"; version = "0.26"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.26.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.26.tar.gz"; sha256 = "1x4h5m5fkwaa0gbn6zp9mjrhr3r989w8wyrjxiii3dqm3xghnj60"; }; meta = { @@ -20766,7 +20850,7 @@ let pname = "WWW-Mechanize"; version = "1.95"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.95.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.95.tar.gz"; sha256 = "1w121x0xsn1bm699ncanyxqv3njqam3zzjkq8p54bqmzpikn5crs"; }; propagatedBuildInputs = [ HTMLForm HTMLTree LWP ]; @@ -20783,7 +20867,7 @@ let pname = "WWW-Mechanize-CGI"; version = "0.3"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRAMBERG/WWW-Mechanize-CGI-0.3.tar.gz; + url = "mirror://cpan/authors/id/M/MR/MRAMBERG/WWW-Mechanize-CGI-0.3.tar.gz"; sha256 = "046jm18liq7rwkdawdh9520cnalkfrk26yqryp7xgw71y65lvq61"; }; propagatedBuildInputs = [ HTTPRequestAsCGI WWWMechanize ]; @@ -20797,7 +20881,7 @@ let pname = "WWW-RobotRules"; version = "6.02"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/WWW-RobotRules-6.02.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/WWW-RobotRules-6.02.tar.gz"; sha256 = "07m50dp5n5jxv3m93i55qvnd67a6g7cvbvlik115kmc8lbkh5da6"; }; propagatedBuildInputs = [ URI ]; @@ -20813,7 +20897,7 @@ let pname = "Want"; version = "0.29"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROBIN/Want-0.29.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROBIN/Want-0.29.tar.gz"; sha256 = "1xsjylbxxcbkjazqms49ipi94j1hd2ykdikk29cq7dscil5p9r5l"; }; }; @@ -20822,7 +20906,7 @@ let pname = "Win32-ShellQuote"; version = "0.003001"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Win32-ShellQuote-0.003001.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Win32-ShellQuote-0.003001.tar.gz"; sha256 = "aa74b0e3dc2d41cd63f62f853e521ffd76b8d823479a2619e22edb4049b4c0dc"; }; meta = { @@ -20835,13 +20919,13 @@ let pname = "Workflow"; version = "1.48"; src = fetchurl { - url = mirror://cpan/authors/id/J/JO/JONASBN/Workflow-1.48.tar.gz; + url = "mirror://cpan/authors/id/J/JO/JONASBN/Workflow-1.48.tar.gz"; sha256 = "0bz6gil9mygh5ikh8mf86ids9xb1dbgx9hqc1g68qn9ffsyb012f"; }; buildInputs = [ DBDMock ListMoreUtils PodCoverageTrustPod TestException TestKwalitee TestPod TestPodCoverage ]; propagatedBuildInputs = [ ClassAccessor ClassFactory ClassObservable DBI DataUUID DateTimeFormatStrptime FileSlurp LogDispatch LogLog4perl XMLSimple ]; meta = { - homepage = https://github.com/jonasbn/perl-workflow; + homepage = "https://github.com/jonasbn/perl-workflow"; description = "Simple, flexible system to implement workflows"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -20851,7 +20935,7 @@ let pname = "Wx"; version = "0.9932"; src = fetchurl { - url = mirror://cpan/authors/id/M/MD/MDOOTSON/Wx-0.9932.tar.gz; + url = "mirror://cpan/authors/id/M/MD/MDOOTSON/Wx-0.9932.tar.gz"; sha256 = "0w0vcpk8bmklh16c0z1vxgipnmvdw7cckcmay7k7cihgb99vdz8w"; }; propagatedBuildInputs = [ AlienWxWidgets ]; @@ -20865,7 +20949,7 @@ let pname = "Wx-GLCanvas"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/M/MB/MBARBON/Wx-GLCanvas-0.09.tar.gz; + url = "mirror://cpan/authors/id/M/MB/MBARBON/Wx-GLCanvas-0.09.tar.gz"; sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka"; }; propagatedBuildInputs = [ pkgs.libGLU Wx ]; @@ -20876,7 +20960,7 @@ let pname = "X11-IdleTime"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/A/AW/AWENDT/X11-IdleTime-0.09.tar.gz; + url = "mirror://cpan/authors/id/A/AW/AWENDT/X11-IdleTime-0.09.tar.gz"; sha256 = "0j27cb9yy9ymni8cbiyxplbg086b8lv6b330nwqyx0briq3xrzfq"; }; buildInputs = [ pkgs.xorg.libXext pkgs.xorg.libXScrnSaver pkgs.xorg.libX11 ]; @@ -20891,7 +20975,7 @@ let pname = "X11-Protocol"; version = "0.56"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMCCAM/X11-Protocol-0.56.tar.gz; + url = "mirror://cpan/authors/id/S/SM/SMCCAM/X11-Protocol-0.56.tar.gz"; sha256 = "1dq89bh6fqv7l5mbffqcismcljpq5f869bx7g8lg698zgindv5ny"; }; buildInputs = [ pkgs.xlibsWrapper ]; @@ -20903,7 +20987,7 @@ let pname = "X11-Protocol-Other"; version = "31"; src = fetchurl { - url = mirror://cpan/authors/id/K/KR/KRYDE/X11-Protocol-Other-31.tar.gz; + url = "mirror://cpan/authors/id/K/KR/KRYDE/X11-Protocol-Other-31.tar.gz"; sha256 = "1x3kvic52jgp2mvd5wzrqrprqi82cdk8l4075v8b33ksvj9mjqiw"; }; propagatedBuildInputs = [ X11Protocol ]; @@ -20919,7 +21003,7 @@ let pname = "X11-GUITest"; version = "0.28"; src = fetchurl { - url = mirror://cpan/authors/id/C/CT/CTRONDLP/X11-GUITest-0.28.tar.gz; + url = "mirror://cpan/authors/id/C/CT/CTRONDLP/X11-GUITest-0.28.tar.gz"; sha256 = "0jznws68skdzkhgkgcgjlj40qdyh9i75r7fw8bqzy406f19xxvnw"; }; buildInputs = [ pkgs.xlibsWrapper pkgs.xorg.libXtst pkgs.xorg.libXi ]; @@ -20931,7 +21015,7 @@ let pname = "X11-XCB"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTPLBG/X11-XCB-0.18.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSTPLBG/X11-XCB-0.18.tar.gz"; sha256 = "1cjpghw7cnackw20lbd7yzm222kz5bnrwz52f8ay24d1f4pwrnxf"; }; AUTOMATED_TESTING = false; @@ -20949,7 +21033,7 @@ let pname = "XML-Descent"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDYA/XML-Descent-1.04.tar.gz; + url = "mirror://cpan/authors/id/A/AN/ANDYA/XML-Descent-1.04.tar.gz"; sha256 = "0l5xmw2hd95ypppz3lyvp4sn02ccsikzjwacli3ydxfdz1bbh4d7"; }; buildInputs = [ TestDifferences ]; @@ -20964,7 +21048,7 @@ let pname = "XML-DOM"; version = "1.46"; src = fetchurl { - url = mirror://cpan/authors/id/T/TJ/TJMATHER/XML-DOM-1.46.tar.gz; + url = "mirror://cpan/authors/id/T/TJ/TJMATHER/XML-DOM-1.46.tar.gz"; sha256 = "0phpkc4li43m2g44hdcvyxzy9pymqwlqhh5hwp2xc0cv8l5lp8lb"; }; propagatedBuildInputs = [ XMLRegExp libxml_perl ]; @@ -20974,7 +21058,7 @@ let pname = "XML-FeedPP"; version = "0.95"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/XML-FeedPP-0.95.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKOV/XML-FeedPP-0.95.tar.gz"; sha256 = "1x5806xwmbqxr1dkdhalb6d7n31s3ya776klkai7c2x6y6drbhwh"; }; propagatedBuildInputs = [ XMLTreePP ]; @@ -20988,7 +21072,7 @@ let pname = "XML-Filter-BufferText"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/R/RB/RBERJON/XML-Filter-BufferText-1.01.tar.gz; + url = "mirror://cpan/authors/id/R/RB/RBERJON/XML-Filter-BufferText-1.01.tar.gz"; sha256 = "8fd2126d3beec554df852919f4739e689202cbba6a17506e9b66ea165841a75c"; }; doCheck = false; @@ -20998,7 +21082,7 @@ let pname = "XML-Filter-XInclude"; version = "1.0"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSERGEANT/XML-Filter-XInclude-1.0.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSERGEANT/XML-Filter-XInclude-1.0.tar.gz"; sha256 = "98746f3c1f6f049491fec203d455bb8f8c9c6e250f041904dda5d78e21187f93"; }; doCheck = false; @@ -21008,7 +21092,7 @@ let pname = "XML-Grove"; version = "0.46alpha"; src = fetchurl { - url = mirror://cpan/authors/id/K/KM/KMACLEOD/XML-Grove-0.46alpha.tar.gz; + url = "mirror://cpan/authors/id/K/KM/KMACLEOD/XML-Grove-0.46alpha.tar.gz"; sha256 = "05yis1ms7cgwjh57k57whrmalb3ha0bjr9hyvh7cnadcyiynvdpw"; }; buildInputs = [ pkgs.libxml2 ]; @@ -21025,7 +21109,7 @@ let pname = "XML-Handler-YAWriter"; version = "0.23"; src = fetchurl { - url = mirror://cpan/authors/id/K/KR/KRAEHE/XML-Handler-YAWriter-0.23.tar.gz; + url = "mirror://cpan/authors/id/K/KR/KRAEHE/XML-Handler-YAWriter-0.23.tar.gz"; sha256 = "11d45a1sz862va9rry3p2m77pwvq3kpsvgwhc5ramh9mbszbnk77"; }; propagatedBuildInputs = [ libxml_perl ]; @@ -21038,7 +21122,7 @@ let pname = "XML-LibXML"; version = "2.0202"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0202.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0202.tar.gz"; sha256 = "1bp2d5jpfmp35f2giwqx60q2rmzq469szkxzfcqkd742x72h4ayc"; }; SKIP_SAX_INSTALL = 1; @@ -21050,7 +21134,7 @@ let pname = "XML-LibXML-Simple"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/XML-LibXML-Simple-1.01.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKOV/XML-LibXML-Simple-1.01.tar.gz"; sha256 = "cd98c8104b70d7672bfa26b4513b78adf2b4b9220e586aa8beb1a508500365a6"; }; propagatedBuildInputs = [ XMLLibXML ]; @@ -21064,7 +21148,7 @@ let pname = "XML-LibXSLT"; version = "1.99"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.99.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.99.tar.gz"; sha256 = "1w7pn0wb88nma6biy4h05ak3j4ykma6vz1wbkrxy8qgvfyl1fzhj"; }; buildInputs = [ pkgs.pkgconfig pkgs.zlib pkgs.libxml2 pkgs.libxslt ]; @@ -21075,7 +21159,7 @@ let pname = "XML-Mini"; version = "1.38"; src = fetchurl { - url = mirror://cpan/authors/id/P/PD/PDEEGAN/XML-Mini-1.38.tar.gz; + url = "mirror://cpan/authors/id/P/PD/PDEEGAN/XML-Mini-1.38.tar.gz"; sha256 = "af803d38036a3184e124a682e5466f1bc107f48a89ef35b0c7647e11a073fe2d"; }; meta = { @@ -21087,19 +21171,20 @@ let pname = "XML-NamespaceSupport"; version = "1.12"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.12.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.12.tar.gz"; sha256 = "1vz5pbi4lm5fhq2slrs2hlp6bnk29863abgjlcx43l4dky2rbsa7"; }; }; XMLParser = buildPerlPackage { pname = "XML-Parser"; - version = "2.44"; + version = "2.46"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz; - sha256 = "05ij0g6bfn27iaggxf8nl5rhlwx6f6p6xmdav6rjcly3x5zd1s8s"; + url = "mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.46.tar.gz"; + sha256 = "0pai3ik47q7rgnix9644c673fwydz52gqkxr9kxwq765j4j36cfk"; }; - patchPhase = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + patches = [ ../development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch ]; + postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace Expat/Makefile.PL --replace 'use English;' '#' '' + stdenv.lib.optionalString stdenv.isCygwin '' sed -i"" -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm @@ -21112,7 +21197,7 @@ let pname = "XML-Parser-Lite"; version = "0.722"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/XML-Parser-Lite-0.722.tar.gz; + url = "mirror://cpan/authors/id/P/PH/PHRED/XML-Parser-Lite-0.722.tar.gz"; sha256 = "1vk3jwh1kfcsmc5kvxzqdnb1cllvf0yf27fg0ra0w6jkw4ks143g"; }; buildInputs = [ TestRequires ]; @@ -21126,7 +21211,7 @@ let pname = "XML-XPath"; version = "1.44"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MANWAR/XML-XPath-1.44.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MANWAR/XML-XPath-1.44.tar.gz"; sha256 = "1cc9110705165dc09dd09974dd7c0b6709c9351d6b6b1cef5a711055f891dd0f"; }; buildInputs = [ PathTiny ]; @@ -21141,7 +21226,7 @@ let pname = "XML-XPathEngine"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIROD/XML-XPathEngine-0.14.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIROD/XML-XPathEngine-0.14.tar.gz"; sha256 = "0r72na14bmsxfd16s9nlza155amqww0k8wsa9x2a3sqbpp5ppznj"; }; meta = { @@ -21153,7 +21238,7 @@ let pname = "XML-RegExp"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/T/TJ/TJMATHER/XML-RegExp-0.04.tar.gz; + url = "mirror://cpan/authors/id/T/TJ/TJMATHER/XML-RegExp-0.04.tar.gz"; sha256 = "0m7wj00a2kik7wj0azhs1zagwazqh3hlz4255n75q21nc04r06fz"; }; }; @@ -21162,12 +21247,12 @@ let pname = "XML-RSS"; version = "1.61"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-RSS-1.61.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-RSS-1.61.tar.gz"; sha256 = "fa6fe7ce5d31800a2bd414ef39da48c7f2b26b073a3c1f0d677bda26e840c90d"; }; propagatedBuildInputs = [ DateTimeFormatMail DateTimeFormatW3CDTF XMLParser ]; meta = { - homepage = http://perl-rss.sourceforge.net/; + homepage = "http://perl-rss.sourceforge.net/"; description = "Creates and updates RSS files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -21177,7 +21262,7 @@ let pname = "XML-SAX"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-1.02.tar.gz; + url = "mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-1.02.tar.gz"; sha256 = "0am13vnv8qsjafr5ljakwnkhlwpk15sga02z8mxsg9is0j3w61j5"; }; propagatedBuildInputs = [ XMLNamespaceSupport XMLSAXBase ]; @@ -21190,12 +21275,12 @@ let pname = "XML-SAX-Base"; version = "1.09"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-Base-1.09.tar.gz; + url = "mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-Base-1.09.tar.gz"; sha256 = "66cb355ba4ef47c10ca738bd35999723644386ac853abbeb5132841f5e8a2ad0"; }; meta = { description = "Base class for SAX Drivers and Filters"; - homepage = https://github.com/grantm/XML-SAX-Base; + homepage = "https://github.com/grantm/XML-SAX-Base"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21204,7 +21289,7 @@ let pname = "XML-SAX-Expat"; version = "0.51"; src = fetchurl { - url = mirror://cpan/authors/id/B/BJ/BJOERN/XML-SAX-Expat-0.51.tar.gz; + url = "mirror://cpan/authors/id/B/BJ/BJOERN/XML-SAX-Expat-0.51.tar.gz"; sha256 = "0gy8h2bvvvlxychwsb99ikdh5cqpk6sqc073jk2b4zffs09n40ac"; }; propagatedBuildInputs = [ XMLParser XMLSAX ]; @@ -21220,12 +21305,12 @@ let pname = "XML-SAX-Writer"; version = "0.57"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-SAX-Writer-0.57.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PERIGRIN/XML-SAX-Writer-0.57.tar.gz"; sha256 = "3d61d07ef43b0126f5b4de4f415a256fa859fa88dc4fdabaad70b7be7c682cf0"; }; propagatedBuildInputs = [ XMLFilterBufferText XMLNamespaceSupport XMLSAXBase ]; meta = { - homepage = https://github.com/perigrin/xml-sax-writer; + homepage = "https://github.com/perigrin/xml-sax-writer"; description = "SAX2 XML Writer"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -21235,7 +21320,7 @@ let pname = "XML-SemanticDiff"; version = "1.0007"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-SemanticDiff-1.0007.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PERIGRIN/XML-SemanticDiff-1.0007.tar.gz"; sha256 = "1xd00821y795fy2rag8aizb5wsbbzfxgmdf9qwpvdxn3pgpyzz85"; }; propagatedBuildInputs = [ XMLParser ]; @@ -21245,7 +21330,7 @@ let pname = "XML-Simple"; version = "2.25"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.25.tar.gz; + url = "mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.25.tar.gz"; sha256 = "1y6vh328zrh085d40852v4ij2l4g0amxykswxd1nfhd2pspds7sk"; }; propagatedBuildInputs = [ XMLSAXExpat ]; @@ -21255,7 +21340,7 @@ let pname = "XML-TokeParser"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/P/PO/PODMASTER/XML-TokeParser-0.05.tar.gz; + url = "mirror://cpan/authors/id/P/PO/PODMASTER/XML-TokeParser-0.05.tar.gz"; sha256 = "1hnpwb3lh6cbgwvjjgqzcp6jm4mp612qn6ili38adc9nhkwv8fc5"; }; propagatedBuildInputs = [ XMLParser ]; @@ -21269,7 +21354,7 @@ let pname = "XML-TreePP"; version = "0.43"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAWASAKI/XML-TreePP-0.43.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAWASAKI/XML-TreePP-0.43.tar.gz"; sha256 = "7fbe2d6430860059894aeeebf75d4cacf1bf8d7b75294eb87d8e1502f81bd760"; }; propagatedBuildInputs = [ LWP ]; @@ -21283,7 +21368,7 @@ let pname = "XML-Twig"; version = "3.52"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.52.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.52.tar.gz"; sha256 = "1bc0hrz4jp6199hi29sdxmb9gyy45whla9hd19yqfasgq8k5ixzy"; }; postInstall = '' @@ -21298,7 +21383,7 @@ let pname = "XML-Validator-Schema"; version = "1.10"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SAMTREGAR/XML-Validator-Schema-1.10.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SAMTREGAR/XML-Validator-Schema-1.10.tar.gz"; sha256 = "6142679580150a891f7d32232b5e31e2b4e5e53e8a6fa9cbeecb5c23814f1422"; }; propagatedBuildInputs = [ TreeDAGNode XMLFilterBufferText XMLSAX ]; @@ -21311,7 +21396,7 @@ let pname = "XML-Writer"; version = "0.625"; src = fetchurl { - url = mirror://cpan/authors/id/J/JO/JOSEPHW/XML-Writer-0.625.tar.gz; + url = "mirror://cpan/authors/id/J/JO/JOSEPHW/XML-Writer-0.625.tar.gz"; sha256 = "1gjzs570i67ywbv967g8ylb5sg59clwmyrl2yix3jl70dhn55070"; }; }; @@ -21320,7 +21405,7 @@ let pname = "XS-Object-Magic"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/XS-Object-Magic-0.04.tar.gz; + url = "mirror://cpan/authors/id/F/FL/FLORA/XS-Object-Magic-0.04.tar.gz"; sha256 = "03fghj7hq0fiicmfdxhmzfm4mzv7s097pgkd32ji7jnljvhm9six"; }; buildInputs = [ ExtUtilsDepends TestFatal ]; @@ -21334,7 +21419,7 @@ let pname = "XXX"; version = "0.35"; src = fetchurl { - url = mirror://cpan/authors/id/I/IN/INGY/XXX-0.35.tar.gz; + url = "mirror://cpan/authors/id/I/IN/INGY/XXX-0.35.tar.gz"; sha256 = "1azk2h3d2vxc84zpa34gr0dvhvf5qkwbaidy3ks0gkkx9463crm6"; }; propagatedBuildInputs = [ YAMLPP ]; @@ -21349,7 +21434,7 @@ let pname = "YAML"; version = "1.30"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/YAML-1.30.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-1.30.tar.gz"; sha256 = "1kbrfksjg4k4vmx1i337m5n69m00m0m5bgsh61c15bzzrgbacc2h"; }; @@ -21366,7 +21451,7 @@ let pname = "YAML-Syck"; version = "1.32"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.32.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.32.tar.gz"; sha256 = "1fz9r9vvsmjkzvcbznxw65b319vkmwzd0ck09q9nwip00gn907fv"; }; meta = { @@ -21379,7 +21464,7 @@ let pname = "YAML-Tiny"; version = "1.73"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/YAML-Tiny-1.73.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/YAML-Tiny-1.73.tar.gz"; sha256 = "0i3p4nz8ysrsrs6vlzc6gkjcfpcaf05xjc7lwbjkw7lg5shmycdw"; }; }; @@ -21388,7 +21473,7 @@ let pname = "YAML-LibYAML"; version = "0.81"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.81.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.81.tar.gz"; sha256 = "1rwmy4kywaa0hypy329gb8wbqdk01bv4179bbnjbg66kzl5ndpvh"; }; }; @@ -21397,7 +21482,7 @@ let pname = "YAML-PP"; version = "0.018"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.018.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.018.tar.gz"; sha256 = "1s957svv1z4sz62s53n5ym3c0liafs2gl8r0m7xq9qgcb9dyvblx"; }; buildInputs = [ TestDeep TestWarn ]; @@ -21411,13 +21496,13 @@ let pname = "WebService-Linode"; version = "0.29"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKEGRB/WebService-Linode-0.29.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIKEGRB/WebService-Linode-0.29.tar.gz"; sha256 = "103aab245304f08e9e87ac7bc884ddb44a630de6bac077dc921f716d71154922"; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ JSON LWPProtocolHttps ]; meta = { - homepage = https://github.com/mikegrb/WebService-Linode; + homepage = "https://github.com/mikegrb/WebService-Linode"; description = "Perl Interface to the Linode.com API"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 6bae48b54c387..82c68c2127d79 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgs, fetchgit, php, phpWithExtensions, autoconf, pkgconfig, re2c +{ stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c , gettext, bzip2, curl, libxml2, openssl, gmp, icu, oniguruma, libsodium , html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng @@ -8,7 +8,8 @@ let buildPecl = import ../build-support/build-pecl.nix { - inherit php lib; + php = php.unwrapped; + inherit lib; inherit (pkgs) stdenv autoreconfHook fetchurl re2c; }; @@ -43,25 +44,25 @@ in installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/box/box.phar - makeWrapper ${phpWithExtensions}/bin/php $out/bin/box \ + makeWrapper ${php}/bin/php $out/bin/box \ --add-flags "-d phar.readonly=0 $out/libexec/box/box.phar" ''; meta = with pkgs.lib; { description = "An application for building and managing Phars"; license = licenses.mit; - homepage = https://box-project.github.io/box2/; - maintainers = with maintainers; [ jtojnar ]; + homepage = "https://box-project.github.io/box2/"; + maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; }; }; composer = mkDerivation rec { - version = "1.9.3"; + version = "1.10.6"; pname = "composer"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "VRZVwvyB9BBlCPQrvEsk6r00sCKxO8Hn2WQr9IPQp9Q="; + sha256 = "0yzfzgg9qlc388g91bdg7y7rp1q8vqb5hkwykwmr1n1lv8dsrg99"; }; dontUnpack = true; @@ -71,7 +72,7 @@ in installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/composer/composer.phar - makeWrapper ${phpWithExtensions}/bin/php $out/bin/composer \ + makeWrapper ${php}/bin/php $out/bin/composer \ --add-flags "$out/libexec/composer/composer.phar" \ --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]} ''; @@ -79,18 +80,18 @@ in meta = with pkgs.lib; { description = "Dependency Manager for PHP"; license = licenses.mit; - homepage = https://getcomposer.org/; - maintainers = with maintainers; [ globin offline ]; + homepage = "https://getcomposer.org/"; + maintainers = with maintainers; [ offline ] ++ teams.php.members; }; }; php-cs-fixer = mkDerivation rec { - version = "2.16.1"; + version = "2.16.3"; pname = "php-cs-fixer"; src = pkgs.fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "1dq1nhy666zg6d4fkfsjwhj1vwh1ncap2c9ljplxv98a9mm6fk68"; + sha256 = "195j61qbgbdn5xi0l6030mklji8m7fan2kf3446a1m2n4df3f5hb"; }; phases = [ "installPhase" ]; @@ -106,8 +107,8 @@ in meta = with pkgs.lib; { description = "A tool to automatically fix PHP coding standards issues"; license = licenses.mit; - homepage = http://cs.sensiolabs.org/; - maintainers = with maintainers; [ jtojnar ]; + homepage = "http://cs.sensiolabs.org/"; + maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; }; }; @@ -143,18 +144,18 @@ in meta = with pkgs.lib; { description = "This tool check syntax of PHP files faster than serial check with fancier output"; license = licenses.bsd2; - homepage = https://github.com/JakubOnderka/PHP-Parallel-Lint; - maintainers = with maintainers; [ jtojnar ]; + homepage = "https://github.com/JakubOnderka/PHP-Parallel-Lint"; + maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; }; }; phpcbf = mkDerivation rec { - version = "3.5.3"; + version = "3.5.5"; pname = "phpcbf"; src = pkgs.fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar"; - sha256 = "1mrsf9p6p64pyqyylnlxb2b7cirdfccch83g7yhfnka3znffq86v"; + sha256 = "0hgagn70gl46migm6zpwcr39dxal07f5cdpnasrafgz5vq0gwr3g"; }; phases = [ "installPhase" ]; @@ -170,18 +171,18 @@ in meta = with pkgs.lib; { description = "PHP coding standard beautifier and fixer"; license = licenses.bsd3; - homepage = https://squizlabs.github.io/PHP_CodeSniffer/; - maintainers = with maintainers; [ cmcdragonkai etu ]; + homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; + maintainers = with maintainers; [ cmcdragonkai ] ++ teams.php.members; }; }; phpcs = mkDerivation rec { - version = "3.5.3"; + version = "3.5.5"; pname = "phpcs"; src = pkgs.fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar"; - sha256 = "0y4nhsifj4pdmf5g1nnm4951yjgiqswyz7wmjxx6kqiqc7chlkml"; + sha256 = "0jl038l55cmzn5ml61qkv4z1w4ri0h3v7h00pcb04xhz3gznlbsa"; }; phases = [ "installPhase" ]; @@ -197,18 +198,46 @@ in meta = with pkgs.lib; { description = "PHP coding standard tool"; license = licenses.bsd3; - homepage = https://squizlabs.github.io/PHP_CodeSniffer/; - maintainers = with maintainers; [ javaguirre etu ]; + homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; + maintainers = with maintainers; [ javaguirre ] ++ teams.php.members; + }; + }; + + phpmd = mkDerivation rec { + version = "2.8.2"; + pname = "phpmd"; + + src = pkgs.fetchurl { + url = "https://github.com/phpmd/phpmd/releases/download/${version}/phpmd.phar"; + sha256 = "1i8qgzxniw5d8zjpypalm384y7qfczapfq70xmg129laq6xiqlqb"; + }; + + phases = [ "installPhase" ]; + buildInputs = [ pkgs.makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/phpmd/phpmd.phar + makeWrapper ${php}/bin/php $out/bin/phpmd \ + --add-flags "$out/libexec/phpmd/phpmd.phar" + ''; + + meta = with pkgs.lib; { + description = "PHP code quality analyzer"; + license = licenses.bsd3; + homepage = "https://phpmd.org/"; + maintainers = teams.php.members; + broken = !isPhp74; }; }; phpstan = mkDerivation rec { - version = "0.12.14"; + version = "0.12.25"; pname = "phpstan"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "JAq1/+bVhTgKRR7oFusqZ/yBOYewaOM38ZoiCjirsTg="; + sha256 = "1a864v7fxpv5kp24nkvczrir3ldl6wxvaq85rd391ppa8ahdhvdd"; }; phases = [ "installPhase" ]; @@ -224,25 +253,25 @@ in meta = with pkgs.lib; { description = "PHP Static Analysis Tool"; longDescription = '' - PHPStan focuses on finding errors in your code without actually running - it. It catches whole classes of bugs even before you write tests for the - code. It moves PHP closer to compiled languages in the sense that the - correctness of each line of the code can be checked before you run the - actual line. - ''; + PHPStan focuses on finding errors in your code without actually + running it. It catches whole classes of bugs even before you write + tests for the code. It moves PHP closer to compiled languages in the + sense that the correctness of each line of the code can be checked + before you run the actual line. + ''; license = licenses.mit; homepage = "https://github.com/phpstan/phpstan"; - maintainers = with maintainers; [ etu ]; + maintainers = teams.php.members; }; }; psalm = mkDerivation rec { - version = "3.9.3"; + version = "3.11.2"; pname = "psalm"; src = pkgs.fetchurl { url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar"; - sha256 = "KHm2n06y/yxN5B2rCVxT5ja7HxkyxAMsjZ5HLb3xr4M="; + sha256 = "1ani0907whqy2ycr01sjlvrmwps4dg5igim8z1qyv8grhwvw6gb0"; }; phases = [ "installPhase" ]; @@ -258,17 +287,18 @@ in meta = with pkgs.lib; { description = "A static analysis tool for finding errors in PHP applications"; license = licenses.mit; - homepage = https://github.com/vimeo/psalm; + homepage = "https://github.com/vimeo/psalm"; + maintainers = teams.php.members; }; }; psysh = mkDerivation rec { - version = "0.9.12"; + version = "0.10.3"; pname = "psysh"; src = pkgs.fetchurl { url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; - sha256 = "0bzmc94li481xk81gv460ipq9zl03skbnq8m3rnw34i2c04hxczc"; + sha256 = "0glply451fy0g7zbasyp350qvmk2aglrlcrcdd7w0igylgwfkg71"; }; phases = [ "installPhase" ]; @@ -284,8 +314,8 @@ in meta = with pkgs.lib; { description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP."; license = licenses.mit; - homepage = https://psysh.org/; - maintainers = with maintainers; [ caugner ]; + homepage = "https://psysh.org/"; + maintainers = with maintainers; [ caugner ] ++ teams.php.members; }; }; }; @@ -308,6 +338,8 @@ in checkFlagsArray = ["REPORT_EXIT_STATUS=1" "NO_INTERACTION=1"]; makeFlags = [ "phpincludedir=$(dev)/include" ]; outputs = [ "out" "dev" ]; + + meta.maintainers = lib.teams.php.members; }; apcu_bc = buildPecl { @@ -316,10 +348,17 @@ in sha256 = "0ma00syhk2ps9k9p02jz7rii6x3i2p986il23703zz5npd6y9n20"; + peclDeps = [ php.extensions.apcu ]; + buildInputs = [ - php.extensions.apcu pcre' ]; + + postInstall = '' + mv $out/lib/php/extensions/apc.so $out/lib/php/extensions/apcu_bc.so + ''; + + meta.maintainers = lib.teams.php.members; }; ast = buildPecl { @@ -327,19 +366,14 @@ in pname = "ast"; sha256 = "16c5isldm4csjbcvz1qk2mmrhgvh24sxsp6w6f5a37xpa3vciawp"; + + meta.maintainers = lib.teams.php.members; }; couchbase = buildPecl rec { version = "2.6.1"; pname = "couchbase"; - buildInputs = [ - pkgs.libcouchbase - pkgs.zlib - php.extensions.igbinary - php.extensions.pcs - ]; - src = pkgs.fetchFromGitHub { owner = "couchbase"; repo = "php-couchbase"; @@ -348,7 +382,14 @@ in }; configureFlags = [ "--with-couchbase" ]; + + buildInputs = [ + pkgs.libcouchbase + pkgs.zlib + ]; internalDeps = [ php.extensions.json ]; + peclDeps = [ php.extensions.igbinary ]; + patches = [ (pkgs.writeText "php-couchbase.patch" '' --- a/config.m4 @@ -374,7 +415,7 @@ in '') ]; - meta.broken = isPhp74; # Build error + meta.maintainers = lib.teams.php.members; }; event = buildPecl { @@ -406,6 +447,7 @@ in ''; license = licenses.php301; homepage = "https://bitbucket.org/osmanov/pecl-event/"; + maintainers = teams.php.members; }; }; @@ -418,6 +460,8 @@ in configureFlags = [ "--enable-igbinary" ]; makeFlags = [ "phpincludedir=$(dev)/include" ]; outputs = [ "out" "dev" ]; + + meta.maintainers = lib.teams.php.members; }; imagick = buildPecl { @@ -429,6 +473,8 @@ in configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pcre' ]; + + meta.maintainers = lib.teams.php.members; }; mailparse = buildPecl { @@ -440,6 +486,8 @@ in postConfigure = '' echo "#define HAVE_MBSTRING 1" >> config.h ''; + + meta.maintainers = lib.teams.php.members; }; maxminddb = buildPecl rec { @@ -459,7 +507,7 @@ in meta = with pkgs.lib; { description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ ajs124 das_j ]; + maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members; }; }; @@ -486,6 +534,8 @@ in nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ cyrus_sasl zlib ]; + + meta.maintainers = lib.teams.php.members; }; mongodb = buildPecl { @@ -503,6 +553,8 @@ in zlib pcre' ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; + + meta.maintainers = lib.teams.php.members; }; oci8 = buildPecl { @@ -516,6 +568,8 @@ in postPatch = '' sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 ''; + + meta.maintainers = lib.teams.php.members; }; pcov = buildPecl { @@ -525,6 +579,8 @@ in sha256 = "1psfwscrc025z8mziq69pcx60k4fbkqa5g2ia8lplb94mmarj0v1"; buildInputs = [ pcre' ]; + + meta.maintainers = lib.teams.php.members; }; pcs = buildPecl { @@ -533,11 +589,14 @@ in sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p"; - meta.broken = isPhp74; # Build error + internalDeps = [ php.extensions.tokenizer ]; + + meta.maintainers = lib.teams.php.members; + meta.broken = isPhp73; # Runtime failure on 7.3, build error on 7.4 }; pdo_oci = buildPecl rec { - inherit (php) src version; + inherit (php.unwrapped) src version; pname = "pdo_oci"; sourceRoot = "php-${version}/ext/pdo_oci"; @@ -548,19 +607,23 @@ in internalDeps = [ php.extensions.pdo ]; postPatch = '' - sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 - ''; + sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 + ''; + + meta.maintainers = lib.teams.php.members; }; pdo_sqlsrv = buildPecl { - version = "5.8.0"; + version = "5.8.1"; pname = "pdo_sqlsrv"; - sha256 = "0z4vbyd851b4jr6p69l2ylk91iihndsm2qjb429pxcv8g6dqzqll"; + sha256 = "06ba4x34fgs092qq9w62y2afsm1nyasqiprirk4951ax9v5vcir0"; internalDeps = [ php.extensions.pdo ]; buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; + + meta.maintainers = lib.teams.php.members; }; php_excel = buildPecl rec { @@ -576,6 +639,8 @@ in }; configureFlags = [ "--with-excel" "--with-libxl-incdir=${pkgs.libxl}/include_c" "--with-libxl-libdir=${pkgs.libxl}/lib" ]; + + meta.maintainers = lib.teams.php.members; }; pinba = let @@ -601,6 +666,7 @@ in statistics server for PHP using MySQL as a read-only interface. ''; homepage = "http://pinba.org/"; + maintainers = teams.php.members; }; }; @@ -618,6 +684,7 @@ in ''; license = licenses.bsd3; homepage = "https://developers.google.com/protocol-buffers/"; + maintainers = teams.php.members; }; }; @@ -642,6 +709,26 @@ in meta.broken = isPhp74; }; + rdkafka = buildPecl { + version = "4.0.3"; + pname = "rdkafka"; + + sha256 = "1g00p911raxcc7n2w9pzadxaggw5c564md6hjvqfs9ip550y5x16"; + + buildInputs = with pkgs; [ rdkafka pcre' ]; + + postPhpize = '' + substituteInPlace configure \ + --replace 'SEARCH_PATH="/usr/local /usr"' 'SEARCH_PATH=${pkgs.rdkafka}' + ''; + + meta = { + description = "Kafka client based on librdkafka"; + homepage = "https://github.com/arnaud-lb/php-rdkafka"; + maintainers = lib.teams.php.members; + }; + }; + redis = buildPecl { version = "5.1.1"; pname = "redis"; @@ -653,15 +740,19 @@ in session ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ hash ]; + + meta.maintainers = lib.teams.php.members; }; sqlsrv = buildPecl { - version = "5.8.0"; + version = "5.8.1"; pname = "sqlsrv"; - sha256 = "1kv4krk1w4hri99b0sdgwgy9c4y0yh217wx2y3irhkfi46kdrjnw"; + sha256 = "0c9a6ghch2537vi0274vx0mn6nb1xg2qv7nprnf3xdfqi5ww1i9r"; buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; + + meta.maintainers = lib.teams.php.members; }; v8 = buildPecl { @@ -672,6 +763,8 @@ in buildInputs = [ pkgs.v8_6_x ]; configureFlags = [ "--with-v8=${pkgs.v8_6_x}" ]; + + meta.maintainers = lib.teams.php.members; meta.broken = true; }; @@ -683,6 +776,8 @@ in buildInputs = [ pkgs.v8_6_x ]; configureFlags = [ "--with-v8js=${pkgs.v8_6_x}" ]; + + meta.maintainers = lib.teams.php.members; meta.broken = true; }; @@ -696,6 +791,8 @@ in checkTarget = "test"; zendExtension = true; + + meta.maintainers = lib.teams.php.members; }; yaml = buildPecl { @@ -709,6 +806,8 @@ in ]; nativeBuildInputs = [ pkgs.pkgconfig ]; + + meta.maintainers = lib.teams.php.members; }; zmq = buildPecl { @@ -723,6 +822,7 @@ in nativeBuildInputs = [ pkgs.pkgconfig ]; + meta.maintainers = lib.teams.php.members; meta.broken = isPhp73; }; } // (let @@ -746,11 +846,11 @@ in pname = "php-${name}"; extensionName = name; - inherit (php) version src; + inherit (php.unwrapped) version src; sourceRoot = "php-${php.version}/ext/${name}"; enableParallelBuilding = true; - nativeBuildInputs = [ php autoconf pkgconfig re2c ]; + nativeBuildInputs = [ php.unwrapped autoconf pkgconfig re2c ]; inherit configureFlags internalDeps buildInputs zendExtension doCheck; @@ -782,6 +882,11 @@ in --prune-empty-dirs \ . $dev/include/ ''; + + meta = { + description = "PHP upstream extension: ${name}"; + inherit (php.meta) maintainers homepage license; + }; }); # This list contains build instructions for different modules that one may @@ -939,7 +1044,7 @@ in # pdo_firebird (7.4, 7.3, 7.2) { name = "pdo_mysql"; internalDeps = with php.extensions; [ pdo mysqlnd ]; - configureFlags = [ "--with-pdo-mysql=mysqlnd" ]; + configureFlags = [ "--with-pdo-mysql=mysqlnd" "PHP_MYSQL_SOCK=/run/mysqld/mysqld.sock" ]; doCheck = false; } # pdo_oci (7.4, 7.3, 7.2) { name = "pdo_odbc"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e16cc830fc2bf..61467b1fc43e6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18,7 +18,7 @@ let packages = ( self: let - inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; + inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; callPackage = pkgs.newScope self; @@ -100,7 +100,7 @@ let in { - inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; + inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; inherit python bootstrapped-pip buildPythonPackage buildPythonApplication; inherit fetchPypi callPackage; inherit hasPythonModule requiredPythonModules makePythonPath disabledIf; @@ -248,6 +248,8 @@ in { authres = callPackage ../development/python-modules/authres { }; + auth0-python = callPackage ../development/python-modules/auth0-python { }; + autograd = callPackage ../development/python-modules/autograd { }; autologging = callPackage ../development/python-modules/autologging { }; @@ -278,8 +280,6 @@ in { withPython = true; }); - azure = callPackage ../development/python-modules/azure { }; - azure-nspkg = callPackage ../development/python-modules/azure-nspkg { }; azure-common = callPackage ../development/python-modules/azure-common { }; @@ -308,6 +308,8 @@ in { azure-keyvault = callPackage ../development/python-modules/azure-keyvault { }; + azure-keyvault-certificates = callPackage ../development/python-modules/azure-keyvault-certificates { }; + azure-keyvault-keys = callPackage ../development/python-modules/azure-keyvault-keys { }; azure-keyvault-nspkg = callPackage ../development/python-modules/azure-keyvault-nspkg { }; @@ -374,6 +376,8 @@ in { azure-mgmt-containerservice = callPackage ../development/python-modules/azure-mgmt-containerservice { }; + azure-mgmt-core = callPackage ../development/python-modules/azure-mgmt-core { }; + azure-mgmt-cosmosdb = callPackage ../development/python-modules/azure-mgmt-cosmosdb { }; azure-mgmt-datafactory = callPackage ../development/python-modules/azure-mgmt-datafactory { }; @@ -454,6 +458,8 @@ in { azure-mgmt-recoveryservicesbackup = callPackage ../development/python-modules/azure-mgmt-recoveryservicesbackup { }; + azure-mgmt-redhatopenshift = callPackage ../development/python-modules/azure-mgmt-redhatopenshift { }; + azure-mgmt-redis = callPackage ../development/python-modules/azure-mgmt-redis { }; azure-mgmt-relay = callPackage ../development/python-modules/azure-mgmt-relay { }; @@ -518,6 +524,8 @@ in { blivet = callPackage ../development/python-modules/blivet { }; + bluepy = callPackage ../development/python-modules/bluepy { }; + boltons = callPackage ../development/python-modules/boltons { }; bravia-tv = callPackage ../development/python-modules/bravia-tv { }; @@ -560,6 +568,8 @@ in { catalogue = callPackage ../development/python-modules/catalogue { }; + cbeams = callPackage ../misc/cbeams { }; + cdecimal = callPackage ../development/python-modules/cdecimal { }; cfn-flip = callPackage ../development/python-modules/cfn-flip { }; @@ -666,6 +676,8 @@ in { dftfit = callPackage ../development/python-modules/dftfit { }; + dicom2nifti = callPackage ../development/python-modules/dicom2nifti { }; + discid = callPackage ../development/python-modules/discid { }; discordpy = callPackage ../development/python-modules/discordpy { }; @@ -726,8 +738,6 @@ in { flufl_lock = callPackage ../development/python-modules/flufl/lock.nix { }; - fluidasserts = callPackage ../development/python-modules/fluidasserts { }; - foxdot = callPackage ../development/python-modules/foxdot { }; fsspec = callPackage ../development/python-modules/fsspec { }; @@ -795,6 +805,8 @@ in { handout = callPackage ../development/python-modules/handout { }; + HAP-python = callPackage ../development/python-modules/HAP-python { }; + helper = callPackage ../development/python-modules/helper { }; hdmedians = callPackage ../development/python-modules/hdmedians { }; @@ -929,6 +941,8 @@ in { python-mpv-jsonipc = callPackage ../development/python-modules/python-mpv-jsonipc { }; + mortgage = callPackage ../development/python-modules/mortgage { }; + msal = callPackage ../development/python-modules/msal { }; msal-extensions = callPackage ../development/python-modules/msal-extensions { }; @@ -955,6 +969,8 @@ in { ndtypes = callPackage ../development/python-modules/ndtypes { }; + neo = callPackage ../development/python-modules/neo { }; + nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; neuron = pkgs.neuron.override { @@ -1023,6 +1039,8 @@ in { pdfminer = callPackage ../development/python-modules/pdfminer_six { }; + pdfposter = callPackage ../development/python-modules/pdfposter { }; + pdftotext = callPackage ../development/python-modules/pdftotext { }; pdfx = callPackage ../development/python-modules/pdfx { }; @@ -1059,10 +1077,14 @@ in { proglog = callPackage ../development/python-modules/proglog { }; + pulsectl = callPackage ../development/python-modules/pulsectl { }; + pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { }; purl = callPackage ../development/python-modules/purl { }; + pyclipper = callPackage ../development/python-modules/pyclipper { }; + pymystem3 = callPackage ../development/python-modules/pymystem3 { }; pymysql = callPackage ../development/python-modules/pymysql { }; @@ -1127,6 +1149,10 @@ in { py-lru-cache = callPackage ../development/python-modules/py-lru-cache { }; + py-multibase = callPackage ../development/python-modules/py-multibase { }; + + py-multihash = callPackage ../development/python-modules/py-multihash { }; + py-radix = callPackage ../development/python-modules/py-radix { }; pydbus = callPackage ../development/python-modules/pydbus { }; @@ -1204,6 +1230,10 @@ in { pylev = callPackage ../development/python-modules/pylev { }; + pylibftdi = callPackage ../development/python-modules/pylibftdi { + inherit (pkgs) libusb1; + }; + pymatgen = callPackage ../development/python-modules/pymatgen { }; pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { }; @@ -1445,6 +1475,10 @@ in { transformers = callPackage ../development/python-modules/transformers { }; + transforms3d = callPackage ../development/python-modules/transforms3d { }; + + trimesh = callPackage ../development/python-modules/trimesh {}; + sentinel = callPackage ../development/python-modules/sentinel { }; sentry-sdk = callPackage ../development/python-modules/sentry-sdk {}; @@ -1455,6 +1489,8 @@ in { shellingham = callPackage ../development/python-modules/shellingham {}; + simpleaudio = callPackage ../development/python-modules/simpleaudio { }; + simpleeval = callPackage ../development/python-modules/simpleeval { }; simple-salesforce = callPackage ../development/python-modules/simple-salesforce { }; @@ -1569,6 +1605,13 @@ in { vdf = callPackage ../development/python-modules/vdf { }; + vdirsyncer = callPackage ../development/python-modules/vdirsyncer { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security; + inherit (pkgs) pkg-config openssl rustPlatform; + }; + + vdirsyncerStable = callPackage ../development/python-modules/vdirsyncer/stable.nix { }; + vidstab = callPackage ../development/python-modules/vidstab { }; webapp2 = callPackage ../development/python-modules/webapp2 { }; @@ -1619,6 +1662,8 @@ in { aioftp = callPackage ../development/python-modules/aioftp { }; + aioharmony = callPackage ../development/python-modules/aioharmony { }; + aiohttp = callPackage ../development/python-modules/aiohttp { }; aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; @@ -2055,6 +2100,8 @@ in { bleach = callPackage ../development/python-modules/bleach { }; + bleak = callPackage ../development/python-modules/bleak { }; + blinker = callPackage ../development/python-modules/blinker { }; blockdiag = callPackage ../development/python-modules/blockdiag { }; @@ -2198,6 +2245,8 @@ in { closure-linter = callPackage ../development/python-modules/closure-linter { }; + cloudflare = callPackage ../development/python-modules/cloudflare { }; + cloudpickle = callPackage ../development/python-modules/cloudpickle { }; cmdline = callPackage ../development/python-modules/cmdline { }; @@ -2660,6 +2709,8 @@ in { dpath = callPackage ../development/python-modules/dpath { }; + dparse = callPackage ../development/python-modules/dparse { }; + dpkt = callPackage ../development/python-modules/dpkt {}; urllib3 = callPackage ../development/python-modules/urllib3 {}; @@ -2743,6 +2794,8 @@ in { fastdtw = callPackage ../development/python-modules/fastdtw { }; + fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; + faulthandler = if ! isPy3k then callPackage ../development/python-modules/faulthandler {} else throw "faulthandler is built into ${python.executable}"; @@ -2879,12 +2932,16 @@ in { helpdev = callPackage ../development/python-modules/helpdev { }; + heudiconv = callPackage ../development/python-modules/heudiconv { }; + hickle = callPackage ../development/python-modules/hickle { }; hiro = callPackage ../development/python-modules/hiro {}; hglib = callPackage ../development/python-modules/hglib {}; + huey = callPackage ../development/python-modules/huey { }; + humanize = callPackage ../development/python-modules/humanize { }; humanfriendly = callPackage ../development/python-modules/humanfriendly { }; @@ -2979,6 +3036,10 @@ in { jsonwatch = callPackage ../development/python-modules/jsonwatch { }; + kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { + python3 = python; + }).src); + latexcodec = callPackage ../development/python-modules/latexcodec {}; libmodulemd = pipe pkgs.libmodulemd [ @@ -3185,6 +3246,9 @@ in { priority = callPackage ../development/python-modules/priority { }; + privacyidea = callPackage ../development/python-modules/privacyidea { }; + privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { }; + prov = callPackage ../development/python-modules/prov { }; pudb = callPackage ../development/python-modules/pudb { }; @@ -3208,7 +3272,7 @@ in { pycares = callPackage ../development/python-modules/pycares { }; pycuda = callPackage ../development/python-modules/pycuda { - cudatoolkit = pkgs.cudatoolkit_7_5; + cudatoolkit = pkgs.cudatoolkit; inherit (pkgs.stdenv) mkDerivation; }; @@ -3256,6 +3320,8 @@ in { peewee = callPackage ../development/python-modules/peewee { }; + pyroma = callPackage ../development/python-modules/pyroma { }; + pyroute2 = callPackage ../development/python-modules/pyroute2 { }; pyspf = callPackage ../development/python-modules/pyspf { }; @@ -3268,6 +3334,8 @@ in { pytools = callPackage ../development/python-modules/pytools { }; + python-constraint = callPackage ../development/python-modules/python-constraint { }; + python-ctags3 = callPackage ../development/python-modules/python-ctags3 { }; python-lzo = callPackage ../development/python-modules/python-lzo { @@ -3701,6 +3769,8 @@ in { flask_testing = callPackage ../development/python-modules/flask-testing { }; + flask-versioned = callPackage ../development/python-modules/flask-versioned { }; + flask_wtf = callPackage ../development/python-modules/flask-wtf { }; wtforms = callPackage ../development/python-modules/wtforms { }; @@ -4004,6 +4074,8 @@ in { hypothesis = callPackage ../development/python-modules/hypothesis { }; + hydra-check = callPackage ../development/python-modules/hydra-check { }; + colored = callPackage ../development/python-modules/colored { }; xdg = callPackage ../development/python-modules/xdg { }; @@ -4014,6 +4086,8 @@ in { uncompyle6 = callPackage ../development/python-modules/uncompyle6 { }; + unrpa = callPackage ../development/python-modules/unrpa { }; + lsi = callPackage ../development/python-modules/lsi { }; hkdf = callPackage ../development/python-modules/hkdf { }; @@ -4054,6 +4128,8 @@ in { ipy = callPackage ../development/python-modules/IPy { }; + ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { }; + ipykernel = if pythonOlder "3.4" then callPackage ../development/python-modules/ipykernel/4.nix { } else @@ -4130,7 +4206,10 @@ in { inherit (pkgs.jsonnet) name src; }; - jupyter_client = callPackage ../development/python-modules/jupyter_client { }; + jupyter_client = if isPy3k then + callPackage ../development/python-modules/jupyter_client { } + else + callPackage ../development/python-modules/jupyter_client/5.nix { }; jupyter_core = callPackage ../development/python-modules/jupyter_core { }; @@ -4366,7 +4445,10 @@ in { maya = callPackage ../development/python-modules/maya { }; - mayavi = callPackage ../development/python-modules/mayavi { }; + mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { + inherit buildPythonPackage isPy27 fetchPypi; + inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5; + }; mccabe = callPackage ../development/python-modules/mccabe { }; @@ -4657,9 +4739,7 @@ in { Nuitka = callPackage ../development/python-modules/nuitka { }; numpy = let - numpy_ = callPackage ../development/python-modules/numpy { - blas = pkgs.openblasCompat; - }; + numpy_ = callPackage ../development/python-modules/numpy { }; numpy_2 = numpy_.overridePythonAttrs(oldAttrs: rec { version = "1.16.5"; src = oldAttrs.src.override { @@ -4815,6 +4895,8 @@ in { paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; + pagelabels = callPackage ../development/python-modules/pagelabels { }; + pamqp = callPackage ../development/python-modules/pamqp { }; parsedatetime = callPackage ../development/python-modules/parsedatetime { }; @@ -4886,6 +4968,8 @@ in { pdfkit = callPackage ../development/python-modules/pdfkit { }; + pdfrw = callPackage ../development/python-modules/pdfrw { }; + periodictable = callPackage ../development/python-modules/periodictable { }; pgcli = callPackage ../development/tools/database/pgcli {}; @@ -4938,11 +5022,7 @@ in { promise = callPackage ../development/python-modules/promise { }; - prox-tv = callPackage ../development/python-modules/prox-tv { - # We need to use blas instead of openblas on darwin, - # see https://github.com/NixOS/nixpkgs/pull/45013. - useOpenblas = ! stdenv.isDarwin; - }; + prox-tv = callPackage ../development/python-modules/prox-tv { }; pvlib = callPackage ../development/python-modules/pvlib { }; @@ -5028,6 +5108,8 @@ in { publicsuffix = callPackage ../development/python-modules/publicsuffix {}; + publicsuffix2 = callPackage ../development/python-modules/publicsuffix2 {}; + py = callPackage ../development/python-modules/py { }; pyacoustid = callPackage ../development/python-modules/pyacoustid { }; @@ -5165,6 +5247,8 @@ in { pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { }; + pyrad = callPackage ../development/python-modules/pyrad { }; + pyrr = callPackage ../development/python-modules/pyrr { }; pysha3 = callPackage ../development/python-modules/pysha3 { }; @@ -5388,21 +5472,6 @@ in { pyyaml = callPackage ../development/python-modules/pyyaml { }; - pyyaml_3 = (callPackage ../development/python-modules/pyyaml { }).overridePythonAttrs (oldAttrs: rec { - version = "3.13"; - src = oldAttrs.src.override { - inherit version; - sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf"; - }; - # https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948 - patches = singleton (pkgs.fetchpatch { - url = "https://github.com/yaml/pyyaml/commit/c5b135fe39d41cffbdc006f28ccb2032df6005e0.patch"; - sha256 = "0x1v45rkmj194c41d1nqi3ihj9z4rsy8zvpfcd8p960g1fia7fhn"; - }); - # https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948 - doCheck = false; - }); - rabbitpy = callPackage ../development/python-modules/rabbitpy { }; rasterio = callPackage ../development/python-modules/rasterio { @@ -5497,6 +5566,8 @@ in { readchar = callPackage ../development/python-modules/readchar { }; + retworkx = callPackage ../development/python-modules/retworkx { }; + rivet = disabledIf isPy3k (toPythonModule (pkgs.rivet.override { python2 = python; })); @@ -5608,6 +5679,8 @@ in { safe = callPackage ../development/python-modules/safe { }; + safety = callPackage ../development/python-modules/safety { }; + sampledata = callPackage ../development/python-modules/sampledata { }; sasmodels = callPackage ../development/python-modules/sasmodels { }; @@ -5771,6 +5844,8 @@ in { sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; + sqlsoup = callPackage ../development/python-modules/sqlsoup { }; + staticjinja = callPackage ../development/python-modules/staticjinja { }; statsmodels = callPackage ../development/python-modules/statsmodels { }; @@ -5818,6 +5893,8 @@ in { traitlets = callPackage ../development/python-modules/traitlets { }; + traittypes = callPackage ../development/python-modules/traittypes { }; + transitions = callPackage ../development/python-modules/transitions { }; extras = callPackage ../development/python-modules/extras { }; @@ -5864,6 +5941,8 @@ in { txtorcon = callPackage ../development/python-modules/txtorcon { }; + txdbus = callPackage ../development/python-modules/txdbus { }; + tzlocal = callPackage ../development/python-modules/tzlocal { }; u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; @@ -6002,6 +6081,8 @@ in { zerorpc = callPackage ../development/python-modules/zerorpc { }; + zimports = callPackage ../development/python-modules/zimports { }; + zipstream = callPackage ../development/python-modules/zipstream { }; zodb = callPackage ../development/python-modules/zodb {}; @@ -6179,6 +6260,8 @@ in { smartdc = callPackage ../development/python-modules/smartdc { }; + smpplib = callPackage ../development/python-modules/smpplib { }; + socksipy-branch = callPackage ../development/python-modules/socksipy-branch { }; sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { }; @@ -6957,6 +7040,11 @@ in { pytoml = callPackage ../development/python-modules/pytoml { }; + pypamtest = pkgs.libpam-wrapper.override { + enablePython = true; + inherit python; + }; + pypandoc = callPackage ../development/python-modules/pypandoc { }; yamllint = callPackage ../development/python-modules/yamllint { }; @@ -7217,7 +7305,7 @@ in { scour = callPackage ../development/python-modules/scour { }; - pymssql = callPackage ../development/python-modules/pymssql { }; + pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 nanoleaf = callPackage ../development/python-modules/nanoleaf { }; diff --git a/pkgs/top-level/release-alternatives.nix b/pkgs/top-level/release-alternatives.nix new file mode 100644 index 0000000000000..7479377bd3026 --- /dev/null +++ b/pkgs/top-level/release-alternatives.nix @@ -0,0 +1,91 @@ +{ pkgsFun ? import ../.. +, lib ? import ../../lib +, supportedSystems ? ["x86_64-linux"] +, allowUnfree ? false }: + +let + + # called BLAS here, but also tests LAPACK + blasUsers = [ + # "julia_07" "julia_10" "julia_11" "julia_13" "octave" "octaveFull" + "fflas-ffpack" "linbox" "R" "ipopt" "hpl" "rspamd" "octopus" + "sundials" "sundials_2" "superlu" "suitesparse_5_3" "suitesparse_4_4" + "suitesparse_4_2" "scs" "scalapack" "petsc" "cholmod-extra" + "arpack" "qrupdate" "libcint" "iml" "globalarrays" "arrayfire" "armadillo" + "xfitter" "lammps" "plink-ng" "quantum-espresso" "siesta" + "siesta-mpi" "shogun" "calculix" "csdp" "getdp" "giac" "gmsh" "jags" + "lammps" "lammps-mpi" + + # requires openblas + # "caffe" "mxnet" "flint" "sage" "sageWithDoc" + + # broken + # "gnss-sdr" "octave-jit" "openmodelica" "torch" + + # subpackages + ["pythonPackages" "numpy"] ["pythonPackages" "prox-tv"] ["pythonPackages" "scs"] + ["pythonPackages" "pysparse"] ["pythonPackages" "cvxopt"] + # ["pythonPackages" "fenics"] + ["rPackages" "slfm"] ["rPackages" "SamplerCompare"] + # ["rPackages" "EMCluster"] + # ["ocamlPackages" "lacaml"] + # ["ocamlPackages" "owl"] + ["haskellPackages" "bindings-levmar"] + ] ++ lib.optionals allowUnfree [ "magma" ]; + blas64Users = [ + "rspamd" "suitesparse_5_3" "suitesparse_4_4" + "suitesparse_4_2" "petsc" "cholmod-extra" + "arpack" "qrupdate" "iml" "globalarrays" "arrayfire" + "xfitter" "lammps" "plink-ng" "quantum-espresso" + "calculix" "csdp" "getdp" "jags" + "lammps" "lammps-mpi" + # ["ocamlPackages" "lacaml"] + ["haskellPackages" "bindings-levmar"] + ] ++ lib.optionals allowUnfree [ "magma" ]; + blasProviders = system: [ "openblasCompat" "lapack-reference" "openblas" ] + ++ lib.optionals (allowUnfree && system.isx86) ["mkl" "mkl64"]; + + blas64Providers = [ "mkl64" "openblas"]; + + mapListToAttrs = xs: f: builtins.listToAttrs (map (name: { + name = if builtins.isList name + then builtins.elemAt name (builtins.length name - 1) + else name; + value = f name; + }) xs); + +in + +{ + blas = mapListToAttrs supportedSystems (system': let system = lib.systems.elaborate { system = system'; }; + in mapListToAttrs (blasProviders system) (provider: let + isILP64 = builtins.elem provider (["mkl64"] ++ lib.optional system.is64bit "openblas"); + pkgs = pkgsFun { + config = { inherit allowUnfree; }; + system = system'; + overlays = [(self: super: { + lapack = super.lapack.override { + lapackProvider = if provider == "mkl64" + then super.mkl + else builtins.getAttr provider super; + inherit isILP64; + }; + blas = super.blas.override { + blasProvider = if provider == "mkl64" + then super.mkl + else builtins.getAttr provider super; + inherit isILP64; + }; + })]; + }; + in mapListToAttrs (if builtins.elem provider blas64Providers + then blas64Users else blasUsers) + (attr: if builtins.isList attr + then lib.getAttrFromPath attr pkgs + else builtins.getAttr attr pkgs) + + // { recurseForDerivations = true; }) + // { recurseForDerivations = true; }) + // { recurseForDerivations = true; }; + recurseForDerivations = true; +} diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index ab7e4ce00d7d1..1c7f758ccff35 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -78,9 +78,9 @@ with import ./release-lib.nix { inherit supportedSystems; }; kvm = linux; qemu = linux; qemu_kvm = linux; + lapack-reference = linux; less = all; lftp = all; - liblapack = linux; libtool = all; libtool_2 = all; libxml2 = all; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index e0723523f4e51..60a4a679f1611 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -181,6 +181,7 @@ let haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskellPackages = packagePlatforms pkgs.haskellPackages; idrisPackages = packagePlatforms pkgs.idrisPackages; + agdaPackages = packagePlatforms pkgs.agdaPackages; tests = packagePlatforms pkgs.tests; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index c7db64b99f6f1..6f331b20d3fcb 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -166,7 +166,6 @@ in { }); arrow-cpp = super.arrow-cpp.override { enableShared = false; - python = { pkgs = { python = null; numpy = null; }; }; }; boost = super.boost.override { enableStatic = true; diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 56bab2fe41166..cdad9de61f41b 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -66,12 +66,12 @@ let linux = pkgs.utillinux; }; getconf = { - linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.glibc + linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc else pkgs.netbsd.getconf; darwin = pkgs.darwin.system_cmds; }; getent = { - linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.glibc + linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc else pkgs.netbsd.getent; darwin = pkgs.netbsd.getent; }; |